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

2 files changed, 160 insertions, 4 deletions

diff --git a/docs/reports/LPC1114-48.txt b/docs/reports/LPC1114-48.txt
new file mode 100644
index 000000000..444b7db1b
--- /dev/null
+++ b/docs/reports/LPC1114-48.txt
@@ -0,0 +1,156 @@
+***************************************************************************

+Options:  -O2 -fomit-frame-pointer -mabi=apcs-gnu -falign-functions=16

+Settings: CCLK=48, MAMCR=2, MAMTIM=3 (3 wait states)

+***************************************************************************

+

+*** ChibiOS/RT test suite

+***

+*** Kernel:       1.5.4unstable

+*** GCC Version:  4.3.3

+*** Architecture: ARMv6-M

+*** Core Variant: Cortex-M0

+*** Platform:     LPC111x

+*** Test Board:   Embedded Artists LPCXpresso Base Board + LPC1114

+

+----------------------------------------------------------------------------

+--- 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 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 10.1 (Queues, input queues)

+--- Result: SUCCESS

+----------------------------------------------------------------------------

+--- Test Case 10.2 (Queues, output queues)

+--- Result: SUCCESS

+----------------------------------------------------------------------------

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

+--- Score : 125437 msgs/S, 250874 ctxswc/S

+--- Result: SUCCESS

+----------------------------------------------------------------------------

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

+--- Score : 102120 msgs/S, 204240 ctxswc/S

+--- Result: SUCCESS

+----------------------------------------------------------------------------

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

+--- Score : 102120 msgs/S, 204240 ctxswc/S

+--- Result: SUCCESS

+----------------------------------------------------------------------------

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

+--- Score : 384256 ctxswc/S

+--- Result: SUCCESS

+----------------------------------------------------------------------------

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

+--- Score : 78221 threads/S

+--- Result: SUCCESS

+----------------------------------------------------------------------------

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

+--- Score : 105736 threads/S

+--- Result: SUCCESS

+----------------------------------------------------------------------------

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

+--- Score : 31756 reschedules/S, 190536 ctxswc/S

+--- Result: SUCCESS

+----------------------------------------------------------------------------

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

+--- Score : 238060 ctxswc/S

+--- Result: SUCCESS

+----------------------------------------------------------------------------

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

+--- Score : 316568 bytes/S

+--- Result: SUCCESS

+----------------------------------------------------------------------------

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

+--- Score : 355402 timers/S

+--- Result: SUCCESS

+----------------------------------------------------------------------------

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

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

+--- Result: SUCCESS

+----------------------------------------------------------------------------

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

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

+--- Result: SUCCESS

+----------------------------------------------------------------------------

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

+--- System: 340 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/os/hal/platforms/LPC111x/serial_lld.c b/os/hal/platforms/LPC111x/serial_lld.c
index 7ef7608e3..e77a47bb2 100644
--- a/os/hal/platforms/LPC111x/serial_lld.c
+++ b/os/hal/platforms/LPC111x/serial_lld.c
@@ -233,8 +233,8 @@ void sd_lld_init(void) {
 #if USE_LPC111x_UART0

   sdObjectInit(&SD1, NULL, notify1);

   SD1.uart = LPC_UART;

-  LPC_IOCON->PIO0_6 = 0xC1;                 /* RDX without resistors.       */

-  LPC_IOCON->PIO0_7 = 0xC1;                 /* TDX without resistors.       */

+  LPC_IOCON->PIO1_6 = 0xC1;                 /* RDX without resistors.       */

+  LPC_IOCON->PIO1_7 = 0xC1;                 /* TDX without resistors.       */

 #endif

 }

 

@@ -251,7 +251,7 @@ void sd_lld_start(SerialDriver *sdp) {
   if (sdp->state == SD_STOP) {

 #if USE_LPC111x_UART0

     if (&SD1 == sdp) {

-      LPC_SYSCON->SYSAHBCLKCTRL |= (1 << 11);

+      LPC_SYSCON->SYSAHBCLKCTRL |= (1 << 12);

       NVICEnableVector(UART_IRQn,

                        CORTEX_PRIORITY_MASK(LPC111x_UART0_PRIORITY));

     }

@@ -273,7 +273,7 @@ void sd_lld_stop(SerialDriver *sdp) {
     uart_deinit(sdp->uart);

 #if USE_LPC111x_UART0

     if (&SD1 == sdp) {

-      LPC_SYSCON->SYSAHBCLKCTRL &= ~(1 << 11);

+      LPC_SYSCON->SYSAHBCLKCTRL &= ~(1 << 12);

       NVICDisableVector(UART_IRQn);

       return;

     }