yuzu: config: Remove most special config cases for handheld

src/core/hid/emulated_controller.cpp

@@ -111,16 +111,25 @@ void EmulatedController::ReloadFromSettings() {
 
     ring_params[0] = Common::ParamPackage(Settings::values.ringcon_analogs);
 
-    // Other or debug controller should always be a pro controller
-    if (npad_id_type != NpadIdType::Other) {
-        SetNpadStyleIndex(MapSettingsTypeToNPad(player.controller_type));
-        original_npad_type = npad_type;
-    } else {
-        SetNpadStyleIndex(NpadStyleIndex::ProController);
-        original_npad_type = npad_type;
+    // Player 1 shares config with handheld. Disable controller when handheld is selected
+    // if (npad_id_type == NpadIdType::Player1 && npad_type == NpadStyleIndex::Handheld) {
+    //    Disconnect();
+    //    ReloadInput();
+    //    return;
+    //}
+
+    // Handheld shares config with player 1. Disable controller when handheld isn't selected
+    if (npad_id_type == NpadIdType::Handheld && npad_type != NpadStyleIndex::Handheld) {
+        Disconnect();
+        ReloadInput();
+        return;
     }
 
     Disconnect();
+
+    SetNpadStyleIndex(MapSettingsTypeToNPad(player.controller_type));
+    original_npad_type = npad_type;
+
     if (player.connected) {
         Connect();
     }
@@ -593,8 +602,14 @@ bool EmulatedController::IsConfiguring() const {
 }
 
 void EmulatedController::SaveCurrentConfig() {
-    const auto player_index = NpadIdTypeToIndex(npad_id_type);
+    // Other and Handheld can't alter the config from here
+    if (npad_id_type == NpadIdType::Other || npad_id_type == NpadIdType::Handheld) {
+        return;
+    }
+
+    const auto player_index = NpadIdTypeToConfigIndex(npad_id_type);
     auto& player = Settings::values.players.GetValue()[player_index];
+
     player.connected = is_connected;
     player.controller_type = MapNPadToSettingsType(npad_type);
     for (std::size_t index = 0; index < player.buttons.size(); ++index) {

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 {
-        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
+} // namespace Service::PTM

src/yuzu/configuration/configure_input.cpp

@@ -196,6 +196,7 @@ void ConfigureInput::ApplyConfiguration() {
     }
 
     advanced->ApplyConfiguration();
+    system.HIDCore().ReloadInputDevices();
 
     const bool pre_docked_mode = Settings::values.use_docked_mode.GetValue();
     Settings::values.use_docked_mode.SetValue(ui->radioDocked->isChecked());

src/yuzu/configuration/configure_input_per_game.cpp

@@ -89,17 +89,12 @@ void ConfigureInputPerGame::LoadConfiguration() {
 
         emulated_controller->ReloadFromSettings();
 
-        if (player_index > 0) {
+        if (player_index != HANDHELD_INDEX) {
             continue;
         }
+
         // Handle Handheld cases
-        auto& handheld_player = Settings::values.players.GetValue()[HANDHELD_INDEX];
-        auto* handheld_controller = hid_core.GetEmulatedController(Core::HID::NpadIdType::Handheld);
-        if (player.controller_type == Settings::ControllerType::Handheld) {
-            handheld_player = player;
-        } else {
-            handheld_player = {};
-        }
+        auto handheld_controller = hid_core.GetEmulatedController(Core::HID::NpadIdType::Handheld);
         handheld_controller->ReloadFromSettings();
     }
 }

src/yuzu/configuration/configure_input_player.cpp

@@ -296,26 +296,11 @@ ConfigureInputPlayer::ConfigureInputPlayer(QWidget* parent, std::size_t player_i
       is_powered_on{is_powered_on_}, input_subsystem{input_subsystem_}, profiles(profiles_),
       timeout_timer(std::make_unique<QTimer>()),
       poll_timer(std::make_unique<QTimer>()), bottom_row{bottom_row_}, hid_core{hid_core_} {
-    if (player_index == 0) {
-        auto* emulated_controller_p1 =
-            hid_core.GetEmulatedController(Core::HID::NpadIdType::Player1);
-        auto* emulated_controller_handheld =
-            hid_core.GetEmulatedController(Core::HID::NpadIdType::Handheld);
-        emulated_controller_p1->SaveCurrentConfig();
-        emulated_controller_p1->EnableConfiguration();
-        emulated_controller_handheld->SaveCurrentConfig();
-        emulated_controller_handheld->EnableConfiguration();
-        if (emulated_controller_handheld->IsConnected(true)) {
-            emulated_controller_p1->Disconnect();
-            emulated_controller = emulated_controller_handheld;
-        } else {
-            emulated_controller = emulated_controller_p1;
-        }
-    } else {
-        emulated_controller = hid_core.GetEmulatedControllerByIndex(player_index);
-        emulated_controller->SaveCurrentConfig();
-        emulated_controller->EnableConfiguration();
-    }
+
+    emulated_controller = hid_core.GetEmulatedControllerByIndex(player_index);
+    emulated_controller->SaveCurrentConfig();
+    emulated_controller->EnableConfiguration();
+
     ui->setupUi(this);
 
     setFocusPolicy(Qt::ClickFocus);
@@ -747,29 +732,6 @@ ConfigureInputPlayer::ConfigureInputPlayer(QWidget* parent, std::size_t player_i
         UpdateMotionButtons();
         const Core::HID::NpadStyleIndex type =
             GetControllerTypeFromIndex(ui->comboControllerType->currentIndex());
-
-        if (player_index == 0) {
-            auto* emulated_controller_p1 =
-                hid_core.GetEmulatedController(Core::HID::NpadIdType::Player1);
-            auto* emulated_controller_handheld =
-                hid_core.GetEmulatedController(Core::HID::NpadIdType::Handheld);
-            bool is_connected = emulated_controller->IsConnected(true);
-
-            emulated_controller_p1->SetNpadStyleIndex(type);
-            emulated_controller_handheld->SetNpadStyleIndex(type);
-            if (is_connected) {
-                if (type == Core::HID::NpadStyleIndex::Handheld) {
-                    emulated_controller_p1->Disconnect();
-                    emulated_controller_handheld->Connect(true);
-                    emulated_controller = emulated_controller_handheld;
-                } else {
-                    emulated_controller_handheld->Disconnect();
-                    emulated_controller_p1->Connect(true);
-                    emulated_controller = emulated_controller_p1;
-                }
-            }
-            ui->controllerFrame->SetController(emulated_controller);
-        }
         emulated_controller->SetNpadStyleIndex(type);
     });
 
@@ -805,32 +767,10 @@ ConfigureInputPlayer::ConfigureInputPlayer(QWidget* parent, std::size_t player_i
 }
 
 ConfigureInputPlayer::~ConfigureInputPlayer() {
-    if (player_index == 0) {
-        auto* emulated_controller_p1 =
-            hid_core.GetEmulatedController(Core::HID::NpadIdType::Player1);
-        auto* emulated_controller_handheld =
-            hid_core.GetEmulatedController(Core::HID::NpadIdType::Handheld);
-        emulated_controller_p1->DisableConfiguration();
-        emulated_controller_handheld->DisableConfiguration();
-    } else {
-        emulated_controller->DisableConfiguration();
-    }
+    emulated_controller->DisableConfiguration();
 }
 
 void ConfigureInputPlayer::ApplyConfiguration() {
-    if (player_index == 0) {
-        auto* emulated_controller_p1 =
-            hid_core.GetEmulatedController(Core::HID::NpadIdType::Player1);
-        auto* emulated_controller_handheld =
-            hid_core.GetEmulatedController(Core::HID::NpadIdType::Handheld);
-        emulated_controller_p1->DisableConfiguration();
-        emulated_controller_p1->SaveCurrentConfig();
-        emulated_controller_p1->EnableConfiguration();
-        emulated_controller_handheld->DisableConfiguration();
-        emulated_controller_handheld->SaveCurrentConfig();
-        emulated_controller_handheld->EnableConfiguration();
-        return;
-    }
     emulated_controller->DisableConfiguration();
     emulated_controller->SaveCurrentConfig();
     emulated_controller->EnableConfiguration();