diff options
| author | Jens Arnold <amiconn@rockbox.org> | 2010-06-06 13:50:26 +0000 |
|---|---|---|
| committer | Jens Arnold <amiconn@rockbox.org> | 2010-06-06 13:50:26 +0000 |
| commit | a225ee9867263fe99e14edfcabfe6eda4670a7b6 (patch) | |
| tree | 9236fc7d73bbb5f0f65a69b5f46bafd702037c2c /firmware | |
| parent | 5c9e76a1e0b1e6017acc6d8503eb12b42b4d0de7 (diff) | |
| download | rockbox-a225ee9867263fe99e14edfcabfe6eda4670a7b6.tar.gz rockbox-a225ee9867263fe99e14edfcabfe6eda4670a7b6.zip | |
Use atomic GPIO manipulation where appropriate.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@26632 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'firmware')
| -rw-r--r-- | firmware/target/arm/ipod/power-ipod.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/firmware/target/arm/ipod/power-ipod.c b/firmware/target/arm/ipod/power-ipod.c index 0becedf2cd..a82a18f699 100644 --- a/firmware/target/arm/ipod/power-ipod.c +++ b/firmware/target/arm/ipod/power-ipod.c | |||
| @@ -194,15 +194,15 @@ void usb_charging_maxcurrent_change(int maxcurrent) | |||
| 194 | /* which supports USB suspend */ | 194 | /* which supports USB suspend */ |
| 195 | #if defined(IPOD_VIDEO) || defined(IPOD_NANO) | 195 | #if defined(IPOD_VIDEO) || defined(IPOD_NANO) |
| 196 | if (suspend_charging) | 196 | if (suspend_charging) |
| 197 | GPIOL_OUTPUT_VAL |= 4; | 197 | GPIO_SET_BITWISE(GPIOL_OUTPUT_VAL, 4); |
| 198 | else | 198 | else |
| 199 | GPIOL_OUTPUT_VAL &= ~4; | 199 | GPIO_CLEAR_BITWISE(GPIOL_OUTPUT_VAL, 4); |
| 200 | #elif defined(IPOD_MINI2G) | 200 | #elif defined(IPOD_MINI2G) |
| 201 | if (suspend_charging) | 201 | if (suspend_charging) |
| 202 | GPIOJ_OUTPUT_VAL |= 2; | 202 | GPIO_SET_BITWISE(GPIOJ_OUTPUT_VAL, 2); |
| 203 | else | 203 | else |
| 204 | GPIOJ_OUTPUT_VAL &= ~2; | 204 | GPIO_CLEAR_BITWISE(GPIOJ_OUTPUT_VAL, 2); |
| 205 | #else | 205 | #else /* Color, 4G, Mini G1 */ |
| 206 | if (suspend_charging) | 206 | if (suspend_charging) |
| 207 | GPO32_VAL |= 0x8000000; | 207 | GPO32_VAL |= 0x8000000; |
| 208 | else | 208 | else |
| @@ -213,9 +213,9 @@ void usb_charging_maxcurrent_change(int maxcurrent) | |||
| 213 | /* Setting it low limits current to 100mA, setting it high allows 500mA */ | 213 | /* Setting it low limits current to 100mA, setting it high allows 500mA */ |
| 214 | #if defined(IPOD_VIDEO) || defined(IPOD_NANO) | 214 | #if defined(IPOD_VIDEO) || defined(IPOD_NANO) |
| 215 | if (fast_charging) | 215 | if (fast_charging) |
| 216 | GPIOA_OUTPUT_VAL |= 4; | 216 | GPIO_SET_BITWISE(GPIOA_OUTPUT_VAL, 4); |
| 217 | else | 217 | else |
| 218 | GPIOA_OUTPUT_VAL &= ~4; | 218 | GPIO_CLEAR_BITWISE(GPIOA_OUTPUT_VAL, 4); |
| 219 | #else | 219 | #else |
| 220 | if (fast_charging) | 220 | if (fast_charging) |
| 221 | GPO32_VAL |= 0x40; | 221 | GPO32_VAL |= 0x40; |