Split the core project into core/kernel/services as it's become a behemoth.

src/CMakeLists.txt

@@ -181,13 +181,15 @@ else()
     endif()
 endif()
 
+add_subdirectory(audio_core)
 add_subdirectory(common)
 add_subdirectory(core)
-add_subdirectory(audio_core)
-add_subdirectory(video_core)
-add_subdirectory(network)
 add_subdirectory(input_common)
+add_subdirectory(kernel)
+add_subdirectory(network)
 add_subdirectory(shader_recompiler)
+add_subdirectory(service)
+add_subdirectory(video_core)
 
 if (YUZU_ROOM)
      add_subdirectory(dedicated_room)

src/android/app/src/main/java/org/yuzu/yuzu_emu/activities/EmulationActivity.kt

@@ -373,10 +373,8 @@ class EmulationActivity : AppCompatActivity(), SensorEventListener {
         val pictureInPictureParamsBuilder = PictureInPictureParams.Builder()
             .getPictureInPictureActionsBuilder().getPictureInPictureAspectBuilder()
         if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.S) {
-            val isEmulationActive = emulationViewModel.emulationStarted.value &&
-                !emulationViewModel.isEmulationStopping.value
             pictureInPictureParamsBuilder.setAutoEnterEnabled(
-                BooleanSetting.PICTURE_IN_PICTURE.boolean && isEmulationActive
+                BooleanSetting.PICTURE_IN_PICTURE.boolean
             )
         }
         setPictureInPictureParams(pictureInPictureParamsBuilder.build())

src/android/app/src/main/java/org/yuzu/yuzu_emu/features/settings/model/view/SettingsItem.kt

@@ -73,7 +73,7 @@ abstract class SettingsItem(
                     R.string.frame_limit_slider,
                     R.string.frame_limit_slider_description,
                     1,
-                    400,
+                    200,
                     "%"
                 )
             )

src/android/app/src/main/java/org/yuzu/yuzu_emu/fragments/InstallableFragment.kt

@@ -21,8 +21,6 @@ import org.yuzu.yuzu_emu.databinding.FragmentInstallablesBinding
 import org.yuzu.yuzu_emu.model.HomeViewModel
 import org.yuzu.yuzu_emu.model.Installable
 import org.yuzu.yuzu_emu.ui.main.MainActivity
-import java.time.LocalDateTime
-import java.time.format.DateTimeFormatter
 
 class InstallableFragment : Fragment() {
     private var _binding: FragmentInstallablesBinding? = null
@@ -80,15 +78,7 @@ class InstallableFragment : Fragment() {
                     R.string.manage_save_data,
                     R.string.import_export_saves_description,
                     install = { mainActivity.importSaves.launch(arrayOf("application/zip")) },
-                    export = {
-                        mainActivity.exportSaves.launch(
-                            "yuzu saves - ${
-                            LocalDateTime.now().format(
-                                DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm")
-                            )
-                            }.zip"
-                        )
-                    }
+                    export = { mainActivity.exportSave() }
                 )
             } else {
                 Installable(

src/android/app/src/main/java/org/yuzu/yuzu_emu/model/Game.kt

@@ -18,8 +18,8 @@ class Game(
     val version: String = "",
     val isHomebrew: Boolean = false
 ) : Parcelable {
-    val keyAddedToLibraryTime get() = "${path}_AddedToLibraryTime"
-    val keyLastPlayedTime get() = "${path}_LastPlayed"
+    val keyAddedToLibraryTime get() = "${programId}_AddedToLibraryTime"
+    val keyLastPlayedTime get() = "${programId}_LastPlayed"
 
     override fun equals(other: Any?): Boolean {
         if (other !is Game) {

src/android/app/src/main/java/org/yuzu/yuzu_emu/ui/main/MainActivity.kt

@@ -6,6 +6,7 @@ package org.yuzu.yuzu_emu.ui.main
 import android.content.Intent
 import android.net.Uri
 import android.os.Bundle
+import android.provider.DocumentsContract
 import android.view.View
 import android.view.ViewGroup.MarginLayoutParams
 import android.view.WindowManager
@@ -19,6 +20,7 @@ import androidx.core.splashscreen.SplashScreen.Companion.installSplashScreen
 import androidx.core.view.ViewCompat
 import androidx.core.view.WindowCompat
 import androidx.core.view.WindowInsetsCompat
+import androidx.documentfile.provider.DocumentFile
 import androidx.lifecycle.Lifecycle
 import androidx.lifecycle.lifecycleScope
 import androidx.lifecycle.repeatOnLifecycle
@@ -39,6 +41,7 @@ import org.yuzu.yuzu_emu.NativeLibrary
 import org.yuzu.yuzu_emu.R
 import org.yuzu.yuzu_emu.activities.EmulationActivity
 import org.yuzu.yuzu_emu.databinding.ActivityMainBinding
+import org.yuzu.yuzu_emu.features.DocumentProvider
 import org.yuzu.yuzu_emu.features.settings.model.Settings
 import org.yuzu.yuzu_emu.fragments.IndeterminateProgressDialogFragment
 import org.yuzu.yuzu_emu.fragments.MessageDialogFragment
@@ -50,6 +53,9 @@ import org.yuzu.yuzu_emu.model.TaskViewModel
 import org.yuzu.yuzu_emu.utils.*
 import java.io.BufferedInputStream
 import java.io.BufferedOutputStream
+import java.io.FileOutputStream
+import java.time.LocalDateTime
+import java.time.format.DateTimeFormatter
 import java.util.zip.ZipEntry
 import java.util.zip.ZipInputStream
 
@@ -67,6 +73,7 @@ class MainActivity : AppCompatActivity(), ThemeProvider {
 
     // Get first subfolder in saves folder (should be the user folder)
     val savesFolderRoot get() = File(savesFolder).listFiles()?.firstOrNull()?.canonicalPath ?: ""
+    private var lastZipCreated: File? = null
 
     override fun onCreate(savedInstanceState: Bundle?) {
         val splashScreen = installSplashScreen()
@@ -649,31 +656,75 @@ class MainActivity : AppCompatActivity(), ThemeProvider {
             }.show(supportFragmentManager, IndeterminateProgressDialogFragment.TAG)
         }
 
+    /**
+     * Zips the save files located in the given folder path and creates a new zip file with the current date and time.
+     * @return true if the zip file is successfully created, false otherwise.
+     */
+    private fun zipSave(): Boolean {
+        try {
+            val tempFolder = File(getPublicFilesDir().canonicalPath, "temp")
+            tempFolder.mkdirs()
+            val saveFolder = File(savesFolderRoot)
+            val outputZipFile = File(
+                tempFolder,
+                "yuzu saves - ${
+                LocalDateTime.now().format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm"))
+                }.zip"
+            )
+            outputZipFile.createNewFile()
+            val result = FileUtil.zipFromInternalStorage(
+                saveFolder,
+                savesFolderRoot,
+                BufferedOutputStream(FileOutputStream(outputZipFile))
+            )
+            if (result == TaskState.Failed) {
+                return false
+            }
+            lastZipCreated = outputZipFile
+        } catch (e: Exception) {
+            return false
+        }
+        return true
+    }
+
     /**
      * Exports the save file located in the given folder path by creating a zip file and sharing it via intent.
      */
-    val exportSaves = registerForActivityResult(
-        ActivityResultContracts.CreateDocument("application/zip")
-    ) { result ->
-        if (result == null) {
-            return@registerForActivityResult
-        }
-
-        IndeterminateProgressDialogFragment.newInstance(
-            this,
-            R.string.save_files_exporting,
-            false
-        ) {
-            val zipResult = FileUtil.zipFromInternalStorage(
-                File(savesFolderRoot),
-                savesFolderRoot,
-                BufferedOutputStream(contentResolver.openOutputStream(result))
-            )
-            return@newInstance when (zipResult) {
-                TaskState.Completed -> getString(R.string.export_success)
-                TaskState.Cancelled, TaskState.Failed -> getString(R.string.export_failed)
+    fun exportSave() {
+        CoroutineScope(Dispatchers.IO).launch {
+            val wasZipCreated = zipSave()
+            val lastZipFile = lastZipCreated
+            if (!wasZipCreated || lastZipFile == null) {
+                withContext(Dispatchers.Main) {
+                    Toast.makeText(
+                        this@MainActivity,
+                        getString(R.string.export_save_failed),
+                        Toast.LENGTH_LONG
+                    ).show()
+                }
+                return@launch
             }
-        }.show(supportFragmentManager, IndeterminateProgressDialogFragment.TAG)
+
+            withContext(Dispatchers.Main) {
+                val file = DocumentFile.fromSingleUri(
+                    this@MainActivity,
+                    DocumentsContract.buildDocumentUri(
+                        DocumentProvider.AUTHORITY,
+                        "${DocumentProvider.ROOT_ID}/temp/${lastZipFile.name}"
+                    )
+                )!!
+                val intent = Intent(Intent.ACTION_SEND)
+                    .setDataAndType(file.uri, "application/zip")
+                    .addFlags(Intent.FLAG_GRANT_READ_URI_PERMISSION)
+                    .putExtra(Intent.EXTRA_STREAM, file.uri)
+                startForResultExportSave.launch(
+                    Intent.createChooser(
+                        intent,
+                        getString(R.string.share_save_file)
+                    )
+                )
+            }
+        }
     }
 
     private val startForResultExportSave =

src/android/app/src/main/jni/config.cpp

@@ -12,10 +12,10 @@
 #include "common/logging/log.h"
 #include "common/settings.h"
 #include "common/settings_enums.h"
-#include "core/hle/service/acc/profile_manager.h"
 #include "input_common/main.h"
 #include "jni/config.h"
 #include "jni/default_ini.h"
+#include "service/acc/profile_manager.h"
 #include "uisettings.h"
 
 namespace FS = Common::FS;

src/android/app/src/main/jni/native.cpp

@@ -47,15 +47,15 @@
 #include "core/hid/emulated_controller.h"
 #include "core/hid/hid_core.h"
 #include "core/hid/hid_types.h"
-#include "core/hle/service/am/applet_ae.h"
-#include "core/hle/service/am/applet_oe.h"
-#include "core/hle/service/am/applets/applets.h"
-#include "core/hle/service/filesystem/filesystem.h"
 #include "core/loader/loader.h"
 #include "jni/android_common/android_common.h"
 #include "jni/config.h"
 #include "jni/id_cache.h"
 #include "jni/native.h"
+#include "service/am/applet_ae.h"
+#include "service/am/applet_oe.h"
+#include "service/am/applets/applets.h"
+#include "service/filesystem/filesystem.h"
 #include "video_core/renderer_base.h"
 
 #define jconst [[maybe_unused]] const auto

src/android/app/src/main/jni/native.h

@@ -5,10 +5,10 @@
 #include "common/detached_tasks.h"
 #include "core/core.h"
 #include "core/file_sys/registered_cache.h"
-#include "core/hle/service/acc/profile_manager.h"
 #include "core/perf_stats.h"
 #include "jni/applets/software_keyboard.h"
 #include "jni/emu_window/emu_window.h"
+#include "service/acc/profile_manager.h"
 #include "video_core/rasterizer_interface.h"
 
 #pragma once

src/android/app/src/main/jni/uisettings.h

@@ -13,7 +13,7 @@ struct Values {
     Settings::Linkage linkage;
 
     // Android
-    Settings::Setting<bool> picture_in_picture{linkage, false, "picture_in_picture",
+    Settings::Setting<bool> picture_in_picture{linkage, true, "picture_in_picture",
                                                Settings::Category::Android};
     Settings::Setting<s32> screen_layout{linkage,
                                          5,

src/android/app/src/main/res/layout/fragment_emulation.xml

@@ -139,7 +139,7 @@
 
             <com.google.android.material.textview.MaterialTextView
                 android:id="@+id/show_fps_text"
-                style="@style/TextAppearance.Material3.BodySmall"
+                style="@style/TextAppearance.Material3.BodyMedium"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_gravity="left"
@@ -147,8 +147,7 @@
                 android:focusable="false"
                 android:paddingHorizontal="20dp"
                 android:textColor="@android:color/white"
-                android:shadowColor="@android:color/black"
-                android:shadowRadius="3"
+                android:textSize="12sp"
                 tools:ignore="RtlHardcoded" />
 
         </FrameLayout>

src/android/app/src/main/res/layout/fragment_search.xml

@@ -127,7 +127,6 @@
             android:layout_height="wrap_content"
             android:clipToPadding="false"
             android:paddingVertical="4dp"
-            app:checkedChip="@id/chip_recently_played"
             app:chipSpacingHorizontal="12dp"
             app:singleLine="true"
             app:singleSelection="true">

src/android/app/src/main/res/values/strings.xml

@@ -91,7 +91,6 @@
     <string name="manage_save_data">Manage save data</string>
     <string name="manage_save_data_description">Save data found. Please select an option below.</string>
     <string name="import_export_saves_description">Import or export save files</string>
-    <string name="save_files_exporting">Exporting save files…</string>
     <string name="save_file_imported_success">Imported successfully</string>
     <string name="save_file_invalid_zip_structure">Invalid save directory structure</string>
     <string name="save_file_invalid_zip_structure_description">The first subfolder name must be the title ID of the game.</string>
@@ -257,7 +256,6 @@
     <string name="cancelling">Cancelling</string>
     <string name="install">Install</string>
     <string name="delete">Delete</string>
-    <string name="export_success">Exported successfully</string>
 
     <!-- GPU driver installation -->
     <string name="select_gpu_driver">Select GPU driver</string>

src/audio_core/adsp/apps/opus/opus_multistream_decode_object.cpp

@@ -12,7 +12,7 @@ bool IsValidChannelCount(u32 channel_count) {
 }
 
 bool IsValidStreamCounts(u32 total_stream_count, u32 stereo_stream_count) {
-    return total_stream_count > 0 && static_cast<s32>(stereo_stream_count) >= 0 &&
+    return total_stream_count > 0 && stereo_stream_count > 0 &&
            stereo_stream_count <= total_stream_count && IsValidChannelCount(total_stream_count);
 }
 } // namespace

src/audio_core/audio_in_manager.cpp

@@ -8,7 +8,7 @@
 #include "audio_core/sink/sink_details.h"
 #include "common/settings.h"
 #include "core/core.h"
-#include "core/hle/service/audio/errors.h"
+#include "service/audio/errors.h"
 
 namespace AudioCore::AudioIn {
 

src/audio_core/audio_manager.cpp

@@ -3,7 +3,7 @@
 
 #include "audio_core/audio_manager.h"
 #include "core/core.h"
-#include "core/hle/service/audio/errors.h"
+#include "service/audio/errors.h"
 
 namespace AudioCore {
 

src/audio_core/audio_out_manager.cpp

@@ -6,8 +6,8 @@
 #include "audio_core/audio_out_manager.h"
 #include "audio_core/out/audio_out.h"
 #include "core/core.h"
-#include "core/hle/kernel/k_event.h"
-#include "core/hle/service/audio/errors.h"
+#include "kernel/k_event.h"
+#include "service/audio/errors.h"
 
 namespace AudioCore::AudioOut {
 

src/audio_core/audio_render_manager.h

@@ -11,7 +11,7 @@
 
 #include "audio_core/common/common.h"
 #include "audio_core/renderer/system_manager.h"
-#include "core/hle/service/audio/errors.h"
+#include "service/audio/errors.h"
 
 namespace Core {
 class System;

src/audio_core/device/device_session.h

@@ -11,7 +11,7 @@
 #include "audio_core/common/common.h"
 #include "audio_core/sink/sink.h"
 #include "common/scratch_buffer.h"
-#include "core/hle/service/audio/errors.h"
+#include "service/audio/errors.h"
 
 namespace Core {
 class System;

src/audio_core/in/audio_in.cpp

@@ -3,7 +3,7 @@
 
 #include "audio_core/audio_in_manager.h"
 #include "audio_core/in/audio_in.h"
-#include "core/hle/kernel/k_event.h"
+#include "kernel/k_event.h"
 
 namespace AudioCore::AudioIn {
 

src/audio_core/in/audio_in_system.cpp

@@ -9,7 +9,7 @@
 #include "common/logging/log.h"
 #include "core/core.h"
 #include "core/core_timing.h"
-#include "core/hle/kernel/k_event.h"
+#include "kernel/k_event.h"
 
 namespace AudioCore::AudioIn {
 

src/audio_core/in/audio_in_system.h

@@ -11,7 +11,7 @@
 #include "audio_core/common/common.h"
 #include "audio_core/device/audio_buffers.h"
 #include "audio_core/device/device_session.h"
-#include "core/hle/service/audio/errors.h"
+#include "service/audio/errors.h"
 
 namespace Core {
 class System;

src/audio_core/opus/decoder.cpp

@@ -148,7 +148,7 @@ Result OpusDecoder::DecodeInterleavedForMultiStream(u32* out_data_size, u64* out
     auto* header_p{reinterpret_cast<const OpusPacketHeader*>(input_data.data())};
     OpusPacketHeader header{ReverseHeader(*header_p)};
 
-    LOG_TRACE(Service_Audio, "header size 0x{:X} input data size 0x{:X} in_data size 0x{:X}",
+    LOG_ERROR(Service_Audio, "header size 0x{:X} input data size 0x{:X} in_data size 0x{:X}",
               header.size, input_data.size_bytes(), in_data.size_bytes());
 
     R_UNLESS(in_data.size_bytes() >= header.size &&

src/audio_core/opus/decoder.h

@@ -7,8 +7,8 @@
 
 #include "audio_core/opus/parameters.h"
 #include "common/common_types.h"
-#include "core/hle/kernel/k_transfer_memory.h"
-#include "core/hle/service/audio/errors.h"
+#include "kernel/k_transfer_memory.h"
+#include "service/audio/errors.h"
 
 namespace Core {
 class System;

src/audio_core/opus/decoder_manager.h

@@ -6,7 +6,7 @@
 #include "audio_core/opus/hardware_opus.h"
 #include "audio_core/opus/parameters.h"
 #include "common/common_types.h"
-#include "core/hle/service/audio/errors.h"
+#include "service/audio/errors.h"
 
 namespace Core {
 class System;

src/audio_core/opus/hardware_opus.h

@@ -9,7 +9,7 @@
 #include "audio_core/adsp/apps/opus/opus_decoder.h"
 #include "audio_core/adsp/apps/opus/shared_memory.h"
 #include "audio_core/adsp/mailbox.h"
-#include "core/hle/service/audio/errors.h"
+#include "service/audio/errors.h"
 
 namespace AudioCore::OpusDecoder {
 class HardwareOpus {

src/audio_core/out/audio_out.cpp

@@ -3,7 +3,7 @@
 
 #include "audio_core/audio_out_manager.h"
 #include "audio_core/out/audio_out.h"
-#include "core/hle/kernel/k_event.h"
+#include "kernel/k_event.h"
 
 namespace AudioCore::AudioOut {
 

src/audio_core/out/audio_out_system.cpp

@@ -9,7 +9,7 @@
 #include "common/logging/log.h"
 #include "core/core.h"
 #include "core/core_timing.h"
-#include "core/hle/kernel/k_event.h"
+#include "kernel/k_event.h"
 
 namespace AudioCore::AudioOut {
 

src/audio_core/out/audio_out_system.h

@@ -11,7 +11,7 @@
 #include "audio_core/common/common.h"
 #include "audio_core/device/audio_buffers.h"
 #include "audio_core/device/device_session.h"
-#include "core/hle/service/audio/errors.h"
+#include "service/audio/errors.h"
 
 namespace Core {
 class System;

src/audio_core/renderer/audio_renderer.cpp

@@ -6,8 +6,8 @@
 #include "audio_core/renderer/audio_renderer.h"
 #include "audio_core/renderer/system_manager.h"
 #include "core/core.h"
-#include "core/hle/kernel/k_transfer_memory.h"
-#include "core/hle/service/audio/errors.h"
+#include "kernel/k_transfer_memory.h"
+#include "service/audio/errors.h"
 
 namespace AudioCore::Renderer {
 

src/audio_core/renderer/audio_renderer.h

@@ -6,7 +6,7 @@
 #include <span>
 
 #include "audio_core/renderer/system.h"
-#include "core/hle/service/audio/errors.h"
+#include "service/audio/errors.h"
 
 namespace Core {
 class System;

src/audio_core/renderer/behavior/behavior_info.h

@@ -8,7 +8,7 @@
 
 #include "audio_core/common/common.h"
 #include "common/common_types.h"
-#include "core/hle/service/audio/errors.h"
+#include "service/audio/errors.h"
 
 namespace AudioCore::Renderer {
 /**

src/audio_core/renderer/behavior/info_updater.h

@@ -6,7 +6,7 @@
 #include <span>
 
 #include "common/common_types.h"
-#include "core/hle/service/audio/errors.h"
+#include "service/audio/errors.h"
 
 namespace AudioCore::Renderer {
 class BehaviorInfo;

src/audio_core/renderer/memory/pool_mapper.cpp

@@ -3,8 +3,8 @@
 
 #include "audio_core/renderer/memory/address_info.h"
 #include "audio_core/renderer/memory/pool_mapper.h"
-#include "core/hle/kernel/k_process.h"
-#include "core/hle/kernel/svc.h"
+#include "kernel/k_process.h"
+#include "kernel/svc.h"
 
 namespace AudioCore::Renderer {
 

src/audio_core/renderer/memory/pool_mapper.h

@@ -8,7 +8,7 @@
 #include "audio_core/renderer/behavior/behavior_info.h"
 #include "audio_core/renderer/memory/memory_pool_info.h"
 #include "common/common_types.h"
-#include "core/hle/service/audio/errors.h"
+#include "service/audio/errors.h"
 
 namespace AudioCore::Renderer {
 class AddressInfo;

src/audio_core/renderer/system.cpp

@@ -31,9 +31,9 @@
 #include "common/alignment.h"
 #include "core/core.h"
 #include "core/core_timing.h"
-#include "core/hle/kernel/k_event.h"
-#include "core/hle/kernel/k_transfer_memory.h"
 #include "core/memory.h"
+#include "kernel/k_event.h"
+#include "kernel/k_transfer_memory.h"
 
 namespace AudioCore::Renderer {
 

src/audio_core/renderer/system.h

@@ -18,7 +18,7 @@
 #include "audio_core/renderer/upsampler/upsampler_manager.h"
 #include "audio_core/renderer/voice/voice_context.h"
 #include "common/thread.h"
-#include "core/hle/service/audio/errors.h"
+#include "service/audio/errors.h"
 
 namespace Core {
 namespace Memory {

src/common/settings_input.cpp

@@ -6,11 +6,10 @@
 namespace Settings {
 namespace NativeButton {
 const std::array<const char*, NumButtons> mapping = {{
-    "button_a",       "button_b",       "button_x",      "button_y",    "button_lstick",
-    "button_rstick",  "button_l",       "button_r",      "button_zl",   "button_zr",
-    "button_plus",    "button_minus",   "button_dleft",  "button_dup",  "button_dright",
-    "button_ddown",   "button_slleft",  "button_srleft", "button_home", "button_screenshot",
-    "button_slright", "button_srright",
+    "button_a",      "button_b",     "button_x",     "button_y",    "button_lstick",
+    "button_rstick", "button_l",     "button_r",     "button_zl",   "button_zr",
+    "button_plus",   "button_minus", "button_dleft", "button_dup",  "button_dright",
+    "button_ddown",  "button_sl",    "button_sr",    "button_home", "button_screenshot",
 }};
 }
 

src/common/settings_input.h

@@ -29,15 +29,12 @@ enum Values : int {
     DRight,
     DDown,
 
-    SLLeft,
-    SRLeft,
+    SL,
+    SR,
 
     Home,
     Screenshot,
 
-    SLRight,
-    SRRight,
-
     NumButtons,
 };
 

src/core/CMakeLists.txt

@@ -197,653 +197,9 @@ add_library(core STATIC
     hid/irs_types.h
     hid/motion_input.cpp
     hid/motion_input.h
-    hle/api_version.h
-    hle/ipc.h
-    hle/kernel/board/nintendo/nx/k_memory_layout.cpp
-    hle/kernel/board/nintendo/nx/k_memory_layout.h
-    hle/kernel/board/nintendo/nx/k_system_control.cpp
-    hle/kernel/board/nintendo/nx/k_system_control.h
-    hle/kernel/board/nintendo/nx/secure_monitor.h
-    hle/kernel/code_set.cpp
-    hle/kernel/code_set.h
-    hle/kernel/svc_results.h
-    hle/kernel/global_scheduler_context.cpp
-    hle/kernel/global_scheduler_context.h
-    hle/kernel/init/init_slab_setup.cpp
-    hle/kernel/init/init_slab_setup.h
-    hle/kernel/initial_process.h
-    hle/kernel/k_address_arbiter.cpp
-    hle/kernel/k_address_arbiter.h
-    hle/kernel/k_address_space_info.cpp
-    hle/kernel/k_address_space_info.h
-    hle/kernel/k_auto_object.cpp
-    hle/kernel/k_auto_object.h
-    hle/kernel/k_auto_object_container.cpp
-    hle/kernel/k_auto_object_container.h
-    hle/kernel/k_affinity_mask.h
-    hle/kernel/k_capabilities.cpp
-    hle/kernel/k_capabilities.h
-    hle/kernel/k_class_token.cpp
-    hle/kernel/k_class_token.h
-    hle/kernel/k_client_port.cpp
-    hle/kernel/k_client_port.h
-    hle/kernel/k_client_session.cpp
-    hle/kernel/k_client_session.h
-    hle/kernel/k_code_memory.cpp
-    hle/kernel/k_code_memory.h
-    hle/kernel/k_condition_variable.cpp
-    hle/kernel/k_condition_variable.h
-    hle/kernel/k_debug.h
-    hle/kernel/k_device_address_space.cpp
-    hle/kernel/k_device_address_space.h
-    hle/kernel/k_dynamic_page_manager.h
-    hle/kernel/k_dynamic_resource_manager.h
-    hle/kernel/k_dynamic_slab_heap.h
-    hle/kernel/k_event.cpp
-    hle/kernel/k_event.h
-    hle/kernel/k_event_info.h
-    hle/kernel/k_handle_table.cpp
-    hle/kernel/k_handle_table.h
-    hle/kernel/k_hardware_timer_base.h
-    hle/kernel/k_hardware_timer.cpp
-    hle/kernel/k_hardware_timer.h
-    hle/kernel/k_interrupt_manager.cpp
-    hle/kernel/k_interrupt_manager.h
-    hle/kernel/k_light_condition_variable.cpp
-    hle/kernel/k_light_condition_variable.h
-    hle/kernel/k_light_lock.cpp
-    hle/kernel/k_light_lock.h
-    hle/kernel/k_memory_block.h
-    hle/kernel/k_memory_block_manager.cpp
-    hle/kernel/k_memory_block_manager.h
-    hle/kernel/k_memory_layout.cpp
-    hle/kernel/k_memory_layout.h
-    hle/kernel/k_memory_manager.cpp
-    hle/kernel/k_memory_manager.h
-    hle/kernel/k_memory_region.h
-    hle/kernel/k_memory_region_type.h
-    hle/kernel/k_object_name.cpp
-    hle/kernel/k_object_name.h
-    hle/kernel/k_page_bitmap.h
-    hle/kernel/k_page_buffer.cpp
-    hle/kernel/k_page_buffer.h
-    hle/kernel/k_page_heap.cpp
-    hle/kernel/k_page_heap.h
-    hle/kernel/k_page_group.cpp
-    hle/kernel/k_page_group.h
-    hle/kernel/k_page_table.h
-    hle/kernel/k_page_table_base.cpp
-    hle/kernel/k_page_table_base.h
-    hle/kernel/k_page_table_manager.h
-    hle/kernel/k_page_table_slab_heap.h
-    hle/kernel/k_port.cpp
-    hle/kernel/k_port.h
-    hle/kernel/k_priority_queue.h
-    hle/kernel/k_process.cpp
-    hle/kernel/k_process.h
-    hle/kernel/k_process_page_table.h
-    hle/kernel/k_readable_event.cpp
-    hle/kernel/k_readable_event.h
-    hle/kernel/k_resource_limit.cpp
-    hle/kernel/k_resource_limit.h
-    hle/kernel/k_scheduler.cpp
-    hle/kernel/k_scheduler.h
-    hle/kernel/k_scheduler_lock.h
-    hle/kernel/k_scoped_lock.h
-    hle/kernel/k_scoped_resource_reservation.h
-    hle/kernel/k_scoped_scheduler_lock_and_sleep.h
-    hle/kernel/k_server_port.cpp
-    hle/kernel/k_server_port.h
-    hle/kernel/k_server_session.cpp
-    hle/kernel/k_server_session.h
-    hle/kernel/k_session.cpp
-    hle/kernel/k_session.h
-    hle/kernel/k_session_request.cpp
-    hle/kernel/k_session_request.h
-    hle/kernel/k_shared_memory.cpp
-    hle/kernel/k_shared_memory.h
-    hle/kernel/k_shared_memory_info.h
-    hle/kernel/k_slab_heap.h
-    hle/kernel/k_spin_lock.cpp
-    hle/kernel/k_spin_lock.h
-    hle/kernel/k_synchronization_object.cpp
-    hle/kernel/k_synchronization_object.h
-    hle/kernel/k_system_control.h
-    hle/kernel/k_system_resource.cpp
-    hle/kernel/k_system_resource.h
-    hle/kernel/k_thread.cpp
-    hle/kernel/k_thread.h
-    hle/kernel/k_thread_local_page.cpp
-    hle/kernel/k_thread_local_page.h
-    hle/kernel/k_thread_queue.cpp
-    hle/kernel/k_thread_queue.h
-    hle/kernel/k_timer_task.h
-    hle/kernel/k_trace.h
-    hle/kernel/k_transfer_memory.cpp
-    hle/kernel/k_transfer_memory.h
-    hle/kernel/k_typed_address.h
-    hle/kernel/k_worker_task.h
-    hle/kernel/k_worker_task_manager.cpp
-    hle/kernel/k_worker_task_manager.h
-    hle/kernel/kernel.cpp
-    hle/kernel/kernel.h
-    hle/kernel/memory_types.h
-    hle/kernel/message_buffer.h
-    hle/kernel/physical_core.cpp
-    hle/kernel/physical_core.h
-    hle/kernel/physical_memory.h
-    hle/kernel/slab_helpers.h
-    hle/kernel/svc.cpp
-    hle/kernel/svc.h
-    hle/kernel/svc_common.h
-    hle/kernel/svc_types.h
-    hle/kernel/svc/svc_activity.cpp
-    hle/kernel/svc/svc_address_arbiter.cpp
-    hle/kernel/svc/svc_address_translation.cpp
-    hle/kernel/svc/svc_cache.cpp
-    hle/kernel/svc/svc_code_memory.cpp
-    hle/kernel/svc/svc_condition_variable.cpp
-    hle/kernel/svc/svc_debug.cpp
-    hle/kernel/svc/svc_debug_string.cpp
-    hle/kernel/svc/svc_device_address_space.cpp
-    hle/kernel/svc/svc_event.cpp
-    hle/kernel/svc/svc_exception.cpp
-    hle/kernel/svc/svc_info.cpp
-    hle/kernel/svc/svc_insecure_memory.cpp
-    hle/kernel/svc/svc_interrupt_event.cpp
-    hle/kernel/svc/svc_io_pool.cpp
-    hle/kernel/svc/svc_ipc.cpp
-    hle/kernel/svc/svc_kernel_debug.cpp
-    hle/kernel/svc/svc_light_ipc.cpp
-    hle/kernel/svc/svc_lock.cpp
-    hle/kernel/svc/svc_memory.cpp
-    hle/kernel/svc/svc_physical_memory.cpp
-    hle/kernel/svc/svc_port.cpp
-    hle/kernel/svc/svc_power_management.cpp
-    hle/kernel/svc/svc_process.cpp
-    hle/kernel/svc/svc_process_memory.cpp
-    hle/kernel/svc/svc_processor.cpp
-    hle/kernel/svc/svc_query_memory.cpp
-    hle/kernel/svc/svc_register.cpp
-    hle/kernel/svc/svc_resource_limit.cpp
-    hle/kernel/svc/svc_secure_monitor_call.cpp
-    hle/kernel/svc/svc_session.cpp
-    hle/kernel/svc/svc_shared_memory.cpp
-    hle/kernel/svc/svc_synchronization.cpp
-    hle/kernel/svc/svc_thread.cpp
-    hle/kernel/svc/svc_thread_profiler.cpp
-    hle/kernel/svc/svc_tick.cpp
-    hle/kernel/svc/svc_transfer_memory.cpp
-    hle/result.h
-    hle/service/acc/acc.cpp
-    hle/service/acc/acc.h
-    hle/service/acc/acc_aa.cpp
-    hle/service/acc/acc_aa.h
-    hle/service/acc/acc_su.cpp
-    hle/service/acc/acc_su.h
-    hle/service/acc/acc_u0.cpp
-    hle/service/acc/acc_u0.h
-    hle/service/acc/acc_u1.cpp
-    hle/service/acc/acc_u1.h
-    hle/service/acc/async_context.cpp
-    hle/service/acc/async_context.h
-    hle/service/acc/errors.h
-    hle/service/acc/profile_manager.cpp
-    hle/service/acc/profile_manager.h
-    hle/service/am/am.cpp
-    hle/service/am/am.h
-    hle/service/am/applet_ae.cpp
-    hle/service/am/applet_ae.h
-    hle/service/am/applet_oe.cpp
-    hle/service/am/applet_oe.h
-    hle/service/am/applets/applet_cabinet.cpp
-    hle/service/am/applets/applet_cabinet.h
-    hle/service/am/applets/applet_controller.cpp
-    hle/service/am/applets/applet_controller.h
-    hle/service/am/applets/applet_error.cpp
-    hle/service/am/applets/applet_error.h
-    hle/service/am/applets/applet_general_backend.cpp
-    hle/service/am/applets/applet_general_backend.h
-    hle/service/am/applets/applet_mii_edit.cpp
-    hle/service/am/applets/applet_mii_edit.h
-    hle/service/am/applets/applet_mii_edit_types.h
-    hle/service/am/applets/applet_profile_select.cpp
-    hle/service/am/applets/applet_profile_select.h
-    hle/service/am/applets/applet_software_keyboard.cpp
-    hle/service/am/applets/applet_software_keyboard.h
-    hle/service/am/applets/applet_software_keyboard_types.h
-    hle/service/am/applets/applet_web_browser.cpp
-    hle/service/am/applets/applet_web_browser.h
-    hle/service/am/applets/applet_web_browser_types.h
-    hle/service/am/applets/applets.cpp
-    hle/service/am/applets/applets.h
-    hle/service/am/idle.cpp
-    hle/service/am/idle.h
-    hle/service/am/omm.cpp
-    hle/service/am/omm.h
-    hle/service/am/spsm.cpp
-    hle/service/am/spsm.h
-    hle/service/aoc/aoc_u.cpp
-    hle/service/aoc/aoc_u.h
-    hle/service/apm/apm.cpp
-    hle/service/apm/apm.h
-    hle/service/apm/apm_controller.cpp
-    hle/service/apm/apm_controller.h
-    hle/service/apm/apm_interface.cpp
-    hle/service/apm/apm_interface.h
-    hle/service/audio/audctl.cpp
-    hle/service/audio/audctl.h
-    hle/service/audio/audin_u.cpp
-    hle/service/audio/audin_u.h
-    hle/service/audio/audio.cpp
-    hle/service/audio/audio.h
-    hle/service/audio/audout_u.cpp
-    hle/service/audio/audout_u.h
-    hle/service/audio/audrec_a.cpp
-    hle/service/audio/audrec_a.h
-    hle/service/audio/audrec_u.cpp
-    hle/service/audio/audrec_u.h
-    hle/service/audio/audren_u.cpp
-    hle/service/audio/audren_u.h
-    hle/service/audio/errors.h
-    hle/service/audio/hwopus.cpp
-    hle/service/audio/hwopus.h
-    hle/service/bcat/backend/backend.cpp
-    hle/service/bcat/backend/backend.h
-    hle/service/bcat/bcat.cpp
-    hle/service/bcat/bcat.h
-    hle/service/bcat/bcat_module.cpp
-    hle/service/bcat/bcat_module.h
-    hle/service/bpc/bpc.cpp
-    hle/service/bpc/bpc.h
-    hle/service/btdrv/btdrv.cpp
-    hle/service/btdrv/btdrv.h
-    hle/service/btm/btm.cpp
-    hle/service/btm/btm.h
-    hle/service/caps/caps.cpp
-    hle/service/caps/caps.h
-    hle/service/caps/caps_a.cpp
-    hle/service/caps/caps_a.h
-    hle/service/caps/caps_c.cpp
-    hle/service/caps/caps_c.h
-    hle/service/caps/caps_manager.cpp
-    hle/service/caps/caps_manager.h
-    hle/service/caps/caps_result.h
-    hle/service/caps/caps_sc.cpp
-    hle/service/caps/caps_sc.h
-    hle/service/caps/caps_ss.cpp
-    hle/service/caps/caps_ss.h
-    hle/service/caps/caps_su.cpp
-    hle/service/caps/caps_su.h
-    hle/service/caps/caps_types.h
-    hle/service/caps/caps_u.cpp
-    hle/service/caps/caps_u.h
-    hle/service/erpt/erpt.cpp
-    hle/service/erpt/erpt.h
-    hle/service/es/es.cpp
-    hle/service/es/es.h
-    hle/service/eupld/eupld.cpp
-    hle/service/eupld/eupld.h
-    hle/service/fatal/fatal.cpp
-    hle/service/fatal/fatal.h
-    hle/service/fatal/fatal_p.cpp
-    hle/service/fatal/fatal_p.h
-    hle/service/fatal/fatal_u.cpp
-    hle/service/fatal/fatal_u.h
-    hle/service/filesystem/filesystem.cpp
-    hle/service/filesystem/filesystem.h
-    hle/service/filesystem/fsp_ldr.cpp
-    hle/service/filesystem/fsp_ldr.h
-    hle/service/filesystem/fsp_pr.cpp
-    hle/service/filesystem/fsp_pr.h
-    hle/service/filesystem/fsp_srv.cpp
-    hle/service/filesystem/fsp_srv.h
-    hle/service/fgm/fgm.cpp
-    hle/service/fgm/fgm.h
-    hle/service/friend/friend.cpp
-    hle/service/friend/friend.h
-    hle/service/friend/friend_interface.cpp
-    hle/service/friend/friend_interface.h
-    hle/service/glue/arp.cpp
-    hle/service/glue/arp.h
-    hle/service/glue/bgtc.cpp
-    hle/service/glue/bgtc.h
-    hle/service/glue/ectx.cpp
-    hle/service/glue/ectx.h
-    hle/service/glue/errors.h
-    hle/service/glue/glue.cpp
-    hle/service/glue/glue.h
-    hle/service/glue/glue_manager.cpp
-    hle/service/glue/glue_manager.h
-    hle/service/glue/notif.cpp
-    hle/service/glue/notif.h
-    hle/service/grc/grc.cpp
-    hle/service/grc/grc.h
-    hle/service/hid/hid.cpp
-    hle/service/hid/hid.h
-    hle/service/hid/hid_debug_server.cpp
-    hle/service/hid/hid_debug_server.h
-    hle/service/hid/hid_firmware_settings.cpp
-    hle/service/hid/hid_firmware_settings.h
-    hle/service/hid/hid_server.cpp
-    hle/service/hid/hid_server.h
-    hle/service/hid/hid_system_server.cpp
-    hle/service/hid/hid_system_server.h
-    hle/service/hid/hidbus.cpp
-    hle/service/hid/hidbus.h
-    hle/service/hid/irs.cpp
-    hle/service/hid/irs.h
-    hle/service/hid/irs_ring_lifo.h
-    hle/service/hid/resource_manager.cpp
-    hle/service/hid/resource_manager.h
-    hle/service/hid/ring_lifo.h
-    hle/service/hid/xcd.cpp
-    hle/service/hid/xcd.h
-    hle/service/hid/errors.h
-    hle/service/hid/controllers/console_sixaxis.cpp
-    hle/service/hid/controllers/console_sixaxis.h
-    hle/service/hid/controllers/controller_base.cpp
-    hle/service/hid/controllers/controller_base.h
-    hle/service/hid/controllers/debug_pad.cpp
-    hle/service/hid/controllers/debug_pad.h
-    hle/service/hid/controllers/gesture.cpp
-    hle/service/hid/controllers/gesture.h
-    hle/service/hid/controllers/keyboard.cpp
-    hle/service/hid/controllers/keyboard.h
-    hle/service/hid/controllers/mouse.cpp
-    hle/service/hid/controllers/mouse.h
-    hle/service/hid/controllers/npad.cpp
-    hle/service/hid/controllers/npad.h
-    hle/service/hid/controllers/palma.cpp
-    hle/service/hid/controllers/palma.h
-    hle/service/hid/controllers/stubbed.cpp
-    hle/service/hid/controllers/stubbed.h
-    hle/service/hid/controllers/touchscreen.cpp
-    hle/service/hid/controllers/touchscreen.h
-    hle/service/hid/controllers/xpad.cpp
-    hle/service/hid/controllers/xpad.h
-    hle/service/hid/hidbus/hidbus_base.cpp
-    hle/service/hid/hidbus/hidbus_base.h
-    hle/service/hid/hidbus/ringcon.cpp
-    hle/service/hid/hidbus/ringcon.h
-    hle/service/hid/hidbus/starlink.cpp
-    hle/service/hid/hidbus/starlink.h
-    hle/service/hid/hidbus/stubbed.cpp
-    hle/service/hid/hidbus/stubbed.h
-    hle/service/hid/irsensor/clustering_processor.cpp
-    hle/service/hid/irsensor/clustering_processor.h
-    hle/service/hid/irsensor/image_transfer_processor.cpp
-    hle/service/hid/irsensor/image_transfer_processor.h
-    hle/service/hid/irsensor/ir_led_processor.cpp
-    hle/service/hid/irsensor/ir_led_processor.h
-    hle/service/hid/irsensor/moment_processor.cpp
-    hle/service/hid/irsensor/moment_processor.h
-    hle/service/hid/irsensor/pointing_processor.cpp
-    hle/service/hid/irsensor/pointing_processor.h
-    hle/service/hid/irsensor/processor_base.cpp
-    hle/service/hid/irsensor/processor_base.h
-    hle/service/hid/irsensor/tera_plugin_processor.cpp
-    hle/service/hid/irsensor/tera_plugin_processor.h
-    hle/service/lbl/lbl.cpp
-    hle/service/lbl/lbl.h
-    hle/service/ldn/lan_discovery.cpp
-    hle/service/ldn/lan_discovery.h
-    hle/service/ldn/ldn_results.h
-    hle/service/ldn/ldn.cpp
-    hle/service/ldn/ldn.h
-    hle/service/ldn/ldn_types.h
-    hle/service/ldr/ldr.cpp
-    hle/service/ldr/ldr.h
-    hle/service/lm/lm.cpp
-    hle/service/lm/lm.h
-    hle/service/mig/mig.cpp
-    hle/service/mig/mig.h
-    hle/service/mii/types/char_info.cpp
-    hle/service/mii/types/char_info.h
-    hle/service/mii/types/core_data.cpp
-    hle/service/mii/types/core_data.h
-    hle/service/mii/types/raw_data.cpp
-    hle/service/mii/types/raw_data.h
-    hle/service/mii/types/store_data.cpp
-    hle/service/mii/types/store_data.h
-    hle/service/mii/types/ver3_store_data.cpp
-    hle/service/mii/types/ver3_store_data.h
-    hle/service/mii/mii.cpp
-    hle/service/mii/mii.h
-    hle/service/mii/mii_database.cpp
-    hle/service/mii/mii_database.h
-    hle/service/mii/mii_database_manager.cpp
-    hle/service/mii/mii_database_manager.h
-    hle/service/mii/mii_manager.cpp
-    hle/service/mii/mii_manager.h
-    hle/service/mii/mii_result.h
-    hle/service/mii/mii_types.h
-    hle/service/mii/mii_util.h
-    hle/service/mm/mm_u.cpp
-    hle/service/mm/mm_u.h
-    hle/service/mnpp/mnpp_app.cpp
-    hle/service/mnpp/mnpp_app.h
-    hle/service/ncm/ncm.cpp
-    hle/service/ncm/ncm.h
-    hle/service/nfc/common/amiibo_crypto.cpp
-    hle/service/nfc/common/amiibo_crypto.h
-    hle/service/nfc/common/device.cpp
-    hle/service/nfc/common/device.h
-    hle/service/nfc/common/device_manager.cpp
-    hle/service/nfc/common/device_manager.h
-    hle/service/nfc/mifare_result.h
-    hle/service/nfc/mifare_types.h
-    hle/service/nfc/nfc.cpp
-    hle/service/nfc/nfc.h
-    hle/service/nfc/nfc_interface.cpp
-    hle/service/nfc/nfc_interface.h
-    hle/service/nfc/nfc_result.h
-    hle/service/nfc/nfc_types.h
-    hle/service/nfp/nfp.cpp
-    hle/service/nfp/nfp.h
-    hle/service/nfp/nfp_interface.cpp
-    hle/service/nfp/nfp_interface.h
-    hle/service/nfp/nfp_result.h
-    hle/service/nfp/nfp_types.h
-    hle/service/ngc/ngc.cpp
-    hle/service/ngc/ngc.h
-    hle/service/nifm/nifm.cpp
-    hle/service/nifm/nifm.h
-    hle/service/nim/nim.cpp
-    hle/service/nim/nim.h
-    hle/service/npns/npns.cpp
-    hle/service/npns/npns.h
-    hle/service/ns/errors.h
-    hle/service/ns/iplatform_service_manager.cpp
-    hle/service/ns/iplatform_service_manager.h
-    hle/service/ns/language.cpp
-    hle/service/ns/language.h
-    hle/service/ns/ns.cpp
-    hle/service/ns/ns.h
-    hle/service/ns/pdm_qry.cpp
-    hle/service/ns/pdm_qry.h
-    hle/service/nvdrv/core/container.cpp
-    hle/service/nvdrv/core/container.h
-    hle/service/nvdrv/core/nvmap.cpp
-    hle/service/nvdrv/core/nvmap.h
-    hle/service/nvdrv/core/syncpoint_manager.cpp
-    hle/service/nvdrv/core/syncpoint_manager.h
-    hle/service/nvdrv/devices/nvdevice.h
-    hle/service/nvdrv/devices/nvdisp_disp0.cpp
-    hle/service/nvdrv/devices/nvdisp_disp0.h
-    hle/service/nvdrv/devices/nvhost_as_gpu.cpp
-    hle/service/nvdrv/devices/nvhost_as_gpu.h
-    hle/service/nvdrv/devices/nvhost_ctrl.cpp
-    hle/service/nvdrv/devices/nvhost_ctrl.h
-    hle/service/nvdrv/devices/nvhost_ctrl_gpu.cpp
-    hle/service/nvdrv/devices/nvhost_ctrl_gpu.h
-    hle/service/nvdrv/devices/nvhost_gpu.cpp
-    hle/service/nvdrv/devices/nvhost_gpu.h
-    hle/service/nvdrv/devices/nvhost_nvdec.cpp
-    hle/service/nvdrv/devices/nvhost_nvdec.h
-    hle/service/nvdrv/devices/nvhost_nvdec_common.cpp
-    hle/service/nvdrv/devices/nvhost_nvdec_common.h
-    hle/service/nvdrv/devices/nvhost_nvjpg.cpp
-    hle/service/nvdrv/devices/nvhost_nvjpg.h
-    hle/service/nvdrv/devices/nvhost_vic.cpp
-    hle/service/nvdrv/devices/nvhost_vic.h
-    hle/service/nvdrv/devices/nvmap.cpp
-    hle/service/nvdrv/devices/nvmap.h
-    hle/service/nvdrv/nvdata.h
-    hle/service/nvdrv/nvdrv.cpp
-    hle/service/nvdrv/nvdrv.h
-    hle/service/nvdrv/nvdrv_interface.cpp
-    hle/service/nvdrv/nvdrv_interface.h
-    hle/service/nvdrv/nvmemp.cpp
-    hle/service/nvdrv/nvmemp.h
-    hle/service/nvnflinger/binder.h
-    hle/service/nvnflinger/buffer_item.h
-    hle/service/nvnflinger/buffer_item_consumer.cpp
-    hle/service/nvnflinger/buffer_item_consumer.h
-    hle/service/nvnflinger/buffer_queue_consumer.cpp
-    hle/service/nvnflinger/buffer_queue_consumer.h
-    hle/service/nvnflinger/buffer_queue_core.cpp
-    hle/service/nvnflinger/buffer_queue_core.h
-    hle/service/nvnflinger/buffer_queue_defs.h
-    hle/service/nvnflinger/buffer_queue_producer.cpp
-    hle/service/nvnflinger/buffer_queue_producer.h
-    hle/service/nvnflinger/buffer_slot.h
-    hle/service/nvnflinger/buffer_transform_flags.h
-    hle/service/nvnflinger/consumer_base.cpp
-    hle/service/nvnflinger/consumer_base.h
-    hle/service/nvnflinger/consumer_listener.h
-    hle/service/nvnflinger/fb_share_buffer_manager.cpp
-    hle/service/nvnflinger/fb_share_buffer_manager.h
-    hle/service/nvnflinger/graphic_buffer_producer.cpp
-    hle/service/nvnflinger/graphic_buffer_producer.h
-    hle/service/nvnflinger/hos_binder_driver_server.cpp
-    hle/service/nvnflinger/hos_binder_driver_server.h
-    hle/service/nvnflinger/nvnflinger.cpp
-    hle/service/nvnflinger/nvnflinger.h
-    hle/service/nvnflinger/parcel.h
-    hle/service/nvnflinger/pixel_format.h
-    hle/service/nvnflinger/producer_listener.h
-    hle/service/nvnflinger/status.h
-    hle/service/nvnflinger/ui/fence.h
-    hle/service/nvnflinger/ui/graphic_buffer.cpp
-    hle/service/nvnflinger/ui/graphic_buffer.h
-    hle/service/nvnflinger/window.h
-    hle/service/olsc/olsc.cpp
-    hle/service/olsc/olsc.h
-    hle/service/pcie/pcie.cpp
-    hle/service/pcie/pcie.h
-    hle/service/pctl/pctl.cpp
-    hle/service/pctl/pctl.h
-    hle/service/pctl/pctl_module.cpp
-    hle/service/pctl/pctl_module.h
-    hle/service/pcv/pcv.cpp
-    hle/service/pcv/pcv.h
-    hle/service/pm/pm.cpp
-    hle/service/pm/pm.h
-    hle/service/prepo/prepo.cpp
-    hle/service/prepo/prepo.h
-    hle/service/psc/psc.cpp
-    hle/service/psc/psc.h
-    hle/service/ptm/psm.cpp
-    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/hle_ipc.cpp
-    hle/service/hle_ipc.h
-    hle/service/ipc_helpers.h
-    hle/service/kernel_helpers.cpp
-    hle/service/kernel_helpers.h
-    hle/service/mutex.cpp
-    hle/service/mutex.h
-    hle/service/server_manager.cpp
-    hle/service/server_manager.h
-    hle/service/service.cpp
-    hle/service/service.h
-    hle/service/set/set.cpp
-    hle/service/set/set.h
-    hle/service/set/set_cal.cpp
-    hle/service/set/set_cal.h
-    hle/service/set/set_fd.cpp
-    hle/service/set/set_fd.h
-    hle/service/set/set_sys.cpp
-    hle/service/set/set_sys.h
-    hle/service/set/settings.cpp
-    hle/service/set/settings.h
-    hle/service/sm/sm.cpp
-    hle/service/sm/sm.h
-    hle/service/sm/sm_controller.cpp
-    hle/service/sm/sm_controller.h
-    hle/service/sockets/bsd.cpp
-    hle/service/sockets/bsd.h
-    hle/service/sockets/nsd.cpp
-    hle/service/sockets/nsd.h
-    hle/service/sockets/sfdnsres.cpp
-    hle/service/sockets/sfdnsres.h
-    hle/service/sockets/sockets.cpp
-    hle/service/sockets/sockets.h
-    hle/service/sockets/sockets_translate.cpp
-    hle/service/sockets/sockets_translate.h
-    hle/service/spl/csrng.cpp
-    hle/service/spl/csrng.h
-    hle/service/spl/spl.cpp
-    hle/service/spl/spl.h
-    hle/service/spl/spl_module.cpp
-    hle/service/spl/spl_module.h
-    hle/service/spl/spl_results.h
-    hle/service/spl/spl_types.h
-    hle/service/ssl/ssl.cpp
-    hle/service/ssl/ssl.h
-    hle/service/ssl/ssl_backend.h
-    hle/service/time/clock_types.h
-    hle/service/time/ephemeral_network_system_clock_context_writer.h
-    hle/service/time/ephemeral_network_system_clock_core.h
-    hle/service/time/errors.h
-    hle/service/time/local_system_clock_context_writer.h
-    hle/service/time/network_system_clock_context_writer.h
-    hle/service/time/standard_local_system_clock_core.h
-    hle/service/time/standard_network_system_clock_core.h
-    hle/service/time/standard_steady_clock_core.cpp
-    hle/service/time/standard_steady_clock_core.h
-    hle/service/time/standard_user_system_clock_core.cpp
-    hle/service/time/standard_user_system_clock_core.h
-    hle/service/time/steady_clock_core.h
-    hle/service/time/system_clock_context_update_callback.cpp
-    hle/service/time/system_clock_context_update_callback.h
-    hle/service/time/system_clock_core.cpp
-    hle/service/time/system_clock_core.h
-    hle/service/time/tick_based_steady_clock_core.cpp
-    hle/service/time/tick_based_steady_clock_core.h
-    hle/service/time/time.cpp
-    hle/service/time/time.h
-    hle/service/time/time_interface.cpp
-    hle/service/time/time_interface.h
-    hle/service/time/time_manager.cpp
-    hle/service/time/time_manager.h
-    hle/service/time/time_sharedmemory.cpp
-    hle/service/time/time_sharedmemory.h
-    hle/service/time/time_zone_content_manager.cpp
-    hle/service/time/time_zone_content_manager.h
-    hle/service/time/time_zone_manager.cpp
-    hle/service/time/time_zone_manager.h
-    hle/service/time/time_zone_service.cpp
-    hle/service/time/time_zone_service.h
-    hle/service/time/time_zone_types.h
-    hle/service/usb/usb.cpp
-    hle/service/usb/usb.h
-    hle/service/vi/display/vi_display.cpp
-    hle/service/vi/display/vi_display.h
-    hle/service/vi/layer/vi_layer.cpp
-    hle/service/vi/layer/vi_layer.h
-    hle/service/vi/vi.cpp
-    hle/service/vi/vi.h
-    hle/service/vi/vi_m.cpp
-    hle/service/vi/vi_m.h
-    hle/service/vi/vi_s.cpp
-    hle/service/vi/vi_s.h
-    hle/service/vi/vi_u.cpp
-    hle/service/vi/vi_u.h
+    api_version.h
+    ipc.h
+    result.h
     internal_network/network.cpp
     internal_network/network.h
     internal_network/network_interface.cpp
@@ -910,8 +266,9 @@ endif()
 
 create_target_directory_groups(core)
 
-target_link_libraries(core PUBLIC common PRIVATE audio_core network video_core nx_tzdb)
+target_link_libraries(core PUBLIC common PRIVATE audio_core kernel network service video_core nx_tzdb)
 target_link_libraries(core PUBLIC Boost::headers PRIVATE fmt::fmt nlohmann_json::nlohmann_json mbedtls RenderDoc::API)
+
 if (MINGW)
     target_link_libraries(core PRIVATE ${MSWSOCK_LIBRARY})
 endif()
@@ -932,31 +289,10 @@ if (ARCHITECTURE_x86_64 OR ARCHITECTURE_arm64)
         arm/dynarmic/dynarmic_cp15.h
         arm/dynarmic/dynarmic_exclusive_monitor.cpp
         arm/dynarmic/dynarmic_exclusive_monitor.h
-        hle/service/jit/jit_context.cpp
-        hle/service/jit/jit_context.h
-        hle/service/jit/jit.cpp
-        hle/service/jit/jit.h
     )
     target_link_libraries(core PRIVATE dynarmic::dynarmic)
 endif()
 
-if(ENABLE_OPENSSL)
-    target_sources(core PRIVATE
-        hle/service/ssl/ssl_backend_openssl.cpp)
-    target_link_libraries(core PRIVATE OpenSSL::SSL)
-elseif (APPLE)
-    target_sources(core PRIVATE
-        hle/service/ssl/ssl_backend_securetransport.cpp)
-    target_link_libraries(core PRIVATE "-framework Security")
-elseif (WIN32)
-    target_sources(core PRIVATE
-        hle/service/ssl/ssl_backend_schannel.cpp)
-    target_link_libraries(core PRIVATE crypt32 secur32)
-else()
-    target_sources(core PRIVATE
-        hle/service/ssl/ssl_backend_none.cpp)
-endif()
-
 if (YUZU_USE_PRECOMPILED_HEADERS)
     target_precompile_headers(core PRIVATE precompiled_headers.h)
 endif()

src/core/api_version.h

@@ -7,7 +7,7 @@
 
 // This file contains yuzu's HLE API version constants.
 
-namespace HLE::ApiVersion {
+namespace Core::ApiVersion {
 
 // Horizon OS version constants.
 
@@ -43,4 +43,4 @@ constexpr u32 GetTargetFirmware() {
     return AtmosphereTargetFirmware(HOS_VERSION_MAJOR, HOS_VERSION_MINOR, HOS_VERSION_MICRO);
 }
 
-} // namespace HLE::ApiVersion
+} // namespace Core::ApiVersion

src/core/arm/arm_interface.cpp

@@ -12,11 +12,11 @@
 #include "core/arm/symbols.h"
 #include "core/core.h"
 #include "core/debugger/debugger.h"
-#include "core/hle/kernel/k_process.h"
-#include "core/hle/kernel/k_thread.h"
-#include "core/hle/kernel/svc.h"
 #include "core/loader/loader.h"
 #include "core/memory.h"
+#include "kernel/k_process.h"
+#include "kernel/k_thread.h"
+#include "kernel/svc.h"
 
 namespace Core {
 

src/core/arm/dynarmic/arm_dynarmic_32.cpp

@@ -17,9 +17,9 @@
 #include "core/core.h"
 #include "core/core_timing.h"
 #include "core/debugger/debugger.h"
-#include "core/hle/kernel/k_process.h"
-#include "core/hle/kernel/svc.h"
 #include "core/memory.h"
+#include "kernel/k_process.h"
+#include "kernel/svc.h"
 
 namespace Core {
 

src/core/arm/dynarmic/arm_dynarmic_64.cpp

@@ -17,9 +17,9 @@
 #include "core/core_timing.h"
 #include "core/debugger/debugger.h"
 #include "core/hardware_properties.h"
-#include "core/hle/kernel/k_process.h"
-#include "core/hle/kernel/svc.h"
 #include "core/memory.h"
+#include "kernel/k_process.h"
+#include "kernel/svc.h"
 
 namespace Core {
 

src/core/core.cpp

@@ -30,19 +30,6 @@
 #include "core/file_sys/vfs_real.h"
 #include "core/gpu_dirty_memory_manager.h"
 #include "core/hid/hid_core.h"
-#include "core/hle/kernel/k_memory_manager.h"
-#include "core/hle/kernel/k_process.h"
-#include "core/hle/kernel/k_resource_limit.h"
-#include "core/hle/kernel/k_scheduler.h"
-#include "core/hle/kernel/kernel.h"
-#include "core/hle/kernel/physical_core.h"
-#include "core/hle/service/am/applets/applets.h"
-#include "core/hle/service/apm/apm_controller.h"
-#include "core/hle/service/filesystem/filesystem.h"
-#include "core/hle/service/glue/glue_manager.h"
-#include "core/hle/service/service.h"
-#include "core/hle/service/sm/sm.h"
-#include "core/hle/service/time/time_manager.h"
 #include "core/internal_network/network.h"
 #include "core/loader/loader.h"
 #include "core/memory.h"
@@ -52,7 +39,20 @@
 #include "core/telemetry_session.h"
 #include "core/tools/freezer.h"
 #include "core/tools/renderdoc.h"
+#include "kernel/k_memory_manager.h"
+#include "kernel/k_process.h"
+#include "kernel/k_resource_limit.h"
+#include "kernel/k_scheduler.h"
+#include "kernel/kernel.h"
+#include "kernel/physical_core.h"
 #include "network/network.h"
+#include "service/am/applets/applets.h"
+#include "service/apm/apm_controller.h"
+#include "service/filesystem/filesystem.h"
+#include "service/glue/glue_manager.h"
+#include "service/service.h"
+#include "service/sm/sm.h"
+#include "service/time/time_manager.h"
 #include "video_core/host1x/host1x.h"
 #include "video_core/renderer_base.h"
 #include "video_core/video_core.h"

src/core/cpu_manager.cpp

@@ -8,11 +8,11 @@
 #include "core/core.h"
 #include "core/core_timing.h"
 #include "core/cpu_manager.h"
-#include "core/hle/kernel/k_interrupt_manager.h"
-#include "core/hle/kernel/k_scheduler.h"
-#include "core/hle/kernel/k_thread.h"
-#include "core/hle/kernel/kernel.h"
-#include "core/hle/kernel/physical_core.h"
+#include "kernel/k_interrupt_manager.h"
+#include "kernel/k_scheduler.h"
+#include "kernel/k_thread.h"
+#include "kernel/kernel.h"
+#include "kernel/physical_core.h"
 #include "video_core/gpu.h"
 
 namespace Core {

src/core/crypto/key_manager.cpp

@@ -28,8 +28,8 @@
 #include "core/file_sys/content_archive.h"
 #include "core/file_sys/nca_metadata.h"
 #include "core/file_sys/registered_cache.h"
-#include "core/hle/service/filesystem/filesystem.h"
 #include "core/loader/loader.h"
+#include "service/filesystem/filesystem.h"
 
 namespace Core::Crypto {
 namespace {

src/core/debugger/debugger.cpp

@@ -15,9 +15,9 @@
 #include "core/debugger/debugger.h"
 #include "core/debugger/debugger_interface.h"
 #include "core/debugger/gdbstub.h"
-#include "core/hle/kernel/global_scheduler_context.h"
-#include "core/hle/kernel/k_process.h"
-#include "core/hle/kernel/k_scheduler.h"
+#include "kernel/global_scheduler_context.h"
+#include "kernel/k_process.h"
+#include "kernel/k_scheduler.h"
 
 template <typename Readable, typename Buffer, typename Callback>
 static void AsyncReceiveInto(Readable& r, Buffer& buffer, Callback&& c) {

src/core/debugger/gdbstub.cpp

@@ -19,11 +19,11 @@
 #include "core/core.h"
 #include "core/debugger/gdbstub.h"
 #include "core/debugger/gdbstub_arch.h"
-#include "core/hle/kernel/k_page_table.h"
-#include "core/hle/kernel/k_process.h"
-#include "core/hle/kernel/k_thread.h"
 #include "core/loader/loader.h"
 #include "core/memory.h"
+#include "kernel/k_page_table.h"
+#include "kernel/k_process.h"
+#include "kernel/k_thread.h"
 
 namespace Core {
 

src/core/debugger/gdbstub_arch.cpp

@@ -3,7 +3,7 @@
 
 #include "common/hex_util.h"
 #include "core/debugger/gdbstub_arch.h"
-#include "core/hle/kernel/k_thread.h"
+#include "kernel/k_thread.h"
 
 namespace Core {
 

src/core/device_memory.cpp

@@ -2,7 +2,7 @@
 // SPDX-License-Identifier: GPL-2.0-or-later
 
 #include "core/device_memory.h"
-#include "hle/kernel/board/nintendo/nx/k_system_control.h"
+#include "kernel/board/nintendo/nx/k_system_control.h"
 
 namespace Core {
 

src/core/file_sys/errors.h

@@ -3,7 +3,7 @@
 
 #pragma once
 
-#include "core/hle/result.h"
+#include "core/result.h"
 
 namespace FileSys {
 

src/core/file_sys/fssystem/fssystem_bucket_tree.h

@@ -11,7 +11,7 @@
 #include "common/literals.h"
 
 #include "core/file_sys/vfs.h"
-#include "core/hle/result.h"
+#include "core/result.h"
 
 namespace FileSys {
 

src/core/file_sys/fssystem/fssystem_compression_common.h

@@ -3,7 +3,7 @@
 
 #pragma once
 
-#include "core/hle/result.h"
+#include "core/result.h"
 
 namespace FileSys {
 

src/core/file_sys/fssystem/fssystem_pooled_buffer.h

@@ -6,7 +6,7 @@
 #include "common/common_funcs.h"
 #include "common/common_types.h"
 #include "common/literals.h"
-#include "core/hle/result.h"
+#include "core/result.h"
 
 namespace FileSys {
 

src/core/file_sys/patch_manager.cpp

@@ -24,12 +24,12 @@
 #include "core/file_sys/vfs_cached.h"
 #include "core/file_sys/vfs_layered.h"
 #include "core/file_sys/vfs_vector.h"
-#include "core/hle/service/filesystem/filesystem.h"
-#include "core/hle/service/ns/language.h"
-#include "core/hle/service/set/set.h"
 #include "core/loader/loader.h"
 #include "core/loader/nso.h"
 #include "core/memory/cheat_engine.h"
+#include "service/filesystem/filesystem.h"
+#include "service/ns/language.h"
+#include "service/set/set.h"
 
 namespace FileSys {
 namespace {

src/core/file_sys/romfs_factory.cpp

@@ -11,9 +11,9 @@
 #include "core/file_sys/patch_manager.h"
 #include "core/file_sys/registered_cache.h"
 #include "core/file_sys/romfs_factory.h"
-#include "core/hle/kernel/k_process.h"
-#include "core/hle/service/filesystem/filesystem.h"
 #include "core/loader/loader.h"
+#include "kernel/k_process.h"
+#include "service/filesystem/filesystem.h"
 
 namespace FileSys {
 

src/core/file_sys/romfs_factory.h

@@ -7,7 +7,7 @@
 
 #include "common/common_types.h"
 #include "core/file_sys/vfs_types.h"
-#include "core/hle/result.h"
+#include "core/result.h"
 
 namespace Loader {
 class AppLoader;

src/core/file_sys/savedata_factory.h

@@ -8,7 +8,7 @@
 #include "common/common_funcs.h"
 #include "common/common_types.h"
 #include "core/file_sys/vfs.h"
-#include "core/hle/result.h"
+#include "core/result.h"
 
 namespace Core {
 class System;

src/core/file_sys/sdmc_factory.h

@@ -5,7 +5,7 @@
 
 #include <memory>
 #include "core/file_sys/vfs_types.h"
-#include "core/hle/result.h"
+#include "core/result.h"
 
 namespace FileSys {
 

src/core/file_sys/system_archive/shared_font.cpp

@@ -9,7 +9,7 @@
 #include "core/file_sys/system_archive/data/font_standard.h"
 #include "core/file_sys/system_archive/shared_font.h"
 #include "core/file_sys/vfs_vector.h"
-#include "core/hle/service/ns/iplatform_service_manager.h"
+#include "service/ns/iplatform_service_manager.h"
 
 namespace FileSys::SystemArchive {
 

src/core/file_sys/system_archive/system_version.cpp

@@ -2,14 +2,14 @@
 // SPDX-License-Identifier: GPL-2.0-or-later
 
 #include "common/logging/log.h"
+#include "core/api_version.h"
 #include "core/file_sys/system_archive/system_version.h"
 #include "core/file_sys/vfs_vector.h"
-#include "core/hle/api_version.h"
 
 namespace FileSys::SystemArchive {
 
 std::string GetLongDisplayVersion() {
-    return HLE::ApiVersion::DISPLAY_TITLE;
+    return Core::ApiVersion::DISPLAY_TITLE;
 }
 
 VirtualDir SystemVersion() {
@@ -17,19 +17,19 @@ VirtualDir SystemVersion() {
                 GetLongDisplayVersion());
 
     VirtualFile file = std::make_shared<VectorVfsFile>(std::vector<u8>(0x100), "file");
-    file->WriteObject(HLE::ApiVersion::HOS_VERSION_MAJOR, 0);
-    file->WriteObject(HLE::ApiVersion::HOS_VERSION_MINOR, 1);
-    file->WriteObject(HLE::ApiVersion::HOS_VERSION_MICRO, 2);
-    file->WriteObject(HLE::ApiVersion::SDK_REVISION_MAJOR, 4);
-    file->WriteObject(HLE::ApiVersion::SDK_REVISION_MINOR, 5);
-    file->WriteArray(HLE::ApiVersion::PLATFORM_STRING,
-                     std::min<u64>(sizeof(HLE::ApiVersion::PLATFORM_STRING), 0x20ULL), 0x8);
-    file->WriteArray(HLE::ApiVersion::VERSION_HASH,
-                     std::min<u64>(sizeof(HLE::ApiVersion::VERSION_HASH), 0x40ULL), 0x28);
-    file->WriteArray(HLE::ApiVersion::DISPLAY_VERSION,
-                     std::min<u64>(sizeof(HLE::ApiVersion::DISPLAY_VERSION), 0x18ULL), 0x68);
-    file->WriteArray(HLE::ApiVersion::DISPLAY_TITLE,
-                     std::min<u64>(sizeof(HLE::ApiVersion::DISPLAY_TITLE), 0x80ULL), 0x80);
+    file->WriteObject(Core::ApiVersion::HOS_VERSION_MAJOR, 0);
+    file->WriteObject(Core::ApiVersion::HOS_VERSION_MINOR, 1);
+    file->WriteObject(Core::ApiVersion::HOS_VERSION_MICRO, 2);
+    file->WriteObject(Core::ApiVersion::SDK_REVISION_MAJOR, 4);
+    file->WriteObject(Core::ApiVersion::SDK_REVISION_MINOR, 5);
+    file->WriteArray(Core::ApiVersion::PLATFORM_STRING,
+                     std::min<u64>(sizeof(Core::ApiVersion::PLATFORM_STRING), 0x20ULL), 0x8);
+    file->WriteArray(Core::ApiVersion::VERSION_HASH,
+                     std::min<u64>(sizeof(Core::ApiVersion::VERSION_HASH), 0x40ULL), 0x28);
+    file->WriteArray(Core::ApiVersion::DISPLAY_VERSION,
+                     std::min<u64>(sizeof(Core::ApiVersion::DISPLAY_VERSION), 0x18ULL), 0x68);
+    file->WriteArray(Core::ApiVersion::DISPLAY_TITLE,
+                     std::min<u64>(sizeof(Core::ApiVersion::DISPLAY_TITLE), 0x80ULL), 0x80);
     return std::make_shared<VectorVfsDirectory>(std::vector<VirtualFile>{file},
                                                 std::vector<VirtualDir>{}, "data");
 }

src/core/file_sys/system_archive/time_zone_binary.cpp

@@ -6,7 +6,7 @@
 #include "common/swap.h"
 #include "core/file_sys/system_archive/time_zone_binary.h"
 #include "core/file_sys/vfs_vector.h"
-#include "core/hle/service/time/time_zone_types.h"
+#include "service/time/time_zone_types.h"
 
 #include "nx_tzdb.h"
 

src/core/frontend/applets/cabinet.h

@@ -5,7 +5,7 @@
 
 #include <functional>
 #include "core/frontend/applets/applet.h"
-#include "core/hle/service/nfp/nfp_types.h"
+#include "service/nfp/nfp_types.h"
 
 namespace Service::NFC {
 class NfcDevice;

src/core/frontend/applets/error.h

@@ -7,7 +7,7 @@
 #include <functional>
 
 #include "core/frontend/applets/applet.h"
-#include "core/hle/result.h"
+#include "core/result.h"
 
 namespace Core::Frontend {
 

src/core/frontend/applets/profile_select.cpp

@@ -3,7 +3,7 @@
 
 #include "common/settings.h"
 #include "core/frontend/applets/profile_select.h"
-#include "core/hle/service/acc/profile_manager.h"
+#include "service/acc/profile_manager.h"
 
 namespace Core::Frontend {
 

src/core/frontend/applets/profile_select.h

@@ -8,7 +8,7 @@
 
 #include "common/uuid.h"
 #include "core/frontend/applets/applet.h"
-#include "core/hle/service/am/applets/applet_profile_select.h"
+#include "service/am/applets/applet_profile_select.h"
 
 namespace Core::Frontend {
 

src/core/frontend/applets/software_keyboard.h

@@ -8,7 +8,7 @@
 #include "common/common_types.h"
 
 #include "core/frontend/applets/applet.h"
-#include "core/hle/service/am/applets/applet_software_keyboard_types.h"
+#include "service/am/applets/applet_software_keyboard_types.h"
 
 namespace Core::Frontend {
 

src/core/frontend/applets/web_browser.h

@@ -6,7 +6,7 @@
 #include <functional>
 
 #include "core/frontend/applets/applet.h"
-#include "core/hle/service/am/applets/applet_web_browser_types.h"
+#include "service/am/applets/applet_web_browser_types.h"
 
 namespace Core::Frontend {
 

src/core/hid/emulated_console.h

@@ -38,6 +38,14 @@ using TouchParams = std::array<Common::ParamPackage, MaxTouchDevices>;
 using ConsoleMotionValues = ConsoleMotionInfo;
 using TouchValues = std::array<Common::Input::TouchStatus, MaxTouchDevices>;
 
+struct TouchFinger {
+    u64 last_touch{};
+    Common::Point<float> position{};
+    u32 id{};
+    TouchAttribute attribute{};
+    bool pressed{};
+};
+
 // Contains all motion related data that is used on the services
 struct ConsoleMotion {
     Common::Vec3f accel{};

src/core/hid/emulated_controller.cpp

@@ -243,12 +243,10 @@ void EmulatedController::LoadTASParams() {
     tas_button_params[Settings::NativeButton::DUp].Set("button", 13);
     tas_button_params[Settings::NativeButton::DRight].Set("button", 14);
     tas_button_params[Settings::NativeButton::DDown].Set("button", 15);
-    tas_button_params[Settings::NativeButton::SLLeft].Set("button", 16);
-    tas_button_params[Settings::NativeButton::SRLeft].Set("button", 17);
+    tas_button_params[Settings::NativeButton::SL].Set("button", 16);
+    tas_button_params[Settings::NativeButton::SR].Set("button", 17);
     tas_button_params[Settings::NativeButton::Home].Set("button", 18);
     tas_button_params[Settings::NativeButton::Screenshot].Set("button", 19);
-    tas_button_params[Settings::NativeButton::SLRight].Set("button", 20);
-    tas_button_params[Settings::NativeButton::SRRight].Set("button", 21);
 
     tas_stick_params[Settings::NativeAnalog::LStick].Set("axis_x", 0);
     tas_stick_params[Settings::NativeAnalog::LStick].Set("axis_y", 1);
@@ -298,12 +296,10 @@ void EmulatedController::LoadVirtualGamepadParams() {
     virtual_button_params[Settings::NativeButton::DUp].Set("button", 13);
     virtual_button_params[Settings::NativeButton::DRight].Set("button", 14);
     virtual_button_params[Settings::NativeButton::DDown].Set("button", 15);
-    virtual_button_params[Settings::NativeButton::SLLeft].Set("button", 16);
-    virtual_button_params[Settings::NativeButton::SRLeft].Set("button", 17);
+    virtual_button_params[Settings::NativeButton::SL].Set("button", 16);
+    virtual_button_params[Settings::NativeButton::SR].Set("button", 17);
     virtual_button_params[Settings::NativeButton::Home].Set("button", 18);
     virtual_button_params[Settings::NativeButton::Screenshot].Set("button", 19);
-    virtual_button_params[Settings::NativeButton::SLRight].Set("button", 20);
-    virtual_button_params[Settings::NativeButton::SRRight].Set("button", 21);
 
     virtual_stick_params[Settings::NativeAnalog::LStick].Set("axis_x", 0);
     virtual_stick_params[Settings::NativeAnalog::LStick].Set("axis_y", 1);
@@ -871,16 +867,12 @@ void EmulatedController::SetButton(const Common::Input::CallbackStatus& callback
         controller.npad_button_state.down.Assign(current_status.value);
         controller.debug_pad_button_state.d_down.Assign(current_status.value);
         break;
-    case Settings::NativeButton::SLLeft:
+    case Settings::NativeButton::SL:
         controller.npad_button_state.left_sl.Assign(current_status.value);
-        break;
-    case Settings::NativeButton::SLRight:
         controller.npad_button_state.right_sl.Assign(current_status.value);
         break;
-    case Settings::NativeButton::SRLeft:
+    case Settings::NativeButton::SR:
         controller.npad_button_state.left_sr.Assign(current_status.value);
-        break;
-    case Settings::NativeButton::SRRight:
         controller.npad_button_state.right_sr.Assign(current_status.value);
         break;
     case Settings::NativeButton::Home:
@@ -1898,16 +1890,12 @@ NpadButton EmulatedController::GetTurboButtonMask() const {
         case Settings::NativeButton::DDown:
             button_mask.down.Assign(1);
             break;
-        case Settings::NativeButton::SLLeft:
+        case Settings::NativeButton::SL:
             button_mask.left_sl.Assign(1);
-            break;
-        case Settings::NativeButton::SLRight:
             button_mask.right_sl.Assign(1);
             break;
-        case Settings::NativeButton::SRLeft:
+        case Settings::NativeButton::SR:
             button_mask.left_sr.Assign(1);
-            break;
-        case Settings::NativeButton::SRRight:
             button_mask.right_sr.Assign(1);
             break;
         default:

src/core/hid/hid_types.h

@@ -356,14 +356,6 @@ struct TouchState {
 };
 static_assert(sizeof(TouchState) == 0x28, "Touchstate is an invalid size");
 
-struct TouchFinger {
-    u64 last_touch{};
-    Common::Point<float> position{};
-    u32 id{};
-    TouchAttribute attribute{};
-    bool pressed{};
-};
-
 // This is nn::hid::TouchScreenConfigurationForNx
 struct TouchScreenConfigurationForNx {
     TouchScreenModeForNx mode{TouchScreenModeForNx::UseSystemSetting};

src/core/hid/input_interpreter.cpp

@@ -4,15 +4,14 @@
 #include "core/core.h"
 #include "core/hid/hid_types.h"
 #include "core/hid/input_interpreter.h"
-#include "core/hle/service/hid/controllers/npad.h"
-#include "core/hle/service/hid/hid_server.h"
-#include "core/hle/service/hid/resource_manager.h"
-#include "core/hle/service/sm/sm.h"
+#include "service/hid/controllers/npad.h"
+#include "service/hid/hid.h"
+#include "service/sm/sm.h"
 
 InputInterpreter::InputInterpreter(Core::System& system)
     : npad{system.ServiceManager()
-               .GetService<Service::HID::IHidServer>("hid")
-               ->GetResourceManager()
+               .GetService<Service::HID::Hid>("hid")
+               ->GetAppletResource()
                ->GetController<Service::HID::Controller_NPad>(Service::HID::HidController::NPad)} {
     ResetButtonStates();
 }

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

@@ -1,40 +0,0 @@
-// SPDX-FileCopyrightText: Copyright 2018 yuzu Emulator Project
-// SPDX-License-Identifier: GPL-2.0-or-later
-
-#include "core/hle/service/hid/hid.h"
-#include "core/hle/service/hid/hid_debug_server.h"
-#include "core/hle/service/hid/hid_firmware_settings.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"
-
-namespace Service::HID {
-
-void LoopProcess(Core::System& system) {
-    auto server_manager = std::make_unique<ServerManager>(system);
-    std::shared_ptr<ResourceManager> resouce_manager = std::make_shared<ResourceManager>(system);
-    std::shared_ptr<HidFirmwareSettings> firmware_settings =
-        std::make_shared<HidFirmwareSettings>();
-
-    server_manager->RegisterNamedService(
-        "hid", std::make_shared<IHidServer>(system, resouce_manager, firmware_settings));
-    server_manager->RegisterNamedService(
-        "hid:dbg", std::make_shared<IHidDebugServer>(system, resouce_manager));
-    server_manager->RegisterNamedService(
-        "hid:sys", std::make_shared<IHidSystemServer>(system, resouce_manager));
-
-    server_manager->RegisterNamedService("hidbus", std::make_shared<HidBus>(system));
-
-    server_manager->RegisterNamedService("irs", std::make_shared<IRS::IRS>(system));
-    server_manager->RegisterNamedService("irs:sys", std::make_shared<IRS::IRS_SYS>(system));
-
-    server_manager->RegisterNamedService("xcd:sys", std::make_shared<XCD_SYS>(system));
-
-    system.RunServer(std::move(server_manager));
-}
-
-} // namespace Service::HID

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

@@ -1,14 +0,0 @@
-// SPDX-FileCopyrightText: Copyright 2018 yuzu Emulator Project
-// SPDX-License-Identifier: GPL-2.0-or-later
-
-#pragma once
-
-namespace Core {
-class System;
-}
-
-namespace Service::HID {
-
-void LoopProcess(Core::System& system);
-
-} // namespace Service::HID

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

@@ -1,159 +0,0 @@
-// SPDX-FileCopyrightText: Copyright 2023 yuzu Emulator Project
-// SPDX-License-Identifier: GPL-3.0-or-later
-
-#include "core/hle/service/hid/hid_debug_server.h"
-#include "core/hle/service/hid/resource_manager.h"
-#include "core/hle/service/ipc_helpers.h"
-
-namespace Service::HID {
-
-IHidDebugServer::IHidDebugServer(Core::System& system_, std::shared_ptr<ResourceManager> resource)
-    : ServiceFramework{system_, "hid:dbg"}, resource_manager{resource} {
-    // clang-format off
-    static const FunctionInfo functions[] = {
-        {0, nullptr, "DeactivateDebugPad"},
-        {1, nullptr, "SetDebugPadAutoPilotState"},
-        {2, nullptr, "UnsetDebugPadAutoPilotState"},
-        {10, nullptr, "DeactivateTouchScreen"},
-        {11, nullptr, "SetTouchScreenAutoPilotState"},
-        {12, nullptr, "UnsetTouchScreenAutoPilotState"},
-        {13, nullptr, "GetTouchScreenConfiguration"},
-        {14, nullptr, "ProcessTouchScreenAutoTune"},
-        {15, nullptr, "ForceStopTouchScreenManagement"},
-        {16, nullptr, "ForceRestartTouchScreenManagement"},
-        {17, nullptr, "IsTouchScreenManaged"},
-        {20, nullptr, "DeactivateMouse"},
-        {21, nullptr, "SetMouseAutoPilotState"},
-        {22, nullptr, "UnsetMouseAutoPilotState"},
-        {25, nullptr, "SetDebugMouseAutoPilotState"},
-        {26, nullptr, "UnsetDebugMouseAutoPilotState"},
-        {30, nullptr, "DeactivateKeyboard"},
-        {31, nullptr, "SetKeyboardAutoPilotState"},
-        {32, nullptr, "UnsetKeyboardAutoPilotState"},
-        {50, nullptr, "DeactivateXpad"},
-        {51, nullptr, "SetXpadAutoPilotState"},
-        {52, nullptr, "UnsetXpadAutoPilotState"},
-        {53, nullptr, "DeactivateJoyXpad"},
-        {60, nullptr, "ClearNpadSystemCommonPolicy"},
-        {61, nullptr, "DeactivateNpad"},
-        {62, nullptr, "ForceDisconnectNpad"},
-        {91, nullptr, "DeactivateGesture"},
-        {110, nullptr, "DeactivateHomeButton"},
-        {111, nullptr, "SetHomeButtonAutoPilotState"},
-        {112, nullptr, "UnsetHomeButtonAutoPilotState"},
-        {120, nullptr, "DeactivateSleepButton"},
-        {121, nullptr, "SetSleepButtonAutoPilotState"},
-        {122, nullptr, "UnsetSleepButtonAutoPilotState"},
-        {123, nullptr, "DeactivateInputDetector"},
-        {130, nullptr, "DeactivateCaptureButton"},
-        {131, nullptr, "SetCaptureButtonAutoPilotState"},
-        {132, nullptr, "UnsetCaptureButtonAutoPilotState"},
-        {133, nullptr, "SetShiftAccelerometerCalibrationValue"},
-        {134, nullptr, "GetShiftAccelerometerCalibrationValue"},
-        {135, nullptr, "SetShiftGyroscopeCalibrationValue"},
-        {136, nullptr, "GetShiftGyroscopeCalibrationValue"},
-        {140, nullptr, "DeactivateConsoleSixAxisSensor"},
-        {141, nullptr, "GetConsoleSixAxisSensorSamplingFrequency"},
-        {142, nullptr, "DeactivateSevenSixAxisSensor"},
-        {143, nullptr, "GetConsoleSixAxisSensorCountStates"},
-        {144, nullptr, "GetAccelerometerFsr"},
-        {145, nullptr, "SetAccelerometerFsr"},
-        {146, nullptr, "GetAccelerometerOdr"},
-        {147, nullptr, "SetAccelerometerOdr"},
-        {148, nullptr, "GetGyroscopeFsr"},
-        {149, nullptr, "SetGyroscopeFsr"},
-        {150, nullptr, "GetGyroscopeOdr"},
-        {151, nullptr, "SetGyroscopeOdr"},
-        {152, nullptr, "GetWhoAmI"},
-        {201, nullptr, "ActivateFirmwareUpdate"},
-        {202, nullptr, "DeactivateFirmwareUpdate"},
-        {203, nullptr, "StartFirmwareUpdate"},
-        {204, nullptr, "GetFirmwareUpdateStage"},
-        {205, nullptr, "GetFirmwareVersion"},
-        {206, nullptr, "GetDestinationFirmwareVersion"},
-        {207, nullptr, "DiscardFirmwareInfoCacheForRevert"},
-        {208, nullptr, "StartFirmwareUpdateForRevert"},
-        {209, nullptr, "GetAvailableFirmwareVersionForRevert"},
-        {210, nullptr, "IsFirmwareUpdatingDevice"},
-        {211, nullptr, "StartFirmwareUpdateIndividual"},
-        {215, nullptr, "SetUsbFirmwareForceUpdateEnabled"},
-        {216, nullptr, "SetAllKuinaDevicesToFirmwareUpdateMode"},
-        {221, nullptr, "UpdateControllerColor"},
-        {222, nullptr, "ConnectUsbPadsAsync"},
-        {223, nullptr, "DisconnectUsbPadsAsync"},
-        {224, nullptr, "UpdateDesignInfo"},
-        {225, nullptr, "GetUniquePadDriverState"},
-        {226, nullptr, "GetSixAxisSensorDriverStates"},
-        {227, nullptr, "GetRxPacketHistory"},
-        {228, nullptr, "AcquireOperationEventHandle"},
-        {229, nullptr, "ReadSerialFlash"},
-        {230, nullptr, "WriteSerialFlash"},
-        {231, nullptr, "GetOperationResult"},
-        {232, nullptr, "EnableShipmentMode"},
-        {233, nullptr, "ClearPairingInfo"},
-        {234, nullptr, "GetUniquePadDeviceTypeSetInternal"},
-        {235, nullptr, "EnableAnalogStickPower"},
-        {236, nullptr, "RequestKuinaUartClockCal"},
-        {237, nullptr, "GetKuinaUartClockCal"},
-        {238, nullptr, "SetKuinaUartClockTrim"},
-        {239, nullptr, "KuinaLoopbackTest"},
-        {240, nullptr, "RequestBatteryVoltage"},
-        {241, nullptr, "GetBatteryVoltage"},
-        {242, nullptr, "GetUniquePadPowerInfo"},
-        {243, nullptr, "RebootUniquePad"},
-        {244, nullptr, "RequestKuinaFirmwareVersion"},
-        {245, nullptr, "GetKuinaFirmwareVersion"},
-        {246, nullptr, "GetVidPid"},
-        {247, nullptr, "GetAnalogStickCalibrationValue"},
-        {248, nullptr, "GetUniquePadIdsFull"},
-        {249, nullptr, "ConnectUniquePad"},
-        {250, nullptr, "IsVirtual"},
-        {251, nullptr, "GetAnalogStickModuleParam"},
-        {301, nullptr, "GetAbstractedPadHandles"},
-        {302, nullptr, "GetAbstractedPadState"},
-        {303, nullptr, "GetAbstractedPadsState"},
-        {321, nullptr, "SetAutoPilotVirtualPadState"},
-        {322, nullptr, "UnsetAutoPilotVirtualPadState"},
-        {323, nullptr, "UnsetAllAutoPilotVirtualPadState"},
-        {324, nullptr, "AttachHdlsWorkBuffer"},
-        {325, nullptr, "ReleaseHdlsWorkBuffer"},
-        {326, nullptr, "DumpHdlsNpadAssignmentState"},
-        {327, nullptr, "DumpHdlsStates"},
-        {328, nullptr, "ApplyHdlsNpadAssignmentState"},
-        {329, nullptr, "ApplyHdlsStateList"},
-        {330, nullptr, "AttachHdlsVirtualDevice"},
-        {331, nullptr, "DetachHdlsVirtualDevice"},
-        {332, nullptr, "SetHdlsState"},
-        {350, nullptr, "AddRegisteredDevice"},
-        {400, nullptr, "DisableExternalMcuOnNxDevice"},
-        {401, nullptr, "DisableRailDeviceFiltering"},
-        {402, nullptr, "EnableWiredPairing"},
-        {403, nullptr, "EnableShipmentModeAutoClear"},
-        {404, nullptr, "SetRailEnabled"},
-        {500, nullptr, "SetFactoryInt"},
-        {501, nullptr, "IsFactoryBootEnabled"},
-        {550, nullptr, "SetAnalogStickModelDataTemporarily"},
-        {551, nullptr, "GetAnalogStickModelData"},
-        {552, nullptr, "ResetAnalogStickModelData"},
-        {600, nullptr, "ConvertPadState"},
-        {650, nullptr, "AddButtonPlayData"},
-        {651, nullptr, "StartButtonPlayData"},
-        {652, nullptr, "StopButtonPlayData"},
-        {2000, nullptr, "DeactivateDigitizer"},
-        {2001, nullptr, "SetDigitizerAutoPilotState"},
-        {2002, nullptr, "UnsetDigitizerAutoPilotState"},
-        {2002, nullptr, "ReloadFirmwareDebugSettings"},
-    };
-    // clang-format on
-
-    RegisterHandlers(functions);
-}
-
-IHidDebugServer::~IHidDebugServer() = default;
-
-std::shared_ptr<ResourceManager> IHidDebugServer::GetResourceManager() {
-    resource_manager->Initialize();
-    return resource_manager;
-}
-
-} // namespace Service::HID

src/core/hle/service/hid/hid_debug_server.h

@@ -1,26 +0,0 @@
-// SPDX-FileCopyrightText: Copyright 2023 yuzu Emulator Project
-// SPDX-License-Identifier: GPL-3.0-or-later
-
-#pragma once
-
-#include "core/hle/service/service.h"
-
-namespace Core {
-class System;
-}
-
-namespace Service::HID {
-class ResourceManager;
-
-class IHidDebugServer final : public ServiceFramework<IHidDebugServer> {
-public:
-    explicit IHidDebugServer(Core::System& system_, std::shared_ptr<ResourceManager> resource);
-    ~IHidDebugServer() override;
-
-private:
-    std::shared_ptr<ResourceManager> GetResourceManager();
-
-    std::shared_ptr<ResourceManager> resource_manager;
-};
-
-} // namespace Service::HID

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

@@ -1,99 +0,0 @@
-// SPDX-FileCopyrightText: Copyright 2023 yuzu Emulator Project
-// SPDX-License-Identifier: GPL-3.0-or-later
-
-#include "core/hle/service/hid/hid_firmware_settings.h"
-
-namespace Service::HID {
-
-HidFirmwareSettings::HidFirmwareSettings() {
-    LoadSettings(true);
-}
-
-void HidFirmwareSettings::Reload() {
-    LoadSettings(true);
-}
-
-void HidFirmwareSettings::LoadSettings(bool reload_config) {
-    if (is_initalized && !reload_config) {
-        return;
-    }
-
-    // TODO: Use nn::settings::fwdbg::GetSettingsItemValue to load config values
-
-    is_debug_pad_enabled = true;
-    is_device_managed = true;
-    is_touch_i2c_managed = is_device_managed;
-    is_future_devices_emulated = false;
-    is_mcu_hardware_error_emulated = false;
-    is_rail_enabled = true;
-    is_firmware_update_failure_emulated = false;
-    is_firmware_update_failure = {};
-    is_ble_disabled = false;
-    is_dscale_disabled = false;
-    is_handheld_forced = true;
-    features_per_id_disabled = {};
-    is_touch_firmware_auto_update_disabled = false;
-    is_initalized = true;
-}
-
-bool HidFirmwareSettings::IsDebugPadEnabled() {
-    LoadSettings(false);
-    return is_debug_pad_enabled;
-}
-
-bool HidFirmwareSettings::IsDeviceManaged() {
-    LoadSettings(false);
-    return is_device_managed;
-}
-
-bool HidFirmwareSettings::IsEmulateFutureDevice() {
-    LoadSettings(false);
-    return is_future_devices_emulated;
-}
-
-bool HidFirmwareSettings::IsTouchI2cManaged() {
-    LoadSettings(false);
-    return is_touch_i2c_managed;
-}
-
-bool HidFirmwareSettings::IsHandheldForced() {
-    LoadSettings(false);
-    return is_handheld_forced;
-}
-
-bool HidFirmwareSettings::IsRailEnabled() {
-    LoadSettings(false);
-    return is_rail_enabled;
-}
-
-bool HidFirmwareSettings::IsHardwareErrorEmulated() {
-    LoadSettings(false);
-    return is_mcu_hardware_error_emulated;
-}
-
-bool HidFirmwareSettings::IsBleDisabled() {
-    LoadSettings(false);
-    return is_ble_disabled;
-}
-
-bool HidFirmwareSettings::IsDscaleDisabled() {
-    LoadSettings(false);
-    return is_dscale_disabled;
-}
-
-bool HidFirmwareSettings::IsTouchAutoUpdateDisabled() {
-    LoadSettings(false);
-    return is_touch_firmware_auto_update_disabled;
-}
-
-HidFirmwareSettings::FirmwareSetting HidFirmwareSettings::GetFirmwareUpdateFailure() {
-    LoadSettings(false);
-    return is_firmware_update_failure;
-}
-
-HidFirmwareSettings::FeaturesPerId HidFirmwareSettings::FeaturesDisabledPerId() {
-    LoadSettings(false);
-    return features_per_id_disabled;
-}
-
-} // namespace Service::HID

src/core/hle/service/hid/hid_firmware_settings.h

@@ -1,54 +0,0 @@
-// SPDX-FileCopyrightText: Copyright 2023 yuzu Emulator Project
-// SPDX-License-Identifier: GPL-3.0-or-later
-
-#pragma once
-
-#include "common/common_types.h"
-
-namespace Service::HID {
-
-/// Loads firmware config from nn::settings::fwdbg
-class HidFirmwareSettings {
-public:
-    using FirmwareSetting = std::array<u8, 4>;
-    using FeaturesPerId = std::array<bool, 0xA8>;
-
-    HidFirmwareSettings();
-
-    void Reload();
-    void LoadSettings(bool reload_config);
-
-    bool IsDebugPadEnabled();
-    bool IsDeviceManaged();
-    bool IsEmulateFutureDevice();
-    bool IsTouchI2cManaged();
-    bool IsHandheldForced();
-    bool IsRailEnabled();
-    bool IsHardwareErrorEmulated();
-    bool IsBleDisabled();
-    bool IsDscaleDisabled();
-    bool IsTouchAutoUpdateDisabled();
-
-    FirmwareSetting GetFirmwareUpdateFailure();
-    FeaturesPerId FeaturesDisabledPerId();
-
-private:
-    bool is_initalized{};
-
-    // Debug settings
-    bool is_debug_pad_enabled{};
-    bool is_device_managed{};
-    bool is_touch_i2c_managed{};
-    bool is_future_devices_emulated{};
-    bool is_mcu_hardware_error_emulated{};
-    bool is_rail_enabled{};
-    bool is_firmware_update_failure_emulated{};
-    bool is_ble_disabled{};
-    bool is_dscale_disabled{};
-    bool is_handheld_forced{};
-    bool is_touch_firmware_auto_update_disabled{};
-    FirmwareSetting is_firmware_update_failure{};
-    FeaturesPerId features_per_id_disabled{};
-};
-
-} // namespace Service::HID

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

@@ -1,304 +0,0 @@
-// SPDX-FileCopyrightText: Copyright 2023 yuzu Emulator Project
-// SPDX-License-Identifier: GPL-3.0-or-later
-
-#include "core/hid/hid_core.h"
-#include "core/hle/service/hid/controllers/npad.h"
-#include "core/hle/service/hid/controllers/touchscreen.h"
-#include "core/hle/service/hid/errors.h"
-#include "core/hle/service/hid/hid_system_server.h"
-#include "core/hle/service/hid/resource_manager.h"
-#include "core/hle/service/ipc_helpers.h"
-
-namespace Service::HID {
-
-IHidSystemServer::IHidSystemServer(Core::System& system_, std::shared_ptr<ResourceManager> resource)
-    : ServiceFramework{system_, "hid:sys"}, service_context{system_, service_name},
-      resource_manager{resource} {
-    // clang-format off
-    static const FunctionInfo functions[] = {
-            {31, nullptr, "SendKeyboardLockKeyEvent"},
-            {101, nullptr, "AcquireHomeButtonEventHandle"},
-            {111, nullptr, "ActivateHomeButton"},
-            {121, nullptr, "AcquireSleepButtonEventHandle"},
-            {131, nullptr, "ActivateSleepButton"},
-            {141, nullptr, "AcquireCaptureButtonEventHandle"},
-            {151, nullptr, "ActivateCaptureButton"},
-            {161, nullptr, "GetPlatformConfig"},
-            {210, nullptr, "AcquireNfcDeviceUpdateEventHandle"},
-            {211, nullptr, "GetNpadsWithNfc"},
-            {212, nullptr, "AcquireNfcActivateEventHandle"},
-            {213, nullptr, "ActivateNfc"},
-            {214, nullptr, "GetXcdHandleForNpadWithNfc"},
-            {215, nullptr, "IsNfcActivated"},
-            {230, nullptr, "AcquireIrSensorEventHandle"},
-            {231, nullptr, "ActivateIrSensor"},
-            {232, nullptr, "GetIrSensorState"},
-            {233, nullptr, "GetXcdHandleForNpadWithIrSensor"},
-            {301, nullptr, "ActivateNpadSystem"},
-            {303, &IHidSystemServer::ApplyNpadSystemCommonPolicy, "ApplyNpadSystemCommonPolicy"},
-            {304, nullptr, "EnableAssigningSingleOnSlSrPress"},
-            {305, nullptr, "DisableAssigningSingleOnSlSrPress"},
-            {306, &IHidSystemServer::GetLastActiveNpad, "GetLastActiveNpad"},
-            {307, nullptr, "GetNpadSystemExtStyle"},
-            {308, nullptr, "ApplyNpadSystemCommonPolicyFull"},
-            {309, nullptr, "GetNpadFullKeyGripColor"},
-            {310, nullptr, "GetMaskedSupportedNpadStyleSet"},
-            {311, nullptr, "SetNpadPlayerLedBlinkingDevice"},
-            {312, nullptr, "SetSupportedNpadStyleSetAll"},
-            {313, nullptr, "GetNpadCaptureButtonAssignment"},
-            {314, nullptr, "GetAppletFooterUiType"},
-            {315, nullptr, "GetAppletDetailedUiType"},
-            {316, nullptr, "GetNpadInterfaceType"},
-            {317, nullptr, "GetNpadLeftRightInterfaceType"},
-            {318, nullptr, "HasBattery"},
-            {319, nullptr, "HasLeftRightBattery"},
-            {321, &IHidSystemServer::GetUniquePadsFromNpad, "GetUniquePadsFromNpad"},
-            {322, nullptr, "GetIrSensorState"},
-            {323, nullptr, "GetXcdHandleForNpadWithIrSensor"},
-            {324, nullptr, "GetUniquePadButtonSet"},
-            {325, nullptr, "GetUniquePadColor"},
-            {326, nullptr, "GetUniquePadAppletDetailedUiType"},
-            {327, nullptr, "GetAbstractedPadIdDataFromNpad"},
-            {328, nullptr, "AttachAbstractedPadToNpad"},
-            {329, nullptr, "DetachAbstractedPadAll"},
-            {330, nullptr, "CheckAbstractedPadConnection"},
-            {500, nullptr, "SetAppletResourceUserId"},
-            {501, nullptr, "RegisterAppletResourceUserId"},
-            {502, nullptr, "UnregisterAppletResourceUserId"},
-            {503, nullptr, "EnableAppletToGetInput"},
-            {504, nullptr, "SetAruidValidForVibration"},
-            {505, nullptr, "EnableAppletToGetSixAxisSensor"},
-            {506, nullptr, "EnableAppletToGetPadInput"},
-            {507, nullptr, "EnableAppletToGetTouchScreen"},
-            {510, nullptr, "SetVibrationMasterVolume"},
-            {511, nullptr, "GetVibrationMasterVolume"},
-            {512, nullptr, "BeginPermitVibrationSession"},
-            {513, nullptr, "EndPermitVibrationSession"},
-            {514, nullptr, "Unknown514"},
-            {520, nullptr, "EnableHandheldHids"},
-            {521, nullptr, "DisableHandheldHids"},
-            {522, nullptr, "SetJoyConRailEnabled"},
-            {523, nullptr, "IsJoyConRailEnabled"},
-            {524, nullptr, "IsHandheldHidsEnabled"},
-            {525, nullptr, "IsJoyConAttachedOnAllRail"},
-            {540, nullptr, "AcquirePlayReportControllerUsageUpdateEvent"},
-            {541, nullptr, "GetPlayReportControllerUsages"},
-            {542, nullptr, "AcquirePlayReportRegisteredDeviceUpdateEvent"},
-            {543, nullptr, "GetRegisteredDevicesOld"},
-            {544, nullptr, "AcquireConnectionTriggerTimeoutEvent"},
-            {545, nullptr, "SendConnectionTrigger"},
-            {546, nullptr, "AcquireDeviceRegisteredEventForControllerSupport"},
-            {547, nullptr, "GetAllowedBluetoothLinksCount"},
-            {548, nullptr, "GetRegisteredDevices"},
-            {549, nullptr, "GetConnectableRegisteredDevices"},
-            {700, nullptr, "ActivateUniquePad"},
-            {702, nullptr, "AcquireUniquePadConnectionEventHandle"},
-            {703, nullptr, "GetUniquePadIds"},
-            {751, &IHidSystemServer::AcquireJoyDetachOnBluetoothOffEventHandle, "AcquireJoyDetachOnBluetoothOffEventHandle"},
-            {800, nullptr, "ListSixAxisSensorHandles"},
-            {801, nullptr, "IsSixAxisSensorUserCalibrationSupported"},
-            {802, nullptr, "ResetSixAxisSensorCalibrationValues"},
-            {803, nullptr, "StartSixAxisSensorUserCalibration"},
-            {804, nullptr, "CancelSixAxisSensorUserCalibration"},
-            {805, nullptr, "GetUniquePadBluetoothAddress"},
-            {806, nullptr, "DisconnectUniquePad"},
-            {807, nullptr, "GetUniquePadType"},
-            {808, nullptr, "GetUniquePadInterface"},
-            {809, nullptr, "GetUniquePadSerialNumber"},
-            {810, nullptr, "GetUniquePadControllerNumber"},
-            {811, nullptr, "GetSixAxisSensorUserCalibrationStage"},
-            {812, nullptr, "GetConsoleUniqueSixAxisSensorHandle"},
-            {821, nullptr, "StartAnalogStickManualCalibration"},
-            {822, nullptr, "RetryCurrentAnalogStickManualCalibrationStage"},
-            {823, nullptr, "CancelAnalogStickManualCalibration"},
-            {824, nullptr, "ResetAnalogStickManualCalibration"},
-            {825, nullptr, "GetAnalogStickState"},
-            {826, nullptr, "GetAnalogStickManualCalibrationStage"},
-            {827, nullptr, "IsAnalogStickButtonPressed"},
-            {828, nullptr, "IsAnalogStickInReleasePosition"},
-            {829, nullptr, "IsAnalogStickInCircumference"},
-            {830, nullptr, "SetNotificationLedPattern"},
-            {831, nullptr, "SetNotificationLedPatternWithTimeout"},
-            {832, nullptr, "PrepareHidsForNotificationWake"},
-            {850, &IHidSystemServer::IsUsbFullKeyControllerEnabled, "IsUsbFullKeyControllerEnabled"},
-            {851, nullptr, "EnableUsbFullKeyController"},
-            {852, nullptr, "IsUsbConnected"},
-            {870, nullptr, "IsHandheldButtonPressedOnConsoleMode"},
-            {900, nullptr, "ActivateInputDetector"},
-            {901, nullptr, "NotifyInputDetector"},
-            {1000, nullptr, "InitializeFirmwareUpdate"},
-            {1001, nullptr, "GetFirmwareVersion"},
-            {1002, nullptr, "GetAvailableFirmwareVersion"},
-            {1003, nullptr, "IsFirmwareUpdateAvailable"},
-            {1004, nullptr, "CheckFirmwareUpdateRequired"},
-            {1005, nullptr, "StartFirmwareUpdate"},
-            {1006, nullptr, "AbortFirmwareUpdate"},
-            {1007, nullptr, "GetFirmwareUpdateState"},
-            {1008, nullptr, "ActivateAudioControl"},
-            {1009, nullptr, "AcquireAudioControlEventHandle"},
-            {1010, nullptr, "GetAudioControlStates"},
-            {1011, nullptr, "DeactivateAudioControl"},
-            {1050, nullptr, "IsSixAxisSensorAccurateUserCalibrationSupported"},
-            {1051, nullptr, "StartSixAxisSensorAccurateUserCalibration"},
-            {1052, nullptr, "CancelSixAxisSensorAccurateUserCalibration"},
-            {1053, nullptr, "GetSixAxisSensorAccurateUserCalibrationState"},
-            {1100, nullptr, "GetHidbusSystemServiceObject"},
-            {1120, nullptr, "SetFirmwareHotfixUpdateSkipEnabled"},
-            {1130, nullptr, "InitializeUsbFirmwareUpdate"},
-            {1131, nullptr, "FinalizeUsbFirmwareUpdate"},
-            {1132, nullptr, "CheckUsbFirmwareUpdateRequired"},
-            {1133, nullptr, "StartUsbFirmwareUpdate"},
-            {1134, nullptr, "GetUsbFirmwareUpdateState"},
-            {1150, nullptr, "SetTouchScreenMagnification"},
-            {1151, nullptr, "GetTouchScreenFirmwareVersion"},
-            {1152, nullptr, "SetTouchScreenDefaultConfiguration"},
-            {1153, &IHidSystemServer::GetTouchScreenDefaultConfiguration, "GetTouchScreenDefaultConfiguration"},
-            {1154, nullptr, "IsFirmwareAvailableForNotification"},
-            {1155, nullptr, "SetForceHandheldStyleVibration"},
-            {1156, nullptr, "SendConnectionTriggerWithoutTimeoutEvent"},
-            {1157, nullptr, "CancelConnectionTrigger"},
-            {1200, nullptr, "IsButtonConfigSupported"},
-            {1201, nullptr, "IsButtonConfigEmbeddedSupported"},
-            {1202, nullptr, "DeleteButtonConfig"},
-            {1203, nullptr, "DeleteButtonConfigEmbedded"},
-            {1204, nullptr, "SetButtonConfigEnabled"},
-            {1205, nullptr, "SetButtonConfigEmbeddedEnabled"},
-            {1206, nullptr, "IsButtonConfigEnabled"},
-            {1207, nullptr, "IsButtonConfigEmbeddedEnabled"},
-            {1208, nullptr, "SetButtonConfigEmbedded"},
-            {1209, nullptr, "SetButtonConfigFull"},
-            {1210, nullptr, "SetButtonConfigLeft"},
-            {1211, nullptr, "SetButtonConfigRight"},
-            {1212, nullptr, "GetButtonConfigEmbedded"},
-            {1213, nullptr, "GetButtonConfigFull"},
-            {1214, nullptr, "GetButtonConfigLeft"},
-            {1215, nullptr, "GetButtonConfigRight"},
-            {1250, nullptr, "IsCustomButtonConfigSupported"},
-            {1251, nullptr, "IsDefaultButtonConfigEmbedded"},
-            {1252, nullptr, "IsDefaultButtonConfigFull"},
-            {1253, nullptr, "IsDefaultButtonConfigLeft"},
-            {1254, nullptr, "IsDefaultButtonConfigRight"},
-            {1255, nullptr, "IsButtonConfigStorageEmbeddedEmpty"},
-            {1256, nullptr, "IsButtonConfigStorageFullEmpty"},
-            {1257, nullptr, "IsButtonConfigStorageLeftEmpty"},
-            {1258, nullptr, "IsButtonConfigStorageRightEmpty"},
-            {1259, nullptr, "GetButtonConfigStorageEmbeddedDeprecated"},
-            {1260, nullptr, "GetButtonConfigStorageFullDeprecated"},
-            {1261, nullptr, "GetButtonConfigStorageLeftDeprecated"},
-            {1262, nullptr, "GetButtonConfigStorageRightDeprecated"},
-            {1263, nullptr, "SetButtonConfigStorageEmbeddedDeprecated"},
-            {1264, nullptr, "SetButtonConfigStorageFullDeprecated"},
-            {1265, nullptr, "SetButtonConfigStorageLeftDeprecated"},
-            {1266, nullptr, "SetButtonConfigStorageRightDeprecated"},
-            {1267, nullptr, "DeleteButtonConfigStorageEmbedded"},
-            {1268, nullptr, "DeleteButtonConfigStorageFull"},
-            {1269, nullptr, "DeleteButtonConfigStorageLeft"},
-            {1270, nullptr, "DeleteButtonConfigStorageRight"},
-            {1271, nullptr, "IsUsingCustomButtonConfig"},
-            {1272, nullptr, "IsAnyCustomButtonConfigEnabled"},
-            {1273, nullptr, "SetAllCustomButtonConfigEnabled"},
-            {1274, nullptr, "SetDefaultButtonConfig"},
-            {1275, nullptr, "SetAllDefaultButtonConfig"},
-            {1276, nullptr, "SetHidButtonConfigEmbedded"},
-            {1277, nullptr, "SetHidButtonConfigFull"},
-            {1278, nullptr, "SetHidButtonConfigLeft"},
-            {1279, nullptr, "SetHidButtonConfigRight"},
-            {1280, nullptr, "GetHidButtonConfigEmbedded"},
-            {1281, nullptr, "GetHidButtonConfigFull"},
-            {1282, nullptr, "GetHidButtonConfigLeft"},
-            {1283, nullptr, "GetHidButtonConfigRight"},
-            {1284, nullptr, "GetButtonConfigStorageEmbedded"},
-            {1285, nullptr, "GetButtonConfigStorageFull"},
-            {1286, nullptr, "GetButtonConfigStorageLeft"},
-            {1287, nullptr, "GetButtonConfigStorageRight"},
-            {1288, nullptr, "SetButtonConfigStorageEmbedded"},
-            {1289, nullptr, "SetButtonConfigStorageFull"},
-            {1290, nullptr, "DeleteButtonConfigStorageRight"},
-            {1291, nullptr, "DeleteButtonConfigStorageRight"},
-    };
-    // clang-format on
-
-    RegisterHandlers(functions);
-
-    joy_detach_event = service_context.CreateEvent("HidSys::JoyDetachEvent");
-}
-
-IHidSystemServer::~IHidSystemServer() {
-    service_context.CloseEvent(joy_detach_event);
-};
-
-void IHidSystemServer::ApplyNpadSystemCommonPolicy(HLERequestContext& ctx) {
-    LOG_WARNING(Service_HID, "called");
-
-    GetResourceManager()
-        ->GetController<Controller_NPad>(HidController::NPad)
-        .ApplyNpadSystemCommonPolicy();
-
-    IPC::ResponseBuilder rb{ctx, 2};
-    rb.Push(ResultSuccess);
-}
-
-void IHidSystemServer::GetLastActiveNpad(HLERequestContext& ctx) {
-    LOG_DEBUG(Service_HID, "(STUBBED) called");
-
-    IPC::ResponseBuilder rb{ctx, 3};
-    rb.Push(ResultSuccess);
-    rb.PushEnum(system.HIDCore().GetLastActiveController());
-}
-
-void IHidSystemServer::GetUniquePadsFromNpad(HLERequestContext& ctx) {
-    IPC::RequestParser rp{ctx};
-    const auto npad_id_type{rp.PopEnum<Core::HID::NpadIdType>()};
-
-    LOG_WARNING(Service_HID, "(STUBBED) called, npad_id_type={}", npad_id_type);
-
-    const std::vector<Core::HID::UniquePadId> unique_pads{};
-
-    ctx.WriteBuffer(unique_pads);
-
-    IPC::ResponseBuilder rb{ctx, 3};
-    rb.Push(ResultSuccess);
-    rb.Push(static_cast<u32>(unique_pads.size()));
-}
-
-void IHidSystemServer::AcquireJoyDetachOnBluetoothOffEventHandle(HLERequestContext& ctx) {
-    LOG_INFO(Service_AM, "called");
-
-    IPC::ResponseBuilder rb{ctx, 2, 1};
-    rb.Push(ResultSuccess);
-    rb.PushCopyObjects(joy_detach_event->GetReadableEvent());
-}
-
-void IHidSystemServer::IsUsbFullKeyControllerEnabled(HLERequestContext& ctx) {
-    const bool is_enabled = false;
-
-    LOG_WARNING(Service_HID, "(STUBBED) called, is_enabled={}", is_enabled);
-
-    IPC::ResponseBuilder rb{ctx, 3};
-    rb.Push(ResultSuccess);
-    rb.Push(is_enabled);
-}
-
-void IHidSystemServer::GetTouchScreenDefaultConfiguration(HLERequestContext& ctx) {
-    LOG_WARNING(Service_HID, "(STUBBED) called");
-
-    Core::HID::TouchScreenConfigurationForNx touchscreen_config{
-        .mode = Core::HID::TouchScreenModeForNx::Finger,
-    };
-
-    if (touchscreen_config.mode != Core::HID::TouchScreenModeForNx::Heat2 &&
-        touchscreen_config.mode != Core::HID::TouchScreenModeForNx::Finger) {
-        touchscreen_config.mode = Core::HID::TouchScreenModeForNx::UseSystemSetting;
-    }
-
-    IPC::ResponseBuilder rb{ctx, 6};
-    rb.Push(ResultSuccess);
-    rb.PushRaw(touchscreen_config);
-}
-
-std::shared_ptr<ResourceManager> IHidSystemServer::GetResourceManager() {
-    resource_manager->Initialize();
-    return resource_manager;
-}
-
-} // namespace Service::HID

src/core/hle/service/hid/hid_system_server.h

@@ -1,40 +0,0 @@
-// SPDX-FileCopyrightText: Copyright 2023 yuzu Emulator Project
-// SPDX-License-Identifier: GPL-3.0-or-later
-
-#pragma once
-
-#include "core/hle/service/kernel_helpers.h"
-#include "core/hle/service/service.h"
-
-namespace Core {
-class System;
-}
-
-namespace Kernel {
-class KEvent;
-}
-
-namespace Service::HID {
-class ResourceManager;
-
-class IHidSystemServer final : public ServiceFramework<IHidSystemServer> {
-public:
-    explicit IHidSystemServer(Core::System& system_, std::shared_ptr<ResourceManager> resource);
-    ~IHidSystemServer() override;
-
-private:
-    void ApplyNpadSystemCommonPolicy(HLERequestContext& ctx);
-    void GetLastActiveNpad(HLERequestContext& ctx);
-    void GetUniquePadsFromNpad(HLERequestContext& ctx);
-    void AcquireJoyDetachOnBluetoothOffEventHandle(HLERequestContext& ctx);
-    void IsUsbFullKeyControllerEnabled(HLERequestContext& ctx);
-    void GetTouchScreenDefaultConfiguration(HLERequestContext& ctx);
-
-    std::shared_ptr<ResourceManager> GetResourceManager();
-
-    Kernel::KEvent* joy_detach_event;
-    KernelHelpers::ServiceContext service_context;
-    std::shared_ptr<ResourceManager> resource_manager;
-};
-
-} // namespace Service::HID

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

@@ -1,184 +0,0 @@
-// SPDX-FileCopyrightText: Copyright 2023 yuzu Emulator Project
-// SPDX-License-Identifier: GPL-3.0-or-later
-
-#include "common/logging/log.h"
-#include "core/core.h"
-#include "core/core_timing.h"
-#include "core/hid/hid_core.h"
-#include "core/hle/kernel/k_shared_memory.h"
-#include "core/hle/service/hid/resource_manager.h"
-#include "core/hle/service/ipc_helpers.h"
-
-#include "core/hle/service/hid/controllers/console_sixaxis.h"
-#include "core/hle/service/hid/controllers/controller_base.h"
-#include "core/hle/service/hid/controllers/debug_pad.h"
-#include "core/hle/service/hid/controllers/gesture.h"
-#include "core/hle/service/hid/controllers/keyboard.h"
-#include "core/hle/service/hid/controllers/mouse.h"
-#include "core/hle/service/hid/controllers/npad.h"
-#include "core/hle/service/hid/controllers/palma.h"
-#include "core/hle/service/hid/controllers/stubbed.h"
-#include "core/hle/service/hid/controllers/touchscreen.h"
-#include "core/hle/service/hid/controllers/xpad.h"
-
-namespace Service::HID {
-
-// Updating period for each HID device.
-// Period time is obtained by measuring the number of samples in a second on HW using a homebrew
-// Correct npad_update_ns is 4ms this is overclocked to lower input lag
-constexpr auto npad_update_ns = std::chrono::nanoseconds{1 * 1000 * 1000};    // (1ms, 1000Hz)
-constexpr auto default_update_ns = std::chrono::nanoseconds{4 * 1000 * 1000}; // (4ms, 1000Hz)
-constexpr auto mouse_keyboard_update_ns = std::chrono::nanoseconds{8 * 1000 * 1000}; // (8ms, 125Hz)
-constexpr auto motion_update_ns = std::chrono::nanoseconds{5 * 1000 * 1000};         // (5ms, 200Hz)
-
-ResourceManager::ResourceManager(Core::System& system_)
-    : system{system_}, service_context{system_, "hid"} {}
-
-ResourceManager::~ResourceManager() = default;
-
-void ResourceManager::Initialize() {
-    if (is_initialized) {
-        return;
-    }
-
-    u8* shared_memory = system.Kernel().GetHidSharedMem().GetPointer();
-    MakeController<Controller_DebugPad>(HidController::DebugPad, shared_memory);
-    MakeController<Controller_Touchscreen>(HidController::Touchscreen, shared_memory);
-    MakeController<Controller_Mouse>(HidController::Mouse, shared_memory);
-    MakeController<Controller_Keyboard>(HidController::Keyboard, shared_memory);
-    MakeController<Controller_XPad>(HidController::XPad, shared_memory);
-    MakeController<Controller_Stubbed>(HidController::HomeButton, shared_memory);
-    MakeController<Controller_Stubbed>(HidController::SleepButton, shared_memory);
-    MakeController<Controller_Stubbed>(HidController::CaptureButton, shared_memory);
-    MakeController<Controller_Stubbed>(HidController::InputDetector, shared_memory);
-    MakeController<Controller_Stubbed>(HidController::UniquePad, shared_memory);
-    MakeControllerWithServiceContext<Controller_NPad>(HidController::NPad, shared_memory);
-    MakeController<Controller_Gesture>(HidController::Gesture, shared_memory);
-    MakeController<Controller_ConsoleSixAxis>(HidController::ConsoleSixAxisSensor, shared_memory);
-    MakeController<Controller_Stubbed>(HidController::DebugMouse, shared_memory);
-    MakeControllerWithServiceContext<Controller_Palma>(HidController::Palma, shared_memory);
-
-    // Homebrew doesn't try to activate some controllers, so we activate them by default
-    GetController<Controller_NPad>(HidController::NPad).Activate();
-    GetController<Controller_Touchscreen>(HidController::Touchscreen).Activate();
-
-    GetController<Controller_Stubbed>(HidController::HomeButton).SetCommonHeaderOffset(0x4C00);
-    GetController<Controller_Stubbed>(HidController::SleepButton).SetCommonHeaderOffset(0x4E00);
-    GetController<Controller_Stubbed>(HidController::CaptureButton).SetCommonHeaderOffset(0x5000);
-    GetController<Controller_Stubbed>(HidController::InputDetector).SetCommonHeaderOffset(0x5200);
-    GetController<Controller_Stubbed>(HidController::UniquePad).SetCommonHeaderOffset(0x5A00);
-    GetController<Controller_Stubbed>(HidController::DebugMouse).SetCommonHeaderOffset(0x3DC00);
-
-    system.HIDCore().ReloadInputDevices();
-    is_initialized = true;
-}
-
-void ResourceManager::UpdateControllers(std::uintptr_t user_data,
-                                        std::chrono::nanoseconds ns_late) {
-    auto& core_timing = system.CoreTiming();
-
-    for (const auto& controller : controllers) {
-        // Keyboard has it's own update event
-        if (controller == controllers[static_cast<size_t>(HidController::Keyboard)]) {
-            continue;
-        }
-        // Mouse has it's own update event
-        if (controller == controllers[static_cast<size_t>(HidController::Mouse)]) {
-            continue;
-        }
-        // Npad has it's own update event
-        if (controller == controllers[static_cast<size_t>(HidController::NPad)]) {
-            continue;
-        }
-        controller->OnUpdate(core_timing);
-    }
-}
-
-void ResourceManager::UpdateNpad(std::uintptr_t user_data, std::chrono::nanoseconds ns_late) {
-    auto& core_timing = system.CoreTiming();
-
-    controllers[static_cast<size_t>(HidController::NPad)]->OnUpdate(core_timing);
-}
-
-void ResourceManager::UpdateMouseKeyboard(std::uintptr_t user_data,
-                                          std::chrono::nanoseconds ns_late) {
-    auto& core_timing = system.CoreTiming();
-
-    controllers[static_cast<size_t>(HidController::Mouse)]->OnUpdate(core_timing);
-    controllers[static_cast<size_t>(HidController::Keyboard)]->OnUpdate(core_timing);
-}
-
-void ResourceManager::UpdateMotion(std::uintptr_t user_data, std::chrono::nanoseconds ns_late) {
-    auto& core_timing = system.CoreTiming();
-
-    controllers[static_cast<size_t>(HidController::NPad)]->OnMotionUpdate(core_timing);
-}
-
-IAppletResource::IAppletResource(Core::System& system_, std::shared_ptr<ResourceManager> resource)
-    : ServiceFramework{system_, "IAppletResource"} {
-    static const FunctionInfo functions[] = {
-        {0, &IAppletResource::GetSharedMemoryHandle, "GetSharedMemoryHandle"},
-    };
-    RegisterHandlers(functions);
-
-    resource->Initialize();
-
-    // Register update callbacks
-    npad_update_event = Core::Timing::CreateEvent(
-        "HID::UpdatePadCallback",
-        [this, resource](std::uintptr_t user_data, s64 time, std::chrono::nanoseconds ns_late)
-            -> std::optional<std::chrono::nanoseconds> {
-            const auto guard = LockService();
-            resource->UpdateNpad(user_data, ns_late);
-            return std::nullopt;
-        });
-    default_update_event = Core::Timing::CreateEvent(
-        "HID::UpdateDefaultCallback",
-        [this, resource](std::uintptr_t user_data, s64 time, std::chrono::nanoseconds ns_late)
-            -> std::optional<std::chrono::nanoseconds> {
-            const auto guard = LockService();
-            resource->UpdateControllers(user_data, ns_late);
-            return std::nullopt;
-        });
-    mouse_keyboard_update_event = Core::Timing::CreateEvent(
-        "HID::UpdateMouseKeyboardCallback",
-        [this, resource](std::uintptr_t user_data, s64 time, std::chrono::nanoseconds ns_late)
-            -> std::optional<std::chrono::nanoseconds> {
-            const auto guard = LockService();
-            resource->UpdateMouseKeyboard(user_data, ns_late);
-            return std::nullopt;
-        });
-    motion_update_event = Core::Timing::CreateEvent(
-        "HID::UpdateMotionCallback",
-        [this, resource](std::uintptr_t user_data, s64 time, std::chrono::nanoseconds ns_late)
-            -> std::optional<std::chrono::nanoseconds> {
-            const auto guard = LockService();
-            resource->UpdateMotion(user_data, ns_late);
-            return std::nullopt;
-        });
-
-    system.CoreTiming().ScheduleLoopingEvent(npad_update_ns, npad_update_ns, npad_update_event);
-    system.CoreTiming().ScheduleLoopingEvent(default_update_ns, default_update_ns,
-                                             default_update_event);
-    system.CoreTiming().ScheduleLoopingEvent(mouse_keyboard_update_ns, mouse_keyboard_update_ns,
-                                             mouse_keyboard_update_event);
-    system.CoreTiming().ScheduleLoopingEvent(motion_update_ns, motion_update_ns,
-                                             motion_update_event);
-}
-
-IAppletResource::~IAppletResource() {
-    system.CoreTiming().UnscheduleEvent(npad_update_event, 0);
-    system.CoreTiming().UnscheduleEvent(default_update_event, 0);
-    system.CoreTiming().UnscheduleEvent(mouse_keyboard_update_event, 0);
-    system.CoreTiming().UnscheduleEvent(motion_update_event, 0);
-}
-
-void IAppletResource::GetSharedMemoryHandle(HLERequestContext& ctx) {
-    LOG_DEBUG(Service_HID, "called");
-
-    IPC::ResponseBuilder rb{ctx, 2, 1};
-    rb.Push(ResultSuccess);
-    rb.PushCopyObjects(&system.Kernel().GetHidSharedMem());
-}
-
-} // namespace Service::HID

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

@@ -1,104 +0,0 @@
-// SPDX-FileCopyrightText: Copyright 2023 yuzu Emulator Project
-// SPDX-License-Identifier: GPL-3.0-or-later
-
-#pragma once
-
-#include <chrono>
-
-#include "core/core.h"
-#include "core/hle/service/hid/controllers/controller_base.h"
-#include "core/hle/service/kernel_helpers.h"
-#include "core/hle/service/service.h"
-
-namespace Core::Timing {
-struct EventType;
-}
-
-namespace Core::HID {
-class HIDCore;
-}
-
-namespace Service::HID {
-
-enum class HidController : std::size_t {
-    DebugPad,
-    Touchscreen,
-    Mouse,
-    Keyboard,
-    XPad,
-    HomeButton,
-    SleepButton,
-    CaptureButton,
-    InputDetector,
-    UniquePad,
-    NPad,
-    Gesture,
-    ConsoleSixAxisSensor,
-    DebugMouse,
-    Palma,
-
-    MaxControllers,
-};
-class ResourceManager {
-public:
-    explicit ResourceManager(Core::System& system_);
-    ~ResourceManager();
-
-    template <typename T>
-    T& GetController(HidController controller) {
-        return static_cast<T&>(*controllers[static_cast<size_t>(controller)]);
-    }
-
-    template <typename T>
-    const T& GetController(HidController controller) const {
-        return static_cast<T&>(*controllers[static_cast<size_t>(controller)]);
-    }
-
-    void Initialize();
-
-    void UpdateControllers(std::uintptr_t user_data, std::chrono::nanoseconds ns_late);
-    void UpdateNpad(std::uintptr_t user_data, std::chrono::nanoseconds ns_late);
-    void UpdateMouseKeyboard(std::uintptr_t user_data, std::chrono::nanoseconds ns_late);
-    void UpdateMotion(std::uintptr_t user_data, std::chrono::nanoseconds ns_late);
-
-private:
-    template <typename T>
-    void MakeController(HidController controller, u8* shared_memory) {
-        if constexpr (std::is_constructible_v<T, Core::System&, u8*>) {
-            controllers[static_cast<std::size_t>(controller)] =
-                std::make_unique<T>(system, shared_memory);
-        } else {
-            controllers[static_cast<std::size_t>(controller)] =
-                std::make_unique<T>(system.HIDCore(), shared_memory);
-        }
-    }
-
-    template <typename T>
-    void MakeControllerWithServiceContext(HidController controller, u8* shared_memory) {
-        controllers[static_cast<std::size_t>(controller)] =
-            std::make_unique<T>(system.HIDCore(), shared_memory, service_context);
-    }
-
-    bool is_initialized{false};
-    std::array<std::unique_ptr<ControllerBase>, static_cast<size_t>(HidController::MaxControllers)>
-        controllers{};
-
-    Core::System& system;
-    KernelHelpers::ServiceContext service_context;
-};
-
-class IAppletResource final : public ServiceFramework<IAppletResource> {
-public:
-    explicit IAppletResource(Core::System& system_, std::shared_ptr<ResourceManager> resource);
-    ~IAppletResource() override;
-
-private:
-    void GetSharedMemoryHandle(HLERequestContext& ctx);
-
-    std::shared_ptr<Core::Timing::EventType> npad_update_event;
-    std::shared_ptr<Core::Timing::EventType> default_update_event;
-    std::shared_ptr<Core::Timing::EventType> mouse_keyboard_update_event;
-    std::shared_ptr<Core::Timing::EventType> motion_update_event;
-};
-
-} // namespace Service::HID

src/core/hle/service/nvnflinger/ui/graphic_buffer.cpp

@@ -1,34 +0,0 @@
-// SPDX-FileCopyrightText: Copyright 2023 yuzu Emulator Project
-// SPDX-License-Identifier: GPL-3.0-or-later
-
-#include "core/hle/service/nvdrv/core/nvmap.h"
-#include "core/hle/service/nvnflinger/ui/graphic_buffer.h"
-
-namespace Service::android {
-
-static NvGraphicBuffer GetBuffer(std::shared_ptr<NvGraphicBuffer>& buffer) {
-    if (buffer) {
-        return *buffer;
-    } else {
-        return {};
-    }
-}
-
-GraphicBuffer::GraphicBuffer(u32 width_, u32 height_, PixelFormat format_, u32 usage_)
-    : NvGraphicBuffer(width_, height_, format_, usage_), m_nvmap(nullptr) {}
-
-GraphicBuffer::GraphicBuffer(Service::Nvidia::NvCore::NvMap& nvmap,
-                             std::shared_ptr<NvGraphicBuffer> buffer)
-    : NvGraphicBuffer(GetBuffer(buffer)), m_nvmap(std::addressof(nvmap)) {
-    if (this->BufferId() > 0) {
-        m_nvmap->DuplicateHandle(this->BufferId(), true);
-    }
-}
-
-GraphicBuffer::~GraphicBuffer() {
-    if (m_nvmap != nullptr && this->BufferId() > 0) {
-        m_nvmap->FreeHandle(this->BufferId(), true);
-    }
-}
-
-} // namespace Service::android

src/core/loader/deconstructed_rom_directory.cpp

@@ -8,11 +8,11 @@
 #include "core/file_sys/control_metadata.h"
 #include "core/file_sys/patch_manager.h"
 #include "core/file_sys/romfs_factory.h"
-#include "core/hle/kernel/k_page_table.h"
-#include "core/hle/kernel/k_process.h"
-#include "core/hle/service/filesystem/filesystem.h"
 #include "core/loader/deconstructed_rom_directory.h"
 #include "core/loader/nso.h"
+#include "kernel/k_page_table.h"
+#include "kernel/k_process.h"
+#include "service/filesystem/filesystem.h"
 
 namespace Loader {
 

src/core/loader/kip.cpp

@@ -4,11 +4,11 @@
 #include <cstring>
 #include "core/file_sys/kernel_executable.h"
 #include "core/file_sys/program_metadata.h"
-#include "core/hle/kernel/code_set.h"
-#include "core/hle/kernel/k_page_table.h"
-#include "core/hle/kernel/k_process.h"
 #include "core/loader/kip.h"
 #include "core/memory.h"
+#include "kernel/code_set.h"
+#include "kernel/k_page_table.h"
+#include "kernel/k_process.h"
 
 namespace Loader {
 

src/core/loader/loader.cpp

@@ -10,7 +10,6 @@
 #include "common/logging/log.h"
 #include "common/string_util.h"
 #include "core/core.h"
-#include "core/hle/kernel/k_process.h"
 #include "core/loader/deconstructed_rom_directory.h"
 #include "core/loader/kip.h"
 #include "core/loader/nax.h"
@@ -19,6 +18,7 @@
 #include "core/loader/nso.h"
 #include "core/loader/nsp.h"
 #include "core/loader/xci.h"
+#include "kernel/k_process.h"
 
 namespace Loader {
 

src/core/loader/nax.cpp

@@ -4,9 +4,9 @@
 #include "core/file_sys/content_archive.h"
 #include "core/file_sys/romfs.h"
 #include "core/file_sys/xts_archive.h"
-#include "core/hle/kernel/k_process.h"
 #include "core/loader/nax.h"
 #include "core/loader/nca.h"
+#include "kernel/k_process.h"
 
 namespace Loader {
 namespace {

src/core/loader/nca.cpp

@@ -10,11 +10,11 @@
 #include "core/file_sys/nca_metadata.h"
 #include "core/file_sys/registered_cache.h"
 #include "core/file_sys/romfs_factory.h"
-#include "core/hle/kernel/k_process.h"
-#include "core/hle/service/filesystem/filesystem.h"
 #include "core/loader/deconstructed_rom_directory.h"
 #include "core/loader/nca.h"
+#include "kernel/k_process.h"
 #include "mbedtls/sha256.h"
+#include "service/filesystem/filesystem.h"
 
 namespace Loader {
 

src/core/loader/nro.cpp

@@ -13,14 +13,14 @@
 #include "core/file_sys/control_metadata.h"
 #include "core/file_sys/romfs_factory.h"
 #include "core/file_sys/vfs_offset.h"
-#include "core/hle/kernel/code_set.h"
-#include "core/hle/kernel/k_page_table.h"
-#include "core/hle/kernel/k_process.h"
-#include "core/hle/kernel/k_thread.h"
-#include "core/hle/service/filesystem/filesystem.h"
 #include "core/loader/nro.h"
 #include "core/loader/nso.h"
 #include "core/memory.h"
+#include "kernel/code_set.h"
+#include "kernel/k_page_table.h"
+#include "kernel/k_process.h"
+#include "kernel/k_thread.h"
+#include "service/filesystem/filesystem.h"
 
 namespace Loader {
 

src/core/loader/nso.cpp

@@ -13,12 +13,12 @@
 #include "common/swap.h"
 #include "core/core.h"
 #include "core/file_sys/patch_manager.h"
-#include "core/hle/kernel/code_set.h"
-#include "core/hle/kernel/k_page_table.h"
-#include "core/hle/kernel/k_process.h"
-#include "core/hle/kernel/k_thread.h"
 #include "core/loader/nso.h"
 #include "core/memory.h"
+#include "kernel/code_set.h"
+#include "kernel/k_page_table.h"
+#include "kernel/k_process.h"
+#include "kernel/k_thread.h"
 
 namespace Loader {
 namespace {

src/core/loader/nsp.cpp

@@ -11,11 +11,11 @@
 #include "core/file_sys/patch_manager.h"
 #include "core/file_sys/registered_cache.h"
 #include "core/file_sys/submission_package.h"
-#include "core/hle/kernel/k_process.h"
-#include "core/hle/service/filesystem/filesystem.h"
 #include "core/loader/deconstructed_rom_directory.h"
 #include "core/loader/nca.h"
 #include "core/loader/nsp.h"
+#include "kernel/k_process.h"
+#include "service/filesystem/filesystem.h"
 
 namespace Loader {
 

src/core/loader/xci.cpp

@@ -11,10 +11,10 @@
 #include "core/file_sys/patch_manager.h"
 #include "core/file_sys/registered_cache.h"
 #include "core/file_sys/submission_package.h"
-#include "core/hle/kernel/k_process.h"
-#include "core/hle/service/filesystem/filesystem.h"
 #include "core/loader/nca.h"
 #include "core/loader/xci.h"
+#include "kernel/k_process.h"
+#include "service/filesystem/filesystem.h"
 
 namespace Loader {
 

src/core/memory.cpp

@@ -1,10 +1,8 @@
 // SPDX-FileCopyrightText: 2015 Citra Emulator Project
-// SPDX-FileCopyrightText: 2018 yuzu Emulator Project
 // SPDX-License-Identifier: GPL-2.0-or-later
 
 #include <algorithm>
 #include <cstring>
-#include <mutex>
 #include <span>
 
 #include "common/assert.h"
@@ -12,16 +10,15 @@
 #include "common/common_types.h"
 #include "common/logging/log.h"
 #include "common/page_table.h"
-#include "common/scope_exit.h"
 #include "common/settings.h"
 #include "common/swap.h"
 #include "core/core.h"
 #include "core/device_memory.h"
 #include "core/gpu_dirty_memory_manager.h"
 #include "core/hardware_properties.h"
-#include "core/hle/kernel/k_page_table.h"
-#include "core/hle/kernel/k_process.h"
 #include "core/memory.h"
+#include "kernel/k_page_table.h"
+#include "kernel/k_process.h"
 #include "video_core/gpu.h"
 #include "video_core/rasterizer_download_area.h"
 
@@ -321,7 +318,7 @@ struct Memory::Impl {
             [&](const Common::ProcessAddress current_vaddr, const std::size_t copy_amount,
                 u8* const host_ptr) {
                 if constexpr (!UNSAFE) {
-                    HandleRasterizerWrite(GetInteger(current_vaddr), copy_amount);
+                    system.GPU().InvalidateRegion(GetInteger(current_vaddr), copy_amount);
                 }
                 std::memcpy(host_ptr, src_buffer, copy_amount);
             },
@@ -354,7 +351,7 @@ struct Memory::Impl {
             },
             [&](const Common::ProcessAddress current_vaddr, const std::size_t copy_amount,
                 u8* const host_ptr) {
-                HandleRasterizerWrite(GetInteger(current_vaddr), copy_amount);
+                system.GPU().InvalidateRegion(GetInteger(current_vaddr), copy_amount);
                 std::memset(host_ptr, 0, copy_amount);
             },
             [](const std::size_t copy_amount) {});
@@ -423,7 +420,7 @@ struct Memory::Impl {
                                  const std::size_t block_size) {
             // dc cvac: Store to point of coherency
             // CPU flush -> GPU invalidate
-            HandleRasterizerWrite(GetInteger(current_vaddr), block_size);
+            system.GPU().InvalidateRegion(GetInteger(current_vaddr), block_size);
         };
         return PerformCacheOperation(dest_addr, size, on_rasterizer);
     }
@@ -433,7 +430,7 @@ struct Memory::Impl {
                                  const std::size_t block_size) {
             // dc civac: Store to point of coherency, and invalidate from cache
             // CPU flush -> GPU invalidate
-            HandleRasterizerWrite(GetInteger(current_vaddr), block_size);
+            system.GPU().InvalidateRegion(GetInteger(current_vaddr), block_size);
         };
         return PerformCacheOperation(dest_addr, size, on_rasterizer);
     }
@@ -770,18 +767,7 @@ struct Memory::Impl {
     }
 
     void HandleRasterizerWrite(VAddr address, size_t size) {
-        constexpr size_t sys_core = Core::Hardware::NUM_CPU_CORES - 1;
-        const size_t core = std::min(system.GetCurrentHostThreadID(),
-                                     sys_core); // any other calls threads go to syscore.
-        // Guard on sys_core;
-        if (core == sys_core) [[unlikely]] {
-            sys_core_guard.lock();
-        }
-        SCOPE_EXIT({
-            if (core == sys_core) [[unlikely]] {
-                sys_core_guard.unlock();
-            }
-        });
+        const size_t core = system.GetCurrentHostThreadID();
         auto& current_area = rasterizer_write_areas[core];
         VAddr subaddress = address >> YUZU_PAGEBITS;
         bool do_collection = current_area.last_address == subaddress;
@@ -813,7 +799,6 @@ struct Memory::Impl {
         rasterizer_read_areas{};
     std::array<GPUDirtyState, Core::Hardware::NUM_CPU_CORES> rasterizer_write_areas{};
     std::span<Core::GPUDirtyMemoryManager> gpu_dirty_managers;
-    std::mutex sys_core_guard;
 };
 
 Memory::Memory(Core::System& system_) : system{system_} {

src/core/memory.h

@@ -12,7 +12,7 @@
 
 #include "common/scratch_buffer.h"
 #include "common/typed_address.h"
-#include "core/hle/result.h"
+#include "core/result.h"
 
 namespace Common {
 struct PageTable;

src/core/memory/cheat_engine.cpp

@@ -7,14 +7,13 @@
 #include "common/swap.h"
 #include "core/core.h"
 #include "core/core_timing.h"
-#include "core/hle/kernel/k_page_table.h"
-#include "core/hle/kernel/k_process.h"
-#include "core/hle/service/hid/controllers/npad.h"
-#include "core/hle/service/hid/hid_server.h"
-#include "core/hle/service/hid/resource_manager.h"
-#include "core/hle/service/sm/sm.h"
 #include "core/memory.h"
 #include "core/memory/cheat_engine.h"
+#include "kernel/k_page_table.h"
+#include "kernel/k_process.h"
+#include "service/hid/controllers/npad.h"
+#include "service/hid/hid.h"
+#include "service/sm/sm.h"
 
 namespace Core::Memory {
 namespace {
@@ -55,13 +54,13 @@ void StandardVmCallbacks::MemoryWrite(VAddr address, const void* data, u64 size)
 }
 
 u64 StandardVmCallbacks::HidKeysDown() {
-    const auto hid = system.ServiceManager().GetService<Service::HID::IHidServer>("hid");
+    const auto hid = system.ServiceManager().GetService<Service::HID::Hid>("hid");
     if (hid == nullptr) {
         LOG_WARNING(CheatEngine, "Attempted to read input state, but hid is not initialized!");
         return 0;
     }
 
-    const auto applet_resource = hid->GetResourceManager();
+    const auto applet_resource = hid->GetAppletResource();
     if (applet_resource == nullptr) {
         LOG_WARNING(CheatEngine,
                     "Attempted to read input state, but applet resource is not initialized!");

src/core/precompiled_headers.h

@@ -8,4 +8,4 @@
 
 #include "common/common_precompiled_headers.h"
 
-#include "core/hle/kernel/k_process.h"
+#include "kernel/k_process.h"

src/core/reporter.cpp

@@ -17,12 +17,12 @@
 #include "common/settings.h"
 #include "core/arm/arm_interface.h"
 #include "core/core.h"
-#include "core/hle/kernel/k_page_table.h"
-#include "core/hle/kernel/k_process.h"
-#include "core/hle/result.h"
-#include "core/hle/service/hle_ipc.h"
 #include "core/memory.h"
 #include "core/reporter.h"
+#include "core/result.h"
+#include "kernel/k_page_table.h"
+#include "kernel/k_process.h"
+#include "service/hle_ipc.h"
 
 namespace {