sync

1 files changed, 174 insertions, 75 deletions

diff --git a/etc/etc.sparc64/MAKEDEV b/etc/etc.sparc64/MAKEDEV
index 234d5b0c04b..369f8bae141 100644
--- a/etc/etc.sparc64/MAKEDEV
+++ b/etc/etc.sparc64/MAKEDEV
@@ -1,6 +1,13 @@
 #!/bin/sh -
 #
-#	$OpenBSD: MAKEDEV,v 1.25 2001/11/16 20:52:18 todd Exp $
+# THIS FILE AUTOMATICALLY GENERATED.  DO NOT EDIT.
+# generated from:
+#
+#	OpenBSD: etc.sparc64/MAKEDEV.md,v 1.1 2002/01/04 09:25:35 todd Exp 
+#	OpenBSD: MAKEDEV.mi,v 1.1 2002/01/04 09:25:35 todd Exp 
+#	OpenBSD: MAKEDEV.sub,v 1.1 2002/01/04 09:25:35 todd Exp 
+#
+#	$OpenBSD: MAKEDEV,v 1.26 2002/01/04 09:37:30 todd Exp $
 #
 # Copyright (c) 2001 Todd T. Fries <todd@OpenBSD.org>
 # All rights reserved.
@@ -43,6 +50,9 @@
 #	ccd*	concatenated disk devices
 #	raid*	RAIDframe disk devices
 # Console ports:
+#	ttyC0	wscons screen 0
+#	wskbd*	wscons keyboards
+#	wsmux	wscons keyboard/mouse mux devices
 #	console	PROM console
 # Pointing devices:
 #	mouse	mouse (provides events, for X11)
@@ -57,17 +67,12 @@
 # Special purpose devices:
 #	ses*	SES/SAF-TE SCSI devices
 #	fd	makes fd/* for the fdescfs
-#	bwtwo*	
 #	xfs*	XFS filesystem devices
-#	cgthree*	
 #	ss*	SCSI scanners
 #	uk*	SCSI Unknown device
 #	audio*	audio device
-#	cgsix*	
 #	pf*	Packet Filter
 #	altq/	ALTQ control interface
-#	cgfourteen*	
-#	tcx*	
 #	bpf*	Berkeley Packet Filter
 #	tun*	network tunnel driver
 #	lkm	loadable kernel modules interface
@@ -177,89 +182,116 @@ U=`unt $i`
 [ "$U" ] || U=0
 
 case $i in
-all)
-	R std fd wd0 wd1 wd2 wd3 sd0 sd1 sd2
-	R pty0 pty1 st0 st1 ch0 cd0 cd1
-	R vnd0 vnd1 ccd0 ccd1 ccd2 ccd3
-	R raid0 raid1 raid2 raid3
-	R bpf0 bpf1 bpf2 bpf3 bpf4 bpf5 bpf6 bpf7 bpf8 bpf9
-	R pf altq tun0 tun1 tun2 random ses0 uk0 uk1 ss0 ss1
-	R fd0 fd0B fd0C fd0D fd0E fd0F fd0G fd0H
-	R fd1 fd1B fd1C fd1D fd1E fd1F fd1G fd1H
-	R xfs0 tcx0 lkm audio0 local crypto
-	R ttya ttyb ttyc ttyd cuaa cuab cuac cuad
-	R tty00 tty01 tty02 tty03 ttyh0 ttyh1
-	;;
 floppy)
 	R std fd0 wd0 wd1 sd0 sd1
 	R st0 cd0 random
 	;;
+
 ramdisk)
 	R std lkm random
 	R fd0 rd0 wd0 wd1 wd2 wd3 bpf0
 	R sd0 sd1 sd2 sd3 st0 st1 cd0 cd1
 	;;
-std)M console	c 0 0 600
+
+std)
+	M console	c 0 0 600
 	M tty		c 2 0
+	M mem		c 3 0 640 kmem
+	M kmem		c 3 1 640 kmem
 	M null		c 3 2
 	M zero		c 3 12
-	M mouse		c 13 0 666
-	M klog		c 16 0 600
-	M fb		c 22 0 666
 	M stdin		c 24 0
 	M stdout	c 24 1
 	M stderr	c 24 2
-	M kbd		c 29 0 666
-	M mem		c 3 0 640 kmem
-	M kmem		c 3 1 640 kmem
 	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 644
 	;;
+
 mouse*)name=${i##mouse-}
 	if [ ! -c $name ]; then
 		$0 $name	# make the appropriate device
 	fi
 	RMlist="$RMlist mouse"
 	MKlist="$MKlist;ln -s $name mouse";;
-crypto)M crypto c 75 0;;
-*random)n=0
+
+crypto)
+	M crypto c 75 0
+	;;
+
+*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 kmem;;tun*)M tun$U c 111 $U 600;;
-bpf*)M bpf$U c 105 $U 600;;
-tcx*)M tcx$U c 109 $U;;
-cgfourteen*)M cgfourteen$U c 99 $U;;
-altq)RMlist="mkdir -p altq;$RMlist"
+	done
+	;;
+
+lkm)
+	M lkm c 112 0 640 kmem
+	;;
+
+tun*)
+	M tun$U c 111 $U 600
+	;;
+
+bpf*)
+	M bpf$U c 105 $U 600
+	;;
+
+altq)
+	RMlist="mkdir -p altq;$RMlist"
 	for d in altq cbq wfq afm fifoq red rio localq hfsc cdnr blue priq; do
 		M altq/$d c 74 $U 644
 		U=$(($U+1))
-	done;;
-pf*)M pf c 73 0 600;;
-cgsix*)M cgsix$U c 67 $U 666;;
-audio*)M sound$U	c 69 $U
+	done
+	;;
+
+pf*)
+	M pf c 73 0 600
+	;;
+
+audio*)
+	M sound$U	c 69 $U
 	M mixer$U	c 69 $(($U+16))
 	M audio$U	c 69 $(($U+128))
 	M audioctl$U	c 69 $(($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";;
-uk*)M uk$U c 60 $U 640 operator;;
-ss*)M ss$U c 59 $U 440 operator
+	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 440 operator
 	RMlist="$RMlist scan$U"
-	MKlist="$MKlist;umask 77;ln -s ss$U scan$U";;
-cgthree*)M cgthree$U c 55 $U 666;;
-xfs*)M xfs$U c 51 $U 600;;
-bwtwo*)M bwtwo$U c 27 $U 666;;
-fd)RMlist="mkdir -p fd;$RMlist" n=0
+	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;;
-pty*)case $U in
+	MKlist="$MKlist;chmod 555 fd"
+	;;
+
+ses*)
+	M ses$U c 4 $U 640 operator
+	;;
+
+pty*)
+	case $U in
 	0) off=0 name=p;;
 	1) off=16 name=q;;
 	2) off=32 name=r;;
@@ -286,11 +318,20 @@ pty*)case $U in
 		M tty$nam c 20 $(($off+$n))
 		M pty$nam c 21 $(($off+$n))
 		n=$(($n+1))
-	done;;
-ttyh*)M ttyh$U c 77 $U 660 dialer uucp;;
-tty0*)M tty$U c 36 $U 660 dialer uucp
-	M cua$U c 36 $(($U+128)) 660 dialer uucp;;
-cua[a-z])u=${i#cua*}
+	done
+	;;
+
+ttyh*)
+	M ttyh$U c 77 $U 660 dialer uucp
+	;;
+
+tty0*)
+	M tty$U c 36 $U 660 dialer uucp
+	M cua$U c 36 $(($U+128)) 660 dialer uucp
+	;;
+
+cua[a-z])
+	u=${i#cua*}
 	case $u in
 	a) n=0 ;;
 	b) n=1 ;;
@@ -298,8 +339,11 @@ cua[a-z])u=${i#cua*}
 	d) n=5 ;;
 	*) echo unknown cua device $i ;;  
 	esac
-	M cua$u c 12 $(($n+128)) 660 dialer uucp;;
-tty[a-z])u=${i#tty*}
+	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 ;;
@@ -307,12 +351,41 @@ tty[a-z])u=${i#tty*}
 	d) n=5 ;;
 	*) echo unknown tty device $i ;;
 	esac
-	M tty$u c 12 $n 660 dialer uucp;;
-mouse)M mouse c 30 0 666 ;;rd*)dodisk2 rd $U 5 61 $U 0;;
-vnd*)dodisk vnd $U 8 110 $U 0
-	dodisk svnd $U 8 110 $U 128;;
-cd*)dodisk2 cd $U 18 58 $U 0;;
-fd*)typnam=$U${i#fd[01]*}
+	M tty$u c 12 $n 660 dialer uucp
+	;;
+
+mouse)
+	M mouse c 30 0 666 
+	;;
+
+wsmux|wsmouse|wskbd)
+	M wsmouse c 69 0 600
+	M wskbd c 69 1 600
+	;;
+
+wskbd*)
+	M wskbd$U c 67 $U 600
+	;;
+
+wscons)
+	R ttyCcfg wsmux wskbd0 wskbd1 wskbd2 wskbd3
+	;;
+
+rd*)
+	dodisk2 rd $U 5 61 $U 0
+	;;
+
+vnd*)
+	dodisk vnd $U 8 110 $U 0
+	dodisk svnd $U 8 110 $U 128
+	;;
+
+cd*)
+	dodisk2 cd $U 18 58 $U 0
+	;;
+
+fd*)
+	typnam=$U${i#fd[01]*}
 	case $typnam in
 	0|1)	typnum=0;; # no type specified, assume A
 	*A)		typnam=0; typnum=0;;
@@ -336,23 +409,49 @@ fd*)typnam=$U${i#fd[01]*}
 	M ${nam}c	b $blk $(($n+2)) 640 operator
 	M r${nam}a	c $chr $n 640 operator
 	M r${nam}b	c $chr $(($n+1)) 640 operator
-	M r${nam}c	c $chr $(($n+2)) 640 operator;;
-ch*)M ch$U c 19 $U 660 operator;;
-st*)n=$(($U*16))
+	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;;
-local)test -s $T.local && sh $T.local;;
-sd*|ccd*|raid*|wd*)case $i in
+	done
+	;;
+
+local)
+	test -s $T.local && sh $T.local
+	;;
+
+all)
+	R std fd sd0 sd1 sd2 sd3 sd4 pty0 pty1 st0 st1 ch0 cd0 cd1
+	R vnd0 vnd1 vnd2 vnd3 ccd0 ccd1 ccd2 ccd3 wd0 wd1 wd2 wd3
+	R raid0 raid1 raid2 raid3
+	R bpf0 bpf1 bpf2 bpf3 bpf4 bpf5 bpf6 bpf7 bpf8 bpf9
+	R tun0 tun1 tun2 tun3 altq pf crypto ttyh0 ttyh1
+	R fd0 fd0B fd0C fd0D fd0E fd0F fd0G fd0H
+	R fd1 fd1B fd1C fd1D fd1E fd1F fd1G fd1H ttya ttyb ttyc ttyd
+	R cuaa cuab cuac cuad lkm random ses0 uk0 uk1 ss0 ss1
+	R tty00 tty01 tty02 tty03 xfs0 audio0
+	;;
+
+sd*|ccd*|raid*|wd*)
+	case $i in
 	sd*) n=sd b=7 c=17;;
 	ccd*) n=ccd b=9 c=23;;
 	raid*) n=raid b=25 c=121;;
 	wd*) n=wd b=12 c=26;;
 	esac
-	dodisk $n $U $b $c $U 0;;
+	dodisk $n $U $b $c $U 0
+	;;
+
 *)
 	echo $i: unknown device
 	;;
@@ -364,12 +463,12 @@ if [ "$os" = "SunOS" ]; then
 	eo=transform
 	transform() {
 		case $mode in
-		600)mask=077;;
-		640)mask=027;;
-		660)mask=007;;
-		644)mask=022;;
-		666)mask=0;;
-		440)mask=227;;
+		600) mask=077;;
+		640) mask=027;;
+		660) mask=007;;
+		644) mask=022;;
+		666) mask=0;;
+		440) mask=227;;
 		esac
 		echo `echo "$@"|sed \
 			's/mknod -m \([0-9]*\) /umask '$mask';mknod /;s/-m [0-9]* //g;\