ARMmbed
/
mbed-os
mirror of https://github.com/ARMmbed/mbed-os.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Move SPM_PANIC to psa/service.h

pull/9823/head
Oren Cohen 2019-02-27 14:03:05 +02:00
parent 306a51f6c0
commit bd9a738473
8 changed files with 4 additions and 58 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
TESTS/psa/spm_client/COMPONENT_SPE/client_tests_partition.c
View File

@ -19,15 +19,6 @@
#include "psa/service.h" #include "psa/service.h"
#include "psa_client_tests_part1_partition.h" #include "psa_client_tests_part1_partition.h"
#if defined(TARGET_MBED_SPM)
#include "spm_panic.h"
#else
#define SPM_PANIC(format, ...) \
{ \
while(1){}; \
}
#endif
#define MSG_BUF_SIZE 128 #define MSG_BUF_SIZE 128
uint8_t data[MSG_BUF_SIZE] = {0}; uint8_t data[MSG_BUF_SIZE] = {0};

9
TESTS/psa/spm_server/COMPONENT_SPE/server_tests_partition1.c
View File

@ -21,15 +21,6 @@
#include "psa_server_tests_part1_partition.h" #include "psa_server_tests_part1_partition.h"
#include "server_tests.h" #include "server_tests.h"
#if defined(TARGET_MBED_SPM)
#include "spm_panic.h"
#else
#define SPM_PANIC(format, ...) \
{ \
while(1){}; \
}
#endif
extern psa_test_server_side_func test_list[]; extern psa_test_server_side_func test_list[];
static size_t num_of_tests = 0; static size_t num_of_tests = 0;
static psa_msg_t msg = {0}; static psa_msg_t msg = {0};

9
TESTS/psa/spm_server/COMPONENT_SPE/tests.c
View File

@ -22,15 +22,6 @@
#include "psa_server_tests_part2_ifs.h" #include "psa_server_tests_part2_ifs.h"
#include "server_tests.h" #include "server_tests.h"
#if defined(TARGET_MBED_SPM)
#include "spm_panic.h"
#else
#define SPM_PANIC(format, ...) \
{ \
while(1){}; \
}
#endif
/** /**
* Process a generic connect message to TEST ROT_SRV. * Process a generic connect message to TEST ROT_SRV.
* @return PSA_SUCCESS or negative error code if failed. * @return PSA_SUCCESS or negative error code if failed.

9
TESTS/psa/spm_smoke/COMPONENT_SPE/smoke_tests_partition.c
View File

@ -23,15 +23,6 @@
#include "psa/service.h" #include "psa/service.h"
#include "psa_smoke_tests_part1_partition.h" #include "psa_smoke_tests_part1_partition.h"
#if defined(TARGET_MBED_SPM)
#include "spm_panic.h"
#else
#define SPM_PANIC(format, ...) \
{ \
while(1){}; \
}
#endif
// ------------------------------------ Definitions ---------------------------------- // ------------------------------------ Definitions ----------------------------------
#define SERVER_READ_MSG_BUF_SIZE 30 #define SERVER_READ_MSG_BUF_SIZE 30

4
components/TARGET_PSA/inc/psa/service.h
View File

@ -17,6 +17,10 @@
#if defined(TARGET_TFM) #if defined(TARGET_TFM)
#include "interface/include/psa_service.h" #include "interface/include/psa_service.h"
#define SPM_PANIC(format, ...) \
{ \
while(1){}; \
}
#else #else
#include "TARGET_MBED_SPM/psa_defs.h" #include "TARGET_MBED_SPM/psa_defs.h"
#include "TARGET_MBED_SPM/COMPONENT_SPE/spm_server.h" #include "TARGET_MBED_SPM/COMPONENT_SPE/spm_server.h"

7
components/TARGET_PSA/services/crypto/COMPONENT_SPE/psa_crypto_partition.c
View File

@ -1,16 +1,9 @@
// ---------------------------------- Includes --------------------------------- // ---------------------------------- Includes ---------------------------------
#include <stdint.h> #include <stdint.h>
#include <string.h> #include <string.h>
#include "psa/service.h" #include "psa/service.h"
#include "psa/client.h" #include "psa/client.h"
#if defined(TARGET_TFM)
#define SPM_PANIC(format, ...) \
{ \
while(1){}; \
}
#endif
#define PSA_CRYPTO_SECURE 1 #define PSA_CRYPTO_SECURE 1
#include "crypto_spe.h" #include "crypto_spe.h"

7
components/TARGET_PSA/services/platform/COMPONENT_SPE/platform_partition.c
View File

@ -20,13 +20,6 @@
#include "psa/internal_trusted_storage.h" #include "psa/internal_trusted_storage.h"
#include "psa/service.h" #include "psa/service.h"
#if defined(TARGET_TFM)
#define SPM_PANIC(format, ...) \
{ \
while(1){}; \
}
#endif
typedef psa_status_t (*SignalHandler)(psa_msg_t *); typedef psa_status_t (*SignalHandler)(psa_msg_t *);
static psa_status_t lifecycle_get(psa_msg_t *msg) static psa_status_t lifecycle_get(psa_msg_t *msg)

8
components/TARGET_PSA/services/storage/its/COMPONENT_SPE/its_partition.c
View File

@ -25,7 +25,6 @@
#if defined(TARGET_MBED_SPM) #if defined(TARGET_MBED_SPM)
#include "kv_config.h" #include "kv_config.h"
#endif #endif
#ifdef __cplusplus #ifdef __cplusplus
@ -33,13 +32,6 @@ extern "C"
{ {
#endif #endif
#if defined(TARGET_TFM)
#define SPM_PANIC(format, ...) \
{ \
while(1){}; \
}
#endif
typedef psa_status_t (*SignalHandler)(psa_msg_t *); typedef psa_status_t (*SignalHandler)(psa_msg_t *);
static psa_status_t storage_set(psa_msg_t *msg) static psa_status_t storage_set(psa_msg_t *msg)