RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-05-28 07:25:07 +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

34
Kernel/Devices/PATAChannel.cpp
View file

@ -112,25 +112,18 @@ static Lock& s_lock()
return *lock;
};
OwnPtr<PATAChannel> PATAChannel::autodetect(ChannelType type, bool force_pio)
OwnPtr<PATAChannel> PATAChannel::create(ChannelType type, bool force_pio)
{
PCI::Address found_address;
PCI::enumerate_all([&](const PCI::Address& address, PCI::ID id) {
if (PCI::get_class(address) == PCI_Mass_Storage_Class && PCI::get_subclass(address) == PCI_IDE_Controller_Subclass) {
found_address = address;
kprintf("PATAChannel: PATA Controller found! id=%w:%w\n", id.vendor_id, id.device_id);
}
});
return make<PATAChannel>(found_address, type, force_pio);
return make<PATAChannel>(type, force_pio);
}
PATAChannel::PATAChannel(PCI::Address pci_address, ChannelType type, bool force_pio)
: PCI::Device(pci_address, (type == ChannelType::Primary ? PATA_PRIMARY_IRQ : PATA_SECONDARY_IRQ))
PATAChannel::PATAChannel(ChannelType type, bool force_pio)
: IRQHandler((type == ChannelType::Primary ? PATA_PRIMARY_IRQ : PATA_SECONDARY_IRQ))
, m_channel_number((type == ChannelType::Primary ? 0 : 1))
, m_io_base((type == ChannelType::Primary ? 0x1F0 : 0x170))
, m_control_base((type == ChannelType::Primary ? 0x3f6 : 0x376))
{
disable_interrupts();
disable_irq();
m_dma_enabled.resource() = true;
ProcFS::add_sys_bool("ide_dma", m_dma_enabled);
@ -147,8 +140,14 @@ PATAChannel::~PATAChannel()
void PATAChannel::initialize(bool force_pio)
{
PCI::enumerate_all([this](const PCI::Address& address, PCI::ID id) {
if (PCI::get_class(address) == PCI_Mass_Storage_Class && PCI::get_subclass(address) == PCI_IDE_Controller_Subclass) {
m_pci_address = address;
kprintf("PATAChannel: PATA Controller found! id=%w:%w\n", id.vendor_id, id.device_id);
}
});
if (get_pci_address().is_null()) {
if (m_pci_address.is_null()) {
kprintf("PATAChannel: PCI address was null; can not set up DMA\n");
return;
}
@ -159,9 +158,9 @@ void PATAChannel::initialize(bool force_pio)
}
// Let's try to set up DMA transfers.
PCI::enable_bus_mastering(get_pci_address());
PCI::enable_bus_mastering(m_pci_address);
prdt().end_of_table = 0x8000;
m_bus_master_base = PCI::get_BAR4(get_pci_address()) & 0xfffc;
m_bus_master_base = PCI::get_BAR4(m_pci_address) & 0xfffc;
m_dma_buffer_page = MM.allocate_supervisor_physical_page();
kprintf("PATAChannel: Bus master IDE: I/O @ %x\n", m_bus_master_base);
}
@ -182,11 +181,12 @@ static void print_ide_status(u8 status)
void PATAChannel::wait_for_irq()
{
cli();
InterruptHandler::Enabler enabler(*this);
enable_irq();
current->wait_on(m_irq_queue);
disable_irq();
}
void PATAChannel::handle_interrupt()
void PATAChannel::handle_irq()
{
u8 status = IO::in8(m_io_base + ATA_REG_STATUS);
if (status & ATA_SR_ERR) {