Rockblox for the last two targets (ifp and Sansa). The Sansa keymap has already been there, the ifp keymap is working but might have room for improvements by someone who can test on the unit.

git-svn-id: svn://svn.rockbox.org/rockbox/trunk@11933 a1c6a512-1295-4272-9138-f99709370657

6 files changed, 42 insertions, 3 deletions

diff --git a/apps/plugins/SOURCES b/apps/plugins/SOURCES
index 0c3b577..f396729 100644
--- a/apps/plugins/SOURCES
+++ b/apps/plugins/SOURCES
@@ -9,9 +9,7 @@ logo.c
 mosaique.c
 properties.c
 random_folder_advance_config.c
-#if ((LCD_WIDTH != 128) || (LCD_HEIGHT != 64)) && !defined(SANSA_E200) 
 rockblox.c
-#endif
 rockbox_flash.c
 search.c
 snow.c
diff --git a/apps/plugins/bitmaps/mono/SOURCES b/apps/plugins/bitmaps/mono/SOURCES
index c165abe..c5c26cd 100644
--- a/apps/plugins/bitmaps/mono/SOURCES
+++ b/apps/plugins/bitmaps/mono/SOURCES
@@ -49,6 +49,8 @@ brickmania_powerups.112x64x1.bmp
 /* Rockblox */
 #if (LCD_WIDTH == 112) && (LCD_HEIGHT == 64)
 rockblox_background.112x64x1.bmp
+#elif (LCD_WIDTH == 128) && (LCD_HEIGHT == 64)
+rockblox_background.128x64x1.bmp
 #endif
 
 /* Flip it */
diff --git a/apps/plugins/bitmaps/mono/rockblox_background.128x64x1.bmp b/apps/plugins/bitmaps/mono/rockblox_background.128x64x1.bmp
new file mode 100755
index 0000000..09b4c08
--- /dev/null
+++ b/apps/plugins/bitmaps/mono/rockblox_background.128x64x1.bmp
diff --git a/apps/plugins/bitmaps/native/SOURCES b/apps/plugins/bitmaps/native/SOURCES
index 0521f72..53a8b22 100644
--- a/apps/plugins/bitmaps/native/SOURCES
+++ b/apps/plugins/bitmaps/native/SOURCES
@@ -318,6 +318,8 @@ rockblox_background.240x320x16.bmp
 rockblox_background.220x176x16.bmp
 #elif (LCD_WIDTH == 176) && (LCD_HEIGHT == 132) && (LCD_DEPTH == 16)
 rockblox_background.176x132x16.bmp
+#elif (LCD_WIDTH == 176) && (LCD_HEIGHT == 220) && (LCD_DEPTH == 16)
+rockblox_background.176x220x16.bmp
 #elif (LCD_WIDTH == 160) && (LCD_HEIGHT == 128) && (LCD_DEPTH >= 16)
 rockblox_background.160x128x16.bmp
 #elif (LCD_WIDTH == 128) && (LCD_HEIGHT == 128) && (LCD_DEPTH == 16)
diff --git a/apps/plugins/bitmaps/native/rockblox_background.176x220x16.bmp b/apps/plugins/bitmaps/native/rockblox_background.176x220x16.bmp
new file mode 100755
index 0000000..5046615
--- /dev/null
+++ b/apps/plugins/bitmaps/native/rockblox_background.176x220x16.bmp
diff --git a/apps/plugins/rockblox.c b/apps/plugins/rockblox.c
index ebb6fe0..ef6fcaf 100644
--- a/apps/plugins/rockblox.c
+++ b/apps/plugins/rockblox.c
@@ -123,12 +123,24 @@ PLUGIN_HEADER
 #define ROCKBLOX_OFF           BUTTON_A
 #define ROCKBLOX_ROTATE_RIGHT  BUTTON_VOL_DOWN
 #define ROCKBLOX_ROTATE_LEFT   BUTTON_VOL_UP
-#define ROCKBLOX_ROTATE		   BUTTON_UP
+#define ROCKBLOX_ROTATE	       BUTTON_UP
 #define ROCKBLOX_DOWN          BUTTON_DOWN
 #define ROCKBLOX_LEFT          BUTTON_LEFT
 #define ROCKBLOX_RIGHT         BUTTON_RIGHT
 #define ROCKBLOX_DROP          BUTTON_SELECT
 #define ROCKBLOX_RESTART       BUTTON_MENU
+
+#elif CONFIG_KEYPAD == IRIVER_IFP7XX_PAD
+
+#define ROCKBLOX_OFF           BUTTON_PLAY
+#define ROCKBLOX_ROTATE_RIGHT  BUTTON_UP
+#define ROCKBLOX_ROTATE_LEFT   BUTTON_SELECT
+#define ROCKBLOX_DOWN          BUTTON_DOWN
+#define ROCKBLOX_LEFT          BUTTON_LEFT
+#define ROCKBLOX_RIGHT         BUTTON_RIGHT
+#define ROCKBLOX_DROP          BUTTON_MODE
+#define ROCKBLOX_RESTART       BUTTON_EQ
+
 #endif
 
 #define BLOCKS_NUM  7
@@ -195,6 +207,18 @@ PLUGIN_HEADER
 #define LEVEL_Y 49
 #define LINES_Y 81
 
+#elif (LCD_WIDTH == 176) && (LCD_HEIGHT == 220)
+
+#define BLOCK_WIDTH 10
+#define BLOCK_HEIGHT 10
+#define BOARD_X 6
+#define BOARD_Y 10
+#define PREVIEW_X 124
+#define PREVIEW_Y 167
+#define LABEL_X 117
+#define SCORE_Y 24
+#define LEVEL_Y 65
+#define LINES_Y 103
 #elif (LCD_WIDTH == 160) && (LCD_HEIGHT == 128)
 
 #define BLOCK_WIDTH 6
@@ -221,6 +245,19 @@ PLUGIN_HEADER
 #define LEVEL_Y 49
 #define LINES_Y 82
 
+#elif (LCD_WIDTH == 128) && (LCD_HEIGHT == 64)
+
+#define BLOCK_WIDTH 3
+#define BLOCK_HEIGHT 3
+#define BOARD_X 9
+#define BOARD_Y 3
+#define PREVIEW_X 53
+#define PREVIEW_Y 5
+#define LABEL_X 70
+#define SCORE_Y 32
+#define LEVEL_Y 13
+#define LINES_Y 51
+
 #elif (LCD_WIDTH == 112) && (LCD_HEIGHT == 64)
 
 #define BLOCK_WIDTH 4