refactor(lib/smc): Use SET_MEMBER_RSI for RSI header
The smc-rsi.h header is refactored to use SET_MEMBER_RSI.
The patch also removes some unneeded header inclusions.
Signed-off-by: Yousuf A <yousuf.sait@arm.com>
Signed-off-by: Soby Mathew <soby.mathew@arm.com>
Change-Id: Id1a8315c3c30d79a83917bec1aa296f35b132ea0
diff --git a/lib/smc/include/smc-rsi.h b/lib/smc/include/smc-rsi.h
index 0fe4c6a..e0df8b1 100644
--- a/lib/smc/include/smc-rsi.h
+++ b/lib/smc/include/smc-rsi.h
@@ -7,15 +7,11 @@
#define SMC_RSI_H
#include <smc.h>
-#include <stddef.h>
-#include <utils_def.h>
/*
* This file describes the Realm Services Interface (RSI) Application Binary
* Interface (ABI) for SMC calls made from within the Realm to the RMM and
* serviced by the RMM.
- *
- * See doc/rmm_interface.md for more details.
*/
/*
@@ -120,9 +116,15 @@
*/
#define SMC_RSI_ATTEST_TOKEN_CONTINUE SMC64_RSI_FID(U(0x5))
+/*
+ * Defines member of structure and reserves space
+ * for the next member with specified offset.
+ */
+#define SET_MEMBER_RSI SET_MEMBER
+
struct rsi_realm_config {
/* IPA width in bits */
- SET_MEMBER(unsigned long ipa_width, 0, 0x1000); /* Offset 0 */
+ SET_MEMBER_RSI(unsigned long ipa_width, 0, 0x1000); /* Offset 0 */
};
/*
@@ -149,7 +151,7 @@
#define RSI_HOST_CALL_NR_GPRS 7U
struct rsi_host_call {
- SET_MEMBER(struct {
+ SET_MEMBER_RSI(struct {
/* Immediate value */
unsigned int imm; /* Offset 0 */
/* Registers */