svn commit: r187979 - user/thompsa/usb/sys/dev/usb2/ethernet
Andrew Thompson
thompsa at FreeBSD.org
Sat Jan 31 23:00:21 PST 2009
Author: thompsa
Date: Sun Feb 1 07:00:21 2009
New Revision: 187979
URL: http://svn.freebsd.org/changeset/base/187979
Log:
Be consistent about xfer debug messages.
Modified:
user/thompsa/usb/sys/dev/usb2/ethernet/if_aue2.c
user/thompsa/usb/sys/dev/usb2/ethernet/if_axe2.c
user/thompsa/usb/sys/dev/usb2/ethernet/if_cdce2.c
user/thompsa/usb/sys/dev/usb2/ethernet/if_cue2.c
user/thompsa/usb/sys/dev/usb2/ethernet/if_kue2.c
user/thompsa/usb/sys/dev/usb2/ethernet/if_rue2.c
user/thompsa/usb/sys/dev/usb2/ethernet/if_udav2.c
Modified: user/thompsa/usb/sys/dev/usb2/ethernet/if_aue2.c
==============================================================================
--- user/thompsa/usb/sys/dev/usb2/ethernet/if_aue2.c Sun Feb 1 06:50:37 2009 (r187978)
+++ user/thompsa/usb/sys/dev/usb2/ethernet/if_aue2.c Sun Feb 1 07:00:21 2009 (r187979)
@@ -709,6 +709,7 @@ aue_intr_callback(struct usb2_xfer *xfer
break;
default: /* Error */
+ DPRINTF("intr transfer error, %s\n", usb2_errstr(xfer->error));
if (xfer->error != USB_ERR_CANCELLED) {
/* start clear stall */
usb2_clear_endpoint_stall(xfer);
@@ -768,12 +769,12 @@ tr_setup:
break;
default: /* Error */
+ DPRINTF("read transfer error, %s\n", usb2_errstr(xfer->error));
if (xfer->error != USB_ERR_CANCELLED) {
/* try to clear stall first */
usb2_clear_endpoint_stall(xfer);
return;
}
- DPRINTF("bulk read error, %s\n", usb2_errstr(xfer->error));
break;
}
}
@@ -839,9 +840,7 @@ aue_bulk_write_callback(struct usb2_xfer
break;
default: /* Error */
- DPRINTFN(11, "transfer error, %s\n",
- usb2_errstr(xfer->error));
-
+ DPRINTF("write transfer error, %s\n", usb2_errstr(xfer->error));
if (xfer->error != USB_ERR_CANCELLED) {
/* try to clear stall first */
usb2_clear_endpoint_stall(xfer);
Modified: user/thompsa/usb/sys/dev/usb2/ethernet/if_axe2.c
==============================================================================
--- user/thompsa/usb/sys/dev/usb2/ethernet/if_axe2.c Sun Feb 1 06:50:37 2009 (r187978)
+++ user/thompsa/usb/sys/dev/usb2/ethernet/if_axe2.c Sun Feb 1 07:00:21 2009 (r187979)
@@ -705,6 +705,7 @@ axe_intr_callback(struct usb2_xfer *xfer
break;
default: /* Error */
+ DPRINTF("intr transfer error, %s\n", usb2_errstr(xfer->error));
if (xfer->error != USB_ERR_CANCELLED) {
/* start clear stall */
usb2_clear_endpoint_stall(xfer);
@@ -776,12 +777,12 @@ axe_bulk_read_callback(struct usb2_xfer
break;
default: /* Error */
+ DPRINTF("read transfer error, %s\n", usb2_errstr(xfer->error));
if (xfer->error != USB_ERR_CANCELLED) {
/* try to clear stall first */
usb2_clear_endpoint_stall(xfer);
return;
}
- DPRINTF("bulk read error, %s\n", usb2_errstr(xfer->error));
break;
}
}
@@ -863,9 +864,7 @@ axe_bulk_write_callback(struct usb2_xfer
break;
default: /* Error */
- DPRINTFN(11, "transfer error, %s\n",
- usb2_errstr(xfer->error));
-
+ DPRINTF("write transfer error, %s\n", usb2_errstr(xfer->error));
if (xfer->error != USB_ERR_CANCELLED) {
/* try to clear stall first */
usb2_clear_endpoint_stall(xfer);
Modified: user/thompsa/usb/sys/dev/usb2/ethernet/if_cdce2.c
==============================================================================
--- user/thompsa/usb/sys/dev/usb2/ethernet/if_cdce2.c Sun Feb 1 06:50:37 2009 (r187978)
+++ user/thompsa/usb/sys/dev/usb2/ethernet/if_cdce2.c Sun Feb 1 07:00:21 2009 (r187979)
@@ -668,8 +668,7 @@ cdce_bulk_write_512x4_callback(struct us
break;
default: /* Error */
- DPRINTFN(11, "transfer error, %s\n",
- usb2_errstr(xfer->error));
+ DPRINTF("write transfer error, %s\n", usb2_errstr(xfer->error));
/* update error counter */
ifp->if_oerrors += sc->sc_tx_mq.ifq_len;
@@ -759,8 +758,7 @@ tr_setup:
break;
default: /* Error */
- DPRINTFN(11, "transfer error, %s\n",
- usb2_errstr(xfer->error));
+ DPRINTF("write transfer error, %s\n", usb2_errstr(xfer->error));
/* free all previous mbufs */
cdce_free_mq(&sc->sc_tx_mq);
@@ -1093,8 +1091,7 @@ cdce_bulk_read_512x4_callback(struct usb
break;
default: /* Error */
- DPRINTF("error = %s\n",
- usb2_errstr(xfer->error));
+ DPRINTF("read transfer error, %s\n", usb2_errstr(xfer->error));
if (xfer->error != USB_ERR_CANCELLED) {
/* try to clear stall first */
@@ -1179,8 +1176,7 @@ tr_setup:
break;
default: /* Error */
- DPRINTF("error = %s\n",
- usb2_errstr(xfer->error));
+ DPRINTF("read transfer error, %s\n", usb2_errstr(xfer->error));
/* free all mbufs */
cdce_free_mq(&sc->sc_rx_mq);
@@ -1257,6 +1253,7 @@ cdce_intr_read_callback(struct usb2_xfer
break;
default: /* Error */
+ DPRINTF("intr transfer error, %s\n", usb2_errstr(xfer->error));
if (xfer->error != USB_ERR_CANCELLED) {
/* start clear stall */
usb2_clear_endpoint_stall(xfer);
@@ -1284,6 +1281,7 @@ cdce_intr_write_callback(struct usb2_xfe
break;
default: /* Error */
+ DPRINTF("intr transfer error, %s\n", usb2_errstr(xfer->error));
if (xfer->error != USB_ERR_CANCELLED) {
/* start clear stall */
usb2_clear_endpoint_stall(xfer);
Modified: user/thompsa/usb/sys/dev/usb2/ethernet/if_cue2.c
==============================================================================
--- user/thompsa/usb/sys/dev/usb2/ethernet/if_cue2.c Sun Feb 1 06:50:37 2009 (r187978)
+++ user/thompsa/usb/sys/dev/usb2/ethernet/if_cue2.c Sun Feb 1 07:00:21 2009 (r187979)
@@ -451,12 +451,12 @@ cue_bulk_read_callback(struct usb2_xfer
break;
default: /* Error */
+ DPRINTF("read transfer error, %s\n", usb2_errstr(xfer->error));
if (xfer->error != USB_ERR_CANCELLED) {
/* try to clear stall first */
usb2_clear_endpoint_stall(xfer);
return;
}
- DPRINTF("bulk read error, %s\n", usb2_errstr(xfer->error));
break;
}
}
@@ -506,9 +506,7 @@ cue_bulk_write_callback(struct usb2_xfer
break;
default: /* Error */
- DPRINTFN(11, "transfer error, %s\n",
- usb2_errstr(xfer->error));
-
+ DPRINTF("write transfer error, %s\n", usb2_errstr(xfer->error));
if (xfer->error != USB_ERR_CANCELLED) {
/* try to clear stall first */
usb2_clear_endpoint_stall(xfer);
Modified: user/thompsa/usb/sys/dev/usb2/ethernet/if_kue2.c
==============================================================================
--- user/thompsa/usb/sys/dev/usb2/ethernet/if_kue2.c Sun Feb 1 06:50:37 2009 (r187978)
+++ user/thompsa/usb/sys/dev/usb2/ethernet/if_kue2.c Sun Feb 1 07:00:21 2009 (r187979)
@@ -529,12 +529,12 @@ kue_bulk_read_callback(struct usb2_xfer
break;
default: /* Error */
+ DPRINTF("read transfer error, %s\n", usb2_errstr(xfer->error));
if (xfer->error != USB_ERR_CANCELLED) {
/* try to clear stall first */
usb2_clear_endpoint_stall(xfer);
return;
}
- DPRINTF("bulk read error, %s\n", usb2_errstr(xfer->error));
break;
}
}
@@ -592,8 +592,7 @@ kue_bulk_write_callback(struct usb2_xfer
break;
default: /* Error */
- DPRINTFN(11, "transfer error, %s\n", usb2_errstr(xfer->error));
-
+ DPRINTF("write transfer error, %s\n", usb2_errstr(xfer->error));
if (xfer->error != USB_ERR_CANCELLED) {
/* try to clear stall first */
usb2_clear_endpoint_stall(xfer);
Modified: user/thompsa/usb/sys/dev/usb2/ethernet/if_rue2.c
==============================================================================
--- user/thompsa/usb/sys/dev/usb2/ethernet/if_rue2.c Sun Feb 1 06:50:37 2009 (r187978)
+++ user/thompsa/usb/sys/dev/usb2/ethernet/if_rue2.c Sun Feb 1 07:00:21 2009 (r187979)
@@ -633,6 +633,7 @@ rue_intr_callback(struct usb2_xfer *xfer
break;
default: /* Error */
+ DPRINTF("intr transfer error, %s\n", usb2_errstr(xfer->error));
if (xfer->error != USB_ERR_CANCELLED) {
/* start clear stall */
usb2_clear_endpoint_stall(xfer);
@@ -678,12 +679,12 @@ tr_setup:
break;
default: /* Error */
+ DPRINTF("read transfer error, %s\n", usb2_errstr(xfer->error));
if (xfer->error != USB_ERR_CANCELLED) {
/* try to clear stall first */
usb2_clear_endpoint_stall(xfer);
return;
}
- DPRINTF("bulk read error, %s\n", usb2_errstr(xfer->error));
break;
}
@@ -747,8 +748,7 @@ done:
break;
default: /* Error */
- DPRINTFN(11, "transfer error, %s\n", usb2_errstr(xfer->error));
-
+ DPRINTF("write transfer error, %s\n", usb2_errstr(xfer->error));
if (xfer->error != USB_ERR_CANCELLED) {
/* try to clear stall first */
usb2_clear_endpoint_stall(xfer);
Modified: user/thompsa/usb/sys/dev/usb2/ethernet/if_udav2.c
==============================================================================
--- user/thompsa/usb/sys/dev/usb2/ethernet/if_udav2.c Sun Feb 1 06:50:37 2009 (r187978)
+++ user/thompsa/usb/sys/dev/usb2/ethernet/if_udav2.c Sun Feb 1 07:00:21 2009 (r187979)
@@ -605,8 +605,7 @@ udav_bulk_write_callback(struct usb2_xfe
break;
default: /* Error */
- DPRINTFN(11, "transfer error, %s\n", usb2_errstr(xfer->error));
-
+ DPRINTF("write transfer error, %s\n", usb2_errstr(xfer->error));
if (xfer->error != USB_ERR_CANCELLED) {
/* try to clear stall first */
usb2_clear_endpoint_stall(xfer);
@@ -657,12 +656,12 @@ tr_setup:
break;
default: /* Error */
+ DPRINTF("read transfer error, %s\n", usb2_errstr(xfer->error));
if (xfer->error != USB_ERR_CANCELLED) {
/* try to clear stall first */
usb2_clear_endpoint_stall(xfer);
return;
}
- DPRINTF("bulk read error, %s\n", usb2_errstr(xfer->error));
break;
}
}
@@ -678,6 +677,7 @@ udav_intr_callback(struct usb2_xfer *xfe
break;
default: /* Error */
+ DPRINTF("intr transfer error, %s\n", usb2_errstr(xfer->error));
if (xfer->error != USB_ERR_CANCELLED) {
/* start clear stall */
usb2_clear_endpoint_stall(xfer);
More information about the svn-src-user
mailing list