From 736e966cf5cd6cae1732d874229f363ecfcb9b3a Mon Sep 17 00:00:00 2001 From: gdisirio Date: Thu, 2 Oct 2014 10:13:13 +0000 Subject: renamed STM32F3 directories to reflect new models git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@7342 35acf78f-673a-0410-8e92-d51de3d6d3f4 --- demos/STM32/RT-STM32F303-DISCOVERY/Makefile | 4 +- demos/STM32/RT-STM32F303-DISCOVERY/iar/ch.ewp | 40 +- demos/STM32/RT-STM32F303-DISCOVERY/keil/ch.uvproj | 36 +- demos/STM32/RT-STM32F303-DISCOVERY/mcuconf.h | 4 +- demos/STM32/RT-STM32F373-STM32373C_EVAL/Makefile | 2 +- .../ports/ARMCMx/devices/STM32F30x/cmparams.h | 90 -- .../ports/ARMCMx/devices/STM32F37x/cmparams.h | 85 -- .../ports/ARMCMx/devices/STM32F3xx/cmparams.h | 90 ++ os/hal/ports/STM32/STM32F30x/adc_lld.c | 548 -------- os/hal/ports/STM32/STM32F30x/adc_lld.h | 619 --------- os/hal/ports/STM32/STM32F30x/ext_lld_isr.c | 406 ------ os/hal/ports/STM32/STM32F30x/ext_lld_isr.h | 177 --- os/hal/ports/STM32/STM32F30x/hal_lld.c | 202 --- os/hal/ports/STM32/STM32F30x/hal_lld.h | 1150 ---------------- os/hal/ports/STM32/STM32F30x/platform.mk | 31 - os/hal/ports/STM32/STM32F30x/stm32_dma.c | 449 ------ os/hal/ports/STM32/STM32F30x/stm32_dma.h | 406 ------ os/hal/ports/STM32/STM32F30x/stm32_isr.h | 132 -- os/hal/ports/STM32/STM32F30x/stm32_rcc.h | 835 ----------- os/hal/ports/STM32/STM32F30x/stm32_registry.h | 1444 -------------------- os/hal/ports/STM32/STM32F3xx/adc_lld.c | 548 ++++++++ os/hal/ports/STM32/STM32F3xx/adc_lld.h | 619 +++++++++ os/hal/ports/STM32/STM32F3xx/ext_lld_isr.c | 406 ++++++ os/hal/ports/STM32/STM32F3xx/ext_lld_isr.h | 177 +++ os/hal/ports/STM32/STM32F3xx/hal_lld.c | 202 +++ os/hal/ports/STM32/STM32F3xx/hal_lld.h | 1150 ++++++++++++++++ os/hal/ports/STM32/STM32F3xx/platform.mk | 31 + os/hal/ports/STM32/STM32F3xx/stm32_dma.c | 449 ++++++ os/hal/ports/STM32/STM32F3xx/stm32_dma.h | 406 ++++++ os/hal/ports/STM32/STM32F3xx/stm32_isr.h | 132 ++ os/hal/ports/STM32/STM32F3xx/stm32_rcc.h | 835 +++++++++++ os/hal/ports/STM32/STM32F3xx/stm32_registry.h | 1444 ++++++++++++++++++++ .../ARMCMx/compilers/GCC/mk/port_stm32f30x.mk | 15 - .../ARMCMx/compilers/GCC/mk/port_stm32f3xx.mk | 15 + .../ARMCMx/compilers/GCC/mk/port_stm32f30x.mk | 15 - .../ARMCMx/compilers/GCC/mk/port_stm32f3xx.mk | 15 + testhal/STM32/STM32F30x/ADC/Makefile | 4 +- testhal/STM32/STM32F30x/ADC/mcuconf.h | 4 +- testhal/STM32/STM32F30x/ADC_DUAL/Makefile | 4 +- testhal/STM32/STM32F30x/ADC_DUAL/mcuconf.h | 4 +- testhal/STM32/STM32F30x/CAN/Makefile | 4 +- testhal/STM32/STM32F30x/CAN/mcuconf.h | 4 +- testhal/STM32/STM32F30x/EXT/Makefile | 4 +- testhal/STM32/STM32F30x/EXT/mcuconf.h | 4 +- testhal/STM32/STM32F30x/IRQ_STORM/Makefile | 4 +- testhal/STM32/STM32F30x/IRQ_STORM/mcuconf.h | 4 +- testhal/STM32/STM32F30x/PWM-ICU/Makefile | 4 +- testhal/STM32/STM32F30x/PWM-ICU/mcuconf.h | 4 +- testhal/STM32/STM32F30x/SPI/Makefile | 4 +- testhal/STM32/STM32F30x/SPI/mcuconf.h | 4 +- testhal/STM32/STM32F30x/UART/Makefile | 4 +- testhal/STM32/STM32F30x/UART/mcuconf.h | 4 +- testhal/STM32/STM32F30x/USB_CDC/Makefile | 4 +- testhal/STM32/STM32F30x/USB_CDC/mcuconf.h | 4 +- testhal/STM32/STM32F37x/ADC/Makefile | 2 +- testhal/STM32/STM32F37x/CAN/Makefile | 2 +- testhal/STM32/STM32F37x/EXT/Makefile | 2 +- testhal/STM32/STM32F37x/I2C/Makefile | 2 +- testhal/STM32/STM32F37x/IRQ_STORM/Makefile | 2 +- testhal/STM32/STM32F37x/PWM-ICU/Makefile | 2 +- testhal/STM32/STM32F37x/SDADC/Makefile | 2 +- testhal/STM32/STM32F37x/SPI/Makefile | 2 +- testhal/STM32/STM32F37x/UART/Makefile | 2 +- testhal/STM32/STM32F37x/USB_CDC/Makefile | 2 +- 64 files changed, 6608 insertions(+), 6693 deletions(-) delete mode 100644 os/common/ports/ARMCMx/devices/STM32F30x/cmparams.h delete mode 100644 os/common/ports/ARMCMx/devices/STM32F37x/cmparams.h create mode 100644 os/common/ports/ARMCMx/devices/STM32F3xx/cmparams.h delete mode 100644 os/hal/ports/STM32/STM32F30x/adc_lld.c delete mode 100644 os/hal/ports/STM32/STM32F30x/adc_lld.h delete mode 100644 os/hal/ports/STM32/STM32F30x/ext_lld_isr.c delete mode 100644 os/hal/ports/STM32/STM32F30x/ext_lld_isr.h delete mode 100644 os/hal/ports/STM32/STM32F30x/hal_lld.c delete mode 100644 os/hal/ports/STM32/STM32F30x/hal_lld.h delete mode 100644 os/hal/ports/STM32/STM32F30x/platform.mk delete mode 100644 os/hal/ports/STM32/STM32F30x/stm32_dma.c delete mode 100644 os/hal/ports/STM32/STM32F30x/stm32_dma.h delete mode 100644 os/hal/ports/STM32/STM32F30x/stm32_isr.h delete mode 100644 os/hal/ports/STM32/STM32F30x/stm32_rcc.h delete mode 100644 os/hal/ports/STM32/STM32F30x/stm32_registry.h create mode 100644 os/hal/ports/STM32/STM32F3xx/adc_lld.c create mode 100644 os/hal/ports/STM32/STM32F3xx/adc_lld.h create mode 100644 os/hal/ports/STM32/STM32F3xx/ext_lld_isr.c create mode 100644 os/hal/ports/STM32/STM32F3xx/ext_lld_isr.h create mode 100644 os/hal/ports/STM32/STM32F3xx/hal_lld.c create mode 100644 os/hal/ports/STM32/STM32F3xx/hal_lld.h create mode 100644 os/hal/ports/STM32/STM32F3xx/platform.mk create mode 100644 os/hal/ports/STM32/STM32F3xx/stm32_dma.c create mode 100644 os/hal/ports/STM32/STM32F3xx/stm32_dma.h create mode 100644 os/hal/ports/STM32/STM32F3xx/stm32_isr.h create mode 100644 os/hal/ports/STM32/STM32F3xx/stm32_rcc.h create mode 100644 os/hal/ports/STM32/STM32F3xx/stm32_registry.h delete mode 100644 os/nil/ports/ARMCMx/compilers/GCC/mk/port_stm32f30x.mk create mode 100644 os/nil/ports/ARMCMx/compilers/GCC/mk/port_stm32f3xx.mk delete mode 100644 os/rt/ports/ARMCMx/compilers/GCC/mk/port_stm32f30x.mk create mode 100644 os/rt/ports/ARMCMx/compilers/GCC/mk/port_stm32f3xx.mk diff --git a/demos/STM32/RT-STM32F303-DISCOVERY/Makefile b/demos/STM32/RT-STM32F303-DISCOVERY/Makefile index 6f276f8f9..fcd7c512e 100644 --- a/demos/STM32/RT-STM32F303-DISCOVERY/Makefile +++ b/demos/STM32/RT-STM32F303-DISCOVERY/Makefile @@ -83,10 +83,10 @@ PROJECT = ch CHIBIOS = ../../.. include $(CHIBIOS)/os/hal/hal.mk include $(CHIBIOS)/os/hal/boards/ST_STM32F3_DISCOVERY/board.mk -include $(CHIBIOS)/os/hal/ports/STM32/STM32F30x/platform.mk +include $(CHIBIOS)/os/hal/ports/STM32/STM32F3xx/platform.mk include $(CHIBIOS)/os/hal/osal/rt/osal.mk include $(CHIBIOS)/os/rt/rt.mk -include $(CHIBIOS)/os/rt/ports/ARMCMx/compilers/GCC/mk/port_stm32f30x.mk +include $(CHIBIOS)/os/rt/ports/ARMCMx/compilers/GCC/mk/port_stm32f3xx.mk include $(CHIBIOS)/test/rt/test.mk # Define linker script file here diff --git a/demos/STM32/RT-STM32F303-DISCOVERY/iar/ch.ewp b/demos/STM32/RT-STM32F303-DISCOVERY/iar/ch.ewp index 9427f0f63..fd7b13a99 100644 --- a/demos/STM32/RT-STM32F303-DISCOVERY/iar/ch.ewp +++ b/demos/STM32/RT-STM32F303-DISCOVERY/iar/ch.ewp @@ -302,7 +302,7 @@