summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndree Buschmann <AndreeBuschmann@t-online.de>2010-03-21 13:50:38 +0000
committerAndree Buschmann <AndreeBuschmann@t-online.de>2010-03-21 13:50:38 +0000
commit18e7c1f4af9593bfd8ce8bfcd4b594ed7211b6e9 (patch)
treee8c5d6f97a634f4d25b58475222ec16135a91599
parent7eafef09a66b7030f54e2c033c4b00eb612e1b30 (diff)
downloadrockbox-18e7c1f4af9593bfd8ce8bfcd4b594ed7211b6e9.zip
rockbox-18e7c1f4af9593bfd8ce8bfcd4b594ed7211b6e9.tar.gz
rockbox-18e7c1f4af9593bfd8ce8bfcd4b594ed7211b6e9.tar.bz2
rockbox-18e7c1f4af9593bfd8ce8bfcd4b594ed7211b6e9.tar.xz
Use atomic operation for GPIOx_ENABLEs in ide_power_enable() for iPod Video. Thanks to Jens Arnold for this one.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@25273 a1c6a512-1295-4272-9138-f99709370657
-rw-r--r--firmware/target/arm/ipod/power-ipod.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/firmware/target/arm/ipod/power-ipod.c b/firmware/target/arm/ipod/power-ipod.c
index 897527f..14c8bf2 100644
--- a/firmware/target/arm/ipod/power-ipod.c
+++ b/firmware/target/arm/ipod/power-ipod.c
@@ -121,8 +121,8 @@ void ide_power_enable(bool on)
DEV_EN |= DEV_IDE0;
GPIOG_ENABLE = 0;
GPIOH_ENABLE = 0;
- GPIOI_ENABLE &= 0x40;
- GPIOK_ENABLE &= 0XE0;
+ GPIO_CLEAR_BITWISE(GPIOI_ENABLE, 0xBF);
+ GPIO_CLEAR_BITWISE(GPIOK_ENABLE, 0x1F);
udelay(10);
}
else
@@ -131,8 +131,8 @@ void ide_power_enable(bool on)
udelay(10);
GPIOG_ENABLE = 0xFF;
GPIOH_ENABLE = 0xFF;
- GPIOI_ENABLE |= 0xBF;
- GPIOK_ENABLE |= 0x1F;
+ GPIO_SET_BITWISE(GPIOI_ENABLE, 0xBF);
+ GPIO_SET_BITWISE(GPIOK_ENABLE, 0x1F);
GPO32_VAL |= 0x40000000;
}
#else /* Nano */