+5 -3

apps/bitmaps/native/SOURCES

··· 11 11 rockboxlogo.160x50x16.bmp 12 12 #elif (LCD_WIDTH == 176) && (LCD_DEPTH == 16) 13 13 rockboxlogo.176x54x16.bmp 14 14 - #elif (LCD_WIDTH == 320) && (LCD_DEPTH == 16) 15 15 - rockboxlogo.320x98x16.bmp 16 16 - #elif (LCD_WIDTH >= 220) && (LCD_DEPTH == 16) 14 14 + #elif (LCD_WIDTH == 220) && (LCD_DEPTH == 16) 17 15 rockboxlogo.220x68x16.bmp 16 16 + #elif (LCD_WIDTH == 240) && (LCD_DEPTH == 16) 17 17 + rockboxlogo.240x74x16.bmp 18 18 + #elif (LCD_WIDTH >= 320) && (LCD_DEPTH == 16) 19 19 + rockboxlogo.320x98x16.bmp 18 20 #endif 19 21 20 22 #endif /* HAVE_LCD_BITMAP */

apps/bitmaps/native/rockboxlogo.240x74x16.bmp

This is a binary file and will not be displayed.

+5

apps/bookmark.h

··· 48 48 #define BOOKMARK_DELETE BUTTON_REC | BUTTON_REPEAT 49 49 #define BOOKMARK_DOWN BUTTON_DOWN 50 50 51 51 + #elif CONFIG_KEYPAD == GIGABEAT_PAD 52 52 + #define BOOKMARK_SELECT BUTTON_MENU 53 53 + #define BOOKMARK_DELETE BUTTON_POWER 54 54 + #define BOOKMARK_DOWN BUTTON_A 55 55 + 51 56 #else /* player, recorder, gmini */ 52 57 #define BOOKMARK_SELECT BUTTON_PLAY 53 58 #define BOOKMARK_DELETE (BUTTON_ON | BUTTON_PLAY)

+9

apps/eq_menu.c

··· 85 85 #define EQ_BTN_CHANGE_MODE BUTTON_SELECT 86 86 #define EQ_BTN_EXIT BUTTON_PLAY 87 87 88 88 + #elif (CONFIG_KEYPAD == GIGABEAT_PAD) 89 89 + 90 90 + #define EQ_BTN_DECREMENT BUTTON_LEFT 91 91 + #define EQ_BTN_INCREMENT BUTTON_RIGHT 92 92 + #define EQ_BTN_NEXT_BAND BUTTON_DOWN 93 93 + #define EQ_BTN_PREV_BAND BUTTON_UP 94 94 + #define EQ_BTN_CHANGE_MODE BUTTON_SELECT 95 95 + #define EQ_BTN_EXIT BUTTON_A 96 96 + 88 97 #endif 89 98 90 99

+23

apps/gui/gwps.h

··· 233 233 #define WPS_EXIT (BUTTON_PLAY | BUTTON_REPEAT) 234 234 #define WPS_CONTEXT (BUTTON_SELECT | BUTTON_REPEAT) 235 235 236 236 + #elif CONFIG_KEYPAD == GIGABEAT_PAD 237 237 + 238 238 + #define WPS_NEXT (BUTTON_RIGHT | BUTTON_REL) 239 239 + #define WPS_NEXT_PRE BUTTON_RIGHT 240 240 + #define WPS_PREV (BUTTON_LEFT | BUTTON_REL) 241 241 + #define WPS_PREV_PRE BUTTON_LEFT 242 242 + #define WPS_FFWD (BUTTON_RIGHT | BUTTON_REPEAT) 243 243 + #define WPS_REW (BUTTON_LEFT | BUTTON_REPEAT) 244 244 + #define WPS_INCVOL BUTTON_UP 245 245 + #define WPS_DECVOL BUTTON_DOWN 246 246 + #define WPS_PAUSE (BUTTON_POWER | BUTTON_REL) 247 247 + #define WPS_PAUSE_PRE BUTTON_POWER 248 248 + #define WPS_MENU (BUTTON_MENU | BUTTON_REL) 249 249 + #define WPS_MENU_PRE BUTTON_MENU 250 250 + #define WPS_BROWSE (BUTTON_SELECT | BUTTON_REL) 251 251 + #define WPS_BROWSE_PRE BUTTON_SELECT 252 252 + #define WPS_EXIT BUTTON_A 253 253 + #define WPS_ID3 (BUTTON_MENU | BUTTON_POWER) 254 254 + #define WPS_CONTEXT (BUTTON_SELECT | BUTTON_REPEAT) 255 255 + #define WPS_QUICK (BUTTON_MENU | BUTTON_REPEAT) 256 256 + #define WPS_NEXT_DIR (BUTTON_RIGHT | BUTTON_POWER) 257 257 + #define WPS_PREV_DIR (BUTTON_LEFT | BUTTON_POWER) 258 258 + 236 259 #endif 237 260 238 261 /* constants used in line_type and as refresh_mode for wps_refresh */

+4

apps/gui/list.h

··· 93 93 #define LIST_NEXT BUTTON_DOWN 94 94 #define LIST_PREV BUTTON_UP 95 95 96 96 + #elif CONFIG_KEYPAD == GIGABEAT_PAD 97 97 + #define LIST_NEXT BUTTON_DOWN 98 98 + #define LIST_PREV BUTTON_UP 99 99 + 96 100 #endif 97 101 98 102 /*

+8

apps/gui/select.h

··· 93 93 #define SELECT_CANCEL BUTTON_PLAY 94 94 #define SELECT_CANCEL2 BUTTON_POWER 95 95 96 96 + #elif CONFIG_KEYPAD == GIGABEAT_PAD 97 97 + #define SELECT_INC BUTTON_UP 98 98 + #define SELECT_DEC BUTTON_DOWN 99 99 + #define SELECT_OK BUTTON_MENU 100 100 + #define SELECT_OK2 BUTTON_LEFT 101 101 + #define SELECT_CANCEL BUTTON_A 102 102 + #define SELECT_CANCEL2 BUTTON_POWER 103 103 + 96 104 #endif 97 105 98 106 struct gui_select

+3

apps/gui/yesno.h

··· 32 32 #elif (CONFIG_KEYPAD == IAUDIO_X5_PAD) 33 33 #define YESNO_OK BUTTON_RIGHT 34 34 35 35 + #elif (CONFIG_KEYPAD == GIGABEAT_PAD) 36 36 + #define YESNO_OK BUTTON_RIGHT 37 37 + 35 38 #endif 36 39 enum yesno_res 37 40 {

+10

apps/menu.h

··· 95 95 #define MENU_EXIT_MENU BUTTON_REC 96 96 #define MENU_ENTER BUTTON_RIGHT 97 97 98 98 + #elif CONFIG_KEYPAD == GIGABEAT_PAD 99 99 + 100 100 + #define MENU_EXIT BUTTON_LEFT 101 101 + #define MENU_EXIT2 BUTTON_A 102 102 + #define MENU_EXIT_MENU BUTTON_MENU 103 103 + #define MENU_ENTER BUTTON_RIGHT 104 104 + #define MENU_ENTER2 BUTTON_SELECT 105 105 + #define MENU_NEXT BUTTON_DOWN 106 106 + #define MENU_PREV BUTTON_UP 107 107 + 98 108 #endif 99 109 100 110 struct menu_item {

+2

apps/plugins/battery_test.c

··· 47 47 #define BATTERY_TEST_QUIT BUTTON_MENU 48 48 #elif (CONFIG_KEYPAD == IAUDIO_X5_PAD) 49 49 #define BATTERY_TEST_QUIT BUTTON_POWER 50 50 + #elif (CONFIG_KEYPAD == GIGABEAT_PAD) 51 51 + #define BATTERY_TEST_QUIT BUTTON_A 50 52 #endif 51 53 52 54 static struct plugin_api* rb;

+2

apps/plugins/bitmaps/native/SOURCES

··· 15 15 bejeweled_jewels.160x128x16.bmp 16 16 #elif (LCD_WIDTH == 220) && (LCD_HEIGHT == 176) 17 17 bejeweled_jewels.220x176x16.bmp 18 18 + #elif (LCD_WIDTH == 240) && (LCD_HEIGHT == 320) 19 19 + bejeweled_jewels.220x176x16.bmp 18 20 #elif (LCD_WIDTH == 320) && (LCD_HEIGHT == 240) 19 21 bejeweled_jewels.320x240x16.bmp 20 22 #endif

+6

apps/plugins/bounce.c

··· 64 64 #define BOUNCE_QUIT BUTTON_POWER 65 65 #define BOUNCE_MODE BUTTON_PLAY 66 66 67 67 + #elif (CONFIG_KEYPAD == GIGABEAT_PAD) 68 68 + #define BOUNCE_UP BUTTON_UP 69 69 + #define BOUNCE_DOWN BUTTON_DOWN 70 70 + #define BOUNCE_QUIT BUTTON_A 71 71 + #define BOUNCE_MODE BUTTON_POWER 72 72 + 67 73 #endif 68 74 69 75 static struct plugin_api* rb;

+12

apps/plugins/brickmania.c

··· 75 75 #define SCROLL_FWD(x) ((x) & BUTTON_SCROLL_FWD) 76 76 #define SCROLL_BACK(x) ((x) & BUTTON_SCROLL_BACK) 77 77 78 78 + #elif (CONFIG_KEYPAD == GIGABEAT_PAD) 79 79 + 80 80 + #define QUIT BUTTON_A 81 81 + #define LEFT BUTTON_LEFT 82 82 + #define RIGHT BUTTON_RIGHT 83 83 + #define SELECT BUTTON_SELECT 84 84 + #define UP BUTTON_UP 85 85 + #define DOWN BUTTON_DOWN 86 86 + 87 87 + #define SCROLL_FWD(x) (0) 88 88 + #define SCROLL_BACK(x) (0) 89 89 + 78 90 #elif CONFIG_KEYPAD == IAUDIO_X5_PAD /* grayscale at the moment */ 79 91 80 92 #define QUIT BUTTON_POWER

+10

apps/plugins/calculator.c

··· 153 153 #define CALCULATOR_CALC BUTTON_PLAY 154 154 #define CALCULATOR_CLEAR BUTTON_REC 155 155 156 156 + #elif (CONFIG_KEYPAD == GIGABEAT_PAD) 157 157 + 158 158 + #define CALCULATOR_UP BUTTON_UP 159 159 + #define CALCULATOR_DOWN BUTTON_DOWN 160 160 + #define CALCULATOR_QUIT BUTTON_A 161 161 + #define CALCULATOR_INPUT_CALC_PRE BUTTON_MENU 162 162 + #define CALCULATOR_INPUT (BUTTON_MENU | BUTTON_REL) 163 163 + #define CALCULATOR_CALC BUTTON_SELECT 164 164 + #define CALCULATOR_CLEAR BUTTON_POWER 165 165 + 156 166 #endif 157 167 158 168 static struct plugin_api* rb;

+10

apps/plugins/chessclock.c

··· 96 96 #define CHC_SETTINGS_OK BUTTON_SELECT 97 97 #define CHC_SETTINGS_CANCEL BUTTON_REC 98 98 99 99 + #elif CONFIG_KEYPAD == GIGABEAT_PAD 100 100 + #define CHC_QUIT BUTTON_A 101 101 + #define CHC_STARTSTOP BUTTON_SELECT 102 102 + #define CHC_RESET BUTTON_POWER 103 103 + #define CHC_MENU BUTTON_MENU 104 104 + #define CHC_SETTINGS_INC BUTTON_RIGHT 105 105 + #define CHC_SETTINGS_DEC BUTTON_LEFT 106 106 + #define CHC_SETTINGS_OK BUTTON_MENU 107 107 + #define CHC_SETTINGS_CANCEL BUTTON_A 108 108 + 99 109 #endif 100 110 101 111

+8

apps/plugins/chip8.c

··· 992 992 #define CHIP8_KEY6 BUTTON_RIGHT 993 993 #define CHIP8_KEY8 BUTTON_DOWN 994 994 995 995 + #elif (CONFIG_KEYPAD == GIGABEAT_PAD) 996 996 + #define CHIP8_OFF BUTTON_A 997 997 + #define CHIP8_KEY2 BUTTON_UP 998 998 + #define CHIP8_KEY4 BUTTON_LEFT 999 999 + #define CHIP8_KEY5 BUTTON_MENU 1000 1000 + #define CHIP8_KEY6 BUTTON_RIGHT 1001 1001 + #define CHIP8_KEY8 BUTTON_DOWN 1002 1002 + 995 1003 #endif 996 1004 997 1005 static byte chip8_virtual_keys[16];

+13

apps/plugins/cube.c

··· 120 120 #define CUBE_PAUSE (BUTTON_PLAY | BUTTON_REL) 121 121 #define CUBE_HIGHSPEED (BUTTON_REC | BUTTON_REL) 122 122 123 123 + #elif (CONFIG_KEYPAD == GIGABEAT_PAD) 124 124 + #define CUBE_QUIT BUTTON_A 125 125 + #define CUBE_X_INC BUTTON_LEFT 126 126 + #define CUBE_X_DEC BUTTON_RIGHT 127 127 + #define CUBE_Y_INC BUTTON_UP 128 128 + #define CUBE_Y_DEC BUTTON_DOWN 129 129 + #define CUBE_Z_INC (BUTTON_POWER | BUTTON_UP) 130 130 + #define CUBE_Z_DEC (BUTTON_POWER | BUTTON_DOWN) 131 131 + #define CUBE_MODE BUTTON_MENU 132 132 + #define CUBE_PAUSE_PRE BUTTON_SELECT 133 133 + #define CUBE_PAUSE (BUTTON_SELECT | BUTTON_REL) 134 134 + #define CUBE_HIGHSPEED (BUTTON_POWER | BUTTON_REL) 135 135 + 123 136 #endif 124 137 125 138 #ifdef HAVE_LCD_BITMAP

+3

apps/plugins/databox/databox.c

··· 43 43 #elif CONFIG_KEYPAD == IAUDIO_X5_PAD 44 44 #define DBX_SELECT BUTTON_SELECT 45 45 #define DBX_STOP BUTTON_PLAY 46 46 + #elif CONFIG_KEYPAD == GIGABEAT_PAD 47 47 + #define DBX_SELECT BUTTON_SELECT 48 48 + #define DBX_STOP BUTTON_A 46 49 #endif 47 50 48 51 #define MAX_TOKENS 70

+6

apps/plugins/demystify.c

··· 38 38 #define DEMYSTIFY_REMOVE_POLYGON BUTTON_LEFT 39 39 #define DEMYSTIFY_INCREASE_SPEED BUTTON_UP 40 40 #define DEMYSTIFY_DECREASE_SPEED BUTTON_DOWN 41 41 + #elif (CONFIG_KEYPAD == GIGABEAT_PAD) 42 42 + #define DEMYSTIFY_QUIT BUTTON_A 43 43 + #define DEMYSTIFY_ADD_POLYGON BUTTON_RIGHT 44 44 + #define DEMYSTIFY_REMOVE_POLYGON BUTTON_LEFT 45 45 + #define DEMYSTIFY_INCREASE_SPEED BUTTON_UP 46 46 + #define DEMYSTIFY_DECREASE_SPEED BUTTON_DOWN 41 47 #else 42 48 #define DEMYSTIFY_QUIT BUTTON_OFF 43 49 #define DEMYSTIFY_ADD_POLYGON BUTTON_UP

+2

apps/plugins/dict.c

··· 110 110 #define LP_QUIT BUTTON_PLAY 111 111 #elif CONFIG_KEYPAD == IAUDIO_X5_PAD 112 112 #define LP_QUIT BUTTON_POWER 113 113 + #elif CONFIG_KEYPAD == GIGABEAT_PAD 114 114 + #define LP_QUIT BUTTON_A 113 115 #else 114 116 #define LP_QUIT BUTTON_OFF 115 117 #endif

+11

apps/plugins/flipit.c

··· 74 74 #define FLIPIT_TOGGLE_PRE BUTTON_SELECT 75 75 #define FLIPIT_TOGGLE (BUTTON_SELECT | BUTTON_REL) 76 76 77 77 + #elif (CONFIG_KEYPAD == GIGABEAT_PAD) 78 78 + 79 79 + #define FLIPIT_UP BUTTON_UP 80 80 + #define FLIPIT_DOWN BUTTON_DOWN 81 81 + #define FLIPIT_QUIT BUTTON_A 82 82 + #define FLIPIT_SHUFFLE (BUTTON_POWER | BUTTON_LEFT) 83 83 + #define FLIPIT_SOLVE (BUTTON_POWER | BUTTON_RIGHT) 84 84 + #define FLIPIT_STEP_BY_STEP (BUTTON_POWER | BUTTON_UP) 85 85 + #define FLIPIT_TOGGLE_PRE BUTTON_MENU 86 86 + #define FLIPIT_TOGGLE (BUTTON_MENU | BUTTON_REL) 87 87 + 77 88 #endif 78 89 79 90 static struct plugin_api* rb;

+11 -1

apps/plugins/jewels.c

··· 76 76 #define BEJEWELED_SELECT BUTTON_SELECT 77 77 #define BEJEWELED_CANCEL BUTTON_PLAY 78 78 79 79 + #elif CONFIG_KEYPAD == GIGABEAT_PAD 80 80 + #define BEJEWELED_UP BUTTON_UP 81 81 + #define BEJEWELED_DOWN BUTTON_DOWN 82 82 + #define BEJEWELED_LEFT BUTTON_LEFT 83 83 + #define BEJEWELED_RIGHT BUTTON_RIGHT 84 84 + #define BEJEWELED_QUIT BUTTON_A 85 85 + #define BEJEWELED_START BUTTON_POWER 86 86 + #define BEJEWELED_SELECT BUTTON_SELECT 87 87 + #define BEJEWELED_RESUME BUTTON_MENU 88 88 + 79 89 #else 80 90 #error BEJEWELED: Unsupported keypad 81 91 #endif ··· 88 98 #define NUM_SCORES 10 89 99 90 100 /* use 22x22 tiles (H300, iPod Color) */ 91 91 - #elif (LCD_HEIGHT == 176) && (LCD_WIDTH == 220) 101 101 + #elif ((LCD_HEIGHT == 176) && (LCD_WIDTH == 220)) || ((LCD_HEIGHT == 320) && (LCD_WIDTH == 240)) 92 102 #define TILE_WIDTH 22 93 103 #define TILE_HEIGHT 22 94 104 #define YOFS 0

+12

apps/plugins/jpeg.c

··· 97 97 #define JPEG_NEXT BUTTON_PLAY 98 98 #define JPEG_PREVIOUS BUTTON_REC 99 99 100 100 + #elif CONFIG_KEYPAD == GIGABEAT_PAD 101 101 + #define JPEG_ZOOM_IN_PRE BUTTON_MENU 102 102 + #define JPEG_ZOOM_IN (BUTTON_MENU | BUTTON_REL) 103 103 + #define JPEG_ZOOM_OUT (BUTTON_MENU | BUTTON_REPEAT) 104 104 + #define JPEG_UP BUTTON_UP 105 105 + #define JPEG_DOWN BUTTON_DOWN 106 106 + #define JPEG_LEFT BUTTON_LEFT 107 107 + #define JPEG_RIGHT BUTTON_RIGHT 108 108 + #define JPEG_QUIT BUTTON_A 109 109 + #define JPEG_NEXT (BUTTON_POWER | BUTTON_RIGHT) 110 110 + #define JPEG_PREVIOUS (BUTTON_POWER | BUTTON_LEFT) 111 111 + 100 112 #endif 101 113 102 114 /* different graphics libraries */

+6

apps/plugins/logo.c

··· 201 201 #define LP_INC_X BUTTON_RIGHT 202 202 #define LP_DEC_Y BUTTON_DOWN 203 203 #define LP_INC_Y BUTTON_UP 204 204 + #elif CONFIG_KEYPAD == GIGABEAT_PAD 205 205 + #define LP_QUIT BUTTON_A 206 206 + #define LP_DEC_X BUTTON_LEFT 207 207 + #define LP_INC_X BUTTON_RIGHT 208 208 + #define LP_DEC_Y BUTTON_DOWN 209 209 + #define LP_INC_Y BUTTON_UP 204 210 #else 205 211 #define LP_QUIT BUTTON_OFF 206 212 #define LP_DEC_X BUTTON_LEFT

+13

apps/plugins/mandelbrot.c

··· 90 90 #define MANDELBROT_MAXITER_INC (BUTTON_PLAY | BUTTON_RIGHT) 91 91 #define MANDELBROT_MAXITER_DEC (BUTTON_PLAY | BUTTON_LEFT) 92 92 #define MANDELBROT_RESET BUTTON_REC 93 93 + 94 94 + #elif CONFIG_KEYPAD == GIGABEAT_PAD 95 95 + #define MANDELBROT_QUIT BUTTON_A 96 96 + #define MANDELBROT_UP BUTTON_UP 97 97 + #define MANDELBROT_DOWN BUTTON_DOWN 98 98 + #define MANDELBROT_LEFT BUTTON_LEFT 99 99 + #define MANDELBROT_RIGHT BUTTON_RIGHT 100 100 + #define MANDELBROT_ZOOM_IN_PRE BUTTON_MENU 101 101 + #define MANDELBROT_ZOOM_IN (BUTTON_MENU | BUTTON_REL) 102 102 + #define MANDELBROT_ZOOM_OUT (BUTTON_MENU | BUTTON_REPEAT) 103 103 + #define MANDELBROT_MAXITER_INC (BUTTON_POWER | BUTTON_RIGHT) 104 104 + #define MANDELBROT_MAXITER_DEC (BUTTON_POWER | BUTTON_LEFT) 105 105 + #define MANDELBROT_RESET BUTTON_SELECT 93 106 #endif 94 107 95 108 #if LCD_DEPTH < 8

+9

apps/plugins/minesweeper.c

··· 89 89 #define MINESWP_DISCOVER BUTTON_SELECT 90 90 #define MINESWP_INFO (BUTTON_REC | BUTTON_PLAY) 91 91 92 92 + #elif (CONFIG_KEYPAD == GIGABEAT_PAD) 93 93 + #define MINESWP_UP BUTTON_UP 94 94 + #define MINESWP_DOWN BUTTON_DOWN 95 95 + #define MINESWP_QUIT BUTTON_A 96 96 + #define MINESWP_START BUTTON_SELECT 97 97 + #define MINESWP_TOGGLE BUTTON_SELECT 98 98 + #define MINESWP_DISCOVER BUTTON_POWER 99 99 + #define MINESWP_INFO BUTTON_MENU 100 100 + 92 101 #endif 93 102 94 103 /* here is a global api struct pointer. while not strictly necessary,

+5

apps/plugins/mosaique.c

··· 68 68 #define MOSAIQUE_SPEED BUTTON_SELECT 69 69 #define MOSAIQUE_RESTART BUTTON_PLAY 70 70 71 71 + #elif CONFIG_KEYPAD == GIGABEAT_PAD 72 72 + #define MOSAIQUE_QUIT BUTTON_A 73 73 + #define MOSAIQUE_SPEED BUTTON_MENU 74 74 + #define MOSAIQUE_RESTART BUTTON_SELECT 75 75 + 71 76 #endif 72 77 73 78 enum plugin_status plugin_start(struct plugin_api* api, void* parameter)

+6

apps/plugins/mp3_encoder.c

··· 1890 1890 #define MP3ENC_NEXT BUTTON_DOWN 1891 1891 #define MP3ENC_DONE BUTTON_POWER 1892 1892 #define MP3ENC_SELECT BUTTON_SELECT 1893 1893 + #define MP3ENC_SELECT BUTTON_MENU 1894 1894 + #elif CONFIG_KEYPAD == GIGABEAT_PAD 1895 1895 + #define MP3ENC_PREV BUTTON_UP 1896 1896 + #define MP3ENC_NEXT BUTTON_DOWN 1897 1897 + #define MP3ENC_DONE BUTTON_A 1898 1898 + #define MP3ENC_SELECT BUTTON_SELECT 1893 1899 #endif 1894 1900 1895 1901 enum plugin_status plugin_start(struct plugin_api* api, void* parameter)

+6

apps/plugins/plasma.c

··· 55 55 #define PLASMA_QUIT BUTTON_MENU 56 56 #define PLASMA_INCREASE_FREQUENCY BUTTON_SCROLL_FWD 57 57 #define PLASMA_DECREASE_FREQUENCY BUTTON_SCROLL_BACK 58 58 + #elif (CONFIG_KEYPAD == GIGABEAT_PAD) 59 59 + #define PLASMA_QUIT BUTTON_A 60 60 + #define PLASMA_INCREASE_FREQUENCY BUTTON_UP 61 61 + #define PLASMA_DECREASE_FREQUENCY BUTTON_DOWN 58 62 #elif (CONFIG_KEYPAD == IAUDIO_X5_PAD) 59 63 #define PLASMA_QUIT BUTTON_REC 60 64 #define PLASMA_INCREASE_FREQUENCY BUTTON_UP ··· 71 75 #elif CONFIG_KEYPAD == IPOD_4G_PAD 72 76 #define PLASMA_REGEN_COLORS BUTTON_SELECT 73 77 #elif CONFIG_KEYPAD == IRIVER_H300_PAD 78 78 + #define PLASMA_REGEN_COLORS BUTTON_SELECT 79 79 + #elif CONFIG_KEYPAD == GIGABEAT_PAD 74 80 #define PLASMA_REGEN_COLORS BUTTON_SELECT 75 81 #endif 76 82 #endif

+7

apps/plugins/pong.c

··· 72 72 #define PONG_RIGHT_UP BUTTON_REC 73 73 #define PONG_RIGHT_DOWN BUTTON_PLAY 74 74 75 75 + #elif (CONFIG_KEYPAD == GIGABEAT_PAD) 76 76 + #define PONG_QUIT BUTTON_A 77 77 + #define PONG_LEFT_UP BUTTON_UP 78 78 + #define PONG_LEFT_DOWN BUTTON_DOWN 79 79 + #define PONG_RIGHT_UP BUTTON_POWER 80 80 + #define PONG_RIGHT_DOWN BUTTON_MENU 81 81 + 75 82 #endif 76 83 77 84 static struct plugin_api* rb;

+6

apps/plugins/rockblox.c

··· 36 36 #define ROCKBLOX_DOWN BUTTON_DOWN 37 37 #define ROCKBLOX_LEFT BUTTON_LEFT 38 38 #define ROCKBLOX_RIGHT BUTTON_RIGHT 39 39 + #elif (CONFIG_KEYPAD == GIGABEAT_PAD) 40 40 + #define ROCKBLOX_OFF BUTTON_A 41 41 + #define ROCKBLOX_UP BUTTON_UP 42 42 + #define ROCKBLOX_DOWN BUTTON_DOWN 43 43 + #define ROCKBLOX_LEFT BUTTON_LEFT 44 44 + #define ROCKBLOX_RIGHT BUTTON_RIGHT 39 45 #else 40 46 #define ROCKBLOX_OFF BUTTON_OFF 41 47 #define ROCKBLOX_UP BUTTON_UP

+7

apps/plugins/sliding_puzzle.c

··· 59 59 #define PUZZLE_SHUFFLE BUTTON_REC 60 60 #define PUZZLE_PICTURE BUTTON_PLAY 61 61 62 62 + #elif (CONFIG_KEYPAD == GIGABEAT_PAD) 63 63 + #define PUZZLE_QUIT BUTTON_A 64 64 + #define PUZZLE_UP BUTTON_UP 65 65 + #define PUZZLE_DOWN BUTTON_DOWN 66 66 + #define PUZZLE_SHUFFLE BUTTON_SELECT 67 67 + #define PUZZLE_PICTURE BUTTON_POWER 68 68 + 62 69 #endif 63 70 64 71 static struct plugin_api* rb;

+6

apps/plugins/snake.c

··· 67 67 #define SNAKE_DOWN BUTTON_DOWN 68 68 #define SNAKE_PLAYPAUSE BUTTON_PLAY 69 69 70 70 + #elif (CONFIG_KEYPAD == GIGABEAT_PAD) 71 71 + #define SNAKE_QUIT BUTTON_A 72 72 + #define SNAKE_UP BUTTON_UP 73 73 + #define SNAKE_DOWN BUTTON_DOWN 74 74 + #define SNAKE_PLAYPAUSE BUTTON_SELECT 75 75 + 70 76 #else 71 77 #error "lacks keymapping" 72 78 #endif

+12

apps/plugins/snake2.c

··· 113 113 #define SNAKE2_SELECT_TYPE BUTTON_RIGHT 114 114 #define SNAKE2_PLAYPAUSE BUTTON_SELECT 115 115 116 116 + #elif (CONFIG_KEYPAD == GIGABEAT_PAD) 117 117 + #define SNAKE2_UP BUTTON_UP 118 118 + #define SNAKE2_DOWN BUTTON_DOWN 119 119 + #define SNAKE2_QUIT BUTTON_A 120 120 + #define SNAKE2_LEVEL_UP BUTTON_UP 121 121 + #define SNAKE2_LEVEL_UP2 BUTTON_RIGHT 122 122 + #define SNAKE2_LEVEL_DOWN BUTTON_DOWN 123 123 + #define SNAKE2_LEVEL_DOWN2 BUTTON_LEFT 124 124 + #define SNAKE2_SELECT_MAZE BUTTON_POWER 125 125 + #define SNAKE2_SELECT_TYPE BUTTON_MENU 126 126 + #define SNAKE2_PLAYPAUSE BUTTON_SELECT 127 127 + 116 128 #else 117 129 #error "lacks keymapping" 118 130 #endif

+2

apps/plugins/snow.c

··· 42 42 #define SNOW_QUIT BUTTON_PLAY 43 43 #elif CONFIG_KEYPAD == IAUDIO_X5_PAD 44 44 #define SNOW_QUIT BUTTON_POWER 45 45 + #elif CONFIG_KEYPAD == GIGABEAT_PAD 46 46 + #define SNOW_QUIT BUTTON_A 45 47 #else 46 48 #define SNOW_QUIT BUTTON_OFF 47 49 #endif

+9

apps/plugins/sokoban.c

··· 86 86 #define SOKOBAN_LEVEL_DOWN (BUTTON_PLAY | BUTTON_DOWN) 87 87 #define SOKOBAN_LEVEL_REPEAT BUTTON_REC 88 88 89 89 + #elif (CONFIG_KEYPAD == GIGABEAT_PAD) 90 90 + #define SOKOBAN_UP BUTTON_UP 91 91 + #define SOKOBAN_DOWN BUTTON_DOWN 92 92 + #define SOKOBAN_QUIT BUTTON_A 93 93 + #define SOKOBAN_UNDO BUTTON_MENU 94 94 + #define SOKOBAN_LEVEL_UP (BUTTON_POWER | BUTTON_UP) 95 95 + #define SOKOBAN_LEVEL_DOWN (BUTTON_POWER | BUTTON_DOWN) 96 96 + #define SOKOBAN_LEVEL_REPEAT BUTTON_SELECT 97 97 + 89 98 #endif 90 99 91 100 #ifdef HAVE_LCD_COLOR

+23 -1

apps/plugins/solitaire.c

··· 136 136 #define SOL_REM2STACK (BUTTON_REC | BUTTON_DOWN) 137 137 #define SOL_MENU_RUN BUTTON_SELECT 138 138 #define SOL_MENU_INFO BUTTON_PLAY 139 139 - 139 139 + 140 140 + #elif (CONFIG_KEYPAD == GIGABEAT_PAD) 141 141 + #define SOL_QUIT BUTTON_A 142 142 + #define SOL_UP BUTTON_UP 143 143 + #define SOL_DOWN BUTTON_DOWN 144 144 + #define SOL_LEFT BUTTON_LEFT 145 145 + #define SOL_RIGHT BUTTON_RIGHT 146 146 + #define SOL_MOVE_PRE BUTTON_SELECT 147 147 + #define SOL_MOVE (BUTTON_SELECT | BUTTON_REL) 148 148 + #define SOL_DRAW BUTTON_MENU 149 149 + #define SOL_REM2CUR (BUTTON_LEFT | BUTTON_POWER) 150 150 + #define SOL_CUR2STACK (BUTTON_SELECT | BUTTON_REPEAT) 151 151 + #define SOL_REM2STACK (BUTTON_RIGHT | BUTTON_POWER) 152 152 + #define SOL_MENU_RUN BUTTON_SELECT 153 153 + #define SOL_MENU_RUN2 BUTTON_RIGHT 154 154 + #define SOL_MENU_INFO BUTTON_MENU 140 155 #endif 141 156 142 157 /* common help definitions */ ··· 181 196 #define HELP_SOL_REM2CUR "REC+LEFT: Put the card on top of the remains' stack on top of the cursor." 182 197 #define HELP_SOL_CUR2STACK "REC+UP..: Put the card under the cursor on one of the 4 final stacks." 183 198 #define HELP_SOL_REM2STACK "REC+DOWN: Put the card on top of the remains' stack on one of the 4 final stacks." 199 199 + 200 200 + #elif (CONFIG_KEYPAD == GIGABEAT_PAD) 201 201 + #define HELP_SOL_MOVE "SELECT: Select cards, Move cards, reveal hidden cards ..." 202 202 + #define HELP_SOL_DRAW "MENU: Un-select a card if it was selected. Else, draw 3 new cards out of the remains' stack." 203 203 + #define HELP_SOL_REM2CUR "POWER+LEFT: Put the card on top of the remains' stack on top of the cursor." 204 204 + #define HELP_SOL_CUR2STACK "SELECT..: Put the card under the cursor on one of the 4 final stacks." 205 205 + #define HELP_SOL_REM2STACK "POWER+RIGHT: Put the card on top of the remains' stack on one of the 4 final stacks." 184 206 185 207 #endif 186 208

+12

apps/plugins/star.c

··· 122 122 #define STAR_LEVEL_REPEAT (BUTTON_PLAY | BUTTON_RIGHT) 123 123 #define STAR_MENU_RUN BUTTON_REC 124 124 125 125 + #elif (CONFIG_KEYPAD == GIGABEAT_PAD) 126 126 + 127 127 + #define STAR_QUIT BUTTON_A 128 128 + #define STAR_UP BUTTON_UP 129 129 + #define STAR_DOWN BUTTON_DOWN 130 130 + #define STAR_TOGGLE_CONTROL_PRE BUTTON_MENU 131 131 + #define STAR_TOGGLE_CONTROL (BUTTON_MENU | BUTTON_REL) 132 132 + #define STAR_LEVEL_UP (BUTTON_POWER | BUTTON_UP) 133 133 + #define STAR_LEVEL_DOWN (BUTTON_POWER | BUTTON_DOWN) 134 134 + #define STAR_LEVEL_REPEAT (BUTTON_POWER | BUTTON_RIGHT) 135 135 + #define STAR_MENU_RUN BUTTON_RIGHT 136 136 + 125 137 #endif 126 138 127 139 /* function returns because of USB? */

+6

apps/plugins/starfield.c

··· 38 38 #define STARFIELD_DECREASE_ZMOVE BUTTON_DOWN 39 39 #define STARFIELD_INCREASE_NB_STARS BUTTON_RIGHT 40 40 #define STARFIELD_DECREASE_NB_STARS BUTTON_LEFT 41 41 + #elif (CONFIG_KEYPAD == GIGABEAT_PAD) 42 42 + #define STARFIELD_QUIT BUTTON_A 43 43 + #define STARFIELD_INCREASE_ZMOVE BUTTON_UP 44 44 + #define STARFIELD_DECREASE_ZMOVE BUTTON_DOWN 45 45 + #define STARFIELD_INCREASE_NB_STARS BUTTON_RIGHT 46 46 + #define STARFIELD_DECREASE_NB_STARS BUTTON_LEFT 41 47 #else 42 48 #define STARFIELD_QUIT BUTTON_OFF 43 49 #define STARFIELD_INCREASE_ZMOVE BUTTON_UP

+2

apps/plugins/stats.c

··· 36 36 #define STATS_STOP BUTTON_PLAY 37 37 #elif CONFIG_KEYPAD == IAUDIO_X5_PAD 38 38 #define STATS_STOP BUTTON_POWER 39 39 + #elif CONFIG_KEYPAD == GIGABEAT_PAD 40 40 + #define STATS_STOP BUTTON_A 39 41 #else 40 42 #define STATS_STOP BUTTON_OFF 41 43 #endif

+7

apps/plugins/stopwatch.c

··· 84 84 #define STOPWATCH_LAP_TIMER BUTTON_SELECT 85 85 #define STOPWATCH_SCROLL_UP BUTTON_UP 86 86 #define STOPWATCH_SCROLL_DOWN BUTTON_DOWN 87 87 + #elif CONFIG_KEYPAD == GIGABEAT_PAD 88 88 + #define STOPWATCH_QUIT BUTTON_A 89 89 + #define STOPWATCH_START_STOP BUTTON_SELECT 90 90 + #define STOPWATCH_RESET_TIMER BUTTON_POWER 91 91 + #define STOPWATCH_LAP_TIMER BUTTON_MENU 92 92 + #define STOPWATCH_SCROLL_UP BUTTON_UP 93 93 + #define STOPWATCH_SCROLL_DOWN BUTTON_DOWN 87 94 #endif 88 95 89 96 static struct plugin_api* rb;

+8

apps/plugins/sudoku.c

··· 111 111 #define SUDOKU_BUTTON_MENU BUTTON_PLAY 112 112 #define SUDOKU_BUTTON_POSSIBLE BUTTON_REC 113 113 114 114 + #elif (CONFIG_KEYPAD == GIGABEAT_PAD) 115 115 + #define SUDOKU_BUTTON_QUIT BUTTON_A 116 116 + #define SUDOKU_BUTTON_UP BUTTON_UP 117 117 + #define SUDOKU_BUTTON_DOWN BUTTON_DOWN 118 118 + #define SUDOKU_BUTTON_TOGGLE BUTTON_SELECT 119 119 + #define SUDOKU_BUTTON_MENU BUTTON_MENU 120 120 + #define SUDOKU_BUTTON_POSSIBLE BUTTON_POWER 121 121 + 114 122 #elif 115 123 #error SUDOKU: Unsupported keypad 116 124 #endif

+11

apps/plugins/viewer.c

··· 152 152 #define VIEWER_MODE_LINE (BUTTON_PLAY | BUTTON_REPEAT) 153 153 #define VIEWER_MODE_WIDTH BUTTON_SELECT 154 154 155 155 + /* iAudio X5 keys */ 156 156 + #elif CONFIG_KEYPAD == GIGABEAT_PAD 157 157 + #define VIEWER_QUIT BUTTON_A 158 158 + #define VIEWER_PAGE_UP BUTTON_UP 159 159 + #define VIEWER_PAGE_DOWN BUTTON_DOWN 160 160 + #define VIEWER_SCREEN_LEFT BUTTON_LEFT 161 161 + #define VIEWER_SCREEN_RIGHT BUTTON_RIGHT 162 162 + #define VIEWER_MODE_WRAP (BUTTON_POWER | BUTTON_REL) 163 163 + #define VIEWER_MODE_LINE (BUTTON_POWER | BUTTON_REPEAT) 164 164 + #define VIEWER_MODE_WIDTH BUTTON_MENU 165 165 + 155 166 #endif 156 167 157 168 enum {

+14

apps/recorder/keyboard.c

··· 156 156 #define KBD_UP BUTTON_UP 157 157 #define KBD_DOWN BUTTON_DOWN 158 158 159 159 + #elif CONFIG_KEYPAD == GIGABEAT_PAD 160 160 + 161 161 + /* TODO: Check keyboard mappings */ 162 162 + 163 163 + #define KBD_MODES /* Gigabeat uses 2 modes, picker and line edit */ 164 164 + #define KBD_SELECT (BUTTON_MENU | BUTTON_REL) /* backspace in line edit */ 165 165 + #define KBD_SELECT_PRE BUTTON_MENU 166 166 + #define KBD_DONE BUTTON_POWER 167 167 + #define KBD_ABORT BUTTON_A 168 168 + #define KBD_LEFT BUTTON_LEFT 169 169 + #define KBD_RIGHT BUTTON_RIGHT 170 170 + #define KBD_UP BUTTON_UP 171 171 + #define KBD_DOWN BUTTON_DOWN 172 172 + 159 173 #endif 160 174 161 175 #if KEYBOARD_PAGES == 1

+9

apps/settings.h

··· 119 119 #define SETTINGS_NEXT BUTTON_RIGHT 120 120 #define SETTINGS_ACCEPT BUTTON_PLAY 121 121 122 122 + #elif CONFIG_KEYPAD == GIGABEAT_PAD 123 123 + #define SETTINGS_INC BUTTON_UP 124 124 + #define SETTINGS_DEC BUTTON_DOWN 125 125 + #define SETTINGS_OK BUTTON_MENU 126 126 + #define SETTINGS_CANCEL BUTTON_A 127 127 + #define SETTINGS_PREV BUTTON_LEFT 128 128 + #define SETTINGS_NEXT BUTTON_RIGHT 129 129 + #define SETTINGS_ACCEPT BUTTON_SELECT 130 130 + 122 131 #endif 123 132 124 133 /* data structures */

+17

apps/tree.h

··· 155 155 #define TREE_WPS_PRE BUTTON_REC 156 156 #define TREE_CONTEXT (BUTTON_SELECT | BUTTON_REPEAT) 157 157 #define TREE_POWER_BTN (BUTTON_PLAY | BUTTON_REPEAT) 158 158 + 159 159 + #elif CONFIG_KEYPAD == GIGABEAT_PAD 160 160 + 161 161 + #define TREE_NEXT BUTTON_DOWN 162 162 + #define TREE_PREV BUTTON_UP 163 163 + #define TREE_EXIT BUTTON_LEFT 164 164 + #define TREE_ABORT BUTTON_A 165 165 + #define TREE_ENTER BUTTON_RIGHT 166 166 + #define TREE_RUN (BUTTON_SELECT | BUTTON_REL) 167 167 + #define TREE_RUN_PRE BUTTON_SELECT 168 168 + #define TREE_MENU (BUTTON_MENU | BUTTON_REL) 169 169 + #define TREE_MENU_PRE BUTTON_MENU 170 170 + #define TREE_WPS (BUTTON_POWER | BUTTON_REL) 171 171 + #define TREE_WPS_PRE BUTTON_POWER 172 172 + #define TREE_CONTEXT (BUTTON_SELECT | BUTTON_REPEAT) 173 173 + #define TREE_POWER_BTN BUTTON_POWER 174 174 + 158 175 #endif 159 176 160 177 struct entry {

+4

firmware/app.lds

··· 130 130 #define DRAMORIG 0xc00000 + STUBOFFSET 131 131 #define IRAMORIG 0x400000 132 132 #define IRAMSIZE 0x8000 133 133 + #elif CONFIG_CPU==S3C2440 134 134 + #define DRAMORIG 0x30000000 + STUBOFFSET 135 135 + #define IRAMORIG 0x40000000 136 136 + #define IRAMSIZE 4K 133 137 #else 134 138 #define DRAMORIG 0x09000000 + STUBOFFSET 135 139 #define IRAMORIG 0x0f000000

+6

firmware/boot.lds

··· 38 38 #define IRAMSIZE 0x18000 39 39 #define FLASHORIG 0x001f0000 40 40 #define FLASHSIZE 2M 41 41 + #elif CONFIG_CPU == S3C2440 42 42 + #define DRAMORIG 0x30000000 43 43 + #define IRAMORIG 0x40000000 44 44 + #define IRAMSIZE 4K 45 45 + #define FLASHORIG 0x0000000 46 46 + #define FLASHSIZE 1M 41 47 #elif CONFIG_CPU == PP5002 42 48 #define DRAMORIG 0x28000000 43 49 #define IRAMORIG 0x40000000

+40

firmware/drivers/ata.c

··· 246 246 return ide_reg_temp; 247 247 } 248 248 249 249 + #elif defined(TOSHIBA_GIGABEAT_F) 250 250 + 251 251 + /* don't use sh7034 assembler routines */ 252 252 + #define PREFER_C_READING 253 253 + #define PREFER_C_WRITING 254 254 + 255 255 + #define ATA_IOBASE 0x20000000 256 256 + #define ATA_DATA (*((volatile unsigned short*)(ATA_IOBASE))) 257 257 + #define ATA_ERROR (*((volatile unsigned char*)(ATA_IOBASE + 0x02))) 258 258 + #define ATA_NSECTOR (*((volatile unsigned char*)(ATA_IOBASE + 0x04))) 259 259 + #define ATA_SECTOR (*((volatile unsigned char*)(ATA_IOBASE + 0x06))) 260 260 + #define ATA_LCYL (*((volatile unsigned char*)(ATA_IOBASE + 0x08))) 261 261 + #define ATA_HCYL (*((volatile unsigned char*)(ATA_IOBASE + 0x10))) 262 262 + #define ATA_SELECT (*((volatile unsigned char*)(ATA_IOBASE + 0x12))) 263 263 + #define ATA_COMMAND (*((volatile unsigned char*)(ATA_IOBASE + 0x14))) 264 264 + #define ATA_CONTROL (*((volatile unsigned char*)(0x21000000 + 0x1c))) 265 265 + 266 266 + #define STATUS_BSY 0x80 267 267 + #define STATUS_RDY 0x40 268 268 + #define STATUS_DF 0x20 269 269 + #define STATUS_DRQ 0x08 270 270 + #define STATUS_ERR 0x01 271 271 + #define ERROR_ABRT 0x04 272 272 + 273 273 + #define WRITE_PATTERN1 0xa5 274 274 + #define WRITE_PATTERN2 0x5a 275 275 + #define WRITE_PATTERN3 0xaa 276 276 + #define WRITE_PATTERN4 0x55 277 277 + 278 278 + #define READ_PATTERN1 0xa5 279 279 + #define READ_PATTERN2 0x5a 280 280 + #define READ_PATTERN3 0xaa 281 281 + #define READ_PATTERN4 0x55 282 282 + 283 283 + #define SET_REG(reg,val) reg = (val) 284 284 + #define SET_16BITREG(reg,val) reg = (val) 285 285 + 249 286 #endif 250 287 251 288 #define ATA_FEATURE ATA_ERROR ··· 1429 1466 #elif (CONFIG_CPU == PP5002) || (CONFIG_CPU == PP5020) 1430 1467 bool coldstart = false; 1431 1468 /* TODO: Implement coldstart variable */ 1469 1469 + #elif defined(TOSHIBA_GIGABEAT_F) 1470 1470 + /* TODO */ 1471 1471 + bool coldstart = true; 1432 1472 #else 1433 1473 bool coldstart = (PACR2 & 0x4000) != 0; 1434 1474 #endif

+8

firmware/drivers/power.c

··· 122 122 /* FM or V2, can also charge from the USB port */ 123 123 return (adc_read(ADC_CHARGE_REGULATOR) < 0x1FF) || 124 124 (adc_read(ADC_USB_POWER) < 0x1FF); 125 125 + #elif defined(TOSHIBA_GIGABEAT_F) 126 126 + return false; 125 127 #else 126 128 /* Player */ 127 129 return (PADR & 1) == 0; ··· 189 191 P1 &= ~0x08; 190 192 #elif CONFIG_CPU == PNX0101 191 193 /* no ide controller */ 194 194 + #elif defined(TOSHIBA_GIGABEAT_F) 195 195 + /* Gigabeat TODO */ 192 196 #else /* SH1 based archos */ 193 197 bool touched = false; 194 198 #ifdef NEEDS_ATA_POWER_ON ··· 241 245 return true; 242 246 #elif defined(GMINI_ARCH) 243 247 return (P1 & 0x08?true:false); 248 248 + #elif defined(TOSHIBA_GIGABEAT_F) 249 249 + return false; 244 250 #else /* SH1 based archos */ 245 251 #if defined(NEEDS_ATA_POWER_ON) || defined(HAVE_ATA_POWER_OFF) 246 252 #ifdef ATA_POWER_PLAYERSTYLE ··· 283 289 #elif defined(GMINI_ARCH) 284 290 P1 &= ~1; 285 291 P1CON &= ~1; 292 292 + #elif defined(TOSHIBA_GIGABEAT_F) 293 293 + /* FIXME: Can we turn the device off, or only enter sleep mode? */ 286 294 #else 287 295 #ifdef HAVE_POWEROFF_ON_PBDR 288 296 and_b(~0x10, &PBDRL);

+14

firmware/export/button.h

··· 197 197 198 198 #define BUTTON_RC_REC (BUTTON_REMOTE | 0x00400000) 199 199 200 200 + #elif CONFIG_KEYPAD == GIGABEAT_PAD 201 201 + 202 202 + /* TODO: These codes should relate to the hardware */ 203 203 + 204 204 + #define BUTTON_POWER 0x0001 205 205 + #define BUTTON_MENU 0x0002 206 206 + #define BUTTON_VOL_UP 0x0008 207 207 + #define BUTTON_VOL_DOWN 0x0010 208 208 + #define BUTTON_A 0x0020 209 209 + #define BUTTON_UP 0x0100 210 210 + #define BUTTON_DOWN 0x0200 211 211 + #define BUTTON_SELECT 0x0400 212 212 + 213 213 + 200 214 #endif /* RECORDER/PLAYER/ONDIO/GMINI KEYPAD */ 201 215 202 216 #endif /* _BUTTON_H_ */

+94

firmware/export/config-gigabeat.h

··· 1 1 + /* 2 2 + * This config file is for toshiba Gigabeat F 3 3 + */ 4 4 + #define TOSHIBA_GIGABEAT_F 1 5 5 + 6 6 + /* For Rolo and boot loader */ 7 7 + #define MODEL_NUMBER 1 8 8 + 9 9 + /* define this if you have a bitmap LCD display */ 10 10 + #define HAVE_LCD_BITMAP 1 11 11 + 12 12 + /* define this if you have a colour LCD */ 13 13 + #define HAVE_LCD_COLOR 1 14 14 + 15 15 + /* LCD dimensions */ 16 16 + #define LCD_WIDTH 240 17 17 + #define LCD_HEIGHT 320 18 18 + #define LCD_DEPTH 16 /* 65k colours */ 19 19 + #define LCD_PIXELFORMAT RGB565 /* rgb565 */ 20 20 + 21 21 + 22 22 + #define CONFIG_KEYPAD GIGABEAT_PAD 23 23 + 24 24 + /* Define this if you do software codec */ 25 25 + #define CONFIG_CODEC SWCODEC 26 26 + 27 27 + /* define this if you have a real-time clock */ 28 28 + //#define CONFIG_RTC RTC_PCF50606 29 29 + 30 30 + /* Define this for LCD backlight available */ 31 31 + #define CONFIG_BACKLIGHT BL_GIGABEAT /* port controlled PWM */ 32 32 + 33 33 + /* Define this if you have a software controlled poweroff */ 34 34 + #define HAVE_SW_POWEROFF 35 35 + 36 36 + /* The number of bytes reserved for loadable codecs */ 37 37 + #define CODEC_SIZE 0x80000 38 38 + 39 39 + /* The number of bytes reserved for loadable plugins */ 40 40 + #define PLUGIN_BUFFER_SIZE 0x80000 41 41 + 42 42 + /* Define this if you have the WM8975 audio codec */ 43 43 + #define HAVE_WM8751 44 44 + 45 45 + #ifndef SIMULATOR 46 46 + 47 47 + /* Define this if you have a Motorola SCF5249 */ 48 48 + #define CONFIG_CPU S3C2440 49 49 + 50 50 + /* Define this if you want to use coldfire's i2c interface */ 51 51 + #define CONFIG_I2C I2C_S3C2440 52 52 + 53 53 + /* Type of mobile power */ 54 54 + #define CONFIG_BATTERY BATT_LIPOL1300 55 55 + 56 56 + #define BATTERY_SCALE_FACTOR 23437 /* FIX: this value is picked at random */ 57 57 + 58 58 + /* Define this if the platform can charge batteries */ 59 59 + #define HAVE_CHARGING 1 60 60 + 61 61 + /* define this if the hardware can be powered off while charging */ 62 62 + #define HAVE_POWEROFF_WHILE_CHARGING 63 63 + 64 64 + /* The size of the flash ROM */ 65 65 + #define FLASH_SIZE 0x400000 66 66 + 67 67 + /* Define this to the CPU frequency */ 68 68 + #define CPU_FREQ 16934400 69 69 + 70 70 + /* Define this if you have ATA power-off control */ 71 71 + #define HAVE_ATA_POWER_OFF 72 72 + 73 73 + /* Virtual LED (icon) */ 74 74 + #define CONFIG_LED LED_VIRTUAL 75 75 + 76 76 + #define CONFIG_LCD LCD_GIGABEAT 77 77 + 78 78 + /* Offset ( in the firmware file's header ) to the file CRC */ 79 79 + #define FIRMWARE_OFFSET_FILE_CRC 0 80 80 + 81 81 + /* Offset ( in the firmware file's header ) to the real data */ 82 82 + #define FIRMWARE_OFFSET_FILE_DATA 8 83 83 + 84 84 + #define USB_IRIVERSTYLE 85 85 + 86 86 + /* Define this if you have adjustable CPU frequency */ 87 87 + #define HAVE_ADJUSTABLE_CPU_FREQ 88 88 + 89 89 + #define BOOTFILE_EXT "gigabeat" 90 90 + #define BOOTFILE "rockbox." BOOTFILE_EXT 91 91 + 92 92 + #define HAVE_BACKLIGHT_BRIGHTNESS 93 93 + 94 94 + #endif

+10 -1

firmware/export/config.h

··· 42 42 #define PP5002 5002 43 43 #define PP5020 5020 44 44 #define PNX0101 101 45 45 + #define S3C2440 2440 45 46 46 47 /* CONFIG_KEYPAD */ 47 48 #define PLAYER_PAD 0 ··· 54 55 #define IPOD_4G_PAD 7 55 56 #define IPOD_3G_PAD 8 56 57 #define IRIVER_IFP7XX_PAD 9 58 58 + #define GIGABEAT_PAD 10 57 59 58 60 /* CONFIG_REMOTE_KEYPAD */ 59 61 #define H100_REMOTE 1 ··· 80 82 #define LCD_IPODVIDEO 8 /* as used by iPod Video */ 81 83 #define LCD_IPOD2BPP 9 /* as used by all greyscale iPods */ 82 84 #define LCD_IFP7XX 10 /* as used by iRiver iFP 7xx/8xx */ 85 85 + #define LCD_GIGABEAT 11 83 86 84 87 /* LCD_PIXELFORMAT */ 85 88 #define HORIZONTAL_PACKING 1 ··· 99 102 #define BL_IRIVER_H300 8 /* IRiver PWM */ 100 103 #define BL_IRIVER_IFP7XX 9 /* IRiver GPIO */ 101 104 #define BL_IPODMINI 10 /* Apple iPod Mini */ 105 105 + #define BL_GIGABEAT 11 /* Toshiba Gigabeat */ 102 106 103 107 /* CONFIG_I2C */ 104 108 #define I2C_PLAYREC 0 /* Archos Player/Recorder style */ ··· 108 112 #define I2C_PP5002 4 /* PP5002 style */ 109 113 #define I2C_PP5020 5 /* PP5020 style */ 110 114 #define I2C_PNX0101 6 /* PNX0101 style */ 115 115 + #define I2C_S3C2440 7 111 116 112 117 /* CONFIG_LED */ 113 118 #define LED_REAL 1 /* SW controlled LED (Archos recorders, player, Gmini) */ ··· 120 125 #define RTC_M41ST84W 1 /* Archos Recorder */ 121 126 #define RTC_PCF50605 2 /* iPod 3G and 4G*/ 122 127 #define RTC_PCF50606 3 /* iriver H300 */ 128 128 + #define RTC_S3C2440 4 123 129 124 130 /* else HW controlled LED (iRiver H1x0) */ 125 131 ··· 160 166 #include "config-ipod4g.h" 161 167 #elif defined(IRIVER_IFP7XX) 162 168 #include "config-ifp7xx.h" 169 169 + #elif defined(GIGABEAT_F) 170 170 + #include "config-gigabeat.h" 163 171 #elif defined(IPOD_MINI) 164 172 #include "config-ipodmini.h" 165 173 #else ··· 185 193 #endif 186 194 187 195 /* define for all cpus from ARM family */ 188 188 - #if (CONFIG_CPU == PP5002) || (CONFIG_CPU == PP5020) || (CONFIG_CPU == PNX0101) 196 196 + #if (CONFIG_CPU == PP5002) || (CONFIG_CPU == PP5020) || (CONFIG_CPU == PNX0101) || (CONFIG_CPU == S3C2440) 197 197 + 189 198 #define CPU_ARM 190 199 #endif 191 200

+3

firmware/export/cpu.h

··· 39 39 #if CONFIG_CPU == PNX0101 40 40 #include "pnx0101.h" 41 41 #endif 42 42 + #if CONFIG_CPU == S3C2440 43 43 + #include "s3c2440.h" 44 44 + #endif

+26

tools/configure

··· 212 212 endian="little" 213 213 } 214 214 215 215 + arm9tdmicc () { 216 216 + prefixtools arm-elf- 217 217 + GCCOPTS="$CCOPTS -mcpu=arm9tdmi -ffunction-sections -mlong-calls" 218 218 + GCCOPTIMIZE="-fomit-frame-pointer" 219 219 + endian="little" 220 220 + } 221 221 + 215 222 whichaddr () { 216 223 case $archos in 217 224 gmini120|gminisp) ··· 457 464 echo "17 - iPod 4G (Grayscale)" 458 465 echo "18 - iPod Mini (1G/2G)" 459 466 echo "19 - iriver iFP-790" 467 467 + echo "20 - Toshiba Gigabeat F" 460 468 461 469 target_id=`input`; 462 470 ··· 467 475 archosbitmaptools="$toolset scramble descramble sh2d uclpack bmp2rb codepages" 468 476 iriverbitmaptools="$toolset scramble descramble mkboot bmp2rb codepages" 469 477 iaudiobitmaptools="$toolset scramble descramble mkboot bmp2rb codepages" 478 478 + gigabeatbitmaptools="$toolset bmp2rb codepages" 470 479 ipodbitmaptools="$toolset scramble ipod_fw bmp2rb codepages" 471 480 ifpbitmaptools="$toolset bmp2rb codepages" 472 481 ··· 835 844 # toolset is the tools within the tools directory that we build for 836 845 # this particular target. 837 846 toolset=$ifpbitmaptools 847 847 + ;; 848 848 + 849 849 + 20) 850 850 + archos="gigabeatf" 851 851 + target="-DGIGABEAT_F" 852 852 + memory=32 # always 853 853 + arm9tdmicc 854 854 + tool="cp" 855 855 + bmp2rb_mono="$rootdir/tools/bmp2rb -f 0" 856 856 + bmp2rb_native="$rootdir/tools/bmp2rb -f 4" 857 857 + output="rockbox.gigabeat" 858 858 + appextra="recorder:gui" 859 859 + archosrom="" 860 860 + flash="" 861 861 + plugins="yes" 862 862 + codecs="libmad liba52 libffmpegFLAC libTremor libwavpack dumb libmusepack libalac libfaad libm4a" 863 863 + toolset=$gigabeatbitmaptools 838 864 ;; 839 865 840 866 *)

uisimulator/sdl/UI-gigabeatf.bmp

This is a binary file and will not be displayed.

+6 -2

uisimulator/sdl/button.c

··· 86 86 new_btn = BUTTON_ON; 87 87 #elif defined(BUTTON_SELECT) && defined(BUTTON_PLAY) 88 88 new_btn = BUTTON_PLAY; 89 89 + #elif defined BUTTON_POWER 90 90 + new_btn = BUTTON_POWER; 89 91 #endif 90 92 break; 91 93 94 94 + case SDLK_KP_ENTER: 92 95 #ifdef BUTTON_OFF 93 93 - case SDLK_RETURN: 94 96 new_btn = BUTTON_OFF; 95 95 - break; 97 97 + #elif defined BUTTON_A 98 98 + new_btn = BUTTON_A; 96 99 #endif 100 100 + break; 97 101 98 102 #ifdef BUTTON_F1 99 103 case SDLK_KP_DIVIDE:

+10

uisimulator/sdl/uisdl.h

··· 180 180 181 181 #define UI_REMOTE_BGCOLORLIGHT 250, 180, 130 // bkgnd of remote lcd (bklight) 182 182 #define UI_REMOTE_BGCOLOR 90, 145, 90 // bkgnd of remote lcd (no bklight) 183 183 + 184 184 + #elif defined(GIGABEAT_F) 185 185 + #define UI_TITLE "Toshiba Gigabeat" 186 186 + #define UI_WIDTH 401 // width of GUI window 187 187 + #define UI_HEIGHT 655 // height of GUI window 188 188 + /* high-colour */ 189 189 + #define UI_LCD_POSX 48 // x position of lcd 190 190 + #define UI_LCD_POSY 60 // y position of lcd 191 191 + #define UI_LCD_WIDTH 240 192 192 + #define UI_LCD_HEIGHT 320 183 193 #endif 184 194 185 195 extern SDL_Surface *gui_surface;