Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/kqueue]: src/sys/dev/usb sync with rev. 1.14: g/c uriopoll() and only pr...



details:   https://anonhg.NetBSD.org/src/rev/f110c269ee8b
branches:  kqueue
changeset: 512551:f110c269ee8b
user:      jdolecek <jdolecek%NetBSD.org@localhost>
date:      Fri Oct 11 21:05:09 2002 +0000

description:
sync with rev. 1.14: g/c uriopoll() and only provide urioselect() for OpenBSD

g/c uriokqfilter() and use nokqfilter() instead

diffstat:

 sys/dev/usb/urio.c |  19 ++++++-------------
 1 files changed, 6 insertions(+), 13 deletions(-)

diffs (54 lines):

diff -r 052263a9afe1 -r f110c269ee8b sys/dev/usb/urio.c
--- a/sys/dev/usb/urio.c        Fri Oct 11 20:59:40 2002 +0000
+++ b/sys/dev/usb/urio.c        Fri Oct 11 21:05:09 2002 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: urio.c,v 1.5.6.5 2002/10/10 18:42:43 jdolecek Exp $    */
+/*     $NetBSD: urio.c,v 1.5.6.6 2002/10/11 21:05:09 jdolecek Exp $    */
 
 /*
  * Copyright (c) 2000 The NetBSD Foundation, Inc.
@@ -43,7 +43,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: urio.c,v 1.5.6.5 2002/10/10 18:42:43 jdolecek Exp $");
+__KERNEL_RCSID(0, "$NetBSD: urio.c,v 1.5.6.6 2002/10/11 21:05:09 jdolecek Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -90,12 +90,10 @@
 dev_type_read(urioread);
 dev_type_write(uriowrite);
 dev_type_ioctl(urioioctl);
-dev_type_poll(uriopoll);
-dev_type_kqfilter(uriokqfilter);
 
 const struct cdevsw urio_cdevsw = {
        urioopen, urioclose, urioread, uriowrite, urioioctl,
-       nostop, notty, uriopoll, nommap, uriokqfilter,
+       nostop, notty, nopoll, nommap, nokqfilter,
 };
 #elif defined(__OpenBSD__)
 cdev_decl(urio);
@@ -581,18 +579,13 @@
        return (error);
 }
 
+#if defined(__OpenBSD__)
 int
-uriopoll(dev_t dev, int events, usb_proc_ptr p)
+urioselect(dev_t dev, int events, usb_proc_ptr p)
 {
        return (0);
 }
-
-int
-uriokqfilter(dev_t dev, struct knote *kn)
-{
-
-       return (1);
-}
+#endif
 
 #if defined(__FreeBSD__)
 DRIVER_MODULE(urio, uhub, urio_driver, urio_devclass, usbd_driver_load, 0);



Home | Main Index | Thread Index | Old Index