CVS commit: src/sys/dev/usb

[Frank Wille]

Module Name:    src
Committed By:   phx
Date:           Mon Dec 20 18:49:12 UTC 2010

Modified Files:
        src/sys/dev/usb: usbdi.c usbdivar.h

Log Message:
usbd_dump_*() functions are also needed when just EHCI_DEBUG is defined,
without USB_DEBUG.


To generate a diff of this commit:
cvs rdiff -u -r1.130 -r1.131 src/sys/dev/usb/usbdi.c
cvs rdiff -u -r1.91 -r1.92 src/sys/dev/usb/usbdivar.h

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/usbdi.c
diff -u src/sys/dev/usb/usbdi.c:1.130 src/sys/dev/usb/usbdi.c:1.131
--- src/sys/dev/usb/usbdi.c:1.130	Wed Nov  3 22:34:24 2010
+++ src/sys/dev/usb/usbdi.c	Mon Dec 20 18:49:11 2010
@@ -1,4 +1,4 @@
-/*	$NetBSD: usbdi.c,v 1.130 2010/11/03 22:34:24 dyoung Exp $	*/
+/*	$NetBSD: usbdi.c,v 1.131 2010/12/20 18:49:11 phx Exp $	*/
 /*	$FreeBSD: src/sys/dev/usb/usbdi.c,v 1.28 1999/11/17 22:33:49 n_hibma Exp $	*/
 
 /*
@@ -32,7 +32,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: usbdi.c,v 1.130 2010/11/03 22:34:24 dyoung Exp $");
+__KERNEL_RCSID(0, "$NetBSD: usbdi.c,v 1.131 2010/12/20 18:49:11 phx Exp $");
 
 #include "opt_compat_netbsd.h"
 
@@ -81,7 +81,7 @@
 			UE_DIR_IN);
 }
 
-#ifdef USB_DEBUG
+#if defined(USB_DEBUG) || defined(EHCI_DEBUG)
 void
 usbd_dump_iface(struct usbd_interface *iface)
 {

Index: src/sys/dev/usb/usbdivar.h
diff -u src/sys/dev/usb/usbdivar.h:1.91 src/sys/dev/usb/usbdivar.h:1.92
--- src/sys/dev/usb/usbdivar.h:1.91	Thu Nov 12 20:11:35 2009
+++ src/sys/dev/usb/usbdivar.h	Mon Dec 20 18:49:12 2010
@@ -1,4 +1,4 @@
-/*	$NetBSD: usbdivar.h,v 1.91 2009/11/12 20:11:35 dyoung Exp $	*/
+/*	$NetBSD: usbdivar.h,v 1.92 2010/12/20 18:49:12 phx Exp $	*/
 /*	$FreeBSD: src/sys/dev/usb/usbdivar.h,v 1.11 1999/11/17 22:33:51 n_hibma Exp $	*/
 
 /*
@@ -223,7 +223,7 @@
 void usbd_init(void);
 void usbd_finish(void);
 
-#ifdef USB_DEBUG
+#if defined(USB_DEBUG) || defined(EHCI_DEBUG)
 void usbd_dump_iface(struct usbd_interface *iface);
 void usbd_dump_device(struct usbd_device *dev);
 void usbd_dump_endpoint(struct usbd_endpoint *endp);