Remote control support added

git-svn-id: svn://svn.rockbox.org/rockbox/trunk@1685 a1c6a512-1295-4272-9138-f99709370657

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 @@
 #ifndef SIMULATOR
 #include "dmalloc.h"
 #include "bmalloc.h"
+#ifndef DEBUG
+#include "serial.h"
+#endif
 #endif
 #include "mpeg.h"
 #include "main_menu.h"
@@ -50,6 +53,7 @@
 #include "unicode.h"
 #endif
 
+
 char appsversion[]=APPSVERSION;
 
 void init(void);
@@ -98,6 +102,8 @@ void init(void)
 
 #ifdef DEBUG
     debug_init();
+#else
+    serial_setup();
 #endif
     set_irq_level(0);
 
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)
 #ifdef HAVE_RECORDER_KEYPAD
             case BUTTON_UP:
             case BUTTON_UP | BUTTON_REPEAT:
+#else
+            case BUTTON_VOL_UP:
+#endif
                 if (keys_locked)
                 {
                     display_keylock_text(keys_locked);
@@ -310,8 +313,12 @@ int wps_show(void)
                 status_draw();
                 break;
 
+#ifdef HAVE_RECORDER_KEYPAD
             case BUTTON_DOWN:
             case BUTTON_DOWN | BUTTON_REPEAT:
+#else
+            case BUTTON_VOL_DOWN:
+#endif
                 if (keys_locked)
                 {
                     display_keylock_text(keys_locked);
@@ -325,7 +332,6 @@ int wps_show(void)
                 mpeg_sound_set(SOUND_VOLUME, global_settings.volume);
                 status_draw();
                 break;
-#endif
 
             case BUTTON_LEFT:
                 if (keys_locked)