94 lines
4.4 KiB
Diff
94 lines
4.4 KiB
Diff
--- /usr/src/linux/drivers/block/floppy.c Mon Apr 3 18:31:31 1995
|
|
+++ linux/drivers/block/floppy.c Sat Aug 5 00:21:03 1995
|
|
@@ -150,8 +150,8 @@
|
|
#define FLOPPY1_TYPE 0
|
|
#endif
|
|
|
|
-#define N_FDC 2
|
|
-#define N_DRIVE 8
|
|
+#define N_FDC 1
|
|
+#define N_DRIVE 2
|
|
|
|
#define TYPE(x) ( ((x)>>2) & 0x1f )
|
|
#define DRIVE(x) ( ((x)&0x03) | (((x)&0x80 ) >> 5))
|
|
@@ -280,11 +280,6 @@
|
|
{{4, 500, 16, 16, 4000, 4*HZ/10, 3*HZ, 10, SEL_DLY, 5, 83, 3*HZ, 20, {3,1,2,0,2}, 0,
|
|
0, { 7, 4,25,22,31,21,29,11}, 3*HZ/2, 7 }, "1.44M" }, /*3 1/2 HD*/
|
|
|
|
-{{5, 1000, 15, 8, 3000, 4*HZ/10, 3*HZ, 10, SEL_DLY, 5, 83, 3*HZ, 40, {3,1,2,0,2}, 0,
|
|
- 0, { 7, 8, 4,25,28,22,31,21}, 3*HZ/2, 8 }, "2.88M AMI BIOS" }, /*3 1/2 ED*/
|
|
-
|
|
-{{6, 1000, 15, 8, 3000, 4*HZ/10, 3*HZ, 10, SEL_DLY, 5, 83, 3*HZ, 40, {3,1,2,0,2}, 0,
|
|
- 0, { 7, 8, 4,25,28,22,31,21}, 3*HZ/2, 8 }, "2.88M" } /*3 1/2 ED*/
|
|
/* | ---autodetected formats-- | | |
|
|
read_track | | Name printed when booting
|
|
| Native format
|
|
@@ -303,7 +298,7 @@
|
|
* types (ie 360kB diskette in 1.2MB drive etc). Others should
|
|
* be self-explanatory.
|
|
*/
|
|
-static struct floppy_struct floppy_type[32] = {
|
|
+static struct floppy_struct floppy_type[8] = {
|
|
{ 0, 0,0, 0,0,0x00,0x00,0x00,0x00,NULL }, /* 0 no testing */
|
|
{ 720, 9,2,40,0,0x2A,0x02,0xDF,0x50,"d360" }, /* 1 360KB PC */
|
|
{ 2400,15,2,80,0,0x1B,0x00,0xDF,0x54,"h1200" }, /* 2 1.2MB AT */
|
|
@@ -312,33 +307,6 @@
|
|
{ 720, 9,2,40,1,0x23,0x01,0xDF,0x50,"h360" }, /* 5 360KB AT */
|
|
{ 1440, 9,2,80,0,0x23,0x01,0xDF,0x50,"h720" }, /* 6 720KB AT */
|
|
{ 2880,18,2,80,0,0x1B,0x00,0xCF,0x6C,"H1440" }, /* 7 1.44MB 3.5" */
|
|
- { 5760,36,2,80,0,0x1B,0x43,0xAF,0x54,"E2880" }, /* 8 2.88MB 3.5" */
|
|
- { 5760,36,2,80,0,0x1B,0x43,0xAF,0x54,"CompaQ"}, /* 9 2.88MB 3.5" */
|
|
-
|
|
- { 2880,18,2,80,0,0x25,0x00,0xDF,0x02,"h1440" }, /* 10 1.44MB 5.25" */
|
|
- { 3360,21,2,80,0,0x1C,0x00,0xCF,0x0C,"H1680" }, /* 11 1.68MB 3.5" */
|
|
- { 820,10,2,41,1,0x25,0x01,0xDF,0x2E,"h410" }, /* 12 410KB 5.25" */
|
|
- { 1640,10,2,82,0,0x25,0x02,0xDF,0x2E,"H820" }, /* 13 820KB 3.5" */
|
|
- { 2952,18,2,82,0,0x25,0x00,0xDF,0x02,"h1476" }, /* 14 1.48MB 5.25" */
|
|
- { 3444,21,2,82,0,0x25,0x00,0xDF,0x0C,"H1722" }, /* 15 1.72MB 3.5" */
|
|
- { 840,10,2,42,1,0x25,0x01,0xDF,0x2E,"h420" }, /* 16 420KB 5.25" */
|
|
- { 1660,10,2,83,0,0x25,0x02,0xDF,0x2E,"H830" }, /* 17 830KB 3.5" */
|
|
- { 2988,18,2,83,0,0x25,0x00,0xDF,0x02,"h1494" }, /* 18 1.49MB 5.25" */
|
|
- { 3486,21,2,83,0,0x25,0x00,0xDF,0x0C,"H1743" }, /* 19 1.74 MB 3.5" */
|
|
-
|
|
- { 1760,11,2,80,0,0x1C,0x09,0xCF,0x00,"h880" }, /* 20 880KB 5.25" */
|
|
- { 2080,13,2,80,0,0x1C,0x01,0xCF,0x00,"D1040" }, /* 21 1.04MB 3.5" */
|
|
- { 2240,14,2,80,0,0x1C,0x19,0xCF,0x00,"D1120" }, /* 22 1.12MB 3.5" */
|
|
- { 3200,20,2,80,0,0x1C,0x20,0xCF,0x2C,"h1600" }, /* 23 1.6MB 5.25" */
|
|
- { 3520,22,2,80,0,0x1C,0x08,0xCF,0x2e,"H1760" }, /* 24 1.76MB 3.5" */
|
|
- { 3840,24,2,80,0,0x1C,0x20,0xCF,0x00,"H1920" }, /* 25 1.92MB 3.5" */
|
|
- { 6400,40,2,80,0,0x25,0x5B,0xCF,0x00,"E3200" }, /* 26 3.20MB 3.5" */
|
|
- { 7040,44,2,80,0,0x25,0x5B,0xCF,0x00,"E3520" }, /* 27 3.52MB 3.5" */
|
|
- { 7680,48,2,80,0,0x25,0x63,0xCF,0x00,"E3840" }, /* 28 3.84MB 3.5" */
|
|
-
|
|
- { 3680,23,2,80,0,0x1C,0x10,0xCF,0x00,"H1840" }, /* 29 1.84MB 3.5" */
|
|
- { 1600,10,2,80,0,0x25,0x02,0xDF,0x2E,"D800" }, /* 30 800KB 3.5" */
|
|
- { 3200,20,2,80,0,0x1C,0x00,0xCF,0x2C,"H1600" }, /* 31 1.6MB 3.5" */
|
|
};
|
|
|
|
#define NUMBER(x) (sizeof(x) / sizeof(*(x)))
|
|
@@ -346,8 +314,7 @@
|
|
|
|
/* Auto-detection: Disk type used until the next media change occurs. */
|
|
struct floppy_struct *current_type[N_DRIVE] = {
|
|
- NULL, NULL, NULL, NULL,
|
|
- NULL, NULL, NULL, NULL
|
|
+ NULL, NULL
|
|
};
|
|
|
|
/*
|
|
@@ -704,13 +671,7 @@
|
|
|
|
static struct timer_list motor_off_timer[N_DRIVE] = {
|
|
{ NULL, NULL, 0, 0, motor_off_callback },
|
|
- { NULL, NULL, 0, 1, motor_off_callback },
|
|
- { NULL, NULL, 0, 2, motor_off_callback },
|
|
- { NULL, NULL, 0, 3, motor_off_callback },
|
|
- { NULL, NULL, 0, 4, motor_off_callback },
|
|
- { NULL, NULL, 0, 5, motor_off_callback },
|
|
- { NULL, NULL, 0, 6, motor_off_callback },
|
|
- { NULL, NULL, 0, 7, motor_off_callback }
|
|
+ { NULL, NULL, 0, 1, motor_off_callback }
|
|
};
|
|
|
|
/* schedules motor off */
|