diff options
| author | gdisirio <gdisirio@35acf78f-673a-0410-8e92-d51de3d6d3f4> | 2013-01-14 19:54:54 +0000 |
|---|---|---|
| committer | gdisirio <gdisirio@35acf78f-673a-0410-8e92-d51de3d6d3f4> | 2013-01-14 19:54:54 +0000 |
| commit | 65dcd4d72ec5cb99205ec348a769d68293a49222 (patch) | |
| tree | d559b07497e6758f316273d4c39c800e5b279a86 | |
| parent | 99d2a086388f100e9db93f9c6304891e873bb866 (diff) | |
| download | ChibiOS-65dcd4d72ec5cb99205ec348a769d68293a49222.tar.gz ChibiOS-65dcd4d72ec5cb99205ec348a769d68293a49222.tar.bz2 ChibiOS-65dcd4d72ec5cb99205ec348a769d68293a49222.zip | |
git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@5069 35acf78f-673a-0410-8e92-d51de3d6d3f4
| -rw-r--r-- | demos/ARMCM4-STM32F407-DISCOVERY/iar/ch.ewp | 12 | ||||
| -rw-r--r-- | os/hal/src/rtc.c | 2 |
2 files changed, 9 insertions, 5 deletions
diff --git a/demos/ARMCM4-STM32F407-DISCOVERY/iar/ch.ewp b/demos/ARMCM4-STM32F407-DISCOVERY/iar/ch.ewp index 5982bc909..55e090426 100644 --- a/demos/ARMCM4-STM32F407-DISCOVERY/iar/ch.ewp +++ b/demos/ARMCM4-STM32F407-DISCOVERY/iar/ch.ewp @@ -303,6 +303,8 @@ <state>$PROJ_DIR$\..\..\..\os\hal\platforms\STM32</state>
<state>$PROJ_DIR$\..\..\..\os\hal\platforms\STM32\DMAv1</state>
<state>$PROJ_DIR$\..\..\..\os\hal\platforms\STM32\GPIOv2</state>
+ <state>$PROJ_DIR$\..\..\..\os\hal\platforms\STM32\SPIv1</state>
+ <state>$PROJ_DIR$\..\..\..\os\hal\platforms\STM32\USARTv1</state>
<state>$PROJ_DIR$\..\..\..\os\hal\platforms\STM32F4xx</state>
<state>$PROJ_DIR$\..\..\..\os\various</state>
<state>$PROJ_DIR$\..\..\..\os\various\devices_lib\accel</state>
@@ -1226,6 +1228,8 @@ <state>$PROJ_DIR$\..\..\..\os\hal\platforms\STM32</state>
<state>$PROJ_DIR$\..\..\..\os\hal\platforms\STM32\DMAv1</state>
<state>$PROJ_DIR$\..\..\..\os\hal\platforms\STM32\GPIOv2</state>
+ <state>$PROJ_DIR$\..\..\..\os\hal\platforms\STM32\SPIv1</state>
+ <state>$PROJ_DIR$\..\..\..\os\hal\platforms\STM32\USARTv1</state>
<state>$PROJ_DIR$\..\..\..\os\hal\platforms\STM32F4xx</state>
<state>$PROJ_DIR$\..\..\..\os\various</state>
<state>$PROJ_DIR$\..\..\..\os\various\devices_lib\accel</state>
@@ -2137,16 +2141,16 @@ <name>$PROJ_DIR$\..\..\..\os\hal\platforms\STM32\pwm_lld.h</name>
</file>
<file>
- <name>$PROJ_DIR$\..\..\..\os\hal\platforms\STM32\serial_lld.c</name>
+ <name>$PROJ_DIR$\..\..\..\os\hal\platforms\STM32\USARTv1\serial_lld.c</name>
</file>
<file>
- <name>$PROJ_DIR$\..\..\..\os\hal\platforms\STM32\serial_lld.h</name>
+ <name>$PROJ_DIR$\..\..\..\os\hal\platforms\STM32\USARTv1\serial_lld.h</name>
</file>
<file>
- <name>$PROJ_DIR$\..\..\..\os\hal\platforms\STM32\spi_lld.c</name>
+ <name>$PROJ_DIR$\..\..\..\os\hal\platforms\STM32\SPIv1\spi_lld.c</name>
</file>
<file>
- <name>$PROJ_DIR$\..\..\..\os\hal\platforms\STM32\spi_lld.h</name>
+ <name>$PROJ_DIR$\..\..\..\os\hal\platforms\STM32\SPIv1\spi_lld.h</name>
</file>
<file>
<name>$PROJ_DIR$\..\..\..\os\hal\platforms\STM32F4xx\stm32_dma.c</name>
diff --git a/os/hal/src/rtc.c b/os/hal/src/rtc.c index daf4f4102..4d14140f3 100644 --- a/os/hal/src/rtc.c +++ b/os/hal/src/rtc.c @@ -175,7 +175,7 @@ void rtcSetCallback(RTCDriver *rtcp, rtccb_t callback) { *
* @api
*/
-uint32_t rtcGetTimeFat(RTCDriver *rtcp) { +uint32_t rtcGetTimeFat(RTCDriver *rtcp) {
chDbgCheck((rtcp != NULL), "rtcSetTime");
return rtc_lld_get_time_fat(rtcp);
|