Android 256

Merge yuzu-emu#13048
Merge yuzu-emu#13035
2024-02-19 00:56:59 +00:00 · 2024-02-19 00:56:59 +00:00 · 2024-02-19 00:56:59 +00:00 · 2024-02-19 00:56:59 +00:00 · 2024-02-19 00:56:59 +00:00 · 2024-02-19 00:56:59 +00:00
345 changed files with 7720 additions and 10572 deletions
--- a/.github/workflows/verify.yml
+++ b/.github/workflows/verify.yml
@ -81,7 +81,8 @@ jobs:
          fetch-depth: 0
      - name: Install dependencies
        run: |
-          brew install autoconf automake boost ccache ffmpeg fmt glslang hidapi libtool libusb lz4 ninja nlohmann-json openssl pkg-config qt@5 sdl2 speexdsp zlib zlib zstd
+          # workaround for https://github.com/actions/setup-python/issues/577
+          brew install autoconf automake boost@1.83 ccache ffmpeg fmt glslang hidapi libtool libusb lz4 ninja nlohmann-json openssl pkg-config qt@5 sdl2 speexdsp zlib zlib zstd || brew link --overwrite python@3.12
      - name: Build
        run: |
          mkdir build
--- a/README.md
+++ b/README.md
@ -1,12 +1,14 @@
 | Pull Request | Commit | Title | Author | Merged? |
 |----|----|----|----|----|
-| [12461](https://github.com/yuzu-emu/yuzu//pull/12461) | [`a84e8e26f`](https://github.com/yuzu-emu/yuzu//pull/12461/files) | Rework Nvdec and VIC to fix out-of-order videos, and speed up decoding. | [Kelebek1](https://github.com/Kelebek1/) | Yes |
+| [10529](https://github.com/yuzu-emu/yuzu//pull/10529) | [`368bf2211`](https://github.com/yuzu-emu/yuzu//pull/10529/files) | caches: make critical reclamation less eager and possible in more cases | [liamwhite](https://github.com/liamwhite/) | Yes |
+| [12461](https://github.com/yuzu-emu/yuzu//pull/12461) | [`acc26667b`](https://github.com/yuzu-emu/yuzu//pull/12461/files) | Rework Nvdec and VIC to fix out-of-order videos, and speed up decoding. | [Kelebek1](https://github.com/Kelebek1/) | Yes |
 | [12749](https://github.com/yuzu-emu/yuzu//pull/12749) | [`aad4b0d6f`](https://github.com/yuzu-emu/yuzu//pull/12749/files) | general: workarounds for SMMU syncing issues | [liamwhite](https://github.com/liamwhite/) | Yes |
-| [13018](https://github.com/yuzu-emu/yuzu//pull/13018) | [`fffec12d3`](https://github.com/yuzu-emu/yuzu//pull/13018/files) | am: rewrite part 2 | [liamwhite](https://github.com/liamwhite/) | Yes |
-| [13096](https://github.com/yuzu-emu/yuzu//pull/13096) | [`0a8759057`](https://github.com/yuzu-emu/yuzu//pull/13096/files) | texture_cache: use two-pass collection for costly load resources | [liamwhite](https://github.com/liamwhite/) | Yes |
-| [13122](https://github.com/yuzu-emu/yuzu//pull/13122) | [`5dc08c7fe`](https://github.com/yuzu-emu/yuzu//pull/13122/files) | vk_rasterizer: flip scissor y on lower left origin mode | [liamwhite](https://github.com/liamwhite/) | Yes |
-| [13135](https://github.com/yuzu-emu/yuzu//pull/13135) | [`fc6a87bba`](https://github.com/yuzu-emu/yuzu//pull/13135/files) | service: hid: Migrate HidServer to new IPC | [german77](https://github.com/german77/) | Yes |
-| [13159](https://github.com/yuzu-emu/yuzu//pull/13159) | [`dc50b95a4`](https://github.com/yuzu-emu/yuzu//pull/13159/files) | core: enable error applet, add stubs for web applet | [liamwhite](https://github.com/liamwhite/) | Yes |
+| [13000](https://github.com/yuzu-emu/yuzu//pull/13000) | [`461eaca7e`](https://github.com/yuzu-emu/yuzu//pull/13000/files) | device_memory_manager: skip unregistered interfaces on invalidate | [liamwhite](https://github.com/liamwhite/) | Yes |
+| [13006](https://github.com/yuzu-emu/yuzu//pull/13006) | [`3067bfd12`](https://github.com/yuzu-emu/yuzu//pull/13006/files) | buffer_cache: use mapped range with large vertex buffer size | [liamwhite](https://github.com/liamwhite/) | Yes |
+| [13026](https://github.com/yuzu-emu/yuzu//pull/13026) | [`462ea921e`](https://github.com/yuzu-emu/yuzu//pull/13026/files) |  shader_recompiler: fix non-const offset for arrayed image types  | [liamwhite](https://github.com/liamwhite/) | Yes |
+| [13031](https://github.com/yuzu-emu/yuzu//pull/13031) | [`110969e20`](https://github.com/yuzu-emu/yuzu//pull/13031/files) | service: btm: Migrate service to new IPC | [german77](https://github.com/german77/) | Yes |
+| [13035](https://github.com/yuzu-emu/yuzu//pull/13035) | [`940a71422`](https://github.com/yuzu-emu/yuzu//pull/13035/files) | vi: manage resources independently of nvnflinger and refactor | [liamwhite](https://github.com/liamwhite/) | Yes |
+| [13048](https://github.com/yuzu-emu/yuzu//pull/13048) | [`d45a12826`](https://github.com/yuzu-emu/yuzu//pull/13048/files) | ns: rewrite for new IPC | [liamwhite](https://github.com/liamwhite/) | Yes |


 End of merge log. You can find the original README.md below the break.
--- a/externals/sse2neon/sse2neon.h
+++ b/externals/sse2neon/sse2neon.h
@ -1,6 +1,3 @@
-// SPDX-FileCopyrightText: Copyright 2015-2024 SSE2NEON Contributors
-// SPDX-License-Identifier: MIT
-
 #ifndef SSE2NEON_H
 #define SSE2NEON_H

--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@ -121,7 +121,6 @@ else()
        -Wno-attributes
        -Wno-invalid-offsetof
        -Wno-unused-parameter
-        -Wno-missing-field-initializers
    )

    if (CMAKE_CXX_COMPILER_ID MATCHES Clang) # Clang or AppleClang
--- a/src/android/app/src/main/java/org/yuzu/yuzu_emu/features/input/model/PlayerInput.kt
+++ b/src/android/app/src/main/java/org/yuzu/yuzu_emu/features/input/model/PlayerInput.kt
@ -64,17 +64,17 @@ data class PlayerInput(
    fun hasMapping(): Boolean {
        var hasMapping = false
        buttons.forEach {
-            if (it != "[empty]" && it.isNotEmpty()) {
+            if (it != "[empty]") {
                hasMapping = true
            }
        }
        analogs.forEach {
-            if (it != "[empty]" && it.isNotEmpty()) {
+            if (it != "[empty]") {
                hasMapping = true
            }
        }
        motions.forEach {
-            if (it != "[empty]" && it.isNotEmpty()) {
+            if (it != "[empty]") {
                hasMapping = true
            }
        }
--- a/src/android/app/src/main/java/org/yuzu/yuzu_emu/features/settings/model/StringSetting.kt
+++ b/src/android/app/src/main/java/org/yuzu/yuzu_emu/features/settings/model/StringSetting.kt
@ -6,8 +6,7 @@ package org.yuzu.yuzu_emu.features.settings.model
 import org.yuzu.yuzu_emu.utils.NativeConfig

 enum class StringSetting(override val key: String) : AbstractStringSetting {
-    DRIVER_PATH("driver_path"),
-    DEVICE_NAME("device_name");
+    DRIVER_PATH("driver_path");

    override fun getString(needsGlobal: Boolean): String = NativeConfig.getString(key, needsGlobal)

--- a/src/android/app/src/main/java/org/yuzu/yuzu_emu/features/settings/model/view/SettingsItem.kt
+++ b/src/android/app/src/main/java/org/yuzu/yuzu_emu/features/settings/model/view/SettingsItem.kt
@ -16,7 +16,6 @@ import org.yuzu.yuzu_emu.features.settings.model.ByteSetting
 import org.yuzu.yuzu_emu.features.settings.model.IntSetting
 import org.yuzu.yuzu_emu.features.settings.model.LongSetting
 import org.yuzu.yuzu_emu.features.settings.model.ShortSetting
-import org.yuzu.yuzu_emu.features.settings.model.StringSetting
 import org.yuzu.yuzu_emu.utils.NativeConfig

 /**
@ -76,9 +75,6 @@ abstract class SettingsItem(
        get() = NativeLibrary.isRunning() && !setting.global &&
            !NativeConfig.isPerGameConfigLoaded()

-    val clearable: Boolean
-        get() = !setting.global && NativeConfig.isPerGameConfigLoaded()
-
    companion object {
        const val TYPE_HEADER = 0
        const val TYPE_SWITCH = 1
@ -91,7 +87,6 @@ abstract class SettingsItem(
        const val TYPE_INPUT = 8
        const val TYPE_INT_SINGLE_CHOICE = 9
        const val TYPE_INPUT_PROFILE = 10
-        const val TYPE_STRING_INPUT = 11

        const val FASTMEM_COMBINED = "fastmem_combined"

@ -110,7 +105,6 @@ abstract class SettingsItem(

        // List of all general
        val settingsItems = HashMap<String, SettingsItem>().apply {
-            put(StringInputSetting(StringSetting.DEVICE_NAME, titleId = R.string.device_name))
            put(
                SwitchSetting(
                    BooleanSetting.RENDERER_USE_SPEED_LIMIT,
--- a/src/android/app/src/main/java/org/yuzu/yuzu_emu/features/settings/model/view/StringInputSetting.kt
+++ b/src/android/app/src/main/java/org/yuzu/yuzu_emu/features/settings/model/view/StringInputSetting.kt
@ -1,22 +0,0 @@
-// SPDX-FileCopyrightText: 2024 yuzu Emulator Project
-// SPDX-License-Identifier: GPL-2.0-or-later
-
-package org.yuzu.yuzu_emu.features.settings.model.view
-
-import androidx.annotation.StringRes
-import org.yuzu.yuzu_emu.features.settings.model.AbstractStringSetting
-
-class StringInputSetting(
-    setting: AbstractStringSetting,
-    @StringRes titleId: Int = 0,
-    titleString: String = "",
-    @StringRes descriptionId: Int = 0,
-    descriptionString: String = ""
-) : SettingsItem(setting, titleId, titleString, descriptionId, descriptionString) {
-    override val type = TYPE_STRING_INPUT
-
-    fun getSelectedValue(needsGlobal: Boolean = false) = setting.getValueAsString(needsGlobal)
-
-    fun setSelectedValue(selection: String) =
-        (setting as AbstractStringSetting).setString(selection)
-}
--- a/src/android/app/src/main/java/org/yuzu/yuzu_emu/features/settings/ui/SettingsAdapter.kt
+++ b/src/android/app/src/main/java/org/yuzu/yuzu_emu/features/settings/ui/SettingsAdapter.kt
@ -85,10 +85,6 @@ class SettingsAdapter(
                InputProfileViewHolder(ListItemSettingBinding.inflate(inflater), this)
            }

-            SettingsItem.TYPE_STRING_INPUT -> {
-                StringInputViewHolder(ListItemSettingBinding.inflate(inflater), this)
-            }
-
            else -> {
                HeaderViewHolder(ListItemSettingsHeaderBinding.inflate(inflater), this)
            }
@ -396,15 +392,6 @@ class SettingsAdapter(
        popup.show()
    }

-    fun onStringInputClick(item: StringInputSetting, position: Int) {
-        SettingsDialogFragment.newInstance(
-            settingsViewModel,
-            item,
-            SettingsItem.TYPE_STRING_INPUT,
-            position
-        ).show(fragment.childFragmentManager, SettingsDialogFragment.TAG)
-    }
-
    fun onLongClick(item: SettingsItem, position: Int): Boolean {
        SettingsDialogFragment.newInstance(
            settingsViewModel,
--- a/src/android/app/src/main/java/org/yuzu/yuzu_emu/features/settings/ui/SettingsDialogFragment.kt
+++ b/src/android/app/src/main/java/org/yuzu/yuzu_emu/features/settings/ui/SettingsDialogFragment.kt
@ -14,7 +14,6 @@ import androidx.fragment.app.activityViewModels
 import com.google.android.material.dialog.MaterialAlertDialogBuilder
 import com.google.android.material.slider.Slider
 import org.yuzu.yuzu_emu.R
-import org.yuzu.yuzu_emu.databinding.DialogEditTextBinding
 import org.yuzu.yuzu_emu.databinding.DialogSliderBinding
 import org.yuzu.yuzu_emu.features.input.NativeInput
 import org.yuzu.yuzu_emu.features.input.model.AnalogDirection
@ -24,7 +23,6 @@ import org.yuzu.yuzu_emu.features.settings.model.view.IntSingleChoiceSetting
 import org.yuzu.yuzu_emu.features.settings.model.view.SettingsItem
 import org.yuzu.yuzu_emu.features.settings.model.view.SingleChoiceSetting
 import org.yuzu.yuzu_emu.features.settings.model.view.SliderSetting
-import org.yuzu.yuzu_emu.features.settings.model.view.StringInputSetting
 import org.yuzu.yuzu_emu.features.settings.model.view.StringSingleChoiceSetting
 import org.yuzu.yuzu_emu.utils.ParamPackage
 import org.yuzu.yuzu_emu.utils.collect
@ -39,7 +37,6 @@ class SettingsDialogFragment : DialogFragment(), DialogInterface.OnClickListener
    private val settingsViewModel: SettingsViewModel by activityViewModels()

    private lateinit var sliderBinding: DialogSliderBinding
-    private lateinit var stringInputBinding: DialogEditTextBinding

    override fun onCreate(savedInstanceState: Bundle?) {
        super.onCreate(savedInstanceState)
@ -134,18 +131,6 @@ class SettingsDialogFragment : DialogFragment(), DialogInterface.OnClickListener
                    .create()
            }

-            SettingsItem.TYPE_STRING_INPUT -> {
-                stringInputBinding = DialogEditTextBinding.inflate(layoutInflater)
-                val item = settingsViewModel.clickedItem as StringInputSetting
-                stringInputBinding.editText.setText(item.getSelectedValue())
-                MaterialAlertDialogBuilder(requireContext())
-                    .setTitle(item.title)
-                    .setView(stringInputBinding.root)
-                    .setPositiveButton(android.R.string.ok, this)
-                    .setNegativeButton(android.R.string.cancel, defaultCancelListener)
-                    .create()
-            }
-
            SettingsItem.TYPE_STRING_SINGLE_CHOICE -> {
                val item = settingsViewModel.clickedItem as StringSingleChoiceSetting
                MaterialAlertDialogBuilder(requireContext())
@ -173,7 +158,6 @@ class SettingsDialogFragment : DialogFragment(), DialogInterface.OnClickListener
    ): View? {
        return when (type) {
            SettingsItem.TYPE_SLIDER -> sliderBinding.root
-            SettingsItem.TYPE_STRING_INPUT -> stringInputBinding.root
            else -> super.onCreateView(inflater, container, savedInstanceState)
        }
    }
@ -216,13 +200,6 @@ class SettingsDialogFragment : DialogFragment(), DialogInterface.OnClickListener
                val sliderSetting = settingsViewModel.clickedItem as SliderSetting
                sliderSetting.setSelectedValue(settingsViewModel.sliderProgress.value)
            }
-
-            is StringInputSetting -> {
-                val stringInputSetting = settingsViewModel.clickedItem as StringInputSetting
-                stringInputSetting.setSelectedValue(
-                    (stringInputBinding.editText.text ?: "").toString()
-                )
-            }
        }
        closeDialog()
    }
--- a/src/android/app/src/main/java/org/yuzu/yuzu_emu/features/settings/ui/SettingsFragmentPresenter.kt
+++ b/src/android/app/src/main/java/org/yuzu/yuzu_emu/features/settings/ui/SettingsFragmentPresenter.kt
@ -23,7 +23,6 @@ import org.yuzu.yuzu_emu.features.settings.model.LongSetting
 import org.yuzu.yuzu_emu.features.settings.model.Settings
 import org.yuzu.yuzu_emu.features.settings.model.Settings.MenuTag
 import org.yuzu.yuzu_emu.features.settings.model.ShortSetting
-import org.yuzu.yuzu_emu.features.settings.model.StringSetting
 import org.yuzu.yuzu_emu.features.settings.model.view.*
 import org.yuzu.yuzu_emu.utils.InputHandler
 import org.yuzu.yuzu_emu.utils.NativeConfig
@ -154,7 +153,6 @@ class SettingsFragmentPresenter(

    private fun addSystemSettings(sl: ArrayList<SettingsItem>) {
        sl.apply {
-            add(StringSetting.DEVICE_NAME.key)
            add(BooleanSetting.RENDERER_USE_SPEED_LIMIT.key)
            add(ShortSetting.RENDERER_SPEED_LIMIT.key)
            add(BooleanSetting.USE_DOCKED_MODE.key)
@ -780,7 +778,7 @@ class SettingsFragmentPresenter(
        playerIndex: Int,
        paramName: String,
        stick: NativeAnalog,
-        defaultValue: Float
+        defaultValue: Int
    ): AbstractIntSetting =
        object : AbstractIntSetting {
            val params get() = NativeInput.getStickParam(playerIndex, stick)
@ -788,7 +786,7 @@ class SettingsFragmentPresenter(
            override val key = ""

            override fun getInt(needsGlobal: Boolean): Int =
-                (params.get(paramName, defaultValue) * 100).toInt()
+                (params.get(paramName, 0.15f) * 100).toInt()

            override fun setInt(value: Int) {
                val tempParams = params
@ -796,12 +794,12 @@ class SettingsFragmentPresenter(
                NativeInput.setStickParam(playerIndex, stick, tempParams)
            }

-            override val defaultValue = (defaultValue * 100).toInt()
+            override val defaultValue = defaultValue

            override fun getValueAsString(needsGlobal: Boolean): String =
                getInt(needsGlobal).toString()

-            override fun reset() = setInt(this.defaultValue)
+            override fun reset() = setInt(defaultValue)
        }

    private fun getExtraStickSettings(
@ -811,11 +809,11 @@ class SettingsFragmentPresenter(
        val stickIsController =
            NativeInput.isController(NativeInput.getStickParam(playerIndex, nativeAnalog))
        val modifierRangeSetting =
-            getStickIntSettingFromParam(playerIndex, "modifier_scale", nativeAnalog, 0.5f)
+            getStickIntSettingFromParam(playerIndex, "modifier_scale", nativeAnalog, 50)
        val stickRangeSetting =
-            getStickIntSettingFromParam(playerIndex, "range", nativeAnalog, 0.95f)
+            getStickIntSettingFromParam(playerIndex, "range", nativeAnalog, 95)
        val stickDeadzoneSetting =
-            getStickIntSettingFromParam(playerIndex, "deadzone", nativeAnalog, 0.15f)
+            getStickIntSettingFromParam(playerIndex, "deadzone", nativeAnalog, 15)

        val out = mutableListOf<SettingsItem>().apply {
            if (stickIsController) {
--- a/src/android/app/src/main/java/org/yuzu/yuzu_emu/features/settings/ui/viewholder/DateTimeViewHolder.kt
+++ b/src/android/app/src/main/java/org/yuzu/yuzu_emu/features/settings/ui/viewholder/DateTimeViewHolder.kt
@ -13,6 +13,7 @@ import org.yuzu.yuzu_emu.databinding.ListItemSettingBinding
 import org.yuzu.yuzu_emu.features.settings.model.view.DateTimeSetting
 import org.yuzu.yuzu_emu.features.settings.model.view.SettingsItem
 import org.yuzu.yuzu_emu.features.settings.ui.SettingsAdapter
+import org.yuzu.yuzu_emu.utils.NativeConfig
 import org.yuzu.yuzu_emu.utils.ViewUtils.setVisible

 class DateTimeViewHolder(val binding: ListItemSettingBinding, adapter: SettingsAdapter) :
@ -31,7 +32,9 @@ class DateTimeViewHolder(val binding: ListItemSettingBinding, adapter: SettingsA
        val dateFormatter = DateTimeFormatter.ofLocalizedDateTime(FormatStyle.MEDIUM)
        binding.textSettingValue.text = dateFormatter.format(zonedTime)

-        binding.buttonClear.setVisible(setting.clearable)
+        binding.buttonClear.setVisible(
+            !setting.setting.global || NativeConfig.isPerGameConfigLoaded()
+        )
        binding.buttonClear.setOnClickListener {
            adapter.onClearClick(setting, bindingAdapterPosition)
        }
--- a/src/android/app/src/main/java/org/yuzu/yuzu_emu/features/settings/ui/viewholder/SingleChoiceViewHolder.kt
+++ b/src/android/app/src/main/java/org/yuzu/yuzu_emu/features/settings/ui/viewholder/SingleChoiceViewHolder.kt
@ -10,6 +10,7 @@ import org.yuzu.yuzu_emu.features.settings.model.view.SettingsItem
 import org.yuzu.yuzu_emu.features.settings.model.view.SingleChoiceSetting
 import org.yuzu.yuzu_emu.features.settings.model.view.StringSingleChoiceSetting
 import org.yuzu.yuzu_emu.features.settings.ui.SettingsAdapter
+import org.yuzu.yuzu_emu.utils.NativeConfig
 import org.yuzu.yuzu_emu.utils.ViewUtils.setVisible

 class SingleChoiceViewHolder(val binding: ListItemSettingBinding, adapter: SettingsAdapter) :
@ -47,7 +48,9 @@ class SingleChoiceViewHolder(val binding: ListItemSettingBinding, adapter: Setti
            binding.textSettingValue.setVisible(false)
        }

-        binding.buttonClear.setVisible(setting.clearable)
+        binding.buttonClear.setVisible(
+            !setting.setting.global || NativeConfig.isPerGameConfigLoaded()
+        )
        binding.buttonClear.setOnClickListener {
            adapter.onClearClick(setting, bindingAdapterPosition)
        }
--- a/src/android/app/src/main/java/org/yuzu/yuzu_emu/features/settings/ui/viewholder/SliderViewHolder.kt
+++ b/src/android/app/src/main/java/org/yuzu/yuzu_emu/features/settings/ui/viewholder/SliderViewHolder.kt
@ -9,6 +9,7 @@ import org.yuzu.yuzu_emu.databinding.ListItemSettingBinding
 import org.yuzu.yuzu_emu.features.settings.model.view.SettingsItem
 import org.yuzu.yuzu_emu.features.settings.model.view.SliderSetting
 import org.yuzu.yuzu_emu.features.settings.ui.SettingsAdapter
+import org.yuzu.yuzu_emu.utils.NativeConfig
 import org.yuzu.yuzu_emu.utils.ViewUtils.setVisible

 class SliderViewHolder(val binding: ListItemSettingBinding, adapter: SettingsAdapter) :
@ -27,7 +28,9 @@ class SliderViewHolder(val binding: ListItemSettingBinding, adapter: SettingsAda
            setting.units
        )

-        binding.buttonClear.setVisible(setting.clearable)
+        binding.buttonClear.setVisible(
+            !setting.setting.global || NativeConfig.isPerGameConfigLoaded()
+        )
        binding.buttonClear.setOnClickListener {
            adapter.onClearClick(setting, bindingAdapterPosition)
        }
--- a/src/android/app/src/main/java/org/yuzu/yuzu_emu/features/settings/ui/viewholder/StringInputViewHolder.kt
+++ b/src/android/app/src/main/java/org/yuzu/yuzu_emu/features/settings/ui/viewholder/StringInputViewHolder.kt
@ -1,45 +0,0 @@
-// SPDX-FileCopyrightText: 2024 yuzu Emulator Project
-// SPDX-License-Identifier: GPL-2.0-or-later
-
-package org.yuzu.yuzu_emu.features.settings.ui.viewholder
-
-import android.view.View
-import org.yuzu.yuzu_emu.databinding.ListItemSettingBinding
-import org.yuzu.yuzu_emu.features.settings.model.view.SettingsItem
-import org.yuzu.yuzu_emu.features.settings.model.view.StringInputSetting
-import org.yuzu.yuzu_emu.features.settings.ui.SettingsAdapter
-import org.yuzu.yuzu_emu.utils.ViewUtils.setVisible
-
-class StringInputViewHolder(val binding: ListItemSettingBinding, adapter: SettingsAdapter) :
-    SettingViewHolder(binding.root, adapter) {
-    private lateinit var setting: StringInputSetting
-
-    override fun bind(item: SettingsItem) {
-        setting = item as StringInputSetting
-        binding.textSettingName.text = setting.title
-        binding.textSettingDescription.setVisible(setting.description.isNotEmpty())
-        binding.textSettingDescription.text = setting.description
-        binding.textSettingValue.setVisible(true)
-        binding.textSettingValue.text = setting.getSelectedValue()
-
-        binding.buttonClear.setVisible(setting.clearable)
-        binding.buttonClear.setOnClickListener {
-            adapter.onClearClick(setting, bindingAdapterPosition)
-        }
-
-        setStyle(setting.isEditable, binding)
-    }
-
-    override fun onClick(clicked: View) {
-        if (setting.isEditable) {
-            adapter.onStringInputClick(setting, bindingAdapterPosition)
-        }
-    }
-
-    override fun onLongClick(clicked: View): Boolean {
-        if (setting.isEditable) {
-            return adapter.onLongClick(setting, bindingAdapterPosition)
-        }
-        return false
-    }
-}
--- a/src/android/app/src/main/java/org/yuzu/yuzu_emu/features/settings/ui/viewholder/SwitchSettingViewHolder.kt
+++ b/src/android/app/src/main/java/org/yuzu/yuzu_emu/features/settings/ui/viewholder/SwitchSettingViewHolder.kt
@ -9,6 +9,7 @@ import org.yuzu.yuzu_emu.databinding.ListItemSettingSwitchBinding
 import org.yuzu.yuzu_emu.features.settings.model.view.SettingsItem
 import org.yuzu.yuzu_emu.features.settings.model.view.SwitchSetting
 import org.yuzu.yuzu_emu.features.settings.ui.SettingsAdapter
+import org.yuzu.yuzu_emu.utils.NativeConfig
 import org.yuzu.yuzu_emu.utils.ViewUtils.setVisible

 class SwitchSettingViewHolder(val binding: ListItemSettingSwitchBinding, adapter: SettingsAdapter) :
@ -28,7 +29,9 @@ class SwitchSettingViewHolder(val binding: ListItemSettingSwitchBinding, adapter
            adapter.onBooleanClick(setting, binding.switchWidget.isChecked, bindingAdapterPosition)
        }

-        binding.buttonClear.setVisible(setting.clearable)
+        binding.buttonClear.setVisible(
+            !setting.setting.global || NativeConfig.isPerGameConfigLoaded()
+        )
        binding.buttonClear.setOnClickListener {
            adapter.onClearClick(setting, bindingAdapterPosition)
        }
--- a/src/android/app/src/main/java/org/yuzu/yuzu_emu/fragments/EmulationFragment.kt
+++ b/src/android/app/src/main/java/org/yuzu/yuzu_emu/fragments/EmulationFragment.kt
@ -810,7 +810,7 @@ class EmulationFragment : Fragment(), SurfaceHolder.Callback {
                    }
            }
        }
-        binding.doneControlConfig.setVisible(true)
+        binding.doneControlConfig.setVisible(false)
        binding.surfaceInputOverlay.setIsInEditMode(true)
    }

--- a/src/android/app/src/main/java/org/yuzu/yuzu_emu/overlay/InputOverlay.kt
+++ b/src/android/app/src/main/java/org/yuzu/yuzu_emu/overlay/InputOverlay.kt
@ -28,7 +28,6 @@ import org.yuzu.yuzu_emu.features.input.NativeInput
 import org.yuzu.yuzu_emu.R
 import org.yuzu.yuzu_emu.features.input.model.NativeAnalog
 import org.yuzu.yuzu_emu.features.input.model.NativeButton
-import org.yuzu.yuzu_emu.features.input.model.NpadStyleIndex
 import org.yuzu.yuzu_emu.features.settings.model.BooleanSetting
 import org.yuzu.yuzu_emu.features.settings.model.IntSetting
 import org.yuzu.yuzu_emu.overlay.model.OverlayControl
@ -100,10 +99,12 @@ class InputOverlay(context: Context, attrs: AttributeSet?) :
        }

        var shouldUpdateView = false
-        val playerIndex = when (NativeInput.getStyleIndex(0)) {
-            NpadStyleIndex.Handheld -> 8
-            else -> 0
-        }
+        val playerIndex =
+            if (NativeInput.isHandheldOnly()) {
+                NativeInput.ConsoleDevice
+            } else {
+                NativeInput.Player1Device
+            }

        for (button in overlayButtons) {
            if (!button.updateStatus(event)) {
@ -663,7 +664,7 @@ class InputOverlay(context: Context, attrs: AttributeSet?) :

        val overlayControlData = NativeConfig.getOverlayControlData()
        overlayControlData.forEach {
-            it.enabled = OverlayControl.from(it.id)?.defaultVisibility == true
+            it.enabled = OverlayControl.from(it.id)?.defaultVisibility == false
        }
        NativeConfig.setOverlayControlData(overlayControlData)

--- a/src/android/app/src/main/jni/native.cpp
+++ b/src/android/app/src/main/jni/native.cpp
@ -292,9 +292,6 @@ void EmulationSession::ShutdownEmulation() {
    // Unload user input.
    m_system.HIDCore().UnloadInputDevices();

-    // Enable all controllers
-    m_system.HIDCore().SetSupportedStyleTag({Core::HID::NpadStyleSet::All});
-
    // Shutdown the main emulated process
    if (m_load_result == Core::SystemResultStatus::Success) {
        m_system.DetachDebugger();
@ -407,9 +404,7 @@ static Core::SystemResultStatus RunEmulation(const std::string& filepath,
                                             const size_t program_index,
                                             const bool frontend_initiated) {
    MicroProfileOnThreadCreate("EmuThread");
-    SCOPE_EXIT {
-        MicroProfileShutdown();
-    };
+    SCOPE_EXIT({ MicroProfileShutdown(); });

    LOG_INFO(Frontend, "starting");

@ -418,9 +413,7 @@ static Core::SystemResultStatus RunEmulation(const std::string& filepath,
        return Core::SystemResultStatus::ErrorLoader;
    }

-    SCOPE_EXIT {
-        EmulationSession::GetInstance().ShutdownEmulation();
-    };
+    SCOPE_EXIT({ EmulationSession::GetInstance().ShutdownEmulation(); });

    jconst result = EmulationSession::GetInstance().InitializeEmulation(filepath, program_index,
                                                                        frontend_initiated);
@ -668,7 +661,7 @@ void Java_org_yuzu_yuzu_1emu_NativeLibrary_initializeEmptyUserDirectory(JNIEnv*
    ASSERT(user_id);

    const auto user_save_data_path = FileSys::SaveDataFactory::GetFullPath(
-        {}, vfs_nand_dir, FileSys::SaveDataSpaceId::User, FileSys::SaveDataType::Account, 1,
+        {}, vfs_nand_dir, FileSys::SaveDataSpaceId::NandUser, FileSys::SaveDataType::SaveData, 1,
        user_id->AsU128(), 0);

    const auto full_path = Common::FS::ConcatPathSafe(nand_dir, user_save_data_path);
@ -836,8 +829,8 @@ jstring Java_org_yuzu_yuzu_1emu_NativeLibrary_getSavePath(JNIEnv* env, jobject j
                                                            FileSys::OpenMode::Read);

    const auto user_save_data_path = FileSys::SaveDataFactory::GetFullPath(
-        {}, vfsNandDir, FileSys::SaveDataSpaceId::User, FileSys::SaveDataType::Account, program_id,
-        user_id->AsU128(), 0);
+        {}, vfsNandDir, FileSys::SaveDataSpaceId::NandUser, FileSys::SaveDataType::SaveData,
+        program_id, user_id->AsU128(), 0);
    return Common::Android::ToJString(env, user_save_data_path);
 }

--- a/src/android/app/src/main/jni/native_input.cpp
+++ b/src/android/app/src/main/jni/native_input.cpp
@ -102,50 +102,8 @@ void ApplyControllerConfig(size_t player_index,
    }
 }

-std::vector<s32> GetSupportedStyles(int player_index) {
-    auto& hid_core = EmulationSession::GetInstance().System().HIDCore();
-    const auto npad_style_set = hid_core.GetSupportedStyleTag();
-    std::vector<s32> supported_indexes;
-    if (npad_style_set.fullkey == 1) {
-        supported_indexes.push_back(static_cast<s32>(Core::HID::NpadStyleIndex::Fullkey));
-    }
-
-    if (npad_style_set.joycon_dual == 1) {
-        supported_indexes.push_back(static_cast<s32>(Core::HID::NpadStyleIndex::JoyconDual));
-    }
-
-    if (npad_style_set.joycon_left == 1) {
-        supported_indexes.push_back(static_cast<s32>(Core::HID::NpadStyleIndex::JoyconLeft));
-    }
-
-    if (npad_style_set.joycon_right == 1) {
-        supported_indexes.push_back(static_cast<s32>(Core::HID::NpadStyleIndex::JoyconRight));
-    }
-
-    if (player_index == 0 && npad_style_set.handheld == 1) {
-        supported_indexes.push_back(static_cast<s32>(Core::HID::NpadStyleIndex::Handheld));
-    }
-
-    if (npad_style_set.gamecube == 1) {
-        supported_indexes.push_back(static_cast<s32>(Core::HID::NpadStyleIndex::GameCube));
-    }
-
-    return supported_indexes;
-}
-
 void ConnectController(size_t player_index, bool connected) {
    auto& hid_core = EmulationSession::GetInstance().System().HIDCore();
-    ApplyControllerConfig(player_index, [&](Core::HID::EmulatedController* controller) {
-        auto supported_styles = GetSupportedStyles(player_index);
-        auto controller_style = controller->GetNpadStyleIndex(true);
-        auto style = std::find(supported_styles.begin(), supported_styles.end(),
-                               static_cast<int>(controller_style));
-        if (style == supported_styles.end() && !supported_styles.empty()) {
-            controller->SetNpadStyleIndex(
-                static_cast<Core::HID::NpadStyleIndex>(supported_styles[0]));
-        }
-    });
-
    if (player_index == 0) {
        auto* handheld = hid_core.GetEmulatedController(Core::HID::NpadIdType::Handheld);
        auto* player_one = hid_core.GetEmulatedController(Core::HID::NpadIdType::Player1);
@ -564,10 +522,36 @@ jint Java_org_yuzu_yuzu_1emu_features_input_NativeInput_getButtonNameImpl(JNIEnv

 jintArray Java_org_yuzu_yuzu_1emu_features_input_NativeInput_getSupportedStyleTagsImpl(
    JNIEnv* env, jobject j_obj, jint j_player_index) {
-    auto supported_styles = GetSupportedStyles(j_player_index);
-    jintArray j_supported_indexes = env->NewIntArray(supported_styles.size());
-    env->SetIntArrayRegion(j_supported_indexes, 0, supported_styles.size(),
-                           supported_styles.data());
+    auto& hid_core = EmulationSession::GetInstance().System().HIDCore();
+    const auto npad_style_set = hid_core.GetSupportedStyleTag();
+    std::vector<s32> supported_indexes;
+    if (npad_style_set.fullkey == 1) {
+        supported_indexes.push_back(static_cast<u32>(Core::HID::NpadStyleIndex::Fullkey));
+    }
+
+    if (npad_style_set.joycon_dual == 1) {
+        supported_indexes.push_back(static_cast<u32>(Core::HID::NpadStyleIndex::JoyconDual));
+    }
+
+    if (npad_style_set.joycon_left == 1) {
+        supported_indexes.push_back(static_cast<u32>(Core::HID::NpadStyleIndex::JoyconLeft));
+    }
+
+    if (npad_style_set.joycon_right == 1) {
+        supported_indexes.push_back(static_cast<u32>(Core::HID::NpadStyleIndex::JoyconRight));
+    }
+
+    if (j_player_index == 0 && npad_style_set.handheld == 1) {
+        supported_indexes.push_back(static_cast<u32>(Core::HID::NpadStyleIndex::Handheld));
+    }
+
+    if (npad_style_set.gamecube == 1) {
+        supported_indexes.push_back(static_cast<u32>(Core::HID::NpadStyleIndex::GameCube));
+    }
+
+    jintArray j_supported_indexes = env->NewIntArray(supported_indexes.size());
+    env->SetIntArrayRegion(j_supported_indexes, 0, supported_indexes.size(),
+                           supported_indexes.data());
    return j_supported_indexes;
 }

--- a/src/android/app/src/main/res/values/strings.xml
+++ b/src/android/app/src/main/res/values/strings.xml
@ -209,7 +209,6 @@
    <string name="value_with_units">%1$s%2$s</string>

    <!-- System settings strings -->
-    <string name="device_name">Device name</string>
    <string name="use_docked_mode">Docked Mode</string>
    <string name="use_docked_mode_description">Increases resolution, decreasing performance. Handheld Mode is used when disabled, lowering resolution and increasing performance.</string>
    <string name="emulated_region">Emulated region</string>
--- a/src/audio_core/audio_in_manager.cpp
+++ b/src/audio_core/audio_in_manager.cpp
@ -73,15 +73,16 @@ void Manager::BufferReleaseAndRegister() {
    }
 }

-u32 Manager::GetDeviceNames(std::span<Renderer::AudioDevice::AudioDeviceName> names,
+u32 Manager::GetDeviceNames(std::vector<Renderer::AudioDevice::AudioDeviceName>& names,
+                            [[maybe_unused]] const u32 max_count,
                            [[maybe_unused]] const bool filter) {
    std::scoped_lock l{mutex};

    LinkToManager();

    auto input_devices{Sink::GetDeviceListForSink(Settings::values.sink_id.GetValue(), true)};
-    if (!input_devices.empty() && !names.empty()) {
-        names[0] = Renderer::AudioDevice::AudioDeviceName("Uac");
+    if (input_devices.size() > 1) {
+        names.emplace_back("Uac");
        return 1;
    }
    return 0;
--- a/src/audio_core/audio_in_manager.h
+++ b/src/audio_core/audio_in_manager.h
@ -60,11 +60,13 @@ public:
     * Get a list of audio in device names.
     *
     * @param names     - Output container to write names to.
+     * @param max_count - Maximum number of device names to write. Unused
     * @param filter    - Should the list be filtered? Unused.
     *
     * @return Number of names written.
     */
-    u32 GetDeviceNames(std::span<Renderer::AudioDevice::AudioDeviceName> names, bool filter);
+    u32 GetDeviceNames(std::vector<Renderer::AudioDevice::AudioDeviceName>& names, u32 max_count,
+                       bool filter);

    /// Core system
    Core::System& system;
--- a/src/audio_core/device/audio_buffers.h
+++ b/src/audio_core/device/audio_buffers.h
@ -146,11 +146,7 @@ public:
                break;
            }

-            if (released < tags.size()) {
-                tags[released] = tag;
-            }
-
-            released++;
+            tags[released++] = tag;

            if (released >= tags.size()) {
                break;
--- a/src/audio_core/opus/decoder.cpp
+++ b/src/audio_core/opus/decoder.cpp
@ -28,8 +28,8 @@ OpusDecoder::~OpusDecoder() {
    }
 }

-Result OpusDecoder::Initialize(const OpusParametersEx& params,
-                               Kernel::KTransferMemory* transfer_memory, u64 transfer_memory_size) {
+Result OpusDecoder::Initialize(OpusParametersEx& params, Kernel::KTransferMemory* transfer_memory,
+                               u64 transfer_memory_size) {
    auto frame_size{params.use_large_frame_size ? 5760 : 1920};
    shared_buffer_size = transfer_memory_size;
    shared_buffer = std::make_unique<u8[]>(shared_buffer_size);
@ -59,7 +59,7 @@ Result OpusDecoder::Initialize(const OpusParametersEx& params,
    R_SUCCEED();
 }

-Result OpusDecoder::Initialize(const OpusMultiStreamParametersEx& params,
+Result OpusDecoder::Initialize(OpusMultiStreamParametersEx& params,
                               Kernel::KTransferMemory* transfer_memory, u64 transfer_memory_size) {
    auto frame_size{params.use_large_frame_size ? 5760 : 1920};
    shared_buffer_size = transfer_memory_size;
--- a/src/audio_core/opus/decoder.h
+++ b/src/audio_core/opus/decoder.h
@ -22,10 +22,10 @@ public:
    explicit OpusDecoder(Core::System& system, HardwareOpus& hardware_opus_);
    ~OpusDecoder();

-    Result Initialize(const OpusParametersEx& params, Kernel::KTransferMemory* transfer_memory,
+    Result Initialize(OpusParametersEx& params, Kernel::KTransferMemory* transfer_memory,
+                      u64 transfer_memory_size);
+    Result Initialize(OpusMultiStreamParametersEx& params, Kernel::KTransferMemory* transfer_memory,
                      u64 transfer_memory_size);
-    Result Initialize(const OpusMultiStreamParametersEx& params,
-                      Kernel::KTransferMemory* transfer_memory, u64 transfer_memory_size);
    Result DecodeInterleaved(u32* out_data_size, u64* out_time_taken, u32* out_sample_count,
                             std::span<const u8> input_data, std::span<u8> output_data, bool reset);
    Result SetContext([[maybe_unused]] std::span<const u8> context);
--- a/src/audio_core/opus/decoder_manager.cpp
+++ b/src/audio_core/opus/decoder_manager.cpp
@ -38,7 +38,7 @@ OpusDecoderManager::OpusDecoderManager(Core::System& system_)
    }
 }

-Result OpusDecoderManager::GetWorkBufferSize(const OpusParameters& params, u32& out_size) {
+Result OpusDecoderManager::GetWorkBufferSize(OpusParameters& params, u64& out_size) {
    OpusParametersEx ex{
        .sample_rate = params.sample_rate,
        .channel_count = params.channel_count,
@ -47,11 +47,11 @@ Result OpusDecoderManager::GetWorkBufferSize(const OpusParameters& params, u32&
    R_RETURN(GetWorkBufferSizeExEx(ex, out_size));
 }

-Result OpusDecoderManager::GetWorkBufferSizeEx(const OpusParametersEx& params, u32& out_size) {
+Result OpusDecoderManager::GetWorkBufferSizeEx(OpusParametersEx& params, u64& out_size) {
    R_RETURN(GetWorkBufferSizeExEx(params, out_size));
 }

-Result OpusDecoderManager::GetWorkBufferSizeExEx(const OpusParametersEx& params, u32& out_size) {
+Result OpusDecoderManager::GetWorkBufferSizeExEx(OpusParametersEx& params, u64& out_size) {
    R_UNLESS(IsValidChannelCount(params.channel_count), ResultInvalidOpusChannelCount);
    R_UNLESS(IsValidSampleRate(params.sample_rate), ResultInvalidOpusSampleRate);

@ -63,8 +63,8 @@ Result OpusDecoderManager::GetWorkBufferSizeExEx(const OpusParametersEx& params,
    R_SUCCEED();
 }

-Result OpusDecoderManager::GetWorkBufferSizeForMultiStream(const OpusMultiStreamParameters& params,
-                                                           u32& out_size) {
+Result OpusDecoderManager::GetWorkBufferSizeForMultiStream(OpusMultiStreamParameters& params,
+                                                           u64& out_size) {
    OpusMultiStreamParametersEx ex{
        .sample_rate = params.sample_rate,
        .channel_count = params.channel_count,
@ -76,13 +76,13 @@ Result OpusDecoderManager::GetWorkBufferSizeForMultiStream(const OpusMultiStream
    R_RETURN(GetWorkBufferSizeForMultiStreamExEx(ex, out_size));
 }

-Result OpusDecoderManager::GetWorkBufferSizeForMultiStreamEx(
-    const OpusMultiStreamParametersEx& params, u32& out_size) {
+Result OpusDecoderManager::GetWorkBufferSizeForMultiStreamEx(OpusMultiStreamParametersEx& params,
+                                                             u64& out_size) {
    R_RETURN(GetWorkBufferSizeForMultiStreamExEx(params, out_size));
 }

-Result OpusDecoderManager::GetWorkBufferSizeForMultiStreamExEx(
-    const OpusMultiStreamParametersEx& params, u32& out_size) {
+Result OpusDecoderManager::GetWorkBufferSizeForMultiStreamExEx(OpusMultiStreamParametersEx& params,
+                                                               u64& out_size) {
    R_UNLESS(IsValidMultiStreamChannelCount(params.channel_count), ResultInvalidOpusChannelCount);
    R_UNLESS(IsValidSampleRate(params.sample_rate), ResultInvalidOpusSampleRate);
    R_UNLESS(IsValidStreamCount(params.channel_count, params.total_stream_count,
--- a/src/audio_core/opus/decoder_manager.h
+++ b/src/audio_core/opus/decoder_manager.h
@ -22,19 +22,17 @@ public:
        return hardware_opus;
    }

-    Result GetWorkBufferSize(const OpusParameters& params, u32& out_size);
-    Result GetWorkBufferSizeEx(const OpusParametersEx& params, u32& out_size);
-    Result GetWorkBufferSizeExEx(const OpusParametersEx& params, u32& out_size);
-    Result GetWorkBufferSizeForMultiStream(const OpusMultiStreamParameters& params, u32& out_size);
-    Result GetWorkBufferSizeForMultiStreamEx(const OpusMultiStreamParametersEx& params,
-                                             u32& out_size);
-    Result GetWorkBufferSizeForMultiStreamExEx(const OpusMultiStreamParametersEx& params,
-                                               u32& out_size);
+    Result GetWorkBufferSize(OpusParameters& params, u64& out_size);
+    Result GetWorkBufferSizeEx(OpusParametersEx& params, u64& out_size);
+    Result GetWorkBufferSizeExEx(OpusParametersEx& params, u64& out_size);
+    Result GetWorkBufferSizeForMultiStream(OpusMultiStreamParameters& params, u64& out_size);
+    Result GetWorkBufferSizeForMultiStreamEx(OpusMultiStreamParametersEx& params, u64& out_size);
+    Result GetWorkBufferSizeForMultiStreamExEx(OpusMultiStreamParametersEx& params, u64& out_size);

 private:
    Core::System& system;
    HardwareOpus hardware_opus;
-    std::array<u32, MaxChannels> required_workbuffer_sizes{};
+    std::array<u64, MaxChannels> required_workbuffer_sizes{};
 };

 } // namespace AudioCore::OpusDecoder
--- a/src/audio_core/opus/hardware_opus.cpp
+++ b/src/audio_core/opus/hardware_opus.cpp
@ -42,7 +42,7 @@ HardwareOpus::HardwareOpus(Core::System& system_)
    opus_decoder.SetSharedMemory(shared_memory);
 }

-u32 HardwareOpus::GetWorkBufferSize(u32 channel) {
+u64 HardwareOpus::GetWorkBufferSize(u32 channel) {
    if (!opus_decoder.IsRunning()) {
        return 0;
    }
@ -55,10 +55,10 @@ u32 HardwareOpus::GetWorkBufferSize(u32 channel) {
                  ADSP::OpusDecoder::Message::GetWorkBufferSizeOK, msg);
        return 0;
    }
-    return static_cast<u32>(shared_memory.dsp_return_data[0]);
+    return shared_memory.dsp_return_data[0];
 }

-u32 HardwareOpus::GetWorkBufferSizeForMultiStream(u32 total_stream_count, u32 stereo_stream_count) {
+u64 HardwareOpus::GetWorkBufferSizeForMultiStream(u32 total_stream_count, u32 stereo_stream_count) {
    std::scoped_lock l{mutex};
    shared_memory.host_send_data[0] = total_stream_count;
    shared_memory.host_send_data[1] = stereo_stream_count;
@ -70,7 +70,7 @@ u32 HardwareOpus::GetWorkBufferSizeForMultiStream(u32 total_stream_count, u32 st
                  ADSP::OpusDecoder::Message::GetWorkBufferSizeForMultiStreamOK, msg);
        return 0;
    }
-    return static_cast<u32>(shared_memory.dsp_return_data[0]);
+    return shared_memory.dsp_return_data[0];
 }

 Result HardwareOpus::InitializeDecodeObject(u32 sample_rate, u32 channel_count, void* buffer,
@ -94,9 +94,8 @@ Result HardwareOpus::InitializeDecodeObject(u32 sample_rate, u32 channel_count,

 Result HardwareOpus::InitializeMultiStreamDecodeObject(u32 sample_rate, u32 channel_count,
                                                       u32 total_stream_count,
-                                                       u32 stereo_stream_count,
-                                                       const void* mappings, void* buffer,
-                                                       u64 buffer_size) {
+                                                       u32 stereo_stream_count, void* mappings,
+                                                       void* buffer, u64 buffer_size) {
    std::scoped_lock l{mutex};
    shared_memory.host_send_data[0] = (u64)buffer;
    shared_memory.host_send_data[1] = buffer_size;
--- a/src/audio_core/opus/hardware_opus.h
+++ b/src/audio_core/opus/hardware_opus.h
@ -16,14 +16,14 @@ class HardwareOpus {
 public:
    HardwareOpus(Core::System& system);

-    u32 GetWorkBufferSize(u32 channel);
-    u32 GetWorkBufferSizeForMultiStream(u32 total_stream_count, u32 stereo_stream_count);
+    u64 GetWorkBufferSize(u32 channel);
+    u64 GetWorkBufferSizeForMultiStream(u32 total_stream_count, u32 stereo_stream_count);

    Result InitializeDecodeObject(u32 sample_rate, u32 channel_count, void* buffer,
                                  u64 buffer_size);
    Result InitializeMultiStreamDecodeObject(u32 sample_rate, u32 channel_count,
                                             u32 totaL_stream_count, u32 stereo_stream_count,
-                                             const void* mappings, void* buffer, u64 buffer_size);
+                                             void* mappings, void* buffer, u64 buffer_size);
    Result ShutdownDecodeObject(void* buffer, u64 buffer_size);
    Result ShutdownMultiStreamDecodeObject(void* buffer, u64 buffer_size);
    Result DecodeInterleaved(u32& out_sample_count, void* output_data, u64 output_data_size,
--- a/src/audio_core/opus/parameters.h
+++ b/src/audio_core/opus/parameters.h
@ -20,7 +20,7 @@ struct OpusParametersEx {
    /* 0x00 */ u32 sample_rate;
    /* 0x04 */ u32 channel_count;
    /* 0x08 */ bool use_large_frame_size;
-    /* 0x09 */ INSERT_PADDING_BYTES_NOINIT(7);
+    /* 0x09 */ INSERT_PADDING_BYTES(7);
 }; // size = 0x10
 static_assert(sizeof(OpusParametersEx) == 0x10, "OpusParametersEx has the wrong size!");

@ -40,7 +40,7 @@ struct OpusMultiStreamParametersEx {
    /* 0x08 */ u32 total_stream_count;
    /* 0x0C */ u32 stereo_stream_count;
    /* 0x10 */ bool use_large_frame_size;
-    /* 0x11 */ INSERT_PADDING_BYTES_NOINIT(7);
+    /* 0x11 */ INSERT_PADDING_BYTES(7);
    /* 0x18 */ std::array<u8, OpusStreamCountMax + 1> mappings;
 }; // size = 0x118
 static_assert(sizeof(OpusMultiStreamParametersEx) == 0x118,
--- a/src/audio_core/renderer/audio_device.cpp
+++ b/src/audio_core/renderer/audio_device.cpp
@ -36,7 +36,8 @@ AudioDevice::AudioDevice(Core::System& system, const u64 applet_resource_user_id
    : output_sink{system.AudioCore().GetOutputSink()},
      applet_resource_user_id{applet_resource_user_id_}, user_revision{revision} {}

-u32 AudioDevice::ListAudioDeviceName(std::span<AudioDeviceName> out_buffer) const {
+u32 AudioDevice::ListAudioDeviceName(std::vector<AudioDeviceName>& out_buffer,
+                                     const size_t max_count) const {
    std::span<const AudioDeviceName> names{};

    if (CheckFeatureSupported(SupportTags::AudioUsbDeviceOutput, user_revision)) {
@ -45,18 +46,19 @@ u32 AudioDevice::ListAudioDeviceName(std::span<AudioDeviceName> out_buffer) cons
        names = device_names;
    }

-    const u32 out_count{static_cast<u32>(std::min(out_buffer.size(), names.size()))};
+    const u32 out_count{static_cast<u32>(std::min(max_count, names.size()))};
    for (u32 i = 0; i < out_count; i++) {
-        out_buffer[i] = names[i];
+        out_buffer.push_back(names[i]);
    }
    return out_count;
 }

-u32 AudioDevice::ListAudioOutputDeviceName(std::span<AudioDeviceName> out_buffer) const {
-    const u32 out_count{static_cast<u32>(std::min(out_buffer.size(), output_device_names.size()))};
+u32 AudioDevice::ListAudioOutputDeviceName(std::vector<AudioDeviceName>& out_buffer,
+                                           const size_t max_count) const {
+    const u32 out_count{static_cast<u32>(std::min(max_count, output_device_names.size()))};

    for (u32 i = 0; i < out_count; i++) {
-        out_buffer[i] = output_device_names[i];
+        out_buffer.push_back(output_device_names[i]);
    }
    return out_count;
 }
--- a/src/audio_core/renderer/audio_device.h
+++ b/src/audio_core/renderer/audio_device.h
@ -36,18 +36,20 @@ public:
     * Get a list of the available output devices.
     *
     * @param out_buffer - Output buffer to write the available device names.
+     * @param max_count  - Maximum number of devices to write (count of out_buffer).
     * @return Number of device names written.
     */
-    u32 ListAudioDeviceName(std::span<AudioDeviceName> out_buffer) const;
+    u32 ListAudioDeviceName(std::vector<AudioDeviceName>& out_buffer, size_t max_count) const;

    /**
     * Get a list of the available output devices.
     * Different to above somehow...
     *
     * @param out_buffer - Output buffer to write the available device names.
+     * @param max_count  - Maximum number of devices to write (count of out_buffer).
     * @return Number of device names written.
     */
-    u32 ListAudioOutputDeviceName(std::span<AudioDeviceName> out_buffer) const;
+    u32 ListAudioOutputDeviceName(std::vector<AudioDeviceName>& out_buffer, size_t max_count) const;

    /**
     * Set the volume of all streams in the backend sink.
--- a/src/audio_core/renderer/audio_renderer.cpp
+++ b/src/audio_core/renderer/audio_renderer.cpp
@ -17,8 +17,9 @@ Renderer::Renderer(Core::System& system_, Manager& manager_, Kernel::KEvent* ren

 Result Renderer::Initialize(const AudioRendererParameterInternal& params,
                            Kernel::KTransferMemory* transfer_memory,
-                            const u64 transfer_memory_size, Kernel::KProcess* process_handle,
-                            const u64 applet_resource_user_id, const s32 session_id) {
+                            const u64 transfer_memory_size, const u32 process_handle,
+                            Kernel::KProcess& process, const u64 applet_resource_user_id,
+                            const s32 session_id) {
    if (params.execution_mode == ExecutionMode::Auto) {
        if (!manager.AddSystem(system)) {
            LOG_ERROR(Service_Audio,
@ -29,7 +30,7 @@ Result Renderer::Initialize(const AudioRendererParameterInternal& params,
    }

    initialized = true;
-    system.Initialize(params, transfer_memory, transfer_memory_size, process_handle,
+    system.Initialize(params, transfer_memory, transfer_memory_size, process_handle, process,
                      applet_resource_user_id, session_id);

    return ResultSuccess;
--- a/src/audio_core/renderer/audio_renderer.h
+++ b/src/audio_core/renderer/audio_renderer.h
@ -38,14 +38,14 @@ public:
     * @param params                  - Input parameters to initialize the system with.
     * @param transfer_memory         - Game-supplied memory for all workbuffers. Unused.
     * @param transfer_memory_size    - Size of the transfer memory. Unused.
-     * @param process_handle          - Process handle, also used for memory.
+     * @param process_handle          - Process handle, also used for memory. Unused.
     * @param applet_resource_user_id - Applet id for this renderer. Unused.
     * @param session_id              - Session id of this renderer.
     * @return Result code.
     */
    Result Initialize(const AudioRendererParameterInternal& params,
                      Kernel::KTransferMemory* transfer_memory, u64 transfer_memory_size,
-                      Kernel::KProcess* process_handle, u64 applet_resource_user_id,
+                      u32 process_handle, Kernel::KProcess& process, u64 applet_resource_user_id,
                      s32 session_id);

    /**
--- a/src/audio_core/renderer/behavior/info_updater.cpp
+++ b/src/audio_core/renderer/behavior/info_updater.cpp
@ -18,7 +18,7 @@
 namespace AudioCore::Renderer {

 InfoUpdater::InfoUpdater(std::span<const u8> input_, std::span<u8> output_,
-                         Kernel::KProcess* process_handle_, BehaviorInfo& behaviour_)
+                         const u32 process_handle_, BehaviorInfo& behaviour_)
    : input{input_.data() + sizeof(UpdateDataHeader)},
      input_origin{input_}, output{output_.data() + sizeof(UpdateDataHeader)},
      output_origin{output_}, in_header{reinterpret_cast<const UpdateDataHeader*>(
--- a/src/audio_core/renderer/behavior/info_updater.h
+++ b/src/audio_core/renderer/behavior/info_updater.h
@ -8,10 +8,6 @@
 #include "common/common_types.h"
 #include "core/hle/service/audio/errors.h"

-namespace Kernel {
-class KProcess;
-}
-
 namespace AudioCore::Renderer {
 class BehaviorInfo;
 class VoiceContext;
@ -43,8 +39,8 @@ class InfoUpdater {
    static_assert(sizeof(UpdateDataHeader) == 0x40, "UpdateDataHeader has the wrong size!");

 public:
-    explicit InfoUpdater(std::span<const u8> input, std::span<u8> output,
-                         Kernel::KProcess* process_handle, BehaviorInfo& behaviour);
+    explicit InfoUpdater(std::span<const u8> input, std::span<u8> output, u32 process_handle,
+                         BehaviorInfo& behaviour);

    /**
     * Update the voice channel resources.
@ -201,7 +197,7 @@ private:
    /// Expected output size, see CheckConsumedSize
    u64 expected_output_size;
    /// Unused
-    Kernel::KProcess* process_handle;
+    u32 process_handle;
    /// Behaviour
    BehaviorInfo& behaviour;
 };
--- a/src/audio_core/renderer/memory/pool_mapper.cpp
+++ b/src/audio_core/renderer/memory/pool_mapper.cpp
@ -8,11 +8,11 @@

 namespace AudioCore::Renderer {

-PoolMapper::PoolMapper(Kernel::KProcess* process_handle_, bool force_map_)
+PoolMapper::PoolMapper(u32 process_handle_, bool force_map_)
    : process_handle{process_handle_}, force_map{force_map_} {}

-PoolMapper::PoolMapper(Kernel::KProcess* process_handle_, std::span<MemoryPoolInfo> pool_infos_,
-                       u32 pool_count_, bool force_map_)
+PoolMapper::PoolMapper(u32 process_handle_, std::span<MemoryPoolInfo> pool_infos_, u32 pool_count_,
+                       bool force_map_)
    : process_handle{process_handle_}, pool_infos{pool_infos_.data()},
      pool_count{pool_count_}, force_map{force_map_} {}

@ -106,17 +106,15 @@ bool PoolMapper::IsForceMapEnabled() const {
    return force_map;
 }

-Kernel::KProcess* PoolMapper::GetProcessHandle(const MemoryPoolInfo* pool) const {
+u32 PoolMapper::GetProcessHandle(const MemoryPoolInfo* pool) const {
    switch (pool->GetLocation()) {
    case MemoryPoolInfo::Location::CPU:
        return process_handle;
    case MemoryPoolInfo::Location::DSP:
-        // return Kernel::Svc::CurrentProcess;
-        return nullptr;
+        return Kernel::Svc::CurrentProcess;
    }
    LOG_WARNING(Service_Audio, "Invalid MemoryPoolInfo location!");
-    // return Kernel::Svc::CurrentProcess;
-    return nullptr;
+    return Kernel::Svc::CurrentProcess;
 }

 bool PoolMapper::Map([[maybe_unused]] const u32 handle, [[maybe_unused]] const CpuAddr cpu_addr,
@ -149,14 +147,14 @@ bool PoolMapper::Unmap([[maybe_unused]] const u32 handle, [[maybe_unused]] const
 }

 bool PoolMapper::Unmap(MemoryPoolInfo& pool) const {
-    [[maybe_unused]] Kernel::KProcess* handle{};
+    [[maybe_unused]] u32 handle{0};

    switch (pool.GetLocation()) {
    case MemoryPoolInfo::Location::CPU:
        handle = process_handle;
        break;
    case MemoryPoolInfo::Location::DSP:
-        // handle = Kernel::Svc::CurrentProcess;
+        handle = Kernel::Svc::CurrentProcess;
        break;
    }
    // nn::audio::dsp::UnmapUserPointer(handle, pool->cpu_address, pool->size);
--- a/src/audio_core/renderer/memory/pool_mapper.h
+++ b/src/audio_core/renderer/memory/pool_mapper.h
@ -10,10 +10,6 @@
 #include "common/common_types.h"
 #include "core/hle/service/audio/errors.h"

-namespace Kernel {
-class KProcess;
-}
-
 namespace AudioCore::Renderer {
 class AddressInfo;

@ -22,9 +18,9 @@ class AddressInfo;
 */
 class PoolMapper {
 public:
-    explicit PoolMapper(Kernel::KProcess* process_handle, bool force_map);
-    explicit PoolMapper(Kernel::KProcess* process_handle, std::span<MemoryPoolInfo> pool_infos,
-                        u32 pool_count, bool force_map);
+    explicit PoolMapper(u32 process_handle, bool force_map);
+    explicit PoolMapper(u32 process_handle, std::span<MemoryPoolInfo> pool_infos, u32 pool_count,
+                        bool force_map);

    /**
     * Clear the usage state for all given pools.
@ -102,7 +98,7 @@ public:
     * @return CurrentProcessHandle if location == DSP,
     *         the PoolMapper's process_handle if location == CPU
     */
-    Kernel::KProcess* GetProcessHandle(const MemoryPoolInfo* pool) const;
+    u32 GetProcessHandle(const MemoryPoolInfo* pool) const;

    /**
     * Map the given region with the given handle. This is a no-op.
@ -171,7 +167,7 @@ public:

 private:
    /// Process handle for this mapper, used when location == CPU
-    Kernel::KProcess* process_handle{};
+    u32 process_handle;
    /// List of memory pools assigned to this mapper
    MemoryPoolInfo* pool_infos{};
    /// The number of pools
--- a/src/audio_core/renderer/system.cpp
+++ b/src/audio_core/renderer/system.cpp
@ -102,8 +102,8 @@ System::System(Core::System& core_, Kernel::KEvent* adsp_rendered_event_)

 Result System::Initialize(const AudioRendererParameterInternal& params,
                          Kernel::KTransferMemory* transfer_memory, u64 transfer_memory_size,
-                          Kernel::KProcess* process_handle_, u64 applet_resource_user_id_,
-                          s32 session_id_) {
+                          u32 process_handle_, Kernel::KProcess& process_,
+                          u64 applet_resource_user_id_, s32 session_id_) {
    if (!CheckValidRevision(params.revision)) {
        return Service::Audio::ResultInvalidRevision;
    }
@ -119,6 +119,7 @@ Result System::Initialize(const AudioRendererParameterInternal& params,
    behavior.SetUserLibRevision(params.revision);

    process_handle = process_handle_;
+    process = &process_;
    applet_resource_user_id = applet_resource_user_id_;
    session_id = session_id_;

@ -131,8 +132,7 @@ Result System::Initialize(const AudioRendererParameterInternal& params,
    render_device = params.rendering_device;
    execution_mode = params.execution_mode;

-    process_handle->GetMemory().ZeroBlock(transfer_memory->GetSourceAddress(),
-                                          transfer_memory_size);
+    process->GetMemory().ZeroBlock(transfer_memory->GetSourceAddress(), transfer_memory_size);

    // Note: We're not actually using the transfer memory because it's a pain to code for.
    // Allocate the memory normally instead and hope the game doesn't try to read anything back
@ -616,7 +616,7 @@ void System::SendCommandToDsp() {
                static_cast<u64>((time_limit_percent / 100) * 2'880'000.0 *
                                 (static_cast<f32>(render_time_limit_percent) / 100.0f))};
            audio_renderer.SetCommandBuffer(session_id, translated_addr, command_size, time_limit,
-                                            applet_resource_user_id, process_handle,
+                                            applet_resource_user_id, process,
                                            reset_command_buffers);
            reset_command_buffers = false;
            command_buffer_size = command_size;
--- a/src/audio_core/renderer/system.h
+++ b/src/audio_core/renderer/system.h
@ -74,14 +74,14 @@ public:
     * @param params                  - Input parameters to initialize the system with.
     * @param transfer_memory         - Game-supplied memory for all workbuffers. Unused.
     * @param transfer_memory_size    - Size of the transfer memory. Unused.
-     * @param process_handle          - Process handle, also used for memory.
+     * @param process_handle          - Process handle, also used for memory. Unused.
     * @param applet_resource_user_id - Applet id for this renderer. Unused.
     * @param session_id              - Session id of this renderer.
     * @return Result code.
     */
    Result Initialize(const AudioRendererParameterInternal& params,
                      Kernel::KTransferMemory* transfer_memory, u64 transfer_memory_size,
-                      Kernel::KProcess* process_handle, u64 applet_resource_user_id,
+                      u32 process_handle, Kernel::KProcess& process, u64 applet_resource_user_id,
                      s32 session_id);

    /**
@ -278,7 +278,9 @@ private:
    /// Does what locks do
    std::mutex lock{};
    /// Process this audio render is operating within, used for memory reads/writes.
-    Kernel::KProcess* process_handle{};
+    Kernel::KProcess* process{};
+    /// Handle for the process for this system, unused
+    u32 process_handle{};
    /// Applet resource id for this system, unused
    u64 applet_resource_user_id{};
    /// Controls performance input and output
--- a/src/audio_core/sink/cubeb_sink.cpp
+++ b/src/audio_core/sink/cubeb_sink.cpp
@ -357,9 +357,7 @@ bool IsCubebSuitable() {
        return false;
    }

-    SCOPE_EXIT {
-        cubeb_destroy(ctx);
-    };
+    SCOPE_EXIT({ cubeb_destroy(ctx); });

 #ifdef _WIN32
    if (SUCCEEDED(com_init_result)) {
--- a/src/audio_core/sink/oboe_sink.cpp
+++ b/src/audio_core/sink/oboe_sink.cpp
@ -67,13 +67,9 @@ public:
        oboe::AudioStreamBuilder builder;

        const auto result = ConfigureBuilder(builder, direction)->openStream(temp_stream);
-        if (result == oboe::Result::OK) {
-            return temp_stream->getChannelCount() >= 6 ? 6 : 2;
-        }
+        ASSERT(result == oboe::Result::OK);

-        LOG_ERROR(Audio_Sink, "Failed to open {} stream. Using default channel count 2",
-                  direction == oboe::Direction::Output ? "output" : "input");
-        return 2;
+        return temp_stream->getChannelCount() >= 6 ? 6 : 2;
    }

 protected:
--- a/src/audio_core/sink/sink_stream.cpp
+++ b/src/audio_core/sink/sink_stream.cpp
@ -20,10 +20,10 @@
 namespace AudioCore::Sink {

 void SinkStream::AppendBuffer(SinkBuffer& buffer, std::span<s16> samples) {
-    SCOPE_EXIT {
+    SCOPE_EXIT({
        queue.enqueue(buffer);
        ++queued_buffers;
-    };
+    });

    if (type == StreamType::In) {
        return;
--- a/src/common/demangle.cpp
+++ b/src/common/demangle.cpp
@ -20,9 +20,7 @@ std::string DemangleSymbol(const std::string& mangled) {
    }

    char* demangled = nullptr;
-    SCOPE_EXIT {
-        std::free(demangled);
-    };
+    SCOPE_EXIT({ std::free(demangled); });

    if (is_itanium(mangled)) {
        demangled = llvm::itaniumDemangle(mangled.c_str());
--- a/src/common/host_memory.cpp
+++ b/src/common/host_memory.cpp
@ -430,11 +430,11 @@ public:
    explicit Impl(size_t backing_size_, size_t virtual_size_)
        : backing_size{backing_size_}, virtual_size{virtual_size_} {
        bool good = false;
-        SCOPE_EXIT {
+        SCOPE_EXIT({
            if (!good) {
                Release();
            }
-        };
+        });

        long page_size = sysconf(_SC_PAGESIZE);
        if (page_size != 0x1000) {
--- a/src/common/page_table.cpp
+++ b/src/common/page_table.cpp
@ -24,10 +24,10 @@ bool PageTable::ContinueTraversal(TraversalEntry* out_entry, TraversalContext* c
    out_entry->block_size = page_size;

    // Regardless of whether the page was mapped, advance on exit.
-    SCOPE_EXIT {
+    SCOPE_EXIT({
        context->next_page += 1;
        context->next_offset += page_size;
-    };
+    });

    // Validate that we can read the actual entry.
    const auto page = context->next_page;
--- a/src/common/ring_buffer.h
+++ b/src/common/ring_buffer.h
@ -8,7 +8,6 @@
 #include <atomic>
 #include <cstddef>
 #include <cstring>
-#include <limits>
 #include <new>
 #include <span>
 #include <type_traits>
--- a/src/common/scope_exit.h
+++ b/src/common/scope_exit.h
@ -7,61 +7,29 @@
 #include "common/common_funcs.h"

 namespace detail {
-template <class F>
-class ScopeGuard {
-    YUZU_NON_COPYABLE(ScopeGuard);
-
-private:
-    F f;
-    bool active;
-
-public:
-    constexpr ScopeGuard(F f_) : f(std::move(f_)), active(true) {}
-    constexpr ~ScopeGuard() {
+template <typename Func>
+struct ScopeExitHelper {
+    explicit ScopeExitHelper(Func&& func_) : func(std::move(func_)) {}
+    ~ScopeExitHelper() {
        if (active) {
-            f();
+            func();
        }
    }
-    constexpr void Cancel() {
+
+    void Cancel() {
        active = false;
    }

-    constexpr ScopeGuard(ScopeGuard&& rhs) : f(std::move(rhs.f)), active(rhs.active) {
-        rhs.Cancel();
-    }
-
-    ScopeGuard& operator=(ScopeGuard&& rhs) = delete;
+    Func func;
+    bool active{true};
 };

-template <class F>
-constexpr ScopeGuard<F> MakeScopeGuard(F f) {
-    return ScopeGuard<F>(std::move(f));
+template <typename Func>
+ScopeExitHelper<Func> ScopeExit(Func&& func) {
+    return ScopeExitHelper<Func>(std::forward<Func>(func));
 }
-
-enum class ScopeGuardOnExit {};
-
-template <typename F>
-constexpr ScopeGuard<F> operator+(ScopeGuardOnExit, F&& f) {
-    return ScopeGuard<F>(std::forward<F>(f));
-}
-
 } // namespace detail

-#define CONCATENATE_IMPL(s1, s2) s1##s2
-#define CONCATENATE(s1, s2) CONCATENATE_IMPL(s1, s2)
-
-#ifdef __COUNTER__
-#define ANONYMOUS_VARIABLE(pref) CONCATENATE(pref, __COUNTER__)
-#else
-#define ANONYMOUS_VARIABLE(pref) CONCATENATE(pref, __LINE__)
-#endif
-
-/**
- * This macro is similar to SCOPE_EXIT, except the object is caller managed. This is intended to be
- * used when the caller might want to cancel the ScopeExit.
- */
-#define SCOPE_GUARD detail::ScopeGuardOnExit() + [&]()
-
 /**
 * This macro allows you to conveniently specify a block of code that will run on scope exit. Handy
 * for doing ad-hoc clean-up tasks in a function with multiple returns.
@ -70,7 +38,7 @@ constexpr ScopeGuard<F> operator+(ScopeGuardOnExit, F&& f) {
 * \code
 * const int saved_val = g_foo;
 * g_foo = 55;
- * SCOPE_EXIT{ g_foo = saved_val; };
+ * SCOPE_EXIT({ g_foo = saved_val; });
 *
 * if (Bar()) {
 *     return 0;
@ -79,4 +47,10 @@ constexpr ScopeGuard<F> operator+(ScopeGuardOnExit, F&& f) {
 * }
 * \endcode
 */
-#define SCOPE_EXIT auto ANONYMOUS_VARIABLE(SCOPE_EXIT_STATE_) = SCOPE_GUARD
+#define SCOPE_EXIT(body) auto CONCAT2(scope_exit_helper_, __LINE__) = detail::ScopeExit([&]() body)
+
+/**
+ * This macro is similar to SCOPE_EXIT, except the object is caller managed. This is intended to be
+ * used when the caller might want to cancel the ScopeExit.
+ */
+#define SCOPE_GUARD(body) detail::ScopeExit([&]() body)
--- a/src/common/settings.h
+++ b/src/common/settings.h
@ -140,7 +140,7 @@ struct Values {
                                               Category::LibraryApplet};
    Setting<AppletMode> data_erase_applet_mode{linkage, AppletMode::HLE, "data_erase_applet_mode",
                                               Category::LibraryApplet};
-    Setting<AppletMode> error_applet_mode{linkage, AppletMode::LLE, "error_applet_mode",
+    Setting<AppletMode> error_applet_mode{linkage, AppletMode::HLE, "error_applet_mode",
                                          Category::LibraryApplet};
    Setting<AppletMode> net_connect_applet_mode{linkage, AppletMode::HLE, "net_connect_applet_mode",
                                                Category::LibraryApplet};
@ -384,12 +384,6 @@ struct Values {
                                                                  AstcRecompression::Bc3,
                                                                  "astc_recompression",
                                                                  Category::RendererAdvanced};
-    SwitchableSetting<VramUsageMode, true> vram_usage_mode{linkage,
-                                                           VramUsageMode::Conservative,
-                                                           VramUsageMode::Conservative,
-                                                           VramUsageMode::Aggressive,
-                                                           "vram_usage_mode",
-                                                           Category::RendererAdvanced};
    SwitchableSetting<bool> async_presentation{linkage,
 #ifdef ANDROID
                                               true,
--- a/src/common/settings_enums.h
+++ b/src/common/settings_enums.h
@ -122,8 +122,6 @@ ENUM(AstcRecompression, Uncompressed, Bc1, Bc3);

 ENUM(VSyncMode, Immediate, Mailbox, Fifo, FifoRelaxed);

-ENUM(VramUsageMode, Conservative, Aggressive);
-
 ENUM(RendererBackend, OpenGL, Vulkan, Null);

 ENUM(ShaderBackend, Glsl, Glasm, SpirV);
--- a/src/common/string_util.cpp
+++ b/src/common/string_util.cpp
@ -38,10 +38,6 @@ std::string StringFromBuffer(std::span<const u8> data) {
    return std::string(data.begin(), std::find(data.begin(), data.end(), '\0'));
 }

-std::string StringFromBuffer(std::span<const char> data) {
-    return std::string(data.begin(), std::find(data.begin(), data.end(), '\0'));
-}
-
 // Turns "  hej " into "hej". Also handles tabs.
 std::string StripSpaces(const std::string& str) {
    const std::size_t s = str.find_first_not_of(" \t\r\n");
--- a/src/common/string_util.h
+++ b/src/common/string_util.h
@ -19,7 +19,6 @@ namespace Common {
 [[nodiscard]] std::string ToUpper(std::string str);

 [[nodiscard]] std::string StringFromBuffer(std::span<const u8> data);
-[[nodiscard]] std::string StringFromBuffer(std::span<const char> data);

 [[nodiscard]] std::string StripSpaces(const std::string& s);
 [[nodiscard]] std::string StripQuotes(const std::string& s);
--- a/src/core/CMakeLists.txt
+++ b/src/core/CMakeLists.txt
@ -2,8 +2,8 @@
 # SPDX-License-Identifier: GPL-2.0-or-later

 add_library(core STATIC
-    arm/arm_interface.cpp
    arm/arm_interface.h
+    arm/arm_interface.cpp
    arm/debug.cpp
    arm/debug.h
    arm/exclusive_monitor.cpp
@ -37,10 +37,10 @@ add_library(core STATIC
    debugger/gdbstub.h
    debugger/gdbstub_arch.cpp
    debugger/gdbstub_arch.h
-    device_memory.cpp
-    device_memory.h
    device_memory_manager.h
    device_memory_manager.inc
+    device_memory.cpp
+    device_memory.h
    file_sys/bis_factory.cpp
    file_sys/bis_factory.h
    file_sys/card_image.cpp
@ -58,14 +58,9 @@ add_library(core STATIC
    file_sys/fs_operate_range.h
    file_sys/fs_path.h
    file_sys/fs_path_utility.h
-    file_sys/fs_save_data_types.h
    file_sys/fs_string_util.h
-    file_sys/fsa/fs_i_directory.h
-    file_sys/fsa/fs_i_file.h
-    file_sys/fsa/fs_i_filesystem.h
    file_sys/fsmitm_romfsbuild.cpp
    file_sys/fsmitm_romfsbuild.h
-    file_sys/fssrv/fssrv_sf_path.h
    file_sys/fssystem/fs_i_storage.h
    file_sys/fssystem/fs_types.h
    file_sys/fssystem/fssystem_aes_ctr_counter_extended_storage.cpp
@ -395,22 +390,6 @@ add_library(core STATIC
    hle/service/acc/errors.h
    hle/service/acc/profile_manager.cpp
    hle/service/acc/profile_manager.h
-    hle/service/am/am.cpp
-    hle/service/am/am.h
-    hle/service/am/am_results.h
-    hle/service/am/am_types.h
-    hle/service/am/applet.cpp
-    hle/service/am/applet.h
-    hle/service/am/applet_manager.cpp
-    hle/service/am/applet_data_broker.cpp
-    hle/service/am/applet_data_broker.h
-    hle/service/am/applet_manager.h
-    hle/service/am/button_poller.cpp
-    hle/service/am/button_poller.h
-    hle/service/am/display_layer_manager.cpp
-    hle/service/am/display_layer_manager.h
-    hle/service/am/event_observer.cpp
-    hle/service/am/event_observer.h
    hle/service/am/frontend/applet_cabinet.cpp
    hle/service/am/frontend/applet_cabinet.h
    hle/service/am/frontend/applet_controller.cpp
@ -432,16 +411,26 @@ add_library(core STATIC
    hle/service/am/frontend/applet_web_browser_types.h
    hle/service/am/frontend/applets.cpp
    hle/service/am/frontend/applets.h
+    hle/service/am/am.cpp
+    hle/service/am/am.h
+    hle/service/am/am_results.h
+    hle/service/am/am_types.h
+    hle/service/am/applet.cpp
+    hle/service/am/applet.h
+    hle/service/am/applet_manager.cpp
+    hle/service/am/applet_data_broker.cpp
+    hle/service/am/applet_data_broker.h
+    hle/service/am/applet_manager.h
+    hle/service/am/applet_message_queue.cpp
+    hle/service/am/applet_message_queue.h
+    hle/service/am/display_layer_manager.cpp
+    hle/service/am/display_layer_manager.h
    hle/service/am/hid_registration.cpp
    hle/service/am/hid_registration.h
    hle/service/am/library_applet_storage.cpp
    hle/service/am/library_applet_storage.h
-    hle/service/am/lifecycle_manager.cpp
-    hle/service/am/lifecycle_manager.h
-    hle/service/am/process_creation.cpp
-    hle/service/am/process_creation.h
-    hle/service/am/process_holder.cpp
-    hle/service/am/process_holder.h
+    hle/service/am/process.cpp
+    hle/service/am/process.h
    hle/service/am/service/all_system_applet_proxies_service.cpp
    hle/service/am/service/all_system_applet_proxies_service.h
    hle/service/am/service/applet_common_functions.cpp
@ -452,10 +441,10 @@ add_library(core STATIC
    hle/service/am/service/application_creator.h
    hle/service/am/service/application_functions.cpp
    hle/service/am/service/application_functions.h
-    hle/service/am/service/application_proxy.cpp
-    hle/service/am/service/application_proxy.h
    hle/service/am/service/application_proxy_service.cpp
    hle/service/am/service/application_proxy_service.h
+    hle/service/am/service/application_proxy.cpp
+    hle/service/am/service/application_proxy.h
    hle/service/am/service/audio_controller.cpp
    hle/service/am/service/audio_controller.h
    hle/service/am/service/common_state_getter.cpp
@ -484,55 +473,53 @@ add_library(core STATIC
    hle/service/am/service/process_winding_controller.h
    hle/service/am/service/self_controller.cpp
    hle/service/am/service/self_controller.h
-    hle/service/am/service/storage.cpp
-    hle/service/am/service/storage.h
    hle/service/am/service/storage_accessor.cpp
    hle/service/am/service/storage_accessor.h
+    hle/service/am/service/storage.cpp
+    hle/service/am/service/storage.h
    hle/service/am/service/system_applet_proxy.cpp
    hle/service/am/service/system_applet_proxy.h
    hle/service/am/service/window_controller.cpp
    hle/service/am/service/window_controller.h
-    hle/service/am/window_system.cpp
-    hle/service/am/window_system.h
-    hle/service/aoc/addon_content_manager.cpp
-    hle/service/aoc/addon_content_manager.h
-    hle/service/aoc/purchase_event_manager.cpp
-    hle/service/aoc/purchase_event_manager.h
+    hle/service/aoc/aoc_u.cpp
+    hle/service/aoc/aoc_u.h
    hle/service/apm/apm.cpp
    hle/service/apm/apm.h
    hle/service/apm/apm_controller.cpp
    hle/service/apm/apm_controller.h
    hle/service/apm/apm_interface.cpp
    hle/service/apm/apm_interface.h
-    hle/service/audio/audio_controller.cpp
-    hle/service/audio/audio_controller.h
-    hle/service/audio/audio_device.cpp
-    hle/service/audio/audio_device.h
-    hle/service/audio/audio_in_manager.cpp
-    hle/service/audio/audio_in_manager.h
-    hle/service/audio/audio_in.cpp
-    hle/service/audio/audio_in.h
-    hle/service/audio/audio_out_manager.cpp
-    hle/service/audio/audio_out_manager.h
-    hle/service/audio/audio_out.cpp
-    hle/service/audio/audio_out.h
-    hle/service/audio/audio_renderer_manager.cpp
-    hle/service/audio/audio_renderer_manager.h
-    hle/service/audio/audio_renderer.cpp
-    hle/service/audio/audio_renderer.h
+    hle/service/audio/audin_u.cpp
+    hle/service/audio/audin_u.h
    hle/service/audio/audio.cpp
    hle/service/audio/audio.h
+    hle/service/audio/audio_controller.cpp
+    hle/service/audio/audio_controller.h
+    hle/service/audio/audout_u.cpp
+    hle/service/audio/audout_u.h
+    hle/service/audio/audrec_a.cpp
+    hle/service/audio/audrec_a.h
+    hle/service/audio/audrec_u.cpp
+    hle/service/audio/audrec_u.h
+    hle/service/audio/audren_u.cpp
+    hle/service/audio/audren_u.h
    hle/service/audio/errors.h
-    hle/service/audio/final_output_recorder_manager_for_applet.cpp
-    hle/service/audio/final_output_recorder_manager_for_applet.h
-    hle/service/audio/final_output_recorder_manager.cpp
-    hle/service/audio/final_output_recorder_manager.h
-    hle/service/audio/hardware_opus_decoder_manager.cpp
-    hle/service/audio/hardware_opus_decoder_manager.h
-    hle/service/audio/hardware_opus_decoder.cpp
-    hle/service/audio/hardware_opus_decoder.h
+    hle/service/audio/hwopus.cpp
+    hle/service/audio/hwopus.h
    hle/service/bcat/backend/backend.cpp
    hle/service/bcat/backend/backend.h
+    hle/service/bcat/news/newly_arrived_event_holder.cpp
+    hle/service/bcat/news/newly_arrived_event_holder.h
+    hle/service/bcat/news/news_data_service.cpp
+    hle/service/bcat/news/news_data_service.h
+    hle/service/bcat/news/news_database_service.cpp
+    hle/service/bcat/news/news_database_service.h
+    hle/service/bcat/news/news_service.cpp
+    hle/service/bcat/news/news_service.h
+    hle/service/bcat/news/overwrite_event_holder.cpp
+    hle/service/bcat/news/overwrite_event_holder.h
+    hle/service/bcat/news/service_creator.cpp
+    hle/service/bcat/news/service_creator.h
    hle/service/bcat/bcat.cpp
    hle/service/bcat/bcat.h
    hle/service/bcat/bcat_result.h
@ -548,18 +535,6 @@ add_library(core STATIC
    hle/service/bcat/delivery_cache_progress_service.h
    hle/service/bcat/delivery_cache_storage_service.cpp
    hle/service/bcat/delivery_cache_storage_service.h
-    hle/service/bcat/news/newly_arrived_event_holder.cpp
-    hle/service/bcat/news/newly_arrived_event_holder.h
-    hle/service/bcat/news/news_data_service.cpp
-    hle/service/bcat/news/news_data_service.h
-    hle/service/bcat/news/news_database_service.cpp
-    hle/service/bcat/news/news_database_service.h
-    hle/service/bcat/news/news_service.cpp
-    hle/service/bcat/news/news_service.h
-    hle/service/bcat/news/overwrite_event_holder.cpp
-    hle/service/bcat/news/overwrite_event_holder.h
-    hle/service/bcat/news/service_creator.cpp
-    hle/service/bcat/news/service_creator.h
    hle/service/bcat/service_creator.cpp
    hle/service/bcat/service_creator.h
    hle/service/bpc/bpc.cpp
@ -620,10 +595,6 @@ add_library(core STATIC
    hle/service/filesystem/fsp/fs_i_file.h
    hle/service/filesystem/fsp/fs_i_filesystem.cpp
    hle/service/filesystem/fsp/fs_i_filesystem.h
-    hle/service/filesystem/fsp/fs_i_multi_commit_manager.cpp
-    hle/service/filesystem/fsp/fs_i_multi_commit_manager.h
-    hle/service/filesystem/fsp/fs_i_save_data_info_reader.cpp
-    hle/service/filesystem/fsp/fs_i_save_data_info_reader.h
    hle/service/filesystem/fsp/fs_i_storage.cpp
    hle/service/filesystem/fsp/fs_i_storage.h
    hle/service/filesystem/fsp/fsp_ldr.cpp
@ -632,13 +603,13 @@ add_library(core STATIC
    hle/service/filesystem/fsp/fsp_pr.h
    hle/service/filesystem/fsp/fsp_srv.cpp
    hle/service/filesystem/fsp/fsp_srv.h
-    hle/service/filesystem/fsp/fsp_types.h
-    hle/service/filesystem/fsp/save_data_transfer_prohibiter.cpp
-    hle/service/filesystem/fsp/save_data_transfer_prohibiter.h
+    hle/service/filesystem/fsp/fsp_util.h
    hle/service/filesystem/romfs_controller.cpp
    hle/service/filesystem/romfs_controller.h
    hle/service/filesystem/save_data_controller.cpp
    hle/service/filesystem/save_data_controller.h
+    hle/service/fgm/fgm.cpp
+    hle/service/fgm/fgm.h
    hle/service/friend/friend.cpp
    hle/service/friend/friend.h
    hle/service/friend/friend_interface.cpp
@ -676,10 +647,6 @@ add_library(core STATIC
    hle/service/glue/time/worker.h
    hle/service/grc/grc.cpp
    hle/service/grc/grc.h
-    hle/service/hid/active_vibration_device_list.cpp
-    hle/service/hid/active_vibration_device_list.h
-    hle/service/hid/applet_resource.cpp
-    hle/service/hid/applet_resource.h
    hle/service/hid/hid.cpp
    hle/service/hid/hid.h
    hle/service/hid/hid_debug_server.cpp
@ -802,10 +769,10 @@ add_library(core STATIC
    hle/service/ns/factory_reset_interface.h
    hle/service/ns/language.cpp
    hle/service/ns/language.h
-    hle/service/ns/ns.cpp
-    hle/service/ns/ns.h
    hle/service/ns/ns_results.h
    hle/service/ns/ns_types.h
+    hle/service/ns/ns.cpp
+    hle/service/ns/ns.h
    hle/service/ns/platform_service_manager.cpp
    hle/service/ns/platform_service_manager.h
    hle/service/ns/query_service.cpp
@ -876,12 +843,12 @@ add_library(core STATIC
    hle/service/nvnflinger/consumer_listener.h
    hle/service/nvnflinger/graphic_buffer_producer.cpp
    hle/service/nvnflinger/graphic_buffer_producer.h
-    hle/service/nvnflinger/hardware_composer.cpp
-    hle/service/nvnflinger/hardware_composer.h
-    hle/service/nvnflinger/hos_binder_driver.cpp
-    hle/service/nvnflinger/hos_binder_driver.h
    hle/service/nvnflinger/hos_binder_driver_server.cpp
    hle/service/nvnflinger/hos_binder_driver_server.h
+    hle/service/nvnflinger/hos_binder_driver.cpp
+    hle/service/nvnflinger/hos_binder_driver.h
+    hle/service/nvnflinger/hardware_composer.cpp
+    hle/service/nvnflinger/hardware_composer.h
    hle/service/nvnflinger/hwc_layer.h
    hle/service/nvnflinger/nvnflinger.cpp
    hle/service/nvnflinger/nvnflinger.h
@ -895,20 +862,8 @@ add_library(core STATIC
    hle/service/nvnflinger/ui/graphic_buffer.cpp
    hle/service/nvnflinger/ui/graphic_buffer.h
    hle/service/nvnflinger/window.h
-    hle/service/olsc/daemon_controller.cpp
-    hle/service/olsc/daemon_controller.h
-    hle/service/olsc/native_handle_holder.cpp
-    hle/service/olsc/native_handle_holder.h
-    hle/service/olsc/olsc_service_for_application.cpp
-    hle/service/olsc/olsc_service_for_application.h
-    hle/service/olsc/olsc_service_for_system_service.cpp
-    hle/service/olsc/olsc_service_for_system_service.h
    hle/service/olsc/olsc.cpp
    hle/service/olsc/olsc.h
-    hle/service/olsc/remote_storage_controller.cpp
-    hle/service/olsc/remote_storage_controller.h
-    hle/service/olsc/transfer_task_list_controller.cpp
-    hle/service/olsc/transfer_task_list_controller.h
    hle/service/omm/omm.cpp
    hle/service/omm/omm.h
    hle/service/omm/operation_mode_manager.cpp
@ -919,46 +874,25 @@ add_library(core STATIC
    hle/service/omm/power_state_interface.h
    hle/service/os/event.cpp
    hle/service/os/event.h
-    hle/service/os/multi_wait.cpp
-    hle/service/os/multi_wait.h
    hle/service/os/multi_wait_holder.cpp
    hle/service/os/multi_wait_holder.h
    hle/service/os/multi_wait_utils.h
+    hle/service/os/multi_wait.cpp
+    hle/service/os/multi_wait.h
    hle/service/os/mutex.cpp
    hle/service/os/mutex.h
-    hle/service/os/process.cpp
-    hle/service/os/process.h
    hle/service/pcie/pcie.cpp
    hle/service/pcie/pcie.h
-    hle/service/pctl/parental_control_service_factory.cpp
-    hle/service/pctl/parental_control_service_factory.h
-    hle/service/pctl/parental_control_service.cpp
-    hle/service/pctl/parental_control_service.h
    hle/service/pctl/pctl.cpp
    hle/service/pctl/pctl.h
-    hle/service/pctl/pctl_results.h
-    hle/service/pctl/pctl_types.h
+    hle/service/pctl/pctl_module.cpp
+    hle/service/pctl/pctl_module.h
    hle/service/pcv/pcv.cpp
    hle/service/pcv/pcv.h
    hle/service/pm/pm.cpp
    hle/service/pm/pm.h
    hle/service/prepo/prepo.cpp
    hle/service/prepo/prepo.h
-    hle/service/psc/ovln/ovln_types.h
-    hle/service/psc/ovln/receiver_service.cpp
-    hle/service/psc/ovln/receiver_service.h
-    hle/service/psc/ovln/receiver.cpp
-    hle/service/psc/ovln/receiver.h
-    hle/service/psc/ovln/sender_service.cpp
-    hle/service/psc/ovln/sender_service.h
-    hle/service/psc/ovln/sender.cpp
-    hle/service/psc/ovln/sender.h
-    hle/service/psc/pm_control.cpp
-    hle/service/psc/pm_control.h
-    hle/service/psc/pm_module.cpp
-    hle/service/psc/pm_module.h
-    hle/service/psc/pm_service.cpp
-    hle/service/psc/pm_service.h
    hle/service/psc/psc.cpp
    hle/service/psc/psc.h
    hle/service/psc/time/alarms.cpp
@ -982,17 +916,15 @@ add_library(core STATIC
    hle/service/psc/time/common.cpp
    hle/service/psc/time/common.h
    hle/service/psc/time/errors.h
-    hle/service/psc/time/manager.h
-    hle/service/psc/time/power_state_request_manager.cpp
-    hle/service/psc/time/power_state_request_manager.h
-    hle/service/psc/time/power_state_service.cpp
-    hle/service/psc/time/power_state_service.h
-    hle/service/psc/time/service_manager.cpp
-    hle/service/psc/time/service_manager.h
    hle/service/psc/time/shared_memory.cpp
    hle/service/psc/time/shared_memory.h
    hle/service/psc/time/static.cpp
    hle/service/psc/time/static.h
+    hle/service/psc/time/manager.h
+    hle/service/psc/time/power_state_service.cpp
+    hle/service/psc/time/power_state_service.h
+    hle/service/psc/time/service_manager.cpp
+    hle/service/psc/time/service_manager.h
    hle/service/psc/time/steady_clock.cpp
    hle/service/psc/time/steady_clock.h
    hle/service/psc/time/system_clock.cpp
@ -1001,6 +933,8 @@ add_library(core STATIC
    hle/service/psc/time/time_zone.h
    hle/service/psc/time/time_zone_service.cpp
    hle/service/psc/time/time_zone_service.h
+    hle/service/psc/time/power_state_request_manager.cpp
+    hle/service/psc/time/power_state_request_manager.h
    hle/service/ptm/psm.cpp
    hle/service/ptm/psm.h
    hle/service/ptm/ptm.cpp
@ -1019,19 +953,19 @@ add_library(core STATIC
    hle/service/service.h
    hle/service/services.cpp
    hle/service/services.h
+    hle/service/set/setting_formats/appln_settings.cpp
+    hle/service/set/setting_formats/appln_settings.h
+    hle/service/set/setting_formats/device_settings.cpp
+    hle/service/set/setting_formats/device_settings.h
+    hle/service/set/setting_formats/system_settings.cpp
+    hle/service/set/setting_formats/system_settings.h
+    hle/service/set/setting_formats/private_settings.cpp
+    hle/service/set/setting_formats/private_settings.h
    hle/service/set/factory_settings_server.cpp
    hle/service/set/factory_settings_server.h
    hle/service/set/firmware_debug_settings_server.cpp
    hle/service/set/firmware_debug_settings_server.h
    hle/service/set/key_code_map.h
-    hle/service/set/setting_formats/appln_settings.cpp
-    hle/service/set/setting_formats/appln_settings.h
-    hle/service/set/setting_formats/device_settings.cpp
-    hle/service/set/setting_formats/device_settings.h
-    hle/service/set/setting_formats/private_settings.cpp
-    hle/service/set/setting_formats/private_settings.h
-    hle/service/set/setting_formats/system_settings.cpp
-    hle/service/set/setting_formats/system_settings.h
    hle/service/set/settings.cpp
    hle/service/set/settings.h
    hle/service/set/settings_server.cpp
@ -1061,12 +995,9 @@ add_library(core STATIC
    hle/service/spl/spl_module.h
    hle/service/spl/spl_results.h
    hle/service/spl/spl_types.h
-    hle/service/ssl/cert_store.cpp
-    hle/service/ssl/cert_store.h
    hle/service/ssl/ssl.cpp
    hle/service/ssl/ssl.h
    hle/service/ssl/ssl_backend.h
-    hle/service/ssl/ssl_types.h
    hle/service/usb/usb.cpp
    hle/service/usb/usb.h
    hle/service/vi/application_display_service.cpp
@ -1077,10 +1008,10 @@ add_library(core STATIC
    hle/service/vi/conductor.h
    hle/service/vi/container.cpp
    hle/service/vi/container.h
-    hle/service/vi/display.h
    hle/service/vi/display_list.h
-    hle/service/vi/layer.h
+    hle/service/vi/display.h
    hle/service/vi/layer_list.h
+    hle/service/vi/layer.h
    hle/service/vi/manager_display_service.cpp
    hle/service/vi/manager_display_service.h
    hle/service/vi/manager_root_service.cpp
@ -1093,10 +1024,10 @@ add_library(core STATIC
    hle/service/vi/system_display_service.h
    hle/service/vi/system_root_service.cpp
    hle/service/vi/system_root_service.h
-    hle/service/vi/vi.cpp
-    hle/service/vi/vi.h
    hle/service/vi/vi_results.h
    hle/service/vi/vi_types.h
+    hle/service/vi/vi.cpp
+    hle/service/vi/vi.h
    hle/service/vi/vsync_manager.cpp
    hle/service/vi/vsync_manager.h
    internal_network/network.cpp
--- a/src/core/core.cpp
+++ b/src/core/core.cpp
@ -3,6 +3,7 @@

 #include <array>
 #include <atomic>
+#include <exception>
 #include <memory>
 #include <utility>

@ -19,6 +20,7 @@
 #include "core/cpu_manager.h"
 #include "core/debugger/debugger.h"
 #include "core/device_memory.h"
+#include "core/file_sys/bis_factory.h"
 #include "core/file_sys/fs_filesystem.h"
 #include "core/file_sys/patch_manager.h"
 #include "core/file_sys/registered_cache.h"
@ -36,7 +38,6 @@
 #include "core/hle/service/acc/profile_manager.h"
 #include "core/hle/service/am/applet_manager.h"
 #include "core/hle/service/am/frontend/applets.h"
-#include "core/hle/service/am/process_creation.h"
 #include "core/hle/service/apm/apm_controller.h"
 #include "core/hle/service/filesystem/filesystem.h"
 #include "core/hle/service/glue/glue_manager.h"
@ -71,6 +72,30 @@ MICROPROFILE_DEFINE(ARM_CPU3, "ARM", "CPU 3", MP_RGB(255, 64, 64));

 namespace Core {

+namespace {
+
+FileSys::StorageId GetStorageIdForFrontendSlot(
+    std::optional<FileSys::ContentProviderUnionSlot> slot) {
+    if (!slot.has_value()) {
+        return FileSys::StorageId::None;
+    }
+
+    switch (*slot) {
+    case FileSys::ContentProviderUnionSlot::UserNAND:
+        return FileSys::StorageId::NandUser;
+    case FileSys::ContentProviderUnionSlot::SysNAND:
+        return FileSys::StorageId::NandSystem;
+    case FileSys::ContentProviderUnionSlot::SDMC:
+        return FileSys::StorageId::SdCard;
+    case FileSys::ContentProviderUnionSlot::FrontendManual:
+        return FileSys::StorageId::Host;
+    default:
+        return FileSys::StorageId::None;
+    }
+}
+
+} // Anonymous namespace
+
 FileSys::VirtualFile GetGameFileFromPath(const FileSys::VirtualFilesystem& vfs,
                                         const std::string& path) {
    // To account for split 00+01+etc files.
@ -272,6 +297,9 @@ struct System::Impl {
    }

    SystemResultStatus SetupForApplicationProcess(System& system, Frontend::EmuWindow& emu_window) {
+        /// Reset all glue registrations
+        arp_manager.ResetAll();
+
        telemetry_session = std::make_unique<Core::TelemetrySession>();

        host1x_core = std::make_unique<Tegra::Host1x::Host1x>(system);
@ -307,24 +335,8 @@ struct System::Impl {
    SystemResultStatus Load(System& system, Frontend::EmuWindow& emu_window,
                            const std::string& filepath,
                            Service::AM::FrontendAppletParameters& params) {
-        InitializeKernel(system);
-
-        const auto file = GetGameFileFromPath(virtual_filesystem, filepath);
-
-        // Create the application process
-        Loader::ResultStatus load_result{};
-        std::vector<u8> control;
-        auto process =
-            Service::AM::CreateApplicationProcess(control, app_loader, load_result, system, file,
-                                                  params.program_id, params.program_index);
-
-        if (load_result != Loader::ResultStatus::Success) {
-            LOG_CRITICAL(Core, "Failed to load ROM (Error {})!", load_result);
-            ShutdownMainProcess();
-
-            return static_cast<SystemResultStatus>(
-                static_cast<u32>(SystemResultStatus::ErrorLoader) + static_cast<u32>(load_result));
-        }
+        app_loader = Loader::GetLoader(system, GetGameFileFromPath(virtual_filesystem, filepath),
+                                       params.program_id, params.program_index);

        if (!app_loader) {
            LOG_CRITICAL(Core, "Failed to obtain loader for {}!", filepath);
@ -332,7 +344,7 @@ struct System::Impl {
        }

        if (app_loader->ReadProgramId(params.program_id) != Loader::ResultStatus::Success) {
-            LOG_ERROR(Core, "Failed to find program id for ROM!");
+            LOG_ERROR(Core, "Failed to find title id for ROM!");
        }

        std::string name = "Unknown program";
@ -340,10 +352,23 @@ struct System::Impl {
            LOG_ERROR(Core, "Failed to read title for ROM!");
        }

-        LOG_INFO(Core, "Loading {} ({:016X}) ...", name, params.program_id);
+        LOG_INFO(Core, "Loading {} ({})", name, params.program_id);

-        // Make the process created be the application
-        kernel.MakeApplicationProcess(process->GetHandle());
+        InitializeKernel(system);
+
+        // Create the application process.
+        auto main_process = Kernel::KProcess::Create(system.Kernel());
+        Kernel::KProcess::Register(system.Kernel(), main_process);
+        kernel.AppendNewProcess(main_process);
+        kernel.MakeApplicationProcess(main_process);
+        const auto [load_result, load_parameters] = app_loader->Load(*main_process, system);
+        if (load_result != Loader::ResultStatus::Success) {
+            LOG_CRITICAL(Core, "Failed to load ROM (Error {})!", load_result);
+            ShutdownMainProcess();
+
+            return static_cast<SystemResultStatus>(
+                static_cast<u32>(SystemResultStatus::ErrorLoader) + static_cast<u32>(load_result));
+        }

        // Set up the rest of the system.
        SystemResultStatus init_result{SetupForApplicationProcess(system, emu_window)};
@ -354,6 +379,7 @@ struct System::Impl {
            return init_result;
        }

+        AddGlueRegistrationForProcess(*app_loader, *main_process);
        telemetry_session->AddInitialInfo(*app_loader, fs_controller, *content_provider);

        // Initialize cheat engine
@ -361,9 +387,14 @@ struct System::Impl {
            cheat_engine->Initialize();
        }

-        // Register with applet manager
-        // All threads are started, begin main process execution, now that we're in the clear
-        applet_manager.CreateAndInsertByFrontendAppletParameters(std::move(process), params);
+        // Register with applet manager.
+        applet_manager.CreateAndInsertByFrontendAppletParameters(main_process->GetProcessId(),
+                                                                 params);
+
+        // All threads are started, begin main process execution, now that we're in the clear.
+        main_process->Run(load_parameters->main_thread_priority,
+                          load_parameters->main_thread_stack_size);
+        main_process->Close();

        if (Settings::values.gamecard_inserted) {
            if (Settings::values.gamecard_current_game) {
@ -435,6 +466,7 @@ struct System::Impl {
        kernel.SuspendEmulation(true);
        kernel.CloseServices();
        kernel.ShutdownCores();
+        applet_manager.Reset();
        services.reset();
        service_manager.reset();
        fs_controller.Reset();
@ -460,9 +492,6 @@ struct System::Impl {
        // Workarounds
        Settings::values.renderer_amdvlk_depth_bias_workaround = false;

-        // Reset all glue registrations
-        arp_manager.ResetAll();
-
        LOG_DEBUG(Core, "Shutdown OK");
    }

@ -480,6 +509,31 @@ struct System::Impl {
        return app_loader->ReadTitle(out);
    }

+    void AddGlueRegistrationForProcess(Loader::AppLoader& loader, Kernel::KProcess& process) {
+        std::vector<u8> nacp_data;
+        FileSys::NACP nacp;
+        if (loader.ReadControlData(nacp) == Loader::ResultStatus::Success) {
+            nacp_data = nacp.GetRawBytes();
+        } else {
+            nacp_data.resize(sizeof(FileSys::RawNACP));
+        }
+
+        Service::Glue::ApplicationLaunchProperty launch{};
+        launch.title_id = process.GetProgramId();
+
+        FileSys::PatchManager pm{launch.title_id, fs_controller, *content_provider};
+        launch.version = pm.GetGameVersion().value_or(0);
+
+        // TODO(DarkLordZach): When FSController/Game Card Support is added, if
+        // current_process_game_card use correct StorageId
+        launch.base_game_storage_id = GetStorageIdForFrontendSlot(content_provider->GetSlotForEntry(
+            launch.title_id, FileSys::ContentRecordType::Program));
+        launch.update_storage_id = GetStorageIdForFrontendSlot(content_provider->GetSlotForEntry(
+            FileSys::GetUpdateTitleID(launch.title_id), FileSys::ContentRecordType::Program));
+
+        arp_manager.Register(launch.title_id, launch, std::move(nacp_data));
+    }
+
    void SetStatus(SystemResultStatus new_status, const char* details = nullptr) {
        status = new_status;
        if (details) {
--- a/src/core/cpu_manager.cpp
+++ b/src/core/cpu_manager.cpp
@ -199,10 +199,10 @@ void CpuManager::RunThread(std::stop_token token, std::size_t core) {
    data.host_context = Common::Fiber::ThreadToFiber();

    // Cleanup
-    SCOPE_EXIT {
+    SCOPE_EXIT({
        data.host_context->Exit();
        MicroProfileOnThreadExit();
-    };
+    });

    // Running
    if (!gpu_barrier->Sync(token)) {
--- a/src/core/device_memory_manager.inc
+++ b/src/core/device_memory_manager.inc
@ -391,12 +391,12 @@ void DeviceMemoryManager<Traits>::WalkBlock(DAddr addr, std::size_t size, auto o
            std::min((next_pages << Memory::YUZU_PAGEBITS) - page_offset, remaining_size);
        const auto current_vaddr =
            static_cast<u64>((page_index << Memory::YUZU_PAGEBITS) + page_offset);
-        SCOPE_EXIT{
+        SCOPE_EXIT({
            page_index += next_pages;
            page_offset = 0;
            increment(copy_amount);
            remaining_size -= copy_amount;
-        };
+        });

        auto phys_addr = compressed_physical_ptr[page_index];
        if (phys_addr == 0) {
--- a/src/core/file_sys/fs_directory.h
+++ b/src/core/file_sys/fs_directory.h
@ -3,10 +3,6 @@

 #pragma once

-#include <string_view>
-#include "common/common_funcs.h"
-#include "common/common_types.h"
-
 namespace FileSys {

 constexpr inline size_t EntryNameLengthMax = 0x300;
--- a/src/core/file_sys/fs_filesystem.h
+++ b/src/core/file_sys/fs_filesystem.h
@ -23,8 +23,6 @@ enum class OpenDirectoryMode : u64 {
    File = (1 << 1),

    All = (Directory | File),
-
-    NotRequireFileSize = (1ULL << 31),
 };
 DECLARE_ENUM_FLAG_OPERATORS(OpenDirectoryMode)

@ -38,29 +36,4 @@ enum class CreateOption : u8 {
    BigFile = (1 << 0),
 };

-struct FileSystemAttribute {
-    u8 dir_entry_name_length_max_defined;
-    u8 file_entry_name_length_max_defined;
-    u8 dir_path_name_length_max_defined;
-    u8 file_path_name_length_max_defined;
-    INSERT_PADDING_BYTES_NOINIT(0x5);
-    u8 utf16_dir_entry_name_length_max_defined;
-    u8 utf16_file_entry_name_length_max_defined;
-    u8 utf16_dir_path_name_length_max_defined;
-    u8 utf16_file_path_name_length_max_defined;
-    INSERT_PADDING_BYTES_NOINIT(0x18);
-    s32 dir_entry_name_length_max;
-    s32 file_entry_name_length_max;
-    s32 dir_path_name_length_max;
-    s32 file_path_name_length_max;
-    INSERT_PADDING_WORDS_NOINIT(0x5);
-    s32 utf16_dir_entry_name_length_max;
-    s32 utf16_file_entry_name_length_max;
-    s32 utf16_dir_path_name_length_max;
-    s32 utf16_file_path_name_length_max;
-    INSERT_PADDING_WORDS_NOINIT(0x18);
-    INSERT_PADDING_WORDS_NOINIT(0x1);
-};
-static_assert(sizeof(FileSystemAttribute) == 0xC0, "FileSystemAttribute has incorrect size");
-
 } // namespace FileSys
--- a/src/core/file_sys/fs_memory_management.h
+++ b/src/core/file_sys/fs_memory_management.h
@ -10,7 +10,7 @@ namespace FileSys {

 constexpr size_t RequiredAlignment = alignof(u64);

-inline void* AllocateUnsafe(size_t size) {
+void* AllocateUnsafe(size_t size) {
    // Allocate
    void* const ptr = ::operator new(size, std::align_val_t{RequiredAlignment});

@ -21,16 +21,16 @@ inline void* AllocateUnsafe(size_t size) {
    return ptr;
 }

-inline void DeallocateUnsafe(void* ptr, size_t size) {
+void DeallocateUnsafe(void* ptr, size_t size) {
    // Deallocate the pointer
    ::operator delete(ptr, std::align_val_t{RequiredAlignment});
 }

-inline void* Allocate(size_t size) {
+void* Allocate(size_t size) {
    return AllocateUnsafe(size);
 }

-inline void Deallocate(void* ptr, size_t size) {
+void Deallocate(void* ptr, size_t size) {
    // If the pointer is non-null, deallocate it
    if (ptr != nullptr) {
        DeallocateUnsafe(ptr, size);
--- a/src/core/file_sys/fs_path.h
+++ b/src/core/file_sys/fs_path.h
@ -381,7 +381,7 @@ public:

        // Check that it's possible for us to remove a child
        auto* p = m_write_buffer.Get();
-        s32 len = static_cast<s32>(std::strlen(p));
+        s32 len = std::strlen(p);
        R_UNLESS(len != 1 || (p[0] != '/' && p[0] != '.'), ResultNotImplemented);

        // Handle a trailing separator
--- a/src/core/file_sys/fs_path_utility.h
+++ b/src/core/file_sys/fs_path_utility.h
@ -426,10 +426,9 @@ public:
        R_SUCCEED();
    }

-    static constexpr Result Normalize(char* dst, size_t* out_len, const char* path,
-                                      size_t max_out_size, bool is_windows_path,
-                                      bool is_drive_relative_path,
-                                      bool allow_all_characters = false) {
+    static Result Normalize(char* dst, size_t* out_len, const char* path, size_t max_out_size,
+                            bool is_windows_path, bool is_drive_relative_path,
+                            bool allow_all_characters = false) {
        // Use StringTraits names for remainder of scope
        using namespace StringTraits;

@ -448,7 +447,7 @@ public:
        char* replacement_path = nullptr;
        size_t replacement_path_size = 0;

-        SCOPE_EXIT {
+        SCOPE_EXIT({
            if (replacement_path != nullptr) {
                if (std::is_constant_evaluated()) {
                    delete[] replacement_path;
@ -456,7 +455,7 @@ public:
                    Deallocate(replacement_path, replacement_path_size);
                }
            }
-        };
+        });

        // Perform path replacement, if necessary
        if (IsParentDirectoryPathReplacementNeeded(cur_path)) {
@ -1103,8 +1102,8 @@ public:
        R_SUCCEED();
    }

-    static constexpr Result Normalize(char* dst, size_t dst_size, const char* path, size_t path_len,
-                                      const PathFlags& flags) {
+    static Result Normalize(char* dst, size_t dst_size, const char* path, size_t path_len,
+                            const PathFlags& flags) {
        // Use StringTraits names for remainder of scope
        using namespace StringTraits;

@ -1200,7 +1199,7 @@ public:
            const size_t replaced_src_len = path_len - (src - path);

            char* replaced_src = nullptr;
-            SCOPE_EXIT {
+            SCOPE_EXIT({
                if (replaced_src != nullptr) {
                    if (std::is_constant_evaluated()) {
                        delete[] replaced_src;
@ -1208,7 +1207,7 @@ public:
                        Deallocate(replaced_src, replaced_src_len);
                    }
                }
-            };
+            });

            if (std::is_constant_evaluated()) {
                replaced_src = new char[replaced_src_len];
--- a/src/core/file_sys/fs_save_data_types.h
+++ b/src/core/file_sys/fs_save_data_types.h
@ -1,188 +0,0 @@
-// SPDX-FileCopyrightText: Copyright 2024 yuzu Emulator Project
-// SPDX-License-Identifier: GPL-2.0-or-later
-
-#pragma once
-
-#include <array>
-#include <fmt/format.h>
-#include "common/common_funcs.h"
-#include "common/common_types.h"
-
-namespace FileSys {
-
-using SaveDataId = u64;
-using SystemSaveDataId = u64;
-using SystemBcatSaveDataId = SystemSaveDataId;
-using ProgramId = u64;
-
-enum class SaveDataSpaceId : u8 {
-    System = 0,
-    User = 1,
-    SdSystem = 2,
-    Temporary = 3,
-    SdUser = 4,
-
-    ProperSystem = 100,
-    SafeMode = 101,
-};
-
-enum class SaveDataType : u8 {
-    System = 0,
-    Account = 1,
-    Bcat = 2,
-    Device = 3,
-    Temporary = 4,
-    Cache = 5,
-    SystemBcat = 6,
-};
-
-enum class SaveDataRank : u8 {
-    Primary = 0,
-    Secondary = 1,
-};
-
-struct SaveDataSize {
-    u64 normal;
-    u64 journal;
-};
-static_assert(sizeof(SaveDataSize) == 0x10, "SaveDataSize has invalid size.");
-
-using UserId = u128;
-static_assert(std::is_trivially_copyable_v<UserId>, "Data type must be trivially copyable.");
-static_assert(sizeof(UserId) == 0x10, "UserId has invalid size.");
-
-constexpr inline SystemSaveDataId InvalidSystemSaveDataId = 0;
-constexpr inline UserId InvalidUserId = {};
-
-enum class SaveDataFlags : u32 {
-    None = (0 << 0),
-    KeepAfterResettingSystemSaveData = (1 << 0),
-    KeepAfterRefurbishment = (1 << 1),
-    KeepAfterResettingSystemSaveDataWithoutUserSaveData = (1 << 2),
-    NeedsSecureDelete = (1 << 3),
-};
-
-enum class SaveDataMetaType : u8 {
-    None = 0,
-    Thumbnail = 1,
-    ExtensionContext = 2,
-};
-
-struct SaveDataMetaInfo {
-    u32 size;
-    SaveDataMetaType type;
-    INSERT_PADDING_BYTES(0xB);
-};
-static_assert(std::is_trivially_copyable_v<SaveDataMetaInfo>,
-              "Data type must be trivially copyable.");
-static_assert(sizeof(SaveDataMetaInfo) == 0x10, "SaveDataMetaInfo has invalid size.");
-
-struct SaveDataCreationInfo {
-    s64 size;
-    s64 journal_size;
-    s64 block_size;
-    u64 owner_id;
-    u32 flags;
-    SaveDataSpaceId space_id;
-    bool pseudo;
-    INSERT_PADDING_BYTES(0x1A);
-};
-static_assert(std::is_trivially_copyable_v<SaveDataCreationInfo>,
-              "Data type must be trivially copyable.");
-static_assert(sizeof(SaveDataCreationInfo) == 0x40, "SaveDataCreationInfo has invalid size.");
-
-struct SaveDataAttribute {
-    ProgramId program_id;
-    UserId user_id;
-    SystemSaveDataId system_save_data_id;
-    SaveDataType type;
-    SaveDataRank rank;
-    u16 index;
-    INSERT_PADDING_BYTES(0x1C);
-
-    static constexpr SaveDataAttribute Make(ProgramId program_id, SaveDataType type, UserId user_id,
-                                            SystemSaveDataId system_save_data_id, u16 index,
-                                            SaveDataRank rank) {
-        return {
-            .program_id = program_id,
-            .user_id = user_id,
-            .system_save_data_id = system_save_data_id,
-            .type = type,
-            .rank = rank,
-            .index = index,
-        };
-    }
-
-    static constexpr SaveDataAttribute Make(ProgramId program_id, SaveDataType type, UserId user_id,
-                                            SystemSaveDataId system_save_data_id, u16 index) {
-        return Make(program_id, type, user_id, system_save_data_id, index, SaveDataRank::Primary);
-    }
-
-    static constexpr SaveDataAttribute Make(ProgramId program_id, SaveDataType type, UserId user_id,
-                                            SystemSaveDataId system_save_data_id) {
-        return Make(program_id, type, user_id, system_save_data_id, 0, SaveDataRank::Primary);
-    }
-
-    std::string DebugInfo() const {
-        return fmt::format(
-            "[title_id={:016X}, user_id={:016X}{:016X}, save_id={:016X}, type={:02X}, "
-            "rank={}, index={}]",
-            program_id, user_id[1], user_id[0], system_save_data_id, static_cast<u8>(type),
-            static_cast<u8>(rank), index);
-    }
-};
-static_assert(sizeof(SaveDataAttribute) == 0x40);
-static_assert(std::is_trivially_destructible<SaveDataAttribute>::value);
-
-constexpr inline bool operator<(const SaveDataAttribute& lhs, const SaveDataAttribute& rhs) {
-    return std::tie(lhs.program_id, lhs.user_id, lhs.system_save_data_id, lhs.index, lhs.rank) <
-           std::tie(rhs.program_id, rhs.user_id, rhs.system_save_data_id, rhs.index, rhs.rank);
-}
-
-constexpr inline bool operator==(const SaveDataAttribute& lhs, const SaveDataAttribute& rhs) {
-    return std::tie(lhs.program_id, lhs.user_id, lhs.system_save_data_id, lhs.type, lhs.rank,
-                    lhs.index) == std::tie(rhs.program_id, rhs.user_id, rhs.system_save_data_id,
-                                           rhs.type, rhs.rank, rhs.index);
-}
-
-constexpr inline bool operator!=(const SaveDataAttribute& lhs, const SaveDataAttribute& rhs) {
-    return !(lhs == rhs);
-}
-
-struct SaveDataExtraData {
-    SaveDataAttribute attr;
-    u64 owner_id;
-    s64 timestamp;
-    u32 flags;
-    INSERT_PADDING_BYTES(4);
-    s64 available_size;
-    s64 journal_size;
-    s64 commit_id;
-    INSERT_PADDING_BYTES(0x190);
-};
-static_assert(sizeof(SaveDataExtraData) == 0x200, "SaveDataExtraData has invalid size.");
-static_assert(std::is_trivially_copyable_v<SaveDataExtraData>,
-              "Data type must be trivially copyable.");
-
-struct SaveDataFilter {
-    bool use_program_id;
-    bool use_save_data_type;
-    bool use_user_id;
-    bool use_save_data_id;
-    bool use_index;
-    SaveDataRank rank;
-    SaveDataAttribute attribute;
-};
-static_assert(sizeof(SaveDataFilter) == 0x48, "SaveDataFilter has invalid size.");
-static_assert(std::is_trivially_copyable_v<SaveDataFilter>,
-              "Data type must be trivially copyable.");
-
-struct HashSalt {
-    static constexpr size_t Size = 32;
-
-    std::array<u8, Size> value;
-};
-static_assert(std::is_trivially_copyable_v<HashSalt>, "Data type must be trivially copyable.");
-static_assert(sizeof(HashSalt) == HashSalt::Size);
-
-} // namespace FileSys
--- a/src/core/file_sys/fs_string_util.h
+++ b/src/core/file_sys/fs_string_util.h
@ -19,11 +19,6 @@ constexpr int Strlen(const T* str) {
    return length;
 }

-template <typename T>
-constexpr int Strnlen(const T* str, std::size_t count) {
-    return Strnlen(str, static_cast<int>(count));
-}
-
 template <typename T>
 constexpr int Strnlen(const T* str, int count) {
    ASSERT(str != nullptr);
@ -37,11 +32,6 @@ constexpr int Strnlen(const T* str, int count) {
    return length;
 }

-template <typename T>
-constexpr int Strncmp(const T* lhs, const T* rhs, std::size_t count) {
-    return Strncmp(lhs, rhs, static_cast<int>(count));
-}
-
 template <typename T>
 constexpr int Strncmp(const T* lhs, const T* rhs, int count) {
    ASSERT(lhs != nullptr);
@ -61,11 +51,6 @@ constexpr int Strncmp(const T* lhs, const T* rhs, int count) {
    return l - r;
 }

-template <typename T>
-static constexpr int Strlcpy(T* dst, const T* src, std::size_t count) {
-    return Strlcpy<T>(dst, src, static_cast<int>(count));
-}
-
 template <typename T>
 static constexpr int Strlcpy(T* dst, const T* src, int count) {
    ASSERT(dst != nullptr);
--- a/src/core/file_sys/fsa/fs_i_directory.h
+++ b/src/core/file_sys/fsa/fs_i_directory.h
@ -1,91 +0,0 @@
-// SPDX-FileCopyrightText: Copyright 2024 yuzu Emulator Project
-// SPDX-License-Identifier: GPL-2.0-or-later
-
-#pragma once
-
-#include "common/common_types.h"
-#include "core/file_sys/errors.h"
-#include "core/file_sys/fs_directory.h"
-#include "core/file_sys/fs_file.h"
-#include "core/file_sys/fs_filesystem.h"
-#include "core/file_sys/savedata_factory.h"
-#include "core/file_sys/vfs/vfs.h"
-#include "core/hle/result.h"
-
-namespace FileSys::Fsa {
-
-class IDirectory {
-public:
-    explicit IDirectory(VirtualDir backend_, OpenDirectoryMode mode)
-        : backend(std::move(backend_)) {
-        // TODO(DarkLordZach): Verify that this is the correct behavior.
-        // Build entry index now to save time later.
-        if (True(mode & OpenDirectoryMode::Directory)) {
-            BuildEntryIndex(backend->GetSubdirectories(), DirectoryEntryType::Directory);
-        }
-        if (True(mode & OpenDirectoryMode::File)) {
-            BuildEntryIndex(backend->GetFiles(), DirectoryEntryType::File);
-        }
-    }
-    virtual ~IDirectory() {}
-
-    Result Read(s64* out_count, DirectoryEntry* out_entries, s64 max_entries) {
-        R_UNLESS(out_count != nullptr, ResultNullptrArgument);
-        if (max_entries == 0) {
-            *out_count = 0;
-            R_SUCCEED();
-        }
-        R_UNLESS(out_entries != nullptr, ResultNullptrArgument);
-        R_UNLESS(max_entries > 0, ResultInvalidArgument);
-        R_RETURN(this->DoRead(out_count, out_entries, max_entries));
-    }
-
-    Result GetEntryCount(s64* out) {
-        R_UNLESS(out != nullptr, ResultNullptrArgument);
-        R_RETURN(this->DoGetEntryCount(out));
-    }
-
-private:
-    Result DoRead(s64* out_count, DirectoryEntry* out_entries, s64 max_entries) {
-        const u64 actual_entries =
-            std::min(static_cast<u64>(max_entries), entries.size() - next_entry_index);
-        const auto* begin = reinterpret_cast<u8*>(entries.data() + next_entry_index);
-        const auto* end = reinterpret_cast<u8*>(entries.data() + next_entry_index + actual_entries);
-        const auto range_size = static_cast<std::size_t>(std::distance(begin, end));
-
-        next_entry_index += actual_entries;
-        *out_count = actual_entries;
-
-        std::memcpy(out_entries, begin, range_size);
-
-        R_SUCCEED();
-    }
-
-    Result DoGetEntryCount(s64* out) {
-        *out = entries.size() - next_entry_index;
-        R_SUCCEED();
-    }
-
-    // TODO: Remove this when VFS is gone
-    template <typename T>
-    void BuildEntryIndex(const std::vector<T>& new_data, DirectoryEntryType type) {
-        entries.reserve(entries.size() + new_data.size());
-
-        for (const auto& new_entry : new_data) {
-            auto name = new_entry->GetName();
-
-            if (type == DirectoryEntryType::File && name == GetSaveDataSizeFileName()) {
-                continue;
-            }
-
-            entries.emplace_back(name, static_cast<s8>(type),
-                                 type == DirectoryEntryType::Directory ? 0 : new_entry->GetSize());
-        }
-    }
-
-    VirtualDir backend;
-    std::vector<DirectoryEntry> entries;
-    u64 next_entry_index = 0;
-};
-
-} // namespace FileSys::Fsa
--- a/src/core/file_sys/fsa/fs_i_file.h
+++ b/src/core/file_sys/fsa/fs_i_file.h
@ -1,167 +0,0 @@
-// SPDX-FileCopyrightText: Copyright 2024 yuzu Emulator Project
-// SPDX-License-Identifier: GPL-2.0-or-later
-
-#pragma once
-
-#include "common/overflow.h"
-#include "core/file_sys/errors.h"
-#include "core/file_sys/fs_file.h"
-#include "core/file_sys/fs_filesystem.h"
-#include "core/file_sys/fs_operate_range.h"
-#include "core/file_sys/vfs/vfs.h"
-#include "core/file_sys/vfs/vfs_types.h"
-#include "core/hle/result.h"
-
-namespace FileSys::Fsa {
-
-class IFile {
-public:
-    explicit IFile(VirtualFile backend_) : backend(std::move(backend_)) {}
-    virtual ~IFile() {}
-
-    Result Read(size_t* out, s64 offset, void* buffer, size_t size, const ReadOption& option) {
-        // Check that we have an output pointer
-        R_UNLESS(out != nullptr, ResultNullptrArgument);
-
-        // If we have nothing to read, just succeed
-        if (size == 0) {
-            *out = 0;
-            R_SUCCEED();
-        }
-
-        // Check that the read is valid
-        R_UNLESS(buffer != nullptr, ResultNullptrArgument);
-        R_UNLESS(offset >= 0, ResultOutOfRange);
-        R_UNLESS(Common::CanAddWithoutOverflow<s64>(offset, size), ResultOutOfRange);
-
-        // Do the read
-        R_RETURN(this->DoRead(out, offset, buffer, size, option));
-    }
-
-    Result Read(size_t* out, s64 offset, void* buffer, size_t size) {
-        R_RETURN(this->Read(out, offset, buffer, size, ReadOption::None));
-    }
-
-    Result GetSize(s64* out) {
-        R_UNLESS(out != nullptr, ResultNullptrArgument);
-        R_RETURN(this->DoGetSize(out));
-    }
-
-    Result Flush() {
-        R_RETURN(this->DoFlush());
-    }
-
-    Result Write(s64 offset, const void* buffer, size_t size, const WriteOption& option) {
-        // Handle the zero-size case
-        if (size == 0) {
-            if (option.HasFlushFlag()) {
-                R_TRY(this->Flush());
-            }
-            R_SUCCEED();
-        }
-
-        // Check the write is valid
-        R_UNLESS(buffer != nullptr, ResultNullptrArgument);
-        R_UNLESS(offset >= 0, ResultOutOfRange);
-        R_UNLESS(Common::CanAddWithoutOverflow<s64>(offset, size), ResultOutOfRange);
-
-        R_RETURN(this->DoWrite(offset, buffer, size, option));
-    }
-
-    Result SetSize(s64 size) {
-        R_UNLESS(size >= 0, ResultOutOfRange);
-        R_RETURN(this->DoSetSize(size));
-    }
-
-    Result OperateRange(void* dst, size_t dst_size, OperationId op_id, s64 offset, s64 size,
-                        const void* src, size_t src_size) {
-        R_RETURN(this->DoOperateRange(dst, dst_size, op_id, offset, size, src, src_size));
-    }
-
-    Result OperateRange(OperationId op_id, s64 offset, s64 size) {
-        R_RETURN(this->DoOperateRange(nullptr, 0, op_id, offset, size, nullptr, 0));
-    }
-
-protected:
-    Result DryRead(size_t* out, s64 offset, size_t size, const ReadOption& option,
-                   OpenMode open_mode) {
-        // Check that we can read
-        R_UNLESS(static_cast<u32>(open_mode & OpenMode::Read) != 0, ResultReadNotPermitted);
-
-        // Get the file size, and validate our offset
-        s64 file_size = 0;
-        R_TRY(this->DoGetSize(std::addressof(file_size)));
-        R_UNLESS(offset <= file_size, ResultOutOfRange);
-
-        *out = static_cast<size_t>(std::min(file_size - offset, static_cast<s64>(size)));
-        R_SUCCEED();
-    }
-
-    Result DrySetSize(s64 size, OpenMode open_mode) {
-        // Check that we can write
-        R_UNLESS(static_cast<u32>(open_mode & OpenMode::Write) != 0, ResultWriteNotPermitted);
-        R_SUCCEED();
-    }
-
-    Result DryWrite(bool* out_append, s64 offset, size_t size, const WriteOption& option,
-                    OpenMode open_mode) {
-        // Check that we can write
-        R_UNLESS(static_cast<u32>(open_mode & OpenMode::Write) != 0, ResultWriteNotPermitted);
-
-        // Get the file size
-        s64 file_size = 0;
-        R_TRY(this->DoGetSize(&file_size));
-
-        // Determine if we need to append
-        *out_append = false;
-        if (file_size < offset + static_cast<s64>(size)) {
-            R_UNLESS(static_cast<u32>(open_mode & OpenMode::AllowAppend) != 0,
-                     ResultFileExtensionWithoutOpenModeAllowAppend);
-            *out_append = true;
-        }
-
-        R_SUCCEED();
-    }
-
-private:
-    Result DoRead(size_t* out, s64 offset, void* buffer, size_t size, const ReadOption& option) {
-        const auto read_size = backend->Read(static_cast<u8*>(buffer), size, offset);
-        *out = read_size;
-
-        R_SUCCEED();
-    }
-
-    Result DoGetSize(s64* out) {
-        *out = backend->GetSize();
-        R_SUCCEED();
-    }
-
-    Result DoFlush() {
-        // Exists for SDK compatibiltity -- No need to flush file.
-        R_SUCCEED();
-    }
-
-    Result DoWrite(s64 offset, const void* buffer, size_t size, const WriteOption& option) {
-        const std::size_t written = backend->Write(static_cast<const u8*>(buffer), size, offset);
-
-        ASSERT_MSG(written == size,
-                   "Could not write all bytes to file (requested={:016X}, actual={:016X}).", size,
-                   written);
-
-        R_SUCCEED();
-    }
-
-    Result DoSetSize(s64 size) {
-        backend->Resize(size);
-        R_SUCCEED();
-    }
-
-    Result DoOperateRange(void* dst, size_t dst_size, OperationId op_id, s64 offset, s64 size,
-                          const void* src, size_t src_size) {
-        R_THROW(ResultNotImplemented);
-    }
-
-    VirtualFile backend;
-};
-
-} // namespace FileSys::Fsa
--- a/src/core/file_sys/fsa/fs_i_filesystem.h
+++ b/src/core/file_sys/fsa/fs_i_filesystem.h
@ -1,206 +0,0 @@
-// SPDX-FileCopyrightText: Copyright 2024 yuzu Emulator Project
-// SPDX-License-Identifier: GPL-2.0-or-later
-
-#pragma once
-
-#include "core/file_sys/errors.h"
-#include "core/file_sys/fs_filesystem.h"
-#include "core/file_sys/fs_path.h"
-#include "core/file_sys/vfs/vfs_types.h"
-#include "core/hle/result.h"
-#include "core/hle/service/filesystem/filesystem.h"
-
-namespace FileSys::Fsa {
-
-class IFile;
-class IDirectory;
-
-enum class QueryId : u32 {
-    SetConcatenationFileAttribute = 0,
-    UpdateMac = 1,
-    IsSignedSystemPartitionOnSdCardValid = 2,
-    QueryUnpreparedFileInformation = 3,
-};
-
-class IFileSystem {
-public:
-    explicit IFileSystem(VirtualDir backend_) : backend{std::move(backend_)} {}
-    virtual ~IFileSystem() {}
-
-    Result CreateFile(const Path& path, s64 size, CreateOption option) {
-        R_UNLESS(size >= 0, ResultOutOfRange);
-        R_RETURN(this->DoCreateFile(path, size, static_cast<int>(option)));
-    }
-
-    Result CreateFile(const Path& path, s64 size) {
-        R_RETURN(this->CreateFile(path, size, CreateOption::None));
-    }
-
-    Result DeleteFile(const Path& path) {
-        R_RETURN(this->DoDeleteFile(path));
-    }
-
-    Result CreateDirectory(const Path& path) {
-        R_RETURN(this->DoCreateDirectory(path));
-    }
-
-    Result DeleteDirectory(const Path& path) {
-        R_RETURN(this->DoDeleteDirectory(path));
-    }
-
-    Result DeleteDirectoryRecursively(const Path& path) {
-        R_RETURN(this->DoDeleteDirectoryRecursively(path));
-    }
-
-    Result RenameFile(const Path& old_path, const Path& new_path) {
-        R_RETURN(this->DoRenameFile(old_path, new_path));
-    }
-
-    Result RenameDirectory(const Path& old_path, const Path& new_path) {
-        R_RETURN(this->DoRenameDirectory(old_path, new_path));
-    }
-
-    Result GetEntryType(DirectoryEntryType* out, const Path& path) {
-        R_RETURN(this->DoGetEntryType(out, path));
-    }
-
-    Result OpenFile(VirtualFile* out_file, const Path& path, OpenMode mode) {
-        R_UNLESS(out_file != nullptr, ResultNullptrArgument);
-        R_UNLESS(static_cast<u32>(mode & OpenMode::ReadWrite) != 0, ResultInvalidOpenMode);
-        R_UNLESS(static_cast<u32>(mode & ~OpenMode::All) == 0, ResultInvalidOpenMode);
-        R_RETURN(this->DoOpenFile(out_file, path, mode));
-    }
-
-    Result OpenDirectory(VirtualDir* out_dir, const Path& path, OpenDirectoryMode mode) {
-        R_UNLESS(out_dir != nullptr, ResultNullptrArgument);
-        R_UNLESS(static_cast<u64>(mode & OpenDirectoryMode::All) != 0, ResultInvalidOpenMode);
-        R_UNLESS(static_cast<u64>(
-                     mode & ~(OpenDirectoryMode::All | OpenDirectoryMode::NotRequireFileSize)) == 0,
-                 ResultInvalidOpenMode);
-        R_RETURN(this->DoOpenDirectory(out_dir, path, mode));
-    }
-
-    Result Commit() {
-        R_RETURN(this->DoCommit());
-    }
-
-    Result GetFreeSpaceSize(s64* out, const Path& path) {
-        R_UNLESS(out != nullptr, ResultNullptrArgument);
-        R_RETURN(this->DoGetFreeSpaceSize(out, path));
-    }
-
-    Result GetTotalSpaceSize(s64* out, const Path& path) {
-        R_UNLESS(out != nullptr, ResultNullptrArgument);
-        R_RETURN(this->DoGetTotalSpaceSize(out, path));
-    }
-
-    Result CleanDirectoryRecursively(const Path& path) {
-        R_RETURN(this->DoCleanDirectoryRecursively(path));
-    }
-
-    Result GetFileTimeStampRaw(FileTimeStampRaw* out, const Path& path) {
-        R_UNLESS(out != nullptr, ResultNullptrArgument);
-        R_RETURN(this->DoGetFileTimeStampRaw(out, path));
-    }
-
-    Result QueryEntry(char* dst, size_t dst_size, const char* src, size_t src_size, QueryId query,
-                      const Path& path) {
-        R_RETURN(this->DoQueryEntry(dst, dst_size, src, src_size, query, path));
-    }
-
-    // These aren't accessible as commands
-    Result CommitProvisionally(s64 counter) {
-        R_RETURN(this->DoCommitProvisionally(counter));
-    }
-
-    Result Rollback() {
-        R_RETURN(this->DoRollback());
-    }
-
-    Result Flush() {
-        R_RETURN(this->DoFlush());
-    }
-
-private:
-    Result DoCreateFile(const Path& path, s64 size, int flags) {
-        R_RETURN(backend.CreateFile(path.GetString(), size));
-    }
-
-    Result DoDeleteFile(const Path& path) {
-        R_RETURN(backend.DeleteFile(path.GetString()));
-    }
-
-    Result DoCreateDirectory(const Path& path) {
-        R_RETURN(backend.CreateDirectory(path.GetString()));
-    }
-
-    Result DoDeleteDirectory(const Path& path) {
-        R_RETURN(backend.DeleteDirectory(path.GetString()));
-    }
-
-    Result DoDeleteDirectoryRecursively(const Path& path) {
-        R_RETURN(backend.DeleteDirectoryRecursively(path.GetString()));
-    }
-
-    Result DoRenameFile(const Path& old_path, const Path& new_path) {
-        R_RETURN(backend.RenameFile(old_path.GetString(), new_path.GetString()));
-    }
-
-    Result DoRenameDirectory(const Path& old_path, const Path& new_path) {
-        R_RETURN(backend.RenameDirectory(old_path.GetString(), new_path.GetString()));
-    }
-
-    Result DoGetEntryType(DirectoryEntryType* out, const Path& path) {
-        R_RETURN(backend.GetEntryType(out, path.GetString()));
-    }
-
-    Result DoOpenFile(VirtualFile* out_file, const Path& path, OpenMode mode) {
-        R_RETURN(backend.OpenFile(out_file, path.GetString(), mode));
-    }
-
-    Result DoOpenDirectory(VirtualDir* out_directory, const Path& path, OpenDirectoryMode mode) {
-        R_RETURN(backend.OpenDirectory(out_directory, path.GetString()));
-    }
-
-    Result DoCommit() {
-        R_THROW(ResultNotImplemented);
-    }
-
-    Result DoGetFreeSpaceSize(s64* out, const Path& path) {
-        R_THROW(ResultNotImplemented);
-    }
-
-    Result DoGetTotalSpaceSize(s64* out, const Path& path) {
-        R_THROW(ResultNotImplemented);
-    }
-
-    Result DoCleanDirectoryRecursively(const Path& path) {
-        R_RETURN(backend.CleanDirectoryRecursively(path.GetString()));
-    }
-
-    Result DoGetFileTimeStampRaw(FileTimeStampRaw* out, const Path& path) {
-        R_RETURN(backend.GetFileTimeStampRaw(out, path.GetString()));
-    }
-
-    Result DoQueryEntry(char* dst, size_t dst_size, const char* src, size_t src_size, QueryId query,
-                        const Path& path) {
-        R_THROW(ResultNotImplemented);
-    }
-
-    // These aren't accessible as commands
-    Result DoCommitProvisionally(s64 counter) {
-        R_THROW(ResultNotImplemented);
-    }
-
-    Result DoRollback() {
-        R_THROW(ResultNotImplemented);
-    }
-
-    Result DoFlush() {
-        R_THROW(ResultNotImplemented);
-    }
-
-    Service::FileSystem::VfsDirectoryServiceWrapper backend;
-};
-
-} // namespace FileSys::Fsa
--- a/src/core/file_sys/fssrv/fssrv_sf_path.h
+++ b/src/core/file_sys/fssrv/fssrv_sf_path.h
@ -1,36 +0,0 @@
-// SPDX-FileCopyrightText: Copyright 2024 yuzu Emulator Project
-// SPDX-License-Identifier: GPL-2.0-or-later
-
-#pragma once
-
-#include "core/file_sys/fs_directory.h"
-
-namespace FileSys::Sf {
-
-struct Path {
-    char str[EntryNameLengthMax + 1];
-
-    static constexpr Path Encode(const char* p) {
-        Path path = {};
-        for (size_t i = 0; i < sizeof(path) - 1; i++) {
-            path.str[i] = p[i];
-            if (p[i] == '\x00') {
-                break;
-            }
-        }
-        return path;
-    }
-
-    static constexpr size_t GetPathLength(const Path& path) {
-        size_t len = 0;
-        for (size_t i = 0; i < sizeof(path) - 1 && path.str[i] != '\x00'; i++) {
-            len++;
-        }
-        return len;
-    }
-};
-static_assert(std::is_trivially_copyable_v<Path>, "Path must be trivially copyable.");
-
-using FspPath = Path;
-
-} // namespace FileSys::Sf
--- a/src/core/file_sys/fssystem/fssystem_aes_xts_storage.h
+++ b/src/core/file_sys/fssystem/fssystem_aes_xts_storage.h
@ -3,7 +3,6 @@

 #pragma once

-#include <mutex>
 #include <optional>

 #include "core/crypto/aes_util.h"
--- a/src/core/file_sys/fssystem/fssystem_hierarchical_sha256_storage.cpp
+++ b/src/core/file_sys/fssystem/fssystem_hierarchical_sha256_storage.cpp
@ -36,9 +36,7 @@ Result HierarchicalSha256Storage::Initialize(VirtualFile* base_storages, s32 lay
    // Get the base storage size.
    m_base_storage_size = base_storages[2]->GetSize();
    {
-        auto size_guard = SCOPE_GUARD {
-            m_base_storage_size = 0;
-        };
+        auto size_guard = SCOPE_GUARD({ m_base_storage_size = 0; });
        R_UNLESS(m_base_storage_size <= static_cast<s64>(HashSize)
                                            << m_log_size_ratio << m_log_size_ratio,
                 ResultHierarchicalSha256BaseStorageTooLarge);
--- a/src/core/file_sys/program_metadata.cpp
+++ b/src/core/file_sys/program_metadata.cpp
@ -98,9 +98,7 @@ Loader::ResultStatus ProgramMetadata::Load(VirtualFile file) {

 Loader::ResultStatus ProgramMetadata::Reload(VirtualFile file) {
    const u64 original_program_id = aci_header.title_id;
-    SCOPE_EXIT {
-        aci_header.title_id = original_program_id;
-    };
+    SCOPE_EXIT({ aci_header.title_id = original_program_id; });

    return this->Load(file);
 }
--- a/src/core/file_sys/savedata_factory.cpp
+++ b/src/core/file_sys/savedata_factory.cpp
@ -14,11 +14,48 @@ namespace FileSys {

 namespace {

+void PrintSaveDataAttributeWarnings(SaveDataAttribute meta) {
+    if (meta.type == SaveDataType::SystemSaveData || meta.type == SaveDataType::SaveData) {
+        if (meta.zero_1 != 0) {
+            LOG_WARNING(Service_FS,
+                        "Possibly incorrect SaveDataAttribute, type is "
+                        "SystemSaveData||SaveData but offset 0x28 is non-zero ({:016X}).",
+                        meta.zero_1);
+        }
+        if (meta.zero_2 != 0) {
+            LOG_WARNING(Service_FS,
+                        "Possibly incorrect SaveDataAttribute, type is "
+                        "SystemSaveData||SaveData but offset 0x30 is non-zero ({:016X}).",
+                        meta.zero_2);
+        }
+        if (meta.zero_3 != 0) {
+            LOG_WARNING(Service_FS,
+                        "Possibly incorrect SaveDataAttribute, type is "
+                        "SystemSaveData||SaveData but offset 0x38 is non-zero ({:016X}).",
+                        meta.zero_3);
+        }
+    }
+
+    if (meta.type == SaveDataType::SystemSaveData && meta.title_id != 0) {
+        LOG_WARNING(Service_FS,
+                    "Possibly incorrect SaveDataAttribute, type is SystemSaveData but title_id is "
+                    "non-zero ({:016X}).",
+                    meta.title_id);
+    }
+
+    if (meta.type == SaveDataType::DeviceSaveData && meta.user_id != u128{0, 0}) {
+        LOG_WARNING(Service_FS,
+                    "Possibly incorrect SaveDataAttribute, type is DeviceSaveData but user_id is "
+                    "non-zero ({:016X}{:016X})",
+                    meta.user_id[1], meta.user_id[0]);
+    }
+}
+
 bool ShouldSaveDataBeAutomaticallyCreated(SaveDataSpaceId space, const SaveDataAttribute& attr) {
-    return attr.type == SaveDataType::Cache || attr.type == SaveDataType::Temporary ||
-           (space == SaveDataSpaceId::User && ///< Normal Save Data -- Current Title & User
-            (attr.type == SaveDataType::Account || attr.type == SaveDataType::Device) &&
-            attr.program_id == 0 && attr.system_save_data_id == 0);
+    return attr.type == SaveDataType::CacheStorage || attr.type == SaveDataType::TemporaryStorage ||
+           (space == SaveDataSpaceId::NandUser && ///< Normal Save Data -- Current Title & User
+            (attr.type == SaveDataType::SaveData || attr.type == SaveDataType::DeviceSaveData) &&
+            attr.title_id == 0 && attr.save_id == 0);
 }

 std::string GetFutureSaveDataPath(SaveDataSpaceId space_id, SaveDataType type, u64 title_id,
@ -26,7 +63,7 @@ std::string GetFutureSaveDataPath(SaveDataSpaceId space_id, SaveDataType type, u
    // Only detect nand user saves.
    const auto space_id_path = [space_id]() -> std::string_view {
        switch (space_id) {
-        case SaveDataSpaceId::User:
+        case SaveDataSpaceId::NandUser:
            return "/user/save";
        default:
            return "";
@ -42,9 +79,9 @@ std::string GetFutureSaveDataPath(SaveDataSpaceId space_id, SaveDataType type, u

    // Only detect account/device saves from the future location.
    switch (type) {
-    case SaveDataType::Account:
+    case SaveDataType::SaveData:
        return fmt::format("{}/account/{}/{:016X}/0", space_id_path, uuid.RawString(), title_id);
-    case SaveDataType::Device:
+    case SaveDataType::DeviceSaveData:
        return fmt::format("{}/device/{:016X}/0", space_id_path, title_id);
    default:
        return "";
@ -53,6 +90,13 @@ std::string GetFutureSaveDataPath(SaveDataSpaceId space_id, SaveDataType type, u

 } // Anonymous namespace

+std::string SaveDataAttribute::DebugInfo() const {
+    return fmt::format("[title_id={:016X}, user_id={:016X}{:016X}, save_id={:016X}, type={:02X}, "
+                       "rank={}, index={}]",
+                       title_id, user_id[1], user_id[0], save_id, static_cast<u8>(type),
+                       static_cast<u8>(rank), index);
+}
+
 SaveDataFactory::SaveDataFactory(Core::System& system_, ProgramId program_id_,
                                 VirtualDir save_directory_)
    : system{system_}, program_id{program_id_}, dir{std::move(save_directory_)} {
@ -64,16 +108,18 @@ SaveDataFactory::SaveDataFactory(Core::System& system_, ProgramId program_id_,
 SaveDataFactory::~SaveDataFactory() = default;

 VirtualDir SaveDataFactory::Create(SaveDataSpaceId space, const SaveDataAttribute& meta) const {
-    const auto save_directory = GetFullPath(program_id, dir, space, meta.type, meta.program_id,
-                                            meta.user_id, meta.system_save_data_id);
+    PrintSaveDataAttributeWarnings(meta);
+
+    const auto save_directory =
+        GetFullPath(program_id, dir, space, meta.type, meta.title_id, meta.user_id, meta.save_id);

    return dir->CreateDirectoryRelative(save_directory);
 }

 VirtualDir SaveDataFactory::Open(SaveDataSpaceId space, const SaveDataAttribute& meta) const {

-    const auto save_directory = GetFullPath(program_id, dir, space, meta.type, meta.program_id,
-                                            meta.user_id, meta.system_save_data_id);
+    const auto save_directory =
+        GetFullPath(program_id, dir, space, meta.type, meta.title_id, meta.user_id, meta.save_id);

    auto out = dir->GetDirectoryRelative(save_directory);

@ -90,11 +136,11 @@ VirtualDir SaveDataFactory::GetSaveDataSpaceDirectory(SaveDataSpaceId space) con

 std::string SaveDataFactory::GetSaveDataSpaceIdPath(SaveDataSpaceId space) {
    switch (space) {
-    case SaveDataSpaceId::System:
+    case SaveDataSpaceId::NandSystem:
        return "/system/";
-    case SaveDataSpaceId::User:
+    case SaveDataSpaceId::NandUser:
        return "/user/";
-    case SaveDataSpaceId::Temporary:
+    case SaveDataSpaceId::TemporaryStorage:
        return "/temp/";
    default:
        ASSERT_MSG(false, "Unrecognized SaveDataSpaceId: {:02X}", static_cast<u8>(space));
@ -107,7 +153,7 @@ std::string SaveDataFactory::GetFullPath(ProgramId program_id, VirtualDir dir,
                                         u128 user_id, u64 save_id) {
    // According to switchbrew, if a save is of type SaveData and the title id field is 0, it should
    // be interpreted as the title id of the current process.
-    if (type == SaveDataType::Account || type == SaveDataType::Device) {
+    if (type == SaveDataType::SaveData || type == SaveDataType::DeviceSaveData) {
        if (title_id == 0) {
            title_id = program_id;
        }
@ -127,16 +173,16 @@ std::string SaveDataFactory::GetFullPath(ProgramId program_id, VirtualDir dir,
    std::string out = GetSaveDataSpaceIdPath(space);

    switch (type) {
-    case SaveDataType::System:
+    case SaveDataType::SystemSaveData:
        return fmt::format("{}save/{:016X}/{:016X}{:016X}", out, save_id, user_id[1], user_id[0]);
-    case SaveDataType::Account:
-    case SaveDataType::Device:
+    case SaveDataType::SaveData:
+    case SaveDataType::DeviceSaveData:
        return fmt::format("{}save/{:016X}/{:016X}{:016X}/{:016X}", out, 0, user_id[1], user_id[0],
                           title_id);
-    case SaveDataType::Temporary:
+    case SaveDataType::TemporaryStorage:
        return fmt::format("{}{:016X}/{:016X}{:016X}/{:016X}", out, 0, user_id[1], user_id[0],
                           title_id);
-    case SaveDataType::Cache:
+    case SaveDataType::CacheStorage:
        return fmt::format("{}save/cache/{:016X}", out, title_id);
    default:
        ASSERT_MSG(false, "Unrecognized SaveDataType: {:02X}", static_cast<u8>(type));
@ -156,7 +202,7 @@ std::string SaveDataFactory::GetUserGameSaveDataRoot(u128 user_id, bool future)
 SaveDataSize SaveDataFactory::ReadSaveDataSize(SaveDataType type, u64 title_id,
                                               u128 user_id) const {
    const auto path =
-        GetFullPath(program_id, dir, SaveDataSpaceId::User, type, title_id, user_id, 0);
+        GetFullPath(program_id, dir, SaveDataSpaceId::NandUser, type, title_id, user_id, 0);
    const auto relative_dir = GetOrCreateDirectoryRelative(dir, path);

    const auto size_file = relative_dir->GetFile(GetSaveDataSizeFileName());
@ -175,7 +221,7 @@ SaveDataSize SaveDataFactory::ReadSaveDataSize(SaveDataType type, u64 title_id,
 void SaveDataFactory::WriteSaveDataSize(SaveDataType type, u64 title_id, u128 user_id,
                                        SaveDataSize new_value) const {
    const auto path =
-        GetFullPath(program_id, dir, SaveDataSpaceId::User, type, title_id, user_id, 0);
+        GetFullPath(program_id, dir, SaveDataSpaceId::NandUser, type, title_id, user_id, 0);
    const auto relative_dir = GetOrCreateDirectoryRelative(dir, path);

    const auto size_file = relative_dir->CreateFile(GetSaveDataSizeFileName());
--- a/src/core/file_sys/savedata_factory.h
+++ b/src/core/file_sys/savedata_factory.h
@ -7,7 +7,6 @@
 #include <string>
 #include "common/common_funcs.h"
 #include "common/common_types.h"
-#include "core/file_sys/fs_save_data_types.h"
 #include "core/file_sys/vfs/vfs.h"
 #include "core/hle/result.h"

@ -17,6 +16,73 @@ class System;

 namespace FileSys {

+enum class SaveDataSpaceId : u8 {
+    NandSystem = 0,
+    NandUser = 1,
+    SdCardSystem = 2,
+    TemporaryStorage = 3,
+    SdCardUser = 4,
+    ProperSystem = 100,
+    SafeMode = 101,
+};
+
+enum class SaveDataType : u8 {
+    SystemSaveData = 0,
+    SaveData = 1,
+    BcatDeliveryCacheStorage = 2,
+    DeviceSaveData = 3,
+    TemporaryStorage = 4,
+    CacheStorage = 5,
+    SystemBcat = 6,
+};
+
+enum class SaveDataRank : u8 {
+    Primary = 0,
+    Secondary = 1,
+};
+
+enum class SaveDataFlags : u32 {
+    None = (0 << 0),
+    KeepAfterResettingSystemSaveData = (1 << 0),
+    KeepAfterRefurbishment = (1 << 1),
+    KeepAfterResettingSystemSaveDataWithoutUserSaveData = (1 << 2),
+    NeedsSecureDelete = (1 << 3),
+};
+
+struct SaveDataAttribute {
+    u64 title_id;
+    u128 user_id;
+    u64 save_id;
+    SaveDataType type;
+    SaveDataRank rank;
+    u16 index;
+    INSERT_PADDING_BYTES_NOINIT(4);
+    u64 zero_1;
+    u64 zero_2;
+    u64 zero_3;
+
+    std::string DebugInfo() const;
+};
+static_assert(sizeof(SaveDataAttribute) == 0x40, "SaveDataAttribute has incorrect size.");
+
+struct SaveDataExtraData {
+    SaveDataAttribute attr;
+    u64 owner_id;
+    s64 timestamp;
+    SaveDataFlags flags;
+    INSERT_PADDING_BYTES_NOINIT(4);
+    s64 available_size;
+    s64 journal_size;
+    s64 commit_id;
+    std::array<u8, 0x190> unused;
+};
+static_assert(sizeof(SaveDataExtraData) == 0x200, "SaveDataExtraData has incorrect size.");
+
+struct SaveDataSize {
+    u64 normal;
+    u64 journal;
+};
+
 constexpr const char* GetSaveDataSizeFileName() {
    return ".yuzu_save_size";
 }
--- a/src/core/hle/kernel/k_client_session.cpp
+++ b/src/core/hle/kernel/k_client_session.cpp
@ -24,9 +24,7 @@ Result KClientSession::SendSyncRequest(uintptr_t address, size_t size) {
    // Create a session request.
    KSessionRequest* request = KSessionRequest::Create(m_kernel);
    R_UNLESS(request != nullptr, ResultOutOfResource);
-    SCOPE_EXIT {
-        request->Close();
-    };
+    SCOPE_EXIT({ request->Close(); });

    // Initialize the request.
    request->Initialize(nullptr, address, size);
@ -39,9 +37,7 @@ Result KClientSession::SendAsyncRequest(KEvent* event, uintptr_t address, size_t
    // Create a session request.
    KSessionRequest* request = KSessionRequest::Create(m_kernel);
    R_UNLESS(request != nullptr, ResultOutOfResource);
-    SCOPE_EXIT {
-        request->Close();
-    };
+    SCOPE_EXIT({ request->Close(); });

    // Initialize the request.
    request->Initialize(event, address, size);
--- a/src/core/hle/kernel/k_page_table_base.cpp
+++ b/src/core/hle/kernel/k_page_table_base.cpp
@ -1305,11 +1305,11 @@ Result KPageTableBase::UnmapCodeMemory(KProcessAddress dst_address, KProcessAddr

    // Ensure that we maintain the instruction cache.
    bool reprotected_pages = false;
-    SCOPE_EXIT {
+    SCOPE_EXIT({
        if (reprotected_pages && any_code_pages) {
            InvalidateInstructionCache(m_kernel, this, dst_address, size);
        }
-    };
+    });

    // Unmap.
    {
@ -1397,9 +1397,7 @@ Result KPageTableBase::MapInsecureMemory(KProcessAddress address, size_t size) {
    // Close the opened pages when we're done with them.
    // If the mapping succeeds, each page will gain an extra reference, otherwise they will be freed
    // automatically.
-    SCOPE_EXIT {
-        pg.Close();
-    };
+    SCOPE_EXIT({ pg.Close(); });

    // Clear all the newly allocated pages.
    for (const auto& it : pg) {
@ -1605,9 +1603,7 @@ Result KPageTableBase::AllocateAndMapPagesImpl(PageLinkedList* page_list, KProce
        m_kernel.MemoryManager().AllocateAndOpen(std::addressof(pg), num_pages, m_allocate_option));

    // Ensure that the page group is closed when we're done working with it.
-    SCOPE_EXIT {
-        pg.Close();
-    };
+    SCOPE_EXIT({ pg.Close(); });

    // Clear all pages.
    for (const auto& it : pg) {
@ -2195,9 +2191,7 @@ Result KPageTableBase::SetHeapSize(KProcessAddress* out, size_t size) {
    // Close the opened pages when we're done with them.
    // If the mapping succeeds, each page will gain an extra reference, otherwise they will be freed
    // automatically.
-    SCOPE_EXIT {
-        pg.Close();
-    };
+    SCOPE_EXIT({ pg.Close(); });

    // Clear all the newly allocated pages.
    for (const auto& it : pg) {
@ -2598,9 +2592,7 @@ Result KPageTableBase::UnmapIoRegion(KProcessAddress dst_address, KPhysicalAddre
        // Temporarily unlock ourselves, so that other operations can occur while we flush the
        // region.
        m_general_lock.Unlock();
-        SCOPE_EXIT {
-            m_general_lock.Lock();
-        };
+        SCOPE_EXIT({ m_general_lock.Lock(); });

        // Flush the region.
        R_ASSERT(FlushDataCache(dst_address, size));
@ -3319,10 +3311,10 @@ Result KPageTableBase::ReadIoMemoryImpl(KProcessAddress dst_addr, KPhysicalAddre
    // Ensure we unmap the io memory when we're done with it.
    const KPageProperties unmap_properties =
        KPageProperties{KMemoryPermission::None, false, false, DisableMergeAttribute::None};
-    SCOPE_EXIT {
+    SCOPE_EXIT({
        R_ASSERT(this->Operate(updater.GetPageList(), io_addr, map_size / PageSize, 0, false,
                               unmap_properties, OperationType::Unmap, true));
-    };
+    });

    // Read the memory.
    const KProcessAddress read_addr = io_addr + (GetInteger(phys_addr) & (PageSize - 1));
@ -3355,10 +3347,10 @@ Result KPageTableBase::WriteIoMemoryImpl(KPhysicalAddress phys_addr, KProcessAdd
    // Ensure we unmap the io memory when we're done with it.
    const KPageProperties unmap_properties =
        KPageProperties{KMemoryPermission::None, false, false, DisableMergeAttribute::None};
-    SCOPE_EXIT {
+    SCOPE_EXIT({
        R_ASSERT(this->Operate(updater.GetPageList(), io_addr, map_size / PageSize, 0, false,
                               unmap_properties, OperationType::Unmap, true));
-    };
+    });

    // Write the memory.
    const KProcessAddress write_addr = io_addr + (GetInteger(phys_addr) & (PageSize - 1));
@ -4499,14 +4491,14 @@ Result KPageTableBase::SetupForIpcServer(KProcessAddress* out_addr, size_t size,

    // If the partial pages are mapped, an extra reference will have been opened. Otherwise, they'll
    // free on scope exit.
-    SCOPE_EXIT {
+    SCOPE_EXIT({
        if (start_partial_page != 0) {
            m_kernel.MemoryManager().Close(start_partial_page, 1);
        }
        if (end_partial_page != 0) {
            m_kernel.MemoryManager().Close(end_partial_page, 1);
        }
-    };
+    });

    ON_RESULT_FAILURE {
        if (cur_mapped_addr != dst_addr) {
@ -5174,10 +5166,10 @@ Result KPageTableBase::MapPhysicalMemory(KProcessAddress address, size_t size) {
                GetCurrentProcess(m_kernel).GetId(), m_heap_fill_value));

            // If we fail in the next bit (or retry), we need to cleanup the pages.
-            auto pg_guard = SCOPE_GUARD {
+            auto pg_guard = SCOPE_GUARD({
                pg.OpenFirst();
                pg.Close();
-            };
+            });

            // Map the memory.
            {
@ -5702,9 +5694,7 @@ Result KPageTableBase::Operate(PageLinkedList* page_list, KProcessAddress virt_a

        // Ensure that any pages we track are closed on exit.
        KPageGroup pages_to_close(m_kernel, this->GetBlockInfoManager());
-        SCOPE_EXIT {
-            pages_to_close.CloseAndReset();
-        };
+        SCOPE_EXIT({ pages_to_close.CloseAndReset(); });

        // Make a page group representing the region to unmap.
        this->MakePageGroup(pages_to_close, virt_addr, num_pages);
--- a/src/core/hle/kernel/k_process.cpp
+++ b/src/core/hle/kernel/k_process.cpp
@ -77,9 +77,7 @@ Result TerminateChildren(KernelCore& kernel, KProcess* process,
        }

        // Terminate and close the thread.
-        SCOPE_EXIT {
-            cur_child->Close();
-        };
+        SCOPE_EXIT({ cur_child->Close(); });

        if (const Result terminate_result = cur_child->Terminate();
            ResultTerminationRequested == terminate_result) {
@ -468,11 +466,11 @@ void KProcess::DoWorkerTaskImpl() {

 Result KProcess::StartTermination() {
    // Finalize the handle table when we're done, if the process isn't immortal.
-    SCOPE_EXIT {
+    SCOPE_EXIT({
        if (!m_is_immortal) {
            this->FinalizeHandleTable();
        }
-    };
+    });

    // Terminate child threads other than the current one.
    R_RETURN(TerminateChildren(m_kernel, this, GetCurrentThreadPointer(m_kernel)));
@ -966,9 +964,7 @@ Result KProcess::Run(s32 priority, size_t stack_size) {
    // Create a new thread for the process.
    KThread* main_thread = KThread::Create(m_kernel);
    R_UNLESS(main_thread != nullptr, ResultOutOfResource);
-    SCOPE_EXIT {
-        main_thread->Close();
-    };
+    SCOPE_EXIT({ main_thread->Close(); });

    // Initialize the thread.
    R_TRY(KThread::InitializeUserThread(m_kernel.System(), main_thread, this->GetEntryPoint(), 0,
@ -1159,9 +1155,7 @@ Result KProcess::LoadFromMetadata(const FileSys::ProgramMetadata& metadata, std:
        Kernel::CreateResourceLimitForProcess(m_kernel.System(), physical_memory_size);

    // Ensure we maintain a clean state on exit.
-    SCOPE_EXIT {
-        res_limit->Close();
-    };
+    SCOPE_EXIT({ res_limit->Close(); });

    // Declare flags and code address.
    Svc::CreateProcessFlag flag{};
@ -1170,7 +1164,6 @@ Result KProcess::LoadFromMetadata(const FileSys::ProgramMetadata& metadata, std:
    // Determine if we are an application.
    if (pool == KMemoryManager::Pool::Application) {
        flag |= Svc::CreateProcessFlag::IsApplication;
-        m_is_application = true;
    }

    // If we are 64-bit, create as such.
--- a/src/core/hle/kernel/k_server_session.cpp
+++ b/src/core/hle/kernel/k_server_session.cpp
@ -651,11 +651,11 @@ Result ReceiveMessage(KernelCore& kernel, bool& recv_list_broken, uint64_t dst_m
    // Process any special data.
    if (src_header.GetHasSpecialHeader()) {
        // After we process, make sure we track whether the receive list is broken.
-        SCOPE_EXIT {
+        SCOPE_EXIT({
            if (offset > dst_recv_list_idx) {
                recv_list_broken = true;
            }
-        };
+        });

        // Process special data.
        R_TRY(ProcessMessageSpecialData<false>(offset, dst_process, src_process, src_thread,
@ -665,11 +665,11 @@ Result ReceiveMessage(KernelCore& kernel, bool& recv_list_broken, uint64_t dst_m
    // Process any pointer buffers.
    for (auto i = 0; i < src_header.GetPointerCount(); ++i) {
        // After we process, make sure we track whether the receive list is broken.
-        SCOPE_EXIT {
+        SCOPE_EXIT({
            if (offset > dst_recv_list_idx) {
                recv_list_broken = true;
            }
-        };
+        });

        R_TRY(ProcessReceiveMessagePointerDescriptors(
            offset, pointer_key, dst_page_table, src_page_table, dst_msg, src_msg, dst_recv_list,
@ -680,11 +680,11 @@ Result ReceiveMessage(KernelCore& kernel, bool& recv_list_broken, uint64_t dst_m
    // Process any map alias buffers.
    for (auto i = 0; i < src_header.GetMapAliasCount(); ++i) {
        // After we process, make sure we track whether the receive list is broken.
-        SCOPE_EXIT {
+        SCOPE_EXIT({
            if (offset > dst_recv_list_idx) {
                recv_list_broken = true;
            }
-        };
+        });

        // We process in order send, recv, exch. Buffers after send (recv/exch) are ReadWrite.
        const KMemoryPermission perm = (i >= src_header.GetSendCount())
@ -702,11 +702,11 @@ Result ReceiveMessage(KernelCore& kernel, bool& recv_list_broken, uint64_t dst_m
    // Process any raw data.
    if (const auto raw_count = src_header.GetRawCount(); raw_count != 0) {
        // After we process, make sure we track whether the receive list is broken.
-        SCOPE_EXIT {
+        SCOPE_EXIT({
            if (offset + raw_count > dst_recv_list_idx) {
                recv_list_broken = true;
            }
-        };
+        });

        // Get the offset and size.
        const size_t offset_words = offset * sizeof(u32);
@ -1124,9 +1124,7 @@ Result KServerSession::ReceiveRequest(uintptr_t server_message, uintptr_t server
        client_thread->Open();
    }

-    SCOPE_EXIT {
-        client_thread->Close();
-    };
+    SCOPE_EXIT({ client_thread->Close(); });

    // Set the request as our current.
    m_current_request = request;
@ -1176,9 +1174,7 @@ Result KServerSession::ReceiveRequest(uintptr_t server_message, uintptr_t server
        // Reply to the client.
        {
            // After we reply, close our reference to the request.
-            SCOPE_EXIT {
-                request->Close();
-            };
+            SCOPE_EXIT({ request->Close(); });

            // Get the event to check whether the request is async.
            if (KEvent* event = request->GetEvent(); event != nullptr) {
@ -1240,9 +1236,7 @@ Result KServerSession::SendReply(uintptr_t server_message, uintptr_t server_buff
    }

    // Close reference to the request once we're done processing it.
-    SCOPE_EXIT {
-        request->Close();
-    };
+    SCOPE_EXIT({ request->Close(); });

    // Extract relevant information from the request.
    const uint64_t client_message = request->GetAddress();
@ -1400,9 +1394,7 @@ void KServerSession::CleanupRequests() {
        }

        // Close a reference to the request once it's cleaned up.
-        SCOPE_EXIT {
-            request->Close();
-        };
+        SCOPE_EXIT({ request->Close(); });

        // Extract relevant information from the request.
        const uint64_t client_message = request->GetAddress();
@ -1499,9 +1491,7 @@ void KServerSession::OnClientClosed() {
        ASSERT(thread != nullptr);

        // Ensure that we close the request when done.
-        SCOPE_EXIT {
-            request->Close();
-        };
+        SCOPE_EXIT({ request->Close(); });

        // If we're terminating, close a reference to the thread and event.
        if (terminate) {
--- a/src/core/hle/kernel/k_thread_local_page.cpp
+++ b/src/core/hle/kernel/k_thread_local_page.cpp
@ -21,9 +21,7 @@ Result KThreadLocalPage::Initialize(KernelCore& kernel, KProcess* process) {
    // Allocate a new page.
    KPageBuffer* page_buf = KPageBuffer::Allocate(kernel);
    R_UNLESS(page_buf != nullptr, ResultOutOfMemory);
-    auto page_buf_guard = SCOPE_GUARD {
-        KPageBuffer::Free(kernel, page_buf);
-    };
+    auto page_buf_guard = SCOPE_GUARD({ KPageBuffer::Free(kernel, page_buf); });

    // Map the address in.
    const auto phys_addr = kernel.System().DeviceMemory().GetPhysicalAddr(page_buf);
--- a/src/core/hle/kernel/k_transfer_memory.cpp
+++ b/src/core/hle/kernel/k_transfer_memory.cpp
@ -24,9 +24,7 @@ Result KTransferMemory::Initialize(KProcessAddress addr, std::size_t size,

    // Construct the page group, guarding to make sure our state is valid on exit.
    m_page_group.emplace(m_kernel, page_table.GetBlockInfoManager());
-    auto pg_guard = SCOPE_GUARD {
-        m_page_group.reset();
-    };
+    auto pg_guard = SCOPE_GUARD({ m_page_group.reset(); });

    // Lock the memory.
    R_TRY(page_table.LockForTransferMemory(std::addressof(*m_page_group), addr, size,
--- a/src/core/hle/kernel/kernel.cpp
+++ b/src/core/hle/kernel/kernel.cpp
@ -109,9 +109,7 @@ struct KernelCore::Impl {

    void Shutdown() {
        is_shutting_down.store(true, std::memory_order_relaxed);
-        SCOPE_EXIT {
-            is_shutting_down.store(false, std::memory_order_relaxed);
-        };
+        SCOPE_EXIT({ is_shutting_down.store(false, std::memory_order_relaxed); });

        CloseServices();

@ -1082,9 +1080,7 @@ std::jthread KernelCore::RunOnHostCoreProcess(std::string&& process_name,
        process->Initialize(Svc::CreateProcessParameter{}, GetSystemResourceLimit(), false)));

    // Ensure that we don't hold onto any extra references.
-    SCOPE_EXIT {
-        process->Close();
-    };
+    SCOPE_EXIT({ process->Close(); });

    // Register the new process.
    KProcess::Register(*this, process);
@ -1112,9 +1108,7 @@ void KernelCore::RunOnGuestCoreProcess(std::string&& process_name, std::function
        process->Initialize(Svc::CreateProcessParameter{}, GetSystemResourceLimit(), false)));

    // Ensure that we don't hold onto any extra references.
-    SCOPE_EXIT {
-        process->Close();
-    };
+    SCOPE_EXIT({ process->Close(); });

    // Register the new process.
    KProcess::Register(*this, process);
--- a/src/core/hle/kernel/svc/svc_code_memory.cpp
+++ b/src/core/hle/kernel/svc/svc_code_memory.cpp
@ -45,9 +45,7 @@ Result CreateCodeMemory(Core::System& system, Handle* out, u64 address, uint64_t

    KCodeMemory* code_mem = KCodeMemory::Create(kernel);
    R_UNLESS(code_mem != nullptr, ResultOutOfResource);
-    SCOPE_EXIT {
-        code_mem->Close();
-    };
+    SCOPE_EXIT({ code_mem->Close(); });

    // Verify that the region is in range.
    R_UNLESS(GetCurrentProcess(system.Kernel()).GetPageTable().Contains(address, size),
--- a/src/core/hle/kernel/svc/svc_device_address_space.cpp
+++ b/src/core/hle/kernel/svc/svc_device_address_space.cpp
@ -28,9 +28,7 @@ Result CreateDeviceAddressSpace(Core::System& system, Handle* out, uint64_t das_
    // Create the device address space.
    KDeviceAddressSpace* das = KDeviceAddressSpace::Create(system.Kernel());
    R_UNLESS(das != nullptr, ResultOutOfResource);
-    SCOPE_EXIT {
-        das->Close();
-    };
+    SCOPE_EXIT({ das->Close(); });

    // Initialize the device address space.
    R_TRY(das->Initialize(das_address, das_size));
--- a/src/core/hle/kernel/svc/svc_event.cpp
+++ b/src/core/hle/kernel/svc/svc_event.cpp
@ -72,10 +72,10 @@ Result CreateEvent(Core::System& system, Handle* out_write, Handle* out_read) {
    event_reservation.Commit();

    // Ensure that we clean up the event (and its only references are handle table) on function end.
-    SCOPE_EXIT {
+    SCOPE_EXIT({
        event->GetReadableEvent().Close();
        event->Close();
-    };
+    });

    // Register the event.
    KEvent::Register(kernel, event);
--- a/src/core/hle/kernel/svc/svc_ipc.cpp
+++ b/src/core/hle/kernel/svc/svc_ipc.cpp
@ -129,11 +129,11 @@ Result ReplyAndReceiveImpl(KernelCore& kernel, int32_t* out_index, uintptr_t mes
    }

    // Ensure handles are closed when we're done.
-    SCOPE_EXIT {
+    SCOPE_EXIT({
        for (auto i = 0; i < num_handles; ++i) {
            objs[i]->Close();
        }
-    };
+    });

    R_RETURN(ReplyAndReceiveImpl(kernel, out_index, message, buffer_size, message_paddr, objs,
                                 num_handles, reply_target, timeout_ns));
@ -208,10 +208,10 @@ Result SendAsyncRequestWithUserBuffer(Core::System& system, Handle* out_event_ha
    event_reservation.Commit();

    // At end of scope, kill the standing references to the sub events.
-    SCOPE_EXIT {
+    SCOPE_EXIT({
        event->GetReadableEvent().Close();
        event->Close();
-    };
+    });

    // Register the event.
    KEvent::Register(system.Kernel(), event);
--- a/src/core/hle/kernel/svc/svc_port.cpp
+++ b/src/core/hle/kernel/svc/svc_port.cpp
@ -68,10 +68,10 @@ Result CreatePort(Core::System& system, Handle* out_server, Handle* out_client,
    port->Initialize(max_sessions, is_light, name);

    // Ensure that we clean up the port (and its only references are handle table) on function end.
-    SCOPE_EXIT {
+    SCOPE_EXIT({
        port->GetServerPort().Close();
        port->GetClientPort().Close();
-    };
+    });

    // Register the port.
    KPort::Register(kernel, port);
@ -150,10 +150,10 @@ Result ManageNamedPort(Core::System& system, Handle* out_server_handle, uint64_t
        KPort::Register(system.Kernel(), port);

        // Ensure that our only reference to the port is in the handle table when we're done.
-        SCOPE_EXIT {
+        SCOPE_EXIT({
            port->GetClientPort().Close();
            port->GetServerPort().Close();
-        };
+        });

        // Register the handle in the table.
        R_TRY(handle_table.Add(out_server_handle, std::addressof(port->GetServerPort())));
--- a/src/core/hle/kernel/svc/svc_resource_limit.cpp
+++ b/src/core/hle/kernel/svc/svc_resource_limit.cpp
@ -18,9 +18,7 @@ Result CreateResourceLimit(Core::System& system, Handle* out_handle) {
    R_UNLESS(resource_limit != nullptr, ResultOutOfResource);

    // Ensure we don't leak a reference to the limit.
-    SCOPE_EXIT {
-        resource_limit->Close();
-    };
+    SCOPE_EXIT({ resource_limit->Close(); });

    // Initialize the resource limit.
    resource_limit->Initialize();
--- a/src/core/hle/kernel/svc/svc_session.cpp
+++ b/src/core/hle/kernel/svc/svc_session.cpp
@ -69,10 +69,10 @@ Result CreateSession(Core::System& system, Handle* out_server, Handle* out_clien

    // Ensure that we clean up the session (and its only references are handle table) on function
    // end.
-    SCOPE_EXIT {
+    SCOPE_EXIT({
        session->GetClientSession().Close();
        session->GetServerSession().Close();
-    };
+    });

    // Register the session.
    T::Register(system.Kernel(), session);
--- a/src/core/hle/kernel/svc/svc_synchronization.cpp
+++ b/src/core/hle/kernel/svc/svc_synchronization.cpp
@ -78,11 +78,11 @@ Result WaitSynchronization(Core::System& system, int32_t* out_index, u64 user_ha
    }

    // Ensure handles are closed when we're done.
-    SCOPE_EXIT {
+    SCOPE_EXIT({
        for (auto i = 0; i < num_handles; ++i) {
            objs[i]->Close();
        }
-    };
+    });

    // Convert the timeout from nanoseconds to ticks.
    s64 timeout;
--- a/src/core/hle/kernel/svc/svc_thread.cpp
+++ b/src/core/hle/kernel/svc/svc_thread.cpp
@ -51,9 +51,7 @@ Result CreateThread(Core::System& system, Handle* out_handle, u64 entry_point, u
    // Create the thread.
    KThread* thread = KThread::Create(kernel);
    R_UNLESS(thread != nullptr, ResultOutOfResource)
-    SCOPE_EXIT {
-        thread->Close();
-    };
+    SCOPE_EXIT({ thread->Close(); });

    // Initialize the thread.
    {
--- a/src/core/hle/kernel/svc/svc_transfer_memory.cpp
+++ b/src/core/hle/kernel/svc/svc_transfer_memory.cpp
@ -52,9 +52,7 @@ Result CreateTransferMemory(Core::System& system, Handle* out, u64 address, u64
    R_UNLESS(trmem != nullptr, ResultOutOfResource);

    // Ensure the only reference is in the handle table when we're done.
-    SCOPE_EXIT {
-        trmem->Close();
-    };
+    SCOPE_EXIT({ trmem->Close(); });

    // Ensure that the region is in range.
    R_UNLESS(process.GetPageTable().Contains(address, size), ResultInvalidCurrentMemory);
--- a/src/core/hle/service/acc/acc.cpp
+++ b/src/core/hle/service/acc/acc.cpp
@ -25,8 +25,8 @@
 #include "core/hle/service/acc/async_context.h"
 #include "core/hle/service/acc/errors.h"
 #include "core/hle/service/acc/profile_manager.h"
-#include "core/hle/service/cmif_serialization.h"
 #include "core/hle/service/glue/glue_manager.h"
+#include "core/hle/service/ipc_helpers.h"
 #include "core/hle/service/server_manager.h"
 #include "core/loader/loader.h"

@ -74,12 +74,12 @@ static void SanitizeJPEGImageSize(std::vector<u8>& image) {

 class IManagerForSystemService final : public ServiceFramework<IManagerForSystemService> {
 public:
-    explicit IManagerForSystemService(Core::System& system_, Common::UUID uuid)
-        : ServiceFramework{system_, "IManagerForSystemService"}, account_id{uuid} {
+    explicit IManagerForSystemService(Core::System& system_, Common::UUID)
+        : ServiceFramework{system_, "IManagerForSystemService"} {
        // clang-format off
        static const FunctionInfo functions[] = {
-            {0, D<&IManagerForSystemService::CheckAvailability>, "CheckAvailability"},
-            {1, D<&IManagerForSystemService::GetAccountId>, "GetAccountId"},
+            {0, &IManagerForSystemService::CheckAvailability, "CheckAvailability"},
+            {1, nullptr, "GetAccountId"},
            {2, nullptr, "EnsureIdTokenCacheAsync"},
            {3, nullptr, "LoadIdTokenCache"},
            {100, nullptr, "SetSystemProgramIdentification"},
@ -109,18 +109,11 @@ public:
    }

 private:
-    Result CheckAvailability() {
+    void CheckAvailability(HLERequestContext& ctx) {
        LOG_WARNING(Service_ACC, "(STUBBED) called");
-        R_SUCCEED();
+        IPC::ResponseBuilder rb{ctx, 2};
+        rb.Push(ResultSuccess);
    }
-
-    Result GetAccountId(Out<u64> out_account_id) {
-        LOG_WARNING(Service_ACC, "(STUBBED) called");
-        *out_account_id = account_id.Hash();
-        R_SUCCEED();
-    }
-
-    Common::UUID account_id;
 };

 // 3.0.0+
--- a/src/core/hle/service/acc/acc_u1.cpp
+++ b/src/core/hle/service/acc/acc_u1.cpp
@ -23,7 +23,7 @@ ACC_U1::ACC_U1(std::shared_ptr<Module> module_, std::shared_ptr<ProfileManager>
        {99, nullptr, "DebugActivateOpenContextRetention"},
        {100, nullptr, "GetUserRegistrationNotifier"},
        {101, nullptr, "GetUserStateChangeNotifier"},
-        {102, &ACC_U1::GetBaasAccountManagerForSystemService, "GetBaasAccountManagerForSystemService"},
+        {102, nullptr, "GetBaasAccountManagerForSystemService"},
        {103, nullptr, "GetBaasUserAvailabilityChangeNotifier"},
        {104, nullptr, "GetProfileUpdateNotifier"},
        {105, nullptr, "CheckNetworkServiceAvailabilityAsync"},
--- a/src/core/hle/service/am/am.cpp
+++ b/src/core/hle/service/am/am.cpp
@ -2,26 +2,19 @@
 // SPDX-License-Identifier: GPL-2.0-or-later

 #include "core/hle/service/am/am.h"
-#include "core/hle/service/am/button_poller.h"
-#include "core/hle/service/am/event_observer.h"
 #include "core/hle/service/am/service/all_system_applet_proxies_service.h"
 #include "core/hle/service/am/service/application_proxy_service.h"
-#include "core/hle/service/am/window_system.h"
 #include "core/hle/service/server_manager.h"

 namespace Service::AM {

 void LoopProcess(Core::System& system) {
-    WindowSystem window_system(system);
-    ButtonPoller button_poller(system, window_system);
-    EventObserver event_observer(system, window_system);
-
    auto server_manager = std::make_unique<ServerManager>(system);

-    server_manager->RegisterNamedService(
-        "appletAE", std::make_shared<IAllSystemAppletProxiesService>(system, window_system));
-    server_manager->RegisterNamedService(
-        "appletOE", std::make_shared<IApplicationProxyService>(system, window_system));
+    server_manager->RegisterNamedService("appletAE",
+                                         std::make_shared<IAllSystemAppletProxiesService>(system));
+    server_manager->RegisterNamedService("appletOE",
+                                         std::make_shared<IApplicationProxyService>(system));
    ServerManager::RunServer(std::move(server_manager));
 }

--- a/src/core/hle/service/am/am_results.h
+++ b/src/core/hle/service/am/am_results.h
@ -9,7 +9,6 @@ namespace Service::AM {

 constexpr Result ResultNoDataInChannel{ErrorModule::AM, 2};
 constexpr Result ResultNoMessages{ErrorModule::AM, 3};
-constexpr Result ResultLibraryAppletTerminated{ErrorModule::AM, 22};
 constexpr Result ResultInvalidOffset{ErrorModule::AM, 503};
 constexpr Result ResultInvalidStorageType{ErrorModule::AM, 511};
 constexpr Result ResultFatalSectionCountImbalance{ErrorModule::AM, 512};
--- a/src/core/hle/service/am/am_types.h
+++ b/src/core/hle/service/am/am_types.h
@ -48,6 +48,11 @@ enum class SystemButtonType {
    CaptureButtonLongPressing,
 };

+enum class SysPlatformRegion : s32 {
+    Global = 1,
+    Terra = 2,
+};
+
 struct AppletProcessLaunchReason {
    u8 flag;
    INSERT_PADDING_BYTES(3);
@ -61,6 +66,12 @@ enum class ScreenshotPermission : u32 {
    Disable = 2,
 };

+struct FocusHandlingMode {
+    bool notify;
+    bool background;
+    bool suspend;
+};
+
 enum class IdleTimeDetectionExtension : u32 {
    Disabled = 0,
    Extended = 1,
@ -233,6 +244,7 @@ struct ApplicationPlayStatistics {
 static_assert(sizeof(ApplicationPlayStatistics) == 0x18,
              "ApplicationPlayStatistics has incorrect size.");

+using AppletResourceUserId = u64;
 using ProgramId = u64;

 struct Applet;
--- a/src/core/hle/service/am/applet.cpp
+++ b/src/core/hle/service/am/applet.cpp
@ -1,71 +1,27 @@
 // SPDX-FileCopyrightText: Copyright 2024 yuzu Emulator Project
 // SPDX-License-Identifier: GPL-2.0-or-later

+#include "common/scope_exit.h"
+
 #include "core/core.h"
+#include "core/hle/service/am/am_results.h"
 #include "core/hle/service/am/applet.h"
 #include "core/hle/service/am/applet_manager.h"

 namespace Service::AM {

-Applet::Applet(Core::System& system, std::unique_ptr<Process> process_, bool is_application)
-    : context(system, "Applet"), lifecycle_manager(system, context, is_application),
-      process(std::move(process_)), hid_registration(system, *process),
-      gpu_error_detected_event(context), friend_invitation_storage_channel_event(context),
-      notification_storage_channel_event(context), health_warning_disappeared_system_event(context),
-      acquired_sleep_lock_event(context), pop_from_general_channel_event(context),
-      library_applet_launchable_event(context), accumulated_suspended_tick_changed_event(context),
-      sleep_lock_event(context), state_changed_event(context) {
+Applet::Applet(Core::System& system, std::unique_ptr<Process> process_)
+    : context(system, "Applet"), message_queue(system), process(std::move(process_)),
+      hid_registration(system, *process), gpu_error_detected_event(context),
+      friend_invitation_storage_channel_event(context), notification_storage_channel_event(context),
+      health_warning_disappeared_system_event(context), acquired_sleep_lock_event(context),
+      pop_from_general_channel_event(context), library_applet_launchable_event(context),
+      accumulated_suspended_tick_changed_event(context), sleep_lock_event(context) {

-    aruid.pid = process->GetProcessId();
+    aruid = process->GetProcessId();
    program_id = process->GetProgramId();
 }

 Applet::~Applet() = default;

-void Applet::UpdateSuspensionStateLocked(bool force_message) {
-    // Remove any forced resumption.
-    lifecycle_manager.RemoveForceResumeIfPossible();
-
-    // Check if we're runnable.
-    const bool curr_activity_runnable = lifecycle_manager.IsRunnable();
-    const bool prev_activity_runnable = is_activity_runnable;
-    const bool was_changed = curr_activity_runnable != prev_activity_runnable;
-
-    if (was_changed) {
-        if (curr_activity_runnable) {
-            process->Suspend(false);
-        } else {
-            process->Suspend(true);
-            lifecycle_manager.RequestResumeNotification();
-        }
-
-        is_activity_runnable = curr_activity_runnable;
-    }
-
-    if (lifecycle_manager.GetForcedSuspend()) {
-        // TODO: why is this allowed?
-        return;
-    }
-
-    // Signal if the focus state was changed or the process state was changed.
-    if (lifecycle_manager.UpdateRequestedFocusState() || was_changed || force_message) {
-        lifecycle_manager.SignalSystemEventIfNeeded();
-    }
-}
-
-void Applet::SetInteractibleLocked(bool interactible) {
-    if (is_interactible == interactible) {
-        return;
-    }
-
-    is_interactible = interactible;
-
-    hid_registration.EnableAppletToGetInput(interactible && !lifecycle_manager.GetExitRequested());
-}
-
-void Applet::OnProcessTerminatedLocked() {
-    is_completed = true;
-    state_changed_event.Signal();
-}
-
 } // namespace Service::AM
--- a/src/core/hle/service/am/applet.h
+++ b/src/core/hle/service/am/applet.h
@ -3,28 +3,25 @@

 #pragma once

-#include <deque>
 #include <mutex>

 #include "common/math_util.h"
 #include "core/hle/service/apm/apm_controller.h"
 #include "core/hle/service/caps/caps_types.h"
-#include "core/hle/service/cmif_types.h"
 #include "core/hle/service/kernel_helpers.h"
 #include "core/hle/service/os/event.h"
-#include "core/hle/service/os/process.h"
 #include "core/hle/service/service.h"

 #include "core/hle/service/am/am_types.h"
+#include "core/hle/service/am/applet_message_queue.h"
 #include "core/hle/service/am/display_layer_manager.h"
 #include "core/hle/service/am/hid_registration.h"
-#include "core/hle/service/am/lifecycle_manager.h"
-#include "core/hle/service/am/process_holder.h"
+#include "core/hle/service/am/process.h"

 namespace Service::AM {

 struct Applet {
-    explicit Applet(Core::System& system, std::unique_ptr<Process> process_, bool is_application);
+    explicit Applet(Core::System& system, std::unique_ptr<Process> process_);
    ~Applet();

    // Lock
@ -33,13 +30,11 @@ struct Applet {
    // Event creation helper
    KernelHelpers::ServiceContext context;

-    // Lifecycle manager
-    LifecycleManager lifecycle_manager;
+    // Applet message queue
+    AppletMessageQueue message_queue;

    // Process
    std::unique_ptr<Process> process;
-    std::optional<ProcessHolder> process_holder;
-    bool is_process_running{};

    // Creation state
    AppletId applet_id{};
@ -80,9 +75,11 @@ struct Applet {
    bool game_play_recording_supported{};
    GamePlayRecordingState game_play_recording_state{GamePlayRecordingState::Disabled};
    bool jit_service_launched{};
+    bool is_running{};
    bool application_crash_report_enabled{};

    // Common state
+    FocusState focus_state{};
    bool sleep_lock_enabled{};
    bool vr_mode_enabled{};
    bool lcd_backlight_off_enabled{};
@ -96,12 +93,15 @@ struct Applet {
    // Caller applet
    std::weak_ptr<Applet> caller_applet{};
    std::shared_ptr<AppletDataBroker> caller_applet_broker{};
-    std::list<std::shared_ptr<Applet>> child_applets{};
-    bool is_completed{};

    // Self state
    bool exit_locked{};
    s32 fatal_section_count{};
+    bool operation_mode_changed_notification_enabled{true};
+    bool performance_mode_changed_notification_enabled{true};
+    FocusHandlingMode focus_handling_mode{};
+    bool restart_message_enabled{};
+    bool out_of_focus_suspension_enabled{true};
    Capture::AlbumImageOrientation album_image_orientation{};
    bool handles_request_to_display{};
    ScreenshotPermission screenshot_permission{};
@ -110,9 +110,6 @@ struct Applet {
    u64 suspended_ticks{};
    bool album_image_taken_notification_enabled{};
    bool record_volume_muted{};
-    bool is_activity_runnable{};
-    bool is_interactible{true};
-    bool window_visible{true};

    // Events
    Event gpu_error_detected_event;
@ -124,15 +121,9 @@ struct Applet {
    Event library_applet_launchable_event;
    Event accumulated_suspended_tick_changed_event;
    Event sleep_lock_event;
-    Event state_changed_event;

    // Frontend state
    std::shared_ptr<Frontend::FrontendApplet> frontend{};
-
-    // Process state management
-    void UpdateSuspensionStateLocked(bool force_message);
-    void SetInteractibleLocked(bool interactible);
-    void OnProcessTerminatedLocked();
 };

 } // namespace Service::AM
--- a/src/core/hle/service/am/applet_data_broker.cpp
+++ b/src/core/hle/service/am/applet_data_broker.cpp
@ -24,11 +24,11 @@ void AppletStorageChannel::Push(std::shared_ptr<IStorage> storage) {
 Result AppletStorageChannel::Pop(std::shared_ptr<IStorage>* out_storage) {
    std::scoped_lock lk{m_lock};

-    SCOPE_EXIT {
+    SCOPE_EXIT({
        if (m_data.empty()) {
            m_event.Clear();
        }
-    };
+    });

    R_UNLESS(!m_data.empty(), AM::ResultNoDataInChannel);

@ -44,8 +44,24 @@ Kernel::KReadableEvent* AppletStorageChannel::GetEvent() {

 AppletDataBroker::AppletDataBroker(Core::System& system_)
    : system(system_), context(system_, "AppletDataBroker"), in_data(context),
-      interactive_in_data(context), out_data(context), interactive_out_data(context) {}
+      interactive_in_data(context), out_data(context), interactive_out_data(context),
+      state_changed_event(context), is_completed(false) {}

 AppletDataBroker::~AppletDataBroker() = default;

+void AppletDataBroker::SignalCompletion() {
+    {
+        std::scoped_lock lk{lock};
+
+        if (is_completed) {
+            return;
+        }
+
+        is_completed = true;
+        state_changed_event.Signal();
+    }
+
+    system.GetAppletManager().FocusStateChanged();
+}
+
 } // namespace Service::AM
--- a/src/core/hle/service/am/applet_data_broker.h
+++ b/src/core/hle/service/am/applet_data_broker.h
@ -53,6 +53,16 @@ public:
        return interactive_out_data;
    }

+    Event& GetStateChangedEvent() {
+        return state_changed_event;
+    }
+
+    bool IsCompleted() const {
+        return is_completed;
+    }
+
+    void SignalCompletion();
+
 private:
    Core::System& system;
    KernelHelpers::ServiceContext context;
@ -61,6 +71,10 @@ private:
    AppletStorageChannel interactive_in_data;
    AppletStorageChannel out_data;
    AppletStorageChannel interactive_out_data;
+    Event state_changed_event;
+
+    std::mutex lock;
+    bool is_completed;
 };

 } // namespace Service::AM
--- a/src/core/hle/service/am/applet_manager.cpp
+++ b/src/core/hle/service/am/applet_manager.cpp
@ -13,7 +13,6 @@
 #include "core/hle/service/am/frontend/applet_mii_edit_types.h"
 #include "core/hle/service/am/frontend/applet_software_keyboard_types.h"
 #include "core/hle/service/am/service/storage.h"
-#include "core/hle/service/am/window_system.h"
 #include "hid_core/hid_types.h"

 namespace Service::AM {
@ -226,46 +225,49 @@ void PushInShowSoftwareKeyboard(Core::System& system, AppletStorageChannel& chan
 } // namespace

 AppletManager::AppletManager(Core::System& system) : m_system(system) {}
-AppletManager::~AppletManager() = default;
+AppletManager::~AppletManager() {
+    this->Reset();
+}

-void AppletManager::CreateAndInsertByFrontendAppletParameters(
-    std::unique_ptr<Process> process, const FrontendAppletParameters& params) {
+void AppletManager::InsertApplet(std::shared_ptr<Applet> applet) {
+    std::scoped_lock lk{m_lock};
+
+    m_applets.emplace(applet->aruid, std::move(applet));
+}
+
+void AppletManager::TerminateAndRemoveApplet(AppletResourceUserId aruid) {
+    std::shared_ptr<Applet> applet;
+    bool should_stop = false;
    {
        std::scoped_lock lk{m_lock};
-        m_pending_process = std::move(process);
-        m_pending_parameters = params;
-    }
-    m_cv.notify_all();
-}

-void AppletManager::RequestExit() {
-    std::scoped_lock lk{m_lock};
-    if (m_window_system) {
-        m_window_system->OnExitRequested();
+        const auto it = m_applets.find(aruid);
+        if (it == m_applets.end()) {
+            return;
+        }
+
+        applet = it->second;
+        m_applets.erase(it);
+
+        should_stop = m_applets.empty();
+    }
+
+    // Terminate process.
+    applet->process->Terminate();
+
+    // If there were no applets left, stop emulation.
+    if (should_stop) {
+        m_system.Exit();
    }
 }

-void AppletManager::OperationModeChanged() {
-    std::scoped_lock lk{m_lock};
-    if (m_window_system) {
-        m_window_system->OnOperationModeChanged();
-    }
-}
-
-void AppletManager::SetWindowSystem(WindowSystem* window_system) {
-    std::unique_lock lk{m_lock};
-
-    m_window_system = window_system;
-    if (!m_window_system) {
-        return;
-    }
-
-    m_cv.wait(lk, [&] { return m_pending_process != nullptr; });
-
-    const auto& params = m_pending_parameters;
-    auto applet = std::make_shared<Applet>(m_system, std::move(m_pending_process),
-                                           params.applet_id == AppletId::Application);
+void AppletManager::CreateAndInsertByFrontendAppletParameters(
+    AppletResourceUserId aruid, const FrontendAppletParameters& params) {
+    // TODO: this should be run inside AM so that the events will have a parent process
+    // TODO: have am create the guest process
+    auto applet = std::make_shared<Applet>(m_system, std::make_unique<Process>(m_system));

+    applet->aruid = aruid;
    applet->program_id = params.program_id;
    applet->applet_id = params.applet_id;
    applet->type = params.applet_type;
@ -320,19 +322,59 @@ void AppletManager::SetWindowSystem(WindowSystem* window_system) {
    }

    // Applet was started by frontend, so it is foreground.
-    applet->lifecycle_manager.SetFocusState(FocusState::InFocus);
+    applet->message_queue.PushMessage(AppletMessage::ChangeIntoForeground);
+    applet->message_queue.PushMessage(AppletMessage::FocusStateChanged);
+    applet->focus_state = FocusState::InFocus;

-    if (applet->applet_id == AppletId::QLaunch) {
-        applet->lifecycle_manager.SetFocusHandlingMode(false);
-        applet->lifecycle_manager.SetOutOfFocusSuspendingEnabled(false);
-        m_window_system->TrackApplet(applet, false);
-        m_window_system->RequestHomeMenuToGetForeground();
-    } else {
-        m_window_system->TrackApplet(applet, true);
-        m_window_system->RequestApplicationToGetForeground();
+    this->InsertApplet(std::move(applet));
+}
+
+std::shared_ptr<Applet> AppletManager::GetByAppletResourceUserId(AppletResourceUserId aruid) const {
+    std::scoped_lock lk{m_lock};
+
+    if (const auto it = m_applets.find(aruid); it != m_applets.end()) {
+        return it->second;
    }

-    applet->process->Run();
+    return {};
+}
+
+void AppletManager::Reset() {
+    std::scoped_lock lk{m_lock};
+
+    m_applets.clear();
+}
+
+void AppletManager::RequestExit() {
+    std::scoped_lock lk{m_lock};
+
+    for (const auto& [aruid, applet] : m_applets) {
+        applet->message_queue.RequestExit();
+    }
+}
+
+void AppletManager::RequestResume() {
+    std::scoped_lock lk{m_lock};
+
+    for (const auto& [aruid, applet] : m_applets) {
+        applet->message_queue.RequestResume();
+    }
+}
+
+void AppletManager::OperationModeChanged() {
+    std::scoped_lock lk{m_lock};
+
+    for (const auto& [aruid, applet] : m_applets) {
+        applet->message_queue.OperationModeChanged();
+    }
+}
+
+void AppletManager::FocusStateChanged() {
+    std::scoped_lock lk{m_lock};
+
+    for (const auto& [aruid, applet] : m_applets) {
+        applet->message_queue.FocusStateChanged();
+    }
 }

 } // namespace Service::AM
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
yuzubot	53eb86513d	Android 256	2024-02-19 00:56:59 +00:00
yuzubot	e85a2f9f75	Merge yuzu-emu#13048	2024-02-19 00:56:59 +00:00
yuzubot	89dd56ae42	Merge yuzu-emu#13035	2024-02-19 00:56:59 +00:00
yuzubot	cdf60ba092	Merge yuzu-emu#13031	2024-02-19 00:56:59 +00:00
yuzubot	9cc88db6d0	Merge yuzu-emu#13026	2024-02-19 00:56:59 +00:00
yuzubot	764f3a0c8c	Merge yuzu-emu#13006	2024-02-19 00:56:59 +00:00
yuzubot	378fcc2cd4	Merge yuzu-emu#13000	2024-02-19 00:56:59 +00:00
yuzubot	5beb4449e0	Merge yuzu-emu#12749	2024-02-19 00:56:59 +00:00
yuzubot	12f8119826	Merge yuzu-emu#12461	2024-02-19 00:56:58 +00:00
yuzubot	0d129b8c31	Merge yuzu-emu#10529	2024-02-19 00:56:58 +00:00