Android 215

Merge yuzu-emu#12802
Merge yuzu-emu#12760
2024-01-28 01:00:30 +00:00 · 2024-01-28 01:00:30 +00:00 · 2024-01-28 01:00:30 +00:00 · 2024-01-28 01:00:30 +00:00 · 2024-01-27 12:13:46 -05:00 · 2024-01-27 17:32:49 +03:00
326 changed files with 11472 additions and 6318 deletions
--- a/CMakeModules/FindSimpleIni.cmake
+++ b/CMakeModules/FindSimpleIni.cmake
@ -2,18 +2,20 @@
 #
 # SPDX-License-Identifier: GPL-3.0-or-later

-find_path(SimpleIni_INCLUDE_DIR SimpleIni.h)
-
 include(FindPackageHandleStandardArgs)
-find_package_handle_standard_args(SimpleIni
-    REQUIRED_VARS SimpleIni_INCLUDE_DIR
-)

-if (SimpleIni_FOUND AND NOT TARGET SimpleIni::SimpleIni)
-    add_library(SimpleIni::SimpleIni INTERFACE IMPORTED)
-    set_target_properties(SimpleIni::SimpleIni PROPERTIES
-        INTERFACE_INCLUDE_DIRECTORIES "${SimpleIni_INCLUDE_DIR}"
+find_package(SimpleIni QUIET CONFIG)
+if (SimpleIni_CONSIDERED_CONFIGS)
+    find_package_handle_standard_args(SimpleIni CONFIG_MODE)
+else()
+    find_package(PkgConfig QUIET)
+    pkg_search_module(SIMPLEINI QUIET IMPORTED_TARGET simpleini)
+    find_package_handle_standard_args(SimpleIni
+        REQUIRED_VARS SIMPLEINI_INCLUDEDIR
+        VERSION_VAR SIMPLEINI_VERSION
    )
 endif()

-mark_as_advanced(SimpleIni_INCLUDE_DIR)
+if (SimpleIni_FOUND AND NOT TARGET SimpleIni::SimpleIni)
+    add_library(SimpleIni::SimpleIni ALIAS PkgConfig::SIMPLEINI)
+endif()
--- a/README.md
+++ b/README.md
@ -1,3 +1,14 @@
+| 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 |
+| [12760](https://github.com/yuzu-emu/yuzu-android//pull/12760) | [`2c33ba278`](https://github.com/yuzu-emu/yuzu-android//pull/12760/files) | am: rewrite for multiprocess support | [liamwhite](https://github.com/liamwhite/) | 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 |
+
+
+End of merge log. You can find the original README.md below the break.
+
+-----
+
 <!--
 SPDX-FileCopyrightText: 2018 yuzu Emulator Project
 SPDX-License-Identifier: GPL-2.0-or-later
--- a/externals/nx_tzdb/CMakeLists.txt
+++ b/externals/nx_tzdb/CMakeLists.txt
@ -32,7 +32,7 @@ set(NX_TZDB_ARCHIVE "${CMAKE_CURRENT_BINARY_DIR}/${NX_TZDB_VERSION}.zip")

 set(NX_TZDB_ROMFS_DIR "${CMAKE_CURRENT_BINARY_DIR}/nx_tzdb")

-if ((NOT CAN_BUILD_NX_TZDB OR YUZU_DOWNLOAD_TIME_ZONE_DATA) AND NOT EXISTS ${NX_TZDB_ARCHIVE})
+if ((NOT CAN_BUILD_NX_TZDB OR YUZU_DOWNLOAD_TIME_ZONE_DATA) AND NOT EXISTS ${NX_TZDB_ROMFS_DIR})
    set(NX_TZDB_DOWNLOAD_URL "https://github.com/lat9nq/tzdb_to_nx/releases/download/${NX_TZDB_VERSION}/${NX_TZDB_VERSION}.zip")

    message(STATUS "Downloading time zone data from ${NX_TZDB_DOWNLOAD_URL}...")
--- a/externals/nx_tzdb/NxTzdbCreateHeader.cmake
+++ b/externals/nx_tzdb/NxTzdbCreateHeader.cmake
@ -11,6 +11,10 @@ execute_process(
    WORKING_DIRECTORY ${ZONE_PATH}
    OUTPUT_VARIABLE FILE_LIST)

+if (NOT FILE_LIST)
+    message(FATAL_ERROR "No timezone files found in directory ${ZONE_PATH}, did the download fail?")
+endif()
+
 set(DIRECTORY_NAME ${HEADER_NAME})

 set(FILE_DATA "")
--- a/src/android/app/src/main/java/org/yuzu/yuzu_emu/activities/EmulationActivity.kt
+++ b/src/android/app/src/main/java/org/yuzu/yuzu_emu/activities/EmulationActivity.kt
@ -193,6 +193,10 @@ class EmulationActivity : AppCompatActivity(), SensorEventListener {
            return super.dispatchKeyEvent(event)
        }

+        if (emulationViewModel.drawerOpen.value) {
+            return super.dispatchKeyEvent(event)
+        }
+
        return InputHandler.dispatchKeyEvent(event)
    }

@ -203,6 +207,10 @@ 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
--- a/src/android/app/src/main/java/org/yuzu/yuzu_emu/fragments/AboutFragment.kt
+++ b/src/android/app/src/main/java/org/yuzu/yuzu_emu/fragments/AboutFragment.kt
@ -77,7 +77,7 @@ class AboutFragment : Fragment() {
        }

        binding.textVersionName.text = BuildConfig.VERSION_NAME
-        binding.textVersionName.setOnClickListener {
+        binding.buttonVersionName.setOnClickListener {
            val clipBoard =
                requireContext().getSystemService(Context.CLIPBOARD_SERVICE) as ClipboardManager
            val clip = ClipData.newPlainText(getString(R.string.build), BuildConfig.GIT_HASH)
--- a/src/android/app/src/main/java/org/yuzu/yuzu_emu/fragments/EmulationFragment.kt
+++ b/src/android/app/src/main/java/org/yuzu/yuzu_emu/fragments/EmulationFragment.kt
@ -38,6 +38,7 @@ import androidx.window.layout.WindowLayoutInfo
 import com.google.android.material.dialog.MaterialAlertDialogBuilder
 import com.google.android.material.slider.Slider
 import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.flow.collect
 import kotlinx.coroutines.flow.collectLatest
 import kotlinx.coroutines.launch
 import org.yuzu.yuzu_emu.HomeNavigationDirections
@ -184,10 +185,13 @@ class EmulationFragment : Fragment(), SurfaceHolder.Callback {

            override fun onDrawerOpened(drawerView: View) {
                binding.drawerLayout.setDrawerLockMode(DrawerLayout.LOCK_MODE_UNLOCKED)
+                binding.inGameMenu.requestFocus()
+                emulationViewModel.setDrawerOpen(true)
            }

            override fun onDrawerClosed(drawerView: View) {
                binding.drawerLayout.setDrawerLockMode(IntSetting.LOCK_DRAWER.getInt())
+                emulationViewModel.setDrawerOpen(false)
            }

            override fun onDrawerStateChanged(newState: Int) {
@ -239,6 +243,7 @@ class EmulationFragment : Fragment(), SurfaceHolder.Callback {
                            requireContext().theme
                        )
                    }
+                    binding.inGameMenu.requestFocus()
                    true
                }

@ -247,6 +252,7 @@ class EmulationFragment : Fragment(), SurfaceHolder.Callback {
                        null,
                        Settings.MenuTag.SECTION_ROOT
                    )
+                    binding.inGameMenu.requestFocus()
                    binding.root.findNavController().navigate(action)
                    true
                }
@ -256,6 +262,7 @@ class EmulationFragment : Fragment(), SurfaceHolder.Callback {
                        args.game,
                        Settings.MenuTag.SECTION_ROOT
                    )
+                    binding.inGameMenu.requestFocus()
                    binding.root.findNavController().navigate(action)
                    true
                }
@ -287,15 +294,17 @@ class EmulationFragment : Fragment(), SurfaceHolder.Callback {
                            )
                        }
                    }
+                    binding.inGameMenu.requestFocus()
                    NativeConfig.saveGlobalConfig()
                    true
                }

                R.id.menu_exit -> {
                    emulationState.stop()
+                    NativeConfig.reloadGlobalConfig()
                    emulationViewModel.setIsEmulationStopping(true)
                    binding.drawerLayout.close()
-                    binding.drawerLayout.setDrawerLockMode(DrawerLayout.LOCK_MODE_LOCKED_CLOSED)
+                    binding.inGameMenu.requestFocus()
                    true
                }

@ -312,12 +321,7 @@ class EmulationFragment : Fragment(), SurfaceHolder.Callback {
                    if (!NativeLibrary.isRunning()) {
                        return
                    }
-
-                    if (binding.drawerLayout.isOpen) {
-                        binding.drawerLayout.close()
-                    } else {
-                        binding.drawerLayout.open()
-                    }
+                    emulationViewModel.setDrawerOpen(!binding.drawerLayout.isOpen)
                }
            }
        )
@ -408,6 +412,18 @@ class EmulationFragment : Fragment(), SurfaceHolder.Callback {
                    }
                }
            }
+            launch {
+                repeatOnLifecycle(Lifecycle.State.CREATED) {
+                    emulationViewModel.drawerOpen.collect {
+                        if (it) {
+                            binding.drawerLayout.open()
+                            binding.inGameMenu.requestFocus()
+                        } else {
+                            binding.drawerLayout.close()
+                        }
+                    }
+                }
+            }
        }
    }

--- a/src/android/app/src/main/java/org/yuzu/yuzu_emu/fragments/HomeSettingsFragment.kt
+++ b/src/android/app/src/main/java/org/yuzu/yuzu_emu/fragments/HomeSettingsFragment.kt
@ -153,7 +153,13 @@ class HomeSettingsFragment : Fragment() {
                            cancellable = true
                        ) { progressCallback, _ ->
                            val result = NativeLibrary.verifyInstalledContents(progressCallback)
-                            return@newInstance if (result.isEmpty()) {
+                            return@newInstance if (progressCallback.invoke(100, 100)) {
+                                // 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
--- a/src/android/app/src/main/java/org/yuzu/yuzu_emu/model/EmulationViewModel.kt
+++ b/src/android/app/src/main/java/org/yuzu/yuzu_emu/model/EmulationViewModel.kt
@ -6,6 +6,7 @@ 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
@ -23,6 +24,9 @@ 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
    }
@ -49,6 +53,10 @@ class EmulationViewModel : ViewModel() {
        setTotalShaders(max)
    }

+    fun setDrawerOpen(value: Boolean) {
+        _drawerOpen.value = value
+    }
+
    fun clear() {
        setEmulationStarted(false)
        setIsEmulationStopping(false)
--- a/src/android/app/src/main/jni/applets/software_keyboard.cpp
+++ b/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::Applets::SwkbdResult>(env->GetIntField(
+                      static_cast<Service::AM::Frontend::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::Applets::SwkbdTextCheckResult text_check_result,
+    Service::AM::Frontend::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::Applets::SwkbdReplyType::ChangedString,
+    submit_inline_callback(Service::AM::Frontend::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::Applets::SwkbdReplyType::ChangedString, m_current_text,
+    submit_inline_callback(Service::AM::Frontend::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::Applets::SwkbdReplyType::DecidedEnter, m_current_text,
+        submit_inline_callback(Service::AM::Frontend::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::Applets::SwkbdReplyType::ChangedString, m_current_text,
+        submit_inline_callback(Service::AM::Frontend::SwkbdReplyType::ChangedString, m_current_text,
                               m_current_text.size());
        break;
    }
--- a/src/android/app/src/main/jni/applets/software_keyboard.h
+++ b/src/android/app/src/main/jni/applets/software_keyboard.h
@ -24,7 +24,7 @@ public:

    void ShowNormalKeyboard() const override;

-    void ShowTextCheckDialog(Service::AM::Applets::SwkbdTextCheckResult text_check_result,
+    void ShowTextCheckDialog(Service::AM::Frontend::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::Applets::SwkbdResult result{};
+        Service::AM::Frontend::SwkbdResult result{};
    };

    void SubmitNormalText(const ResultData& result) const;
--- a/src/android/app/src/main/jni/game_metadata.cpp
+++ b/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/file_sys/mode.h>
-#include <core/file_sys/patch_manager.h>
-#include <core/loader/nro.h>
-#include <jni.h>
+#include "core/core.h"
+#include "core/file_sys/fs_filesystem.h"
+#include "core/file_sys/patch_manager.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::Mode::Read);
+        GetJString(env, jpath), FileSys::OpenMode::Read);
    if (!file) {
        return false;
    }
--- a/src/android/app/src/main/jni/native.cpp
+++ b/src/android/app/src/main/jni/native.cpp
@ -35,20 +35,22 @@
 #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.h"
-#include "core/file_sys/vfs_real.h"
+#include "core/file_sys/vfs/vfs.h"
+#include "core/file_sys/vfs/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_frontend.h"
+#include "core/frontend/applets/general.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/applets/applets.h"
+#include "core/hle/service/am/frontend/applets.h"
 #include "core/hle/service/filesystem/filesystem.h"
 #include "core/loader/loader.h"
 #include "frontend_common/config.h"
@ -154,7 +156,7 @@ void EmulationSession::SurfaceChanged() {
 }

 void EmulationSession::ConfigureFilesystemProvider(const std::string& filepath) {
-    const auto file = m_system.GetFilesystem()->OpenFile(filepath, FileSys::Mode::Read);
+    const auto file = m_system.GetFilesystem()->OpenFile(filepath, FileSys::OpenMode::Read);
    if (!file) {
        return;
    }
@ -207,6 +209,12 @@ 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);

@ -221,7 +229,7 @@ Core::SystemResultStatus EmulationSession::InitializeEmulation(const std::string
    m_system.ApplySettings();
    Settings::LogSettings();
    m_system.HIDCore().ReloadInputDevices();
-    m_system.SetAppletFrontendSet({
+    m_system.SetFrontendAppletSet({
        nullptr,                     // Amiibo Settings
        nullptr,                     // Controller Selector
        nullptr,                     // Error Display
@ -237,7 +245,10 @@ Core::SystemResultStatus EmulationSession::InitializeEmulation(const std::string
    ConfigureFilesystemProvider(filepath);

    // Load the ROM.
-    m_load_result = m_system.Load(EmulationSession::GetInstance().Window(), filepath);
+    Service::AM::FrontendAppletParameters params{
+        .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;
    }
@ -322,6 +333,9 @@ void EmulationSession::RunEmulation() {
            }
        }
    }
+
+    // Reset current applet ID.
+    m_applet_id = static_cast<int>(Service::AM::AppletId::Application);
 }

 bool EmulationSession::IsHandheldOnly() {
@ -475,8 +489,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(updatePath,
-                                                                           FileSys::Mode::Read));
+        EmulationSession::GetInstance().System().GetFilesystem()->OpenFile(
+            updatePath, FileSys::OpenMode::Read));
    for (const auto& item : nsp->GetNCAs()) {
        for (const auto& nca_details : item.second) {
            if (nca_details.second->GetName().ends_with(".cnmt.nca")) {
@ -719,7 +733,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::Mode::Read);
+        Common::FS::PathToUTF8String(nand_dir), FileSys::OpenMode::Read);

    const auto user_id = EmulationSession::GetInstance().System().GetProfileManager().GetUser(
        static_cast<std::size_t>(0));
@ -754,13 +768,12 @@ 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().System().GetAppletManager().SetCurrentAppletId(
-        static_cast<Service::AM::Applets::AppletId>(jappletId));
+    EmulationSession::GetInstance().SetAppletId(jappletId);
 }

 void Java_org_yuzu_yuzu_1emu_NativeLibrary_setCabinetMode(JNIEnv* env, jclass clazz,
                                                          jint jcabinetMode) {
-    EmulationSession::GetInstance().System().GetAppletManager().SetCabinetMode(
+    EmulationSession::GetInstance().System().GetFrontendAppletHolder().SetCabinetMode(
        static_cast<Service::NFP::CabinetMode>(jcabinetMode));
 }

@ -889,7 +902,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::Mode::Read);
+                                                            FileSys::OpenMode::Read);

    const auto user_save_data_path = FileSys::SaveDataFactory::GetFullPath(
        {}, vfsNandDir, FileSys::SaveDataSpaceId::NandUser, FileSys::SaveDataType::SaveData,
--- a/src/android/app/src/main/jni/native.h
+++ b/src/android/app/src/main/jni/native.h
@ -45,6 +45,7 @@ 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();
@ -77,6 +78,7 @@ 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;
--- a/src/android/app/src/main/res/layout-w600dp/fragment_about.xml
+++ b/src/android/app/src/main/res/layout-w600dp/fragment_about.xml
@ -11,12 +11,14 @@
        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" />

@ -28,6 +30,7 @@
        android:layout_height="match_parent"
        android:fadeScrollbars="false"
        android:scrollbars="vertical"
+        android:defaultFocusHighlightEnabled="false"
        app:layout_behavior="@string/appbar_scrolling_view_behavior">

        <LinearLayout
--- a/src/android/app/src/main/res/layout-w600dp/fragment_game_info.xml
+++ b/src/android/app/src/main/res/layout-w600dp/fragment_game_info.xml
@ -0,0 +1,155 @@
+<?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>
--- a/src/android/app/src/main/res/layout-w600dp/fragment_game_properties.xml
+++ b/src/android/app/src/main/res/layout-w600dp/fragment_game_properties.xml
@ -14,6 +14,7 @@
        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">
--- a/src/android/app/src/main/res/layout/card_driver_option.xml
+++ b/src/android/app/src/main/res/layout/card_driver_option.xml
@ -23,6 +23,7 @@
            android:layout_width="wrap_content"
            android:layout_height="wrap_content"
            android:layout_gravity="center_vertical"
+            android:focusable="false"
            android:clickable="false"
            android:checked="false" />

--- a/src/android/app/src/main/res/layout/card_folder.xml
+++ b/src/android/app/src/main/res/layout/card_folder.xml
@ -6,16 +6,14 @@
    android:layout_width="match_parent"
    android:layout_height="wrap_content"
    android:layout_marginHorizontal="16dp"
-    android:layout_marginVertical="12dp"
-    android:focusable="true">
+    android:layout_marginVertical="12dp">

    <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:animateLayoutChanges="true">
+        android:layout_gravity="center_vertical">

        <com.google.android.material.textview.MaterialTextView
            android:id="@+id/path"
--- a/src/android/app/src/main/res/layout/fragment_about.xml
+++ b/src/android/app/src/main/res/layout/fragment_about.xml
@ -11,12 +11,14 @@
        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" />

@ -28,6 +30,7 @@
        android:layout_height="match_parent"
        android:scrollbars="vertical"
        android:fadeScrollbars="false"
+        android:defaultFocusHighlightEnabled="false"
        app:layout_behavior="@string/appbar_scrolling_view_behavior">

        <LinearLayout
--- a/src/android/app/src/main/res/layout/fragment_addons.xml
+++ b/src/android/app/src/main/res/layout/fragment_addons.xml
@ -11,6 +11,7 @@
        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">
@ -19,6 +20,7 @@
            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>
@ -28,6 +30,8 @@
        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"
--- a/src/android/app/src/main/res/layout/fragment_applet_launcher.xml
+++ b/src/android/app/src/main/res/layout/fragment_applet_launcher.xml
@ -10,12 +10,14 @@
        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" />

--- a/src/android/app/src/main/res/layout/fragment_driver_manager.xml
+++ b/src/android/app/src/main/res/layout/fragment_driver_manager.xml
@ -15,12 +15,14 @@
            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" />

--- a/src/android/app/src/main/res/layout/fragment_early_access.xml
+++ b/src/android/app/src/main/res/layout/fragment_early_access.xml
@ -11,12 +11,14 @@
        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" />

@ -30,6 +32,7 @@
        android:paddingBottom="20dp"
        android:scrollbars="vertical"
        android:fadeScrollbars="false"
+        android:defaultFocusHighlightEnabled="false"
        app:layout_behavior="@string/appbar_scrolling_view_behavior">

        <LinearLayout
--- a/src/android/app/src/main/res/layout/fragment_emulation.xml
+++ b/src/android/app/src/main/res/layout/fragment_emulation.xml
@ -5,6 +5,7 @@
    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">

@ -24,7 +25,8 @@
                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"
@ -32,7 +34,7 @@
                android:layout_width="wrap_content"
                android:layout_height="wrap_content"
                android:layout_gravity="center"
-                android:focusable="false"
+                android:defaultFocusHighlightEnabled="false"
                android:clickable="false">

                <androidx.constraintlayout.widget.ConstraintLayout
@ -118,6 +120,7 @@
                android:layout_gravity="center"
                android:focusable="true"
                android:focusableInTouchMode="true"
+                android:defaultFocusHighlightEnabled="false"
                android:visibility="invisible" />

            <Button
@ -160,6 +163,7 @@
        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" />
--- a/src/android/app/src/main/res/layout/fragment_folders.xml
+++ b/src/android/app/src/main/res/layout/fragment_folders.xml
@ -15,12 +15,14 @@
            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" />

@ -31,6 +33,7 @@
            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>
--- a/src/android/app/src/main/res/layout/fragment_game_info.xml
+++ b/src/android/app/src/main/res/layout/fragment_game_info.xml
@ -11,12 +11,14 @@
        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>
@ -25,6 +27,7 @@
        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
--- a/src/android/app/src/main/res/layout/fragment_game_properties.xml
+++ b/src/android/app/src/main/res/layout/fragment_game_properties.xml
@ -12,7 +12,8 @@
        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"
@ -86,7 +87,7 @@
                android:id="@+id/list_properties"
                android:layout_width="match_parent"
                android:layout_height="match_parent"
-                tools:listitem="@layout/card_simple_outlined" />
+                android:defaultFocusHighlightEnabled="false" />

        </LinearLayout>

--- a/src/android/app/src/main/res/layout/fragment_games.xml
+++ b/src/android/app/src/main/res/layout/fragment_games.xml
@ -27,6 +27,7 @@
            android:layout_width="match_parent"
            android:layout_height="match_parent"
            android:clipToPadding="false"
+            android:defaultFocusHighlightEnabled="false"
            tools:listitem="@layout/card_game" />

    </RelativeLayout>
--- a/src/android/app/src/main/res/layout/fragment_home_settings.xml
+++ b/src/android/app/src/main/res/layout/fragment_home_settings.xml
@ -7,7 +7,8 @@
    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"
--- a/src/android/app/src/main/res/layout/fragment_installables.xml
+++ b/src/android/app/src/main/res/layout/fragment_installables.xml
@ -10,12 +10,14 @@
        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" />

--- a/src/android/app/src/main/res/layout/fragment_licenses.xml
+++ b/src/android/app/src/main/res/layout/fragment_licenses.xml
@ -10,12 +10,14 @@
        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" />

--- a/src/android/app/src/main/res/layout/fragment_settings.xml
+++ b/src/android/app/src/main/res/layout/fragment_settings.xml
@ -11,6 +11,7 @@
        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
@ -24,6 +25,7 @@
                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" />

--- a/src/android/app/src/main/res/layout/list_item_addon.xml
+++ b/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="true"
+    android:focusable="false"
    android:paddingHorizontal="20dp"
    android:paddingVertical="16dp">

--- a/src/android/app/src/main/res/layout/list_item_settings_header.xml
+++ b/src/android/app/src/main/res/layout/list_item_settings_header.xml
@ -12,4 +12,5 @@
    android:textAlignment="viewStart"
    android:textColor="?attr/colorPrimary"
    android:textStyle="bold"
+    android:focusable="false"
    tools:text="CPU Settings" />
--- a/src/common/CMakeLists.txt
+++ b/src/common/CMakeLists.txt
@ -106,6 +106,7 @@ 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
--- a/src/common/overflow.h
+++ b/src/common/overflow.h
@ -3,6 +3,7 @@

 #pragma once

+#include <algorithm>
 #include <type_traits>
 #include "bit_cast.h"

@ -19,4 +20,21 @@ 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
--- a/src/common/range_mutex.h
+++ b/src/common/range_mutex.h
@ -0,0 +1,93 @@
+// 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
--- a/src/core/CMakeLists.txt
+++ b/src/core/CMakeLists.txt
@ -20,28 +20,49 @@ 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/gdbstub_arch.cpp
-    debugger/gdbstub_arch.h
+    debugger/debugger_interface.h
    debugger/gdbstub.cpp
    debugger/gdbstub.h
+    debugger/gdbstub_arch.cpp
+    debugger/gdbstub_arch.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
@ -83,25 +104,10 @@ 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
@ -146,22 +152,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.cpp
-    file_sys/vfs.h
-    file_sys/vfs_cached.cpp
-    file_sys/vfs_cached.h
-    file_sys/vfs_concat.cpp
-    file_sys/vfs_concat.h
-    file_sys/vfs_layered.cpp
-    file_sys/vfs_layered.h
-    file_sys/vfs_offset.cpp
-    file_sys/vfs_offset.h
-    file_sys/vfs_real.cpp
-    file_sys/vfs_real.h
-    file_sys/vfs_static.h
-    file_sys/vfs_types.h
-    file_sys/vfs_vector.cpp
-    file_sys/vfs_vector.h
+    file_sys/vfs/vfs.cpp
+    file_sys/vfs/vfs.h
+    file_sys/vfs/vfs_cached.cpp
+    file_sys/vfs/vfs_cached.h
+    file_sys/vfs/vfs_concat.cpp
+    file_sys/vfs/vfs_concat.h
+    file_sys/vfs/vfs_layered.cpp
+    file_sys/vfs/vfs_layered.h
+    file_sys/vfs/vfs_offset.cpp
+    file_sys/vfs/vfs_offset.h
+    file_sys/vfs/vfs_real.cpp
+    file_sys/vfs/vfs_real.h
+    file_sys/vfs/vfs_static.h
+    file_sys/vfs/vfs_types.h
+    file_sys/vfs/vfs_vector.cpp
+    file_sys/vfs/vfs_vector.h
    file_sys/xts_archive.cpp
    file_sys/xts_archive.h
    frontend/applets/cabinet.cpp
@ -170,8 +176,8 @@ add_library(core STATIC
    frontend/applets/controller.h
    frontend/applets/error.cpp
    frontend/applets/error.h
-    frontend/applets/general_frontend.cpp
-    frontend/applets/general_frontend.h
+    frontend/applets/general.cpp
+    frontend/applets/general.h
    frontend/applets/mii_edit.cpp
    frontend/applets/mii_edit.h
    frontend/applets/profile_select.cpp
@ -194,7 +200,6 @@ 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
@ -204,11 +209,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
@ -232,9 +237,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
@ -261,10 +266,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_heap.cpp
-    hle/kernel/k_page_heap.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_table.h
    hle/kernel/k_page_table_base.cpp
    hle/kernel/k_page_table_base.h
@ -329,8 +334,6 @@ 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
@ -368,6 +371,9 @@ 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
@ -384,39 +390,101 @@ 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/applets/applet_cabinet.cpp
-    hle/service/am/applets/applet_cabinet.h
-    hle/service/am/applets/applet_controller.cpp
-    hle/service/am/applets/applet_controller.h
-    hle/service/am/applets/applet_error.cpp
-    hle/service/am/applets/applet_error.h
-    hle/service/am/applets/applet_general_backend.cpp
-    hle/service/am/applets/applet_general_backend.h
-    hle/service/am/applets/applet_mii_edit.cpp
-    hle/service/am/applets/applet_mii_edit.h
-    hle/service/am/applets/applet_mii_edit_types.h
-    hle/service/am/applets/applet_profile_select.cpp
-    hle/service/am/applets/applet_profile_select.h
-    hle/service/am/applets/applet_software_keyboard.cpp
-    hle/service/am/applets/applet_software_keyboard.h
-    hle/service/am/applets/applet_software_keyboard_types.h
-    hle/service/am/applets/applet_web_browser.cpp
-    hle/service/am/applets/applet_web_browser.h
-    hle/service/am/applets/applet_web_browser_types.h
-    hle/service/am/applets/applets.cpp
-    hle/service/am/applets/applets.h
+    hle/service/am/applet_common_functions.cpp
+    hle/service/am/applet_common_functions.h
+    hle/service/am/applet_message_queue.cpp
+    hle/service/am/applet_message_queue.h
+    hle/service/am/application_creator.cpp
+    hle/service/am/application_creator.h
+    hle/service/am/application_functions.cpp
+    hle/service/am/application_functions.h
+    hle/service/am/application_proxy.cpp
+    hle/service/am/application_proxy.h
+    hle/service/am/audio_controller.cpp
+    hle/service/am/audio_controller.h
+    hle/service/am/common_state_getter.cpp
+    hle/service/am/common_state_getter.h
+    hle/service/am/debug_functions.cpp
+    hle/service/am/debug_functions.h
+    hle/service/am/display_controller.cpp
+    hle/service/am/display_controller.h
+    hle/service/am/global_state_controller.cpp
+    hle/service/am/global_state_controller.h
+    hle/service/am/hid_registration.cpp
+    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
@ -480,20 +548,33 @@ add_library(core STATIC
    hle/service/es/es.h
    hle/service/eupld/eupld.cpp
    hle/service/eupld/eupld.h
+    hle/service/event.cpp
+    hle/service/event.h
    hle/service/fatal/fatal.cpp
    hle/service/fatal/fatal.h
    hle/service/fatal/fatal_p.cpp
    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_ldr.cpp
-    hle/service/filesystem/fsp_ldr.h
-    hle/service/filesystem/fsp_pr.cpp
-    hle/service/filesystem/fsp_pr.h
-    hle/service/filesystem/fsp_srv.cpp
-    hle/service/filesystem/fsp_srv.h
+    hle/service/filesystem/fsp/fs_i_directory.cpp
+    hle/service/filesystem/fsp/fs_i_directory.h
+    hle/service/filesystem/fsp/fs_i_file.cpp
+    hle/service/filesystem/fsp/fs_i_file.h
+    hle/service/filesystem/fsp/fs_i_filesystem.cpp
+    hle/service/filesystem/fsp/fs_i_filesystem.h
+    hle/service/filesystem/fsp/fs_i_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
@ -551,13 +632,18 @@ 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
@ -565,16 +651,6 @@ 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
@ -586,10 +662,22 @@ 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
@ -759,19 +847,12 @@ add_library(core STATIC
    hle/service/ptm/ptm.h
    hle/service/ptm/ts.cpp
    hle/service/ptm/ts.h
-    hle/service/hle_ipc.cpp
-    hle/service/hle_ipc.h
-    hle/service/ipc_helpers.h
-    hle/service/kernel_helpers.cpp
-    hle/service/kernel_helpers.h
-    hle/service/mutex.cpp
-    hle/service/mutex.h
+    hle/service/ro/ro.cpp
+    hle/service/ro/ro.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
@ -838,9 +919,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
@ -859,13 +940,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
--- a/src/core/core.cpp
+++ b/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/mode.h"
+#include "core/file_sys/fs_filesystem.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_concat.h"
-#include "core/file_sys/vfs_real.h"
+#include "core/file_sys/vfs/vfs_concat.h"
+#include "core/file_sys/vfs/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,7 +36,8 @@
 #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/applets/applets.h"
+#include "core/hle/service/am/applet_manager.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"
@ -102,7 +103,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::Mode::Read);
+        const auto dir = vfs->OpenDirectory(dir_name, FileSys::OpenMode::Read);
        std::vector<FileSys::VirtualFile> concat;

        for (u32 i = 0; i < 0x10; ++i) {
@ -127,16 +128,16 @@ FileSys::VirtualFile GetGameFileFromPath(const FileSys::VirtualFilesystem& vfs,
    }

    if (Common::FS::IsDir(path)) {
-        return vfs->OpenFile(path + "/main", FileSys::Mode::Read);
+        return vfs->OpenFile(path + "/main", FileSys::OpenMode::Read);
    }

-    return vfs->OpenFile(path, FileSys::Mode::Read);
+    return vfs->OpenFile(path, FileSys::OpenMode::Read);
 }

 struct System::Impl {
    explicit Impl(System& system)
-        : kernel{system}, fs_controller{system}, hid_core{}, room_network{},
-          cpu_manager{system}, reporter{system}, applet_manager{system}, profile_manager{} {}
+        : kernel{system}, fs_controller{system}, hid_core{}, room_network{}, cpu_manager{system},
+          reporter{system}, applet_manager{system}, frontend_applets{system}, profile_manager{} {}

    void Initialize(System& system) {
        device_memory = std::make_unique<Core::DeviceMemory>();
@ -157,7 +158,7 @@ struct System::Impl {
        }

        // Create default implementations of applets if one is not provided.
-        applet_manager.SetDefaultAppletsIfMissing();
+        frontend_applets.SetDefaultAppletsIfMissing();

        is_async_gpu = Settings::values.use_asynchronous_gpu_emulation.GetValue();

@ -330,16 +331,27 @@ struct System::Impl {
    }

    SystemResultStatus Load(System& system, Frontend::EmuWindow& emu_window,
-                            const std::string& filepath, u64 program_id,
-                            std::size_t program_index) {
+                            const std::string& filepath,
+                            Service::AM::FrontendAppletParameters& params) {
        app_loader = Loader::GetLoader(system, GetGameFileFromPath(virtual_filesystem, filepath),
-                                       program_id, program_index);
+                                       params.program_id, params.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.
@ -373,9 +385,14 @@ 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) {
@ -386,21 +403,13 @@ struct System::Impl {
            }
        }

-        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);
+        perf_stats = std::make_unique<PerfStats>(params.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(program_id, system.GetFileSystemController(),
+        const FileSys::PatchManager pm(params.program_id, system.GetFileSystemController(),
                                       system.GetContentProvider());
        const auto metadata = pm.GetControlMetadata();
        if (metadata.first != nullptr) {
@ -409,14 +418,15 @@ struct System::Impl {
        if (auto room_member = room_network.GetRoomMember().lock()) {
            Network::GameInfo game_info;
            game_info.name = name;
-            game_info.id = program_id;
+            game_info.id = params.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 = program_id == 0x1006A800016E000ULL;
+        Settings::values.renderer_amdvlk_depth_bias_workaround =
+            params.program_id == 0x1006A800016E000ULL;

        status = SystemResultStatus::Success;
        return status;
@ -455,6 +465,7 @@ struct System::Impl {
        }
        kernel.CloseServices();
        kernel.ShutdownCores();
+        applet_manager.Reset();
        services.reset();
        service_manager.reset();
        fs_controller.Reset();
@ -566,8 +577,9 @@ struct System::Impl {

    std::unique_ptr<Tools::RenderdocAPI> renderdoc_api;

-    /// Frontend applets
-    Service::AM::Applets::AppletManager applet_manager;
+    /// Applets
+    Service::AM::AppletManager applet_manager;
+    Service::AM::Frontend::FrontendAppletHolder frontend_applets;

    /// APM (Performance) services
    Service::APM::Controller apm_controller{core_timing};
@ -680,8 +692,8 @@ void System::InitializeDebugger() {
 }

 SystemResultStatus System::Load(Frontend::EmuWindow& emu_window, const std::string& filepath,
-                                u64 program_id, std::size_t program_index) {
-    return impl->Load(*this, emu_window, filepath, program_id, program_index);
+                                Service::AM::FrontendAppletParameters& params) {
+    return impl->Load(*this, emu_window, filepath, params);
 }

 bool System::IsPoweredOn() const {
@ -871,19 +883,19 @@ void System::RegisterCheatList(const std::vector<Memory::CheatEntry>& list,
    impl->cheat_engine->SetMainMemoryParameters(main_region_begin, main_region_size);
 }

-void System::SetAppletFrontendSet(Service::AM::Applets::AppletFrontendSet&& set) {
-    impl->applet_manager.SetAppletFrontendSet(std::move(set));
+void System::SetFrontendAppletSet(Service::AM::Frontend::FrontendAppletSet&& set) {
+    impl->frontend_applets.SetFrontendAppletSet(std::move(set));
 }

-void System::SetDefaultAppletFrontendSet() {
-    impl->applet_manager.SetDefaultAppletFrontendSet();
+Service::AM::Frontend::FrontendAppletHolder& System::GetFrontendAppletHolder() {
+    return impl->frontend_applets;
 }

-Service::AM::Applets::AppletManager& System::GetAppletManager() {
-    return impl->applet_manager;
+const Service::AM::Frontend::FrontendAppletHolder& System::GetFrontendAppletHolder() const {
+    return impl->frontend_applets;
 }

-const Service::AM::Applets::AppletManager& System::GetAppletManager() const {
+Service::AM::AppletManager& System::GetAppletManager() {
    return impl->applet_manager;
 }

--- a/src/core/core.h
+++ b/src/core/core.h
@ -13,7 +13,7 @@
 #include <vector>

 #include "common/common_types.h"
-#include "core/file_sys/vfs_types.h"
+#include "core/file_sys/vfs/vfs_types.h"

 namespace Core::Frontend {
 class EmuWindow;
@ -50,10 +50,15 @@ namespace Account {
 class ProfileManager;
 } // namespace Account

-namespace AM::Applets {
-struct AppletFrontendSet;
+namespace AM {
+struct FrontendAppletParameters;
 class AppletManager;
-} // namespace AM::Applets
+} // namespace AM
+
+namespace AM::Frontend {
+struct FrontendAppletSet;
+class FrontendAppletHolder;
+} // namespace AM::Frontend

 namespace APM {
 class Controller;
@ -203,8 +208,8 @@ public:
     * @returns SystemResultStatus code, indicating if the operation succeeded.
     */
    [[nodiscard]] SystemResultStatus Load(Frontend::EmuWindow& emu_window,
-                                          const std::string& filepath, u64 program_id = 0,
-                                          std::size_t program_index = 0);
+                                          const std::string& filepath,
+                                          Service::AM::FrontendAppletParameters& params);

    /**
     * Indicates if the emulated system is powered on (all subsystems initialized and able to run an
@ -344,11 +349,13 @@ public:
                           const std::array<u8, 0x20>& build_id, u64 main_region_begin,
                           u64 main_region_size);

-    void SetAppletFrontendSet(Service::AM::Applets::AppletFrontendSet&& set);
-    void SetDefaultAppletFrontendSet();
+    void SetFrontendAppletSet(Service::AM::Frontend::FrontendAppletSet&& set);

-    [[nodiscard]] Service::AM::Applets::AppletManager& GetAppletManager();
-    [[nodiscard]] const Service::AM::Applets::AppletManager& GetAppletManager() const;
+    [[nodiscard]] Service::AM::Frontend::FrontendAppletHolder& GetFrontendAppletHolder();
+    [[nodiscard]] const Service::AM::Frontend::FrontendAppletHolder& GetFrontendAppletHolder()
+        const;
+
+    [[nodiscard]] Service::AM::AppletManager& GetAppletManager();

    void SetContentProvider(std::unique_ptr<FileSys::ContentProviderUnion> provider);

--- a/src/core/crypto/aes_util.h
+++ b/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.h"
+#include "core/file_sys/vfs/vfs.h"

 namespace Core::Crypto {

--- a/src/core/crypto/encryption_layer.h
+++ b/src/core/crypto/encryption_layer.h
@ -4,7 +4,7 @@
 #pragma once

 #include "common/common_types.h"
-#include "core/file_sys/vfs.h"
+#include "core/file_sys/vfs/vfs.h"

 namespace Core::Crypto {

--- a/src/core/crypto/partition_data_manager.cpp
+++ b/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.h"
-#include "core/file_sys/vfs_offset.h"
-#include "core/file_sys/vfs_vector.h"
+#include "core/file_sys/vfs/vfs.h"
+#include "core/file_sys/vfs/vfs_offset.h"
+#include "core/file_sys/vfs/vfs_vector.h"
 #include "core/loader/loader.h"

 using Common::AsArray;
--- a/src/core/crypto/partition_data_manager.h
+++ b/src/core/crypto/partition_data_manager.h
@ -5,7 +5,7 @@

 #include <vector>
 #include "common/common_types.h"
-#include "core/file_sys/vfs_types.h"
+#include "core/file_sys/vfs/vfs_types.h"

 namespace Core::Crypto {

--- a/src/core/device_memory_manager.h
+++ b/src/core/device_memory_manager.h
@ -10,6 +10,7 @@
 #include <mutex>

 #include "common/common_types.h"
+#include "common/range_mutex.h"
 #include "common/scratch_buffer.h"
 #include "common/virtual_buffer.h"

@ -204,7 +205,7 @@ private:
        (1ULL << (device_virtual_bits - page_bits)) / subentries;
    using CachedPages = std::array<CounterEntry, num_counter_entries>;
    std::unique_ptr<CachedPages> cached_pages;
-    std::mutex counter_guard;
+    Common::RangeMutex counter_guard;
    std::mutex mapping_guard;
 };

--- a/src/core/device_memory_manager.inc
+++ b/src/core/device_memory_manager.inc
@ -508,12 +508,7 @@ void DeviceMemoryManager<Traits>::UnregisterProcess(Asid asid) {

 template <typename Traits>
 void DeviceMemoryManager<Traits>::UpdatePagesCachedCount(DAddr addr, size_t size, s32 delta) {
-    std::unique_lock<std::mutex> lk(counter_guard, std::defer_lock);
-    const auto Lock = [&] {
-        if (!lk) {
-            lk.lock();
-        }
-    };
+    Common::ScopedRangeLock lk(counter_guard, addr, size);
    u64 uncache_begin = 0;
    u64 cache_begin = 0;
    u64 uncache_bytes = 0;
@ -548,7 +543,6 @@ 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;
@ -559,7 +553,6 @@ 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;
@ -567,12 +560,10 @@ 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);
    }
--- a/src/core/file_sys/bis_factory.cpp
+++ b/src/core/file_sys/bis_factory.cpp
@ -4,9 +4,8 @@
 #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.h"
+#include "core/file_sys/vfs/vfs.h"

 namespace FileSys {

@ -84,7 +83,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), Mode::Read)};
+        Common::FS::GetYuzuPathString(Common::FS::YuzuPath::NANDDir), OpenMode::Read)};
    keys.PopulateFromPartitionData(pdm);

    switch (id) {
--- a/src/core/file_sys/bis_factory.h
+++ b/src/core/file_sys/bis_factory.h
@ -6,7 +6,7 @@
 #include <memory>

 #include "common/common_types.h"
-#include "core/file_sys/vfs_types.h"
+#include "core/file_sys/vfs/vfs_types.h"

 namespace FileSys {

--- a/src/core/file_sys/card_image.cpp
+++ b/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_offset.h"
-#include "core/file_sys/vfs_vector.h"
+#include "core/file_sys/vfs/vfs_offset.h"
+#include "core/file_sys/vfs/vfs_vector.h"
 #include "core/loader/loader.h"

 namespace FileSys {
--- a/src/core/file_sys/card_image.h
+++ b/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.h"
+#include "core/file_sys/vfs/vfs.h"

 namespace Core::Crypto {
 class KeyManager;
--- a/src/core/file_sys/content_archive.cpp
+++ b/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_offset.h"
+#include "core/file_sys/vfs/vfs_offset.h"
 #include "core/loader/loader.h"

 #include "core/file_sys/fssystem/fssystem_compression_configuration.h"
--- a/src/core/file_sys/content_archive.h
+++ b/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.h"
+#include "core/file_sys/vfs/vfs.h"

 namespace Loader {
 enum class ResultStatus : u16;
--- a/src/core/file_sys/control_metadata.cpp
+++ b/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.h"
+#include "core/file_sys/vfs/vfs.h"

 namespace FileSys {

--- a/src/core/file_sys/control_metadata.h
+++ b/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_types.h"
+#include "core/file_sys/vfs/vfs_types.h"

 namespace FileSys {

--- a/src/core/file_sys/directory.h
+++ b/src/core/file_sys/directory.h
@ -1,39 +0,0 @@
-// 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
--- a/src/core/file_sys/errors.h
+++ b/src/core/file_sys/errors.h
@ -7,18 +7,13 @@

 namespace FileSys {

-constexpr Result ERROR_PATH_NOT_FOUND{ErrorModule::FS, 1};
-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 ResultPathNotFound{ErrorModule::FS, 1};
+constexpr Result ResultPathAlreadyExists{ErrorModule::FS, 2};
 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};
@ -78,10 +73,21 @@ 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};
--- a/src/core/file_sys/fs_directory.h
+++ b/src/core/file_sys/fs_directory.h
@ -0,0 +1,33 @@
+// 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
--- a/src/core/file_sys/fs_file.h
+++ b/src/core/file_sys/fs_file.h
@ -0,0 +1,65 @@
+// 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
--- a/src/core/file_sys/fs_filesystem.h
+++ b/src/core/file_sys/fs_filesystem.h
@ -0,0 +1,39 @@
+// 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
--- a/src/core/file_sys/fs_memory_management.h
+++ b/src/core/file_sys/fs_memory_management.h
@ -0,0 +1,40 @@
+// 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
--- a/src/core/file_sys/fs_operate_range.h
+++ b/src/core/file_sys/fs_operate_range.h
@ -0,0 +1,22 @@
+// 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
--- a/src/core/file_sys/fs_path.h
+++ b/src/core/file_sys/fs_path.h
@ -0,0 +1,566 @@
+// 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
--- a/src/core/file_sys/fs_path_utility.h
+++ b/src/core/file_sys/fs_path_utility.h
--- a/src/core/file_sys/fs_string_util.h
+++ b/src/core/file_sys/fs_string_util.h
@ -0,0 +1,226 @@
+// 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
--- a/src/core/file_sys/fsmitm_romfsbuild.cpp
+++ b/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.h"
-#include "core/file_sys/vfs_vector.h"
+#include "core/file_sys/vfs/vfs.h"
+#include "core/file_sys/vfs/vfs_vector.h"

 namespace FileSys {

--- a/src/core/file_sys/fsmitm_romfsbuild.h
+++ b/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.h"
+#include "core/file_sys/vfs/vfs.h"

 namespace FileSys {

--- a/src/core/file_sys/fssystem/fs_i_storage.h
+++ b/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.h"
+#include "core/file_sys/vfs/vfs.h"

 namespace FileSys {

--- a/src/core/file_sys/fssystem/fssystem_aes_ctr_counter_extended_storage.cpp
+++ b/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_offset.h"
+#include "core/file_sys/vfs/vfs_offset.h"

 namespace FileSys {

--- a/src/core/file_sys/fssystem/fssystem_aes_ctr_storage.h
+++ b/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.h"
+#include "core/file_sys/vfs/vfs.h"

 namespace FileSys {

--- a/src/core/file_sys/fssystem/fssystem_bucket_tree.h
+++ b/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.h"
+#include "core/file_sys/vfs/vfs.h"
 #include "core/hle/result.h"

 namespace FileSys {
--- a/src/core/file_sys/fssystem/fssystem_compressed_storage.h
+++ b/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.h"
+#include "core/file_sys/vfs/vfs.h"

 namespace FileSys {

--- a/src/core/file_sys/fssystem/fssystem_hierarchical_integrity_verification_storage.cpp
+++ b/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_offset.h"
+#include "core/file_sys/vfs/vfs_offset.h"

 namespace FileSys {

--- a/src/core/file_sys/fssystem/fssystem_hierarchical_integrity_verification_storage.h
+++ b/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_offset.h"
+#include "core/file_sys/vfs/vfs_offset.h"

 namespace FileSys {

--- a/src/core/file_sys/fssystem/fssystem_hierarchical_sha256_storage.h
+++ b/src/core/file_sys/fssystem/fssystem_hierarchical_sha256_storage.h
@ -7,7 +7,7 @@

 #include "core/file_sys/errors.h"
 #include "core/file_sys/fssystem/fs_i_storage.h"
-#include "core/file_sys/vfs.h"
+#include "core/file_sys/vfs/vfs.h"

 namespace FileSys {

--- a/src/core/file_sys/fssystem/fssystem_indirect_storage.h
+++ b/src/core/file_sys/fssystem/fssystem_indirect_storage.h
@ -7,8 +7,8 @@
 #include "core/file_sys/fssystem/fs_i_storage.h"
 #include "core/file_sys/fssystem/fssystem_bucket_tree.h"
 #include "core/file_sys/fssystem/fssystem_bucket_tree_template_impl.h"
-#include "core/file_sys/vfs.h"
-#include "core/file_sys/vfs_offset.h"
+#include "core/file_sys/vfs/vfs.h"
+#include "core/file_sys/vfs/vfs_offset.h"

 namespace FileSys {

--- a/src/core/file_sys/fssystem/fssystem_integrity_romfs_storage.h
+++ b/src/core/file_sys/fssystem/fssystem_integrity_romfs_storage.h
@ -5,7 +5,7 @@

 #include "core/file_sys/fssystem/fssystem_hierarchical_integrity_verification_storage.h"
 #include "core/file_sys/fssystem/fssystem_nca_header.h"
-#include "core/file_sys/vfs_vector.h"
+#include "core/file_sys/vfs/vfs_vector.h"

 namespace FileSys {

--- a/src/core/file_sys/fssystem/fssystem_nca_file_system_driver.cpp
+++ b/src/core/file_sys/fssystem/fssystem_nca_file_system_driver.cpp
@ -14,8 +14,8 @@
 #include "core/file_sys/fssystem/fssystem_nca_file_system_driver.h"
 #include "core/file_sys/fssystem/fssystem_sparse_storage.h"
 #include "core/file_sys/fssystem/fssystem_switch_storage.h"
-#include "core/file_sys/vfs_offset.h"
-#include "core/file_sys/vfs_vector.h"
+#include "core/file_sys/vfs/vfs_offset.h"
+#include "core/file_sys/vfs/vfs_vector.h"

 namespace FileSys {

--- a/src/core/file_sys/fssystem/fssystem_nca_file_system_driver.h
+++ b/src/core/file_sys/fssystem/fssystem_nca_file_system_driver.h
@ -5,7 +5,7 @@

 #include "core/file_sys/fssystem/fssystem_compression_common.h"
 #include "core/file_sys/fssystem/fssystem_nca_header.h"
-#include "core/file_sys/vfs.h"
+#include "core/file_sys/vfs/vfs.h"

 namespace FileSys {

--- a/src/core/file_sys/fssystem/fssystem_nca_reader.cpp
+++ b/src/core/file_sys/fssystem/fssystem_nca_reader.cpp
@ -3,7 +3,7 @@

 #include "core/file_sys/fssystem/fssystem_aes_xts_storage.h"
 #include "core/file_sys/fssystem/fssystem_nca_file_system_driver.h"
-#include "core/file_sys/vfs_offset.h"
+#include "core/file_sys/vfs/vfs_offset.h"

 namespace FileSys {

--- a/src/core/file_sys/ips_layer.cpp
+++ b/src/core/file_sys/ips_layer.cpp
@ -12,7 +12,7 @@
 #include "common/logging/log.h"
 #include "common/swap.h"
 #include "core/file_sys/ips_layer.h"
-#include "core/file_sys/vfs_vector.h"
+#include "core/file_sys/vfs/vfs_vector.h"

 namespace FileSys {

--- a/src/core/file_sys/ips_layer.h
+++ b/src/core/file_sys/ips_layer.h
@ -8,7 +8,7 @@
 #include <vector>

 #include "common/common_types.h"
-#include "core/file_sys/vfs.h"
+#include "core/file_sys/vfs/vfs.h"

 namespace FileSys {

--- a/src/core/file_sys/kernel_executable.cpp
+++ b/src/core/file_sys/kernel_executable.cpp
@ -5,7 +5,7 @@

 #include "common/string_util.h"
 #include "core/file_sys/kernel_executable.h"
-#include "core/file_sys/vfs_offset.h"
+#include "core/file_sys/vfs/vfs_offset.h"
 #include "core/loader/loader.h"

 namespace FileSys {
--- a/src/core/file_sys/kernel_executable.h
+++ b/src/core/file_sys/kernel_executable.h
@ -10,7 +10,7 @@
 #include "common/common_funcs.h"
 #include "common/common_types.h"
 #include "common/swap.h"
-#include "core/file_sys/vfs_types.h"
+#include "core/file_sys/vfs/vfs_types.h"

 namespace Loader {
 enum class ResultStatus : u16;
--- a/src/core/file_sys/mode.h
+++ b/src/core/file_sys/mode.h
@ -1,23 +0,0 @@
-// SPDX-FileCopyrightText: Copyright 2018 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 Mode : u32 {
-    Read = 1 << 0,
-    Write = 1 << 1,
-    ReadWrite = Read | Write,
-    Append = 1 << 2,
-    ReadAppend = Read | Append,
-    WriteAppend = Write | Append,
-    All = ReadWrite | Append,
-};
-
-DECLARE_ENUM_FLAG_OPERATORS(Mode)
-
-} // namespace FileSys
--- a/src/core/file_sys/nca_metadata.cpp
+++ b/src/core/file_sys/nca_metadata.cpp
@ -6,7 +6,7 @@
 #include "common/logging/log.h"
 #include "common/swap.h"
 #include "core/file_sys/nca_metadata.h"
-#include "core/file_sys/vfs.h"
+#include "core/file_sys/vfs/vfs.h"

 namespace FileSys {

--- a/src/core/file_sys/nca_metadata.h
+++ b/src/core/file_sys/nca_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_types.h"
+#include "core/file_sys/vfs/vfs_types.h"

 namespace FileSys {
 class CNMT;
--- a/src/core/file_sys/partition_filesystem.cpp
+++ b/src/core/file_sys/partition_filesystem.cpp
@ -9,7 +9,7 @@

 #include "common/logging/log.h"
 #include "core/file_sys/partition_filesystem.h"
-#include "core/file_sys/vfs_offset.h"
+#include "core/file_sys/vfs/vfs_offset.h"
 #include "core/loader/loader.h"

 namespace FileSys {
--- a/src/core/file_sys/partition_filesystem.h
+++ b/src/core/file_sys/partition_filesystem.h
@ -9,7 +9,7 @@
 #include "common/common_funcs.h"
 #include "common/common_types.h"
 #include "common/swap.h"
-#include "core/file_sys/vfs.h"
+#include "core/file_sys/vfs/vfs.h"

 namespace Loader {
 enum class ResultStatus : u16;
--- a/src/core/file_sys/patch_manager.cpp
+++ b/src/core/file_sys/patch_manager.cpp
@ -21,9 +21,9 @@
 #include "core/file_sys/patch_manager.h"
 #include "core/file_sys/registered_cache.h"
 #include "core/file_sys/romfs.h"
-#include "core/file_sys/vfs_cached.h"
-#include "core/file_sys/vfs_layered.h"
-#include "core/file_sys/vfs_vector.h"
+#include "core/file_sys/vfs/vfs_cached.h"
+#include "core/file_sys/vfs/vfs_layered.h"
+#include "core/file_sys/vfs/vfs_vector.h"
 #include "core/hle/service/filesystem/filesystem.h"
 #include "core/hle/service/ns/language.h"
 #include "core/hle/service/set/settings_server.h"
--- a/src/core/file_sys/patch_manager.h
+++ b/src/core/file_sys/patch_manager.h
@ -9,7 +9,7 @@
 #include <string>
 #include "common/common_types.h"
 #include "core/file_sys/nca_metadata.h"
-#include "core/file_sys/vfs_types.h"
+#include "core/file_sys/vfs/vfs_types.h"
 #include "core/memory/dmnt_cheat_types.h"

 namespace Core {
--- a/src/core/file_sys/program_metadata.cpp
+++ b/src/core/file_sys/program_metadata.cpp
@ -7,7 +7,7 @@
 #include "common/logging/log.h"
 #include "common/scope_exit.h"
 #include "core/file_sys/program_metadata.h"
-#include "core/file_sys/vfs.h"
+#include "core/file_sys/vfs/vfs.h"
 #include "core/loader/loader.h"

 namespace FileSys {
--- a/src/core/file_sys/program_metadata.h
+++ b/src/core/file_sys/program_metadata.h
@ -10,7 +10,7 @@
 #include "common/common_funcs.h"
 #include "common/common_types.h"
 #include "common/swap.h"
-#include "core/file_sys/vfs_types.h"
+#include "core/file_sys/vfs/vfs_types.h"

 namespace Loader {
 enum class ResultStatus : u16;
--- a/src/core/file_sys/registered_cache.cpp
+++ b/src/core/file_sys/registered_cache.cpp
@ -17,7 +17,7 @@
 #include "core/file_sys/nca_metadata.h"
 #include "core/file_sys/registered_cache.h"
 #include "core/file_sys/submission_package.h"
-#include "core/file_sys/vfs_concat.h"
+#include "core/file_sys/vfs/vfs_concat.h"
 #include "core/loader/loader.h"

 namespace FileSys {
--- a/src/core/file_sys/registered_cache.h
+++ b/src/core/file_sys/registered_cache.h
@ -11,7 +11,7 @@
 #include <boost/container/flat_map.hpp>
 #include "common/common_types.h"
 #include "core/crypto/key_manager.h"
-#include "core/file_sys/vfs.h"
+#include "core/file_sys/vfs/vfs.h"

 namespace FileSys {
 class CNMT;
--- a/src/core/file_sys/romfs.cpp
+++ b/src/core/file_sys/romfs.cpp
@ -9,11 +9,11 @@
 #include "common/swap.h"
 #include "core/file_sys/fsmitm_romfsbuild.h"
 #include "core/file_sys/romfs.h"
-#include "core/file_sys/vfs.h"
-#include "core/file_sys/vfs_cached.h"
-#include "core/file_sys/vfs_concat.h"
-#include "core/file_sys/vfs_offset.h"
-#include "core/file_sys/vfs_vector.h"
+#include "core/file_sys/vfs/vfs.h"
+#include "core/file_sys/vfs/vfs_cached.h"
+#include "core/file_sys/vfs/vfs_concat.h"
+#include "core/file_sys/vfs/vfs_offset.h"
+#include "core/file_sys/vfs/vfs_vector.h"

 namespace FileSys {
 namespace {
--- a/src/core/file_sys/romfs.h
+++ b/src/core/file_sys/romfs.h
@ -3,7 +3,7 @@

 #pragma once

-#include "core/file_sys/vfs.h"
+#include "core/file_sys/vfs/vfs.h"

 namespace FileSys {

--- a/src/core/file_sys/romfs_factory.h
+++ b/src/core/file_sys/romfs_factory.h
@ -6,7 +6,7 @@
 #include <memory>

 #include "common/common_types.h"
-#include "core/file_sys/vfs_types.h"
+#include "core/file_sys/vfs/vfs_types.h"
 #include "core/hle/result.h"

 namespace Loader {
--- a/src/core/file_sys/savedata_factory.cpp
+++ b/src/core/file_sys/savedata_factory.cpp
@ -8,7 +8,7 @@
 #include "common/uuid.h"
 #include "core/core.h"
 #include "core/file_sys/savedata_factory.h"
-#include "core/file_sys/vfs.h"
+#include "core/file_sys/vfs/vfs.h"

 namespace FileSys {

--- a/src/core/file_sys/savedata_factory.h
+++ b/src/core/file_sys/savedata_factory.h
@ -7,7 +7,7 @@
 #include <string>
 #include "common/common_funcs.h"
 #include "common/common_types.h"
-#include "core/file_sys/vfs.h"
+#include "core/file_sys/vfs/vfs.h"
 #include "core/hle/result.h"

 namespace Core {
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
yuzubot	28a23c4380	Android 215	2024-01-28 01:00:30 +00:00
yuzubot	c768c19898	Merge yuzu-emu#12802	2024-01-28 01:00:30 +00:00
yuzubot	7273701bc2	Merge yuzu-emu#12760	2024-01-28 01:00:30 +00:00
yuzubot	3bf0492edb	Merge yuzu-emu#12749	2024-01-28 01:00:30 +00:00
liamwhite	ce2eb6e8ee	Merge pull request #12818 from K900/small-fixes A few small fixes	2024-01-27 12:13:46 -05:00
K900	8b47465586	input: add a missing null pointer check There's a few other places where the result of GetAruidData is accessed without a null check, but I couldn't find a code path that hits those.	2024-01-27 17:32:49 +03:00
K900	3065ab0fd8	nx_tzdb: add another safety assertion	2024-01-27 17:28:04 +03:00
K900	a2407a2964	nx_tzdb: check for unpacked directory Otherwise things get funny if the archive is downloaded, but the unpacking was interrupted.	2024-01-27 17:25:52 +03:00
liamwhite	16b79df836	Merge pull request #12815 from t895/visual-driver-silly android: Reload global settings on closing emulation	2024-01-27 01:36:26 -05:00
t895	6a4b25699d	android: Reload global settings on closing emulation UI like the driver manager expects the global settings to be loaded when in the MainActivity so we reload global config to properly reset state on exit.	2024-01-26 23:05:02 -05:00
liamwhite	bd8635e26a	Merge pull request #12808 from t895/uri-moment vfs: Fix getting URI filename	2024-01-26 10:23:08 -05:00
liamwhite	4349cdba07	Merge pull request #12769 from german77/no-log core: hid: Reduce controller requests	2024-01-26 09:57:40 -05:00
t895	f2fb761bac	vfs: Fix getting URI filename	2024-01-26 09:57:22 -05:00
liamwhite	59aee2b461	Merge pull request #12809 from t895/error-message android: Add cancel condition to installed content check	2024-01-26 09:56:01 -05:00
liamwhite	4d206d849e	Merge pull request #12765 from german77/sys-hid service: set: Implement more settings functions for Qlaunch	2024-01-26 09:55:47 -05:00
liamwhite	744c0173d1	Merge pull request #12801 from german77/vibration-fix service: hid: Don't try to vibrate if device isn't initialized	2024-01-26 09:55:37 -05:00
liamwhite	55482ab5dc	Merge pull request #12707 from FearlessTobi/fs-housekeeping fs: Various cleanups & add path class for later use	2024-01-26 09:55:25 -05:00
t895	e56b44dee6	android: Add cancel condition to installed content check	2024-01-26 09:29:51 -05:00
Narr the Reg	f2012e5aff	service: hid: Don't try to vibrate if device isn't initialized	2024-01-25 23:46:46 -06:00
liamwhite	4526fdaf64	Merge pull request #12796 from t895/controller-optimizations android: Controller focus optimizations	2024-01-25 23:01:44 -05:00
liamwhite	bc22b4e782	Merge pull request #12798 from liamwhite/cmif-fixes cmif_serialization: fixes	2024-01-25 23:01:10 -05:00
liamwhite	f70821ce0d	Merge pull request #12794 from abouvier/cmake-simpleini-module cmake: support simpleini config and pc file	2024-01-25 23:01:04 -05:00
Liam	a774ff935c	cmif_serialization: support non-domain sessions on domain servers	2024-01-25 22:18:42 -05:00
Liam	431df5ae93	cmif_types: improve ergonomics of types	2024-01-25 22:18:37 -05:00
t895	677c2c2cd2	android: Disable default focus highlight on views that shouldn't be selected	2024-01-25 20:49:57 -05:00
t895	ee540c712c	android: Allow controller to focus on toolbar menu items Workaround for this https://issuetracker.google.com/issues/256948272	2024-01-25 20:48:58 -05:00
t895	d23c4393fd	android: Add 600dp layout for GameInfoFragment	2024-01-25 20:46:03 -05:00
t895	b24a111136	android: Fix button click listener for build version name Was set to the text instead of the parent view by mistake	2024-01-25 20:43:12 -05:00
t895	91636deaaf	android: Disable focus for the root of cards that contain buttons	2024-01-25 20:42:23 -05:00
t895	68cbf67f4c	android: Focus on the in game menu when opened	2024-01-25 20:39:52 -05:00
Alexandre Bouvier	645961613f	cmake: support simpleini cmake config and pc file	2024-01-26 01:13:47 +01:00
Narr the Reg	53b321c945	service: set: Implement more settings functions for Qlaunch	2024-01-25 17:14:18 -06:00
FearlessTobi	975deb7528	Address review comments and fix compilation problems	2024-01-25 16:43:53 -05:00
FearlessTobi	2c049ae06d	fs: Add path class	2024-01-25 16:42:06 -05:00
FearlessTobi	54372fdff5	result: Make fully constexpr, add ON_RESULT_INCLUDED	2024-01-25 16:42:06 -05:00
FearlessTobi	c60ab6bbf6	fs/errors: Unify naming of result codes	2024-01-25 16:42:06 -05:00
FearlessTobi	cc09c265e1	fs: Replace Mode enum by OpenMode enum	2024-01-25 16:42:05 -05:00
FearlessTobi	0f9288e38d	vfs: Move vfs files to their own directory	2024-01-25 16:40:42 -05:00
FearlessTobi	06fb7f90da	fs: Move fsp_srv subclasses to separate files fs: Move additional files to the fsp directory	2024-01-25 16:40:42 -05:00
Narr the Reg	ad4622da2c	core: hid: Skip duplicated vibrations	2024-01-23 11:33:08 -06:00
Narr the Reg	3b1c2896d9	core: hid: Only set polling mode if needed	2024-01-23 11:11:09 -06:00