Regen

1 files changed, 198 insertions, 209 deletions

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*)