From e1dad060c325f0c78246b43eaa2b00dbe208e5ce Mon Sep 17 00:00:00 2001 From: Benjamin Walsh Date: Fri, 26 Aug 2016 16:32:31 -0400 Subject: [PATCH] tests/crypto: rename MICROKERNEL entry from 'mainloop' to 'main' Microkernels now support 'main' as a task entry point. Change-Id: I39b07c191a98748191536ade6f87ec02da064bf1 Signed-off-by: Benjamin Walsh --- tests/crypto/test_aes/prj.mdef | 2 +- tests/crypto/test_aes/src/test_aes.c | 4 ---- tests/crypto/test_cbc/README.txt | 2 +- tests/crypto/test_cbc/prj.mdef | 2 +- tests/crypto/test_cbc/src/test_cbc_mode.c | 4 ---- tests/crypto/test_ccm_mode/README.txt | 2 +- tests/crypto/test_ccm_mode/prj.mdef | 2 +- tests/crypto/test_ccm_mode/src/test_ccm_mode.c | 6 +----- tests/crypto/test_cmac_mode/README.txt | 2 +- tests/crypto/test_cmac_mode/prj.mdef | 2 +- tests/crypto/test_cmac_mode/src/test_cmac_mode.c | 6 +----- tests/crypto/test_ctr/README.txt | 2 +- tests/crypto/test_ctr/prj.mdef | 2 +- tests/crypto/test_ctr/src/test_ctr_mode.c | 4 ---- tests/crypto/test_hmac/README.txt | 2 +- tests/crypto/test_hmac/prj.mdef | 2 +- tests/crypto/test_hmac/src/test_hmac.c | 4 ---- tests/crypto/test_prng/README.txt | 8 ++++---- tests/crypto/test_prng/prj.mdef | 2 +- tests/crypto/test_prng/src/test_hmac_prng.c | 4 ---- tests/crypto/test_sha256/README.txt | 2 +- tests/crypto/test_sha256/prj.mdef | 2 +- tests/crypto/test_sha256/src/test_sha256.c | 4 ---- 23 files changed, 20 insertions(+), 52 deletions(-) diff --git a/tests/crypto/test_aes/prj.mdef b/tests/crypto/test_aes/prj.mdef index d657d188892..8cfab864c8b 100644 --- a/tests/crypto/test_aes/prj.mdef +++ b/tests/crypto/test_aes/prj.mdef @@ -2,4 +2,4 @@ % TASK NAME PRIO ENTRY STACK GROUPS % ==================================================== - TASK tStartTask 7 mainloop 5120 [EXE] + TASK tStartTask 7 main 5120 [EXE] diff --git a/tests/crypto/test_aes/src/test_aes.c b/tests/crypto/test_aes/src/test_aes.c index 34b04c850f7..ed81037ec4d 100644 --- a/tests/crypto/test_aes/src/test_aes.c +++ b/tests/crypto/test_aes/src/test_aes.c @@ -2036,11 +2036,7 @@ uint32_t test_4(void) * Main task to test AES */ -#ifdef CONFIG_MICROKERNEL -void mainloop(void) -#else void main(void) -#endif { uint32_t result = TC_PASS; diff --git a/tests/crypto/test_cbc/README.txt b/tests/crypto/test_cbc/README.txt index 9a97023318c..b4c3d3805ae 100644 --- a/tests/crypto/test_cbc/README.txt +++ b/tests/crypto/test_cbc/README.txt @@ -38,6 +38,6 @@ CBC test #2 (decryption SP 800-38a tests): PASS - test_1_and_2. All CBC tests succeeded! =================================================================== -PASS - mainloop. +PASS - main. =================================================================== PROJECT EXECUTION SUCCESSFUL diff --git a/tests/crypto/test_cbc/prj.mdef b/tests/crypto/test_cbc/prj.mdef index c99932bb3ea..1a068c9d2d7 100644 --- a/tests/crypto/test_cbc/prj.mdef +++ b/tests/crypto/test_cbc/prj.mdef @@ -2,4 +2,4 @@ % TASK NAME PRIO ENTRY STACK GROUPS % ==================================================== - TASK tStartTask 5 mainloop 1024 [EXE] + TASK tStartTask 5 main 1024 [EXE] diff --git a/tests/crypto/test_cbc/src/test_cbc_mode.c b/tests/crypto/test_cbc/src/test_cbc_mode.c index 8a42d53d36c..f2631d010ca 100644 --- a/tests/crypto/test_cbc/src/test_cbc_mode.c +++ b/tests/crypto/test_cbc/src/test_cbc_mode.c @@ -151,11 +151,7 @@ uint32_t test_1_and_2(void) * Main task to test AES */ -#ifdef CONFIG_MICROKERNEL -void mainloop(void) -#else void main(void) -#endif { uint32_t result = TC_PASS; diff --git a/tests/crypto/test_ccm_mode/README.txt b/tests/crypto/test_ccm_mode/README.txt index b8afa44702a..65a34721d26 100644 --- a/tests/crypto/test_ccm_mode/README.txt +++ b/tests/crypto/test_ccm_mode/README.txt @@ -55,6 +55,6 @@ Performing CCM test #8 (no payload data): PASS - test_vector_8. All CCM tests succeeded! =================================================================== -PASS - mainloop. +PASS - main. =================================================================== PROJECT EXECUTION SUCCESSFUL diff --git a/tests/crypto/test_ccm_mode/prj.mdef b/tests/crypto/test_ccm_mode/prj.mdef index 3ca375d099c..577133057ca 100644 --- a/tests/crypto/test_ccm_mode/prj.mdef +++ b/tests/crypto/test_ccm_mode/prj.mdef @@ -2,4 +2,4 @@ % TASK NAME PRIO ENTRY STACK GROUPS % ==================================================== - TASK tStartTask 5 mainloop 1024 [EXE] + TASK tStartTask 5 main 1024 [EXE] diff --git a/tests/crypto/test_ccm_mode/src/test_ccm_mode.c b/tests/crypto/test_ccm_mode/src/test_ccm_mode.c index 6646c83170a..bc9c8a76d71 100644 --- a/tests/crypto/test_ccm_mode/src/test_ccm_mode.c +++ b/tests/crypto/test_ccm_mode/src/test_ccm_mode.c @@ -450,11 +450,7 @@ exitTest1: * Main task to test CCM */ -#ifdef CONFIG_MICROKERNEL -void mainloop(void) -#else - void main(void) -#endif +void main(void) { uint32_t result = TC_PASS; diff --git a/tests/crypto/test_cmac_mode/README.txt b/tests/crypto/test_cmac_mode/README.txt index a046c588c29..dc761522c3f 100644 --- a/tests/crypto/test_cmac_mode/README.txt +++ b/tests/crypto/test_cmac_mode/README.txt @@ -46,6 +46,6 @@ Performing CMAC test #5 (SP 800-38B test vector #4) PASS - verify_cmac_512_bit_msg. All CMAC tests succeeded! =================================================================== -PASS - mainloop. +PASS - main. =================================================================== PROJECT EXECUTION SUCCESSFUL diff --git a/tests/crypto/test_cmac_mode/prj.mdef b/tests/crypto/test_cmac_mode/prj.mdef index 1d5653ca626..2b504204cbc 100644 --- a/tests/crypto/test_cmac_mode/prj.mdef +++ b/tests/crypto/test_cmac_mode/prj.mdef @@ -2,4 +2,4 @@ % TASK NAME PRIO ENTRY STACK GROUPS % ==================================================== - TASK tStartTask 5 mainloop 1024 [EXE] + TASK tStartTask 5 main 1024 [EXE] diff --git a/tests/crypto/test_cmac_mode/src/test_cmac_mode.c b/tests/crypto/test_cmac_mode/src/test_cmac_mode.c index 4ea6214cc27..6f65e9aabad 100644 --- a/tests/crypto/test_cmac_mode/src/test_cmac_mode.c +++ b/tests/crypto/test_cmac_mode/src/test_cmac_mode.c @@ -250,11 +250,7 @@ static uint32_t verify_cmac_512_bit_msg(TCCmacState_t s) * Main task to test CMAC */ -#ifdef CONFIG_MICROKERNEL -void mainloop(void) -#else - void main(void) -#endif +void main(void) { uint32_t result = TC_PASS; diff --git a/tests/crypto/test_ctr/README.txt b/tests/crypto/test_ctr/README.txt index bf18dc9ef91..6fda5b7818b 100644 --- a/tests/crypto/test_ctr/README.txt +++ b/tests/crypto/test_ctr/README.txt @@ -38,6 +38,6 @@ CTR test #2 (decryption SP 800-38a tests): PASS - test_1_and_2. All CTR tests succeeded! =================================================================== -PASS - mainloop. +PASS - main. =================================================================== PROJECT EXECUTION SUCCESSFUL diff --git a/tests/crypto/test_ctr/prj.mdef b/tests/crypto/test_ctr/prj.mdef index 46959cc826c..a416288841e 100644 --- a/tests/crypto/test_ctr/prj.mdef +++ b/tests/crypto/test_ctr/prj.mdef @@ -2,4 +2,4 @@ % TASK NAME PRIO ENTRY STACK GROUPS % ==================================================== - TASK tStartTask 5 mainloop 1024 [EXE] + TASK tStartTask 5 main 1024 [EXE] diff --git a/tests/crypto/test_ctr/src/test_ctr_mode.c b/tests/crypto/test_ctr/src/test_ctr_mode.c index d49874a7b64..e6e02d50602 100644 --- a/tests/crypto/test_ctr/src/test_ctr_mode.c +++ b/tests/crypto/test_ctr/src/test_ctr_mode.c @@ -116,11 +116,7 @@ uint32_t test_1_and_2(void) * Main task to test AES */ -#ifdef CONFIG_MICROKERNEL -void mainloop(void) -#else void main(void) -#endif { uint32_t result = TC_PASS; diff --git a/tests/crypto/test_hmac/README.txt b/tests/crypto/test_hmac/README.txt index 3c19225e52d..5e861010b96 100644 --- a/tests/crypto/test_hmac/README.txt +++ b/tests/crypto/test_hmac/README.txt @@ -52,6 +52,6 @@ HMAC test_7: PASS - test_7. All HMAC tests succeeded! =================================================================== -PASS - mainloop. +PASS - main. =================================================================== PROJECT EXECUTION SUCCESSFUL diff --git a/tests/crypto/test_hmac/prj.mdef b/tests/crypto/test_hmac/prj.mdef index d829c2b365c..5d1fb077aad 100644 --- a/tests/crypto/test_hmac/prj.mdef +++ b/tests/crypto/test_hmac/prj.mdef @@ -2,4 +2,4 @@ % TASK NAME PRIO ENTRY STACK GROUPS % ==================================================== - TASK tStartTask 5 mainloop 10240 [EXE] + TASK tStartTask 5 main 10240 [EXE] diff --git a/tests/crypto/test_hmac/src/test_hmac.c b/tests/crypto/test_hmac/src/test_hmac.c index 2a110a2ef90..00d5595ae15 100644 --- a/tests/crypto/test_hmac/src/test_hmac.c +++ b/tests/crypto/test_hmac/src/test_hmac.c @@ -304,11 +304,7 @@ uint32_t test_7(void) /* * Main task to test AES */ -#ifdef CONFIG_MICROKERNEL -void mainloop(void) -#else void main(void) -#endif { uint32_t result = TC_PASS; diff --git a/tests/crypto/test_prng/README.txt b/tests/crypto/test_prng/README.txt index 7a52c64c501..8b06cea5977 100644 --- a/tests/crypto/test_prng/README.txt +++ b/tests/crypto/test_prng/README.txt @@ -32,15 +32,15 @@ tc_start() - Performing HMAC-PRNG tests: HMAC-PRNG test#1 (init, reseed, generate): HMAC-PRNG test#1 (init): =================================================================== -PASS - mainloop. +PASS - main. HMAC-PRNG test#1 (reseed): =================================================================== -PASS - mainloop. +PASS - main. HMAC-PRNG test#1 (generate): =================================================================== -PASS - mainloop. +PASS - main. All HMAC tests succeeded! =================================================================== -PASS - mainloop. +PASS - main. =================================================================== PROJECT EXECUTION SUCCESSFUL diff --git a/tests/crypto/test_prng/prj.mdef b/tests/crypto/test_prng/prj.mdef index 003b5ccb544..75e7ebc6e23 100644 --- a/tests/crypto/test_prng/prj.mdef +++ b/tests/crypto/test_prng/prj.mdef @@ -2,4 +2,4 @@ % TASK NAME PRIO ENTRY STACK GROUPS % ==================================================== - TASK tStartTask 5 mainloop 51200 [EXE] + TASK tStartTask 5 main 51200 [EXE] diff --git a/tests/crypto/test_prng/src/test_hmac_prng.c b/tests/crypto/test_prng/src/test_hmac_prng.c index 795c092437d..c4118fd9423 100644 --- a/tests/crypto/test_prng/src/test_hmac_prng.c +++ b/tests/crypto/test_prng/src/test_hmac_prng.c @@ -51,11 +51,7 @@ * Main task to test AES */ -#ifdef CONFIG_MICROKERNEL -void mainloop(void) -#else void main(void) -#endif { uint8_t seed[128]; struct tc_hmac_prng_struct h; diff --git a/tests/crypto/test_sha256/README.txt b/tests/crypto/test_sha256/README.txt index be11b42106c..15bcb1c5826 100644 --- a/tests/crypto/test_sha256/README.txt +++ b/tests/crypto/test_sha256/README.txt @@ -73,7 +73,7 @@ SHA256 test #14: PASS - test_14. All SHA256 tests succeeded! =================================================================== -PASS - mainloop. +PASS - main. =================================================================== PROJECT EXECUTION SUCCESSFUL diff --git a/tests/crypto/test_sha256/prj.mdef b/tests/crypto/test_sha256/prj.mdef index cd0e5812d92..f4b62cc882c 100644 --- a/tests/crypto/test_sha256/prj.mdef +++ b/tests/crypto/test_sha256/prj.mdef @@ -2,4 +2,4 @@ % TASK NAME PRIO ENTRY STACK GROUPS % ==================================================== - TASK tStartTask 5 mainloop 40960 [EXE] + TASK tStartTask 5 main 40960 [EXE] diff --git a/tests/crypto/test_sha256/src/test_sha256.c b/tests/crypto/test_sha256/src/test_sha256.c index 271f7ec5514..54dd5dcbfab 100644 --- a/tests/crypto/test_sha256/src/test_sha256.c +++ b/tests/crypto/test_sha256/src/test_sha256.c @@ -421,11 +421,7 @@ uint32_t test_14(void) * Main task to test AES */ -#ifdef CONFIG_MICROKERNEL -void mainloop(void) -#else void main(void) -#endif { uint32_t result = TC_PASS;