From 9eb485702fdefbb029b7ad31c3b01eb887f41e73 Mon Sep 17 00:00:00 2001 From: bunnei Date: Mon, 2 Apr 2018 23:05:17 -0400 Subject: service: Add friend:u interface. --- src/core/CMakeLists.txt | 2 ++ src/core/hle/service/friend/friend.cpp | 2 ++ src/core/hle/service/friend/friend_u.cpp | 19 +++++++++++++++++++ src/core/hle/service/friend/friend_u.h | 18 ++++++++++++++++++ 4 files changed, 41 insertions(+) create mode 100644 src/core/hle/service/friend/friend_u.cpp create mode 100644 src/core/hle/service/friend/friend_u.h diff --git a/src/core/CMakeLists.txt b/src/core/CMakeLists.txt index 6f8104516..97d795d5f 100644 --- a/src/core/CMakeLists.txt +++ b/src/core/CMakeLists.txt @@ -130,6 +130,8 @@ add_library(core STATIC hle/service/friend/friend.h hle/service/friend/friend_a.cpp hle/service/friend/friend_a.h + hle/service/friend/friend_u.cpp + hle/service/friend/friend_u.h hle/service/hid/hid.cpp hle/service/hid/hid.h hle/service/lm/lm.cpp diff --git a/src/core/hle/service/friend/friend.cpp b/src/core/hle/service/friend/friend.cpp index 26593bb0c..fc5adc56d 100644 --- a/src/core/hle/service/friend/friend.cpp +++ b/src/core/hle/service/friend/friend.cpp @@ -6,6 +6,7 @@ #include "core/hle/ipc_helpers.h" #include "core/hle/service/friend/friend.h" #include "core/hle/service/friend/friend_a.h" +#include "core/hle/service/friend/friend_u.h" namespace Service { namespace Friend { @@ -22,6 +23,7 @@ Module::Interface::Interface(std::shared_ptr module, const char* name) void InstallInterfaces(SM::ServiceManager& service_manager) { auto module = std::make_shared(); std::make_shared(module)->InstallAsService(service_manager); + std::make_shared(module)->InstallAsService(service_manager); } } // namespace Friend diff --git a/src/core/hle/service/friend/friend_u.cpp b/src/core/hle/service/friend/friend_u.cpp new file mode 100644 index 000000000..084388e5f --- /dev/null +++ b/src/core/hle/service/friend/friend_u.cpp @@ -0,0 +1,19 @@ +// Copyright 2018 yuzu emulator team +// Licensed under GPLv2 or any later version +// Refer to the license.txt file included. + +#include "core/hle/service/friend/friend_u.h" + +namespace Service { +namespace Friend { + +Friend_U::Friend_U(std::shared_ptr module) + : Module::Interface(std::move(module), "friend:u") { + static const FunctionInfo functions[] = { + {0, &Friend_U::Unknown, "Unknown"}, + }; + RegisterHandlers(functions); +} + +} // namespace Friend +} // namespace Service diff --git a/src/core/hle/service/friend/friend_u.h b/src/core/hle/service/friend/friend_u.h new file mode 100644 index 000000000..6be49ff01 --- /dev/null +++ b/src/core/hle/service/friend/friend_u.h @@ -0,0 +1,18 @@ +// Copyright 2018 yuzu emulator team +// Licensed under GPLv2 or any later version +// Refer to the license.txt file included. + +#pragma once + +#include "core/hle/service/friend/friend.h" + +namespace Service { +namespace Friend { + +class Friend_U final : public Module::Interface { +public: + explicit Friend_U(std::shared_ptr module); +}; + +} // namespace Friend +} // namespace Service -- cgit v1.2.3 From 99ae9dbf490c599afee21b1dc47de51734381a64 Mon Sep 17 00:00:00 2001 From: bunnei Date: Mon, 2 Apr 2018 23:07:38 -0400 Subject: shared_memory: Remove incorrect 3ds-specific check. --- src/core/hle/kernel/shared_memory.cpp | 12 ------------ 1 file changed, 12 deletions(-) diff --git a/src/core/hle/kernel/shared_memory.cpp b/src/core/hle/kernel/shared_memory.cpp index 88230bdd9..bc99993c8 100644 --- a/src/core/hle/kernel/shared_memory.cpp +++ b/src/core/hle/kernel/shared_memory.cpp @@ -120,18 +120,6 @@ ResultCode SharedMemory::Map(Process* target_process, VAddr address, MemoryPermi return ERR_WRONG_PERMISSION; } - // TODO(Subv): The same process that created a SharedMemory object - // can not map it in its own address space unless it was created with addr=0, result 0xD900182C. - - if (address != 0) { - // TODO(shinyquagsire23): Check for virtual/mappable memory here too? - if (address >= Memory::HEAP_VADDR && address < Memory::HEAP_VADDR_END) { - LOG_ERROR(Kernel, "cannot map id=%u, address=0x%lx name=%s, invalid address", - GetObjectId(), address, name.c_str()); - return ERR_INVALID_ADDRESS; - } - } - VAddr target_address = address; if (base_address == 0 && target_address == 0) { -- cgit v1.2.3 From 9d08a11c1deb80843dd9996a3df17f6da2ec401e Mon Sep 17 00:00:00 2001 From: bunnei Date: Mon, 2 Apr 2018 23:28:45 -0400 Subject: vi: Implement GetDisplayResolution. --- src/core/hle/service/vi/vi.cpp | 19 +++++++++++++++++++ src/core/hle/service/vi/vi.h | 7 +++++++ 2 files changed, 26 insertions(+) diff --git a/src/core/hle/service/vi/vi.cpp b/src/core/hle/service/vi/vi.cpp index 06c34e979..42793f155 100644 --- a/src/core/hle/service/vi/vi.cpp +++ b/src/core/hle/service/vi/vi.cpp @@ -17,6 +17,7 @@ #include "core/hle/service/vi/vi_m.h" #include "core/hle/service/vi/vi_s.h" #include "core/hle/service/vi/vi_u.h" +#include "core/settings.h" #include "video_core/renderer_base.h" #include "video_core/video_core.h" @@ -711,6 +712,23 @@ private: rb.Push(RESULT_SUCCESS); } + void GetDisplayResolution(Kernel::HLERequestContext& ctx) { + LOG_WARNING(Service_VI, "(STUBBED) called"); + IPC::RequestParser rp{ctx}; + u64 display_id = rp.Pop(); + + IPC::ResponseBuilder rb = rp.MakeBuilder(6, 0, 0); + rb.Push(RESULT_SUCCESS); + + if (Settings::values.use_docked_mode) { + rb.Push(static_cast(DisplayResolution::DockedWidth)); + rb.Push(static_cast(DisplayResolution::DockedHeight)); + } else { + rb.Push(static_cast(DisplayResolution::UndockedWidth)); + rb.Push(static_cast(DisplayResolution::UndockedHeight)); + } + } + void SetLayerScalingMode(Kernel::HLERequestContext& ctx) { LOG_WARNING(Service_VI, "(STUBBED) called"); IPC::RequestParser rp{ctx}; @@ -808,6 +826,7 @@ IApplicationDisplayService::IApplicationDisplayService( {1000, &IApplicationDisplayService::ListDisplays, "ListDisplays"}, {1010, &IApplicationDisplayService::OpenDisplay, "OpenDisplay"}, {1020, &IApplicationDisplayService::CloseDisplay, "CloseDisplay"}, + {1102, &IApplicationDisplayService::GetDisplayResolution, "GetDisplayResolution"}, {2101, &IApplicationDisplayService::SetLayerScalingMode, "SetLayerScalingMode"}, {2020, &IApplicationDisplayService::OpenLayer, "OpenLayer"}, {2030, &IApplicationDisplayService::CreateStrayLayer, "CreateStrayLayer"}, diff --git a/src/core/hle/service/vi/vi.h b/src/core/hle/service/vi/vi.h index 985c9d27c..7f16fad8e 100644 --- a/src/core/hle/service/vi/vi.h +++ b/src/core/hle/service/vi/vi.h @@ -14,6 +14,13 @@ struct EventType; namespace Service { namespace VI { +enum class DisplayResolution : u32 { + DockedWidth = 1920, + DockedHeight = 1080, + UndockedWidth = 1280, + UndockedHeight = 720, +}; + class Module final { public: class Interface : public ServiceFramework { -- cgit v1.2.3 From 910b02d74b38fc37915be35a2d2a5fa027e37252 Mon Sep 17 00:00:00 2001 From: bunnei Date: Mon, 2 Apr 2018 23:30:27 -0400 Subject: nifm: GetResult does not return a data field. --- src/core/hle/service/nifm/nifm.cpp | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/core/hle/service/nifm/nifm.cpp b/src/core/hle/service/nifm/nifm.cpp index dd2d5fe63..b32112db3 100644 --- a/src/core/hle/service/nifm/nifm.cpp +++ b/src/core/hle/service/nifm/nifm.cpp @@ -70,9 +70,8 @@ private: } void GetResult(Kernel::HLERequestContext& ctx) { LOG_WARNING(Service_NIFM, "(STUBBED) called"); - IPC::ResponseBuilder rb{ctx, 3}; + IPC::ResponseBuilder rb{ctx, 2}; rb.Push(RESULT_SUCCESS); - rb.Push(0); } void GetSystemEventReadableHandles(Kernel::HLERequestContext& ctx) { LOG_WARNING(Service_NIFM, "(STUBBED) called"); -- cgit v1.2.3 From 3d4dfefaecd247fb1969d5e403ac8c97e490d7d9 Mon Sep 17 00:00:00 2001 From: bunnei Date: Mon, 2 Apr 2018 23:31:29 -0400 Subject: audout_u: Implement GetAudioOutState. --- src/core/hle/service/audio/audout_u.cpp | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/src/core/hle/service/audio/audout_u.cpp b/src/core/hle/service/audio/audout_u.cpp index e873d768f..8e935cb7f 100644 --- a/src/core/hle/service/audio/audout_u.cpp +++ b/src/core/hle/service/audio/audout_u.cpp @@ -25,7 +25,7 @@ class IAudioOut final : public ServiceFramework { public: IAudioOut() : ServiceFramework("IAudioOut"), audio_out_state(AudioState::Stopped) { static const FunctionInfo functions[] = { - {0x0, nullptr, "GetAudioOutState"}, + {0x0, &IAudioOut::GetAudioOutState, "GetAudioOutState"}, {0x1, &IAudioOut::StartAudioOut, "StartAudioOut"}, {0x2, &IAudioOut::StopAudioOut, "StopAudioOut"}, {0x3, &IAudioOut::AppendAudioOutBuffer_1, "AppendAudioOutBuffer_1"}, @@ -57,6 +57,13 @@ public: } private: + void GetAudioOutState(Kernel::HLERequestContext& ctx) { + LOG_DEBUG(Service_Audio, "called"); + IPC::ResponseBuilder rb{ctx, 3}; + rb.Push(RESULT_SUCCESS); + rb.Push(static_cast(audio_out_state)); + } + void StartAudioOut(Kernel::HLERequestContext& ctx) { LOG_WARNING(Service_Audio, "(STUBBED) called"); -- cgit v1.2.3 From 4c0cf3d5ff8295e1f77b8bca2e5399805d1beead Mon Sep 17 00:00:00 2001 From: bunnei Date: Mon, 2 Apr 2018 23:34:52 -0400 Subject: audren_u: Stub out GetActiveAudioDeviceName. --- src/core/hle/service/audio/audren_u.cpp | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/src/core/hle/service/audio/audren_u.cpp b/src/core/hle/service/audio/audren_u.cpp index 6d0461bbc..7990595aa 100644 --- a/src/core/hle/service/audio/audren_u.cpp +++ b/src/core/hle/service/audio/audren_u.cpp @@ -158,7 +158,7 @@ public: {0x0, &IAudioDevice::ListAudioDeviceName, "ListAudioDeviceName"}, {0x1, &IAudioDevice::SetAudioDeviceOutputVolume, "SetAudioDeviceOutputVolume"}, {0x2, nullptr, "GetAudioDeviceOutputVolume"}, - {0x3, nullptr, "GetActiveAudioDeviceName"}, + {0x3, &IAudioDevice::GetActiveAudioDeviceName, "GetActiveAudioDeviceName"}, {0x4, &IAudioDevice::QueryAudioDeviceSystemEvent, "QueryAudioDeviceSystemEvent"}, {0x5, &IAudioDevice::GetActiveChannelCount, "GetActiveChannelCount"}, {0x6, nullptr, "ListAudioDeviceNameAuto"}, @@ -199,6 +199,18 @@ private: rb.Push(RESULT_SUCCESS); } + void GetActiveAudioDeviceName(Kernel::HLERequestContext& ctx) { + LOG_WARNING(Service_Audio, "(STUBBED) called"); + IPC::RequestParser rp{ctx}; + + const std::string audio_interface = "AudioDevice"; + ctx.WriteBuffer(audio_interface.c_str(), audio_interface.size()); + + IPC::ResponseBuilder rb = rp.MakeBuilder(3, 0, 0); + rb.Push(RESULT_SUCCESS); + rb.Push(1); + } + void QueryAudioDeviceSystemEvent(Kernel::HLERequestContext& ctx) { LOG_WARNING(Service_Audio, "(STUBBED) called"); -- cgit v1.2.3 From 40bccd74d3336e69112694b2d0e42683efcd4367 Mon Sep 17 00:00:00 2001 From: bunnei Date: Mon, 2 Apr 2018 23:50:17 -0400 Subject: svc: Stub out SetThreadActivity, GetThreadContext. --- src/core/hle/kernel/svc.cpp | 16 ++++++++++++++-- src/core/hle/kernel/svc_wrap.h | 5 +++++ 2 files changed, 19 insertions(+), 2 deletions(-) diff --git a/src/core/hle/kernel/svc.cpp b/src/core/hle/kernel/svc.cpp index 171bbd956..36ea23cd9 100644 --- a/src/core/hle/kernel/svc.cpp +++ b/src/core/hle/kernel/svc.cpp @@ -371,6 +371,18 @@ static ResultCode GetInfo(u64* result, u64 info_id, u64 handle, u64 info_sub_id) return RESULT_SUCCESS; } +/// Sets the thread activity +static ResultCode SetThreadActivity(Handle handle, u32 unknown) { + LOG_WARNING(Kernel_SVC, "(STUBBED) called, handle=0x%08X, unknown=0x%08X", handle, unknown); + return RESULT_SUCCESS; +} + +/// Gets the thread context +static ResultCode GetThreadContext(Handle handle, VAddr addr) { + LOG_WARNING(Kernel_SVC, "(STUBBED) called, handle=0x%08X, addr=0x%" PRIx64, handle, addr); + return RESULT_SUCCESS; +} + /// Gets the priority for the specified thread static ResultCode GetThreadPriority(u32* priority, Handle handle) { const SharedPtr thread = g_handle_table.Get(handle); @@ -853,8 +865,8 @@ static const FunctionDef SVC_Table[] = { {0x2F, nullptr, "GetLastThreadInfo"}, {0x30, nullptr, "GetResourceLimitLimitValue"}, {0x31, nullptr, "GetResourceLimitCurrentValue"}, - {0x32, nullptr, "SetThreadActivity"}, - {0x33, nullptr, "GetThreadContext"}, + {0x32, SvcWrap, "SetThreadActivity"}, + {0x33, SvcWrap, "GetThreadContext"}, {0x34, nullptr, "Unknown"}, {0x35, nullptr, "Unknown"}, {0x36, nullptr, "Unknown"}, diff --git a/src/core/hle/kernel/svc_wrap.h b/src/core/hle/kernel/svc_wrap.h index 5da4f5269..c86ad3e04 100644 --- a/src/core/hle/kernel/svc_wrap.h +++ b/src/core/hle/kernel/svc_wrap.h @@ -70,6 +70,11 @@ void SvcWrap() { FuncReturn(retval); } +template +void SvcWrap() { + FuncReturn(func((u32)(PARAM(0) & 0xFFFFFFFF), PARAM(1)).raw); +} + template void SvcWrap() { FuncReturn(func((u32)(PARAM(0) & 0xFFFFFFFF), (u32)(PARAM(1) & 0xFFFFFFFF), PARAM(2)).raw); -- cgit v1.2.3