diff options
| author | Nathan Binkert <nate@cvs.openbsd.org> | 2003-07-08 13:19:10 +0000 |
|---|---|---|
| committer | Nathan Binkert <nate@cvs.openbsd.org> | 2003-07-08 13:19:10 +0000 |
| commit | e375f3615c7463097f3e178339aad0f6ec36c197 (patch) | |
| tree | 5080b79ebe15758c7db466ea511c6083b4d9fad2 /sys/dev/usb/uhcivar.h | |
| parent | 18791832a5c844c5d36cd0f7afaf4e92d40bcd09 (diff) | |
Sync USB code with NetBSD.
This includes numerous fixes and paves the way for usb 2.0 support.
Diffstat (limited to 'sys/dev/usb/uhcivar.h')
| -rw-r--r-- | sys/dev/usb/uhcivar.h | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/sys/dev/usb/uhcivar.h b/sys/dev/usb/uhcivar.h index 6ec5b6fd01b..403362b55fd 100644 --- a/sys/dev/usb/uhcivar.h +++ b/sys/dev/usb/uhcivar.h @@ -1,5 +1,5 @@ -/* $OpenBSD: uhcivar.h,v 1.14 2002/07/25 02:18:10 nate Exp $ */ -/* $NetBSD: uhcivar.h,v 1.32 2000/08/13 16:18:09 augustss Exp $ */ +/* $OpenBSD: uhcivar.h,v 1.15 2003/07/08 13:19:09 nate Exp $ */ +/* $NetBSD: uhcivar.h,v 1.36 2002/12/31 00:39:11 augustss Exp $ */ /* $FreeBSD: src/sys/dev/usb/uhcivar.h,v 1.14 1999/11/17 22:33:42 n_hibma Exp $ */ /* @@ -84,6 +84,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; }; @@ -161,6 +162,10 @@ typedef struct uhci_softc { u_int8_t sc_saved_sof; u_int16_t sc_saved_frnum; +#ifdef USB_USE_SOFTINTR + char sc_softwake; +#endif /* USB_USE_SOFTINTR */ + char sc_isreset; char sc_suspend; char sc_dying; @@ -172,7 +177,7 @@ typedef struct uhci_softc { usbd_xfer_handle sc_intr_xfer; /* root hub interrupt transfer */ usb_callout_t sc_poll_handle; - char sc_vendor[16]; /* vendor string for root hub */ + char sc_vendor[32]; /* vendor string for root hub */ int sc_id_vendor; /* vendor ID for root hub */ void *sc_powerhook; /* cookie from power hook */ |