diff options
| author | Brad Smith <brad@cvs.openbsd.org> | 2006-02-24 01:48:28 +0000 |
|---|---|---|
| committer | Brad Smith <brad@cvs.openbsd.org> | 2006-02-24 01:48:28 +0000 |
| commit | 67acfdb90350fef0021394b89446f11946124c4a (patch) | |
| tree | 71b906622196c9c9043f6f5b4ecd9d01366bcac9 /sys/dev/ic | |
| parent | a11304e2597c2a67f356537b96ec1d8cb54a3fd4 (diff) | |
remove NetBSD rnd(4) code.
Diffstat (limited to 'sys/dev/ic')
| -rw-r--r-- | sys/dev/ic/smc91cxx.c | 18 | ||||
| -rw-r--r-- | sys/dev/ic/smc91cxxvar.h | 13 |
2 files changed, 2 insertions, 29 deletions
diff --git a/sys/dev/ic/smc91cxx.c b/sys/dev/ic/smc91cxx.c index 9761b81b826..0e050823229 100644 --- a/sys/dev/ic/smc91cxx.c +++ b/sys/dev/ic/smc91cxx.c @@ -1,4 +1,4 @@ -/* $OpenBSD: smc91cxx.c,v 1.22 2006/01/23 14:42:55 martin Exp $ */ +/* $OpenBSD: smc91cxx.c,v 1.23 2006/02/24 01:48:27 brad Exp $ */ /* $NetBSD: smc91cxx.c,v 1.11 1998/08/08 23:51:41 mycroft Exp $ */ /*- @@ -90,9 +90,6 @@ #include <sys/malloc.h> #include <sys/ioctl.h> #include <sys/errno.h> -#if NRND > 0 -#include <sys/rnd.h> -#endif #include <machine/bus.h> #include <machine/intr.h> @@ -325,11 +322,6 @@ smc91cxx_attach(sc, myea) break; } -#if NRND > 0 - rnd_attach_source(&sc->rnd_source, sc->sc_dev.dv_xname, - RND_TYPE_NET, 0); -#endif - /* The attach is successful. */ sc->sc_flags |= SMC_FLAGS_ATTACHED; } @@ -919,11 +911,6 @@ out: mask |= bus_space_read_1(bst, bsh, INTR_MASK_REG_B); bus_space_write_1(bst, bsh, INTR_MASK_REG_B, mask); -#if NRND > 0 - if (status) - rnd_add_uint32(&sc->rnd_source, status); -#endif - return (1); } @@ -1280,9 +1267,6 @@ smc91cxx_detach(self, flags) /* Delete all media. */ ifmedia_delete_instance(&sc->sc_mii.mii_media, IFM_INST_ANY); -#if NRND > 0 - rnd_detach_source(&sc->rnd_source); -#endif #if NBPFILTER > 0 bpfdetach(ifp); #endif diff --git a/sys/dev/ic/smc91cxxvar.h b/sys/dev/ic/smc91cxxvar.h index 13294ad5509..dbdfb1bb77f 100644 --- a/sys/dev/ic/smc91cxxvar.h +++ b/sys/dev/ic/smc91cxxvar.h @@ -1,4 +1,4 @@ -/* $OpenBSD: smc91cxxvar.h,v 1.5 2006/01/23 14:42:55 martin Exp $ */ +/* $OpenBSD: smc91cxxvar.h,v 1.6 2006/02/24 01:48:27 brad Exp $ */ /* $NetBSD: smc91cxxvar.h,v 1.4 1997/10/15 05:56:13 explorer Exp $ */ /*- @@ -38,15 +38,8 @@ * POSSIBILITY OF SUCH DAMAGE. */ -#if NRND > 0 -#include <sys/rnd.h> -#endif - struct smc91cxx_softc { struct device sc_dev; /* generic device glue */ -#ifdef __NetBSD__ - struct ethercom sc_ethercom; /* ethernet common glue */ -#endif struct arpcom sc_arpcom; /* ethernet common glue */ struct mii_data sc_mii; /* MII/media control */ @@ -67,10 +60,6 @@ struct smc91cxx_softc { u_int8_t sc_chipid; u_int8_t sc_internal_phy; /* 91C111 only */ - -#if NRND > 0 - rndsource_element_t rnd_source; -#endif }; #define SMC_SELECT_BANK(sc, x) \ |