aboutsummaryrefslogtreecommitdiff
path: root/sys/dev
diff options
context:
space:
mode:
authorJosef Karthauser <joe@FreeBSD.org>2002-04-07 18:06:34 +0000
committerJosef Karthauser <joe@FreeBSD.org>2002-04-07 18:06:34 +0000
commitb146ba499d712c962db94d0d1395a39147c8ecf9 (patch)
tree4a39661b660d207939605e8ee2127d2a2b7a544b /sys/dev
parent7080df5183210a07153f3a3f9100237b4fe49515 (diff)
Notes
Diffstat (limited to 'sys/dev')
-rw-r--r--sys/dev/usb/uhcireg.h3
-rw-r--r--sys/dev/usb/uhcivar.h4
2 files changed, 5 insertions, 2 deletions
diff --git a/sys/dev/usb/uhcireg.h b/sys/dev/usb/uhcireg.h
index 38f1ebd5612a..367e648d4fee 100644
--- a/sys/dev/usb/uhcireg.h
+++ b/sys/dev/usb/uhcireg.h
@@ -1,4 +1,4 @@
-/* $NetBSD: uhcireg.h,v 1.14 2001/08/06 15:15:08 augustss Exp $ */
+/* $NetBSD: uhcireg.h,v 1.15 2002/02/11 11:41:30 augustss Exp $ */
/* $FreeBSD$ */
/*
@@ -75,6 +75,7 @@
#define UHCI_STS_HSE 0x0008
#define UHCI_STS_HCPE 0x0010
#define UHCI_STS_HCH 0x0020
+#define UHCI_STS_ALLINTRS 0x003f
#define UHCI_INTR 0x04
#define UHCI_INTR_TOCRCIE 0x0001
diff --git a/sys/dev/usb/uhcivar.h b/sys/dev/usb/uhcivar.h
index 109fb41e5d27..82be04b88ed4 100644
--- a/sys/dev/usb/uhcivar.h
+++ b/sys/dev/usb/uhcivar.h
@@ -1,4 +1,4 @@
-/* $NetBSD: uhcivar.h,v 1.32 2000/08/13 16:18:09 augustss Exp $ */
+/* $NetBSD: uhcivar.h,v 1.33 2002/02/11 11:41:30 augustss Exp $ */
/* $FreeBSD$ */
/*
@@ -83,6 +83,7 @@ typedef struct uhci_intr_info {
struct uhci_xfer {
struct usbd_xfer xfer;
uhci_intr_info_t iinfo;
+ struct usb_task abort_task;
int curframe;
};
@@ -166,6 +167,7 @@ typedef struct uhci_softc {
u_int8_t sc_saved_sof;
u_int16_t sc_saved_frnum;
+ char sc_softwake;
char sc_isreset;
char sc_suspend;
char sc_dying;