From b146ba499d712c962db94d0d1395a39147c8ecf9 Mon Sep 17 00:00:00 2001
From: Josef Karthauser <joe@FreeBSD.org>
Date: Sun, 7 Apr 2002 18:06:34 +0000
Subject: [PATCH] MFNetBSD: uhcireg.h (1.15), uhcivar.h (1.33)

    date: 2002/02/11 11:41:30;  author: augustss;
    Switch to new abort mechanism.
---
 sys/dev/usb/uhcireg.h | 3 ++-
 sys/dev/usb/uhcivar.h | 4 +++-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/sys/dev/usb/uhcireg.h b/sys/dev/usb/uhcireg.h
index 38f1ebd5612..367e648d4fe 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 109fb41e5d2..82be04b88ed 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;