Correct audio command numbers & add or rename some functions (#455)
* Add unknown function at the number command 2 * correct audout:u commands numbers * correct audrec:u cmd number & add Unknown function * correct IAudioDevice command numbers * correct codecctl cmd numbers & rename the 8 function * correct place of unknown function & fix clang-format
This commit is contained in:
parent
693f78e6c2
commit
c6eaf0b2cf
|
@ -35,10 +35,8 @@ public:
|
||||||
|
|
||||||
AudInU::AudInU() : ServiceFramework("audin:u") {
|
AudInU::AudInU() : ServiceFramework("audin:u") {
|
||||||
static const FunctionInfo functions[] = {
|
static const FunctionInfo functions[] = {
|
||||||
{0, nullptr, "ListAudioIns"},
|
{0, nullptr, "ListAudioIns"}, {1, nullptr, "OpenAudioIn"}, {2, nullptr, "Unknown"},
|
||||||
{1, nullptr, "OpenAudioIn"},
|
{3, nullptr, "OpenAudioInAuto"}, {4, nullptr, "ListAudioInsAuto"},
|
||||||
{3, nullptr, "OpenAudioInAuto"},
|
|
||||||
{4, nullptr, "ListAudioInsAuto"},
|
|
||||||
};
|
};
|
||||||
RegisterHandlers(functions);
|
RegisterHandlers(functions);
|
||||||
}
|
}
|
||||||
|
|
|
@ -196,10 +196,10 @@ void AudOutU::OpenAudioOut(Kernel::HLERequestContext& ctx) {
|
||||||
}
|
}
|
||||||
|
|
||||||
AudOutU::AudOutU() : ServiceFramework("audout:u") {
|
AudOutU::AudOutU() : ServiceFramework("audout:u") {
|
||||||
static const FunctionInfo functions[] = {{0x00000000, &AudOutU::ListAudioOuts, "ListAudioOuts"},
|
static const FunctionInfo functions[] = {{0, &AudOutU::ListAudioOuts, "ListAudioOuts"},
|
||||||
{0x00000001, &AudOutU::OpenAudioOut, "OpenAudioOut"},
|
{1, &AudOutU::OpenAudioOut, "OpenAudioOut"},
|
||||||
{0x00000002, nullptr, "ListAudioOutsAuto"},
|
{2, nullptr, "ListAudioOutsAuto"},
|
||||||
{0x00000003, nullptr, "OpenAudioOutAuto"}};
|
{3, nullptr, "OpenAudioOutAuto"}};
|
||||||
RegisterHandlers(functions);
|
RegisterHandlers(functions);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -20,6 +20,7 @@ public:
|
||||||
{4, nullptr, "RegisterBufferEvent"},
|
{4, nullptr, "RegisterBufferEvent"},
|
||||||
{5, nullptr, "GetReleasedFinalOutputRecorderBuffer"},
|
{5, nullptr, "GetReleasedFinalOutputRecorderBuffer"},
|
||||||
{6, nullptr, "ContainsFinalOutputRecorderBuffer"},
|
{6, nullptr, "ContainsFinalOutputRecorderBuffer"},
|
||||||
|
{7, nullptr, "Unknown"},
|
||||||
{8, nullptr, "AppendFinalOutputRecorderBufferAuto"},
|
{8, nullptr, "AppendFinalOutputRecorderBufferAuto"},
|
||||||
{9, nullptr, "GetReleasedFinalOutputRecorderBufferAuto"},
|
{9, nullptr, "GetReleasedFinalOutputRecorderBufferAuto"},
|
||||||
};
|
};
|
||||||
|
@ -30,7 +31,7 @@ public:
|
||||||
|
|
||||||
AudRecU::AudRecU() : ServiceFramework("audrec:u") {
|
AudRecU::AudRecU() : ServiceFramework("audrec:u") {
|
||||||
static const FunctionInfo functions[] = {
|
static const FunctionInfo functions[] = {
|
||||||
{0x00000000, nullptr, "OpenFinalOutputRecorder"},
|
{0, nullptr, "OpenFinalOutputRecorder"},
|
||||||
};
|
};
|
||||||
RegisterHandlers(functions);
|
RegisterHandlers(functions);
|
||||||
}
|
}
|
||||||
|
|
|
@ -156,19 +156,20 @@ class IAudioDevice final : public ServiceFramework<IAudioDevice> {
|
||||||
public:
|
public:
|
||||||
IAudioDevice() : ServiceFramework("IAudioDevice") {
|
IAudioDevice() : ServiceFramework("IAudioDevice") {
|
||||||
static const FunctionInfo functions[] = {
|
static const FunctionInfo functions[] = {
|
||||||
{0x0, &IAudioDevice::ListAudioDeviceName, "ListAudioDeviceName"},
|
{0, &IAudioDevice::ListAudioDeviceName, "ListAudioDeviceName"},
|
||||||
{0x1, &IAudioDevice::SetAudioDeviceOutputVolume, "SetAudioDeviceOutputVolume"},
|
{1, &IAudioDevice::SetAudioDeviceOutputVolume, "SetAudioDeviceOutputVolume"},
|
||||||
{0x2, nullptr, "GetAudioDeviceOutputVolume"},
|
{2, nullptr, "GetAudioDeviceOutputVolume"},
|
||||||
{0x3, &IAudioDevice::GetActiveAudioDeviceName, "GetActiveAudioDeviceName"},
|
{3, &IAudioDevice::GetActiveAudioDeviceName, "GetActiveAudioDeviceName"},
|
||||||
{0x4, &IAudioDevice::QueryAudioDeviceSystemEvent, "QueryAudioDeviceSystemEvent"},
|
{4, &IAudioDevice::QueryAudioDeviceSystemEvent, "QueryAudioDeviceSystemEvent"},
|
||||||
{0x5, &IAudioDevice::GetActiveChannelCount, "GetActiveChannelCount"},
|
{5, &IAudioDevice::GetActiveChannelCount, "GetActiveChannelCount"},
|
||||||
{0x6, &IAudioDevice::ListAudioDeviceName,
|
{6, &IAudioDevice::ListAudioDeviceName,
|
||||||
"ListAudioDeviceNameAuto"}, // TODO(ogniK): Confirm if autos are identical to non auto
|
"ListAudioDeviceNameAuto"}, // TODO(ogniK): Confirm if autos are identical to non auto
|
||||||
{0x7, &IAudioDevice::SetAudioDeviceOutputVolume, "SetAudioDeviceOutputVolumeAuto"},
|
{7, &IAudioDevice::SetAudioDeviceOutputVolume, "SetAudioDeviceOutputVolumeAuto"},
|
||||||
{0x8, nullptr, "GetAudioDeviceOutputVolumeAuto"},
|
{8, nullptr, "GetAudioDeviceOutputVolumeAuto"},
|
||||||
{0xa, &IAudioDevice::GetActiveAudioDeviceName, "GetActiveAudioDeviceNameAuto"},
|
{10, &IAudioDevice::GetActiveAudioDeviceName, "GetActiveAudioDeviceNameAuto"},
|
||||||
{0xb, nullptr, "QueryAudioDeviceInputEvent"},
|
{11, nullptr, "QueryAudioDeviceInputEvent"},
|
||||||
{0xc, nullptr, "QueryAudioDeviceOutputEvent"}};
|
{12, nullptr, "QueryAudioDeviceOutputEvent"},
|
||||||
|
};
|
||||||
RegisterHandlers(functions);
|
RegisterHandlers(functions);
|
||||||
|
|
||||||
buffer_event =
|
buffer_event =
|
||||||
|
|
|
@ -11,19 +11,19 @@ namespace Service::Audio {
|
||||||
|
|
||||||
CodecCtl::CodecCtl() : ServiceFramework("codecctl") {
|
CodecCtl::CodecCtl() : ServiceFramework("codecctl") {
|
||||||
static const FunctionInfo functions[] = {
|
static const FunctionInfo functions[] = {
|
||||||
{0x00000000, nullptr, "InitializeCodecController"},
|
{0, nullptr, "InitializeCodecController"},
|
||||||
{0x00000001, nullptr, "FinalizeCodecController"},
|
{1, nullptr, "FinalizeCodecController"},
|
||||||
{0x00000002, nullptr, "SleepCodecController"},
|
{2, nullptr, "SleepCodecController"},
|
||||||
{0x00000003, nullptr, "WakeCodecController"},
|
{3, nullptr, "WakeCodecController"},
|
||||||
{0x00000004, nullptr, "SetCodecVolume"},
|
{4, nullptr, "SetCodecVolume"},
|
||||||
{0x00000005, nullptr, "GetCodecVolumeMax"},
|
{5, nullptr, "GetCodecVolumeMax"},
|
||||||
{0x00000006, nullptr, "GetCodecVolumeMin"},
|
{6, nullptr, "GetCodecVolumeMin"},
|
||||||
{0x00000007, nullptr, "SetCodecActiveTarget"},
|
{7, nullptr, "SetCodecActiveTarget"},
|
||||||
{0x00000008, nullptr, "Unknown"},
|
{8, nullptr, "GetCodecActiveTarget"},
|
||||||
{0x00000009, nullptr, "BindCodecHeadphoneMicJackInterrupt"},
|
{9, nullptr, "BindCodecHeadphoneMicJackInterrupt"},
|
||||||
{0x00000010, nullptr, "IsCodecHeadphoneMicJackInserted"},
|
{10, nullptr, "IsCodecHeadphoneMicJackInserted"},
|
||||||
{0x00000011, nullptr, "ClearCodecHeadphoneMicJackInterrupt"},
|
{11, nullptr, "ClearCodecHeadphoneMicJackInterrupt"},
|
||||||
{0x00000012, nullptr, "IsCodecDeviceRequested"},
|
{12, nullptr, "IsCodecDeviceRequested"},
|
||||||
};
|
};
|
||||||
RegisterHandlers(functions);
|
RegisterHandlers(functions);
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue