From owner-svn-src-stable-8@FreeBSD.ORG Thu Apr 29 22:44:05 2010 Return-Path: Delivered-To: svn-src-stable-8@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id CC235106564A; Thu, 29 Apr 2010 22:44:05 +0000 (UTC) (envelope-from thompsa@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [69.147.83.44]) by mx1.freebsd.org (Postfix) with ESMTP id B5EAF8FC14; Thu, 29 Apr 2010 22:44:05 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id o3TMi58N081024; Thu, 29 Apr 2010 22:44:05 GMT (envelope-from thompsa@svn.freebsd.org) Received: (from thompsa@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id o3TMi5So080980; Thu, 29 Apr 2010 22:44:05 GMT (envelope-from thompsa@svn.freebsd.org) Message-Id: <201004292244.o3TMi5So080980@svn.freebsd.org> From: Andrew Thompson Date: Thu, 29 Apr 2010 22:44:05 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-8@freebsd.org X-SVN-Group: stable-8 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r207399 - in stable/8/sys: amd64/conf arm/conf dev/sound/usb dev/usb dev/usb/controller dev/usb/input dev/usb/misc dev/usb/net dev/usb/serial dev/usb/storage dev/usb/wlan i386/conf ia64... X-BeenThere: svn-src-stable-8@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for only the 8-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 29 Apr 2010 22:44:05 -0000 Author: thompsa Date: Thu Apr 29 22:44:04 2010 New Revision: 207399 URL: http://svn.freebsd.org/changeset/base/207399 Log: MFC r207077 Change USB_DEBUG to #ifdef and allow it to be turned off. Previously this had the illusion of a tunable setting but was always turned on regardless. Modified: stable/8/sys/amd64/conf/GENERIC stable/8/sys/arm/conf/DB-78XXX stable/8/sys/arm/conf/DB-88F5XXX stable/8/sys/arm/conf/DB-88F6XXX stable/8/sys/arm/conf/HL200 stable/8/sys/arm/conf/KB920X stable/8/sys/arm/conf/SHEEVAPLUG stable/8/sys/dev/sound/usb/uaudio.c stable/8/sys/dev/usb/controller/ehci.c stable/8/sys/dev/usb/controller/uhci.c stable/8/sys/dev/usb/controller/uss820dci.c stable/8/sys/dev/usb/input/atp.c stable/8/sys/dev/usb/input/uhid.c stable/8/sys/dev/usb/input/ukbd.c stable/8/sys/dev/usb/input/ums.c stable/8/sys/dev/usb/misc/udbp.c stable/8/sys/dev/usb/net/if_aue.c stable/8/sys/dev/usb/net/if_axe.c stable/8/sys/dev/usb/net/if_cdce.c stable/8/sys/dev/usb/net/if_cue.c stable/8/sys/dev/usb/net/if_kue.c stable/8/sys/dev/usb/net/if_rue.c stable/8/sys/dev/usb/net/if_udav.c stable/8/sys/dev/usb/serial/u3g.c stable/8/sys/dev/usb/serial/ubsa.c stable/8/sys/dev/usb/serial/ubser.c stable/8/sys/dev/usb/serial/uchcom.c stable/8/sys/dev/usb/serial/uftdi.c stable/8/sys/dev/usb/serial/ulpt.c stable/8/sys/dev/usb/serial/umodem.c stable/8/sys/dev/usb/serial/umoscom.c stable/8/sys/dev/usb/serial/uplcom.c stable/8/sys/dev/usb/serial/usb_serial.c stable/8/sys/dev/usb/serial/uslcom.c stable/8/sys/dev/usb/serial/uvisor.c stable/8/sys/dev/usb/serial/uvscom.c stable/8/sys/dev/usb/storage/umass.c stable/8/sys/dev/usb/storage/urio.c stable/8/sys/dev/usb/storage/ustorage_fs.c stable/8/sys/dev/usb/usb_debug.h stable/8/sys/dev/usb/usb_freebsd.h stable/8/sys/dev/usb/usb_request.c stable/8/sys/dev/usb/usb_transfer.c stable/8/sys/dev/usb/wlan/if_rum.c stable/8/sys/dev/usb/wlan/if_run.c stable/8/sys/dev/usb/wlan/if_ural.c stable/8/sys/dev/usb/wlan/if_zyd.c stable/8/sys/i386/conf/GENERIC stable/8/sys/i386/conf/XBOX stable/8/sys/ia64/conf/GENERIC stable/8/sys/mips/conf/SENTRY5 stable/8/sys/pc98/conf/GENERIC stable/8/sys/powerpc/conf/GENERIC stable/8/sys/powerpc/conf/MPC85XX stable/8/sys/sparc64/conf/GENERIC stable/8/sys/sun4v/conf/GENERIC Directory Properties: stable/8/sys/ (props changed) stable/8/sys/amd64/include/xen/ (props changed) stable/8/sys/cddl/contrib/opensolaris/ (props changed) stable/8/sys/contrib/dev/acpica/ (props changed) stable/8/sys/contrib/pf/ (props changed) stable/8/sys/dev/xen/xenpci/ (props changed) stable/8/sys/geom/sched/ (props changed) Modified: stable/8/sys/amd64/conf/GENERIC ============================================================================== --- stable/8/sys/amd64/conf/GENERIC Thu Apr 29 22:42:18 2010 (r207398) +++ stable/8/sys/amd64/conf/GENERIC Thu Apr 29 22:44:04 2010 (r207399) @@ -281,6 +281,7 @@ device firmware # firmware assist modul device bpf # Berkeley packet filter # USB support +options USB_DEBUG # enable debug msgs device uhci # UHCI PCI->USB interface device ohci # OHCI PCI->USB interface device ehci # EHCI PCI->USB interface (USB 2.0) Modified: stable/8/sys/arm/conf/DB-78XXX ============================================================================== --- stable/8/sys/arm/conf/DB-78XXX Thu Apr 29 22:42:18 2010 (r207398) +++ stable/8/sys/arm/conf/DB-78XXX Thu Apr 29 22:44:04 2010 (r207399) @@ -66,6 +66,7 @@ device e1000phy device bpf # USB +options USB_DEBUG # enable debug msgs device usb device ehci device umass Modified: stable/8/sys/arm/conf/DB-88F5XXX ============================================================================== --- stable/8/sys/arm/conf/DB-88F5XXX Thu Apr 29 22:42:18 2010 (r207398) +++ stable/8/sys/arm/conf/DB-88F5XXX Thu Apr 29 22:44:04 2010 (r207399) @@ -73,6 +73,7 @@ device iicbus device ds133x # USB +options USB_DEBUG # enable debug msgs device usb device ehci device umass Modified: stable/8/sys/arm/conf/DB-88F6XXX ============================================================================== --- stable/8/sys/arm/conf/DB-88F6XXX Thu Apr 29 22:42:18 2010 (r207398) +++ stable/8/sys/arm/conf/DB-88F6XXX Thu Apr 29 22:44:04 2010 (r207399) @@ -66,6 +66,7 @@ device e1000phy device bpf # USB +options USB_DEBUG # enable debug msgs device usb device ehci device umass Modified: stable/8/sys/arm/conf/HL200 ============================================================================== --- stable/8/sys/arm/conf/HL200 Thu Apr 29 22:42:18 2010 (r207398) +++ stable/8/sys/arm/conf/HL200 Thu Apr 29 22:44:04 2010 (r207399) @@ -94,6 +94,7 @@ device icee device bpf # USB support +options USB_DEBUG # enable debug msgs device ohci # OHCI localbus->USB interface device usb # USB Bus (required) #device udbp # USB Double Bulk Pipe devices Modified: stable/8/sys/arm/conf/KB920X ============================================================================== --- stable/8/sys/arm/conf/KB920X Thu Apr 29 22:42:18 2010 (r207398) +++ stable/8/sys/arm/conf/KB920X Thu Apr 29 22:44:04 2010 (r207399) @@ -95,6 +95,7 @@ device icee device bpf # USB support +options USB_DEBUG # enable debug msgs device ohci # OHCI localbus->USB interface device usb # USB Bus (required) #device udbp # USB Double Bulk Pipe devices Modified: stable/8/sys/arm/conf/SHEEVAPLUG ============================================================================== --- stable/8/sys/arm/conf/SHEEVAPLUG Thu Apr 29 22:42:18 2010 (r207398) +++ stable/8/sys/arm/conf/SHEEVAPLUG Thu Apr 29 22:44:04 2010 (r207399) @@ -61,6 +61,7 @@ options DEVICE_POLLING device vlan # USB +options USB_DEBUG # enable debug msgs device usb device ehci device umass Modified: stable/8/sys/dev/sound/usb/uaudio.c ============================================================================== --- stable/8/sys/dev/sound/usb/uaudio.c Thu Apr 29 22:42:18 2010 (r207398) +++ stable/8/sys/dev/sound/usb/uaudio.c Thu Apr 29 22:44:04 2010 (r207399) @@ -91,7 +91,7 @@ static int uaudio_default_rate = 0; /* static int uaudio_default_bits = 32; static int uaudio_default_channels = 0; /* use default */ -#if USB_DEBUG +#ifdef USB_DEBUG static int uaudio_debug = 0; SYSCTL_NODE(_hw_usb, OID_AUTO, uaudio, CTLFLAG_RW, 0, "USB uaudio"); @@ -321,7 +321,7 @@ static const struct uaudio_format uaudio #define UAC_RECORD 3 #define UAC_NCLASSES 4 -#if USB_DEBUG +#ifdef USB_DEBUG static const char *uac_names[] = { "outputs", "inputs", "equalization", "record" }; @@ -406,7 +406,7 @@ static void umidi_init(device_t dev); static int32_t umidi_probe(device_t dev); static int32_t umidi_detach(device_t dev); -#if USB_DEBUG +#ifdef USB_DEBUG static void uaudio_chan_dump_ep_desc( const usb_endpoint_descriptor_audio_t *); static void uaudio_mixer_dump_cluster(uint8_t, @@ -780,7 +780,7 @@ uaudio_detach(device_t dev) * AS - Audio Stream - routines *========================================================================*/ -#if USB_DEBUG +#ifdef USB_DEBUG static void uaudio_chan_dump_ep_desc(const usb_endpoint_descriptor_audio_t *ed) { @@ -1019,7 +1019,7 @@ uaudio_chan_fill_info_sub(struct uaudio_ if ((chan->valid == 0) && usbd_get_iface(udev, curidx)) { chan->valid = 1; -#if USB_DEBUG +#ifdef USB_DEBUG uaudio_chan_dump_ep_desc(ed1); uaudio_chan_dump_ep_desc(ed2); @@ -1689,7 +1689,7 @@ uaudio_mixer_add_ctl(struct uaudio_softc uaudio_mixer_add_ctl_sub(sc, mc); -#if USB_DEBUG +#ifdef USB_DEBUG if (uaudio_debug > 2) { uint8_t i; @@ -1708,7 +1708,7 @@ static void uaudio_mixer_add_input(struct uaudio_softc *sc, const struct uaudio_terminal_node *iot, int id) { -#if USB_DEBUG +#ifdef USB_DEBUG const struct usb_audio_input_terminal *d = iot[id].u.it; DPRINTFN(3, "bTerminalId=%d wTerminalType=0x%04x " @@ -1724,7 +1724,7 @@ static void uaudio_mixer_add_output(struct uaudio_softc *sc, const struct uaudio_terminal_node *iot, int id) { -#if USB_DEBUG +#ifdef USB_DEBUG const struct usb_audio_output_terminal *d = iot[id].u.ot; DPRINTFN(3, "bTerminalId=%d wTerminalType=0x%04x " @@ -2257,7 +2257,7 @@ error: return (NULL); } -#if USB_DEBUG +#ifdef USB_DEBUG static void uaudio_mixer_dump_cluster(uint8_t id, const struct uaudio_terminal_node *iot) { @@ -2350,7 +2350,7 @@ done: return (r); } -#if USB_DEBUG +#ifdef USB_DEBUG struct uaudio_tt_to_string { uint16_t terminal_type; @@ -2856,7 +2856,7 @@ uaudio_mixer_fill_info(struct uaudio_sof (iot + i)->root = iot; } while (i--); -#if USB_DEBUG +#ifdef USB_DEBUG i = ID_max; do { uint8_t j; Modified: stable/8/sys/dev/usb/controller/ehci.c ============================================================================== --- stable/8/sys/dev/usb/controller/ehci.c Thu Apr 29 22:42:18 2010 (r207398) +++ stable/8/sys/dev/usb/controller/ehci.c Thu Apr 29 22:44:04 2010 (r207399) @@ -89,7 +89,7 @@ __FBSDID("$FreeBSD$"); ((ehci_softc_t *)(((uint8_t *)(bus)) - \ ((uint8_t *)&(((ehci_softc_t *)0)->sc_bus)))) -#if USB_DEBUG +#ifdef USB_DEBUG static int ehcidebug = 0; static int ehcinohighspeed = 0; static int ehciiaadbug = 0; @@ -258,7 +258,7 @@ ehci_init(ehci_softc_t *sc) usb_callout_init_mtx(&sc->sc_tmo_pcd, &sc->sc_bus.bus_mtx, 0); usb_callout_init_mtx(&sc->sc_tmo_poll, &sc->sc_bus.bus_mtx, 0); -#if USB_DEBUG +#ifdef USB_DEBUG if (ehciiaadbug) sc->sc_flags |= EHCI_SCFLG_IAADBUG; if (ehcilostintrbug) @@ -486,7 +486,7 @@ ehci_init(ehci_softc_t *sc) usb_bus_mem_flush_all(&sc->sc_bus, &ehci_iterate_hw_softc); -#if USB_DEBUG +#ifdef USB_DEBUG if (ehcidebug) { ehci_dump_sqh(sc, sc->sc_async_p_last); } @@ -685,7 +685,7 @@ ehci_shutdown(ehci_softc_t *sc) } } -#if USB_DEBUG +#ifdef USB_DEBUG static void ehci_dump_regs(ehci_softc_t *sc) { @@ -1229,7 +1229,7 @@ ehci_non_isoc_done_sub(struct usb_xfer * xfer->td_transfer_cache = td; -#if USB_DEBUG +#ifdef USB_DEBUG if (status & EHCI_QTD_STATERRS) { DPRINTFN(11, "error, addr=%d, endpt=0x%02x, frame=0x%02x" "status=%s%s%s%s%s%s%s%s\n", @@ -1260,7 +1260,7 @@ ehci_non_isoc_done(struct usb_xfer *xfer DPRINTFN(13, "xfer=%p endpoint=%p transfer done\n", xfer, xfer->endpoint); -#if USB_DEBUG +#ifdef USB_DEBUG if (ehcidebug > 10) { ehci_softc_t *sc = EHCI_BUS2SC(xfer->xroot->bus); @@ -1527,7 +1527,7 @@ ehci_interrupt(ehci_softc_t *sc) DPRINTFN(16, "real interrupt\n"); -#if USB_DEBUG +#ifdef USB_DEBUG if (ehcidebug > 15) { ehci_dump_regs(sc); } @@ -1548,7 +1548,7 @@ ehci_interrupt(ehci_softc_t *sc) if (status & EHCI_STS_HSE) { printf("%s: unrecoverable error, " "controller halted\n", __FUNCTION__); -#if USB_DEBUG +#ifdef USB_DEBUG ehci_dump_regs(sc); ehci_dump_isoc(sc); #endif @@ -1978,7 +1978,7 @@ ehci_setup_standard_chain(struct usb_xfe xfer->td_transfer_last = td; -#if USB_DEBUG +#ifdef USB_DEBUG if (ehcidebug > 8) { DPRINTF("nexttog=%d; data before transfer:\n", xfer->endpoint->toggle_next); @@ -2106,7 +2106,7 @@ ehci_isoc_fs_done(ehci_softc_t *sc, stru if (pp_last >= &sc->sc_isoc_fs_p_last[EHCI_VIRTUAL_FRAMELIST_COUNT]) { pp_last = &sc->sc_isoc_fs_p_last[0]; } -#if USB_DEBUG +#ifdef USB_DEBUG if (ehcidebug > 15) { DPRINTF("isoc FS-TD\n"); ehci_dump_sitd(sc, td); @@ -2160,7 +2160,7 @@ ehci_isoc_hs_done(ehci_softc_t *sc, stru if (pp_last >= &sc->sc_isoc_hs_p_last[EHCI_VIRTUAL_FRAMELIST_COUNT]) { pp_last = &sc->sc_isoc_hs_p_last[0]; } -#if USB_DEBUG +#ifdef USB_DEBUG if (ehcidebug > 15) { DPRINTF("isoc HS-TD\n"); ehci_dump_itd(sc, td); @@ -2224,7 +2224,7 @@ ehci_device_done(struct usb_xfer *xfer, if ((methods == &ehci_device_bulk_methods) || (methods == &ehci_device_ctrl_methods)) { -#if USB_DEBUG +#ifdef USB_DEBUG if (ehcidebug > 8) { DPRINTF("nexttog=%d; data after transfer:\n", xfer->endpoint->toggle_next); @@ -2509,7 +2509,7 @@ ehci_device_isoc_fs_enter(struct usb_xfe uint8_t sb; uint8_t error; -#if USB_DEBUG +#ifdef USB_DEBUG uint8_t once = 1; #endif @@ -2593,7 +2593,7 @@ ehci_device_isoc_fs_enter(struct usb_xfe /* reuse sitd_portaddr and sitd_back from last transfer */ if (*plen > xfer->max_frame_size) { -#if USB_DEBUG +#ifdef USB_DEBUG if (once) { once = 0; printf("%s: frame length(%d) exceeds %d " @@ -2683,7 +2683,7 @@ ehci_device_isoc_fs_enter(struct usb_xfe } usb_pc_cpu_flush(td->page_cache); -#if USB_DEBUG +#ifdef USB_DEBUG if (ehcidebug > 15) { DPRINTF("FS-TD %d\n", nframes); ehci_dump_sitd(sc, td); @@ -2800,7 +2800,7 @@ ehci_device_isoc_hs_enter(struct usb_xfe uint8_t td_no; uint8_t page_no; -#if USB_DEBUG +#ifdef USB_DEBUG uint8_t once = 1; #endif @@ -2878,7 +2878,7 @@ ehci_device_isoc_hs_enter(struct usb_xfe } /* range check */ if (*plen > xfer->max_frame_size) { -#if USB_DEBUG +#ifdef USB_DEBUG if (once) { once = 0; printf("%s: frame length(%d) exceeds %d bytes " @@ -2962,7 +2962,7 @@ ehci_device_isoc_hs_enter(struct usb_xfe td->itd_status[td_no - 1] |= htohc32(sc, EHCI_ITD_IOC); } usb_pc_cpu_flush(td->page_cache); -#if USB_DEBUG +#ifdef USB_DEBUG if (ehcidebug > 15) { DPRINTF("HS-TD %d\n", nframes); ehci_dump_itd(sc, td); @@ -3398,7 +3398,7 @@ ehci_roothub_exec(struct usb_device *ude break; case UHF_PORT_RESET: DPRINTFN(6, "reset port %d\n", index); -#if USB_DEBUG +#ifdef USB_DEBUG if (ehcinohighspeed) { /* * Connect USB device to companion Modified: stable/8/sys/dev/usb/controller/uhci.c ============================================================================== --- stable/8/sys/dev/usb/controller/uhci.c Thu Apr 29 22:42:18 2010 (r207398) +++ stable/8/sys/dev/usb/controller/uhci.c Thu Apr 29 22:44:04 2010 (r207399) @@ -82,7 +82,7 @@ __FBSDID("$FreeBSD$"); ((uhci_softc_t *)(((uint8_t *)(bus)) - \ ((uint8_t *)&(((uhci_softc_t *)0)->sc_bus)))) -#if USB_DEBUG +#ifdef USB_DEBUG static int uhcidebug = 0; static int uhcinoloop = 0; @@ -459,7 +459,7 @@ uhci_init(uhci_softc_t *sc) usb_callout_init_mtx(&sc->sc_root_intr, &sc->sc_bus.bus_mtx, 0); -#if USB_DEBUG +#ifdef USB_DEBUG if (uhcidebug > 2) { uhci_dumpregs(sc); } @@ -668,7 +668,7 @@ uhci_suspend(uhci_softc_t *sc) { USB_BUS_LOCK(&sc->sc_bus); -#if USB_DEBUG +#ifdef USB_DEBUG if (uhcidebug > 2) { uhci_dumpregs(sc); } @@ -712,7 +712,7 @@ uhci_resume(uhci_softc_t *sc) uhci_start(sc); -#if USB_DEBUG +#ifdef USB_DEBUG if (uhcidebug > 2) { uhci_dumpregs(sc); } @@ -724,7 +724,7 @@ uhci_resume(uhci_softc_t *sc) uhci_do_poll(&sc->sc_bus); } -#if USB_DEBUG +#ifdef USB_DEBUG static void uhci_dumpregs(uhci_softc_t *sc) { @@ -882,7 +882,7 @@ uhci_add_loop(uhci_softc_t *sc) struct uhci_qh *qh_lst; struct uhci_qh *qh_rec; -#if USB_DEBUG +#ifdef USB_DEBUG if (uhcinoloop) { return; } @@ -905,7 +905,7 @@ uhci_rem_loop(uhci_softc_t *sc) { struct uhci_qh *qh_lst; -#if USB_DEBUG +#ifdef USB_DEBUG if (uhcinoloop) { return; } @@ -1073,7 +1073,7 @@ uhci_isoc_done(uhci_softc_t *sc, struct if (pp_last >= &sc->sc_isoc_p_last[UHCI_VFRAMELIST_COUNT]) { pp_last = &sc->sc_isoc_p_last[0]; } -#if USB_DEBUG +#ifdef USB_DEBUG if (uhcidebug > 5) { DPRINTF("isoc TD\n"); uhci_dump_td(td); @@ -1204,7 +1204,7 @@ uhci_non_isoc_done_sub(struct usb_xfer * xfer->endpoint->toggle_next = (token & UHCI_TD_SET_DT(1)) ? 0 : 1; -#if USB_DEBUG +#ifdef USB_DEBUG if (status & UHCI_TD_ERROR) { DPRINTFN(11, "error, addr=%d, endpt=0x%02x, frame=0x%02x " "status=%s%s%s%s%s%s%s%s%s%s%s\n", @@ -1234,7 +1234,7 @@ uhci_non_isoc_done(struct usb_xfer *xfer DPRINTFN(13, "xfer=%p endpoint=%p transfer done\n", xfer, xfer->endpoint); -#if USB_DEBUG +#ifdef USB_DEBUG if (uhcidebug > 10) { uhci_dump_tds(xfer->td_transfer_first); } @@ -1473,7 +1473,7 @@ uhci_interrupt(uhci_softc_t *sc) DPRINTFN(16, "real interrupt\n"); -#if USB_DEBUG +#ifdef USB_DEBUG if (uhcidebug > 15) { uhci_dumpregs(sc); } @@ -1487,7 +1487,7 @@ uhci_interrupt(uhci_softc_t *sc) UHCI_STS_HCPE | UHCI_STS_HCH)) { if (status & UHCI_STS_RD) { -#if USB_DEBUG +#ifdef USB_DEBUG printf("%s: resume detect\n", __FUNCTION__); #endif @@ -1504,7 +1504,7 @@ uhci_interrupt(uhci_softc_t *sc) /* no acknowledge needed */ DPRINTF("%s: host controller halted\n", __FUNCTION__); -#if USB_DEBUG +#ifdef USB_DEBUG if (uhcidebug > 0) { uhci_dump_all(sc); } @@ -1866,7 +1866,7 @@ uhci_setup_standard_chain(struct usb_xfe xfer->td_transfer_last = td; -#if USB_DEBUG +#ifdef USB_DEBUG if (uhcidebug > 8) { DPRINTF("nexttog=%d; data before transfer:\n", xfer->endpoint->toggle_next); @@ -2182,7 +2182,7 @@ uhci_device_isoc_enter(struct usb_xfer * uint32_t temp; uint32_t *plen; -#if USB_DEBUG +#ifdef USB_DEBUG uint8_t once = 1; #endif @@ -2254,7 +2254,7 @@ uhci_device_isoc_enter(struct usb_xfer * pp_last = &sc->sc_isoc_p_last[0]; } if (*plen > xfer->max_frame_size) { -#if USB_DEBUG +#ifdef USB_DEBUG if (once) { once = 0; printf("%s: frame length(%d) exceeds %d " @@ -2306,7 +2306,7 @@ uhci_device_isoc_enter(struct usb_xfer * usb_pc_cpu_flush(td->page_cache); -#if USB_DEBUG +#ifdef USB_DEBUG if (uhcidebug > 5) { DPRINTF("TD %d\n", nframes); uhci_dump_td(td); Modified: stable/8/sys/dev/usb/controller/uss820dci.c ============================================================================== --- stable/8/sys/dev/usb/controller/uss820dci.c Thu Apr 29 22:42:18 2010 (r207398) +++ stable/8/sys/dev/usb/controller/uss820dci.c Thu Apr 29 22:44:04 2010 (r207399) @@ -77,7 +77,7 @@ #define USS820_DCI_PC2SC(pc) \ USS820_DCI_BUS2SC(USB_DMATAG_TO_XROOT((pc)->tag_parent)->bus) -#if USB_DEBUG +#ifdef USB_DEBUG static int uss820dcidebug = 0; SYSCTL_NODE(_hw_usb, OID_AUTO, uss820dci, CTLFLAG_RW, 0, "USB uss820dci"); Modified: stable/8/sys/dev/usb/input/atp.c ============================================================================== --- stable/8/sys/dev/usb/input/atp.c Thu Apr 29 22:42:18 2010 (r207398) +++ stable/8/sys/dev/usb/input/atp.c Thu Apr 29 22:44:04 2010 (r207399) @@ -116,7 +116,7 @@ __FBSDID("$FreeBSD$"); /* Tunables */ SYSCTL_NODE(_hw_usb, OID_AUTO, atp, CTLFLAG_RW, 0, "USB atp"); -#if USB_DEBUG +#ifdef USB_DEBUG enum atp_log_level { ATP_LLEVEL_DISABLED = 0, ATP_LLEVEL_ERROR, @@ -126,7 +126,7 @@ enum atp_log_level { static int atp_debug = ATP_LLEVEL_ERROR; /* the default is to only log errors */ SYSCTL_INT(_hw_usb_atp, OID_AUTO, debug, CTLFLAG_RW, &atp_debug, ATP_LLEVEL_ERROR, "ATP debug level"); -#endif /* #if USB_DEBUG */ +#endif /* USB_DEBUG */ static u_int atp_touch_timeout = ATP_TOUCH_TIMEOUT; SYSCTL_INT(_hw_usb_atp, OID_AUTO, touch_timeout, CTLFLAG_RW, &atp_touch_timeout, @@ -1055,7 +1055,7 @@ atp_update_strokes(struct atp_softc *sc, if (pspans_y[j].matched == FALSE) break; } if ((i < n_xpspans) && (j < n_ypspans)) { -#if USB_DEBUG +#ifdef USB_DEBUG if (atp_debug >= ATP_LLEVEL_INFO) { printf("unmatched pspans:"); for (; i < n_xpspans; i++) { @@ -1072,7 +1072,7 @@ atp_update_strokes(struct atp_softc *sc, } printf("\n"); } -#endif /* #if USB_DEBUG */ +#endif /* USB_DEBUG */ if ((n_xpspans == 1) && (n_ypspans == 1)) /* The common case of a single pair of new pspans. */ atp_add_stroke(sc, &pspans_x[0], &pspans_y[0]); @@ -1082,7 +1082,7 @@ atp_update_strokes(struct atp_softc *sc, pspans_y, n_ypspans); } -#if USB_DEBUG +#ifdef USB_DEBUG if (atp_debug >= ATP_LLEVEL_INFO) { for (i = 0; i < sc->sc_n_strokes; i++) { atp_stroke *stroke = &sc->sc_strokes[i]; @@ -1110,7 +1110,7 @@ atp_update_strokes(struct atp_softc *sc, if (sc->sc_n_strokes) printf("\n"); } -#endif /* #if USB_DEBUG */ +#endif /* USB_DEBUG */ return (movement); } Modified: stable/8/sys/dev/usb/input/uhid.c ============================================================================== --- stable/8/sys/dev/usb/input/uhid.c Thu Apr 29 22:42:18 2010 (r207398) +++ stable/8/sys/dev/usb/input/uhid.c Thu Apr 29 22:44:04 2010 (r207399) @@ -83,7 +83,7 @@ __FBSDID("$FreeBSD$"); #include #include -#if USB_DEBUG +#ifdef USB_DEBUG static int uhid_debug = 0; SYSCTL_NODE(_hw_usb, OID_AUTO, uhid, CTLFLAG_RW, 0, "USB uhid"); Modified: stable/8/sys/dev/usb/input/ukbd.c ============================================================================== --- stable/8/sys/dev/usb/input/ukbd.c Thu Apr 29 22:42:18 2010 (r207398) +++ stable/8/sys/dev/usb/input/ukbd.c Thu Apr 29 22:44:04 2010 (r207399) @@ -95,7 +95,7 @@ __FBSDID("$FreeBSD$"); /* the following file must be included after "ukbdmap.h" */ #include -#if USB_DEBUG +#ifdef USB_DEBUG static int ukbd_debug = 0; static int ukbd_no_leds = 0; @@ -621,7 +621,7 @@ ukbd_intr_callback(struct usb_xfer *xfer apple_fn = 1; else apple_fn = 0; -#if USB_DEBUG +#ifdef USB_DEBUG DPRINTF("apple_eject=%u apple_fn=%u\n", apple_eject, apple_fn); @@ -687,7 +687,7 @@ ukbd_set_leds_callback(struct usb_xfer * uint8_t buf[2]; struct ukbd_softc *sc = usbd_xfer_softc(xfer); -#if USB_DEBUG +#ifdef USB_DEBUG if (ukbd_no_leds) return; #endif Modified: stable/8/sys/dev/usb/input/ums.c ============================================================================== --- stable/8/sys/dev/usb/input/ums.c Thu Apr 29 22:42:18 2010 (r207398) +++ stable/8/sys/dev/usb/input/ums.c Thu Apr 29 22:44:04 2010 (r207399) @@ -81,7 +81,7 @@ __FBSDID("$FreeBSD$"); #include #include -#if USB_DEBUG +#ifdef USB_DEBUG static int ums_debug = 0; SYSCTL_NODE(_hw_usb, OID_AUTO, ums, CTLFLAG_RW, 0, "USB ums"); @@ -501,7 +501,9 @@ ums_attach(device_t dev) int err; uint16_t d_len; uint8_t i; +#ifdef USB_DEBUG uint8_t j; +#endif DPRINTFN(11, "sc=%p\n", sc); @@ -595,7 +597,7 @@ ums_attach(device_t dev) free(d_ptr, M_TEMP); d_ptr = NULL; -#if USB_DEBUG +#ifdef USB_DEBUG for (j = 0; j < UMS_INFO_MAX; j++) { info = &sc->sc_info[j]; Modified: stable/8/sys/dev/usb/misc/udbp.c ============================================================================== --- stable/8/sys/dev/usb/misc/udbp.c Thu Apr 29 22:42:18 2010 (r207398) +++ stable/8/sys/dev/usb/misc/udbp.c Thu Apr 29 22:44:04 2010 (r207399) @@ -94,7 +94,7 @@ __FBSDID("$FreeBSD$"); #include -#if USB_DEBUG +#ifdef USB_DEBUG static int udbp_debug = 0; SYSCTL_NODE(_hw_usb, OID_AUTO, udbp, CTLFLAG_RW, 0, "USB udbp"); Modified: stable/8/sys/dev/usb/net/if_aue.c ============================================================================== --- stable/8/sys/dev/usb/net/if_aue.c Thu Apr 29 22:42:18 2010 (r207398) +++ stable/8/sys/dev/usb/net/if_aue.c Thu Apr 29 22:44:04 2010 (r207399) @@ -100,7 +100,7 @@ __FBSDID("$FreeBSD$"); #include #include -#if USB_DEBUG +#ifdef USB_DEBUG static int aue_debug = 0; SYSCTL_NODE(_hw_usb, OID_AUTO, aue, CTLFLAG_RW, 0, "USB aue"); Modified: stable/8/sys/dev/usb/net/if_axe.c ============================================================================== --- stable/8/sys/dev/usb/net/if_axe.c Thu Apr 29 22:42:18 2010 (r207398) +++ stable/8/sys/dev/usb/net/if_axe.c Thu Apr 29 22:44:04 2010 (r207399) @@ -123,7 +123,7 @@ __FBSDID("$FreeBSD$"); */ #define AXE_178_MAX_FRAME_BURST 1 -#if USB_DEBUG +#ifdef USB_DEBUG static int axe_debug = 0; SYSCTL_NODE(_hw_usb, OID_AUTO, axe, CTLFLAG_RW, 0, "USB axe"); Modified: stable/8/sys/dev/usb/net/if_cdce.c ============================================================================== --- stable/8/sys/dev/usb/net/if_cdce.c Thu Apr 29 22:42:18 2010 (r207398) +++ stable/8/sys/dev/usb/net/if_cdce.c Thu Apr 29 22:44:04 2010 (r207399) @@ -108,7 +108,7 @@ static uether_fn_t cdce_setpromisc; static uint32_t cdce_m_crc32(struct mbuf *, uint32_t, uint32_t); -#if USB_DEBUG +#ifdef USB_DEBUG static int cdce_debug = 0; SYSCTL_NODE(_hw_usb, OID_AUTO, cdce, CTLFLAG_RW, 0, "USB CDC-Ethernet"); Modified: stable/8/sys/dev/usb/net/if_cue.c ============================================================================== --- stable/8/sys/dev/usb/net/if_cue.c Thu Apr 29 22:42:18 2010 (r207398) +++ stable/8/sys/dev/usb/net/if_cue.c Thu Apr 29 22:44:04 2010 (r207399) @@ -122,7 +122,7 @@ static int cue_getmac(struct cue_softc * static uint32_t cue_mchash(const uint8_t *); static void cue_reset(struct cue_softc *); -#if USB_DEBUG +#ifdef USB_DEBUG static int cue_debug = 0; SYSCTL_NODE(_hw_usb, OID_AUTO, cue, CTLFLAG_RW, 0, "USB cue"); Modified: stable/8/sys/dev/usb/net/if_kue.c ============================================================================== --- stable/8/sys/dev/usb/net/if_kue.c Thu Apr 29 22:42:18 2010 (r207398) +++ stable/8/sys/dev/usb/net/if_kue.c Thu Apr 29 22:44:04 2010 (r207399) @@ -163,7 +163,7 @@ static int kue_ctl(struct kue_softc *, u static int kue_load_fw(struct kue_softc *); static void kue_reset(struct kue_softc *); -#if USB_DEBUG +#ifdef USB_DEBUG static int kue_debug = 0; SYSCTL_NODE(_hw_usb, OID_AUTO, kue, CTLFLAG_RW, 0, "USB kue"); Modified: stable/8/sys/dev/usb/net/if_rue.c ============================================================================== --- stable/8/sys/dev/usb/net/if_rue.c Thu Apr 29 22:42:18 2010 (r207398) +++ stable/8/sys/dev/usb/net/if_rue.c Thu Apr 29 22:44:04 2010 (r207399) @@ -97,7 +97,7 @@ __FBSDID("$FreeBSD$"); #include #include -#if USB_DEBUG +#ifdef USB_DEBUG static int rue_debug = 0; SYSCTL_NODE(_hw_usb, OID_AUTO, rue, CTLFLAG_RW, 0, "USB rue"); Modified: stable/8/sys/dev/usb/net/if_udav.c ============================================================================== --- stable/8/sys/dev/usb/net/if_udav.c Thu Apr 29 22:42:18 2010 (r207398) +++ stable/8/sys/dev/usb/net/if_udav.c Thu Apr 29 22:44:04 2010 (r207399) @@ -185,7 +185,7 @@ static const struct usb_ether_methods ud .ue_mii_sts = udav_ifmedia_status, }; -#if USB_DEBUG +#ifdef USB_DEBUG static int udav_debug = 0; SYSCTL_NODE(_hw_usb, OID_AUTO, udav, CTLFLAG_RW, 0, "USB udav"); Modified: stable/8/sys/dev/usb/serial/u3g.c ============================================================================== --- stable/8/sys/dev/usb/serial/u3g.c Thu Apr 29 22:42:18 2010 (r207398) +++ stable/8/sys/dev/usb/serial/u3g.c Thu Apr 29 22:44:04 2010 (r207399) @@ -63,7 +63,7 @@ #include -#if USB_DEBUG +#ifdef USB_DEBUG static int u3g_debug = 0; SYSCTL_NODE(_hw_usb, OID_AUTO, u3g, CTLFLAG_RW, 0, "USB 3g"); Modified: stable/8/sys/dev/usb/serial/ubsa.c ============================================================================== --- stable/8/sys/dev/usb/serial/ubsa.c Thu Apr 29 22:42:18 2010 (r207398) +++ stable/8/sys/dev/usb/serial/ubsa.c Thu Apr 29 22:44:04 2010 (r207399) @@ -93,7 +93,7 @@ __FBSDID("$FreeBSD$"); #include -#if USB_DEBUG +#ifdef USB_DEBUG static int ubsa_debug = 0; SYSCTL_NODE(_hw_usb, OID_AUTO, ubsa, CTLFLAG_RW, 0, "USB ubsa"); @@ -405,9 +405,8 @@ ubsa_cfg_set_break(struct ucom_softc *uc static int ubsa_pre_param(struct ucom_softc *ucom, struct termios *t) { - struct ubsa_softc *sc = ucom->sc_parent; - DPRINTF("sc = %p\n", sc); + DPRINTF("sc = %p\n", ucom->sc_parent); switch (t->c_ospeed) { case B0: Modified: stable/8/sys/dev/usb/serial/ubser.c ============================================================================== --- stable/8/sys/dev/usb/serial/ubser.c Thu Apr 29 22:42:18 2010 (r207398) +++ stable/8/sys/dev/usb/serial/ubser.c Thu Apr 29 22:44:04 2010 (r207399) @@ -115,7 +115,7 @@ __FBSDID("$FreeBSD$"); #define VENDOR_SET_BREAK 0x02 #define VENDOR_CLEAR_BREAK 0x03 -#if USB_DEBUG +#ifdef USB_DEBUG static int ubser_debug = 0; SYSCTL_NODE(_hw_usb, OID_AUTO, ubser, CTLFLAG_RW, 0, "USB ubser"); Modified: stable/8/sys/dev/usb/serial/uchcom.c ============================================================================== --- stable/8/sys/dev/usb/serial/uchcom.c Thu Apr 29 22:42:18 2010 (r207398) +++ stable/8/sys/dev/usb/serial/uchcom.c Thu Apr 29 22:44:04 2010 (r207399) @@ -101,7 +101,7 @@ __FBSDID("$FreeBSD$"); #include -#if USB_DEBUG +#ifdef USB_DEBUG static int uchcom_debug = 0; SYSCTL_NODE(_hw_usb, OID_AUTO, uchcom, CTLFLAG_RW, 0, "USB uchcom"); Modified: stable/8/sys/dev/usb/serial/uftdi.c ============================================================================== --- stable/8/sys/dev/usb/serial/uftdi.c Thu Apr 29 22:42:18 2010 (r207398) +++ stable/8/sys/dev/usb/serial/uftdi.c Thu Apr 29 22:44:04 2010 (r207399) @@ -80,7 +80,7 @@ __FBSDID("$FreeBSD$"); #include #include -#if USB_DEBUG +#ifdef USB_DEBUG static int uftdi_debug = 0; SYSCTL_NODE(_hw_usb, OID_AUTO, uftdi, CTLFLAG_RW, 0, "USB uftdi"); Modified: stable/8/sys/dev/usb/serial/ulpt.c ============================================================================== --- stable/8/sys/dev/usb/serial/ulpt.c Thu Apr 29 22:42:18 2010 (r207398) +++ stable/8/sys/dev/usb/serial/ulpt.c Thu Apr 29 22:44:04 2010 (r207399) @@ -79,7 +79,7 @@ __FBSDID("$FreeBSD$"); #include #include -#if USB_DEBUG +#ifdef USB_DEBUG static int ulpt_debug = 0; SYSCTL_NODE(_hw_usb, OID_AUTO, ulpt, CTLFLAG_RW, 0, "USB ulpt"); Modified: stable/8/sys/dev/usb/serial/umodem.c ============================================================================== --- stable/8/sys/dev/usb/serial/umodem.c Thu Apr 29 22:42:18 2010 (r207398) +++ stable/8/sys/dev/usb/serial/umodem.c Thu Apr 29 22:44:04 2010 (r207399) @@ -116,7 +116,7 @@ __FBSDID("$FreeBSD$"); #include -#if USB_DEBUG +#ifdef USB_DEBUG static int umodem_debug = 0; SYSCTL_NODE(_hw_usb, OID_AUTO, umodem, CTLFLAG_RW, 0, "USB umodem"); Modified: stable/8/sys/dev/usb/serial/umoscom.c ============================================================================== --- stable/8/sys/dev/usb/serial/umoscom.c Thu Apr 29 22:42:18 2010 (r207398) +++ stable/8/sys/dev/usb/serial/umoscom.c Thu Apr 29 22:44:04 2010 (r207399) @@ -48,7 +48,7 @@ #include -#if USB_DEBUG +#ifdef USB_DEBUG static int umoscom_debug = 0; SYSCTL_NODE(_hw_usb, OID_AUTO, umoscom, CTLFLAG_RW, 0, "USB umoscom"); Modified: stable/8/sys/dev/usb/serial/uplcom.c ============================================================================== --- stable/8/sys/dev/usb/serial/uplcom.c Thu Apr 29 22:42:18 2010 (r207398) +++ stable/8/sys/dev/usb/serial/uplcom.c Thu Apr 29 22:44:04 2010 (r207399) @@ -116,7 +116,7 @@ __FBSDID("$FreeBSD$"); #include -#if USB_DEBUG +#ifdef USB_DEBUG static int uplcom_debug = 0; SYSCTL_NODE(_hw_usb, OID_AUTO, uplcom, CTLFLAG_RW, 0, "USB uplcom"); Modified: stable/8/sys/dev/usb/serial/usb_serial.c ============================================================================== --- stable/8/sys/dev/usb/serial/usb_serial.c Thu Apr 29 22:42:18 2010 (r207398) +++ stable/8/sys/dev/usb/serial/usb_serial.c Thu Apr 29 22:44:04 2010 (r207399) @@ -104,7 +104,7 @@ __FBSDID("$FreeBSD$"); SYSCTL_NODE(_hw_usb, OID_AUTO, ucom, CTLFLAG_RW, 0, "USB ucom"); -#if USB_DEBUG +#ifdef USB_DEBUG static int ucom_debug = 0; SYSCTL_INT(_hw_usb_ucom, OID_AUTO, debug, CTLFLAG_RW, Modified: stable/8/sys/dev/usb/serial/uslcom.c ============================================================================== --- stable/8/sys/dev/usb/serial/uslcom.c Thu Apr 29 22:42:18 2010 (r207398) +++ stable/8/sys/dev/usb/serial/uslcom.c Thu Apr 29 22:44:04 2010 (r207399) @@ -50,7 +50,7 @@ __FBSDID("$FreeBSD$"); #include -#if USB_DEBUG +#ifdef USB_DEBUG static int uslcom_debug = 0; SYSCTL_NODE(_hw_usb, OID_AUTO, uslcom, CTLFLAG_RW, 0, "USB uslcom"); Modified: stable/8/sys/dev/usb/serial/uvisor.c ============================================================================== --- stable/8/sys/dev/usb/serial/uvisor.c Thu Apr 29 22:42:18 2010 (r207398) +++ stable/8/sys/dev/usb/serial/uvisor.c Thu Apr 29 22:44:04 2010 (r207399) @@ -85,7 +85,7 @@ #include -#if USB_DEBUG +#ifdef USB_DEBUG static int uvisor_debug = 0; SYSCTL_NODE(_hw_usb, OID_AUTO, uvisor, CTLFLAG_RW, 0, "USB uvisor"); @@ -399,7 +399,7 @@ uvisor_init(struct uvisor_softc *sc, str goto done; } } -#if USB_DEBUG +#ifdef USB_DEBUG if (sc->sc_flag & UVISOR_FLAG_VISOR) { uint16_t i, np; const char *desc; Modified: stable/8/sys/dev/usb/serial/uvscom.c ============================================================================== --- stable/8/sys/dev/usb/serial/uvscom.c Thu Apr 29 22:42:18 2010 (r207398) +++ stable/8/sys/dev/usb/serial/uvscom.c Thu Apr 29 22:44:04 2010 (r207399) @@ -68,7 +68,7 @@ __FBSDID("$FreeBSD$"); #include -#if USB_DEBUG +#ifdef USB_DEBUG static int uvscom_debug = 0; SYSCTL_NODE(_hw_usb, OID_AUTO, uvscom, CTLFLAG_RW, 0, "USB uvscom"); Modified: stable/8/sys/dev/usb/storage/umass.c ============================================================================== --- stable/8/sys/dev/usb/storage/umass.c Thu Apr 29 22:42:18 2010 (r207398) +++ stable/8/sys/dev/usb/storage/umass.c Thu Apr 29 22:44:04 2010 (r207399) @@ -146,7 +146,7 @@ __FBSDID("$FreeBSD$"); #define UMASS_USB_FLAGS #endif -#if USB_DEBUG +#ifdef USB_DEBUG #define DIF(m, x) \ do { \ if (umass_debug & (m)) { x ; } \ @@ -488,7 +488,7 @@ static uint8_t umass_no_transform(struct static uint8_t umass_std_transform(struct umass_softc *, union ccb *, uint8_t *, uint8_t); -#if USB_DEBUG +#ifdef USB_DEBUG static void umass_bbb_dump_cbw(struct umass_softc *, umass_bbb_cbw_t *); static void umass_bbb_dump_csw(struct umass_softc *, umass_bbb_csw_t *); static void umass_cbi_dump_cmd(struct umass_softc *, void *, uint8_t); @@ -917,7 +917,7 @@ umass_attach(device_t dev) } sc->sc_iface_no = id->bInterfaceNumber; -#if USB_DEBUG +#ifdef USB_DEBUG device_printf(dev, " "); switch (sc->sc_proto & UMASS_PROTO_COMMAND) { @@ -3012,7 +3012,7 @@ umass_std_transform(struct umass_softc * return (1); } -#if USB_DEBUG +#ifdef USB_DEBUG static void umass_bbb_dump_cbw(struct umass_softc *sc, umass_bbb_cbw_t *cbw) { Modified: stable/8/sys/dev/usb/storage/urio.c ============================================================================== --- stable/8/sys/dev/usb/storage/urio.c Thu Apr 29 22:42:18 2010 (r207398) +++ stable/8/sys/dev/usb/storage/urio.c Thu Apr 29 22:44:04 2010 (r207399) @@ -78,7 +78,7 @@ __FBSDID("$FreeBSD$"); #include -#if USB_DEBUG +#ifdef USB_DEBUG static int urio_debug = 0; SYSCTL_NODE(_hw_usb, OID_AUTO, urio, CTLFLAG_RW, 0, "USB urio"); Modified: stable/8/sys/dev/usb/storage/ustorage_fs.c ============================================================================== --- stable/8/sys/dev/usb/storage/ustorage_fs.c Thu Apr 29 22:42:18 2010 (r207398) +++ stable/8/sys/dev/usb/storage/ustorage_fs.c Thu Apr 29 22:44:04 2010 (r207399) @@ -64,7 +64,7 @@ #define USB_DEBUG_VAR ustorage_fs_debug #include -#if USB_DEBUG +#ifdef USB_DEBUG static int ustorage_fs_debug = 0; SYSCTL_NODE(_hw_usb, OID_AUTO, ustorage_fs, CTLFLAG_RW, 0, "USB ustorage_fs"); Modified: stable/8/sys/dev/usb/usb_debug.h ============================================================================== --- stable/8/sys/dev/usb/usb_debug.h Thu Apr 29 22:42:18 2010 (r207398) +++ stable/8/sys/dev/usb/usb_debug.h Thu Apr 29 22:44:04 2010 (r207399) @@ -34,7 +34,7 @@ extern int usb_debug; /* Check if USB debugging is enabled. */ #ifdef USB_DEBUG_VAR -#if (USB_DEBUG != 0) +#ifdef USB_DEBUG #define DPRINTFN(n,fmt,...) do { \ if ((USB_DEBUG_VAR) >= (n)) { \ printf("%s: " fmt, \ Modified: stable/8/sys/dev/usb/usb_freebsd.h ============================================================================== --- stable/8/sys/dev/usb/usb_freebsd.h Thu Apr 29 22:42:18 2010 (r207398) +++ stable/8/sys/dev/usb/usb_freebsd.h Thu Apr 29 22:44:04 2010 (r207399) @@ -57,10 +57,6 @@ #define USB_HUB_MAX_DEPTH 5 #define USB_EP0_BUFSIZE 1024 /* bytes */ -#ifndef USB_DEBUG -#define USB_DEBUG 1 -#endif - typedef uint32_t usb_timeout_t; /* milliseconds */ typedef uint32_t usb_frlength_t; /* bytes */ typedef uint32_t usb_frcount_t; /* units */ Modified: stable/8/sys/dev/usb/usb_request.c ============================================================================== --- stable/8/sys/dev/usb/usb_request.c Thu Apr 29 22:42:18 2010 (r207398) +++ stable/8/sys/dev/usb/usb_request.c Thu Apr 29 22:44:04 2010 (r207399) @@ -68,7 +68,7 @@ #include #include -#if USB_DEBUG +#ifdef USB_DEBUG static int usb_pr_poll_delay = USB_PORT_RESET_DELAY; static int usb_pr_recovery_delay = USB_PORT_RESET_RECOVERY; static int usb_ss_delay = 0; @@ -433,7 +433,7 @@ usbd_do_request_flags(struct usb_device } else { if (xfer->frlengths[0] == 0) { if (xfer->flags.manual_status) { -#if USB_DEBUG +#ifdef USB_DEBUG int temp; temp = usb_ss_delay; @@ -603,7 +603,7 @@ usbd_req_reset_port(struct usb_device *u usb_error_t err; uint16_t n; -#if USB_DEBUG +#ifdef USB_DEBUG uint16_t pr_poll_delay; uint16_t pr_recovery_delay; *** DIFF OUTPUT TRUNCATED AT 1000 LINES ***