From 63e709c7c83a3c0a462275d6b7c053804127e295 Mon Sep 17 00:00:00 2001 From: Michael Sevakis Date: Wed, 11 Feb 2009 23:56:00 +0000 Subject: Refine the routines in mmu-arm.c and move them to mmu-arm.S since the code is now 100% assembly. git-svn-id: svn://svn.rockbox.org/rockbox/trunk@19980 a1c6a512-1295-4272-9138-f99709370657 --- firmware/export/dm320.h | 7 ++++--- firmware/export/s3c2440.h | 5 +++-- 2 files changed, 7 insertions(+), 5 deletions(-) (limited to 'firmware/export') diff --git a/firmware/export/dm320.h b/firmware/export/dm320.h index bf7295d463..dc29f7de2d 100644 --- a/firmware/export/dm320.h +++ b/firmware/export/dm320.h @@ -32,11 +32,12 @@ /* must be 16Kb (0x4000) aligned */ #if 0 #define MEM_END 0x00900000 + (MEM*0x00100000) -#define TTB_BASE ((unsigned long *)(MEM_END - TTB_SIZE)) /* End of memory */ +#define TTB_BASE_ADDR (MEM_END - TTB_SIZE) #else -#define TTB_BASE ((unsigned long *)(0x04900000 - TTB_SIZE)) /* End of memory */ +#define TTB_BASE_ADDR (0x04900000 - TTB_SIZE) #endif -#define FRAME ((short *) ((char*)TTB_BASE - LCD_BUFFER_SIZE)) /* Right before TTB */ +#define TTB_BASE ((unsigned long *)TTB_BASE_ADDR) /* End of memory */ +#define FRAME ((short *) (TTB_BASE_ADDR - LCD_BUFFER_SIZE)) /* Right before TTB */ #define PHY_IO_BASE 0x00030000 #define DM320_REG(addr) (*(volatile unsigned short *)(PHY_IO_BASE + (addr))) diff --git a/firmware/export/s3c2440.h b/firmware/export/s3c2440.h index f1d41dbae3..a7da64f688 100644 --- a/firmware/export/s3c2440.h +++ b/firmware/export/s3c2440.h @@ -24,8 +24,9 @@ #define LCD_BUFFER_SIZE (320*240*2) #define TTB_SIZE (0x4000) /* must be 16Kb (0x4000) aligned */ -#define TTB_BASE ((unsigned long *)(0x30000000 + (32*1024*1024) - TTB_SIZE)) /* End of memory */ -#define FRAME ((unsigned short *)((unsigned char *)TTB_BASE - LCD_BUFFER_SIZE)) /* Right before TTB */ +#define TTB_BASE_ADDR (0x30000000 + (32*1024*1024) - TTB_SIZE) +#define TTB_BASE ((unsigned long *)TTB_BASE_ADDR) /* End of memory */ +#define FRAME ((unsigned short *)(TTB_BASE_ADDR - LCD_BUFFER_SIZE)) /* Right before TTB */ /* Memory Controllers */ -- cgit v1.2.3