input_common: Reimplement SDL

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

@@ -3,7 +3,6 @@
 
 #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"
@@ -549,84 +548,6 @@ 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
@@ -864,79 +785,6 @@ 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,16 +61,6 @@ 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,57 +169,4 @@ void PSM::OpenSession(HLERequestContext& ctx) {
     rb.PushIpcInterface<IPsmSession>(system);
 }
 
-    enum class ChargerType : u32 {
+} // namespace Service::PTM
-        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/drivers/sdl_driver.h

@@ -21,13 +21,6 @@ using SDL_JoystickID = s32;
 
 namespace InputCommon {
 
-class SDLJoystick;
-
-using ButtonBindings =
-    std::array<std::pair<Settings::NativeButton::Values, SDL_GameControllerButton>, 18>;
-using ZButtonBindings =
-    std::array<std::pair<Settings::NativeButton::Values, SDL_GameControllerAxis>, 2>;
-
 class SDLDriver : public InputEngine {
 public:
     /// Initializes and registers SDL device factories
@@ -41,15 +34,12 @@ public:
     /// Handle SDL_Events for joysticks from SDL_PollEvent
     void HandleGameControllerEvent(const SDL_Event& event);
 
-    /// Get the nth joystick with the corresponding GUID
+    bool IsStickInverted(const Common::ParamPackage& params) override;
-    std::shared_ptr<SDLJoystick> GetSDLJoystickBySDLID(SDL_JoystickID sdl_id);
 
-    /**
+    bool IsVibrationEnabled(const PadIdentifier& identifier) override;
-     * Check how many identical joysticks (by guid) were connected before the one with sdl_id and so
+
-     * tie it to a SDLJoystick with the same guid and that port
+    Common::Input::VibrationError SetVibration(
-     */
+        const PadIdentifier& identifier, const Common::Input::VibrationStatus& vibration) override;
-    std::shared_ptr<SDLJoystick> GetSDLJoystickByGUID(const Common::UUID& guid, int port);
-    std::shared_ptr<SDLJoystick> GetSDLJoystickByGUID(const std::string& guid, int port);
 
     std::vector<Common::ParamPackage> GetInputDevices() const override;
 
@@ -61,75 +51,43 @@ public:
     std::string GetHatButtonName(u8 direction_value) const override;
     u8 GetHatButtonId(const std::string& direction_name) const override;
 
-    bool IsStickInverted(const Common::ParamPackage& params) override;
-
-    Common::Input::DriverResult SetVibration(
-        const PadIdentifier& identifier, const Common::Input::VibrationStatus& vibration) override;
-
-    bool IsVibrationEnabled(const PadIdentifier& identifier) override;
-
 private:
     struct VibrationRequest {
         PadIdentifier identifier;
         Common::Input::VibrationStatus vibration;
     };
 
+    struct JoystickID {
+        int sdl_index;
+        bool has_rumble;
+        PadIdentifier identifier;
+    };
+
+    std::shared_ptr<JoystickID> GetSDLJoystickBySDLID(SDL_JoystickID sdl_id);
+
     void InitJoystick(int joystick_index);
-    void CloseJoystick(SDL_Joystick* sdl_joystick);
+    void CloseJoystick(int joystick_index);
 
     /// Needs to be called before SDL_QuitSubSystem.
     void CloseJoysticks();
 
+    void UpdateControllerStatus(u32 event, int joystick_index, int index, int value);
+
+    Common::Input::BatteryLevel GetBatteryLevel(int value);
+
     /// Takes all vibrations from the queue and sends the command to the controller
     void SendVibrations();
 
-    Common::ParamPackage BuildAnalogParamPackageForButton(int port, const Common::UUID& guid,
+    /// Map of GUID of a list of corresponding virtual Joysticks
-                                                          s32 axis, float value = 0.1f) const;
+    std::unordered_map<Common::UUID, std::vector<std::shared_ptr<JoystickID>>> joystick_map;
-    Common::ParamPackage BuildButtonParamPackageForButton(int port, const Common::UUID& guid,
+    std::mutex joystick_map_mutex;
-                                                          s32 button) const;
 
-    Common::ParamPackage BuildHatParamPackageForButton(int port, const Common::UUID& guid, s32 hat,
+    std::atomic<bool> initialized = false;
-                                                       u8 value) const;
-
-    Common::ParamPackage BuildMotionParam(int port, const Common::UUID& guid) const;
-
-    Common::ParamPackage BuildParamPackageForBinding(
-        int port, const Common::UUID& guid, const SDL_GameControllerButtonBind& binding) const;
-
-    Common::ParamPackage BuildParamPackageForAnalog(PadIdentifier identifier, int axis_x,
-                                                    int axis_y, float offset_x,
-                                                    float offset_y) const;
-
-    /// Returns the default button bindings list for generic controllers
-    ButtonBindings GetDefaultButtonBinding() const;
-
-    /// Returns the default button bindings list for nintendo controllers
-    ButtonBindings GetNintendoButtonBinding(const std::shared_ptr<SDLJoystick>& joystick) const;
-
-    /// Returns the button mappings from a single controller
-    ButtonMapping GetSingleControllerMapping(const std::shared_ptr<SDLJoystick>& joystick,
-                                             const ButtonBindings& switch_to_sdl_button,
-                                             const ZButtonBindings& switch_to_sdl_axis) const;
-
-    /// Returns the button mappings from two different controllers
-    ButtonMapping GetDualControllerMapping(const std::shared_ptr<SDLJoystick>& joystick,
-                                           const std::shared_ptr<SDLJoystick>& joystick2,
-                                           const ButtonBindings& switch_to_sdl_button,
-                                           const ZButtonBindings& switch_to_sdl_axis) const;
-
-    /// Returns true if the button is on the left joycon
-    bool IsButtonOnLeftSide(Settings::NativeButton::Values button) const;
 
     /// Queue of vibration request to controllers
     Common::SPSCQueue<VibrationRequest> vibration_queue;
 
-    /// Map of GUID of a list of corresponding virtual Joysticks
+    /// Thread that handles request from the vibration queue
-    std::unordered_map<Common::UUID, std::vector<std::shared_ptr<SDLJoystick>>> joystick_map;
-    std::mutex joystick_map_mutex;
-
-    bool start_thread = false;
-    std::atomic<bool> initialized = false;
-
     std::thread vibration_thread;
 };
 } // namespace InputCommon