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/button-1g-3g.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/button-1g-3g.c')
| -rw-r--r-- | firmware/target/arm/ipod/button-1g-3g.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/firmware/target/arm/ipod/button-1g-3g.c b/firmware/target/arm/ipod/button-1g-3g.c index 67aa7eb336..2710723866 100644 --- a/firmware/target/arm/ipod/button-1g-3g.c +++ b/firmware/target/arm/ipod/button-1g-3g.c | |||
| @@ -265,7 +265,7 @@ void button_init_device(void) | |||
| 265 | GPIOA_INT_CLR = GPIOA_INT_STAT; | 265 | GPIOA_INT_CLR = GPIOA_INT_STAT; |
| 266 | 266 | ||
| 267 | #ifdef IPOD_1G2G | 267 | #ifdef IPOD_1G2G |
| 268 | if ((IPOD_HW_REVISION >> 16) == 1) | 268 | if ((IPOD_HW_REVISION >> 16) != 2) |
| 269 | { /* enable scroll wheel */ | 269 | { /* enable scroll wheel */ |
| 270 | GPIOB_ENABLE |= 0x01; | 270 | GPIOB_ENABLE |= 0x01; |
| 271 | GPIOB_OUTPUT_EN |= 0x01; | 271 | GPIOB_OUTPUT_EN |= 0x01; |
| @@ -289,7 +289,7 @@ int button_read_device(void) | |||
| 289 | static unsigned char last_wheel_value = 0; | 289 | static unsigned char last_wheel_value = 0; |
| 290 | unsigned char wheel_value; | 290 | unsigned char wheel_value; |
| 291 | 291 | ||
| 292 | if ((IPOD_HW_REVISION >> 16) == 1) | 292 | if ((IPOD_HW_REVISION >> 16) != 2) |
| 293 | { | 293 | { |
| 294 | if (!hold_button && (wheel_timeout == 0)) | 294 | if (!hold_button && (wheel_timeout == 0)) |
| 295 | { | 295 | { |