aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorUladzimir Pylinski <barthess@yandex.ru>2016-04-29 19:09:22 +0300
committerUladzimir Pylinski <barthess@yandex.ru>2016-04-29 19:09:22 +0300
commitecab016be95ecfc51d0e0708d473eaf60f5f0ac7 (patch)
tree43c086961f77693f504535b517dcf94f20565209
parent0625a978f75dc589d306f20c4d1ef755938c3cbc (diff)
parent409a3f226db366ec2918970b732e0ed26dbf173e (diff)
downloadChibiOS-Contrib-ecab016be95ecfc51d0e0708d473eaf60f5f0ac7.tar.gz
ChibiOS-Contrib-ecab016be95ecfc51d0e0708d473eaf60f5f0ac7.tar.bz2
ChibiOS-Contrib-ecab016be95ecfc51d0e0708d473eaf60f5f0ac7.zip
Merge pull request #65 from pl4nkton/add_stm32f1xx_port
FSMC. Added stm32f1xx port.
-rw-r--r--os/hal/ports/STM32/LLD/FSMCv1/hal_fsmc.c4
-rw-r--r--os/hal/ports/STM32/STM32F1xx/platform.mk14
2 files changed, 18 insertions, 0 deletions
diff --git a/os/hal/ports/STM32/LLD/FSMCv1/hal_fsmc.c b/os/hal/ports/STM32/LLD/FSMCv1/hal_fsmc.c
index fe48696..8b1082c 100644
--- a/os/hal/ports/STM32/LLD/FSMCv1/hal_fsmc.c
+++ b/os/hal/ports/STM32/LLD/FSMCv1/hal_fsmc.c
@@ -120,7 +120,9 @@ void fsmc_start(FSMCDriver *fsmcp) {
/* Enables the peripheral.*/
#if STM32_FSMC_USE_FSMC1
if (&FSMCD1 == fsmcp) {
+#ifdef rccResetFSMC
rccResetFSMC();
+#endif
rccEnableFSMC(FALSE);
#if (!STM32_NAND_USE_EXT_INT && HAL_USE_NAND)
nvicEnableVector(STM32_FSMC_NUMBER, STM32_FSMC_FSMC1_IRQ_PRIORITY);
@@ -143,7 +145,9 @@ void fsmc_stop(FSMCDriver *fsmcp) {
if (fsmcp->state == FSMC_READY) {
/* Resets the peripheral.*/
+#ifdef rccResetFSMC
rccResetFSMC();
+#endif
/* Disables the peripheral.*/
#if STM32_FSMC_USE_FSMC1
diff --git a/os/hal/ports/STM32/STM32F1xx/platform.mk b/os/hal/ports/STM32/STM32F1xx/platform.mk
new file mode 100644
index 0000000..d2aeae0
--- /dev/null
+++ b/os/hal/ports/STM32/STM32F1xx/platform.mk
@@ -0,0 +1,14 @@
+include ${CHIBIOS}/os/hal/ports/STM32/STM32F1xx/platform.mk
+
+PLATFORMSRC += ${CHIBIOS_CONTRIB}/os/hal/ports/STM32/LLD/CRCv1/hal_crc_lld.c \
+ ${CHIBIOS_CONTRIB}/os/hal/ports/STM32/LLD/FSMCv1/hal_fsmc.c \
+ ${CHIBIOS_CONTRIB}/os/hal/ports/STM32/LLD/FSMCv1/hal_nand_lld.c \
+ ${CHIBIOS_CONTRIB}/os/hal/ports/STM32/LLD/FSMCv1/hal_fsmc_sram.c \
+ ${CHIBIOS_CONTRIB}/os/hal/ports/STM32/LLD/TIMv1/hal_eicu_lld.c \
+ ${CHIBIOS_CONTRIB}/os/hal/ports/STM32/LLD/TIMv1/hal_timcap_lld.c \
+ ${CHIBIOS_CONTRIB}/os/hal/src/hal_fsmc_sdram.c
+
+PLATFORMINC += ${CHIBIOS_CONTRIB}/os/hal/ports/STM32/LLD/CRCv1 \
+ ${CHIBIOS_CONTRIB}/os/hal/ports/STM32/LLD/FSMCv1 \
+ ${CHIBIOS_CONTRIB}/os/hal/ports/STM32/LLD/TIMv1 \
+ ${CHIBIOS_CONTRIB}/os/hal/ports/STM32/LLD