summaryrefslogtreecommitdiffstats
path: root/sys/dev/usb/uhid.c
diff options
context:
space:
mode:
authorfgsch <fgsch@openbsd.org>1999-08-27 09:00:27 +0000
committerfgsch <fgsch@openbsd.org>1999-08-27 09:00:27 +0000
commitf8958cb133f9eb5739e597c8ff14f11ad08247f1 (patch)
tree25320e66f045c2f1d8bd86d03657a43934af7a6f /sys/dev/usb/uhid.c
parentsync (diff)
downloadwireguard-openbsd-f8958cb133f9eb5739e597c8ff14f11ad08247f1.tar.xz
wireguard-openbsd-f8958cb133f9eb5739e597c8ff14f11ad08247f1.zip
Sync with NetBSD;
Make sure not to call tsleep() from suspend/resume routine. Move more of the transfer completion processing to HC independent code. Fix some problems with transfer abort & timeout. Merge the soft_{td,qh} with the real {td,qh}. This saves time and space.
Diffstat (limited to 'sys/dev/usb/uhid.c')
-rw-r--r--sys/dev/usb/uhid.c15
1 files changed, 13 insertions, 2 deletions
diff --git a/sys/dev/usb/uhid.c b/sys/dev/usb/uhid.c
index c8069545114..74feaaca1d7 100644
--- a/sys/dev/usb/uhid.c
+++ b/sys/dev/usb/uhid.c
@@ -1,5 +1,5 @@
-/* $OpenBSD: uhid.c,v 1.2 1999/08/16 22:08:49 fgsch Exp $ */
-/* $NetBSD: uhid.c,v 1.18 1999/06/30 06:44:23 augustss Exp $ */
+/* $OpenBSD: uhid.c,v 1.3 1999/08/27 09:00:29 fgsch Exp $ */
+/* $NetBSD: uhid.c,v 1.21 1999/08/23 22:55:14 augustss Exp $ */
/*
* Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -243,6 +243,17 @@ uhid_activate(self, act)
struct device *self;
enum devact act;
{
+ struct uhid_softc *sc = (struct uhid_softc *)self;
+
+ switch (act) {
+ case DVACT_ACTIVATE:
+ return (EOPNOTSUPP);
+ break;
+
+ case DVACT_DEACTIVATE:
+ sc->sc_dying = 1;
+ break;
+ }
return (0);
}