Date: Fri, 7 May 2010 07:37:02 GMT From: Hans Petter Selasky <hselasky@FreeBSD.org> To: Perforce Change Reviews <perforce@FreeBSD.org> Subject: PERFORCE change 177881 for review Message-ID: <201005070737.o477b2YB058131@repoman.freebsd.org>
next in thread | raw e-mail | index | archive | help
http://p4web.freebsd.org/@@177881?ac=10 Change 177881 by hselasky@hselasky_laptop001 on 2010/05/07 07:36:17 IFC some changes Affected files ... .. //depot/projects/usb/src/sys/dev/usb/controller/musb_otg.c#33 edit .. //depot/projects/usb/src/sys/dev/usb/controller/ohci.c#34 edit .. //depot/projects/usb/src/sys/dev/usb/controller/uhci_pci.c#20 edit Differences ... ==== //depot/projects/usb/src/sys/dev/usb/controller/musb_otg.c#33 (text+ko) ==== @@ -83,7 +83,7 @@ #define MUSBOTG_PC2SC(pc) \ MUSBOTG_BUS2SC(USB_DMATAG_TO_XROOT((pc)->tag_parent)->bus) -#if USB_DEBUG +#ifdef USB_DEBUG static int musbotgdebug = 0; SYSCTL_NODE(_hw_usb, OID_AUTO, musbotg, CTLFLAG_RW, 0, "USB musbotg"); ==== //depot/projects/usb/src/sys/dev/usb/controller/ohci.c#34 (text+ko) ==== @@ -78,7 +78,7 @@ ((ohci_softc_t *)(((uint8_t *)(bus)) - \ ((uint8_t *)&(((ohci_softc_t *)0)->sc_bus)))) -#if USB_DEBUG +#ifdef USB_DEBUG static int ohcidebug = 0; SYSCTL_NODE(_hw_usb, OID_AUTO, ohci, CTLFLAG_RW, 0, "USB ohci"); @@ -228,7 +228,7 @@ device_printf(sc->sc_bus.bdev, "reset timeout\n"); return (USB_ERR_IOERROR); } -#if USB_DEBUG +#ifdef USB_DEBUG if (ohcidebug > 15) { ohci_dumpregs(sc); } @@ -287,7 +287,7 @@ sc->sc_noport = OHCI_GET_NDP(OREAD4(sc, OHCI_RH_DESCRIPTOR_A)); } -#if USB_DEBUG +#ifdef USB_DEBUG if (ohcidebug > 5) { ohci_dumpregs(sc); } @@ -403,7 +403,7 @@ usb_callout_init_mtx(&sc->sc_tmo_rhsc, &sc->sc_bus.bus_mtx, 0); -#if USB_DEBUG +#ifdef USB_DEBUG if (ohcidebug > 15) { for (i = 0; i != OHCI_NO_EDS; i++) { printf("ed#%d ", i); @@ -456,7 +456,7 @@ USB_BUS_LOCK(&sc->sc_bus); -#if USB_DEBUG +#ifdef USB_DEBUG DPRINTF("\n"); if (ohcidebug > 2) { ohci_dumpregs(sc); @@ -486,7 +486,7 @@ { uint32_t ctl; -#if USB_DEBUG +#ifdef USB_DEBUG DPRINTF("\n"); if (ohcidebug > 2) { ohci_dumpregs(sc); @@ -520,7 +520,7 @@ ohci_do_poll(&sc->sc_bus); } -#if USB_DEBUG +#ifdef USB_DEBUG static void ohci_dumpregs(ohci_softc_t *sc) { @@ -767,7 +767,7 @@ panic("%s:%d: out of TD's\n", __FUNCTION__, __LINE__); } -#if USB_DEBUG +#ifdef USB_DEBUG if (ohcidebug > 5) { DPRINTF("isoc TD\n"); ohci_dump_itd(td); @@ -808,7 +808,7 @@ ohci_device_done(xfer, USB_ERR_NORMAL_COMPLETION); } -#if USB_DEBUG +#ifdef USB_DEBUG static const char *const ohci_cc_strs[] = { @@ -936,7 +936,7 @@ DPRINTFN(13, "xfer=%p endpoint=%p transfer done\n", xfer, xfer->endpoint); -#if USB_DEBUG +#ifdef USB_DEBUG if (ohcidebug > 10) { ohci_dump_tds(xfer->td_transfer_first); } @@ -1161,7 +1161,7 @@ DPRINTFN(16, "real interrupt\n"); -#if USB_DEBUG +#ifdef USB_DEBUG if (ohcidebug > 15) { ohci_dumpregs(sc); } @@ -1587,7 +1587,7 @@ xfer->td_transfer_last = td; -#if USB_DEBUG +#ifdef USB_DEBUG if (ohcidebug > 8) { DPRINTF("nexttog=%d; data before transfer:\n", xfer->endpoint->toggle_next); @@ -2018,7 +2018,7 @@ xfer->td_transfer_last = td_last; -#if USB_DEBUG +#ifdef USB_DEBUG if (ohcidebug > 8) { DPRINTF("data before transfer:\n"); ohci_dump_itds(xfer->td_transfer_first); ==== //depot/projects/usb/src/sys/dev/usb/controller/uhci_pci.c#20 (text+ko) ==== @@ -372,7 +372,7 @@ * that the BIOS won't touch the keyboard anymore if it is connected * to the ports of the root hub? */ -#if USB_DEBUG +#ifdef 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));
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201005070737.o477b2YB058131>