diff options
| author | Sebastian Leonhardt <sebastian.leonhardt@web.de> | 2014-05-22 23:34:52 +0200 |
|---|---|---|
| committer | Szymon Dziok <b0hoon@o2.pl> | 2014-05-24 00:50:11 +0200 |
| commit | 7f7aee3f2457818547ec065ddd65bea0b3a68983 (patch) | |
| tree | 84cfadca3187bf65d569cb5456c8d78245823b23 /firmware | |
| parent | 4b181b4517fad106ab1ffbdab01adac9cf8e4bee (diff) | |
| download | rockbox-7f7aee3f2457818547ec065ddd65bea0b3a68983.zip rockbox-7f7aee3f2457818547ec065ddd65bea0b3a68983.tar.gz rockbox-7f7aee3f2457818547ec065ddd65bea0b3a68983.tar.bz2 rockbox-7f7aee3f2457818547ec065ddd65bea0b3a68983.tar.xz | |
Separate keymaps for YH-820 and YH-920/925
Although both players basically have the same keys, the
differences in the layout is rather big, so I think both
deserve their own keymaps.
(On the yh820 the FFWD/PLAY/REW buttons are located above the
direction keys, on the yh920 at the side of the player.
Furthermore the yh920/925 has a REC switch, whereas
yh820 has a push button.)
Change-Id: I0e62a1b101c387646c0bdb07ea142d9d2430ca15
Reviewed-on: http://gerrit.rockbox.org/814
Reviewed-by: Szymon Dziok <b0hoon@o2.pl>
Diffstat (limited to 'firmware')
| -rw-r--r-- | firmware/export/config.h | 3 | ||||
| -rw-r--r-- | firmware/export/config/samsungyh820.h | 2 | ||||
| -rw-r--r-- | firmware/export/config/samsungyh920.h | 2 | ||||
| -rw-r--r-- | firmware/export/config/samsungyh925.h | 2 | ||||
| -rw-r--r-- | firmware/target/arm/pp/debug-pp.c | 3 |
5 files changed, 7 insertions, 5 deletions
diff --git a/firmware/export/config.h b/firmware/export/config.h index 1998720..9c1a8db 100644 --- a/firmware/export/config.h +++ b/firmware/export/config.h @@ -130,7 +130,7 @@ #define SANSA_CLIP_PAD 35 #define SANSA_FUZE_PAD 36 #define LYRE_PROTO1_PAD 37 -#define SAMSUNG_YH_PAD 38 +#define SAMSUNG_YH820_PAD 38 #define ONDAVX777_PAD 39 #define SAMSUNG_YPS3_PAD 40 #define MINI2440_PAD 41 @@ -154,6 +154,7 @@ #define SAMSUNG_YPZ5_PAD 59 #define IHIFI_PAD 60 #define SAMSUNG_YPR1_PAD 61 +#define SAMSUNG_YH920_PAD 62 /* CONFIG_REMOTE_KEYPAD */ #define H100_REMOTE 1 diff --git a/firmware/export/config/samsungyh820.h b/firmware/export/config/samsungyh820.h index e7a4c9d..0b9c603 100644 --- a/firmware/export/config/samsungyh820.h +++ b/firmware/export/config/samsungyh820.h @@ -90,7 +90,7 @@ /* define this if you would like tagcache to build on this target */ #define HAVE_TAGCACHE -#define CONFIG_KEYPAD SAMSUNG_YH_PAD +#define CONFIG_KEYPAD SAMSUNG_YH820_PAD /* Define this if you do software codec */ #define CONFIG_CODEC SWCODEC diff --git a/firmware/export/config/samsungyh920.h b/firmware/export/config/samsungyh920.h index a5cb75e..04487bc 100644 --- a/firmware/export/config/samsungyh920.h +++ b/firmware/export/config/samsungyh920.h @@ -90,7 +90,7 @@ /* define this if you would like tagcache to build on this target */ #define HAVE_TAGCACHE -#define CONFIG_KEYPAD SAMSUNG_YH_PAD +#define CONFIG_KEYPAD SAMSUNG_YH920_PAD /* Define this if you do software codec */ #define CONFIG_CODEC SWCODEC diff --git a/firmware/export/config/samsungyh925.h b/firmware/export/config/samsungyh925.h index 92604af..aeb9cb6 100644 --- a/firmware/export/config/samsungyh925.h +++ b/firmware/export/config/samsungyh925.h @@ -87,7 +87,7 @@ /* define this if you would like tagcache to build on this target */ #define HAVE_TAGCACHE -#define CONFIG_KEYPAD SAMSUNG_YH_PAD +#define CONFIG_KEYPAD SAMSUNG_YH920_PAD /* Define this if you do software codec */ #define CONFIG_CODEC SWCODEC diff --git a/firmware/target/arm/pp/debug-pp.c b/firmware/target/arm/pp/debug-pp.c index 9e0dcad..a77101e 100644 --- a/firmware/target/arm/pp/debug-pp.c +++ b/firmware/target/arm/pp/debug-pp.c @@ -51,7 +51,8 @@ (CONFIG_KEYPAD == PHILIPS_HDD1630_PAD) # define DEBUG_CANCEL BUTTON_POWER -#elif (CONFIG_KEYPAD == SAMSUNG_YH_PAD) +#elif (CONFIG_KEYPAD == SAMSUNG_YH820_PAD) || \ + (CONFIG_KEYPAD == SAMSUNG_YH920_PAD) # define DEBUG_CANCEL BUTTON_PLAY #elif (CONFIG_KEYPAD == PBELL_VIBE500_PAD) |