Skip to content

Commit 2db64fd

Browse files
natanonatano
committed
Remove floppy support from MAKEDEV.
1 parent 012bdaa commit 2db64fd

File tree

5 files changed

+15
-86
lines changed

5 files changed

+15
-86
lines changed

‎etc/MAKEDEV.common‎

Lines changed: 0 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -229,35 +229,6 @@ __devitem(tmpfsrd, {-tmpfsrd*-}, quote(tmpfsrd)pseudo-disks)dnl
229229
_mkdev(tmpfsrd, tmpfsrd*, {-dodisk2 tmpfsrd $U major_tmpfsrd_b major_tmpfsrd_c $U 0{--}ifstep(tmpfsrd)-})dnl
230230
__devitem(xd, xd*, Xylogic 753/7053 disks)dnl
231231
__devitem(xy, xy*, {- Xylogic 450/451 disks-})dnl
232-
__devitem(flo, {-fd*-}, {-Floppy disk drives (3 1/2"{-,-} 5 1/4")-},fd)dnl
233-
_mkdev(flo, fd*,
234-
{-typnam=$U${i#fd[01]*}
235-
case $typnam in
236-
0|1) typnum=0;; # no type specified, assume A
237-
*A) typnum=0; typnam=0;;
238-
*B) typnum=1;;
239-
*C) typnum=2;;
240-
*D) typnum=3;;
241-
*E) typnum=4;;
242-
*F) typnum=5;;
243-
*G) typnum=6;;
244-
*H) typnum=7;;
245-
*) echo bad type $typnam for $i; exit 1;;
246-
esac
247-
case $U in
248-
0|1) blk=major_flo_b; chr=major_flo_c;;
249-
*) echo bad unit $U for $i; exit 1;;
250-
esac
251-
nam=fd${typnam}
252-
n=Add(Mult($U, 128), Mult($typnum, 16))
253-
M ${nam}a b $blk $n 640 operator
254-
M ${nam}b b $blk Add($n, 1) 640 operator
255-
M ${nam}c b $blk Add($n, 2) 640 operator
256-
M ${nam}i b $blk Add($n, 8) 640 operator
257-
M r${nam}a c $chr $n 640 operator
258-
M r${nam}b c $chr Add($n, 1) 640 operator
259-
M r${nam}c c $chr Add($n, 2) 640 operator
260-
M r${nam}i c $chr Add($n, 8) 640 operator-}, 664)dnl
261232
__devitem(wd, {-wd*-}, {-quote(winchester)disk drives (ST506{-,-} IDE{-,-} ESDI{-,-} RLL{-,-} ...)-})dnl
262233
__devitem(vnd, vnd*, quote(file)pseudo-disk devices)dnl
263234
_mkdev(vnd, vnd*, {-dodisk vnd $U major_vnd_b major_vnd_c $U 0{--}ifstep(vnd)-})dnl

‎etc/etc.amd64/MAKEDEV‎

Lines changed: 11 additions & 44 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
# generated from:
55
#
66
# OpenBSD: etc.amd64/MAKEDEV.md,v 1.56 2014/07/11 22:04:09 tedu Exp
7-
# OpenBSD: MAKEDEV.common,v 1.74 2014/07/11 21:58:32 tedu Exp
7+
# OpenBSD: MAKEDEV.common,v 1.75 2014/07/15 17:36:13 miod Exp
88
# OpenBSD: MAKEDEV.mi,v 1.81 2012/11/05 08:07:09 jasper Exp
99
# OpenBSD: MAKEDEV.sub,v 1.14 2005/02/07 06:14:18 david Exp
1010
#
@@ -31,7 +31,6 @@
3131
# local Configuration specific devices
3232
# Disks:
3333
# cd* ATAPI and SCSI CD-ROM drives
34-
# fd* Floppy disk drives (3 1/2", 5 1/4")
3534
# sd* SCSI disks, including flopticals
3635
# tmpfsrd* "tmpfsrd" pseudo-disks
3736
# vnd* "file" pseudo-disk devices
@@ -220,7 +219,7 @@ U=`unt $i`
220219

221220
case $i in
222221
ramdisk)
223-
R std bpf0 fd0 wd0 sd0 tty00 tty01 tmpfsrd0 bio diskmap
222+
R std bpf0 wd0 sd0 tty00 tty01 tmpfsrd0 bio diskmap
224223
R st0 cd0 ttyC0 wskbd0 wskbd1 wskbd2 random
225224
;;
226225

@@ -517,36 +516,6 @@ tmpfsrd*)
517516
dodisk2 tmpfsrd $U 19 48 $U 0
518517
;;
519518

520-
fd*)
521-
typnam=$U${i#fd[01]*}
522-
case $typnam in
523-
0|1) typnum=0;; # no type specified, assume A
524-
*A) typnum=0; typnam=0;;
525-
*B) typnum=1;;
526-
*C) typnum=2;;
527-
*D) typnum=3;;
528-
*E) typnum=4;;
529-
*F) typnum=5;;
530-
*G) typnum=6;;
531-
*H) typnum=7;;
532-
*) echo bad type $typnam for $i; exit 1;;
533-
esac
534-
case $U in
535-
0|1) blk=2; chr=9;;
536-
*) echo bad unit $U for $i; exit 1;;
537-
esac
538-
nam=fd${typnam}
539-
n=$(($(($U*128))+$(($typnum*16))))
540-
M ${nam}a b $blk $n 640 operator
541-
M ${nam}b b $blk $(($n+1)) 640 operator
542-
M ${nam}c b $blk $(($n+2)) 640 operator
543-
M ${nam}i b $blk $(($n+8)) 640 operator
544-
M r${nam}a c $chr $n 640 operator
545-
M r${nam}b c $chr $(($n+1)) 640 operator
546-
M r${nam}c c $chr $(($n+2)) 640 operator
547-
M r${nam}i c $chr $(($n+8)) 640 operator
548-
;;
549-
550519
cd*)
551520
dodisk2 cd $U 6 15 $U 0
552521
;;
@@ -558,17 +527,15 @@ local)
558527
all)
559528
R drm0 drm1 drm2 drm3 nvram gpio0 gpio1 gpio2 bktr0 vnd0 vnd1
560529
R vnd2 vnd3 sd0 sd1 sd2 sd3 sd4 sd5 sd6 sd7 sd8 sd9 cd0 cd1
561-
R tmpfsrd0 tun0 tun1 tun2 tun3 bpf0 bpf1 bpf2 bpf3 bpf4
562-
R bpf5 bpf6 bpf7 bpf8 bpf9 bio pty0 fd1 fd1B fd1C fd1D fd1E
563-
R fd1F fd1G fd1H fd0 fd0B fd0C fd0D fd0E fd0F fd0G fd0H
564-
R diskmap vscsi0 ch0 audio0 audio1 audio2 fuse pppx hotplug
565-
R ptm gpr0 local wscons pci0 pci1 pci2 pci3 uall rmidi0 rmidi1
566-
R rmidi2 rmidi3 rmidi4 rmidi5 rmidi6 rmidi7 tuner0 radio0
567-
R speaker video0 video1 uk0 random lpa0 lpa1 lpa2 lpt0 lpt1
568-
R lpt2 lkm tty00 tty01 tty02 tty03 tty04 tty05 tty06 tty07
569-
R tty08 tty09 tty0a tty0b ttyc0 ttyc1 ttyc2 ttyc3 ttyc4 ttyc5
570-
R ttyc6 ttyc7 apm crypto pf pctr systrace wd0 wd1 wd2 wd3 std
571-
R st0 st1 fd
530+
R tmpfsrd0 tun0 tun1 tun2 tun3 bpf0 bpf1 bpf2 bpf3 bpf4 bpf5
531+
R bpf6 bpf7 bpf8 bpf9 bio pty0 diskmap vscsi0 ch0 audio0
532+
R audio1 audio2 fuse pppx hotplug ptm gpr0 local wscons pci0
533+
R pci1 pci2 pci3 uall rmidi0 rmidi1 rmidi2 rmidi3 rmidi4
534+
R rmidi5 rmidi6 rmidi7 tuner0 radio0 speaker video0 video1 uk0
535+
R random lpa0 lpa1 lpa2 lpt0 lpt1 lpt2 lkm tty00 tty01 tty02
536+
R tty03 tty04 tty05 tty06 tty07 tty08 tty09 tty0a tty0b ttyc0
537+
R ttyc1 ttyc2 ttyc3 ttyc4 ttyc5 ttyc6 ttyc7 apm crypto pf pctr
538+
R systrace wd0 wd1 wd2 wd3 std st0 st1 fd
572539
;;
573540

574541
wd*|sd*)

‎etc/etc.amd64/MAKEDEV.md‎

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,6 @@ _DEV(std)
2828
_DEV(local)
2929
_TITLE(dis)
3030
_DEV(cd, 15, 6)
31-
_DEV(flo, 9, 2)
3231
_DEV(sd, 13, 4)
3332
_DEV(tmpfsrd, 48, 19)
3433
_DEV(vnd, 41, 14)
@@ -96,7 +95,7 @@ dnl
9695
divert(__mddivert)dnl
9796
dnl
9897
ramdisk)
99-
_recurse std bpf0 fd0 wd0 sd0 tty00 tty01 tmpfsrd0 bio diskmap
98+
_recurse std bpf0 wd0 sd0 tty00 tty01 tmpfsrd0 bio diskmap
10099
_recurse st0 cd0 ttyC0 wskbd0 wskbd1 wskbd2 random
101100
;;
102101

@@ -115,8 +114,6 @@ twrget(all, au, audio, 0, 1, 2)dnl
115114
target(all, ch, 0)dnl
116115
target(all, vscsi, 0)dnl
117116
target(all, diskmap)dnl
118-
twrget(all, flo, fd, 0, 0B, 0C, 0D, 0E, 0F, 0G, 0H)dnl
119-
twrget(all, flo, fd, 1, 1B, 1C, 1D, 1E, 1F, 1G, 1H)dnl
120117
target(all, pty, 0)dnl
121118
target(all, bio)dnl
122119
target(all, bpf, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9)dnl
@@ -131,4 +128,3 @@ target(all, gpio, 0, 1, 2)dnl
131128
target(all, nvram)dnl
132129
target(all, drm, 0, 1, 2, 3)dnl
133130
twrget(ramd, wsdisp, ttyC, 0)dnl
134-
target(ramd, fd, 0)dnl

‎etc/etc.armv7/MAKEDEV.md‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -104,8 +104,6 @@ dnl
104104
target(all, ch, 0)dnl
105105
target(all, vscsi, 0)dnl
106106
target(all, diskmap)dnl
107-
twrget(all, flo, fd, 0, 0B, 0C, 0D, 0E, 0F, 0G, 0H)dnl
108-
twrget(all, flo, fd, 1, 1B, 1C, 1D, 1E, 1F, 1G, 1H)dnl
109107
target(all, pty, 0)dnl
110108
target(all, bpf, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9)dnl
111109
target(all, bio)dnl

‎share/man/man8/man8.amd64/MAKEDEV.8‎

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@
33
.\" THIS FILE AUTOMATICALLY GENERATED. DO NOT EDIT.
44
.\" generated from:
55
.\"
6-
.\" OpenBSD: etc.amd64/MAKEDEV.md,v 1.55 2014/03/14 23:47:04 kettenis Exp
7-
.\" OpenBSD: MAKEDEV.common,v 1.74 2014/07/11 21:58:32 tedu Exp
6+
.\" OpenBSD: etc.amd64/MAKEDEV.md,v 1.56 2014/07/11 22:04:09 tedu Exp
7+
.\" OpenBSD: MAKEDEV.common,v 1.75 2014/07/15 17:36:13 miod Exp
88
.\" OpenBSD: MAKEDEV.man,v 1.7 2009/03/18 17:34:25 sobrado Exp
99
.\" OpenBSD: MAKEDEV.mansub,v 1.2 2004/02/20 19:13:01 miod Exp
1010
.\"
@@ -23,7 +23,7 @@
2323
.\" ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
2424
.\" OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
2525
.\"
26-
.Dd $Mdocdate: July 11 2014 $
26+
.Dd $Mdocdate: March 18 2009 $
2727
.Dt MAKEDEV 8 amd64
2828
.Os
2929
.Sh NAME
@@ -77,9 +77,6 @@ Creates configuration-specific devices, by invoking the shell file
7777
.It Ar cd*
7878
ATAPI and SCSI CD-ROM drives, see
7979
.Xr cd 4 .
80-
.It Ar fd*
81-
Floppy disk drives (3 1/2", 5 1/4"), see
82-
.Xr fd 4 .
8380
.It Ar sd*
8481
SCSI disks, including flopticals, see
8582
.Xr sd 4 .

0 commit comments

Comments
 (0)