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

Kernel: Read and report AC'97 codec revision

Browse source 
This might help with debugging on bare metal. Since the minimum version
that can be specified is revision 2.1, and we do not use any feature
from revision 2.2 or newer, this is merely future-proofing ourselves
for new features yet to be built. Additionally, removing the `VERIFY()`
ensures we will not crash on cards that only support earlier revisions.
This commit is contained in:
Jelle Raaijmakers 2022-02-27 15:57:06 +01:00 • committed by Andreas Kling
parent 9a46573ffc
commit 694ff12272
2 changed files with 7 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

6
Kernel/Devices/Audio/AC97.cpp
View file

@ -87,8 +87,12 @@ UNMAP_AFTER_INIT ErrorOr<void> AC97::initialize()
// Reset mixer // Reset mixer
m_io_mixer_base.offset(NativeAudioMixerRegister::Reset).out<u16>(1); m_io_mixer_base.offset(NativeAudioMixerRegister::Reset).out<u16>(1);
// Read out AC'97 codec revision
auto extended_audio_id = m_io_mixer_base.offset(NativeAudioMixerRegister::ExtendedAudioID).in<u16>(); auto extended_audio_id = m_io_mixer_base.offset(NativeAudioMixerRegister::ExtendedAudioID).in<u16>();
VERIFY((extended_audio_id & ExtendedAudioMask::Revision) >> 10 == AC97Revision::Revision23); m_codec_revision = static_cast<AC97Revision>(((extended_audio_id & ExtendedAudioMask::Revision) >> 10) & 0b11);
dbgln_if(AC97_DEBUG, "AC97 @ {}: codec revision {:#02b}", pci_address(), to_underlying(m_codec_revision));
if (m_codec_revision == AC97Revision::Reserved)
return ENOTSUP;
// Enable variable and double rate PCM audio if supported // Enable variable and double rate PCM audio if supported
auto extended_audio_status_control_register = m_io_mixer_base.offset(NativeAudioMixerRegister::ExtendedAudioStatusControl); auto extended_audio_status_control_register = m_io_mixer_base.offset(NativeAudioMixerRegister::ExtendedAudioStatusControl);

2
Kernel/Devices/Audio/AC97.h
View file

@ -57,6 +57,7 @@ private:
Revision21OrEarlier = 0b00, Revision21OrEarlier = 0b00,
Revision22 = 0b01, Revision22 = 0b01,
Revision23 = 0b10, Revision23 = 0b10,
Reserved = 0b11,
}; };
enum NativeAudioBusChannel : u8 { enum NativeAudioBusChannel : u8 {
@ -162,6 +163,7 @@ private:
OwnPtr<Memory::Region> m_buffer_descriptor_list; OwnPtr<Memory::Region> m_buffer_descriptor_list;
u8 m_buffer_descriptor_list_index { 0 }; u8 m_buffer_descriptor_list_index { 0 };
AC97Revision m_codec_revision;
bool m_double_rate_pcm_enabled { false }; bool m_double_rate_pcm_enabled { false };
IOAddress m_io_mixer_base; IOAddress m_io_mixer_base;
IOAddress m_io_bus_base; IOAddress m_io_bus_base;