revert/fix parts of r19673, as it changed some e200 keymaps and introduces not-needed FIXME comments.

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

17 files changed, 19 insertions, 26 deletions

diff --git a/apps/plugins/blackjack.c b/apps/plugins/blackjack.c
index 274e2033fa..4c7d51fad7 100644
--- a/apps/plugins/blackjack.c
+++ b/apps/plugins/blackjack.c
@@ -160,8 +160,22 @@ PLUGIN_HEADER
 #define BJACK_RIGHT      BUTTON_RIGHT
 #define BJACK_LEFT       BUTTON_LEFT
 
-#elif CONFIG_KEYPAD == SANSA_E200_PAD || \
-      (CONFIG_KEYPAD == SANSA_FUZE_PAD)
+#elif CONFIG_KEYPAD == SANSA_E200_PAD
+#define BJACK_START      BUTTON_SELECT
+#define BJACK_QUIT       BUTTON_POWER
+#define BJACK_MAX        (BUTTON_REC|BUTTON_UP)
+#define BJACK_MIN        (BUTTON_REC|BUTTON_DOWN)
+#define BJACK_HIT        BUTTON_SELECT
+#define BJACK_STAY       BUTTON_RIGHT
+#define BJACK_DOUBLEDOWN BUTTON_LEFT
+#define BJACK_SCORES     BUTTON_UP
+#define BJACK_RESUME     BUTTON_DOWN
+#define BJACK_UP         BUTTON_SCROLL_FWD
+#define BJACK_DOWN       BUTTON_SCROLL_BACK
+#define BJACK_RIGHT      BUTTON_RIGHT
+#define BJACK_LEFT       BUTTON_LEFT
+
+#elif CONFIG_KEYPAD == SANSA_FUZE_PAD
 #define BJACK_START      BUTTON_SELECT
 #define BJACK_QUIT       BUTTON_POWER
 #define BJACK_MAX        (BUTTON_SELECT|BUTTON_UP)
@@ -176,6 +190,7 @@ PLUGIN_HEADER
 #define BJACK_RIGHT      BUTTON_RIGHT
 #define BJACK_LEFT       BUTTON_LEFT
 
+
 #elif CONFIG_KEYPAD == SANSA_C200_PAD
 #define BJACK_START      BUTTON_SELECT
 #define BJACK_QUIT       BUTTON_POWER
diff --git a/apps/plugins/bubbles.c b/apps/plugins/bubbles.c
index 5e338588de..c776b6768e 100644
--- a/apps/plugins/bubbles.c
+++ b/apps/plugins/bubbles.c
@@ -59,7 +59,6 @@ PLUGIN_HEADER
 #define MAX_SHOTTIME 1000
 
 /* keyboard layouts */
-/* FIXME: shouldn't the below be #ifdef HAVE_SCROLLWHEEL rather? */
 
 #if (CONFIG_KEYPAD != SANSA_E200_PAD) && \
       (CONFIG_KEYPAD != SANSA_FUZE_PAD)
diff --git a/apps/plugins/calculator.c b/apps/plugins/calculator.c
index 7d93a24196..434f0482b7 100644
--- a/apps/plugins/calculator.c
+++ b/apps/plugins/calculator.c
@@ -210,9 +210,8 @@ PLUGIN_HEADER
 #define CALCULATOR_CALC      (BUTTON_SELECT|BUTTON_REPEAT)
 #if (CONFIG_KEYPAD == SANSA_E200_PAD)
 #define CALCULATOR_CLEAR     BUTTON_REC
-/* FIXME: define as soon as HOME works
 #elif (CONFIG_KEYPAD == SANSA_FUZE_PAD)
-#define CALCULATOR_CLEAR     BUTTON_HOME */
+#define CALCULATOR_CLEAR     BUTTON_HOME 
 #endif
 
 
diff --git a/apps/plugins/dict.c b/apps/plugins/dict.c
index 9c7e8594fa..34b762f3b0 100644
--- a/apps/plugins/dict.c
+++ b/apps/plugins/dict.c
@@ -102,7 +102,6 @@ long reverse (long N) {
 }
 #endif
 
-/* TODO: Clean up, most use BUTTON_POWER, could be the #else case */
 /* Button definitions */
 #if CONFIG_KEYPAD == PLAYER_PAD
 #define LP_QUIT BUTTON_STOP
@@ -145,7 +144,6 @@ long reverse (long N) {
 #endif
 
 /* data files */
-/* FIXME: use "PLUGIN_APPS_DIR" */
 #define DICT_INDEX ROCKBOX_DIR "/rocks/apps/dict.index"
 #define DICT_DESC ROCKBOX_DIR "/rocks/apps/dict.desc"
 
diff --git a/apps/plugins/euroconverter.c b/apps/plugins/euroconverter.c
index a9ec72d2b3..58c9f1c4ad 100644
--- a/apps/plugins/euroconverter.c
+++ b/apps/plugins/euroconverter.c
@@ -21,7 +21,6 @@
 #include "plugin.h"
 #include "lib/configfile.h"
 
-/* FIXME: Only for LCD_CHARCELL ?? */
 #ifdef HAVE_LCD_CHARCELLS
 
 /* Euro converter for the player */
diff --git a/apps/plugins/keybox.c b/apps/plugins/keybox.c
index 3c874a6549..5575a8b3a5 100644
--- a/apps/plugins/keybox.c
+++ b/apps/plugins/keybox.c
@@ -23,7 +23,6 @@
 PLUGIN_HEADER
 
 
-/* FIXME: use "PLUGIN_APPS_DIR" */
 #define KEYBOX_FILE PLUGIN_DIR "/apps/keybox.dat"
 #define BLOCK_SIZE 8
 #define MAX_ENTRIES 12*BLOCK_SIZE /* keep this a multiple of BLOCK_SIZE */
diff --git a/apps/plugins/matrix.c b/apps/plugins/matrix.c
index a3b0b850d8..d7d2469b07 100644
--- a/apps/plugins/matrix.c
+++ b/apps/plugins/matrix.c
@@ -49,7 +49,6 @@ extern const fb_data matrix_normal[];
 #define LEFTMARGIN (LCD_WIDTH-(COLS*COL_W))/2
 #define TOPMARGIN  (LCD_HEIGHT-(ROWS*COL_H))/2
 
-/* FIXME: could use plugin lib actions */
 #if (CONFIG_KEYPAD == IPOD_4G_PAD) || \
       (CONFIG_KEYPAD == IPOD_3G_PAD) || \
       (CONFIG_KEYPAD == IPOD_1G2G_PAD)
diff --git a/apps/plugins/mosaique.c b/apps/plugins/mosaique.c
index adb0d423f2..81b79c73ac 100644
--- a/apps/plugins/mosaique.c
+++ b/apps/plugins/mosaique.c
@@ -42,7 +42,6 @@ PLUGIN_HEADER
 #define GFX_HEIGHT 6
 #endif
 
-/* FIXME: could use plugin lib actions */
 /* variable button definitions */
 #if CONFIG_KEYPAD == RECORDER_PAD
 #define MOSAIQUE_QUIT BUTTON_OFF
diff --git a/apps/plugins/mp3_encoder.c b/apps/plugins/mp3_encoder.c
index b77058e97e..93de53edac 100644
--- a/apps/plugins/mp3_encoder.c
+++ b/apps/plugins/mp3_encoder.c
@@ -2427,7 +2427,6 @@ void get_mp3_filename(const char *wav_name)
 #define MP3ENC_NEXT BUTTON_DOWN
 #define MP3ENC_DONE BUTTON_POWER
 #define MP3ENC_SELECT BUTTON_SELECT
-/* FIXME: e200 could use scrollwheel */
 #elif (CONFIG_KEYPAD == SANSA_E200_PAD) || \
 (CONFIG_KEYPAD == SANSA_C200_PAD) || \
 (CONFIG_KEYPAD == SANSA_CLIP_PAD) || \
diff --git a/apps/plugins/nim.c b/apps/plugins/nim.c
index 4f8f33b03b..460e2751e9 100644
--- a/apps/plugins/nim.c
+++ b/apps/plugins/nim.c
@@ -20,7 +20,6 @@
  ****************************************************************************/
 #include "plugin.h"
 
-/* FIXME: Why only for charcell? */
 #ifdef HAVE_LCD_CHARCELLS
 
 /* NIM game for the player
diff --git a/apps/plugins/pegbox.c b/apps/plugins/pegbox.c
index 712d102a32..cc4d3aa7ab 100644
--- a/apps/plugins/pegbox.c
+++ b/apps/plugins/pegbox.c
@@ -39,7 +39,6 @@ PLUGIN_HEADER
 #define PB_USB  2
 #define PB_QUIT 1
 
-/* FIXME: USE PLUGIN_GAMES_DIR */
 #define DATA_FILE   PLUGIN_DIR "/games/pegbox.data"
 #define SAVE_FILE   PLUGIN_DIR "/games/pegbox.save"
 
diff --git a/apps/plugins/plasma.c b/apps/plugins/plasma.c
index 6bd4d095ce..1d3dd6c432 100644
--- a/apps/plugins/plasma.c
+++ b/apps/plugins/plasma.c
@@ -54,7 +54,6 @@ static size_t        gbuf_size = 0;
 static unsigned char sp1, sp2, sp3, sp4; /* Speed of plasma */
 static int plasma_frequency;
 
-/* FIXME: Could use plugin lib actions */
 /* Key assignement, all bitmapped models */
 #if (CONFIG_KEYPAD == IPOD_4G_PAD) || (CONFIG_KEYPAD == IPOD_3G_PAD) || \
     (CONFIG_KEYPAD == IPOD_1G2G_PAD)
@@ -67,7 +66,6 @@ static int plasma_frequency;
 #define PLASMA_INCREASE_FREQUENCY BUTTON_UP
 #define PLASMA_DECREASE_FREQUENCY BUTTON_DOWN
 
-/* FIXME: Clip/fuze should use HOME instead of POWER */
 #elif (CONFIG_KEYPAD == SANSA_E200_PAD) || \
       (CONFIG_KEYPAD == SANSA_C200_PAD) || \
       (CONFIG_KEYPAD == SANSA_CLIP_PAD) || \
diff --git a/apps/plugins/rockblox.c b/apps/plugins/rockblox.c
index 639728b370..a68df25f2a 100644
--- a/apps/plugins/rockblox.c
+++ b/apps/plugins/rockblox.c
@@ -41,7 +41,6 @@ PLUGIN_HEADER
 #define ROCKBLOX_RESTART       (BUTTON_SELECT | BUTTON_PLAY)
 #define ROCKBLOX_DROP          (BUTTON_SELECT | BUTTON_REL)
 
-/* FIXME: use HAVE_SCROLLWHEEL */
 #define SCROLL_WHEEL
 
 #elif (CONFIG_KEYPAD == IRIVER_H100_PAD) || \
@@ -115,7 +114,6 @@ PLUGIN_HEADER
 
 #elif CONFIG_KEYPAD == SANSA_E200_PAD
 
-/* FIXME: No #define SCROLL_WHEEL here? */
 #define ROCKBLOX_OFF           BUTTON_POWER
 #define ROCKBLOX_ROTATE_RIGHT  BUTTON_SCROLL_BACK
 #define ROCKBLOX_ROTATE_LEFT   BUTTON_SCROLL_FWD
@@ -127,7 +125,6 @@ PLUGIN_HEADER
 
 #elif CONFIG_KEYPAD == SANSA_FUZE_PAD
 
-/* FIXME: No #define SCROLL_WHEEL here? */
 #define ROCKBLOX_OFF           BUTTON_POWER
 #define ROCKBLOX_ROTATE_RIGHT  BUTTON_SCROLL_BACK
 #define ROCKBLOX_ROTATE_LEFT   BUTTON_SCROLL_FWD
@@ -135,7 +132,7 @@ PLUGIN_HEADER
 #define ROCKBLOX_LEFT          BUTTON_LEFT
 #define ROCKBLOX_RIGHT         BUTTON_RIGHT
 #define ROCKBLOX_DROP          BUTTON_SELECT
-/* FIXME:
+/* TODO:
 #define ROCKBLOX_RESTART       BUTTON_HOME */
 #define ROCKBLOX_RESTART       BUTTON_SELECT|BUTTON_DOWN
 
diff --git a/apps/plugins/rockblox1d.c b/apps/plugins/rockblox1d.c
index 0c6186b0ff..38126d2239 100644
--- a/apps/plugins/rockblox1d.c
+++ b/apps/plugins/rockblox1d.c
@@ -24,7 +24,6 @@
 
 PLUGIN_HEADER
 
-/* FIXME: Could use plugin lib action */
 
 #ifdef HAVE_LCD_BITMAP
 
diff --git a/apps/plugins/snow.c b/apps/plugins/snow.c
index 4996cd3fd5..1cfc3345ab 100644
--- a/apps/plugins/snow.c
+++ b/apps/plugins/snow.c
@@ -35,7 +35,6 @@ PLUGIN_HEADER
 #define MYLCD(fn) pgfx_ ## fn
 #endif
 
-/* FIXME: Could use pluginlib actions, or at least cleaned up */
 /* variable button definitions */
 #if CONFIG_KEYPAD == PLAYER_PAD
 #define SNOW_QUIT BUTTON_STOP
diff --git a/apps/plugins/stats.c b/apps/plugins/stats.c
index 95611e6f2e..0219d0fb0d 100644
--- a/apps/plugins/stats.c
+++ b/apps/plugins/stats.c
@@ -26,7 +26,6 @@ static int files, dirs, musicfiles, largestdir;
 static int lasttick;
 static bool abort;
 
-/* FIXME: Could use plugin lib actions or be cleaned up */
 #if CONFIG_KEYPAD == PLAYER_PAD 
 #define STATS_STOP BUTTON_STOP
 
diff --git a/apps/plugins/stopwatch.c b/apps/plugins/stopwatch.c
index 9395dde31e..0de01287cd 100644
--- a/apps/plugins/stopwatch.c
+++ b/apps/plugins/stopwatch.c
@@ -32,7 +32,6 @@ PLUGIN_HEADER
 #define LAP_Y TIMER_Y+1
 #define MAX_LAPS 64
 
-/* FIXME: Use PLUGIN_APPS_DIR */
 #define STOPWATCH_FILE ROCKBOX_DIR "/apps/stopwatch.dat"
 
 /* variable button definitions */
@@ -106,7 +105,6 @@ PLUGIN_HEADER
 #define STOPWATCH_SCROLL_UP BUTTON_UP
 #define STOPWATCH_SCROLL_DOWN BUTTON_DOWN
 
-/* FIXME: e200 could use scrollwheel */
 #elif (CONFIG_KEYPAD == SANSA_E200_PAD) || \
 (CONFIG_KEYPAD == SANSA_C200_PAD) || \
 (CONFIG_KEYPAD == SANSA_CLIP_PAD) || \
@@ -123,7 +121,6 @@ PLUGIN_HEADER
 #define STOPWATCH_START_STOP BUTTON_RIGHT
 #define STOPWATCH_RESET_TIMER BUTTON_LEFT
 #define STOPWATCH_LAP_TIMER BUTTON_SELECT
-/* FIXME: ipods scroll other way around, investigate */
 #define STOPWATCH_SCROLL_UP BUTTON_SCROLL_BACK
 #define STOPWATCH_SCROLL_DOWN BUTTON_SCROLL_FWD