Module Name: src Committed By: skrll Date: Thu Feb 25 12:52:09 UTC 2016
Modified Files: src/sys/dev/usb [nick-nhusb]: ohci.c Log Message: Remove the big delay / dump ED/TD state debug code. To generate a diff of this commit: cvs rdiff -u -r1.254.2.48 -r1.254.2.49 src/sys/dev/usb/ohci.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
Modified files: Index: src/sys/dev/usb/ohci.c diff -u src/sys/dev/usb/ohci.c:1.254.2.48 src/sys/dev/usb/ohci.c:1.254.2.49 --- src/sys/dev/usb/ohci.c:1.254.2.48 Wed Feb 24 09:06:04 2016 +++ src/sys/dev/usb/ohci.c Thu Feb 25 12:52:09 2016 @@ -1,4 +1,4 @@ -/* $NetBSD: ohci.c,v 1.254.2.48 2016/02/24 09:06:04 skrll Exp $ */ +/* $NetBSD: ohci.c,v 1.254.2.49 2016/02/25 12:52:09 skrll Exp $ */ /* * Copyright (c) 1998, 2004, 2005, 2012 The NetBSD Foundation, Inc. @@ -41,7 +41,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: ohci.c,v 1.254.2.48 2016/02/24 09:06:04 skrll Exp $"); +__KERNEL_RCSID(0, "$NetBSD: ohci.c,v 1.254.2.49 2016/02/25 12:52:09 skrll Exp $"); #include "opt_usb.h" @@ -2976,22 +2976,6 @@ ohci_device_ctrl_start(struct usbd_xfer ohci_timeout, xfer); } -#ifdef OHCI_DEBUG - DPRINTFN(20, "--- dump start ---", 0, 0, 0, 0); - if (ohcidebug >= 20) { - delay(10000); - DPRINTFN(20, "status=%x", OREAD4(sc, OHCI_COMMAND_STATUS), - 0, 0, 0); - ohci_dumpregs(sc); - DPRINTFN(20, "ctrl head:", 0, 0, 0, 0); - ohci_dump_ed(sc, sc->sc_ctrl_head); - DPRINTF("sed:", 0, 0, 0, 0); - ohci_dump_ed(sc, sed); - ohci_dump_tds(sc, setup); - } - DPRINTFN(20, "--- dump start ---", 0, 0, 0, 0); -#endif - DPRINTF("done", 0, 0, 0, 0); mutex_exit(&sc->sc_lock); @@ -3748,16 +3732,6 @@ ohci_device_isoc_enter(struct usbd_xfer sizeof(sed->ed.ed_flags), BUS_DMASYNC_PREWRITE | BUS_DMASYNC_PREREAD); mutex_exit(&sc->sc_lock); - -#ifdef OHCI_DEBUG - if (ohcidebug >= 5) { - delay(150000); - DPRINTF("after frame=%d", O32TOH(sc->sc_hcca->hcca_frame_number), - 0, 0, 0); - ohci_dump_itds(sc, xfer->ux_hcpriv); - ohci_dump_ed(sc, sed); - } -#endif } usbd_status