diff options
| author | tls <tls@NetBSD.org> | 2012-02-02 19:42:57 +0000 |
|---|---|---|
| committer | tls <tls@NetBSD.org> | 2012-02-02 19:42:57 +0000 |
| commit | cc9ee3de3e25ef31d3a97dc35bedc36945e35d2a (patch) | |
| tree | 06a2889eb6b4b02bc8b8bba6b5cc3f9b1938d18b /sys/dev/gpib | |
| parent | f622122a62827e27b444c2f95632d61f73357ced (diff) | |
Entropy-pool implementation move and cleanup.
1) Move core entropy-pool code and source/sink/sample management code
to sys/kern from sys/dev.
2) Remove use of NRND as test for presence of entropy-pool code throughout
source tree.
3) Remove use of RND_ENABLED in device drivers as microoptimization to
avoid expensive operations on disabled entropy sources; make the
rnd_add calls do this directly so all callers benefit.
4) Fix bug in recent rnd_add_data()/rnd_add_uint32() changes that might
have lead to slight entropy overestimation for some sources.
5) Add new source types for environmental sensors, power sensors, VM
system events, and skew between clocks, with a sample implementation
for each.
ok releng to go in before the branch due to the difficulty of later
pullup (widespread #ifdef removal and moved files). Tested with release
builds on amd64 and evbarm and live testing on amd64.
Diffstat (limited to 'sys/dev/gpib')
| -rw-r--r-- | sys/dev/gpib/rd.c | 14 |
1 files changed, 2 insertions, 12 deletions
diff --git a/sys/dev/gpib/rd.c b/sys/dev/gpib/rd.c index 069179d9b81..5352e09af21 100644 --- a/sys/dev/gpib/rd.c +++ b/sys/dev/gpib/rd.c @@ -1,4 +1,4 @@ -/* $NetBSD: rd.c,v 1.29 2011/11/19 22:51:22 tls Exp $ */ +/* $NetBSD: rd.c,v 1.30 2012/02/02 19:43:02 tls Exp $ */ /*- * Copyright (c) 1996-2003 The NetBSD Foundation, Inc. @@ -72,9 +72,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: rd.c,v 1.29 2011/11/19 22:51:22 tls Exp $"); - -#include "rnd.h" +__KERNEL_RCSID(0, "$NetBSD: rd.c,v 1.30 2012/02/02 19:43:02 tls Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -91,9 +89,7 @@ __KERNEL_RCSID(0, "$NetBSD: rd.c,v 1.29 2011/11/19 22:51:22 tls Exp $"); #include <sys/proc.h> #include <sys/stat.h> -#if NRND > 0 #include <sys/rnd.h> -#endif #include <dev/gpib/gpibvar.h> #include <dev/gpib/cs80busvar.h> @@ -142,9 +138,7 @@ struct rd_softc { struct callout sc_restart_ch; -#if NRND > 0 krndsource_t rnd_source; -#endif }; #define RDUNIT(dev) DISKUNIT(dev) @@ -412,13 +406,11 @@ rdattach(device_t parent, device_t self, void *aux) if (rddebug & RDB_ERROR) rderrthresh = 0; #endif -#if NRND > 0 /* * attach the device into the random source list */ rnd_attach_source(&sc->rnd_source, device_xname(&sc->sc_dev), RND_TYPE_DISK, 0); -#endif } /* @@ -798,9 +790,7 @@ rdintr(struct rd_softc *sc) } if (rdfinish(sc, bp) != NULL) rdustart(sc); -#if NRND > 0 rnd_add_uint32(&sc->rnd_source, bp->b_blkno); -#endif } /* |
