summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMarcin Bukat <marcin.bukat@gmail.com>2011-09-06 12:39:49 +0000
committerMarcin Bukat <marcin.bukat@gmail.com>2011-09-06 12:39:49 +0000
commit6d5671a8d8199c7fd04490fce5098b23b893c528 (patch)
tree9102217f6f7629c3fc84bac0544c35eb14c83a88
parent4c896d9fe2f951da712dc1b3a5f6b5dbdf113f35 (diff)
downloadrockbox-6d5671a8d8199c7fd04490fce5098b23b893c528.tar.gz
rockbox-6d5671a8d8199c7fd04490fce5098b23b893c528.tar.bz2
rockbox-6d5671a8d8199c7fd04490fce5098b23b893c528.zip
rk27xx - enable a few test plugins
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@30459 a1c6a512-1295-4272-9138-f99709370657
-rw-r--r--apps/SOURCES2
-rw-r--r--apps/plugins/lib/pluginlib_actions.c16
-rw-r--r--apps/plugins/plugin.lds6
-rw-r--r--apps/plugins/test_codec.c2
-rw-r--r--apps/plugins/test_disk.c8
-rw-r--r--apps/plugins/test_fps.c2
6 files changed, 31 insertions, 5 deletions
diff --git a/apps/SOURCES b/apps/SOURCES
index 26e53d1bb0..e0244b240d 100644
--- a/apps/SOURCES
+++ b/apps/SOURCES
@@ -325,4 +325,6 @@ keymaps/keymap-android.c
keymaps/keymap-sdl.c
#elif CONFIG_KEYPAD == SANSA_FUZEPLUS_PAD
keymaps/keymap-fuzeplus.c
+#elif CONFIG_KEYPAD == RK27XX_GENERIC_PAD
+keymaps/keymap-rk27xx-generic.c
#endif
diff --git a/apps/plugins/lib/pluginlib_actions.c b/apps/plugins/lib/pluginlib_actions.c
index f42dbb34c6..510d569bcf 100644
--- a/apps/plugins/lib/pluginlib_actions.c
+++ b/apps/plugins/lib/pluginlib_actions.c
@@ -209,7 +209,15 @@ const struct button_mapping pla_main_ctx[] =
{ PLA_DOWN_REPEAT, BUTTON_DOWN|BUTTON_REPEAT, BUTTON_NONE},
{ PLA_LEFT_REPEAT, BUTTON_REW|BUTTON_REPEAT, BUTTON_NONE},
{ PLA_RIGHT_REPEAT, BUTTON_FF|BUTTON_REPEAT, BUTTON_NONE},
-
+#elif (CONFIG_KEYPAD == RK27XX_GENERIC_PAD)
+ { PLA_UP, BUTTON_REW, BUTTON_NONE},
+ { PLA_DOWN, BUTTON_FF, BUTTON_NONE},
+ { PLA_LEFT, BUTTON_REW|BUTTON_M, BUTTON_NONE},
+ { PLA_RIGHT, BUTTON_FF|BUTTON_M, BUTTON_NONE},
+ { PLA_UP_REPEAT, BUTTON_REW|BUTTON_REPEAT, BUTTON_NONE},
+ { PLA_DOWN_REPEAT, BUTTON_FF|BUTTON_REPEAT, BUTTON_NONE},
+ { PLA_LEFT_REPEAT, BUTTON_REW|BUTTON_M|BUTTON_REPEAT, BUTTON_NONE},
+ { PLA_RIGHT_REPEAT, BUTTON_FF|BUTTON_M|BUTTON_REPEAT, BUTTON_NONE},
#else
# ifndef HAVE_TOUCHSCREEN
# error pluginlib_actions: No directions defined
@@ -382,6 +390,12 @@ const struct button_mapping pla_main_ctx[] =
{PLA_SELECT, BUTTON_ENTER, BUTTON_NONE},
{PLA_SELECT_REL, BUTTON_ENTER|BUTTON_REL, BUTTON_ENTER},
{PLA_SELECT_REPEAT, BUTTON_ENTER|BUTTON_REPEAT, BUTTON_NONE},
+#elif (CONFIG_KEYPAD == RK27XX_GENERIC_PAD)
+ {PLA_CANCEL, BUTTON_M, BUTTON_NONE},
+ {PLA_EXIT, BUTTON_M|BUTTON_REPEAT, BUTTON_NONE},
+ {PLA_SELECT, BUTTON_PLAY, BUTTON_NONE},
+ {PLA_SELECT_REL, BUTTON_PLAY|BUTTON_REL, BUTTON_PLAY},
+ {PLA_SELECT_REPEAT, BUTTON_PLAY|BUTTON_REPEAT, BUTTON_NONE},
#else
# ifndef HAVE_TOUCHSCREEN
# error pluginlib_actions: No actions defined
diff --git a/apps/plugins/plugin.lds b/apps/plugins/plugin.lds
index efd60159d1..49d965f5f4 100644
--- a/apps/plugins/plugin.lds
+++ b/apps/plugins/plugin.lds
@@ -165,6 +165,12 @@ OUTPUT_FORMAT(elf32-littlemips)
#define IRAM DRAM
#define IRAMSIZE 0
/* The bit of IRAM that is available is used in the core */
+
+#elif CONFIG_CPU == RK27XX
+#define DRAMORIG 0x60000000
+#define IRAM DRAM
+#define IRAMSIZE 0
+
#else
#define DRAMORIG 0x09000000 + STUBOFFSET
#endif
diff --git a/apps/plugins/test_codec.c b/apps/plugins/test_codec.c
index 6b6ba00840..6c3fca242c 100644
--- a/apps/plugins/test_codec.c
+++ b/apps/plugins/test_codec.c
@@ -37,6 +37,8 @@
#define TESTCODEC_EXITBUTTON (BUTTON_REC | BUTTON_PLAY)
#elif CONFIG_KEYPAD == MPIO_HD300_PAD
#define TESTCODEC_EXITBUTTON (BUTTON_REC | BUTTON_REPEAT)
+#elif CONFIG_KEYPAD == RK27XX_GENERIC_PAD
+#define TESTCODEC_EXITBUTTON (BUTTON_M | BUTTON_REPEAT)
#elif defined(HAVE_TOUCHSCREEN)
#define TESTCODEC_EXITBUTTON BUTTON_TOPLEFT
#else
diff --git a/apps/plugins/test_disk.c b/apps/plugins/test_disk.c
index b211bc774e..6d5ea29d57 100644
--- a/apps/plugins/test_disk.c
+++ b/apps/plugins/test_disk.c
@@ -28,11 +28,11 @@
#define TEST_FILE TESTBASEDIR "/test_disk.tmp"
#define FRND_SEED 0x78C3 /* arbirary */
-#if (CONFIG_STORAGE & STORAGE_MMC)
+//#if (CONFIG_STORAGE & STORAGE_MMC)
#define TEST_SIZE (20*1024*1024)
-#else
-#define TEST_SIZE (300*1024*1024)
-#endif
+//#else
+//#define TEST_SIZE (300*1024*1024)
+//#endif
#define TEST_TIME 10 /* in seconds */
static unsigned char* audiobuf;
diff --git a/apps/plugins/test_fps.c b/apps/plugins/test_fps.c
index 6851f6739f..da4684f60a 100644
--- a/apps/plugins/test_fps.c
+++ b/apps/plugins/test_fps.c
@@ -35,6 +35,8 @@
#define FPS_QUIT (BUTTON_REC|BUTTON_PLAY)
#elif CONFIG_KEYPAD == MPIO_HD300_PAD
#define FPS_QUIT (BUTTON_REC|BUTTON_REPEAT)
+#elif CONFIG_KEYPAD == RK27XX_GENERIC_PAD
+#define FPS_QUIT (BUTTON_M|BUTTON_REPEAT)
#elif defined(BUTTON_OFF)
#define FPS_QUIT BUTTON_OFF
#else