diff options
| author |   fgsch <fgsch@openbsd.org> | 2000-07-04 11:44:20 +0000 |
|---|---|---|
| committer | fgsch <fgsch@openbsd.org> | 2000-07-04 11:44:20 +0000 |
| commit | 82426cf3b279940ef76b217706b0c03228290c05 (patch) | |
| tree | fab3dc409a2eacc9d426d1ae2acfdf2c8551cce1 /sys/dev/usb/uhci.c | |
| parent | add uvisor and clcs, both commented out. (diff) | |
| download | wireguard-openbsd-82426cf3b279940ef76b217706b0c03228290c05.tar.xz wireguard-openbsd-82426cf3b279940ef76b217706b0c03228290c05.zip | |
sync with NetBSD... well almost. someone w/ the hw should check umass.
Diffstat (limited to 'sys/dev/usb/uhci.c')
| -rw-r--r-- | sys/dev/usb/uhci.c | 17 |
1 files changed, 13 insertions, 4 deletions
diff --git a/sys/dev/usb/uhci.c b/sys/dev/usb/uhci.c index e28400a8034..aae1039dcee 100644 --- a/sys/dev/usb/uhci.c +++ b/sys/dev/usb/uhci.c @@ -1,4 +1,4 @@ -/* $OpenBSD: uhci.c,v 1.12 2000/04/14 22:50:25 aaron Exp $ */ +/* $OpenBSD: uhci.c,v 1.13 2000/07/04 11:44:23 fgsch Exp $ */ /* $NetBSD: uhci.c,v 1.110 2000/04/14 14:11:36 augustss Exp $ */ /* $FreeBSD: src/sys/dev/usb/uhci.c,v 1.33 1999/11/17 22:33:41 n_hibma Exp $ */ @@ -7,7 +7,7 @@ * All rights reserved. * * This code is derived from software contributed to The NetBSD Foundation - * by Lennart Augustsson (augustss@carlstedt.se) at + * by Lennart Augustsson (lennart@augustsson.net) at * Carlstedt Research & Technology. * * Redistribution and use in source and binary forms, with or without @@ -1038,6 +1038,12 @@ uhci_intr(arg) } #endif + if (sc->sc_suspend != PWR_RESUME) { + printf("%s: interrupt while not operating ignored\n", + USBDEVNAME(sc->sc_bus.bdev)); + return (0); + } + status = UREAD2(sc, UHCI_STS); if (status == 0) /* The interrupt was not for us. */ return (0); @@ -2551,7 +2557,7 @@ uhci_add_intr(sc, sqh) vf->bandwidth++; } -/* Remove interrupt QH, called with vflock. */ +/* Remove interrupt QH. */ void uhci_remove_intr(sc, sqh) uhci_softc_t *sc; @@ -3112,12 +3118,15 @@ uhci_root_ctrl_start(xfer) index, UREAD2(sc, port))); sc->sc_isreset = 1; break; + case UHF_PORT_POWER: + /* Pretend we turned on power */ + err = USBD_NORMAL_COMPLETION; + goto ret; case UHF_C_PORT_CONNECTION: case UHF_C_PORT_ENABLE: case UHF_C_PORT_OVER_CURRENT: case UHF_PORT_CONNECTION: case UHF_PORT_OVER_CURRENT: - case UHF_PORT_POWER: case UHF_PORT_LOW_SPEED: case UHF_C_PORT_SUSPEND: case UHF_C_PORT_RESET: |