patch-2.4.5 linux/include/asm-ppc/rpxlite.h

Next file: linux/include/asm-ppc/rwsem.h
Previous file: linux/include/asm-ppc/rpxhiox.h
Back to the patch index
Back to the overall index

diff -u --recursive --new-file v2.4.4/linux/include/asm-ppc/rpxlite.h linux/include/asm-ppc/rpxlite.h
@@ -1,3 +1,6 @@
+/*
+ * BK Id: SCCS/s.rpxlite.h 1.8 05/17/01 18:14:25 cort
+ */
 
 /*
  * A collection of structures, addresses, and values associated with
@@ -9,6 +12,9 @@
 #ifndef __MACH_RPX_DEFS
 #define __MACH_RPX_DEFS
 
+#include <linux/config.h>
+
+#ifndef __ASSEMBLY__
 /* A Board Information structure that is given to a program when
  * prom starts it up.
  */
@@ -31,8 +37,6 @@
 #define RPX_CSR_SIZE		((uint)(4 * 1024))
 #define IMAP_ADDR		((uint)0xfa200000)
 #define IMAP_SIZE		((uint)(64 * 1024))
-#define HIOX_CSR_ADDR		((uint)0xfac00000)
-#define HIOX_CSR_SIZE		((uint)(4 * 1024))
 #define PCMCIA_MEM_ADDR		((uint)0x04000000)
 #define PCMCIA_MEM_SIZE		((uint)(64 * 1024))
 #define PCMCIA_IO_ADDR		((uint)0x04400000)
@@ -52,10 +56,25 @@
 #define BCSR0_PCMCIA3VOLT	((uint)0x000a0000)
 #define BCSR0_PCMCIA5VOLT	((uint)0x00060000)
 
-/* HIO Expansion card.
-*/
-#define HIOX_CSR_ENAUDIO	((uint)0x00000200)
-#define HIOX_CSR_RSTAUDIO	((uint)0x00000100)	/* 0 == reset */
+#define BCSR1_IPB5SEL          ((uint)0x00100000)
+#define BCSR1_PCVCTL4          ((uint)0x00080000)
+#define BCSR1_PCVCTL5          ((uint)0x00040000)
+#define BCSR1_PCVCTL6          ((uint)0x00020000)
+#define BCSR1_PCVCTL7          ((uint)0x00010000)
+
+#if defined(CONFIG_HTDMSOUND)
+#include <asm/rpxhiox.h>
+#endif
+#endif /* !__ASSEMBLY__ */
+
+/* define IO_BASE for pcmcia */
+#define _IO_BASE 0x80000000
+#define _IO_BASE_SIZE 0x1000
+
+#ifdef CONFIG_IDE
+#define MAX_HWIFS 1
+#define ide_request_irq(irq,hand,flg,dev,id)    request_8xxirq((irq),(hand),(flg),(dev),(id))
+#endif
 
 /* We don't use the 8259.
 */

FUNET's LINUX-ADM group, linux-adm@nic.funet.fi
TCL-scripts by Sam Shen (who was at: slshen@lbl.gov)