diff options
| author | joe <joe@FreeBSD.org> | 2002-01-26 12:04:22 +0000 |
|---|---|---|
| committer | joe <joe@FreeBSD.org> | 2002-01-26 12:04:22 +0000 |
| commit | 102fdc4f0a532992ab09937febc22df37cc7b579 (patch) | |
| tree | 8222196b5e2a8f7ebfce2834d2eb9a1be1b2cbaf /sys/dev/usb/ohcivar.h | |
| parent | cc5a433a5e8a9fedce126874b6188478b8453575 (diff) | |
| download | FreeBSD-src-102fdc4f0a532992ab09937febc22df37cc7b579.zip FreeBSD-src-102fdc4f0a532992ab09937febc22df37cc7b579.tar.gz | |
Merge from NetBSD:
ohci.c: revision 1.72 and 1.73
ohcivar.h: revision 1.19 and 1.20
uhci.c: revision 1.85
usbdi.h: a small part of revision 1.40
usbdivar.h: revision 1.47
Relevant commit messages from NetBSD are:
date: 2000/02/22 11:30:54; author: augustss; state: Exp;
Prepare a little for having USB interrupt processing done
outside the hard interrupt level (in a thread or a softintr).
No real soft processing done yet.
----------------------------
date: 2000/02/01 05:42:53; author: augustss; state: Exp;
Put some #ifdefs around power and shutdown hooks.
Diffstat (limited to 'sys/dev/usb/ohcivar.h')
| -rw-r--r-- | sys/dev/usb/ohcivar.h | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/sys/dev/usb/ohcivar.h b/sys/dev/usb/ohcivar.h index adf68a7..b72ccba 100644 --- a/sys/dev/usb/ohcivar.h +++ b/sys/dev/usb/ohcivar.h @@ -1,4 +1,4 @@ -/* $NetBSD: ohcivar.h,v 1.18 2000/01/18 20:11:00 augustss Exp $ */ +/* $NetBSD: ohcivar.h,v 1.20 2000/02/22 11:30:55 augustss Exp $ */ /* $FreeBSD$ */ /* @@ -111,11 +111,13 @@ typedef struct ohci_softc { usbd_xfer_handle sc_intrxfer; + ohci_physaddr_t sc_done; + char sc_vendor[16]; int sc_id_vendor; -#if defined(__NetBSD__) - void *sc_powerhook; +#if defined(__NetBSD__) || defined(__OpenBSD__) + void *sc_powerhook; /* cookie from power hook */ void *sc_shutdownhook; /* cookie from shutdown hook */ #endif |
