aboutsummaryrefslogtreecommitdiff
path: root/test
diff options
context:
space:
mode:
authorTTornblom <thomas.tornblom@iar.com>2019-11-19 12:53:16 +0100
committerKen Liu <ken.liu@arm.com>2020-04-20 01:51:47 +0000
commit83d9637fa26444736c06c1486c00cf63d5111525 (patch)
tree99d18f127623c2c286c5f0ebef7131fa582bcfa6 /test
parent344c29385ae223ac4253fb65ff156ce0da5b5ad3 (diff)
downloadtrusted-firmware-m-83d9637fa26444736c06c1486c00cf63d5111525.tar.gz
Build: Update to IAR support
Cleaned up #ifdef in secure_fw/services/tfm_spm_db.inc.template Moved "signals" member to front of spm_partition_runtime_data_t. The suggestion to move the aggregate types to the front turned out to be hard to make work for both PSA and non-PSA configs. Moved REGION_DECLARE macros to new include file, platform/include/region.h. Cleaned up type cast in core_test_api.c Change-Id: I5dce1e7c019d4d7e4c14dc79be5ee2b855ad4f9e Signed-off-by: Thomas Tornblom <thomas.tornblom@iar.com>
Diffstat (limited to 'test')
-rw-r--r--test/suites/core/non_secure/core_test_api.c12
-rw-r--r--test/suites/core/non_secure/core_test_api.h4
2 files changed, 8 insertions, 8 deletions
diff --git a/test/suites/core/non_secure/core_test_api.c b/test/suites/core/non_secure/core_test_api.c
index 05c9a77673..b49af5d06e 100644
--- a/test/suites/core/non_secure/core_test_api.c
+++ b/test/suites/core/non_secure/core_test_api.c
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2017-2018, Arm Limited. All rights reserved.
+ * Copyright (c) 2017-2020, Arm Limited. All rights reserved.
*
* SPDX-License-Identifier: BSD-3-Clause
*
@@ -8,10 +8,10 @@
#include "core_test_api.h"
#include "test/test_services/tfm_core_test/core_test_defs.h"
-int32_t tfm_core_test_call(void *fn_ptr, struct tfm_core_test_call_args_t *args)
+int32_t tfm_core_test_call(int32_t (*fn_ptr)(struct psa_invec*, size_t,
+ struct psa_outvec*, size_t),
+ struct tfm_core_test_call_args_t *args)
{
- int32_t (*fn_ptr_to_call)(struct psa_invec*, size_t,
- struct psa_outvec*, size_t) = fn_ptr;
- return fn_ptr_to_call(args->in_vec, args->in_len,
- args->out_vec, args->out_len);
+ return fn_ptr(args->in_vec, args->in_len,
+ args->out_vec, args->out_len);
}
diff --git a/test/suites/core/non_secure/core_test_api.h b/test/suites/core/non_secure/core_test_api.h
index 0f8331118a..eaa8b44f3a 100644
--- a/test/suites/core/non_secure/core_test_api.h
+++ b/test/suites/core/non_secure/core_test_api.h
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2017-2018, Arm Limited. All rights reserved.
+ * Copyright (c) 2017-2020, Arm Limited. All rights reserved.
*
* SPDX-License-Identifier: BSD-3-Clause
*
@@ -34,7 +34,7 @@ struct tfm_core_test_call_args_t {
*
* \return Returns value depending on fn_ptr.
*/
-int32_t tfm_core_test_call(void *fn_ptr,
+int32_t tfm_core_test_call(int32_t (*fn_ptr)(),
struct tfm_core_test_call_args_t *args);
#ifdef __cplusplus