patch-2.4.0-test1 linux/include/asm-sh/ide.h

• Lines: 48
• Date: Wed May 24 08:40:41 2000
• Orig file: v2.3.99-pre9/linux/include/asm-sh/ide.h
• Orig date: Tue May 23 15:31:36 2000

diff -u --recursive --new-file v2.3.99-pre9/linux/include/asm-sh/ide.h linux/include/asm-sh/ide.h
@@ -17,7 +17,7 @@
 #include <linux/config.h>
 
 #ifndef MAX_HWIFS
-#define MAX_HWIFS	1
+#define MAX_HWIFS	1	/* XXX: For my board -- gniibe */
 #endif
 
 #define ide__sti()	__sti()
@@ -25,8 +25,8 @@
 static __inline__ int ide_default_irq(ide_ioreg_t base)
 {
 	switch (base) {
-		case 0x01f0: return 14;
-		case 0x0170: return 15;
+		case 0xba0001f0: return 14;
+		case 0xba000170: return 14;
 		default:
 			return 0;
 	}
@@ -36,9 +36,9 @@
 {
 	switch (index) {
 		case 0:	
-			return 0x01f0;
+			return 0xba0001f0;
 		case 1:	
-			return 0x0170;
+			return 0xba000170;
 		default:
 			return 0;
 	}
@@ -60,6 +60,7 @@
 	}
 	if (irq != NULL)
 		*irq = 0;
+	hw->io_ports[IDE_IRQ_OFFSET] = 0;
 }
 
 static __inline__ void ide_init_default_hwifs(void)
@@ -69,7 +70,6 @@
 	int index;
 
 	for(index = 0; index < MAX_HWIFS; index++) {
-		memset(&hw, 0, sizeof(hw_regs_t));
 		ide_init_hwif_ports(&hw, ide_default_io_base(index), 0, NULL);
 		hw.irq = ide_default_irq(ide_default_io_base(index));
 		ide_register_hw(&hw, NULL);