summaryrefslogtreecommitdiff
path: root/sys/dev
diff options
context:
space:
mode:
authorjdolecek <jdolecek@NetBSD.org>2002-10-11 20:29:30 +0000
committerjdolecek <jdolecek@NetBSD.org>2002-10-11 20:29:30 +0000
commit0f4abac044840a9159a55ec693db2906f53a1cdf (patch)
tree1a95d17ccc0799dab7f92e99499698673634e393 /sys/dev
parent63c35652f59ba59cdd494012db1bb513f00ea32a (diff)
use nopoll() instead of empty uriopoll() for NetBSD
rename former uriopoll() to urioselect() and provide it only for OpenBSD - FreeBSD uses nopoll() for urio too g/c no longer needed uriopoll define for OpenBSD
Diffstat (limited to 'sys/dev')
-rw-r--r--sys/dev/usb/urio.c11
-rw-r--r--sys/dev/usb/usb_port.h3
2 files changed, 7 insertions, 7 deletions
diff --git a/sys/dev/usb/urio.c b/sys/dev/usb/urio.c
index 815c141b3d0..93fca4563cb 100644
--- a/sys/dev/usb/urio.c
+++ b/sys/dev/usb/urio.c
@@ -1,4 +1,4 @@
-/* $NetBSD: urio.c,v 1.13 2002/09/06 13:18:43 gehenna Exp $ */
+/* $NetBSD: urio.c,v 1.14 2002/10/11 20:29:30 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.13 2002/09/06 13:18:43 gehenna Exp $");
+__KERNEL_RCSID(0, "$NetBSD: urio.c,v 1.14 2002/10/11 20:29:30 jdolecek Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -90,11 +90,10 @@ dev_type_close(urioclose);
dev_type_read(urioread);
dev_type_write(uriowrite);
dev_type_ioctl(urioioctl);
-dev_type_poll(uriopoll);
const struct cdevsw urio_cdevsw = {
urioopen, urioclose, urioread, uriowrite, urioioctl,
- nostop, notty, uriopoll, nommap,
+ nostop, notty, nopoll, nommap,
};
#elif defined(__OpenBSD__)
cdev_decl(urio);
@@ -580,11 +579,13 @@ ret:
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);
}
+#endif
#if defined(__FreeBSD__)
DRIVER_MODULE(urio, uhub, urio_driver, urio_devclass, usbd_driver_load, 0);
diff --git a/sys/dev/usb/usb_port.h b/sys/dev/usb/usb_port.h
index 844585b2cb9..fe3c5de24bf 100644
--- a/sys/dev/usb/usb_port.h
+++ b/sys/dev/usb/usb_port.h
@@ -1,5 +1,5 @@
/* $OpenBSD: usb_port.h,v 1.18 2000/09/06 22:42:10 rahnds Exp $ */
-/* $NetBSD: usb_port.h,v 1.58 2002/10/01 01:25:26 thorpej Exp $ */
+/* $NetBSD: usb_port.h,v 1.59 2002/10/11 20:29:30 jdolecek Exp $ */
/* $FreeBSD: src/sys/dev/usb/usb_port.h,v 1.21 1999/11/17 22:33:47 n_hibma Exp $ */
/*
@@ -268,7 +268,6 @@ typedef int usb_malloc_type;
#define usbpoll usbselect
#define uhidpoll uhidselect
#define ugenpoll ugenselect
-#define uriopoll urioselect
#define uscannerpoll uscannerselect
#define powerhook_establish(fn, sc) (fn)