patch-2.1.129 linux/drivers/block/amiflop.c

• Lines: 30
• Date: Sun Nov 15 11:23:08 1998
• Orig file: v2.1.128/linux/drivers/block/amiflop.c
• Orig date: Wed Aug 26 11:37:34 1998

diff -u --recursive --new-file v2.1.128/linux/drivers/block/amiflop.c linux/drivers/block/amiflop.c
@@ -114,7 +114,7 @@
 #define FD_HD_3 	0x55555555  /* high-density 3.5" (1760K) drive */
 #define FD_DD_5 	0xaaaaaaaa  /* double-density 5.25" (440K) drive */
 
-static long int fd_def_df0 = 0;     /* default for df0 if it doesn't identify */
+static long int fd_def_df0 = FD_DD_3;     /* default for df0 if it doesn't identify */
 
 MODULE_PARM(fd_def_df0,"l");
 
@@ -1858,20 +1858,6 @@
   blk_dev[MAJOR_NR].request_fn = DEVICE_REQUEST;
   blksize_size[MAJOR_NR] = floppy_blocksizes;
   blk_size[MAJOR_NR] = floppy_sizes;
-
-
-  #if 0 /* Doesn't seem to be correct */
-  if (fd_def_df0==0) {
-    if ((amiga.model == AMI_3000) || (amiga.model == AMI_3000T) ||
-        (amiga.model == AMI_3000PLUS) || (amiga.model == AMI_4000))
-      fd_def_df0=FD_HD_3;
-    else
-      fd_def_df0=FD_DD_3;
-  }
-  #else
-  /* Now we hope that every HD drive will identify itself correctly */
-  fd_def_df0 = FD_DD_3;
-  #endif
 
   for (i = 0; i < 128; i++)
 	  mfmdecode[i]=255;