diff options
author | Solomon Peachy <pizza@shaftnet.org> | 2020-07-27 21:00:49 -0400 |
---|---|---|
committer | Solomon Peachy <pizza@shaftnet.org> | 2020-07-28 01:07:45 +0000 |
commit | 5e72616618658c8b377db323696042ca122a5c89 (patch) | |
tree | 5f52d841e789a7d63473c0604aa0c0a468e8ab5d /firmware/target/arm/ipod/1g2g/adc-ipod-1g2g.c | |
parent | be04c4be0afbdef36f2968dc291af54360de8e23 (diff) | |
download | rockbox-5e72616618658c8b377db323696042ca122a5c89.tar.gz rockbox-5e72616618658c8b377db323696042ca122a5c89.zip |
FS#8778: Fix iPod 1G scroll wheel not being enabled (Mark Fawcus and Rune Pade)
They confirmed it worked in the original ticket.
Change-Id: I949f119554a1e8bbdd0e4160c104cbc4aa2bd17d
Diffstat (limited to 'firmware/target/arm/ipod/1g2g/adc-ipod-1g2g.c')
-rw-r--r-- | firmware/target/arm/ipod/1g2g/adc-ipod-1g2g.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/firmware/target/arm/ipod/1g2g/adc-ipod-1g2g.c b/firmware/target/arm/ipod/1g2g/adc-ipod-1g2g.c index 37c719f2b1..4a9fe2e568 100644 --- a/firmware/target/arm/ipod/1g2g/adc-ipod-1g2g.c +++ b/firmware/target/arm/ipod/1g2g/adc-ipod-1g2g.c | |||
@@ -40,7 +40,7 @@ unsigned short adc_scan(int channel) | |||
40 | (void)channel; /* there is only one */ | 40 | (void)channel; /* there is only one */ |
41 | mutex_lock(&adc_mtx); | 41 | mutex_lock(&adc_mtx); |
42 | 42 | ||
43 | if ((IPOD_HW_REVISION >> 16) == 1) | 43 | if ((IPOD_HW_REVISION >> 16) != 2) |
44 | { | 44 | { |
45 | int i; | 45 | int i; |
46 | unsigned pval = GPIOB_OUTPUT_VAL; | 46 | unsigned pval = GPIOB_OUTPUT_VAL; |
@@ -109,7 +109,7 @@ void adc_init(void) | |||
109 | 109 | ||
110 | GPIOB_ENABLE |= 0x1e; /* enable B1..B4 */ | 110 | GPIOB_ENABLE |= 0x1e; /* enable B1..B4 */ |
111 | 111 | ||
112 | if ((IPOD_HW_REVISION >> 16) == 1) | 112 | if ((IPOD_HW_REVISION >> 16) != 2) |
113 | { | 113 | { |
114 | GPIOB_OUTPUT_EN = (GPIOB_OUTPUT_EN & ~0x08) | 0x16; | 114 | GPIOB_OUTPUT_EN = (GPIOB_OUTPUT_EN & ~0x08) | 0x16; |
115 | /* B1, B2, B4 -> output, B3 -> input */ | 115 | /* B1, B2, B4 -> output, B3 -> input */ |