RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-05-31 06:38:10 +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/Device.cpp
View file

@ -25,32 +25,48 @@
*/
#include <Kernel/Devices/Device.h>
#include <Kernel/Devices/HardwareEventsManager.h>
#include <Kernel/FileSystem/InodeMetadata.h>
#include <LibC/errno_numbers.h>
static HashMap<u32, Device*>* s_all_devices;
HashMap<u32, Device*>& Device::all_devices()
{
if (s_all_devices == nullptr)
s_all_devices = new HashMap<u32, Device*>;
return *s_all_devices;
}
void Device::for_each(Function<void(Device&)> callback)
{
for (auto* entry : HardwareEventsManager::the().get_devices_list()) {
ASSERT(entry != nullptr);
callback(*entry);
}
for (auto& entry : all_devices())
callback(*entry.value);
}
Device* Device::get_device(unsigned major, unsigned minor)
{
return HardwareEventsManager::the().get_device(major, minor);
auto it = all_devices().find(encoded_device(major, minor));
if (it == all_devices().end())
return nullptr;
return it->value;
}
Device::Device(unsigned major, unsigned minor, u8 device_type)
Device::Device(unsigned major, unsigned minor)
: m_major(major)
, m_minor(minor)
{
HardwareEventsManager::the().register_device(*this, device_type);
u32 device_id = encoded_device(major, minor);
auto it = all_devices().find(device_id);
if (it != all_devices().end()) {
dbg() << "Already registered " << major << "," << minor << ": " << it->value->class_name();
}
ASSERT(!all_devices().contains(device_id));
all_devices().set(device_id, this);
}
Device::~Device()
{
HardwareEventsManager::the().unregister_device(*this);
all_devices().remove(encoded_device(m_major, m_minor));
}
String Device::absolute_path() const