summaryrefslogtreecommitdiff
path: root/sys/dev
diff options
context:
space:
mode:
authoraugustss <augustss@NetBSD.org>2002-02-11 11:41:30 +0000
committeraugustss <augustss@NetBSD.org>2002-02-11 11:41:30 +0000
commit0e66a32e2ce2c18b8b888b72815a815c094cfeed (patch)
tree81be9e4c69b2d9722f237979c97cf658f3fb7bda /sys/dev
parentf8204d29e12facc774ad386f7dc4bfdcd104de24 (diff)
Switch to new abort mechanism.
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 3f980ef56ae..00a1bbafe07 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: src/sys/dev/usb/uhcireg.h,v 1.12 1999/11/17 22:33:42 n_hibma Exp $ */
/*
@@ -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 e7fb5a048a3..90b8a18c77c 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: src/sys/dev/usb/uhcivar.h,v 1.14 1999/11/17 22:33:42 n_hibma Exp $ */
/*
@@ -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;
};
@@ -160,6 +161,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;