using cdev_ugen_init for all sorts of usb devices is just one pint less wrong than using cdev_decl_random for the same purpose

4 files changed, 11 insertions, 11 deletions

diff --git a/sys/arch/alpha/alpha/conf.c b/sys/arch/alpha/alpha/conf.c
index 8eaf119c66c..37f4d627d7c 100644
--- a/sys/arch/alpha/alpha/conf.c
+++ b/sys/arch/alpha/alpha/conf.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: conf.c,v 1.41 2002/06/11 05:15:17 miod Exp $	*/
+/*	$OpenBSD: conf.c,v 1.42 2002/06/19 02:52:23 mickey Exp $	*/
 /*	$NetBSD: conf.c,v 1.16 1996/10/18 21:26:57 cgd Exp $	*/
 
 /*-
@@ -189,7 +189,7 @@ struct cdevsw	cdevsw[] =
 	cdev_usb_init(NUSB,usb),	/* 45: USB controller */
 	cdev_usbdev_init(NUHID,uhid),	/* 46: USB generic HID */
 	cdev_ulpt_init(NULPT,ulpt),	/* 47: USB printer */
-	cdev_ugen_init(NUGEN,ugen),	/* 48: USB generic driver */
+	cdev_usbdev_init(NUGEN,ugen),	/* 48: USB generic driver */
 	cdev_tty_init(NUCOM, ucom),	/* 49: USB tty */
 	cdev_systrace_init(NSYSTRACE,systrace),	/* 50 system call tracing */
 #ifdef XFS
diff --git a/sys/arch/i386/i386/conf.c b/sys/arch/i386/i386/conf.c
index d090818c657..1f25084e4b4 100644
--- a/sys/arch/i386/i386/conf.c
+++ b/sys/arch/i386/i386/conf.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: conf.c,v 1.94 2002/06/18 23:16:50 fgsch Exp $	*/
+/*	$OpenBSD: conf.c,v 1.95 2002/06/19 02:52:23 mickey Exp $	*/
 /*	$NetBSD: conf.c,v 1.75 1996/05/03 19:40:20 christos Exp $	*/
 
 /*
@@ -309,7 +309,7 @@ struct cdevsw	cdevsw[] =
 	/* End of reserved slots for isdn4bsd. */
 	cdev_usb_init(NUSB,usb),	/* 61: USB controller */
 	cdev_usbdev_init(NUHID,uhid),	/* 62: USB generic HID */
-	cdev_ugen_init(NUGEN,ugen),	/* 63: USB generic driver */
+	cdev_usbdev_init(NUGEN,ugen),	/* 63: USB generic driver */
 	cdev_ulpt_init(NULPT,ulpt), 	/* 64: USB printers */
 	cdev_usbdev_init(NURIO,urio),	/* 65: USB Diamond Rio 500 */
 	cdev_tty_init(NUCOM,ucom),	/* 66: USB tty */
@@ -328,7 +328,7 @@ struct cdevsw	cdevsw[] =
 	cdev_altq_init(NALTQ,altq),	/* 74: ALTQ control interface */
 	cdev_iop_init(NIOP,iop),	/* 75: I2O IOP control interface */
 	cdev_radio_init(NRADIO, radio), /* 76: generic radio I/O */
-	cdev_ugen_init(NUSCANNER,uscanner),	/* 77: USB scanners */
+	cdev_usbdev_init(NUSCANNER,uscanner),	/* 77: USB scanners */
 	cdev_systrace_init(NSYSTRACE,systrace),	/* 78: system call tracing */
  	cdev_oci_init(NBIO,bio),	/* 79: ioctl tunnel */
 	cdev_ch_init(NGPR,gpr)		/* 80: GPR400 SmartCard reader */
diff --git a/sys/arch/macppc/macppc/conf.c b/sys/arch/macppc/macppc/conf.c
index 174ea40e180..1d33e6b0cbf 100644
--- a/sys/arch/macppc/macppc/conf.c
+++ b/sys/arch/macppc/macppc/conf.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: conf.c,v 1.13 2002/06/11 03:43:46 miod Exp $ */
+/*	$OpenBSD: conf.c,v 1.14 2002/06/19 02:52:23 mickey Exp $ */
 
 /*
  * Copyright (c) 1997 Per Fogelstrom
@@ -222,7 +222,7 @@ struct cdevsw cdevsw[] = {
 	/* End of reserved slots for isdn4bsd. */
 	cdev_usb_init(NUSB,usb),	/* 61: USB controller */
 	cdev_usbdev_init(NUHID,uhid),	/* 62: USB generic HID */
-	cdev_ugen_init(NUGEN,ugen),	/* 63: USB generic driver */
+	cdev_usbdev_init(NUGEN,ugen),	/* 63: USB generic driver */
 	cdev_ulpt_init(NULPT,ulpt),	/* 64: USB printers */
 	cdev_usbdev_init(NURIO,urio),	/* 65: USB Diamond Rio 500 */
 	cdev_tty_init(NUCOM,ucom),	/* 66: USB tty */
@@ -239,7 +239,7 @@ struct cdevsw cdevsw[] = {
 #endif
 	cdev_altq_init(NALTQ,altq),	/* 72: ALTQ control interface */
 	cdev_iop_init(NIOP,iop),	/* 73: I2O IOP control interface */
-	cdev_ugen_init(NUSCANNER,uscanner), /* 74: usb scanner */
+	cdev_usbdev_init(NUSCANNER,uscanner), /* 74: usb scanner */
 };
 int nchrdev = sizeof cdevsw / sizeof cdevsw[0];
 
diff --git a/sys/arch/sparc64/sparc64/conf.c b/sys/arch/sparc64/sparc64/conf.c
index dcdf4376633..c6cccd6bd09 100644
--- a/sys/arch/sparc64/sparc64/conf.c
+++ b/sys/arch/sparc64/sparc64/conf.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: conf.c,v 1.31 2002/06/11 05:15:21 miod Exp $	*/
+/*	$OpenBSD: conf.c,v 1.32 2002/06/19 02:52:24 mickey Exp $	*/
 /*	$NetBSD: conf.c,v 1.17 2001/03/26 12:33:26 lukem Exp $ */
 
 /*
@@ -262,11 +262,11 @@ struct cdevsw	cdevsw[] =
 	cdev_notdef(),			/* 89 */
 	cdev_usb_init(NUSB,usb),	/* 90: USB controller */
 	cdev_usbdev_init(NUHID,uhid),	/* 91: USB generic HID */
-	cdev_ugen_init(NUGEN,ugen),	/* 92: USB generic driver */
+	cdev_usbdev_init(NUGEN,ugen),	/* 92: USB generic driver */
 	cdev_ulpt_init(NULPT,ulpt),	/* 93: USB printers */
 	cdev_usbdev_init(NURIO,urio),	/* 94: USB Diamond Rio 500 */
 	cdev_tty_init(NUCOM,ucom),	/* 95: USB tty */
-	cdev_ugen_init(NUSCANNER,uscanner), /* 96: USB scanners */
+	cdev_usbdev_init(NUSCANNER,uscanner), /* 96: USB scanners */
 	cdev_notdef(),			/* 97 */
 	cdev_notdef(),			/* 98 */
 	cdev_notdef(),			/* 99 */