Android 202

.reuse/dep5

@@ -155,7 +155,3 @@ License: MIT
 Files: externals/gamemode/*
 Copyright: Copyright 2017-2019 Feral Interactive
 License: BSD-3-Clause
-
-Files: src/android/app/debug.keystore
-Copyright: 2023 yuzu Emulator Project
-License: GPL-3.0-or-later

CMakeModules/FindSimpleIni.cmake

@@ -2,20 +2,18 @@
 #
 # SPDX-License-Identifier: GPL-3.0-or-later
 
-include(FindPackageHandleStandardArgs)
+find_path(SimpleIni_INCLUDE_DIR SimpleIni.h)
 
-find_package(SimpleIni QUIET CONFIG)
+include(FindPackageHandleStandardArgs)
-if (SimpleIni_CONSIDERED_CONFIGS)
+find_package_handle_standard_args(SimpleIni
-    find_package_handle_standard_args(SimpleIni CONFIG_MODE)
+    REQUIRED_VARS SimpleIni_INCLUDE_DIR
-else()
+)
-    find_package(PkgConfig QUIET)
+
-    pkg_search_module(SIMPLEINI QUIET IMPORTED_TARGET simpleini)
+if (SimpleIni_FOUND AND NOT TARGET SimpleIni::SimpleIni)
-    find_package_handle_standard_args(SimpleIni
+    add_library(SimpleIni::SimpleIni INTERFACE IMPORTED)
-        REQUIRED_VARS SIMPLEINI_INCLUDEDIR
+    set_target_properties(SimpleIni::SimpleIni PROPERTIES
-        VERSION_VAR SIMPLEINI_VERSION
+        INTERFACE_INCLUDE_DIRECTORIES "${SimpleIni_INCLUDE_DIR}"
     )
 endif()
 
-if (SimpleIni_FOUND AND NOT TARGET SimpleIni::SimpleIni)
+mark_as_advanced(SimpleIni_INCLUDE_DIR)
-    add_library(SimpleIni::SimpleIni ALIAS PkgConfig::SIMPLEINI)
-endif()

README.md

@@ -1,8 +1,8 @@
 | Pull Request | Commit | Title | Author | Merged? |
 |----|----|----|----|----|
-| [12749](https://github.com/yuzu-emu/yuzu-android//pull/12749) | [`e3171486d`](https://github.com/yuzu-emu/yuzu-android//pull/12749/files) | general: workarounds for SMMU syncing issues | [liamwhite](https://github.com/liamwhite/) | Yes |
+| [12499](https://github.com/yuzu-emu/yuzu-android//pull/12499) | [`ac964a067`](https://github.com/yuzu-emu/yuzu-android//pull/12499/files) | Rework time services | [Kelebek1](https://github.com/Kelebek1/) | Yes |
-| [12760](https://github.com/yuzu-emu/yuzu-android//pull/12760) | [`0e9c39c9f`](https://github.com/yuzu-emu/yuzu-android//pull/12760/files) | am: rewrite for multiprocess support | [liamwhite](https://github.com/liamwhite/) | Yes |
+| [12579](https://github.com/yuzu-emu/yuzu-android//pull/12579) | [`748465f5a`](https://github.com/yuzu-emu/yuzu-android//pull/12579/files) | Core: Implement Device Mapping & GPU SMMU | [FernandoS27](https://github.com/FernandoS27/) | Yes |
-| [12802](https://github.com/yuzu-emu/yuzu-android//pull/12802) | [`c5e88c654`](https://github.com/yuzu-emu/yuzu-android//pull/12802/files) | service: mii: Migrate service to new interface | [german77](https://github.com/german77/) | Yes |
+| [12736](https://github.com/yuzu-emu/yuzu-android//pull/12736) | [`961b5586a`](https://github.com/yuzu-emu/yuzu-android//pull/12736/files) | android: Add verify contents buttons | [t895](https://github.com/t895/) | Yes |
 
 
 End of merge log. You can find the original README.md below the break.

src/android/app/build.gradle.kts

@@ -82,8 +82,8 @@ android {
     }
 
     val keystoreFile = System.getenv("ANDROID_KEYSTORE_FILE")
-    signingConfigs {
+    if (keystoreFile != null) {
-        if (keystoreFile != null) {
+        signingConfigs {
             create("release") {
                 storeFile = file(keystoreFile)
                 storePassword = System.getenv("ANDROID_KEYSTORE_PASS")
@@ -91,12 +91,6 @@ android {
                 keyPassword = System.getenv("ANDROID_KEYSTORE_PASS")
             }
         }
-        create("default") {
-            storeFile = file("$projectDir/debug.keystore")
-            storePassword = "android"
-            keyAlias = "androiddebugkey"
-            keyPassword = "android"
-        }
     }
 
     // Define build types, which are orthogonal to product flavors.
@@ -107,7 +101,7 @@ android {
             signingConfig = if (keystoreFile != null) {
                 signingConfigs.getByName("release")
             } else {
-                signingConfigs.getByName("default")
+                signingConfigs.getByName("debug")
             }
 
             resValue("string", "app_name_suffixed", "yuzu")
@@ -124,7 +118,7 @@ android {
         register("relWithDebInfo") {
             isDefault = true
             resValue("string", "app_name_suffixed", "yuzu Debug Release")
-            signingConfig = signingConfigs.getByName("default")
+            signingConfig = signingConfigs.getByName("debug")
             isMinifyEnabled = true
             isDebuggable = true
             proguardFiles(
@@ -139,7 +133,6 @@ android {
         // Signed by debug key disallowing distribution on Play Store.
         // Attaches 'debug' suffix to version and package name, allowing installation alongside the release build.
         debug {
-            signingConfig = signingConfigs.getByName("default")
             resValue("string", "app_name_suffixed", "yuzu Debug")
             isDebuggable = true
             isJniDebuggable = true

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

@@ -303,11 +303,6 @@ object NativeLibrary {
      */
     external fun getCpuBackend(): String
 
-    /**
-     * Returns the current GPU Driver.
-     */
-    external fun getGpuDriver(): String
-
     external fun applySettings()
 
     external fun logSettings()
@@ -619,11 +614,6 @@ object NativeLibrary {
      */
     external fun clearFilesystemProvider()
 
-    /**
-     * Checks if all necessary keys are present for decryption
-     */
-    external fun areKeysPresent(): Boolean
-
     /**
      * Button type for use in onTouchEvent
      */

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

@@ -193,10 +193,6 @@ class EmulationActivity : AppCompatActivity(), SensorEventListener {
             return super.dispatchKeyEvent(event)
         }
 
-        if (emulationViewModel.drawerOpen.value) {
-            return super.dispatchKeyEvent(event)
-        }
-
         return InputHandler.dispatchKeyEvent(event)
     }
 
@@ -207,10 +203,6 @@ class EmulationActivity : AppCompatActivity(), SensorEventListener {
             return super.dispatchGenericMotionEvent(event)
         }
 
-        if (emulationViewModel.drawerOpen.value) {
-            return super.dispatchGenericMotionEvent(event)
-        }
-
         // Don't attempt to do anything if we are disconnecting a device.
         if (event.actionMasked == MotionEvent.ACTION_CANCEL) {
             return true

src/android/app/src/main/java/org/yuzu/yuzu_emu/adapters/AbstractDiffAdapter.kt

@@ -14,20 +14,15 @@ import androidx.recyclerview.widget.RecyclerView
  * Generic adapter that implements an [AsyncDifferConfig] and covers some of the basic boilerplate
  * code used in every [RecyclerView].
  * Type assigned to [Model] must inherit from [Object] in order to be compared properly.
- * @param exact Decides whether each item will be compared by reference or by their contents
  */
-abstract class AbstractDiffAdapter<Model : Any, Holder : AbstractViewHolder<Model>>(
+abstract class AbstractDiffAdapter<Model : Any, Holder : AbstractViewHolder<Model>> :
-    exact: Boolean = true
+    ListAdapter<Model, Holder>(AsyncDifferConfig.Builder(DiffCallback<Model>()).build()) {
-) : ListAdapter<Model, Holder>(AsyncDifferConfig.Builder(DiffCallback<Model>(exact)).build()) {
     override fun onBindViewHolder(holder: Holder, position: Int) =
         holder.bind(currentList[position])
 
-    private class DiffCallback<Model>(val exact: Boolean) : DiffUtil.ItemCallback<Model>() {
+    private class DiffCallback<Model> : DiffUtil.ItemCallback<Model>() {
         override fun areItemsTheSame(oldItem: Model & Any, newItem: Model & Any): Boolean {
-            if (exact) {
+            return oldItem === newItem
-                return oldItem === newItem
-            }
-            return oldItem == newItem
         }
 
         @SuppressLint("DiffUtilEquals")

src/android/app/src/main/java/org/yuzu/yuzu_emu/adapters/GameAdapter.kt

@@ -3,6 +3,9 @@
 
 package org.yuzu.yuzu_emu.adapters
 
+import android.content.Intent
+import android.graphics.Bitmap
+import android.graphics.drawable.LayerDrawable
 import android.net.Uri
 import android.text.TextUtils
 import android.view.LayoutInflater
@@ -12,6 +15,10 @@ import android.widget.Toast
 import androidx.appcompat.app.AppCompatActivity
 import androidx.core.content.pm.ShortcutInfoCompat
 import androidx.core.content.pm.ShortcutManagerCompat
+import androidx.core.content.res.ResourcesCompat
+import androidx.core.graphics.drawable.IconCompat
+import androidx.core.graphics.drawable.toBitmap
+import androidx.core.graphics.drawable.toDrawable
 import androidx.documentfile.provider.DocumentFile
 import androidx.lifecycle.ViewModelProvider
 import androidx.lifecycle.lifecycleScope
@@ -23,6 +30,7 @@ import kotlinx.coroutines.withContext
 import org.yuzu.yuzu_emu.HomeNavigationDirections
 import org.yuzu.yuzu_emu.R
 import org.yuzu.yuzu_emu.YuzuApplication
+import org.yuzu.yuzu_emu.activities.EmulationActivity
 import org.yuzu.yuzu_emu.databinding.CardGameBinding
 import org.yuzu.yuzu_emu.model.Game
 import org.yuzu.yuzu_emu.model.GamesViewModel
@@ -30,7 +38,7 @@ import org.yuzu.yuzu_emu.utils.GameIconUtils
 import org.yuzu.yuzu_emu.viewholder.AbstractViewHolder
 
 class GameAdapter(private val activity: AppCompatActivity) :
-    AbstractDiffAdapter<Game, GameAdapter.GameViewHolder>(exact = false) {
+    AbstractDiffAdapter<Game, GameAdapter.GameViewHolder>() {
     override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): GameViewHolder {
         CardGameBinding.inflate(LayoutInflater.from(parent.context), parent, false)
             .also { return GameViewHolder(it) }
@@ -81,13 +89,36 @@ class GameAdapter(private val activity: AppCompatActivity) :
                 )
                 .apply()
 
+            val openIntent =
+                Intent(YuzuApplication.appContext, EmulationActivity::class.java).apply {
+                    action = Intent.ACTION_VIEW
+                    data = Uri.parse(game.path)
+                }
+
             activity.lifecycleScope.launch {
                 withContext(Dispatchers.IO) {
+                    val layerDrawable = ResourcesCompat.getDrawable(
+                        YuzuApplication.appContext.resources,
+                        R.drawable.shortcut,
+                        null
+                    ) as LayerDrawable
+                    layerDrawable.setDrawableByLayerId(
+                        R.id.shortcut_foreground,
+                        GameIconUtils.getGameIcon(activity, game)
+                            .toDrawable(YuzuApplication.appContext.resources)
+                    )
+                    val inset = YuzuApplication.appContext.resources
+                        .getDimensionPixelSize(R.dimen.icon_inset)
+                    layerDrawable.setLayerInset(1, inset, inset, inset, inset)
                     val shortcut =
                         ShortcutInfoCompat.Builder(YuzuApplication.appContext, game.path)
                             .setShortLabel(game.title)
-                            .setIcon(GameIconUtils.getShortcutIcon(activity, game))
+                            .setIcon(
-                            .setIntent(game.launchIntent)
+                                IconCompat.createWithAdaptiveBitmap(
+                                    layerDrawable.toBitmap(config = Bitmap.Config.ARGB_8888)
+                                )
+                            )
+                            .setIntent(openIntent)
                             .build()
                     ShortcutManagerCompat.pushDynamicShortcut(YuzuApplication.appContext, shortcut)
                 }

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

@@ -23,8 +23,7 @@ enum class IntSetting(override val key: String) : AbstractIntSetting {
     THEME("theme"),
     THEME_MODE("theme_mode"),
     OVERLAY_SCALE("control_scale"),
-    OVERLAY_OPACITY("control_opacity"),
+    OVERLAY_OPACITY("control_opacity");
-    LOCK_DRAWER("lock_drawer");
 
     override fun getInt(needsGlobal: Boolean): Int = NativeConfig.getInt(key, needsGlobal)
 

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

@@ -77,7 +77,7 @@ class AboutFragment : Fragment() {
         }
 
         binding.textVersionName.text = BuildConfig.VERSION_NAME
-        binding.buttonVersionName.setOnClickListener {
+        binding.textVersionName.setOnClickListener {
             val clipBoard =
                 requireContext().getSystemService(Context.CLIPBOARD_SERVICE) as ClipboardManager
             val clip = ClipData.newPlainText(getString(R.string.build), BuildConfig.GIT_HASH)

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

@@ -141,9 +141,7 @@ class EmulationFragment : Fragment(), SurfaceHolder.Callback {
 
         // So this fragment doesn't restart on configuration changes; i.e. rotation.
         retainInstance = true
-        emulationState = EmulationState(game.path) {
+        emulationState = EmulationState(game.path)
-            return@EmulationState driverViewModel.isInteractionAllowed.value
-        }
     }
 
     /**
@@ -184,14 +182,11 @@ class EmulationFragment : Fragment(), SurfaceHolder.Callback {
             }
 
             override fun onDrawerOpened(drawerView: View) {
-                binding.drawerLayout.setDrawerLockMode(DrawerLayout.LOCK_MODE_UNLOCKED)
+                // No op
-                binding.inGameMenu.requestFocus()
-                emulationViewModel.setDrawerOpen(true)
             }
 
             override fun onDrawerClosed(drawerView: View) {
-                binding.drawerLayout.setDrawerLockMode(IntSetting.LOCK_DRAWER.getInt())
+                // No op
-                emulationViewModel.setDrawerOpen(false)
             }
 
             override fun onDrawerStateChanged(newState: Int) {
@@ -201,28 +196,6 @@ class EmulationFragment : Fragment(), SurfaceHolder.Callback {
         binding.drawerLayout.setDrawerLockMode(DrawerLayout.LOCK_MODE_LOCKED_CLOSED)
         binding.inGameMenu.getHeaderView(0).findViewById<TextView>(R.id.text_game_title).text =
             game.title
-
-        binding.inGameMenu.menu.findItem(R.id.menu_lock_drawer).apply {
-            val lockMode = IntSetting.LOCK_DRAWER.getInt()
-            val titleId = if (lockMode == DrawerLayout.LOCK_MODE_LOCKED_CLOSED) {
-                R.string.unlock_drawer
-            } else {
-                R.string.lock_drawer
-            }
-            val iconId = if (lockMode == DrawerLayout.LOCK_MODE_UNLOCKED) {
-                R.drawable.ic_unlock
-            } else {
-                R.drawable.ic_lock
-            }
-
-            title = getString(titleId)
-            icon = ResourcesCompat.getDrawable(
-                resources,
-                iconId,
-                requireContext().theme
-            )
-        }
-
         binding.inGameMenu.setNavigationItemSelectedListener {
             when (it.itemId) {
                 R.id.menu_pause_emulation -> {
@@ -243,7 +216,6 @@ class EmulationFragment : Fragment(), SurfaceHolder.Callback {
                             requireContext().theme
                         )
                     }
-                    binding.inGameMenu.requestFocus()
                     true
                 }
 
@@ -252,7 +224,6 @@ class EmulationFragment : Fragment(), SurfaceHolder.Callback {
                         null,
                         Settings.MenuTag.SECTION_ROOT
                     )
-                    binding.inGameMenu.requestFocus()
                     binding.root.findNavController().navigate(action)
                     true
                 }
@@ -262,7 +233,6 @@ class EmulationFragment : Fragment(), SurfaceHolder.Callback {
                         args.game,
                         Settings.MenuTag.SECTION_ROOT
                     )
-                    binding.inGameMenu.requestFocus()
                     binding.root.findNavController().navigate(action)
                     true
                 }
@@ -272,39 +242,11 @@ class EmulationFragment : Fragment(), SurfaceHolder.Callback {
                     true
                 }
 
-                R.id.menu_lock_drawer -> {
-                    when (IntSetting.LOCK_DRAWER.getInt()) {
-                        DrawerLayout.LOCK_MODE_UNLOCKED -> {
-                            IntSetting.LOCK_DRAWER.setInt(DrawerLayout.LOCK_MODE_LOCKED_CLOSED)
-                            it.title = resources.getString(R.string.unlock_drawer)
-                            it.icon = ResourcesCompat.getDrawable(
-                                resources,
-                                R.drawable.ic_lock,
-                                requireContext().theme
-                            )
-                        }
-
-                        DrawerLayout.LOCK_MODE_LOCKED_CLOSED -> {
-                            IntSetting.LOCK_DRAWER.setInt(DrawerLayout.LOCK_MODE_UNLOCKED)
-                            it.title = resources.getString(R.string.lock_drawer)
-                            it.icon = ResourcesCompat.getDrawable(
-                                resources,
-                                R.drawable.ic_unlock,
-                                requireContext().theme
-                            )
-                        }
-                    }
-                    binding.inGameMenu.requestFocus()
-                    NativeConfig.saveGlobalConfig()
-                    true
-                }
-
                 R.id.menu_exit -> {
                     emulationState.stop()
-                    NativeConfig.reloadGlobalConfig()
                     emulationViewModel.setIsEmulationStopping(true)
                     binding.drawerLayout.close()
-                    binding.inGameMenu.requestFocus()
+                    binding.drawerLayout.setDrawerLockMode(DrawerLayout.LOCK_MODE_LOCKED_CLOSED)
                     true
                 }
 
@@ -321,7 +263,12 @@ class EmulationFragment : Fragment(), SurfaceHolder.Callback {
                     if (!NativeLibrary.isRunning()) {
                         return
                     }
-                    emulationViewModel.setDrawerOpen(!binding.drawerLayout.isOpen)
+
+                    if (binding.drawerLayout.isOpen) {
+                        binding.drawerLayout.close()
+                    } else {
+                        binding.drawerLayout.open()
+                    }
                 }
             }
         )
@@ -375,20 +322,11 @@ class EmulationFragment : Fragment(), SurfaceHolder.Callback {
                     }
                 }
             }
-            launch {
-                repeatOnLifecycle(Lifecycle.State.RESUMED) {
-                    driverViewModel.isInteractionAllowed.collect {
-                        if (it) {
-                            startEmulation()
-                        }
-                    }
-                }
-            }
             launch {
                 repeatOnLifecycle(Lifecycle.State.CREATED) {
                     emulationViewModel.emulationStarted.collectLatest {
                         if (it) {
-                            binding.drawerLayout.setDrawerLockMode(IntSetting.LOCK_DRAWER.getInt())
+                            binding.drawerLayout.setDrawerLockMode(DrawerLayout.LOCK_MODE_UNLOCKED)
                             ViewUtils.showView(binding.surfaceInputOverlay)
                             ViewUtils.hideView(binding.loadingIndicator)
 
@@ -413,13 +351,10 @@ class EmulationFragment : Fragment(), SurfaceHolder.Callback {
                 }
             }
             launch {
-                repeatOnLifecycle(Lifecycle.State.CREATED) {
+                repeatOnLifecycle(Lifecycle.State.RESUMED) {
-                    emulationViewModel.drawerOpen.collect {
+                    driverViewModel.isInteractionAllowed.collect {
                         if (it) {
-                            binding.drawerLayout.open()
+                            onEmulationStart()
-                            binding.inGameMenu.requestFocus()
-                        } else {
-                            binding.drawerLayout.close()
                         }
                     }
                 }
@@ -427,7 +362,7 @@ class EmulationFragment : Fragment(), SurfaceHolder.Callback {
         }
     }
 
-    private fun startEmulation() {
+    private fun onEmulationStart() {
         if (!NativeLibrary.isRunning() && !NativeLibrary.isPaused()) {
             if (!DirectoryInitialization.areDirectoriesReady) {
                 DirectoryInitialization.start()
@@ -502,15 +437,12 @@ class EmulationFragment : Fragment(), SurfaceHolder.Callback {
             val FRAMETIME = 2
             val SPEED = 3
             perfStatsUpdater = {
-                if (emulationViewModel.emulationStarted.value &&
+                if (emulationViewModel.emulationStarted.value) {
-                    !emulationViewModel.isEmulationStopping.value
-                ) {
                     val perfStats = NativeLibrary.getPerfStats()
                     val cpuBackend = NativeLibrary.getCpuBackend()
-                    val gpuDriver = NativeLibrary.getGpuDriver()
                     if (_binding != null) {
                         binding.showFpsText.text =
-                            String.format("FPS: %.1f\n%s/%s", perfStats[FPS], cpuBackend, gpuDriver)
+                            String.format("FPS: %.1f\n%s", perfStats[FPS], cpuBackend)
                     }
                     perfStatsUpdateHandler.postDelayed(perfStatsUpdater!!, 800)
                 }
@@ -827,10 +759,7 @@ class EmulationFragment : Fragment(), SurfaceHolder.Callback {
         }
     }
 
-    private class EmulationState(
+    private class EmulationState(private val gamePath: String) {
-        private val gamePath: String,
-        private val emulationCanStart: () -> Boolean
-    ) {
         private var state: State
         private var surface: Surface? = null
 
@@ -924,7 +853,6 @@ class EmulationFragment : Fragment(), SurfaceHolder.Callback {
                     State.PAUSED -> Log.warning(
                         "[EmulationFragment] Surface cleared while emulation paused."
                     )
-
                     else -> Log.warning(
                         "[EmulationFragment] Surface cleared while emulation stopped."
                     )
@@ -934,10 +862,6 @@ class EmulationFragment : Fragment(), SurfaceHolder.Callback {
 
         private fun runWithValidSurface() {
             NativeLibrary.surfaceChanged(surface)
-            if (!emulationCanStart.invoke()) {
-                return
-            }
-
             when (state) {
                 State.STOPPED -> {
                     val emulationThread = Thread({

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

@@ -4,8 +4,6 @@
 package org.yuzu.yuzu_emu.fragments
 
 import android.annotation.SuppressLint
-import android.content.pm.ShortcutInfo
-import android.content.pm.ShortcutManager
 import android.os.Bundle
 import android.text.TextUtils
 import android.view.LayoutInflater
@@ -86,24 +84,6 @@ class GamePropertiesFragment : Fragment() {
             view.findNavController().popBackStack()
         }
 
-        val shortcutManager = requireActivity().getSystemService(ShortcutManager::class.java)
-        binding.buttonShortcut.isEnabled = shortcutManager.isRequestPinShortcutSupported
-        binding.buttonShortcut.setOnClickListener {
-            viewLifecycleOwner.lifecycleScope.launch {
-                withContext(Dispatchers.IO) {
-                    val shortcut = ShortcutInfo.Builder(requireContext(), args.game.title)
-                        .setShortLabel(args.game.title)
-                        .setIcon(
-                            GameIconUtils.getShortcutIcon(requireActivity(), args.game)
-                                .toIcon(requireContext())
-                        )
-                        .setIntent(args.game.launchIntent)
-                        .build()
-                    shortcutManager.requestPinShortcut(shortcut, null)
-                }
-            }
-        }
-
         GameIconUtils.loadGameIcon(args.game, binding.imageGameScreen)
         binding.title.text = args.game.title
         binding.title.postDelayed(

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

@@ -153,13 +153,7 @@ class HomeSettingsFragment : Fragment() {
                             cancellable = true
                         ) { progressCallback, _ ->
                             val result = NativeLibrary.verifyInstalledContents(progressCallback)
-                            return@newInstance if (progressCallback.invoke(100, 100)) {
+                            return@newInstance if (result.isEmpty()) {
-                                // Invoke the progress callback to check if the process was cancelled
-                                MessageDialogFragment.newInstance(
-                                    titleId = R.string.verify_no_result,
-                                    descriptionId = R.string.verify_no_result_description
-                                )
-                            } else if (result.isEmpty()) {
                                 MessageDialogFragment.newInstance(
                                     titleId = R.string.verify_success,
                                     descriptionId = R.string.operation_completed_successfully

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

@@ -26,15 +26,9 @@ class MessageDialogFragment : DialogFragment() {
         val descriptionId = requireArguments().getInt(DESCRIPTION_ID)
         val descriptionString = requireArguments().getString(DESCRIPTION_STRING)!!
         val helpLinkId = requireArguments().getInt(HELP_LINK)
-        val dismissible = requireArguments().getBoolean(DISMISSIBLE)
-        val clearPositiveAction = requireArguments().getBoolean(CLEAR_POSITIVE_ACTION)
 
         val builder = MaterialAlertDialogBuilder(requireContext())
 
-        if (clearPositiveAction) {
-            messageDialogViewModel.positiveAction = null
-        }
-
         if (messageDialogViewModel.positiveAction == null) {
             builder.setPositiveButton(R.string.close, null)
         } else {
@@ -57,8 +51,6 @@ class MessageDialogFragment : DialogFragment() {
             }
         }
 
-        isCancelable = dismissible
-
         return builder.show()
     }
 
@@ -75,8 +67,6 @@ class MessageDialogFragment : DialogFragment() {
         private const val DESCRIPTION_ID = "DescriptionId"
         private const val DESCRIPTION_STRING = "DescriptionString"
         private const val HELP_LINK = "Link"
-        private const val DISMISSIBLE = "Dismissible"
-        private const val CLEAR_POSITIVE_ACTION = "ClearPositiveAction"
 
         fun newInstance(
             activity: FragmentActivity? = null,
@@ -85,28 +75,22 @@ class MessageDialogFragment : DialogFragment() {
             descriptionId: Int = 0,
             descriptionString: String = "",
             helpLinkId: Int = 0,
-            dismissible: Boolean = true,
             positiveAction: (() -> Unit)? = null
         ): MessageDialogFragment {
-            var clearPositiveAction = false
-            if (activity != null) {
-                ViewModelProvider(activity)[MessageDialogViewModel::class.java].apply {
-                    clear()
-                    this.positiveAction = positiveAction
-                }
-            } else {
-                clearPositiveAction = true
-            }
-
             val dialog = MessageDialogFragment()
-            val bundle = Bundle().apply {
+            val bundle = Bundle()
+            bundle.apply {
                 putInt(TITLE_ID, titleId)
                 putString(TITLE_STRING, titleString)
                 putInt(DESCRIPTION_ID, descriptionId)
                 putString(DESCRIPTION_STRING, descriptionString)
                 putInt(HELP_LINK, helpLinkId)
-                putBoolean(DISMISSIBLE, dismissible)
+            }
-                putBoolean(CLEAR_POSITIVE_ACTION, clearPositiveAction)
+            if (activity != null) {
+                ViewModelProvider(activity)[MessageDialogViewModel::class.java].apply {
+                    clear()
+                    this.positiveAction = positiveAction
+                }
             }
             dialog.arguments = bundle
             return dialog

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

@@ -31,7 +31,6 @@ import androidx.preference.PreferenceManager
 import androidx.viewpager2.widget.ViewPager2.OnPageChangeCallback
 import com.google.android.material.transition.MaterialFadeThrough
 import kotlinx.coroutines.launch
-import org.yuzu.yuzu_emu.NativeLibrary
 import java.io.File
 import org.yuzu.yuzu_emu.R
 import org.yuzu.yuzu_emu.YuzuApplication
@@ -163,7 +162,7 @@ class SetupFragment : Fragment() {
                     R.string.install_prod_keys_warning_help,
                     {
                         val file = File(DirectoryInitialization.userDirectory + "/keys/prod.keys")
-                        if (file.exists() && NativeLibrary.areKeysPresent()) {
+                        if (file.exists()) {
                             StepState.COMPLETE
                         } else {
                             StepState.INCOMPLETE
@@ -348,8 +347,7 @@ class SetupFragment : Fragment() {
     val getProdKey =
         registerForActivityResult(ActivityResultContracts.OpenDocument()) { result ->
             if (result != null) {
-                mainActivity.processKey(result)
+                if (mainActivity.processKey(result)) {
-                if (NativeLibrary.areKeysPresent()) {
                     keyCallback.onStepCompleted()
                 }
             }

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

@@ -144,7 +144,6 @@ class DriverViewModel : ViewModel() {
         val selectedDriverFile = File(StringSetting.DRIVER_PATH.getString())
         val selectedDriverMetadata = GpuDriverHelper.customDriverSettingData
         if (GpuDriverHelper.installedCustomDriverData == selectedDriverMetadata) {
-            setDriverReady()
             return
         }
 

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

@@ -6,7 +6,6 @@ package org.yuzu.yuzu_emu.model
 import androidx.lifecycle.ViewModel
 import kotlinx.coroutines.flow.MutableStateFlow
 import kotlinx.coroutines.flow.StateFlow
-import kotlinx.coroutines.flow.asStateFlow
 
 class EmulationViewModel : ViewModel() {
     val emulationStarted: StateFlow<Boolean> get() = _emulationStarted
@@ -24,9 +23,6 @@ class EmulationViewModel : ViewModel() {
     val shaderMessage: StateFlow<String> get() = _shaderMessage
     private val _shaderMessage = MutableStateFlow("")
 
-    private val _drawerOpen = MutableStateFlow(false)
-    val drawerOpen = _drawerOpen.asStateFlow()
-
     fun setEmulationStarted(started: Boolean) {
         _emulationStarted.value = started
     }
@@ -53,10 +49,6 @@ class EmulationViewModel : ViewModel() {
         setTotalShaders(max)
     }
 
-    fun setDrawerOpen(value: Boolean) {
-        _drawerOpen.value = value
-    }
-
     fun clear() {
         setEmulationStarted(false)
         setIsEmulationStopping(false)

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

@@ -3,7 +3,6 @@
 
 package org.yuzu.yuzu_emu.model
 
-import android.content.Intent
 import android.net.Uri
 import android.os.Parcelable
 import java.util.HashSet
@@ -12,7 +11,6 @@ import kotlinx.serialization.Serializable
 import org.yuzu.yuzu_emu.NativeLibrary
 import org.yuzu.yuzu_emu.R
 import org.yuzu.yuzu_emu.YuzuApplication
-import org.yuzu.yuzu_emu.activities.EmulationActivity
 import org.yuzu.yuzu_emu.utils.DirectoryInitialization
 import org.yuzu.yuzu_emu.utils.FileUtil
 import java.time.LocalDateTime
@@ -63,26 +61,12 @@ class Game(
     val addonDir: String
         get() = DirectoryInitialization.userDirectory + "/load/" + programIdHex + "/"
 
-    val launchIntent: Intent
+    override fun equals(other: Any?): Boolean {
-        get() = Intent(YuzuApplication.appContext, EmulationActivity::class.java).apply {
+        if (other !is Game) {
-            action = Intent.ACTION_VIEW
+            return false
-            data = Uri.parse(path)
         }
 
-    override fun equals(other: Any?): Boolean {
+        return hashCode() == other.hashCode()
-        if (this === other) return true
-        if (javaClass != other?.javaClass) return false
-
-        other as Game
-
-        if (title != other.title) return false
-        if (path != other.path) return false
-        if (programId != other.programId) return false
-        if (developer != other.developer) return false
-        if (version != other.version) return false
-        if (isHomebrew != other.isHomebrew) return false
-
-        return true
     }
 
     override fun hashCode(): Int {

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

@@ -31,9 +31,6 @@ class HomeViewModel : ViewModel() {
     private val _reloadPropertiesList = MutableStateFlow(false)
     val reloadPropertiesList get() = _reloadPropertiesList.asStateFlow()
 
-    private val _checkKeys = MutableStateFlow(false)
-    val checkKeys = _checkKeys.asStateFlow()
-
     var navigatedToSetup = false
 
     fun setNavigationVisibility(visible: Boolean, animated: Boolean) {
@@ -69,8 +66,4 @@ class HomeViewModel : ViewModel() {
     fun reloadPropertiesList(reload: Boolean) {
         _reloadPropertiesList.value = reload
     }
-
-    fun setCheckKeys(value: Boolean) {
-        _checkKeys.value = value
-    }
 }

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

@@ -64,9 +64,6 @@ class MainActivity : AppCompatActivity(), ThemeProvider {
 
     override var themeId: Int = 0
 
-    private val CHECKED_DECRYPTION = "CheckedDecryption"
-    private var checkedDecryption = false
-
     override fun onCreate(savedInstanceState: Bundle?) {
         val splashScreen = installSplashScreen()
         splashScreen.setKeepOnScreenCondition { !DirectoryInitialization.areDirectoriesReady }
@@ -78,18 +75,6 @@ class MainActivity : AppCompatActivity(), ThemeProvider {
         binding = ActivityMainBinding.inflate(layoutInflater)
         setContentView(binding.root)
 
-        if (savedInstanceState != null) {
-            checkedDecryption = savedInstanceState.getBoolean(CHECKED_DECRYPTION)
-        }
-        if (!checkedDecryption) {
-            val firstTimeSetup = PreferenceManager.getDefaultSharedPreferences(applicationContext)
-                .getBoolean(Settings.PREF_FIRST_APP_LAUNCH, true)
-            if (!firstTimeSetup) {
-                checkKeys()
-            }
-            checkedDecryption = true
-        }
-
         WindowCompat.setDecorFitsSystemWindows(window, false)
         window.setSoftInputMode(WindowManager.LayoutParams.SOFT_INPUT_ADJUST_NOTHING)
 
@@ -165,16 +150,6 @@ class MainActivity : AppCompatActivity(), ThemeProvider {
                     }
                 }
             }
-            launch {
-                repeatOnLifecycle(Lifecycle.State.CREATED) {
-                    homeViewModel.checkKeys.collect {
-                        if (it) {
-                            checkKeys()
-                            homeViewModel.setCheckKeys(false)
-                        }
-                    }
-                }
-            }
         }
 
         // Dismiss previous notifications (should not happen unless a crash occurred)
@@ -183,21 +158,6 @@ class MainActivity : AppCompatActivity(), ThemeProvider {
         setInsets()
     }
 
-    private fun checkKeys() {
-        if (!NativeLibrary.areKeysPresent()) {
-            MessageDialogFragment.newInstance(
-                titleId = R.string.keys_missing,
-                descriptionId = R.string.keys_missing_description,
-                helpLinkId = R.string.keys_missing_help
-            ).show(supportFragmentManager, MessageDialogFragment.TAG)
-        }
-    }
-
-    override fun onSaveInstanceState(outState: Bundle) {
-        super.onSaveInstanceState(outState)
-        outState.putBoolean(CHECKED_DECRYPTION, checkedDecryption)
-    }
-
     fun finishSetup(navController: NavController) {
         navController.navigate(R.id.action_firstTimeSetupFragment_to_gamesFragment)
         (binding.navigationView as NavigationBarView).setupWithNavController(navController)
@@ -389,7 +349,6 @@ class MainActivity : AppCompatActivity(), ThemeProvider {
                     R.string.install_keys_success,
                     Toast.LENGTH_SHORT
                 ).show()
-                homeViewModel.setCheckKeys(true)
                 gamesViewModel.reloadGames(true)
                 return true
             } else {
@@ -440,7 +399,6 @@ class MainActivity : AppCompatActivity(), ThemeProvider {
                         firmwarePath.deleteRecursively()
                         cacheFirmwareDir.copyRecursively(firmwarePath, true)
                         NativeLibrary.initializeSystem(true)
-                        homeViewModel.setCheckKeys(true)
                         getString(R.string.save_file_imported_success)
                     }
                 } catch (e: Exception) {

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

@@ -5,10 +5,7 @@ package org.yuzu.yuzu_emu.utils
 
 import android.graphics.Bitmap
 import android.graphics.BitmapFactory
-import android.graphics.drawable.LayerDrawable
 import android.widget.ImageView
-import androidx.core.content.res.ResourcesCompat
-import androidx.core.graphics.drawable.IconCompat
 import androidx.core.graphics.drawable.toBitmap
 import androidx.core.graphics.drawable.toDrawable
 import androidx.lifecycle.LifecycleOwner
@@ -88,22 +85,4 @@ object GameIconUtils {
         return imageLoader.execute(request)
             .drawable!!.toBitmap(config = Bitmap.Config.ARGB_8888)
     }
-
-    suspend fun getShortcutIcon(lifecycleOwner: LifecycleOwner, game: Game): IconCompat {
-        val layerDrawable = ResourcesCompat.getDrawable(
-            YuzuApplication.appContext.resources,
-            R.drawable.shortcut,
-            null
-        ) as LayerDrawable
-        layerDrawable.setDrawableByLayerId(
-            R.id.shortcut_foreground,
-            getGameIcon(lifecycleOwner, game).toDrawable(YuzuApplication.appContext.resources)
-        )
-        val inset = YuzuApplication.appContext.resources
-            .getDimensionPixelSize(R.dimen.icon_inset)
-        layerDrawable.setLayerInset(1, inset, inset, inset, inset)
-        return IconCompat.createWithAdaptiveBitmap(
-            layerDrawable.toBitmap(config = Bitmap.Config.ARGB_8888)
-        )
-    }
 }

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

@@ -63,7 +63,6 @@ struct Values {
     Settings::Setting<bool> show_input_overlay{linkage, true, "show_input_overlay",
                                                Settings::Category::Overlay};
     Settings::Setting<bool> touchscreen{linkage, true, "touchscreen", Settings::Category::Overlay};
-    Settings::Setting<s32> lock_drawer{linkage, false, "lock_drawer", Settings::Category::Overlay};
 };
 
 extern Values values;

src/android/app/src/main/jni/applets/software_keyboard.cpp

@@ -82,7 +82,7 @@ AndroidKeyboard::ResultData AndroidKeyboard::ResultData::CreateFromFrontend(jobj
     const jstring string = reinterpret_cast<jstring>(env->GetObjectField(
         object, env->GetFieldID(s_keyboard_data_class, "text", "Ljava/lang/String;")));
     return ResultData{GetJString(env, string),
-                      static_cast<Service::AM::Frontend::SwkbdResult>(env->GetIntField(
+                      static_cast<Service::AM::Applets::SwkbdResult>(env->GetIntField(
                           object, env->GetFieldID(s_keyboard_data_class, "result", "I")))};
 }
 
@@ -149,7 +149,7 @@ void AndroidKeyboard::ShowNormalKeyboard() const {
 }
 
 void AndroidKeyboard::ShowTextCheckDialog(
-    Service::AM::Frontend::SwkbdTextCheckResult text_check_result,
+    Service::AM::Applets::SwkbdTextCheckResult text_check_result,
     std::u16string text_check_message) const {
     LOG_WARNING(Frontend, "(STUBBED) called, backend requested to show the text check dialog.");
 }
@@ -204,7 +204,7 @@ void AndroidKeyboard::InlineTextChanged(
              "\ncursor_position={}",
              Common::UTF16ToUTF8(text_parameters.input_text), text_parameters.cursor_position);
 
-    submit_inline_callback(Service::AM::Frontend::SwkbdReplyType::ChangedString,
+    submit_inline_callback(Service::AM::Applets::SwkbdReplyType::ChangedString,
                            text_parameters.input_text, text_parameters.cursor_position);
 }
 
@@ -219,7 +219,7 @@ void AndroidKeyboard::SubmitInlineKeyboardText(std::u16string submitted_text) {
 
     m_current_text += submitted_text;
 
-    submit_inline_callback(Service::AM::Frontend::SwkbdReplyType::ChangedString, m_current_text,
+    submit_inline_callback(Service::AM::Applets::SwkbdReplyType::ChangedString, m_current_text,
                            m_current_text.size());
 }
 
@@ -236,12 +236,12 @@ void AndroidKeyboard::SubmitInlineKeyboardInput(int key_code) {
     case KEYCODE_BACK:
     case KEYCODE_ENTER:
         m_is_inline_active = false;
-        submit_inline_callback(Service::AM::Frontend::SwkbdReplyType::DecidedEnter, m_current_text,
+        submit_inline_callback(Service::AM::Applets::SwkbdReplyType::DecidedEnter, m_current_text,
                                static_cast<s32>(m_current_text.size()));
         break;
     case KEYCODE_DEL:
         m_current_text.pop_back();
-        submit_inline_callback(Service::AM::Frontend::SwkbdReplyType::ChangedString, m_current_text,
+        submit_inline_callback(Service::AM::Applets::SwkbdReplyType::ChangedString, m_current_text,
                                m_current_text.size());
         break;
     }

src/android/app/src/main/jni/applets/software_keyboard.h

@@ -24,7 +24,7 @@ public:
 
     void ShowNormalKeyboard() const override;
 
-    void ShowTextCheckDialog(Service::AM::Frontend::SwkbdTextCheckResult text_check_result,
+    void ShowTextCheckDialog(Service::AM::Applets::SwkbdTextCheckResult text_check_result,
                              std::u16string text_check_message) const override;
 
     void ShowInlineKeyboard(
@@ -45,7 +45,7 @@ private:
         static ResultData CreateFromFrontend(jobject object);
 
         std::string text;
-        Service::AM::Frontend::SwkbdResult result{};
+        Service::AM::Applets::SwkbdResult result{};
     };
 
     void SubmitNormalText(const ResultData& result) const;

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

@@ -1,12 +1,12 @@
 // SPDX-FileCopyrightText: Copyright 2023 yuzu Emulator Project
 // SPDX-License-Identifier: GPL-2.0-or-later
 
-#include "core/core.h"
+#include <core/core.h>
-#include "core/file_sys/fs_filesystem.h"
+#include <core/file_sys/mode.h>
-#include "core/file_sys/patch_manager.h"
+#include <core/file_sys/patch_manager.h>
+#include <core/loader/nro.h>
+#include <jni.h>
 #include "core/loader/loader.h"
-#include "core/loader/nro.h"
-#include "jni.h"
 #include "jni/android_common/android_common.h"
 #include "native.h"
 
@@ -79,7 +79,7 @@ extern "C" {
 jboolean Java_org_yuzu_yuzu_1emu_utils_GameMetadata_getIsValid(JNIEnv* env, jobject obj,
                                                                jstring jpath) {
     const auto file = EmulationSession::GetInstance().System().GetFilesystem()->OpenFile(
-        GetJString(env, jpath), FileSys::OpenMode::Read);
+        GetJString(env, jpath), FileSys::Mode::Read);
     if (!file) {
         return false;
     }

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

@@ -35,22 +35,20 @@
 #include "core/crypto/key_manager.h"
 #include "core/file_sys/card_image.h"
 #include "core/file_sys/content_archive.h"
-#include "core/file_sys/fs_filesystem.h"
 #include "core/file_sys/submission_package.h"
-#include "core/file_sys/vfs/vfs.h"
+#include "core/file_sys/vfs.h"
-#include "core/file_sys/vfs/vfs_real.h"
+#include "core/file_sys/vfs_real.h"
 #include "core/frontend/applets/cabinet.h"
 #include "core/frontend/applets/controller.h"
 #include "core/frontend/applets/error.h"
-#include "core/frontend/applets/general.h"
+#include "core/frontend/applets/general_frontend.h"
 #include "core/frontend/applets/mii_edit.h"
 #include "core/frontend/applets/profile_select.h"
 #include "core/frontend/applets/software_keyboard.h"
 #include "core/frontend/applets/web_browser.h"
 #include "core/hle/service/am/applet_ae.h"
-#include "core/hle/service/am/applet_manager.h"
 #include "core/hle/service/am/applet_oe.h"
-#include "core/hle/service/am/frontend/applets.h"
+#include "core/hle/service/am/applets/applets.h"
 #include "core/hle/service/filesystem/filesystem.h"
 #include "core/loader/loader.h"
 #include "frontend_common/config.h"
@@ -156,7 +154,7 @@ void EmulationSession::SurfaceChanged() {
 }
 
 void EmulationSession::ConfigureFilesystemProvider(const std::string& filepath) {
-    const auto file = m_system.GetFilesystem()->OpenFile(filepath, FileSys::OpenMode::Read);
+    const auto file = m_system.GetFilesystem()->OpenFile(filepath, FileSys::Mode::Read);
     if (!file) {
         return;
     }
@@ -209,12 +207,6 @@ void EmulationSession::InitializeSystem(bool reload) {
     m_system.GetFileSystemController().CreateFactories(*m_vfs);
 }
 
-void EmulationSession::SetAppletId(int applet_id) {
-    m_applet_id = applet_id;
-    m_system.GetFrontendAppletHolder().SetCurrentAppletId(
-        static_cast<Service::AM::AppletId>(m_applet_id));
-}
-
 Core::SystemResultStatus EmulationSession::InitializeEmulation(const std::string& filepath) {
     std::scoped_lock lock(m_mutex);
 
@@ -229,7 +221,7 @@ Core::SystemResultStatus EmulationSession::InitializeEmulation(const std::string
     m_system.ApplySettings();
     Settings::LogSettings();
     m_system.HIDCore().ReloadInputDevices();
-    m_system.SetFrontendAppletSet({
+    m_system.SetAppletFrontendSet({
         nullptr,                     // Amiibo Settings
         nullptr,                     // Controller Selector
         nullptr,                     // Error Display
@@ -245,10 +237,7 @@ Core::SystemResultStatus EmulationSession::InitializeEmulation(const std::string
     ConfigureFilesystemProvider(filepath);
 
     // Load the ROM.
-    Service::AM::FrontendAppletParameters params{
+    m_load_result = m_system.Load(EmulationSession::GetInstance().Window(), filepath);
-        .applet_id = static_cast<Service::AM::AppletId>(m_applet_id),
-    };
-    m_load_result = m_system.Load(EmulationSession::GetInstance().Window(), filepath, params);
     if (m_load_result != Core::SystemResultStatus::Success) {
         return m_load_result;
     }
@@ -258,7 +247,6 @@ Core::SystemResultStatus EmulationSession::InitializeEmulation(const std::string
     m_system.GetCpuManager().OnGpuReady();
     m_system.RegisterExitCallback([&] { HaltEmulation(); });
 
-    OnEmulationStarted();
     return Core::SystemResultStatus::Success;
 }
 
@@ -333,9 +321,6 @@ void EmulationSession::RunEmulation() {
             }
         }
     }
-
-    // Reset current applet ID.
-    m_applet_id = static_cast<int>(Service::AM::AppletId::Application);
 }
 
 bool EmulationSession::IsHandheldOnly() {
@@ -478,8 +463,8 @@ int Java_org_yuzu_yuzu_1emu_NativeLibrary_installFileToNand(JNIEnv* env, jobject
     };
 
     return static_cast<int>(
-        ContentManager::InstallNSP(EmulationSession::GetInstance().System(),
+        ContentManager::InstallNSP(&EmulationSession::GetInstance().System(),
-                                   *EmulationSession::GetInstance().System().GetFilesystem(),
+                                   EmulationSession::GetInstance().System().GetFilesystem().get(),
                                    GetJString(env, j_file), callback));
 }
 
@@ -489,8 +474,8 @@ jboolean Java_org_yuzu_yuzu_1emu_NativeLibrary_doesUpdateMatchProgram(JNIEnv* en
     u64 program_id = EmulationSession::GetProgramId(env, jprogramId);
     std::string updatePath = GetJString(env, jupdatePath);
     std::shared_ptr<FileSys::NSP> nsp = std::make_shared<FileSys::NSP>(
-        EmulationSession::GetInstance().System().GetFilesystem()->OpenFile(
+        EmulationSession::GetInstance().System().GetFilesystem()->OpenFile(updatePath,
-            updatePath, FileSys::OpenMode::Read));
+                                                                           FileSys::Mode::Read));
     for (const auto& item : nsp->GetNCAs()) {
         for (const auto& nca_details : item.second) {
             if (nca_details.second->GetName().ends_with(".cnmt.nca")) {
@@ -689,11 +674,6 @@ jstring Java_org_yuzu_yuzu_1emu_NativeLibrary_getCpuBackend(JNIEnv* env, jclass
     return ToJString(env, "JIT");
 }
 
-jstring Java_org_yuzu_yuzu_1emu_NativeLibrary_getGpuDriver(JNIEnv* env, jobject jobj) {
-    return ToJString(env,
-                     EmulationSession::GetInstance().System().GPU().Renderer().GetDeviceVendor());
-}
-
 void Java_org_yuzu_yuzu_1emu_NativeLibrary_applySettings(JNIEnv* env, jobject jobj) {
     EmulationSession::GetInstance().System().ApplySettings();
 }
@@ -733,7 +713,7 @@ void Java_org_yuzu_yuzu_1emu_NativeLibrary_initializeEmptyUserDirectory(JNIEnv*
                                                                         jobject instance) {
     const auto nand_dir = Common::FS::GetYuzuPath(Common::FS::YuzuPath::NANDDir);
     auto vfs_nand_dir = EmulationSession::GetInstance().System().GetFilesystem()->OpenDirectory(
-        Common::FS::PathToUTF8String(nand_dir), FileSys::OpenMode::Read);
+        Common::FS::PathToUTF8String(nand_dir), FileSys::Mode::Read);
 
     const auto user_id = EmulationSession::GetInstance().System().GetProfileManager().GetUser(
         static_cast<std::size_t>(0));
@@ -768,12 +748,13 @@ jstring Java_org_yuzu_yuzu_1emu_NativeLibrary_getAppletLaunchPath(JNIEnv* env, j
 
 void Java_org_yuzu_yuzu_1emu_NativeLibrary_setCurrentAppletId(JNIEnv* env, jclass clazz,
                                                               jint jappletId) {
-    EmulationSession::GetInstance().SetAppletId(jappletId);
+    EmulationSession::GetInstance().System().GetAppletManager().SetCurrentAppletId(
+        static_cast<Service::AM::Applets::AppletId>(jappletId));
 }
 
 void Java_org_yuzu_yuzu_1emu_NativeLibrary_setCabinetMode(JNIEnv* env, jclass clazz,
                                                           jint jcabinetMode) {
-    EmulationSession::GetInstance().System().GetFrontendAppletHolder().SetCabinetMode(
+    EmulationSession::GetInstance().System().GetAppletManager().SetCabinetMode(
         static_cast<Service::NFP::CabinetMode>(jcabinetMode));
 }
 
@@ -838,7 +819,7 @@ void Java_org_yuzu_yuzu_1emu_NativeLibrary_removeUpdate(JNIEnv* env, jobject job
 void Java_org_yuzu_yuzu_1emu_NativeLibrary_removeDLC(JNIEnv* env, jobject jobj,
                                                      jstring jprogramId) {
     auto program_id = EmulationSession::GetProgramId(env, jprogramId);
-    ContentManager::RemoveAllDLC(EmulationSession::GetInstance().System(), program_id);
+    ContentManager::RemoveAllDLC(&EmulationSession::GetInstance().System(), program_id);
 }
 
 void Java_org_yuzu_yuzu_1emu_NativeLibrary_removeMod(JNIEnv* env, jobject jobj, jstring jprogramId,
@@ -848,9 +829,8 @@ void Java_org_yuzu_yuzu_1emu_NativeLibrary_removeMod(JNIEnv* env, jobject jobj,
                               program_id, GetJString(env, jname));
 }
 
-jobjectArray Java_org_yuzu_yuzu_1emu_NativeLibrary_verifyInstalledContents(JNIEnv* env,
+jobject Java_org_yuzu_yuzu_1emu_NativeLibrary_verifyInstalledContents(JNIEnv* env, jobject jobj,
-                                                                           jobject jobj,
+                                                                      jobject jcallback) {
-                                                                           jobject jcallback) {
     auto jlambdaClass = env->GetObjectClass(jcallback);
     auto jlambdaInvokeMethod = env->GetMethodID(
         jlambdaClass, "invoke", "(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;");
@@ -862,7 +842,7 @@ jobjectArray Java_org_yuzu_yuzu_1emu_NativeLibrary_verifyInstalledContents(JNIEn
 
     auto& session = EmulationSession::GetInstance();
     std::vector<std::string> result = ContentManager::VerifyInstalledContents(
-        session.System(), *session.GetContentProvider(), callback);
+        &session.System(), session.GetContentProvider(), callback);
     jobjectArray jresult =
         env->NewObjectArray(result.size(), IDCache::GetStringClass(), ToJString(env, ""));
     for (size_t i = 0; i < result.size(); ++i) {
@@ -883,7 +863,7 @@ jint Java_org_yuzu_yuzu_1emu_NativeLibrary_verifyGameContents(JNIEnv* env, jobje
     };
     auto& session = EmulationSession::GetInstance();
     return static_cast<jint>(
-        ContentManager::VerifyGameContents(session.System(), GetJString(env, jpath), callback));
+        ContentManager::VerifyGameContents(&session.System(), GetJString(env, jpath), callback));
 }
 
 jstring Java_org_yuzu_yuzu_1emu_NativeLibrary_getSavePath(JNIEnv* env, jobject jobj,
@@ -902,7 +882,7 @@ jstring Java_org_yuzu_yuzu_1emu_NativeLibrary_getSavePath(JNIEnv* env, jobject j
 
     const auto nandDir = Common::FS::GetYuzuPath(Common::FS::YuzuPath::NANDDir);
     auto vfsNandDir = system.GetFilesystem()->OpenDirectory(Common::FS::PathToUTF8String(nandDir),
-                                                            FileSys::OpenMode::Read);
+                                                            FileSys::Mode::Read);
 
     const auto user_save_data_path = FileSys::SaveDataFactory::GetFullPath(
         {}, vfsNandDir, FileSys::SaveDataSpaceId::NandUser, FileSys::SaveDataType::SaveData,
@@ -932,10 +912,4 @@ void Java_org_yuzu_yuzu_1emu_NativeLibrary_clearFilesystemProvider(JNIEnv* env,
     EmulationSession::GetInstance().GetContentProvider()->ClearAllEntries();
 }
 
-jboolean Java_org_yuzu_yuzu_1emu_NativeLibrary_areKeysPresent(JNIEnv* env, jobject jobj) {
-    auto& system = EmulationSession::GetInstance().System();
-    system.GetFileSystemController().CreateFactories(*system.GetFilesystem());
-    return ContentManager::AreKeysPresent();
-}
-
 } // extern "C"

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

@@ -45,7 +45,6 @@ public:
     const Core::PerfStatsResults& PerfStats();
     void ConfigureFilesystemProvider(const std::string& filepath);
     void InitializeSystem(bool reload);
-    void SetAppletId(int applet_id);
     Core::SystemResultStatus InitializeEmulation(const std::string& filepath);
 
     bool IsHandheldOnly();
@@ -78,7 +77,6 @@ private:
     std::atomic<bool> m_is_paused = false;
     SoftwareKeyboard::AndroidKeyboard* m_software_keyboard{};
     std::unique_ptr<FileSys::ManualContentProvider> m_manual_provider;
-    int m_applet_id{1};
 
     // GPU driver parameters
     std::shared_ptr<Common::DynamicLibrary> m_vulkan_library;

src/android/app/src/main/res/drawable/ic_lock.xml

@@ -1,9 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:height="24dp"
-    android:viewportHeight="24"
-    android:viewportWidth="24"
-    android:width="24dp">
-    <path
-        android:fillColor="?attr/colorControlNormal"
-        android:pathData="M18,8h-1L17,6c0,-2.76 -2.24,-5 -5,-5S7,3.24 7,6v2L6,8c-1.1,0 -2,0.9 -2,2v10c0,1.1 0.9,2 2,2h12c1.1,0 2,-0.9 2,-2L20,10c0,-1.1 -0.9,-2 -2,-2zM12,17c-1.1,0 -2,-0.9 -2,-2s0.9,-2 2,-2 2,0.9 2,2 -0.9,2 -2,2zM15.1,8L8.9,8L8.9,6c0,-1.71 1.39,-3.1 3.1,-3.1 1.71,0 3.1,1.39 3.1,3.1v2z" />
-</vector>

src/android/app/src/main/res/drawable/ic_shortcut.xml

@@ -1,9 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportWidth="960"
-    android:viewportHeight="960">
-    <path
-        android:fillColor="?attr/colorControlNormal"
-        android:pathData="M280,920q-33,0 -56.5,-23.5T200,840v-720q0,-33 23.5,-56.5T280,40h400q33,0 56.5,23.5T760,120v160h-80v-40L280,240v480h400v-40h80v160q0,33 -23.5,56.5T680,920L280,920ZM686,520L480,520v120h-80v-120q0,-33 23.5,-56.5T480,440h206l-62,-64 56,-56 160,160 -160,160 -56,-56 62,-64Z" />
-</vector>

src/android/app/src/main/res/layout-w600dp/fragment_about.xml

@@ -11,14 +11,12 @@
         android:id="@+id/appbar_about"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:fitsSystemWindows="true"
+        android:fitsSystemWindows="true">
-        android:touchscreenBlocksFocus="false">
 
         <com.google.android.material.appbar.MaterialToolbar
             android:id="@+id/toolbar_about"
             android:layout_width="match_parent"
             android:layout_height="?attr/actionBarSize"
-            android:touchscreenBlocksFocus="false"
             app:navigationIcon="@drawable/ic_back"
             app:title="@string/about" />
 
@@ -30,7 +28,6 @@
         android:layout_height="match_parent"
         android:fadeScrollbars="false"
         android:scrollbars="vertical"
-        android:defaultFocusHighlightEnabled="false"
         app:layout_behavior="@string/appbar_scrolling_view_behavior">
 
         <LinearLayout

src/android/app/src/main/res/layout-w600dp/fragment_game_info.xml

@@ -1,155 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<androidx.coordinatorlayout.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:id="@+id/coordinator_about"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:background="?attr/colorSurface">
-
-    <com.google.android.material.appbar.AppBarLayout
-        android:id="@+id/appbar_info"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:fitsSystemWindows="true"
-        android:touchscreenBlocksFocus="false">
-
-        <com.google.android.material.appbar.MaterialToolbar
-            android:id="@+id/toolbar_info"
-            android:layout_width="match_parent"
-            android:layout_height="?attr/actionBarSize"
-            android:touchscreenBlocksFocus="false"
-            app:navigationIcon="@drawable/ic_back" />
-
-    </com.google.android.material.appbar.AppBarLayout>
-
-    <androidx.core.widget.NestedScrollView
-        android:id="@+id/scroll_info"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:defaultFocusHighlightEnabled="false"
-        app:layout_behavior="@string/appbar_scrolling_view_behavior">
-
-        <LinearLayout
-            android:id="@+id/content_info"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:orientation="horizontal"
-            android:paddingHorizontal="16dp"
-            android:baselineAligned="false">
-
-            <LinearLayout
-                android:layout_width="match_parent"
-                android:layout_height="match_parent"
-                android:orientation="vertical"
-                android:layout_weight="3"
-                android:gravity="top|center_horizontal"
-                android:paddingHorizontal="16dp">
-
-                <com.google.android.material.button.MaterialButton
-                    android:id="@+id/button_copy"
-                    style="@style/Widget.Material3.Button"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_marginTop="16dp"
-                    android:text="@string/copy_details" />
-
-                <com.google.android.material.button.MaterialButton
-                    android:id="@+id/button_verify_integrity"
-                    style="@style/Widget.Material3.Button"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_marginTop="10dp"
-                    android:text="@string/verify_integrity" />
-
-            </LinearLayout>
-
-            <LinearLayout
-                android:layout_width="match_parent"
-                android:layout_height="match_parent"
-                android:orientation="vertical"
-                android:layout_weight="1">
-
-                <com.google.android.material.textfield.TextInputLayout
-                    android:id="@+id/path"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:paddingTop="16dp">
-
-                    <com.google.android.material.textfield.TextInputEditText
-                        android:id="@+id/path_field"
-                        android:layout_width="match_parent"
-                        android:layout_height="wrap_content"
-                        android:editable="false"
-                        android:importantForAutofill="no"
-                        android:inputType="none"
-                        android:minHeight="48dp"
-                        android:textAlignment="viewStart"
-                        tools:text="1.0.0" />
-
-                </com.google.android.material.textfield.TextInputLayout>
-
-                <com.google.android.material.textfield.TextInputLayout
-                    android:id="@+id/program_id"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:paddingTop="16dp">
-
-                    <com.google.android.material.textfield.TextInputEditText
-                        android:id="@+id/program_id_field"
-                        android:layout_width="match_parent"
-                        android:layout_height="wrap_content"
-                        android:editable="false"
-                        android:importantForAutofill="no"
-                        android:inputType="none"
-                        android:minHeight="48dp"
-                        android:textAlignment="viewStart"
-                        tools:text="1.0.0" />
-
-                </com.google.android.material.textfield.TextInputLayout>
-
-                <com.google.android.material.textfield.TextInputLayout
-                    android:id="@+id/developer"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:paddingTop="16dp">
-
-                    <com.google.android.material.textfield.TextInputEditText
-                        android:id="@+id/developer_field"
-                        android:layout_width="match_parent"
-                        android:layout_height="wrap_content"
-                        android:editable="false"
-                        android:importantForAutofill="no"
-                        android:inputType="none"
-                        android:minHeight="48dp"
-                        android:textAlignment="viewStart"
-                        tools:text="1.0.0" />
-
-                </com.google.android.material.textfield.TextInputLayout>
-
-                <com.google.android.material.textfield.TextInputLayout
-                    android:id="@+id/version"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:paddingTop="16dp">
-
-                    <com.google.android.material.textfield.TextInputEditText
-                        android:id="@+id/version_field"
-                        android:layout_width="match_parent"
-                        android:layout_height="wrap_content"
-                        android:editable="false"
-                        android:importantForAutofill="no"
-                        android:inputType="none"
-                        android:minHeight="48dp"
-                        android:textAlignment="viewStart"
-                        tools:text="1.0.0" />
-
-                </com.google.android.material.textfield.TextInputLayout>
-
-            </LinearLayout>
-
-        </LinearLayout>
-
-    </androidx.core.widget.NestedScrollView>
-
-</androidx.coordinatorlayout.widget.CoordinatorLayout>

src/android/app/src/main/res/layout-w600dp/fragment_game_properties.xml

@@ -14,7 +14,6 @@
         android:clipToPadding="false"
         android:fadeScrollbars="false"
         android:scrollbars="vertical"
-        android:defaultFocusHighlightEnabled="false"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toEndOf="@+id/icon_layout"
         app:layout_constraintTop_toTopOf="parent">
@@ -44,35 +43,16 @@
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent">
 
-        <androidx.constraintlayout.widget.ConstraintLayout
+        <Button
-            android:layout_width="match_parent"
+            android:id="@+id/button_back"
+            style="?attr/materialIconButtonStyle"
+            android:layout_width="wrap_content"
             android:layout_height="wrap_content"
+            android:layout_gravity="start"
             android:layout_margin="8dp"
-            android:orientation="horizontal">
+            app:icon="@drawable/ic_back"
-
+            app:iconSize="24dp"
-            <Button
+            app:iconTint="?attr/colorOnSurface" />
-                android:id="@+id/button_back"
-                style="?attr/materialIconButtonStyle"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                app:icon="@drawable/ic_back"
-                app:iconSize="24dp"
-                app:iconTint="?attr/colorOnSurface"
-                app:layout_constraintStart_toStartOf="parent"
-                app:layout_constraintTop_toTopOf="parent" />
-
-            <Button
-                android:id="@+id/button_shortcut"
-                style="?attr/materialIconButtonStyle"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                app:icon="@drawable/ic_shortcut"
-                app:iconSize="24dp"
-                app:iconTint="?attr/colorOnSurface"
-                app:layout_constraintTop_toTopOf="parent"
-                app:layout_constraintEnd_toEndOf="parent" />
-
-        </androidx.constraintlayout.widget.ConstraintLayout>
 
         <com.google.android.material.card.MaterialCardView
             style="?attr/materialCardViewElevatedStyle"

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

@@ -23,7 +23,6 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_gravity="center_vertical"
-            android:focusable="false"
             android:clickable="false"
             android:checked="false" />
 

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

@@ -6,14 +6,16 @@
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
     android:layout_marginHorizontal="16dp"
-    android:layout_marginVertical="12dp">
+    android:layout_marginVertical="12dp"
+    android:focusable="true">
 
     <androidx.constraintlayout.widget.ConstraintLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:orientation="horizontal"
         android:padding="16dp"
-        android:layout_gravity="center_vertical">
+        android:layout_gravity="center_vertical"
+        android:animateLayoutChanges="true">
 
         <com.google.android.material.textview.MaterialTextView
             android:id="@+id/path"

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

@@ -11,14 +11,12 @@
         android:id="@+id/appbar_about"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:fitsSystemWindows="true"
+        android:fitsSystemWindows="true">
-        android:touchscreenBlocksFocus="false">
 
         <com.google.android.material.appbar.MaterialToolbar
             android:id="@+id/toolbar_about"
             android:layout_width="match_parent"
             android:layout_height="?attr/actionBarSize"
-            android:touchscreenBlocksFocus="false"
             app:title="@string/about"
             app:navigationIcon="@drawable/ic_back" />
 
@@ -30,7 +28,6 @@
         android:layout_height="match_parent"
         android:scrollbars="vertical"
         android:fadeScrollbars="false"
-        android:defaultFocusHighlightEnabled="false"
         app:layout_behavior="@string/appbar_scrolling_view_behavior">
 
         <LinearLayout

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

@@ -11,7 +11,6 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:fitsSystemWindows="true"
-        android:touchscreenBlocksFocus="false"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent">
@@ -20,7 +19,6 @@
             android:id="@+id/toolbar_addons"
             android:layout_width="match_parent"
             android:layout_height="?attr/actionBarSize"
-            android:touchscreenBlocksFocus="false"
             app:navigationIcon="@drawable/ic_back" />
 
     </com.google.android.material.appbar.AppBarLayout>
@@ -30,8 +28,6 @@
         android:layout_width="match_parent"
         android:layout_height="0dp"
         android:clipToPadding="false"
-        android:defaultFocusHighlightEnabled="false"
-        android:nextFocusDown="@id/button_install"
         app:layout_behavior="@string/appbar_scrolling_view_behavior"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"

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

@@ -10,14 +10,12 @@
         android:id="@+id/appbar_applets"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:fitsSystemWindows="true"
+        android:fitsSystemWindows="true">
-        android:touchscreenBlocksFocus="false">
 
         <com.google.android.material.appbar.MaterialToolbar
             android:id="@+id/toolbar_applets"
             android:layout_width="match_parent"
             android:layout_height="?attr/actionBarSize"
-            android:touchscreenBlocksFocus="false"
             app:navigationIcon="@drawable/ic_back"
             app:title="@string/applets" />
 

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

@@ -15,14 +15,12 @@
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:fitsSystemWindows="true"
-            android:touchscreenBlocksFocus="false"
             app:liftOnScrollTargetViewId="@id/list_drivers">
 
             <com.google.android.material.appbar.MaterialToolbar
                 android:id="@+id/toolbar_drivers"
                 android:layout_width="match_parent"
                 android:layout_height="?attr/actionBarSize"
-                android:touchscreenBlocksFocus="false"
                 app:navigationIcon="@drawable/ic_back"
                 app:title="@string/gpu_driver_manager" />
 

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

@@ -11,14 +11,12 @@
         android:id="@+id/appbar_ea"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:fitsSystemWindows="true"
+        android:fitsSystemWindows="true">
-        android:touchscreenBlocksFocus="false">
 
         <com.google.android.material.appbar.MaterialToolbar
             android:id="@+id/toolbar_about"
             android:layout_width="match_parent"
             android:layout_height="?attr/actionBarSize"
-            android:touchscreenBlocksFocus="false"
             app:navigationIcon="@drawable/ic_back"
             app:title="@string/early_access" />
 
@@ -32,7 +30,6 @@
         android:paddingBottom="20dp"
         android:scrollbars="vertical"
         android:fadeScrollbars="false"
-        android:defaultFocusHighlightEnabled="false"
         app:layout_behavior="@string/appbar_scrolling_view_behavior">
 
         <LinearLayout

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

@@ -5,7 +5,6 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:keepScreenOn="true"
-    android:defaultFocusHighlightEnabled="false"
     tools:context="org.yuzu.yuzu_emu.fragments.EmulationFragment"
     tools:openDrawer="start">
 
@@ -25,8 +24,7 @@
                 android:layout_height="match_parent"
                 android:layout_gravity="center"
                 android:focusable="false"
-                android:focusableInTouchMode="false"
+                android:focusableInTouchMode="false" />
-                android:defaultFocusHighlightEnabled="false" />
 
             <com.google.android.material.card.MaterialCardView
                 android:id="@+id/loading_indicator"
@@ -34,7 +32,7 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_gravity="center"
-                android:defaultFocusHighlightEnabled="false"
+                android:focusable="false"
                 android:clickable="false">
 
                 <androidx.constraintlayout.widget.ConstraintLayout
@@ -120,7 +118,6 @@
                 android:layout_gravity="center"
                 android:focusable="true"
                 android:focusableInTouchMode="true"
-                android:defaultFocusHighlightEnabled="false"
                 android:visibility="invisible" />
 
             <Button
@@ -163,7 +160,6 @@
         android:layout_width="wrap_content"
         android:layout_height="match_parent"
         android:layout_gravity="start"
-        android:focusedByDefault="true"
         app:headerLayout="@layout/header_in_game"
         app:menu="@menu/menu_in_game"
         tools:visibility="gone" />

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

@@ -15,14 +15,12 @@
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:fitsSystemWindows="true"
-            android:touchscreenBlocksFocus="false"
             app:liftOnScrollTargetViewId="@id/list_folders">
 
             <com.google.android.material.appbar.MaterialToolbar
                 android:id="@+id/toolbar_folders"
                 android:layout_width="match_parent"
                 android:layout_height="?attr/actionBarSize"
-                android:touchscreenBlocksFocus="false"
                 app:navigationIcon="@drawable/ic_back"
                 app:title="@string/game_folders" />
 
@@ -33,7 +31,6 @@
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:clipToPadding="false"
-            android:defaultFocusHighlightEnabled="false"
             app:layout_behavior="@string/appbar_scrolling_view_behavior" />
 
     </androidx.coordinatorlayout.widget.CoordinatorLayout>

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

@@ -11,14 +11,12 @@
         android:id="@+id/appbar_info"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:touchscreenBlocksFocus="false"
         android:fitsSystemWindows="true">
 
         <com.google.android.material.appbar.MaterialToolbar
             android:id="@+id/toolbar_info"
             android:layout_width="match_parent"
             android:layout_height="?attr/actionBarSize"
-            android:touchscreenBlocksFocus="false"
             app:navigationIcon="@drawable/ic_back" />
 
     </com.google.android.material.appbar.AppBarLayout>
@@ -27,7 +25,6 @@
         android:id="@+id/scroll_info"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:defaultFocusHighlightEnabled="false"
         app:layout_behavior="@string/appbar_scrolling_view_behavior">
 
         <LinearLayout

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

@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
-<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<androidx.constraintlayout.widget.ConstraintLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
@@ -12,8 +13,7 @@
         android:layout_height="match_parent"
         android:scrollbars="vertical"
         android:fadeScrollbars="false"
-        android:clipToPadding="false"
+        android:clipToPadding="false">
-        android:defaultFocusHighlightEnabled="false">
 
         <LinearLayout
             android:id="@+id/layout_all"
@@ -22,35 +22,16 @@
             android:orientation="vertical"
             android:gravity="center_horizontal">
 
-            <androidx.constraintlayout.widget.ConstraintLayout
+            <Button
-                android:layout_width="match_parent"
+                android:id="@+id/button_back"
+                style="?attr/materialIconButtonStyle"
+                android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_margin="8dp"
-                android:orientation="horizontal">
+                android:layout_gravity="start"
-
+                app:icon="@drawable/ic_back"
-                <Button
+                app:iconSize="24dp"
-                    android:id="@+id/button_back"
+                app:iconTint="?attr/colorOnSurface" />
-                    style="?attr/materialIconButtonStyle"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    app:icon="@drawable/ic_back"
-                    app:iconSize="24dp"
-                    app:iconTint="?attr/colorOnSurface"
-                    app:layout_constraintStart_toStartOf="parent"
-                    app:layout_constraintTop_toTopOf="parent" />
-
-                <Button
-                    android:id="@+id/button_shortcut"
-                    style="?attr/materialIconButtonStyle"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    app:icon="@drawable/ic_shortcut"
-                    app:iconSize="24dp"
-                    app:iconTint="?attr/colorOnSurface"
-                    app:layout_constraintEnd_toEndOf="parent"
-                    app:layout_constraintTop_toTopOf="parent" />
-
-            </androidx.constraintlayout.widget.ConstraintLayout>
 
             <com.google.android.material.card.MaterialCardView
                 style="?attr/materialCardViewElevatedStyle"
@@ -64,7 +45,7 @@
                     android:id="@+id/image_game_screen"
                     android:layout_width="175dp"
                     android:layout_height="175dp"
-                    tools:src="@drawable/default_icon" />
+                    tools:src="@drawable/default_icon"/>
 
             </com.google.android.material.card.MaterialCardView>
 
@@ -87,7 +68,7 @@
                 android:id="@+id/list_properties"
                 android:layout_width="match_parent"
                 android:layout_height="match_parent"
-                android:defaultFocusHighlightEnabled="false" />
+                tools:listitem="@layout/card_simple_outlined" />
 
         </LinearLayout>
 

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

@@ -27,7 +27,6 @@
             android:layout_width="match_parent"
             android:layout_height="match_parent"
             android:clipToPadding="false"
-            android:defaultFocusHighlightEnabled="false"
             tools:listitem="@layout/card_game" />
 
     </RelativeLayout>

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

@@ -7,8 +7,7 @@
     android:background="?attr/colorSurface"
     android:scrollbars="vertical"
     android:fadeScrollbars="false"
-    android:clipToPadding="false"
+    android:clipToPadding="false">
-    android:defaultFocusHighlightEnabled="false">
 
     <androidx.appcompat.widget.LinearLayoutCompat
         android:id="@+id/linear_layout_settings"

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

@@ -10,14 +10,12 @@
         android:id="@+id/appbar_installables"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:fitsSystemWindows="true"
+        android:fitsSystemWindows="true">
-        android:touchscreenBlocksFocus="false">
 
         <com.google.android.material.appbar.MaterialToolbar
             android:id="@+id/toolbar_installables"
             android:layout_width="match_parent"
             android:layout_height="?attr/actionBarSize"
-            android:touchscreenBlocksFocus="false"
             app:title="@string/manage_yuzu_data"
             app:navigationIcon="@drawable/ic_back" />
 

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

@@ -10,14 +10,12 @@
         android:id="@+id/appbar_licenses"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:fitsSystemWindows="true"
+        android:fitsSystemWindows="true">
-        android:touchscreenBlocksFocus="false">
 
         <com.google.android.material.appbar.MaterialToolbar
             android:id="@+id/toolbar_licenses"
             android:layout_width="match_parent"
             android:layout_height="?attr/actionBarSize"
-            android:touchscreenBlocksFocus="false"
             app:title="@string/licenses"
             app:navigationIcon="@drawable/ic_back" />
 

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

@@ -11,7 +11,6 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:fitsSystemWindows="true"
-        android:touchscreenBlocksFocus="false"
         app:elevation="0dp">
 
         <com.google.android.material.appbar.CollapsingToolbarLayout
@@ -25,7 +24,6 @@
                 android:id="@+id/toolbar_settings"
                 android:layout_width="match_parent"
                 android:layout_height="?attr/actionBarSize"
-                android:touchscreenBlocksFocus="false"
                 app:layout_collapseMode="pin"
                 app:navigationIcon="@drawable/ic_back" />
 

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

@@ -6,7 +6,7 @@
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
     android:background="?attr/selectableItemBackground"
-    android:focusable="false"
+    android:focusable="true"
     android:paddingHorizontal="20dp"
     android:paddingVertical="16dp">
 

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

@@ -12,5 +12,4 @@
     android:textAlignment="viewStart"
     android:textColor="?attr/colorPrimary"
     android:textStyle="bold"
-    android:focusable="false"
     tools:text="CPU Settings" />

src/android/app/src/main/res/menu/menu_in_game.xml

@@ -21,11 +21,6 @@
         android:icon="@drawable/ic_controller"
         android:title="@string/emulation_input_overlay" />
 
-    <item
-        android:id="@+id/menu_lock_drawer"
-        android:icon="@drawable/ic_unlock"
-        android:title="@string/emulation_input_overlay" />
-
     <item
         android:id="@+id/menu_exit"
         android:icon="@drawable/ic_exit"

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

@@ -144,9 +144,6 @@
     <string name="no_save_data_found">No save data found</string>
     <string name="verify_installed_content">Verify installed content</string>
     <string name="verify_installed_content_description">Checks all installed content for corruption</string>
-    <string name="keys_missing">Encryption keys are missing</string>
-    <string name="keys_missing_description">Firmware and retail games cannot be decrypted</string>
-    <string name="keys_missing_help">https://yuzu-emu.org/help/quickstart/#dumping-decryption-keys</string>
 
     <!-- Applet launcher strings -->
     <string name="applets">Applet launcher</string>
@@ -395,8 +392,6 @@
     <string name="emulation_unpause">Unpause emulation</string>
     <string name="emulation_input_overlay">Overlay options</string>
     <string name="touchscreen">Touchscreen</string>
-    <string name="lock_drawer">Lock drawer</string>
-    <string name="unlock_drawer">Unlock drawer</string>
 
     <string name="load_settings">Loading settings…</string>
 

src/common/CMakeLists.txt

@@ -106,7 +106,6 @@ add_library(common STATIC
     precompiled_headers.h
     quaternion.h
     range_map.h
-    range_mutex.h
     reader_writer_queue.h
     ring_buffer.h
     ${CMAKE_CURRENT_BINARY_DIR}/scm_rev.cpp

src/common/arm64/native_clock.cpp

@@ -29,6 +29,10 @@ NativeClock::NativeClock() {
     gputick_cntfrq_factor = GetFixedPointFactor(GPUTickFreq, host_cntfrq);
 }
 
+void NativeClock::Reset() {
+    start_ticks = GetUptime();
+}
+
 std::chrono::nanoseconds NativeClock::GetTimeNS() const {
     return std::chrono::nanoseconds{MultiplyHigh(GetUptime(), ns_cntfrq_factor)};
 }
@@ -42,11 +46,11 @@ std::chrono::milliseconds NativeClock::GetTimeMS() const {
 }
 
 s64 NativeClock::GetCNTPCT() const {
-    return MultiplyHigh(GetUptime(), guest_cntfrq_factor);
+    return MultiplyHigh(GetUptime() - start_ticks, guest_cntfrq_factor);
 }
 
 s64 NativeClock::GetGPUTick() const {
-    return MultiplyHigh(GetUptime(), gputick_cntfrq_factor);
+    return MultiplyHigh(GetUptime() - start_ticks, gputick_cntfrq_factor);
 }
 
 s64 NativeClock::GetUptime() const {

src/common/arm64/native_clock.h

@@ -11,6 +11,8 @@ class NativeClock final : public WallClock {
 public:
     explicit NativeClock();
 
+    void Reset() override;
+
     std::chrono::nanoseconds GetTimeNS() const override;
 
     std::chrono::microseconds GetTimeUS() const override;
@@ -40,6 +42,7 @@ private:
     FactorType ms_cntfrq_factor;
     FactorType guest_cntfrq_factor;
     FactorType gputick_cntfrq_factor;
+    s64 start_ticks;
 };
 
 } // namespace Common::Arm64

src/common/overflow.h

@@ -3,7 +3,6 @@
 
 #pragma once
 
-#include <algorithm>
 #include <type_traits>
 #include "bit_cast.h"
 
@@ -20,21 +19,4 @@ inline T WrappingAdd(T lhs, T rhs) {
     return BitCast<T>(lhs_u + rhs_u);
 }
 
-template <typename T>
-    requires(std::is_integral_v<T> && std::is_signed_v<T>)
-inline bool CanAddWithoutOverflow(T lhs, T rhs) {
-#ifdef _MSC_VER
-    if (lhs >= 0 && rhs >= 0) {
-        return WrappingAdd(lhs, rhs) >= std::max(lhs, rhs);
-    } else if (lhs < 0 && rhs < 0) {
-        return WrappingAdd(lhs, rhs) <= std::min(lhs, rhs);
-    } else {
-        return true;
-    }
-#else
-    T res;
-    return !__builtin_add_overflow(lhs, rhs, &res);
-#endif
-}
-
 } // namespace Common

src/common/range_mutex.h

@@ -1,93 +0,0 @@
-// SPDX-FileCopyrightText: 2024 yuzu Emulator Project
-// SPDX-License-Identifier: GPL-2.0-or-later
-
-#pragma once
-
-#include <condition_variable>
-#include <mutex>
-
-#include "common/intrusive_list.h"
-
-namespace Common {
-
-class ScopedRangeLock;
-
-class RangeMutex {
-public:
-    explicit RangeMutex() = default;
-    ~RangeMutex() = default;
-
-private:
-    friend class ScopedRangeLock;
-
-    void Lock(ScopedRangeLock& l);
-    void Unlock(ScopedRangeLock& l);
-    bool HasIntersectionLocked(ScopedRangeLock& l);
-
-private:
-    std::mutex m_mutex;
-    std::condition_variable m_cv;
-
-    using LockList = Common::IntrusiveListBaseTraits<ScopedRangeLock>::ListType;
-    LockList m_list;
-};
-
-class ScopedRangeLock : public Common::IntrusiveListBaseNode<ScopedRangeLock> {
-public:
-    explicit ScopedRangeLock(RangeMutex& mutex, u64 address, u64 size)
-        : m_mutex(mutex), m_address(address), m_size(size) {
-        if (m_size > 0) {
-            m_mutex.Lock(*this);
-        }
-    }
-    ~ScopedRangeLock() {
-        if (m_size > 0) {
-            m_mutex.Unlock(*this);
-        }
-    }
-
-    u64 GetAddress() const {
-        return m_address;
-    }
-
-    u64 GetSize() const {
-        return m_size;
-    }
-
-private:
-    RangeMutex& m_mutex;
-    const u64 m_address{};
-    const u64 m_size{};
-};
-
-inline void RangeMutex::Lock(ScopedRangeLock& l) {
-    std::unique_lock lk{m_mutex};
-    m_cv.wait(lk, [&] { return !HasIntersectionLocked(l); });
-    m_list.push_back(l);
-}
-
-inline void RangeMutex::Unlock(ScopedRangeLock& l) {
-    {
-        std::scoped_lock lk{m_mutex};
-        m_list.erase(m_list.iterator_to(l));
-    }
-    m_cv.notify_all();
-}
-
-inline bool RangeMutex::HasIntersectionLocked(ScopedRangeLock& l) {
-    const auto cur_begin = l.GetAddress();
-    const auto cur_last = l.GetAddress() + l.GetSize() - 1;
-
-    for (const auto& other : m_list) {
-        const auto other_begin = other.GetAddress();
-        const auto other_last = other.GetAddress() + other.GetSize() - 1;
-
-        if (cur_begin <= other_last && other_begin <= cur_last) {
-            return true;
-        }
-    }
-
-    return false;
-}
-
-} // namespace Common

src/common/settings.h

@@ -420,15 +420,8 @@ struct Values {
     SwitchableSetting<s64> custom_rtc{
         linkage, 0,    "custom_rtc",       Category::System, Specialization::Time,
         false,   true, &custom_rtc_enabled};
-    SwitchableSetting<s64, true> custom_rtc_offset{linkage,
+    SwitchableSetting<s64, false> custom_rtc_offset{
-                                                   0,
+        linkage, 0, "custom_rtc_offset", Category::System, Specialization::Countable, true, true};
-                                                   std::numeric_limits<int>::min(),
-                                                   std::numeric_limits<int>::max(),
-                                                   "custom_rtc_offset",
-                                                   Category::System,
-                                                   Specialization::Countable,
-                                                   true,
-                                                   true};
     SwitchableSetting<bool> rng_seed_enabled{
         linkage, false, "rng_seed_enabled", Category::System, Specialization::Paired, true, true};
     SwitchableSetting<u32> rng_seed{

src/common/wall_clock.cpp

@@ -20,6 +20,10 @@ class StandardWallClock final : public WallClock {
 public:
     explicit StandardWallClock() {}
 
+    void Reset() override {
+        start_time = std::chrono::system_clock::now();
+    }
+
     std::chrono::nanoseconds GetTimeNS() const override {
         return std::chrono::duration_cast<std::chrono::nanoseconds>(
             std::chrono::system_clock::now().time_since_epoch());
@@ -45,13 +49,16 @@ public:
 
     s64 GetUptime() const override {
         return std::chrono::duration_cast<std::chrono::nanoseconds>(
-                   std::chrono::steady_clock::now().time_since_epoch())
+                   std::chrono::system_clock::now() - start_time)
             .count();
     }
 
     bool IsNative() const override {
         return false;
     }
+
+private:
+    std::chrono::system_clock::time_point start_time{};
 };
 
 std::unique_ptr<WallClock> CreateOptimalClock() {

src/common/wall_clock.h

@@ -19,6 +19,8 @@ public:
 
     virtual ~WallClock() = default;
 
+    virtual void Reset() = 0;
+
     /// @returns The time in nanoseconds since the construction of this clock.
     virtual std::chrono::nanoseconds GetTimeNS() const = 0;
 

src/common/x64/native_clock.cpp

@@ -15,6 +15,10 @@ NativeClock::NativeClock(u64 rdtsc_frequency_)
       cntpct_rdtsc_factor{GetFixedPoint64Factor(CNTFRQ, rdtsc_frequency)},
       gputick_rdtsc_factor{GetFixedPoint64Factor(GPUTickFreq, rdtsc_frequency)} {}
 
+void NativeClock::Reset() {
+    start_ticks = FencedRDTSC();
+}
+
 std::chrono::nanoseconds NativeClock::GetTimeNS() const {
     return std::chrono::nanoseconds{MultiplyHigh(GetUptime(), ns_rdtsc_factor)};
 }
@@ -28,11 +32,11 @@ std::chrono::milliseconds NativeClock::GetTimeMS() const {
 }
 
 s64 NativeClock::GetCNTPCT() const {
-    return MultiplyHigh(GetUptime(), cntpct_rdtsc_factor);
+    return MultiplyHigh(GetUptime() - start_ticks, cntpct_rdtsc_factor);
 }
 
 s64 NativeClock::GetGPUTick() const {
-    return MultiplyHigh(GetUptime(), gputick_rdtsc_factor);
+    return MultiplyHigh(GetUptime() - start_ticks, gputick_rdtsc_factor);
 }
 
 s64 NativeClock::GetUptime() const {

src/common/x64/native_clock.h

@@ -11,6 +11,8 @@ class NativeClock final : public WallClock {
 public:
     explicit NativeClock(u64 rdtsc_frequency_);
 
+    void Reset() override;
+
     std::chrono::nanoseconds GetTimeNS() const override;
 
     std::chrono::microseconds GetTimeUS() const override;
@@ -26,6 +28,7 @@ public:
     bool IsNative() const override;
 
 private:
+    u64 start_ticks;
     u64 rdtsc_frequency;
 
     u64 ns_rdtsc_factor;

src/core/CMakeLists.txt

@@ -20,49 +20,28 @@ add_library(core STATIC
     cpu_manager.h
     crypto/aes_util.cpp
     crypto/aes_util.h
-    crypto/ctr_encryption_layer.cpp
-    crypto/ctr_encryption_layer.h
     crypto/encryption_layer.cpp
     crypto/encryption_layer.h
     crypto/key_manager.cpp
     crypto/key_manager.h
     crypto/partition_data_manager.cpp
     crypto/partition_data_manager.h
+    crypto/ctr_encryption_layer.cpp
+    crypto/ctr_encryption_layer.h
     crypto/xts_encryption_layer.cpp
     crypto/xts_encryption_layer.h
+    debugger/debugger_interface.h
     debugger/debugger.cpp
     debugger/debugger.h
-    debugger/debugger_interface.h
-    debugger/gdbstub.cpp
-    debugger/gdbstub.h
     debugger/gdbstub_arch.cpp
     debugger/gdbstub_arch.h
+    debugger/gdbstub.cpp
+    debugger/gdbstub.h
     device_memory_manager.h
     device_memory_manager.inc
     device_memory.cpp
     device_memory.h
-    file_sys/bis_factory.cpp
-    file_sys/bis_factory.h
-    file_sys/card_image.cpp
-    file_sys/card_image.h
-    file_sys/common_funcs.h
-    file_sys/content_archive.cpp
-    file_sys/content_archive.h
-    file_sys/control_metadata.cpp
-    file_sys/control_metadata.h
-    file_sys/errors.h
-    file_sys/fs_directory.h
-    file_sys/fs_file.h
-    file_sys/fs_filesystem.h
-    file_sys/fs_memory_management.h
-    file_sys/fs_operate_range.h
-    file_sys/fs_path.h
-    file_sys/fs_path_utility.h
-    file_sys/fs_string_util.h
-    file_sys/fsmitm_romfsbuild.cpp
-    file_sys/fsmitm_romfsbuild.h
     file_sys/fssystem/fs_i_storage.h
-    file_sys/fssystem/fs_types.h
     file_sys/fssystem/fssystem_aes_ctr_counter_extended_storage.cpp
     file_sys/fssystem/fssystem_aes_ctr_counter_extended_storage.h
     file_sys/fssystem/fssystem_aes_ctr_storage.cpp
@@ -104,10 +83,25 @@ add_library(core STATIC
     file_sys/fssystem/fssystem_switch_storage.h
     file_sys/fssystem/fssystem_utility.cpp
     file_sys/fssystem/fssystem_utility.h
+    file_sys/fssystem/fs_types.h
+    file_sys/bis_factory.cpp
+    file_sys/bis_factory.h
+    file_sys/card_image.cpp
+    file_sys/card_image.h
+    file_sys/common_funcs.h
+    file_sys/content_archive.cpp
+    file_sys/content_archive.h
+    file_sys/control_metadata.cpp
+    file_sys/control_metadata.h
+    file_sys/directory.h
+    file_sys/errors.h
+    file_sys/fsmitm_romfsbuild.cpp
+    file_sys/fsmitm_romfsbuild.h
     file_sys/ips_layer.cpp
     file_sys/ips_layer.h
     file_sys/kernel_executable.cpp
     file_sys/kernel_executable.h
+    file_sys/mode.h
     file_sys/nca_metadata.cpp
     file_sys/nca_metadata.h
     file_sys/partition_filesystem.cpp
@@ -152,22 +146,22 @@ add_library(core STATIC
     file_sys/system_archive/system_version.h
     file_sys/system_archive/time_zone_binary.cpp
     file_sys/system_archive/time_zone_binary.h
-    file_sys/vfs/vfs.cpp
+    file_sys/vfs.cpp
-    file_sys/vfs/vfs.h
+    file_sys/vfs.h
-    file_sys/vfs/vfs_cached.cpp
+    file_sys/vfs_cached.cpp
-    file_sys/vfs/vfs_cached.h
+    file_sys/vfs_cached.h
-    file_sys/vfs/vfs_concat.cpp
+    file_sys/vfs_concat.cpp
-    file_sys/vfs/vfs_concat.h
+    file_sys/vfs_concat.h
-    file_sys/vfs/vfs_layered.cpp
+    file_sys/vfs_layered.cpp
-    file_sys/vfs/vfs_layered.h
+    file_sys/vfs_layered.h
-    file_sys/vfs/vfs_offset.cpp
+    file_sys/vfs_offset.cpp
-    file_sys/vfs/vfs_offset.h
+    file_sys/vfs_offset.h
-    file_sys/vfs/vfs_real.cpp
+    file_sys/vfs_real.cpp
-    file_sys/vfs/vfs_real.h
+    file_sys/vfs_real.h
-    file_sys/vfs/vfs_static.h
+    file_sys/vfs_static.h
-    file_sys/vfs/vfs_types.h
+    file_sys/vfs_types.h
-    file_sys/vfs/vfs_vector.cpp
+    file_sys/vfs_vector.cpp
-    file_sys/vfs/vfs_vector.h
+    file_sys/vfs_vector.h
     file_sys/xts_archive.cpp
     file_sys/xts_archive.h
     frontend/applets/cabinet.cpp
@@ -176,8 +170,8 @@ add_library(core STATIC
     frontend/applets/controller.h
     frontend/applets/error.cpp
     frontend/applets/error.h
-    frontend/applets/general.cpp
+    frontend/applets/general_frontend.cpp
-    frontend/applets/general.h
+    frontend/applets/general_frontend.h
     frontend/applets/mii_edit.cpp
     frontend/applets/mii_edit.h
     frontend/applets/profile_select.cpp
@@ -200,6 +194,7 @@ add_library(core STATIC
     hle/kernel/board/nintendo/nx/secure_monitor.h
     hle/kernel/code_set.cpp
     hle/kernel/code_set.h
+    hle/kernel/svc_results.h
     hle/kernel/global_scheduler_context.cpp
     hle/kernel/global_scheduler_context.h
     hle/kernel/init/init_slab_setup.cpp
@@ -209,11 +204,11 @@ add_library(core STATIC
     hle/kernel/k_address_arbiter.h
     hle/kernel/k_address_space_info.cpp
     hle/kernel/k_address_space_info.h
-    hle/kernel/k_affinity_mask.h
     hle/kernel/k_auto_object.cpp
     hle/kernel/k_auto_object.h
     hle/kernel/k_auto_object_container.cpp
     hle/kernel/k_auto_object_container.h
+    hle/kernel/k_affinity_mask.h
     hle/kernel/k_capabilities.cpp
     hle/kernel/k_capabilities.h
     hle/kernel/k_class_token.cpp
@@ -237,9 +232,9 @@ add_library(core STATIC
     hle/kernel/k_event_info.h
     hle/kernel/k_handle_table.cpp
     hle/kernel/k_handle_table.h
+    hle/kernel/k_hardware_timer_base.h
     hle/kernel/k_hardware_timer.cpp
     hle/kernel/k_hardware_timer.h
-    hle/kernel/k_hardware_timer_base.h
     hle/kernel/k_interrupt_manager.cpp
     hle/kernel/k_interrupt_manager.h
     hle/kernel/k_light_client_session.cpp
@@ -266,10 +261,10 @@ add_library(core STATIC
     hle/kernel/k_page_bitmap.h
     hle/kernel/k_page_buffer.cpp
     hle/kernel/k_page_buffer.h
-    hle/kernel/k_page_group.cpp
-    hle/kernel/k_page_group.h
     hle/kernel/k_page_heap.cpp
     hle/kernel/k_page_heap.h
+    hle/kernel/k_page_group.cpp
+    hle/kernel/k_page_group.h
     hle/kernel/k_page_table.h
     hle/kernel/k_page_table_base.cpp
     hle/kernel/k_page_table_base.h
@@ -334,6 +329,8 @@ add_library(core STATIC
     hle/kernel/slab_helpers.h
     hle/kernel/svc.cpp
     hle/kernel/svc.h
+    hle/kernel/svc_common.h
+    hle/kernel/svc_types.h
     hle/kernel/svc/svc_activity.cpp
     hle/kernel/svc/svc_address_arbiter.cpp
     hle/kernel/svc/svc_address_translation.cpp
@@ -371,9 +368,6 @@ add_library(core STATIC
     hle/kernel/svc/svc_thread_profiler.cpp
     hle/kernel/svc/svc_tick.cpp
     hle/kernel/svc/svc_transfer_memory.cpp
-    hle/kernel/svc_common.h
-    hle/kernel/svc_results.h
-    hle/kernel/svc_types.h
     hle/result.h
     hle/service/acc/acc.cpp
     hle/service/acc/acc.h
@@ -390,101 +384,39 @@ add_library(core STATIC
     hle/service/acc/errors.h
     hle/service/acc/profile_manager.cpp
     hle/service/acc/profile_manager.h
-    hle/service/am/frontend/applet_cabinet.cpp
-    hle/service/am/frontend/applet_cabinet.h
-    hle/service/am/frontend/applet_controller.cpp
-    hle/service/am/frontend/applet_controller.h
-    hle/service/am/frontend/applet_error.cpp
-    hle/service/am/frontend/applet_error.h
-    hle/service/am/frontend/applet_general.cpp
-    hle/service/am/frontend/applet_general.h
-    hle/service/am/frontend/applet_mii_edit.cpp
-    hle/service/am/frontend/applet_mii_edit.h
-    hle/service/am/frontend/applet_mii_edit_types.h
-    hle/service/am/frontend/applet_profile_select.cpp
-    hle/service/am/frontend/applet_profile_select.h
-    hle/service/am/frontend/applet_software_keyboard.cpp
-    hle/service/am/frontend/applet_software_keyboard.h
-    hle/service/am/frontend/applet_software_keyboard_types.h
-    hle/service/am/frontend/applet_web_browser.cpp
-    hle/service/am/frontend/applet_web_browser.h
-    hle/service/am/frontend/applet_web_browser_types.h
-    hle/service/am/frontend/applets.cpp
-    hle/service/am/frontend/applets.h
     hle/service/am/am.cpp
     hle/service/am/am.h
-    hle/service/am/am_results.h
-    hle/service/am/am_types.h
-    hle/service/am/applet.cpp
-    hle/service/am/applet.h
     hle/service/am/applet_ae.cpp
     hle/service/am/applet_ae.h
-    hle/service/am/applet_manager.cpp
-    hle/service/am/applet_data_broker.cpp
-    hle/service/am/applet_data_broker.h
-    hle/service/am/applet_manager.h
     hle/service/am/applet_oe.cpp
     hle/service/am/applet_oe.h
-    hle/service/am/applet_common_functions.cpp
+    hle/service/am/applets/applet_cabinet.cpp
-    hle/service/am/applet_common_functions.h
+    hle/service/am/applets/applet_cabinet.h
-    hle/service/am/applet_message_queue.cpp
+    hle/service/am/applets/applet_controller.cpp
-    hle/service/am/applet_message_queue.h
+    hle/service/am/applets/applet_controller.h
-    hle/service/am/application_creator.cpp
+    hle/service/am/applets/applet_error.cpp
-    hle/service/am/application_creator.h
+    hle/service/am/applets/applet_error.h
-    hle/service/am/application_functions.cpp
+    hle/service/am/applets/applet_general_backend.cpp
-    hle/service/am/application_functions.h
+    hle/service/am/applets/applet_general_backend.h
-    hle/service/am/application_proxy.cpp
+    hle/service/am/applets/applet_mii_edit.cpp
-    hle/service/am/application_proxy.h
+    hle/service/am/applets/applet_mii_edit.h
-    hle/service/am/audio_controller.cpp
+    hle/service/am/applets/applet_mii_edit_types.h
-    hle/service/am/audio_controller.h
+    hle/service/am/applets/applet_profile_select.cpp
-    hle/service/am/common_state_getter.cpp
+    hle/service/am/applets/applet_profile_select.h
-    hle/service/am/common_state_getter.h
+    hle/service/am/applets/applet_software_keyboard.cpp
-    hle/service/am/debug_functions.cpp
+    hle/service/am/applets/applet_software_keyboard.h
-    hle/service/am/debug_functions.h
+    hle/service/am/applets/applet_software_keyboard_types.h
-    hle/service/am/display_controller.cpp
+    hle/service/am/applets/applet_web_browser.cpp
-    hle/service/am/display_controller.h
+    hle/service/am/applets/applet_web_browser.h
-    hle/service/am/global_state_controller.cpp
+    hle/service/am/applets/applet_web_browser_types.h
-    hle/service/am/global_state_controller.h
+    hle/service/am/applets/applets.cpp
-    hle/service/am/hid_registration.cpp
+    hle/service/am/applets/applets.h
-    hle/service/am/hid_registration.h
-    hle/service/am/home_menu_functions.cpp
-    hle/service/am/home_menu_functions.h
     hle/service/am/idle.cpp
     hle/service/am/idle.h
-    hle/service/am/library_applet_accessor.cpp
-    hle/service/am/library_applet_accessor.h
-    hle/service/am/library_applet_creator.cpp
-    hle/service/am/library_applet_creator.h
-    hle/service/am/library_applet_proxy.cpp
-    hle/service/am/library_applet_proxy.h
-    hle/service/am/library_applet_self_accessor.cpp
-    hle/service/am/library_applet_self_accessor.h
-    hle/service/am/library_applet_storage.cpp
-    hle/service/am/library_applet_storage.h
-    hle/service/am/lock_accessor.cpp
-    hle/service/am/lock_accessor.h
-    hle/service/am/managed_layer_holder.cpp
-    hle/service/am/managed_layer_holder.h
     hle/service/am/omm.cpp
     hle/service/am/omm.h
-    hle/service/am/process_winding_controller.cpp
-    hle/service/am/process_winding_controller.h
-    hle/service/am/process.cpp
-    hle/service/am/process.h
-    hle/service/am/self_controller.cpp
-    hle/service/am/self_controller.h
-    hle/service/am/system_applet_proxy.cpp
-    hle/service/am/system_applet_proxy.h
-    hle/service/am/system_buffer_manager.cpp
-    hle/service/am/system_buffer_manager.h
     hle/service/am/spsm.cpp
     hle/service/am/spsm.h
-    hle/service/am/storage_accessor.cpp
-    hle/service/am/storage_accessor.h
-    hle/service/am/storage.cpp
-    hle/service/am/storage.h
-    hle/service/am/window_controller.cpp
-    hle/service/am/window_controller.h
     hle/service/aoc/aoc_u.cpp
     hle/service/aoc/aoc_u.h
     hle/service/apm/apm.cpp
@@ -540,41 +472,26 @@ add_library(core STATIC
     hle/service/caps/caps_types.h
     hle/service/caps/caps_u.cpp
     hle/service/caps/caps_u.h
-    hle/service/cmif_serialization.h
-    hle/service/cmif_types.h
     hle/service/erpt/erpt.cpp
     hle/service/erpt/erpt.h
     hle/service/es/es.cpp
     hle/service/es/es.h
     hle/service/eupld/eupld.cpp
     hle/service/eupld/eupld.h
-    hle/service/event.cpp
-    hle/service/event.h
     hle/service/fatal/fatal.cpp
     hle/service/fatal/fatal.h
     hle/service/fatal/fatal_p.cpp
     hle/service/fatal/fatal_p.h
     hle/service/fatal/fatal_u.cpp
     hle/service/fatal/fatal_u.h
-    hle/service/fgm/fgm.cpp
-    hle/service/fgm/fgm.h
     hle/service/filesystem/filesystem.cpp
     hle/service/filesystem/filesystem.h
-    hle/service/filesystem/fsp/fs_i_directory.cpp
+    hle/service/filesystem/fsp_ldr.cpp
-    hle/service/filesystem/fsp/fs_i_directory.h
+    hle/service/filesystem/fsp_ldr.h
-    hle/service/filesystem/fsp/fs_i_file.cpp
+    hle/service/filesystem/fsp_pr.cpp
-    hle/service/filesystem/fsp/fs_i_file.h
+    hle/service/filesystem/fsp_pr.h
-    hle/service/filesystem/fsp/fs_i_filesystem.cpp
+    hle/service/filesystem/fsp_srv.cpp
-    hle/service/filesystem/fsp/fs_i_filesystem.h
+    hle/service/filesystem/fsp_srv.h
-    hle/service/filesystem/fsp/fs_i_storage.cpp
-    hle/service/filesystem/fsp/fs_i_storage.h
-    hle/service/filesystem/fsp/fsp_ldr.cpp
-    hle/service/filesystem/fsp/fsp_ldr.h
-    hle/service/filesystem/fsp/fsp_pr.cpp
-    hle/service/filesystem/fsp/fsp_pr.h
-    hle/service/filesystem/fsp/fsp_srv.cpp
-    hle/service/filesystem/fsp/fsp_srv.h
-    hle/service/filesystem/fsp/fsp_util.h
     hle/service/filesystem/romfs_controller.cpp
     hle/service/filesystem/romfs_controller.h
     hle/service/filesystem/save_data_controller.cpp
@@ -632,18 +549,13 @@ add_library(core STATIC
     hle/service/hid/irs.h
     hle/service/hid/xcd.cpp
     hle/service/hid/xcd.h
-    hle/service/hle_ipc.cpp
-    hle/service/hle_ipc.h
-    hle/service/ipc_helpers.h
-    hle/service/kernel_helpers.cpp
-    hle/service/kernel_helpers.h
     hle/service/lbl/lbl.cpp
     hle/service/lbl/lbl.h
     hle/service/ldn/lan_discovery.cpp
     hle/service/ldn/lan_discovery.h
+    hle/service/ldn/ldn_results.h
     hle/service/ldn/ldn.cpp
     hle/service/ldn/ldn.h
-    hle/service/ldn/ldn_results.h
     hle/service/ldn/ldn_types.h
     hle/service/ldr/ldr.cpp
     hle/service/ldr/ldr.h
@@ -651,6 +563,16 @@ add_library(core STATIC
     hle/service/lm/lm.h
     hle/service/mig/mig.cpp
     hle/service/mig/mig.h
+    hle/service/mii/types/char_info.cpp
+    hle/service/mii/types/char_info.h
+    hle/service/mii/types/core_data.cpp
+    hle/service/mii/types/core_data.h
+    hle/service/mii/types/raw_data.cpp
+    hle/service/mii/types/raw_data.h
+    hle/service/mii/types/store_data.cpp
+    hle/service/mii/types/store_data.h
+    hle/service/mii/types/ver3_store_data.cpp
+    hle/service/mii/types/ver3_store_data.h
     hle/service/mii/mii.cpp
     hle/service/mii/mii.h
     hle/service/mii/mii_database.cpp
@@ -662,22 +584,10 @@ add_library(core STATIC
     hle/service/mii/mii_result.h
     hle/service/mii/mii_types.h
     hle/service/mii/mii_util.h
-    hle/service/mii/types/char_info.cpp
-    hle/service/mii/types/char_info.h
-    hle/service/mii/types/core_data.cpp
-    hle/service/mii/types/core_data.h
-    hle/service/mii/types/raw_data.cpp
-    hle/service/mii/types/raw_data.h
-    hle/service/mii/types/store_data.cpp
-    hle/service/mii/types/store_data.h
-    hle/service/mii/types/ver3_store_data.cpp
-    hle/service/mii/types/ver3_store_data.h
     hle/service/mm/mm_u.cpp
     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
@@ -847,12 +757,19 @@ add_library(core STATIC
     hle/service/ptm/ptm.h
     hle/service/ptm/ts.cpp
     hle/service/ptm/ts.h
-    hle/service/ro/ro.cpp
+    hle/service/hle_ipc.cpp
-    hle/service/ro/ro.h
+    hle/service/hle_ipc.h
+    hle/service/ipc_helpers.h
+    hle/service/kernel_helpers.cpp
+    hle/service/kernel_helpers.h
+    hle/service/mutex.cpp
+    hle/service/mutex.h
     hle/service/ro/ro_nro_utils.cpp
     hle/service/ro/ro_nro_utils.h
     hle/service/ro/ro_results.h
     hle/service/ro/ro_types.h
+    hle/service/ro/ro.cpp
+    hle/service/ro/ro.h
     hle/service/server_manager.cpp
     hle/service/server_manager.h
     hle/service/service.cpp
@@ -919,9 +836,9 @@ add_library(core STATIC
     internal_network/network.h
     internal_network/network_interface.cpp
     internal_network/network_interface.h
+    internal_network/sockets.h
     internal_network/socket_proxy.cpp
     internal_network/socket_proxy.h
-    internal_network/sockets.h
     loader/deconstructed_rom_directory.cpp
     loader/deconstructed_rom_directory.h
     loader/kip.cpp
@@ -940,13 +857,13 @@ add_library(core STATIC
     loader/nsp.h
     loader/xci.cpp
     loader/xci.h
-    memory.cpp
-    memory.h
     memory/cheat_engine.cpp
     memory/cheat_engine.h
     memory/dmnt_cheat_types.h
     memory/dmnt_cheat_vm.cpp
     memory/dmnt_cheat_vm.h
+    memory.cpp
+    memory.h
     perf_stats.cpp
     perf_stats.h
     precompiled_headers.h

src/core/core.cpp

@@ -21,13 +21,13 @@
 #include "core/debugger/debugger.h"
 #include "core/device_memory.h"
 #include "core/file_sys/bis_factory.h"
-#include "core/file_sys/fs_filesystem.h"
+#include "core/file_sys/mode.h"
 #include "core/file_sys/patch_manager.h"
 #include "core/file_sys/registered_cache.h"
 #include "core/file_sys/romfs_factory.h"
 #include "core/file_sys/savedata_factory.h"
-#include "core/file_sys/vfs/vfs_concat.h"
+#include "core/file_sys/vfs_concat.h"
-#include "core/file_sys/vfs/vfs_real.h"
+#include "core/file_sys/vfs_real.h"
 #include "core/gpu_dirty_memory_manager.h"
 #include "core/hle/kernel/k_memory_manager.h"
 #include "core/hle/kernel/k_process.h"
@@ -36,8 +36,7 @@
 #include "core/hle/kernel/kernel.h"
 #include "core/hle/kernel/physical_core.h"
 #include "core/hle/service/acc/profile_manager.h"
-#include "core/hle/service/am/applet_manager.h"
+#include "core/hle/service/am/applets/applets.h"
-#include "core/hle/service/am/frontend/applets.h"
 #include "core/hle/service/apm/apm_controller.h"
 #include "core/hle/service/filesystem/filesystem.h"
 #include "core/hle/service/glue/glue_manager.h"
@@ -103,7 +102,7 @@ FileSys::VirtualFile GetGameFileFromPath(const FileSys::VirtualFilesystem& vfs,
     Common::SplitPath(path, &dir_name, &filename, nullptr);
 
     if (filename == "00") {
-        const auto dir = vfs->OpenDirectory(dir_name, FileSys::OpenMode::Read);
+        const auto dir = vfs->OpenDirectory(dir_name, FileSys::Mode::Read);
         std::vector<FileSys::VirtualFile> concat;
 
         for (u32 i = 0; i < 0x10; ++i) {
@@ -128,16 +127,16 @@ FileSys::VirtualFile GetGameFileFromPath(const FileSys::VirtualFilesystem& vfs,
     }
 
     if (Common::FS::IsDir(path)) {
-        return vfs->OpenFile(path + "/main", FileSys::OpenMode::Read);
+        return vfs->OpenFile(path + "/main", FileSys::Mode::Read);
     }
 
-    return vfs->OpenFile(path, FileSys::OpenMode::Read);
+    return vfs->OpenFile(path, FileSys::Mode::Read);
 }
 
 struct System::Impl {
     explicit Impl(System& system)
-        : kernel{system}, fs_controller{system}, hid_core{}, room_network{}, cpu_manager{system},
+        : kernel{system}, fs_controller{system}, hid_core{}, room_network{},
-          reporter{system}, applet_manager{system}, frontend_applets{system}, profile_manager{} {}
+          cpu_manager{system}, reporter{system}, applet_manager{system}, profile_manager{} {}
 
     void Initialize(System& system) {
         device_memory = std::make_unique<Core::DeviceMemory>();
@@ -158,7 +157,7 @@ struct System::Impl {
         }
 
         // Create default implementations of applets if one is not provided.
-        frontend_applets.SetDefaultAppletsIfMissing();
+        applet_manager.SetDefaultAppletsIfMissing();
 
         is_async_gpu = Settings::values.use_asynchronous_gpu_emulation.GetValue();
 
@@ -331,27 +330,16 @@ struct System::Impl {
     }
 
     SystemResultStatus Load(System& system, Frontend::EmuWindow& emu_window,
-                            const std::string& filepath,
+                            const std::string& filepath, u64 program_id,
-                            Service::AM::FrontendAppletParameters& params) {
+                            std::size_t program_index) {
         app_loader = Loader::GetLoader(system, GetGameFileFromPath(virtual_filesystem, filepath),
-                                       params.program_id, params.program_index);
+                                       program_id, program_index);
 
         if (!app_loader) {
             LOG_CRITICAL(Core, "Failed to obtain loader for {}!", filepath);
             return SystemResultStatus::ErrorGetLoader;
         }
 
-        if (app_loader->ReadProgramId(params.program_id) != Loader::ResultStatus::Success) {
-            LOG_ERROR(Core, "Failed to find title id for ROM!");
-        }
-
-        std::string name = "Unknown program";
-        if (app_loader->ReadTitle(name) != Loader::ResultStatus::Success) {
-            LOG_ERROR(Core, "Failed to read title for ROM!");
-        }
-
-        LOG_INFO(Core, "Loading {} ({})", name, params.program_id);
-
         InitializeKernel(system);
 
         // Create the application process.
@@ -385,14 +373,9 @@ struct System::Impl {
             cheat_engine->Initialize();
         }
 
-        // Register with applet manager.
-        applet_manager.CreateAndInsertByFrontendAppletParameters(main_process->GetProcessId(),
-                                                                 params);
-
         // All threads are started, begin main process execution, now that we're in the clear.
         main_process->Run(load_parameters->main_thread_priority,
                           load_parameters->main_thread_stack_size);
-        main_process->Close();
 
         if (Settings::values.gamecard_inserted) {
             if (Settings::values.gamecard_current_game) {
@@ -403,13 +386,21 @@ struct System::Impl {
             }
         }
 
-        perf_stats = std::make_unique<PerfStats>(params.program_id);
+        if (app_loader->ReadProgramId(program_id) != Loader::ResultStatus::Success) {
+            LOG_ERROR(Core, "Failed to find title id for ROM (Error {})", load_result);
+        }
+        perf_stats = std::make_unique<PerfStats>(program_id);
         // Reset counters and set time origin to current frame
         GetAndResetPerfStats();
         perf_stats->BeginSystemFrame();
 
+        std::string name = "Unknown Game";
+        if (app_loader->ReadTitle(name) != Loader::ResultStatus::Success) {
+            LOG_ERROR(Core, "Failed to read title for ROM (Error {})", load_result);
+        }
+
         std::string title_version;
-        const FileSys::PatchManager pm(params.program_id, system.GetFileSystemController(),
+        const FileSys::PatchManager pm(program_id, system.GetFileSystemController(),
                                        system.GetContentProvider());
         const auto metadata = pm.GetControlMetadata();
         if (metadata.first != nullptr) {
@@ -418,15 +409,14 @@ struct System::Impl {
         if (auto room_member = room_network.GetRoomMember().lock()) {
             Network::GameInfo game_info;
             game_info.name = name;
-            game_info.id = params.program_id;
+            game_info.id = program_id;
             game_info.version = title_version;
             room_member->SendGameInfo(game_info);
         }
 
         // Workarounds:
         // Activate this in Super Smash Brothers Ultimate, it only affects AMD cards using AMDVLK
-        Settings::values.renderer_amdvlk_depth_bias_workaround =
+        Settings::values.renderer_amdvlk_depth_bias_workaround = program_id == 0x1006A800016E000ULL;
-            params.program_id == 0x1006A800016E000ULL;
 
         status = SystemResultStatus::Success;
         return status;
@@ -465,7 +455,6 @@ struct System::Impl {
         }
         kernel.CloseServices();
         kernel.ShutdownCores();
-        applet_manager.Reset();
         services.reset();
         service_manager.reset();
         fs_controller.Reset();
@@ -577,9 +566,8 @@ struct System::Impl {
 
     std::unique_ptr<Tools::RenderdocAPI> renderdoc_api;
 
-    /// Applets
+    /// Frontend applets
-    Service::AM::AppletManager applet_manager;
+    Service::AM::Applets::AppletManager applet_manager;
-    Service::AM::Frontend::FrontendAppletHolder frontend_applets;
 
     /// APM (Performance) services
     Service::APM::Controller apm_controller{core_timing};
@@ -692,8 +680,8 @@ void System::InitializeDebugger() {
 }
 
 SystemResultStatus System::Load(Frontend::EmuWindow& emu_window, const std::string& filepath,
-                                Service::AM::FrontendAppletParameters& params) {
+                                u64 program_id, std::size_t program_index) {
-    return impl->Load(*this, emu_window, filepath, params);
+    return impl->Load(*this, emu_window, filepath, program_id, program_index);
 }
 
 bool System::IsPoweredOn() const {
@@ -883,19 +871,19 @@ void System::RegisterCheatList(const std::vector<Memory::CheatEntry>& list,
     impl->cheat_engine->SetMainMemoryParameters(main_region_begin, main_region_size);
 }
 
-void System::SetFrontendAppletSet(Service::AM::Frontend::FrontendAppletSet&& set) {
+void System::SetAppletFrontendSet(Service::AM::Applets::AppletFrontendSet&& set) {
-    impl->frontend_applets.SetFrontendAppletSet(std::move(set));
+    impl->applet_manager.SetAppletFrontendSet(std::move(set));
 }
 
-Service::AM::Frontend::FrontendAppletHolder& System::GetFrontendAppletHolder() {
+void System::SetDefaultAppletFrontendSet() {
-    return impl->frontend_applets;
+    impl->applet_manager.SetDefaultAppletFrontendSet();
 }
 
-const Service::AM::Frontend::FrontendAppletHolder& System::GetFrontendAppletHolder() const {
+Service::AM::Applets::AppletManager& System::GetAppletManager() {
-    return impl->frontend_applets;
+    return impl->applet_manager;
 }
 
-Service::AM::AppletManager& System::GetAppletManager() {
+const Service::AM::Applets::AppletManager& System::GetAppletManager() const {
     return impl->applet_manager;
 }
 

src/core/core.h

@@ -13,7 +13,7 @@
 #include <vector>
 
 #include "common/common_types.h"
-#include "core/file_sys/vfs/vfs_types.h"
+#include "core/file_sys/vfs_types.h"
 
 namespace Core::Frontend {
 class EmuWindow;
@@ -50,15 +50,10 @@ namespace Account {
 class ProfileManager;
 } // namespace Account
 
-namespace AM {
+namespace AM::Applets {
-struct FrontendAppletParameters;
+struct AppletFrontendSet;
 class AppletManager;
-} // namespace AM
+} // namespace AM::Applets
-
-namespace AM::Frontend {
-struct FrontendAppletSet;
-class FrontendAppletHolder;
-} // namespace AM::Frontend
 
 namespace APM {
 class Controller;
@@ -208,8 +203,8 @@ public:
      * @returns SystemResultStatus code, indicating if the operation succeeded.
      */
     [[nodiscard]] SystemResultStatus Load(Frontend::EmuWindow& emu_window,
-                                          const std::string& filepath,
+                                          const std::string& filepath, u64 program_id = 0,
-                                          Service::AM::FrontendAppletParameters& params);
+                                          std::size_t program_index = 0);
 
     /**
      * Indicates if the emulated system is powered on (all subsystems initialized and able to run an
@@ -349,13 +344,11 @@ public:
                            const std::array<u8, 0x20>& build_id, u64 main_region_begin,
                            u64 main_region_size);
 
-    void SetFrontendAppletSet(Service::AM::Frontend::FrontendAppletSet&& set);
+    void SetAppletFrontendSet(Service::AM::Applets::AppletFrontendSet&& set);
+    void SetDefaultAppletFrontendSet();
 
-    [[nodiscard]] Service::AM::Frontend::FrontendAppletHolder& GetFrontendAppletHolder();
+    [[nodiscard]] Service::AM::Applets::AppletManager& GetAppletManager();
-    [[nodiscard]] const Service::AM::Frontend::FrontendAppletHolder& GetFrontendAppletHolder()
+    [[nodiscard]] const Service::AM::Applets::AppletManager& GetAppletManager() const;
-        const;
-
-    [[nodiscard]] Service::AM::AppletManager& GetAppletManager();
 
     void SetContentProvider(std::unique_ptr<FileSys::ContentProviderUnion> provider);
 

src/core/core_timing.cpp

@@ -66,6 +66,7 @@ void CoreTiming::Initialize(std::function<void()>&& on_thread_init_) {
     event_fifo_id = 0;
     shutting_down = false;
     cpu_ticks = 0;
+    clock->Reset();
     if (is_multicore) {
         timer_thread = std::make_unique<std::jthread>(ThreadEntry, std::ref(*this));
     }

src/core/crypto/aes_util.h

@@ -7,7 +7,7 @@
 #include <span>
 #include <type_traits>
 #include "common/common_types.h"
-#include "core/file_sys/vfs/vfs.h"
+#include "core/file_sys/vfs.h"
 
 namespace Core::Crypto {
 

src/core/crypto/encryption_layer.h

@@ -4,7 +4,7 @@
 #pragma once
 
 #include "common/common_types.h"
-#include "core/file_sys/vfs/vfs.h"
+#include "core/file_sys/vfs.h"
 
 namespace Core::Crypto {
 

src/core/crypto/partition_data_manager.cpp

@@ -21,9 +21,9 @@
 #include "core/crypto/partition_data_manager.h"
 #include "core/crypto/xts_encryption_layer.h"
 #include "core/file_sys/kernel_executable.h"
-#include "core/file_sys/vfs/vfs.h"
+#include "core/file_sys/vfs.h"
-#include "core/file_sys/vfs/vfs_offset.h"
+#include "core/file_sys/vfs_offset.h"
-#include "core/file_sys/vfs/vfs_vector.h"
+#include "core/file_sys/vfs_vector.h"
 #include "core/loader/loader.h"
 
 using Common::AsArray;

src/core/crypto/partition_data_manager.h

@@ -5,7 +5,7 @@
 
 #include <vector>
 #include "common/common_types.h"
-#include "core/file_sys/vfs/vfs_types.h"
+#include "core/file_sys/vfs_types.h"
 
 namespace Core::Crypto {
 

src/core/device_memory_manager.h

@@ -10,7 +10,6 @@
 #include <mutex>
 
 #include "common/common_types.h"
-#include "common/range_mutex.h"
 #include "common/scratch_buffer.h"
 #include "common/virtual_buffer.h"
 
@@ -205,7 +204,7 @@ private:
         (1ULL << (device_virtual_bits - page_bits)) / subentries;
     using CachedPages = std::array<CounterEntry, num_counter_entries>;
     std::unique_ptr<CachedPages> cached_pages;
-    Common::RangeMutex counter_guard;
+    std::mutex counter_guard;
     std::mutex mapping_guard;
 };
 

src/core/device_memory_manager.inc

@@ -31,8 +31,9 @@ public:
         buffer.resize(0);
         size_t index = 0;
         const auto add_value = [&](u32 value) {
-            buffer.resize(index + 1);
+            buffer[index] = value;
-            buffer[index++] = value;
+            index++;
+            buffer.resize(index);
         };
 
         u32 iter_entry = start_entry;
@@ -508,7 +509,12 @@ void DeviceMemoryManager<Traits>::UnregisterProcess(Asid asid) {
 
 template <typename Traits>
 void DeviceMemoryManager<Traits>::UpdatePagesCachedCount(DAddr addr, size_t size, s32 delta) {
-    Common::ScopedRangeLock lk(counter_guard, addr, size);
+    std::unique_lock<std::mutex> lk(counter_guard, std::defer_lock);
+    const auto Lock = [&] {
+        if (!lk) {
+            lk.lock();
+        }
+    };
     u64 uncache_begin = 0;
     u64 cache_begin = 0;
     u64 uncache_bytes = 0;
@@ -543,6 +549,7 @@ void DeviceMemoryManager<Traits>::UpdatePagesCachedCount(DAddr addr, size_t size
             }
             uncache_bytes += Memory::YUZU_PAGESIZE;
         } else if (uncache_bytes > 0) {
+            Lock();
             MarkRegionCaching(memory_device_inter, uncache_begin << Memory::YUZU_PAGEBITS,
                               uncache_bytes, false);
             uncache_bytes = 0;
@@ -553,6 +560,7 @@ void DeviceMemoryManager<Traits>::UpdatePagesCachedCount(DAddr addr, size_t size
             }
             cache_bytes += Memory::YUZU_PAGESIZE;
         } else if (cache_bytes > 0) {
+            Lock();
             MarkRegionCaching(memory_device_inter, cache_begin << Memory::YUZU_PAGEBITS, cache_bytes,
                               true);
             cache_bytes = 0;
@@ -560,10 +568,12 @@ void DeviceMemoryManager<Traits>::UpdatePagesCachedCount(DAddr addr, size_t size
         vpage++;
     }
     if (uncache_bytes > 0) {
+        Lock();
         MarkRegionCaching(memory_device_inter, uncache_begin << Memory::YUZU_PAGEBITS, uncache_bytes,
                           false);
     }
     if (cache_bytes > 0) {
+        Lock();
         MarkRegionCaching(memory_device_inter, cache_begin << Memory::YUZU_PAGEBITS, cache_bytes,
                           true);
     }

src/core/file_sys/bis_factory.cpp

@@ -4,8 +4,9 @@
 #include <fmt/format.h>
 #include "common/fs/path_util.h"
 #include "core/file_sys/bis_factory.h"
+#include "core/file_sys/mode.h"
 #include "core/file_sys/registered_cache.h"
-#include "core/file_sys/vfs/vfs.h"
+#include "core/file_sys/vfs.h"
 
 namespace FileSys {
 
@@ -83,7 +84,7 @@ VirtualFile BISFactory::OpenPartitionStorage(BisPartitionId id,
                                              VirtualFilesystem file_system) const {
     auto& keys = Core::Crypto::KeyManager::Instance();
     Core::Crypto::PartitionDataManager pdm{file_system->OpenDirectory(
-        Common::FS::GetYuzuPathString(Common::FS::YuzuPath::NANDDir), OpenMode::Read)};
+        Common::FS::GetYuzuPathString(Common::FS::YuzuPath::NANDDir), Mode::Read)};
     keys.PopulateFromPartitionData(pdm);
 
     switch (id) {

src/core/file_sys/bis_factory.h

@@ -6,7 +6,7 @@
 #include <memory>
 
 #include "common/common_types.h"
-#include "core/file_sys/vfs/vfs_types.h"
+#include "core/file_sys/vfs_types.h"
 
 namespace FileSys {
 

src/core/file_sys/card_image.cpp

@@ -13,8 +13,8 @@
 #include "core/file_sys/nca_metadata.h"
 #include "core/file_sys/partition_filesystem.h"
 #include "core/file_sys/submission_package.h"
-#include "core/file_sys/vfs/vfs_offset.h"
+#include "core/file_sys/vfs_offset.h"
-#include "core/file_sys/vfs/vfs_vector.h"
+#include "core/file_sys/vfs_vector.h"
 #include "core/loader/loader.h"
 
 namespace FileSys {

src/core/file_sys/card_image.h

@@ -8,7 +8,7 @@
 #include <vector>
 #include "common/common_types.h"
 #include "common/swap.h"
-#include "core/file_sys/vfs/vfs.h"
+#include "core/file_sys/vfs.h"
 
 namespace Core::Crypto {
 class KeyManager;

src/core/file_sys/content_archive.cpp

@@ -13,7 +13,7 @@
 #include "core/crypto/key_manager.h"
 #include "core/file_sys/content_archive.h"
 #include "core/file_sys/partition_filesystem.h"
-#include "core/file_sys/vfs/vfs_offset.h"
+#include "core/file_sys/vfs_offset.h"
 #include "core/loader/loader.h"
 
 #include "core/file_sys/fssystem/fssystem_compression_configuration.h"

src/core/file_sys/content_archive.h

@@ -13,7 +13,7 @@
 #include "common/common_types.h"
 #include "common/swap.h"
 #include "core/crypto/key_manager.h"
-#include "core/file_sys/vfs/vfs.h"
+#include "core/file_sys/vfs.h"
 
 namespace Loader {
 enum class ResultStatus : u16;

src/core/file_sys/control_metadata.cpp

@@ -5,7 +5,7 @@
 #include "common/string_util.h"
 #include "common/swap.h"
 #include "core/file_sys/control_metadata.h"
-#include "core/file_sys/vfs/vfs.h"
+#include "core/file_sys/vfs.h"
 
 namespace FileSys {
 

src/core/file_sys/control_metadata.h

@@ -8,7 +8,7 @@
 #include "common/common_funcs.h"
 #include "common/common_types.h"
 #include "common/swap.h"
-#include "core/file_sys/vfs/vfs_types.h"
+#include "core/file_sys/vfs_types.h"
 
 namespace FileSys {
 

src/core/file_sys/directory.h

@@ -0,0 +1,39 @@
+// SPDX-FileCopyrightText: Copyright 2018 yuzu Emulator Project
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#pragma once
+
+#include <cstddef>
+#include "common/common_funcs.h"
+#include "common/common_types.h"
+
+////////////////////////////////////////////////////////////////////////////////////////////////////
+// FileSys namespace
+
+namespace FileSys {
+
+enum class EntryType : u8 {
+    Directory = 0,
+    File = 1,
+};
+
+// Structure of a directory entry, from
+// http://switchbrew.org/index.php?title=Filesystem_services#DirectoryEntry
+struct Entry {
+    Entry(std::string_view view, EntryType entry_type, u64 entry_size)
+        : type{entry_type}, file_size{entry_size} {
+        const std::size_t copy_size = view.copy(filename, std::size(filename) - 1);
+        filename[copy_size] = '\0';
+    }
+
+    char filename[0x301];
+    INSERT_PADDING_BYTES(3);
+    EntryType type;
+    INSERT_PADDING_BYTES(3);
+    u64 file_size;
+};
+static_assert(sizeof(Entry) == 0x310, "Directory Entry struct isn't exactly 0x310 bytes long!");
+static_assert(offsetof(Entry, type) == 0x304, "Wrong offset for type in Entry.");
+static_assert(offsetof(Entry, file_size) == 0x308, "Wrong offset for file_size in Entry.");
+
+} // namespace FileSys

src/core/file_sys/errors.h

@@ -7,13 +7,18 @@
 
 namespace FileSys {
 
-constexpr Result ResultPathNotFound{ErrorModule::FS, 1};
+constexpr Result ERROR_PATH_NOT_FOUND{ErrorModule::FS, 1};
-constexpr Result ResultPathAlreadyExists{ErrorModule::FS, 2};
+constexpr Result ERROR_PATH_ALREADY_EXISTS{ErrorModule::FS, 2};
+constexpr Result ERROR_ENTITY_NOT_FOUND{ErrorModule::FS, 1002};
+constexpr Result ERROR_SD_CARD_NOT_FOUND{ErrorModule::FS, 2001};
+constexpr Result ERROR_OUT_OF_BOUNDS{ErrorModule::FS, 3005};
+constexpr Result ERROR_FAILED_MOUNT_ARCHIVE{ErrorModule::FS, 3223};
+constexpr Result ERROR_INVALID_ARGUMENT{ErrorModule::FS, 6001};
+constexpr Result ERROR_INVALID_OFFSET{ErrorModule::FS, 6061};
+constexpr Result ERROR_INVALID_SIZE{ErrorModule::FS, 6062};
+
 constexpr Result ResultUnsupportedSdkVersion{ErrorModule::FS, 50};
 constexpr Result ResultPartitionNotFound{ErrorModule::FS, 1001};
-constexpr Result ResultTargetNotFound{ErrorModule::FS, 1002};
-constexpr Result ResultPortSdCardNoDevice{ErrorModule::FS, 2001};
-constexpr Result ResultNotImplemented{ErrorModule::FS, 3001};
 constexpr Result ResultUnsupportedVersion{ErrorModule::FS, 3002};
 constexpr Result ResultOutOfRange{ErrorModule::FS, 3005};
 constexpr Result ResultAllocationMemoryFailedInFileSystemBuddyHeapA{ErrorModule::FS, 3294};
@@ -73,21 +78,10 @@ constexpr Result ResultUnexpectedInCompressedStorageA{ErrorModule::FS, 5324};
 constexpr Result ResultUnexpectedInCompressedStorageB{ErrorModule::FS, 5325};
 constexpr Result ResultUnexpectedInCompressedStorageC{ErrorModule::FS, 5326};
 constexpr Result ResultUnexpectedInCompressedStorageD{ErrorModule::FS, 5327};
-constexpr Result ResultUnexpectedInPathA{ErrorModule::FS, 5328};
 constexpr Result ResultInvalidArgument{ErrorModule::FS, 6001};
-constexpr Result ResultInvalidPath{ErrorModule::FS, 6002};
-constexpr Result ResultTooLongPath{ErrorModule::FS, 6003};
-constexpr Result ResultInvalidCharacter{ErrorModule::FS, 6004};
-constexpr Result ResultInvalidPathFormat{ErrorModule::FS, 6005};
-constexpr Result ResultDirectoryUnobtainable{ErrorModule::FS, 6006};
-constexpr Result ResultNotNormalized{ErrorModule::FS, 6007};
 constexpr Result ResultInvalidOffset{ErrorModule::FS, 6061};
 constexpr Result ResultInvalidSize{ErrorModule::FS, 6062};
 constexpr Result ResultNullptrArgument{ErrorModule::FS, 6063};
-constexpr Result ResultInvalidOpenMode{ErrorModule::FS, 6072};
-constexpr Result ResultFileExtensionWithoutOpenModeAllowAppend{ErrorModule::FS, 6201};
-constexpr Result ResultReadNotPermitted{ErrorModule::FS, 6202};
-constexpr Result ResultWriteNotPermitted{ErrorModule::FS, 6203};
 constexpr Result ResultUnsupportedSetSizeForIndirectStorage{ErrorModule::FS, 6325};
 constexpr Result ResultUnsupportedWriteForCompressedStorage{ErrorModule::FS, 6387};
 constexpr Result ResultUnsupportedOperateRangeForCompressedStorage{ErrorModule::FS, 6388};

src/core/file_sys/fs_directory.h

@@ -1,33 +0,0 @@
-// SPDX-FileCopyrightText: Copyright 2024 yuzu Emulator Project
-// SPDX-License-Identifier: GPL-2.0-or-later
-
-#pragma once
-
-namespace FileSys {
-
-constexpr inline size_t EntryNameLengthMax = 0x300;
-
-struct DirectoryEntry {
-    DirectoryEntry(std::string_view view, s8 entry_type, u64 entry_size)
-        : type{entry_type}, file_size{static_cast<s64>(entry_size)} {
-        const std::size_t copy_size = view.copy(name, std::size(name) - 1);
-        name[copy_size] = '\0';
-    }
-
-    char name[EntryNameLengthMax + 1];
-    INSERT_PADDING_BYTES(3);
-    s8 type;
-    INSERT_PADDING_BYTES(3);
-    s64 file_size;
-};
-
-static_assert(sizeof(DirectoryEntry) == 0x310,
-              "Directory Entry struct isn't exactly 0x310 bytes long!");
-static_assert(offsetof(DirectoryEntry, type) == 0x304, "Wrong offset for type in Entry.");
-static_assert(offsetof(DirectoryEntry, file_size) == 0x308, "Wrong offset for file_size in Entry.");
-
-struct DirectoryHandle {
-    void* handle;
-};
-
-} // namespace FileSys

src/core/file_sys/fs_file.h

@@ -1,65 +0,0 @@
-// SPDX-FileCopyrightText: Copyright 2024 yuzu Emulator Project
-// SPDX-License-Identifier: GPL-2.0-or-later
-
-#pragma once
-
-#include "common/common_types.h"
-
-namespace FileSys {
-
-struct ReadOption {
-    u32 value;
-
-    static const ReadOption None;
-};
-
-enum ReadOptionFlag : u32 {
-    ReadOptionFlag_None = (0 << 0),
-};
-
-inline constexpr const ReadOption ReadOption::None = {ReadOptionFlag_None};
-
-inline constexpr bool operator==(const ReadOption& lhs, const ReadOption& rhs) {
-    return lhs.value == rhs.value;
-}
-
-inline constexpr bool operator!=(const ReadOption& lhs, const ReadOption& rhs) {
-    return !(lhs == rhs);
-}
-
-static_assert(sizeof(ReadOption) == sizeof(u32));
-
-enum WriteOptionFlag : u32 {
-    WriteOptionFlag_None = (0 << 0),
-    WriteOptionFlag_Flush = (1 << 0),
-};
-
-struct WriteOption {
-    u32 value;
-
-    constexpr inline bool HasFlushFlag() const {
-        return value & WriteOptionFlag_Flush;
-    }
-
-    static const WriteOption None;
-    static const WriteOption Flush;
-};
-
-inline constexpr const WriteOption WriteOption::None = {WriteOptionFlag_None};
-inline constexpr const WriteOption WriteOption::Flush = {WriteOptionFlag_Flush};
-
-inline constexpr bool operator==(const WriteOption& lhs, const WriteOption& rhs) {
-    return lhs.value == rhs.value;
-}
-
-inline constexpr bool operator!=(const WriteOption& lhs, const WriteOption& rhs) {
-    return !(lhs == rhs);
-}
-
-static_assert(sizeof(WriteOption) == sizeof(u32));
-
-struct FileHandle {
-    void* handle;
-};
-
-} // namespace FileSys

src/core/file_sys/fs_filesystem.h

@@ -1,39 +0,0 @@
-// SPDX-FileCopyrightText: Copyright 2023 yuzu Emulator Project
-// SPDX-License-Identifier: GPL-2.0-or-later
-
-#pragma once
-
-#include "common/common_funcs.h"
-#include "common/common_types.h"
-
-namespace FileSys {
-
-enum class OpenMode : u32 {
-    Read = (1 << 0),
-    Write = (1 << 1),
-    AllowAppend = (1 << 2),
-
-    ReadWrite = (Read | Write),
-    All = (ReadWrite | AllowAppend),
-};
-DECLARE_ENUM_FLAG_OPERATORS(OpenMode)
-
-enum class OpenDirectoryMode : u64 {
-    Directory = (1 << 0),
-    File = (1 << 1),
-
-    All = (Directory | File),
-};
-DECLARE_ENUM_FLAG_OPERATORS(OpenDirectoryMode)
-
-enum class DirectoryEntryType : u8 {
-    Directory = 0,
-    File = 1,
-};
-
-enum class CreateOption : u8 {
-    None = (0 << 0),
-    BigFile = (1 << 0),
-};
-
-} // namespace FileSys

src/core/file_sys/fs_memory_management.h

@@ -1,40 +0,0 @@
-// SPDX-FileCopyrightText: Copyright 2024 yuzu Emulator Project
-// SPDX-License-Identifier: GPL-2.0-or-later
-
-#pragma once
-
-#include <mutex>
-#include "common/alignment.h"
-
-namespace FileSys {
-
-constexpr size_t RequiredAlignment = alignof(u64);
-
-void* AllocateUnsafe(size_t size) {
-    // Allocate
-    void* const ptr = ::operator new(size, std::align_val_t{RequiredAlignment});
-
-    // Check alignment
-    ASSERT(Common::IsAligned(reinterpret_cast<uintptr_t>(ptr), RequiredAlignment));
-
-    // Return allocated pointer
-    return ptr;
-}
-
-void DeallocateUnsafe(void* ptr, size_t size) {
-    // Deallocate the pointer
-    ::operator delete(ptr, std::align_val_t{RequiredAlignment});
-}
-
-void* Allocate(size_t size) {
-    return AllocateUnsafe(size);
-}
-
-void Deallocate(void* ptr, size_t size) {
-    // If the pointer is non-null, deallocate it
-    if (ptr != nullptr) {
-        DeallocateUnsafe(ptr, size);
-    }
-}
-
-} // namespace FileSys

src/core/file_sys/fs_operate_range.h

@@ -1,22 +0,0 @@
-// SPDX-FileCopyrightText: Copyright 2024 yuzu Emulator Project
-// SPDX-License-Identifier: GPL-2.0-or-later
-
-#pragma once
-
-#include "common/common_types.h"
-
-namespace FileSys {
-
-enum class OperationId : s64 {
-    FillZero = 0,
-    DestroySignature = 1,
-    Invalidate = 2,
-    QueryRange = 3,
-    QueryUnpreparedRange = 4,
-    QueryLazyLoadCompletionRate = 5,
-    SetLazyLoadPriority = 6,
-
-    ReadLazyLoadFileForciblyForDebug = 10001,
-};
-
-} // namespace FileSys

src/core/file_sys/fs_path.h

@@ -1,566 +0,0 @@
-// SPDX-FileCopyrightText: Copyright 2024 yuzu Emulator Project
-// SPDX-License-Identifier: GPL-2.0-or-later
-
-#pragma once
-
-#include "common/alignment.h"
-#include "common/common_funcs.h"
-#include "core/file_sys/errors.h"
-#include "core/file_sys/fs_memory_management.h"
-#include "core/file_sys/fs_path_utility.h"
-#include "core/file_sys/fs_string_util.h"
-#include "core/hle/result.h"
-
-namespace FileSys {
-class DirectoryPathParser;
-
-class Path {
-    YUZU_NON_COPYABLE(Path);
-    YUZU_NON_MOVEABLE(Path);
-
-private:
-    static constexpr const char* EmptyPath = "";
-    static constexpr size_t WriteBufferAlignmentLength = 8;
-
-private:
-    friend class DirectoryPathParser;
-
-public:
-    class WriteBuffer {
-        YUZU_NON_COPYABLE(WriteBuffer);
-
-    private:
-        char* m_buffer;
-        size_t m_length_and_is_normalized;
-
-    public:
-        constexpr WriteBuffer() : m_buffer(nullptr), m_length_and_is_normalized(0) {}
-
-        constexpr ~WriteBuffer() {
-            if (m_buffer != nullptr) {
-                Deallocate(m_buffer, this->GetLength());
-                this->ResetBuffer();
-            }
-        }
-
-        constexpr WriteBuffer(WriteBuffer&& rhs)
-            : m_buffer(rhs.m_buffer), m_length_and_is_normalized(rhs.m_length_and_is_normalized) {
-            rhs.ResetBuffer();
-        }
-
-        constexpr WriteBuffer& operator=(WriteBuffer&& rhs) {
-            if (m_buffer != nullptr) {
-                Deallocate(m_buffer, this->GetLength());
-            }
-
-            m_buffer = rhs.m_buffer;
-            m_length_and_is_normalized = rhs.m_length_and_is_normalized;
-
-            rhs.ResetBuffer();
-
-            return *this;
-        }
-
-        constexpr void ResetBuffer() {
-            m_buffer = nullptr;
-            this->SetLength(0);
-        }
-
-        constexpr char* Get() const {
-            return m_buffer;
-        }
-
-        constexpr size_t GetLength() const {
-            return m_length_and_is_normalized >> 1;
-        }
-
-        constexpr bool IsNormalized() const {
-            return static_cast<bool>(m_length_and_is_normalized & 1);
-        }
-
-        constexpr void SetNormalized() {
-            m_length_and_is_normalized |= static_cast<size_t>(1);
-        }
-
-        constexpr void SetNotNormalized() {
-            m_length_and_is_normalized &= ~static_cast<size_t>(1);
-        }
-
-    private:
-        constexpr WriteBuffer(char* buffer, size_t length)
-            : m_buffer(buffer), m_length_and_is_normalized(0) {
-            this->SetLength(length);
-        }
-
-    public:
-        static WriteBuffer Make(size_t length) {
-            if (void* alloc = Allocate(length); alloc != nullptr) {
-                return WriteBuffer(static_cast<char*>(alloc), length);
-            } else {
-                return WriteBuffer();
-            }
-        }
-
-    private:
-        constexpr void SetLength(size_t size) {
-            m_length_and_is_normalized = (m_length_and_is_normalized & 1) | (size << 1);
-        }
-    };
-
-private:
-    const char* m_str;
-    WriteBuffer m_write_buffer;
-
-public:
-    constexpr Path() : m_str(EmptyPath), m_write_buffer() {}
-
-    constexpr Path(const char* s) : m_str(s), m_write_buffer() {
-        m_write_buffer.SetNormalized();
-    }
-
-    constexpr ~Path() = default;
-
-    constexpr Result SetShallowBuffer(const char* buffer) {
-        // Check pre-conditions
-        ASSERT(m_write_buffer.GetLength() == 0);
-
-        // Check the buffer is valid
-        R_UNLESS(buffer != nullptr, ResultNullptrArgument);
-
-        // Set buffer
-        this->SetReadOnlyBuffer(buffer);
-
-        // Note that we're normalized
-        this->SetNormalized();
-
-        R_SUCCEED();
-    }
-
-    constexpr const char* GetString() const {
-        // Check pre-conditions
-        ASSERT(this->IsNormalized());
-
-        return m_str;
-    }
-
-    constexpr size_t GetLength() const {
-        if (std::is_constant_evaluated()) {
-            return Strlen(this->GetString());
-        } else {
-            return std::strlen(this->GetString());
-        }
-    }
-
-    constexpr bool IsEmpty() const {
-        return *m_str == '\x00';
-    }
-
-    constexpr bool IsMatchHead(const char* p, size_t len) const {
-        return Strncmp(this->GetString(), p, len) == 0;
-    }
-
-    Result Initialize(const Path& rhs) {
-        // Check the other path is normalized
-        const bool normalized = rhs.IsNormalized();
-        R_UNLESS(normalized, ResultNotNormalized);
-
-        // Allocate buffer for our path
-        const auto len = rhs.GetLength();
-        R_TRY(this->Preallocate(len + 1));
-
-        // Copy the path
-        const size_t copied = Strlcpy<char>(m_write_buffer.Get(), rhs.GetString(), len + 1);
-        R_UNLESS(copied == len, ResultUnexpectedInPathA);
-
-        // Set normalized
-        this->SetNormalized();
-        R_SUCCEED();
-    }
-
-    Result Initialize(const char* path, size_t len) {
-        // Check the path is valid
-        R_UNLESS(path != nullptr, ResultNullptrArgument);
-
-        // Initialize
-        R_TRY(this->InitializeImpl(path, len));
-
-        // Set not normalized
-        this->SetNotNormalized();
-
-        R_SUCCEED();
-    }
-
-    Result Initialize(const char* path) {
-        // Check the path is valid
-        R_UNLESS(path != nullptr, ResultNullptrArgument);
-
-        R_RETURN(this->Initialize(path, std::strlen(path)));
-    }
-
-    Result InitializeWithReplaceBackslash(const char* path) {
-        // Check the path is valid
-        R_UNLESS(path != nullptr, ResultNullptrArgument);
-
-        // Initialize
-        R_TRY(this->InitializeImpl(path, std::strlen(path)));
-
-        // Replace slashes as desired
-        if (const auto write_buffer_length = m_write_buffer.GetLength(); write_buffer_length > 1) {
-            Replace(m_write_buffer.Get(), write_buffer_length - 1, '\\', '/');
-        }
-
-        // Set not normalized
-        this->SetNotNormalized();
-
-        R_SUCCEED();
-    }
-
-    Result InitializeWithReplaceForwardSlashes(const char* path) {
-        // Check the path is valid
-        R_UNLESS(path != nullptr, ResultNullptrArgument);
-
-        // Initialize
-        R_TRY(this->InitializeImpl(path, std::strlen(path)));
-
-        // Replace slashes as desired
-        if (m_write_buffer.GetLength() > 1) {
-            if (auto* p = m_write_buffer.Get(); p[0] == '/' && p[1] == '/') {
-                p[0] = '\\';
-                p[1] = '\\';
-            }
-        }
-
-        // Set not normalized
-        this->SetNotNormalized();
-
-        R_SUCCEED();
-    }
-
-    Result InitializeWithNormalization(const char* path, size_t size) {
-        // Check the path is valid
-        R_UNLESS(path != nullptr, ResultNullptrArgument);
-
-        // Initialize
-        R_TRY(this->InitializeImpl(path, size));
-
-        // Set not normalized
-        this->SetNotNormalized();
-
-        // Perform normalization
-        PathFlags path_flags;
-        if (IsPathRelative(m_str)) {
-            path_flags.AllowRelativePath();
-        } else if (IsWindowsPath(m_str, true)) {
-            path_flags.AllowWindowsPath();
-        } else {
-            /* NOTE: In this case, Nintendo checks is normalized, then sets is normalized, then
-             * returns success. */
-            /* This seems like a bug. */
-            size_t dummy;
-            bool normalized;
-            R_TRY(PathFormatter::IsNormalized(std::addressof(normalized), std::addressof(dummy),
-                                              m_str));
-
-            this->SetNormalized();
-            R_SUCCEED();
-        }
-
-        // Normalize
-        R_TRY(this->Normalize(path_flags));
-
-        this->SetNormalized();
-        R_SUCCEED();
-    }
-
-    Result InitializeWithNormalization(const char* path) {
-        // Check the path is valid
-        R_UNLESS(path != nullptr, ResultNullptrArgument);
-
-        R_RETURN(this->InitializeWithNormalization(path, std::strlen(path)));
-    }
-
-    Result InitializeAsEmpty() {
-        // Clear our buffer
-        this->ClearBuffer();
-
-        // Set normalized
-        this->SetNormalized();
-
-        R_SUCCEED();
-    }
-
-    Result AppendChild(const char* child) {
-        // Check the path is valid
-        R_UNLESS(child != nullptr, ResultNullptrArgument);
-
-        // Basic checks. If we have a path and the child is empty, we have nothing to do
-        const char* c = child;
-        if (m_str[0]) {
-            // Skip an early separator
-            if (*c == '/') {
-                ++c;
-            }
-
-            R_SUCCEED_IF(*c == '\x00');
-        }
-
-        // If we don't have a string, we can just initialize
-        auto cur_len = std::strlen(m_str);
-        if (cur_len == 0) {
-            R_RETURN(this->Initialize(child));
-        }
-
-        // Remove a trailing separator
-        if (m_str[cur_len - 1] == '/' || m_str[cur_len - 1] == '\\') {
-            --cur_len;
-        }
-
-        // Get the child path's length
-        auto child_len = std::strlen(c);
-
-        // Reset our write buffer
-        WriteBuffer old_write_buffer;
-        if (m_write_buffer.Get() != nullptr) {
-            old_write_buffer = std::move(m_write_buffer);
-            this->ClearBuffer();
-        }
-
-        // Pre-allocate the new buffer
-        R_TRY(this->Preallocate(cur_len + 1 + child_len + 1));
-
-        // Get our write buffer
-        auto* dst = m_write_buffer.Get();
-        if (old_write_buffer.Get() != nullptr && cur_len > 0) {
-            Strlcpy<char>(dst, old_write_buffer.Get(), cur_len + 1);
-        }
-
-        // Add separator
-        dst[cur_len] = '/';
-
-        // Copy the child path
-        const size_t copied = Strlcpy<char>(dst + cur_len + 1, c, child_len + 1);
-        R_UNLESS(copied == child_len, ResultUnexpectedInPathA);
-
-        R_SUCCEED();
-    }
-
-    Result AppendChild(const Path& rhs) {
-        R_RETURN(this->AppendChild(rhs.GetString()));
-    }
-
-    Result Combine(const Path& parent, const Path& child) {
-        // Get the lengths
-        const auto p_len = parent.GetLength();
-        const auto c_len = child.GetLength();
-
-        // Allocate our buffer
-        R_TRY(this->Preallocate(p_len + c_len + 1));
-
-        // Initialize as parent
-        R_TRY(this->Initialize(parent));
-
-        // If we're empty, we can just initialize as child
-        if (this->IsEmpty()) {
-            R_TRY(this->Initialize(child));
-        } else {
-            // Otherwise, we should append the child
-            R_TRY(this->AppendChild(child));
-        }
-
-        R_SUCCEED();
-    }
-
-    Result RemoveChild() {
-        // If we don't have a write-buffer, ensure that we have one
-        if (m_write_buffer.Get() == nullptr) {
-            if (const auto len = std::strlen(m_str); len > 0) {
-                R_TRY(this->Preallocate(len));
-                Strlcpy<char>(m_write_buffer.Get(), m_str, len + 1);
-            }
-        }
-
-        // Check that it's possible for us to remove a child
-        auto* p = m_write_buffer.Get();
-        s32 len = std::strlen(p);
-        R_UNLESS(len != 1 || (p[0] != '/' && p[0] != '.'), ResultNotImplemented);
-
-        // Handle a trailing separator
-        if (len > 0 && (p[len - 1] == '\\' || p[len - 1] == '/')) {
-            --len;
-        }
-
-        // Remove the child path segment
-        while ((--len) >= 0 && p[len]) {
-            if (p[len] == '/' || p[len] == '\\') {
-                if (len > 0) {
-                    p[len] = 0;
-                } else {
-                    p[1] = 0;
-                    len = 1;
-                }
-                break;
-            }
-        }
-
-        // Check that length remains > 0
-        R_UNLESS(len > 0, ResultNotImplemented);
-
-        R_SUCCEED();
-    }
-
-    Result Normalize(const PathFlags& flags) {
-        // If we're already normalized, nothing to do
-        R_SUCCEED_IF(this->IsNormalized());
-
-        // Check if we're normalized
-        bool normalized;
-        size_t dummy;
-        R_TRY(PathFormatter::IsNormalized(std::addressof(normalized), std::addressof(dummy), m_str,
-                                          flags));
-
-        // If we're not normalized, normalize
-        if (!normalized) {
-            // Determine necessary buffer length
-            auto len = m_write_buffer.GetLength();
-            if (flags.IsRelativePathAllowed() && IsPathRelative(m_str)) {
-                len += 2;
-            }
-            if (flags.IsWindowsPathAllowed() && IsWindowsPath(m_str, true)) {
-                len += 1;
-            }
-
-            // Allocate a new buffer
-            const size_t size = Common::AlignUp(len, WriteBufferAlignmentLength);
-            auto buf = WriteBuffer::Make(size);
-            R_UNLESS(buf.Get() != nullptr, ResultAllocationMemoryFailedMakeUnique);
-
-            // Normalize into it
-            R_TRY(PathFormatter::Normalize(buf.Get(), size, m_write_buffer.Get(),
-                                           m_write_buffer.GetLength(), flags));
-
-            // Set the normalized buffer as our buffer
-            this->SetModifiableBuffer(std::move(buf));
-        }
-
-        // Set normalized
-        this->SetNormalized();
-        R_SUCCEED();
-    }
-
-private:
-    void ClearBuffer() {
-        m_write_buffer.ResetBuffer();
-        m_str = EmptyPath;
-    }
-
-    void SetModifiableBuffer(WriteBuffer&& buffer) {
-        // Check pre-conditions
-        ASSERT(buffer.Get() != nullptr);
-        ASSERT(buffer.GetLength() > 0);
-        ASSERT(Common::IsAligned(buffer.GetLength(), WriteBufferAlignmentLength));
-
-        // Get whether we're normalized
-        if (m_write_buffer.IsNormalized()) {
-            buffer.SetNormalized();
-        } else {
-            buffer.SetNotNormalized();
-        }
-
-        // Set write buffer
-        m_write_buffer = std::move(buffer);
-        m_str = m_write_buffer.Get();
-    }
-
-    constexpr void SetReadOnlyBuffer(const char* buffer) {
-        m_str = buffer;
-        m_write_buffer.ResetBuffer();
-    }
-
-    Result Preallocate(size_t length) {
-        // Allocate additional space, if needed
-        if (length > m_write_buffer.GetLength()) {
-            // Allocate buffer
-            const size_t size = Common::AlignUp(length, WriteBufferAlignmentLength);
-            auto buf = WriteBuffer::Make(size);
-            R_UNLESS(buf.Get() != nullptr, ResultAllocationMemoryFailedMakeUnique);
-
-            // Set write buffer
-            this->SetModifiableBuffer(std::move(buf));
-        }
-
-        R_SUCCEED();
-    }
-
-    Result InitializeImpl(const char* path, size_t size) {
-        if (size > 0 && path[0]) {
-            // Pre allocate a buffer for the path
-            R_TRY(this->Preallocate(size + 1));
-
-            // Copy the path
-            const size_t copied = Strlcpy<char>(m_write_buffer.Get(), path, size + 1);
-            R_UNLESS(copied >= size, ResultUnexpectedInPathA);
-        } else {
-            // We can just clear the buffer
-            this->ClearBuffer();
-        }
-
-        R_SUCCEED();
-    }
-
-    constexpr char* GetWriteBuffer() {
-        ASSERT(m_write_buffer.Get() != nullptr);
-        return m_write_buffer.Get();
-    }
-
-    constexpr size_t GetWriteBufferLength() const {
-        return m_write_buffer.GetLength();
-    }
-
-    constexpr bool IsNormalized() const {
-        return m_write_buffer.IsNormalized();
-    }
-
-    constexpr void SetNormalized() {
-        m_write_buffer.SetNormalized();
-    }
-
-    constexpr void SetNotNormalized() {
-        m_write_buffer.SetNotNormalized();
-    }
-
-public:
-    bool operator==(const FileSys::Path& rhs) const {
-        return std::strcmp(this->GetString(), rhs.GetString()) == 0;
-    }
-    bool operator!=(const FileSys::Path& rhs) const {
-        return !(*this == rhs);
-    }
-    bool operator==(const char* p) const {
-        return std::strcmp(this->GetString(), p) == 0;
-    }
-    bool operator!=(const char* p) const {
-        return !(*this == p);
-    }
-};
-
-inline Result SetUpFixedPath(FileSys::Path* out, const char* s) {
-    // Verify the path is normalized
-    bool normalized;
-    size_t dummy;
-    R_TRY(PathNormalizer::IsNormalized(std::addressof(normalized), std::addressof(dummy), s));
-
-    R_UNLESS(normalized, ResultInvalidPathFormat);
-
-    // Set the fixed path
-    R_RETURN(out->SetShallowBuffer(s));
-}
-
-constexpr inline bool IsWindowsDriveRootPath(const FileSys::Path& path) {
-    const char* const str = path.GetString();
-    return IsWindowsDrive(str) &&
-           (str[2] == StringTraits::DirectorySeparator ||
-            str[2] == StringTraits::AlternateDirectorySeparator) &&
-           str[3] == StringTraits::NullTerminator;
-}
-
-} // namespace FileSys

src/core/file_sys/fs_string_util.h

@@ -1,226 +0,0 @@
-// SPDX-FileCopyrightText: Copyright 2024 yuzu Emulator Project
-// SPDX-License-Identifier: GPL-2.0-or-later
-
-#pragma once
-
-#include "common/assert.h"
-
-namespace FileSys {
-
-template <typename T>
-constexpr int Strlen(const T* str) {
-    ASSERT(str != nullptr);
-
-    int length = 0;
-    while (*str++) {
-        ++length;
-    }
-
-    return length;
-}
-
-template <typename T>
-constexpr int Strnlen(const T* str, int count) {
-    ASSERT(str != nullptr);
-    ASSERT(count >= 0);
-
-    int length = 0;
-    while (count-- && *str++) {
-        ++length;
-    }
-
-    return length;
-}
-
-template <typename T>
-constexpr int Strncmp(const T* lhs, const T* rhs, int count) {
-    ASSERT(lhs != nullptr);
-    ASSERT(rhs != nullptr);
-    ASSERT(count >= 0);
-
-    if (count == 0) {
-        return 0;
-    }
-
-    T l, r;
-    do {
-        l = *(lhs++);
-        r = *(rhs++);
-    } while (l && (l == r) && (--count));
-
-    return l - r;
-}
-
-template <typename T>
-static constexpr int Strlcpy(T* dst, const T* src, int count) {
-    ASSERT(dst != nullptr);
-    ASSERT(src != nullptr);
-
-    const T* cur = src;
-    if (count > 0) {
-        while ((--count) && *cur) {
-            *(dst++) = *(cur++);
-        }
-        *dst = 0;
-    }
-
-    while (*cur) {
-        cur++;
-    }
-
-    return static_cast<int>(cur - src);
-}
-
-enum CharacterEncodingResult {
-    CharacterEncodingResult_Success = 0,
-    CharacterEncodingResult_InsufficientLength = 1,
-    CharacterEncodingResult_InvalidFormat = 2,
-};
-
-namespace impl {
-
-class CharacterEncodingHelper {
-public:
-    static constexpr int8_t Utf8NBytesInnerTable[0x100 + 1] = {
-        -1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
-        1,  1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
-        1,  1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
-        1,  1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
-        1,  1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-        0,  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-        0,  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
-        2,  2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 3, 3, 3, 3, 3, 3, 3,
-        3,  3, 3, 3, 3, 3, 3, 3, 3, 4, 4, 4, 4, 4, 4, 4, 4, 5, 5, 5, 5, 6, 6, 7, 8,
-    };
-
-    static constexpr char GetUtf8NBytes(size_t i) {
-        return static_cast<char>(Utf8NBytesInnerTable[1 + i]);
-    }
-};
-
-} // namespace impl
-
-constexpr inline CharacterEncodingResult ConvertCharacterUtf8ToUtf32(u32* dst, const char* src) {
-    // Check pre-conditions
-    ASSERT(dst != nullptr);
-    ASSERT(src != nullptr);
-
-    // Perform the conversion
-    const auto* p = src;
-    switch (impl::CharacterEncodingHelper::GetUtf8NBytes(static_cast<unsigned char>(p[0]))) {
-    case 1:
-        *dst = static_cast<u32>(p[0]);
-        return CharacterEncodingResult_Success;
-    case 2:
-        if ((static_cast<u32>(p[0]) & 0x1E) != 0) {
-            if (impl::CharacterEncodingHelper::GetUtf8NBytes(static_cast<unsigned char>(p[1])) ==
-                0) {
-                *dst = (static_cast<u32>(p[0] & 0x1F) << 6) | (static_cast<u32>(p[1] & 0x3F) << 0);
-                return CharacterEncodingResult_Success;
-            }
-        }
-        break;
-    case 3:
-        if (impl::CharacterEncodingHelper::GetUtf8NBytes(static_cast<unsigned char>(p[1])) == 0 &&
-            impl::CharacterEncodingHelper::GetUtf8NBytes(static_cast<unsigned char>(p[2])) == 0) {
-            const u32 c = (static_cast<u32>(p[0] & 0xF) << 12) |
-                          (static_cast<u32>(p[1] & 0x3F) << 6) |
-                          (static_cast<u32>(p[2] & 0x3F) << 0);
-            if ((c & 0xF800) != 0 && (c & 0xF800) != 0xD800) {
-                *dst = c;
-                return CharacterEncodingResult_Success;
-            }
-        }
-        return CharacterEncodingResult_InvalidFormat;
-    case 4:
-        if (impl::CharacterEncodingHelper::GetUtf8NBytes(static_cast<unsigned char>(p[1])) == 0 &&
-            impl::CharacterEncodingHelper::GetUtf8NBytes(static_cast<unsigned char>(p[2])) == 0 &&
-            impl::CharacterEncodingHelper::GetUtf8NBytes(static_cast<unsigned char>(p[3])) == 0) {
-            const u32 c =
-                (static_cast<u32>(p[0] & 0x7) << 18) | (static_cast<u32>(p[1] & 0x3F) << 12) |
-                (static_cast<u32>(p[2] & 0x3F) << 6) | (static_cast<u32>(p[3] & 0x3F) << 0);
-            if (c >= 0x10000 && c < 0x110000) {
-                *dst = c;
-                return CharacterEncodingResult_Success;
-            }
-        }
-        return CharacterEncodingResult_InvalidFormat;
-    default:
-        break;
-    }
-
-    // We failed to convert
-    return CharacterEncodingResult_InvalidFormat;
-}
-
-constexpr inline CharacterEncodingResult PickOutCharacterFromUtf8String(char* dst,
-                                                                        const char** str) {
-    // Check pre-conditions
-    ASSERT(dst != nullptr);
-    ASSERT(str != nullptr);
-    ASSERT(*str != nullptr);
-
-    // Clear the output
-    dst[0] = 0;
-    dst[1] = 0;
-    dst[2] = 0;
-    dst[3] = 0;
-
-    // Perform the conversion
-    const auto* p = *str;
-    u32 c = static_cast<u32>(*p);
-    switch (impl::CharacterEncodingHelper::GetUtf8NBytes(c)) {
-    case 1:
-        dst[0] = (*str)[0];
-        ++(*str);
-        break;
-    case 2:
-        if ((p[0] & 0x1E) != 0) {
-            if (impl::CharacterEncodingHelper::GetUtf8NBytes(static_cast<unsigned char>(p[1])) ==
-                0) {
-                c = (static_cast<u32>(p[0] & 0x1F) << 6) | (static_cast<u32>(p[1] & 0x3F) << 0);
-                dst[0] = (*str)[0];
-                dst[1] = (*str)[1];
-                (*str) += 2;
-                break;
-            }
-        }
-        return CharacterEncodingResult_InvalidFormat;
-    case 3:
-        if (impl::CharacterEncodingHelper::GetUtf8NBytes(static_cast<unsigned char>(p[1])) == 0 &&
-            impl::CharacterEncodingHelper::GetUtf8NBytes(static_cast<unsigned char>(p[2])) == 0) {
-            c = (static_cast<u32>(p[0] & 0xF) << 12) | (static_cast<u32>(p[1] & 0x3F) << 6) |
-                (static_cast<u32>(p[2] & 0x3F) << 0);
-            if ((c & 0xF800) != 0 && (c & 0xF800) != 0xD800) {
-                dst[0] = (*str)[0];
-                dst[1] = (*str)[1];
-                dst[2] = (*str)[2];
-                (*str) += 3;
-                break;
-            }
-        }
-        return CharacterEncodingResult_InvalidFormat;
-    case 4:
-        if (impl::CharacterEncodingHelper::GetUtf8NBytes(static_cast<unsigned char>(p[1])) == 0 &&
-            impl::CharacterEncodingHelper::GetUtf8NBytes(static_cast<unsigned char>(p[2])) == 0 &&
-            impl::CharacterEncodingHelper::GetUtf8NBytes(static_cast<unsigned char>(p[3])) == 0) {
-            c = (static_cast<u32>(p[0] & 0x7) << 18) | (static_cast<u32>(p[1] & 0x3F) << 12) |
-                (static_cast<u32>(p[2] & 0x3F) << 6) | (static_cast<u32>(p[3] & 0x3F) << 0);
-            if (c >= 0x10000 && c < 0x110000) {
-                dst[0] = (*str)[0];
-                dst[1] = (*str)[1];
-                dst[2] = (*str)[2];
-                dst[3] = (*str)[3];
-                (*str) += 4;
-                break;
-            }
-        }
-        return CharacterEncodingResult_InvalidFormat;
-    default:
-        return CharacterEncodingResult_InvalidFormat;
-    }
-
-    return CharacterEncodingResult_Success;
-}
-
-} // namespace FileSys

src/core/file_sys/fsmitm_romfsbuild.cpp

@@ -8,8 +8,8 @@
 #include "common/assert.h"
 #include "core/file_sys/fsmitm_romfsbuild.h"
 #include "core/file_sys/ips_layer.h"
-#include "core/file_sys/vfs/vfs.h"
+#include "core/file_sys/vfs.h"
-#include "core/file_sys/vfs/vfs_vector.h"
+#include "core/file_sys/vfs_vector.h"
 
 namespace FileSys {
 

src/core/file_sys/fsmitm_romfsbuild.h

@@ -7,7 +7,7 @@
 #include <memory>
 #include <string>
 #include "common/common_types.h"
-#include "core/file_sys/vfs/vfs.h"
+#include "core/file_sys/vfs.h"
 
 namespace FileSys {
 

src/core/file_sys/fssystem/fs_i_storage.h

@@ -5,7 +5,7 @@
 
 #include "common/overflow.h"
 #include "core/file_sys/errors.h"
-#include "core/file_sys/vfs/vfs.h"
+#include "core/file_sys/vfs.h"
 
 namespace FileSys {
 

src/core/file_sys/fssystem/fssystem_aes_ctr_counter_extended_storage.cpp

@@ -4,7 +4,7 @@
 #include "core/file_sys/fssystem/fssystem_aes_ctr_counter_extended_storage.h"
 #include "core/file_sys/fssystem/fssystem_aes_ctr_storage.h"
 #include "core/file_sys/fssystem/fssystem_nca_header.h"
-#include "core/file_sys/vfs/vfs_offset.h"
+#include "core/file_sys/vfs_offset.h"
 
 namespace FileSys {
 

src/core/file_sys/fssystem/fssystem_aes_ctr_storage.h

@@ -9,7 +9,7 @@
 #include "core/crypto/key_manager.h"
 #include "core/file_sys/errors.h"
 #include "core/file_sys/fssystem/fs_i_storage.h"
-#include "core/file_sys/vfs/vfs.h"
+#include "core/file_sys/vfs.h"
 
 namespace FileSys {
 

src/core/file_sys/fssystem/fssystem_bucket_tree.h

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

src/core/file_sys/fssystem/fssystem_compressed_storage.h

@@ -10,7 +10,7 @@
 #include "core/file_sys/fssystem/fssystem_bucket_tree.h"
 #include "core/file_sys/fssystem/fssystem_compression_common.h"
 #include "core/file_sys/fssystem/fssystem_pooled_buffer.h"
-#include "core/file_sys/vfs/vfs.h"
+#include "core/file_sys/vfs.h"
 
 namespace FileSys {
 

src/core/file_sys/fssystem/fssystem_hierarchical_integrity_verification_storage.cpp

@@ -2,7 +2,7 @@
 // SPDX-License-Identifier: GPL-2.0-or-later
 
 #include "core/file_sys/fssystem/fssystem_hierarchical_integrity_verification_storage.h"
-#include "core/file_sys/vfs/vfs_offset.h"
+#include "core/file_sys/vfs_offset.h"
 
 namespace FileSys {
 

src/core/file_sys/fssystem/fssystem_hierarchical_integrity_verification_storage.h

@@ -8,7 +8,7 @@
 #include "core/file_sys/fssystem/fs_types.h"
 #include "core/file_sys/fssystem/fssystem_alignment_matching_storage.h"
 #include "core/file_sys/fssystem/fssystem_integrity_verification_storage.h"
-#include "core/file_sys/vfs/vfs_offset.h"
+#include "core/file_sys/vfs_offset.h"
 
 namespace FileSys {