 @@ -1,14 +1,14 @@
-/*	$NetBSD: kern_rndq.c,v 1.49 2015/04/14 12:25:41 riastradh Exp $	*/
+/*	$NetBSD: kern_rndq.c,v 1.50 2015/04/14 12:28:12 riastradh Exp $	*/
 /*-
  * Copyright (c) 1997-2013 The NetBSD Foundation, Inc.
  * All rights reserved.
+ *
  * This code is derived from software contributed to The NetBSD Foundation
  * by Michael Graff <explorer@flame.org> and Thor Lancelot Simon.
  * This code uses ideas and algorithms from the Linux driver written by
  * Ted Ts'o.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
 @@ -22,27 +22,27 @@
  * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
  * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
  * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
  * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
  * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
  * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
  * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
  * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: kern_rndq.c,v 1.49 2015/04/14 12:25:41 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: kern_rndq.c,v 1.50 2015/04/14 12:28:12 riastradh Exp $");
 #include <sys/param.h>
 #include <sys/atomic.h>
 #include <sys/ioctl.h>
 #include <sys/fcntl.h>
 #include <sys/select.h>
 #include <sys/poll.h>
 #include <sys/kmem.h>
 #include <sys/mutex.h>
 #include <sys/proc.h>
 #include <sys/kernel.h>
 #include <sys/conf.h>
 #include <sys/systm.h>
 @@ -91,27 +91,27 @@ static unsigned int deltacnt;
 /*
  * This is a little bit of state information attached to each device that we
  * collect entropy from.  This is simply a collection buffer, and when it
  * is full it will be "detached" from the source and added to the entropy
  * pool after entropy is distilled as much as possible.
  */
 #define	RND_SAMPLE_COUNT	64	/* collect N samples, then compress */
 typedef struct _rnd_sample_t {
 	SIMPLEQ_ENTRY(_rnd_sample_t) next;
 	krndsource_t	*source;
 	int		cursor;
 	int		entropy;
 	uint32_t	ts[RND_SAMPLE_COUNT];
-	u_int32_t	values[RND_SAMPLE_COUNT];
+	uint32_t	values[RND_SAMPLE_COUNT];
 } rnd_sample_t;
 SIMPLEQ_HEAD(rnd_sampleq, _rnd_sample_t);
 /*
  * The sample queue.  Samples are put into the queue and processed in a
  * softint in order to limit the latency of adding a sample.
  */
 static struct {
 	kmutex_t		lock;
 	struct rnd_sampleq	q;
 } rnd_samples __cacheline_aligned;
 @@ -837,28 +837,28 @@ rnd_add_data(krndsource_t *rs, const voi
 	 * itself, random.  Don't estimate entropy based on
 	 * timestamp, just directly add the data.
 	 */
 	if (__predict_false(rs == NULL)) {
 		mutex_spin_enter(&rndpool_mtx);
 		rndpool_add_data(&rnd_pool, data, len, entropy);
 		mutex_spin_exit(&rndpool_mtx);
 	} else {
 		rnd_add_data_ts(rs, data, len, entropy, rnd_counter());
+	}
+}
 static void
-rnd_add_data_ts(krndsource_t *rs, const void *const data, u_int32_t len,
+rnd_add_data_ts(krndsource_t *rs, const void *const data, uint32_t len,
-		u_int32_t entropy, uint32_t ts)
+    uint32_t entropy, uint32_t ts)
+{
 	rnd_sample_t *state = NULL;
 	const uint8_t *p = data;
 	uint32_t dint;
 	int todo, done, filled = 0;
 	int sample_count;
 	struct rnd_sampleq tmp_samples = SIMPLEQ_HEAD_INITIALIZER(tmp_samples);
 	if (rs && (rs->flags & RND_FLAG_NO_COLLECT ||
 	    __predict_false(!(rs->flags &
 			     (RND_FLAG_COLLECT_TIME|
 			     RND_FLAG_COLLECT_VALUE))))) {
 		return;
 @@ -1012,27 +1012,27 @@ rnd_hwrng_test(rnd_sample_t *sample)
 /*
  * Process the events in the ring buffer.  Called by rnd_timeout or
  * by the add routines directly if the callout has never fired (that
  * is, if we are "cold" -- just booted).
+ *
  */
 static void
 rnd_process_events(void)
+{
 	rnd_sample_t *sample = NULL;
 	krndsource_t *source, *badsource = NULL;
 	static krndsource_t *last_source;
-	u_int32_t entropy;
+	uint32_t entropy;
 	size_t pool_entropy;
 	int found = 0, wake = 0;
 	struct rnd_sampleq dq_samples = SIMPLEQ_HEAD_INITIALIZER(dq_samples);
 	struct rnd_sampleq df_samples = SIMPLEQ_HEAD_INITIALIZER(df_samples);
 	/*
 	 * Drain to the on-stack queue and drop the lock.
 	 */
 	mutex_spin_enter(&rnd_samples.lock);
 	while ((sample = SIMPLEQ_FIRST(&rnd_samples.q))) {
 		found++;
 		SIMPLEQ_REMOVE_HEAD(&rnd_samples.q, next);
 		/*
 @@ -1139,27 +1139,27 @@ skip:		SIMPLEQ_INSERT_TAIL(&df_samples,
 static void
 rnd_intr(void *arg)
+{
 	rnd_process_events();
+}
 static void
 rnd_wake(void *arg)
+{
 	rnd_wakeup_readers();
+}
 static uint32_t
-rnd_extract_data(void *p, u_int32_t len, u_int32_t flags)
+rnd_extract_data(void *p, uint32_t len, uint32_t flags)
+{
 	static int timed_in;
 	int entropy_count;
 	uint32_t retval;
 	mutex_spin_enter(&rndpool_mtx);
 	if (__predict_false(!timed_in)) {
 		if (boottime.tv_sec) {
 			rndpool_add_data(&rnd_pool, &boottime,
 					 sizeof(boottime), 0);
+		}
 		timed_in++;
+	}