Date: Sun, 14 Sep 2008 16:31:59 GMT From: Hans Petter Selasky <hselasky@FreeBSD.org> To: Perforce Change Reviews <perforce@FreeBSD.org> Subject: PERFORCE change 149759 for review Message-ID: <200809141631.m8EGVxNk004885@repoman.freebsd.org>
next in thread | raw e-mail | index | archive | help
http://perforce.freebsd.org/chv.cgi?CH=149759 Change 149759 by hselasky@hselasky_laptop001 on 2008/09/14 16:31:05 Change #ifdef into #if when testing for debugging enabled. This makes it easier to override the default debugging value, and it is easier to track when USB_DEBUG is not defined. Affected files ... .. //depot/projects/usb/src/sys/dev/usb2/controller/at91dci.c#12 edit .. //depot/projects/usb/src/sys/dev/usb2/controller/ehci2.c#13 edit .. //depot/projects/usb/src/sys/dev/usb2/controller/musb2_otg.c#13 edit .. //depot/projects/usb/src/sys/dev/usb2/controller/ohci2.c#12 edit .. //depot/projects/usb/src/sys/dev/usb2/controller/uhci2.c#10 edit .. //depot/projects/usb/src/sys/dev/usb2/controller/uhci2_pci.c#9 edit .. //depot/projects/usb/src/sys/dev/usb2/controller/usb2_controller.c#11 edit .. //depot/projects/usb/src/sys/dev/usb2/controller/uss820dci.c#11 edit .. //depot/projects/usb/src/sys/dev/usb2/core/usb2_core.h#19 edit .. //depot/projects/usb/src/sys/dev/usb2/core/usb2_debug.h#6 edit .. //depot/projects/usb/src/sys/dev/usb2/core/usb2_dev.c#30 edit .. //depot/projects/usb/src/sys/dev/usb2/core/usb2_device.c#25 edit .. //depot/projects/usb/src/sys/dev/usb2/core/usb2_generic.c#25 edit .. //depot/projects/usb/src/sys/dev/usb2/core/usb2_hub.c#16 edit .. //depot/projects/usb/src/sys/dev/usb2/core/usb2_process.c#8 edit .. //depot/projects/usb/src/sys/dev/usb2/core/usb2_request.c#17 edit .. //depot/projects/usb/src/sys/dev/usb2/core/usb2_transfer.c#26 edit .. //depot/projects/usb/src/sys/dev/usb2/ethernet/if_aue2.c#8 edit .. //depot/projects/usb/src/sys/dev/usb2/ethernet/if_axe2.c#8 edit .. //depot/projects/usb/src/sys/dev/usb2/ethernet/if_cdce2.c#8 edit .. //depot/projects/usb/src/sys/dev/usb2/ethernet/if_cue2.c#8 edit .. //depot/projects/usb/src/sys/dev/usb2/ethernet/if_kue2.c#8 edit .. //depot/projects/usb/src/sys/dev/usb2/ethernet/if_rue2.c#8 edit .. //depot/projects/usb/src/sys/dev/usb2/ethernet/if_udav2.c#8 edit .. //depot/projects/usb/src/sys/dev/usb2/image/uscanner2.c#7 edit .. //depot/projects/usb/src/sys/dev/usb2/input/uhid2.c#8 edit .. //depot/projects/usb/src/sys/dev/usb2/input/ukbd2.c#7 edit .. //depot/projects/usb/src/sys/dev/usb2/input/ums2.c#8 edit .. //depot/projects/usb/src/sys/dev/usb2/misc/udbp2.c#7 edit .. //depot/projects/usb/src/sys/dev/usb2/serial/ubsa2.c#7 edit .. //depot/projects/usb/src/sys/dev/usb2/serial/ubser2.c#6 edit .. //depot/projects/usb/src/sys/dev/usb2/serial/uchcom2.c#6 edit .. //depot/projects/usb/src/sys/dev/usb2/serial/uftdi2.c#6 edit .. //depot/projects/usb/src/sys/dev/usb2/serial/ulpt2.c#6 edit .. //depot/projects/usb/src/sys/dev/usb2/serial/umodem2.c#7 edit .. //depot/projects/usb/src/sys/dev/usb2/serial/umoscom2.c#6 edit .. //depot/projects/usb/src/sys/dev/usb2/serial/uplcom2.c#7 edit .. //depot/projects/usb/src/sys/dev/usb2/serial/usb2_serial.c#13 edit .. //depot/projects/usb/src/sys/dev/usb2/serial/uvisor2.c#6 edit .. //depot/projects/usb/src/sys/dev/usb2/serial/uvscom2.c#6 edit .. //depot/projects/usb/src/sys/dev/usb2/sound/uaudio2.c#12 edit .. //depot/projects/usb/src/sys/dev/usb2/storage/umass2.c#9 edit .. //depot/projects/usb/src/sys/dev/usb2/storage/urio2.c#7 edit .. //depot/projects/usb/src/sys/dev/usb2/storage/ustorage2_fs.c#9 edit .. //depot/projects/usb/src/sys/dev/usb2/wlan/if_rum2.c#12 edit .. //depot/projects/usb/src/sys/dev/usb2/wlan/if_ural2.c#12 edit .. //depot/projects/usb/src/sys/dev/usb2/wlan/if_zyd2.c#13 edit Differences ... ==== //depot/projects/usb/src/sys/dev/usb2/controller/at91dci.c#12 (text+ko) ==== @@ -75,7 +75,7 @@ #define AT9100_DCI_PC2SC(pc) \ AT9100_DCI_BUS2SC((pc)->tag_parent->info->bus) -#ifdef USB_DEBUG +#if USB_DEBUG static int at91dcidebug = 0; SYSCTL_NODE(_hw_usb2, OID_AUTO, at91dci, CTLFLAG_RW, 0, "USB at91dci"); ==== //depot/projects/usb/src/sys/dev/usb2/controller/ehci2.c#13 (text+ko) ==== @@ -73,7 +73,7 @@ #define EHCI_BUS2SC(bus) ((ehci_softc_t *)(((uint8_t *)(bus)) - \ USB_P2U(&(((ehci_softc_t *)0)->sc_bus)))) -#ifdef USB_DEBUG +#if USB_DEBUG static int ehcidebug = 0; SYSCTL_NODE(_hw_usb2, OID_AUTO, ehci, CTLFLAG_RW, 0, "USB ehci"); @@ -212,7 +212,7 @@ usb2_callout_init_mtx(&sc->sc_tmo_pcd, &sc->sc_bus.mtx, CALLOUT_RETURNUNLOCKED); -#ifdef USB_DEBUG +#if USB_DEBUG if (ehcidebug > 2) { ehci_dump_regs(sc); } @@ -437,7 +437,7 @@ usb2_bus_mem_flush_all(&sc->sc_bus, &ehci_iterate_hw_softc); -#ifdef USB_DEBUG +#if USB_DEBUG if (ehcidebug) { ehci_dump_sqh(sc->sc_async_p_last); } @@ -644,7 +644,7 @@ mtx_unlock(&sc->sc_bus.mtx); } -#ifdef USB_DEBUG +#if USB_DEBUG static void ehci_dump_regs(ehci_softc_t *sc) { @@ -1051,7 +1051,7 @@ usb2_pc_cpu_flush(last->page_cache); -#ifdef USB_DEBUG +#if USB_DEBUG if (ehcidebug > 5) { printf("%s:\n", __FUNCTION__); ehci_dump_sqh(sqh); @@ -1213,7 +1213,7 @@ xfer->pipe->toggle_next = (status & EHCI_QTD_TOGGLE_MASK) ? 1 : 0; -#ifdef USB_DEBUG +#if 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", @@ -1241,7 +1241,7 @@ DPRINTFN(13, "xfer=%p pipe=%p transfer done\n", xfer, xfer->pipe); -#ifdef USB_DEBUG +#if USB_DEBUG if (ehcidebug > 10) { ehci_dump_sqtds(xfer->td_transfer_first); } @@ -1461,7 +1461,7 @@ DPRINTFN(16, "real interrupt\n"); -#ifdef USB_DEBUG +#if USB_DEBUG if (ehcidebug > 15) { ehci_dump_regs(sc); } @@ -1482,7 +1482,7 @@ if (status & EHCI_STS_HSE) { printf("%s: unrecoverable error, " "controller halted\n", __FUNCTION__); -#ifdef USB_DEBUG +#if USB_DEBUG ehci_dump_regs(sc); ehci_dump_isoc(sc); #endif @@ -1876,7 +1876,7 @@ xfer->td_transfer_last = td; -#ifdef USB_DEBUG +#if USB_DEBUG if (ehcidebug > 8) { DPRINTF("nexttog=%d; data before transfer:\n", xfer->pipe->toggle_next); @@ -2015,7 +2015,7 @@ if (pp_last >= &sc->sc_isoc_fs_p_last[EHCI_VIRTUAL_FRAMELIST_COUNT]) { pp_last = &sc->sc_isoc_fs_p_last[0]; } -#ifdef USB_DEBUG +#if USB_DEBUG if (ehcidebug > 15) { DPRINTF("isoc FS-TD\n"); ehci_dump_sitd(td); @@ -2069,7 +2069,7 @@ if (pp_last >= &sc->sc_isoc_hs_p_last[EHCI_VIRTUAL_FRAMELIST_COUNT]) { pp_last = &sc->sc_isoc_hs_p_last[0]; } -#ifdef USB_DEBUG +#if USB_DEBUG if (ehcidebug > 15) { DPRINTF("isoc HS-TD\n"); ehci_dump_itd(td); @@ -2128,7 +2128,7 @@ if ((methods == &ehci_device_bulk_methods) || (methods == &ehci_device_ctrl_methods)) { -#ifdef USB_DEBUG +#if USB_DEBUG if (ehcidebug > 8) { DPRINTF("nexttog=%d; data after transfer:\n", xfer->pipe->toggle_next); @@ -2426,7 +2426,7 @@ uint8_t sb; uint8_t error; -#ifdef USB_DEBUG +#if USB_DEBUG uint8_t once = 1; #endif @@ -2510,7 +2510,7 @@ /* reuse sitd_portaddr and sitd_back from last transfer */ if (*plen > xfer->max_frame_size) { -#ifdef USB_DEBUG +#if USB_DEBUG if (once) { once = 0; printf("%s: frame length(%d) exceeds %d " @@ -2600,7 +2600,7 @@ } usb2_pc_cpu_flush(td->page_cache); -#ifdef USB_DEBUG +#if USB_DEBUG if (ehcidebug > 15) { DPRINTF("FS-TD %d\n", nframes); ehci_dump_sitd(td); @@ -2718,7 +2718,7 @@ uint8_t td_no; uint8_t page_no; -#ifdef USB_DEBUG +#if USB_DEBUG uint8_t once = 1; #endif @@ -2796,7 +2796,7 @@ } /* range check */ if (*plen > xfer->max_frame_size) { -#ifdef USB_DEBUG +#if USB_DEBUG if (once) { once = 0; printf("%s: frame length(%d) exceeds %d bytes " @@ -2872,7 +2872,7 @@ td->itd_status[7] |= htole32(EHCI_ITD_IOC); } usb2_pc_cpu_flush(td->page_cache); -#ifdef USB_DEBUG +#if USB_DEBUG if (ehcidebug > 15) { DPRINTF("HS-TD %d\n", nframes); ehci_dump_itd(td); ==== //depot/projects/usb/src/sys/dev/usb2/controller/musb2_otg.c#13 (text+ko) ==== @@ -64,7 +64,7 @@ #define MUSBOTG_PC2SC(pc) \ MUSBOTG_BUS2SC((pc)->tag_parent->info->bus) -#ifdef USB_DEBUG +#if USB_DEBUG static int musbotgdebug = 0; SYSCTL_NODE(_hw_usb2, OID_AUTO, musbotg, CTLFLAG_RW, 0, "USB musbotg"); ==== //depot/projects/usb/src/sys/dev/usb2/controller/ohci2.c#12 (text+ko) ==== @@ -62,7 +62,7 @@ #define OHCI_BUS2SC(bus) ((ohci_softc_t *)(((uint8_t *)(bus)) - \ USB_P2U(&(((ohci_softc_t *)0)->sc_bus)))) -#ifdef USB_DEBUG +#if USB_DEBUG static int ohcidebug = 0; SYSCTL_NODE(_hw_usb2, OID_AUTO, ohci, CTLFLAG_RW, 0, "USB ohci"); @@ -216,7 +216,7 @@ device_printf(sc->sc_bus.bdev, "reset timeout\n"); return (USB_ERR_IOERROR); } -#ifdef USB_DEBUG +#if USB_DEBUG if (ohcidebug > 15) { ohci_dumpregs(sc); } @@ -275,7 +275,7 @@ sc->sc_noport = OHCI_GET_NDP(OREAD4(sc, OHCI_RH_DESCRIPTOR_A)); } -#ifdef USB_DEBUG +#if USB_DEBUG if (ohcidebug > 5) { ohci_dumpregs(sc); } @@ -394,7 +394,7 @@ usb2_callout_init_mtx(&sc->sc_tmo_rhsc, &sc->sc_bus.mtx, CALLOUT_RETURNUNLOCKED); -#ifdef USB_DEBUG +#if USB_DEBUG if (ohcidebug > 15) { for (i = 0; i != OHCI_NO_EDS; i++) { printf("ed#%d ", i); @@ -451,7 +451,7 @@ mtx_lock(&sc->sc_bus.mtx); -#ifdef USB_DEBUG +#if USB_DEBUG DPRINTF("\n"); if (ohcidebug > 2) { ohci_dumpregs(sc); @@ -484,7 +484,7 @@ mtx_lock(&sc->sc_bus.mtx); -#ifdef USB_DEBUG +#if USB_DEBUG DPRINTF("\n"); if (ohcidebug > 2) { ohci_dumpregs(sc); @@ -517,7 +517,7 @@ return; } -#ifdef USB_DEBUG +#if USB_DEBUG static void ohci_dumpregs(ohci_softc_t *sc) { @@ -772,7 +772,7 @@ panic("%s:%d: out of TD's\n", __FUNCTION__, __LINE__); } -#ifdef USB_DEBUG +#if USB_DEBUG if (ohcidebug > 5) { DPRINTF("isoc TD\n"); ohci_dump_itd(td); @@ -814,7 +814,7 @@ return; } -#ifdef USB_DEBUG +#if USB_DEBUG static const char *const ohci_cc_strs[] = { @@ -934,7 +934,7 @@ DPRINTFN(13, "xfer=%p pipe=%p transfer done\n", xfer, xfer->pipe); -#ifdef USB_DEBUG +#if USB_DEBUG if (ohcidebug > 10) { ohci_dump_tds(xfer->td_transfer_first); } @@ -1152,7 +1152,7 @@ DPRINTFN(16, "real interrupt\n"); -#ifdef USB_DEBUG +#if USB_DEBUG if (ohcidebug > 15) { ohci_dumpregs(sc); } @@ -1568,7 +1568,7 @@ xfer->td_transfer_last = td; -#ifdef USB_DEBUG +#if USB_DEBUG if (ohcidebug > 8) { DPRINTF("nexttog=%d; data before transfer:\n", xfer->pipe->toggle_next); @@ -2022,7 +2022,7 @@ xfer->td_transfer_last = td_last; -#ifdef USB_DEBUG +#if USB_DEBUG if (ohcidebug > 8) { DPRINTF("data before transfer:\n"); ohci_dump_itds(xfer->td_transfer_first); ==== //depot/projects/usb/src/sys/dev/usb2/controller/uhci2.c#10 (text+ko) ==== @@ -66,7 +66,7 @@ #define UHCI_BUS2SC(bus) ((uhci_softc_t *)(((uint8_t *)(bus)) - \ USB_P2U(&(((uhci_softc_t *)0)->sc_bus)))) -#ifdef USB_DEBUG +#if USB_DEBUG static int uhcidebug = 0; static int uhcinoloop = 0; @@ -420,7 +420,7 @@ DPRINTF("start\n"); -#ifdef USB_DEBUG +#if USB_DEBUG if (uhcidebug > 2) { uhci_dumpregs(sc); } @@ -630,7 +630,7 @@ { mtx_lock(&sc->sc_bus.mtx); -#ifdef USB_DEBUG +#if USB_DEBUG if (uhcidebug > 2) { uhci_dumpregs(sc); } @@ -674,7 +674,7 @@ uhci_start(sc); -#ifdef USB_DEBUG +#if USB_DEBUG if (uhcidebug > 2) { uhci_dumpregs(sc); } @@ -688,7 +688,7 @@ return; } -#ifdef USB_DEBUG +#if USB_DEBUG static void uhci_dumpregs(uhci_softc_t *sc) { @@ -851,7 +851,7 @@ struct uhci_qh *qh_lst; struct uhci_qh *qh_rec; -#ifdef USB_DEBUG +#if USB_DEBUG if (uhcinoloop) { return; } @@ -875,7 +875,7 @@ { struct uhci_qh *qh_lst; -#ifdef USB_DEBUG +#if USB_DEBUG if (uhcinoloop) { return; } @@ -1050,7 +1050,7 @@ if (pp_last >= &sc->sc_isoc_p_last[UHCI_VFRAMELIST_COUNT]) { pp_last = &sc->sc_isoc_p_last[0]; } -#ifdef USB_DEBUG +#if USB_DEBUG if (uhcidebug > 5) { DPRINTF("isoc TD\n"); uhci_dump_td(td); @@ -1183,7 +1183,7 @@ xfer->pipe->toggle_next = (token & UHCI_TD_SET_DT(1)) ? 0 : 1; -#ifdef USB_DEBUG +#if 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", @@ -1213,7 +1213,7 @@ DPRINTFN(13, "xfer=%p pipe=%p transfer done\n", xfer, xfer->pipe); -#ifdef USB_DEBUG +#if USB_DEBUG if (uhcidebug > 10) { uhci_dump_tds(xfer->td_transfer_first); } @@ -1452,7 +1452,7 @@ DPRINTFN(16, "real interrupt\n"); -#ifdef USB_DEBUG +#if USB_DEBUG if (uhcidebug > 15) { uhci_dumpregs(sc); } @@ -1466,7 +1466,7 @@ UHCI_STS_HCPE | UHCI_STS_HCH)) { if (status & UHCI_STS_RD) { -#ifdef USB_DEBUG +#if USB_DEBUG printf("%s: resume detect\n", __FUNCTION__); #endif @@ -1483,7 +1483,7 @@ /* no acknowledge needed */ printf("%s: host controller halted\n", __FUNCTION__); -#ifdef USB_DEBUG +#if USB_DEBUG uhci_dump_all(sc); #endif } @@ -1836,7 +1836,7 @@ xfer->td_transfer_last = td; -#ifdef USB_DEBUG +#if USB_DEBUG if (uhcidebug > 8) { DPRINTF("nexttog=%d; data before transfer:\n", xfer->pipe->toggle_next); @@ -2152,7 +2152,7 @@ uint32_t temp; uint32_t *plen; -#ifdef USB_DEBUG +#if USB_DEBUG uint8_t once = 1; #endif @@ -2224,7 +2224,7 @@ pp_last = &sc->sc_isoc_p_last[0]; } if (*plen > xfer->max_frame_size) { -#ifdef USB_DEBUG +#if USB_DEBUG if (once) { once = 0; printf("%s: frame length(%d) exceeds %d " @@ -2276,7 +2276,7 @@ usb2_pc_cpu_flush(td->page_cache); -#ifdef USB_DEBUG +#if USB_DEBUG if (uhcidebug > 5) { DPRINTF("TD %d\n", nframes); uhci_dump_td(td); ==== //depot/projects/usb/src/sys/dev/usb2/controller/uhci2_pci.c#9 (text+ko) ==== @@ -58,6 +58,7 @@ #include <dev/usb2/core/usb2_config_td.h> #include <dev/usb2/core/usb2_sw_transfer.h> #include <dev/usb2/core/usb2_util.h> +#include <dev/usb2/core/usb2_debug.h> #include <dev/usb2/controller/usb2_controller.h> #include <dev/usb2/controller/usb2_bus.h> @@ -345,7 +346,7 @@ * that the BIOS won't touch the keyboard anymore if it is connected * to the ports of the root hub? */ -#ifdef USB_DEBUG +#if USB_DEBUG if (pci_read_config(self, PCI_LEGSUP, 2) != PCI_LEGSUP_USBPIRQDEN) { device_printf(self, "LegSup = 0x%04x\n", pci_read_config(self, PCI_LEGSUP, 2)); ==== //depot/projects/usb/src/sys/dev/usb2/controller/usb2_controller.c#11 (text+ko) ==== @@ -56,7 +56,7 @@ /* static variables */ -#ifdef USB_DEBUG +#if USB_DEBUG static int usb2_ctrl_debug = 0; SYSCTL_NODE(_hw_usb2, OID_AUTO, ctrl, CTLFLAG_RW, 0, "USB controller"); ==== //depot/projects/usb/src/sys/dev/usb2/controller/uss820dci.c#11 (text+ko) ==== @@ -64,7 +64,7 @@ #define USS820_DCI_PC2SC(pc) \ USS820_DCI_BUS2SC((pc)->tag_parent->info->bus) -#ifdef USB_DEBUG +#if USB_DEBUG static int uss820dcidebug = 0; SYSCTL_NODE(_hw_usb2, OID_AUTO, uss820dci, CTLFLAG_RW, 0, "USB uss820dci"); ==== //depot/projects/usb/src/sys/dev/usb2/core/usb2_core.h#19 (text+ko) ==== @@ -115,7 +115,9 @@ #define USB_MAX_IPACKET 8 /* maximum size of the initial USB * data packet */ -#define USB_VERBOSE +#ifndef USB_VERBOSE +#define USB_VERBOSE 1 +#endif #define USB_HUB_MAX_DEPTH 5 ==== //depot/projects/usb/src/sys/dev/usb2/core/usb2_debug.h#6 (text+ko) ==== ==== //depot/projects/usb/src/sys/dev/usb2/core/usb2_dev.c#30 (text+ko) ==== @@ -55,7 +55,7 @@ #include <machine/stdarg.h> -#ifdef USB_DEBUG +#if USB_DEBUG static int usb2_fifo_debug = 0; SYSCTL_NODE(_hw_usb2, OID_AUTO, dev, CTLFLAG_RW, 0, "USB device"); ==== //depot/projects/usb/src/sys/dev/usb2/core/usb2_device.c#25 (text+ko) ==== @@ -1356,7 +1356,7 @@ hub = udev->parent_hub; if (hub) { if (usb2_hub_speed_combs[hub->speed][speed] == 0) { -#ifdef USB_DEBUG +#if USB_DEBUG printf("%s: the selected subdevice and HUB speed " "combination is not supported %d/%d.\n", __FUNCTION__, speed, hub->speed); @@ -1827,7 +1827,7 @@ return; } -#ifdef USB_VERBOSE +#if USB_VERBOSE /* * Descriptions of of known vendors and devices ("products"). */ @@ -1858,7 +1858,7 @@ const char *vendor; const char *product; -#ifdef USB_VERBOSE +#if USB_VERBOSE const struct usb_knowndev *kdp; #endif @@ -1883,7 +1883,7 @@ vendor_id = UGETW(udd->idVendor); product_id = UGETW(udd->idProduct); -#ifdef USB_VERBOSE +#if USB_VERBOSE if (vendor == NULL || product == NULL) { for (kdp = usb_knowndevs; ==== //depot/projects/usb/src/sys/dev/usb2/core/usb2_generic.c#25 (text+ko) ==== @@ -98,7 +98,7 @@ .f_stop_write = &ugen_stop_io, }; -#ifdef USB_DEBUG +#if USB_DEBUG static int ugen_debug = 0; SYSCTL_NODE(_hw_usb2, OID_AUTO, ugen, CTLFLAG_RW, 0, "USB generic"); ==== //depot/projects/usb/src/sys/dev/usb2/core/usb2_hub.c#16 (text+ko) ==== @@ -53,7 +53,7 @@ #define UHUB_INTR_INTERVAL 250 /* ms */ -#ifdef USB_DEBUG +#if USB_DEBUG static int uhub_debug = 0; SYSCTL_NODE(_hw_usb2, OID_AUTO, uhub, CTLFLAG_RW, 0, "USB HUB"); ==== //depot/projects/usb/src/sys/dev/usb2/core/usb2_process.c#8 (text+ko) ==== @@ -52,7 +52,7 @@ #define USB_THREAD_EXIT(err) kthread_exit(err) #endif -#ifdef USB_DEBUG +#if USB_DEBUG static int usb2_proc_debug; SYSCTL_NODE(_hw_usb2, OID_AUTO, proc, CTLFLAG_RW, 0, "USB process"); ==== //depot/projects/usb/src/sys/dev/usb2/core/usb2_request.c#17 (text+ko) ==== @@ -47,7 +47,7 @@ #include <sys/ctype.h> -#ifdef USB_DEBUG +#if USB_DEBUG static int usb2_pr_poll_delay = USB_PORT_RESET_DELAY; static int usb2_pr_recovery_delay = USB_PORT_RESET_RECOVERY; static int usb2_ss_delay = 0; @@ -358,7 +358,7 @@ } else { if (xfer->frlengths[0] == 0) { if (xfer->flags.manual_status) { -#ifdef USB_DEBUG +#if USB_DEBUG int temp; temp = usb2_ss_delay; @@ -489,7 +489,7 @@ usb2_error_t err; uint16_t n; -#ifdef USB_DEBUG +#if USB_DEBUG uint16_t pr_poll_delay; uint16_t pr_recovery_delay; @@ -498,7 +498,7 @@ if (err) { goto done; } -#ifdef USB_DEBUG +#if USB_DEBUG /* range check input parameters */ pr_poll_delay = usb2_pr_poll_delay; if (pr_poll_delay < 1) { @@ -513,7 +513,7 @@ #endif n = 0; while (1) { -#ifdef USB_DEBUG +#if USB_DEBUG /* wait for the device to recover from reset */ usb2_pause_mtx(mtx, pr_poll_delay); n += pr_poll_delay; @@ -552,7 +552,7 @@ err = USB_ERR_TIMEOUT; goto done; } -#ifdef USB_DEBUG +#if USB_DEBUG /* wait for the device to recover from reset */ usb2_pause_mtx(mtx, pr_recovery_delay); #else ==== //depot/projects/usb/src/sys/dev/usb2/core/usb2_transfer.c#26 (text+ko) ==== @@ -1278,7 +1278,7 @@ xfer, xfer->pipe, xfer->nframes, USB_GET_DATA_ISREAD(xfer) ? "read" : "write"); -#ifdef USB_DEBUG +#if USB_DEBUG if (USB_DEBUG_VAR > 0) { mtx_lock(xfer->usb2_mtx); ==== //depot/projects/usb/src/sys/dev/usb2/ethernet/if_aue2.c#8 (text+ko) ==== @@ -93,7 +93,7 @@ MODULE_DEPEND(aue, ether, 1, 1, 1); MODULE_DEPEND(aue, miibus, 1, 1, 1); -#ifdef USB_DEBUG +#if USB_DEBUG static int aue_debug = 0; SYSCTL_NODE(_hw_usb2, OID_AUTO, aue, CTLFLAG_RW, 0, "USB aue"); ==== //depot/projects/usb/src/sys/dev/usb2/ethernet/if_axe2.c#8 (text+ko) ==== @@ -107,7 +107,7 @@ MODULE_DEPEND(axe, ether, 1, 1, 1); MODULE_DEPEND(axe, miibus, 1, 1, 1); -#ifdef USB_DEBUG +#if USB_DEBUG static int axe_debug = 0; SYSCTL_NODE(_hw_usb2, OID_AUTO, axe, CTLFLAG_RW, 0, "USB axe"); ==== //depot/projects/usb/src/sys/dev/usb2/ethernet/if_cdce2.c#8 (text+ko) ==== @@ -90,7 +90,7 @@ static int cdce_ifmedia_upd_cb(struct ifnet *ifp); static void cdce_ifmedia_sts_cb(struct ifnet *const ifp, struct ifmediareq *req); -#ifdef USB_DEBUG +#if USB_DEBUG static int cdce_debug = 0; static int cdce_force_512x4 = 0; @@ -286,7 +286,7 @@ } /* get the interface subclass we are using */ sc->sc_iface_protocol = uaa->iface->idesc->bInterfaceProtocol; -#ifdef USB_DEBUG +#if USB_DEBUG if (cdce_force_512x4) { sc->sc_iface_protocol = UIPROTO_CDC_ETH_512X4; } ==== //depot/projects/usb/src/sys/dev/usb2/ethernet/if_cue2.c#8 (text+ko) ==== @@ -125,7 +125,7 @@ static int cue_ioctl_cb(struct ifnet *ifp, u_long command, caddr_t data); static void cue_watchdog(void *arg); -#ifdef USB_DEBUG +#if USB_DEBUG static int cue_debug = 0; SYSCTL_NODE(_hw_usb2, OID_AUTO, cue, CTLFLAG_RW, 0, "USB cue"); ==== //depot/projects/usb/src/sys/dev/usb2/ethernet/if_kue2.c#8 (text+ko) ==== @@ -165,7 +165,7 @@ static int kue_ioctl_cb(struct ifnet *ifp, u_long command, caddr_t data); static void kue_watchdog(void *arg); -#ifdef USB_DEBUG +#if USB_DEBUG static int kue_debug = 0; SYSCTL_NODE(_hw_usb2, OID_AUTO, kue, CTLFLAG_RW, 0, "USB kue"); ==== //depot/projects/usb/src/sys/dev/usb2/ethernet/if_rue2.c#8 (text+ko) ==== @@ -92,7 +92,7 @@ #include <dev/usb2/ethernet/usb2_ethernet.h> #include <dev/usb2/ethernet/if_rue2_reg.h> -#ifdef USB_DEBUG +#if USB_DEBUG static int rue_debug = 0; SYSCTL_NODE(_hw_usb2, OID_AUTO, rue, CTLFLAG_RW, 0, "USB rue"); ==== //depot/projects/usb/src/sys/dev/usb2/ethernet/if_udav2.c#8 (text+ko) ==== @@ -213,7 +213,7 @@ MODULE_DEPEND(udav, ether, 1, 1, 1); MODULE_DEPEND(udav, miibus, 1, 1, 1); -#ifdef USB_DEBUG +#if USB_DEBUG static int udav_debug = 0; SYSCTL_NODE(_hw_usb2, OID_AUTO, udav, CTLFLAG_RW, 0, "USB udav"); ==== //depot/projects/usb/src/sys/dev/usb2/image/uscanner2.c#7 (text+ko) ==== @@ -63,7 +63,7 @@ #include <dev/usb2/core/usb2_mbuf.h> #include <dev/usb2/core/usb2_dev.h> -#ifdef USB_DEBUG +#if USB_DEBUG static int uscanner_debug = 0; SYSCTL_NODE(_hw_usb2, OID_AUTO, uscanner, CTLFLAG_RW, 0, "USB uscanner"); ==== //depot/projects/usb/src/sys/dev/usb2/input/uhid2.c#8 (text+ko) ==== @@ -74,7 +74,7 @@ #include <dev/usb2/quirk/usb2_quirk.h> -#ifdef USB_DEBUG +#if USB_DEBUG static int uhid_debug = 0; SYSCTL_NODE(_hw_usb2, OID_AUTO, uhid, CTLFLAG_RW, 0, "USB uhid"); ==== //depot/projects/usb/src/sys/dev/usb2/input/ukbd2.c#7 (text+ko) ==== @@ -85,7 +85,7 @@ /* the following file must be included after "ukbdmap.h" */ #include <dev/kbd/kbdtables.h> -#ifdef USB_DEBUG +#if USB_DEBUG static int ukbd_debug = 0; SYSCTL_NODE(_hw_usb2, OID_AUTO, ukbd, CTLFLAG_RW, 0, "USB ukbd"); @@ -487,7 +487,7 @@ if (len) { bzero(&sc->sc_ndata, sizeof(sc->sc_ndata)); usb2_copy_out(xfer->frbuffers, 0, &sc->sc_ndata, len); -#ifdef USB_DEBUG +#if USB_DEBUG if (sc->sc_ndata.modifiers) { DPRINTF("mod: 0x%04x\n", sc->sc_ndata.modifiers); } ==== //depot/projects/usb/src/sys/dev/usb2/input/ums2.c#8 (text+ko) ==== @@ -71,7 +71,7 @@ #include <sys/tty.h> #include <sys/mouse.h> -#ifdef USB_DEBUG +#if USB_DEBUG static int ums_debug = 0; SYSCTL_NODE(_hw_usb2, OID_AUTO, ums, CTLFLAG_RW, 0, "USB ums"); @@ -579,7 +579,7 @@ free(d_ptr, M_TEMP); d_ptr = NULL; -#ifdef USB_DEBUG +#if USB_DEBUG DPRINTF("sc=%p\n", sc); DPRINTF("X\t%d/%d\n", sc->sc_loc_x.pos, sc->sc_loc_x.size); DPRINTF("Y\t%d/%d\n", sc->sc_loc_y.pos, sc->sc_loc_y.size); ==== //depot/projects/usb/src/sys/dev/usb2/misc/udbp2.c#7 (text+ko) ==== @@ -80,7 +80,7 @@ #include <dev/usb2/misc/udbp2.h> -#ifdef USB_DEBUG +#if USB_DEBUG static int udbp_debug = 0; SYSCTL_NODE(_hw_usb2, OID_AUTO, udbp, CTLFLAG_RW, 0, "USB udbp"); ==== //depot/projects/usb/src/sys/dev/usb2/serial/ubsa2.c#7 (text+ko) ==== @@ -81,7 +81,7 @@ #include <dev/usb2/serial/usb2_serial.h> -#ifdef USB_DEBUG +#if USB_DEBUG static int ubsa_debug = 0; SYSCTL_NODE(_hw_usb2, OID_AUTO, ubsa, CTLFLAG_RW, 0, "USB ubsa"); ==== //depot/projects/usb/src/sys/dev/usb2/serial/ubser2.c#6 (text+ko) ==== @@ -103,7 +103,7 @@ #define VENDOR_SET_BREAK 0x02 #define VENDOR_CLEAR_BREAK 0x03 -#ifdef USB_DEBUG +#if USB_DEBUG static int ubser_debug = 0; SYSCTL_NODE(_hw_usb2, OID_AUTO, ubser, CTLFLAG_RW, 0, "USB ubser"); ==== //depot/projects/usb/src/sys/dev/usb2/serial/uchcom2.c#6 (text+ko) ==== @@ -89,7 +89,7 @@ #include <dev/usb2/serial/usb2_serial.h> -#ifdef USB_DEBUG +#if USB_DEBUG static int uchcom_debug = 0; SYSCTL_NODE(_hw_usb2, OID_AUTO, uchcom, CTLFLAG_RW, 0, "USB uchcom"); ==== //depot/projects/usb/src/sys/dev/usb2/serial/uftdi2.c#6 (text+ko) ==== @@ -68,7 +68,7 @@ #include <dev/usb2/serial/usb2_serial.h> #include <dev/usb2/serial/uftdi2_reg.h> -#ifdef USB_DEBUG +#if USB_DEBUG static int uftdi_debug = 0; SYSCTL_NODE(_hw_usb2, OID_AUTO, uftdi, CTLFLAG_RW, 0, "USB uftdi"); ==== //depot/projects/usb/src/sys/dev/usb2/serial/ulpt2.c#6 (text+ko) ==== @@ -66,7 +66,7 @@ #include <sys/syslog.h> -#ifdef USB_DEBUG +#if USB_DEBUG static int ulpt_debug = 0; SYSCTL_NODE(_hw_usb2, OID_AUTO, ulpt, CTLFLAG_RW, 0, "USB ulpt"); ==== //depot/projects/usb/src/sys/dev/usb2/serial/umodem2.c#7 (text+ko) ==== @@ -101,7 +101,7 @@ #include <dev/usb2/serial/usb2_serial.h> -#ifdef USB_DEBUG +#if USB_DEBUG static int umodem_debug = 0; SYSCTL_NODE(_hw_usb2, OID_AUTO, umodem, CTLFLAG_RW, 0, "USB umodem"); ==== //depot/projects/usb/src/sys/dev/usb2/serial/umoscom2.c#6 (text+ko) ==== @@ -36,7 +36,7 @@ #include <dev/usb2/serial/usb2_serial.h> -#ifdef USB_DEBUG >>> TRUNCATED FOR MAIL (1000 lines) <<<
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200809141631.m8EGVxNk004885>