diff options
Diffstat (limited to 'tests/runtime_services/trusted_os/tsp/test_smc_tsp_std_fn_call.c')
| -rw-r--r-- | tests/runtime_services/trusted_os/tsp/test_smc_tsp_std_fn_call.c | 18 |
1 files changed, 10 insertions, 8 deletions
diff --git a/tests/runtime_services/trusted_os/tsp/test_smc_tsp_std_fn_call.c b/tests/runtime_services/trusted_os/tsp/test_smc_tsp_std_fn_call.c index dec1107..80854d7 100644 --- a/tests/runtime_services/trusted_os/tsp/test_smc_tsp_std_fn_call.c +++ b/tests/runtime_services/trusted_os/tsp/test_smc_tsp_std_fn_call.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2014, ARM Limited and Contributors. All rights reserved. + * Copyright (c) 2014-2016, ARM Limited and Contributors. All rights reserved. * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions are met: @@ -49,8 +49,8 @@ */ test_result_t test_smc_tsp_std_fns_call(void) { - smc64_args std_svc_args; - smc64_ret_values ret; + smc_args std_svc_args; + smc_ret_values ret; uuid_t tos_uuid; char tos_uuid_str[UUID_STR_SIZE]; @@ -68,22 +68,24 @@ test_result_t test_smc_tsp_std_fns_call(void) /* TrustedOS Service Call Count */ std_svc_args.arg0 = SMC_TOS_CALL_COUNT; - ret = tftf_smc64(&std_svc_args); + ret = tftf_smc(&std_svc_args); if (ret.ret0 != TSP_NUM_FID) { tftf_testcase_printf("Wrong Call Count: expected %u,\n" - " got %lu\n", TSP_NUM_FID, ret.ret0); + " got %llu\n", TSP_NUM_FID, + (unsigned long long)ret.ret0); return TEST_RESULT_FAIL; } /* TrustedOS Service Call Revision details */ std_svc_args.arg0 = SMC_TOS_REVISION; - ret = tftf_smc64(&std_svc_args); + ret = tftf_smc(&std_svc_args); if ((ret.ret0 != TSP_REVISION_MAJOR) || ret.ret1 != TSP_REVISION_MINOR) { tftf_testcase_printf("Wrong Revision: expected {%u.%u}\n" - " got {%lu.%lu}\n", + " got {%llu.%llu}\n", TSP_REVISION_MAJOR, TSP_REVISION_MINOR, - ret.ret0, ret.ret1); + (unsigned long long)ret.ret0, + (unsigned long long)ret.ret1); return TEST_RESULT_FAIL; } |