summaryrefslogtreecommitdiffstats
path: root/sys/dev/usb/uhci.c
diff options
context:
space:
mode:
authorn_hibma <n_hibma@FreeBSD.org>1999-01-10 18:42:54 +0000
committern_hibma <n_hibma@FreeBSD.org>1999-01-10 18:42:54 +0000
commit910aa44d3b83a9b8499aa367bb1117572d1390d6 (patch)
tree8a044a96be7b26512d809593ab4478a2285e6ae4 /sys/dev/usb/uhci.c
parent2850284f098bcd5c582370a3b4b97dbba890d7bf (diff)
downloadFreeBSD-src-910aa44d3b83a9b8499aa367bb1117572d1390d6.zip
FreeBSD-src-910aa44d3b83a9b8499aa367bb1117572d1390d6.tar.gz
Sync with NetBSD sources. Almost there. Mostly style fixes.
Diffstat (limited to 'sys/dev/usb/uhci.c')
-rw-r--r--sys/dev/usb/uhci.c12
1 files changed, 6 insertions, 6 deletions
diff --git a/sys/dev/usb/uhci.c b/sys/dev/usb/uhci.c
index 12554b3..707bfe3 100644
--- a/sys/dev/usb/uhci.c
+++ b/sys/dev/usb/uhci.c
@@ -1,5 +1,5 @@
-/* $NetBSD: uhci.c,v 1.20 1998/12/30 18:06:25 augustss Exp $ */
-/* FreeBSD $Id$ */
+/* $NetBSD: uhci.c,v 1.22 1999/01/08 11:58:25 augustss Exp $ */
+/* FreeBSD $Id: uhci.c,v 1.6 1999/01/07 23:31:33 n_hibma Exp $ */
/*
* Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -418,9 +418,9 @@ uhci_dump_td(p)
if (uhci_longtd)
printf(" %b %b,errcnt=%d,actlen=%d pid=%02x,addr=%d,endpt=%d,"
"D=%d,maxlen=%d\n",
- (long)p->td->td_link,
+ (int)p->td->td_link,
"\20\1T\2Q\3VF",
- (long)p->td->td_status,
+ (int)p->td->td_status,
"\20\22BITSTUFF\23CRCTO\24NAK\25BABBLE\26DBUFFER\27"
"STALLED\30ACTIVE\31IOC\32ISO\33LS\36SPD",
UHCI_TD_GET_ERRCNT(p->td->td_status),
@@ -775,7 +775,7 @@ uhci_ii_done(ii, timo)
#endif
/* The transfer is done, compute length and status. */
- /* XXX stop at first inactive to get toggle right. */
+ /* XXX Should stop at first inactive to get toggle right. */
/* XXX Is this correct for control xfers? */
for (len = status = 0, std = ii->stdstart;
std != 0;
@@ -799,7 +799,7 @@ uhci_ii_done(ii, timo)
"status 0x%b\n",
reqh->pipe->device->address,
reqh->pipe->endpoint->edesc->bEndpointAddress,
- (long)status,
+ (int)status,
"\20\22BITSTUFF\23CRCTO\24NAK\25BABBLE\26DBUFFER\27"
"STALLED\30ACTIVE"));
if (status == UHCI_TD_STALLED)
OpenPOWER on IntegriCloud