patch-2.3.23 linux/arch/arm/mm/mm-tbox.c

• Lines: 73
• Date: Wed Oct 20 16:29:08 1999
• Orig file: v2.3.22/linux/arch/arm/mm/mm-tbox.c
• Orig date: Sat Jul 18 11:55:23 1998

diff -u --recursive --new-file v2.3.22/linux/arch/arm/mm/mm-tbox.c linux/arch/arm/mm/mm-tbox.c
@@ -5,7 +5,7 @@
  * Extra MM routines for the Tbox architecture
  *
  * Copyright (C) 1998 Phil Blundell
- * Copyright (C) 1998 Russell King
+ * Copyright (C) 1998-1999 Russell King
  */
 
 #include <linux/sched.h>
@@ -15,9 +15,15 @@
 #include <asm/io.h>
 #include <asm/pgtable.h>
 #include <asm/page.h>
-#include <asm/proc/mm-init.h>
- 
+
+#include "map.h"
  
+struct mem_desc mem_desc[] __initdata = {
+	0, 0
+};
+
+unsigned int __initdata mem_desc_size = 0;
+
 /*    Logical    Physical
  * 0xffff1000	0x00100000	DMA registers
  * 0xffff2000	0x00200000	MPEG
@@ -34,23 +40,26 @@
  * 0xffffd000	0x00d00000	Interrupt reset
  * 0xffffe000	0x00e00000	MPEG DMA throttle
  */
- 
-#define MAPPING								\
-  	{ 0xffff0000, 0x01000000, 0x00001000, DOMAIN_IO, 0, 1 },	\
- 	{ 0xffff1000, 0x00100000, 0x00001000, DOMAIN_IO, 0, 1 },	\
- 	{ 0xffff2000, 0x00200000, 0x00001000, DOMAIN_IO, 0, 1 },	\
- 	{ 0xffff3000, 0x00300000, 0x00001000, DOMAIN_IO, 0, 1 },	\
- 	{ 0xffff4000, 0x00400000, 0x00001000, DOMAIN_IO, 0, 1 },	\
- 	{ 0xfe000000, 0x00400000, 0x00001000, DOMAIN_IO, 0, 1 },	\
- 	{ 0xffff5000, 0x00500000, 0x00001000, DOMAIN_IO, 0, 1 },	\
- 	{ 0xffff6000, 0x00600000, 0x00001000, DOMAIN_IO, 0, 1 },	\
- 	{ 0xffff7000, 0x00700000, 0x00001000, DOMAIN_IO, 0, 1 },	\
- 	{ 0xffff8000, 0x00800000, 0x00001000, DOMAIN_IO, 0, 1 },	\
- 	{ 0xffff9000, 0x00900000, 0x00001000, DOMAIN_IO, 0, 1 },	\
- 	{ 0xffffa000, 0x00a00000, 0x00001000, DOMAIN_IO, 0, 1 },	\
- 	{ 0xffffb000, 0x00b00000, 0x00001000, DOMAIN_IO, 0, 1 },	\
- 	{ 0xffffc000, 0x00c00000, 0x00001000, DOMAIN_IO, 0, 1 },	\
- 	{ 0xffffd000, 0x00d00000, 0x00001000, DOMAIN_IO, 0, 1 },	\
- 	{ 0xffffe000, 0x00e00000, 0x00001000, DOMAIN_IO, 0, 1 }
 
-#include "mm-armv.c"
+const struct map_desc io_desc[] __initdata = {
+  	{ 0xffff0000, 0x01000000, 0x00001000, DOMAIN_IO, 0, 1, 0, 0 },
+ 	{ 0xffff1000, 0x00100000, 0x00001000, DOMAIN_IO, 0, 1, 0, 0 },
+ 	{ 0xffff2000, 0x00200000, 0x00001000, DOMAIN_IO, 0, 1, 0, 0 },
+ 	{ 0xffff3000, 0x00300000, 0x00001000, DOMAIN_IO, 0, 1, 0, 0 },
+ 	{ 0xffff4000, 0x00400000, 0x00001000, DOMAIN_IO, 0, 1, 0, 0 },
+ 	{ 0xfe000000, 0x00400000, 0x00001000, DOMAIN_IO, 0, 1, 0, 0 },
+ 	{ 0xffff5000, 0x00500000, 0x00001000, DOMAIN_IO, 0, 1, 0, 0 },
+ 	{ 0xffff6000, 0x00600000, 0x00001000, DOMAIN_IO, 0, 1, 0, 0 },
+ 	{ 0xffff7000, 0x00700000, 0x00001000, DOMAIN_IO, 0, 1, 0, 0 },
+ 	{ 0xffff8000, 0x00800000, 0x00001000, DOMAIN_IO, 0, 1, 0, 0 },
+ 	{ 0xffff9000, 0x00900000, 0x00001000, DOMAIN_IO, 0, 1, 0, 0 },
+ 	{ 0xffffa000, 0x00a00000, 0x00001000, DOMAIN_IO, 0, 1, 0, 0 },
+ 	{ 0xffffb000, 0x00b00000, 0x00001000, DOMAIN_IO, 0, 1, 0, 0 },
+ 	{ 0xffffc000, 0x00c00000, 0x00001000, DOMAIN_IO, 0, 1, 0, 0 },
+ 	{ 0xffffd000, 0x00d00000, 0x00001000, DOMAIN_IO, 0, 1, 0, 0 },
+ 	{ 0xffffe000, 0x00e00000, 0x00001000, DOMAIN_IO, 0, 1, 0, 0 }
+};
+
+#define SIZEOFMAP (sizeof(mapping) / sizeof(mapping[0]))
+
+unsigned int __initdata io_desc_size = SIZEOFMAP;