summaryrefslogtreecommitdiff
path: root/firmware/drivers
diff options
context:
space:
mode:
authorWilliam Wilgus <me.theuser@yahoo.com>2021-03-24 18:44:35 +0000
committerWilliam Wilgus <me.theuser@yahoo.com>2021-03-24 18:44:35 +0000
commited99b305a9bf83609452a7703a60e4c73b065f73 (patch)
tree644ddc9801a3ba0c63b57cc76d71e05381997acf /firmware/drivers
parentffee661ab70e9622a05c9c2f24ecf474dad8f042 (diff)
Revert "lcd framebuffer - Bugfix ensure proper alignment"
This reverts commit ffee661ab70e9622a05c9c2f24ecf474dad8f042. Reason for revert: <INSERT REASONING HERE> iAudio M5 `IRAM' overflowed by 48 bytes Change-Id: Id808a72c6eacabc562d53eac8acd36b45f678a97
Diffstat (limited to 'firmware/drivers')
-rw-r--r--firmware/drivers/lcd-1bit-vert.c5
-rw-r--r--firmware/drivers/lcd-2bit-horz.c5
-rw-r--r--firmware/drivers/lcd-2bit-vert.c4
-rw-r--r--firmware/drivers/lcd-2bit-vi.c4
-rw-r--r--firmware/drivers/lcd-color-common.c4
5 files changed, 12 insertions, 10 deletions
diff --git a/firmware/drivers/lcd-1bit-vert.c b/firmware/drivers/lcd-1bit-vert.c
index 8bdc0c6d8e..c86ced9b6c 100644
--- a/firmware/drivers/lcd-1bit-vert.c
+++ b/firmware/drivers/lcd-1bit-vert.c
@@ -73,10 +73,10 @@ static struct viewport default_vp =
.height = LCDM(HEIGHT),
.font = FONT_SYSFIXED,
.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)
{
@@ -94,6 +94,7 @@ static void *LCDFN(frameaddress_default)(int x, int y)
/* LCD init */
void LCDFN(init)(void)
{
+
/* Initialize the viewport */
LCDFN(set_viewport)(NULL);
LCDFN(clear_display)();
diff --git a/firmware/drivers/lcd-2bit-horz.c b/firmware/drivers/lcd-2bit-horz.c
index a96ee51036..b2114ba830 100644
--- a/firmware/drivers/lcd-2bit-horz.c
+++ b/firmware/drivers/lcd-2bit-horz.c
@@ -66,12 +66,12 @@ static struct viewport default_vp =
.height = LCD_HEIGHT,
.font = FONT_SYSFIXED,
.drawmode = DRMODE_SOLID,
- .buffer = &lcd_framebuffer_default,
+ .buffer = NULL,
.fg_pattern = LCD_DEFAULT_FG,
.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 bg_pattern IBSS_ATTR;
@@ -93,6 +93,7 @@ void lcd_init(void)
{
/* Initialize the viewport */
lcd_set_viewport(NULL);
+
lcd_clear_display();
/* Call device specific init */
lcd_init_device();
diff --git a/firmware/drivers/lcd-2bit-vert.c b/firmware/drivers/lcd-2bit-vert.c
index dbd0eac3b6..6a476495d0 100644
--- a/firmware/drivers/lcd-2bit-vert.c
+++ b/firmware/drivers/lcd-2bit-vert.c
@@ -68,12 +68,12 @@ static struct viewport default_vp =
.height = LCD_HEIGHT,
.font = FONT_SYSFIXED,
.drawmode = DRMODE_SOLID,
- .buffer = &lcd_framebuffer_default,
+ .buffer = NULL,
.fg_pattern = LCD_DEFAULT_FG,
.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 bg_pattern IBSS_ATTR;
diff --git a/firmware/drivers/lcd-2bit-vi.c b/firmware/drivers/lcd-2bit-vi.c
index 5482777afd..c09bbce2e0 100644
--- a/firmware/drivers/lcd-2bit-vi.c
+++ b/firmware/drivers/lcd-2bit-vi.c
@@ -80,12 +80,12 @@ static struct viewport default_vp =
.height = LCDM(HEIGHT),
.font = FONT_SYSFIXED,
.drawmode = DRMODE_SOLID,
- .buffer = &LCDFN(framebuffer_default),
+ .buffer = NULL,
.fg_pattern = LCDM(DEFAULT_FG),
.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 bg_pattern IBSS_ATTR;
diff --git a/firmware/drivers/lcd-color-common.c b/firmware/drivers/lcd-color-common.c
index de72863bea..935f4e59dd 100644
--- a/firmware/drivers/lcd-color-common.c
+++ b/firmware/drivers/lcd-color-common.c
@@ -63,12 +63,12 @@ static struct viewport default_vp =
.height = LCD_HEIGHT,
.font = FONT_SYSFIXED,
.drawmode = DRMODE_SOLID,
- .buffer = &lcd_framebuffer_default,
+ .buffer = NULL,
.fg_pattern = LCD_DEFAULT_FG,
.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)
{