aboutsummaryrefslogtreecommitdiff
path: root/sys/dev/usb/uhid.c
diff options
context:
space:
mode:
Diffstat (limited to 'sys/dev/usb/uhid.c')
-rw-r--r--sys/dev/usb/uhid.c30
1 files changed, 15 insertions, 15 deletions
diff --git a/sys/dev/usb/uhid.c b/sys/dev/usb/uhid.c
index cffc5e543330..7914cb341f5f 100644
--- a/sys/dev/usb/uhid.c
+++ b/sys/dev/usb/uhid.c
@@ -163,7 +163,7 @@ Static void uhid_intr(usbd_xfer_handle, usbd_private_handle,
Static int uhid_do_read(struct uhid_softc *, struct uio *uio, int);
Static int uhid_do_write(struct uhid_softc *, struct uio *uio, int);
Static int uhid_do_ioctl(struct uhid_softc *, u_long, caddr_t, int,
- struct proc *);
+ struct thread *);
USB_DECLARE_DRIVER(uhid);
@@ -373,11 +373,11 @@ uhid_intr(xfer, addr, status)
}
int
-uhidopen(dev, flag, mode, p)
+uhidopen(dev, flag, mode, td)
dev_t dev;
int flag;
int mode;
- struct proc *p;
+ struct thread *td;
{
struct uhid_softc *sc;
usbd_status err;
@@ -422,11 +422,11 @@ uhidopen(dev, flag, mode, p)
}
int
-uhidclose(dev, flag, mode, p)
+uhidclose(dev, flag, mode, td)
dev_t dev;
int flag;
int mode;
- struct proc *p;
+ struct thread *td;
{
struct uhid_softc *sc;
@@ -588,12 +588,12 @@ uhidwrite(dev, uio, flag)
}
int
-uhid_do_ioctl(sc, cmd, addr, flag, p)
+uhid_do_ioctl(sc, cmd, addr, flag, td)
struct uhid_softc *sc;
u_long cmd;
caddr_t addr;
int flag;
- struct proc *p;
+ struct thread *td;
{
struct usb_ctl_report_desc *rd;
struct usb_ctl_report *re;
@@ -614,8 +614,8 @@ uhid_do_ioctl(sc, cmd, addr, flag, p)
if (*(int *)addr) {
if (sc->sc_async != NULL)
return (EBUSY);
- sc->sc_async = p;
- DPRINTF(("uhid_do_ioctl: FIOASYNC %p\n", p));
+ sc->sc_async = td->td_proc; /* XXXKSE */
+ DPRINTF(("uhid_do_ioctl: FIOASYNC %p\n", td->td_proc));
} else
sc->sc_async = NULL;
break;
@@ -703,12 +703,12 @@ uhid_do_ioctl(sc, cmd, addr, flag, p)
}
int
-uhidioctl(dev, cmd, addr, flag, p)
+uhidioctl(dev, cmd, addr, flag, td)
dev_t dev;
u_long cmd;
caddr_t addr;
int flag;
- struct proc *p;
+ struct thread *td;
{
struct uhid_softc *sc;
int error;
@@ -716,17 +716,17 @@ uhidioctl(dev, cmd, addr, flag, p)
USB_GET_SC(uhid, UHIDUNIT(dev), sc);
sc->sc_refcnt++;
- error = uhid_do_ioctl(sc, cmd, addr, flag, p);
+ error = uhid_do_ioctl(sc, cmd, addr, flag, td);
if (--sc->sc_refcnt < 0)
usb_detach_wakeup(USBDEV(sc->sc_dev));
return (error);
}
int
-uhidpoll(dev, events, p)
+uhidpoll(dev, events, td)
dev_t dev;
int events;
- struct proc *p;
+ struct thread *td;
{
struct uhid_softc *sc;
int revents = 0;
@@ -744,7 +744,7 @@ uhidpoll(dev, events, p)
if (sc->sc_q.c_cc > 0)
revents |= events & (POLLIN | POLLRDNORM);
else
- selrecord(p, &sc->sc_rsel);
+ selrecord(td, &sc->sc_rsel);
}
splx(s);