Index: apps/bookmark.h
===================================================================
RCS file: /cvsroot/rockbox/apps/bookmark.h,v
retrieving revision 1.9
diff -u -r1.9 bookmark.h
--- apps/bookmark.h	5 Feb 2006 21:18:18 -0000	1.9
+++ apps/bookmark.h	6 Feb 2006 00:34:12 -0000
@@ -33,7 +33,9 @@
 #define BOOKMARK_DELETE (BUTTON_ON | BUTTON_SELECT)
 #define BOOKMARK_DOWN BUTTON_DOWN
 
+
 #elif (CONFIG_KEYPAD == IPOD_3G_PAD) || (CONFIG_KEYPAD == IPOD_4G_PAD)
+
 #define BOOKMARK_SELECT BUTTON_SELECT
 #define BOOKMARK_DELETE (BUTTON_RIGHT | BUTTON_REPEAT)
 #define BOOKMARK_DOWN BUTTON_SCROLL_FWD
Index: apps/plugins/battery_bench.c
===================================================================
RCS file: /cvsroot/rockbox/apps/plugins/battery_bench.c,v
retrieving revision 1.3
diff -u -r1.3 battery_bench.c
--- apps/plugins/battery_bench.c	3 Feb 2006 23:16:24 -0000	1.3
+++ apps/plugins/battery_bench.c	6 Feb 2006 00:34:12 -0000
@@ -49,7 +49,7 @@
 #define BATTERY_OFF BUTTON_OFF
 #define BATTERY_RC_OFF BUTTON_RC_STOP
 
-#elif CONFIG_KEYPAD == IPOD_4G_PAD
+#elif CONFIG_KEYPAD == IPOD_4G_PAD || CONFIG_KEYPAD == IPOD_3G_PAD
 
 #define BATTERY_ON  BUTTON_PLAY
 #define BATTERY_OFF BUTTON_MENU
Index: apps/plugins/battery_test.c
===================================================================
RCS file: /cvsroot/rockbox/apps/plugins/battery_test.c,v
retrieving revision 1.17
diff -u -r1.17 battery_test.c
--- apps/plugins/battery_test.c	18 Jan 2006 11:09:05 -0000	1.17
+++ apps/plugins/battery_test.c	6 Feb 2006 00:34:12 -0000
@@ -43,7 +43,7 @@
 #define BATTERY_TEST_QUIT BUTTON_OFF
 #elif CONFIG_KEYPAD == IRIVER_IFP7XX_PAD
 #define BATTERY_TEST_QUIT BUTTON_PLAY
-#elif (CONFIG_KEYPAD == IPOD_4G_PAD)
+#elif (CONFIG_KEYPAD == IPOD_4G_PAD) || (CONFIG_KEYPAD == IPOD_3G_PAD)
 #define BATTERY_TEST_QUIT BUTTON_MENU
 #elif (CONFIG_KEYPAD == IAUDIO_X5_PAD)
 #define BATTERY_TEST_QUIT BUTTON_POWER
Index: apps/plugins/bejeweled.c
===================================================================
RCS file: /cvsroot/rockbox/apps/plugins/bejeweled.c,v
retrieving revision 1.13
diff -u -r1.13 bejeweled.c
--- apps/plugins/bejeweled.c	27 Jan 2006 13:29:41 -0000	1.13
+++ apps/plugins/bejeweled.c	6 Feb 2006 00:34:13 -0000
@@ -68,7 +68,7 @@
 #define BEJEWELED_SELECT BUTTON_SELECT
 #define BEJEWELED_RESUME BUTTON_MODE
 
-#elif (CONFIG_KEYPAD == IPOD_4G_PAD)
+#elif (CONFIG_KEYPAD == IPOD_4G_PAD) || (CONFIG_KEYPAD == IPOD_3G_PAD)
 #define BEJEWELED_SCROLLWHEEL
 #define BEJEWELED_UP         BUTTON_MENU
 #define BEJEWELED_DOWN       BUTTON_PLAY
Index: apps/plugins/bounce.c
===================================================================
RCS file: /cvsroot/rockbox/apps/plugins/bounce.c,v
retrieving revision 1.25
diff -u -r1.25 bounce.c
--- apps/plugins/bounce.c	19 Jan 2006 12:44:46 -0000	1.25
+++ apps/plugins/bounce.c	6 Feb 2006 00:34:14 -0000
@@ -52,7 +52,7 @@
 #define BOUNCE_QUIT (BUTTON_OFF | BUTTON_REL)
 #define BOUNCE_MODE (BUTTON_SELECT | BUTTON_REL)
 
-#elif (CONFIG_KEYPAD == IPOD_4G_PAD)
+#elif (CONFIG_KEYPAD == IPOD_4G_PAD) || (CONFIG_KEYPAD == IPOD_3G_PAD)
 #define BOUNCE_UP   BUTTON_SCROLL_BACK
 #define BOUNCE_DOWN BUTTON_SCROLL_FWD
 #define BOUNCE_QUIT (BUTTON_MENU | BUTTON_REL)
Index: apps/plugins/brickmania.c
===================================================================
RCS file: /cvsroot/rockbox/apps/plugins/brickmania.c,v
retrieving revision 1.6
diff -u -r1.6 brickmania.c
--- apps/plugins/brickmania.c	1 Feb 2006 18:25:23 -0000	1.6
+++ apps/plugins/brickmania.c	6 Feb 2006 00:34:14 -0000
@@ -41,7 +41,7 @@
 #define SCROLL_FWD(x) (0)
 #define SCROLL_BACK(x) (0)
 
-#elif (CONFIG_KEYPAD == IPOD_4G_PAD)
+#elif (CONFIG_KEYPAD == IPOD_4G_PAD) || (CONFIG_KEYPAD == IPOD_3G_PAD)
 
 #define QUIT BUTTON_MENU
 #define LEFT BUTTON_LEFT
Index: apps/plugins/calculator.c
===================================================================
RCS file: /cvsroot/rockbox/apps/plugins/calculator.c,v
retrieving revision 1.16
diff -u -r1.16 calculator.c
--- apps/plugins/calculator.c	18 Jan 2006 11:09:05 -0000	1.16
+++ apps/plugins/calculator.c	6 Feb 2006 00:34:15 -0000
@@ -134,7 +134,7 @@
 #define CALCULATOR_OPERATORS BUTTON_MODE
 #define CALCULATOR_CLEAR BUTTON_REC
 
-#elif (CONFIG_KEYPAD == IPOD_4G_PAD)
+#elif (CONFIG_KEYPAD == IPOD_4G_PAD) || (CONFIG_KEYPAD == IPOD_3G_PAD)
 
 #define CALCULATOR_UP   BUTTON_SCROLL_BACK
 #define CALCULATOR_DOWN BUTTON_SCROLL_FWD
Index: apps/plugins/chessclock.c
===================================================================
RCS file: /cvsroot/rockbox/apps/plugins/chessclock.c,v
retrieving revision 1.16
diff -u -r1.16 chessclock.c
--- apps/plugins/chessclock.c	18 Jan 2006 11:09:05 -0000	1.16
+++ apps/plugins/chessclock.c	6 Feb 2006 00:34:15 -0000
@@ -66,7 +66,7 @@
 #define CHC_SETTINGS_CANCEL BUTTON_OFF
 #define CHC_SETTINGS_CANCEL2 BUTTON_REC
 
-#elif (CONFIG_KEYPAD == IPOD_4G_PAD)
+#elif (CONFIG_KEYPAD == IPOD_4G_PAD) || (CONFIG_KEYPAD == IPOD_3G_PAD)
 #define CHC_QUIT BUTTON_PLAY
 #define CHC_STARTSTOP BUTTON_SELECT
 #define CHC_RESET BUTTON_LEFT
Index: apps/plugins/chip8.c
===================================================================
RCS file: /cvsroot/rockbox/apps/plugins/chip8.c,v
retrieving revision 1.17
diff -u -r1.17 chip8.c
--- apps/plugins/chip8.c	18 Jan 2006 11:09:05 -0000	1.17
+++ apps/plugins/chip8.c	6 Feb 2006 00:34:15 -0000
@@ -976,7 +976,7 @@
 #define CHIP8_KEY6 BUTTON_RIGHT
 #define CHIP8_KEY8 BUTTON_DOWN
 
-#elif (CONFIG_KEYPAD == IPOD_4G_PAD)
+#elif (CONFIG_KEYPAD == IPOD_4G_PAD) || (CONFIG_KEYPAD == IPOD_3G_PAD)
 #define CHIP8_OFF  BUTTON_MENU
 #define CHIP8_KEY2 BUTTON_SCROLL_BACK
 #define CHIP8_KEY4 BUTTON_LEFT
Index: apps/plugins/cube.c
===================================================================
RCS file: /cvsroot/rockbox/apps/plugins/cube.c,v
retrieving revision 1.26
diff -u -r1.26 cube.c
--- apps/plugins/cube.c	23 Jan 2006 23:53:22 -0000	1.26
+++ apps/plugins/cube.c	6 Feb 2006 00:34:15 -0000
@@ -82,7 +82,7 @@
 #define CUBE_PAUSE         (BUTTON_ON | BUTTON_REL)
 #define CUBE_HIGHSPEED     BUTTON_SELECT
 
-#elif (CONFIG_KEYPAD == IPOD_4G_PAD)
+#elif (CONFIG_KEYPAD == IPOD_4G_PAD)|| (CONFIG_KEYPAD == IPOD_3G_PAD)
 #define CUBE_QUIT          BUTTON_MENU
 #define CUBE_X_INC         BUTTON_LEFT
 #define CUBE_X_DEC         BUTTON_RIGHT
Index: apps/plugins/demystify.c
===================================================================
RCS file: /cvsroot/rockbox/apps/plugins/demystify.c,v
retrieving revision 1.5
diff -u -r1.5 demystify.c
--- apps/plugins/demystify.c	18 Jan 2006 11:09:05 -0000	1.5
+++ apps/plugins/demystify.c	6 Feb 2006 00:34:15 -0000
@@ -26,7 +26,7 @@
 PLUGIN_HEADER
 
 /* Key assignement */
-#if (CONFIG_KEYPAD == IPOD_4G_PAD)
+#if (CONFIG_KEYPAD == IPOD_4G_PAD) || (CONFIG_KEYPAD == IPOD_3G_PAD)
 #define DEMYSTIFY_QUIT BUTTON_MENU
 #define DEMYSTIFY_ADD_POLYGON BUTTON_RIGHT
 #define DEMYSTIFY_REMOVE_POLYGON BUTTON_LEFT
Index: apps/plugins/dict.c
===================================================================
RCS file: /cvsroot/rockbox/apps/plugins/dict.c,v
retrieving revision 1.10
diff -u -r1.10 dict.c
--- apps/plugins/dict.c	18 Jan 2006 11:09:05 -0000	1.10
+++ apps/plugins/dict.c	6 Feb 2006 00:34:15 -0000
@@ -104,7 +104,7 @@
 /* Button definitions */
 #if CONFIG_KEYPAD == PLAYER_PAD
 #define LP_QUIT BUTTON_STOP
-#elif (CONFIG_KEYPAD == IPOD_4G_PAD)
+#elif (CONFIG_KEYPAD == IPOD_4G_PAD)  || (CONFIG_KEYPAD == IPOD_3G_PAD)
 #define LP_QUIT BUTTON_MENU
 #elif CONFIG_KEYPAD == IRIVER_IFP7XX_PAD
 #define LP_QUIT BUTTON_PLAY
Index: apps/plugins/flipit.c
===================================================================
RCS file: /cvsroot/rockbox/apps/plugins/flipit.c,v
retrieving revision 1.16
diff -u -r1.16 flipit.c
--- apps/plugins/flipit.c	18 Jan 2006 11:09:05 -0000	1.16
+++ apps/plugins/flipit.c	6 Feb 2006 00:34:15 -0000
@@ -52,7 +52,7 @@
 #define FLIPIT_TOGGLE_PRE BUTTON_SELECT
 #define FLIPIT_TOGGLE (BUTTON_SELECT | BUTTON_REL)
 
-#elif (CONFIG_KEYPAD == IPOD_4G_PAD)
+#elif (CONFIG_KEYPAD == IPOD_4G_PAD) || (CONFIG_KEYPAD == IPOD_3G_PAD)
 
 #define FLIPIT_UP   BUTTON_SCROLL_FWD
 #define FLIPIT_DOWN BUTTON_SCROLL_BACK
Index: apps/plugins/jpeg.c
===================================================================
RCS file: /cvsroot/rockbox/apps/plugins/jpeg.c,v
retrieving revision 1.24
diff -u -r1.24 jpeg.c
--- apps/plugins/jpeg.c	5 Feb 2006 19:27:23 -0000	1.24
+++ apps/plugins/jpeg.c	6 Feb 2006 00:34:16 -0000
@@ -60,7 +60,7 @@
 #define JPEG_RIGHT BUTTON_RIGHT
 #define JPEG_QUIT BUTTON_OFF
 
-#elif (CONFIG_KEYPAD == IPOD_4G_PAD) || (CONFIG_KEYPAD == IPOD_4G_PAD)
+#elif (CONFIG_KEYPAD == IPOD_3G_PAD) || (CONFIG_KEYPAD == IPOD_4G_PAD)
 #define JPEG_ZOOM_IN BUTTON_SCROLL_FWD
 #define JPEG_ZOOM_OUT BUTTON_SCROLL_BACK
 #define JPEG_UP BUTTON_MENU
Index: apps/plugins/logo.c
===================================================================
RCS file: /cvsroot/rockbox/apps/plugins/logo.c,v
retrieving revision 1.21
diff -u -r1.21 logo.c
--- apps/plugins/logo.c	19 Jan 2006 12:44:46 -0000	1.21
+++ apps/plugins/logo.c	6 Feb 2006 00:34:16 -0000
@@ -183,7 +183,7 @@
 #define LP_INC_X BUTTON_RIGHT
 #define LP_DEC_Y (BUTTON_ON | BUTTON_LEFT)
 #define LP_INC_Y (BUTTON_ON | BUTTON_RIGHT)
-#elif (CONFIG_KEYPAD == IPOD_4G_PAD)
+#elif (CONFIG_KEYPAD == IPOD_4G_PAD) || (CONFIG_KEYPAD == IPOD_3G_PAD)
 #define LP_QUIT BUTTON_MENU
 #define LP_DEC_X BUTTON_LEFT
 #define LP_INC_X BUTTON_RIGHT
Index: apps/plugins/mandelbrot.c
===================================================================
RCS file: /cvsroot/rockbox/apps/plugins/mandelbrot.c,v
retrieving revision 1.25
diff -u -r1.25 mandelbrot.c
--- apps/plugins/mandelbrot.c	5 Feb 2006 12:59:07 -0000	1.25
+++ apps/plugins/mandelbrot.c	6 Feb 2006 00:34:16 -0000
@@ -66,7 +66,7 @@
 #define MANDELBROT_MAXITER_DEC (BUTTON_ON | BUTTON_LEFT)
 #define MANDELBROT_RESET BUTTON_REC
 
-#elif CONFIG_KEYPAD == IPOD_4G_PAD
+#elif (CONFIG_KEYPAD == IPOD_4G_PAD) || (CONFIG_KEYPAD == IPOD_3G_PAD)
 #define MANDELBROT_QUIT (BUTTON_SELECT | BUTTON_MENU)
 #define MANDELBROT_UP BUTTON_MENU
 #define MANDELBROT_DOWN BUTTON_PLAY
Index: apps/plugins/metronome.c
===================================================================
RCS file: /cvsroot/rockbox/apps/plugins/metronome.c,v
retrieving revision 1.23
diff -u -r1.23 metronome.c
--- apps/plugins/metronome.c	15 Jan 2006 18:20:08 -0000	1.23
+++ apps/plugins/metronome.c	6 Feb 2006 00:34:17 -0000
@@ -58,7 +58,7 @@
 #define METRONOME_MSG_START "press play"
 #define METRONOME_MSG_STOP "press pause"
 
-#elif (CONFIG_KEYPAD == IPOD_4G_PAD)
+#elif (CONFIG_KEYPAD == IPOD_4G_PAD) || (CONFIG_KEYPAD == IPOD_3G_PAD)
 #define METRONOME_QUIT BUTTON_MENU
 #define METRONOME_PLAYPAUSE BUTTON_PLAY
 #define METRONOME_VOL_UP BUTTON_SCROLL_FWD
Index: apps/plugins/minesweeper.c
===================================================================
RCS file: /cvsroot/rockbox/apps/plugins/minesweeper.c,v
retrieving revision 1.19
diff -u -r1.19 minesweeper.c
--- apps/plugins/minesweeper.c	18 Jan 2006 11:09:05 -0000	1.19
+++ apps/plugins/minesweeper.c	6 Feb 2006 00:34:17 -0000
@@ -71,7 +71,7 @@
 #define MINESWP_DISCOVER BUTTON_ON
 #define MINESWP_INFO BUTTON_MODE
 
-#elif (CONFIG_KEYPAD == IPOD_4G_PAD)
+#elif (CONFIG_KEYPAD == IPOD_4G_PAD) || (CONFIG_KEYPAD == IPOD_3G_PAD)
 #define MINESWP_UP BUTTON_SCROLL_BACK
 #define MINESWP_DOWN BUTTON_SCROLL_FWD
 #define MINESWP_QUIT BUTTON_MENU
Index: apps/plugins/mosaique.c
===================================================================
RCS file: /cvsroot/rockbox/apps/plugins/mosaique.c,v
retrieving revision 1.13
diff -u -r1.13 mosaique.c
--- apps/plugins/mosaique.c	18 Jan 2006 11:09:05 -0000	1.13
+++ apps/plugins/mosaique.c	6 Feb 2006 00:34:17 -0000
@@ -53,7 +53,7 @@
 #define MOSAIQUE_SPEED BUTTON_MODE
 #define MOSAIQUE_RESTART BUTTON_ON
 
-#elif (CONFIG_KEYPAD == IPOD_4G_PAD)
+#elif (CONFIG_KEYPAD == IPOD_4G_PAD) || (CONFIG_KEYPAD == IPOD_3G_PAD)
 #define MOSAIQUE_QUIT BUTTON_MENU
 #define MOSAIQUE_SPEED BUTTON_SELECT
 #define MOSAIQUE_RESTART BUTTON_PLAY
Index: apps/plugins/mp3_encoder.c
===================================================================
RCS file: /cvsroot/rockbox/apps/plugins/mp3_encoder.c,v
retrieving revision 1.7
diff -u -r1.7 mp3_encoder.c
--- apps/plugins/mp3_encoder.c	18 Jan 2006 11:09:05 -0000	1.7
+++ apps/plugins/mp3_encoder.c	6 Feb 2006 00:34:18 -0000
@@ -1880,7 +1880,7 @@
 #define MP3ENC_NEXT BUTTON_DOWN
 #define MP3ENC_DONE BUTTON_OFF
 #define MP3ENC_SELECT BUTTON_SELECT
-#elif CONFIG_KEYPAD == IPOD_4G_PAD
+#elif CONFIG_KEYPAD == IPOD_4G_PAD  || (CONFIG_KEYPAD == IPOD_3G_PAD)
 #define MP3ENC_PREV BUTTON_SCROLL_BACK
 #define MP3ENC_NEXT BUTTON_SCROLL_FWD
 #define MP3ENC_DONE BUTTON_MENU
Index: apps/plugins/plugin.lds
===================================================================
RCS file: /cvsroot/rockbox/apps/plugins/plugin.lds,v
retrieving revision 1.31
diff -u -r1.31 plugin.lds
--- apps/plugins/plugin.lds	5 Feb 2006 19:27:23 -0000	1.31
+++ apps/plugins/plugin.lds	6 Feb 2006 00:34:18 -0000
@@ -73,7 +73,7 @@
     .text :
     {
         *(.text*)
-#if (CONFIG_CPU==PP5020) || (CONFIG_CPU==PNX0101)
+#if (CONFIG_CPU==PP5020) || (CONFIG_CPU==PNX0101) || (CONFIG_CPU==PP5002)
         *(.glue_7)
         *(.glue_7t)
 #endif
Index: apps/plugins/pong.c
===================================================================
RCS file: /cvsroot/rockbox/apps/plugins/pong.c,v
retrieving revision 1.15
diff -u -r1.15 pong.c
--- apps/plugins/pong.c	18 Jan 2006 11:09:05 -0000	1.15
+++ apps/plugins/pong.c	6 Feb 2006 00:34:18 -0000
@@ -58,7 +58,7 @@
 #define PONG_RIGHT_UP BUTTON_ON
 #define PONG_RIGHT_DOWN BUTTON_MODE
 
-#elif (CONFIG_KEYPAD == IPOD_4G_PAD)
+#elif (CONFIG_KEYPAD == IPOD_4G_PAD) || (CONFIG_KEYPAD == IPOD_3G_PAD)
 #define PONG_QUIT BUTTON_SELECT
 #define PONG_LEFT_UP BUTTON_MENU
 #define PONG_LEFT_DOWN BUTTON_LEFT
Index: apps/plugins/rockblox.c
===================================================================
RCS file: /cvsroot/rockbox/apps/plugins/rockblox.c,v
retrieving revision 1.7
diff -u -r1.7 rockblox.c
--- apps/plugins/rockblox.c	18 Jan 2006 11:09:05 -0000	1.7
+++ apps/plugins/rockblox.c	6 Feb 2006 00:34:18 -0000
@@ -24,7 +24,7 @@
 
 PLUGIN_HEADER
 
-#if (CONFIG_KEYPAD == IPOD_4G_PAD)
+#if (CONFIG_KEYPAD == IPOD_4G_PAD) || (CONFIG_KEYPAD == IPOD_3G_PAD)
 #define ROCKBLOX_OFF   BUTTON_MENU
 #define ROCKBLOX_UP    BUTTON_SCROLL_BACK
 #define ROCKBLOX_DOWN  BUTTON_SCROLL_FWD
Index: apps/plugins/sliding_puzzle.c
===================================================================
RCS file: /cvsroot/rockbox/apps/plugins/sliding_puzzle.c,v
retrieving revision 1.17
diff -u -r1.17 sliding_puzzle.c
--- apps/plugins/sliding_puzzle.c	18 Jan 2006 11:09:05 -0000	1.17
+++ apps/plugins/sliding_puzzle.c	6 Feb 2006 00:34:19 -0000
@@ -45,7 +45,7 @@
 #define PUZZLE_SHUFFLE BUTTON_SELECT
 #define PUZZLE_PICTURE BUTTON_ON
 
-#elif (CONFIG_KEYPAD == IPOD_4G_PAD)
+#elif (CONFIG_KEYPAD == IPOD_4G_PAD) || (CONFIG_KEYPAD == IPOD_3G_PAD)
 #define PUZZLE_QUIT BUTTON_MENU
 #define PUZZLE_UP BUTTON_SCROLL_BACK
 #define PUZZLE_DOWN BUTTON_SCROLL_FWD
Index: apps/plugins/snake.c
===================================================================
RCS file: /cvsroot/rockbox/apps/plugins/snake.c,v
retrieving revision 1.12
diff -u -r1.12 snake.c
--- apps/plugins/snake.c	18 Jan 2006 11:09:05 -0000	1.12
+++ apps/plugins/snake.c	6 Feb 2006 00:34:19 -0000
@@ -55,7 +55,7 @@
 #define SNAKE_DOWN BUTTON_DOWN
 #define SNAKE_PLAYPAUSE BUTTON_ON
 
-#elif (CONFIG_KEYPAD == IPOD_4G_PAD)
+#elif (CONFIG_KEYPAD == IPOD_4G_PAD) || (CONFIG_KEYPAD == IPOD_3G_PAD)
 #define SNAKE_QUIT (BUTTON_SELECT|BUTTON_MENU)
 #define SNAKE_UP   BUTTON_MENU
 #define SNAKE_DOWN BUTTON_PLAY
Index: apps/plugins/snake2.c
===================================================================
RCS file: /cvsroot/rockbox/apps/plugins/snake2.c,v
retrieving revision 1.22
diff -u -r1.22 snake2.c
--- apps/plugins/snake2.c	23 Jan 2006 21:14:55 -0000	1.22
+++ apps/plugins/snake2.c	6 Feb 2006 00:34:19 -0000
@@ -93,7 +93,7 @@
 #define SNAKE2_SELECT_TYPE BUTTON_MODE
 #define SNAKE2_PLAYPAUSE BUTTON_ON
 
-#elif (CONFIG_KEYPAD == IPOD_4G_PAD)
+#elif (CONFIG_KEYPAD == IPOD_4G_PAD) || (CONFIG_KEYPAD == IPOD_3G_PAD)
 #define SNAKE2_UP   BUTTON_MENU
 #define SNAKE2_DOWN BUTTON_PLAY
 #define SNAKE2_QUIT (BUTTON_SELECT | BUTTON_MENU)
Index: apps/plugins/snow.c
===================================================================
RCS file: /cvsroot/rockbox/apps/plugins/snow.c,v
retrieving revision 1.17
diff -u -r1.17 snow.c
--- apps/plugins/snow.c	18 Jan 2006 11:09:05 -0000	1.17
+++ apps/plugins/snow.c	6 Feb 2006 00:34:19 -0000
@@ -36,7 +36,7 @@
 /* variable button definitions */
 #if CONFIG_KEYPAD == PLAYER_PAD
 #define SNOW_QUIT BUTTON_STOP
-#elif (CONFIG_KEYPAD == IPOD_4G_PAD)
+#elif (CONFIG_KEYPAD == IPOD_4G_PAD) || (CONFIG_KEYPAD == IPOD_3G_PAD)
 #define SNOW_QUIT BUTTON_MENU
 #elif CONFIG_KEYPAD == IRIVER_IFP7XX_PAD
 #define SNOW_QUIT BUTTON_PLAY
Index: apps/plugins/sokoban.c
===================================================================
RCS file: /cvsroot/rockbox/apps/plugins/sokoban.c,v
retrieving revision 1.20
diff -u -r1.20 sokoban.c
--- apps/plugins/sokoban.c	19 Jan 2006 07:42:57 -0000	1.20
+++ apps/plugins/sokoban.c	6 Feb 2006 00:34:19 -0000
@@ -66,7 +66,7 @@
 #define SOKOBAN_LEVEL_DOWN BUTTON_REC
 #define SOKOBAN_LEVEL_REPEAT BUTTON_SELECT
 
-#elif (CONFIG_KEYPAD == IPOD_4G_PAD)
+#elif (CONFIG_KEYPAD == IPOD_4G_PAD) || (CONFIG_KEYPAD == IPOD_3G_PAD)
 #define SOKOBAN_UP BUTTON_MENU
 #define SOKOBAN_DOWN BUTTON_PLAY
 #define SOKOBAN_QUIT (BUTTON_SELECT | BUTTON_MENU)
Index: apps/plugins/solitaire.c
===================================================================
RCS file: /cvsroot/rockbox/apps/plugins/solitaire.c,v
retrieving revision 1.26
diff -u -r1.26 solitaire.c
--- apps/plugins/solitaire.c	5 Feb 2006 01:58:09 -0000	1.26
+++ apps/plugins/solitaire.c	6 Feb 2006 00:34:20 -0000
@@ -109,7 +109,7 @@
 #define SOL_OPT BUTTON_ON
 #define SOL_REM BUTTON_REC
 
-#elif (CONFIG_KEYPAD == IPOD_4G_PAD)
+#elif (CONFIG_KEYPAD == IPOD_4G_PAD)  || (CONFIG_KEYPAD == IPOD_3G_PAD)
 #define SOL_QUIT (BUTTON_SELECT | BUTTON_MENU)
 #define SOL_UP BUTTON_MENU
 #define SOL_DOWN BUTTON_PLAY
@@ -168,7 +168,7 @@
 #define HELP_SOL_CUR2STACK "SELECT..: Put the card under the cursor on one of the 4 final stacks."
 #define HELP_SOL_REM2STACK "PLAY+RIGHT: Put the card on top of the remains' stack on one of the 4 final stacks."
 
-#elif (CONFIG_KEYPAD == IPOD_4G_PAD) 	 
+#elif (CONFIG_KEYPAD == IPOD_4G_PAD) 	  || (CONFIG_KEYPAD == IPOD_3G_PAD)
 #define HELP_SOL_MOVE "SELECT: Select cards, Move cards, reveal hidden cards ..." 	 
 #define HELP_SOL_DRAW "SELECT+PLAY: Un-select a card if it was selected. Else, draw 3 new cards out of the remains' stack." 	 
 #define HELP_SOL_REM2CUR "SELECT+LEFT: Put the card on top of the remains' stack on top of the cursor." 	 
Index: apps/plugins/star.c
===================================================================
RCS file: /cvsroot/rockbox/apps/plugins/star.c,v
retrieving revision 1.14
diff -u -r1.14 star.c
--- apps/plugins/star.c	18 Jan 2006 11:09:05 -0000	1.14
+++ apps/plugins/star.c	6 Feb 2006 00:34:20 -0000
@@ -98,7 +98,7 @@
 #define STAR_LEVEL_REPEAT (BUTTON_MODE | BUTTON_UP)
 #define STAR_MENU_RUN BUTTON_RIGHT
 
-#elif (CONFIG_KEYPAD == IPOD_4G_PAD)
+#elif (CONFIG_KEYPAD == IPOD_4G_PAD) || (CONFIG_KEYPAD == IPOD_3G_PAD)
 
 #define STAR_QUIT (BUTTON_SELECT | BUTTON_MENU)
 #define STAR_UP   BUTTON_SCROLL_BACK
Index: apps/plugins/starfield.c
===================================================================
RCS file: /cvsroot/rockbox/apps/plugins/starfield.c,v
retrieving revision 1.9
diff -u -r1.9 starfield.c
--- apps/plugins/starfield.c	18 Jan 2006 11:09:05 -0000	1.9
+++ apps/plugins/starfield.c	6 Feb 2006 00:34:20 -0000
@@ -26,7 +26,7 @@
 static struct plugin_api* rb; /* global api struct pointer */
 
 /* Key assignement */
-#if (CONFIG_KEYPAD == IPOD_4G_PAD)
+#if (CONFIG_KEYPAD == IPOD_4G_PAD) || (CONFIG_KEYPAD == IPOD_3G_PAD)
 #define STARFIELD_QUIT BUTTON_MENU
 #define STARFIELD_INCREASE_ZMOVE BUTTON_SCROLL_FWD
 #define STARFIELD_DECREASE_ZMOVE BUTTON_SCROLL_BACK
Index: apps/plugins/stats.c
===================================================================
RCS file: /cvsroot/rockbox/apps/plugins/stats.c,v
retrieving revision 1.7
diff -u -r1.7 stats.c
--- apps/plugins/stats.c	18 Jan 2006 11:09:05 -0000	1.7
+++ apps/plugins/stats.c	6 Feb 2006 00:34:20 -0000
@@ -30,7 +30,7 @@
 
 #if CONFIG_KEYPAD == PLAYER_PAD 
 #define STATS_STOP BUTTON_STOP
-#elif (CONFIG_KEYPAD == IPOD_4G_PAD)
+#elif (CONFIG_KEYPAD == IPOD_4G_PAD) || (CONFIG_KEYPAD == IPOD_3G_PAD)
 #define STATS_STOP BUTTON_MENU
 #elif CONFIG_KEYPAD == IRIVER_IFP7XX_PAD
 #define STATS_STOP BUTTON_PLAY
Index: apps/plugins/stopwatch.c
===================================================================
RCS file: /cvsroot/rockbox/apps/plugins/stopwatch.c,v
retrieving revision 1.15
diff -u -r1.15 stopwatch.c
--- apps/plugins/stopwatch.c	18 Jan 2006 11:09:05 -0000	1.15
+++ apps/plugins/stopwatch.c	6 Feb 2006 00:34:20 -0000
@@ -63,7 +63,7 @@
 #define STOPWATCH_LAP_TIMER BUTTON_ON
 #define STOPWATCH_SCROLL_UP BUTTON_RIGHT
 #define STOPWATCH_SCROLL_DOWN BUTTON_LEFT
-#elif (CONFIG_KEYPAD == IPOD_4G_PAD)
+#elif (CONFIG_KEYPAD == IPOD_4G_PAD)  || (CONFIG_KEYPAD == IPOD_3G_PAD)
 #define STOPWATCH_QUIT BUTTON_MENU
 #define STOPWATCH_START_STOP BUTTON_SELECT
 #define STOPWATCH_RESET_TIMER BUTTON_LEFT
Index: apps/plugins/sudoku.c
===================================================================
RCS file: /cvsroot/rockbox/apps/plugins/sudoku.c,v
retrieving revision 1.19
diff -u -r1.19 sudoku.c
--- apps/plugins/sudoku.c	24 Jan 2006 23:24:58 -0000	1.19
+++ apps/plugins/sudoku.c	6 Feb 2006 00:34:21 -0000
@@ -95,7 +95,7 @@
 #define SUDOKU_BUTTON_MENU BUTTON_MODE
 #define SUDOKU_BUTTON_POSSIBLE BUTTON_REC
 
-#elif (CONFIG_KEYPAD == IPOD_4G_PAD)
+#elif (CONFIG_KEYPAD == IPOD_4G_PAD) || (CONFIG_KEYPAD == IPOD_3G_PAD)
 #define SUDOKU_BUTTON_QUIT (BUTTON_SELECT | BUTTON_MENU)
 #define SUDOKU_BUTTON_UP BUTTON_SCROLL_BACK
 #define SUDOKU_BUTTON_DOWN BUTTON_SCROLL_FWD
Index: apps/plugins/viewer.c
===================================================================
RCS file: /cvsroot/rockbox/apps/plugins/viewer.c,v
retrieving revision 1.24
diff -u -r1.24 viewer.c
--- apps/plugins/viewer.c	27 Jan 2006 13:30:57 -0000	1.24
+++ apps/plugins/viewer.c	6 Feb 2006 00:34:21 -0000
@@ -117,7 +117,7 @@
 #define VIEWER_COLUMN_LEFT (BUTTON_ON | BUTTON_LEFT)
 #define VIEWER_COLUMN_RIGHT (BUTTON_ON | BUTTON_RIGHT)
 
-#elif (CONFIG_KEYPAD == IPOD_4G_PAD)
+#elif (CONFIG_KEYPAD == IPOD_4G_PAD)  || (CONFIG_KEYPAD == IPOD_3G_PAD)
 #define VIEWER_QUIT BUTTON_MENU
 #define VIEWER_PAGE_UP BUTTON_SCROLL_FWD
 #define VIEWER_PAGE_DOWN BUTTON_SCROLL_BACK
Index: apps/plugins/databox/databox.c
===================================================================
RCS file: /cvsroot/rockbox/apps/plugins/databox/databox.c,v
retrieving revision 1.18
diff -u -r1.18 databox.c
--- apps/plugins/databox/databox.c	18 Jan 2006 11:09:05 -0000	1.18
+++ apps/plugins/databox/databox.c	6 Feb 2006 00:34:21 -0000
@@ -31,7 +31,7 @@
 #elif CONFIG_KEYPAD == ONDIO_PAD
 #define DBX_SELECT BUTTON_MENU
 #define DBX_STOP   BUTTON_OFF
-#elif (CONFIG_KEYPAD == IPOD_4G_PAD)
+#elif (CONFIG_KEYPAD == IPOD_4G_PAD)  || (CONFIG_KEYPAD == IPOD_3G_PAD)
 #define DBX_SELECT BUTTON_SELECT
 #define DBX_STOP   BUTTON_MENU
 #elif CONFIG_KEYPAD == PLAYER_PAD
Index: apps/plugins/rockboy/menu.c
===================================================================
RCS file: /cvsroot/rockbox/apps/plugins/rockboy/menu.c,v
retrieving revision 1.7
diff -u -r1.7 menu.c
--- apps/plugins/rockboy/menu.c	20 Jan 2006 20:59:00 -0000	1.7
+++ apps/plugins/rockboy/menu.c	6 Feb 2006 00:34:21 -0000
@@ -10,7 +10,7 @@
 #include "rockmacros.h"
 #include "mem.h"
 
-#if (CONFIG_KEYPAD == IPOD_4G_PAD)
+#if (CONFIG_KEYPAD == IPOD_4G_PAD) || (CONFIG_KEYPAD == IPOD_3G_PAD)
 #define MENU_BUTTON_UP BUTTON_SCROLL_BACK
 #define MENU_BUTTON_DOWN BUTTON_SCROLL_FWD
 #define MENU_BUTTON_LEFT BUTTON_LEFT
Index: apps/plugins/rockboy/rockboy.c
===================================================================
RCS file: /cvsroot/rockbox/apps/plugins/rockboy/rockboy.c,v
retrieving revision 1.16
diff -u -r1.16 rockboy.c
--- apps/plugins/rockboy/rockboy.c	20 Jan 2006 20:59:00 -0000	1.16
+++ apps/plugins/rockboy/rockboy.c	6 Feb 2006 00:34:21 -0000
@@ -113,7 +113,7 @@
       options.SELECT=BUTTON_PLAY;
       options.MENU=BUTTON_OFF;
 
-#elif CONFIG_KEYPAD == IPOD_4G_PAD
+#elif CONFIG_KEYPAD == IPOD_4G_PAD || (CONFIG_KEYPAD == IPOD_3G_PAD)
       options.A=BUTTON_NONE;
       options.B=BUTTON_NONE;
       options.START=BUTTON_SELECT;
Index: apps/plugins/rockboy/sys_rockbox.c
===================================================================
RCS file: /cvsroot/rockbox/apps/plugins/rockboy/sys_rockbox.c,v
retrieving revision 1.19
diff -u -r1.19 sys_rockbox.c
--- apps/plugins/rockboy/sys_rockbox.c	20 Jan 2006 20:59:00 -0000	1.19
+++ apps/plugins/rockboy/sys_rockbox.c	6 Feb 2006 00:34:21 -0000
@@ -25,7 +25,7 @@
 #include "hw.h"
 #include "config.h"
 
-#if (CONFIG_KEYPAD == IPOD_4G_PAD)
+#if (CONFIG_KEYPAD == IPOD_4G_PAD) || (CONFIG_KEYPAD == IPOD_3G_PAD)
 
 #define ROCKBOY_PAD_LEFT BUTTON_LEFT
 #define ROCKBOY_PAD_RIGHT BUTTON_RIGHT
Index: bootloader/ipod.c
===================================================================
RCS file: /cvsroot/rockbox/bootloader/ipod.c,v
retrieving revision 1.11
diff -u -r1.11 ipod.c
--- bootloader/ipod.c	5 Feb 2006 19:05:55 -0000	1.11
+++ bootloader/ipod.c	6 Feb 2006 00:34:22 -0000
@@ -413,11 +413,17 @@
 
             /* Transfer execution directly to Rockbox - we don't want
                to run the rest of the bootloader startup code. */
-            asm volatile(
+ #if CONFIG_CPU == PP5020
+    asm volatile(
                 "mov   r0, #0x10000000    \n"
                 "mov   pc, r0             \n"
             );
-
+#else
+asm volatile(
+                "mov   r0, #0x28000000    \n"
+                "mov   pc, r0             \n"
+            );
+#endif
             /* We don't get here, but keep the compiler happy. */
             return (void*)0;
         }
Index: firmware/pcm_playback.c
===================================================================
RCS file: /cvsroot/rockbox/firmware/pcm_playback.c,v
retrieving revision 1.89
diff -u -r1.89 pcm_playback.c
--- firmware/pcm_playback.c	5 Feb 2006 17:34:49 -0000	1.89
+++ firmware/pcm_playback.c	6 Feb 2006 00:34:22 -0000
@@ -463,9 +463,39 @@
 static bool pcm_paused;
 static int pcm_freq = 0x6; /* 44.1 is default */
 
-static unsigned char *next_start;
-static long next_size;
 
+/* the registered callback function to ask for more mp3 data */
+static void (*callback_for_more)(unsigned char**, long*) = NULL;
+
+static unsigned char *next_start IBSS_ATTR;
+static long next_size IBSS_ATTR;
+
+void fiq(void) ICODE_ATTR;
+void fiq(void)
+{
+    /* Clear interrupt */
+    IISCONFIG &= ~0x2;
+
+    if ((next_size==0) && (callback_for_more)) {
+        callback_for_more((unsigned char **)&next_start, (long *)&next_size);
+    }
+
+    while (next_size > 0) {
+        if (((IISFIFO_CFG & 0x7800000) >> 23) < 2) {
+            /* Enable interrupt */
+            IISFIFO_CFG |= (1<<9);
+            return;
+        }
+
+        IISFIFO_WR = (*(next_start++))<<16;
+        IISFIFO_WR = (*(next_start++))<<16;
+        next_size-=4;
+
+        if ((next_size==0) && (callback_for_more)) {
+            callback_for_more((unsigned char **)&next_start, (long *)&next_size);
+	}
+    }
+}
 /* Set up the DMA transfer that kicks in when the audio FIFO gets empty */
 static void dma_start(const void *addr, long size)
 {
@@ -538,8 +568,12 @@
     pcm_freq=frequency;
 }
 
+void pcm_mute(bool mute)
+{
+    (void)mute;
+}
+
 /* the registered callback function to ask for more mp3 data */
-static void (*callback_for_more)(unsigned char**, long*) = NULL;
 
 void pcm_play_data(void (*get_more)(unsigned char** start, long* size))
 {
Index: firmware/drivers/adc.c
===================================================================
RCS file: /cvsroot/rockbox/firmware/drivers/adc.c,v
retrieving revision 1.25
diff -u -r1.25 adc.c
--- firmware/drivers/adc.c	5 Feb 2006 00:18:42 -0000	1.25
+++ firmware/drivers/adc.c	6 Feb 2006 00:34:22 -0000
@@ -279,7 +279,7 @@
     sleep(2);    /* Ensure valid readings when adc_init returns */
 }
 
-#elif CONFIG_CPU == PP5020
+#elif CONFIG_CPU == PP5020 || CONFIG_CPU == PP5002
 
 /* TODO: Implement adc.c */
 
Index: firmware/drivers/button.c
===================================================================
RCS file: /cvsroot/rockbox/firmware/drivers/button.c,v
retrieving revision 1.113
diff -u -r1.113 button.c
--- firmware/drivers/button.c	5 Feb 2006 20:58:41 -0000	1.113
+++ firmware/drivers/button.c	6 Feb 2006 00:34:22 -0000
@@ -532,9 +532,9 @@
     CPU_HI_INT_EN = I2C_MASK;
 
 #elif CONFIG_KEYPAD == IPOD_3G_PAD
-    outb(~inb(GPIOA_INPUT_VAL), GPIOA_INT_LEV);
-    outb(inb(GPIOA_INT_STAT), GPIOA_INT_CLR);
-    outb(0xff, GPIOA_INT_EN);
+    GPIOA_INT_LEV = ~GPIOA_INPUT_VAL;
+    GPIOA_INT_CLR = GPIOA_INT_STAT;
+    GPIOA_INT_EN = 0xff;
 
 #endif /* CONFIG_KEYPAD */
     queue_init(&button_queue);
Index: firmware/drivers/lcd-2bit-horz.c
===================================================================
RCS file: /cvsroot/rockbox/firmware/drivers/lcd-2bit-horz.c,v
retrieving revision 1.2
diff -u -r1.2 lcd-2bit-horz.c
--- firmware/drivers/lcd-2bit-horz.c	5 Feb 2006 18:25:41 -0000	1.2
+++ firmware/drivers/lcd-2bit-horz.c	6 Feb 2006 00:34:23 -0000
@@ -526,7 +526,7 @@
     {
         const unsigned char *src_col = src++;
         unsigned data = *src_col >> src_y;
-        int numbits = 8 - src_y;
+        int numbits = 4 - src_y;
         
         ymax = y + height;
         ny = y;
@@ -536,10 +536,10 @@
                 setpixel_value (nx,ny, 0xFF);
             else
             if (data & 0x01)
-                setpixel_value (nx,ny, 0x3F);
+                setpixel_value (nx,ny, 0x55);
             else
             if (data & 0x02)
-                setpixel_value (nx,ny, 0xCF);
+                setpixel_value (nx,ny, 0xAA);
             else
                 setpixel_value (nx,ny, 0x00);