diff options
| author | mrg <mrg@NetBSD.org> | 2015-10-29 00:15:48 +0000 |
|---|---|---|
| committer | mrg <mrg@NetBSD.org> | 2015-10-29 00:15:48 +0000 |
| commit | 59babc21bc976f2fea8c024987169516da2e1c3b (patch) | |
| tree | 6d85d064d823c0b1d413009e26bc7b9a00a89e49 /sys/dev | |
| parent | 60d23084d464e0bfa47755d62c5f0ed726046f61 (diff) | |
eliminate USBHIST as a define/option. it was entangled with USB_DEBUG
and only referenced a handful of times. rename any usage in configs.
fixes recent build problems i introduced with the previous files.usb
change.
Diffstat (limited to 'sys/dev')
| -rw-r--r-- | sys/dev/usb/ehci.c | 9 | ||||
| -rw-r--r-- | sys/dev/usb/files.usb | 5 | ||||
| -rw-r--r-- | sys/dev/usb/usb.c | 6 | ||||
| -rw-r--r-- | sys/dev/usb/usbhist.h | 4 |
4 files changed, 9 insertions, 15 deletions
diff --git a/sys/dev/usb/ehci.c b/sys/dev/usb/ehci.c index bab8b2fbabd..9a5c7ae42ba 100644 --- a/sys/dev/usb/ehci.c +++ b/sys/dev/usb/ehci.c @@ -1,4 +1,4 @@ -/* $NetBSD: ehci.c,v 1.245 2015/09/11 06:51:43 skrll Exp $ */ +/* $NetBSD: ehci.c,v 1.246 2015/10/29 00:15:48 mrg Exp $ */ /* * Copyright (c) 2004-2012 The NetBSD Foundation, Inc. @@ -53,7 +53,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: ehci.c,v 1.245 2015/09/11 06:51:43 skrll Exp $"); +__KERNEL_RCSID(0, "$NetBSD: ehci.c,v 1.246 2015/10/29 00:15:48 mrg Exp $"); #include "ohci.h" #include "uhci.h" @@ -1610,10 +1610,7 @@ Static void ehci_dump_qtd(ehci_qtd_t *qtd) { USBHIST_FUNC(); USBHIST_CALLED(ehcidebug); - -#ifdef USBHIST uint32_t s = le32toh(qtd->qtd_status); -#endif USBHIST_LOGN(ehcidebug, 10, " next = 0x%08x altnext = 0x%08x status = 0x%08x", @@ -1650,10 +1647,8 @@ ehci_dump_qtd(ehci_qtd_t *qtd) Static void ehci_dump_sqh(ehci_soft_qh_t *sqh) { -#ifdef USBHIST ehci_qh_t *qh = &sqh->qh; ehci_link_t link; -#endif u_int32_t endp, endphub; USBHIST_FUNC(); USBHIST_CALLED(ehcidebug); diff --git a/sys/dev/usb/files.usb b/sys/dev/usb/files.usb index 04a10c2bfe1..206e20369e4 100644 --- a/sys/dev/usb/files.usb +++ b/sys/dev/usb/files.usb @@ -1,4 +1,4 @@ -# $NetBSD: files.usb,v 1.136 2015/10/27 22:25:23 mrg Exp $ +# $NetBSD: files.usb,v 1.137 2015/10/29 00:15:48 mrg Exp $ # # Config file and device description for machine-independent USB code. # Included by ports that need it. Ports that use it must provide @@ -9,8 +9,7 @@ defparam opt_usb.h USBHIST_SIZE defflag opt_usb.h USB_FRAG_DMA_WORKAROUND # top level usb debug defines -defflag opt_usb.h USB_DEBUG -defflag opt_usb.h USBHIST: KERNHIST, USB_DEBUG +defflag opt_usb.h USB_DEBUG: KERNHIST # HC controllers defflag opt_usb.h EHCI_DEBUG: USB_DEBUG diff --git a/sys/dev/usb/usb.c b/sys/dev/usb/usb.c index 03459356365..c2151b60b8a 100644 --- a/sys/dev/usb/usb.c +++ b/sys/dev/usb/usb.c @@ -1,4 +1,4 @@ -/* $NetBSD: usb.c,v 1.159 2015/05/30 06:41:08 skrll Exp $ */ +/* $NetBSD: usb.c,v 1.160 2015/10/29 00:15:48 mrg Exp $ */ /* * Copyright (c) 1998, 2002, 2008, 2012 The NetBSD Foundation, Inc. @@ -37,7 +37,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: usb.c,v 1.159 2015/05/30 06:41:08 skrll Exp $"); +__KERNEL_RCSID(0, "$NetBSD: usb.c,v 1.160 2015/10/29 00:15:48 mrg Exp $"); #ifdef _KERNEL_OPT #include "opt_usb.h" @@ -73,7 +73,7 @@ __KERNEL_RCSID(0, "$NetBSD: usb.c,v 1.159 2015/05/30 06:41:08 skrll Exp $"); #include <dev/usb/usb_quirks.h> #include <dev/usb/usbhist.h> -#if defined(USBHIST) +#if defined(USB_DEBUG) #ifndef USBHIST_SIZE #define USBHIST_SIZE 50000 diff --git a/sys/dev/usb/usbhist.h b/sys/dev/usb/usbhist.h index 2437395c69d..762db639275 100644 --- a/sys/dev/usb/usbhist.h +++ b/sys/dev/usb/usbhist.h @@ -1,4 +1,4 @@ -/* $NetBSD: usbhist.h,v 1.2 2015/05/30 06:41:08 skrll Exp $ */ +/* $NetBSD: usbhist.h,v 1.3 2015/10/29 00:15:48 mrg Exp $ */ /* * Copyright (c) 2012 Matthew R. Green @@ -44,7 +44,7 @@ #include <sys/kernhist.h> -#ifdef USBHIST +#ifdef USB_DEBUG extern int usbdebug; |
