Resent-Date: Tue, 13 Oct 1998 15:54:52 +0200 (MET DST) Date: Tue, 13 Oct 1998 15:54:55 +0200 From: Kars de Jong To: linux-m68k@lists.linux-m68k.org Subject: Patch for 2.1.124 Resent-From: linux-m68k@phil.uni-sb.de Hi all, Here's a patch that should really fix the floppy behaviour in case it doesn't identify. The problem was that it had already probed and found no drives before it got to the code that set the default to be a 3.5 inch DD drive. Kars. -- ------------------------------------------------------------------------------ Kars de Jong Signaalkamp rules the waves! Turrican@Discworld --------======]**-----| jongk@cs.utwente.nl |-----**[======--------- --- linux/drivers/block/amiflop.c 1998/10/13 10:19:24 1.1 +++ linux/drivers/block/amiflop.c 1998/10/13 10:23:46 @@ -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;