summaryrefslogtreecommitdiff
path: root/firmware/target/arm
diff options
context:
space:
mode:
authorDaniel Ankers <dan@weirdo.org.uk>2006-10-07 12:19:34 +0000
committerDaniel Ankers <dan@weirdo.org.uk>2006-10-07 12:19:34 +0000
commit5c6f32af9563764cf7b3f9529956ac27808246cf (patch)
tree3df4eb7103c77846a938092b79ce445ab7f0330c /firmware/target/arm
parent24c337514333460b3738403b264498cad746ccc0 (diff)
downloadrockbox-5c6f32af9563764cf7b3f9529956ac27808246cf.tar.gz
rockbox-5c6f32af9563764cf7b3f9529956ac27808246cf.zip
Move iPod headphone detection into target tree (FS#6131 by Robert Keevil) and fix detection on 3G iPod
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@11143 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'firmware/target/arm')
-rw-r--r--firmware/target/arm/ipod/3g/button-3g.c5
-rw-r--r--firmware/target/arm/ipod/button-clickwheel.c5
-rw-r--r--firmware/target/arm/ipod/button-mini1g.c5
3 files changed, 15 insertions, 0 deletions
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
191bool 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
239bool 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
219bool headphones_inserted(void)
220{
221 return (GPIOA_INPUT_VAL & 0x80)?true:false;
222}