Update

[l4.git] / kernel / fiasco / src / kern / arm / bsp / omap / pic-arm-gic-omap4.cpp

diff --git a/kernel/fiasco/src/kern/arm/bsp/omap/pic-arm-gic-omap4.cpp b/kernel/fiasco/src/kern/arm/bsp/omap/pic-arm-gic-omap4.cpp
index be34ed836e70aff547b020f8b551453f4d0f5206..80f1f790b83bd394301989cb906647d654de6d55 100644 (file)
--- a/kernel/fiasco/src/kern/arm/bsp/omap/pic-arm-gic-omap4.cpp
+++ b/kernel/fiasco/src/kern/arm/bsp/omap/pic-arm-gic-omap4.cpp
@@ -1,14 +1,15 @@
-INTERFACE [arm && pic_gic && omap4]:
+INTERFACE [arm && pic_gic && (omap4 || omap5)]:
 
+#include "initcalls.h"
 #include "gic.h"
 
 // ------------------------------------------------------------------------
-IMPLEMENTATION [arm && pic_gic && omap4]:
+IMPLEMENTATION [arm && pic_gic && (omap4 || omap5)]:
 
 #include "irq_mgr_multi_chip.h"
 #include "kmem.h"
 
-IMPLEMENT FIASCO_INIT
+PUBLIC static FIASCO_INIT
 void
 Pic::init()
 {
@@ -23,19 +24,11 @@ Pic::init()
   Irq_mgr::mgr = m;
 }
 
-IMPLEMENT inline
-Pic::Status Pic::disable_all_save()
-{ return 0; }
-
-IMPLEMENT inline
-void Pic::restore_all(Status)
-{}
-
 // ------------------------------------------------------------------------
-IMPLEMENTATION [arm && mp && pic_gic && omap4]:
+IMPLEMENTATION [arm && mp && pic_gic && (omap4 || omap5)]:
 
 PUBLIC static
-void Pic::init_ap(Cpu_number)
+void Pic::init_ap(Cpu_number, bool resume)
 {
-  gic->init_ap();
+  gic->init_ap(resume);
 }