diff options
| author | Jonathan Gordon <rockbox@jdgordon.info> | 2007-10-22 01:29:16 +0000 |
|---|---|---|
| committer | Jonathan Gordon <rockbox@jdgordon.info> | 2007-10-22 01:29:16 +0000 |
| commit | 5f3af145680c07dcb6a2b21a4c8350e800c35c32 (patch) | |
| tree | d70311e744354c7089c96d7e30adcd0b3d0d425b | |
| parent | 3c1b9d9d70f090744d1646cab4555a86664d151e (diff) | |
| download | rockbox-5f3af145680c07dcb6a2b21a4c8350e800c35c32.tar.gz rockbox-5f3af145680c07dcb6a2b21a4c8350e800c35c32.zip | |
add PLA keys for mrobe, and dont bother compiling any plugins yet
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@15258 a1c6a512-1295-4272-9138-f99709370657
| -rw-r--r-- | apps/plugins/SOURCES | 2 | ||||
| -rw-r--r-- | apps/plugins/SUBDIRS | 2 | ||||
| -rw-r--r-- | apps/plugins/lib/pluginlib_actions.c | 23 |
3 files changed, 25 insertions, 2 deletions
diff --git a/apps/plugins/SOURCES b/apps/plugins/SOURCES index 1bed2b1e3a..2f7ea1d32f 100644 --- a/apps/plugins/SOURCES +++ b/apps/plugins/SOURCES @@ -1,3 +1,4 @@ +#ifndef OLYMPUS_MROBE_500 /* plugins common to all models */ battery_bench.c chessclock.c @@ -141,3 +142,4 @@ iriver_flash.c /* Built for bitmap targets except H10 5/6gb, Archoses, iPod mini and ifp */ superdom.c #endif +#endif /* m:robe 500 */ diff --git a/apps/plugins/SUBDIRS b/apps/plugins/SUBDIRS index c01f760ffd..97731a1e6c 100644 --- a/apps/plugins/SUBDIRS +++ b/apps/plugins/SUBDIRS @@ -1,4 +1,4 @@ -#ifndef IRIVER_IFP7XX_SERIES +#if !defined(IRIVER_IFP7XX_SERIES) && !defined(OLYMPUS_MROBE_500) /* For all targets */ shortcuts diff --git a/apps/plugins/lib/pluginlib_actions.c b/apps/plugins/lib/pluginlib_actions.c index 6957ae5e0f..1063c245a4 100644 --- a/apps/plugins/lib/pluginlib_actions.c +++ b/apps/plugins/lib/pluginlib_actions.c @@ -120,7 +120,15 @@ const struct button_mapping generic_directions[] = { PLA_DOWN_REPEAT, BUTTON_SCROLL_DOWN|BUTTON_REPEAT, BUTTON_NONE}, { PLA_LEFT_REPEAT, BUTTON_LEFT|BUTTON_REPEAT, BUTTON_NONE}, { PLA_RIGHT_REPEAT, BUTTON_RIGHT|BUTTON_REPEAT, BUTTON_NONE}, - +#elif (CONFIG_KEYPAD == MROBE500_PAD) + { PLA_UP, BUTTON_RC_PLAY, BUTTON_NONE}, + { PLA_DOWN, BUTTON_RC_DOWN, BUTTON_NONE}, + { PLA_LEFT, BUTTON_RC_REW, BUTTON_NONE}, + { PLA_RIGHT, BUTTON_RC_FF, BUTTON_NONE}, + { PLA_UP_REPEAT, BUTTON_RC_PLAY|BUTTON_REPEAT, BUTTON_NONE}, + { PLA_DOWN_REPEAT, BUTTON_RC_DOWN|BUTTON_REPEAT, BUTTON_NONE}, + { PLA_LEFT_REPEAT, BUTTON_RC_REW|BUTTON_REPEAT, BUTTON_NONE}, + { PLA_RIGHT_REPEAT, BUTTON_RC_FF|BUTTON_REPEAT, BUTTON_NONE}, #else #error pluginlib_actions: Unsupported keypad #endif @@ -192,6 +200,13 @@ const struct button_mapping generic_left_right_fire[] = { PLA_RIGHT_REPEAT, BUTTON_RIGHT|BUTTON_REPEAT, BUTTON_NONE}, { PLA_FIRE, BUTTON_REW, BUTTON_NONE}, { PLA_FIRE_REPEAT, BUTTON_REW|BUTTON_REPEAT, BUTTON_NONE}, +#elif (CONFIG_KEYPAD == MROBE500_PAD) + { PLA_LEFT, BUTTON_RC_REW, BUTTON_NONE}, + { PLA_RIGHT, BUTTON_RC_FF, BUTTON_NONE}, + { PLA_LEFT_REPEAT, BUTTON_RC_REW|BUTTON_REPEAT, BUTTON_NONE}, + { PLA_RIGHT_REPEAT, BUTTON_RC_FF|BUTTON_REPEAT, BUTTON_NONE}, + { PLA_FIRE, BUTTON_RC_HEART, BUTTON_NONE}, + { PLA_FIRE_REPEAT, BUTTON_RC_HEART|BUTTON_REPEAT, BUTTON_NONE}, #else #error pluginlib_actions: Unsupported keypad #endif @@ -283,6 +298,12 @@ const struct button_mapping generic_actions[] = {PLA_MENU, BUTTON_MODE, BUTTON_NONE}, {PLA_FIRE, BUTTON_SELECT, BUTTON_NONE}, {PLA_FIRE_REPEAT, BUTTON_SELECT|BUTTON_REPEAT, BUTTON_NONE}, +#elif (CONFIG_KEYPAD == MROBE500_PAD) + {PLA_QUIT, BUTTON_POWER, BUTTON_NONE}, + {PLA_START, BUTTON_RC_PLAY, BUTTON_NONE}, + {PLA_MENU, BUTTON_RC_MODE, BUTTON_NONE}, + {PLA_FIRE, BUTTON_RC_HEART, BUTTON_NONE}, + {PLA_FIRE_REPEAT, BUTTON_RC_HEART|BUTTON_REPEAT, BUTTON_NONE}, #else #error pluginlib_actions: Unsupported keypad #endif |