--- ../../rockbox/firmware/target/hosted/android/app/button-application.c	2011-01-24 02:41:27.000000000 -0600
+++ ../../rockbox.mod/firmware/target/hosted/android/app/button-application.c	2011-01-25 22:05:11.000000000 -0600
@@ -39,15 +39,6 @@
             return BUTTON_MENU;
         case KEYCODE_DPAD_CENTER:
             return BUTTON_DPAD_CENTER;
-        default:
-            return BUTTON_NONE;
-    }
-}
-
-unsigned multimedia_to_button(int keyboard_key)
-{
-    switch (keyboard_key)
-    {
         case KEYCODE_MEDIA_PLAY_PAUSE:
             return BUTTON_MULTIMEDIA_PLAYPAUSE;
         case KEYCODE_MEDIA_STOP:
@@ -60,27 +51,14 @@
             return BUTTON_MULTIMEDIA_REW;
         case KEYCODE_MEDIA_FAST_FORWARD:
             return BUTTON_MULTIMEDIA_FFWD;
-        default:
-            return 0;
-    }
-}
-
-unsigned dpad_to_button(int keyboard_key)
-{
-    switch (keyboard_key)
-    {
-        /* These buttons only post a single release event.
-         * doing otherwise will cause action.c to lock up waiting for
-         * a release (because android sends press/unpress to us too quickly
-         */
         case KEYCODE_DPAD_UP:
-            return BUTTON_DPAD_UP|BUTTON_REL;
+            return BUTTON_DPAD_UP;
         case KEYCODE_DPAD_DOWN:
-            return BUTTON_DPAD_DOWN|BUTTON_REL;
+            return BUTTON_DPAD_DOWN;
         case KEYCODE_DPAD_LEFT:
-            return BUTTON_DPAD_LEFT|BUTTON_REL;
+            return BUTTON_DPAD_LEFT;
         case KEYCODE_DPAD_RIGHT:
-            return BUTTON_DPAD_RIGHT|BUTTON_REL;
+            return BUTTON_DPAD_RIGHT;
         default:
             return BUTTON_NONE;
     }