len0rd/rockbox
1
0
Fork 1
mirror of https://github.com/Rockbox/rockbox.git synced 2025-11-09 21:22:39 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

Revert "lcd framebuffer - Bugfix ensure proper alignment"

Browse source 
This reverts commit ffee661ab7.

Reason for revert: <INSERT REASONING HERE>
iAudio M5  `IRAM' overflowed by 48 bytes

Change-Id: Id808a72c6eacabc562d53eac8acd36b45f678a97
This commit is contained in:
William Wilgus 2021-03-24 18:44:35 +00:00
parent ffee661ab7
commit ed99b305a9
5 changed files with 12 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

5
firmware/drivers/lcd-1bit-vert.c
View file

@ -73,10 +73,10 @@ static struct viewport default_vp =
.height = LCDM(HEIGHT), .height = LCDM(HEIGHT),
.font = FONT_SYSFIXED, .font = FONT_SYSFIXED,
.drawmode = DRMODE_SOLID, .drawmode = DRMODE_SOLID,
.buffer = &LCDFN(framebuffer_default), .buffer = NULL,
}; };
struct viewport* CURRENT_VP MEM_ALIGN_ATTR = NULL; struct viewport* CURRENT_VP;
static void *LCDFN(frameaddress_default)(int x, int y) static void *LCDFN(frameaddress_default)(int x, int y)
{ {
@ -94,6 +94,7 @@ static void *LCDFN(frameaddress_default)(int x, int y)
/* LCD init */ /* LCD init */
void LCDFN(init)(void) void LCDFN(init)(void)
{ {
/* Initialize the viewport */ /* Initialize the viewport */
LCDFN(set_viewport)(NULL); LCDFN(set_viewport)(NULL);
LCDFN(clear_display)(); LCDFN(clear_display)();

5
firmware/drivers/lcd-2bit-horz.c
View file

@ -66,12 +66,12 @@ static struct viewport default_vp =
.height = LCD_HEIGHT, .height = LCD_HEIGHT,
.font = FONT_SYSFIXED, .font = FONT_SYSFIXED,
.drawmode = DRMODE_SOLID, .drawmode = DRMODE_SOLID,
.buffer = &lcd_framebuffer_default, .buffer = NULL,
.fg_pattern = LCD_DEFAULT_FG, .fg_pattern = LCD_DEFAULT_FG,
.bg_pattern = LCD_DEFAULT_BG .bg_pattern = LCD_DEFAULT_BG
}; };
struct viewport* lcd_current_viewport IBSS_ATTR MEM_ALIGN_ATTR = NULL; struct viewport* lcd_current_viewport IBSS_ATTR;
static unsigned fg_pattern IBSS_ATTR; static unsigned fg_pattern IBSS_ATTR;
static unsigned bg_pattern IBSS_ATTR; static unsigned bg_pattern IBSS_ATTR;
@ -93,6 +93,7 @@ void lcd_init(void)
{ {
/* Initialize the viewport */ /* Initialize the viewport */
lcd_set_viewport(NULL); lcd_set_viewport(NULL);
lcd_clear_display(); lcd_clear_display();
/* Call device specific init */ /* Call device specific init */
lcd_init_device(); lcd_init_device();

4
firmware/drivers/lcd-2bit-vert.c
View file

@ -68,12 +68,12 @@ static struct viewport default_vp =
.height = LCD_HEIGHT, .height = LCD_HEIGHT,
.font = FONT_SYSFIXED, .font = FONT_SYSFIXED,
.drawmode = DRMODE_SOLID, .drawmode = DRMODE_SOLID,
.buffer = &lcd_framebuffer_default, .buffer = NULL,
.fg_pattern = LCD_DEFAULT_FG, .fg_pattern = LCD_DEFAULT_FG,
.bg_pattern = LCD_DEFAULT_BG .bg_pattern = LCD_DEFAULT_BG
}; };
struct viewport* lcd_current_viewport IBSS_ATTR MEM_ALIGN_ATTR = NULL; struct viewport* lcd_current_viewport IBSS_ATTR;
static unsigned fg_pattern IBSS_ATTR; static unsigned fg_pattern IBSS_ATTR;
static unsigned bg_pattern IBSS_ATTR; static unsigned bg_pattern IBSS_ATTR;

4
firmware/drivers/lcd-2bit-vi.c
View file

@ -80,12 +80,12 @@ static struct viewport default_vp =
.height = LCDM(HEIGHT), .height = LCDM(HEIGHT),
.font = FONT_SYSFIXED, .font = FONT_SYSFIXED,
.drawmode = DRMODE_SOLID, .drawmode = DRMODE_SOLID,
.buffer = &LCDFN(framebuffer_default), .buffer = NULL,
.fg_pattern = LCDM(DEFAULT_FG), .fg_pattern = LCDM(DEFAULT_FG),
.bg_pattern = LCDM(DEFAULT_BG) .bg_pattern = LCDM(DEFAULT_BG)
}; };
struct viewport * CURRENT_VP IBSS_ATTR MEM_ALIGN_ATTR = NULL; struct viewport * CURRENT_VP IBSS_ATTR;
static unsigned fg_pattern IBSS_ATTR; static unsigned fg_pattern IBSS_ATTR;
static unsigned bg_pattern IBSS_ATTR; static unsigned bg_pattern IBSS_ATTR;

4
firmware/drivers/lcd-color-common.c
View file

@ -63,12 +63,12 @@ static struct viewport default_vp =
.height = LCD_HEIGHT, .height = LCD_HEIGHT,
.font = FONT_SYSFIXED, .font = FONT_SYSFIXED,
.drawmode = DRMODE_SOLID, .drawmode = DRMODE_SOLID,
.buffer = &lcd_framebuffer_default, .buffer = NULL,
.fg_pattern = LCD_DEFAULT_FG, .fg_pattern = LCD_DEFAULT_FG,
.bg_pattern = LCD_DEFAULT_BG, .bg_pattern = LCD_DEFAULT_BG,
}; };
struct viewport* lcd_current_viewport IDATA_ATTR MEM_ALIGN_ATTR = NULL; struct viewport* lcd_current_viewport IDATA_ATTR;
static void *lcd_frameaddress_default(int x, int y) static void *lcd_frameaddress_default(int x, int y)
{ {