Module Name: src
Committed By: skrll
Date: Sat Nov 23 12:41:13 UTC 2013
Modified Files:
src/sys/dev/usb: ehci.c
Log Message:
Simplify debug/DIAGNOSTIC code.
To generate a diff of this commit:
cvs rdiff -u -r1.216 -r1.217 src/sys/dev/usb/ehci.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/ehci.c
diff -u src/sys/dev/usb/ehci.c:1.216 src/sys/dev/usb/ehci.c:1.217
--- src/sys/dev/usb/ehci.c:1.216 Sat Nov 23 12:35:19 2013
+++ src/sys/dev/usb/ehci.c Sat Nov 23 12:41:13 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: ehci.c,v 1.216 2013/11/23 12:35:19 skrll Exp $ */
+/* $NetBSD: ehci.c,v 1.217 2013/11/23 12:41:13 skrll 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.216 2013/11/23 12:35:19 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ehci.c,v 1.217 2013/11/23 12:41:13 skrll Exp $");
#include "ohci.h"
#include "uhci.h"
@@ -919,16 +919,15 @@ ehci_idone(struct ehci_xfer *ex)
#ifdef DIAGNOSTIC
if (ex->isdone) {
+ printf("ehci_idone: ex=%p is done!\n", ex);
#ifdef EHCI_DEBUG
- printf("ehci_idone: ex is done!\n");
ehci_dump_exfer(ex);
-#else
- printf("ehci_idone: ex=%p is done!\n", ex);
#endif
return;
}
ex->isdone = 1;
#endif
+
if (xfer->status == USBD_CANCELLED ||
xfer->status == USBD_TIMEOUT) {
DPRINTF(("ehci_idone: aborted xfer=%p\n", xfer));
