diff options
Diffstat (limited to 'test')
| -rw-r--r-- | test/test.c | 14 | ||||
| -rw-r--r-- | test/test.h | 12 | ||||
| -rw-r--r-- | test/testbmk.c | 4 | ||||
| -rw-r--r-- | test/testdyn.c | 11 | ||||
| -rw-r--r-- | test/testpools.c | 4 |
5 files changed, 24 insertions, 21 deletions
diff --git a/test/test.c b/test/test.c index 58cad43c3..0750a0d80 100644 --- a/test/test.c +++ b/test/test.c @@ -322,19 +322,19 @@ msg_t TestThread(void *p) { test_println(CH_KERNEL_VERSION);
test_print("*** Compiled: ");
test_println(__DATE__ " - " __TIME__);
-#ifdef CH_COMPILER_NAME
+#ifdef PORT_COMPILER_NAME
test_print("*** Compiler: ");
- test_println(CH_COMPILER_NAME);
+ test_println(PORT_COMPILER_NAME);
#endif
test_print("*** Architecture: ");
- test_println(CH_ARCHITECTURE_NAME);
-#ifdef CH_CORE_VARIANT_NAME
+ test_println(PORT_ARCHITECTURE_NAME);
+#ifdef PORT_CORE_VARIANT_NAME
test_print("*** Core Variant: ");
- test_println(CH_CORE_VARIANT_NAME);
+ test_println(PORT_CORE_VARIANT_NAME);
#endif
-#ifdef CH_PORT_INFO
+#ifdef PORT_INFO
test_print("*** Port Info: ");
- test_println(CH_PORT_INFO);
+ test_println(PORT_INFO);
#endif
#ifdef PLATFORM_NAME
test_print("*** Platform: ");
diff --git a/test/test.h b/test/test.h index 1088d0517..1b40a48e0 100644 --- a/test/test.h +++ b/test/test.h @@ -51,7 +51,7 @@ #else
#define THREADS_STACK_SIZE 128
#endif
-#define WA_SIZE THD_WA_SIZE(THREADS_STACK_SIZE)
+#define WA_SIZE THD_WORKING_AREA_SIZE(THREADS_STACK_SIZE)
/**
* @brief Structure representing a test case.
@@ -66,11 +66,11 @@ struct testcase { #ifndef __DOXYGEN__
union test_buffers {
struct {
- WORKING_AREA(T0, THREADS_STACK_SIZE);
- WORKING_AREA(T1, THREADS_STACK_SIZE);
- WORKING_AREA(T2, THREADS_STACK_SIZE);
- WORKING_AREA(T3, THREADS_STACK_SIZE);
- WORKING_AREA(T4, THREADS_STACK_SIZE);
+ THD_WORKING_AREA(T0, THREADS_STACK_SIZE);
+ THD_WORKING_AREA(T1, THREADS_STACK_SIZE);
+ THD_WORKING_AREA(T2, THREADS_STACK_SIZE);
+ THD_WORKING_AREA(T3, THREADS_STACK_SIZE);
+ THD_WORKING_AREA(T4, THREADS_STACK_SIZE);
} wa;
uint8_t buffer[WA_SIZE * 5];
};
diff --git a/test/testbmk.c b/test/testbmk.c index 551a001a1..2a3b7c1b5 100644 --- a/test/testbmk.c +++ b/test/testbmk.c @@ -637,10 +637,10 @@ static void bmk13_execute(void) { test_print("--- System: ");
test_printn(sizeof(ready_list_t) + sizeof(virtual_timers_list_t) +
- CH_PORT_IDLE_THREAD_STACK_SIZE +
+ PORT_IDLE_THREAD_STACK_SIZE +
(sizeof(thread_t) + sizeof(struct port_intctx) +
sizeof(struct port_extctx) +
- CH_PORT_INT_REQUIRED_STACK) * 2);
+ PORT_INT_REQUIRED_STACK) * 2);
test_println(" bytes");
test_print("--- Thread: ");
test_printn(sizeof(thread_t));
diff --git a/test/testdyn.c b/test/testdyn.c index cd73e73ce..bf9f127a0 100644 --- a/test/testdyn.c +++ b/test/testdyn.c @@ -87,14 +87,17 @@ static void dyn1_execute(void) { (void)chHeapStatus(&heap1, &sz);
/* Starting threads from the heap. */
- threads[0] = chThdCreateFromHeap(&heap1, THD_WA_SIZE(THREADS_STACK_SIZE),
+ threads[0] = chThdCreateFromHeap(&heap1,
+ THD_WORKING_AREA_SIZE(THREADS_STACK_SIZE),
prio-1, thread, "A");
- threads[1] = chThdCreateFromHeap(&heap1, THD_WA_SIZE(THREADS_STACK_SIZE),
+ threads[1] = chThdCreateFromHeap(&heap1,
+ THD_WORKING_AREA_SIZE(THREADS_STACK_SIZE),
prio-2, thread, "B");
/* Allocating the whole heap in order to make the thread creation fail.*/
(void)chHeapStatus(&heap1, &n);
p1 = chHeapAlloc(&heap1, n);
- threads[2] = chThdCreateFromHeap(&heap1, THD_WA_SIZE(THREADS_STACK_SIZE),
+ threads[2] = chThdCreateFromHeap(&heap1,
+ THD_WORKING_AREA_SIZE(THREADS_STACK_SIZE),
prio-3, thread, "C");
chHeapFree(p1);
@@ -135,7 +138,7 @@ ROMCONST struct testcase testdyn1 = { static void dyn2_setup(void) {
- chPoolObjectInit(&mp1, THD_WA_SIZE(THREADS_STACK_SIZE), NULL);
+ chPoolObjectInit(&mp1, THD_WORKING_AREA_SIZE(THREADS_STACK_SIZE), NULL);
}
static void dyn2_execute(void) {
diff --git a/test/testpools.c b/test/testpools.c index 18063e111..3037846ea 100644 --- a/test/testpools.c +++ b/test/testpools.c @@ -46,7 +46,7 @@ #if CH_CFG_USE_MEMPOOLS || defined(__DOXYGEN__)
-static MEMORYPOOL_DECL(mp1, THD_WA_SIZE(THREADS_STACK_SIZE), NULL);
+static MEMORYPOOL_DECL(mp1, THD_WORKING_AREA_SIZE(THREADS_STACK_SIZE), NULL);
/**
* @page test_pools_001 Allocation and enqueuing test
@@ -65,7 +65,7 @@ static void *null_provider(size_t size) { static void pools1_setup(void) {
- chPoolObjectInit(&mp1, THD_WA_SIZE(THREADS_STACK_SIZE), NULL);
+ chPoolObjectInit(&mp1, THD_WORKING_AREA_SIZE(THREADS_STACK_SIZE), NULL);
}
static void pools1_execute(void) {
|