JSON upgrade to give function names
Function names can be provided against entry points.
This helps to ensure easy migration for misnamed functions.
Signed-off-by: Archana <archana.madhavan@silabs.com>
Signed-off-by: Asfandyar Orakzai <asfandyar.orakzai@silabs.com>
diff --git a/scripts/data_files/driver_jsons/mbedtls_test_opaque_driver.json b/scripts/data_files/driver_jsons/mbedtls_test_opaque_driver.json
index 1322083..c63e360 100644
--- a/scripts/data_files/driver_jsons/mbedtls_test_opaque_driver.json
+++ b/scripts/data_files/driver_jsons/mbedtls_test_opaque_driver.json
@@ -12,7 +12,8 @@
{
"_comment": "The mbedTLS opaque driver supports copy key/ get builtin key",
"depend_on": "defined(PSA_CRYPTO_DRIVER_TEST)",
- "entry_points": ["copy_key","get_builtin_key"]
+ "entry_points": ["copy_key","get_builtin_key"],
+ "name": {"copy_key":"mbedtls_test_opaque_copy_key", "get_builtin_key":"mbedtls_test_opaque_get_builtin_key"}
}
]
}]
diff --git a/scripts/data_files/driver_jsons/mbedtls_test_transparent_driver.json b/scripts/data_files/driver_jsons/mbedtls_test_transparent_driver.json
index dfa4234..1b4d615 100644
--- a/scripts/data_files/driver_jsons/mbedtls_test_transparent_driver.json
+++ b/scripts/data_files/driver_jsons/mbedtls_test_transparent_driver.json
@@ -4,10 +4,18 @@
"headers": ["test/drivers/test_driver.h"],
"capabilities": [
{
- "_comment": "The mbedTLS transparent driver supports import key/export key/export_public key",
+ "_comment": "The mbedTLS transparent driver supports import key/export key",
"depend_on": "defined(PSA_CRYPTO_DRIVER_TEST)",
- "entry_points": ["import_key", "export_key", "export_public_key"],
+ "entry_points": ["import_key", "export_key"],
"fallback": true
+ },
+ {
+ "_comment": "The mbedTLS transparent driver supports export_public key",
+ "depend_on": "defined(PSA_CRYPTO_DRIVER_TEST)",
+ "entry_points": ["export_public_key"],
+ "fallback": true,
+ "name": {"export_public_key":"mbedtls_test_transparent_export_public_key"}
}
+
]
}]
diff --git a/scripts/data_files/driver_templates/OS-template-opaque.jinja b/scripts/data_files/driver_templates/OS-template-opaque.jinja
index 3d9724c..f11ac77 100644
--- a/scripts/data_files/driver_templates/OS-template-opaque.jinja
+++ b/scripts/data_files/driver_templates/OS-template-opaque.jinja
@@ -3,7 +3,11 @@
#if ({% if capability.depend_on is defined -%}{{ capability.depend_on }} {% else -%} {{ 1 }} {% endif %})
{%- filter indent(width = nest_indent) %}
case {{ driver.location }}:
+ {% if capability.name is defined and entry_point in capability.name.keys() -%}
+ return({{ capability.name[entry_point]}}({{entry_point_attributes(driver) | indent(20)}}));
+ {% else -%}
return({{driver.prefix}}_{{driver.type}}_{{entry_point}}({{entry_point_attributes(driver) | indent(20)}}));
+ {% endif -%}
{% endfilter -%}
#endif
{% endfor %}
diff --git a/scripts/data_files/driver_templates/OS-template-transparent.jinja b/scripts/data_files/driver_templates/OS-template-transparent.jinja
index 017c937..4eadd1e 100644
--- a/scripts/data_files/driver_templates/OS-template-transparent.jinja
+++ b/scripts/data_files/driver_templates/OS-template-transparent.jinja
@@ -2,7 +2,11 @@
{% for capability in driver.capabilities if entry_point in capability.entry_points -%}
#if ({% if capability.depend_on is defined -%}{{ capability.depend_on }} {% else -%} {{ 1 }} {% endif %})
{%- filter indent(width = nest_indent) %}
+{% if capability.name is defined and entry_point in capability.name.keys() -%}
+status = {{ capability.name[entry_point]}}({{entry_point_attributes(driver) | indent(20)}});
+{% else -%}
status = {{driver.prefix}}_{{driver.type}}_{{entry_point}}({{entry_point_attributes(driver) | indent(20)}});
+{% endif -%}
if( status != PSA_ERROR_NOT_SUPPORTED )
return( status );