CVS commit: src/sys/dev/usb

[Nick Hudson]

Module Name:    src
Committed By:   skrll
Date:           Sun Mar 24 22:38:45 UTC 2013

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

Log Message:
Add || defined(OHCI_DEBUG) to pick up usbd_dump_pipe

Fixes kern/47690


To generate a diff of this commit:
cvs rdiff -u -r1.150 -r1.151 src/sys/dev/usb/usbdi.c
cvs rdiff -u -r1.102 -r1.103 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.150 src/sys/dev/usb/usbdi.c:1.151
--- src/sys/dev/usb/usbdi.c:1.150	Tue Jan 22 13:27:59 2013
+++ src/sys/dev/usb/usbdi.c	Sun Mar 24 22:38:45 2013
@@ -1,4 +1,4 @@
-/*	$NetBSD: usbdi.c,v 1.150 2013/01/22 13:27:59 jmcneill Exp $	*/
+/*	$NetBSD: usbdi.c,v 1.151 2013/03/24 22:38:45 skrll Exp $	*/
 
 /*
  * Copyright (c) 1998, 2012 The NetBSD Foundation, Inc.
@@ -31,7 +31,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: usbdi.c,v 1.150 2013/01/22 13:27:59 jmcneill Exp $");
+__KERNEL_RCSID(0, "$NetBSD: usbdi.c,v 1.151 2013/03/24 22:38:45 skrll Exp $");
 
 #ifdef _KERNEL_OPT
 #include "opt_compat_netbsd.h"
@@ -82,7 +82,7 @@ usbd_xfer_isread(usbd_xfer_handle xfer)
 			UE_DIR_IN);
 }
 
-#if defined(USB_DEBUG) || defined(EHCI_DEBUG)
+#if defined(USB_DEBUG) || defined(EHCI_DEBUG) || defined(OHCI_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.102 src/sys/dev/usb/usbdivar.h:1.103
--- src/sys/dev/usb/usbdivar.h:1.102	Wed Jan 23 06:53:30 2013
+++ src/sys/dev/usb/usbdivar.h	Sun Mar 24 22:38:45 2013
@@ -1,4 +1,4 @@
-/*	$NetBSD: usbdivar.h,v 1.102 2013/01/23 06:53:30 skrll Exp $	*/
+/*	$NetBSD: usbdivar.h,v 1.103 2013/03/24 22:38:45 skrll Exp $	*/
 
 /*
  * Copyright (c) 1998, 2012 The NetBSD Foundation, Inc.
@@ -270,7 +270,7 @@ struct usbd_xfer {
 void usbd_init(void);
 void usbd_finish(void);
 
-#if defined(USB_DEBUG) || defined(EHCI_DEBUG)
+#if defined(USB_DEBUG) || defined(EHCI_DEBUG) || defined(OHCI_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);