1
0
Fork 0
forked from len0rd/rockbox

Use atomic GPIO manipulation where appropriate.

git-svn-id: svn://svn.rockbox.org/rockbox/trunk@26632 a1c6a512-1295-4272-9138-f99709370657
This commit is contained in:
Jens Arnold 2010-06-06 13:50:26 +00:00
parent 5c9e76a1e0
commit a225ee9867

View file

@ -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;