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/target/arm/ipod/power-ipod.c | |
| 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/target/arm/ipod/power-ipod.c')
| -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) /* which supports USB suspend */ #if defined(IPOD_VIDEO) || defined(IPOD_NANO) if (suspend_charging) - GPIOL_OUTPUT_VAL |= 4; + GPIO_SET_BITWISE(GPIOL_OUTPUT_VAL, 4); else - GPIOL_OUTPUT_VAL &= ~4; + GPIO_CLEAR_BITWISE(GPIOL_OUTPUT_VAL, 4); #elif defined(IPOD_MINI2G) if (suspend_charging) - GPIOJ_OUTPUT_VAL |= 2; + GPIO_SET_BITWISE(GPIOJ_OUTPUT_VAL, 2); else - GPIOJ_OUTPUT_VAL &= ~2; -#else + GPIO_CLEAR_BITWISE(GPIOJ_OUTPUT_VAL, 2); +#else /* Color, 4G, Mini G1 */ if (suspend_charging) GPO32_VAL |= 0x8000000; else @@ -213,9 +213,9 @@ void usb_charging_maxcurrent_change(int maxcurrent) /* Setting it low limits current to 100mA, setting it high allows 500mA */ #if defined(IPOD_VIDEO) || defined(IPOD_NANO) if (fast_charging) - GPIOA_OUTPUT_VAL |= 4; + GPIO_SET_BITWISE(GPIOA_OUTPUT_VAL, 4); else - GPIOA_OUTPUT_VAL &= ~4; + GPIO_CLEAR_BITWISE(GPIOA_OUTPUT_VAL, 4); #else if (fast_charging) GPO32_VAL |= 0x40; |