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

6 files changed, 10 insertions, 6 deletions

diff --git a/os/hal/platforms/STM32/i2c_lld.c b/os/hal/platforms/STM32/I2Cv1/i2c_lld.c
index 229520a91..229520a91 100644
--- a/os/hal/platforms/STM32/i2c_lld.c
+++ b/os/hal/platforms/STM32/I2Cv1/i2c_lld.c
diff --git a/os/hal/platforms/STM32/i2c_lld.h b/os/hal/platforms/STM32/I2Cv1/i2c_lld.h
index 55870cb37..55870cb37 100644
--- a/os/hal/platforms/STM32/i2c_lld.h
+++ b/os/hal/platforms/STM32/I2Cv1/i2c_lld.h
diff --git a/os/hal/platforms/STM32F1xx/platform.mk b/os/hal/platforms/STM32F1xx/platform.mk
index bc2711236..1a9979dfa 100644
--- a/os/hal/platforms/STM32F1xx/platform.mk
+++ b/os/hal/platforms/STM32F1xx/platform.mk
@@ -6,7 +6,6 @@ PLATFORMSRC = ${CHIBIOS}/os/hal/platforms/STM32F1xx/stm32_dma.c \
               ${CHIBIOS}/os/hal/platforms/STM32/can_lld.c \

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

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

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

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

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

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

@@ -15,6 +14,7 @@ PLATFORMSRC = ${CHIBIOS}/os/hal/platforms/STM32F1xx/stm32_dma.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/I2Cv1/i2c_lld.c \

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

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

 

@@ -22,5 +22,6 @@ PLATFORMSRC = ${CHIBIOS}/os/hal/platforms/STM32F1xx/stm32_dma.c \
 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

diff --git a/os/hal/platforms/STM32F2xx/platform.mk b/os/hal/platforms/STM32F2xx/platform.mk
index 9febbc16e..2b7eaf38f 100644
--- a/os/hal/platforms/STM32F2xx/platform.mk
+++ b/os/hal/platforms/STM32F2xx/platform.mk
@@ -6,7 +6,6 @@ PLATFORMSRC = ${CHIBIOS}/os/hal/platforms/STM32F2xx/stm32_dma.c \
               ${CHIBIOS}/os/hal/platforms/STM32/can_lld.c \

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

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

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

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

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

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

@@ -14,6 +13,7 @@ PLATFORMSRC = ${CHIBIOS}/os/hal/platforms/STM32F2xx/stm32_dma.c \
               ${CHIBIOS}/os/hal/platforms/STM32/spi_lld.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/OTGv1/usb_lld.c \

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

 

@@ -21,5 +21,6 @@ PLATFORMSRC = ${CHIBIOS}/os/hal/platforms/STM32F2xx/stm32_dma.c \
 PLATFORMINC = ${CHIBIOS}/os/hal/platforms/STM32F2xx \

               ${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

diff --git a/os/hal/platforms/STM32F4xx/platform.mk b/os/hal/platforms/STM32F4xx/platform.mk
index 028b23247..55668ada5 100644
--- a/os/hal/platforms/STM32F4xx/platform.mk
+++ b/os/hal/platforms/STM32F4xx/platform.mk
@@ -6,7 +6,6 @@ PLATFORMSRC = ${CHIBIOS}/os/hal/platforms/STM32F4xx/stm32_dma.c \
               ${CHIBIOS}/os/hal/platforms/STM32/can_lld.c \

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

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

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

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

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

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

@@ -14,13 +13,14 @@ PLATFORMSRC = ${CHIBIOS}/os/hal/platforms/STM32F4xx/stm32_dma.c \
               ${CHIBIOS}/os/hal/platforms/STM32/spi_lld.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/OTGv1/usb_lld.c \

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

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

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

 

 # Required include directories

 PLATFORMINC = ${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
\ No newline at end of file
+              ${CHIBIOS}/os/hal/platforms/STM32/RTCv2

diff --git a/os/hal/platforms/STM32L1xx/platform.mk b/os/hal/platforms/STM32L1xx/platform.mk
index 6c7cb5f59..2e4ef4a69 100644
--- a/os/hal/platforms/STM32L1xx/platform.mk
+++ b/os/hal/platforms/STM32L1xx/platform.mk
@@ -12,10 +12,12 @@ PLATFORMSRC = ${CHIBIOS}/os/hal/platforms/STM32L1xx/stm32_dma.c \
               ${CHIBIOS}/os/hal/platforms/STM32/spi_lld.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/USBv1/usb_lld.c

 

 # Required include directories

 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/USBv1