commit 3a98602d90d3fd293b996a08992a15bea0812e29
author Jaykumar Pitambarbhai Patel <jaykumar.pitambarbhaipatel@arm.com> Tue Oct 08 17:37:15 2019 +0530
committer Ken Liu <ken.liu@arm.com> Mon Nov 18 02:31:33 2019 +0000
tree c80aee11a01e3b054d8ceff967d20f6965aaf98d
parent 1bad759065ffcc785e0bf048ecfdb17b97056d88

Build: Align service version convention to PSA FF 1.0

Replace minor_version by version field
Replace minor_policy by version_policy field

Change-Id: I51b6f35fa4e5b529188168b7e99765a4add1cc47
Signed-off-by: Jaykumar Pitambarbhai Patel <jay08ec71@yahoo.com>

interface/include/psa_manifest/sid.h.template

diff --git a/interface/include/psa_manifest/sid.h.template b/interface/include/psa_manifest/sid.h.template
index f49c730..44d8bb5 100644
--- a/interface/include/psa_manifest/sid.h.template
+++ b/interface/include/psa_manifest/sid.h.template
@@ -25,7 +25,7 @@
                 {% set str = service.name + "_SID" %}
 #define {{"%-58s"|format(str)}} ({{"%10s"|format(service.sid)}}U)
                 {% set str = service.name + "_VERSION" %}
-#define {{"%-58s"|format(str)}} ({{"%d"|format(service.minor_version)}}U)
+#define {{"%-58s"|format(str)}} ({{"%d"|format(service.version)}}U)
             {% endfor %}
         {% endif %}
         {% if manifest.attr.conditional %}

interface/include/tfm_mailbox.h

diff --git a/interface/include/tfm_mailbox.h b/interface/include/tfm_mailbox.h
index f6bdae4..2c0ccc5 100644
--- a/interface/include/tfm_mailbox.h
+++ b/interface/include/tfm_mailbox.h
@@ -54,7 +54,7 @@
 
         struct {
             uint32_t        sid;
-            uint32_t        minor_version;
+            uint32_t        version;
         } psa_connect_params;
 
         struct {

interface/src/tfm_multi_core_psa_ns_api.c

diff --git a/interface/src/tfm_multi_core_psa_ns_api.c b/interface/src/tfm_multi_core_psa_ns_api.c
index d765af8..25161ce 100644
--- a/interface/src/tfm_multi_core_psa_ns_api.c
+++ b/interface/src/tfm_multi_core_psa_ns_api.c
@@ -112,7 +112,7 @@
     return version;
 }
 
-psa_handle_t psa_connect(uint32_t sid, uint32_t minor_version)
+psa_handle_t psa_connect(uint32_t sid, uint32_t version)
 {
     struct psa_client_params_t params;
     mailbox_msg_handle_t handle;
@@ -120,7 +120,7 @@
     int32_t ret;
 
     params.psa_connect_params.sid = sid;
-    params.psa_connect_params.minor_version = minor_version;
+    params.psa_connect_params.version = version;
 
     if (tfm_ns_multi_core_lock_acquire() != OS_WRAPPER_SUCCESS) {
         return PSA_NULL_HANDLE;