rebase to latest master

src/core/hle/service/hid/hid.cpp

@@ -2,13 +2,13 @@
 // SPDX-License-Identifier: GPL-2.0-or-later
 
 #include "core/core.h"
-#include "core/hle/service/hid/resource_manager.h"
 #include "core/hle/service/hid/hid.h"
 #include "core/hle/service/hid/hid_debug_server.h"
 #include "core/hle/service/hid/hid_server.h"
 #include "core/hle/service/hid/hid_system_server.h"
 #include "core/hle/service/hid/hidbus.h"
 #include "core/hle/service/hid/irs.h"
+#include "core/hle/service/hid/resource_manager.h"
 #include "core/hle/service/hid/xcd.h"
 #include "core/hle/service/server_manager.h"
 

src/core/hle/service/hid/hid_server.cpp

@@ -325,8 +325,7 @@ void IHidServer::ActivateKeyboard(HLERequestContext& ctx) {
     rb.Push(result);
 }
 
-void IHidServer::SendKeyboardLockKeyEvent(HLERequestContext& ctx) {
+void IHidServer::SendKeyboardLockKeyEvent(HLERequestContext& ctx) {}
-}
 
 void IHidServer::AcquireXpadIdEventHandle(HLERequestContext& ctx) {
     IPC::RequestParser rp{ctx};
@@ -2242,7 +2241,6 @@ void IHidServer::GetSevenSixAxisSensorFusionStrength(HLERequestContext& ctx) {}
 
 void IHidServer::ResetSevenSixAxisSensorTimestamp(HLERequestContext& ctx) {}
 
-
 void IHidServer::IsUsbFullKeyControllerEnabled(HLERequestContext& ctx) {
     IPC::RequestParser rp{ctx};
     const bool is_enabled = false;
@@ -2798,8 +2796,7 @@ void IHidServer::GetNpadCommunicationMode(HLERequestContext& ctx) {
     IPC::RequestParser rp{ctx};
     const auto applet_resource_user_id{rp.Pop<u64>()};
 
-    LOG_DEBUG(Service_HID, "called, applet_resource_user_id={}",
+    LOG_DEBUG(Service_HID, "called, applet_resource_user_id={}", applet_resource_user_id);
-              applet_resource_user_id);
 
     // This function has been stubbed since 2.0.0+
 
@@ -2855,9 +2852,7 @@ void IHidServer::IsFirmwareUpdateNeededForNotification(HLERequestContext& ctx) {
     rb.Push(needs_update);
 }
 
-void IHidServer::ActivateDigitizer(HLERequestContext& ctx) {
+void IHidServer::ActivateDigitizer(HLERequestContext& ctx) {}
-
-}
 
 bool IHidServer::IsDeviceManaged() {
     InitializeDebugSettings();
@@ -2903,14 +2898,13 @@ void IHidServer::InitializeDebugSettings() {
 
     is_firmware_update_failure = {};
     if (is_firmware_update_failure_emulated) {
-        const std::size_t size =
+        const std::size_t size = 0; // GetSettingsItemValueSize("hid_debug",
-            0; // GetSettingsItemValueSize("hid_debug", "firmware_update_failure");
+                                    // "firmware_update_failure"); if (size != 0) {
-        if (size != 0) {
         [[maybe_unused]] const std::size_t setting_size =
             std::min(size, is_firmware_update_failure.size());
         // nn::settings::fwdbg::GetSettingsItemValue(&is_firmware_update_failure, setting_size,
         //                                           "hid_debug", "firmware_update_failure");
-        }
+        //}
     }
 
     is_ble_disabled = false;

src/core/hle/service/hid/resource_manager.cpp

@@ -194,7 +194,6 @@ std::shared_ptr<SixAxis> ResourceManager::GetSixAxis() {
     return sixaxis;
 }
 
-
 std::shared_ptr<SixAxis> ResourceManager::GetConsoleSixAxis() {
     return sixaxis;
 }

src/core/hle/service/hid/resource_manager/gesture.h

@@ -11,8 +11,7 @@ namespace Core {
 class System;
 }
 
-namespace Service::HID {
+namespace Service::HID {} // namespace Service::HID
-} // namespace Service::HID
 
 namespace Service::HID {
 

src/core/hle/service/hid/resource_manager/keyboard.h

@@ -11,8 +11,7 @@ namespace Core {
 class System;
 }
 
-namespace Service::HID {
+namespace Service::HID {} // namespace Service::HID
-} // namespace Service::HID
 
 namespace Service::HID {
 

src/core/hle/service/hid/resource_manager/mouse.h

@@ -11,8 +11,7 @@ namespace Core {
 class System;
 }
 
-namespace Service::HID {
+namespace Service::HID {} // namespace Service::HID
-} // namespace Service::HID
 
 namespace Service::HID {
 

src/core/hle/service/hid/resource_manager/npad_resource/npad.h

@@ -65,9 +65,7 @@ private:
     };
     static_assert(sizeof(BatteryState) == 0x40, "BatteryState is an invalid size");
 
-    struct Unknown0x88 {
+    struct Unknown0x88 {};
-
-    };
 
     struct AbstractState {
         INSERT_PADDING_BYTES(0x88);

src/yuzu/applets/qt_controller.h

@@ -51,7 +51,7 @@ public:
 
     int exec() override;
 
-    void keyPressEvent(QKeyEvent* evt) override;
+    //void keyPressEvent(QKeyEvent* evt) override;
 
 private:
     // Applies the current configuration.