Module Name: src
Committed By: pooka
Date: Sat Dec 19 11:41:57 UTC 2009
Modified Files:
src/sys/dev/usb: usb.c
Log Message:
Don't impose a compile-time dependency on the kernel containing
ohci/uhci just for the sake of setting a debug variable.
To generate a diff of this commit:
cvs rdiff -u -r1.119 -r1.120 src/sys/dev/usb/usb.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/usb.c
diff -u src/sys/dev/usb/usb.c:1.119 src/sys/dev/usb/usb.c:1.120
--- src/sys/dev/usb/usb.c:1.119 Thu Nov 12 20:11:35 2009
+++ src/sys/dev/usb/usb.c Sat Dec 19 11:41:56 2009
@@ -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:
