patch-2.3.23 linux/include/asm-arm/arch-rpc/system.h

• Lines: 41
• Date: Wed Oct 20 16:29:08 1999
• Orig file: v2.3.22/linux/include/asm-arm/arch-rpc/system.h
• Orig date: Tue Aug 31 17:29:14 1999

diff -u --recursive --new-file v2.3.22/linux/include/asm-arm/arch-rpc/system.h linux/include/asm-arm/arch-rpc/system.h
@@ -1,23 +1,24 @@
 /*
  * linux/include/asm-arm/arch-rpc/system.h
  *
- * Copyright (c) 1996 Russell King
+ * Copyright (c) 1996-1999 Russell King.
  */
-#ifndef __ASM_ARCH_SYSTEM_H
-#define __ASM_ARCH_SYSTEM_H
-
+#include <asm/arch/hardware.h>
 #include <asm/iomd.h>
+#include <asm/io.h>
+
+#define arch_do_idle() cpu_do_idle()
+
+extern __inline__ void arch_reset(char mode)
+{
+	extern void ecard_reset(int card);
+
+	ecard_reset(-1);
 
-#define arch_reset(mode) {						\
-	extern void ecard_reset (int card);				\
-	outb (0, IOMD_ROMCR0);						\
-	ecard_reset(-1);						\
-	cli();								\
-	__asm__ __volatile__("msr  spsr, r1;"				\
-			     "mcr  p15, 0, %0, c1, c0, 0;"		\
-			     "movs pc, #0"				\
-			 : 						\
-			 : "r" (cpu_reset()));				\
-	}
+	outb(0, IOMD_ROMCR0);
 
-#endif
+	__asm__ __volatile__(
+		"mcr  p15, 0, %0, c1, c0, 0\n\t"
+		"movs pc, #0"
+		 : : "r" (cpu_reset()));
+}