patch-2.3.1 linux/arch/ppc/kernel/mbx_setup.c

• Lines: 49
• Date: Thu May 13 11:00:08 1999
• Orig file: v2.3.0/linux/arch/ppc/kernel/mbx_setup.c
• Orig date: Thu Apr 29 12:39:01 1999

diff -u --recursive --new-file v2.3.0/linux/arch/ppc/kernel/mbx_setup.c linux/arch/ppc/kernel/mbx_setup.c
@@ -380,23 +380,35 @@
         ppc_generic_ide_fix_driveid(id);
 }
 
-void __init mbx_ide_init_hwif_ports(ide_ioreg_t *p, ide_ioreg_t base, int *irq)
+void
+mbx_ide_init_hwif_ports(hw_regs_t *hw, ide_ioreg_t data_port, ide_ioreg_t ctrl_port, int *irq)
 {
-	ide_ioreg_t port = base;
-	int i = 8;
+	ide_ioreg_t reg = data_port;
+	int i;
+
+	*irq = 0;
+
+	if (data_port != 0)	/* Only map the first ATA flash drive */
+		return;
 
-	while (i--)
-		*p++ = port++;
-	*p++ = base + 0x206;
-	if (irq != NULL)
-		*irq = 0;
 #ifdef ATA_FLASH
-	base = (unsigned long) ioremap(PCMCIA_MEM_ADDR, 0x200);
-	for (i = 0; i < 8; ++i)
-		*p++ = base++;
-	*p = ++base;		/* Does not matter */
+
+	reg = (ide_ioreg_t) ioremap(PCMCIA_MEM_ADDR, 0x200);
+
+	for (i = IDE_DATA_OFFSET; i <= IDE_STATUS_OFFSET; i++) {
+		hw->io_ports[i] = reg;
+		reg += 1;
+	}
+
+	/* Does not matter */
+
+	if (ctrl_port) {
+		hw->io_ports[IDE_CONTROL_OFFSET] = ctrl_port;
+	} else {
+		hw->io_ports[IDE_CONTROL_OFFSET] = reg;
+	}
 	if (irq)
-		*irq = 13;
+		hw->irq = 13;
 #endif
 }
 #endif