summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--etc/etc.alpha/MAKEDEV309
-rw-r--r--etc/etc.amd64/MAKEDEV407
-rw-r--r--etc/etc.cats/MAKEDEV273
-rw-r--r--etc/etc.hp300/MAKEDEV96
-rw-r--r--etc/etc.hppa/MAKEDEV206
-rw-r--r--etc/etc.i386/MAKEDEV407
-rw-r--r--etc/etc.mac68k/MAKEDEV139
-rw-r--r--etc/etc.macppc/MAKEDEV280
-rw-r--r--etc/etc.mvme68k/MAKEDEV179
-rw-r--r--etc/etc.mvme88k/MAKEDEV173
-rw-r--r--etc/etc.pegasos/MAKEDEV278
-rw-r--r--etc/etc.sparc/MAKEDEV261
-rw-r--r--etc/etc.sparc64/MAKEDEV381
-rw-r--r--etc/etc.vax/MAKEDEV235
-rw-r--r--share/man/man8/man8.alpha/MAKEDEV.8257
-rw-r--r--share/man/man8/man8.amd64/MAKEDEV.8241
-rw-r--r--share/man/man8/man8.cats/MAKEDEV.8199
-rw-r--r--share/man/man8/man8.hp300/MAKEDEV.8235
-rw-r--r--share/man/man8/man8.hppa/MAKEDEV.8255
-rw-r--r--share/man/man8/man8.i386/MAKEDEV.8342
-rw-r--r--share/man/man8/man8.mac68k/MAKEDEV.8199
-rw-r--r--share/man/man8/man8.macppc/MAKEDEV.8287
-rw-r--r--share/man/man8/man8.mvme68k/MAKEDEV.8199
-rw-r--r--share/man/man8/man8.mvme88k/MAKEDEV.8189
-rw-r--r--share/man/man8/man8.pegasos/MAKEDEV.8282
-rw-r--r--share/man/man8/man8.sparc/MAKEDEV.8280
-rw-r--r--share/man/man8/man8.sparc64/MAKEDEV.8307
-rw-r--r--share/man/man8/man8.vax/MAKEDEV.8285
28 files changed, 4013 insertions, 3168 deletions
diff --git a/etc/etc.alpha/MAKEDEV b/etc/etc.alpha/MAKEDEV
index a67ac038b8a..994c890b63b 100644
--- a/etc/etc.alpha/MAKEDEV
+++ b/etc/etc.alpha/MAKEDEV
@@ -3,9 +3,10 @@
# THIS FILE AUTOMATICALLY GENERATED. DO NOT EDIT.
# generated from:
#
-# OpenBSD: etc.alpha/MAKEDEV.md,v 1.20 2004/02/14 17:24:31 todd Exp
-# OpenBSD: MAKEDEV.mi,v 1.71 2004/02/14 17:24:30 todd Exp
-# OpenBSD: MAKEDEV.sub,v 1.10 2004/02/14 17:24:31 todd Exp
+# OpenBSD: etc.alpha/MAKEDEV.md,v 1.21 2004/02/16 19:00:57 miod Exp
+# OpenBSD: MAKEDEV.common,v 1.1 2004/02/16 18:58:54 miod Exp
+# OpenBSD: MAKEDEV.mi,v 1.72 2004/02/16 18:58:53 miod Exp
+# OpenBSD: MAKEDEV.sub,v 1.11 2004/02/16 18:58:53 miod Exp
#
#
# Copyright (c) 2001-2004 Todd T. Fries <todd@OpenBSD.org>
@@ -25,65 +26,64 @@
# Device "make" file. Valid arguments:
# all makes all known devices, including local devices.
# Tries to make the ``standard'' number of each type.
-# ramdisk devices to be put on ramdisk-based media
-# std standard devices
-# local configuration specific devices
-# Tapes:
-# st* SCSI tapes
+# ramdisk Ramdisk kernel devices
+# std Standard devices
+# local Configuration specific devices
# Disks:
-# sd* SCSI disks
+# ccd* Concatenated disk devices
# cd* SCSI cdrom drives
-# vnd* "file" pseudo-disks
-# ccd* concatenated disk devices
-# wd* "winchester" disk drives (ST506, IDE, ESDI, RLL, ...)
+# fd* Floppy disk drives (3 1/2", 5 1/4")
# rd* "rd" pseudo-disks
# raid* RAIDframe disk devices
-# fd* Floppy disk drives (3 1/2", 5 1/4")
+# sd* SCSI disks
+# vnd* "file" pseudo-disk devices
+# wd* "winchester" disk drives (ST506, IDE, ESDI, RLL, ...)
+# Tapes:
+# ch* SCSI media changers
+# st* SCSI tape drives
# Terminal ports:
+# tty[0-7][0-9a-f] NS16x50 serial ports
# ttyB? DEC 3000 ZS8530 ("scc") serial ports
-# ttyC0 wscons screen 0
-# ttyC-F* wscons virtual consoles
+# ttyc* Cyclades serial ports
+# Pseudo terminals:
+# ptm pty master device
+# pty* Set of 16 master pseudo terminals
+# tty* Set of 16 slave pseudo terminals
+# Console ports:
+# ttyC0 Minimal wscons devices
+# ttyC-F* wscons display devices
# wskbd* wscons keyboards
# wsmux wscons keyboard/mouse mux devices
-# tty[0-7][0-9a-f] NS16x50 serial ports
-# ttyc* Cyclades serial ports
# Pointing devices:
# wsmouse* wscons mice
-# Pseudo terminals:
-# tty* set of 16 slave pseudo terminals
-# pty* set of 16 master pseudo terminals
-# ptm pty master device
# Printers:
+# lpa* Polled printer port
# lpt* IEEE 1284 centronics printer
-# lpa* interruptless lp
# USB devices:
-# usb* Bus control devices used by usbd for attach/detach
+# usbs All USB devices
+# ttyU* USB serial ports
+# ugen* Generic USB devices
# uhid* Generic HID devices
# ulpt* Printer devices
-# ugen* Generic device
-# ttyU* Serial ports
+# usb* Bus control devices used by usbd for attach/detach
# Special purpose devices:
-# ch* SCSI media changer
-# pf* Packet Filter
+# audio* Audio devices
# bpf* Berkeley Packet Filter
-# iop* I2O controller device
+# fd fd/* nodes for fdescfs
+# iop* I2O controller devices
+# lkm Loadable kernel modules interface
+# mmclock Memory mapped clock
+# music* MIDI devices
# pci PCI bus device
-# usbs make USB devices
-# fd makes fd/* for the fdescfs
-# lkm loadable kernel modules interface
-# tun* network tunnel driver
-# mmclock memory mapped clock
-# kbd keyboard (provides events, for X11)
-# mouse mouse (provides events, for X11)
-# *random inkernel random data source
-# uk* SCSI Unknown device
+# pf* Packet Filter
+# rmidi* Raw MIDI devices
+# *random In-kernel random data source
+# speaker PC speaker
# ss* SCSI scanners
-# xfs* XFS filesystem devices
-# audio* audio device
-# speaker pc speaker
-# rmidi* raw midi devices
-# music* midi devices
-# systrace* system call tracing device
+# systrace* System call tracing device
+# tun* Network tunnel driver
+# uk* SCSI unknown devices
+# xfs* XFS filesystem node
PATH=/sbin:/usr/sbin:/bin:/usr/bin
T=$0
@@ -250,38 +250,20 @@ mmclock)
M mmclock c 28 0 444
;;
-systrace)
- M systrace c 50 0 644
- ;;
-
-music*)
- M music$U c 42 $U
- M sequencer$U c 42 $(($U+128))
- MKlist="$MKlist;[ -e music ] || ln -s music$U music"
- MKlist="$MKlist;[ -e sequencer ] || ln -s sequencer$U sequencer"
- ;;
-
-rmidi*)
- M rmidi$U c 41 $U 666
+xfs*)
+ M xfs$U c 51 $U 600
;;
-speaker)
- M speaker c 40 0 600
+uk*)
+ M uk$U c 33 $U 640 operator
;;
-audio*)
- M sound$U c 24 $U
- M mixer$U c 24 $(($U+16))
- M audio$U c 24 $(($U+128))
- M audioctl$U c 24 $(($U+192))
- MKlist="$MKlist;[ -e audio ] || ln -s audio$U audio"
- MKlist="$MKlist;[ -e mixer ] || ln -s mixer$U mixer"
- MKlist="$MKlist;[ -e sound ] || ln -s sound$U sound"
- MKlist="$MKlist;[ -e audioctl ] || ln -s audioctl$U audioctl"
+tun*)
+ M tun$U c 7 $U 600
;;
-xfs*)
- M xfs$U c 51 $U 600
+systrace)
+ M systrace c 50 0 644
;;
ss*)
@@ -292,8 +274,8 @@ ss*)
MKlist="$MKlist;umask 77;ln -s ss$U scan$U"
;;
-uk*)
- M uk$U c 33 $U 640 operator
+speaker)
+ M speaker c 40 0 600
;;
*random)
@@ -305,53 +287,65 @@ uk*)
done
;;
-kbd)
- M kbd c major_kbd_c 0 600
- ;;
-
-tun*)
- M tun$U c 7 $U 600
+rmidi*)
+ M rmidi$U c 41 $U 666
;;
-lkm)
- M lkm c 16 0 640 _lkm
+pf*)
+ M pf c 35 0 600
;;
-fd)
- RMlist="mkdir -p fd;$RMlist" n=0
- while [ $n -lt 64 ];do M fd/$n c 10 $n;n=$(($n+1));done
- MKlist="$MKlist;chmod 555 fd"
+pci)
+ M pci c 52 0 600
;;
-usbs)
- R ttyU0 ttyU1 ugen0 ugen1 ulpt0 ulpt1 uhid0 uhid1 uhid2 uhid3
- R usb0 usb1
+music*)
+ M music$U c 42 $U
+ M sequencer$U c 42 $(($U+128))
+ MKlist="$MKlist;[ -e music ] || ln -s music$U music"
+ MKlist="$MKlist;[ -e sequencer ] || ln -s sequencer$U sequencer"
;;
-pci)
- M pci c 52 0 600
+lkm)
+ M lkm c 16 0 640 _lkm
;;
iop*)
M iop$U c 54 $U 660
;;
+fd)
+ RMlist="mkdir -p fd;$RMlist" n=0
+ while [ $n -lt 64 ];do M fd/$n c 10 $n;n=$(($n+1));done
+ MKlist="$MKlist;chmod 555 fd"
+ ;;
+
bpf*)
M bpf$U c 11 $U 600
;;
-pf*)
- M pf c 35 0 600
+audio*)
+ M sound$U c 24 $U
+ M mixer$U c 24 $(($U+16))
+ M audio$U c 24 $(($U+128))
+ M audioctl$U c 24 $(($U+192))
+ MKlist="$MKlist;[ -e audio ] || ln -s audio$U audio"
+ MKlist="$MKlist;[ -e mixer ] || ln -s mixer$U mixer"
+ MKlist="$MKlist;[ -e sound ] || ln -s sound$U sound"
+ MKlist="$MKlist;[ -e audioctl ] || ln -s audioctl$U audioctl"
;;
-ch*)
- M ch$U c 14 $U 660 operator
+usb*)
+ [ "$i" = "usb" ] && u= || u=$U
+ M usb$u c 45 $U 660
;;
-ttyU[0-9a-zA-Z])
- U=${i#ttyU*}
- o=$(alph2d $U)
- M ttyU$U c 49 $o 660 dialer uucp
+ulpt*)
+ M ulpt$U c 47 $U 660
+ ;;
+
+uhid*)
+ M uhid$U c 46 $U 660
;;
ugen*)
@@ -362,17 +356,15 @@ ugen*)
done
;;
-ulpt*)
- M ulpt$U c 47 $U 660
- ;;
-
-uhid*)
- M uhid$U c 46 $U 660
+ttyU[0-9a-zA-Z])
+ U=${i#ttyU*}
+ o=$(alph2d $U)
+ M ttyU$U c 49 $o 660 dialer uucp
;;
-usb*)
- [ "$i" = "usb" ] && u= || u=$U
- M usb$u c 45 $U 660
+usbs)
+ R ttyU0 ttyU1 ugen0 ugen1 ulpt0 ulpt1 uhid0 uhid1 uhid2 uhid3
+ R usb0 usb1
;;
lpt*|lpa*)
@@ -383,8 +375,38 @@ lpt*|lpa*)
M $n$U c 31 $(($U+$f)) 600
;;
-ptm)
- M ptm c 55 0 666
+wsmouse*)
+ M wsmouse$U c 30 $U 600
+ ;;
+
+wsmux|wsmouse|wskbd)
+ M wsmouse c 56 0 600
+ M wskbd c 56 1 600
+ ;;
+
+wskbd*)
+ M wskbd$U c 29 $U 600
+ ;;
+
+tty[C-F]*)
+ U=${i##tty[C-F]}
+ case $i in
+ ttyC*) n=C m=0;;
+ ttyD*) n=D m=256;;
+ ttyE*) n=E m=512;;
+ ttyF*) n=F m=768;;
+ esac
+ case $U in
+ [0-9a-f]) M tty$n$U c 25 $(( 16#$U + $m )) 600;;
+ cfg) M tty${n}cfg c 25 $((255+$m)) 600;;
+ *) echo bad unit $U for $i; exit 1;;
+ esac
+ ;;
+
+wscons)
+ R wsmouse0 wsmouse1 wsmouse2 wsmouse3 wskbd0 wskbd1 wskbd2
+ R wskbd3 wsmux ttyCcfg ttyC0 ttyC1 ttyC2 ttyC3 ttyC4 ttyC5
+ R ttyC6 ttyC7 ttyC8 ttyC9 ttyCa ttyCb
;;
pty*)
@@ -405,8 +427,8 @@ pty*)
done
;;
-wsmouse*)
- M wsmouse$U c 30 $U 600
+ptm)
+ M ptm c 55 0 666
;;
tty[0-7][0-9a-f])
@@ -416,34 +438,27 @@ tty[0-7][0-9a-f])
M cua$U c 26 $(($o+128)) 660 dialer uucp
;;
-wsmux|wsmouse|wskbd)
- M wsmouse c 56 0 600
- M wskbd c 56 1 600
+st*)
+ n=$(($U*16))
+ for pre in " " n e en
+ do
+ M ${pre}st$U b 2 $n 660 operator
+ M ${pre}rst$U c 12 $n 660 operator
+ n=$(($n+1))
+ done
;;
-wskbd*)
- M wskbd$U c 29 $U 600
+ch*)
+ M ch$U c 14 $U 660 operator
;;
-tty[C-F]*)
- U=${i##tty[C-F]}
- case $i in
- ttyC*) n=C m=0;;
- ttyD*) n=D m=256;;
- ttyE*) n=E m=512;;
- ttyF*) n=F m=768;;
- esac
- case $U in
- [0-9a-f]) M tty$n$U c 25 $(( 16#$U + $m )) 600;;
- cfg) M tty${n}cfg c 25 $((255+$m)) 600;;
- *) echo bad unit $U for $i; exit 1;;
- esac
+vnd*)
+ dodisk vnd $U 9 9 $U 0
+ dodisk svnd $U 9 9 $U 2048
;;
-wscons)
- R wsmouse0 wsmouse1 wsmouse2 wsmouse3 wskbd0 wskbd1 wskbd2
- R wskbd3 wsmux ttyCcfg ttyC0 ttyC1 ttyC2 ttyC3 ttyC4 ttyC5
- R ttyC6 ttyC7 ttyC8 ttyC9 ttyCa ttyCb
+rd*)
+ dodisk2 rd $U 6 28 $U 0
;;
fd*)
@@ -474,29 +489,10 @@ fd*)
M r${nam}c c $chr $(($n+2)) 640 operator
;;
-rd*)
- dodisk2 rd $U 6 28 $U 0
- ;;
-
-vnd*)
- dodisk vnd $U 9 9 $U 0
- dodisk svnd $U 9 9 $U 2048
- ;;
-
cd*)
dodisk2 cd $U 3 13 $U 0
;;
-st*)
- n=$(($U*16))
- for pre in " " n e en
- do
- M ${pre}st$U b 2 $n 660 operator
- M ${pre}rst$U c 12 $n 660 operator
- n=$(($n+1))
- done
- ;;
-
local)
test -s $T.local && sh $T.local
;;
@@ -506,12 +502,13 @@ all)
R cd0 cd1 rd0 tun0 tun1 tun2 tun3 bpf0 bpf1 bpf2 bpf3 bpf4
R bpf5 bpf6 bpf7 bpf8 bpf9 pty0 pty1 pty2 fd1 fd1B fd1C fd1D
R fd1E fd1F fd1G fd1H fd0 fd0B fd0C fd0D fd0E fd0F fd0G fd0H
- R xfs0 ss0 ss1 ch0 ptm wscons pci iop0 iop1 usbs rmidi0 rmidi1
- R rmidi2 rmidi3 rmidi4 rmidi5 rmidi6 rmidi7 music0 speaker
- R audio0 uk0 random lpa0 lpa1 lpa2 lpt0 lpt1 lpt2 mmclock lkm
- R tty00 tty01 tty02 tty03 ttyc0 ttyc1 ttyc2 ttyc3 ttyc4 ttyc5
- R ttyc6 ttyc7 ttyB0 ttyB1 ttyB2 ttyB3 ttyB4 ttyB5 pf systrace
- R wd0 wd1 wd2 wd3 raid0 raid1 raid2 raid3 std st0 st1 fd
+ R xfs0 ss0 ss1 ch0 ptm local wscons pci iop0 iop1 usbs rmidi0
+ R rmidi1 rmidi2 rmidi3 rmidi4 rmidi5 rmidi6 rmidi7 music0
+ R speaker audio0 uk0 random lpa0 lpa1 lpa2 lpt0 lpt1 lpt2
+ R mmclock lkm tty00 tty01 tty02 tty03 ttyc0 ttyc1 ttyc2 ttyc3
+ R ttyc4 ttyc5 ttyc6 ttyc7 ttyB0 ttyB1 ttyB2 ttyB3 ttyB4 ttyB5
+ R pf systrace wd0 wd1 wd2 wd3 raid0 raid1 raid2 raid3 std st0
+ R st1 fd
;;
wd*|sd*|raid*|ccd*)
diff --git a/etc/etc.amd64/MAKEDEV b/etc/etc.amd64/MAKEDEV
index 8a111e4d964..d4942b621e5 100644
--- a/etc/etc.amd64/MAKEDEV
+++ b/etc/etc.amd64/MAKEDEV
@@ -3,9 +3,10 @@
# THIS FILE AUTOMATICALLY GENERATED. DO NOT EDIT.
# generated from:
#
-# OpenBSD: etc.amd64/MAKEDEV.md,v 1.3 2004/02/14 17:24:31 todd Exp
-# OpenBSD: MAKEDEV.mi,v 1.71 2004/02/14 17:24:30 todd Exp
-# OpenBSD: MAKEDEV.sub,v 1.10 2004/02/14 17:24:31 todd Exp
+# OpenBSD: etc.amd64/MAKEDEV.md,v 1.4 2004/02/16 19:01:01 miod Exp
+# OpenBSD: MAKEDEV.common,v 1.1 2004/02/16 18:58:54 miod Exp
+# OpenBSD: MAKEDEV.mi,v 1.72 2004/02/16 18:58:53 miod Exp
+# OpenBSD: MAKEDEV.sub,v 1.11 2004/02/16 18:58:53 miod Exp
#
#
# Copyright (c) 2001-2004 Todd T. Fries <todd@OpenBSD.org>
@@ -25,80 +26,77 @@
# Device "make" file. Valid arguments:
# all makes all known devices, including local devices.
# Tries to make the ``standard'' number of each type.
-# ramdisk devices to be put on ramdisk-based media
-# std standard devices
-# local configuration specific devices
-# Tapes:
-# wt* QIC-interface (e.g. not SCSI) 3M cartridge tape
-# st* SCSI tapes
-# ch* SCSI media changer
+# ramdisk Ramdisk kernel devices
+# std Standard devices
+# local Configuration specific devices
# Disks:
-# wd* "winchester" disk drives (ST506, IDE, ESDI, RLL, ...)
-# fd* Floppy disk drives (3 1/2", 5 1/4")
-# sd* SCSI disks
+# ccd* Concatenated disk devices
# cd* SCSI cdrom drives
+# fd* Floppy disk drives (3 1/2", 5 1/4")
# mcd* Mitsumi cdrom drives
-# vnd* "file" pseudo-disks
-# rd* "rd" pseudo-disks
-# ccd* concatenated disk devices
# raid* RAIDframe disk devices
+# rd* "rd" pseudo-disks
+# sd* SCSI disks
+# vnd* "file" pseudo-disk devices
+# wd* "winchester" disk drives (ST506, IDE, ESDI, RLL, ...)
+# Tapes:
+# ch* SCSI media changers
+# st* SCSI tape drives
+# wt* Archive/Wangtek QIC-cartridge tape drives
+# Terminal ports:
+# tty[0-7][0-9a-f] NS16x50 serial ports
+# ttyc* Cyclades serial ports
+# Call units:
+# tun* Network tunnel driver
+# Pseudo terminals:
+# ptm pty master device
+# pty* Set of 16 master pseudo terminals
+# tty* Set of 16 slave pseudo terminals
# Console ports:
-# ttyC0 wscons screen 0
-# ttyC-F* wscons virtual consoles
+# ttyC0 Minimal wscons devices
+# ttyC-F* wscons display devices
# wskbd* wscons keyboards
# wsmux wscons keyboard/mouse mux devices
# Pointing devices:
-# mouse mouse (provides events, for X11)
# wsmouse* wscons mice
-# Terminal ports:
-# tty[0-7][0-9a-f] NS16x50 serial ports
-# ttyc* Cyclades serial ports
-# Pseudo terminals:
-# tty* set of 16 slave pseudo terminals
-# pty* set of 16 master pseudo terminals
# Printers:
+# lpa* Polled printer port
# lpt* IEEE 1284 centronics printer
-# lpa* interruptless lp
# USB devices:
-# usb* Bus control devices used by usbd for attach/detach
+# usbs All USB devices
+# ttyU* USB serial ports
+# ugen* Generic USB devices
# uhid* Generic HID devices
-# ugen* Generic device
# ulpt* Printer devices
# urio* Diamond Multimedia Rio 500
-# ttyU* Serial ports
+# usb* Bus control devices used by usbd for attach/detach
# uscanner* Scanners
-# Call units:
# Special purpose devices:
-# fd makes fd/* for the fdescfs
-# crypto hardware crypto access driver
-# pf* Packet Filter
+# apm Power management device
+# audio* Audio devices
+# bktr* Video frame grabbers
# bpf* Berkeley Packet Filter
-# speaker pc speaker
-# lkm loadable kernel modules interface
-# audio* audio device
-# rmidi* raw midi devices
-# music* midi devices
-# apm power management device
-# tun* network tunnel driver
-# joy* joystick driver
-# pcmcia* PCMCIA card drivers
-# *random inkernel random data source
-# uk* SCSI Unknown device
-# ss* SCSI scanners
-# ses* SES/SAF-TE SCSI devices
-# xfs* XFS filesystem devices
-# bktr* video capturing
-# tuner* tuner device
-# wdt0 watchdog timer
-# pctr* PC Performance Tuning Register access device
+# crypto Hardware crypto access driver
+# fd fd/* nodes for fdescfs
+# gpr* GPR400 smartcard reader
+# iop* I2O controller devices
+# joy* Joystick driver
+# lkm Loadable kernel modules interface
+# music* MIDI devices
# pci PCI bus device
-# iop* I2O controller device
-# radio* FM tuner device
-# systrace* system call tracing device
-# gpr* gpr400 pcmcia device
-# ptm pty master device
-# usbs make USB devices
-#
+# pctr* PC Performance Tuning Register access device
+# pf* Packet Filter
+# radio* FM tuner devices
+# rmidi* Raw MIDI devices
+# *random In-kernel random data source
+# ses* SES/SAF-TE SCSI devices
+# speaker PC speaker
+# ss* SCSI scanners
+# systrace* System call tracing device
+# tuner* Tuner devices
+# uk* SCSI unknown devices
+# wdt0 Watchdog timer
+# xfs* XFS filesystem node
PATH=/sbin:/usr/sbin:/bin:/usr/bin
T=$0
@@ -256,67 +254,24 @@ ttyc*)
M cuac$U c 38 $(($U+128)) 660 dialer uucp
;;
-mouse*)
- name=${i##mouse-}
- if [ ! -c $name ]; then
- $0 $name # make the appropriate device
- fi
- RMlist="$RMlist mouse"
- MKlist="$MKlist;ln -s $name mouse"
- ;;
-
-usbs)
- R ttyU0 ttyU1 ugen0 ugen1 ulpt0 ulpt1 uhid0 uhid1 uhid2 uhid3
- R uscanner0 urio0 usb0 usb1
- ;;
-
-ptm)
- M ptm c 81 0 666
- ;;
-
-gpr*)
- M gpr$U c 80 $U
- ;;
-
-systrace)
- M systrace c 78 0 644
- ;;
-
-radio*)
- M radio$U c 76 $U
- MKlist="$MKlist;[ -e radio ] || ln -s radio$U radio"
- ;;
-
-iop*)
- M iop$U c 75 $U 660
- ;;
-
-pci)
- M pci c 72 0 600
- ;;
-
-pctr)
- M pctr c 46 0 644
+xfs*)
+ M xfs$U c 51 $U 600
;;
wdt0)
M wdt$U c 55 $U 440 operator
;;
-tuner*)
- M tuner$U c 49 $(($(($U*2))+16)) 644
- ;;
-
-bktr*)
- M bktr$U c 49 $U 644
+uk*)
+ M uk$U c 20 $U 640 operator
;;
-xfs*)
- M xfs$U c 51 $U 600
+tuner*)
+ M tuner$U c 49 $(($(($U*2))+16)) 644
;;
-ses*)
- M ses$U c 24 $U 640 operator
+systrace)
+ M systrace c 78 0 644
;;
ss*)
@@ -327,8 +282,12 @@ ss*)
MKlist="$MKlist;umask 77;ln -s ss$U scan$U"
;;
-uk*)
- M uk$U c 20 $U 640 operator
+speaker)
+ M speaker c 27 0 600
+ ;;
+
+ses*)
+ M ses$U c 24 $U 640 operator
;;
*random)
@@ -340,17 +299,25 @@ uk*)
done
;;
-joy*)
- M joy$U c 26 $U 666
+rmidi*)
+ M rmidi$U c 52 $U 666
;;
-tun*)
- M tun$U c 40 $U 600
+radio*)
+ M radio$U c 76 $U
+ MKlist="$MKlist;[ -e radio ] || ln -s radio$U radio"
;;
-apm*)
- M apm c 21 0 644
- M apmctl c 21 8 644
+pf*)
+ M pf c 73 0 600
+ ;;
+
+pctr)
+ M pctr c 46 0 644
+ ;;
+
+pci)
+ M pci c 72 0 600
;;
music*)
@@ -360,55 +327,63 @@ music*)
MKlist="$MKlist;[ -e sequencer ] || ln -s sequencer$U sequencer"
;;
-rmidi*)
- M rmidi$U c 52 $U 666
+lkm)
+ M lkm c 28 0 640 _lkm
;;
-audio*)
- M sound$U c 42 $U
- M mixer$U c 42 $(($U+16))
- M audio$U c 42 $(($U+128))
- M audioctl$U c 42 $(($U+192))
- MKlist="$MKlist;[ -e audio ] || ln -s audio$U audio"
- MKlist="$MKlist;[ -e mixer ] || ln -s mixer$U mixer"
- MKlist="$MKlist;[ -e sound ] || ln -s sound$U sound"
- MKlist="$MKlist;[ -e audioctl ] || ln -s audioctl$U audioctl"
+joy*)
+ M joy$U c 26 $U 666
;;
-lkm)
- M lkm c 28 0 640 _lkm
+iop*)
+ M iop$U c 75 $U 660
;;
-speaker)
- M speaker c 27 0 600
+gpr*)
+ M gpr$U c 80 $U
+ ;;
+
+fd)
+ RMlist="mkdir -p fd;$RMlist" n=0
+ while [ $n -lt 64 ];do M fd/$n c 22 $n;n=$(($n+1));done
+ MKlist="$MKlist;chmod 555 fd"
+ ;;
+
+crypto)
+ M crypto c 70 0
;;
bpf*)
M bpf$U c 23 $U 600
;;
-pf*)
- M pf c 73 0 600
+bktr*)
+ M bktr$U c 49 $U 644
;;
-crypto)
- M crypto c 70 0
+audio*)
+ M sound$U c 42 $U
+ M mixer$U c 42 $(($U+16))
+ M audio$U c 42 $(($U+128))
+ M audioctl$U c 42 $(($U+192))
+ MKlist="$MKlist;[ -e audio ] || ln -s audio$U audio"
+ MKlist="$MKlist;[ -e mixer ] || ln -s mixer$U mixer"
+ MKlist="$MKlist;[ -e sound ] || ln -s sound$U sound"
+ MKlist="$MKlist;[ -e audioctl ] || ln -s audioctl$U audioctl"
;;
-fd)
- RMlist="mkdir -p fd;$RMlist" n=0
- while [ $n -lt 64 ];do M fd/$n c 22 $n;n=$(($n+1));done
- MKlist="$MKlist;chmod 555 fd"
+apm*)
+ M apm c 21 0 644
+ M apmctl c 21 8 644
;;
uscanner*)
M uscanner$U c 77 $U 660
;;
-ttyU[0-9a-zA-Z])
- U=${i#ttyU*}
- o=$(alph2d $U)
- M ttyU$U c 66 $o 660 dialer uucp
+usb*)
+ [ "$i" = "usb" ] && u= || u=$U
+ M usb$u c 61 $U 660
;;
urio*)
@@ -419,6 +394,10 @@ ulpt*)
M ulpt$U c 64 $U 660
;;
+uhid*)
+ M uhid$U c 62 $U 660
+ ;;
+
ugen*)
n=$(($U*16))
for j in 00 01 02 03 04 05 06 07 08 09 10 11 12 13 14 15
@@ -427,13 +406,15 @@ ugen*)
done
;;
-uhid*)
- M uhid$U c 62 $U 660
+ttyU[0-9a-zA-Z])
+ U=${i#ttyU*}
+ o=$(alph2d $U)
+ M ttyU$U c 66 $o 660 dialer uucp
;;
-usb*)
- [ "$i" = "usb" ] && u= || u=$U
- M usb$u c 61 $U 660
+usbs)
+ R ttyU0 ttyU1 ugen0 ugen1 ulpt0 ulpt1 uhid0 uhid1 uhid2 uhid3
+ R uscanner0 urio0 usb0 usb1
;;
lpt*|lpa*)
@@ -444,31 +425,6 @@ lpt*|lpa*)
M $n$U c 16 $(($U+$f)) 600
;;
-pty*)
- if [ $U -gt 15 ]; then
- echo bad unit for pty in: $i
- continue
- fi
- set -A tbl p q r s t u v w x y z P Q R S T
- name=${tbl[$U]}
- n=0
- while [ $n -lt 16 ]
- do
- nam=$name$(hex $n)
- off=$(($U*16))
- M tty$nam c 5 $(($off+$n))
- M pty$nam c 6 $(($off+$n))
- n=$(($n+1))
- done
- ;;
-
-tty[0-7][0-9a-f])
- U=${i#tty*}
- o=$(h2d $U)
- M tty$U c 8 $o 660 dialer uucp
- M cua$U c 8 $(($o+128)) 660 dialer uucp
- ;;
-
wsmouse*)
M wsmouse$U c 68 $U 600
;;
@@ -503,8 +459,60 @@ wscons)
R ttyC6 ttyC7 ttyC8 ttyC9 ttyCa ttyCb
;;
-rd*)
- dodisk2 rd $U 17 47 $U 0
+pty*)
+ if [ $U -gt 15 ]; then
+ echo bad unit for pty in: $i
+ continue
+ fi
+ set -A tbl p q r s t u v w x y z P Q R S T
+ name=${tbl[$U]}
+ n=0
+ while [ $n -lt 16 ]
+ do
+ nam=$name$(hex $n)
+ off=$(($U*16))
+ M tty$nam c 5 $(($off+$n))
+ M pty$nam c 6 $(($off+$n))
+ n=$(($n+1))
+ done
+ ;;
+
+ptm)
+ M ptm c 81 0 666
+ ;;
+
+tun*)
+ M tun$U c 40 $U 600
+ ;;
+
+tty[0-7][0-9a-f])
+ U=${i#tty*}
+ o=$(h2d $U)
+ M tty$U c 8 $o 660 dialer uucp
+ M cua$U c 8 $(($o+128)) 660 dialer uucp
+ ;;
+
+wt*)
+ name=wt
+ n=$(($U*8)) m=$(($n+4))
+ M $name$U b 3 $n 640 operator
+ M r$name$U c 10 $n 640 operator
+ M n$name$U b 3 $m 640 operator
+ M nr$name$U c 10 $m 640 operator
+ ;;
+
+st*)
+ n=$(($U*16))
+ for pre in " " n e en
+ do
+ M ${pre}st$U b 5 $n 660 operator
+ M ${pre}rst$U c 14 $n 660 operator
+ n=$(($n+1))
+ done
+ ;;
+
+ch*)
+ M ch$U c 17 $U 660 operator
;;
vnd*)
@@ -512,12 +520,12 @@ vnd*)
dodisk svnd $U 14 41 $U 2048
;;
-mcd*)
- dodisk2 mcd $U 7 39 $U 0
+rd*)
+ dodisk2 rd $U 17 47 $U 0
;;
-cd*)
- dodisk2 cd $U 6 15 $U 0
+mcd*)
+ dodisk2 mcd $U 7 39 $U 0
;;
fd*)
@@ -548,27 +556,8 @@ fd*)
M r${nam}c c $chr $(($n+2)) 640 operator
;;
-ch*)
- M ch$U c 17 $U 660 operator
- ;;
-
-st*)
- n=$(($U*16))
- for pre in " " n e en
- do
- M ${pre}st$U b 5 $n 660 operator
- M ${pre}rst$U c 14 $n 660 operator
- n=$(($n+1))
- done
- ;;
-
-wt*)
- name=wt
- n=$(($U*8)) m=$(($n+4))
- M $name$U b 3 $n 640 operator
- M r$name$U c 10 $n 640 operator
- M n$name$U b 3 $m 640 operator
- M nr$name$U c 10 $m 640 operator
+cd*)
+ dodisk2 cd $U 6 15 $U 0
;;
local)
@@ -580,13 +569,13 @@ all)
R sd3 sd4 cd0 cd1 rd0 tun0 tun1 tun2 tun3 bpf0 bpf1 bpf2 bpf3
R bpf4 bpf5 bpf6 bpf7 bpf8 bpf9 pty0 pty1 pty2 fd1 fd1B fd1C
R fd1D fd1E fd1F fd1G fd1H fd0 fd0B fd0C fd0D fd0E fd0F fd0G
- R fd0H xfs0 ss0 ss1 ch0 ses0 ptm gpr0 wscons pci iop0 iop1
- R usbs rmidi0 rmidi1 rmidi2 rmidi3 rmidi4 rmidi5 rmidi6 rmidi7
- R tuner0 radio0 music0 speaker audio0 wdt0 wt0 uk0 random joy0
- R joy1 lpa0 lpa1 lpa2 lpt0 lpt1 lpt2 lkm tty00 tty01 tty02
- R tty03 ttyc0 ttyc1 ttyc2 ttyc3 ttyc4 ttyc5 ttyc6 ttyc7 apm
- R crypto pf pctr systrace wd0 wd1 wd2 wd3 raid0 raid1 raid2
- R raid3 std st0 st1 fd mcd0
+ R fd0H xfs0 ss0 ss1 ch0 ses0 ptm gpr0 local wscons pci iop0
+ R iop1 usbs rmidi0 rmidi1 rmidi2 rmidi3 rmidi4 rmidi5 rmidi6
+ R rmidi7 tuner0 radio0 music0 speaker audio0 wdt0 wt0 uk0
+ R random joy0 joy1 lpa0 lpa1 lpa2 lpt0 lpt1 lpt2 lkm tty00
+ R tty01 tty02 tty03 ttyc0 ttyc1 ttyc2 ttyc3 ttyc4 ttyc5 ttyc6
+ R ttyc7 apm crypto pf pctr systrace wd0 wd1 wd2 wd3 raid0
+ R raid1 raid2 raid3 std st0 st1 fd mcd0
;;
wd*|sd*|raid*|ccd*)
diff --git a/etc/etc.cats/MAKEDEV b/etc/etc.cats/MAKEDEV
index fe1d792c717..7aca71e6247 100644
--- a/etc/etc.cats/MAKEDEV
+++ b/etc/etc.cats/MAKEDEV
@@ -3,9 +3,10 @@
# THIS FILE AUTOMATICALLY GENERATED. DO NOT EDIT.
# generated from:
#
-# OpenBSD: etc.cats/MAKEDEV.md,v 1.5 2004/02/14 17:24:31 todd Exp
-# OpenBSD: MAKEDEV.mi,v 1.71 2004/02/14 17:24:30 todd Exp
-# OpenBSD: MAKEDEV.sub,v 1.10 2004/02/14 17:24:31 todd Exp
+# OpenBSD: etc.cats/MAKEDEV.md,v 1.6 2004/02/16 19:01:01 miod Exp
+# OpenBSD: MAKEDEV.common,v 1.1 2004/02/16 18:58:54 miod Exp
+# OpenBSD: MAKEDEV.mi,v 1.72 2004/02/16 18:58:53 miod Exp
+# OpenBSD: MAKEDEV.sub,v 1.11 2004/02/16 18:58:53 miod Exp
#
#
# Copyright (c) 2001-2004 Todd T. Fries <todd@OpenBSD.org>
@@ -25,60 +26,59 @@
# Device "make" file. Valid arguments:
# all makes all known devices, including local devices.
# Tries to make the ``standard'' number of each type.
-# std standard devices
-# fd makes fd/* for the fdescfs
-# local configuration specific devices
-# ramdisk makes all devices for a ramdisk kernel
-# Tapes:
-# st* SCSI tapes
+# ramdisk Ramdisk kernel devices
+# std Standard devices
+# local Configuration specific devices
# Disks:
-# wd* "winchester" disk drives (ST506, IDE, ESDI, RLL, ...)
-# sd* SCSI disks
+# ccd* Concatenated disk devices
# cd* SCSI cdrom drives
-# ch* SCSI media changer
-# rd* "rd" pseudo-disks
-# vnd* "file" pseudo-disks
+# ch* SCSI media changers
# raid* RAIDframe disk devices
-# ccd* concatenated disk devices
+# rd* "rd" pseudo-disks
+# sd* SCSI disks
+# vnd* "file" pseudo-disk devices
+# wd* "winchester" disk drives (ST506, IDE, ESDI, RLL, ...)
+# Tapes:
+# st* SCSI tape drives
+# Terminal ports:
+# tty[0-7][0-9a-f] NS16x50 serial ports
+# Pseudo terminals:
+# ptm pty master device
+# pty* Set of 16 master pseudo terminals
+# tty* Set of 16 slave pseudo terminals
# Console ports:
-# ttyC0 wscons screen 0
-# ttyC-F* wscons virtual consoles
+# ttyC0 Minimal wscons devices
+# ttyC-F* wscons display devices
# wskbd* wscons keyboards
# wsmouse* wscons mice
# wsmux wscons keyboard/mouse mux devices
-# Terminal ports:
-# tty[0-7][0-9a-f] NS16x50 serial ports
-# Pseudo terminals:
-# tty* set of 16 slave pseudo terminals
-# pty* set of 16 master pseudo terminals
# USB devices:
-# usb* Bus control devices used by usbd for attach/detach
+# usbs All USB devices
+# ttyU* USB serial ports
+# ugen* Generic USB devices
# uhid* Generic HID devices
# ulpt* Printer devices
# urio* Diamond Multimedia Rio 500
-# ttyU* Serial ports
+# usb* Bus control devices used by usbd for attach/detach
# uscanner* Scanners
-# ugen* Generic device
# Special purpose devices:
-# audio* audio device
-# apm power management device
+# audio* Audio devices
+# bktr* Video frame grabbers
# bpf* Berkeley Packet Filter
-# tun* network tunnel driver
-# lkm loadable kernel modules interface
-# *random inkernel random data source
-# uk* SCSI Unknown device
-# ss* SCSI scanners
-# xfs* XFS filesystem devices
-# iop* I2O controller device
-# pf* Packet Filter
-# crypto hardware crypto access driver
-# usbs make USB devices
+# crypto Hardware crypto access driver
+# fd fd/* nodes for fdescfs
+# iop* I2O controller devices
+# lkm Loadable kernel modules interface
# pci PCI bus device
-# systrace* system call tracing device
-# bktr* video capturing
-# tuner* tuner device
-# radio* FM tuner device
-# ptm pty master device
+# pf* Packet Filter
+# radio* FM tuner devices
+# *random In-kernel random data source
+# tun* Network tunnel driver
+# uk* SCSI unknown devices
+# ss* SCSI scanners
+# systrace* System call tracing device
+# tuner* Tuner devices
+# xfs* XFS filesystem node
PATH=/sbin:/usr/sbin:/bin:/usr/bin
T=$0
@@ -227,52 +227,18 @@ std)
M reload c 2 20 640 kmem
;;
-ptm)
- M ptm c 98 0 666
- ;;
-
-radio*)
- M radio$U c 97 $U
- MKlist="$MKlist;[ -e radio ] || ln -s radio$U radio"
+xfs*)
+ M xfs$U c 51 $U 600
;;
tuner*)
M tuner$U c 75 $(($(($U*2))+16)) 644
;;
-bktr*)
- M bktr$U c 75 $U 644
- ;;
-
systrace)
M systrace c 50 0 644
;;
-pci)
- M pci c 71 0 600
- ;;
-
-usbs)
- R ttyU0 ttyU1 ugen0 ugen1 ulpt0 ulpt1 uhid0 uhid1 uhid2 uhid3
- R uscanner0 urio0 usb0 usb1
- ;;
-
-crypto)
- M crypto c 47 0
- ;;
-
-pf*)
- M pf c 39 0 600
- ;;
-
-iop*)
- M iop$U c 73 $U 660
- ;;
-
-xfs*)
- M xfs$U c 51 $U 600
- ;;
-
ss*)
M ss$U c 29 $(($U*16)) 640 operator
M nss$U c 29 $(($(($U*16))+1)) 640 operator
@@ -285,6 +251,10 @@ uk*)
M uk$U c 28 $U 640 operator
;;
+tun*)
+ M tun$U c 33 $U 600
+ ;;
+
*random)
n=0
for pre in " " s u p a
@@ -294,21 +264,43 @@ uk*)
done
;;
+radio*)
+ M radio$U c 97 $U
+ MKlist="$MKlist;[ -e radio ] || ln -s radio$U radio"
+ ;;
+
+pf*)
+ M pf c 39 0 600
+ ;;
+
+pci)
+ M pci c 71 0 600
+ ;;
+
lkm)
M lkm c 35 0 640 _lkm
;;
-tun*)
- M tun$U c 33 $U 600
+iop*)
+ M iop$U c 73 $U 660
+ ;;
+
+fd)
+ RMlist="mkdir -p fd;$RMlist" n=0
+ while [ $n -lt 64 ];do M fd/$n c 7 $n;n=$(($n+1));done
+ MKlist="$MKlist;chmod 555 fd"
+ ;;
+
+crypto)
+ M crypto c 47 0
;;
bpf*)
M bpf$U c 22 $U 600
;;
-apm*)
- M apm c 25 0 644
- M apmctl c 25 8 644
+bktr*)
+ M bktr$U c 75 $U 644
;;
audio*)
@@ -322,22 +314,13 @@ audio*)
MKlist="$MKlist;[ -e audioctl ] || ln -s audioctl$U audioctl"
;;
-ugen*)
- n=$(($U*16))
- for j in 00 01 02 03 04 05 06 07 08 09 10 11 12 13 14 15
- do
- M ugen$U.$j c 70 $(($n+$j)) 660
- done
- ;;
-
uscanner*)
M uscanner$U c 69 $U 660
;;
-ttyU[0-9a-zA-Z])
- U=${i#ttyU*}
- o=$(alph2d $U)
- M ttyU$U c 68 $o 660 dialer uucp
+usb*)
+ [ "$i" = "usb" ] && u= || u=$U
+ M usb$u c 64 $U 660
;;
urio*)
@@ -352,34 +335,23 @@ uhid*)
M uhid$U c 65 $U 660
;;
-usb*)
- [ "$i" = "usb" ] && u= || u=$U
- M usb$u c 64 $U 660
- ;;
-
-pty*)
- if [ $U -gt 15 ]; then
- echo bad unit for pty in: $i
- continue
- fi
- set -A tbl p q r s t u v w x y z P Q R S T
- name=${tbl[$U]}
- n=0
- while [ $n -lt 16 ]
+ugen*)
+ n=$(($U*16))
+ for j in 00 01 02 03 04 05 06 07 08 09 10 11 12 13 14 15
do
- nam=$name$(hex $n)
- off=$(($U*16))
- M tty$nam c 4 $(($off+$n))
- M pty$nam c 5 $(($off+$n))
- n=$(($n+1))
+ M ugen$U.$j c 70 $(($n+$j)) 660
done
;;
-tty[0-7][0-9a-f])
- U=${i#tty*}
- o=$(h2d $U)
- M tty$U c 54 $o 660 dialer uucp
- M cua$U c 54 $(($o+128)) 660 dialer uucp
+ttyU[0-9a-zA-Z])
+ U=${i#ttyU*}
+ o=$(alph2d $U)
+ M ttyU$U c 68 $o 660 dialer uucp
+ ;;
+
+usbs)
+ R ttyU0 ttyU1 ugen0 ugen1 ulpt0 ulpt1 uhid0 uhid1 uhid2 uhid3
+ R uscanner0 urio0 usb0 usb1
;;
wsmux|wsmouse|wskbd)
@@ -416,21 +388,33 @@ wscons)
R ttyC6 ttyC7 ttyC8 ttyC9 ttyCa ttyCb
;;
-vnd*)
- dodisk vnd $U 19 19 $U 0
- dodisk svnd $U 19 19 $U 2048
- ;;
-
-rd*)
- dodisk2 rd $U 18 18 $U 0
+pty*)
+ if [ $U -gt 15 ]; then
+ echo bad unit for pty in: $i
+ continue
+ fi
+ set -A tbl p q r s t u v w x y z P Q R S T
+ name=${tbl[$U]}
+ n=0
+ while [ $n -lt 16 ]
+ do
+ nam=$name$(hex $n)
+ off=$(($U*16))
+ M tty$nam c 4 $(($off+$n))
+ M pty$nam c 5 $(($off+$n))
+ n=$(($n+1))
+ done
;;
-ch*)
- M ch$U c 27 $U 660 operator
+ptm)
+ M ptm c 98 0 666
;;
-cd*)
- dodisk2 cd $U 26 26 $U 0
+tty[0-7][0-9a-f])
+ U=${i#tty*}
+ o=$(h2d $U)
+ M tty$U c 54 $o 660 dialer uucp
+ M cua$U c 54 $(($o+128)) 660 dialer uucp
;;
st*)
@@ -443,19 +427,30 @@ st*)
done
;;
-ramdisk)
- R pty0 rd0 cd0 cd1 st0 st1 wd0 wd1 wd2 wd3 wd4 sd0 sd1 sd2
- R sd3 sd4 bpf0 std
+vnd*)
+ dodisk vnd $U 19 19 $U 0
+ dodisk svnd $U 19 19 $U 2048
+ ;;
+
+rd*)
+ dodisk2 rd $U 18 18 $U 0
+ ;;
+
+ch*)
+ M ch$U c 27 $U 660 operator
+ ;;
+
+cd*)
+ dodisk2 cd $U 26 26 $U 0
;;
local)
test -s $T.local && sh $T.local
;;
-fd)
- RMlist="mkdir -p fd;$RMlist" n=0
- while [ $n -lt 64 ];do M fd/$n c 7 $n;n=$(($n+1));done
- MKlist="$MKlist;chmod 555 fd"
+ramdisk)
+ R pty0 rd0 cd0 cd1 st0 st1 wd0 wd1 wd2 wd3 wd4 sd0 sd1 sd2
+ R sd3 sd4 bpf0 std
;;
all)
@@ -463,8 +458,8 @@ all)
R cd0 cd1 rd0 tun0 tun1 tun2 tun3 bpf0 bpf1 bpf2 bpf3 bpf4
R bpf5 bpf6 bpf7 bpf8 bpf9 pty0 pty1 pty2 xfs0 ss0 ss1 ch0 ptm
R local wscons pci iop0 iop1 usbs tuner0 radio0 audio0 uk0
- R random lkm tty00 tty01 tty02 tty03 apm crypto pf systrace
- R wd0 wd1 wd2 wd3 raid0 raid1 raid2 raid3 std st0 st1 fd
+ R random lkm tty00 tty01 tty02 tty03 crypto pf systrace wd0
+ R wd1 wd2 wd3 raid0 raid1 raid2 raid3 std st0 st1 fd
;;
wd*|sd*|raid*|ccd*)
diff --git a/etc/etc.hp300/MAKEDEV b/etc/etc.hp300/MAKEDEV
index 1c3aa8088d0..8569c023e1c 100644
--- a/etc/etc.hp300/MAKEDEV
+++ b/etc/etc.hp300/MAKEDEV
@@ -3,9 +3,10 @@
# THIS FILE AUTOMATICALLY GENERATED. DO NOT EDIT.
# generated from:
#
-# OpenBSD: etc.hp300/MAKEDEV.md,v 1.16 2004/02/14 17:24:31 todd Exp
-# OpenBSD: MAKEDEV.mi,v 1.71 2004/02/14 17:24:30 todd Exp
-# OpenBSD: MAKEDEV.sub,v 1.10 2004/02/14 17:24:31 todd Exp
+# OpenBSD: etc.hp300/MAKEDEV.md,v 1.17 2004/02/16 19:01:01 miod Exp
+# OpenBSD: MAKEDEV.common,v 1.1 2004/02/16 18:58:54 miod Exp
+# OpenBSD: MAKEDEV.mi,v 1.72 2004/02/16 18:58:53 miod Exp
+# OpenBSD: MAKEDEV.sub,v 1.11 2004/02/16 18:58:53 miod Exp
#
#
# Copyright (c) 2001-2004 Todd T. Fries <todd@OpenBSD.org>
@@ -25,41 +26,42 @@
# Device "make" file. Valid arguments:
# all makes all known devices, including local devices.
# Tries to make the ``standard'' number of each type.
-# std standard devices
-# local configuration specific devices
-# Tapes:
-# ct* HP300 HP-IB cartridge tape
-# mt* (Magnetic) 9-track reel tape
-# st* Exabyte tape
+# ramdisk Ramdisk kernel devices
+# std Standard devices
+# local Configuration specific devices
# Disks:
-# ccd* concatenated disk devices
+# ccd* Concatenated disk devices
# hd* HP300 HP-IB disks
-# sd* SCSI disks
-# vnd* "file" pseudo-disks
# rd* "rd" pseudo-disks
-# Terminal multiplexers:
+# sd* SCSI disks
+# vnd* "file" pseudo-disk devices
+# Tapes:
+# ct* HP300 HP-IB cartridge tape drives
+# mt* (Magnetic) 9-track reel tape drives
+# st* Exabyte tape
+# Terminal ports:
+# apci* HP400 4 port serial mux interface
# dca* HP200/300 single port serial interface
# dcm* HP200/300 4 port serial mux interface
-# apci* HP400 4 port serial mux interface
# Pseudo terminals:
-# tty* set of 16 slave pseudo terminals
-# pty* set of 16 master pseudo terminals
# ptm pty master device
+# pty* Set of 16 master pseudo terminals
+# tty* Set of 16 slave pseudo terminals
+# Console ports:
+# grf* Raw interface to HP300 graphics devices
+# ite* Terminal emulator interface to HP300 graphics devices
# Printers:
# ppi* HP-IB plotters
-# Call units:
# Special purpose devices:
-# fd makes fd/* for the fdescfs
-# grf* raw interface to HP300 graphics devices
-# ite* terminal emulator interface to HP300 graphics devices
-# hil HP300 HIL input devices
# bpf* Berkeley Packet Filter
-# tun* network tunnel driver
+# fd fd/* nodes for fdescfs
+# hil HP-HIL input devices
+# lkm Loadable kernel modules interface
# pf* Packet Filter
-# lkm loadable kernel modules interface
-# *random inkernel random data source
-# xfs* XFS filesystem devices
-# systrace* system call tracing device
+# *random In-kernel random data source
+# tun* Network tunnel driver
+# systrace* System call tracing device
+# xfs* XFS filesystem node
PATH=/sbin:/usr/sbin:/bin:/usr/bin
T=$0
@@ -305,12 +307,16 @@ hil)
RMlist="$RMlist keyboard locator"
;;
+xfs*)
+ M xfs$U c 51 $U 600
+ ;;
+
systrace)
M systrace c 50 0 644
;;
-xfs*)
- M xfs$U c 51 $U 600
+tun*)
+ M tun$U c 23 $U 600
;;
*random)
@@ -322,20 +328,12 @@ xfs*)
done
;;
-lkm)
- M lkm c 24 0 640 _lkm
- ;;
-
pf*)
M pf c 33 0 600
;;
-tun*)
- M tun$U c 23 $U 600
- ;;
-
-bpf*)
- M bpf$U c 22 $U 600
+lkm)
+ M lkm c 24 0 640 _lkm
;;
fd)
@@ -344,8 +342,8 @@ fd)
MKlist="$MKlist;chmod 555 fd"
;;
-ptm)
- M ptm c 52 0 666
+bpf*)
+ M bpf$U c 22 $U 600
;;
pty*)
@@ -366,13 +364,8 @@ pty*)
done
;;
-rd*)
- dodisk2 rd $U 8 34 $U 0
- ;;
-
-vnd*)
- dodisk vnd $U 6 19 $U 0
- dodisk svnd $U 6 19 $U 2048
+ptm)
+ M ptm c 52 0 666
;;
ct*|mt*|st*)
@@ -399,6 +392,15 @@ ct*|mt*|st*)
esac
;;
+vnd*)
+ dodisk vnd $U 6 19 $U 0
+ dodisk svnd $U 6 19 $U 2048
+ ;;
+
+rd*)
+ dodisk2 rd $U 8 34 $U 0
+ ;;
+
local)
test -s $T.local && sh $T.local
;;
diff --git a/etc/etc.hppa/MAKEDEV b/etc/etc.hppa/MAKEDEV
index d6180967463..93c60149eeb 100644
--- a/etc/etc.hppa/MAKEDEV
+++ b/etc/etc.hppa/MAKEDEV
@@ -3,9 +3,10 @@
# THIS FILE AUTOMATICALLY GENERATED. DO NOT EDIT.
# generated from:
#
-# OpenBSD: etc.hppa/MAKEDEV.md,v 1.18 2004/02/14 17:24:31 todd Exp
-# OpenBSD: MAKEDEV.mi,v 1.71 2004/02/14 17:24:30 todd Exp
-# OpenBSD: MAKEDEV.sub,v 1.10 2004/02/14 17:24:31 todd Exp
+# OpenBSD: etc.hppa/MAKEDEV.md,v 1.19 2004/02/16 19:01:01 miod Exp
+# OpenBSD: MAKEDEV.common,v 1.1 2004/02/16 18:58:54 miod Exp
+# OpenBSD: MAKEDEV.mi,v 1.72 2004/02/16 18:58:53 miod Exp
+# OpenBSD: MAKEDEV.sub,v 1.11 2004/02/16 18:58:53 miod Exp
#
#
# Copyright (c) 2001-2004 Todd T. Fries <todd@OpenBSD.org>
@@ -25,51 +26,50 @@
# Device "make" file. Valid arguments:
# all makes all known devices, including local devices.
# Tries to make the ``standard'' number of each type.
-# std standard devices
-# local configuration specific devices
-# Tapes:
-# st* SCSI tapes
+# ramdisk Ramdisk kernel devices
+# std Standard devices
+# local Configuration specific devices
# Disks:
-# ccd* concatenated disk devices
-# vnd* "file" pseudo-disks
-# rd* "rd" pseudo-disks
-# sd* SCSI disks
+# ccd* Concatenated disk devices
# cd* SCSI cdrom drives
# fd* Floppy disk drives (3 1/2", 5 1/4")
+# sd* SCSI disks
+# rd* "rd" pseudo-disks
+# vnd* "file" pseudo-disk devices
+# Tapes:
+# ch* SCSI media changers
+# st* SCSI tape drives
# Terminal ports:
# tty[0-7][0-9a-f] NS16x50 serial ports
# Pseudo terminals:
-# tty* set of 16 slave pseudo terminals
-# pty* set of 16 master pseudo terminals
# ptm pty master device
-# Printers:
-# lpt* IEEE 1284 centronics printer
+# pty* Set of 16 master pseudo terminals
+# tty* Set of 16 slave pseudo terminals
# Console ports:
-# ttyC0 wscons screen 0
-# ttyC-F* wscons virtual consoles
+# ttyC0 Minimal wscons devices
+# ttyC-F* wscons display devices
# wskbd* wscons keyboards
# wsmux wscons keyboard/mouse mux devices
# Pointing devices:
# wsmouse* wscons mice
-# Call units:
+# Printers:
+# lpt* IEEE 1284 centronics printer
# Special purpose devices:
-# ch* SCSI media changer
-# ss* SCSI scanners
-# uk* SCSI Unknown device
-# fd makes fd/* for the fdescfs
+# audio* Audio devices
# bpf* Berkeley Packet Filter
-# tun* network tunnel driver
-# lkm loadable kernel modules interface
-# *random inkernel random data source
-# pf* Packet Filter
-# pdc PDC device
+# crypto Hardware crypto access driver
+# fd fd/* nodes for fdescfs
+# lkm Loadable kernel modules interface
# pci PCI bus device
-# xfs* XFS filesystem devices
-# systrace* system call tracing device
-# audio* audio device
-# crypto hardware crypto access driver
+# pdc PDC device
+# pf* Packet Filter
+# *random In-kernel random data source
# ses* SES/SAF-TE SCSI devices
-#
+# ss* SCSI scanners
+# systrace* System call tracing device
+# tun* Network tunnel driver
+# uk* SCSI unknown devices
+# xfs* XFS filesystem node
PATH=/sbin:/usr/sbin:/bin:/usr/bin
T=$0
@@ -221,39 +221,32 @@ std)
M klog c 6 0 600
;;
-ses*)
- M ses$U c 37 $U 640 operator
+xfs*)
+ M xfs$U c 32 $U 600
;;
-crypto)
- M crypto c 36 0
+uk*)
+ M uk$U c 15 $U 640 operator
;;
-audio*)
- M sound$U c 35 $U
- M mixer$U c 35 $(($U+16))
- M audio$U c 35 $(($U+128))
- M audioctl$U c 35 $(($U+192))
- MKlist="$MKlist;[ -e audio ] || ln -s audio$U audio"
- MKlist="$MKlist;[ -e mixer ] || ln -s mixer$U mixer"
- MKlist="$MKlist;[ -e sound ] || ln -s sound$U sound"
- MKlist="$MKlist;[ -e audioctl ] || ln -s audioctl$U audioctl"
+tun*)
+ M tun$U c 18 $U 600
;;
systrace)
M systrace c 34 0 644
;;
-xfs*)
- M xfs$U c 32 $U 600
- ;;
-
-pci)
- M pci c 31 0 600
+ss*)
+ M ss$U c 14 $(($U*16)) 640 operator
+ M nss$U c 14 $(($(($U*16))+1)) 640 operator
+ M enss$U c 14 $(($(($U*16))+3)) 640 operator
+ RMlist="$RMlist scan$U"
+ MKlist="$MKlist;umask 77;ln -s ss$U scan$U"
;;
-pf*)
- M pf c 21 0 600
+ses*)
+ M ses$U c 37 $U 640 operator
;;
*random)
@@ -265,16 +258,16 @@ pf*)
done
;;
-lkm)
- M lkm c 19 0 640 _lkm
+pf*)
+ M pf c 21 0 600
;;
-tun*)
- M tun$U c 18 $U 600
+pci)
+ M pci c 31 0 600
;;
-bpf*)
- M bpf$U c 17 $U 600
+lkm)
+ M lkm c 19 0 640 _lkm
;;
fd)
@@ -283,20 +276,31 @@ fd)
MKlist="$MKlist;chmod 555 fd"
;;
-uk*)
- M uk$U c 15 $U 640 operator
+crypto)
+ M crypto c 36 0
;;
-ss*)
- M ss$U c 14 $(($U*16)) 640 operator
- M nss$U c 14 $(($(($U*16))+1)) 640 operator
- M enss$U c 14 $(($(($U*16))+3)) 640 operator
- RMlist="$RMlist scan$U"
- MKlist="$MKlist;umask 77;ln -s ss$U scan$U"
+bpf*)
+ M bpf$U c 17 $U 600
;;
-ch*)
- M ch$U c 13 $U 660 operator
+audio*)
+ M sound$U c 35 $U
+ M mixer$U c 35 $(($U+16))
+ M audio$U c 35 $(($U+128))
+ M audioctl$U c 35 $(($U+192))
+ MKlist="$MKlist;[ -e audio ] || ln -s audio$U audio"
+ MKlist="$MKlist;[ -e mixer ] || ln -s mixer$U mixer"
+ MKlist="$MKlist;[ -e sound ] || ln -s sound$U sound"
+ MKlist="$MKlist;[ -e audioctl ] || ln -s audioctl$U audioctl"
+ ;;
+
+lpt*|lpa*)
+ case $i in
+ lpt*) n=lpt f=0;;
+ lpa*) n=lpa f=128;;
+ esac
+ M $n$U c 30 $(($U+$f)) 600
;;
wsmouse*)
@@ -333,18 +337,6 @@ wscons)
R ttyC6 ttyC7 ttyC8 ttyC9 ttyCa ttyCb
;;
-lpt*|lpa*)
- case $i in
- lpt*) n=lpt f=0;;
- lpa*) n=lpa f=128;;
- esac
- M $n$U c 30 $(($U+$f)) 600
- ;;
-
-ptm)
- M ptm c 38 0 666
- ;;
-
pty*)
if [ $U -gt 15 ]; then
echo bad unit for pty in: $i
@@ -363,6 +355,10 @@ pty*)
done
;;
+ptm)
+ M ptm c 38 0 666
+ ;;
+
tty[0-7][0-9a-f])
U=${i#tty*}
o=$(h2d $U)
@@ -370,6 +366,29 @@ tty[0-7][0-9a-f])
M cua$U c 23 $(($o+128)) 660 dialer uucp
;;
+st*)
+ n=$(($U*16))
+ for pre in " " n e en
+ do
+ M ${pre}st$U b 5 $n 660 operator
+ M ${pre}rst$U c 11 $n 660 operator
+ n=$(($n+1))
+ done
+ ;;
+
+ch*)
+ M ch$U c 13 $U 660 operator
+ ;;
+
+vnd*)
+ dodisk vnd $U 2 8 $U 0
+ dodisk svnd $U 2 8 $U 2048
+ ;;
+
+rd*)
+ dodisk2 rd $U 3 9 $U 0
+ ;;
+
fd*)
typnam=$U${i#fd[01]*}
case $typnam in
@@ -402,25 +421,6 @@ cd*)
dodisk2 cd $U 6 12 $U 0
;;
-rd*)
- dodisk2 rd $U 3 9 $U 0
- ;;
-
-vnd*)
- dodisk vnd $U 2 8 $U 0
- dodisk svnd $U 2 8 $U 2048
- ;;
-
-st*)
- n=$(($U*16))
- for pre in " " n e en
- do
- M ${pre}st$U b 5 $n 660 operator
- M ${pre}rst$U c 11 $n 660 operator
- n=$(($n+1))
- done
- ;;
-
local)
test -s $T.local && sh $T.local
;;
@@ -430,9 +430,9 @@ all)
R cd0 cd1 rd0 tun0 tun1 tun2 tun3 bpf0 bpf1 bpf2 bpf3 bpf4
R bpf5 bpf6 bpf7 bpf8 bpf9 pty0 pty1 pty2 fd1 fd1B fd1C fd1D
R fd1E fd1F fd1G fd1H fd0 fd0B fd0C fd0D fd0E fd0F fd0G fd0H
- R xfs0 ss0 ss1 ch0 ses0 ptm wscons pci audio0 uk0 random lpa0
- R lpa1 lpa2 lpt0 lpt1 lpt2 lkm tty00 tty01 tty02 tty03 crypto
- R pf systrace std st0 st1 fd
+ R xfs0 ss0 ss1 ch0 ses0 ptm local wscons pci audio0 uk0 random
+ R lpa0 lpa1 lpa2 lpt0 lpt1 lpt2 lkm tty00 tty01 tty02 tty03
+ R crypto pf systrace std st0 st1 fd
;;
sd*|ccd*)
diff --git a/etc/etc.i386/MAKEDEV b/etc/etc.i386/MAKEDEV
index ff7dd44b7c7..5d7adef2e8c 100644
--- a/etc/etc.i386/MAKEDEV
+++ b/etc/etc.i386/MAKEDEV
@@ -3,9 +3,10 @@
# THIS FILE AUTOMATICALLY GENERATED. DO NOT EDIT.
# generated from:
#
-# OpenBSD: etc.i386/MAKEDEV.md,v 1.20 2004/02/14 17:24:31 todd Exp
-# OpenBSD: MAKEDEV.mi,v 1.71 2004/02/14 17:24:30 todd Exp
-# OpenBSD: MAKEDEV.sub,v 1.10 2004/02/14 17:24:31 todd Exp
+# OpenBSD: etc.i386/MAKEDEV.md,v 1.21 2004/02/16 19:01:01 miod Exp
+# OpenBSD: MAKEDEV.common,v 1.1 2004/02/16 18:58:54 miod Exp
+# OpenBSD: MAKEDEV.mi,v 1.72 2004/02/16 18:58:53 miod Exp
+# OpenBSD: MAKEDEV.sub,v 1.11 2004/02/16 18:58:53 miod Exp
#
#
# Copyright (c) 2001-2004 Todd T. Fries <todd@OpenBSD.org>
@@ -25,80 +26,77 @@
# Device "make" file. Valid arguments:
# all makes all known devices, including local devices.
# Tries to make the ``standard'' number of each type.
-# ramdisk devices to be put on ramdisk-based media
-# std standard devices
-# local configuration specific devices
-# Tapes:
-# wt* QIC-interface (e.g. not SCSI) 3M cartridge tape
-# st* SCSI tapes
-# ch* SCSI media changer
+# ramdisk Ramdisk kernel devices
+# std Standard devices
+# local Configuration specific devices
# Disks:
-# wd* "winchester" disk drives (ST506, IDE, ESDI, RLL, ...)
-# fd* Floppy disk drives (3 1/2", 5 1/4")
-# sd* SCSI disks
+# ccd* Concatenated disk devices
# cd* SCSI cdrom drives
+# fd* Floppy disk drives (3 1/2", 5 1/4")
# mcd* Mitsumi cdrom drives
-# vnd* "file" pseudo-disks
-# rd* "rd" pseudo-disks
-# ccd* concatenated disk devices
# raid* RAIDframe disk devices
-# Console ports:
-# ttyC0 wscons screen 0
-# ttyC-F* wscons virtual consoles
-# wskbd* wscons keyboards
-# wsmux wscons keyboard/mouse mux devices
-# Pointing devices:
-# mouse mouse (provides events, for X11)
-# wsmouse* wscons mice
+# rd* "rd" pseudo-disks
+# sd* SCSI disks
+# vnd* "file" pseudo-disk devices
+# wd* "winchester" disk drives (ST506, IDE, ESDI, RLL, ...)
+# Tapes:
+# ch* SCSI media changers
+# st* SCSI tape drives
+# wt* Archive/Wangtek QIC-cartridge tape drives
# Terminal ports:
# tty[0-7][0-9a-f] NS16x50 serial ports
# ttyc* Cyclades serial ports
+# Call units:
+# tun* Network tunnel driver
# Pseudo terminals:
# ptm pty master device
-# tty* set of 16 slave pseudo terminals
-# pty* set of 16 master pseudo terminals
+# pty* Set of 16 master pseudo terminals
+# tty* Set of 16 slave pseudo terminals
+# Console ports:
+# ttyC0 Minimal wscons devices
+# ttyC-F* wscons display devices
+# wskbd* wscons keyboards
+# wsmux wscons keyboard/mouse mux devices
+# Pointing devices:
+# wsmouse* wscons mice
# Printers:
+# lpa* Polled printer port
# lpt* IEEE 1284 centronics printer
-# lpa* interruptless lp
# USB devices:
-# usb* Bus control devices used by usbd for attach/detach
+# usbs All USB devices
+# ttyU* USB serial ports
+# ugen* Generic USB devices
# uhid* Generic HID devices
-# ugen* Generic device
# ulpt* Printer devices
# urio* Diamond Multimedia Rio 500
-# ttyU* Serial ports
+# usb* Bus control devices used by usbd for attach/detach
# uscanner* Scanners
-# Call units:
# Special purpose devices:
-# fd makes fd/* for the fdescfs
-# crypto hardware crypto access driver
-# pf* Packet Filter
+# apm Power management device
+# audio* Audio devices
+# bktr* Video frame grabbers
# bpf* Berkeley Packet Filter
-# speaker pc speaker
-# lkm loadable kernel modules interface
-# audio* audio device
-# rmidi* raw midi devices
-# music* midi devices
-# apm power management device
-# tun* network tunnel driver
-# joy* joystick driver
-# pcmcia* PCMCIA card drivers
-# *random inkernel random data source
-# uk* SCSI Unknown device
-# ss* SCSI scanners
-# ses* SES/SAF-TE SCSI devices
-# xfs* XFS filesystem devices
-# bktr* video capturing
-# tuner* tuner device
-# wdt0 watchdog timer
-# pctr* PC Performance Tuning Register access device
+# crypto Hardware crypto access driver
+# fd fd/* nodes for fdescfs
+# gpr* GPR400 smartcard reader
+# iop* I2O controller devices
+# joy* Joystick driver
+# lkm Loadable kernel modules interface
+# music* MIDI devices
# pci PCI bus device
-# iop* I2O controller device
-# radio* FM tuner device
-# systrace* system call tracing device
-# gpr* gpr400 pcmcia device
-# usbs make USB devices
-#
+# pctr* PC Performance Tuning Register access device
+# pf* Packet Filter
+# radio* FM tuner devices
+# rmidi* Raw MIDI devices
+# *random In-kernel random data source
+# ses* SES/SAF-TE SCSI devices
+# speaker PC speaker
+# ss* SCSI scanners
+# systrace* System call tracing device
+# tuner* Tuner devices
+# uk* SCSI unknown devices
+# wdt0 Watchdog timer
+# xfs* XFS filesystem node
PATH=/sbin:/usr/sbin:/bin:/usr/bin
T=$0
@@ -256,63 +254,24 @@ ttyc*)
M cuac$U c 38 $(($U+128)) 660 dialer uucp
;;
-mouse*)
- name=${i##mouse-}
- if [ ! -c $name ]; then
- $0 $name # make the appropriate device
- fi
- RMlist="$RMlist mouse"
- MKlist="$MKlist;ln -s $name mouse"
- ;;
-
-usbs)
- R ttyU0 ttyU1 ugen0 ugen1 ulpt0 ulpt1 uhid0 uhid1 uhid2 uhid3
- R uscanner0 urio0 usb0 usb1
- ;;
-
-gpr*)
- M gpr$U c 80 $U
- ;;
-
-systrace)
- M systrace c 78 0 644
- ;;
-
-radio*)
- M radio$U c 76 $U
- MKlist="$MKlist;[ -e radio ] || ln -s radio$U radio"
- ;;
-
-iop*)
- M iop$U c 75 $U 660
- ;;
-
-pci)
- M pci c 72 0 600
- ;;
-
-pctr)
- M pctr c 46 0 644
+xfs*)
+ M xfs$U c 51 $U 600
;;
wdt0)
M wdt$U c 55 $U 440 operator
;;
-tuner*)
- M tuner$U c 49 $(($(($U*2))+16)) 644
- ;;
-
-bktr*)
- M bktr$U c 49 $U 644
+uk*)
+ M uk$U c 20 $U 640 operator
;;
-xfs*)
- M xfs$U c 51 $U 600
+tuner*)
+ M tuner$U c 49 $(($(($U*2))+16)) 644
;;
-ses*)
- M ses$U c 24 $U 640 operator
+systrace)
+ M systrace c 78 0 644
;;
ss*)
@@ -323,8 +282,12 @@ ss*)
MKlist="$MKlist;umask 77;ln -s ss$U scan$U"
;;
-uk*)
- M uk$U c 20 $U 640 operator
+speaker)
+ M speaker c 27 0 600
+ ;;
+
+ses*)
+ M ses$U c 24 $U 640 operator
;;
*random)
@@ -336,17 +299,25 @@ uk*)
done
;;
-joy*)
- M joy$U c 26 $U 666
+rmidi*)
+ M rmidi$U c 52 $U 666
;;
-tun*)
- M tun$U c 40 $U 600
+radio*)
+ M radio$U c 76 $U
+ MKlist="$MKlist;[ -e radio ] || ln -s radio$U radio"
;;
-apm*)
- M apm c 21 0 644
- M apmctl c 21 8 644
+pf*)
+ M pf c 73 0 600
+ ;;
+
+pctr)
+ M pctr c 46 0 644
+ ;;
+
+pci)
+ M pci c 72 0 600
;;
music*)
@@ -356,55 +327,63 @@ music*)
MKlist="$MKlist;[ -e sequencer ] || ln -s sequencer$U sequencer"
;;
-rmidi*)
- M rmidi$U c 52 $U 666
+lkm)
+ M lkm c 28 0 640 _lkm
;;
-audio*)
- M sound$U c 42 $U
- M mixer$U c 42 $(($U+16))
- M audio$U c 42 $(($U+128))
- M audioctl$U c 42 $(($U+192))
- MKlist="$MKlist;[ -e audio ] || ln -s audio$U audio"
- MKlist="$MKlist;[ -e mixer ] || ln -s mixer$U mixer"
- MKlist="$MKlist;[ -e sound ] || ln -s sound$U sound"
- MKlist="$MKlist;[ -e audioctl ] || ln -s audioctl$U audioctl"
+joy*)
+ M joy$U c 26 $U 666
;;
-lkm)
- M lkm c 28 0 640 _lkm
+iop*)
+ M iop$U c 75 $U 660
;;
-speaker)
- M speaker c 27 0 600
+gpr*)
+ M gpr$U c 80 $U
+ ;;
+
+fd)
+ RMlist="mkdir -p fd;$RMlist" n=0
+ while [ $n -lt 64 ];do M fd/$n c 22 $n;n=$(($n+1));done
+ MKlist="$MKlist;chmod 555 fd"
+ ;;
+
+crypto)
+ M crypto c 70 0
;;
bpf*)
M bpf$U c 23 $U 600
;;
-pf*)
- M pf c 73 0 600
+bktr*)
+ M bktr$U c 49 $U 644
;;
-crypto)
- M crypto c 70 0
+audio*)
+ M sound$U c 42 $U
+ M mixer$U c 42 $(($U+16))
+ M audio$U c 42 $(($U+128))
+ M audioctl$U c 42 $(($U+192))
+ MKlist="$MKlist;[ -e audio ] || ln -s audio$U audio"
+ MKlist="$MKlist;[ -e mixer ] || ln -s mixer$U mixer"
+ MKlist="$MKlist;[ -e sound ] || ln -s sound$U sound"
+ MKlist="$MKlist;[ -e audioctl ] || ln -s audioctl$U audioctl"
;;
-fd)
- RMlist="mkdir -p fd;$RMlist" n=0
- while [ $n -lt 64 ];do M fd/$n c 22 $n;n=$(($n+1));done
- MKlist="$MKlist;chmod 555 fd"
+apm*)
+ M apm c 21 0 644
+ M apmctl c 21 8 644
;;
uscanner*)
M uscanner$U c 77 $U 660
;;
-ttyU[0-9a-zA-Z])
- U=${i#ttyU*}
- o=$(alph2d $U)
- M ttyU$U c 66 $o 660 dialer uucp
+usb*)
+ [ "$i" = "usb" ] && u= || u=$U
+ M usb$u c 61 $U 660
;;
urio*)
@@ -415,6 +394,10 @@ ulpt*)
M ulpt$U c 64 $U 660
;;
+uhid*)
+ M uhid$U c 62 $U 660
+ ;;
+
ugen*)
n=$(($U*16))
for j in 00 01 02 03 04 05 06 07 08 09 10 11 12 13 14 15
@@ -423,13 +406,15 @@ ugen*)
done
;;
-uhid*)
- M uhid$U c 62 $U 660
+ttyU[0-9a-zA-Z])
+ U=${i#ttyU*}
+ o=$(alph2d $U)
+ M ttyU$U c 66 $o 660 dialer uucp
;;
-usb*)
- [ "$i" = "usb" ] && u= || u=$U
- M usb$u c 61 $U 660
+usbs)
+ R ttyU0 ttyU1 ugen0 ugen1 ulpt0 ulpt1 uhid0 uhid1 uhid2 uhid3
+ R uscanner0 urio0 usb0 usb1
;;
lpt*|lpa*)
@@ -440,35 +425,6 @@ lpt*|lpa*)
M $n$U c 16 $(($U+$f)) 600
;;
-pty*)
- if [ $U -gt 15 ]; then
- echo bad unit for pty in: $i
- continue
- fi
- set -A tbl p q r s t u v w x y z P Q R S T
- name=${tbl[$U]}
- n=0
- while [ $n -lt 16 ]
- do
- nam=$name$(hex $n)
- off=$(($U*16))
- M tty$nam c 5 $(($off+$n))
- M pty$nam c 6 $(($off+$n))
- n=$(($n+1))
- done
- ;;
-
-ptm)
- M ptm c 81 0 666
- ;;
-
-tty[0-7][0-9a-f])
- U=${i#tty*}
- o=$(h2d $U)
- M tty$U c 8 $o 660 dialer uucp
- M cua$U c 8 $(($o+128)) 660 dialer uucp
- ;;
-
wsmouse*)
M wsmouse$U c 68 $U 600
;;
@@ -503,8 +459,60 @@ wscons)
R ttyC6 ttyC7 ttyC8 ttyC9 ttyCa ttyCb
;;
-rd*)
- dodisk2 rd $U 17 47 $U 0
+pty*)
+ if [ $U -gt 15 ]; then
+ echo bad unit for pty in: $i
+ continue
+ fi
+ set -A tbl p q r s t u v w x y z P Q R S T
+ name=${tbl[$U]}
+ n=0
+ while [ $n -lt 16 ]
+ do
+ nam=$name$(hex $n)
+ off=$(($U*16))
+ M tty$nam c 5 $(($off+$n))
+ M pty$nam c 6 $(($off+$n))
+ n=$(($n+1))
+ done
+ ;;
+
+ptm)
+ M ptm c 81 0 666
+ ;;
+
+tun*)
+ M tun$U c 40 $U 600
+ ;;
+
+tty[0-7][0-9a-f])
+ U=${i#tty*}
+ o=$(h2d $U)
+ M tty$U c 8 $o 660 dialer uucp
+ M cua$U c 8 $(($o+128)) 660 dialer uucp
+ ;;
+
+wt*)
+ name=wt
+ n=$(($U*8)) m=$(($n+4))
+ M $name$U b 3 $n 640 operator
+ M r$name$U c 10 $n 640 operator
+ M n$name$U b 3 $m 640 operator
+ M nr$name$U c 10 $m 640 operator
+ ;;
+
+st*)
+ n=$(($U*16))
+ for pre in " " n e en
+ do
+ M ${pre}st$U b 5 $n 660 operator
+ M ${pre}rst$U c 14 $n 660 operator
+ n=$(($n+1))
+ done
+ ;;
+
+ch*)
+ M ch$U c 17 $U 660 operator
;;
vnd*)
@@ -512,12 +520,12 @@ vnd*)
dodisk svnd $U 14 41 $U 2048
;;
-mcd*)
- dodisk2 mcd $U 7 39 $U 0
+rd*)
+ dodisk2 rd $U 17 47 $U 0
;;
-cd*)
- dodisk2 cd $U 6 15 $U 0
+mcd*)
+ dodisk2 mcd $U 7 39 $U 0
;;
fd*)
@@ -548,27 +556,8 @@ fd*)
M r${nam}c c $chr $(($n+2)) 640 operator
;;
-ch*)
- M ch$U c 17 $U 660 operator
- ;;
-
-st*)
- n=$(($U*16))
- for pre in " " n e en
- do
- M ${pre}st$U b 5 $n 660 operator
- M ${pre}rst$U c 14 $n 660 operator
- n=$(($n+1))
- done
- ;;
-
-wt*)
- name=wt
- n=$(($U*8)) m=$(($n+4))
- M $name$U b 3 $n 640 operator
- M r$name$U c 10 $n 640 operator
- M n$name$U b 3 $m 640 operator
- M nr$name$U c 10 $m 640 operator
+cd*)
+ dodisk2 cd $U 6 15 $U 0
;;
local)
@@ -580,13 +569,13 @@ all)
R sd3 sd4 cd0 cd1 rd0 tun0 tun1 tun2 tun3 bpf0 bpf1 bpf2 bpf3
R bpf4 bpf5 bpf6 bpf7 bpf8 bpf9 pty0 pty1 pty2 fd1 fd1B fd1C
R fd1D fd1E fd1F fd1G fd1H fd0 fd0B fd0C fd0D fd0E fd0F fd0G
- R fd0H xfs0 ss0 ss1 ch0 ses0 ptm gpr0 wscons pci iop0 iop1
- R usbs rmidi0 rmidi1 rmidi2 rmidi3 rmidi4 rmidi5 rmidi6 rmidi7
- R tuner0 radio0 music0 speaker audio0 wdt0 wt0 uk0 random joy0
- R joy1 lpa0 lpa1 lpa2 lpt0 lpt1 lpt2 lkm tty00 tty01 tty02
- R tty03 ttyc0 ttyc1 ttyc2 ttyc3 ttyc4 ttyc5 ttyc6 ttyc7 apm
- R crypto pf pctr systrace wd0 wd1 wd2 wd3 raid0 raid1 raid2
- R raid3 std st0 st1 fd mcd0
+ R fd0H xfs0 ss0 ss1 ch0 ses0 ptm gpr0 local wscons pci iop0
+ R iop1 usbs rmidi0 rmidi1 rmidi2 rmidi3 rmidi4 rmidi5 rmidi6
+ R rmidi7 tuner0 radio0 music0 speaker audio0 wdt0 wt0 uk0
+ R random joy0 joy1 lpa0 lpa1 lpa2 lpt0 lpt1 lpt2 lkm tty00
+ R tty01 tty02 tty03 ttyc0 ttyc1 ttyc2 ttyc3 ttyc4 ttyc5 ttyc6
+ R ttyc7 apm crypto pf pctr systrace wd0 wd1 wd2 wd3 raid0
+ R raid1 raid2 raid3 std st0 st1 fd mcd0
;;
wd*|sd*|raid*|ccd*)
diff --git a/etc/etc.mac68k/MAKEDEV b/etc/etc.mac68k/MAKEDEV
index 834d5fc69cd..f9a3e6d2408 100644
--- a/etc/etc.mac68k/MAKEDEV
+++ b/etc/etc.mac68k/MAKEDEV
@@ -3,9 +3,10 @@
# THIS FILE AUTOMATICALLY GENERATED. DO NOT EDIT.
# generated from:
#
-# OpenBSD: etc.mac68k/MAKEDEV.md,v 1.14 2004/02/14 17:24:31 todd Exp
-# OpenBSD: MAKEDEV.mi,v 1.71 2004/02/14 17:24:30 todd Exp
-# OpenBSD: MAKEDEV.sub,v 1.10 2004/02/14 17:24:31 todd Exp
+# OpenBSD: etc.mac68k/MAKEDEV.md,v 1.15 2004/02/16 19:01:01 miod Exp
+# OpenBSD: MAKEDEV.common,v 1.1 2004/02/16 18:58:54 miod Exp
+# OpenBSD: MAKEDEV.mi,v 1.72 2004/02/16 18:58:53 miod Exp
+# OpenBSD: MAKEDEV.sub,v 1.11 2004/02/16 18:58:53 miod Exp
#
#
# Copyright (c) 2001-2004 Todd T. Fries <todd@OpenBSD.org>
@@ -25,40 +26,40 @@
# Device "make" file. Valid arguments:
# all makes all known devices, including local devices.
# Tries to make the ``standard'' number of each type.
-# std standard devices
-# fd makes fd/* for the fdescfs
-# local configuration specific devices
-# ramdisk makes all devices for a ramdisk kernel
-# st* SCSI tapes
-# sd* SCSI disks
+# ramdisk Ramdisk kernel devices
+# std Standard devices
+# local Configuration specific devices
+# Disks:
+# ccd* Concatenated disk devices
# cd* SCSI cdrom drives
# rd* "rd" pseudo-disks
-# ch* SCSI media changer
-# vnd* "file" pseudo-disks
-# ccd* concatenated disk devices
+# sd* SCSI disks
+# vnd* "file" pseudo-disk devices
+# Tapes:
+# ch* SCSI media changers
+# st* SCSI tape drives
# Terminal ports:
-# ttye* ite bitmapped consoles
-# tty00 standard serial port
+# tty00 Standard serial port
+# ttye* ITE bitmapped consoles
# Pseudo terminals:
-# tty* set of 16 slave pseudo terminals
-# pty* set of 16 master pseudo terminals
# ptm pty master device
-# Graphics devices:
-# grf* custom chip (grf0), Retina Z2/Z3 (grf1/grf2),
-# Cirrus boards (grf3), A2410 (grf4) video or
-# CyberVision 64 (grf5)
+# pty* Set of 16 master pseudo terminals
+# tty* Set of 16 slave pseudo terminals
+# Console ports:
+# adb Apple Desktop bus event interface
+# grf* Raw interface to the mac68k graphics devices
# Special purpose devices:
+# asc* ASC Audio device
# bpf* Berkeley Packet Filter
-# tun* network tunnel driver
+# fd fd/* nodes for fdescfs
+# lkm Loadable kernel modules interface
# pf* Packet Filter
-# lkm loadable kernel modules interface
-# *random inkernel random data source
-# uk* SCSI Unknown device
+# *random In-kernel random data source
# ss* SCSI scanners
-# xfs* XFS filesystem devices
-# adb Apple Desktop bus event interface
-# asc* ASC Audio device
-# systrace* system call tracing device
+# systrace* System call tracing device
+# tun* Network tunnel driver
+# uk* SCSI unknown devices
+# xfs* XFS filesystem node
PATH=/sbin:/usr/sbin:/bin:/usr/bin
T=$0
@@ -246,20 +247,20 @@ asc*)
M asc$U c 36 $U
;;
-systrace)
- M systrace c 50 0 644
+xfs*)
+ M xfs$U c 51 $U 600
;;
-asc*)
- M asc$U 36 0
+uk*)
+ M uk$U c 34 $U 640 operator
;;
-adb)
- M adb c 23 0
+tun*)
+ M tun$U c 24 $U 600
;;
-xfs*)
- M xfs$U c 51 $U 600
+systrace)
+ M systrace c 50 0 644
;;
ss*)
@@ -270,10 +271,6 @@ ss*)
MKlist="$MKlist;umask 77;ln -s ss$U scan$U"
;;
-uk*)
- M uk$U c 34 $U 640 operator
- ;;
-
*random)
n=0
for pre in " " s u p a
@@ -283,24 +280,30 @@ uk*)
done
;;
-lkm)
- M lkm c 25 0 640 _lkm
- ;;
-
pf*)
M pf c 35 0 600
;;
-tun*)
- M tun$U c 24 $U 600
+lkm)
+ M lkm c 25 0 640 _lkm
+ ;;
+
+fd)
+ RMlist="mkdir -p fd;$RMlist" n=0
+ while [ $n -lt 64 ];do M fd/$n c 21 $n;n=$(($n+1));done
+ MKlist="$MKlist;chmod 555 fd"
;;
bpf*)
M bpf$U c 22 $U 600
;;
-ptm)
- M ptm c 52 0 666
+asc*)
+ M asc$U 36 0
+ ;;
+
+adb)
+ M adb c 23 0
;;
pty*)
@@ -321,15 +324,29 @@ pty*)
done
;;
-vnd*)
- dodisk vnd $U 8 19 $U 0
- dodisk svnd $U 8 19 $U 2048
+ptm)
+ M ptm c 52 0 666
+ ;;
+
+st*)
+ n=$(($U*16))
+ for pre in " " n e en
+ do
+ M ${pre}st$U b 5 $n 660 operator
+ M ${pre}rst$U c 14 $n 660 operator
+ n=$(($n+1))
+ done
;;
ch*)
M ch$U c 17 $U 660 operator
;;
+vnd*)
+ dodisk vnd $U 8 19 $U 0
+ dodisk svnd $U 8 19 $U 2048
+ ;;
+
rd*)
dodisk2 rd $U 13 18 $U 0
;;
@@ -338,14 +355,8 @@ cd*)
dodisk2 cd $U 6 15 $U 0
;;
-st*)
- n=$(($U*16))
- for pre in " " n e en
- do
- M ${pre}st$U b 5 $n 660 operator
- M ${pre}rst$U c 14 $n 660 operator
- n=$(($n+1))
- done
+local)
+ test -s $T.local && sh $T.local
;;
ramdisk)
@@ -353,16 +364,6 @@ ramdisk)
R bpf0 std
;;
-local)
- test -s $T.local && sh $T.local
- ;;
-
-fd)
- RMlist="mkdir -p fd;$RMlist" n=0
- while [ $n -lt 64 ];do M fd/$n c 21 $n;n=$(($n+1));done
- MKlist="$MKlist;chmod 555 fd"
- ;;
-
all)
R ttye0 ccd0 ccd1 ccd2 ccd3 cd0 cd1 rd0 tun0 tun1 tun2 tun3
R bpf0 bpf1 bpf2 bpf3 bpf4 bpf5 bpf6 bpf7 bpf8 bpf9 pty0 pty1
diff --git a/etc/etc.macppc/MAKEDEV b/etc/etc.macppc/MAKEDEV
index c9e24f154c0..6335259a9de 100644
--- a/etc/etc.macppc/MAKEDEV
+++ b/etc/etc.macppc/MAKEDEV
@@ -3,9 +3,10 @@
# THIS FILE AUTOMATICALLY GENERATED. DO NOT EDIT.
# generated from:
#
-# OpenBSD: etc.macppc/MAKEDEV.md,v 1.15 2004/02/14 17:24:31 todd Exp
-# OpenBSD: MAKEDEV.mi,v 1.71 2004/02/14 17:24:30 todd Exp
-# OpenBSD: MAKEDEV.sub,v 1.10 2004/02/14 17:24:31 todd Exp
+# OpenBSD: etc.macppc/MAKEDEV.md,v 1.16 2004/02/16 19:01:01 miod Exp
+# OpenBSD: MAKEDEV.common,v 1.1 2004/02/16 18:58:54 miod Exp
+# OpenBSD: MAKEDEV.mi,v 1.72 2004/02/16 18:58:53 miod Exp
+# OpenBSD: MAKEDEV.sub,v 1.11 2004/02/16 18:58:53 miod Exp
#
#
# Copyright (c) 2001-2004 Todd T. Fries <todd@OpenBSD.org>
@@ -25,60 +26,61 @@
# Device "make" file. Valid arguments:
# all makes all known devices, including local devices.
# Tries to make the ``standard'' number of each type.
-# std standard devices
-# fd makes fd/* for the fdescfs
-# local configuration specific devices
-# ramdisk makes all devices for a ramdisk kernel
-# Tapes:
-# st* SCSI tapes
+# ramdisk Ramdisk kernel devices
+# std Standard devices
+# local Configuration specific devices
# Disks:
-# wd* "winchester" disk drives (ST506, IDE, ESDI, RLL, ...)
-# sd* SCSI disks
+# ccd* Concatenated disk devices
# cd* SCSI cdrom drives
-# ch* SCSI media changer
-# vnd* "file" pseudo-disks
-# rd* "rd" pseudo-disks
# raid* RAIDframe disk devices
-# ccd* concatenated disk devices
-# Console ports:
-# ttyC0 wscons screen 0
-# ttyC-F* wscons virtual consoles
-# wskbd* wscons keyboards
-# wsmouse* wscons mice
-# wsmux wscons keyboard/mouse mux devices
+# rd* "rd" pseudo-disks
+# sd* SCSI disks
+# vnd* "file" pseudo-disk devices
+# wd* "winchester" disk drives (ST506, IDE, ESDI, RLL, ...)
+# Tapes:
+# ch* SCSI media changers
+# st* SCSI tape drives
# Terminal ports:
# tty[0-7][0-9a-f] NS16x50 serial ports
# Pseudo terminals:
-# tty* set of 16 slave pseudo terminals
-# pty* set of 16 master pseudo terminals
# ptm pty master device
+# pty* Set of 16 master pseudo terminals
+# tty* Set of 16 slave pseudo terminals
+# Console ports:
+# ttyC0 Minimal wscons devices
+# ttyC-F* wscons display devices
+# wskbd* wscons keyboards
+# wsmux wscons keyboard/mouse mux devices
+# Pointing devices:
+# wsmouse* wscons mice
# USB devices:
-# usb* Bus control devices used by usbd for attach/detach
+# usbs All USB devices
+# ttyU* USB serial ports
+# ugen* Generic USB devices
# uhid* Generic HID devices
-# ugen* Generic device
# ulpt* Printer devices
# urio* Diamond Multimedia Rio 500
-# ttyU* Serial ports
+# usb* Bus control devices used by usbd for attach/detach
# uscanner* Scanners
# Special purpose devices:
-# audio* audio device
-# apm power management device
+# apm Power management device
+# audio* Audio devices
+# bktr* Video frame grabbers
# bpf* Berkeley Packet Filter
-# tun* network tunnel driver
-# lkm loadable kernel modules interface
-# *random inkernel random data source
-# uk* SCSI Unknown device
-# ss* SCSI scanners
-# xfs* XFS filesystem devices
-# iop* I2O controller device
-# pf* Packet Filter
-# crypto hardware crypto access driver
-# usbs make USB devices
+# crypto Hardware crypto access driver
+# fd fd/* nodes for fdescfs
+# iop* I2O controller devices
+# lkm Loadable kernel modules interface
# pci PCI bus device
-# systrace* system call tracing device
-# bktr* video capturing
-# tuner* tuner device
-# radio* FM tuner device
+# pf* Packet Filter
+# radio* FM tuner devices
+# *random In-kernel random data source
+# ss* SCSI scanners
+# systrace* System call tracing device
+# tun* Network tunnel driver
+# tuner* Tuner devices
+# uk* SCSI unknown devices
+# xfs* XFS filesystem node
PATH=/sbin:/usr/sbin:/bin:/usr/bin
T=$0
@@ -228,48 +230,26 @@ std)
;;
-radio*)
- M radio$U c 76 $U
- MKlist="$MKlist;[ -e radio ] || ln -s radio$U radio"
+xfs*)
+ M xfs$U c 51 $U 600
+ ;;
+
+uk*)
+ M uk$U c 41 $U 640 operator
;;
tuner*)
M tuner$U c 75 $(($(($U*2))+16)) 644
;;
-bktr*)
- M bktr$U c 75 $U 644
+tun*)
+ M tun$U c 23 $U 600
;;
systrace)
M systrace c 50 0 644
;;
-pci)
- M pci c 71 0 600
- ;;
-
-usbs)
- R ttyU0 ttyU1 ugen0 ugen1 ulpt0 ulpt1 uhid0 uhid1 uhid2 uhid3
- R uscanner0 urio0 usb0 usb1
- ;;
-
-crypto)
- M crypto c 47 0
- ;;
-
-pf*)
- M pf c 39 0 600
- ;;
-
-iop*)
- M iop$U c 73 $U 660
- ;;
-
-xfs*)
- M xfs$U c 51 $U 600
- ;;
-
ss*)
M ss$U c 42 $(($U*16)) 640 operator
M nss$U c 42 $(($(($U*16))+1)) 640 operator
@@ -278,10 +258,6 @@ ss*)
MKlist="$MKlist;umask 77;ln -s ss$U scan$U"
;;
-uk*)
- M uk$U c 41 $U 640 operator
- ;;
-
*random)
n=0
for pre in " " s u p a
@@ -291,21 +267,43 @@ uk*)
done
;;
+radio*)
+ M radio$U c 76 $U
+ MKlist="$MKlist;[ -e radio ] || ln -s radio$U radio"
+ ;;
+
+pf*)
+ M pf c 39 0 600
+ ;;
+
+pci)
+ M pci c 71 0 600
+ ;;
+
lkm)
M lkm c 24 0 640 _lkm
;;
-tun*)
- M tun$U c 23 $U 600
+iop*)
+ M iop$U c 73 $U 660
+ ;;
+
+fd)
+ RMlist="mkdir -p fd;$RMlist" n=0
+ while [ $n -lt 64 ];do M fd/$n c 21 $n;n=$(($n+1));done
+ MKlist="$MKlist;chmod 555 fd"
+ ;;
+
+crypto)
+ M crypto c 47 0
;;
bpf*)
M bpf$U c 22 $U 600
;;
-apm*)
- M apm c 25 0 644
- M apmctl c 25 8 644
+bktr*)
+ M bktr$U c 75 $U 644
;;
audio*)
@@ -319,14 +317,18 @@ audio*)
MKlist="$MKlist;[ -e audioctl ] || ln -s audioctl$U audioctl"
;;
+apm*)
+ M apm c 25 0 644
+ M apmctl c 25 8 644
+ ;;
+
uscanner*)
M uscanner$U c 74 $U 660
;;
-ttyU[0-9a-zA-Z])
- U=${i#ttyU*}
- o=$(alph2d $U)
- M ttyU$U c 66 $o 660 dialer uucp
+usb*)
+ [ "$i" = "usb" ] && u= || u=$U
+ M usb$u c 61 $U 660
;;
urio*)
@@ -337,6 +339,10 @@ ulpt*)
M ulpt$U c 64 $U 660
;;
+uhid*)
+ M uhid$U c 62 $U 660
+ ;;
+
ugen*)
n=$(($U*16))
for j in 00 01 02 03 04 05 06 07 08 09 10 11 12 13 14 15
@@ -345,42 +351,19 @@ ugen*)
done
;;
-uhid*)
- M uhid$U c 62 $U 660
- ;;
-
-usb*)
- [ "$i" = "usb" ] && u= || u=$U
- M usb$u c 61 $U 660
- ;;
-
-ptm)
- M ptm c 77 0 666
+ttyU[0-9a-zA-Z])
+ U=${i#ttyU*}
+ o=$(alph2d $U)
+ M ttyU$U c 66 $o 660 dialer uucp
;;
-pty*)
- if [ $U -gt 15 ]; then
- echo bad unit for pty in: $i
- continue
- fi
- set -A tbl p q r s t u v w x y z P Q R S T
- name=${tbl[$U]}
- n=0
- while [ $n -lt 16 ]
- do
- nam=$name$(hex $n)
- off=$(($U*16))
- M tty$nam c 4 $(($off+$n))
- M pty$nam c 5 $(($off+$n))
- n=$(($n+1))
- done
+usbs)
+ R ttyU0 ttyU1 ugen0 ugen1 ulpt0 ulpt1 uhid0 uhid1 uhid2 uhid3
+ R uscanner0 urio0 usb0 usb1
;;
-tty[0-7][0-9a-f])
- U=${i#tty*}
- o=$(h2d $U)
- M tty$U c 7 $o 660 dialer uucp
- M cua$U c 7 $(($o+128)) 660 dialer uucp
+wsmouse*)
+ M wsmouse$U c 69 $U 600
;;
wsmux|wsmouse|wskbd)
@@ -388,10 +371,6 @@ wsmux|wsmouse|wskbd)
M wskbd c 70 1 600
;;
-wsmouse*)
- M wsmouse$U c 69 $U 600
- ;;
-
wskbd*)
M wskbd$U c 68 $U 600
;;
@@ -417,21 +396,33 @@ wscons)
R ttyC6 ttyC7 ttyC8 ttyC9 ttyCa ttyCb
;;
-rd*)
- dodisk2 rd $U 17 17 $U 0
- ;;
-
-vnd*)
- dodisk vnd $U 14 19 $U 0
- dodisk svnd $U 14 19 $U 2048
+pty*)
+ if [ $U -gt 15 ]; then
+ echo bad unit for pty in: $i
+ continue
+ fi
+ set -A tbl p q r s t u v w x y z P Q R S T
+ name=${tbl[$U]}
+ n=0
+ while [ $n -lt 16 ]
+ do
+ nam=$name$(hex $n)
+ off=$(($U*16))
+ M tty$nam c 4 $(($off+$n))
+ M pty$nam c 5 $(($off+$n))
+ n=$(($n+1))
+ done
;;
-ch*)
- M ch$U c 10 $U 660 operator
+ptm)
+ M ptm c 77 0 666
;;
-cd*)
- dodisk2 cd $U 3 9 $U 0
+tty[0-7][0-9a-f])
+ U=${i#tty*}
+ o=$(h2d $U)
+ M tty$U c 7 $o 660 dialer uucp
+ M cua$U c 7 $(($o+128)) 660 dialer uucp
;;
st*)
@@ -444,19 +435,30 @@ st*)
done
;;
-ramdisk)
- R pty0 rd0 cd0 cd1 st0 st1 wd0 wd1 wd2 wd3 wd4 sd0 sd1 sd2
- R sd3 sd4 bpf0 std
+ch*)
+ M ch$U c 10 $U 660 operator
+ ;;
+
+vnd*)
+ dodisk vnd $U 14 19 $U 0
+ dodisk svnd $U 14 19 $U 2048
+ ;;
+
+rd*)
+ dodisk2 rd $U 17 17 $U 0
+ ;;
+
+cd*)
+ dodisk2 cd $U 3 9 $U 0
;;
local)
test -s $T.local && sh $T.local
;;
-fd)
- RMlist="mkdir -p fd;$RMlist" n=0
- while [ $n -lt 64 ];do M fd/$n c 21 $n;n=$(($n+1));done
- MKlist="$MKlist;chmod 555 fd"
+ramdisk)
+ R pty0 rd0 cd0 cd1 st0 st1 wd0 wd1 wd2 wd3 wd4 sd0 sd1 sd2
+ R sd3 sd4 bpf0 std
;;
all)
diff --git a/etc/etc.mvme68k/MAKEDEV b/etc/etc.mvme68k/MAKEDEV
index 21ff92d16b3..24d40995471 100644
--- a/etc/etc.mvme68k/MAKEDEV
+++ b/etc/etc.mvme68k/MAKEDEV
@@ -3,9 +3,10 @@
# THIS FILE AUTOMATICALLY GENERATED. DO NOT EDIT.
# generated from:
#
-# OpenBSD: etc.mvme68k/MAKEDEV.md,v 1.11 2004/02/14 17:24:31 todd Exp
-# OpenBSD: MAKEDEV.mi,v 1.71 2004/02/14 17:24:30 todd Exp
-# OpenBSD: MAKEDEV.sub,v 1.10 2004/02/14 17:24:31 todd Exp
+# OpenBSD: etc.mvme68k/MAKEDEV.md,v 1.12 2004/02/16 19:01:02 miod Exp
+# OpenBSD: MAKEDEV.common,v 1.1 2004/02/16 18:58:54 miod Exp
+# OpenBSD: MAKEDEV.mi,v 1.72 2004/02/16 18:58:53 miod Exp
+# OpenBSD: MAKEDEV.sub,v 1.11 2004/02/16 18:58:53 miod Exp
#
#
# Copyright (c) 2001-2004 Todd T. Fries <todd@OpenBSD.org>
@@ -25,45 +26,45 @@
# Device "make" file. Valid arguments:
# all makes all known devices, including local devices.
# Tries to make the ``standard'' number of each type.
-# ramdisk makes all devices for a ramdisk kernel
-# std standard devices
-# local configuration specific devices
-# Tapes:
-# st* SCSI tapes
+# ramdisk Ramdisk kernel devices
+# std Standard devices
+# local Configuration specific devices
# Disks:
-# sd* SCSI disks
+# ccd* Concatenated disk devices
# cd* SCSI cdrom drives
-# ccd* concatenated disk devices
-# vnd* "file" pseudo-disks
# rd* "rd" pseudo-disks
+# sd* SCSI disks
+# vnd* "file" pseudo-disk devices
+# Tapes:
+# ch* SCSI media changers
+# st* SCSI tape drives
# Terminal ports:
-# ttya-d standard serial ports
-# cuaa-d standard call-up devices
+# cuaa-d On-board call-up devices
+# ttya-d On-board serial ports
# tty0* CL-CD2400 serial ports
# ttyw* WG CL-CD2400 serial ports
# Pseudo terminals:
-# tty* set of 16 slave pseudo terminals
-# pty* set of 16 master pseudo terminals
# ptm pty master device
+# pty* Set of 16 master pseudo terminals
+# tty* Set of 16 slave pseudo terminals
# Printers:
-# par0 Printer port
+# par0 On-board printer port
# Special purpose devices:
-# uk* SCSI Unknown device
-# ss* SCSI scanners
-# ch* SCSI media changer
-# fd makes fd/* for the fdescfs
# bpf* Berkeley Packet Filter
-# tun* network tunnel driver
+# fd fd/* nodes for fdescfs
+# flash0 On-board flash memory
+# lkm Loadable kernel modules interface
+# nvram0 On-board non-volatile memory
# pf* Packet Filter
-# lkm loadable kernel modules interface
-# *random inkernel random data source
-# xfs* XFS filesystem devices
-# sram0 static memory access
-# nvram0 non-volatile memory access
-# flash0 flash memory access
-# vmes0 VMEbus access
-# vmel0 VMEbus access
-# systrace* system call tracing device
+# *random In-kernel random data source
+# sram0 On-board static memory
+# ss* SCSI scanners
+# systrace* System call tracing device
+# tun* Network tunnel driver
+# uk* SCSI unknown devices
+# vmel0 VMEbus D32 space
+# vmes0 VMEbus D16 space
+# xfs* XFS filesystem node
PATH=/sbin:/usr/sbin:/bin:/usr/bin
T=$0
@@ -211,32 +212,40 @@ std)
;;
-systrace)
- M systrace c 50 0 644
+xfs*)
+ M xfs$U c 51 $U 600
+ ;;
+
+vmes0)
+ M vmes0 c 32 0 640 kmem
;;
vmel0)
M vmel0 c 31 0 640 kmem
;;
-vmes0)
- M vmes0 c 32 0 640 kmem
+uk*)
+ M uk$U c 41 $U 640 operator
;;
-flash0)
- M flash0 c 11 0 640 kmem
+tun*)
+ M tun$U c 23 $U 600
;;
-nvram0)
- M nvram0 c 10 0 640 kmem
+systrace)
+ M systrace c 50 0 644
;;
-sram0)
- M sram0 c 7 0 640 kmem
+ss*)
+ M ss$U c 42 $(($U*16)) 640 operator
+ M nss$U c 42 $(($(($U*16))+1)) 640 operator
+ M enss$U c 42 $(($(($U*16))+3)) 640 operator
+ RMlist="$RMlist scan$U"
+ MKlist="$MKlist;umask 77;ln -s ss$U scan$U"
;;
-xfs*)
- M xfs$U c 51 $U 600
+sram0)
+ M sram0 c 7 0 640 kmem
;;
*random)
@@ -248,20 +257,20 @@ xfs*)
done
;;
-lkm)
- M lkm c 24 0 640 _lkm
- ;;
-
pf*)
M pf c 39 0 600
;;
-tun*)
- M tun$U c 23 $U 600
+nvram0)
+ M nvram0 c 10 0 640 kmem
;;
-bpf*)
- M bpf$U c 22 $U 600
+lkm)
+ M lkm c 24 0 640 _lkm
+ ;;
+
+flash0)
+ M flash0 c 11 0 640 kmem
;;
fd)
@@ -270,20 +279,8 @@ fd)
MKlist="$MKlist;chmod 555 fd"
;;
-ch*)
- M ch$U c 44 $U 660 operator
- ;;
-
-ss*)
- M ss$U c 42 $(($U*16)) 640 operator
- M nss$U c 42 $(($(($U*16))+1)) 640 operator
- M enss$U c 42 $(($(($U*16))+3)) 640 operator
- RMlist="$RMlist scan$U"
- MKlist="$MKlist;umask 77;ln -s ss$U scan$U"
- ;;
-
-uk*)
- M uk$U c 41 $U 640 operator
+bpf*)
+ M bpf$U c 22 $U 600
;;
lp*)
@@ -294,10 +291,6 @@ lp*)
esac
;;
-ptm)
- M ptm c 52 0 666
- ;;
-
pty*)
if [ $U -gt 15 ]; then
echo bad unit for pty in: $i
@@ -316,6 +309,10 @@ pty*)
done
;;
+ptm)
+ M ptm c 52 0 666
+ ;;
+
ttyw*)
u=${i#ttyw*}
case $u in
@@ -338,40 +335,50 @@ tty0*)
esac
;;
-cua[a-z])
- u=${i#cua*}
+tty[a-z])
+ u=${i#tty*}
case $u in
a) n=0 ;;
b) n=1 ;;
c) n=2 ;;
d) n=3 ;;
- *) echo unknown cua device $i ;;
+ *) echo unknown tty device $i ;;
esac
case $u in
a|b|c|d)
- M cua$u c 12 $(($n+128)) 660 dialer uucp
+ M tty$u c 12 $n 660 dialer uucp
;;
esac
;;
-tty[a-z])
- u=${i#tty*}
+cua[a-z])
+ u=${i#cua*}
case $u in
a) n=0 ;;
b) n=1 ;;
c) n=2 ;;
d) n=3 ;;
- *) echo unknown tty device $i ;;
+ *) echo unknown cua device $i ;;
esac
case $u in
a|b|c|d)
- M tty$u c 12 $n 660 dialer uucp
+ M cua$u c 12 $(($n+128)) 660 dialer uucp
;;
esac
;;
-rd*)
- dodisk2 rd $U 9 18 $U 0
+st*)
+ n=$(($U*16))
+ for pre in " " n e en
+ do
+ M ${pre}st$U b 7 $n 660 operator
+ M ${pre}rst$U c 20 $n 660 operator
+ n=$(($n+1))
+ done
+ ;;
+
+ch*)
+ M ch$U c 44 $U 660 operator
;;
vnd*)
@@ -379,18 +386,12 @@ vnd*)
dodisk svnd $U 6 19 $U 2048
;;
-cd*)
- dodisk2 cd $U 8 9 $U 0
+rd*)
+ dodisk2 rd $U 9 18 $U 0
;;
-st*)
- n=$(($U*16))
- for pre in " " n e en
- do
- M ${pre}st$U b 7 $n 660 operator
- M ${pre}rst$U c 20 $n 660 operator
- n=$(($n+1))
- done
+cd*)
+ dodisk2 cd $U 8 9 $U 0
;;
local)
@@ -407,7 +408,7 @@ all)
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 pty0
R pty1 pty2 xfs0 ss0 ss1 ch0 vmel0 vmes0 flash0 nvram0 sram0
- R ptm uk0 random lkm pf systrace std st0 st1 fd
+ R ptm local uk0 random lkm pf systrace std st0 st1 fd
;;
sd*|ccd*)
diff --git a/etc/etc.mvme88k/MAKEDEV b/etc/etc.mvme88k/MAKEDEV
index d4e62806f22..3f9631cc11e 100644
--- a/etc/etc.mvme88k/MAKEDEV
+++ b/etc/etc.mvme88k/MAKEDEV
@@ -3,9 +3,10 @@
# THIS FILE AUTOMATICALLY GENERATED. DO NOT EDIT.
# generated from:
#
-# OpenBSD: etc.mvme88k/MAKEDEV.md,v 1.12 2004/02/14 17:24:31 todd Exp
-# OpenBSD: MAKEDEV.mi,v 1.71 2004/02/14 17:24:30 todd Exp
-# OpenBSD: MAKEDEV.sub,v 1.10 2004/02/14 17:24:31 todd Exp
+# OpenBSD: etc.mvme88k/MAKEDEV.md,v 1.13 2004/02/16 19:01:02 miod Exp
+# OpenBSD: MAKEDEV.common,v 1.1 2004/02/16 18:58:54 miod Exp
+# OpenBSD: MAKEDEV.mi,v 1.72 2004/02/16 18:58:53 miod Exp
+# OpenBSD: MAKEDEV.sub,v 1.11 2004/02/16 18:58:53 miod Exp
#
#
# Copyright (c) 2001-2004 Todd T. Fries <todd@OpenBSD.org>
@@ -25,41 +26,41 @@
# Device "make" file. Valid arguments:
# all makes all known devices, including local devices.
# Tries to make the ``standard'' number of each type.
-# ramdisk makes all devices for a ramdisk kernel
-# std standard devices
-# local configuration specific devices
-# Tapes:
-# st* SCSI tapes
+# ramdisk Ramdisk kernel devices
+# std Standard devices
+# local Configuration specific devices
# Disks:
-# sd* SCSI disks
+# ccd* Concatenated disk devices
# cd* SCSI cdrom drives
-# ccd* concatenated disk devices
-# vnd* "file" pseudo-disks
# rd* "rd" pseudo-disks
+# sd* SCSI disks
+# vnd* "file" pseudo-disk devices
+# Tapes:
+# ch* SCSI media changers
+# st* SCSI tape drives
# Terminal ports:
-# ttya-b MVME188 standard serial ports
# tty0* MVME1x7 CL-CD2400 serial ports
+# ttya-b MVME188 serial ports
# ttyv* MVME332XT serial ports
# Pseudo terminals:
-# tty* set of 16 slave pseudo terminals
-# pty* set of 16 master pseudo terminals
# ptm pty master device
+# pty* Set of 16 master pseudo terminals
+# tty* Set of 16 slave pseudo terminals
# Special purpose devices:
-# uk* SCSI Unknown device
-# ss* SCSI scanners
-# ch* SCSI media changer
-# fd makes fd/* for the fdescfs
# bpf* Berkeley Packet Filter
-# tun* network tunnel driver
+# fd fd/* nodes for fdescfs
+# lkm Loadable kernel modules interface
+# nvram0 On-board non-volatile memory
# pf* Packet Filter
-# lkm loadable kernel modules interface
-# *random inkernel random data source
-# xfs* XFS filesystem devices
-# sram0 static memory access
-# nvram0 non-volatile memory access
-# vmes0 VMEbus access
-# vmel0 VMEbus access
-# systrace* system call tracing device
+# *random In-kernel random data source
+# sram0 On-board static memory
+# ss* SCSI scanners
+# systrace* System call tracing device
+# tun* Network tunnel driver
+# vmel0 VMEbus D32 space
+# vmes0 VMEbus D16 space
+# uk* SCSI unknown devices
+# xfs* XFS filesystem node
PATH=/sbin:/usr/sbin:/bin:/usr/bin
T=$0
@@ -207,28 +208,40 @@ std)
;;
-systrace)
- M systrace c 50 0 644
+xfs*)
+ M xfs$U c 51 $U 600
;;
-vmel0)
- M vmel0 c 31 0 640 kmem
+uk*)
+ M uk$U c 41 $U 640 operator
;;
vmes0)
M vmes0 c 32 0 640 kmem
;;
-nvram0)
- M nvram0 c 10 0 640 kmem
+vmel0)
+ M vmel0 c 31 0 640 kmem
;;
-sram0)
- M sram0 c 7 0 640 kmem
+tun*)
+ M tun$U c 23 $U 600
;;
-xfs*)
- M xfs$U c 51 $U 600
+systrace)
+ M systrace c 50 0 644
+ ;;
+
+ss*)
+ M ss$U c 42 $(($U*16)) 640 operator
+ M nss$U c 42 $(($(($U*16))+1)) 640 operator
+ M enss$U c 42 $(($(($U*16))+3)) 640 operator
+ RMlist="$RMlist scan$U"
+ MKlist="$MKlist;umask 77;ln -s ss$U scan$U"
+ ;;
+
+sram0)
+ M sram0 c 7 0 640 kmem
;;
*random)
@@ -240,20 +253,16 @@ xfs*)
done
;;
-lkm)
- M lkm c 24 0 640 _lkm
- ;;
-
pf*)
M pf c 39 0 600
;;
-tun*)
- M tun$U c 23 $U 600
+nvram0)
+ M nvram0 c 10 0 640 kmem
;;
-bpf*)
- M bpf$U c 22 $U 600
+lkm)
+ M lkm c 24 0 640 _lkm
;;
fd)
@@ -262,24 +271,8 @@ fd)
MKlist="$MKlist;chmod 555 fd"
;;
-ch*)
- M ch$U c 44 $U 660 operator
- ;;
-
-ss*)
- M ss$U c 42 $(($U*16)) 640 operator
- M nss$U c 42 $(($(($U*16))+1)) 640 operator
- M enss$U c 42 $(($(($U*16))+3)) 640 operator
- RMlist="$RMlist scan$U"
- MKlist="$MKlist;umask 77;ln -s ss$U scan$U"
- ;;
-
-uk*)
- M uk$U c 41 $U 640 operator
- ;;
-
-ptm)
- M ptm c 52 0 666
+bpf*)
+ M bpf$U c 22 $U 600
;;
pty*)
@@ -300,6 +293,10 @@ pty*)
done
;;
+ptm)
+ M ptm c 52 0 666
+ ;;
+
ttyv*)
u=${i#ttyv*}
case $u in
@@ -311,17 +308,6 @@ ttyv*)
esac
;;
-tty0*)
- u=${i#tty0*}
- case $u in
- 0|1|2|3|4|5|6|7)
- M tty0$u c 13 $u 660 dialer uucp
- M cua0$u c 13 $(($u+128)) 660 dialer uucp
- ;;
- *) echo unknown tty device $i ;;
- esac
- ;;
-
tty[a-z])
u=${i#tty*}
case $u in
@@ -337,17 +323,15 @@ tty[a-z])
esac
;;
-rd*)
- dodisk2 rd $U 7 18 $U 0
- ;;
-
-vnd*)
- dodisk vnd $U 8 19 $U 0
- dodisk svnd $U 8 19 $U 2048
- ;;
-
-cd*)
- dodisk2 cd $U 6 9 $U 0
+tty0*)
+ u=${i#tty0*}
+ case $u in
+ 0|1|2|3|4|5|6|7)
+ M tty0$u c 13 $u 660 dialer uucp
+ M cua0$u c 13 $(($u+128)) 660 dialer uucp
+ ;;
+ *) echo unknown tty device $i ;;
+ esac
;;
st*)
@@ -360,6 +344,23 @@ st*)
done
;;
+ch*)
+ M ch$U c 44 $U 660 operator
+ ;;
+
+vnd*)
+ dodisk vnd $U 8 19 $U 0
+ dodisk svnd $U 8 19 $U 2048
+ ;;
+
+rd*)
+ dodisk2 rd $U 7 18 $U 0
+ ;;
+
+cd*)
+ dodisk2 cd $U 6 9 $U 0
+ ;;
+
local)
test -s $T.local && sh $T.local
;;
@@ -375,7 +376,7 @@ all)
R ccd3 vnd0 vnd1 vnd2 vnd3 sd0 sd1 sd2 sd3 sd4 cd0 cd1 rd0
R tun0 tun1 tun2 tun3 bpf0 bpf1 bpf2 bpf3 bpf4 bpf5 bpf6 bpf7
R bpf8 bpf9 pty0 pty1 pty2 xfs0 ss0 ch0 vmel0 vmes0 nvram0
- R sram0 ptm uk0 random lkm pf systrace std st0 st1 fd
+ R sram0 ptm local uk0 random lkm pf systrace std st0 st1 fd
;;
sd*|ccd*)
diff --git a/etc/etc.pegasos/MAKEDEV b/etc/etc.pegasos/MAKEDEV
index b4c0c817f87..a65086883f5 100644
--- a/etc/etc.pegasos/MAKEDEV
+++ b/etc/etc.pegasos/MAKEDEV
@@ -3,9 +3,10 @@
# THIS FILE AUTOMATICALLY GENERATED. DO NOT EDIT.
# generated from:
#
-# OpenBSD: etc.pegasos/MAKEDEV.md,v 1.5 2004/02/14 17:24:31 todd Exp
-# OpenBSD: MAKEDEV.mi,v 1.71 2004/02/14 17:24:30 todd Exp
-# OpenBSD: MAKEDEV.sub,v 1.10 2004/02/14 17:24:31 todd Exp
+# OpenBSD: etc.pegasos/MAKEDEV.md,v 1.6 2004/02/16 19:01:02 miod Exp
+# OpenBSD: MAKEDEV.common,v 1.1 2004/02/16 18:58:54 miod Exp
+# OpenBSD: MAKEDEV.mi,v 1.72 2004/02/16 18:58:53 miod Exp
+# OpenBSD: MAKEDEV.sub,v 1.11 2004/02/16 18:58:53 miod Exp
#
#
# Copyright (c) 2001-2004 Todd T. Fries <todd@OpenBSD.org>
@@ -25,60 +26,60 @@
# Device "make" file. Valid arguments:
# all makes all known devices, including local devices.
# Tries to make the ``standard'' number of each type.
-# std standard devices
-# fd makes fd/* for the fdescfs
-# local configuration specific devices
-# ramdisk makes all devices for a ramdisk kernel
-# Tapes:
-# st* SCSI tapes
+# ramdisk Ramdisk kernel devices
+# std Standard devices
+# local Configuration specific devices
# Disks:
-# wd* "winchester" disk drives (ST506, IDE, ESDI, RLL, ...)
-# sd* SCSI disks
+# ccd* Concatenated disk devices
# cd* SCSI cdrom drives
-# ch* SCSI media changer
-# vnd* "file" pseudo-disks
-# rd* "rd" pseudo-disks
# raid* RAIDframe disk devices
-# ccd* concatenated disk devices
-# Console ports:
-# ttyC0 wscons screen 0
-# ttyC-F* wscons virtual consoles
-# wskbd* wscons keyboards
-# wsmouse* wscons mice
-# wsmux wscons keyboard/mouse mux devices
+# rd* "rd" pseudo-disks
+# sd* SCSI disks
+# vnd* "file" pseudo-disk devices
+# wd* "winchester" disk drives (ST506, IDE, ESDI, RLL, ...)
+# Tapes:
+# ch* SCSI media changers
+# st* SCSI tape drives
# Terminal ports:
# tty[0-7][0-9a-f] NS16x50 serial ports
# Pseudo terminals:
-# tty* set of 16 slave pseudo terminals
-# pty* set of 16 master pseudo terminals
# ptm pty master device
+# pty* Set of 16 master pseudo terminals
+# tty* Set of 16 slave pseudo terminals
+# Console ports:
+# ttyC0 Minimal wscons devices
+# ttyC-F* wscons display devices
+# wskbd* wscons keyboards
+# wsmux wscons keyboard/mouse mux devices
+# Pointing devices:
+# wsmouse* wscons mice
# USB devices:
-# usb* Bus control devices used by usbd for attach/detach
+# usbs All USB devices
+# ttyU* USB serial ports
+# ugen* Generic USB devices
# uhid* Generic HID devices
-# ugen* Generic device
# ulpt* Printer devices
# urio* Diamond Multimedia Rio 500
-# ttyU* Serial ports
+# usb* Bus control devices used by usbd for attach/detach
# uscanner* Scanners
# Special purpose devices:
-# audio* audio device
-# apm power management device
+# audio* Audio devices
+# bktr* Video frame grabbers
# bpf* Berkeley Packet Filter
-# tun* network tunnel driver
-# lkm loadable kernel modules interface
-# *random inkernel random data source
-# uk* SCSI Unknown device
-# ss* SCSI scanners
-# xfs* XFS filesystem devices
-# iop* I2O controller device
-# pf* Packet Filter
-# crypto hardware crypto access driver
-# usbs make USB devices
+# crypto Hardware crypto access driver
+# fd fd/* nodes for fdescfs
+# iop* I2O controller devices
+# lkm Loadable kernel modules interface
# pci PCI bus device
-# systrace* system call tracing device
-# bktr* video capturing
-# tuner* tuner device
-# radio* FM tuner device
+# pf* Packet Filter
+# radio* FM tuner devices
+# *random In-kernel random data source
+# ss* SCSI scanners
+# systrace* System call tracing device
+# tun* Network tunnel driver
+# tuner* Tuner devices
+# uk* SCSI unknown devices
+# xfs* XFS filesystem node
PATH=/sbin:/usr/sbin:/bin:/usr/bin
T=$0
@@ -227,48 +228,26 @@ std)
M reload c 2 20 640 kmem
;;
-radio*)
- M radio$U c 76 $U
- MKlist="$MKlist;[ -e radio ] || ln -s radio$U radio"
+xfs*)
+ M xfs$U c 51 $U 600
+ ;;
+
+uk*)
+ M uk$U c 41 $U 640 operator
;;
tuner*)
M tuner$U c 75 $(($(($U*2))+16)) 644
;;
-bktr*)
- M bktr$U c 75 $U 644
+tun*)
+ M tun$U c 23 $U 600
;;
systrace)
M systrace c 50 0 644
;;
-pci)
- M pci c 71 0 600
- ;;
-
-usbs)
- R ttyU0 ttyU1 ugen0 ugen1 ulpt0 ulpt1 uhid0 uhid1 uhid2 uhid3
- R uscanner0 urio0 usb0 usb1
- ;;
-
-crypto)
- M crypto c 47 0
- ;;
-
-pf*)
- M pf c 39 0 600
- ;;
-
-iop*)
- M iop$U c 73 $U 660
- ;;
-
-xfs*)
- M xfs$U c 51 $U 600
- ;;
-
ss*)
M ss$U c 42 $(($U*16)) 640 operator
M nss$U c 42 $(($(($U*16))+1)) 640 operator
@@ -277,10 +256,6 @@ ss*)
MKlist="$MKlist;umask 77;ln -s ss$U scan$U"
;;
-uk*)
- M uk$U c 41 $U 640 operator
- ;;
-
*random)
n=0
for pre in " " s u p a
@@ -290,21 +265,43 @@ uk*)
done
;;
+radio*)
+ M radio$U c 76 $U
+ MKlist="$MKlist;[ -e radio ] || ln -s radio$U radio"
+ ;;
+
+pf*)
+ M pf c 39 0 600
+ ;;
+
+pci)
+ M pci c 71 0 600
+ ;;
+
lkm)
M lkm c 24 0 640 _lkm
;;
-tun*)
- M tun$U c 23 $U 600
+iop*)
+ M iop$U c 73 $U 660
+ ;;
+
+fd)
+ RMlist="mkdir -p fd;$RMlist" n=0
+ while [ $n -lt 64 ];do M fd/$n c 21 $n;n=$(($n+1));done
+ MKlist="$MKlist;chmod 555 fd"
+ ;;
+
+crypto)
+ M crypto c 47 0
;;
bpf*)
M bpf$U c 22 $U 600
;;
-apm*)
- M apm c 25 0 644
- M apmctl c 25 8 644
+bktr*)
+ M bktr$U c 75 $U 644
;;
audio*)
@@ -322,10 +319,9 @@ uscanner*)
M uscanner$U c 74 $U 660
;;
-ttyU[0-9a-zA-Z])
- U=${i#ttyU*}
- o=$(alph2d $U)
- M ttyU$U c 66 $o 660 dialer uucp
+usb*)
+ [ "$i" = "usb" ] && u= || u=$U
+ M usb$u c 61 $U 660
;;
urio*)
@@ -336,6 +332,10 @@ ulpt*)
M ulpt$U c 64 $U 660
;;
+uhid*)
+ M uhid$U c 62 $U 660
+ ;;
+
ugen*)
n=$(($U*16))
for j in 00 01 02 03 04 05 06 07 08 09 10 11 12 13 14 15
@@ -344,42 +344,19 @@ ugen*)
done
;;
-uhid*)
- M uhid$U c 62 $U 660
- ;;
-
-usb*)
- [ "$i" = "usb" ] && u= || u=$U
- M usb$u c 61 $U 660
- ;;
-
-ptm)
- M ptm c 77 0 666
+ttyU[0-9a-zA-Z])
+ U=${i#ttyU*}
+ o=$(alph2d $U)
+ M ttyU$U c 66 $o 660 dialer uucp
;;
-pty*)
- if [ $U -gt 15 ]; then
- echo bad unit for pty in: $i
- continue
- fi
- set -A tbl p q r s t u v w x y z P Q R S T
- name=${tbl[$U]}
- n=0
- while [ $n -lt 16 ]
- do
- nam=$name$(hex $n)
- off=$(($U*16))
- M tty$nam c 4 $(($off+$n))
- M pty$nam c 5 $(($off+$n))
- n=$(($n+1))
- done
+usbs)
+ R ttyU0 ttyU1 ugen0 ugen1 ulpt0 ulpt1 uhid0 uhid1 uhid2 uhid3
+ R uscanner0 urio0 usb0 usb1
;;
-tty[0-7][0-9a-f])
- U=${i#tty*}
- o=$(h2d $U)
- M tty$U c 7 $o 660 dialer uucp
- M cua$U c 7 $(($o+128)) 660 dialer uucp
+wsmouse*)
+ M wsmouse$U c 69 $U 600
;;
wsmux|wsmouse|wskbd)
@@ -387,10 +364,6 @@ wsmux|wsmouse|wskbd)
M wskbd c 70 1 600
;;
-wsmouse*)
- M wsmouse$U c 69 $U 600
- ;;
-
wskbd*)
M wskbd$U c 68 $U 600
;;
@@ -416,21 +389,33 @@ wscons)
R ttyC6 ttyC7 ttyC8 ttyC9 ttyCa ttyCb
;;
-rd*)
- dodisk2 rd $U 17 17 $U 0
- ;;
-
-vnd*)
- dodisk vnd $U 14 19 $U 0
- dodisk svnd $U 14 19 $U 2048
+pty*)
+ if [ $U -gt 15 ]; then
+ echo bad unit for pty in: $i
+ continue
+ fi
+ set -A tbl p q r s t u v w x y z P Q R S T
+ name=${tbl[$U]}
+ n=0
+ while [ $n -lt 16 ]
+ do
+ nam=$name$(hex $n)
+ off=$(($U*16))
+ M tty$nam c 4 $(($off+$n))
+ M pty$nam c 5 $(($off+$n))
+ n=$(($n+1))
+ done
;;
-ch*)
- M ch$U c 10 $U 660 operator
+ptm)
+ M ptm c 77 0 666
;;
-cd*)
- dodisk2 cd $U 3 9 $U 0
+tty[0-7][0-9a-f])
+ U=${i#tty*}
+ o=$(h2d $U)
+ M tty$U c 7 $o 660 dialer uucp
+ M cua$U c 7 $(($o+128)) 660 dialer uucp
;;
st*)
@@ -443,19 +428,30 @@ st*)
done
;;
-ramdisk)
- R pty0 rd0 cd0 cd1 st0 st1 wd0 wd1 wd2 wd3 wd4 sd0 sd1 sd2
- R sd3 sd4 bpf0 std
+ch*)
+ M ch$U c 10 $U 660 operator
+ ;;
+
+vnd*)
+ dodisk vnd $U 14 19 $U 0
+ dodisk svnd $U 14 19 $U 2048
+ ;;
+
+rd*)
+ dodisk2 rd $U 17 17 $U 0
+ ;;
+
+cd*)
+ dodisk2 cd $U 3 9 $U 0
;;
local)
test -s $T.local && sh $T.local
;;
-fd)
- RMlist="mkdir -p fd;$RMlist" n=0
- while [ $n -lt 64 ];do M fd/$n c 21 $n;n=$(($n+1));done
- MKlist="$MKlist;chmod 555 fd"
+ramdisk)
+ R pty0 rd0 cd0 cd1 st0 st1 wd0 wd1 wd2 wd3 wd4 sd0 sd1 sd2
+ R sd3 sd4 bpf0 std
;;
all)
@@ -463,8 +459,8 @@ all)
R cd0 cd1 rd0 tun0 tun1 tun2 tun3 bpf0 bpf1 bpf2 bpf3 bpf4
R bpf5 bpf6 bpf7 bpf8 bpf9 pty0 pty1 pty2 xfs0 ss0 ss1 ch0 ptm
R local wscons pci iop0 iop1 usbs tuner0 radio0 audio0 uk0
- R random lkm tty00 tty01 tty02 tty03 apm crypto pf systrace
- R wd0 wd1 wd2 wd3 raid0 raid1 raid2 raid3 std st0 st1 fd
+ R random lkm tty00 tty01 tty02 tty03 crypto pf systrace wd0
+ R wd1 wd2 wd3 raid0 raid1 raid2 raid3 std st0 st1 fd
;;
wd*|sd*|raid*|ccd*)
diff --git a/etc/etc.sparc/MAKEDEV b/etc/etc.sparc/MAKEDEV
index 56d5392c7eb..ba01bef87cf 100644
--- a/etc/etc.sparc/MAKEDEV
+++ b/etc/etc.sparc/MAKEDEV
@@ -3,9 +3,10 @@
# THIS FILE AUTOMATICALLY GENERATED. DO NOT EDIT.
# generated from:
#
-# OpenBSD: etc.sparc/MAKEDEV.md,v 1.21 2004/02/14 17:24:31 todd Exp
-# OpenBSD: MAKEDEV.mi,v 1.71 2004/02/14 17:24:30 todd Exp
-# OpenBSD: MAKEDEV.sub,v 1.10 2004/02/14 17:24:31 todd Exp
+# OpenBSD: etc.sparc/MAKEDEV.md,v 1.22 2004/02/16 19:01:02 miod Exp
+# OpenBSD: MAKEDEV.common,v 1.1 2004/02/16 18:58:54 miod Exp
+# OpenBSD: MAKEDEV.mi,v 1.72 2004/02/16 18:58:53 miod Exp
+# OpenBSD: MAKEDEV.sub,v 1.11 2004/02/16 18:58:53 miod Exp
#
#
# Copyright (c) 2001-2004 Todd T. Fries <todd@OpenBSD.org>
@@ -25,56 +26,56 @@
# Device "make" file. Valid arguments:
# all makes all known devices, including local devices.
# Tries to make the ``standard'' number of each type.
-# std standard devices
-# local configuration specific devices
-# Tapes:
-# st* SCSI tapes
+# ramdisk Ramdisk kernel devices
+# std Standard devices
+# local Configuration specific devices
# Disks:
-# sd* SCSI disks
+# ccd* Concatenated disk devices
# cd* SCSI cdrom drives
-# ch* SCSI media changer
-# uk* SCSI Unknown device
-# ss* SCSI scanners
-# xy* Xylogic 450/451 disks
-# rd* "rd" pseudo-disks
-# xd* Xylogic 753/7053 disks
# fd* Floppy disk drives (3 1/2", 5 1/4")
-# vnd* "file" pseudo-disks
-# ccd* concatenated disk devices
# presto* Prestoserve NVRAM memory
+# sd* SCSI disks
+# rd* "rd" pseudo-disks
+# vnd* "file" pseudo-disk devices
+# xd* Xylogic 753/7053 disks
+# xy* Xylogic 450/451 disks
+# Tapes:
+# ch* SCSI media changers
+# st* SCSI tape drives
+# Terminal ports:
+# cua[a-z]* Zilog 8530 Serial Port
+# tty[a-z]* Zilog 8530 Serial Port
# Pseudo terminals:
-# tty* set of 16 slave pseudo terminals
-# pty* set of 16 master pseudo terminals
# ptm pty master device
-# Printers:
+# pty* Set of 16 master pseudo terminals
+# tty* Set of 16 slave pseudo terminals
# Console ports:
-# ttyC0 wscons screen 0
-# ttyC-F* wscons virtual consoles
+# ttyC0 Minimal wscons devices
+# ttyC-F* wscons display devices
# wskbd* wscons keyboards
# wsmux wscons keyboard/mouse mux devices
# Pointing devices:
# wsmouse* wscons mice
-# Terminal ports:
-# tty[a-z]* Zilog 8530 Serial Port
-# cua[a-z]* Zilog 8530 Serial Port
# Special purpose devices:
-# audio* audio device
-# openprom
+# audio* Audio devices
# bpf* Berkeley Packet Filter
+# bpp* Parallel port
+# bppmag[mno] Magma parallel port
+# bpp[jkl] "spif" parallel port
+# fd fd/* nodes for fdescfs
+# lkm Loadable kernel modules interface
+# openprom
+# magma* Magma multiport cards
# pf* Packet Filter
-# lkm loadable kernel modules interface
-# tun* network tunnel driver
-# *random inkernel random data source
-# magma* magma card (makes 16 tty and 2 bpp)
-# bppmag[mno] magma parallel port device
-# spif* spif card (makes 8 tty and 1 bpp)
-# bpp[jkl] spif parallel port device
-# bpp* parallel port devices
-# xfs* XFS filesystem devices
# raid* RAIDframe disk devices
-# fd makes fd/* for the fdescfs
+# *random In-kernel random data source
+# spif* "spif" multiport cards
# ses* SES/SAF-TE SCSI devices
-# systrace* system call tracing device
+# ss* SCSI scanners
+# systrace* System call tracing device
+# tun* Network tunnel driver
+# uk* SCSI unknown devices
+# xfs* XFS filesystem node
PATH=/sbin:/usr/sbin:/bin:/usr/bin
T=$0
@@ -228,26 +229,32 @@ std)
M openprom c 70 0 640 kmem
;;
-systrace)
- M systrace c 50 0 644
+xfs*)
+ M xfs$U c 51 $U 600
;;
-ses*)
- M ses$U c 124 $U 640 operator
+uk*)
+ M uk$U c 120 $U 640 operator
;;
-fd)
- RMlist="mkdir -p fd;$RMlist" n=0
- while [ $n -lt 64 ];do M fd/$n c 24 $n;n=$(($n+1));done
- MKlist="$MKlist;chmod 555 fd"
+tun*)
+ M tun$U c 111 $U 600
;;
-xfs*)
- M xfs$U c 51 $U 600
+systrace)
+ M systrace c 50 0 644
;;
-bpp*)
- M bpp$U c 104 $U 600
+ss*)
+ M ss$U c 121 $(($U*16)) 640 operator
+ M nss$U c 121 $(($(($U*16))+1)) 640 operator
+ M enss$U c 121 $(($(($U*16))+3)) 640 operator
+ RMlist="$RMlist scan$U"
+ MKlist="$MKlist;umask 77;ln -s ss$U scan$U"
+ ;;
+
+ses*)
+ M ses$U c 124 $U 640 operator
;;
spif*)
@@ -268,6 +275,19 @@ spif*)
M bpp${nam}0 c 103 $(($offset+0)) 600
;;
+*random)
+ n=0
+ for pre in " " s u p a
+ do
+ M ${pre}random c 119 $n 644
+ n=$(($n+1))
+ done
+ ;;
+
+pf*)
+ M pf c 59 0 600
+ ;;
+
magma*)
case $U in
0) offset=0 nam=m;;
@@ -287,33 +307,26 @@ magma*)
M bpp${nam}1 c 101 $(($offset+1)) 600
;;
-*random)
- n=0
- for pre in " " s u p a
- do
- M ${pre}random c 119 $n 644
- n=$(($n+1))
- done
- ;;
-
-tun*)
- M tun$U c 111 $U 600
+openprom)
+ M openprom c 70 0
;;
lkm)
M lkm c 112 0 640 _lkm
;;
-pf*)
- M pf c 59 0 600
+fd)
+ RMlist="mkdir -p fd;$RMlist" n=0
+ while [ $n -lt 64 ];do M fd/$n c 24 $n;n=$(($n+1));done
+ MKlist="$MKlist;chmod 555 fd"
;;
-bpf*)
- M bpf$U c 105 $U 600
+bpp*)
+ M bpp$U c 104 $U 600
;;
-openprom)
- M openprom c 70 0
+bpf*)
+ M bpf$U c 105 $U 600
;;
audio*)
@@ -327,34 +340,6 @@ audio*)
MKlist="$MKlist;[ -e audioctl ] || ln -s audioctl$U audioctl"
;;
-cua[a-z])
- u=${i#cua*}
- case $u in
- a) n=0 ;;
- b) n=1 ;;
- c) n=2 ;;
- d) n=3 ;;
- e) n=4;;
- f) n=5;;
- *) echo unknown cua device $i ;;
- esac
- M cua$u c 12 $(($n+128)) 660 dialer uucp
- ;;
-
-tty[a-z])
- u=${i#tty*}
- case $u in
- a) n=0 ;;
- b) n=1 ;;
- c) n=2 ;;
- d) n=3 ;;
- e) n=4;;
- f) n=5;;
- *) echo unknown tty device $i ;;
- esac
- M tty$u c 12 $n 660 dialer uucp
- ;;
-
wsmouse*)
M wsmouse$U c 80 $U 600
;;
@@ -393,10 +378,6 @@ wscons)
R ttyC4 ttyC5 ttyC6 ttyC7 ttyC8 ttyC9 ttyCa ttyCb
;;
-ptm)
- M ptm c 125 0 666
- ;;
-
pty*)
if [ $U -gt 15 ]; then
echo bad unit for pty in: $i
@@ -415,11 +396,61 @@ pty*)
done
;;
+ptm)
+ M ptm c 125 0 666
+ ;;
+
+tty[a-z])
+ u=${i#tty*}
+ case $u in
+ a) n=0 ;;
+ b) n=1 ;;
+ c) n=2 ;;
+ d) n=3 ;;
+ e) n=4;;
+ f) n=5;;
+ *) echo unknown tty device $i ;;
+ esac
+ M tty$u c 12 $n 660 dialer uucp
+ ;;
+
+cua[a-z])
+ u=${i#cua*}
+ case $u in
+ a) n=0 ;;
+ b) n=1 ;;
+ c) n=2 ;;
+ d) n=3 ;;
+ e) n=4;;
+ f) n=5;;
+ *) echo unknown cua device $i ;;
+ esac
+ M cua$u c 12 $(($n+128)) 660 dialer uucp
+ ;;
+
+st*)
+ n=$(($U*16))
+ for pre in " " n e en
+ do
+ M ${pre}st$U b 11 $n 660 operator
+ M ${pre}rst$U c 18 $n 660 operator
+ n=$(($n+1))
+ done
+ ;;
+
+ch*)
+ M ch$U c 19 $U 660 operator
+ ;;
+
vnd*)
dodisk vnd $U 8 110 $U 0
dodisk svnd $U 8 110 $U 2048
;;
+rd*)
+ dodisk2 rd $U 17 106 $U 0
+ ;;
+
fd*)
typnam=$U${i#fd[01]*}
case $typnam in
@@ -448,40 +479,10 @@ fd*)
M r${nam}c c $chr $(($n+2)) 640 operator
;;
-rd*)
- dodisk2 rd $U 17 106 $U 0
- ;;
-
-ss*)
- M ss$U c 121 $(($U*16)) 640 operator
- M nss$U c 121 $(($(($U*16))+1)) 640 operator
- M enss$U c 121 $(($(($U*16))+3)) 640 operator
- RMlist="$RMlist scan$U"
- MKlist="$MKlist;umask 77;ln -s ss$U scan$U"
- ;;
-
-uk*)
- M uk$U c 120 $U 640 operator
- ;;
-
-ch*)
- M ch$U c 19 $U 660 operator
- ;;
-
cd*)
dodisk2 cd $U 18 58 $U 0
;;
-st*)
- n=$(($U*16))
- for pre in " " n e en
- do
- M ${pre}st$U b 11 $n 660 operator
- M ${pre}rst$U c 18 $n 660 operator
- n=$(($n+1))
- done
- ;;
-
local)
test -s $T.local && sh $T.local
;;
@@ -492,8 +493,8 @@ all)
R tun3 bpf0 bpf1 bpf2 bpf3 bpf4 bpf5 bpf6 bpf7 bpf8 bpf9 pty0
R pty1 pty2 fd1 fd1B fd1C fd1D fd1E fd1F fd1G fd1H fd0 fd0B
R fd0C fd0D fd0E fd0F fd0G fd0H xfs0 ss0 ss1 ch0 ses0 cuaa
- R cuab cuac cuad ttya ttyb ttyc ttyd ptm wscons audio0 uk0
- R random lkm pf systrace xd0 xd1 xd2 xd3 raid0 raid1 raid2
+ R cuab cuac cuad ttya ttyb ttyc ttyd ptm local wscons audio0
+ R uk0 random lkm pf systrace xd0 xd1 xd2 xd3 raid0 raid1 raid2
R raid3 std st0 st1 fd
;;
diff --git a/etc/etc.sparc64/MAKEDEV b/etc/etc.sparc64/MAKEDEV
index e5e45edb10a..9950e1d773b 100644
--- a/etc/etc.sparc64/MAKEDEV
+++ b/etc/etc.sparc64/MAKEDEV
@@ -3,9 +3,10 @@
# THIS FILE AUTOMATICALLY GENERATED. DO NOT EDIT.
# generated from:
#
-# OpenBSD: etc.sparc64/MAKEDEV.md,v 1.30 2004/02/14 17:24:31 todd Exp
-# OpenBSD: MAKEDEV.mi,v 1.71 2004/02/14 17:24:30 todd Exp
-# OpenBSD: MAKEDEV.sub,v 1.10 2004/02/14 17:24:31 todd Exp
+# OpenBSD: etc.sparc64/MAKEDEV.md,v 1.31 2004/02/16 19:01:02 miod Exp
+# OpenBSD: MAKEDEV.common,v 1.1 2004/02/16 18:58:54 miod Exp
+# OpenBSD: MAKEDEV.mi,v 1.72 2004/02/16 18:58:53 miod Exp
+# OpenBSD: MAKEDEV.sub,v 1.11 2004/02/16 18:58:53 miod Exp
#
#
# Copyright (c) 2001-2004 Todd T. Fries <todd@OpenBSD.org>
@@ -25,72 +26,71 @@
# Device "make" file. Valid arguments:
# all makes all known devices, including local devices.
# Tries to make the ``standard'' number of each type.
-# ramdisk devices to be put on ramdisk-based media
-# std standard devices
-# local configuration specific devices
-# Tapes:
-# st* SCSI tapes
-# ch* SCSI media changer
+# ramdisk Ramdisk kernel devices
+# std Standard devices
+# local Configuration specific devices
# Disks:
-# wd* "winchester" disk drives (ST506, IDE, ESDI, RLL, ...)
-# fd* Floppy disk drives (3 1/2", 5 1/4")
-# sd* SCSI disks
+# ccd* Concatenated disk devices
# cd* SCSI cdrom drives
-# vnd* "file" pseudo-disks
-# rd* "rd" pseudo-disks
-# ccd* concatenated disk devices
+# fd* Floppy disk drives (3 1/2", 5 1/4")
# raid* RAIDframe disk devices
-# Console ports:
-# ttyC0 wscons screen 0
-# ttyC-F* wscons virtual consoles
-# wskbd* wscons keyboards
-# wsmux wscons keyboard/mouse mux devices
-# console PROM console
-# Pointing devices:
-# mouse mouse (provides events, for X11)
-# wsmouse* wscons mice
+# rd* "rd" pseudo-disks
+# sd* SCSI disks
+# vnd* "file" pseudo-disk devices
+# wd* "winchester" disk drives (ST506, IDE, ESDI, RLL, ...)
+# Tapes:
+# ch* SCSI media changers
+# st* SCSI tape drives
# Terminal ports:
-# tty[a-z]* Zilog 8530 Serial Port
-# cua[a-z]* Zilog 8530 Serial Port
# tty[0-7][0-9a-f] NS16x50 serial ports
+# cua[a-z]* Zilog 8530 Serial Port
+# tty[a-z]* Zilog 8530 Serial Port
# ttyh* Sab82532 serial devices
# Pseudo terminals:
-# tty* set of 16 slave pseudo terminals
-# pty* set of 16 master pseudo terminals
# ptm pty master device
+# pty* Set of 16 master pseudo terminals
+# tty* Set of 16 slave pseudo terminals
+# Console ports:
+# console PROM console
+# ttyC0 Minimal wscons devices
+# ttyC-F* wscons display devices
+# wskbd* wscons keyboards
+# wsmux wscons keyboard/mouse mux devices
+# Pointing devices:
+# wsmouse* wscons mice
# Printers:
+# lpa* Polled printer port
# lpt* IEEE 1284 centronics printer
-# lpa* interruptless lp
# USB devices:
-# usb* Bus control devices used by usbd for attach/detach
+# usbs All USB devices
+# ttyU* USB serial ports
+# ugen* Generic USB devices
# uhid* Generic HID devices
-# ugen* Generic device
# ulpt* Printer devices
# urio* Diamond Multimedia Rio 500
-# ttyU* Serial ports
+# usb* Bus control devices used by usbd for attach/detach
# uscanner* Scanners
# Special purpose devices:
-# usbs make USB devices
-# ses* SES/SAF-TE SCSI devices
-# fd makes fd/* for the fdescfs
-# xfs* XFS filesystem devices
-# ss* SCSI scanners
-# uk* SCSI Unknown device
-# audio* audio device
-# pf* Packet Filter
+# audio* Audio devices
# bpf* Berkeley Packet Filter
-# tun* network tunnel driver
-# lkm loadable kernel modules interface
-# *random inkernel random data source
-# magma* magma card (makes 16 tty and 2 bpp)
-# bppmag[mno] magma parallel port device
-# bpp* parallel port devices
-# spif* spif card (makes 8 tty and 1 bpp)
-# bpp[jkl] spif parallel port device
-# crypto hardware crypto access driver
+# bpp* Parallel port
+# bppmag[mno] Magma parallel port
+# bpp[jkl] "spif" parallel port
+# crypto Hardware crypto access driver
+# fd fd/* nodes for fdescfs
+# lkm Loadable kernel modules interface
+# magma* Magma multiport cards
# pci PCI bus device
-# uperf performance counters
-# systrace* system call tracing device
+# pf* Packet Filter
+# *random In-kernel random data source
+# ses* SES/SAF-TE SCSI devices
+# spif* "spif" multiport cards
+# ss* SCSI scanners
+# systrace* System call tracing device
+# tun* Network tunnel driver
+# uk* SCSI unknown devices
+# uperf Performance counters
+# xfs* XFS filesystem node
PATH=/sbin:/usr/sbin:/bin:/usr/bin
T=$0
@@ -240,34 +240,35 @@ std)
M ksyms c 76 0 640 kmem
M drum c 7 0 640 kmem
M klog c 16 0 600
- M mouse c 13 0 666
- M fb c 22 0 666
M openprom c 70 0 640 kmem
;;
-mouse*)
- name=${i##mouse-}
- if [ ! -c $name ]; then
- $0 $name # make the appropriate device
- fi
- RMlist="$RMlist mouse"
- MKlist="$MKlist;ln -s $name mouse"
- ;;
-
-systrace)
- M systrace c 50 0 644
+xfs*)
+ M xfs$U c 51 $U 600
;;
uperf)
M uperf c 25 0 664
;;
-pci)
- M pci c 52 0 600
+uk*)
+ M uk$U c 60 $U 640 operator
;;
-crypto)
- M crypto c 75 0
+tun*)
+ M tun$U c 111 $U 600
+ ;;
+
+systrace)
+ M systrace c 50 0 644
+ ;;
+
+ss*)
+ M ss$U c 59 $(($U*16)) 640 operator
+ M nss$U c 59 $(($(($U*16))+1)) 640 operator
+ M enss$U c 59 $(($(($U*16))+3)) 640 operator
+ RMlist="$RMlist scan$U"
+ MKlist="$MKlist;umask 77;ln -s ss$U scan$U"
;;
spif*)
@@ -288,8 +289,25 @@ spif*)
M bpp${nam}0 c 109 $(($offset+0)) 600
;;
-bpp*)
- M bpp$U c 107 $U 600
+ses*)
+ M ses$U c 4 $U 640 operator
+ ;;
+
+*random)
+ n=0
+ for pre in " " s u p a
+ do
+ M ${pre}random c 119 $n 644
+ n=$(($n+1))
+ done
+ ;;
+
+pf*)
+ M pf c 73 0 600
+ ;;
+
+pci)
+ M pci c 52 0 600
;;
magma*)
@@ -311,29 +329,26 @@ magma*)
M bpp${nam}1 c 72 $(($offset+1)) 600
;;
-*random)
- n=0
- for pre in " " s u p a
- do
- M ${pre}random c 119 $n 644
- n=$(($n+1))
- done
- ;;
-
lkm)
M lkm c 112 0 640 _lkm
;;
-tun*)
- M tun$U c 111 $U 600
+fd)
+ RMlist="mkdir -p fd;$RMlist" n=0
+ while [ $n -lt 64 ];do M fd/$n c 24 $n;n=$(($n+1));done
+ MKlist="$MKlist;chmod 555 fd"
;;
-bpf*)
- M bpf$U c 105 $U 600
+crypto)
+ M crypto c 75 0
;;
-pf*)
- M pf c 73 0 600
+bpp*)
+ M bpp$U c 107 $U 600
+ ;;
+
+bpf*)
+ M bpf$U c 105 $U 600
;;
audio*)
@@ -347,45 +362,13 @@ audio*)
MKlist="$MKlist;[ -e audioctl ] || ln -s audioctl$U audioctl"
;;
-uk*)
- M uk$U c 60 $U 640 operator
- ;;
-
-ss*)
- M ss$U c 59 $(($U*16)) 640 operator
- M nss$U c 59 $(($(($U*16))+1)) 640 operator
- M enss$U c 59 $(($(($U*16))+3)) 640 operator
- RMlist="$RMlist scan$U"
- MKlist="$MKlist;umask 77;ln -s ss$U scan$U"
- ;;
-
-xfs*)
- M xfs$U c 51 $U 600
- ;;
-
-fd)
- RMlist="mkdir -p fd;$RMlist" n=0
- while [ $n -lt 64 ];do M fd/$n c 24 $n;n=$(($n+1));done
- MKlist="$MKlist;chmod 555 fd"
- ;;
-
-ses*)
- M ses$U c 4 $U 640 operator
- ;;
-
-usbs)
- R ttyU0 ttyU1 ugen0 ugen1 ulpt0 ulpt1 uhid0 uhid1 uhid2 uhid3
- R uscanner0 urio0 usb0 usb1
- ;;
-
uscanner*)
M uscanner$U c 96 $U 660
;;
-ttyU[0-9a-zA-Z])
- U=${i#ttyU*}
- o=$(alph2d $U)
- M ttyU$U c 95 $o 660 dialer uucp
+usb*)
+ [ "$i" = "usb" ] && u= || u=$U
+ M usb$u c 90 $U 660
;;
urio*)
@@ -396,6 +379,10 @@ ulpt*)
M ulpt$U c 93 $U 660
;;
+uhid*)
+ M uhid$U c 91 $U 660
+ ;;
+
ugen*)
n=$(($U*16))
for j in 00 01 02 03 04 05 06 07 08 09 10 11 12 13 14 15
@@ -404,13 +391,15 @@ ugen*)
done
;;
-uhid*)
- M uhid$U c 91 $U 660
+ttyU[0-9a-zA-Z])
+ U=${i#ttyU*}
+ o=$(alph2d $U)
+ M ttyU$U c 95 $o 660 dialer uucp
;;
-usb*)
- [ "$i" = "usb" ] && u= || u=$U
- M usb$u c 90 $U 660
+usbs)
+ R ttyU0 ttyU1 ugen0 ugen1 ulpt0 ulpt1 uhid0 uhid1 uhid2 uhid3
+ R uscanner0 urio0 usb0 usb1
;;
lpt*|lpa*)
@@ -421,8 +410,42 @@ lpt*|lpa*)
M $n$U c 37 $(($U+$f)) 600
;;
-ptm)
- M ptm c 123 0 666
+wsmouse*)
+ M wsmouse$U c 80 $U 600
+ ;;
+
+wsmux|wsmouse|wskbd)
+ M wsmouse c 81 0 600
+ M wskbd c 81 1 600
+ ;;
+
+wskbd*)
+ M wskbd$U c 79 $U 600
+ ;;
+
+tty[C-F]*)
+ U=${i##tty[C-F]}
+ case $i in
+ ttyC*) n=C m=0;;
+ ttyD*) n=D m=256;;
+ ttyE*) n=E m=512;;
+ ttyF*) n=F m=768;;
+ esac
+ case $U in
+ [0-9a-f]) M tty$n$U c 78 $(( 16#$U + $m )) 600;;
+ cfg) M tty${n}cfg c 78 $((255+$m)) 600;;
+ *) echo bad unit $U for $i; exit 1;;
+ esac
+ ;;
+
+wscons)
+ R wsmouse0 wsmouse1 wsmouse2 wsmouse3 wskbd0 wskbd1 wskbd2
+ R wskbd3 wsmux ttyFcfg ttyF0 ttyF1 ttyF2 ttyF3 ttyF4 ttyF5
+ R ttyF6 ttyF7 ttyF8 ttyF9 ttyFa ttyFb ttyEcfg ttyE0 ttyE1
+ R ttyE2 ttyE3 ttyE4 ttyE5 ttyE6 ttyE7 ttyE8 ttyE9 ttyEa ttyEb
+ R ttyDcfg ttyD0 ttyD1 ttyD2 ttyD3 ttyD4 ttyD5 ttyD6 ttyD7
+ R ttyD8 ttyD9 ttyDa ttyDb ttyCcfg ttyC0 ttyC1 ttyC2 ttyC3
+ R ttyC4 ttyC5 ttyC6 ttyC7 ttyC8 ttyC9 ttyCa ttyCb
;;
pty*)
@@ -443,81 +466,57 @@ pty*)
done
;;
-ttyh*)
- M ttyh$U c 77 $U 660 dialer uucp
+ptm)
+ M ptm c 123 0 666
;;
-tty[0-7][0-9a-f])
- U=${i#tty*}
- o=$(h2d $U)
- M tty$U c 36 $o 660 dialer uucp
- M cua$U c 36 $(($o+128)) 660 dialer uucp
+ttyh*)
+ M ttyh$U c 77 $U 660 dialer uucp
;;
-cua[a-z])
- u=${i#cua*}
+tty[a-z])
+ u=${i#tty*}
case $u in
a) n=0 ;;
b) n=1 ;;
c) n=2 ;;
d) n=3 ;;
- *) echo unknown cua device $i ;;
+ *) echo unknown tty device $i ;;
esac
- M cua$u c 12 $(($n+128)) 660 dialer uucp
+ M tty$u c 12 $n 660 dialer uucp
;;
-tty[a-z])
- u=${i#tty*}
+cua[a-z])
+ u=${i#cua*}
case $u in
a) n=0 ;;
b) n=1 ;;
c) n=2 ;;
d) n=3 ;;
- *) echo unknown tty device $i ;;
+ *) echo unknown cua device $i ;;
esac
- M tty$u c 12 $n 660 dialer uucp
- ;;
-
-wsmouse*)
- M wsmouse$U c 80 $U 600
- ;;
-
-wsmux|wsmouse|wskbd)
- M wsmouse c 81 0 600
- M wskbd c 81 1 600
- ;;
-
-wskbd*)
- M wskbd$U c 79 $U 600
+ M cua$u c 12 $(($n+128)) 660 dialer uucp
;;
-tty[C-F]*)
- U=${i##tty[C-F]}
- case $i in
- ttyC*) n=C m=0;;
- ttyD*) n=D m=256;;
- ttyE*) n=E m=512;;
- ttyF*) n=F m=768;;
- esac
- case $U in
- [0-9a-f]) M tty$n$U c 78 $(( 16#$U + $m )) 600;;
- cfg) M tty${n}cfg c 78 $((255+$m)) 600;;
- *) echo bad unit $U for $i; exit 1;;
- esac
+tty[0-7][0-9a-f])
+ U=${i#tty*}
+ o=$(h2d $U)
+ M tty$U c 36 $o 660 dialer uucp
+ M cua$U c 36 $(($o+128)) 660 dialer uucp
;;
-wscons)
- R wsmouse0 wsmouse1 wsmouse2 wsmouse3 wskbd0 wskbd1 wskbd2
- R wskbd3 wsmux ttyFcfg ttyF0 ttyF1 ttyF2 ttyF3 ttyF4 ttyF5
- R ttyF6 ttyF7 ttyF8 ttyF9 ttyFa ttyFb ttyEcfg ttyE0 ttyE1
- R ttyE2 ttyE3 ttyE4 ttyE5 ttyE6 ttyE7 ttyE8 ttyE9 ttyEa ttyEb
- R ttyDcfg ttyD0 ttyD1 ttyD2 ttyD3 ttyD4 ttyD5 ttyD6 ttyD7
- R ttyD8 ttyD9 ttyDa ttyDb ttyCcfg ttyC0 ttyC1 ttyC2 ttyC3
- R ttyC4 ttyC5 ttyC6 ttyC7 ttyC8 ttyC9 ttyCa ttyCb
+st*)
+ n=$(($U*16))
+ for pre in " " n e en
+ do
+ M ${pre}st$U b 11 $n 660 operator
+ M ${pre}rst$U c 18 $n 660 operator
+ n=$(($n+1))
+ done
;;
-rd*)
- dodisk2 rd $U 5 61 $U 0
+ch*)
+ M ch$U c 19 $U 660 operator
;;
vnd*)
@@ -525,8 +524,8 @@ vnd*)
dodisk svnd $U 8 110 $U 2048
;;
-cd*)
- dodisk2 cd $U 18 58 $U 0
+rd*)
+ dodisk2 rd $U 5 61 $U 0
;;
fd*)
@@ -557,18 +556,8 @@ fd*)
M r${nam}c c $chr $(($n+2)) 640 operator
;;
-ch*)
- M ch$U c 19 $U 660 operator
- ;;
-
-st*)
- n=$(($U*16))
- for pre in " " n e en
- do
- M ${pre}st$U b 11 $n 660 operator
- M ${pre}rst$U c 18 $n 660 operator
- n=$(($n+1))
- done
+cd*)
+ dodisk2 cd $U 18 58 $U 0
;;
local)
@@ -581,10 +570,10 @@ all)
R bpf0 bpf1 bpf2 bpf3 bpf4 bpf5 bpf6 bpf7 bpf8 bpf9 pty0 pty1
R pty2 fd1 fd1B fd1C fd1D fd1E fd1F fd1G fd1H fd0 fd0B fd0C
R fd0D fd0E fd0F fd0G fd0H xfs0 ss0 ss1 ch0 ses0 ccd0 ccd1
- R ccd2 ccd3 ptm wscons pci usbs audio0 uk0 random lpa0 lpa1
- R lpa2 lpt0 lpt1 lpt2 lkm tty00 tty01 tty02 tty03 ttyh0 ttyh1
- R crypto pf systrace wd0 wd1 wd2 wd3 raid0 raid1 raid2 raid3
- R std st0 st1 fd
+ R ccd2 ccd3 ptm local wscons pci usbs audio0 uk0 random lpa0
+ R lpa1 lpa2 lpt0 lpt1 lpt2 lkm tty00 tty01 tty02 tty03 ttyh0
+ R ttyh1 crypto pf systrace wd0 wd1 wd2 wd3 raid0 raid1 raid2
+ R raid3 std st0 st1 fd
;;
wd*|sd*|raid*|ccd*)
diff --git a/etc/etc.vax/MAKEDEV b/etc/etc.vax/MAKEDEV
index e12e7f593d6..b673aa505a8 100644
--- a/etc/etc.vax/MAKEDEV
+++ b/etc/etc.vax/MAKEDEV
@@ -3,9 +3,10 @@
# THIS FILE AUTOMATICALLY GENERATED. DO NOT EDIT.
# generated from:
#
-# OpenBSD: etc.vax/MAKEDEV.md,v 1.15 2004/02/14 17:24:31 todd Exp
-# OpenBSD: MAKEDEV.mi,v 1.71 2004/02/14 17:24:30 todd Exp
-# OpenBSD: MAKEDEV.sub,v 1.10 2004/02/14 17:24:31 todd Exp
+# OpenBSD: etc.vax/MAKEDEV.md,v 1.16 2004/02/16 19:01:02 miod Exp
+# OpenBSD: MAKEDEV.common,v 1.1 2004/02/16 18:58:54 miod Exp
+# OpenBSD: MAKEDEV.mi,v 1.72 2004/02/16 18:58:53 miod Exp
+# OpenBSD: MAKEDEV.sub,v 1.11 2004/02/16 18:58:53 miod Exp
#
#
# Copyright (c) 2001-2004 Todd T. Fries <todd@OpenBSD.org>
@@ -22,63 +23,60 @@
# 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.
-# std standard devices
-# local configuration specific devices
-# Tapes:
-# st* SCSI tapes
-# mt* (Magnetic) 9-track reel tape
-# ht* massbus tm03 & tu??
-# tm* unibus tm11 & te10 emulations (e.g. Emulex tc-11)
-# ts* unibus ts11
-# ut* unibus tu45 emulations (e.g.si 9700)
+# ramdisk Ramdisk kernel devices
+# std Standard devices
+# local Configuration specific devices
# Disks:
-# hp* massbuss rm??
-# hk* unibus rk06 and rk07
-# up* other unibus devices (e.g. on Emulex sc-21v controller)
-# ra* MSCP disks (ra??, hd??)
-# rb* 730 idc w/ rb80 and/or rb02
-# rx* MSCP floppy disk (rx33/50/...)
-# rl* unibus r102
-# hd* HP300 HP-IB disks
-# sd* SCSI disks
+# ccd* Concatenated disk devices
# cd* SCSI cdrom drives
-# ch* SCSI media changer
-# ss* SCSI scanners
-# uk* SCSI Unknown device
-# rd* "rd" pseudo-disks
# fd* Floppy disk drives (3 1/2", 5 1/4")
-# vnd* "file" pseudo-disks
-# ccd* concatenated disk devices
-# Pseudo terminals:
-# tty* set of 16 slave pseudo terminals
-# pty* set of 16 master pseudo terminals
-# ptm pty master device
-# Printers:
+# hk* UNIBUS RK06 and RK07 disks
+# hd* HP300 HP-IB disks
+# hp* MASSBUSS disks
+# ra* MSCP disks
+# rb* 730 IDC w/ RB80 and/or RB02
+# rd* "rd" pseudo-disks
+# rl* UNIBUS RL02
+# rx* RX02 floppy disks
+# sd* SCSI disks
+# up* Other UNIBUS devices
+# vnd* "file" pseudo-disk devices
+# Tapes:
+# ch* SCSI media changers
+# ht* MASSBUS TM03 and TU?? devices
+# mt* (Magnetic) 9-track reel tape drives
+# st* SCSI tape drives
+# tm* UNIBUS TM11 and TE10 emulations (e.g. Emulex TC-11)
+# ts* UNIBUS TS11
+# ut* UNIBUS TU45 emulations (e.g. 9700)
# Terminal ports:
-# dhu* unibus dhu11
-# dh* unibus dh11 and emulations (e.g. Able dmax, Emulex cs-11)
-# dmf* unibus dmf32
-# dmz* unibus dmz32
+# dh* UNIBUS DH11 and emulations (e.g. Able dmax, Emulex CS-11)
+# dhu* UNIBUS DHU11
+# dl* UNIBUS DL11
+# dmf* UNIBUS DMF32
+# dmz* UNIBUS DMZ32
+# dz* UNIBUS DZ11 and DZ32
# vt* console
-# dz* unibus dz11 and dz32
-# dl* unibus dl11
+# Pseudo terminals:
+# ptm pty master device
+# pty* Set of 16 master pseudo terminals
+# tty* Set of 16 slave pseudo terminals
# Special purpose devices:
-# openprom
# bpf* Berkeley Packet Filter
+# fd fd/* nodes for fdescfs
+# lkm Loadable kernel modules interface
# pf* Packet Filter
-# lkm loadable kernel modules interface
-# tun* network tunnel driver
-# *random inkernel random data source
-# magma* magma card (makes 16 tty and 2 bpp)
-# xfs* XFS filesystem devices
# raid* RAIDframe disk devices
-# fd makes fd/* for the fdescfs
+# *random In-kernel random data source
# ses* SES/SAF-TE SCSI devices
-# systrace* system call tracing device
+# ss* SCSI scanners
+# systrace* System call tracing device
+# tun* Network tunnel driver
+# uk* SCSI unknown devices
+# xfs* XFS filesystem node
PATH=/sbin:/usr/sbin:/bin:/usr/bin
T=$0
@@ -280,41 +278,32 @@ ht*|tm*|mt*|ts*|ut*)
umask 77
;;
-systrace)
- M systrace c 49 0 644
+xfs*)
+ M xfs$U c 51 $U 600
;;
-ses*)
- M ses$U c 124 $U 640 operator
+uk*)
+ M uk$U c 65 $U 640 operator
;;
-fd)
- RMlist="mkdir -p fd;$RMlist" n=0
- while [ $n -lt 64 ];do M fd/$n c 53 $n;n=$(($n+1));done
- MKlist="$MKlist;chmod 555 fd"
+tun*)
+ M tun$U c 57 $U 600
;;
-xfs*)
- M xfs$U c 51 $U 600
+systrace)
+ M systrace c 49 0 644
;;
-magma*)
- case $U in
- 0) offset=0 nam=m;;
- 1) offset=16 nam=n;;
- 2) offset=32 nam=o;;
- *) echo "bad unit for $i: $U"; exit 127;;
- esac
- offset=$(($U*64))
- n=0
- while [ $n -lt 16 ]
- do
- name=${nam}`hex $n`
- M tty$name c major_mag_c $(($offset+$n)) 660 dialer uucp
- n=$(($n+1))
- done
- M bpp${nam}0 c major_bppmag_c $(($offset+0)) 600
- M bpp${nam}1 c major_bppmag_c $(($offset+1)) 600
+ss*)
+ M ss$U c 64 $(($U*16)) 640 operator
+ M nss$U c 64 $(($(($U*16))+1)) 640 operator
+ M enss$U c 64 $(($(($U*16))+3)) 640 operator
+ RMlist="$RMlist scan$U"
+ MKlist="$MKlist;umask 77;ln -s ss$U scan$U"
+ ;;
+
+ses*)
+ M ses$U c 124 $U 640 operator
;;
*random)
@@ -326,24 +315,44 @@ magma*)
done
;;
-tun*)
- M tun$U c 57 $U 600
+pf*)
+ M pf c 42 0 600
;;
lkm)
M lkm c 28 0 640 _lkm
;;
-pf*)
- M pf c 42 0 600
+fd)
+ RMlist="mkdir -p fd;$RMlist" n=0
+ while [ $n -lt 64 ];do M fd/$n c 53 $n;n=$(($n+1));done
+ MKlist="$MKlist;chmod 555 fd"
;;
bpf*)
M bpf$U c 56 $U 600
;;
-openprom)
- M openprom c 70 0
+pty*)
+ if [ $U -gt 15 ]; then
+ echo bad unit for pty in: $i
+ continue
+ fi
+ set -A tbl p q r s t u v w x y z P Q R S T
+ name=${tbl[$U]}
+ n=0
+ while [ $n -lt 16 ]
+ do
+ nam=$name$(hex $n)
+ off=$(($U*16))
+ M tty$nam c 20 $(($off+$n))
+ M pty$nam c 21 $(($off+$n))
+ n=$(($n+1))
+ done
+ ;;
+
+ptm)
+ M ptm c 75 0 666
;;
dz*)
@@ -419,33 +428,29 @@ dl*)
fi
;;
-ptm)
- M ptm c 75 0 666
- ;;
-
-pty*)
- if [ $U -gt 15 ]; then
- echo bad unit for pty in: $i
- continue
- fi
- set -A tbl p q r s t u v w x y z P Q R S T
- name=${tbl[$U]}
- n=0
- while [ $n -lt 16 ]
+st*)
+ n=$(($U*16))
+ for pre in " " n e en
do
- nam=$name$(hex $n)
- off=$(($U*16))
- M tty$nam c 20 $(($off+$n))
- M pty$nam c 21 $(($off+$n))
+ M ${pre}st$U b 21 $n 660 operator
+ M ${pre}rst$U c 60 $n 660 operator
n=$(($n+1))
done
;;
+ch*)
+ M ch$U c 63 $U 660 operator
+ ;;
+
vnd*)
dodisk vnd $U 18 55 $U 0
dodisk svnd $U 18 55 $U 2048
;;
+rd*)
+ dodisk2 rd $U 23 62 $U 0
+ ;;
+
fd*)
typnam=$U${i#fd[01]*}
case $typnam in
@@ -474,40 +479,10 @@ fd*)
M r${nam}c c $chr $(($n+2)) 640 operator
;;
-rd*)
- dodisk2 rd $U 23 62 $U 0
- ;;
-
-uk*)
- M uk$U c 65 $U 640 operator
- ;;
-
-ss*)
- M ss$U c 64 $(($U*16)) 640 operator
- M nss$U c 64 $(($(($U*16))+1)) 640 operator
- M enss$U c 64 $(($(($U*16))+3)) 640 operator
- RMlist="$RMlist scan$U"
- MKlist="$MKlist;umask 77;ln -s ss$U scan$U"
- ;;
-
-ch*)
- M ch$U c 63 $U 660 operator
- ;;
-
cd*)
dodisk2 cd $U 22 61 $U 0
;;
-st*)
- n=$(($U*16))
- for pre in " " n e en
- do
- M ${pre}st$U b 21 $n 660 operator
- M ${pre}rst$U c 60 $n 660 operator
- n=$(($n+1))
- done
- ;;
-
local)
test -s $T.local && sh $T.local
;;
@@ -515,9 +490,9 @@ local)
all)
R vt0 dl0 dz0 dhu0 ts0 ts1 mt0 mt1 hd0 hd1 hd2 ccd0 vnd0 sd0
R sd1 sd2 sd3 cd0 tun0 tun1 bpf0 bpf1 bpf2 bpf3 bpf4 bpf5 bpf6
- R bpf7 pty0 pty1 ss0 ptm uk0 random lkm pf systrace rx0 rx1
- R ra0 ra1 ra2 ra3 hp0 hp1 hp2 hp3 raid0 raid1 raid2 raid3 std
- R st0 st1 fd
+ R bpf7 pty0 pty1 ss0 ptm local uk0 random lkm pf systrace rx0
+ R rx1 ra0 ra1 ra2 ra3 hp0 hp1 hp2 hp3 raid0 raid1 raid2 raid3
+ R std st0 st1 fd
;;
up*|sd*|rx*|rl*|rb*|raid*|ra*|hp*|hk*|hd*|ccd*)
diff --git a/share/man/man8/man8.alpha/MAKEDEV.8 b/share/man/man8/man8.alpha/MAKEDEV.8
index 63aa3b6c3d1..0587345d252 100644
--- a/share/man/man8/man8.alpha/MAKEDEV.8
+++ b/share/man/man8/man8.alpha/MAKEDEV.8
@@ -1,30 +1,29 @@
-.\" $OpenBSD: MAKEDEV.8,v 1.6 2004/01/13 19:27:19 jmc Exp $
+.\" $OpenBSD: MAKEDEV.8,v 1.7 2004/02/16 19:05:06 miod Exp $
.\"
-.\" Copyright (c) 2001 Miodrag Vallat.
-.\" All rights reserved.
+.\" THIS FILE AUTOMATICALLY GENERATED. DO NOT EDIT.
+.\" generated from:
.\"
-.\" Redistribution and use in source and binary forms, with or without
-.\" modification, are permitted provided that the following conditions
-.\" are met:
-.\" 1. Redistributions of source code must retain the above copyright
-.\" notice, this list of conditions and the following disclaimer.
-.\" 2. Redistributions in binary form must reproduce the above copyright
-.\" notice, this list of conditions and the following disclaimer in the
-.\" documentation and/or other materials provided with the distribution.
+.\" OpenBSD: etc.alpha/MAKEDEV.md,v 1.21 2004/02/16 19:00:57 miod Exp
+.\" OpenBSD: MAKEDEV.common,v 1.1 2004/02/16 18:58:54 miod Exp
+.\" OpenBSD: MAKEDEV.man,v 1.1 2004/02/16 19:03:30 miod Exp
+.\" OpenBSD: MAKEDEV.mansub,v 1.1 2004/02/16 19:03:30 miod Exp
.\"
-.\" THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
-.\" IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
-.\" OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
-.\" IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
-.\" INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
-.\" NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-.\" DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-.\" THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-.\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
-.\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+.\" Copyright (c) 2004, Miodrag Vallat
+.\" Copyright (c) 2001-2004 Todd T. Fries <todd@OpenBSD.org>
.\"
+.\" Permission to use, copy, modify, and distribute this software for any
+.\" purpose with or without fee is hereby granted, provided that the above
+.\" copyright notice and this permission notice appear in all copies.
.\"
-.Dd October 7, 2001
+.\" THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+.\" WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+.\" MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+.\" ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+.\" WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+.\" ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+.\" OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+.\"
+.Dd February 16, 2004
.Dt MAKEDEV 8 alpha
.Os
.Sh NAME
@@ -36,87 +35,173 @@
.Op Ar ...
.Sh DESCRIPTION
The shell script
-.Nm MAKEDEV ,
+.Nm ,
found in the
.Pa /dev
-directory, is used to create the common special files.
+directory, is used to create various special files.
See
.Xr intro 4
for a more complete discussion of special files.
.Pp
-.Nm MAKEDEV
+.Nm
takes any number of device names as arguments, where the names are
-the common abbreviation for the device.
-There are four special device names,
-.Ar all ,
-.Ar std ,
-.Ar local
-and
-.Ar wscons .
-If
-given,
-.Ar all
-creates device files for all devices on the alpha.
-If units are expected for a device,
-.Nm MAKEDEV
-will supply the standard numbers.
-The
-.Ar std
-argument creates only the standard devices for the alpha.
-Finally
-.Ar local
-is for devices specific to the local site, and executes the shell file
-.Pa MAKEDEV.local .
+the common abbreviation for the device or group of devices.
+.Pp
+Where a device name is followed by a star
+.Sq * ,
+the star must be replaced by a unit number.
+If units are expected for a device but not provided,
+.Nm
+will supply the standard numbers in most cases.
.Pp
-The alpha supports the following devices.
-Where a device name is followed by a hash sign ("#"), the hash sign
-must be replaced by a unit number.
+The alpha supports the following devices:
.Pp
-.Sy Pseudo-names
-.Bl -tag -width wsmouse -compact
+.Pp
+.Sy Special device names
+.Bl -tag -width tenletters -compact
.It Ar all
-All known devices for the alpha.
+Creates special files for all devices on alpha.
+.It Ar ramdisk
+Ramdisk kernel devices.
.It Ar std
-The standard devices (console, drum, klog, kmem, ksyms, mem, null, stderr,
-stdin, stdout, tty, zero).
+Creates the
+.Sq standard
+devices (console, drum, klog, kmem, ksyms, mem, null,
+stderr, stdin, stdout, tty, zero)
+which are absolutely necessary for the system to function properly.
.It Ar local
-Configuration specific devices.
-.It Ar wscons
-All wscons-related devices.
+Creates configuration-specific devices.
.El
.Pp
-.Sy Device-names
-.Bl -tag -width wsmouse -compact
-.It Ar bpf#
-Berkeley packet filters.
-.It Ar cd#
-SCSI CD-ROM drives.
-.It Ar iop#
-I2O devices.
-.It Ar lkm
-Loadable kernel modules.
-.It Ar pty#
-Set of 16 master and slave pseudo terminals.
-.It Ar sd#
-SCSI disk drives.
-.It Ar st#
-SCSI tape drives.
-.It Ar tty#
-Onboard Serial ports.
-.It Ar ttyC#
-Wscons console screens.
-.It Ar ttyU#
-USB serial ports.
-.It Ar vnd#
-.Dq File
+.Sy Disks
+.Bl -tag -width tenletters -compact
+.It Ar ccd*
+Concatenated disk devices.
+.It Ar cd*
+SCSI cdrom drives.
+.It Ar fd*
+Floppy disk drives (3 1/2", 5 1/4").
+.It Ar rd*
+.Dq rd
pseudo-disks.
-.It Ar wskbd
-Keyboard devices for wscons.
-.It Ar wsmouse
-Mouse devices for wscons.
+.It Ar raid*
+RAIDframe disk devices.
+.It Ar sd*
+SCSI disks.
+.It Ar vnd*
+.Dq file
+pseudo-disk devices.
+.It Ar wd*
+.Dq winchester
+disk drives (ST506, IDE, ESDI, RLL, ...).
+.El
+.Pp
+.Sy Tapes
+.Bl -tag -width tenletters -compact
+.It Ar ch*
+SCSI media changers.
+.It Ar st*
+SCSI tape drives.
+.El
+.Pp
+.Sy Terminal ports
+.Bl -tag -width tenletters -compact
+.It Ar tty[0-7][0-9a-f]
+NS16x50 serial ports.
+.It Ar ttyB?
+DEC 3000 ZS8530 ("scc") serial ports.
+.It Ar ttyc*
+Cyclades serial ports.
+.El
+.Pp
+.Sy Pseudo terminals
+.Bl -tag -width tenletters -compact
+.It Ar ptm
+pty master device.
+.It Ar pty*
+Set of 16 master pseudo terminals.
+.It Ar tty*
+Set of 16 slave pseudo terminals.
+.El
+.Pp
+.Sy Console ports
+.Bl -tag -width tenletters -compact
+.It Ar ttyC0
+Minimal wscons devices.
+.It Ar ttyC-F*
+wscons display devices.
+.It Ar wskbd*
+wscons keyboards.
.It Ar wsmux
-Multiplexor devices for wscons.
+wscons keyboard/mouse mux devices.
.El
+.Pp
+.Sy Pointing devices
+.Bl -tag -width tenletters -compact
+.It Ar wsmouse*
+wscons mice.
+.El
+.Pp
+.Sy Printers
+.Bl -tag -width tenletters -compact
+.It Ar lpa*
+Polled printer port.
+.It Ar lpt*
+IEEE 1284 centronics printer.
+.El
+.Pp
+.Sy USB devices
+.Bl -tag -width tenletters -compact
+.It Ar usbs
+All USB devices.
+.It Ar ttyU*
+USB serial ports.
+.It Ar ugen*
+Generic USB devices.
+.It Ar uhid*
+Generic HID devices.
+.It Ar ulpt*
+Printer devices.
+.It Ar usb*
+Bus control devices used by usbd for attach/detach.
+.El
+.Pp
+.Sy Special purpose devices
+.Bl -tag -width tenletters -compact
+.It Ar audio*
+Audio devices.
+.It Ar bpf*
+Berkeley Packet Filter.
+.It Ar fd
+fd/* nodes for fdescfs.
+.It Ar iop*
+I2O controller devices.
+.It Ar lkm
+Loadable kernel modules interface.
+.It Ar mmclock
+Memory mapped clock.
+.It Ar music*
+MIDI devices.
+.It Ar pci
+PCI bus device.
+.It Ar pf*
+Packet Filter.
+.It Ar rmidi*
+Raw MIDI devices.
+.It Ar *random
+In-kernel random data source.
+.It Ar speaker
+PC speaker.
+.It Ar ss*
+SCSI scanners.
+.It Ar systrace*
+System call tracing device.
+.It Ar tun*
+Network tunnel driver.
+.It Ar uk*
+SCSI unknown devices.
+.It Ar xfs*
+XFS filesystem node.
.Sh FILES
.Bl -tag -width /dev -compact
.It Pa /dev
diff --git a/share/man/man8/man8.amd64/MAKEDEV.8 b/share/man/man8/man8.amd64/MAKEDEV.8
new file mode 100644
index 00000000000..e9120950941
--- /dev/null
+++ b/share/man/man8/man8.amd64/MAKEDEV.8
@@ -0,0 +1,241 @@
+.\" $OpenBSD: MAKEDEV.8,v 1.1 2004/02/16 19:05:06 miod Exp $
+.\"
+.\" THIS FILE AUTOMATICALLY GENERATED. DO NOT EDIT.
+.\" generated from:
+.\"
+.\" OpenBSD: etc.amd64/MAKEDEV.md,v 1.4 2004/02/16 19:01:01 miod Exp
+.\" OpenBSD: MAKEDEV.common,v 1.1 2004/02/16 18:58:54 miod Exp
+.\" OpenBSD: MAKEDEV.man,v 1.1 2004/02/16 19:03:30 miod Exp
+.\" OpenBSD: MAKEDEV.mansub,v 1.1 2004/02/16 19:03:30 miod Exp
+.\"
+.\" Copyright (c) 2004, Miodrag Vallat
+.\" Copyright (c) 2001-2004 Todd T. Fries <todd@OpenBSD.org>
+.\"
+.\" Permission to use, copy, modify, and distribute this software for any
+.\" purpose with or without fee is hereby granted, provided that the above
+.\" copyright notice and this permission notice appear in all copies.
+.\"
+.\" THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+.\" WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+.\" MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+.\" ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+.\" WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+.\" ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+.\" OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+.\"
+.Dd February 16, 2004
+.Dt MAKEDEV 8 amd64
+.Os
+.Sh NAME
+.Nm MAKEDEV
+.Nd create system and device special files
+.Sh SYNOPSIS
+.Nm MAKEDEV
+.Ar name
+.Op Ar ...
+.Sh DESCRIPTION
+The shell script
+.Nm ,
+found in the
+.Pa /dev
+directory, is used to create various special files.
+See
+.Xr intro 4
+for a more complete discussion of special files.
+.Pp
+.Nm
+takes any number of device names as arguments, where the names are
+the common abbreviation for the device or group of devices.
+.Pp
+Where a device name is followed by a star
+.Sq * ,
+the star must be replaced by a unit number.
+If units are expected for a device but not provided,
+.Nm
+will supply the standard numbers in most cases.
+.Pp
+The amd64 supports the following devices:
+.Pp
+.Pp
+.Sy Special device names
+.Bl -tag -width tenletters -compact
+.It Ar all
+Creates special files for all devices on amd64.
+.It Ar ramdisk
+Ramdisk kernel devices.
+.It Ar std
+Creates the
+.Sq standard
+devices (console, drum, klog, kmem, ksyms, mem, null,
+stderr, stdin, stdout, tty, zero)
+which are absolutely necessary for the system to function properly.
+.It Ar local
+Creates configuration-specific devices.
+.El
+.Pp
+.Sy Disks
+.Bl -tag -width tenletters -compact
+.It Ar ccd*
+Concatenated disk devices.
+.It Ar cd*
+SCSI cdrom drives.
+.It Ar fd*
+Floppy disk drives (3 1/2", 5 1/4").
+.It Ar mcd*
+Mitsumi cdrom drives.
+.It Ar raid*
+RAIDframe disk devices.
+.It Ar rd*
+.Dq rd
+pseudo-disks.
+.It Ar sd*
+SCSI disks.
+.It Ar vnd*
+.Dq file
+pseudo-disk devices.
+.It Ar wd*
+.Dq winchester
+disk drives (ST506, IDE, ESDI, RLL, ...).
+.El
+.Pp
+.Sy Tapes
+.Bl -tag -width tenletters -compact
+.It Ar ch*
+SCSI media changers.
+.It Ar st*
+SCSI tape drives.
+.It Ar wt*
+Archive/Wangtek QIC-cartridge tape drives.
+.El
+.Pp
+.Sy Terminal ports
+.Bl -tag -width tenletters -compact
+.It Ar tty[0-7][0-9a-f]
+NS16x50 serial ports.
+.It Ar ttyc*
+Cyclades serial ports.
+.El
+.Pp
+.Sy Call units
+.Bl -tag -width tenletters -compact
+.It Ar tun*
+Network tunnel driver.
+.El
+.Pp
+.Sy Pseudo terminals
+.Bl -tag -width tenletters -compact
+.It Ar ptm
+pty master device.
+.It Ar pty*
+Set of 16 master pseudo terminals.
+.It Ar tty*
+Set of 16 slave pseudo terminals.
+.El
+.Pp
+.Sy Console ports
+.Bl -tag -width tenletters -compact
+.It Ar ttyC0
+Minimal wscons devices.
+.It Ar ttyC-F*
+wscons display devices.
+.It Ar wskbd*
+wscons keyboards.
+.It Ar wsmux
+wscons keyboard/mouse mux devices.
+.El
+.Pp
+.Sy Pointing devices
+.Bl -tag -width tenletters -compact
+.It Ar wsmouse*
+wscons mice.
+.El
+.Pp
+.Sy Printers
+.Bl -tag -width tenletters -compact
+.It Ar lpa*
+Polled printer port.
+.It Ar lpt*
+IEEE 1284 centronics printer.
+.El
+.Pp
+.Sy USB devices
+.Bl -tag -width tenletters -compact
+.It Ar usbs
+All USB devices.
+.It Ar ttyU*
+USB serial ports.
+.It Ar ugen*
+Generic USB devices.
+.It Ar uhid*
+Generic HID devices.
+.It Ar ulpt*
+Printer devices.
+.It Ar urio*
+Diamond Multimedia Rio 500.
+.It Ar usb*
+Bus control devices used by usbd for attach/detach.
+.It Ar uscanner*
+Scanners.
+.El
+.Pp
+.Sy Special purpose devices
+.Bl -tag -width tenletters -compact
+.It Ar apm
+Power management device.
+.It Ar audio*
+Audio devices.
+.It Ar bktr*
+Video frame grabbers.
+.It Ar bpf*
+Berkeley Packet Filter.
+.It Ar crypto
+Hardware crypto access driver.
+.It Ar fd
+fd/* nodes for fdescfs.
+.It Ar gpr*
+GPR400 smartcard reader.
+.It Ar iop*
+I2O controller devices.
+.It Ar joy*
+Joystick driver.
+.It Ar lkm
+Loadable kernel modules interface.
+.It Ar music*
+MIDI devices.
+.It Ar pci
+PCI bus device.
+.It Ar pctr*
+PC Performance Tuning Register access device.
+.It Ar pf*
+Packet Filter.
+.It Ar radio*
+FM tuner devices.
+.It Ar rmidi*
+Raw MIDI devices.
+.It Ar *random
+In-kernel random data source.
+.It Ar ses*
+SES/SAF-TE SCSI devices.
+.It Ar speaker
+PC speaker.
+.It Ar ss*
+SCSI scanners.
+.It Ar systrace*
+System call tracing device.
+.It Ar tuner*
+Tuner devices.
+.It Ar uk*
+SCSI unknown devices.
+.It Ar wdt0
+Watchdog timer.
+.It Ar xfs*
+XFS filesystem node.
+.Sh FILES
+.Bl -tag -width /dev -compact
+.It Pa /dev
+The special file directory.
+.El
+.Sh SEE ALSO
+.Xr intro 4 ,
+.Xr config 8 ,
+.Xr mknod 8
diff --git a/share/man/man8/man8.cats/MAKEDEV.8 b/share/man/man8/man8.cats/MAKEDEV.8
new file mode 100644
index 00000000000..dc0cb6cca60
--- /dev/null
+++ b/share/man/man8/man8.cats/MAKEDEV.8
@@ -0,0 +1,199 @@
+.\" $OpenBSD: MAKEDEV.8,v 1.1 2004/02/16 19:05:06 miod Exp $
+.\"
+.\" THIS FILE AUTOMATICALLY GENERATED. DO NOT EDIT.
+.\" generated from:
+.\"
+.\" OpenBSD: etc.cats/MAKEDEV.md,v 1.6 2004/02/16 19:01:01 miod Exp
+.\" OpenBSD: MAKEDEV.common,v 1.1 2004/02/16 18:58:54 miod Exp
+.\" OpenBSD: MAKEDEV.man,v 1.1 2004/02/16 19:03:30 miod Exp
+.\" OpenBSD: MAKEDEV.mansub,v 1.1 2004/02/16 19:03:30 miod Exp
+.\"
+.\" Copyright (c) 2004, Miodrag Vallat
+.\" Copyright (c) 2001-2004 Todd T. Fries <todd@OpenBSD.org>
+.\"
+.\" Permission to use, copy, modify, and distribute this software for any
+.\" purpose with or without fee is hereby granted, provided that the above
+.\" copyright notice and this permission notice appear in all copies.
+.\"
+.\" THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+.\" WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+.\" MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+.\" ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+.\" WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+.\" ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+.\" OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+.\"
+.Dd February 16, 2004
+.Dt MAKEDEV 8 cats
+.Os
+.Sh NAME
+.Nm MAKEDEV
+.Nd create system and device special files
+.Sh SYNOPSIS
+.Nm MAKEDEV
+.Ar name
+.Op Ar ...
+.Sh DESCRIPTION
+The shell script
+.Nm ,
+found in the
+.Pa /dev
+directory, is used to create various special files.
+See
+.Xr intro 4
+for a more complete discussion of special files.
+.Pp
+.Nm
+takes any number of device names as arguments, where the names are
+the common abbreviation for the device or group of devices.
+.Pp
+Where a device name is followed by a star
+.Sq * ,
+the star must be replaced by a unit number.
+If units are expected for a device but not provided,
+.Nm
+will supply the standard numbers in most cases.
+.Pp
+The cats supports the following devices:
+.Pp
+.Pp
+.Sy Special device names
+.Bl -tag -width tenletters -compact
+.It Ar all
+Creates special files for all devices on cats.
+.It Ar ramdisk
+Ramdisk kernel devices.
+.It Ar std
+Creates the
+.Sq standard
+devices (console, drum, klog, kmem, ksyms, mem, null,
+stderr, stdin, stdout, tty, zero)
+which are absolutely necessary for the system to function properly.
+.It Ar local
+Creates configuration-specific devices.
+.El
+.Pp
+.Sy Disks
+.Bl -tag -width tenletters -compact
+.It Ar ccd*
+Concatenated disk devices.
+.It Ar cd*
+SCSI cdrom drives.
+.It Ar ch*
+SCSI media changers.
+.It Ar raid*
+RAIDframe disk devices.
+.It Ar rd*
+.Dq rd
+pseudo-disks.
+.It Ar sd*
+SCSI disks.
+.It Ar vnd*
+.Dq file
+pseudo-disk devices.
+.It Ar wd*
+.Dq winchester
+disk drives (ST506, IDE, ESDI, RLL, ...).
+.El
+.Pp
+.Sy Tapes
+.Bl -tag -width tenletters -compact
+.It Ar st*
+SCSI tape drives.
+.El
+.Pp
+.Sy Terminal ports
+.Bl -tag -width tenletters -compact
+.It Ar tty[0-7][0-9a-f]
+NS16x50 serial ports.
+.El
+.Pp
+.Sy Pseudo terminals
+.Bl -tag -width tenletters -compact
+.It Ar ptm
+pty master device.
+.It Ar pty*
+Set of 16 master pseudo terminals.
+.It Ar tty*
+Set of 16 slave pseudo terminals.
+.El
+.Pp
+.Sy Console ports
+.Bl -tag -width tenletters -compact
+.It Ar ttyC0
+Minimal wscons devices.
+.It Ar ttyC-F*
+wscons display devices.
+.It Ar wskbd*
+wscons keyboards.
+.It Ar wsmouse*
+wscons mice.
+.It Ar wsmux
+wscons keyboard/mouse mux devices.
+.El
+.Pp
+.Sy USB devices
+.Bl -tag -width tenletters -compact
+.It Ar usbs
+All USB devices.
+.It Ar ttyU*
+USB serial ports.
+.It Ar ugen*
+Generic USB devices.
+.It Ar uhid*
+Generic HID devices.
+.It Ar ulpt*
+Printer devices.
+.It Ar urio*
+Diamond Multimedia Rio 500.
+.It Ar usb*
+Bus control devices used by usbd for attach/detach.
+.It Ar uscanner*
+Scanners.
+.El
+.Pp
+.Sy Special purpose devices
+.Bl -tag -width tenletters -compact
+.It Ar audio*
+Audio devices.
+.It Ar bktr*
+Video frame grabbers.
+.It Ar bpf*
+Berkeley Packet Filter.
+.It Ar crypto
+Hardware crypto access driver.
+.It Ar fd
+fd/* nodes for fdescfs.
+.It Ar iop*
+I2O controller devices.
+.It Ar lkm
+Loadable kernel modules interface.
+.It Ar pci
+PCI bus device.
+.It Ar pf*
+Packet Filter.
+.It Ar radio*
+FM tuner devices.
+.It Ar *random
+In-kernel random data source.
+.It Ar tun*
+Network tunnel driver.
+.It Ar uk*
+SCSI unknown devices.
+.It Ar ss*
+SCSI scanners.
+.It Ar systrace*
+System call tracing device.
+.It Ar tuner*
+Tuner devices.
+.It Ar xfs*
+XFS filesystem node.
+.Sh FILES
+.Bl -tag -width /dev -compact
+.It Pa /dev
+The special file directory.
+.El
+.Sh SEE ALSO
+.Xr intro 4 ,
+.Xr config 8 ,
+.Xr mknod 8
diff --git a/share/man/man8/man8.hp300/MAKEDEV.8 b/share/man/man8/man8.hp300/MAKEDEV.8
index aa851618e81..e8a7c4584f6 100644
--- a/share/man/man8/man8.hp300/MAKEDEV.8
+++ b/share/man/man8/man8.hp300/MAKEDEV.8
@@ -1,58 +1,29 @@
-.\" $OpenBSD: MAKEDEV.8,v 1.15 2003/06/06 19:28:06 jmc Exp $
+.\" $OpenBSD: MAKEDEV.8,v 1.16 2004/02/16 19:05:06 miod Exp $
.\"
-.\" Copyright (c) 1997, Jason Downs. All rights reserved.
+.\" THIS FILE AUTOMATICALLY GENERATED. DO NOT EDIT.
+.\" generated from:
.\"
-.\" Redistribution and use in source and binary forms, with or without
-.\" modification, are permitted provided that the following conditions
-.\" are met:
-.\" 1. Redistributions of source code must retain the above copyright
-.\" notice, this list of conditions and the following disclaimer.
-.\" 2. Redistributions in binary form must reproduce the above copyright
-.\" notice, this list of conditions and the following disclaimer in the
-.\" documentation and/or other materials provided with the distribution.
+.\" OpenBSD: etc.hp300/MAKEDEV.md,v 1.17 2004/02/16 19:01:01 miod Exp
+.\" OpenBSD: MAKEDEV.common,v 1.1 2004/02/16 18:58:54 miod Exp
+.\" OpenBSD: MAKEDEV.man,v 1.1 2004/02/16 19:03:30 miod Exp
+.\" OpenBSD: MAKEDEV.mansub,v 1.1 2004/02/16 19:03:30 miod Exp
.\"
-.\" THIS SOFTWARE IS PROVIDED BY THE AUTHOR(S) ``AS IS'' AND ANY EXPRESS
-.\" OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-.\" WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-.\" DISCLAIMED. IN NO EVENT SHALL THE AUTHOR(S) BE LIABLE FOR ANY DIRECT,
-.\" INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-.\" (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
-.\" SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
-.\" CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-.\" LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
-.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
-.\" SUCH DAMAGE.
+.\" Copyright (c) 2004, Miodrag Vallat
+.\" Copyright (c) 2001-2004 Todd T. Fries <todd@OpenBSD.org>
.\"
-.\" Copyright (c) 1991 The Regents of the University of California.
-.\" All rights reserved.
+.\" Permission to use, copy, modify, and distribute this software for any
+.\" purpose with or without fee is hereby granted, provided that the above
+.\" copyright notice and this permission notice appear in all copies.
.\"
-.\" Redistribution and use in source and binary forms, with or without
-.\" modification, are permitted provided that the following conditions
-.\" are met:
-.\" 1. Redistributions of source code must retain the above copyright
-.\" notice, this list of conditions and the following disclaimer.
-.\" 2. Redistributions in binary form must reproduce the above copyright
-.\" notice, this list of conditions and the following disclaimer in the
-.\" documentation and/or other materials provided with the distribution.
-.\" 3. Neither the name of the University nor the names of its contributors
-.\" may be used to endorse or promote products derived from this software
-.\" without specific prior written permission.
+.\" THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+.\" WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+.\" MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+.\" ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+.\" WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+.\" ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+.\" OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
.\"
-.\" THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
-.\" ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-.\" IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-.\" ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
-.\" FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
-.\" DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
-.\" OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
-.\" HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-.\" LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
-.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
-.\" SUCH DAMAGE.
-.\"
-.\" from: @(#)MAKEDEV.8 5.2 (Berkeley) 3/22/91
-.\"
-.Dd July 27, 1997
+.Dd February 16, 2004
.Dt MAKEDEV 8 hp300
.Os
.Sh NAME
@@ -64,100 +35,126 @@
.Op Ar ...
.Sh DESCRIPTION
The shell script
-.Nm MAKEDEV ,
+.Nm ,
found in the
.Pa /dev
-directory, is used to create the common special files.
+directory, is used to create various special files.
See
.Xr intro 4
for a more complete discussion of special files.
.Pp
-.Nm MAKEDEV
+.Nm
takes any number of device names as arguments, where the names are
-the common abbreviation for the device.
-There are three special device names,
-.Ar all ,
-.Ar std
-and
-.Ar local .
-If
-given,
-.Ar all
-creates device files for all devices on the hp300.
-If units are expected for a device,
-.Nm MAKEDEV
-will supply the standard numbers.
-The
-.Ar std
-argument creates only the standard devices for the hp300.
-Finally
-.Ar local
-is for devices specific to the local site, and executes the shell file
-.Pa MAKEDEV.local .
+the common abbreviation for the device or group of devices.
.Pp
-The hp300 supports the following devices.
-Where a device name is followed by a hash sign ("#"), the hash sign
-must be replaced by a unit number.
+Where a device name is followed by a star
+.Sq * ,
+the star must be replaced by a unit number.
+If units are expected for a device but not provided,
+.Nm
+will supply the standard numbers in most cases.
.Pp
-.Sy Pseudo\-names
-.Bl -tag -width indent -compact
+The hp300 supports the following devices:
+.Pp
+.Pp
+.Sy Special device names
+.Bl -tag -width tenletters -compact
.It Ar all
-All known devices for the hp300.
+Creates special files for all devices on hp300.
+.It Ar ramdisk
+Ramdisk kernel devices.
.It Ar std
-The standard devices (console, drum, fd/*, klog, kmem, mem, null, stderr,
-stdin, stdout, tty, zero).
+Creates the
+.Sq standard
+devices (console, drum, klog, kmem, ksyms, mem, null,
+stderr, stdin, stdout, tty, zero)
+which are absolutely necessary for the system to function properly.
.It Ar local
-Configuration specific devices.
+Creates configuration-specific devices.
.El
.Pp
-.Sy Device\-names
-.Bl -tag -width indent -compact
-.It Ar ct#
-HP300 HP-IB cartridge tape.
-.It Ar ccd#
-.Dq Concatenated
-pseudo-disks.
-.It Ar hd#
+.Sy Disks
+.Bl -tag -width tenletters -compact
+.It Ar ccd*
+Concatenated disk devices.
+.It Ar hd*
HP300 HP-IB disks.
-.It Ar mt#
-(Magnetic) 9-track reel tape.
-.It Ar sd#
-HP300 SCSI disks.
-.It Ar st#
-HP300 SCSI tape.
-.It Ar vnd#
-.Dq File
+.It Ar rd*
+.Dq rd
pseudo-disks.
-.It Ar rd#
-.Dq Ramdisk
-pseudo-disks.
-.It Ar dca#
+.It Ar sd*
+SCSI disks.
+.It Ar vnd*
+.Dq file
+pseudo-disk devices.
+.El
+.Pp
+.Sy Tapes
+.Bl -tag -width tenletters -compact
+.It Ar ct*
+HP300 HP-IB cartridge tape drives.
+.It Ar mt*
+(Magnetic) 9-track reel tape drives.
+.It Ar st*
+Exabyte tape.
+.El
+.Pp
+.Sy Terminal ports
+.Bl -tag -width tenletters -compact
+.It Ar apci*
+HP400 4 port serial mux interface.
+.It Ar dca*
HP200/300 single port serial interface.
-.It Ar dcm#
+.It Ar dcm*
HP200/300 4 port serial mux interface.
-.It Ar apci#
-HP400 3 port/keyboard Apollo mux interface.
-.It Ar pty#
-Set of 16 master and slave pseudo terminals.
-.It Ar grf#
+.El
+.Pp
+.Sy Pseudo terminals
+.Bl -tag -width tenletters -compact
+.It Ar ptm
+pty master device.
+.It Ar pty*
+Set of 16 master pseudo terminals.
+.It Ar tty*
+Set of 16 slave pseudo terminals.
+.El
+.Pp
+.Sy Console ports
+.Bl -tag -width tenletters -compact
+.It Ar grf*
Raw interface to HP300 graphics devices.
-.It Ar ite#
+.It Ar ite*
Terminal emulator interface to HP300 graphics devices.
-.It Ar hil
-HP300 HIL input devices.
-.It Ar ppi#
+.El
+.Pp
+.Sy Printers
+.Bl -tag -width tenletters -compact
+.It Ar ppi*
HP-IB plotters.
-.It Ar bpf#
-Berkeley packet filters.
-.It Ar tun#
-Network tunnel driver.
+.El
+.Pp
+.Sy Special purpose devices
+.Bl -tag -width tenletters -compact
+.It Ar bpf*
+Berkeley Packet Filter.
+.It Ar fd
+fd/* nodes for fdescfs.
+.It Ar hil
+HP-HIL input devices.
.It Ar lkm
Loadable kernel modules interface.
-.It Ar random
-In-kernel random number generator.
-.El
+.It Ar pf*
+Packet Filter.
+.It Ar *random
+In-kernel random data source.
+.It Ar tun*
+Network tunnel driver.
+.It Ar systrace*
+System call tracing device.
+.It Ar xfs*
+XFS filesystem node.
.Sh FILES
-.Bl -tag -width XXXX -compact
+.Bl -tag -width /dev -compact
.It Pa /dev
The special file directory.
.El
diff --git a/share/man/man8/man8.hppa/MAKEDEV.8 b/share/man/man8/man8.hppa/MAKEDEV.8
index 626cb834eef..7fa64562549 100644
--- a/share/man/man8/man8.hppa/MAKEDEV.8
+++ b/share/man/man8/man8.hppa/MAKEDEV.8
@@ -1,35 +1,29 @@
-.\" $OpenBSD: MAKEDEV.8,v 1.4 2003/07/10 08:30:36 jmc Exp $
+.\" $OpenBSD: MAKEDEV.8,v 1.5 2004/02/16 19:05:06 miod Exp $
.\"
-.\" Copyright (c) 1991 The Regents of the University of California.
-.\" All rights reserved.
+.\" THIS FILE AUTOMATICALLY GENERATED. DO NOT EDIT.
+.\" generated from:
.\"
-.\" Redistribution and use in source and binary forms, with or without
-.\" modification, are permitted provided that the following conditions
-.\" are met:
-.\" 1. Redistributions of source code must retain the above copyright
-.\" notice, this list of conditions and the following disclaimer.
-.\" 2. Redistributions in binary form must reproduce the above copyright
-.\" notice, this list of conditions and the following disclaimer in the
-.\" documentation and/or other materials provided with the distribution.
-.\" 3. Neither the name of the University nor the names of its contributors
-.\" may be used to endorse or promote products derived from this software
-.\" without specific prior written permission.
+.\" OpenBSD: etc.hppa/MAKEDEV.md,v 1.19 2004/02/16 19:01:01 miod Exp
+.\" OpenBSD: MAKEDEV.common,v 1.1 2004/02/16 18:58:54 miod Exp
+.\" OpenBSD: MAKEDEV.man,v 1.1 2004/02/16 19:03:30 miod Exp
+.\" OpenBSD: MAKEDEV.mansub,v 1.1 2004/02/16 19:03:30 miod Exp
.\"
-.\" THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
-.\" ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-.\" IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-.\" ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
-.\" FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
-.\" DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
-.\" OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
-.\" HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-.\" LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
-.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
-.\" SUCH DAMAGE.
+.\" Copyright (c) 2004, Miodrag Vallat
+.\" Copyright (c) 2001-2004 Todd T. Fries <todd@OpenBSD.org>
.\"
-.\" from: @(#)MAKEDEV.8 5.2 (Berkeley) 3/22/91
+.\" Permission to use, copy, modify, and distribute this software for any
+.\" purpose with or without fee is hereby granted, provided that the above
+.\" copyright notice and this permission notice appear in all copies.
.\"
-.Dd October 4, 2002
+.\" THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+.\" WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+.\" MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+.\" ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+.\" WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+.\" ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+.\" OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+.\"
+.Dd February 16, 2004
.Dt MAKEDEV 8 hppa
.Os
.Sh NAME
@@ -41,111 +35,142 @@
.Op Ar ...
.Sh DESCRIPTION
The shell script
-.Nm MAKEDEV ,
+.Nm ,
found in the
.Pa /dev
-directory, is used to create
-the common special
-files.
+directory, is used to create various special files.
See
.Xr intro 4
for a more complete discussion of special files.
.Pp
-.Nm MAKEDEV
+.Nm
takes any number of device names as arguments, where the names are
-the common abbreviation for the device.
-There are four special device names,
-.Ar all ,
-.Ar std ,
-.Ar local
-and
-.Ar wscons .
-If
-given,
-.Ar all
-creates device files for all devices on the hppa.
-If units are expected for a device,
-.Nm MAKEDEV
-will supply the standard numbers.
-The
-.Ar std
-argument creates only the standard devices for the hppa.
-Finally
-.Ar local
-is for devices specific to the local site, and executes the shell file
-.Pa MAKEDEV.local .
+the common abbreviation for the device or group of devices.
.Pp
-The hppa supports the following devices.
-Where a device name is followed by a hash sign ("#"), the hash sign
-must be replaced by a unit number.
+Where a device name is followed by a star
+.Sq * ,
+the star must be replaced by a unit number.
+If units are expected for a device but not provided,
+.Nm
+will supply the standard numbers in most cases.
.Pp
-.Sy Pseudo-names
-.Bl -tag -width openprom -compact
+The hppa supports the following devices:
+.Pp
+.Pp
+.Sy Special device names
+.Bl -tag -width tenletters -compact
.It Ar all
-All known devices for the hppa.
+Creates special files for all devices on hppa.
+.It Ar ramdisk
+Ramdisk kernel devices.
.It Ar std
-The standard devices (console, drum, fd/*, klog, kmem, mem, null, stderr,
-stdin, stdout, tty, zero).
+Creates the
+.Sq standard
+devices (console, drum, klog, kmem, ksyms, mem, null,
+stderr, stdin, stdout, tty, zero)
+which are absolutely necessary for the system to function properly.
.It Ar local
-Configuration specific devices.
-.It Ar wscons
-All wscons-related devices.
+Creates configuration-specific devices.
.El
.Pp
-.Sy Device-names
-.Bl -tag -width openprom -compact
-.It Ar audio
-Audio device.
-.It Ar bpf#
-Berkeley packet filters.
-.It Ar ccd#
-.Dq Concatenated
-disk drives.
-.It Ar cd#
-SCSI CD-ROM drives.
-.It Ar ch#
-SCSI media changer drives.
-.It Ar cua#
-Serial ports.
-.It Ar fd#
-.Dq Floppy
-disk drives.
-.It Ar lkm
-Loadable kernel modules.
-.It Ar pty#
-Set of 16 master and slave pseudo terminals.
-.It Ar raid#
-RAIDframe disk drives.
-.It Ar random
-In-kernel random number generator.
-.It Ar rd#
-.Dq Ramdisk
+.Sy Disks
+.Bl -tag -width tenletters -compact
+.It Ar ccd*
+Concatenated disk devices.
+.It Ar cd*
+SCSI cdrom drives.
+.It Ar fd*
+Floppy disk drives (3 1/2", 5 1/4").
+.It Ar sd*
+SCSI disks.
+.It Ar rd*
+.Dq rd
pseudo-disks.
-.It Ar sd#
-SCSI disk drives.
-.It Ar ses#
-SCSI SES/SAF-TE devices.
-.It Ar st#
+.It Ar vnd*
+.Dq file
+pseudo-disk devices.
+.El
+.Pp
+.Sy Tapes
+.Bl -tag -width tenletters -compact
+.It Ar ch*
+SCSI media changers.
+.It Ar st*
SCSI tape drives.
-.It Ar tty#
-Serial ports.
-.It Ar ttyC#
-Wscons console screens.
-.It Ar tun#
-Network tunnel devices.
-.It Ar uk#
-.Dq Unknown SCSI
-devices.
-.It Ar vnd#
-.Dq File
-pseudo-disks.
-.It Ar wskbd
-Keyboard devices for wscons.
-.It Ar wsmouse
-Mouse devices for wscons.
-.It Ar xfs#
-XFS filesystem devices.
.El
+.Pp
+.Sy Terminal ports
+.Bl -tag -width tenletters -compact
+.It Ar tty[0-7][0-9a-f]
+NS16x50 serial ports.
+.El
+.Pp
+.Sy Pseudo terminals
+.Bl -tag -width tenletters -compact
+.It Ar ptm
+pty master device.
+.It Ar pty*
+Set of 16 master pseudo terminals.
+.It Ar tty*
+Set of 16 slave pseudo terminals.
+.El
+.Pp
+.Sy Console ports
+.Bl -tag -width tenletters -compact
+.It Ar ttyC0
+Minimal wscons devices.
+.It Ar ttyC-F*
+wscons display devices.
+.It Ar wskbd*
+wscons keyboards.
+.It Ar wsmux
+wscons keyboard/mouse mux devices.
+.El
+.Pp
+.Sy Pointing devices
+.Bl -tag -width tenletters -compact
+.It Ar wsmouse*
+wscons mice.
+.El
+.Pp
+.Sy Printers
+.Bl -tag -width tenletters -compact
+.It Ar lpt*
+IEEE 1284 centronics printer.
+.El
+.Pp
+.Sy Special purpose devices
+.Bl -tag -width tenletters -compact
+.It Ar audio*
+Audio devices.
+.It Ar bpf*
+Berkeley Packet Filter.
+.It Ar crypto
+Hardware crypto access driver.
+.It Ar fd
+fd/* nodes for fdescfs.
+.It Ar lkm
+Loadable kernel modules interface.
+.It Ar pci
+PCI bus device.
+.It Ar pdc
+PDC device.
+.It Ar pf*
+Packet Filter.
+.It Ar *random
+In-kernel random data source.
+.It Ar ses*
+SES/SAF-TE SCSI devices.
+.It Ar ss*
+SCSI scanners.
+.It Ar systrace*
+System call tracing device.
+.It Ar tun*
+Network tunnel driver.
+.It Ar uk*
+SCSI unknown devices.
+.It Ar xfs*
+XFS filesystem node.
.Sh FILES
.Bl -tag -width /dev -compact
.It Pa /dev
diff --git a/share/man/man8/man8.i386/MAKEDEV.8 b/share/man/man8/man8.i386/MAKEDEV.8
index 27c1f9eea4b..1527b311ac1 100644
--- a/share/man/man8/man8.i386/MAKEDEV.8
+++ b/share/man/man8/man8.i386/MAKEDEV.8
@@ -1,58 +1,29 @@
-.\" $OpenBSD: MAKEDEV.8,v 1.25 2004/01/13 19:27:19 jmc Exp $
+.\" $OpenBSD: MAKEDEV.8,v 1.26 2004/02/16 19:05:06 miod Exp $
.\"
-.\" Copyright (c) 1997, Jason Downs. All rights reserved.
+.\" THIS FILE AUTOMATICALLY GENERATED. DO NOT EDIT.
+.\" generated from:
.\"
-.\" Redistribution and use in source and binary forms, with or without
-.\" modification, are permitted provided that the following conditions
-.\" are met:
-.\" 1. Redistributions of source code must retain the above copyright
-.\" notice, this list of conditions and the following disclaimer.
-.\" 2. Redistributions in binary form must reproduce the above copyright
-.\" notice, this list of conditions and the following disclaimer in the
-.\" documentation and/or other materials provided with the distribution.
+.\" OpenBSD: etc.i386/MAKEDEV.md,v 1.21 2004/02/16 19:01:01 miod Exp
+.\" OpenBSD: MAKEDEV.common,v 1.1 2004/02/16 18:58:54 miod Exp
+.\" OpenBSD: MAKEDEV.man,v 1.1 2004/02/16 19:03:30 miod Exp
+.\" OpenBSD: MAKEDEV.mansub,v 1.1 2004/02/16 19:03:30 miod Exp
.\"
-.\" THIS SOFTWARE IS PROVIDED BY THE AUTHOR(S) ``AS IS'' AND ANY EXPRESS
-.\" OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-.\" WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-.\" DISCLAIMED. IN NO EVENT SHALL THE AUTHOR(S) BE LIABLE FOR ANY DIRECT,
-.\" INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-.\" (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
-.\" SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
-.\" CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-.\" LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
-.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
-.\" SUCH DAMAGE.
+.\" Copyright (c) 2004, Miodrag Vallat
+.\" Copyright (c) 2001-2004 Todd T. Fries <todd@OpenBSD.org>
.\"
-.\" Copyright (c) 1991 The Regents of the University of California.
-.\" All rights reserved.
+.\" Permission to use, copy, modify, and distribute this software for any
+.\" purpose with or without fee is hereby granted, provided that the above
+.\" copyright notice and this permission notice appear in all copies.
.\"
-.\" Redistribution and use in source and binary forms, with or without
-.\" modification, are permitted provided that the following conditions
-.\" are met:
-.\" 1. Redistributions of source code must retain the above copyright
-.\" notice, this list of conditions and the following disclaimer.
-.\" 2. Redistributions in binary form must reproduce the above copyright
-.\" notice, this list of conditions and the following disclaimer in the
-.\" documentation and/or other materials provided with the distribution.
-.\" 3. Neither the name of the University nor the names of its contributors
-.\" may be used to endorse or promote products derived from this software
-.\" without specific prior written permission.
+.\" THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+.\" WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+.\" MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+.\" ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+.\" WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+.\" ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+.\" OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
.\"
-.\" THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
-.\" ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-.\" IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-.\" ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
-.\" FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
-.\" DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
-.\" OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
-.\" HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-.\" LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
-.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
-.\" SUCH DAMAGE.
-.\"
-.\" from: @(#)MAKEDEV.8 5.2 (Berkeley) 3/22/91
-.\"
-.Dd July 27, 1997
+.Dd February 16, 2004
.Dt MAKEDEV 8 i386
.Os
.Sh NAME
@@ -64,126 +35,201 @@
.Op Ar ...
.Sh DESCRIPTION
The shell script
-.Nm MAKEDEV ,
+.Nm ,
found in the
.Pa /dev
-directory, is used to create the common special files.
+directory, is used to create various special files.
See
.Xr intro 4
for a more complete discussion of special files.
.Pp
-.Nm MAKEDEV
+.Nm
takes any number of device names as arguments, where the names are
-the common abbreviation for the device.
-There are four special device names,
-.Ar all ,
-.Ar std ,
-.Ar local
-and
-.Ar wscons .
-If
-given,
-.Ar all
-creates device files for all devices on the i386.
-If units are expected for a device,
-.Nm MAKEDEV
-will supply the standard numbers.
-The
-.Ar std
-argument creates only the standard devices for the i386.
-Finally
-.Ar local
-is for devices specific to the local site, and executes the shell file
-.Pa MAKEDEV.local .
+the common abbreviation for the device or group of devices.
+.Pp
+Where a device name is followed by a star
+.Sq * ,
+the star must be replaced by a unit number.
+If units are expected for a device but not provided,
+.Nm
+will supply the standard numbers in most cases.
.Pp
-The i386 supports the following devices.
-Where a device name is followed by a hash sign ("#"), the hash sign
-must be replaced by a unit number.
+The i386 supports the following devices:
.Pp
-.Sy Pseudo-names
-.Bl -tag -width wsmouse -compact
+.Pp
+.Sy Special device names
+.Bl -tag -width tenletters -compact
.It Ar all
-All known devices for the i386.
+Creates special files for all devices on i386.
+.It Ar ramdisk
+Ramdisk kernel devices.
.It Ar std
-The standard devices (console, drum, fd/*, klog, kmem, mem, null, stderr,
-stdin, stdout, tty, zero).
+Creates the
+.Sq standard
+devices (console, drum, klog, kmem, ksyms, mem, null,
+stderr, stdin, stdout, tty, zero)
+which are absolutely necessary for the system to function properly.
.It Ar local
-Configuration specific devices.
-.It Ar wscons
-All wscons-related devices.
+Creates configuration-specific devices.
+.El
+.Pp
+.Sy Disks
+.Bl -tag -width tenletters -compact
+.It Ar ccd*
+Concatenated disk devices.
+.It Ar cd*
+SCSI cdrom drives.
+.It Ar fd*
+Floppy disk drives (3 1/2", 5 1/4").
+.It Ar mcd*
+Mitsumi cdrom drives.
+.It Ar raid*
+RAIDframe disk devices.
+.It Ar rd*
+.Dq rd
+pseudo-disks.
+.It Ar sd*
+SCSI disks.
+.It Ar vnd*
+.Dq file
+pseudo-disk devices.
+.It Ar wd*
+.Dq winchester
+disk drives (ST506, IDE, ESDI, RLL, ...).
+.El
+.Pp
+.Sy Tapes
+.Bl -tag -width tenletters -compact
+.It Ar ch*
+SCSI media changers.
+.It Ar st*
+SCSI tape drives.
+.It Ar wt*
+Archive/Wangtek QIC-cartridge tape drives.
+.El
+.Pp
+.Sy Terminal ports
+.Bl -tag -width tenletters -compact
+.It Ar tty[0-7][0-9a-f]
+NS16x50 serial ports.
+.It Ar ttyc*
+Cyclades serial ports.
+.El
+.Pp
+.Sy Call units
+.Bl -tag -width tenletters -compact
+.It Ar tun*
+Network tunnel driver.
+.El
+.Pp
+.Sy Pseudo terminals
+.Bl -tag -width tenletters -compact
+.It Ar ptm
+pty master device.
+.It Ar pty*
+Set of 16 master pseudo terminals.
+.It Ar tty*
+Set of 16 slave pseudo terminals.
+.El
+.Pp
+.Sy Console ports
+.Bl -tag -width tenletters -compact
+.It Ar ttyC0
+Minimal wscons devices.
+.It Ar ttyC-F*
+wscons display devices.
+.It Ar wskbd*
+wscons keyboards.
+.It Ar wsmux
+wscons keyboard/mouse mux devices.
+.El
+.Pp
+.Sy Pointing devices
+.Bl -tag -width tenletters -compact
+.It Ar wsmouse*
+wscons mice.
+.El
+.Pp
+.Sy Printers
+.Bl -tag -width tenletters -compact
+.It Ar lpa*
+Polled printer port.
+.It Ar lpt*
+IEEE 1284 centronics printer.
+.El
+.Pp
+.Sy USB devices
+.Bl -tag -width tenletters -compact
+.It Ar usbs
+All USB devices.
+.It Ar ttyU*
+USB serial ports.
+.It Ar ugen*
+Generic USB devices.
+.It Ar uhid*
+Generic HID devices.
+.It Ar ulpt*
+Printer devices.
+.It Ar urio*
+Diamond Multimedia Rio 500.
+.It Ar usb*
+Bus control devices used by usbd for attach/detach.
+.It Ar uscanner*
+Scanners.
.El
.Pp
-.Sy Device-names
-.Bl -tag -width wsmouse -compact
+.Sy Special purpose devices
+.Bl -tag -width tenletters -compact
.It Ar apm
-Power management devices.
-.It Ar audio
-Audio device.
-.It Ar bktr#
-Brooktree 848 driver.
-.It Ar bpf#
-Berkeley packet filters.
-.It Ar ccd#
-.Dq Concatenated
-disk devices.
-.It Ar cd#
-SCSI CD-ROM drives.
-.It Ar fd#
-.Dq Floppy
-disk drives (3 1/2, 5 1/4).
-.It Ar joy#
+Power management device.
+.It Ar audio*
+Audio devices.
+.It Ar bktr*
+Video frame grabbers.
+.It Ar bpf*
+Berkeley Packet Filter.
+.It Ar crypto
+Hardware crypto access driver.
+.It Ar fd
+fd/* nodes for fdescfs.
+.It Ar gpr*
+GPR400 smartcard reader.
+.It Ar iop*
+I2O controller devices.
+.It Ar joy*
Joystick driver.
.It Ar lkm
Loadable kernel modules interface.
-.It Ar lpa#
-Interruptless parallel port driver.
-.It Ar lpt#
-Stock parallel port device driver.
-.It Ar mcd#
-Mitsumi CD-ROM drives.
-.It Ar pty#
-Set of 16 master and slave pseudo terminals.
-.It Ar random
-In-kernel random number generator.
-.It Ar rd#
-.Dq Ramdisk
-pseudo-disks.
-.It Ar sd#
-SCSI disk drives.
+.It Ar music*
+MIDI devices.
+.It Ar pci
+PCI bus device.
+.It Ar pctr*
+PC Performance Tuning Register access device.
+.It Ar pf*
+Packet Filter.
+.It Ar radio*
+FM tuner devices.
+.It Ar rmidi*
+Raw MIDI devices.
+.It Ar *random
+In-kernel random data source.
+.It Ar ses*
+SES/SAF-TE SCSI devices.
.It Ar speaker
-Pc speaker.
-.It Ar ss#
+PC speaker.
+.It Ar ss*
SCSI scanners.
-.It Ar st#
-SCSI tape drives.
-.It Ar tty#
-Standard PC COM ports.
-.It Ar ttyC#
-Wscons console screens.
-.It Ar ttyU#
-USB serial ports.
-.It Ar tun#
-Network tunnel driver.
-.It Ar uk#
-.Dq Unknown SCSI
-devices.
-.It Ar vnd#
-.Dq File
-pseudo-disks.
-.It Ar wd#
-.Dq Winchester
-disk drives (ST506, IDE, ESDI, RLL etc.).
-.It Ar wdt#
+.It Ar systrace*
+System call tracing device.
+.It Ar tuner*
+Tuner devices.
+.It Ar uk*
+SCSI unknown devices.
+.It Ar wdt0
Watchdog timer.
-.It Ar wskbd
-Keyboard devices for wscons.
-.It Ar wsmouse
-Mouse devices for wscons.
-.It Ar wsmux
-Multiplexor devices for wscons.
-.It Ar wt#
-QIC-interfaced (i.e. not SCSI) 3M cartridge tape.
-.El
+.It Ar xfs*
+XFS filesystem node.
.Sh FILES
.Bl -tag -width /dev -compact
.It Pa /dev
diff --git a/share/man/man8/man8.mac68k/MAKEDEV.8 b/share/man/man8/man8.mac68k/MAKEDEV.8
index 449fead30ec..e1b06fcedfa 100644
--- a/share/man/man8/man8.mac68k/MAKEDEV.8
+++ b/share/man/man8/man8.mac68k/MAKEDEV.8
@@ -1,34 +1,29 @@
-.\" $OpenBSD: MAKEDEV.8,v 1.6 2003/06/02 23:30:15 millert Exp $
-.\" Copyright (c) 1991 The Regents of the University of California.
-.\" All rights reserved.
+.\" $OpenBSD: MAKEDEV.8,v 1.7 2004/02/16 19:05:06 miod Exp $
.\"
-.\" Redistribution and use in source and binary forms, with or without
-.\" modification, are permitted provided that the following conditions
-.\" are met:
-.\" 1. Redistributions of source code must retain the above copyright
-.\" notice, this list of conditions and the following disclaimer.
-.\" 2. Redistributions in binary form must reproduce the above copyright
-.\" notice, this list of conditions and the following disclaimer in the
-.\" documentation and/or other materials provided with the distribution.
-.\" 3. Neither the name of the University nor the names of its contributors
-.\" may be used to endorse or promote products derived from this software
-.\" without specific prior written permission.
+.\" THIS FILE AUTOMATICALLY GENERATED. DO NOT EDIT.
+.\" generated from:
.\"
-.\" THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
-.\" ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-.\" IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-.\" ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
-.\" FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
-.\" DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
-.\" OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
-.\" HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-.\" LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
-.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
-.\" SUCH DAMAGE.
+.\" OpenBSD: etc.mac68k/MAKEDEV.md,v 1.15 2004/02/16 19:01:01 miod Exp
+.\" OpenBSD: MAKEDEV.common,v 1.1 2004/02/16 18:58:54 miod Exp
+.\" OpenBSD: MAKEDEV.man,v 1.1 2004/02/16 19:03:30 miod Exp
+.\" OpenBSD: MAKEDEV.mansub,v 1.1 2004/02/16 19:03:30 miod Exp
.\"
-.\" from: @(#)MAKEDEV.8 5.2 (Berkeley) 3/22/91
+.\" Copyright (c) 2004, Miodrag Vallat
+.\" Copyright (c) 2001-2004 Todd T. Fries <todd@OpenBSD.org>
.\"
-.Dd February 21, 1994
+.\" Permission to use, copy, modify, and distribute this software for any
+.\" purpose with or without fee is hereby granted, provided that the above
+.\" copyright notice and this permission notice appear in all copies.
+.\"
+.\" THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+.\" WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+.\" MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+.\" ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+.\" WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+.\" ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+.\" OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+.\"
+.Dd February 16, 2004
.Dt MAKEDEV 8 mac68k
.Os
.Sh NAME
@@ -40,76 +35,118 @@
.Op Ar ...
.Sh DESCRIPTION
The shell script
-.Nm MAKEDEV ,
+.Nm ,
found in the
.Pa /dev
-directory, is used to create the common special files.
+directory, is used to create various special files.
See
.Xr intro 4
for a more complete discussion of special files.
.Pp
-.Nm MAKEDEV
+.Nm
takes any number of device names as arguments, where the names are
-the common abbreviation for the device.
-There are three special device names,
-.Ar all ,
-.Ar std ,
-and
-.Ar local .
-If
-given,
-.Ar all
-creates device files for all devices on the mac68k.
-If units are expected for a device,
-.Nm MAKEDEV
-will supply the standard numbers.
-The
-.Ar std
-argument creates only the standard devices for the mac68k.
-Finally
-.Ar local
-is for devices specific to the local site, and executes the shell file
-.Pa MAKEDEV.local .
+the common abbreviation for the device or group of devices.
+.Pp
+Where a device name is followed by a star
+.Sq * ,
+the star must be replaced by a unit number.
+If units are expected for a device but not provided,
+.Nm
+will supply the standard numbers in most cases.
.Pp
-The mac68k supports the following devices.
-Where a device name is followed by a hash sign ("#"), the hash sign
-must be replaced by a unit number.
+The mac68k supports the following devices:
.Pp
-.Sy Pseudo\-names
-.Bl -tag -width indent -compact
+.Pp
+.Sy Special device names
+.Bl -tag -width tenletters -compact
.It Ar all
-All known devices for the mac68k.
+Creates special files for all devices on mac68k.
+.It Ar ramdisk
+Ramdisk kernel devices.
.It Ar std
-The standard devices (console, drum, fd/*, klog, kmem, mem, null, stderr,
-stdin, stdout, tty, zero).
+Creates the
+.Sq standard
+devices (console, drum, klog, kmem, ksyms, mem, null,
+stderr, stdin, stdout, tty, zero)
+which are absolutely necessary for the system to function properly.
.It Ar local
-Configuration specific devices.
+Creates configuration-specific devices.
.El
.Pp
-.Sy Device\-names
-.Bl -tag -width indent -compact
-.It Ar bpf#
-Berkeley packet filters.
-.It Ar cd#
-SCSI CD-ROM drives.
-.It Ar kbd
-The keyboard.
-.It Ar lkm
-Loadable kernel modules.
-.It Ar mouse#
-Mouse ports.
-.It Ar pty#
-Set of 16 master and slave pseudo terminals.
-.It Ar sd#
-SCSI disk drives.
-.It Ar st#
-SCSI tape drives.
-.It Ar tty#
-Onboard Serial ports.
-.It Ar vnd#
-.Dq File
+.Sy Disks
+.Bl -tag -width tenletters -compact
+.It Ar ccd*
+Concatenated disk devices.
+.It Ar cd*
+SCSI cdrom drives.
+.It Ar rd*
+.Dq rd
pseudo-disks.
+.It Ar sd*
+SCSI disks.
+.It Ar vnd*
+.Dq file
+pseudo-disk devices.
.El
+.Pp
+.Sy Tapes
+.Bl -tag -width tenletters -compact
+.It Ar ch*
+SCSI media changers.
+.It Ar st*
+SCSI tape drives.
+.El
+.Pp
+.Sy Terminal ports
+.Bl -tag -width tenletters -compact
+.It Ar tty00
+Standard serial port.
+.It Ar ttye*
+ITE bitmapped consoles.
+.El
+.Pp
+.Sy Pseudo terminals
+.Bl -tag -width tenletters -compact
+.It Ar ptm
+pty master device.
+.It Ar pty*
+Set of 16 master pseudo terminals.
+.It Ar tty*
+Set of 16 slave pseudo terminals.
+.El
+.Pp
+.Sy Console ports
+.Bl -tag -width tenletters -compact
+.It Ar adb
+Apple Desktop bus event interface.
+.It Ar grf*
+Raw interface to the mac68k graphics devices.
+.El
+.Pp
+.Sy Special purpose devices
+.Bl -tag -width tenletters -compact
+.It Ar asc*
+ASC Audio device.
+.It Ar bpf*
+Berkeley Packet Filter.
+.It Ar fd
+fd/* nodes for fdescfs.
+.It Ar lkm
+Loadable kernel modules interface.
+.It Ar pf*
+Packet Filter.
+.It Ar *random
+In-kernel random data source.
+.It Ar ss*
+SCSI scanners.
+.It Ar systrace*
+System call tracing device.
+.It Ar tun*
+Network tunnel driver.
+.It Ar uk*
+SCSI unknown devices.
+.It Ar xfs*
+XFS filesystem node.
.Sh FILES
.Bl -tag -width /dev -compact
.It Pa /dev
diff --git a/share/man/man8/man8.macppc/MAKEDEV.8 b/share/man/man8/man8.macppc/MAKEDEV.8
index b9def35c904..5e801d9d654 100644
--- a/share/man/man8/man8.macppc/MAKEDEV.8
+++ b/share/man/man8/man8.macppc/MAKEDEV.8
@@ -1,34 +1,29 @@
-.\" $OpenBSD: MAKEDEV.8,v 1.9 2004/01/13 19:27:19 jmc Exp $
-.\" Copyright (c) 1991 The Regents of the University of California.
-.\" All rights reserved.
+.\" $OpenBSD: MAKEDEV.8,v 1.10 2004/02/16 19:05:06 miod Exp $
.\"
-.\" Redistribution and use in source and binary forms, with or without
-.\" modification, are permitted provided that the following conditions
-.\" are met:
-.\" 1. Redistributions of source code must retain the above copyright
-.\" notice, this list of conditions and the following disclaimer.
-.\" 2. Redistributions in binary form must reproduce the above copyright
-.\" notice, this list of conditions and the following disclaimer in the
-.\" documentation and/or other materials provided with the distribution.
-.\" 3. Neither the name of the University nor the names of its contributors
-.\" may be used to endorse or promote products derived from this software
-.\" without specific prior written permission.
+.\" THIS FILE AUTOMATICALLY GENERATED. DO NOT EDIT.
+.\" generated from:
.\"
-.\" THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
-.\" ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-.\" IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-.\" ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
-.\" FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
-.\" DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
-.\" OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
-.\" HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-.\" LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
-.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
-.\" SUCH DAMAGE.
+.\" OpenBSD: etc.macppc/MAKEDEV.md,v 1.16 2004/02/16 19:01:01 miod Exp
+.\" OpenBSD: MAKEDEV.common,v 1.1 2004/02/16 18:58:54 miod Exp
+.\" OpenBSD: MAKEDEV.man,v 1.1 2004/02/16 19:03:30 miod Exp
+.\" OpenBSD: MAKEDEV.mansub,v 1.1 2004/02/16 19:03:30 miod Exp
.\"
-.\" from: @(#)MAKEDEV.8 5.2 (Berkeley) 3/22/91
+.\" Copyright (c) 2004, Miodrag Vallat
+.\" Copyright (c) 2001-2004 Todd T. Fries <todd@OpenBSD.org>
.\"
-.Dd January 27, 2001
+.\" Permission to use, copy, modify, and distribute this software for any
+.\" purpose with or without fee is hereby granted, provided that the above
+.\" copyright notice and this permission notice appear in all copies.
+.\"
+.\" THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+.\" WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+.\" MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+.\" ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+.\" WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+.\" ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+.\" OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+.\"
+.Dd February 16, 2004
.Dt MAKEDEV 8 macppc
.Os
.Sh NAME
@@ -40,121 +35,165 @@
.Op Ar ...
.Sh DESCRIPTION
The shell script
-.Nm MAKEDEV ,
+.Nm ,
found in the
.Pa /dev
-directory, is used to create the common special files.
+directory, is used to create various special files.
See
.Xr intro 4
for a more complete discussion of special files.
.Pp
-.Nm MAKEDEV
+.Nm
takes any number of device names as arguments, where the names are
-the common abbreviation for the device.
-There are four special device names,
-.Ar all ,
-.Ar std ,
-.Ar local
-and
-.Ar wscons .
-If
-given,
-.Ar all
-creates device files for all devices on the macppc.
-If units are expected for a device,
-.Nm MAKEDEV
-will supply the standard numbers.
-The
-.Ar std
-argument creates only the standard devices for the macppc.
-Finally
-.Ar local
-is for devices specific to the local site, and executes the shell file
-.Pa MAKEDEV.local .
+the common abbreviation for the device or group of devices.
.Pp
-The macppc supports the following devices.
-Where a device name is followed by a hash sign ("#"), the hash sign
-must be replaced by a unit number.
+Where a device name is followed by a star
+.Sq * ,
+the star must be replaced by a unit number.
+If units are expected for a device but not provided,
+.Nm
+will supply the standard numbers in most cases.
.Pp
-.Sy Pseudo-names
-.Bl -tag -width wsmouse -compact
+The macppc supports the following devices:
+.Pp
+.Pp
+.Sy Special device names
+.Bl -tag -width tenletters -compact
.It Ar all
-All known devices for the macppc.
+Creates special files for all devices on macppc.
+.It Ar ramdisk
+Ramdisk kernel devices.
.It Ar std
-The standard devices (console, drum, fd/*, klog, kmem, mem, null, stderr,
-stdin, stdout, tty, zero).
+Creates the
+.Sq standard
+devices (console, drum, klog, kmem, ksyms, mem, null,
+stderr, stdin, stdout, tty, zero)
+which are absolutely necessary for the system to function properly.
.It Ar local
-Configuration specific devices.
-.It Ar wscons
-All wscons-related devices.
+Creates configuration-specific devices.
.El
.Pp
-.Sy Device-names
-.Bl -tag -width wsmouse -compact
-.It Ar bpf#
-Berkeley packet filters.
-.It Ar ccd#
-.Dq Concatenated
-disk drives.
-.It Ar cd#
-SCSI CD-ROM drives.
-.It Ar ch#
-SCSI media changer drives.
-.It Ar fd#
-.Dq Floppy
-disk drives.
-.It Ar lkm
-Loadable kernel modules.
-.It Ar pty#
-Set of 16 master and slave pseudo terminals.
-.It Ar raid#
-RAIDframe disk drives.
-.It Ar random
-In-kernel random number generator.
-.It Ar rd#
-.Dq Ramdisk
+.Sy Disks
+.Bl -tag -width tenletters -compact
+.It Ar ccd*
+Concatenated disk devices.
+.It Ar cd*
+SCSI cdrom drives.
+.It Ar raid*
+RAIDframe disk devices.
+.It Ar rd*
+.Dq rd
pseudo-disks.
-.It Ar sd#
-SCSI disk drives.
-.It Ar ss#
-SCSI scanners.
-.It Ar st#
+.It Ar sd*
+SCSI disks.
+.It Ar vnd*
+.Dq file
+pseudo-disk devices.
+.It Ar wd*
+.Dq winchester
+disk drives (ST506, IDE, ESDI, RLL, ...).
+.El
+.Pp
+.Sy Tapes
+.Bl -tag -width tenletters -compact
+.It Ar ch*
+SCSI media changers.
+.It Ar st*
SCSI tape drives.
-.It Ar tty#
-Serial ports.
-.It Ar ttyC#
-Wscons console screens.
-.It Ar ttyU#
-USB serial ports.
-.It Ar tun#
-Network tunnel devices.
-.It Ar uk#
-.Dq Unknown SCSI
-devices.
-.It Ar usb#
-USB control devices.
-.It Ar uhid#
-USB generic HID devices.
-.It Ar ulpt#
-USB printer devices.
-.It Ar urio#
-USB Diamond Multimedia Rio 500.
-.It Ar ugen#
-USB generic devices.
-.It Ar vnd#
-.Dq File
-pseudo-disks.
-.It Ar wd#
-IDE disk drives.
-.It Ar wskbd
-Keyboard devices for wscons.
-.It Ar wsmouse
-Mouse devices for wscons.
+.El
+.Pp
+.Sy Terminal ports
+.Bl -tag -width tenletters -compact
+.It Ar tty[0-7][0-9a-f]
+NS16x50 serial ports.
+.El
+.Pp
+.Sy Pseudo terminals
+.Bl -tag -width tenletters -compact
+.It Ar ptm
+pty master device.
+.It Ar pty*
+Set of 16 master pseudo terminals.
+.It Ar tty*
+Set of 16 slave pseudo terminals.
+.El
+.Pp
+.Sy Console ports
+.Bl -tag -width tenletters -compact
+.It Ar ttyC0
+Minimal wscons devices.
+.It Ar ttyC-F*
+wscons display devices.
+.It Ar wskbd*
+wscons keyboards.
.It Ar wsmux
-Multiplexor devices for wscons.
-.It Ar xfs#
-XFS filesystem devices.
+wscons keyboard/mouse mux devices.
+.El
+.Pp
+.Sy Pointing devices
+.Bl -tag -width tenletters -compact
+.It Ar wsmouse*
+wscons mice.
.El
+.Pp
+.Sy USB devices
+.Bl -tag -width tenletters -compact
+.It Ar usbs
+All USB devices.
+.It Ar ttyU*
+USB serial ports.
+.It Ar ugen*
+Generic USB devices.
+.It Ar uhid*
+Generic HID devices.
+.It Ar ulpt*
+Printer devices.
+.It Ar urio*
+Diamond Multimedia Rio 500.
+.It Ar usb*
+Bus control devices used by usbd for attach/detach.
+.It Ar uscanner*
+Scanners.
+.El
+.Pp
+.Sy Special purpose devices
+.Bl -tag -width tenletters -compact
+.It Ar apm
+Power management device.
+.It Ar audio*
+Audio devices.
+.It Ar bktr*
+Video frame grabbers.
+.It Ar bpf*
+Berkeley Packet Filter.
+.It Ar crypto
+Hardware crypto access driver.
+.It Ar fd
+fd/* nodes for fdescfs.
+.It Ar iop*
+I2O controller devices.
+.It Ar lkm
+Loadable kernel modules interface.
+.It Ar pci
+PCI bus device.
+.It Ar pf*
+Packet Filter.
+.It Ar radio*
+FM tuner devices.
+.It Ar *random
+In-kernel random data source.
+.It Ar ss*
+SCSI scanners.
+.It Ar systrace*
+System call tracing device.
+.It Ar tun*
+Network tunnel driver.
+.It Ar tuner*
+Tuner devices.
+.It Ar uk*
+SCSI unknown devices.
+.It Ar xfs*
+XFS filesystem node.
.Sh FILES
.Bl -tag -width /dev -compact
.It Pa /dev
diff --git a/share/man/man8/man8.mvme68k/MAKEDEV.8 b/share/man/man8/man8.mvme68k/MAKEDEV.8
index 1c3d8c4bea4..4293dff9643 100644
--- a/share/man/man8/man8.mvme68k/MAKEDEV.8
+++ b/share/man/man8/man8.mvme68k/MAKEDEV.8
@@ -1,30 +1,29 @@
-.\" $OpenBSD: MAKEDEV.8,v 1.5 2003/09/02 21:32:15 miod Exp $
+.\" $OpenBSD: MAKEDEV.8,v 1.6 2004/02/16 19:05:06 miod Exp $
.\"
-.\" Copyright (c) 2001 Miodrag Vallat.
-.\" All rights reserved.
+.\" THIS FILE AUTOMATICALLY GENERATED. DO NOT EDIT.
+.\" generated from:
.\"
-.\" Redistribution and use in source and binary forms, with or without
-.\" modification, are permitted provided that the following conditions
-.\" are met:
-.\" 1. Redistributions of source code must retain the above copyright
-.\" notice, this list of conditions and the following disclaimer.
-.\" 2. Redistributions in binary form must reproduce the above copyright
-.\" notice, this list of conditions and the following disclaimer in the
-.\" documentation and/or other materials provided with the distribution.
+.\" OpenBSD: etc.mvme68k/MAKEDEV.md,v 1.12 2004/02/16 19:01:02 miod Exp
+.\" OpenBSD: MAKEDEV.common,v 1.1 2004/02/16 18:58:54 miod Exp
+.\" OpenBSD: MAKEDEV.man,v 1.1 2004/02/16 19:03:30 miod Exp
+.\" OpenBSD: MAKEDEV.mansub,v 1.1 2004/02/16 19:03:30 miod Exp
.\"
-.\" THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
-.\" IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
-.\" OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
-.\" IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
-.\" INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
-.\" NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-.\" DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-.\" THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-.\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
-.\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+.\" Copyright (c) 2004, Miodrag Vallat
+.\" Copyright (c) 2001-2004 Todd T. Fries <todd@OpenBSD.org>
.\"
+.\" Permission to use, copy, modify, and distribute this software for any
+.\" purpose with or without fee is hereby granted, provided that the above
+.\" copyright notice and this permission notice appear in all copies.
.\"
-.Dd October 7, 2001
+.\" THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+.\" WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+.\" MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+.\" ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+.\" WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+.\" ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+.\" OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+.\"
+.Dd February 16, 2004
.Dt MAKEDEV 8 mvme68k
.Os
.Sh NAME
@@ -36,72 +35,128 @@
.Op Ar ...
.Sh DESCRIPTION
The shell script
-.Nm MAKEDEV ,
+.Nm ,
found in the
.Pa /dev
-directory, is used to create the common special files.
+directory, is used to create various special files.
See
.Xr intro 4
for a more complete discussion of special files.
.Pp
-.Nm MAKEDEV
+.Nm
takes any number of device names as arguments, where the names are
-the common abbreviation for the device.
-There are three special device names,
-.Ar all ,
-.Ar std
-and
-.Ar local .
-If
-given,
-.Ar all
-creates device files for all devices on the mvme68k.
-If units are expected for a device,
-.Nm MAKEDEV
-will supply the standard numbers.
-The
-.Ar std
-argument creates only the standard devices for the mvme68k.
-Finally
-.Ar local
-is for devices specific to the local site, and executes the shell file
-.Pa MAKEDEV.local .
+the common abbreviation for the device or group of devices.
+.Pp
+Where a device name is followed by a star
+.Sq * ,
+the star must be replaced by a unit number.
+If units are expected for a device but not provided,
+.Nm
+will supply the standard numbers in most cases.
+.Pp
+The mvme68k supports the following devices:
.Pp
-The mvme68k supports the following devices.
-Where a device name is followed by a hash sign ("#"), the hash sign
-must be replaced by a unit number.
.Pp
-.Sy Pseudo\-names
-.Bl -tag -width indent -compact
+.Sy Special device names
+.Bl -tag -width tenletters -compact
.It Ar all
-All known devices for the mvme68k.
+Creates special files for all devices on mvme68k.
+.It Ar ramdisk
+Ramdisk kernel devices.
.It Ar std
-The standard devices (console, drum, fd/*, klog, kmem, mem, null, stderr,
-stdin, stdout, tty, zero).
+Creates the
+.Sq standard
+devices (console, drum, klog, kmem, ksyms, mem, null,
+stderr, stdin, stdout, tty, zero)
+which are absolutely necessary for the system to function properly.
.It Ar local
-Configuration specific devices.
+Creates configuration-specific devices.
.El
.Pp
-.Sy Device\-names
-.Bl -tag -width indent -compact
-.It Ar bpf#
-Berkeley packet filters.
-.It Ar cd#
-SCSI CD-ROM drives.
-.It Ar lkm
-Loadable kernel modules.
-.It Ar pty#
-Set of 16 master and slave pseudo terminals.
-.It Ar sd#
-SCSI disk drives.
-.It Ar st#
-SCSI tape drives.
-.It Ar tty#
-Onboard Serial ports.
-.It Ar vnd#
-.Dq File
+.Sy Disks
+.Bl -tag -width tenletters -compact
+.It Ar ccd*
+Concatenated disk devices.
+.It Ar cd*
+SCSI cdrom drives.
+.It Ar rd*
+.Dq rd
pseudo-disks.
+.It Ar sd*
+SCSI disks.
+.It Ar vnd*
+.Dq file
+pseudo-disk devices.
+.El
+.Pp
+.Sy Tapes
+.Bl -tag -width tenletters -compact
+.It Ar ch*
+SCSI media changers.
+.It Ar st*
+SCSI tape drives.
+.El
+.Pp
+.Sy Terminal ports
+.Bl -tag -width tenletters -compact
+.It Ar cuaa-d
+On-board call-up devices.
+.It Ar ttya-d
+On-board serial ports.
+.It Ar tty0*
+CL-CD2400 serial ports.
+.It Ar ttyw*
+WG CL-CD2400 serial ports.
+.El
+.Pp
+.Sy Pseudo terminals
+.Bl -tag -width tenletters -compact
+.It Ar ptm
+pty master device.
+.It Ar pty*
+Set of 16 master pseudo terminals.
+.It Ar tty*
+Set of 16 slave pseudo terminals.
.El
+.Pp
+.Sy Printers
+.Bl -tag -width tenletters -compact
+.It Ar par0
+On-board printer port.
+.El
+.Pp
+.Sy Special purpose devices
+.Bl -tag -width tenletters -compact
+.It Ar bpf*
+Berkeley Packet Filter.
+.It Ar fd
+fd/* nodes for fdescfs.
+.It Ar flash0
+On-board flash memory.
+.It Ar lkm
+Loadable kernel modules interface.
+.It Ar nvram0
+On-board non-volatile memory.
+.It Ar pf*
+Packet Filter.
+.It Ar *random
+In-kernel random data source.
+.It Ar sram0
+On-board static memory.
+.It Ar ss*
+SCSI scanners.
+.It Ar systrace*
+System call tracing device.
+.It Ar tun*
+Network tunnel driver.
+.It Ar uk*
+SCSI unknown devices.
+.It Ar vmel0
+VMEbus D32 space.
+.It Ar vmes0
+VMEbus D16 space.
+.It Ar xfs*
+XFS filesystem node.
.Sh FILES
.Bl -tag -width /dev -compact
.It Pa /dev
diff --git a/share/man/man8/man8.mvme88k/MAKEDEV.8 b/share/man/man8/man8.mvme88k/MAKEDEV.8
index f234fb3fd8c..2459ea4f941 100644
--- a/share/man/man8/man8.mvme88k/MAKEDEV.8
+++ b/share/man/man8/man8.mvme88k/MAKEDEV.8
@@ -1,30 +1,29 @@
-.\" $OpenBSD: MAKEDEV.8,v 1.1 2003/09/02 21:33:16 miod Exp $
+.\" $OpenBSD: MAKEDEV.8,v 1.2 2004/02/16 19:05:06 miod Exp $
.\"
-.\" Copyright (c) 2001, 2003 Miodrag Vallat.
-.\" All rights reserved.
+.\" THIS FILE AUTOMATICALLY GENERATED. DO NOT EDIT.
+.\" generated from:
.\"
-.\" Redistribution and use in source and binary forms, with or without
-.\" modification, are permitted provided that the following conditions
-.\" are met:
-.\" 1. Redistributions of source code must retain the above copyright
-.\" notice, this list of conditions and the following disclaimer.
-.\" 2. Redistributions in binary form must reproduce the above copyright
-.\" notice, this list of conditions and the following disclaimer in the
-.\" documentation and/or other materials provided with the distribution.
+.\" OpenBSD: etc.mvme88k/MAKEDEV.md,v 1.13 2004/02/16 19:01:02 miod Exp
+.\" OpenBSD: MAKEDEV.common,v 1.1 2004/02/16 18:58:54 miod Exp
+.\" OpenBSD: MAKEDEV.man,v 1.1 2004/02/16 19:03:30 miod Exp
+.\" OpenBSD: MAKEDEV.mansub,v 1.1 2004/02/16 19:03:30 miod Exp
.\"
-.\" THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
-.\" IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
-.\" OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
-.\" IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
-.\" INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
-.\" NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-.\" DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-.\" THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-.\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
-.\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+.\" Copyright (c) 2004, Miodrag Vallat
+.\" Copyright (c) 2001-2004 Todd T. Fries <todd@OpenBSD.org>
.\"
+.\" Permission to use, copy, modify, and distribute this software for any
+.\" purpose with or without fee is hereby granted, provided that the above
+.\" copyright notice and this permission notice appear in all copies.
.\"
-.Dd September 2, 2003
+.\" THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+.\" WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+.\" MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+.\" ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+.\" WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+.\" ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+.\" OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+.\"
+.Dd February 16, 2004
.Dt MAKEDEV 8 mvme88k
.Os
.Sh NAME
@@ -36,72 +35,118 @@
.Op Ar ...
.Sh DESCRIPTION
The shell script
-.Nm MAKEDEV ,
+.Nm ,
found in the
.Pa /dev
-directory, is used to create the common special files.
+directory, is used to create various special files.
See
.Xr intro 4
for a more complete discussion of special files.
.Pp
-.Nm MAKEDEV
+.Nm
takes any number of device names as arguments, where the names are
-the common abbreviation for the device.
-There are three special device names,
-.Ar all ,
-.Ar std
-and
-.Ar local .
-If
-given,
-.Ar all
-creates device files for all devices on the mvme88k.
-If units are expected for a device,
-.Nm MAKEDEV
-will supply the standard numbers.
-The
-.Ar std
-argument creates only the standard devices for the mvme88k.
-Finally
-.Ar local
-is for devices specific to the local site, and executes the shell file
-.Pa MAKEDEV.local .
+the common abbreviation for the device or group of devices.
+.Pp
+Where a device name is followed by a star
+.Sq * ,
+the star must be replaced by a unit number.
+If units are expected for a device but not provided,
+.Nm
+will supply the standard numbers in most cases.
.Pp
-The mvme88k supports the following devices.
-Where a device name is followed by a hash sign ("#"), the hash sign
-must be replaced by a unit number.
+The mvme88k supports the following devices:
.Pp
-.Sy Pseudo\-names
-.Bl -tag -width indent -compact
+.Pp
+.Sy Special device names
+.Bl -tag -width tenletters -compact
.It Ar all
-All known devices for the mvme88k.
+Creates special files for all devices on mvme88k.
+.It Ar ramdisk
+Ramdisk kernel devices.
.It Ar std
-The standard devices (console, drum, fd/*, klog, kmem, mem, null, stderr,
-stdin, stdout, tty, zero).
+Creates the
+.Sq standard
+devices (console, drum, klog, kmem, ksyms, mem, null,
+stderr, stdin, stdout, tty, zero)
+which are absolutely necessary for the system to function properly.
.It Ar local
-Configuration specific devices.
+Creates configuration-specific devices.
.El
.Pp
-.Sy Device\-names
-.Bl -tag -width indent -compact
-.It Ar bpf#
-Berkeley packet filters.
-.It Ar cd#
-SCSI CD-ROM drives.
-.It Ar lkm
-Loadable kernel modules.
-.It Ar pty#
-Set of 16 master and slave pseudo terminals.
-.It Ar sd#
-SCSI disk drives.
-.It Ar st#
-SCSI tape drives.
-.It Ar tty#
-Onboard Serial ports.
-.It Ar vnd#
-.Dq File
+.Sy Disks
+.Bl -tag -width tenletters -compact
+.It Ar ccd*
+Concatenated disk devices.
+.It Ar cd*
+SCSI cdrom drives.
+.It Ar rd*
+.Dq rd
pseudo-disks.
+.It Ar sd*
+SCSI disks.
+.It Ar vnd*
+.Dq file
+pseudo-disk devices.
+.El
+.Pp
+.Sy Tapes
+.Bl -tag -width tenletters -compact
+.It Ar ch*
+SCSI media changers.
+.It Ar st*
+SCSI tape drives.
+.El
+.Pp
+.Sy Terminal ports
+.Bl -tag -width tenletters -compact
+.It Ar tty0*
+MVME1x7 CL-CD2400 serial ports.
+.It Ar ttya-b
+MVME188 serial ports.
+.It Ar ttyv*
+MVME332XT serial ports.
.El
+.Pp
+.Sy Pseudo terminals
+.Bl -tag -width tenletters -compact
+.It Ar ptm
+pty master device.
+.It Ar pty*
+Set of 16 master pseudo terminals.
+.It Ar tty*
+Set of 16 slave pseudo terminals.
+.El
+.Pp
+.Sy Special purpose devices
+.Bl -tag -width tenletters -compact
+.It Ar bpf*
+Berkeley Packet Filter.
+.It Ar fd
+fd/* nodes for fdescfs.
+.It Ar lkm
+Loadable kernel modules interface.
+.It Ar nvram0
+On-board non-volatile memory.
+.It Ar pf*
+Packet Filter.
+.It Ar *random
+In-kernel random data source.
+.It Ar sram0
+On-board static memory.
+.It Ar ss*
+SCSI scanners.
+.It Ar systrace*
+System call tracing device.
+.It Ar tun*
+Network tunnel driver.
+.It Ar vmel0
+VMEbus D32 space.
+.It Ar vmes0
+VMEbus D16 space.
+.It Ar uk*
+SCSI unknown devices.
+.It Ar xfs*
+XFS filesystem node.
.Sh FILES
.Bl -tag -width /dev -compact
.It Pa /dev
diff --git a/share/man/man8/man8.pegasos/MAKEDEV.8 b/share/man/man8/man8.pegasos/MAKEDEV.8
index b8c1ed086d0..de54e72c409 100644
--- a/share/man/man8/man8.pegasos/MAKEDEV.8
+++ b/share/man/man8/man8.pegasos/MAKEDEV.8
@@ -1,34 +1,29 @@
-.\" $OpenBSD: MAKEDEV.8,v 1.2 2004/01/13 19:27:19 jmc Exp $
-.\" Copyright (c) 1991 The Regents of the University of California.
-.\" All rights reserved.
+.\" $OpenBSD: MAKEDEV.8,v 1.3 2004/02/16 19:05:06 miod Exp $
.\"
-.\" Redistribution and use in source and binary forms, with or without
-.\" modification, are permitted provided that the following conditions
-.\" are met:
-.\" 1. Redistributions of source code must retain the above copyright
-.\" notice, this list of conditions and the following disclaimer.
-.\" 2. Redistributions in binary form must reproduce the above copyright
-.\" notice, this list of conditions and the following disclaimer in the
-.\" documentation and/or other materials provided with the distribution.
-.\" 3. Neither the name of the University nor the names of its contributors
-.\" may be used to endorse or promote products derived from this software
-.\" without specific prior written permission.
+.\" THIS FILE AUTOMATICALLY GENERATED. DO NOT EDIT.
+.\" generated from:
.\"
-.\" THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
-.\" ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-.\" IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-.\" ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
-.\" FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
-.\" DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
-.\" OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
-.\" HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-.\" LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
-.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
-.\" SUCH DAMAGE.
+.\" OpenBSD: etc.pegasos/MAKEDEV.md,v 1.6 2004/02/16 19:01:02 miod Exp
+.\" OpenBSD: MAKEDEV.common,v 1.1 2004/02/16 18:58:54 miod Exp
+.\" OpenBSD: MAKEDEV.man,v 1.1 2004/02/16 19:03:30 miod Exp
+.\" OpenBSD: MAKEDEV.mansub,v 1.1 2004/02/16 19:03:30 miod Exp
.\"
-.\" from: @(#)MAKEDEV.8 5.2 (Berkeley) 3/22/91
+.\" Copyright (c) 2004, Miodrag Vallat
+.\" Copyright (c) 2001-2004 Todd T. Fries <todd@OpenBSD.org>
.\"
-.Dd November 8, 2003
+.\" Permission to use, copy, modify, and distribute this software for any
+.\" purpose with or without fee is hereby granted, provided that the above
+.\" copyright notice and this permission notice appear in all copies.
+.\"
+.\" THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+.\" WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+.\" MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+.\" ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+.\" WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+.\" ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+.\" OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+.\"
+.Dd February 16, 2004
.Dt MAKEDEV 8 pegasos
.Os
.Sh NAME
@@ -40,118 +35,163 @@
.Op Ar ...
.Sh DESCRIPTION
The shell script
-.Nm MAKEDEV ,
+.Nm ,
found in the
.Pa /dev
-directory, is used to create the common special files.
+directory, is used to create various special files.
See
.Xr intro 4
for a more complete discussion of special files.
.Pp
-.Nm MAKEDEV
+.Nm
takes any number of device names as arguments, where the names are
-the common abbreviation for the device.
-There are four special device names,
-.Ar all ,
-.Ar std ,
-.Ar local
-and
-.Ar wscons .
-If
-given,
-.Ar all
-creates device files for all devices on the pegasos.
-If units are expected for a device,
-.Nm MAKEDEV
-will supply the standard numbers.
-The
-.Ar std
-argument creates only the standard devices for the pegasos.
-Finally
-.Ar local
-is for devices specific to the local site, and executes the shell file
-.Pa MAKEDEV.local .
+the common abbreviation for the device or group of devices.
.Pp
-The pegasos supports the following devices.
-Where a device name is followed by a hash sign ("#"), the hash sign
-must be replaced by a unit number.
+Where a device name is followed by a star
+.Sq * ,
+the star must be replaced by a unit number.
+If units are expected for a device but not provided,
+.Nm
+will supply the standard numbers in most cases.
.Pp
-.Sy Pseudo-names
-.Bl -tag -width wsmouse -compact
+The pegasos supports the following devices:
+.Pp
+.Pp
+.Sy Special device names
+.Bl -tag -width tenletters -compact
.It Ar all
-All known devices for the pegasos.
+Creates special files for all devices on pegasos.
+.It Ar ramdisk
+Ramdisk kernel devices.
.It Ar std
-The standard devices (console, drum, fd/*, klog, kmem, mem, null, stderr,
-stdin, stdout, tty, zero).
+Creates the
+.Sq standard
+devices (console, drum, klog, kmem, ksyms, mem, null,
+stderr, stdin, stdout, tty, zero)
+which are absolutely necessary for the system to function properly.
.It Ar local
-Configuration specific devices.
-.It Ar wscons
-All wscons-related devices.
+Creates configuration-specific devices.
.El
.Pp
-.Sy Device-names
-.Bl -tag -width wsmouse -compact
-.It Ar bpf#
-Berkeley packet filters.
-.It Ar ccd#
-.Dq Concatenated
-disk drives.
-.It Ar cd#
-SCSI CD-ROM drives.
-.It Ar ch#
-SCSI media changer drives.
-.It Ar lkm
-Loadable kernel modules.
-.It Ar pty#
-Set of 16 master and slave pseudo terminals.
-.It Ar raid#
-RAIDframe disk drives.
-.It Ar random
-In-kernel random number generator.
-.It Ar rd#
-.Dq Ramdisk
+.Sy Disks
+.Bl -tag -width tenletters -compact
+.It Ar ccd*
+Concatenated disk devices.
+.It Ar cd*
+SCSI cdrom drives.
+.It Ar raid*
+RAIDframe disk devices.
+.It Ar rd*
+.Dq rd
pseudo-disks.
-.It Ar sd#
-SCSI disk drives.
-.It Ar ss#
-SCSI scanners.
-.It Ar st#
+.It Ar sd*
+SCSI disks.
+.It Ar vnd*
+.Dq file
+pseudo-disk devices.
+.It Ar wd*
+.Dq winchester
+disk drives (ST506, IDE, ESDI, RLL, ...).
+.El
+.Pp
+.Sy Tapes
+.Bl -tag -width tenletters -compact
+.It Ar ch*
+SCSI media changers.
+.It Ar st*
SCSI tape drives.
-.It Ar tty#
-Serial ports.
-.It Ar ttyC#
-Wscons console screens.
-.It Ar ttyU#
-USB serial ports.
-.It Ar tun#
-Network tunnel devices.
-.It Ar uk#
-.Dq Unknown SCSI
-devices.
-.It Ar usb#
-USB control devices.
-.It Ar uhid#
-USB generic HID devices.
-.It Ar ulpt#
-USB printer devices.
-.It Ar urio#
-USB Diamond Multimedia Rio 500.
-.It Ar ugen#
-USB generic devices.
-.It Ar vnd#
-.Dq File
-pseudo-disks.
-.It Ar wd#
-IDE disk drives.
-.It Ar wskbd
-Keyboard devices for wscons.
-.It Ar wsmouse
-Mouse devices for wscons.
+.El
+.Pp
+.Sy Terminal ports
+.Bl -tag -width tenletters -compact
+.It Ar tty[0-7][0-9a-f]
+NS16x50 serial ports.
+.El
+.Pp
+.Sy Pseudo terminals
+.Bl -tag -width tenletters -compact
+.It Ar ptm
+pty master device.
+.It Ar pty*
+Set of 16 master pseudo terminals.
+.It Ar tty*
+Set of 16 slave pseudo terminals.
+.El
+.Pp
+.Sy Console ports
+.Bl -tag -width tenletters -compact
+.It Ar ttyC0
+Minimal wscons devices.
+.It Ar ttyC-F*
+wscons display devices.
+.It Ar wskbd*
+wscons keyboards.
.It Ar wsmux
-Multiplexor devices for wscons.
-.It Ar xfs#
-XFS filesystem devices.
+wscons keyboard/mouse mux devices.
+.El
+.Pp
+.Sy Pointing devices
+.Bl -tag -width tenletters -compact
+.It Ar wsmouse*
+wscons mice.
.El
+.Pp
+.Sy USB devices
+.Bl -tag -width tenletters -compact
+.It Ar usbs
+All USB devices.
+.It Ar ttyU*
+USB serial ports.
+.It Ar ugen*
+Generic USB devices.
+.It Ar uhid*
+Generic HID devices.
+.It Ar ulpt*
+Printer devices.
+.It Ar urio*
+Diamond Multimedia Rio 500.
+.It Ar usb*
+Bus control devices used by usbd for attach/detach.
+.It Ar uscanner*
+Scanners.
+.El
+.Pp
+.Sy Special purpose devices
+.Bl -tag -width tenletters -compact
+.It Ar audio*
+Audio devices.
+.It Ar bktr*
+Video frame grabbers.
+.It Ar bpf*
+Berkeley Packet Filter.
+.It Ar crypto
+Hardware crypto access driver.
+.It Ar fd
+fd/* nodes for fdescfs.
+.It Ar iop*
+I2O controller devices.
+.It Ar lkm
+Loadable kernel modules interface.
+.It Ar pci
+PCI bus device.
+.It Ar pf*
+Packet Filter.
+.It Ar radio*
+FM tuner devices.
+.It Ar *random
+In-kernel random data source.
+.It Ar ss*
+SCSI scanners.
+.It Ar systrace*
+System call tracing device.
+.It Ar tun*
+Network tunnel driver.
+.It Ar tuner*
+Tuner devices.
+.It Ar uk*
+SCSI unknown devices.
+.It Ar xfs*
+XFS filesystem node.
.Sh FILES
.Bl -tag -width /dev -compact
.It Pa /dev
diff --git a/share/man/man8/man8.sparc/MAKEDEV.8 b/share/man/man8/man8.sparc/MAKEDEV.8
index c21bc925453..a33649c10a1 100644
--- a/share/man/man8/man8.sparc/MAKEDEV.8
+++ b/share/man/man8/man8.sparc/MAKEDEV.8
@@ -1,34 +1,29 @@
-.\" $OpenBSD: MAKEDEV.8,v 1.15 2003/07/10 08:30:36 jmc Exp $
-.\" Copyright (c) 1991 The Regents of the University of California.
-.\" All rights reserved.
+.\" $OpenBSD: MAKEDEV.8,v 1.16 2004/02/16 19:05:06 miod Exp $
.\"
-.\" Redistribution and use in source and binary forms, with or without
-.\" modification, are permitted provided that the following conditions
-.\" are met:
-.\" 1. Redistributions of source code must retain the above copyright
-.\" notice, this list of conditions and the following disclaimer.
-.\" 2. Redistributions in binary form must reproduce the above copyright
-.\" notice, this list of conditions and the following disclaimer in the
-.\" documentation and/or other materials provided with the distribution.
-.\" 3. Neither the name of the University nor the names of its contributors
-.\" may be used to endorse or promote products derived from this software
-.\" without specific prior written permission.
+.\" THIS FILE AUTOMATICALLY GENERATED. DO NOT EDIT.
+.\" generated from:
.\"
-.\" THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
-.\" ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-.\" IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-.\" ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
-.\" FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
-.\" DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
-.\" OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
-.\" HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-.\" LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
-.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
-.\" SUCH DAMAGE.
+.\" OpenBSD: etc.sparc/MAKEDEV.md,v 1.22 2004/02/16 19:01:02 miod Exp
+.\" OpenBSD: MAKEDEV.common,v 1.1 2004/02/16 18:58:54 miod Exp
+.\" OpenBSD: MAKEDEV.man,v 1.1 2004/02/16 19:03:30 miod Exp
+.\" OpenBSD: MAKEDEV.mansub,v 1.1 2004/02/16 19:03:30 miod Exp
.\"
-.\" from: @(#)MAKEDEV.8 5.2 (Berkeley) 3/22/91
+.\" Copyright (c) 2004, Miodrag Vallat
+.\" Copyright (c) 2001-2004 Todd T. Fries <todd@OpenBSD.org>
.\"
-.Dd February 21, 1994
+.\" Permission to use, copy, modify, and distribute this software for any
+.\" purpose with or without fee is hereby granted, provided that the above
+.\" copyright notice and this permission notice appear in all copies.
+.\"
+.\" THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+.\" WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+.\" MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+.\" ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+.\" WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+.\" ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+.\" OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+.\"
+.Dd February 16, 2004
.Dt MAKEDEV 8 sparc
.Os
.Sh NAME
@@ -40,123 +35,154 @@
.Op Ar ...
.Sh DESCRIPTION
The shell script
-.Nm MAKEDEV ,
+.Nm ,
found in the
.Pa /dev
-directory, is used to create
-the common special
-files.
+directory, is used to create various special files.
See
.Xr intro 4
for a more complete discussion of special files.
.Pp
-.Nm MAKEDEV
+.Nm
takes any number of device names as arguments, where the names are
-the common abbreviation for the device.
-There are four special device names,
-.Ar all ,
-.Ar std ,
-.Ar local
-and
-.Ar wscons .
-If
-given,
-.Ar all
-creates device files for all devices on the sparc.
-If units are expected for a device,
-.Nm MAKEDEV
-will supply the standard numbers.
-The
-.Ar std
-argument creates only the standard devices for the sparc.
-Finally
-.Ar local
-is for devices specific to the local site, and executes the shell file
-.Pa MAKEDEV.local .
+the common abbreviation for the device or group of devices.
.Pp
-The sparc supports the following devices.
-Where a device name is followed by a hash sign ("#"), the hash sign
-must be replaced by a unit number.
+Where a device name is followed by a star
+.Sq * ,
+the star must be replaced by a unit number.
+If units are expected for a device but not provided,
+.Nm
+will supply the standard numbers in most cases.
.Pp
-.Sy Pseudo-names
-.Bl -tag -width openprom -compact
+The sparc supports the following devices:
+.Pp
+.Pp
+.Sy Special device names
+.Bl -tag -width tenletters -compact
.It Ar all
-All known devices for the sparc.
+Creates special files for all devices on sparc.
+.It Ar ramdisk
+Ramdisk kernel devices.
.It Ar std
-The standard devices (console, drum, fd/*, klog, kmem, mem, null, stderr,
-stdin, stdout, tty, zero).
+Creates the
+.Sq standard
+devices (console, drum, klog, kmem, ksyms, mem, null,
+stderr, stdin, stdout, tty, zero)
+which are absolutely necessary for the system to function properly.
.It Ar local
-Configuration specific devices.
-.It Ar wscons
-All wscons-related devices.
+Creates configuration-specific devices.
.El
.Pp
-.Sy Device-names
-.Bl -tag -width openprom -compact
-.It Ar audio
-Audio device.
-.It Ar bpf#
-Berkeley packet filters.
-.It Ar bpp#
-Bi-directional printer ports.
-.It Ar ccd#
-.Dq Concatenated
-disk drives.
-.It Ar cd#
-SCSI CD-ROM drives.
-.It Ar ch#
-SCSI media changer drives.
-.It Ar cua#
-Serial ports.
-.It Ar fd#
-.Dq Floppy
-disk drives.
-.It Ar lkm
-Loadable kernel modules.
-.It Ar magma#
-Magma serial/parallel interfaces.
-.It Ar openprom
-OPENPROM and EEPROM interface.
-.It Ar pty#
-Set of 16 master and slave pseudo terminals.
-.It Ar raid#
-RAIDframe disk drives.
-.It Ar random
-In-kernel random number generator.
-.It Ar rd#
-.Dq Ramdisk
-pseudo-disks.
-.It Ar sd#
-SCSI disk drives.
-.It Ar ses#
-SCSI SES/SAF-TE devices.
-.It Ar spif#
-SPARC serial/parallel interfaces.
-.It Ar st#
-SCSI tape drives.
-.It Ar tty#
-Serial ports.
-.It Ar ttyC#
-Wscons console screens.
-.It Ar tun#
-Network tunnel devices.
-.It Ar uk#
-.Dq Unknown SCSI
-devices.
-.It Ar vnd#
-.Dq File
+.Sy Disks
+.Bl -tag -width tenletters -compact
+.It Ar ccd*
+Concatenated disk devices.
+.It Ar cd*
+SCSI cdrom drives.
+.It Ar fd*
+Floppy disk drives (3 1/2", 5 1/4").
+.It Ar presto*
+Prestoserve NVRAM memory.
+.It Ar sd*
+SCSI disks.
+.It Ar rd*
+.Dq rd
pseudo-disks.
-.It Ar wskbd
-Keyboard devices for wscons.
-.It Ar wsmouse
-Mouse devices for wscons.
-.It Ar xd#
-Xylogic 450/451 disks.
-.It Ar xfs#
-XFS filesystem devices.
-.It Ar xy#
+.It Ar vnd*
+.Dq file
+pseudo-disk devices.
+.It Ar xd*
Xylogic 753/7053 disks.
+.It Ar xy*
+Xylogic 450/451 disks.
+.El
+.Pp
+.Sy Tapes
+.Bl -tag -width tenletters -compact
+.It Ar ch*
+SCSI media changers.
+.It Ar st*
+SCSI tape drives.
+.El
+.Pp
+.Sy Terminal ports
+.Bl -tag -width tenletters -compact
+.It Ar cua[a-z]*
+Zilog 8530 Serial Port.
+.It Ar tty[a-z]*
+Zilog 8530 Serial Port.
.El
+.Pp
+.Sy Pseudo terminals
+.Bl -tag -width tenletters -compact
+.It Ar ptm
+pty master device.
+.It Ar pty*
+Set of 16 master pseudo terminals.
+.It Ar tty*
+Set of 16 slave pseudo terminals.
+.El
+.Pp
+.Sy Console ports
+.Bl -tag -width tenletters -compact
+.It Ar ttyC0
+Minimal wscons devices.
+.It Ar ttyC-F*
+wscons display devices.
+.It Ar wskbd*
+wscons keyboards.
+.It Ar wsmux
+wscons keyboard/mouse mux devices.
+.El
+.Pp
+.Sy Pointing devices
+.Bl -tag -width tenletters -compact
+.It Ar wsmouse*
+wscons mice.
+.El
+.Pp
+.Sy Special purpose devices
+.Bl -tag -width tenletters -compact
+.It Ar audio*
+Audio devices.
+.It Ar bpf*
+Berkeley Packet Filter.
+.It Ar bpp*
+Parallel port.
+.It Ar bppmag[mno]
+Magma parallel port.
+.It Ar bpp[jkl]
+.Dq spif
+parallel port.
+.It Ar fd
+fd/* nodes for fdescfs.
+.It Ar lkm
+Loadable kernel modules interface.
+.It Ar openprom
+.
+.It Ar magma*
+Magma multiport cards.
+.It Ar pf*
+Packet Filter.
+.It Ar raid*
+RAIDframe disk devices.
+.It Ar *random
+In-kernel random data source.
+.It Ar spif*
+.Dq spif
+multiport cards.
+.It Ar ses*
+SES/SAF-TE SCSI devices.
+.It Ar ss*
+SCSI scanners.
+.It Ar systrace*
+System call tracing device.
+.It Ar tun*
+Network tunnel driver.
+.It Ar uk*
+SCSI unknown devices.
+.It Ar xfs*
+XFS filesystem node.
.Sh FILES
.Bl -tag -width /dev -compact
.It Pa /dev
diff --git a/share/man/man8/man8.sparc64/MAKEDEV.8 b/share/man/man8/man8.sparc64/MAKEDEV.8
index 6eb984860a5..05a3e9a4549 100644
--- a/share/man/man8/man8.sparc64/MAKEDEV.8
+++ b/share/man/man8/man8.sparc64/MAKEDEV.8
@@ -1,34 +1,29 @@
-.\" $OpenBSD: MAKEDEV.8,v 1.8 2004/01/13 19:27:19 jmc Exp $
-.\" Copyright (c) 1991 The Regents of the University of California.
-.\" All rights reserved.
+.\" $OpenBSD: MAKEDEV.8,v 1.9 2004/02/16 19:05:06 miod Exp $
.\"
-.\" Redistribution and use in source and binary forms, with or without
-.\" modification, are permitted provided that the following conditions
-.\" are met:
-.\" 1. Redistributions of source code must retain the above copyright
-.\" notice, this list of conditions and the following disclaimer.
-.\" 2. Redistributions in binary form must reproduce the above copyright
-.\" notice, this list of conditions and the following disclaimer in the
-.\" documentation and/or other materials provided with the distribution.
-.\" 3. Neither the name of the University nor the names of its contributors
-.\" may be used to endorse or promote products derived from this software
-.\" without specific prior written permission.
+.\" THIS FILE AUTOMATICALLY GENERATED. DO NOT EDIT.
+.\" generated from:
.\"
-.\" THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
-.\" ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-.\" IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-.\" ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
-.\" FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
-.\" DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
-.\" OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
-.\" HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-.\" LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
-.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
-.\" SUCH DAMAGE.
+.\" OpenBSD: etc.sparc64/MAKEDEV.md,v 1.31 2004/02/16 19:01:02 miod Exp
+.\" OpenBSD: MAKEDEV.common,v 1.1 2004/02/16 18:58:54 miod Exp
+.\" OpenBSD: MAKEDEV.man,v 1.1 2004/02/16 19:03:30 miod Exp
+.\" OpenBSD: MAKEDEV.mansub,v 1.1 2004/02/16 19:03:30 miod Exp
.\"
-.\" from: @(#)MAKEDEV.8 5.2 (Berkeley) 3/22/91
+.\" Copyright (c) 2004, Miodrag Vallat
+.\" Copyright (c) 2001-2004 Todd T. Fries <todd@OpenBSD.org>
.\"
-.Dd October 5, 2001
+.\" Permission to use, copy, modify, and distribute this software for any
+.\" purpose with or without fee is hereby granted, provided that the above
+.\" copyright notice and this permission notice appear in all copies.
+.\"
+.\" THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+.\" WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+.\" MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+.\" ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+.\" WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+.\" ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+.\" OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+.\"
+.Dd February 16, 2004
.Dt MAKEDEV 8 sparc64
.Os
.Sh NAME
@@ -40,117 +35,189 @@
.Op Ar ...
.Sh DESCRIPTION
The shell script
-.Nm MAKEDEV ,
+.Nm ,
found in the
.Pa /dev
-directory, is used to create
-the common special
-files.
+directory, is used to create various special files.
See
.Xr intro 4
for a more complete discussion of special files.
.Pp
-.Nm MAKEDEV
+.Nm
takes any number of device names as arguments, where the names are
-the common abbreviation for the device.
-There are four special device names,
-.Ar all ,
-.Ar std ,
-.Ar local
-and
-.Ar wscons .
-If
-given,
-.Ar all
-creates device files for all devices on the sparc64.
-If units are expected for a device,
-.Nm MAKEDEV
-will supply the standard numbers.
-The
-.Ar std
-argument creates only the standard devices for the sparc64.
-Finally
-.Ar local
-is for devices specific to the local site, and executes the shell file
-.Pa MAKEDEV.local .
+the common abbreviation for the device or group of devices.
.Pp
-The sparc64 supports the following devices.
-Where a device name is followed by a hash sign ("#"), the hash sign
-must be replaced by a unit number.
+Where a device name is followed by a star
+.Sq * ,
+the star must be replaced by a unit number.
+If units are expected for a device but not provided,
+.Nm
+will supply the standard numbers in most cases.
.Pp
-.Sy Pseudo-names
-.Bl -tag -width openprom -compact
+The sparc64 supports the following devices:
+.Pp
+.Pp
+.Sy Special device names
+.Bl -tag -width tenletters -compact
.It Ar all
-All known devices for the sparc64.
+Creates special files for all devices on sparc64.
+.It Ar ramdisk
+Ramdisk kernel devices.
.It Ar std
-The standard devices (console, drum, fd/*, klog, kmem, mem, null, stderr,
-stdin, stdout, tty, zero).
+Creates the
+.Sq standard
+devices (console, drum, klog, kmem, ksyms, mem, null,
+stderr, stdin, stdout, tty, zero)
+which are absolutely necessary for the system to function properly.
.It Ar local
-Configuration specific devices.
-.It Ar wscons
-All wscons-related devices.
+Creates configuration-specific devices.
.El
.Pp
-.Sy Device-names
-.Bl -tag -width openprom -compact
-.It Ar audio
-Audio device.
-.It Ar bpf#
-Berkeley packet filters.
-.It Ar ccd#
-.Dq Concatenated
-disk drives.
-.It Ar cd#
-SCSI CD-ROM drives.
-.It Ar ch#
-SCSI media changer drives.
-.It Ar cua#
-Serial ports.
-.It Ar fd#
-.Dq Floppy
-disk drives.
-.It Ar lkm
-Loadable kernel modules.
-.It Ar openprom
-OPENPROM and EEPROM interface.
-.It Ar pty#
-Set of 16 master and slave pseudo terminals.
-.It Ar raid#
-RAIDframe disk drives.
-.It Ar random
-In-kernel random number generator.
-.It Ar rd#
-.Dq Ramdisk
+.Sy Disks
+.Bl -tag -width tenletters -compact
+.It Ar ccd*
+Concatenated disk devices.
+.It Ar cd*
+SCSI cdrom drives.
+.It Ar fd*
+Floppy disk drives (3 1/2", 5 1/4").
+.It Ar raid*
+RAIDframe disk devices.
+.It Ar rd*
+.Dq rd
pseudo-disks.
-.It Ar sd#
-SCSI disk drives.
-.It Ar ses#
-SCSI SES/SAF-TE devices.
-.It Ar st#
+.It Ar sd*
+SCSI disks.
+.It Ar vnd*
+.Dq file
+pseudo-disk devices.
+.It Ar wd*
+.Dq winchester
+disk drives (ST506, IDE, ESDI, RLL, ...).
+.El
+.Pp
+.Sy Tapes
+.Bl -tag -width tenletters -compact
+.It Ar ch*
+SCSI media changers.
+.It Ar st*
SCSI tape drives.
-.It Ar tty#
-Serial ports.
-.It Ar ttyC#
-Wscons console screens.
-.It Ar ttyU#
-USB serial ports.
-.It Ar tun#
-Network tunnel devices.
-.It Ar uk#
-.Dq Unknown SCSI
-devices.
-.It Ar vnd#
-.Dq File
-pseudo-disks.
-.It Ar wskbd
-Keyboard devices for wscons.
-.It Ar wsmouse
-Mouse devices for wscons.
+.El
+.Pp
+.Sy Terminal ports
+.Bl -tag -width tenletters -compact
+.It Ar tty[0-7][0-9a-f]
+NS16x50 serial ports.
+.It Ar cua[a-z]*
+Zilog 8530 Serial Port.
+.It Ar tty[a-z]*
+Zilog 8530 Serial Port.
+.It Ar ttyh*
+Sab82532 serial devices.
+.El
+.Pp
+.Sy Pseudo terminals
+.Bl -tag -width tenletters -compact
+.It Ar ptm
+pty master device.
+.It Ar pty*
+Set of 16 master pseudo terminals.
+.It Ar tty*
+Set of 16 slave pseudo terminals.
+.El
+.Pp
+.Sy Console ports
+.Bl -tag -width tenletters -compact
+.It Ar console
+PROM console.
+.It Ar ttyC0
+Minimal wscons devices.
+.It Ar ttyC-F*
+wscons display devices.
+.It Ar wskbd*
+wscons keyboards.
.It Ar wsmux
-Multiplexor devices for wscons.
-.It Ar xfs#
-XFS filesystem devices.
+wscons keyboard/mouse mux devices.
.El
+.Pp
+.Sy Pointing devices
+.Bl -tag -width tenletters -compact
+.It Ar wsmouse*
+wscons mice.
+.El
+.Pp
+.Sy Printers
+.Bl -tag -width tenletters -compact
+.It Ar lpa*
+Polled printer port.
+.It Ar lpt*
+IEEE 1284 centronics printer.
+.El
+.Pp
+.Sy USB devices
+.Bl -tag -width tenletters -compact
+.It Ar usbs
+All USB devices.
+.It Ar ttyU*
+USB serial ports.
+.It Ar ugen*
+Generic USB devices.
+.It Ar uhid*
+Generic HID devices.
+.It Ar ulpt*
+Printer devices.
+.It Ar urio*
+Diamond Multimedia Rio 500.
+.It Ar usb*
+Bus control devices used by usbd for attach/detach.
+.It Ar uscanner*
+Scanners.
+.El
+.Pp
+.Sy Special purpose devices
+.Bl -tag -width tenletters -compact
+.It Ar audio*
+Audio devices.
+.It Ar bpf*
+Berkeley Packet Filter.
+.It Ar bpp*
+Parallel port.
+.It Ar bppmag[mno]
+Magma parallel port.
+.It Ar bpp[jkl]
+.Dq spif
+parallel port.
+.It Ar crypto
+Hardware crypto access driver.
+.It Ar fd
+fd/* nodes for fdescfs.
+.It Ar lkm
+Loadable kernel modules interface.
+.It Ar magma*
+Magma multiport cards.
+.It Ar pci
+PCI bus device.
+.It Ar pf*
+Packet Filter.
+.It Ar *random
+In-kernel random data source.
+.It Ar ses*
+SES/SAF-TE SCSI devices.
+.It Ar spif*
+.Dq spif
+multiport cards.
+.It Ar ss*
+SCSI scanners.
+.It Ar systrace*
+System call tracing device.
+.It Ar tun*
+Network tunnel driver.
+.It Ar uk*
+SCSI unknown devices.
+.It Ar uperf
+Performance counters.
+.It Ar xfs*
+XFS filesystem node.
.Sh FILES
.Bl -tag -width /dev -compact
.It Pa /dev
diff --git a/share/man/man8/man8.vax/MAKEDEV.8 b/share/man/man8/man8.vax/MAKEDEV.8
index 792d1bc2d51..d3fb048718b 100644
--- a/share/man/man8/man8.vax/MAKEDEV.8
+++ b/share/man/man8/man8.vax/MAKEDEV.8
@@ -1,34 +1,29 @@
-.\" $OpenBSD: MAKEDEV.8,v 1.14 2003/06/02 23:30:16 millert Exp $
-.\" Copyright (c) 1991 The Regents of the University of California.
-.\" All rights reserved.
+.\" $OpenBSD: MAKEDEV.8,v 1.15 2004/02/16 19:05:06 miod Exp $
.\"
-.\" Redistribution and use in source and binary forms, with or without
-.\" modification, are permitted provided that the following conditions
-.\" are met:
-.\" 1. Redistributions of source code must retain the above copyright
-.\" notice, this list of conditions and the following disclaimer.
-.\" 2. Redistributions in binary form must reproduce the above copyright
-.\" notice, this list of conditions and the following disclaimer in the
-.\" documentation and/or other materials provided with the distribution.
-.\" 3. Neither the name of the University nor the names of its contributors
-.\" may be used to endorse or promote products derived from this software
-.\" without specific prior written permission.
+.\" THIS FILE AUTOMATICALLY GENERATED. DO NOT EDIT.
+.\" generated from:
.\"
-.\" THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
-.\" ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-.\" IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-.\" ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
-.\" FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
-.\" DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
-.\" OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
-.\" HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-.\" LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
-.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
-.\" SUCH DAMAGE.
+.\" OpenBSD: etc.vax/MAKEDEV.md,v 1.16 2004/02/16 19:01:02 miod Exp
+.\" OpenBSD: MAKEDEV.common,v 1.1 2004/02/16 18:58:54 miod Exp
+.\" OpenBSD: MAKEDEV.man,v 1.1 2004/02/16 19:03:30 miod Exp
+.\" OpenBSD: MAKEDEV.mansub,v 1.1 2004/02/16 19:03:30 miod Exp
.\"
-.\" from: @(#)MAKEDEV.8 5.2 (Berkeley) 3/22/91
+.\" Copyright (c) 2004, Miodrag Vallat
+.\" Copyright (c) 2001-2004 Todd T. Fries <todd@OpenBSD.org>
.\"
-.Dd March 22, 1991
+.\" Permission to use, copy, modify, and distribute this software for any
+.\" purpose with or without fee is hereby granted, provided that the above
+.\" copyright notice and this permission notice appear in all copies.
+.\"
+.\" THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+.\" WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+.\" MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+.\" ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+.\" WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+.\" ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+.\" OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+.\"
+.Dd February 16, 2004
.Dt MAKEDEV 8 vax
.Os
.Sh NAME
@@ -40,140 +35,150 @@
.Op Ar ...
.Sh DESCRIPTION
The shell script
-.Nm MAKEDEV ,
+.Nm ,
found in the
.Pa /dev
-directory, is used to create the common special files.
+directory, is used to create various special files.
See
.Xr intro 4
for a more complete discussion of special files.
.Pp
-.Nm MAKEDEV
+.Nm
takes any number of device names as arguments, where the names are
-the common abbreviation for the device.
-There are three special device names,
-.Ar all ,
-.Ar std
-and
-.Ar local .
-If
-given,
-.Ar all
-creates device files for all devices on the vax.
-If units are expected for a device,
-.Nm MAKEDEV
-will supply the standard numbers.
-The
-.Ar std
-argument creates only the standard devices for the vax.
-Finally
-.Ar local
-is for devices specific to the local site, and executes the shell file
-.Pa MAKEDEV.local .
+the common abbreviation for the device or group of devices.
.Pp
-The vax supports the following devices.
-Where a device name is followed by a hash sign ("#"), the hash sign
-must be replaced by a unit number.
+Where a device name is followed by a star
+.Sq * ,
+the star must be replaced by a unit number.
+If units are expected for a device but not provided,
+.Nm
+will supply the standard numbers in most cases.
.Pp
-.Sy Pseudo\-names
-.Bl -tag -width indent -compact
+The vax supports the following devices:
+.Pp
+.Pp
+.Sy Special device names
+.Bl -tag -width tenletters -compact
.It Ar all
-All known devices for the vax.
+Creates special files for all devices on vax.
+.It Ar ramdisk
+Ramdisk kernel devices.
.It Ar std
-The standard devices (console, drum, fd/*, klog, kmem, mem, null, stderr,
-stdin, stdout, tty, zero).
+Creates the
+.Sq standard
+devices (console, drum, klog, kmem, ksyms, mem, null,
+stderr, stdin, stdout, tty, zero)
+which are absolutely necessary for the system to function properly.
.It Ar local
-Configuration specific devices.
+Creates configuration-specific devices.
.El
.Pp
-.Sy Device\-names
-.Bl -tag -width indent -compact
-.It Ar ad#
-UNIBUS interface to Data Translation A/D converter.
-.It Ar bpf#
-Berkeley Packet Filters.
-.It Ar ccd#
-.Dq Concatenated
-pseudo-disks.
-.It Ar cd#
-SCSI CD-ROM drives.
-.It Ar ch#
-SCSI changer.
-.It Ar ct#
-UNIBUS parallel interface to CAT typesetter.
-.It Ar dh#
-UNIBUS DH11 and emulations (e.g. Able DMAX, Emulex CS-11).
-.It Ar dhu#
-UNIBUS DHU11.
-.It Ar dmf#
-UNIBUS DMF32.
-.It Ar dmz#
-UNIBUS DMZ32.
-.It Ar dn#
-UNIBUS DN11 and emulations (e.g. Able Quadracall).
-.It Ar dz#
-UNIBUS DZ11 and DZ32.
-.It Ar hk#
-UNIBUS RK06 and RK07.
-.It Ar hp#
-MASSBUS RM??.
-.It Ar ht#
-MASSBUS TM03 & TU??.
-.It Ar ik#
-UNIBUS interface to Ikonas frame buffer.
-.It Ar lp#
-UNIBUS LP11 parallel interface.
-.It Ar md#
-.Dq Memory
-pseudo-disk devices.
-.It Ar mt#
-MSCP tape drives (TU81, TK50, etc.).
-.It Ar np#
-UNIBUS Ethernet co-processor interface, for downloading.
-.It Ar ps#
-UNIBUS interface to E&S Picture System 2.
-.It Ar pty#
-Set of master and slave pseudo terminals.
-.It Ar qv#
-QVSS (MicroVAX) display.
-.It Ar ra#
-UNIBUS UDA50 w/ RA??.
-.It Ar random
-Random number generator.
-.It Ar rb#
+.Sy Disks
+.Bl -tag -width tenletters -compact
+.It Ar ccd*
+Concatenated disk devices.
+.It Ar cd*
+SCSI cdrom drives.
+.It Ar fd*
+Floppy disk drives (3 1/2", 5 1/4").
+.It Ar hk*
+UNIBUS RK06 and RK07 disks.
+.It Ar hd*
+HP300 HP-IB disks.
+.It Ar hp*
+MASSBUSS disks.
+.It Ar ra*
+MSCP disks.
+.It Ar rb*
730 IDC w/ RB80 and/or RB02.
-.It Ar rl#
+.It Ar rd*
+.Dq rd
+pseudo-disks.
+.It Ar rl*
UNIBUS RL02.
-.It Ar rx#
-UNIBUS RX211 floppy disk.
-.It Ar sd#
+.It Ar rx*
+RX02 floppy disks.
+.It Ar sd*
SCSI disks.
-.It Ar ss#
-SCSI scanner.
-.It Ar st#
+.It Ar up*
+Other UNIBUS devices.
+.It Ar vnd*
+.Dq file
+pseudo-disk devices.
+.El
+.Pp
+.Sy Tapes
+.Bl -tag -width tenletters -compact
+.It Ar ch*
+SCSI media changers.
+.It Ar ht*
+MASSBUS TM03 and TU?? devices.
+.It Ar mt*
+(Magnetic) 9-track reel tape drives.
+.It Ar st*
SCSI tape drives.
-.It Ar tm#
-UNIBUS TM11 & TE10 emulations (e.g. Emulex TC-11).
-.It Ar ts#
+.It Ar tm*
+UNIBUS TM11 and TE10 emulations (e.g. Emulex TC-11).
+.It Ar ts*
UNIBUS TS11.
-.It Ar ttyv0
-QVSS (MicroVAX) display reserved pty.
-.It Ar uk#
-SCSI unknown.
-.It Ar up#
-Other UNIBUS devices (e.g. on Emulex SC-21V controller).
-.It Ar ut#
+.It Ar ut*
UNIBUS TU45 emulations (e.g. 9700).
-.It Ar uu#
-TU58 cassettes on DL11 controller.
-.It Ar va#
-UNIBUS Varian parallel interface.
-.It Ar vnd#
-.Dq File
-pseudo-disks.
-.It Ar vp#
-UNIBUS Versatec parallel interface.
.El
+.Pp
+.Sy Terminal ports
+.Bl -tag -width tenletters -compact
+.It Ar dh*
+UNIBUS DH11 and emulations (e.g. Able dmax, Emulex CS-11).
+.It Ar dhu*
+UNIBUS DHU11.
+.It Ar dl*
+UNIBUS DL11.
+.It Ar dmf*
+UNIBUS DMF32.
+.It Ar dmz*
+UNIBUS DMZ32.
+.It Ar dz*
+UNIBUS DZ11 and DZ32.
+.It Ar vt*
+console.
+.El
+.Pp
+.Sy Pseudo terminals
+.Bl -tag -width tenletters -compact
+.It Ar ptm
+pty master device.
+.It Ar pty*
+Set of 16 master pseudo terminals.
+.It Ar tty*
+Set of 16 slave pseudo terminals.
+.El
+.Pp
+.Sy Special purpose devices
+.Bl -tag -width tenletters -compact
+.It Ar bpf*
+Berkeley Packet Filter.
+.It Ar fd
+fd/* nodes for fdescfs.
+.It Ar lkm
+Loadable kernel modules interface.
+.It Ar pf*
+Packet Filter.
+.It Ar raid*
+RAIDframe disk devices.
+.It Ar *random
+In-kernel random data source.
+.It Ar ses*
+SES/SAF-TE SCSI devices.
+.It Ar ss*
+SCSI scanners.
+.It Ar systrace*
+System call tracing device.
+.It Ar tun*
+Network tunnel driver.
+.It Ar uk*
+SCSI unknown devices.
+.It Ar xfs*
+XFS filesystem node.
.Sh FILES
.Bl -tag -width /dev -compact
.It Pa /dev