summaryrefslogtreecommitdiff
path: root/etc/etc.amd64
diff options
context:
space:
mode:
authorMiod Vallat <miod@cvs.openbsd.org>2010-09-04 12:18:43 +0000
committerMiod Vallat <miod@cvs.openbsd.org>2010-09-04 12:18:43 +0000
commit5f86ebb1d8d1e131e074a173957575950b506808 (patch)
treed63d76d7dd095e01b5a01337df628fe3403c487b /etc/etc.amd64
parent0cb9417fa1bc83776b7674ec3503eb92a639e166 (diff)
Regen
Diffstat (limited to 'etc/etc.amd64')
-rw-r--r--etc/etc.amd64/MAKEDEV58
1 files changed, 29 insertions, 29 deletions
diff --git a/etc/etc.amd64/MAKEDEV b/etc/etc.amd64/MAKEDEV
index 33565f064ba..ba46637c7a8 100644
--- a/etc/etc.amd64/MAKEDEV
+++ b/etc/etc.amd64/MAKEDEV
@@ -49,8 +49,8 @@
# pty* Set of 62 master pseudo terminals
# tty* Set of 62 slave pseudo terminals
# Console ports:
-# wscons Minimal wscons devices
# ttyC-J* wscons display devices
+# wscons Minimal wscons devices
# wskbd* wscons keyboards
# wsmux wscons keyboard/mouse mux devices
# Pointing devices:
@@ -59,8 +59,8 @@
# lpa* Polled printer port
# lpt* IEEE 1284 centronics printer
# USB devices:
-# uall All USB devices
# ttyU* USB serial ports
+# uall All USB devices
# ugen* Generic USB devices
# uhid* Generic HID devices
# ulpt* Printer devices
@@ -76,6 +76,7 @@
# bpf* Berkeley Packet Filter
# bthub* Bluetooth Hubs
# crypto Hardware crypto access driver
+# diskmap Disk mapper
# drm* Direct Rendering Manager
# fd fd/* nodes
# gpio* General Purpose Input/Output
@@ -84,22 +85,21 @@
# iop* I2O controller devices
# lkm Loadable kernel modules interface
# music* MIDI sequencer
+# nnpfs* NNPFS filesystem node
# nvram NVRAM access
# pci* PCI bus 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
+# rmidi* Raw MIDI devices
# speaker PC speaker
# systrace* System call tracing device
# tun* Network tunnel driver
# tuner* Tuner devices
# uk* Unknown SCSI devices
# video* Video V4L2 devices
-# nnpfs* NNPFS filesystem node
# vscsi* Virtual SCSI controller
-# diskmap Disk mapper
PATH=/sbin:/usr/sbin:/bin:/usr/bin
T=$0
@@ -250,18 +250,10 @@ ttyc*)
M cuac$U c 38 $(($U+128)) 660 dialer uucp
;;
-diskmap)
- M diskmap c 90 0 640 operator
- ;;
-
vscsi*)
M vscsi$U c 89 $U 600
;;
-nnpfs*)
- M nnpfs$U c 51 $U 600
- ;;
-
video*)
M video$U c 44 $U
MKlist[${#MKlist[*]}]=";[ -e video ] || ln -s video$U video"
@@ -287,6 +279,10 @@ speaker)
M speaker c 27 0 600
;;
+rmidi*)
+ M rmidi$U c 52 $U 666
+ ;;
+
*random)
n=0
for pre in " " s u a
@@ -296,10 +292,6 @@ speaker)
done
;;
-rmidi*)
- M rmidi$U c 52 $U 666
- ;;
-
radio*)
M radio$U c 76 $U
MKlist[${#MKlist[*]}]=";[ -e radio ] || ln -s radio$U radio"
@@ -322,6 +314,10 @@ nvram)
M nvram c 85 0 440 kmem
;;
+nnpfs*)
+ M nnpfs$U c 51 $U 600
+ ;;
+
music*)
M music$U c 53 $U
M sequencer$U c 53 $(($U+128))
@@ -359,6 +355,10 @@ drm*)
M drm$U c 87 $U 660
;;
+diskmap)
+ M diskmap c 90 0 640 operator
+ ;;
+
crypto)
M crypto c 70 0
;;
@@ -429,6 +429,12 @@ ugen*)
done
;;
+uall)
+ R ttyU0 ttyU1 ttyU2 ttyU3 ugen0 ugen1 ulpt0 ulpt1 uhid0 uhid1
+ R uhid2 uhid3 uscanner0 urio0 usb0 usb1 usb2 usb3 usb4 usb5
+ R usb6 usb7
+ ;;
+
ttyU[0-9a-zA-Z])
U=${i#ttyU*}
o=$(alph2d $U)
@@ -436,12 +442,6 @@ ttyU[0-9a-zA-Z])
M cuaU$U c 66 $(($o+128)) 660 dialer uucp
;;
-uall)
- R ttyU0 ttyU1 ttyU2 ttyU3 ugen0 ugen1 ulpt0 ulpt1 uhid0 uhid1
- R uhid2 uhid3 uscanner0 urio0 usb0 usb1 usb2 usb3 usb4 usb5
- R usb6 usb7
- ;;
-
lpt*|lpa*)
case $i in
lpt*) n=lpt f=0;;
@@ -463,6 +463,12 @@ wskbd[0-9]*)
M wskbd$U c 67 $U 600
;;
+wscons)
+ R wsmouse0 wsmouse1 wsmouse2 wsmouse3 wskbd0 wskbd1 wskbd2
+ R wskbd3 wsmux ttyCcfg ttyC0 ttyC1 ttyC2 ttyC3 ttyC4 ttyC5
+ R ttyC6 ttyC7 ttyC8 ttyC9 ttyCa ttyCb
+ ;;
+
tty[C-J]*)
U=${i##tty[C-J]}
case $i in
@@ -482,12 +488,6 @@ tty[C-J]*)
esac
;;
-wscons)
- R wsmouse0 wsmouse1 wsmouse2 wsmouse3 wskbd0 wskbd1 wskbd2
- R wskbd3 wsmux ttyCcfg ttyC0 ttyC1 ttyC2 ttyC3 ttyC4 ttyC5
- R ttyC6 ttyC7 ttyC8 ttyC9 ttyCa ttyCb
- ;;
-
pty*)
if [ $U -gt 15 ]; then
echo bad unit for pty in: $i