Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

===================================================================
RCS file: /ftp/cvs/cvsroot/src/sys/dev/usb/uhid.c,v
rcsdiff: /ftp/cvs/cvsroot/src/sys/dev/usb/uhid.c,v: warning: Unknown phrases like `commitid ...;' are present.
retrieving revision 1.67
retrieving revision 1.68
diff -u -p -r1.67 -r1.68
--- src/sys/dev/usb/uhid.c	2005/11/28 13:14:48	1.67
+++ src/sys/dev/usb/uhid.c	2005/12/11 12:24:01	1.68
@@ -1,4 +1,4 @@
-/*	$NetBSD: uhid.c,v 1.67 2005/11/28 13:14:48 augustss Exp $	*/
+/*	$NetBSD: uhid.c,v 1.68 2005/12/11 12:24:01 christos Exp $	*/
 
 /*
  * Copyright (c) 1998, 2004 The NetBSD Foundation, Inc.
@@ -42,7 +42,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: uhid.c,v 1.67 2005/11/28 13:14:48 augustss Exp $");
+__KERNEL_RCSID(0, "$NetBSD: uhid.c,v 1.68 2005/12/11 12:24:01 christos Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -120,7 +120,7 @@ Static void uhid_intr(struct uhidev *, v
 
 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, usb_proc_ptr);
+Static int uhid_do_ioctl(struct uhid_softc*, u_long, caddr_t, int, struct lwp *);
 
 USB_DECLARE_DRIVER(uhid);
 
@@ -254,7 +254,7 @@ uhid_intr(struct uhidev *addr, void *dat
 }
 
 int
-uhidopen(dev_t dev, int flag, int mode, usb_proc_ptr p)
+uhidopen(dev_t dev, int flag, int mode, struct lwp *l)
 {
 	struct uhid_softc *sc;
 	int error;
@@ -282,7 +282,7 @@ uhidopen(dev_t dev, int flag, int mode, 
 }
 
 int
-uhidclose(dev_t dev, int flag, int mode, usb_proc_ptr p)
+uhidclose(dev_t dev, int flag, int mode, struct lwp *l)
 {
 	struct uhid_softc *sc;
 
@@ -415,7 +415,7 @@ uhidwrite(dev_t dev, struct uio *uio, in
 
 int
 uhid_do_ioctl(struct uhid_softc *sc, u_long cmd, caddr_t addr,
-	      int flag, usb_proc_ptr p)
+	      int flag, struct lwp *l)
 {
 	struct usb_ctl_report_desc *rd;
 	struct usb_ctl_report *re;
@@ -438,8 +438,8 @@ uhid_do_ioctl(struct uhid_softc *sc, u_l
 		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 = l->l_proc;
+			DPRINTF(("uhid_do_ioctl: FIOASYNC %p\n", l->l_proc));
 		} else
 			sc->sc_async = NULL;
 		break;
@@ -553,7 +553,7 @@ uhid_do_ioctl(struct uhid_softc *sc, u_l
 }
 
 int
-uhidioctl(dev_t dev, u_long cmd, caddr_t addr, int flag, usb_proc_ptr p)
+uhidioctl(dev_t dev, u_long cmd, caddr_t addr, int flag, struct lwp *l)
 {
 	struct uhid_softc *sc;
 	int error;
@@ -561,14 +561,14 @@ uhidioctl(dev_t dev, u_long cmd, caddr_t
 	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, l);
 	if (--sc->sc_refcnt < 0)
 		usb_detach_wakeup(USBDEV(sc->sc_hdev.sc_dev));
 	return (error);
 }
 
 int
-uhidpoll(dev_t dev, int events, usb_proc_ptr p)
+uhidpoll(dev_t dev, int events, struct lwp *l)
 {
 	struct uhid_softc *sc;
 	int revents = 0;
@@ -586,7 +586,7 @@ uhidpoll(dev_t dev, int events, usb_proc
 		if (sc->sc_q.c_cc > 0)
 			revents |= events & (POLLIN | POLLRDNORM);
 		else
-			selrecord(p, &sc->sc_rsel);
+			selrecord(l, &sc->sc_rsel);
 	}
 
 	splx(s);