patch-2.4.0-test3 linux/include/asm-arm/floppy.h

• Lines: 49
• Date: Mon Jun 26 12:04:42 2000
• Orig file: v2.4.0-test2/linux/include/asm-arm/floppy.h
• Orig date: Sat May 8 11:06:57 1999

diff -u --recursive --new-file v2.4.0-test2/linux/include/asm-arm/floppy.h linux/include/asm-arm/floppy.h
@@ -1,7 +1,9 @@
 /*
  * linux/include/asm-arm/floppy.h
  *
- * (C) 1996 Russell King
+ * (C) 1996-2000 Russell King
+ *
+ * Note that we don't touch FLOPPY_DMA nor FLOPPY_IRQ here
  */
 #ifndef __ASM_ARM_FLOPPY_H
 #define __ASM_ARM_FLOPPY_H
@@ -24,14 +26,14 @@
 #define fd_disable_irq()	disable_irq(IRQ_FLOPPYDISK)
 #define fd_enable_irq()		enable_irq(IRQ_FLOPPYDISK)
 
-#define fd_request_dma()	request_dma(FLOPPY_DMA,"floppy")
-#define fd_free_dma()		free_dma(FLOPPY_DMA)
-#define fd_disable_dma()	disable_dma(FLOPPY_DMA)
-#define fd_enable_dma()		enable_dma(FLOPPY_DMA)
-#define fd_clear_dma_ff()	clear_dma_ff(FLOPPY_DMA)
-#define fd_set_dma_mode(mode)	set_dma_mode(FLOPPY_DMA, (mode))
-#define fd_set_dma_addr(addr)	set_dma_addr(FLOPPY_DMA, virt_to_bus((addr)))
-#define fd_set_dma_count(len)	set_dma_count(FLOPPY_DMA, (len))
+#define fd_request_dma()	request_dma(DMA_FLOPPY,"floppy")
+#define fd_free_dma()		free_dma(DMA_FLOPPY)
+#define fd_disable_dma()	disable_dma(DMA_FLOPPY)
+#define fd_enable_dma()		enable_dma(DMA_FLOPPY)
+#define fd_clear_dma_ff()	clear_dma_ff(DMA_FLOPPY)
+#define fd_set_dma_mode(mode)	set_dma_mode(DMA_FLOPPY, (mode))
+#define fd_set_dma_addr(addr)	set_dma_addr(DMA_FLOPPY, virt_to_bus((addr)))
+#define fd_set_dma_count(len)	set_dma_count(DMA_FLOPPY, (len))
 #define fd_cacheflush(addr,sz)
 
 /* need to clean up dma.h */
@@ -109,13 +111,12 @@
 }
 
 #define FDC1 (0x3f0)
-static int FDC2 = -1;
 
 #define FLOPPY0_TYPE 4
 #define FLOPPY1_TYPE 4
 
 #define N_FDC 1
-#define N_DRIVE 8
+#define N_DRIVE 4
 
 #define FLOPPY_MOTOR_MASK 0xf0