First cleanup pass finished, queues and streams not yet removed.

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

5 files changed, 11 insertions, 11 deletions

diff --git a/test/testbmk.c b/test/testbmk.c
index 957f634ac..e117d9120 100644
--- a/test/testbmk.c
+++ b/test/testbmk.c
@@ -58,7 +58,7 @@
 

 static semaphore_t sem1;

 #if CH_USE_MUTEXES || defined(__DOXYGEN__)

-static Mutex mtx1;

+static mutex_t mtx1;

 #endif

 

 static msg_t thread1(void *p) {

@@ -650,15 +650,15 @@ static void bmk13_execute(void) {
   test_println(" bytes");

 #if CH_USE_EVENTS || defined(__DOXYGEN__)

   test_print("--- EventS: ");

-  test_printn(sizeof(EventSource));

+  test_printn(sizeof(event_source_t));

   test_println(" bytes");

   test_print("--- EventL: ");

-  test_printn(sizeof(EventListener));

+  test_printn(sizeof(event_listener_t));

   test_println(" bytes");

 #endif

 #if CH_USE_MUTEXES || defined(__DOXYGEN__)

   test_print("--- Mutex : ");

-  test_printn(sizeof(Mutex));

+  test_printn(sizeof(mutex_t));

   test_println(" bytes");

 #endif

 #if CH_USE_CONDVARS || defined(__DOXYGEN__)

@@ -673,7 +673,7 @@ static void bmk13_execute(void) {
 #endif

 #if CH_USE_MAILBOXES || defined(__DOXYGEN__)

   test_print("--- MailB.: ");

-  test_printn(sizeof(Mailbox));

+  test_printn(sizeof(mailbox_t));

   test_println(" bytes");

 #endif

 }

diff --git a/test/testdyn.c b/test/testdyn.c
index ebfb00a4b..15664ee07 100644
--- a/test/testdyn.c
+++ b/test/testdyn.c
@@ -51,10 +51,10 @@
 

 #if CH_USE_DYNAMIC || defined(__DOXYGEN__)

 #if (CH_USE_HEAP && !CH_USE_MALLOC_HEAP) || defined(__DOXYGEN__)

-static MemoryHeap heap1;

+static memory_heap_t heap1;

 #endif

 #if CH_USE_MEMPOOLS || defined(__DOXYGEN__)

-static MemoryPool mp1;

+static memory_pool_t mp1;

 #endif

 

 /**

diff --git a/test/testevt.c b/test/testevt.c
index 5daa7f1e3..188a6fe2e 100644
--- a/test/testevt.c
+++ b/test/testevt.c
@@ -83,7 +83,7 @@ static void h3(eventid_t id) {(void)id;test_emit_token('C');}
 static ROMCONST evhandler_t evhndl[] = {h1, h2, h3};

 

 static void evt1_execute(void) {

-  EventListener el1, el2;

+  event_listener_t el1, el2;

 

   /*

    * Testing chEvtRegisterMask() and chEvtUnregister().

@@ -148,7 +148,7 @@ static msg_t thread2(void *p) {
 

 static void evt2_execute(void) {

   eventmask_t m;

-  EventListener el1, el2;

+  event_listener_t el1, el2;

   systime_t target_time;

 

   /*

diff --git a/test/testheap.c b/test/testheap.c
index 9baa95d82..e160143aa 100644
--- a/test/testheap.c
+++ b/test/testheap.c
@@ -48,7 +48,7 @@
 

 #define SIZE 16

 

-static MemoryHeap test_heap;

+static memory_heap_t test_heap;

 

 /**

  * @page test_heap_001 Allocation and fragmentation test

diff --git a/test/testmbox.c b/test/testmbox.c
index b1fe675cc..35a22b88c 100644
--- a/test/testmbox.c
+++ b/test/testmbox.c
@@ -155,7 +155,7 @@ static void mbox1_execute(void) {
   /*

    * Testing I-Class.

    */

-  chSysLock()

+  chSysLock();

   msg1 = chMBPostI(&mb1, 'A');

   test_assert(22, msg1 == RDY_OK, "wrong wake-up message");

   msg1 = chMBPostI(&mb1, 'B');