Fixed bug 3606616.

git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@5389 35acf78f-673a-0410-8e92-d51de3d6d3f4

demos/ARMCM3-STM32F103/.project

@@ -1,43 +1,95 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
+<projectDescription>
-	<name>ARMCM3-STM32F103</name>
+	<name>ARMCM3-STM32F103</name>
-	<comment></comment>
+	<comment></comment>
-	<projects>
+	<projects>
-	</projects>
+	</projects>
-	<buildSpec>
+	<buildSpec>
-		<buildCommand>
+		<buildCommand>
-			<name>org.eclipse.cdt.managedbuilder.core.genmakebuilder</name>
+			<name>org.eclipse.cdt.managedbuilder.core.genmakebuilder</name>
-			<triggers>clean,full,incremental,</triggers>
+			<triggers>clean,full,incremental,</triggers>
-			<arguments>
+			<arguments>
-			</arguments>
+				<dictionary>
-		</buildCommand>
+					<key>?name?</key>
-		<buildCommand>
+					<value></value>
-			<name>org.eclipse.cdt.managedbuilder.core.ScannerConfigBuilder</name>
+				</dictionary>
-			<triggers>full,incremental,</triggers>
+				<dictionary>
-			<arguments>
+					<key>org.eclipse.cdt.make.core.append_environment</key>
-			</arguments>
+					<value>true</value>
-		</buildCommand>
+				</dictionary>
-	</buildSpec>
+				<dictionary>
-	<natures>
+					<key>org.eclipse.cdt.make.core.autoBuildTarget</key>
-		<nature>org.eclipse.cdt.core.cnature</nature>
+					<value>all</value>
-		<nature>org.eclipse.cdt.managedbuilder.core.managedBuildNature</nature>
+				</dictionary>
-		<nature>org.eclipse.cdt.managedbuilder.core.ScannerConfigNature</nature>
+				<dictionary>
-	</natures>
+					<key>org.eclipse.cdt.make.core.buildArguments</key>
-	<linkedResources>
+					<value>-j1</value>
-		<link>
+				</dictionary>
-			<name>board</name>
+				<dictionary>
-			<type>2</type>
+					<key>org.eclipse.cdt.make.core.buildCommand</key>
-			<locationURI>CHIBIOS/boards/OLIMEX_STM32_P103</locationURI>
+					<value>make</value>
-		</link>
+				</dictionary>
-		<link>
+				<dictionary>
-			<name>os</name>
+					<key>org.eclipse.cdt.make.core.cleanBuildTarget</key>
-			<type>2</type>
+					<value>clean</value>
-			<locationURI>CHIBIOS/os</locationURI>
+				</dictionary>
-		</link>
+				<dictionary>
-		<link>
+					<key>org.eclipse.cdt.make.core.contents</key>
-			<name>test</name>
+					<value>org.eclipse.cdt.make.core.activeConfigSettings</value>
-			<type>2</type>
+				</dictionary>
-			<locationURI>CHIBIOS/test</locationURI>
+				<dictionary>
-		</link>
+					<key>org.eclipse.cdt.make.core.enableAutoBuild</key>
-	</linkedResources>
+					<value>false</value>
-</projectDescription>
+				</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>

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;

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).