From 6dce8229275ea014b3c39181e4bcce1d3845f530 Mon Sep 17 00:00:00 2001 From: Buschel Date: Sun, 21 Mar 2010 13:50:38 +0000 Subject: [PATCH] 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 --- firmware/target/arm/ipod/power-ipod.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/firmware/target/arm/ipod/power-ipod.c b/firmware/target/arm/ipod/power-ipod.c index 897527f6a..14c8bf21e 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 */ -- 2.11.4.GIT