EMTime/libopencm3
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merging pull request #63 Improvements to STM32F1 I2C, CAN, RCC, and USB (f107)

Browse Source 
Merge remote-tracking branch 'icd/master'
This commit is contained in:
Piotr Esden-Tempski
2013-01-06 17:52:43 -08:00
parent 70746ccd67 88d4f02081
commit c904c3ae57
20 changed files with 496 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
lib/stm32/f1/gpio.c
View File

@@ -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;
}
/**@}*/