diff options
| author | 2018-01-14 21:29:11 -0500 | |
|---|---|---|
| committer | 2018-01-14 21:45:06 -0500 | |
| commit | 7a50d56d0eadab17c8f190e2e2341e985f6b8115 (patch) | |
| tree | 98e4c55af1d7dfbae79eb14e1dd1d80722c44011 /src | |
| parent | hid: Implement IAppletResource::GetSharedMemoryHandle. (diff) | |
| download | yuzu-7a50d56d0eadab17c8f190e2e2341e985f6b8115.tar.gz yuzu-7a50d56d0eadab17c8f190e2e2341e985f6b8115.tar.xz yuzu-7a50d56d0eadab17c8f190e2e2341e985f6b8115.zip | |
audio: Stub out AudOutU::ListAudioOuts.
Diffstat (limited to 'src')
| -rw-r--r-- | src/core/hle/service/audio/audio.cpp | 17 | ||||
| -rw-r--r-- | src/core/hle/service/audio/audio.h | 16 | ||||
| -rw-r--r-- | src/core/hle/service/audio/audout_u.cpp | 26 | ||||
| -rw-r--r-- | src/core/hle/service/audio/audout_u.h | 23 | ||||
| -rw-r--r-- | src/core/hle/service/service.cpp | 2 |
5 files changed, 84 insertions, 0 deletions
diff --git a/src/core/hle/service/audio/audio.cpp b/src/core/hle/service/audio/audio.cpp new file mode 100644 index 000000000..0ffd72e7b --- /dev/null +++ b/src/core/hle/service/audio/audio.cpp | |||
| @@ -0,0 +1,17 @@ | |||
| 1 | // Copyright 2018 yuzu emulator team | ||
| 2 | // Licensed under GPLv2 or any later version | ||
| 3 | // Refer to the license.txt file included. | ||
| 4 | |||
| 5 | #include "core/hle/ipc_helpers.h" | ||
| 6 | #include "core/hle/service/audio/audio.h" | ||
| 7 | #include "core/hle/service/audio/audout_u.h" | ||
| 8 | |||
| 9 | namespace Service { | ||
| 10 | namespace Audio { | ||
| 11 | |||
| 12 | void InstallInterfaces(SM::ServiceManager& service_manager) { | ||
| 13 | std::make_shared<AudOutU>()->InstallAsService(service_manager); | ||
| 14 | } | ||
| 15 | |||
| 16 | } // namespace Audio | ||
| 17 | } // namespace Service | ||
diff --git a/src/core/hle/service/audio/audio.h b/src/core/hle/service/audio/audio.h new file mode 100644 index 000000000..cbd56b2a8 --- /dev/null +++ b/src/core/hle/service/audio/audio.h | |||
| @@ -0,0 +1,16 @@ | |||
| 1 | // Copyright 2018 yuzu emulator team | ||
| 2 | // Licensed under GPLv2 or any later version | ||
| 3 | // Refer to the license.txt file included. | ||
| 4 | |||
| 5 | #pragma once | ||
| 6 | |||
| 7 | #include "core/hle/service/service.h" | ||
| 8 | |||
| 9 | namespace Service { | ||
| 10 | namespace Audio { | ||
| 11 | |||
| 12 | /// Registers all Audio services with the specified service manager. | ||
| 13 | void InstallInterfaces(SM::ServiceManager& service_manager); | ||
| 14 | |||
| 15 | } // namespace Audio | ||
| 16 | } // namespace Service | ||
diff --git a/src/core/hle/service/audio/audout_u.cpp b/src/core/hle/service/audio/audout_u.cpp new file mode 100644 index 000000000..c028262c6 --- /dev/null +++ b/src/core/hle/service/audio/audout_u.cpp | |||
| @@ -0,0 +1,26 @@ | |||
| 1 | // Copyright 2018 yuzu emulator team | ||
| 2 | // Licensed under GPLv2 or any later version | ||
| 3 | // Refer to the license.txt file included. | ||
| 4 | |||
| 5 | #include "common/logging/log.h" | ||
| 6 | #include "core/hle/ipc_helpers.h" | ||
| 7 | #include "core/hle/service/audio/audout_u.h" | ||
| 8 | |||
| 9 | namespace Service { | ||
| 10 | namespace Audio { | ||
| 11 | |||
| 12 | void AudOutU::ListAudioOuts(Kernel::HLERequestContext& ctx) { | ||
| 13 | LOG_WARNING(Service, "(STUBBED) called"); | ||
| 14 | IPC::RequestBuilder rb{ctx, 2}; | ||
| 15 | rb.Push(RESULT_SUCCESS); | ||
| 16 | } | ||
| 17 | |||
| 18 | AudOutU::AudOutU() : ServiceFramework("audout:u") { | ||
| 19 | static const FunctionInfo functions[] = { | ||
| 20 | {0x00000000, &AudOutU::ListAudioOuts, "ListAudioOuts"}, | ||
| 21 | }; | ||
| 22 | RegisterHandlers(functions); | ||
| 23 | } | ||
| 24 | |||
| 25 | } // namespace Audio | ||
| 26 | } // namespace Service | ||
diff --git a/src/core/hle/service/audio/audout_u.h b/src/core/hle/service/audio/audout_u.h new file mode 100644 index 000000000..42680af94 --- /dev/null +++ b/src/core/hle/service/audio/audout_u.h | |||
| @@ -0,0 +1,23 @@ | |||
| 1 | // Copyright 2018 yuzu emulator team | ||
| 2 | // Licensed under GPLv2 or any later version | ||
| 3 | // Refer to the license.txt file included. | ||
| 4 | |||
| 5 | #pragma once | ||
| 6 | |||
| 7 | #include "core/hle/kernel/hle_ipc.h" | ||
| 8 | #include "core/hle/service/service.h" | ||
| 9 | |||
| 10 | namespace Service { | ||
| 11 | namespace Audio { | ||
| 12 | |||
| 13 | class AudOutU final : public ServiceFramework<AudOutU> { | ||
| 14 | public: | ||
| 15 | AudOutU(); | ||
| 16 | ~AudOutU() = default; | ||
| 17 | |||
| 18 | private: | ||
| 19 | void ListAudioOuts(Kernel::HLERequestContext& ctx); | ||
| 20 | }; | ||
| 21 | |||
| 22 | } // namespace Audio | ||
| 23 | } // namespace Service | ||
diff --git a/src/core/hle/service/service.cpp b/src/core/hle/service/service.cpp index 0ecc0eb16..c27525980 100644 --- a/src/core/hle/service/service.cpp +++ b/src/core/hle/service/service.cpp | |||
| @@ -17,6 +17,7 @@ | |||
| 17 | #include "core/hle/service/am/am.h" | 17 | #include "core/hle/service/am/am.h" |
| 18 | #include "core/hle/service/aoc/aoc_u.h" | 18 | #include "core/hle/service/aoc/aoc_u.h" |
| 19 | #include "core/hle/service/apm/apm.h" | 19 | #include "core/hle/service/apm/apm.h" |
| 20 | #include "core/hle/service/audio/audio.h" | ||
| 20 | #include "core/hle/service/hid/hid.h" | 21 | #include "core/hle/service/hid/hid.h" |
| 21 | #include "core/hle/service/lm/lm.h" | 22 | #include "core/hle/service/lm/lm.h" |
| 22 | #include "core/hle/service/nvdrv/nvdrv.h" | 23 | #include "core/hle/service/nvdrv/nvdrv.h" |
| @@ -164,6 +165,7 @@ void Init() { | |||
| 164 | AM::InstallInterfaces(*SM::g_service_manager); | 165 | AM::InstallInterfaces(*SM::g_service_manager); |
| 165 | AOC::InstallInterfaces(*SM::g_service_manager); | 166 | AOC::InstallInterfaces(*SM::g_service_manager); |
| 166 | APM::InstallInterfaces(*SM::g_service_manager); | 167 | APM::InstallInterfaces(*SM::g_service_manager); |
| 168 | Audio::InstallInterfaces(*SM::g_service_manager); | ||
| 167 | HID::InstallInterfaces(*SM::g_service_manager); | 169 | HID::InstallInterfaces(*SM::g_service_manager); |
| 168 | LM::InstallInterfaces(*SM::g_service_manager); | 170 | LM::InstallInterfaces(*SM::g_service_manager); |
| 169 | NVDRV::InstallInterfaces(*SM::g_service_manager); | 171 | NVDRV::InstallInterfaces(*SM::g_service_manager); |