patch-2.1.53 linux/include/asm-ppc/ide.h

• Lines: 52
• Date: Thu Sep 4 12:54:49 1997
• Orig file: v2.1.52/linux/include/asm-ppc/ide.h
• Orig date: Mon Aug 18 18:19:47 1997

diff -u --recursive --new-file v2.1.52/linux/include/asm-ppc/ide.h linux/include/asm-ppc/ide.h
@@ -21,10 +21,12 @@
 
 #define ide_sti()	sti()
 
-#ifdef CONFIG_PREP
-
 typedef unsigned short ide_ioreg_t;
+void ide_init_hwif_ports(ide_ioreg_t *p, ide_ioreg_t base, int *irq);
+void prep_ide_init_hwif_ports(ide_ioreg_t *p, ide_ioreg_t base, int *irq);
+void pmac_ide_init_hwif_ports(ide_ioreg_t *p, ide_ioreg_t base, int *irq);
 
+#if defined(CONFIG_PREP) || defined(CONFIG_CHRP)
 static __inline__ int ide_default_irq(ide_ioreg_t base)
 {
 	switch (base) {
@@ -49,18 +51,6 @@
 	}
 }
 
-static __inline__ void ide_init_hwif_ports (ide_ioreg_t *p, ide_ioreg_t base, int *irq)
-{
-	ide_ioreg_t port = base;
-	int i = 8;
-
-	while (i--)
-		*p++ = port++;
-	*p++ = base + 0x206;
-	if (irq != NULL)
-		*irq = 0;
-}
-
 typedef union {
 	unsigned all			: 8;	/* all of the bits together */
 	struct {
@@ -89,7 +79,8 @@
 
 #define ide_fix_driveid(id)		do {} while (0)
 
-#endif
+#endif /* CONFIG_CHRP || CONFIG_PREP */
+
 
 #ifdef CONFIG_PMAC
 
@@ -107,7 +98,6 @@
 	return index;
 }
 
-void ide_init_hwif_ports(ide_ioreg_t *p, ide_ioreg_t base, int *irq);
 
 typedef union {
 	unsigned all			: 8;	/* all of the bits together */