diff options
| author | gdisirio <gdisirio@35acf78f-673a-0410-8e92-d51de3d6d3f4> | 2011-09-17 06:48:56 +0000 |
|---|---|---|
| committer | gdisirio <gdisirio@35acf78f-673a-0410-8e92-d51de3d6d3f4> | 2011-09-17 06:48:56 +0000 |
| commit | eea844796a2cdbea9f4ddf51f9766ff3964984b6 (patch) | |
| tree | 293cb5ca8e8c0cfe5c037432010c2868a1e2eeac /demos | |
| parent | 06d3e6325be3061cc281b3aa49fcb983998fc4cb (diff) | |
| download | ChibiOS-eea844796a2cdbea9f4ddf51f9766ff3964984b6.tar.gz ChibiOS-eea844796a2cdbea9f4ddf51f9766ff3964984b6.tar.bz2 ChibiOS-eea844796a2cdbea9f4ddf51f9766ff3964984b6.zip | |
Fixed paths in IAR project for STM32L152-Discovery board.
git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@3322 35acf78f-673a-0410-8e92-d51de3d6d3f4
Diffstat (limited to 'demos')
| -rw-r--r-- | demos/ARMCM3-STM32L152-DISCOVERY/halconf.h | 6 | ||||
| -rw-r--r-- | demos/ARMCM3-STM32L152-DISCOVERY/iar/ch.ewp | 27 | ||||
| -rw-r--r-- | demos/ARMCM3-STM32L152-DISCOVERY/main.c | 2 |
3 files changed, 24 insertions, 11 deletions
diff --git a/demos/ARMCM3-STM32L152-DISCOVERY/halconf.h b/demos/ARMCM3-STM32L152-DISCOVERY/halconf.h index 2a5f1806e..b9bee3656 100644 --- a/demos/ARMCM3-STM32L152-DISCOVERY/halconf.h +++ b/demos/ARMCM3-STM32L152-DISCOVERY/halconf.h @@ -115,14 +115,14 @@ * @brief Enables the SERIAL subsystem.
*/
#if !defined(HAL_USE_SERIAL) || defined(__DOXYGEN__)
-#define HAL_USE_SERIAL FALSE
+#define HAL_USE_SERIAL TRUE
#endif
/**
* @brief Enables the SERIAL over USB subsystem.
*/
#if !defined(HAL_USE_SERIAL_USB) || defined(__DOXYGEN__)
-#define HAL_USE_SERIAL_USB TRUE
+#define HAL_USE_SERIAL_USB FALSE
#endif
/**
@@ -143,7 +143,7 @@ * @brief Enables the USB subsystem.
*/
#if !defined(HAL_USE_USB) || defined(__DOXYGEN__)
-#define HAL_USE_USB TRUE
+#define HAL_USE_USB FALSE
#endif
/*===========================================================================*/
diff --git a/demos/ARMCM3-STM32L152-DISCOVERY/iar/ch.ewp b/demos/ARMCM3-STM32L152-DISCOVERY/iar/ch.ewp index 88946580b..d84ff7beb 100644 --- a/demos/ARMCM3-STM32L152-DISCOVERY/iar/ch.ewp +++ b/demos/ARMCM3-STM32L152-DISCOVERY/iar/ch.ewp @@ -295,9 +295,14 @@ <name>CCIncludePath2</name>
<state>$PROJ_DIR$\..\</state>
<state>$PROJ_DIR$\..\..\..\os\kernel\include</state>
+ <state>$PROJ_DIR$\..\..\..\os\ports\common\ARMCMx\CMSIS\include</state>
<state>$PROJ_DIR$\..\..\..\os\ports\IAR\ARMCMx</state>
<state>$PROJ_DIR$\..\..\..\os\ports\IAR\ARMCMx\STM32L1xx</state>
<state>$PROJ_DIR$\..\..\..\os\hal\include</state>
+ <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\USBv1</state>
<state>$PROJ_DIR$\..\..\..\os\hal\platforms\STM32L1xx</state>
<state>$PROJ_DIR$\..\..\..\boards\ST_STM32L_DISCOVERY</state>
<state>$PROJ_DIR$\..\..\..\test</state>
@@ -1198,9 +1203,14 @@ <name>CCIncludePath2</name>
<state>$PROJ_DIR$\..\</state>
<state>$PROJ_DIR$\..\..\..\os\kernel\include</state>
+ <state>$PROJ_DIR$\..\..\..\os\ports\common\ARMCMx\CMSIS\include</state>
<state>$PROJ_DIR$\..\..\..\os\ports\IAR\ARMCMx</state>
<state>$PROJ_DIR$\..\..\..\os\ports\IAR\ARMCMx\STM32L1xx</state>
<state>$PROJ_DIR$\..\..\..\os\hal\include</state>
+ <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\USBv1</state>
<state>$PROJ_DIR$\..\..\..\os\hal\platforms\STM32L1xx</state>
<state>$PROJ_DIR$\..\..\..\boards\ST_STM32L_DISCOVERY</state>
<state>$PROJ_DIR$\..\..\..\test</state>
@@ -2029,25 +2039,28 @@ <group>
<name>platform</name>
<file>
- <name>$PROJ_DIR$\..\..\..\os\hal\platforms\STM32L1xx\core_cm3.h</name>
- </file>
- <file>
<name>$PROJ_DIR$\..\..\..\os\hal\platforms\STM32L1xx\hal_lld.c</name>
</file>
<file>
<name>$PROJ_DIR$\..\..\..\os\hal\platforms\STM32L1xx\hal_lld.h</name>
</file>
<file>
- <name>$PROJ_DIR$\..\..\..\os\hal\platforms\STM32L1xx\pal_lld.c</name>
+ <name>$PROJ_DIR$\..\..\..\os\hal\platforms\STM32\GPIOv2\pal_lld.c</name>
+ </file>
+ <file>
+ <name>$PROJ_DIR$\..\..\..\os\hal\platforms\STM32\GPIOv2\pal_lld.h</name>
+ </file>
+ <file>
+ <name>$PROJ_DIR$\..\..\..\os\hal\platforms\STM32\serial_lld.c</name>
</file>
<file>
- <name>$PROJ_DIR$\..\..\..\os\hal\platforms\STM32L1xx\pal_lld.h</name>
+ <name>$PROJ_DIR$\..\..\..\os\hal\platforms\STM32\serial_lld.h</name>
</file>
<file>
- <name>$PROJ_DIR$\..\..\..\os\hal\platforms\STM32L1xx\stm32_dma.c</name>
+ <name>$PROJ_DIR$\..\..\..\os\hal\platforms\STM32\DMAv1\stm32_dma.c</name>
</file>
<file>
- <name>$PROJ_DIR$\..\..\..\os\hal\platforms\STM32L1xx\stm32_dma.h</name>
+ <name>$PROJ_DIR$\..\..\..\os\hal\platforms\STM32\DMAv1\stm32_dma.h</name>
</file>
<file>
<name>$PROJ_DIR$\..\..\..\os\hal\platforms\STM32L1xx\stm32l1xx.h</name>
diff --git a/demos/ARMCM3-STM32L152-DISCOVERY/main.c b/demos/ARMCM3-STM32L152-DISCOVERY/main.c index 6f0ea53a0..3eaddc5fc 100644 --- a/demos/ARMCM3-STM32L152-DISCOVERY/main.c +++ b/demos/ARMCM3-STM32L152-DISCOVERY/main.c @@ -61,7 +61,7 @@ int main(void) { /*
* Activates the serial driver 1 using the driver default configuration.
*/
-// sdStart(&SD1, NULL);
+ sdStart(&SD1, NULL);
/*
* If the user button is pressed after the reset then the test suite is
|