RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-07-26 20:07:36 +00:00
Code Issues Activity Actions

Kernel/Audio: Don't try to enumerate PCI adapters if PCI is disabled

Browse source
This commit is contained in:
Liav A 2022-02-17 22:10:59 +02:00 • committed by Andreas Kling
parent 71de4f7114
commit 15315be55c
1 changed files with 16 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

30
Kernel/Devices/Audio/Management.cpp
View file

@ -38,21 +38,23 @@ UNMAP_AFTER_INIT AudioManagement::AudioManagement()
UNMAP_AFTER_INIT void AudioManagement::enumerate_hardware_controllers() UNMAP_AFTER_INIT void AudioManagement::enumerate_hardware_controllers()
{ {
PCI::enumerate([&](PCI::DeviceIdentifier const& device_identifier) { if (!PCI::Access::is_disabled()) {
// Note: Only consider PCI audio controllers PCI::enumerate([&](PCI::DeviceIdentifier const& device_identifier) {
if (device_identifier.class_code().value() != to_underlying(PCI::ClassID::Multimedia) // Note: Only consider PCI audio controllers
|| device_identifier.subclass_code().value() != to_underlying(PCI::Multimedia::SubclassID::AudioController)) if (device_identifier.class_code().value() != to_underlying(PCI::ClassID::Multimedia)
return; || device_identifier.subclass_code().value() != to_underlying(PCI::Multimedia::SubclassID::AudioController))
return;
dbgln("AC97: found audio controller at {}", device_identifier.address()); dbgln("AC97: found audio controller at {}", device_identifier.address());
auto ac97_device = AC97::try_create(device_identifier); auto ac97_device = AC97::try_create(device_identifier);
if (ac97_device.is_error()) { if (ac97_device.is_error()) {
// FIXME: Propagate errors properly // FIXME: Propagate errors properly
dbgln("AudioManagement: failed to initialize AC97 device: {}", ac97_device.error()); dbgln("AudioManagement: failed to initialize AC97 device: {}", ac97_device.error());
return; return;
} }
m_controllers_list.append(ac97_device.release_value()); m_controllers_list.append(ac97_device.release_value());
}); });
}
} }
UNMAP_AFTER_INIT void AudioManagement::enumerate_hardware_audio_channels() UNMAP_AFTER_INIT void AudioManagement::enumerate_hardware_audio_channels()