aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPiotr Esden-Tempski2012-06-27 13:49:26 -0700
committerPiotr Esden-Tempski2012-06-27 13:49:26 -0700
commitdb505a87f7f9b0adc340a26481e830727b448f10 (patch)
treece0a57b2d4fafea9261344bbe22f91da6e157c29
parent3bfeeedceb3dcff80fa2b4e17efaba615ca4760b (diff)
parent12a73ce052477ef9d35244e2986a7e56428754df (diff)
Merging pull request #7 "Use ODR instead of IDR to toggle an output GPIO"
Merge remote-tracking branch 'schodet/gpio-toggle'
-rw-r--r--lib/stm32/f2/gpio.c2
-rw-r--r--lib/stm32/f4/gpio.c2
2 files changed, 2 insertions, 2 deletions
diff --git a/lib/stm32/f2/gpio.c b/lib/stm32/f2/gpio.c
index fc7a5b6..984cddb 100644
--- a/lib/stm32/f2/gpio.c
+++ b/lib/stm32/f2/gpio.c
@@ -111,7 +111,7 @@ u16 gpio_get(u32 gpioport, u16 gpios)
void gpio_toggle(u32 gpioport, u16 gpios)
{
- GPIO_ODR(gpioport) = GPIO_IDR(gpioport) ^ gpios;
+ GPIO_ODR(gpioport) ^= gpios;
}
u16 gpio_port_read(u32 gpioport)
diff --git a/lib/stm32/f4/gpio.c b/lib/stm32/f4/gpio.c
index e721f3f..1d7739d 100644
--- a/lib/stm32/f4/gpio.c
+++ b/lib/stm32/f4/gpio.c
@@ -111,7 +111,7 @@ u16 gpio_get(u32 gpioport, u16 gpios)
void gpio_toggle(u32 gpioport, u16 gpios)
{
- GPIO_ODR(gpioport) = GPIO_IDR(gpioport) ^ gpios;
+ GPIO_ODR(gpioport) ^= gpios;
}
u16 gpio_port_read(u32 gpioport)