len0rd/rockbox
1
0
Fork 1
mirror of https://github.com/Rockbox/rockbox.git synced 2025-10-14 02:27:39 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

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

Browse source 
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@19778 a1c6a512-1295-4272-9138-f99709370657
This commit is contained in:
Dominik Wenger 2009-01-16 15:35:05 +00:00
parent e6bf9f9ff8
commit 15013562dc
17 changed files with 19 additions and 26 deletions
Download patch file Download diff file Expand all files Collapse all files

19
apps/plugins/blackjack.c
View file

@ -160,8 +160,22 @@ PLUGIN_HEADER
#define BJACK_RIGHT BUTTON_RIGHT #define BJACK_RIGHT BUTTON_RIGHT
#define BJACK_LEFT BUTTON_LEFT #define BJACK_LEFT BUTTON_LEFT
#elif CONFIG_KEYPAD == SANSA_E200_PAD || \ #elif CONFIG_KEYPAD == SANSA_E200_PAD
(CONFIG_KEYPAD == SANSA_FUZE_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_START BUTTON_SELECT
#define BJACK_QUIT BUTTON_POWER #define BJACK_QUIT BUTTON_POWER
#define BJACK_MAX (BUTTON_SELECT|BUTTON_UP) #define BJACK_MAX (BUTTON_SELECT|BUTTON_UP)
@ -176,6 +190,7 @@ PLUGIN_HEADER
#define BJACK_RIGHT BUTTON_RIGHT #define BJACK_RIGHT BUTTON_RIGHT
#define BJACK_LEFT BUTTON_LEFT #define BJACK_LEFT BUTTON_LEFT
#elif CONFIG_KEYPAD == SANSA_C200_PAD #elif CONFIG_KEYPAD == SANSA_C200_PAD
#define BJACK_START BUTTON_SELECT #define BJACK_START BUTTON_SELECT
#define BJACK_QUIT BUTTON_POWER #define BJACK_QUIT BUTTON_POWER

1
apps/plugins/bubbles.c
View file

@ -59,7 +59,6 @@ PLUGIN_HEADER
#define MAX_SHOTTIME 1000 #define MAX_SHOTTIME 1000
/* keyboard layouts */ /* keyboard layouts */
/* FIXME: shouldn't the below be #ifdef HAVE_SCROLLWHEEL rather? */
#if (CONFIG_KEYPAD != SANSA_E200_PAD) && \ #if (CONFIG_KEYPAD != SANSA_E200_PAD) && \
(CONFIG_KEYPAD != SANSA_FUZE_PAD) (CONFIG_KEYPAD != SANSA_FUZE_PAD)

3
apps/plugins/calculator.c
View file

@ -210,9 +210,8 @@ PLUGIN_HEADER
#define CALCULATOR_CALC (BUTTON_SELECT|BUTTON_REPEAT) #define CALCULATOR_CALC (BUTTON_SELECT|BUTTON_REPEAT)
#if (CONFIG_KEYPAD == SANSA_E200_PAD) #if (CONFIG_KEYPAD == SANSA_E200_PAD)
#define CALCULATOR_CLEAR BUTTON_REC #define CALCULATOR_CLEAR BUTTON_REC
/* FIXME: define as soon as HOME works
#elif (CONFIG_KEYPAD == SANSA_FUZE_PAD) #elif (CONFIG_KEYPAD == SANSA_FUZE_PAD)
#define CALCULATOR_CLEAR BUTTON_HOME */ #define CALCULATOR_CLEAR BUTTON_HOME
#endif #endif

2
apps/plugins/dict.c
View file

@ -102,7 +102,6 @@ long reverse (long N) {
} }
#endif #endif
/* TODO: Clean up, most use BUTTON_POWER, could be the #else case */
/* Button definitions */ /* Button definitions */
#if CONFIG_KEYPAD == PLAYER_PAD #if CONFIG_KEYPAD == PLAYER_PAD
#define LP_QUIT BUTTON_STOP #define LP_QUIT BUTTON_STOP
@ -145,7 +144,6 @@ long reverse (long N) {
#endif #endif
/* data files */ /* data files */
/* FIXME: use "PLUGIN_APPS_DIR" */
#define DICT_INDEX ROCKBOX_DIR "/rocks/apps/dict.index" #define DICT_INDEX ROCKBOX_DIR "/rocks/apps/dict.index"
#define DICT_DESC ROCKBOX_DIR "/rocks/apps/dict.desc" #define DICT_DESC ROCKBOX_DIR "/rocks/apps/dict.desc"

1
apps/plugins/euroconverter.c
View file

@ -21,7 +21,6 @@
#include "plugin.h" #include "plugin.h"
#include "lib/configfile.h" #include "lib/configfile.h"
/* FIXME: Only for LCD_CHARCELL ?? */
#ifdef HAVE_LCD_CHARCELLS #ifdef HAVE_LCD_CHARCELLS
/* Euro converter for the player */ /* Euro converter for the player */

1
apps/plugins/keybox.c
View file

@ -23,7 +23,6 @@
PLUGIN_HEADER PLUGIN_HEADER
/* FIXME: use "PLUGIN_APPS_DIR" */
#define KEYBOX_FILE PLUGIN_DIR "/apps/keybox.dat" #define KEYBOX_FILE PLUGIN_DIR "/apps/keybox.dat"
#define BLOCK_SIZE 8 #define BLOCK_SIZE 8
#define MAX_ENTRIES 12*BLOCK_SIZE /* keep this a multiple of BLOCK_SIZE */ #define MAX_ENTRIES 12*BLOCK_SIZE /* keep this a multiple of BLOCK_SIZE */

1
apps/plugins/matrix.c
View file

@ -49,7 +49,6 @@ extern const fb_data matrix_normal[];
#define LEFTMARGIN (LCD_WIDTH-(COLS*COL_W))/2 #define LEFTMARGIN (LCD_WIDTH-(COLS*COL_W))/2
#define TOPMARGIN (LCD_HEIGHT-(ROWS*COL_H))/2 #define TOPMARGIN (LCD_HEIGHT-(ROWS*COL_H))/2
/* FIXME: could use plugin lib actions */
#if (CONFIG_KEYPAD == IPOD_4G_PAD) || \ #if (CONFIG_KEYPAD == IPOD_4G_PAD) || \
(CONFIG_KEYPAD == IPOD_3G_PAD) || \ (CONFIG_KEYPAD == IPOD_3G_PAD) || \
(CONFIG_KEYPAD == IPOD_1G2G_PAD) (CONFIG_KEYPAD == IPOD_1G2G_PAD)

1
apps/plugins/mosaique.c
View file

@ -42,7 +42,6 @@ PLUGIN_HEADER
#define GFX_HEIGHT 6 #define GFX_HEIGHT 6
#endif #endif
/* FIXME: could use plugin lib actions */
/* variable button definitions */ /* variable button definitions */
#if CONFIG_KEYPAD == RECORDER_PAD #if CONFIG_KEYPAD == RECORDER_PAD
#define MOSAIQUE_QUIT BUTTON_OFF #define MOSAIQUE_QUIT BUTTON_OFF

1
apps/plugins/mp3_encoder.c
View file

@ -2427,7 +2427,6 @@ void get_mp3_filename(const char *wav_name)
#define MP3ENC_NEXT BUTTON_DOWN #define MP3ENC_NEXT BUTTON_DOWN
#define MP3ENC_DONE BUTTON_POWER #define MP3ENC_DONE BUTTON_POWER
#define MP3ENC_SELECT BUTTON_SELECT #define MP3ENC_SELECT BUTTON_SELECT
/* FIXME: e200 could use scrollwheel */
#elif (CONFIG_KEYPAD == SANSA_E200_PAD) || \ #elif (CONFIG_KEYPAD == SANSA_E200_PAD) || \
(CONFIG_KEYPAD == SANSA_C200_PAD) || \ (CONFIG_KEYPAD == SANSA_C200_PAD) || \
(CONFIG_KEYPAD == SANSA_CLIP_PAD) || \ (CONFIG_KEYPAD == SANSA_CLIP_PAD) || \

1
apps/plugins/nim.c
View file

@ -20,7 +20,6 @@
****************************************************************************/ ****************************************************************************/
#include "plugin.h" #include "plugin.h"
/* FIXME: Why only for charcell? */
#ifdef HAVE_LCD_CHARCELLS #ifdef HAVE_LCD_CHARCELLS
/* NIM game for the player /* NIM game for the player

1
apps/plugins/pegbox.c
View file

@ -39,7 +39,6 @@ PLUGIN_HEADER
#define PB_USB 2 #define PB_USB 2
#define PB_QUIT 1 #define PB_QUIT 1
/* FIXME: USE PLUGIN_GAMES_DIR */
#define DATA_FILE PLUGIN_DIR "/games/pegbox.data" #define DATA_FILE PLUGIN_DIR "/games/pegbox.data"
#define SAVE_FILE PLUGIN_DIR "/games/pegbox.save" #define SAVE_FILE PLUGIN_DIR "/games/pegbox.save"

2
apps/plugins/plasma.c
View file

@ -54,7 +54,6 @@ static size_t gbuf_size = 0;
static unsigned char sp1, sp2, sp3, sp4; /* Speed of plasma */ static unsigned char sp1, sp2, sp3, sp4; /* Speed of plasma */
static int plasma_frequency; static int plasma_frequency;
/* FIXME: Could use plugin lib actions */
/* Key assignement, all bitmapped models */ /* Key assignement, all bitmapped models */
#if (CONFIG_KEYPAD == IPOD_4G_PAD) || (CONFIG_KEYPAD == IPOD_3G_PAD) || \ #if (CONFIG_KEYPAD == IPOD_4G_PAD) || (CONFIG_KEYPAD == IPOD_3G_PAD) || \
(CONFIG_KEYPAD == IPOD_1G2G_PAD) (CONFIG_KEYPAD == IPOD_1G2G_PAD)
@ -67,7 +66,6 @@ static int plasma_frequency;
#define PLASMA_INCREASE_FREQUENCY BUTTON_UP #define PLASMA_INCREASE_FREQUENCY BUTTON_UP
#define PLASMA_DECREASE_FREQUENCY BUTTON_DOWN #define PLASMA_DECREASE_FREQUENCY BUTTON_DOWN
/* FIXME: Clip/fuze should use HOME instead of POWER */
#elif (CONFIG_KEYPAD == SANSA_E200_PAD) || \ #elif (CONFIG_KEYPAD == SANSA_E200_PAD) || \
(CONFIG_KEYPAD == SANSA_C200_PAD) || \ (CONFIG_KEYPAD == SANSA_C200_PAD) || \
(CONFIG_KEYPAD == SANSA_CLIP_PAD) || \ (CONFIG_KEYPAD == SANSA_CLIP_PAD) || \

5
apps/plugins/rockblox.c
View file

@ -41,7 +41,6 @@ PLUGIN_HEADER
#define ROCKBLOX_RESTART (BUTTON_SELECT | BUTTON_PLAY) #define ROCKBLOX_RESTART (BUTTON_SELECT | BUTTON_PLAY)
#define ROCKBLOX_DROP (BUTTON_SELECT | BUTTON_REL) #define ROCKBLOX_DROP (BUTTON_SELECT | BUTTON_REL)
/* FIXME: use HAVE_SCROLLWHEEL */
#define SCROLL_WHEEL #define SCROLL_WHEEL
#elif (CONFIG_KEYPAD == IRIVER_H100_PAD) || \ #elif (CONFIG_KEYPAD == IRIVER_H100_PAD) || \
@ -115,7 +114,6 @@ PLUGIN_HEADER
#elif CONFIG_KEYPAD == SANSA_E200_PAD #elif CONFIG_KEYPAD == SANSA_E200_PAD
/* FIXME: No #define SCROLL_WHEEL here? */
#define ROCKBLOX_OFF BUTTON_POWER #define ROCKBLOX_OFF BUTTON_POWER
#define ROCKBLOX_ROTATE_RIGHT BUTTON_SCROLL_BACK #define ROCKBLOX_ROTATE_RIGHT BUTTON_SCROLL_BACK
#define ROCKBLOX_ROTATE_LEFT BUTTON_SCROLL_FWD #define ROCKBLOX_ROTATE_LEFT BUTTON_SCROLL_FWD
@ -127,7 +125,6 @@ PLUGIN_HEADER
#elif CONFIG_KEYPAD == SANSA_FUZE_PAD #elif CONFIG_KEYPAD == SANSA_FUZE_PAD
/* FIXME: No #define SCROLL_WHEEL here? */
#define ROCKBLOX_OFF BUTTON_POWER #define ROCKBLOX_OFF BUTTON_POWER
#define ROCKBLOX_ROTATE_RIGHT BUTTON_SCROLL_BACK #define ROCKBLOX_ROTATE_RIGHT BUTTON_SCROLL_BACK
#define ROCKBLOX_ROTATE_LEFT BUTTON_SCROLL_FWD #define ROCKBLOX_ROTATE_LEFT BUTTON_SCROLL_FWD
@ -135,7 +132,7 @@ PLUGIN_HEADER
#define ROCKBLOX_LEFT BUTTON_LEFT #define ROCKBLOX_LEFT BUTTON_LEFT
#define ROCKBLOX_RIGHT BUTTON_RIGHT #define ROCKBLOX_RIGHT BUTTON_RIGHT
#define ROCKBLOX_DROP BUTTON_SELECT #define ROCKBLOX_DROP BUTTON_SELECT
/* FIXME: /* TODO:
#define ROCKBLOX_RESTART BUTTON_HOME */ #define ROCKBLOX_RESTART BUTTON_HOME */
#define ROCKBLOX_RESTART BUTTON_SELECT|BUTTON_DOWN #define ROCKBLOX_RESTART BUTTON_SELECT|BUTTON_DOWN

1
apps/plugins/rockblox1d.c
View file

@ -24,7 +24,6 @@
PLUGIN_HEADER PLUGIN_HEADER
/* FIXME: Could use plugin lib action */
#ifdef HAVE_LCD_BITMAP #ifdef HAVE_LCD_BITMAP

1
apps/plugins/snow.c
View file

@ -35,7 +35,6 @@ PLUGIN_HEADER
#define MYLCD(fn) pgfx_ ## fn #define MYLCD(fn) pgfx_ ## fn
#endif #endif
/* FIXME: Could use pluginlib actions, or at least cleaned up */
/* variable button definitions */ /* variable button definitions */
#if CONFIG_KEYPAD == PLAYER_PAD #if CONFIG_KEYPAD == PLAYER_PAD
#define SNOW_QUIT BUTTON_STOP #define SNOW_QUIT BUTTON_STOP

1
apps/plugins/stats.c
View file

@ -26,7 +26,6 @@ static int files, dirs, musicfiles, largestdir;
static int lasttick; static int lasttick;
static bool abort; static bool abort;
/* FIXME: Could use plugin lib actions or be cleaned up */
#if CONFIG_KEYPAD == PLAYER_PAD #if CONFIG_KEYPAD == PLAYER_PAD
#define STATS_STOP BUTTON_STOP #define STATS_STOP BUTTON_STOP

3
apps/plugins/stopwatch.c
View file

@ -32,7 +32,6 @@ PLUGIN_HEADER
#define LAP_Y TIMER_Y+1 #define LAP_Y TIMER_Y+1
#define MAX_LAPS 64 #define MAX_LAPS 64
/* FIXME: Use PLUGIN_APPS_DIR */
#define STOPWATCH_FILE ROCKBOX_DIR "/apps/stopwatch.dat" #define STOPWATCH_FILE ROCKBOX_DIR "/apps/stopwatch.dat"
/* variable button definitions */ /* variable button definitions */
@ -106,7 +105,6 @@ PLUGIN_HEADER
#define STOPWATCH_SCROLL_UP BUTTON_UP #define STOPWATCH_SCROLL_UP BUTTON_UP
#define STOPWATCH_SCROLL_DOWN BUTTON_DOWN #define STOPWATCH_SCROLL_DOWN BUTTON_DOWN
/* FIXME: e200 could use scrollwheel */
#elif (CONFIG_KEYPAD == SANSA_E200_PAD) || \ #elif (CONFIG_KEYPAD == SANSA_E200_PAD) || \
(CONFIG_KEYPAD == SANSA_C200_PAD) || \ (CONFIG_KEYPAD == SANSA_C200_PAD) || \
(CONFIG_KEYPAD == SANSA_CLIP_PAD) || \ (CONFIG_KEYPAD == SANSA_CLIP_PAD) || \
@ -123,7 +121,6 @@ PLUGIN_HEADER
#define STOPWATCH_START_STOP BUTTON_RIGHT #define STOPWATCH_START_STOP BUTTON_RIGHT
#define STOPWATCH_RESET_TIMER BUTTON_LEFT #define STOPWATCH_RESET_TIMER BUTTON_LEFT
#define STOPWATCH_LAP_TIMER BUTTON_SELECT #define STOPWATCH_LAP_TIMER BUTTON_SELECT
/* FIXME: ipods scroll other way around, investigate */
#define STOPWATCH_SCROLL_UP BUTTON_SCROLL_BACK #define STOPWATCH_SCROLL_UP BUTTON_SCROLL_BACK
#define STOPWATCH_SCROLL_DOWN BUTTON_SCROLL_FWD #define STOPWATCH_SCROLL_DOWN BUTTON_SCROLL_FWD