diff options
-rw-r--r-- | apps/gui/viewport.h | 14 | ||||
-rw-r--r-- | firmware/export/system.h | 5 | ||||
-rw-r--r-- | tools/checkwps/checkwps.make | 2 |
3 files changed, 14 insertions, 7 deletions
diff --git a/apps/gui/viewport.h b/apps/gui/viewport.h index 3da001e190..ecbd325946 100644 --- a/apps/gui/viewport.h +++ b/apps/gui/viewport.h | |||
@@ -38,19 +38,21 @@ int viewport_get_nb_lines(const struct viewport *vp); | |||
38 | #define THEME_LISTS (BIT_N(3)) | 38 | #define THEME_LISTS (BIT_N(3)) |
39 | #define THEME_ALL (~(0u)) | 39 | #define THEME_ALL (~(0u)) |
40 | 40 | ||
41 | /* These are needed in checkwps */ | ||
42 | void viewport_set_defaults(struct viewport *vp, | ||
43 | const enum screen_type screen); | ||
44 | void viewport_set_fullscreen(struct viewport *vp, | ||
45 | const enum screen_type screen); | ||
46 | int get_viewport_default_colour(enum screen_type screen, bool fgcolour); | ||
47 | |||
41 | #ifndef __PCTOOL__ | 48 | #ifndef __PCTOOL__ |
49 | |||
42 | /* | 50 | /* |
43 | * Initialize the viewportmanager, which in turns initializes the UI vp and | 51 | * Initialize the viewportmanager, which in turns initializes the UI vp and |
44 | * statusbar stuff | 52 | * statusbar stuff |
45 | */ | 53 | */ |
46 | void viewportmanager_init(void) INIT_ATTR; | 54 | void viewportmanager_init(void) INIT_ATTR; |
47 | 55 | ||
48 | void viewport_set_defaults(struct viewport *vp, | ||
49 | const enum screen_type screen); | ||
50 | void viewport_set_fullscreen(struct viewport *vp, | ||
51 | const enum screen_type screen); | ||
52 | int get_viewport_default_colour(enum screen_type screen, bool fgcolour); | ||
53 | |||
54 | #ifdef HAVE_LCD_BITMAP | 56 | #ifdef HAVE_LCD_BITMAP |
55 | void viewportmanager_theme_enable(enum screen_type screen, bool enable, | 57 | void viewportmanager_theme_enable(enum screen_type screen, bool enable, |
56 | struct viewport *viewport); | 58 | struct viewport *viewport); |
diff --git a/firmware/export/system.h b/firmware/export/system.h index f6d441ef2a..0a13ec2208 100644 --- a/firmware/export/system.h +++ b/firmware/export/system.h | |||
@@ -157,7 +157,12 @@ int get_cpu_boost_counter(void); | |||
157 | ((type *)((intptr_t)(memberptr) - OFFSETOF(type, membername))) | 157 | ((type *)((intptr_t)(memberptr) - OFFSETOF(type, membername))) |
158 | 158 | ||
159 | /* returns index of first set bit or 32 if no bits are set */ | 159 | /* returns index of first set bit or 32 if no bits are set */ |
160 | #if defined(CPU_ARM) && ARM_ARCH >= 5 && !defined(__thumb__) | ||
161 | static inline int find_first_set_bit(uint32_t val) | ||
162 | { return LIKELY(val) ? __builtin_ctz(val) : 32; } | ||
163 | #else | ||
160 | int find_first_set_bit(uint32_t val); | 164 | int find_first_set_bit(uint32_t val); |
165 | #endif | ||
161 | 166 | ||
162 | static inline __attribute__((always_inline)) | 167 | static inline __attribute__((always_inline)) |
163 | uint32_t isolate_first_bit(uint32_t val) | 168 | uint32_t isolate_first_bit(uint32_t val) |
diff --git a/tools/checkwps/checkwps.make b/tools/checkwps/checkwps.make index 2ae15903a7..3720637595 100644 --- a/tools/checkwps/checkwps.make +++ b/tools/checkwps/checkwps.make | |||
@@ -7,7 +7,7 @@ | |||
7 | # $Id$ | 7 | # $Id$ |
8 | # | 8 | # |
9 | 9 | ||
10 | GCCOPTS=-g -D__PCTOOL__ -DCHECKWPS $(TARGET) | 10 | GCCOPTS=-std=gnu99 -g -D__PCTOOL__ -DCHECKWPS $(TARGET) |
11 | 11 | ||
12 | CHECKWPS_SRC = $(call preprocess, $(TOOLSDIR)/checkwps/SOURCES) | 12 | CHECKWPS_SRC = $(call preprocess, $(TOOLSDIR)/checkwps/SOURCES) |
13 | CHECKWPS_OBJ = $(call c2obj,$(CHECKWPS_SRC)) | 13 | CHECKWPS_OBJ = $(call c2obj,$(CHECKWPS_SRC)) |