Update

[l4.git] / kernel / fiasco / src / kern / arm / bsp / pxa-sa / pic-arm-pxa_sa1100.cpp

diff --git a/kernel/fiasco/src/kern/arm/bsp/pxa-sa/pic-arm-pxa_sa1100.cpp b/kernel/fiasco/src/kern/arm/bsp/pxa-sa/pic-arm-pxa_sa1100.cpp
index 646e2a9f4bd5bd830fef229a9b4d94cbc6a747a7..c2024d31719b31483f6e14e624b29fbe7f89a4ba 100644 (file)
--- a/kernel/fiasco/src/kern/arm/bsp/pxa-sa/pic-arm-pxa_sa1100.cpp
+++ b/kernel/fiasco/src/kern/arm/bsp/pxa-sa/pic-arm-pxa_sa1100.cpp
@@ -1,10 +1,12 @@
 INTERFACE [arm && pxa]: // -------------------------------------
 
+#include "initcalls.h"
 #include "kmem.h"
 
 EXTENSION class Pic
 {
 public:
+  typedef Mword Status;
   enum {
     ICIP = 0x000000,
     ICMR = 0x000004,
@@ -17,11 +19,13 @@ public:
 
 INTERFACE [arm && sa1100]: // ----------------------------------
 
+#include "initcalls.h"
 #include "kmem.h"
 
 EXTENSION class Pic
 {
 public:
+  typedef Mword Status;
   enum {
     ICIP = 0x00000,
     ICMR = 0x00004,
@@ -36,7 +40,6 @@ public:
 IMPLEMENTATION [arm && (sa1100 || pxa)]:
 
 #include "assert.h"
-#include "initcalls.h"
 #include "config.h"
 #include "irq_chip_generic.h"
 #include "irq_mgr.h"
@@ -109,18 +112,18 @@ Chip::restore_all(Mword s)
 
 static Static_object<Irq_mgr_single_chip<Chip> > mgr;
 
-IMPLEMENT FIASCO_INIT
+PUBLIC static FIASCO_INIT
 void Pic::init()
 {
   Irq_mgr::mgr = mgr.construct();
 }
 
 // for JDB only
-IMPLEMENT
+PUBLIC
 Pic::Status Pic::disable_all_save()
 { return mgr->c.disable_all_save(); }
 
-IMPLEMENT
+PUBLIC
 void
 Pic::restore_all(Status s)
 {