[src/trunk]: src/sys/dev/usb Switch to new abort mechanism.

[augustss <augustss%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/0c96120ce4bb
branches:  trunk
changeset: 522085:0c96120ce4bb
user:      augustss <augustss%NetBSD.org@localhost>
date:      Mon Feb 11 11:41:30 2002 +0000

description:
Switch to new abort mechanism.

diffstat:

 sys/dev/usb/uhcireg.h |  3 ++-
 sys/dev/usb/uhcivar.h |  4 +++-
 2 files changed, 5 insertions(+), 2 deletions(-)

diffs (42 lines):

diff -r b749c113cc5e -r 0c96120ce4bb sys/dev/usb/uhcireg.h
--- a/sys/dev/usb/uhcireg.h     Mon Feb 11 11:40:33 2002 +0000
+++ b/sys/dev/usb/uhcireg.h     Mon Feb 11 11:41:30 2002 +0000
@@ -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 -r b749c113cc5e -r 0c96120ce4bb sys/dev/usb/uhcivar.h
--- a/sys/dev/usb/uhcivar.h     Mon Feb 11 11:40:33 2002 +0000
+++ b/sys/dev/usb/uhcivar.h     Mon Feb 11 11:41:30 2002 +0000
@@ -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 @@
 struct uhci_xfer {
        struct usbd_xfer xfer;
        uhci_intr_info_t iinfo;
+       struct usb_task abort_task;
        int curframe;
 };
 
@@ -160,6 +161,7 @@
        u_int8_t sc_saved_sof;
        u_int16_t sc_saved_frnum;
 
+       char sc_softwake;
        char sc_isreset;
        char sc_suspend;
        char sc_dying;