mirror/pineapple
1
0
Fork 0
Code Issues Pull requests Projects Releases 1 Packages Wiki Activity

early-access version 3438

Browse source
This commit is contained in:
pineappleEA 2023-03-06 19:03:03 +01:00
parent 1d866e0d61
commit 0de89fc8b6
14 changed files with 261 additions and 134 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
README.md
View file

@ -1,7 +1,7 @@
yuzu emulator early access yuzu emulator early access
============= =============
This is the source code for early-access 3437. This is the source code for early-access 3438.
## Legal Notice ## Legal Notice

10
src/common/settings.h
View file

@ -128,7 +128,7 @@ public:
/** /**
* Sets a default value, label, and setting value. * Sets a default value, label, and setting value.
* *
* @param default_val Intial value of the setting, and default value of the setting * @param default_val Initial value of the setting, and default value of the setting
* @param name Label for the setting * @param name Label for the setting
*/ */
explicit Setting(const Type& default_val, const std::string& name) explicit Setting(const Type& default_val, const std::string& name)
@ -139,7 +139,7 @@ public:
/** /**
* Sets a default value, minimum value, maximum value, and label. * Sets a default value, minimum value, maximum value, and label.
* *
* @param default_val Intial value of the setting, and default value of the setting * @param default_val Initial value of the setting, and default value of the setting
* @param min_val Sets the minimum allowed value of the setting * @param min_val Sets the minimum allowed value of the setting
* @param max_val Sets the maximum allowed value of the setting * @param max_val Sets the maximum allowed value of the setting
* @param name Label for the setting * @param name Label for the setting
@ -231,7 +231,7 @@ public:
/** /**
* Sets a default value, label, and setting value. * Sets a default value, label, and setting value.
* *
* @param default_val Intial value of the setting, and default value of the setting * @param default_val Initial value of the setting, and default value of the setting
* @param name Label for the setting * @param name Label for the setting
*/ */
explicit SwitchableSetting(const Type& default_val, const std::string& name) explicit SwitchableSetting(const Type& default_val, const std::string& name)
@ -242,7 +242,7 @@ public:
/** /**
* Sets a default value, minimum value, maximum value, and label. * Sets a default value, minimum value, maximum value, and label.
* *
* @param default_val Intial value of the setting, and default value of the setting * @param default_val Initial value of the setting, and default value of the setting
* @param min_val Sets the minimum allowed value of the setting * @param min_val Sets the minimum allowed value of the setting
* @param max_val Sets the maximum allowed value of the setting * @param max_val Sets the maximum allowed value of the setting
* @param name Label for the setting * @param name Label for the setting
@ -503,7 +503,7 @@ struct Values {
Setting<bool> tas_loop{false, "tas_loop"}; Setting<bool> tas_loop{false, "tas_loop"};
Setting<bool> mouse_panning{false, "mouse_panning"}; Setting<bool> mouse_panning{false, "mouse_panning"};
Setting<u8, true> mouse_panning_sensitivity{10, 1, 100, "mouse_panning_sensitivity"}; Setting<u8, true> mouse_panning_sensitivity{50, 1, 100, "mouse_panning_sensitivity"};
Setting<bool> mouse_enabled{false, "mouse_enabled"}; Setting<bool> mouse_enabled{false, "mouse_enabled"};
Setting<bool> emulate_analog_keyboard{false, "emulate_analog_keyboard"}; Setting<bool> emulate_analog_keyboard{false, "emulate_analog_keyboard"};

27
src/core/constants.cpp
View file

@ -4,13 +4,24 @@
#include "core/constants.h" #include "core/constants.h"
namespace Core::Constants { namespace Core::Constants {
const std::array<u8, 107> ACCOUNT_BACKUP_JPEG{{ const std::array<u8, 287> ACCOUNT_BACKUP_JPEG{{
0xff, 0xd8, 0xff, 0xdb, 0x00, 0x43, 0x00, 0x03, 0x02, 0x02, 0x02, 0x02, 0x02, 0x03, 0x02, 0x02, 0xff, 0xd8, 0xff, 0xe0, 0x00, 0x10, 0x4a, 0x46, 0x49, 0x46, 0x00, 0x01, 0x01, 0x01, 0x00, 0x48,
0x02, 0x03, 0x03, 0x03, 0x03, 0x04, 0x06, 0x04, 0x04, 0x04, 0x04, 0x04, 0x08, 0x06, 0x06, 0x05, 0x00, 0x48, 0x00, 0x00, 0xff, 0xdb, 0x00, 0x43, 0x00, 0x06, 0x04, 0x04, 0x04, 0x05, 0x04, 0x06,
0x06, 0x09, 0x08, 0x0a, 0x0a, 0x09, 0x08, 0x09, 0x09, 0x0a, 0x0c, 0x0f, 0x0c, 0x0a, 0x0b, 0x0e, 0x05, 0x05, 0x06, 0x09, 0x06, 0x05, 0x06, 0x09, 0x0b, 0x08, 0x06, 0x06, 0x08, 0x0b, 0x0c, 0x0a,
0x0b, 0x09, 0x09, 0x0d, 0x11, 0x0d, 0x0e, 0x0f, 0x10, 0x10, 0x11, 0x10, 0x0a, 0x0c, 0x12, 0x13, 0x0a, 0x0b, 0x0a, 0x0a, 0x0c, 0x10, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x10, 0x0c, 0x0e, 0x0f,
0x12, 0x10, 0x13, 0x0f, 0x10, 0x10, 0x10, 0xff, 0xc9, 0x00, 0x0b, 0x08, 0x00, 0x01, 0x00, 0x01, 0x10, 0x0f, 0x0e, 0x0c, 0x13, 0x13, 0x14, 0x14, 0x13, 0x13, 0x1c, 0x1b, 0x1b, 0x1b, 0x1c, 0x20,
0x01, 0x01, 0x11, 0x00, 0xff, 0xcc, 0x00, 0x06, 0x00, 0x10, 0x10, 0x05, 0xff, 0xda, 0x00, 0x08, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0xff, 0xdb, 0x00, 0x43, 0x01, 0x07, 0x07,
0x01, 0x01, 0x00, 0x00, 0x3f, 0x00, 0xd2, 0xcf, 0x20, 0xff, 0xd9, 0x07, 0x0d, 0x0c, 0x0d, 0x18, 0x10, 0x10, 0x18, 0x1a, 0x15, 0x11, 0x15, 0x1a, 0x20, 0x20, 0x20,
0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20,
0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20,
0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0xff, 0xc0,
0x00, 0x11, 0x08, 0x00, 0x20, 0x00, 0x20, 0x03, 0x01, 0x22, 0x00, 0x02, 0x11, 0x01, 0x03, 0x11,
0x01, 0xff, 0xc4, 0x00, 0x14, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0xc4, 0x00, 0x14, 0x10, 0x01, 0x00, 0x00, 0x00,
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0xc4, 0x00,
0x14, 0x01, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
0x00, 0x00, 0x00, 0xff, 0xc4, 0x00, 0x14, 0x11, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0xda, 0x00, 0x0c, 0x03, 0x01, 0x00,
0x02, 0x11, 0x03, 0x11, 0x00, 0x3f, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0xd9,
}}; }};
} }

2
src/core/constants.h
View file

@ -12,6 +12,6 @@
namespace Core::Constants { namespace Core::Constants {
// ACC Service - Blank JPEG used as user icon in absentia of real one. // ACC Service - Blank JPEG used as user icon in absentia of real one.
extern const std::array<u8, 107> ACCOUNT_BACKUP_JPEG; extern const std::array<u8, 287> ACCOUNT_BACKUP_JPEG;
} // namespace Core::Constants } // namespace Core::Constants

1
src/core/hle/kernel/k_scoped_lock.h
View file

@ -4,6 +4,7 @@
#pragma once #pragma once
#include <concepts> #include <concepts>
#include <memory>
#include <type_traits> #include <type_traits>
namespace Kernel { namespace Kernel {

45
src/core/hle/kernel/svc/svc_synchronization.cpp
View file

@ -48,19 +48,15 @@ Result ResetSignal(Core::System& system, Handle handle) {
return ResultInvalidHandle; return ResultInvalidHandle;
} }
/// Wait for the given handles to synchronize, timeout after the specified nanoseconds static Result WaitSynchronization(Core::System& system, int32_t* out_index, const Handle* handles,
Result WaitSynchronization(Core::System& system, s32* index, VAddr handles_address, s32 num_handles, int32_t num_handles, int64_t timeout_ns) {
s64 nano_seconds) {
LOG_TRACE(Kernel_SVC, "called handles_address=0x{:X}, num_handles={}, nano_seconds={}",
handles_address, num_handles, nano_seconds);
// Ensure number of handles is valid. // Ensure number of handles is valid.
R_UNLESS(0 <= num_handles && num_handles <= ArgumentHandleCountMax, ResultOutOfRange); R_UNLESS(0 <= num_handles && num_handles <= Svc::ArgumentHandleCountMax, ResultOutOfRange);
// Get the synchronization context.
auto& kernel = system.Kernel(); auto& kernel = system.Kernel();
auto& handle_table = GetCurrentProcess(kernel).GetHandleTable();
std::vector<KSynchronizationObject*> objs(num_handles); std::vector<KSynchronizationObject*> objs(num_handles);
const auto& handle_table = GetCurrentProcess(kernel).GetHandleTable();
Handle* handles = system.Memory().GetPointer<Handle>(handles_address);
// Copy user handles. // Copy user handles.
if (num_handles > 0) { if (num_handles > 0) {
@ -68,21 +64,38 @@ Result WaitSynchronization(Core::System& system, s32* index, VAddr handles_addre
R_UNLESS(handle_table.GetMultipleObjects<KSynchronizationObject>(objs.data(), handles, R_UNLESS(handle_table.GetMultipleObjects<KSynchronizationObject>(objs.data(), handles,
num_handles), num_handles),
ResultInvalidHandle); ResultInvalidHandle);
for (const auto& obj : objs) {
kernel.RegisterInUseObject(obj);
}
} }
// Ensure handles are closed when we're done. // Ensure handles are closed when we're done.
SCOPE_EXIT({ SCOPE_EXIT({
for (s32 i = 0; i < num_handles; ++i) { for (auto i = 0; i < num_handles; ++i) {
kernel.UnregisterInUseObject(objs[i]);
objs[i]->Close(); objs[i]->Close();
} }
}); });
return KSynchronizationObject::Wait(kernel, index, objs.data(), static_cast<s32>(objs.size()), // Wait on the objects.
nano_seconds); Result res = KSynchronizationObject::Wait(kernel, out_index, objs.data(),
static_cast<s32>(objs.size()), timeout_ns);
R_SUCCEED_IF(res == ResultSessionClosed);
R_RETURN(res);
}
/// Wait for the given handles to synchronize, timeout after the specified nanoseconds
Result WaitSynchronization(Core::System& system, int32_t* out_index, VAddr user_handles,
int32_t num_handles, int64_t timeout_ns) {
LOG_TRACE(Kernel_SVC, "called user_handles={:#x}, num_handles={}, timeout_ns={}", user_handles,
num_handles, timeout_ns);
// Ensure number of handles is valid.
R_UNLESS(0 <= num_handles && num_handles <= Svc::ArgumentHandleCountMax, ResultOutOfRange);
std::vector<Handle> handles(num_handles);
if (num_handles > 0) {
system.Memory().ReadBlock(user_handles, handles.data(), num_handles * sizeof(Handle));
}
R_RETURN(WaitSynchronization(system, out_index, handles.data(), num_handles, timeout_ns));
} }
/// Resumes a thread waiting on WaitSynchronization /// Resumes a thread waiting on WaitSynchronization

18
src/core/hle/service/psc/psc.cpp
View file

@ -11,9 +11,9 @@
namespace Service::PSC { namespace Service::PSC {
class PSC_C final : public ServiceFramework<PSC_C> { class IPmControl final : public ServiceFramework<IPmControl> {
public: public:
explicit PSC_C(Core::System& system_) : ServiceFramework{system_, "psc:c"} { explicit IPmControl(Core::System& system_) : ServiceFramework{system_, "psc:c"} {
// clang-format off // clang-format off
static const FunctionInfo functions[] = { static const FunctionInfo functions[] = {
{0, nullptr, "Initialize"}, {0, nullptr, "Initialize"},
@ -23,8 +23,8 @@ public:
{4, nullptr, "Cancel"}, {4, nullptr, "Cancel"},
{5, nullptr, "PrintModuleInformation"}, {5, nullptr, "PrintModuleInformation"},
{6, nullptr, "GetModuleInformation"}, {6, nullptr, "GetModuleInformation"},
{10, nullptr, "Unknown10"}, {10, nullptr, "AcquireStateLock"},
{11, nullptr, "Unknown11"}, {11, nullptr, "HasStateLock"},
}; };
// clang-format on // clang-format on
@ -49,12 +49,12 @@ public:
} }
}; };
class PSC_M final : public ServiceFramework<PSC_M> { class IPmService final : public ServiceFramework<IPmService> {
public: public:
explicit PSC_M(Core::System& system_) : ServiceFramework{system_, "psc:m"} { explicit IPmService(Core::System& system_) : ServiceFramework{system_, "psc:m"} {
// clang-format off // clang-format off
static const FunctionInfo functions[] = { static const FunctionInfo functions[] = {
{0, &PSC_M::GetPmModule, "GetPmModule"}, {0, &IPmService::GetPmModule, "GetPmModule"},
}; };
// clang-format on // clang-format on
@ -74,8 +74,8 @@ private:
void LoopProcess(Core::System& system) { void LoopProcess(Core::System& system) {
auto server_manager = std::make_unique<ServerManager>(system); auto server_manager = std::make_unique<ServerManager>(system);
server_manager->RegisterNamedService("psc:c", std::make_shared<PSC_C>(system)); server_manager->RegisterNamedService("psc:c", std::make_shared<IPmControl>(system));
server_manager->RegisterNamedService("psc:m", std::make_shared<PSC_M>(system)); server_manager->RegisterNamedService("psc:m", std::make_shared<IPmService>(system));
ServerManager::RunServer(std::move(server_manager)); ServerManager::RunServer(std::move(server_manager));
} }

76
src/core/hle/service/ssl/ssl.cpp
View file

@ -8,14 +8,36 @@
namespace Service::SSL { namespace Service::SSL {
// This is nn::ssl::sf::CertificateFormat
enum class CertificateFormat : u32 { enum class CertificateFormat : u32 {
Pem = 1, Pem = 1,
Der = 2, Der = 2,
}; };
// This is nn::ssl::sf::ContextOption
enum class ContextOption : u32 {
None = 0,
CrlImportDateCheckEnable = 1,
};
// This is nn::ssl::sf::SslVersion
struct SslVersion {
union {
u32 raw{};
BitField<0, 1, u32> tls_auto;
BitField<3, 1, u32> tls_v10;
BitField<4, 1, u32> tls_v11;
BitField<5, 1, u32> tls_v12;
BitField<6, 1, u32> tls_v13;
BitField<24, 7, u32> api_version;
};
};
class ISslConnection final : public ServiceFramework<ISslConnection> { class ISslConnection final : public ServiceFramework<ISslConnection> {
public: public:
explicit ISslConnection(Core::System& system_) : ServiceFramework{system_, "ISslConnection"} { explicit ISslConnection(Core::System& system_, SslVersion version)
: ServiceFramework{system_, "ISslConnection"}, ssl_version{version} {
// clang-format off // clang-format off
static const FunctionInfo functions[] = { static const FunctionInfo functions[] = {
{0, nullptr, "SetSocketDescriptor"}, {0, nullptr, "SetSocketDescriptor"},
@ -59,11 +81,15 @@ public:
RegisterHandlers(functions); RegisterHandlers(functions);
} }
private:
SslVersion ssl_version;
}; };
class ISslContext final : public ServiceFramework<ISslContext> { class ISslContext final : public ServiceFramework<ISslContext> {
public: public:
explicit ISslContext(Core::System& system_) : ServiceFramework{system_, "ISslContext"} { explicit ISslContext(Core::System& system_, SslVersion version)
: ServiceFramework{system_, "ISslContext"}, ssl_version{version} {
static const FunctionInfo functions[] = { static const FunctionInfo functions[] = {
{0, &ISslContext::SetOption, "SetOption"}, {0, &ISslContext::SetOption, "SetOption"},
{1, nullptr, "GetOption"}, {1, nullptr, "GetOption"},
@ -84,17 +110,20 @@ public:
} }
private: private:
SslVersion ssl_version;
void SetOption(HLERequestContext& ctx) { void SetOption(HLERequestContext& ctx) {
struct Parameters { struct Parameters {
u8 enable; ContextOption option;
u32 option; s32 value;
}; };
static_assert(sizeof(Parameters) == 0x8, "Parameters is an invalid size");
IPC::RequestParser rp{ctx}; IPC::RequestParser rp{ctx};
const auto parameters = rp.PopRaw<Parameters>(); const auto parameters = rp.PopRaw<Parameters>();
LOG_WARNING(Service_SSL, "(STUBBED) called. enable={}, option={}", parameters.enable, LOG_WARNING(Service_SSL, "(STUBBED) called. option={}, value={}", parameters.option,
parameters.option); parameters.value);
IPC::ResponseBuilder rb{ctx, 2}; IPC::ResponseBuilder rb{ctx, 2};
rb.Push(ResultSuccess); rb.Push(ResultSuccess);
@ -105,7 +134,7 @@ private:
IPC::ResponseBuilder rb{ctx, 2, 0, 1}; IPC::ResponseBuilder rb{ctx, 2, 0, 1};
rb.Push(ResultSuccess); rb.Push(ResultSuccess);
rb.PushIpcInterface<ISslConnection>(system); rb.PushIpcInterface<ISslConnection>(system, ssl_version);
} }
void ImportServerPki(HLERequestContext& ctx) { void ImportServerPki(HLERequestContext& ctx) {
@ -142,20 +171,21 @@ private:
} }
}; };
class SSL final : public ServiceFramework<SSL> { class ISslService final : public ServiceFramework<ISslService> {
public: public:
explicit SSL(Core::System& system_) : ServiceFramework{system_, "ssl"} { explicit ISslService(Core::System& system_) : ServiceFramework{system_, "ssl"} {
// clang-format off // clang-format off
static const FunctionInfo functions[] = { static const FunctionInfo functions[] = {
{0, &SSL::CreateContext, "CreateContext"}, {0, &ISslService::CreateContext, "CreateContext"},
{1, nullptr, "GetContextCount"}, {1, nullptr, "GetContextCount"},
{2, nullptr, "GetCertificates"}, {2, nullptr, "GetCertificates"},
{3, nullptr, "GetCertificateBufSize"}, {3, nullptr, "GetCertificateBufSize"},
{4, nullptr, "DebugIoctl"}, {4, nullptr, "DebugIoctl"},
{5, &SSL::SetInterfaceVersion, "SetInterfaceVersion"}, {5, &ISslService::SetInterfaceVersion, "SetInterfaceVersion"},
{6, nullptr, "FlushSessionCache"}, {6, nullptr, "FlushSessionCache"},
{7, nullptr, "SetDebugOption"}, {7, nullptr, "SetDebugOption"},
{8, nullptr, "GetDebugOption"}, {8, nullptr, "GetDebugOption"},
{8, nullptr, "ClearTls12FallbackFlag"},
}; };
// clang-format on // clang-format on
@ -163,20 +193,30 @@ public:
} }
private: private:
u32 ssl_version{};
void CreateContext(HLERequestContext& ctx) { void CreateContext(HLERequestContext& ctx) {
LOG_WARNING(Service_SSL, "(STUBBED) called"); struct Parameters {
SslVersion ssl_version;
INSERT_PADDING_BYTES(0x4);
u64 pid_placeholder;
};
static_assert(sizeof(Parameters) == 0x10, "Parameters is an invalid size");
IPC::RequestParser rp{ctx};
const auto parameters = rp.PopRaw<Parameters>();
LOG_WARNING(Service_SSL, "(STUBBED) called, api_version={}, pid_placeholder={}",
parameters.ssl_version.api_version, parameters.pid_placeholder);
IPC::ResponseBuilder rb{ctx, 2, 0, 1}; IPC::ResponseBuilder rb{ctx, 2, 0, 1};
rb.Push(ResultSuccess); rb.Push(ResultSuccess);
rb.PushIpcInterface<ISslContext>(system); rb.PushIpcInterface<ISslContext>(system, parameters.ssl_version);
} }
void SetInterfaceVersion(HLERequestContext& ctx) { void SetInterfaceVersion(HLERequestContext& ctx) {
LOG_DEBUG(Service_SSL, "called");
IPC::RequestParser rp{ctx}; IPC::RequestParser rp{ctx};
ssl_version = rp.Pop<u32>(); u32 ssl_version = rp.Pop<u32>();
LOG_DEBUG(Service_SSL, "called, ssl_version={}", ssl_version);
IPC::ResponseBuilder rb{ctx, 2}; IPC::ResponseBuilder rb{ctx, 2};
rb.Push(ResultSuccess); rb.Push(ResultSuccess);
@ -186,7 +226,7 @@ private:
void LoopProcess(Core::System& system) { void LoopProcess(Core::System& system) {
auto server_manager = std::make_unique<ServerManager>(system); auto server_manager = std::make_unique<ServerManager>(system);
server_manager->RegisterNamedService("ssl", std::make_shared<SSL>(system)); server_manager->RegisterNamedService("ssl", std::make_shared<ISslService>(system));
ServerManager::RunServer(std::move(server_manager)); ServerManager::RunServer(std::move(server_manager));
} }

70
src/core/hle/service/usb/usb.cpp
View file

@ -16,19 +16,19 @@ public:
explicit IDsInterface(Core::System& system_) : ServiceFramework{system_, "IDsInterface"} { explicit IDsInterface(Core::System& system_) : ServiceFramework{system_, "IDsInterface"} {
// clang-format off // clang-format off
static const FunctionInfo functions[] = { static const FunctionInfo functions[] = {
{0, nullptr, "BindDevice"}, {0, nullptr, "AddEndpoint"},
{1, nullptr, "BindClientProcess"}, {1, nullptr, "GetSetupEvent"},
{2, nullptr, "AddInterface"}, {2, nullptr, "GetSetupPacket"},
{3, nullptr, "GetStateChangeEvent"}, {3, nullptr, "Enable"},
{4, nullptr, "GetState"}, {4, nullptr, "Disable"},
{5, nullptr, "ClearDeviceData"}, {5, nullptr, "CtrlIn"},
{6, nullptr, "AddUsbStringDescriptor"}, {6, nullptr, "CtrlOut"},
{7, nullptr, "DeleteUsbStringDescriptor"}, {7, nullptr, "GetCtrlInCompletionEvent"},
{8, nullptr, "SetUsbDeviceDescriptor"}, {8, nullptr, "GetCtrlInUrbReport"},
{9, nullptr, "SetBinaryObjectStore"}, {9, nullptr, "GetCtrlOutCompletionEvent"},
{10, nullptr, "Enable"}, {10, nullptr, "GetCtrlOutUrbReport"},
{11, nullptr, "Disable"}, {11, nullptr, "CtrlStall"},
{12, nullptr, "Unknown12"}, {12, nullptr, "AppendConfigurationData"},
}; };
// clang-format on // clang-format on
@ -36,9 +36,9 @@ public:
} }
}; };
class USB_DS final : public ServiceFramework<USB_DS> { class IDsRootSession final : public ServiceFramework<IDsRootSession> {
public: public:
explicit USB_DS(Core::System& system_) : ServiceFramework{system_, "usb:ds"} { explicit IDsRootSession(Core::System& system_) : ServiceFramework{system_, "usb:ds"} {
// clang-format off // clang-format off
static const FunctionInfo functions[] = { static const FunctionInfo functions[] = {
{0, nullptr, "OpenDsService"}, {0, nullptr, "OpenDsService"},
@ -94,9 +94,9 @@ public:
} }
}; };
class USB_HS final : public ServiceFramework<USB_HS> { class IClientRootSession final : public ServiceFramework<IClientRootSession> {
public: public:
explicit USB_HS(Core::System& system_) : ServiceFramework{system_, "usb:hs"} { explicit IClientRootSession(Core::System& system_) : ServiceFramework{system_, "usb:hs"} {
// clang-format off // clang-format off
static const FunctionInfo functions[] = { static const FunctionInfo functions[] = {
{0, nullptr, "BindClientProcess"}, {0, nullptr, "BindClientProcess"},
@ -107,7 +107,7 @@ public:
{5, nullptr, "DestroyInterfaceAvailableEvent"}, {5, nullptr, "DestroyInterfaceAvailableEvent"},
{6, nullptr, "GetInterfaceStateChangeEvent"}, {6, nullptr, "GetInterfaceStateChangeEvent"},
{7, nullptr, "AcquireUsbIf"}, {7, nullptr, "AcquireUsbIf"},
{8, nullptr, "ResetDevice"}, {8, nullptr, "SetTestMode"},
}; };
// clang-format on // clang-format on
@ -134,12 +134,12 @@ public:
} }
}; };
class USB_PD final : public ServiceFramework<USB_PD> { class IPdManager final : public ServiceFramework<IPdManager> {
public: public:
explicit USB_PD(Core::System& system_) : ServiceFramework{system_, "usb:pd"} { explicit IPdManager(Core::System& system_) : ServiceFramework{system_, "usb:pd"} {
// clang-format off // clang-format off
static const FunctionInfo functions[] = { static const FunctionInfo functions[] = {
{0, &USB_PD::GetPdSession, "GetPdSession"}, {0, &IPdManager::OpenSession, "OpenSession"},
}; };
// clang-format on // clang-format on
@ -147,7 +147,7 @@ public:
} }
private: private:
void GetPdSession(HLERequestContext& ctx) { void OpenSession(HLERequestContext& ctx) {
LOG_DEBUG(Service_USB, "called"); LOG_DEBUG(Service_USB, "called");
IPC::ResponseBuilder rb{ctx, 2, 0, 1}; IPC::ResponseBuilder rb{ctx, 2, 0, 1};
@ -178,12 +178,12 @@ public:
} }
}; };
class USB_PD_C final : public ServiceFramework<USB_PD_C> { class IPdCradleManager final : public ServiceFramework<IPdCradleManager> {
public: public:
explicit USB_PD_C(Core::System& system_) : ServiceFramework{system_, "usb:pd:c"} { explicit IPdCradleManager(Core::System& system_) : ServiceFramework{system_, "usb:pd:c"} {
// clang-format off // clang-format off
static const FunctionInfo functions[] = { static const FunctionInfo functions[] = {
{0, &USB_PD_C::GetPdCradleSession, "GetPdCradleSession"}, {0, &IPdCradleManager::OpenCradleSession, "OpenCradleSession"},
}; };
// clang-format on // clang-format on
@ -191,18 +191,18 @@ public:
} }
private: private:
void GetPdCradleSession(HLERequestContext& ctx) { void OpenCradleSession(HLERequestContext& ctx) {
LOG_DEBUG(Service_USB, "called");
IPC::ResponseBuilder rb{ctx, 2, 0, 1}; IPC::ResponseBuilder rb{ctx, 2, 0, 1};
rb.Push(ResultSuccess); rb.Push(ResultSuccess);
rb.PushIpcInterface<IPdCradleSession>(system); rb.PushIpcInterface<IPdCradleSession>(system);
LOG_DEBUG(Service_USB, "called");
} }
}; };
class USB_PM final : public ServiceFramework<USB_PM> { class IPmMainService final : public ServiceFramework<IPmMainService> {
public: public:
explicit USB_PM(Core::System& system_) : ServiceFramework{system_, "usb:pm"} { explicit IPmMainService(Core::System& system_) : ServiceFramework{system_, "usb:pm"} {
// clang-format off // clang-format off
static const FunctionInfo functions[] = { static const FunctionInfo functions[] = {
{0, nullptr, "GetPowerEvent"}, {0, nullptr, "GetPowerEvent"},
@ -221,11 +221,11 @@ public:
void LoopProcess(Core::System& system) { void LoopProcess(Core::System& system) {
auto server_manager = std::make_unique<ServerManager>(system); auto server_manager = std::make_unique<ServerManager>(system);
server_manager->RegisterNamedService("usb:ds", std::make_shared<USB_DS>(system)); server_manager->RegisterNamedService("usb:ds", std::make_shared<IDsRootSession>(system));
server_manager->RegisterNamedService("usb:hs", std::make_shared<USB_HS>(system)); server_manager->RegisterNamedService("usb:hs", std::make_shared<IClientRootSession>(system));
server_manager->RegisterNamedService("usb:pd", std::make_shared<USB_PD>(system)); server_manager->RegisterNamedService("usb:pd", std::make_shared<IPdManager>(system));
server_manager->RegisterNamedService("usb:pd:c", std::make_shared<USB_PD_C>(system)); server_manager->RegisterNamedService("usb:pd:c", std::make_shared<IPdCradleManager>(system));
server_manager->RegisterNamedService("usb:pm", std::make_shared<USB_PM>(system)); server_manager->RegisterNamedService("usb:pm", std::make_shared<IPmMainService>(system));
ServerManager::RunServer(std::move(server_manager)); ServerManager::RunServer(std::move(server_manager));
} }

27
src/input_common/drivers/mouse.cpp
View file

@ -3,6 +3,7 @@
#include <thread> #include <thread>
#include <fmt/format.h> #include <fmt/format.h>
#include <math.h>
#include "common/param_package.h" #include "common/param_package.h"
#include "common/settings.h" #include "common/settings.h"
@ -11,8 +12,9 @@
namespace InputCommon { namespace InputCommon {
constexpr int update_time = 10; constexpr int update_time = 10;
constexpr float default_stick_sensitivity = 0.022f; constexpr float default_stick_sensitivity = 0.0044f;
constexpr float default_motion_sensitivity = 0.008f; constexpr float default_motion_sensitivity = 0.0003f;
constexpr float maximum_rotation_speed = 1.0f;
constexpr int mouse_axis_x = 0; constexpr int mouse_axis_x = 0;
constexpr int mouse_axis_y = 1; constexpr int mouse_axis_y = 1;
constexpr int wheel_axis_x = 2; constexpr int wheel_axis_x = 2;
@ -99,11 +101,13 @@ void Mouse::UpdateMotionInput() {
const float sensitivity = const float sensitivity =
Settings::values.mouse_panning_sensitivity.GetValue() * default_motion_sensitivity; Settings::values.mouse_panning_sensitivity.GetValue() * default_motion_sensitivity;
// Slow movement by 7% const float rotation_velocity = std::sqrt(last_motion_change.x * last_motion_change.x +
if (Settings::values.mouse_panning) { last_motion_change.y * last_motion_change.y);
last_motion_change *= 0.93f;
} else { if (rotation_velocity > maximum_rotation_speed / sensitivity) {
last_motion_change.z *= 0.93f; const float multiplier = maximum_rotation_speed / rotation_velocity / sensitivity;
last_motion_change.x = last_motion_change.x * multiplier;
last_motion_change.y = last_motion_change.y * multiplier;
} }
const BasicMotion motion_data{ const BasicMotion motion_data{
@ -116,6 +120,12 @@ void Mouse::UpdateMotionInput() {
.delta_timestamp = update_time * 1000, .delta_timestamp = update_time * 1000,
}; };
if (Settings::values.mouse_panning) {
last_motion_change.x = 0;
last_motion_change.y = 0;
}
last_motion_change.z = 0;
SetMotion(motion_identifier, 0, motion_data); SetMotion(motion_identifier, 0, motion_data);
} }
@ -125,7 +135,7 @@ void Mouse::Move(int x, int y, int center_x, int center_y) {
auto mouse_change = auto mouse_change =
(Common::MakeVec(x, y) - Common::MakeVec(center_x, center_y)).Cast<float>(); (Common::MakeVec(x, y) - Common::MakeVec(center_x, center_y)).Cast<float>();
Common::Vec3<float> motion_change{-mouse_change.y, -mouse_change.x, last_motion_change.z}; last_motion_change += {-mouse_change.y, -mouse_change.x, last_motion_change.z};
const auto move_distance = mouse_change.Length(); const auto move_distance = mouse_change.Length();
if (move_distance == 0) { if (move_distance == 0) {
@ -141,7 +151,6 @@ void Mouse::Move(int x, int y, int center_x, int center_y) {
// Average mouse movements // Average mouse movements
last_mouse_change = (last_mouse_change * 0.91f) + (mouse_change * 0.09f); last_mouse_change = (last_mouse_change * 0.91f) + (mouse_change * 0.09f);
last_motion_change = (last_motion_change * 0.69f) + (motion_change * 0.31f);
const auto last_move_distance = last_mouse_change.Length(); const auto last_move_distance = last_mouse_change.Length();

12
src/input_common/helpers/joycon_protocol/joycon_types.h
View file

@ -95,6 +95,18 @@ enum class PasivePadButton : u32 {
ZL_ZR = 0x8000, ZL_ZR = 0x8000,
}; };
enum class PasivePadStick : u8 {
Right = 0x00,
RightDown = 0x01,
Down = 0x02,
DownLeft = 0x03,
Left = 0x04,
LeftUp = 0x05,
Up = 0x06,
UpRight = 0x07,
Neutral = 0x08,
};
enum class OutputReport : u8 { enum class OutputReport : u8 {
RUMBLE_AND_SUBCMD = 0x01, RUMBLE_AND_SUBCMD = 0x01,
FW_UPDATE_PKT = 0x03, FW_UPDATE_PKT = 0x03,

95
src/input_common/helpers/joycon_protocol/poller.cpp
View file

@ -12,7 +12,7 @@ JoyconPoller::JoyconPoller(ControllerType device_type_, JoyStickCalibration left
: device_type{device_type_}, left_stick_calibration{left_stick_calibration_}, : device_type{device_type_}, left_stick_calibration{left_stick_calibration_},
right_stick_calibration{right_stick_calibration_}, motion_calibration{motion_calibration_} {} right_stick_calibration{right_stick_calibration_}, motion_calibration{motion_calibration_} {}
void JoyconPoller::SetCallbacks(const Joycon::JoyconCallbacks& callbacks_) { void JoyconPoller::SetCallbacks(const JoyconCallbacks& callbacks_) {
callbacks = std::move(callbacks_); callbacks = std::move(callbacks_);
} }
@ -22,13 +22,13 @@ void JoyconPoller::ReadActiveMode(std::span<u8> buffer, const MotionStatus& moti
memcpy(&data, buffer.data(), sizeof(InputReportActive)); memcpy(&data, buffer.data(), sizeof(InputReportActive));
switch (device_type) { switch (device_type) {
case Joycon::ControllerType::Left: case ControllerType::Left:
UpdateActiveLeftPadInput(data, motion_status); UpdateActiveLeftPadInput(data, motion_status);
break; break;
case Joycon::ControllerType::Right: case ControllerType::Right:
UpdateActiveRightPadInput(data, motion_status); UpdateActiveRightPadInput(data, motion_status);
break; break;
case Joycon::ControllerType::Pro: case ControllerType::Pro:
UpdateActiveProPadInput(data, motion_status); UpdateActiveProPadInput(data, motion_status);
break; break;
default: default:
@ -47,13 +47,13 @@ void JoyconPoller::ReadPassiveMode(std::span<u8> buffer) {
memcpy(&data, buffer.data(), sizeof(InputReportPassive)); memcpy(&data, buffer.data(), sizeof(InputReportPassive));
switch (device_type) { switch (device_type) {
case Joycon::ControllerType::Left: case ControllerType::Left:
UpdatePasiveLeftPadInput(data); UpdatePasiveLeftPadInput(data);
break; break;
case Joycon::ControllerType::Right: case ControllerType::Right:
UpdatePasiveRightPadInput(data); UpdatePasiveRightPadInput(data);
break; break;
case Joycon::ControllerType::Pro: case ControllerType::Pro:
UpdatePasiveProPadInput(data); UpdatePasiveProPadInput(data);
break; break;
default: default:
@ -211,13 +211,11 @@ void JoyconPoller::UpdateActiveProPadInput(const InputReportActive& input,
} }
void JoyconPoller::UpdatePasiveLeftPadInput(const InputReportPassive& input) { void JoyconPoller::UpdatePasiveLeftPadInput(const InputReportPassive& input) {
static constexpr std::array<Joycon::PasivePadButton, 11> left_buttons{ static constexpr std::array<PasivePadButton, 11> left_buttons{
Joycon::PasivePadButton::Down_A, Joycon::PasivePadButton::Right_X, PasivePadButton::Down_A, PasivePadButton::Right_X, PasivePadButton::Left_B,
Joycon::PasivePadButton::Left_B, Joycon::PasivePadButton::Up_Y, PasivePadButton::Up_Y, PasivePadButton::SL, PasivePadButton::SR,
Joycon::PasivePadButton::SL, Joycon::PasivePadButton::SR, PasivePadButton::L_R, PasivePadButton::ZL_ZR, PasivePadButton::Minus,
Joycon::PasivePadButton::L_R, Joycon::PasivePadButton::ZL_ZR, PasivePadButton::Capture, PasivePadButton::StickL,
Joycon::PasivePadButton::Minus, Joycon::PasivePadButton::Capture,
Joycon::PasivePadButton::StickL,
}; };
for (auto left_button : left_buttons) { for (auto left_button : left_buttons) {
@ -225,16 +223,19 @@ void JoyconPoller::UpdatePasiveLeftPadInput(const InputReportPassive& input) {
const int button = static_cast<int>(left_button); const int button = static_cast<int>(left_button);
callbacks.on_button_data(button, button_status); callbacks.on_button_data(button, button_status);
} }
const auto [left_axis_x, left_axis_y] =
GetPassiveAxisValue(static_cast<PasivePadStick>(input.stick_state));
callbacks.on_stick_data(static_cast<int>(PadAxes::LeftStickX), left_axis_x);
callbacks.on_stick_data(static_cast<int>(PadAxes::LeftStickY), left_axis_y);
} }
void JoyconPoller::UpdatePasiveRightPadInput(const InputReportPassive& input) { void JoyconPoller::UpdatePasiveRightPadInput(const InputReportPassive& input) {
static constexpr std::array<Joycon::PasivePadButton, 11> right_buttons{ static constexpr std::array<PasivePadButton, 11> right_buttons{
Joycon::PasivePadButton::Down_A, Joycon::PasivePadButton::Right_X, PasivePadButton::Down_A, PasivePadButton::Right_X, PasivePadButton::Left_B,
Joycon::PasivePadButton::Left_B, Joycon::PasivePadButton::Up_Y, PasivePadButton::Up_Y, PasivePadButton::SL, PasivePadButton::SR,
Joycon::PasivePadButton::SL, Joycon::PasivePadButton::SR, PasivePadButton::L_R, PasivePadButton::ZL_ZR, PasivePadButton::Plus,
Joycon::PasivePadButton::L_R, Joycon::PasivePadButton::ZL_ZR, PasivePadButton::Home, PasivePadButton::StickR,
Joycon::PasivePadButton::Plus, Joycon::PasivePadButton::Home,
Joycon::PasivePadButton::StickR,
}; };
for (auto right_button : right_buttons) { for (auto right_button : right_buttons) {
@ -242,17 +243,20 @@ void JoyconPoller::UpdatePasiveRightPadInput(const InputReportPassive& input) {
const int button = static_cast<int>(right_button); const int button = static_cast<int>(right_button);
callbacks.on_button_data(button, button_status); callbacks.on_button_data(button, button_status);
} }
const auto [right_axis_x, right_axis_y] =
GetPassiveAxisValue(static_cast<PasivePadStick>(input.stick_state));
callbacks.on_stick_data(static_cast<int>(PadAxes::RightStickX), right_axis_x);
callbacks.on_stick_data(static_cast<int>(PadAxes::RightStickY), right_axis_y);
} }
void JoyconPoller::UpdatePasiveProPadInput(const InputReportPassive& input) { void JoyconPoller::UpdatePasiveProPadInput(const InputReportPassive& input) {
static constexpr std::array<Joycon::PasivePadButton, 14> pro_buttons{ static constexpr std::array<PasivePadButton, 14> pro_buttons{
Joycon::PasivePadButton::Down_A, Joycon::PasivePadButton::Right_X, PasivePadButton::Down_A, PasivePadButton::Right_X, PasivePadButton::Left_B,
Joycon::PasivePadButton::Left_B, Joycon::PasivePadButton::Up_Y, PasivePadButton::Up_Y, PasivePadButton::SL, PasivePadButton::SR,
Joycon::PasivePadButton::SL, Joycon::PasivePadButton::SR, PasivePadButton::L_R, PasivePadButton::ZL_ZR, PasivePadButton::Minus,
Joycon::PasivePadButton::L_R, Joycon::PasivePadButton::ZL_ZR, PasivePadButton::Plus, PasivePadButton::Capture, PasivePadButton::Home,
Joycon::PasivePadButton::Minus, Joycon::PasivePadButton::Plus, PasivePadButton::StickL, PasivePadButton::StickR,
Joycon::PasivePadButton::Capture, Joycon::PasivePadButton::Home,
Joycon::PasivePadButton::StickL, Joycon::PasivePadButton::StickR,
}; };
for (auto pro_button : pro_buttons) { for (auto pro_button : pro_buttons) {
@ -260,6 +264,15 @@ void JoyconPoller::UpdatePasiveProPadInput(const InputReportPassive& input) {
const int button = static_cast<int>(pro_button); const int button = static_cast<int>(pro_button);
callbacks.on_button_data(button, button_status); callbacks.on_button_data(button, button_status);
} }
const auto [left_axis_x, left_axis_y] =
GetPassiveAxisValue(static_cast<PasivePadStick>(input.stick_state && 0xf));
const auto [right_axis_x, right_axis_y] =
GetPassiveAxisValue(static_cast<PasivePadStick>(input.stick_state >> 4));
callbacks.on_stick_data(static_cast<int>(PadAxes::LeftStickX), left_axis_x);
callbacks.on_stick_data(static_cast<int>(PadAxes::LeftStickY), left_axis_y);
callbacks.on_stick_data(static_cast<int>(PadAxes::RightStickX), right_axis_x);
callbacks.on_stick_data(static_cast<int>(PadAxes::RightStickY), right_axis_y);
} }
f32 JoyconPoller::GetAxisValue(u16 raw_value, Joycon::JoyStickAxisCalibration calibration) const { f32 JoyconPoller::GetAxisValue(u16 raw_value, Joycon::JoyStickAxisCalibration calibration) const {
@ -270,6 +283,30 @@ f32 JoyconPoller::GetAxisValue(u16 raw_value, Joycon::JoyStickAxisCalibration ca
return value / calibration.min; return value / calibration.min;
} }
std::pair<f32, f32> JoyconPoller::GetPassiveAxisValue(PasivePadStick raw_value) const {
switch (raw_value) {
case PasivePadStick::Right:
return {1.0f, 0.0f};
case PasivePadStick::RightDown:
return {1.0f, -1.0f};
case PasivePadStick::Down:
return {0.0f, -1.0f};
case PasivePadStick::DownLeft:
return {-1.0f, -1.0f};
case PasivePadStick::Left:
return {-1.0f, 0.0f};
case PasivePadStick::LeftUp:
return {-1.0f, 1.0f};
case PasivePadStick::Up:
return {0.0f, 1.0f};
case PasivePadStick::UpRight:
return {1.0f, 1.0f};
case PasivePadStick::Neutral:
default:
return {0.0f, 0.0f};
}
}
f32 JoyconPoller::GetAccelerometerValue(s16 raw, const MotionSensorCalibration& cal, f32 JoyconPoller::GetAccelerometerValue(s16 raw, const MotionSensorCalibration& cal,
AccelerometerSensitivity sensitivity) const { AccelerometerSensitivity sensitivity) const {
const f32 value = raw * (1.0f / (cal.scale - cal.offset)) * 4; const f32 value = raw * (1.0f / (cal.scale - cal.offset)) * 4;

9
src/input_common/helpers/joycon_protocol/poller.h
View file

@ -22,7 +22,7 @@ public:
JoyStickCalibration right_stick_calibration_, JoyStickCalibration right_stick_calibration_,
MotionCalibration motion_calibration_); MotionCalibration motion_calibration_);
void SetCallbacks(const Joycon::JoyconCallbacks& callbacks_); void SetCallbacks(const JoyconCallbacks& callbacks_);
/// Handles data from passive packages /// Handles data from passive packages
void ReadPassiveMode(std::span<u8> buffer); void ReadPassiveMode(std::span<u8> buffer);
@ -51,7 +51,10 @@ private:
void UpdatePasiveProPadInput(const InputReportPassive& buffer); void UpdatePasiveProPadInput(const InputReportPassive& buffer);
/// Returns a calibrated joystick axis from raw axis data /// Returns a calibrated joystick axis from raw axis data
f32 GetAxisValue(u16 raw_value, Joycon::JoyStickAxisCalibration calibration) const; f32 GetAxisValue(u16 raw_value, JoyStickAxisCalibration calibration) const;
/// Returns a digital joystick axis from passive axis data
std::pair<f32, f32> GetPassiveAxisValue(PasivePadStick raw_value) const;
/// Returns a calibrated accelerometer axis from raw motion data /// Returns a calibrated accelerometer axis from raw motion data
f32 GetAccelerometerValue(s16 raw, const MotionSensorCalibration& cal, f32 GetAccelerometerValue(s16 raw, const MotionSensorCalibration& cal,
@ -75,7 +78,7 @@ private:
JoyStickCalibration right_stick_calibration{}; JoyStickCalibration right_stick_calibration{};
MotionCalibration motion_calibration{}; MotionCalibration motion_calibration{};
Joycon::JoyconCallbacks callbacks{}; JoyconCallbacks callbacks{};
}; };
} // namespace InputCommon::Joycon } // namespace InputCommon::Joycon

1
src/input_common/input_mapping.cpp
View file

@ -146,6 +146,7 @@ void MappingFactory::RegisterMotion(const MappingData& data) {
if (data.engine == "mouse") { if (data.engine == "mouse") {
new_input.Set("motion", 0); new_input.Set("motion", 0);
new_input.Set("pad", 1); new_input.Set("pad", 1);
new_input.Set("threshold", 0.001f);
input_queue.Push(new_input); input_queue.Push(new_input);
return; return;
} }