Module Name: src
Committed By: apb
Date: Tue Sep 6 14:40:11 UTC 2011
Modified Files:
src/etc/etc.alpha: MAKEDEV.conf
src/etc/etc.amiga: MAKEDEV.conf
src/etc/etc.amigappc: MAKEDEV.conf
src/etc/etc.atari: MAKEDEV.conf
src/etc/etc.emips: MAKEDEV.conf
src/etc/etc.evbppc: MAKEDEV.conf
src/etc/etc.hp300: MAKEDEV.conf
src/etc/etc.mvme68k: MAKEDEV.conf
src/etc/etc.ofppc: MAKEDEV.conf
src/etc/etc.pmax: MAKEDEV.conf
src/etc/etc.sandpoint: MAKEDEV.conf
src/etc/etc.sparc: MAKEDEV.conf
src/etc/etc.vax: MAKEDEV.conf
src/etc/etc.x68k: MAKEDEV.conf
Log Message:
Change foo*) case patterns to foo[0-9]*) in MD MAKEDEV.conf files,
as was done earlier today for the MI MAKEDEV.tmpl. There are
also a few instances of slightly different changes in the
case patterns.
To generate a diff of this commit:
cvs rdiff -u -r1.7 -r1.8 src/etc/etc.alpha/MAKEDEV.conf
cvs rdiff -u -r1.10 -r1.11 src/etc/etc.amiga/MAKEDEV.conf
cvs rdiff -u -r1.1 -r1.2 src/etc/etc.amigappc/MAKEDEV.conf
cvs rdiff -u -r1.8 -r1.9 src/etc/etc.atari/MAKEDEV.conf
cvs rdiff -u -r1.1 -r1.2 src/etc/etc.emips/MAKEDEV.conf
cvs rdiff -u -r1.7 -r1.8 src/etc/etc.evbppc/MAKEDEV.conf
cvs rdiff -u -r1.12 -r1.13 src/etc/etc.hp300/MAKEDEV.conf
cvs rdiff -u -r1.6 -r1.7 src/etc/etc.mvme68k/MAKEDEV.conf
cvs rdiff -u -r1.7 -r1.8 src/etc/etc.ofppc/MAKEDEV.conf
cvs rdiff -u -r1.7 -r1.8 src/etc/etc.pmax/MAKEDEV.conf
cvs rdiff -u -r1.13 -r1.14 src/etc/etc.sandpoint/MAKEDEV.conf
cvs rdiff -u -r1.13 -r1.14 src/etc/etc.sparc/MAKEDEV.conf
cvs rdiff -u -r1.11 -r1.12 src/etc/etc.vax/MAKEDEV.conf
cvs rdiff -u -r1.9 -r1.10 src/etc/etc.x68k/MAKEDEV.conf
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/etc/etc.alpha/MAKEDEV.conf
diff -u src/etc/etc.alpha/MAKEDEV.conf:1.7 src/etc/etc.alpha/MAKEDEV.conf:1.8
--- src/etc/etc.alpha/MAKEDEV.conf:1.7 Mon Jan 15 23:35:11 2007
+++ src/etc/etc.alpha/MAKEDEV.conf Tue Sep 6 14:40:10 2011
@@ -1,4 +1,4 @@
-# $NetBSD: MAKEDEV.conf,v 1.7 2007/01/15 23:35:11 hubertf Exp $
+# $NetBSD: MAKEDEV.conf,v 1.8 2011/09/06 14:40:10 apb Exp $
all_md)
makedev wscons stic0 sd0 sd1 sd2 sd3 sd4
@@ -30,9 +30,7 @@
makedev ttyB0 ttyB1 ttyC0 ttyC1 ttyE0 ttyE1 wsmouse0 wskbd0 ttyEcfg
;;
-ttyB*)
- case $i in
- ttyB*) name=ttyB; unit=${i#ttyB}; major=15; minor=$(($unit * 2));;
- esac
+ttyB[0-9]*)
+ name=ttyB; unit=${i#ttyB}; major=15; minor=$(($unit * 2))
mkdev $name$unit c $major $minor "" "" $u_uucp
;;
Index: src/etc/etc.amiga/MAKEDEV.conf
diff -u src/etc/etc.amiga/MAKEDEV.conf:1.10 src/etc/etc.amiga/MAKEDEV.conf:1.11
--- src/etc/etc.amiga/MAKEDEV.conf:1.10 Mon Jan 15 23:35:11 2007
+++ src/etc/etc.amiga/MAKEDEV.conf Tue Sep 6 14:40:10 2011
@@ -1,4 +1,4 @@
-# $NetBSD: MAKEDEV.conf,v 1.10 2007/01/15 23:35:11 hubertf Exp $
+# $NetBSD: MAKEDEV.conf,v 1.11 2011/09/06 14:40:10 apb Exp $
all_md)
makedev wscons std_amiga fd0 fd1 fd2 fd3 kbd mouse0 mouse1 par0
@@ -33,7 +33,7 @@
mkdev reload c 2 20
;;
-tty0*|ttyA*|ttyB*)
+tty0[0-9]*|ttyA[0-9]*|ttyB[0-9]*)
case $i in
tty0*) name=tty0; mname=ttym; unit=${i#tty0}; chr=12; mult=1; add=128;;
ttyA*) name=ttyA; mname=ttyAm; unit=${i#ttyA}; chr=17; mult=1; add=128;;
@@ -43,7 +43,7 @@
mkdev $mname$unit c $chr $(($unit * $mult + $add)) "" "" $u_uucp
;;
-grf*)
+grf[0-9]*)
unit=${i#grf}; chr=10
case $unit in
0|1|2|3|4|5|6|7)
Index: src/etc/etc.amigappc/MAKEDEV.conf
diff -u src/etc/etc.amigappc/MAKEDEV.conf:1.1 src/etc/etc.amigappc/MAKEDEV.conf:1.2
--- src/etc/etc.amigappc/MAKEDEV.conf:1.1 Wed Jan 11 16:06:36 2006
+++ src/etc/etc.amigappc/MAKEDEV.conf Tue Sep 6 14:40:10 2011
@@ -1,4 +1,4 @@
-# $NetBSD: MAKEDEV.conf,v 1.1 2006/01/11 16:06:36 is Exp $
+# $NetBSD: MAKEDEV.conf,v 1.2 2011/09/06 14:40:10 apb Exp $
all_md)
makedev wscons std_amiga fd0 fd1 fd2 fd3 kbd mouse0 mouse1 par0
@@ -31,7 +31,7 @@
mkdev reload c 2 20
;;
-tty0*|ttyA*|ttyB*)
+tty0[0-9]*|ttyA[0-9]*|ttyB[0-9]*)
case $i in
tty0*) name=tty0; mname=ttym; unit=${i#tty0}; chr=12; mult=1; add=128;;
ttyA*) name=ttyA; mname=ttyAm; unit=${i#ttyA}; chr=17; mult=1; add=128;;
@@ -41,7 +41,7 @@
mkdev $mname$unit c $chr $(($unit * $mult + $add)) "" "" $u_uucp
;;
-grf*)
+grf[0-9]*)
unit=${i#grf}; chr=10
case $unit in
0|1|2|3|4|5|6|7)
Index: src/etc/etc.atari/MAKEDEV.conf
diff -u src/etc/etc.atari/MAKEDEV.conf:1.8 src/etc/etc.atari/MAKEDEV.conf:1.9
--- src/etc/etc.atari/MAKEDEV.conf:1.8 Sat Nov 8 22:34:57 2008
+++ src/etc/etc.atari/MAKEDEV.conf Tue Sep 6 14:40:10 2011
@@ -1,4 +1,4 @@
-# $NetBSD: MAKEDEV.conf,v 1.8 2008/11/08 22:34:57 abs Exp $
+# $NetBSD: MAKEDEV.conf,v 1.9 2011/09/06 14:40:10 apb Exp $
all_md)
makedev std_atari st0 ttye0 ttye1 ttye2 ttye3 ttye4 ttye5 grf0 grf1
@@ -26,7 +26,7 @@
mkdev reload c 2 20 640 $g_kmem
;;
-ttyA*|ttyB*)
+ttyA[0-9]*|ttyB[0-9]*)
case $i in
ttyA*) name=tyA; unit=${i#ttyA}; major=7; minor=$(($unit * 16));;
ttyB*) name=tyB; unit=${i#ttyB}; major=35; minor=$unit;;
@@ -35,7 +35,7 @@
mkdev d$name$unit c $major $(($minor + $dialout )) "" "" $u_uucp
;;
-lpt*)
+lpt[0-9]*)
unit=${i#lpt}
mkdev lpt$unit c 29 $unit
;;
Index: src/etc/etc.emips/MAKEDEV.conf
diff -u src/etc/etc.emips/MAKEDEV.conf:1.1 src/etc/etc.emips/MAKEDEV.conf:1.2
--- src/etc/etc.emips/MAKEDEV.conf:1.1 Wed Jan 26 01:18:47 2011
+++ src/etc/etc.emips/MAKEDEV.conf Tue Sep 6 14:40:10 2011
@@ -1,4 +1,4 @@
-# $NetBSD: MAKEDEV.conf,v 1.1 2011/01/26 01:18:47 pooka Exp $
+# $NetBSD: MAKEDEV.conf,v 1.2 2011/09/06 14:40:10 apb Exp $
all_md)
makedev minimal
@@ -14,10 +14,8 @@
# Serial devices: dz*.
#
# Create dz* devices as /dev/ttyD[0-3],
-dz*)
- case $i in
- dz*) name=dz; unit=${i#dz}; chr=16;;
- esac
+dz[0-9]*)
+ name=dz; unit=${i#dz}; chr=16
case $unit in
0)
mkdev ttyD0 c $chr 0
Index: src/etc/etc.evbppc/MAKEDEV.conf
diff -u src/etc/etc.evbppc/MAKEDEV.conf:1.7 src/etc/etc.evbppc/MAKEDEV.conf:1.8
--- src/etc/etc.evbppc/MAKEDEV.conf:1.7 Sat Feb 26 18:07:16 2011
+++ src/etc/etc.evbppc/MAKEDEV.conf Tue Sep 6 14:40:10 2011
@@ -1,4 +1,4 @@
-# $NetBSD: MAKEDEV.conf,v 1.7 2011/02/26 18:07:16 ahoka Exp $
+# $NetBSD: MAKEDEV.conf,v 1.8 2011/09/06 14:40:10 apb Exp $
all_md)
makedev wscons sd0 sd1 sd2 st0 st1 cd0 cd1 wd0 wd1
@@ -25,7 +25,7 @@
makedev md0
;;
-xlcom*)
+xlcom[0-9]*)
unit=${i#xlcom}
mkdev xlcom$unit c 99 $unit "" "" $u_uucp
;;
Index: src/etc/etc.hp300/MAKEDEV.conf
diff -u src/etc/etc.hp300/MAKEDEV.conf:1.12 src/etc/etc.hp300/MAKEDEV.conf:1.13
--- src/etc/etc.hp300/MAKEDEV.conf:1.12 Sun Feb 6 18:26:51 2011
+++ src/etc/etc.hp300/MAKEDEV.conf Tue Sep 6 14:40:11 2011
@@ -1,4 +1,4 @@
-# $NetBSD: MAKEDEV.conf,v 1.12 2011/02/06 18:26:51 tsutsui Exp $
+# $NetBSD: MAKEDEV.conf,v 1.13 2011/09/06 14:40:11 apb Exp $
all_md)
makedev ct0 ct1 rd0 rd1 rd2
@@ -12,10 +12,8 @@
makedev ss0 uk0 uk1
;;
-ct*)
- case $i in
- ct*) name=ct; unit=${i#ct}; blk=0; chr=7;;
- esac
+ct[0-9]*)
+ name=ct; unit=${i#ct}; blk=0; chr=7
case $unit in
0|1|2|3|4|5|6|7)
four=$(($unit + 4)) ; eight=$(($unit + 8))
@@ -42,12 +40,12 @@
esac
;;
-rd*)
+rd[0-9]*)
name=rd; unit=${i#rd}; blk=2; chr=9
%MKDISK% $name $unit $blk $chr
;;
-ttyM*)
+ttyM[0-9a-f]*)
unit=${i#????}
case $unit in
[0-9]) i=$unit ;;
Index: src/etc/etc.mvme68k/MAKEDEV.conf
diff -u src/etc/etc.mvme68k/MAKEDEV.conf:1.6 src/etc/etc.mvme68k/MAKEDEV.conf:1.7
--- src/etc/etc.mvme68k/MAKEDEV.conf:1.6 Mon Jan 15 23:35:12 2007
+++ src/etc/etc.mvme68k/MAKEDEV.conf Tue Sep 6 14:40:11 2011
@@ -1,4 +1,4 @@
-# $NetBSD: MAKEDEV.conf,v 1.6 2007/01/15 23:35:12 hubertf Exp $
+# $NetBSD: MAKEDEV.conf,v 1.7 2011/09/06 14:40:11 apb Exp $
all_md)
makedev sd0 sd1 sd2
@@ -9,7 +9,7 @@
makedev ses0 ses1 ses2 ses3
;;
-ttyC*)
+ttyC[0-9]*)
# on-board mvme68k serial ports
unit=${i#ttyC}
mkdev ttyC$unit c 13 $(($unit + $dialin )) "" "" $u_uucp
Index: src/etc/etc.ofppc/MAKEDEV.conf
diff -u src/etc/etc.ofppc/MAKEDEV.conf:1.7 src/etc/etc.ofppc/MAKEDEV.conf:1.8
--- src/etc/etc.ofppc/MAKEDEV.conf:1.7 Sat Sep 13 11:46:18 2008
+++ src/etc/etc.ofppc/MAKEDEV.conf Tue Sep 6 14:40:11 2011
@@ -1,4 +1,4 @@
-# $NetBSD: MAKEDEV.conf,v 1.7 2008/09/13 11:46:18 tsutsui Exp $
+# $NetBSD: MAKEDEV.conf,v 1.8 2011/09/06 14:40:11 apb Exp $
all_md)
makedev wscons sd0 sd1 sd2 st0 st1 cd0 cd1 wd0 wd1 fd0 fd1
@@ -42,7 +42,7 @@
mkdev dty$unit c 45 $(($ounit + $dialout)) "" "" $u_uucp
;;
-xlcom*)
+xlcom[0-9]*)
unit=${i#xlcom}
mkdev xlcom$unit c 99 $unit "" "" $u_uucp
;;
Index: src/etc/etc.pmax/MAKEDEV.conf
diff -u src/etc/etc.pmax/MAKEDEV.conf:1.7 src/etc/etc.pmax/MAKEDEV.conf:1.8
--- src/etc/etc.pmax/MAKEDEV.conf:1.7 Wed Sep 6 11:09:58 2006
+++ src/etc/etc.pmax/MAKEDEV.conf Tue Sep 6 14:40:11 2011
@@ -1,4 +1,4 @@
-# $NetBSD: MAKEDEV.conf,v 1.7 2006/09/06 11:09:58 ad Exp $
+# $NetBSD: MAKEDEV.conf,v 1.8 2011/09/06 14:40:11 apb Exp $
all_md)
makedev minimal
@@ -20,10 +20,8 @@
# Serial devices: dc*, scc*.
#
# Create dz* devices as /dev/ttyD[0-3],
-dz*)
- case $i in
- dz*) name=dz; unit=${i#dz}; chr=16;;
- esac
+dz[0-9]*)
+ name=dz; unit=${i#dz}; chr=16
case $unit in
0)
mkdev ttyD0 c $chr 0
@@ -39,10 +37,8 @@
# Make zs devices as /dev/tty[abcd],
#
-zs*)
- case $i in
- zs*) name=scc; unit=${i#zs}; chr=17;;
- esac
+zs[0-9]*)
+ name=scc; unit=${i#zs}; chr=17
case $unit in
0|1)
mkdev ttya c $chr 0
@@ -56,7 +52,7 @@
esac
;;
-stic*)
+stic[0-9]*)
unit=${i#stic}
mkdev stic$unit c 98 $unit
;;
Index: src/etc/etc.sandpoint/MAKEDEV.conf
diff -u src/etc/etc.sandpoint/MAKEDEV.conf:1.13 src/etc/etc.sandpoint/MAKEDEV.conf:1.14
--- src/etc/etc.sandpoint/MAKEDEV.conf:1.13 Wed Jun 8 18:37:23 2011
+++ src/etc/etc.sandpoint/MAKEDEV.conf Tue Sep 6 14:40:11 2011
@@ -1,4 +1,4 @@
-# $NetBSD: MAKEDEV.conf,v 1.13 2011/06/08 18:37:23 phx Exp $
+# $NetBSD: MAKEDEV.conf,v 1.14 2011/09/06 14:40:11 apb Exp $
init)
makedev std tty00 tty01 opty ptm pty0
@@ -20,7 +20,7 @@
makedev init
;;
-tty0*)
+tty0[0-9]*)
unit=${i#tty0}
mkdev tty0$unit c 45 $(($unit + $dialin )) "" "" $u_uucp
mkdev dty0$unit c 45 $(($unit + $dialout)) "" "" $u_uucp
Index: src/etc/etc.sparc/MAKEDEV.conf
diff -u src/etc/etc.sparc/MAKEDEV.conf:1.13 src/etc/etc.sparc/MAKEDEV.conf:1.14
--- src/etc/etc.sparc/MAKEDEV.conf:1.13 Sat Sep 13 13:11:38 2008
+++ src/etc/etc.sparc/MAKEDEV.conf Tue Sep 6 14:40:11 2011
@@ -1,4 +1,4 @@
-# $NetBSD: MAKEDEV.conf,v 1.13 2008/09/13 13:11:38 tsutsui Exp $
+# $NetBSD: MAKEDEV.conf,v 1.14 2011/09/06 14:40:11 apb Exp $
all_md)
makedev std_sparc ttya ttyb ttyc ttyd ttyC00 ttyC01
@@ -50,12 +50,12 @@
mkdev dty$unit c 12 $(($index + $dialout)) "" "" $u_uucp
;;
-apm*)
+apm|apmctl)
lndev tctrl0 apm
mkdev apmctl c 71 8 644
;;
-tctrl*)
+tctrl[0-9]*)
unit=${i#tctrl}
mkdev tctrl$unit c 71 $unit 666
;;
Index: src/etc/etc.vax/MAKEDEV.conf
diff -u src/etc/etc.vax/MAKEDEV.conf:1.11 src/etc/etc.vax/MAKEDEV.conf:1.12
--- src/etc/etc.vax/MAKEDEV.conf:1.11 Fri Mar 9 19:16:48 2007
+++ src/etc/etc.vax/MAKEDEV.conf Tue Sep 6 14:40:11 2011
@@ -1,4 +1,4 @@
-# $NetBSD: MAKEDEV.conf,v 1.11 2007/03/09 19:16:48 dsl Exp $
+# $NetBSD: MAKEDEV.conf,v 1.12 2011/09/06 14:40:11 apb Exp $
all_md)
makedev mt0 mt1 ts0 ts1 st0 st1 uk0 ss0 cd0 vt0
@@ -24,7 +24,7 @@
mkdev leds c 3 13 666
;;
-ht*|tm*|mt*|ts*|ut*)
+ht[0-9]*|tm[0-9]*|mt[0-9]*|ts[0-9]*|ut[0-9]*)
case $i in
ht*) name=ht; unit=${i#ht}; blk=1; chr=5 ;;
mt*) name=mt; unit=${i#mt}; blk=15; chr=38;;
@@ -60,7 +60,7 @@
esac
;;
-hp*|hk*|up*|ra[0-9]*|rl*|rb*|rd*|rx*)
+hp[0-9]*|hk[0-9]*|up[0-9]*|ra[0-9][0-9]*|rl[0-9]*|rb[0-9]*|rd[0-9]*|rx[0-9]*)
case $i in
hp*) name=hp; unit=${i#hp}; blk=0; chr=4;;
hk*) name=hk; unit=${i#hk}; blk=3; chr=11;;
@@ -74,7 +74,7 @@
%MKDISK% $name $unit $blk $chr
;;
-uu*)
+uu[0-9]*)
unit=${i#uu}
name=uu; blk=13
case $unit in
@@ -88,7 +88,7 @@
esac
;;
-dz*)
+dz[0-9]*)
unit=${i#dz}
case $unit in
[0-7])
@@ -108,7 +108,7 @@
esac
;;
-dhu*|dh*|dmf*|dmz*|vt*)
+dhu[0-9]*|dh[0-9]*|dmf[0-9]*|dmz[0-9]*|vt[0-9]*)
case $i in
vt*) name=vt; major=68; count=8
unit=${i#vt}
@@ -180,12 +180,12 @@
;;
-dl*)
+dl[0-9]*)
unit=${i#dl}
mkdev ttyJ$(hexprint $unit) c 66 $unit
;;
-lp*|va*|vp*)
+lp[0-9]*|va[0-9]*|vp[0-9]*)
case $i in
lp*) name=lp; unit=${i#lp}; major=15;;
va*) name=va; unit=${i#va}; major=10;;
@@ -201,7 +201,7 @@
esac
;;
-np*)
+np[0-9]*)
class=${i#np}
case $class in
0) offset=0 name=0;;
@@ -222,7 +222,7 @@
esac
;;
-dn*|ik*|ps*|ad*|ct*)
+dn[0-9]*|ik[0-9]*|ps[0-9]*|ad[0-9]*|ct[0-9]*)
case $i in
ct*) name=ct; unit=${i#ct}; chr=18;;
dn*) name=cu; unit=${i#dn}; chr=24;;
@@ -240,7 +240,7 @@
esac
;;
-qd*)
+qd[0-9]*)
unit=${i#qd}
mkdev qc$unit c 40 $(($unit * 4))
mkdev qd$unit c 40 $(($unit * 4 + 2))
Index: src/etc/etc.x68k/MAKEDEV.conf
diff -u src/etc/etc.x68k/MAKEDEV.conf:1.9 src/etc/etc.x68k/MAKEDEV.conf:1.10
--- src/etc/etc.x68k/MAKEDEV.conf:1.9 Sat Dec 20 13:20:58 2008
+++ src/etc/etc.x68k/MAKEDEV.conf Tue Sep 6 14:40:11 2011
@@ -1,4 +1,4 @@
-# $NetBSD: MAKEDEV.conf,v 1.9 2008/12/20 13:20:58 isaki Exp $
+# $NetBSD: MAKEDEV.conf,v 1.10 2011/09/06 14:40:11 apb Exp $
all_md)
makedev std_x68k st0 st1 ttye0 ttye1 mouse0 mouse1
@@ -28,11 +28,11 @@
makedev floppy md0 sram
;;
-bell*)
+bell)
mkdev bell c 33 0 666
;;
-grf*)
+grf[0-9]*)
unit=${i#grf}
mkdev grf$unit c 10 $unit 600
;;
