From owner-p4-projects@FreeBSD.ORG Mon Sep 1 19:36:28 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id D37AA1065670; Mon, 1 Sep 2008 19:36:28 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 810D31065695 for ; Mon, 1 Sep 2008 19:36:28 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 6AA668FC18 for ; Mon, 1 Sep 2008 19:36:28 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.2/8.14.2) with ESMTP id m81JaS50000303 for ; Mon, 1 Sep 2008 19:36:28 GMT (envelope-from hselasky@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.2/8.14.1/Submit) id m81JaS60000301 for perforce@freebsd.org; Mon, 1 Sep 2008 19:36:28 GMT (envelope-from hselasky@FreeBSD.org) Date: Mon, 1 Sep 2008 19:36:28 GMT Message-Id: <200809011936.m81JaS60000301@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to hselasky@FreeBSD.org using -f From: Hans Petter Selasky To: Perforce Change Reviews Cc: Subject: PERFORCE change 149007 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 01 Sep 2008 19:36:29 -0000 http://perforce.freebsd.org/chv.cgi?CH=149007 Change 149007 by hselasky@hselasky_laptop001 on 2008/09/01 19:36:21 Fix function name consistency. Change "stop" into "drain" because the "usb2_config_td_drain" will block/sleep until it is done. This gives the programmer some hints that this function should not be called with any mutexes locked. Affected files ... .. //depot/projects/usb/src/sys/dev/usb2/controller/ehci2_pci.c#10 edit .. //depot/projects/usb/src/sys/dev/usb2/controller/ohci2_pci.c#8 edit .. //depot/projects/usb/src/sys/dev/usb2/controller/uhci2_pci.c#8 edit .. //depot/projects/usb/src/sys/dev/usb2/core/usb2_config_td.c#8 edit .. //depot/projects/usb/src/sys/dev/usb2/core/usb2_config_td.h#3 edit .. //depot/projects/usb/src/sys/dev/usb2/ethernet/if_aue2.c#7 edit .. //depot/projects/usb/src/sys/dev/usb2/ethernet/if_axe2.c#7 edit .. //depot/projects/usb/src/sys/dev/usb2/ethernet/if_cue2.c#7 edit .. //depot/projects/usb/src/sys/dev/usb2/ethernet/if_kue2.c#7 edit .. //depot/projects/usb/src/sys/dev/usb2/ethernet/if_rue2.c#7 edit .. //depot/projects/usb/src/sys/dev/usb2/ethernet/if_udav2.c#7 edit .. //depot/projects/usb/src/sys/dev/usb2/serial/usb2_serial.c#8 edit .. //depot/projects/usb/src/sys/dev/usb2/wlan/if_rum2.c#9 edit .. //depot/projects/usb/src/sys/dev/usb2/wlan/if_ural2.c#10 edit .. //depot/projects/usb/src/sys/dev/usb2/wlan/if_zyd2.c#10 edit Differences ... ==== //depot/projects/usb/src/sys/dev/usb2/controller/ehci2_pci.c#10 (text+ko) ==== @@ -377,7 +377,7 @@ ehci_softc_t *sc = device_get_softc(self); device_t bdev; - usb2_config_td_stop(&sc->sc_config_td); + usb2_config_td_drain(&sc->sc_config_td); if (sc->sc_bus.bdev) { bdev = sc->sc_bus.bdev; ==== //depot/projects/usb/src/sys/dev/usb2/controller/ohci2_pci.c#8 (text+ko) ==== @@ -321,7 +321,7 @@ ohci_softc_t *sc = device_get_softc(self); device_t bdev; - usb2_config_td_stop(&sc->sc_config_td); + usb2_config_td_drain(&sc->sc_config_td); if (sc->sc_bus.bdev) { bdev = sc->sc_bus.bdev; ==== //depot/projects/usb/src/sys/dev/usb2/controller/uhci2_pci.c#8 (text+ko) ==== @@ -374,7 +374,7 @@ uhci_softc_t *sc = device_get_softc(self); device_t bdev; - usb2_config_td_stop(&sc->sc_config_td); + usb2_config_td_drain(&sc->sc_config_td); if (sc->sc_bus.bdev) { bdev = sc->sc_bus.bdev; ==== //depot/projects/usb/src/sys/dev/usb2/core/usb2_config_td.c#8 (text+ko) ==== @@ -103,7 +103,7 @@ } /*------------------------------------------------------------------------* - * usb2_config_td_stop + * usb2_config_td_drain * * This function will tear down an USB config thread, waiting for the * currently executing command to return. @@ -112,7 +112,7 @@ * this function does nothing. *------------------------------------------------------------------------*/ void -usb2_config_td_stop(struct usb2_config_td *ctd) +usb2_config_td_drain(struct usb2_config_td *ctd) { DPRINTF("\n"); if (ctd->p_msgs) { @@ -132,7 +132,7 @@ { DPRINTF("\n"); - usb2_config_td_stop(ctd); + usb2_config_td_drain(ctd); if (ctd->p_msgs) { usb2_proc_unsetup(&ctd->usb2_proc); ==== //depot/projects/usb/src/sys/dev/usb2/core/usb2_config_td.h#3 (text+ko) ==== @@ -59,7 +59,7 @@ /* prototypes */ uint8_t usb2_config_td_setup(struct usb2_config_td *ctd, void *priv_sc, struct mtx *priv_mtx, usb2_config_td_end_of_commands_t *p_func_eoc, uint16_t item_size, uint16_t item_count); -void usb2_config_td_stop(struct usb2_config_td *ctd); +void usb2_config_td_drain(struct usb2_config_td *ctd); void usb2_config_td_unsetup(struct usb2_config_td *ctd); void usb2_config_td_queue_command(struct usb2_config_td *ctd, usb2_config_td_command_t *pre_func, usb2_config_td_command_t *post_func, uint16_t command_qcount, uint16_t command_ref); uint8_t usb2_config_td_is_gone(struct usb2_config_td *ctd); ==== //depot/projects/usb/src/sys/dev/usb2/ethernet/if_aue2.c#7 (text+ko) ==== @@ -905,7 +905,7 @@ struct aue_softc *sc = device_get_softc(dev); struct ifnet *ifp; - usb2_config_td_stop(&sc->sc_config_td); + usb2_config_td_drain(&sc->sc_config_td); mtx_lock(&sc->sc_mtx); ==== //depot/projects/usb/src/sys/dev/usb2/ethernet/if_axe2.c#7 (text+ko) ==== @@ -861,7 +861,7 @@ struct axe_softc *sc = device_get_softc(dev); struct ifnet *ifp; - usb2_config_td_stop(&sc->sc_config_td); + usb2_config_td_drain(&sc->sc_config_td); mtx_lock(&sc->sc_mtx); ==== //depot/projects/usb/src/sys/dev/usb2/ethernet/if_cue2.c#7 (text+ko) ==== @@ -509,7 +509,7 @@ struct cue_softc *sc = device_get_softc(dev); struct ifnet *ifp; - usb2_config_td_stop(&sc->sc_config_td); + usb2_config_td_drain(&sc->sc_config_td); mtx_lock(&sc->sc_mtx); ==== //depot/projects/usb/src/sys/dev/usb2/ethernet/if_kue2.c#7 (text+ko) ==== @@ -578,7 +578,7 @@ struct kue_softc *sc = device_get_softc(dev); struct ifnet *ifp; - usb2_config_td_stop(&sc->sc_config_td); + usb2_config_td_drain(&sc->sc_config_td); mtx_lock(&sc->sc_mtx); ==== //depot/projects/usb/src/sys/dev/usb2/ethernet/if_rue2.c#7 (text+ko) ==== @@ -784,7 +784,7 @@ struct rue_softc *sc = device_get_softc(dev); struct ifnet *ifp; - usb2_config_td_stop(&sc->sc_config_td); + usb2_config_td_drain(&sc->sc_config_td); mtx_lock(&sc->sc_mtx); ==== //depot/projects/usb/src/sys/dev/usb2/ethernet/if_udav2.c#7 (text+ko) ==== @@ -400,7 +400,7 @@ struct udav_softc *sc = device_get_softc(dev); struct ifnet *ifp; - usb2_config_td_stop(&sc->sc_config_td); + usb2_config_td_drain(&sc->sc_config_td); mtx_lock(&sc->sc_mtx); ==== //depot/projects/usb/src/sys/dev/usb2/serial/usb2_serial.c#8 (text+ko) ==== @@ -278,7 +278,7 @@ { uint32_t n; - usb2_config_td_stop(&ssc->sc_config_td); + usb2_config_td_drain(&ssc->sc_config_td); for (n = 0; n < sub_units; n++, sc++) { if (sc->sc_flag & UCOM_FLAG_ATTACHED) { ==== //depot/projects/usb/src/sys/dev/usb2/wlan/if_rum2.c#9 (text+ko) ==== @@ -500,7 +500,7 @@ struct ieee80211com *ic; struct ifnet *ifp; - usb2_config_td_stop(&sc->sc_config_td); + usb2_config_td_drain(&sc->sc_config_td); mtx_lock(&sc->sc_mtx); ==== //depot/projects/usb/src/sys/dev/usb2/wlan/if_ural2.c#10 (text+ko) ==== @@ -495,7 +495,7 @@ struct ieee80211com *ic; struct ifnet *ifp; - usb2_config_td_stop(&sc->sc_config_td); + usb2_config_td_drain(&sc->sc_config_td); mtx_lock(&sc->sc_mtx); ==== //depot/projects/usb/src/sys/dev/usb2/wlan/if_zyd2.c#10 (text+ko) ==== @@ -2032,7 +2032,7 @@ struct ieee80211com *ic; struct ifnet *ifp; - usb2_config_td_stop(&sc->sc_config_td); + usb2_config_td_drain(&sc->sc_config_td); mtx_lock(&sc->sc_mtx);