Implemented GetIUserInterface properly, Playreport and SSL::SetInterfaceVersion. Fixed ipc issues with IAudioDevice(wrong ids)

This commit is contained in:
David Marcec 2018-04-21 22:04:24 -07:00
parent ebb8e06df0
commit f3137d3bc1
11 changed files with 109 additions and 11 deletions

View File

@ -187,6 +187,8 @@ add_library(core STATIC
hle/service/pctl/pctl.h hle/service/pctl/pctl.h
hle/service/pctl/pctl_a.cpp hle/service/pctl/pctl_a.cpp
hle/service/pctl/pctl_a.h hle/service/pctl/pctl_a.h
hle/service/prepo/prepo.cpp
hle/service/prepo/prepo.h
hle/service/service.cpp hle/service/service.cpp
hle/service/service.h hle/service/service.h
hle/service/set/set.cpp hle/service/set/set.cpp

View File

@ -162,12 +162,15 @@ public:
{0x3, &IAudioDevice::GetActiveAudioDeviceName, "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, &IAudioDevice::ListAudioDeviceName,
{0x7, nullptr, "SetAudioDeviceOutputVolumeAuto"}, "ListAudioDeviceNameAuto"}, // Are these any different?
{0x7, &IAudioDevice::SetAudioDeviceOutputVolume,
"SetAudioDeviceOutputVolumeAuto"}, // Are these any different?
{0x8, nullptr, "GetAudioDeviceOutputVolumeAuto"}, {0x8, nullptr, "GetAudioDeviceOutputVolumeAuto"},
{0x10, nullptr, "GetActiveAudioDeviceNameAuto"}, {0xa, &IAudioDevice::GetActiveAudioDeviceName,
{0x11, nullptr, "QueryAudioDeviceInputEvent"}, "GetActiveAudioDeviceNameAuto"}, // Are these any different?
{0x12, nullptr, "QueryAudioDeviceOutputEvent"}}; {0xb, nullptr, "QueryAudioDeviceInputEvent"},
{0xc, nullptr, "QueryAudioDeviceOutputEvent"}};
RegisterHandlers(functions); RegisterHandlers(functions);
buffer_event = buffer_event =
@ -257,7 +260,7 @@ void AudRenU::GetAudioRendererWorkBufferSize(Kernel::HLERequestContext& ctx) {
IPC::ResponseBuilder rb{ctx, 4}; IPC::ResponseBuilder rb{ctx, 4};
rb.Push(RESULT_SUCCESS); rb.Push(RESULT_SUCCESS);
rb.Push<u64>(0x400); rb.Push<u64>(0x4000);
LOG_WARNING(Service_Audio, "(STUBBED) called"); LOG_WARNING(Service_Audio, "(STUBBED) called");
} }

View File

@ -12,10 +12,27 @@ namespace Service::NFP {
Module::Interface::Interface(std::shared_ptr<Module> module, const char* name) Module::Interface::Interface(std::shared_ptr<Module> module, const char* name)
: ServiceFramework(name), module(std::move(module)) {} : ServiceFramework(name), module(std::move(module)) {}
void Module::Interface::Unknown(Kernel::HLERequestContext& ctx) { class IUser final : public ServiceFramework<IUser> {
public:
IUser() : ServiceFramework("IUser") {
static const FunctionInfo functions[] = {
{0, &IUser::Initialize, "Initialize"},
};
RegisterHandlers(functions);
}
private:
void Initialize(Kernel::HLERequestContext& ctx) {
IPC::ResponseBuilder rb{ctx, 2};
rb.Push(RESULT_SUCCESS);
}
};
void Module::Interface::GetIUserInterface(Kernel::HLERequestContext& ctx) {
LOG_WARNING(Service_NFP, "(STUBBED) called"); LOG_WARNING(Service_NFP, "(STUBBED) called");
IPC::ResponseBuilder rb{ctx, 2}; IPC::ResponseBuilder rb{ctx, 2, 0, 1};
rb.Push(RESULT_SUCCESS); rb.Push(RESULT_SUCCESS);
rb.PushIpcInterface<IUser>();
} }
void InstallInterfaces(SM::ServiceManager& service_manager) { void InstallInterfaces(SM::ServiceManager& service_manager) {

View File

@ -14,7 +14,7 @@ public:
public: public:
Interface(std::shared_ptr<Module> module, const char* name); Interface(std::shared_ptr<Module> module, const char* name);
void Unknown(Kernel::HLERequestContext& ctx); void GetIUserInterface(Kernel::HLERequestContext& ctx);
protected: protected:
std::shared_ptr<Module> module; std::shared_ptr<Module> module;

View File

@ -9,7 +9,7 @@ namespace Service::NFP {
NFP_User::NFP_User(std::shared_ptr<Module> module) NFP_User::NFP_User(std::shared_ptr<Module> module)
: Module::Interface(std::move(module), "nfp:user") { : Module::Interface(std::move(module), "nfp:user") {
static const FunctionInfo functions[] = { static const FunctionInfo functions[] = {
{0, &NFP_User::Unknown, "Unknown"}, {0, &NFP_User::GetIUserInterface, "GetIUserInterface"},
}; };
RegisterHandlers(functions); RegisterHandlers(functions);
} }

View File

@ -79,6 +79,7 @@ u32 nvhost_ctrl_gpu::GetTPCMasks(const std::vector<u8>& input, std::vector<u8>&
std::memcpy(&params, input.data(), input.size()); std::memcpy(&params, input.data(), input.size());
LOG_WARNING(Service_NVDRV, "(STUBBED) called, mask=0x%x, mask_buf_addr=0x%" PRIx64, LOG_WARNING(Service_NVDRV, "(STUBBED) called, mask=0x%x, mask_buf_addr=0x%" PRIx64,
params.mask_buf_size, params.mask_buf_addr); params.mask_buf_size, params.mask_buf_addr);
params.unk = 0xcafe; // Needs to be non 0, what does this actually do?
std::memcpy(output.data(), &params, sizeof(params)); std::memcpy(output.data(), &params, sizeof(params));
return 0; return 0;
} }

View File

@ -0,0 +1,40 @@
#include <cinttypes>
#include "common/logging/log.h"
#include "core/hle/ipc_helpers.h"
#include "core/hle/kernel/event.h"
#include "core/hle/service/prepo/prepo.h"
namespace Service::Playreport {
Playreport::Playreport(const char* name) : ServiceFramework(name) {
static const FunctionInfo functions[] = {
{10101, &Playreport::SaveReportWithUser, "SaveReportWithUser"},
};
RegisterHandlers(functions);
};
void Playreport::SaveReportWithUser(Kernel::HLERequestContext& ctx) {
/*IPC::RequestParser rp{ctx};
auto Uid = rp.PopRaw<std::array<u64, 2>>();
u64 unk = rp.Pop<u64>();
std::vector<u8> buffer;
buffer.reserve(ctx.BufferDescriptorX()[0].Size());
Memory::ReadBlock(ctx.BufferDescriptorX()[0].Address(), buffer.data(), buffer.size());
std::vector<u8> buffer2;
buffer.reserve(ctx.BufferDescriptorA()[0].Size());
Memory::ReadBlock(ctx.BufferDescriptorA()[0].Address(), buffer.data(), buffer.size());*/
// If we ever want to add play reports
IPC::ResponseBuilder rb{ctx, 2};
rb.Push(RESULT_SUCCESS);
};
void InstallInterfaces(SM::ServiceManager& service_manager) {
std::make_shared<Playreport>("prepo:a")->InstallAsService(service_manager);
std::make_shared<Playreport>("prepo:m")->InstallAsService(service_manager);
std::make_shared<Playreport>("prepo:s")->InstallAsService(service_manager);
std::make_shared<Playreport>("prepo:u")->InstallAsService(service_manager);
}
} // namespace Service::Playreport

View File

@ -0,0 +1,23 @@
// Copyright 2018 yuzu emulator team
// Licensed under GPLv2 or any later version
// Refer to the license.txt file included.
#include <memory>
#include <string>
#include "core/hle/kernel/event.h"
#include "core/hle/service/service.h"
namespace Service::Playreport {
class Playreport final : public ServiceFramework<Playreport> {
public:
Playreport(const char* name);
~Playreport() = default;
private:
void SaveReportWithUser(Kernel::HLERequestContext& ctx);
};
void InstallInterfaces(SM::ServiceManager& service_manager);
}; // namespace Service::Playreport

View File

@ -30,6 +30,7 @@
#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"
#include "core/hle/service/pctl/pctl.h" #include "core/hle/service/pctl/pctl.h"
#include "core/hle/service/prepo/prepo.h"
#include "core/hle/service/service.h" #include "core/hle/service/service.h"
#include "core/hle/service/set/settings.h" #include "core/hle/service/set/settings.h"
#include "core/hle/service/sm/controller.h" #include "core/hle/service/sm/controller.h"
@ -192,6 +193,7 @@ void Init(std::shared_ptr<SM::ServiceManager>& sm) {
NS::InstallInterfaces(*sm); NS::InstallInterfaces(*sm);
Nvidia::InstallInterfaces(*sm); Nvidia::InstallInterfaces(*sm);
PCTL::InstallInterfaces(*sm); PCTL::InstallInterfaces(*sm);
Playreport::InstallInterfaces(*sm);
Sockets::InstallInterfaces(*sm); Sockets::InstallInterfaces(*sm);
SPL::InstallInterfaces(*sm); SPL::InstallInterfaces(*sm);
SSL::InstallInterfaces(*sm); SSL::InstallInterfaces(*sm);

View File

@ -96,12 +96,21 @@ SSL::SSL() : ServiceFramework("ssl") {
{2, nullptr, "GetCertificates"}, {2, nullptr, "GetCertificates"},
{3, nullptr, "GetCertificateBufSize"}, {3, nullptr, "GetCertificateBufSize"},
{4, nullptr, "DebugIoctl"}, {4, nullptr, "DebugIoctl"},
{5, nullptr, "SetInterfaceVersion"}, {5, &SSL::SetInterfaceVersion, "SetInterfaceVersion"},
{6, nullptr, "FlushSessionCache"}, {6, nullptr, "FlushSessionCache"},
}; };
RegisterHandlers(functions); RegisterHandlers(functions);
} }
void SSL::SetInterfaceVersion(Kernel::HLERequestContext& ctx) {
IPC::RequestParser rp{ctx};
u32 unk1 = rp.Pop<u32>(); // Probably minor/major?
u32 unk2 = rp.Pop<u32>();
IPC::ResponseBuilder rb{ctx, 2};
rb.Push(RESULT_SUCCESS);
}
void InstallInterfaces(SM::ServiceManager& service_manager) { void InstallInterfaces(SM::ServiceManager& service_manager) {
std::make_shared<SSL>()->InstallAsService(service_manager); std::make_shared<SSL>()->InstallAsService(service_manager);
} }

View File

@ -15,6 +15,7 @@ public:
private: private:
void CreateContext(Kernel::HLERequestContext& ctx); void CreateContext(Kernel::HLERequestContext& ctx);
void SetInterfaceVersion(Kernel::HLERequestContext& ctx);
}; };
/// Registers all SSL services with the specified service manager. /// Registers all SSL services with the specified service manager.