diff options
Diffstat (limited to 'tests/runtime_services/standard_service/query_std_svc.c')
| -rw-r--r-- | tests/runtime_services/standard_service/query_std_svc.c | 19 |
1 files changed, 10 insertions, 9 deletions
diff --git a/tests/runtime_services/standard_service/query_std_svc.c b/tests/runtime_services/standard_service/query_std_svc.c index d08c000..a9082e1 100644 --- a/tests/runtime_services/standard_service/query_std_svc.c +++ b/tests/runtime_services/standard_service/query_std_svc.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: @@ -58,15 +58,15 @@ static const uuid_t armtf_std_svc_uuid = { */ test_result_t test_query_std_svc(void) { - smc64_args std_svc_args; - smc64_ret_values ret; + smc_args std_svc_args; + smc_ret_values ret; uuid_t std_svc_uuid; char uuid_str[UUID_STR_SIZE]; test_result_t test_result = TEST_RESULT_SUCCESS; /* Standard Service Call UID */ std_svc_args.arg0 = SMC_STD_SVC_UID; - ret = tftf_smc64(&std_svc_args); + ret = tftf_smc(&std_svc_args); make_uuid_from_4words(&std_svc_uuid, ret.ret0, ret.ret1, ret.ret2, ret.ret3); @@ -80,7 +80,7 @@ test_result_t test_query_std_svc(void) /* Standard Service Call Count */ std_svc_args.arg0 = SMC_STD_SVC_CALL_COUNT; - ret = tftf_smc64(&std_svc_args); + ret = tftf_smc(&std_svc_args); if (ret.ret0 == SMC_UNKNOWN) { tftf_testcase_printf("Querying STD service call count" @@ -88,19 +88,20 @@ test_result_t test_query_std_svc(void) test_result = TEST_RESULT_FAIL; } else { tftf_testcase_printf("STD Service Call Count reported by firmware:" - " %lu\n", ret.ret0); + " %llu\n", (unsigned long long)ret.ret0); } /* Standard Service Call Revision details */ std_svc_args.arg0 = SMC_STD_SVC_REVISION; - ret = tftf_smc64(&std_svc_args); + ret = tftf_smc(&std_svc_args); if ((ret.ret0 != STD_SVC_REVISION_MAJOR) || (ret.ret1 != STD_SVC_REVISION_MINOR)) { tftf_testcase_printf( - "Wrong Revision: expected {%u.%u}, got {%lu.%lu}\n", + "Wrong Revision: expected {%u.%u}, got {%llu.%llu}\n", STD_SVC_REVISION_MAJOR, STD_SVC_REVISION_MINOR, - ret.ret0, ret.ret1); + (unsigned long long)ret.ret0, + (unsigned long long)ret.ret1); test_result = TEST_RESULT_FAIL; } |