mirror of
https://git.suyu.dev/suyu/suyu.git
synced 2024-11-29 14:57:41 -05:00
Merge pull request #308 from bunnei/misc-fixes-2
Implement and stub several SVC/VI/Audio/Friend/etc. funcs
This commit is contained in:
commit
20bd26dc7d
12 changed files with 108 additions and 18 deletions
|
@ -130,6 +130,8 @@ add_library(core STATIC
|
||||||
hle/service/friend/friend.h
|
hle/service/friend/friend.h
|
||||||
hle/service/friend/friend_a.cpp
|
hle/service/friend/friend_a.cpp
|
||||||
hle/service/friend/friend_a.h
|
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.cpp
|
||||||
hle/service/hid/hid.h
|
hle/service/hid/hid.h
|
||||||
hle/service/lm/lm.cpp
|
hle/service/lm/lm.cpp
|
||||||
|
|
|
@ -120,18 +120,6 @@ ResultCode SharedMemory::Map(Process* target_process, VAddr address, MemoryPermi
|
||||||
return ERR_WRONG_PERMISSION;
|
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;
|
VAddr target_address = address;
|
||||||
|
|
||||||
if (base_address == 0 && target_address == 0) {
|
if (base_address == 0 && target_address == 0) {
|
||||||
|
|
|
@ -371,6 +371,18 @@ static ResultCode GetInfo(u64* result, u64 info_id, u64 handle, u64 info_sub_id)
|
||||||
return RESULT_SUCCESS;
|
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
|
/// Gets the priority for the specified thread
|
||||||
static ResultCode GetThreadPriority(u32* priority, Handle handle) {
|
static ResultCode GetThreadPriority(u32* priority, Handle handle) {
|
||||||
const SharedPtr<Thread> thread = g_handle_table.Get<Thread>(handle);
|
const SharedPtr<Thread> thread = g_handle_table.Get<Thread>(handle);
|
||||||
|
@ -853,8 +865,8 @@ static const FunctionDef SVC_Table[] = {
|
||||||
{0x2F, nullptr, "GetLastThreadInfo"},
|
{0x2F, nullptr, "GetLastThreadInfo"},
|
||||||
{0x30, nullptr, "GetResourceLimitLimitValue"},
|
{0x30, nullptr, "GetResourceLimitLimitValue"},
|
||||||
{0x31, nullptr, "GetResourceLimitCurrentValue"},
|
{0x31, nullptr, "GetResourceLimitCurrentValue"},
|
||||||
{0x32, nullptr, "SetThreadActivity"},
|
{0x32, SvcWrap<SetThreadActivity>, "SetThreadActivity"},
|
||||||
{0x33, nullptr, "GetThreadContext"},
|
{0x33, SvcWrap<GetThreadContext>, "GetThreadContext"},
|
||||||
{0x34, nullptr, "Unknown"},
|
{0x34, nullptr, "Unknown"},
|
||||||
{0x35, nullptr, "Unknown"},
|
{0x35, nullptr, "Unknown"},
|
||||||
{0x36, nullptr, "Unknown"},
|
{0x36, nullptr, "Unknown"},
|
||||||
|
|
|
@ -70,6 +70,11 @@ void SvcWrap() {
|
||||||
FuncReturn(retval);
|
FuncReturn(retval);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
template <ResultCode func(u32, u64)>
|
||||||
|
void SvcWrap() {
|
||||||
|
FuncReturn(func((u32)(PARAM(0) & 0xFFFFFFFF), PARAM(1)).raw);
|
||||||
|
}
|
||||||
|
|
||||||
template <ResultCode func(u32, u32, u64)>
|
template <ResultCode func(u32, u32, u64)>
|
||||||
void SvcWrap() {
|
void SvcWrap() {
|
||||||
FuncReturn(func((u32)(PARAM(0) & 0xFFFFFFFF), (u32)(PARAM(1) & 0xFFFFFFFF), PARAM(2)).raw);
|
FuncReturn(func((u32)(PARAM(0) & 0xFFFFFFFF), (u32)(PARAM(1) & 0xFFFFFFFF), PARAM(2)).raw);
|
||||||
|
|
|
@ -25,7 +25,7 @@ class IAudioOut final : public ServiceFramework<IAudioOut> {
|
||||||
public:
|
public:
|
||||||
IAudioOut() : ServiceFramework("IAudioOut"), audio_out_state(AudioState::Stopped) {
|
IAudioOut() : ServiceFramework("IAudioOut"), audio_out_state(AudioState::Stopped) {
|
||||||
static const FunctionInfo functions[] = {
|
static const FunctionInfo functions[] = {
|
||||||
{0x0, nullptr, "GetAudioOutState"},
|
{0x0, &IAudioOut::GetAudioOutState, "GetAudioOutState"},
|
||||||
{0x1, &IAudioOut::StartAudioOut, "StartAudioOut"},
|
{0x1, &IAudioOut::StartAudioOut, "StartAudioOut"},
|
||||||
{0x2, &IAudioOut::StopAudioOut, "StopAudioOut"},
|
{0x2, &IAudioOut::StopAudioOut, "StopAudioOut"},
|
||||||
{0x3, &IAudioOut::AppendAudioOutBuffer_1, "AppendAudioOutBuffer_1"},
|
{0x3, &IAudioOut::AppendAudioOutBuffer_1, "AppendAudioOutBuffer_1"},
|
||||||
|
@ -57,6 +57,13 @@ public:
|
||||||
}
|
}
|
||||||
|
|
||||||
private:
|
private:
|
||||||
|
void GetAudioOutState(Kernel::HLERequestContext& ctx) {
|
||||||
|
LOG_DEBUG(Service_Audio, "called");
|
||||||
|
IPC::ResponseBuilder rb{ctx, 3};
|
||||||
|
rb.Push(RESULT_SUCCESS);
|
||||||
|
rb.Push(static_cast<u32>(audio_out_state));
|
||||||
|
}
|
||||||
|
|
||||||
void StartAudioOut(Kernel::HLERequestContext& ctx) {
|
void StartAudioOut(Kernel::HLERequestContext& ctx) {
|
||||||
LOG_WARNING(Service_Audio, "(STUBBED) called");
|
LOG_WARNING(Service_Audio, "(STUBBED) called");
|
||||||
|
|
||||||
|
|
|
@ -158,7 +158,7 @@ public:
|
||||||
{0x0, &IAudioDevice::ListAudioDeviceName, "ListAudioDeviceName"},
|
{0x0, &IAudioDevice::ListAudioDeviceName, "ListAudioDeviceName"},
|
||||||
{0x1, &IAudioDevice::SetAudioDeviceOutputVolume, "SetAudioDeviceOutputVolume"},
|
{0x1, &IAudioDevice::SetAudioDeviceOutputVolume, "SetAudioDeviceOutputVolume"},
|
||||||
{0x2, nullptr, "GetAudioDeviceOutputVolume"},
|
{0x2, nullptr, "GetAudioDeviceOutputVolume"},
|
||||||
{0x3, nullptr, "GetActiveAudioDeviceName"},
|
{0x3, &IAudioDevice::GetActiveAudioDeviceName, "GetActiveAudioDeviceName"},
|
||||||
{0x4, &IAudioDevice::QueryAudioDeviceSystemEvent, "QueryAudioDeviceSystemEvent"},
|
{0x4, &IAudioDevice::QueryAudioDeviceSystemEvent, "QueryAudioDeviceSystemEvent"},
|
||||||
{0x5, &IAudioDevice::GetActiveChannelCount, "GetActiveChannelCount"},
|
{0x5, &IAudioDevice::GetActiveChannelCount, "GetActiveChannelCount"},
|
||||||
{0x6, nullptr, "ListAudioDeviceNameAuto"},
|
{0x6, nullptr, "ListAudioDeviceNameAuto"},
|
||||||
|
@ -199,6 +199,18 @@ private:
|
||||||
rb.Push(RESULT_SUCCESS);
|
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<u32>(1);
|
||||||
|
}
|
||||||
|
|
||||||
void QueryAudioDeviceSystemEvent(Kernel::HLERequestContext& ctx) {
|
void QueryAudioDeviceSystemEvent(Kernel::HLERequestContext& ctx) {
|
||||||
LOG_WARNING(Service_Audio, "(STUBBED) called");
|
LOG_WARNING(Service_Audio, "(STUBBED) called");
|
||||||
|
|
||||||
|
|
|
@ -6,6 +6,7 @@
|
||||||
#include "core/hle/ipc_helpers.h"
|
#include "core/hle/ipc_helpers.h"
|
||||||
#include "core/hle/service/friend/friend.h"
|
#include "core/hle/service/friend/friend.h"
|
||||||
#include "core/hle/service/friend/friend_a.h"
|
#include "core/hle/service/friend/friend_a.h"
|
||||||
|
#include "core/hle/service/friend/friend_u.h"
|
||||||
|
|
||||||
namespace Service {
|
namespace Service {
|
||||||
namespace Friend {
|
namespace Friend {
|
||||||
|
@ -22,6 +23,7 @@ Module::Interface::Interface(std::shared_ptr<Module> module, const char* name)
|
||||||
void InstallInterfaces(SM::ServiceManager& service_manager) {
|
void InstallInterfaces(SM::ServiceManager& service_manager) {
|
||||||
auto module = std::make_shared<Module>();
|
auto module = std::make_shared<Module>();
|
||||||
std::make_shared<Friend_A>(module)->InstallAsService(service_manager);
|
std::make_shared<Friend_A>(module)->InstallAsService(service_manager);
|
||||||
|
std::make_shared<Friend_U>(module)->InstallAsService(service_manager);
|
||||||
}
|
}
|
||||||
|
|
||||||
} // namespace Friend
|
} // namespace Friend
|
||||||
|
|
19
src/core/hle/service/friend/friend_u.cpp
Normal file
19
src/core/hle/service/friend/friend_u.cpp
Normal file
|
@ -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)
|
||||||
|
: Module::Interface(std::move(module), "friend:u") {
|
||||||
|
static const FunctionInfo functions[] = {
|
||||||
|
{0, &Friend_U::Unknown, "Unknown"},
|
||||||
|
};
|
||||||
|
RegisterHandlers(functions);
|
||||||
|
}
|
||||||
|
|
||||||
|
} // namespace Friend
|
||||||
|
} // namespace Service
|
18
src/core/hle/service/friend/friend_u.h
Normal file
18
src/core/hle/service/friend/friend_u.h
Normal file
|
@ -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> module);
|
||||||
|
};
|
||||||
|
|
||||||
|
} // namespace Friend
|
||||||
|
} // namespace Service
|
|
@ -70,9 +70,8 @@ private:
|
||||||
}
|
}
|
||||||
void GetResult(Kernel::HLERequestContext& ctx) {
|
void GetResult(Kernel::HLERequestContext& ctx) {
|
||||||
LOG_WARNING(Service_NIFM, "(STUBBED) called");
|
LOG_WARNING(Service_NIFM, "(STUBBED) called");
|
||||||
IPC::ResponseBuilder rb{ctx, 3};
|
IPC::ResponseBuilder rb{ctx, 2};
|
||||||
rb.Push(RESULT_SUCCESS);
|
rb.Push(RESULT_SUCCESS);
|
||||||
rb.Push<u32>(0);
|
|
||||||
}
|
}
|
||||||
void GetSystemEventReadableHandles(Kernel::HLERequestContext& ctx) {
|
void GetSystemEventReadableHandles(Kernel::HLERequestContext& ctx) {
|
||||||
LOG_WARNING(Service_NIFM, "(STUBBED) called");
|
LOG_WARNING(Service_NIFM, "(STUBBED) called");
|
||||||
|
|
|
@ -17,6 +17,7 @@
|
||||||
#include "core/hle/service/vi/vi_m.h"
|
#include "core/hle/service/vi/vi_m.h"
|
||||||
#include "core/hle/service/vi/vi_s.h"
|
#include "core/hle/service/vi/vi_s.h"
|
||||||
#include "core/hle/service/vi/vi_u.h"
|
#include "core/hle/service/vi/vi_u.h"
|
||||||
|
#include "core/settings.h"
|
||||||
#include "video_core/renderer_base.h"
|
#include "video_core/renderer_base.h"
|
||||||
#include "video_core/video_core.h"
|
#include "video_core/video_core.h"
|
||||||
|
|
||||||
|
@ -711,6 +712,23 @@ private:
|
||||||
rb.Push(RESULT_SUCCESS);
|
rb.Push(RESULT_SUCCESS);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
void GetDisplayResolution(Kernel::HLERequestContext& ctx) {
|
||||||
|
LOG_WARNING(Service_VI, "(STUBBED) called");
|
||||||
|
IPC::RequestParser rp{ctx};
|
||||||
|
u64 display_id = rp.Pop<u64>();
|
||||||
|
|
||||||
|
IPC::ResponseBuilder rb = rp.MakeBuilder(6, 0, 0);
|
||||||
|
rb.Push(RESULT_SUCCESS);
|
||||||
|
|
||||||
|
if (Settings::values.use_docked_mode) {
|
||||||
|
rb.Push(static_cast<u32>(DisplayResolution::DockedWidth));
|
||||||
|
rb.Push(static_cast<u32>(DisplayResolution::DockedHeight));
|
||||||
|
} else {
|
||||||
|
rb.Push(static_cast<u32>(DisplayResolution::UndockedWidth));
|
||||||
|
rb.Push(static_cast<u32>(DisplayResolution::UndockedHeight));
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
void SetLayerScalingMode(Kernel::HLERequestContext& ctx) {
|
void SetLayerScalingMode(Kernel::HLERequestContext& ctx) {
|
||||||
LOG_WARNING(Service_VI, "(STUBBED) called");
|
LOG_WARNING(Service_VI, "(STUBBED) called");
|
||||||
IPC::RequestParser rp{ctx};
|
IPC::RequestParser rp{ctx};
|
||||||
|
@ -808,6 +826,7 @@ IApplicationDisplayService::IApplicationDisplayService(
|
||||||
{1000, &IApplicationDisplayService::ListDisplays, "ListDisplays"},
|
{1000, &IApplicationDisplayService::ListDisplays, "ListDisplays"},
|
||||||
{1010, &IApplicationDisplayService::OpenDisplay, "OpenDisplay"},
|
{1010, &IApplicationDisplayService::OpenDisplay, "OpenDisplay"},
|
||||||
{1020, &IApplicationDisplayService::CloseDisplay, "CloseDisplay"},
|
{1020, &IApplicationDisplayService::CloseDisplay, "CloseDisplay"},
|
||||||
|
{1102, &IApplicationDisplayService::GetDisplayResolution, "GetDisplayResolution"},
|
||||||
{2101, &IApplicationDisplayService::SetLayerScalingMode, "SetLayerScalingMode"},
|
{2101, &IApplicationDisplayService::SetLayerScalingMode, "SetLayerScalingMode"},
|
||||||
{2020, &IApplicationDisplayService::OpenLayer, "OpenLayer"},
|
{2020, &IApplicationDisplayService::OpenLayer, "OpenLayer"},
|
||||||
{2030, &IApplicationDisplayService::CreateStrayLayer, "CreateStrayLayer"},
|
{2030, &IApplicationDisplayService::CreateStrayLayer, "CreateStrayLayer"},
|
||||||
|
|
|
@ -14,6 +14,13 @@ struct EventType;
|
||||||
namespace Service {
|
namespace Service {
|
||||||
namespace VI {
|
namespace VI {
|
||||||
|
|
||||||
|
enum class DisplayResolution : u32 {
|
||||||
|
DockedWidth = 1920,
|
||||||
|
DockedHeight = 1080,
|
||||||
|
UndockedWidth = 1280,
|
||||||
|
UndockedHeight = 720,
|
||||||
|
};
|
||||||
|
|
||||||
class Module final {
|
class Module final {
|
||||||
public:
|
public:
|
||||||
class Interface : public ServiceFramework<Interface> {
|
class Interface : public ServiceFramework<Interface> {
|
||||||
|
|
Loading…
Reference in a new issue