aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--boards/OLIMEX_STM32_P107/board.h2
-rw-r--r--demos/ARMCM3-STM32F103/readme.txt6
-rw-r--r--demos/ARMCM3-STM32F107-GCC/Makefile2
-rw-r--r--demos/ARMCM3-STM32F107-GCC/main.c13
-rw-r--r--demos/ARMCM3-STM32F107-GCC/mcuconf.h10
-rw-r--r--demos/ARMCM3-STM32F107-GCC/readme.txt9
-rw-r--r--docs/reports/STM32F107-72-GCC.txt162
-rw-r--r--readme.txt3
8 files changed, 187 insertions, 20 deletions
diff --git a/boards/OLIMEX_STM32_P107/board.h b/boards/OLIMEX_STM32_P107/board.h
index 52639b0e2..61ea865e0 100644
--- a/boards/OLIMEX_STM32_P107/board.h
+++ b/boards/OLIMEX_STM32_P107/board.h
@@ -142,7 +142,7 @@
*/
#define VAL_GPIOCCRL 0x334488B8 /* PC7...PC0 */
#define VAL_GPIOCCRH 0x444B8B88 /* PC15...PC8 */
-#define VAL_GPIOCODR 0xFFFFFFFF
+#define VAL_GPIOCODR 0xFFFFFF3F
/*
* Port D setup:
diff --git a/demos/ARMCM3-STM32F103/readme.txt b/demos/ARMCM3-STM32F103/readme.txt
index 5329bfb35..e14bc600f 100644
--- a/demos/ARMCM3-STM32F103/readme.txt
+++ b/demos/ARMCM3-STM32F103/readme.txt
@@ -10,12 +10,12 @@ The demo runs on an Olimex STM32-P103 board.
The demo flashes the board LED using a thread, by pressing the button located
on the board the test procedure is activated with output on the serial port
-COM2 (USART2).
+SD2 (USART2).
** Build Procedure **
-The demo has been tested by using the free Codesourcery GCC-based toolchain,
-YAGARTO and an experimental WinARM build including GCC 4.3.0.
+The demo has been tested by using the free Codesourcery GCC-based toolchain
+and YAGARTO.
Just modify the TRGT line in the makefile in order to use different GCC ports.
** Notes **
diff --git a/demos/ARMCM3-STM32F107-GCC/Makefile b/demos/ARMCM3-STM32F107-GCC/Makefile
index dc4ebeeeb..9a7631be9 100644
--- a/demos/ARMCM3-STM32F107-GCC/Makefile
+++ b/demos/ARMCM3-STM32F107-GCC/Makefile
@@ -57,7 +57,7 @@ LDSCRIPT= ch.ld
# Imported source files
CHIBIOS = ../..
-include $(CHIBIOS)/boards/ST_STM3210C_EVAL/board.mk
+include $(CHIBIOS)/boards/OLIMEX_STM32_P107/board.mk
include $(CHIBIOS)/os/hal/platforms/STM32/platform.mk
include $(CHIBIOS)/os/hal/hal.mk
include $(CHIBIOS)/os/ports/GCC/ARMCMx/STM32/port.mk
diff --git a/demos/ARMCM3-STM32F107-GCC/main.c b/demos/ARMCM3-STM32F107-GCC/main.c
index 73bc0b402..418966941 100644
--- a/demos/ARMCM3-STM32F107-GCC/main.c
+++ b/demos/ARMCM3-STM32F107-GCC/main.c
@@ -22,19 +22,18 @@
#include "test.h"
/*
- * Red LED blinker thread, times are in milliseconds.
+ * Green LED blinker thread, times are in milliseconds.
*/
static WORKING_AREA(waThread1, 128);
static msg_t Thread1(void *arg) {
(void)arg;
while (TRUE) {
- palClearPad(IOPORT4, 7);
+ palClearPad(GPIOC, GPIOC_LED_STATUS1);
chThdSleepMilliseconds(500);
- palSetPad(IOPORT4, 7);
+ palSetPad(GPIOC, GPIOC_LED_STATUS1);
chThdSleepMilliseconds(500);
}
- return 0;
}
/*
@@ -55,7 +54,7 @@ int main(void) {
/*
* Activates the serial driver 2 using the driver default configuration.
*/
- sdStart(&SD2, NULL);
+ sdStart(&SD3, NULL);
/*
* Creates the blinker thread.
@@ -67,8 +66,8 @@ int main(void) {
* sleeping in a loop and check the button state.
*/
while (TRUE) {
- if (palReadPad(IOPORT2, 9) == 0)
- TestThread(&SD2);
+ if (palReadPad(GPIOC, GPIOC_SWITCH_TAMPER) == 0)
+ TestThread(&SD3);
chThdSleepMilliseconds(500);
}
return 0;
diff --git a/demos/ARMCM3-STM32F107-GCC/mcuconf.h b/demos/ARMCM3-STM32F107-GCC/mcuconf.h
index f3e7ad40b..3c741ceb8 100644
--- a/demos/ARMCM3-STM32F107-GCC/mcuconf.h
+++ b/demos/ARMCM3-STM32F107-GCC/mcuconf.h
@@ -94,8 +94,8 @@
* SERIAL driver system settings.
*/
#define STM32_SERIAL_USE_USART1 FALSE
-#define STM32_SERIAL_USE_USART2 TRUE
-#define STM32_SERIAL_USE_USART3 FALSE
+#define STM32_SERIAL_USE_USART2 FALSE
+#define STM32_SERIAL_USE_USART3 TRUE
#define STM32_SERIAL_USE_UART4 FALSE
#define STM32_SERIAL_USE_UART5 FALSE
#define STM32_SERIAL_USART1_PRIORITY 12
@@ -107,9 +107,9 @@
/*
* SPI driver system settings.
*/
-#define STM32_SPI_USE_SPI1 TRUE
-#define STM32_SPI_USE_SPI2 TRUE
-#define STM32_SPI_USE_SPI3 FALSE
+#define STM32_SPI_USE_SPI1 FALSE
+#define STM32_SPI_USE_SPI2 FALSE
+#define STM32_SPI_USE_SPI3 TRUE
#define STM32_SPI_SPI1_DMA_PRIORITY 2
#define STM32_SPI_SPI2_DMA_PRIORITY 2
#define STM32_SPI_SPI3_DMA_PRIORITY 2
diff --git a/demos/ARMCM3-STM32F107-GCC/readme.txt b/demos/ARMCM3-STM32F107-GCC/readme.txt
index 959a23363..f535df8b4 100644
--- a/demos/ARMCM3-STM32F107-GCC/readme.txt
+++ b/demos/ARMCM3-STM32F107-GCC/readme.txt
@@ -4,15 +4,18 @@
** TARGET **
-The demo runs on an ST STM3210C-EVAL board.
+The demo runs on an Olimex STM32-P107 board.
** The Demo **
+The demo flashes the board LED using a thread, by pressing the button located
+on the board the test procedure is activated with output on the serial port
+SD3 (USART3).
** Build Procedure **
-The demo has been tested by using the free Codesourcery GCC-based toolchain,
-YAGARTO and an experimental WinARM build including GCC 4.3.0.
+The demo has been tested by using the free Codesourcery GCC-based toolchain
+and YAGARTO.
Just modify the TRGT line in the makefile in order to use different GCC ports.
** Notes **
diff --git a/docs/reports/STM32F107-72-GCC.txt b/docs/reports/STM32F107-72-GCC.txt
new file mode 100644
index 000000000..884a1b30e
--- /dev/null
+++ b/docs/reports/STM32F107-72-GCC.txt
@@ -0,0 +1,162 @@
+***************************************************************************
+Options: -O2 -fomit-frame-pointer -mabi=apcs-gnu -falign-functions=16
+Settings: SYSCLK=72, ACR=0x12 (2 wait states)
+***************************************************************************
+
+*** ChibiOS/RT test suite
+***
+*** Kernel: 2.3.1unstable
+*** GCC Version: 4.5.2
+*** Architecture: ARMv7-M
+*** Core Variant: Cortex-M3
+*** Platform: STM32 Connectivity Line
+*** Test Board: Olimex STM32-P107
+
+----------------------------------------------------------------------------
+--- Test Case 1.1 (Threads, enqueuing test #1)
+--- Result: SUCCESS
+----------------------------------------------------------------------------
+--- Test Case 1.2 (Threads, enqueuing test #2)
+--- Result: SUCCESS
+----------------------------------------------------------------------------
+--- Test Case 1.3 (Threads, priority change)
+--- Result: SUCCESS
+----------------------------------------------------------------------------
+--- Test Case 1.4 (Threads, delays)
+--- Result: SUCCESS
+----------------------------------------------------------------------------
+--- Test Case 2.1 (Semaphores, enqueuing)
+--- Result: SUCCESS
+----------------------------------------------------------------------------
+--- Test Case 2.2 (Semaphores, timeout)
+--- Result: SUCCESS
+----------------------------------------------------------------------------
+--- 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
+----------------------------------------------------------------------------
+--- Test Case 6.2 (Events, wait and broadcast)
+--- Result: SUCCESS
+----------------------------------------------------------------------------
+--- Test Case 6.3 (Events, timeouts)
+--- Result: SUCCESS
+----------------------------------------------------------------------------
+--- Test Case 7.1 (Heap, allocation and fragmentation test)
+--- Result: SUCCESS
+----------------------------------------------------------------------------
+--- Test Case 8.1 (Memory Pools, queue/dequeue)
+--- Result: SUCCESS
+----------------------------------------------------------------------------
+--- Test Case 9.1 (Dynamic APIs, threads creation from heap)
+--- Result: SUCCESS
+----------------------------------------------------------------------------
+--- Test Case 9.2 (Dynamic APIs, threads creation from memory pool)
+--- Result: SUCCESS
+----------------------------------------------------------------------------
+--- Test Case 9.3 (Dynamic APIs, registry and references)
+--- Result: SUCCESS
+----------------------------------------------------------------------------
+--- Test Case 10.1 (Queues, input queues)
+--- Result: SUCCESS
+----------------------------------------------------------------------------
+--- Test Case 10.2 (Queues, output queues)
+--- Result: SUCCESS
+----------------------------------------------------------------------------
+--- Test Case 11.1 (Benchmark, messages #1)
+--- Score : 249425 msgs/S, 498850 ctxswc/S
+--- Result: SUCCESS
+----------------------------------------------------------------------------
+--- Test Case 11.2 (Benchmark, messages #2)
+--- Score : 198438 msgs/S, 396876 ctxswc/S
+--- Result: SUCCESS
+----------------------------------------------------------------------------
+--- Test Case 11.3 (Benchmark, messages #3)
+--- Score : 198438 msgs/S, 396876 ctxswc/S
+--- Result: SUCCESS
+----------------------------------------------------------------------------
+--- Test Case 11.4 (Benchmark, context switch)
+--- Score : 848888 ctxswc/S
+--- Result: SUCCESS
+----------------------------------------------------------------------------
+--- Test Case 11.5 (Benchmark, threads, full cycle)
+--- Score : 156166 threads/S
+--- Result: SUCCESS
+----------------------------------------------------------------------------
+--- Test Case 11.6 (Benchmark, threads, create only)
+--- Score : 235534 threads/S
+--- Result: SUCCESS
+----------------------------------------------------------------------------
+--- Test Case 11.7 (Benchmark, mass reschedule, 5 threads)
+--- Score : 61032 reschedules/S, 366192 ctxswc/S
+--- Result: SUCCESS
+----------------------------------------------------------------------------
+--- Test Case 11.8 (Benchmark, round robin context switching)
+--- Score : 472600 ctxswc/S
+--- Result: SUCCESS
+----------------------------------------------------------------------------
+--- Test Case 11.9 (Benchmark, I/O Queues throughput)
+--- Score : 474216 bytes/S
+--- Result: SUCCESS
+----------------------------------------------------------------------------
+--- Test Case 11.10 (Benchmark, virtual timers set/reset)
+--- Score : 644340 timers/S
+--- Result: SUCCESS
+----------------------------------------------------------------------------
+--- Test Case 11.11 (Benchmark, semaphores wait/signal)
+--- Score : 787320 wait+signal/S
+--- Result: SUCCESS
+----------------------------------------------------------------------------
+--- Test Case 11.12 (Benchmark, mutexes lock/unlock)
+--- Score : 586488 lock+unlock/S
+--- Result: SUCCESS
+----------------------------------------------------------------------------
+--- Test Case 11.13 (Benchmark, RAM footprint)
+--- System: 360 bytes
+--- Thread: 68 bytes
+--- Timer : 20 bytes
+--- Semaph: 12 bytes
+--- EventS: 4 bytes
+--- EventL: 12 bytes
+--- Mutex : 16 bytes
+--- CondV.: 8 bytes
+--- Queue : 32 bytes
+--- MailB.: 40 bytes
+--- Result: SUCCESS
+----------------------------------------------------------------------------
+
+Final result: SUCCESS
diff --git a/readme.txt b/readme.txt
index 12ed129bf..ddf0b0ceb 100644
--- a/readme.txt
+++ b/readme.txt
@@ -73,9 +73,12 @@
*** 2.3.1 ***
- FIX: Fixed invalid assertion in adcConvert() (bug 3205410)(backported
to 2.2.3).
+- NEW: Added board files for the Olimex STM32-P107.
- NEW: Improved setup packets handling in the USB driver through a specific
callback.
- OPT: Simplified Serial over USB driver configuration.
+- CHANGE: Now the STM32F107 demo targets the board Olimex STM32-P107 as
+ default.
- CHANGE: Removed all the prefixes from the structure/union field names
in the HAL subsystem.