From 4e88f578c93f37b7c838d4891dc6aa00ce1338c1 Mon Sep 17 00:00:00 2001 From: deraadt <> Date: Thu, 2 Aug 2007 16:42:19 +0000 Subject: [PATCH] sync --- src/etc/etc.alpha/MAKEDEV | 2 +- src/etc/etc.amd64/MAKEDEV | 19 ++++++++++++------- src/etc/etc.armish/MAKEDEV | 3 +-- src/etc/etc.hp300/MAKEDEV | 3 +-- src/etc/etc.hppa/MAKEDEV | 3 +-- src/etc/etc.hppa64/MAKEDEV | 3 +-- src/etc/etc.landisk/MAKEDEV | 3 +-- src/etc/etc.luna88k/MAKEDEV | 3 +-- src/etc/etc.mac68k/MAKEDEV | 3 +-- src/etc/etc.mvme68k/MAKEDEV | 10 ++++------ src/etc/etc.mvme88k/MAKEDEV | 3 +-- src/etc/etc.sgi/MAKEDEV | 3 +-- src/etc/etc.sparc/MAKEDEV | 3 +-- src/etc/etc.sparc64/MAKEDEV | 3 +-- src/etc/etc.vax/MAKEDEV | 3 +-- src/etc/etc.zaurus/MAKEDEV | 3 +-- 16 files changed, 30 insertions(+), 40 deletions(-) diff --git a/src/etc/etc.alpha/MAKEDEV b/src/etc/etc.alpha/MAKEDEV index 8c6fa357..72ad4f61 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.34 2007/06/20 18:28:55 miod Exp -# OpenBSD: MAKEDEV.common,v 1.35 2007/05/28 22:37:14 todd Exp +# OpenBSD: MAKEDEV.common,v 1.36 2007/07/23 23:21:25 todd Exp # OpenBSD: MAKEDEV.mi,v 1.77 2005/10/06 06:43:19 otto Exp # OpenBSD: MAKEDEV.sub,v 1.14 2005/02/07 06:14:18 david Exp # diff --git a/src/etc/etc.amd64/MAKEDEV b/src/etc/etc.amd64/MAKEDEV index ae4a6154..09a658c1 100644 --- a/src/etc/etc.amd64/MAKEDEV +++ b/src/etc/etc.amd64/MAKEDEV @@ -3,7 +3,7 @@ # THIS FILE AUTOMATICALLY GENERATED. DO NOT EDIT. # generated from: # -# OpenBSD: etc.amd64/MAKEDEV.md,v 1.18 2007/07/25 18:48:35 todd Exp +# OpenBSD: etc.amd64/MAKEDEV.md,v 1.19 2007/08/02 16:40:26 deraadt Exp # OpenBSD: MAKEDEV.common,v 1.36 2007/07/23 23:21:25 todd Exp # OpenBSD: MAKEDEV.mi,v 1.77 2005/10/06 06:43:19 otto Exp # OpenBSD: MAKEDEV.sub,v 1.14 2005/02/07 06:14:18 david Exp @@ -83,6 +83,7 @@ # joy* Joystick driver # lkm Loadable kernel modules interface # music* MIDI devices +# nvram NVRAM access # pci* PCI bus devices # pctr* PC Performance Tuning Register access device # pf* Packet Filter @@ -310,6 +311,10 @@ pci*) MKlist[${#MKlist[*]}]=";[ -h pci ] || ln -sf pci0 pci" ;; +nvram) + M nvram c 85 0 440 kmem + ;; + music*) M music$U c 53 $U M sequencer$U c 53 $(($U+128)) @@ -564,12 +569,12 @@ local) ;; all) - R bthub0 bthub1 bthub2 bktr0 ccd0 ccd1 ccd2 ccd3 vnd0 vnd1 - R vnd2 vnd3 sd0 sd1 sd2 sd3 sd4 cd0 cd1 rd0 tun0 tun1 tun2 - R tun3 bpf0 bpf1 bpf2 bpf3 bpf4 bpf5 bpf6 bpf7 bpf8 bpf9 bio - R pty0 fd1 fd1B fd1C fd1D fd1E fd1F fd1G fd1H fd0 fd0B fd0C - R fd0D fd0E fd0F fd0G fd0H xfs0 ss0 ss1 ch0 hotplug ptm gpr0 - R local wscons pci0 pci1 pci2 pci3 iop0 iop1 uall rmidi0 + R bthub0 bthub1 bthub2 nvram bktr0 ccd0 ccd1 ccd2 ccd3 vnd0 + R vnd1 vnd2 vnd3 sd0 sd1 sd2 sd3 sd4 cd0 cd1 rd0 tun0 tun1 + R tun2 tun3 bpf0 bpf1 bpf2 bpf3 bpf4 bpf5 bpf6 bpf7 bpf8 bpf9 + R bio pty0 fd1 fd1B fd1C fd1D fd1E fd1F fd1G fd1H fd0 fd0B + R fd0C fd0D fd0E fd0F fd0G fd0H xfs0 ss0 ss1 ch0 hotplug ptm + R gpr0 local wscons pci0 pci1 pci2 pci3 iop0 iop1 uall rmidi0 R rmidi1 rmidi2 rmidi3 rmidi4 rmidi5 rmidi6 rmidi7 tuner0 R radio0 music0 speaker audio0 uk0 random joy0 joy1 lpa0 lpa1 R lpa2 lpt0 lpt1 lpt2 lkm tty00 tty01 tty02 tty03 ttyc0 ttyc1 diff --git a/src/etc/etc.armish/MAKEDEV b/src/etc/etc.armish/MAKEDEV index 815871d4..51f9024f 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.5 2007/05/28 22:26:02 todd Exp -# OpenBSD: MAKEDEV.common,v 1.34 2007/05/18 14:05:33 jmc Exp +# OpenBSD: MAKEDEV.common,v 1.36 2007/07/23 23:21:25 todd Exp # OpenBSD: MAKEDEV.mi,v 1.77 2005/10/06 06:43:19 otto Exp # OpenBSD: MAKEDEV.sub,v 1.14 2005/02/07 06:14:18 david Exp # @@ -23,7 +23,6 @@ # ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF # OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. # - # Device "make" file. Valid arguments: # all makes all known devices, including local devices. # Tries to make the ``standard'' number of each type. diff --git a/src/etc/etc.hp300/MAKEDEV b/src/etc/etc.hp300/MAKEDEV index 3d8afbbc..3d5d64b4 100644 --- a/src/etc/etc.hp300/MAKEDEV +++ b/src/etc/etc.hp300/MAKEDEV @@ -4,7 +4,7 @@ # generated from: # # OpenBSD: etc.hp300/MAKEDEV.md,v 1.30 2007/05/28 22:26:02 todd Exp -# OpenBSD: MAKEDEV.common,v 1.34 2007/05/18 14:05:33 jmc Exp +# OpenBSD: MAKEDEV.common,v 1.36 2007/07/23 23:21:25 todd Exp # OpenBSD: MAKEDEV.mi,v 1.77 2005/10/06 06:43:19 otto Exp # OpenBSD: MAKEDEV.sub,v 1.14 2005/02/07 06:14:18 david Exp # @@ -23,7 +23,6 @@ # ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF # OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. # - # Device "make" file. Valid arguments: # all makes all known devices, including local devices. # Tries to make the ``standard'' number of each type. diff --git a/src/etc/etc.hppa/MAKEDEV b/src/etc/etc.hppa/MAKEDEV index 7c6f8c96..c61fcaf3 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.30 2007/05/28 22:26:02 todd Exp -# OpenBSD: MAKEDEV.common,v 1.34 2007/05/18 14:05:33 jmc Exp +# OpenBSD: MAKEDEV.common,v 1.36 2007/07/23 23:21:25 todd Exp # OpenBSD: MAKEDEV.mi,v 1.77 2005/10/06 06:43:19 otto Exp # OpenBSD: MAKEDEV.sub,v 1.14 2005/02/07 06:14:18 david Exp # @@ -23,7 +23,6 @@ # ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF # OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. # - # Device "make" file. Valid arguments: # all makes all known devices, including local devices. # Tries to make the ``standard'' number of each type. diff --git a/src/etc/etc.hppa64/MAKEDEV b/src/etc/etc.hppa64/MAKEDEV index 67880762..5e8fdd07 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.7 2007/05/28 22:26:02 todd Exp -# OpenBSD: MAKEDEV.common,v 1.34 2007/05/18 14:05:33 jmc Exp +# OpenBSD: MAKEDEV.common,v 1.36 2007/07/23 23:21:25 todd Exp # OpenBSD: MAKEDEV.mi,v 1.77 2005/10/06 06:43:19 otto Exp # OpenBSD: MAKEDEV.sub,v 1.14 2005/02/07 06:14:18 david Exp # @@ -23,7 +23,6 @@ # ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF # OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. # - # Device "make" file. Valid arguments: # all makes all known devices, including local devices. # Tries to make the ``standard'' number of each type. diff --git a/src/etc/etc.landisk/MAKEDEV b/src/etc/etc.landisk/MAKEDEV index e463286e..8cf46569 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.7 2007/05/28 22:26:02 todd Exp -# OpenBSD: MAKEDEV.common,v 1.34 2007/05/18 14:05:33 jmc Exp +# OpenBSD: MAKEDEV.common,v 1.36 2007/07/23 23:21:25 todd Exp # OpenBSD: MAKEDEV.mi,v 1.77 2005/10/06 06:43:19 otto Exp # OpenBSD: MAKEDEV.sub,v 1.14 2005/02/07 06:14:18 david Exp # @@ -23,7 +23,6 @@ # ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF # OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. # - # Device "make" file. Valid arguments: # all makes all known devices, including local devices. # Tries to make the ``standard'' number of each type. diff --git a/src/etc/etc.luna88k/MAKEDEV b/src/etc/etc.luna88k/MAKEDEV index 0c5ed875..73f1f4e4 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.7 2007/05/28 22:26:02 todd Exp -# OpenBSD: MAKEDEV.common,v 1.34 2007/05/18 14:05:33 jmc Exp +# OpenBSD: MAKEDEV.common,v 1.36 2007/07/23 23:21:25 todd Exp # OpenBSD: MAKEDEV.mi,v 1.77 2005/10/06 06:43:19 otto Exp # OpenBSD: MAKEDEV.sub,v 1.14 2005/02/07 06:14:18 david Exp # @@ -23,7 +23,6 @@ # ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF # OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. # - # Device "make" file. Valid arguments: # all makes all known devices, including local devices. # Tries to make the ``standard'' number of each type. diff --git a/src/etc/etc.mac68k/MAKEDEV b/src/etc/etc.mac68k/MAKEDEV index a16aa617..1acdac03 100644 --- a/src/etc/etc.mac68k/MAKEDEV +++ b/src/etc/etc.mac68k/MAKEDEV @@ -4,7 +4,7 @@ # generated from: # # OpenBSD: etc.mac68k/MAKEDEV.md,v 1.25 2007/05/28 22:26:02 todd Exp -# OpenBSD: MAKEDEV.common,v 1.34 2007/05/18 14:05:33 jmc Exp +# OpenBSD: MAKEDEV.common,v 1.36 2007/07/23 23:21:25 todd Exp # OpenBSD: MAKEDEV.mi,v 1.77 2005/10/06 06:43:19 otto Exp # OpenBSD: MAKEDEV.sub,v 1.14 2005/02/07 06:14:18 david Exp # @@ -23,7 +23,6 @@ # ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF # OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. # - # Device "make" file. Valid arguments: # all makes all known devices, including local devices. # Tries to make the ``standard'' number of each type. diff --git a/src/etc/etc.mvme68k/MAKEDEV b/src/etc/etc.mvme68k/MAKEDEV index 7e7dbf26..f56b2637 100644 --- a/src/etc/etc.mvme68k/MAKEDEV +++ b/src/etc/etc.mvme68k/MAKEDEV @@ -4,7 +4,7 @@ # generated from: # # OpenBSD: etc.mvme68k/MAKEDEV.md,v 1.19 2007/05/28 22:26:02 todd Exp -# OpenBSD: MAKEDEV.common,v 1.34 2007/05/18 14:05:33 jmc Exp +# OpenBSD: MAKEDEV.common,v 1.36 2007/07/23 23:21:25 todd Exp # OpenBSD: MAKEDEV.mi,v 1.77 2005/10/06 06:43:19 otto Exp # OpenBSD: MAKEDEV.sub,v 1.14 2005/02/07 06:14:18 david Exp # @@ -23,7 +23,6 @@ # ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF # OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. # - # Device "make" file. Valid arguments: # all makes all known devices, including local devices. # Tries to make the ``standard'' number of each type. @@ -54,7 +53,7 @@ # bio ioctl tunnel pseudo-device # bpf* Berkeley Packet Filter # fd fd/* nodes -# flash* NAND flash pseudo-disk devices +# flash0 On-board flash memory # lkm Loadable kernel modules interface # nvram0 On-board non-volatile memory # pf* Packet Filter @@ -265,9 +264,8 @@ lkm) M lkm c 24 0 640 _lkm ;; -flash*) - dodisk flash $U major_flash_b 11 $U 0 - dodisk sflash $U major_flash_b 11 $U 2048 +flash0) + M flash0 c 11 0 640 kmem ;; fd) diff --git a/src/etc/etc.mvme88k/MAKEDEV b/src/etc/etc.mvme88k/MAKEDEV index e95ca88d..5d26775c 100644 --- a/src/etc/etc.mvme88k/MAKEDEV +++ b/src/etc/etc.mvme88k/MAKEDEV @@ -4,7 +4,7 @@ # generated from: # # OpenBSD: etc.mvme88k/MAKEDEV.md,v 1.19 2007/05/28 22:26:02 todd Exp -# OpenBSD: MAKEDEV.common,v 1.34 2007/05/18 14:05:33 jmc Exp +# OpenBSD: MAKEDEV.common,v 1.36 2007/07/23 23:21:25 todd Exp # OpenBSD: MAKEDEV.mi,v 1.77 2005/10/06 06:43:19 otto Exp # OpenBSD: MAKEDEV.sub,v 1.14 2005/02/07 06:14:18 david Exp # @@ -23,7 +23,6 @@ # ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF # OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. # - # Device "make" file. Valid arguments: # all makes all known devices, including local devices. # Tries to make the ``standard'' number of each type. diff --git a/src/etc/etc.sgi/MAKEDEV b/src/etc/etc.sgi/MAKEDEV index b192e720..0bf9aa25 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.15 2007/05/28 22:26:02 todd Exp -# OpenBSD: MAKEDEV.common,v 1.34 2007/05/18 14:05:33 jmc Exp +# OpenBSD: MAKEDEV.common,v 1.36 2007/07/23 23:21:25 todd Exp # OpenBSD: MAKEDEV.mi,v 1.77 2005/10/06 06:43:19 otto Exp # OpenBSD: MAKEDEV.sub,v 1.14 2005/02/07 06:14:18 david Exp # @@ -23,7 +23,6 @@ # ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF # OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. # - # Device "make" file. Valid arguments: # all makes all known devices, including local devices. # Tries to make the ``standard'' number of each type. diff --git a/src/etc/etc.sparc/MAKEDEV b/src/etc/etc.sparc/MAKEDEV index d3ff8535..eb85fa07 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.34 2007/05/28 22:26:02 todd Exp -# OpenBSD: MAKEDEV.common,v 1.34 2007/05/18 14:05:33 jmc Exp +# OpenBSD: MAKEDEV.common,v 1.36 2007/07/23 23:21:25 todd Exp # OpenBSD: MAKEDEV.mi,v 1.77 2005/10/06 06:43:19 otto Exp # OpenBSD: MAKEDEV.sub,v 1.14 2005/02/07 06:14:18 david Exp # @@ -23,7 +23,6 @@ # ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF # OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. # - # Device "make" file. Valid arguments: # all makes all known devices, including local devices. # Tries to make the ``standard'' number of each type. diff --git a/src/etc/etc.sparc64/MAKEDEV b/src/etc/etc.sparc64/MAKEDEV index 89d32ced..003ba796 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.44 2007/05/28 22:26:02 todd Exp -# OpenBSD: MAKEDEV.common,v 1.34 2007/05/18 14:05:33 jmc Exp +# OpenBSD: MAKEDEV.common,v 1.36 2007/07/23 23:21:25 todd Exp # OpenBSD: MAKEDEV.mi,v 1.77 2005/10/06 06:43:19 otto Exp # OpenBSD: MAKEDEV.sub,v 1.14 2005/02/07 06:14:18 david Exp # @@ -23,7 +23,6 @@ # ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF # OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. # - # Device "make" file. Valid arguments: # all makes all known devices, including local devices. # Tries to make the ``standard'' number of each type. diff --git a/src/etc/etc.vax/MAKEDEV b/src/etc/etc.vax/MAKEDEV index 5e701ef4..daf5a5ac 100644 --- a/src/etc/etc.vax/MAKEDEV +++ b/src/etc/etc.vax/MAKEDEV @@ -4,7 +4,7 @@ # generated from: # # OpenBSD: etc.vax/MAKEDEV.md,v 1.31 2007/05/28 22:26:02 todd Exp -# OpenBSD: MAKEDEV.common,v 1.34 2007/05/18 14:05:33 jmc Exp +# OpenBSD: MAKEDEV.common,v 1.36 2007/07/23 23:21:25 todd Exp # OpenBSD: MAKEDEV.mi,v 1.77 2005/10/06 06:43:19 otto Exp # OpenBSD: MAKEDEV.sub,v 1.14 2005/02/07 06:14:18 david Exp # @@ -23,7 +23,6 @@ # ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF # OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. # - # Device "make" file. Valid arguments: # all makes all known devices, including local devices. # Tries to make the ``standard'' number of each type. diff --git a/src/etc/etc.zaurus/MAKEDEV b/src/etc/etc.zaurus/MAKEDEV index 1567cbeb..8d244d04 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.12 2007/05/28 22:26:02 todd Exp -# OpenBSD: MAKEDEV.common,v 1.34 2007/05/18 14:05:33 jmc Exp +# OpenBSD: MAKEDEV.common,v 1.36 2007/07/23 23:21:25 todd Exp # OpenBSD: MAKEDEV.mi,v 1.77 2005/10/06 06:43:19 otto Exp # OpenBSD: MAKEDEV.sub,v 1.14 2005/02/07 06:14:18 david Exp # @@ -23,7 +23,6 @@ # ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF # OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. # - # Device "make" file. Valid arguments: # all makes all known devices, including local devices. # Tries to make the ``standard'' number of each type.