patch-2.4.0-test12 linux/arch/arm/kernel/oldlatches.c

• Lines: 38
• Date: Mon Nov 27 17:07:59 2000
• Orig file: v2.4.0-test11/linux/arch/arm/kernel/oldlatches.c
• Orig date: Sun Oct 8 10:50:05 2000

diff -u --recursive --new-file v2.4.0-test11/linux/arch/arm/kernel/oldlatches.c linux/arch/arm/kernel/oldlatches.c
@@ -26,12 +26,12 @@
 /* newval=(oldval & ~mask)|newdata */
 void oldlatch_aupdate(unsigned char mask,unsigned char newdata)
 {
-	if (machine_is_arc()) {
+	if (machine_is_archimedes()) {
 		latch_a_copy = (latch_a_copy & ~mask) | newdata;
 
 		printk("Latch: A = 0x%02x\n", latch_a_copy);
 
-		outb(latch_a_copy, LATCHAADDR);
+		__raw_writeb(latch_a_copy, LATCHA_BASE);
 	} else
 		BUG();
 }
@@ -40,19 +40,19 @@
 /* newval=(oldval & ~mask)|newdata */
 void oldlatch_bupdate(unsigned char mask,unsigned char newdata)
 {
-	if (machine_is_arc()) {
+	if (machine_is_archimedes()) {
 		latch_b_copy = (latch_b_copy & ~mask) | newdata;
 
 		printk("Latch: B = 0x%02x\n", latch_b_copy);
 
-		outb(latch_b_copy, LATCHBADDR);
+		__raw_writeb(latch_b_copy, LATCHB_BASE);
 	} else
 		BUG();
 }
 
 static void __init oldlatch_init(void)
 {
-	if (machine_is_arc()) {
+	if (machine_is_archimedes()) {
 		oldlatch_aupdate(0xff, 0xff);
 		/* Thats no FDC reset...*/
 		oldlatch_bupdate(0xff, LATCHB_FDCRESET);