From owner-p4-projects@FreeBSD.ORG Fri Jun 5 01:36:26 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 394F11065674; Fri, 5 Jun 2009 01:36:26 +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 EA8A2106564A for ; Fri, 5 Jun 2009 01:36:25 +0000 (UTC) (envelope-from thompsa@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id D6ED58FC0A for ; Fri, 5 Jun 2009 01:36:25 +0000 (UTC) (envelope-from thompsa@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n551aPxQ082211 for ; Fri, 5 Jun 2009 01:36:25 GMT (envelope-from thompsa@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n551aPi5082209 for perforce@freebsd.org; Fri, 5 Jun 2009 01:36:25 GMT (envelope-from thompsa@freebsd.org) Date: Fri, 5 Jun 2009 01:36:25 GMT Message-Id: <200906050136.n551aPi5082209@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to thompsa@freebsd.org using -f From: Andrew Thompson To: Perforce Change Reviews Cc: Subject: PERFORCE change 163536 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: Fri, 05 Jun 2009 01:36:27 -0000 http://perforce.freebsd.org/chv.cgi?CH=163536 Change 163536 by thompsa@thompsa_burger on 2009/06/05 01:36:24 Reshuffle includes - delete empty .h files - move content around Affected files ... .. //depot/projects/usb_buf/src/sys/dev/usb/controller/at91dci.c#8 edit .. //depot/projects/usb_buf/src/sys/dev/usb/controller/atmegadci.c#8 edit .. //depot/projects/usb_buf/src/sys/dev/usb/controller/avr32dci.c#8 edit .. //depot/projects/usb_buf/src/sys/dev/usb/controller/ehci.c#10 edit .. //depot/projects/usb_buf/src/sys/dev/usb/controller/musb_otg.c#8 edit .. //depot/projects/usb_buf/src/sys/dev/usb/controller/ohci.c#8 edit .. //depot/projects/usb_buf/src/sys/dev/usb/controller/ohci_pci.c#3 edit .. //depot/projects/usb_buf/src/sys/dev/usb/controller/uhci.c#8 edit .. //depot/projects/usb_buf/src/sys/dev/usb/controller/uhci_pci.c#3 edit .. //depot/projects/usb_buf/src/sys/dev/usb/controller/usb_controller.c#7 edit .. //depot/projects/usb_buf/src/sys/dev/usb/controller/uss820dci.c#8 edit .. //depot/projects/usb_buf/src/sys/dev/usb/input/uhid.c#7 edit .. //depot/projects/usb_buf/src/sys/dev/usb/input/ukbd.c#8 edit .. //depot/projects/usb_buf/src/sys/dev/usb/input/ums.c#7 edit .. //depot/projects/usb_buf/src/sys/dev/usb/misc/udbp.c#7 edit .. //depot/projects/usb_buf/src/sys/dev/usb/misc/ufm.c#6 edit .. //depot/projects/usb_buf/src/sys/dev/usb/net/if_aue.c#7 edit .. //depot/projects/usb_buf/src/sys/dev/usb/net/if_axe.c#7 edit .. //depot/projects/usb_buf/src/sys/dev/usb/net/if_cdce.c#7 edit .. //depot/projects/usb_buf/src/sys/dev/usb/net/if_cue.c#7 edit .. //depot/projects/usb_buf/src/sys/dev/usb/net/if_kue.c#7 edit .. //depot/projects/usb_buf/src/sys/dev/usb/net/if_rue.c#7 edit .. //depot/projects/usb_buf/src/sys/dev/usb/net/if_udav.c#7 edit .. //depot/projects/usb_buf/src/sys/dev/usb/net/usb_ethernet.c#5 edit .. //depot/projects/usb_buf/src/sys/dev/usb/quirk/usb_quirk.c#4 edit .. //depot/projects/usb_buf/src/sys/dev/usb/serial/u3g.c#7 edit .. //depot/projects/usb_buf/src/sys/dev/usb/serial/uark.c#7 edit .. //depot/projects/usb_buf/src/sys/dev/usb/serial/ubsa.c#7 edit .. //depot/projects/usb_buf/src/sys/dev/usb/serial/ubser.c#7 edit .. //depot/projects/usb_buf/src/sys/dev/usb/serial/uchcom.c#7 edit .. //depot/projects/usb_buf/src/sys/dev/usb/serial/ucycom.c#7 edit .. //depot/projects/usb_buf/src/sys/dev/usb/serial/ufoma.c#7 edit .. //depot/projects/usb_buf/src/sys/dev/usb/serial/uftdi.c#7 edit .. //depot/projects/usb_buf/src/sys/dev/usb/serial/ugensa.c#8 edit .. //depot/projects/usb_buf/src/sys/dev/usb/serial/uipaq.c#7 edit .. //depot/projects/usb_buf/src/sys/dev/usb/serial/ulpt.c#7 edit .. //depot/projects/usb_buf/src/sys/dev/usb/serial/umct.c#8 edit .. //depot/projects/usb_buf/src/sys/dev/usb/serial/umodem.c#7 edit .. //depot/projects/usb_buf/src/sys/dev/usb/serial/umoscom.c#7 edit .. //depot/projects/usb_buf/src/sys/dev/usb/serial/uplcom.c#7 edit .. //depot/projects/usb_buf/src/sys/dev/usb/serial/usb_serial.c#5 edit .. //depot/projects/usb_buf/src/sys/dev/usb/serial/uslcom.c#7 edit .. //depot/projects/usb_buf/src/sys/dev/usb/serial/uvisor.c#7 edit .. //depot/projects/usb_buf/src/sys/dev/usb/serial/uvscom.c#7 edit .. //depot/projects/usb_buf/src/sys/dev/usb/storage/umass.c#8 edit .. //depot/projects/usb_buf/src/sys/dev/usb/storage/urio.c#7 edit .. //depot/projects/usb_buf/src/sys/dev/usb/storage/ustorage_fs.c#8 edit .. //depot/projects/usb_buf/src/sys/dev/usb/template/usb_template.c#5 edit .. //depot/projects/usb_buf/src/sys/dev/usb/usb.h#5 edit .. //depot/projects/usb_buf/src/sys/dev/usb/usb_busdma.c#9 edit .. //depot/projects/usb_buf/src/sys/dev/usb/usb_compat_linux.c#10 edit .. //depot/projects/usb_buf/src/sys/dev/usb/usb_core.c#3 edit .. //depot/projects/usb_buf/src/sys/dev/usb/usb_core.h#13 edit .. //depot/projects/usb_buf/src/sys/dev/usb/usb_debug.h#7 edit .. //depot/projects/usb_buf/src/sys/dev/usb/usb_dev.c#9 edit .. //depot/projects/usb_buf/src/sys/dev/usb/usb_device.c#12 edit .. //depot/projects/usb_buf/src/sys/dev/usb/usb_dynamic.c#5 edit .. //depot/projects/usb_buf/src/sys/dev/usb/usb_error.c#4 edit .. //depot/projects/usb_buf/src/sys/dev/usb/usb_error.h#2 delete .. //depot/projects/usb_buf/src/sys/dev/usb/usb_freebsd.h#1 add .. //depot/projects/usb_buf/src/sys/dev/usb/usb_generic.c#12 edit .. //depot/projects/usb_buf/src/sys/dev/usb/usb_handle_request.c#8 edit .. //depot/projects/usb_buf/src/sys/dev/usb/usb_handle_request.h#2 delete .. //depot/projects/usb_buf/src/sys/dev/usb/usb_hid.c#6 edit .. //depot/projects/usb_buf/src/sys/dev/usb/usb_hub.c#11 edit .. //depot/projects/usb_buf/src/sys/dev/usb/usb_lookup.c#5 edit .. //depot/projects/usb_buf/src/sys/dev/usb/usb_mbuf.c#5 edit .. //depot/projects/usb_buf/src/sys/dev/usb/usb_msctest.c#8 edit .. //depot/projects/usb_buf/src/sys/dev/usb/usb_parse.c#4 edit .. //depot/projects/usb_buf/src/sys/dev/usb/usb_process.c#6 edit .. //depot/projects/usb_buf/src/sys/dev/usb/usb_request.c#12 edit .. //depot/projects/usb_buf/src/sys/dev/usb/usb_revision.h#4 delete .. //depot/projects/usb_buf/src/sys/dev/usb/usb_transfer.c#12 edit .. //depot/projects/usb_buf/src/sys/dev/usb/usb_util.c#5 edit .. //depot/projects/usb_buf/src/sys/dev/usb/usbdi.h#3 edit .. //depot/projects/usb_buf/src/sys/dev/usb/wlan/if_rum.c#7 edit .. //depot/projects/usb_buf/src/sys/dev/usb/wlan/if_uath.c#7 edit .. //depot/projects/usb_buf/src/sys/dev/usb/wlan/if_upgt.c#7 edit .. //depot/projects/usb_buf/src/sys/dev/usb/wlan/if_ural.c#7 edit .. //depot/projects/usb_buf/src/sys/dev/usb/wlan/if_urtw.c#4 edit .. //depot/projects/usb_buf/src/sys/dev/usb/wlan/if_zyd.c#8 edit Differences ... ==== //depot/projects/usb_buf/src/sys/dev/usb/controller/at91dci.c#8 (text+ko) ==== @@ -66,7 +66,6 @@ #include #include -#include #include #define USB_DEBUG_VAR at91dcidebug @@ -91,7 +90,7 @@ #define AT9100_DCI_PC2SC(pc) \ AT9100_DCI_BUS2SC(USB_DMATAG_TO_XROOT((pc)->tag_parent)->bus) -#if USB_DEBUG +#ifdef USB_DEBUG static int at91dcidebug = 0; SYSCTL_NODE(_hw_usb, OID_AUTO, at91dci, CTLFLAG_RW, 0, "USB at91dci"); ==== //depot/projects/usb_buf/src/sys/dev/usb/controller/atmegadci.c#8 (text+ko) ==== @@ -58,7 +58,6 @@ #include #include -#include #include #define USB_DEBUG_VAR atmegadci_debug @@ -83,7 +82,7 @@ #define ATMEGA_PC2SC(pc) \ ATMEGA_BUS2SC(USB_DMATAG_TO_XROOT((pc)->tag_parent)->bus) -#if USB_DEBUG +#ifdef USB_DEBUG static int atmegadci_debug = 0; SYSCTL_NODE(_hw_usb, OID_AUTO, atmegadci, CTLFLAG_RW, 0, "USB ATMEGA DCI"); ==== //depot/projects/usb_buf/src/sys/dev/usb/controller/avr32dci.c#8 (text+ko) ==== @@ -58,7 +58,6 @@ #include #include -#include #include #define USB_DEBUG_VAR avr32dci_debug @@ -83,7 +82,7 @@ #define AVR32_PC2SC(pc) \ AVR32_BUS2SC(USB_DMATAG_TO_XROOT((pc)->tag_parent)->bus) -#if USB_DEBUG +#ifdef USB_DEBUG static int avr32dci_debug = 0; SYSCTL_NODE(_hw_usb, OID_AUTO, avr32dci, CTLFLAG_RW, 0, "USB AVR32 DCI"); ==== //depot/projects/usb_buf/src/sys/dev/usb/controller/ehci.c#10 (text+ko) ==== @@ -68,7 +68,6 @@ #include #include -#include #include #define USB_DEBUG_VAR ehcidebug @@ -90,7 +89,7 @@ ((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; @@ -244,7 +243,7 @@ usb2_callout_init_mtx(&sc->sc_tmo_pcd, &sc->sc_bus.bus_mtx, 0); -#if USB_DEBUG +#ifdef USB_DEBUG if (ehcidebug > 2) { ehci_dump_regs(sc); } @@ -468,7 +467,7 @@ usb2_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); } @@ -665,7 +664,7 @@ } } -#if USB_DEBUG +#ifdef USB_DEBUG static void ehci_dump_regs(ehci_softc_t *sc) { @@ -1221,7 +1220,7 @@ pipe->endpoint->toggle_next = (status & EHCI_QTD_TOGGLE_MASK) ? 1 : 0; -#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", @@ -1250,7 +1249,7 @@ DPRINTFN(13, "urb=%p endpoint=%p transfer done\n", urb, pipe->endpoint); -#if USB_DEBUG +#ifdef USB_DEBUG if (ehcidebug > 10) { ehci_softc_t *sc = EHCI_BUS2SC(pipe->xroot->bus); @@ -1468,7 +1467,7 @@ DPRINTFN(16, "real interrupt\n"); -#if USB_DEBUG +#ifdef USB_DEBUG if (ehcidebug > 15) { ehci_dump_regs(sc); } @@ -1489,7 +1488,7 @@ 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 @@ -1913,7 +1912,7 @@ pipe->td_transfer_last = td; -#if USB_DEBUG +#ifdef USB_DEBUG if (ehcidebug > 8) { DPRINTF("nexttog=%d; data before transfer:\n", pipe->endpoint->toggle_next); @@ -2046,7 +2045,7 @@ 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); @@ -2101,7 +2100,7 @@ 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); @@ -2167,7 +2166,7 @@ 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", pipe->endpoint->toggle_next); @@ -2520,7 +2519,7 @@ uint8_t sb; uint8_t error; -#if USB_DEBUG +#ifdef USB_DEBUG uint8_t once = 1; #endif @@ -2604,7 +2603,7 @@ /* reuse sitd_portaddr and sitd_back from last transfer */ if (*plen > pipe->max_frame_size) { -#if USB_DEBUG +#ifdef USB_DEBUG if (once) { once = 0; printf("%s: frame length(%d) exceeds %d " @@ -2694,7 +2693,7 @@ } usb2_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); @@ -2810,7 +2809,7 @@ uint8_t td_no; uint8_t page_no; -#if USB_DEBUG +#ifdef USB_DEBUG uint8_t once = 1; #endif @@ -2888,7 +2887,7 @@ } /* range check */ if (*plen > pipe->max_frame_size) { -#if USB_DEBUG +#ifdef USB_DEBUG if (once) { once = 0; printf("%s: frame length(%d) exceeds %d bytes " @@ -2964,7 +2963,7 @@ td->itd_status[7] |= htohc32(sc, EHCI_ITD_IOC); } usb2_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); @@ -3397,7 +3396,7 @@ 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 ==== //depot/projects/usb_buf/src/sys/dev/usb/controller/musb_otg.c#8 (text+ko) ==== @@ -58,7 +58,6 @@ #include #include -#include #include #define USB_DEBUG_VAR musbotgdebug @@ -85,7 +84,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_buf/src/sys/dev/usb/controller/ohci.c#8 (text+ko) ==== @@ -57,7 +57,6 @@ #include #include -#include #include #define USB_DEBUG_VAR ohcidebug @@ -79,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"); @@ -226,7 +225,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); } @@ -285,7 +284,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); } @@ -401,7 +400,7 @@ usb2_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); @@ -454,7 +453,7 @@ USB_BUS_LOCK(&sc->sc_bus); -#if USB_DEBUG +#ifdef USB_DEBUG DPRINTF("\n"); if (ohcidebug > 2) { ohci_dumpregs(sc); @@ -484,7 +483,7 @@ { uint32_t ctl; -#if USB_DEBUG +#ifdef USB_DEBUG DPRINTF("\n"); if (ohcidebug > 2) { ohci_dumpregs(sc); @@ -518,7 +517,7 @@ ohci_do_poll(&sc->sc_bus); } -#if USB_DEBUG +#ifdef USB_DEBUG static void ohci_dumpregs(ohci_softc_t *sc) { @@ -765,7 +764,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); @@ -806,7 +805,7 @@ ohci_device_done(xfer, USB_ERR_NORMAL_COMPLETION); } -#if USB_DEBUG +#ifdef USB_DEBUG static const char *const ohci_cc_strs[] = { @@ -934,7 +933,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); } @@ -1159,7 +1158,7 @@ DPRINTFN(16, "real interrupt\n"); -#if USB_DEBUG +#ifdef USB_DEBUG if (ohcidebug > 15) { ohci_dumpregs(sc); } @@ -1585,7 +1584,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); @@ -2016,7 +2015,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_buf/src/sys/dev/usb/controller/ohci_pci.c#3 (text+ko) ==== @@ -71,7 +71,6 @@ #include #include -#include #include #include ==== //depot/projects/usb_buf/src/sys/dev/usb/controller/uhci.c#8 (text+ko) ==== @@ -60,7 +60,6 @@ #include #include -#include #include #define USB_DEBUG_VAR uhcidebug @@ -83,7 +82,7 @@ ((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; @@ -456,7 +455,7 @@ usb2_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); } @@ -665,7 +664,7 @@ { USB_BUS_LOCK(&sc->sc_bus); -#if USB_DEBUG +#ifdef USB_DEBUG if (uhcidebug > 2) { uhci_dumpregs(sc); } @@ -709,7 +708,7 @@ uhci_start(sc); -#if USB_DEBUG +#ifdef USB_DEBUG if (uhcidebug > 2) { uhci_dumpregs(sc); } @@ -721,7 +720,7 @@ uhci_do_poll(&sc->sc_bus); } -#if USB_DEBUG +#ifdef USB_DEBUG static void uhci_dumpregs(uhci_softc_t *sc) { @@ -879,7 +878,7 @@ struct uhci_qh *qh_lst; struct uhci_qh *qh_rec; -#if USB_DEBUG +#ifdef USB_DEBUG if (uhcinoloop) { return; } @@ -902,7 +901,7 @@ { struct uhci_qh *qh_lst; -#if USB_DEBUG +#ifdef USB_DEBUG if (uhcinoloop) { return; } @@ -1070,7 +1069,7 @@ 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); @@ -1201,7 +1200,7 @@ 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", @@ -1231,7 +1230,7 @@ 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); } @@ -1470,7 +1469,7 @@ DPRINTFN(16, "real interrupt\n"); -#if USB_DEBUG +#ifdef USB_DEBUG if (uhcidebug > 15) { uhci_dumpregs(sc); } @@ -1484,7 +1483,7 @@ UHCI_STS_HCPE | UHCI_STS_HCH)) { if (status & UHCI_STS_RD) { -#if USB_DEBUG +#ifdef USB_DEBUG printf("%s: resume detect\n", __FUNCTION__); #endif @@ -1501,7 +1500,7 @@ /* no acknowledge needed */ DPRINTF("%s: host controller halted\n", __FUNCTION__); -#if USB_DEBUG +#ifdef USB_DEBUG if (uhcidebug > 0) { uhci_dump_all(sc); } @@ -1863,7 +1862,7 @@ 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); @@ -2179,7 +2178,7 @@ uint32_t temp; uint32_t *plen; -#if USB_DEBUG +#ifdef USB_DEBUG uint8_t once = 1; #endif @@ -2251,7 +2250,7 @@ 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 " @@ -2303,7 +2302,7 @@ usb2_pc_cpu_flush(td->page_cache); -#if USB_DEBUG +#ifdef USB_DEBUG if (uhcidebug > 5) { DPRINTF("TD %d\n", nframes); uhci_dump_td(td); ==== //depot/projects/usb_buf/src/sys/dev/usb/controller/uhci_pci.c#3 (text+ko) ==== @@ -360,7 +360,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)); ==== //depot/projects/usb_buf/src/sys/dev/usb/controller/usb_controller.c#7 (text+ko) ==== @@ -45,7 +45,6 @@ #include #include -#include #include #include @@ -73,7 +72,7 @@ /* static variables */ -#if USB_DEBUG +#ifdef USB_DEBUG static int usb2_ctrl_debug = 0; SYSCTL_NODE(_hw_usb, OID_AUTO, ctrl, CTLFLAG_RW, 0, "USB controller"); ==== //depot/projects/usb_buf/src/sys/dev/usb/controller/uss820dci.c#8 (text+ko) ==== @@ -54,8 +54,6 @@ #include #include -#include -#include #include #define USB_DEBUG_VAR uss820dcidebug @@ -80,7 +78,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"); ==== //depot/projects/usb_buf/src/sys/dev/usb/input/uhid.c#7 (text+ko) ==== @@ -51,7 +51,6 @@ #include "usbdevs.h" #include #include -#include #include #include ==== //depot/projects/usb_buf/src/sys/dev/usb/input/ukbd.c#8 (text+ko) ==== @@ -50,7 +50,6 @@ #include #include -#include #include #define USB_DEBUG_VAR ukbd_debug ==== //depot/projects/usb_buf/src/sys/dev/usb/input/ums.c#7 (text+ko) ==== @@ -45,7 +45,6 @@ #include "usbdevs.h" #include #include -#include #include #define USB_DEBUG_VAR ums_debug ==== //depot/projects/usb_buf/src/sys/dev/usb/misc/udbp.c#7 (text+ko) ==== @@ -60,7 +60,6 @@ #include "usbdevs.h" #include #include -#include #define USB_DEBUG_VAR udbp_debug ==== //depot/projects/usb_buf/src/sys/dev/usb/misc/ufm.c#6 (text+ko) ==== @@ -35,7 +35,6 @@ #include "usbdevs.h" #include #include -#include #include #define USB_DEBUG_VAR usb2_debug ==== //depot/projects/usb_buf/src/sys/dev/usb/net/if_aue.c#7 (text+ko) ==== @@ -71,7 +71,6 @@ #include "usbdevs.h" #include #include -#include #define USB_DEBUG_VAR aue_debug ==== //depot/projects/usb_buf/src/sys/dev/usb/net/if_axe.c#7 (text+ko) ==== @@ -79,7 +79,6 @@ #include "usbdevs.h" #include #include -#include #define USB_DEBUG_VAR axe_debug ==== //depot/projects/usb_buf/src/sys/dev/usb/net/if_cdce.c#7 (text+ko) ==== @@ -46,7 +46,6 @@ #include "usbdevs.h" #include #include -#include #include #define USB_DEBUG_VAR cdce_debug ==== //depot/projects/usb_buf/src/sys/dev/usb/net/if_cue.c#7 (text+ko) ==== @@ -54,7 +54,6 @@ #include "usbdevs.h" #include #include -#include #define USB_DEBUG_VAR cue_debug ==== //depot/projects/usb_buf/src/sys/dev/usb/net/if_kue.c#7 (text+ko) ==== @@ -68,7 +68,6 @@ #include "usbdevs.h" #include #include -#include #define USB_DEBUG_VAR kue_debug ==== //depot/projects/usb_buf/src/sys/dev/usb/net/if_rue.c#7 (text+ko) ==== @@ -68,7 +68,6 @@ #include "usbdevs.h" #include #include -#include #define USB_DEBUG_VAR rue_debug ==== //depot/projects/usb_buf/src/sys/dev/usb/net/if_udav.c#7 (text+ko) ==== @@ -49,7 +49,6 @@ #include "usbdevs.h" #include #include -#include #define USB_DEBUG_VAR udav_debug ==== //depot/projects/usb_buf/src/sys/dev/usb/net/usb_ethernet.c#5 (text+ko) ==== @@ -25,7 +25,6 @@ */ #include -#include #include #include ==== //depot/projects/usb_buf/src/sys/dev/usb/quirk/usb_quirk.c#4 (text+ko) ==== @@ -54,7 +54,6 @@ #define USB_DEBUG_VAR usb2_debug -#include #include #include #include ==== //depot/projects/usb_buf/src/sys/dev/usb/serial/u3g.c#7 (text+ko) ==== @@ -33,7 +33,6 @@ #include "usbdevs.h" #include #include -#include #define USB_DEBUG_VAR u3g_debug ==== //depot/projects/usb_buf/src/sys/dev/usb/serial/uark.c#7 (text+ko) ==== @@ -26,7 +26,6 @@ #include "usbdevs.h" #include #include -#include #include #define USB_DEBUG_VAR usb2_debug ==== //depot/projects/usb_buf/src/sys/dev/usb/serial/ubsa.c#7 (text+ko) ==== @@ -65,7 +65,6 @@ #include "usbdevs.h" #include #include -#include #include #define USB_DEBUG_VAR ubsa_debug ==== //depot/projects/usb_buf/src/sys/dev/usb/serial/ubser.c#7 (text+ko) ==== @@ -78,7 +78,6 @@ #include #include -#include #include #define USB_DEBUG_VAR ubser_debug ==== //depot/projects/usb_buf/src/sys/dev/usb/serial/uchcom.c#7 (text+ko) ==== @@ -72,7 +72,6 @@ #include "usbdevs.h" #include #include -#include #include #include ==== //depot/projects/usb_buf/src/sys/dev/usb/serial/ucycom.c#7 (text+ko) ==== @@ -37,7 +37,6 @@ #include "usbdevs.h" #include #include -#include #include #include #include ==== //depot/projects/usb_buf/src/sys/dev/usb/serial/ufoma.c#7 (text+ko) ==== @@ -85,7 +85,6 @@ #include "usbdevs.h" #include #include -#include #include #define USB_DEBUG_VAR usb2_debug ==== //depot/projects/usb_buf/src/sys/dev/usb/serial/uftdi.c#7 (text+ko) ==== @@ -51,7 +51,6 @@ #include "usbdevs.h" #include #include -#include #include #define USB_DEBUG_VAR uftdi_debug ==== //depot/projects/usb_buf/src/sys/dev/usb/serial/ugensa.c#8 (text+ko) ==== @@ -45,7 +45,6 @@ #include "usbdevs.h" #include #include -#include #include #define USB_DEBUG_VAR usb2_debug ==== //depot/projects/usb_buf/src/sys/dev/usb/serial/uipaq.c#7 (text+ko) ==== @@ -54,7 +54,6 @@ #include "usbdevs.h" #include #include -#include #include #define USB_DEBUG_VAR usb2_debug ==== //depot/projects/usb_buf/src/sys/dev/usb/serial/ulpt.c#7 (text+ko) ==== @@ -48,7 +48,6 @@ #include "usbdevs.h" #include #include -#include #define USB_DEBUG_VAR ulpt_debug ==== //depot/projects/usb_buf/src/sys/dev/usb/serial/umct.c#8 (text+ko) ==== @@ -47,7 +47,6 @@ #include "usbdevs.h" #include #include -#include #include #define USB_DEBUG_VAR usb2_debug ==== //depot/projects/usb_buf/src/sys/dev/usb/serial/umodem.c#7 (text+ko) ==== @@ -83,7 +83,6 @@ #include "usbdevs.h" >>> TRUNCATED FOR MAIL (1000 lines) <<<