aboutsummaryrefslogtreecommitdiff
path: root/lib/stm32/f1/gpio.c
diff options
context:
space:
mode:
authorPiotr Esden-Tempski2013-01-06 17:52:43 -0800
committerPiotr Esden-Tempski2013-01-06 17:52:43 -0800
commitc904c3ae575e1bdb9a6fe69a25f22a254516b201 (patch)
tree3736f852dd3f37b3273d42de6607060fd0ad2d48 /lib/stm32/f1/gpio.c
parent70746ccd676445481511c0e8bc6b617f7b052878 (diff)
parent88d4f020816c018e31ba48cdd975a9738ba56eed (diff)
Merging pull request #63 Improvements to STM32F1 I2C, CAN, RCC, and USB (f107)
Merge remote-tracking branch 'icd/master'
Diffstat (limited to 'lib/stm32/f1/gpio.c')
-rw-r--r--lib/stm32/f1/gpio.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/stm32/f1/gpio.c b/lib/stm32/f1/gpio.c
index f0b7f70..2b33cad 100644
--- a/lib/stm32/f1/gpio.c
+++ b/lib/stm32/f1/gpio.c
@@ -164,7 +164,7 @@ value cannot be ascertained from the hardware.
*/
void gpio_primary_remap(u8 swjdisable, u32 maps)
{
- AFIO_MAPR = swjdisable | (maps & 0x1FFFFF);
+ AFIO_MAPR |= swjdisable | (maps & 0x1FFFFF);
}
/*-----------------------------------------------------------------------------*/
@@ -182,7 +182,7 @@ The AFIO remapping feature is used only with the STM32F10x series.
*/
void gpio_secondary_remap(u32 maps)
{
- AFIO_MAPR2 = maps;
+ AFIO_MAPR2 |= maps;
}
/**@}*/