summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--etc/etc.alpha/MAKEDEV.md4
-rw-r--r--etc/etc.hp300/MAKEDEV.md3
-rw-r--r--etc/etc.hppa64/MAKEDEV.md18
-rw-r--r--etc/etc.loongson/MAKEDEV.md3
-rw-r--r--etc/etc.sgi/MAKEDEV.md3
-rw-r--r--etc/etc.socppc/MAKEDEV.md37
-rw-r--r--etc/etc.sparc/MAKEDEV.md4
-rw-r--r--sys/arch/alpha/alpha/conf.c6
-rw-r--r--sys/arch/hp300/hp300/conf.c4
-rw-r--r--sys/arch/hppa64/hppa64/conf.c42
-rw-r--r--sys/arch/landisk/landisk/conf.c23
-rw-r--r--sys/arch/loongson/loongson/conf.c4
-rw-r--r--sys/arch/octeon/octeon/conf.c4
-rw-r--r--sys/arch/sgi/sgi/conf.c6
-rw-r--r--sys/arch/socppc/socppc/conf.c20
-rw-r--r--sys/arch/sparc/sparc/conf.c4
16 files changed, 112 insertions, 73 deletions
diff --git a/etc/etc.alpha/MAKEDEV.md b/etc/etc.alpha/MAKEDEV.md
index c75a05bad16..bd8567579d6 100644
--- a/etc/etc.alpha/MAKEDEV.md
+++ b/etc/etc.alpha/MAKEDEV.md
@@ -1,6 +1,6 @@
define(MACHINE,alpha)dnl
vers(__file__,
- {-$OpenBSD: MAKEDEV.md,v 1.50 2010/09/30 15:27:54 claudio Exp $-},
+ {-$OpenBSD: MAKEDEV.md,v 1.51 2010/11/19 20:55:46 miod Exp $-},
etc.MACHINE)dnl
dnl
dnl Copyright (c) 2001-2006 Todd T. Fries <todd@OpenBSD.org>
@@ -59,7 +59,9 @@ _DEV(uall)
_DEV(ugen, 48)
_DEV(uhid, 46)
_DEV(ulpt, 47)
+_DEV(urio, 65)
_DEV(usb, 45)
+_DEV(uscan, 66)
_TITLE(spec)
_DEV(au, 24)
_DEV(bio, 53)
diff --git a/etc/etc.hp300/MAKEDEV.md b/etc/etc.hp300/MAKEDEV.md
index b1fc49eb8b4..e8fddd8a325 100644
--- a/etc/etc.hp300/MAKEDEV.md
+++ b/etc/etc.hp300/MAKEDEV.md
@@ -1,6 +1,6 @@
define(MACHINE,hp300)dnl
vers(__file__,
- {-$OpenBSD: MAKEDEV.md,v 1.41 2010/09/30 15:27:54 claudio Exp $-},
+ {-$OpenBSD: MAKEDEV.md,v 1.42 2010/11/19 20:55:48 miod Exp $-},
etc.MACHINE)dnl
dnl
dnl Copyright (c) 2001-2006 Todd T. Fries <todd@OpenBSD.org>
@@ -84,6 +84,7 @@ _DEV(bio, 49)
_DEV(bpf, 22)
_DEV(diskmap, 54)
_DEV(fdesc, 21)
+_DEV(hotplug, 56)
_DEV(lkm, 24)
_DEV(nnpfs, 51)
_DEV(pf, 33)
diff --git a/etc/etc.hppa64/MAKEDEV.md b/etc/etc.hppa64/MAKEDEV.md
index 3e39becfca1..37545391b52 100644
--- a/etc/etc.hppa64/MAKEDEV.md
+++ b/etc/etc.hppa64/MAKEDEV.md
@@ -1,6 +1,6 @@
define(MACHINE,hppa64)dnl
vers(__file__,
- {-$OpenBSD: MAKEDEV.md,v 1.21 2010/09/30 15:27:54 claudio Exp $-},
+ {-$OpenBSD: MAKEDEV.md,v 1.22 2010/11/19 20:55:48 miod Exp $-},
etc.MACHINE)dnl
dnl
dnl Copyright (c) 2001-2006 Todd T. Fries <todd@OpenBSD.org>
@@ -50,26 +50,34 @@ _TITLE(point)
_DEV(wsmouse, 29)
_TITLE(prn)
_DEV(lpt, 26)
-dnl _TITLE(usb)
+_TITLE(usb)
+_DEV(uall)
+_DEV(usb, 40)
+_DEV(uhid, 41)
+_DEV(ugen, 42)
+_DEV(ulpt, 43)
+_DEV(urio, 44)
+_DEV(ttyU, 45)
+_DEV(uscan, 46)
_TITLE(spec)
_DEV(au, 35)
_DEV(bio, 37)
_DEV(bpf, 17)
_DEV(cry, 36)
-_DEV(diskmap,47)
+_DEV(diskmap,56)
_DEV(fdesc, 16)
_DEV(lkm, 19)
_DEV(nnpfs, 32)
_DEV(pci, 31)
_DEV(pdc, 22)
_DEV(pf, 21)
-_DEV(pppx,48)
+_DEV(pppx,57)
_DEV(rnd, 20)
_DEV(systrace, 34)
_DEV(tun, 18)
_DEV(uk, 15)
_DEV(vi, 33)
-_DEV(vscsi, 46)
+_DEV(vscsi, 54)
dnl
divert(__mddivert)dnl
dnl
diff --git a/etc/etc.loongson/MAKEDEV.md b/etc/etc.loongson/MAKEDEV.md
index 44b95cdaa53..f3df7a28ae7 100644
--- a/etc/etc.loongson/MAKEDEV.md
+++ b/etc/etc.loongson/MAKEDEV.md
@@ -1,6 +1,6 @@
define(MACHINE,loongson)dnl
vers(__file__,
- {-$OpenBSD: MAKEDEV.md,v 1.9 2010/09/30 15:27:54 claudio Exp $-},
+ {-$OpenBSD: MAKEDEV.md,v 1.10 2010/11/19 20:55:48 miod Exp $-},
etc.MACHINE)dnl
dnl
dnl Copyright (c) 2001-2006 Todd T. Fries <todd@OpenBSD.org>
@@ -63,6 +63,7 @@ _DEV(uhid, 62)
_DEV(ulpt, 64)
_DEV(urio, 65)
_DEV(usb, 61)
+_DEV(uscan, 72)
_TITLE(spec)
_DEV(apm, 14)
_DEV(au, 44)
diff --git a/etc/etc.sgi/MAKEDEV.md b/etc/etc.sgi/MAKEDEV.md
index b08602b27d7..93bfbdce221 100644
--- a/etc/etc.sgi/MAKEDEV.md
+++ b/etc/etc.sgi/MAKEDEV.md
@@ -1,6 +1,6 @@
define(MACHINE,sgi)dnl
vers(__file__,
- {-$OpenBSD: MAKEDEV.md,v 1.32 2010/09/30 15:27:54 claudio Exp $-},
+ {-$OpenBSD: MAKEDEV.md,v 1.33 2010/11/19 20:55:48 miod Exp $-},
etc.MACHINE)dnl
dnl
dnl Copyright (c) 2001-2006 Todd T. Fries <todd@OpenBSD.org>
@@ -62,6 +62,7 @@ _DEV(uhid, 62)
_DEV(ulpt, 64)
_DEV(urio, 65)
_DEV(usb, 61)
+_DEV(uscan, 72)
_TITLE(spec)
_DEV(au, 44)
_DEV(bio, 49)
diff --git a/etc/etc.socppc/MAKEDEV.md b/etc/etc.socppc/MAKEDEV.md
index 68e7a22002e..a303bdea809 100644
--- a/etc/etc.socppc/MAKEDEV.md
+++ b/etc/etc.socppc/MAKEDEV.md
@@ -1,6 +1,6 @@
define(MACHINE,socppc)dnl
vers(__file__,
- {-$OpenBSD: MAKEDEV.md,v 1.12 2010/09/30 15:27:54 claudio Exp $-},
+ {-$OpenBSD: MAKEDEV.md,v 1.13 2010/11/19 20:55:48 miod Exp $-},
etc.MACHINE)dnl
dnl
dnl Copyright (c) 2001-2006 Todd T. Fries <todd@OpenBSD.org>
@@ -18,7 +18,7 @@ dnl ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
dnl OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
dnl
dnl
-__devitem(apm, apm, Power management device)dnl
+dnl __devitem(apm, apm, Power management device)dnl
_TITLE(make)
_DEV(all)
_DEV(ramd)
@@ -49,8 +49,8 @@ _DEV(wsmux, 70)
_TITLE(point)
_DEV(wsmouse, 69)
_TITLE(usb)
-_DEV(ttyU, 66)
_DEV(uall)
+_DEV(ttyU, 66)
_DEV(ugen, 63)
_DEV(uhid, 62)
_DEV(ulpt, 64)
@@ -58,29 +58,29 @@ _DEV(urio, 65)
_DEV(usb, 61)
_DEV(uscan, 74)
_TITLE(spec)
-_DEV(apm, 25)
-_DEV(au, 44)
-_DEV(bio, 80)
-dnl _DEV(bktr, 75)
+dnl _DEV(apm, 25)
+dnl _DEV(au, 44)
+dnl _DEV(bio, 80)
+dnl dnl _DEV(bktr, 75)
_DEV(bpf, 22)
_DEV(bthub, 81)
-_DEV(cry, 47)
+dnl _DEV(cry, 47)
_DEV(diskmap, 82)
_DEV(fdesc, 21)
-_DEV(gpio, 79)
-_DEV(hotplug, 78)
-_DEV(iop, 73)
+dnl _DEV(gpio, 79)
+_DEV(hotplug, 84)
+dnl _DEV(iop, 73)
_DEV(lkm, 24)
-_DEV(nnpfs, 51)
+dnl _DEV(nnpfs, 51)
_DEV(pci, 71)
_DEV(pf, 39)
_DEV(pppx, 83)
-_DEV(radio, 76)
+dnl _DEV(radio, 76)
_DEV(rnd, 40)
_DEV(systrace, 50)
_DEV(tun, 23)
dnl _DEV(tuner, 75)
-_DEV(uk, 41)
+dnl _DEV(uk, 41)
_DEV(vi, 44)
_DEV(vscsi, 78)
dnl
@@ -93,20 +93,17 @@ dnl
dnl *** socppc specific targets
dnl
target(all, ch, 0)dnl
-target(all, nnpfs, 0)dnl
+dnl target(all, nnpfs, 0)dnl
target(all, vscsi, 0)dnl
target(all, diskmap)dnl
-twrget(all, flo, fd, 0, 0B, 0C, 0D, 0E, 0F, 0G, 0H)dnl
-twrget(all, flo, fd, 1, 1B, 1C, 1D, 1E, 1F, 1G, 1H)dnl
target(all, pty, 0)dnl
target(all, bpf, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9)dnl
target(all, tun, 0, 1, 2, 3)dnl
-target(all, xy, 0, 1, 2, 3)dnl
target(all, rd, 0)dnl
target(all, cd, 0, 1)dnl
target(all, sd, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9)dnl
target(all, vnd, 0, 1, 2, 3)dnl
target(all, ccd, 0, 1, 2, 3)dnl
-target(all, gpio, 0, 1, 2)dnl
-target(all, bio)dnl
+dnl target(all, gpio, 0, 1, 2)dnl
+dnl target(all, bio)dnl
target(all, bthub, 0, 1, 2)dnl
diff --git a/etc/etc.sparc/MAKEDEV.md b/etc/etc.sparc/MAKEDEV.md
index f6778ce95e6..1926ce4d3ce 100644
--- a/etc/etc.sparc/MAKEDEV.md
+++ b/etc/etc.sparc/MAKEDEV.md
@@ -1,6 +1,6 @@
define(MACHINE,sparc)dnl
vers(__file__,
- {-$OpenBSD: MAKEDEV.md,v 1.45 2010/09/30 15:27:54 claudio Exp $-},
+ {-$OpenBSD: MAKEDEV.md,v 1.46 2010/11/19 20:55:48 miod Exp $-},
etc.MACHINE)dnl
dnl
dnl Copyright (c) 2001-2006 Todd T. Fries <todd@OpenBSD.org>
@@ -98,6 +98,7 @@ _DEV(bio, 124)
_DEV(bpf, 105)
_DEV(diskmap, 129)
_DEV(fdesc, 24)
+_DEV(hotplug, 131)
_DEV(lkm, 112)
_DEV(nnpfs, 51)
_DEV(oppr)
@@ -136,7 +137,6 @@ target(all, pty, 0)dnl
target(all, bpf, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9)dnl
target(all, tun, 0, 1, 2, 3)dnl
target(all, xy, 0, 1, 2, 3)dnl
-target(all, hk, 0, 1, 2, 3)dnl
target(all, rd, 0)dnl
target(all, cd, 0, 1)dnl
target(all, sd, 0, 1, 2, 3, 4)dnl
diff --git a/sys/arch/alpha/alpha/conf.c b/sys/arch/alpha/alpha/conf.c
index 905dd18eae8..2463e994747 100644
--- a/sys/arch/alpha/alpha/conf.c
+++ b/sys/arch/alpha/alpha/conf.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: conf.c,v 1.64 2010/09/23 05:02:14 claudio Exp $ */
+/* $OpenBSD: conf.c,v 1.65 2010/11/19 20:55:48 miod Exp $ */
/* $NetBSD: conf.c,v 1.16 1996/10/18 21:26:57 cgd Exp $ */
/*-
@@ -124,7 +124,9 @@ cdev_decl(nnpfs_dev);
#include "uhid.h"
#include "ugen.h"
#include "ulpt.h"
+#include "urio.h"
#include "ucom.h"
+#include "uscanner.h"
#include "pf.h"
#ifdef USER_PCICONF
#include "pci.h"
@@ -212,6 +214,8 @@ struct cdevsw cdevsw[] =
cdev_bthub_init(NBTHUB, bthub), /* 62: bthub */
cdev_disk_init(1,diskmap), /* 63: disk mapper */
cdev_pppx_init(NPPPX,pppx), /* 64: pppx */
+ cdev_urio_init(NURIO,urio), /* 65: USB Diamond Rio 500 */
+ cdev_usbdev_init(NUSCANNER,uscanner), /* 66: USB scanners */
};
int nchrdev = sizeof (cdevsw) / sizeof (cdevsw[0]);
diff --git a/sys/arch/hp300/hp300/conf.c b/sys/arch/hp300/hp300/conf.c
index 32ea18e52a7..3a198fe1106 100644
--- a/sys/arch/hp300/hp300/conf.c
+++ b/sys/arch/hp300/hp300/conf.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: conf.c,v 1.49 2010/09/23 05:02:14 claudio Exp $ */
+/* $OpenBSD: conf.c,v 1.50 2010/11/19 20:55:48 miod Exp $ */
/* $NetBSD: conf.c,v 1.39 1997/05/12 08:17:53 thorpej Exp $ */
/*-
@@ -114,6 +114,7 @@ cdev_decl(nnpfs_dev);
#include "systrace.h"
#include "vscsi.h"
#include "pppx.h"
+#include "hotplug.h"
struct cdevsw cdevsw[] =
{
@@ -177,6 +178,7 @@ struct cdevsw cdevsw[] =
cdev_vscsi_init(NVSCSI,vscsi), /* 53: vscsi */
cdev_disk_init(1,diskmap), /* 54: disk mapper */
cdev_pppx_init(NPPPX,pppx), /* 55: pppx */
+ cdev_hotplug_init(NHOTPLUG,hotplug), /* 56: devices hot plugging */
};
int nchrdev = sizeof(cdevsw) / sizeof(cdevsw[0]);
diff --git a/sys/arch/hppa64/hppa64/conf.c b/sys/arch/hppa64/hppa64/conf.c
index 98e38afa1fd..995715976df 100644
--- a/sys/arch/hppa64/hppa64/conf.c
+++ b/sys/arch/hppa64/hppa64/conf.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: conf.c,v 1.16 2010/09/23 05:02:14 claudio Exp $ */
+/* $OpenBSD: conf.c,v 1.17 2010/11/19 20:55:48 miod Exp $ */
/*-
* Copyright (c) 1991 The Regents of the University of California.
@@ -108,7 +108,7 @@ cdev_decl(com);
#include "pf.h"
#include "systrace.h"
-
+#include "hotplug.h"
#include "vscsi.h"
#include "pppx.h"
@@ -117,6 +117,17 @@ cdev_decl(com);
cdev_decl(pci);
#endif
+#include "usb.h"
+#include "uhid.h"
+#include "ugen.h"
+#include "ulpt.h"
+#include "urio.h"
+#include "ucom.h"
+#include "uscanner.h"
+
+#include "bthub.h"
+
+
struct cdevsw cdevsw[] =
{
cdev_cn_init(1,cn), /* 0: virtual console */
@@ -168,15 +179,24 @@ struct cdevsw cdevsw[] =
cdev_bio_init(NBIO,bio), /* 37: ioctl tunnel */
cdev_ptm_init(NPTY,ptm), /* 38: pseudo-tty ptm device */
cdev_disk_init(NWD,wd), /* 39: ST506 disk */
- cdev_lkm_dummy(), /* 40 */
- cdev_lkm_dummy(), /* 41 */
- cdev_lkm_dummy(), /* 42 */
- cdev_lkm_dummy(), /* 43 */
- cdev_lkm_dummy(), /* 44 */
- cdev_lkm_dummy(), /* 45 */
- cdev_vscsi_init(NVSCSI,vscsi), /* 46: vscsi */
- cdev_disk_init(1,diskmap), /* 47: disk mapper */
- cdev_pppx_init(NPPPX,pppx), /* 48: pppx */
+ cdev_usb_init(NUSB,usb), /* 40: USB controller */
+ cdev_usbdev_init(NUHID,uhid), /* 41: USB generic HID */
+ cdev_usbdev_init(NUGEN,ugen), /* 42: USB generic driver */
+ cdev_ulpt_init(NULPT,ulpt), /* 43: USB printers */
+ cdev_urio_init(NURIO,urio), /* 44: USB Diamond Rio 500 */
+ cdev_tty_init(NUCOM,ucom), /* 45: USB tty */
+ cdev_usbdev_init(NUSCANNER,uscanner), /* 46: USB scanners */
+ cdev_hotplug_init(NHOTPLUG,hotplug), /* 47: devices hot plugging */
+ cdev_lkm_dummy(), /* 48: */
+ cdev_lkm_dummy(), /* 49: */
+ cdev_lkm_dummy(), /* 50: */
+ cdev_lkm_dummy(), /* 51: */
+ cdev_lkm_dummy(), /* 52: */
+ cdev_lkm_dummy(), /* 53: */
+ cdev_vscsi_init(NVSCSI,vscsi), /* 54: vscsi */
+ cdev_bthub_init(NBTHUB,bthub), /* 55: bthub */
+ cdev_disk_init(1,diskmap), /* 56: disk mapper */
+ cdev_pppx_init(NPPPX,pppx), /* 57: pppx */
};
int nchrdev = sizeof(cdevsw) / sizeof(cdevsw[0]);
diff --git a/sys/arch/landisk/landisk/conf.c b/sys/arch/landisk/landisk/conf.c
index 8c23e827a2f..f6dc1139745 100644
--- a/sys/arch/landisk/landisk/conf.c
+++ b/sys/arch/landisk/landisk/conf.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: conf.c,v 1.17 2010/09/23 05:02:14 claudio Exp $ */
+/* $OpenBSD: conf.c,v 1.18 2010/11/19 20:55:48 miod Exp $ */
/*
* Copyright (c) 1994-1998 Mark Brinicombe.
@@ -39,7 +39,7 @@
* Character and Block Device configuration
* Console configuration
*
- * Defines the structures cdevsw and constab
+ * Defines the structures [bc]devsw
*
* Created : 17/09/94
*/
@@ -76,15 +76,6 @@
#include "ksyms.h"
/*
- * APM interface
- */
-#ifdef CONF_HAVE_APM
-#include "apm.h"
-#else
-#define NAPM 0
-#endif
-
-/*
* Disk/Filesystem pseudo-devices
*/
#include "ccd.h" /* concatenated disk driver */
@@ -272,12 +263,6 @@ cdev_decl(nnpfs_dev);
#include "vscsi.h"
#include "pppx.h"
-#ifdef CONF_HAVE_GPIO
-#include "gpio.h"
-#else
-#define NGPIO 0
-#endif
-
struct cdevsw cdevsw[] = {
cdev_cn_init(1,cn), /* 0: virtual console */
cdev_ctty_init(1,ctty), /* 1: controlling terminal */
@@ -292,7 +277,7 @@ struct cdevsw cdevsw[] = {
cdev_lkm_dummy(), /* 10: */
cdev_tty_init(NSCIF,scif), /* 11: scif */
cdev_tty_init(NCOM,com), /* 12: serial port */
- cdev_gpio_init(NGPIO,gpio), /* 13: GPIO interface */
+ cdev_lkm_dummy(), /* 13: */
cdev_lkm_dummy(), /* 14: */
cdev_lkm_dummy(), /* 15: */
cdev_disk_init(NWD,wd), /* 16: ST506/ESDI/IDE disk */
@@ -313,7 +298,7 @@ struct cdevsw cdevsw[] = {
cdev_lkm_dummy(), /* 31: */
cdev_lkm_dummy(), /* 32: */
cdev_tun_init(NTUN,tun), /* 33: network tunnel */
- cdev_apm_init(NAPM,apm), /* 34: APM interface */
+ cdev_lkm_dummy(), /* 34: */
cdev_lkm_init(NLKM,lkm), /* 35: loadable module driver */
cdev_audio_init(NAUDIO,audio), /* 36: generic audio I/O */
cdev_hotplug_init(NHOTPLUG,hotplug), /* 37: devices hot plugging*/
diff --git a/sys/arch/loongson/loongson/conf.c b/sys/arch/loongson/loongson/conf.c
index b7b9eedbcaa..c5f81fd983d 100644
--- a/sys/arch/loongson/loongson/conf.c
+++ b/sys/arch/loongson/loongson/conf.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: conf.c,v 1.9 2010/09/23 05:02:14 claudio Exp $ */
+/* $OpenBSD: conf.c,v 1.10 2010/11/19 20:55:48 miod Exp $ */
/*
* Copyright (c) 1992, 1993
@@ -130,6 +130,7 @@ cdev_decl(pci);
#include "ulpt.h"
#include "urio.h"
#include "ucom.h"
+#include "uscanner.h"
#include "bthub.h"
#include "vscsi.h"
@@ -217,6 +218,7 @@ struct cdevsw cdevsw[] =
cdev_vscsi_init(NVSCSI,vscsi), /* 69: vscsi */
cdev_disk_init(1,diskmap), /* 70: disk mapper */
cdev_pppx_init(NPPPX,pppx), /* 71: pppx */
+ cdev_usbdev_init(NUSCANNER,uscanner), /* 72: USB scanners */
};
int nchrdev = sizeof (cdevsw) / sizeof (cdevsw[0]);
diff --git a/sys/arch/octeon/octeon/conf.c b/sys/arch/octeon/octeon/conf.c
index 7ff5d2fbba3..ade4586fec4 100644
--- a/sys/arch/octeon/octeon/conf.c
+++ b/sys/arch/octeon/octeon/conf.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: conf.c,v 1.3 2010/10/26 00:02:01 syuu Exp $ */
+/* $OpenBSD: conf.c,v 1.4 2010/11/19 20:55:48 miod Exp $ */
/*
* Copyright (c) 1992, 1993
@@ -137,6 +137,7 @@ cdev_decl(pci);
#include "ulpt.h"
#include "urio.h"
#include "ucom.h"
+#include "uscanner.h"
#include "bthub.h"
#include "vscsi.h"
@@ -228,6 +229,7 @@ struct cdevsw cdevsw[] =
cdev_vscsi_init(NVSCSI,vscsi), /* 69: vscsi */
cdev_disk_init(1,diskmap), /* 70: disk mapper */
cdev_pppx_init(NPPPX,pppx), /* 71: pppx */
+ cdev_usbdev_init(NUSCANNER,uscanner), /* 72: USB scanners */
};
int nchrdev = sizeof (cdevsw) / sizeof (cdevsw[0]);
diff --git a/sys/arch/sgi/sgi/conf.c b/sys/arch/sgi/sgi/conf.c
index cabd3c8105f..f2ef0f0b5d2 100644
--- a/sys/arch/sgi/sgi/conf.c
+++ b/sys/arch/sgi/sgi/conf.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: conf.c,v 1.25 2010/09/23 05:02:14 claudio Exp $ */
+/* $OpenBSD: conf.c,v 1.26 2010/11/19 20:55:48 miod Exp $ */
/*
* Copyright (c) 1992, 1993
@@ -129,6 +129,8 @@ cdev_decl(pci);
#include "ulpt.h"
#include "urio.h"
#include "ucom.h"
+#include "uscanner.h"
+
#include "vscsi.h"
#include "pppx.h"
@@ -213,6 +215,8 @@ struct cdevsw cdevsw[] =
cdev_vscsi_init(NVSCSI,vscsi), /* 68: vscsi */
cdev_disk_init(1,diskmap), /* 69: disk mapper */
cdev_pppx_init(NPPPX,pppx), /* 70: pppx */
+ cdev_notdef(), /* 71: */
+ cdev_usbdev_init(NUSCANNER,uscanner), /* 72: USB scanners */
};
int nchrdev = sizeof (cdevsw) / sizeof (cdevsw[0]);
diff --git a/sys/arch/socppc/socppc/conf.c b/sys/arch/socppc/socppc/conf.c
index b983c485bb2..6cb234c321f 100644
--- a/sys/arch/socppc/socppc/conf.c
+++ b/sys/arch/socppc/socppc/conf.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: conf.c,v 1.11 2010/09/23 05:02:14 claudio Exp $ */
+/* $OpenBSD: conf.c,v 1.12 2010/11/19 20:55:48 miod Exp $ */
/*
* Copyright (c) 1997 Per Fogelstrom
@@ -109,10 +109,16 @@ cdev_decl(pci);
#include "ksyms.h"
#include "usb.h"
#include "uhid.h"
+#include "ugen.h"
+#include "ulpt.h"
+#include "urio.h"
+#include "ucom.h"
+#include "uscanner.h"
#include "bthub.h"
#include "vscsi.h"
#include "pppx.h"
+#include "hotplug.h"
struct cdevsw cdevsw[] = {
cdev_cn_init(1,cn), /* 0: virtual console */
@@ -178,10 +184,10 @@ struct cdevsw cdevsw[] = {
cdev_notdef(), /* 60 */
cdev_usb_init(NUSB,usb), /* 61: USB controller */
cdev_usbdev_init(NUHID,uhid), /* 62: USB generic HID */
- cdev_notdef(), /* 63 */
- cdev_notdef(), /* 64 */
- cdev_notdef(), /* 65 */
- cdev_notdef(), /* 66 */
+ cdev_usbdev_init(NUGEN,ugen), /* 63: USB generic driver */
+ cdev_ulpt_init(NULPT,ulpt), /* 64: USB printers */
+ cdev_urio_init(NURIO,urio), /* 65: USB Diamond Rio 500 */
+ cdev_tty_init(NUCOM,ucom), /* 66: USB tty */
cdev_wsdisplay_init(NWSDISPLAY, /* 67: frame buffers, etc. */
wsdisplay),
cdev_mouse_init(NWSKBD, wskbd), /* 68: keyboards */
@@ -195,7 +201,7 @@ struct cdevsw cdevsw[] = {
#endif
cdev_notdef(), /* 72 */
cdev_notdef(), /* 73 */
- cdev_notdef(), /* 74 */
+ cdev_usbdev_init(NUSCANNER,uscanner), /* 74: usb scanner */
cdev_notdef(), /* 75 */
cdev_notdef(), /* 76 */
cdev_ptm_init(NPTY,ptm), /* 77: pseudo-tty ptm device */
@@ -205,6 +211,7 @@ struct cdevsw cdevsw[] = {
cdev_bthub_init(NBTHUB,bthub), /* 81: bluetooth hub */
cdev_disk_init(1,diskmap), /* 82: disk mapper */
cdev_pppx_init(NPPPX,pppx), /* 83: pppx */
+ cdev_hotplug_init(NHOTPLUG,hotplug), /* 84: devices hot plugging */
};
int nchrdev = sizeof cdevsw / sizeof cdevsw[0];
@@ -302,6 +309,7 @@ int nchrtoblktbl = sizeof(chrtoblktbl) / sizeof(chrtoblktbl[0]);
#include <dev/cons.h>
+#define comcnpollc nullcnpollc
cons_decl(com);
struct consdev constab[] = {
diff --git a/sys/arch/sparc/sparc/conf.c b/sys/arch/sparc/sparc/conf.c
index f6db91c50e9..cf7bced3f9f 100644
--- a/sys/arch/sparc/sparc/conf.c
+++ b/sys/arch/sparc/sparc/conf.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: conf.c,v 1.54 2010/09/23 05:02:14 claudio Exp $ */
+/* $OpenBSD: conf.c,v 1.55 2010/11/19 20:55:48 miod Exp $ */
/* $NetBSD: conf.c,v 1.40 1996/04/11 19:20:03 thorpej Exp $ */
/*
@@ -129,6 +129,7 @@ int nblkdev = sizeof(bdevsw) / sizeof(bdevsw[0]);
#include "tctrl.h"
#include "vscsi.h"
#include "pppx.h"
+#include "hotplug.h"
struct cdevsw cdevsw[] =
{
@@ -270,6 +271,7 @@ struct cdevsw cdevsw[] =
cdev_vscsi_init(NVSCSI,vscsi), /* 128: vscsi */
cdev_disk_init(1,diskmap), /* 129: disk mapper */
cdev_pppx_init(NPPPX,pppx), /* 130: pppx */
+ cdev_hotplug_init(NHOTPLUG,hotplug), /* 131: devices hot plugging */
};
int nchrdev = sizeof(cdevsw) / sizeof(cdevsw[0]);
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-26 23:11:34 +0000