From 646fd3c198ade370763bc5a93c664e73f886d3f6 Mon Sep 17 00:00:00 2001 From: Kenneth R Westerback Date: Tue, 7 Mar 2006 04:41:20 +0000 Subject: Remove last NRND NetBSDisms from tree. ok deraadt@ brad@ --- sys/dev/usb/if_aue.c | 14 +------------- sys/dev/usb/if_auereg.h | 8 +------- sys/dev/usb/if_axe.c | 14 +------------- sys/dev/usb/if_cue.c | 14 +------------- sys/dev/usb/if_cuereg.h | 5 +---- sys/dev/usb/if_kue.c | 15 +-------------- sys/dev/usb/if_kuereg.h | 5 +---- sys/dev/usb/if_udav.c | 12 +----------- sys/dev/usb/if_udavreg.h | 5 +---- sys/dev/usb/if_upl.c | 18 +----------------- sys/dev/usb/if_url.c | 12 +----------- sys/dev/usb/if_urlreg.h | 5 +---- sys/dev/usb/uhidev.c | 13 +------------ sys/dev/usb/uhidev.h | 8 +------- 14 files changed, 14 insertions(+), 134 deletions(-) (limited to 'sys') diff --git a/sys/dev/usb/if_aue.c b/sys/dev/usb/if_aue.c index d2a066bf384..207503e0e42 100644 --- a/sys/dev/usb/if_aue.c +++ b/sys/dev/usb/if_aue.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_aue.c,v 1.43 2006/01/29 03:22:52 brad Exp $ */ +/* $OpenBSD: if_aue.c,v 1.44 2006/03/07 04:41:19 krw Exp $ */ /* $NetBSD: if_aue.c,v 1.82 2003/03/05 17:37:36 shiba Exp $ */ /* * Copyright (c) 1997, 1998, 1999, 2000 @@ -98,9 +98,6 @@ #include #include -#if NRND > 0 -#include -#endif #include #if defined(__NetBSD__) @@ -847,10 +844,6 @@ USB_ATTACH(aue) /* Attach the interface. */ if_attach(ifp); Ether_ifattach(ifp, eaddr); -#if NRND > 0 - rnd_attach_source(&sc->rnd_source, USBDEVNAME(sc->aue_dev), - RND_TYPE_NET, 0); -#endif usb_callout_init(sc->aue_stat_ch); @@ -889,11 +882,6 @@ USB_DETACH(aue) if (ifp->if_flags & IFF_RUNNING) aue_stop(sc); -#if defined(__NetBSD__) -#if NRND > 0 - rnd_detach_source(&sc->rnd_source); -#endif -#endif /* __NetBSD__ */ mii_detach(&sc->aue_mii, MII_PHY_ANY, MII_OFFSET_ANY); ifmedia_delete_instance(&sc->aue_mii.mii_media, IFM_INST_ANY); ether_ifdetach(ifp); diff --git a/sys/dev/usb/if_auereg.h b/sys/dev/usb/if_auereg.h index 9b5da5e2e39..d78cdb908fa 100644 --- a/sys/dev/usb/if_auereg.h +++ b/sys/dev/usb/if_auereg.h @@ -1,4 +1,4 @@ -/* $OpenBSD: if_auereg.h,v 1.7 2004/05/19 11:37:00 brad Exp $ */ +/* $OpenBSD: if_auereg.h,v 1.8 2006/03/07 04:41:19 krw Exp $ */ /* $NetBSD: if_auereg.h,v 1.16 2001/10/10 02:14:17 augustss Exp $ */ /* * Copyright (c) 1997, 1998, 1999 @@ -235,17 +235,11 @@ struct aue_softc { #elif defined(__NetBSD__) struct ethercom aue_ec; struct mii_data aue_mii; -#if NRND > 0 - rndsource_element_t rnd_source; -#endif #define GET_IFP(sc) (&(sc)->aue_ec.ec_if) #define GET_MII(sc) (&(sc)->aue_mii) #elif defined(__OpenBSD__) struct arpcom arpcom; struct mii_data aue_mii; -#if NRND > 0 - rndsource_element_t rnd_source; -#endif #define GET_IFP(sc) (&(sc)->arpcom.ac_if) #define GET_MII(sc) (&(sc)->aue_mii) #endif diff --git a/sys/dev/usb/if_axe.c b/sys/dev/usb/if_axe.c index 519fa52463d..655192b1519 100644 --- a/sys/dev/usb/if_axe.c +++ b/sys/dev/usb/if_axe.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_axe.c,v 1.45 2006/01/29 03:22:52 brad Exp $ */ +/* $OpenBSD: if_axe.c,v 1.46 2006/03/07 04:41:19 krw Exp $ */ /* * Copyright (c) 1997, 1998, 1999, 2000-2003 @@ -93,9 +93,6 @@ #include #include -#if NRND > 0 -#include -#endif #include @@ -699,10 +696,6 @@ USB_ATTACH(axe) /* Attach the interface. */ if_attach(ifp); Ether_ifattach(ifp, eaddr); -#if NRND > 0 - rnd_attach_source(&sc->rnd_source, USBDEVNAME(sc->axe_dev), - RND_TYPE_NET, 0); -#endif usb_callout_init(sc->axe_stat_ch); @@ -757,11 +750,6 @@ USB_DETACH(axe) if (ifp->if_flags & IFF_RUNNING) axe_stop(sc); -#if defined(__NetBSD__) -#if NRND > 0 - rnd_detach_source(&sc->rnd_source); -#endif -#endif /* __NetBSD__ */ mii_detach(&sc->axe_mii, MII_PHY_ANY, MII_OFFSET_ANY); ifmedia_delete_instance(&sc->axe_mii.mii_media, IFM_INST_ANY); ether_ifdetach(ifp); diff --git a/sys/dev/usb/if_cue.c b/sys/dev/usb/if_cue.c index 81610ef68fd..b96bc008085 100644 --- a/sys/dev/usb/if_cue.c +++ b/sys/dev/usb/if_cue.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_cue.c,v 1.28 2006/01/29 03:22:52 brad Exp $ */ +/* $OpenBSD: if_cue.c,v 1.29 2006/03/07 04:41:19 krw Exp $ */ /* $NetBSD: if_cue.c,v 1.40 2002/07/11 21:14:26 augustss Exp $ */ /* * Copyright (c) 1997, 1998, 1999, 2000 @@ -77,9 +77,6 @@ #include #include -#if NRND > 0 -#include -#endif #include #if defined(__NetBSD__) @@ -559,10 +556,6 @@ USB_ATTACH(cue) /* Attach the interface. */ if_attach(ifp); Ether_ifattach(ifp, eaddr); -#if NRND > 0 - rnd_attach_source(&sc->rnd_source, USBDEVNAME(sc->cue_dev), - RND_TYPE_NET, 0); -#endif usb_callout_init(sc->cue_stat_ch); @@ -601,11 +594,6 @@ USB_DETACH(cue) if (ifp->if_flags & IFF_RUNNING) cue_stop(sc); -#if defined(__NetBSD__) -#if NRND > 0 - rnd_detach_source(&sc->rnd_source); -#endif -#endif /* __NetBSD__ */ ether_ifdetach(ifp); if_detach(ifp); diff --git a/sys/dev/usb/if_cuereg.h b/sys/dev/usb/if_cuereg.h index a8ec8c8872e..b831d78fc6e 100644 --- a/sys/dev/usb/if_cuereg.h +++ b/sys/dev/usb/if_cuereg.h @@ -1,4 +1,4 @@ -/* $OpenBSD: if_cuereg.h,v 1.6 2004/05/19 11:37:00 brad Exp $ */ +/* $OpenBSD: if_cuereg.h,v 1.7 2006/03/07 04:41:19 krw Exp $ */ /* $NetBSD: if_cuereg.h,v 1.14 2001/01/21 22:09:24 augustss Exp $ */ /* * Copyright (c) 1997, 1998, 1999, 2000 @@ -172,9 +172,6 @@ struct cue_softc { #define GET_IFP(sc) (&(sc)->arpcom.ac_if) #elif defined(__NetBSD__) struct ethercom cue_ec; -#if NRND > 0 - rndsource_element_t rnd_source; -#endif #define GET_IFP(sc) (&(sc)->cue_ec.ec_if) #endif diff --git a/sys/dev/usb/if_kue.c b/sys/dev/usb/if_kue.c index 21fdf08367d..0893de73250 100644 --- a/sys/dev/usb/if_kue.c +++ b/sys/dev/usb/if_kue.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_kue.c,v 1.39 2006/01/29 03:22:52 brad Exp $ */ +/* $OpenBSD: if_kue.c,v 1.40 2006/03/07 04:41:19 krw Exp $ */ /* $NetBSD: if_kue.c,v 1.50 2002/07/16 22:00:31 augustss Exp $ */ /* * Copyright (c) 1997, 1998, 1999, 2000 @@ -89,10 +89,6 @@ #include #include -#if NRND > 0 -#include -#endif - #include #if defined(__NetBSD__) #include @@ -523,10 +519,6 @@ kue_attachhook(void *xsc) /* Attach the interface. */ if_attach(ifp); Ether_ifattach(ifp, sc->kue_desc.kue_macaddr); -#if NRND > 0 - rnd_attach_source(&sc->rnd_source, USBDEVNAME(sc->kue_dev), - RND_TYPE_NET, 0); -#endif sc->kue_attached = 1; splx(s); @@ -595,11 +587,6 @@ USB_DETACH(kue) if (ifp->if_flags & IFF_RUNNING) kue_stop(sc); -#if defined(__NetBSD__) -#if NRND > 0 - rnd_detach_source(&sc->rnd_source); -#endif -#endif /* __NetBSD__ */ ether_ifdetach(ifp); if_detach(ifp); diff --git a/sys/dev/usb/if_kuereg.h b/sys/dev/usb/if_kuereg.h index 8c4bf56739e..4daf86b316d 100644 --- a/sys/dev/usb/if_kuereg.h +++ b/sys/dev/usb/if_kuereg.h @@ -1,4 +1,4 @@ -/* $OpenBSD: if_kuereg.h,v 1.5 2004/05/19 11:37:00 brad Exp $ */ +/* $OpenBSD: if_kuereg.h,v 1.6 2006/03/07 04:41:19 krw Exp $ */ /* $NetBSD: if_kuereg.h,v 1.11 2001/01/21 02:35:31 augustss Exp $ */ /* * Copyright (c) 1997, 1998, 1999, 2000 @@ -167,9 +167,6 @@ struct kue_softc { #define GET_IFP(sc) (&(sc)->arpcom.ac_if) #elif defined(__NetBSD__) struct ethercom kue_ec; -#if NRND > 0 - rndsource_element_t rnd_source; -#endif #define GET_IFP(sc) (&(sc)->kue_ec.ec_if) #endif diff --git a/sys/dev/usb/if_udav.c b/sys/dev/usb/if_udav.c index 81e486135b8..0e166f11b30 100644 --- a/sys/dev/usb/if_udav.c +++ b/sys/dev/usb/if_udav.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_udav.c,v 1.15 2006/02/06 17:29:11 jmc Exp $ */ +/* $OpenBSD: if_udav.c,v 1.16 2006/03/07 04:41:19 krw Exp $ */ /* $NetBSD: if_udav.c,v 1.3 2004/04/23 17:25:25 itojun Exp $ */ /* $nabe: if_udav.c,v 1.3 2003/08/21 16:57:19 nabe Exp $ */ /* @@ -57,9 +57,6 @@ #include #include -#if NRND > 0 -#include -#endif #include #include @@ -295,10 +292,6 @@ USB_ATTACH(udav) if_attach(ifp); Ether_ifattach(ifp, eaddr); -#if NRND > 0 - rnd_attach_source(&sc->rnd_source, devname, RND_TYPE_NET, 0); -#endif - usb_callout_init(sc->sc_stat_ch); sc->sc_attached = 1; splx(s); @@ -340,9 +333,6 @@ USB_DETACH(udav) if (ifp->if_flags & IFF_RUNNING) udav_stop(GET_IFP(sc), 1); -#if NRND > 0 - rnd_detach_source(&sc->rnd_source); -#endif mii_detach(&sc->sc_mii, MII_PHY_ANY, MII_OFFSET_ANY); ifmedia_delete_instance(&sc->sc_mii.mii_media, IFM_INST_ANY); ether_ifdetach(ifp); diff --git a/sys/dev/usb/if_udavreg.h b/sys/dev/usb/if_udavreg.h index c53371e8582..e1222104d0f 100644 --- a/sys/dev/usb/if_udavreg.h +++ b/sys/dev/usb/if_udavreg.h @@ -1,4 +1,4 @@ -/* $OpenBSD: if_udavreg.h,v 1.3 2005/01/30 13:22:58 dlg Exp $ */ +/* $OpenBSD: if_udavreg.h,v 1.4 2006/03/07 04:41:19 krw Exp $ */ /* $NetBSD: if_udavreg.h,v 1.2 2003/09/04 15:17:39 tsutsui Exp $ */ /* $nabe: if_udavreg.h,v 1.2 2003/08/21 16:26:40 nabe Exp $ */ /* @@ -191,9 +191,6 @@ struct udav_softc { struct lock sc_mii_lock; int sc_link; #define sc_media udav_mii.mii_media -#if NRND > 0 - rndsource_element_t rnd_source; -#endif struct udav_cdata sc_cdata; int sc_attached; diff --git a/sys/dev/usb/if_upl.c b/sys/dev/usb/if_upl.c index 09b187217f4..540d3af9698 100644 --- a/sys/dev/usb/if_upl.c +++ b/sys/dev/usb/if_upl.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_upl.c,v 1.22 2006/01/29 03:22:52 brad Exp $ */ +/* $OpenBSD: if_upl.c,v 1.23 2006/03/07 04:41:19 krw Exp $ */ /* $NetBSD: if_upl.c,v 1.19 2002/07/11 21:14:26 augustss Exp $ */ /* * Copyright (c) 2000 The NetBSD Foundation, Inc. @@ -63,9 +63,6 @@ #include #include -#if NRND > 0 -#include -#endif #include #include @@ -159,10 +156,6 @@ struct upl_softc { USBBASEDEVICE sc_dev; struct ifnet sc_if; -#if NRND > 0 - rndsource_element_t sc_rnd_source; -#endif - usb_callout_t sc_stat_ch; usbd_device_handle sc_udev; @@ -335,11 +328,6 @@ USB_ATTACH(upl) #if defined(__NetBSD__) && NBPFILTER > 0 bpfattach(ifp, DLT_RAW, 0); #endif -#if NRND > 0 - rnd_attach_source(&sc->sc_rnd_source, USBDEVNAME(sc->sc_dev), - RND_TYPE_NET, 0); -#endif - sc->sc_attached = 1; splx(s); @@ -368,10 +356,6 @@ USB_DETACH(upl) if (ifp->if_flags & IFF_RUNNING) upl_stop(sc); -#if NRND > 0 - rnd_detach_source(&sc->sc_rnd_source); -#endif - if_detach(ifp); #ifdef DIAGNOSTIC diff --git a/sys/dev/usb/if_url.c b/sys/dev/usb/if_url.c index d85c8123175..02aa5d4bebe 100644 --- a/sys/dev/usb/if_url.c +++ b/sys/dev/usb/if_url.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_url.c,v 1.29 2006/02/06 17:29:11 jmc Exp $ */ +/* $OpenBSD: if_url.c,v 1.30 2006/03/07 04:41:19 krw Exp $ */ /* $NetBSD: if_url.c,v 1.6 2002/09/29 10:19:21 martin Exp $ */ /* * Copyright (c) 2001, 2002 @@ -62,9 +62,6 @@ #include #include -#if NRND > 0 -#include -#endif #include #include @@ -332,10 +329,6 @@ USB_ATTACH(url) if_attach(ifp); Ether_ifattach(ifp, eaddr); -#if NRND > 0 - rnd_attach_source(&sc->rnd_source, devname, RND_TYPE_NET, 0); -#endif - usb_callout_init(sc->sc_stat_ch); sc->sc_attached = 1; splx(s); @@ -378,9 +371,6 @@ USB_DETACH(url) if (ifp->if_flags & IFF_RUNNING) url_stop(GET_IFP(sc), 1); -#if NRND > 0 - rnd_detach_source(&sc->rnd_source); -#endif mii_detach(&sc->sc_mii, MII_PHY_ANY, MII_OFFSET_ANY); ifmedia_delete_instance(&sc->sc_mii.mii_media, IFM_INST_ANY); ether_ifdetach(ifp); diff --git a/sys/dev/usb/if_urlreg.h b/sys/dev/usb/if_urlreg.h index bc97fc05f9d..650d7550476 100644 --- a/sys/dev/usb/if_urlreg.h +++ b/sys/dev/usb/if_urlreg.h @@ -1,4 +1,4 @@ -/* $OpenBSD: if_urlreg.h,v 1.6 2004/09/29 09:51:07 dlg Exp $ */ +/* $OpenBSD: if_urlreg.h,v 1.7 2006/03/07 04:41:19 krw Exp $ */ /* $NetBSD: if_urlreg.h,v 1.1 2002/03/28 21:09:11 ichiro Exp $ */ /* * Copyright (c) 2001, 2002 @@ -181,9 +181,6 @@ struct url_softc { struct lock sc_mii_lock; int sc_link; #define sc_media url_mii.mii_media -#if NRND > 0 - rndsource_element_t rnd_source; -#endif struct url_cdata sc_cdata; int sc_attached; diff --git a/sys/dev/usb/uhidev.c b/sys/dev/usb/uhidev.c index fd4f252e86a..6c8a77ea356 100644 --- a/sys/dev/usb/uhidev.c +++ b/sys/dev/usb/uhidev.c @@ -1,4 +1,4 @@ -/* $OpenBSD: uhidev.c,v 1.12 2006/01/06 03:36:32 brad Exp $ */ +/* $OpenBSD: uhidev.c,v 1.13 2006/03/07 04:41:19 krw Exp $ */ /* $NetBSD: uhidev.c,v 1.14 2003/03/11 16:44:00 augustss Exp $ */ /* @@ -260,11 +260,6 @@ USB_ATTACH(uhidev) USBDEVNAME(sc->sc_dev)); USB_ATTACH_ERROR_RETURN; } -#endif -#if defined(__NetBSD__) && NRND > 0 - rnd_attach_source(&dev->rnd_source, - USBDEVNAME(dev->sc_dev), - RND_TYPE_TTY, 0); #endif } } @@ -361,9 +356,6 @@ USB_DETACH(uhidev) rv = 0; for (i = 0; i < sc->sc_nrepid; i++) { if (sc->sc_subdevs[i] != NULL) { -#if defined(__NetBSD__) && NRND > 0 - rnd_detach_source(&sc->sc_subdevs[i]->rnd_source); -#endif rv |= config_detach(&sc->sc_subdevs[i]->sc_dev, flags); sc->sc_subdevs[i] = NULL; } @@ -426,9 +418,6 @@ uhidev_intr(usbd_xfer_handle xfer, usbd_private_handle addr, usbd_status status) if (scd->sc_in_rep_size != cc) printf("%s: bad input length %d != %d\n",USBDEVNAME(sc->sc_dev), scd->sc_in_rep_size, cc); -#endif -#if defined(__NetBSD__) && NRND > 0 - rnd_add_uint32(&scd->rnd_source, (uintptr_t)(sc->sc_ibuf)); #endif scd->sc_intr(scd, p, cc); } diff --git a/sys/dev/usb/uhidev.h b/sys/dev/usb/uhidev.h index 90ba1509499..dd9190c1f62 100644 --- a/sys/dev/usb/uhidev.h +++ b/sys/dev/usb/uhidev.h @@ -1,4 +1,4 @@ -/* $OpenBSD: uhidev.h,v 1.4 2002/11/11 02:32:32 nate Exp $ */ +/* $OpenBSD: uhidev.h,v 1.5 2006/03/07 04:41:19 krw Exp $ */ /* $NetBSD: uhidev.h,v 1.3 2002/10/08 09:56:17 dan Exp $ */ /* @@ -42,9 +42,6 @@ #include "locators.h" #include "rnd.h" -#if NRND > 0 -#include -#endif #endif #define uhidevcf_reportid cf_loc[UHIDBUSCF_REPORTID] @@ -78,9 +75,6 @@ struct uhidev { int sc_in_rep_size; #define UHIDEV_OPEN 0x01 /* device is open */ void (*sc_intr)(struct uhidev *, void *, u_int); -#if defined(__NetBSD__) && NRND > 0 - rndsource_element_t rnd_source; -#endif }; struct uhidev_attach_arg { -- cgit v1.2.3