more MAKEDEV cleanup

Previous Topic Next Topic
 
classic Classic list List threaded Threaded
1 message Options
Reply | Threaded
Open this post in threaded view
|

more MAKEDEV cleanup

Miod Vallat
The following diff attempts to clean up a few loose ends in the current
MAKEDEV files:

- remove no-longer applicable device definitions (MSCP and SMD disks,
  this kind of thing).
- makes sure all platforms use the same `ramdisk' target for
  installation media devices, rather than a mix of `ramd' and `ramdisk'.
- moves as many `ramdisk' devices to MI land (bio, diskmap, random,
  etc).
- reduces the number of block devices in `ramdisk' targets to only one
  per device, since the installer script will invoke MAKEDEV by itself
  for the devices it needs to use.
- sort device names in `all' and `ramdisk' MI lists to make maintainence
  easier. This causes some ordering change in the `all' target in the
  generated MAKEDEVs.

Index: MAKEDEV.common
===================================================================
RCS file: /OpenBSD/src/etc/MAKEDEV.common,v
retrieving revision 1.113
diff -u -p -r1.113 MAKEDEV.common
--- MAKEDEV.common 12 Feb 2021 10:26:33 -0000 1.113
+++ MAKEDEV.common 5 Apr 2021 09:18:49 -0000
@@ -114,7 +114,7 @@ dnl make a 'disktgt' macro that automati
 dnl disktgt(rd, {-rd-})
 dnl
 dnl target(all,rd,0)
-dnl target(ramd,rd,0)
+dnl target(ramdisk,rd,0)
 dnl disk_q(rd)
 dnl __devitem(rd, {-rd*-}, {-rd-})dnl
 dnl
@@ -122,62 +122,60 @@ dnl  Note: not all devices are generated
 dnl        its own extra list.
 dnl
 divert(1)dnl
+target(all, acpi)dnl
+target(all, apm)dnl
+target(all, bio)dnl
+target(all, bpf)dnl
+twrget(all, com, tty0, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, a, b)dnl
+twrget(all, czs, cua, a, b, c, d)dnl
+target(all, diskmap)dnl
+target(all, dt)dnl
 twrget(all, fdesc, fd)dnl
-target(all, st, 0, 1)dnl
-target(all, std)dnl
-target(all, ra, 0, 1, 2, 3)dnl
-target(all, rx, 0, 1)dnl
-target(all, wd, 0, 1, 2, 3)dnl
-target(all, xd, 0, 1, 2, 3)dnl
+target(all, fuse)dnl
+target(all, hotplug)dnl
+target(all, joy, 0, 1)dnl
+target(all, kcov)dnl
+target(all, kstat)dnl
+target(all, local)dnl
+target(all, lpt, 0, 1, 2)dnl
+twrget(all, lpt, lpa, 0, 1, 2)dnl
+target(all, par, 0)dnl
+target(all, pci, 0, 1, 2, 3)dnl
 target(all, pctr)dnl
 target(all, pctr0)dnl
 target(all, pf)dnl
-target(all, apm)dnl
-target(all, acpi)dnl
+target(all, pppac)dnl
+target(all, pppx)dnl
+target(all, ptm)dnl
+target(all, pty, 0)dnl
+target(all, pvbus, 0, 1)dnl
+target(all, radio, 0)dnl
+target(all, rmidi, 0, 1, 2, 3, 4, 5, 6, 7)dnl
+twrget(all, rnd, random)dnl
+twrget(all, speak, speaker)dnl
+target(all, st, 0, 1)dnl
+target(all, std)dnl
+target(all, switch, 0, 1, 2, 3)dnl
+target(all, tap, 0, 1, 2, 3)dnl
 twrget(all, tth, ttyh, 0, 1)dnl
 target(all, ttyA, 0, 1)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, 4, 5, 6, 7, 8, 9, a, b)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
-twrget(all, rnd, random)dnl
-target(all, uk, 0)dnl
-twrget(all, vi, video, 0, 1)dnl
-twrget(all, speak, speaker)dnl
-target(all, asc, 0)dnl
-target(all, radio, 0)dnl
+target(all, tun, 0, 1, 2, 3)dnl
 target(all, tuner, 0)dnl
-target(all, rmidi, 0, 1, 2, 3, 4, 5, 6, 7)dnl
+twrget(all, tzs, tty, a, b, c, d)dnl
 target(all, uall)dnl
-target(all, pci, 0, 1, 2, 3)dnl
-twrget(all, wsmouse, wscons)dnl
-target(all, par, 0)dnl
-target(all, apci, 0)dnl
-target(all, local)dnl
-target(all, ptm)dnl
-target(all, hotplug)dnl
-target(all, pppx)dnl
-target(all, pppac)dnl
-target(all, fuse)dnl
+target(all, uk, 0)dnl
+twrget(all, vi, video, 0, 1)dnl
 target(all, vmm)dnl
-target(all, pvbus, 0, 1)dnl
-target(all, bpf)dnl
-target(all, kcov)dnl
-target(all, dt)dnl
-target(all, kstat)dnl
+target(all, vnd, 0, 1, 2, 3)dnl
+target(all, vscsi, 0)dnl
+target(all, wd, 0, 1, 2, 3)dnl
+twrget(all, wsmouse, wscons)dnl
 dnl
 _mkdev(all, {-all-}, {-dnl
 show_target(all)dnl
 -})dnl
 dnl
-dnl XXX some arches use ramd, others ramdisk - needs to be fixed eventually
-__devitem(ramdisk, ramdisk, Ramdisk kernel devices,nothing)dnl
-dnl
 target(usb, usb, 0, 1, 2, 3, 4, 5, 6, 7)dnl
 target(usb, uhid, 0, 1, 2, 3, 4, 5, 6, 7)dnl
 twrget(usb, fido, fido)dnl
@@ -208,26 +206,26 @@ __devitem(ch, {-ch*-}, SCSI media change
 _mcdev(ch, ch*, ch, {-major_ch_c-}, 660, operator)dnl
 __devitem(uk, uk*, Unknown SCSI devices)dnl
 _mcdev(uk, uk*, uk, {-major_uk_c-}, 640, operator)dnl
-dnl XXX see ramdisk above
-__devitem(ramd, ramdisk, Ramdisk kernel devices,nothing)dnl
 dnl
-_mkdev(ramd, ramdisk, {-dnl
-show_target(ramd)dnl
+__devitem(ramdisk, ramdisk, Ramdisk kernel devices,nothing)dnl
+_mkdev(ramdisk, ramdisk, {-dnl
+show_target(ramdisk)dnl
 -})dnl
 dnl
-target(ramd, std)dnl
-target(ramd, bpf)dnl
-twrget(ramd, com, tty0, 0, 1)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
-target(ramd, rd, 0)dnl
+target(ramdisk, bio)dnl
+target(ramdisk, bpf)dnl
+target(ramdisk, cd, 0)dnl
+twrget(ramdisk, com, tty0, 0, 1)dnl
+target(ramdisk, diskmap)dnl
+twrget(ramdisk, rnd, random)dnl
+target(ramdisk, rd, 0)dnl
+target(ramdisk, sd, 0)dnl
+target(ramdisk, st, 0)dnl
+target(ramdisk, std)dnl
+target(ramdisk, wd, 0)dnl
 dnl
 __devitem(rd, {-rd*-}, quote(rd)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")-},fd)dnl
 _mkdev(flo, fd*,
 {-typnam=$U${i#fd[01]*}
@@ -260,18 +258,10 @@ _mkdev(flo, fd*,
 __devitem(wd, {-wd*-}, {-quote(winchester)disk drives (ST506{-,-} IDE{-,-} ESDI{-,-} RLL{-,-} ...)-})dnl
 __devitem(vnd, vnd*, quote(file)pseudo-disk devices)dnl
 _mkdev(vnd, vnd*, {-dodisk vnd $U major_vnd_b major_vnd_c $U 0{--}ifstep(vnd)-})dnl
-__devitem(ra, ra*, {-MSCP disks-})dnl
-__devitem(rx, rx*, {-RX02 floppy disks-})dnl
-dnl
 dnl For normal disk devices, add a disk_q entry; anything else define like
 dnl the rest (such as vnd above).
 dnl
-disk_q({-hd-})dnl
-disk_q({-ra-})dnl
-disk_q({-rx-})dnl
 disk_q({-sd-})dnl
-disk_q({-xy-})dnl
-disk_q({-xd-})dnl
 disk_q({-wd-})dnl
 _mkdev({-disks-}, {-undefine({-C_ase-})show_disks()undefine({-C_ase-})-},
 {-case $i in
@@ -396,9 +386,6 @@ _mkdev(ugen, ugen*, {-n=Mult($U, 16)
  done-})dnl
 __devtitle(call, Call units)dnl
 __devtitle(term, Terminal ports)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-}, {-tty[0-7][0-9a-f]-}, NS16x50 serial ports)dnl
 _mkdev(com, {-tty[0-7][0-9a-f]-}, {-U=${i#tty*}
  o=$(h2d $U)
@@ -430,7 +417,6 @@ _mkdev(czs, cua[a-z], {-u=${i#cua*}
  esac
  M cua$u c major_czs_c Add($n, 128) 660 dialer root-})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 serial ports,zs)dnl
@@ -446,8 +432,6 @@ _mkdev(au, audio*, {-M audio$U c major_a
 __devitem(vi, video*, Video V4L2 devices,video)dnl
 _mkdev(vi, video*, {-M video$U  c major_vi_c $U 600
  MKlist[${#MKlist[*]}]=";[ -e video ] || ln -s video$U video"-})dnl
-__devitem(asc, asc*, ASC Audio device)dnl
-_mkdev(asc, asc*, {-M asc$U major_asc_c 0-})dnl
 __devitem(bio, bio, {-ioctl tunnel pseudo-device-})dnl
 _mkdev(bio, bio, {-M bio c major_bio_c 0 600-})dnl
 __devitem(radio, radio*, FM tuner devices)dnl
Index: etc.alpha/MAKEDEV.md
===================================================================
RCS file: /OpenBSD/src/etc/etc.alpha/MAKEDEV.md,v
retrieving revision 1.77
diff -u -p -r1.77 MAKEDEV.md
--- etc.alpha/MAKEDEV.md 23 Jan 2021 05:08:33 -0000 1.77
+++ etc.alpha/MAKEDEV.md 5 Apr 2021 09:18:49 -0000
@@ -88,11 +88,6 @@ _DEV(kstat, 51)
 dnl
 divert(__mddivert)dnl
 dnl
-ramdisk)
- _recurse std fd0 wd0 wd1 wd2 sd0 sd1 sd2 bpf
- _recurse st0 cd0 ttyC0 rd0 bio diskmap random
- ;;
-
 _std(1, 2, 39, 6)
  M xf86 c 2 4 600
  ;;
@@ -110,19 +105,13 @@ dnl
 dnl *** alpha specific targets
 dnl
 twrget(all, au, audio, 0, 1, 2, 3)dnl
-target(all, bio)dnl
 target(all, ch, 0)dnl
-target(all, vscsi, 0)dnl
-target(all, diskmap)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
-target(all, pty, 0)dnl
-target(all, tun, 0, 1, 2, 3)dnl
-target(all, tap, 0, 1, 2, 3)dnl
 target(all, ttyB, 0, 1)dnl
 target(all, rd, 0)dnl
 target(all, cd, 0, 1)dnl
 target(all, sd, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9)dnl
-target(all, vnd, 0, 1, 2, 3)dnl
-target(all, switch, 0, 1, 2, 3)dnl
-target(ramd, ttyB, 0, 1)dnl
+target(ramdisk, ttyB, 0, 1)dnl
+twrget(ramdisk, wsdisp, ttyC, 0)dnl
+target(ramdisk, wskbd, 0, 1, 2)dnl
Index: etc.amd64/MAKEDEV.md
===================================================================
RCS file: /OpenBSD/src/etc/etc.amd64/MAKEDEV.md,v
retrieving revision 1.78
diff -u -p -r1.78 MAKEDEV.md
--- etc.amd64/MAKEDEV.md 12 Feb 2021 10:26:33 -0000 1.78
+++ etc.amd64/MAKEDEV.md 5 Apr 2021 09:18:49 -0000
@@ -103,11 +103,6 @@ _DEV(kstat, 51)
 dnl
 divert(__mddivert)dnl
 dnl
-ramdisk)
- _recurse std bpf fd0 wd0 sd0 tty00 tty01 rd0 bio diskmap
- _recurse st0 cd0 ttyC0 wskbd0 wskbd1 wskbd2 random
- ;;
-
 _std(1, 2, 50, 7)
  M xf86 c 2 4 600
  ;;
@@ -142,5 +137,6 @@ target(all, drm, 0, 1, 2, 3)dnl
 target(all, ttyVI, 00, 10, 20, 30, 40)dnl
 target(all, ipmi, 0)dnl
 target(all, switch, 0, 1, 2, 3)dnl
-twrget(ramd, wsdisp, ttyC, 0)dnl
-target(ramd, fd, 0)dnl
+target(ramdisk, fd, 0)dnl
+twrget(ramdisk, wsdisp, ttyC, 0)dnl
+target(ramdisk, wskbd, 0, 1, 2)dnl
Index: etc.arm64/MAKEDEV.md
===================================================================
RCS file: /OpenBSD/src/etc/etc.arm64/MAKEDEV.md,v
retrieving revision 1.12
diff -u -p -r1.12 MAKEDEV.md
--- etc.arm64/MAKEDEV.md 12 Feb 2021 10:26:34 -0000 1.12
+++ etc.arm64/MAKEDEV.md 5 Apr 2021 09:18:49 -0000
@@ -89,11 +89,6 @@ _DEV(kstat, 51)
 dnl
 divert(__mddivert)dnl
 dnl
-ramdisk)
- _recurse std bpf wd0 sd0 tty00 tty01 rd0 bio diskmap
- _recurse cd0 ttyC0 wskbd0 wskbd1 wskbd2 random
- ;;
-
 _std(1, 2, 50, 7)
  M openprom c 70 0 600
  ;;
@@ -120,4 +115,5 @@ target(all, dri)dnl
 target(all, drm, 0, 1, 2, 3)dnl
 target(all, ipmi, 0)dnl
 target(all, switch, 0, 1, 2, 3)dnl
-twrget(ramd, wsdisp, ttyC, 0)dnl
+twrget(ramdisk, wsdisp, ttyC, 0)dnl
+target(ramdisk, wskbd, 0, 1, 2)dnl
Index: etc.armv7/MAKEDEV.md
===================================================================
RCS file: /OpenBSD/src/etc/etc.armv7/MAKEDEV.md,v
retrieving revision 1.19
diff -u -p -r1.19 MAKEDEV.md
--- etc.armv7/MAKEDEV.md 23 Jan 2021 05:08:33 -0000 1.19
+++ etc.armv7/MAKEDEV.md 5 Apr 2021 09:18:49 -0000
@@ -94,11 +94,6 @@ _DEV(kstat, 51)
 dnl
 divert(__mddivert)dnl
 dnl
-ramdisk)
- _recurse std bpf wd0 wd1 sd0 tty00 rd0 wsmouse
- _recurse st0 ttyC0 wskbd0 apm bio diskmap random
- ;;
-
 _std(1, 2, 8, 6)
  M openprom c 82 0 600
  ;;
@@ -121,3 +116,5 @@ target(all, sd, 0, 1, 2, 3, 4, 5, 6, 7,
 target(all, vnd, 0, 1, 2, 3)dnl
 target(all, switch, 0, 1, 2, 3)dnl
 target(all, gpio, 0, 1, 2, 3, 4, 5, 6, 7, 8)dnl
+target(ramdisk, wskbd, 0)dnl
+twrget(ramdisk, wsdisp, ttyC, 0)dnl
Index: etc.hppa/MAKEDEV.md
===================================================================
RCS file: /OpenBSD/src/etc/etc.hppa/MAKEDEV.md,v
retrieving revision 1.67
diff -u -p -r1.67 MAKEDEV.md
--- etc.hppa/MAKEDEV.md 2 Apr 2021 02:29:54 -0000 1.67
+++ etc.hppa/MAKEDEV.md 5 Apr 2021 09:18:49 -0000
@@ -83,11 +83,6 @@ _DEV(kstat, 51)
 dnl
 divert(__mddivert)dnl
 dnl
-ramdisk)
- _recurse std fd st0 st1 sd0 sd1 sd2 sd3 rd0 random
- _recurse bpf bio diskmap
- ;;
-
 _std(1, 2, 25, 6)
  M pdc c 22 0 640 operator
  ;;
Index: etc.i386/MAKEDEV.md
===================================================================
RCS file: /OpenBSD/src/etc/etc.i386/MAKEDEV.md,v
retrieving revision 1.93
diff -u -p -r1.93 MAKEDEV.md
--- etc.i386/MAKEDEV.md 12 Feb 2021 10:26:34 -0000 1.93
+++ etc.i386/MAKEDEV.md 5 Apr 2021 09:18:49 -0000
@@ -104,11 +104,6 @@ _DEV(kstat, 51)
 dnl
 divert(__mddivert)dnl
 dnl
-ramdisk)
- _recurse std bpf fd0 wd0 sd0 tty00 tty01 rd0 bio diskmap
- _recurse st0 cd0 ttyC0 wskbd0 wskbd1 wskbd2 apm random
- ;;
-
 _std(1, 2, 50, 7)
  M xf86 c 2 4 600
  ;;
@@ -143,4 +138,7 @@ target(all, drm, 0, 1, 2, 3)dnl
 target(all, amdmsr)dnl
 target(all, ipmi, 0)dnl
 target(all, switch, 0, 1, 2, 3)dnl
-twrget(ramd, wsdisp, ttyC, 0)dnl
+target(ramdisk, apm)dnl
+target(ramdisk, fd, 0)dnl
+twrget(ramdisk, wsdisp, ttyC, 0)dnl
+target(ramdisk, wskbd, 0, 1, 2)dnl
Index: etc.landisk/MAKEDEV.md
===================================================================
RCS file: /OpenBSD/src/etc/etc.landisk/MAKEDEV.md,v
retrieving revision 1.49
diff -u -p -r1.49 MAKEDEV.md
--- etc.landisk/MAKEDEV.md 23 Jan 2021 05:08:33 -0000 1.49
+++ etc.landisk/MAKEDEV.md 5 Apr 2021 09:18:49 -0000
@@ -97,11 +97,6 @@ _DEV(kstat, 51)
 dnl
 divert(__mddivert)dnl
 dnl
-ramdisk)
- _recurse std bpf wd0 wd1 sd0 rd0 wsmouse
- _recurse st0 ttyC0 wskbd0 bio diskmap random
- ;;
-
 _std(1, 2, 8, 6)
  ;;
 dnl
@@ -124,3 +119,5 @@ target(all, cd, 0, 1)dnl
 target(all, sd, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9)dnl
 target(all, switch, 0, 1, 2, 3)dnl
 target(all, vnd, 0, 1, 2, 3)dnl
+twrget(ramdisk, wsdisp, ttyC, 0)dnl
+target(ramdisk, wskbd, 0)dnl
Index: etc.loongson/MAKEDEV.md
===================================================================
RCS file: /OpenBSD/src/etc/etc.loongson/MAKEDEV.md,v
retrieving revision 1.35
diff -u -p -r1.35 MAKEDEV.md
--- etc.loongson/MAKEDEV.md 2 Apr 2021 02:29:56 -0000 1.35
+++ etc.loongson/MAKEDEV.md 5 Apr 2021 09:18:49 -0000
@@ -29,7 +29,7 @@ dnl
 __devitem(apm, apm, Power management device)dnl
 _TITLE(make)
 _DEV(all)
-_DEV(ramd)
+_DEV(ramdisk)
 _DEV(std)
 _DEV(local)
 _TITLE(dis)
@@ -113,7 +113,4 @@ target(all, vnd, 0, 1, 2, 3)dnl
 target(all, switch, 0, 1, 2, 3)dnl
 target(all, dri)dnl
 target(all, drm, 0, 1, 2, 3)dnl
-target(ramd, bio)dnl
-target(ramd, diskmap)dnl
-target(ramd, random)dnl
-target(ramd, wskbd, 0, 1, 2)dnl
+target(ramdisk, wskbd, 0, 1, 2)dnl
Index: etc.luna88k/MAKEDEV.md
===================================================================
RCS file: /OpenBSD/src/etc/etc.luna88k/MAKEDEV.md,v
retrieving revision 1.36
diff -u -p -r1.36 MAKEDEV.md
--- etc.luna88k/MAKEDEV.md 2 Apr 2021 02:29:56 -0000 1.36
+++ etc.luna88k/MAKEDEV.md 5 Apr 2021 09:18:49 -0000
@@ -64,11 +64,8 @@ _DEV(all)
 dnl
 dnl ramdisk)
 dnl
-twrget(ramd, sio, tty, a)dnl
-target(ramd, bio)dnl
-target(ramd, diskmap)dnl
-target(ramd, random)dnl
-_DEV(ramd)
+twrget(ramdisk, sio, tty, a)dnl
+_DEV(ramdisk)
 dnl
 _DEV(std)
 _DEV(local)
@@ -122,4 +119,3 @@ divert(__mddivert)dnl
 dnl
 _std(1, 2, 43, 6)
  ;;
-
Index: etc.macppc/MAKEDEV.md
===================================================================
RCS file: /OpenBSD/src/etc/etc.macppc/MAKEDEV.md,v
retrieving revision 1.78
diff -u -p -r1.78 MAKEDEV.md
--- etc.macppc/MAKEDEV.md 2 Apr 2021 02:29:56 -0000 1.78
+++ etc.macppc/MAKEDEV.md 5 Apr 2021 09:18:49 -0000
@@ -37,7 +37,7 @@ _mkdev(s64_czs, cua[a-z], {-u=${i#cua*}
 __devitem(apm, apm, Power management device)dnl
 _TITLE(make)
 _DEV(all)
-_DEV(ramd)
+_DEV(ramdisk)
 _DEV(std)
 _DEV(local)
 _TITLE(dis)
@@ -134,8 +134,5 @@ target(all, bio)dnl
 target(all, dri)dnl
 target(all, drm, 0, 1, 2, 3)dnl
 target(all, switch, 0, 1, 2, 3)dnl
-target(ramd, ttya, 0, 1)dnl
-target(ramd, ttyb, 0, 1)dnl
-target(ramd, bio)dnl
-target(ramd, diskmap)dnl
-target(ramd, random)dnl
+target(ramdisk, ttya, 0, 1)dnl
+target(ramdisk, ttyb, 0, 1)dnl
Index: etc.octeon/MAKEDEV.md
===================================================================
RCS file: /OpenBSD/src/etc/etc.octeon/MAKEDEV.md,v
retrieving revision 1.21
diff -u -p -r1.21 MAKEDEV.md
--- etc.octeon/MAKEDEV.md 2 Apr 2021 02:29:56 -0000 1.21
+++ etc.octeon/MAKEDEV.md 5 Apr 2021 09:18:49 -0000
@@ -35,7 +35,7 @@ dnl *** MAKEDEV itself
 dnl
 _TITLE(make)
 _DEV(all)
-_DEV(ramd)
+_DEV(ramdisk)
 _DEV(std)
 _DEV(local)
 _TITLE(dis)
@@ -116,7 +116,4 @@ target(all, sd, 0, 1, 2, 3, 4, 5, 6, 7,
 target(all, vnd, 0, 1, 2, 3)dnl
 target(all, octcf, 0)dnl
 target(all, switch, 0, 1, 2, 3)dnl
-target(ramd, bio)dnl
-target(ramd, diskmap)dnl
-target(ramd, random)dnl
-target(ramd, octcf, 0)dnl
+target(ramdisk, octcf, 0)dnl
Index: etc.powerpc64/MAKEDEV.md
===================================================================
RCS file: /OpenBSD/src/etc/etc.powerpc64/MAKEDEV.md,v
retrieving revision 1.8
diff -u -p -r1.8 MAKEDEV.md
--- etc.powerpc64/MAKEDEV.md 12 Feb 2021 10:26:34 -0000 1.8
+++ etc.powerpc64/MAKEDEV.md 5 Apr 2021 09:18:49 -0000
@@ -88,10 +88,6 @@ boot)
  _recurse ramdisk sd1 sd2 sd3 sd4 sd5 sd6 sd7 sd8 sd9
  M kexec c 16 0 600
  ;;
-ramdisk)
- _recurse std bpf sd0 tty00 tty01 rd0 bio diskmap
- _recurse cd0 ttyC0 wskbd0 wskbd1 wskbd2 random
- ;;
 
 _std(1, 2, 3, 4)
  M openprom c 92 0 600
@@ -115,4 +111,5 @@ target(all, tap, 0, 1, 2, 3)dnl
 target(all, tun, 0, 1, 2, 3)dnl
 target(all, vnd, 0, 1, 2, 3)dnl
 target(all, vscsi, 0)dnl
-twrget(ramd, wsdisp, ttyC, 0)dnl
+twrget(ramdisk, wsdisp, ttyC, 0)dnl
+target(ramdisk, wskbd, 0, 1, 2)dnl
Index: etc.sgi/MAKEDEV.md
===================================================================
RCS file: /OpenBSD/src/etc/etc.sgi/MAKEDEV.md,v
retrieving revision 1.56
diff -u -p -r1.56 MAKEDEV.md
--- etc.sgi/MAKEDEV.md 2 Apr 2021 02:29:56 -0000 1.56
+++ etc.sgi/MAKEDEV.md 5 Apr 2021 09:18:49 -0000
@@ -37,7 +37,7 @@ _mkdev(zs, {-tty[a-b]-}, {-u=${i#tty*}
  M cua$u c major_zs_c Add($n, 128) 660 dialer root-})dnl
 _TITLE(make)
 _DEV(all)
-_DEV(ramd)
+_DEV(ramdisk)
 _DEV(std)
 _DEV(local)
 _TITLE(dis)
@@ -118,6 +118,3 @@ twrget(all, zs, tty, a, b)dnl
 twrget(wscons, wscons, ttyD, cfg, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, a, b)dnl
 twrget(wscons, wscons, ttyE, cfg, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, a, b)dnl
 twrget(wscons, wscons, ttyF, cfg, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, a, b)dnl
-target(ramd, bio)dnl
-target(ramd, diskmap)dnl
-target(ramd, random)dnl
Index: etc.sparc64/MAKEDEV.md
===================================================================
RCS file: /OpenBSD/src/etc/etc.sparc64/MAKEDEV.md,v
retrieving revision 1.97
diff -u -p -r1.97 MAKEDEV.md
--- etc.sparc64/MAKEDEV.md 12 Feb 2021 10:26:34 -0000 1.97
+++ etc.sparc64/MAKEDEV.md 5 Apr 2021 09:18:49 -0000
@@ -140,11 +140,6 @@ _DEV(kstat, 51)
 dnl
 divert(__mddivert)dnl
 dnl
-ramdisk)
- _recurse std fd0 wd0 wd1 wd2 sd0 sd1 sd2 rd0
- _recurse st0 cd0 bpf bio diskmap random
- ;;
-
 _std(2, 3, 76, 16)
  M openprom c 70 0 600
  M mdesc c 70 1 640 kmem