Revert "Kernel: Replace IRQHandler with the new InterruptHandler class"

This reverts commit 6c72736b26a81a8f03d8dd47989bfffe26bb1c95.

I am unable to boot on my home machine with this change in the tree.

1 files changed, 5 insertions, 4 deletions

diff --git a/Kernel/Net/E1000NetworkAdapter.h b/Kernel/Net/E1000NetworkAdapter.h
index fb1fbb58b9..93efc84faf 100644
--- a/Kernel/Net/E1000NetworkAdapter.h
+++ b/Kernel/Net/E1000NetworkAdapter.h
@@ -27,23 +27,23 @@
 #pragma once
 
 #include <AK/OwnPtr.h>
+#include <Kernel/IRQHandler.h>
 #include <Kernel/Net/NetworkAdapter.h>
 #include <Kernel/PCI/Access.h>
-#include <Kernel/PCI/Device.h>
 
 class E1000NetworkAdapter final : public NetworkAdapter
-    , public PCI::Device {
+    , public IRQHandler {
 public:
     static OwnPtr<E1000NetworkAdapter> autodetect();
 
-    E1000NetworkAdapter(PCI::Address, u8 interrupt_vector);
+    E1000NetworkAdapter(PCI::Address, u8 irq);
     virtual ~E1000NetworkAdapter() override;
 
     virtual void send_raw(const u8*, int) override;
     virtual bool link_up() override;
 
 private:
-    virtual void handle_interrupt() override;
+    virtual void handle_irq() override;
     virtual const char* class_name() const override { return "E1000NetworkAdapter"; }
 
     struct [[gnu::packed]] e1000_rx_desc
@@ -86,6 +86,7 @@ private:
 
     void receive();
 
+    PCI::Address m_pci_address;
     u16 m_io_base { 0 };
     VirtualAddress m_mmio_base;
     OwnPtr<Region> m_mmio_region;