diff options
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 1998720f87..9c1a8dbf57 100644 --- a/firmware/export/config.h +++ b/firmware/export/config.h | |||
@@ -130,7 +130,7 @@ | |||
130 | #define SANSA_CLIP_PAD 35 | 130 | #define SANSA_CLIP_PAD 35 |
131 | #define SANSA_FUZE_PAD 36 | 131 | #define SANSA_FUZE_PAD 36 |
132 | #define LYRE_PROTO1_PAD 37 | 132 | #define LYRE_PROTO1_PAD 37 |
133 | #define SAMSUNG_YH_PAD 38 | 133 | #define SAMSUNG_YH820_PAD 38 |
134 | #define ONDAVX777_PAD 39 | 134 | #define ONDAVX777_PAD 39 |
135 | #define SAMSUNG_YPS3_PAD 40 | 135 | #define SAMSUNG_YPS3_PAD 40 |
136 | #define MINI2440_PAD 41 | 136 | #define MINI2440_PAD 41 |
@@ -154,6 +154,7 @@ | |||
154 | #define SAMSUNG_YPZ5_PAD 59 | 154 | #define SAMSUNG_YPZ5_PAD 59 |
155 | #define IHIFI_PAD 60 | 155 | #define IHIFI_PAD 60 |
156 | #define SAMSUNG_YPR1_PAD 61 | 156 | #define SAMSUNG_YPR1_PAD 61 |
157 | #define SAMSUNG_YH920_PAD 62 | ||
157 | 158 | ||
158 | /* CONFIG_REMOTE_KEYPAD */ | 159 | /* CONFIG_REMOTE_KEYPAD */ |
159 | #define H100_REMOTE 1 | 160 | #define H100_REMOTE 1 |
diff --git a/firmware/export/config/samsungyh820.h b/firmware/export/config/samsungyh820.h index e7a4c9d307..0b9c603850 100644 --- a/firmware/export/config/samsungyh820.h +++ b/firmware/export/config/samsungyh820.h | |||
@@ -90,7 +90,7 @@ | |||
90 | /* define this if you would like tagcache to build on this target */ | 90 | /* define this if you would like tagcache to build on this target */ |
91 | #define HAVE_TAGCACHE | 91 | #define HAVE_TAGCACHE |
92 | 92 | ||
93 | #define CONFIG_KEYPAD SAMSUNG_YH_PAD | 93 | #define CONFIG_KEYPAD SAMSUNG_YH820_PAD |
94 | 94 | ||
95 | /* Define this if you do software codec */ | 95 | /* Define this if you do software codec */ |
96 | #define CONFIG_CODEC SWCODEC | 96 | #define CONFIG_CODEC SWCODEC |
diff --git a/firmware/export/config/samsungyh920.h b/firmware/export/config/samsungyh920.h index a5cb75ef43..04487bc2db 100644 --- a/firmware/export/config/samsungyh920.h +++ b/firmware/export/config/samsungyh920.h | |||
@@ -90,7 +90,7 @@ | |||
90 | /* define this if you would like tagcache to build on this target */ | 90 | /* define this if you would like tagcache to build on this target */ |
91 | #define HAVE_TAGCACHE | 91 | #define HAVE_TAGCACHE |
92 | 92 | ||
93 | #define CONFIG_KEYPAD SAMSUNG_YH_PAD | 93 | #define CONFIG_KEYPAD SAMSUNG_YH920_PAD |
94 | 94 | ||
95 | /* Define this if you do software codec */ | 95 | /* Define this if you do software codec */ |
96 | #define CONFIG_CODEC SWCODEC | 96 | #define CONFIG_CODEC SWCODEC |
diff --git a/firmware/export/config/samsungyh925.h b/firmware/export/config/samsungyh925.h index 92604af135..aeb9cb6829 100644 --- a/firmware/export/config/samsungyh925.h +++ b/firmware/export/config/samsungyh925.h | |||
@@ -87,7 +87,7 @@ | |||
87 | /* define this if you would like tagcache to build on this target */ | 87 | /* define this if you would like tagcache to build on this target */ |
88 | #define HAVE_TAGCACHE | 88 | #define HAVE_TAGCACHE |
89 | 89 | ||
90 | #define CONFIG_KEYPAD SAMSUNG_YH_PAD | 90 | #define CONFIG_KEYPAD SAMSUNG_YH920_PAD |
91 | 91 | ||
92 | /* Define this if you do software codec */ | 92 | /* Define this if you do software codec */ |
93 | #define CONFIG_CODEC SWCODEC | 93 | #define CONFIG_CODEC SWCODEC |
diff --git a/firmware/target/arm/pp/debug-pp.c b/firmware/target/arm/pp/debug-pp.c index 9e0dcad5f9..a77101eef4 100644 --- a/firmware/target/arm/pp/debug-pp.c +++ b/firmware/target/arm/pp/debug-pp.c | |||
@@ -51,7 +51,8 @@ | |||
51 | (CONFIG_KEYPAD == PHILIPS_HDD1630_PAD) | 51 | (CONFIG_KEYPAD == PHILIPS_HDD1630_PAD) |
52 | # define DEBUG_CANCEL BUTTON_POWER | 52 | # define DEBUG_CANCEL BUTTON_POWER |
53 | 53 | ||
54 | #elif (CONFIG_KEYPAD == SAMSUNG_YH_PAD) | 54 | #elif (CONFIG_KEYPAD == SAMSUNG_YH820_PAD) || \ |
55 | (CONFIG_KEYPAD == SAMSUNG_YH920_PAD) | ||
55 | # define DEBUG_CANCEL BUTTON_PLAY | 56 | # define DEBUG_CANCEL BUTTON_PLAY |
56 | 57 | ||
57 | #elif (CONFIG_KEYPAD == PBELL_VIBE500_PAD) | 58 | #elif (CONFIG_KEYPAD == PBELL_VIBE500_PAD) |