mirror of
https://github.com/yuzu-emu/yuzu.git
synced 2024-08-21 22:53:23 +02:00
Merge pull request #292 from bunnei/botw-progress
NFP, SVC, and AudRen progress
This commit is contained in:
commit
9cba0f1794
@ -42,6 +42,7 @@ namespace Log {
|
|||||||
SUB(Service, FS) \
|
SUB(Service, FS) \
|
||||||
SUB(Service, HID) \
|
SUB(Service, HID) \
|
||||||
SUB(Service, LM) \
|
SUB(Service, LM) \
|
||||||
|
SUB(Service, NFP) \
|
||||||
SUB(Service, NIFM) \
|
SUB(Service, NIFM) \
|
||||||
SUB(Service, NS) \
|
SUB(Service, NS) \
|
||||||
SUB(Service, NVDRV) \
|
SUB(Service, NVDRV) \
|
||||||
|
@ -59,6 +59,7 @@ enum class Class : ClassType {
|
|||||||
Service_FS, ///< The FS (Filesystem) service
|
Service_FS, ///< The FS (Filesystem) service
|
||||||
Service_HID, ///< The HID (Human interface device) service
|
Service_HID, ///< The HID (Human interface device) service
|
||||||
Service_LM, ///< The LM (Logger) service
|
Service_LM, ///< The LM (Logger) service
|
||||||
|
Service_NFP, ///< The NFP service
|
||||||
Service_NIFM, ///< The NIFM (Network interface) service
|
Service_NIFM, ///< The NIFM (Network interface) service
|
||||||
Service_NS, ///< The NS services
|
Service_NS, ///< The NS services
|
||||||
Service_NVDRV, ///< The NVDRV (Nvidia driver) service
|
Service_NVDRV, ///< The NVDRV (Nvidia driver) service
|
||||||
|
@ -142,6 +142,10 @@ add_library(core STATIC
|
|||||||
hle/service/nifm/nifm_s.h
|
hle/service/nifm/nifm_s.h
|
||||||
hle/service/nifm/nifm_u.cpp
|
hle/service/nifm/nifm_u.cpp
|
||||||
hle/service/nifm/nifm_u.h
|
hle/service/nifm/nifm_u.h
|
||||||
|
hle/service/nfp/nfp.cpp
|
||||||
|
hle/service/nfp/nfp.h
|
||||||
|
hle/service/nfp/nfp_user.cpp
|
||||||
|
hle/service/nfp/nfp_user.h
|
||||||
hle/service/ns/ns.cpp
|
hle/service/ns/ns.cpp
|
||||||
hle/service/ns/ns.h
|
hle/service/ns/ns.h
|
||||||
hle/service/ns/pl_u.cpp
|
hle/service/ns/pl_u.cpp
|
||||||
|
@ -756,8 +756,16 @@ static ResultCode CreateTransferMemory(Handle* handle, VAddr addr, u64 size, u32
|
|||||||
return RESULT_SUCCESS;
|
return RESULT_SUCCESS;
|
||||||
}
|
}
|
||||||
|
|
||||||
static ResultCode SetThreadCoreMask(u64, u64, u64) {
|
static ResultCode GetThreadCoreMask(Handle handle, u32* mask, u64* unknown) {
|
||||||
LOG_WARNING(Kernel_SVC, "(STUBBED) called");
|
LOG_WARNING(Kernel_SVC, "(STUBBED) called, handle=0x%08X", handle);
|
||||||
|
*mask = 0x0;
|
||||||
|
*unknown = 0xf;
|
||||||
|
return RESULT_SUCCESS;
|
||||||
|
}
|
||||||
|
|
||||||
|
static ResultCode SetThreadCoreMask(Handle handle, u32 mask, u64 unknown) {
|
||||||
|
LOG_WARNING(Kernel_SVC, "(STUBBED) called, handle=0x%08X, mask=0x%08X, unknown=0x%lx", handle,
|
||||||
|
mask, unknown);
|
||||||
return RESULT_SUCCESS;
|
return RESULT_SUCCESS;
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -809,7 +817,7 @@ static const FunctionDef SVC_Table[] = {
|
|||||||
{0x0B, SvcWrap<SleepThread>, "SleepThread"},
|
{0x0B, SvcWrap<SleepThread>, "SleepThread"},
|
||||||
{0x0C, SvcWrap<GetThreadPriority>, "GetThreadPriority"},
|
{0x0C, SvcWrap<GetThreadPriority>, "GetThreadPriority"},
|
||||||
{0x0D, SvcWrap<SetThreadPriority>, "SetThreadPriority"},
|
{0x0D, SvcWrap<SetThreadPriority>, "SetThreadPriority"},
|
||||||
{0x0E, nullptr, "GetThreadCoreMask"},
|
{0x0E, SvcWrap<GetThreadCoreMask>, "GetThreadCoreMask"},
|
||||||
{0x0F, SvcWrap<SetThreadCoreMask>, "SetThreadCoreMask"},
|
{0x0F, SvcWrap<SetThreadCoreMask>, "SetThreadCoreMask"},
|
||||||
{0x10, SvcWrap<GetCurrentProcessorNumber>, "GetCurrentProcessorNumber"},
|
{0x10, SvcWrap<GetCurrentProcessorNumber>, "GetCurrentProcessorNumber"},
|
||||||
{0x11, nullptr, "SignalEvent"},
|
{0x11, nullptr, "SignalEvent"},
|
||||||
|
@ -70,6 +70,21 @@ void SvcWrap() {
|
|||||||
FuncReturn(retval);
|
FuncReturn(retval);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
template <ResultCode func(u32, u32, u64)>
|
||||||
|
void SvcWrap() {
|
||||||
|
FuncReturn(func((u32)(PARAM(0) & 0xFFFFFFFF), (u32)(PARAM(1) & 0xFFFFFFFF), PARAM(2)).raw);
|
||||||
|
}
|
||||||
|
|
||||||
|
template <ResultCode func(u32, u32*, u64*)>
|
||||||
|
void SvcWrap() {
|
||||||
|
u32 param_1 = 0;
|
||||||
|
u64 param_2 = 0;
|
||||||
|
ResultCode retval = func((u32)(PARAM(2) & 0xFFFFFFFF), ¶m_1, ¶m_2);
|
||||||
|
Core::CPU().SetReg(1, param_1);
|
||||||
|
Core::CPU().SetReg(2, param_2);
|
||||||
|
FuncReturn(retval.raw);
|
||||||
|
}
|
||||||
|
|
||||||
template <ResultCode func(u64, u64, u32, u32)>
|
template <ResultCode func(u64, u64, u32, u32)>
|
||||||
void SvcWrap() {
|
void SvcWrap() {
|
||||||
FuncReturn(
|
FuncReturn(
|
||||||
|
@ -59,12 +59,12 @@ private:
|
|||||||
AudioRendererResponseData response_data{};
|
AudioRendererResponseData response_data{};
|
||||||
|
|
||||||
response_data.section_0_size =
|
response_data.section_0_size =
|
||||||
response_data.state_entries.size() * sizeof(AudioRendererStateEntry);
|
static_cast<u32>(response_data.state_entries.size() * sizeof(AudioRendererStateEntry));
|
||||||
response_data.section_1_size = response_data.section_1.size();
|
response_data.section_1_size = static_cast<u32>(response_data.section_1.size());
|
||||||
response_data.section_2_size = response_data.section_2.size();
|
response_data.section_2_size = static_cast<u32>(response_data.section_2.size());
|
||||||
response_data.section_3_size = response_data.section_3.size();
|
response_data.section_3_size = static_cast<u32>(response_data.section_3.size());
|
||||||
response_data.section_4_size = response_data.section_4.size();
|
response_data.section_4_size = static_cast<u32>(response_data.section_4.size());
|
||||||
response_data.section_5_size = response_data.section_5.size();
|
response_data.section_5_size = static_cast<u32>(response_data.section_5.size());
|
||||||
response_data.total_size = sizeof(AudioRendererResponseData);
|
response_data.total_size = sizeof(AudioRendererResponseData);
|
||||||
|
|
||||||
for (unsigned i = 0; i < response_data.state_entries.size(); i++) {
|
for (unsigned i = 0; i < response_data.state_entries.size(); i++) {
|
||||||
@ -156,7 +156,17 @@ public:
|
|||||||
IAudioDevice() : ServiceFramework("IAudioDevice") {
|
IAudioDevice() : ServiceFramework("IAudioDevice") {
|
||||||
static const FunctionInfo functions[] = {
|
static const FunctionInfo functions[] = {
|
||||||
{0x0, &IAudioDevice::ListAudioDeviceName, "ListAudioDeviceName"},
|
{0x0, &IAudioDevice::ListAudioDeviceName, "ListAudioDeviceName"},
|
||||||
{0x1, &IAudioDevice::SetAudioDeviceOutputVolume, "SetAudioDeviceOutputVolume"}};
|
{0x1, &IAudioDevice::SetAudioDeviceOutputVolume, "SetAudioDeviceOutputVolume"},
|
||||||
|
{0x2, nullptr, "GetAudioDeviceOutputVolume"},
|
||||||
|
{0x3, nullptr, "GetActiveAudioDeviceName"},
|
||||||
|
{0x4, &IAudioDevice::QueryAudioDeviceSystemEvent, "QueryAudioDeviceSystemEvent"},
|
||||||
|
{0x5, &IAudioDevice::GetActiveChannelCount, "GetActiveChannelCount"},
|
||||||
|
{0x6, nullptr, "ListAudioDeviceNameAuto"},
|
||||||
|
{0x7, nullptr, "SetAudioDeviceOutputVolumeAuto"},
|
||||||
|
{0x8, nullptr, "GetAudioDeviceOutputVolumeAuto"},
|
||||||
|
{0x10, nullptr, "GetActiveAudioDeviceNameAuto"},
|
||||||
|
{0x11, nullptr, "QueryAudioDeviceInputEvent"},
|
||||||
|
{0x12, nullptr, "QueryAudioDeviceOutputEvent"}};
|
||||||
RegisterHandlers(functions);
|
RegisterHandlers(functions);
|
||||||
|
|
||||||
buffer_event =
|
buffer_event =
|
||||||
@ -189,8 +199,26 @@ private:
|
|||||||
rb.Push(RESULT_SUCCESS);
|
rb.Push(RESULT_SUCCESS);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
void QueryAudioDeviceSystemEvent(Kernel::HLERequestContext& ctx) {
|
||||||
|
LOG_WARNING(Service_Audio, "(STUBBED) called");
|
||||||
|
|
||||||
|
buffer_event->Signal();
|
||||||
|
|
||||||
|
IPC::ResponseBuilder rb{ctx, 2, 1};
|
||||||
|
rb.Push(RESULT_SUCCESS);
|
||||||
|
rb.PushCopyObjects(buffer_event);
|
||||||
|
}
|
||||||
|
|
||||||
|
void GetActiveChannelCount(Kernel::HLERequestContext& ctx) {
|
||||||
|
LOG_WARNING(Service_Audio, "(STUBBED) called");
|
||||||
|
IPC::ResponseBuilder rb{ctx, 3};
|
||||||
|
rb.Push(RESULT_SUCCESS);
|
||||||
|
rb.Push<u32>(1);
|
||||||
|
}
|
||||||
|
|
||||||
Kernel::SharedPtr<Kernel::Event> buffer_event;
|
Kernel::SharedPtr<Kernel::Event> buffer_event;
|
||||||
};
|
|
||||||
|
}; // namespace Audio
|
||||||
|
|
||||||
AudRenU::AudRenU() : ServiceFramework("audren:u") {
|
AudRenU::AudRenU() : ServiceFramework("audren:u") {
|
||||||
static const FunctionInfo functions[] = {
|
static const FunctionInfo functions[] = {
|
||||||
|
28
src/core/hle/service/nfp/nfp.cpp
Normal file
28
src/core/hle/service/nfp/nfp.cpp
Normal file
@ -0,0 +1,28 @@
|
|||||||
|
// Copyright 2018 yuzu emulator team
|
||||||
|
// Licensed under GPLv2 or any later version
|
||||||
|
// Refer to the license.txt file included.
|
||||||
|
|
||||||
|
#include "common/logging/log.h"
|
||||||
|
#include "core/hle/ipc_helpers.h"
|
||||||
|
#include "core/hle/service/nfp/nfp.h"
|
||||||
|
#include "core/hle/service/nfp/nfp_user.h"
|
||||||
|
|
||||||
|
namespace Service {
|
||||||
|
namespace NFP {
|
||||||
|
|
||||||
|
Module::Interface::Interface(std::shared_ptr<Module> module, const char* name)
|
||||||
|
: ServiceFramework(name), module(std::move(module)) {}
|
||||||
|
|
||||||
|
void Module::Interface::Unknown(Kernel::HLERequestContext& ctx) {
|
||||||
|
LOG_WARNING(Service_NFP, "(STUBBED) called");
|
||||||
|
IPC::ResponseBuilder rb{ctx, 2};
|
||||||
|
rb.Push(RESULT_SUCCESS);
|
||||||
|
}
|
||||||
|
|
||||||
|
void InstallInterfaces(SM::ServiceManager& service_manager) {
|
||||||
|
auto module = std::make_shared<Module>();
|
||||||
|
std::make_shared<NFP_User>(module)->InstallAsService(service_manager);
|
||||||
|
}
|
||||||
|
|
||||||
|
} // namespace NFP
|
||||||
|
} // namespace Service
|
28
src/core/hle/service/nfp/nfp.h
Normal file
28
src/core/hle/service/nfp/nfp.h
Normal file
@ -0,0 +1,28 @@
|
|||||||
|
// 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/service.h"
|
||||||
|
|
||||||
|
namespace Service {
|
||||||
|
namespace NFP {
|
||||||
|
|
||||||
|
class Module final {
|
||||||
|
public:
|
||||||
|
class Interface : public ServiceFramework<Interface> {
|
||||||
|
public:
|
||||||
|
Interface(std::shared_ptr<Module> module, const char* name);
|
||||||
|
|
||||||
|
void Unknown(Kernel::HLERequestContext& ctx);
|
||||||
|
|
||||||
|
protected:
|
||||||
|
std::shared_ptr<Module> module;
|
||||||
|
};
|
||||||
|
};
|
||||||
|
|
||||||
|
void InstallInterfaces(SM::ServiceManager& service_manager);
|
||||||
|
|
||||||
|
} // namespace NFP
|
||||||
|
} // namespace Service
|
19
src/core/hle/service/nfp/nfp_user.cpp
Normal file
19
src/core/hle/service/nfp/nfp_user.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/nfp/nfp_user.h"
|
||||||
|
|
||||||
|
namespace Service {
|
||||||
|
namespace NFP {
|
||||||
|
|
||||||
|
NFP_User::NFP_User(std::shared_ptr<Module> module)
|
||||||
|
: Module::Interface(std::move(module), "nfp:user") {
|
||||||
|
static const FunctionInfo functions[] = {
|
||||||
|
{0, &NFP_User::Unknown, "Unknown"},
|
||||||
|
};
|
||||||
|
RegisterHandlers(functions);
|
||||||
|
}
|
||||||
|
|
||||||
|
} // namespace NFP
|
||||||
|
} // namespace Service
|
18
src/core/hle/service/nfp/nfp_user.h
Normal file
18
src/core/hle/service/nfp/nfp_user.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/nfp/nfp.h"
|
||||||
|
|
||||||
|
namespace Service {
|
||||||
|
namespace NFP {
|
||||||
|
|
||||||
|
class NFP_User final : public Module::Interface {
|
||||||
|
public:
|
||||||
|
explicit NFP_User(std::shared_ptr<Module> module);
|
||||||
|
};
|
||||||
|
|
||||||
|
} // namespace NFP
|
||||||
|
} // namespace Service
|
@ -25,6 +25,7 @@
|
|||||||
#include "core/hle/service/friend/friend.h"
|
#include "core/hle/service/friend/friend.h"
|
||||||
#include "core/hle/service/hid/hid.h"
|
#include "core/hle/service/hid/hid.h"
|
||||||
#include "core/hle/service/lm/lm.h"
|
#include "core/hle/service/lm/lm.h"
|
||||||
|
#include "core/hle/service/nfp/nfp.h"
|
||||||
#include "core/hle/service/nifm/nifm.h"
|
#include "core/hle/service/nifm/nifm.h"
|
||||||
#include "core/hle/service/ns/ns.h"
|
#include "core/hle/service/ns/ns.h"
|
||||||
#include "core/hle/service/nvdrv/nvdrv.h"
|
#include "core/hle/service/nvdrv/nvdrv.h"
|
||||||
@ -187,6 +188,7 @@ void Init() {
|
|||||||
Friend::InstallInterfaces(*SM::g_service_manager);
|
Friend::InstallInterfaces(*SM::g_service_manager);
|
||||||
HID::InstallInterfaces(*SM::g_service_manager);
|
HID::InstallInterfaces(*SM::g_service_manager);
|
||||||
LM::InstallInterfaces(*SM::g_service_manager);
|
LM::InstallInterfaces(*SM::g_service_manager);
|
||||||
|
NFP::InstallInterfaces(*SM::g_service_manager);
|
||||||
NIFM::InstallInterfaces(*SM::g_service_manager);
|
NIFM::InstallInterfaces(*SM::g_service_manager);
|
||||||
NS::InstallInterfaces(*SM::g_service_manager);
|
NS::InstallInterfaces(*SM::g_service_manager);
|
||||||
Nvidia::InstallInterfaces(*SM::g_service_manager);
|
Nvidia::InstallInterfaces(*SM::g_service_manager);
|
||||||
|
Loading…
Reference in New Issue
Block a user