diff options
Diffstat (limited to 'firmware/drivers')
-rw-r--r-- | firmware/drivers/lcd-1bit-vert.c | 5 | ||||
-rw-r--r-- | firmware/drivers/lcd-2bit-horz.c | 5 | ||||
-rw-r--r-- | firmware/drivers/lcd-2bit-vert.c | 4 | ||||
-rw-r--r-- | firmware/drivers/lcd-2bit-vi.c | 4 | ||||
-rw-r--r-- | firmware/drivers/lcd-color-common.c | 4 |
5 files changed, 10 insertions, 12 deletions
diff --git a/firmware/drivers/lcd-1bit-vert.c b/firmware/drivers/lcd-1bit-vert.c index c86ced9b6c..8bdc0c6d8e 100644 --- a/firmware/drivers/lcd-1bit-vert.c +++ b/firmware/drivers/lcd-1bit-vert.c | |||
@@ -73,10 +73,10 @@ static struct viewport default_vp = | |||
73 | .height = LCDM(HEIGHT), | 73 | .height = LCDM(HEIGHT), |
74 | .font = FONT_SYSFIXED, | 74 | .font = FONT_SYSFIXED, |
75 | .drawmode = DRMODE_SOLID, | 75 | .drawmode = DRMODE_SOLID, |
76 | .buffer = NULL, | 76 | .buffer = &LCDFN(framebuffer_default), |
77 | }; | 77 | }; |
78 | 78 | ||
79 | struct viewport* CURRENT_VP; | 79 | struct viewport* CURRENT_VP MEM_ALIGN_ATTR = NULL; |
80 | 80 | ||
81 | static void *LCDFN(frameaddress_default)(int x, int y) | 81 | static void *LCDFN(frameaddress_default)(int x, int y) |
82 | { | 82 | { |
@@ -94,7 +94,6 @@ static void *LCDFN(frameaddress_default)(int x, int y) | |||
94 | /* LCD init */ | 94 | /* LCD init */ |
95 | void LCDFN(init)(void) | 95 | void LCDFN(init)(void) |
96 | { | 96 | { |
97 | |||
98 | /* Initialize the viewport */ | 97 | /* Initialize the viewport */ |
99 | LCDFN(set_viewport)(NULL); | 98 | LCDFN(set_viewport)(NULL); |
100 | LCDFN(clear_display)(); | 99 | LCDFN(clear_display)(); |
diff --git a/firmware/drivers/lcd-2bit-horz.c b/firmware/drivers/lcd-2bit-horz.c index b2114ba830..a96ee51036 100644 --- a/firmware/drivers/lcd-2bit-horz.c +++ b/firmware/drivers/lcd-2bit-horz.c | |||
@@ -66,12 +66,12 @@ static struct viewport default_vp = | |||
66 | .height = LCD_HEIGHT, | 66 | .height = LCD_HEIGHT, |
67 | .font = FONT_SYSFIXED, | 67 | .font = FONT_SYSFIXED, |
68 | .drawmode = DRMODE_SOLID, | 68 | .drawmode = DRMODE_SOLID, |
69 | .buffer = NULL, | 69 | .buffer = &lcd_framebuffer_default, |
70 | .fg_pattern = LCD_DEFAULT_FG, | 70 | .fg_pattern = LCD_DEFAULT_FG, |
71 | .bg_pattern = LCD_DEFAULT_BG | 71 | .bg_pattern = LCD_DEFAULT_BG |
72 | }; | 72 | }; |
73 | 73 | ||
74 | struct viewport* lcd_current_viewport IBSS_ATTR; | 74 | struct viewport* lcd_current_viewport IBSS_ATTR MEM_ALIGN_ATTR = NULL; |
75 | static unsigned fg_pattern IBSS_ATTR; | 75 | static unsigned fg_pattern IBSS_ATTR; |
76 | static unsigned bg_pattern IBSS_ATTR; | 76 | static unsigned bg_pattern IBSS_ATTR; |
77 | 77 | ||
@@ -93,7 +93,6 @@ void lcd_init(void) | |||
93 | { | 93 | { |
94 | /* Initialize the viewport */ | 94 | /* Initialize the viewport */ |
95 | lcd_set_viewport(NULL); | 95 | lcd_set_viewport(NULL); |
96 | |||
97 | lcd_clear_display(); | 96 | lcd_clear_display(); |
98 | /* Call device specific init */ | 97 | /* Call device specific init */ |
99 | lcd_init_device(); | 98 | lcd_init_device(); |
diff --git a/firmware/drivers/lcd-2bit-vert.c b/firmware/drivers/lcd-2bit-vert.c index 6a476495d0..dbd0eac3b6 100644 --- a/firmware/drivers/lcd-2bit-vert.c +++ b/firmware/drivers/lcd-2bit-vert.c | |||
@@ -68,12 +68,12 @@ static struct viewport default_vp = | |||
68 | .height = LCD_HEIGHT, | 68 | .height = LCD_HEIGHT, |
69 | .font = FONT_SYSFIXED, | 69 | .font = FONT_SYSFIXED, |
70 | .drawmode = DRMODE_SOLID, | 70 | .drawmode = DRMODE_SOLID, |
71 | .buffer = NULL, | 71 | .buffer = &lcd_framebuffer_default, |
72 | .fg_pattern = LCD_DEFAULT_FG, | 72 | .fg_pattern = LCD_DEFAULT_FG, |
73 | .bg_pattern = LCD_DEFAULT_BG | 73 | .bg_pattern = LCD_DEFAULT_BG |
74 | }; | 74 | }; |
75 | 75 | ||
76 | struct viewport* lcd_current_viewport IBSS_ATTR; | 76 | struct viewport* lcd_current_viewport IBSS_ATTR MEM_ALIGN_ATTR = NULL; |
77 | static unsigned fg_pattern IBSS_ATTR; | 77 | static unsigned fg_pattern IBSS_ATTR; |
78 | static unsigned bg_pattern IBSS_ATTR; | 78 | static unsigned bg_pattern IBSS_ATTR; |
79 | 79 | ||
diff --git a/firmware/drivers/lcd-2bit-vi.c b/firmware/drivers/lcd-2bit-vi.c index c09bbce2e0..5482777afd 100644 --- a/firmware/drivers/lcd-2bit-vi.c +++ b/firmware/drivers/lcd-2bit-vi.c | |||
@@ -80,12 +80,12 @@ static struct viewport default_vp = | |||
80 | .height = LCDM(HEIGHT), | 80 | .height = LCDM(HEIGHT), |
81 | .font = FONT_SYSFIXED, | 81 | .font = FONT_SYSFIXED, |
82 | .drawmode = DRMODE_SOLID, | 82 | .drawmode = DRMODE_SOLID, |
83 | .buffer = NULL, | 83 | .buffer = &LCDFN(framebuffer_default), |
84 | .fg_pattern = LCDM(DEFAULT_FG), | 84 | .fg_pattern = LCDM(DEFAULT_FG), |
85 | .bg_pattern = LCDM(DEFAULT_BG) | 85 | .bg_pattern = LCDM(DEFAULT_BG) |
86 | }; | 86 | }; |
87 | 87 | ||
88 | struct viewport * CURRENT_VP IBSS_ATTR; | 88 | struct viewport * CURRENT_VP IBSS_ATTR MEM_ALIGN_ATTR = NULL; |
89 | 89 | ||
90 | static unsigned fg_pattern IBSS_ATTR; | 90 | static unsigned fg_pattern IBSS_ATTR; |
91 | static unsigned bg_pattern IBSS_ATTR; | 91 | static unsigned bg_pattern IBSS_ATTR; |
diff --git a/firmware/drivers/lcd-color-common.c b/firmware/drivers/lcd-color-common.c index 935f4e59dd..de72863bea 100644 --- a/firmware/drivers/lcd-color-common.c +++ b/firmware/drivers/lcd-color-common.c | |||
@@ -63,12 +63,12 @@ static struct viewport default_vp = | |||
63 | .height = LCD_HEIGHT, | 63 | .height = LCD_HEIGHT, |
64 | .font = FONT_SYSFIXED, | 64 | .font = FONT_SYSFIXED, |
65 | .drawmode = DRMODE_SOLID, | 65 | .drawmode = DRMODE_SOLID, |
66 | .buffer = NULL, | 66 | .buffer = &lcd_framebuffer_default, |
67 | .fg_pattern = LCD_DEFAULT_FG, | 67 | .fg_pattern = LCD_DEFAULT_FG, |
68 | .bg_pattern = LCD_DEFAULT_BG, | 68 | .bg_pattern = LCD_DEFAULT_BG, |
69 | }; | 69 | }; |
70 | 70 | ||
71 | struct viewport* lcd_current_viewport IDATA_ATTR; | 71 | struct viewport* lcd_current_viewport IDATA_ATTR MEM_ALIGN_ATTR = NULL; |
72 | 72 | ||
73 | static void *lcd_frameaddress_default(int x, int y) | 73 | static void *lcd_frameaddress_default(int x, int y) |
74 | { | 74 | { |