SPCI is now called PSA FF-A.
Change-Id: Iaa10e0449edf5f6493ab21e648219392b17cc5ec
diff --git a/inc/hf/arch/cpu.h b/inc/hf/arch/cpu.h
index a7fe5a8..171abaa 100644
--- a/inc/hf/arch/cpu.h
+++ b/inc/hf/arch/cpu.h
@@ -25,7 +25,7 @@
#include "hf/addr.h"
#include "hf/vcpu.h"
-#include "vmapi/hf/spci.h"
+#include "vmapi/hf/ffa.h"
/**
* Reset the register values other than the PC and argument which are set with
@@ -48,7 +48,7 @@
* This function must only be called on an arch_regs that is known not be in use
* by any other physical CPU.
*/
-void arch_regs_set_retval(struct arch_regs *r, struct spci_value v);
+void arch_regs_set_retval(struct arch_regs *r, struct ffa_value v);
/**
* Initialize and reset CPU-wide register values.
diff --git a/inc/hf/arch/plat/smc.h b/inc/hf/arch/plat/smc.h
index 29493fc..4d5b9a0 100644
--- a/inc/hf/arch/plat/smc.h
+++ b/inc/hf/arch/plat/smc.h
@@ -16,11 +16,11 @@
#pragma once
-#include "vmapi/hf/spci.h"
+#include "vmapi/hf/ffa.h"
/**
* Called after an SMC has been forwarded. `args` contains the arguments passed
* to the SMC and `ret` contains the return values that will be set in the vCPU
* registers after this call returns.
*/
-void plat_smc_post_forward(struct spci_value args, struct spci_value *ret);
+void plat_smc_post_forward(struct ffa_value args, struct ffa_value *ret);
diff --git a/inc/hf/arch/tee.h b/inc/hf/arch/tee.h
index f37fe0b..5cf4f81 100644
--- a/inc/hf/arch/tee.h
+++ b/inc/hf/arch/tee.h
@@ -16,7 +16,7 @@
#pragma once
-#include "hf/spci.h"
+#include "hf/ffa.h"
void arch_tee_init(void);
-struct spci_value arch_tee_call(struct spci_value args);
+struct ffa_value arch_tee_call(struct ffa_value args);