From 47b2b579cccc531b50e4e01d757e92fa557b949c Mon Sep 17 00:00:00 2001 From: Rafaël Carré Date: Tue, 18 Aug 2009 04:10:06 +0000 Subject: LCD_DEPTH == 1 : specify if lcd framebuffer is in iram into the model specific config file git-svn-id: svn://svn.rockbox.org/rockbox/trunk@22397 a1c6a512-1295-4272-9138-f99709370657 --- firmware/drivers/lcd-1bit-vert.c | 6 +----- firmware/export/config-clip.h | 2 +- firmware/export/config-ifp7xx.h | 2 ++ firmware/export/config-logikdax.h | 2 ++ firmware/export/config-m200.h | 2 ++ firmware/export/config-m200v4.h | 2 ++ firmware/export/config-mrobe100.h | 2 +- 7 files changed, 11 insertions(+), 7 deletions(-) diff --git a/firmware/drivers/lcd-1bit-vert.c b/firmware/drivers/lcd-1bit-vert.c index db8cc6771b..dd6c7cd354 100644 --- a/firmware/drivers/lcd-1bit-vert.c +++ b/firmware/drivers/lcd-1bit-vert.c @@ -44,11 +44,7 @@ /*** globals ***/ -FBFN(data) LCDFN(framebuffer)[LCDM(FBHEIGHT)][LCDM(FBWIDTH)] -#if CONFIG_CPU != SH7034 - IBSS_ATTR -#endif - ; +FBFN(data) LCDFN(framebuffer)[LCDM(FBHEIGHT)][LCDM(FBWIDTH)] IRAM_LCDFRAMEBUFFER; static struct viewport default_vp = { diff --git a/firmware/export/config-clip.h b/firmware/export/config-clip.h index 57dd6bf374..03f5edd453 100644 --- a/firmware/export/config-clip.h +++ b/firmware/export/config-clip.h @@ -87,7 +87,7 @@ #define MAX_CONTRAST_SETTING 50 #define DEFAULT_CONTRAST_SETTING 30 -#define IRAM_LCDFRAMEBUFFER IDATA_ATTR /* put the lcd frame buffer in IRAM */ +#define IRAM_LCDFRAMEBUFFER IBSS_ATTR /* put the lcd frame buffer in IRAM */ #define CONFIG_KEYPAD SANSA_CLIP_PAD diff --git a/firmware/export/config-ifp7xx.h b/firmware/export/config-ifp7xx.h index 96faf46e91..1c85252eba 100644 --- a/firmware/export/config-ifp7xx.h +++ b/firmware/export/config-ifp7xx.h @@ -128,4 +128,6 @@ #define ICODE_ATTR_ALAC #define IBSS_ATTR_SHORTEN_DECODED0 +#define IRAM_LCDFRAMEBUFFER IBSS_ATTR /* put the lcd frame buffer in IRAM */ + #endif diff --git a/firmware/export/config-logikdax.h b/firmware/export/config-logikdax.h index 800688b01d..54baa95b8b 100644 --- a/firmware/export/config-logikdax.h +++ b/firmware/export/config-logikdax.h @@ -148,4 +148,6 @@ #define ICODE_ATTR_ALAC #define IBSS_ATTR_SHORTEN_DECODED0 +#define IRAM_LCDFRAMEBUFFER IBSS_ATTR /* put the lcd frame buffer in IRAM */ + #endif /* SIMULATOR */ diff --git a/firmware/export/config-m200.h b/firmware/export/config-m200.h index 38d59cbcbe..f9e64e8b14 100644 --- a/firmware/export/config-m200.h +++ b/firmware/export/config-m200.h @@ -134,4 +134,6 @@ #define ICODE_ATTR_ALAC #define IBSS_ATTR_SHORTEN_DECODED0 +#define IRAM_LCDFRAMEBUFFER IBSS_ATTR /* put the lcd frame buffer in IRAM */ + #endif /* SIMULATOR */ diff --git a/firmware/export/config-m200v4.h b/firmware/export/config-m200v4.h index 4044c3d8ef..119bca8fe8 100644 --- a/firmware/export/config-m200v4.h +++ b/firmware/export/config-m200v4.h @@ -171,4 +171,6 @@ #define ICODE_ATTR_ALAC #define IBSS_ATTR_SHORTEN_DECODED0 +#define IRAM_LCDFRAMEBUFFER IBSS_ATTR /* put the lcd frame buffer in IRAM */ + #endif /* SIMULATOR */ diff --git a/firmware/export/config-mrobe100.h b/firmware/export/config-mrobe100.h index 3fcef555d4..84d2ab14e1 100644 --- a/firmware/export/config-mrobe100.h +++ b/firmware/export/config-mrobe100.h @@ -43,7 +43,7 @@ /* define this if you can invert the colours on your LCD */ #define HAVE_LCD_INVERT -/*#define IRAM_LCDFRAMEBUFFER IDATA_ATTR */ /* put the lcd frame buffer in IRAM */ +#define IRAM_LCDFRAMEBUFFER IBSS_ATTR /* put the lcd frame buffer in IRAM */ #ifndef BOOTLOADER /* Define this if you have an remote lcd */ -- cgit v1.2.3