patch-2.1.132 linux/include/asm-arm/arch-rpc/ide.h

Next file: linux/include/asm-arm/arch-rpc/keyboard.h
Previous file: linux/include/asm-arm/arch-rpc/hardware.h
Back to the patch index
Back to the overall index

diff -u --recursive --new-file v2.1.131/linux/include/asm-arm/arch-rpc/ide.h linux/include/asm-arm/arch-rpc/ide.h
@@ -2,44 +2,41 @@
  * linux/include/asm-arm/arch-rpc/ide.h
  *
  * Copyright (c) 1997 Russell King
+ *
+ * Modifications:
+ *  29-07-1998	RMK	Major re-work of IDE architecture specific code
  */
 #include <asm/irq.h>
 
-static __inline__ int
-ide_default_irq(ide_ioreg_t base)
+/*
+ * Set up a hw structure for a specified data port, control port and IRQ.
+ * This should follow whatever the default interface uses.
+ */
+static __inline__ void
+ide_init_hwif_ports(hw_regs_t *hw, int data_port, int ctrl_port, int irq)
 {
-	if (base == 0x1f0)
-		return IRQ_HARDDISK;
-	return 0;
-}
+	ide_ioreg_t reg = (ide_ioreg_t) data_port;
+	int i;
 
-static __inline__ ide_ioreg_t
-ide_default_io_base(int index)
-{
-	if (index == 0)
-		return 0x1f0;
-	return 0;
-}
+	memset(hw, 0, sizeof(*hw));
 
-static __inline__ int
-ide_default_stepping(int index)
-{
-	return 0;
+	for (i = IDE_DATA_OFFSET; i <= IDE_STATUS_OFFSET; i++) {
+		hw->io_ports[i] = reg;
+		reg += 1;
+	}
+	hw->io_ports[IDE_CONTROL_OFFSET] = (ide_ioreg_t) ctrl_port;
+	hw->irq = irq;
 }
 
+/*
+ * This registers the standard ports for this architecture with the IDE
+ * driver.
+ */
 static __inline__ void
-ide_init_hwif_ports (ide_ioreg_t *p, ide_ioreg_t base, int stepping, int *irq)
+ide_init_default_hwifs(void)
 {
-	ide_ioreg_t port = base;
-	ide_ioreg_t ctrl = base + 0x206;
-	int i;
+	hw_regs_t hw;
 
-	i = 8;
-	while (i--) {
-		*p++ = port;
-		port += 1 << stepping;
-	}
-	*p++ = ctrl;
-	if (irq != NULL)
-		*irq = 0;
+	ide_init_hwif_ports(&hw, 0x1f0, 0x3f6, IRQ_HARDDISK);
+	ide_register_hw(&hw, NULL);
 }

FUNET's LINUX-ADM group, linux-adm@nic.funet.fi
TCL-scripts by Sam Shen, slshen@lbl.gov