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

7 files changed, 22 insertions, 13 deletions

diff --git a/os/hal/platforms/STM32/uart_lld.c b/os/hal/platforms/STM32/USBv1/uart_lld.c
index 4bc2be265..4bc2be265 100644
--- a/os/hal/platforms/STM32/uart_lld.c
+++ b/os/hal/platforms/STM32/USBv1/uart_lld.c
diff --git a/os/hal/platforms/STM32/uart_lld.h b/os/hal/platforms/STM32/USBv1/uart_lld.h
index 79edb62d9..79edb62d9 100644
--- a/os/hal/platforms/STM32/uart_lld.h
+++ b/os/hal/platforms/STM32/USBv1/uart_lld.h
diff --git a/os/hal/platforms/STM32F0xx/platform.mk b/os/hal/platforms/STM32F0xx/platform.mk
index acf4c94b3..217876573 100644
--- a/os/hal/platforms/STM32F0xx/platform.mk
+++ b/os/hal/platforms/STM32F0xx/platform.mk
@@ -9,9 +9,11 @@ PLATFORMSRC = ${CHIBIOS}/os/hal/platforms/STM32F0xx/stm32_dma.c \
               ${CHIBIOS}/os/hal/platforms/STM32/pwm_lld.c \

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

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

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

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

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

 

 # Required include directories

 PLATFORMINC = ${CHIBIOS}/os/hal/platforms/STM32F0xx \

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

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

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

+              ${CHIBIOS}/os/hal/platforms/STM32/USARTv2

diff --git a/os/hal/platforms/STM32F1xx/platform.mk b/os/hal/platforms/STM32F1xx/platform.mk
index 1a9979dfa..3f892c6b9 100644
--- a/os/hal/platforms/STM32F1xx/platform.mk
+++ b/os/hal/platforms/STM32F1xx/platform.mk
@@ -11,17 +11,18 @@ PLATFORMSRC = ${CHIBIOS}/os/hal/platforms/STM32F1xx/stm32_dma.c \
               ${CHIBIOS}/os/hal/platforms/STM32/pwm_lld.c \

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

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

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

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

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

+              ${CHIBIOS}/os/hal/platforms/STM32/spi_lld.c \  ${CHIBIOS}/os/hal/platforms/STM32/GPIOv1/pal_lld.c \

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

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

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

+              ${CHIBIOS}/os/hal/platforms/STM32/RTCv1/rtc_lld.c \

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

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

 

 # Required include directories

 PLATFORMINC = ${CHIBIOS}/os/hal/platforms/STM32F1xx \

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

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

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

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

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

+              ${CHIBIOS}/os/hal/platforms/STM32/RTCv1 \

+              ${CHIBIOS}/os/hal/platforms/STM32/USARTv1 \

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

+

diff --git a/os/hal/platforms/STM32F2xx/platform.mk b/os/hal/platforms/STM32F2xx/platform.mk
index b8e46af1d..7a140499d 100644
--- a/os/hal/platforms/STM32F2xx/platform.mk
+++ b/os/hal/platforms/STM32F2xx/platform.mk
@@ -16,7 +16,8 @@ PLATFORMSRC = ${CHIBIOS}/os/hal/platforms/STM32F2xx/stm32_dma.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/RTCv2/rtc_lld.c \

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

 

 # Required include directories

 PLATFORMINC = ${CHIBIOS}/os/hal/platforms/STM32F2xx \

@@ -24,4 +25,5 @@ PLATFORMINC = ${CHIBIOS}/os/hal/platforms/STM32F2xx \
               ${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/RTCv2 \

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

diff --git a/os/hal/platforms/STM32F4xx/platform.mk b/os/hal/platforms/STM32F4xx/platform.mk
index 74d226dc3..76944c45f 100644
--- a/os/hal/platforms/STM32F4xx/platform.mk
+++ b/os/hal/platforms/STM32F4xx/platform.mk
@@ -16,7 +16,8 @@ PLATFORMSRC = ${CHIBIOS}/os/hal/platforms/STM32F4xx/stm32_dma.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/RTCv2/rtc_lld.c \

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

 

 # Required include directories

 PLATFORMINC = ${CHIBIOS}/os/hal/platforms/STM32F4xx \

@@ -24,4 +25,5 @@ PLATFORMINC = ${CHIBIOS}/os/hal/platforms/STM32F4xx \
               ${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/RTCv2 \

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

diff --git a/os/hal/platforms/STM32L1xx/platform.mk b/os/hal/platforms/STM32L1xx/platform.mk
index 2e4ef4a69..e4f764083 100644
--- a/os/hal/platforms/STM32L1xx/platform.mk
+++ b/os/hal/platforms/STM32L1xx/platform.mk
@@ -13,6 +13,7 @@ PLATFORMSRC = ${CHIBIOS}/os/hal/platforms/STM32L1xx/stm32_dma.c \
               ${CHIBIOS}/os/hal/platforms/STM32/uart_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/USARTv1/uart_lld.c \

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

 

 # Required include directories

@@ -20,4 +21,5 @@ PLATFORMINC = ${CHIBIOS}/os/hal/platforms/STM32L1xx \
               ${CHIBIOS}/os/hal/platforms/STM32 \

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

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

+              ${CHIBIOS}/os/hal/platforms/STM32/USARTv1 \

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