patch-2.3.20 linux/arch/ppc/kernel/feature.c

• Lines: 57
• Date: Thu Oct 7 10:17:08 1999
• Orig file: v2.3.19/linux/arch/ppc/kernel/feature.c
• Orig date: Wed Mar 10 21:30:31 1999

diff -u --recursive --new-file v2.3.19/linux/arch/ppc/kernel/feature.c linux/arch/ppc/kernel/feature.c
@@ -41,7 +41,9 @@
 	OH_BAY_FLOPPY_ENABLE,	/* FEATURE_Mediabay_floppy_enable */
 	0,			/* FEATURE_BMac_reset */
 	0,			/* FEATURE_BMac_IO_enable */
-	0			/* FEATURE_Modem_Reset -> guess...*/
+	0,			/* FEATURE_Modem_Reset -> guess... */
+	OH_IDE_POWER,		/* FEATURE_IDE_DiskPower -> guess... */
+	OH_IDE_RESET		/* FEATURE_IDE_Reset (0 based) -> guess... */
 };
 
 /* assume these are the same as the ohare until proven otherwise */
@@ -63,7 +65,9 @@
 	OH_BAY_FLOPPY_ENABLE,	/* FEATURE_Mediabay_floppy_enable */
 	0x80000000,		/* FEATURE_BMac_reset */
 	0x60000000,		/* FEATURE_BMac_IO_enable */
-	0x02000000		/* FEATURE_Modem_Reset -> guess...*/
+	0x02000000,		/* FEATURE_Modem_Reset -> guess...*/
+	OH_IDE_POWER,		/* FEATURE_IDE_DiskPower -> guess... */
+	OH_IDE_RESET		/* FEATURE_IDE_Reset (0 based) -> guess... */
 };
 
 /* definition of a feature controller object */
@@ -191,9 +195,10 @@
 
 	save_flags(flags);
 	cli();
-	st_le32( controllers[controller].reg,
-		 ld_le32(controllers[controller].reg) |
+	out_le32( controllers[controller].reg,
+		 in_le32(controllers[controller].reg) |
 		 controllers[controller].bits[f]);
+	(void)in_le32(controllers[controller].reg);
 	restore_flags(flags);
 	udelay(10);
 	
@@ -220,9 +225,10 @@
 
 	save_flags(flags);
 	cli();
-	st_le32( controllers[controller].reg,
-		 ld_le32(controllers[controller].reg) &
+	out_le32( controllers[controller].reg,
+		 in_le32(controllers[controller].reg) &
 		 ~(controllers[controller].bits[f]));
+	(void)in_le32(controllers[controller].reg);
 	restore_flags(flags);
 	udelay(10);
 	
@@ -241,7 +247,7 @@
 	if (controller < 0)
 		return controller;
 	
-	return (ld_le32(controllers[controller].reg) &
+	return (in_le32(controllers[controller].reg) &
 		controllers[controller].bits[f]) != 0;
 }