Merge pull request #8511 from german77/hbmenu

service: ptm: Add TS, nifm: Stub GetInternetConnectionStatus
This commit is contained in:
bunnei 2022-07-16 11:30:56 -07:00 committed by GitHub
commit 87bb44830b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
11 changed files with 230 additions and 91 deletions

View File

@ -128,7 +128,7 @@ bool ParseFilterRule(Filter& instance, Iterator begin, Iterator end) {
SUB(Service, PM) \ SUB(Service, PM) \
SUB(Service, PREPO) \ SUB(Service, PREPO) \
SUB(Service, PSC) \ SUB(Service, PSC) \
SUB(Service, PSM) \ SUB(Service, PTM) \
SUB(Service, SET) \ SUB(Service, SET) \
SUB(Service, SM) \ SUB(Service, SM) \
SUB(Service, SPL) \ SUB(Service, SPL) \

View File

@ -95,7 +95,7 @@ enum class Class : u8 {
Service_PM, ///< The PM service Service_PM, ///< The PM service
Service_PREPO, ///< The PREPO (Play report) service Service_PREPO, ///< The PREPO (Play report) service
Service_PSC, ///< The PSC service Service_PSC, ///< The PSC service
Service_PSM, ///< The PSM service Service_PTM, ///< The PTM service
Service_SET, ///< The SET (Settings) service Service_SET, ///< The SET (Settings) service
Service_SM, ///< The SM (Service manager) service Service_SM, ///< The SM (Service manager) service
Service_SPL, ///< The SPL service Service_SPL, ///< The SPL service

View File

@ -605,6 +605,10 @@ add_library(core STATIC
hle/service/psc/psc.h hle/service/psc/psc.h
hle/service/ptm/psm.cpp hle/service/ptm/psm.cpp
hle/service/ptm/psm.h hle/service/ptm/psm.h
hle/service/ptm/ptm.cpp
hle/service/ptm/ptm.h
hle/service/ptm/ts.cpp
hle/service/ptm/ts.h
hle/service/kernel_helpers.cpp hle/service/kernel_helpers.cpp
hle/service/kernel_helpers.h hle/service/kernel_helpers.h
hle/service/service.cpp hle/service/service.cpp

View File

@ -30,6 +30,19 @@ enum class RequestState : u32 {
Connected = 3, Connected = 3,
}; };
enum class InternetConnectionType : u8 {
WiFi = 1,
Ethernet = 2,
};
enum class InternetConnectionStatus : u8 {
ConnectingUnknown1,
ConnectingUnknown2,
ConnectingUnknown3,
ConnectingUnknown4,
Connected,
};
struct IpAddressSetting { struct IpAddressSetting {
bool is_automatic{}; bool is_automatic{};
Network::IPv4Address current_address{}; Network::IPv4Address current_address{};
@ -271,6 +284,7 @@ private:
rb.Push(ResultSuccess); rb.Push(ResultSuccess);
rb.Push<u64>(client_id); // Client ID needs to be non zero otherwise it's considered invalid rb.Push<u64>(client_id); // Client ID needs to be non zero otherwise it's considered invalid
} }
void CreateScanRequest(Kernel::HLERequestContext& ctx) { void CreateScanRequest(Kernel::HLERequestContext& ctx) {
LOG_DEBUG(Service_NIFM, "called"); LOG_DEBUG(Service_NIFM, "called");
@ -279,6 +293,7 @@ private:
rb.Push(ResultSuccess); rb.Push(ResultSuccess);
rb.PushIpcInterface<IScanRequest>(system); rb.PushIpcInterface<IScanRequest>(system);
} }
void CreateRequest(Kernel::HLERequestContext& ctx) { void CreateRequest(Kernel::HLERequestContext& ctx) {
LOG_DEBUG(Service_NIFM, "called"); LOG_DEBUG(Service_NIFM, "called");
@ -287,6 +302,7 @@ private:
rb.Push(ResultSuccess); rb.Push(ResultSuccess);
rb.PushIpcInterface<IRequest>(system); rb.PushIpcInterface<IRequest>(system);
} }
void GetCurrentNetworkProfile(Kernel::HLERequestContext& ctx) { void GetCurrentNetworkProfile(Kernel::HLERequestContext& ctx) {
LOG_WARNING(Service_NIFM, "(STUBBED) called"); LOG_WARNING(Service_NIFM, "(STUBBED) called");
@ -335,12 +351,14 @@ private:
IPC::ResponseBuilder rb{ctx, 2}; IPC::ResponseBuilder rb{ctx, 2};
rb.Push(ResultSuccess); rb.Push(ResultSuccess);
} }
void RemoveNetworkProfile(Kernel::HLERequestContext& ctx) { void RemoveNetworkProfile(Kernel::HLERequestContext& ctx) {
LOG_WARNING(Service_NIFM, "(STUBBED) called"); LOG_WARNING(Service_NIFM, "(STUBBED) called");
IPC::ResponseBuilder rb{ctx, 2}; IPC::ResponseBuilder rb{ctx, 2};
rb.Push(ResultSuccess); rb.Push(ResultSuccess);
} }
void GetCurrentIpAddress(Kernel::HLERequestContext& ctx) { void GetCurrentIpAddress(Kernel::HLERequestContext& ctx) {
LOG_WARNING(Service_NIFM, "(STUBBED) called"); LOG_WARNING(Service_NIFM, "(STUBBED) called");
@ -354,6 +372,7 @@ private:
rb.Push(ResultSuccess); rb.Push(ResultSuccess);
rb.PushRaw(*ipv4); rb.PushRaw(*ipv4);
} }
void CreateTemporaryNetworkProfile(Kernel::HLERequestContext& ctx) { void CreateTemporaryNetworkProfile(Kernel::HLERequestContext& ctx) {
LOG_DEBUG(Service_NIFM, "called"); LOG_DEBUG(Service_NIFM, "called");
@ -369,6 +388,7 @@ private:
rb.PushIpcInterface<INetworkProfile>(system); rb.PushIpcInterface<INetworkProfile>(system);
rb.PushRaw<u128>(uuid); rb.PushRaw<u128>(uuid);
} }
void GetCurrentIpConfigInfo(Kernel::HLERequestContext& ctx) { void GetCurrentIpConfigInfo(Kernel::HLERequestContext& ctx) {
LOG_WARNING(Service_NIFM, "(STUBBED) called"); LOG_WARNING(Service_NIFM, "(STUBBED) called");
@ -405,6 +425,7 @@ private:
rb.Push(ResultSuccess); rb.Push(ResultSuccess);
rb.PushRaw<IpConfigInfo>(ip_config_info); rb.PushRaw<IpConfigInfo>(ip_config_info);
} }
void IsWirelessCommunicationEnabled(Kernel::HLERequestContext& ctx) { void IsWirelessCommunicationEnabled(Kernel::HLERequestContext& ctx) {
LOG_WARNING(Service_NIFM, "(STUBBED) called"); LOG_WARNING(Service_NIFM, "(STUBBED) called");
@ -412,6 +433,24 @@ private:
rb.Push(ResultSuccess); rb.Push(ResultSuccess);
rb.Push<u8>(0); rb.Push<u8>(0);
} }
void GetInternetConnectionStatus(Kernel::HLERequestContext& ctx) {
LOG_WARNING(Service_NIFM, "(STUBBED) called");
struct Output {
InternetConnectionType type{InternetConnectionType::WiFi};
u8 wifi_strength{3};
InternetConnectionStatus state{InternetConnectionStatus::Connected};
};
static_assert(sizeof(Output) == 0x3, "Output has incorrect size.");
constexpr Output out{};
IPC::ResponseBuilder rb{ctx, 3};
rb.Push(ResultSuccess);
rb.PushRaw(out);
}
void IsEthernetCommunicationEnabled(Kernel::HLERequestContext& ctx) { void IsEthernetCommunicationEnabled(Kernel::HLERequestContext& ctx) {
LOG_WARNING(Service_NIFM, "(STUBBED) called"); LOG_WARNING(Service_NIFM, "(STUBBED) called");
@ -423,6 +462,7 @@ private:
rb.Push<u8>(0); rb.Push<u8>(0);
} }
} }
void IsAnyInternetRequestAccepted(Kernel::HLERequestContext& ctx) { void IsAnyInternetRequestAccepted(Kernel::HLERequestContext& ctx) {
LOG_WARNING(Service_NIFM, "(STUBBED) called"); LOG_WARNING(Service_NIFM, "(STUBBED) called");
@ -456,7 +496,7 @@ IGeneralService::IGeneralService(Core::System& system_)
{15, &IGeneralService::GetCurrentIpConfigInfo, "GetCurrentIpConfigInfo"}, {15, &IGeneralService::GetCurrentIpConfigInfo, "GetCurrentIpConfigInfo"},
{16, nullptr, "SetWirelessCommunicationEnabled"}, {16, nullptr, "SetWirelessCommunicationEnabled"},
{17, &IGeneralService::IsWirelessCommunicationEnabled, "IsWirelessCommunicationEnabled"}, {17, &IGeneralService::IsWirelessCommunicationEnabled, "IsWirelessCommunicationEnabled"},
{18, nullptr, "GetInternetConnectionStatus"}, {18, &IGeneralService::GetInternetConnectionStatus, "GetInternetConnectionStatus"},
{19, nullptr, "SetEthernetCommunicationEnabled"}, {19, nullptr, "SetEthernetCommunicationEnabled"},
{20, &IGeneralService::IsEthernetCommunicationEnabled, "IsEthernetCommunicationEnabled"}, {20, &IGeneralService::IsEthernetCommunicationEnabled, "IsEthernetCommunicationEnabled"},
{21, &IGeneralService::IsAnyInternetRequestAccepted, "IsAnyInternetRequestAccepted"}, {21, &IGeneralService::IsAnyInternetRequestAccepted, "IsAnyInternetRequestAccepted"},

View File

@ -9,10 +9,8 @@
#include "core/hle/kernel/k_event.h" #include "core/hle/kernel/k_event.h"
#include "core/hle/service/kernel_helpers.h" #include "core/hle/service/kernel_helpers.h"
#include "core/hle/service/ptm/psm.h" #include "core/hle/service/ptm/psm.h"
#include "core/hle/service/service.h"
#include "core/hle/service/sm/sm.h"
namespace Service::PSM { namespace Service::PTM {
class IPsmSession final : public ServiceFramework<IPsmSession> { class IPsmSession final : public ServiceFramework<IPsmSession> {
public: public:
@ -57,7 +55,7 @@ public:
private: private:
void BindStateChangeEvent(Kernel::HLERequestContext& ctx) { void BindStateChangeEvent(Kernel::HLERequestContext& ctx) {
LOG_DEBUG(Service_PSM, "called"); LOG_DEBUG(Service_PTM, "called");
should_signal = true; should_signal = true;
@ -67,7 +65,7 @@ private:
} }
void UnbindStateChangeEvent(Kernel::HLERequestContext& ctx) { void UnbindStateChangeEvent(Kernel::HLERequestContext& ctx) {
LOG_DEBUG(Service_PSM, "called"); LOG_DEBUG(Service_PTM, "called");
should_signal = false; should_signal = false;
@ -78,7 +76,7 @@ private:
void SetChargerTypeChangeEventEnabled(Kernel::HLERequestContext& ctx) { void SetChargerTypeChangeEventEnabled(Kernel::HLERequestContext& ctx) {
IPC::RequestParser rp{ctx}; IPC::RequestParser rp{ctx};
const auto state = rp.Pop<bool>(); const auto state = rp.Pop<bool>();
LOG_DEBUG(Service_PSM, "called, state={}", state); LOG_DEBUG(Service_PTM, "called, state={}", state);
should_signal_charger_type = state; should_signal_charger_type = state;
@ -89,7 +87,7 @@ private:
void SetPowerSupplyChangeEventEnabled(Kernel::HLERequestContext& ctx) { void SetPowerSupplyChangeEventEnabled(Kernel::HLERequestContext& ctx) {
IPC::RequestParser rp{ctx}; IPC::RequestParser rp{ctx};
const auto state = rp.Pop<bool>(); const auto state = rp.Pop<bool>();
LOG_DEBUG(Service_PSM, "called, state={}", state); LOG_DEBUG(Service_PTM, "called, state={}", state);
should_signal_power_supply = state; should_signal_power_supply = state;
@ -100,7 +98,7 @@ private:
void SetBatteryVoltageStateChangeEventEnabled(Kernel::HLERequestContext& ctx) { void SetBatteryVoltageStateChangeEventEnabled(Kernel::HLERequestContext& ctx) {
IPC::RequestParser rp{ctx}; IPC::RequestParser rp{ctx};
const auto state = rp.Pop<bool>(); const auto state = rp.Pop<bool>();
LOG_DEBUG(Service_PSM, "called, state={}", state); LOG_DEBUG(Service_PTM, "called, state={}", state);
should_signal_battery_voltage = state; should_signal_battery_voltage = state;
@ -117,76 +115,58 @@ private:
Kernel::KEvent* state_change_event; Kernel::KEvent* state_change_event;
}; };
class PSM final : public ServiceFramework<PSM> { PSM::PSM(Core::System& system_) : ServiceFramework{system_, "psm"} {
public: // clang-format off
explicit PSM(Core::System& system_) : ServiceFramework{system_, "psm"} { static const FunctionInfo functions[] = {
// clang-format off {0, &PSM::GetBatteryChargePercentage, "GetBatteryChargePercentage"},
static const FunctionInfo functions[] = { {1, &PSM::GetChargerType, "GetChargerType"},
{0, &PSM::GetBatteryChargePercentage, "GetBatteryChargePercentage"}, {2, nullptr, "EnableBatteryCharging"},
{1, &PSM::GetChargerType, "GetChargerType"}, {3, nullptr, "DisableBatteryCharging"},
{2, nullptr, "EnableBatteryCharging"}, {4, nullptr, "IsBatteryChargingEnabled"},
{3, nullptr, "DisableBatteryCharging"}, {5, nullptr, "AcquireControllerPowerSupply"},
{4, nullptr, "IsBatteryChargingEnabled"}, {6, nullptr, "ReleaseControllerPowerSupply"},
{5, nullptr, "AcquireControllerPowerSupply"}, {7, &PSM::OpenSession, "OpenSession"},
{6, nullptr, "ReleaseControllerPowerSupply"}, {8, nullptr, "EnableEnoughPowerChargeEmulation"},
{7, &PSM::OpenSession, "OpenSession"}, {9, nullptr, "DisableEnoughPowerChargeEmulation"},
{8, nullptr, "EnableEnoughPowerChargeEmulation"}, {10, nullptr, "EnableFastBatteryCharging"},
{9, nullptr, "DisableEnoughPowerChargeEmulation"}, {11, nullptr, "DisableFastBatteryCharging"},
{10, nullptr, "EnableFastBatteryCharging"}, {12, nullptr, "GetBatteryVoltageState"},
{11, nullptr, "DisableFastBatteryCharging"}, {13, nullptr, "GetRawBatteryChargePercentage"},
{12, nullptr, "GetBatteryVoltageState"}, {14, nullptr, "IsEnoughPowerSupplied"},
{13, nullptr, "GetRawBatteryChargePercentage"}, {15, nullptr, "GetBatteryAgePercentage"},
{14, nullptr, "IsEnoughPowerSupplied"}, {16, nullptr, "GetBatteryChargeInfoEvent"},
{15, nullptr, "GetBatteryAgePercentage"}, {17, nullptr, "GetBatteryChargeInfoFields"},
{16, nullptr, "GetBatteryChargeInfoEvent"}, {18, nullptr, "GetBatteryChargeCalibratedEvent"},
{17, nullptr, "GetBatteryChargeInfoFields"},
{18, nullptr, "GetBatteryChargeCalibratedEvent"},
};
// clang-format on
RegisterHandlers(functions);
}
~PSM() override = default;
private:
void GetBatteryChargePercentage(Kernel::HLERequestContext& ctx) {
LOG_DEBUG(Service_PSM, "called");
IPC::ResponseBuilder rb{ctx, 3};
rb.Push(ResultSuccess);
rb.Push<u32>(battery_charge_percentage);
}
void GetChargerType(Kernel::HLERequestContext& ctx) {
LOG_DEBUG(Service_PSM, "called");
IPC::ResponseBuilder rb{ctx, 3};
rb.Push(ResultSuccess);
rb.PushEnum(charger_type);
}
void OpenSession(Kernel::HLERequestContext& ctx) {
LOG_DEBUG(Service_PSM, "called");
IPC::ResponseBuilder rb{ctx, 2, 0, 1};
rb.Push(ResultSuccess);
rb.PushIpcInterface<IPsmSession>(system);
}
enum class ChargerType : u32 {
Unplugged = 0,
RegularCharger = 1,
LowPowerCharger = 2,
Unknown = 3,
}; };
// clang-format on
u32 battery_charge_percentage{100}; // 100% RegisterHandlers(functions);
ChargerType charger_type{ChargerType::RegularCharger};
};
void InstallInterfaces(SM::ServiceManager& sm, Core::System& system) {
std::make_shared<PSM>(system)->InstallAsService(sm);
} }
} // namespace Service::PSM PSM::~PSM() = default;
void PSM::GetBatteryChargePercentage(Kernel::HLERequestContext& ctx) {
LOG_DEBUG(Service_PTM, "called");
IPC::ResponseBuilder rb{ctx, 3};
rb.Push(ResultSuccess);
rb.Push<u32>(battery_charge_percentage);
}
void PSM::GetChargerType(Kernel::HLERequestContext& ctx) {
LOG_DEBUG(Service_PTM, "called");
IPC::ResponseBuilder rb{ctx, 3};
rb.Push(ResultSuccess);
rb.PushEnum(charger_type);
}
void PSM::OpenSession(Kernel::HLERequestContext& ctx) {
LOG_DEBUG(Service_PTM, "called");
IPC::ResponseBuilder rb{ctx, 2, 0, 1};
rb.Push(ResultSuccess);
rb.PushIpcInterface<IPsmSession>(system);
}
} // namespace Service::PTM

View File

@ -3,16 +3,29 @@
#pragma once #pragma once
namespace Core { #include "core/hle/service/service.h"
class System;
}
namespace Service::SM { namespace Service::PTM {
class ServiceManager;
}
namespace Service::PSM { class PSM final : public ServiceFramework<PSM> {
public:
explicit PSM(Core::System& system_);
~PSM() override;
void InstallInterfaces(SM::ServiceManager& sm, Core::System& system); private:
enum class ChargerType : u32 {
Unplugged = 0,
RegularCharger = 1,
LowPowerCharger = 2,
Unknown = 3,
};
} // namespace Service::PSM void GetBatteryChargePercentage(Kernel::HLERequestContext& ctx);
void GetChargerType(Kernel::HLERequestContext& ctx);
void OpenSession(Kernel::HLERequestContext& ctx);
u32 battery_charge_percentage{100};
ChargerType charger_type{ChargerType::RegularCharger};
};
} // namespace Service::PTM

View File

@ -0,0 +1,18 @@
// SPDX-FileCopyrightText: Copyright 2022 yuzu Emulator Project
// SPDX-License-Identifier: GPL-3.0-or-later
#include <memory>
#include "core/core.h"
#include "core/hle/service/ptm/psm.h"
#include "core/hle/service/ptm/ptm.h"
#include "core/hle/service/ptm/ts.h"
namespace Service::PTM {
void InstallInterfaces(SM::ServiceManager& sm, Core::System& system) {
std::make_shared<PSM>(system)->InstallAsService(sm);
std::make_shared<TS>(system)->InstallAsService(sm);
}
} // namespace Service::PTM

View File

@ -0,0 +1,18 @@
// SPDX-FileCopyrightText: Copyright 2022 yuzu Emulator Project
// SPDX-License-Identifier: GPL-3.0-or-later
#pragma once
namespace Core {
class System;
}
namespace Service::SM {
class ServiceManager;
}
namespace Service::PTM {
void InstallInterfaces(SM::ServiceManager& sm, Core::System& system);
} // namespace Service::PTM

View File

@ -0,0 +1,41 @@
// SPDX-FileCopyrightText: Copyright 2022 yuzu Emulator Project
// SPDX-License-Identifier: GPL-3.0-or-later
#include <memory>
#include "core/core.h"
#include "core/hle/ipc_helpers.h"
#include "core/hle/service/ptm/ts.h"
namespace Service::PTM {
TS::TS(Core::System& system_) : ServiceFramework{system_, "ts"} {
// clang-format off
static const FunctionInfo functions[] = {
{0, nullptr, "GetTemperatureRange"},
{1, &TS::GetTemperature, "GetTemperature"},
{2, nullptr, "SetMeasurementMode"},
{3, nullptr, "GetTemperatureMilliC"},
{4, nullptr, "OpenSession"},
};
// clang-format on
RegisterHandlers(functions);
}
TS::~TS() = default;
void TS::GetTemperature(Kernel::HLERequestContext& ctx) {
IPC::RequestParser rp{ctx};
const auto location{rp.PopEnum<Location>()};
LOG_WARNING(Service_HID, "(STUBBED) called. location={}", location);
const s32 temperature = location == Location::Internal ? 35 : 20;
IPC::ResponseBuilder rb{ctx, 3};
rb.Push(ResultSuccess);
rb.Push(temperature);
}
} // namespace Service::PTM

View File

@ -0,0 +1,25 @@
// SPDX-FileCopyrightText: Copyright 2022 yuzu Emulator Project
// SPDX-License-Identifier: GPL-3.0-or-later
#pragma once
#include "common/common_types.h"
#include "core/hle/service/service.h"
namespace Service::PTM {
class TS final : public ServiceFramework<TS> {
public:
explicit TS(Core::System& system_);
~TS() override;
private:
enum class Location : u8 {
Internal,
External,
};
void GetTemperature(Kernel::HLERequestContext& ctx);
};
} // namespace Service::PTM

View File

@ -58,7 +58,7 @@
#include "core/hle/service/pm/pm.h" #include "core/hle/service/pm/pm.h"
#include "core/hle/service/prepo/prepo.h" #include "core/hle/service/prepo/prepo.h"
#include "core/hle/service/psc/psc.h" #include "core/hle/service/psc/psc.h"
#include "core/hle/service/ptm/psm.h" #include "core/hle/service/ptm/ptm.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/sm.h" #include "core/hle/service/sm/sm.h"
@ -287,7 +287,7 @@ Services::Services(std::shared_ptr<SM::ServiceManager>& sm, Core::System& system
PlayReport::InstallInterfaces(*sm, system); PlayReport::InstallInterfaces(*sm, system);
PM::InstallInterfaces(system); PM::InstallInterfaces(system);
PSC::InstallInterfaces(*sm, system); PSC::InstallInterfaces(*sm, system);
PSM::InstallInterfaces(*sm, system); PTM::InstallInterfaces(*sm, system);
Set::InstallInterfaces(*sm, system); Set::InstallInterfaces(*sm, system);
Sockets::InstallInterfaces(*sm, system); Sockets::InstallInterfaces(*sm, system);
SPL::InstallInterfaces(*sm, system); SPL::InstallInterfaces(*sm, system);