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

@ -74,7 +74,7 @@ void SB16::set_sample_rate(uint16_t hz)
static SB16* s_the;
SB16::SB16()
: InterruptHandler(5)
: IRQHandler(5)
, CharacterDevice(42, 42) // ### ?
{
s_the = this;
@ -92,7 +92,7 @@ SB16& SB16::the()
void SB16::initialize()
{
disable_interrupts();
disable_irq();
IO::out8(0x226, 1);
IO::delay();
@ -153,7 +153,7 @@ void SB16::dma_start(uint32_t length)
IO::out8(0xd4, (channel % 4));
}
void SB16::handle_interrupt()
void SB16::handle_irq()
{
// Stop sound output ready for the next block.
dsp_write(0xd5);
@ -168,8 +168,9 @@ void SB16::handle_interrupt()
void SB16::wait_for_irq()
{
cli();
InterruptHandler::Enabler enabler(*this);
enable_irq();
current->wait_on(m_irq_queue);
disable_irq();
}
ssize_t SB16::write(FileDescription&, const u8* data, ssize_t length)