patch-1.3.45 linux/include/asm-sparc/floppy.h

• Lines: 41
• Date: Sun Nov 26 11:50:02 1995
• Orig file: v1.3.44/linux/include/asm-sparc/floppy.h
• Orig date: Sat Nov 25 19:04:49 1995

diff -u --recursive --new-file v1.3.44/linux/include/asm-sparc/floppy.h linux/include/asm-sparc/floppy.h
@@ -1,5 +1,4 @@
-/* $Id: floppy.h,v 1.8 1995/11/25 02:31:45 davem Exp $
- * asm-sparc/floppy.h: Sparc specific parts of the Floppy driver.
+/* asm-sparc/floppy.h: Sparc specific parts of the Floppy driver.
  *
  * Copyright (C) 1995 David S. Miller (davem@caip.rutgers.edu)
  */
@@ -130,12 +129,14 @@
 		 *               drive attached to a Sun controller
 		 *               and it will be at drive zero.
 		 */
+#if 0
 		if(value & 0xf0)
+#else
+		if(value & 0x10)
+#endif
 			set_auxio(AUXIO_FLPY_DSEL, 0);
-#if 0
 		else
 			set_auxio(0, AUXIO_FLPY_DSEL);
-#endif
 		break;
 	case 5: /* FD_DATA */
 		sun_fdc->data_82072 = value;
@@ -203,7 +204,6 @@
  * the transfer for debugging.  1=read 2=write
  */
 char *pdma_vaddr;
-char *pdma_vsave;
 unsigned long pdma_size;
 int doing_pdma = 0;
 
@@ -246,7 +246,7 @@
 static inline void sun_fd_enable_dma(void)
 {
 	/* We're about to let it rip, lock any tlb entries necessary. */
-	pdma_vaddr = pdma_vsave = mmu_lockarea(pdma_vaddr, pdma_size);
+	pdma_vaddr = mmu_lockarea(pdma_vaddr, pdma_size);
 }
 
 /* Our low-level entry point in arch/sparc/kernel/entry.S */