diff options
| author |   fgsch <fgsch@openbsd.org> | 1999-09-27 18:03:54 +0000 |
|---|---|---|
| committer | fgsch <fgsch@openbsd.org> | 1999-09-27 18:03:54 +0000 |
| commit | ce4d70384102ffb4292ce6d5ad41a0c78ffc56f8 (patch) | |
| tree | e9e92c3bacab4732d6236ada4d4ec8efc4eebce7 /sys/dev/usb/uhid.c | |
| parent | regen. (diff) | |
| download | wireguard-openbsd-ce4d70384102ffb4292ce6d5ad41a0c78ffc56f8.tar.xz wireguard-openbsd-ce4d70384102ffb4292ce6d5ad41a0c78ffc56f8.zip | |
Sync with NetBSD.
Diffstat (limited to 'sys/dev/usb/uhid.c')
| -rw-r--r-- | sys/dev/usb/uhid.c | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/sys/dev/usb/uhid.c b/sys/dev/usb/uhid.c index a626d8d0d59..ca1ba498cd3 100644 --- a/sys/dev/usb/uhid.c +++ b/sys/dev/usb/uhid.c @@ -1,5 +1,5 @@ -/* $OpenBSD: uhid.c,v 1.4 1999/08/31 07:42:50 fgsch Exp $ */ -/* $NetBSD: uhid.c,v 1.21 1999/08/23 22:55:14 augustss Exp $ */ +/* $OpenBSD: uhid.c,v 1.5 1999/09/27 18:03:55 fgsch Exp $ */ +/* $NetBSD: uhid.c,v 1.24 1999/09/05 19:32:18 augustss Exp $ */ /* * Copyright (c) 1998 The NetBSD Foundation, Inc. @@ -82,7 +82,7 @@ int uhiddebug = 0; #endif struct uhid_softc { - bdevice sc_dev; /* base device */ + USBBASEDEVICE sc_dev; /* base device */ usbd_interface_handle sc_iface; /* interface */ usbd_pipe_handle sc_intrpipe; /* interrupt pipe */ int sc_ep_addr; @@ -203,11 +203,11 @@ USB_ATTACH(uhid) " bInterval=%d\n", ed->bLength, ed->bDescriptorType, ed->bEndpointAddress & UE_ADDR, - ed->bEndpointAddress & UE_IN ? "in" : "out", + UE_GET_DIR(ed->bEndpointAddress)==UE_DIR_IN? "in" : "out", ed->bmAttributes & UE_XFERTYPE, UGETW(ed->wMaxPacketSize), ed->bInterval)); - if ((ed->bEndpointAddress & UE_IN) != UE_IN || + if (UE_GET_DIR(ed->bEndpointAddress) != UE_DIR_IN || (ed->bmAttributes & UE_XFERTYPE) != UE_INTERRUPT) { printf("%s: unexpected endpoint\n", USBDEVNAME(sc->sc_dev)); sc->sc_dying = 1; @@ -240,7 +240,7 @@ USB_ATTACH(uhid) int uhid_activate(self, act) - bdevice *self; + device_ptr_t self; enum devact act; { struct uhid_softc *sc = (struct uhid_softc *)self; @@ -259,7 +259,7 @@ uhid_activate(self, act) int uhid_detach(self, flags) - bdevice *self; + device_ptr_t self; int flags; { struct uhid_softc *sc = (struct uhid_softc *)self; @@ -278,7 +278,7 @@ uhid_detach(self, flags) /* Wake everyone */ wakeup(&sc->sc_q); /* Wait for processes to go away. */ - usb_detach_wait(&sc->sc_dev); + usb_detach_wait(USBDEV(sc->sc_dev)); } splx(s); } @@ -485,7 +485,7 @@ uhidread(dev, uio, flag) sc->sc_refcnt++; error = uhid_do_read(sc, uio, flag); if (--sc->sc_refcnt < 0) - usb_detach_wakeup(&sc->sc_dev); + usb_detach_wakeup(USBDEV(sc->sc_dev)); return (error); } @@ -537,7 +537,7 @@ uhidwrite(dev, uio, flag) sc->sc_refcnt++; error = uhid_do_write(sc, uio, flag); if (--sc->sc_refcnt < 0) - usb_detach_wakeup(&sc->sc_dev); + usb_detach_wakeup(USBDEV(sc->sc_dev)); return (error); } @@ -629,7 +629,7 @@ uhidioctl(dev, cmd, addr, flag, p) sc->sc_refcnt++; error = uhid_do_ioctl(sc, cmd, addr, flag, p); if (--sc->sc_refcnt < 0) - usb_detach_wakeup(&sc->sc_dev); + usb_detach_wakeup(USBDEV(sc->sc_dev)); return (error); } |