Android #179

.github/workflows/android-merge.js

@@ -10,7 +10,7 @@ const CHANGE_LABEL = 'android-merge';
 // how far back in time should we consider the changes are "recent"? (default: 24 hours)
 const DETECTION_TIME_FRAME = (parseInt(process.env.DETECTION_TIME_FRAME)) || (24 * 3600 * 1000);
 
-async function checkBaseChanges(github) {
+async function checkBaseChanges(github, context) {
     // query the commit date of the latest commit on this branch
     const query = `query($owner:String!, $name:String!, $ref:String!) {
         repository(name:$name, owner:$owner) {
@@ -22,8 +22,8 @@ async function checkBaseChanges(github) {
         }
     }`;
     const variables = {
-        owner: 'yuzu-emu',
-        name: 'yuzu',
+        owner: context.repo.owner,
+        name: context.repo.repo,
         ref: 'refs/heads/master',
     };
     const result = await github.graphql(query, variables);
@@ -38,8 +38,8 @@ async function checkBaseChanges(github) {
     return false;
 }
 
-async function checkAndroidChanges(github) {
-    if (checkBaseChanges(github)) return true;
+async function checkAndroidChanges(github, context) {
+    if (checkBaseChanges(github, context)) return true;
     const query = `query($owner:String!, $name:String!, $label:String!) {
         repository(name:$name, owner:$owner) {
             pullRequests(labels: [$label], states: OPEN, first: 100) {
@@ -48,8 +48,8 @@ async function checkAndroidChanges(github) {
         }
     }`;
     const variables = {
-        owner: 'yuzu-emu',
-        name: 'yuzu',
+        owner: context.repo.owner,
+        name: context.repo.repo,
         label: CHANGE_LABEL,
     };
     const result = await github.graphql(query, variables);
@@ -90,8 +90,8 @@ async function tagAndPush(github, owner, repo, execa, commit=false) {
     console.log(`New tag: ${newTag}`);
     if (commit) {
         let channelName = channel[0].toUpperCase() + channel.slice(1);
-        console.info(`Committing pending commit as ${channelName} ${tagNumber + 1}`);
-        await execa("git", ['commit', '-m', `${channelName} ${tagNumber + 1}`]);
+        console.info(`Committing pending commit as ${channelName} #${tagNumber + 1}`);
+        await execa("git", ['commit', '-m', `${channelName} #${tagNumber + 1}`]);
     }
     console.info('Pushing tags to GitHub ...');
     await execa("git", ['tag', newTag]);
@@ -157,7 +157,7 @@ async function mergePullRequests(pulls, execa) {
             process1.stdout.pipe(process.stdout);
             await process1;
 
-            const process2 = execa("git", ["commit", "-m", `Merge yuzu-emu#${pr}`]);
+            const process2 = execa("git", ["commit", "-m", `Merge PR ${pr}`]);
             process2.stdout.pipe(process.stdout);
             await process2;
 
@@ -182,30 +182,7 @@ async function mergePullRequests(pulls, execa) {
     return mergeResults;
 }
 
-async function resetBranch(execa) {
-    console.log("::group::Reset master branch");
-    let hasFailed = false;
-    try {
-        await execa("git", ["remote", "add", "source", "https://github.com/yuzu-emu/yuzu.git"]);
-        await execa("git", ["fetch", "source"]);
-        const process1 = await execa("git", ["rev-parse", "source/master"]);
-        const headCommit = process1.stdout;
-
-        await execa("git", ["reset", "--hard", headCommit]);
-    } catch (err) {
-        console.log(`::error title=Failed to reset master branch`);
-        hasFailed = true;
-    }
-    console.log("::endgroup::");
-    if (hasFailed) {
-        throw 'Failed to reset the master branch. Aborting!';
-    }
-}
-
 async function mergebot(github, context, execa) {
-    // Reset our local copy of master to what appears on yuzu-emu/yuzu - master
-    await resetBranch(execa);
-
     const query = `query ($owner:String!, $name:String!, $label:String!) {
         repository(name:$name, owner:$owner) {
             pullRequests(labels: [$label], states: OPEN, first: 100) {
@@ -216,8 +193,8 @@ async function mergebot(github, context, execa) {
         }
     }`;
     const variables = {
-        owner: 'yuzu-emu',
-        name: 'yuzu',
+        owner: context.repo.owner,
+        name: context.repo.repo,
         label: CHANGE_LABEL,
     };
     const result = await github.graphql(query, variables);
@@ -232,7 +209,7 @@ async function mergebot(github, context, execa) {
     await fetchPullRequests(pulls, "https://github.com/yuzu-emu/yuzu", execa);
     const mergeResults = await mergePullRequests(pulls, execa);
     await generateReadme(pulls, context, mergeResults, execa);
-    await tagAndPush(github, 'yuzu-emu', `yuzu-android`, execa, true);
+    await tagAndPush(github, context.repo.owner, `${context.repo.repo}-android`, execa, true);
 }
 
 module.exports.mergebot = mergebot;

.github/workflows/android-publish.yml

@@ -16,7 +16,7 @@ on:
 jobs:
   android:
     runs-on: ubuntu-latest
-    if: ${{ github.event.inputs.android != 'false' && github.repository == 'yuzu-emu/yuzu-android' }}
+    if: ${{ github.event.inputs.android != 'false' && github.repository == 'yuzu-emu/yuzu' }}
     steps:
       # this checkout is required to make sure the GitHub Actions scripts are available
       - uses: actions/checkout@v3
@@ -33,7 +33,7 @@ jobs:
           script: |
             if (context.payload.inputs && context.payload.inputs.android === 'true') return true;
             const checkAndroidChanges = require('./.github/workflows/android-merge.js').checkAndroidChanges;
-            return checkAndroidChanges(github);
+            return checkAndroidChanges(github, context);
       - run: npm install execa@5
         if: ${{ steps.check-changes.outputs.result == 'true' }}
       - uses: actions/checkout@v3

README.md

@@ -1,7 +1,5 @@
 | Pull Request | Commit | Title | Author | Merged? |
 |----|----|----|----|----|
-| [12560](https://github.com/yuzu-emu/yuzu-android//pull/12560) | [`e5de3d5a7`](https://github.com/yuzu-emu/yuzu-android//pull/12560/files) | android: add basic support for google game dashboard | [GayPotatoEmma](https://github.com/GayPotatoEmma/) | Yes |
-| [12576](https://github.com/yuzu-emu/yuzu-android//pull/12576) | [`53d4dbacf`](https://github.com/yuzu-emu/yuzu-android//pull/12576/files) | android: Re-add global save manager | [t895](https://github.com/t895/) | Yes |
 
 
 End of merge log. You can find the original README.md below the break.

src/CMakeLists.txt

@@ -185,7 +185,6 @@ add_subdirectory(common)
 add_subdirectory(core)
 add_subdirectory(audio_core)
 add_subdirectory(video_core)
-add_subdirectory(hid_core)
 add_subdirectory(network)
 add_subdirectory(input_common)
 add_subdirectory(frontend_common)

src/android/app/src/main/AndroidManifest.xml

@@ -31,9 +31,6 @@ SPDX-License-Identifier: GPL-3.0-or-later
         android:dataExtractionRules="@xml/data_extraction_rules_api_31"
         android:enableOnBackInvokedCallback="true">
 
-        <meta-data android:name="android.game_mode_config"
-            android:resource="@xml/game_mode_config" />
-
         <activity
             android:name="org.yuzu.yuzu_emu.ui.main.MainActivity"
             android:exported="true"

src/android/app/src/main/java/org/yuzu/yuzu_emu/NativeLibrary.kt

@@ -547,15 +547,6 @@ object NativeLibrary {
      */
     external fun getSavePath(programId: String): String
 
-    /**
-     * Gets the root save directory for the default profile as either
-     * /user/save/account/<user id raw string> or /user/save/000...000/<user id>
-     *
-     * @param future If true, returns the /user/save/account/... directory
-     * @return Save data path that may not exist yet
-     */
-    external fun getDefaultProfileSaveDataRoot(future: Boolean): String
-
     /**
      * Adds a file to the manual filesystem provider in our EmulationSession instance
      * @param path Path to the file we're adding. Can be a string representation of a [Uri] or

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

@@ -79,18 +79,7 @@ object Settings {
     const val PREF_THEME_MODE = "ThemeMode"
     const val PREF_BLACK_BACKGROUNDS = "BlackBackgrounds"
 
-    enum class EmulationOrientation(val int: Int) {
-        Unspecified(0),
-        SensorLandscape(5),
-        Landscape(1),
-        ReverseLandscape(2),
-        SensorPortrait(6),
-        Portrait(4),
-        ReversePortrait(3);
-
-        companion object {
-            fun from(int: Int): EmulationOrientation =
-                entries.firstOrNull { it.int == int } ?: Unspecified
-        }
-    }
+    const val LayoutOption_Unspecified = 0
+    const val LayoutOption_MobilePortrait = 4
+    const val LayoutOption_MobileLandscape = 5
 }

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

@@ -149,7 +149,7 @@ class AddonsFragment : Fragment() {
             }
 
             val isValid = externalAddonDirectory.listFiles()
-                .any { AddonUtil.validAddonDirectories.contains(it.name?.lowercase()) }
+                .any { AddonUtil.validAddonDirectories.contains(it.name) }
             val errorMessage = MessageDialogFragment.newInstance(
                 requireActivity(),
                 titleId = R.string.invalid_directory,

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

@@ -50,7 +50,6 @@ import org.yuzu.yuzu_emu.databinding.FragmentEmulationBinding
 import org.yuzu.yuzu_emu.features.settings.model.BooleanSetting
 import org.yuzu.yuzu_emu.features.settings.model.IntSetting
 import org.yuzu.yuzu_emu.features.settings.model.Settings
-import org.yuzu.yuzu_emu.features.settings.model.Settings.EmulationOrientation
 import org.yuzu.yuzu_emu.features.settings.utils.SettingsFile
 import org.yuzu.yuzu_emu.model.DriverViewModel
 import org.yuzu.yuzu_emu.model.Game
@@ -100,7 +99,6 @@ class EmulationFragment : Fragment(), SurfaceHolder.Callback {
      */
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
-        updateOrientation()
 
         val intentUri: Uri? = requireActivity().intent.data
         var intentGame: Game? = null
@@ -460,23 +458,13 @@ class EmulationFragment : Fragment(), SurfaceHolder.Callback {
     @SuppressLint("SourceLockedOrientationActivity")
     private fun updateOrientation() {
         emulationActivity?.let {
-            val orientationSetting =
-                EmulationOrientation.from(IntSetting.RENDERER_SCREEN_LAYOUT.getInt())
-            it.requestedOrientation = when (orientationSetting) {
-                EmulationOrientation.Unspecified -> ActivityInfo.SCREEN_ORIENTATION_UNSPECIFIED
-                EmulationOrientation.SensorLandscape ->
+            it.requestedOrientation = when (IntSetting.RENDERER_SCREEN_LAYOUT.getInt()) {
+                Settings.LayoutOption_MobileLandscape ->
                     ActivityInfo.SCREEN_ORIENTATION_SENSOR_LANDSCAPE
-
-                EmulationOrientation.Landscape -> ActivityInfo.SCREEN_ORIENTATION_LANDSCAPE
-                EmulationOrientation.ReverseLandscape ->
-                    ActivityInfo.SCREEN_ORIENTATION_REVERSE_LANDSCAPE
-
-                EmulationOrientation.SensorPortrait ->
-                    ActivityInfo.SCREEN_ORIENTATION_SENSOR_PORTRAIT
-
-                EmulationOrientation.Portrait -> ActivityInfo.SCREEN_ORIENTATION_PORTRAIT
-                EmulationOrientation.ReversePortrait ->
-                    ActivityInfo.SCREEN_ORIENTATION_REVERSE_PORTRAIT
+                Settings.LayoutOption_MobilePortrait ->
+                    ActivityInfo.SCREEN_ORIENTATION_USER_PORTRAIT
+                Settings.LayoutOption_Unspecified -> ActivityInfo.SCREEN_ORIENTATION_UNSPECIFIED
+                else -> ActivityInfo.SCREEN_ORIENTATION_SENSOR_LANDSCAPE
             }
         }
     }
@@ -663,7 +651,7 @@ class EmulationFragment : Fragment(), SurfaceHolder.Callback {
     @SuppressLint("SourceLockedOrientationActivity")
     private fun startConfiguringControls() {
         // Lock the current orientation to prevent editing inconsistencies
-        if (IntSetting.RENDERER_SCREEN_LAYOUT.getInt() == EmulationOrientation.Unspecified.int) {
+        if (IntSetting.RENDERER_SCREEN_LAYOUT.getInt() == Settings.LayoutOption_Unspecified) {
             emulationActivity?.let {
                 it.requestedOrientation =
                     if (resources.configuration.orientation == Configuration.ORIENTATION_PORTRAIT) {
@@ -681,7 +669,7 @@ class EmulationFragment : Fragment(), SurfaceHolder.Callback {
         binding.doneControlConfig.visibility = View.GONE
         binding.surfaceInputOverlay.setIsInEditMode(false)
         // Unlock the orientation if it was locked for editing
-        if (IntSetting.RENDERER_SCREEN_LAYOUT.getInt() == EmulationOrientation.Unspecified.int) {
+        if (IntSetting.RENDERER_SCREEN_LAYOUT.getInt() == Settings.LayoutOption_Unspecified) {
             emulationActivity?.let {
                 it.requestedOrientation = ActivityInfo.SCREEN_ORIENTATION_UNSPECIFIED
             }

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

@@ -445,8 +445,7 @@ class GamePropertiesFragment : Fragment() {
             val zipResult = FileUtil.zipFromInternalStorage(
                 File(saveLocation),
                 saveLocation.replaceAfterLast("/", ""),
-                BufferedOutputStream(requireContext().contentResolver.openOutputStream(result)),
-                compression = false
+                BufferedOutputStream(requireContext().contentResolver.openOutputStream(result))
             )
             return@newInstance when (zipResult) {
                 TaskState.Completed -> getString(R.string.export_success)

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

@@ -7,39 +7,20 @@ import android.os.Bundle
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
-import android.widget.Toast
-import androidx.activity.result.contract.ActivityResultContracts
 import androidx.core.view.ViewCompat
 import androidx.core.view.WindowInsetsCompat
 import androidx.core.view.updatePadding
 import androidx.fragment.app.Fragment
 import androidx.fragment.app.activityViewModels
-import androidx.lifecycle.Lifecycle
-import androidx.lifecycle.lifecycleScope
-import androidx.lifecycle.repeatOnLifecycle
 import androidx.navigation.findNavController
 import androidx.recyclerview.widget.GridLayoutManager
 import com.google.android.material.transition.MaterialSharedAxis
-import kotlinx.coroutines.Dispatchers
-import kotlinx.coroutines.launch
-import kotlinx.coroutines.withContext
-import org.yuzu.yuzu_emu.NativeLibrary
 import org.yuzu.yuzu_emu.R
-import org.yuzu.yuzu_emu.YuzuApplication
 import org.yuzu.yuzu_emu.adapters.InstallableAdapter
 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.model.TaskState
 import org.yuzu.yuzu_emu.ui.main.MainActivity
-import org.yuzu.yuzu_emu.utils.DirectoryInitialization
-import org.yuzu.yuzu_emu.utils.FileUtil
-import java.io.BufferedInputStream
-import java.io.BufferedOutputStream
-import java.io.File
-import java.math.BigInteger
-import java.time.LocalDateTime
-import java.time.format.DateTimeFormatter
 
 class InstallableFragment : Fragment() {
     private var _binding: FragmentInstallablesBinding? = null
@@ -75,17 +56,6 @@ class InstallableFragment : Fragment() {
             binding.root.findNavController().popBackStack()
         }
 
-        viewLifecycleOwner.lifecycleScope.launch {
-            repeatOnLifecycle(Lifecycle.State.CREATED) {
-                homeViewModel.openImportSaves.collect {
-                    if (it) {
-                        importSaves.launch(arrayOf("application/zip"))
-                        homeViewModel.setOpenImportSaves(false)
-                    }
-                }
-            }
-        }
-
         val installables = listOf(
             Installable(
                 R.string.user_data,
@@ -93,43 +63,6 @@ class InstallableFragment : Fragment() {
                 install = { mainActivity.importUserData.launch(arrayOf("application/zip")) },
                 export = { mainActivity.exportUserData.launch("export.zip") }
             ),
-            Installable(
-                R.string.manage_save_data,
-                R.string.manage_save_data_description,
-                install = {
-                    MessageDialogFragment.newInstance(
-                        requireActivity(),
-                        titleId = R.string.import_save_warning,
-                        descriptionId = R.string.import_save_warning_description,
-                        positiveAction = { homeViewModel.setOpenImportSaves(true) }
-                    ).show(parentFragmentManager, MessageDialogFragment.TAG)
-                },
-                export = {
-                    val oldSaveDataFolder = File(
-                        "${DirectoryInitialization.userDirectory}/nand" +
-                            NativeLibrary.getDefaultProfileSaveDataRoot(false)
-                    )
-                    val futureSaveDataFolder = File(
-                        "${DirectoryInitialization.userDirectory}/nand" +
-                            NativeLibrary.getDefaultProfileSaveDataRoot(true)
-                    )
-                    if (!oldSaveDataFolder.exists() && !futureSaveDataFolder.exists()) {
-                        Toast.makeText(
-                            YuzuApplication.appContext,
-                            R.string.no_save_data_found,
-                            Toast.LENGTH_SHORT
-                        ).show()
-                        return@Installable
-                    } else {
-                        exportSaves.launch(
-                            "${getString(R.string.save_data)} " +
-                                LocalDateTime.now().format(
-                                    DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm")
-                                )
-                        )
-                    }
-                }
-            ),
             Installable(
                 R.string.install_game_content,
                 R.string.install_game_content_description,
@@ -188,156 +121,4 @@ class InstallableFragment : Fragment() {
 
             windowInsets
         }
-
-    private val importSaves =
-        registerForActivityResult(ActivityResultContracts.OpenDocument()) { result ->
-            if (result == null) {
-                return@registerForActivityResult
-            }
-
-            val inputZip = requireContext().contentResolver.openInputStream(result)
-            val cacheSaveDir = File("${requireContext().cacheDir.path}/saves/")
-            cacheSaveDir.mkdir()
-
-            if (inputZip == null) {
-                Toast.makeText(
-                    YuzuApplication.appContext,
-                    getString(R.string.fatal_error),
-                    Toast.LENGTH_LONG
-                ).show()
-                return@registerForActivityResult
-            }
-
-            IndeterminateProgressDialogFragment.newInstance(
-                requireActivity(),
-                R.string.save_files_importing,
-                false
-            ) {
-                try {
-                    FileUtil.unzipToInternalStorage(BufferedInputStream(inputZip), cacheSaveDir)
-                    val files = cacheSaveDir.listFiles()
-                    var successfulImports = 0
-                    var failedImports = 0
-                    if (files != null) {
-                        for (file in files) {
-                            if (file.isDirectory) {
-                                val baseSaveDir =
-                                    NativeLibrary.getSavePath(BigInteger(file.name, 16).toString())
-                                if (baseSaveDir.isEmpty()) {
-                                    failedImports++
-                                    continue
-                                }
-
-                                val internalSaveFolder = File(
-                                    "${DirectoryInitialization.userDirectory}/nand$baseSaveDir"
-                                )
-                                internalSaveFolder.deleteRecursively()
-                                internalSaveFolder.mkdir()
-                                file.copyRecursively(target = internalSaveFolder, overwrite = true)
-                                successfulImports++
-                            }
-                        }
-                    }
-
-                    withContext(Dispatchers.Main) {
-                        if (successfulImports == 0) {
-                            MessageDialogFragment.newInstance(
-                                requireActivity(),
-                                titleId = R.string.save_file_invalid_zip_structure,
-                                descriptionId = R.string.save_file_invalid_zip_structure_description
-                            ).show(parentFragmentManager, MessageDialogFragment.TAG)
-                            return@withContext
-                        }
-                        val successString = if (failedImports > 0) {
-                            """
-                            ${
-                            requireContext().resources.getQuantityString(
-                                R.plurals.saves_import_success,
-                                successfulImports,
-                                successfulImports
-                            )
-                            }
-                            ${
-                            requireContext().resources.getQuantityString(
-                                R.plurals.saves_import_failed,
-                                failedImports,
-                                failedImports
-                            )
-                            }
-                            """
-                        } else {
-                            requireContext().resources.getQuantityString(
-                                R.plurals.saves_import_success,
-                                successfulImports,
-                                successfulImports
-                            )
-                        }
-                        MessageDialogFragment.newInstance(
-                            requireActivity(),
-                            titleId = R.string.import_complete,
-                            descriptionString = successString
-                        ).show(parentFragmentManager, MessageDialogFragment.TAG)
-                    }
-
-                    cacheSaveDir.deleteRecursively()
-                } catch (e: Exception) {
-                    Toast.makeText(
-                        YuzuApplication.appContext,
-                        getString(R.string.fatal_error),
-                        Toast.LENGTH_LONG
-                    ).show()
-                }
-            }.show(parentFragmentManager, IndeterminateProgressDialogFragment.TAG)
-        }
-
-    private val exportSaves = registerForActivityResult(
-        ActivityResultContracts.CreateDocument("application/zip")
-    ) { result ->
-        if (result == null) {
-            return@registerForActivityResult
-        }
-
-        IndeterminateProgressDialogFragment.newInstance(
-            requireActivity(),
-            R.string.save_files_exporting,
-            false
-        ) {
-            val cacheSaveDir = File("${requireContext().cacheDir.path}/saves/")
-            cacheSaveDir.mkdir()
-
-            val oldSaveDataFolder = File(
-                "${DirectoryInitialization.userDirectory}/nand" +
-                    NativeLibrary.getDefaultProfileSaveDataRoot(false)
-            )
-            if (oldSaveDataFolder.exists()) {
-                oldSaveDataFolder.copyRecursively(cacheSaveDir)
-            }
-
-            val futureSaveDataFolder = File(
-                "${DirectoryInitialization.userDirectory}/nand" +
-                    NativeLibrary.getDefaultProfileSaveDataRoot(true)
-            )
-            if (futureSaveDataFolder.exists()) {
-                futureSaveDataFolder.copyRecursively(cacheSaveDir)
-            }
-
-            val saveFilesTotal = cacheSaveDir.listFiles()?.size ?: 0
-            if (saveFilesTotal == 0) {
-                cacheSaveDir.deleteRecursively()
-                return@newInstance getString(R.string.no_save_data_found)
-            }
-
-            val zipResult = FileUtil.zipFromInternalStorage(
-                cacheSaveDir,
-                cacheSaveDir.path,
-                BufferedOutputStream(requireContext().contentResolver.openOutputStream(result))
-            )
-            cacheSaveDir.deleteRecursively()
-
-            return@newInstance when (zipResult) {
-                TaskState.Completed -> getString(R.string.export_success)
-                TaskState.Cancelled, TaskState.Failed -> getString(R.string.export_failed)
-            }
-        }.show(parentFragmentManager, IndeterminateProgressDialogFragment.TAG)
-    }
 }

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

@@ -167,14 +167,13 @@ class GamesViewModel : ViewModel() {
             }
         }
 
-    fun onCloseGameFoldersFragment() {
-        NativeConfig.saveGlobalConfig()
+    fun onCloseGameFoldersFragment() =
         viewModelScope.launch {
             withContext(Dispatchers.IO) {
+                NativeConfig.saveGlobalConfig()
                 getGameDirs(true)
             }
         }
-    }
 
     private fun getGameDirs(reloadList: Boolean = false) {
         val gameDirs = NativeConfig.getGameDirs()

src/android/app/src/main/java/org/yuzu/yuzu_emu/overlay/InputOverlay.kt

@@ -30,6 +30,7 @@ import org.yuzu.yuzu_emu.NativeLibrary.StickType
 import org.yuzu.yuzu_emu.R
 import org.yuzu.yuzu_emu.features.settings.model.BooleanSetting
 import org.yuzu.yuzu_emu.features.settings.model.IntSetting
+import org.yuzu.yuzu_emu.features.settings.model.Settings
 import org.yuzu.yuzu_emu.overlay.model.OverlayControl
 import org.yuzu.yuzu_emu.overlay.model.OverlayControlData
 import org.yuzu.yuzu_emu.overlay.model.OverlayLayout
@@ -301,7 +302,7 @@ class InputOverlay(context: Context, attrs: AttributeSet?) :
                 MotionEvent.ACTION_POINTER_UP -> if (dpadBeingConfigured === dpad) {
                     // Persist button position by saving new place.
                     saveControlPosition(
-                        OverlayControl.COMBINED_DPAD.id,
+                        Settings.PREF_BUTTON_DPAD,
                         dpadBeingConfigured!!.bounds.centerX(),
                         dpadBeingConfigured!!.bounds.centerY(),
                         layout

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

@@ -625,8 +625,7 @@ class MainActivity : AppCompatActivity(), ThemeProvider {
                 File(DirectoryInitialization.userDirectory!!),
                 DirectoryInitialization.userDirectory!!,
                 BufferedOutputStream(contentResolver.openOutputStream(result)),
-                taskViewModel.cancelled,
-                compression = false
+                taskViewModel.cancelled
             )
             return@newInstance when (zipResult) {
                 TaskState.Completed -> getString(R.string.user_data_export_success)

src/android/app/src/main/java/org/yuzu/yuzu_emu/utils/FileUtil.kt

@@ -21,7 +21,6 @@ import org.yuzu.yuzu_emu.model.TaskState
 import java.io.BufferedOutputStream
 import java.lang.NullPointerException
 import java.nio.charset.StandardCharsets
-import java.util.zip.Deflater
 import java.util.zip.ZipOutputStream
 import kotlin.IllegalStateException
 
@@ -313,23 +312,15 @@ object FileUtil {
      * @param inputFile File representation of the item that will be zipped
      * @param rootDir Directory containing the inputFile
      * @param outputStream Stream where the zip file will be output
-     * @param cancelled [StateFlow] that reports whether this process has been cancelled
-     * @param compression Disables compression if true
      */
     fun zipFromInternalStorage(
         inputFile: File,
         rootDir: String,
         outputStream: BufferedOutputStream,
-        cancelled: StateFlow<Boolean>? = null,
-        compression: Boolean = true
+        cancelled: StateFlow<Boolean>? = null
     ): TaskState {
         try {
             ZipOutputStream(outputStream).use { zos ->
-                if (!compression) {
-                    zos.setMethod(ZipOutputStream.DEFLATED)
-                    zos.setLevel(Deflater.NO_COMPRESSION)
-                }
-
                 inputFile.walkTopDown().forEach { file ->
                     if (cancelled?.value == true) {
                         return TaskState.Cancelled
@@ -347,7 +338,6 @@ object FileUtil {
                 }
             }
         } catch (e: Exception) {
-            Log.error("[FileUtil] Failed creating zip file - ${e.message}")
             return TaskState.Failed
         }
         return TaskState.Completed

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

@@ -14,6 +14,12 @@ AndroidConfig::AndroidConfig(const std::string& config_name, ConfigType config_t
     }
 }
 
+AndroidConfig::~AndroidConfig() {
+    if (global) {
+        AndroidConfig::SaveAllValues();
+    }
+}
+
 void AndroidConfig::ReloadAllValues() {
     Reload();
     ReadAndroidValues();

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

@@ -9,6 +9,7 @@ class AndroidConfig final : public Config {
 public:
     explicit AndroidConfig(const std::string& config_name = "config",
                            ConfigType config_type = ConfigType::GlobalConfig);
+    ~AndroidConfig() override;
 
     void ReloadAllValues() override;
     void SaveAllValues() override;

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

@@ -45,15 +45,15 @@
 #include "core/frontend/applets/profile_select.h"
 #include "core/frontend/applets/software_keyboard.h"
 #include "core/frontend/applets/web_browser.h"
+#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 "frontend_common/config.h"
-#include "hid_core/frontend/emulated_controller.h"
-#include "hid_core/hid_core.h"
-#include "hid_core/hid_types.h"
 #include "jni/android_common/android_common.h"
 #include "jni/id_cache.h"
 #include "jni/native.h"
@@ -862,9 +862,6 @@ jobjectArray Java_org_yuzu_yuzu_1emu_NativeLibrary_getAddonsForFile(JNIEnv* env,
 jstring Java_org_yuzu_yuzu_1emu_NativeLibrary_getSavePath(JNIEnv* env, jobject jobj,
                                                           jstring jprogramId) {
     auto program_id = EmulationSession::GetProgramId(env, jprogramId);
-    if (program_id == 0) {
-        return ToJString(env, "");
-    }
 
     auto& system = EmulationSession::GetInstance().System();
 
@@ -883,19 +880,6 @@ jstring Java_org_yuzu_yuzu_1emu_NativeLibrary_getSavePath(JNIEnv* env, jobject j
     return ToJString(env, user_save_data_path);
 }
 
-jstring Java_org_yuzu_yuzu_1emu_NativeLibrary_getDefaultProfileSaveDataRoot(JNIEnv* env,
-                                                                            jobject jobj,
-                                                                            jboolean jfuture) {
-    Service::Account::ProfileManager manager;
-    // TODO: Pass in a selected user once we get the relevant UI working
-    const auto user_id = manager.GetUser(static_cast<std::size_t>(0));
-    ASSERT(user_id);
-
-    const auto user_save_data_root =
-        FileSys::SaveDataFactory::GetUserGameSaveDataRoot(user_id->AsU128(), jfuture);
-    return ToJString(env, user_save_data_root);
-}
-
 void Java_org_yuzu_yuzu_1emu_NativeLibrary_addFileToFilesystemProvider(JNIEnv* env, jobject jobj,
                                                                        jstring jpath) {
     EmulationSession::GetInstance().ConfigureFilesystemProvider(GetJString(env, jpath));

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

@@ -118,23 +118,15 @@
     </integer-array>
 
     <string-array name="rendererScreenLayoutNames">
-        <item>@string/screen_layout_auto</item>
-        <item>@string/screen_layout_sensor_landscape</item>
         <item>@string/screen_layout_landscape</item>
-        <item>@string/screen_layout_reverse_landscape</item>
-        <item>@string/screen_layout_sensor_portrait</item>
         <item>@string/screen_layout_portrait</item>
-        <item>@string/screen_layout_reverse_portrait</item>
+        <item>@string/screen_layout_auto</item>
     </string-array>
 
     <integer-array name="rendererScreenLayoutValues">
-        <item>0</item>
         <item>5</item>
-        <item>1</item>
-        <item>2</item>
-        <item>6</item>
         <item>4</item>
-        <item>3</item>
+        <item>0</item>
     </integer-array>
 
     <string-array name="rendererAspectRatioNames">

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

@@ -133,15 +133,6 @@
     <string name="add_game_folder">Add game folder</string>
     <string name="folder_already_added">This folder was already added!</string>
     <string name="game_folder_properties">Game folder properties</string>
-    <plurals name="saves_import_failed">
-        <item quantity="one">Failed to import %d save</item>
-        <item quantity="other">Failed to import %d saves</item>
-    </plurals>
-    <plurals name="saves_import_success">
-        <item quantity="one">Successfully imported %d save</item>
-        <item quantity="other">Successfully imported %d saves</item>
-    </plurals>
-    <string name="no_save_data_found">No save data found</string>
 
     <!-- Applet launcher strings -->
     <string name="applets">Applet launcher</string>
@@ -285,7 +276,6 @@
     <string name="global">Global</string>
     <string name="custom">Custom</string>
     <string name="notice">Notice</string>
-    <string name="import_complete">Import complete</string>
 
     <!-- GPU driver installation -->
     <string name="select_gpu_driver">Select GPU driver</string>
@@ -473,13 +463,9 @@
     <string name="anti_aliasing_smaa">SMAA</string>
 
     <!-- Screen Layouts -->
-    <string name="screen_layout_auto">Auto</string>
-    <string name="screen_layout_sensor_landscape">Sensor landscape</string>
     <string name="screen_layout_landscape">Landscape</string>
-    <string name="screen_layout_reverse_landscape">Reverse landscape</string>
-    <string name="screen_layout_sensor_portrait">Sensor portrait</string>
     <string name="screen_layout_portrait">Portrait</string>
-    <string name="screen_layout_reverse_portrait">Reverse portrait</string>
+    <string name="screen_layout_auto">Auto</string>
 
     <!-- Aspect Ratios -->
     <string name="ratio_default">Default (16:9)</string>

src/android/app/src/main/res/xml/game_mode_config.xml

@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<game-mode-config
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    android:supportsBatteryGameMode="true"
-    android:supportsPerformanceGameMode="true"
-    android:allowGameDownscaling="false"
-    android:allowGameFpsOverride="false"/>

src/core/CMakeLists.txt

@@ -183,6 +183,22 @@ add_library(core STATIC
     frontend/framebuffer_layout.cpp
     frontend/framebuffer_layout.h
     frontend/graphics_context.h
+    hid/emulated_console.cpp
+    hid/emulated_console.h
+    hid/emulated_controller.cpp
+    hid/emulated_controller.h
+    hid/emulated_devices.cpp
+    hid/emulated_devices.h
+    hid/hid_core.cpp
+    hid/hid_core.h
+    hid/hid_types.h
+    hid/input_converter.cpp
+    hid/input_converter.h
+    hid/input_interpreter.cpp
+    hid/input_interpreter.h
+    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
@@ -515,16 +531,90 @@ add_library(core STATIC
     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/hid_util.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/types/debug_pad_types.h
+    hle/service/hid/controllers/types/keyboard_types.h
+    hle/service/hid/controllers/types/mouse_types.h
+    hle/service/hid/controllers/types/npad_types.h
+    hle/service/hid/controllers/types/shared_memory_format.h
+    hle/service/hid/controllers/types/touch_types.h
+    hle/service/hid/controllers/applet_resource.cpp
+    hle/service/hid/controllers/applet_resource.h
+    hle/service/hid/controllers/capture_button.cpp
+    hle/service/hid/controllers/capture_button.h
+    hle/service/hid/controllers/console_six_axis.cpp
+    hle/service/hid/controllers/console_six_axis.h
+    hle/service/hid/controllers/controller_base.cpp
+    hle/service/hid/controllers/controller_base.h
+    hle/service/hid/controllers/debug_mouse.cpp
+    hle/service/hid/controllers/debug_mouse.h
+    hle/service/hid/controllers/debug_pad.cpp
+    hle/service/hid/controllers/debug_pad.h
+    hle/service/hid/controllers/digitizer.cpp
+    hle/service/hid/controllers/digitizer.h
+    hle/service/hid/controllers/gesture.cpp
+    hle/service/hid/controllers/gesture.h
+    hle/service/hid/controllers/home_button.cpp
+    hle/service/hid/controllers/home_button.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/seven_six_axis.cpp
+    hle/service/hid/controllers/seven_six_axis.h
+    hle/service/hid/controllers/shared_memory_holder.cpp
+    hle/service/hid/controllers/shared_memory_holder.h
+    hle/service/hid/controllers/six_axis.cpp
+    hle/service/hid/controllers/six_axis.h
+    hle/service/hid/controllers/sleep_button.cpp
+    hle/service/hid/controllers/sleep_button.h
+    hle/service/hid/controllers/touchscreen.cpp
+    hle/service/hid/controllers/touchscreen.h
+    hle/service/hid/controllers/unique_pad.cpp
+    hle/service/hid/controllers/unique_pad.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
@@ -865,7 +955,7 @@ endif()
 
 create_target_directory_groups(core)
 
-target_link_libraries(core PUBLIC common PRIVATE audio_core hid_core network video_core nx_tzdb)
+target_link_libraries(core PUBLIC common PRIVATE audio_core network 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})

src/core/core.cpp

@@ -28,6 +28,7 @@
 #include "core/file_sys/savedata_factory.h"
 #include "core/file_sys/vfs_concat.h"
 #include "core/file_sys/vfs_real.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"
@@ -51,7 +52,6 @@
 #include "core/telemetry_session.h"
 #include "core/tools/freezer.h"
 #include "core/tools/renderdoc.h"
-#include "hid_core/hid_core.h"
 #include "network/network.h"
 #include "video_core/host1x/host1x.h"
 #include "video_core/renderer_base.h"

src/core/file_sys/savedata_factory.cpp

@@ -189,15 +189,6 @@ std::string SaveDataFactory::GetFullPath(Core::System& system, VirtualDir dir,
     }
 }
 
-std::string SaveDataFactory::GetUserGameSaveDataRoot(u128 user_id, bool future) {
-    if (future) {
-        Common::UUID uuid;
-        std::memcpy(uuid.uuid.data(), user_id.data(), sizeof(Common::UUID));
-        return fmt::format("/user/save/account/{}", uuid.RawString());
-    }
-    return fmt::format("/user/save/{:016X}/{:016X}{:016X}", 0, user_id[1], user_id[0]);
-}
-
 SaveDataSize SaveDataFactory::ReadSaveDataSize(SaveDataType type, u64 title_id,
                                                u128 user_id) const {
     const auto path =

src/core/file_sys/savedata_factory.h

@@ -101,7 +101,6 @@ public:
     static std::string GetSaveDataSpaceIdPath(SaveDataSpaceId space);
     static std::string GetFullPath(Core::System& system, VirtualDir dir, SaveDataSpaceId space,
                                    SaveDataType type, u64 title_id, u128 user_id, u64 save_id);
-    static std::string GetUserGameSaveDataRoot(u128 user_id, bool future);
 
     SaveDataSize ReadSaveDataSize(SaveDataType type, u64 title_id, u128 user_id) const;
     void WriteSaveDataSize(SaveDataType type, u64 title_id, u128 user_id,

src/core/frontend/applets/controller.cpp

@@ -6,9 +6,9 @@
 #include "common/settings.h"
 #include "common/settings_enums.h"
 #include "core/frontend/applets/controller.h"
-#include "hid_core/frontend/emulated_controller.h"
-#include "hid_core/hid_core.h"
-#include "hid_core/hid_types.h"
+#include "core/hid/emulated_controller.h"
+#include "core/hid/hid_core.h"
+#include "core/hid/hid_types.h"
 
 namespace Core::Frontend {
 

src/core/hid/emulated_console.cpp

@@ -2,8 +2,8 @@
 // SPDX-License-Identifier: GPL-2.0-or-later
 
 #include "common/settings.h"
-#include "hid_core/frontend/emulated_console.h"
-#include "hid_core/frontend/input_converter.h"
+#include "core/hid/emulated_console.h"
+#include "core/hid/input_converter.h"
 
 namespace Core::HID {
 EmulatedConsole::EmulatedConsole() = default;

src/core/hid/emulated_console.h

@@ -17,8 +17,8 @@
 #include "common/point.h"
 #include "common/quaternion.h"
 #include "common/vector_math.h"
-#include "hid_core/frontend/motion_input.h"
-#include "hid_core/hid_types.h"
+#include "core/hid/hid_types.h"
+#include "core/hid/motion_input.h"
 
 namespace Core::HID {
 static constexpr std::size_t MaxTouchDevices = 32;

src/core/hid/emulated_controller.cpp

@@ -6,9 +6,9 @@
 
 #include "common/polyfill_ranges.h"
 #include "common/thread.h"
-#include "hid_core/frontend/emulated_controller.h"
-#include "hid_core/frontend/input_converter.h"
-#include "hid_core/hid_util.h"
+#include "core/hid/emulated_controller.h"
+#include "core/hid/input_converter.h"
+#include "core/hle/service/hid/hid_util.h"
 
 namespace Core::HID {
 constexpr s32 HID_JOYSTICK_MAX = 0x7fff;

src/core/hid/emulated_controller.h

@@ -15,9 +15,9 @@
 #include "common/param_package.h"
 #include "common/settings.h"
 #include "common/vector_math.h"
-#include "hid_core/frontend/motion_input.h"
-#include "hid_core/hid_types.h"
-#include "hid_core/irsensor/irs_types.h"
+#include "core/hid/hid_types.h"
+#include "core/hid/irs_types.h"
+#include "core/hid/motion_input.h"
 
 namespace Core::HID {
 const std::size_t max_emulated_controllers = 2;

src/core/hid/emulated_devices.cpp

@@ -4,8 +4,8 @@
 #include <algorithm>
 #include <fmt/format.h>
 
-#include "hid_core/frontend/emulated_devices.h"
-#include "hid_core/frontend/input_converter.h"
+#include "core/hid/emulated_devices.h"
+#include "core/hid/input_converter.h"
 
 namespace Core::HID {
 

src/core/hid/emulated_devices.h

@@ -14,7 +14,7 @@
 #include "common/input.h"
 #include "common/param_package.h"
 #include "common/settings.h"
-#include "hid_core/hid_types.h"
+#include "core/hid/hid_types.h"
 
 namespace Core::HID {
 using KeyboardDevices = std::array<std::unique_ptr<Common::Input::InputDevice>,

src/core/hid/hid_core.cpp

@@ -2,11 +2,11 @@
 // SPDX-License-Identifier: GPL-2.0-or-later
 
 #include "common/assert.h"
-#include "hid_core/frontend/emulated_console.h"
-#include "hid_core/frontend/emulated_controller.h"
-#include "hid_core/frontend/emulated_devices.h"
-#include "hid_core/hid_core.h"
-#include "hid_core/hid_util.h"
+#include "core/hid/emulated_console.h"
+#include "core/hid/emulated_controller.h"
+#include "core/hid/emulated_devices.h"
+#include "core/hid/hid_core.h"
+#include "core/hle/service/hid/hid_util.h"
 
 namespace Core::HID {
 

src/core/hid/hid_core.h

@@ -6,7 +6,7 @@
 #include <memory>
 
 #include "common/common_funcs.h"
-#include "hid_core/hid_types.h"
+#include "core/hid/hid_types.h"
 
 namespace Core::HID {
 class EmulatedConsole;

src/core/hid/hid_types.h

@@ -267,7 +267,6 @@ enum class NpadStyleSet : u32 {
     All = 0xFFFFFFFFU,
 };
 static_assert(sizeof(NpadStyleSet) == 4, "NpadStyleSet is an invalid size");
-DECLARE_ENUM_FLAG_OPERATORS(NpadStyleSet)
 
 // This is nn::hid::VibrationDevicePosition
 enum class VibrationDevicePosition : u32 {

src/core/hid/input_converter.cpp

@@ -5,7 +5,7 @@
 #include <random>
 
 #include "common/input.h"
-#include "hid_core/frontend/input_converter.h"
+#include "core/hid/input_converter.h"
 
 namespace Core::HID {
 

src/core/hid/input_interpreter.cpp

@@ -2,12 +2,12 @@
 // SPDX-License-Identifier: GPL-2.0-or-later
 
 #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 "hid_core/frontend/input_interpreter.h"
-#include "hid_core/hid_types.h"
-#include "hid_core/resource_manager.h"
-#include "hid_core/resources/npad/npad.h"
 
 InputInterpreter::InputInterpreter(Core::System& system)
     : npad{system.ServiceManager()

src/core/hid/irs_types.h

@@ -5,7 +5,7 @@
 
 #include "common/common_funcs.h"
 #include "common/common_types.h"
-#include "hid_core/hid_types.h"
+#include "core/hid/hid_types.h"
 
 namespace Core::IrSensor {
 

src/core/hid/motion_input.cpp

@@ -4,7 +4,7 @@
 #include <cmath>
 
 #include "common/math_util.h"
-#include "hid_core/frontend/motion_input.h"
+#include "core/hid/motion_input.h"
 
 namespace Core::HID {
 

src/core/hle/kernel/k_thread.cpp

@@ -1258,11 +1258,11 @@ ThreadState KThread::RequestTerminate() {
         // Change the thread's priority to be higher than any system thread's.
         this->IncreaseBasePriority(TerminatingThreadPriority);
 
-        // If the thread is runnable, send a termination interrupt to cores it may be running on.
+        // If the thread is runnable, send a termination interrupt to other cores.
         if (this->GetState() == ThreadState::Runnable) {
-            // NOTE: We do not mask the "current core", because this code may not actually be
-            //       executing from the thread representing the "current core".
-            if (const u64 core_mask = m_physical_affinity_mask.GetAffinityMask(); core_mask != 0) {
+            if (const u64 core_mask = m_physical_affinity_mask.GetAffinityMask() &
+                                      ~(1ULL << GetCurrentCoreId(m_kernel));
+                core_mask != 0) {
                 Kernel::KInterruptManager::SendInterProcessorInterrupt(m_kernel, core_mask);
             }
         }

src/core/hle/service/am/am.cpp

@@ -13,6 +13,7 @@
 #include "core/file_sys/patch_manager.h"
 #include "core/file_sys/registered_cache.h"
 #include "core/file_sys/savedata_factory.h"
+#include "core/hid/hid_types.h"
 #include "core/hle/kernel/k_event.h"
 #include "core/hle/kernel/k_transfer_memory.h"
 #include "core/hle/result.h"
@@ -36,6 +37,7 @@
 #include "core/hle/service/caps/caps_su.h"
 #include "core/hle/service/caps/caps_types.h"
 #include "core/hle/service/filesystem/filesystem.h"
+#include "core/hle/service/hid/controllers/npad.h"
 #include "core/hle/service/ipc_helpers.h"
 #include "core/hle/service/ns/ns.h"
 #include "core/hle/service/nvnflinger/fb_share_buffer_manager.h"
@@ -46,8 +48,6 @@
 #include "core/hle/service/vi/vi.h"
 #include "core/hle/service/vi/vi_results.h"
 #include "core/memory.h"
-#include "hid_core/hid_types.h"
-#include "hid_core/resources/npad/npad.h"
 
 namespace Service::AM {
 

src/core/hle/service/am/applets/applet_cabinet.cpp

@@ -5,13 +5,13 @@
 #include "common/logging/log.h"
 #include "core/core.h"
 #include "core/frontend/applets/cabinet.h"
+#include "core/hid/hid_core.h"
 #include "core/hle/kernel/k_event.h"
 #include "core/hle/kernel/k_readable_event.h"
 #include "core/hle/service/am/am.h"
 #include "core/hle/service/am/applets/applet_cabinet.h"
 #include "core/hle/service/mii/mii_manager.h"
 #include "core/hle/service/nfc/common/device.h"
-#include "hid_core/hid_core.h"
 
 namespace Service::AM::Applets {
 

src/core/hle/service/am/applets/applet_controller.cpp

@@ -9,13 +9,13 @@
 #include "common/string_util.h"
 #include "core/core.h"
 #include "core/frontend/applets/controller.h"
+#include "core/hid/emulated_controller.h"
+#include "core/hid/hid_core.h"
+#include "core/hid/hid_types.h"
 #include "core/hle/result.h"
 #include "core/hle/service/am/am.h"
 #include "core/hle/service/am/applets/applet_controller.h"
-#include "hid_core/frontend/emulated_controller.h"
-#include "hid_core/hid_core.h"
-#include "hid_core/hid_types.h"
-#include "hid_core/resources/npad/npad.h"
+#include "core/hle/service/hid/controllers/npad.h"
 
 namespace Service::AM::Applets {
 

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

@@ -3,9 +3,9 @@
 
 #include "core/core.h"
 #include "core/hle/kernel/k_shared_memory.h"
-#include "hid_core/hid_result.h"
-#include "hid_core/resources/applet_resource.h"
-#include "hid_core/resources/shared_memory_format.h"
+#include "core/hle/service/hid/controllers/applet_resource.h"
+#include "core/hle/service/hid/controllers/types/shared_memory_format.h"
+#include "core/hle/service/hid/errors.h"
 
 namespace Service::HID {
 

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

@@ -9,7 +9,7 @@
 #include "common/bit_field.h"
 #include "common/common_types.h"
 #include "core/hle/result.h"
-#include "hid_core/resources/shared_memory_holder.h"
+#include "core/hle/service/hid/controllers/shared_memory_holder.h"
 
 namespace Core {
 class System;
@@ -25,7 +25,6 @@ class AppletResource;
 class NPadResource;
 
 static constexpr std::size_t AruidIndexMax = 0x20;
-static constexpr u64 SystemAruid = 0;
 
 enum class RegistrationStatus : u32 {
     None,

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

@@ -2,9 +2,9 @@
 // SPDX-License-Identifier: GPL-2.0-or-later
 
 #include "core/core_timing.h"
-#include "hid_core/resources/applet_resource.h"
-#include "hid_core/resources/shared_memory_format.h"
-#include "hid_core/resources/system_buttons/capture_button.h"
+#include "core/hle/service/hid/controllers/applet_resource.h"
+#include "core/hle/service/hid/controllers/capture_button.h"
+#include "core/hle/service/hid/controllers/types/shared_memory_format.h"
 
 namespace Service::HID {
 
@@ -21,11 +21,10 @@ void CaptureButton::OnUpdate(const Core::Timing::CoreTiming& core_timing) {
         return;
     }
 
-    std::scoped_lock shared_lock{*shared_mutex};
     const u64 aruid = applet_resource->GetActiveAruid();
     auto* data = applet_resource->GetAruidData(aruid);
 
-    if (data == nullptr || !data->flag.is_assigned) {
+    if (data == nullptr) {
         return;
     }
 

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

@@ -3,7 +3,7 @@
 
 #pragma once
 
-#include "hid_core/resources/controller_base.h"
+#include "core/hle/service/hid/controllers/controller_base.h"
 
 namespace Service::HID {
 

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

@@ -2,10 +2,10 @@
 // SPDX-License-Identifier: GPL-2.0-or-later
 
 #include "core/core_timing.h"
-#include "hid_core/frontend/emulated_console.h"
-#include "hid_core/hid_core.h"
-#include "hid_core/resources/shared_memory_format.h"
-#include "hid_core/resources/six_axis/console_six_axis.h"
+#include "core/hid/emulated_console.h"
+#include "core/hid/hid_core.h"
+#include "core/hle/service/hid/controllers/console_six_axis.h"
+#include "core/hle/service/hid/controllers/types/shared_memory_format.h"
 
 namespace Service::HID {
 
@@ -20,11 +20,10 @@ void ConsoleSixAxis::OnInit() {}
 void ConsoleSixAxis::OnRelease() {}
 
 void ConsoleSixAxis::OnUpdate(const Core::Timing::CoreTiming& core_timing) {
-    std::scoped_lock shared_lock{*shared_mutex};
     const u64 aruid = applet_resource->GetActiveAruid();
     auto* data = applet_resource->GetAruidData(aruid);
 
-    if (data == nullptr || !data->flag.is_assigned) {
+    if (data == nullptr) {
         return;
     }
 

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

@@ -3,7 +3,7 @@
 
 #pragma once
 
-#include "hid_core/resources/controller_base.h"
+#include "core/hle/service/hid/controllers/controller_base.h"
 
 namespace Core::HID {
 class EmulatedConsole;

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

@@ -1,7 +1,7 @@
 // SPDX-FileCopyrightText: Copyright 2018 yuzu Emulator Project
 // SPDX-License-Identifier: GPL-2.0-or-later
 
-#include "hid_core/resources/controller_base.h"
+#include "core/hle/service/hid/controllers/controller_base.h"
 
 namespace Service::HID {
 
@@ -32,10 +32,8 @@ bool ControllerBase::IsControllerActivated() const {
     return is_activated;
 }
 
-void ControllerBase::SetAppletResource(std::shared_ptr<AppletResource> resource,
-                                       std::recursive_mutex* resource_mutex) {
+void ControllerBase::SetAppletResource(std::shared_ptr<AppletResource> resource) {
     applet_resource = resource;
-    shared_mutex = resource_mutex;
 }
 
 } // namespace Service::HID

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

@@ -7,7 +7,7 @@
 
 #include "common/common_types.h"
 #include "core/hle/result.h"
-#include "hid_core/resources/applet_resource.h"
+#include "core/hle/service/hid/controllers/applet_resource.h"
 
 namespace Core::Timing {
 class CoreTiming;
@@ -42,13 +42,11 @@ public:
 
     bool IsControllerActivated() const;
 
-    void SetAppletResource(std::shared_ptr<AppletResource> resource,
-                           std::recursive_mutex* resource_mutex);
+    void SetAppletResource(std::shared_ptr<AppletResource> resource);
 
 protected:
     bool is_activated{false};
     std::shared_ptr<AppletResource> applet_resource{nullptr};
-    std::recursive_mutex* shared_mutex{nullptr};
 
     Core::HID::HIDCore& hid_core;
 };

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

@@ -3,11 +3,11 @@
 
 #include "core/core_timing.h"
 #include "core/frontend/emu_window.h"
-#include "hid_core/frontend/emulated_devices.h"
-#include "hid_core/hid_core.h"
-#include "hid_core/resources/applet_resource.h"
-#include "hid_core/resources/mouse/debug_mouse.h"
-#include "hid_core/resources/shared_memory_format.h"
+#include "core/hid/emulated_devices.h"
+#include "core/hid/hid_core.h"
+#include "core/hle/service/hid/controllers/applet_resource.h"
+#include "core/hle/service/hid/controllers/debug_mouse.h"
+#include "core/hle/service/hid/controllers/types/shared_memory_format.h"
 
 namespace Service::HID {
 
@@ -21,11 +21,10 @@ void DebugMouse::OnInit() {}
 void DebugMouse::OnRelease() {}
 
 void DebugMouse::OnUpdate(const Core::Timing::CoreTiming& core_timing) {
-    std::scoped_lock shared_lock{*shared_mutex};
     const u64 aruid = applet_resource->GetActiveAruid();
     auto* data = applet_resource->GetAruidData(aruid);
 
-    if (data == nullptr || !data->flag.is_assigned) {
+    if (data == nullptr) {
         return;
     }
 

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

@@ -3,12 +3,12 @@
 
 #pragma once
 
-#include "hid_core/hid_types.h"
-#include "hid_core/resources/controller_base.h"
+#include "core/hle/service/hid/controllers/controller_base.h"
 
 namespace Core::HID {
-class HIDCore;
 class EmulatedDevices;
+struct MouseState;
+struct AnalogStickState;
 } // namespace Core::HID
 
 namespace Service::HID {

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

@@ -3,12 +3,12 @@
 
 #include "common/settings.h"
 #include "core/core_timing.h"
-#include "hid_core/frontend/emulated_controller.h"
-#include "hid_core/hid_core.h"
-#include "hid_core/hid_types.h"
-#include "hid_core/resources/applet_resource.h"
-#include "hid_core/resources/debug_pad/debug_pad.h"
-#include "hid_core/resources/shared_memory_format.h"
+#include "core/hid/emulated_controller.h"
+#include "core/hid/hid_core.h"
+#include "core/hid/hid_types.h"
+#include "core/hle/service/hid/controllers/applet_resource.h"
+#include "core/hle/service/hid/controllers/debug_pad.h"
+#include "core/hle/service/hid/controllers/types/shared_memory_format.h"
 
 namespace Service::HID {
 
@@ -23,11 +23,10 @@ void DebugPad::OnInit() {}
 void DebugPad::OnRelease() {}
 
 void DebugPad::OnUpdate(const Core::Timing::CoreTiming& core_timing) {
-    std::scoped_lock shared_lock{*shared_mutex};
     const u64 aruid = applet_resource->GetActiveAruid();
     auto* data = applet_resource->GetAruidData(aruid);
 
-    if (data == nullptr || !data->flag.is_assigned) {
+    if (data == nullptr) {
         return;
     }
 

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

@@ -3,13 +3,12 @@
 
 #pragma once
 
-#include "hid_core/resources/controller_base.h"
-#include "hid_core/resources/debug_pad/debug_pad_types.h"
+#include "core/hle/service/hid/controllers/controller_base.h"
+#include "core/hle/service/hid/controllers/types/debug_pad_types.h"
 
 namespace Core::HID {
 class HIDCore;
-class EmulatedController;
-} // namespace Core::HID
+}
 
 namespace Core::Timing {
 class CoreTiming;

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

@@ -2,9 +2,9 @@
 // SPDX-License-Identifier: GPL-2.0-or-later
 
 #include "core/core_timing.h"
-#include "hid_core/resources/applet_resource.h"
-#include "hid_core/resources/digitizer/digitizer.h"
-#include "hid_core/resources/shared_memory_format.h"
+#include "core/hle/service/hid/controllers/applet_resource.h"
+#include "core/hle/service/hid/controllers/digitizer.h"
+#include "core/hle/service/hid/controllers/types/shared_memory_format.h"
 
 namespace Service::HID {
 
@@ -21,11 +21,10 @@ void Digitizer::OnUpdate(const Core::Timing::CoreTiming& core_timing) {
         return;
     }
 
-    std::scoped_lock shared_lock{*shared_mutex};
     const u64 aruid = applet_resource->GetActiveAruid();
     auto* data = applet_resource->GetAruidData(aruid);
 
-    if (data == nullptr || !data->flag.is_assigned) {
+    if (data == nullptr) {
         return;
     }
 

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

@@ -3,7 +3,7 @@
 
 #pragma once
 
-#include "hid_core/resources/controller_base.h"
+#include "core/hle/service/hid/controllers/controller_base.h"
 
 namespace Service::HID {
 

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

@@ -4,11 +4,11 @@
 #include "common/math_util.h"
 #include "common/settings.h"
 #include "core/frontend/emu_window.h"
-#include "hid_core/frontend/emulated_console.h"
-#include "hid_core/hid_core.h"
-#include "hid_core/resources/applet_resource.h"
-#include "hid_core/resources/shared_memory_format.h"
-#include "hid_core/resources/touch_screen/gesture.h"
+#include "core/hid/emulated_console.h"
+#include "core/hid/hid_core.h"
+#include "core/hle/service/hid/controllers/applet_resource.h"
+#include "core/hle/service/hid/controllers/gesture.h"
+#include "core/hle/service/hid/controllers/types/shared_memory_format.h"
 
 namespace Service::HID {
 // HW is around 700, value is set to 400 to make it easier to trigger with mouse
@@ -28,11 +28,10 @@ Gesture::Gesture(Core::HID::HIDCore& hid_core_) : ControllerBase(hid_core_) {
 Gesture::~Gesture() = default;
 
 void Gesture::OnInit() {
-    std::scoped_lock shared_lock{*shared_mutex};
     const u64 aruid = applet_resource->GetActiveAruid();
     auto* data = applet_resource->GetAruidData(aruid);
 
-    if (data == nullptr || !data->flag.is_assigned) {
+    if (data == nullptr) {
         return;
     }
 
@@ -45,11 +44,10 @@ void Gesture::OnInit() {
 void Gesture::OnRelease() {}
 
 void Gesture::OnUpdate(const Core::Timing::CoreTiming& core_timing) {
-    std::scoped_lock shared_lock{*shared_mutex};
     const u64 aruid = applet_resource->GetActiveAruid();
     auto* data = applet_resource->GetAruidData(aruid);
 
-    if (data == nullptr || !data->flag.is_assigned) {
+    if (data == nullptr) {
         return;
     }
 

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

@@ -6,8 +6,8 @@
 #include <array>
 
 #include "common/common_types.h"
-#include "hid_core/resources/controller_base.h"
-#include "hid_core/resources/touch_screen/touch_types.h"
+#include "core/hle/service/hid/controllers/controller_base.h"
+#include "core/hle/service/hid/controllers/types/touch_types.h"
 
 namespace Core::HID {
 class EmulatedConsole;

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

@@ -2,9 +2,9 @@
 // SPDX-License-Identifier: GPL-2.0-or-later
 
 #include "core/core_timing.h"
-#include "hid_core/resources/applet_resource.h"
-#include "hid_core/resources/shared_memory_format.h"
-#include "hid_core/resources/system_buttons/home_button.h"
+#include "core/hle/service/hid/controllers/applet_resource.h"
+#include "core/hle/service/hid/controllers/home_button.h"
+#include "core/hle/service/hid/controllers/types/shared_memory_format.h"
 
 namespace Service::HID {
 
@@ -21,11 +21,10 @@ void HomeButton::OnUpdate(const Core::Timing::CoreTiming& core_timing) {
         return;
     }
 
-    std::scoped_lock shared_lock{*shared_mutex};
     const u64 aruid = applet_resource->GetActiveAruid();
     auto* data = applet_resource->GetAruidData(aruid);
 
-    if (data == nullptr || !data->flag.is_assigned) {
+    if (data == nullptr) {
         return;
     }
 

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

@@ -3,7 +3,7 @@
 
 #pragma once
 
-#include "hid_core/resources/controller_base.h"
+#include "core/hle/service/hid/controllers/controller_base.h"
 
 namespace Service::HID {
 

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

@@ -3,11 +3,11 @@
 
 #include "common/settings.h"
 #include "core/core_timing.h"
-#include "hid_core/frontend/emulated_devices.h"
-#include "hid_core/hid_core.h"
-#include "hid_core/resources/applet_resource.h"
-#include "hid_core/resources/keyboard/keyboard.h"
-#include "hid_core/resources/shared_memory_format.h"
+#include "core/hid/emulated_devices.h"
+#include "core/hid/hid_core.h"
+#include "core/hle/service/hid/controllers/applet_resource.h"
+#include "core/hle/service/hid/controllers/keyboard.h"
+#include "core/hle/service/hid/controllers/types/shared_memory_format.h"
 
 namespace Service::HID {
 
@@ -22,11 +22,10 @@ void Keyboard::OnInit() {}
 void Keyboard::OnRelease() {}
 
 void Keyboard::OnUpdate(const Core::Timing::CoreTiming& core_timing) {
-    std::scoped_lock shared_lock{*shared_mutex};
     const u64 aruid = applet_resource->GetActiveAruid();
     auto* data = applet_resource->GetAruidData(aruid);
 
-    if (data == nullptr || !data->flag.is_assigned) {
+    if (data == nullptr) {
         return;
     }
 

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

@@ -3,13 +3,8 @@
 
 #pragma once
 
-#include "hid_core/resources/controller_base.h"
-#include "hid_core/resources/keyboard/keyboard_types.h"
-
-namespace Core::HID {
-class HIDCore;
-class EmulatedDevices;
-} // namespace Core::HID
+#include "core/hle/service/hid/controllers/controller_base.h"
+#include "core/hle/service/hid/controllers/types/keyboard_types.h"
 
 namespace Service::HID {
 class Keyboard final : public ControllerBase {

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

@@ -3,11 +3,11 @@
 
 #include "core/core_timing.h"
 #include "core/frontend/emu_window.h"
-#include "hid_core/frontend/emulated_devices.h"
-#include "hid_core/hid_core.h"
-#include "hid_core/resources/applet_resource.h"
-#include "hid_core/resources/mouse/mouse.h"
-#include "hid_core/resources/shared_memory_format.h"
+#include "core/hid/emulated_devices.h"
+#include "core/hid/hid_core.h"
+#include "core/hle/service/hid/controllers/applet_resource.h"
+#include "core/hle/service/hid/controllers/mouse.h"
+#include "core/hle/service/hid/controllers/types/shared_memory_format.h"
 
 namespace Service::HID {
 
@@ -21,11 +21,10 @@ void Mouse::OnInit() {}
 void Mouse::OnRelease() {}
 
 void Mouse::OnUpdate(const Core::Timing::CoreTiming& core_timing) {
-    std::scoped_lock shared_lock{*shared_mutex};
     const u64 aruid = applet_resource->GetActiveAruid();
     auto* data = applet_resource->GetAruidData(aruid);
 
-    if (data == nullptr || !data->flag.is_assigned) {
+    if (data == nullptr) {
         return;
     }
 

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

@@ -3,12 +3,12 @@
 
 #pragma once
 
-#include "hid_core/hid_types.h"
-#include "hid_core/resources/controller_base.h"
+#include "core/hle/service/hid/controllers/controller_base.h"
 
 namespace Core::HID {
-class HIDCore;
 class EmulatedDevices;
+struct MouseState;
+struct AnalogStickState;
 } // namespace Core::HID
 
 namespace Service::HID {

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

@@ -0,0 +1,197 @@
+// SPDX-FileCopyrightText: Copyright 2018 yuzu Emulator Project
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#pragma once
+
+#include <array>
+#include <atomic>
+#include <mutex>
+#include <span>
+
+#include "common/common_types.h"
+#include "core/hid/hid_types.h"
+#include "core/hle/service/hid/controllers/controller_base.h"
+#include "core/hle/service/hid/controllers/types/npad_types.h"
+
+namespace Core::HID {
+class EmulatedController;
+enum class ControllerTriggerType;
+} // namespace Core::HID
+
+namespace Kernel {
+class KEvent;
+class KReadableEvent;
+} // namespace Kernel
+
+namespace Service::KernelHelpers {
+class ServiceContext;
+} // namespace Service::KernelHelpers
+
+union Result;
+
+namespace Service::HID {
+class AppletResource;
+struct NpadInternalState;
+struct NpadSixAxisSensorLifo;
+struct NpadSharedMemoryFormat;
+
+class NPad final : public ControllerBase {
+public:
+    explicit NPad(Core::HID::HIDCore& hid_core_, KernelHelpers::ServiceContext& service_context_);
+    ~NPad() override;
+
+    // Called when the controller is initialized
+    void OnInit() override;
+
+    // When the controller is released
+    void OnRelease() override;
+
+    // When the controller is requesting an update for the shared memory
+    void OnUpdate(const Core::Timing::CoreTiming& core_timing) override;
+
+    void SetSupportedStyleSet(Core::HID::NpadStyleTag style_set);
+    Core::HID::NpadStyleTag GetSupportedStyleSet() const;
+
+    Result SetSupportedNpadIdTypes(std::span<const u8> data);
+    void GetSupportedNpadIdTypes(u32* data, std::size_t max_length);
+    std::size_t GetSupportedNpadIdTypesSize() const;
+
+    void SetHoldType(NpadJoyHoldType joy_hold_type);
+    NpadJoyHoldType GetHoldType() const;
+
+    void SetNpadHandheldActivationMode(NpadHandheldActivationMode activation_mode);
+    NpadHandheldActivationMode GetNpadHandheldActivationMode() const;
+
+    void SetNpadCommunicationMode(NpadCommunicationMode communication_mode_);
+    NpadCommunicationMode GetNpadCommunicationMode() const;
+
+    bool SetNpadMode(Core::HID::NpadIdType& new_npad_id, Core::HID::NpadIdType npad_id,
+                     NpadJoyDeviceType npad_device_type, NpadJoyAssignmentMode assignment_mode);
+
+    bool VibrateControllerAtIndex(Core::HID::NpadIdType npad_id, std::size_t device_index,
+                                  const Core::HID::VibrationValue& vibration_value);
+
+    void VibrateController(const Core::HID::VibrationDeviceHandle& vibration_device_handle,
+                           const Core::HID::VibrationValue& vibration_value);
+
+    void VibrateControllers(
+        std::span<const Core::HID::VibrationDeviceHandle> vibration_device_handles,
+        std::span<const Core::HID::VibrationValue> vibration_values);
+
+    Core::HID::VibrationValue GetLastVibration(
+        const Core::HID::VibrationDeviceHandle& vibration_device_handle) const;
+
+    void InitializeVibrationDevice(const Core::HID::VibrationDeviceHandle& vibration_device_handle);
+
+    void InitializeVibrationDeviceAtIndex(Core::HID::NpadIdType npad_id, std::size_t device_index);
+
+    void SetPermitVibrationSession(bool permit_vibration_session);
+
+    bool IsVibrationDeviceMounted(
+        const Core::HID::VibrationDeviceHandle& vibration_device_handle) const;
+
+    Kernel::KReadableEvent& GetStyleSetChangedEvent(Core::HID::NpadIdType npad_id);
+    void SignalStyleSetChangedEvent(Core::HID::NpadIdType npad_id) const;
+
+    // Adds a new controller at an index.
+    void AddNewControllerAt(Core::HID::NpadStyleIndex controller, Core::HID::NpadIdType npad_id);
+    // Adds a new controller at an index with connection status.
+    void UpdateControllerAt(Core::HID::NpadStyleIndex controller, Core::HID::NpadIdType npad_id,
+                            bool connected);
+
+    Result DisconnectNpad(Core::HID::NpadIdType npad_id);
+
+    Result IsFirmwareUpdateAvailableForSixAxisSensor(
+        const Core::HID::SixAxisSensorHandle& sixaxis_handle, bool& is_firmware_available) const;
+    Result ResetIsSixAxisSensorDeviceNewlyAssigned(
+        const Core::HID::SixAxisSensorHandle& sixaxis_handle);
+
+    Result GetLedPattern(Core::HID::NpadIdType npad_id, Core::HID::LedPattern& pattern) const;
+    Result IsUnintendedHomeButtonInputProtectionEnabled(Core::HID::NpadIdType npad_id,
+                                                        bool& is_enabled) const;
+    Result SetUnintendedHomeButtonInputProtectionEnabled(bool is_protection_enabled,
+                                                         Core::HID::NpadIdType npad_id);
+    void SetAnalogStickUseCenterClamp(bool use_center_clamp);
+    void ClearAllConnectedControllers();
+    void DisconnectAllConnectedControllers();
+    void ConnectAllDisconnectedControllers();
+    void ClearAllControllers();
+
+    Result MergeSingleJoyAsDualJoy(Core::HID::NpadIdType npad_id_1,
+                                   Core::HID::NpadIdType npad_id_2);
+    void StartLRAssignmentMode();
+    void StopLRAssignmentMode();
+    Result SwapNpadAssignment(Core::HID::NpadIdType npad_id_1, Core::HID::NpadIdType npad_id_2);
+
+    // Logical OR for all buttons presses on all controllers
+    // Specifically for cheat engine and other features.
+    Core::HID::NpadButton GetAndResetPressState();
+
+    void ApplyNpadSystemCommonPolicy();
+
+    AppletDetailedUiType GetAppletDetailedUiType(Core::HID::NpadIdType npad_id);
+
+private:
+    struct VibrationData {
+        bool device_mounted{};
+        Core::HID::VibrationValue latest_vibration_value{};
+        std::chrono::steady_clock::time_point last_vibration_timepoint{};
+    };
+
+    struct NpadControllerData {
+        Kernel::KEvent* styleset_changed_event{};
+        NpadInternalState* shared_memory = nullptr;
+        Core::HID::EmulatedController* device = nullptr;
+
+        std::array<VibrationData, 2> vibration{};
+        bool unintended_home_button_input_protection{};
+        bool is_connected{};
+
+        // Dual joycons can have only one side connected
+        bool is_dual_left_connected{true};
+        bool is_dual_right_connected{true};
+
+        // Current pad state
+        NPadGenericState npad_pad_state{};
+        NPadGenericState npad_libnx_state{};
+        NpadGcTriggerState npad_trigger_state{};
+        int callback_key{};
+    };
+
+    void ControllerUpdate(Core::HID::ControllerTriggerType type, std::size_t controller_idx);
+    void InitNewlyAddedController(Core::HID::NpadIdType npad_id);
+    bool IsControllerSupported(Core::HID::NpadStyleIndex controller) const;
+    void RequestPadStateUpdate(Core::HID::NpadIdType npad_id);
+    void WriteEmptyEntry(NpadInternalState* npad);
+
+    NpadControllerData& GetControllerFromHandle(
+        const Core::HID::VibrationDeviceHandle& device_handle);
+    const NpadControllerData& GetControllerFromHandle(
+        const Core::HID::VibrationDeviceHandle& device_handle) const;
+    NpadControllerData& GetControllerFromHandle(
+        const Core::HID::SixAxisSensorHandle& device_handle);
+    const NpadControllerData& GetControllerFromHandle(
+        const Core::HID::SixAxisSensorHandle& device_handle) const;
+    NpadControllerData& GetControllerFromNpadIdType(Core::HID::NpadIdType npad_id);
+    const NpadControllerData& GetControllerFromNpadIdType(Core::HID::NpadIdType npad_id) const;
+
+    Core::HID::SixAxisSensorProperties& GetSixaxisProperties(
+        const Core::HID::SixAxisSensorHandle& device_handle);
+    const Core::HID::SixAxisSensorProperties& GetSixaxisProperties(
+        const Core::HID::SixAxisSensorHandle& device_handle) const;
+
+    std::atomic<u64> press_state{};
+
+    std::array<NpadControllerData, NpadCount> controller_data{};
+    KernelHelpers::ServiceContext& service_context;
+    std::mutex mutex;
+    std::vector<Core::HID::NpadIdType> supported_npad_id_types{};
+    NpadJoyHoldType hold_type{NpadJoyHoldType::Vertical};
+    NpadHandheldActivationMode handheld_activation_mode{NpadHandheldActivationMode::Dual};
+    NpadCommunicationMode communication_mode{NpadCommunicationMode::Default};
+    bool permit_vibration_session_enabled{false};
+    bool analog_stick_use_center_clamp{false};
+    bool is_in_lr_assignment_mode{false};
+    bool is_controller_initialized{false};
+};
+} // namespace Service::HID

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

@@ -2,12 +2,13 @@
 // SPDX-License-Identifier: GPL-2.0-or-later
 
 #include "core/core_timing.h"
+#include "core/hid/emulated_controller.h"
+#include "core/hid/hid_core.h"
+#include "core/hid/hid_types.h"
 #include "core/hle/kernel/k_event.h"
 #include "core/hle/kernel/k_readable_event.h"
+#include "core/hle/service/hid/controllers/palma.h"
 #include "core/hle/service/kernel_helpers.h"
-#include "hid_core/frontend/emulated_controller.h"
-#include "hid_core/hid_core.h"
-#include "hid_core/resources/palma/palma.h"
 
 namespace Service::HID {
 

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

@@ -6,9 +6,8 @@
 #include <array>
 #include "common/common_funcs.h"
 #include "common/typed_address.h"
-#include "hid_core/hid_result.h"
-#include "hid_core/hid_types.h"
-#include "hid_core/resources/controller_base.h"
+#include "core/hle/service/hid/controllers/controller_base.h"
+#include "core/hle/service/hid/errors.h"
 
 namespace Kernel {
 class KEvent;

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

@@ -6,11 +6,11 @@
 #include "core/core.h"
 #include "core/core_timing.h"
 #include "core/frontend/emu_window.h"
+#include "core/hid/emulated_console.h"
+#include "core/hid/emulated_devices.h"
+#include "core/hid/hid_core.h"
+#include "core/hle/service/hid/controllers/seven_six_axis.h"
 #include "core/memory.h"
-#include "hid_core/frontend/emulated_console.h"
-#include "hid_core/frontend/emulated_devices.h"
-#include "hid_core/hid_core.h"
-#include "hid_core/resources/six_axis/seven_six_axis.h"
 
 namespace Service::HID {
 SevenSixAxis::SevenSixAxis(Core::System& system_)

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

@@ -6,8 +6,8 @@
 #include "common/common_types.h"
 #include "common/quaternion.h"
 #include "common/typed_address.h"
-#include "hid_core/resources/controller_base.h"
-#include "hid_core/resources/ring_lifo.h"
+#include "core/hle/service/hid/controllers/controller_base.h"
+#include "core/hle/service/hid/ring_lifo.h"
 
 namespace Core {
 class System;

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

@@ -3,10 +3,10 @@
 
 #include "core/core.h"
 #include "core/hle/kernel/k_shared_memory.h"
-#include "hid_core/hid_result.h"
-#include "hid_core/resources/applet_resource.h"
-#include "hid_core/resources/shared_memory_format.h"
-#include "hid_core/resources/shared_memory_holder.h"
+#include "core/hle/service/hid/controllers/applet_resource.h"
+#include "core/hle/service/hid/controllers/shared_memory_holder.h"
+#include "core/hle/service/hid/controllers/types/shared_memory_format.h"
+#include "core/hle/service/hid/errors.h"
 
 namespace Service::HID {
 SharedMemoryHolder::SharedMemoryHolder() {}

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

@@ -3,13 +3,13 @@
 
 #include "common/common_types.h"
 #include "core/core_timing.h"
-#include "hid_core/frontend/emulated_controller.h"
-#include "hid_core/hid_core.h"
-#include "hid_core/hid_result.h"
-#include "hid_core/hid_util.h"
-#include "hid_core/resources/npad/npad.h"
-#include "hid_core/resources/shared_memory_format.h"
-#include "hid_core/resources/six_axis/six_axis.h"
+#include "core/hid/emulated_controller.h"
+#include "core/hid/hid_core.h"
+#include "core/hle/service/hid/controllers/npad.h"
+#include "core/hle/service/hid/controllers/six_axis.h"
+#include "core/hle/service/hid/controllers/types/shared_memory_format.h"
+#include "core/hle/service/hid/errors.h"
+#include "core/hle/service/hid/hid_util.h"
 
 namespace Service::HID {
 
@@ -27,11 +27,10 @@ void SixAxis::OnInit() {}
 void SixAxis::OnRelease() {}
 
 void SixAxis::OnUpdate(const Core::Timing::CoreTiming& core_timing) {
-    std::scoped_lock shared_lock{*shared_mutex};
     const u64 aruid = applet_resource->GetActiveAruid();
     auto* data = applet_resource->GetAruidData(aruid);
 
-    if (data == nullptr || !data->flag.is_assigned) {
+    if (data == nullptr) {
         return;
     }
 

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

@@ -4,9 +4,9 @@
 #pragma once
 
 #include "common/common_types.h"
-#include "hid_core/hid_types.h"
-#include "hid_core/resources/controller_base.h"
-#include "hid_core/resources/ring_lifo.h"
+#include "core/hid/hid_types.h"
+#include "core/hle/service/hid/controllers/controller_base.h"
+#include "core/hle/service/hid/ring_lifo.h"
 
 namespace Core::HID {
 class EmulatedController;

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

@@ -2,9 +2,9 @@
 // SPDX-License-Identifier: GPL-2.0-or-later
 
 #include "core/core_timing.h"
-#include "hid_core/resources/applet_resource.h"
-#include "hid_core/resources/shared_memory_format.h"
-#include "hid_core/resources/system_buttons/sleep_button.h"
+#include "core/hle/service/hid/controllers/applet_resource.h"
+#include "core/hle/service/hid/controllers/sleep_button.h"
+#include "core/hle/service/hid/controllers/types/shared_memory_format.h"
 
 namespace Service::HID {
 
@@ -21,11 +21,10 @@ void SleepButton::OnUpdate(const Core::Timing::CoreTiming& core_timing) {
         return;
     }
 
-    std::scoped_lock shared_lock{*shared_mutex};
     const u64 aruid = applet_resource->GetActiveAruid();
     auto* data = applet_resource->GetAruidData(aruid);
 
-    if (data == nullptr || !data->flag.is_assigned) {
+    if (data == nullptr) {
         return;
     }
 

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

@@ -3,7 +3,7 @@
 
 #pragma once
 
-#include "hid_core/resources/controller_base.h"
+#include "core/hle/service/hid/controllers/controller_base.h"
 
 namespace Service::HID {
 

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

@@ -6,11 +6,11 @@
 #include "common/settings.h"
 #include "core/core_timing.h"
 #include "core/frontend/emu_window.h"
-#include "hid_core/frontend/emulated_console.h"
-#include "hid_core/hid_core.h"
-#include "hid_core/resources/applet_resource.h"
-#include "hid_core/resources/shared_memory_format.h"
-#include "hid_core/resources/touch_screen/touch_screen.h"
+#include "core/hid/emulated_console.h"
+#include "core/hid/hid_core.h"
+#include "core/hle/service/hid/controllers/applet_resource.h"
+#include "core/hle/service/hid/controllers/touchscreen.h"
+#include "core/hle/service/hid/controllers/types/shared_memory_format.h"
 
 namespace Service::HID {
 
@@ -30,7 +30,7 @@ void TouchScreen::OnUpdate(const Core::Timing::CoreTiming& core_timing) {
     const u64 aruid = applet_resource->GetActiveAruid();
     auto* data = applet_resource->GetAruidData(aruid);
 
-    if (data == nullptr || !data->flag.is_assigned) {
+    if (data == nullptr) {
         return;
     }
 

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

@@ -5,9 +5,9 @@
 
 #include <array>
 
-#include "hid_core/hid_types.h"
-#include "hid_core/resources/controller_base.h"
-#include "hid_core/resources/touch_screen/touch_types.h"
+#include "core/hid/hid_types.h"
+#include "core/hle/service/hid/controllers/controller_base.h"
+#include "core/hle/service/hid/controllers/types/touch_types.h"
 
 namespace Core::HID {
 class EmulatedConsole;

src/core/hle/service/hid/controllers/types/debug_pad_types.h

@@ -5,7 +5,7 @@
 
 #include "common/bit_field.h"
 #include "common/common_types.h"
-#include "hid_core/hid_types.h"
+#include "core/hid/hid_types.h"
 
 namespace Service::HID {
 

src/core/hle/service/hid/controllers/types/keyboard_types.h

@@ -4,7 +4,7 @@
 #pragma once
 
 #include "common/common_types.h"
-#include "hid_core/hid_types.h"
+#include "core/hid/hid_types.h"
 
 namespace Service::HID {
 

src/core/hle/service/hid/controllers/types/npad_types.h

@@ -6,11 +6,10 @@
 #include "common/bit_field.h"
 #include "common/common_funcs.h"
 #include "common/common_types.h"
-#include "hid_core/hid_types.h"
+#include "core/hid/hid_types.h"
 
 namespace Service::HID {
-static constexpr std::size_t MaxSupportedNpadIdTypes = 10;
-static constexpr std::size_t StyleIndexCount = 7;
+static constexpr std::size_t NpadCount = 10;
 
 // This is nn::hid::NpadJoyHoldType
 enum class NpadJoyHoldType : u64 {

src/core/hle/service/hid/controllers/types/shared_memory_format.h

@@ -6,13 +6,13 @@
 #include "common/common_funcs.h"
 #include "common/common_types.h"
 #include "common/vector_math.h"
-#include "hid_core/hid_types.h"
-#include "hid_core/resources/debug_pad/debug_pad_types.h"
-#include "hid_core/resources/keyboard/keyboard_types.h"
-#include "hid_core/resources/mouse/mouse_types.h"
-#include "hid_core/resources/npad/npad_types.h"
-#include "hid_core/resources/ring_lifo.h"
-#include "hid_core/resources/touch_screen/touch_types.h"
+#include "core/hid/hid_types.h"
+#include "core/hle/service/hid//controllers/types/debug_pad_types.h"
+#include "core/hle/service/hid//controllers/types/keyboard_types.h"
+#include "core/hle/service/hid//controllers/types/mouse_types.h"
+#include "core/hle/service/hid//controllers/types/npad_types.h"
+#include "core/hle/service/hid//controllers/types/touch_types.h"
+#include "core/hle/service/hid/ring_lifo.h"
 
 namespace Service::HID {
 static const std::size_t HidEntryCount = 17;
@@ -171,7 +171,7 @@ static_assert(sizeof(NpadSharedMemoryEntry) == 0x5000, "NpadSharedMemoryEntry is
 
 // This is nn::hid::detail::NpadSharedMemoryFormat
 struct NpadSharedMemoryFormat {
-    std::array<NpadSharedMemoryEntry, MaxSupportedNpadIdTypes> npad_entry;
+    std::array<NpadSharedMemoryEntry, NpadCount> npad_entry;
 };
 static_assert(sizeof(NpadSharedMemoryFormat) == 0x32000,
               "NpadSharedMemoryFormat is an invalid size");

src/core/hle/service/hid/controllers/types/touch_types.h

@@ -10,7 +10,7 @@
 #include "common/common_funcs.h"
 #include "common/common_types.h"
 #include "common/point.h"
-#include "hid_core/hid_types.h"
+#include "core/hid/hid_types.h"
 
 namespace Service::HID {
 static constexpr std::size_t MAX_FINGERS = 16;

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

@@ -2,9 +2,9 @@
 // SPDX-License-Identifier: GPL-2.0-or-later
 
 #include "core/core_timing.h"
-#include "hid_core/resources/applet_resource.h"
-#include "hid_core/resources/shared_memory_format.h"
-#include "hid_core/resources/unique_pad/unique_pad.h"
+#include "core/hle/service/hid/controllers/applet_resource.h"
+#include "core/hle/service/hid/controllers/types/shared_memory_format.h"
+#include "core/hle/service/hid/controllers/unique_pad.h"
 
 namespace Service::HID {
 
@@ -24,7 +24,7 @@ void UniquePad::OnUpdate(const Core::Timing::CoreTiming& core_timing) {
     const u64 aruid = applet_resource->GetActiveAruid();
     auto* data = applet_resource->GetAruidData(aruid);
 
-    if (data == nullptr || !data->flag.is_assigned) {
+    if (data == nullptr) {
         return;
     }
 

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

@@ -3,7 +3,7 @@
 
 #pragma once
 
-#include "hid_core/resources/controller_base.h"
+#include "core/hle/service/hid/controllers/controller_base.h"
 
 namespace Service::HID {
 

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

@@ -0,0 +1,39 @@
+// SPDX-FileCopyrightText: Copyright 2019 yuzu Emulator Project
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#pragma once
+
+#include "core/hle/result.h"
+
+namespace Service::HID {
+
+constexpr Result PalmaResultSuccess{ErrorModule::HID, 0};
+constexpr Result NpadInvalidHandle{ErrorModule::HID, 100};
+constexpr Result NpadDeviceIndexOutOfRange{ErrorModule::HID, 107};
+constexpr Result VibrationInvalidStyleIndex{ErrorModule::HID, 122};
+constexpr Result VibrationInvalidNpadId{ErrorModule::HID, 123};
+constexpr Result VibrationDeviceIndexOutOfRange{ErrorModule::HID, 124};
+constexpr Result InvalidSixAxisFusionRange{ErrorModule::HID, 423};
+constexpr Result NpadIsDualJoycon{ErrorModule::HID, 601};
+constexpr Result NpadIsSameType{ErrorModule::HID, 602};
+constexpr Result InvalidNpadId{ErrorModule::HID, 709};
+constexpr Result NpadNotConnected{ErrorModule::HID, 710};
+constexpr Result InvalidArraySize{ErrorModule::HID, 715};
+
+constexpr Result ResultAppletResourceOverflow{ErrorModule::HID, 1041};
+constexpr Result ResultAppletResourceNotInitialized{ErrorModule::HID, 1042};
+constexpr Result ResultSharedMemoryNotInitialized{ErrorModule::HID, 1043};
+constexpr Result ResultAruidNoAvailableEntries{ErrorModule::HID, 1044};
+constexpr Result ResultAruidAlreadyRegistered{ErrorModule::HID, 1046};
+constexpr Result ResultAruidNotRegistered{ErrorModule::HID, 1047};
+
+constexpr Result InvalidPalmaHandle{ErrorModule::HID, 3302};
+
+} // namespace Service::HID
+
+namespace Service::IRS {
+
+constexpr Result InvalidProcessorState{ErrorModule::Irsensor, 78};
+constexpr Result InvalidIrCameraHandle{ErrorModule::Irsensor, 204};
+
+} // namespace Service::IRS

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

@@ -5,14 +5,14 @@
 #include "core/hle/kernel/kernel.h"
 #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"
-#include "hid_core/resource_manager.h"
-#include "hid_core/resources/hid_firmware_settings.h"
 
 namespace Service::HID {
 
@@ -25,7 +25,6 @@ void LoopProcess(Core::System& system) {
     // TODO: Remove this hack until this service is emulated properly.
     const auto process_list = system.Kernel().GetProcessList();
     if (!process_list.empty()) {
-        resouce_manager->Initialize();
         resouce_manager->RegisterAppletResourceUserId(process_list[0]->GetId(), true);
     }
 

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

@@ -2,8 +2,8 @@
 // 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"
-#include "hid_core/resource_manager.h"
 
 namespace Service::HID {
 

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

@@ -1,7 +1,7 @@
 // SPDX-FileCopyrightText: Copyright 2023 yuzu Emulator Project
 // SPDX-License-Identifier: GPL-3.0-or-later
 
-#include "hid_core/resources/hid_firmware_settings.h"
+#include "core/hle/service/hid/hid_firmware_settings.h"
 
 namespace Service::HID {
 

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

@@ -5,29 +5,30 @@
 #include "common/common_types.h"
 #include "common/logging/log.h"
 #include "common/settings.h"
+#include "core/hid/hid_core.h"
 #include "core/hle/kernel/k_shared_memory.h"
 #include "core/hle/kernel/k_transfer_memory.h"
 #include "core/hle/kernel/kernel.h"
+#include "core/hle/service/hid/errors.h"
+#include "core/hle/service/hid/hid_firmware_settings.h"
 #include "core/hle/service/hid/hid_server.h"
+#include "core/hle/service/hid/hid_util.h"
+#include "core/hle/service/hid/resource_manager.h"
 #include "core/hle/service/ipc_helpers.h"
 #include "core/memory.h"
-#include "hid_core/hid_result.h"
-#include "hid_core/hid_util.h"
-#include "hid_core/resource_manager.h"
-#include "hid_core/resources/hid_firmware_settings.h"
 
-#include "hid_core/resources/controller_base.h"
-#include "hid_core/resources/debug_pad/debug_pad.h"
-#include "hid_core/resources/keyboard/keyboard.h"
-#include "hid_core/resources/mouse/mouse.h"
-#include "hid_core/resources/npad/npad.h"
-#include "hid_core/resources/npad/npad_types.h"
-#include "hid_core/resources/palma/palma.h"
-#include "hid_core/resources/six_axis/console_six_axis.h"
-#include "hid_core/resources/six_axis/seven_six_axis.h"
-#include "hid_core/resources/six_axis/six_axis.h"
-#include "hid_core/resources/touch_screen/gesture.h"
-#include "hid_core/resources/touch_screen/touch_screen.h"
+#include "core/hle/service/hid/controllers/console_six_axis.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/seven_six_axis.h"
+#include "core/hle/service/hid/controllers/six_axis.h"
+#include "core/hle/service/hid/controllers/touchscreen.h"
+#include "core/hle/service/hid/controllers/types/npad_types.h"
 
 namespace Service::HID {
 
@@ -784,8 +785,8 @@ void IHidServer::IsFirmwareUpdateAvailableForSixAxisSensor(HLERequestContext& ct
 
     bool is_firmware_available{};
     auto controller = GetResourceManager()->GetNpad();
-    controller->IsFirmwareUpdateAvailableForSixAxisSensor(
-        parameters.applet_resource_user_id, parameters.sixaxis_handle, is_firmware_available);
+    controller->IsFirmwareUpdateAvailableForSixAxisSensor(parameters.sixaxis_handle,
+                                                          is_firmware_available);
 
     LOG_WARNING(
         Service_HID,
@@ -923,8 +924,8 @@ void IHidServer::ResetIsSixAxisSensorDeviceNewlyAssigned(HLERequestContext& ctx)
     const auto parameters{rp.PopRaw<Parameters>()};
 
     auto controller = GetResourceManager()->GetNpad();
-    const auto result = controller->ResetIsSixAxisSensorDeviceNewlyAssigned(
-        parameters.applet_resource_user_id, parameters.sixaxis_handle);
+    const auto result =
+        controller->ResetIsSixAxisSensorDeviceNewlyAssigned(parameters.sixaxis_handle);
 
     LOG_WARNING(
         Service_HID,
@@ -969,7 +970,7 @@ void IHidServer::ActivateGesture(HLERequestContext& ctx) {
 void IHidServer::SetSupportedNpadStyleSet(HLERequestContext& ctx) {
     IPC::RequestParser rp{ctx};
     struct Parameters {
-        Core::HID::NpadStyleSet supported_style_set;
+        Core::HID::NpadStyleSet supported_styleset;
         INSERT_PADDING_WORDS_NOINIT(1);
         u64 applet_resource_user_id;
     };
@@ -977,25 +978,13 @@ void IHidServer::SetSupportedNpadStyleSet(HLERequestContext& ctx) {
 
     const auto parameters{rp.PopRaw<Parameters>()};
 
-    LOG_DEBUG(Service_HID, "called, supported_style_set={}, applet_resource_user_id={}",
-              parameters.supported_style_set, parameters.applet_resource_user_id);
+    GetResourceManager()->GetNpad()->SetSupportedStyleSet({parameters.supported_styleset});
 
-    const auto npad = GetResourceManager()->GetNpad();
-    const Result result = npad->SetSupportedNpadStyleSet(parameters.applet_resource_user_id,
-                                                         parameters.supported_style_set);
-
-    if (result.IsSuccess()) {
-        Core::HID::NpadStyleTag style_tag{parameters.supported_style_set};
-        const auto revision = npad->GetRevision(parameters.applet_resource_user_id);
-
-        if (style_tag.palma != 0 && revision < NpadRevision::Revision3) {
-            // GetResourceManager()->GetPalma()->EnableBoostMode(parameters.applet_resource_user_id,
-            //                                                   true);
-        }
-    }
+    LOG_DEBUG(Service_HID, "called, supported_styleset={}, applet_resource_user_id={}",
+              parameters.supported_styleset, parameters.applet_resource_user_id);
 
     IPC::ResponseBuilder rb{ctx, 2};
-    rb.Push(result);
+    rb.Push(ResultSuccess);
 }
 
 void IHidServer::GetSupportedNpadStyleSet(HLERequestContext& ctx) {
@@ -1004,31 +993,19 @@ void IHidServer::GetSupportedNpadStyleSet(HLERequestContext& ctx) {
 
     LOG_DEBUG(Service_HID, "called, applet_resource_user_id={}", applet_resource_user_id);
 
-    Core::HID::NpadStyleSet supported_style_set{};
-    const auto npad = GetResourceManager()->GetNpad();
-    const auto result =
-        npad->GetSupportedNpadStyleSet(applet_resource_user_id, supported_style_set);
-
     IPC::ResponseBuilder rb{ctx, 3};
-    rb.Push(result);
-    rb.PushEnum(supported_style_set);
+    rb.Push(ResultSuccess);
+    rb.PushEnum(GetResourceManager()->GetNpad()->GetSupportedStyleSet().raw);
 }
 
 void IHidServer::SetSupportedNpadIdType(HLERequestContext& ctx) {
     IPC::RequestParser rp{ctx};
     const auto applet_resource_user_id{rp.Pop<u64>()};
-    const auto buffer = ctx.ReadBuffer();
-    const std::size_t elements = ctx.GetReadBufferNumElements<Core::HID::NpadIdType>();
+
+    const auto result = GetResourceManager()->GetNpad()->SetSupportedNpadIdTypes(ctx.ReadBuffer());
 
     LOG_DEBUG(Service_HID, "called, applet_resource_user_id={}", applet_resource_user_id);
 
-    std::vector<Core::HID::NpadIdType> supported_npad_list(elements);
-    memcpy(supported_npad_list.data(), buffer.data(), buffer.size());
-
-    const auto npad = GetResourceManager()->GetNpad();
-    const Result result =
-        npad->SetSupportedNpadIdType(applet_resource_user_id, supported_npad_list);
-
     IPC::ResponseBuilder rb{ctx, 2};
     rb.Push(result);
 }
@@ -1041,7 +1018,7 @@ void IHidServer::ActivateNpad(HLERequestContext& ctx) {
 
     auto npad = GetResourceManager()->GetNpad();
 
-    npad->SetRevision(applet_resource_user_id, NpadRevision::Revision0);
+    // TODO: npad->SetRevision(applet_resource_user_id, NpadRevision::Revision0);
     const Result result = npad->Activate(applet_resource_user_id);
 
     IPC::ResponseBuilder rb{ctx, 2};
@@ -1075,13 +1052,13 @@ void IHidServer::AcquireNpadStyleSetUpdateEventHandle(HLERequestContext& ctx) {
     LOG_DEBUG(Service_HID, "called, npad_id={}, applet_resource_user_id={}, unknown={}",
               parameters.npad_id, parameters.applet_resource_user_id, parameters.unknown);
 
-    Kernel::KReadableEvent* style_set_update_event;
-    const auto result = GetResourceManager()->GetNpad()->AcquireNpadStyleSetUpdateEventHandle(
-        parameters.applet_resource_user_id, &style_set_update_event, parameters.npad_id);
+    // Games expect this event to be signaled after calling this function
+    GetResourceManager()->GetNpad()->SignalStyleSetChangedEvent(parameters.npad_id);
 
     IPC::ResponseBuilder rb{ctx, 2, 1};
-    rb.Push(result);
-    rb.PushCopyObjects(style_set_update_event);
+    rb.Push(ResultSuccess);
+    rb.PushCopyObjects(
+        GetResourceManager()->GetNpad()->GetStyleSetChangedEvent(parameters.npad_id));
 }
 
 void IHidServer::DisconnectNpad(HLERequestContext& ctx) {
@@ -1096,7 +1073,7 @@ void IHidServer::DisconnectNpad(HLERequestContext& ctx) {
     const auto parameters{rp.PopRaw<Parameters>()};
 
     auto controller = GetResourceManager()->GetNpad();
-    controller->DisconnectNpad(parameters.applet_resource_user_id, parameters.npad_id);
+    controller->DisconnectNpad(parameters.npad_id);
 
     LOG_DEBUG(Service_HID, "called, npad_id={}, applet_resource_user_id={}", parameters.npad_id,
               parameters.applet_resource_user_id);
@@ -1136,7 +1113,7 @@ void IHidServer::ActivateNpadWithRevision(HLERequestContext& ctx) {
 
     auto npad = GetResourceManager()->GetNpad();
 
-    npad->SetRevision(parameters.applet_resource_user_id, parameters.revision);
+    // TODO: npad->SetRevision(applet_resource_user_id, revision);
     const auto result = npad->Activate(parameters.applet_resource_user_id);
 
     IPC::ResponseBuilder rb{ctx, 2};
@@ -1148,19 +1125,13 @@ void IHidServer::SetNpadJoyHoldType(HLERequestContext& ctx) {
     const auto applet_resource_user_id{rp.Pop<u64>()};
     const auto hold_type{rp.PopEnum<NpadJoyHoldType>()};
 
+    GetResourceManager()->GetNpad()->SetHoldType(hold_type);
+
     LOG_DEBUG(Service_HID, "called, applet_resource_user_id={}, hold_type={}",
               applet_resource_user_id, hold_type);
 
-    if (hold_type != NpadJoyHoldType::Horizontal && hold_type != NpadJoyHoldType::Vertical) {
-        // This should crash console
-        ASSERT_MSG(false, "Invalid npad joy hold type");
-    }
-
-    const auto npad = GetResourceManager()->GetNpad();
-    const auto result = npad->SetNpadJoyHoldType(applet_resource_user_id, hold_type);
-
     IPC::ResponseBuilder rb{ctx, 2};
-    rb.Push(result);
+    rb.Push(ResultSuccess);
 }
 
 void IHidServer::GetNpadJoyHoldType(HLERequestContext& ctx) {
@@ -1169,13 +1140,9 @@ void IHidServer::GetNpadJoyHoldType(HLERequestContext& ctx) {
 
     LOG_DEBUG(Service_HID, "called, applet_resource_user_id={}", applet_resource_user_id);
 
-    NpadJoyHoldType hold_type{};
-    const auto npad = GetResourceManager()->GetNpad();
-    const auto result = npad->GetNpadJoyHoldType(applet_resource_user_id, hold_type);
-
     IPC::ResponseBuilder rb{ctx, 4};
-    rb.Push(result);
-    rb.PushEnum(hold_type);
+    rb.Push(ResultSuccess);
+    rb.PushEnum(GetResourceManager()->GetNpad()->GetHoldType());
 }
 
 void IHidServer::SetNpadJoyAssignmentModeSingleByDefault(HLERequestContext& ctx) {
@@ -1191,8 +1158,8 @@ void IHidServer::SetNpadJoyAssignmentModeSingleByDefault(HLERequestContext& ctx)
 
     Core::HID::NpadIdType new_npad_id{};
     auto controller = GetResourceManager()->GetNpad();
-    controller->SetNpadMode(parameters.applet_resource_user_id, new_npad_id, parameters.npad_id,
-                            NpadJoyDeviceType::Left, NpadJoyAssignmentMode::Single);
+    controller->SetNpadMode(new_npad_id, parameters.npad_id, NpadJoyDeviceType::Left,
+                            NpadJoyAssignmentMode::Single);
 
     LOG_INFO(Service_HID, "called, npad_id={}, applet_resource_user_id={}", parameters.npad_id,
              parameters.applet_resource_user_id);
@@ -1215,8 +1182,8 @@ void IHidServer::SetNpadJoyAssignmentModeSingle(HLERequestContext& ctx) {
 
     Core::HID::NpadIdType new_npad_id{};
     auto controller = GetResourceManager()->GetNpad();
-    controller->SetNpadMode(parameters.applet_resource_user_id, new_npad_id, parameters.npad_id,
-                            parameters.npad_joy_device_type, NpadJoyAssignmentMode::Single);
+    controller->SetNpadMode(new_npad_id, parameters.npad_id, parameters.npad_joy_device_type,
+                            NpadJoyAssignmentMode::Single);
 
     LOG_INFO(Service_HID, "called, npad_id={}, applet_resource_user_id={}, npad_joy_device_type={}",
              parameters.npad_id, parameters.applet_resource_user_id,
@@ -1239,8 +1206,7 @@ void IHidServer::SetNpadJoyAssignmentModeDual(HLERequestContext& ctx) {
 
     Core::HID::NpadIdType new_npad_id{};
     auto controller = GetResourceManager()->GetNpad();
-    controller->SetNpadMode(parameters.applet_resource_user_id, new_npad_id, parameters.npad_id, {},
-                            NpadJoyAssignmentMode::Dual);
+    controller->SetNpadMode(new_npad_id, parameters.npad_id, {}, NpadJoyAssignmentMode::Dual);
 
     LOG_DEBUG(Service_HID, "called, npad_id={}, applet_resource_user_id={}", parameters.npad_id,
               parameters.applet_resource_user_id); // Spams a lot when controller applet is open
@@ -1256,8 +1222,7 @@ void IHidServer::MergeSingleJoyAsDualJoy(HLERequestContext& ctx) {
     const auto applet_resource_user_id{rp.Pop<u64>()};
 
     auto controller = GetResourceManager()->GetNpad();
-    const auto result =
-        controller->MergeSingleJoyAsDualJoy(applet_resource_user_id, npad_id_1, npad_id_2);
+    const auto result = controller->MergeSingleJoyAsDualJoy(npad_id_1, npad_id_2);
 
     LOG_DEBUG(Service_HID, "called, npad_id_1={}, npad_id_2={}, applet_resource_user_id={}",
               npad_id_1, npad_id_2, applet_resource_user_id);
@@ -1270,9 +1235,9 @@ void IHidServer::StartLrAssignmentMode(HLERequestContext& ctx) {
     IPC::RequestParser rp{ctx};
     const auto applet_resource_user_id{rp.Pop<u64>()};
 
-    LOG_DEBUG(Service_HID, "called, applet_resource_user_id={}", applet_resource_user_id);
+    GetResourceManager()->GetNpad()->StartLRAssignmentMode();
 
-    GetResourceManager()->GetNpad()->StartLrAssignmentMode(applet_resource_user_id);
+    LOG_DEBUG(Service_HID, "called, applet_resource_user_id={}", applet_resource_user_id);
 
     IPC::ResponseBuilder rb{ctx, 2};
     rb.Push(ResultSuccess);
@@ -1282,9 +1247,9 @@ void IHidServer::StopLrAssignmentMode(HLERequestContext& ctx) {
     IPC::RequestParser rp{ctx};
     const auto applet_resource_user_id{rp.Pop<u64>()};
 
-    LOG_DEBUG(Service_HID, "called, applet_resource_user_id={}", applet_resource_user_id);
+    GetResourceManager()->GetNpad()->StopLRAssignmentMode();
 
-    GetResourceManager()->GetNpad()->StopLrAssignmentMode(applet_resource_user_id);
+    LOG_DEBUG(Service_HID, "called, applet_resource_user_id={}", applet_resource_user_id);
 
     IPC::ResponseBuilder rb{ctx, 2};
     rb.Push(ResultSuccess);
@@ -1295,23 +1260,13 @@ void IHidServer::SetNpadHandheldActivationMode(HLERequestContext& ctx) {
     const auto applet_resource_user_id{rp.Pop<u64>()};
     const auto activation_mode{rp.PopEnum<NpadHandheldActivationMode>()};
 
+    GetResourceManager()->GetNpad()->SetNpadHandheldActivationMode(activation_mode);
+
     LOG_DEBUG(Service_HID, "called, applet_resource_user_id={}, activation_mode={}",
               applet_resource_user_id, activation_mode);
 
-    if (activation_mode >= NpadHandheldActivationMode::MaxActivationMode) {
-        // Console should crash here
-        ASSERT_MSG(false, "Activation mode should be always None, Single or Dual");
-        IPC::ResponseBuilder rb{ctx, 2};
-        rb.Push(ResultSuccess);
-        return;
-    }
-
-    const auto npad = GetResourceManager()->GetNpad();
-    const auto result =
-        npad->SetNpadHandheldActivationMode(applet_resource_user_id, activation_mode);
-
     IPC::ResponseBuilder rb{ctx, 2};
-    rb.Push(result);
+    rb.Push(ResultSuccess);
 }
 
 void IHidServer::GetNpadHandheldActivationMode(HLERequestContext& ctx) {
@@ -1320,14 +1275,9 @@ void IHidServer::GetNpadHandheldActivationMode(HLERequestContext& ctx) {
 
     LOG_DEBUG(Service_HID, "called, applet_resource_user_id={}", applet_resource_user_id);
 
-    NpadHandheldActivationMode activation_mode{};
-    const auto npad = GetResourceManager()->GetNpad();
-    const auto result =
-        npad->GetNpadHandheldActivationMode(applet_resource_user_id, activation_mode);
-
     IPC::ResponseBuilder rb{ctx, 4};
-    rb.Push(result);
-    rb.PushEnum(activation_mode);
+    rb.Push(ResultSuccess);
+    rb.PushEnum(GetResourceManager()->GetNpad()->GetNpadHandheldActivationMode());
 }
 
 void IHidServer::SwapNpadAssignment(HLERequestContext& ctx) {
@@ -1336,12 +1286,12 @@ void IHidServer::SwapNpadAssignment(HLERequestContext& ctx) {
     const auto npad_id_2{rp.PopEnum<Core::HID::NpadIdType>()};
     const auto applet_resource_user_id{rp.Pop<u64>()};
 
+    auto controller = GetResourceManager()->GetNpad();
+    const auto result = controller->SwapNpadAssignment(npad_id_1, npad_id_2);
+
     LOG_DEBUG(Service_HID, "called, npad_id_1={}, npad_id_2={}, applet_resource_user_id={}",
               npad_id_1, npad_id_2, applet_resource_user_id);
 
-    const auto npad = GetResourceManager()->GetNpad();
-    const auto result = npad->SwapNpadAssignment(applet_resource_user_id, npad_id_1, npad_id_2);
-
     IPC::ResponseBuilder rb{ctx, 2};
     rb.Push(result);
 }
@@ -1357,19 +1307,13 @@ void IHidServer::IsUnintendedHomeButtonInputProtectionEnabled(HLERequestContext&
 
     const auto parameters{rp.PopRaw<Parameters>()};
 
-    LOG_INFO(Service_HID, "called, npad_id={}, applet_resource_user_id={}", parameters.npad_id,
-             parameters.applet_resource_user_id);
+    bool is_enabled = false;
+    auto controller = GetResourceManager()->GetNpad();
+    const auto result =
+        controller->IsUnintendedHomeButtonInputProtectionEnabled(parameters.npad_id, is_enabled);
 
-    if (!IsNpadIdValid(parameters.npad_id)) {
-        IPC::ResponseBuilder rb{ctx, 3};
-        rb.Push(ResultInvalidNpadId);
-        return;
-    }
-
-    bool is_enabled{};
-    const auto npad = GetResourceManager()->GetNpad();
-    const auto result = npad->IsUnintendedHomeButtonInputProtectionEnabled(
-        is_enabled, parameters.applet_resource_user_id, parameters.npad_id);
+    LOG_WARNING(Service_HID, "(STUBBED) called, npad_id={}, applet_resource_user_id={}",
+                parameters.npad_id, parameters.applet_resource_user_id);
 
     IPC::ResponseBuilder rb{ctx, 3};
     rb.Push(result);
@@ -1388,18 +1332,13 @@ void IHidServer::EnableUnintendedHomeButtonInputProtection(HLERequestContext& ct
 
     const auto parameters{rp.PopRaw<Parameters>()};
 
-    LOG_INFO(Service_HID, "called, is_enabled={}, npad_id={}, applet_resource_user_id={}",
-             parameters.is_enabled, parameters.npad_id, parameters.applet_resource_user_id);
+    auto controller = GetResourceManager()->GetNpad();
+    const auto result = controller->SetUnintendedHomeButtonInputProtectionEnabled(
+        parameters.is_enabled, parameters.npad_id);
 
-    if (!IsNpadIdValid(parameters.npad_id)) {
-        IPC::ResponseBuilder rb{ctx, 3};
-        rb.Push(ResultInvalidNpadId);
-        return;
-    }
-
-    const auto npad = GetResourceManager()->GetNpad();
-    const auto result = npad->EnableUnintendedHomeButtonInputProtection(
-        parameters.applet_resource_user_id, parameters.npad_id, parameters.is_enabled);
+    LOG_DEBUG(Service_HID,
+              "(STUBBED) called, is_enabled={}, npad_id={}, applet_resource_user_id={}",
+              parameters.is_enabled, parameters.npad_id, parameters.applet_resource_user_id);
 
     IPC::ResponseBuilder rb{ctx, 2};
     rb.Push(result);
@@ -1420,8 +1359,8 @@ void IHidServer::SetNpadJoyAssignmentModeSingleWithDestination(HLERequestContext
     Core::HID::NpadIdType new_npad_id{};
     auto controller = GetResourceManager()->GetNpad();
     const auto is_reassigned =
-        controller->SetNpadMode(parameters.applet_resource_user_id, new_npad_id, parameters.npad_id,
-                                parameters.npad_joy_device_type, NpadJoyAssignmentMode::Single);
+        controller->SetNpadMode(new_npad_id, parameters.npad_id, parameters.npad_joy_device_type,
+                                NpadJoyAssignmentMode::Single);
 
     LOG_INFO(Service_HID, "called, npad_id={}, applet_resource_user_id={}, npad_joy_device_type={}",
              parameters.npad_id, parameters.applet_resource_user_id,
@@ -1436,7 +1375,7 @@ void IHidServer::SetNpadJoyAssignmentModeSingleWithDestination(HLERequestContext
 void IHidServer::SetNpadAnalogStickUseCenterClamp(HLERequestContext& ctx) {
     IPC::RequestParser rp{ctx};
     struct Parameters {
-        bool use_center_clamp;
+        bool analog_stick_use_center_clamp;
         INSERT_PADDING_BYTES_NOINIT(7);
         u64 applet_resource_user_id;
     };
@@ -1444,11 +1383,12 @@ void IHidServer::SetNpadAnalogStickUseCenterClamp(HLERequestContext& ctx) {
 
     const auto parameters{rp.PopRaw<Parameters>()};
 
-    LOG_WARNING(Service_HID, "(STUBBED) called, use_center_clamp={}, applet_resource_user_id={}",
-                parameters.use_center_clamp, parameters.applet_resource_user_id);
+    GetResourceManager()->GetNpad()->SetAnalogStickUseCenterClamp(
+        parameters.analog_stick_use_center_clamp);
 
-    GetResourceManager()->GetNpad()->SetNpadAnalogStickUseCenterClamp(
-        parameters.applet_resource_user_id, parameters.use_center_clamp);
+    LOG_WARNING(Service_HID,
+                "(STUBBED) called, analog_stick_use_center_clamp={}, applet_resource_user_id={}",
+                parameters.analog_stick_use_center_clamp, parameters.applet_resource_user_id);
 
     IPC::ResponseBuilder rb{ctx, 2};
     rb.Push(ResultSuccess);
@@ -1556,8 +1496,7 @@ void IHidServer::SendVibrationValue(HLERequestContext& ctx) {
 
     const auto parameters{rp.PopRaw<Parameters>()};
 
-    GetResourceManager()->GetNpad()->VibrateController(parameters.applet_resource_user_id,
-                                                       parameters.vibration_device_handle,
+    GetResourceManager()->GetNpad()->VibrateController(parameters.vibration_device_handle,
                                                        parameters.vibration_value);
 
     LOG_DEBUG(Service_HID,
@@ -1589,8 +1528,8 @@ void IHidServer::GetActualVibrationValue(HLERequestContext& ctx) {
 
     IPC::ResponseBuilder rb{ctx, 6};
     rb.Push(ResultSuccess);
-    rb.PushRaw(GetResourceManager()->GetNpad()->GetLastVibration(
-        parameters.applet_resource_user_id, parameters.vibration_device_handle));
+    rb.PushRaw(
+        GetResourceManager()->GetNpad()->GetLastVibration(parameters.vibration_device_handle));
 }
 
 void IHidServer::CreateActiveVibrationDeviceList(HLERequestContext& ctx) {
@@ -1641,8 +1580,7 @@ void IHidServer::SendVibrationValues(HLERequestContext& ctx) {
     auto vibration_values = std::span(
         reinterpret_cast<const Core::HID::VibrationValue*>(vibration_data.data()), vibration_count);
 
-    GetResourceManager()->GetNpad()->VibrateControllers(applet_resource_user_id,
-                                                        vibration_device_handles, vibration_values);
+    GetResourceManager()->GetNpad()->VibrateControllers(vibration_device_handles, vibration_values);
 
     LOG_DEBUG(Service_HID, "called, applet_resource_user_id={}", applet_resource_user_id);
 
@@ -1696,8 +1634,8 @@ void IHidServer::SendVibrationGcErmCommand(HLERequestContext& ctx) {
         }
     }();
 
-    GetResourceManager()->GetNpad()->VibrateController(
-        parameters.applet_resource_user_id, parameters.vibration_device_handle, vibration_value);
+    GetResourceManager()->GetNpad()->VibrateController(parameters.vibration_device_handle,
+                                                       vibration_value);
 
     LOG_DEBUG(Service_HID,
               "called, npad_type={}, npad_id={}, device_index={}, applet_resource_user_id={}, "
@@ -1721,8 +1659,8 @@ void IHidServer::GetActualVibrationGcErmCommand(HLERequestContext& ctx) {
 
     const auto parameters{rp.PopRaw<Parameters>()};
 
-    const auto last_vibration = GetResourceManager()->GetNpad()->GetLastVibration(
-        parameters.applet_resource_user_id, parameters.vibration_device_handle);
+    const auto last_vibration =
+        GetResourceManager()->GetNpad()->GetLastVibration(parameters.vibration_device_handle);
 
     const auto gc_erm_command = [last_vibration] {
         if (last_vibration.low_amplitude != 0.0f || last_vibration.high_amplitude != 0.0f) {
@@ -1794,7 +1732,7 @@ void IHidServer::IsVibrationDeviceMounted(HLERequestContext& ctx) {
     IPC::ResponseBuilder rb{ctx, 3};
     rb.Push(ResultSuccess);
     rb.Push(GetResourceManager()->GetNpad()->IsVibrationDeviceMounted(
-        parameters.applet_resource_user_id, parameters.vibration_device_handle));
+        parameters.vibration_device_handle));
 }
 
 void IHidServer::ActivateConsoleSixAxisSensor(HLERequestContext& ctx) {
@@ -2377,10 +2315,10 @@ void IHidServer::SetNpadCommunicationMode(HLERequestContext& ctx) {
     const auto applet_resource_user_id{rp.Pop<u64>()};
     const auto communication_mode{rp.PopEnum<NpadCommunicationMode>()};
 
-    LOG_DEBUG(Service_HID, "called, applet_resource_user_id={}, communication_mode={}",
-              applet_resource_user_id, communication_mode);
+    GetResourceManager()->GetNpad()->SetNpadCommunicationMode(communication_mode);
 
-    // This function has been stubbed since 2.0.0+
+    LOG_WARNING(Service_HID, "(STUBBED) called, applet_resource_user_id={}, communication_mode={}",
+                applet_resource_user_id, communication_mode);
 
     IPC::ResponseBuilder rb{ctx, 2};
     rb.Push(ResultSuccess);
@@ -2388,15 +2326,12 @@ void IHidServer::SetNpadCommunicationMode(HLERequestContext& ctx) {
 
 void IHidServer::GetNpadCommunicationMode(HLERequestContext& ctx) {
     IPC::RequestParser rp{ctx};
-    const auto applet_resource_user_id{rp.Pop<u64>()};
 
-    LOG_DEBUG(Service_HID, "called, applet_resource_user_id={}", applet_resource_user_id);
-
-    // This function has been stubbed since 2.0.0+
+    LOG_WARNING(Service_HID, "(STUBBED) called");
 
     IPC::ResponseBuilder rb{ctx, 4};
     rb.Push(ResultSuccess);
-    rb.PushEnum(NpadCommunicationMode::Default);
+    rb.PushEnum(GetResourceManager()->GetNpad()->GetNpadCommunicationMode());
 }
 
 void IHidServer::SetTouchScreenConfiguration(HLERequestContext& ctx) {

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

@@ -1,14 +1,15 @@
 // 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/palma.h"
+#include "core/hle/service/hid/controllers/touchscreen.h"
+#include "core/hle/service/hid/controllers/types/npad_types.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"
-#include "hid_core/hid_result.h"
-#include "hid_core/resource_manager.h"
-#include "hid_core/resources/npad/npad.h"
-#include "hid_core/resources/npad/npad_types.h"
-#include "hid_core/resources/palma/palma.h"
-#include "hid_core/resources/touch_screen/touch_screen.h"
 
 namespace Service::HID {
 
@@ -239,12 +240,9 @@ IHidSystemServer::~IHidSystemServer() {
 };
 
 void IHidSystemServer::ApplyNpadSystemCommonPolicy(HLERequestContext& ctx) {
-    IPC::RequestParser rp{ctx};
-    const auto applet_resource_user_id{rp.Pop<u64>()};
+    LOG_WARNING(Service_HID, "called");
 
-    LOG_INFO(Service_HID, "called, applet_resource_user_id={}", applet_resource_user_id);
-
-    GetResourceManager()->GetNpad()->ApplyNpadSystemCommonPolicy(applet_resource_user_id);
+    GetResourceManager()->GetNpad()->ApplyNpadSystemCommonPolicy();
 
     IPC::ResponseBuilder rb{ctx, 2};
     rb.Push(ResultSuccess);
@@ -269,16 +267,13 @@ void IHidSystemServer::GetLastActiveNpad(HLERequestContext& ctx) {
 
     IPC::ResponseBuilder rb{ctx, 3};
     rb.Push(ResultSuccess);
-    rb.Push(0); // Dont forget to fix this
+    rb.PushEnum(system.HIDCore().GetLastActiveController());
 }
 
 void IHidSystemServer::ApplyNpadSystemCommonPolicyFull(HLERequestContext& ctx) {
-    IPC::RequestParser rp{ctx};
-    const auto applet_resource_user_id{rp.Pop<u64>()};
+    LOG_WARNING(Service_HID, "called");
 
-    LOG_INFO(Service_HID, "called, applet_resource_user_id={}", applet_resource_user_id);
-
-    GetResourceManager()->GetNpad()->ApplyNpadSystemCommonPolicyFull(applet_resource_user_id);
+    GetResourceManager()->GetNpad()->ApplyNpadSystemCommonPolicy();
 
     IPC::ResponseBuilder rb{ctx, 2};
     rb.Push(ResultSuccess);
@@ -303,32 +298,28 @@ void IHidSystemServer::GetNpadFullKeyGripColor(HLERequestContext& ctx) {
 
 void IHidSystemServer::GetMaskedSupportedNpadStyleSet(HLERequestContext& ctx) {
     IPC::RequestParser rp{ctx};
-    const auto applet_resource_user_id{rp.Pop<u64>()};
 
-    LOG_INFO(Service_HID, "called, applet_resource_user_id={}", applet_resource_user_id);
+    LOG_INFO(Service_HID, "(STUBBED) called");
 
-    Core::HID::NpadStyleSet supported_styleset{};
-    const auto& npad = GetResourceManager()->GetNpad();
-    const Result result =
-        npad->GetMaskedSupportedNpadStyleSet(applet_resource_user_id, supported_styleset);
+    Core::HID::NpadStyleSet supported_styleset =
+        GetResourceManager()->GetNpad()->GetSupportedStyleSet().raw;
 
     IPC::ResponseBuilder rb{ctx, 3};
-    rb.Push(result);
+    rb.Push(ResultSuccess);
     rb.PushEnum(supported_styleset);
 }
 
 void IHidSystemServer::SetSupportedNpadStyleSetAll(HLERequestContext& ctx) {
     IPC::RequestParser rp{ctx};
-    const auto applet_resource_user_id{rp.Pop<u64>()};
 
-    LOG_DEBUG(Service_HID, "called, applet_resource_user_id={}", applet_resource_user_id);
+    LOG_INFO(Service_HID, "(STUBBED) called");
 
-    const auto& npad = GetResourceManager()->GetNpad();
-    const auto result =
-        npad->SetSupportedNpadStyleSet(applet_resource_user_id, Core::HID::NpadStyleSet::All);
+    Core::HID::NpadStyleSet supported_styleset =
+        GetResourceManager()->GetNpad()->GetSupportedStyleSet().raw;
 
-    IPC::ResponseBuilder rb{ctx, 2};
-    rb.Push(result);
+    IPC::ResponseBuilder rb{ctx, 3};
+    rb.Push(ResultSuccess);
+    rb.PushEnum(supported_styleset);
 }
 
 void IHidSystemServer::GetAppletDetailedUiType(HLERequestContext& ctx) {

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

@@ -3,8 +3,8 @@
 
 #pragma once
 
-#include "hid_core/hid_result.h"
-#include "hid_core/hid_types.h"
+#include "core/hid/hid_types.h"
+#include "core/hle/service/hid/errors.h"
 
 namespace Service::HID {
 
@@ -31,7 +31,7 @@ constexpr Result IsSixaxisHandleValid(const Core::HID::SixAxisSensorHandle& hand
     const bool device_index = handle.device_index < Core::HID::DeviceIndex::MaxDeviceIndex;
 
     if (!npad_id) {
-        return ResultInvalidNpadId;
+        return InvalidNpadId;
     }
     if (!device_index) {
         return NpadDeviceIndexOutOfRange;
@@ -54,15 +54,15 @@ constexpr Result IsVibrationHandleValid(const Core::HID::VibrationDeviceHandle&
         // These support vibration
         break;
     default:
-        return ResultVibrationInvalidStyleIndex;
+        return VibrationInvalidStyleIndex;
     }
 
     if (!IsNpadIdValid(static_cast<Core::HID::NpadIdType>(handle.npad_id))) {
-        return ResultVibrationInvalidNpadId;
+        return VibrationInvalidNpadId;
     }
 
     if (handle.device_index >= Core::HID::DeviceIndex::MaxDeviceIndex) {
-        return ResultVibrationDeviceIndexOutOfRange;
+        return VibrationDeviceIndexOutOfRange;
     }
 
     return ResultSuccess;

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

@@ -5,18 +5,18 @@
 #include "common/settings.h"
 #include "core/core.h"
 #include "core/core_timing.h"
+#include "core/hid/hid_types.h"
 #include "core/hle/kernel/k_event.h"
 #include "core/hle/kernel/k_readable_event.h"
 #include "core/hle/kernel/k_shared_memory.h"
 #include "core/hle/kernel/k_transfer_memory.h"
 #include "core/hle/service/hid/hidbus.h"
+#include "core/hle/service/hid/hidbus/ringcon.h"
+#include "core/hle/service/hid/hidbus/starlink.h"
+#include "core/hle/service/hid/hidbus/stubbed.h"
 #include "core/hle/service/ipc_helpers.h"
 #include "core/hle/service/service.h"
 #include "core/memory.h"
-#include "hid_core/hid_types.h"
-#include "hid_core/hidbus/ringcon.h"
-#include "hid_core/hidbus/starlink.h"
-#include "hid_core/hidbus/stubbed.h"
 
 namespace Service::HID {
 // (15ms, 66Hz)