===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/etc/MAKEDEV.common,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- src/etc/MAKEDEV.common	2004/02/17 11:18:03	1.2
+++ src/etc/MAKEDEV.common	2004/02/20 19:13:01	1.3
@@ -1,4 +1,4 @@
-vers(a, {-$OpenBSD: MAKEDEV.common,v 1.2 2004/02/17 11:18:03 miod Exp $-})dnl
+vers(a, {-$OpenBSD: MAKEDEV.common,v 1.3 2004/02/20 19:13:01 miod Exp $-})dnl
 divert(1)dnl
 dnl
 dnl Common device definitions.
@@ -172,7 +172,7 @@
 -})dnl
 dnl
 dnl XXX some arches use ramd, others ramdisk - needs to be fixed eventually
-__devitem(ramdisk, ramdisk, Ramdisk kernel devices)dnl
+__devitem(ramdisk, ramdisk, Ramdisk kernel devices,nothing)dnl
 dnl
 target(usb, usb, 0, 1)dnl
 target(usb, urio, 0)dnl
@@ -182,12 +182,12 @@
 target(usb, ugen, 0, 1)dnl
 target(usb, ttyU, 0, 1)dnl
 dnl
-__devitem({-usbs-}, usbs, All USB devices)dnl
+__devitem({-usbs-}, usbs, All USB devices,usb)dnl
 _mkdev(usbs, usbs, {-dnl
 show_target({-usb-})dnl
 -})dnl
 __devtitle(tap, Tapes)dnl
-__devitem(wt, {-wt*	-}, Archive/Wangtek QIC-cartridge tape drives)dnl
+__devitem(wt, {-wt*-}, Archive/Wangtek QIC-cartridge tape drives)dnl
 _mkdev(wt, wt*,
 {-name=wt
 	n=Mult($U, 8) m=Add($n, 4)
@@ -211,12 +211,10 @@
 __devitem(ts, ts*, UNIBUS TS11)dnl
 __devitem(ut, ut*, UNIBUS TU45 emulations (e.g. 9700))dnl
 __devtitle(dis, Disks)dnl
-dnl REMOVE __devitem(rz, rz*, SCSI disks)dnl
-__devitem(sd, {-sd*-}, {-SCSI disks, includes flopticals-})dnl
-__devitem(cd, {-cd*-}, SCSI cdrom drives)dnl
-__devitem(acd, acd*, ATAPI cdrom drives)dnl
+__devitem(sd, {-sd*-}, {-SCSI disks{-,-} including flopticals-})dnl
+__devitem(cd, {-cd*-}, ATAPI and SCSI CD-ROM 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
+__devitem(mcd, mcd*, Mitsumi CD-ROM 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 changers)dnl
@@ -232,7 +230,7 @@
 __devitem(ses, ses*, SES/SAF-TE SCSI devices)dnl
 _mkdev(ses, ses*, {-M ses$U c major_ses_c $U 640 operator-})dnl
 dnl XXX see ramdisk above
-__devitem(ramd, ramdisk, Ramdisk kernel devices)dnl
+__devitem(ramd, ramdisk, Ramdisk kernel devices,nothing)dnl
 _mkdev(ramd, ramdisk, {-dnl
 show_target(ramd)dnl
 -})dnl
@@ -243,7 +241,7 @@
 _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
+__devitem(flo, {-fd*-}, {-Floppy disk drives (3 1/2"{-,-} 5 1/4")-},fd)dnl
 _mkdev(flo, fd*,
 {-typnam=$U${i#fd[01]*}
 	case $typnam in
@@ -274,7 +272,7 @@
 _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(wd, {-wd*-}, {-quote(winchester)disk drives (ST506, IDE, ESDI, RLL, ...)-})dnl
+__devitem(wd, {-wd*-}, {-quote(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*, quote(file)pseudo-disk devices)dnl
@@ -321,7 +319,7 @@
 _mkdev({-wscons-}, {-wscons-}, {-dnl
 show_target(wscons)dnl
 -})dnl
-__devitem(wsdisp, ttyC-F*, wscons display devices)dnl
+__devitem(wsdisp, ttyC-F*, wscons display devices,wsdisplay)dnl
 _mkdev({-wsdisp-}, tty[C-F]*, {-U=${i##tty[C-F]}
 	case $i in
 	ttyC*) n=C m=expr(0*256);;
@@ -365,7 +363,6 @@
 	done-})dnl
 __devitem(dc, dc*, {-4 channel serial interface (keyboard{-,-} mouse{-,-}modem{-,-} printer)-})dnl
 __devtitle(prn, Printers)dnl
-__devitem(par, par*, On-board parallel port)dnl
 __devitem(lpt, lpt*, IEEE 1284 centronics printer)dnl
 _mkdev(lpt, lpt*|lpa*,
 {-case $i in
@@ -373,7 +370,7 @@
 	lpa*) n=lpa f=128;;
 	esac
 	M $n$U c major_lpt_c Add($U, $f) 600-})dnl
-__devitem(lpa, lpa*, Polled printer port)dnl
+__devitem(lpa, lpa*, Polled printer port,lpt)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
@@ -383,13 +380,13 @@
 _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(ttyU, ttyU*, USB serial ports)dnl
+__devitem(ttyU, ttyU*, USB serial ports,ucom)dnl
 _mkdev({-ttyU-}, {-ttyU[0-9a-zA-Z]-}, {-U=${i#ttyU*}
 	o=$(alph2d $U)
 	M ttyU$U c major_ttyU_c $o 660 dialer uucp-})dnl
 __devitem(urio, urio*, Diamond Multimedia Rio 500)dnl
 _mcdev({-urio-}, urio*, {-urio-}, {-major_urio_c-}, 660)dnl
-__devitem(uscan, uscanner*, Scanners)dnl
+__devitem(uscan, uscanner*, Scanners,uscanner)dnl
 _mcdev({-uscan-}, uscanner*, {-uscanner-}, {-major_uscan_c-}, 660)dnl
 __devitem(ugen, ugen*, Generic USB devices)dnl
 _mkdev(ugen, ugen*, {-n=Mult($U, 16)
@@ -407,8 +404,8 @@
 	o=$(h2d $U)
 	M tty$U c major_com_c $o 660 dialer uucp
 	M cua$U c major_com_c Add($o, 128) 660 dialer uucp-})dnl
-__devitem(ttyc, ttyc*, Cyclades serial ports)dnl
-__devitem(tzs, tty[a-z]*, Zilog 8530 Serial Port)dnl
+__devitem(ttyc, ttyc*, Cyclades serial ports,cy)dnl
+__devitem(tzs, tty[a-z]*, Zilog 8530 Serial Port,zs)dnl
 _mkdev(tzs, {-tty[a-z]-}, {-u=${i#tty*}
 	case $u in
 	a) n=0 ;;
@@ -418,9 +415,9 @@
 	*) 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
+__devitem(tth, ttyh*, Sab82532 serial devices,sab)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
+__devitem(czs, cua[a-z]*, Zilog 8530 Serial Port,zs)dnl
 _mkdev(czs, cua[a-z], {-u=${i#cua*}
 	case $u in
 	a) n=0 ;;
@@ -430,12 +427,12 @@
 	*) echo unknown cua device $i ;;
 	esac
 	M cua$u c major_czs_c Add($n, 128) 660 dialer uucp-})dnl
-__devitem(tty0, tty00, Standard serial port)dnl
-__devitem(mac_tty0, tty00, Standard serial port)dnl
-__devitem(ttyz, tty[a-d], On-board zs serial ports)dnl
-__devitem(cuaz, cua[a-d], On-board zs serial ports)dnl
-__devitem(ttyB, ttyB?, DEC 3000 ZS8530 ("scc") serial ports)dnl
-__devitem(scc, scc*, 82530 serial interface)dnl
+__devitem(tty0, tty00, Standard serial port,com)dnl
+__devitem(mac_tty0, tty00, Standard serial port,zsc)dnl
+__devitem(ttyz, tty[a-d], On-board zs serial ports,zs)dnl
+__devitem(cuaz, cua[a-d], On-board zs serial ports,zs)dnl
+__devitem(ttyB, ttyB?, DEC 3000 ZS8530 ("scc") serial ports,scc)dnl
+__devitem(scc, scc*, 82530 serial interface,scc)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
@@ -444,7 +441,7 @@
 _mkdev(pctr, pctr, {-M pctr c major_pctr_c 0 644-})dnl
 __devitem(systrace, systrace*, System call tracing device)dnl
 _mkdev(systrace, systrace, {-M systrace c major_systrace_c 0 644-})dnl
-__devitem(au, audio*, Audio devices)dnl
+__devitem(au, audio*, Audio devices,audio)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)
@@ -455,7 +452,7 @@
 	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
+__devitem(music, music*, MIDI devices,midi)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"
@@ -463,29 +460,28 @@
 __devitem(radio, radio*, FM tuner devices)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, fd/* nodes for fdescfs)dnl
+__devitem(fdesc, fd, fd/* nodes for fdescfs,mount_fdesc 8)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
-__devitem(grf_mac, grf*, Raw interface to the mac68k graphics devices)dnl
+__devitem(grf_mac, grf*, Raw interface to the mac68k graphics devices,grf)dnl
 __devitem(ite, ite*, Terminal emulator interface to HP300 graphics devices)dnl
 __devitem({-hil-}, {-hil-}, HP-HIL input devices)dnl
-__devitem(oppr, openprom)dnl
+__devitem(oppr, openprom,,openprom)dnl
 _cdev(oppr, openprom, 70, 0)dnl
-__devitem(cry, crypto, Hardware crypto access driver)dnl
+__devitem(cry, crypto, Hardware crypto access driver,crypto)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(speak, speaker, PC speaker)dnl
+__devitem(speak, speaker, PC speaker,spkr)dnl
 _mkdev(speak, speaker, {-M speaker c major_speak_c 0 600-})dnl
 __devitem(lkm, lkm, Loadable kernel modules interface)dnl
 _cdev(lkm, lkm, {-major_lkm_c-}, 0, 640, _lkm)dnl
-__devitem(mmcl, mmclock, Memory mapped clock)dnl
 __devitem(tun, tun*, Network tunnel driver)dnl
-__devitem(rnd, *random, In-kernel random data source)dnl
+__devitem(rnd, *random, In-kernel random data source,random)dnl
 _mkdev(rnd, *random, {-n=0
 	for pre in " " s u p a
 	do
@@ -494,10 +490,10 @@
 	done-}, 644)dnl
 __devitem(joy, joy*, Joystick driver)dnl
 _mcdev(joy, joy*, joy, {-major_joy_c-}, 666)dnl
-__devitem(mag, magma*, Magma multiport cards)dnl
-__devitem(bppmag, bppmag[mno], Magma parallel port)dnl
+__devitem(mag, magma*, Magma multiport cards,magma)dnl
+__devitem(bppmag, bppmag[mno], Magma parallel port,magma)dnl
 __devitem(spif, spif*, quote(spif)multiport cards)dnl
-__devitem(bppsp, bpp[jkl], quote(spif)parallel port)dnl
+__devitem(bppsp, bpp[jkl], quote(spif)parallel port,spif)dnl
 _mkdev(mag, magma*, {-case $U in
 	0)	offset=0  nam=m;;
 	1)	offset=16 nam=n;;
@@ -531,10 +527,10 @@
 	M bpp${nam}0 c major_bppsp_c Add($offset, 0) 600-})dnl
 __devitem(bpp, bpp*, Parallel port)dnl
 _mkdev(bpp, {-bpp*-}, {-M bpp$U c major_bpp_c $U 600-}, 600)dnl
-__devitem(xfs, xfs*, XFS filesystem node)dnl
+__devitem(xfs, xfs*, XFS filesystem node, mount_xfs 8)dnl
 _mcdev(xfs, xfs*, xfs, {-major_xfs_c-}, 600)dnl
 __devitem(hil, hil, HP-HIL input devices)dnl
-__devitem(rmidi, rmidi*, Raw MIDI devices)dnl
+__devitem(rmidi, rmidi*, Raw MIDI devices,midi)dnl
 _mcdev(rmidi, rmidi*, rmidi, {-major_rmidi_c-}, 666)dnl
 __devtitle(plat, Platform-specific devices)dnl
 __devitem(bktr, bktr*, Video frame grabbers)dnl