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

Kernel: Teach DeviceManagement to handle multiple audio devices

Browse source
This commit is contained in:
Jelle Raaijmakers 2021-11-23 01:12:19 +01:00 • committed by Andreas Kling
parent 61d77274db
commit 1aafb6cd23
4 changed files with 9 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

6
Kernel/Devices/DeviceManagement.h
View file

@ -15,7 +15,7 @@
#include <AK/Types.h>
#include <Kernel/API/TimePage.h>
#include <Kernel/Arch/RegisterState.h>
#include <Kernel/Devices/Audio/SB16.h>
#include <Kernel/Devices/CharacterDevice.h>
#include <Kernel/Devices/ConsoleDevice.h>
#include <Kernel/Devices/Device.h>
#include <Kernel/Devices/NullDevice.h>
@ -36,7 +36,7 @@ public:
void attach_console_device(ConsoleDevice const&);
// FIXME: Once we have a singleton for managing many sound cards, remove this from here
void attach_sb16_device(SB16 const&);
void attach_audio_device(CharacterDevice const&);
void after_inserting_device(Badge<Device>, Device&);
void before_device_removal(Badge<Device>, Device&);
@ -62,7 +62,7 @@ private:
RefPtr<NullDevice> m_null_device;
RefPtr<ConsoleDevice> m_console_device;
// FIXME: Once we have a singleton for managing many sound cards, remove this from here
RefPtr<SB16> m_sb16_device;
NonnullRefPtrVector<CharacterDevice, 1> m_audio_devices;
MutexProtected<HashMap<u32, Device*>> m_devices;
};