fix padding

src/core/hle/service/ns/ns.cpp

@@ -3,6 +3,7 @@
 
 #include "common/logging/log.h"
 #include "common/settings.h"
+#include "common/uuid.h"
 #include "core/core.h"
 #include "core/file_sys/control_metadata.h"
 #include "core/file_sys/patch_manager.h"
@@ -548,6 +549,84 @@ IDownloadTaskInterface::IDownloadTaskInterface(Core::System& system_)
 
 IDownloadTaskInterface::~IDownloadTaskInterface() = default;
 
+IReadOnlyApplicationControlDataInterface::IReadOnlyApplicationControlDataInterface(
+    Core::System& system_)
+    : ServiceFramework{system_, "IReadOnlyApplicationControlDataInterface"} {
+    // clang-format off
+    static const FunctionInfo functions[] = {
+        {0, &IReadOnlyApplicationControlDataInterface::GetApplicationControlData, "GetApplicationControlData"},
+        {1, nullptr, "GetApplicationDesiredLanguage"},
+        {2, nullptr, "ConvertApplicationLanguageToLanguageCode"},
+        {3, nullptr, "ConvertLanguageCodeToApplicationLanguage"},
+        {4, nullptr, "SelectApplicationDesiredLanguage"},
+    };
+    // clang-format on
+
+    RegisterHandlers(functions);
+}
+
+IReadOnlyApplicationControlDataInterface::~IReadOnlyApplicationControlDataInterface() = default;
+
+void IReadOnlyApplicationControlDataInterface::GetApplicationControlData(
+    Kernel::HLERequestContext& ctx) {
+    IPC::RequestParser rp{ctx};
+    const auto flag = rp.PopRaw<u64>();
+    LOG_DEBUG(Service_NS, "called with flag={:016X}", flag);
+
+    const auto title_id = rp.PopRaw<u64>();
+
+    const auto size = ctx.GetWriteBufferSize();
+
+    const FileSys::PatchManager pm{title_id, system.GetFileSystemController(),
+                                   system.GetContentProvider()};
+    const auto control = pm.GetControlMetadata();
+
+    std::vector<u8> out;
+
+    if (control.first != nullptr) {
+        if (size < 0x4000) {
+            LOG_ERROR(Service_NS,
+                      "output buffer is too small! (actual={:016X}, expected_min=0x4000)", size);
+            IPC::ResponseBuilder rb{ctx, 2};
+            // TODO(DarkLordZach): Find a better error code for this.
+            rb.Push(ResultUnknown);
+            return;
+        }
+
+        out.resize(0x4000);
+        const auto bytes = control.first->GetRawBytes();
+        std::memcpy(out.data(), bytes.data(), bytes.size());
+    } else {
+        LOG_WARNING(Service_NS, "missing NACP data for title_id={:016X}, defaulting to zeros.",
+                    title_id);
+        out.resize(std::min<u64>(0x4000, size));
+    }
+
+    if (control.second != nullptr) {
+        if (size < 0x4000 + control.second->GetSize()) {
+            LOG_ERROR(Service_NS,
+                      "output buffer is too small! (actual={:016X}, expected_min={:016X})", size,
+                      0x4000 + control.second->GetSize());
+            IPC::ResponseBuilder rb{ctx, 2};
+            // TODO(DarkLordZach): Find a better error code for this.
+            rb.Push(ResultUnknown);
+            return;
+        }
+
+        out.resize(0x4000 + control.second->GetSize());
+        control.second->Read(out.data() + 0x4000, control.second->GetSize());
+    } else {
+        LOG_WARNING(Service_NS, "missing icon data for title_id={:016X}, defaulting to zeros.",
+                    title_id);
+    }
+
+    ctx.WriteBuffer(out);
+
+    IPC::ResponseBuilder rb{ctx, 3};
+    rb.Push(ResultSuccess);
+    rb.Push<u32>(static_cast<u32>(out.size()));
+}
+
 IECommerceInterface::IECommerceInterface(Core::System& system_)
     : ServiceFramework{system_, "IECommerceInterface"} {
     // clang-format off
@@ -785,6 +864,79 @@ private:
     }
 };
 
+class PDM_QRY final : public ServiceFramework<PDM_QRY> {
+public:
+    explicit PDM_QRY(Core::System& system_) : ServiceFramework{system_, "pdm:qry"} {
+        // clang-format off
+        static const FunctionInfo functions[] = {
+            {0, nullptr, "QueryAppletEvent"},
+            {1, nullptr, "QueryPlayStatistics"},
+            {2, nullptr, "QueryPlayStatisticsByUserAccountId"},
+            {3, nullptr, "QueryPlayStatisticsByNetworkServiceAccountId"},
+            {4, nullptr, "QueryPlayStatisticsByApplicationId"},
+            {5, &PDM_QRY::QueryPlayStatisticsByApplicationIdAndUserAccountId, "QueryPlayStatisticsByApplicationIdAndUserAccountId"},
+            {6, nullptr, "QueryPlayStatisticsByApplicationIdAndNetworkServiceAccountId"},
+            {7, nullptr, "QueryLastPlayTimeV0"},
+            {8, nullptr, "QueryPlayEvent"},
+            {9, nullptr, "GetAvailablePlayEventRange"},
+            {10, nullptr, "QueryAccountEvent"},
+            {11, nullptr, "QueryAccountPlayEvent"},
+            {12, nullptr, "GetAvailableAccountPlayEventRange"},
+            {13, nullptr, "QueryApplicationPlayStatisticsForSystemV0"},
+            {14, nullptr, "QueryRecentlyPlayedApplication"},
+            {15, nullptr, "GetRecentlyPlayedApplicationUpdateEvent"},
+            {16, nullptr, "QueryApplicationPlayStatisticsByUserAccountIdForSystemV0"},
+            {17, nullptr, "QueryLastPlayTime"},
+            {18, nullptr, "QueryApplicationPlayStatisticsForSystem"},
+            {19, nullptr, "QueryApplicationPlayStatisticsByUserAccountIdForSystem"},
+        };
+        // clang-format on
+
+        RegisterHandlers(functions);
+    }
+
+    ~PDM_QRY() override = default;
+
+private:
+    struct PlayStadistics {
+        u64 application_id; ///< ApplicationId.
+
+        u32 first_entry_index;      ///< Entry index for the first time the application was played.
+        u32 first_timestampUser;    ///< See PdmAppletEvent::timestampUser
+        u32 first_timestampNetwork; ///< See PdmAppletEvent::timestampNetwork
+
+        u32 last_entry_index;      ///< Entry index for the last time the application was played.
+        u32 last_timestampUser;    ///< See PdmAppletEvent::timestampUser
+        u32 last_timestampNetwork; ///< See PdmAppletEvent::timestampNetwork
+
+        u32 play_time_in_minutes;
+        u32 total_launches;
+    };
+    static_assert(sizeof(PlayStadistics) == 0x28, "PlayStadistics is an invalid size");
+
+    void QueryPlayStatisticsByApplicationIdAndUserAccountId(Kernel::HLERequestContext& ctx) {
+        IPC::RequestParser rp{ctx};
+        const auto unknown = rp.Pop<bool>();
+        const auto unknown2 = rp.Pop<bool>();
+        const auto application_id = rp.Pop<u64>();
+        const auto user_account_uid = rp.PopRaw<Common::UUID>();
+
+        PlayStadistics stadistics{
+            .application_id = application_id,
+            .play_time_in_minutes = 120,
+            .total_launches = 15,
+        };
+
+        LOG_WARNING(Service_NS,
+                    "(STUBBED) called. unknown={}. application_id=0x{:016X}, user_account_uid=0x{}",
+                    unknown, application_id, user_account_uid.Format());
+
+        IPC::ResponseBuilder rb{ctx, 12};
+        rb.Push(ResultSuccess);
+        rb.PushRaw(stadistics);
+    }
+};
+
 void LoopProcess(Core::System& system) {
     auto server_manager = std::make_unique<ServerManager>(system);
 

src/core/hle/service/ns/ns.h

@@ -61,6 +61,16 @@ public:
     ~IDownloadTaskInterface() override;
 };
 
+class IReadOnlyApplicationControlDataInterface final
+    : public ServiceFramework<IReadOnlyApplicationControlDataInterface> {
+public:
+    explicit IReadOnlyApplicationControlDataInterface(Core::System& system_);
+    ~IReadOnlyApplicationControlDataInterface() override;
+
+private:
+    void GetApplicationControlData(Kernel::HLERequestContext& ctx);
+};
+
 class IECommerceInterface final : public ServiceFramework<IECommerceInterface> {
 public:
     explicit IECommerceInterface(Core::System& system_);

src/core/hle/service/ptm/psm.cpp

@@ -169,4 +169,57 @@ void PSM::OpenSession(HLERequestContext& ctx) {
     rb.PushIpcInterface<IPsmSession>(system);
 }
 
-} // namespace Service::PTM
+    enum class ChargerType : u32 {
+        Unplugged = 0,
+        RegularCharger = 1,
+        LowPowerCharger = 2,
+        Unknown = 3,
+    };
+
+    u32 battery_charge_percentage{100}; // 100%
+    ChargerType charger_type{ChargerType::RegularCharger};
+};
+
+
+class TS final : public ServiceFramework<TS> {
+public:
+    explicit TS(Core::System& system_) : ServiceFramework{system_, "ts"} {
+        // clang-format off
+        static const FunctionInfo functions[] = {
+            {0, nullptr, "GetTemperatureRange"},
+            {1, nullptr, "GetTemperature"},
+            {2, nullptr, "SetMeasurementMode"},
+            {3, &TS::GetTemperatureMilliC, "GetTemperatureMilliC"},
+            {4, nullptr, "Unknown"},
+        };
+        // clang-format on
+
+        RegisterHandlers(functions);
+    }
+
+    ~TS() override = default;
+
+private:
+    enum class Location : u8 {
+        Internal,
+        External,
+    };
+    void GetTemperatureMilliC(Kernel::HLERequestContext& ctx) {
+        IPC::RequestParser rp{ctx};
+        const auto location = rp.PopEnum<Location>();
+        s32 temperature = 25000;
+
+        LOG_WARNING(Service_PSM, "called location={}, temperature={}",location, temperature);
+
+        IPC::ResponseBuilder rb{ctx, 3};
+        rb.Push(ResultSuccess);
+        rb.Push(temperature);
+    }
+};
+
+void InstallInterfaces(SM::ServiceManager& sm, Core::System& system) {
+    std::make_shared<PSM>(system)->InstallAsService(sm);
+    std::make_shared<TS>(system)->InstallAsService(sm);
+}
+
+} // namespace Service::PSM

src/input_common/helpers/joycon_protocol/joycon_types.h

@@ -388,32 +388,6 @@ enum class ExternalDeviceId : u16 {
     Starlink = 0x2800,
 };
 
-// Most missing command names are leftovers from other firmware versions
-enum class RingConCommand : u32 {
-    GetFirmwareVersion = 0x00020000,
-    ReadId = 0x00020100,
-    JoyPolling = 0x00020101,
-    Unknown1 = 0x00020104,
-    c20105 = 0x00020105,
-    Unknown2 = 0x00020204,
-    Unknown3 = 0x00020304,
-    Unknown4 = 0x00020404,
-    ReadUnkCal = 0x00020504,
-    ReadFactoryCal = 0x00020A04,
-    Unknown5 = 0x00021104,
-    Unknown6 = 0x00021204,
-    Unknown7 = 0x00021304,
-    ReadUserCal = 0x00021A04,
-    ReadRepCount = 0x00023104,
-    ReadTotalPushCount = 0x00023204,
-    ResetRepCount = 0x04013104,
-    Unknown8 = 0x04011104,
-    Unknown9 = 0x04011204,
-    Unknown10 = 0x04011304,
-    SaveCalData = 0x10011A04,
-    Error = 0xFFFFFFFF,
-};
-
 enum class DriverResult {
     Success,
     WrongReply,
@@ -713,57 +687,6 @@ struct RingStatus {
     s16 min_value;
 };
 
-#pragma pack(push, 1)
-struct RingCommandData {
-    u8 data_type;
-    RingConCommand command;
-};
-static_assert(sizeof(RingCommandData) == 0x5, "RingCommandData is an invalid size");
-#pragma pack(pop)
-
-struct RingFactoryCalibration {
-    s32_le os_max;
-    s32_le hk_max;
-    s32_le zero_min;
-    s32_le zero_max;
-};
-static_assert(sizeof(RingFactoryCalibration) == 0x10, "RingFactoryCalibration is an invalid size");
-
-struct RingCalibrationValue {
-    s16 value;
-    u16 crc;
-};
-static_assert(sizeof(RingCalibrationValue) == 0x4, "RingCalibrationValue is an invalid size");
-
-struct RingUserCalibration {
-    RingCalibrationValue os_max;
-    RingCalibrationValue hk_max;
-    RingCalibrationValue zero;
-};
-static_assert(sizeof(RingUserCalibration) == 0xC, "RingUserCalibration is an invalid size");
-
-struct RingReadId {
-    u16 id_l_x0;
-    u16 id_l_x0_2;
-    u16 id_l_x4;
-    u16 id_h_x0;
-    u16 id_h_x0_2;
-    u16 id_h_x4;
-};
-static_assert(sizeof(RingReadId) == 0xC, "RingReadId is an invalid size");
-
-struct RingCommandReply {
-    DriverResult result;
-    RingConCommand command;
-    FirmwareVersion firmware;
-    RingFactoryCalibration factory_calibration;
-    RingUserCalibration user_calibration;
-    RingReadId read_id;
-    u8 c20105;
-    u8 total_push_count;
-    u8 total_rep_count;
-};
-
 struct VibrationPacket {
     OutputReport output_report;
     u8 packet_counter;

src/input_common/helpers/joycon_protocol/ringcon.cpp

@@ -108,65 +108,6 @@ DriverResult RingConProtocol::ConfigureRing() {
     return SendSubCommand(SubCommand::ENABLE_EXTERNAL_POLLING, ringcon_data);
 }
 
-
-DriverResult RingConProtocol::SendCommand(RingConCommand command) {
-    SubCommandResponce output{};
-    RingCommandData data{
-        .data_type = 0x04, // This seems to be always 4 for this command
-        .command = command,
-    };
-    RingCommandReply reply{
-        .result = DriverResult::Success,
-        .command = command,
-    };
-
-    std::array<u8, sizeof(RingCommandData)> raw_data{};
-    memcpy(raw_data.data(), &data, sizeof(RingCommandData));
-    const DriverResult result = SendSubCommand(SubCommand::SET_EXTERNAL_CONFIG, raw_data, output);
-
-    if (result != DriverResult::Success) {
-        reply.result = result;
-        return result;
-    }
-
-    switch (command) {
-    case RingConCommand::GetFirmwareVersion:
-        memcpy(&reply.firmware, output.command_data.data() + 6, sizeof(FirmwareVersion));
-        break;
-    case RingConCommand::ReadId:
-        memcpy(&reply.read_id, output.command_data.data() + 6,
-               sizeof(RingReadId));
-        break;
-    case RingConCommand::c20105:
-        reply.c20105 = output.command_data[6];
-        break;
-    case RingConCommand::ReadUnkCal:
-        break;
-    case RingConCommand::ReadFactoryCal:
-        memcpy(&reply.factory_calibration, output.command_data.data() + 6,
-               sizeof(RingFactoryCalibration));
-        break;
-    case RingConCommand::ReadUserCal:
-        memcpy(&reply.user_calibration, output.command_data.data() + 6, sizeof(RingUserCalibration));
-        break;
-    case RingConCommand::ReadRepCount:
-        reply.total_rep_count = output.command_data[6];
-        break;
-    case RingConCommand::ReadTotalPushCount:
-        reply.total_push_count = output.command_data[6];
-        break;
-    case RingConCommand::ResetRepCount:
-        break;
-    case RingConCommand::SaveCalData:
-        break;
-    default:
-        reply.result = DriverResult::NotSupported;
-        break;
-    }
-
-    return result;
-}
-
 bool RingConProtocol::IsEnabled() const {
     return is_enabled;
 }

src/input_common/helpers/joycon_protocol/ringcon.h

@@ -25,9 +25,6 @@ public:
 
     DriverResult StartRingconPolling();
 
-    // Hidbus can send individual commands to the ring each one with an unique reply
-    DriverResult SendCommand(RingConCommand command);
-
     bool IsEnabled() const;
 
 private: