av300: Continue cleaning out keymaps.

(A lot of work was done on this thing, for a target that hasn't been compileable
 at least since we moved to git..)

Change-Id: Ibface9392f3251b5be4bf1e0c4d12639c4f1662d

33 files changed, 6 insertions, 340 deletions

diff --git a/apps/plugins/brickmania.c b/apps/plugins/brickmania.c
index c5d74bcf37..b0a1b6565b 100644
--- a/apps/plugins/brickmania.c
+++ b/apps/plugins/brickmania.c
@@ -78,14 +78,6 @@
 #define UP BUTTON_UP
 #define DOWN BUTTON_DOWN
 
-#elif CONFIG_KEYPAD == ARCHOS_AV300_PAD
-#define QUIT BUTTON_OFF
-#define LEFT BUTTON_LEFT
-#define RIGHT BUTTON_RIGHT
-#define SELECT BUTTON_SELECT
-#define UP BUTTON_UP
-#define DOWN BUTTON_DOWN
-
 #elif (CONFIG_KEYPAD == IPOD_4G_PAD) || \
       (CONFIG_KEYPAD == IPOD_3G_PAD) || \
       (CONFIG_KEYPAD == IPOD_1G2G_PAD)
@@ -1494,8 +1486,7 @@ static int brickmania_help(void)
 #elif (CONFIG_KEYPAD == IRIVER_H100_PAD) || \
       (CONFIG_KEYPAD == IRIVER_H300_PAD) || \
       (CONFIG_KEYPAD == ONDIO_PAD) || \
-      (CONFIG_KEYPAD == RECORDER_PAD) || \
-      (CONFIG_KEYPAD == ARCHOS_AV300_PAD)
+      (CONFIG_KEYPAD == RECORDER_PAD)
         "STOP:",
 #else
         "POWER:",
diff --git a/apps/plugins/calculator.c b/apps/plugins/calculator.c
index be5087967c..d3cf57536d 100644
--- a/apps/plugins/calculator.c
+++ b/apps/plugins/calculator.c
@@ -121,17 +121,6 @@ F3: equal to "="
 #define CALCULATOR_OPERATORS BUTTON_F2
 #define CALCULATOR_CLEAR BUTTON_F1
 
-#elif CONFIG_KEYPAD == ARCHOS_AV300_PAD
-#define CALCULATOR_LEFT BUTTON_LEFT
-#define CALCULATOR_RIGHT BUTTON_RIGHT
-#define CALCULATOR_UP   BUTTON_UP
-#define CALCULATOR_DOWN BUTTON_DOWN
-#define CALCULATOR_QUIT BUTTON_OFF
-#define CALCULATOR_INPUT BUTTON_SELECT
-#define CALCULATOR_CALC BUTTON_F3
-#define CALCULATOR_OPERATORS BUTTON_F2
-#define CALCULATOR_CLEAR BUTTON_F1
-
 #elif CONFIG_KEYPAD == ONDIO_PAD
 #define CALCULATOR_LEFT BUTTON_LEFT
 #define CALCULATOR_RIGHT BUTTON_RIGHT
diff --git a/apps/plugins/calendar.c b/apps/plugins/calendar.c
index af550685cc..4d89530ca9 100644
--- a/apps/plugins/calendar.c
+++ b/apps/plugins/calendar.c
@@ -37,16 +37,6 @@
 #define CALENDAR_NEXT_MONTH (BUTTON_ON|BUTTON_DOWN)
 #define CALENDAR_PREV_MONTH (BUTTON_ON|BUTTON_UP)
 
-#elif CONFIG_KEYPAD == ARCHOS_AV300_PAD
-#define CALENDAR_QUIT       BUTTON_OFF
-#define CALENDAR_SELECT     BUTTON_SELECT
-#define CALENDAR_NEXT_WEEK  BUTTON_DOWN
-#define CALENDAR_PREV_WEEK  BUTTON_UP
-#define CALENDAR_NEXT_DAY   BUTTON_RIGHT
-#define CALENDAR_PREV_DAY   BUTTON_LEFT
-#define CALENDAR_NEXT_MONTH (BUTTON_ON|BUTTON_DOWN)
-#define CALENDAR_PREV_MONTH (BUTTON_ON|BUTTON_UP)
-
 #elif CONFIG_KEYPAD == ONDIO_PAD
 #define CALENDAR_QUIT       BUTTON_OFF
 #define CALENDAR_SELECT     (BUTTON_MENU|BUTTON_REL)
diff --git a/apps/plugins/chessbox/chessbox_pgn.h b/apps/plugins/chessbox/chessbox_pgn.h
index 9d37953c6f..9c7693305c 100644
--- a/apps/plugins/chessbox/chessbox_pgn.h
+++ b/apps/plugins/chessbox/chessbox_pgn.h
@@ -99,21 +99,6 @@
 #define CB_SCROLL_LEFT   (BUTTON_LEFT|BUTTON_REPEAT)
 #define CB_SCROLL_RIGHT  (BUTTON_RIGHT|BUTTON_REPEAT)
 
-#elif CONFIG_KEYPAD == ARCHOS_AV300_PAD
-#define CB_SELECT  BUTTON_SELECT
-#define CB_UP      BUTTON_UP
-#define CB_DOWN    BUTTON_DOWN
-#define CB_LEFT    BUTTON_LEFT
-#define CB_RIGHT   BUTTON_RIGHT
-#define CB_PLAY    BUTTON_ON
-#define CB_LEVEL   BUTTON_F1
-#define CB_RESTART BUTTON_F3
-#define CB_MENU    BUTTON_OFF
-#define CB_SCROLL_UP     (BUTTON_UP|BUTTON_REPEAT)
-#define CB_SCROLL_DOWN   (BUTTON_DOWN|BUTTON_REPEAT)
-#define CB_SCROLL_LEFT   (BUTTON_LEFT|BUTTON_REPEAT)
-#define CB_SCROLL_RIGHT  (BUTTON_RIGHT|BUTTON_REPEAT)
-
 #elif CONFIG_KEYPAD == ONDIO_PAD
 #define CB_SELECT_PRE BUTTON_MENU
 #define CB_SELECT  (BUTTON_MENU|BUTTON_REL)
diff --git a/apps/plugins/chessclock.c b/apps/plugins/chessclock.c
index d93777860b..ba8fea4935 100644
--- a/apps/plugins/chessclock.c
+++ b/apps/plugins/chessclock.c
@@ -35,17 +35,6 @@
 #define CHC_SETTINGS_OK2 BUTTON_LEFT
 #define CHC_SETTINGS_CANCEL BUTTON_OFF
 
-#elif CONFIG_KEYPAD == ARCHOS_AV300_PAD
-#define CHC_QUIT BUTTON_OFF
-#define CHC_STARTSTOP BUTTON_SELECT
-#define CHC_RESET BUTTON_LEFT
-#define CHC_MENU BUTTON_F1
-#define CHC_SETTINGS_INC BUTTON_UP
-#define CHC_SETTINGS_DEC BUTTON_DOWN
-#define CHC_SETTINGS_OK BUTTON_SELECT
-#define CHC_SETTINGS_OK2 BUTTON_LEFT
-#define CHC_SETTINGS_CANCEL BUTTON_OFF
-
 #elif CONFIG_KEYPAD == ONDIO_PAD
 #define CHC_QUIT BUTTON_OFF
 #define CHC_STARTSTOP BUTTON_RIGHT
diff --git a/apps/plugins/chip8.c b/apps/plugins/chip8.c
index 7c2be3f7e7..8645893820 100644
--- a/apps/plugins/chip8.c
+++ b/apps/plugins/chip8.c
@@ -956,18 +956,6 @@ STATIC void chip8 (void)
 #define CHIP8_KEY8 BUTTON_DOWN
 #define CHIP8_KEY9 BUTTON_ON
 
-#elif CONFIG_KEYPAD == ARCHOS_AV300_PAD /* only 9 out of 16 chip8 buttons */
-#define CHIP8_OFF  BUTTON_OFF
-#define CHIP8_KEY1 BUTTON_F1
-#define CHIP8_KEY2 BUTTON_UP
-#define CHIP8_KEY3 BUTTON_F3
-#define CHIP8_KEY4 BUTTON_LEFT
-#define CHIP8_KEY5 BUTTON_SELECT
-#define CHIP8_KEY6 BUTTON_RIGHT
-#define CHIP8_KEY7 BUTTON_F2
-#define CHIP8_KEY8 BUTTON_DOWN
-#define CHIP8_KEY9 BUTTON_ON
-
 #elif CONFIG_KEYPAD == ONDIO_PAD /* even more limited */
 #define CHIP8_OFF  BUTTON_OFF
 #define CHIP8_KEY2 BUTTON_UP
diff --git a/apps/plugins/cube.c b/apps/plugins/cube.c
index 78fd333773..0f51e44e5c 100644
--- a/apps/plugins/cube.c
+++ b/apps/plugins/cube.c
@@ -47,16 +47,6 @@
 #define CUBE_PAUSE         BUTTON_PLAY
 #define CUBE_HIGHSPEED     BUTTON_ON
 
-#elif CONFIG_KEYPAD == ARCHOS_AV300_PAD
-#define CUBE_QUIT          BUTTON_OFF
-#define CUBE_NEXT          BUTTON_RIGHT
-#define CUBE_PREV          BUTTON_LEFT
-#define CUBE_INC           BUTTON_UP
-#define CUBE_DEC           BUTTON_DOWN
-#define CUBE_MODE          BUTTON_F1
-#define CUBE_PAUSE         BUTTON_SELECT
-#define CUBE_HIGHSPEED     BUTTON_ON
-
 #elif CONFIG_KEYPAD == PLAYER_PAD
 #define CUBE_QUIT          BUTTON_STOP
 #define CUBE_INC           BUTTON_RIGHT
diff --git a/apps/plugins/fft/fft.c b/apps/plugins/fft/fft.c
index 0f4e33759d..1349b07012 100644
--- a/apps/plugins/fft/fft.c
+++ b/apps/plugins/fft/fft.c
@@ -38,16 +38,7 @@
 GREY_INFO_STRUCT
 #endif
 
-#if CONFIG_KEYPAD == ARCHOS_AV300_PAD
-#   define FFT_PREV_GRAPH   BUTTON_LEFT
-#   define FFT_NEXT_GRAPH   BUTTON_RIGHT
-#   define FFT_ORIENTATION  BUTTON_F3
-#   define FFT_WINDOW       BUTTON_F1
-#   define FFT_AMP_SCALE    BUTTON_UP
-#   define FFT_QUIT         BUTTON_OFF
-/* Need FFT_FREQ_SCALE key */
-
-#elif (CONFIG_KEYPAD == IRIVER_H100_PAD) || \
+#if (CONFIG_KEYPAD == IRIVER_H100_PAD) || \
       (CONFIG_KEYPAD == IRIVER_H300_PAD)
 #   define FFT_PREV_GRAPH   BUTTON_LEFT
 #   define FFT_NEXT_GRAPH   BUTTON_RIGHT
diff --git a/apps/plugins/flipit.c b/apps/plugins/flipit.c
index 7d1257ef94..ed288d444d 100644
--- a/apps/plugins/flipit.c
+++ b/apps/plugins/flipit.c
@@ -34,17 +34,6 @@
 #define FLIPIT_STEP_BY_STEP BUTTON_F3
 #define FLIPIT_TOGGLE       BUTTON_PLAY
 
-#elif CONFIG_KEYPAD == ARCHOS_AV300_PAD
-#define FLIPIT_LEFT         BUTTON_LEFT
-#define FLIPIT_RIGHT        BUTTON_RIGHT
-#define FLIPIT_UP           BUTTON_UP
-#define FLIPIT_DOWN         BUTTON_DOWN
-#define FLIPIT_QUIT         BUTTON_OFF
-#define FLIPIT_SHUFFLE      BUTTON_F1
-#define FLIPIT_SOLVE        BUTTON_F2
-#define FLIPIT_STEP_BY_STEP BUTTON_F3
-#define FLIPIT_TOGGLE       BUTTON_SELECT
-
 #elif CONFIG_KEYPAD == PLAYER_PAD
 #define FLIPIT_LEFT         BUTTON_LEFT
 #define FLIPIT_RIGHT        BUTTON_RIGHT
diff --git a/apps/plugins/fractals/fractal.h b/apps/plugins/fractals/fractal.h
index 679782d37a..c7a822c2c6 100644
--- a/apps/plugins/fractals/fractal.h
+++ b/apps/plugins/fractals/fractal.h
@@ -34,18 +34,6 @@
 #define FRACTAL_PRECISION_DEC   BUTTON_F1
 #define FRACTAL_RESET           BUTTON_F3
 
-#elif CONFIG_KEYPAD == ARCHOS_AV300_PAD
-#define FRACTAL_QUIT            BUTTON_OFF
-#define FRACTAL_UP              BUTTON_UP
-#define FRACTAL_DOWN            BUTTON_DOWN
-#define FRACTAL_LEFT            BUTTON_LEFT
-#define FRACTAL_RIGHT           BUTTON_RIGHT
-#define FRACTAL_ZOOM_IN         BUTTON_SELECT
-#define FRACTAL_ZOOM_OUT        BUTTON_ON
-#define FRACTAL_PRECISION_INC   BUTTON_F2
-#define FRACTAL_PRECISION_DEC   BUTTON_F1
-#define FRACTAL_RESET           BUTTON_F3
-
 #elif CONFIG_KEYPAD == ONDIO_PAD
 #define FRACTAL_QUIT            BUTTON_OFF
 #define FRACTAL_UP              BUTTON_UP
diff --git a/apps/plugins/imageviewer/imageviewer_button.h b/apps/plugins/imageviewer/imageviewer_button.h
index e37febc76a..dfdd39ffa4 100644
--- a/apps/plugins/imageviewer/imageviewer_button.h
+++ b/apps/plugins/imageviewer/imageviewer_button.h
@@ -36,17 +36,6 @@
 #define IMGVIEW_PREVIOUS    BUTTON_F2
 #define IMGVIEW_MENU        BUTTON_OFF
 
-#elif CONFIG_KEYPAD == ARCHOS_AV300_PAD
-#define IMGVIEW_ZOOM_IN     BUTTON_SELECT
-#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)
diff --git a/apps/plugins/jewels.c b/apps/plugins/jewels.c
index 38121a480c..87a9d2fabf 100644
--- a/apps/plugins/jewels.c
+++ b/apps/plugins/jewels.c
@@ -38,16 +38,6 @@
 #define HK_SELECT "PLAY"
 #define HK_CANCEL "OFF"
 
-#elif CONFIG_KEYPAD == ARCHOS_AV300_PAD
-#define JEWELS_UP     BUTTON_UP
-#define JEWELS_DOWN   BUTTON_DOWN
-#define JEWELS_LEFT   BUTTON_LEFT
-#define JEWELS_RIGHT  BUTTON_RIGHT
-#define JEWELS_SELECT BUTTON_SELECT
-#define JEWELS_CANCEL BUTTON_OFF
-#define HK_SELECT "SELECT"
-#define HK_CANCEL "OFF"
-
 #elif CONFIG_KEYPAD == ONDIO_PAD
 #define JEWELS_UP     BUTTON_UP
 #define JEWELS_DOWN   BUTTON_DOWN
diff --git a/apps/plugins/lib/pluginlib_actions.c b/apps/plugins/lib/pluginlib_actions.c
index 0834e020f4..e5b48c2f6a 100644
--- a/apps/plugins/lib/pluginlib_actions.c
+++ b/apps/plugins/lib/pluginlib_actions.c
@@ -102,7 +102,6 @@ const struct button_mapping pla_main_ctx[] =
     || (CONFIG_KEYPAD == IAUDIO_X5M5_PAD)     \
     || (CONFIG_KEYPAD == GIGABEAT_PAD)      \
     || (CONFIG_KEYPAD == RECORDER_PAD)      \
-    || (CONFIG_KEYPAD == ARCHOS_AV300_PAD)  \
     || (CONFIG_KEYPAD == IRIVER_IFP7XX_PAD) \
     || (CONFIG_KEYPAD == ONDIO_PAD) \
     || (CONFIG_KEYPAD == SANSA_C200_PAD) \
@@ -346,12 +345,6 @@ const struct button_mapping pla_main_ctx[] =
     {PLA_SELECT,            BUTTON_PLAY,                        BUTTON_NONE},
     {PLA_SELECT_REL,        BUTTON_PLAY|BUTTON_REL,             BUTTON_PLAY},
     {PLA_SELECT_REPEAT,     BUTTON_PLAY|BUTTON_REPEAT,          BUTTON_NONE},
-#elif (CONFIG_KEYPAD == ARCHOS_AV300_PAD)
-    {PLA_CANCEL,            BUTTON_OFF|BUTTON_REL,              BUTTON_OFF},
-    {PLA_EXIT,              BUTTON_OFF|BUTTON_REPEAT,           BUTTON_NONE},
-    {PLA_SELECT,            BUTTON_SELECT,                      BUTTON_NONE},
-    {PLA_SELECT_REL,        BUTTON_SELECT|BUTTON_REL,           BUTTON_SELECT},
-    {PLA_SELECT_REPEAT,     BUTTON_SELECT|BUTTON_REPEAT,        BUTTON_NONE},
 #elif (CONFIG_KEYPAD == ONDIO_PAD)
     {PLA_CANCEL,            BUTTON_OFF|BUTTON_REL,              BUTTON_OFF},
     {PLA_EXIT,              BUTTON_OFF|BUTTON_REPEAT,           BUTTON_NONE},
diff --git a/apps/plugins/minesweeper.c b/apps/plugins/minesweeper.c
index 917f90dcd0..4e875979ab 100644
--- a/apps/plugins/minesweeper.c
+++ b/apps/plugins/minesweeper.c
@@ -46,18 +46,6 @@ enum minesweeper_status {
 #   define MINESWP_DISCOVER2 BUTTON_F2
 #   define MINESWP_INFO     BUTTON_F3
 
-#elif CONFIG_KEYPAD == ARCHOS_AV300_PAD
-#   define MINESWP_LEFT     BUTTON_LEFT
-#   define MINESWP_RIGHT    BUTTON_RIGHT
-#   define MINESWP_UP       BUTTON_UP
-#   define MINESWP_DOWN     BUTTON_DOWN
-#   define MINESWP_QUIT     BUTTON_OFF
-#   define MINESWP_TOGGLE   BUTTON_ON
-#   define MINESWP_TOGGLE2  BUTTON_F1
-#   define MINESWP_DISCOVER BUTTON_SELECT
-#   define MINESWP_DISCOVER2 BUTTON_F2
-#   define MINESWP_INFO     BUTTON_F3
-
 #elif CONFIG_KEYPAD == ONDIO_PAD
 #   define MINESWP_LEFT     BUTTON_LEFT
 #   define MINESWP_RIGHT    BUTTON_RIGHT
diff --git a/apps/plugins/oscilloscope.c b/apps/plugins/oscilloscope.c
index 6702add139..97a8094e1f 100644
--- a/apps/plugins/oscilloscope.c
+++ b/apps/plugins/oscilloscope.c
@@ -41,17 +41,6 @@
 #define OSCILLOSCOPE_VOL_UP          BUTTON_UP
 #define OSCILLOSCOPE_VOL_DOWN        BUTTON_DOWN
 
-#elif CONFIG_KEYPAD == ARCHOS_AV300_PAD
-#define OSCILLOSCOPE_QUIT            BUTTON_OFF
-#define OSCILLOSCOPE_DRAWMODE        BUTTON_F1
-#define OSCILLOSCOPE_ADVMODE         BUTTON_F2
-#define OSCILLOSCOPE_ORIENTATION     BUTTON_F3
-#define OSCILLOSCOPE_PAUSE           BUTTON_SELECT
-#define OSCILLOSCOPE_SPEED_UP        BUTTON_RIGHT
-#define OSCILLOSCOPE_SPEED_DOWN      BUTTON_LEFT
-#define OSCILLOSCOPE_VOL_UP          BUTTON_UP
-#define OSCILLOSCOPE_VOL_DOWN        BUTTON_DOWN
-
 #elif CONFIG_KEYPAD == ONDIO_PAD
 #define OSCILLOSCOPE_QUIT            BUTTON_OFF
 #define OSCILLOSCOPE_DRAWMODE_PRE    BUTTON_MENU
diff --git a/apps/plugins/pictureflow/pictureflow.c b/apps/plugins/pictureflow/pictureflow.c
index c9d425c549..0efba4f5cb 100644
--- a/apps/plugins/pictureflow/pictureflow.c
+++ b/apps/plugins/pictureflow/pictureflow.c
@@ -109,9 +109,7 @@ const struct button_mapping pf_context_buttons[] =
     {PF_SELECT,       BUTTON_CENTER,              BUTTON_NONE},
     {PF_BACK,         BUTTON_BOTTOMRIGHT,         BUTTON_NONE},
 #endif
-#if CONFIG_KEYPAD == ARCHOS_AV300_PAD
-    {PF_QUIT,         BUTTON_OFF,                 BUTTON_NONE},
-#elif CONFIG_KEYPAD == SANSA_C100_PAD
+#if CONFIG_KEYPAD == SANSA_C100_PAD
     {PF_QUIT,         BUTTON_MENU|BUTTON_REPEAT,  BUTTON_MENU},
 #elif CONFIG_KEYPAD == CREATIVEZV_PAD || CONFIG_KEYPAD == CREATIVEZVM_PAD || \
     CONFIG_KEYPAD == PHILIPS_HDD1630_PAD || CONFIG_KEYPAD == IAUDIO67_PAD || \
diff --git a/apps/plugins/pong.c b/apps/plugins/pong.c
index 3656a35fd2..1fcd018de2 100644
--- a/apps/plugins/pong.c
+++ b/apps/plugins/pong.c
@@ -47,14 +47,6 @@
 #define PONG_RIGHT_UP BUTTON_F3
 #define PONG_RIGHT_DOWN BUTTON_RIGHT
 
-#elif CONFIG_KEYPAD == ARCHOS_AV300_PAD
-#define PONG_QUIT BUTTON_OFF
-#define PONG_PAUSE BUTTON_ON
-#define PONG_LEFT_UP BUTTON_F1
-#define PONG_LEFT_DOWN BUTTON_LEFT
-#define PONG_RIGHT_UP BUTTON_F3
-#define PONG_RIGHT_DOWN BUTTON_RIGHT
-
 #elif CONFIG_KEYPAD == ONDIO_PAD
 #define PONG_QUIT BUTTON_OFF
 #define PONG_PAUSE BUTTON_RIGHT
diff --git a/apps/plugins/rockblox.c b/apps/plugins/rockblox.c
index e2fedab200..93479c5c56 100644
--- a/apps/plugins/rockblox.c
+++ b/apps/plugins/rockblox.c
@@ -69,17 +69,6 @@
 #define ROCKBLOX_DROP          BUTTON_ON
 #define ROCKBLOX_RESTART       BUTTON_F1
 
-#elif CONFIG_KEYPAD == ARCHOS_AV300_PAD
-
-#define ROCKBLOX_OFF           BUTTON_OFF
-#define ROCKBLOX_ROTATE_CCW    BUTTON_UP
-#define ROCKBLOX_ROTATE_CW     BUTTON_SELECT
-#define ROCKBLOX_DOWN          BUTTON_DOWN
-#define ROCKBLOX_LEFT          BUTTON_LEFT
-#define ROCKBLOX_RIGHT         BUTTON_RIGHT
-#define ROCKBLOX_DROP          BUTTON_ON
-#define ROCKBLOX_RESTART       BUTTON_F1
-
 #elif CONFIG_KEYPAD == PLAYER_PAD
 
 #define ROCKBLOX_OFF_PRE       BUTTON_STOP
diff --git a/apps/plugins/sliding_puzzle.c b/apps/plugins/sliding_puzzle.c
index 9b863906ce..ad856b8ab2 100644
--- a/apps/plugins/sliding_puzzle.c
+++ b/apps/plugins/sliding_puzzle.c
@@ -30,15 +30,6 @@
 #define PUZZLE_SHUFFLE BUTTON_F1
 #define PUZZLE_PICTURE BUTTON_F2
 
-#elif CONFIG_KEYPAD == ARCHOS_AV300_PAD
-#define PUZZLE_QUIT BUTTON_OFF
-#define PUZZLE_LEFT BUTTON_LEFT
-#define PUZZLE_RIGHT BUTTON_RIGHT
-#define PUZZLE_UP BUTTON_UP
-#define PUZZLE_DOWN BUTTON_DOWN
-#define PUZZLE_SHUFFLE BUTTON_F1
-#define PUZZLE_PICTURE BUTTON_F2
-
 #elif CONFIG_KEYPAD == ONDIO_PAD
 #define PUZZLE_QUIT BUTTON_OFF
 #define PUZZLE_LEFT BUTTON_LEFT
@@ -862,7 +853,7 @@ enum plugin_status plugin_start(
         /* print instructions */
         rb->lcd_clear_display();
         rb->lcd_setfont(FONT_SYSFIXED);
-#if CONFIG_KEYPAD == RECORDER_PAD || CONFIG_KEYPAD == ARCHOS_AV300_PAD
+#if CONFIG_KEYPAD == RECORDER_PAD
         rb->lcd_putsxy(3, 18, "[OFF] to stop");
         rb->lcd_putsxy(3, 28, "[F1] shuffle");
         rb->lcd_putsxy(3, 38, "[F2] change pic");
diff --git a/apps/plugins/snake.c b/apps/plugins/snake.c
index ae1e4350ad..c885f4ccae 100644
--- a/apps/plugins/snake.c
+++ b/apps/plugins/snake.c
@@ -49,14 +49,6 @@ dir is the current direction of the snake - 0=up, 1=right, 2=down, 3=left;
 #define SNAKE_DOWN BUTTON_DOWN
 #define SNAKE_PLAYPAUSE BUTTON_PLAY
 
-#elif CONFIG_KEYPAD == ARCHOS_AV300_PAD
-#define SNAKE_QUIT BUTTON_OFF
-#define SNAKE_LEFT BUTTON_LEFT
-#define SNAKE_RIGHT BUTTON_RIGHT
-#define SNAKE_UP   BUTTON_UP
-#define SNAKE_DOWN BUTTON_DOWN
-#define SNAKE_PLAYPAUSE BUTTON_SELECT
-
 #elif CONFIG_KEYPAD == ONDIO_PAD
 #define SNAKE_QUIT BUTTON_OFF
 #define SNAKE_LEFT BUTTON_LEFT
diff --git a/apps/plugins/snake2.c b/apps/plugins/snake2.c
index a9f0942806..dcb5b72633 100644
--- a/apps/plugins/snake2.c
+++ b/apps/plugins/snake2.c
@@ -159,15 +159,6 @@ Head and Tail are stored
 #define SNAKE2_PLAYPAUSE BUTTON_PLAY
 #define SNAKE2_PLAYPAUSE_TEXT "Play"
 
-#elif CONFIG_KEYPAD == ARCHOS_AV300_PAD
-#define SNAKE2_LEFT BUTTON_LEFT
-#define SNAKE2_RIGHT BUTTON_RIGHT
-#define SNAKE2_UP   BUTTON_UP
-#define SNAKE2_DOWN BUTTON_DOWN
-#define SNAKE2_QUIT BUTTON_OFF
-#define SNAKE2_PLAYPAUSE BUTTON_SELECT
-#define SNAKE2_PLAYPAUSE_TEXT "Select"
-
 #elif CONFIG_KEYPAD == ONDIO_PAD
 #define SNAKE2_LEFT BUTTON_LEFT
 #define SNAKE2_RIGHT BUTTON_RIGHT
diff --git a/apps/plugins/sokoban.c b/apps/plugins/sokoban.c
index 450c881d1e..e4c34930b1 100644
--- a/apps/plugins/sokoban.c
+++ b/apps/plugins/sokoban.c
@@ -104,8 +104,7 @@
 #define SOKOBAN_MOVE_MIN     SOKOBAN_MOVE_DOWN
 
 /* variable button definitions */
-#if (CONFIG_KEYPAD == RECORDER_PAD) || \
-    (CONFIG_KEYPAD == ARCHOS_AV300_PAD)
+#if (CONFIG_KEYPAD == RECORDER_PAD)
 #define SOKOBAN_LEFT BUTTON_LEFT
 #define SOKOBAN_RIGHT BUTTON_RIGHT
 #define SOKOBAN_UP BUTTON_UP
@@ -1643,8 +1642,7 @@ static int sokoban_menu(void)
                     rb->screens[i]->clear_display();
                 rb->lcd_setfont(SOKOBAN_FONT);
 
-#if (CONFIG_KEYPAD == RECORDER_PAD) || \
-    (CONFIG_KEYPAD == ARCHOS_AV300_PAD)
+#if (CONFIG_KEYPAD == RECORDER_PAD)
                 rb->lcd_putsxy(3,  6, "[OFF] Menu");
                 rb->lcd_putsxy(3, 16, "[ON] Undo");
                 rb->lcd_putsxy(3, 26, "[PLAY] Redo");
diff --git a/apps/plugins/solitaire.c b/apps/plugins/solitaire.c
index dd4c8d3447..c743634279 100644
--- a/apps/plugins/solitaire.c
+++ b/apps/plugins/solitaire.c
@@ -49,23 +49,6 @@
 #   define HK_CUR2STACK    "F2"
 #   define HK_REM2STACK    "F3"
 
-#elif CONFIG_KEYPAD == ARCHOS_AV300_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_F1
-#   define SOL_REM2CUR      BUTTON_SELECT
-#   define SOL_CUR2STACK    BUTTON_F2
-#   define SOL_REM2STACK    BUTTON_F3
-#   define HK_MOVE         "ON"
-#   define HK_DRAW         "F1"
-#   define HK_REM2CUR      "SELECT"
-#   define HK_CUR2STACK    "F2"
-#   define HK_REM2STACK    "F3"
-
 #elif CONFIG_KEYPAD == ONDIO_PAD
 #   define SOL_QUIT         BUTTON_OFF
 #   define SOL_UP_PRE       BUTTON_UP
diff --git a/apps/plugins/spacerocks.c b/apps/plugins/spacerocks.c
index 98c6d1a032..91bf7757de 100644
--- a/apps/plugins/spacerocks.c
+++ b/apps/plugins/spacerocks.c
@@ -37,15 +37,6 @@
 #define AST_RIGHT BUTTON_RIGHT
 #define AST_FIRE BUTTON_PLAY
 
-#elif CONFIG_KEYPAD == ARCHOS_AV300_PAD
-#define AST_PAUSE BUTTON_ON
-#define AST_QUIT BUTTON_OFF
-#define AST_THRUST BUTTON_UP
-#define AST_HYPERSPACE BUTTON_DOWN
-#define AST_LEFT BUTTON_LEFT
-#define AST_RIGHT BUTTON_RIGHT
-#define AST_FIRE BUTTON_SELECT
-
 #elif CONFIG_KEYPAD == ONDIO_PAD
 #define AST_PAUSE (BUTTON_MENU | BUTTON_OFF)
 #define AST_QUIT BUTTON_OFF
diff --git a/apps/plugins/star.c b/apps/plugins/star.c
index 43036e2808..5814cc8cab 100644
--- a/apps/plugins/star.c
+++ b/apps/plugins/star.c
@@ -74,23 +74,6 @@
 #define STAR_LEVEL_DOWN_NAME "F1"
 #define STAR_LEVEL_REPEAT_NAME "F2"
 
-#elif CONFIG_KEYPAD == ARCHOS_AV300_PAD
-#define STAR_QUIT           BUTTON_OFF
-#define STAR_LEFT           BUTTON_LEFT
-#define STAR_RIGHT          BUTTON_RIGHT
-#define STAR_UP             BUTTON_UP
-#define STAR_DOWN           BUTTON_DOWN
-#define STAR_TOGGLE_CONTROL BUTTON_ON
-#define STAR_TOGGLE_CONTROL2 BUTTON_SELECT
-#define STAR_LEVEL_UP       BUTTON_F3
-#define STAR_LEVEL_DOWN     BUTTON_F1
-#define STAR_LEVEL_REPEAT   BUTTON_F2
-#define STAR_TOGGLE_CONTROL_NAME "ON/SELECT"
-#define STAR_QUIT_NAME      "OFF"
-#define STAR_LEVEL_UP_NAME  "F3"
-#define STAR_LEVEL_DOWN_NAME "F1"
-#define STAR_LEVEL_REPEAT_NAME "F2"
-
 #elif CONFIG_KEYPAD == ONDIO_PAD
 #define STAR_QUIT           BUTTON_OFF
 #define STAR_LEFT           BUTTON_LEFT
diff --git a/apps/plugins/stopwatch.c b/apps/plugins/stopwatch.c
index a806e4e830..bb778c9d24 100644
--- a/apps/plugins/stopwatch.c
+++ b/apps/plugins/stopwatch.c
@@ -43,14 +43,6 @@
 #define STOPWATCH_SCROLL_UP BUTTON_UP
 #define STOPWATCH_SCROLL_DOWN BUTTON_DOWN
 
-#elif CONFIG_KEYPAD == ARCHOS_AV300_PAD
-#define STOPWATCH_QUIT BUTTON_OFF
-#define STOPWATCH_START_STOP BUTTON_SELECT
-#define STOPWATCH_RESET_TIMER BUTTON_LEFT
-#define STOPWATCH_LAP_TIMER BUTTON_ON
-#define STOPWATCH_SCROLL_UP BUTTON_UP
-#define STOPWATCH_SCROLL_DOWN BUTTON_DOWN
-
 #elif CONFIG_KEYPAD == ONDIO_PAD
 #define STOPWATCH_QUIT BUTTON_OFF
 #define STOPWATCH_START_STOP BUTTON_RIGHT
diff --git a/apps/plugins/sudoku/sudoku.h b/apps/plugins/sudoku/sudoku.h
index 2bee868de9..47000b8e25 100644
--- a/apps/plugins/sudoku/sudoku.h
+++ b/apps/plugins/sudoku/sudoku.h
@@ -37,16 +37,6 @@
 #define SUDOKU_BUTTON_MENU BUTTON_F1
 #define SUDOKU_BUTTON_POSSIBLE BUTTON_F2
 
-#elif CONFIG_KEYPAD == ARCHOS_AV300_PAD
-#define SUDOKU_BUTTON_QUIT BUTTON_OFF
-#define SUDOKU_BUTTON_UP BUTTON_UP
-#define SUDOKU_BUTTON_DOWN BUTTON_DOWN
-#define SUDOKU_BUTTON_LEFT BUTTON_LEFT
-#define SUDOKU_BUTTON_RIGHT BUTTON_RIGHT
-#define SUDOKU_BUTTON_TOGGLE BUTTON_SELECT
-#define SUDOKU_BUTTON_MENU BUTTON_F1
-#define SUDOKU_BUTTON_POSSIBLE BUTTON_F2
-
 #elif CONFIG_KEYPAD == ONDIO_PAD
 #define SUDOKU_BUTTON_QUIT BUTTON_OFF
 #define SUDOKU_BUTTON_UP BUTTON_UP
diff --git a/apps/plugins/text_viewer/tv_button.h b/apps/plugins/text_viewer/tv_button.h
index 6ee8f9bbf1..acf7519b69 100644
--- a/apps/plugins/text_viewer/tv_button.h
+++ b/apps/plugins/text_viewer/tv_button.h
@@ -59,21 +59,6 @@
 #define TV_COLUMN_RIGHT (BUTTON_ON | BUTTON_RIGHT)
 #define TV_BOOKMARK     BUTTON_F2
 
-/* Archos AV300 keys */
-#elif CONFIG_KEYPAD == ARCHOS_AV300_PAD
-#define TV_QUIT         BUTTON_OFF
-#define TV_SCROLL_UP    BUTTON_UP
-#define TV_SCROLL_DOWN  BUTTON_DOWN
-#define TV_SCREEN_LEFT  BUTTON_LEFT
-#define TV_SCREEN_RIGHT BUTTON_RIGHT
-#define TV_MENU         BUTTON_F1
-#define TV_AUTOSCROLL   BUTTON_SELECT
-#define TV_LINE_UP      (BUTTON_ON | BUTTON_UP)
-#define TV_LINE_DOWN    (BUTTON_ON | BUTTON_DOWN)
-#define TV_COLUMN_LEFT  (BUTTON_ON | BUTTON_LEFT)
-#define TV_COLUMN_RIGHT (BUTTON_ON | BUTTON_RIGHT)
-#define TV_BOOKMARK     BUTTON_F2
-
 /* Ondio keys */
 #elif CONFIG_KEYPAD == ONDIO_PAD
 #define TV_QUIT           BUTTON_OFF
diff --git a/apps/plugins/vu_meter.c b/apps/plugins/vu_meter.c
index 33ad38d72c..af6bd6f397 100644
--- a/apps/plugins/vu_meter.c
+++ b/apps/plugins/vu_meter.c
@@ -35,17 +35,6 @@
 #define LABEL_MENU "F1"
 #define LABEL_VOLUME "UP/DOWN"
 
-#elif CONFIG_KEYPAD == ARCHOS_AV300_PAD
-#define VUMETER_QUIT BUTTON_OFF
-#define VUMETER_HELP BUTTON_ON
-#define VUMETER_MENU BUTTON_F1
-#define VUMETER_UP BUTTON_UP
-#define VUMETER_DOWN BUTTON_DOWN
-#define LABEL_HELP "ON"
-#define LABEL_QUIT "OFF"
-#define LABEL_MENU "F1"
-#define LABEL_VOLUME "UP/DOWN"
-
 #elif CONFIG_KEYPAD == ONDIO_PAD
 #define VUMETER_QUIT BUTTON_OFF
 #define VUMETER_HELP_PRE BUTTON_MENU
diff --git a/apps/plugins/wormlet.c b/apps/plugins/wormlet.c
index d342511419..a8447c9952 100644
--- a/apps/plugins/wormlet.c
+++ b/apps/plugins/wormlet.c
@@ -65,18 +65,6 @@ static long max_cycle;
 #define MULTIPLAYER
 #endif
 
-#elif (CONFIG_KEYPAD == ARCHOS_AV300_PAD)
-#define BTN_DIR_UP BUTTON_UP
-#define BTN_DIR_DOWN BUTTON_DOWN
-#define BTN_DIR_LEFT BUTTON_LEFT
-#define BTN_DIR_RIGHT BUTTON_RIGHT
-#define BTN_PLAYER2_DIR1 BUTTON_F2
-#define BTN_PLAYER2_DIR2 BUTTON_F3
-#define BTN_STARTPAUSE BUTTON_SELECT
-#define BTN_QUIT BUTTON_OFF
-#define BTN_STOPRESET BUTTON_ON
-#define BTN_TOGGLE_KEYS BUTTON_F1
-
 #elif (CONFIG_KEYPAD == ONDIO_PAD)
 #define BTN_DIR_UP BUTTON_UP
 #define BTN_DIR_DOWN BUTTON_DOWN
diff --git a/apps/plugins/xobox.c b/apps/plugins/xobox.c
index 9643641569..f86992f240 100644
--- a/apps/plugins/xobox.c
+++ b/apps/plugins/xobox.c
@@ -38,15 +38,6 @@
 
 #define RC_QUIT BUTTON_RC_STOP
 
-#elif (CONFIG_KEYPAD == ARCHOS_AV300_PAD)
-
-#define QUIT BUTTON_OFF
-#define LEFT BUTTON_LEFT
-#define RIGHT BUTTON_RIGHT
-#define PAUSE BUTTON_ON
-#define UP BUTTON_UP
-#define DOWN BUTTON_DOWN
-
 #elif (CONFIG_KEYPAD == IPOD_4G_PAD) || \
       (CONFIG_KEYPAD == IPOD_3G_PAD) || \
       (CONFIG_KEYPAD == IPOD_1G2G_PAD)
diff --git a/apps/plugins/zxbox/keymaps.h b/apps/plugins/zxbox/keymaps.h
index 53dd9e8d88..c2d434415c 100644
--- a/apps/plugins/zxbox/keymaps.h
+++ b/apps/plugins/zxbox/keymaps.h
@@ -55,14 +55,6 @@
 #define ZX_UP BUTTON_UP
 #define ZX_DOWN BUTTON_DOWN
 
-#elif CONFIG_KEYPAD == ARCHOS_AV300_PAD
-#define ZX_SELECT BUTTON_SELECT
-#define ZX_MENU BUTTON_OFF
-#define ZX_LEFT BUTTON_LEFT
-#define ZX_RIGHT BUTTON_RIGHT
-#define ZX_UP BUTTON_UP
-#define ZX_DOWN BUTTON_DOWN
-
 #elif CONFIG_KEYPAD == ONDIO_PAD
 #define ZX_SELECT BUTTON_MENU
 #define ZX_MENU BUTTON_OFF
diff --git a/apps/plugins/zxbox/zxbox_keyb.c b/apps/plugins/zxbox/zxbox_keyb.c
index 4a26accc8a..046f07379d 100644
--- a/apps/plugins/zxbox/zxbox_keyb.c
+++ b/apps/plugins/zxbox/zxbox_keyb.c
@@ -35,14 +35,6 @@
 #define KBD_UP BUTTON_UP
 #define KBD_DOWN BUTTON_DOWN
 
-#elif CONFIG_KEYPAD == ARCHOS_AV300_PAD
-#define KBD_SELECT BUTTON_SELECT
-#define KBD_ABORT BUTTON_OFF
-#define KBD_LEFT BUTTON_LEFT
-#define KBD_RIGHT BUTTON_RIGHT
-#define KBD_UP BUTTON_UP
-#define KBD_DOWN BUTTON_DOWN
-
 #elif CONFIG_KEYPAD == ONDIO_PAD /* restricted Ondio keypad */
 #define KBD_SELECT BUTTON_MENU
 #define KBD_ABORT BUTTON_OFF