From f13dabb9985c5604c4150f4c8476ba74607f293d Mon Sep 17 00:00:00 2001
From: gdisirio <gdisirio@35acf78f-673a-0410-8e92-d51de3d6d3f4>
Date: Sat, 27 Nov 2010 11:29:25 +0000
Subject: Fixes to the STM8S RIDE7 project.

git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@2433 35acf78f-673a-0410-8e92-d51de3d6d3f4
---
 demos/STM8S-STM8S105-DISCOVERY-STVD/ChibiOS-RT.stw |  2 +-
 .../cosmic/cosmic.stp                              |  4 +-
 .../raisonance/raisonance.stp                      |  4 +-
 demos/STM8S-STM8S208-RC/ch.rapp                    | 69 +++++++++++-----------
 demos/STM8S-STM8S208-RC/ch.rprj                    |  2 +-
 demos/STM8S-STM8S208-RC/mcuconf.h                  | 10 ++--
 6 files changed, 47 insertions(+), 44 deletions(-)

(limited to 'demos')

diff --git a/demos/STM8S-STM8S105-DISCOVERY-STVD/ChibiOS-RT.stw b/demos/STM8S-STM8S105-DISCOVERY-STVD/ChibiOS-RT.stw
index a6630271a..130504bef 100644
--- a/demos/STM8S-STM8S105-DISCOVERY-STVD/ChibiOS-RT.stw
+++ b/demos/STM8S-STM8S105-DISCOVERY-STVD/ChibiOS-RT.stw
@@ -11,6 +11,6 @@ Dependencies=
 Filename=raisonance\raisonance.stp
 Dependencies=
 [Options]
-ActiveProject=cosmic
+ActiveProject=raisonance
 ActiveConfig=Release
 AddSortedElements=0
diff --git a/demos/STM8S-STM8S105-DISCOVERY-STVD/cosmic/cosmic.stp b/demos/STM8S-STM8S105-DISCOVERY-STVD/cosmic/cosmic.stp
index 2baf85710..a477aa256 100644
--- a/demos/STM8S-STM8S105-DISCOVERY-STVD/cosmic/cosmic.stp
+++ b/demos/STM8S-STM8S105-DISCOVERY-STVD/cosmic/cosmic.stp
@@ -61,7 +61,7 @@ String.100.2=STM8 Cosmic
 String.100.3=ST7 Metrowerks V1.1
 String.100.4=Raisonance
 String.101.0=STM8 Cosmic
-String.102.0=C:\Program Files\COSMIC\CXSTM8_32K
+String.102.0=C:\Programmi\COSMIC\CXSTM8_32K
 String.103.0=
 String.104.0=Hstm8
 String.105.0=Lib
@@ -144,7 +144,7 @@ String.100.2=STM8 Cosmic
 String.100.3=ST7 Metrowerks V1.1
 String.100.4=Raisonance
 String.101.0=STM8 Cosmic
-String.102.0=C:\Program Files\COSMIC\CXSTM8_32K
+String.102.0=C:\Programmi\COSMIC\CXSTM8_32K
 String.103.0=
 String.104.0=Hstm8
 String.105.0=Lib
diff --git a/demos/STM8S-STM8S105-DISCOVERY-STVD/raisonance/raisonance.stp b/demos/STM8S-STM8S105-DISCOVERY-STVD/raisonance/raisonance.stp
index 4176b9ecc..de4b0c75e 100644
--- a/demos/STM8S-STM8S105-DISCOVERY-STVD/raisonance/raisonance.stp
+++ b/demos/STM8S-STM8S105-DISCOVERY-STVD/raisonance/raisonance.stp
@@ -61,7 +61,7 @@ String.100.2=STM8 Cosmic
 String.100.3=ST7 Metrowerks V1.1
 String.100.4=Raisonance
 String.101.0=Raisonance
-String.102.0=C:\Program Files\Raisonance\Ride
+String.102.0=C:\Programmi\Raisonance\Ride
 String.103.0=bin
 String.104.0=INC\ST7;INC
 String.105.0=LIB\ST7
@@ -130,7 +130,7 @@ String.100.2=STM8 Cosmic
 String.100.3=ST7 Metrowerks V1.1
 String.100.4=Raisonance
 String.101.0=Raisonance
-String.102.0=C:\Program Files\Raisonance\Ride
+String.102.0=C:\Programmi\Raisonance\Ride
 String.103.0=bin
 String.104.0=INC\ST7;INC
 String.105.0=LIB\ST7
diff --git a/demos/STM8S-STM8S208-RC/ch.rapp b/demos/STM8S-STM8S208-RC/ch.rapp
index 85071d41a..fbe5413e6 100644
--- a/demos/STM8S-STM8S208-RC/ch.rapp
+++ b/demos/STM8S-STM8S208-RC/ch.rapp
@@ -1,8 +1,9 @@
 
-<ApplicationBuild Header="ch" Extern=".\ch.rapp" Path=".\ch.rapp" OutputFile="..\STM8S-STM8S208-RC/bin\ch.aof" sate="98" AsyncBuild="" >
-	<Group Header="kernel" Marker="-1" OutputFile="" sate="0" AsyncBuild="" >
+<ApplicationBuild Header="ch" Extern=".\ch.rapp" Path=".\ch.rapp" OutputFile="..\STM8S-STM8S208-RC/bin\ch.aof" sate="2" AsyncBuild="" >
+	<Group Header="kernel" Marker="-1" OutputFile="" sate="96" AsyncBuild="" >
 		<NodeC Path="..\..\os\kernel\src\chcond.c" Header="chcond.c" Marker="-1" OutputFile="..\STM8S-STM8S208-RC/bin\chcond.obj" sate="0" AsyncBuild="" />
 		<NodeC Path="..\..\os\kernel\src\chdebug.c" Header="chdebug.c" Marker="-1" OutputFile="..\STM8S-STM8S208-RC/bin\chdebug.obj" sate="0" AsyncBuild="" />
+		<NodeC Path="..\..\os\kernel\src\chdynamic.c" Header="chdynamic.c" Marker="-1" AsyncBuild="" OutputFile="..\STM8S-STM8S208-RC/bin\chdynamic.obj" sate="0" />
 		<NodeC Path="..\..\os\kernel\src\chevents.c" Header="chevents.c" Marker="-1" OutputFile="..\STM8S-STM8S208-RC/bin\chevents.obj" sate="0" AsyncBuild="" />
 		<NodeC Path="..\..\os\kernel\src\chheap.c" Header="chheap.c" Marker="0" OutputFile="..\STM8S-STM8S208-RC/bin\chheap.obj" sate="0" AsyncBuild="" >
 			<Options>
@@ -10,15 +11,15 @@
 					<Set Header="RCST7" >
 						<Section Header="Model" >
 							<Property Header="GlobalMemory" Value="" Removable="1" />
-																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																														
+																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																											
 						</Section>
-																																																																																																																																																																																																																																																																																																																																																																																																																																																																										
+																																																																																																																																																																																																																																																																																																																																																																																																																																																																																					
 					</Set>
-																																																																																																																																																																																																																																																																																																																																																																																	
+																																																																																																																																																																																																																																																																																																																																																																																										
 				</Config>
-																																																																																																																																																																																																																																																																																															
+																																																																																																																																																																																																																																																																																																						
 			</Options>
-																																																																																																																																																																																																													
+																																																																																																																																																																																																																		
 		</NodeC>
 		<NodeC Path="..\..\os\kernel\src\chlists.c" Header="chlists.c" Marker="-1" OutputFile="..\STM8S-STM8S208-RC/bin\chlists.obj" sate="0" AsyncBuild="" />
 		<NodeC Path="..\..\os\kernel\src\chmboxes.c" Header="chmboxes.c" Marker="-1" OutputFile="..\STM8S-STM8S208-RC/bin\chmboxes.obj" sate="0" AsyncBuild="" />
@@ -30,7 +31,7 @@
 		<NodeC Path="..\..\os\kernel\src\chregistry.c" Header="chregistry.c" Marker="-1" OutputFile="..\STM8S-STM8S208-RC/bin\chregistry.obj" sate="0" AsyncBuild="" />
 		<NodeC Path="..\..\os\kernel\src\chschd.c" Header="chschd.c" Marker="-1" OutputFile="..\STM8S-STM8S208-RC/bin\chschd.obj" sate="0" AsyncBuild="" >
 			<Options/>
-																																																																																																																																																																																																													
+																																																																																																																																																																																																																		
 		</NodeC>
 		<NodeC Path="..\..\os\kernel\src\chsem.c" Header="chsem.c" Marker="-1" OutputFile="..\STM8S-STM8S208-RC/bin\chsem.obj" sate="0" AsyncBuild="" />
 		<NodeC Path="..\..\os\kernel\src\chsys.c" Header="chsys.c" Marker="-1" OutputFile="..\STM8S-STM8S208-RC/bin\chsys.obj" sate="0" AsyncBuild="" />
@@ -41,17 +42,17 @@
 					<Set Header="RCST7" >
 						<Section Header="Model" >
 							<Property Header="GlobalMemory" Value="" Removable="1" />
-																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																														
+																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																											
 						</Section>
-																																																																																																																																																																																																																																																																																																																																																																																																																																																																										
+																																																																																																																																																																																																																																																																																																																																																																																																																																																																																					
 					</Set>
-																																																																																																																																																																																																																																																																																																																																																																																	
+																																																																																																																																																																																																																																																																																																																																																																																										
 				</Config>
-																																																																																																																																																																																																																																																																																															
+																																																																																																																																																																																																																																																																																																						
 			</Options>
-																																																																																																																																																																																																													
+																																																																																																																																																																																																																		
 		</NodeC>
-																																																																																																																														
+																																																																																																																																	
 	</Group>
 	<Group Header="test" Marker="-1" OutputFile="" sate="0" AsyncBuild="" >
 		<NodeC Path="..\..\test\test.c" Header="test.c" Marker="-1" OutputFile="..\STM8S-STM8S208-RC/bin\test.obj" sate="0" AsyncBuild="" />
@@ -66,11 +67,11 @@
 		<NodeC Path="..\..\test\testqueues.c" Header="testqueues.c" Marker="-1" OutputFile="..\STM8S-STM8S208-RC/bin\testqueues.obj" sate="0" AsyncBuild="" />
 		<NodeC Path="..\..\test\testsem.c" Header="testsem.c" Marker="-1" OutputFile="..\STM8S-STM8S208-RC/bin\testsem.obj" sate="0" AsyncBuild="" />
 		<NodeC Path="..\..\test\testthd.c" Header="testthd.c" Marker="-1" OutputFile="..\STM8S-STM8S208-RC/bin\testthd.obj" sate="0" AsyncBuild="" />
-																																																																																				
+																																																																																							
 	</Group>
 	<Group Header="port" Marker="-1" OutputFile="" sate="0" AsyncBuild="" >
 		<NodeC Path="..\..\os\ports\RC\STM8\chcore.c" Header="chcore.c" Marker="-1" OutputFile="..\STM8S-STM8S208-RC/bin\chcore.obj" sate="0" AsyncBuild="" />
-																																																																																																																														
+																																																																																																																																	
 	</Group>
 	<Group Header="hal" Marker="-1" OutputFile="" sate="0" AsyncBuild="" >
 		<NodeC Path="..\..\os\hal\src\adc.c" Header="adc.c" Marker="-1" OutputFile="..\STM8S-STM8S208-RC/bin\adc.obj" sate="0" AsyncBuild="" />
@@ -82,15 +83,17 @@
 		<NodeC Path="..\..\os\hal\src\pwm.c" Header="pwm.c" Marker="-1" OutputFile="..\STM8S-STM8S208-RC/bin\pwm.obj" sate="0" AsyncBuild="" />
 		<NodeC Path="..\..\os\hal\src\serial.c" Header="serial.c" Marker="-1" OutputFile="..\STM8S-STM8S208-RC/bin\serial.obj" sate="0" AsyncBuild="" />
 		<NodeC Path="..\..\os\hal\src\spi.c" Header="spi.c" Marker="-1" OutputFile="..\STM8S-STM8S208-RC/bin\spi.obj" sate="0" AsyncBuild="" />
-		<NodeC Path="..\..\os\hal\platforms\STM8S\hal_lld.c" Header="hal_lld.c" Marker="-1" OutputFile="..\STM8S-STM8S208-RC/bin\hal_lld.obj" sate="0" AsyncBuild="" />
-		<NodeC Path="..\..\os\hal\platforms\STM8S\serial_lld.c" Header="serial_lld.c" Marker="-1" OutputFile="..\STM8S-STM8S208-RC/bin\serial_lld.obj" sate="0" AsyncBuild="" />
-		<NodeC Path="..\..\os\hal\platforms\STM8S\pal_lld.c" Header="pal_lld.c" Marker="-1" OutputFile="..\STM8S-STM8S208-RC/bin\pal_lld.obj" sate="0" AsyncBuild="" />
-		<NodeC Path="..\..\os\hal\platforms\STM8S\spi_lld.c" Header="spi_lld.c" Marker="-1" AsyncBuild="" OutputFile="..\STM8S-STM8S208-RC/bin\spi_lld.obj" sate="0" />
-																																																																																																												
+		<Group Header="stm8s" Marker="-1" AsyncBuild="" OutputFile="" sate="0" >
+			<NodeC Path="..\..\os\hal\platforms\STM8S\hal_lld.c" Header="hal_lld.c" Marker="-1" AsyncBuild="" OutputFile="..\STM8S-STM8S208-RC/bin\hal_lld.obj" sate="0" />
+			<NodeC Path="..\..\os\hal\platforms\STM8S\pal_lld.c" Header="pal_lld.c" Marker="-1" AsyncBuild="" OutputFile="..\STM8S-STM8S208-RC/bin\pal_lld.obj" sate="0" />
+			<NodeC Path="..\..\os\hal\platforms\STM8S\serial_lld.c" Header="serial_lld.c" Marker="-1" AsyncBuild="" OutputFile="..\STM8S-STM8S208-RC/bin\serial_lld.obj" sate="0" />
+			<NodeC Path="..\..\os\hal\platforms\STM8S\spi_lld.c" Header="spi_lld.c" Marker="-1" AsyncBuild="" OutputFile="..\STM8S-STM8S208-RC/bin\spi_lld.obj" sate="0" />
+		</Group>
+																																																																																																															
 	</Group>
 	<Group Header="board" Marker="-1" OutputFile="" sate="0" AsyncBuild="" >
 		<NodeC Path="..\..\boards\RAISONANCE_REVA_STM8S\board.c" Header="board.c" Marker="-1" OutputFile="..\STM8S-STM8S208-RC/bin\board.obj" sate="0" AsyncBuild="" />
-																																																																																																															
+																																																																																																																		
 	</Group>
 	<NodeC Path=".\main.c" Header="main.c" Marker="-1" OutputFile="..\STM8S-STM8S208-RC/bin\main.obj" sate="0" AsyncBuild="" />
 	<Options>
@@ -98,21 +101,21 @@
 			<Set Header="ApplicationBuild" >
 				<Section Header="General" >
 					<Property Header="TargetFamily" Value="ST7" />
-																																																																																																																																																																																																																																																																																																																																																																																																										
+																																																																																																																																																																																																																																																																																																																																																																																																																			
 				</Section>
 				<Section Header="Directories" >
 					<Property Header="IncDir" Value="$(RkitInc);$(RkitInc)\ST7;..\..\os\kernel\include;..\..\os\ports\RC\STM8;..\..\os\hal\include;..\..\os\hal\platforms\STM8S;..\..\boards\RAISONANCE_REVA_STM8S;..\..\test" Removable="1" />
 					<Property Header="OutDir" Value="$(ApplicationDir)/bin" Removable="1" />
 					<Property Header="ListDir" Value="$(ApplicationDir)/lst" Removable="1" />
 					<Property Header="LinkerOutputDir" Value="Output Directory" Removable="1" />
-																																																																																																																																																																																																																																																	
+																																																																																																																																																																																																																																																										
 				</Section>
-																																																																																																																																																																																											
+																																																																																																																																																																																																		
 			</Set>
 			<Set Header="Target" >
 				<Section Header="ProcessorST7" >
 					<Property Header="Processor" Value="STM8S208MB" Removable="1" />
-																																																																																																																																																																																																																																																																																																																																																																																																										
+																																																																																																																																																																																																																																																																																																																																																																																																																			
 				</Section>
 				<Section Header="ToolSetST7" >
 					<Property Header="BuildToolSetST7" Value="ST7\RaisonanceTools.config" Removable="1" />
@@ -123,33 +126,33 @@
 				<Section Header="DebugST7" >
 					<Property Header="Startup" Value="1" Removable="1" />
 					<Property Header="DebugTool_STM8" Value="RLINK_STM8" Removable="1" />
-																																																																																																																																					
+																																																																																																																																														
 				</Section>
 					
 			</Set>
 			<Set Header="RCST7" >
 				<Section Header="CodeGen" >
 					<Property Header="ENUMTYPE" Value="ET(CHAR)" Removable="1" />
-																																																																																																																																																																																																																																																																																																																																																																																																	
+																																																																																																																																																																																																																																																																																																																																																																																																										
 				</Section>
 				<Section Header="Model" >
 					<Property Header="GlobalMemory" Value="DGC(DATA)" Removable="1" />
 					<Property Header="ModelP" Value="STM8(SMALL)" Removable="1" />
-																																																																																																																																														
+																																																																																																																																																							
 				</Section>
 				<Section Header="OPTIM" >
 					<Property Header="OTLEVEL" Value="3" Removable="1" />
 					<Property Header="SPEEDSIZE" Value="SPEED" Removable="1" />
-																																																																																																																																																																																		
+																																																																																																																																																																																											
 				</Section>
-																																																																																																														
+																																																																																																																					
 			</Set>
 			<Set Header="MAST7" >
 				<Section Header="Set" >
 					<Property Header="Defines" Value="STM8S208RB" Removable="1" />
-																																																																																																																																																																																																																																																																																																																																											
+																																																																																																																																																																																																																																																																																																																																																				
 				</Section>
-																																																																																																																																																																																																																																																																	
+																																																																																																																																																																																																																																																																								
 			</Set>
 		</Config>
 	</Options>
diff --git a/demos/STM8S-STM8S208-RC/ch.rprj b/demos/STM8S-STM8S208-RC/ch.rprj
index ad8b9b39e..138f43304 100644
--- a/demos/STM8S-STM8S208-RC/ch.rprj
+++ b/demos/STM8S-STM8S208-RC/ch.rprj
@@ -1,4 +1,4 @@
 
 <Project Header="Project 'ch'" Path=".\ch.rprj" Project="Yes" OutputFile="" sate="96" ActiveApp="ch" AsyncBuild="" >
-	<ApplicationBuild Header="ch" Extern=".\ch.rapp" Path=".\ch.rapp" OutputFile="..\STM8S-STM8S208-RC/bin\ch.aof" sate="98" AsyncBuild="" />
+	<ApplicationBuild Header="ch" Extern=".\ch.rapp" Path=".\ch.rapp" OutputFile="..\STM8S-STM8S208-RC/bin\ch.aof" sate="2" AsyncBuild="" />
 </Project>
\ No newline at end of file
diff --git a/demos/STM8S-STM8S208-RC/mcuconf.h b/demos/STM8S-STM8S208-RC/mcuconf.h
index bb38a3760..198106dec 100644
--- a/demos/STM8S-STM8S208-RC/mcuconf.h
+++ b/demos/STM8S-STM8S208-RC/mcuconf.h
@@ -29,9 +29,9 @@
  * HAL general settings.
  */
 #define STM8S_NO_CLOCK_INIT             FALSE
-#define STM8S_HSI_ENABLED               FALSE
+#define STM8S_HSI_ENABLED               TRUE
 #define STM8S_LSI_ENABLED               TRUE
-#define STM8S_HSE_ENABLED               TRUE
+#define STM8S_HSE_ENABLED               FALSE
 #define STM8S_SYSCLK_SOURCE             CLK_SYSSEL_HSI
 #define STM8S_HSI_DIVIDER               CLK_HSI_DIV1
 #define STM8S_CPU_DIVIDER               CLK_CPU_DIV1
@@ -40,9 +40,9 @@
 /*
  * SERIAL driver system settings.
  */
-#define USE_STM8S_UART1                 TRUE
-#define USE_STM8S_UART2                 FALSE
-#define USE_STM8S_UART3                 FALSE
+#define STM8S_SERIAL_USE_UART1          TRUE
+#define STM8S_SERIAL_USE_UART2          FALSE
+#define STM8S_SERIAL_USE_UART3          FALSE
 
 /*
  * SPI driver system settings.
-- 
cgit v1.2.3