26 files changed, 184 insertions, 11 deletions

diff --git a/apps/plugins/SOURCES b/apps/plugins/SOURCES
index 1948cf663e..021f45674f 100644
--- a/apps/plugins/SOURCES
+++ b/apps/plugins/SOURCES
@@ -32,10 +32,15 @@ snake.c
 snake2.c
 snow.c
 sokoban.c
+#ifndef CONFIG_KEYPAD != IRIVER_H100_PAD
+/* just because it isn't fixed yet to deal with this keymap */
 solitaire.c
+#endif
 splitedit.c
 star.c
+#if CONFIG_LCD == LCD_SSD1815
 video.c
+#endif
 vu_meter.c
 
 #ifdef HAVE_RTC /* Recorder models only */
diff --git a/apps/plugins/alpine_cdc.c b/apps/plugins/alpine_cdc.c
index dacc4a7dae..742e0bc6f5 100644
--- a/apps/plugins/alpine_cdc.c
+++ b/apps/plugins/alpine_cdc.c
@@ -30,6 +30,8 @@
  *
  ****************************************************************************/
 
+#include "plugin.h"
+
 /* Only build for (correct) target */
 #if !defined(SIMULATOR) && CONFIG_CPU==SH7034 && !defined(HAVE_MMC)
 
@@ -43,7 +45,6 @@
 
 /****************** imports ******************/
 
-#include "plugin.h"
 #include "sh7034.h"
 #include "system.h"
 
diff --git a/apps/plugins/bounce.c b/apps/plugins/bounce.c
index ee89cd19e5..e7fc7dedd1 100644
--- a/apps/plugins/bounce.c
+++ b/apps/plugins/bounce.c
@@ -39,6 +39,9 @@
 #define BOUNCE_QUIT (BUTTON_OFF | BUTTON_REL)
 #define BOUNCE_MODE (BUTTON_MENU | BUTTON_REL)
 
+#elif CONFIG_KEYPAD == IRIVER_H100_PAD
+#define BOUNCE_QUIT (BUTTON_OFF | BUTTON_REL)
+#define BOUNCE_MODE (BUTTON_SELECT | BUTTON_REL)
 #endif
 
 static struct plugin_api* rb;
diff --git a/apps/plugins/calculator.c b/apps/plugins/calculator.c
index 193ac8a7ce..a8349f4c06 100644
--- a/apps/plugins/calculator.c
+++ b/apps/plugins/calculator.c
@@ -118,6 +118,12 @@ F3: equal to "="
 #define CALCULATOR_INPUT (BUTTON_MENU | BUTTON_REL)
 #define CALCULATOR_CALC (BUTTON_MENU | BUTTON_REPEAT)
 
+#elif CONFIG_KEYPAD == IRIVER_H100_PAD
+#define CALCULATOR_QUIT BUTTON_OFF
+#define CALCULATOR_INPUT_CALC_PRE BUTTON_SELECT
+#define CALCULATOR_INPUT (BUTTON_ON | BUTTON_REL)
+#define CALCULATOR_CALC (BUTTON_ON | BUTTON_REPEAT)
+
 #endif
 
 static struct plugin_api* rb;
diff --git a/apps/plugins/chip8.c b/apps/plugins/chip8.c
index aa81b263dc..0830279671 100644
--- a/apps/plugins/chip8.c
+++ b/apps/plugins/chip8.c
@@ -42,6 +42,13 @@
 #define CHIP8_KEY6 BUTTON_RIGHT
 #define CHIP8_KEY8 BUTTON_DOWN
 
+#elif CONFIG_KEYPAD == IRIVER_H100_PAD
+#define CHIP8_KEY2 BUTTON_UP
+#define CHIP8_KEY4 BUTTON_LEFT
+#define CHIP8_KEY5 BUTTON_SELECT
+#define CHIP8_KEY6 BUTTON_RIGHT
+#define CHIP8_KEY8 BUTTON_DOWN
+
 #endif
 
 static struct plugin_api* rb; /* here is a global api struct pointer */
diff --git a/apps/plugins/cube.c b/apps/plugins/cube.c
index b0c6daa656..e17dcb752a 100644
--- a/apps/plugins/cube.c
+++ b/apps/plugins/cube.c
@@ -46,6 +46,17 @@
 #define CUBE_HIGHSPEED_PRE BUTTON_MENU
 #define CUBE_HIGHSPEED (BUTTON_MENU | BUTTON_REL)
 
+#elif CONFIG_KEYPAD == IRIVER_H100_PAD
+#define CUBE_QUIT (BUTTON_OFF | BUTTON_REL)
+#define CUBE_X_INC BUTTON_RIGHT
+#define CUBE_X_DEC BUTTON_LEFT
+#define CUBE_Y_INC BUTTON_UP
+#define CUBE_Y_DEC BUTTON_DOWN
+#define CUBE_Z_INC (BUTTON_ON | BUTTON_UP)
+#define CUBE_Z_DEC (BUTTON_ON | BUTTON_DOWN)
+#define CUBE_HIGHSPEED_PRE BUTTON_SELECT
+#define CUBE_HIGHSPEED (BUTTON_SELECT | BUTTON_REL)
+
 #endif
 
 struct point_3D {
diff --git a/apps/plugins/flipit.c b/apps/plugins/flipit.c
index 02867d9d8b..bcd705c16c 100644
--- a/apps/plugins/flipit.c
+++ b/apps/plugins/flipit.c
@@ -35,6 +35,14 @@
 #define FLIPIT_TOGGLE_PRE BUTTON_MENU
 #define FLIPIT_TOGGLE (BUTTON_MENU | BUTTON_REL)
 
+#elif CONFIG_KEYPAD == IRIVER_H100_PAD
+#define FLIPIT_QUIT BUTTON_OFF
+#define FLIPIT_SHUFFLE BUTTON_SELECT
+#define FLIPIT_SOLVE BUTTON_ON
+#define FLIPIT_STEP_BY_STEP BUTTON_REC
+#define FLIPIT_TOGGLE_PRE BUTTON_MODE
+#define FLIPIT_TOGGLE (BUTTON_MODE | BUTTON_REL)
+
 #endif
 
 static struct plugin_api* rb;
diff --git a/apps/plugins/grayscale.c b/apps/plugins/grayscale.c
index ebfc7f59c0..196545c0e7 100644
--- a/apps/plugins/grayscale.c
+++ b/apps/plugins/grayscale.c
@@ -22,7 +22,7 @@
 #ifndef SIMULATOR /* not for simulator by now */
 #include "plugin.h"
 
-#ifdef HAVE_LCD_BITMAP /* and also not for the Player */
+#if CONFIG_LCD == LCD_SSD1815 /* only for Recorder/Ondio displays */
 #include "gray.h"
 
 /* variable button definitions */
diff --git a/apps/plugins/jpeg.c b/apps/plugins/jpeg.c
index d760812b86..f705271240 100644
--- a/apps/plugins/jpeg.c
+++ b/apps/plugins/jpeg.c
@@ -26,7 +26,15 @@
 #ifndef SIMULATOR /* not for simulator by now */
 #include "plugin.h"
 
-#ifdef HAVE_LCD_BITMAP /* and also not for the Player */
+#if CONFIG_LCD == LCD_SSD1815 /* only for Recorder/Ondio displays */
+/*
+  FIX:
+
+  This would be a lot nicer if it depended on HAVE_LCD_BITMAP only, but we
+  need to fix the grayscale lib for Gmini and iRiver. Either with true
+  grayscale or 1bit.
+
+*/
 #include "gray.h"
 
 /* variable button definitions */
@@ -39,6 +47,10 @@
 #define JPEG_ZOOM_IN (BUTTON_MENU | BUTTON_REL)
 #define JPEG_ZOOM_OUT (BUTTON_MENU | BUTTON_REPEAT)
 
+#elif CONFIG_KEYPAD == IRIVER_H100_PAD
+#define JPEG_ZOOM_IN BUTTON_ON
+#define JPEG_ZOOM_OUT BUTTON_SELECT
+
 #endif
 
 /******************************* Globals ***********************************/
diff --git a/apps/plugins/mandelbrot.c b/apps/plugins/mandelbrot.c
index 2e9cb97eec..bb96b9b71c 100644
--- a/apps/plugins/mandelbrot.c
+++ b/apps/plugins/mandelbrot.c
@@ -20,8 +20,17 @@
 #ifndef SIMULATOR 
 #include "plugin.h"
 
-#ifdef HAVE_LCD_BITMAP // this is not fun on the player
-# include "gray.h"
+#if CONFIG_LCD == LCD_SSD1815 /* only for Recorder/Ondio displays */
+/*
+  FIX:
+
+  This would be a lot nicer if it depended on HAVE_LCD_BITMAP only, but we
+  need to fix the grayscale lib for Gmini and iRiver. Either with true
+  grayscale or 1bit.
+
+*/
+
+#include "gray.h"
 
 /* variable button definitions */
 #if CONFIG_KEYPAD == RECORDER_PAD
@@ -42,6 +51,13 @@
 #define MANDELBROT_MAXITER_DEC (BUTTON_MENU | BUTTON_LEFT)
 #define MANDELBROT_RESET (BUTTON_MENU | BUTTON_OFF)
 
+#elif CONFIG_KEYPAD == IRIVER_H100_PAD
+#define MANDELBROT_QUIT BUTTON_OFF
+#define MANDELBROT_ZOOM_IN BUTTON_ON
+#define MANDELBROT_ZOOM_OUT BUTTON_SELECT
+#define MANDELBROT_MAXITER_INC (BUTTON_MODE | BUTTON_RIGHT)
+#define MANDELBROT_MAXITER_DEC (BUTTON_MODE | BUTTON_LEFT)
+#define MANDELBROT_RESET (BUTTON_MODE | BUTTON_SELECT)
 #endif
 
 static struct plugin_api* rb;
diff --git a/apps/plugins/minesweeper.c b/apps/plugins/minesweeper.c
index b6636bbfb7..fb997ac819 100644
--- a/apps/plugins/minesweeper.c
+++ b/apps/plugins/minesweeper.c
@@ -57,6 +57,15 @@ use F3 to see how many mines are left (supposing all your flags are correct)
 #define MINESWP_DISCOVER (BUTTON_MENU | BUTTON_REPEAT)
 #define MINESWP_INFO (BUTTON_MENU | BUTTON_OFF)
 
+#elif CONFIG_KEYPAD == IRIVER_H100_PAD
+#define MINESWP_QUIT BUTTON_OFF
+#define MINESWP_START BUTTON_ON
+#define MINESWP_TOGGLE_PRE BUTTON_MODE
+
+#define MINESWP_TOGGLE (BUTTON_MODE | BUTTON_REL)
+#define MINESWP_DISCOVER (BUTTON_MODE | BUTTON_REPEAT)
+#define MINESWP_INFO (BUTTON_MODE | BUTTON_OFF)
+
 #endif
 
 
diff --git a/apps/plugins/mosaique.c b/apps/plugins/mosaique.c
index 09c56c3bc3..619464d432 100644
--- a/apps/plugins/mosaique.c
+++ b/apps/plugins/mosaique.c
@@ -35,6 +35,10 @@
 #define MOSAIQUE_SPEED2 BUTTON_RIGHT
 #define MOSAIQUE_RESTART BUTTON_MENU
 
+#elif CONFIG_KEYPAD == IRIVER_H100_PAD
+#define MOSAIQUE_QUIT BUTTON_OFF
+#define MOSAIQUE_SPEED BUTTON_MODE
+#define MOSAIQUE_RESTART BUTTON_ON
 #endif
 
 enum plugin_status plugin_start(struct plugin_api* api, void* parameter)
diff --git a/apps/plugins/oscillograph.c b/apps/plugins/oscillograph.c
index 5beeb8891b..50e18e5a9f 100644
--- a/apps/plugins/oscillograph.c
+++ b/apps/plugins/oscillograph.c
@@ -20,6 +20,7 @@
 
 #ifdef HAVE_LCD_BITMAP
 #ifndef SIMULATOR /* don't want this code in the simulator */
+#if CONFIG_HWCODEC != MASNONE /* only for MAS-targets */
 
 /* The different drawing modes */
 #define DRAW_MODE_FILLED  0
@@ -241,5 +242,6 @@ enum plugin_status plugin_start(struct plugin_api* api, void* parameter)
     return PLUGIN_OK;
 }
 
+#endif /* if using MAS */
 #endif /* #ifndef SIMULATOR */
 #endif
diff --git a/apps/plugins/oscilloscope.c b/apps/plugins/oscilloscope.c
index cfb8330134..caa09a0ed4 100644
--- a/apps/plugins/oscilloscope.c
+++ b/apps/plugins/oscilloscope.c
@@ -23,6 +23,7 @@
 #include "plugin.h"
 
 #ifdef HAVE_LCD_BITMAP /* and also not for the Player */
+#if CONFIG_HWCODEC != MASNONE /* only for MAS-targets */
 
 /* The different drawing modes */
 #define DRAW_MODE_FILLED  0
@@ -269,5 +270,6 @@ enum plugin_status plugin_start(struct plugin_api* api, void* parameter)
     cleanup(NULL);
     return PLUGIN_OK;
 }
-#endif
-#endif
+#endif /* if using MAS */
+#endif /* if HAVE_LCD_BITMAP */
+#endif /* SIMULATOR */
diff --git a/apps/plugins/pong.c b/apps/plugins/pong.c
index c7547d6de4..d98becf06a 100644
--- a/apps/plugins/pong.c
+++ b/apps/plugins/pong.c
@@ -48,6 +48,13 @@
 #define PONG_RIGHT_UP BUTTON_UP
 #define PONG_RIGHT_DOWN BUTTON_DOWN
 
+#elif CONFIG_KEYPAD == IRIVER_H100_PAD
+#define PONG_QUIT BUTTON_OFF
+#define PONG_LEFT_UP BUTTON_UP
+#define PONG_LEFT_DOWN BUTTON_DOWN
+#define PONG_RIGHT_UP BUTTON_ON
+#define PONG_RIGHT_DOWN BUTTON_MODE
+
 #endif
 
 static struct plugin_api* rb;
diff --git a/apps/plugins/rockbox_flash.c b/apps/plugins/rockbox_flash.c
index 7d0f630474..b1b5bc5233 100644
--- a/apps/plugins/rockbox_flash.c
+++ b/apps/plugins/rockbox_flash.c
@@ -21,7 +21,7 @@
 ****************************************************************************/
 #include "plugin.h"
 
-#ifndef SIMULATOR /* Only build for target */
+#if !defined(SIMULATOR) && (CONFIG_CPU == SH7034) /* Only for SH targets */
 
 /* define DUMMY if you only want to "play" with the UI, does no harm */
 /* #define DUMMY */
@@ -1002,4 +1002,4 @@ enum plugin_status plugin_start(struct plugin_api* api, void* parameter)
 }
 
 
-#endif /* #ifndef SIMULATOR */
+#endif /* !SIMULATOR or a SH-target */
diff --git a/apps/plugins/sliding_puzzle.c b/apps/plugins/sliding_puzzle.c
index aaaf0f78cb..d6cbe48525 100644
--- a/apps/plugins/sliding_puzzle.c
+++ b/apps/plugins/sliding_puzzle.c
@@ -31,6 +31,10 @@
 #define PUZZLE_SHUFFLE (BUTTON_MENU | BUTTON_REPEAT)
 #define PUZZLE_PICTURE (BUTTON_MENU | BUTTON_REL)
 
+#elif CONFIG_KEYPAD == IRIVER_H100_PAD
+#define PUZZLE_QUIT BUTTON_OFF
+#define PUZZLE_SHUFFLE BUTTON_SELECT
+#define PUZZLE_PICTURE BUTTON_ON
 #endif
 
 static struct plugin_api* rb;
diff --git a/apps/plugins/snake.c b/apps/plugins/snake.c
index 3a672f9972..21761f1e3a 100644
--- a/apps/plugins/snake.c
+++ b/apps/plugins/snake.c
@@ -42,6 +42,12 @@ dir is the current direction of the snake - 0=up, 1=right, 2=down, 3=left;
 #define SNAKE_QUIT BUTTON_OFF
 #define SNAKE_PLAYPAUSE BUTTON_MENU
 
+#elif CONFIG_KEYPAD == IRIVER_H100_PAD
+#define SNAKE_QUIT BUTTON_OFF
+#define SNAKE_PLAYPAUSE BUTTON_ON
+
+#else
+#error "lacks keymapping"
 #endif
 
 static int board[28][16],snakelength;
diff --git a/apps/plugins/snake2.c b/apps/plugins/snake2.c
index b0b9e6424a..1e3859165c 100644
--- a/apps/plugins/snake2.c
+++ b/apps/plugins/snake2.c
@@ -52,6 +52,17 @@ Head and Tail are stored
 #define SNAKE2_SELECT_TYPE BUTTON_RIGHT
 #define SNAKE2_PLAYPAUSE BUTTON_MENU
 
+#elif CONFIG_KEYPAD == IRIVER_H100_PAD
+#define SNAKE2_QUIT BUTTON_OFF
+#define SNAKE2_LEVEL_UP BUTTON_UP
+#define SNAKE2_LEVEL_UP2 BUTTON_RIGHT
+#define SNAKE2_LEVEL_DOWN BUTTON_DOWN
+#define SNAKE2_LEVEL_DOWN2 BUTTON_LEFT
+#define SNAKE2_SELECT_MAZE BUTTON_REC
+#define SNAKE2_SELECT_TYPE BUTTON_MODE
+#define SNAKE2_PLAYPAUSE BUTTON_ON
+#else
+#error "lacks keymapping"
 #endif
 
 static int max_levels = 0;
diff --git a/apps/plugins/sokoban.c b/apps/plugins/sokoban.c
index 5b0eae1bc6..1011c85c80 100644
--- a/apps/plugins/sokoban.c
+++ b/apps/plugins/sokoban.c
@@ -49,6 +49,12 @@
 #define SOKOBAN_LEVEL_DOWN (BUTTON_MENU | BUTTON_LEFT)
 #define SOKOBAN_LEVEL_REPEAT (BUTTON_MENU | BUTTON_UP)
 
+#elif CONFIG_KEYPAD == IRIVER_H100_PAD
+#define SOKOBAN_QUIT BUTTON_OFF
+#define SOKOBAN_UNDO BUTTON_ON
+#define SOKOBAN_LEVEL_UP BUTTON_MODE
+#define SOKOBAN_LEVEL_DOWN BUTTON_REC
+#define SOKOBAN_LEVEL_REPEAT BUTTON_SELECT
 #endif
 
 static void init_undo(void);
diff --git a/apps/plugins/solitaire.c b/apps/plugins/solitaire.c
index 9e8347fb79..37d9f1ee78 100644
--- a/apps/plugins/solitaire.c
+++ b/apps/plugins/solitaire.c
@@ -85,6 +85,22 @@ static struct plugin_api* rb;
 #define SOL_MENU_RUN BUTTON_RIGHT
 #define SOL_MENU_INFO BUTTON_MENU
 
+#elif CONFIG_KEYPAD == IRIVER_H100_PAD
+#define SOL_QUIT BUTTON_OFF
+#define SOL_UP BUTTON_UP
+#define SOL_DOWN BUTTON_DOWN
+#define SOL_LEFT BUTTON_LEFT
+#define SOL_RIGHT BUTTON_RIGHT
+#define SOL_MOVE BUTTON_ON
+#define SOL_DRAW BUTTON_SELECT
+#define SOL_REM2CUR BUTTON_PLAY
+#define SOL_CUR2STACK BUTTON_F1
+#define SOL_REM2STACK BUTTON_F3
+#define SOL_MENU_RUN BUTTON_RIGHT
+#define SOL_MENU_RUN2 BUTTON_ON
+#define SOL_MENU_INFO BUTTON_SELECT
+#define SOL_MENU_INFO2 BUTTON_REC
+#define SOL_MENU_INFO3 BUTTON_MODE
 #endif
 
 /* common help definitions */
diff --git a/apps/plugins/splitedit.c b/apps/plugins/splitedit.c
index 65d4c080b8..d3145b438a 100644
--- a/apps/plugins/splitedit.c
+++ b/apps/plugins/splitedit.c
@@ -43,6 +43,18 @@
 #define SPLITEDIT_SCALE (BUTTON_MENU | BUTTON_RIGHT)
 #define SPLITEDIT_MENU_RUN BUTTON_RIGHT
 
+#elif CONFIG_KEYPAD == IRIVER_H100_PAD
+#define SPLITEDIT_QUIT BUTTON_OFF
+#define SPLITEDIT_PLAY BUTTON_ON
+#define SPLITEDIT_SAVE BUTTON_SELECT
+#define SPLITEDIT_LOOP_MODE BUTTON_MODE
+#define SPLITEDIT_SCALE (BUTTON_REC | BUTTON_UP)
+#define SPLITEDIT_SPEED50 (BUTTON_REC | BUTTON_LEFT)
+#define SPLITEDIT_SPEED100 (BUTTON_REC | BUTTON_DOWN)
+#define SPLITEDIT_SPEED150 (BUTTON_REC | BUTTON_RIGHT)
+#define SPLITEDIT_MENU_RUN BUTTON_RIGHT
+
+
 #endif
 
 #define BMPHEIGHT 7
diff --git a/apps/plugins/star.c b/apps/plugins/star.c
index 1b9dca8f40..79f93ccba2 100644
--- a/apps/plugins/star.c
+++ b/apps/plugins/star.c
@@ -80,6 +80,14 @@
 #define STAR_LEVEL_REPEAT (BUTTON_MENU | BUTTON_UP)
 #define STAR_MENU_RUN BUTTON_RIGHT
 
+#elif CONFIG_KEYPAD == IRIVER_H100_PAD
+#define STAR_QUIT BUTTON_OFF
+#define STAR_TOGGLE_CONTROL_PRE BUTTON_MODE
+#define STAR_TOGGLE_CONTROL (BUTTON_MODE | BUTTON_REL)
+#define STAR_LEVEL_UP (BUTTON_MODE | BUTTON_RIGHT)
+#define STAR_LEVEL_DOWN (BUTTON_MODE | BUTTON_LEFT)
+#define STAR_LEVEL_REPEAT (BUTTON_MODE | BUTTON_UP)
+#define STAR_MENU_RUN BUTTON_RIGHT
 #endif
 
 /* function returns because of USB? */
diff --git a/apps/plugins/stopwatch.c b/apps/plugins/stopwatch.c
index 3843476f78..7f0bcd699c 100644
--- a/apps/plugins/stopwatch.c
+++ b/apps/plugins/stopwatch.c
@@ -53,6 +53,13 @@
 #define STOPWATCH_LAP_TIMER BUTTON_ON
 #define STOPWATCH_SCROLL_UP BUTTON_RIGHT
 #define STOPWATCH_SCROLL_DOWN BUTTON_LEFT
+#elif CONFIG_KEYPAD == IRIVER_H100_PAD
+#define STOPWATCH_QUIT BUTTON_OFF
+#define STOPWATCH_START_STOP BUTTON_SELECT
+#define STOPWATCH_RESET_TIMER BUTTON_DOWN
+#define STOPWATCH_LAP_TIMER BUTTON_ON
+#define STOPWATCH_SCROLL_UP BUTTON_RIGHT
+#define STOPWATCH_SCROLL_DOWN BUTTON_LEFT
 #endif
 
 static struct plugin_api* rb;
diff --git a/apps/plugins/viewer.c b/apps/plugins/viewer.c
index 281868bf65..f09e7c8682 100644
--- a/apps/plugins/viewer.c
+++ b/apps/plugins/viewer.c
@@ -98,6 +98,16 @@
 #define VIEWER_MODE_LINE (BUTTON_ON | BUTTON_MENU | BUTTON_RIGHT)
 #define VIEWER_MODE_WIDTH (BUTTON_ON | BUTTON_RIGHT)
 
+#elif CONFIG_KEYPAD == IRIVER_H100_PAD
+#define VIEWER_QUIT BUTTON_OFF
+#define VIEWER_PAGE_UP BUTTON_UP
+#define VIEWER_PAGE_DOWN BUTTON_DOWN
+#define VIEWER_SCREEN_LEFT BUTTON_LEFT
+#define VIEWER_SCREEN_RIGHT BUTTON_RIGHT
+#define VIEWER_MODE_WRAP (BUTTON_ON | BUTTON_LEFT)
+#define VIEWER_MODE_LINE (BUTTON_ON | BUTTON_DOWN)
+#define VIEWER_MODE_WIDTH (BUTTON_ON | BUTTON_RIGHT)
+
 #endif
 
 enum {
diff --git a/apps/plugins/vu_meter.c b/apps/plugins/vu_meter.c
index ba218903e7..22fc5217d2 100644
--- a/apps/plugins/vu_meter.c
+++ b/apps/plugins/vu_meter.c
@@ -17,7 +17,7 @@
  **************************************************************************/
 #include "plugin.h"
 
-#ifdef HAVE_LCD_BITMAP
+#if defined(HAVE_LCD_BITMAP) && (CONFIG_HWCODEC != MASNONE)
 
 /* variable button definitions */
 #if CONFIG_KEYPAD == RECORDER_PAD
@@ -482,4 +482,4 @@ enum plugin_status plugin_start(struct plugin_api* api, void* parameter) {
             lastbutton = button;
     }
 }
-#endif /* #ifdef HAVE_LCD_BITMAP */
+#endif /* #ifdef HAVE_LCD_BITMAP and HWCODEC */