beenull/ladybird
1
0
Fork 0
mirror of https://github.com/LadybirdBrowser/ladybird.git synced 2024-11-22 23:50:19 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 6

SB16: Set "m_interrupted" to false before enabling IRQ's.

Browse source 
Otherwise, we might get interrupted before entering wait_for_irq() and then
resetting the flag again.
This commit is contained in:
Andreas Kling 2019-07-14 15:02:02 +02:00
parent b2e502e533
commit e78097d140
Notes: sideshowbarker 2024-07-19 13:16:23 +09:00 
Author: https://github.com/awesomekling
Commit: https://github.com/SerenityOS/serenity/commit/e78097d1402
1 changed files with 17 additions and 25 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

42
Kernel/Devices/SB16.cpp
View file

@ -63,18 +63,6 @@ SB16& SB16::the()
return *s_the;
}
void SB16::handle_irq()
{
// Stop sound output ready for the next block.
dsp_write(0xd5);
IO::in8(DSP_STATUS); // 8 bit interrupt
if (m_major_version >= 4)
IO::in8(DSP_R_ACK); // 16 bit interrupt
m_interrupted = true;
}
void SB16::initialize()
{
IO::out8(0x226, 1);
@ -137,26 +125,29 @@ void SB16::dma_start(uint32_t length)
IO::out8(0xd4, (channel % 4));
}
void SB16::handle_irq()
{
// Stop sound output ready for the next block.
dsp_write(0xd5);
IO::in8(DSP_STATUS); // 8 bit interrupt
if (m_major_version >= 4)
IO::in8(DSP_R_ACK); // 16 bit interrupt
m_interrupted = true;
}
void SB16::wait_for_irq()
{
m_interrupted = false;
#ifdef SB16_DEBUG
kprintf("SB16: waiting for interrupt...\n");
#endif
current->block_until([this] { return m_interrupted; });
#ifdef SB16_DEBUG
kprintf("SB16: got interrupt!\n");
#endif
current->block_until([this] {
return m_interrupted;
});
}
ssize_t SB16::write(FileDescription&, const u8* data, ssize_t length)
{
if (!m_dma_buffer_page) {
#ifdef SB16_DEBUG
kprintf("SB16: Allocating page\n");
#endif
if (!m_dma_buffer_page)
m_dma_buffer_page = MM.allocate_supervisor_physical_page();
}
#ifdef SB16_DEBUG
kprintf("SB16: Writing buffer of %d bytes\n", length);
@ -190,6 +181,7 @@ ssize_t SB16::write(FileDescription&, const u8* data, ssize_t length)
dsp_write((u8)sample_count);
dsp_write((u8)(sample_count >> 8));
m_interrupted = false;
enable_irq();
wait_for_irq();
return length;