diff options
Diffstat (limited to 'firmware')
-rw-r--r-- | firmware/drivers/button.c | 12 | ||||
-rw-r--r-- | firmware/target/arm/ipod/3g/button-3g.c | 5 | ||||
-rw-r--r-- | firmware/target/arm/ipod/button-clickwheel.c | 5 | ||||
-rw-r--r-- | firmware/target/arm/ipod/button-mini1g.c | 5 |
4 files changed, 15 insertions, 12 deletions
diff --git a/firmware/drivers/button.c b/firmware/drivers/button.c index 8acae01006..cc9f0fa18d 100644 --- a/firmware/drivers/button.c +++ b/firmware/drivers/button.c | |||
@@ -951,15 +951,3 @@ void button_clear_queue(void) | |||
951 | { | 951 | { |
952 | queue_clear(&button_queue); | 952 | queue_clear(&button_queue); |
953 | } | 953 | } |
954 | |||
955 | #ifdef HAVE_HEADPHONE_DETECTION | ||
956 | bool headphones_inserted(void) | ||
957 | { | ||
958 | #if (CONFIG_KEYPAD==IPOD_3G_PAD) | ||
959 | return (GPIOB_INPUT_VAL & 0x10)?true:false; | ||
960 | #elif (CONFIG_KEYPAD==IPOD_4G_PAD) | ||
961 | return (GPIOA_INPUT_VAL & 0x80)?true:false; | ||
962 | #endif | ||
963 | } | ||
964 | #endif | ||
965 | |||
diff --git a/firmware/target/arm/ipod/3g/button-3g.c b/firmware/target/arm/ipod/3g/button-3g.c index 7244dd597b..25afd42095 100644 --- a/firmware/target/arm/ipod/3g/button-3g.c +++ b/firmware/target/arm/ipod/3g/button-3g.c | |||
@@ -187,3 +187,8 @@ bool button_hold(void) | |||
187 | { | 187 | { |
188 | return (GPIOA_INPUT_VAL & 0x20)?false:true; | 188 | return (GPIOA_INPUT_VAL & 0x20)?false:true; |
189 | } | 189 | } |
190 | |||
191 | bool headphones_inserted(void) | ||
192 | { | ||
193 | return (GPIOC_INPUT_VAL & 0x1)?true:false; | ||
194 | } | ||
diff --git a/firmware/target/arm/ipod/button-clickwheel.c b/firmware/target/arm/ipod/button-clickwheel.c index 4c536343c4..6cac037155 100644 --- a/firmware/target/arm/ipod/button-clickwheel.c +++ b/firmware/target/arm/ipod/button-clickwheel.c | |||
@@ -235,3 +235,8 @@ bool button_hold(void) | |||
235 | { | 235 | { |
236 | return (GPIOA_INPUT_VAL & 0x20)?false:true; | 236 | return (GPIOA_INPUT_VAL & 0x20)?false:true; |
237 | } | 237 | } |
238 | |||
239 | bool headphones_inserted(void) | ||
240 | { | ||
241 | return (GPIOA_INPUT_VAL & 0x80)?true:false; | ||
242 | } | ||
diff --git a/firmware/target/arm/ipod/button-mini1g.c b/firmware/target/arm/ipod/button-mini1g.c index 07885bc159..f979991141 100644 --- a/firmware/target/arm/ipod/button-mini1g.c +++ b/firmware/target/arm/ipod/button-mini1g.c | |||
@@ -215,3 +215,8 @@ bool button_hold(void) | |||
215 | { | 215 | { |
216 | return (GPIOA_INPUT_VAL & 0x20)?false:true; | 216 | return (GPIOA_INPUT_VAL & 0x20)?false:true; |
217 | } | 217 | } |
218 | |||
219 | bool headphones_inserted(void) | ||
220 | { | ||
221 | return (GPIOA_INPUT_VAL & 0x80)?true:false; | ||
222 | } | ||