From 51da054bb5d06a36374639da2343c40edb606461 Mon Sep 17 00:00:00 2001 From: natano <> Date: Thu, 28 Apr 2016 18:17:31 +0000 Subject: [PATCH] Replace /dev/bpf[0-9] with /dev/bpf and /dev/bpf0. The /dev/bpf node is unused for now, but I plan to convert all programs in base to use it in a future diff. /dev/bpf0 is for compatibility with existing binaries and is to be removed after a transition period. ok rpe krw, for the installer part "Let's see it hit the tree." deraadt --- src/etc/MAKEDEV.common | 10 ++++++---- src/etc/etc.alpha/MAKEDEV | 22 +++++++++++----------- src/etc/etc.alpha/MAKEDEV.md | 5 ++--- src/etc/etc.amd64/MAKEDEV | 22 +++++++++++----------- src/etc/etc.amd64/MAKEDEV.md | 5 ++--- src/etc/etc.armish/MAKEDEV | 25 +++++++++++++------------ src/etc/etc.armish/MAKEDEV.md | 5 ++--- src/etc/etc.armv7/MAKEDEV | 24 ++++++++++++------------ src/etc/etc.armv7/MAKEDEV.md | 5 ++--- src/etc/etc.hppa/MAKEDEV | 26 +++++++++++++------------- src/etc/etc.hppa/MAKEDEV.md | 5 ++--- src/etc/etc.hppa64/MAKEDEV | 26 +++++++++++++------------- src/etc/etc.hppa64/MAKEDEV.md | 5 ++--- src/etc/etc.i386/MAKEDEV | 30 +++++++++++++++--------------- src/etc/etc.i386/MAKEDEV.md | 5 ++--- src/etc/etc.landisk/MAKEDEV | 22 +++++++++++----------- src/etc/etc.landisk/MAKEDEV.md | 5 ++--- src/etc/etc.loongson/MAKEDEV | 23 ++++++++++++----------- src/etc/etc.loongson/MAKEDEV.md | 3 +-- src/etc/etc.luna88k/MAKEDEV | 18 +++++++++--------- src/etc/etc.luna88k/MAKEDEV.md | 3 +-- src/etc/etc.macppc/MAKEDEV | 26 +++++++++++++------------- src/etc/etc.macppc/MAKEDEV.md | 3 +-- src/etc/etc.octeon/MAKEDEV | 22 +++++++++++----------- src/etc/etc.octeon/MAKEDEV.md | 3 +-- src/etc/etc.sgi/MAKEDEV | 22 +++++++++++----------- src/etc/etc.sgi/MAKEDEV.md | 3 +-- src/etc/etc.socppc/MAKEDEV | 22 +++++++++++----------- src/etc/etc.socppc/MAKEDEV.md | 3 +-- src/etc/etc.sparc/MAKEDEV | 24 ++++++++++++------------ src/etc/etc.sparc/MAKEDEV.md | 5 ++--- src/etc/etc.sparc64/MAKEDEV | 28 ++++++++++++++-------------- src/etc/etc.sparc64/MAKEDEV.md | 5 ++--- src/etc/etc.zaurus/MAKEDEV | 24 ++++++++++++------------ src/etc/etc.zaurus/MAKEDEV.md | 5 ++--- 35 files changed, 238 insertions(+), 251 deletions(-) diff --git a/src/etc/MAKEDEV.common b/src/etc/MAKEDEV.common index 55675417..975a9a09 100644 --- a/src/etc/MAKEDEV.common +++ b/src/etc/MAKEDEV.common @@ -1,4 +1,4 @@ -vers(a, {-$OpenBSD: MAKEDEV.common,v 1.86 2016/04/25 20:39:42 tedu Exp $-})dnl +vers(a, {-$OpenBSD: MAKEDEV.common,v 1.87 2016/04/28 18:17:30 natano Exp $-})dnl dnl dnl Copyright (c) 2001-2006 Todd T. Fries dnl @@ -168,6 +168,7 @@ target(all, pppx)dnl target(all, fuse)dnl target(all, vmm)dnl target(all, pvbus, 0)dnl +target(all, bpf)dnl dnl _mkdev(all, {-all-}, {-dnl show_target(all)dnl @@ -215,7 +216,7 @@ show_target(ramd)dnl -})dnl dnl target(ramd, std)dnl -target(ramd, bpf, 0)dnl +target(ramd, bpf)dnl twrget(ramd, com, tty0, 0, 1)dnl target(ramd, sd, 0, 1, 2, 3, 4)dnl target(ramd, wd, 0, 1, 2, 3, 4)dnl @@ -446,8 +447,9 @@ __devitem(oppr, openprom,PROM settings,openprom)dnl _cdev(oppr, openprom, 70, 0)dnl __devitem(pf, pf*, Packet Filter)dnl _mkdev(pf, {-pf*-}, {-M pf c major_pf_c 0 600-})dnl -__devitem(bpf, bpf*, Berkeley Packet Filter)dnl -_mkdev(bpf, {-bpf*-}, {-M bpf$U c major_bpf_c $U 600-}, 600)dnl +__devitem(bpf, bpf, Berkeley Packet Filter)dnl +_mkdev(bpf, bpf, {-M bpf c major_bpf_c 0 600 + M bpf0 c major_bpf_c 0 600-})dnl _mkdev(tun, {-tun*-}, {-M tun$U c major_tun_c $U 600-}, 600)dnl _mkdev(tap, {-tap*-}, {-M tap$U c major_tap_c $U 600-}, 600)dnl __devitem(speak, speaker, PC speaker,spkr)dnl diff --git a/src/etc/etc.alpha/MAKEDEV b/src/etc/etc.alpha/MAKEDEV index 3e14d038..cf14803b 100644 --- a/src/etc/etc.alpha/MAKEDEV +++ b/src/etc/etc.alpha/MAKEDEV @@ -4,7 +4,7 @@ # generated from: # # OpenBSD: etc.alpha/MAKEDEV.md,v 1.66 2016/04/25 20:38:10 tedu Exp -# OpenBSD: MAKEDEV.common,v 1.85 2016/02/05 06:29:45 uebayasi Exp +# OpenBSD: MAKEDEV.common,v 1.86 2016/04/25 20:39:42 tedu Exp # OpenBSD: MAKEDEV.mi,v 1.82 2016/03/12 17:58:59 espie Exp # OpenBSD: MAKEDEV.sub,v 1.14 2005/02/07 06:14:18 david Exp # @@ -68,7 +68,7 @@ # audio* Audio devices # bio ioctl tunnel pseudo-device # bktr* Video frame grabbers -# bpf* Berkeley Packet Filter +# bpf Berkeley Packet Filter # diskmap Disk mapper # fd fd/* nodes # fuse Userland Filesystem @@ -213,7 +213,7 @@ U=`unt $i` case $i in ramdisk) - R std fd0 wd0 wd1 wd2 sd0 sd1 sd2 bpf0 + R std fd0 wd0 wd1 wd2 sd0 sd1 sd2 bpf R st0 cd0 ttyC0 rd0 bio diskmap random ;; @@ -320,8 +320,9 @@ diskmap) M diskmap c 63 0 640 operator ;; -bpf*) - M bpf$U c 11 $U 600 +bpf) + M bpf c 11 0 600 + M bpf0 c 11 0 600 ;; bktr*) @@ -518,12 +519,11 @@ local) all) R vnd0 vnd1 vnd2 vnd3 sd0 sd1 sd2 sd3 sd4 sd5 sd6 sd7 sd8 sd9 - R cd0 cd1 rd0 tap0 tap1 tap2 tap3 tun0 tun1 tun2 tun3 bpf0 - R bpf1 bpf2 bpf3 bpf4 bpf5 bpf6 bpf7 bpf8 bpf9 pty0 fd1 fd1B - R fd1C fd1D fd1E fd1F fd1G fd1H fd0 fd0B fd0C fd0D fd0E fd0F - R fd0G fd0H diskmap vscsi0 ch0 bio audio0 audio1 audio2 fuse - R pppx hotplug ptm local wscons pci0 pci1 pci2 pci3 uall - R rmidi0 rmidi1 rmidi2 rmidi3 rmidi4 rmidi5 rmidi6 rmidi7 + R cd0 cd1 rd0 tap0 tap1 tap2 tap3 tun0 tun1 tun2 tun3 pty0 fd1 + R fd1B fd1C fd1D fd1E fd1F fd1G fd1H fd0 fd0B fd0C fd0D fd0E + R fd0F fd0G fd0H diskmap vscsi0 ch0 bio audio0 audio1 audio2 + R bpf fuse pppx hotplug ptm local wscons pci0 pci1 pci2 pci3 + R uall rmidi0 rmidi1 rmidi2 rmidi3 rmidi4 rmidi5 rmidi6 rmidi7 R tuner0 radio0 speaker video0 video1 uk0 random lpa0 lpa1 R lpa2 lpt0 lpt1 lpt2 tty00 tty01 tty02 tty03 tty04 tty05 R tty06 tty07 tty08 tty09 tty0a tty0b ttyc0 ttyc1 ttyc2 ttyc3 diff --git a/src/etc/etc.alpha/MAKEDEV.md b/src/etc/etc.alpha/MAKEDEV.md index 89232122..f1f32e85 100644 --- a/src/etc/etc.alpha/MAKEDEV.md +++ b/src/etc/etc.alpha/MAKEDEV.md @@ -1,6 +1,6 @@ define(MACHINE,alpha)dnl vers(__file__, - {-$OpenBSD: MAKEDEV.md,v 1.66 2016/04/25 20:38:10 tedu Exp $-}, + {-$OpenBSD: MAKEDEV.md,v 1.67 2016/04/28 18:17:30 natano Exp $-}, etc.MACHINE)dnl dnl dnl Copyright (c) 2001-2006 Todd T. Fries @@ -84,7 +84,7 @@ dnl divert(__mddivert)dnl dnl ramdisk) - _recurse std fd0 wd0 wd1 wd2 sd0 sd1 sd2 bpf0 + _recurse std fd0 wd0 wd1 wd2 sd0 sd1 sd2 bpf _recurse st0 cd0 ttyC0 rd0 bio diskmap random ;; @@ -112,7 +112,6 @@ 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, tap, 0, 1, 2, 3)dnl target(all, xy, 0, 1, 2, 3)dnl diff --git a/src/etc/etc.amd64/MAKEDEV b/src/etc/etc.amd64/MAKEDEV index 755ca14b..0baf78ac 100644 --- a/src/etc/etc.amd64/MAKEDEV +++ b/src/etc/etc.amd64/MAKEDEV @@ -4,7 +4,7 @@ # generated from: # # OpenBSD: etc.amd64/MAKEDEV.md,v 1.65 2016/04/25 20:38:10 tedu Exp -# OpenBSD: MAKEDEV.common,v 1.85 2016/02/05 06:29:45 uebayasi Exp +# OpenBSD: MAKEDEV.common,v 1.86 2016/04/25 20:39:42 tedu Exp # OpenBSD: MAKEDEV.mi,v 1.82 2016/03/12 17:58:59 espie Exp # OpenBSD: MAKEDEV.sub,v 1.14 2005/02/07 06:14:18 david Exp # @@ -69,7 +69,7 @@ # audio* Audio devices # bio ioctl tunnel pseudo-device # bktr* Video frame grabbers -# bpf* Berkeley Packet Filter +# bpf Berkeley Packet Filter # diskmap Disk mapper # drm* Direct Rendering Manager # fd fd/* nodes @@ -222,7 +222,7 @@ U=`unt $i` case $i in ramdisk) - R std bpf0 fd0 wd0 sd0 tty00 tty01 rd0 bio diskmap + R std bpf fd0 wd0 sd0 tty00 tty01 rd0 bio diskmap R st0 cd0 ttyC0 wskbd0 wskbd1 wskbd2 random ;; @@ -356,8 +356,9 @@ diskmap) M diskmap c 90 0 640 operator ;; -bpf*) - M bpf$U c 23 $U 600 +bpf) + M bpf c 23 0 600 + M bpf0 c 23 0 600 ;; bktr*) @@ -565,12 +566,11 @@ all) R ipmi0 ttyVI00 ttyVI10 ttyVI20 ttyVI30 ttyVI40 drm0 drm1 R drm2 drm3 nvram gpio0 gpio1 gpio2 bktr0 vnd0 vnd1 vnd2 vnd3 R sd0 sd1 sd2 sd3 sd4 sd5 sd6 sd7 sd8 sd9 cd0 cd1 rd0 tap0 - R tap1 tap2 tap3 tun0 tun1 tun2 tun3 bpf0 bpf1 bpf2 bpf3 bpf4 - R bpf5 bpf6 bpf7 bpf8 bpf9 bio pty0 fd1 fd1B fd1C fd1D fd1E - R fd1F fd1G fd1H fd0 fd0B fd0C fd0D fd0E fd0F fd0G fd0H - R diskmap vscsi0 ch0 audio0 audio1 audio2 pvbus0 vmm fuse pppx - R hotplug ptm gpr0 local wscons pci0 pci1 pci2 pci3 uall - R rmidi0 rmidi1 rmidi2 rmidi3 rmidi4 rmidi5 rmidi6 rmidi7 + R tap1 tap2 tap3 tun0 tun1 tun2 tun3 bio pty0 fd1 fd1B fd1C + R fd1D fd1E fd1F fd1G fd1H fd0 fd0B fd0C fd0D fd0E fd0F fd0G + R fd0H diskmap vscsi0 ch0 audio0 audio1 audio2 bpf pvbus0 vmm + R fuse pppx hotplug ptm gpr0 local wscons pci0 pci1 pci2 pci3 + R uall rmidi0 rmidi1 rmidi2 rmidi3 rmidi4 rmidi5 rmidi6 rmidi7 R tuner0 radio0 speaker video0 video1 uk0 random lpa0 lpa1 R lpa2 lpt0 lpt1 lpt2 tty00 tty01 tty02 tty03 tty04 tty05 R tty06 tty07 tty08 tty09 tty0a tty0b ttyc0 ttyc1 ttyc2 ttyc3 diff --git a/src/etc/etc.amd64/MAKEDEV.md b/src/etc/etc.amd64/MAKEDEV.md index 80c73ff9..6f624ac0 100644 --- a/src/etc/etc.amd64/MAKEDEV.md +++ b/src/etc/etc.amd64/MAKEDEV.md @@ -1,6 +1,6 @@ define(MACHINE,amd64)dnl vers(__file__, - {-$OpenBSD: MAKEDEV.md,v 1.65 2016/04/25 20:38:10 tedu Exp $-}, + {-$OpenBSD: MAKEDEV.md,v 1.66 2016/04/28 18:17:30 natano Exp $-}, etc.MACHINE)dnl dnl dnl Copyright (c) 2001-2006 Todd T. Fries @@ -97,7 +97,7 @@ dnl divert(__mddivert)dnl dnl ramdisk) - _recurse std bpf0 fd0 wd0 sd0 tty00 tty01 rd0 bio diskmap + _recurse std bpf fd0 wd0 sd0 tty00 tty01 rd0 bio diskmap _recurse st0 cd0 ttyC0 wskbd0 wskbd1 wskbd2 random ;; @@ -120,7 +120,6 @@ 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, bio)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, tap, 0, 1, 2, 3)dnl target(all, xy, 0, 1, 2, 3)dnl diff --git a/src/etc/etc.armish/MAKEDEV b/src/etc/etc.armish/MAKEDEV index 278dc0aa..328a86ee 100644 --- a/src/etc/etc.armish/MAKEDEV +++ b/src/etc/etc.armish/MAKEDEV @@ -4,7 +4,7 @@ # generated from: # # OpenBSD: etc.armish/MAKEDEV.md,v 1.36 2016/04/25 20:38:10 tedu Exp -# OpenBSD: MAKEDEV.common,v 1.85 2016/02/05 06:29:45 uebayasi Exp +# OpenBSD: MAKEDEV.common,v 1.86 2016/04/25 20:39:42 tedu Exp # OpenBSD: MAKEDEV.mi,v 1.82 2016/03/12 17:58:59 espie Exp # OpenBSD: MAKEDEV.sub,v 1.14 2005/02/07 06:14:18 david Exp # @@ -62,7 +62,7 @@ # audio* Audio devices # bio ioctl tunnel pseudo-device # bktr* Video frame grabbers -# bpf* Berkeley Packet Filter +# bpf Berkeley Packet Filter # diskmap Disk mapper # fd fd/* nodes # fuse Userland Filesystem @@ -206,7 +206,7 @@ U=`unt $i` case $i in ramdisk) - R std bpf0 wd0 wd1 sd0 tty00 rd0 wsmouse + R std bpf wd0 wd1 sd0 tty00 rd0 wsmouse R st0 ttyC0 wskbd0 apm bio diskmap random ;; @@ -298,8 +298,9 @@ diskmap) M diskmap c 102 0 640 operator ;; -bpf*) - M bpf$U c 22 $U 600 +bpf) + M bpf c 22 0 600 + M bpf0 c 22 0 600 ;; bktr*) @@ -463,13 +464,13 @@ local) all) R vnd0 vnd1 vnd2 vnd3 sd0 sd1 sd2 sd3 sd4 sd5 sd6 sd7 sd8 sd9 - R cd0 cd1 rd0 tap0 tap1 tap2 tap3 tun0 tun1 tun2 tun3 bio bpf0 - R bpf1 bpf2 bpf3 bpf4 bpf5 bpf6 bpf7 bpf8 bpf9 pty0 diskmap - R vscsi0 ch0 audio0 audio1 audio2 fuse pppx hotplug ptm local - R wscons pci0 pci1 pci2 pci3 uall rmidi0 rmidi1 rmidi2 rmidi3 - R rmidi4 rmidi5 rmidi6 rmidi7 tuner0 radio0 video0 video1 uk0 - R random tty00 tty01 tty02 tty03 tty04 tty05 tty06 tty07 tty08 - R tty09 tty0a tty0b apm pf wd0 wd1 wd2 wd3 std st0 st1 fd + R cd0 cd1 rd0 tap0 tap1 tap2 tap3 tun0 tun1 tun2 tun3 bio pty0 + R diskmap vscsi0 ch0 audio0 audio1 audio2 bpf fuse pppx + R hotplug ptm local wscons pci0 pci1 pci2 pci3 uall rmidi0 + R rmidi1 rmidi2 rmidi3 rmidi4 rmidi5 rmidi6 rmidi7 tuner0 + R radio0 video0 video1 uk0 random tty00 tty01 tty02 tty03 + R tty04 tty05 tty06 tty07 tty08 tty09 tty0a tty0b apm pf wd0 + R wd1 wd2 wd3 std st0 st1 fd ;; wd*|sd*) diff --git a/src/etc/etc.armish/MAKEDEV.md b/src/etc/etc.armish/MAKEDEV.md index 30375d41..3a996c3e 100644 --- a/src/etc/etc.armish/MAKEDEV.md +++ b/src/etc/etc.armish/MAKEDEV.md @@ -1,6 +1,6 @@ define(MACHINE,armish)dnl vers(__file__, - {-$OpenBSD: MAKEDEV.md,v 1.36 2016/04/25 20:38:10 tedu Exp $-}, + {-$OpenBSD: MAKEDEV.md,v 1.37 2016/04/28 18:17:31 natano Exp $-}, etc.MACHINE)dnl dnl dnl Copyright (c) 2001-2004 Todd T. Fries @@ -88,7 +88,7 @@ dnl divert(__mddivert)dnl dnl ramdisk) - _recurse std bpf0 wd0 wd1 sd0 tty00 rd0 wsmouse + _recurse std bpf wd0 wd1 sd0 tty00 rd0 wsmouse _recurse st0 ttyC0 wskbd0 apm bio diskmap random ;; @@ -104,7 +104,6 @@ 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, bio)dnl target(all, tun, 0, 1, 2, 3)dnl target(all, tap, 0, 1, 2, 3)dnl diff --git a/src/etc/etc.armv7/MAKEDEV b/src/etc/etc.armv7/MAKEDEV index d9cf4d4f..f07871f4 100644 --- a/src/etc/etc.armv7/MAKEDEV +++ b/src/etc/etc.armv7/MAKEDEV @@ -4,7 +4,7 @@ # generated from: # # OpenBSD: etc.armv7/MAKEDEV.md,v 1.10 2016/04/25 20:38:10 tedu Exp -# OpenBSD: MAKEDEV.common,v 1.85 2016/02/05 06:29:45 uebayasi Exp +# OpenBSD: MAKEDEV.common,v 1.86 2016/04/25 20:39:42 tedu Exp # OpenBSD: MAKEDEV.mi,v 1.82 2016/03/12 17:58:59 espie Exp # OpenBSD: MAKEDEV.sub,v 1.14 2005/02/07 06:14:18 david Exp # @@ -62,7 +62,7 @@ # audio* Audio devices # bio ioctl tunnel pseudo-device # bktr* Video frame grabbers -# bpf* Berkeley Packet Filter +# bpf Berkeley Packet Filter # diskmap Disk mapper # fd fd/* nodes # fuse Userland Filesystem @@ -207,7 +207,7 @@ U=`unt $i` case $i in ramdisk) - R std bpf0 wd0 wd1 sd0 tty00 rd0 wsmouse + R std bpf wd0 wd1 sd0 tty00 rd0 wsmouse R st0 ttyC0 wskbd0 apm bio diskmap random ;; @@ -303,8 +303,9 @@ diskmap) M diskmap c 102 0 640 operator ;; -bpf*) - M bpf$U c 22 $U 600 +bpf) + M bpf c 22 0 600 + M bpf0 c 22 0 600 ;; bktr*) @@ -469,13 +470,12 @@ local) all) R gpio0 gpio1 gpio2 gpio3 gpio4 gpio5 gpio6 gpio7 gpio8 vnd0 R vnd1 vnd2 vnd3 sd0 sd1 sd2 sd3 sd4 sd5 sd6 sd7 sd8 sd9 cd0 - R cd1 rd0 tap0 tap1 tap2 tap3 tun0 tun1 tun2 tun3 bio bpf0 - R bpf1 bpf2 bpf3 bpf4 bpf5 bpf6 bpf7 bpf8 bpf9 pty0 diskmap - R vscsi0 ch0 fuse pppx hotplug ptm local wscons pci0 pci1 pci2 - R pci3 uall rmidi0 rmidi1 rmidi2 rmidi3 rmidi4 rmidi5 rmidi6 - R rmidi7 tuner0 radio0 video0 video1 uk0 random tty00 tty01 - R tty02 tty03 tty04 tty05 tty06 tty07 tty08 tty09 tty0a tty0b - R apm pf wd0 wd1 wd2 wd3 std st0 st1 fd + R cd1 rd0 tap0 tap1 tap2 tap3 tun0 tun1 tun2 tun3 bio pty0 + R diskmap vscsi0 ch0 bpf fuse pppx hotplug ptm local wscons + R pci0 pci1 pci2 pci3 uall rmidi0 rmidi1 rmidi2 rmidi3 rmidi4 + R rmidi5 rmidi6 rmidi7 tuner0 radio0 video0 video1 uk0 random + R tty00 tty01 tty02 tty03 tty04 tty05 tty06 tty07 tty08 tty09 + R tty0a tty0b apm pf wd0 wd1 wd2 wd3 std st0 st1 fd ;; wd*|sd*) diff --git a/src/etc/etc.armv7/MAKEDEV.md b/src/etc/etc.armv7/MAKEDEV.md index 2389fb76..6934034e 100644 --- a/src/etc/etc.armv7/MAKEDEV.md +++ b/src/etc/etc.armv7/MAKEDEV.md @@ -1,6 +1,6 @@ define(MACHINE,armv7)dnl vers(__file__, - {-$OpenBSD: MAKEDEV.md,v 1.10 2016/04/25 20:38:10 tedu Exp $-}, + {-$OpenBSD: MAKEDEV.md,v 1.11 2016/04/28 18:17:31 natano Exp $-}, etc.MACHINE)dnl dnl dnl Copyright (c) 2001-2004 Todd T. Fries @@ -89,7 +89,7 @@ dnl divert(__mddivert)dnl dnl ramdisk) - _recurse std bpf0 wd0 wd1 sd0 tty00 rd0 wsmouse + _recurse std bpf wd0 wd1 sd0 tty00 rd0 wsmouse _recurse st0 ttyC0 wskbd0 apm bio diskmap random ;; @@ -104,7 +104,6 @@ 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, bio)dnl target(all, tun, 0, 1, 2, 3)dnl target(all, tap, 0, 1, 2, 3)dnl diff --git a/src/etc/etc.hppa/MAKEDEV b/src/etc/etc.hppa/MAKEDEV index 5e5f1a2e..78accc0f 100644 --- a/src/etc/etc.hppa/MAKEDEV +++ b/src/etc/etc.hppa/MAKEDEV @@ -4,7 +4,7 @@ # generated from: # # OpenBSD: etc.hppa/MAKEDEV.md,v 1.57 2016/04/25 20:38:10 tedu Exp -# OpenBSD: MAKEDEV.common,v 1.85 2016/02/05 06:29:45 uebayasi Exp +# OpenBSD: MAKEDEV.common,v 1.86 2016/04/25 20:39:42 tedu Exp # OpenBSD: MAKEDEV.mi,v 1.82 2016/03/12 17:58:59 espie Exp # OpenBSD: MAKEDEV.sub,v 1.14 2005/02/07 06:14:18 david Exp # @@ -64,7 +64,7 @@ # Special purpose devices: # audio* Audio devices # bio ioctl tunnel pseudo-device -# bpf* Berkeley Packet Filter +# bpf Berkeley Packet Filter # diskmap Disk mapper # fd fd/* nodes # fuse Userland Filesystem @@ -207,7 +207,7 @@ U=`unt $i` case $i in ramdisk) R std fd st0 st1 sd0 sd1 sd2 sd3 rd0 random - R pty0 bpf0 bpf1 bio diskmap + R pty0 bpf bio diskmap ;; std) @@ -286,8 +286,9 @@ diskmap) M diskmap c 56 0 640 operator ;; -bpf*) - M bpf$U c 17 $U 600 +bpf) + M bpf c 17 0 600 + M bpf0 c 17 0 600 ;; bio) @@ -480,14 +481,13 @@ local) all) R vnd0 vnd1 vnd2 vnd3 sd0 sd1 sd2 sd3 sd4 sd5 sd6 sd7 sd8 sd9 - R cd0 cd1 rd0 tap0 tap1 tap2 tap3 tun0 tun1 tun2 tun3 bpf0 - R bpf1 bpf2 bpf3 bpf4 bpf5 bpf6 bpf7 bpf8 bpf9 pty0 fd1 fd1B - R fd1C fd1D fd1E fd1F fd1G fd1H fd0 fd0B fd0C fd0D fd0E fd0F - R fd0G fd0H diskmap vscsi0 bio ch0 audio0 audio1 audio2 fuse - R pppx hotplug ptm local wscons pci0 pci1 pci2 pci3 uall - R video0 video1 uk0 random lpa0 lpa1 lpa2 lpt0 lpt1 lpt2 tty00 - R tty01 tty02 tty03 tty04 tty05 tty06 tty07 tty08 tty09 tty0a - R tty0b pf wd0 wd1 wd2 wd3 std st0 st1 fd + R cd0 cd1 rd0 tap0 tap1 tap2 tap3 tun0 tun1 tun2 tun3 pty0 fd1 + R fd1B fd1C fd1D fd1E fd1F fd1G fd1H fd0 fd0B fd0C fd0D fd0E + R fd0F fd0G fd0H diskmap vscsi0 bio ch0 audio0 audio1 audio2 + R bpf fuse pppx hotplug ptm local wscons pci0 pci1 pci2 pci3 + R uall video0 video1 uk0 random lpa0 lpa1 lpa2 lpt0 lpt1 lpt2 + R tty00 tty01 tty02 tty03 tty04 tty05 tty06 tty07 tty08 tty09 + R tty0a tty0b pf wd0 wd1 wd2 wd3 std st0 st1 fd ;; wd*|sd*) diff --git a/src/etc/etc.hppa/MAKEDEV.md b/src/etc/etc.hppa/MAKEDEV.md index b1918870..db2bb196 100644 --- a/src/etc/etc.hppa/MAKEDEV.md +++ b/src/etc/etc.hppa/MAKEDEV.md @@ -1,6 +1,6 @@ define(MACHINE,hppa)dnl vers(__file__, - {-$OpenBSD: MAKEDEV.md,v 1.57 2016/04/25 20:38:10 tedu Exp $-}, + {-$OpenBSD: MAKEDEV.md,v 1.58 2016/04/28 18:17:31 natano Exp $-}, etc.MACHINE)dnl dnl dnl Copyright (c) 2001-2006 Todd T. Fries @@ -79,7 +79,7 @@ divert(__mddivert)dnl dnl ramdisk) _recurse std fd st0 st1 sd0 sd1 sd2 sd3 rd0 random - _recurse pty0 bpf0 bpf1 bio diskmap + _recurse pty0 bpf bio diskmap ;; _std(1, 2, 25, 6) @@ -96,7 +96,6 @@ 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, tap, 0, 1, 2, 3)dnl target(all, xy, 0, 1, 2, 3)dnl diff --git a/src/etc/etc.hppa64/MAKEDEV b/src/etc/etc.hppa64/MAKEDEV index 8c4dec4a..f11f695f 100644 --- a/src/etc/etc.hppa64/MAKEDEV +++ b/src/etc/etc.hppa64/MAKEDEV @@ -4,7 +4,7 @@ # generated from: # # OpenBSD: etc.hppa64/MAKEDEV.md,v 1.33 2016/04/25 20:38:10 tedu Exp -# OpenBSD: MAKEDEV.common,v 1.85 2016/02/05 06:29:45 uebayasi Exp +# OpenBSD: MAKEDEV.common,v 1.86 2016/04/25 20:39:42 tedu Exp # OpenBSD: MAKEDEV.mi,v 1.82 2016/03/12 17:58:59 espie Exp # OpenBSD: MAKEDEV.sub,v 1.14 2005/02/07 06:14:18 david Exp # @@ -64,7 +64,7 @@ # Special purpose devices: # audio* Audio devices # bio ioctl tunnel pseudo-device -# bpf* Berkeley Packet Filter +# bpf Berkeley Packet Filter # diskmap Disk mapper # fd fd/* nodes # fuse Userland Filesystem @@ -206,7 +206,7 @@ U=`unt $i` case $i in ramdisk) R std fd st0 st1 sd0 sd1 sd2 sd3 rd0 random - R pty0 bpf0 bpf1 bio diskmap + R pty0 bpf bio diskmap ;; std) @@ -281,8 +281,9 @@ diskmap) M diskmap c 56 0 640 operator ;; -bpf*) - M bpf$U c 17 $U 600 +bpf) + M bpf c 17 0 600 + M bpf0 c 17 0 600 ;; bio) @@ -475,14 +476,13 @@ local) all) R vnd0 vnd1 vnd2 vnd3 sd0 sd1 sd2 sd3 sd4 sd5 sd6 sd7 sd8 sd9 - R cd0 cd1 rd0 tap0 tap1 tap2 tap3 tun0 tun1 tun2 tun3 bio bpf0 - R bpf1 bpf2 bpf3 bpf4 bpf5 bpf6 bpf7 bpf8 bpf9 pty0 fd1 fd1B - R fd1C fd1D fd1E fd1F fd1G fd1H fd0 fd0B fd0C fd0D fd0E fd0F - R fd0G fd0H diskmap vscsi0 ch0 audio0 audio1 audio2 fuse pppx - R ptm local wscons pci0 pci1 pci2 pci3 uall video0 video1 uk0 - R random lpa0 lpa1 lpa2 lpt0 lpt1 lpt2 tty00 tty01 tty02 tty03 - R tty04 tty05 tty06 tty07 tty08 tty09 tty0a tty0b pf wd0 wd1 - R wd2 wd3 std st0 st1 fd + R cd0 cd1 rd0 tap0 tap1 tap2 tap3 tun0 tun1 tun2 tun3 bio pty0 + R fd1 fd1B fd1C fd1D fd1E fd1F fd1G fd1H fd0 fd0B fd0C fd0D + R fd0E fd0F fd0G fd0H diskmap vscsi0 ch0 audio0 audio1 audio2 + R bpf fuse pppx ptm local wscons pci0 pci1 pci2 pci3 uall + R video0 video1 uk0 random lpa0 lpa1 lpa2 lpt0 lpt1 lpt2 tty00 + R tty01 tty02 tty03 tty04 tty05 tty06 tty07 tty08 tty09 tty0a + R tty0b pf wd0 wd1 wd2 wd3 std st0 st1 fd ;; wd*|sd*) diff --git a/src/etc/etc.hppa64/MAKEDEV.md b/src/etc/etc.hppa64/MAKEDEV.md index 639c4f52..b31c97ee 100644 --- a/src/etc/etc.hppa64/MAKEDEV.md +++ b/src/etc/etc.hppa64/MAKEDEV.md @@ -1,6 +1,6 @@ define(MACHINE,hppa64)dnl vers(__file__, - {-$OpenBSD: MAKEDEV.md,v 1.33 2016/04/25 20:38:10 tedu Exp $-}, + {-$OpenBSD: MAKEDEV.md,v 1.34 2016/04/28 18:17:31 natano Exp $-}, etc.MACHINE)dnl dnl dnl Copyright (c) 2001-2006 Todd T. Fries @@ -78,7 +78,7 @@ divert(__mddivert)dnl dnl ramdisk) _recurse std fd st0 st1 sd0 sd1 sd2 sd3 rd0 random - _recurse pty0 bpf0 bpf1 bio diskmap + _recurse pty0 bpf bio diskmap ;; _std(1, 2, 25, 6) @@ -94,7 +94,6 @@ 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, bio)dnl target(all, tun, 0, 1, 2, 3)dnl target(all, tap, 0, 1, 2, 3)dnl diff --git a/src/etc/etc.i386/MAKEDEV b/src/etc/etc.i386/MAKEDEV index bdcf30d0..6c99f730 100644 --- a/src/etc/etc.i386/MAKEDEV +++ b/src/etc/etc.i386/MAKEDEV @@ -4,7 +4,7 @@ # generated from: # # OpenBSD: etc.i386/MAKEDEV.md,v 1.79 2016/04/25 20:38:11 tedu Exp -# OpenBSD: MAKEDEV.common,v 1.85 2016/02/05 06:29:45 uebayasi Exp +# OpenBSD: MAKEDEV.common,v 1.86 2016/04/25 20:39:42 tedu Exp # OpenBSD: MAKEDEV.mi,v 1.82 2016/03/12 17:58:59 espie Exp # OpenBSD: MAKEDEV.sub,v 1.14 2005/02/07 06:14:18 david Exp # @@ -69,7 +69,7 @@ # audio* Audio devices # bio ioctl tunnel pseudo-device # bktr* Video frame grabbers -# bpf* Berkeley Packet Filter +# bpf Berkeley Packet Filter # diskmap Disk mapper # drm* Direct Rendering Manager # fd fd/* nodes @@ -223,7 +223,7 @@ U=`unt $i` case $i in ramdisk) - R std bpf0 fd0 wd0 sd0 tty00 tty01 rd0 bio diskmap + R std bpf fd0 wd0 sd0 tty00 tty01 rd0 bio diskmap R st0 cd0 ttyC0 wskbd0 wskbd1 wskbd2 apm random ;; @@ -361,8 +361,9 @@ diskmap) M diskmap c 91 0 640 operator ;; -bpf*) - M bpf$U c 23 $U 600 +bpf) + M bpf c 23 0 600 + M bpf0 c 23 0 600 ;; bktr*) @@ -570,16 +571,15 @@ all) R ipmi0 amdmsr drm0 drm1 drm2 drm3 nvram gpio0 gpio1 gpio2 R bktr0 vnd0 vnd1 vnd2 vnd3 sd0 sd1 sd2 sd3 sd4 sd5 sd6 sd7 R sd8 sd9 cd0 cd1 rd0 tap0 tap1 tap2 tap3 tun0 tun1 tun2 tun3 - R bio bpf0 bpf1 bpf2 bpf3 bpf4 bpf5 bpf6 bpf7 bpf8 bpf9 pty0 - R fd1 fd1B fd1C fd1D fd1E fd1F fd1G fd1H fd0 fd0B fd0C fd0D - R fd0E fd0F fd0G fd0H diskmap vscsi0 ch0 audio0 audio1 audio2 - R pvbus0 vmm fuse pppx hotplug ptm gpr0 local wscons pci0 pci1 - R pci2 pci3 uall rmidi0 rmidi1 rmidi2 rmidi3 rmidi4 rmidi5 - R rmidi6 rmidi7 tuner0 radio0 speaker video0 video1 uk0 random - R joy0 joy1 lpa0 lpa1 lpa2 lpt0 lpt1 lpt2 tty00 tty01 tty02 - R tty03 tty04 tty05 tty06 tty07 tty08 tty09 tty0a tty0b ttyc0 - R ttyc1 ttyc2 ttyc3 ttyc4 ttyc5 ttyc6 ttyc7 apm pf pctr wd0 - R wd1 wd2 wd3 std st0 st1 fd + R bio pty0 fd1 fd1B fd1C fd1D fd1E fd1F fd1G fd1H fd0 fd0B + R fd0C fd0D fd0E fd0F fd0G fd0H diskmap vscsi0 ch0 audio0 + R audio1 audio2 bpf pvbus0 vmm fuse pppx hotplug ptm gpr0 + R local wscons pci0 pci1 pci2 pci3 uall rmidi0 rmidi1 rmidi2 + R rmidi3 rmidi4 rmidi5 rmidi6 rmidi7 tuner0 radio0 speaker + R video0 video1 uk0 random joy0 joy1 lpa0 lpa1 lpa2 lpt0 lpt1 + R lpt2 tty00 tty01 tty02 tty03 tty04 tty05 tty06 tty07 tty08 + R tty09 tty0a tty0b ttyc0 ttyc1 ttyc2 ttyc3 ttyc4 ttyc5 ttyc6 + R ttyc7 apm pf pctr wd0 wd1 wd2 wd3 std st0 st1 fd ;; wd*|sd*) diff --git a/src/etc/etc.i386/MAKEDEV.md b/src/etc/etc.i386/MAKEDEV.md index 1ac717ba..e71049c7 100644 --- a/src/etc/etc.i386/MAKEDEV.md +++ b/src/etc/etc.i386/MAKEDEV.md @@ -1,6 +1,6 @@ define(MACHINE,i386)dnl vers(__file__, - {-$OpenBSD: MAKEDEV.md,v 1.79 2016/04/25 20:38:11 tedu Exp $-}, + {-$OpenBSD: MAKEDEV.md,v 1.80 2016/04/28 18:17:31 natano Exp $-}, etc.MACHINE)dnl dnl dnl Copyright (c) 2001-2006 Todd T. Fries @@ -99,7 +99,7 @@ dnl divert(__mddivert)dnl dnl ramdisk) - _recurse std bpf0 fd0 wd0 sd0 tty00 tty01 rd0 bio diskmap + _recurse std bpf fd0 wd0 sd0 tty00 tty01 rd0 bio diskmap _recurse st0 cd0 ttyC0 wskbd0 wskbd1 wskbd2 apm random ;; @@ -121,7 +121,6 @@ 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, bio)dnl target(all, tun, 0, 1, 2, 3)dnl target(all, tap, 0, 1, 2, 3)dnl diff --git a/src/etc/etc.landisk/MAKEDEV b/src/etc/etc.landisk/MAKEDEV index 04fea231..fa1282a7 100644 --- a/src/etc/etc.landisk/MAKEDEV +++ b/src/etc/etc.landisk/MAKEDEV @@ -4,7 +4,7 @@ # generated from: # # OpenBSD: etc.landisk/MAKEDEV.md,v 1.39 2016/04/25 20:38:11 tedu Exp -# OpenBSD: MAKEDEV.common,v 1.85 2016/02/05 06:29:45 uebayasi Exp +# OpenBSD: MAKEDEV.common,v 1.86 2016/04/25 20:39:42 tedu Exp # OpenBSD: MAKEDEV.mi,v 1.82 2016/03/12 17:58:59 espie Exp # OpenBSD: MAKEDEV.sub,v 1.14 2005/02/07 06:14:18 david Exp # @@ -60,7 +60,7 @@ # Special purpose devices: # audio* Audio devices # bio ioctl tunnel pseudo-device -# bpf* Berkeley Packet Filter +# bpf Berkeley Packet Filter # diskmap Disk mapper # fd fd/* nodes # fuse Userland Filesystem @@ -203,7 +203,7 @@ U=`unt $i` case $i in ramdisk) - R std bpf0 wd0 wd1 sd0 rd0 wsmouse + R std bpf wd0 wd1 sd0 rd0 wsmouse R st0 ttyC0 wskbd0 bio diskmap random ;; @@ -291,8 +291,9 @@ diskmap) M diskmap c 101 0 640 operator ;; -bpf*) - M bpf$U c 22 $U 600 +bpf) + M bpf c 22 0 600 + M bpf0 c 22 0 600 ;; bio) @@ -444,12 +445,11 @@ local) all) R vnd0 vnd1 vnd2 vnd3 sd0 sd1 sd2 sd3 sd4 sd5 sd6 sd7 sd8 sd9 - R cd0 cd1 rd0 tap0 tap1 tap2 tap3 tun0 tun1 tun2 tun3 bio bpf0 - R bpf1 bpf2 bpf3 bpf4 bpf5 bpf6 bpf7 bpf8 bpf9 pty0 diskmap - R vscsi0 ch0 ttya audio0 audio1 audio2 fuse pppx hotplug ptm - R local wscons pci0 pci1 pci2 pci3 uall rmidi0 rmidi1 rmidi2 - R rmidi3 rmidi4 rmidi5 rmidi6 rmidi7 radio0 video0 video1 uk0 - R random pf wd0 wd1 wd2 wd3 std st0 st1 fd + R cd0 cd1 rd0 tap0 tap1 tap2 tap3 tun0 tun1 tun2 tun3 bio pty0 + R diskmap vscsi0 ch0 ttya audio0 audio1 audio2 bpf fuse pppx + R hotplug ptm local wscons pci0 pci1 pci2 pci3 uall rmidi0 + R rmidi1 rmidi2 rmidi3 rmidi4 rmidi5 rmidi6 rmidi7 radio0 + R video0 video1 uk0 random pf wd0 wd1 wd2 wd3 std st0 st1 fd ;; wd*|sd*) diff --git a/src/etc/etc.landisk/MAKEDEV.md b/src/etc/etc.landisk/MAKEDEV.md index f576de6e..8fe6fe53 100644 --- a/src/etc/etc.landisk/MAKEDEV.md +++ b/src/etc/etc.landisk/MAKEDEV.md @@ -1,6 +1,6 @@ define(MACHINE,landisk)dnl vers(__file__, - {-$OpenBSD: MAKEDEV.md,v 1.39 2016/04/25 20:38:11 tedu Exp $-}, + {-$OpenBSD: MAKEDEV.md,v 1.40 2016/04/28 18:17:31 natano Exp $-}, etc.MACHINE)dnl dnl dnl Copyright (c) 2001-2004 Todd T. Fries @@ -92,7 +92,7 @@ dnl divert(__mddivert)dnl dnl ramdisk) - _recurse std bpf0 wd0 wd1 sd0 rd0 wsmouse + _recurse std bpf wd0 wd1 sd0 rd0 wsmouse _recurse st0 ttyC0 wskbd0 bio diskmap random ;; @@ -109,7 +109,6 @@ 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, bio)dnl target(all, tun, 0, 1, 2, 3)dnl target(all, tap, 0, 1, 2, 3)dnl diff --git a/src/etc/etc.loongson/MAKEDEV b/src/etc/etc.loongson/MAKEDEV index 56d6da42..d5211f89 100644 --- a/src/etc/etc.loongson/MAKEDEV +++ b/src/etc/etc.loongson/MAKEDEV @@ -4,7 +4,7 @@ # generated from: # # OpenBSD: etc.loongson/MAKEDEV.md,v 1.23 2016/04/25 20:38:11 tedu Exp -# OpenBSD: MAKEDEV.common,v 1.85 2016/02/05 06:29:45 uebayasi Exp +# OpenBSD: MAKEDEV.common,v 1.86 2016/04/25 20:39:42 tedu Exp # OpenBSD: MAKEDEV.mi,v 1.82 2016/03/12 17:58:59 espie Exp # OpenBSD: MAKEDEV.sub,v 1.14 2005/02/07 06:14:18 david Exp # @@ -62,7 +62,7 @@ # apm Power management device # audio* Audio devices # bio ioctl tunnel pseudo-device -# bpf* Berkeley Packet Filter +# bpf Berkeley Packet Filter # diskmap Disk mapper # fd fd/* nodes # fuse Userland Filesystem @@ -277,8 +277,9 @@ diskmap) M diskmap c 70 0 640 operator ;; -bpf*) - M bpf$U c 12 $U 600 +bpf) + M bpf c 12 0 600 + M bpf0 c 12 0 600 ;; bio) @@ -438,17 +439,17 @@ local) ramdisk) R wskbd0 wskbd1 wskbd2 diskmap bio pty0 rd0 cd0 cd1 st0 st1 - R wd0 wd1 wd2 wd3 wd4 sd0 sd1 sd2 sd3 sd4 tty00 tty01 bpf0 std + R wd0 wd1 wd2 wd3 wd4 sd0 sd1 sd2 sd3 sd4 tty00 tty01 bpf std ;; all) R vnd0 vnd1 vnd2 vnd3 sd0 sd1 sd2 sd3 sd4 sd5 sd6 sd7 sd8 sd9 - R cd0 cd1 rd0 tap0 tap1 tap2 tap3 tun0 tun1 tun2 tun3 bio bpf0 - R bpf1 bpf2 bpf3 bpf4 bpf5 bpf6 bpf7 bpf8 bpf9 pty0 pty1 pty2 - R diskmap vscsi0 audio0 audio1 audio2 fuse pppx hotplug ptm - R local wscons pci0 pci1 pci2 pci3 uall video0 video1 uk0 - R random tty00 tty01 tty02 tty03 tty04 tty05 tty06 tty07 tty08 - R tty09 tty0a tty0b apm pf wd0 wd1 wd2 wd3 std st0 st1 fd + R cd0 cd1 rd0 tap0 tap1 tap2 tap3 tun0 tun1 tun2 tun3 bio pty0 + R pty1 pty2 diskmap vscsi0 audio0 audio1 audio2 bpf fuse pppx + R hotplug ptm local wscons pci0 pci1 pci2 pci3 uall video0 + R video1 uk0 random tty00 tty01 tty02 tty03 tty04 tty05 tty06 + R tty07 tty08 tty09 tty0a tty0b apm pf wd0 wd1 wd2 wd3 std st0 + R st1 fd ;; wd*|sd*) diff --git a/src/etc/etc.loongson/MAKEDEV.md b/src/etc/etc.loongson/MAKEDEV.md index a354f9ca..270af57d 100644 --- a/src/etc/etc.loongson/MAKEDEV.md +++ b/src/etc/etc.loongson/MAKEDEV.md @@ -1,6 +1,6 @@ define(MACHINE,loongson)dnl vers(__file__, - {-$OpenBSD: MAKEDEV.md,v 1.23 2016/04/25 20:38:11 tedu Exp $-}, + {-$OpenBSD: MAKEDEV.md,v 1.24 2016/04/28 18:17:31 natano Exp $-}, etc.MACHINE)dnl dnl dnl Copyright (c) 2001-2006 Todd T. Fries @@ -94,7 +94,6 @@ target(all, diskmap)dnl dnl twrget(all, flo, fd, 0, 0B, 0C, 0D, 0E, 0F, 0G, 0H)dnl dnl twrget(all, flo, fd, 1, 1B, 1C, 1D, 1E, 1F, 1G, 1H)dnl target(all, pty, 0, 1, 2)dnl -target(all, bpf, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9)dnl target(all, bio)dnl target(all, tun, 0, 1, 2, 3)dnl target(all, tap, 0, 1, 2, 3)dnl diff --git a/src/etc/etc.luna88k/MAKEDEV b/src/etc/etc.luna88k/MAKEDEV index 4a17fe22..15b6c4a1 100644 --- a/src/etc/etc.luna88k/MAKEDEV +++ b/src/etc/etc.luna88k/MAKEDEV @@ -4,7 +4,7 @@ # generated from: # # OpenBSD: etc.luna88k/MAKEDEV.md,v 1.27 2016/04/25 20:38:11 tedu Exp -# OpenBSD: MAKEDEV.common,v 1.85 2016/02/05 06:29:45 uebayasi Exp +# OpenBSD: MAKEDEV.common,v 1.86 2016/04/25 20:39:42 tedu Exp # OpenBSD: MAKEDEV.mi,v 1.82 2016/03/12 17:58:59 espie Exp # OpenBSD: MAKEDEV.sub,v 1.14 2005/02/07 06:14:18 david Exp # @@ -55,7 +55,7 @@ # Special purpose devices: # audio* Audio devices # bio ioctl tunnel pseudo-device -# bpf* Berkeley Packet Filter +# bpf Berkeley Packet Filter # diskmap Disk mapper # fd fd/* nodes # fuse Userland Filesystem @@ -265,8 +265,9 @@ diskmap) M diskmap c 54 0 640 operator ;; -bpf*) - M bpf$U c 22 $U 600 +bpf) + M bpf c 22 0 600 + M bpf0 c 22 0 600 ;; bio) @@ -392,16 +393,15 @@ local) ramdisk) R diskmap bio pty0 ttya rd0 cd0 cd1 st0 st1 wd0 wd1 wd2 wd3 - R wd4 sd0 sd1 sd2 sd3 sd4 tty00 tty01 bpf0 std + R wd4 sd0 sd1 sd2 sd3 sd4 tty00 tty01 bpf std ;; all) R pcex audio0 lcd ttya vnd0 vnd1 vnd2 vnd3 sd0 sd1 sd2 sd3 R sd4 cd0 cd1 rd0 tap0 tap1 tap2 tap3 tun0 tun1 tun2 tun3 bio - R bpf0 bpf1 bpf2 bpf3 bpf4 bpf5 bpf6 bpf7 bpf8 bpf9 pty0 - R diskmap vscsi0 ch0 fuse pppx ptm local wscons uk0 random - R tty00 tty01 tty02 tty03 tty04 tty05 tty06 tty07 tty08 tty09 - R tty0a tty0b pf wd0 wd1 wd2 wd3 std st0 st1 fd + R pty0 diskmap vscsi0 ch0 bpf fuse pppx ptm local wscons uk0 + R random tty00 tty01 tty02 tty03 tty04 tty05 tty06 tty07 tty08 + R tty09 tty0a tty0b pf wd0 wd1 wd2 wd3 std st0 st1 fd ;; wd*|sd*) diff --git a/src/etc/etc.luna88k/MAKEDEV.md b/src/etc/etc.luna88k/MAKEDEV.md index d5650659..0a03a330 100644 --- a/src/etc/etc.luna88k/MAKEDEV.md +++ b/src/etc/etc.luna88k/MAKEDEV.md @@ -1,6 +1,6 @@ define(MACHINE,luna88k)dnl vers(__file__, - {-$OpenBSD: MAKEDEV.md,v 1.27 2016/04/25 20:38:11 tedu Exp $-}, + {-$OpenBSD: MAKEDEV.md,v 1.28 2016/04/28 18:17:31 natano Exp $-}, etc.MACHINE)dnl dnl dnl Copyright (c) 2001-2006 Todd T. Fries @@ -43,7 +43,6 @@ target(all, ch, 0)dnl target(all, vscsi, 0)dnl target(all, diskmap)dnl target(all, pty, 0)dnl -target(all, bpf, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9)dnl target(all, bio)dnl target(all, tun, 0, 1, 2, 3)dnl target(all, tap, 0, 1, 2, 3)dnl diff --git a/src/etc/etc.macppc/MAKEDEV b/src/etc/etc.macppc/MAKEDEV index 0ecdc280..1ddf5783 100644 --- a/src/etc/etc.macppc/MAKEDEV +++ b/src/etc/etc.macppc/MAKEDEV @@ -4,7 +4,7 @@ # generated from: # # OpenBSD: etc.macppc/MAKEDEV.md,v 1.66 2016/04/25 20:38:11 tedu Exp -# OpenBSD: MAKEDEV.common,v 1.85 2016/02/05 06:29:45 uebayasi Exp +# OpenBSD: MAKEDEV.common,v 1.86 2016/04/25 20:39:42 tedu Exp # OpenBSD: MAKEDEV.mi,v 1.82 2016/03/12 17:58:59 espie Exp # OpenBSD: MAKEDEV.sub,v 1.14 2005/02/07 06:14:18 david Exp # @@ -65,7 +65,7 @@ # audio* Audio devices # bio ioctl tunnel pseudo-device # bktr* Video frame grabbers -# bpf* Berkeley Packet Filter +# bpf Berkeley Packet Filter # diskmap Disk mapper # drm* Direct Rendering Manager # fd fd/* nodes @@ -309,8 +309,9 @@ diskmap) M diskmap c 84 0 640 operator ;; -bpf*) - M bpf$U c 22 $U 600 +bpf) + M bpf c 22 0 600 + M bpf0 c 22 0 600 ;; bktr*) @@ -494,20 +495,19 @@ local) ramdisk) R diskmap bio pty0 rd0 cd0 cd1 st0 st1 wd0 wd1 wd2 wd3 wd4 - R sd0 sd1 sd2 sd3 sd4 tty00 tty01 bpf0 std + R sd0 sd1 sd2 sd3 sd4 tty00 tty01 bpf std ;; all) R drm0 drm1 drm2 drm3 bio gpio0 gpio1 gpio2 vnd0 vnd1 vnd2 R vnd3 sd0 sd1 sd2 sd3 sd4 sd5 sd6 sd7 sd8 sd9 cd0 cd1 rd0 - R tap0 tap1 tap2 tap3 tun0 tun1 tun2 tun3 bpf0 bpf1 bpf2 bpf3 - R bpf4 bpf5 bpf6 bpf7 bpf8 bpf9 pty0 diskmap vscsi0 ch0 cuaa - R cuab ttya ttyb audio0 audio1 audio2 fuse pppx hotplug ptm - R local wscons pci0 pci1 pci2 pci3 uall rmidi0 rmidi1 rmidi2 - R rmidi3 rmidi4 rmidi5 rmidi6 rmidi7 tuner0 radio0 video0 - R video1 uk0 random tty00 tty01 tty02 tty03 tty04 tty05 tty06 - R tty07 tty08 tty09 tty0a tty0b apm pf wd0 wd1 wd2 wd3 std st0 - R st1 fd + R tap0 tap1 tap2 tap3 tun0 tun1 tun2 tun3 pty0 diskmap vscsi0 + R ch0 cuaa cuab ttya ttyb audio0 audio1 audio2 bpf fuse pppx + R hotplug ptm local wscons pci0 pci1 pci2 pci3 uall rmidi0 + R rmidi1 rmidi2 rmidi3 rmidi4 rmidi5 rmidi6 rmidi7 tuner0 + R radio0 video0 video1 uk0 random tty00 tty01 tty02 tty03 + R tty04 tty05 tty06 tty07 tty08 tty09 tty0a tty0b apm pf wd0 + R wd1 wd2 wd3 std st0 st1 fd ;; wd*|sd*) diff --git a/src/etc/etc.macppc/MAKEDEV.md b/src/etc/etc.macppc/MAKEDEV.md index 3ac6b53f..44c195db 100644 --- a/src/etc/etc.macppc/MAKEDEV.md +++ b/src/etc/etc.macppc/MAKEDEV.md @@ -1,6 +1,6 @@ define(MACHINE,macppc)dnl vers(__file__, - {-$OpenBSD: MAKEDEV.md,v 1.66 2016/04/25 20:38:11 tedu Exp $-}, + {-$OpenBSD: MAKEDEV.md,v 1.67 2016/04/28 18:17:31 natano Exp $-}, etc.MACHINE)dnl dnl dnl Copyright (c) 2001-2006 Todd T. Fries @@ -115,7 +115,6 @@ 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, tap, 0, 1, 2, 3)dnl target(all, xy, 0, 1, 2, 3)dnl diff --git a/src/etc/etc.octeon/MAKEDEV b/src/etc/etc.octeon/MAKEDEV index 46a54020..e0d6c19a 100644 --- a/src/etc/etc.octeon/MAKEDEV +++ b/src/etc/etc.octeon/MAKEDEV @@ -4,7 +4,7 @@ # generated from: # # OpenBSD: etc.octeon/MAKEDEV.md,v 1.9 2016/04/25 20:38:11 tedu Exp -# OpenBSD: MAKEDEV.common,v 1.85 2016/02/05 06:29:45 uebayasi Exp +# OpenBSD: MAKEDEV.common,v 1.86 2016/04/25 20:39:42 tedu Exp # OpenBSD: MAKEDEV.mi,v 1.82 2016/03/12 17:58:59 espie Exp # OpenBSD: MAKEDEV.sub,v 1.14 2005/02/07 06:14:18 david Exp # @@ -59,7 +59,7 @@ # Special purpose devices: # audio* Audio devices # bio ioctl tunnel pseudo-device -# bpf* Berkeley Packet Filter +# bpf Berkeley Packet Filter # diskmap Disk mapper # fd fd/* nodes # fuse Userland Filesystem @@ -274,8 +274,9 @@ diskmap) M diskmap c 70 0 640 operator ;; -bpf*) - M bpf$U c 12 $U 600 +bpf) + M bpf c 12 0 600 + M bpf0 c 12 0 600 ;; bio) @@ -413,18 +414,17 @@ local) ramdisk) R octcf0 diskmap bio pty0 rd0 cd0 cd1 st0 st1 wd0 wd1 wd2 wd3 - R wd4 sd0 sd1 sd2 sd3 sd4 tty00 tty01 bpf0 std + R wd4 sd0 sd1 sd2 sd3 sd4 tty00 tty01 bpf std ;; all) R octcf0 vnd0 vnd1 vnd2 vnd3 sd0 sd1 sd2 sd3 sd4 sd5 sd6 sd7 R sd8 sd9 cd0 cd1 rd0 tap0 tap1 tap2 tap3 tun0 tun1 tun2 tun3 - R bio bpf0 bpf1 bpf2 bpf3 bpf4 bpf5 bpf6 bpf7 bpf8 bpf9 pty0 - R pty1 pty2 diskmap vscsi0 ch0 audio0 audio1 audio2 fuse pppx - R hotplug ptm local wscons pci0 pci1 pci2 pci3 uall video0 - R video1 uk0 random tty00 tty01 tty02 tty03 tty04 tty05 tty06 - R tty07 tty08 tty09 tty0a tty0b pf wd0 wd1 wd2 wd3 std st0 st1 - R fd + R bio pty0 pty1 pty2 diskmap vscsi0 ch0 audio0 audio1 audio2 + R bpf fuse pppx hotplug ptm local wscons pci0 pci1 pci2 pci3 + R uall video0 video1 uk0 random tty00 tty01 tty02 tty03 tty04 + R tty05 tty06 tty07 tty08 tty09 tty0a tty0b pf wd0 wd1 wd2 wd3 + R std st0 st1 fd ;; octcf*|wd*|sd*) diff --git a/src/etc/etc.octeon/MAKEDEV.md b/src/etc/etc.octeon/MAKEDEV.md index b8ca248f..4c3edd98 100644 --- a/src/etc/etc.octeon/MAKEDEV.md +++ b/src/etc/etc.octeon/MAKEDEV.md @@ -1,6 +1,6 @@ define(MACHINE,octeon)dnl vers(__file__, - {-$OpenBSD: MAKEDEV.md,v 1.9 2016/04/25 20:38:11 tedu Exp $-}, + {-$OpenBSD: MAKEDEV.md,v 1.10 2016/04/28 18:17:31 natano Exp $-}, etc.MACHINE)dnl dnl dnl Copyright (c) 2001-2006 Todd T. Fries @@ -95,7 +95,6 @@ target(all, ch, 0)dnl target(all, vscsi, 0)dnl target(all, diskmap)dnl target(all, pty, 0, 1, 2)dnl -target(all, bpf, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9)dnl target(all, bio)dnl target(all, tun, 0, 1, 2, 3)dnl target(all, tap, 0, 1, 2, 3)dnl diff --git a/src/etc/etc.sgi/MAKEDEV b/src/etc/etc.sgi/MAKEDEV index b80d4656..0546fb48 100644 --- a/src/etc/etc.sgi/MAKEDEV +++ b/src/etc/etc.sgi/MAKEDEV @@ -4,7 +4,7 @@ # generated from: # # OpenBSD: etc.sgi/MAKEDEV.md,v 1.45 2016/04/25 20:38:11 tedu Exp -# OpenBSD: MAKEDEV.common,v 1.85 2016/02/05 06:29:45 uebayasi Exp +# OpenBSD: MAKEDEV.common,v 1.86 2016/04/25 20:39:42 tedu Exp # OpenBSD: MAKEDEV.mi,v 1.82 2016/03/12 17:58:59 espie Exp # OpenBSD: MAKEDEV.sub,v 1.14 2005/02/07 06:14:18 david Exp # @@ -62,7 +62,7 @@ # Special purpose devices: # audio* Audio devices # bio ioctl tunnel pseudo-device -# bpf* Berkeley Packet Filter +# bpf Berkeley Packet Filter # diskmap Disk mapper # fd fd/* nodes # fuse Userland Filesystem @@ -277,8 +277,9 @@ diskmap) M diskmap c 69 0 640 operator ;; -bpf*) - M bpf$U c 12 $U 600 +bpf) + M bpf c 12 0 600 + M bpf0 c 12 0 600 ;; bio) @@ -448,18 +449,17 @@ local) ramdisk) R diskmap bio pty0 rd0 cd0 cd1 st0 st1 wd0 wd1 wd2 wd3 wd4 - R sd0 sd1 sd2 sd3 sd4 tty00 tty01 bpf0 std + R sd0 sd1 sd2 sd3 sd4 tty00 tty01 bpf std ;; all) R ttya ttyb vnd0 vnd1 vnd2 vnd3 sd0 sd1 sd2 sd3 sd4 sd5 sd6 R sd7 sd8 sd9 cd0 cd1 rd0 tap0 tap1 tap2 tap3 tun0 tun1 tun2 - R tun3 bio bpf0 bpf1 bpf2 bpf3 bpf4 bpf5 bpf6 bpf7 bpf8 bpf9 - R pty0 pty1 pty2 diskmap vscsi0 ch0 audio0 audio1 audio2 fuse - R pppx hotplug ptm local wscons pci0 pci1 pci2 pci3 uall - R video0 video1 uk0 random tty00 tty01 tty02 tty03 tty04 tty05 - R tty06 tty07 tty08 tty09 tty0a tty0b pf wd0 wd1 wd2 wd3 std - R st0 st1 fd + R tun3 bio pty0 pty1 pty2 diskmap vscsi0 ch0 audio0 audio1 + R audio2 bpf fuse pppx hotplug ptm local wscons pci0 pci1 pci2 + R pci3 uall video0 video1 uk0 random tty00 tty01 tty02 tty03 + R tty04 tty05 tty06 tty07 tty08 tty09 tty0a tty0b pf wd0 wd1 + R wd2 wd3 std st0 st1 fd ;; wd*|sd*) diff --git a/src/etc/etc.sgi/MAKEDEV.md b/src/etc/etc.sgi/MAKEDEV.md index 9da07063..d96a3383 100644 --- a/src/etc/etc.sgi/MAKEDEV.md +++ b/src/etc/etc.sgi/MAKEDEV.md @@ -1,6 +1,6 @@ define(MACHINE,sgi)dnl vers(__file__, - {-$OpenBSD: MAKEDEV.md,v 1.45 2016/04/25 20:38:11 tedu Exp $-}, + {-$OpenBSD: MAKEDEV.md,v 1.46 2016/04/28 18:17:31 natano Exp $-}, etc.MACHINE)dnl dnl dnl Copyright (c) 2001-2006 Todd T. Fries @@ -100,7 +100,6 @@ target(all, ch, 0)dnl target(all, vscsi, 0)dnl target(all, diskmap)dnl target(all, pty, 0, 1, 2)dnl -target(all, bpf, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9)dnl target(all, bio)dnl target(all, tun, 0, 1, 2, 3)dnl target(all, tap, 0, 1, 2, 3)dnl diff --git a/src/etc/etc.socppc/MAKEDEV b/src/etc/etc.socppc/MAKEDEV index c7865333..31944e10 100644 --- a/src/etc/etc.socppc/MAKEDEV +++ b/src/etc/etc.socppc/MAKEDEV @@ -4,7 +4,7 @@ # generated from: # # OpenBSD: etc.socppc/MAKEDEV.md,v 1.28 2016/04/25 20:38:11 tedu Exp -# OpenBSD: MAKEDEV.common,v 1.85 2016/02/05 06:29:45 uebayasi Exp +# OpenBSD: MAKEDEV.common,v 1.86 2016/04/25 20:39:42 tedu Exp # OpenBSD: MAKEDEV.mi,v 1.82 2016/03/12 17:58:59 espie Exp # OpenBSD: MAKEDEV.sub,v 1.14 2005/02/07 06:14:18 david Exp # @@ -59,7 +59,7 @@ # ulpt* Printer devices # usb* Bus control devices used by usbd for attach/detach # Special purpose devices: -# bpf* Berkeley Packet Filter +# bpf Berkeley Packet Filter # diskmap Disk mapper # fd fd/* nodes # fuse Userland Filesystem @@ -270,8 +270,9 @@ diskmap) M diskmap c 82 0 640 operator ;; -bpf*) - M bpf$U c 22 $U 600 +bpf) + M bpf c 22 0 600 + M bpf0 c 22 0 600 ;; usb*) @@ -411,17 +412,16 @@ local) ramdisk) R diskmap rd0 cd0 cd1 st0 st1 wd0 wd1 wd2 wd3 wd4 sd0 sd1 sd2 - R sd3 sd4 tty00 tty01 bpf0 std + R sd3 sd4 tty00 tty01 bpf std ;; all) R vnd0 vnd1 vnd2 vnd3 sd0 sd1 sd2 sd3 sd4 sd5 sd6 sd7 sd8 sd9 - R cd0 cd1 rd0 tap0 tap1 tap2 tap3 tun0 tun1 tun2 tun3 bpf0 - R bpf1 bpf2 bpf3 bpf4 bpf5 bpf6 bpf7 bpf8 bpf9 pty0 diskmap - R vscsi0 ch0 fuse pppx hotplug ptm local wscons pci0 pci1 pci2 - R pci3 uall video0 video1 random tty00 tty01 tty02 tty03 tty04 - R tty05 tty06 tty07 tty08 tty09 tty0a tty0b pf wd0 wd1 wd2 wd3 - R std st0 st1 fd + R cd0 cd1 rd0 tap0 tap1 tap2 tap3 tun0 tun1 tun2 tun3 pty0 + R diskmap vscsi0 ch0 bpf fuse pppx hotplug ptm local wscons + R pci0 pci1 pci2 pci3 uall video0 video1 random tty00 tty01 + R tty02 tty03 tty04 tty05 tty06 tty07 tty08 tty09 tty0a tty0b + R pf wd0 wd1 wd2 wd3 std st0 st1 fd ;; wd*|sd*) diff --git a/src/etc/etc.socppc/MAKEDEV.md b/src/etc/etc.socppc/MAKEDEV.md index d6901885..e932754a 100644 --- a/src/etc/etc.socppc/MAKEDEV.md +++ b/src/etc/etc.socppc/MAKEDEV.md @@ -1,6 +1,6 @@ define(MACHINE,socppc)dnl vers(__file__, - {-$OpenBSD: MAKEDEV.md,v 1.28 2016/04/25 20:38:11 tedu Exp $-}, + {-$OpenBSD: MAKEDEV.md,v 1.29 2016/04/28 18:17:31 natano Exp $-}, etc.MACHINE)dnl dnl dnl Copyright (c) 2001-2006 Todd T. Fries @@ -89,7 +89,6 @@ target(all, ch, 0)dnl target(all, vscsi, 0)dnl target(all, diskmap)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, tap, 0, 1, 2, 3)dnl target(all, rd, 0)dnl diff --git a/src/etc/etc.sparc/MAKEDEV b/src/etc/etc.sparc/MAKEDEV index e99cf373..cdaf59a1 100644 --- a/src/etc/etc.sparc/MAKEDEV +++ b/src/etc/etc.sparc/MAKEDEV @@ -4,7 +4,7 @@ # generated from: # # OpenBSD: etc.sparc/MAKEDEV.md,v 1.57 2016/04/25 20:38:11 tedu Exp -# OpenBSD: MAKEDEV.common,v 1.85 2016/02/05 06:29:45 uebayasi Exp +# OpenBSD: MAKEDEV.common,v 1.86 2016/04/25 20:39:42 tedu Exp # OpenBSD: MAKEDEV.mi,v 1.82 2016/03/12 17:58:59 espie Exp # OpenBSD: MAKEDEV.sub,v 1.14 2005/02/07 06:14:18 david Exp # @@ -66,7 +66,7 @@ # apm Power management device # audio* Audio devices # bio ioctl tunnel pseudo-device -# bpf* Berkeley Packet Filter +# bpf Berkeley Packet Filter # diskmap Disk mapper # fd fd/* nodes # fuse Userland Filesystem @@ -206,7 +206,7 @@ U=`unt $i` case $i in ramdisk) - R std bpf0 bio diskmap random + R std bpf bio diskmap random R fd0 sd0 sd1 sd2 rd0 cd0 ;; @@ -281,8 +281,9 @@ diskmap) M diskmap c 129 0 640 operator ;; -bpf*) - M bpf$U c 105 $U 600 +bpf) + M bpf c 105 0 600 + M bpf0 c 105 0 600 ;; bio) @@ -516,13 +517,12 @@ local) all) R presto0 bpp0 vnd0 vnd1 vnd2 vnd3 sd0 sd1 sd2 sd3 sd4 cd0 R cd1 rd0 xy0 xy1 xy2 xy3 tap0 tap1 tap2 tap3 tun0 tun1 tun2 - R tun3 bpf0 bpf1 bpf2 bpf3 bpf4 bpf5 bpf6 bpf7 bpf8 bpf9 pty0 - R fd1 fd1B fd1C fd1D fd1E fd1F fd1G fd1H fd0 fd0B fd0C fd0D - R fd0E fd0F fd0G fd0H diskmap vscsi0 ch0 bio cuaa cuab cuac - R cuad ttya ttyb ttyc ttyd audio0 audio1 audio2 fuse pppx - R hotplug ptm local wscons uk0 random tty00 tty01 tty02 tty03 - R tty04 tty05 tty06 tty07 tty08 tty09 tty0a tty0b apm pf xd0 - R xd1 xd2 xd3 std st0 st1 fd + R tun3 pty0 fd1 fd1B fd1C fd1D fd1E fd1F fd1G fd1H fd0 fd0B + R fd0C fd0D fd0E fd0F fd0G fd0H diskmap vscsi0 ch0 bio cuaa + R cuab cuac cuad ttya ttyb ttyc ttyd audio0 audio1 audio2 bpf + R fuse pppx hotplug ptm local wscons uk0 random tty00 tty01 + R tty02 tty03 tty04 tty05 tty06 tty07 tty08 tty09 tty0a tty0b + R apm pf xd0 xd1 xd2 xd3 std st0 st1 fd ;; presto*|xd*|xy*|sd*) diff --git a/src/etc/etc.sparc/MAKEDEV.md b/src/etc/etc.sparc/MAKEDEV.md index d3e701cd..f2a4da8b 100644 --- a/src/etc/etc.sparc/MAKEDEV.md +++ b/src/etc/etc.sparc/MAKEDEV.md @@ -1,6 +1,6 @@ define(MACHINE,sparc)dnl vers(__file__, - {-$OpenBSD: MAKEDEV.md,v 1.57 2016/04/25 20:38:11 tedu Exp $-}, + {-$OpenBSD: MAKEDEV.md,v 1.58 2016/04/28 18:17:31 natano Exp $-}, etc.MACHINE)dnl dnl dnl Copyright (c) 2001-2006 Todd T. Fries @@ -110,7 +110,7 @@ dnl divert(__mddivert)dnl dnl ramdisk) - _recurse std bpf0 bio diskmap random + _recurse std bpf bio diskmap random _recurse fd0 sd0 sd1 sd2 rd0 cd0 ;; @@ -131,7 +131,6 @@ 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, tap, 0, 1, 2, 3)dnl target(all, xy, 0, 1, 2, 3)dnl diff --git a/src/etc/etc.sparc64/MAKEDEV b/src/etc/etc.sparc64/MAKEDEV index 706ac99f..5d15db1b 100644 --- a/src/etc/etc.sparc64/MAKEDEV +++ b/src/etc/etc.sparc64/MAKEDEV @@ -4,7 +4,7 @@ # generated from: # # OpenBSD: etc.sparc64/MAKEDEV.md,v 1.83 2016/04/25 20:38:11 tedu Exp -# OpenBSD: MAKEDEV.common,v 1.85 2016/02/05 06:29:45 uebayasi Exp +# OpenBSD: MAKEDEV.common,v 1.86 2016/04/25 20:39:42 tedu Exp # OpenBSD: MAKEDEV.mi,v 1.82 2016/03/12 17:58:59 espie Exp # OpenBSD: MAKEDEV.sub,v 1.14 2005/02/07 06:14:18 david Exp # @@ -75,7 +75,7 @@ # Special purpose devices: # audio* Audio devices # bio ioctl tunnel pseudo-device -# bpf* Berkeley Packet Filter +# bpf Berkeley Packet Filter # diskmap Disk mapper # drm* Direct Rendering Manager # fd fd/* nodes @@ -225,7 +225,7 @@ U=`unt $i` case $i in ramdisk) R std fd0 wd0 wd1 wd2 sd0 sd1 sd2 rd0 - R st0 cd0 bpf0 bio diskmap random + R st0 cd0 bpf bio diskmap random ;; std) @@ -337,8 +337,9 @@ diskmap) M diskmap c 130 0 640 operator ;; -bpf*) - M bpf$U c 105 $U 600 +bpf) + M bpf c 105 0 600 + M bpf0 c 105 0 600 ;; bio) @@ -621,15 +622,14 @@ all) R ttyV3 ttyV4 ttyV5 ttyV6 ttyV7 cuaa cuab cuac cuad ttya ttyb R ttyc ttyd drm0 drm1 drm2 drm3 bpp0 vnd0 vnd1 vnd2 vnd3 sd0 R sd1 sd2 sd3 sd4 sd5 sd6 sd7 sd8 sd9 cd0 cd1 rd0 tap0 tap1 - R tap2 tap3 tun0 tun1 tun2 tun3 bio bpf0 bpf1 bpf2 bpf3 bpf4 - R bpf5 bpf6 bpf7 bpf8 bpf9 pty0 fd1 fd1B fd1C fd1D fd1E fd1F - R fd1G fd1H fd0 fd0B fd0C fd0D fd0E fd0F fd0G fd0H diskmap - R vscsi0 ch0 audio0 audio1 audio2 fuse pppx hotplug ptm local - R wscons pci0 pci1 pci2 pci3 uall rmidi0 rmidi1 rmidi2 rmidi3 - R rmidi4 rmidi5 rmidi6 rmidi7 video0 video1 uk0 random lpa0 - R lpa1 lpa2 lpt0 lpt1 lpt2 tty00 tty01 tty02 tty03 tty04 tty05 - R tty06 tty07 tty08 tty09 tty0a tty0b ttyh0 ttyh1 pf wd0 wd1 - R wd2 wd3 std st0 st1 fd + R tap2 tap3 tun0 tun1 tun2 tun3 bio pty0 fd1 fd1B fd1C fd1D + R fd1E fd1F fd1G fd1H fd0 fd0B fd0C fd0D fd0E fd0F fd0G fd0H + R diskmap vscsi0 ch0 audio0 audio1 audio2 bpf fuse pppx + R hotplug ptm local wscons pci0 pci1 pci2 pci3 uall rmidi0 + R rmidi1 rmidi2 rmidi3 rmidi4 rmidi5 rmidi6 rmidi7 video0 + R video1 uk0 random lpa0 lpa1 lpa2 lpt0 lpt1 lpt2 tty00 tty01 + R tty02 tty03 tty04 tty05 tty06 tty07 tty08 tty09 tty0a tty0b + R ttyh0 ttyh1 pf wd0 wd1 wd2 wd3 std st0 st1 fd ;; wd*|sd*) diff --git a/src/etc/etc.sparc64/MAKEDEV.md b/src/etc/etc.sparc64/MAKEDEV.md index 02c887ef..d66153c7 100644 --- a/src/etc/etc.sparc64/MAKEDEV.md +++ b/src/etc/etc.sparc64/MAKEDEV.md @@ -1,6 +1,6 @@ define(MACHINE,sparc64)dnl vers(__file__, - {-$OpenBSD: MAKEDEV.md,v 1.83 2016/04/25 20:38:11 tedu Exp $-}, + {-$OpenBSD: MAKEDEV.md,v 1.84 2016/04/28 18:17:31 natano Exp $-}, etc.MACHINE)dnl dnl dnl Copyright (c) 2001-2006 Todd T. Fries @@ -135,7 +135,7 @@ divert(__mddivert)dnl dnl ramdisk) _recurse std fd0 wd0 wd1 wd2 sd0 sd1 sd2 rd0 - _recurse st0 cd0 bpf0 bio diskmap random + _recurse st0 cd0 bpf bio diskmap random ;; _std(2, 3, 76, 16) @@ -159,7 +159,6 @@ 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, bio)dnl target(all, tun, 0, 1, 2, 3)dnl target(all, tap, 0, 1, 2, 3)dnl diff --git a/src/etc/etc.zaurus/MAKEDEV b/src/etc/etc.zaurus/MAKEDEV index 503efa9b..9f254106 100644 --- a/src/etc/etc.zaurus/MAKEDEV +++ b/src/etc/etc.zaurus/MAKEDEV @@ -4,7 +4,7 @@ # generated from: # # OpenBSD: etc.zaurus/MAKEDEV.md,v 1.42 2016/04/25 20:38:11 tedu Exp -# OpenBSD: MAKEDEV.common,v 1.85 2016/02/05 06:29:45 uebayasi Exp +# OpenBSD: MAKEDEV.common,v 1.86 2016/04/25 20:39:42 tedu Exp # OpenBSD: MAKEDEV.mi,v 1.82 2016/03/12 17:58:59 espie Exp # OpenBSD: MAKEDEV.sub,v 1.14 2005/02/07 06:14:18 david Exp # @@ -62,7 +62,7 @@ # audio* Audio devices # bio ioctl tunnel pseudo-device # bktr* Video frame grabbers -# bpf* Berkeley Packet Filter +# bpf Berkeley Packet Filter # diskmap Disk mapper # fd fd/* nodes # fuse Userland Filesystem @@ -205,7 +205,7 @@ U=`unt $i` case $i in ramdisk) - R std bpf0 wd0 wd1 sd0 tty00 rd0 wsmouse + R std bpf wd0 wd1 sd0 tty00 rd0 wsmouse R st0 ttyC0 wskbd0 apm bio diskmap random ;; @@ -292,8 +292,9 @@ diskmap) M diskmap c 102 0 640 operator ;; -bpf*) - M bpf$U c 22 $U 600 +bpf) + M bpf c 22 0 600 + M bpf0 c 22 0 600 ;; bktr*) @@ -457,13 +458,12 @@ local) all) R vnd0 vnd1 vnd2 vnd3 sd0 sd1 sd2 sd3 sd4 sd5 sd6 sd7 sd8 sd9 - R cd0 cd1 rd0 tap0 tap1 tap2 tap3 tun0 tun1 tun2 tun3 bpf0 - R bpf1 bpf2 bpf3 bpf4 bpf5 bpf6 bpf7 bpf8 bpf9 pty0 bio - R diskmap vscsi0 ch0 audio0 audio1 audio2 fuse pppx hotplug - R ptm local wscons uall rmidi0 rmidi1 rmidi2 rmidi3 rmidi4 - R rmidi5 rmidi6 rmidi7 tuner0 radio0 video0 video1 uk0 random - R tty00 tty01 tty02 tty03 tty04 tty05 tty06 tty07 tty08 tty09 - R tty0a tty0b apm pf wd0 wd1 wd2 wd3 std st0 st1 fd + R cd0 cd1 rd0 tap0 tap1 tap2 tap3 tun0 tun1 tun2 tun3 pty0 bio + R diskmap vscsi0 ch0 audio0 audio1 audio2 bpf fuse pppx + R hotplug ptm local wscons uall rmidi0 rmidi1 rmidi2 rmidi3 + R rmidi4 rmidi5 rmidi6 rmidi7 tuner0 radio0 video0 video1 uk0 + R random tty00 tty01 tty02 tty03 tty04 tty05 tty06 tty07 tty08 + R tty09 tty0a tty0b apm pf wd0 wd1 wd2 wd3 std st0 st1 fd ;; wd*|sd*) diff --git a/src/etc/etc.zaurus/MAKEDEV.md b/src/etc/etc.zaurus/MAKEDEV.md index f85155e6..6c5f9bd6 100644 --- a/src/etc/etc.zaurus/MAKEDEV.md +++ b/src/etc/etc.zaurus/MAKEDEV.md @@ -1,6 +1,6 @@ define(MACHINE,zaurus)dnl vers(__file__, - {-$OpenBSD: MAKEDEV.md,v 1.42 2016/04/25 20:38:11 tedu Exp $-}, + {-$OpenBSD: MAKEDEV.md,v 1.43 2016/04/28 18:17:31 natano Exp $-}, etc.MACHINE)dnl dnl dnl Copyright (c) 2001-2004 Todd T. Fries @@ -87,7 +87,7 @@ dnl divert(__mddivert)dnl dnl ramdisk) - _recurse std bpf0 wd0 wd1 sd0 tty00 rd0 wsmouse + _recurse std bpf wd0 wd1 sd0 tty00 rd0 wsmouse _recurse st0 ttyC0 wskbd0 apm bio diskmap random ;; @@ -104,7 +104,6 @@ target(all, bio)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, tap, 0, 1, 2, 3)dnl target(all, xy, 0, 1, 2, 3)dnl