Tidying FFA helpers
Moved SP specific functions/macros to "sp_helpers.c/h".
Placed ffa interfaces/symbols shared between tftf and SPs in
"ffa_helpers.c/h".
Signed-off-by: J-Alves <joao.alves@arm.com>
Change-Id: I4cf967f87837ce3e7d0f7244f9cc0677f608f9cd
diff --git a/spm/cactus/cactus_ffa_tests.c b/spm/cactus/cactus_ffa_tests.c
index 2143e75..411cc9f 100644
--- a/spm/cactus/cactus_ffa_tests.c
+++ b/spm/cactus/cactus_ffa_tests.c
@@ -6,7 +6,7 @@
#include <assert.h>
#include <errno.h>
#include <debug.h>
-#include "ffa_helpers.h"
+#include <ffa_helpers.h>
#include <sp_helpers.h>
/* FFA version test helpers */
@@ -26,7 +26,7 @@
uint32_t spm_version = (uint32_t)(0xFFFFFFFF & ret.ret0);
bool ffa_version_compatible = ((spm_version >> FFA_VERSION_MAJOR_SHIFT) == FFA_MAJOR &&
- (FFA_VERSION_MINOR_MASK & spm_version) >= FFA_MINOR);
+ (spm_version & FFA_VERSION_MINOR_MASK) >= FFA_MINOR);
NOTICE("FFA_VERSION returned %u.%u; Compatible: %i\n",
spm_version >> FFA_VERSION_MAJOR_SHIFT,