summaryrefslogtreecommitdiff
path: root/firmware
diff options
context:
space:
mode:
Diffstat (limited to 'firmware')
-rw-r--r--firmware/bidi.c2
-rw-r--r--firmware/font.c2
-rw-r--r--firmware/kernel.c2
-rw-r--r--firmware/sound.c2
4 files changed, 4 insertions, 4 deletions
diff --git a/firmware/bidi.c b/firmware/bidi.c
index e6a4341f79..2f4e137956 100644
--- a/firmware/bidi.c
+++ b/firmware/bidi.c
@@ -159,7 +159,7 @@ unsigned short *bidi_l2v(const unsigned char *str, int orientation)
159#ifdef BOOTLOADER 159#ifdef BOOTLOADER
160 (void)orientation; 160 (void)orientation;
161 return utf16_buf; 161 return utf16_buf;
162 162
163#else /* !BOOTLOADER */ 163#else /* !BOOTLOADER */
164 if (target == utf16_buf) /* empty string */ 164 if (target == utf16_buf) /* empty string */
165 return target; 165 return target;
diff --git a/firmware/font.c b/firmware/font.c
index 858a312ac6..a8734e93a1 100644
--- a/firmware/font.c
+++ b/firmware/font.c
@@ -578,7 +578,7 @@ void font_init(void)
578struct font* font_get(int font) 578struct font* font_get(int font)
579{ 579{
580 (void)font; 580 (void)font;
581 return &sysfont; 581 return &sysfont;
582} 582}
583 583
584/* 584/*
diff --git a/firmware/kernel.c b/firmware/kernel.c
index fbc5a2905c..29907f3082 100644
--- a/firmware/kernel.c
+++ b/firmware/kernel.c
@@ -260,7 +260,7 @@ void sleep(int ticks)
260 switch_thread(); 260 switch_thread();
261#elif defined(CREATIVE_ZVx) && defined(BOOTLOADER) 261#elif defined(CREATIVE_ZVx) && defined(BOOTLOADER)
262 /* hacky.. */ 262 /* hacky.. */
263 long sleep_ticks = current_tick + ticks + 1; 263 long sleep_ticks = current_tick + ticks + 1;
264 while (TIME_BEFORE(current_tick, sleep_ticks)) 264 while (TIME_BEFORE(current_tick, sleep_ticks))
265 switch_thread(); 265 switch_thread();
266#else 266#else
diff --git a/firmware/sound.c b/firmware/sound.c
index 7c97d9b63c..d66a93a70d 100644
--- a/firmware/sound.c
+++ b/firmware/sound.c
@@ -253,7 +253,7 @@ static void set_prescaled_volume(void)
253 || defined(HAVE_AK4537) || defined(HAVE_UDA1341) 253 || defined(HAVE_AK4537) || defined(HAVE_UDA1341)
254 audiohw_set_master_vol(tenthdb2master(l), tenthdb2master(r)); 254 audiohw_set_master_vol(tenthdb2master(l), tenthdb2master(r));
255#if defined(HAVE_WM8975) || defined(HAVE_WM8758) \ 255#if defined(HAVE_WM8975) || defined(HAVE_WM8758) \
256 || (defined(HAVE_WM8751) && !defined(MROBE_100)) || defined(HAVE_WM8985) 256 || (defined(HAVE_WM8751) && !defined(MROBE_100)) || defined(HAVE_WM8985)
257 audiohw_set_lineout_vol(tenthdb2master(0), tenthdb2master(0)); 257 audiohw_set_lineout_vol(tenthdb2master(0), tenthdb2master(0));
258#endif 258#endif
259 259