Nyaaori/rockbox
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Rename some macros to account for the recently added M5 port. No code changes.

Browse source 
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@12809 a1c6a512-1295-4272-9138-f99709370657
This commit is contained in:
Jens Arnold 2007-03-16 23:02:39 +00:00
parent f3455d15e0
commit 85a226d4e7
68 changed files with 95 additions and 95 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
apps/SOURCES
View file

@ -114,7 +114,7 @@ keymaps/keymap-recorder.c
keymaps/keymap-ondio.c
#elif CONFIG_KEYPAD == PLAYER_PAD
keymaps/keymap-player.c
#elif CONFIG_KEYPAD == IAUDIO_X5_PAD
#elif CONFIG_KEYPAD == IAUDIO_X5M5_PAD
keymaps/keymap-x5.c
#elif CONFIG_KEYPAD == GIGABEAT_PAD
keymaps/keymap-gigabeat.c

2
apps/debug_menu.c
View file

@ -984,7 +984,7 @@ static bool dbg_spdif(void)
#elif CONFIG_KEYPAD == IRIVER_IFP7XX_PAD
# define DEBUG_CANCEL BUTTON_PLAY
#elif CONFIG_KEYPAD == IAUDIO_X5_PAD
#elif CONFIG_KEYPAD == IAUDIO_X5M5_PAD
# define DEBUG_CANCEL BUTTON_REC
#elif CONFIG_KEYPAD == GIGABEAT_PAD

2
apps/plugins/battery_bench.c
View file

@ -69,7 +69,7 @@ PLUGIN_HEADER
#define BATTERY_ON BUTTON_PLAY
#define BATTERY_OFF BUTTON_MENU
#elif CONFIG_KEYPAD == IAUDIO_X5_PAD
#elif CONFIG_KEYPAD == IAUDIO_X5M5_PAD
#define BATTERY_ON BUTTON_SELECT
#define BATTERY_OFF BUTTON_PLAY

4
apps/plugins/blackjack.c
View file

@ -112,7 +112,7 @@ PLUGIN_HEADER
#define BJACK_RIGHT BUTTON_RIGHT
#define BJACK_LEFT BUTTON_LEFT
#elif CONFIG_KEYPAD == IAUDIO_X5_PAD
#elif CONFIG_KEYPAD == IAUDIO_X5M5_PAD
#define BJACK_START BUTTON_PLAY
#define BJACK_QUIT BUTTON_POWER
#define BJACK_MAX (BUTTON_PLAY|BUTTON_UP)
@ -1052,7 +1052,7 @@ static unsigned int blackjack_menu(struct game_context* bj) {
rb->snprintf(str, 21, "High Score: $%d", bj->highscores[0]);
rb->lcd_puts(0, 9, str);
#endif
#elif CONFIG_KEYPAD == IAUDIO_X5_PAD
#elif CONFIG_KEYPAD == IAUDIO_X5M5_PAD
rb->lcd_puts(0, 2, "PLAY to start to hit");
rb->lcd_puts(0, 3, "POWER to exit");
rb->lcd_puts(0, 4, "SELECT to hit");

2
apps/plugins/bounce.c
View file

@ -63,7 +63,7 @@ PLUGIN_HEADER
#define BOUNCE_QUIT (BUTTON_MENU | BUTTON_REL)
#define BOUNCE_MODE (BUTTON_SELECT | BUTTON_REL)
#elif (CONFIG_KEYPAD == IAUDIO_X5_PAD)
#elif (CONFIG_KEYPAD == IAUDIO_X5M5_PAD)
#define BOUNCE_UP BUTTON_UP
#define BOUNCE_DOWN BUTTON_DOWN
#define BOUNCE_QUIT BUTTON_POWER

2
apps/plugins/brickmania.c
View file

@ -102,7 +102,7 @@ PLUGIN_HEADER
#define SCROLL_FWD(x) (0)
#define SCROLL_BACK(x) (0)
#elif CONFIG_KEYPAD == IAUDIO_X5_PAD /* grayscale at the moment */
#elif CONFIG_KEYPAD == IAUDIO_X5M5_PAD /* grayscale at the moment */
#define QUIT BUTTON_POWER
#define LEFT BUTTON_LEFT

2
apps/plugins/bubbles.c
View file

@ -2465,7 +2465,7 @@ static int bubbles(struct game_context* bb) {
rb->lcd_puts(0, 6, " and show high scores");
rb->lcd_puts(0, 7, "SCROLL to aim");
rb->lcd_puts(0, 8, " and to change level");
#elif CONFIG_KEYPAD == IAUDIO_X5_PAD
#elif CONFIG_KEYPAD == IAUDIO_X5M5_PAD
rb->lcd_puts(0, 2, "PLAY to start/pause");
rb->lcd_puts(0, 3, "REC to save/resume");
rb->lcd_puts(0, 4, "POWER to exit");

2
apps/plugins/calculator.c
View file

@ -155,7 +155,7 @@ PLUGIN_HEADER
#define CALCULATOR_INPUT (BUTTON_SELECT | BUTTON_REL)
#define CALCULATOR_CALC (BUTTON_PLAY | BUTTON_REPEAT)
#elif (CONFIG_KEYPAD == IAUDIO_X5_PAD)
#elif (CONFIG_KEYPAD == IAUDIO_X5M5_PAD)
#define CALCULATOR_UP BUTTON_UP
#define CALCULATOR_DOWN BUTTON_DOWN

2
apps/plugins/chessbox/chessbox.c
View file

@ -51,7 +51,7 @@ PLUGIN_HEADER
#define CB_RESTART (BUTTON_SELECT | BUTTON_LEFT)
#define CB_QUIT (BUTTON_SELECT | BUTTON_MENU)
#elif CONFIG_KEYPAD == IAUDIO_X5_PAD
#elif CONFIG_KEYPAD == IAUDIO_X5M5_PAD
#define CB_SELECT BUTTON_SELECT
#define CB_UP BUTTON_UP
#define CB_DOWN BUTTON_DOWN

2
apps/plugins/chessclock.c
View file

@ -98,7 +98,7 @@ PLUGIN_HEADER
#define CHC_SETTINGS_OK BUTTON_SELECT
#define CHC_SETTINGS_CANCEL BUTTON_PLAY
#elif CONFIG_KEYPAD == IAUDIO_X5_PAD
#elif CONFIG_KEYPAD == IAUDIO_X5M5_PAD
#define CHC_QUIT BUTTON_REC
#define CHC_STARTSTOP BUTTON_PLAY
#define CHC_RESET BUTTON_POWER

2
apps/plugins/chip8.c
View file

@ -999,7 +999,7 @@ STATIC void chip8 (void)
#define CHIP8_KEY6 BUTTON_RIGHT
#define CHIP8_KEY8 BUTTON_SCROLL_FWD
#elif (CONFIG_KEYPAD == IAUDIO_X5_PAD)
#elif (CONFIG_KEYPAD == IAUDIO_X5M5_PAD)
#define CHIP8_OFF BUTTON_POWER
#define CHIP8_KEY2 BUTTON_UP
#define CHIP8_KEY4 BUTTON_LEFT

2
apps/plugins/chopper.c
View file

@ -46,7 +46,7 @@ PLUGIN_HEADER
#define ACTION BUTTON_SELECT
#define ACTIONTEXT "SELECT"
#elif CONFIG_KEYPAD == IAUDIO_X5_PAD /* grayscale at the moment */
#elif CONFIG_KEYPAD == IAUDIO_X5M5_PAD /* grayscale at the moment */
#define QUIT BUTTON_POWER
#define ACTION BUTTON_UP

2
apps/plugins/clock.c
View file

@ -285,7 +285,7 @@ extern const fb_data clock_timesup[];
#define MODE_NEXT_BUTTON BUTTON_RIGHT
#define MODE_PREV_BUTTON BUTTON_LEFT
#define EXIT_RC_BUTTON BUTTON_RC_STOP
#elif (CONFIG_KEYPAD == IAUDIO_X5_PAD)
#elif (CONFIG_KEYPAD == IAUDIO_X5M5_PAD)
#define COUNTER_TOGGLE_BUTTON (BUTTON_PLAY|BUTTON_REL)
#define COUNTER_RESET_BUTTON (BUTTON_PLAY|BUTTON_REPEAT)
#define MENU_BUTTON BUTTON_SELECT

2
apps/plugins/cube.c
View file

@ -121,7 +121,7 @@ PLUGIN_HEADER
#define CUBE_PAUSE (BUTTON_SELECT | BUTTON_REL)
#define CUBE_HIGHSPEED (BUTTON_MODE | BUTTON_EQ) /* TODO: this is impossible */
#elif (CONFIG_KEYPAD == IAUDIO_X5_PAD)
#elif (CONFIG_KEYPAD == IAUDIO_X5M5_PAD)
#define CUBE_QUIT BUTTON_POWER
#define CUBE_X_INC BUTTON_LEFT
#define CUBE_X_DEC BUTTON_RIGHT

2
apps/plugins/demystify.c
View file

@ -45,7 +45,7 @@ PLUGIN_HEADER
#define DEMYSTIFY_REMOVE_POLYGON BUTTON_LEFT
#define DEMYSTIFY_INCREASE_SPEED BUTTON_SCROLL_UP
#define DEMYSTIFY_DECREASE_SPEED BUTTON_SCROLL_DOWN
#elif (CONFIG_KEYPAD == IAUDIO_X5_PAD)
#elif (CONFIG_KEYPAD == IAUDIO_X5M5_PAD)
#define DEMYSTIFY_QUIT BUTTON_POWER
#define DEMYSTIFY_ADD_POLYGON BUTTON_RIGHT
#define DEMYSTIFY_REMOVE_POLYGON BUTTON_LEFT

2
apps/plugins/dice.c
View file

@ -116,7 +116,7 @@ use stop to exit
#define DICE_BUTTON_ON (BUTTON_ON|BUTTON_REPEAT)
#define DICE_BUTTON_OFF BUTTON_MENU
#elif (CONFIG_KEYPAD == IAUDIO_X5_PAD)
#elif (CONFIG_KEYPAD == IAUDIO_X5M5_PAD)
#define DICE_BUTTON_UP BUTTON_UP
#define DICE_BUTTON_DOWN BUTTON_DOWN
#define DICE_BUTTON_LEFT BUTTON_LEFT

2
apps/plugins/dict.c
View file

@ -109,7 +109,7 @@ long reverse (long N) {
#define LP_QUIT BUTTON_MENU
#elif CONFIG_KEYPAD == IRIVER_IFP7XX_PAD
#define LP_QUIT BUTTON_PLAY
#elif CONFIG_KEYPAD == IAUDIO_X5_PAD
#elif CONFIG_KEYPAD == IAUDIO_X5M5_PAD
#define LP_QUIT BUTTON_POWER
#elif CONFIG_KEYPAD == GIGABEAT_PAD
#define LP_QUIT BUTTON_A

2
apps/plugins/disktidy.c
View file

@ -59,7 +59,7 @@ enum tidy_system
(CONFIG_KEYPAD == IPOD_4G_PAD)
#define TIDY_STOP BUTTON_MENU
#elif CONFIG_KEYPAD == IAUDIO_X5_PAD
#elif CONFIG_KEYPAD == IAUDIO_X5M5_PAD
#define TIDY_STOP BUTTON_POWER
#elif CONFIG_KEYPAD == GIGABEAT_PAD

2
apps/plugins/doom/i_video.c
View file

@ -158,7 +158,7 @@ void I_ShutdownGraphics(void)
#define DOOMBUTTON_SHOOT BUTTON_PLAY
#define DOOMBUTTON_ENTER BUTTON_SELECT
#define DOOMBUTTON_OPEN BUTTON_MENU
#elif CONFIG_KEYPAD == IAUDIO_X5_PAD
#elif CONFIG_KEYPAD == IAUDIO_X5M5_PAD
#define DOOMBUTTON_UP BUTTON_UP
#define DOOMBUTTON_DOWN BUTTON_DOWN
#define DOOMBUTTON_LEFT BUTTON_LEFT

2
apps/plugins/fire.c
View file

@ -80,7 +80,7 @@ static unsigned char draw_buffer[8*LCD_WIDTH];
#define FIRE_INCREASE_MULT BUTTON_SCROLL_FWD
#define FIRE_DECREASE_MULT BUTTON_SCROLL_BACK
#elif (CONFIG_KEYPAD == IAUDIO_X5_PAD)
#elif (CONFIG_KEYPAD == IAUDIO_X5M5_PAD)
#define FIRE_QUIT BUTTON_POWER
#define FIRE_SWITCH_FLAMES_TYPE BUTTON_LEFT
#define FIRE_SWITCH_FLAMES_MOVING BUTTON_RIGHT

2
apps/plugins/fireworks.c
View file

@ -45,7 +45,7 @@ static struct plugin_api* rb;
#elif (CONFIG_KEYPAD == ONDIO_PAD)
#define BTN_MENU BUTTON_MENU
#define BTN_FIRE BUTTON_UP
#elif (CONFIG_KEYPAD == IAUDIO_X5_PAD)
#elif (CONFIG_KEYPAD == IAUDIO_X5M5_PAD)
#define BTN_MENU BUTTON_POWER
#define BTN_FIRE BUTTON_SELECT
#elif (CONFIG_KEYPAD == IRIVER_IFP7XX_PAD)

4
apps/plugins/flipit.c
View file

@ -84,7 +84,7 @@ PLUGIN_HEADER
#define FLIPIT_TOGGLE_PRE BUTTON_SELECT
#define FLIPIT_TOGGLE (BUTTON_SELECT | BUTTON_REL)
#elif CONFIG_KEYPAD == IAUDIO_X5_PAD
#elif CONFIG_KEYPAD == IAUDIO_X5M5_PAD
#define FLIPIT_UP BUTTON_UP
#define FLIPIT_DOWN BUTTON_DOWN
@ -514,7 +514,7 @@ enum plugin_status plugin_start(struct plugin_api* api, void* parameter)
rb->lcd_putsxy(2, 28, "[S-LEFT] shuffle");
rb->lcd_putsxy(2, 38, "[S-PLAY] solution");
rb->lcd_putsxy(2, 48, "[S-RIGHT] step by step");
#elif CONFIG_KEYPAD == IAUDIO_X5_PAD
#elif CONFIG_KEYPAD == IAUDIO_X5M5_PAD
rb->lcd_putsxy(2, 8, "[POWER] to stop");
rb->lcd_putsxy(2, 18, "[SELECT] toggle");
rb->lcd_putsxy(2, 28, "[REC] shuffle");

2
apps/plugins/invadrox.c
View file

@ -76,7 +76,7 @@ PLUGIN_HEADER
#define RIGHT BUTTON_RIGHT
#define FIRE BUTTON_SELECT
#elif CONFIG_KEYPAD == IAUDIO_X5_PAD
#elif CONFIG_KEYPAD == IAUDIO_X5M5_PAD
#define QUIT BUTTON_POWER
#define LEFT BUTTON_LEFT

4
apps/plugins/jewels.c
View file

@ -78,7 +78,7 @@ PLUGIN_HEADER
#define JEWELS_SELECT BUTTON_SELECT
#define JEWELS_CANCEL BUTTON_PLAY
#elif CONFIG_KEYPAD == IAUDIO_X5_PAD
#elif CONFIG_KEYPAD == IAUDIO_X5M5_PAD
#define JEWELS_UP BUTTON_UP
#define JEWELS_DOWN BUTTON_DOWN
#define JEWELS_LEFT BUTTON_LEFT
@ -1287,7 +1287,7 @@ static int jewels_main(struct game_context* bj) {
rb->lcd_puts(0, 8, "Directions or scroll to move");
rb->lcd_puts(0, 9, "SELECT to select");
rb->lcd_puts(0, 10, "Long SELECT to show menu");
#elif CONFIG_KEYPAD == IAUDIO_X5_PAD
#elif CONFIG_KEYPAD == IAUDIO_X5M5_PAD
rb->lcd_puts(0, 2, "Swap pairs of jewels to");
rb->lcd_puts(0, 3, "form connected segments");
rb->lcd_puts(0, 4, "of three or more of the");

2
apps/plugins/jpeg.c
View file

@ -97,7 +97,7 @@ PLUGIN_HEADER
#define JPEG_NEXT (BUTTON_SELECT | BUTTON_RIGHT)
#define JPEG_PREVIOUS (BUTTON_SELECT | BUTTON_LEFT)
#elif CONFIG_KEYPAD == IAUDIO_X5_PAD
#elif CONFIG_KEYPAD == IAUDIO_X5M5_PAD
#define JPEG_ZOOM_PRE BUTTON_SELECT
#define JPEG_ZOOM_IN (BUTTON_SELECT | BUTTON_REL)
#define JPEG_ZOOM_OUT (BUTTON_SELECT | BUTTON_REPEAT)

6
apps/plugins/lib/pluginlib_actions.h
View file

@ -49,7 +49,7 @@ static const struct button_mapping generic_directions[] =
{
#if (CONFIG_KEYPAD == IRIVER_H100_PAD) \
|| (CONFIG_KEYPAD == IRIVER_H300_PAD) \
|| (CONFIG_KEYPAD == IAUDIO_X5_PAD) \
|| (CONFIG_KEYPAD == IAUDIO_X5M5_PAD) \
|| (CONFIG_KEYPAD == GIGABEAT_PAD) \
|| (CONFIG_KEYPAD == RECORDER_PAD) \
|| (CONFIG_KEYPAD == ARCHOS_AV300_PAD) \
@ -109,7 +109,7 @@ static const struct button_mapping generic_left_right_fire[] =
{
#if (CONFIG_KEYPAD == IRIVER_H100_PAD) \
|| (CONFIG_KEYPAD == IRIVER_H300_PAD) \
|| (CONFIG_KEYPAD == IAUDIO_X5_PAD) \
|| (CONFIG_KEYPAD == IAUDIO_X5M5_PAD) \
|| (CONFIG_KEYPAD == GIGABEAT_PAD) \
|| (CONFIG_KEYPAD == IRIVER_IFP7XX_PAD)
{ PLA_LEFT, BUTTON_LEFT, BUTTON_NONE},
@ -189,7 +189,7 @@ static const struct button_mapping generic_actions[] =
{PLA_MENU, BUTTON_MENU|BUTTON_REL, BUTTON_NONE},
{PLA_FIRE, BUTTON_SELECT|BUTTON_REL, BUTTON_SELECT},
{PLA_FIRE_REPEAT, BUTTON_SELECT|BUTTON_REPEAT, BUTTON_NONE},
#elif CONFIG_KEYPAD == IAUDIO_X5_PAD
#elif CONFIG_KEYPAD == IAUDIO_X5M5_PAD
{PLA_QUIT, BUTTON_POWER, BUTTON_NONE},
{PLA_START, BUTTON_PLAY, BUTTON_NONE},
{PLA_MENU, BUTTON_REC, BUTTON_NONE},

2
apps/plugins/logo.c
View file

@ -196,7 +196,7 @@ const unsigned char rockbox16x7[] = {
#define LP_INC_X BUTTON_RIGHT
#define LP_DEC_Y BUTTON_DOWN
#define LP_INC_Y BUTTON_UP
#elif CONFIG_KEYPAD == IAUDIO_X5_PAD
#elif CONFIG_KEYPAD == IAUDIO_X5M5_PAD
#define LP_QUIT BUTTON_POWER
#define LP_DEC_X BUTTON_LEFT
#define LP_INC_X BUTTON_RIGHT

2
apps/plugins/mandelbrot.c
View file

@ -93,7 +93,7 @@ PLUGIN_HEADER
#define MANDELBROT_MAXITER_DEC (BUTTON_SELECT | BUTTON_LEFT)
#define MANDELBROT_RESET (BUTTON_SELECT | BUTTON_PLAY)
#elif CONFIG_KEYPAD == IAUDIO_X5_PAD
#elif CONFIG_KEYPAD == IAUDIO_X5M5_PAD
#define MANDELBROT_QUIT BUTTON_POWER
#define MANDELBROT_UP BUTTON_UP
#define MANDELBROT_DOWN BUTTON_DOWN

2
apps/plugins/mazezam.c
View file

@ -62,7 +62,7 @@ static struct plugin_api* rb;
#define MAZEZAM_QUIT BUTTON_OFF
#define MAZEZAM_QUIT_KEYNAME "[OFF]"
#elif (CONFIG_KEYPAD == IAUDIO_X5_PAD)
#elif (CONFIG_KEYPAD == IAUDIO_X5M5_PAD)
#define MAZEZAM_UP BUTTON_UP
#define MAZEZAM_DOWN BUTTON_DOWN
#define MAZEZAM_LEFT BUTTON_LEFT

2
apps/plugins/midiplay.c
View file

@ -61,7 +61,7 @@ PLUGIN_IRAM_DECLARE
#define BTN_DOWN BUTTON_DOWN
#elif CONFIG_KEYPAD == IAUDIO_X5_PAD
#elif CONFIG_KEYPAD == IAUDIO_X5M5_PAD
#define BTN_QUIT BUTTON_POWER
#define BTN_RIGHT BUTTON_RIGHT
#define BTN_UP BUTTON_UP

4
apps/plugins/minesweeper.c
View file

@ -96,7 +96,7 @@ enum minesweeper_status {
# define MINESWP_RIGHT (BUTTON_SELECT | BUTTON_RIGHT)
# define MINESWP_LEFT (BUTTON_SELECT | BUTTON_LEFT)
#elif (CONFIG_KEYPAD == IAUDIO_X5_PAD)
#elif (CONFIG_KEYPAD == IAUDIO_X5M5_PAD)
# define MINESWP_UP BUTTON_UP
# define MINESWP_DOWN BUTTON_DOWN
# define MINESWP_QUIT BUTTON_POWER
@ -446,7 +446,7 @@ enum minesweeper_status menu( void )
|| (CONFIG_KEYPAD == IPOD_3G_PAD) \
|| (CONFIG_KEYPAD == GIGABEAT_PAD)
"SELECT to start"
#elif CONFIG_KEYPAD == IAUDIO_X5_PAD
#elif CONFIG_KEYPAD == IAUDIO_X5M5_PAD
"REC to start"
#elif CONFIG_KEYPAD == IRIVER_H10_PAD
"FF to start"

2
apps/plugins/mosaique.c
View file

@ -80,7 +80,7 @@ PLUGIN_HEADER
#define MOSAIQUE_SPEED BUTTON_MODE
#define MOSAIQUE_RESTART BUTTON_SELECT
#elif CONFIG_KEYPAD == IAUDIO_X5_PAD
#elif CONFIG_KEYPAD == IAUDIO_X5M5_PAD
#define MOSAIQUE_QUIT BUTTON_POWER
#define MOSAIQUE_SPEED BUTTON_SELECT
#define MOSAIQUE_RESTART BUTTON_PLAY

2
apps/plugins/mp3_encoder.c
View file

@ -2331,7 +2331,7 @@ void get_mp3_filename(char *wav_name)
#define MP3ENC_NEXT BUTTON_SCROLL_FWD
#define MP3ENC_DONE BUTTON_MENU
#define MP3ENC_SELECT BUTTON_SELECT
#elif CONFIG_KEYPAD == IAUDIO_X5_PAD
#elif CONFIG_KEYPAD == IAUDIO_X5M5_PAD
#define MP3ENC_PREV BUTTON_UP
#define MP3ENC_NEXT BUTTON_DOWN
#define MP3ENC_DONE BUTTON_POWER

2
apps/plugins/mpegplayer/mpegplayer.c
View file

@ -123,7 +123,7 @@ PLUGIN_IRAM_DECLARE
#define MPEG_PAUSE (BUTTON_PLAY | BUTTON_REL)
#define MPEG_STOP (BUTTON_PLAY | BUTTON_REPEAT)
#elif CONFIG_KEYPAD == IAUDIO_X5_PAD
#elif CONFIG_KEYPAD == IAUDIO_X5M5_PAD
#define MPEG_MENU (BUTTON_REC | BUTTON_REL)
#define MPEG_STOP BUTTON_POWER
#define MPEG_PAUSE BUTTON_PLAY

2
apps/plugins/oscilloscope.c
View file

@ -107,7 +107,7 @@ PLUGIN_HEADER
#define OSCILLOSCOPE_VOL_UP BUTTON_SCROLL_UP
#define OSCILLOSCOPE_VOL_DOWN BUTTON_SCROLL_DOWN
#elif CONFIG_KEYPAD == IAUDIO_X5_PAD
#elif CONFIG_KEYPAD == IAUDIO_X5M5_PAD
#define OSCILLOSCOPE_QUIT BUTTON_POWER
#define OSCILLOSCOPE_DRAWMODE_PRE BUTTON_SELECT
#define OSCILLOSCOPE_DRAWMODE (BUTTON_SELECT | BUTTON_REL)

2
apps/plugins/pacbox/pacbox.h
View file

@ -76,7 +76,7 @@
#define PACMAN_COIN BUTTON_A
#define PACMAN_MENU BUTTON_MENU
#elif CONFIG_KEYPAD == IAUDIO_X5_PAD
#elif CONFIG_KEYPAD == IAUDIO_X5M5_PAD
#define PACMAN_UP BUTTON_RIGHT
#define PACMAN_DOWN BUTTON_LEFT

4
apps/plugins/plasma.c
View file

@ -65,7 +65,7 @@ static int plasma_frequency;
#define PLASMA_INCREASE_FREQUENCY BUTTON_UP
#define PLASMA_DECREASE_FREQUENCY BUTTON_DOWN
#elif (CONFIG_KEYPAD == IAUDIO_X5_PAD)
#elif (CONFIG_KEYPAD == IAUDIO_X5M5_PAD)
#define PLASMA_QUIT BUTTON_POWER
#define PLASMA_INCREASE_FREQUENCY BUTTON_UP
#define PLASMA_DECREASE_FREQUENCY BUTTON_DOWN
@ -83,7 +83,7 @@ static int plasma_frequency;
#endif
#ifdef HAVE_LCD_COLOR
#if CONFIG_KEYPAD == IAUDIO_X5_PAD
#if CONFIG_KEYPAD == IAUDIO_X5M5_PAD
#define PLASMA_REGEN_COLORS BUTTON_PLAY
#elif CONFIG_KEYPAD == IRIVER_H10_PAD
#define PLASMA_REGEN_COLORS BUTTON_PLAY

2
apps/plugins/pong.c
View file

@ -84,7 +84,7 @@ PLUGIN_HEADER
#define PONG_RIGHT_UP BUTTON_RIGHT
#define PONG_RIGHT_DOWN BUTTON_PLAY
#elif (CONFIG_KEYPAD == IAUDIO_X5_PAD)
#elif (CONFIG_KEYPAD == IAUDIO_X5M5_PAD)
#define PONG_QUIT BUTTON_POWER
#define PONG_LEFT_UP BUTTON_UP
#define PONG_LEFT_DOWN BUTTON_DOWN

2
apps/plugins/random_folder_advance_config.c
View file

@ -46,7 +46,7 @@ struct file_format *list = NULL;
#elif CONFIG_KEYPAD == IRIVER_IFP7XX_PAD
#elif CONFIG_KEYPAD == IAUDIO_X5_PAD
#elif CONFIG_KEYPAD == IAUDIO_X5M5_PAD
#elif CONFIG_KEYPAD == GIGABEAT_PAD

2
apps/plugins/rockblox.c
View file

@ -96,7 +96,7 @@ PLUGIN_HEADER
#define ROCKBLOX_DROP_PRE BUTTON_MENU
#define ROCKBLOX_DROP (BUTTON_MENU|BUTTON_REL)
#elif CONFIG_KEYPAD == IAUDIO_X5_PAD
#elif CONFIG_KEYPAD == IAUDIO_X5M5_PAD
#define ROCKBLOX_OFF BUTTON_POWER
#define ROCKBLOX_ROTATE_RIGHT BUTTON_UP

2
apps/plugins/rockboy/rockboy.c
View file

@ -136,7 +136,7 @@ void setoptions (void)
options.START=BUTTON_SCROLL_UP;
options.SELECT=BUTTON_SCROLL_DOWN;
options.MENU=BUTTON_POWER;
#elif CONFIG_KEYPAD == IAUDIO_X5_PAD
#elif CONFIG_KEYPAD == IAUDIO_X5M5_PAD
options.A=BUTTON_PLAY;
options.B=BUTTON_REC;
options.START=BUTTON_SELECT;

2
apps/plugins/rockpaint.c
View file

@ -59,7 +59,7 @@ PLUGIN_HEADER
#define ROCKPAINT_LEFT BUTTON_LEFT
#define ROCKPAINT_RIGHT BUTTON_RIGHT
#elif ( CONFIG_KEYPAD == IAUDIO_X5_PAD )
#elif ( CONFIG_KEYPAD == IAUDIO_X5M5_PAD )
#define ROCKPAINT_QUIT BUTTON_POWER
#define ROCKPAINT_DRAW BUTTON_SELECT
#define ROCKPAINT_MENU BUTTON_PLAY

2
apps/plugins/sliding_puzzle.c
View file

@ -62,7 +62,7 @@ PLUGIN_HEADER
#define PUZZLE_SHUFFLE (BUTTON_SELECT | BUTTON_LEFT)
#define PUZZLE_PICTURE (BUTTON_SELECT | BUTTON_RIGHT)
#elif (CONFIG_KEYPAD == IAUDIO_X5_PAD)
#elif (CONFIG_KEYPAD == IAUDIO_X5M5_PAD)
#define PUZZLE_QUIT BUTTON_POWER
#define PUZZLE_UP BUTTON_UP
#define PUZZLE_DOWN BUTTON_DOWN

2
apps/plugins/snake.c
View file

@ -70,7 +70,7 @@ PLUGIN_HEADER
#define SNAKE_DOWN BUTTON_PLAY
#define SNAKE_PLAYPAUSE BUTTON_SELECT
#elif (CONFIG_KEYPAD == IAUDIO_X5_PAD)
#elif (CONFIG_KEYPAD == IAUDIO_X5M5_PAD)
#define SNAKE_QUIT BUTTON_POWER
#define SNAKE_UP BUTTON_UP
#define SNAKE_DOWN BUTTON_DOWN

2
apps/plugins/snake2.c
View file

@ -207,7 +207,7 @@ PLUGIN_HEADER
#define SNAKE2_PLAYPAUSE BUTTON_SELECT
#define SNAKE2_PLAYPAUSE_TEXT "Select"
#elif (CONFIG_KEYPAD == IAUDIO_X5_PAD)
#elif (CONFIG_KEYPAD == IAUDIO_X5M5_PAD)
#define SNAKE2_UP BUTTON_UP
#define SNAKE2_DOWN BUTTON_DOWN
#define SNAKE2_QUIT BUTTON_POWER

2
apps/plugins/snow.c
View file

@ -41,7 +41,7 @@ PLUGIN_HEADER
#define SNOW_QUIT BUTTON_MENU
#elif CONFIG_KEYPAD == IRIVER_IFP7XX_PAD
#define SNOW_QUIT BUTTON_PLAY
#elif CONFIG_KEYPAD == IAUDIO_X5_PAD
#elif CONFIG_KEYPAD == IAUDIO_X5M5_PAD
#define SNOW_QUIT BUTTON_POWER
#elif CONFIG_KEYPAD == GIGABEAT_PAD
#define SNOW_QUIT BUTTON_A

4
apps/plugins/sokoban.c
View file

@ -124,7 +124,7 @@ enum {
/* fixme: if/when simultaneous button presses work for X5,
add redo & level repeat */
#elif (CONFIG_KEYPAD == IAUDIO_X5_PAD)
#elif (CONFIG_KEYPAD == IAUDIO_X5M5_PAD)
#define SOKOBAN_UP BUTTON_UP
#define SOKOBAN_DOWN BUTTON_DOWN
#define SOKOBAN_QUIT BUTTON_POWER
@ -961,7 +961,7 @@ enum plugin_status plugin_start(struct plugin_api* api, void* parameter)
rb->lcd_putsxy(3, 26, "[SELECT+PLAY] Redo");
rb->lcd_putsxy(3, 36, "[SELECT+LEFT] Down a Level");
rb->lcd_putsxy(3, 46, "[SELECT+RIGHT] Up a Level");
#elif CONFIG_KEYPAD == IAUDIO_X5_PAD
#elif CONFIG_KEYPAD == IAUDIO_X5M5_PAD
rb->lcd_putsxy(3, 6, "[POWER] Quit");
rb->lcd_putsxy(3, 16, "[SELECT] Undo");
rb->lcd_putsxy(3, 26, "[REC] Down a Level");

2
apps/plugins/solitaire.c
View file

@ -154,7 +154,7 @@ static struct plugin_api* rb;
# define HK_CUR2STACK "MENU.."
# define HK_REM2STACK "RIGHT.."
#elif (CONFIG_KEYPAD == IAUDIO_X5_PAD)
#elif (CONFIG_KEYPAD == IAUDIO_X5M5_PAD)
# define SOL_QUIT BUTTON_POWER
# define SOL_UP BUTTON_UP
# define SOL_DOWN BUTTON_DOWN

4
apps/plugins/spacerocks.c
View file

@ -80,7 +80,7 @@ static struct plugin_api* rb; /* global api struct pointer */
#define AST_RC_QUIT BUTTON_RC_STOP
#elif (CONFIG_KEYPAD == IAUDIO_X5_PAD)
#elif (CONFIG_KEYPAD == IAUDIO_X5M5_PAD)
#define AST_PAUSE BUTTON_PLAY
#define AST_QUIT BUTTON_POWER
#define AST_THRUST_REP BUTTON_UP | BUTTON_REPEAT
@ -156,7 +156,7 @@ static struct plugin_api* rb; /* global api struct pointer */
#define LARGE_LCD 0
#elif (CONFIG_KEYPAD == IRIVER_H100_PAD) || \
(CONFIG_KEYPAD == IRIVER_H300_PAD) || \
(CONFIG_KEYPAD == IAUDIO_X5_PAD) || \
(CONFIG_KEYPAD == IAUDIO_X5M5_PAD) || \
(CONFIG_KEYPAD == IPOD_3G_PAD) || \
(CONFIG_KEYPAD == IPOD_4G_PAD) || \
(CONFIG_KEYPAD == GIGABEAT_PAD)|| \

4
apps/plugins/star.c
View file

@ -123,7 +123,7 @@ PLUGIN_HEADER
#define STAR_MENU_RUN BUTTON_RIGHT
#define STAR_MENU_RUN2 BUTTON_SELECT
#elif (CONFIG_KEYPAD == IAUDIO_X5_PAD)
#elif (CONFIG_KEYPAD == IAUDIO_X5M5_PAD)
#define STAR_QUIT BUTTON_POWER
#define STAR_UP BUTTON_UP
@ -1061,7 +1061,7 @@ static int star_menu(void)
"[S <] Prev. level\n"
"[S + PLAY] Reset level\n"
"[S >] Next level", true);
#elif CONFIG_KEYPAD == IAUDIO_X5_PAD
#elif CONFIG_KEYPAD == IAUDIO_X5M5_PAD
star_display_text("KEYS\n\n"
"[SELECT] Toggle Ctl\n"
"[POWER] Exit\n"

2
apps/plugins/starfield.c
View file

@ -33,7 +33,7 @@ static struct plugin_api* rb; /* global api struct pointer */
#define STARFIELD_DECREASE_ZMOVE BUTTON_SCROLL_BACK
#define STARFIELD_INCREASE_NB_STARS BUTTON_RIGHT
#define STARFIELD_DECREASE_NB_STARS BUTTON_LEFT
#elif (CONFIG_KEYPAD == IAUDIO_X5_PAD)
#elif (CONFIG_KEYPAD == IAUDIO_X5M5_PAD)
#define STARFIELD_QUIT BUTTON_POWER
#define STARFIELD_INCREASE_ZMOVE BUTTON_UP
#define STARFIELD_DECREASE_ZMOVE BUTTON_DOWN

2
apps/plugins/stats.c
View file

@ -48,7 +48,7 @@ static int fontwidth, fontheight;
#elif CONFIG_KEYPAD == IRIVER_IFP7XX_PAD
#define STATS_STOP BUTTON_PLAY
#elif CONFIG_KEYPAD == IAUDIO_X5_PAD
#elif CONFIG_KEYPAD == IAUDIO_X5M5_PAD
#define STATS_STOP BUTTON_POWER
#define STATS_STOP_REMOTE BUTTON_RC_PLAY

2
apps/plugins/stopwatch.c
View file

@ -88,7 +88,7 @@ PLUGIN_HEADER
#define STOPWATCH_LAP_TIMER BUTTON_SELECT
#define STOPWATCH_SCROLL_UP BUTTON_UP
#define STOPWATCH_SCROLL_DOWN BUTTON_DOWN
#elif CONFIG_KEYPAD == IAUDIO_X5_PAD
#elif CONFIG_KEYPAD == IAUDIO_X5M5_PAD
#define STOPWATCH_QUIT BUTTON_POWER
#define STOPWATCH_START_STOP BUTTON_PLAY
#define STOPWATCH_RESET_TIMER BUTTON_REC

2
apps/plugins/sudoku/sudoku.h
View file

@ -80,7 +80,7 @@
#define SUDOKU_BUTTON_TOGGLEBACK BUTTON_LEFT
#define SUDOKU_BUTTON_POSSIBLE BUTTON_PLAY
#elif (CONFIG_KEYPAD == IAUDIO_X5_PAD)
#elif (CONFIG_KEYPAD == IAUDIO_X5M5_PAD)
#define SUDOKU_BUTTON_QUIT BUTTON_POWER
#define SUDOKU_BUTTON_UP BUTTON_UP
#define SUDOKU_BUTTON_DOWN BUTTON_DOWN

2
apps/plugins/viewer.c
View file

@ -151,7 +151,7 @@ PLUGIN_HEADER
#define VIEWER_AUTOSCROLL BUTTON_SELECT
/* iAudio X5 keys */
#elif CONFIG_KEYPAD == IAUDIO_X5_PAD
#elif CONFIG_KEYPAD == IAUDIO_X5M5_PAD
#define VIEWER_QUIT BUTTON_POWER
#define VIEWER_PAGE_UP BUTTON_UP
#define VIEWER_PAGE_DOWN BUTTON_DOWN

2
apps/plugins/vu_meter.c
View file

@ -105,7 +105,7 @@ PLUGIN_HEADER
#define VUMETER_UP BUTTON_UP
#define VUMETER_DOWN BUTTON_DOWN
#elif CONFIG_KEYPAD == IAUDIO_X5_PAD
#elif CONFIG_KEYPAD == IAUDIO_X5M5_PAD
#define VUMETER_QUIT BUTTON_POWER
#define VUMETER_HELP BUTTON_PLAY
#define VUMETER_MENU BUTTON_SELECT

2
apps/plugins/wormlet.c
View file

@ -119,7 +119,7 @@ PLUGIN_HEADER
#define PLAYERS_TEXT "Up/Down"
#define WORMS_TEXT "Left/Right"
#elif (CONFIG_KEYPAD == IAUDIO_X5_PAD)
#elif (CONFIG_KEYPAD == IAUDIO_X5M5_PAD)
#define BTN_DIR_UP BUTTON_UP
#define BTN_DIR_DOWN BUTTON_DOWN

2
apps/plugins/xobox.c
View file

@ -56,7 +56,7 @@ PLUGIN_HEADER
#define UP BUTTON_MENU
#define DOWN BUTTON_PLAY
#elif CONFIG_KEYPAD == IAUDIO_X5_PAD
#elif CONFIG_KEYPAD == IAUDIO_X5M5_PAD
#define QUIT BUTTON_POWER
#define LEFT BUTTON_LEFT

2
apps/plugins/zxbox/keymaps.h
View file

@ -28,7 +28,7 @@
#define ZX_SELECT BUTTON_SELECT
#define ZX_MENU BUTTON_MENU
#elif CONFIG_KEYPAD == IAUDIO_X5_PAD
#elif CONFIG_KEYPAD == IAUDIO_X5M5_PAD
#define ZX_RIGHT BUTTON_RIGHT
#define ZX_LEFT BUTTON_LEFT

2
apps/plugins/zxbox/zxbox_keyb.c
View file

@ -68,7 +68,7 @@
#define KBD_UP BUTTON_UP
#define KBD_DOWN BUTTON_DOWN
#elif CONFIG_KEYPAD == IAUDIO_X5_PAD
#elif CONFIG_KEYPAD == IAUDIO_X5M5_PAD
/* TODO: Check keyboard mappings */

2
apps/recorder/keyboard.c
View file

@ -63,7 +63,7 @@
#elif CONFIG_KEYPAD == IRIVER_IFP7XX_PAD
#define KBD_MODES /* iFP7xx uses 2 modes, picker and line edit */
#elif CONFIG_KEYPAD == IAUDIO_X5_PAD
#elif CONFIG_KEYPAD == IAUDIO_X5M5_PAD
#define KBD_MODES /* iAudio X5 uses 2 modes, picker and line edit */
#elif CONFIG_KEYPAD == IRIVER_H10_PAD

2
apps/recorder/radio.c
View file

@ -79,7 +79,7 @@
#define FM_NEXT_PRESET
#define FM_PREV_PRESET
#elif (CONFIG_KEYPAD == IAUDIO_X5_PAD)
#elif (CONFIG_KEYPAD == IAUDIO_X5M5_PAD)
#define FM_PRESET
#define FM_MODE
/* This should be removeable if the whole tuning thing is sorted out since

9
firmware/export/config-iaudiom5.h
View file

@ -47,7 +47,7 @@
#define LCD_REMOTE_PIXELFORMAT VERTICAL_INTERLEAVED
#define CONFIG_KEYPAD IAUDIO_X5_PAD
#define CONFIG_KEYPAD IAUDIO_X5M5_PAD
#define AB_REPEAT_ENABLE 1
#define ACTION_WPSAB_SINGLE ACTION_WPS_BROWSE
@ -64,8 +64,7 @@
#define CONFIG_LCD LCD_S1D15E06
/* Define this for LCD backlight available */
#define CONFIG_BACKLIGHT BL_X5 /* PCF50606 I2C */
/* #define HAVE_BACKLIGHT_BRIGHTNESS TODO: not yet known */
#define CONFIG_BACKLIGHT BL_M5 /* PCF50606 I2C */
/* Define this if you have a software controlled poweroff */
#define HAVE_SW_POWEROFF
@ -108,7 +107,7 @@
/* Type of mobile power */
#define X5_BATT_CONFIG 2
#define CONFIG_BATTERY BATT_IAUDIO_X5
#define CONFIG_BATTERY BATT_IAUDIO_X5M5
#define BATTERY_CAPACITY_MIN 950 /* min. capacity selectable */
#define BATTERY_CAPACITY_MAX 2250 /* max. capacity selectable */
#define BATTERY_CAPACITY_INC 50 /* capacity increment */
@ -127,7 +126,7 @@
/* Offset ( in the firmware file's header ) to the real data */
#define FIRMWARE_OFFSET_FILE_DATA 8
#define USB_X5STYLE
#define USB_X5M5_STYLE
/* Define this if you have adjustable CPU frequency */
#define HAVE_ADJUSTABLE_CPU_FREQ

6
firmware/export/config-iaudiox5.h
View file

@ -49,7 +49,7 @@
#define LCD_REMOTE_PIXELFORMAT VERTICAL_INTERLEAVED
#define CONFIG_KEYPAD IAUDIO_X5_PAD
#define CONFIG_KEYPAD IAUDIO_X5M5_PAD
#define AB_REPEAT_ENABLE 1
#define ACTION_WPSAB_SINGLE ACTION_WPS_BROWSE
@ -122,7 +122,7 @@
/* Type of mobile power */
#define X5_BATT_CONFIG 2
#define CONFIG_BATTERY BATT_IAUDIO_X5
#define CONFIG_BATTERY BATT_IAUDIO_X5M5
#define BATTERY_CAPACITY_MIN 950 /* min. capacity selectable */
#define BATTERY_CAPACITY_MAX 2250 /* max. capacity selectable */
#define BATTERY_CAPACITY_INC 50 /* capacity increment */
@ -141,7 +141,7 @@
/* Offset ( in the firmware file's header ) to the real data */
#define FIRMWARE_OFFSET_FILE_DATA 8
#define USB_X5STYLE
#define USB_X5M5_STYLE
/* USB On-the-go */
#define CONFIG_USBOTG USBOTG_M5636

21
firmware/export/config.h
View file

@ -53,7 +53,7 @@
#define ONDIO_PAD 3
#define IRIVER_H100_PAD 4
#define IRIVER_H300_PAD 5
#define IAUDIO_X5_PAD 6
#define IAUDIO_X5M5_PAD 6
#define IPOD_4G_PAD 7
#define IPOD_3G_PAD 8
#define IRIVER_IFP7XX_PAD 9
@ -69,15 +69,15 @@
#define X5_REMOTE 3
/* CONFIG_BATTERY */
#define BATT_LIION2200 2200 /* FM/V2 recorder type */
#define BATT_4AA_NIMH 1500
#define BATT_3AAA 1000 /* Ondio */
#define BATT_IAUDIO_X5 950
#define BATT_LIPOL1300 1300 /* the type used in iRiver h1x0 models */
#define BATT_LPCS355385 1550 /* iriver h10 20Gb - SKC LPCS355385 */
#define BATT_BP009 820 /* iriver H10 5/6Gb - iriver BP009 */
#define BATT_LIION830 830 /* Toshiba Gigabeat Fxx and Xxx series MK11-2740 */
#define BATT_1AA 333 /* iRiver iFP: Alkaline, NiHM */
#define BATT_LIION2200 2200 /* FM/V2 recorder type */
#define BATT_4AA_NIMH 1500
#define BATT_3AAA 1000 /* Ondio */
#define BATT_IAUDIO_X5M5 950
#define BATT_LIPOL1300 1300 /* the type used in iRiver h1x0 models */
#define BATT_LPCS355385 1550 /* iriver h10 20Gb - SKC LPCS355385 */
#define BATT_BP009 820 /* iriver H10 5/6Gb - iriver BP009 */
#define BATT_LIION830 830 /* Toshiba Gigabeat Fxx and Xxx series MK11-2740 */
#define BATT_1AA 333 /* iRiver iFP: Alkaline, NiHM */
/* CONFIG_CHARGING */
#define CHARGING_SIMPLE 1 /* Simple, hardware controlled charging */
@ -128,6 +128,7 @@
#define BL_X5 13 /* iAudio X5 PCF50606 I2C */
#define BL_H10_5GB 14 /* iriver H10 5/6GB */
#define BL_TPJ1022 15 /* Tatung Elio TPJ-1022 */
#define BL_M5 16 /* iAudio M5 PCF50606 I2C */
/* CONFIG_I2C */
#define I2C_PLAYREC 1 /* Archos Player/Recorder style */

6
firmware/powermgmt.c
View file

@ -192,7 +192,7 @@ static const unsigned int battery_level_dangerous[BATTERY_TYPES_COUNT] =
338
#elif CONFIG_BATTERY == BATT_LIION830 /* Gigabeat F */
345
#elif CONFIG_BATTERY == BATT_IAUDIO_X5 /* iAudio X5 */
#elif CONFIG_BATTERY == BATT_IAUDIO_X5M5 /* iAudio X5 */
354
#elif CONFIG_BATTERY == BATT_LPCS355385 /* iriver H10 20GB: LiPolymer*/
376
@ -213,7 +213,7 @@ static const unsigned short battery_level_shutoff[BATTERY_TYPES_COUNT] =
302
#elif CONFIG_BATTERY == BATT_LIION830 /* Gigabeat F */
340
#elif CONFIG_BATTERY == BATT_IAUDIO_X5 /* iAudio X5 */
#elif CONFIG_BATTERY == BATT_IAUDIO_X5M5 /* iAudio X5 */
350
#elif CONFIG_BATTERY == BATT_LPCS355385 /* iriver H10 20GB */
365
@ -237,7 +237,7 @@ static const unsigned short percent_to_volt_discharge[BATTERY_TYPES_COUNT][11] =
#elif CONFIG_BATTERY == BATT_LIPOL1300
/* Below 337 the backlight starts flickering during HD access */
{ 337, 365, 370, 374, 378, 382, 387, 393, 400, 408, 416 }
#elif CONFIG_BATTERY == BATT_IAUDIO_X5
#elif CONFIG_BATTERY == BATT_IAUDIO_X5M5
/* iAudio x5 series - still experimenting with best curve */
// Lithium ion discharge curve
{ 355, 356, 357, 359, 362, 365, 369, 374, 380, 387, 395 }

2
firmware/usb.c
View file

@ -141,7 +141,7 @@ void usb_enable(bool on)
#elif defined(USB_ISP1582)
/* TODO: Implement USB_ISP1582 */
(void) on;
#elif defined(USB_X5STYLE)
#elif defined(USB_X5M5_STYLE)
/* TODO X5 */
#elif defined(USB_GIGABEAT_STYLE)
/* TODO gigabeat */

2
uisimulator/sdl/button.c
View file

@ -172,7 +172,7 @@ void button_event(int key, bool pressed)
new_btn = BUTTON_MENU;
break;
#elif CONFIG_KEYPAD == IAUDIO_X5_PAD
#elif CONFIG_KEYPAD == IAUDIO_X5M5_PAD
case SDLK_KP4:
case SDLK_LEFT:
new_btn = BUTTON_LEFT;