2 files changed, 3 insertions, 42 deletions

diff --git a/apps/plugins/imageviewer/imageviewer_button.h b/apps/plugins/imageviewer/imageviewer_button.h
index dfdd39ffa4..46813d5e69 100644
--- a/apps/plugins/imageviewer/imageviewer_button.h
+++ b/apps/plugins/imageviewer/imageviewer_button.h
@@ -25,31 +25,8 @@
 #include "plugin.h"
 
 /* variable button definitions */
-#if CONFIG_KEYPAD == RECORDER_PAD
-#define IMGVIEW_ZOOM_IN     BUTTON_PLAY
-#define IMGVIEW_ZOOM_OUT    BUTTON_ON
-#define IMGVIEW_UP          BUTTON_UP
-#define IMGVIEW_DOWN        BUTTON_DOWN
-#define IMGVIEW_LEFT        BUTTON_LEFT
-#define IMGVIEW_RIGHT       BUTTON_RIGHT
-#define IMGVIEW_NEXT        BUTTON_F3
-#define IMGVIEW_PREVIOUS    BUTTON_F2
-#define IMGVIEW_MENU        BUTTON_OFF
-
-#elif CONFIG_KEYPAD == ONDIO_PAD
-#define IMGVIEW_ZOOM_PRE    BUTTON_MENU
-#define IMGVIEW_ZOOM_IN     (BUTTON_MENU | BUTTON_REL)
-#define IMGVIEW_ZOOM_OUT    (BUTTON_MENU | BUTTON_DOWN)
-#define IMGVIEW_UP          BUTTON_UP
-#define IMGVIEW_DOWN        BUTTON_DOWN
-#define IMGVIEW_LEFT        BUTTON_LEFT
-#define IMGVIEW_RIGHT       BUTTON_RIGHT
-#define IMGVIEW_NEXT        (BUTTON_MENU | BUTTON_RIGHT)
-#define IMGVIEW_PREVIOUS    (BUTTON_MENU | BUTTON_LEFT)
-#define IMGVIEW_MENU        BUTTON_OFF
-
-#elif (CONFIG_KEYPAD == IRIVER_H100_PAD) || \
-      (CONFIG_KEYPAD == IRIVER_H300_PAD)
+#if (CONFIG_KEYPAD == IRIVER_H100_PAD) || \
+    (CONFIG_KEYPAD == IRIVER_H300_PAD)
 #define IMGVIEW_ZOOM_IN     BUTTON_SELECT
 #define IMGVIEW_ZOOM_OUT    BUTTON_MODE
 #define IMGVIEW_UP          BUTTON_UP
diff --git a/apps/plugins/imageviewer/jpeg/jpeg_decoder.c b/apps/plugins/imageviewer/jpeg/jpeg_decoder.c
index 342b59c6a4..b014fa0ed1 100644
--- a/apps/plugins/imageviewer/jpeg/jpeg_decoder.c
+++ b/apps/plugins/imageviewer/jpeg/jpeg_decoder.c
@@ -39,23 +39,7 @@
 
 INLINE unsigned range_limit(int value)
 {
-#if CONFIG_CPU == SH7034
-    unsigned tmp;
-    asm (  /* Note: Uses knowledge that only low byte of result is used */
-        "mov     #-128,%[t]  \n"
-        "sub     %[t],%[v]   \n"  /* value -= -128; equals value += 128; */
-        "extu.b  %[v],%[t]   \n"
-        "cmp/eq  %[v],%[t]   \n"  /* low byte == whole number ? */
-        "bt      1f          \n"  /* yes: no overflow */
-        "cmp/pz  %[v]        \n"  /* overflow: positive? */
-        "subc    %[v],%[v]   \n"  /* %[r] now either 0 or 0xffffffff */
-    "1:                      \n"
-        : /* outputs */
-        [v]"+r"(value),
-        [t]"=&r"(tmp)
-    );
-    return value;
-#elif defined(CPU_COLDFIRE)
+#if defined(CPU_COLDFIRE)
     asm (  /* Note: Uses knowledge that only the low byte of the result is used */
         "add.l   #128,%[v]   \n"  /* value += 128; */
         "cmp.l   #255,%[v]   \n"  /* overflow? */