diff options
-rw-r--r-- | docs/CREDITS | 1 | ||||
-rw-r--r-- | firmware/target/arm/ipod/1g2g/adc-ipod-1g2g.c | 4 | ||||
-rw-r--r-- | firmware/target/arm/ipod/1g2g/powermgmt-1g2g.c | 2 | ||||
-rw-r--r-- | firmware/target/arm/ipod/button-1g-3g.c | 4 |
4 files changed, 6 insertions, 5 deletions
diff --git a/docs/CREDITS b/docs/CREDITS index 85f02dd4f1..012b31c72b 100644 --- a/docs/CREDITS +++ b/docs/CREDITS | |||
@@ -695,6 +695,7 @@ Sylvain Saubier | |||
695 | Adrián Tinoco | 695 | Adrián Tinoco |
696 | Boris Kovačević | 696 | Boris Kovačević |
697 | Stéphane Moutard-Martin | 697 | Stéphane Moutard-Martin |
698 | Rune Pade | ||
698 | 699 | ||
699 | The libmad team | 700 | The libmad team |
700 | The wavpack team | 701 | The wavpack team |
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 */ |
diff --git a/firmware/target/arm/ipod/1g2g/powermgmt-1g2g.c b/firmware/target/arm/ipod/1g2g/powermgmt-1g2g.c index c3eca14332..b90b953c68 100644 --- a/firmware/target/arm/ipod/1g2g/powermgmt-1g2g.c +++ b/firmware/target/arm/ipod/1g2g/powermgmt-1g2g.c | |||
@@ -61,7 +61,7 @@ int _battery_voltage(void) | |||
61 | { | 61 | { |
62 | unsigned adcval = adc_read(ADC_UNREG_POWER); | 62 | unsigned adcval = adc_read(ADC_UNREG_POWER); |
63 | 63 | ||
64 | if ((IPOD_HW_REVISION >> 16) == 1) | 64 | if ((IPOD_HW_REVISION >> 16) != 2) |
65 | return (adcval * BATTERY_SCALE_FACTOR_1G) >> 8; | 65 | return (adcval * BATTERY_SCALE_FACTOR_1G) >> 8; |
66 | else | 66 | else |
67 | return (adcval * BATTERY_SCALE_FACTOR_2G) >> 8; | 67 | return (adcval * BATTERY_SCALE_FACTOR_2G) >> 8; |
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 | { |