update

[l4.git] / kernel / fiasco / src / jdb / jdb_io_apic.cpp

diff --git a/kernel/fiasco/src/jdb/jdb_io_apic.cpp b/kernel/fiasco/src/jdb/jdb_io_apic.cpp
index 9025c89fdadc5adb6e1885593c0b053776cf0612..24f16862e8ed42d50aebda435774da9d60a48a18 100644 (file)
--- a/kernel/fiasco/src/jdb/jdb_io_apic.cpp
+++ b/kernel/fiasco/src/jdb/jdb_io_apic.cpp
@@ -28,10 +28,11 @@ static Jdb_io_apic_module jdb_io_apic_module INIT_PRIORITY(JDB_MODULE_INIT_PRIO)
 
 PRIVATE static
 void
-Jdb_io_apic_module::print_lapic(unsigned cpu, void *)
+Jdb_io_apic_module::print_lapic(Cpu_number cpu, void *)
 {
-  printf("\nLocal APIC [%u, %08x]: tpr=%2x ppr=%2x\n", cpu, Apic::get_id(), Apic::tpr(),
-         Apic::reg_read(0xa0));
+  printf("\nLocal APIC [%u, %08x]: tpr=%2x ppr=%2x\n",
+         cxx::int_value<Cpu_number>(cpu),
+         Apic::get_id(), Apic::tpr(), Apic::reg_read(0xa0));
   printf("  Running: tpr=%02x\n", Jdb::apic_tpr.cpu(cpu));
 
   unsigned const regs[] = { 0x200, 0x100, 0x180 };
@@ -50,7 +51,7 @@ Jdb_io_apic_module::print_lapic(unsigned cpu, void *)
 
 PRIVATE static
 void
-Jdb_io_apic_module::remote_print_lapic(unsigned cpu)
+Jdb_io_apic_module::remote_print_lapic(Cpu_number cpu)
 {
   Jdb::remote_work(cpu, print_lapic, 0);
 }
@@ -68,7 +69,8 @@ Jdb_io_apic_module::action (int cmd, void *&, char const *&, int &)
       return NOTHING;
     }
   printf("\nState of IO APIC\n");
-  Io_apic::dump();
+  for (Io_apic *a = Io_apic::_first; a; a = a->_next)
+    a->dump();
 
   // print global LAPIC state
   unsigned khz;