diff options
author | Marcin Bukat <marcin.bukat@gmail.com> | 2011-09-06 12:39:49 +0000 |
---|---|---|
committer | Marcin Bukat <marcin.bukat@gmail.com> | 2011-09-06 12:39:49 +0000 |
commit | 6d5671a8d8199c7fd04490fce5098b23b893c528 (patch) | |
tree | 9102217f6f7629c3fc84bac0544c35eb14c83a88 | |
parent | 4c896d9fe2f951da712dc1b3a5f6b5dbdf113f35 (diff) | |
download | rockbox-6d5671a8d8199c7fd04490fce5098b23b893c528.tar.gz 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/SOURCES | 2 | ||||
-rw-r--r-- | apps/plugins/lib/pluginlib_actions.c | 16 | ||||
-rw-r--r-- | apps/plugins/plugin.lds | 6 | ||||
-rw-r--r-- | apps/plugins/test_codec.c | 2 | ||||
-rw-r--r-- | apps/plugins/test_disk.c | 8 | ||||
-rw-r--r-- | apps/plugins/test_fps.c | 2 |
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 | |||
325 | keymaps/keymap-sdl.c | 325 | keymaps/keymap-sdl.c |
326 | #elif CONFIG_KEYPAD == SANSA_FUZEPLUS_PAD | 326 | #elif CONFIG_KEYPAD == SANSA_FUZEPLUS_PAD |
327 | keymaps/keymap-fuzeplus.c | 327 | keymaps/keymap-fuzeplus.c |
328 | #elif CONFIG_KEYPAD == RK27XX_GENERIC_PAD | ||
329 | keymaps/keymap-rk27xx-generic.c | ||
328 | #endif | 330 | #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[] = | |||
209 | { PLA_DOWN_REPEAT, BUTTON_DOWN|BUTTON_REPEAT, BUTTON_NONE}, | 209 | { PLA_DOWN_REPEAT, BUTTON_DOWN|BUTTON_REPEAT, BUTTON_NONE}, |
210 | { PLA_LEFT_REPEAT, BUTTON_REW|BUTTON_REPEAT, BUTTON_NONE}, | 210 | { PLA_LEFT_REPEAT, BUTTON_REW|BUTTON_REPEAT, BUTTON_NONE}, |
211 | { PLA_RIGHT_REPEAT, BUTTON_FF|BUTTON_REPEAT, BUTTON_NONE}, | 211 | { PLA_RIGHT_REPEAT, BUTTON_FF|BUTTON_REPEAT, BUTTON_NONE}, |
212 | 212 | #elif (CONFIG_KEYPAD == RK27XX_GENERIC_PAD) | |
213 | { PLA_UP, BUTTON_REW, BUTTON_NONE}, | ||
214 | { PLA_DOWN, BUTTON_FF, BUTTON_NONE}, | ||
215 | { PLA_LEFT, BUTTON_REW|BUTTON_M, BUTTON_NONE}, | ||
216 | { PLA_RIGHT, BUTTON_FF|BUTTON_M, BUTTON_NONE}, | ||
217 | { PLA_UP_REPEAT, BUTTON_REW|BUTTON_REPEAT, BUTTON_NONE}, | ||
218 | { PLA_DOWN_REPEAT, BUTTON_FF|BUTTON_REPEAT, BUTTON_NONE}, | ||
219 | { PLA_LEFT_REPEAT, BUTTON_REW|BUTTON_M|BUTTON_REPEAT, BUTTON_NONE}, | ||
220 | { PLA_RIGHT_REPEAT, BUTTON_FF|BUTTON_M|BUTTON_REPEAT, BUTTON_NONE}, | ||
213 | #else | 221 | #else |
214 | # ifndef HAVE_TOUCHSCREEN | 222 | # ifndef HAVE_TOUCHSCREEN |
215 | # error pluginlib_actions: No directions defined | 223 | # error pluginlib_actions: No directions defined |
@@ -382,6 +390,12 @@ const struct button_mapping pla_main_ctx[] = | |||
382 | {PLA_SELECT, BUTTON_ENTER, BUTTON_NONE}, | 390 | {PLA_SELECT, BUTTON_ENTER, BUTTON_NONE}, |
383 | {PLA_SELECT_REL, BUTTON_ENTER|BUTTON_REL, BUTTON_ENTER}, | 391 | {PLA_SELECT_REL, BUTTON_ENTER|BUTTON_REL, BUTTON_ENTER}, |
384 | {PLA_SELECT_REPEAT, BUTTON_ENTER|BUTTON_REPEAT, BUTTON_NONE}, | 392 | {PLA_SELECT_REPEAT, BUTTON_ENTER|BUTTON_REPEAT, BUTTON_NONE}, |
393 | #elif (CONFIG_KEYPAD == RK27XX_GENERIC_PAD) | ||
394 | {PLA_CANCEL, BUTTON_M, BUTTON_NONE}, | ||
395 | {PLA_EXIT, BUTTON_M|BUTTON_REPEAT, BUTTON_NONE}, | ||
396 | {PLA_SELECT, BUTTON_PLAY, BUTTON_NONE}, | ||
397 | {PLA_SELECT_REL, BUTTON_PLAY|BUTTON_REL, BUTTON_PLAY}, | ||
398 | {PLA_SELECT_REPEAT, BUTTON_PLAY|BUTTON_REPEAT, BUTTON_NONE}, | ||
385 | #else | 399 | #else |
386 | # ifndef HAVE_TOUCHSCREEN | 400 | # ifndef HAVE_TOUCHSCREEN |
387 | # error pluginlib_actions: No actions defined | 401 | # 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) | |||
165 | #define IRAM DRAM | 165 | #define IRAM DRAM |
166 | #define IRAMSIZE 0 | 166 | #define IRAMSIZE 0 |
167 | /* The bit of IRAM that is available is used in the core */ | 167 | /* The bit of IRAM that is available is used in the core */ |
168 | |||
169 | #elif CONFIG_CPU == RK27XX | ||
170 | #define DRAMORIG 0x60000000 | ||
171 | #define IRAM DRAM | ||
172 | #define IRAMSIZE 0 | ||
173 | |||
168 | #else | 174 | #else |
169 | #define DRAMORIG 0x09000000 + STUBOFFSET | 175 | #define DRAMORIG 0x09000000 + STUBOFFSET |
170 | #endif | 176 | #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 @@ | |||
37 | #define TESTCODEC_EXITBUTTON (BUTTON_REC | BUTTON_PLAY) | 37 | #define TESTCODEC_EXITBUTTON (BUTTON_REC | BUTTON_PLAY) |
38 | #elif CONFIG_KEYPAD == MPIO_HD300_PAD | 38 | #elif CONFIG_KEYPAD == MPIO_HD300_PAD |
39 | #define TESTCODEC_EXITBUTTON (BUTTON_REC | BUTTON_REPEAT) | 39 | #define TESTCODEC_EXITBUTTON (BUTTON_REC | BUTTON_REPEAT) |
40 | #elif CONFIG_KEYPAD == RK27XX_GENERIC_PAD | ||
41 | #define TESTCODEC_EXITBUTTON (BUTTON_M | BUTTON_REPEAT) | ||
40 | #elif defined(HAVE_TOUCHSCREEN) | 42 | #elif defined(HAVE_TOUCHSCREEN) |
41 | #define TESTCODEC_EXITBUTTON BUTTON_TOPLEFT | 43 | #define TESTCODEC_EXITBUTTON BUTTON_TOPLEFT |
42 | #else | 44 | #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 @@ | |||
28 | #define TEST_FILE TESTBASEDIR "/test_disk.tmp" | 28 | #define TEST_FILE TESTBASEDIR "/test_disk.tmp" |
29 | #define FRND_SEED 0x78C3 /* arbirary */ | 29 | #define FRND_SEED 0x78C3 /* arbirary */ |
30 | 30 | ||
31 | #if (CONFIG_STORAGE & STORAGE_MMC) | 31 | //#if (CONFIG_STORAGE & STORAGE_MMC) |
32 | #define TEST_SIZE (20*1024*1024) | 32 | #define TEST_SIZE (20*1024*1024) |
33 | #else | 33 | //#else |
34 | #define TEST_SIZE (300*1024*1024) | 34 | //#define TEST_SIZE (300*1024*1024) |
35 | #endif | 35 | //#endif |
36 | #define TEST_TIME 10 /* in seconds */ | 36 | #define TEST_TIME 10 /* in seconds */ |
37 | 37 | ||
38 | static unsigned char* audiobuf; | 38 | 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 @@ | |||
35 | #define FPS_QUIT (BUTTON_REC|BUTTON_PLAY) | 35 | #define FPS_QUIT (BUTTON_REC|BUTTON_PLAY) |
36 | #elif CONFIG_KEYPAD == MPIO_HD300_PAD | 36 | #elif CONFIG_KEYPAD == MPIO_HD300_PAD |
37 | #define FPS_QUIT (BUTTON_REC|BUTTON_REPEAT) | 37 | #define FPS_QUIT (BUTTON_REC|BUTTON_REPEAT) |
38 | #elif CONFIG_KEYPAD == RK27XX_GENERIC_PAD | ||
39 | #define FPS_QUIT (BUTTON_M|BUTTON_REPEAT) | ||
38 | #elif defined(BUTTON_OFF) | 40 | #elif defined(BUTTON_OFF) |
39 | #define FPS_QUIT BUTTON_OFF | 41 | #define FPS_QUIT BUTTON_OFF |
40 | #else | 42 | #else |