From d379346fad1898bc2f7c62516ab282a87bc66e15 Mon Sep 17 00:00:00 2001 From: gdisirio Date: Sat, 24 Sep 2011 10:41:58 +0000 Subject: [PATCH] Updated Keil demos. git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@3397 35acf78f-673a-0410-8e92-d51de3d6d3f4 --- .../ARMCM3-STM32F100-DISCOVERY/keil/ch.uvproj | 31 ++-- demos/ARMCM3-STM32F103/keil/ch.uvproj | 75 ++++++++ demos/ARMCM3-STM32F107/keil/ch.uvproj | 169 +++++++++--------- readme.txt | 1 - 4 files changed, 175 insertions(+), 101 deletions(-) diff --git a/demos/ARMCM3-STM32F100-DISCOVERY/keil/ch.uvproj b/demos/ARMCM3-STM32F100-DISCOVERY/keil/ch.uvproj index cffe0a6e8..723042027 100644 --- a/demos/ARMCM3-STM32F100-DISCOVERY/keil/ch.uvproj +++ b/demos/ARMCM3-STM32F100-DISCOVERY/keil/ch.uvproj @@ -346,7 +346,7 @@ __heap_base__=Image$$RW_IRAM1$$ZI$$Limit __heap_end__=Image$$RW_IRAM2$$Base - ..\;..\..\..\os\kernel\include;..\..\..\os\ports\RVCT\ARMCMx;..\..\..\os\ports\RVCT\ARMCMx\STM32;..\..\..\os\hal\include;..\..\..\os\hal\platforms\STM32;..\..\..\boards\ST_STM32VL_DISCOVERY;..\..\..\test + ..\;..\..\..\os\kernel\include;..\..\..\os\ports\RVCT\ARMCMx;..\..\..\os\ports\RVCT\ARMCMx\STM32F1xx;..\..\..\os\hal\include;..\..\..\os\hal\platforms\STM32;..\..\..\os\hal\platforms\STM32\GPIOv1;..\..\..\os\hal\platforms\STM32\DMAv1;..\..\..\os\hal\platforms\STM32\USBv1;..\..\..\os\hal\platforms\STM32F1xx;..\..\..\boards\ST_STM32VL_DISCOVERY;..\..\..\test @@ -361,7 +361,7 @@ --cpreproc - ..\..\..\boards\ST_STM32VL_DISCOVERY;..\..\..\os\ports\RVCT\ARMCMx\STM32 + ..\;..\..\..\boards\ST_STM32VL_DISCOVERY;..\..\..\os\ports\RVCT\ARMCMx\STM32F1xx @@ -409,7 +409,7 @@ vectors.s 2 - ..\..\..\os\ports\RVCT\ARMCMx\STM32\vectors.s + D:\Progetti\ChibiOS-RT\os\ports\RVCT\ARMCMx\STM32F1xx\vectors.s chcoreasm_v7m.s @@ -794,7 +794,7 @@ adc_lld.c 1 - ..\..\..\os\hal\platforms\STM32\adc_lld.c + D:\Progetti\ChibiOS-RT\os\hal\platforms\STM32F1xx\adc_lld.c can_lld.c @@ -804,12 +804,12 @@ hal_lld.c 1 - ..\..\..\os\hal\platforms\STM32\hal_lld.c + D:\Progetti\ChibiOS-RT\os\hal\platforms\STM32F1xx\hal_lld.c pal_lld.c 1 - ..\..\..\os\hal\platforms\STM32\pal_lld.c + D:\Progetti\ChibiOS-RT\os\hal\platforms\STM32\GPIOv1\pal_lld.c pwm_lld.c @@ -829,7 +829,7 @@ stm32_dma.c 1 - ..\..\..\os\hal\platforms\STM32\stm32_dma.c + D:\Progetti\ChibiOS-RT\os\hal\platforms\STM32\DMAv1\stm32_dma.c uart_lld.c @@ -839,32 +839,27 @@ adc_lld.h 5 - ..\..\..\os\hal\platforms\STM32\adc_lld.h + D:\Progetti\ChibiOS-RT\os\hal\platforms\STM32F1xx\adc_lld.h can_lld.h 5 ..\..\..\os\hal\platforms\STM32\can_lld.h - - core_cm3.h - 5 - ..\..\..\os\hal\platforms\STM32\core_cm3.h - hal_lld.h 5 - ..\..\..\os\hal\platforms\STM32\hal_lld.h + D:\Progetti\ChibiOS-RT\os\hal\platforms\STM32F1xx\hal_lld.h hal_lld_f103.h 5 - ..\..\..\os\hal\platforms\STM32\hal_lld_f103.h + D:\Progetti\ChibiOS-RT\os\hal\platforms\STM32F1xx\hal_lld_f103.h pal_lld.h 5 - ..\..\..\os\hal\platforms\STM32\pal_lld.h + D:\Progetti\ChibiOS-RT\os\hal\platforms\STM32\GPIOv1\pal_lld.h pwm_lld.h @@ -884,12 +879,12 @@ stm32_dma.h 5 - ..\..\..\os\hal\platforms\STM32\stm32_dma.h + D:\Progetti\ChibiOS-RT\os\hal\platforms\STM32\DMAv1\stm32_dma.h stm32f10x.h 5 - ..\..\..\os\hal\platforms\STM32\stm32f10x.h + D:\Progetti\ChibiOS-RT\os\hal\platforms\STM32F1xx\stm32f10x.h uart_lld.h diff --git a/demos/ARMCM3-STM32F103/keil/ch.uvproj b/demos/ARMCM3-STM32F103/keil/ch.uvproj index 59cab5187..80066e03a 100644 --- a/demos/ARMCM3-STM32F103/keil/ch.uvproj +++ b/demos/ARMCM3-STM32F103/keil/ch.uvproj @@ -786,6 +786,81 @@ 5 ..\..\..\os\hal\include\uart.h + + ext.c + 1 + ..\..\..\os\hal\src\ext.c + + + gpt.c + 1 + ..\..\..\os\hal\src\gpt.c + + + icu.c + 1 + ..\..\..\os\hal\src\icu.c + + + rtc.c + 1 + ..\..\..\os\hal\src\rtc.c + + + sdc.c + 1 + ..\..\..\os\hal\src\sdc.c + + + serial_usb.c + 1 + ..\..\..\os\hal\src\serial_usb.c + + + usb.c + 1 + ..\..\..\os\hal\src\usb.c + + + ext.h + 5 + ..\..\..\os\hal\include\ext.h + + + gpt.h + 5 + ..\..\..\os\hal\include\gpt.h + + + icu.h + 5 + ..\..\..\os\hal\include\icu.h + + + rtc.h + 5 + ..\..\..\os\hal\include\rtc.h + + + sdc.h + 5 + ..\..\..\os\hal\include\sdc.h + + + serial_usb.h + 5 + ..\..\..\os\hal\include\serial_usb.h + + + usb.h + 5 + ..\..\..\os\hal\include\usb.h + + + usb_cdc.h + 5 + ..\..\..\os\hal\include\usb_cdc.h + diff --git a/demos/ARMCM3-STM32F107/keil/ch.uvproj b/demos/ARMCM3-STM32F107/keil/ch.uvproj index 71bb839e7..3600bb519 100644 --- a/demos/ARMCM3-STM32F107/keil/ch.uvproj +++ b/demos/ARMCM3-STM32F107/keil/ch.uvproj @@ -346,7 +346,7 @@ __heap_base__=Image$$RW_IRAM1$$ZI$$Limit __heap_end__=Image$$RW_IRAM2$$Base - ..\;..\..\..\os\kernel\include;..\..\..\os\ports\RVCT\ARMCMx;..\..\..\os\ports\RVCT\ARMCMx\STM32;..\..\..\os\hal\include;..\..\..\os\hal\platforms\STM32;..\..\..\os\various;..\..\..\boards\OLIMEX_STM32_P107;..\..\..\test + ..\;..\..\..\os\kernel\include;..\..\..\os\ports\RVCT\ARMCMx;..\..\..\os\ports\RVCT\ARMCMx\STM32F1xx;..\..\..\os\hal\include;..\..\..\os\hal\platforms\STM32;..\..\..\os\hal\platforms\STM32F1xx;..\..\..\os\hal\platforms\STM32\GPIOv1;..\..\..\os\hal\platforms\STM32\DMAv1;..\..\..\os\various;..\..\..\boards\OLIMEX_STM32_P107;..\..\..\test @@ -361,7 +361,7 @@ --cpreproc - ..\..\..\boards\OLIMEX_STM32_P107;..\..\..\os\ports\RVCT\ARMCMx\STM32 + ..\;..\..\..\boards\OLIMEX_STM32_P107;..\..\..\os\ports\RVCT\ARMCMx\STM32F1xx @@ -409,7 +409,7 @@ vectors.s 2 - ..\..\..\os\ports\RVCT\ARMCMx\STM32\vectors.s + D:\Progetti\ChibiOS-RT\os\ports\RVCT\ARMCMx\STM32F1xx\vectors.s chcoreasm_v7m.s @@ -816,35 +816,60 @@ 5 ..\..\..\os\hal\include\usb.h + + ext.h + 5 + ..\..\..\os\hal\include\ext.h + + + icu.h + 5 + ..\..\..\os\hal\include\icu.h + + + rtc.h + 5 + ..\..\..\os\hal\include\rtc.h + + + sdc.h + 5 + ..\..\..\os\hal\include\sdc.h + + + usb_cdc.h + 5 + ..\..\..\os\hal\include\usb_cdc.h + + + ext.c + 1 + ..\..\..\os\hal\src\ext.c + + + icu.c + 1 + ..\..\..\os\hal\src\icu.c + + + rtc.c + 1 + ..\..\..\os\hal\src\rtc.c + + + sdc.c + 1 + ..\..\..\os\hal\src\sdc.c + platform - adc_lld.c - 1 - ..\..\..\os\hal\platforms\STM32\adc_lld.c - - - can_lld.c - 1 - ..\..\..\os\hal\platforms\STM32\can_lld.c - - - hal_lld.c - 1 - ..\..\..\os\hal\platforms\STM32\hal_lld.c - - - pal_lld.c - 1 - ..\..\..\os\hal\platforms\STM32\pal_lld.c - - - pwm_lld.c - 1 - ..\..\..\os\hal\platforms\STM32\pwm_lld.c + serial_lld.h + 5 + ..\..\..\os\hal\platforms\STM32\serial_lld.h serial_lld.c @@ -852,79 +877,59 @@ ..\..\..\os\hal\platforms\STM32\serial_lld.c - spi_lld.c - 1 - ..\..\..\os\hal\platforms\STM32\spi_lld.c + stm32_dma.h + 5 + ..\..\..\os\hal\platforms\STM32\DMAv1\stm32_dma.h stm32_dma.c 1 - ..\..\..\os\hal\platforms\STM32\stm32_dma.c - - - uart_lld.c - 1 - ..\..\..\os\hal\platforms\STM32\uart_lld.c - - - adc_lld.h - 5 - ..\..\..\os\hal\platforms\STM32\adc_lld.h - - - can_lld.h - 5 - ..\..\..\os\hal\platforms\STM32\can_lld.h - - - core_cm3.h - 5 - ..\..\..\os\hal\platforms\STM32\core_cm3.h - - - hal_lld.h - 5 - ..\..\..\os\hal\platforms\STM32\hal_lld.h - - - hal_lld_f103.h - 5 - ..\..\..\os\hal\platforms\STM32\hal_lld_f103.h + ..\..\..\os\hal\platforms\STM32\DMAv1\stm32_dma.c pal_lld.h 5 - ..\..\..\os\hal\platforms\STM32\pal_lld.h + ..\..\..\os\hal\platforms\STM32\GPIOv1\pal_lld.h - pwm_lld.h - 5 - ..\..\..\os\hal\platforms\STM32\pwm_lld.h - - - serial_lld.h - 5 - ..\..\..\os\hal\platforms\STM32\serial_lld.h - - - spi_lld.h - 5 - ..\..\..\os\hal\platforms\STM32\spi_lld.h - - - stm32_dma.h - 5 - ..\..\..\os\hal\platforms\STM32\stm32_dma.h + pal_lld.c + 1 + ..\..\..\os\hal\platforms\STM32\GPIOv1\pal_lld.c stm32f10x.h 5 - ..\..\..\os\hal\platforms\STM32\stm32f10x.h + ..\..\..\os\hal\platforms\STM32F1xx\stm32f10x.h - uart_lld.h + hal_lld.c + 1 + ..\..\..\os\hal\platforms\STM32F1xx\hal_lld.c + + + hal_lld.h 5 - ..\..\..\os\hal\platforms\STM32\uart_lld.h + ..\..\..\os\hal\platforms\STM32F1xx\hal_lld.h + + + hal_lld_f100.h + 5 + ..\..\..\os\hal\platforms\STM32F1xx\hal_lld_f100.h + + + hal_lld_f103.h + 5 + ..\..\..\os\hal\platforms\STM32F1xx\hal_lld_f103.h + + + hal_lld_f105_f107.h + 5 + ..\..\..\os\hal\platforms\STM32F1xx\hal_lld_f105_f107.h + + + stm32_rcc.h + 5 + ..\..\..\os\hal\platforms\STM32F1xx\stm32_rcc.h diff --git a/readme.txt b/readme.txt index c8cb07e7d..6165592a8 100644 --- a/readme.txt +++ b/readme.txt @@ -161,7 +161,6 @@ - NEW: Added provisional support for STM32F2xx. Because of this some directories related to the STM32 have been renamed, your makefiles may require adjustments. - (TODO: change to be ported to Keil build files) - NEW: Added a custom rule to the various rules.mk files, now it is possible to add an user rule into the Makefiles. - NEW: Improvements to the trace buffer, now it stores a full thread pointer