Update

[l4.git] / kernel / fiasco / src / kern / ux / net.cpp

diff --git a/kernel/fiasco/src/kern/ux/net.cpp b/kernel/fiasco/src/kern/ux/net.cpp
index 6596584ddba9b425ee5865c6c1648b23d1022a50..c52b11ce11caf1cc8b684d9f99e53f5daedbc5a1 100644 (file)
--- a/kernel/fiasco/src/kern/ux/net.cpp
+++ b/kernel/fiasco/src/kern/ux/net.cpp
@@ -26,9 +26,8 @@ IMPLEMENTATION:
 #include "boot_info.h"
 #include "initcalls.h"
 #include "irq_chip.h"
-#include "irq_pin.h"
 #include "kmem.h"
-#include "pic.h"
+#include "irq_chip_ux.h"
 #include "warn.h"
 
 int Net::tunfd;
@@ -60,20 +59,16 @@ Net::init()
     }
 
   // Setup virtual interrupt
-  if (!Pic::setup_irq_prov (Pic::IRQ_NET,
-                            Boot_info::net_program(), bootstrap))
+  auto chip = Irq_chip_ux::main;
+  auto const irq = Irq_chip_ux::Irq_net;
+  if (!chip->setup_irq_prov(irq, Boot_info::net_program(), bootstrap))
     {
       puts("Problems setting up network interrupt!");
       exit(1);
     }
 
-  static Irq_base ib;
-  Irq_chip::hw_chip->setup(&ib, Pic::IRQ_NET);
-
   Kip::k()->vhw()->set_desc(Vhw_entry::TYPE_NET,
-                            0, 0,
-                            Pic::IRQ_NET,
-                            Pic::get_pid_for_irq_prov(Pic::IRQ_NET), tunfd);
+                            0, 0, irq, chip->pid_for_irq_prov(irq), tunfd);
 
   printf("Starting Network.\n\n");
 }