diff options
| author | David Gwynne <dlg@cvs.openbsd.org> | 2005-03-30 14:02:04 +0000 |
|---|---|---|
| committer | David Gwynne <dlg@cvs.openbsd.org> | 2005-03-30 14:02:04 +0000 |
| commit | c593492063adad7596bea476f7ca7656c6ec3f33 (patch) | |
| tree | 91e61e1ee77ea5fa73bdb3a349e000cbf29033fa /sys/dev/usb | |
| parent | 0b6d27832ef6d0e331b4660db5272c34ae508242 (diff) | |
make the powerhooks the responsibility of the bus ohci is attached to
ok uwe@
Diffstat (limited to 'sys/dev/usb')
| -rw-r--r-- | sys/dev/usb/ohci.c | 5 | ||||
| -rw-r--r-- | sys/dev/usb/ohcivar.h | 3 |
2 files changed, 3 insertions, 5 deletions
diff --git a/sys/dev/usb/ohci.c b/sys/dev/usb/ohci.c index 9b68c77d6b0..8ec47dc7eca 100644 --- a/sys/dev/usb/ohci.c +++ b/sys/dev/usb/ohci.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ohci.c,v 1.56 2005/03/30 03:01:55 pascoe Exp $ */ +/* $OpenBSD: ohci.c,v 1.57 2005/03/30 14:02:03 dlg Exp $ */ /* $NetBSD: ohci.c,v 1.139 2003/02/22 05:24:16 tsutsui Exp $ */ /* $FreeBSD: src/sys/dev/usb/ohci.c,v 1.22 1999/11/17 22:33:40 n_hibma Exp $ */ @@ -135,7 +135,6 @@ Static usbd_status ohci_alloc_std_chain(struct ohci_pipe *, ohci_soft_td_t *, ohci_soft_td_t **); Static void ohci_shutdown(void *v); -Static void ohci_power(int, void *); Static usbd_status ohci_open(usbd_pipe_handle); Static void ohci_poll(struct usbd_bus *); Static void ohci_softintr(void *); @@ -374,7 +373,6 @@ ohci_detach(struct ohci_softc *sc, int flags) usb_uncallout(sc->sc_tmo_rhsc, ohci_rhsc_enable, sc); #if defined(__NetBSD__) || defined(__OpenBSD__) - powerhook_disestablish(sc->sc_powerhook); shutdownhook_disestablish(sc->sc_shutdownhook); #endif @@ -869,7 +867,6 @@ ohci_init(ohci_softc_t *sc) #if defined(__NetBSD__) || defined(__OpenBSD__) sc->sc_control = sc->sc_intre = 0; - sc->sc_powerhook = powerhook_establish(ohci_power, sc); sc->sc_shutdownhook = shutdownhook_establish(ohci_shutdown, sc); #endif diff --git a/sys/dev/usb/ohcivar.h b/sys/dev/usb/ohcivar.h index 96be803111a..4792958b9c9 100644 --- a/sys/dev/usb/ohcivar.h +++ b/sys/dev/usb/ohcivar.h @@ -1,4 +1,4 @@ -/* $OpenBSD: ohcivar.h,v 1.18 2003/07/08 13:19:09 nate Exp $ */ +/* $OpenBSD: ohcivar.h,v 1.19 2005/03/30 14:02:03 dlg Exp $ */ /* $NetBSD: ohcivar.h,v 1.32 2003/02/22 05:24:17 tsutsui Exp $ */ /* $FreeBSD: src/sys/dev/usb/ohcivar.h,v 1.13 1999/11/17 22:33:41 n_hibma Exp $ */ @@ -152,4 +152,5 @@ int ohci_intr(void *); #if defined(__NetBSD__) || defined(__OpenBSD__) int ohci_detach(ohci_softc_t *, int); int ohci_activate(device_ptr_t, enum devact); +void ohci_power(int, void *); #endif |