move cdev_decl() for usb devices into one place.

usage of cdev_decl() in the driver code is more tricky since i have
kqueue mods here and there and will fix that on that way through.

5 files changed, 30 insertions, 48 deletions

diff --git a/sys/arch/alpha/alpha/conf.c b/sys/arch/alpha/alpha/conf.c
index 37f4d627d7c..36c17de5846 100644
--- a/sys/arch/alpha/alpha/conf.c
+++ b/sys/arch/alpha/alpha/conf.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: conf.c,v 1.42 2002/06/19 02:52:23 mickey Exp $	*/
+/*	$OpenBSD: conf.c,v 1.43 2002/06/24 19:00:33 mickey Exp $	*/
 /*	$NetBSD: conf.c,v 1.16 1996/10/18 21:26:57 cgd Exp $	*/
 
 /*-
@@ -120,15 +120,10 @@ cdev_decl(ksyms);
 
 /* USB Devices */
 #include "usb.h"
-cdev_decl(usb);
 #include "uhid.h"
-cdev_decl(uhid);
 #include "ugen.h"
-cdev_decl(ugen);
 #include "ulpt.h"
-cdev_decl(ulpt);
 #include "ucom.h"
-cdev_decl(ucom);
 #include "pf.h"
 #ifdef USER_PCICONF
 #include "pci.h"
diff --git a/sys/arch/i386/i386/conf.c b/sys/arch/i386/i386/conf.c
index 1f25084e4b4..d6356407da5 100644
--- a/sys/arch/i386/i386/conf.c
+++ b/sys/arch/i386/i386/conf.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: conf.c,v 1.95 2002/06/19 02:52:23 mickey Exp $	*/
+/*	$OpenBSD: conf.c,v 1.96 2002/06/24 19:00:33 mickey Exp $	*/
 /*	$NetBSD: conf.c,v 1.75 1996/05/03 19:40:20 christos Exp $	*/
 
 /*
@@ -187,19 +187,12 @@ cdev_decl(wdt);
 #include "ksyms.h"
 cdev_decl(ksyms);   
 #include "usb.h"
-cdev_decl(usb);
 #include "uhid.h"
-cdev_decl(uhid);
 #include "ugen.h"
-cdev_decl(ugen);
 #include "ulpt.h"
-cdev_decl(ulpt);
 #include "urio.h"
-cdev_decl(urio);
 #include "ucom.h"
-cdev_decl(ucom);
 #include "uscanner.h"
-cdev_decl(uscanner);
 #include "cz.h"
 cdev_decl(cztty);
 #include "radio.h"
diff --git a/sys/arch/macppc/macppc/conf.c b/sys/arch/macppc/macppc/conf.c
index 1d33e6b0cbf..eb4e368b9ce 100644
--- a/sys/arch/macppc/macppc/conf.c
+++ b/sys/arch/macppc/macppc/conf.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: conf.c,v 1.14 2002/06/19 02:52:23 mickey Exp $ */
+/*	$OpenBSD: conf.c,v 1.15 2002/06/24 19:00:33 mickey Exp $ */
 
 /*
  * Copyright (c) 1997 Per Fogelstrom
@@ -119,19 +119,12 @@ cdev_decl(xfs_dev);
 #include "ksyms.h"
 cdev_decl(ksyms);
 #include "usb.h"
-cdev_decl(usb);
 #include "uhid.h"
-cdev_decl(uhid);
 #include "ugen.h"
-cdev_decl(ugen);
 #include "ulpt.h"
-cdev_decl(ulpt);
 #include "urio.h"
-cdev_decl(urio);
 #include "ucom.h"
-cdev_decl(ucom);
 #include "uscanner.h"
-cdev_decl(uscanner);
 
 #include "inet.h"
 
diff --git a/sys/arch/sparc64/include/conf.h b/sys/arch/sparc64/include/conf.h
index 7af2252db93..a0033d0ffc8 100644
--- a/sys/arch/sparc64/include/conf.h
+++ b/sys/arch/sparc64/include/conf.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: conf.h,v 1.10 2002/01/30 23:58:03 jason Exp $	*/
+/*	$OpenBSD: conf.h,v 1.11 2002/06/24 19:00:33 mickey Exp $	*/
 /*	$NetBSD: conf.h,v 1.9 2001/03/26 12:33:26 lukem Exp $	*/
 
 /*-
@@ -113,14 +113,6 @@ cdev_decl(pcons);
 
 cdev_decl(com);
 
-cdev_decl(usb);
-cdev_decl(uhid);
-cdev_decl(ugen);
-cdev_decl(ulpt);
-cdev_decl(urio);
-cdev_decl(ucom);
-cdev_decl(uscanner);
-
 cdev_decl(mtty);
 cdev_decl(mbpp);
 cdev_decl(stty);
diff --git a/sys/sys/conf.h b/sys/sys/conf.h
index 822b4b34a0d..9372a14e17c 100644
--- a/sys/sys/conf.h
+++ b/sys/sys/conf.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: conf.h,v 1.61 2002/06/19 03:03:28 mickey Exp $	*/
+/*	$OpenBSD: conf.h,v 1.62 2002/06/24 19:00:33 mickey Exp $	*/
 /*	$NetBSD: conf.h,v 1.33 1996/05/03 20:03:32 christos Exp $	*/
 
 /*-
@@ -203,14 +203,14 @@ extern struct cdevsw cdevsw[];
 	dev_init(c,n,tty), ttselect, (dev_type_mmap((*))) enodev, \
 	D_TTY | D_KQFILTER, ttkqfilter }
 
-/* open, close, read, ioctl, select */
+/* open, close, read, ioctl, select, nokqfilter */
 #define	cdev_mouse_init(c,n) { \
 	dev_init(c,n,open), dev_init(c,n,close), dev_init(c,n,read), \
 	(dev_type_write((*))) enodev, dev_init(c,n,ioctl), \
 	(dev_type_stop((*))) enodev, 0, dev_init(c,n,select), \
 	(dev_type_mmap((*))) enodev }
 
-/* open, close, read, write, ioctl, select */
+/* open, close, read, write, ioctl, select, nokqfilter */
 #define	cdev_mousewr_init(c,n) { \
 	dev_init(c,n,open), dev_init(c,n,close), dev_init(c,n,read), \
 	dev_init(c,n,write), dev_init(c,n,ioctl), \
@@ -229,14 +229,14 @@ extern struct cdevsw cdevsw[];
 	(dev_type_ioctl((*))) enodev, (dev_type_stop((*))) enodev, \
 	0, seltrue, (dev_type_mmap((*))) enodev }
 
-/* open, close, read, write, ioctl, select -- XXX should be a tty */
+/* open, close, read, write, ioctl, select, kqfilter -- XXX should be a tty */
 #define	cdev_cn_init(c,n) { \
 	dev_init(c,n,open), dev_init(c,n,close), dev_init(c,n,read), \
 	dev_init(c,n,write), dev_init(c,n,ioctl), dev_init(c,n,stop), \
 	0, dev_init(c,n,select), (dev_type_mmap((*))) enodev, \
 	D_TTY | D_KQFILTER, dev_init(c,n,kqfilter) }
 
-/* open, read, write, ioctl, select -- XXX should be a tty */
+/* open, read, write, ioctl, select, kqfilter -- XXX should be a tty */
 #define cdev_ctty_init(c,n) { \
 	dev_init(c,n,open), (dev_type_close((*))) nullop, dev_init(c,n,read), \
 	dev_init(c,n,write), dev_init(c,n,ioctl), (dev_type_stop((*))) nullop, \
@@ -268,14 +268,14 @@ extern struct cdevsw cdevsw[];
 	(dev_type_stop((*))) enodev, 0, (dev_type_select((*))) enodev, \
 	(dev_type_mmap((*))) enodev }
 
-/* open, close, read, write, ioctl, tty, select */
+/* open, close, read, write, ioctl, tty, select, kqfilter */
 #define cdev_ptc_init(c,n) { \
 	dev_init(c,n,open), dev_init(c,n,close), dev_init(c,n,read), \
 	dev_init(c,n,write), dev_init(c,n,ioctl), (dev_type_stop((*))) nullop, \
 	dev_init(c,n,tty), dev_init(c,n,select), (dev_type_mmap((*))) enodev, \
 	D_TTY | D_KQFILTER, ttkqfilter }
 
-/* open, close, read, ioctl, select -- XXX should be a generic device */
+/* open, close, read, ioctl, select, nokqfilter -- XXX should be a generic device */
 #define cdev_log_init(c,n) { \
 	dev_init(c,n,open), dev_init(c,n,close), dev_init(c,n,read), \
 	(dev_type_write((*))) enodev, dev_init(c,n,ioctl), \
@@ -289,7 +289,7 @@ extern struct cdevsw cdevsw[];
 	(dev_type_ioctl((*))) enodev, (dev_type_stop((*))) enodev, \
 	0, (dev_type_select((*))) enodev, (dev_type_mmap((*))) enodev }
 
-/* open, close, read, write, ioctl, select -- XXX should be generic device */
+/* open, close, read, write, ioctl, select, kqfilter -- XXX should be generic device */
 #define cdev_bpftun_init(c,n) { \
 	dev_init(c,n,open), dev_init(c,n,close), dev_init(c,n,read), \
 	dev_init(c,n,write), dev_init(c,n,ioctl), (dev_type_stop((*))) enodev, \
@@ -338,14 +338,14 @@ extern struct cdevsw cdevsw[];
 	(dev_type_stop((*))) enodev, 0, (dev_type_select((*))) enodev, \
 	dev_init(c,n,mmap) }
 
-/* open, close, read, write, ioctl */
+/* open, close, read, write, ioctl, select, kqfilter */
 #define cdev_audio_init(c,n) { \
 	dev_init(c,n,open), dev_init(c,n,close), dev_init(c,n,read), \
 	dev_init(c,n,write), dev_init(c,n,ioctl), \
 	(dev_type_stop((*))) enodev, 0, dev_init(c,n,select), \
 	dev_init(c,n,mmap), D_KQFILTER, dev_init(c,n,kqfilter) }
 
-/* open, close, read, write, ioctl, poll */
+/* open, close, read, write, ioctl, select, nokqfilter */
 #define cdev_midi_init(c,n) { \
 	dev_init(c,n,open), dev_init(c,n,close), dev_init(c,n,read), \
 	dev_init(c,n,write), dev_init(c,n,ioctl), \
@@ -358,7 +358,7 @@ extern struct cdevsw cdevsw[];
 	(dev_type_ioctl((*))) enodev, (dev_type_stop((*))) nullop, \
 	0, (dev_type_select((*))) enodev, (dev_type_mmap((*))) enodev }
 
-/* open, close, read, write, ioctl, select */
+/* open, close, read, write, ioctl, select, nokqfilter */
 #define cdev_xfs_init(c, n) { \
 	dev_init(c,n,open), dev_init(c,n,close), dev_init(c,n,read), \
 	dev_init(c,n,write), dev_init(c,n,ioctl), \
@@ -372,14 +372,14 @@ extern struct cdevsw cdevsw[];
 	(dev_type_stop((*))) enodev, 0, seltrue, \
 	(dev_type_mmap((*))) enodev, 0 }
 
-/* open, close, read, write, ioctl, stop, tty, select, mmap */
+/* open, close, read, write, ioctl, stop, tty, select, mmap, kqfilter */
 #define	cdev_wsdisplay_init(c,n) { \
 	dev_init(c,n,open), dev_init(c,n,close), dev_init(c,n,read), \
 	dev_init(c,n,write), dev_init(c,n,ioctl), dev_init(c,n,stop), \
 	dev_init(c,n,tty), ttselect, dev_init(c,n,mmap), \
 	D_KQFILTER, dev_init(c,n,kqfilter) }
 
-/* open, close, read, write, ioctl, select */
+/* open, close, read, write, ioctl, select, kqfilter */
 #define	cdev_random_init(c,n) { \
 	dev_init(c,n,open), dev_init(c,n,close), dev_init(c,n,read), \
 	dev_init(c,n,write), dev_init(c,n,ioctl), (dev_type_stop((*))) enodev, \
@@ -387,7 +387,7 @@ extern struct cdevsw cdevsw[];
 	D_KQFILTER, dev_init(c,n,kqfilter) }
 void	randomattach(void);
 
-/* open, close, ioctl, select */
+/* open, close, ioctl, select, nokqfilter */
 #define	cdev_usb_init(c,n) { \
 	dev_init(c,n,open), dev_init(c,n,close), (dev_type_read((*))) enodev, \
 	(dev_type_write((*))) enodev, dev_init(c,n,ioctl), \
@@ -407,27 +407,28 @@ void	randomattach(void);
 	(dev_type_stop((*))) enodev, 0, (dev_type_select((*))) enodev, \
 	(dev_type_mmap((*))) enodev }
 
+/* open, close, read, write, ioctl, select, nokqfilter */
 #define	cdev_usbdev_init(c,n) { \
 	dev_init(c,n,open), dev_init(c,n,close), dev_init(c,n,read), \
 	dev_init(c,n,write), dev_init(c,n,ioctl), (dev_type_stop((*))) enodev, \
 	0, dev_init(c,n,select), (dev_type_mmap((*))) enodev }
 
 /* open, close, init */
-#define       cdev_pci_init(c,n) { \
+#define cdev_pci_init(c,n) { \
 	dev_init(c,n,open), dev_init(c,n,close), (dev_type_read((*))) enodev, \
 	(dev_type_write((*))) enodev, dev_init(c,n,ioctl), \
 	(dev_type_stop((*))) enodev, 0, (dev_type_select((*))) enodev, \
 	(dev_type_mmap((*))) enodev }
 
 /* open, close, init */
-#define       cdev_iop_init(c,n) { \
+#define cdev_iop_init(c,n) { \
 	dev_init(c,n,open), dev_init(c,n,close), (dev_type_read((*))) enodev, \
 	(dev_type_write((*))) enodev, dev_init(c,n,ioctl), \
 	(dev_type_stop((*))) enodev, 0, (dev_type_select((*))) enodev, \
 	(dev_type_mmap((*))) enodev }
 
 /* open, close, ioctl */
-#define       cdev_radio_init(c,n) { \
+#define cdev_radio_init(c,n) { \
 	dev_init(c,n,open), dev_init(c,n,close), (dev_type_read((*))) enodev, \
 	(dev_type_write((*))) enodev, dev_init(c,n,ioctl), \
 	(dev_type_stop((*))) enodev, 0, (dev_type_select((*))) enodev, \
@@ -581,4 +582,12 @@ cdev_decl(systrace);
 
 cdev_decl(bio);
 
+cdev_decl(usb);
+cdev_decl(ugen);
+cdev_decl(uhid);
+cdev_decl(ucom);
+cdev_decl(ulpt);
+cdev_decl(uscanner);
+cdev_decl(urio);
+
 #endif