update

[l4.git] / kernel / fiasco / src / abi / arm / kip-arm.cpp

diff --git a/kernel/fiasco/src/abi/arm/kip-arm.cpp b/kernel/fiasco/src/abi/arm/kip-arm.cpp
index 06e5b177c0104c3f870cd5f8d19d872f3e363ab7..05dfdae27aeacdbcf066bc2e86f9880bc286dc76 100644 (file)
--- a/kernel/fiasco/src/abi/arm/kip-arm.cpp
+++ b/kernel/fiasco/src/abi/arm/kip-arm.cpp
@@ -9,64 +9,68 @@ INTERFACE [arm]:
 EXTENSION class Kip
 {
 public:
-
-  Mword magic;
-  Mword version;
-  Mword offset_version_strings;
-  Mword res0; //offset_memory_descs;
-
-  /* 0x10 */
-  Mword _res1[4];
-
+  struct Platform_info
+  {
+    Unsigned32 cpuid;
+    Unsigned32 mp;
+  };
+
+  /* 0x00 */
+  Mword      magic;
+  Mword      version;
+  Unsigned8  offset_version_strings;
+  Unsigned8  fill0[3];
+  Unsigned8  kip_sys_calls;
+  Unsigned8  fill1[3];
 
   /* the following stuff is undocumented; we assume that the kernel
      info page is located at offset 0x1000 into the L4 kernel boot
      image so that these declarations are consistent with section 2.9
      of the L4 Reference Manual */
 
+  /* 0x10 */
+  Mword      sched_granularity;
+  Mword      _res1[3];
+
   /* 0x20 */
-  Mword sigma0_sp, sigma0_ip;
-  Mword _res2[2];
+  Mword      sigma0_sp, sigma0_ip;
+  Mword      _res2[2];
 
   /* 0x30 */
-  Mword sigma1_sp, sigma1_ip;
-  Mword _res3[2];
+  Mword      sigma1_sp, sigma1_ip;
+  Mword      _res3[2];
 
   /* 0x40 */
-  Mword root_sp,   root_ip;
-  Mword _res4[2];
+  Mword      root_sp, root_ip;
+  Mword      _res4[2];
 
   /* 0x50 */
-  Mword l4_config;
-  Mword _mem_info;
-  Mword kdebug_config;
-  Mword kdebug_permission;
+  Mword      _res_50;
+  Mword      _mem_info;
+  Mword      _res_58[2];
 
   /* 0x60 */
-  Mword total_ram;
-  Mword processor_info;
-  Mword _res6[14];
+  Mword      _res5[16];
 
   /* 0xA0 */
   volatile Cpu_time clock;
-  Mword _res7[2];
+  Unsigned64 _res6;
 
   /* 0xB0 */
-  Mword frequency_cpu;
-  Mword frequency_bus;
-  Mword _res10[2];
+  Mword      frequency_cpu;
+  Mword      frequency_bus;
 
-  /* 0xC0 */
-  Mword _res11[8];
+  /* 0xB8 */
+  Mword      _res7[10];
 
   /* 0xE0 */
-  Mword user_ptr;
-  Mword vhw_offset;
-  char _res8[8];
+  Mword      user_ptr;
+  Mword      vhw_offset;
+  Unsigned32 _res8[2];
 
   /* 0xF0 */
-  Kernel_uart_info  kernel_uart_info;
-  Platform_info     platform_info;
+  Platform_info platform_info;
+  Unsigned32 __reserved[18];
 };
 
 //---------------------------------------------------------------------------
@@ -76,4 +80,3 @@ IMPLEMENT inline
 void
 Kip::debug_print_syscalls() const
 {}
-