summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorGravatar greggameplayer2018-05-21 05:48:44 +0200
committerGravatar bunnei2018-05-20 23:48:44 -0400
commitc6eaf0b2cf993c25516f2ae1d27fed840e99b472 (patch)
tree80d3a9c486e94176c38d8fe18e2ff056714f7122 /src
parentMerge pull request #457 from Subv/mutex_waiters (diff)
downloadyuzu-c6eaf0b2cf993c25516f2ae1d27fed840e99b472.tar.gz
yuzu-c6eaf0b2cf993c25516f2ae1d27fed840e99b472.tar.xz
yuzu-c6eaf0b2cf993c25516f2ae1d27fed840e99b472.zip
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
Diffstat (limited to 'src')
-rw-r--r--src/core/hle/service/audio/audin_u.cpp6
-rw-r--r--src/core/hle/service/audio/audout_u.cpp8
-rw-r--r--src/core/hle/service/audio/audrec_u.cpp3
-rw-r--r--src/core/hle/service/audio/audren_u.cpp25
-rw-r--r--src/core/hle/service/audio/codecctl.cpp26
5 files changed, 34 insertions, 34 deletions
diff --git a/src/core/hle/service/audio/audin_u.cpp b/src/core/hle/service/audio/audin_u.cpp
index dca2bfb92..cbc49e55e 100644
--- a/src/core/hle/service/audio/audin_u.cpp
+++ b/src/core/hle/service/audio/audin_u.cpp
@@ -35,10 +35,8 @@ public:
35 35
36AudInU::AudInU() : ServiceFramework("audin:u") { 36AudInU::AudInU() : ServiceFramework("audin:u") {
37 static const FunctionInfo functions[] = { 37 static const FunctionInfo functions[] = {
38 {0, nullptr, "ListAudioIns"}, 38 {0, nullptr, "ListAudioIns"}, {1, nullptr, "OpenAudioIn"}, {2, nullptr, "Unknown"},
39 {1, nullptr, "OpenAudioIn"}, 39 {3, nullptr, "OpenAudioInAuto"}, {4, nullptr, "ListAudioInsAuto"},
40 {3, nullptr, "OpenAudioInAuto"},
41 {4, nullptr, "ListAudioInsAuto"},
42 }; 40 };
43 RegisterHandlers(functions); 41 RegisterHandlers(functions);
44} 42}
diff --git a/src/core/hle/service/audio/audout_u.cpp b/src/core/hle/service/audio/audout_u.cpp
index fa3728672..402eaa306 100644
--- a/src/core/hle/service/audio/audout_u.cpp
+++ b/src/core/hle/service/audio/audout_u.cpp
@@ -196,10 +196,10 @@ void AudOutU::OpenAudioOut(Kernel::HLERequestContext& ctx) {
196} 196}
197 197
198AudOutU::AudOutU() : ServiceFramework("audout:u") { 198AudOutU::AudOutU() : ServiceFramework("audout:u") {
199 static const FunctionInfo functions[] = {{0x00000000, &AudOutU::ListAudioOuts, "ListAudioOuts"}, 199 static const FunctionInfo functions[] = {{0, &AudOutU::ListAudioOuts, "ListAudioOuts"},
200 {0x00000001, &AudOutU::OpenAudioOut, "OpenAudioOut"}, 200 {1, &AudOutU::OpenAudioOut, "OpenAudioOut"},
201 {0x00000002, nullptr, "ListAudioOutsAuto"}, 201 {2, nullptr, "ListAudioOutsAuto"},
202 {0x00000003, nullptr, "OpenAudioOutAuto"}}; 202 {3, nullptr, "OpenAudioOutAuto"}};
203 RegisterHandlers(functions); 203 RegisterHandlers(functions);
204} 204}
205 205
diff --git a/src/core/hle/service/audio/audrec_u.cpp b/src/core/hle/service/audio/audrec_u.cpp
index b2be10919..74909415c 100644
--- a/src/core/hle/service/audio/audrec_u.cpp
+++ b/src/core/hle/service/audio/audrec_u.cpp
@@ -20,6 +20,7 @@ public:
20 {4, nullptr, "RegisterBufferEvent"}, 20 {4, nullptr, "RegisterBufferEvent"},
21 {5, nullptr, "GetReleasedFinalOutputRecorderBuffer"}, 21 {5, nullptr, "GetReleasedFinalOutputRecorderBuffer"},
22 {6, nullptr, "ContainsFinalOutputRecorderBuffer"}, 22 {6, nullptr, "ContainsFinalOutputRecorderBuffer"},
23 {7, nullptr, "Unknown"},
23 {8, nullptr, "AppendFinalOutputRecorderBufferAuto"}, 24 {8, nullptr, "AppendFinalOutputRecorderBufferAuto"},
24 {9, nullptr, "GetReleasedFinalOutputRecorderBufferAuto"}, 25 {9, nullptr, "GetReleasedFinalOutputRecorderBufferAuto"},
25 }; 26 };
@@ -30,7 +31,7 @@ public:
30 31
31AudRecU::AudRecU() : ServiceFramework("audrec:u") { 32AudRecU::AudRecU() : ServiceFramework("audrec:u") {
32 static const FunctionInfo functions[] = { 33 static const FunctionInfo functions[] = {
33 {0x00000000, nullptr, "OpenFinalOutputRecorder"}, 34 {0, nullptr, "OpenFinalOutputRecorder"},
34 }; 35 };
35 RegisterHandlers(functions); 36 RegisterHandlers(functions);
36} 37}
diff --git a/src/core/hle/service/audio/audren_u.cpp b/src/core/hle/service/audio/audren_u.cpp
index 0d6eb1d51..38bc65d95 100644
--- a/src/core/hle/service/audio/audren_u.cpp
+++ b/src/core/hle/service/audio/audren_u.cpp
@@ -156,19 +156,20 @@ class IAudioDevice final : public ServiceFramework<IAudioDevice> {
156public: 156public:
157 IAudioDevice() : ServiceFramework("IAudioDevice") { 157 IAudioDevice() : ServiceFramework("IAudioDevice") {
158 static const FunctionInfo functions[] = { 158 static const FunctionInfo functions[] = {
159 {0x0, &IAudioDevice::ListAudioDeviceName, "ListAudioDeviceName"}, 159 {0, &IAudioDevice::ListAudioDeviceName, "ListAudioDeviceName"},
160 {0x1, &IAudioDevice::SetAudioDeviceOutputVolume, "SetAudioDeviceOutputVolume"}, 160 {1, &IAudioDevice::SetAudioDeviceOutputVolume, "SetAudioDeviceOutputVolume"},
161 {0x2, nullptr, "GetAudioDeviceOutputVolume"}, 161 {2, nullptr, "GetAudioDeviceOutputVolume"},
162 {0x3, &IAudioDevice::GetActiveAudioDeviceName, "GetActiveAudioDeviceName"}, 162 {3, &IAudioDevice::GetActiveAudioDeviceName, "GetActiveAudioDeviceName"},
163 {0x4, &IAudioDevice::QueryAudioDeviceSystemEvent, "QueryAudioDeviceSystemEvent"}, 163 {4, &IAudioDevice::QueryAudioDeviceSystemEvent, "QueryAudioDeviceSystemEvent"},
164 {0x5, &IAudioDevice::GetActiveChannelCount, "GetActiveChannelCount"}, 164 {5, &IAudioDevice::GetActiveChannelCount, "GetActiveChannelCount"},
165 {0x6, &IAudioDevice::ListAudioDeviceName, 165 {6, &IAudioDevice::ListAudioDeviceName,
166 "ListAudioDeviceNameAuto"}, // TODO(ogniK): Confirm if autos are identical to non auto 166 "ListAudioDeviceNameAuto"}, // TODO(ogniK): Confirm if autos are identical to non auto
167 {0x7, &IAudioDevice::SetAudioDeviceOutputVolume, "SetAudioDeviceOutputVolumeAuto"}, 167 {7, &IAudioDevice::SetAudioDeviceOutputVolume, "SetAudioDeviceOutputVolumeAuto"},
168 {0x8, nullptr, "GetAudioDeviceOutputVolumeAuto"}, 168 {8, nullptr, "GetAudioDeviceOutputVolumeAuto"},
169 {0xa, &IAudioDevice::GetActiveAudioDeviceName, "GetActiveAudioDeviceNameAuto"}, 169 {10, &IAudioDevice::GetActiveAudioDeviceName, "GetActiveAudioDeviceNameAuto"},
170 {0xb, nullptr, "QueryAudioDeviceInputEvent"}, 170 {11, nullptr, "QueryAudioDeviceInputEvent"},
171 {0xc, nullptr, "QueryAudioDeviceOutputEvent"}}; 171 {12, nullptr, "QueryAudioDeviceOutputEvent"},
172 };
172 RegisterHandlers(functions); 173 RegisterHandlers(functions);
173 174
174 buffer_event = 175 buffer_event =
diff --git a/src/core/hle/service/audio/codecctl.cpp b/src/core/hle/service/audio/codecctl.cpp
index ba0f1d228..212c8d448 100644
--- a/src/core/hle/service/audio/codecctl.cpp
+++ b/src/core/hle/service/audio/codecctl.cpp
@@ -11,19 +11,19 @@ namespace Service::Audio {
11 11
12CodecCtl::CodecCtl() : ServiceFramework("codecctl") { 12CodecCtl::CodecCtl() : ServiceFramework("codecctl") {
13 static const FunctionInfo functions[] = { 13 static const FunctionInfo functions[] = {
14 {0x00000000, nullptr, "InitializeCodecController"}, 14 {0, nullptr, "InitializeCodecController"},
15 {0x00000001, nullptr, "FinalizeCodecController"}, 15 {1, nullptr, "FinalizeCodecController"},
16 {0x00000002, nullptr, "SleepCodecController"}, 16 {2, nullptr, "SleepCodecController"},
17 {0x00000003, nullptr, "WakeCodecController"}, 17 {3, nullptr, "WakeCodecController"},
18 {0x00000004, nullptr, "SetCodecVolume"}, 18 {4, nullptr, "SetCodecVolume"},
19 {0x00000005, nullptr, "GetCodecVolumeMax"}, 19 {5, nullptr, "GetCodecVolumeMax"},
20 {0x00000006, nullptr, "GetCodecVolumeMin"}, 20 {6, nullptr, "GetCodecVolumeMin"},
21 {0x00000007, nullptr, "SetCodecActiveTarget"}, 21 {7, nullptr, "SetCodecActiveTarget"},
22 {0x00000008, nullptr, "Unknown"}, 22 {8, nullptr, "GetCodecActiveTarget"},
23 {0x00000009, nullptr, "BindCodecHeadphoneMicJackInterrupt"}, 23 {9, nullptr, "BindCodecHeadphoneMicJackInterrupt"},
24 {0x00000010, nullptr, "IsCodecHeadphoneMicJackInserted"}, 24 {10, nullptr, "IsCodecHeadphoneMicJackInserted"},
25 {0x00000011, nullptr, "ClearCodecHeadphoneMicJackInterrupt"}, 25 {11, nullptr, "ClearCodecHeadphoneMicJackInterrupt"},
26 {0x00000012, nullptr, "IsCodecDeviceRequested"}, 26 {12, nullptr, "IsCodecDeviceRequested"},
27 }; 27 };
28 RegisterHandlers(functions); 28 RegisterHandlers(functions);
29} 29}