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

Kernel: Modernize SB16.cpp

Browse source 
This was some old code that could use mostly some east-const :^)
This commit is contained in:
kleines Filmröllchen 2021-08-19 00:02:58 +02:00 • committed by Ali Mohammad Pur
parent 24dbf18936
commit 2c9afaf5ac
1 changed files with 18 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

37
Kernel/Devices/SB16.cpp
View file

@ -17,33 +17,32 @@
#include <Kernel/Thread.h> #include <Kernel/Thread.h>
namespace Kernel { namespace Kernel {
#define SB16_DEFAULT_IRQ 5
enum class SampleFormat : u8 { enum class SampleFormat : u8 {
Signed = 0x10, Signed = 0x10,
Stereo = 0x20, Stereo = 0x20,
}; };
const u16 DSP_READ = 0x22A; constexpr int SB16_DEFAULT_IRQ = 5;
const u16 DSP_WRITE = 0x22C;
const u16 DSP_STATUS = 0x22E; constexpr u16 DSP_READ = 0x22A;
const u16 DSP_R_ACK = 0x22F; constexpr u16 DSP_WRITE = 0x22C;
constexpr u16 DSP_STATUS = 0x22E;
constexpr u16 DSP_R_ACK = 0x22F;
/* Write a value to the DSP write register */ /* Write a value to the DSP write register */
void SB16::dsp_write(u8 value) void SB16::dsp_write(u8 value)
{ {
while (IO::in8(DSP_WRITE) & 0x80) { while (IO::in8(DSP_WRITE) & 0x80)
; ;
}
IO::out8(DSP_WRITE, value); IO::out8(DSP_WRITE, value);
} }
/* Reads the value of the DSP read register */ /* Reads the value of the DSP read register */
u8 SB16::dsp_read() u8 SB16::dsp_read()
{ {
while (!(IO::in8(DSP_STATUS) & 0x80)) { while (!(IO::in8(DSP_STATUS) & 0x80))
; ;
}
return IO::in8(DSP_READ); return IO::in8(DSP_READ);
} }
@ -62,7 +61,8 @@ static Singleton<SB16> s_the;
UNMAP_AFTER_INIT SB16::SB16() UNMAP_AFTER_INIT SB16::SB16()
: IRQHandler(SB16_DEFAULT_IRQ) : IRQHandler(SB16_DEFAULT_IRQ)
, CharacterDevice(42, 42) // ### ? // FIXME: We can't change version numbers later, i.e. after the sound card is initialized.
, CharacterDevice(42, 42)
{ {
initialize(); initialize();
} }
@ -78,9 +78,8 @@ UNMAP_AFTER_INIT void SB16::detect()
IO::out8(0x226, 0); IO::out8(0x226, 0);
auto data = dsp_read(); auto data = dsp_read();
if (data != 0xaa) { if (data != 0xaa)
return; return;
}
SB16::create(); SB16::create();
} }
@ -166,7 +165,7 @@ void SB16::set_irq_line(u8 irq_number)
change_irq_number(irq_number); change_irq_number(irq_number);
} }
bool SB16::can_read(const FileDescription&, size_t) const bool SB16::can_read(FileDescription const&, size_t) const
{ {
return false; return false;
} }
@ -178,9 +177,9 @@ KResultOr<size_t> SB16::read(FileDescription&, u64, UserOrKernelBuffer&, size_t)
void SB16::dma_start(uint32_t length) void SB16::dma_start(uint32_t length)
{ {
const auto addr = m_dma_region->physical_page(0)->paddr().get(); auto const addr = m_dma_region->physical_page(0)->paddr().get();
const u8 channel = 5; // 16-bit samples use DMA channel 5 (on the master DMA controller) u8 const channel = 5; // 16-bit samples use DMA channel 5 (on the master DMA controller)
const u8 mode = 0x48; u8 const mode = 0x48;
// Disable the DMA channel // Disable the DMA channel
IO::out8(0xd4, 4 + (channel % 4)); IO::out8(0xd4, 4 + (channel % 4));
@ -210,7 +209,7 @@ void SB16::dma_start(uint32_t length)
IO::out8(0xd4, (channel % 4)); IO::out8(0xd4, (channel % 4));
} }
bool SB16::handle_irq(const RegisterState&) bool SB16::handle_irq(RegisterState const&)
{ {
// FIXME: Check if the interrupt was actually for us or not... (shared IRQs) // FIXME: Check if the interrupt was actually for us or not... (shared IRQs)
@ -231,7 +230,7 @@ void SB16::wait_for_irq()
disable_irq(); disable_irq();
} }
KResultOr<size_t> SB16::write(FileDescription&, u64, const UserOrKernelBuffer& data, size_t length) KResultOr<size_t> SB16::write(FileDescription&, u64, UserOrKernelBuffer const& data, size_t length)
{ {
if (!m_dma_region) { if (!m_dma_region) {
auto page = MM.allocate_supervisor_physical_page(); auto page = MM.allocate_supervisor_physical_page();
@ -250,7 +249,7 @@ KResultOr<size_t> SB16::write(FileDescription&, u64, const UserOrKernelBuffer& d
dbgln_if(SB16_DEBUG, "SB16: Writing buffer of {} bytes", length); dbgln_if(SB16_DEBUG, "SB16: Writing buffer of {} bytes", length);
VERIFY(length <= PAGE_SIZE); VERIFY(length <= PAGE_SIZE);
const int BLOCK_SIZE = 32 * 1024; int const BLOCK_SIZE = 32 * 1024;
if (length > BLOCK_SIZE) { if (length > BLOCK_SIZE) {
return ENOSPC; return ENOSPC;
} }