patch-pre2.0.8 linux/drivers/block/floppy.c

• Lines: 78
• Date: Mon May 27 13:16:02 1996
• Orig file: pre2.0.7/linux/drivers/block/floppy.c
• Orig date: Tue May 21 19:52:33 1996

diff -u --recursive --new-file pre2.0.7/linux/drivers/block/floppy.c linux/drivers/block/floppy.c
@@ -213,13 +213,6 @@
 static unsigned int fake_change = 0;
 static int initialising=1;
 
-#ifdef __sparc__
-/* We hold the FIFO configuration here.  We want to have Polling and
- * Implied Seek enabled on Sun controllers.
- */
-unsigned char fdc_cfg = 0;
-#endif
-
 static inline int TYPE(kdev_t x) {
 	return  (MINOR(x)>>2) & 0x1f;
 }
@@ -1184,15 +1177,10 @@
 {
 	/* Turn on FIFO */
 	output_byte(FD_CONFIGURE);
-#ifdef __sparc__ 
-	output_byte(0x64);	/* Motor off timeout */
-	output_byte(fdc_cfg | 0x0A);
-#else
 	if(need_more_output() != MORE_OUTPUT)
 		return 0;
 	output_byte(0);
 	output_byte(0x10 | (no_fifo & 0x20) | (fifo_depth & 0xf));
-#endif
 	output_byte(0);	/* pre-compensation from track 
 			   0 upwards */
 	return 1;
@@ -1234,12 +1222,7 @@
 		/*DPRINT("FIFO enabled\n");*/
 	}
 
-#ifdef __sparc__
-	/* If doing implied seeks, no specify necessary */
-	if(fdc_cfg&0x40)
-		return;
-#endif
-
+#ifndef __sparc__
 	switch (raw_cmd->rate & 0x03) {
 		case 3:
 			dtr = 1000;
@@ -1294,6 +1277,7 @@
 		output_byte(FDCS->spec1 = spec1);
 		output_byte(FDCS->spec2 = spec2);
 	}
+#endif
 } /* fdc_specify */
 
 /* Set the FDC's data transfer rate on behalf of the specified drive.
@@ -1572,15 +1556,6 @@
 		}
 	}
 
-#ifdef __sparc__
-	if (fdc_cfg&0x40) {
-		/* Implied seeks being done... */
-		DRS->track = raw_cmd->track;
-		setup_rw_floppy();
-		return;
-	}
-#endif
-
 	SET_INTR(seek_interrupt);
 	output_byte(FD_SEEK);
 	output_byte(UNIT(current_drive));
@@ -3982,9 +3957,6 @@
 	blksize_size[MAJOR_NR] = floppy_blocksizes;
 	blk_dev[MAJOR_NR].request_fn = DEVICE_REQUEST;
 	reschedule_timeout(MAXTIMEOUT, "floppy init", MAXTIMEOUT);
-#ifdef __sparc__
-	fdc_cfg = (0x40 | 0x10); /* ImplSeek+Polling+FIFO */
-#endif
 	config_types();
 
 	for (i = 0; i < N_FDC; i++) {