git-svn-id: svn://svn.code.sf.net/p/chibios/svn/branches/kernel_3_dev@6243 35acf78f-673a-0410-8e92-d51de3d6d3f4

8 files changed, 88 insertions, 87 deletions

diff --git a/demos/rt/ARMCM0-STM32F051-DISCOVERY/.cproject b/demos/rt/ARMCM0-STM32F051-DISCOVERY/.cproject
index a5d58c50a..1f5f1c985 100644
--- a/demos/rt/ARMCM0-STM32F051-DISCOVERY/.cproject
+++ b/demos/rt/ARMCM0-STM32F051-DISCOVERY/.cproject
@@ -48,4 +48,5 @@
 		</scannerConfigBuildInfo>

 	</storageModule>

 	<storageModule moduleId="org.eclipse.cdt.core.LanguageSettingsProviders"/>

+	<storageModule moduleId="refreshScope"/>

 </cproject>

diff --git a/demos/rt/ARMCM0-STM32F051-DISCOVERY/Makefile b/demos/rt/ARMCM0-STM32F051-DISCOVERY/Makefile
index fa4567fb4..f00e5aa5c 100644
--- a/demos/rt/ARMCM0-STM32F051-DISCOVERY/Makefile
+++ b/demos/rt/ARMCM0-STM32F051-DISCOVERY/Makefile
@@ -62,7 +62,7 @@ CHIBIOS = ../../..
 include $(CHIBIOS)/os/hal/hal.mk

 include $(CHIBIOS)/os/hal/osal/chibios/osal.mk

 include $(CHIBIOS)/os/hal/boards/ST_STM32F0_DISCOVERY/board.mk

-include $(CHIBIOS)/os/hal/platforms/STM32F0xx/platform.mk

+include $(CHIBIOS)/os/hal/ports/STM32F0xx/platform.mk

 include $(CHIBIOS)/os/rt/rt.mk

 include $(CHIBIOS)/os/rt/ports/ARMCMx/compilers/GCC/mk/port_stm32f0xx.mk

 include $(CHIBIOS)/test/test.mk

diff --git a/demos/rt/ARMCM4-STM32F303-DISCOVERY/Makefile b/demos/rt/ARMCM4-STM32F303-DISCOVERY/Makefile
index d6676f786..674ce2218 100644
--- a/demos/rt/ARMCM4-STM32F303-DISCOVERY/Makefile
+++ b/demos/rt/ARMCM4-STM32F303-DISCOVERY/Makefile
@@ -68,7 +68,7 @@ CHIBIOS = ../../..
 include $(CHIBIOS)/os/hal/hal.mk

 include $(CHIBIOS)/os/hal/osal/chibios/osal.mk

 include $(CHIBIOS)/os/hal/boards/ST_STM32F3_DISCOVERY/board.mk

-include $(CHIBIOS)/os/hal/platforms/STM32F30x/platform.mk

+include $(CHIBIOS)/os/hal/ports/STM32F30x/platform.mk

 include $(CHIBIOS)/os/rt/rt.mk

 include $(CHIBIOS)/os/rt/ports/ARMCMx/compilers/GCC/mk/port_stm32f30x.mk

 include $(CHIBIOS)/test/test.mk

diff --git a/demos/rt/ARMCM4-STM32F407-DISCOVERY-MEMS/Makefile b/demos/rt/ARMCM4-STM32F407-DISCOVERY-MEMS/Makefile
index 2e7dbeeea..08ed3908a 100644
--- a/demos/rt/ARMCM4-STM32F407-DISCOVERY-MEMS/Makefile
+++ b/demos/rt/ARMCM4-STM32F407-DISCOVERY-MEMS/Makefile
@@ -68,7 +68,7 @@ CHIBIOS = ../../..
 include $(CHIBIOS)/os/hal/hal.mk

 include $(CHIBIOS)/os/hal/osal/chibios/osal.mk

 include $(CHIBIOS)/os/hal/boards/ST_STM32F4_DISCOVERY/board.mk

-include $(CHIBIOS)/os/hal/platforms/STM32F4xx/platform.mk

+include $(CHIBIOS)/os/hal/ports/STM32F4xx/platform.mk

 include $(CHIBIOS)/os/rt/rt.mk

 include $(CHIBIOS)/os/rt/ports/ARMCMx/compilers/GCC/mk/port_stm32f4xx.mk

 include $(CHIBIOS)/test/test.mk

diff --git a/demos/rt/ARMCM4-STM32F407-DISCOVERY/Makefile b/demos/rt/ARMCM4-STM32F407-DISCOVERY/Makefile
index 6c63f1a5b..119c17090 100644
--- a/demos/rt/ARMCM4-STM32F407-DISCOVERY/Makefile
+++ b/demos/rt/ARMCM4-STM32F407-DISCOVERY/Makefile
@@ -68,7 +68,7 @@ CHIBIOS = ../../..
 include $(CHIBIOS)/os/hal/hal.mk

 include $(CHIBIOS)/os/hal/osal/chibios/osal.mk

 include $(CHIBIOS)/os/hal/boards/ST_STM32F4_DISCOVERY/board.mk

-include $(CHIBIOS)/os/hal/platforms/STM32F4xx/platform.mk

+include $(CHIBIOS)/os/hal/ports/STM32F4xx/platform.mk

 include $(CHIBIOS)/os/rt/rt.mk

 include $(CHIBIOS)/os/rt/ports/ARMCMx/compilers/GCC/mk/port_stm32f4xx.mk

 include $(CHIBIOS)/test/test.mk

diff --git a/os/hal/ports/STM32F0xx/platform.mk b/os/hal/ports/STM32F0xx/platform.mk
index 0a5c73362..df5dbc321 100644
--- a/os/hal/ports/STM32F0xx/platform.mk
+++ b/os/hal/ports/STM32F0xx/platform.mk
@@ -1,28 +1,28 @@
 # List of all the STM32F0xx platform files.

-PLATFORMSRC = ${CHIBIOS}/os/hal/platforms/common/ARMCMx/nvic.c \

-              ${CHIBIOS}/os/hal/platforms/STM32F0xx/stm32_dma.c \

-              ${CHIBIOS}/os/hal/platforms/STM32F0xx/hal_lld.c \

-              ${CHIBIOS}/os/hal/platforms/STM32F0xx/adc_lld.c \

-              ${CHIBIOS}/os/hal/platforms/STM32F0xx/ext_lld_isr.c \

-              ${CHIBIOS}/os/hal/platforms/STM32/ext_lld.c \

-              ${CHIBIOS}/os/hal/platforms/STM32/GPIOv2/pal_lld.c \

-              ${CHIBIOS}/os/hal/platforms/STM32/I2Cv2/i2c_lld.c \

-              ${CHIBIOS}/os/hal/platforms/STM32/SPIv2/spi_lld.c \

-              ${CHIBIOS}/os/hal/platforms/STM32/TIMv1/gpt_lld.c \

-              ${CHIBIOS}/os/hal/platforms/STM32/TIMv1/icu_lld.c \

-              ${CHIBIOS}/os/hal/platforms/STM32/TIMv1/pwm_lld.c \

-              ${CHIBIOS}/os/hal/platforms/STM32/TIMv1/st_lld.c \

-              ${CHIBIOS}/os/hal/platforms/STM32/USARTv2/serial_lld.c \

-              ${CHIBIOS}/os/hal/platforms/STM32/USARTv2/uart_lld.c \

-              ${CHIBIOS}/os/hal/platforms/STM32/USBv1/usb_lld.c

+PLATFORMSRC = ${CHIBIOS}/os/hal/ports/common/ARMCMx/nvic.c \

+              ${CHIBIOS}/os/hal/ports/STM32F0xx/stm32_dma.c \

+              ${CHIBIOS}/os/hal/ports/STM32F0xx/hal_lld.c \

+              ${CHIBIOS}/os/hal/ports/STM32F0xx/adc_lld.c \

+              ${CHIBIOS}/os/hal/ports/STM32F0xx/ext_lld_isr.c \

+              ${CHIBIOS}/os/hal/ports/STM32/ext_lld.c \

+              ${CHIBIOS}/os/hal/ports/STM32/GPIOv2/pal_lld.c \

+              ${CHIBIOS}/os/hal/ports/STM32/I2Cv2/i2c_lld.c \

+              ${CHIBIOS}/os/hal/ports/STM32/SPIv2/spi_lld.c \

+              ${CHIBIOS}/os/hal/ports/STM32/TIMv1/gpt_lld.c \

+              ${CHIBIOS}/os/hal/ports/STM32/TIMv1/icu_lld.c \

+              ${CHIBIOS}/os/hal/ports/STM32/TIMv1/pwm_lld.c \

+              ${CHIBIOS}/os/hal/ports/STM32/TIMv1/st_lld.c \

+              ${CHIBIOS}/os/hal/ports/STM32/USARTv2/serial_lld.c \

+              ${CHIBIOS}/os/hal/ports/STM32/USARTv2/uart_lld.c \

+              ${CHIBIOS}/os/hal/ports/STM32/USBv1/usb_lld.c

 

 # Required include directories

-PLATFORMINC = ${CHIBIOS}/os/hal/platforms/common/ARMCMx \

-              ${CHIBIOS}/os/hal/platforms/STM32F0xx \

-              ${CHIBIOS}/os/hal/platforms/STM32 \

-              ${CHIBIOS}/os/hal/platforms/STM32/GPIOv2 \

-              ${CHIBIOS}/os/hal/platforms/STM32/I2Cv2 \

-              ${CHIBIOS}/os/hal/platforms/STM32/SPIv2 \

-              ${CHIBIOS}/os/hal/platforms/STM32/TIMv1 \

-              ${CHIBIOS}/os/hal/platforms/STM32/USARTv2 \

-              ${CHIBIOS}/os/hal/platforms/STM32/USBv1

+PLATFORMINC = ${CHIBIOS}/os/hal/ports/common/ARMCMx \

+              ${CHIBIOS}/os/hal/ports/STM32F0xx \

+              ${CHIBIOS}/os/hal/ports/STM32 \

+              ${CHIBIOS}/os/hal/ports/STM32/GPIOv2 \

+              ${CHIBIOS}/os/hal/ports/STM32/I2Cv2 \

+              ${CHIBIOS}/os/hal/ports/STM32/SPIv2 \

+              ${CHIBIOS}/os/hal/ports/STM32/TIMv1 \

+              ${CHIBIOS}/os/hal/ports/STM32/USARTv2 \

+              ${CHIBIOS}/os/hal/ports/STM32/USBv1

diff --git a/os/hal/ports/STM32F30x/platform.mk b/os/hal/ports/STM32F30x/platform.mk
index 09d7f1872..fabc8032f 100644
--- a/os/hal/ports/STM32F30x/platform.mk
+++ b/os/hal/ports/STM32F30x/platform.mk
@@ -1,31 +1,31 @@
 # List of all the STM32F30x platform files.

-PLATFORMSRC = ${CHIBIOS}/os/hal/platforms/common/ARMCMx/nvic.c \

-              ${CHIBIOS}/os/hal/platforms/STM32F30x/stm32_dma.c \

-              ${CHIBIOS}/os/hal/platforms/STM32F30x/hal_lld.c \

-              ${CHIBIOS}/os/hal/platforms/STM32F30x/adc_lld.c \

-              ${CHIBIOS}/os/hal/platforms/STM32F30x/ext_lld_isr.c \

-              ${CHIBIOS}/os/hal/platforms/STM32/can_lld.c \

-              ${CHIBIOS}/os/hal/platforms/STM32/ext_lld.c \

-              ${CHIBIOS}/os/hal/platforms/STM32/GPIOv2/pal_lld.c \

-              ${CHIBIOS}/os/hal/platforms/STM32/I2Cv2/i2c_lld.c \

-              ${CHIBIOS}/os/hal/platforms/STM32/RTCv2/rtc_lld.c \

-              ${CHIBIOS}/os/hal/platforms/STM32/SPIv2/spi_lld.c \

-              ${CHIBIOS}/os/hal/platforms/STM32/TIMv1/gpt_lld.c \

-              ${CHIBIOS}/os/hal/platforms/STM32/TIMv1/icu_lld.c \

-              ${CHIBIOS}/os/hal/platforms/STM32/TIMv1/pwm_lld.c \

-              ${CHIBIOS}/os/hal/platforms/STM32/TIMv1/st_lld.c \

-              ${CHIBIOS}/os/hal/platforms/STM32/USARTv2/serial_lld.c \

-              ${CHIBIOS}/os/hal/platforms/STM32/USARTv2/uart_lld.c \

-              ${CHIBIOS}/os/hal/platforms/STM32/USBv1/usb_lld.c

+PLATFORMSRC = ${CHIBIOS}/os/hal/ports/common/ARMCMx/nvic.c \

+              ${CHIBIOS}/os/hal/ports/STM32F30x/stm32_dma.c \

+              ${CHIBIOS}/os/hal/ports/STM32F30x/hal_lld.c \

+              ${CHIBIOS}/os/hal/ports/STM32F30x/adc_lld.c \

+              ${CHIBIOS}/os/hal/ports/STM32F30x/ext_lld_isr.c \

+              ${CHIBIOS}/os/hal/ports/STM32/can_lld.c \

+              ${CHIBIOS}/os/hal/ports/STM32/ext_lld.c \

+              ${CHIBIOS}/os/hal/ports/STM32/GPIOv2/pal_lld.c \

+              ${CHIBIOS}/os/hal/ports/STM32/I2Cv2/i2c_lld.c \

+              ${CHIBIOS}/os/hal/ports/STM32/RTCv2/rtc_lld.c \

+              ${CHIBIOS}/os/hal/ports/STM32/SPIv2/spi_lld.c \

+              ${CHIBIOS}/os/hal/ports/STM32/TIMv1/gpt_lld.c \

+              ${CHIBIOS}/os/hal/ports/STM32/TIMv1/icu_lld.c \

+              ${CHIBIOS}/os/hal/ports/STM32/TIMv1/pwm_lld.c \

+              ${CHIBIOS}/os/hal/ports/STM32/TIMv1/st_lld.c \

+              ${CHIBIOS}/os/hal/ports/STM32/USARTv2/serial_lld.c \

+              ${CHIBIOS}/os/hal/ports/STM32/USARTv2/uart_lld.c \

+              ${CHIBIOS}/os/hal/ports/STM32/USBv1/usb_lld.c

 

 # Required include directories

-PLATFORMINC = ${CHIBIOS}/os/hal/platforms/common/ARMCMx \

-              ${CHIBIOS}/os/hal/platforms/STM32F30x \

-              ${CHIBIOS}/os/hal/platforms/STM32 \

-              ${CHIBIOS}/os/hal/platforms/STM32/GPIOv2 \

-              ${CHIBIOS}/os/hal/platforms/STM32/I2Cv2 \

-              ${CHIBIOS}/os/hal/platforms/STM32/RTCv2 \

-              ${CHIBIOS}/os/hal/platforms/STM32/SPIv2 \

-              ${CHIBIOS}/os/hal/platforms/STM32/TIMv1 \

-              ${CHIBIOS}/os/hal/platforms/STM32/USARTv2 \

-              ${CHIBIOS}/os/hal/platforms/STM32/USBv1

+PLATFORMINC = ${CHIBIOS}/os/hal/ports/common/ARMCMx \

+              ${CHIBIOS}/os/hal/ports/STM32F30x \

+              ${CHIBIOS}/os/hal/ports/STM32 \

+              ${CHIBIOS}/os/hal/ports/STM32/GPIOv2 \

+              ${CHIBIOS}/os/hal/ports/STM32/I2Cv2 \

+              ${CHIBIOS}/os/hal/ports/STM32/RTCv2 \

+              ${CHIBIOS}/os/hal/ports/STM32/SPIv2 \

+              ${CHIBIOS}/os/hal/ports/STM32/TIMv1 \

+              ${CHIBIOS}/os/hal/ports/STM32/USARTv2 \

+              ${CHIBIOS}/os/hal/ports/STM32/USBv1

diff --git a/os/hal/ports/STM32F4xx/platform.mk b/os/hal/ports/STM32F4xx/platform.mk
index fdd725faf..d91d96409 100644
--- a/os/hal/ports/STM32F4xx/platform.mk
+++ b/os/hal/ports/STM32F4xx/platform.mk
@@ -1,33 +1,33 @@
 # List of all the STM32F2xx/STM32F4xx platform files.

-PLATFORMSRC = ${CHIBIOS}/os/hal/platforms/common/ARMCMx/nvic.c \

-              ${CHIBIOS}/os/hal/platforms/STM32F4xx/stm32_dma.c \

-              ${CHIBIOS}/os/hal/platforms/STM32F4xx/hal_lld.c \

-              ${CHIBIOS}/os/hal/platforms/STM32F4xx/adc_lld.c \

-              ${CHIBIOS}/os/hal/platforms/STM32F4xx/ext_lld_isr.c \

-              ${CHIBIOS}/os/hal/platforms/STM32/can_lld.c \

-              ${CHIBIOS}/os/hal/platforms/STM32/ext_lld.c \

-              ${CHIBIOS}/os/hal/platforms/STM32/mac_lld.c \

-              ${CHIBIOS}/os/hal/platforms/STM32/sdc_lld.c \

-              ${CHIBIOS}/os/hal/platforms/STM32/GPIOv2/pal_lld.c \

- 			  ${CHIBIOS}/os/hal/platforms/STM32/I2Cv1/i2c_lld.c \

-              ${CHIBIOS}/os/hal/platforms/STM32/OTGv1/usb_lld.c \

-              ${CHIBIOS}/os/hal/platforms/STM32/RTCv2/rtc_lld.c \

-              ${CHIBIOS}/os/hal/platforms/STM32/SPIv1/spi_lld.c \

-              ${CHIBIOS}/os/hal/platforms/STM32/TIMv1/gpt_lld.c \

-              ${CHIBIOS}/os/hal/platforms/STM32/TIMv1/icu_lld.c \

-              ${CHIBIOS}/os/hal/platforms/STM32/TIMv1/pwm_lld.c \

-              ${CHIBIOS}/os/hal/platforms/STM32/TIMv1/st_lld.c \

-              ${CHIBIOS}/os/hal/platforms/STM32/USARTv1/serial_lld.c \

-              ${CHIBIOS}/os/hal/platforms/STM32/USARTv1/uart_lld.c

+PLATFORMSRC = ${CHIBIOS}/os/hal/ports/common/ARMCMx/nvic.c \

+              ${CHIBIOS}/os/hal/ports/STM32F4xx/stm32_dma.c \

+              ${CHIBIOS}/os/hal/ports/STM32F4xx/hal_lld.c \

+              ${CHIBIOS}/os/hal/ports/STM32F4xx/adc_lld.c \

+              ${CHIBIOS}/os/hal/ports/STM32F4xx/ext_lld_isr.c \

+              ${CHIBIOS}/os/hal/ports/STM32/can_lld.c \

+              ${CHIBIOS}/os/hal/ports/STM32/ext_lld.c \

+              ${CHIBIOS}/os/hal/ports/STM32/mac_lld.c \

+              ${CHIBIOS}/os/hal/ports/STM32/sdc_lld.c \

+              ${CHIBIOS}/os/hal/ports/STM32/GPIOv2/pal_lld.c \

+ 			  ${CHIBIOS}/os/hal/ports/STM32/I2Cv1/i2c_lld.c \

+              ${CHIBIOS}/os/hal/ports/STM32/OTGv1/usb_lld.c \

+              ${CHIBIOS}/os/hal/ports/STM32/RTCv2/rtc_lld.c \

+              ${CHIBIOS}/os/hal/ports/STM32/SPIv1/spi_lld.c \

+              ${CHIBIOS}/os/hal/ports/STM32/TIMv1/gpt_lld.c \

+              ${CHIBIOS}/os/hal/ports/STM32/TIMv1/icu_lld.c \

+              ${CHIBIOS}/os/hal/ports/STM32/TIMv1/pwm_lld.c \

+              ${CHIBIOS}/os/hal/ports/STM32/TIMv1/st_lld.c \

+              ${CHIBIOS}/os/hal/ports/STM32/USARTv1/serial_lld.c \

+              ${CHIBIOS}/os/hal/ports/STM32/USARTv1/uart_lld.c

 

 # Required include directories

-PLATFORMINC = ${CHIBIOS}/os/hal/platforms/common/ARMCMx \

-              ${CHIBIOS}/os/hal/platforms/STM32F4xx \

-              ${CHIBIOS}/os/hal/platforms/STM32 \

-              ${CHIBIOS}/os/hal/platforms/STM32/GPIOv2 \

-              ${CHIBIOS}/os/hal/platforms/STM32/I2Cv1 \

-              ${CHIBIOS}/os/hal/platforms/STM32/OTGv1 \

-              ${CHIBIOS}/os/hal/platforms/STM32/RTCv2 \

-              ${CHIBIOS}/os/hal/platforms/STM32/SPIv1 \

-              ${CHIBIOS}/os/hal/platforms/STM32/TIMv1 \

-              ${CHIBIOS}/os/hal/platforms/STM32/USARTv1

+PLATFORMINC = ${CHIBIOS}/os/hal/ports/common/ARMCMx \

+              ${CHIBIOS}/os/hal/ports/STM32F4xx \

+              ${CHIBIOS}/os/hal/ports/STM32 \

+              ${CHIBIOS}/os/hal/ports/STM32/GPIOv2 \

+              ${CHIBIOS}/os/hal/ports/STM32/I2Cv1 \

+              ${CHIBIOS}/os/hal/ports/STM32/OTGv1 \

+              ${CHIBIOS}/os/hal/ports/STM32/RTCv2 \

+              ${CHIBIOS}/os/hal/ports/STM32/SPIv1 \

+              ${CHIBIOS}/os/hal/ports/STM32/TIMv1 \

+              ${CHIBIOS}/os/hal/ports/STM32/USARTv1