summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorWilliam Wilgus <wilgus.william@gmail.com>2022-04-17 10:36:33 -0400
committerWilliam Wilgus <me.theuser@yahoo.com>2022-04-17 10:59:56 -0400
commitc4156b1909175cd74154fa4217be053c1180ae9c (patch)
tree0511ee767f000a6b9fe0cc9c06503b8a4b28f647
parent6703f43f5cc6c6d2f4983aaafd4bcfd582b133cf (diff)
downloadrockbox-c4156b1909175cd74154fa4217be053c1180ae9c.tar.gz
rockbox-c4156b1909175cd74154fa4217be053c1180ae9c.zip
viewports, set flags to VP_DEFAULT_FLAGS
flags were getting un-initialized memory it really didn't matter with the flags getting initialized anyway But once I added a new flag that didn't explicitly set or clear the flag at init well here we are set flags to VP_DEFAULT_FLAGS in viewport_set_defaults() add the flags variable to the default vp's set to 0 (it was already initialized to 0 by bss, make it explicit) Change-Id: I3a9a062455b4cf66d2b8c70fdf05402a5c0c091c
-rw-r--r--apps/gui/viewport.c2
-rw-r--r--firmware/drivers/lcd-1bit-vert.c1
-rw-r--r--firmware/drivers/lcd-2bit-horz.c1
-rw-r--r--firmware/drivers/lcd-2bit-vert.c1
-rw-r--r--firmware/drivers/lcd-2bit-vi.c1
-rw-r--r--firmware/drivers/lcd-color-common.c1
-rw-r--r--firmware/export/lcd.h2
7 files changed, 8 insertions, 1 deletions
diff --git a/apps/gui/viewport.c b/apps/gui/viewport.c
index 3dd8bca979..9f9cb186f5 100644
--- a/apps/gui/viewport.c
+++ b/apps/gui/viewport.c
@@ -332,7 +332,7 @@ void viewport_set_defaults(struct viewport *vp,
332 const enum screen_type screen) 332 const enum screen_type screen)
333{ 333{
334 vp->buffer = NULL; /* use default frame_buffer */ 334 vp->buffer = NULL; /* use default frame_buffer */
335 335 vp->flags = VP_DEFAULT_FLAGS;
336#if !defined(__PCTOOL__) 336#if !defined(__PCTOOL__)
337 struct viewport *sbs_area = NULL; 337 struct viewport *sbs_area = NULL;
338 if (!is_theme_enabled(screen)) 338 if (!is_theme_enabled(screen))
diff --git a/firmware/drivers/lcd-1bit-vert.c b/firmware/drivers/lcd-1bit-vert.c
index c86ced9b6c..dcf5e49504 100644
--- a/firmware/drivers/lcd-1bit-vert.c
+++ b/firmware/drivers/lcd-1bit-vert.c
@@ -71,6 +71,7 @@ static struct viewport default_vp =
71 .y = 0, 71 .y = 0,
72 .width = LCDM(WIDTH), 72 .width = LCDM(WIDTH),
73 .height = LCDM(HEIGHT), 73 .height = LCDM(HEIGHT),
74 .flags = 0,
74 .font = FONT_SYSFIXED, 75 .font = FONT_SYSFIXED,
75 .drawmode = DRMODE_SOLID, 76 .drawmode = DRMODE_SOLID,
76 .buffer = NULL, 77 .buffer = NULL,
diff --git a/firmware/drivers/lcd-2bit-horz.c b/firmware/drivers/lcd-2bit-horz.c
index b2114ba830..85918a735c 100644
--- a/firmware/drivers/lcd-2bit-horz.c
+++ b/firmware/drivers/lcd-2bit-horz.c
@@ -64,6 +64,7 @@ static struct viewport default_vp =
64 .y = 0, 64 .y = 0,
65 .width = LCD_WIDTH, 65 .width = LCD_WIDTH,
66 .height = LCD_HEIGHT, 66 .height = LCD_HEIGHT,
67 .flags = 0,
67 .font = FONT_SYSFIXED, 68 .font = FONT_SYSFIXED,
68 .drawmode = DRMODE_SOLID, 69 .drawmode = DRMODE_SOLID,
69 .buffer = NULL, 70 .buffer = NULL,
diff --git a/firmware/drivers/lcd-2bit-vert.c b/firmware/drivers/lcd-2bit-vert.c
index 6a476495d0..a059e3b512 100644
--- a/firmware/drivers/lcd-2bit-vert.c
+++ b/firmware/drivers/lcd-2bit-vert.c
@@ -66,6 +66,7 @@ static struct viewport default_vp =
66 .y = 0, 66 .y = 0,
67 .width = LCD_WIDTH, 67 .width = LCD_WIDTH,
68 .height = LCD_HEIGHT, 68 .height = LCD_HEIGHT,
69 .flags = 0,
69 .font = FONT_SYSFIXED, 70 .font = FONT_SYSFIXED,
70 .drawmode = DRMODE_SOLID, 71 .drawmode = DRMODE_SOLID,
71 .buffer = NULL, 72 .buffer = NULL,
diff --git a/firmware/drivers/lcd-2bit-vi.c b/firmware/drivers/lcd-2bit-vi.c
index c09bbce2e0..423f4536d4 100644
--- a/firmware/drivers/lcd-2bit-vi.c
+++ b/firmware/drivers/lcd-2bit-vi.c
@@ -78,6 +78,7 @@ static struct viewport default_vp =
78 .y = 0, 78 .y = 0,
79 .width = LCDM(WIDTH), 79 .width = LCDM(WIDTH),
80 .height = LCDM(HEIGHT), 80 .height = LCDM(HEIGHT),
81 .flags = 0,
81 .font = FONT_SYSFIXED, 82 .font = FONT_SYSFIXED,
82 .drawmode = DRMODE_SOLID, 83 .drawmode = DRMODE_SOLID,
83 .buffer = NULL, 84 .buffer = NULL,
diff --git a/firmware/drivers/lcd-color-common.c b/firmware/drivers/lcd-color-common.c
index 20d8c65e21..a867583d36 100644
--- a/firmware/drivers/lcd-color-common.c
+++ b/firmware/drivers/lcd-color-common.c
@@ -61,6 +61,7 @@ static struct viewport default_vp =
61 .y = 0, 61 .y = 0,
62 .width = LCD_WIDTH, 62 .width = LCD_WIDTH,
63 .height = LCD_HEIGHT, 63 .height = LCD_HEIGHT,
64 .flags = 0,
64 .font = FONT_SYSFIXED, 65 .font = FONT_SYSFIXED,
65 .drawmode = DRMODE_SOLID, 66 .drawmode = DRMODE_SOLID,
66 .buffer = NULL, 67 .buffer = NULL,
diff --git a/firmware/export/lcd.h b/firmware/export/lcd.h
index 2f8fd3e751..0edef7b866 100644
--- a/firmware/export/lcd.h
+++ b/firmware/export/lcd.h
@@ -182,6 +182,8 @@ struct frame_buffer_t {
182#define VP_FLAG_VP_DIRTY 0x4000 182#define VP_FLAG_VP_DIRTY 0x4000
183#define VP_FLAG_CLEAR_FLAG 0x8000 183#define VP_FLAG_CLEAR_FLAG 0x8000
184#define VP_FLAG_VP_SET_CLEAN (VP_FLAG_CLEAR_FLAG | VP_FLAG_VP_DIRTY) 184#define VP_FLAG_VP_SET_CLEAN (VP_FLAG_CLEAR_FLAG | VP_FLAG_VP_DIRTY)
185/* flags set by viewport_set_defaults() */
186#define VP_DEFAULT_FLAGS (VP_FLAG_VP_DIRTY)
185 187
186struct viewport { 188struct viewport {
187 int x; 189 int x;