Signed-off-by: Ralf Ramsauer <[email protected]>
---
inmates/lib/{arm64 => arm-common}/include/gic.h | 6 +++++-
inmates/lib/arm/include/{ => arch}/gic.h | 15 ---------------
inmates/lib/arm64/include/arch/gic.h | 13 +++++++++++++
3 files changed, 18 insertions(+), 16 deletions(-)
rename inmates/lib/{arm64 => arm-common}/include/gic.h (90%)
rename inmates/lib/arm/include/{ => arch}/gic.h (63%)
create mode 100644 inmates/lib/arm64/include/arch/gic.h
diff --git a/inmates/lib/arm64/include/gic.h
b/inmates/lib/arm-common/include/gic.h
similarity index 90%
rename from inmates/lib/arm64/include/gic.h
rename to inmates/lib/arm-common/include/gic.h
index 6e00643198..fc7963e93d 100644
--- a/inmates/lib/arm64/include/gic.h
+++ b/inmates/lib/arm-common/include/gic.h
@@ -9,6 +9,7 @@
* This work is licensed under the terms of the GNU GPL, version 2. See
* the COPYING file in the top-level directory.
*/
+
#ifndef _JAILHOUSE_INMATES_GIC_H
#define _JAILHOUSE_INMATES_GIC_H
@@ -16,8 +17,8 @@
#define GICD_ISENABLER 0x0100
+#define is_sgi_ppi(irqn) ((irqn) < 32)
#define is_spi(irqn) ((irqn) > 31 && (irqn) < 1020)
-#define gic_setup_irq_stack()
#ifndef __ASSEMBLY__
@@ -27,4 +28,7 @@ void gic_write_eoi(u32 irqn);
u32 gic_read_ack(void);
#endif /* !__ASSEMBLY__ */
+
+#include <arch/gic.h>
+
#endif
diff --git a/inmates/lib/arm/include/gic.h b/inmates/lib/arm/include/arch/gic.h
similarity index 63%
rename from inmates/lib/arm/include/gic.h
rename to inmates/lib/arm/include/arch/gic.h
index 23b0e9038c..9e1e988ea2 100644
--- a/inmates/lib/arm/include/gic.h
+++ b/inmates/lib/arm/include/arch/gic.h
@@ -9,15 +9,6 @@
* This work is licensed under the terms of the GNU GPL, version 2. See
* the COPYING file in the top-level directory.
*/
-#ifndef _JAILHOUSE_INMATES_GIC_H
-#define _JAILHOUSE_INMATES_GIC_H
-
-#include <inmate.h>
-
-#define GICD_ISENABLER 0x0100
-
-#define is_sgi_ppi(irqn) ((irqn) < 32)
-#define is_spi(irqn) ((irqn) > 31 && (irqn) < 1020)
#ifndef __ASSEMBLY__
@@ -30,10 +21,4 @@ static inline void gic_setup_irq_stack(void)
asm volatile ("cpsie i\n");
}
-int gic_init(void);
-void gic_enable(unsigned int irqn);
-void gic_write_eoi(u32 irqn);
-u32 gic_read_ack(void);
-
#endif /* !__ASSEMBLY__ */
-#endif
diff --git a/inmates/lib/arm64/include/arch/gic.h
b/inmates/lib/arm64/include/arch/gic.h
new file mode 100644
index 0000000000..7cfe99e69a
--- /dev/null
+++ b/inmates/lib/arm64/include/arch/gic.h
@@ -0,0 +1,13 @@
+/*
+ * Jailhouse, a Linux-based partitioning hypervisor
+ *
+ * Copyright (c) OTH Regensburg, 2017
+ *
+ * Authors:
+ * Ralf Ramsauer <[email protected]>
+ *
+ * This work is licensed under the terms of the GNU GPL, version 2. See
+ * the COPYING file in the top-level directory.
+ */
+
+#define gic_setup_irq_stack()
--
2.12.0
--
You received this message because you are subscribed to the Google Groups
"Jailhouse" group.
To unsubscribe from this group and stop receiving emails from it, send an email
to [email protected].
For more options, visit https://groups.google.com/d/optout.
