diff options
Diffstat (limited to 'apps')
-rw-r--r-- | apps/main.c | 6 | ||||
-rw-r--r-- | apps/wps.c | 8 |
2 files changed, 13 insertions, 1 deletions
diff --git a/apps/main.c b/apps/main.c index 887c85b64e..307dd71e3d 100644 --- a/apps/main.c +++ b/apps/main.c | |||
@@ -36,6 +36,9 @@ | |||
36 | #ifndef SIMULATOR | 36 | #ifndef SIMULATOR |
37 | #include "dmalloc.h" | 37 | #include "dmalloc.h" |
38 | #include "bmalloc.h" | 38 | #include "bmalloc.h" |
39 | #ifndef DEBUG | ||
40 | #include "serial.h" | ||
41 | #endif | ||
39 | #endif | 42 | #endif |
40 | #include "mpeg.h" | 43 | #include "mpeg.h" |
41 | #include "main_menu.h" | 44 | #include "main_menu.h" |
@@ -50,6 +53,7 @@ | |||
50 | #include "unicode.h" | 53 | #include "unicode.h" |
51 | #endif | 54 | #endif |
52 | 55 | ||
56 | |||
53 | char appsversion[]=APPSVERSION; | 57 | char appsversion[]=APPSVERSION; |
54 | 58 | ||
55 | void init(void); | 59 | void init(void); |
@@ -98,6 +102,8 @@ void init(void) | |||
98 | 102 | ||
99 | #ifdef DEBUG | 103 | #ifdef DEBUG |
100 | debug_init(); | 104 | debug_init(); |
105 | #else | ||
106 | serial_setup(); | ||
101 | #endif | 107 | #endif |
102 | set_irq_level(0); | 108 | set_irq_level(0); |
103 | 109 | ||
diff --git a/apps/wps.c b/apps/wps.c index 4de87383d3..3137a265a9 100644 --- a/apps/wps.c +++ b/apps/wps.c | |||
@@ -296,6 +296,9 @@ int wps_show(void) | |||
296 | #ifdef HAVE_RECORDER_KEYPAD | 296 | #ifdef HAVE_RECORDER_KEYPAD |
297 | case BUTTON_UP: | 297 | case BUTTON_UP: |
298 | case BUTTON_UP | BUTTON_REPEAT: | 298 | case BUTTON_UP | BUTTON_REPEAT: |
299 | #else | ||
300 | case BUTTON_VOL_UP: | ||
301 | #endif | ||
299 | if (keys_locked) | 302 | if (keys_locked) |
300 | { | 303 | { |
301 | display_keylock_text(keys_locked); | 304 | display_keylock_text(keys_locked); |
@@ -310,8 +313,12 @@ int wps_show(void) | |||
310 | status_draw(); | 313 | status_draw(); |
311 | break; | 314 | break; |
312 | 315 | ||
316 | #ifdef HAVE_RECORDER_KEYPAD | ||
313 | case BUTTON_DOWN: | 317 | case BUTTON_DOWN: |
314 | case BUTTON_DOWN | BUTTON_REPEAT: | 318 | case BUTTON_DOWN | BUTTON_REPEAT: |
319 | #else | ||
320 | case BUTTON_VOL_DOWN: | ||
321 | #endif | ||
315 | if (keys_locked) | 322 | if (keys_locked) |
316 | { | 323 | { |
317 | display_keylock_text(keys_locked); | 324 | display_keylock_text(keys_locked); |
@@ -325,7 +332,6 @@ int wps_show(void) | |||
325 | mpeg_sound_set(SOUND_VOLUME, global_settings.volume); | 332 | mpeg_sound_set(SOUND_VOLUME, global_settings.volume); |
326 | status_draw(); | 333 | status_draw(); |
327 | break; | 334 | break; |
328 | #endif | ||
329 | 335 | ||
330 | case BUTTON_LEFT: | 336 | case BUTTON_LEFT: |
331 | if (keys_locked) | 337 | if (keys_locked) |