From 85a226d4e7dfcb4d5fe63dd1292bb667fa147cb0 Mon Sep 17 00:00:00 2001 From: Jens Arnold Date: Fri, 16 Mar 2007 23:02:39 +0000 Subject: [PATCH] Rename some macros to account for the recently added M5 port. No code changes. git-svn-id: svn://svn.rockbox.org/rockbox/trunk@12809 a1c6a512-1295-4272-9138-f99709370657 --- apps/SOURCES | 2 +- apps/debug_menu.c | 2 +- apps/plugins/battery_bench.c | 2 +- apps/plugins/blackjack.c | 4 ++-- apps/plugins/bounce.c | 2 +- apps/plugins/brickmania.c | 2 +- apps/plugins/bubbles.c | 2 +- apps/plugins/calculator.c | 2 +- apps/plugins/chessbox/chessbox.c | 2 +- apps/plugins/chessclock.c | 2 +- apps/plugins/chip8.c | 2 +- apps/plugins/chopper.c | 2 +- apps/plugins/clock.c | 2 +- apps/plugins/cube.c | 2 +- apps/plugins/demystify.c | 2 +- apps/plugins/dice.c | 2 +- apps/plugins/dict.c | 2 +- apps/plugins/disktidy.c | 2 +- apps/plugins/doom/i_video.c | 2 +- apps/plugins/fire.c | 2 +- apps/plugins/fireworks.c | 2 +- apps/plugins/flipit.c | 4 ++-- apps/plugins/invadrox.c | 2 +- apps/plugins/jewels.c | 4 ++-- apps/plugins/jpeg.c | 2 +- apps/plugins/lib/pluginlib_actions.h | 6 +++--- apps/plugins/logo.c | 2 +- apps/plugins/mandelbrot.c | 2 +- apps/plugins/mazezam.c | 2 +- apps/plugins/midiplay.c | 2 +- apps/plugins/minesweeper.c | 4 ++-- apps/plugins/mosaique.c | 2 +- apps/plugins/mp3_encoder.c | 2 +- apps/plugins/mpegplayer/mpegplayer.c | 2 +- apps/plugins/oscilloscope.c | 2 +- apps/plugins/pacbox/pacbox.h | 2 +- apps/plugins/plasma.c | 4 ++-- apps/plugins/pong.c | 2 +- apps/plugins/random_folder_advance_config.c | 2 +- apps/plugins/rockblox.c | 2 +- apps/plugins/rockboy/rockboy.c | 2 +- apps/plugins/rockpaint.c | 2 +- apps/plugins/sliding_puzzle.c | 2 +- apps/plugins/snake.c | 2 +- apps/plugins/snake2.c | 2 +- apps/plugins/snow.c | 2 +- apps/plugins/sokoban.c | 4 ++-- apps/plugins/solitaire.c | 2 +- apps/plugins/spacerocks.c | 4 ++-- apps/plugins/star.c | 4 ++-- apps/plugins/starfield.c | 2 +- apps/plugins/stats.c | 2 +- apps/plugins/stopwatch.c | 2 +- apps/plugins/sudoku/sudoku.h | 2 +- apps/plugins/viewer.c | 2 +- apps/plugins/vu_meter.c | 2 +- apps/plugins/wormlet.c | 2 +- apps/plugins/xobox.c | 2 +- apps/plugins/zxbox/keymaps.h | 2 +- apps/plugins/zxbox/zxbox_keyb.c | 2 +- apps/recorder/keyboard.c | 2 +- apps/recorder/radio.c | 2 +- firmware/export/config-iaudiom5.h | 9 ++++----- firmware/export/config-iaudiox5.h | 6 +++--- firmware/export/config.h | 21 +++++++++++---------- firmware/powermgmt.c | 6 +++--- firmware/usb.c | 2 +- uisimulator/sdl/button.c | 2 +- 68 files changed, 95 insertions(+), 95 deletions(-) diff --git a/apps/SOURCES b/apps/SOURCES index 3f0c2bd2d9..4a4d83d0e6 100644 --- a/apps/SOURCES +++ b/apps/SOURCES @@ -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 diff --git a/apps/debug_menu.c b/apps/debug_menu.c index c3532dbf8b..2b0381fef5 100644 --- a/apps/debug_menu.c +++ b/apps/debug_menu.c @@ -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 diff --git a/apps/plugins/battery_bench.c b/apps/plugins/battery_bench.c index b82fdef965..a4da7f4bb5 100644 --- a/apps/plugins/battery_bench.c +++ b/apps/plugins/battery_bench.c @@ -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 diff --git a/apps/plugins/blackjack.c b/apps/plugins/blackjack.c index 81ac65d142..f987eeb3b5 100644 --- a/apps/plugins/blackjack.c +++ b/apps/plugins/blackjack.c @@ -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"); diff --git a/apps/plugins/bounce.c b/apps/plugins/bounce.c index 40794241e6..46d9d88b21 100644 --- a/apps/plugins/bounce.c +++ b/apps/plugins/bounce.c @@ -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 diff --git a/apps/plugins/brickmania.c b/apps/plugins/brickmania.c index 2f1696f08a..38014e73a6 100644 --- a/apps/plugins/brickmania.c +++ b/apps/plugins/brickmania.c @@ -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 diff --git a/apps/plugins/bubbles.c b/apps/plugins/bubbles.c index bc862baeda..48ca231349 100644 --- a/apps/plugins/bubbles.c +++ b/apps/plugins/bubbles.c @@ -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"); diff --git a/apps/plugins/calculator.c b/apps/plugins/calculator.c index 2a8f8ffe45..05f9c73ba9 100644 --- a/apps/plugins/calculator.c +++ b/apps/plugins/calculator.c @@ -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 diff --git a/apps/plugins/chessbox/chessbox.c b/apps/plugins/chessbox/chessbox.c index da26d0f6db..0bd72ebcd8 100644 --- a/apps/plugins/chessbox/chessbox.c +++ b/apps/plugins/chessbox/chessbox.c @@ -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 diff --git a/apps/plugins/chessclock.c b/apps/plugins/chessclock.c index bb4045249a..acc35c3788 100644 --- a/apps/plugins/chessclock.c +++ b/apps/plugins/chessclock.c @@ -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 diff --git a/apps/plugins/chip8.c b/apps/plugins/chip8.c index 6e54669ef0..c18da43591 100644 --- a/apps/plugins/chip8.c +++ b/apps/plugins/chip8.c @@ -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 diff --git a/apps/plugins/chopper.c b/apps/plugins/chopper.c index 1efe202946..1c3d7a765c 100644 --- a/apps/plugins/chopper.c +++ b/apps/plugins/chopper.c @@ -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 diff --git a/apps/plugins/clock.c b/apps/plugins/clock.c index dfc5fd7163..59b98247b8 100644 --- a/apps/plugins/clock.c +++ b/apps/plugins/clock.c @@ -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 diff --git a/apps/plugins/cube.c b/apps/plugins/cube.c index 526400db61..f481ee3ff4 100644 --- a/apps/plugins/cube.c +++ b/apps/plugins/cube.c @@ -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 diff --git a/apps/plugins/demystify.c b/apps/plugins/demystify.c index d29f6c3b14..1a5dfae412 100644 --- a/apps/plugins/demystify.c +++ b/apps/plugins/demystify.c @@ -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 diff --git a/apps/plugins/dice.c b/apps/plugins/dice.c index 8638cb8cc3..7c265dac4b 100644 --- a/apps/plugins/dice.c +++ b/apps/plugins/dice.c @@ -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 diff --git a/apps/plugins/dict.c b/apps/plugins/dict.c index 4e5066af79..2fde18611e 100644 --- a/apps/plugins/dict.c +++ b/apps/plugins/dict.c @@ -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 diff --git a/apps/plugins/disktidy.c b/apps/plugins/disktidy.c index 651ed5f3ba..f5e34cd54d 100644 --- a/apps/plugins/disktidy.c +++ b/apps/plugins/disktidy.c @@ -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 diff --git a/apps/plugins/doom/i_video.c b/apps/plugins/doom/i_video.c index b69b017103..2274854b4a 100644 --- a/apps/plugins/doom/i_video.c +++ b/apps/plugins/doom/i_video.c @@ -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 diff --git a/apps/plugins/fire.c b/apps/plugins/fire.c index c293bf7af6..4917bf6a63 100644 --- a/apps/plugins/fire.c +++ b/apps/plugins/fire.c @@ -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 diff --git a/apps/plugins/fireworks.c b/apps/plugins/fireworks.c index 8b8ee3398b..f564b68b85 100644 --- a/apps/plugins/fireworks.c +++ b/apps/plugins/fireworks.c @@ -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) diff --git a/apps/plugins/flipit.c b/apps/plugins/flipit.c index d6083ee7e7..fd02bc4789 100644 --- a/apps/plugins/flipit.c +++ b/apps/plugins/flipit.c @@ -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"); diff --git a/apps/plugins/invadrox.c b/apps/plugins/invadrox.c index 270f08dd1b..5172edbb5e 100644 --- a/apps/plugins/invadrox.c +++ b/apps/plugins/invadrox.c @@ -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 diff --git a/apps/plugins/jewels.c b/apps/plugins/jewels.c index d4bef240e8..975f0cfa34 100644 --- a/apps/plugins/jewels.c +++ b/apps/plugins/jewels.c @@ -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"); diff --git a/apps/plugins/jpeg.c b/apps/plugins/jpeg.c index c6cb2701c0..900e6df72a 100644 --- a/apps/plugins/jpeg.c +++ b/apps/plugins/jpeg.c @@ -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) diff --git a/apps/plugins/lib/pluginlib_actions.h b/apps/plugins/lib/pluginlib_actions.h index 7ce43ce9e4..1a3ab522be 100644 --- a/apps/plugins/lib/pluginlib_actions.h +++ b/apps/plugins/lib/pluginlib_actions.h @@ -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}, diff --git a/apps/plugins/logo.c b/apps/plugins/logo.c index 68b8bc4b93..168e68cbb9 100644 --- a/apps/plugins/logo.c +++ b/apps/plugins/logo.c @@ -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 diff --git a/apps/plugins/mandelbrot.c b/apps/plugins/mandelbrot.c index 113737ba56..824fc03c87 100644 --- a/apps/plugins/mandelbrot.c +++ b/apps/plugins/mandelbrot.c @@ -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 diff --git a/apps/plugins/mazezam.c b/apps/plugins/mazezam.c index 8a737d235e..bd76245662 100644 --- a/apps/plugins/mazezam.c +++ b/apps/plugins/mazezam.c @@ -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 diff --git a/apps/plugins/midiplay.c b/apps/plugins/midiplay.c index 088b431a73..61a834755f 100644 --- a/apps/plugins/midiplay.c +++ b/apps/plugins/midiplay.c @@ -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 diff --git a/apps/plugins/minesweeper.c b/apps/plugins/minesweeper.c index 26565f335f..26c2df5233 100644 --- a/apps/plugins/minesweeper.c +++ b/apps/plugins/minesweeper.c @@ -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" diff --git a/apps/plugins/mosaique.c b/apps/plugins/mosaique.c index 093e642703..4e5928807c 100644 --- a/apps/plugins/mosaique.c +++ b/apps/plugins/mosaique.c @@ -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 diff --git a/apps/plugins/mp3_encoder.c b/apps/plugins/mp3_encoder.c index da0245eb2a..8f4b9bdda6 100644 --- a/apps/plugins/mp3_encoder.c +++ b/apps/plugins/mp3_encoder.c @@ -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 diff --git a/apps/plugins/mpegplayer/mpegplayer.c b/apps/plugins/mpegplayer/mpegplayer.c index f292e3dbb3..bd0b7a5a42 100644 --- a/apps/plugins/mpegplayer/mpegplayer.c +++ b/apps/plugins/mpegplayer/mpegplayer.c @@ -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 diff --git a/apps/plugins/oscilloscope.c b/apps/plugins/oscilloscope.c index c9120e4fe5..ee534313d1 100644 --- a/apps/plugins/oscilloscope.c +++ b/apps/plugins/oscilloscope.c @@ -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) diff --git a/apps/plugins/pacbox/pacbox.h b/apps/plugins/pacbox/pacbox.h index c326f9add8..4b8ec41ce5 100644 --- a/apps/plugins/pacbox/pacbox.h +++ b/apps/plugins/pacbox/pacbox.h @@ -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 diff --git a/apps/plugins/plasma.c b/apps/plugins/plasma.c index ff410528d4..d5decd1e2e 100644 --- a/apps/plugins/plasma.c +++ b/apps/plugins/plasma.c @@ -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 diff --git a/apps/plugins/pong.c b/apps/plugins/pong.c index b799a0a37a..b332dd6de9 100644 --- a/apps/plugins/pong.c +++ b/apps/plugins/pong.c @@ -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 diff --git a/apps/plugins/random_folder_advance_config.c b/apps/plugins/random_folder_advance_config.c index cd3bf9f1c2..3b387537b4 100644 --- a/apps/plugins/random_folder_advance_config.c +++ b/apps/plugins/random_folder_advance_config.c @@ -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 diff --git a/apps/plugins/rockblox.c b/apps/plugins/rockblox.c index c137814831..dda8987c36 100644 --- a/apps/plugins/rockblox.c +++ b/apps/plugins/rockblox.c @@ -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 diff --git a/apps/plugins/rockboy/rockboy.c b/apps/plugins/rockboy/rockboy.c index 9b514a4978..1534173114 100644 --- a/apps/plugins/rockboy/rockboy.c +++ b/apps/plugins/rockboy/rockboy.c @@ -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; diff --git a/apps/plugins/rockpaint.c b/apps/plugins/rockpaint.c index 2881c64309..34d9847042 100644 --- a/apps/plugins/rockpaint.c +++ b/apps/plugins/rockpaint.c @@ -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 diff --git a/apps/plugins/sliding_puzzle.c b/apps/plugins/sliding_puzzle.c index 1fccdade12..dfc0811506 100644 --- a/apps/plugins/sliding_puzzle.c +++ b/apps/plugins/sliding_puzzle.c @@ -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 diff --git a/apps/plugins/snake.c b/apps/plugins/snake.c index 6cf197b4b0..7551e59e40 100644 --- a/apps/plugins/snake.c +++ b/apps/plugins/snake.c @@ -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 diff --git a/apps/plugins/snake2.c b/apps/plugins/snake2.c index 350beb6dc1..cd4037ae70 100644 --- a/apps/plugins/snake2.c +++ b/apps/plugins/snake2.c @@ -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 diff --git a/apps/plugins/snow.c b/apps/plugins/snow.c index 64d3f2430b..555389019a 100644 --- a/apps/plugins/snow.c +++ b/apps/plugins/snow.c @@ -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 diff --git a/apps/plugins/sokoban.c b/apps/plugins/sokoban.c index 6892e83f31..d9c3e64a03 100644 --- a/apps/plugins/sokoban.c +++ b/apps/plugins/sokoban.c @@ -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"); diff --git a/apps/plugins/solitaire.c b/apps/plugins/solitaire.c index da01f0f608..b6bf23ca68 100644 --- a/apps/plugins/solitaire.c +++ b/apps/plugins/solitaire.c @@ -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 diff --git a/apps/plugins/spacerocks.c b/apps/plugins/spacerocks.c index 6f478987fe..74e65d8185 100644 --- a/apps/plugins/spacerocks.c +++ b/apps/plugins/spacerocks.c @@ -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)|| \ diff --git a/apps/plugins/star.c b/apps/plugins/star.c index 0287794031..03c0422158 100644 --- a/apps/plugins/star.c +++ b/apps/plugins/star.c @@ -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" diff --git a/apps/plugins/starfield.c b/apps/plugins/starfield.c index 93e4cac6ab..0c3acec8fc 100644 --- a/apps/plugins/starfield.c +++ b/apps/plugins/starfield.c @@ -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 diff --git a/apps/plugins/stats.c b/apps/plugins/stats.c index b69ab2d8e0..5625f7247a 100644 --- a/apps/plugins/stats.c +++ b/apps/plugins/stats.c @@ -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 diff --git a/apps/plugins/stopwatch.c b/apps/plugins/stopwatch.c index d113af7f25..e0ae300d23 100644 --- a/apps/plugins/stopwatch.c +++ b/apps/plugins/stopwatch.c @@ -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 diff --git a/apps/plugins/sudoku/sudoku.h b/apps/plugins/sudoku/sudoku.h index 04923be18e..94fae58d9a 100644 --- a/apps/plugins/sudoku/sudoku.h +++ b/apps/plugins/sudoku/sudoku.h @@ -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 diff --git a/apps/plugins/viewer.c b/apps/plugins/viewer.c index c12c1d41d2..4c5e37e56e 100644 --- a/apps/plugins/viewer.c +++ b/apps/plugins/viewer.c @@ -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 diff --git a/apps/plugins/vu_meter.c b/apps/plugins/vu_meter.c index 0f1f72cbc5..fff64d4b7f 100644 --- a/apps/plugins/vu_meter.c +++ b/apps/plugins/vu_meter.c @@ -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 diff --git a/apps/plugins/wormlet.c b/apps/plugins/wormlet.c index 22f49e2298..dce4931de6 100644 --- a/apps/plugins/wormlet.c +++ b/apps/plugins/wormlet.c @@ -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 diff --git a/apps/plugins/xobox.c b/apps/plugins/xobox.c index bfbadd2e6c..df7a65b2eb 100644 --- a/apps/plugins/xobox.c +++ b/apps/plugins/xobox.c @@ -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 diff --git a/apps/plugins/zxbox/keymaps.h b/apps/plugins/zxbox/keymaps.h index a967b3ab73..9bac74726c 100644 --- a/apps/plugins/zxbox/keymaps.h +++ b/apps/plugins/zxbox/keymaps.h @@ -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 diff --git a/apps/plugins/zxbox/zxbox_keyb.c b/apps/plugins/zxbox/zxbox_keyb.c index 693e48ba73..9bfcf5c4b0 100644 --- a/apps/plugins/zxbox/zxbox_keyb.c +++ b/apps/plugins/zxbox/zxbox_keyb.c @@ -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 */ diff --git a/apps/recorder/keyboard.c b/apps/recorder/keyboard.c index 0aa7188c01..9856e80d4a 100644 --- a/apps/recorder/keyboard.c +++ b/apps/recorder/keyboard.c @@ -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 diff --git a/apps/recorder/radio.c b/apps/recorder/radio.c index 47ca978475..ed14a4e282 100644 --- a/apps/recorder/radio.c +++ b/apps/recorder/radio.c @@ -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 diff --git a/firmware/export/config-iaudiom5.h b/firmware/export/config-iaudiom5.h index 66c54bfdd9..d714736035 100644 --- a/firmware/export/config-iaudiom5.h +++ b/firmware/export/config-iaudiom5.h @@ -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 diff --git a/firmware/export/config-iaudiox5.h b/firmware/export/config-iaudiox5.h index bf33e1c093..90959db345 100644 --- a/firmware/export/config-iaudiox5.h +++ b/firmware/export/config-iaudiox5.h @@ -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 diff --git a/firmware/export/config.h b/firmware/export/config.h index 13fb77661d..ae1ce5b283 100644 --- a/firmware/export/config.h +++ b/firmware/export/config.h @@ -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 */ diff --git a/firmware/powermgmt.c b/firmware/powermgmt.c index bbb98144fb..eced1a21a6 100644 --- a/firmware/powermgmt.c +++ b/firmware/powermgmt.c @@ -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 } diff --git a/firmware/usb.c b/firmware/usb.c index cf4641950e..264c53284d 100644 --- a/firmware/usb.c +++ b/firmware/usb.c @@ -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 */ diff --git a/uisimulator/sdl/button.c b/uisimulator/sdl/button.c index e9f627f148..76a41f2230 100644 --- a/uisimulator/sdl/button.c +++ b/uisimulator/sdl/button.c @@ -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;