RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-05-31 14:28:12 +00:00
Code Issues Activity Actions

Kernel/Devices: Use try_create_device helper for SB16

Browse source
This commit is contained in:
Liav A 2021-09-16 22:24:55 +03:00 • committed by Idan Horowitz
parent fd4397a430
commit 44f5f72add
5 changed files with 26 additions and 22 deletions
Download patch file Download diff file Expand all files Collapse all files

24
Kernel/Devices/SB16.cpp
View file

@ -5,10 +5,10 @@
*/
#include <AK/Memory.h>
#include <AK/Singleton.h>
#include <AK/StringView.h>
#include <Kernel/Arch/x86/InterruptDisabler.h>
#include <Kernel/Debug.h>
#include <Kernel/Devices/DeviceManagement.h>
#include <Kernel/Devices/SB16.h>
#include <Kernel/IO.h>
#include <Kernel/Memory/AnonymousVMObject.h>
@ -60,8 +60,6 @@ void SB16::set_sample_rate(uint16_t hz)
dsp_write((u8)hz);
}
static Singleton<SB16> s_the;
UNMAP_AFTER_INIT SB16::SB16()
: IRQHandler(SB16_DEFAULT_IRQ)
// FIXME: We can't change version numbers later, i.e. after the sound card is initialized.
@ -74,7 +72,7 @@ UNMAP_AFTER_INIT SB16::~SB16()
{
}
UNMAP_AFTER_INIT void SB16::detect()
UNMAP_AFTER_INIT RefPtr<SB16> SB16::try_detect_and_create()
{
IO::out8(0x226, 1);
IO::delay(32);
@ -82,19 +80,11 @@ UNMAP_AFTER_INIT void SB16::detect()
auto data = dsp_read();
if (data != 0xaa)
return;
SB16::create();
}
UNMAP_AFTER_INIT void SB16::create()
{
s_the.ensure_instance();
s_the->after_inserting();
}
SB16& SB16::the()
{
return *s_the;
return {};
auto device_or_error = DeviceManagement::try_create_device<SB16>();
if (device_or_error.is_error())
return {};
return device_or_error.release_value();
}
UNMAP_AFTER_INIT void SB16::initialize()