[src/trunk]: src/sys/dev/usb Don't impose a compile-time dependency on the ke...

[pooka <pooka%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/9b74d7e1208d
branches:  trunk
changeset: 750174:9b74d7e1208d
user:      pooka <pooka%NetBSD.org@localhost>
date:      Sat Dec 19 11:41:56 2009 +0000

description:
Don't impose a compile-time dependency on the kernel containing
ohci/uhci just for the sake of setting a debug variable.

diffstat:

 sys/dev/usb/usb.c |  19 ++-----------------
 1 files changed, 2 insertions(+), 17 deletions(-)

diffs (50 lines):

diff -r b622d7de2933 -r 9b74d7e1208d sys/dev/usb/usb.c
--- a/sys/dev/usb/usb.c Sat Dec 19 11:29:26 2009 +0000
+++ b/sys/dev/usb/usb.c Sat Dec 19 11:41:56 2009 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: usb.c,v 1.119 2009/11/12 20:11:35 dyoung Exp $ */
+/*     $NetBSD: usb.c,v 1.120 2009/12/19 11:41:56 pooka Exp $  */
 
 /*
  * Copyright (c) 1998, 2002, 2008 The NetBSD Foundation, Inc.
@@ -37,13 +37,10 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: usb.c,v 1.119 2009/11/12 20:11:35 dyoung Exp $");
+__KERNEL_RCSID(0, "$NetBSD: usb.c,v 1.120 2009/12/19 11:41:56 pooka Exp $");
 
 #include "opt_compat_netbsd.h"
 
-#include "ohci.h"
-#include "uhci.h"
-
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/kernel.h>
@@ -74,12 +71,6 @@
 #define DPRINTF(x)     if (usbdebug) logprintf x
 #define DPRINTFN(n,x)  if (usbdebug>(n)) logprintf x
 int    usbdebug = 0;
-#if defined(UHCI_DEBUG) && NUHCI > 0
-extern int     uhcidebug;
-#endif
-#if defined(OHCI_DEBUG) && NOHCI > 0
-extern int     ohcidebug;
-#endif
 /*
  * 0  - do usual exploration
  * 1  - do not use timeout exploration
@@ -602,12 +593,6 @@
                if (!(flag & FWRITE))
                        return (EBADF);
                usbdebug  = ((*(int *)data) & 0x000000ff);
-#if defined(UHCI_DEBUG) && NUHCI > 0
-               uhcidebug = ((*(int *)data) & 0x0000ff00) >> 8;
-#endif
-#if defined(OHCI_DEBUG) && NOHCI > 0
-               ohcidebug = ((*(int *)data) & 0x00ff0000) >> 16;
-#endif
                break;
 #endif /* USB_DEBUG */
        case USB_REQUEST: