commit ca95c48e35246a8112b3ad7473899e35cf04a903
author Hugues de Valon <hugues.devalon@arm.com> Tue Jun 18 16:12:11 2019 +0100
committer Máté Tóth-Pál <Mate.Toth-Pal@arm.com> Thu Jul 18 11:01:52 2019 +0000
tree 641fdf5dae05c0d701889af8dec2c285d8be862f
parent 995785602c941dbaeb17839ffad1a284d97644ad

Interface: Improve code quality

This patch fixes implicit casting in the tfm_ns_lock_dispatch function.

Change-Id: I9f3db6e850f22c608c26b45a481cb3c910d2abd6
Signed-off-by: Hugues de Valon <hugues.devalon@arm.com>

interface/include/tfm_ns_lock.h

diff --git a/interface/include/tfm_ns_lock.h b/interface/include/tfm_ns_lock.h
index f9a47f0..ff38556 100644
--- a/interface/include/tfm_ns_lock.h
+++ b/interface/include/tfm_ns_lock.h
@@ -23,9 +23,9 @@
  * \details To be called from the wrapper API interface
  */
 
-uint32_t tfm_ns_lock_dispatch(veneer_fn fn,
-                              uint32_t arg0, uint32_t arg1,
-                              uint32_t arg2, uint32_t arg3);
+int32_t tfm_ns_lock_dispatch(veneer_fn fn,
+                             uint32_t arg0, uint32_t arg1,
+                             uint32_t arg2, uint32_t arg3);
 
 /**
  * \brief NS world, Init NS lock

interface/src/tfm_ns_lock_cmsis_rtos.c

diff --git a/interface/src/tfm_ns_lock_cmsis_rtos.c b/interface/src/tfm_ns_lock_cmsis_rtos.c
index a81f6e1..3747319 100644
--- a/interface/src/tfm_ns_lock_cmsis_rtos.c
+++ b/interface/src/tfm_ns_lock_cmsis_rtos.c
@@ -38,26 +38,26 @@
 /**
  * \brief NS world, NS lock based dispatcher
  */
-uint32_t tfm_ns_lock_dispatch(veneer_fn fn,
-                              uint32_t arg0, uint32_t arg1,
-                              uint32_t arg2, uint32_t arg3)
+int32_t tfm_ns_lock_dispatch(veneer_fn fn,
+                             uint32_t arg0, uint32_t arg1,
+                             uint32_t arg2, uint32_t arg3)
 {
-    uint32_t result;
+    int32_t result;
 
     /* Check the NS lock has been initialized */
     if (ns_lock.init == false) {
-        return TFM_ERROR_GENERIC;
+        return (int32_t)TFM_ERROR_GENERIC;
     }
 
     /* TFM request protected by NS lock */
     if (osMutexAcquire(ns_lock.id, osWaitForever) != osOK) {
-        return TFM_ERROR_GENERIC;
+        return (int32_t)TFM_ERROR_GENERIC;
     }
 
     result = fn(arg0, arg1, arg2, arg3);
 
     if (osMutexRelease(ns_lock.id) != osOK) {
-        return TFM_ERROR_GENERIC;
+        return (int32_t)TFM_ERROR_GENERIC;
     }
 
     return result;