From f13dabb9985c5604c4150f4c8476ba74607f293d Mon Sep 17 00:00:00 2001 From: gdisirio 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 ++-- docs/reports/STM8S208-16-Raisonance.txt | 69 +++++++++++++++++----- 7 files changed, 100 insertions(+), 60 deletions(-) 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 @@ - - + + + @@ -10,15 +11,15 @@
- +
- +
- + - +
- +
@@ -30,7 +31,7 @@ - + @@ -41,17 +42,17 @@
- +
- +
- + - + - +
- +
@@ -66,11 +67,11 @@ - + - + @@ -82,15 +83,17 @@ - - - - - + + + + + + + - + @@ -98,21 +101,21 @@
- +
- +
- +
- +
@@ -123,33 +126,33 @@
- +
- +
- +
- +
- +
- +
- +
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 @@ - + \ 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. diff --git a/docs/reports/STM8S208-16-Raisonance.txt b/docs/reports/STM8S208-16-Raisonance.txt index 144b5b253..267f008f2 100644 --- a/docs/reports/STM8S208-16-Raisonance.txt +++ b/docs/reports/STM8S208-16-Raisonance.txt @@ -6,9 +6,9 @@ Compiler: Raisonance RKit-STM8_2.30.10.0175 *** ChibiOS/RT test suite *** -*** Kernel: 2.1.0unstable +*** Kernel: 2.1.4unstable *** Architecture: STM8 -*** Platform: STM8x +*** Platform: STM8S *** Test Board: Raisonance REva V3 + STM8S208RB ---------------------------------------------------------------------------- @@ -33,9 +33,39 @@ Compiler: Raisonance RKit-STM8_2.30.10.0175 --- Test Case 2.3 (Semaphores, atomic signal-wait) --- Result: SUCCESS ---------------------------------------------------------------------------- +--- Test Case 2.4 (Binary Semaphores, functionality) +--- Result: SUCCESS +---------------------------------------------------------------------------- +--- Test Case 3.1 (Mutexes, priority enqueuing test) +--- Result: SUCCESS +---------------------------------------------------------------------------- +--- Test Case 3.2 (Mutexes, priority inheritance, simple case) +--- Result: SUCCESS +---------------------------------------------------------------------------- +--- Test Case 3.3 (Mutexes, priority inheritance, complex case) +--- Result: SUCCESS +---------------------------------------------------------------------------- +--- Test Case 3.4 (Mutexes, priority return) +--- Result: SUCCESS +---------------------------------------------------------------------------- +--- Test Case 3.5 (Mutexes, status) +--- Result: SUCCESS +---------------------------------------------------------------------------- +--- Test Case 3.6 (CondVar, signal test) +--- Result: SUCCESS +---------------------------------------------------------------------------- +--- Test Case 3.7 (CondVar, broadcast test) +--- Result: SUCCESS +---------------------------------------------------------------------------- +--- Test Case 3.8 (CondVar, boost test) +--- Result: SUCCESS +---------------------------------------------------------------------------- --- Test Case 4.1 (Messages, loop) --- Result: SUCCESS ---------------------------------------------------------------------------- +--- Test Case 5.1 (Mailboxes, queuing and timeouts) +--- Result: SUCCESS +---------------------------------------------------------------------------- --- Test Case 6.1 (Events, registration and dispatch) --- Result: SUCCESS ---------------------------------------------------------------------------- @@ -67,57 +97,64 @@ Compiler: Raisonance RKit-STM8_2.30.10.0175 --- Result: SUCCESS ---------------------------------------------------------------------------- --- Test Case 11.1 (Benchmark, messages #1) ---- Score : 32031 msgs/S, 64062 ctxswc/S +--- Score : 31278 msgs/S, 62556 ctxswc/S --- Result: SUCCESS ---------------------------------------------------------------------------- --- Test Case 11.2 (Benchmark, messages #2) ---- Score : 24553 msgs/S, 49106 ctxswc/S +--- Score : 23785 msgs/S, 47570 ctxswc/S --- Result: SUCCESS ---------------------------------------------------------------------------- --- Test Case 11.3 (Benchmark, messages #3) ---- Score : 24553 msgs/S, 49106 ctxswc/S +--- Score : 23785 msgs/S, 47570 ctxswc/S --- Result: SUCCESS ---------------------------------------------------------------------------- --- Test Case 11.4 (Benchmark, context switch) ---- Score : 110712 ctxswc/S +--- Score : 107368 ctxswc/S --- Result: SUCCESS ---------------------------------------------------------------------------- --- Test Case 11.5 (Benchmark, threads, full cycle) ---- Score : 18102 threads/S +--- Score : 17603 threads/S --- Result: SUCCESS ---------------------------------------------------------------------------- --- Test Case 11.6 (Benchmark, threads, create only) ---- Score : 28091 threads/S +--- Score : 27510 threads/S --- Result: SUCCESS ---------------------------------------------------------------------------- --- Test Case 11.7 (Benchmark, mass reschedule, 5 threads) ---- Score : 7067 reschedules/S, 42402 ctxswc/S +--- Score : 6268 reschedules/S, 37608 ctxswc/S --- Result: SUCCESS ---------------------------------------------------------------------------- --- Test Case 11.8 (Benchmark, round robin context switching) ---- Score : 54880 ctxswc/S +--- Score : 53236 ctxswc/S --- Result: SUCCESS ---------------------------------------------------------------------------- --- Test Case 11.9 (Benchmark, I/O Queues throughput) ---- Score : 63540 bytes/S +--- Score : 53004 bytes/S --- Result: SUCCESS ---------------------------------------------------------------------------- --- Test Case 11.10 (Benchmark, virtual timers set/reset) ---- Score : 57788 timers/S +--- Score : 57830 timers/S --- Result: SUCCESS ---------------------------------------------------------------------------- --- Test Case 11.11 (Benchmark, semaphores wait/signal) ---- Score : 216720 wait+signal/S +--- Score : 125116 wait+signal/S +--- Result: SUCCESS +---------------------------------------------------------------------------- +--- Test Case 11.12 (Benchmark, mutexes lock/unlock) +--- Score : 123188 lock+unlock/S --- Result: SUCCESS ---------------------------------------------------------------------------- ---- Test Case 11.12 (Benchmark, RAM footprint) ---- System: 208 bytes ---- Thread: 29 bytes +--- Test Case 11.13 (Benchmark, RAM footprint) +--- System: 214 bytes +--- Thread: 32 bytes --- Timer : 10 bytes --- Semaph: 5 bytes --- EventS: 2 bytes --- EventL: 5 bytes +--- Mutex : 8 bytes +--- CondV.: 4 bytes --- Queue : 15 bytes +--- MailB.: 18 bytes --- Result: SUCCESS ---------------------------------------------------------------------------- -- cgit v1.2.3