RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-07-25 20:57:35 +00:00
Code Issues Activity Actions

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

Browse source 
This reverts commit 6c72736b26.

I am unable to boot on my home machine with this change in the tree.
This commit is contained in:
Andreas Kling 2020-01-22 22:23:50 +01:00
parent 8e21e31b3a
commit e64c335e5a
29 changed files with 169 additions and 193 deletions
Download patch file Download diff file Expand all files Collapse all files

9
Kernel/Net/RTL8139NetworkAdapter.h
View file

@ -27,25 +27,25 @@
#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>
#define RTL8139_TX_BUFFER_COUNT 4
class RTL8139NetworkAdapter final : public NetworkAdapter
, public PCI::Device {
, public IRQHandler {
public:
static OwnPtr<RTL8139NetworkAdapter> autodetect();
RTL8139NetworkAdapter(PCI::Address, u8 interrupt_vector);
RTL8139NetworkAdapter(PCI::Address, u8 irq);
virtual ~RTL8139NetworkAdapter() override;
virtual void send_raw(const u8*, int) override;
virtual bool link_up() override { return m_link_up; }
private:
virtual void handle_interrupt() override;
virtual void handle_irq() override;
virtual const char* class_name() const override { return "RTL8139NetworkAdapter"; }
void reset();
@ -60,6 +60,7 @@ private:
u16 in16(u16 address);
u32 in32(u16 address);
PCI::Address m_pci_address;
u16 m_io_base { 0 };
u8 m_interrupt_line { 0 };
u32 m_rx_buffer_addr { 0 };