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

4 files changed, 28 insertions, 28 deletions

diff --git a/demos/ARMCM3-STM32F103-GCC-ALT/Makefile b/demos/ARMCM3-STM32F103-GCC-ALT/Makefile
index 36567e197..347a6f7e0 100644
--- a/demos/ARMCM3-STM32F103-GCC-ALT/Makefile
+++ b/demos/ARMCM3-STM32F103-GCC-ALT/Makefile
@@ -60,7 +60,7 @@ CHIBIOS = ../..
 include $(CHIBIOS)/boards/OLIMEX_STM32_P103/board.mk

 include $(CHIBIOS)/os/hal/platforms/STM32/platform.mk

 include $(CHIBIOS)/os/hal/hal.mk

-include $(CHIBIOS)/os/ports/GCC/ARMCMx/STM32F10x/port.mk

+include $(CHIBIOS)/os/ports/GCC/ARMCM3/STM32F103/port.mk

 include $(CHIBIOS)/os/kernel/kernel.mk

 include $(CHIBIOS)/test/test.mk

 

diff --git a/demos/ARMCM3-STM32F103-GCC/Makefile b/demos/ARMCM3-STM32F103-GCC/Makefile
index 347a6f7e0..36567e197 100644
--- a/demos/ARMCM3-STM32F103-GCC/Makefile
+++ b/demos/ARMCM3-STM32F103-GCC/Makefile
@@ -60,7 +60,7 @@ CHIBIOS = ../..
 include $(CHIBIOS)/boards/OLIMEX_STM32_P103/board.mk

 include $(CHIBIOS)/os/hal/platforms/STM32/platform.mk

 include $(CHIBIOS)/os/hal/hal.mk

-include $(CHIBIOS)/os/ports/GCC/ARMCM3/STM32F103/port.mk

+include $(CHIBIOS)/os/ports/GCC/ARMCMx/STM32F10x/port.mk

 include $(CHIBIOS)/os/kernel/kernel.mk

 include $(CHIBIOS)/test/test.mk

 

diff --git a/docs/reports/STM32F103-72-ALT.txt b/docs/reports/STM32F103-72-ALT.txt
index 81c9a564d..4d3d89417 100644
--- a/docs/reports/STM32F103-72-ALT.txt
+++ b/docs/reports/STM32F103-72-ALT.txt
@@ -92,55 +92,55 @@ Settings: SYSCLK=72, ACR=0x12 (2 wait states)
 --- Result: SUCCESS

 ----------------------------------------------------------------------------

 --- Test Case 11.1 (Benchmark, messages #1)

---- Score : 252111 msgs/S, 504222 ctxswc/S

+--- Score : 226004 msgs/S, 452008 ctxswc/S

 --- Result: SUCCESS

 ----------------------------------------------------------------------------

 --- Test Case 11.2 (Benchmark, messages #2)

---- Score : 200704 msgs/S, 401408 ctxswc/S

+--- Score : 188141 msgs/S, 376282 ctxswc/S

 --- Result: SUCCESS

 ----------------------------------------------------------------------------

 --- Test Case 11.3 (Benchmark, messages #3)

---- Score : 200704 msgs/S, 401408 ctxswc/S

+--- Score : 188141 msgs/S, 376282 ctxswc/S

 --- Result: SUCCESS

 ----------------------------------------------------------------------------

 --- Test Case 11.4 (Benchmark, context switch)

---- Score : 822344 ctxswc/S

+--- Score : 707232 ctxswc/S

 --- Result: SUCCESS

 ----------------------------------------------------------------------------

 --- Test Case 11.5 (Benchmark, threads, full cycle)

---- Score : 156203 threads/S

+--- Score : 147284 threads/S

 --- Result: SUCCESS

 ----------------------------------------------------------------------------

 --- Test Case 11.6 (Benchmark, threads, create only)

---- Score : 223839 threads/S

+--- Score : 204767 threads/S

 --- Result: SUCCESS

 ----------------------------------------------------------------------------

 --- Test Case 11.7 (Benchmark, mass reschedule, 5 threads)

---- Score : 62866 reschedules/S, 377196 ctxswc/S

+--- Score : 57135 reschedules/S, 342810 ctxswc/S

 --- Result: SUCCESS

 ----------------------------------------------------------------------------

 --- Test Case 11.8 (Benchmark, round robin context switching)

---- Score : 491292 ctxswc/S

+--- Score : 429720 ctxswc/S

 --- Result: SUCCESS

 ----------------------------------------------------------------------------

 --- Test Case 11.9 (Benchmark, I/O Queues throughput)

---- Score : 471792 bytes/S

+--- Score : 475040 bytes/S

 --- Result: SUCCESS

 ----------------------------------------------------------------------------

 --- Test Case 11.10 (Benchmark, virtual timers set/reset)

---- Score : 644466 timers/S

+--- Score : 647548 timers/S

 --- Result: SUCCESS

 ----------------------------------------------------------------------------

 --- Test Case 11.11 (Benchmark, semaphores wait/signal)

---- Score : 895484 wait+signal/S

+--- Score : 833440 wait+signal/S

 --- Result: SUCCESS

 ----------------------------------------------------------------------------

 --- Test Case 11.12 (Benchmark, mutexes lock/unlock)

---- Score : 694320 lock+unlock/S

+--- Score : 644680 lock+unlock/S

 --- Result: SUCCESS

 ----------------------------------------------------------------------------

 --- Test Case 11.13 (Benchmark, RAM footprint)

---- System: 340 bytes

+--- System: 332 bytes

 --- Thread: 68 bytes

 --- Timer : 20 bytes

 --- Semaph: 12 bytes

diff --git a/docs/reports/STM32F103-72.txt b/docs/reports/STM32F103-72.txt
index 4d3d89417..81c9a564d 100644
--- a/docs/reports/STM32F103-72.txt
+++ b/docs/reports/STM32F103-72.txt
@@ -92,55 +92,55 @@ Settings: SYSCLK=72, ACR=0x12 (2 wait states)
 --- Result: SUCCESS

 ----------------------------------------------------------------------------

 --- Test Case 11.1 (Benchmark, messages #1)

---- Score : 226004 msgs/S, 452008 ctxswc/S

+--- Score : 252111 msgs/S, 504222 ctxswc/S

 --- Result: SUCCESS

 ----------------------------------------------------------------------------

 --- Test Case 11.2 (Benchmark, messages #2)

---- Score : 188141 msgs/S, 376282 ctxswc/S

+--- Score : 200704 msgs/S, 401408 ctxswc/S

 --- Result: SUCCESS

 ----------------------------------------------------------------------------

 --- Test Case 11.3 (Benchmark, messages #3)

---- Score : 188141 msgs/S, 376282 ctxswc/S

+--- Score : 200704 msgs/S, 401408 ctxswc/S

 --- Result: SUCCESS

 ----------------------------------------------------------------------------

 --- Test Case 11.4 (Benchmark, context switch)

---- Score : 707232 ctxswc/S

+--- Score : 822344 ctxswc/S

 --- Result: SUCCESS

 ----------------------------------------------------------------------------

 --- Test Case 11.5 (Benchmark, threads, full cycle)

---- Score : 147284 threads/S

+--- Score : 156203 threads/S

 --- Result: SUCCESS

 ----------------------------------------------------------------------------

 --- Test Case 11.6 (Benchmark, threads, create only)

---- Score : 204767 threads/S

+--- Score : 223839 threads/S

 --- Result: SUCCESS

 ----------------------------------------------------------------------------

 --- Test Case 11.7 (Benchmark, mass reschedule, 5 threads)

---- Score : 57135 reschedules/S, 342810 ctxswc/S

+--- Score : 62866 reschedules/S, 377196 ctxswc/S

 --- Result: SUCCESS

 ----------------------------------------------------------------------------

 --- Test Case 11.8 (Benchmark, round robin context switching)

---- Score : 429720 ctxswc/S

+--- Score : 491292 ctxswc/S

 --- Result: SUCCESS

 ----------------------------------------------------------------------------

 --- Test Case 11.9 (Benchmark, I/O Queues throughput)

---- Score : 475040 bytes/S

+--- Score : 471792 bytes/S

 --- Result: SUCCESS

 ----------------------------------------------------------------------------

 --- Test Case 11.10 (Benchmark, virtual timers set/reset)

---- Score : 647548 timers/S

+--- Score : 644466 timers/S

 --- Result: SUCCESS

 ----------------------------------------------------------------------------

 --- Test Case 11.11 (Benchmark, semaphores wait/signal)

---- Score : 833440 wait+signal/S

+--- Score : 895484 wait+signal/S

 --- Result: SUCCESS

 ----------------------------------------------------------------------------

 --- Test Case 11.12 (Benchmark, mutexes lock/unlock)

---- Score : 644680 lock+unlock/S

+--- Score : 694320 lock+unlock/S

 --- Result: SUCCESS

 ----------------------------------------------------------------------------

 --- Test Case 11.13 (Benchmark, RAM footprint)

---- System: 332 bytes

+--- System: 340 bytes

 --- Thread: 68 bytes

 --- Timer : 20 bytes

 --- Semaph: 12 bytes