diff options
| -rw-r--r-- | demos/ARMCM3-STM32F107/halconf.h | 2 | ||||
| -rw-r--r-- | demos/ARMCM3-STM32F107/iar/ch.ewp | 24 | ||||
| -rw-r--r-- | demos/ARMCM3-STM32F107/keil/ch.uvproj | 29 | ||||
| -rw-r--r-- | demos/ARMCM3-STM32L152-DISCOVERY/keil/ch.uvproj | 35 | ||||
| -rw-r--r-- | demos/ARMCM4-STM32F407-DISCOVERY/iar/ch.ewp | 23 | ||||
| -rw-r--r-- | demos/ARMCM4-STM32F407-DISCOVERY/keil/ch.uvproj | 10 | ||||
| -rw-r--r-- | testhal/STM32F4xx/IRQ_STORM_FPU/halconf.h | 2 | ||||
| -rw-r--r-- | testhal/STM32F4xx/IRQ_STORM_FPU/main.c | 10 | ||||
| -rw-r--r-- | todo.txt | 3 |
9 files changed, 79 insertions, 59 deletions
diff --git a/demos/ARMCM3-STM32F107/halconf.h b/demos/ARMCM3-STM32F107/halconf.h index 0b2461b61..c9b3ad25a 100644 --- a/demos/ARMCM3-STM32F107/halconf.h +++ b/demos/ARMCM3-STM32F107/halconf.h @@ -38,7 +38,7 @@ * @brief Enables the TM subsystem.
*/
#if !defined(HAL_USE_TM) || defined(__DOXYGEN__)
-#define HAL_USE_TM TRUE
+#define HAL_USE_TM FALSE
#endif
/**
diff --git a/demos/ARMCM3-STM32F107/iar/ch.ewp b/demos/ARMCM3-STM32F107/iar/ch.ewp index d4c879be2..8b33c97d6 100644 --- a/demos/ARMCM3-STM32F107/iar/ch.ewp +++ b/demos/ARMCM3-STM32F107/iar/ch.ewp @@ -1878,9 +1878,18 @@ <name>$PROJ_DIR$\..\..\..\os\hal\include\i2c.h</name>
</file>
<file>
+ <name>$PROJ_DIR$\..\..\..\os\hal\include\i2s.h</name>
+ </file>
+ <file>
<name>$PROJ_DIR$\..\..\..\os\hal\include\icu.h</name>
</file>
<file>
+ <name>$PROJ_DIR$\..\..\..\os\hal\include\io_block.h</name>
+ </file>
+ <file>
+ <name>$PROJ_DIR$\..\..\..\os\hal\include\io_channel.h</name>
+ </file>
+ <file>
<name>$PROJ_DIR$\..\..\..\os\hal\include\mac.h</name>
</file>
<file>
@@ -1890,6 +1899,9 @@ <name>$PROJ_DIR$\..\..\..\os\hal\include\mmc_spi.h</name>
</file>
<file>
+ <name>$PROJ_DIR$\..\..\..\os\hal\include\mmcsd.h</name>
+ </file>
+ <file>
<name>$PROJ_DIR$\..\..\..\os\hal\include\pal.h</name>
</file>
<file>
@@ -1911,6 +1923,9 @@ <name>$PROJ_DIR$\..\..\..\os\hal\include\spi.h</name>
</file>
<file>
+ <name>$PROJ_DIR$\..\..\..\os\hal\include\tm.h</name>
+ </file>
+ <file>
<name>$PROJ_DIR$\..\..\..\os\hal\include\uart.h</name>
</file>
<file>
@@ -1941,6 +1956,9 @@ <name>$PROJ_DIR$\..\..\..\os\hal\src\i2c.c</name>
</file>
<file>
+ <name>$PROJ_DIR$\..\..\..\os\hal\src\i2s.c</name>
+ </file>
+ <file>
<name>$PROJ_DIR$\..\..\..\os\hal\src\icu.c</name>
</file>
<file>
@@ -1950,6 +1968,9 @@ <name>$PROJ_DIR$\..\..\..\os\hal\src\mmc_spi.c</name>
</file>
<file>
+ <name>$PROJ_DIR$\..\..\..\os\hal\src\mmcsd.c</name>
+ </file>
+ <file>
<name>$PROJ_DIR$\..\..\..\os\hal\src\pal.c</name>
</file>
<file>
@@ -1971,6 +1992,9 @@ <name>$PROJ_DIR$\..\..\..\os\hal\src\spi.c</name>
</file>
<file>
+ <name>$PROJ_DIR$\..\..\..\os\hal\src\tm.c</name>
+ </file>
+ <file>
<name>$PROJ_DIR$\..\..\..\os\hal\src\uart.c</name>
</file>
<file>
diff --git a/demos/ARMCM3-STM32F107/keil/ch.uvproj b/demos/ARMCM3-STM32F107/keil/ch.uvproj index c68d0291f..e079f081c 100644 --- a/demos/ARMCM3-STM32F107/keil/ch.uvproj +++ b/demos/ARMCM3-STM32F107/keil/ch.uvproj @@ -346,7 +346,7 @@ <MiscControls></MiscControls> <Define>__heap_base__=Image$$RW_IRAM1$$ZI$$Limit __heap_end__=Image$$RW_IRAM2$$Base</Define> <Undefine></Undefine> - <IncludePath>..\;..\..\..\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</IncludePath> + <IncludePath>..\;..\..\..\os\kernel\include;..\..\..\os\ports\common\ARMCMx;..\..\..\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</IncludePath> </VariousControls> </Cads> <Aads> @@ -427,11 +427,6 @@ <FilePath>..\..\..\os\ports\RVCT\ARMCMx\chcore_v7m.c</FilePath> </File> <File> - <FileName>nvic.c</FileName> - <FileType>1</FileType> - <FilePath>..\..\..\os\ports\RVCT\ARMCMx\nvic.c</FilePath> - </File> - <File> <FileName>chcore.h</FileName> <FileType>5</FileType> <FilePath>..\..\..\os\ports\RVCT\ARMCMx\chcore.h</FilePath> @@ -447,9 +442,14 @@ <FilePath>..\..\..\os\ports\RVCT\ARMCMx\chtypes.h</FilePath> </File> <File> + <FileName>nvic.c</FileName> + <FileType>1</FileType> + <FilePath>..\..\..\os\ports\common\ARMCMx\nvic.c</FilePath> + </File> + <File> <FileName>nvic.h</FileName> <FileType>5</FileType> - <FilePath>..\..\..\os\ports\RVCT\ARMCMx\nvic.h</FilePath> + <FilePath>..\..\..\os\ports\common\ARMCMx\nvic.h</FilePath> </File> </Files> </Group> @@ -1066,6 +1066,21 @@ <FileType>1</FileType> <FilePath>..\main.c</FilePath> </File> + <File> + <FileName>chconf.h</FileName> + <FileType>5</FileType> + <FilePath>..\chconf.h</FilePath> + </File> + <File> + <FileName>halconf.h</FileName> + <FileType>5</FileType> + <FilePath>..\halconf.h</FilePath> + </File> + <File> + <FileName>mcuconf.h</FileName> + <FileType>5</FileType> + <FilePath>..\mcuconf.h</FilePath> + </File> </Files> </Group> </Groups> diff --git a/demos/ARMCM3-STM32L152-DISCOVERY/keil/ch.uvproj b/demos/ARMCM3-STM32L152-DISCOVERY/keil/ch.uvproj index dcdb0cfb9..51c0c26fc 100644 --- a/demos/ARMCM3-STM32L152-DISCOVERY/keil/ch.uvproj +++ b/demos/ARMCM3-STM32L152-DISCOVERY/keil/ch.uvproj @@ -782,36 +782,6 @@ <FilePath>..\..\..\os\hal\platforms\STM32\GPIOv2\pal_lld.c</FilePath> </File> <File> - <FileName>uart_lld.c</FileName> - <FileType>1</FileType> - <FilePath>..\..\..\os\hal\platforms\STM32\uart_lld.c</FilePath> - </File> - <File> - <FileName>can_lld.c</FileName> - <FileType>1</FileType> - <FilePath>..\..\..\os\hal\platforms\STM32\can_lld.c</FilePath> - </File> - <File> - <FileName>ext_lld.c</FileName> - <FileType>1</FileType> - <FilePath>..\..\..\os\hal\platforms\STM32\ext_lld.c</FilePath> - </File> - <File> - <FileName>gpt_lld.c</FileName> - <FileType>1</FileType> - <FilePath>..\..\..\os\hal\platforms\STM32\gpt_lld.c</FilePath> - </File> - <File> - <FileName>i2c_lld.c</FileName> - <FileType>1</FileType> - <FilePath>..\..\..\os\hal\platforms\STM32\i2c_lld.c</FilePath> - </File> - <File> - <FileName>icu_lld.c</FileName> - <FileType>1</FileType> - <FilePath>..\..\..\os\hal\platforms\STM32\icu_lld.c</FilePath> - </File> - <File> <FileName>mac_lld.c</FileName> <FileType>1</FileType> <FilePath>..\..\..\os\hal\platforms\STM32\mac_lld.c</FilePath> @@ -822,11 +792,6 @@ <FilePath>..\..\..\os\hal\platforms\STM32\pwm_lld.c</FilePath> </File> <File> - <FileName>sdc_lld.c</FileName> - <FileType>1</FileType> - <FilePath>..\..\..\os\hal\platforms\STM32\sdc_lld.c</FilePath> - </File> - <File> <FileName>serial_lld.c</FileName> <FileType>1</FileType> <FilePath>..\..\..\os\hal\platforms\STM32\serial_lld.c</FilePath> diff --git a/demos/ARMCM4-STM32F407-DISCOVERY/iar/ch.ewp b/demos/ARMCM4-STM32F407-DISCOVERY/iar/ch.ewp index 2aa6b16ab..5982bc909 100644 --- a/demos/ARMCM4-STM32F407-DISCOVERY/iar/ch.ewp +++ b/demos/ARMCM4-STM32F407-DISCOVERY/iar/ch.ewp @@ -164,7 +164,7 @@ <debug>1</debug>
<option>
<name>CCDefines</name>
- <state></state>
+ <state>CORTEX_USE_FPU=FALSE</state>
</option>
<option>
<name>CCPreprocFile</name>
@@ -305,6 +305,7 @@ <state>$PROJ_DIR$\..\..\..\os\hal\platforms\STM32\GPIOv2</state>
<state>$PROJ_DIR$\..\..\..\os\hal\platforms\STM32F4xx</state>
<state>$PROJ_DIR$\..\..\..\os\various</state>
+ <state>$PROJ_DIR$\..\..\..\os\various\devices_lib\accel</state>
<state>$PROJ_DIR$\..\..\..\boards\ST_STM32F4_DISCOVERY</state>
<state>$PROJ_DIR$\..\..\..\test</state>
</option>
@@ -455,7 +456,7 @@ </option>
<option>
<name>ADefines</name>
- <state></state>
+ <state>CORTEX_USE_FPU=FALSE</state>
</option>
<option>
<name>AList</name>
@@ -1085,6 +1086,7 @@ <debug>0</debug>
<option>
<name>CCDefines</name>
+ <state>CORTEX_USE_FPU=FALSE</state>
<state>NDEBUG</state>
</option>
<option>
@@ -1226,6 +1228,7 @@ <state>$PROJ_DIR$\..\..\..\os\hal\platforms\STM32\GPIOv2</state>
<state>$PROJ_DIR$\..\..\..\os\hal\platforms\STM32F4xx</state>
<state>$PROJ_DIR$\..\..\..\os\various</state>
+ <state>$PROJ_DIR$\..\..\..\os\various\devices_lib\accel</state>
<state>$PROJ_DIR$\..\..\..\boards\ST_STM32F4_DISCOVERY</state>
<state>$PROJ_DIR$\..\..\..\test</state>
</option>
@@ -1376,7 +1379,7 @@ </option>
<option>
<name>ADefines</name>
- <state></state>
+ <state>CORTEX_USE_FPU=FALSE</state>
</option>
<option>
<name>AList</name>
@@ -2199,11 +2202,23 @@ </group>
<group>
<name>various</name>
+ <group>
+ <name>devices_lib</name>
+ <group>
+ <name>accel</name>
+ <file>
+ <name>$PROJ_DIR$\..\..\..\os\various\devices_lib\accel\lis302dl.c</name>
+ </file>
+ <file>
+ <name>$PROJ_DIR$\..\..\..\os\various\devices_lib\accel\lis302dl.h</name>
+ </file>
+ </group>
+ </group>
<file>
<name>$PROJ_DIR$\..\..\..\os\various\chprintf.c</name>
</file>
<file>
- <name>$PROJ_DIR$\..\..\..\os\various\lis302dl.c</name>
+ <name>$PROJ_DIR$\..\..\..\os\various\chprintf.h</name>
</file>
</group>
</group>
diff --git a/demos/ARMCM4-STM32F407-DISCOVERY/keil/ch.uvproj b/demos/ARMCM4-STM32F407-DISCOVERY/keil/ch.uvproj index c76d132ff..074e3a343 100644 --- a/demos/ARMCM4-STM32F407-DISCOVERY/keil/ch.uvproj +++ b/demos/ARMCM4-STM32F407-DISCOVERY/keil/ch.uvproj @@ -346,7 +346,7 @@ <MiscControls></MiscControls> <Define>__heap_base__=Image$$RW_IRAM1$$ZI$$Limit __heap_end__=Image$$RW_IRAM2$$Base</Define> <Undefine></Undefine> - <IncludePath>..\;..\..\..\os\kernel\include;..\..\..\os\ports\common\ARMCMx;..\..\..\os\ports\common\ARMCMx\CMSIS\include;..\..\..\os\ports\RVCT\ARMCMx;..\..\..\os\ports\RVCT\ARMCMx\STM32F4xx;..\..\..\os\hal\include;..\..\..\os\hal\platforms\STM32;..\..\..\os\hal\platforms\STM32\GPIOv2;..\..\..\os\hal\platforms\STM32F4xx;..\..\..\os\various;..\..\..\boards\ST_STM32F4_DISCOVERY;..\..\..\test</IncludePath> + <IncludePath>..\;..\..\..\os\kernel\include;..\..\..\os\ports\common\ARMCMx;..\..\..\os\ports\common\ARMCMx\CMSIS\include;..\..\..\os\ports\RVCT\ARMCMx;..\..\..\os\ports\RVCT\ARMCMx\STM32F4xx;..\..\..\os\hal\include;..\..\..\os\hal\platforms\STM32;..\..\..\os\hal\platforms\STM32\GPIOv2;..\..\..\os\hal\platforms\STM32F4xx;..\..\..\os\various;..\..\..\os\various\devices_lib\accel;..\..\..\boards\ST_STM32F4_DISCOVERY;..\..\..\test</IncludePath> </VariousControls> </Cads> <Aads> @@ -977,14 +977,14 @@ <GroupName>various</GroupName> <Files> <File> - <FileName>lis302dl.c</FileName> + <FileName>chprintf.c</FileName> <FileType>1</FileType> - <FilePath>..\..\..\os\various\lis302dl.c</FilePath> + <FilePath>..\..\..\os\various\chprintf.c</FilePath> </File> <File> - <FileName>chprintf.c</FileName> + <FileName>lis302dl.c</FileName> <FileType>1</FileType> - <FilePath>..\..\..\os\various\chprintf.c</FilePath> + <FilePath>..\..\..\os\various\devices_lib\accel\lis302dl.c</FilePath> </File> </Files> </Group> diff --git a/testhal/STM32F4xx/IRQ_STORM_FPU/halconf.h b/testhal/STM32F4xx/IRQ_STORM_FPU/halconf.h index 4e5a16796..08b919c73 100644 --- a/testhal/STM32F4xx/IRQ_STORM_FPU/halconf.h +++ b/testhal/STM32F4xx/IRQ_STORM_FPU/halconf.h @@ -38,7 +38,7 @@ * @brief Enables the TM subsystem.
*/
#if !defined(HAL_USE_TM) || defined(__DOXYGEN__)
-#define HAL_USE_TM TRUE
+#define HAL_USE_TM FALSE
#endif
/**
diff --git a/testhal/STM32F4xx/IRQ_STORM_FPU/main.c b/testhal/STM32F4xx/IRQ_STORM_FPU/main.c index 0b0e86740..c32cbf10f 100644 --- a/testhal/STM32F4xx/IRQ_STORM_FPU/main.c +++ b/testhal/STM32F4xx/IRQ_STORM_FPU/main.c @@ -150,29 +150,29 @@ static const GPTConfig gpt3cfg = { static void print(char *p) {
while (*p) {
- chIOPut(&SD2, *p++);
+ chSequentialStreamPut(&SD2, *p++);
}
}
static void println(char *p) {
while (*p) {
- chIOPut(&SD2, *p++);
+ chSequentialStreamPut(&SD2, *p++);
}
- chIOWriteTimeout(&SD2, (uint8_t *)"\r\n", 2, TIME_INFINITE);
+ chSequentialStreamWrite(&SD2, (uint8_t *)"\r\n", 2);
}
static void printn(uint32_t n) {
char buf[16], *p;
if (!n)
- chIOPut(&SD2, '0');
+ chSequentialStreamPut(&SD2, '0');
else {
p = buf;
while (n)
*p++ = (n % 10) + '0', n /= 10;
while (p > buf)
- chIOPut(&SD2, *--p);
+ chSequentialStreamPut(&SD2, *--p);
}
}
@@ -23,12 +23,13 @@ X Revision of the RTCv2 driver implementation. X File System infrastructure.
- FatFs wrapper.
X Streaming DAC/I2S driver model and STM32 implementation.
+- Support for STM32F3xx devices.
- Specific I2C driver for STM32F0 and newer devices.
- STM32 CAN2 support.
- Unified LPC1xxx HAL.
- LPC11xx and LPC13xx HALs merged in the unified one.
- LPC17xx support.
-- NUC120 support.
+- NUC140 support.
- Create a null device driver implementing a stream interface.
- Add USARTs support to the STM32 SPI driver.
- Add option to use another counter instead of the systick counter into the
|