diff options
| author | gdisirio <gdisirio@35acf78f-673a-0410-8e92-d51de3d6d3f4> | 2013-03-09 11:19:01 +0000 |
|---|---|---|
| committer | gdisirio <gdisirio@35acf78f-673a-0410-8e92-d51de3d6d3f4> | 2013-03-09 11:19:01 +0000 |
| commit | f8a70c1eb1401a4efa87ebc2c97f9782c79a6e7f (patch) | |
| tree | 1d10bf834234aa99b4a4f69c8a86bbb6f0173e92 | |
| parent | 125a85a1528192fc43f532b570268640eaa550bf (diff) | |
| download | ChibiOS-f8a70c1eb1401a4efa87ebc2c97f9782c79a6e7f.tar.gz ChibiOS-f8a70c1eb1401a4efa87ebc2c97f9782c79a6e7f.tar.bz2 ChibiOS-f8a70c1eb1401a4efa87ebc2c97f9782c79a6e7f.zip | |
Fixed bug 3606616.
git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@5389 35acf78f-673a-0410-8e92-d51de3d6d3f4
| -rw-r--r-- | demos/ARMCM3-STM32F103/.project | 138 | ||||
| -rw-r--r-- | os/hal/platforms/STM32/can_lld.c | 2 | ||||
| -rw-r--r-- | readme.txt | 1 |
3 files changed, 98 insertions, 43 deletions
diff --git a/demos/ARMCM3-STM32F103/.project b/demos/ARMCM3-STM32F103/.project index c32eaeafc..35116e95f 100644 --- a/demos/ARMCM3-STM32F103/.project +++ b/demos/ARMCM3-STM32F103/.project @@ -1,43 +1,95 @@ -<?xml version="1.0" encoding="UTF-8"?> -<projectDescription> - <name>ARMCM3-STM32F103</name> - <comment></comment> - <projects> - </projects> - <buildSpec> - <buildCommand> - <name>org.eclipse.cdt.managedbuilder.core.genmakebuilder</name> - <triggers>clean,full,incremental,</triggers> - <arguments> - </arguments> - </buildCommand> - <buildCommand> - <name>org.eclipse.cdt.managedbuilder.core.ScannerConfigBuilder</name> - <triggers>full,incremental,</triggers> - <arguments> - </arguments> - </buildCommand> - </buildSpec> - <natures> - <nature>org.eclipse.cdt.core.cnature</nature> - <nature>org.eclipse.cdt.managedbuilder.core.managedBuildNature</nature> - <nature>org.eclipse.cdt.managedbuilder.core.ScannerConfigNature</nature> - </natures> - <linkedResources> - <link> - <name>board</name> - <type>2</type> - <locationURI>CHIBIOS/boards/OLIMEX_STM32_P103</locationURI> - </link> - <link> - <name>os</name> - <type>2</type> - <locationURI>CHIBIOS/os</locationURI> - </link> - <link> - <name>test</name> - <type>2</type> - <locationURI>CHIBIOS/test</locationURI> - </link> - </linkedResources> -</projectDescription> +<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+ <name>ARMCM3-STM32F103</name>
+ <comment></comment>
+ <projects>
+ </projects>
+ <buildSpec>
+ <buildCommand>
+ <name>org.eclipse.cdt.managedbuilder.core.genmakebuilder</name>
+ <triggers>clean,full,incremental,</triggers>
+ <arguments>
+ <dictionary>
+ <key>?name?</key>
+ <value></value>
+ </dictionary>
+ <dictionary>
+ <key>org.eclipse.cdt.make.core.append_environment</key>
+ <value>true</value>
+ </dictionary>
+ <dictionary>
+ <key>org.eclipse.cdt.make.core.autoBuildTarget</key>
+ <value>all</value>
+ </dictionary>
+ <dictionary>
+ <key>org.eclipse.cdt.make.core.buildArguments</key>
+ <value>-j1</value>
+ </dictionary>
+ <dictionary>
+ <key>org.eclipse.cdt.make.core.buildCommand</key>
+ <value>make</value>
+ </dictionary>
+ <dictionary>
+ <key>org.eclipse.cdt.make.core.cleanBuildTarget</key>
+ <value>clean</value>
+ </dictionary>
+ <dictionary>
+ <key>org.eclipse.cdt.make.core.contents</key>
+ <value>org.eclipse.cdt.make.core.activeConfigSettings</value>
+ </dictionary>
+ <dictionary>
+ <key>org.eclipse.cdt.make.core.enableAutoBuild</key>
+ <value>false</value>
+ </dictionary>
+ <dictionary>
+ <key>org.eclipse.cdt.make.core.enableCleanBuild</key>
+ <value>true</value>
+ </dictionary>
+ <dictionary>
+ <key>org.eclipse.cdt.make.core.enableFullBuild</key>
+ <value>true</value>
+ </dictionary>
+ <dictionary>
+ <key>org.eclipse.cdt.make.core.fullBuildTarget</key>
+ <value>all</value>
+ </dictionary>
+ <dictionary>
+ <key>org.eclipse.cdt.make.core.stopOnError</key>
+ <value>true</value>
+ </dictionary>
+ <dictionary>
+ <key>org.eclipse.cdt.make.core.useDefaultBuildCmd</key>
+ <value>true</value>
+ </dictionary>
+ </arguments>
+ </buildCommand>
+ <buildCommand>
+ <name>org.eclipse.cdt.managedbuilder.core.ScannerConfigBuilder</name>
+ <triggers>full,incremental,</triggers>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ </buildSpec>
+ <natures>
+ <nature>org.eclipse.cdt.core.cnature</nature>
+ <nature>org.eclipse.cdt.managedbuilder.core.managedBuildNature</nature>
+ <nature>org.eclipse.cdt.managedbuilder.core.ScannerConfigNature</nature>
+ </natures>
+ <linkedResources>
+ <link>
+ <name>board</name>
+ <type>2</type>
+ <locationURI>CHIBIOS/boards/OLIMEX_STM32_P103</locationURI>
+ </link>
+ <link>
+ <name>os</name>
+ <type>2</type>
+ <locationURI>CHIBIOS/os</locationURI>
+ </link>
+ <link>
+ <name>test</name>
+ <type>2</type>
+ <locationURI>CHIBIOS/test</locationURI>
+ </link>
+ </linkedResources>
+</projectDescription>
diff --git a/os/hal/platforms/STM32/can_lld.c b/os/hal/platforms/STM32/can_lld.c index 76a50f460..7dab31faf 100644 --- a/os/hal/platforms/STM32/can_lld.c +++ b/os/hal/platforms/STM32/can_lld.c @@ -212,6 +212,7 @@ static void can_lld_sce_handler(CANDriver *canp) { msr = canp->can->MSR;
canp->can->MSR = CAN_MSR_ERRI | CAN_MSR_WKUI | CAN_MSR_SLAKI;
/* Wakeup event.*/
+#if CAN_USE_SLEEP_MODE
if (msr & CAN_MSR_WKUI) {
canp->state = CAN_READY;
canp->can->MCR &= ~CAN_MCR_SLEEP;
@@ -219,6 +220,7 @@ static void can_lld_sce_handler(CANDriver *canp) { chEvtBroadcastI(&canp->wakeup_event);
chSysUnlockFromIsr();
}
+#endif /* CAN_USE_SLEEP_MODE */
/* Error event.*/
if (msr & CAN_MSR_ERRI) {
flagsmask_t flags;
diff --git a/readme.txt b/readme.txt index 809ba0839..08d5c68f7 100644 --- a/readme.txt +++ b/readme.txt @@ -87,6 +87,7 @@ *** 2.5.2 ***
- FIX: Fixed surprising non-CRLF lines in source (bug 3607380).
+- FIX: Fixed CAN_USE_SLEEP_MODE compilation problem (bug 3606616).
- FIX: Fixed missing HSE bypass option for STM32F103 (bug 3606274).
- FIX: Fixed misplaced brace in icu_lld.c (bug 3605832)(backported to 2.4.4).
- FIX: Fixed errors in MMC_SPI driver state machine (bug 3605794).
|