summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--etc/etc.alpha/MAKEDEV.md4
-rw-r--r--etc/etc.armish/MAKEDEV.md4
-rw-r--r--etc/etc.hppa/MAKEDEV.md4
-rw-r--r--etc/etc.landisk/MAKEDEV.md4
-rw-r--r--etc/etc.loongson/MAKEDEV.md4
-rw-r--r--etc/etc.palm/MAKEDEV.md4
-rw-r--r--etc/etc.sparc64/MAKEDEV.md4
-rw-r--r--etc/etc.zaurus/MAKEDEV.md4
-rw-r--r--sys/arch/alpha/alpha/conf.c4
-rw-r--r--sys/arch/arm/arm/conf.c8
-rw-r--r--sys/arch/hppa/hppa/conf.c5
-rw-r--r--sys/arch/landisk/landisk/conf.c8
-rw-r--r--sys/arch/loongson/loongson/conf.c7
-rw-r--r--sys/arch/socppc/socppc/conf.c7
-rw-r--r--sys/arch/sparc64/sparc64/conf.c5
15 files changed, 60 insertions, 16 deletions
diff --git a/etc/etc.alpha/MAKEDEV.md b/etc/etc.alpha/MAKEDEV.md
index 2a90d08a01a..7bf5de28373 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.44 2009/08/13 15:12:36 deraadt Exp $-},
+ {-$OpenBSD: MAKEDEV.md,v 1.45 2010/03/30 19:16:09 matthieu Exp $-},
etc.MACHINE)dnl
dnl
dnl Copyright (c) 2001-2006 Todd T. Fries <todd@OpenBSD.org>
@@ -85,6 +85,7 @@ _DEV(uk, 33)
_DEV(vi, 44)
_DEV(nnpfs, 51)
_DEV(vscsi, 61)
+_DEV(bthub, 62)
dnl
divert(__mddivert)dnl
dnl
@@ -125,4 +126,5 @@ 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, bthub, 0, 1, 2)dnl
target(ramd, ttyB, 0, 1)dnl
diff --git a/etc/etc.armish/MAKEDEV.md b/etc/etc.armish/MAKEDEV.md
index eded7977bc2..b16cc7bb221 100644
--- a/etc/etc.armish/MAKEDEV.md
+++ b/etc/etc.armish/MAKEDEV.md
@@ -1,6 +1,6 @@
define(MACHINE,armish)dnl
vers(__file__,
- {-$OpenBSD: MAKEDEV.md,v 1.15 2009/08/13 15:12:36 deraadt Exp $-},
+ {-$OpenBSD: MAKEDEV.md,v 1.16 2010/03/30 19:16:09 matthieu Exp $-},
etc.MACHINE)dnl
dnl
dnl Copyright (c) 2001-2004 Todd T. Fries <todd@OpenBSD.org>
@@ -91,6 +91,7 @@ _DEV(tuner, 75)
_DEV(vi, 38)
_DEV(nnpfs, 51)
_DEV(vscsi, 100)
+_DEV(bthub, 101)
dnl
divert(__mddivert)dnl
dnl
@@ -120,3 +121,4 @@ 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, bthub, 0, 1, 2)dnl
diff --git a/etc/etc.hppa/MAKEDEV.md b/etc/etc.hppa/MAKEDEV.md
index 6d45b1f8523..56b502b681a 100644
--- a/etc/etc.hppa/MAKEDEV.md
+++ b/etc/etc.hppa/MAKEDEV.md
@@ -1,6 +1,6 @@
define(MACHINE,hppa)dnl
vers(__file__,
- {-$OpenBSD: MAKEDEV.md,v 1.39 2009/08/13 15:12:36 deraadt Exp $-},
+ {-$OpenBSD: MAKEDEV.md,v 1.40 2010/03/30 19:16:09 matthieu Exp $-},
etc.MACHINE)dnl
dnl
dnl Copyright (c) 2001-2006 Todd T. Fries <todd@OpenBSD.org>
@@ -78,6 +78,7 @@ _DEV(uk, 15)
_DEV(vi, 33)
_DEV(nnpfs, 32)
_DEV(vscsi, 54)
+_DEV(bthub,55)
dnl
divert(__mddivert)dnl
dnl
@@ -108,6 +109,7 @@ 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, bthub, 0, 1, 2)dnl
target(ramd, pty, 0)dnl
target(ramd, hil)dnl
target(ramd, tun, 0, 1)dnl
diff --git a/etc/etc.landisk/MAKEDEV.md b/etc/etc.landisk/MAKEDEV.md
index 6d52cca1330..ca64239cd19 100644
--- a/etc/etc.landisk/MAKEDEV.md
+++ b/etc/etc.landisk/MAKEDEV.md
@@ -1,6 +1,6 @@
define(MACHINE,landisk)dnl
vers(__file__,
- {-$OpenBSD: MAKEDEV.md,v 1.17 2009/08/13 15:12:36 deraadt Exp $-},
+ {-$OpenBSD: MAKEDEV.md,v 1.18 2010/03/30 19:16:09 matthieu Exp $-},
etc.MACHINE)dnl
dnl
dnl Copyright (c) 2001-2004 Todd T. Fries <todd@OpenBSD.org>
@@ -95,6 +95,7 @@ dnl _DEV(tuner, 75)
_DEV(vi, 77)
_DEV(nnpfs, 51)
_DEV(vscsi, 99)
+_DEV(bthub,100)
dnl
divert(__mddivert)dnl
dnl
@@ -125,3 +126,4 @@ 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, bthub, 0, 1, 2)dnl
diff --git a/etc/etc.loongson/MAKEDEV.md b/etc/etc.loongson/MAKEDEV.md
index 8d015a0b87f..94c57eeb139 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.2 2010/02/28 08:31:18 otto Exp $-},
+ {-$OpenBSD: MAKEDEV.md,v 1.3 2010/03/30 19:16:09 matthieu Exp $-},
etc.MACHINE)dnl
dnl
dnl Copyright (c) 2001-2006 Todd T. Fries <todd@OpenBSD.org>
@@ -82,6 +82,7 @@ _DEV(uk, 32)
_DEV(vi, 45)
_DEV(nnpfs, 51)
_DEV(vscsi, 68)
+_DEV(bthub, 69)
dnl
divert(__mddivert)dnl
dnl
@@ -106,5 +107,6 @@ 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, bthub, 0, 1, 2)dnl
target(ramd, pty, 0)dnl
target(ramd, bio)dnl
diff --git a/etc/etc.palm/MAKEDEV.md b/etc/etc.palm/MAKEDEV.md
index eaf3c9c8081..838645a995d 100644
--- a/etc/etc.palm/MAKEDEV.md
+++ b/etc/etc.palm/MAKEDEV.md
@@ -1,6 +1,6 @@
define(MACHINE,palm)dnl
vers(__file__,
- {-$OpenBSD: MAKEDEV.md,v 1.1 2009/09/05 02:19:09 marex Exp $-},
+ {-$OpenBSD: MAKEDEV.md,v 1.2 2010/03/30 19:16:09 matthieu Exp $-},
etc.MACHINE)dnl
dnl
dnl Copyright (c) 2001-2004 Todd T. Fries <todd@OpenBSD.org>
@@ -88,6 +88,7 @@ _DEV(systrace, 50)
_DEV(tuner, 75)
_DEV(vi, 38)
_DEV(nnpfs, 51)
+_DEV(bthub, 101)
dnl
divert(__mddivert)dnl
dnl
@@ -117,3 +118,4 @@ 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, ttyC, 0, 1)dnl
+target(all, bthub, 0, 1, 2)dnl
diff --git a/etc/etc.sparc64/MAKEDEV.md b/etc/etc.sparc64/MAKEDEV.md
index 5f124486b12..ca0950ac0b8 100644
--- a/etc/etc.sparc64/MAKEDEV.md
+++ b/etc/etc.sparc64/MAKEDEV.md
@@ -1,6 +1,6 @@
define(MACHINE,sparc64)dnl
vers(__file__,
- {-$OpenBSD: MAKEDEV.md,v 1.55 2009/08/13 15:12:36 deraadt Exp $-},
+ {-$OpenBSD: MAKEDEV.md,v 1.56 2010/03/30 19:16:09 matthieu Exp $-},
etc.MACHINE)dnl
dnl
dnl Copyright (c) 2001-2006 Todd T. Fries <todd@OpenBSD.org>
@@ -118,6 +118,7 @@ _DEV(uperf, 25)
_DEV(vi, 44)
_DEV(nnpfs, 51)
_DEV(vscsi, 128)
+_DEV(bthub, 129)
dnl
divert(__mddivert)dnl
dnl
@@ -157,6 +158,7 @@ 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, bpp, 0)dnl
+target(all, bthub, 0, 1, 2)dnl
twrget(all, s64_tzs, tty, a, b, c, d)dnl
twrget(all, s64_czs, cua, a, b, c, d)dnl
twrget(all, vcc, ttyV, 0, 1, 2, 3)dnl
diff --git a/etc/etc.zaurus/MAKEDEV.md b/etc/etc.zaurus/MAKEDEV.md
index c9ed268940f..baa908f41ba 100644
--- a/etc/etc.zaurus/MAKEDEV.md
+++ b/etc/etc.zaurus/MAKEDEV.md
@@ -1,6 +1,6 @@
define(MACHINE,zaurus)dnl
vers(__file__,
- {-$OpenBSD: MAKEDEV.md,v 1.22 2009/08/13 15:12:36 deraadt Exp $-},
+ {-$OpenBSD: MAKEDEV.md,v 1.23 2010/03/30 19:16:09 matthieu Exp $-},
etc.MACHINE)dnl
dnl
dnl Copyright (c) 2001-2004 Todd T. Fries <todd@OpenBSD.org>
@@ -89,6 +89,7 @@ _DEV(tuner, 75)
_DEV(vi, 38)
_DEV(nnpfs, 51)
_DEV(vscsi, 100)
+_DEV(bthub, 101)
dnl
divert(__mddivert)dnl
dnl
@@ -119,3 +120,4 @@ 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, ttyC, 0, 1)dnl
+target(all, bthub, 0, 1, 2)dnl
diff --git a/sys/arch/alpha/alpha/conf.c b/sys/arch/alpha/alpha/conf.c
index 877e2cdc497..b415cde65f1 100644
--- a/sys/arch/alpha/alpha/conf.c
+++ b/sys/arch/alpha/alpha/conf.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: conf.c,v 1.60 2009/08/13 15:04:20 dlg Exp $ */
+/* $OpenBSD: conf.c,v 1.61 2010/03/30 19:16:09 matthieu Exp $ */
/* $NetBSD: conf.c,v 1.16 1996/10/18 21:26:57 cgd Exp $ */
/*-
@@ -131,6 +131,7 @@ cdev_decl(nnpfs_dev);
#include "pci.h"
cdev_decl(pci);
#endif
+#include "bthub.h"
#include "systrace.h"
#include "hotplug.h"
@@ -208,6 +209,7 @@ struct cdevsw cdevsw[] =
cdev_radio_init(NRADIO,radio), /* 59: generic radio I/O */
cdev_mouse_init(NWSMUX, wsmux), /* 60: ws multiplexor */
cdev_vscsi_init(NVSCSI, vscsi), /* 61: vscsi */
+ cdev_bthub_init(NBTHUB, bthub), /* 62: bthub */
};
int nchrdev = sizeof (cdevsw) / sizeof (cdevsw[0]);
diff --git a/sys/arch/arm/arm/conf.c b/sys/arch/arm/arm/conf.c
index c28e3fe6d69..1a4dd1773b7 100644
--- a/sys/arch/arm/arm/conf.c
+++ b/sys/arch/arm/arm/conf.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: conf.c,v 1.23 2009/08/13 15:04:20 dlg Exp $ */
+/* $OpenBSD: conf.c,v 1.24 2010/03/30 19:16:09 matthieu Exp $ */
/* $NetBSD: conf.c,v 1.10 2002/04/19 01:04:38 wiz Exp $ */
/*
@@ -141,6 +141,11 @@ cdev_decl(pci);
#include "uscanner.h"
/*
+ * Bluetooth devices
+ */
+#include "bthub.h"
+
+/*
* WSCONS devices
*/
#include "wsdisplay.h"
@@ -404,6 +409,7 @@ struct cdevsw cdevsw[] = {
cdev_ptm_init(NPTY,ptm), /* 98: pseudo-tty ptm device */
cdev_spkr_init(NSPKR,spkr), /* 99: PC speaker */
cdev_vscsi_init(NVSCSI,vscsi), /* 100: vscsi */
+ cdev_bthub_init(NBTHUB,bthub), /* 101: bthub */
};
int nblkdev = sizeof(bdevsw) / sizeof(bdevsw[0]);
diff --git a/sys/arch/hppa/hppa/conf.c b/sys/arch/hppa/hppa/conf.c
index 7d0df892a08..9d5404bd81a 100644
--- a/sys/arch/hppa/hppa/conf.c
+++ b/sys/arch/hppa/hppa/conf.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: conf.c,v 1.48 2009/08/13 15:10:26 dlg Exp $ */
+/* $OpenBSD: conf.c,v 1.49 2010/03/30 19:16:09 matthieu Exp $ */
/*-
* Copyright (c) 1991 The Regents of the University of California.
@@ -124,6 +124,8 @@ cdev_decl(pci);
#include "ucom.h"
#include "uscanner.h"
+#include "bthub.h"
+
struct cdevsw cdevsw[] =
{
cdev_cn_init(1,cn), /* 0: virtual console */
@@ -190,6 +192,7 @@ struct cdevsw cdevsw[] =
cdev_lkm_dummy(), /* 52: */
cdev_lkm_dummy(), /* 53: */
cdev_vscsi_init(NVSCSI,vscsi), /* 54: vscsi */
+ cdev_bthub_init(NBTHUB,bthub), /* 55: bthub */
};
int nchrdev = sizeof(cdevsw) / sizeof(cdevsw[0]);
diff --git a/sys/arch/landisk/landisk/conf.c b/sys/arch/landisk/landisk/conf.c
index 98fb35877d1..cc7c2fcd9f6 100644
--- a/sys/arch/landisk/landisk/conf.c
+++ b/sys/arch/landisk/landisk/conf.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: conf.c,v 1.13 2009/08/13 15:04:20 dlg Exp $ */
+/* $OpenBSD: conf.c,v 1.14 2010/03/30 19:16:09 matthieu Exp $ */
/*
* Copyright (c) 1994-1998 Mark Brinicombe.
@@ -133,6 +133,11 @@ cdev_decl(pci);
#include "uscanner.h"
/*
+ * Bluetooth devices
+ */
+#include "bthub.h"
+
+/*
* WSCONS devices
*/
#include "wsdisplay.h"
@@ -382,6 +387,7 @@ struct cdevsw cdevsw[] = {
cdev_radio_init(NRADIO,radio), /* 97: generic radio I/O */
cdev_ptm_init(NPTY,ptm), /* 98: pseudo-tty ptm device */
cdev_vscsi_init(NVSCSI,vscsi), /* 99: vscsi */
+ cdev_bthub_init(NBTHUB,bthub), /* 100: bthub */
};
int nblkdev = sizeof(bdevsw) / sizeof(bdevsw[0]);
diff --git a/sys/arch/loongson/loongson/conf.c b/sys/arch/loongson/loongson/conf.c
index 4fac5af5bfc..a5c0a544c6b 100644
--- a/sys/arch/loongson/loongson/conf.c
+++ b/sys/arch/loongson/loongson/conf.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: conf.c,v 1.3 2010/02/28 08:30:27 otto Exp $ */
+/* $OpenBSD: conf.c,v 1.4 2010/03/30 19:16:09 matthieu Exp $ */
/*
* Copyright (c) 1992, 1993
@@ -138,6 +138,8 @@ cdev_decl(pci);
#include "urio.h"
#include "ucom.h"
+#include "bthub.h"
+
struct cdevsw cdevsw[] =
{
cdev_cn_init(1,cn), /* 0: virtual console */
@@ -215,7 +217,8 @@ struct cdevsw cdevsw[] =
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_hotplug_init(NHOTPLUG,hotplug) /* 67: devices hotplugging */
+ cdev_hotplug_init(NHOTPLUG,hotplug), /* 67: devices hotplugging */
+ cdev_bthub_init(NBTHUB,bthub), /* 68: bluetooth hub */
};
int nchrdev = sizeof (cdevsw) / sizeof (cdevsw[0]);
diff --git a/sys/arch/socppc/socppc/conf.c b/sys/arch/socppc/socppc/conf.c
index 111543cd4a4..49804f3fb8f 100644
--- a/sys/arch/socppc/socppc/conf.c
+++ b/sys/arch/socppc/socppc/conf.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: conf.c,v 1.7 2009/08/13 15:04:20 dlg Exp $ */
+/* $OpenBSD: conf.c,v 1.8 2010/03/30 19:16:09 matthieu Exp $ */
/*
* Copyright (c) 1997 Per Fogelstrom
@@ -112,6 +112,8 @@ cdev_decl(pci);
#include "vscsi.h"
+#include "bthub.h"
+
struct cdevsw cdevsw[] = {
cdev_cn_init(1,cn), /* 0: virtual console */
cdev_ctty_init(1,ctty), /* 1: controlling terminal */
@@ -198,6 +200,9 @@ struct cdevsw cdevsw[] = {
cdev_notdef(), /* 76 */
cdev_ptm_init(NPTY,ptm), /* 77: pseudo-tty ptm device */
cdev_vscsi_init(NVSCSI,vscsi), /* 78: vscsi */
+ cdev_notdef(), /* 79 */
+ cdev_notdev(), /* 80 */
+ cdev_bthub_init(NBTHUB,bthub), /* 81: bluetooth hub */
};
int nchrdev = sizeof cdevsw / sizeof cdevsw[0];
diff --git a/sys/arch/sparc64/sparc64/conf.c b/sys/arch/sparc64/sparc64/conf.c
index 66dca24ace1..14d11a15563 100644
--- a/sys/arch/sparc64/sparc64/conf.c
+++ b/sys/arch/sparc64/sparc64/conf.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: conf.c,v 1.53 2009/08/13 19:44:41 deraadt Exp $ */
+/* $OpenBSD: conf.c,v 1.54 2010/03/30 19:16:09 matthieu Exp $ */
/* $NetBSD: conf.c,v 1.17 2001/03/26 12:33:26 lukem Exp $ */
/*
@@ -106,6 +106,8 @@ cdev_decl(pci);
#include "ucom.h"
#include "uscanner.h"
+#include "bthub.h"
+
#include "pf.h"
#ifdef NNPFS
@@ -291,6 +293,7 @@ struct cdevsw cdevsw[] =
cdev_tty_init(NSBBC,sbbc), /* 126: SBBC console */
cdev_tty_init(NVCCTTY,vcctty), /* 127: virtual console concentrator */
cdev_vscsi_init(NVSCSI,vscsi), /* 128: vscsi */
+ cdev_bthub_init(NBTHUB,bthub), /* 129: bluetooth hub */
};
int nchrdev = sizeof(cdevsw) / sizeof(cdevsw[0]);