From 998e04f9dc55b6ebd30411183d3e4d038ed02d29 Mon Sep 17 00:00:00 2001 From: joe Date: Sat, 6 Apr 2002 20:17:13 +0000 Subject: [PATCH] Rename foo_gone to foo_dying, in keeping with the rest of the usb code. --- sys/dev/usb/if_aue.c | 16 ++++++++-------- sys/dev/usb/if_auereg.h | 2 +- sys/dev/usb/if_cue.c | 18 +++++++++--------- sys/dev/usb/if_cuereg.h | 2 +- sys/dev/usb/if_kue.c | 8 ++++---- sys/dev/usb/if_kuereg.h | 2 +- 6 files changed, 24 insertions(+), 24 deletions(-) diff --git a/sys/dev/usb/if_aue.c b/sys/dev/usb/if_aue.c index 4430837f0bf9..a520099cb671 100644 --- a/sys/dev/usb/if_aue.c +++ b/sys/dev/usb/if_aue.c @@ -242,7 +242,7 @@ aue_csr_read_1(struct aue_softc *sc, int reg) usbd_status err; u_int8_t val = 0; - if (sc->aue_gone) + if (sc->aue_dying) return (0); AUE_LOCK(sc); @@ -272,7 +272,7 @@ aue_csr_read_2(struct aue_softc *sc, int reg) usbd_status err; u_int16_t val = 0; - if (sc->aue_gone) + if (sc->aue_dying) return (0); AUE_LOCK(sc); @@ -301,7 +301,7 @@ aue_csr_write_1(struct aue_softc *sc, int reg, int val) usb_device_request_t req; usbd_status err; - if (sc->aue_gone) + if (sc->aue_dying) return (0); AUE_LOCK(sc); @@ -330,7 +330,7 @@ aue_csr_write_2(struct aue_softc *sc, int reg, int val) usb_device_request_t req; usbd_status err; - if (sc->aue_gone) + if (sc->aue_dying) return (0); AUE_LOCK(sc); @@ -769,7 +769,7 @@ USB_ATTACH(aue) ether_ifattach(ifp, ETHER_BPF_SUPPORTED); callout_handle_init(&sc->aue_stat_ch); usb_register_netisr(); - sc->aue_gone = 0; + sc->aue_dying = 0; AUE_UNLOCK(sc); USB_ATTACH_SUCCESS_RETURN; @@ -785,7 +785,7 @@ aue_detach(device_ptr_t dev) AUE_LOCK(sc); ifp = &sc->arpcom.ac_if; - sc->aue_gone = 1; + sc->aue_dying = 1; untimeout(aue_tick, sc, sc->aue_stat_ch); ether_ifdetach(ifp, ETHER_BPF_SUPPORTED); @@ -972,7 +972,7 @@ aue_rxeof(usbd_xfer_handle xfer, usbd_private_handle priv, usbd_status status) int total_len = 0; struct aue_rxpkt r; - if (sc->aue_gone) + if (sc->aue_dying) return; AUE_LOCK(sc); ifp = &sc->arpcom.ac_if; @@ -1557,7 +1557,7 @@ aue_shutdown(device_ptr_t dev) struct aue_softc *sc; sc = device_get_softc(dev); - sc->aue_gone++; + sc->aue_dying++; AUE_LOCK(sc); aue_reset(sc); aue_stop(sc); diff --git a/sys/dev/usb/if_auereg.h b/sys/dev/usb/if_auereg.h index 6fec3cd15092..29883145fb20 100644 --- a/sys/dev/usb/if_auereg.h +++ b/sys/dev/usb/if_auereg.h @@ -249,11 +249,11 @@ struct aue_softc { usbd_pipe_handle aue_ep[AUE_ENDPT_MAX]; int aue_unit; u_int8_t aue_link; - u_int8_t aue_gone; int aue_if_flags; struct aue_cdata aue_cdata; struct callout_handle aue_stat_ch; struct mtx aue_mtx; + char aue_dying; }; #if 0 diff --git a/sys/dev/usb/if_cue.c b/sys/dev/usb/if_cue.c index 47830ebfd238..8f7fa5f53c3e 100644 --- a/sys/dev/usb/if_cue.c +++ b/sys/dev/usb/if_cue.c @@ -159,7 +159,7 @@ csr_read_1(struct cue_softc *sc, int reg) usbd_status err; u_int8_t val = 0; - if (sc->cue_gone) + if (sc->cue_dying) return(0); CUE_LOCK(sc); @@ -188,7 +188,7 @@ csr_read_2(struct cue_softc *sc, int reg) usbd_status err; u_int16_t val = 0; - if (sc->cue_gone) + if (sc->cue_dying) return(0); CUE_LOCK(sc); @@ -216,7 +216,7 @@ csr_write_1(struct cue_softc *sc, int reg, int val) usb_device_request_t req; usbd_status err; - if (sc->cue_gone) + if (sc->cue_dying) return(0); CUE_LOCK(sc); @@ -245,7 +245,7 @@ csr_write_2(struct cue_softc *sc, int reg, int val) usb_device_request_t req; usbd_status err; - if (sc->cue_gone) + if (sc->cue_dying) return(0); CUE_LOCK(sc); @@ -274,7 +274,7 @@ cue_mem(struct cue_softc *sc, int cmd, int addr, void *buf, int len) usb_device_request_t req; usbd_status err; - if (sc->cue_gone) + if (sc->cue_dying) return(0); CUE_LOCK(sc); @@ -305,7 +305,7 @@ cue_getmac(struct cue_softc *sc, void *buf) usb_device_request_t req; usbd_status err; - if (sc->cue_gone) + if (sc->cue_dying) return(0); CUE_LOCK(sc); @@ -398,7 +398,7 @@ cue_reset(struct cue_softc *sc) usb_device_request_t req; usbd_status err; - if (sc->cue_gone) + if (sc->cue_dying) return; req.bmRequestType = UT_WRITE_VENDOR_DEVICE; @@ -534,7 +534,7 @@ USB_ATTACH(cue) ether_ifattach(ifp, ETHER_BPF_SUPPORTED); callout_handle_init(&sc->cue_stat_ch); usb_register_netisr(); - sc->cue_gone = 0; + sc->cue_dying = 0; CUE_UNLOCK(sc); USB_ATTACH_SUCCESS_RETURN; @@ -550,7 +550,7 @@ cue_detach(device_ptr_t dev) CUE_LOCK(sc); ifp = &sc->arpcom.ac_if; - sc->cue_gone = 1; + sc->cue_dying = 1; untimeout(cue_tick, sc, sc->cue_stat_ch); ether_ifdetach(ifp, ETHER_BPF_SUPPORTED); diff --git a/sys/dev/usb/if_cuereg.h b/sys/dev/usb/if_cuereg.h index 3e3e1b6b485a..b74ca04277d4 100644 --- a/sys/dev/usb/if_cuereg.h +++ b/sys/dev/usb/if_cuereg.h @@ -175,11 +175,11 @@ struct cue_softc { int cue_unit; u_int8_t cue_mctab[CUE_MCAST_TABLE_LEN]; int cue_if_flags; - u_int8_t cue_gone; u_int16_t cue_rxfilt; struct cue_cdata cue_cdata; struct callout_handle cue_stat_ch; struct mtx cue_mtx; + char cue_dying; }; #if 0 diff --git a/sys/dev/usb/if_kue.c b/sys/dev/usb/if_kue.c index 835289895426..bd9a6b6d18fa 100644 --- a/sys/dev/usb/if_kue.c +++ b/sys/dev/usb/if_kue.c @@ -200,7 +200,7 @@ kue_setword(struct kue_softc *sc, u_int8_t breq, u_int16_t word) usb_device_request_t req; usbd_status err; - if (sc->kue_gone) + if (sc->kue_dying) return(USBD_NORMAL_COMPLETION); dev = sc->kue_udev; @@ -231,7 +231,7 @@ kue_ctl(struct kue_softc *sc, int rw, u_int8_t breq, u_int16_t val, dev = sc->kue_udev; - if (sc->kue_gone) + if (sc->kue_dying) return(USBD_NORMAL_COMPLETION); KUE_LOCK(sc); @@ -493,7 +493,7 @@ USB_ATTACH(kue) */ ether_ifattach(ifp, ETHER_BPF_SUPPORTED); usb_register_netisr(); - sc->kue_gone = 0; + sc->kue_dying = 0; KUE_UNLOCK(sc); @@ -510,7 +510,7 @@ kue_detach(device_ptr_t dev) KUE_LOCK(sc); ifp = &sc->arpcom.ac_if; - sc->kue_gone = 1; + sc->kue_dying = 1; if (ifp != NULL) ether_ifdetach(ifp, ETHER_BPF_SUPPORTED); diff --git a/sys/dev/usb/if_kuereg.h b/sys/dev/usb/if_kuereg.h index 9dac6861c35f..07cdfced695a 100644 --- a/sys/dev/usb/if_kuereg.h +++ b/sys/dev/usb/if_kuereg.h @@ -166,11 +166,11 @@ struct kue_softc { usbd_pipe_handle kue_ep[KUE_ENDPT_MAX]; int kue_unit; int kue_if_flags; - u_int8_t kue_gone; u_int16_t kue_rxfilt; u_int8_t *kue_mcfilters; struct kue_cdata kue_cdata; struct mtx kue_mtx; + char kue_dying; }; #if 0