Bring in IDE ATAPI floppy support.

This is Junichi's v1.0 driver.

NOTE: Major device numbers have been changed to avoid conflict with other
      FreeBSD 3.0 devices.  The new numbers should be considered "official."
      This driver is still considered "beta" quality, although we have been
      playing with it.  Please submit bugs to junichi and myself.

Submitted by:	junichi@astec.co.jp

4 files changed, 70 insertions, 14 deletions

diff --git a/etc/MAKEDEV b/etc/MAKEDEV
index 03b5ae4..0f65cb6 100644
--- a/etc/MAKEDEV
+++ b/etc/MAKEDEV
@@ -37,6 +37,7 @@
 #
 # Disks:
 #	wd*	"Winchester" disk drives (ST506,IDE,ESDI,RLL,...)
+#	wfd*	"IDE floppy" disk drives (LS-120)
 #	fd*	"floppy" disk drives (3 1/2", 5 1/4")
 #	sd*	"SCSI disks"
 #	cd*	"SCSI CD-ROM disks"
@@ -106,7 +107,7 @@
 #	perfmon	CPU performance-monitoring counters
 #	pci	PCI configuration-space access from user mode
 #
-#	$Id: MAKEDEV,v 1.148 1998/01/03 11:53:52 jkh Exp $
+#	$Id: MAKEDEV,v 1.149 1998/01/09 18:32:51 steve Exp $
 #
 
 PATH=/sbin:/bin/:/usr/bin:/usr/sbin:$PATH
@@ -260,17 +261,27 @@ wt*)
 	;;
 
 # Individual slices.
-od*s*|sd*s*|vn*s*|wd*s*)
+od*s*|sd*s*|vn*s*|wd*s*|wfd*s*)
 	umask $disk_umask
 	case $i in
 	od*s*) name=od; blk=20; chr=70;;
 	sd*s*) name=sd; blk=4;  chr=13;;
 	wd*s*) name=wd; blk=0;  chr=3;;
 	vn*s*) name=vn; blk=15; chr=43;;
+	wfd*s*) name=wfd; blk=24; chr=87;;
+	esac
+	case $i in
+	wfd*s*)
+		unit=`expr $i : '...\([0-9]*\)s'`
+		slice=`expr $i : '...[0-9]*s\([0-9]*\)'`
+		part=`expr $i : '...[0-9]*s[0-9]*\(.*\)'`
+		;;
+	*)
+		unit=`expr $i : '..\([0-9]*\)s'`
+		slice=`expr $i : '..[0-9]*s\([0-9]*\)'`
+		part=`expr $i : '..[0-9]*s[0-9]*\(.*\)'`
+		;;
 	esac
-	unit=`expr $i : '..\([0-9]*\)s'`
-	slice=`expr $i : '..[0-9]*s\([0-9]*\)'`
-	part=`expr $i : '..[0-9]*s[0-9]*\(.*\)'`
 	case $unit in
 	[0-9]|[0-9][0-9]|[0-4][0-9][0-9]|50[0-9]|51[0-1])
 		case $slice in
@@ -419,15 +430,23 @@ ft*)
 	umask 77
 	;;
 
-od*|sd*|vn*|wd*)
+od*|sd*|vn*|wd*|wfd*)
 	umask $disk_umask
 	case $i in
 	od*) name=od; blk=20; chr=70;;
 	sd*) name=sd; blk=4;  chr=13;;
 	vn*) name=vn; blk=15; chr=43;;
 	wd*) name=wd; blk=0;  chr=3;;
+	wfd*) name=wfd; blk=24; chr=87;;
+	esac
+	case $i in
+	wfd*)
+		unit=`expr $i : '...\(.*\)'`
+		;;
+	*)
+		unit=`expr $i : '..\(.*\)'`
+		;;
 	esac
-	unit=`expr $i : '..\(.*\)'`
 	case $unit in
 	[0-9]|[0-9][0-9]|[0-4][0-9][0-9]|50[0-9]|51[0-1])
 		for slicepartname in s0h s1 s2 s3 s4
diff --git a/etc/disktab b/etc/disktab
index 08824c4..9947370 100644
--- a/etc/disktab
+++ b/etc/disktab
@@ -99,6 +99,15 @@ fd1720:\
 	:pc#3444:oc#0:bc#4096:fc#512:
 
 #
+# LS-120 floppy-format.
+#
+fd120m|floppy120|floppy120m|3.5in LS-120 Floppy:\
+	:ty=floppy:se#512:nt#8:rm#300:ns#32:nc#963:\
+	:pa#246528:oa#0:ba#4096:fa#512:\
+	:pb#246528:ob#0:bb#4096:fb#512:\
+	:pc#246528:oc#0:bc#4096:fc#512:
+
+#
 # Harddisk formats
 #
 qp120at|Quantum Peripherals 120MB IDE:\
diff --git a/etc/etc.i386/MAKEDEV b/etc/etc.i386/MAKEDEV
index 03b5ae4..0f65cb6 100644
--- a/etc/etc.i386/MAKEDEV
+++ b/etc/etc.i386/MAKEDEV
@@ -37,6 +37,7 @@
 #
 # Disks:
 #	wd*	"Winchester" disk drives (ST506,IDE,ESDI,RLL,...)
+#	wfd*	"IDE floppy" disk drives (LS-120)
 #	fd*	"floppy" disk drives (3 1/2", 5 1/4")
 #	sd*	"SCSI disks"
 #	cd*	"SCSI CD-ROM disks"
@@ -106,7 +107,7 @@
 #	perfmon	CPU performance-monitoring counters
 #	pci	PCI configuration-space access from user mode
 #
-#	$Id: MAKEDEV,v 1.148 1998/01/03 11:53:52 jkh Exp $
+#	$Id: MAKEDEV,v 1.149 1998/01/09 18:32:51 steve Exp $
 #
 
 PATH=/sbin:/bin/:/usr/bin:/usr/sbin:$PATH
@@ -260,17 +261,27 @@ wt*)
 	;;
 
 # Individual slices.
-od*s*|sd*s*|vn*s*|wd*s*)
+od*s*|sd*s*|vn*s*|wd*s*|wfd*s*)
 	umask $disk_umask
 	case $i in
 	od*s*) name=od; blk=20; chr=70;;
 	sd*s*) name=sd; blk=4;  chr=13;;
 	wd*s*) name=wd; blk=0;  chr=3;;
 	vn*s*) name=vn; blk=15; chr=43;;
+	wfd*s*) name=wfd; blk=24; chr=87;;
+	esac
+	case $i in
+	wfd*s*)
+		unit=`expr $i : '...\([0-9]*\)s'`
+		slice=`expr $i : '...[0-9]*s\([0-9]*\)'`
+		part=`expr $i : '...[0-9]*s[0-9]*\(.*\)'`
+		;;
+	*)
+		unit=`expr $i : '..\([0-9]*\)s'`
+		slice=`expr $i : '..[0-9]*s\([0-9]*\)'`
+		part=`expr $i : '..[0-9]*s[0-9]*\(.*\)'`
+		;;
 	esac
-	unit=`expr $i : '..\([0-9]*\)s'`
-	slice=`expr $i : '..[0-9]*s\([0-9]*\)'`
-	part=`expr $i : '..[0-9]*s[0-9]*\(.*\)'`
 	case $unit in
 	[0-9]|[0-9][0-9]|[0-4][0-9][0-9]|50[0-9]|51[0-1])
 		case $slice in
@@ -419,15 +430,23 @@ ft*)
 	umask 77
 	;;
 
-od*|sd*|vn*|wd*)
+od*|sd*|vn*|wd*|wfd*)
 	umask $disk_umask
 	case $i in
 	od*) name=od; blk=20; chr=70;;
 	sd*) name=sd; blk=4;  chr=13;;
 	vn*) name=vn; blk=15; chr=43;;
 	wd*) name=wd; blk=0;  chr=3;;
+	wfd*) name=wfd; blk=24; chr=87;;
+	esac
+	case $i in
+	wfd*)
+		unit=`expr $i : '...\(.*\)'`
+		;;
+	*)
+		unit=`expr $i : '..\(.*\)'`
+		;;
 	esac
-	unit=`expr $i : '..\(.*\)'`
 	case $unit in
 	[0-9]|[0-9][0-9]|[0-4][0-9][0-9]|50[0-9]|51[0-1])
 		for slicepartname in s0h s1 s2 s3 s4
diff --git a/etc/etc.i386/disktab b/etc/etc.i386/disktab
index 08824c4..9947370 100644
--- a/etc/etc.i386/disktab
+++ b/etc/etc.i386/disktab
@@ -99,6 +99,15 @@ fd1720:\
 	:pc#3444:oc#0:bc#4096:fc#512:
 
 #
+# LS-120 floppy-format.
+#
+fd120m|floppy120|floppy120m|3.5in LS-120 Floppy:\
+	:ty=floppy:se#512:nt#8:rm#300:ns#32:nc#963:\
+	:pa#246528:oa#0:ba#4096:fa#512:\
+	:pb#246528:ob#0:bb#4096:fb#512:\
+	:pc#246528:oc#0:bc#4096:fc#512:
+
+#
 # Harddisk formats
 #
 qp120at|Quantum Peripherals 120MB IDE:\