From 347bc23944c7f68ba3875884000fca70734e9494 Mon Sep 17 00:00:00 2001
From: todd <>
Date: Thu, 14 Feb 2002 05:38:22 +0000
Subject: [PATCH] s/,\([^ ]\)/, \1/g .. mostly.  Function arguments now spaced
 like style(9)

---
 src/etc/MAKEDEV.mi | 1056 ++++++++++++++++++++++----------------------
 1 file changed, 528 insertions(+), 528 deletions(-)

diff --git a/src/etc/MAKEDEV.mi b/src/etc/MAKEDEV.mi
index 4428e23f..9438efc1 100644
--- a/src/etc/MAKEDEV.mi
+++ b/src/etc/MAKEDEV.mi
@@ -1,6 +1,6 @@
 include(MAKEDEV.sub)dnl
 dnl
-vers(a,{-$OpenBSD: MAKEDEV.mi,v 1.28 2002/02/14 04:41:32 todd Exp $-})dnl
+vers(a, {-$OpenBSD: MAKEDEV.mi,v 1.29 2002/02/14 05:38:22 todd Exp $-})dnl
 dnl
 divert(1)dnl
 {-#-}
@@ -40,37 +40,37 @@ dnl HOW TO ADD A DEVICE:
 dnl
 dnl In this file, you must use at least two macros:
 dnl
-dnl  Use '__devitem(uniqueid,name-pattern,description)' to create an entry
+dnl  Use '__devitem(uniqueid, name-pattern, description)' to create an entry
 dnl  in the description at the top of the generated MAKEDEV file:
 dnl
-dnl    __devitem(sca,sca*,Sugar Generic device)dnl
+dnl    __devitem(sca, sca*, Sugar Generic device)dnl
 dnl
 dnl  This is ultimately shown as:
 dnl
 dnl    #  sca*   Sugar Generic device
 dnl
-dnl  Use '_mkdev(uniqueid,shell-pattern,{-shell-script-})dnl' to create
+dnl  Use '_mkdev(uniqueid, shell-pattern, {-shell-script-})dnl' to create
 dnl  a shell script fragment used to 'create' the device (be sure to match
 dnl  the uniqueid from above):
 dnl
-dnl    _mkdev(sca,sca*,{-M sca$U c major_sca_c $U
-dnl           M rsca$U b major_sca_b Add($U,128)-})dnl
+dnl    _mkdev(sca, sca*, {-M sca$U c major_sca_c $U
+dnl           M rsca$U b major_sca_b Add($U, 128)-})dnl
 dnl
 dnl  This is ultimately expanded into:
 dnl
 dnl    sca*)  M sca$U c 24 $U
 dnl           M sca$U b 42 $(($U+128));;
 dnl
-dnl In the MAKEDEV.md file, add a '_DEV(uniqueid,charmajor,blockmajor)'
+dnl In the MAKEDEV.md file, add a '_DEV(uniqueid, charmajor, blockmajor)'
 dnl entry:
 dnl
-dnl   _DEV(sca,24,42)
+dnl   _DEV(sca, 24, 42)
 dnl
 dnl Final step is to add an entry to the 'all' entry below. For a short
 dnl example:
 dnl
-dnl   _mkdev({-all-},{-all-},{-dnl
-dnl   _dl({-std-},{-std-},{-sca-},{-sca0 sca1 sca2 sca3-})-})dnl
+dnl   _mkdev({-all-}, {-all-}, {-dnl
+dnl   _dl({-std-}, {-std-}, {-sca-}, {-sca0 sca1 sca2 sca3-})-})dnl
 dnl
 dnl would expand to:
 dnl
@@ -89,10 +89,10 @@ dnl Note: be very wary of adding whitespace, carriage returns, or not
 dnl finishing a macro with ')dnl' .. otherwise, extra blank lines show up
 dnl in the output.
 dnl
-_mkdev(loc,local,{-test -s $T.local && sh $T.local-})dnl
+_mkdev(loc, local, {-test -s $T.local && sh $T.local-})dnl
 dnl
-__devtitle(make,Device "make" file.  Valid arguments)dnl
-__devitem({-all-},{-all-},
+__devtitle(make, Device "make" file.  Valid arguments)dnl
+__devitem({-all-}, {-all-},
 {-makes all known devices{-,-} including local devices.
 {-#-}		Tries to make the ``standard'' number of each type.-})dnl
 dnl
@@ -102,107 +102,107 @@ dnl necessary devices.  Otherwise the devices are not included in the 'all'
 dnl target.  Note this keeps line lengths to less than column 70.  For the
 dnl gory details see the definition of '_dl' in MAKEDEV.sub
 dnl
-twrget(all,attyB,sd,5,6,7,8,9)dnl
-target(all,sd,0,1,2,3,4)dnl
-target(all,mcd,0)dnl
-twrget(all,fdesc,fd)dnl
-target(all,pty,0,1,2)dnl
-target(all,st,0,1)dnl
-target(all,ch,0)dnl
-target(all,cd,0,1)dnl
-target(all,mcd,0)dnl
-target(all,std)dnl
-target(all,vnd,0,1,2,3)dnl
-target(all,ccd,0,1,2,3)dnl
-target(all,raid,0,1,2,3)dnl
-target(all,rd,0)dnl
-target(all,rz,0,1,2,3,4)dnl
-target(all,hk,0,1,2,3)dnl
-target(all,hp,0,1,2,3)dnl
-target(all,ht,0)dnl
-target(all,ra,0,1,2,3)dnl
-target(all,rb,0,1,2,3)dnl
-target(all,rl,0,1,2,3)dnl
-target(all,rx,0,1)dnl
-target(all,tm,0)dnl
-target(all,ts,0)dnl
-target(all,up,0,1,2,3)dnl
-target(all,ut,0)dnl
-target(all,wd,0,1,2,3)dnl
-target(all,xy,0,1,2,3)dnl
-target(all,xd,0,1,2,3)dnl
-twrget(all,flo,fd,0,0B,0C,0D,0E,0F,0G,0H)dnl
-twrget(all,flo,fd,1,1B,1C,1D,1E,1F,1G,1H)dnl
-twrget(all,aflo,fd,0,1,2,3)dnl
-target(all,bpf,0,1,2,3,4,5,6,7,8,9)dnl
-target(all,tun,0,1,2,3)dnl
-target(all,pctr)dnl
-target(all,pctr0)dnl
-target(all,altq)dnl
-target(all,pf)dnl
-twrget(all,cry,crypto)dnl
-target(all,apm)dnl
-twrget(all,tth,ttyh,0,1)dnl
-target(all,ttyA,0,1)dnl
-target(all,ttyB,0,1,2,3,4,5)dnl
-twrget(all,attyB,ttyB,0,1,2,3,4)dnl
-target(all,tty0,0,1,2,3)dnl
-twrget(all,mac_tty0,tty0,0,1)dnl
-twrget(all,tzs,tty,a,b,c,d)dnl
-twrget(all,czs,cua,a,b,c,d)dnl
-target(all,ttyc,0,1,2,3,4,5,6,7)dnl
-twrget(all,com,tty0,0,1,2,3)dnl
-twrget(all,mac_ttye,ttye,0)dnl
-target(all,ttye,0,1,2,3,4,5,6)dnl
-target(all,lkm)dnl
-twrget(all,mmcl,mmclock)dnl
-target(all,lpt,0,1,2)dnl
-twrget(all,lpt,lpa,0,1,2)dnl
-target(all,joy,0,1)dnl
-target(all,rnd,random)dnl
-target(all,ses,0)dnl
-target(all,uk,0)dnl
-target(all,ss,0,1)dnl
-target(all,st,0)dnl
-target(all,wt,0)dnl
-target(all,wdt,0)dnl
-target(all,xfs,0)dnl
-twrget(all,au,audio,0)dnl
-twrget(all,speak,speaker)dnl
-target(all,asc,0)dnl
-target(all,music,0)dnl
-target(all,radio,0)dnl
-target(all,tuner,0)dnl
-target(all,rmidi,0,1,2,3,4,5,6,7)dnl
-target(all,usbs)dnl
-target(all,adb)dnl
-target(all,iop,0,1)dnl
-target(all,pci)dnl
-twrget(all,wsmouse,wscons)dnl
-twrget(all,btw,bwtwo,0)dnl
-twrget(all,ctw,cgtwo,0)dnl
-twrget(all,ctr,cgthree,0)dnl
-twrget(all,cfr,cgfour,0)dnl
-twrget(all,csx,cgsix,0)dnl
-twrget(all,ceg,cgeight,0)dnl
-twrget(all,cfo,cgfourteen,0)dnl
-target(all,tcx,0)dnl
-twrget(all,grf_mac,grf,0,1,2,3)dnl
-twrget(all,grf_amiga,grf,0,1,2,3,4,5,6)dnl
-target(all,par,0)dnl
-twrget(all,amouse,mouse,0,1)dnl
-twrget(all,akbd,kbd)dnl
-target(all,apci,0)dnl
-target(all,ppi,0)dnl
-target(all,view0,0,1,2,3,4,5)dnl
-target(all,local)dnl
+twrget(all, attyB, sd, 5, 6, 7, 8, 9)dnl
+target(all, sd, 0, 1, 2, 3, 4)dnl
+target(all, mcd, 0)dnl
+twrget(all, fdesc, fd)dnl
+target(all, pty, 0, 1, 2)dnl
+target(all, st, 0, 1)dnl
+target(all, ch, 0)dnl
+target(all, cd, 0, 1)dnl
+target(all, mcd, 0)dnl
+target(all, std)dnl
+target(all, vnd, 0, 1, 2, 3)dnl
+target(all, ccd, 0, 1, 2, 3)dnl
+target(all, raid, 0, 1, 2, 3)dnl
+target(all, rd, 0)dnl
+target(all, rz, 0, 1, 2, 3, 4)dnl
+target(all, hk, 0, 1, 2, 3)dnl
+target(all, hp, 0, 1, 2, 3)dnl
+target(all, ht, 0)dnl
+target(all, ra, 0, 1, 2, 3)dnl
+target(all, rb, 0, 1, 2, 3)dnl
+target(all, rl, 0, 1, 2, 3)dnl
+target(all, rx, 0, 1)dnl
+target(all, tm, 0)dnl
+target(all, ts, 0)dnl
+target(all, up, 0, 1, 2, 3)dnl
+target(all, ut, 0)dnl
+target(all, wd, 0, 1, 2, 3)dnl
+target(all, xy, 0, 1, 2, 3)dnl
+target(all, xd, 0, 1, 2, 3)dnl
+twrget(all, flo, fd, 0, 0B, 0C, 0D, 0E, 0F, 0G, 0H)dnl
+twrget(all, flo, fd, 1, 1B, 1C, 1D, 1E, 1F, 1G, 1H)dnl
+twrget(all, aflo, fd, 0, 1, 2, 3)dnl
+target(all, bpf, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9)dnl
+target(all, tun, 0, 1, 2, 3)dnl
+target(all, pctr)dnl
+target(all, pctr0)dnl
+target(all, altq)dnl
+target(all, pf)dnl
+twrget(all, cry, crypto)dnl
+target(all, apm)dnl
+twrget(all, tth, ttyh, 0, 1)dnl
+target(all, ttyA, 0, 1)dnl
+target(all, ttyB, 0, 1, 2, 3, 4, 5)dnl
+twrget(all, attyB, ttyB, 0, 1, 2, 3, 4)dnl
+target(all, tty0, 0, 1, 2, 3)dnl
+twrget(all, mac_tty0, tty0, 0, 1)dnl
+twrget(all, tzs, tty, a, b, c, d)dnl
+twrget(all, czs, cua, a, b, c, d)dnl
+target(all, ttyc, 0, 1, 2, 3, 4, 5, 6, 7)dnl
+twrget(all, com, tty0, 0, 1, 2, 3)dnl
+twrget(all, mac_ttye, ttye, 0)dnl
+target(all, ttye, 0, 1, 2, 3, 4, 5, 6)dnl
+target(all, lkm)dnl
+twrget(all, mmcl, mmclock)dnl
+target(all, lpt, 0, 1, 2)dnl
+twrget(all, lpt, lpa, 0, 1, 2)dnl
+target(all, joy, 0, 1)dnl
+target(all, rnd, random)dnl
+target(all, ses, 0)dnl
+target(all, uk, 0)dnl
+target(all, ss, 0, 1)dnl
+target(all, st, 0)dnl
+target(all, wt, 0)dnl
+target(all, wdt, 0)dnl
+target(all, xfs, 0)dnl
+twrget(all, au, audio, 0)dnl
+twrget(all, speak, speaker)dnl
+target(all, asc, 0)dnl
+target(all, music, 0)dnl
+target(all, radio, 0)dnl
+target(all, tuner, 0)dnl
+target(all, rmidi, 0, 1, 2, 3, 4, 5, 6, 7)dnl
+target(all, usbs)dnl
+target(all, adb)dnl
+target(all, iop, 0, 1)dnl
+target(all, pci)dnl
+twrget(all, wsmouse, wscons)dnl
+twrget(all, btw, bwtwo, 0)dnl
+twrget(all, ctw, cgtwo, 0)dnl
+twrget(all, ctr, cgthree, 0)dnl
+twrget(all, cfr, cgfour, 0)dnl
+twrget(all, csx, cgsix, 0)dnl
+twrget(all, ceg, cgeight, 0)dnl
+twrget(all, cfo, cgfourteen, 0)dnl
+target(all, tcx, 0)dnl
+twrget(all, grf_mac, grf, 0, 1, 2, 3)dnl
+twrget(all, grf_amiga, grf, 0, 1, 2, 3, 4, 5, 6)dnl
+target(all, par, 0)dnl
+twrget(all, amouse, mouse, 0, 1)dnl
+twrget(all, akbd, kbd)dnl
+target(all, apci, 0)dnl
+target(all, ppi, 0)dnl
+target(all, view0, 0, 1, 2, 3, 4, 5)dnl
+target(all, local)dnl
 dnl
-_mkdev(all,{-all-},{-dnl
+_mkdev(all, {-all-}, {-dnl
 show_target(all)dnl
 -})dnl
 dnl
-__devitem(ramdisk,ramdisk,devices to be put on install floppies)dnl
-__devitem(std,{-std-},standard devices)dnl
+__devitem(ramdisk, ramdisk, devices to be put on install floppies)dnl
+__devitem(std, {-std-}, standard devices)dnl
 dnl
 dnl
 dnl
@@ -214,7 +214,7 @@ dnl $3: ksyms
 dnl $4: drum
 dnl $5: klog
 dnl
-define({-_std-},{-dnl
+define({-_std-}, {-dnl
 std)
 	M console	c 0 0 600
 	M tty		c $1 0
@@ -229,96 +229,96 @@ std)
 	M drum		c $4 0 640 kmem
 	M klog		c $5 0 600-})dnl
 dnl
-target(usb,usb,0,1)dnl
-target(usb,urio,0)dnl
-twrget(usb,uscan,uscanner,0)dnl
-target(usb,uhid,0,1,2,3)dnl
-target(usb,ulpt,0,1)dnl
-target(usb,ugen,0,1)dnl
-target(usb,utty,0,1)dnl
+target(usb, usb, 0, 1)dnl
+target(usb, urio, 0)dnl
+twrget(usb, uscan, uscanner, 0)dnl
+target(usb, uhid, 0, 1, 2, 3)dnl
+target(usb, ulpt, 0, 1)dnl
+target(usb, ugen, 0, 1)dnl
+target(usb, utty, 0, 1)dnl
 dnl
-__devitem({-usbs-},usbs,make USB devices)dnl
-_mkdev(usbs,usbs,{-dnl
+__devitem({-usbs-}, usbs, make USB devices)dnl
+_mkdev(usbs, usbs, {-dnl
 show_target({-usb-})dnl
 -})dnl
-__devtitle(tap,Tapes)dnl
-__devitem(wt,{-wt*	-},QIC-interface (e.g. not SCSI) 3M cartridge tape)dnl
-_mkdev(wt,wt*,
+__devtitle(tap, Tapes)dnl
+__devitem(wt, {-wt*	-}, QIC-interface (e.g. not SCSI) 3M cartridge tape)dnl
+_mkdev(wt, wt*,
 {-name=wt
-	n=Mult($U,8) m=Add($n,4)
+	n=Mult($U, 8) m=Add($n, 4)
 	M $name$U	b major_wt_b $n 640 operator
 	M r$name$U	c major_wt_c $n 640 operator
 	M n$name$U	b major_wt_b $m 640 operator
 	M nr$name$U	c major_wt_c $m 640 operator-})dnl
-__devitem(tz,tz*,{-SCSI tapes{-,-} DEC TK50 cartridge tape-})dnl
-__devitem(st,{-st*-},SCSI tapes)dnl
-_mkdev(st,st*,{-n=Mult($U,16)
+__devitem(tz, tz*, {-SCSI tapes{-,-} DEC TK50 cartridge tape-})dnl
+__devitem(st, {-st*-}, SCSI tapes)dnl
+_mkdev(st, st*, {-n=Mult($U, 16)
 	for pre in " " n e en
 	do
 		M ${pre}st$U	b major_st_b $n 660 operator
 		M ${pre}rst$U	c major_st_c $n 660 operator
-		n=Add($n,1)
+		n=Add($n, 1)
 	done-})dnl
-__devitem(ct,ct*,HP300 HP-IB cartridge tape)dnl
-__devitem(mt,mt*,(Magnetic) 9-track reel tape)dnl
-__devitem(ht,ht*,massbus tm03 & tu??)dnl
-__devitem(tm,tm*,unibus tm11 & te10 emulations (e.g. Emulex tc-11))dnl
-__devitem(ts,ts*,unibus ts11)dnl
-__devitem(ut,ut*,unibus tu45 emulations (e.g.si 9700))dnl
-__devtitle(dis,Disks)dnl
-__devitem(rz,rz*,SCSI disks)dnl
-__devitem(sd,{-sd*-},SCSI disks{-,-} includes flopticals)dnl
-__devitem(hd,{-hd*-},HP300 HP-IB disks)dnl
-__devitem(cd,{-cd*-},SCSI cdrom drives)dnl
-__devitem(acd,acd*,ATAPI cdrom drives)dnl
-_mkdev(cd,cd*,{-dodisk2 cd $U major_cd_b major_cd_c $U 0{--}ifstep(cd)-})dnl
-__devitem(mcd,mcd*,Mitsumi cdrom drives)dnl
-_mkdev(mcd,mcd*,{-dodisk2 mcd $U major_mcd_b major_mcd_c $U 0{--}ifstep(mcd)dnl
+__devitem(ct, ct*, HP300 HP-IB cartridge tape)dnl
+__devitem(mt, mt*, (Magnetic) 9-track reel tape)dnl
+__devitem(ht, ht*, massbus tm03 & tu??)dnl
+__devitem(tm, tm*, unibus tm11 & te10 emulations (e.g. Emulex tc-11))dnl
+__devitem(ts, ts*, unibus ts11)dnl
+__devitem(ut, ut*, unibus tu45 emulations (e.g.si 9700))dnl
+__devtitle(dis, Disks)dnl
+__devitem(rz, rz*, SCSI disks)dnl
+__devitem(sd, {-sd*-}, SCSI disks{-,-} includes flopticals)dnl
+__devitem(hd, {-hd*-}, HP300 HP-IB disks)dnl
+__devitem(cd, {-cd*-}, SCSI cdrom drives)dnl
+__devitem(acd, acd*, ATAPI cdrom drives)dnl
+_mkdev(cd, cd*, {-dodisk2 cd $U major_cd_b major_cd_c $U 0{--}ifstep(cd)-})dnl
+__devitem(mcd, mcd*, Mitsumi cdrom drives)dnl
+_mkdev(mcd, mcd*, {-dodisk2 mcd $U major_mcd_b major_mcd_c $U 0{--}ifstep(mcd)dnl
 -})dnl
-__devitem(ch,{-ch*-},SCSI media changer)dnl
-_mcdev(ch,ch*,ch,{-major_ch_c-},660,operator)dnl
-__devitem(uk,uk*,SCSI Unknown device)dnl
-_mcdev(uk,uk*,uk,{-major_uk_c-},640,operator)dnl
-__devitem(ss,ss*,SCSI scanners)dnl
-_mkdev(ss,ss*,{-M ss$U c major_ss_c $U 440 operator
+__devitem(ch, {-ch*-}, SCSI media changer)dnl
+_mcdev(ch, ch*, ch, {-major_ch_c-}, 660, operator)dnl
+__devitem(uk, uk*, SCSI Unknown device)dnl
+_mcdev(uk, uk*, uk, {-major_uk_c-}, 640, operator)dnl
+__devitem(ss, ss*, SCSI scanners)dnl
+_mkdev(ss, ss*, {-M ss$U c major_ss_c $U 440 operator
 	RMlist="$RMlist scan$U"
 	MKlist="$MKlist;umask 77;ln -s ss$U scan$U"-})dnl
-__devitem(ses,ses*,SES/SAF-TE SCSI devices)dnl
-_mkdev(ses,ses*,{-M ses$U c major_ses_c $U 640 operator-})dnl
-__devitem(ramd,ramdisk,makes all devices for a ramdisk kernel)dnl arc
-_mkdev(ramd,ramdisk,{-dnl
+__devitem(ses, ses*, SES/SAF-TE SCSI devices)dnl
+_mkdev(ses, ses*, {-M ses$U c major_ses_c $U 640 operator-})dnl
+__devitem(ramd, ramdisk, makes all devices for a ramdisk kernel)dnl arc
+_mkdev(ramd, ramdisk, {-dnl
 show_target(ramd)dnl
 -})dnl
-ifelse(MACHINE,mvmeppc,{-dnl
-target(ramd,tty0,0,1,2,3)dnl
-twrget(ramd,wsdisp,ttyC,0)dnl
-target(ramd,rd,0)dnl
-target(ramd,wd,0,1,2,3)dnl
-target(ramd,sd,0,1,2,3,4)dnl
-target(ramd,cd,0,1)dnl
-target(ramd,st,0,1)dnl
-target(ramd,bpf,0)dnl
-target(ramd,rd,0)dnl
+ifelse(MACHINE, mvmeppc, {-dnl
+target(ramd, tty0, 0, 1, 2, 3)dnl
+twrget(ramd, wsdisp, ttyC, 0)dnl
+target(ramd, rd, 0)dnl
+target(ramd, wd, 0, 1, 2, 3)dnl
+target(ramd, sd, 0, 1, 2, 3, 4)dnl
+target(ramd, cd, 0, 1)dnl
+target(ramd, st, 0, 1)dnl
+target(ramd, bpf, 0)dnl
+target(ramd, rd, 0)dnl
 -})dnl
-ifelse(MACHINE,sparc,{-dnl
-target(ramd,fd,0)dnl
-target(ramd,sd,0,1,2,3)dnl
-target(ramd,rd,0)dnl
-target(ramd,cd,0)dnl
+ifelse(MACHINE, sparc, {-dnl
+target(ramd, fd, 0)dnl
+target(ramd, sd, 0, 1, 2, 3)dnl
+target(ramd, rd, 0)dnl
+target(ramd, cd, 0)dnl
 -})dnl
-ifelse(MACHINE,sparc64,{-dnl
-target(ramd,fd,0)dnl
-target(ramd,rd,0)dnl
-target(ramd,sd,0,1,2,3)dnl
-target(ramd,wd,0,1,2,3)dnl
-target(ramd,cd,0,1)dnl
-target(ramd,st,0,1)dnl
-target(ramd,bpf,0)dnl
-twrget(all,s64_tzs,tty,a,b,c,d)dnl
-twrget(all,s64_czs,cua,a,b,c,d)dnl
-__devitem(s64_tzs,tty[a-z]*,Zilog 8530 Serial Port)dnl
-__devitem(s64_czs,cua[a-z]*,Zilog 8530 Serial Port)dnl
-_mkdev(s64_tzs,{-tty[a-z]-},{-u=${i#tty*}
+ifelse(MACHINE, sparc64, {-dnl
+target(ramd, fd, 0)dnl
+target(ramd, rd, 0)dnl
+target(ramd, sd, 0, 1, 2, 3)dnl
+target(ramd, wd, 0, 1, 2, 3)dnl
+target(ramd, cd, 0, 1)dnl
+target(ramd, st, 0, 1)dnl
+target(ramd, bpf, 0)dnl
+twrget(all, s64_tzs, tty, a, b, c, d)dnl
+twrget(all, s64_czs, cua, a, b, c, d)dnl
+__devitem(s64_tzs, tty[a-z]*, Zilog 8530 Serial Port)dnl
+__devitem(s64_czs, cua[a-z]*, Zilog 8530 Serial Port)dnl
+_mkdev(s64_tzs, {-tty[a-z]-}, {-u=${i#tty*}
 	case $u in
 	a) n=0 ;;
 	b) n=1 ;;
@@ -327,7 +327,7 @@ _mkdev(s64_tzs,{-tty[a-z]-},{-u=${i#tty*}
 	*) echo unknown tty device $i ;;
 	esac
 	M tty$u c major_s64_tzs_c $n 660 dialer uucp-})dnl
-_mkdev(s64_czs,cua[a-z],{-u=${i#cua*}
+_mkdev(s64_czs, cua[a-z], {-u=${i#cua*}
 	case $u in
 	a) n=0 ;;
 	b) n=1 ;;
@@ -335,45 +335,45 @@ _mkdev(s64_czs,cua[a-z],{-u=${i#cua*}
 	d) n=3 ;;
 	*) echo unknown cua device $i ;;  
 	esac
-	M cua$u c major_s64_czs_c Add($n,128) 660 dialer uucp-})dnl
+	M cua$u c major_s64_czs_c Add($n, 128) 660 dialer uucp-})dnl
 -})dnl
-ifelse(MACHINE,i386,{-dnl
-target(ramd,tty0,0,1,2,3)dnl
-twrget(ramd,wsdisp,ttyC,0)dnl
-target(ramd,wt,0)dnl
-target(ramd,fd,0)dnl
-target(ramd,rd,0)dnl
-target(ramd,wd,0,1,2,3)dnl
-target(ramd,sd,0,1,2,3)dnl
-target(ramd,cd,0,1)dnl
-target(ramd,st,0,1)dnl
-target(ramd,mcd,0)dnl
+ifelse(MACHINE, i386, {-dnl
+target(ramd, tty0, 0, 1, 2, 3)dnl
+twrget(ramd, wsdisp, ttyC, 0)dnl
+target(ramd, wt, 0)dnl
+target(ramd, fd, 0)dnl
+target(ramd, rd, 0)dnl
+target(ramd, wd, 0, 1, 2, 3)dnl
+target(ramd, sd, 0, 1, 2, 3)dnl
+target(ramd, cd, 0, 1)dnl
+target(ramd, st, 0, 1)dnl
+target(ramd, mcd, 0)dnl
 -})dnl
-ifelse(MACHINE,alpha,{-dnl
-target(ramd,sd,0,1,2)dnl
-target(ramd,wd,0)dnl
-target(ramd,tty0,0,1)dnl
-target(ramd,st,0)dnl
-target(ramd,cd,0)dnl
-target(ramd,ttyB,0,1)dnl
-target(ramd,ttyE,0,1)dnl
+ifelse(MACHINE, alpha, {-dnl
+target(ramd, sd, 0, 1, 2)dnl
+target(ramd, wd, 0)dnl
+target(ramd, tty0, 0, 1)dnl
+target(ramd, st, 0)dnl
+target(ramd, cd, 0)dnl
+target(ramd, ttyB, 0, 1)dnl
+target(ramd, ttyE, 0, 1)dnl
 -})dnl
-ifelse(MACHINE,amiga,{-dnl
-target(ramd,kbd)dnl
-target(ramd,pty,0)dnl
-target(ramd,tty0,0)dnl
-target(ramd,ttyA,0,1)dnl
-target(ramd,ttyB,0,1)dnl
-target(ramd,ttye,0,1,2,3,4,5,6)dnl
-target(ramd,cd,0,1)dnl
-target(ramd,sd,0,1,2,3)dnl
-target(ramd,st,0,1)dnl
-target(ramd,fd,0,1)dnl
-target(ramd,wd,0,1)dnl
-target(ramd,rd,0)dnl
+ifelse(MACHINE, amiga, {-dnl
+target(ramd, kbd)dnl
+target(ramd, pty, 0)dnl
+target(ramd, tty0, 0)dnl
+target(ramd, ttyA, 0, 1)dnl
+target(ramd, ttyB, 0, 1)dnl
+target(ramd, ttye, 0, 1, 2, 3, 4, 5, 6)dnl
+target(ramd, cd, 0, 1)dnl
+target(ramd, sd, 0, 1, 2, 3)dnl
+target(ramd, st, 0, 1)dnl
+target(ramd, fd, 0, 1)dnl
+target(ramd, wd, 0, 1)dnl
+target(ramd, rd, 0)dnl
 -})dnl
-ifelse(MACHINE,hp300,{-dnl
-_mkdev(st_hp300,ct*|mt*|st*,
+ifelse(MACHINE, hp300, {-dnl
+_mkdev(st_hp300, ct*|mt*|st*,
 {-case $i in
 	ct*) name=ct blk=major_ct_b chr=major_ct_c;;
 	mt*) name=mt blk=major_mt_b chr=major_mt_c;;
@@ -381,8 +381,8 @@ _mkdev(st_hp300,ct*|mt*|st*,
 	esac
 	case $U in
 	[0-7])
-		four=Add($U,4) eight=Add($U,8)
-		twelve=Add($U,12) twenty=Add($U,20)
+		four=Add($U, 4) eight=Add($U, 8)
+		twelve=Add($U, 12) twenty=Add($U, 20)
 		M r$name$U	c $chr $U 660 operator
 		M r$name$four	c $chr $four 660 operator
 		M r$name$eight	c $chr $eight 660 operator
@@ -395,78 +395,78 @@ _mkdev(st_hp300,ct*|mt*|st*,
 		echo bad unit for tape in: $1
 		;;
 	esac-})dnl
-__devitem(st_hp300,st*,Exabyte tape)dnl
-__devitem(grf,grf*,raw interface to HP300 graphics devices)dnl
-target( all,	grf,	0)dnl
-dnl XXX target( all,	hil,	0,1,2,3,4,5,6,7)dnl
-target( all,	hil,	)dnl
-twrget( all,	st_hp300,st,0,1)dnl
-target( all,	dca,	0,1)dnl
-target( all,	dcm,	0,1,2,3)dnl
-target( all,	hd,	0,1,2)dnl
-target( all,	ct,	0,1)dnl
-target( all,	ite,	0)dnl
-target(ramd,	ct,	0,1)dnl
-target(ramd,	hd,	0,1,2)dnl
-target(ramd,	sd,	0,1,2)dnl
-target(ramd,	rd,	0,1)dnl
-target(ramd,	pty,	0)dnl
-target(ramd,	hil,	)dnl
-target(ramd,	grf,	0)dnl
-target(ramd,	apci,	0)dnl
-target(ramd,	ite,	0)dnl
-target(ramd,	dca,	0)dnl
-target(ramd,	dcm,	0,1)dnl
-target(ramd,	bpf,	0,1)dnl
-target(ramd,	tun,	0,1)dnl
+__devitem(st_hp300, st*, Exabyte tape)dnl
+__devitem(grf, grf*, raw interface to HP300 graphics devices)dnl
+target( all, grf, 0)dnl
+dnl XXX target( all, hil, 0, 1, 2, 3, 4, 5, 6, 7)dnl
+target( all, hil, )dnl
+twrget( all, st_hp300, st, 0, 1)dnl
+target( all, dca, 0, 1)dnl
+target( all, dcm, 0, 1, 2, 3)dnl
+target( all, hd, 0, 1, 2)dnl
+target( all, ct, 0, 1)dnl
+target( all, ite, 0)dnl
+target(ramd, ct, 0, 1)dnl
+target(ramd, hd, 0, 1, 2)dnl
+target(ramd, sd, 0, 1, 2)dnl
+target(ramd, rd, 0, 1)dnl
+target(ramd, pty, 0)dnl
+target(ramd, hil, )dnl
+target(ramd, grf, 0)dnl
+target(ramd, apci, 0)dnl
+target(ramd, ite, 0)dnl
+target(ramd, dca, 0)dnl
+target(ramd, dcm, 0, 1)dnl
+target(ramd, bpf, 0, 1)dnl
+target(ramd, tun, 0, 1)dnl
 -})dnl
-ifelse(MACHINE,hppa,{-dnl
-target(ramd,st,0,1)dnl
-target(ramd,sd,0,1,2,3)dnl
-target(ramd,rd,0,1)dnl
-target(ramd,pty,0)dnl
-target(ramd,hil)dnl
-target(ramd,com,0,1)dnl
-target(ramd,bpf,0,1)dnl
-target(ramd,tun,0,1)dnl
+ifelse(MACHINE, hppa, {-dnl
+target(ramd, st, 0, 1)dnl
+target(ramd, sd, 0, 1, 2, 3)dnl
+target(ramd, rd, 0, 1)dnl
+target(ramd, pty, 0)dnl
+target(ramd, hil)dnl
+target(ramd, com, 0, 1)dnl
+target(ramd, bpf, 0, 1)dnl
+target(ramd, tun, 0, 1)dnl
 -})dnl
-ifelse(MACHINE,mac68k,{-dnl
-target(ramd,sd,0,1,2,3)dnl
-target(ramd,st,0,1)dnl
-target(ramd,adb)dnl
-target(ramd,asc,0)dnl
-target(ramd,grf,0,1)dnl
-target(ramd,ttye,0)dnl
-twrget(ramd,mac_tty0,tty0,0,1)dnl
-target(ramd,pty,0)dnl
+ifelse(MACHINE, mac68k, {-dnl
+target(ramd, sd, 0, 1, 2, 3)dnl
+target(ramd, st, 0, 1)dnl
+target(ramd, adb)dnl
+target(ramd, asc, 0)dnl
+target(ramd, grf, 0, 1)dnl
+target(ramd, ttye, 0)dnl
+twrget(ramd, mac_tty0, tty0, 0, 1)dnl
+target(ramd, pty, 0)dnl
 -})dnl
-ifelse(MACHINE,macppc,{-dnl
-target(ramd,sd,0,1,2,3,4)dnl
-target(ramd,wd,0,1,2,3,4)dnl
-target(ramd,st,0,1)dnl
-target(ramd,cd,0,1)dnl)dnl
-target(ramd,rd,0)dnl
-target(ramd,ttyE,0)dnl
-target(ramd,tty0,0,1)dnl
-target(ramd,pty,0)dnl
+ifelse(MACHINE, macppc, {-dnl
+target(ramd, sd, 0, 1, 2, 3, 4)dnl
+target(ramd, wd, 0, 1, 2, 3, 4)dnl
+target(ramd, st, 0, 1)dnl
+target(ramd, cd, 0, 1)dnl)dnl
+target(ramd, rd, 0)dnl
+target(ramd, ttyE, 0)dnl
+target(ramd, tty0, 0, 1)dnl
+target(ramd, pty, 0)dnl
 -})dnl
-ifelse(MACHINE,vax,{-
-target( all,	hd,	0,1,2)dnl
-target(ramd,fd,0)dnl
-target(ramd,sd,0,1,2,3)dnl
-target(ramd,rd,0)dnl
-target(ramd,cd,0)dnl
-target(ramd,bpf,0)dnl
+ifelse(MACHINE, vax, {-
+target( all, hd, 0, 1, 2)dnl
+target(ramd, fd, 0)dnl
+target(ramd, sd, 0, 1, 2, 3)dnl
+target(ramd, rd, 0)dnl
+target(ramd, cd, 0)dnl
+target(ramd, bpf, 0)dnl
 -})dnl
-target(ramd,std)dnl
-target(ramd,random)dnl
-target(ramd,bpf,0)dnl
-__devitem(rd,{-rd*-},"ramdisk" pseudo-disks)dnl
-_mkdev(rd,rd*,{-dodisk2 rd $U major_rd_b major_rd_c $U 0{--}ifstep(rd)-})dnl
-__devitem(xd,xd*,Xylogic 753/7053 disks)dnl
-__devitem(xy,xy*,{-	Xylogic 450/451 disks-})dnl
-__devitem(flo,{-fd*-},{-Floppy disk drives (3 1/2"{-,-} 5 1/4")-})dnl
-_mkdev(flo,fd*,
+target(ramd, std)dnl
+target(ramd, random)dnl
+target(ramd, bpf, 0)dnl
+__devitem(rd, {-rd*-}, "ramdisk" pseudo-disks)dnl
+_mkdev(rd, rd*, {-dodisk2 rd $U major_rd_b major_rd_c $U 0{--}ifstep(rd)-})dnl
+__devitem(xd, xd*, Xylogic 753/7053 disks)dnl
+__devitem(xy, xy*, {-	Xylogic 450/451 disks-})dnl
+__devitem(flo, {-fd*-}, {-Floppy disk drives (3 1/2"{-,-} 5 1/4")-})dnl
+_mkdev(flo, fd*,
 {-typnam=$U${i#fd[01]*}
 	case $typnam in
 	0|1)	typnum=0;; # no type specified, assume A
@@ -485,40 +485,40 @@ _mkdev(flo,fd*,
 	*)	echo bad unit $U for $i; exit 1;;
 	esac
 	nam=fd${typnam}
-	n=Add(Mult($U,128),Mult($typnum,16))
+	n=Add(Mult($U, 128), Mult($typnum, 16))
 	M ${nam}a	b $blk $n 640 operator
-	M ${nam}b	b $blk Add($n,1) 640 operator
-	M ${nam}c	b $blk Add($n,2) 640 operator
+	M ${nam}b	b $blk Add($n, 1) 640 operator
+	M ${nam}c	b $blk Add($n, 2) 640 operator
 	M r${nam}a	c $chr $n 640 operator
-	M r${nam}b	c $chr Add($n,1) 640 operator
-	M r${nam}c	c $chr Add($n,2) 640 operator-},664)dnl
-__devitem(aflo,ramdisk,devices needed for install floppies)dnl
-_mkdev(aflo,fd*,{-case $U in 0|1|2|3)
-	M fd${U}a b major_aflo_b Mult($U,16) 640 operator
-	M fd${U}b b major_aflo_b Add(Mult($U,16),1) 640 operator
-	M rfd${U}a c major_aflo_c Mult($U,16) 640 operator
-	M rfd${U}b c major_aflo_c Add(Mult($U,16),1) 640 operator;;
+	M r${nam}b	c $chr Add($n, 1) 640 operator
+	M r${nam}c	c $chr Add($n, 2) 640 operator-}, 664)dnl
+__devitem(aflo, ramdisk, devices needed for install floppies)dnl
+_mkdev(aflo, fd*, {-case $U in 0|1|2|3)
+	M fd${U}a b major_aflo_b Mult($U, 16) 640 operator
+	M fd${U}b b major_aflo_b Add(Mult($U, 16), 1) 640 operator
+	M rfd${U}a c major_aflo_c Mult($U, 16) 640 operator
+	M rfd${U}b c major_aflo_c Add(Mult($U, 16), 1) 640 operator;;
 	*) echo bad unit for floppy disk in: $i;;
 	esac-})dnl
-__devitem(iop,iop*,I2O controller device)dnl
-_mcdev(iop,iop*,iop,{-major_iop_c-},660)dnl
-__devitem(wdt,wdt0,watchdog timer)dnl
-_mcdev(wdt,wdt0,wdt,{-major_wdt_c-},440,operator)dnl
-__devitem(local,local,configuration specific devices)dnl
-__devitem(wd,{-wd*-},{-"winchester" disk drives (ST506,IDE,ESDI,RLL,...)-})dnl
-__devitem(ccd,ccd*,concatenated disk devices)dnl
-__devitem(raid,raid*,RAIDframe disk devices)dnl
-__devitem(vnd,vnd*,"file" pseudo-disks)dnl
-_mkdev(vnd,vnd*,{-dodisk vnd $U major_vnd_b major_vnd_c $U 0{--}ifstep(vnd)
+__devitem(iop, iop*, I2O controller device)dnl
+_mcdev(iop, iop*, iop, {-major_iop_c-}, 660)dnl
+__devitem(wdt, wdt0, watchdog timer)dnl
+_mcdev(wdt, wdt0, wdt, {-major_wdt_c-}, 440, operator)dnl
+__devitem(local, local, configuration specific devices)dnl
+__devitem(wd, {-wd*-}, {-"winchester" disk drives (ST506, IDE, ESDI, RLL, ...)-})dnl
+__devitem(ccd, ccd*, concatenated disk devices)dnl
+__devitem(raid, raid*, RAIDframe disk devices)dnl
+__devitem(vnd, vnd*, "file" pseudo-disks)dnl
+_mkdev(vnd, vnd*, {-dodisk vnd $U major_vnd_b major_vnd_c $U 0{--}ifstep(vnd)
 	dodisk svnd $U major_vnd_b major_vnd_c $U 128{--}ifstep(vnd)-})dnl
-__devitem(ra,ra*,{-MSCP disks (ra??, hd??)-})dnl
-__devitem(hp,hp*,{-massbuss rm??-})dnl
-__devitem(hk,hk*,{-unibus rk06 and rk07-})dnl
-__devitem(up,up*,{-other unibus devices (e.g. on Emulex sc-21v controller)-})dnl
-__devitem(rb,rb*,{-730 idc w/ rb80 and/or rb02-})dnl
-__devitem(rx,rx*,{-MSCP floppy disk (rx33/50/...)-})dnl
-__devitem(rl,rl*,{-unibus r102-})dnl
-__devitem(hd,hd*,{-HDC9224 hd disks on VS2000-})dnl
+__devitem(ra, ra*, {-MSCP disks (ra??, hd??)-})dnl
+__devitem(hp, hp*, {-massbuss rm??-})dnl
+__devitem(hk, hk*, {-unibus rk06 and rk07-})dnl
+__devitem(up, up*, {-other unibus devices (e.g. on Emulex sc-21v controller)-})dnl
+__devitem(rb, rb*, {-730 idc w/ rb80 and/or rb02-})dnl
+__devitem(rx, rx*, {-MSCP floppy disk (rx33/50/...)-})dnl
+__devitem(rl, rl*, {-unibus r102-})dnl
+__devitem(hd, hd*, {-HDC9224 hd disks on VS2000-})dnl
 dnl
 dnl For normal disk devices, add a disk_q entry; anything else define like
 dnl the rest (such as vnd above).
@@ -539,49 +539,49 @@ disk_q({-up-})dnl
 disk_q({-wd-})dnl
 disk_q({-rz-})dnl
 dnl
-__devitem(loc,local,configuration specific devices)dnl
-_mkdev(loc,local,{-test -s $T.local && sh $T.local-})dnl
-_mkdev({-disks-},{-undefine({-C_ase-})show_disks()undefine({-C_ase-})-},
+__devitem(loc, local, configuration specific devices)dnl
+_mkdev(loc, local, {-test -s $T.local && sh $T.local-})dnl
+_mkdev({-disks-}, {-undefine({-C_ase-})show_disks()undefine({-C_ase-})-},
 {-case $i in
 show_disks2()dnl
 	esac-})dnl
 __mkdev({-disks-}){--}dnl
 dnl
-__devtitle(cons,Console ports)dnl
-__devitem(ttyv0,ttyv0,pccons or pcvt screen 0)dnl
-__devitem(ttyv,ttyv*,pcvt)dnl
-__devitem(ttye,ttye*,ite bitmapped consoles)dnl
-__devitem(mac_ttye,ttye*,ite bitmapped consoles)dnl
-__devitem(wscons,ttyC0,wscons screen 0)dnl
-_mkdev({-wscons-},{-wscons-},{-dnl
+__devtitle(cons, Console ports)dnl
+__devitem(ttyv0, ttyv0, pccons or pcvt screen 0)dnl
+__devitem(ttyv, ttyv*, pcvt)dnl
+__devitem(ttye, ttye*, ite bitmapped consoles)dnl
+__devitem(mac_ttye, ttye*, ite bitmapped consoles)dnl
+__devitem(wscons, ttyC0, wscons screen 0)dnl
+_mkdev({-wscons-}, {-wscons-}, {-dnl
 _dl(dnl
-{-wscons-},{-ttyCcfg-},
-{-wsdisp-},{-ttyC0 ttyC1 ttyC2 ttyC3 ttyC4 ttyC5 ttyC6 ttyC7 ttyC8 ttyC9-},
-{-wsdisp-},{-ttyCa ttyCb-},
-{-wsmux-},{-wsmux-},
-{-wskbd-},{-wskbd0 wskbd1 wskbd2 wskbd3-},
-{-wsmouse-},{-wsmouse0 wsmouse1 wsmouse2 wsmouse3-})-})dnl
-__devitem(wsdisp,ttyC*,wscons virtual consoles)dnl
-_mkdev({-wsdisp-},ttyC*,{-U=${i##ttyC}
+{-wscons-}, {-ttyCcfg-},
+{-wsdisp-}, {-ttyC0 ttyC1 ttyC2 ttyC3 ttyC4 ttyC5 ttyC6 ttyC7 ttyC8 ttyC9-},
+{-wsdisp-}, {-ttyCa ttyCb-},
+{-wsmux-}, {-wsmux-},
+{-wskbd-}, {-wskbd0 wskbd1 wskbd2 wskbd3-},
+{-wsmouse-}, {-wsmouse0 wsmouse1 wsmouse2 wsmouse3-})-})dnl
+__devitem(wsdisp, ttyC*, wscons virtual consoles)dnl
+_mkdev({-wsdisp-}, ttyC*, {-U=${i##ttyC}
 	case $U in
 	[0-9a-f]) M ttyC$U c major_wsdisp_c {-$(( 16#$U ))-} 600;;
 	cfg) M ttyCcfg c major_wsdisp_c 255 600;;
 	*) echo bad unit $U for $i; exit 1;;
 	esac-})dnl
-__devitem(wskbd,wskbd*,wscons keyboards)dnl
-_mkdev(wskbd,wskbd*,{-M wskbd$U c major_wskbd_c $U 600-})dnl
-__devitem(wsmux,wsmux,wscons keyboard/mouse mux devices)dnl
-_mkdev(wsmux,wsmux|wsmouse|wskbd,{-M wsmouse c major_wsmux_c 0 600
+__devitem(wskbd, wskbd*, wscons keyboards)dnl
+_mkdev(wskbd, wskbd*, {-M wskbd$U c major_wskbd_c $U 600-})dnl
+__devitem(wsmux, wsmux, wscons keyboard/mouse mux devices)dnl
+_mkdev(wsmux, wsmux|wsmouse|wskbd, {-M wsmouse c major_wsmux_c 0 600
 	M wskbd c major_wsmux_c 1 600-})dnl
-__devitem(pcons,console,PROM console)dnl
-__devtitle(point,Pointing devices)dnl
-__devitem(wsmouse,wsmouse*,wscons mice)dnl
-_mkdev(wsmouse,wsmouse*,{-M wsmouse$U c major_wsmouse_c $U 600-})dnl
-__devitem(quad,quadmouse,"quadrature mouse")dnl
-__devtitle(pty,Pseudo terminals)dnl
-__devitem(tty,tty*,set of 16 slave psuedo terminals)dnl
-__devitem(pty,pty*,set of 16 master pseudo terminals)dnl
-_mkdev(pty,pty*,{-case $U in
+__devitem(pcons, console, PROM console)dnl
+__devtitle(point, Pointing devices)dnl
+__devitem(wsmouse, wsmouse*, wscons mice)dnl
+_mkdev(wsmouse, wsmouse*, {-M wsmouse$U c major_wsmouse_c $U 600-})dnl
+__devitem(quad, quadmouse, "quadrature mouse")dnl
+__devtitle(pty, Pseudo terminals)dnl
+__devitem(tty, tty*, set of 16 slave psuedo terminals)dnl
+__devitem(pty, pty*, set of 16 master pseudo terminals)dnl
+_mkdev(pty, pty*, {-case $U in
 	0) off=0 name=p;;
 	1) off=16 name=q;;
 	2) off=32 name=r;;
@@ -604,56 +604,56 @@ _mkdev(pty,pty*,{-case $U in
 	while [ $n -lt 16 ]
 	do
 		nam=$name$(hex $n)
-		M tty$nam c major_tty_c Add($off,$n)
-		M pty$nam c major_pty_c Add($off,$n)
-		n=Add($n,1)
+		M tty$nam c major_tty_c Add($off, $n)
+		M pty$nam c major_pty_c Add($off, $n)
+		n=Add($n, 1)
 	done-})dnl
-__devitem(dc,dc*,{-4 channel serial interface (keyboard{-,-} mouse{-,-}modem{-,-} printer)-})dnl
-__devtitle(prn,Printers)dnl
-__devitem(par,par*,motherboard parallel port)dnl
-__devitem(lpt,lpt*,IEEE 1284 centronics printer)dnl
-_mkdev(lpt,lpt*|lpa*,
+__devitem(dc, dc*, {-4 channel serial interface (keyboard{-,-} mouse{-,-}modem{-,-} printer)-})dnl
+__devtitle(prn, Printers)dnl
+__devitem(par, par*, motherboard parallel port)dnl
+__devitem(lpt, lpt*, IEEE 1284 centronics printer)dnl
+_mkdev(lpt, lpt*|lpa*,
 {-case $i in
 	lpt*) n=lpt f=0;;
 	lpa*) n=lpa f=128;;
 	esac
-	M $n$U c major_lpt_c Add($U,$f) 600-})dnl
-__devitem(lpa,lpa*,interruptless lp)dnl
-__devitem(ppi,ppi*,HP-IB plotters)dnl
-__devtitle({-usb-},USB devices)dnl
-__devitem({-usb-},usb*,Bus control devices used by usbd for attach/detach)dnl
-_mkdev({-usb-},usb*,{-[ "$i" = "usb" ] && u= || u=$U
+	M $n$U c major_lpt_c Add($U, $f) 600-})dnl
+__devitem(lpa, lpa*, interruptless lp)dnl
+__devitem(ppi, ppi*, HP-IB plotters)dnl
+__devtitle({-usb-}, USB devices)dnl
+__devitem({-usb-}, usb*, Bus control devices used by usbd for attach/detach)dnl
+_mkdev({-usb-}, usb*, {-[ "$i" = "usb" ] && u= || u=$U
 	M usb$u c major_usb_c $U 660-})dnl
-__devitem(uhid,uhid*,Generic HID devices)dnl
-_mcdev({-uhid-},uhid*,{-uhid-},{-major_uhid_c-},660)dnl
-__devitem(ulpt,ulpt*,Printer devices)dnl
-_mcdev({-ulpt-},ulpt*,{-ulpt-},{-major_ulpt_c-},660)dnl
-__devitem(utty,utty*,Serial ports)dnl
-_mcdev({-utty-},utty*,{-utty-},{-major_utty_c-},660)dnl
-__devitem(urio,urio*,Diamond Multimedia Rio 500)dnl
-_mcdev({-urio-},urio*,{-urio-},{-major_urio_c-},660)dnl
-__devitem(uscan,uscanner*,Scanners)dnl
-_mcdev({-uscan-},uscanner*,{-uscanner-},{-major_uscan_c-},660)dnl
-__devitem(ugen,ugen*,Generic device)dnl
-_mkdev(ugen,ugen*,{-n=Mult($U,16)
+__devitem(uhid, uhid*, Generic HID devices)dnl
+_mcdev({-uhid-}, uhid*, {-uhid-}, {-major_uhid_c-}, 660)dnl
+__devitem(ulpt, ulpt*, Printer devices)dnl
+_mcdev({-ulpt-}, ulpt*, {-ulpt-}, {-major_ulpt_c-}, 660)dnl
+__devitem(utty, utty*, Serial ports)dnl
+_mcdev({-utty-}, utty*, {-utty-}, {-major_utty_c-}, 660)dnl
+__devitem(urio, urio*, Diamond Multimedia Rio 500)dnl
+_mcdev({-urio-}, urio*, {-urio-}, {-major_urio_c-}, 660)dnl
+__devitem(uscan, uscanner*, Scanners)dnl
+_mcdev({-uscan-}, uscanner*, {-uscanner-}, {-major_uscan_c-}, 660)dnl
+__devitem(ugen, ugen*, Generic device)dnl
+_mkdev(ugen, ugen*, {-n=Mult($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 major_ugen_c Add($n,$j) 660
+		M ugen$U.$j c major_ugen_c Add($n, $j) 660
 	done-})dnl
-__devtitle(cpu,Cpus)dnl
-__devitem(cpu,cpu*,cpus)dnl
-__devtitle(call,Call units)dnl
-__devtitle(term,Terminal ports)dnl
-__devtitle(termp,Terminal multiplexers)dnl
-__devitem(dca,dca*,HP200/300 single port serial interface)dnl
-__devitem(dcm,dcm*,HP200/300 4 port serial mux interface)dnl
-__devitem(apci,apci*,HP400 4 port serial mux interface)dnl
-__devitem({-com-},{-tty0*-},NS16x50 serial ports)dnl
-_mkdev(com,{-tty0*-},{-M tty$U c major_com_c $U 660 dialer uucp
-	M cua$U c major_com_c Add($U,128) 660 dialer uucp-})dnl
-__devitem(ttyc,ttyc*,Cyclades serial ports)dnl
-__devitem(tzs,tty[a-z]*,Zilog 8530 Serial Port)dnl
-_mkdev(tzs,{-tty[a-z]-},{-u=${i#tty*}
+__devtitle(cpu, Cpus)dnl
+__devitem(cpu, cpu*, cpus)dnl
+__devtitle(call, Call units)dnl
+__devtitle(term, Terminal ports)dnl
+__devtitle(termp, Terminal multiplexers)dnl
+__devitem(dca, dca*, HP200/300 single port serial interface)dnl
+__devitem(dcm, dcm*, HP200/300 4 port serial mux interface)dnl
+__devitem(apci, apci*, HP400 4 port serial mux interface)dnl
+__devitem({-com-}, {-tty0*-}, NS16x50 serial ports)dnl
+_mkdev(com, {-tty0*-}, {-M tty$U c major_com_c $U 660 dialer uucp
+	M cua$U c major_com_c Add($U, 128) 660 dialer uucp-})dnl
+__devitem(ttyc, ttyc*, Cyclades serial ports)dnl
+__devitem(tzs, tty[a-z]*, Zilog 8530 Serial Port)dnl
+_mkdev(tzs, {-tty[a-z]-}, {-u=${i#tty*}
 	case $u in
 	a) n=0 ;;
 	b) n=1 ;;
@@ -662,10 +662,10 @@ _mkdev(tzs,{-tty[a-z]-},{-u=${i#tty*}
 	*) echo unknown tty device $i ;;
 	esac
 	M tty$u c major_tzs_c $n 660 dialer uucp-})dnl
-__devitem(tth,ttyh*,Sab82532 serial devices)dnl
-_mkdev(tth,ttyh*,{-M ttyh$U c major_tth_c $U 660 dialer uucp-})dnl
-__devitem(czs,cua[a-z]*,Zilog 8530 Serial Port)dnl
-_mkdev(czs,cua[a-z],{-u=${i#cua*}
+__devitem(tth, ttyh*, Sab82532 serial devices)dnl
+_mkdev(tth, ttyh*, {-M ttyh$U c major_tth_c $U 660 dialer uucp-})dnl
+__devitem(czs, cua[a-z]*, Zilog 8530 Serial Port)dnl
+_mkdev(czs, cua[a-z], {-u=${i#cua*}
 	case $u in
 	a) n=0 ;;
 	b) n=1 ;;
@@ -673,172 +673,172 @@ _mkdev(czs,cua[a-z],{-u=${i#cua*}
 	d) n=5 ;;
 	*) echo unknown cua device $i ;;  
 	esac
-	M cua$u c major_czs_c Add($n,128) 660 dialer uucp-})dnl
-__devitem(arm_tty,tty*,{-alias for PC COM ports{-,-} this is what the system really wants-})dnl
-__devitem(tty0,tty00,standard serial port)dnl
-__devitem(mac_tty0,tty00,standard serial port)dnl
-__devitem(ttyA,ttyA*,mfc serial ports)dnl
-__devitem(attyB,ttyB*,ISA COM ports)dnl  amiga
-__devitem(ttyz,tty[a-d],onboard zs serial ports)dnl
-__devitem(cuaz,cua[a-d],onboard zs serial ports)dnl
-__devitem(ttyB,ttyB?,DEC 3000 ZS8530 ("scc") serial ports)dnl
-__devitem(scc,scc*,82530 serial interface)dnl
-__devitem(arc_ttyC,ttyC0,pccons)dnl
-__devitem(i386_ttyC,ttyC*,pcvt)dnl
-__devitem(ttyC,ttyC?,{-AlphaStation NS16550 ("com serial ports")-})dnl
-__devitem(ttyE,ttyE?,Workstation console (framebuffer & keyboard) tty emulators)dnl
-__devitem(ser02,ser02,{-serial2 port (channel A on 8530)-})dnl
-__devitem(mdm02,mdm02,{-modem2 port (channel B on 8530)-})dnl
-__devtitle(spec,Special purpose devices)dnl
-__devitem(apm,apm	,power management device)dnl
-_mkdev(apm,apm*,{-M apm	c major_apm_c 0 644
+	M cua$u c major_czs_c Add($n, 128) 660 dialer uucp-})dnl
+__devitem(arm_tty, tty*, {-alias for PC COM ports{-,-} this is what the system really wants-})dnl
+__devitem(tty0, tty00, standard serial port)dnl
+__devitem(mac_tty0, tty00, standard serial port)dnl
+__devitem(ttyA, ttyA*, mfc serial ports)dnl
+__devitem(attyB, ttyB*, ISA COM ports)dnl  amiga
+__devitem(ttyz, tty[a-d], onboard zs serial ports)dnl
+__devitem(cuaz, cua[a-d], onboard zs serial ports)dnl
+__devitem(ttyB, ttyB?, DEC 3000 ZS8530 ("scc") serial ports)dnl
+__devitem(scc, scc*, 82530 serial interface)dnl
+__devitem(arc_ttyC, ttyC0, pccons)dnl
+__devitem(i386_ttyC, ttyC*, pcvt)dnl
+__devitem(ttyC, ttyC?, {-AlphaStation NS16550 ("com serial ports")-})dnl
+__devitem(ttyE, ttyE?, Workstation console (framebuffer & keyboard) tty emulators)dnl
+__devitem(ser02, ser02, {-serial2 port (channel A on 8530)-})dnl
+__devitem(mdm02, mdm02, {-modem2 port (channel B on 8530)-})dnl
+__devtitle(spec, Special purpose devices)dnl
+__devitem(apm, apm	, power management device)dnl
+_mkdev(apm, apm*, {-M apm	c major_apm_c 0 644
 	M apmctl	c major_apm_c 8 644-})dnl
-__devitem(pcmcia,pcmcia*,PCMCIA card drivers)dnl
-__devitem(pctr,pctr*,PC Performance Tuning Register access device)dnl
-_mkdev(pctr,pctr,{-M pctr c major_pctr_c 0 644-})dnl
-__devitem(au,audio*,audio device)dnl
-_mkdev(au,audio*,{-M sound$U	c major_au_c $U
-	M mixer$U	c major_au_c Add($U,16)
-	M audio$U	c major_au_c Add($U,128)
-	M audioctl$U	c major_au_c Add($U,192)
+__devitem(pcmcia, pcmcia*, PCMCIA card drivers)dnl
+__devitem(pctr, pctr*, PC Performance Tuning Register access device)dnl
+_mkdev(pctr, pctr, {-M pctr c major_pctr_c 0 644-})dnl
+__devitem(au, audio*, audio device)dnl
+_mkdev(au, audio*, {-M sound$U	c major_au_c $U
+	M mixer$U	c major_au_c Add($U, 16)
+	M audio$U	c major_au_c Add($U, 128)
+	M audioctl$U	c major_au_c Add($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"-})dnl
-__devitem(asc,asc*,ASC Audio device)dnl
-_mkdev(asc,asc*,{-M asc$U major_asc_c 0-})dnl
-__devitem(music,music*,midi devices)dnl
-_mkdev(music,music*,{-M music$U     c major_music_c $U
-	M sequencer$U c major_music_c Add($U,128)
+__devitem(asc, asc*, ASC Audio device)dnl
+_mkdev(asc, asc*, {-M asc$U major_asc_c 0-})dnl
+__devitem(music, music*, midi devices)dnl
+_mkdev(music, music*, {-M music$U     c major_music_c $U
+	M sequencer$U c major_music_c Add($U, 128)
 	MKlist="$MKlist;[ -e music ] || ln -s music$U music"
 	MKlist="$MKlist;[ -e sequencer ] || ln -s sequencer$U sequencer"-})dnl
-__devitem(radio,radio*,FM tuner device)dnl
-_mkdev(radio,radio*,{-M radio$U     c major_radio_c $U
+__devitem(radio, radio*, FM tuner device)dnl
+_mkdev(radio, radio*, {-M radio$U     c major_radio_c $U
 	MKlist="$MKlist;[ -e radio ] || ln -s radio$U radio"-})dnl
-__devitem(fdesc,fd,makes fd/* for the fdescfs)dnl
-_mkdev(fdesc,fd,{-RMlist="mkdir -p fd;$RMlist" n=0
-	while [ $n -lt 64 ];do M fd/$n c major_fdesc_c $n;n=Add($n,1);done
+__devitem(fdesc, fd, makes fd/* for the fdescfs)dnl
+_mkdev(fdesc, fd, {-RMlist="mkdir -p fd;$RMlist" n=0
+	while [ $n -lt 64 ];do M fd/$n c major_fdesc_c $n;n=Add($n, 1);done
 	MKlist="$MKlist;chmod 555 fd"-})dnl
-__devtitle(graph,Graphics devices)dnl
-__devitem(grf_mac,grf*,{-custom chip (grf0){-,-} Retina Z2/Z3 (grf1/grf2){-,-}
+__devtitle(graph, Graphics devices)dnl
+__devitem(grf_mac, grf*, {-custom chip (grf0){-,-} Retina Z2/Z3 (grf1/grf2){-,-}
 {-#-}		Cirrus boards (grf3){-,-} A2410 (grf4) video or
 {-#-}		CyberVision 64 (grf5)-})dnl
-__devitem(grf_amiga,grf*,{-Motherboard bitmapped video.-})dnl
-__devitem(ite,ite*,terminal emulator interface to HP300 graphics devices)dnl
-__devitem({-hil-},{-hil-},HP300 HIL input devices)dnl
-__devitem(oppr,openprom)dnl
-_cdev(oppr,openprom,70,0)dnl
-__devitem(btw,bwtwo*)dnl
-_mcdev(btw,bwtwo*,bwtwo,{-major_btw_c-},666)dnl
-__devitem(ctw,cgtwo*)dnl
-_mcdev(ctw,cgtwo*,cgtwo,{-major_ctw_c-},666)dnl
-__devitem(ctr,cgthree*)dnl
-_mcdev(ctr,cgthree*,cgthree,{-major_ctr_c-},666)dnl
-__devitem(cfr,cgfour*)dnl
-_mcdev(cfr,cgfour*,cgfour,{-major_cfr_c-},666)dnl
-__devitem(csx,cgsix*)dnl
-_mcdev(csx,cgsix*,cgsix,{-major_csx_c-},666)dnl
-__devitem(ceg,cgeight*)dnl
-_mcdev(ceg,cgeight*,cgeight,{-major_ceg_c-},666)dnl
-__devitem(cfo,cgfourteen*)dnl
-_mcdev(cfo,cgfourteen*,cgfourteen,{-major_cfo_c-})dnl
-__devitem(tcx,tcx*)dnl
-_mcdev(tcx,tcx*,tcx,{-major_tcx_c-})dnl
-__devitem(cry,crypto,hardware crypto access driver)dnl
-_mkdev(cry,crypto,{-M crypto c major_cry_c-} 0)dnl
-__devitem(pf,pf*,Packet Filter)dnl
-_mkdev(pf,{-pf*-},{-M pf c major_pf_c 0 600-})dnl
-__devitem(bpf,bpf*,Berkeley Packet Filter)dnl
-_mkdev(bpf,{-bpf*-},{-M bpf$U c major_bpf_c $U 600-},600)dnl
-_mkdev(tun,{-tun*-},{-M tun$U c major_tun_c $U 600-},600)dnl
-__devitem(altq,altq/,ALTQ control interface)dnl
-_mkdev(altq,altq,{-RMlist="mkdir -p altq;$RMlist"
+__devitem(grf_amiga, grf*, {-Motherboard bitmapped video.-})dnl
+__devitem(ite, ite*, terminal emulator interface to HP300 graphics devices)dnl
+__devitem({-hil-}, {-hil-}, HP300 HIL input devices)dnl
+__devitem(oppr, openprom)dnl
+_cdev(oppr, openprom, 70, 0)dnl
+__devitem(btw, bwtwo*)dnl
+_mcdev(btw, bwtwo*, bwtwo, {-major_btw_c-}, 666)dnl
+__devitem(ctw, cgtwo*)dnl
+_mcdev(ctw, cgtwo*, cgtwo, {-major_ctw_c-}, 666)dnl
+__devitem(ctr, cgthree*)dnl
+_mcdev(ctr, cgthree*, cgthree, {-major_ctr_c-}, 666)dnl
+__devitem(cfr, cgfour*)dnl
+_mcdev(cfr, cgfour*, cgfour, {-major_cfr_c-}, 666)dnl
+__devitem(csx, cgsix*)dnl
+_mcdev(csx, cgsix*, cgsix, {-major_csx_c-}, 666)dnl
+__devitem(ceg, cgeight*)dnl
+_mcdev(ceg, cgeight*, cgeight, {-major_ceg_c-}, 666)dnl
+__devitem(cfo, cgfourteen*)dnl
+_mcdev(cfo, cgfourteen*, cgfourteen, {-major_cfo_c-})dnl
+__devitem(tcx, tcx*)dnl
+_mcdev(tcx, tcx*, tcx, {-major_tcx_c-})dnl
+__devitem(cry, crypto, hardware crypto access driver)dnl
+_mkdev(cry, crypto, {-M crypto c major_cry_c-} 0)dnl
+__devitem(pf, pf*, Packet Filter)dnl
+_mkdev(pf, {-pf*-}, {-M pf c major_pf_c 0 600-})dnl
+__devitem(bpf, bpf*, Berkeley Packet Filter)dnl
+_mkdev(bpf, {-bpf*-}, {-M bpf$U c major_bpf_c $U 600-}, 600)dnl
+_mkdev(tun, {-tun*-}, {-M tun$U c major_tun_c $U 600-}, 600)dnl
+__devitem(altq, altq/, ALTQ control interface)dnl
+_mkdev(altq, 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 major_altq_c $U 644
-		U=Add($U,1)
+		U=Add($U, 1)
 	done-})dnl
-__devitem(speak,speaker,pc speaker)dnl
-_mkdev(speak,speaker,{-M speaker c major_speak_c 0 600-})dnl
-__devitem(kbd,kbd,keyboard (provides events, for X11))dnl
-_cdev(kbd,kbd,{-major_kbd_c-},0,600)dnl
-__devitem(kbd_atari,kbd,Atari keyboard)dnl
-__devitem(akbd,kbd,Amiga keyboard)dnl
-__devitem(rkbd,kbd,raw keyboard)dnl
-__devitem(kbdctl,kbdctl,keyboard control)dnl
-__devitem(beep,beep,riscpc speaker)dnl
-__devitem(iic,iic*,IIC bus device)dnl
-__devitem(rtc,rtc*,RTC device)dnl
-__devitem(view,view*,generic interface to graphic displays)dnl
-__devitem(aconf,aconf,{-autoconfig information (not yet)-})dnl
-__devitem(mouse-,mouse-*,"mouse link")dnl
-__devitem(mouse,mouse,mouse (provides events, for X11))dnl
-__devitem(amouse,mouse*,Amiga mice)dnl
-__devitem(lkm,lkm,loadable kernel modules interface)dnl
-_cdev(lkm,lkm,{-major_lkm_c-},0,640,kmem)dnl
-__devitem(mmcl,mmclock,memory mapped clock)dnl
-__devitem(tun,tun*,network tunnel driver)dnl
-__devitem(rnd,*random,inkernel random data source)dnl
-_mkdev(rnd,*random,{-n=0
+__devitem(speak, speaker, pc speaker)dnl
+_mkdev(speak, speaker, {-M speaker c major_speak_c 0 600-})dnl
+__devitem(kbd, kbd, keyboard (provides events, for X11))dnl
+_cdev(kbd, kbd, {-major_kbd_c-}, 0, 600)dnl
+__devitem(kbd_atari, kbd, Atari keyboard)dnl
+__devitem(akbd, kbd, Amiga keyboard)dnl
+__devitem(rkbd, kbd, raw keyboard)dnl
+__devitem(kbdctl, kbdctl, keyboard control)dnl
+__devitem(beep, beep, riscpc speaker)dnl
+__devitem(iic, iic*, IIC bus device)dnl
+__devitem(rtc, rtc*, RTC device)dnl
+__devitem(view, view*, generic interface to graphic displays)dnl
+__devitem(aconf, aconf, {-autoconfig information (not yet)-})dnl
+__devitem(mouse-, mouse-*, "mouse link")dnl
+__devitem(mouse, mouse, mouse (provides events, for X11))dnl
+__devitem(amouse, mouse*, Amiga mice)dnl
+__devitem(lkm, lkm, loadable kernel modules interface)dnl
+_cdev(lkm, lkm, {-major_lkm_c-}, 0, 640, kmem)dnl
+__devitem(mmcl, mmclock, memory mapped clock)dnl
+__devitem(tun, tun*, network tunnel driver)dnl
+__devitem(rnd, *random, inkernel random data source)dnl
+_mkdev(rnd, *random, {-n=0
 	for pre in " " s u p a
 	do
 		M ${pre}random c major_rnd_c $n 644
-		n=Add($n,1)
-	done-},644)dnl
-__devitem(joy,joy*,joystick driver)dnl
-_mcdev(joy,joy*,joy,{-major_joy_c-},666)dnl
-__devitem(mag,magma*,magma card (makes 16 tty and 2 bpp))dnl
-__devitem(bppmag,bppmag[mno],magma parallel port device)dnl
-__devitem(spif,spif*,spif card (makes 8 tty and 1 bpp))dnl
-__devitem(bppsp,bpp[jkl],spif parallel port device)dnl
-_mkdev(mag,magma*,{-case $U in
+		n=Add($n, 1)
+	done-}, 644)dnl
+__devitem(joy, joy*, joystick driver)dnl
+_mcdev(joy, joy*, joy, {-major_joy_c-}, 666)dnl
+__devitem(mag, magma*, magma card (makes 16 tty and 2 bpp))dnl
+__devitem(bppmag, bppmag[mno], magma parallel port device)dnl
+__devitem(spif, spif*, spif card (makes 8 tty and 1 bpp))dnl
+__devitem(bppsp, bpp[jkl], spif parallel port device)dnl
+_mkdev(mag, 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=Mult($U,64)
+	offset=Mult($U, 64)
 	n=0
 	while [ $n -lt 16 ]
 	do
 		name=${nam}`hex $n`
-		M tty$name c major_mag_c Add($offset,$n) 660 dialer uucp
-		n=Add($n,1)
+		M tty$name c major_mag_c Add($offset, $n) 660 dialer uucp
+		n=Add($n, 1)
 	done
-	M bpp${nam}0 c major_bppmag_c Add($offset,0) 600
-	M bpp${nam}1 c major_bppmag_c Add($offset,1) 600-})dnl
-_mkdev(spif,spif*,{-case $U in
+	M bpp${nam}0 c major_bppmag_c Add($offset, 0) 600
+	M bpp${nam}1 c major_bppmag_c Add($offset, 1) 600-})dnl
+_mkdev(spif, spif*, {-case $U in
 	0)	offset=0  nam=j;;
 	1)	offset=16 nam=k;;
 	2)	offset=32 nam=l;;
 	*)	echo "bad unit for $i: $U"; exit 127;;
 	esac
-	offset=Mult($U,64)
+	offset=Mult($U, 64)
 	n=0
 	while [ $n -lt 8 ]
 	do
 		name=${nam}`hex $n`
-		M tty$name c major_spif_c Add($offset,$n) 660 dialer uucp
-		n=Add($n,1)
+		M tty$name c major_spif_c Add($offset, $n) 660 dialer uucp
+		n=Add($n, 1)
 	done
-	M bpp${nam}0 c major_bppsp_c Add($offset,0) 600-})dnl
-__devitem(bpp,bpp*,parallel port devices)dnl
-__devitem(xfs,xfs*,XFS filesystem devices)dnl
-_mcdev(xfs,xfs*,xfs,{-major_xfs_c-},600)dnl
-__devitem(hil,hil,HIL input devices)dnl
-__devitem(rmidi,rmidi*,raw midi devices)dnl
-_mcdev(rmidi,rmidi*,rmidi,{-major_rmidi_c-},666)dnl
-__devtitle(plat,Platform-specific devices)dnl
-__devitem(fb,fb*,framebuffer device)dnl
-__devitem(bktr,bktr*,video capturing)dnl
-_mcdev(bktr,bktr*,bktr,{-major_bktr_c-},644)dnl
-__devitem(tuner,tuner*,tuner device)dnl
-_mkdev(tuner,tuner*,{-M tuner$U c major_bktr_c Add(Mult($U,2),16) 644-},644)dnl
-__devitem(pci,pci,PCI bus device)dnl
-_mkdev(pci,pci,{-M pci c major_pci_c 0 664-},664)dnl
-__devitem(adb,adb,Apple Desktop bus event interface)dnl
-_mkdev(adb,adb,{-M adb c major_adb_c 0-})dnl
-__devitem(pdc,pdc,PDC device)dnl
-_mkdev(local,local,{-test -s $T.local && sh $T.local-},666)dnl
+	M bpp${nam}0 c major_bppsp_c Add($offset, 0) 600-})dnl
+__devitem(bpp, bpp*, parallel port devices)dnl
+__devitem(xfs, xfs*, XFS filesystem devices)dnl
+_mcdev(xfs, xfs*, xfs, {-major_xfs_c-}, 600)dnl
+__devitem(hil, hil, HIL input devices)dnl
+__devitem(rmidi, rmidi*, raw midi devices)dnl
+_mcdev(rmidi, rmidi*, rmidi, {-major_rmidi_c-}, 666)dnl
+__devtitle(plat, Platform-specific devices)dnl
+__devitem(fb, fb*, framebuffer device)dnl
+__devitem(bktr, bktr*, video capturing)dnl
+_mcdev(bktr, bktr*, bktr, {-major_bktr_c-}, 644)dnl
+__devitem(tuner, tuner*, tuner device)dnl
+_mkdev(tuner, tuner*, {-M tuner$U c major_bktr_c Add(Mult($U, 2), 16) 644-}, 644)dnl
+__devitem(pci, pci, PCI bus device)dnl
+_mkdev(pci, pci, {-M pci c major_pci_c 0 664-}, 664)dnl
+__devitem(adb, adb, Apple Desktop bus event interface)dnl
+_mkdev(adb, adb, {-M adb c major_adb_c 0-})dnl
+__devitem(pdc, pdc, PDC device)dnl
+_mkdev(local, local, {-test -s $T.local && sh $T.local-}, 666)dnl
 dnl
 divert(1)dnl
 include(etc.MACHINE/MAKEDEV.md)dnl
@@ -902,26 +902,26 @@ unt()
 	echo $arg
 }
 dnl
-dnl dodisk(name,unit,blkmaj,chrmaj,unit,off[,stepping])
+dnl dodisk(name, unit, blkmaj, chrmaj, unit, off[, stepping])
 dnl   arg: 1    2    3      4      5    6    7
 dnl
 
 dodisk()
 {
 	[ "$DEBUG" ] && set -x
-	n=Add(Mult(${5},${7:-16}),${6}) count=0
+	n=Add(Mult(${5}, ${7:-16}), ${6}) count=0
 	RMlist="$RMlist {-$-}1{-$-}2? r{-$-}1{-$-}2?"
 	[ 0$7 -ne 8 ] && l="i j k l m n o p"
 	for d in a b c d e f g h $l
 	do
-		M {-$-}1{-$-}2$d	b {-$-}3 Add($n,$count) 640
-		M r{-$-}1{-$-}2$d	c {-$-}4 Add($n,$count) 640
+		M {-$-}1{-$-}2$d	b {-$-}3 Add($n, $count) 640
+		M r{-$-}1{-$-}2$d	c {-$-}4 Add($n, $count) 640
 		let count=count+1
 	done
 	MKlist="$MKlist;chown root.operator {-$-}1{-$-}2? r{-$-}1{-$-}2?"
 }
 dnl
-dnl dodisk2(name,unit,blkmaj,chrmaj,unit,off[,stepping])
+dnl dodisk2(name, unit, blkmaj, chrmaj, unit, off[, stepping])
 dnl
 dnl 1. name    - prefix name of the device
 dnl 2. unit    - beginning unit number for block devices
@@ -934,10 +934,10 @@ dnl
 
 dodisk2()
 {
-	n=Add(Mult({-$-}5,${7:-16}),{-$-}6)
+	n=Add(Mult({-$-}5, ${7:-16}), {-$-}6)
 	M {-$-}1{-$-}2a b {-$-}3 $n 640 operator
 	M r{-$-}1{-$-}2a c {-$-}4 $n 640 operator
-	n=Add($n,2)
+	n=Add($n, 2)
 	M {-$-}1{-$-}2c b {-$-}3 $n 640 operator
 	M r{-$-}1{-$-}2c c {-$-}4 $n 640 operator
 }
@@ -950,7 +950,7 @@ mkl() {
 dnl
 dnl uncomment if multi mknod happens
 dnl
-ifelse(1,0,
+ifelse(1, 0,
 [ "${mklist[{-$-}1]}" ] && mklist[{-$-}1]="${mklist[{-$-}1]} {-$-}2 {-$-}3 {-$-}4 {-$-}5" || {
           mklist[{-$-}1]="mknod -m {-$-}1 {-$-}2 {-$-}3 {-$-}4 {-$-}5"
           modes="$modes {-$-}1"