Android 237

Merge yuzu-emu#12964
Merge yuzu-emu#12955
2024-02-09 00:56:52 +00:00 · 2024-02-09 00:56:52 +00:00 · 2024-02-09 00:56:52 +00:00 · 2024-02-09 00:56:52 +00:00 · 2024-02-09 00:56:51 +00:00 · 2024-02-09 00:56:51 +00:00
113 changed files with 1371 additions and 11440 deletions
--- a/README.md
+++ b/README.md
@ -1,11 +1,12 @@
 | Pull Request | Commit | Title | Author | Merged? |
 |----|----|----|----|----|
-| [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 |
+| [12461](https://github.com/yuzu-emu/yuzu//pull/12461) | [`54eb8dcc9`](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 |
-| [12756](https://github.com/yuzu-emu/yuzu//pull/12756) | [`13fd37ef6`](https://github.com/yuzu-emu/yuzu//pull/12756/files) | general: applet multiprocess | [liamwhite](https://github.com/liamwhite/) | Yes |
-| [12949](https://github.com/yuzu-emu/yuzu//pull/12949) | [`5a64a77df`](https://github.com/yuzu-emu/yuzu//pull/12949/files) | service: add os types and multi wait API | [liamwhite](https://github.com/liamwhite/) | Yes |
+| [12756](https://github.com/yuzu-emu/yuzu//pull/12756) | [`cd3de0848`](https://github.com/yuzu-emu/yuzu//pull/12756/files) | general: applet multiprocess | [liamwhite](https://github.com/liamwhite/) | Yes |
+| [12920](https://github.com/yuzu-emu/yuzu//pull/12920) | [`2600ac65c`](https://github.com/yuzu-emu/yuzu//pull/12920/files) | android: Move JNI setup and helpers to common | [t895](https://github.com/t895/) | Yes |
+| [12951](https://github.com/yuzu-emu/yuzu//pull/12951) | [`fee263c59`](https://github.com/yuzu-emu/yuzu//pull/12951/files) | ipc: additional fixes | [liamwhite](https://github.com/liamwhite/) | Yes |
 | [12955](https://github.com/yuzu-emu/yuzu//pull/12955) | [`8d2ad3d8f`](https://github.com/yuzu-emu/yuzu//pull/12955/files) | dmnt: cheat: Avoid invalidating cache on 32bit | [german77](https://github.com/german77/) | Yes |
-| [12969](https://github.com/yuzu-emu/yuzu//pull/12969) | [`816d03f7d`](https://github.com/yuzu-emu/yuzu//pull/12969/files) | service: bcat: Migrate and refractor service to new IPC | [german77](https://github.com/german77/) | Yes |
+| [12964](https://github.com/yuzu-emu/yuzu//pull/12964) | [`d93459db6`](https://github.com/yuzu-emu/yuzu//pull/12964/files) | android: Remove foreground service | [t895](https://github.com/t895/) | Yes |


 End of merge log. You can find the original README.md below the break.
--- a/externals/CMakeLists.txt
+++ b/externals/CMakeLists.txt
@ -314,10 +314,3 @@ endif()
 if (NOT TARGET SimpleIni::SimpleIni)
    add_subdirectory(simpleini)
 endif()
-
-# sse2neon
-if (ARCHITECTURE_arm64 AND NOT TARGET sse2neon)
-    add_library(sse2neon INTERFACE)
-    target_include_directories(sse2neon INTERFACE sse2neon)
-endif()
-
--- a/externals/sse2neon/sse2neon.h
+++ b/externals/sse2neon/sse2neon.h
--- a/src/android/app/src/main/java/org/yuzu/yuzu_emu/features/settings/model/BooleanSetting.kt
+++ b/src/android/app/src/main/java/org/yuzu/yuzu_emu/features/settings/model/BooleanSetting.kt
@ -25,8 +25,7 @@ enum class BooleanSetting(override val key: String) : AbstractBooleanSetting {
    HAPTIC_FEEDBACK("haptic_feedback"),
    SHOW_PERFORMANCE_OVERLAY("show_performance_overlay"),
    SHOW_INPUT_OVERLAY("show_input_overlay"),
-    TOUCHSCREEN("touchscreen"),
-    SHOW_THERMAL_OVERLAY("show_thermal_overlay");
+    TOUCHSCREEN("touchscreen");

    override fun getBoolean(needsGlobal: Boolean): Boolean =
        NativeConfig.getBoolean(key, needsGlobal)
--- a/src/android/app/src/main/java/org/yuzu/yuzu_emu/features/settings/ui/SettingsFragment.kt
+++ b/src/android/app/src/main/java/org/yuzu/yuzu_emu/features/settings/ui/SettingsFragment.kt
@ -8,6 +8,7 @@ import android.os.Bundle
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
+import android.view.ViewGroup.MarginLayoutParams
 import androidx.core.view.ViewCompat
 import androidx.core.view.WindowInsetsCompat
 import androidx.core.view.updatePadding
@ -26,7 +27,6 @@ import org.yuzu.yuzu_emu.R
 import org.yuzu.yuzu_emu.databinding.FragmentSettingsBinding
 import org.yuzu.yuzu_emu.features.settings.model.Settings
 import org.yuzu.yuzu_emu.model.SettingsViewModel
-import org.yuzu.yuzu_emu.utils.ViewUtils.updateMargins

 class SettingsFragment : Fragment() {
    private lateinit var presenter: SettingsFragmentPresenter
@ -125,10 +125,18 @@ class SettingsFragment : Fragment() {
            val leftInsets = barInsets.left + cutoutInsets.left
            val rightInsets = barInsets.right + cutoutInsets.right

-            binding.listSettings.updateMargins(left = leftInsets, right = rightInsets)
-            binding.listSettings.updatePadding(bottom = barInsets.bottom)
+            val mlpSettingsList = binding.listSettings.layoutParams as MarginLayoutParams
+            mlpSettingsList.leftMargin = leftInsets
+            mlpSettingsList.rightMargin = rightInsets
+            binding.listSettings.layoutParams = mlpSettingsList
+            binding.listSettings.updatePadding(
+                bottom = barInsets.bottom
+            )

-            binding.appbarSettings.updateMargins(left = leftInsets, right = rightInsets)
+            val mlpAppBar = binding.appbarSettings.layoutParams as MarginLayoutParams
+            mlpAppBar.leftMargin = leftInsets
+            mlpAppBar.rightMargin = rightInsets
+            binding.appbarSettings.layoutParams = mlpAppBar
            windowInsets
        }
    }
--- a/src/android/app/src/main/java/org/yuzu/yuzu_emu/fragments/AboutFragment.kt
+++ b/src/android/app/src/main/java/org/yuzu/yuzu_emu/fragments/AboutFragment.kt
@ -13,6 +13,7 @@ import android.os.Bundle
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
+import android.view.ViewGroup.MarginLayoutParams
 import android.widget.Toast
 import androidx.core.view.ViewCompat
 import androidx.core.view.WindowInsetsCompat
@ -25,7 +26,6 @@ import org.yuzu.yuzu_emu.BuildConfig
 import org.yuzu.yuzu_emu.R
 import org.yuzu.yuzu_emu.databinding.FragmentAboutBinding
 import org.yuzu.yuzu_emu.model.HomeViewModel
-import org.yuzu.yuzu_emu.utils.ViewUtils.updateMargins

 class AboutFragment : Fragment() {
    private var _binding: FragmentAboutBinding? = null
@ -114,8 +114,15 @@ class AboutFragment : Fragment() {
            val leftInsets = barInsets.left + cutoutInsets.left
            val rightInsets = barInsets.right + cutoutInsets.right

-            binding.toolbarAbout.updateMargins(left = leftInsets, right = rightInsets)
-            binding.scrollAbout.updateMargins(left = leftInsets, right = rightInsets)
+            val mlpToolbar = binding.toolbarAbout.layoutParams as MarginLayoutParams
+            mlpToolbar.leftMargin = leftInsets
+            mlpToolbar.rightMargin = rightInsets
+            binding.toolbarAbout.layoutParams = mlpToolbar
+
+            val mlpScrollAbout = binding.scrollAbout.layoutParams as MarginLayoutParams
+            mlpScrollAbout.leftMargin = leftInsets
+            mlpScrollAbout.rightMargin = rightInsets
+            binding.scrollAbout.layoutParams = mlpScrollAbout

            binding.contentAbout.updatePadding(bottom = barInsets.bottom)

--- a/src/android/app/src/main/java/org/yuzu/yuzu_emu/fragments/AddonsFragment.kt
+++ b/src/android/app/src/main/java/org/yuzu/yuzu_emu/fragments/AddonsFragment.kt
@ -31,7 +31,6 @@ import org.yuzu.yuzu_emu.model.AddonViewModel
 import org.yuzu.yuzu_emu.model.HomeViewModel
 import org.yuzu.yuzu_emu.utils.AddonUtil
 import org.yuzu.yuzu_emu.utils.FileUtil.copyFilesTo
-import org.yuzu.yuzu_emu.utils.ViewUtils.updateMargins
 import java.io.File

 class AddonsFragment : Fragment() {
@ -203,19 +202,27 @@ class AddonsFragment : Fragment() {
            val leftInsets = barInsets.left + cutoutInsets.left
            val rightInsets = barInsets.right + cutoutInsets.right

-            binding.toolbarAddons.updateMargins(left = leftInsets, right = rightInsets)
-            binding.listAddons.updateMargins(left = leftInsets, right = rightInsets)
+            val mlpToolbar = binding.toolbarAddons.layoutParams as ViewGroup.MarginLayoutParams
+            mlpToolbar.leftMargin = leftInsets
+            mlpToolbar.rightMargin = rightInsets
+            binding.toolbarAddons.layoutParams = mlpToolbar
+
+            val mlpAddonsList = binding.listAddons.layoutParams as ViewGroup.MarginLayoutParams
+            mlpAddonsList.leftMargin = leftInsets
+            mlpAddonsList.rightMargin = rightInsets
+            binding.listAddons.layoutParams = mlpAddonsList
            binding.listAddons.updatePadding(
                bottom = barInsets.bottom +
                    resources.getDimensionPixelSize(R.dimen.spacing_bottom_list_fab)
            )

            val fabSpacing = resources.getDimensionPixelSize(R.dimen.spacing_fab)
-            binding.buttonInstall.updateMargins(
-                left = leftInsets + fabSpacing,
-                right = rightInsets + fabSpacing,
-                bottom = barInsets.bottom + fabSpacing
-            )
+            val mlpFab =
+                binding.buttonInstall.layoutParams as ViewGroup.MarginLayoutParams
+            mlpFab.leftMargin = leftInsets + fabSpacing
+            mlpFab.rightMargin = rightInsets + fabSpacing
+            mlpFab.bottomMargin = barInsets.bottom + fabSpacing
+            binding.buttonInstall.layoutParams = mlpFab

            windowInsets
        }
--- a/src/android/app/src/main/java/org/yuzu/yuzu_emu/fragments/AppletLauncherFragment.kt
+++ b/src/android/app/src/main/java/org/yuzu/yuzu_emu/fragments/AppletLauncherFragment.kt
@ -21,7 +21,6 @@ import org.yuzu.yuzu_emu.databinding.FragmentAppletLauncherBinding
 import org.yuzu.yuzu_emu.model.Applet
 import org.yuzu.yuzu_emu.model.AppletInfo
 import org.yuzu.yuzu_emu.model.HomeViewModel
-import org.yuzu.yuzu_emu.utils.ViewUtils.updateMargins

 class AppletLauncherFragment : Fragment() {
    private var _binding: FragmentAppletLauncherBinding? = null
@ -96,8 +95,16 @@ class AppletLauncherFragment : Fragment() {
            val leftInsets = barInsets.left + cutoutInsets.left
            val rightInsets = barInsets.right + cutoutInsets.right

-            binding.toolbarApplets.updateMargins(left = leftInsets, right = rightInsets)
-            binding.listApplets.updateMargins(left = leftInsets, right = rightInsets)
+            val mlpAppBar = binding.toolbarApplets.layoutParams as ViewGroup.MarginLayoutParams
+            mlpAppBar.leftMargin = leftInsets
+            mlpAppBar.rightMargin = rightInsets
+            binding.toolbarApplets.layoutParams = mlpAppBar
+
+            val mlpListApplets =
+                binding.listApplets.layoutParams as ViewGroup.MarginLayoutParams
+            mlpListApplets.leftMargin = leftInsets
+            mlpListApplets.rightMargin = rightInsets
+            binding.listApplets.layoutParams = mlpListApplets

            binding.listApplets.updatePadding(bottom = barInsets.bottom)

--- a/src/android/app/src/main/java/org/yuzu/yuzu_emu/fragments/DriverManagerFragment.kt
+++ b/src/android/app/src/main/java/org/yuzu/yuzu_emu/fragments/DriverManagerFragment.kt
@ -34,7 +34,6 @@ import org.yuzu.yuzu_emu.model.HomeViewModel
 import org.yuzu.yuzu_emu.utils.FileUtil
 import org.yuzu.yuzu_emu.utils.GpuDriverHelper
 import org.yuzu.yuzu_emu.utils.NativeConfig
-import org.yuzu.yuzu_emu.utils.ViewUtils.updateMargins
 import java.io.File
 import java.io.IOException

@ -142,15 +141,23 @@ class DriverManagerFragment : Fragment() {
            val leftInsets = barInsets.left + cutoutInsets.left
            val rightInsets = barInsets.right + cutoutInsets.right

-            binding.toolbarDrivers.updateMargins(left = leftInsets, right = rightInsets)
-            binding.listDrivers.updateMargins(left = leftInsets, right = rightInsets)
+            val mlpAppBar = binding.toolbarDrivers.layoutParams as ViewGroup.MarginLayoutParams
+            mlpAppBar.leftMargin = leftInsets
+            mlpAppBar.rightMargin = rightInsets
+            binding.toolbarDrivers.layoutParams = mlpAppBar
+
+            val mlplistDrivers = binding.listDrivers.layoutParams as ViewGroup.MarginLayoutParams
+            mlplistDrivers.leftMargin = leftInsets
+            mlplistDrivers.rightMargin = rightInsets
+            binding.listDrivers.layoutParams = mlplistDrivers

            val fabSpacing = resources.getDimensionPixelSize(R.dimen.spacing_fab)
-            binding.buttonInstall.updateMargins(
-                left = leftInsets + fabSpacing,
-                right = rightInsets + fabSpacing,
-                bottom = barInsets.bottom + fabSpacing
-            )
+            val mlpFab =
+                binding.buttonInstall.layoutParams as ViewGroup.MarginLayoutParams
+            mlpFab.leftMargin = leftInsets + fabSpacing
+            mlpFab.rightMargin = rightInsets + fabSpacing
+            mlpFab.bottomMargin = barInsets.bottom + fabSpacing
+            binding.buttonInstall.layoutParams = mlpFab

            binding.listDrivers.updatePadding(
                bottom = barInsets.bottom +
--- a/src/android/app/src/main/java/org/yuzu/yuzu_emu/fragments/EarlyAccessFragment.kt
+++ b/src/android/app/src/main/java/org/yuzu/yuzu_emu/fragments/EarlyAccessFragment.kt
@ -19,7 +19,6 @@ import com.google.android.material.transition.MaterialSharedAxis
 import org.yuzu.yuzu_emu.R
 import org.yuzu.yuzu_emu.databinding.FragmentEarlyAccessBinding
 import org.yuzu.yuzu_emu.model.HomeViewModel
-import org.yuzu.yuzu_emu.utils.ViewUtils.updateMargins

 class EarlyAccessFragment : Fragment() {
    private var _binding: FragmentEarlyAccessBinding? = null
@ -74,7 +73,10 @@ class EarlyAccessFragment : Fragment() {
            val leftInsets = barInsets.left + cutoutInsets.left
            val rightInsets = barInsets.right + cutoutInsets.right

-            binding.appbarEa.updateMargins(left = leftInsets, right = rightInsets)
+            val mlpAppBar = binding.appbarEa.layoutParams as ViewGroup.MarginLayoutParams
+            mlpAppBar.leftMargin = leftInsets
+            mlpAppBar.rightMargin = rightInsets
+            binding.appbarEa.layoutParams = mlpAppBar

            binding.scrollEa.updatePadding(
                left = leftInsets,
--- 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
@ -13,7 +13,6 @@ import android.net.Uri
 import android.os.Bundle
 import android.os.Handler
 import android.os.Looper
-import android.os.PowerManager
 import android.os.SystemClock
 import android.view.*
 import android.widget.TextView
@ -24,7 +23,6 @@ import androidx.core.content.res.ResourcesCompat
 import androidx.core.graphics.Insets
 import androidx.core.view.ViewCompat
 import androidx.core.view.WindowInsetsCompat
-import androidx.core.view.updatePadding
 import androidx.drawerlayout.widget.DrawerLayout
 import androidx.drawerlayout.widget.DrawerLayout.DrawerListener
 import androidx.fragment.app.Fragment
@ -40,6 +38,7 @@ import androidx.window.layout.WindowLayoutInfo
 import com.google.android.material.dialog.MaterialAlertDialogBuilder
 import com.google.android.material.slider.Slider
 import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.flow.collect
 import kotlinx.coroutines.flow.collectLatest
 import kotlinx.coroutines.launch
 import org.yuzu.yuzu_emu.HomeNavigationDirections
@ -65,7 +64,6 @@ class EmulationFragment : Fragment(), SurfaceHolder.Callback {
    private lateinit var emulationState: EmulationState
    private var emulationActivity: EmulationActivity? = null
    private var perfStatsUpdater: (() -> Unit)? = null
-    private var thermalStatsUpdater: (() -> Unit)? = null

    private var _binding: FragmentEmulationBinding? = null
    private val binding get() = _binding!!
@ -79,8 +77,6 @@ class EmulationFragment : Fragment(), SurfaceHolder.Callback {

    private var isInFoldableLayout = false

-    private lateinit var powerManager: PowerManager
-
    override fun onAttach(context: Context) {
        super.onAttach(context)
        if (context is EmulationActivity) {
@ -106,8 +102,6 @@ class EmulationFragment : Fragment(), SurfaceHolder.Callback {
        super.onCreate(savedInstanceState)
        updateOrientation()

-        powerManager = requireContext().getSystemService(Context.POWER_SERVICE) as PowerManager
-
        val intentUri: Uri? = requireActivity().intent.data
        var intentGame: Game? = null
        if (intentUri != null) {
@ -400,9 +394,8 @@ class EmulationFragment : Fragment(), SurfaceHolder.Callback {

                            emulationState.updateSurface()

-                            // Setup overlays
+                            // Setup overlay
                            updateShowFpsOverlay()
-                            updateThermalOverlay()
                        }
                    }
                }
@ -560,38 +553,6 @@ class EmulationFragment : Fragment(), SurfaceHolder.Callback {
        }
    }

-    private fun updateThermalOverlay() {
-        if (BooleanSetting.SHOW_THERMAL_OVERLAY.getBoolean()) {
-            thermalStatsUpdater = {
-                if (emulationViewModel.emulationStarted.value &&
-                    !emulationViewModel.isEmulationStopping.value
-                ) {
-                    val thermalStatus = when (powerManager.currentThermalStatus) {
-                        PowerManager.THERMAL_STATUS_LIGHT -> "😥"
-                        PowerManager.THERMAL_STATUS_MODERATE -> "🥵"
-                        PowerManager.THERMAL_STATUS_SEVERE -> "🔥"
-                        PowerManager.THERMAL_STATUS_CRITICAL,
-                        PowerManager.THERMAL_STATUS_EMERGENCY,
-                        PowerManager.THERMAL_STATUS_SHUTDOWN -> "☢️"
-
-                        else -> "🙂"
-                    }
-                    if (_binding != null) {
-                        binding.showThermalsText.text = thermalStatus
-                    }
-                    thermalStatsUpdateHandler.postDelayed(thermalStatsUpdater!!, 1000)
-                }
-            }
-            thermalStatsUpdateHandler.post(thermalStatsUpdater!!)
-            binding.showThermalsText.visibility = View.VISIBLE
-        } else {
-            if (thermalStatsUpdater != null) {
-                thermalStatsUpdateHandler.removeCallbacks(thermalStatsUpdater!!)
-            }
-            binding.showThermalsText.visibility = View.GONE
-        }
-    }
-
    @SuppressLint("SourceLockedOrientationActivity")
    private fun updateOrientation() {
        emulationActivity?.let {
@ -680,8 +641,6 @@ class EmulationFragment : Fragment(), SurfaceHolder.Callback {
        popup.menu.apply {
            findItem(R.id.menu_toggle_fps).isChecked =
                BooleanSetting.SHOW_PERFORMANCE_OVERLAY.getBoolean()
-            findItem(R.id.thermal_indicator).isChecked =
-                BooleanSetting.SHOW_THERMAL_OVERLAY.getBoolean()
            findItem(R.id.menu_rel_stick_center).isChecked =
                BooleanSetting.JOYSTICK_REL_CENTER.getBoolean()
            findItem(R.id.menu_dpad_slide).isChecked = BooleanSetting.DPAD_SLIDE.getBoolean()
@ -701,13 +660,6 @@ class EmulationFragment : Fragment(), SurfaceHolder.Callback {
                    true
                }

-                R.id.thermal_indicator -> {
-                    it.isChecked = !it.isChecked
-                    BooleanSetting.SHOW_THERMAL_OVERLAY.setBoolean(it.isChecked)
-                    updateThermalOverlay()
-                    true
-                }
-
                R.id.menu_edit_overlay -> {
                    binding.drawerLayout.close()
                    binding.surfaceInputOverlay.requestFocus()
@ -898,7 +850,7 @@ class EmulationFragment : Fragment(), SurfaceHolder.Callback {
                right = cutInsets.right
            }

-            v.updatePadding(left = left, top = cutInsets.top, right = right)
+            v.setPadding(left, cutInsets.top, right, 0)
            windowInsets
        }
    }
@ -1051,6 +1003,5 @@ class EmulationFragment : Fragment(), SurfaceHolder.Callback {

    companion object {
        private val perfStatsUpdateHandler = Handler(Looper.myLooper()!!)
-        private val thermalStatsUpdateHandler = Handler(Looper.myLooper()!!)
    }
 }
--- a/src/android/app/src/main/java/org/yuzu/yuzu_emu/fragments/GameFoldersFragment.kt
+++ b/src/android/app/src/main/java/org/yuzu/yuzu_emu/fragments/GameFoldersFragment.kt
@ -26,7 +26,6 @@ import org.yuzu.yuzu_emu.databinding.FragmentFoldersBinding
 import org.yuzu.yuzu_emu.model.GamesViewModel
 import org.yuzu.yuzu_emu.model.HomeViewModel
 import org.yuzu.yuzu_emu.ui.main.MainActivity
-import org.yuzu.yuzu_emu.utils.ViewUtils.updateMargins

 class GameFoldersFragment : Fragment() {
    private var _binding: FragmentFoldersBinding? = null
@ -101,16 +100,23 @@ class GameFoldersFragment : Fragment() {
            val leftInsets = barInsets.left + cutoutInsets.left
            val rightInsets = barInsets.right + cutoutInsets.right

-            binding.toolbarFolders.updateMargins(left = leftInsets, right = rightInsets)
+            val mlpToolbar = binding.toolbarFolders.layoutParams as ViewGroup.MarginLayoutParams
+            mlpToolbar.leftMargin = leftInsets
+            mlpToolbar.rightMargin = rightInsets
+            binding.toolbarFolders.layoutParams = mlpToolbar

            val fabSpacing = resources.getDimensionPixelSize(R.dimen.spacing_fab)
-            binding.buttonAdd.updateMargins(
-                left = leftInsets + fabSpacing,
-                right = rightInsets + fabSpacing,
-                bottom = barInsets.bottom + fabSpacing
-            )
+            val mlpFab =
+                binding.buttonAdd.layoutParams as ViewGroup.MarginLayoutParams
+            mlpFab.leftMargin = leftInsets + fabSpacing
+            mlpFab.rightMargin = rightInsets + fabSpacing
+            mlpFab.bottomMargin = barInsets.bottom + fabSpacing
+            binding.buttonAdd.layoutParams = mlpFab

-            binding.listFolders.updateMargins(left = leftInsets, right = rightInsets)
+            val mlpListFolders = binding.listFolders.layoutParams as ViewGroup.MarginLayoutParams
+            mlpListFolders.leftMargin = leftInsets
+            mlpListFolders.rightMargin = rightInsets
+            binding.listFolders.layoutParams = mlpListFolders

            binding.listFolders.updatePadding(
                bottom = barInsets.bottom +
--- a/src/android/app/src/main/java/org/yuzu/yuzu_emu/fragments/GameInfoFragment.kt
+++ b/src/android/app/src/main/java/org/yuzu/yuzu_emu/fragments/GameInfoFragment.kt
@ -27,7 +27,6 @@ import org.yuzu.yuzu_emu.databinding.FragmentGameInfoBinding
 import org.yuzu.yuzu_emu.model.GameVerificationResult
 import org.yuzu.yuzu_emu.model.HomeViewModel
 import org.yuzu.yuzu_emu.utils.GameMetadata
-import org.yuzu.yuzu_emu.utils.ViewUtils.updateMargins

 class GameInfoFragment : Fragment() {
    private var _binding: FragmentGameInfoBinding? = null
@ -123,13 +122,11 @@ class GameInfoFragment : Fragment() {
                                titleId = R.string.verify_success,
                                descriptionId = R.string.operation_completed_successfully
                            )
-
                        GameVerificationResult.Failed ->
                            MessageDialogFragment.newInstance(
                                titleId = R.string.verify_failure,
                                descriptionId = R.string.verify_failure_description
                            )
-
                        GameVerificationResult.NotImplemented ->
                            MessageDialogFragment.newInstance(
                                titleId = R.string.verify_no_result,
@ -168,8 +165,15 @@ class GameInfoFragment : Fragment() {
            val leftInsets = barInsets.left + cutoutInsets.left
            val rightInsets = barInsets.right + cutoutInsets.right

-            binding.toolbarInfo.updateMargins(left = leftInsets, right = rightInsets)
-            binding.scrollInfo.updateMargins(left = leftInsets, right = rightInsets)
+            val mlpToolbar = binding.toolbarInfo.layoutParams as ViewGroup.MarginLayoutParams
+            mlpToolbar.leftMargin = leftInsets
+            mlpToolbar.rightMargin = rightInsets
+            binding.toolbarInfo.layoutParams = mlpToolbar
+
+            val mlpScrollAbout = binding.scrollInfo.layoutParams as ViewGroup.MarginLayoutParams
+            mlpScrollAbout.leftMargin = leftInsets
+            mlpScrollAbout.rightMargin = rightInsets
+            binding.scrollInfo.layoutParams = mlpScrollAbout

            binding.contentInfo.updatePadding(bottom = barInsets.bottom)

--- a/src/android/app/src/main/java/org/yuzu/yuzu_emu/fragments/GamePropertiesFragment.kt
+++ b/src/android/app/src/main/java/org/yuzu/yuzu_emu/fragments/GamePropertiesFragment.kt
@ -46,7 +46,6 @@ import org.yuzu.yuzu_emu.utils.FileUtil
 import org.yuzu.yuzu_emu.utils.GameIconUtils
 import org.yuzu.yuzu_emu.utils.GpuDriverHelper
 import org.yuzu.yuzu_emu.utils.MemoryUtil
-import org.yuzu.yuzu_emu.utils.ViewUtils.updateMargins
 import java.io.BufferedOutputStream
 import java.io.File

@ -321,25 +320,46 @@ class GamePropertiesFragment : Fragment() {

            val smallLayout = resources.getBoolean(R.bool.small_layout)
            if (smallLayout) {
-                binding.listAll.updateMargins(left = leftInsets, right = rightInsets)
+                val mlpListAll =
+                    binding.listAll.layoutParams as ViewGroup.MarginLayoutParams
+                mlpListAll.leftMargin = leftInsets
+                mlpListAll.rightMargin = rightInsets
+                binding.listAll.layoutParams = mlpListAll
            } else {
                if (ViewCompat.getLayoutDirection(binding.root) ==
                    ViewCompat.LAYOUT_DIRECTION_LTR
                ) {
-                    binding.listAll.updateMargins(right = rightInsets)
-                    binding.iconLayout!!.updateMargins(top = barInsets.top, left = leftInsets)
+                    val mlpListAll =
+                        binding.listAll.layoutParams as ViewGroup.MarginLayoutParams
+                    mlpListAll.rightMargin = rightInsets
+                    binding.listAll.layoutParams = mlpListAll
+
+                    val mlpIconLayout =
+                        binding.iconLayout!!.layoutParams as ViewGroup.MarginLayoutParams
+                    mlpIconLayout.topMargin = barInsets.top
+                    mlpIconLayout.leftMargin = leftInsets
+                    binding.iconLayout!!.layoutParams = mlpIconLayout
                } else {
-                    binding.listAll.updateMargins(left = leftInsets)
-                    binding.iconLayout!!.updateMargins(top = barInsets.top, right = rightInsets)
+                    val mlpListAll =
+                        binding.listAll.layoutParams as ViewGroup.MarginLayoutParams
+                    mlpListAll.leftMargin = leftInsets
+                    binding.listAll.layoutParams = mlpListAll
+
+                    val mlpIconLayout =
+                        binding.iconLayout!!.layoutParams as ViewGroup.MarginLayoutParams
+                    mlpIconLayout.topMargin = barInsets.top
+                    mlpIconLayout.rightMargin = rightInsets
+                    binding.iconLayout!!.layoutParams = mlpIconLayout
                }
            }

            val fabSpacing = resources.getDimensionPixelSize(R.dimen.spacing_fab)
-            binding.buttonStart.updateMargins(
-                left = leftInsets + fabSpacing,
-                right = rightInsets + fabSpacing,
-                bottom = barInsets.bottom + fabSpacing
-            )
+            val mlpFab =
+                binding.buttonStart.layoutParams as ViewGroup.MarginLayoutParams
+            mlpFab.leftMargin = leftInsets + fabSpacing
+            mlpFab.rightMargin = rightInsets + fabSpacing
+            mlpFab.bottomMargin = barInsets.bottom + fabSpacing
+            binding.buttonStart.layoutParams = mlpFab

            binding.layoutAll.updatePadding(
                top = barInsets.top,
--- a/src/android/app/src/main/java/org/yuzu/yuzu_emu/fragments/HomeSettingsFragment.kt
+++ b/src/android/app/src/main/java/org/yuzu/yuzu_emu/fragments/HomeSettingsFragment.kt
@ -12,6 +12,7 @@ import android.provider.DocumentsContract
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
+import android.view.ViewGroup.MarginLayoutParams
 import android.widget.Toast
 import androidx.appcompat.app.AppCompatActivity
 import androidx.core.app.ActivityCompat
@ -43,7 +44,6 @@ import org.yuzu.yuzu_emu.ui.main.MainActivity
 import org.yuzu.yuzu_emu.utils.FileUtil
 import org.yuzu.yuzu_emu.utils.GpuDriverHelper
 import org.yuzu.yuzu_emu.utils.Log
-import org.yuzu.yuzu_emu.utils.ViewUtils.updateMargins

 class HomeSettingsFragment : Fragment() {
    private var _binding: FragmentHomeSettingsBinding? = null
@ -408,7 +408,10 @@ class HomeSettingsFragment : Fragment() {
                bottom = barInsets.bottom
            )

-            binding.scrollViewSettings.updateMargins(left = leftInsets, right = rightInsets)
+            val mlpScrollSettings = binding.scrollViewSettings.layoutParams as MarginLayoutParams
+            mlpScrollSettings.leftMargin = leftInsets
+            mlpScrollSettings.rightMargin = rightInsets
+            binding.scrollViewSettings.layoutParams = mlpScrollSettings

            binding.linearLayoutSettings.updatePadding(bottom = spacingNavigation)

--- a/src/android/app/src/main/java/org/yuzu/yuzu_emu/fragments/InstallableFragment.kt
+++ b/src/android/app/src/main/java/org/yuzu/yuzu_emu/fragments/InstallableFragment.kt
@ -34,7 +34,6 @@ import org.yuzu.yuzu_emu.model.TaskState
 import org.yuzu.yuzu_emu.ui.main.MainActivity
 import org.yuzu.yuzu_emu.utils.DirectoryInitialization
 import org.yuzu.yuzu_emu.utils.FileUtil
-import org.yuzu.yuzu_emu.utils.ViewUtils.updateMargins
 import java.io.BufferedOutputStream
 import java.io.File
 import java.math.BigInteger
@ -173,8 +172,16 @@ class InstallableFragment : Fragment() {
            val leftInsets = barInsets.left + cutoutInsets.left
            val rightInsets = barInsets.right + cutoutInsets.right

-            binding.toolbarInstallables.updateMargins(left = leftInsets, right = rightInsets)
-            binding.listInstallables.updateMargins(left = leftInsets, right = rightInsets)
+            val mlpAppBar = binding.toolbarInstallables.layoutParams as ViewGroup.MarginLayoutParams
+            mlpAppBar.leftMargin = leftInsets
+            mlpAppBar.rightMargin = rightInsets
+            binding.toolbarInstallables.layoutParams = mlpAppBar
+
+            val mlpScrollAbout =
+                binding.listInstallables.layoutParams as ViewGroup.MarginLayoutParams
+            mlpScrollAbout.leftMargin = leftInsets
+            mlpScrollAbout.rightMargin = rightInsets
+            binding.listInstallables.layoutParams = mlpScrollAbout

            binding.listInstallables.updatePadding(bottom = barInsets.bottom)

--- a/src/android/app/src/main/java/org/yuzu/yuzu_emu/fragments/LicensesFragment.kt
+++ b/src/android/app/src/main/java/org/yuzu/yuzu_emu/fragments/LicensesFragment.kt
@ -7,6 +7,7 @@ import android.os.Bundle
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
+import android.view.ViewGroup.MarginLayoutParams
 import androidx.appcompat.app.AppCompatActivity
 import androidx.core.view.ViewCompat
 import androidx.core.view.WindowInsetsCompat
@ -21,7 +22,6 @@ import org.yuzu.yuzu_emu.adapters.LicenseAdapter
 import org.yuzu.yuzu_emu.databinding.FragmentLicensesBinding
 import org.yuzu.yuzu_emu.model.HomeViewModel
 import org.yuzu.yuzu_emu.model.License
-import org.yuzu.yuzu_emu.utils.ViewUtils.updateMargins

 class LicensesFragment : Fragment() {
    private var _binding: FragmentLicensesBinding? = null
@ -122,8 +122,15 @@ class LicensesFragment : Fragment() {
            val leftInsets = barInsets.left + cutoutInsets.left
            val rightInsets = barInsets.right + cutoutInsets.right

-            binding.appbarLicenses.updateMargins(left = leftInsets, right = rightInsets)
-            binding.listLicenses.updateMargins(left = leftInsets, right = rightInsets)
+            val mlpAppBar = binding.appbarLicenses.layoutParams as MarginLayoutParams
+            mlpAppBar.leftMargin = leftInsets
+            mlpAppBar.rightMargin = rightInsets
+            binding.appbarLicenses.layoutParams = mlpAppBar
+
+            val mlpScrollAbout = binding.listLicenses.layoutParams as MarginLayoutParams
+            mlpScrollAbout.leftMargin = leftInsets
+            mlpScrollAbout.rightMargin = rightInsets
+            binding.listLicenses.layoutParams = mlpScrollAbout

            binding.listLicenses.updatePadding(bottom = barInsets.bottom)

--- a/src/android/app/src/main/java/org/yuzu/yuzu_emu/fragments/SettingsSearchFragment.kt
+++ b/src/android/app/src/main/java/org/yuzu/yuzu_emu/fragments/SettingsSearchFragment.kt
@ -29,7 +29,6 @@ import org.yuzu.yuzu_emu.features.settings.model.view.SettingsItem
 import org.yuzu.yuzu_emu.features.settings.ui.SettingsAdapter
 import org.yuzu.yuzu_emu.model.SettingsViewModel
 import org.yuzu.yuzu_emu.utils.NativeConfig
-import org.yuzu.yuzu_emu.utils.ViewUtils.updateMargins

 class SettingsSearchFragment : Fragment() {
    private var _binding: FragmentSettingsSearchBinding? = null
@ -175,14 +174,15 @@ class SettingsSearchFragment : Fragment() {
                bottom = barInsets.bottom
            )

-            binding.settingsList.updateMargins(
-                left = leftInsets + sideMargin,
-                right = rightInsets + sideMargin
-            )
-            binding.divider.updateMargins(
-                left = leftInsets + sideMargin,
-                right = rightInsets + sideMargin
-            )
+            val mlpSettingsList = binding.settingsList.layoutParams as ViewGroup.MarginLayoutParams
+            mlpSettingsList.leftMargin = leftInsets + sideMargin
+            mlpSettingsList.rightMargin = rightInsets + sideMargin
+            binding.settingsList.layoutParams = mlpSettingsList
+
+            val mlpDivider = binding.divider.layoutParams as ViewGroup.MarginLayoutParams
+            mlpDivider.leftMargin = leftInsets + sideMargin
+            mlpDivider.rightMargin = rightInsets + sideMargin
+            binding.divider.layoutParams = mlpDivider

            windowInsets
        }
--- a/src/android/app/src/main/java/org/yuzu/yuzu_emu/ui/GamesFragment.kt
+++ b/src/android/app/src/main/java/org/yuzu/yuzu_emu/ui/GamesFragment.kt
@ -8,6 +8,7 @@ import android.os.Bundle
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
+import android.view.ViewGroup.MarginLayoutParams
 import androidx.appcompat.app.AppCompatActivity
 import androidx.core.view.ViewCompat
 import androidx.core.view.WindowInsetsCompat
@ -26,7 +27,6 @@ import org.yuzu.yuzu_emu.databinding.FragmentGamesBinding
 import org.yuzu.yuzu_emu.layout.AutofitGridLayoutManager
 import org.yuzu.yuzu_emu.model.GamesViewModel
 import org.yuzu.yuzu_emu.model.HomeViewModel
-import org.yuzu.yuzu_emu.utils.ViewUtils.updateMargins

 class GamesFragment : Fragment() {
    private var _binding: FragmentGamesBinding? = null
@ -169,16 +169,15 @@ class GamesFragment : Fragment() {

            val leftInsets = barInsets.left + cutoutInsets.left
            val rightInsets = barInsets.right + cutoutInsets.right
-            val left: Int
-            val right: Int
+            val mlpSwipe = binding.swipeRefresh.layoutParams as MarginLayoutParams
            if (ViewCompat.getLayoutDirection(view) == ViewCompat.LAYOUT_DIRECTION_LTR) {
-                left = leftInsets + spacingNavigationRail
-                right = rightInsets
+                mlpSwipe.leftMargin = leftInsets + spacingNavigationRail
+                mlpSwipe.rightMargin = rightInsets
            } else {
-                left = leftInsets
-                right = rightInsets + spacingNavigationRail
+                mlpSwipe.leftMargin = leftInsets
+                mlpSwipe.rightMargin = rightInsets + spacingNavigationRail
            }
-            binding.swipeRefresh.updateMargins(left = left, right = right)
+            binding.swipeRefresh.layoutParams = mlpSwipe

            binding.noticeText.updatePadding(bottom = spacingNavigation)

--- a/src/android/app/src/main/java/org/yuzu/yuzu_emu/utils/ViewUtils.kt
+++ b/src/android/app/src/main/java/org/yuzu/yuzu_emu/utils/ViewUtils.kt
@ -4,7 +4,6 @@
 package org.yuzu.yuzu_emu.utils

 import android.view.View
-import android.view.ViewGroup

 object ViewUtils {
    fun showView(view: View, length: Long = 300) {
@ -33,28 +32,4 @@ object ViewUtils {
            view.visibility = View.INVISIBLE
        }.start()
    }
-
-    fun View.updateMargins(
-        left: Int = -1,
-        top: Int = -1,
-        right: Int = -1,
-        bottom: Int = -1
-    ) {
-        val layoutParams = this.layoutParams as ViewGroup.MarginLayoutParams
-        layoutParams.apply {
-            if (left != -1) {
-                leftMargin = left
-            }
-            if (top != -1) {
-                topMargin = top
-            }
-            if (right != -1) {
-                rightMargin = right
-            }
-            if (bottom != -1) {
-                bottomMargin = bottom
-            }
-        }
-        this.layoutParams = layoutParams
-    }
 }
--- a/src/android/app/src/main/jni/android_settings.h
+++ b/src/android/app/src/main/jni/android_settings.h
@ -60,8 +60,6 @@ struct Values {
                                            Settings::Category::Overlay};
    Settings::Setting<bool> show_performance_overlay{linkage, true, "show_performance_overlay",
                                                     Settings::Category::Overlay};
-    Settings::Setting<bool> show_thermal_overlay{linkage, false, "show_thermal_overlay",
-                                                 Settings::Category::Overlay};
    Settings::Setting<bool> show_input_overlay{linkage, true, "show_input_overlay",
                                               Settings::Category::Overlay};
    Settings::Setting<bool> touchscreen{linkage, true, "touchscreen", Settings::Category::Overlay};
--- a/src/android/app/src/main/res/layout/fragment_emulation.xml
+++ b/src/android/app/src/main/res/layout/fragment_emulation.xml
@ -140,7 +140,6 @@
            android:id="@+id/overlay_container"
            android:layout_width="match_parent"
            android:layout_height="match_parent"
-            android:layout_marginHorizontal="20dp"
            android:fitsSystemWindows="true">

            <com.google.android.material.textview.MaterialTextView
@ -151,19 +150,7 @@
                android:layout_gravity="left"
                android:clickable="false"
                android:focusable="false"
-                android:textColor="@android:color/white"
-                android:shadowColor="@android:color/black"
-                android:shadowRadius="3"
-                tools:ignore="RtlHardcoded" />
-
-            <com.google.android.material.textview.MaterialTextView
-                android:id="@+id/show_thermals_text"
-                style="@style/TextAppearance.Material3.BodySmall"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_gravity="right"
-                android:clickable="false"
-                android:focusable="false"
+                android:paddingHorizontal="20dp"
                android:textColor="@android:color/white"
                android:shadowColor="@android:color/black"
                android:shadowRadius="3"
--- a/src/android/app/src/main/res/menu/menu_overlay_options.xml
+++ b/src/android/app/src/main/res/menu/menu_overlay_options.xml
@ -6,11 +6,6 @@
        android:title="@string/emulation_fps_counter"
        android:checkable="true" />

-    <item
-        android:id="@+id/thermal_indicator"
-        android:title="@string/emulation_thermal_indicator"
-        android:checkable="true" />
-
    <item
        android:id="@+id/menu_edit_overlay"
        android:title="@string/emulation_touch_overlay_edit" />
--- a/src/android/app/src/main/res/values-ar/strings.xml
+++ b/src/android/app/src/main/res/values-ar/strings.xml
@ -1,6 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources xmlns:tools="http://schemas.android.com/tools" tools:ignore="MissingTranslation">

+    <string name="emulation_notification_channel_name">المحاكي نشط</string>
+    <string name="emulation_notification_channel_description">اظهار اشعار دائم عندما يكون المحاكي نشطاً</string>
+    <string name="emulation_notification_running">يوزو قيد التشغيل</string>
    <string name="notice_notification_channel_name">الإشعارات والأخطاء</string>
    <string name="notice_notification_channel_description">اظهار اشعار عند حصول اي مشكلة.</string>
    <string name="notification_permission_not_granted">لم يتم منح إذن الإشعار</string>
--- a/src/android/app/src/main/res/values-ckb/strings.xml
+++ b/src/android/app/src/main/res/values-ckb/strings.xml
@ -2,6 +2,9 @@
 <resources xmlns:tools="http://schemas.android.com/tools" tools:ignore="MissingTranslation">

    <string name="app_disclaimer">ئەم نەرمەکاڵایە یارییەکانی کۆنسۆلی نینتێندۆ سویچ کارپێدەکات. هیچ ناونیشانێکی یاری و کلیلی تێدا نییە..&lt;br /&gt;&lt;br /&gt;پێش ئەوەی دەست پێ بکەیت، تکایە شوێنی فایلی <![CDATA[<b> prod.keys </b>]]> دیاریبکە لە نێو کۆگای ئامێرەکەت.&lt;br /&gt;&lt;br /&gt;<![CDATA[<a href=\"https://yuzu-emu.org/help/quickstart\">زیاتر فێربە</a>]]></string>
+    <string name="emulation_notification_channel_name">ئیمولەیشن کارایە</string>
+    <string name="emulation_notification_channel_description">ئاگادارکردنەوەیەکی بەردەوام نیشان دەدات کاتێک ئیمولەیشن کاردەکات.</string>
+    <string name="emulation_notification_running">یوزو کاردەکات</string>
    <string name="notice_notification_channel_name">ئاگاداری و هەڵەکان</string>
    <string name="notice_notification_channel_description">ئاگادارکردنەوەکان پیشان دەدات کاتێک شتێک بە هەڵەدا دەچێت.</string>
    <string name="notification_permission_not_granted">مۆڵەتی ئاگادارکردنەوە نەدراوە!</string>
--- a/src/android/app/src/main/res/values-cs/strings.xml
+++ b/src/android/app/src/main/res/values-cs/strings.xml
@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources xmlns:tools="http://schemas.android.com/tools" tools:ignore="MissingTranslation">

+    <string name="emulation_notification_channel_name">Emulace je aktivní</string>
    <string name="notice_notification_channel_name">Upozornění a chyby</string>
    <string name="notice_notification_channel_description">Ukáže oznámení v případě chyby.</string>
    <string name="notification_permission_not_granted">Oznámení nejsou oprávněna!</string>
--- a/src/android/app/src/main/res/values-de/strings.xml
+++ b/src/android/app/src/main/res/values-de/strings.xml
@ -2,6 +2,9 @@
 <resources xmlns:tools="http://schemas.android.com/tools" tools:ignore="MissingTranslation">

    <string name="app_disclaimer">Diese Software kann Spiele für die Nintendo Switch abspielen. Keine Spiele oder Spielekeys sind enthalten.&lt;br /&gt;&lt;br /&gt;Bevor du beginnst, bitte halte deine <![CDATA[<b> prod.keys </b>]]> auf deinem Gerät bereit. .&lt;br /&gt;&lt;br /&gt;<![CDATA[<a href=\"https://yuzu-emu.org/help/quickstart\">Mehr Infos</a>]]></string>
+    <string name="emulation_notification_channel_name">Emulation ist aktiv</string>
+    <string name="emulation_notification_channel_description">Zeigt eine dauerhafte Benachrichtigung an, wenn die Emulation läuft.</string>
+    <string name="emulation_notification_running">yuzu läuft</string>
    <string name="notice_notification_channel_name">Hinweise und Fehler</string>
    <string name="notice_notification_channel_description">Zeigt Benachrichtigungen an, wenn etwas schief läuft.</string>
    <string name="notification_permission_not_granted">Berechtigung für Benachrichtigungen nicht erlaubt!</string>
--- a/src/android/app/src/main/res/values-es/strings.xml
+++ b/src/android/app/src/main/res/values-es/strings.xml
@ -2,6 +2,9 @@
 <resources xmlns:tools="http://schemas.android.com/tools" tools:ignore="MissingTranslation">

    <string name="app_disclaimer">Este software ejecuta juegos para la videoconsola Nintendo Switch. Los videojuegos o claves no vienen incluidos.&lt;br /&gt;&lt;br /&gt;Antes de empezar, por favor, localice el archivo <![CDATA[<b> prod.keys </b>]]>en el almacenamiento de su dispositivo..&lt;br /&gt;&lt;br /&gt;<![CDATA[<a href=\"https://yuzu-emu.org/help/quickstart\">Saber más</a>]]></string>
+    <string name="emulation_notification_channel_name">Emulación activa</string>
+    <string name="emulation_notification_channel_description">Muestra una notificación persistente cuando la emulación está activa.</string>
+    <string name="emulation_notification_running">yuzu está ejecutándose</string>
    <string name="notice_notification_channel_name">Avisos y errores</string>
    <string name="notice_notification_channel_description">Mostrar notificaciones cuándo algo vaya mal.</string>
    <string name="notification_permission_not_granted">¡Permisos de notificación no concedidos!</string>
--- a/src/android/app/src/main/res/values-fr/strings.xml
+++ b/src/android/app/src/main/res/values-fr/strings.xml
@ -2,6 +2,9 @@
 <resources xmlns:tools="http://schemas.android.com/tools" tools:ignore="MissingTranslation">

    <string name="app_disclaimer">Ce logiciel exécutera des jeux pour la console de jeu Nintendo Switch. Aucun jeux ou clés n\'est inclus.&lt;br /&gt;&lt;br /&gt;Avant de commencer, veuillez localiser votre fichier <![CDATA[<b> prod.keys </b>]]> sur le stockage de votre appareil.&lt;br /&gt;&lt;br /&gt;<![CDATA[<a href=\"https://yuzu-emu.org/help/quickstart\">En savoir plus</a>]]></string>
+    <string name="emulation_notification_channel_name">L\'émulation est active</string>
+    <string name="emulation_notification_channel_description">Affiche une notification persistante lorsque l\'émulation est en cours d\'exécution.</string>
+    <string name="emulation_notification_running">yuzu est en cours d\'exécution</string>
    <string name="notice_notification_channel_name">Avis et erreurs</string>
    <string name="notice_notification_channel_description">Affiche des notifications en cas de problème.</string>
    <string name="notification_permission_not_granted">Permission de notification non accordée !</string>
--- a/src/android/app/src/main/res/values-he/strings.xml
+++ b/src/android/app/src/main/res/values-he/strings.xml
@ -2,6 +2,9 @@
 <resources xmlns:tools="http://schemas.android.com/tools" tools:ignore="MissingTranslation">

    <string name="app_disclaimer">התוכנה תריץ משחקים לקונסולת ה Nintendo Switch. אף משחק או קבצים בעלי זכויות יוצרים נכללים.&lt;br /&gt;&lt;br /&gt; לפני שאת/ה מתחיל בבקשה מצא את קובץ <![CDATA[<b>prod.keys</b>]]> על המכשיר.&lt;br /&gt;&lt;br /&gt;<![CDATA[<a href=\"https://yuzu-emu.org/help/quickstart\">קרא עוד</a>]]></string>
+    <string name="emulation_notification_channel_name">אמולציה פעילה</string>
+    <string name="emulation_notification_channel_description">מציג התראה מתמשכת כאשר האמולציה פועלת.</string>
+    <string name="emulation_notification_running">yuzu רץ</string>
    <string name="notice_notification_channel_name">התראות ותקלות</string>
    <string name="notice_notification_channel_description">מציג התראות כאשר משהו הולך לא כשורה.</string>
    <string name="notification_permission_not_granted">הרשאות התראות לא ניתנה!</string>
--- a/src/android/app/src/main/res/values-hu/strings.xml
+++ b/src/android/app/src/main/res/values-hu/strings.xml
@ -2,6 +2,9 @@
 <resources xmlns:tools="http://schemas.android.com/tools" tools:ignore="MissingTranslation">

    <string name="app_disclaimer">Ez a szoftver Nintendo Switch játékkonzolhoz készült játékokat futtat. Nem tartalmaz játékokat vagy kulcsokat. .&lt;br /&gt;&lt;br /&gt;Mielőtt hozzákezdenél, kérjük, válaszd ki a <![CDATA[<b>prod.keys</b>]]> fájl helyét a készülék tárhelyén&lt;br /&gt;&lt;br /&gt;<![CDATA[<a href=\"https://yuzu-emu.org/help/quickstart\">Tudj meg többet</a>]]></string>
+    <string name="emulation_notification_channel_name">Emuláció aktív</string>
+    <string name="emulation_notification_channel_description">Állandó értesítést jelenít meg, amíg az emuláció fut.</string>
+    <string name="emulation_notification_running">A yuzu fut</string>
    <string name="notice_notification_channel_name">Megjegyzések és hibák</string>
    <string name="notice_notification_channel_description">Értesítések megjelenítése, ha valami rosszul sül el.</string>
    <string name="notification_permission_not_granted">Nincs engedély az értesítés megjelenítéséhez!</string>
--- a/src/android/app/src/main/res/values-it/strings.xml
+++ b/src/android/app/src/main/res/values-it/strings.xml
@ -2,6 +2,9 @@
 <resources xmlns:tools="http://schemas.android.com/tools" tools:ignore="MissingTranslation">

    <string name="app_disclaimer">Questo software permette di giocare ai giochi della console Nintendo Switch. Nessun gioco o chiave è inclusa.&lt;br /&gt;&lt;br /&gt;Prima di iniziare, perfavore individua il file <![CDATA[<b>prod.keys </b>]]> nella memoria del tuo dispositivo.&lt;br /&gt;&lt;br /&gt;<![CDATA[<a href=\"https://yuzu-emu.org/help/quickstart\">Scopri di più</a>]]></string>
+    <string name="emulation_notification_channel_name">L\'emulatore è attivo</string>
+    <string name="emulation_notification_channel_description">Mostra una notifica persistente quando l\'emulatore è in esecuzione.</string>
+    <string name="emulation_notification_running">yuzu è in esecuzione</string>
    <string name="notice_notification_channel_name">Avvisi ed errori</string>
    <string name="notice_notification_channel_description">Mostra le notifiche quando qualcosa va storto.</string>
    <string name="notification_permission_not_granted">Autorizzazione di notifica non concessa!</string>
--- a/src/android/app/src/main/res/values-ja/strings.xml
+++ b/src/android/app/src/main/res/values-ja/strings.xml
@ -2,6 +2,9 @@
 <resources xmlns:tools="http://schemas.android.com/tools" tools:ignore="MissingTranslation">

    <string name="app_disclaimer">このソフトウェアでは、Nintendo Switchのゲームを実行できます。 ゲームソフトやキーは含まれません。&lt;br /&gt;&lt;br /&gt;事前に、 <![CDATA[<b> prod.keys </b>]]> ファイルをストレージに配置しておいてください。&lt;br /&gt;&lt;br /&gt;<![CDATA[<a href=\"https://yuzu-emu.org/help/quickstart\">詳細</a>]]></string>
+    <string name="emulation_notification_channel_name">エミュレーションが有効です</string>
+    <string name="emulation_notification_channel_description">エミュレーションの実行中に常設通知を表示します。</string>
+    <string name="emulation_notification_running">yuzu は実行中です</string>
    <string name="notice_notification_channel_name">通知とエラー</string>
    <string name="notice_notification_channel_description">問題の発生時に通知を表示します。</string>
    <string name="notification_permission_not_granted">通知が許可されていません!</string>
--- a/src/android/app/src/main/res/values-ko/strings.xml
+++ b/src/android/app/src/main/res/values-ko/strings.xml
@ -2,6 +2,9 @@
 <resources xmlns:tools="http://schemas.android.com/tools" tools:ignore="MissingTranslation">

    <string name="app_disclaimer">이 소프트웨어는 Nintendo Switch 게임을 실행합니다. 게임 타이틀이나 키는 포함되어 있지 않습니다.&lt;br /&gt;&lt;br /&gt;시작하기 전에 장치 저장소에서 <![CDATA[<b> prod.keys </b>]]> 파일을 찾아주세요.&lt;br /&gt;&lt;br /&gt;<![CDATA[<a href=\"https://yuzu-emu.org/help/quickstart\">자세히 알아보기</a>]]></string>
+    <string name="emulation_notification_channel_name">에뮬레이션이 활성화됨</string>
+    <string name="emulation_notification_channel_description">에뮬레이션이 실행 중일 때 지속적으로 알림을 표시합니다.</string>
+    <string name="emulation_notification_running">yuzu가 실행 중입니다.</string>
    <string name="notice_notification_channel_name">알림 및 오류</string>
    <string name="notice_notification_channel_description">문제가 발생하면 알림을 표시합니다.</string>
    <string name="notification_permission_not_granted">알림 권한이 부여되지 않았습니다!</string>
--- a/src/android/app/src/main/res/values-nb/strings.xml
+++ b/src/android/app/src/main/res/values-nb/strings.xml
@ -2,6 +2,9 @@
 <resources xmlns:tools="http://schemas.android.com/tools" tools:ignore="MissingTranslation">

    <string name="app_disclaimer">Denne programvaren vil kjøre spill for Nintendo Switch-spillkonsollen. Ingen spilltitler eller nøkler er inkludert.&lt;br /&gt;&lt;br /&gt;Før du begynner, må du finne <![CDATA[<b> prod.keys </b>]]> filen din på enhetslagringen.&lt;br /&gt;&lt;br /&gt;<![CDATA[<a href=\"https://yuzu-emu.org/help/quickstart\">Lær mer</a>]]></string>
+    <string name="emulation_notification_channel_name">Emulering er aktiv</string>
+    <string name="emulation_notification_channel_description">Viser et vedvarende varsel når emuleringen kjører.</string>
+    <string name="emulation_notification_running">Yuzu kjører</string>
    <string name="notice_notification_channel_name">Merknader og feil</string>
    <string name="notice_notification_channel_description">Viser varsler når noe går galt.</string>
    <string name="notification_permission_not_granted">Varslingstillatelse ikke gitt!</string>
--- a/src/android/app/src/main/res/values-pl/strings.xml
+++ b/src/android/app/src/main/res/values-pl/strings.xml
@ -2,6 +2,9 @@
 <resources xmlns:tools="http://schemas.android.com/tools" tools:ignore="MissingTranslation">

    <string name="app_disclaimer">To oprogramowanie umożliwia uruchomienie gier z konsoli Nintendo Switch. Nie zawiera gier ani wymaganych kluczy.&lt;br /&gt;&lt;br /&gt;Zanim zaczniesz, wybierz plik kluczy <![CDATA[<b> prod.keys </b>]]> z katalogu w pamięci masowej.&lt;br /&gt;&lt;br /&gt;<![CDATA[<a href=\"https://yuzu-emu.org/help/quickstart\">Dowiedz się więcej</a>]]></string>
+    <string name="emulation_notification_channel_name">Emulacja jest uruchomiona</string>
+    <string name="emulation_notification_channel_description">Pokaż trwałe powiadomienie gdy emulacja jest uruchomiona.</string>
+    <string name="emulation_notification_running">yuzu jest uruchomiony</string>
    <string name="notice_notification_channel_name">Powiadomienia błędy</string>
    <string name="notice_notification_channel_description">Pokaż powiadomienie gdy coś pójdzie źle</string>
    <string name="notification_permission_not_granted">Nie zezwolono na powiadomienia!</string>
--- a/src/android/app/src/main/res/values-pt-rBR/strings.xml
+++ b/src/android/app/src/main/res/values-pt-rBR/strings.xml
@ -2,6 +2,9 @@
 <resources xmlns:tools="http://schemas.android.com/tools" tools:ignore="MissingTranslation">

    <string name="app_disclaimer">Este software executa jogos do console Nintendo Switch. Não estão inclusos nem jogos ou chaves.&lt;br /&gt;&lt;br /&gt;Antes de começar, por favor localize o arquivo <![CDATA[<b> prod.keys </b>]]> no armazenamento de seu dispositivo.&lt;br /&gt;&lt;br /&gt;<![CDATA[<a href=\"https://yuzu-emu.org/help/quickstart\">Saiba mais</a>]]></string>
+    <string name="emulation_notification_channel_name">A emulação está Ativa</string>
+    <string name="emulation_notification_channel_description">Mostra uma notificação permanente enquanto a emulação estiver em andamento.</string>
+    <string name="emulation_notification_running">O Yuzu está em execução </string>
    <string name="notice_notification_channel_name">Notificações e erros</string>
    <string name="notice_notification_channel_description">Mostra notificações quando algo dá errado.</string>
    <string name="notification_permission_not_granted">Acesso às notificações não concedido!</string>
--- a/src/android/app/src/main/res/values-pt-rPT/strings.xml
+++ b/src/android/app/src/main/res/values-pt-rPT/strings.xml
@ -2,6 +2,9 @@
 <resources xmlns:tools="http://schemas.android.com/tools" tools:ignore="MissingTranslation">

    <string name="app_disclaimer">Este software corre jogos para a consola Nintendo Switch. Não estão incluídas nem jogos ou chaves. &lt;br /&gt;&lt;br /&gt;Antes de começares, por favor localiza o ficheiro <![CDATA[1 prod.keys 1]]> no armazenamento do teu dispositivo.&lt;br /&gt;&lt;br /&gt;<![CDATA[2Learn more2]]></string>
+    <string name="emulation_notification_channel_name">Emulação está Ativa</string>
+    <string name="emulation_notification_channel_description">Mostra uma notificação permanente enquanto a emulação está a correr.</string>
+    <string name="emulation_notification_running">Yuzu está em execução </string>
    <string name="notice_notification_channel_name">Notificações e erros</string>
    <string name="notice_notification_channel_description">Mostra notificações quendo algo corre mal.</string>
    <string name="notification_permission_not_granted">Permissões de notificação não permitidas </string>
--- a/src/android/app/src/main/res/values-ru/strings.xml
+++ b/src/android/app/src/main/res/values-ru/strings.xml
@ -2,6 +2,9 @@
 <resources xmlns:tools="http://schemas.android.com/tools" tools:ignore="MissingTranslation">

    <string name="app_disclaimer">Это программное обеспечение позволяет запускать игры для игровой консоли Nintendo Switch. Мы не предоставляем сами игры или ключи.&lt;br /&gt;&lt;br /&gt;Перед началом работы найдите файл <![CDATA[<b> prod.keys </b>]]> в хранилище устройства..&lt;br /&gt;&lt;br /&gt;<![CDATA[<a href=\"https://yuzu-emu.org/help/quickstart\">Узнать больше</a>]]></string>
+    <string name="emulation_notification_channel_name">Эмуляция активна</string>
+    <string name="emulation_notification_channel_description">Показывает постоянное уведомление, когда запущена эмуляция.</string>
+    <string name="emulation_notification_running">yuzu запущен</string>
    <string name="notice_notification_channel_name">Уведомления и ошибки</string>
    <string name="notice_notification_channel_description">Показывать уведомления, когда что-то пошло не так</string>
    <string name="notification_permission_not_granted">Вы не предоставили разрешение на уведомления!</string>
--- a/src/android/app/src/main/res/values-uk/strings.xml
+++ b/src/android/app/src/main/res/values-uk/strings.xml
@ -2,6 +2,9 @@
 <resources xmlns:tools="http://schemas.android.com/tools" tools:ignore="MissingTranslation">

    <string name="app_disclaimer">Це програмне забезпечення дозволяє запускати ігри для ігрової консолі Nintendo Switch. Ми не надаємо самі ігри або ключі.&lt;br /&gt;&lt;br /&gt;Перед початком роботи знайдіть ваш файл <![CDATA[<b> prod.keys </b>]]> у сховищі пристрою.&lt;br /&gt;&lt;br /&gt;<![CDATA[<a href=\"https://yuzu-emu.org/help/quickstart\">Дізнатися більше</a>]]></string>
+    <string name="emulation_notification_channel_name">Емуляція активна</string>
+    <string name="emulation_notification_channel_description">Показує постійне сповіщення, коли запущено емуляцію.</string>
+    <string name="emulation_notification_running">yuzu запущено</string>
    <string name="notice_notification_channel_name">Сповіщення та помилки</string>
    <string name="notice_notification_channel_description">Показувати сповіщення, коли щось пішло не так</string>
    <string name="notification_permission_not_granted">Ви не надали дозвіл сповіщень!</string>
--- a/src/android/app/src/main/res/values-vi/strings.xml
+++ b/src/android/app/src/main/res/values-vi/strings.xml
@ -2,6 +2,9 @@
 <resources xmlns:tools="http://schemas.android.com/tools" tools:ignore="MissingTranslation">

    <string name="app_disclaimer">Phần mềm này sẽ chạy các game cho máy chơi game Nintendo Switch. Không có title games hoặc keys được bao gồm.&lt;br /&gt;&lt;br /&gt;Trước khi bạn bắt đầu, hãy tìm tập tin <![CDATA[<b> prod.keys </b>]]> trên bộ nhớ thiết bị của bạn.&lt;br /&gt;&lt;br /&gt;<![CDATA[<a href=\"https://yuzu-emu.org/help/quickstart\">Tìm hiểu thêm</a>]]></string>
+    <string name="emulation_notification_channel_name">Giả lập đang chạy</string>
+    <string name="emulation_notification_channel_description">Hiển thị thông báo liên tục khi giả lập đang chạy.</string>
+    <string name="emulation_notification_running">yuzu đang chạy</string>
    <string name="notice_notification_channel_name">Thông báo và lỗi</string>
    <string name="notice_notification_channel_description">Hiển thị thông báo khi có sự cố xảy ra.</string>
    <string name="notification_permission_not_granted">Ứng dụng không được cấp quyền thông báo!</string>
--- a/src/android/app/src/main/res/values-zh-rCN/strings.xml
+++ b/src/android/app/src/main/res/values-zh-rCN/strings.xml
@ -2,6 +2,9 @@
 <resources xmlns:tools="http://schemas.android.com/tools" tools:ignore="MissingTranslation">

    <string name="app_disclaimer">此软件可以运行 Nintendo Switch 游戏，但不包含任何游戏和密钥文件。&lt;br /&gt;&lt;br /&gt;在开始前，请找到放置于设备存储中的 <![CDATA[<b> prod.keys </b>]]> 文件。&lt;br /&gt;&lt;br /&gt;<![CDATA[<a href=\"https://yuzu-emu.org/help/quickstart\">了解更多</a>]]></string>
+    <string name="emulation_notification_channel_name">正在进行模拟</string>
+    <string name="emulation_notification_channel_description">在模拟运行时显示持久通知。</string>
+    <string name="emulation_notification_running">yuzu 正在运行</string>
    <string name="notice_notification_channel_name">通知及错误提醒</string>
    <string name="notice_notification_channel_description">当发生错误时显示通知。</string>
    <string name="notification_permission_not_granted">未授予通知权限！</string>
--- a/src/android/app/src/main/res/values-zh-rTW/strings.xml
+++ b/src/android/app/src/main/res/values-zh-rTW/strings.xml
@ -2,6 +2,9 @@
 <resources xmlns:tools="http://schemas.android.com/tools" tools:ignore="MissingTranslation">

    <string name="app_disclaimer">此軟體可以執行 Nintendo Switch 主機遊戲，但不包含任何遊戲和金鑰。&lt;br /&gt;&lt;br /&gt;在您開始前，請找到放置於您的裝置儲存空間的 <![CDATA[<b> prod.keys </b>]]> 檔案。&lt;br /&gt;&lt;br /&gt;<![CDATA[<a href=\"https://yuzu-emu.org/help/quickstart\">深入瞭解</a>]]></string>
+    <string name="emulation_notification_channel_name">模擬進行中</string>
+    <string name="emulation_notification_channel_description">在模擬執行時顯示持續通知。</string>
+    <string name="emulation_notification_running">yuzu 正在執行</string>
    <string name="notice_notification_channel_name">通知和錯誤</string>
    <string name="notice_notification_channel_description">發生錯誤時顯示通知。</string>
    <string name="notification_permission_not_granted">未授予通知權限！</string>
--- a/src/android/app/src/main/res/values/strings.xml
+++ b/src/android/app/src/main/res/values/strings.xml
@ -376,7 +376,6 @@
    <string name="emulation_exit">Exit emulation</string>
    <string name="emulation_done">Done</string>
    <string name="emulation_fps_counter">FPS counter</string>
-    <string name="emulation_thermal_indicator">Thermal indicator</string>
    <string name="emulation_toggle_controls">Toggle controls</string>
    <string name="emulation_rel_stick_center">Relative stick center</string>
    <string name="emulation_dpad_slide">D-pad slide</string>
--- a/src/core/CMakeLists.txt
+++ b/src/core/CMakeLists.txt
@ -512,35 +512,10 @@ add_library(core STATIC
    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
-    hle/service/bcat/bcat_service.cpp
-    hle/service/bcat/bcat_service.h
-    hle/service/bcat/bcat_types.h
-    hle/service/bcat/bcat_util.h
-    hle/service/bcat/delivery_cache_directory_service.cpp
-    hle/service/bcat/delivery_cache_directory_service.h
-    hle/service/bcat/delivery_cache_file_service.cpp
-    hle/service/bcat/delivery_cache_file_service.h
-    hle/service/bcat/delivery_cache_progress_service.cpp
-    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/service_creator.cpp
-    hle/service/bcat/service_creator.h
+    hle/service/bcat/bcat_module.cpp
+    hle/service/bcat/bcat_module.h
    hle/service/bpc/bpc.cpp
    hle/service/bpc/bpc.h
    hle/service/btdrv/btdrv.cpp
@ -573,6 +548,8 @@ add_library(core STATIC
    hle/service/es/es.h
    hle/service/eupld/eupld.cpp
    hle/service/eupld/eupld.h
+    hle/service/event.cpp
+    hle/service/event.h
    hle/service/fatal/fatal.cpp
    hle/service/fatal/fatal.h
    hle/service/fatal/fatal_p.cpp
@ -699,6 +676,8 @@ add_library(core STATIC
    hle/service/mm/mm_u.h
    hle/service/mnpp/mnpp_app.cpp
    hle/service/mnpp/mnpp_app.h
+    hle/service/mutex.cpp
+    hle/service/mutex.h
    hle/service/ncm/ncm.cpp
    hle/service/ncm/ncm.h
    hle/service/nfc/common/amiibo_crypto.cpp
@ -811,15 +790,6 @@ add_library(core STATIC
    hle/service/nvnflinger/window.h
    hle/service/olsc/olsc.cpp
    hle/service/olsc/olsc.h
-    hle/service/os/event.cpp
-    hle/service/os/event.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/pcie/pcie.cpp
    hle/service/pcie/pcie.h
    hle/service/pctl/pctl.cpp
--- a/src/core/file_sys/content_archive.cpp
+++ b/src/core/file_sys/content_archive.cpp
@ -172,10 +172,6 @@ u32 NCA::GetSDKVersion() const {
    return reader->GetSdkAddonVersion();
 }

-u8 NCA::GetKeyGeneration() const {
-    return reader->GetKeyGeneration();
-}
-
 bool NCA::IsUpdate() const {
    return is_update;
 }
--- a/src/core/file_sys/content_archive.h
+++ b/src/core/file_sys/content_archive.h
@ -77,7 +77,6 @@ public:
    u64 GetTitleId() const;
    RightsId GetRightsId() const;
    u32 GetSDKVersion() const;
-    u8 GetKeyGeneration() const;
    bool IsUpdate() const;

    VirtualFile GetRomFS() const;
--- a/src/core/file_sys/errors.h
+++ b/src/core/file_sys/errors.h
@ -91,7 +91,6 @@ constexpr Result ResultWriteNotPermitted{ErrorModule::FS, 6203};
 constexpr Result ResultUnsupportedSetSizeForIndirectStorage{ErrorModule::FS, 6325};
 constexpr Result ResultUnsupportedWriteForCompressedStorage{ErrorModule::FS, 6387};
 constexpr Result ResultUnsupportedOperateRangeForCompressedStorage{ErrorModule::FS, 6388};
-constexpr Result ResultPermissionDenied{ErrorModule::FS, 6400};
 constexpr Result ResultBufferAllocationFailed{ErrorModule::FS, 6705};

 } // namespace FileSys
--- a/src/core/hle/service/am/applet.h
+++ b/src/core/hle/service/am/applet.h
@ -9,8 +9,8 @@
 #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/event.h"
 #include "core/hle/service/kernel_helpers.h"
-#include "core/hle/service/os/event.h"
 #include "core/hle/service/service.h"

 #include "core/hle/service/am/am_types.h"
--- a/src/core/hle/service/am/applet_data_broker.h
+++ b/src/core/hle/service/am/applet_data_broker.h
@ -7,8 +7,8 @@
 #include <memory>
 #include <mutex>

+#include "core/hle/service/event.h"
 #include "core/hle/service/kernel_helpers.h"
-#include "core/hle/service/os/event.h"

 union Result;

--- a/src/core/hle/service/am/library_applet_creator.cpp
+++ b/src/core/hle/service/am/library_applet_creator.cpp
@ -102,14 +102,8 @@ std::shared_ptr<ILibraryAppletAccessor> CreateGuestApplet(Core::System& system,
        return {};
    }

-    // TODO: enable other versions of applets
-    enum : u8 {
-        Firmware1600 = 15,
-        Firmware1700 = 16,
-    };
-
    auto process = std::make_unique<Process>(system);
-    if (!process->Initialize(program_id, Firmware1600, Firmware1700)) {
+    if (!process->Initialize(program_id)) {
        // Couldn't initialize the guest process
        return {};
    }
--- a/src/core/hle/service/am/process.cpp
+++ b/src/core/hle/service/am/process.cpp
@ -3,7 +3,6 @@

 #include "common/scope_exit.h"

-#include "core/file_sys/content_archive.h"
 #include "core/file_sys/nca_metadata.h"
 #include "core/file_sys/registered_cache.h"
 #include "core/hle/kernel/k_process.h"
@ -21,7 +20,7 @@ Process::~Process() {
    this->Finalize();
 }

-bool Process::Initialize(u64 program_id, u8 minimum_key_generation, u8 maximum_key_generation) {
+bool Process::Initialize(u64 program_id) {
    // First, ensure we are not holding another process.
    this->Finalize();

@ -30,33 +29,21 @@ bool Process::Initialize(u64 program_id, u8 minimum_key_generation, u8 maximum_k

    // Attempt to load program NCA.
    const FileSys::RegisteredCache* bis_system{};
-    FileSys::VirtualFile nca_raw{};
+    FileSys::VirtualFile nca{};

    // Get the program NCA from built-in storage.
    bis_system = fsc.GetSystemNANDContents();
    if (bis_system) {
-        nca_raw = bis_system->GetEntryRaw(program_id, FileSys::ContentRecordType::Program);
+        nca = bis_system->GetEntryRaw(program_id, FileSys::ContentRecordType::Program);
    }

    // Ensure we retrieved a program NCA.
-    if (!nca_raw) {
+    if (!nca) {
        return false;
    }

-    // Ensure we have a suitable version.
-    if (minimum_key_generation > 0) {
-        FileSys::NCA nca(nca_raw);
-        if (nca.GetStatus() == Loader::ResultStatus::Success &&
-            (nca.GetKeyGeneration() < minimum_key_generation ||
-             nca.GetKeyGeneration() > maximum_key_generation)) {
-            LOG_WARNING(Service_LDR, "Skipping program {:016X} with generation {}", program_id,
-                        nca.GetKeyGeneration());
-            return false;
-        }
-    }
-
    // Get the appropriate loader to parse this NCA.
-    auto app_loader = Loader::GetLoader(m_system, nca_raw, program_id, 0);
+    auto app_loader = Loader::GetLoader(m_system, nca, program_id, 0);

    // Ensure we have a loader which can parse the NCA.
    if (!app_loader) {
--- a/src/core/hle/service/am/process.h
+++ b/src/core/hle/service/am/process.h
@ -21,7 +21,7 @@ public:
    explicit Process(Core::System& system);
    ~Process();

-    bool Initialize(u64 program_id, u8 minimum_key_generation, u8 maximum_key_generation);
+    bool Initialize(u64 program_id);
    void Finalize();

    bool Run();
--- a/src/core/hle/service/bcat/backend/backend.cpp
+++ b/src/core/hle/service/bcat/backend/backend.cpp
@ -33,18 +33,18 @@ void ProgressServiceBackend::SetTotalSize(u64 size) {
 }

 void ProgressServiceBackend::StartConnecting() {
-    impl.status = DeliveryCacheProgressStatus::Connecting;
+    impl.status = DeliveryCacheProgressImpl::Status::Connecting;
    SignalUpdate();
 }

 void ProgressServiceBackend::StartProcessingDataList() {
-    impl.status = DeliveryCacheProgressStatus::ProcessingDataList;
+    impl.status = DeliveryCacheProgressImpl::Status::ProcessingDataList;
    SignalUpdate();
 }

 void ProgressServiceBackend::StartDownloadingFile(std::string_view dir_name,
                                                  std::string_view file_name, u64 file_size) {
-    impl.status = DeliveryCacheProgressStatus::Downloading;
+    impl.status = DeliveryCacheProgressImpl::Status::Downloading;
    impl.current_downloaded_bytes = 0;
    impl.current_total_bytes = file_size;
    std::memcpy(impl.current_directory.data(), dir_name.data(),
@ -65,7 +65,7 @@ void ProgressServiceBackend::FinishDownloadingFile() {
 }

 void ProgressServiceBackend::CommitDirectory(std::string_view dir_name) {
-    impl.status = DeliveryCacheProgressStatus::Committing;
+    impl.status = DeliveryCacheProgressImpl::Status::Committing;
    impl.current_file.fill(0);
    impl.current_downloaded_bytes = 0;
    impl.current_total_bytes = 0;
@ -76,7 +76,7 @@ void ProgressServiceBackend::CommitDirectory(std::string_view dir_name) {

 void ProgressServiceBackend::FinishDownload(Result result) {
    impl.total_downloaded_bytes = impl.total_bytes;
-    impl.status = DeliveryCacheProgressStatus::Done;
+    impl.status = DeliveryCacheProgressImpl::Status::Done;
    impl.result = result;
    SignalUpdate();
 }
@ -85,15 +85,15 @@ void ProgressServiceBackend::SignalUpdate() {
    update_event->Signal();
 }

-BcatBackend::BcatBackend(DirectoryGetter getter) : dir_getter(std::move(getter)) {}
+Backend::Backend(DirectoryGetter getter) : dir_getter(std::move(getter)) {}

-BcatBackend::~BcatBackend() = default;
+Backend::~Backend() = default;

-NullBcatBackend::NullBcatBackend(DirectoryGetter getter) : BcatBackend(std::move(getter)) {}
+NullBackend::NullBackend(DirectoryGetter getter) : Backend(std::move(getter)) {}

-NullBcatBackend::~NullBcatBackend() = default;
+NullBackend::~NullBackend() = default;

-bool NullBcatBackend::Synchronize(TitleIDVersion title, ProgressServiceBackend& progress) {
+bool NullBackend::Synchronize(TitleIDVersion title, ProgressServiceBackend& progress) {
    LOG_DEBUG(Service_BCAT, "called, title_id={:016X}, build_id={:016X}", title.title_id,
              title.build_id);

@ -101,8 +101,8 @@ bool NullBcatBackend::Synchronize(TitleIDVersion title, ProgressServiceBackend&
    return true;
 }

-bool NullBcatBackend::SynchronizeDirectory(TitleIDVersion title, std::string name,
-                                           ProgressServiceBackend& progress) {
+bool NullBackend::SynchronizeDirectory(TitleIDVersion title, std::string name,
+                                       ProgressServiceBackend& progress) {
    LOG_DEBUG(Service_BCAT, "called, title_id={:016X}, build_id={:016X}, name={}", title.title_id,
              title.build_id, name);

@ -110,18 +110,18 @@ bool NullBcatBackend::SynchronizeDirectory(TitleIDVersion title, std::string nam
    return true;
 }

-bool NullBcatBackend::Clear(u64 title_id) {
+bool NullBackend::Clear(u64 title_id) {
    LOG_DEBUG(Service_BCAT, "called, title_id={:016X}", title_id);

    return true;
 }

-void NullBcatBackend::SetPassphrase(u64 title_id, const Passphrase& passphrase) {
+void NullBackend::SetPassphrase(u64 title_id, const Passphrase& passphrase) {
    LOG_DEBUG(Service_BCAT, "called, title_id={:016X}, passphrase={}", title_id,
              Common::HexToString(passphrase));
 }

-std::optional<std::vector<u8>> NullBcatBackend::GetLaunchParameter(TitleIDVersion title) {
+std::optional<std::vector<u8>> NullBackend::GetLaunchParameter(TitleIDVersion title) {
    LOG_DEBUG(Service_BCAT, "called, title_id={:016X}, build_id={:016X}", title.title_id,
              title.build_id);
    return std::nullopt;
--- a/src/core/hle/service/bcat/backend/backend.h
+++ b/src/core/hle/service/bcat/backend/backend.h
@ -10,7 +10,6 @@
 #include "common/common_types.h"
 #include "core/file_sys/vfs/vfs_types.h"
 #include "core/hle/result.h"
-#include "core/hle/service/bcat/bcat_types.h"
 #include "core/hle/service/kernel_helpers.h"

 namespace Core {
@ -25,6 +24,44 @@ class KReadableEvent;

 namespace Service::BCAT {

+struct DeliveryCacheProgressImpl;
+
+using DirectoryGetter = std::function<FileSys::VirtualDir(u64)>;
+using Passphrase = std::array<u8, 0x20>;
+
+struct TitleIDVersion {
+    u64 title_id;
+    u64 build_id;
+};
+
+using DirectoryName = std::array<char, 0x20>;
+using FileName = std::array<char, 0x20>;
+
+struct DeliveryCacheProgressImpl {
+    enum class Status : s32 {
+        None = 0x0,
+        Queued = 0x1,
+        Connecting = 0x2,
+        ProcessingDataList = 0x3,
+        Downloading = 0x4,
+        Committing = 0x5,
+        Done = 0x9,
+    };
+
+    Status status;
+    Result result = ResultSuccess;
+    DirectoryName current_directory;
+    FileName current_file;
+    s64 current_downloaded_bytes; ///< Bytes downloaded on current file.
+    s64 current_total_bytes;      ///< Bytes total on current file.
+    s64 total_downloaded_bytes;   ///< Bytes downloaded on overall download.
+    s64 total_bytes;              ///< Bytes total on overall download.
+    INSERT_PADDING_BYTES(
+        0x198); ///< Appears to be unused in official code, possibly reserved for future use.
+};
+static_assert(sizeof(DeliveryCacheProgressImpl) == 0x200,
+              "DeliveryCacheProgressImpl has incorrect size.");
+
 // A class to manage the signalling to the game about BCAT download progress.
 // Some of this class is implemented in module.cpp to avoid exposing the implementation structure.
 class ProgressServiceBackend {
@ -70,10 +107,10 @@ private:
 };

 // A class representing an abstract backend for BCAT functionality.
-class BcatBackend {
+class Backend {
 public:
-    explicit BcatBackend(DirectoryGetter getter);
-    virtual ~BcatBackend();
+    explicit Backend(DirectoryGetter getter);
+    virtual ~Backend();

    // Called when the backend is needed to synchronize the data for the game with title ID and
    // version in title. A ProgressServiceBackend object is provided to alert the application of
@ -98,10 +135,10 @@ protected:
 };

 // A backend of BCAT that provides no operation.
-class NullBcatBackend : public BcatBackend {
+class NullBackend : public Backend {
 public:
-    explicit NullBcatBackend(DirectoryGetter getter);
-    ~NullBcatBackend() override;
+    explicit NullBackend(DirectoryGetter getter);
+    ~NullBackend() override;

    bool Synchronize(TitleIDVersion title, ProgressServiceBackend& progress) override;
    bool SynchronizeDirectory(TitleIDVersion title, std::string name,
@ -114,7 +151,6 @@ public:
    std::optional<std::vector<u8>> GetLaunchParameter(TitleIDVersion title) override;
 };

-std::unique_ptr<BcatBackend> CreateBackendFromSettings(Core::System& system,
-                                                       DirectoryGetter getter);
+std::unique_ptr<Backend> CreateBackendFromSettings(Core::System& system, DirectoryGetter getter);

 } // namespace Service::BCAT
--- a/src/core/hle/service/bcat/bcat.cpp
+++ b/src/core/hle/service/bcat/bcat.cpp
@ -1,38 +1,24 @@
 // SPDX-FileCopyrightText: Copyright 2018 yuzu Emulator Project
 // SPDX-License-Identifier: GPL-2.0-or-later

-#include "core/hle/service/bcat/backend/backend.h"
 #include "core/hle/service/bcat/bcat.h"
-#include "core/hle/service/bcat/news/service_creator.h"
-#include "core/hle/service/bcat/service_creator.h"
-#include "core/hle/service/server_manager.h"

 namespace Service::BCAT {

-void LoopProcess(Core::System& system) {
-    auto server_manager = std::make_unique<ServerManager>(system);
-
-    server_manager->RegisterNamedService("bcat:a",
-                                         std::make_shared<IServiceCreator>(system, "bcat:a"));
-    server_manager->RegisterNamedService("bcat:m",
-                                         std::make_shared<IServiceCreator>(system, "bcat:m"));
-    server_manager->RegisterNamedService("bcat:u",
-                                         std::make_shared<IServiceCreator>(system, "bcat:u"));
-    server_manager->RegisterNamedService("bcat:s",
-                                         std::make_shared<IServiceCreator>(system, "bcat:s"));
-
-    server_manager->RegisterNamedService(
-        "news:a", std::make_shared<News::IServiceCreator>(system, 0xffffffff, "news:a"));
-    server_manager->RegisterNamedService(
-        "news:p", std::make_shared<News::IServiceCreator>(system, 0x1, "news:p"));
-    server_manager->RegisterNamedService(
-        "news:c", std::make_shared<News::IServiceCreator>(system, 0x2, "news:c"));
-    server_manager->RegisterNamedService(
-        "news:v", std::make_shared<News::IServiceCreator>(system, 0x4, "news:v"));
-    server_manager->RegisterNamedService(
-        "news:m", std::make_shared<News::IServiceCreator>(system, 0xd, "news:m"));
-
-    ServerManager::RunServer(std::move(server_manager));
+BCAT::BCAT(Core::System& system_, std::shared_ptr<Module> module_,
+           FileSystem::FileSystemController& fsc_, const char* name_)
+    : Interface(system_, std::move(module_), fsc_, name_) {
+    // clang-format off
+    static const FunctionInfo functions[] = {
+        {0, &BCAT::CreateBcatService, "CreateBcatService"},
+        {1, &BCAT::CreateDeliveryCacheStorageService, "CreateDeliveryCacheStorageService"},
+        {2, &BCAT::CreateDeliveryCacheStorageServiceWithApplicationId, "CreateDeliveryCacheStorageServiceWithApplicationId"},
+        {3, nullptr, "CreateDeliveryCacheProgressService"},
+        {4, nullptr, "CreateDeliveryCacheProgressServiceWithApplicationId"},
+    };
+    // clang-format on
+    RegisterHandlers(functions);
 }

+BCAT::~BCAT() = default;
 } // namespace Service::BCAT
--- a/src/core/hle/service/bcat/bcat.h
+++ b/src/core/hle/service/bcat/bcat.h
@ -3,7 +3,7 @@

 #pragma once

-#include "core/hle/service/service.h"
+#include "core/hle/service/bcat/bcat_module.h"

 namespace Core {
 class System;
@ -11,6 +11,11 @@ class System;

 namespace Service::BCAT {

-void LoopProcess(Core::System& system);
+class BCAT final : public Module::Interface {
+public:
+    explicit BCAT(Core::System& system_, std::shared_ptr<Module> module_,
+                  FileSystem::FileSystemController& fsc_, const char* name_);
+    ~BCAT() override;
+};

 } // namespace Service::BCAT
--- a/src/core/hle/service/bcat/bcat_module.cpp
+++ b/src/core/hle/service/bcat/bcat_module.cpp
@ -0,0 +1,606 @@
+// SPDX-FileCopyrightText: Copyright 2018 yuzu Emulator Project
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#include <cctype>
+#include <mbedtls/md5.h>
+#include "common/hex_util.h"
+#include "common/logging/log.h"
+#include "common/settings.h"
+#include "common/string_util.h"
+#include "core/core.h"
+#include "core/file_sys/vfs/vfs.h"
+#include "core/hle/kernel/k_readable_event.h"
+#include "core/hle/service/bcat/backend/backend.h"
+#include "core/hle/service/bcat/bcat.h"
+#include "core/hle/service/bcat/bcat_module.h"
+#include "core/hle/service/filesystem/filesystem.h"
+#include "core/hle/service/ipc_helpers.h"
+#include "core/hle/service/server_manager.h"
+
+namespace Service::BCAT {
+
+constexpr Result ERROR_INVALID_ARGUMENT{ErrorModule::BCAT, 1};
+constexpr Result ERROR_FAILED_OPEN_ENTITY{ErrorModule::BCAT, 2};
+constexpr Result ERROR_ENTITY_ALREADY_OPEN{ErrorModule::BCAT, 6};
+constexpr Result ERROR_NO_OPEN_ENTITY{ErrorModule::BCAT, 7};
+
+// The command to clear the delivery cache just calls fs IFileSystem DeleteFile on all of the files
+// and if any of them have a non-zero result it just forwards that result. This is the FS error code
+// for permission denied, which is the closest approximation of this scenario.
+constexpr Result ERROR_FAILED_CLEAR_CACHE{ErrorModule::FS, 6400};
+
+using BCATDigest = std::array<u8, 0x10>;
+
+namespace {
+
+u64 GetCurrentBuildID(const Core::System::CurrentBuildProcessID& id) {
+    u64 out{};
+    std::memcpy(&out, id.data(), sizeof(u64));
+    return out;
+}
+
+// The digest is only used to determine if a file is unique compared to others of the same name.
+// Since the algorithm isn't ever checked in game, MD5 is safe.
+BCATDigest DigestFile(const FileSys::VirtualFile& file) {
+    BCATDigest out{};
+    const auto bytes = file->ReadAllBytes();
+    mbedtls_md5_ret(bytes.data(), bytes.size(), out.data());
+    return out;
+}
+
+// For a name to be valid it must be non-empty, must have a null terminating character as the final
+// char, can only contain numbers, letters, underscores and a hyphen if directory and a period if
+// file.
+bool VerifyNameValidInternal(HLERequestContext& ctx, std::array<char, 0x20> name, char match_char) {
+    const auto null_chars = std::count(name.begin(), name.end(), 0);
+    const auto bad_chars = std::count_if(name.begin(), name.end(), [match_char](char c) {
+        return !std::isalnum(static_cast<u8>(c)) && c != '_' && c != match_char && c != '\0';
+    });
+    if (null_chars == 0x20 || null_chars == 0 || bad_chars != 0 || name[0x1F] != '\0') {
+        LOG_ERROR(Service_BCAT, "Name passed was invalid!");
+        IPC::ResponseBuilder rb{ctx, 2};
+        rb.Push(ERROR_INVALID_ARGUMENT);
+        return false;
+    }
+
+    return true;
+}
+
+bool VerifyNameValidDir(HLERequestContext& ctx, DirectoryName name) {
+    return VerifyNameValidInternal(ctx, name, '-');
+}
+
+bool VerifyNameValidFile(HLERequestContext& ctx, FileName name) {
+    return VerifyNameValidInternal(ctx, name, '.');
+}
+
+} // Anonymous namespace
+
+struct DeliveryCacheDirectoryEntry {
+    FileName name;
+    u64 size;
+    BCATDigest digest;
+};
+
+class IDeliveryCacheProgressService final : public ServiceFramework<IDeliveryCacheProgressService> {
+public:
+    explicit IDeliveryCacheProgressService(Core::System& system_, Kernel::KReadableEvent& event_,
+                                           const DeliveryCacheProgressImpl& impl_)
+        : ServiceFramework{system_, "IDeliveryCacheProgressService"}, event{event_}, impl{impl_} {
+        // clang-format off
+        static const FunctionInfo functions[] = {
+            {0, &IDeliveryCacheProgressService::GetEvent, "GetEvent"},
+            {1, &IDeliveryCacheProgressService::GetImpl, "GetImpl"},
+        };
+        // clang-format on
+
+        RegisterHandlers(functions);
+    }
+
+private:
+    void GetEvent(HLERequestContext& ctx) {
+        LOG_DEBUG(Service_BCAT, "called");
+
+        IPC::ResponseBuilder rb{ctx, 2, 1};
+        rb.Push(ResultSuccess);
+        rb.PushCopyObjects(event);
+    }
+
+    void GetImpl(HLERequestContext& ctx) {
+        LOG_DEBUG(Service_BCAT, "called");
+
+        ctx.WriteBuffer(impl);
+
+        IPC::ResponseBuilder rb{ctx, 2};
+        rb.Push(ResultSuccess);
+    }
+
+    Kernel::KReadableEvent& event;
+    const DeliveryCacheProgressImpl& impl;
+};
+
+class IBcatService final : public ServiceFramework<IBcatService> {
+public:
+    explicit IBcatService(Core::System& system_, Backend& backend_)
+        : ServiceFramework{system_, "IBcatService"}, backend{backend_},
+          progress{{
+              ProgressServiceBackend{system_, "Normal"},
+              ProgressServiceBackend{system_, "Directory"},
+          }} {
+        // clang-format off
+        static const FunctionInfo functions[] = {
+            {10100, &IBcatService::RequestSyncDeliveryCache, "RequestSyncDeliveryCache"},
+            {10101, &IBcatService::RequestSyncDeliveryCacheWithDirectoryName, "RequestSyncDeliveryCacheWithDirectoryName"},
+            {10200, nullptr, "CancelSyncDeliveryCacheRequest"},
+            {20100, nullptr, "RequestSyncDeliveryCacheWithApplicationId"},
+            {20101, nullptr, "RequestSyncDeliveryCacheWithApplicationIdAndDirectoryName"},
+            {20300, nullptr, "GetDeliveryCacheStorageUpdateNotifier"},
+            {20301, nullptr, "RequestSuspendDeliveryTask"},
+            {20400, nullptr, "RegisterSystemApplicationDeliveryTask"},
+            {20401, nullptr, "UnregisterSystemApplicationDeliveryTask"},
+            {20410, nullptr, "SetSystemApplicationDeliveryTaskTimer"},
+            {30100, &IBcatService::SetPassphrase, "SetPassphrase"},
+            {30101, nullptr, "Unknown30101"},
+            {30102, nullptr, "Unknown30102"},
+            {30200, nullptr, "RegisterBackgroundDeliveryTask"},
+            {30201, nullptr, "UnregisterBackgroundDeliveryTask"},
+            {30202, nullptr, "BlockDeliveryTask"},
+            {30203, nullptr, "UnblockDeliveryTask"},
+            {30210, nullptr, "SetDeliveryTaskTimer"},
+            {30300, nullptr, "RegisterSystemApplicationDeliveryTasks"},
+            {90100, nullptr, "EnumerateBackgroundDeliveryTask"},
+            {90101, nullptr, "Unknown90101"},
+            {90200, nullptr, "GetDeliveryList"},
+            {90201, &IBcatService::ClearDeliveryCacheStorage, "ClearDeliveryCacheStorage"},
+            {90202, nullptr, "ClearDeliveryTaskSubscriptionStatus"},
+            {90300, nullptr, "GetPushNotificationLog"},
+            {90301, nullptr, "Unknown90301"},
+        };
+        // clang-format on
+        RegisterHandlers(functions);
+    }
+
+private:
+    enum class SyncType {
+        Normal,
+        Directory,
+        Count,
+    };
+
+    std::shared_ptr<IDeliveryCacheProgressService> CreateProgressService(SyncType type) {
+        auto& progress_backend{GetProgressBackend(type)};
+        return std::make_shared<IDeliveryCacheProgressService>(system, progress_backend.GetEvent(),
+                                                               progress_backend.GetImpl());
+    }
+
+    void RequestSyncDeliveryCache(HLERequestContext& ctx) {
+        LOG_DEBUG(Service_BCAT, "called");
+
+        backend.Synchronize({system.GetApplicationProcessProgramID(),
+                             GetCurrentBuildID(system.GetApplicationProcessBuildID())},
+                            GetProgressBackend(SyncType::Normal));
+
+        IPC::ResponseBuilder rb{ctx, 2, 0, 1};
+        rb.Push(ResultSuccess);
+        rb.PushIpcInterface(CreateProgressService(SyncType::Normal));
+    }
+
+    void RequestSyncDeliveryCacheWithDirectoryName(HLERequestContext& ctx) {
+        IPC::RequestParser rp{ctx};
+        const auto name_raw = rp.PopRaw<DirectoryName>();
+        const auto name =
+            Common::StringFromFixedZeroTerminatedBuffer(name_raw.data(), name_raw.size());
+
+        LOG_DEBUG(Service_BCAT, "called, name={}", name);
+
+        backend.SynchronizeDirectory({system.GetApplicationProcessProgramID(),
+                                      GetCurrentBuildID(system.GetApplicationProcessBuildID())},
+                                     name, GetProgressBackend(SyncType::Directory));
+
+        IPC::ResponseBuilder rb{ctx, 2, 0, 1};
+        rb.Push(ResultSuccess);
+        rb.PushIpcInterface(CreateProgressService(SyncType::Directory));
+    }
+
+    void SetPassphrase(HLERequestContext& ctx) {
+        IPC::RequestParser rp{ctx};
+        const auto title_id = rp.PopRaw<u64>();
+
+        const auto passphrase_raw = ctx.ReadBuffer();
+
+        LOG_DEBUG(Service_BCAT, "called, title_id={:016X}, passphrase={}", title_id,
+                  Common::HexToString(passphrase_raw));
+
+        if (title_id == 0) {
+            LOG_ERROR(Service_BCAT, "Invalid title ID!");
+            IPC::ResponseBuilder rb{ctx, 2};
+            rb.Push(ERROR_INVALID_ARGUMENT);
+        }
+
+        if (passphrase_raw.size() > 0x40) {
+            LOG_ERROR(Service_BCAT, "Passphrase too large!");
+            IPC::ResponseBuilder rb{ctx, 2};
+            rb.Push(ERROR_INVALID_ARGUMENT);
+            return;
+        }
+
+        Passphrase passphrase{};
+        std::memcpy(passphrase.data(), passphrase_raw.data(),
+                    std::min(passphrase.size(), passphrase_raw.size()));
+
+        backend.SetPassphrase(title_id, passphrase);
+
+        IPC::ResponseBuilder rb{ctx, 2};
+        rb.Push(ResultSuccess);
+    }
+
+    void ClearDeliveryCacheStorage(HLERequestContext& ctx) {
+        IPC::RequestParser rp{ctx};
+        const auto title_id = rp.PopRaw<u64>();
+
+        LOG_DEBUG(Service_BCAT, "called, title_id={:016X}", title_id);
+
+        if (title_id == 0) {
+            LOG_ERROR(Service_BCAT, "Invalid title ID!");
+            IPC::ResponseBuilder rb{ctx, 2};
+            rb.Push(ERROR_INVALID_ARGUMENT);
+            return;
+        }
+
+        if (!backend.Clear(title_id)) {
+            LOG_ERROR(Service_BCAT, "Could not clear the directory successfully!");
+            IPC::ResponseBuilder rb{ctx, 2};
+            rb.Push(ERROR_FAILED_CLEAR_CACHE);
+            return;
+        }
+
+        IPC::ResponseBuilder rb{ctx, 2};
+        rb.Push(ResultSuccess);
+    }
+
+    ProgressServiceBackend& GetProgressBackend(SyncType type) {
+        return progress.at(static_cast<size_t>(type));
+    }
+
+    const ProgressServiceBackend& GetProgressBackend(SyncType type) const {
+        return progress.at(static_cast<size_t>(type));
+    }
+
+    Backend& backend;
+    std::array<ProgressServiceBackend, static_cast<size_t>(SyncType::Count)> progress;
+};
+
+void Module::Interface::CreateBcatService(HLERequestContext& ctx) {
+    LOG_DEBUG(Service_BCAT, "called");
+
+    IPC::ResponseBuilder rb{ctx, 2, 0, 1};
+    rb.Push(ResultSuccess);
+    rb.PushIpcInterface<IBcatService>(system, *backend);
+}
+
+class IDeliveryCacheFileService final : public ServiceFramework<IDeliveryCacheFileService> {
+public:
+    explicit IDeliveryCacheFileService(Core::System& system_, FileSys::VirtualDir root_)
+        : ServiceFramework{system_, "IDeliveryCacheFileService"}, root(std::move(root_)) {
+        // clang-format off
+        static const FunctionInfo functions[] = {
+            {0, &IDeliveryCacheFileService::Open, "Open"},
+            {1, &IDeliveryCacheFileService::Read, "Read"},
+            {2, &IDeliveryCacheFileService::GetSize, "GetSize"},
+            {3, &IDeliveryCacheFileService::GetDigest, "GetDigest"},
+        };
+        // clang-format on
+
+        RegisterHandlers(functions);
+    }
+
+private:
+    void Open(HLERequestContext& ctx) {
+        IPC::RequestParser rp{ctx};
+        const auto dir_name_raw = rp.PopRaw<DirectoryName>();
+        const auto file_name_raw = rp.PopRaw<FileName>();
+
+        const auto dir_name =
+            Common::StringFromFixedZeroTerminatedBuffer(dir_name_raw.data(), dir_name_raw.size());
+        const auto file_name =
+            Common::StringFromFixedZeroTerminatedBuffer(file_name_raw.data(), file_name_raw.size());
+
+        LOG_DEBUG(Service_BCAT, "called, dir_name={}, file_name={}", dir_name, file_name);
+
+        if (!VerifyNameValidDir(ctx, dir_name_raw) || !VerifyNameValidFile(ctx, file_name_raw))
+            return;
+
+        if (current_file != nullptr) {
+            LOG_ERROR(Service_BCAT, "A file has already been opened on this interface!");
+            IPC::ResponseBuilder rb{ctx, 2};
+            rb.Push(ERROR_ENTITY_ALREADY_OPEN);
+            return;
+        }
+
+        const auto dir = root->GetSubdirectory(dir_name);
+
+        if (dir == nullptr) {
+            LOG_ERROR(Service_BCAT, "The directory of name={} couldn't be opened!", dir_name);
+            IPC::ResponseBuilder rb{ctx, 2};
+            rb.Push(ERROR_FAILED_OPEN_ENTITY);
+            return;
+        }
+
+        current_file = dir->GetFile(file_name);
+
+        if (current_file == nullptr) {
+            LOG_ERROR(Service_BCAT, "The file of name={} couldn't be opened!", file_name);
+            IPC::ResponseBuilder rb{ctx, 2};
+            rb.Push(ERROR_FAILED_OPEN_ENTITY);
+            return;
+        }
+
+        IPC::ResponseBuilder rb{ctx, 2};
+        rb.Push(ResultSuccess);
+    }
+
+    void Read(HLERequestContext& ctx) {
+        IPC::RequestParser rp{ctx};
+        const auto offset{rp.PopRaw<u64>()};
+
+        auto size = ctx.GetWriteBufferSize();
+
+        LOG_DEBUG(Service_BCAT, "called, offset={:016X}, size={:016X}", offset, size);
+
+        if (current_file == nullptr) {
+            LOG_ERROR(Service_BCAT, "There is no file currently open!");
+            IPC::ResponseBuilder rb{ctx, 2};
+            rb.Push(ERROR_NO_OPEN_ENTITY);
+        }
+
+        size = std::min<u64>(current_file->GetSize() - offset, size);
+        const auto buffer = current_file->ReadBytes(size, offset);
+        ctx.WriteBuffer(buffer);
+
+        IPC::ResponseBuilder rb{ctx, 4};
+        rb.Push(ResultSuccess);
+        rb.Push<u64>(buffer.size());
+    }
+
+    void GetSize(HLERequestContext& ctx) {
+        LOG_DEBUG(Service_BCAT, "called");
+
+        if (current_file == nullptr) {
+            LOG_ERROR(Service_BCAT, "There is no file currently open!");
+            IPC::ResponseBuilder rb{ctx, 2};
+            rb.Push(ERROR_NO_OPEN_ENTITY);
+        }
+
+        IPC::ResponseBuilder rb{ctx, 4};
+        rb.Push(ResultSuccess);
+        rb.Push<u64>(current_file->GetSize());
+    }
+
+    void GetDigest(HLERequestContext& ctx) {
+        LOG_DEBUG(Service_BCAT, "called");
+
+        if (current_file == nullptr) {
+            LOG_ERROR(Service_BCAT, "There is no file currently open!");
+            IPC::ResponseBuilder rb{ctx, 2};
+            rb.Push(ERROR_NO_OPEN_ENTITY);
+        }
+
+        IPC::ResponseBuilder rb{ctx, 6};
+        rb.Push(ResultSuccess);
+        rb.PushRaw(DigestFile(current_file));
+    }
+
+    FileSys::VirtualDir root;
+    FileSys::VirtualFile current_file;
+};
+
+class IDeliveryCacheDirectoryService final
+    : public ServiceFramework<IDeliveryCacheDirectoryService> {
+public:
+    explicit IDeliveryCacheDirectoryService(Core::System& system_, FileSys::VirtualDir root_)
+        : ServiceFramework{system_, "IDeliveryCacheDirectoryService"}, root(std::move(root_)) {
+        // clang-format off
+        static const FunctionInfo functions[] = {
+            {0, &IDeliveryCacheDirectoryService::Open, "Open"},
+            {1, &IDeliveryCacheDirectoryService::Read, "Read"},
+            {2, &IDeliveryCacheDirectoryService::GetCount, "GetCount"},
+        };
+        // clang-format on
+
+        RegisterHandlers(functions);
+    }
+
+private:
+    void Open(HLERequestContext& ctx) {
+        IPC::RequestParser rp{ctx};
+        const auto name_raw = rp.PopRaw<DirectoryName>();
+        const auto name =
+            Common::StringFromFixedZeroTerminatedBuffer(name_raw.data(), name_raw.size());
+
+        LOG_DEBUG(Service_BCAT, "called, name={}", name);
+
+        if (!VerifyNameValidDir(ctx, name_raw))
+            return;
+
+        if (current_dir != nullptr) {
+            LOG_ERROR(Service_BCAT, "A file has already been opened on this interface!");
+            IPC::ResponseBuilder rb{ctx, 2};
+            rb.Push(ERROR_ENTITY_ALREADY_OPEN);
+            return;
+        }
+
+        current_dir = root->GetSubdirectory(name);
+
+        if (current_dir == nullptr) {
+            LOG_ERROR(Service_BCAT, "Failed to open the directory name={}!", name);
+            IPC::ResponseBuilder rb{ctx, 2};
+            rb.Push(ERROR_FAILED_OPEN_ENTITY);
+            return;
+        }
+
+        IPC::ResponseBuilder rb{ctx, 2};
+        rb.Push(ResultSuccess);
+    }
+
+    void Read(HLERequestContext& ctx) {
+        auto write_size = ctx.GetWriteBufferNumElements<DeliveryCacheDirectoryEntry>();
+
+        LOG_DEBUG(Service_BCAT, "called, write_size={:016X}", write_size);
+
+        if (current_dir == nullptr) {
+            LOG_ERROR(Service_BCAT, "There is no open directory!");
+            IPC::ResponseBuilder rb{ctx, 2};
+            rb.Push(ERROR_NO_OPEN_ENTITY);
+            return;
+        }
+
+        const auto files = current_dir->GetFiles();
+        write_size = std::min<u64>(write_size, files.size());
+        std::vector<DeliveryCacheDirectoryEntry> entries(write_size);
+        std::transform(
+            files.begin(), files.begin() + write_size, entries.begin(), [](const auto& file) {
+                FileName name{};
+                std::memcpy(name.data(), file->GetName().data(),
+                            std::min(file->GetName().size(), name.size()));
+                return DeliveryCacheDirectoryEntry{name, file->GetSize(), DigestFile(file)};
+            });
+
+        ctx.WriteBuffer(entries);
+
+        IPC::ResponseBuilder rb{ctx, 3};
+        rb.Push(ResultSuccess);
+        rb.Push(static_cast<u32>(write_size * sizeof(DeliveryCacheDirectoryEntry)));
+    }
+
+    void GetCount(HLERequestContext& ctx) {
+        LOG_DEBUG(Service_BCAT, "called");
+
+        if (current_dir == nullptr) {
+            LOG_ERROR(Service_BCAT, "There is no open directory!");
+            IPC::ResponseBuilder rb{ctx, 2};
+            rb.Push(ERROR_NO_OPEN_ENTITY);
+            return;
+        }
+
+        const auto files = current_dir->GetFiles();
+
+        IPC::ResponseBuilder rb{ctx, 3};
+        rb.Push(ResultSuccess);
+        rb.Push(static_cast<u32>(files.size()));
+    }
+
+    FileSys::VirtualDir root;
+    FileSys::VirtualDir current_dir;
+};
+
+class IDeliveryCacheStorageService final : public ServiceFramework<IDeliveryCacheStorageService> {
+public:
+    explicit IDeliveryCacheStorageService(Core::System& system_, FileSys::VirtualDir root_)
+        : ServiceFramework{system_, "IDeliveryCacheStorageService"}, root(std::move(root_)) {
+        // clang-format off
+        static const FunctionInfo functions[] = {
+            {0, &IDeliveryCacheStorageService::CreateFileService, "CreateFileService"},
+            {1, &IDeliveryCacheStorageService::CreateDirectoryService, "CreateDirectoryService"},
+            {10, &IDeliveryCacheStorageService::EnumerateDeliveryCacheDirectory, "EnumerateDeliveryCacheDirectory"},
+        };
+        // clang-format on
+
+        RegisterHandlers(functions);
+
+        for (const auto& subdir : root->GetSubdirectories()) {
+            DirectoryName name{};
+            std::memcpy(name.data(), subdir->GetName().data(),
+                        std::min(sizeof(DirectoryName) - 1, subdir->GetName().size()));
+            entries.push_back(name);
+        }
+    }
+
+private:
+    void CreateFileService(HLERequestContext& ctx) {
+        LOG_DEBUG(Service_BCAT, "called");
+
+        IPC::ResponseBuilder rb{ctx, 2, 0, 1};
+        rb.Push(ResultSuccess);
+        rb.PushIpcInterface<IDeliveryCacheFileService>(system, root);
+    }
+
+    void CreateDirectoryService(HLERequestContext& ctx) {
+        LOG_DEBUG(Service_BCAT, "called");
+
+        IPC::ResponseBuilder rb{ctx, 2, 0, 1};
+        rb.Push(ResultSuccess);
+        rb.PushIpcInterface<IDeliveryCacheDirectoryService>(system, root);
+    }
+
+    void EnumerateDeliveryCacheDirectory(HLERequestContext& ctx) {
+        auto size = ctx.GetWriteBufferNumElements<DirectoryName>();
+
+        LOG_DEBUG(Service_BCAT, "called, size={:016X}", size);
+
+        size = std::min<u64>(size, entries.size() - next_read_index);
+        ctx.WriteBuffer(entries.data() + next_read_index, size * sizeof(DirectoryName));
+        next_read_index += size;
+
+        IPC::ResponseBuilder rb{ctx, 3};
+        rb.Push(ResultSuccess);
+        rb.Push(static_cast<u32>(size));
+    }
+
+    FileSys::VirtualDir root;
+    std::vector<DirectoryName> entries;
+    u64 next_read_index = 0;
+};
+
+void Module::Interface::CreateDeliveryCacheStorageService(HLERequestContext& ctx) {
+    LOG_DEBUG(Service_BCAT, "called");
+
+    const auto title_id = system.GetApplicationProcessProgramID();
+    IPC::ResponseBuilder rb{ctx, 2, 0, 1};
+    rb.Push(ResultSuccess);
+    rb.PushIpcInterface<IDeliveryCacheStorageService>(system, fsc.GetBCATDirectory(title_id));
+}
+
+void Module::Interface::CreateDeliveryCacheStorageServiceWithApplicationId(HLERequestContext& ctx) {
+    IPC::RequestParser rp{ctx};
+    const auto title_id = rp.PopRaw<u64>();
+
+    LOG_DEBUG(Service_BCAT, "called, title_id={:016X}", title_id);
+
+    IPC::ResponseBuilder rb{ctx, 2, 0, 1};
+    rb.Push(ResultSuccess);
+    rb.PushIpcInterface<IDeliveryCacheStorageService>(system, fsc.GetBCATDirectory(title_id));
+}
+
+std::unique_ptr<Backend> CreateBackendFromSettings([[maybe_unused]] Core::System& system,
+                                                   DirectoryGetter getter) {
+    return std::make_unique<NullBackend>(std::move(getter));
+}
+
+Module::Interface::Interface(Core::System& system_, std::shared_ptr<Module> module_,
+                             FileSystem::FileSystemController& fsc_, const char* name)
+    : ServiceFramework{system_, name}, fsc{fsc_}, module{std::move(module_)},
+      backend{CreateBackendFromSettings(system_,
+                                        [&fsc_](u64 tid) { return fsc_.GetBCATDirectory(tid); })} {}
+
+Module::Interface::~Interface() = default;
+
+void LoopProcess(Core::System& system) {
+    auto server_manager = std::make_unique<ServerManager>(system);
+    auto module = std::make_shared<Module>();
+
+    server_manager->RegisterNamedService(
+        "bcat:a",
+        std::make_shared<BCAT>(system, module, system.GetFileSystemController(), "bcat:a"));
+    server_manager->RegisterNamedService(
+        "bcat:m",
+        std::make_shared<BCAT>(system, module, system.GetFileSystemController(), "bcat:m"));
+    server_manager->RegisterNamedService(
+        "bcat:u",
+        std::make_shared<BCAT>(system, module, system.GetFileSystemController(), "bcat:u"));
+    server_manager->RegisterNamedService(
+        "bcat:s",
+        std::make_shared<BCAT>(system, module, system.GetFileSystemController(), "bcat:s"));
+    ServerManager::RunServer(std::move(server_manager));
+}
+
+} // namespace Service::BCAT
--- a/src/core/hle/service/bcat/bcat_module.h
+++ b/src/core/hle/service/bcat/bcat_module.h
@ -0,0 +1,46 @@
+// SPDX-FileCopyrightText: Copyright 2018 yuzu Emulator Project
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#pragma once
+
+#include "core/hle/service/service.h"
+
+namespace Core {
+class System;
+}
+
+namespace Service {
+
+namespace FileSystem {
+class FileSystemController;
+} // namespace FileSystem
+
+namespace BCAT {
+
+class Backend;
+
+class Module final {
+public:
+    class Interface : public ServiceFramework<Interface> {
+    public:
+        explicit Interface(Core::System& system_, std::shared_ptr<Module> module_,
+                           FileSystem::FileSystemController& fsc_, const char* name);
+        ~Interface() override;
+
+        void CreateBcatService(HLERequestContext& ctx);
+        void CreateDeliveryCacheStorageService(HLERequestContext& ctx);
+        void CreateDeliveryCacheStorageServiceWithApplicationId(HLERequestContext& ctx);
+
+    protected:
+        FileSystem::FileSystemController& fsc;
+
+        std::shared_ptr<Module> module;
+        std::unique_ptr<Backend> backend;
+    };
+};
+
+void LoopProcess(Core::System& system);
+
+} // namespace BCAT
+
+} // namespace Service
--- a/src/core/hle/service/bcat/bcat_result.h
+++ b/src/core/hle/service/bcat/bcat_result.h
@ -1,15 +0,0 @@
-// SPDX-FileCopyrightText: Copyright 2024 yuzu Emulator Project
-// SPDX-License-Identifier: GPL-3.0-or-later
-
-#pragma once
-
-#include "core/hle/result.h"
-
-namespace Service::BCAT {
-
-constexpr Result ResultInvalidArgument{ErrorModule::BCAT, 1};
-constexpr Result ResultFailedOpenEntity{ErrorModule::BCAT, 2};
-constexpr Result ResultEntityAlreadyOpen{ErrorModule::BCAT, 6};
-constexpr Result ResultNoOpenEntry{ErrorModule::BCAT, 7};
-
-} // namespace Service::BCAT
--- a/src/core/hle/service/bcat/bcat_service.cpp
+++ b/src/core/hle/service/bcat/bcat_service.cpp
@ -1,132 +0,0 @@
-// SPDX-FileCopyrightText: Copyright 2018 yuzu Emulator Project
-// SPDX-License-Identifier: GPL-2.0-or-later
-
-#include "common/hex_util.h"
-#include "common/string_util.h"
-#include "core/core.h"
-#include "core/file_sys/errors.h"
-#include "core/hle/service/bcat/backend/backend.h"
-#include "core/hle/service/bcat/bcat_result.h"
-#include "core/hle/service/bcat/bcat_service.h"
-#include "core/hle/service/bcat/bcat_util.h"
-#include "core/hle/service/bcat/delivery_cache_progress_service.h"
-#include "core/hle/service/bcat/delivery_cache_storage_service.h"
-#include "core/hle/service/cmif_serialization.h"
-
-namespace Service::BCAT {
-
-static u64 GetCurrentBuildID(const Core::System::CurrentBuildProcessID& id) {
-    u64 out{};
-    std::memcpy(&out, id.data(), sizeof(u64));
-    return out;
-}
-
-IBcatService::IBcatService(Core::System& system_, BcatBackend& backend_)
-    : ServiceFramework{system_, "IBcatService"}, backend{backend_},
-      progress{{
-          ProgressServiceBackend{system_, "Normal"},
-          ProgressServiceBackend{system_, "Directory"},
-      }} {
-    // clang-format off
-        static const FunctionInfo functions[] = {
-            {10100, D<&IBcatService::RequestSyncDeliveryCache>, "RequestSyncDeliveryCache"},
-            {10101, D<&IBcatService::RequestSyncDeliveryCacheWithDirectoryName>, "RequestSyncDeliveryCacheWithDirectoryName"},
-            {10200, nullptr, "CancelSyncDeliveryCacheRequest"},
-            {20100, nullptr, "RequestSyncDeliveryCacheWithApplicationId"},
-            {20101, nullptr, "RequestSyncDeliveryCacheWithApplicationIdAndDirectoryName"},
-            {20300, nullptr, "GetDeliveryCacheStorageUpdateNotifier"},
-            {20301, nullptr, "RequestSuspendDeliveryTask"},
-            {20400, nullptr, "RegisterSystemApplicationDeliveryTask"},
-            {20401, nullptr, "UnregisterSystemApplicationDeliveryTask"},
-            {20410, nullptr, "SetSystemApplicationDeliveryTaskTimer"},
-            {30100, D<&IBcatService::SetPassphrase>, "SetPassphrase"},
-            {30101, nullptr, "Unknown30101"},
-            {30102, nullptr, "Unknown30102"},
-            {30200, nullptr, "RegisterBackgroundDeliveryTask"},
-            {30201, nullptr, "UnregisterBackgroundDeliveryTask"},
-            {30202, nullptr, "BlockDeliveryTask"},
-            {30203, nullptr, "UnblockDeliveryTask"},
-            {30210, nullptr, "SetDeliveryTaskTimer"},
-            {30300, D<&IBcatService::RegisterSystemApplicationDeliveryTasks>, "RegisterSystemApplicationDeliveryTasks"},
-            {90100, nullptr, "EnumerateBackgroundDeliveryTask"},
-            {90101, nullptr, "Unknown90101"},
-            {90200, nullptr, "GetDeliveryList"},
-            {90201, D<&IBcatService::ClearDeliveryCacheStorage>, "ClearDeliveryCacheStorage"},
-            {90202, nullptr, "ClearDeliveryTaskSubscriptionStatus"},
-            {90300, nullptr, "GetPushNotificationLog"},
-            {90301, nullptr, "Unknown90301"},
-        };
-    // clang-format on
-    RegisterHandlers(functions);
-}
-
-IBcatService::~IBcatService() = default;
-
-Result IBcatService::RequestSyncDeliveryCache(
-    OutInterface<IDeliveryCacheProgressService> out_interface) {
-    LOG_DEBUG(Service_BCAT, "called");
-
-    auto& progress_backend{GetProgressBackend(SyncType::Normal)};
-    backend.Synchronize({system.GetApplicationProcessProgramID(),
-                         GetCurrentBuildID(system.GetApplicationProcessBuildID())},
-                        GetProgressBackend(SyncType::Normal));
-
-    *out_interface = std::make_shared<IDeliveryCacheProgressService>(
-        system, progress_backend.GetEvent(), progress_backend.GetImpl());
-    R_SUCCEED();
-}
-
-Result IBcatService::RequestSyncDeliveryCacheWithDirectoryName(
-    const DirectoryName& name_raw, OutInterface<IDeliveryCacheProgressService> out_interface) {
-    const auto name = Common::StringFromFixedZeroTerminatedBuffer(name_raw.data(), name_raw.size());
-
-    LOG_DEBUG(Service_BCAT, "called, name={}", name);
-
-    auto& progress_backend{GetProgressBackend(SyncType::Directory)};
-    backend.SynchronizeDirectory({system.GetApplicationProcessProgramID(),
-                                  GetCurrentBuildID(system.GetApplicationProcessBuildID())},
-                                 name, progress_backend);
-
-    *out_interface = std::make_shared<IDeliveryCacheProgressService>(
-        system, progress_backend.GetEvent(), progress_backend.GetImpl());
-    R_SUCCEED();
-}
-
-Result IBcatService::SetPassphrase(u64 application_id,
-                                   InBuffer<BufferAttr_HipcPointer> passphrase_buffer) {
-    LOG_DEBUG(Service_BCAT, "called, application_id={:016X}, passphrase={}", application_id,
-              Common::HexToString(passphrase_buffer));
-
-    R_UNLESS(application_id != 0, ResultInvalidArgument);
-    R_UNLESS(passphrase_buffer.size() <= 0x40, ResultInvalidArgument);
-
-    Passphrase passphrase{};
-    std::memcpy(passphrase.data(), passphrase_buffer.data(),
-                std::min(passphrase.size(), passphrase_buffer.size()));
-
-    backend.SetPassphrase(application_id, passphrase);
-    R_SUCCEED();
-}
-
-Result IBcatService::RegisterSystemApplicationDeliveryTasks() {
-    LOG_WARNING(Service_BCAT, "(STUBBED) called");
-    R_SUCCEED();
-}
-
-Result IBcatService::ClearDeliveryCacheStorage(u64 application_id) {
-    LOG_DEBUG(Service_BCAT, "called, title_id={:016X}", application_id);
-
-    R_UNLESS(application_id != 0, ResultInvalidArgument);
-    R_UNLESS(backend.Clear(application_id), FileSys::ResultPermissionDenied);
-    R_SUCCEED();
-}
-
-ProgressServiceBackend& IBcatService::GetProgressBackend(SyncType type) {
-    return progress.at(static_cast<size_t>(type));
-}
-
-const ProgressServiceBackend& IBcatService::GetProgressBackend(SyncType type) const {
-    return progress.at(static_cast<size_t>(type));
-}
-
-} // namespace Service::BCAT
--- a/src/core/hle/service/bcat/bcat_service.h
+++ b/src/core/hle/service/bcat/bcat_service.h
@ -1,45 +0,0 @@
-// SPDX-FileCopyrightText: Copyright 2024 yuzu Emulator Project
-// SPDX-License-Identifier: GPL-3.0-or-later
-
-#pragma once
-
-#include "core/hle/service/bcat/backend/backend.h"
-#include "core/hle/service/bcat/bcat_types.h"
-#include "core/hle/service/cmif_types.h"
-#include "core/hle/service/service.h"
-
-namespace Core {
-class System;
-}
-
-namespace Service::BCAT {
-class BcatBackend;
-class IDeliveryCacheStorageService;
-class IDeliveryCacheProgressService;
-
-class IBcatService final : public ServiceFramework<IBcatService> {
-public:
-    explicit IBcatService(Core::System& system_, BcatBackend& backend_);
-    ~IBcatService() override;
-
-private:
-    Result RequestSyncDeliveryCache(OutInterface<IDeliveryCacheProgressService> out_interface);
-
-    Result RequestSyncDeliveryCacheWithDirectoryName(
-        const DirectoryName& name, OutInterface<IDeliveryCacheProgressService> out_interface);
-
-    Result SetPassphrase(u64 application_id, InBuffer<BufferAttr_HipcPointer> passphrase_buffer);
-
-    Result RegisterSystemApplicationDeliveryTasks();
-
-    Result ClearDeliveryCacheStorage(u64 application_id);
-
-private:
-    ProgressServiceBackend& GetProgressBackend(SyncType type);
-    const ProgressServiceBackend& GetProgressBackend(SyncType type) const;
-
-    BcatBackend& backend;
-    std::array<ProgressServiceBackend, static_cast<size_t>(SyncType::Count)> progress;
-};
-
-} // namespace Service::BCAT
--- a/src/core/hle/service/bcat/bcat_types.h
+++ b/src/core/hle/service/bcat/bcat_types.h
@ -1,66 +0,0 @@
-// SPDX-FileCopyrightText: Copyright 2024 yuzu Emulator Project
-// SPDX-License-Identifier: GPL-3.0-or-later
-
-#pragma once
-
-#include <array>
-#include <functional>
-
-#include "common/common_funcs.h"
-#include "common/common_types.h"
-#include "core/file_sys/vfs/vfs_types.h"
-#include "core/hle/result.h"
-
-namespace Service::BCAT {
-
-using DirectoryName = std::array<char, 0x20>;
-using FileName = std::array<char, 0x20>;
-using BcatDigest = std::array<u8, 0x10>;
-using Passphrase = std::array<u8, 0x20>;
-using DirectoryGetter = std::function<FileSys::VirtualDir(u64)>;
-
-enum class SyncType {
-    Normal,
-    Directory,
-    Count,
-};
-
-enum class DeliveryCacheProgressStatus : s32 {
-    None = 0x0,
-    Queued = 0x1,
-    Connecting = 0x2,
-    ProcessingDataList = 0x3,
-    Downloading = 0x4,
-    Committing = 0x5,
-    Done = 0x9,
-};
-
-struct DeliveryCacheDirectoryEntry {
-    FileName name;
-    u64 size;
-    BcatDigest digest;
-};
-
-struct TitleIDVersion {
-    u64 title_id;
-    u64 build_id;
-};
-
-struct DeliveryCacheProgressImpl {
-    DeliveryCacheProgressStatus status;
-    Result result;
-    DirectoryName current_directory;
-    FileName current_file;
-    s64 current_downloaded_bytes; ///< Bytes downloaded on current file.
-    s64 current_total_bytes;      ///< Bytes total on current file.
-    s64 total_downloaded_bytes;   ///< Bytes downloaded on overall download.
-    s64 total_bytes;              ///< Bytes total on overall download.
-    INSERT_PADDING_BYTES_NOINIT(
-        0x198); ///< Appears to be unused in official code, possibly reserved for future use.
-};
-static_assert(sizeof(DeliveryCacheProgressImpl) == 0x200,
-              "DeliveryCacheProgressImpl has incorrect size.");
-static_assert(std::is_trivial_v<DeliveryCacheProgressImpl>,
-              "DeliveryCacheProgressImpl type must be trivially copyable.");
-
-} // namespace Service::BCAT
--- a/src/core/hle/service/bcat/bcat_util.h
+++ b/src/core/hle/service/bcat/bcat_util.h
@ -1,39 +0,0 @@
-// SPDX-FileCopyrightText: Copyright 2024 yuzu Emulator Project
-// SPDX-License-Identifier: GPL-3.0-or-later
-
-#pragma once
-
-#include <array>
-#include <cctype>
-#include <mbedtls/md5.h>
-
-#include "core/hle/service/bcat/bcat_result.h"
-#include "core/hle/service/bcat/bcat_types.h"
-
-namespace Service::BCAT {
-
-// For a name to be valid it must be non-empty, must have a null terminating character as the final
-// char, can only contain numbers, letters, underscores and a hyphen if directory and a period if
-// file.
-constexpr Result VerifyNameValidInternal(std::array<char, 0x20> name, char match_char) {
-    const auto null_chars = std::count(name.begin(), name.end(), 0);
-    const auto bad_chars = std::count_if(name.begin(), name.end(), [match_char](char c) {
-        return !std::isalnum(static_cast<u8>(c)) && c != '_' && c != match_char && c != '\0';
-    });
-    if (null_chars == 0x20 || null_chars == 0 || bad_chars != 0 || name[0x1F] != '\0') {
-        LOG_ERROR(Service_BCAT, "Name passed was invalid!");
-        return ResultInvalidArgument;
-    }
-
-    return ResultSuccess;
-}
-
-constexpr Result VerifyNameValidDir(DirectoryName name) {
-    return VerifyNameValidInternal(name, '-');
-}
-
-constexpr Result VerifyNameValidFile(FileName name) {
-    return VerifyNameValidInternal(name, '.');
-}
-
-} // namespace Service::BCAT
--- a/src/core/hle/service/bcat/delivery_cache_directory_service.cpp
+++ b/src/core/hle/service/bcat/delivery_cache_directory_service.cpp
@ -1,80 +0,0 @@
-// SPDX-FileCopyrightText: Copyright 2024 yuzu Emulator Project
-// SPDX-License-Identifier: GPL-3.0-or-later
-
-#include "common/string_util.h"
-#include "core/file_sys/vfs/vfs_types.h"
-#include "core/hle/service/bcat/bcat_result.h"
-#include "core/hle/service/bcat/bcat_util.h"
-#include "core/hle/service/bcat/delivery_cache_directory_service.h"
-#include "core/hle/service/cmif_serialization.h"
-
-namespace Service::BCAT {
-
-// The digest is only used to determine if a file is unique compared to others of the same name.
-// Since the algorithm isn't ever checked in game, MD5 is safe.
-static BcatDigest DigestFile(const FileSys::VirtualFile& file) {
-    BcatDigest out{};
-    const auto bytes = file->ReadAllBytes();
-    mbedtls_md5_ret(bytes.data(), bytes.size(), out.data());
-    return out;
-}
-
-IDeliveryCacheDirectoryService::IDeliveryCacheDirectoryService(Core::System& system_,
-                                                               FileSys::VirtualDir root_)
-    : ServiceFramework{system_, "IDeliveryCacheDirectoryService"}, root(std::move(root_)) {
-    // clang-format off
-    static const FunctionInfo functions[] = {
-        {0, D<&IDeliveryCacheDirectoryService::Open>, "Open"},
-        {1, D<&IDeliveryCacheDirectoryService::Read>, "Read"},
-        {2, D<&IDeliveryCacheDirectoryService::GetCount>, "GetCount"},
-    };
-    // clang-format on
-
-    RegisterHandlers(functions);
-}
-
-IDeliveryCacheDirectoryService::~IDeliveryCacheDirectoryService() = default;
-
-Result IDeliveryCacheDirectoryService::Open(const DirectoryName& dir_name_raw) {
-    const auto dir_name =
-        Common::StringFromFixedZeroTerminatedBuffer(dir_name_raw.data(), dir_name_raw.size());
-
-    LOG_DEBUG(Service_BCAT, "called, dir_name={}", dir_name);
-
-    R_TRY(VerifyNameValidDir(dir_name_raw));
-    R_UNLESS(current_dir == nullptr, ResultEntityAlreadyOpen);
-
-    const auto dir = root->GetSubdirectory(dir_name);
-    R_UNLESS(dir != nullptr, ResultFailedOpenEntity);
-
-    R_SUCCEED();
-}
-
-Result IDeliveryCacheDirectoryService::Read(
-    Out<s32> out_count, OutArray<DeliveryCacheDirectoryEntry, BufferAttr_HipcMapAlias> out_buffer) {
-    LOG_DEBUG(Service_BCAT, "called, write_size={:016X}", out_buffer.size());
-
-    R_UNLESS(current_dir != nullptr, ResultNoOpenEntry);
-
-    const auto files = current_dir->GetFiles();
-    *out_count = static_cast<s32>(std::min(files.size(), out_buffer.size()));
-    std::transform(files.begin(), files.begin() + *out_count, out_buffer.begin(),
-                   [](const auto& file) {
-                       FileName name{};
-                       std::memcpy(name.data(), file->GetName().data(),
-                                   std::min(file->GetName().size(), name.size()));
-                       return DeliveryCacheDirectoryEntry{name, file->GetSize(), DigestFile(file)};
-                   });
-    R_SUCCEED();
-}
-
-Result IDeliveryCacheDirectoryService::GetCount(Out<s32> out_count) {
-    LOG_DEBUG(Service_BCAT, "called");
-
-    R_UNLESS(current_dir != nullptr, ResultNoOpenEntry);
-
-    *out_count = static_cast<s32>(current_dir->GetFiles().size());
-    R_SUCCEED();
-}
-
-} // namespace Service::BCAT
--- a/src/core/hle/service/bcat/delivery_cache_directory_service.h
+++ b/src/core/hle/service/bcat/delivery_cache_directory_service.h
@ -1,33 +0,0 @@
-// SPDX-FileCopyrightText: Copyright 2024 yuzu Emulator Project
-// SPDX-License-Identifier: GPL-3.0-or-later
-
-#pragma once
-
-#include "core/file_sys/vfs/vfs.h"
-#include "core/hle/service/bcat/bcat_types.h"
-#include "core/hle/service/cmif_types.h"
-#include "core/hle/service/service.h"
-
-namespace Core {
-class System;
-}
-
-namespace Service::BCAT {
-
-class IDeliveryCacheDirectoryService final
-    : public ServiceFramework<IDeliveryCacheDirectoryService> {
-public:
-    explicit IDeliveryCacheDirectoryService(Core::System& system_, FileSys::VirtualDir root_);
-    ~IDeliveryCacheDirectoryService() override;
-
-private:
-    Result Open(const DirectoryName& dir_name_raw);
-    Result Read(Out<s32> out_count,
-                OutArray<DeliveryCacheDirectoryEntry, BufferAttr_HipcMapAlias> out_buffer);
-    Result GetCount(Out<s32> out_count);
-
-    FileSys::VirtualDir root;
-    FileSys::VirtualDir current_dir;
-};
-
-} // namespace Service::BCAT
--- a/src/core/hle/service/bcat/delivery_cache_file_service.cpp
+++ b/src/core/hle/service/bcat/delivery_cache_file_service.cpp
@ -1,82 +0,0 @@
-// SPDX-FileCopyrightText: Copyright 2024 yuzu Emulator Project
-// SPDX-License-Identifier: GPL-3.0-or-later
-
-#include "common/string_util.h"
-#include "core/hle/service/bcat/bcat_result.h"
-#include "core/hle/service/bcat/bcat_util.h"
-#include "core/hle/service/bcat/delivery_cache_file_service.h"
-#include "core/hle/service/cmif_serialization.h"
-
-namespace Service::BCAT {
-
-IDeliveryCacheFileService::IDeliveryCacheFileService(Core::System& system_,
-                                                     FileSys::VirtualDir root_)
-    : ServiceFramework{system_, "IDeliveryCacheFileService"}, root(std::move(root_)) {
-    // clang-format off
-    static const FunctionInfo functions[] = {
-        {0, D<&IDeliveryCacheFileService::Open>, "Open"},
-        {1, D<&IDeliveryCacheFileService::Read>, "Read"},
-        {2, D<&IDeliveryCacheFileService::GetSize>, "GetSize"},
-        {3, D<&IDeliveryCacheFileService::GetDigest>, "GetDigest"},
-    };
-    // clang-format on
-
-    RegisterHandlers(functions);
-}
-
-IDeliveryCacheFileService::~IDeliveryCacheFileService() = default;
-
-Result IDeliveryCacheFileService::Open(const DirectoryName& dir_name_raw,
-                                       const FileName& file_name_raw) {
-    const auto dir_name =
-        Common::StringFromFixedZeroTerminatedBuffer(dir_name_raw.data(), dir_name_raw.size());
-    const auto file_name =
-        Common::StringFromFixedZeroTerminatedBuffer(file_name_raw.data(), file_name_raw.size());
-
-    LOG_DEBUG(Service_BCAT, "called, dir_name={}, file_name={}", dir_name, file_name);
-
-    R_TRY(VerifyNameValidDir(dir_name_raw));
-    R_TRY(VerifyNameValidDir(file_name_raw));
-    R_UNLESS(current_file == nullptr, ResultEntityAlreadyOpen);
-
-    const auto dir = root->GetSubdirectory(dir_name);
-    R_UNLESS(dir != nullptr, ResultFailedOpenEntity);
-
-    current_file = dir->GetFile(file_name);
-    R_UNLESS(current_file != nullptr, ResultFailedOpenEntity);
-
-    R_SUCCEED();
-}
-
-Result IDeliveryCacheFileService::Read(Out<u64> out_buffer_size, u64 offset,
-                                       OutBuffer<BufferAttr_HipcMapAlias> out_buffer) {
-    LOG_DEBUG(Service_BCAT, "called, offset={:016X}, size={:016X}", offset, out_buffer.size());
-
-    R_UNLESS(current_file != nullptr, ResultNoOpenEntry);
-
-    *out_buffer_size = std::min<u64>(current_file->GetSize() - offset, out_buffer.size());
-    const auto buffer = current_file->ReadBytes(*out_buffer_size, offset);
-    memcpy(out_buffer.data(), buffer.data(), buffer.size());
-
-    R_SUCCEED();
-}
-
-Result IDeliveryCacheFileService::GetSize(Out<u64> out_size) {
-    LOG_DEBUG(Service_BCAT, "called");
-
-    R_UNLESS(current_file != nullptr, ResultNoOpenEntry);
-
-    *out_size = current_file->GetSize();
-    R_SUCCEED();
-}
-
-Result IDeliveryCacheFileService::GetDigest(Out<BcatDigest> out_digest) {
-    LOG_DEBUG(Service_BCAT, "called");
-
-    R_UNLESS(current_file != nullptr, ResultNoOpenEntry);
-
-    //*out_digest = DigestFile(current_file);
-    R_SUCCEED();
-}
-
-} // namespace Service::BCAT
--- a/src/core/hle/service/bcat/delivery_cache_file_service.h
+++ b/src/core/hle/service/bcat/delivery_cache_file_service.h
@ -1,33 +0,0 @@
-// SPDX-FileCopyrightText: Copyright 2024 yuzu Emulator Project
-// SPDX-License-Identifier: GPL-3.0-or-later
-
-#pragma once
-
-#include "core/file_sys/vfs/vfs.h"
-#include "core/hle/service/bcat/bcat_types.h"
-#include "core/hle/service/cmif_types.h"
-#include "core/hle/service/service.h"
-
-namespace Core {
-class System;
-}
-
-namespace Service::BCAT {
-
-class IDeliveryCacheFileService final : public ServiceFramework<IDeliveryCacheFileService> {
-public:
-    explicit IDeliveryCacheFileService(Core::System& system_, FileSys::VirtualDir root_);
-    ~IDeliveryCacheFileService() override;
-
-private:
-    Result Open(const DirectoryName& dir_name_raw, const FileName& file_name_raw);
-    Result Read(Out<u64> out_buffer_size, u64 offset,
-                OutBuffer<BufferAttr_HipcMapAlias> out_buffer);
-    Result GetSize(Out<u64> out_size);
-    Result GetDigest(Out<BcatDigest> out_digest);
-
-    FileSys::VirtualDir root;
-    FileSys::VirtualFile current_file;
-};
-
-} // namespace Service::BCAT
--- a/src/core/hle/service/bcat/delivery_cache_progress_service.cpp
+++ b/src/core/hle/service/bcat/delivery_cache_progress_service.cpp
@ -1,41 +0,0 @@
-// SPDX-FileCopyrightText: Copyright 2024 yuzu Emulator Project
-// SPDX-License-Identifier: GPL-3.0-or-later
-
-#include "core/hle/service/bcat/bcat_types.h"
-#include "core/hle/service/bcat/delivery_cache_progress_service.h"
-#include "core/hle/service/cmif_serialization.h"
-
-namespace Service::BCAT {
-
-IDeliveryCacheProgressService::IDeliveryCacheProgressService(Core::System& system_,
-                                                             Kernel::KReadableEvent& event_,
-                                                             const DeliveryCacheProgressImpl& impl_)
-    : ServiceFramework{system_, "IDeliveryCacheProgressService"}, event{event_}, impl{impl_} {
-    // clang-format off
-    static const FunctionInfo functions[] = {
-        {0, D<&IDeliveryCacheProgressService::GetEvent>, "Get"},
-        {1, D<&IDeliveryCacheProgressService::GetImpl>, "Get"},
-    };
-    // clang-format on
-
-    RegisterHandlers(functions);
-}
-
-IDeliveryCacheProgressService::~IDeliveryCacheProgressService() = default;
-
-Result IDeliveryCacheProgressService::GetEvent(OutCopyHandle<Kernel::KReadableEvent> out_event) {
-    LOG_DEBUG(Service_BCAT, "called");
-
-    *out_event = &event;
-    R_SUCCEED();
-}
-
-Result IDeliveryCacheProgressService::GetImpl(
-    OutLargeData<DeliveryCacheProgressImpl, BufferAttr_HipcPointer> out_impl) {
-    LOG_DEBUG(Service_BCAT, "called");
-
-    *out_impl = impl;
-    R_SUCCEED();
-}
-
-} // namespace Service::BCAT
--- a/src/core/hle/service/bcat/delivery_cache_progress_service.h
+++ b/src/core/hle/service/bcat/delivery_cache_progress_service.h
@ -1,35 +0,0 @@
-// SPDX-FileCopyrightText: Copyright 2024 yuzu Emulator Project
-// SPDX-License-Identifier: GPL-3.0-or-later
-
-#pragma once
-
-#include "core/hle/service/cmif_types.h"
-#include "core/hle/service/service.h"
-
-namespace Core {
-class System;
-}
-
-namespace Kernel {
-class KEvent;
-class KReadableEvent;
-} // namespace Kernel
-
-namespace Service::BCAT {
-struct DeliveryCacheProgressImpl;
-
-class IDeliveryCacheProgressService final : public ServiceFramework<IDeliveryCacheProgressService> {
-public:
-    explicit IDeliveryCacheProgressService(Core::System& system_, Kernel::KReadableEvent& event_,
-                                           const DeliveryCacheProgressImpl& impl_);
-    ~IDeliveryCacheProgressService() override;
-
-private:
-    Result GetEvent(OutCopyHandle<Kernel::KReadableEvent> out_event);
-    Result GetImpl(OutLargeData<DeliveryCacheProgressImpl, BufferAttr_HipcPointer> out_impl);
-
-    Kernel::KReadableEvent& event;
-    const DeliveryCacheProgressImpl& impl;
-};
-
-} // namespace Service::BCAT
--- a/src/core/hle/service/bcat/delivery_cache_storage_service.cpp
+++ b/src/core/hle/service/bcat/delivery_cache_storage_service.cpp
@ -1,57 +0,0 @@
-// SPDX-FileCopyrightText: Copyright 2024 yuzu Emulator Project
-// SPDX-License-Identifier: GPL-3.0-or-later
-
-#include "core/hle/service/bcat/bcat_result.h"
-#include "core/hle/service/bcat/delivery_cache_directory_service.h"
-#include "core/hle/service/bcat/delivery_cache_file_service.h"
-#include "core/hle/service/bcat/delivery_cache_storage_service.h"
-#include "core/hle/service/cmif_serialization.h"
-
-namespace Service::BCAT {
-
-IDeliveryCacheStorageService::IDeliveryCacheStorageService(Core::System& system_,
-                                                           FileSys::VirtualDir root_)
-    : ServiceFramework{system_, "IDeliveryCacheStorageService"}, root(std::move(root_)) {
-    // clang-format off
-    static const FunctionInfo functions[] = {
-        {0, D<&IDeliveryCacheStorageService::CreateFileService>, "CreateFileService"},
-        {1, D<&IDeliveryCacheStorageService::CreateDirectoryService>, "CreateDirectoryService"},
-        {10, D<&IDeliveryCacheStorageService::EnumerateDeliveryCacheDirectory>, "EnumerateDeliveryCacheDirectory"},
-    };
-    // clang-format on
-
-    RegisterHandlers(functions);
-}
-
-IDeliveryCacheStorageService::~IDeliveryCacheStorageService() = default;
-
-Result IDeliveryCacheStorageService::CreateFileService(
-    OutInterface<IDeliveryCacheFileService> out_interface) {
-    LOG_DEBUG(Service_BCAT, "called");
-
-    *out_interface = std::make_shared<IDeliveryCacheFileService>(system, root);
-    R_SUCCEED();
-}
-
-Result IDeliveryCacheStorageService::CreateDirectoryService(
-    OutInterface<IDeliveryCacheDirectoryService> out_interface) {
-    LOG_DEBUG(Service_BCAT, "called");
-
-    *out_interface = std::make_shared<IDeliveryCacheDirectoryService>(system, root);
-    R_SUCCEED();
-}
-
-Result IDeliveryCacheStorageService::EnumerateDeliveryCacheDirectory(
-    Out<s32> out_directory_count,
-    OutArray<DirectoryName, BufferAttr_HipcMapAlias> out_directories) {
-    LOG_DEBUG(Service_BCAT, "called, size={:016X}", out_directories.size());
-
-    *out_directory_count =
-        static_cast<s32>(std::min(out_directories.size(), entries.size() - next_read_index));
-    memcpy(out_directories.data(), entries.data() + next_read_index,
-           *out_directory_count * sizeof(DirectoryName));
-    next_read_index += *out_directory_count;
-    R_SUCCEED();
-}
-
-} // namespace Service::BCAT
--- a/src/core/hle/service/bcat/delivery_cache_storage_service.h
+++ b/src/core/hle/service/bcat/delivery_cache_storage_service.h
@ -1,36 +0,0 @@
-// SPDX-FileCopyrightText: Copyright 2024 yuzu Emulator Project
-// SPDX-License-Identifier: GPL-3.0-or-later
-
-#pragma once
-
-#include "core/file_sys/vfs/vfs.h"
-#include "core/hle/service/bcat/bcat_types.h"
-#include "core/hle/service/cmif_types.h"
-#include "core/hle/service/service.h"
-
-namespace Core {
-class System;
-}
-
-namespace Service::BCAT {
-class IDeliveryCacheFileService;
-class IDeliveryCacheDirectoryService;
-
-class IDeliveryCacheStorageService final : public ServiceFramework<IDeliveryCacheStorageService> {
-public:
-    explicit IDeliveryCacheStorageService(Core::System& system_, FileSys::VirtualDir root_);
-    ~IDeliveryCacheStorageService() override;
-
-private:
-    Result CreateFileService(OutInterface<IDeliveryCacheFileService> out_interface);
-    Result CreateDirectoryService(OutInterface<IDeliveryCacheDirectoryService> out_interface);
-    Result EnumerateDeliveryCacheDirectory(
-        Out<s32> out_directory_count,
-        OutArray<DirectoryName, BufferAttr_HipcMapAlias> out_directories);
-
-    FileSys::VirtualDir root;
-    std::vector<DirectoryName> entries;
-    std::size_t next_read_index = 0;
-};
-
-} // namespace Service::BCAT
--- a/src/core/hle/service/bcat/news/newly_arrived_event_holder.cpp
+++ b/src/core/hle/service/bcat/news/newly_arrived_event_holder.cpp
@ -1,34 +0,0 @@
-// SPDX-FileCopyrightText: Copyright 2024 yuzu Emulator Project
-// SPDX-License-Identifier: GPL-3.0-or-later
-
-#include "core/hle/service/bcat/news/newly_arrived_event_holder.h"
-#include "core/hle/service/cmif_serialization.h"
-
-namespace Service::News {
-
-INewlyArrivedEventHolder::INewlyArrivedEventHolder(Core::System& system_)
-    : ServiceFramework{system_, "INewlyArrivedEventHolder"}, service_context{
-                                                                 system_,
-                                                                 "INewlyArrivedEventHolder"} {
-    // clang-format off
-    static const FunctionInfo functions[] = {
-        {0, C<&INewlyArrivedEventHolder::Get>, "Get"},
-    };
-    // clang-format on
-
-    RegisterHandlers(functions);
-    arrived_event = service_context.CreateEvent("INewlyArrivedEventHolder::ArrivedEvent");
-}
-
-INewlyArrivedEventHolder::~INewlyArrivedEventHolder() {
-    service_context.CloseEvent(arrived_event);
-}
-
-Result INewlyArrivedEventHolder::Get(OutCopyHandle<Kernel::KReadableEvent> out_event) {
-    LOG_INFO(Service_BCAT, "called");
-
-    *out_event = &arrived_event->GetReadableEvent();
-    R_SUCCEED();
-}
-
-} // namespace Service::News
--- a/src/core/hle/service/bcat/news/newly_arrived_event_holder.h
+++ b/src/core/hle/service/bcat/news/newly_arrived_event_holder.h
@ -1,33 +0,0 @@
-// SPDX-FileCopyrightText: Copyright 2024 yuzu Emulator Project
-// SPDX-License-Identifier: GPL-3.0-or-later
-
-#pragma once
-
-#include "core/hle/service/cmif_types.h"
-#include "core/hle/service/kernel_helpers.h"
-#include "core/hle/service/service.h"
-
-namespace Core {
-class System;
-}
-
-namespace Kernel {
-class KEvent;
-class KReadableEvent;
-} // namespace Kernel
-
-namespace Service::News {
-
-class INewlyArrivedEventHolder final : public ServiceFramework<INewlyArrivedEventHolder> {
-public:
-    explicit INewlyArrivedEventHolder(Core::System& system_);
-    ~INewlyArrivedEventHolder() override;
-
-private:
-    Result Get(OutCopyHandle<Kernel::KReadableEvent> out_event);
-
-    Kernel::KEvent* arrived_event;
-    KernelHelpers::ServiceContext service_context;
-};
-
-} // namespace Service::News
--- a/src/core/hle/service/bcat/news/news_data_service.cpp
+++ b/src/core/hle/service/bcat/news/news_data_service.cpp
@ -1,25 +0,0 @@
-// SPDX-FileCopyrightText: Copyright 2024 yuzu Emulator Project
-// SPDX-License-Identifier: GPL-3.0-or-later
-
-#include "core/hle/service/bcat/news/news_data_service.h"
-
-namespace Service::News {
-
-INewsDataService::INewsDataService(Core::System& system_)
-    : ServiceFramework{system_, "INewsDataService"} {
-    // clang-format off
-    static const FunctionInfo functions[] = {
-        {0, nullptr, "Open"},
-        {1, nullptr, "OpenWithNewsRecordV1"},
-        {2, nullptr, "Read"},
-        {3, nullptr, "GetSize"},
-        {1001, nullptr, "OpenWithNewsRecord"},
-    };
-    // clang-format on
-
-    RegisterHandlers(functions);
-}
-
-INewsDataService::~INewsDataService() = default;
-
-} // namespace Service::News
--- a/src/core/hle/service/bcat/news/news_data_service.h
+++ b/src/core/hle/service/bcat/news/news_data_service.h
@ -1,20 +0,0 @@
-// SPDX-FileCopyrightText: Copyright 2024 yuzu Emulator Project
-// SPDX-License-Identifier: GPL-3.0-or-later
-
-#pragma once
-
-#include "core/hle/service/service.h"
-
-namespace Core {
-class System;
-}
-
-namespace Service::News {
-
-class INewsDataService final : public ServiceFramework<INewsDataService> {
-public:
-    explicit INewsDataService(Core::System& system_);
-    ~INewsDataService() override;
-};
-
-} // namespace Service::News
--- a/src/core/hle/service/bcat/news/news_database_service.cpp
+++ b/src/core/hle/service/bcat/news/news_database_service.cpp
@ -1,35 +0,0 @@
-// SPDX-FileCopyrightText: Copyright 2024 yuzu Emulator Project
-// SPDX-License-Identifier: GPL-3.0-or-later
-
-#include "core/hle/service/bcat/news/news_database_service.h"
-#include "core/hle/service/cmif_serialization.h"
-
-namespace Service::News {
-
-INewsDatabaseService::INewsDatabaseService(Core::System& system_)
-    : ServiceFramework{system_, "INewsDatabaseService"} {
-    // clang-format off
-    static const FunctionInfo functions[] = {
-        {0, nullptr, "GetListV1"},
-        {1, C<&INewsDatabaseService::Count>, "Count"},
-        {2, nullptr, "CountWithKey"},
-        {3, nullptr, "UpdateIntegerValue"},
-        {4, nullptr, "UpdateIntegerValueWithAddition"},
-        {5, nullptr, "UpdateStringValue"},
-        {1000, nullptr, "GetList"},
-    };
-    // clang-format on
-
-    RegisterHandlers(functions);
-}
-
-INewsDatabaseService::~INewsDatabaseService() = default;
-
-Result INewsDatabaseService::Count(Out<s32> out_count,
-                                   InBuffer<BufferAttr_HipcPointer> buffer_data) {
-    LOG_WARNING(Service_BCAT, "(STUBBED) called, buffer_size={}", buffer_data.size());
-    *out_count = 0;
-    R_SUCCEED();
-}
-
-} // namespace Service::News
--- a/src/core/hle/service/bcat/news/news_database_service.h
+++ b/src/core/hle/service/bcat/news/news_database_service.h
@ -1,24 +0,0 @@
-// SPDX-FileCopyrightText: Copyright 2024 yuzu Emulator Project
-// SPDX-License-Identifier: GPL-3.0-or-later
-
-#pragma once
-
-#include "core/hle/service/cmif_types.h"
-#include "core/hle/service/service.h"
-
-namespace Core {
-class System;
-}
-
-namespace Service::News {
-
-class INewsDatabaseService final : public ServiceFramework<INewsDatabaseService> {
-public:
-    explicit INewsDatabaseService(Core::System& system_);
-    ~INewsDatabaseService() override;
-
-private:
-    Result Count(Out<s32> out_count, InBuffer<BufferAttr_HipcPointer> buffer_data);
-};
-
-} // namespace Service::News
--- a/src/core/hle/service/bcat/news/news_service.cpp
+++ b/src/core/hle/service/bcat/news/news_service.cpp
@ -1,46 +0,0 @@
-// SPDX-FileCopyrightText: Copyright 2024 yuzu Emulator Project
-// SPDX-License-Identifier: GPL-3.0-or-later
-
-#include "core/hle/service/bcat/news/news_service.h"
-#include "core/hle/service/cmif_serialization.h"
-
-namespace Service::News {
-
-INewsService::INewsService(Core::System& system_) : ServiceFramework{system_, "INewsService"} {
-    // clang-format off
-    static const FunctionInfo functions[] = {
-        {10100, nullptr, "PostLocalNews"},
-        {20100, nullptr, "SetPassphrase"},
-        {30100, C<&INewsService::GetSubscriptionStatus>, "GetSubscriptionStatus"},
-        {30101, nullptr, "GetTopicList"},
-        {30110, nullptr, "Unknown30110"},
-        {30200, nullptr, "IsSystemUpdateRequired"},
-        {30201, nullptr, "Unknown30201"},
-        {30210, nullptr, "Unknown30210"},
-        {30300, nullptr, "RequestImmediateReception"},
-        {30400, nullptr, "DecodeArchiveFile"},
-        {30500, nullptr, "Unknown30500"},
-        {30900, nullptr, "Unknown30900"},
-        {30901, nullptr, "Unknown30901"},
-        {30902, nullptr, "Unknown30902"},
-        {40100, nullptr, "SetSubscriptionStatus"},
-        {40101, nullptr, "RequestAutoSubscription"},
-        {40200, nullptr, "ClearStorage"},
-        {40201, nullptr, "ClearSubscriptionStatusAll"},
-        {90100, nullptr, "GetNewsDatabaseDump"},
-    };
-    // clang-format on
-
-    RegisterHandlers(functions);
-}
-
-INewsService::~INewsService() = default;
-
-Result INewsService::GetSubscriptionStatus(Out<u32> out_status,
-                                           InBuffer<BufferAttr_HipcPointer> buffer_data) {
-    LOG_WARNING(Service_BCAT, "(STUBBED) called, buffer_size={}", buffer_data.size());
-    *out_status = 0;
-    R_SUCCEED();
-}
-
-} // namespace Service::News
--- a/src/core/hle/service/bcat/news/news_service.h
+++ b/src/core/hle/service/bcat/news/news_service.h
@ -1,24 +0,0 @@
-// SPDX-FileCopyrightText: Copyright 2024 yuzu Emulator Project
-// SPDX-License-Identifier: GPL-3.0-or-later
-
-#pragma once
-
-#include "core/hle/service/cmif_types.h"
-#include "core/hle/service/service.h"
-
-namespace Core {
-class System;
-}
-
-namespace Service::News {
-
-class INewsService final : public ServiceFramework<INewsService> {
-public:
-    explicit INewsService(Core::System& system_);
-    ~INewsService() override;
-
-private:
-    Result GetSubscriptionStatus(Out<u32> out_status, InBuffer<BufferAttr_HipcPointer> buffer_data);
-};
-
-} // namespace Service::News
--- a/src/core/hle/service/bcat/news/overwrite_event_holder.cpp
+++ b/src/core/hle/service/bcat/news/overwrite_event_holder.cpp
@ -1,33 +0,0 @@
-// SPDX-FileCopyrightText: Copyright 2024 yuzu Emulator Project
-// SPDX-License-Identifier: GPL-3.0-or-later
-
-#include "core/hle/service/bcat/news/overwrite_event_holder.h"
-#include "core/hle/service/cmif_serialization.h"
-
-namespace Service::News {
-
-IOverwriteEventHolder::IOverwriteEventHolder(Core::System& system_)
-    : ServiceFramework{system_, "IOverwriteEventHolder"}, service_context{system_,
-                                                                          "IOverwriteEventHolder"} {
-    // clang-format off
-    static const FunctionInfo functions[] = {
-        {0, C<&IOverwriteEventHolder::Get>, "Get"},
-    };
-    // clang-format on
-
-    RegisterHandlers(functions);
-    overwrite_event = service_context.CreateEvent("IOverwriteEventHolder::OverwriteEvent");
-}
-
-IOverwriteEventHolder::~IOverwriteEventHolder() {
-    service_context.CloseEvent(overwrite_event);
-}
-
-Result IOverwriteEventHolder::Get(OutCopyHandle<Kernel::KReadableEvent> out_event) {
-    LOG_INFO(Service_BCAT, "called");
-
-    *out_event = &overwrite_event->GetReadableEvent();
-    R_SUCCEED();
-}
-
-} // namespace Service::News
--- a/src/core/hle/service/bcat/news/overwrite_event_holder.h
+++ b/src/core/hle/service/bcat/news/overwrite_event_holder.h
@ -1,33 +0,0 @@
-// SPDX-FileCopyrightText: Copyright 2024 yuzu Emulator Project
-// SPDX-License-Identifier: GPL-3.0-or-later
-
-#pragma once
-
-#include "core/hle/service/cmif_types.h"
-#include "core/hle/service/kernel_helpers.h"
-#include "core/hle/service/service.h"
-
-namespace Core {
-class System;
-}
-
-namespace Kernel {
-class KEvent;
-class KReadableEvent;
-} // namespace Kernel
-
-namespace Service::News {
-
-class IOverwriteEventHolder final : public ServiceFramework<IOverwriteEventHolder> {
-public:
-    explicit IOverwriteEventHolder(Core::System& system_);
-    ~IOverwriteEventHolder() override;
-
-private:
-    Result Get(OutCopyHandle<Kernel::KReadableEvent> out_event);
-
-    Kernel::KEvent* overwrite_event;
-    KernelHelpers::ServiceContext service_context;
-};
-
-} // namespace Service::News
--- a/src/core/hle/service/bcat/news/service_creator.cpp
+++ b/src/core/hle/service/bcat/news/service_creator.cpp
@ -1,64 +0,0 @@
-// SPDX-FileCopyrightText: Copyright 2024 yuzu Emulator Project
-// SPDX-License-Identifier: GPL-3.0-or-later
-
-#include "core/hle/service/bcat/news/newly_arrived_event_holder.h"
-#include "core/hle/service/bcat/news/news_data_service.h"
-#include "core/hle/service/bcat/news/news_database_service.h"
-#include "core/hle/service/bcat/news/news_service.h"
-#include "core/hle/service/bcat/news/overwrite_event_holder.h"
-#include "core/hle/service/bcat/news/service_creator.h"
-#include "core/hle/service/cmif_serialization.h"
-
-namespace Service::News {
-
-IServiceCreator::IServiceCreator(Core::System& system_, u32 permissions_, const char* name_)
-    : ServiceFramework{system_, name_}, permissions{permissions_} {
-    // clang-format off
-    static const FunctionInfo functions[] = {
-        {0, C<&IServiceCreator::CreateNewsService>, "CreateNewsService"},
-        {1, C<&IServiceCreator::CreateNewlyArrivedEventHolder>, "CreateNewlyArrivedEventHolder"},
-        {2, C<&IServiceCreator::CreateNewsDataService>, "CreateNewsDataService"},
-        {3, C<&IServiceCreator::CreateNewsDatabaseService>, "CreateNewsDatabaseService"},
-        {4, C<&IServiceCreator::CreateOverwriteEventHolder>, "CreateOverwriteEventHolder"},
-    };
-    // clang-format on
-
-    RegisterHandlers(functions);
-}
-
-IServiceCreator::~IServiceCreator() = default;
-
-Result IServiceCreator::CreateNewsService(OutInterface<INewsService> out_interface) {
-    LOG_INFO(Service_BCAT, "called");
-    *out_interface = std::make_shared<INewsService>(system);
-    R_SUCCEED();
-}
-
-Result IServiceCreator::CreateNewlyArrivedEventHolder(
-    OutInterface<INewlyArrivedEventHolder> out_interface) {
-    LOG_INFO(Service_BCAT, "called");
-    *out_interface = std::make_shared<INewlyArrivedEventHolder>(system);
-    R_SUCCEED();
-}
-
-Result IServiceCreator::CreateNewsDataService(OutInterface<INewsDataService> out_interface) {
-    LOG_INFO(Service_BCAT, "called");
-    *out_interface = std::make_shared<INewsDataService>(system);
-    R_SUCCEED();
-}
-
-Result IServiceCreator::CreateNewsDatabaseService(
-    OutInterface<INewsDatabaseService> out_interface) {
-    LOG_INFO(Service_BCAT, "called");
-    *out_interface = std::make_shared<INewsDatabaseService>(system);
-    R_SUCCEED();
-}
-
-Result IServiceCreator::CreateOverwriteEventHolder(
-    OutInterface<IOverwriteEventHolder> out_interface) {
-    LOG_INFO(Service_BCAT, "called");
-    *out_interface = std::make_shared<IOverwriteEventHolder>(system);
-    R_SUCCEED();
-}
-
-} // namespace Service::News
--- a/src/core/hle/service/bcat/news/service_creator.h
+++ b/src/core/hle/service/bcat/news/service_creator.h
@ -1,35 +0,0 @@
-// SPDX-FileCopyrightText: Copyright 2024 yuzu Emulator Project
-// SPDX-License-Identifier: GPL-3.0-or-later
-
-#pragma once
-
-#include "core/hle/service/cmif_types.h"
-#include "core/hle/service/service.h"
-
-namespace Core {
-class System;
-}
-
-namespace Service::News {
-class INewsService;
-class INewlyArrivedEventHolder;
-class INewsDataService;
-class INewsDatabaseService;
-class IOverwriteEventHolder;
-
-class IServiceCreator final : public ServiceFramework<IServiceCreator> {
-public:
-    explicit IServiceCreator(Core::System& system_, u32 permissions_, const char* name_);
-    ~IServiceCreator() override;
-
-private:
-    Result CreateNewsService(OutInterface<INewsService> out_interface);
-    Result CreateNewlyArrivedEventHolder(OutInterface<INewlyArrivedEventHolder> out_interface);
-    Result CreateNewsDataService(OutInterface<INewsDataService> out_interface);
-    Result CreateNewsDatabaseService(OutInterface<INewsDatabaseService> out_interface);
-    Result CreateOverwriteEventHolder(OutInterface<IOverwriteEventHolder> out_interface);
-
-    u32 permissions;
-};
-
-} // namespace Service::News
--- a/src/core/hle/service/bcat/service_creator.cpp
+++ b/src/core/hle/service/bcat/service_creator.cpp
@ -1,62 +0,0 @@
-// SPDX-FileCopyrightText: Copyright 2018 yuzu Emulator Project
-// SPDX-License-Identifier: GPL-2.0-or-later
-
-#include "core/hle/service/bcat/bcat_service.h"
-#include "core/hle/service/bcat/delivery_cache_storage_service.h"
-#include "core/hle/service/bcat/service_creator.h"
-#include "core/hle/service/cmif_serialization.h"
-#include "core/hle/service/filesystem/filesystem.h"
-
-namespace Service::BCAT {
-
-std::unique_ptr<BcatBackend> CreateBackendFromSettings([[maybe_unused]] Core::System& system,
-                                                       DirectoryGetter getter) {
-    return std::make_unique<NullBcatBackend>(std::move(getter));
-}
-
-IServiceCreator::IServiceCreator(Core::System& system_, const char* name_)
-    : ServiceFramework{system_, name_}, fsc{system.GetFileSystemController()} {
-    // clang-format off
-    static const FunctionInfo functions[] = {
-        {0, D<&IServiceCreator::CreateBcatService>, "CreateBcatService"},
-        {1, D<&IServiceCreator::CreateDeliveryCacheStorageService>, "CreateDeliveryCacheStorageService"},
-        {2, D<&IServiceCreator::CreateDeliveryCacheStorageServiceWithApplicationId>, "CreateDeliveryCacheStorageServiceWithApplicationId"},
-        {3, nullptr, "CreateDeliveryCacheProgressService"},
-        {4, nullptr, "CreateDeliveryCacheProgressServiceWithApplicationId"},
-    };
-    // clang-format on
-
-    RegisterHandlers(functions);
-
-    backend =
-        CreateBackendFromSettings(system_, [this](u64 tid) { return fsc.GetBCATDirectory(tid); });
-}
-
-IServiceCreator::~IServiceCreator() = default;
-
-Result IServiceCreator::CreateBcatService(ClientProcessId process_id,
-                                          OutInterface<IBcatService> out_interface) {
-    LOG_INFO(Service_BCAT, "called, process_id={}", process_id.pid);
-    *out_interface = std::make_shared<IBcatService>(system, *backend);
-    R_SUCCEED();
-}
-
-Result IServiceCreator::CreateDeliveryCacheStorageService(
-    ClientProcessId process_id, OutInterface<IDeliveryCacheStorageService> out_interface) {
-    LOG_INFO(Service_BCAT, "called, process_id={}", process_id.pid);
-
-    const auto title_id = system.GetApplicationProcessProgramID();
-    *out_interface =
-        std::make_shared<IDeliveryCacheStorageService>(system, fsc.GetBCATDirectory(title_id));
-    R_SUCCEED();
-}
-
-Result IServiceCreator::CreateDeliveryCacheStorageServiceWithApplicationId(
-    u64 application_id, OutInterface<IDeliveryCacheStorageService> out_interface) {
-    LOG_DEBUG(Service_BCAT, "called, application_id={:016X}", application_id);
-    *out_interface = std::make_shared<IDeliveryCacheStorageService>(
-        system, fsc.GetBCATDirectory(application_id));
-    R_SUCCEED();
-}
-
-} // namespace Service::BCAT
--- a/src/core/hle/service/bcat/service_creator.h
+++ b/src/core/hle/service/bcat/service_creator.h
@ -1,40 +0,0 @@
-// SPDX-FileCopyrightText: Copyright 2024 yuzu Emulator Project
-// SPDX-License-Identifier: GPL-3.0-or-later
-
-#pragma once
-
-#include "core/hle/service/cmif_types.h"
-#include "core/hle/service/service.h"
-
-namespace Core {
-class System;
-}
-
-namespace Service::FileSystem {
-class FileSystemController;
-}
-
-namespace Service::BCAT {
-class BcatBackend;
-class IBcatService;
-class IDeliveryCacheStorageService;
-
-class IServiceCreator final : public ServiceFramework<IServiceCreator> {
-public:
-    explicit IServiceCreator(Core::System& system_, const char* name_);
-    ~IServiceCreator() override;
-
-private:
-    Result CreateBcatService(ClientProcessId process_id, OutInterface<IBcatService> out_interface);
-
-    Result CreateDeliveryCacheStorageService(
-        ClientProcessId process_id, OutInterface<IDeliveryCacheStorageService> out_interface);
-
-    Result CreateDeliveryCacheStorageServiceWithApplicationId(
-        u64 application_id, OutInterface<IDeliveryCacheStorageService> out_interface);
-
-    std::unique_ptr<BcatBackend> backend;
-    Service::FileSystem::FileSystemController& fsc;
-};
-
-} // namespace Service::BCAT
--- a/src/core/hle/service/cmif_types.h
+++ b/src/core/hle/service/cmif_types.h
@ -270,7 +270,7 @@ class OutLargeData {
 public:
    static_assert(std::is_trivially_copyable_v<T>, "LargeData type must be trivially copyable");
    static_assert((A & BufferAttr_In) == 0, "OutLargeData attr must not be In");
-    static constexpr BufferAttr Attr = static_cast<BufferAttr>(A | BufferAttr_Out | BufferAttr_FixedSize);
+    static constexpr BufferAttr Attr = static_cast<BufferAttr>(A | BufferAttr_In | BufferAttr_FixedSize);
    using Type = T;

    /* implicit */ OutLargeData(const OutLargeData& t) : raw(t.raw) {}
--- a/src/core/hle/service/os/event.cpp
+++ b/src/core/hle/service/os/event.cpp
@ -2,8 +2,8 @@
 // SPDX-License-Identifier: GPL-2.0-or-later

 #include "core/hle/kernel/k_event.h"
+#include "core/hle/service/event.h"
 #include "core/hle/service/kernel_helpers.h"
-#include "core/hle/service/os/event.h"

 namespace Service {

--- a/src/core/hle/service/os/event.h
+++ b/src/core/hle/service/os/event.h
--- a/src/core/hle/service/glue/time/worker.cpp
+++ b/src/core/hle/service/glue/time/worker.cpp
@ -7,7 +7,6 @@
 #include "core/hle/service/glue/time/file_timestamp_worker.h"
 #include "core/hle/service/glue/time/standard_steady_clock_resource.h"
 #include "core/hle/service/glue/time/worker.h"
-#include "core/hle/service/os/multi_wait_utils.h"
 #include "core/hle/service/psc/time/common.h"
 #include "core/hle/service/psc/time/service_manager.h"
 #include "core/hle/service/psc/time/static.h"
@ -144,46 +143,82 @@ void TimeWorker::ThreadFunc(std::stop_token stop_token) {
    Common::SetCurrentThreadName("TimeWorker");
    Common::SetCurrentThreadPriority(Common::ThreadPriority::Low);

+    enum class EventType {
+        Exit = 0,
+        IpmModuleService_GetEvent = 1,
+        PowerStateChange = 2,
+        SignalAlarms = 3,
+        UpdateLocalSystemClock = 4,
+        UpdateNetworkSystemClock = 5,
+        UpdateEphemeralSystemClock = 6,
+        UpdateSteadyClock = 7,
+        UpdateFileTimestamp = 8,
+        AutoCorrect = 9,
+        Max = 10,
+    };
+
+    s32 num_objs{};
+    std::array<Kernel::KSynchronizationObject*, static_cast<u32>(EventType::Max)> wait_objs{};
+    std::array<EventType, static_cast<u32>(EventType::Max)> wait_indices{};
+
+    const auto AddWaiter{
+        [&](Kernel::KSynchronizationObject* synchronization_object, EventType type) {
+            // Open a new reference to the object.
+            synchronization_object->Open();
+
+            // Insert into the list.
+            wait_indices[num_objs] = type;
+            wait_objs[num_objs++] = synchronization_object;
+        }};
+
    while (!stop_token.stop_requested()) {
-        enum class EventType : s32 {
-            Exit = 0,
-            PowerStateChange = 1,
-            SignalAlarms = 2,
-            UpdateLocalSystemClock = 3,
-            UpdateNetworkSystemClock = 4,
-            UpdateEphemeralSystemClock = 5,
-            UpdateSteadyClock = 6,
-            UpdateFileTimestamp = 7,
-            AutoCorrect = 8,
-        };
-
-        s32 index{};
+        SCOPE_EXIT({
+            for (s32 i = 0; i < num_objs; i++) {
+                wait_objs[i]->Close();
+            }
+        });

+        num_objs = {};
+        wait_objs = {};
        if (m_pm_state_change_handler.m_priority != 0) {
-            // TODO: gIPmModuleService::GetEvent() 1
-            index = WaitAny(m_system.Kernel(),
-                            &m_event->GetReadableEvent(), // 0
-                            &m_alarm_worker.GetEvent()    // 1
-            );
+            AddWaiter(&m_event->GetReadableEvent(), EventType::Exit);
+            // TODO
+            // AddWaiter(gIPmModuleService::GetEvent(), 1);
+            AddWaiter(&m_alarm_worker.GetEvent(), EventType::PowerStateChange);
        } else {
-            // TODO: gIPmModuleService::GetEvent() 1
-            index = WaitAny(m_system.Kernel(),
-                            &m_event->GetReadableEvent(),                       // 0
-                            &m_alarm_worker.GetEvent(),                         // 1
-                            &m_alarm_worker.GetTimerEvent().GetReadableEvent(), // 2
-                            m_local_clock_event,                                // 3
-                            m_network_clock_event,                              // 4
-                            m_ephemeral_clock_event,                            // 5
-                            &m_timer_steady_clock->GetReadableEvent(),          // 6
-                            &m_timer_file_system->GetReadableEvent(),           // 7
-                            m_standard_user_auto_correct_clock_event            // 8
-            );
+            AddWaiter(&m_event->GetReadableEvent(), EventType::Exit);
+            // TODO
+            // AddWaiter(gIPmModuleService::GetEvent(), 1);
+            AddWaiter(&m_alarm_worker.GetEvent(), EventType::PowerStateChange);
+            AddWaiter(&m_alarm_worker.GetTimerEvent().GetReadableEvent(), EventType::SignalAlarms);
+            AddWaiter(m_local_clock_event, EventType::UpdateLocalSystemClock);
+            AddWaiter(m_network_clock_event, EventType::UpdateNetworkSystemClock);
+            AddWaiter(m_ephemeral_clock_event, EventType::UpdateEphemeralSystemClock);
+            AddWaiter(&m_timer_steady_clock->GetReadableEvent(), EventType::UpdateSteadyClock);
+            AddWaiter(&m_timer_file_system->GetReadableEvent(), EventType::UpdateFileTimestamp);
+            AddWaiter(m_standard_user_auto_correct_clock_event, EventType::AutoCorrect);
        }

-        switch (static_cast<EventType>(index)) {
+        s32 out_index{-1};
+        Kernel::KSynchronizationObject::Wait(m_system.Kernel(), &out_index, wait_objs.data(),
+                                             num_objs, -1);
+        ASSERT(out_index >= 0 && out_index < num_objs);
+
+        if (stop_token.stop_requested()) {
+            return;
+        }
+
+        switch (wait_indices[out_index]) {
        case EventType::Exit:
            return;

+        case EventType::IpmModuleService_GetEvent:
+            // TODO
+            // IPmModuleService::GetEvent()
+            // clear the event
+            // Handle power state change event
+            break;
+
        case EventType::PowerStateChange:
            m_alarm_worker.GetEvent().Clear();
            if (m_pm_state_change_handler.m_priority <= 1) {
@ -200,19 +235,19 @@ void TimeWorker::ThreadFunc(std::stop_token stop_token) {
            m_local_clock_event->Clear();

            Service::PSC::Time::SystemClockContext context{};
-            R_ASSERT(m_local_clock->GetSystemClockContext(&context));
+            auto res = m_local_clock->GetSystemClockContext(&context);
+            ASSERT(res == ResultSuccess);

            m_set_sys->SetUserSystemClockContext(context);
+
            m_file_timestamp_worker.SetFilesystemPosixTime();
-            break;
-        }
+        } break;

        case EventType::UpdateNetworkSystemClock: {
            m_network_clock_event->Clear();
-
            Service::PSC::Time::SystemClockContext context{};
-            R_ASSERT(m_network_clock->GetSystemClockContext(&context));
-
+            auto res = m_network_clock->GetSystemClockContext(&context);
+            ASSERT(res == ResultSuccess);
            m_set_sys->SetNetworkSystemClockContext(context);

            s64 time{};
@ -232,8 +267,7 @@ void TimeWorker::ThreadFunc(std::stop_token stop_token) {
            }

            m_file_timestamp_worker.SetFilesystemPosixTime();
-            break;
-        }
+        } break;

        case EventType::UpdateEphemeralSystemClock: {
            m_ephemeral_clock_event->Clear();
@ -261,8 +295,7 @@ void TimeWorker::ThreadFunc(std::stop_token stop_token) {
            if (!g_ig_report_ephemeral_clock_context_set) {
                g_ig_report_ephemeral_clock_context_set = true;
            }
-            break;
-        }
+        } break;

        case EventType::UpdateSteadyClock:
            m_timer_steady_clock->Clear();
@ -281,20 +314,21 @@ void TimeWorker::ThreadFunc(std::stop_token stop_token) {
            m_standard_user_auto_correct_clock_event->Clear();

            bool automatic_correction{};
-            R_ASSERT(m_time_sm->IsStandardUserSystemClockAutomaticCorrectionEnabled(
-                &automatic_correction));
+            auto res = m_time_sm->IsStandardUserSystemClockAutomaticCorrectionEnabled(
+                &automatic_correction);
+            ASSERT(res == ResultSuccess);

            Service::PSC::Time::SteadyClockTimePoint time_point{};
-            R_ASSERT(
-                m_time_sm->GetStandardUserSystemClockAutomaticCorrectionUpdatedTime(&time_point));
+            res = m_time_sm->GetStandardUserSystemClockAutomaticCorrectionUpdatedTime(&time_point);
+            ASSERT(res == ResultSuccess);

            m_set_sys->SetUserSystemClockAutomaticCorrectionEnabled(automatic_correction);
            m_set_sys->SetUserSystemClockAutomaticCorrectionUpdatedTime(time_point);
-            break;
-        }
+        } break;

        default:
            UNREACHABLE();
+            break;
        }
    }
 }
--- a/src/core/hle/service/hid/hid_system_server.cpp
+++ b/src/core/hle/service/hid/hid_system_server.cpp
@ -508,8 +508,13 @@ void IHidSystemServer::RegisterAppletResourceUserId(HLERequestContext& ctx) {
    Result result = GetResourceManager()->RegisterAppletResourceUserId(
        parameters.applet_resource_user_id, parameters.enable_input);

+    if (result.IsSuccess()) {
+        // result = GetResourceManager()->GetNpad()->RegisterAppletResourceUserId(
+        //     parameters.applet_resource_user_id);
+    }
+
    IPC::ResponseBuilder rb{ctx, 2};
-    rb.Push(result);
+    rb.Push(ResultSuccess);
 }

 void IHidSystemServer::UnregisterAppletResourceUserId(HLERequestContext& ctx) {
@ -519,6 +524,8 @@ void IHidSystemServer::UnregisterAppletResourceUserId(HLERequestContext& ctx) {
    LOG_INFO(Service_HID, "called, applet_resource_user_id={}", applet_resource_user_id);

    GetResourceManager()->UnregisterAppletResourceUserId(applet_resource_user_id);
+    // GetResourceManager()->GetNpad()->UnregisterAppletResourceUserId(applet_resource_user_id);
+    // GetResourceManager()->GetPalma()->UnregisterAppletResourceUserId(applet_resource_user_id);

    IPC::ResponseBuilder rb{ctx, 2};
    rb.Push(ResultSuccess);
--- a/src/core/hle/service/os/mutex.cpp
+++ b/src/core/hle/service/os/mutex.cpp
@ -4,7 +4,7 @@
 #include "core/core.h"
 #include "core/hle/kernel/k_event.h"
 #include "core/hle/kernel/k_synchronization_object.h"
-#include "core/hle/service/os/mutex.h"
+#include "core/hle/service/mutex.h"

 namespace Service {

--- a/src/core/hle/service/os/mutex.h
+++ b/src/core/hle/service/os/mutex.h
--- a/src/core/hle/service/os/multi_wait.cpp
+++ b/src/core/hle/service/os/multi_wait.cpp
@ -1,59 +0,0 @@
-// SPDX-FileCopyrightText: Copyright 2024 yuzu Emulator Project
-// SPDX-License-Identifier: GPL-2.0-or-later
-
-#include "core/hle/kernel/k_hardware_timer.h"
-#include "core/hle/kernel/k_synchronization_object.h"
-#include "core/hle/kernel/kernel.h"
-#include "core/hle/kernel/svc_common.h"
-#include "core/hle/service/os/multi_wait.h"
-
-namespace Service {
-
-MultiWait::MultiWait() = default;
-MultiWait::~MultiWait() = default;
-
-MultiWaitHolder* MultiWait::WaitAny(Kernel::KernelCore& kernel) {
-    return this->TimedWaitImpl(kernel, -1);
-}
-
-MultiWaitHolder* MultiWait::TryWaitAny(Kernel::KernelCore& kernel) {
-    return this->TimedWaitImpl(kernel, 0);
-}
-
-MultiWaitHolder* MultiWait::TimedWaitAny(Kernel::KernelCore& kernel, s64 timeout_ns) {
-    return this->TimedWaitImpl(kernel, kernel.HardwareTimer().GetTick() + timeout_ns);
-}
-
-MultiWaitHolder* MultiWait::TimedWaitImpl(Kernel::KernelCore& kernel, s64 timeout_tick) {
-    std::array<MultiWaitHolder*, Kernel::Svc::ArgumentHandleCountMax> holders{};
-    std::array<Kernel::KSynchronizationObject*, Kernel::Svc::ArgumentHandleCountMax> objects{};
-
-    s32 out_index = -1;
-    s32 num_objects = 0;
-
-    for (auto it = m_wait_list.begin(); it != m_wait_list.end(); it++) {
-        ASSERT(num_objects < Kernel::Svc::ArgumentHandleCountMax);
-        holders[num_objects] = std::addressof(*it);
-        objects[num_objects] = it->GetNativeHandle();
-        num_objects++;
-    }
-
-    Kernel::KSynchronizationObject::Wait(kernel, std::addressof(out_index), objects.data(),
-                                         num_objects, timeout_tick);
-
-    if (out_index == -1) {
-        return nullptr;
-    } else {
-        return holders[out_index];
-    }
-}
-
-void MultiWait::MoveAll(MultiWait* other) {
-    while (!other->m_wait_list.empty()) {
-        MultiWaitHolder& holder = other->m_wait_list.front();
-        holder.UnlinkFromMultiWait();
-        holder.LinkToMultiWait(this);
-    }
-}
-
-} // namespace Service
--- a/src/core/hle/service/os/multi_wait.h
+++ b/src/core/hle/service/os/multi_wait.h
@ -1,36 +0,0 @@
-// SPDX-FileCopyrightText: Copyright 2024 yuzu Emulator Project
-// SPDX-License-Identifier: GPL-2.0-or-later
-
-#pragma once
-
-#include "core/hle/service/os/multi_wait_holder.h"
-
-namespace Kernel {
-class KernelCore;
-}
-
-namespace Service {
-
-class MultiWait final {
-public:
-    explicit MultiWait();
-    ~MultiWait();
-
-public:
-    MultiWaitHolder* WaitAny(Kernel::KernelCore& kernel);
-    MultiWaitHolder* TryWaitAny(Kernel::KernelCore& kernel);
-    MultiWaitHolder* TimedWaitAny(Kernel::KernelCore& kernel, s64 timeout_ns);
-    // TODO: SdkReplyAndReceive?
-
-    void MoveAll(MultiWait* other);
-
-private:
-    MultiWaitHolder* TimedWaitImpl(Kernel::KernelCore& kernel, s64 timeout_tick);
-
-private:
-    friend class MultiWaitHolder;
-    using ListType = Common::IntrusiveListMemberTraits<&MultiWaitHolder::m_list_node>::ListType;
-    ListType m_wait_list{};
-};
-
-} // namespace Service
--- a/src/core/hle/service/os/multi_wait_holder.cpp
+++ b/src/core/hle/service/os/multi_wait_holder.cpp
@ -1,25 +0,0 @@
-// SPDX-FileCopyrightText: Copyright 2024 yuzu Emulator Project
-// SPDX-License-Identifier: GPL-2.0-or-later
-
-#include "core/hle/service/os/multi_wait.h"
-#include "core/hle/service/os/multi_wait_holder.h"
-
-namespace Service {
-
-void MultiWaitHolder::LinkToMultiWait(MultiWait* multi_wait) {
-    if (m_multi_wait != nullptr) {
-        UNREACHABLE();
-    }
-
-    m_multi_wait = multi_wait;
-    m_multi_wait->m_wait_list.push_back(*this);
-}
-
-void MultiWaitHolder::UnlinkFromMultiWait() {
-    if (m_multi_wait) {
-        m_multi_wait->m_wait_list.erase(m_multi_wait->m_wait_list.iterator_to(*this));
-        m_multi_wait = nullptr;
-    }
-}
-
-} // namespace Service
--- a/src/core/hle/service/os/multi_wait_holder.h
+++ b/src/core/hle/service/os/multi_wait_holder.h
@ -1,44 +0,0 @@
-// SPDX-FileCopyrightText: Copyright 2024 yuzu Emulator Project
-// SPDX-License-Identifier: GPL-2.0-or-later
-
-#pragma once
-
-#include "common/intrusive_list.h"
-
-namespace Kernel {
-class KSynchronizationObject;
-} // namespace Kernel
-
-namespace Service {
-
-class MultiWait;
-
-class MultiWaitHolder {
-public:
-    explicit MultiWaitHolder(Kernel::KSynchronizationObject* native_handle)
-        : m_native_handle(native_handle) {}
-
-    void LinkToMultiWait(MultiWait* multi_wait);
-    void UnlinkFromMultiWait();
-
-    void SetUserData(uintptr_t user_data) {
-        m_user_data = user_data;
-    }
-
-    uintptr_t GetUserData() const {
-        return m_user_data;
-    }
-
-    Kernel::KSynchronizationObject* GetNativeHandle() const {
-        return m_native_handle;
-    }
-
-private:
-    friend class MultiWait;
-    Common::IntrusiveListNode m_list_node{};
-    MultiWait* m_multi_wait{};
-    Kernel::KSynchronizationObject* m_native_handle{};
-    uintptr_t m_user_data{};
-};
-
-} // namespace Service
--- a/src/core/hle/service/os/multi_wait_utils.h
+++ b/src/core/hle/service/os/multi_wait_utils.h
@ -1,109 +0,0 @@
-// SPDX-FileCopyrightText: Copyright 2024 yuzu Emulator Project
-// SPDX-License-Identifier: GPL-2.0-or-later
-
-#pragma once
-
-#include "core/hle/service/os/multi_wait.h"
-
-namespace Service {
-
-namespace impl {
-
-class AutoMultiWaitHolder {
-private:
-    MultiWaitHolder m_holder;
-
-public:
-    template <typename T>
-    explicit AutoMultiWaitHolder(MultiWait* multi_wait, T&& arg) : m_holder(arg) {
-        m_holder.LinkToMultiWait(multi_wait);
-    }
-
-    ~AutoMultiWaitHolder() {
-        m_holder.UnlinkFromMultiWait();
-    }
-
-    std::pair<MultiWaitHolder*, int> ConvertResult(const std::pair<MultiWaitHolder*, int> result,
-                                                   int index) {
-        if (result.first == std::addressof(m_holder)) {
-            return std::make_pair(static_cast<MultiWaitHolder*>(nullptr), index);
-        } else {
-            return result;
-        }
-    }
-};
-
-using WaitAnyFunction = decltype(&MultiWait::WaitAny);
-
-inline std::pair<MultiWaitHolder*, int> WaitAnyImpl(Kernel::KernelCore& kernel,
-                                                    MultiWait* multi_wait, WaitAnyFunction func,
-                                                    int) {
-    return std::pair<MultiWaitHolder*, int>((multi_wait->*func)(kernel), -1);
-}
-
-template <typename T, typename... Args>
-inline std::pair<MultiWaitHolder*, int> WaitAnyImpl(Kernel::KernelCore& kernel,
-                                                    MultiWait* multi_wait, WaitAnyFunction func,
-                                                    int index, T&& x, Args&&... args) {
-    AutoMultiWaitHolder holder(multi_wait, std::forward<T>(x));
-    return holder.ConvertResult(
-        WaitAnyImpl(kernel, multi_wait, func, index + 1, std::forward<Args>(args)...), index);
-}
-
-template <typename... Args>
-inline std::pair<MultiWaitHolder*, int> WaitAnyImpl(Kernel::KernelCore& kernel,
-                                                    MultiWait* multi_wait, WaitAnyFunction func,
-                                                    Args&&... args) {
-    return WaitAnyImpl(kernel, multi_wait, func, 0, std::forward<Args>(args)...);
-}
-
-template <typename... Args>
-inline std::pair<MultiWaitHolder*, int> WaitAnyImpl(Kernel::KernelCore& kernel,
-                                                    WaitAnyFunction func, Args&&... args) {
-    MultiWait temp_multi_wait;
-    return WaitAnyImpl(kernel, std::addressof(temp_multi_wait), func, 0,
-                       std::forward<Args>(args)...);
-}
-
-class NotBoolButInt {
-public:
-    constexpr NotBoolButInt(int v) : m_value(v) {}
-    constexpr operator int() const {
-        return m_value;
-    }
-    explicit operator bool() const = delete;
-
-private:
-    int m_value;
-};
-
-} // namespace impl
-
-template <typename... Args>
-    requires(sizeof...(Args) > 0)
-inline std::pair<MultiWaitHolder*, int> WaitAny(Kernel::KernelCore& kernel, MultiWait* multi_wait,
-                                                Args&&... args) {
-    return impl::WaitAnyImpl(kernel, &MultiWait::WaitAny, multi_wait, std::forward<Args>(args)...);
-}
-
-template <typename... Args>
-    requires(sizeof...(Args) > 0)
-inline int WaitAny(Kernel::KernelCore& kernel, Args&&... args) {
-    return impl::WaitAnyImpl(kernel, &MultiWait::WaitAny, std::forward<Args>(args)...).second;
-}
-
-template <typename... Args>
-    requires(sizeof...(Args) > 0)
-inline std::pair<MultiWaitHolder*, int> TryWaitAny(Kernel::KernelCore& kernel,
-                                                   MultiWait* multi_wait, Args&&... args) {
-    return impl::WaitAnyImpl(kernel, &MultiWait::TryWaitAny, multi_wait,
-                             std::forward<Args>(args)...);
-}
-
-template <typename... Args>
-    requires(sizeof...(Args) > 0)
-inline impl::NotBoolButInt TryWaitAny(Kernel::KernelCore& kernel, Args&&... args) {
-    return impl::WaitAnyImpl(kernel, &MultiWait::TryWaitAny, std::forward<Args>(args)...).second;
-}
-
-} // namespace Service
--- a/src/core/hle/service/server_manager.cpp
+++ b/src/core/hle/service/server_manager.cpp
@ -20,91 +20,50 @@

 namespace Service {

-enum class UserDataTag {
+constexpr size_t MaximumWaitObjects = 0x40;
+
+enum HandleType {
    Port,
    Session,
    DeferEvent,
+    Event,
 };

-class Port : public MultiWaitHolder, public Common::IntrusiveListBaseNode<Port> {
-public:
-    explicit Port(Kernel::KServerPort* server_port, SessionRequestHandlerFactory&& handler_factory)
-        : MultiWaitHolder(server_port), m_handler_factory(std::move(handler_factory)) {
-        this->SetUserData(static_cast<uintptr_t>(UserDataTag::Port));
-    }
-
-    ~Port() {
-        this->GetNativeHandle()->Close();
-    }
-
-    SessionRequestHandlerPtr CreateHandler() {
-        return m_handler_factory();
-    }
-
-private:
-    const SessionRequestHandlerFactory m_handler_factory;
-};
-
-class Session : public MultiWaitHolder, public Common::IntrusiveListBaseNode<Session> {
-public:
-    explicit Session(Kernel::KServerSession* server_session,
-                     std::shared_ptr<SessionRequestManager>&& manager)
-        : MultiWaitHolder(server_session), m_manager(std::move(manager)) {
-        this->SetUserData(static_cast<uintptr_t>(UserDataTag::Session));
-    }
-
-    ~Session() {
-        this->GetNativeHandle()->Close();
-    }
-
-    std::shared_ptr<SessionRequestManager>& GetManager() {
-        return m_manager;
-    }
-
-    std::shared_ptr<HLERequestContext>& GetContext() {
-        return m_context;
-    }
-
-private:
-    std::shared_ptr<SessionRequestManager> m_manager;
-    std::shared_ptr<HLERequestContext> m_context;
-};
-
-ServerManager::ServerManager(Core::System& system) : m_system{system}, m_selection_mutex{system} {
+ServerManager::ServerManager(Core::System& system) : m_system{system}, m_serve_mutex{system} {
    // Initialize event.
-    m_wakeup_event = Kernel::KEvent::Create(system.Kernel());
-    m_wakeup_event->Initialize(nullptr);
+    m_event = Kernel::KEvent::Create(system.Kernel());
+    m_event->Initialize(nullptr);

    // Register event.
-    Kernel::KEvent::Register(system.Kernel(), m_wakeup_event);
-
-    // Link to holder.
-    m_wakeup_holder.emplace(std::addressof(m_wakeup_event->GetReadableEvent()));
-    m_wakeup_holder->LinkToMultiWait(std::addressof(m_deferred_list));
+    Kernel::KEvent::Register(system.Kernel(), m_event);
 }

 ServerManager::~ServerManager() {
    // Signal stop.
    m_stop_source.request_stop();
-    m_wakeup_event->Signal();
+    m_event->Signal();

    // Wait for processing to stop.
    m_stopped.Wait();
    m_threads.clear();

-    // Clean up ports.
-    for (auto it = m_servers.begin(); it != m_servers.end(); it = m_servers.erase(it)) {
-        delete std::addressof(*it);
+    // Clean up server ports.
+    for (const auto& [port, handler] : m_ports) {
+        port->Close();
    }

    // Clean up sessions.
-    for (auto it = m_sessions.begin(); it != m_sessions.end(); it = m_sessions.erase(it)) {
-        delete std::addressof(*it);
+    for (const auto& [session, manager] : m_sessions) {
+        session->Close();
    }

-    // Close wakeup event.
-    m_wakeup_event->GetReadableEvent().Close();
-    m_wakeup_event->Close();
+    for (const auto& request : m_deferrals) {
+        request.session->Close();
+    }
+
+    // Close event.
+    m_event->GetReadableEvent().Close();
+    m_event->Close();

    if (m_deferral_event) {
        m_deferral_event->GetReadableEvent().Close();
@ -116,19 +75,19 @@ void ServerManager::RunServer(std::unique_ptr<ServerManager>&& server_manager) {
    server_manager->m_system.RunServer(std::move(server_manager));
 }

-Result ServerManager::RegisterSession(Kernel::KServerSession* server_session,
+Result ServerManager::RegisterSession(Kernel::KServerSession* session,
                                      std::shared_ptr<SessionRequestManager> manager) {
-    // We are taking ownership of the server session, so don't open it.
-    auto* session = new Session(server_session, std::move(manager));
+    ASSERT(m_sessions.size() + m_ports.size() < MaximumWaitObjects);

+    // We are taking ownership of the server session, so don't open it.
    // Begin tracking the server session.
    {
-        std::scoped_lock ll{m_deferred_list_mutex};
-        m_sessions.push_back(*session);
+        std::scoped_lock ll{m_list_mutex};
+        m_sessions.emplace(session, std::move(manager));
    }

-    // Register to wait on the session.
-    this->LinkToDeferredList(session);
+    // Signal the wakeup event.
+    m_event->Signal();

    R_SUCCEED();
 }
@ -136,22 +95,21 @@ Result ServerManager::RegisterSession(Kernel::KServerSession* server_session,
 Result ServerManager::RegisterNamedService(const std::string& service_name,
                                           SessionRequestHandlerFactory&& handler_factory,
                                           u32 max_sessions) {
+    ASSERT(m_sessions.size() + m_ports.size() < MaximumWaitObjects);
+
    // Add the new server to sm: and get the moved server port.
    Kernel::KServerPort* server_port{};
    R_ASSERT(m_system.ServiceManager().RegisterService(std::addressof(server_port), service_name,
                                                       max_sessions, handler_factory));

-    // We are taking ownership of the server port, so don't open it.
-    auto* server = new Port(server_port, std::move(handler_factory));
-
    // Begin tracking the server port.
    {
-        std::scoped_lock ll{m_deferred_list_mutex};
-        m_servers.push_back(*server);
+        std::scoped_lock ll{m_list_mutex};
+        m_ports.emplace(server_port, std::move(handler_factory));
    }

-    // Register to wait on the server port.
-    this->LinkToDeferredList(server);
+    // Signal the wakeup event.
+    m_event->Signal();

    R_SUCCEED();
 }
@ -169,6 +127,8 @@ Result ServerManager::RegisterNamedService(const std::string& service_name,
 Result ServerManager::ManageNamedPort(const std::string& service_name,
                                      SessionRequestHandlerFactory&& handler_factory,
                                      u32 max_sessions) {
+    ASSERT(m_sessions.size() + m_ports.size() < MaximumWaitObjects);
+
    // Create a new port.
    auto* port = Kernel::KPort::Create(m_system.Kernel());
    port->Initialize(max_sessions, false, 0);
@ -189,18 +149,12 @@ Result ServerManager::ManageNamedPort(const std::string& service_name,
    // Open a new reference to the server port.
    port->GetServerPort().Open();

-    // Transfer ownership into a new port object.
-    auto* server = new Port(std::addressof(port->GetServerPort()), std::move(handler_factory));
-
-    // Begin tracking the port.
+    // Begin tracking the server port.
    {
-        std::scoped_lock ll{m_deferred_list_mutex};
-        m_servers.push_back(*server);
+        std::scoped_lock ll{m_list_mutex};
+        m_ports.emplace(std::addressof(port->GetServerPort()), std::move(handler_factory));
    }

-    // Register to wait on the port.
-    this->LinkToDeferredList(server);
-
    // We succeeded.
    R_SUCCEED();
 }
@ -219,11 +173,6 @@ Result ServerManager::ManageDeferral(Kernel::KEvent** out_event) {
    // Set the output.
    *out_event = m_deferral_event;

-    // Register to wait on the event.
-    m_deferral_holder.emplace(std::addressof(m_deferral_event->GetReadableEvent()));
-    m_deferral_holder->SetUserData(static_cast<uintptr_t>(UserDataTag::DeferEvent));
-    this->LinkToDeferredList(std::addressof(*m_deferral_holder));
-
    // We succeeded.
    R_SUCCEED();
 }
@ -242,185 +191,270 @@ Result ServerManager::LoopProcess() {
    R_RETURN(this->LoopProcessImpl());
 }

-void ServerManager::LinkToDeferredList(MultiWaitHolder* holder) {
-    // Link.
-    {
-        std::scoped_lock lk{m_deferred_list_mutex};
-        holder->LinkToMultiWait(std::addressof(m_deferred_list));
-    }
-
-    // Signal the wakeup event.
-    m_wakeup_event->Signal();
-}
-
-void ServerManager::LinkDeferred() {
-    std::scoped_lock lk{m_deferred_list_mutex};
-    m_multi_wait.MoveAll(std::addressof(m_deferred_list));
-}
-
-MultiWaitHolder* ServerManager::WaitSignaled() {
-    // Ensure we are the only thread waiting for this server.
-    std::scoped_lock lk{m_selection_mutex};
-
-    while (true) {
-        this->LinkDeferred();
-
-        // If we're done, return before we start waiting.
-        if (m_stop_source.stop_requested()) {
-            return nullptr;
-        }
-
-        auto* selected = m_multi_wait.WaitAny(m_system.Kernel());
-        if (selected == std::addressof(*m_wakeup_holder)) {
-            // Clear and restart if we were woken up.
-            m_wakeup_event->Clear();
-        } else {
-            // Unlink and handle the event.
-            selected->UnlinkFromMultiWait();
-            return selected;
-        }
-    }
-}
-
-Result ServerManager::Process(MultiWaitHolder* holder) {
-    switch (static_cast<UserDataTag>(holder->GetUserData())) {
-    case UserDataTag::Session:
-        R_RETURN(this->OnSessionEvent(static_cast<Session*>(holder)));
-    case UserDataTag::Port:
-        R_RETURN(this->OnPortEvent(static_cast<Port*>(holder)));
-    case UserDataTag::DeferEvent:
-        R_RETURN(this->OnDeferralEvent());
-    default:
-        UNREACHABLE();
-    }
-}
-
-bool ServerManager::WaitAndProcessImpl() {
-    if (auto* signaled_holder = this->WaitSignaled(); signaled_holder != nullptr) {
-        R_ASSERT(this->Process(signaled_holder));
-        return true;
-    } else {
-        return false;
-    }
-}
-
 Result ServerManager::LoopProcessImpl() {
    while (!m_stop_source.stop_requested()) {
-        this->WaitAndProcessImpl();
+        R_TRY(this->WaitAndProcessImpl());
    }

    R_SUCCEED();
 }

-Result ServerManager::OnPortEvent(Port* server) {
+Result ServerManager::WaitAndProcessImpl() {
+    Kernel::KScopedAutoObject<Kernel::KSynchronizationObject> wait_obj;
+    HandleType wait_type{};
+
+    // Ensure we are the only thread waiting for this server.
+    std::unique_lock sl{m_serve_mutex};
+
+    // If we're done, return before we start waiting.
+    R_SUCCEED_IF(m_stop_source.stop_requested());
+
+    // Wait for a tracked object to become signaled.
+    {
+        s32 num_objs{};
+        std::array<HandleType, MaximumWaitObjects> wait_types{};
+        std::array<Kernel::KSynchronizationObject*, MaximumWaitObjects> wait_objs{};
+
+        const auto AddWaiter{
+            [&](Kernel::KSynchronizationObject* synchronization_object, HandleType type) {
+                // Open a new reference to the object.
+                synchronization_object->Open();
+
+                // Insert into the list.
+                wait_types[num_objs] = type;
+                wait_objs[num_objs++] = synchronization_object;
+            }};
+
+        {
+            std::scoped_lock ll{m_list_mutex};
+
+            // Add all of our ports.
+            for (const auto& [port, handler] : m_ports) {
+                AddWaiter(port, HandleType::Port);
+            }
+
+            // Add all of our sessions.
+            for (const auto& [session, manager] : m_sessions) {
+                AddWaiter(session, HandleType::Session);
+            }
+        }
+
+        // Add the deferral wakeup event.
+        if (m_deferral_event != nullptr) {
+            AddWaiter(std::addressof(m_deferral_event->GetReadableEvent()), HandleType::DeferEvent);
+        }
+
+        // Add the wakeup event.
+        AddWaiter(std::addressof(m_event->GetReadableEvent()), HandleType::Event);
+
+        // Clean up extra references on exit.
+        SCOPE_EXIT({
+            for (s32 i = 0; i < num_objs; i++) {
+                wait_objs[i]->Close();
+            }
+        });
+
+        // Wait for a signal.
+        s32 out_index{-1};
+        R_TRY_CATCH(Kernel::KSynchronizationObject::Wait(m_system.Kernel(), &out_index,
+                                                         wait_objs.data(), num_objs, -1)) {
+            R_CATCH(Kernel::ResultSessionClosed) {
+                // On session closed, index is updated and we don't want to return an error.
+            }
+        }
+        R_END_TRY_CATCH;
+        ASSERT(out_index >= 0 && out_index < num_objs);
+
+        // Set the output index.
+        wait_obj = wait_objs[out_index];
+        wait_type = wait_types[out_index];
+    }
+
+    // Process what we just received, temporarily removing the object so it is
+    // not processed concurrently by another thread.
+    {
+        switch (wait_type) {
+        case HandleType::Port: {
+            // Port signaled.
+            auto* port = wait_obj->DynamicCast<Kernel::KServerPort*>();
+            SessionRequestHandlerFactory handler_factory;
+
+            // Remove from tracking.
+            {
+                std::scoped_lock ll{m_list_mutex};
+                ASSERT(m_ports.contains(port));
+                m_ports.at(port).swap(handler_factory);
+                m_ports.erase(port);
+            }
+
+            // Allow other threads to serve.
+            sl.unlock();
+
+            // Finish.
+            R_RETURN(this->OnPortEvent(port, std::move(handler_factory)));
+        }
+        case HandleType::Session: {
+            // Session signaled.
+            auto* session = wait_obj->DynamicCast<Kernel::KServerSession*>();
+            std::shared_ptr<SessionRequestManager> manager;
+
+            // Remove from tracking.
+            {
+                std::scoped_lock ll{m_list_mutex};
+                ASSERT(m_sessions.contains(session));
+                m_sessions.at(session).swap(manager);
+                m_sessions.erase(session);
+            }
+
+            // Allow other threads to serve.
+            sl.unlock();
+
+            // Finish.
+            R_RETURN(this->OnSessionEvent(session, std::move(manager)));
+        }
+        case HandleType::DeferEvent: {
+            // Clear event.
+            ASSERT(R_SUCCEEDED(m_deferral_event->Clear()));
+
+            // Drain the list of deferrals while we process.
+            std::list<RequestState> deferrals;
+            {
+                std::scoped_lock ll{m_list_mutex};
+                m_deferrals.swap(deferrals);
+            }
+
+            // Allow other threads to serve.
+            sl.unlock();
+
+            // Finish.
+            R_RETURN(this->OnDeferralEvent(std::move(deferrals)));
+        }
+        case HandleType::Event: {
+            // Clear event and finish.
+            R_RETURN(m_event->Clear());
+        }
+        default: {
+            UNREACHABLE();
+        }
+        }
+    }
+}
+
+Result ServerManager::OnPortEvent(Kernel::KServerPort* port,
+                                  SessionRequestHandlerFactory&& handler_factory) {
    // Accept a new server session.
-    auto* server_port = static_cast<Kernel::KServerPort*>(server->GetNativeHandle());
-    Kernel::KServerSession* server_session = server_port->AcceptSession();
-    ASSERT(server_session != nullptr);
+    Kernel::KServerSession* session = port->AcceptSession();
+    ASSERT(session != nullptr);

    // Create the session manager and install the handler.
    auto manager = std::make_shared<SessionRequestManager>(m_system.Kernel(), *this);
-    manager->SetSessionHandler(server->CreateHandler());
+    manager->SetSessionHandler(handler_factory());

-    // Create and register the new session.
-    this->RegisterSession(server_session, std::move(manager));
+    // Track the server session.
+    {
+        std::scoped_lock ll{m_list_mutex};
+        m_ports.emplace(port, std::move(handler_factory));
+        m_sessions.emplace(session, std::move(manager));
+    }

-    // Resume tracking the port.
-    this->LinkToDeferredList(server);
+    // Signal the wakeup event.
+    m_event->Signal();

    // We succeeded.
    R_SUCCEED();
 }

-Result ServerManager::OnSessionEvent(Session* session) {
-    Result res = ResultSuccess;
+Result ServerManager::OnSessionEvent(Kernel::KServerSession* session,
+                                     std::shared_ptr<SessionRequestManager>&& manager) {
+    Result rc{ResultSuccess};

    // Try to receive a message.
-    auto* server_session = static_cast<Kernel::KServerSession*>(session->GetNativeHandle());
-    res = server_session->ReceiveRequestHLE(&session->GetContext(), session->GetManager());
+    std::shared_ptr<HLERequestContext> context;
+    rc = session->ReceiveRequestHLE(&context, manager);

    // If the session has been closed, we're done.
-    if (res == Kernel::ResultSessionClosed) {
-        this->DestroySession(session);
+    if (rc == Kernel::ResultSessionClosed) {
+        // Close the session.
+        session->Close();
+
+        // Finish.
        R_SUCCEED();
    }
+    ASSERT(R_SUCCEEDED(rc));

-    R_ASSERT(res);
+    RequestState request{
+        .session = session,
+        .context = std::move(context),
+        .manager = std::move(manager),
+    };

    // Complete the sync request with deferral handling.
-    R_RETURN(this->CompleteSyncRequest(session));
+    R_RETURN(this->CompleteSyncRequest(std::move(request)));
 }

-Result ServerManager::CompleteSyncRequest(Session* session) {
-    Result res = ResultSuccess;
-    Result service_res = ResultSuccess;
+Result ServerManager::CompleteSyncRequest(RequestState&& request) {
+    Result rc{ResultSuccess};
+    Result service_rc{ResultSuccess};

    // Mark the request as not deferred.
-    session->GetContext()->SetIsDeferred(false);
+    request.context->SetIsDeferred(false);

    // Complete the request. We have exclusive access to this session.
-    auto* server_session = static_cast<Kernel::KServerSession*>(session->GetNativeHandle());
-    service_res =
-        session->GetManager()->CompleteSyncRequest(server_session, *session->GetContext());
+    service_rc = request.manager->CompleteSyncRequest(request.session, *request.context);

    // If we've been deferred, we're done.
-    if (session->GetContext()->GetIsDeferred()) {
-        // Insert into deferred session list.
-        std::scoped_lock ll{m_deferred_list_mutex};
-        m_deferred_sessions.push_back(session);
+    if (request.context->GetIsDeferred()) {
+        // Insert into deferral list.
+        std::scoped_lock ll{m_list_mutex};
+        m_deferrals.emplace_back(std::move(request));

        // Finish.
        R_SUCCEED();
    }

    // Send the reply.
-    res = server_session->SendReplyHLE();
+    rc = request.session->SendReplyHLE();

    // If the session has been closed, we're done.
-    if (res == Kernel::ResultSessionClosed || service_res == IPC::ResultSessionClosed) {
-        this->DestroySession(session);
+    if (rc == Kernel::ResultSessionClosed || service_rc == IPC::ResultSessionClosed) {
+        // Close the session.
+        request.session->Close();
+
+        // Finish.
        R_SUCCEED();
    }

-    R_ASSERT(res);
-    R_ASSERT(service_res);
+    ASSERT(R_SUCCEEDED(rc));
+    ASSERT(R_SUCCEEDED(service_rc));

-    // We succeeded, so we can process future messages on this session.
-    this->LinkToDeferredList(session);
-
-    R_SUCCEED();
-}
-
-Result ServerManager::OnDeferralEvent() {
-    // Clear event before grabbing the list.
-    m_deferral_event->Clear();
-
-    // Get and clear list.
-    const auto deferrals = [&] {
-        std::scoped_lock lk{m_deferred_list_mutex};
-        return std::move(m_deferred_sessions);
-    }();
-
-    // Relink deferral event.
-    this->LinkToDeferredList(std::addressof(*m_deferral_holder));
-
-    // For each session, try again to complete the request.
-    for (auto* session : deferrals) {
-        R_ASSERT(this->CompleteSyncRequest(session));
-    }
-
-    R_SUCCEED();
-}
-
-void ServerManager::DestroySession(Session* session) {
-    // Unlink.
+    // Reinsert the session.
    {
-        std::scoped_lock lk{m_deferred_list_mutex};
-        m_sessions.erase(m_sessions.iterator_to(*session));
+        std::scoped_lock ll{m_list_mutex};
+        m_sessions.emplace(request.session, std::move(request.manager));
    }

-    // Free the session.
-    delete session;
+    // Signal the wakeup event.
+    m_event->Signal();
+
+    // We succeeded.
+    R_SUCCEED();
+}
+
+Result ServerManager::OnDeferralEvent(std::list<RequestState>&& deferrals) {
+    ON_RESULT_FAILURE {
+        std::scoped_lock ll{m_list_mutex};
+        m_deferrals.splice(m_deferrals.end(), deferrals);
+    };
+
+    while (!deferrals.empty()) {
+        RequestState request = deferrals.front();
+        deferrals.pop_front();
+
+        // Try again to complete the request.
+        R_TRY(this->CompleteSyncRequest(std::move(request)));
+    }
+
+    R_SUCCEED();
 }

 } // namespace Service
--- a/src/core/hle/service/server_manager.h
+++ b/src/core/hle/service/server_manager.h
@ -3,17 +3,18 @@

 #pragma once

+#include <functional>
 #include <list>
+#include <map>
 #include <mutex>
-#include <optional>
+#include <string_view>
 #include <vector>

 #include "common/polyfill_thread.h"
 #include "common/thread.h"
 #include "core/hle/result.h"
 #include "core/hle/service/hle_ipc.h"
-#include "core/hle/service/os/multi_wait.h"
-#include "core/hle/service/os/mutex.h"
+#include "core/hle/service/mutex.h"

 namespace Core {
 class System;
@ -23,13 +24,11 @@ namespace Kernel {
 class KEvent;
 class KServerPort;
 class KServerSession;
+class KSynchronizationObject;
 } // namespace Kernel

 namespace Service {

-class Port;
-class Session;
-
 class ServerManager {
 public:
    explicit ServerManager(Core::System& system);
@ -53,40 +52,34 @@ public:
    static void RunServer(std::unique_ptr<ServerManager>&& server);

 private:
-    void LinkToDeferredList(MultiWaitHolder* holder);
-    void LinkDeferred();
-    MultiWaitHolder* WaitSignaled();
-    Result Process(MultiWaitHolder* holder);
-    bool WaitAndProcessImpl();
+    struct RequestState;
+
    Result LoopProcessImpl();
-
-    Result OnPortEvent(Port* port);
-    Result OnSessionEvent(Session* session);
-    Result OnDeferralEvent();
-    Result CompleteSyncRequest(Session* session);
-
-private:
-    void DestroySession(Session* session);
+    Result WaitAndProcessImpl();
+    Result OnPortEvent(Kernel::KServerPort* port, SessionRequestHandlerFactory&& handler_factory);
+    Result OnSessionEvent(Kernel::KServerSession* session,
+                          std::shared_ptr<SessionRequestManager>&& manager);
+    Result OnDeferralEvent(std::list<RequestState>&& deferrals);
+    Result CompleteSyncRequest(RequestState&& state);

 private:
    Core::System& m_system;
-    Mutex m_selection_mutex;
-
-    // Events
-    Kernel::KEvent* m_wakeup_event{};
-    Kernel::KEvent* m_deferral_event{};
-
-    // Deferred wait list
-    std::mutex m_deferred_list_mutex{};
-    MultiWait m_deferred_list{};
+    Mutex m_serve_mutex;
+    std::mutex m_list_mutex;

    // Guest state tracking
-    MultiWait m_multi_wait{};
-    Common::IntrusiveListBaseTraits<Port>::ListType m_servers{};
-    Common::IntrusiveListBaseTraits<Session>::ListType m_sessions{};
-    std::list<Session*> m_deferred_sessions{};
-    std::optional<MultiWaitHolder> m_wakeup_holder{};
-    std::optional<MultiWaitHolder> m_deferral_holder{};
+    std::map<Kernel::KServerPort*, SessionRequestHandlerFactory> m_ports{};
+    std::map<Kernel::KServerSession*, std::shared_ptr<SessionRequestManager>> m_sessions{};
+    Kernel::KEvent* m_event{};
+    Kernel::KEvent* m_deferral_event{};
+
+    // Deferral tracking
+    struct RequestState {
+        Kernel::KServerSession* session;
+        std::shared_ptr<HLERequestContext> context;
+        std::shared_ptr<SessionRequestManager> manager;
+    };
+    std::list<RequestState> m_deferrals{};

    // Host state tracking
    Common::Event m_stopped{};
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
yuzubot	50135e480a	Android 237	2024-02-09 00:56:52 +00:00
yuzubot	8495adfed5	Merge yuzu-emu#12964	2024-02-09 00:56:52 +00:00
yuzubot	0b624b8bfa	Merge yuzu-emu#12955	2024-02-09 00:56:52 +00:00
yuzubot	98d0ccc78c	Merge yuzu-emu#12951	2024-02-09 00:56:52 +00:00
yuzubot	bfc714e16c	Merge yuzu-emu#12920	2024-02-09 00:56:51 +00:00
yuzubot	18fa807cd3	Merge yuzu-emu#12756	2024-02-09 00:56:51 +00:00
yuzubot	d5a7230036	Merge yuzu-emu#12749	2024-02-09 00:56:51 +00:00
yuzubot	afb77e967f	Merge yuzu-emu#12461	2024-02-09 00:56:51 +00:00