Android #74

CMakeLists.txt

@@ -333,7 +333,6 @@ find_package(LLVM 17 MODULE COMPONENTS Demangle)
 find_package(lz4 REQUIRED)
 find_package(nlohmann_json 3.8 REQUIRED)
 find_package(Opus 1.3 MODULE)
-find_package(RenderDoc MODULE)
 find_package(VulkanMemoryAllocator CONFIG)
 find_package(ZLIB 1.2 REQUIRED)
 find_package(zstd 1.5 REQUIRED)

CMakeModules/FindRenderDoc.cmake

@@ -1,19 +0,0 @@
-# SPDX-FileCopyrightText: 2023 Alexandre Bouvier <contact@amb.tf>
-#
-# SPDX-License-Identifier: GPL-3.0-or-later
-
-find_path(RenderDoc_INCLUDE_DIR renderdoc_app.h)
-
-include(FindPackageHandleStandardArgs)
-find_package_handle_standard_args(RenderDoc
-    REQUIRED_VARS RenderDoc_INCLUDE_DIR
-)
-
-if (RenderDoc_FOUND AND NOT TARGET RenderDoc::API)
-    add_library(RenderDoc::API INTERFACE IMPORTED)
-    set_target_properties(RenderDoc::API PROPERTIES
-        INTERFACE_INCLUDE_DIRECTORIES "${RenderDoc_INCLUDE_DIR}"
-    )
-endif()
-
-mark_as_advanced(RenderDoc_INCLUDE_DIR)

externals/CMakeLists.txt

@@ -174,11 +174,8 @@ target_include_directories(stb PUBLIC ./stb)
 add_library(bc_decoder bc_decoder/bc_decoder.cpp)
 target_include_directories(bc_decoder PUBLIC ./bc_decoder)
 
-if (NOT TARGET RenderDoc::API)
-    add_library(renderdoc INTERFACE)
-    target_include_directories(renderdoc SYSTEM INTERFACE ./renderdoc)
-    add_library(RenderDoc::API ALIAS renderdoc)
-endif()
+add_library(renderdoc INTERFACE)
+target_include_directories(renderdoc SYSTEM INTERFACE ./renderdoc)
 
 if (ANDROID)
    if (ARCHITECTURE_arm64)

src/android/.gitignore

@@ -63,6 +63,3 @@ fastlane/Preview.html
 fastlane/screenshots
 fastlane/test_output
 fastlane/readme.md
-
-# Autogenerated library for vulkan validation layers
-libVkLayer_khronos_validation.so

src/android/app/build.gradle.kts

@@ -214,7 +214,7 @@ dependencies {
     implementation("androidx.lifecycle:lifecycle-viewmodel-ktx:2.6.1")
     implementation("io.coil-kt:coil:2.2.2")
     implementation("androidx.core:core-splashscreen:1.0.1")
-    implementation("androidx.window:window:1.2.0-beta03")
+    implementation("androidx.window:window:1.1.0")
     implementation("org.ini4j:ini4j:0.5.4")
     implementation("androidx.constraintlayout:constraintlayout:2.1.4")
     implementation("androidx.swiperefreshlayout:swiperefreshlayout:1.1.0")

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

@@ -247,12 +247,7 @@ object NativeLibrary {
 
     external fun setAppDirectory(directory: String)
 
-    /**
-     * Installs a nsp or xci file to nand
-     * @param filename String representation of file uri
-     * @param extension Lowercase string representation of file extension without "."
-     */
-    external fun installFileToNand(filename: String, extension: String): Int
+    external fun installFileToNand(filename: String): Int
 
     external fun initializeGpuDriver(
         hookLibDir: String?,
@@ -516,11 +511,6 @@ object NativeLibrary {
      */
     external fun submitInlineKeyboardInput(key_code: Int)
 
-    /**
-     * Creates a generic user directory if it doesn't exist already
-     */
-    external fun initializeEmptyUserDirectory()
-
     /**
      * Button type for use in onTouchEvent
      */

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

@@ -3,7 +3,6 @@
 
 package org.yuzu.yuzu_emu.activities
 
-import android.annotation.SuppressLint
 import android.app.Activity
 import android.app.PendingIntent
 import android.app.PictureInPictureParams
@@ -398,7 +397,6 @@ class EmulationActivity : AppCompatActivity(), SensorEventListener {
         }
     }
 
-    @SuppressLint("UnspecifiedRegisterReceiverFlag")
     override fun onPictureInPictureModeChanged(
         isInPictureInPictureMode: Boolean,
         newConfig: Configuration
@@ -411,11 +409,7 @@ class EmulationActivity : AppCompatActivity(), SensorEventListener {
                 addAction(actionMute)
                 addAction(actionUnmute)
             }.also {
-                if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU) {
-                    registerReceiver(pictureInPictureReceiver, it, RECEIVER_EXPORTED)
-                } else {
-                    registerReceiver(pictureInPictureReceiver, it)
-                }
+                registerReceiver(pictureInPictureReceiver, it)
             }
         } else {
             try {

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

@@ -49,7 +49,6 @@ class HomeSettingAdapter(
             holder.option.onClick.invoke()
         } else {
             MessageDialogFragment.newInstance(
-                activity,
                 titleId = holder.option.disabledTitleId,
                 descriptionId = holder.option.disabledMessageId
             ).show(activity.supportFragmentManager, MessageDialogFragment.TAG)

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

@@ -1,49 +0,0 @@
-// SPDX-FileCopyrightText: 2023 yuzu Emulator Project
-// SPDX-License-Identifier: GPL-2.0-or-later
-
-package org.yuzu.yuzu_emu.adapters
-
-import android.view.LayoutInflater
-import android.view.View
-import android.view.ViewGroup
-import androidx.recyclerview.widget.RecyclerView
-import org.yuzu.yuzu_emu.databinding.CardInstallableBinding
-import org.yuzu.yuzu_emu.model.Installable
-
-class InstallableAdapter(private val installables: List<Installable>) :
-    RecyclerView.Adapter<InstallableAdapter.InstallableViewHolder>() {
-    override fun onCreateViewHolder(
-        parent: ViewGroup,
-        viewType: Int
-    ): InstallableAdapter.InstallableViewHolder {
-        val binding =
-            CardInstallableBinding.inflate(LayoutInflater.from(parent.context), parent, false)
-        return InstallableViewHolder(binding)
-    }
-
-    override fun getItemCount(): Int = installables.size
-
-    override fun onBindViewHolder(holder: InstallableAdapter.InstallableViewHolder, position: Int) =
-        holder.bind(installables[position])
-
-    inner class InstallableViewHolder(val binding: CardInstallableBinding) :
-        RecyclerView.ViewHolder(binding.root) {
-        lateinit var installable: Installable
-
-        fun bind(installable: Installable) {
-            this.installable = installable
-
-            binding.title.setText(installable.titleId)
-            binding.description.setText(installable.descriptionId)
-
-            if (installable.install != null) {
-                binding.buttonInstall.visibility = View.VISIBLE
-                binding.buttonInstall.setOnClickListener { installable.install.invoke() }
-            }
-            if (installable.export != null) {
-                binding.buttonExport.visibility = View.VISIBLE
-                binding.buttonExport.setOnClickListener { installable.export.invoke() }
-            }
-        }
-    }
-}

src/android/app/src/main/java/org/yuzu/yuzu_emu/features/settings/ui/SettingsActivity.kt

@@ -21,7 +21,6 @@ import androidx.navigation.navArgs
 import com.google.android.material.color.MaterialColors
 import kotlinx.coroutines.flow.collectLatest
 import kotlinx.coroutines.launch
-import org.yuzu.yuzu_emu.NativeLibrary
 import java.io.IOException
 import org.yuzu.yuzu_emu.R
 import org.yuzu.yuzu_emu.databinding.ActivitySettingsBinding
@@ -169,7 +168,7 @@ class SettingsActivity : AppCompatActivity() {
         if (!settingsFile.delete()) {
             throw IOException("Failed to delete $settingsFile")
         }
-        NativeLibrary.reloadSettings()
+        Settings.settingsList.forEach { it.reset() }
 
         Toast.makeText(
             applicationContext,
@@ -182,14 +181,12 @@ class SettingsActivity : AppCompatActivity() {
     private fun setInsets() {
         ViewCompat.setOnApplyWindowInsetsListener(
             binding.navigationBarShade
-        ) { _: View, windowInsets: WindowInsetsCompat ->
+        ) { view: View, windowInsets: WindowInsetsCompat ->
             val barInsets = windowInsets.getInsets(WindowInsetsCompat.Type.systemBars())
 
-            // The only situation where we care to have a nav bar shade is when it's at the bottom
-            // of the screen where scrolling list elements can go behind it.
-            val mlpNavShade = binding.navigationBarShade.layoutParams as MarginLayoutParams
-            mlpNavShade.height = barInsets.bottom
-            binding.navigationBarShade.layoutParams = mlpNavShade
+            val mlpShade = view.layoutParams as MarginLayoutParams
+            mlpShade.height = barInsets.bottom
+            view.layoutParams = mlpShade
 
             windowInsets
         }

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

@@ -15,9 +15,9 @@ import android.net.Uri
 import android.os.Bundle
 import android.os.Handler
 import android.os.Looper
+import android.util.Rational
 import android.view.*
 import android.widget.TextView
-import android.widget.Toast
 import androidx.activity.OnBackPressedCallback
 import androidx.appcompat.widget.PopupMenu
 import androidx.core.content.res.ResourcesCompat
@@ -54,7 +54,6 @@ import org.yuzu.yuzu_emu.model.Game
 import org.yuzu.yuzu_emu.model.EmulationViewModel
 import org.yuzu.yuzu_emu.overlay.InputOverlay
 import org.yuzu.yuzu_emu.utils.*
-import java.lang.NullPointerException
 
 class EmulationFragment : Fragment(), SurfaceHolder.Callback {
     private lateinit var preferences: SharedPreferences
@@ -106,21 +105,10 @@ class EmulationFragment : Fragment(), SurfaceHolder.Callback {
                 null
             }
         }
-
-        try {
-            game = if (args.game != null) {
-                args.game!!
-            } else {
-                intentGame!!
-            }
-        } catch (e: NullPointerException) {
-            Toast.makeText(
-                requireContext(),
-                R.string.no_game_present,
-                Toast.LENGTH_SHORT
-            ).show()
-            requireActivity().finish()
-            return
+        game = if (args.game != null) {
+            args.game!!
+        } else {
+            intentGame ?: error("[EmulationFragment] No bootable game present!")
         }
 
         // So this fragment doesn't restart on configuration changes; i.e. rotation.
@@ -144,11 +132,6 @@ class EmulationFragment : Fragment(), SurfaceHolder.Callback {
     // This is using the correct scope, lint is just acting up
     @SuppressLint("UnsafeRepeatOnLifecycleDetector")
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
-        super.onViewCreated(view, savedInstanceState)
-        if (requireActivity().isFinishing) {
-            return
-        }
-
         binding.surfaceEmulation.holder.addCallback(this)
         binding.showFpsText.setTextColor(Color.YELLOW)
         binding.doneControlConfig.setOnClickListener { stopConfiguringControls() }
@@ -304,23 +287,24 @@ class EmulationFragment : Fragment(), SurfaceHolder.Callback {
 
     override fun onConfigurationChanged(newConfig: Configuration) {
         super.onConfigurationChanged(newConfig)
-        if (_binding == null) {
-            return
-        }
-
-        updateScreenLayout()
         if (emulationActivity?.isInPictureInPictureMode == true) {
             if (binding.drawerLayout.isOpen) {
                 binding.drawerLayout.close()
             }
             if (EmulationMenuSettings.showOverlay) {
-                binding.surfaceInputOverlay.visibility = View.INVISIBLE
+                binding.surfaceInputOverlay.post {
+                    binding.surfaceInputOverlay.visibility = View.VISIBLE
+                }
             }
         } else {
             if (EmulationMenuSettings.showOverlay && emulationViewModel.emulationStarted.value) {
-                binding.surfaceInputOverlay.visibility = View.VISIBLE
+                binding.surfaceInputOverlay.post {
+                    binding.surfaceInputOverlay.visibility = View.VISIBLE
+                }
             } else {
-                binding.surfaceInputOverlay.visibility = View.INVISIBLE
+                binding.surfaceInputOverlay.post {
+                    binding.surfaceInputOverlay.visibility = View.INVISIBLE
+                }
             }
             if (!isInFoldableLayout) {
                 if (newConfig.orientation == Configuration.ORIENTATION_PORTRAIT) {
@@ -344,7 +328,7 @@ class EmulationFragment : Fragment(), SurfaceHolder.Callback {
     }
 
     override fun onPause() {
-        if (emulationState.isRunning && emulationActivity?.isInPictureInPictureMode != true) {
+        if (emulationState.isRunning) {
             emulationState.pause()
         }
         super.onPause()
@@ -410,7 +394,16 @@ class EmulationFragment : Fragment(), SurfaceHolder.Callback {
     }
 
     private fun updateScreenLayout() {
-        binding.surfaceEmulation.setAspectRatio(null)
+        binding.surfaceEmulation.setAspectRatio(
+            when (IntSetting.RENDERER_ASPECT_RATIO.int) {
+                0 -> Rational(16, 9)
+                1 -> Rational(4, 3)
+                2 -> Rational(21, 9)
+                3 -> Rational(16, 10)
+                4 -> null // Stretch
+                else -> Rational(16, 9)
+            }
+        )
         emulationActivity?.buildPictureInPictureParams()
         updateOrientation()
     }
@@ -700,6 +693,7 @@ class EmulationFragment : Fragment(), SurfaceHolder.Callback {
     private class EmulationState(private val gamePath: String) {
         private var state: State
         private var surface: Surface? = null
+        private var runWhenSurfaceIsValid = false
 
         init {
             // Starting state is stopped.
@@ -757,6 +751,8 @@ class EmulationFragment : Fragment(), SurfaceHolder.Callback {
             // If the surface is set, run now. Otherwise, wait for it to get set.
             if (surface != null) {
                 runWithValidSurface()
+            } else {
+                runWhenSurfaceIsValid = true
             }
         }
 
@@ -764,7 +760,7 @@ class EmulationFragment : Fragment(), SurfaceHolder.Callback {
         @Synchronized
         fun newSurface(surface: Surface?) {
             this.surface = surface
-            if (this.surface != null) {
+            if (runWhenSurfaceIsValid) {
                 runWithValidSurface()
             }
         }
@@ -792,9 +788,10 @@ class EmulationFragment : Fragment(), SurfaceHolder.Callback {
         }
 
         private fun runWithValidSurface() {
-            NativeLibrary.surfaceChanged(surface)
+            runWhenSurfaceIsValid = false
             when (state) {
                 State.STOPPED -> {
+                    NativeLibrary.surfaceChanged(surface)
                     val emulationThread = Thread({
                         Log.debug("[EmulationFragment] Starting emulation thread.")
                         NativeLibrary.run(gamePath)
@@ -804,6 +801,7 @@ class EmulationFragment : Fragment(), SurfaceHolder.Callback {
 
                 State.PAUSED -> {
                     Log.debug("[EmulationFragment] Resuming emulation.")
+                    NativeLibrary.surfaceChanged(surface)
                     NativeLibrary.unpauseEmulation()
                 }
 

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

@@ -118,13 +118,18 @@ class HomeSettingsFragment : Fragment() {
             )
             add(
                 HomeSetting(
-                    R.string.manage_yuzu_data,
-                    R.string.manage_yuzu_data_description,
-                    R.drawable.ic_install,
-                    {
-                        binding.root.findNavController()
-                            .navigate(R.id.action_homeSettingsFragment_to_installableFragment)
-                    }
+                    R.string.install_amiibo_keys,
+                    R.string.install_amiibo_keys_description,
+                    R.drawable.ic_nfc,
+                    { mainActivity.getAmiiboKey.launch(arrayOf("*/*")) }
+                )
+            )
+            add(
+                HomeSetting(
+                    R.string.install_game_content,
+                    R.string.install_game_content_description,
+                    R.drawable.ic_system_update_alt,
+                    { mainActivity.installGameUpdate.launch(arrayOf("*/*")) }
                 )
             )
             add(
@@ -143,6 +148,35 @@ class HomeSettingsFragment : Fragment() {
                     homeViewModel.gamesDir
                 )
             )
+            add(
+                HomeSetting(
+                    R.string.manage_save_data,
+                    R.string.import_export_saves_description,
+                    R.drawable.ic_save,
+                    {
+                        ImportExportSavesFragment().show(
+                            parentFragmentManager,
+                            ImportExportSavesFragment.TAG
+                        )
+                    }
+                )
+            )
+            add(
+                HomeSetting(
+                    R.string.install_prod_keys,
+                    R.string.install_prod_keys_description,
+                    R.drawable.ic_unlock,
+                    { mainActivity.getProdKey.launch(arrayOf("*/*")) }
+                )
+            )
+            add(
+                HomeSetting(
+                    R.string.install_firmware,
+                    R.string.install_firmware_description,
+                    R.drawable.ic_firmware,
+                    { mainActivity.getFirmware.launch(arrayOf("application/zip")) }
+                )
+            )
             add(
                 HomeSetting(
                     R.string.share_log,

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

@@ -0,0 +1,213 @@
+// SPDX-FileCopyrightText: 2023 yuzu Emulator Project
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+package org.yuzu.yuzu_emu.fragments
+
+import android.app.Dialog
+import android.content.Intent
+import android.net.Uri
+import android.os.Bundle
+import android.provider.DocumentsContract
+import android.widget.Toast
+import androidx.activity.result.ActivityResultLauncher
+import androidx.activity.result.contract.ActivityResultContracts
+import androidx.appcompat.app.AppCompatActivity
+import androidx.documentfile.provider.DocumentFile
+import androidx.fragment.app.DialogFragment
+import com.google.android.material.dialog.MaterialAlertDialogBuilder
+import java.io.BufferedOutputStream
+import java.io.File
+import java.io.FileOutputStream
+import java.io.FilenameFilter
+import java.time.LocalDateTime
+import java.time.format.DateTimeFormatter
+import java.util.zip.ZipEntry
+import java.util.zip.ZipOutputStream
+import kotlinx.coroutines.CoroutineScope
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.launch
+import kotlinx.coroutines.withContext
+import org.yuzu.yuzu_emu.R
+import org.yuzu.yuzu_emu.YuzuApplication
+import org.yuzu.yuzu_emu.features.DocumentProvider
+import org.yuzu.yuzu_emu.getPublicFilesDir
+import org.yuzu.yuzu_emu.utils.FileUtil
+
+class ImportExportSavesFragment : DialogFragment() {
+    private val context = YuzuApplication.appContext
+    private val savesFolder =
+        "${context.getPublicFilesDir().canonicalPath}/nand/user/save/0000000000000000"
+
+    // Get first subfolder in saves folder (should be the user folder)
+    private val savesFolderRoot = File(savesFolder).listFiles()?.firstOrNull()?.canonicalPath ?: ""
+    private var lastZipCreated: File? = null
+
+    private lateinit var startForResultExportSave: ActivityResultLauncher<Intent>
+    private lateinit var documentPicker: ActivityResultLauncher<Array<String>>
+
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+        val activity = requireActivity() as AppCompatActivity
+
+        val activityResultRegistry = requireActivity().activityResultRegistry
+        startForResultExportSave = activityResultRegistry.register(
+            "startForResultExportSaveKey",
+            ActivityResultContracts.StartActivityForResult()
+        ) {
+            File(context.getPublicFilesDir().canonicalPath, "temp").deleteRecursively()
+        }
+        documentPicker = activityResultRegistry.register(
+            "documentPickerKey",
+            ActivityResultContracts.OpenDocument()
+        ) {
+            it?.let { uri -> importSave(uri, activity) }
+        }
+    }
+
+    override fun onCreateDialog(savedInstanceState: Bundle?): Dialog {
+        return if (savesFolderRoot == "") {
+            MaterialAlertDialogBuilder(requireContext())
+                .setTitle(R.string.manage_save_data)
+                .setMessage(R.string.import_export_saves_no_profile)
+                .setPositiveButton(android.R.string.ok, null)
+                .show()
+        } else {
+            MaterialAlertDialogBuilder(requireContext())
+                .setTitle(R.string.manage_save_data)
+                .setMessage(R.string.manage_save_data_description)
+                .setNegativeButton(R.string.export_saves) { _, _ ->
+                    exportSave()
+                }
+                .setPositiveButton(R.string.import_saves) { _, _ ->
+                    documentPicker.launch(arrayOf("application/zip"))
+                }
+                .setNeutralButton(android.R.string.cancel, null)
+                .show()
+        }
+    }
+
+    /**
+     * Zips the save files located in the given folder path and creates a new zip file with the current date and time.
+     * @return true if the zip file is successfully created, false otherwise.
+     */
+    private fun zipSave(): Boolean {
+        try {
+            val tempFolder = File(requireContext().getPublicFilesDir().canonicalPath, "temp")
+            tempFolder.mkdirs()
+            val saveFolder = File(savesFolderRoot)
+            val outputZipFile = File(
+                tempFolder,
+                "yuzu saves - ${
+                LocalDateTime.now().format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm"))
+                }.zip"
+            )
+            outputZipFile.createNewFile()
+            ZipOutputStream(BufferedOutputStream(FileOutputStream(outputZipFile))).use { zos ->
+                saveFolder.walkTopDown().forEach { file ->
+                    val zipFileName =
+                        file.absolutePath.removePrefix(savesFolderRoot).removePrefix("/")
+                    if (zipFileName == "") {
+                        return@forEach
+                    }
+                    val entry = ZipEntry("$zipFileName${(if (file.isDirectory) "/" else "")}")
+                    zos.putNextEntry(entry)
+                    if (file.isFile) {
+                        file.inputStream().use { fis -> fis.copyTo(zos) }
+                    }
+                }
+            }
+            lastZipCreated = outputZipFile
+        } catch (e: Exception) {
+            return false
+        }
+        return true
+    }
+
+    /**
+     * Exports the save file located in the given folder path by creating a zip file and sharing it via intent.
+     */
+    private fun exportSave() {
+        CoroutineScope(Dispatchers.IO).launch {
+            val wasZipCreated = zipSave()
+            val lastZipFile = lastZipCreated
+            if (!wasZipCreated || lastZipFile == null) {
+                withContext(Dispatchers.Main) {
+                    Toast.makeText(context, "Failed to export save", Toast.LENGTH_LONG).show()
+                }
+                return@launch
+            }
+
+            withContext(Dispatchers.Main) {
+                val file = DocumentFile.fromSingleUri(
+                    context,
+                    DocumentsContract.buildDocumentUri(
+                        DocumentProvider.AUTHORITY,
+                        "${DocumentProvider.ROOT_ID}/temp/${lastZipFile.name}"
+                    )
+                )!!
+                val intent = Intent(Intent.ACTION_SEND)
+                    .setDataAndType(file.uri, "application/zip")
+                    .addFlags(Intent.FLAG_GRANT_READ_URI_PERMISSION)
+                    .putExtra(Intent.EXTRA_STREAM, file.uri)
+                startForResultExportSave.launch(Intent.createChooser(intent, "Share save file"))
+            }
+        }
+    }
+
+    /**
+     * Imports the save files contained in the zip file, and replaces any existing ones with the new save file.
+     * @param zipUri The Uri of the zip file containing the save file(s) to import.
+     */
+    private fun importSave(zipUri: Uri, activity: AppCompatActivity) {
+        val inputZip = context.contentResolver.openInputStream(zipUri)
+        // A zip needs to have at least one subfolder named after a TitleId in order to be considered valid.
+        var validZip = false
+        val savesFolder = File(savesFolderRoot)
+        val cacheSaveDir = File("${context.cacheDir.path}/saves/")
+        cacheSaveDir.mkdir()
+
+        if (inputZip == null) {
+            Toast.makeText(context, context.getString(R.string.fatal_error), Toast.LENGTH_LONG)
+                .show()
+            return
+        }
+
+        val filterTitleId =
+            FilenameFilter { _, dirName -> dirName.matches(Regex("^0100[\\dA-Fa-f]{12}$")) }
+
+        try {
+            CoroutineScope(Dispatchers.IO).launch {
+                FileUtil.unzip(inputZip, cacheSaveDir)
+                cacheSaveDir.list(filterTitleId)?.forEach { savePath ->
+                    File(savesFolder, savePath).deleteRecursively()
+                    File(cacheSaveDir, savePath).copyRecursively(File(savesFolder, savePath), true)
+                    validZip = true
+                }
+
+                withContext(Dispatchers.Main) {
+                    if (!validZip) {
+                        MessageDialogFragment.newInstance(
+                            titleId = R.string.save_file_invalid_zip_structure,
+                            descriptionId = R.string.save_file_invalid_zip_structure_description
+                        ).show(activity.supportFragmentManager, MessageDialogFragment.TAG)
+                        return@withContext
+                    }
+                    Toast.makeText(
+                        context,
+                        context.getString(R.string.save_file_imported_success),
+                        Toast.LENGTH_LONG
+                    ).show()
+                }
+
+                cacheSaveDir.deleteRecursively()
+            }
+        } catch (e: Exception) {
+            Toast.makeText(context, context.getString(R.string.fatal_error), Toast.LENGTH_LONG)
+                .show()
+        }
+    }
+
+    companion object {
+        const val TAG = "ImportExportSavesFragment"
+    }
+}

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

@@ -9,7 +9,6 @@ import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
 import android.widget.Toast
-import androidx.appcompat.app.AlertDialog
 import androidx.appcompat.app.AppCompatActivity
 import androidx.fragment.app.DialogFragment
 import androidx.fragment.app.activityViewModels
@@ -19,7 +18,6 @@ import androidx.lifecycle.lifecycleScope
 import androidx.lifecycle.repeatOnLifecycle
 import com.google.android.material.dialog.MaterialAlertDialogBuilder
 import kotlinx.coroutines.launch
-import org.yuzu.yuzu_emu.R
 import org.yuzu.yuzu_emu.databinding.DialogProgressBarBinding
 import org.yuzu.yuzu_emu.model.TaskViewModel
 
@@ -30,25 +28,19 @@ class IndeterminateProgressDialogFragment : DialogFragment() {
 
     override fun onCreateDialog(savedInstanceState: Bundle?): Dialog {
         val titleId = requireArguments().getInt(TITLE)
-        val cancellable = requireArguments().getBoolean(CANCELLABLE)
 
         binding = DialogProgressBarBinding.inflate(layoutInflater)
         binding.progressBar.isIndeterminate = true
         val dialog = MaterialAlertDialogBuilder(requireContext())
             .setTitle(titleId)
             .setView(binding.root)
-
-        if (cancellable) {
-            dialog.setNegativeButton(android.R.string.cancel, null)
-        }
-
-        val alertDialog = dialog.create()
-        alertDialog.setCanceledOnTouchOutside(false)
+            .create()
+        dialog.setCanceledOnTouchOutside(false)
 
         if (!taskViewModel.isRunning.value) {
             taskViewModel.runTask()
         }
-        return alertDialog
+        return dialog
     }
 
     override fun onCreateView(
@@ -61,50 +53,24 @@ class IndeterminateProgressDialogFragment : DialogFragment() {
 
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
         super.onViewCreated(view, savedInstanceState)
-        viewLifecycleOwner.lifecycleScope.apply {
-            launch {
-                repeatOnLifecycle(Lifecycle.State.CREATED) {
-                    taskViewModel.isComplete.collect {
-                        if (it) {
-                            dismiss()
-                            when (val result = taskViewModel.result.value) {
-                                is String -> Toast.makeText(
-                                    requireContext(),
-                                    result,
-                                    Toast.LENGTH_LONG
-                                ).show()
+        viewLifecycleOwner.lifecycleScope.launch {
+            repeatOnLifecycle(Lifecycle.State.CREATED) {
+                taskViewModel.isComplete.collect {
+                    if (it) {
+                        dismiss()
+                        when (val result = taskViewModel.result.value) {
+                            is String -> Toast.makeText(requireContext(), result, Toast.LENGTH_LONG)
+                                .show()
 
-                                is MessageDialogFragment -> result.show(
-                                    requireActivity().supportFragmentManager,
-                                    MessageDialogFragment.TAG
-                                )
-                            }
-                            taskViewModel.clear()
+                            is MessageDialogFragment -> result.show(
+                                requireActivity().supportFragmentManager,
+                                MessageDialogFragment.TAG
+                            )
                         }
+                        taskViewModel.clear()
                     }
                 }
             }
-            launch {
-                repeatOnLifecycle(Lifecycle.State.CREATED) {
-                    taskViewModel.cancelled.collect {
-                        if (it) {
-                            dialog?.setTitle(R.string.cancelling)
-                        }
-                    }
-                }
-            }
-        }
-    }
-
-    // By default, the ProgressDialog will immediately dismiss itself upon a button being pressed.
-    // Setting the OnClickListener again after the dialog is shown overrides this behavior.
-    override fun onResume() {
-        super.onResume()
-        val alertDialog = dialog as AlertDialog
-        val negativeButton = alertDialog.getButton(Dialog.BUTTON_NEGATIVE)
-        negativeButton.setOnClickListener {
-            alertDialog.setTitle(getString(R.string.cancelling))
-            taskViewModel.setCancelled(true)
         }
     }
 
@@ -112,19 +78,16 @@ class IndeterminateProgressDialogFragment : DialogFragment() {
         const val TAG = "IndeterminateProgressDialogFragment"
 
         private const val TITLE = "Title"
-        private const val CANCELLABLE = "Cancellable"
 
         fun newInstance(
             activity: AppCompatActivity,
             titleId: Int,
-            cancellable: Boolean = false,
             task: () -> Any
         ): IndeterminateProgressDialogFragment {
             val dialog = IndeterminateProgressDialogFragment()
             val args = Bundle()
             ViewModelProvider(activity)[TaskViewModel::class.java].task = task
             args.putInt(TITLE, titleId)
-            args.putBoolean(CANCELLABLE, cancellable)
             dialog.arguments = args
             return dialog
         }

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

@@ -1,138 +0,0 @@
-// SPDX-FileCopyrightText: 2023 yuzu Emulator Project
-// SPDX-License-Identifier: GPL-2.0-or-later
-
-package org.yuzu.yuzu_emu.fragments
-
-import android.os.Bundle
-import android.view.LayoutInflater
-import android.view.View
-import android.view.ViewGroup
-import androidx.core.view.ViewCompat
-import androidx.core.view.WindowInsetsCompat
-import androidx.core.view.updatePadding
-import androidx.fragment.app.Fragment
-import androidx.fragment.app.activityViewModels
-import androidx.navigation.findNavController
-import androidx.recyclerview.widget.GridLayoutManager
-import com.google.android.material.transition.MaterialSharedAxis
-import org.yuzu.yuzu_emu.R
-import org.yuzu.yuzu_emu.adapters.InstallableAdapter
-import org.yuzu.yuzu_emu.databinding.FragmentInstallablesBinding
-import org.yuzu.yuzu_emu.model.HomeViewModel
-import org.yuzu.yuzu_emu.model.Installable
-import org.yuzu.yuzu_emu.ui.main.MainActivity
-
-class InstallableFragment : Fragment() {
-    private var _binding: FragmentInstallablesBinding? = null
-    private val binding get() = _binding!!
-
-    private val homeViewModel: HomeViewModel by activityViewModels()
-
-    override fun onCreate(savedInstanceState: Bundle?) {
-        super.onCreate(savedInstanceState)
-        enterTransition = MaterialSharedAxis(MaterialSharedAxis.X, true)
-        returnTransition = MaterialSharedAxis(MaterialSharedAxis.X, false)
-        reenterTransition = MaterialSharedAxis(MaterialSharedAxis.X, false)
-    }
-
-    override fun onCreateView(
-        inflater: LayoutInflater,
-        container: ViewGroup?,
-        savedInstanceState: Bundle?
-    ): View {
-        _binding = FragmentInstallablesBinding.inflate(layoutInflater)
-        return binding.root
-    }
-
-    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
-        super.onViewCreated(view, savedInstanceState)
-
-        val mainActivity = requireActivity() as MainActivity
-
-        homeViewModel.setNavigationVisibility(visible = false, animated = true)
-        homeViewModel.setStatusBarShadeVisibility(visible = false)
-
-        binding.toolbarInstallables.setNavigationOnClickListener {
-            binding.root.findNavController().popBackStack()
-        }
-
-        val installables = listOf(
-            Installable(
-                R.string.user_data,
-                R.string.user_data_description,
-                install = { mainActivity.importUserData.launch(arrayOf("application/zip")) },
-                export = { mainActivity.exportUserData.launch("export.zip") }
-            ),
-            Installable(
-                R.string.install_game_content,
-                R.string.install_game_content_description,
-                install = { mainActivity.installGameUpdate.launch(arrayOf("*/*")) }
-            ),
-            Installable(
-                R.string.install_firmware,
-                R.string.install_firmware_description,
-                install = { mainActivity.getFirmware.launch(arrayOf("application/zip")) }
-            ),
-            if (mainActivity.savesFolderRoot != "") {
-                Installable(
-                    R.string.manage_save_data,
-                    R.string.import_export_saves_description,
-                    install = { mainActivity.importSaves.launch(arrayOf("application/zip")) },
-                    export = { mainActivity.exportSave() }
-                )
-            } else {
-                Installable(
-                    R.string.manage_save_data,
-                    R.string.import_export_saves_description,
-                    install = { mainActivity.importSaves.launch(arrayOf("application/zip")) }
-                )
-            },
-            Installable(
-                R.string.install_prod_keys,
-                R.string.install_prod_keys_description,
-                install = { mainActivity.getProdKey.launch(arrayOf("*/*")) }
-            ),
-            Installable(
-                R.string.install_amiibo_keys,
-                R.string.install_amiibo_keys_description,
-                install = { mainActivity.getAmiiboKey.launch(arrayOf("*/*")) }
-            )
-        )
-
-        binding.listInstallables.apply {
-            layoutManager = GridLayoutManager(
-                requireContext(),
-                resources.getInteger(R.integer.grid_columns)
-            )
-            adapter = InstallableAdapter(installables)
-        }
-
-        setInsets()
-    }
-
-    private fun setInsets() =
-        ViewCompat.setOnApplyWindowInsetsListener(
-            binding.root
-        ) { _: View, windowInsets: WindowInsetsCompat ->
-            val barInsets = windowInsets.getInsets(WindowInsetsCompat.Type.systemBars())
-            val cutoutInsets = windowInsets.getInsets(WindowInsetsCompat.Type.displayCutout())
-
-            val leftInsets = barInsets.left + cutoutInsets.left
-            val rightInsets = barInsets.right + cutoutInsets.right
-
-            val mlpAppBar = binding.toolbarInstallables.layoutParams as ViewGroup.MarginLayoutParams
-            mlpAppBar.leftMargin = leftInsets
-            mlpAppBar.rightMargin = rightInsets
-            binding.toolbarInstallables.layoutParams = mlpAppBar
-
-            val mlpScrollAbout =
-                binding.listInstallables.layoutParams as ViewGroup.MarginLayoutParams
-            mlpScrollAbout.leftMargin = leftInsets
-            mlpScrollAbout.rightMargin = rightInsets
-            binding.listInstallables.layoutParams = mlpScrollAbout
-
-            binding.listInstallables.updatePadding(bottom = barInsets.bottom)
-
-            windowInsets
-        }
-}

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

@@ -4,21 +4,14 @@
 package org.yuzu.yuzu_emu.fragments
 
 import android.app.Dialog
-import android.content.DialogInterface
 import android.content.Intent
 import android.net.Uri
 import android.os.Bundle
 import androidx.fragment.app.DialogFragment
-import androidx.fragment.app.FragmentActivity
-import androidx.fragment.app.activityViewModels
-import androidx.lifecycle.ViewModelProvider
 import com.google.android.material.dialog.MaterialAlertDialogBuilder
 import org.yuzu.yuzu_emu.R
-import org.yuzu.yuzu_emu.model.MessageDialogViewModel
 
 class MessageDialogFragment : DialogFragment() {
-    private val messageDialogViewModel: MessageDialogViewModel by activityViewModels()
-
     override fun onCreateDialog(savedInstanceState: Bundle?): Dialog {
         val titleId = requireArguments().getInt(TITLE_ID)
         val titleString = requireArguments().getString(TITLE_STRING)!!
@@ -44,12 +37,6 @@ class MessageDialogFragment : DialogFragment() {
         return dialog.show()
     }
 
-    override fun onDismiss(dialog: DialogInterface) {
-        super.onDismiss(dialog)
-        messageDialogViewModel.dismissAction.invoke()
-        messageDialogViewModel.clear()
-    }
-
     private fun openLink(link: String) {
         val intent = Intent(Intent.ACTION_VIEW, Uri.parse(link))
         startActivity(intent)
@@ -65,13 +52,11 @@ class MessageDialogFragment : DialogFragment() {
         private const val HELP_LINK = "Link"
 
         fun newInstance(
-            activity: FragmentActivity,
             titleId: Int = 0,
             titleString: String = "",
             descriptionId: Int = 0,
             descriptionString: String = "",
-            helpLinkId: Int = 0,
-            dismissAction: () -> Unit = {}
+            helpLinkId: Int = 0
         ): MessageDialogFragment {
             val dialog = MessageDialogFragment()
             val bundle = Bundle()
@@ -82,8 +67,6 @@ class MessageDialogFragment : DialogFragment() {
                 putString(DESCRIPTION_STRING, descriptionString)
                 putInt(HELP_LINK, helpLinkId)
             }
-            ViewModelProvider(activity)[MessageDialogViewModel::class.java].dismissAction =
-                dismissAction
             dialog.arguments = bundle
             return dialog
         }

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

@@ -295,10 +295,8 @@ class SetupFragment : Fragment() {
 
     override fun onSaveInstanceState(outState: Bundle) {
         super.onSaveInstanceState(outState)
-        if (_binding != null) {
-            outState.putBoolean(KEY_NEXT_VISIBILITY, binding.buttonNext.isVisible)
-            outState.putBoolean(KEY_BACK_VISIBILITY, binding.buttonBack.isVisible)
-        }
+        outState.putBoolean(KEY_NEXT_VISIBILITY, binding.buttonNext.isVisible)
+        outState.putBoolean(KEY_BACK_VISIBILITY, binding.buttonBack.isVisible)
         outState.putBooleanArray(KEY_HAS_BEEN_WARNED, hasBeenWarned)
     }
 
@@ -355,15 +353,11 @@ class SetupFragment : Fragment() {
     }
 
     fun pageForward() {
-        if (_binding != null) {
-            binding.viewPager2.currentItem += 1
-        }
+        binding.viewPager2.currentItem = binding.viewPager2.currentItem + 1
     }
 
     fun pageBackward() {
-        if (_binding != null) {
-            binding.viewPager2.currentItem -= 1
-        }
+        binding.viewPager2.currentItem = binding.viewPager2.currentItem - 1
     }
 
     fun setPageWarned(page: Int) {

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

@@ -1,13 +0,0 @@
-// SPDX-FileCopyrightText: 2023 yuzu Emulator Project
-// SPDX-License-Identifier: GPL-2.0-or-later
-
-package org.yuzu.yuzu_emu.model
-
-import androidx.annotation.StringRes
-
-data class Installable(
-    @StringRes val titleId: Int,
-    @StringRes val descriptionId: Int,
-    val install: (() -> Unit)? = null,
-    val export: (() -> Unit)? = null
-)

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

@@ -1,14 +0,0 @@
-// SPDX-FileCopyrightText: 2023 yuzu Emulator Project
-// SPDX-License-Identifier: GPL-2.0-or-later
-
-package org.yuzu.yuzu_emu.model
-
-import androidx.lifecycle.ViewModel
-
-class MessageDialogViewModel : ViewModel() {
-    var dismissAction: () -> Unit = {}
-
-    fun clear() {
-        dismissAction = {}
-    }
-}

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

@@ -20,20 +20,12 @@ class TaskViewModel : ViewModel() {
     val isRunning: StateFlow<Boolean> get() = _isRunning
     private val _isRunning = MutableStateFlow(false)
 
-    val cancelled: StateFlow<Boolean> get() = _cancelled
-    private val _cancelled = MutableStateFlow(false)
-
     lateinit var task: () -> Any
 
     fun clear() {
         _result.value = Any()
         _isComplete.value = false
         _isRunning.value = false
-        _cancelled.value = false
-    }
-
-    fun setCancelled(value: Boolean) {
-        _cancelled.value = value
     }
 
     fun runTask() {
@@ -50,9 +42,3 @@ class TaskViewModel : ViewModel() {
         }
     }
 }
-
-enum class TaskState {
-    Completed,
-    Failed,
-    Cancelled
-}

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

@@ -352,7 +352,7 @@ class InputOverlay(context: Context, attrs: AttributeSet?) :
     }
 
     private fun addOverlayControls(layout: String) {
-        val windowSize = getSafeScreenSize(context, Pair(measuredWidth, measuredHeight))
+        val windowSize = getSafeScreenSize(context)
         if (preferences.getBoolean(Settings.PREF_BUTTON_A, true)) {
             overlayButtons.add(
                 initializeOverlayButton(
@@ -593,7 +593,7 @@ class InputOverlay(context: Context, attrs: AttributeSet?) :
     }
 
     private fun saveControlPosition(prefId: String, x: Int, y: Int, layout: String) {
-        val windowSize = getSafeScreenSize(context, Pair(measuredWidth, measuredHeight))
+        val windowSize = getSafeScreenSize(context)
         val min = windowSize.first
         val max = windowSize.second
         PreferenceManager.getDefaultSharedPreferences(YuzuApplication.appContext).edit()
@@ -968,17 +968,14 @@ class InputOverlay(context: Context, attrs: AttributeSet?) :
          * @return A pair of points, the first being the top left corner of the safe area,
          *                  the second being the bottom right corner of the safe area
          */
-        private fun getSafeScreenSize(
-            context: Context,
-            screenSize: Pair<Int, Int>
-        ): Pair<Point, Point> {
+        private fun getSafeScreenSize(context: Context): Pair<Point, Point> {
             // Get screen size
             val windowMetrics = WindowMetricsCalculator.getOrCreate()
                 .computeCurrentWindowMetrics(context as Activity)
-            var maxX = screenSize.first.toFloat()
-            var maxY = screenSize.second.toFloat()
-            var minX = 0
+            var maxY = windowMetrics.bounds.height().toFloat()
+            var maxX = windowMetrics.bounds.width().toFloat()
             var minY = 0
+            var minX = 0
 
             // If we have API access, calculate the safe area to draw the overlay
             var cutoutLeft = 0

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

@@ -6,7 +6,6 @@ package org.yuzu.yuzu_emu.ui.main
 import android.content.Intent
 import android.net.Uri
 import android.os.Bundle
-import android.provider.DocumentsContract
 import android.view.View
 import android.view.ViewGroup.MarginLayoutParams
 import android.view.WindowManager
@@ -20,7 +19,6 @@ import androidx.core.splashscreen.SplashScreen.Companion.installSplashScreen
 import androidx.core.view.ViewCompat
 import androidx.core.view.WindowCompat
 import androidx.core.view.WindowInsetsCompat
-import androidx.documentfile.provider.DocumentFile
 import androidx.lifecycle.Lifecycle
 import androidx.lifecycle.lifecycleScope
 import androidx.lifecycle.repeatOnLifecycle
@@ -31,7 +29,6 @@ import androidx.preference.PreferenceManager
 import com.google.android.material.color.MaterialColors
 import com.google.android.material.dialog.MaterialAlertDialogBuilder
 import com.google.android.material.navigation.NavigationBarView
-import kotlinx.coroutines.CoroutineScope
 import java.io.File
 import java.io.FilenameFilter
 import java.io.IOException
@@ -44,40 +41,21 @@ import org.yuzu.yuzu_emu.R
 import org.yuzu.yuzu_emu.activities.EmulationActivity
 import org.yuzu.yuzu_emu.databinding.ActivityMainBinding
 import org.yuzu.yuzu_emu.databinding.DialogProgressBarBinding
-import org.yuzu.yuzu_emu.features.DocumentProvider
 import org.yuzu.yuzu_emu.features.settings.model.Settings
 import org.yuzu.yuzu_emu.fragments.IndeterminateProgressDialogFragment
 import org.yuzu.yuzu_emu.fragments.MessageDialogFragment
-import org.yuzu.yuzu_emu.getPublicFilesDir
 import org.yuzu.yuzu_emu.model.GamesViewModel
 import org.yuzu.yuzu_emu.model.HomeViewModel
-import org.yuzu.yuzu_emu.model.TaskState
-import org.yuzu.yuzu_emu.model.TaskViewModel
 import org.yuzu.yuzu_emu.utils.*
-import java.io.BufferedInputStream
-import java.io.BufferedOutputStream
-import java.io.FileOutputStream
-import java.time.LocalDateTime
-import java.time.format.DateTimeFormatter
-import java.util.zip.ZipEntry
-import java.util.zip.ZipInputStream
 
 class MainActivity : AppCompatActivity(), ThemeProvider {
     private lateinit var binding: ActivityMainBinding
 
     private val homeViewModel: HomeViewModel by viewModels()
     private val gamesViewModel: GamesViewModel by viewModels()
-    private val taskViewModel: TaskViewModel by viewModels()
 
     override var themeId: Int = 0
 
-    private val savesFolder
-        get() = "${getPublicFilesDir().canonicalPath}/nand/user/save/0000000000000000"
-
-    // Get first subfolder in saves folder (should be the user folder)
-    val savesFolderRoot get() = File(savesFolder).listFiles()?.firstOrNull()?.canonicalPath ?: ""
-    private var lastZipCreated: File? = null
-
     override fun onCreate(savedInstanceState: Bundle?) {
         val splashScreen = installSplashScreen()
         splashScreen.setKeepOnScreenCondition { !DirectoryInitialization.areDirectoriesReady }
@@ -329,7 +307,6 @@ class MainActivity : AppCompatActivity(), ThemeProvider {
     fun processKey(result: Uri): Boolean {
         if (FileUtil.getExtension(result) != "keys") {
             MessageDialogFragment.newInstance(
-                this,
                 titleId = R.string.reading_keys_failure,
                 descriptionId = R.string.install_prod_keys_failure_extension_description
             ).show(supportFragmentManager, MessageDialogFragment.TAG)
@@ -359,7 +336,6 @@ class MainActivity : AppCompatActivity(), ThemeProvider {
                 return true
             } else {
                 MessageDialogFragment.newInstance(
-                    this,
                     titleId = R.string.invalid_keys_error,
                     descriptionId = R.string.install_keys_failure_description,
                     helpLinkId = R.string.dumping_keys_quickstart_link
@@ -395,12 +371,11 @@ class MainActivity : AppCompatActivity(), ThemeProvider {
             val task: () -> Any = {
                 var messageToShow: Any
                 try {
-                    FileUtil.unzipToInternalStorage(BufferedInputStream(inputZip), cacheFirmwareDir)
+                    FileUtil.unzip(inputZip, cacheFirmwareDir)
                     val unfilteredNumOfFiles = cacheFirmwareDir.list()?.size ?: -1
                     val filteredNumOfFiles = cacheFirmwareDir.list(filterNCA)?.size ?: -2
                     messageToShow = if (unfilteredNumOfFiles != filteredNumOfFiles) {
                         MessageDialogFragment.newInstance(
-                            this,
                             titleId = R.string.firmware_installed_failure,
                             descriptionId = R.string.firmware_installed_failure_description
                         )
@@ -420,7 +395,7 @@ class MainActivity : AppCompatActivity(), ThemeProvider {
             IndeterminateProgressDialogFragment.newInstance(
                 this,
                 R.string.firmware_installing,
-                task = task
+                task
             ).show(supportFragmentManager, IndeterminateProgressDialogFragment.TAG)
         }
 
@@ -432,7 +407,6 @@ class MainActivity : AppCompatActivity(), ThemeProvider {
 
             if (FileUtil.getExtension(result) != "bin") {
                 MessageDialogFragment.newInstance(
-                    this,
                     titleId = R.string.reading_keys_failure,
                     descriptionId = R.string.install_amiibo_keys_failure_extension_description
                 ).show(supportFragmentManager, MessageDialogFragment.TAG)
@@ -460,7 +434,6 @@ class MainActivity : AppCompatActivity(), ThemeProvider {
                     ).show()
                 } else {
                     MessageDialogFragment.newInstance(
-                        this,
                         titleId = R.string.invalid_keys_error,
                         descriptionId = R.string.install_keys_failure_description,
                         helpLinkId = R.string.dumping_keys_quickstart_link
@@ -528,7 +501,7 @@ class MainActivity : AppCompatActivity(), ThemeProvider {
         if (documents.isNotEmpty()) {
             IndeterminateProgressDialogFragment.newInstance(
                 this@MainActivity,
-                R.string.installing_game_content
+                R.string.install_game_content
             ) {
                 var installSuccess = 0
                 var installOverwrite = 0
@@ -536,12 +509,7 @@ class MainActivity : AppCompatActivity(), ThemeProvider {
                 var errorExtension = 0
                 var errorOther = 0
                 documents.forEach {
-                    when (
-                        NativeLibrary.installFileToNand(
-                            it.toString(),
-                            FileUtil.getExtension(it)
-                        )
-                    ) {
+                    when (NativeLibrary.installFileToNand(it.toString())) {
                         NativeLibrary.InstallFileToNandResult.Success -> {
                             installSuccess += 1
                         }
@@ -615,14 +583,12 @@ class MainActivity : AppCompatActivity(), ThemeProvider {
                         installResult.append(separator)
                     }
                     return@newInstance MessageDialogFragment.newInstance(
-                        this,
                         titleId = R.string.install_game_content_failure,
                         descriptionString = installResult.toString().trim(),
                         helpLinkId = R.string.install_game_content_help_link
                     )
                 } else {
                     return@newInstance MessageDialogFragment.newInstance(
-                        this,
                         titleId = R.string.install_game_content_success,
                         descriptionString = installResult.toString().trim()
                     )
@@ -630,228 +596,4 @@ class MainActivity : AppCompatActivity(), ThemeProvider {
             }.show(supportFragmentManager, IndeterminateProgressDialogFragment.TAG)
         }
     }
-
-    val exportUserData = registerForActivityResult(
-        ActivityResultContracts.CreateDocument("application/zip")
-    ) { result ->
-        if (result == null) {
-            return@registerForActivityResult
-        }
-
-        IndeterminateProgressDialogFragment.newInstance(
-            this,
-            R.string.exporting_user_data,
-            true
-        ) {
-            val zipResult = FileUtil.zipFromInternalStorage(
-                File(DirectoryInitialization.userDirectory!!),
-                DirectoryInitialization.userDirectory!!,
-                BufferedOutputStream(contentResolver.openOutputStream(result)),
-                taskViewModel.cancelled
-            )
-            return@newInstance when (zipResult) {
-                TaskState.Completed -> getString(R.string.user_data_export_success)
-                TaskState.Failed -> R.string.export_failed
-                TaskState.Cancelled -> R.string.user_data_export_cancelled
-            }
-        }.show(supportFragmentManager, IndeterminateProgressDialogFragment.TAG)
-    }
-
-    val importUserData =
-        registerForActivityResult(ActivityResultContracts.OpenDocument()) { result ->
-            if (result == null) {
-                return@registerForActivityResult
-            }
-
-            IndeterminateProgressDialogFragment.newInstance(
-                this,
-                R.string.importing_user_data
-            ) {
-                val checkStream =
-                    ZipInputStream(BufferedInputStream(contentResolver.openInputStream(result)))
-                var isYuzuBackup = false
-                checkStream.use { stream ->
-                    var ze: ZipEntry? = null
-                    while (stream.nextEntry?.also { ze = it } != null) {
-                        val itemName = ze!!.name.trim()
-                        if (itemName == "/config/config.ini" || itemName == "config/config.ini") {
-                            isYuzuBackup = true
-                            return@use
-                        }
-                    }
-                }
-                if (!isYuzuBackup) {
-                    return@newInstance MessageDialogFragment.newInstance(
-                        this,
-                        titleId = R.string.invalid_yuzu_backup,
-                        descriptionId = R.string.user_data_import_failed_description
-                    )
-                }
-
-                // Clear existing user data
-                File(DirectoryInitialization.userDirectory!!).deleteRecursively()
-
-                // Copy archive to internal storage
-                try {
-                    FileUtil.unzipToInternalStorage(
-                        BufferedInputStream(contentResolver.openInputStream(result)),
-                        File(DirectoryInitialization.userDirectory!!)
-                    )
-                } catch (e: Exception) {
-                    return@newInstance MessageDialogFragment.newInstance(
-                        this,
-                        titleId = R.string.import_failed,
-                        descriptionId = R.string.user_data_import_failed_description
-                    )
-                }
-
-                // Reinitialize relevant data
-                NativeLibrary.initializeEmulation()
-                gamesViewModel.reloadGames(false)
-
-                return@newInstance getString(R.string.user_data_import_success)
-            }.show(supportFragmentManager, IndeterminateProgressDialogFragment.TAG)
-        }
-
-    /**
-     * Zips the save files located in the given folder path and creates a new zip file with the current date and time.
-     * @return true if the zip file is successfully created, false otherwise.
-     */
-    private fun zipSave(): Boolean {
-        try {
-            val tempFolder = File(getPublicFilesDir().canonicalPath, "temp")
-            tempFolder.mkdirs()
-            val saveFolder = File(savesFolderRoot)
-            val outputZipFile = File(
-                tempFolder,
-                "yuzu saves - ${
-                LocalDateTime.now().format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm"))
-                }.zip"
-            )
-            outputZipFile.createNewFile()
-            val result = FileUtil.zipFromInternalStorage(
-                saveFolder,
-                savesFolderRoot,
-                BufferedOutputStream(FileOutputStream(outputZipFile))
-            )
-            if (result == TaskState.Failed) {
-                return false
-            }
-            lastZipCreated = outputZipFile
-        } catch (e: Exception) {
-            return false
-        }
-        return true
-    }
-
-    /**
-     * Exports the save file located in the given folder path by creating a zip file and sharing it via intent.
-     */
-    fun exportSave() {
-        CoroutineScope(Dispatchers.IO).launch {
-            val wasZipCreated = zipSave()
-            val lastZipFile = lastZipCreated
-            if (!wasZipCreated || lastZipFile == null) {
-                withContext(Dispatchers.Main) {
-                    Toast.makeText(
-                        this@MainActivity,
-                        getString(R.string.export_save_failed),
-                        Toast.LENGTH_LONG
-                    ).show()
-                }
-                return@launch
-            }
-
-            withContext(Dispatchers.Main) {
-                val file = DocumentFile.fromSingleUri(
-                    this@MainActivity,
-                    DocumentsContract.buildDocumentUri(
-                        DocumentProvider.AUTHORITY,
-                        "${DocumentProvider.ROOT_ID}/temp/${lastZipFile.name}"
-                    )
-                )!!
-                val intent = Intent(Intent.ACTION_SEND)
-                    .setDataAndType(file.uri, "application/zip")
-                    .addFlags(Intent.FLAG_GRANT_READ_URI_PERMISSION)
-                    .putExtra(Intent.EXTRA_STREAM, file.uri)
-                startForResultExportSave.launch(
-                    Intent.createChooser(
-                        intent,
-                        getString(R.string.share_save_file)
-                    )
-                )
-            }
-        }
-    }
-
-    private val startForResultExportSave =
-        registerForActivityResult(ActivityResultContracts.StartActivityForResult()) { _ ->
-            File(getPublicFilesDir().canonicalPath, "temp").deleteRecursively()
-        }
-
-    val importSaves =
-        registerForActivityResult(ActivityResultContracts.OpenDocument()) { result ->
-            if (result == null) {
-                return@registerForActivityResult
-            }
-
-            NativeLibrary.initializeEmptyUserDirectory()
-
-            val inputZip = contentResolver.openInputStream(result)
-            // A zip needs to have at least one subfolder named after a TitleId in order to be considered valid.
-            var validZip = false
-            val savesFolder = File(savesFolderRoot)
-            val cacheSaveDir = File("${applicationContext.cacheDir.path}/saves/")
-            cacheSaveDir.mkdir()
-
-            if (inputZip == null) {
-                Toast.makeText(
-                    applicationContext,
-                    getString(R.string.fatal_error),
-                    Toast.LENGTH_LONG
-                ).show()
-                return@registerForActivityResult
-            }
-
-            val filterTitleId =
-                FilenameFilter { _, dirName -> dirName.matches(Regex("^0100[\\dA-Fa-f]{12}$")) }
-
-            try {
-                CoroutineScope(Dispatchers.IO).launch {
-                    FileUtil.unzipToInternalStorage(BufferedInputStream(inputZip), cacheSaveDir)
-                    cacheSaveDir.list(filterTitleId)?.forEach { savePath ->
-                        File(savesFolder, savePath).deleteRecursively()
-                        File(cacheSaveDir, savePath).copyRecursively(
-                            File(savesFolder, savePath),
-                            true
-                        )
-                        validZip = true
-                    }
-
-                    withContext(Dispatchers.Main) {
-                        if (!validZip) {
-                            MessageDialogFragment.newInstance(
-                                this@MainActivity,
-                                titleId = R.string.save_file_invalid_zip_structure,
-                                descriptionId = R.string.save_file_invalid_zip_structure_description
-                            ).show(supportFragmentManager, MessageDialogFragment.TAG)
-                            return@withContext
-                        }
-                        Toast.makeText(
-                            applicationContext,
-                            getString(R.string.save_file_imported_success),
-                            Toast.LENGTH_LONG
-                        ).show()
-                    }
-
-                    cacheSaveDir.deleteRecursively()
-                }
-            } catch (e: Exception) {
-                Toast.makeText(
-                    applicationContext,
-                    getString(R.string.fatal_error),
-                    Toast.LENGTH_LONG
-                ).show()
-            }
-        }
 }

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

@@ -8,7 +8,6 @@ import android.database.Cursor
 import android.net.Uri
 import android.provider.DocumentsContract
 import androidx.documentfile.provider.DocumentFile
-import kotlinx.coroutines.flow.StateFlow
 import java.io.BufferedInputStream
 import java.io.File
 import java.io.FileOutputStream
@@ -19,9 +18,6 @@ import java.util.zip.ZipEntry
 import java.util.zip.ZipInputStream
 import org.yuzu.yuzu_emu.YuzuApplication
 import org.yuzu.yuzu_emu.model.MinimalDocumentFile
-import org.yuzu.yuzu_emu.model.TaskState
-import java.io.BufferedOutputStream
-import java.util.zip.ZipOutputStream
 
 object FileUtil {
     const val PATH_TREE = "tree"
@@ -286,65 +282,30 @@ object FileUtil {
 
     /**
      * Extracts the given zip file into the given directory.
+     * @exception IOException if the file was being created outside of the target directory
      */
     @Throws(SecurityException::class)
-    fun unzipToInternalStorage(zipStream: BufferedInputStream, destDir: File) {
-        ZipInputStream(zipStream).use { zis ->
+    fun unzip(zipStream: InputStream, destDir: File): Boolean {
+        ZipInputStream(BufferedInputStream(zipStream)).use { zis ->
             var entry: ZipEntry? = zis.nextEntry
             while (entry != null) {
-                val newFile = File(destDir, entry.name)
-                val destinationDirectory = if (entry.isDirectory) newFile else newFile.parentFile
-
-                if (!newFile.canonicalPath.startsWith(destDir.canonicalPath + File.separator)) {
-                    throw SecurityException("Zip file attempted path traversal! ${entry.name}")
+                val entryName = entry.name
+                val entryFile = File(destDir, entryName)
+                if (!entryFile.canonicalPath.startsWith(destDir.canonicalPath + File.separator)) {
+                    throw SecurityException("Entry is outside of the target dir: " + entryFile.name)
                 }
-
-                if (!destinationDirectory.isDirectory && !destinationDirectory.mkdirs()) {
-                    throw IOException("Failed to create directory $destinationDirectory")
-                }
-
-                if (!entry.isDirectory) {
-                    newFile.outputStream().use { fos -> zis.copyTo(fos) }
+                if (entry.isDirectory) {
+                    entryFile.mkdirs()
+                } else {
+                    entryFile.parentFile?.mkdirs()
+                    entryFile.createNewFile()
+                    entryFile.outputStream().use { fos -> zis.copyTo(fos) }
                 }
                 entry = zis.nextEntry
             }
         }
-    }
 
-    /**
-     * Creates a zip file from a directory within internal storage
-     * @param inputFile File representation of the item that will be zipped
-     * @param rootDir Directory containing the inputFile
-     * @param outputStream Stream where the zip file will be output
-     */
-    fun zipFromInternalStorage(
-        inputFile: File,
-        rootDir: String,
-        outputStream: BufferedOutputStream,
-        cancelled: StateFlow<Boolean>? = null
-    ): TaskState {
-        try {
-            ZipOutputStream(outputStream).use { zos ->
-                inputFile.walkTopDown().forEach { file ->
-                    if (cancelled?.value == true) {
-                        return TaskState.Cancelled
-                    }
-
-                    if (!file.isDirectory) {
-                        val entryName =
-                            file.absolutePath.removePrefix(rootDir).removePrefix("/")
-                        val entry = ZipEntry(entryName)
-                        zos.putNextEntry(entry)
-                        if (file.isFile) {
-                            file.inputStream().use { fis -> fis.copyTo(zos) }
-                        }
-                    }
-                }
-            }
-        } catch (e: Exception) {
-            return TaskState.Failed
-        }
-        return TaskState.Completed
+        return true
     }
 
     fun isRootTreeUri(uri: Uri): Boolean {

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

@@ -11,12 +11,6 @@
 #include "jni/emu_window/emu_window.h"
 
 void EmuWindow_Android::OnSurfaceChanged(ANativeWindow* surface) {
-    m_window_width = ANativeWindow_getWidth(surface);
-    m_window_height = ANativeWindow_getHeight(surface);
-
-    // Ensures that we emulate with the correct aspect ratio.
-    UpdateCurrentFramebufferLayout(m_window_width, m_window_height);
-
     window_info.render_surface = reinterpret_cast<void*>(surface);
 }
 
@@ -68,8 +62,14 @@ EmuWindow_Android::EmuWindow_Android(InputCommon::InputSubsystem* input_subsyste
         return;
     }
 
-    OnSurfaceChanged(surface);
+    m_window_width = ANativeWindow_getWidth(surface);
+    m_window_height = ANativeWindow_getHeight(surface);
+
+    // Ensures that we emulate with the correct aspect ratio.
+    UpdateCurrentFramebufferLayout(m_window_width, m_window_height);
+
     window_info.type = Core::Frontend::WindowSystemType::Android;
+    window_info.render_surface = reinterpret_cast<void*>(surface);
 
     m_input_subsystem->Initialize();
 }

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

@@ -13,8 +13,6 @@
 
 #include <android/api-level.h>
 #include <android/native_window_jni.h>
-#include <common/fs/fs.h>
-#include <core/file_sys/savedata_factory.h>
 #include <core/loader/nro.h>
 #include <jni.h>
 
@@ -104,7 +102,7 @@ public:
         m_native_window = native_window;
     }
 
-    int InstallFileToNand(std::string filename, std::string file_extension) {
+    int InstallFileToNand(std::string filename) {
         jconst copy_func = [](const FileSys::VirtualFile& src, const FileSys::VirtualFile& dest,
                               std::size_t block_size) {
             if (src == nullptr || dest == nullptr) {
@@ -136,11 +134,15 @@ public:
         m_system.GetFileSystemController().CreateFactories(*m_vfs);
 
         [[maybe_unused]] std::shared_ptr<FileSys::NSP> nsp;
-        if (file_extension == "nsp") {
+        if (filename.ends_with("nsp")) {
             nsp = std::make_shared<FileSys::NSP>(m_vfs->OpenFile(filename, FileSys::Mode::Read));
             if (nsp->IsExtractedType()) {
                 return InstallError;
             }
+        } else if (filename.ends_with("xci")) {
+            jconst xci =
+                std::make_shared<FileSys::XCI>(m_vfs->OpenFile(filename, FileSys::Mode::Read));
+            nsp = xci->GetSecurePartitionNSP();
         } else {
             return ErrorFilenameExtension;
         }
@@ -605,10 +607,8 @@ void Java_org_yuzu_yuzu_1emu_NativeLibrary_setAppDirectory(JNIEnv* env, jobject
 }
 
 int Java_org_yuzu_yuzu_1emu_NativeLibrary_installFileToNand(JNIEnv* env, jobject instance,
-                                                            jstring j_file,
-                                                            jstring j_file_extension) {
-    return EmulationSession::GetInstance().InstallFileToNand(GetJString(env, j_file),
-                                                             GetJString(env, j_file_extension));
+                                                            [[maybe_unused]] jstring j_file) {
+    return EmulationSession::GetInstance().InstallFileToNand(GetJString(env, j_file));
 }
 
 void JNICALL Java_org_yuzu_yuzu_1emu_NativeLibrary_initializeGpuDriver(JNIEnv* env, jclass clazz,
@@ -879,24 +879,4 @@ void Java_org_yuzu_yuzu_1emu_NativeLibrary_submitInlineKeyboardInput(JNIEnv* env
     EmulationSession::GetInstance().SoftwareKeyboard()->SubmitInlineKeyboardInput(j_key_code);
 }
 
-void Java_org_yuzu_yuzu_1emu_NativeLibrary_initializeEmptyUserDirectory(JNIEnv* env,
-                                                                        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);
-
-    Service::Account::ProfileManager manager;
-    const auto user_id = manager.GetUser(static_cast<std::size_t>(0));
-    ASSERT(user_id);
-
-    const auto user_save_data_path = FileSys::SaveDataFactory::GetFullPath(
-        EmulationSession::GetInstance().System(), vfs_nand_dir, FileSys::SaveDataSpaceId::NandUser,
-        FileSys::SaveDataType::SaveData, 1, user_id->AsU128(), 0);
-
-    const auto full_path = Common::FS::ConcatPathSafe(nand_dir, user_save_data_path);
-    if (!Common::FS::CreateParentDirs(full_path)) {
-        LOG_WARNING(Frontend, "Failed to create full path of the default user's save directory");
-    }
-}
-
 } // extern "C"

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

@@ -1,9 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportWidth="24"
-    android:viewportHeight="24">
-    <path
-        android:fillColor="?attr/colorControlNormal"
-        android:pathData="M9,16h6v-6h4l-7,-7 -7,7h4zM5,18h14v2L5,20z" />
-</vector>

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

@@ -1,9 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportWidth="24"
-    android:viewportHeight="24">
-    <path
-        android:fillColor="?attr/colorControlNormal"
-        android:pathData="M19,9h-4V3H9v6H5l7,7 7,-7zM5,18v2h14v-2H5z" />
-</vector>

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

@@ -22,7 +22,7 @@
 
     <View
         android:id="@+id/navigation_bar_shade"
-        android:layout_width="0dp"
+        android:layout_width="match_parent"
         android:layout_height="1px"
         android:background="@android:color/transparent"
         android:clickable="false"

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

@@ -1,71 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<com.google.android.material.card.MaterialCardView 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"
-    style="?attr/materialCardViewOutlinedStyle"
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content"
-    android:layout_marginHorizontal="16dp"
-    android:layout_marginVertical="12dp">
-
-    <LinearLayout
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_margin="16dp"
-        android:orientation="horizontal"
-        android:layout_gravity="center">
-
-        <LinearLayout
-            android:layout_width="0dp"
-            android:layout_height="wrap_content"
-            android:layout_marginEnd="16dp"
-            android:layout_weight="1"
-            android:orientation="vertical">
-
-            <com.google.android.material.textview.MaterialTextView
-                android:id="@+id/title"
-                style="@style/TextAppearance.Material3.TitleMedium"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:text="@string/user_data"
-                android:textAlignment="viewStart" />
-
-            <com.google.android.material.textview.MaterialTextView
-                android:id="@+id/description"
-                style="@style/TextAppearance.Material3.BodyMedium"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_marginTop="6dp"
-                android:text="@string/user_data_description"
-                android:textAlignment="viewStart" />
-
-        </LinearLayout>
-
-        <Button
-            android:id="@+id/button_export"
-            style="@style/Widget.Material3.Button.IconButton.Filled.Tonal"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_gravity="center_vertical"
-            android:contentDescription="@string/export"
-            android:tooltipText="@string/export"
-            android:visibility="gone"
-            app:icon="@drawable/ic_export"
-            tools:visibility="visible" />
-
-        <Button
-            android:id="@+id/button_install"
-            style="@style/Widget.Material3.Button.IconButton.Filled.Tonal"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_gravity="center_vertical"
-            android:layout_marginStart="12dp"
-            android:contentDescription="@string/string_import"
-            android:tooltipText="@string/string_import"
-            android:visibility="gone"
-            app:icon="@drawable/ic_import"
-            tools:visibility="visible" />
-
-    </LinearLayout>
-
-</com.google.android.material.card.MaterialCardView>

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

@@ -1,8 +1,24 @@
 <?xml version="1.0" encoding="utf-8"?>
-<com.google.android.material.progressindicator.LinearProgressIndicator xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    android:id="@+id/progress_bar"
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
-    android:layout_height="wrap_content"
-    android:padding="24dp"
-    app:trackCornerRadius="4dp" />
+    android:layout_height="match_parent"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:orientation="vertical">
+
+    <com.google.android.material.progressindicator.LinearProgressIndicator
+        android:id="@+id/progress_bar"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_margin="24dp"
+        app:trackCornerRadius="4dp" />
+
+    <TextView
+        android:id="@+id/progress_text"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginLeft="24dp"
+        android:layout_marginRight="24dp"
+        android:layout_marginBottom="24dp"
+        android:gravity="end" />
+
+</LinearLayout>

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

@@ -32,8 +32,7 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_gravity="center"
-                android:focusable="false"
-                android:clickable="false">
+                android:focusable="false">
 
                 <androidx.constraintlayout.widget.ConstraintLayout
                     android:id="@+id/loading_layout"
@@ -156,7 +155,7 @@
         android:id="@+id/in_game_menu"
         android:layout_width="wrap_content"
         android:layout_height="match_parent"
-        android:layout_gravity="start"
+        android:layout_gravity="start|bottom"
         app:headerLayout="@layout/header_in_game"
         app:menu="@menu/menu_in_game"
         tools:visibility="gone" />

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

@@ -1,31 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<androidx.coordinatorlayout.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    android:id="@+id/coordinator_licenses"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:background="?attr/colorSurface">
-
-    <com.google.android.material.appbar.AppBarLayout
-        android:id="@+id/appbar_installables"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:fitsSystemWindows="true">
-
-        <com.google.android.material.appbar.MaterialToolbar
-            android:id="@+id/toolbar_installables"
-            android:layout_width="match_parent"
-            android:layout_height="?attr/actionBarSize"
-            app:title="@string/manage_yuzu_data"
-            app:navigationIcon="@drawable/ic_back" />
-
-    </com.google.android.material.appbar.AppBarLayout>
-
-    <androidx.recyclerview.widget.RecyclerView
-        android:id="@+id/list_installables"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:clipToPadding="false"
-        app:layout_behavior="@string/appbar_scrolling_view_behavior" />
-
-</androidx.coordinatorlayout.widget.CoordinatorLayout>

src/android/app/src/main/res/navigation/home_navigation.xml

@@ -19,9 +19,6 @@
         <action
             android:id="@+id/action_homeSettingsFragment_to_earlyAccessFragment"
             app:destination="@id/earlyAccessFragment" />
-        <action
-            android:id="@+id/action_homeSettingsFragment_to_installableFragment"
-            app:destination="@id/installableFragment" />
     </fragment>
 
     <fragment
@@ -91,9 +88,5 @@
     <action
         android:id="@+id/action_global_settingsActivity"
         app:destination="@id/settingsActivity" />
-    <fragment
-        android:id="@+id/installableFragment"
-        android:name="org.yuzu.yuzu_emu.fragments.InstallableFragment"
-        android:label="InstallableFragment" />
 
 </navigation>

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

@@ -79,6 +79,7 @@
     <string name="manage_save_data">Speicherdaten verwalten</string>
     <string name="manage_save_data_description">Speicherdaten gefunden. Bitte wähle unten eine Option aus.</string>
     <string name="import_export_saves_description">Speicherdaten importieren oder exportieren</string>
+    <string name="import_export_saves_no_profile">Keine Speicherdaten gefunden. Bitte starte ein Spiel und versuche es erneut.</string>
     <string name="save_file_imported_success">Erfolgreich importiert</string>
     <string name="save_file_invalid_zip_structure">Ungültige Speicherverzeichnisstruktur</string>
     <string name="save_file_invalid_zip_structure_description">Der erste Unterordnername muss die Titel-ID des Spiels sein.</string>

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

@@ -81,6 +81,7 @@
     <string name="manage_save_data">Administrar datos de guardado</string>
     <string name="manage_save_data_description">Guardar los datos encontrados. Por favor, seleccione una opción de abajo.</string>
     <string name="import_export_saves_description">Importar o exportar archivos de guardado</string>
+    <string name="import_export_saves_no_profile">No se han encontrado datos de guardado. Por favor, ejecute un juego y vuelva a intentarlo.</string>
     <string name="save_file_imported_success">Importado correctamente</string>
     <string name="save_file_invalid_zip_structure">Estructura del directorio de guardado no válido</string>
     <string name="save_file_invalid_zip_structure_description">El nombre de la primera subcarpeta debe ser el Title ID del juego.</string>

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

@@ -81,6 +81,7 @@
     <string name="manage_save_data">Gérer les données de sauvegarde</string>
     <string name="manage_save_data_description">Données de sauvegarde trouvées. Veuillez sélectionner une option ci-dessous.</string>
     <string name="import_export_saves_description">Importer ou exporter des fichiers de sauvegarde</string>
+    <string name="import_export_saves_no_profile">Aucune données de sauvegarde trouvées. Veuillez lancer un jeu et réessayer.</string>
     <string name="save_file_imported_success">Importé avec succès</string>
     <string name="save_file_invalid_zip_structure">Structure de répertoire de sauvegarde non valide</string>
     <string name="save_file_invalid_zip_structure_description">Le nom du premier sous-dossier doit être l\'identifiant du titre du jeu.</string>

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

@@ -81,6 +81,7 @@
     <string name="manage_save_data">Gestisci i salvataggi</string>
     <string name="manage_save_data_description">Salvataggio non trovato. Seleziona un\'opzione di seguito.</string>
     <string name="import_export_saves_description">Importa o esporta i salvataggi</string>
+    <string name="import_export_saves_no_profile">Nessun salvataggio trovato. Avvia un gioco e riprova.</string>
     <string name="save_file_imported_success">Importato con successo</string>
     <string name="save_file_invalid_zip_structure">La struttura della cartella dei salvataggi è invalida</string>
     <string name="save_file_invalid_zip_structure_description">La prima sotto cartella <b>deve</b> chiamarsi come l\'ID del titolo del gioco.</string>

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

@@ -80,6 +80,7 @@
     <string name="manage_save_data">セーブデータを管理</string>
     <string name="manage_save_data_description">セーブデータが見つかりました。以下のオプションから選択してください。</string>
     <string name="import_export_saves_description">セーブファイルをインポート/エクスポート</string>
+    <string name="import_export_saves_no_profile">セーブデータがありません。ゲームを起動してから再度お試しください。</string>
     <string name="save_file_imported_success">インポートが完了しました</string>
     <string name="save_file_invalid_zip_structure">セーブデータのディレクトリ構造が無効です</string>
     <string name="save_file_invalid_zip_structure_description">最初のサブフォルダ名は、ゲームのタイトルIDである必要があります。</string>

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

@@ -81,6 +81,7 @@
     <string name="manage_save_data">저장 데이터 관리</string>
     <string name="manage_save_data_description">데이터를 저장했습니다. 아래에서 옵션을 선택하세요.</string>
     <string name="import_export_saves_description">저장 파일 가져오기 또는 내보내기</string>
+    <string name="import_export_saves_no_profile">저장 데이터를 찾을 수 없습니다. 게임을 실행한 후 다시 시도하세요.</string>
     <string name="save_file_imported_success">가져오기 성공</string>
     <string name="save_file_invalid_zip_structure">저장 디렉터리 구조가 잘못됨</string>
     <string name="save_file_invalid_zip_structure_description">첫 번째 하위 폴더 이름은 게임의 타이틀 ID여야 합니다.</string>

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

@@ -81,6 +81,7 @@
     <string name="manage_save_data">Administrere lagringsdata</string>
     <string name="manage_save_data_description">Lagringsdata funnet. Velg et alternativ nedenfor.</string>
     <string name="import_export_saves_description">Importer eller eksporter lagringsfiler</string>
+    <string name="import_export_saves_no_profile">Ingen lagringsdata funnet. Start et nytt spill og prøv på nytt.</string>
     <string name="save_file_imported_success">Vellykket import</string>
     <string name="save_file_invalid_zip_structure">Ugyldig struktur for lagringskatalog</string>
     <string name="save_file_invalid_zip_structure_description">Det første undermappenavnet må være spillets tittel-ID.</string>

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

@@ -81,6 +81,7 @@
     <string name="manage_save_data">Zarządzaj plikami zapisów gier</string>
     <string name="manage_save_data_description">Znaleziono pliki zapisów gier. Wybierz opcję poniżej.</string>
     <string name="import_export_saves_description">Importuj lub wyeksportuj pliki zapisów</string>
+    <string name="import_export_saves_no_profile">Nie znaleziono plików zapisów. Uruchom grę i spróbuj ponownie.</string>
     <string name="save_file_imported_success">Zaimportowano pomyślnie</string>
     <string name="save_file_invalid_zip_structure">Niepoprawna struktura folderów</string>
     <string name="save_file_invalid_zip_structure_description">Pierwszy podkatalog musi zawierać w nazwie numer ID tytułu gry.</string>

src/android/app/src/main/res/values-pt-rBR/strings.xml

@@ -81,6 +81,7 @@
     <string name="manage_save_data">Gerir dados guardados</string>
     <string name="manage_save_data_description">Dados não encontrados. Por favor seleciona uma opção abaixo.</string>
     <string name="import_export_saves_description">Importa ou exporta dados guardados</string>
+    <string name="import_export_saves_no_profile">Dados não encontrados. Por favor lança o jogo e tenta novamente.</string>
     <string name="save_file_imported_success">Importado com sucesso</string>
     <string name="save_file_invalid_zip_structure">Estrutura de diretório de dados invalida</string>
     <string name="save_file_invalid_zip_structure_description">O nome da primeira sub pasta tem de ser a ID do jogo.</string>

src/android/app/src/main/res/values-pt-rPT/strings.xml

@@ -81,6 +81,7 @@
     <string name="manage_save_data">Gerir dados guardados</string>
     <string name="manage_save_data_description">Dados não encontrados. Por favor seleciona uma opção abaixo.</string>
     <string name="import_export_saves_description">Importa ou exporta dados guardados</string>
+    <string name="import_export_saves_no_profile">Dados não encontrados. Por favor lança o jogo e tenta novamente.</string>
     <string name="save_file_imported_success">Importado com sucesso</string>
     <string name="save_file_invalid_zip_structure">Estrutura de diretório de dados invalida</string>
     <string name="save_file_invalid_zip_structure_description">O nome da primeira sub pasta tem de ser a ID do jogo.</string>

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

@@ -81,6 +81,7 @@
     <string name="manage_save_data">Управление данными сохранений</string>
     <string name="manage_save_data_description">Найдено данные сохранений. Пожалуйста, выберите вариант ниже.</string>
     <string name="import_export_saves_description">Импорт или экспорт файлов сохранения</string>
+    <string name="import_export_saves_no_profile">Данные сохранений не найдены. Пожалуйста, запустите игру и повторите попытку.</string>
     <string name="save_file_imported_success">Успешно импортировано</string>
     <string name="save_file_invalid_zip_structure">Недопустимая структура папки сохранения</string>
     <string name="save_file_invalid_zip_structure_description">Название первой вложенной папки должно быть идентификатором игры.</string>

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

@@ -81,6 +81,7 @@
     <string name="manage_save_data">Керування даними збережень</string>
     <string name="manage_save_data_description">Знайдено дані збережень. Будь ласка, виберіть варіант нижче.</string>
     <string name="import_export_saves_description">Імпорт або експорт файлів збереження</string>
+    <string name="import_export_saves_no_profile">Дані збережень не знайдено. Будь ласка, запустіть гру та повторіть спробу.</string>
     <string name="save_file_imported_success">Успішно імпортовано</string>
     <string name="save_file_invalid_zip_structure">Неприпустима структура папки збереження</string>
     <string name="save_file_invalid_zip_structure_description">Назва першої вкладеної папки має бути ідентифікатором гри.</string>

src/android/app/src/main/res/values-w600dp/integers.xml

@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-
-    <integer name="grid_columns">2</integer>
-
-</resources>

src/android/app/src/main/res/values-zh-rCN/strings.xml

@@ -81,6 +81,7 @@
     <string name="manage_save_data">管理存档数据</string>
     <string name="manage_save_data_description">已找到存档数据，请选择下方的选项。</string>
     <string name="import_export_saves_description">导入或导出存档</string>
+    <string name="import_export_saves_no_profile">找不到存档数据，请启动游戏并重试。</string>
     <string name="save_file_imported_success">已成功导入存档</string>
     <string name="save_file_invalid_zip_structure">无效的存档目录</string>
     <string name="save_file_invalid_zip_structure_description">第一个子文件夹名称必须为当前游戏的 ID。</string>

src/android/app/src/main/res/values-zh-rTW/strings.xml

@@ -81,6 +81,7 @@
     <string name="manage_save_data">管理儲存資料</string>
     <string name="manage_save_data_description">已找到儲存資料，請選取下方的選項。</string>
     <string name="import_export_saves_description">匯入或匯出儲存檔案</string>
+    <string name="import_export_saves_no_profile">找不到儲存資料，請啟動遊戲並重試。</string>
     <string name="save_file_imported_success">已成功匯入</string>
     <string name="save_file_invalid_zip_structure">無效的儲存目錄結構</string>
     <string name="save_file_invalid_zip_structure_description">首個子資料夾名稱必須為遊戲標題 ID。</string>

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

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <integer name="grid_columns">1</integer>
+    <integer name="game_title_lines">2</integer>
 
     <!-- Default SWITCH landscape layout -->
     <integer name="SWITCH_BUTTON_A_X">760</integer>

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

@@ -90,6 +90,7 @@
     <string name="manage_save_data">Manage save data</string>
     <string name="manage_save_data_description">Save data found. Please select an option below.</string>
     <string name="import_export_saves_description">Import or export save files</string>
+    <string name="import_export_saves_no_profile">No save data found. Please launch a game and retry.</string>
     <string name="save_file_imported_success">Imported successfully</string>
     <string name="save_file_invalid_zip_structure">Invalid save directory structure</string>
     <string name="save_file_invalid_zip_structure_description">The first subfolder name must be the title ID of the game.</string>
@@ -100,13 +101,12 @@
     <string name="firmware_installing">Installing firmware</string>
     <string name="firmware_installed_success">Firmware installed successfully</string>
     <string name="firmware_installed_failure">Firmware installation failed</string>
-    <string name="firmware_installed_failure_description">Make sure the firmware nca files are at the root of the zip and try again.</string>
+    <string name="firmware_installed_failure_description">Verify that the ZIP contains valid firmware and try again.</string>
     <string name="share_log">Share debug logs</string>
     <string name="share_log_description">Share yuzu\'s log file to debug issues</string>
     <string name="share_log_missing">No log file found</string>
     <string name="install_game_content">Install game content</string>
     <string name="install_game_content_description">Install game updates or DLC</string>
-    <string name="installing_game_content">Installing content…</string>
     <string name="install_game_content_failure">Error installing file(s) to NAND</string>
     <string name="install_game_content_failure_description">Please ensure content(s) are valid and that the prod.keys file is installed.</string>
     <string name="install_game_content_failure_base">Installation of base games isn\'t permitted in order to avoid possible conflicts.</string>
@@ -118,10 +118,6 @@
     <string name="install_game_content_help_link">https://yuzu-emu.org/help/quickstart/#dumping-installed-updates</string>
     <string name="custom_driver_not_supported">Custom drivers not supported</string>
     <string name="custom_driver_not_supported_description">Custom driver loading isn\'t currently supported for this device.\nCheck this option again in the future to see if support was added!</string>
-    <string name="manage_yuzu_data">Manage yuzu data</string>
-    <string name="manage_yuzu_data_description">Import/export firmware, keys, user data, and more!</string>
-    <string name="share_save_file">Share save file</string>
-    <string name="export_save_failed">Failed to export save</string>
 
     <!-- About screen strings -->
     <string name="gaia_is_not_real">Gaia isn\'t real</string>
@@ -132,16 +128,6 @@
     <string name="contributors_link">https://github.com/yuzu-emu/yuzu/graphs/contributors</string>
     <string name="licenses_description">Projects that make yuzu for Android possible</string>
     <string name="build">Build</string>
-    <string name="user_data">User data</string>
-    <string name="user_data_description">Import/export all app data.\n\nWhen importing user data, all existing user data will be deleted!</string>
-    <string name="exporting_user_data">Exporting user data…</string>
-    <string name="importing_user_data">Importing user data…</string>
-    <string name="import_user_data">Import user data</string>
-    <string name="invalid_yuzu_backup">Invalid yuzu backup</string>
-    <string name="user_data_export_success">User data exported successfully</string>
-    <string name="user_data_import_success">User data imported successfully</string>
-    <string name="user_data_export_cancelled">Export cancelled</string>
-    <string name="user_data_import_failed_description">Make sure the user data folders are at the root of the zip folder and contain a config file at config/config.ini and try again.</string>
     <string name="support_link">https://discord.gg/u77vRWY</string>
     <string name="website_link">https://yuzu-emu.org/</string>
     <string name="github_link">https://github.com/yuzu-emu</string>
@@ -229,11 +215,6 @@
     <string name="auto">Auto</string>
     <string name="submit">Submit</string>
     <string name="string_null">Null</string>
-    <string name="string_import">Import</string>
-    <string name="export">Export</string>
-    <string name="export_failed">Export failed</string>
-    <string name="import_failed">Import failed</string>
-    <string name="cancelling">Cancelling</string>
 
     <!-- GPU driver installation -->
     <string name="select_gpu_driver">Select GPU driver</string>
@@ -300,7 +281,6 @@
     <string name="performance_warning">Turning off this setting will significantly reduce emulation performance! For the best experience, it is recommended that you leave this setting enabled.</string>
     <string name="device_memory_inadequate">Device RAM: %1$s\nRecommended: %2$s</string>
     <string name="memory_formatted">%1$s %2$s</string>
-    <string name="no_game_present">No bootable game present!</string>
 
     <!-- Region Names -->
     <string name="region_japan">Japan</string>

src/audio_core/renderer/command/command_processing_time_estimator.cpp

@@ -27,12 +27,12 @@ u32 CommandProcessingTimeEstimatorVersion1::Estimate(
 
 u32 CommandProcessingTimeEstimatorVersion1::Estimate(
     const AdpcmDataSourceVersion1Command& command) const {
-    return static_cast<u32>(command.pitch * 0.46f * 1.2f);
+    return static_cast<u32>(command.pitch * 0.25f * 1.2f);
 }
 
 u32 CommandProcessingTimeEstimatorVersion1::Estimate(
     const AdpcmDataSourceVersion2Command& command) const {
-    return static_cast<u32>(command.pitch * 0.46f * 1.2f);
+    return static_cast<u32>(command.pitch * 0.25f * 1.2f);
 }
 
 u32 CommandProcessingTimeEstimatorVersion1::Estimate(

src/audio_core/renderer/system.cpp

@@ -684,11 +684,11 @@ u64 System::GenerateCommand(std::span<u8> in_command_buffer,
                                        sink_context,   splitter_context,     perf_manager};
 
     voice_context.SortInfo();
-    command_generator.GenerateVoiceCommands();
 
     const auto start_estimated_time{drop_voice_param *
                                     static_cast<f32>(command_buffer.estimated_process_time)};
 
+    command_generator.GenerateVoiceCommands();
     command_generator.GenerateSubMixCommands();
     command_generator.GenerateFinalMixCommands();
     command_generator.GenerateSinkCommands();
@@ -708,13 +708,11 @@ u64 System::GenerateCommand(std::span<u8> in_command_buffer,
 
         const auto end_estimated_time{drop_voice_param *
                                       static_cast<f32>(command_buffer.estimated_process_time)};
-
-        const auto dsp_time_limit{((time_limit_percent / 100.0f) * 2'880'000.0f) *
-                                  (static_cast<f32>(render_time_limit_percent) / 100.0f)};
-
         const auto estimated_time{start_estimated_time - end_estimated_time};
 
-        const auto time_limit{static_cast<u32>(std::max(dsp_time_limit + estimated_time, 0.0f))};
+        const auto time_limit{static_cast<u32>(
+            estimated_time + (((time_limit_percent / 100.0f) * 2'880'000.0) *
+                              (static_cast<f32>(render_time_limit_percent) / 100.0f)))};
         num_voices_dropped =
             DropVoices(command_buffer, static_cast<u32>(start_estimated_time), time_limit);
     }

src/common/settings.cpp

@@ -130,17 +130,13 @@ void LogSettings() {
     log_path("DataStorage_SDMCDir", Common::FS::GetYuzuPath(Common::FS::YuzuPath::SDMCDir));
 }
 
-void UpdateGPUAccuracy() {
-    values.current_gpu_accuracy = values.gpu_accuracy.GetValue();
-}
-
 bool IsGPULevelExtreme() {
-    return values.current_gpu_accuracy == GpuAccuracy::Extreme;
+    return values.gpu_accuracy.GetValue() == GpuAccuracy::Extreme;
 }
 
 bool IsGPULevelHigh() {
-    return values.current_gpu_accuracy == GpuAccuracy::Extreme ||
-           values.current_gpu_accuracy == GpuAccuracy::High;
+    return values.gpu_accuracy.GetValue() == GpuAccuracy::Extreme ||
+           values.gpu_accuracy.GetValue() == GpuAccuracy::High;
 }
 
 bool IsFastmemEnabled() {

src/common/settings.h

@@ -307,7 +307,6 @@ struct Values {
                                                       Specialization::Default,
                                                       true,
                                                       true};
-    GpuAccuracy current_gpu_accuracy{GpuAccuracy::High};
     SwitchableSetting<AnisotropyMode, true> max_anisotropy{
         linkage,          AnisotropyMode::Automatic, AnisotropyMode::Automatic, AnisotropyMode::X16,
         "max_anisotropy", Category::RendererAdvanced};
@@ -351,8 +350,6 @@ struct Values {
         linkage, false, "disable_shader_loop_safety_checks", Category::RendererDebug};
     Setting<bool> enable_renderdoc_hotkey{linkage, false, "renderdoc_hotkey",
                                           Category::RendererDebug};
-    // TODO: remove this once AMDVLK supports VK_EXT_depth_bias_control
-    bool renderer_amdvlk_depth_bias_workaround{};
 
     // System
     SwitchableSetting<Language, true> language_index{linkage,
@@ -525,7 +522,6 @@ struct Values {
 
 extern Values values;
 
-void UpdateGPUAccuracy();
 bool IsGPULevelExtreme();
 bool IsGPULevelHigh();
 

src/common/settings_setting.h

@@ -187,8 +187,6 @@ public:
                 this->SetValue(input == "true");
             } else if constexpr (std::is_same_v<Type, float>) {
                 this->SetValue(std::stof(input));
-            } else if constexpr (std::is_same_v<Type, AudioEngine>) {
-                this->SetValue(ToEnum<AudioEngine>(input));
             } else {
                 this->SetValue(static_cast<Type>(std::stoll(input)));
             }

src/core/CMakeLists.txt

@@ -596,10 +596,6 @@ add_library(core STATIC
     hle/service/mii/types/ver3_store_data.h
     hle/service/mii/mii.cpp
     hle/service/mii/mii.h
-    hle/service/mii/mii_database.cpp
-    hle/service/mii/mii_database.h
-    hle/service/mii/mii_database_manager.cpp
-    hle/service/mii/mii_database_manager.h
     hle/service/mii/mii_manager.cpp
     hle/service/mii/mii_manager.h
     hle/service/mii/mii_result.h
@@ -894,7 +890,7 @@ endif()
 create_target_directory_groups(core)
 
 target_link_libraries(core PUBLIC common PRIVATE audio_core network video_core nx_tzdb)
-target_link_libraries(core PUBLIC Boost::headers PRIVATE fmt::fmt nlohmann_json::nlohmann_json mbedtls RenderDoc::API)
+target_link_libraries(core PUBLIC Boost::headers PRIVATE fmt::fmt nlohmann_json::nlohmann_json mbedtls renderdoc)
 if (MINGW)
     target_link_libraries(core PRIVATE ${MSWSOCK_LIBRARY})
 endif()

src/core/core.cpp

@@ -381,10 +381,6 @@ struct System::Impl {
             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;
-
         status = SystemResultStatus::Success;
         return status;
     }
@@ -444,9 +440,6 @@ struct System::Impl {
             room_member->SendGameInfo(game_info);
         }
 
-        // Workarounds
-        Settings::values.renderer_amdvlk_depth_bias_workaround = false;
-
         LOG_DEBUG(Core, "Shutdown OK");
     }
 

src/core/core_timing.cpp

@@ -32,7 +32,6 @@ struct CoreTiming::Event {
     std::uintptr_t user_data;
     std::weak_ptr<EventType> type;
     s64 reschedule_time;
-    heap_t::handle_type handle{};
 
     // Sort by time, unless the times are the same, in which case sort by
     // the order added to the queue
@@ -123,9 +122,9 @@ void CoreTiming::ScheduleEvent(std::chrono::nanoseconds ns_into_future,
         std::scoped_lock scope{basic_lock};
         const auto next_time{absolute_time ? ns_into_future : GetGlobalTimeNs() + ns_into_future};
 
-        auto h{event_queue.emplace(
-            Event{next_time.count(), event_fifo_id++, user_data, event_type, 0})};
-        (*h).handle = h;
+        event_queue.emplace_back(
+            Event{next_time.count(), event_fifo_id++, user_data, event_type, 0});
+        std::push_heap(event_queue.begin(), event_queue.end(), std::greater<>());
     }
 
     event.Set();
@@ -139,9 +138,10 @@ void CoreTiming::ScheduleLoopingEvent(std::chrono::nanoseconds start_time,
         std::scoped_lock scope{basic_lock};
         const auto next_time{absolute_time ? start_time : GetGlobalTimeNs() + start_time};
 
-        auto h{event_queue.emplace(Event{next_time.count(), event_fifo_id++, user_data, event_type,
-                                         resched_time.count()})};
-        (*h).handle = h;
+        event_queue.emplace_back(
+            Event{next_time.count(), event_fifo_id++, user_data, event_type, resched_time.count()});
+
+        std::push_heap(event_queue.begin(), event_queue.end(), std::greater<>());
     }
 
     event.Set();
@@ -151,17 +151,15 @@ void CoreTiming::UnscheduleEvent(const std::shared_ptr<EventType>& event_type,
                                  std::uintptr_t user_data, bool wait) {
     {
         std::scoped_lock lk{basic_lock};
+        const auto itr =
+            std::remove_if(event_queue.begin(), event_queue.end(), [&](const Event& e) {
+                return e.type.lock().get() == event_type.get() && e.user_data == user_data;
+            });
 
-        std::vector<heap_t::handle_type> to_remove;
-        for (auto itr = event_queue.begin(); itr != event_queue.end(); itr++) {
-            const Event& e = *itr;
-            if (e.type.lock().get() == event_type.get() && e.user_data == user_data) {
-                to_remove.push_back(itr->handle);
-            }
-        }
-
-        for (auto h : to_remove) {
-            event_queue.erase(h);
+        // Removing random items breaks the invariant so we have to re-establish it.
+        if (itr != event_queue.end()) {
+            event_queue.erase(itr, event_queue.end());
+            std::make_heap(event_queue.begin(), event_queue.end(), std::greater<>());
         }
     }
 
@@ -202,45 +200,35 @@ std::optional<s64> CoreTiming::Advance() {
     std::scoped_lock lock{advance_lock, basic_lock};
     global_timer = GetGlobalTimeNs().count();
 
-    while (!event_queue.empty() && event_queue.top().time <= global_timer) {
-        const Event& evt = event_queue.top();
+    while (!event_queue.empty() && event_queue.front().time <= global_timer) {
+        Event evt = std::move(event_queue.front());
+        std::pop_heap(event_queue.begin(), event_queue.end(), std::greater<>());
+        event_queue.pop_back();
 
         if (const auto event_type{evt.type.lock()}) {
-            if (evt.reschedule_time == 0) {
-                const auto evt_user_data = evt.user_data;
-                const auto evt_time = evt.time;
+            basic_lock.unlock();
 
-                event_queue.pop();
+            const auto new_schedule_time{event_type->callback(
+                evt.user_data, evt.time,
+                std::chrono::nanoseconds{GetGlobalTimeNs().count() - evt.time})};
 
-                basic_lock.unlock();
-
-                event_type->callback(
-                    evt_user_data, evt_time,
-                    std::chrono::nanoseconds{GetGlobalTimeNs().count() - evt_time});
-
-                basic_lock.lock();
-            } else {
-                basic_lock.unlock();
-
-                const auto new_schedule_time{event_type->callback(
-                    evt.user_data, evt.time,
-                    std::chrono::nanoseconds{GetGlobalTimeNs().count() - evt.time})};
-
-                basic_lock.lock();
+            basic_lock.lock();
 
+            if (evt.reschedule_time != 0) {
                 const auto next_schedule_time{new_schedule_time.has_value()
                                                   ? new_schedule_time.value().count()
                                                   : evt.reschedule_time};
 
-                // If this event was scheduled into a pause, its time now is going to be way
-                // behind. Re-set this event to continue from the end of the pause.
+                // If this event was scheduled into a pause, its time now is going to be way behind.
+                // Re-set this event to continue from the end of the pause.
                 auto next_time{evt.time + next_schedule_time};
                 if (evt.time < pause_end_time) {
                     next_time = pause_end_time + next_schedule_time;
                 }
 
-                event_queue.update(evt.handle, Event{next_time, event_fifo_id++, evt.user_data,
-                                                     evt.type, next_schedule_time, evt.handle});
+                event_queue.emplace_back(
+                    Event{next_time, event_fifo_id++, evt.user_data, evt.type, next_schedule_time});
+                std::push_heap(event_queue.begin(), event_queue.end(), std::greater<>());
             }
         }
 
@@ -248,7 +236,7 @@ std::optional<s64> CoreTiming::Advance() {
     }
 
     if (!event_queue.empty()) {
-        return event_queue.top().time;
+        return event_queue.front().time;
     } else {
         return std::nullopt;
     }
@@ -286,8 +274,7 @@ void CoreTiming::ThreadLoop() {
 #endif
                 }
             } else {
-                // Queue is empty, wait until another event is scheduled and signals us to
-                // continue.
+                // Queue is empty, wait until another event is scheduled and signals us to continue.
                 wait_set = true;
                 event.Wait();
             }

src/core/core_timing.h

@@ -11,8 +11,7 @@
 #include <optional>
 #include <string>
 #include <thread>
-
-#include <boost/heap/fibonacci_heap.hpp>
+#include <vector>
 
 #include "common/common_types.h"
 #include "common/thread.h"
@@ -152,10 +151,11 @@ private:
     s64 timer_resolution_ns;
 #endif
 
-    using heap_t =
-        boost::heap::fibonacci_heap<CoreTiming::Event, boost::heap::compare<std::greater<>>>;
-
-    heap_t event_queue;
+    // The queue is a min-heap using std::make_heap/push_heap/pop_heap.
+    // We don't use std::priority_queue because we need to be able to serialize, unserialize and
+    // erase arbitrary events (RemoveEvent()) regardless of the queue order. These aren't
+    // accommodated by the standard adaptor class.
+    std::vector<Event> event_queue;
     u64 event_fifo_id = 0;
 
     std::shared_ptr<EventType> ev_lost;

src/core/file_sys/partition_filesystem.cpp

@@ -47,7 +47,6 @@ PartitionFilesystem::PartitionFilesystem(VirtualFile file) {
     // Actually read in now...
     std::vector<u8> file_data = file->ReadBytes(metadata_size);
     const std::size_t total_size = file_data.size();
-    file_data.push_back(0);
 
     if (total_size != metadata_size) {
         status = Loader::ResultStatus::ErrorIncorrectPFSFileSize;

src/core/hid/emulated_controller.cpp

@@ -542,7 +542,6 @@ void EmulatedController::UnloadInput() {
 }
 
 void EmulatedController::EnableConfiguration() {
-    std::scoped_lock lock{connect_mutex, npad_mutex};
     is_configuring = true;
     tmp_is_connected = is_connected;
     tmp_npad_type = npad_type;
@@ -1557,7 +1556,7 @@ void EmulatedController::Connect(bool use_temporary_value) {
 
     auto trigger_guard =
         SCOPE_GUARD({ TriggerOnChange(ControllerTriggerType::Connected, !is_configuring); });
-    std::scoped_lock lock{connect_mutex, mutex};
+    std::scoped_lock lock{mutex};
     if (is_configuring) {
         tmp_is_connected = true;
         return;
@@ -1573,7 +1572,7 @@ void EmulatedController::Connect(bool use_temporary_value) {
 void EmulatedController::Disconnect() {
     auto trigger_guard =
         SCOPE_GUARD({ TriggerOnChange(ControllerTriggerType::Disconnected, !is_configuring); });
-    std::scoped_lock lock{connect_mutex, mutex};
+    std::scoped_lock lock{mutex};
     if (is_configuring) {
         tmp_is_connected = false;
         return;
@@ -1587,7 +1586,7 @@ void EmulatedController::Disconnect() {
 }
 
 bool EmulatedController::IsConnected(bool get_temporary_value) const {
-    std::scoped_lock lock{connect_mutex};
+    std::scoped_lock lock{mutex};
     if (get_temporary_value && is_configuring) {
         return tmp_is_connected;
     }
@@ -1600,7 +1599,7 @@ NpadIdType EmulatedController::GetNpadIdType() const {
 }
 
 NpadStyleIndex EmulatedController::GetNpadStyleIndex(bool get_temporary_value) const {
-    std::scoped_lock lock{npad_mutex};
+    std::scoped_lock lock{mutex};
     if (get_temporary_value && is_configuring) {
         return tmp_npad_type;
     }
@@ -1610,7 +1609,7 @@ NpadStyleIndex EmulatedController::GetNpadStyleIndex(bool get_temporary_value) c
 void EmulatedController::SetNpadStyleIndex(NpadStyleIndex npad_type_) {
     auto trigger_guard =
         SCOPE_GUARD({ TriggerOnChange(ControllerTriggerType::Type, !is_configuring); });
-    std::scoped_lock lock{mutex, npad_mutex};
+    std::scoped_lock lock{mutex};
 
     if (is_configuring) {
         if (tmp_npad_type == npad_type_) {

src/core/hid/emulated_controller.h

@@ -603,8 +603,6 @@ private:
 
     mutable std::mutex mutex;
     mutable std::mutex callback_mutex;
-    mutable std::mutex npad_mutex;
-    mutable std::mutex connect_mutex;
     std::unordered_map<int, ControllerUpdateCallback> callback_list;
     int last_callback_key = 0;
 

src/core/hle/kernel/k_hardware_timer.cpp

@@ -35,9 +35,7 @@ void KHardwareTimer::DoTask() {
         }
 
         // Disable the timer interrupt while we handle this.
-        // Not necessary due to core timing already having popped this event to call it.
-        // this->DisableInterrupt();
-        m_wakeup_time = std::numeric_limits<s64>::max();
+        this->DisableInterrupt();
 
         if (const s64 next_time = this->DoInterruptTaskImpl(GetTick());
             0 < next_time && next_time <= m_wakeup_time) {

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

@@ -19,7 +19,6 @@
 #include "core/hle/service/am/am.h"
 #include "core/hle/service/am/applet_ae.h"
 #include "core/hle/service/am/applet_oe.h"
-#include "core/hle/service/am/applets/applet_mii_edit_types.h"
 #include "core/hle/service/am/applets/applet_profile_select.h"
 #include "core/hle/service/am/applets/applet_web_browser.h"
 #include "core/hle/service/am/applets/applets.h"
@@ -191,7 +190,7 @@ IDisplayController::IDisplayController(Core::System& system_)
         {5, nullptr, "GetLastForegroundCaptureImageEx"},
         {6, nullptr, "GetLastApplicationCaptureImageEx"},
         {7, nullptr, "GetCallerAppletCaptureImageEx"},
-        {8, &IDisplayController::TakeScreenShotOfOwnLayer, "TakeScreenShotOfOwnLayer"},
+        {8, nullptr, "TakeScreenShotOfOwnLayer"},
         {9, nullptr, "CopyBetweenCaptureBuffers"},
         {10, nullptr, "AcquireLastApplicationCaptureBuffer"},
         {11, nullptr, "ReleaseLastApplicationCaptureBuffer"},
@@ -219,13 +218,6 @@ IDisplayController::IDisplayController(Core::System& system_)
 
 IDisplayController::~IDisplayController() = default;
 
-void IDisplayController::TakeScreenShotOfOwnLayer(HLERequestContext& ctx) {
-    LOG_WARNING(Service_AM, "(STUBBED) called");
-
-    IPC::ResponseBuilder rb{ctx, 2};
-    rb.Push(ResultSuccess);
-}
-
 IDebugFunctions::IDebugFunctions(Core::System& system_)
     : ServiceFramework{system_, "IDebugFunctions"} {
     // clang-format off
@@ -732,7 +724,7 @@ ICommonStateGetter::ICommonStateGetter(Core::System& system_,
         {110, nullptr, "OpenMyGpuErrorHandler"},
         {120, nullptr, "GetAppletLaunchedHistory"},
         {200, nullptr, "GetOperationModeSystemInfo"},
-        {300, &ICommonStateGetter::GetSettingsPlatformRegion, "GetSettingsPlatformRegion"},
+        {300, nullptr, "GetSettingsPlatformRegion"},
         {400, nullptr, "ActivateMigrationService"},
         {401, nullptr, "DeactivateMigrationService"},
         {500, nullptr, "DisableSleepTillShutdown"},
@@ -744,10 +736,6 @@ ICommonStateGetter::ICommonStateGetter(Core::System& system_,
     // clang-format on
 
     RegisterHandlers(functions);
-
-    // Configure applets to be in foreground state
-    msg_queue->PushMessage(AppletMessageQueue::AppletMessage::FocusStateChanged);
-    msg_queue->PushMessage(AppletMessageQueue::AppletMessage::ChangeIntoForeground);
 }
 
 ICommonStateGetter::~ICommonStateGetter() = default;
@@ -879,14 +867,6 @@ void ICommonStateGetter::PerformSystemButtonPressingIfInFocus(HLERequestContext&
     rb.Push(ResultSuccess);
 }
 
-void ICommonStateGetter::GetSettingsPlatformRegion(HLERequestContext& ctx) {
-    LOG_WARNING(Service_AM, "(STUBBED) called");
-
-    IPC::ResponseBuilder rb{ctx, 3};
-    rb.Push(ResultSuccess);
-    rb.PushEnum(SysPlatformRegion::Global);
-}
-
 void ICommonStateGetter::SetRequestExitToLibraryAppletAtExecuteNextProgramEnabled(
     HLERequestContext& ctx) {
     LOG_WARNING(Service_AM, "(STUBBED) called");
@@ -1344,19 +1324,18 @@ void ILibraryAppletCreator::CreateHandleStorage(HLERequestContext& ctx) {
 
 ILibraryAppletSelfAccessor::ILibraryAppletSelfAccessor(Core::System& system_)
     : ServiceFramework{system_, "ILibraryAppletSelfAccessor"} {
-    // clang-format off
     static const FunctionInfo functions[] = {
-        {0, &ILibraryAppletSelfAccessor::PopInData, "PopInData"},
-        {1, &ILibraryAppletSelfAccessor::PushOutData, "PushOutData"},
+        {0, nullptr, "PopInData"},
+        {1, nullptr, "PushOutData"},
         {2, nullptr, "PopInteractiveInData"},
         {3, nullptr, "PushInteractiveOutData"},
         {5, nullptr, "GetPopInDataEvent"},
         {6, nullptr, "GetPopInteractiveInDataEvent"},
-        {10, &ILibraryAppletSelfAccessor::ExitProcessAndReturn, "ExitProcessAndReturn"},
-        {11, &ILibraryAppletSelfAccessor::GetLibraryAppletInfo, "GetLibraryAppletInfo"},
+        {10, nullptr, "ExitProcessAndReturn"},
+        {11, nullptr, "GetLibraryAppletInfo"},
         {12, nullptr, "GetMainAppletIdentityInfo"},
         {13, nullptr, "CanUseApplicationCore"},
-        {14, &ILibraryAppletSelfAccessor::GetCallerAppletIdentityInfo, "GetCallerAppletIdentityInfo"},
+        {14, nullptr, "GetCallerAppletIdentityInfo"},
         {15, nullptr, "GetMainAppletApplicationControlProperty"},
         {16, nullptr, "GetMainAppletStorageId"},
         {17, nullptr, "GetCallerAppletIdentityInfoStack"},
@@ -1382,142 +1361,10 @@ ILibraryAppletSelfAccessor::ILibraryAppletSelfAccessor(Core::System& system_)
         {140, nullptr, "SetApplicationMemoryReservation"},
         {150, nullptr, "ShouldSetGpuTimeSliceManually"},
     };
-    // clang-format on
     RegisterHandlers(functions);
-
-    PushInShowMiiEditData();
 }
 
 ILibraryAppletSelfAccessor::~ILibraryAppletSelfAccessor() = default;
-void ILibraryAppletSelfAccessor::PopInData(HLERequestContext& ctx) {
-    LOG_INFO(Service_AM, "called");
-
-    if (queue_data.empty()) {
-        IPC::ResponseBuilder rb{ctx, 2};
-        rb.Push(ResultNoDataInChannel);
-        return;
-    }
-
-    auto data = queue_data.front();
-    queue_data.pop_front();
-
-    IPC::ResponseBuilder rb{ctx, 2, 0, 1};
-    rb.Push(ResultSuccess);
-    rb.PushIpcInterface<IStorage>(system, std::move(data));
-}
-
-void ILibraryAppletSelfAccessor::PushOutData(HLERequestContext& ctx) {
-    LOG_WARNING(Service_AM, "(STUBBED) called");
-
-    IPC::ResponseBuilder rb{ctx, 2};
-    rb.Push(ResultSuccess);
-}
-
-void ILibraryAppletSelfAccessor::ExitProcessAndReturn(HLERequestContext& ctx) {
-    LOG_WARNING(Service_AM, "(STUBBED) called");
-
-    system.Exit();
-
-    IPC::ResponseBuilder rb{ctx, 2};
-    rb.Push(ResultSuccess);
-}
-
-void ILibraryAppletSelfAccessor::GetLibraryAppletInfo(HLERequestContext& ctx) {
-    struct LibraryAppletInfo {
-        Applets::AppletId applet_id;
-        Applets::LibraryAppletMode library_applet_mode;
-    };
-
-    LOG_WARNING(Service_AM, "(STUBBED) called");
-
-    const LibraryAppletInfo applet_info{
-        .applet_id = Applets::AppletId::MiiEdit,
-        .library_applet_mode = Applets::LibraryAppletMode::AllForeground,
-    };
-
-    IPC::ResponseBuilder rb{ctx, 4};
-    rb.Push(ResultSuccess);
-    rb.PushRaw(applet_info);
-}
-
-void ILibraryAppletSelfAccessor::GetCallerAppletIdentityInfo(HLERequestContext& ctx) {
-    struct AppletIdentityInfo {
-        Applets::AppletId applet_id;
-        INSERT_PADDING_BYTES(0x4);
-        u64 application_id;
-    };
-
-    LOG_WARNING(Service_AM, "(STUBBED) called");
-
-    const AppletIdentityInfo applet_info{
-        .applet_id = Applets::AppletId::QLaunch,
-        .application_id = 0x0100000000001000ull,
-    };
-
-    IPC::ResponseBuilder rb{ctx, 6};
-    rb.Push(ResultSuccess);
-    rb.PushRaw(applet_info);
-}
-
-void ILibraryAppletSelfAccessor::PushInShowMiiEditData() {
-    struct MiiEditV3 {
-        Applets::MiiEditAppletInputCommon common;
-        Applets::MiiEditAppletInputV3 input;
-    };
-    static_assert(sizeof(MiiEditV3) == 0x100, "MiiEditV3 has incorrect size.");
-
-    MiiEditV3 mii_arguments{
-        .common =
-            {
-                .version = Applets::MiiEditAppletVersion::Version3,
-                .applet_mode = Applets::MiiEditAppletMode::ShowMiiEdit,
-            },
-        .input{},
-    };
-
-    std::vector<u8> argument_data(sizeof(mii_arguments));
-    std::memcpy(argument_data.data(), &mii_arguments, sizeof(mii_arguments));
-
-    queue_data.emplace_back(std::move(argument_data));
-}
-
-IAppletCommonFunctions::IAppletCommonFunctions(Core::System& system_)
-    : ServiceFramework{system_, "IAppletCommonFunctions"} {
-    // clang-format off
-    static const FunctionInfo functions[] = {
-        {0, nullptr, "SetTerminateResult"},
-        {10, nullptr, "ReadThemeStorage"},
-        {11, nullptr, "WriteThemeStorage"},
-        {20, nullptr, "PushToAppletBoundChannel"},
-        {21, nullptr, "TryPopFromAppletBoundChannel"},
-        {40, nullptr, "GetDisplayLogicalResolution"},
-        {42, nullptr, "SetDisplayMagnification"},
-        {50, nullptr, "SetHomeButtonDoubleClickEnabled"},
-        {51, nullptr, "GetHomeButtonDoubleClickEnabled"},
-        {52, nullptr, "IsHomeButtonShortPressedBlocked"},
-        {60, nullptr, "IsVrModeCurtainRequired"},
-        {61, nullptr, "IsSleepRequiredByHighTemperature"},
-        {62, nullptr, "IsSleepRequiredByLowBattery"},
-        {70, &IAppletCommonFunctions::SetCpuBoostRequestPriority, "SetCpuBoostRequestPriority"},
-        {80, nullptr, "SetHandlingCaptureButtonShortPressedMessageEnabledForApplet"},
-        {81, nullptr, "SetHandlingCaptureButtonLongPressedMessageEnabledForApplet"},
-        {90, nullptr, "OpenNamedChannelAsParent"},
-        {91, nullptr, "OpenNamedChannelAsChild"},
-        {100, nullptr, "SetApplicationCoreUsageMode"},
-    };
-    // clang-format on
-
-    RegisterHandlers(functions);
-}
-
-IAppletCommonFunctions::~IAppletCommonFunctions() = default;
-
-void IAppletCommonFunctions::SetCpuBoostRequestPriority(HLERequestContext& ctx) {
-    LOG_WARNING(Service_AM, "(STUBBED) called");
-
-    IPC::ResponseBuilder rb{ctx, 2};
-    rb.Push(ResultSuccess);
-}
 
 IApplicationFunctions::IApplicationFunctions(Core::System& system_)
     : ServiceFramework{system_, "IApplicationFunctions"}, service_context{system,
@@ -2094,6 +1941,9 @@ void IApplicationFunctions::PrepareForJit(HLERequestContext& ctx) {
 
 void LoopProcess(Nvnflinger::Nvnflinger& nvnflinger, Core::System& system) {
     auto message_queue = std::make_shared<AppletMessageQueue>(system);
+    // Needed on game boot
+    message_queue->PushMessage(AppletMessageQueue::AppletMessage::FocusStateChanged);
+
     auto server_manager = std::make_unique<ServerManager>(system);
 
     server_manager->RegisterNamedService(
@@ -2199,8 +2049,8 @@ IProcessWindingController::IProcessWindingController(Core::System& system_)
     : ServiceFramework{system_, "IProcessWindingController"} {
     // clang-format off
     static const FunctionInfo functions[] = {
-        {0, &IProcessWindingController::GetLaunchReason, "GetLaunchReason"},
-        {11, &IProcessWindingController::OpenCallingLibraryApplet, "OpenCallingLibraryApplet"},
+        {0, nullptr, "GetLaunchReason"},
+        {11, nullptr, "OpenCallingLibraryApplet"},
         {21, nullptr, "PushContext"},
         {22, nullptr, "PopContext"},
         {23, nullptr, "CancelWindingReservation"},
@@ -2214,46 +2064,4 @@ IProcessWindingController::IProcessWindingController(Core::System& system_)
 }
 
 IProcessWindingController::~IProcessWindingController() = default;
-
-void IProcessWindingController::GetLaunchReason(HLERequestContext& ctx) {
-    LOG_WARNING(Service_AM, "(STUBBED) called");
-
-    struct AppletProcessLaunchReason {
-        u8 flag;
-        INSERT_PADDING_BYTES(3);
-    };
-    static_assert(sizeof(AppletProcessLaunchReason) == 0x4,
-                  "AppletProcessLaunchReason is an invalid size");
-
-    AppletProcessLaunchReason reason{
-        .flag = 0,
-    };
-
-    IPC::ResponseBuilder rb{ctx, 3};
-    rb.Push(ResultSuccess);
-    rb.PushRaw(reason);
-}
-
-void IProcessWindingController::OpenCallingLibraryApplet(HLERequestContext& ctx) {
-    const auto applet_id = Applets::AppletId::MiiEdit;
-    const auto applet_mode = Applets::LibraryAppletMode::AllForeground;
-
-    LOG_WARNING(Service_AM, "(STUBBED) called with applet_id={:08X}, applet_mode={:08X}", applet_id,
-                applet_mode);
-
-    const auto& applet_manager{system.GetAppletManager()};
-    const auto applet = applet_manager.GetApplet(applet_id, applet_mode);
-
-    if (applet == nullptr) {
-        LOG_ERROR(Service_AM, "Applet doesn't exist! applet_id={}", applet_id);
-
-        IPC::ResponseBuilder rb{ctx, 2};
-        rb.Push(ResultUnknown);
-        return;
-    }
-
-    IPC::ResponseBuilder rb{ctx, 2, 0, 1};
-    rb.Push(ResultSuccess);
-    rb.PushIpcInterface<ILibraryAppletAccessor>(system, applet);
-}
 } // namespace Service::AM

src/core/hle/service/am/am.h

@@ -120,9 +120,6 @@ class IDisplayController final : public ServiceFramework<IDisplayController> {
 public:
     explicit IDisplayController(Core::System& system_);
     ~IDisplayController() override;
-
-private:
-    void TakeScreenShotOfOwnLayer(HLERequestContext& ctx);
 };
 
 class IDebugFunctions final : public ServiceFramework<IDebugFunctions> {
@@ -215,11 +212,6 @@ private:
         CaptureButtonLongPressing,
     };
 
-    enum class SysPlatformRegion : s32 {
-        Global = 1,
-        Terra = 2,
-    };
-
     void GetEventHandle(HLERequestContext& ctx);
     void ReceiveMessage(HLERequestContext& ctx);
     void GetCurrentFocusState(HLERequestContext& ctx);
@@ -235,7 +227,6 @@ private:
     void GetDefaultDisplayResolution(HLERequestContext& ctx);
     void SetCpuBoostMode(HLERequestContext& ctx);
     void PerformSystemButtonPressingIfInFocus(HLERequestContext& ctx);
-    void GetSettingsPlatformRegion(HLERequestContext& ctx);
     void SetRequestExitToLibraryAppletAtExecuteNextProgramEnabled(HLERequestContext& ctx);
 
     std::shared_ptr<AppletMessageQueue> msg_queue;
@@ -303,26 +294,6 @@ class ILibraryAppletSelfAccessor final : public ServiceFramework<ILibraryAppletS
 public:
     explicit ILibraryAppletSelfAccessor(Core::System& system_);
     ~ILibraryAppletSelfAccessor() override;
-
-private:
-    void PopInData(HLERequestContext& ctx);
-    void PushOutData(HLERequestContext& ctx);
-    void GetLibraryAppletInfo(HLERequestContext& ctx);
-    void ExitProcessAndReturn(HLERequestContext& ctx);
-    void GetCallerAppletIdentityInfo(HLERequestContext& ctx);
-
-    void PushInShowMiiEditData();
-
-    std::deque<std::vector<u8>> queue_data;
-};
-
-class IAppletCommonFunctions final : public ServiceFramework<IAppletCommonFunctions> {
-public:
-    explicit IAppletCommonFunctions(Core::System& system_);
-    ~IAppletCommonFunctions() override;
-
-private:
-    void SetCpuBoostRequestPriority(HLERequestContext& ctx);
 };
 
 class IApplicationFunctions final : public ServiceFramework<IApplicationFunctions> {
@@ -407,10 +378,6 @@ class IProcessWindingController final : public ServiceFramework<IProcessWindingC
 public:
     explicit IProcessWindingController(Core::System& system_);
     ~IProcessWindingController() override;
-
-private:
-    void GetLaunchReason(HLERequestContext& ctx);
-    void OpenCallingLibraryApplet(HLERequestContext& ctx);
 };
 
 void LoopProcess(Nvnflinger::Nvnflinger& nvnflinger, Core::System& system);

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

@@ -27,7 +27,7 @@ public:
             {10, &ILibraryAppletProxy::GetProcessWindingController, "GetProcessWindingController"},
             {11, &ILibraryAppletProxy::GetLibraryAppletCreator, "GetLibraryAppletCreator"},
             {20, &ILibraryAppletProxy::OpenLibraryAppletSelfAccessor, "OpenLibraryAppletSelfAccessor"},
-            {21, &ILibraryAppletProxy::GetAppletCommonFunctions, "GetAppletCommonFunctions"},
+            {21, nullptr, "GetAppletCommonFunctions"},
             {22, nullptr, "GetHomeMenuFunctions"},
             {23, nullptr, "GetGlobalStateController"},
             {1000, &ILibraryAppletProxy::GetDebugFunctions, "GetDebugFunctions"},
@@ -86,6 +86,14 @@ private:
         rb.PushIpcInterface<IProcessWindingController>(system);
     }
 
+    void GetDebugFunctions(HLERequestContext& ctx) {
+        LOG_DEBUG(Service_AM, "called");
+
+        IPC::ResponseBuilder rb{ctx, 2, 0, 1};
+        rb.Push(ResultSuccess);
+        rb.PushIpcInterface<IDebugFunctions>(system);
+    }
+
     void GetLibraryAppletCreator(HLERequestContext& ctx) {
         LOG_DEBUG(Service_AM, "called");
 
@@ -102,22 +110,6 @@ private:
         rb.PushIpcInterface<ILibraryAppletSelfAccessor>(system);
     }
 
-    void GetAppletCommonFunctions(HLERequestContext& ctx) {
-        LOG_DEBUG(Service_AM, "called");
-
-        IPC::ResponseBuilder rb{ctx, 2, 0, 1};
-        rb.Push(ResultSuccess);
-        rb.PushIpcInterface<IAppletCommonFunctions>(system);
-    }
-
-    void GetDebugFunctions(HLERequestContext& ctx) {
-        LOG_DEBUG(Service_AM, "called");
-
-        IPC::ResponseBuilder rb{ctx, 2, 0, 1};
-        rb.Push(ResultSuccess);
-        rb.PushIpcInterface<IDebugFunctions>(system);
-    }
-
     Nvnflinger::Nvnflinger& nvnflinger;
     std::shared_ptr<AppletMessageQueue> msg_queue;
 };
@@ -141,7 +133,7 @@ public:
             {20, &ISystemAppletProxy::GetHomeMenuFunctions, "GetHomeMenuFunctions"},
             {21, &ISystemAppletProxy::GetGlobalStateController, "GetGlobalStateController"},
             {22, &ISystemAppletProxy::GetApplicationCreator, "GetApplicationCreator"},
-            {23,  &ISystemAppletProxy::GetAppletCommonFunctions, "GetAppletCommonFunctions"},
+            {23, nullptr, "GetAppletCommonFunctions"},
             {1000, &ISystemAppletProxy::GetDebugFunctions, "GetDebugFunctions"},
         };
         // clang-format on
@@ -190,6 +182,14 @@ private:
         rb.PushIpcInterface<IDisplayController>(system);
     }
 
+    void GetDebugFunctions(HLERequestContext& ctx) {
+        LOG_DEBUG(Service_AM, "called");
+
+        IPC::ResponseBuilder rb{ctx, 2, 0, 1};
+        rb.Push(ResultSuccess);
+        rb.PushIpcInterface<IDebugFunctions>(system);
+    }
+
     void GetLibraryAppletCreator(HLERequestContext& ctx) {
         LOG_DEBUG(Service_AM, "called");
 
@@ -222,22 +222,6 @@ private:
         rb.PushIpcInterface<IApplicationCreator>(system);
     }
 
-    void GetAppletCommonFunctions(HLERequestContext& ctx) {
-        LOG_DEBUG(Service_AM, "called");
-
-        IPC::ResponseBuilder rb{ctx, 2, 0, 1};
-        rb.Push(ResultSuccess);
-        rb.PushIpcInterface<IAppletCommonFunctions>(system);
-    }
-
-    void GetDebugFunctions(HLERequestContext& ctx) {
-        LOG_DEBUG(Service_AM, "called");
-
-        IPC::ResponseBuilder rb{ctx, 2, 0, 1};
-        rb.Push(ResultSuccess);
-        rb.PushIpcInterface<IDebugFunctions>(system);
-    }
-
     Nvnflinger::Nvnflinger& nvnflinger;
     std::shared_ptr<AppletMessageQueue> msg_queue;
 };

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

@@ -7,9 +7,7 @@
 #include "core/frontend/applets/mii_edit.h"
 #include "core/hle/service/am/am.h"
 #include "core/hle/service/am/applets/applet_mii_edit.h"
-#include "core/hle/service/mii/mii.h"
 #include "core/hle/service/mii/mii_manager.h"
-#include "core/hle/service/sm/sm.h"
 
 namespace Service::AM::Applets {
 
@@ -58,12 +56,6 @@ void MiiEdit::Initialize() {
                     sizeof(MiiEditAppletInputV4));
         break;
     }
-
-    manager = system.ServiceManager().GetService<Mii::MiiDBModule>("mii:e")->GetMiiManager();
-    if (manager == nullptr) {
-        manager = std::make_shared<Mii::MiiManager>();
-    }
-    manager->Initialize(metadata);
 }
 
 bool MiiEdit::TransactionComplete() const {
@@ -86,46 +78,22 @@ void MiiEdit::Execute() {
     // This is a default stub for each of the MiiEdit applet modes.
     switch (applet_input_common.applet_mode) {
     case MiiEditAppletMode::ShowMiiEdit:
+    case MiiEditAppletMode::AppendMii:
     case MiiEditAppletMode::AppendMiiImage:
     case MiiEditAppletMode::UpdateMiiImage:
         MiiEditOutput(MiiEditResult::Success, 0);
         break;
-    case MiiEditAppletMode::AppendMii: {
-        Mii::StoreData store_data{};
-        store_data.BuildRandom(Mii::Age::All, Mii::Gender::All, Mii::Race::All);
-        store_data.SetNickname({u'y', u'u', u'z', u'u'});
-        store_data.SetChecksum();
-        const auto result = manager->AddOrReplace(metadata, store_data);
-
-        if (result.IsError()) {
-            MiiEditOutput(MiiEditResult::Cancel, 0);
-            break;
-        }
-
-        s32 index = manager->FindIndex(store_data.GetCreateId(), false);
-
-        if (index == -1) {
-            MiiEditOutput(MiiEditResult::Cancel, 0);
-            break;
-        }
-
-        MiiEditOutput(MiiEditResult::Success, index);
-        break;
-    }
-    case MiiEditAppletMode::CreateMii: {
-        Mii::CharInfo char_info{};
-        manager->BuildRandom(char_info, Mii::Age::All, Mii::Gender::All, Mii::Race::All);
-
-        const MiiEditCharInfo edit_char_info{
-            .mii_info{char_info},
-        };
-
-        MiiEditOutputForCharInfoEditing(MiiEditResult::Success, edit_char_info);
-        break;
-    }
+    case MiiEditAppletMode::CreateMii:
     case MiiEditAppletMode::EditMii: {
+        Mii::CharInfo char_info{};
+        Mii::StoreData store_data{};
+        store_data.BuildBase(Mii::Gender::Male);
+        char_info.SetFromStoreData(store_data);
+
         const MiiEditCharInfo edit_char_info{
-            .mii_info{applet_input_v4.char_info.mii_info},
+            .mii_info{applet_input_common.applet_mode == MiiEditAppletMode::EditMii
+                          ? applet_input_v4.char_info.mii_info
+                          : char_info},
         };
 
         MiiEditOutputForCharInfoEditing(MiiEditResult::Success, edit_char_info);
@@ -145,8 +113,6 @@ void MiiEdit::MiiEditOutput(MiiEditResult result, s32 index) {
         .index{index},
     };
 
-    LOG_INFO(Input, "called, result={}, index={}", result, index);
-
     std::vector<u8> out_data(sizeof(MiiEditAppletOutput));
     std::memcpy(out_data.data(), &applet_output, sizeof(MiiEditAppletOutput));
 

src/core/hle/service/am/applets/applet_mii_edit.h

@@ -11,11 +11,6 @@ namespace Core {
 class System;
 } // namespace Core
 
-namespace Service::Mii {
-struct DatabaseSessionMetadata;
-class MiiManager;
-} // namespace Service::Mii
-
 namespace Service::AM::Applets {
 
 class MiiEdit final : public Applet {
@@ -45,8 +40,6 @@ private:
     MiiEditAppletInputV4 applet_input_v4{};
 
     bool is_complete{false};
-    std::shared_ptr<Mii::MiiManager> manager = nullptr;
-    Mii::DatabaseSessionMetadata metadata{};
 };
 
 } // namespace Service::AM::Applets

src/core/hle/service/aoc/aoc_u.cpp

@@ -22,8 +22,6 @@
 
 namespace Service::AOC {
 
-constexpr Result ResultNoPurchasedProductInfoAvailable{ErrorModule::NIMShop, 400};
-
 static bool CheckAOCTitleIDMatchesBase(u64 title_id, u64 base) {
     return FileSys::GetBaseTitleID(title_id) == base;
 }
@@ -56,8 +54,8 @@ public:
             {0, &IPurchaseEventManager::SetDefaultDeliveryTarget, "SetDefaultDeliveryTarget"},
             {1, &IPurchaseEventManager::SetDeliveryTarget, "SetDeliveryTarget"},
             {2, &IPurchaseEventManager::GetPurchasedEventReadableHandle, "GetPurchasedEventReadableHandle"},
-            {3, &IPurchaseEventManager::PopPurchasedProductInfo, "PopPurchasedProductInfo"},
-            {4, &IPurchaseEventManager::PopPurchasedProductInfoWithUid, "PopPurchasedProductInfoWithUid"},
+            {3, nullptr, "PopPurchasedProductInfo"},
+            {4, nullptr, "PopPurchasedProductInfoWithUid"},
         };
         // clang-format on
 
@@ -103,20 +101,6 @@ private:
         rb.PushCopyObjects(purchased_event->GetReadableEvent());
     }
 
-    void PopPurchasedProductInfo(HLERequestContext& ctx) {
-        LOG_DEBUG(Service_AOC, "(STUBBED) called");
-
-        IPC::ResponseBuilder rb{ctx, 2};
-        rb.Push(ResultNoPurchasedProductInfoAvailable);
-    }
-
-    void PopPurchasedProductInfoWithUid(HLERequestContext& ctx) {
-        LOG_DEBUG(Service_AOC, "(STUBBED) called");
-
-        IPC::ResponseBuilder rb{ctx, 2};
-        rb.Push(ResultNoPurchasedProductInfoAvailable);
-    }
-
     KernelHelpers::ServiceContext service_context;
 
     Kernel::KEvent* purchased_event;

src/core/hle/service/filesystem/fsp_srv.cpp

@@ -329,7 +329,6 @@ public:
             {13, &IFileSystem::CleanDirectoryRecursively, "CleanDirectoryRecursively"},
             {14, &IFileSystem::GetFileTimeStampRaw, "GetFileTimeStampRaw"},
             {15, nullptr, "QueryEntry"},
-            {16, &IFileSystem::GetFileSystemAttribute, "GetFileSystemAttribute"},
         };
         RegisterHandlers(functions);
     }
@@ -522,46 +521,6 @@ public:
         rb.PushRaw(vfs_timestamp);
     }
 
-    void GetFileSystemAttribute(HLERequestContext& ctx) {
-        LOG_WARNING(Service_FS, "(STUBBED) called");
-
-        struct FileSystemAttribute {
-            u8 dir_entry_name_length_max_defined;
-            u8 file_entry_name_length_max_defined;
-            u8 dir_path_name_length_max_defined;
-            u8 file_path_name_length_max_defined;
-            INSERT_PADDING_BYTES_NOINIT(0x5);
-            u8 utf16_dir_entry_name_length_max_defined;
-            u8 utf16_file_entry_name_length_max_defined;
-            u8 utf16_dir_path_name_length_max_defined;
-            u8 utf16_file_path_name_length_max_defined;
-            INSERT_PADDING_BYTES_NOINIT(0x18);
-            s32 dir_entry_name_length_max;
-            s32 file_entry_name_length_max;
-            s32 dir_path_name_length_max;
-            s32 file_path_name_length_max;
-            INSERT_PADDING_WORDS_NOINIT(0x5);
-            s32 utf16_dir_entry_name_length_max;
-            s32 utf16_file_entry_name_length_max;
-            s32 utf16_dir_path_name_length_max;
-            s32 utf16_file_path_name_length_max;
-            INSERT_PADDING_WORDS_NOINIT(0x18);
-            INSERT_PADDING_WORDS_NOINIT(0x1);
-        };
-        static_assert(sizeof(FileSystemAttribute) == 0xc0,
-                      "FileSystemAttribute has incorrect size");
-
-        FileSystemAttribute savedata_attribute{};
-        savedata_attribute.dir_entry_name_length_max_defined = true;
-        savedata_attribute.file_entry_name_length_max_defined = true;
-        savedata_attribute.dir_entry_name_length_max = 0x40;
-        savedata_attribute.file_entry_name_length_max = 0x40;
-
-        IPC::ResponseBuilder rb{ctx, 50};
-        rb.Push(ResultSuccess);
-        rb.PushRaw(savedata_attribute);
-    }
-
 private:
     VfsDirectoryServiceWrapper backend;
     SizeGetter size;
@@ -739,7 +698,7 @@ FSP_SRV::FSP_SRV(Core::System& system_)
         {19, nullptr, "FormatSdCardFileSystem"},
         {21, nullptr, "DeleteSaveDataFileSystem"},
         {22, &FSP_SRV::CreateSaveDataFileSystem, "CreateSaveDataFileSystem"},
-        {23, &FSP_SRV::CreateSaveDataFileSystemBySystemSaveDataId, "CreateSaveDataFileSystemBySystemSaveDataId"},
+        {23, nullptr, "CreateSaveDataFileSystemBySystemSaveDataId"},
         {24, nullptr, "RegisterSaveDataFileSystemAtomicDeletion"},
         {25, nullptr, "DeleteSaveDataFileSystemBySaveDataSpaceId"},
         {26, nullptr, "FormatSdCardDryRun"},
@@ -753,7 +712,7 @@ FSP_SRV::FSP_SRV(Core::System& system_)
         {35, nullptr, "CreateSaveDataFileSystemByHashSalt"},
         {36, nullptr, "OpenHostFileSystemWithOption"},
         {51, &FSP_SRV::OpenSaveDataFileSystem, "OpenSaveDataFileSystem"},
-        {52, &FSP_SRV::OpenSaveDataFileSystemBySystemSaveDataId, "OpenSaveDataFileSystemBySystemSaveDataId"},
+        {52, nullptr, "OpenSaveDataFileSystemBySystemSaveDataId"},
         {53, &FSP_SRV::OpenReadOnlySaveDataFileSystem, "OpenReadOnlySaveDataFileSystem"},
         {57, nullptr, "ReadSaveDataFileSystemExtraDataBySaveDataSpaceId"},
         {58, nullptr, "ReadSaveDataFileSystemExtraData"},
@@ -911,21 +870,6 @@ void FSP_SRV::CreateSaveDataFileSystem(HLERequestContext& ctx) {
     rb.Push(ResultSuccess);
 }
 
-void FSP_SRV::CreateSaveDataFileSystemBySystemSaveDataId(HLERequestContext& ctx) {
-    IPC::RequestParser rp{ctx};
-
-    auto save_struct = rp.PopRaw<FileSys::SaveDataAttribute>();
-    [[maybe_unused]] auto save_create_struct = rp.PopRaw<std::array<u8, 0x40>>();
-
-    LOG_DEBUG(Service_FS, "called save_struct = {}", save_struct.DebugInfo());
-
-    FileSys::VirtualDir save_data_dir{};
-    fsc.CreateSaveData(&save_data_dir, FileSys::SaveDataSpaceId::NandSystem, save_struct);
-
-    IPC::ResponseBuilder rb{ctx, 2};
-    rb.Push(ResultSuccess);
-}
-
 void FSP_SRV::OpenSaveDataFileSystem(HLERequestContext& ctx) {
     IPC::RequestParser rp{ctx};
 
@@ -972,11 +916,6 @@ void FSP_SRV::OpenSaveDataFileSystem(HLERequestContext& ctx) {
     rb.PushIpcInterface<IFileSystem>(std::move(filesystem));
 }
 
-void FSP_SRV::OpenSaveDataFileSystemBySystemSaveDataId(HLERequestContext& ctx) {
-    LOG_WARNING(Service_FS, "(STUBBED) called, delegating to 51 OpenSaveDataFilesystem");
-    OpenSaveDataFileSystem(ctx);
-}
-
 void FSP_SRV::OpenReadOnlySaveDataFileSystem(HLERequestContext& ctx) {
     LOG_WARNING(Service_FS, "(STUBBED) called, delegating to 51 OpenSaveDataFilesystem");
     OpenSaveDataFileSystem(ctx);

src/core/hle/service/filesystem/fsp_srv.h

@@ -39,9 +39,7 @@ private:
     void OpenFileSystemWithPatch(HLERequestContext& ctx);
     void OpenSdCardFileSystem(HLERequestContext& ctx);
     void CreateSaveDataFileSystem(HLERequestContext& ctx);
-    void CreateSaveDataFileSystemBySystemSaveDataId(HLERequestContext& ctx);
     void OpenSaveDataFileSystem(HLERequestContext& ctx);
-    void OpenSaveDataFileSystemBySystemSaveDataId(HLERequestContext& ctx);
     void OpenReadOnlySaveDataFileSystem(HLERequestContext& ctx);
     void OpenSaveDataInfoReaderBySaveDataSpaceId(HLERequestContext& ctx);
     void OpenSaveDataInfoReaderOnlyCacheStorage(HLERequestContext& ctx);

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

@@ -346,7 +346,6 @@ void Controller_NPad::InitNewlyAddedController(Core::HID::NpadIdType npad_id) {
     }
     SignalStyleSetChangedEvent(npad_id);
     WriteEmptyEntry(controller.shared_memory);
-    hid_core.SetLastActiveController(npad_id);
 }
 
 void Controller_NPad::OnInit() {

src/core/hle/service/mii/mii.cpp

@@ -8,9 +8,6 @@
 #include "core/hle/service/mii/mii.h"
 #include "core/hle/service/mii/mii_manager.h"
 #include "core/hle/service/mii/mii_result.h"
-#include "core/hle/service/mii/types/char_info.h"
-#include "core/hle/service/mii/types/store_data.h"
-#include "core/hle/service/mii/types/ver3_store_data.h"
 #include "core/hle/service/server_manager.h"
 #include "core/hle/service/service.h"
 
@@ -18,10 +15,8 @@ namespace Service::Mii {
 
 class IDatabaseService final : public ServiceFramework<IDatabaseService> {
 public:
-    explicit IDatabaseService(Core::System& system_, std::shared_ptr<MiiManager> mii_manager,
-                              bool is_system_)
-        : ServiceFramework{system_, "IDatabaseService"}, manager{mii_manager}, is_system{
-                                                                                   is_system_} {
+    explicit IDatabaseService(Core::System& system_, bool is_system_)
+        : ServiceFramework{system_, "IDatabaseService"}, is_system{is_system_} {
         // clang-format off
         static const FunctionInfo functions[] = {
             {0, &IDatabaseService::IsUpdated, "IsUpdated"},
@@ -32,31 +27,29 @@ public:
             {5, &IDatabaseService::UpdateLatest, "UpdateLatest"},
             {6, &IDatabaseService::BuildRandom, "BuildRandom"},
             {7, &IDatabaseService::BuildDefault, "BuildDefault"},
-            {8, &IDatabaseService::Get2, "Get2"},
-            {9, &IDatabaseService::Get3, "Get3"},
-            {10, &IDatabaseService::UpdateLatest1, "UpdateLatest1"},
-            {11, &IDatabaseService::FindIndex, "FindIndex"},
-            {12, &IDatabaseService::Move, "Move"},
-            {13, &IDatabaseService::AddOrReplace, "AddOrReplace"},
-            {14, &IDatabaseService::Delete, "Delete"},
-            {15, &IDatabaseService::DestroyFile, "DestroyFile"},
-            {16, &IDatabaseService::DeleteFile, "DeleteFile"},
-            {17, &IDatabaseService::Format, "Format"},
+            {8, nullptr, "Get2"},
+            {9, nullptr, "Get3"},
+            {10, nullptr, "UpdateLatest1"},
+            {11, nullptr, "FindIndex"},
+            {12, nullptr, "Move"},
+            {13, nullptr, "AddOrReplace"},
+            {14, nullptr, "Delete"},
+            {15, nullptr, "DestroyFile"},
+            {16, nullptr, "DeleteFile"},
+            {17, nullptr, "Format"},
             {18, nullptr, "Import"},
             {19, nullptr, "Export"},
-            {20, &IDatabaseService::IsBrokenDatabaseWithClearFlag, "IsBrokenDatabaseWithClearFlag"},
+            {20, nullptr, "IsBrokenDatabaseWithClearFlag"},
             {21, &IDatabaseService::GetIndex, "GetIndex"},
             {22, &IDatabaseService::SetInterfaceVersion, "SetInterfaceVersion"},
             {23, &IDatabaseService::Convert, "Convert"},
-            {24, &IDatabaseService::ConvertCoreDataToCharInfo, "ConvertCoreDataToCharInfo"},
-            {25, &IDatabaseService::ConvertCharInfoToCoreData, "ConvertCharInfoToCoreData"},
-            {26,  &IDatabaseService::Append, "Append"},
+            {24, nullptr, "ConvertCoreDataToCharInfo"},
+            {25, nullptr, "ConvertCharInfoToCoreData"},
+            {26, nullptr, "Append"},
         };
         // clang-format on
 
         RegisterHandlers(functions);
-
-        manager->Initialize(metadata);
     }
 
 private:
@@ -66,7 +59,7 @@ private:
 
         LOG_DEBUG(Service_Mii, "called with source_flag={}", source_flag);
 
-        const bool is_updated = manager->IsUpdated(metadata, source_flag);
+        const bool is_updated = manager.IsUpdated(metadata, source_flag);
 
         IPC::ResponseBuilder rb{ctx, 3};
         rb.Push(ResultSuccess);
@@ -76,7 +69,7 @@ private:
     void IsFullDatabase(HLERequestContext& ctx) {
         LOG_DEBUG(Service_Mii, "called");
 
-        const bool is_full_database = manager->IsFullDatabase();
+        const bool is_full_database = manager.IsFullDatabase();
 
         IPC::ResponseBuilder rb{ctx, 3};
         rb.Push(ResultSuccess);
@@ -87,9 +80,9 @@ private:
         IPC::RequestParser rp{ctx};
         const auto source_flag{rp.PopRaw<SourceFlag>()};
 
-        const u32 mii_count = manager->GetCount(metadata, source_flag);
+        LOG_DEBUG(Service_Mii, "called with source_flag={}", source_flag);
 
-        LOG_DEBUG(Service_Mii, "called with source_flag={}, mii_count={}", source_flag, mii_count);
+        const u32 mii_count = manager.GetCount(metadata, source_flag);
 
         IPC::ResponseBuilder rb{ctx, 3};
         rb.Push(ResultSuccess);
@@ -101,17 +94,16 @@ private:
         const auto source_flag{rp.PopRaw<SourceFlag>()};
         const auto output_size{ctx.GetWriteBufferNumElements<CharInfoElement>()};
 
+        LOG_DEBUG(Service_Mii, "called with source_flag={}, out_size={}", source_flag, output_size);
+
         u32 mii_count{};
         std::vector<CharInfoElement> char_info_elements(output_size);
-        const auto result = manager->Get(metadata, char_info_elements, mii_count, source_flag);
+        Result result = manager.Get(metadata, char_info_elements, mii_count, source_flag);
 
         if (mii_count != 0) {
             ctx.WriteBuffer(char_info_elements);
         }
 
-        LOG_INFO(Service_Mii, "called with source_flag={}, out_size={}, mii_count={}", source_flag,
-                 output_size, mii_count);
-
         IPC::ResponseBuilder rb{ctx, 3};
         rb.Push(result);
         rb.Push(mii_count);
@@ -122,17 +114,16 @@ private:
         const auto source_flag{rp.PopRaw<SourceFlag>()};
         const auto output_size{ctx.GetWriteBufferNumElements<CharInfo>()};
 
+        LOG_DEBUG(Service_Mii, "called with source_flag={}, out_size={}", source_flag, output_size);
+
         u32 mii_count{};
         std::vector<CharInfo> char_info(output_size);
-        const auto result = manager->Get(metadata, char_info, mii_count, source_flag);
+        Result result = manager.Get(metadata, char_info, mii_count, source_flag);
 
         if (mii_count != 0) {
             ctx.WriteBuffer(char_info);
         }
 
-        LOG_INFO(Service_Mii, "called with source_flag={}, out_size={}, mii_count={}", source_flag,
-                 output_size, mii_count);
-
         IPC::ResponseBuilder rb{ctx, 3};
         rb.Push(result);
         rb.Push(mii_count);
@@ -143,10 +134,10 @@ private:
         const auto char_info{rp.PopRaw<CharInfo>()};
         const auto source_flag{rp.PopRaw<SourceFlag>()};
 
-        LOG_INFO(Service_Mii, "called with source_flag={}", source_flag);
+        LOG_DEBUG(Service_Mii, "called with source_flag={}", source_flag);
 
         CharInfo new_char_info{};
-        const auto result = manager->UpdateLatest(metadata, new_char_info, char_info, source_flag);
+        const auto result = manager.UpdateLatest(metadata, new_char_info, char_info, source_flag);
         if (result.IsFailure()) {
             IPC::ResponseBuilder rb{ctx, 2};
             rb.Push(result);
@@ -155,7 +146,7 @@ private:
 
         IPC::ResponseBuilder rb{ctx, 2 + sizeof(CharInfo) / sizeof(u32)};
         rb.Push(ResultSuccess);
-        rb.PushRaw(new_char_info);
+        rb.PushRaw<CharInfo>(new_char_info);
     }
 
     void BuildRandom(HLERequestContext& ctx) {
@@ -185,18 +176,18 @@ private:
         }
 
         CharInfo char_info{};
-        manager->BuildRandom(char_info, age, gender, race);
+        manager.BuildRandom(char_info, age, gender, race);
 
         IPC::ResponseBuilder rb{ctx, 2 + sizeof(CharInfo) / sizeof(u32)};
         rb.Push(ResultSuccess);
-        rb.PushRaw(char_info);
+        rb.PushRaw<CharInfo>(char_info);
     }
 
     void BuildDefault(HLERequestContext& ctx) {
         IPC::RequestParser rp{ctx};
         const auto index{rp.Pop<u32>()};
 
-        LOG_DEBUG(Service_Mii, "called with index={}", index);
+        LOG_INFO(Service_Mii, "called with index={}", index);
 
         if (index > 5) {
             IPC::ResponseBuilder rb{ctx, 2};
@@ -205,243 +196,11 @@ private:
         }
 
         CharInfo char_info{};
-        manager->BuildDefault(char_info, index);
+        manager.BuildDefault(char_info, index);
 
         IPC::ResponseBuilder rb{ctx, 2 + sizeof(CharInfo) / sizeof(u32)};
         rb.Push(ResultSuccess);
-        rb.PushRaw(char_info);
-    }
-
-    void Get2(HLERequestContext& ctx) {
-        IPC::RequestParser rp{ctx};
-        const auto source_flag{rp.PopRaw<SourceFlag>()};
-        const auto output_size{ctx.GetWriteBufferNumElements<StoreDataElement>()};
-
-        u32 mii_count{};
-        std::vector<StoreDataElement> store_data_elements(output_size);
-        const auto result = manager->Get(metadata, store_data_elements, mii_count, source_flag);
-
-        if (mii_count != 0) {
-            ctx.WriteBuffer(store_data_elements);
-        }
-
-        LOG_INFO(Service_Mii, "called with source_flag={}, out_size={}, mii_count={}", source_flag,
-                 output_size, mii_count);
-
-        IPC::ResponseBuilder rb{ctx, 3};
-        rb.Push(result);
-        rb.Push(mii_count);
-    }
-
-    void Get3(HLERequestContext& ctx) {
-        IPC::RequestParser rp{ctx};
-        const auto source_flag{rp.PopRaw<SourceFlag>()};
-        const auto output_size{ctx.GetWriteBufferNumElements<StoreData>()};
-
-        u32 mii_count{};
-        std::vector<StoreData> store_data(output_size);
-        const auto result = manager->Get(metadata, store_data, mii_count, source_flag);
-
-        if (mii_count != 0) {
-            ctx.WriteBuffer(store_data);
-        }
-
-        LOG_INFO(Service_Mii, "called with source_flag={}, out_size={}, mii_count={}", source_flag,
-                 output_size, mii_count);
-
-        IPC::ResponseBuilder rb{ctx, 3};
-        rb.Push(result);
-        rb.Push(mii_count);
-    }
-
-    void UpdateLatest1(HLERequestContext& ctx) {
-        IPC::RequestParser rp{ctx};
-        const auto store_data{rp.PopRaw<StoreData>()};
-        const auto source_flag{rp.PopRaw<SourceFlag>()};
-
-        LOG_INFO(Service_Mii, "called with source_flag={}", source_flag);
-
-        Result result = ResultSuccess;
-        if (!is_system) {
-            result = ResultPermissionDenied;
-        }
-
-        StoreData new_store_data{};
-        if (result.IsSuccess()) {
-            result = manager->UpdateLatest(metadata, new_store_data, store_data, source_flag);
-        }
-
-        if (result.IsFailure()) {
-            IPC::ResponseBuilder rb{ctx, 2};
-            rb.Push(result);
-            return;
-        }
-
-        IPC::ResponseBuilder rb{ctx, 2 + sizeof(StoreData) / sizeof(u32)};
-        rb.Push(ResultSuccess);
-        rb.PushRaw<StoreData>(new_store_data);
-    }
-
-    void FindIndex(HLERequestContext& ctx) {
-        IPC::RequestParser rp{ctx};
-        const auto create_id{rp.PopRaw<Common::UUID>()};
-        const auto is_special{rp.PopRaw<bool>()};
-
-        LOG_INFO(Service_Mii, "called with create_id={}, is_special={}",
-                 create_id.FormattedString(), is_special);
-
-        const s32 index = manager->FindIndex(create_id, is_special);
-
-        IPC::ResponseBuilder rb{ctx, 3};
-        rb.Push(ResultSuccess);
-        rb.Push(index);
-    }
-
-    void Move(HLERequestContext& ctx) {
-        IPC::RequestParser rp{ctx};
-        const auto create_id{rp.PopRaw<Common::UUID>()};
-        const auto new_index{rp.PopRaw<s32>()};
-
-        LOG_INFO(Service_Mii, "called with create_id={}, new_index={}", create_id.FormattedString(),
-                 new_index);
-
-        Result result = ResultSuccess;
-        if (!is_system) {
-            result = ResultPermissionDenied;
-        }
-
-        if (result.IsSuccess()) {
-            const u32 count = manager->GetCount(metadata, SourceFlag::Database);
-            if (new_index < 0 || new_index >= static_cast<s32>(count)) {
-                result = ResultInvalidArgument;
-            }
-        }
-
-        if (result.IsSuccess()) {
-            result = manager->Move(metadata, new_index, create_id);
-        }
-
-        IPC::ResponseBuilder rb{ctx, 2};
-        rb.Push(result);
-    }
-
-    void AddOrReplace(HLERequestContext& ctx) {
-        IPC::RequestParser rp{ctx};
-        const auto store_data{rp.PopRaw<StoreData>()};
-
-        LOG_INFO(Service_Mii, "called");
-
-        Result result = ResultSuccess;
-
-        if (!is_system) {
-            result = ResultPermissionDenied;
-        }
-
-        if (result.IsSuccess()) {
-            result = manager->AddOrReplace(metadata, store_data);
-        }
-
-        IPC::ResponseBuilder rb{ctx, 2};
-        rb.Push(result);
-    }
-
-    void Delete(HLERequestContext& ctx) {
-        IPC::RequestParser rp{ctx};
-        const auto create_id{rp.PopRaw<Common::UUID>()};
-
-        LOG_INFO(Service_Mii, "called, create_id={}", create_id.FormattedString());
-
-        Result result = ResultSuccess;
-
-        if (!is_system) {
-            result = ResultPermissionDenied;
-        }
-
-        if (result.IsSuccess()) {
-            result = manager->Delete(metadata, create_id);
-        }
-
-        IPC::ResponseBuilder rb{ctx, 2};
-        rb.Push(result);
-    }
-
-    void DestroyFile(HLERequestContext& ctx) {
-        // This calls nn::settings::fwdbg::GetSettingsItemValue("is_db_test_mode_enabled");
-        const bool is_db_test_mode_enabled = false;
-
-        LOG_INFO(Service_Mii, "called is_db_test_mode_enabled={}", is_db_test_mode_enabled);
-
-        Result result = ResultSuccess;
-
-        if (!is_db_test_mode_enabled) {
-            result = ResultTestModeOnly;
-        }
-
-        if (result.IsSuccess()) {
-            result = manager->DestroyFile(metadata);
-        }
-
-        IPC::ResponseBuilder rb{ctx, 2};
-        rb.Push(result);
-    }
-
-    void DeleteFile(HLERequestContext& ctx) {
-        // This calls nn::settings::fwdbg::GetSettingsItemValue("is_db_test_mode_enabled");
-        const bool is_db_test_mode_enabled = false;
-
-        LOG_INFO(Service_Mii, "called is_db_test_mode_enabled={}", is_db_test_mode_enabled);
-
-        Result result = ResultSuccess;
-
-        if (!is_db_test_mode_enabled) {
-            result = ResultTestModeOnly;
-        }
-
-        if (result.IsSuccess()) {
-            result = manager->DeleteFile();
-        }
-
-        IPC::ResponseBuilder rb{ctx, 2};
-        rb.Push(result);
-    }
-
-    void Format(HLERequestContext& ctx) {
-        // This calls nn::settings::fwdbg::GetSettingsItemValue("is_db_test_mode_enabled");
-        const bool is_db_test_mode_enabled = false;
-
-        LOG_INFO(Service_Mii, "called is_db_test_mode_enabled={}", is_db_test_mode_enabled);
-
-        Result result = ResultSuccess;
-
-        if (!is_db_test_mode_enabled) {
-            result = ResultTestModeOnly;
-        }
-
-        if (result.IsSuccess()) {
-            result = manager->Format(metadata);
-        }
-
-        IPC::ResponseBuilder rb{ctx, 2};
-        rb.Push(result);
-    }
-
-    void IsBrokenDatabaseWithClearFlag(HLERequestContext& ctx) {
-        LOG_DEBUG(Service_Mii, "called");
-
-        bool is_broken_with_clear_flag = false;
-        Result result = ResultSuccess;
-
-        if (!is_system) {
-            result = ResultPermissionDenied;
-        }
-
-        if (result.IsSuccess()) {
-            is_broken_with_clear_flag = manager->IsBrokenWithClearFlag(metadata);
-        }
-
-        IPC::ResponseBuilder rb{ctx, 3};
-        rb.Push(result);
-        rb.Push<u8>(is_broken_with_clear_flag);
+        rb.PushRaw<CharInfo>(char_info);
     }
 
     void GetIndex(HLERequestContext& ctx) {
@@ -451,7 +210,7 @@ private:
         LOG_DEBUG(Service_Mii, "called");
 
         s32 index{};
-        const auto result = manager->GetIndex(metadata, info, index);
+        const auto result = manager.GetIndex(metadata, info, index);
 
         IPC::ResponseBuilder rb{ctx, 3};
         rb.Push(result);
@@ -464,7 +223,7 @@ private:
 
         LOG_INFO(Service_Mii, "called, interface_version={:08X}", interface_version);
 
-        manager->SetInterfaceVersion(metadata, interface_version);
+        manager.SetInterfaceVersion(metadata, interface_version);
 
         IPC::ResponseBuilder rb{ctx, 2};
         rb.Push(ResultSuccess);
@@ -477,96 +236,51 @@ private:
         LOG_INFO(Service_Mii, "called");
 
         CharInfo char_info{};
-        const auto result = manager->ConvertV3ToCharInfo(char_info, mii_v3);
+        manager.ConvertV3ToCharInfo(char_info, mii_v3);
 
         IPC::ResponseBuilder rb{ctx, 2 + sizeof(CharInfo) / sizeof(u32)};
-        rb.Push(result);
+        rb.Push(ResultSuccess);
         rb.PushRaw<CharInfo>(char_info);
     }
 
-    void ConvertCoreDataToCharInfo(HLERequestContext& ctx) {
-        IPC::RequestParser rp{ctx};
-        const auto core_data{rp.PopRaw<CoreData>()};
-
-        LOG_INFO(Service_Mii, "called");
-
-        CharInfo char_info{};
-        const auto result = manager->ConvertCoreDataToCharInfo(char_info, core_data);
-
-        IPC::ResponseBuilder rb{ctx, 2 + sizeof(CharInfo) / sizeof(u32)};
-        rb.Push(result);
-        rb.PushRaw<CharInfo>(char_info);
-    }
-
-    void ConvertCharInfoToCoreData(HLERequestContext& ctx) {
-        IPC::RequestParser rp{ctx};
-        const auto char_info{rp.PopRaw<CharInfo>()};
-
-        LOG_INFO(Service_Mii, "called");
-
-        CoreData core_data{};
-        const auto result = manager->ConvertCharInfoToCoreData(core_data, char_info);
-
-        IPC::ResponseBuilder rb{ctx, 2 + sizeof(CoreData) / sizeof(u32)};
-        rb.Push(result);
-        rb.PushRaw<CoreData>(core_data);
-    }
-
-    void Append(HLERequestContext& ctx) {
-        IPC::RequestParser rp{ctx};
-        const auto char_info{rp.PopRaw<CharInfo>()};
-
-        LOG_INFO(Service_Mii, "called");
-
-        const auto result = manager->Append(metadata, char_info);
-
-        IPC::ResponseBuilder rb{ctx, 2};
-        rb.Push(result);
-    }
-
-    std::shared_ptr<MiiManager> manager = nullptr;
+    MiiManager manager{};
     DatabaseSessionMetadata metadata{};
     bool is_system{};
 };
 
-MiiDBModule::MiiDBModule(Core::System& system_, const char* name_,
-                         std::shared_ptr<MiiManager> mii_manager, bool is_system_)
-    : ServiceFramework{system_, name_}, manager{mii_manager}, is_system{is_system_} {
-    // clang-format off
-    static const FunctionInfo functions[] = {
-        {0, &MiiDBModule::GetDatabaseService, "GetDatabaseService"},
-    };
-    // clang-format on
+class MiiDBModule final : public ServiceFramework<MiiDBModule> {
+public:
+    explicit MiiDBModule(Core::System& system_, const char* name_, bool is_system_)
+        : ServiceFramework{system_, name_}, is_system{is_system_} {
+        // clang-format off
+        static const FunctionInfo functions[] = {
+            {0, &MiiDBModule::GetDatabaseService, "GetDatabaseService"},
+        };
+        // clang-format on
 
-    RegisterHandlers(functions);
-
-    if (manager == nullptr) {
-        manager = std::make_shared<MiiManager>();
+        RegisterHandlers(functions);
     }
-}
 
-MiiDBModule::~MiiDBModule() = default;
+private:
+    void GetDatabaseService(HLERequestContext& ctx) {
+        IPC::ResponseBuilder rb{ctx, 2, 0, 1};
+        rb.Push(ResultSuccess);
+        rb.PushIpcInterface<IDatabaseService>(system, is_system);
 
-void MiiDBModule::GetDatabaseService(HLERequestContext& ctx) {
-    IPC::ResponseBuilder rb{ctx, 2, 0, 1};
-    rb.Push(ResultSuccess);
-    rb.PushIpcInterface<IDatabaseService>(system, manager, is_system);
+        LOG_DEBUG(Service_Mii, "called");
+    }
 
-    LOG_DEBUG(Service_Mii, "called");
-}
-
-std::shared_ptr<MiiManager> MiiDBModule::GetMiiManager() {
-    return manager;
-}
+    bool is_system{};
+};
 
 class MiiImg final : public ServiceFramework<MiiImg> {
 public:
     explicit MiiImg(Core::System& system_) : ServiceFramework{system_, "miiimg"} {
         // clang-format off
         static const FunctionInfo functions[] = {
-            {0, &MiiImg::Initialize, "Initialize"},
+            {0, nullptr, "Initialize"},
             {10, nullptr, "Reload"},
-            {11, &MiiImg::GetCount, "GetCount"},
+            {11, nullptr, "GetCount"},
             {12, nullptr, "IsEmpty"},
             {13, nullptr, "IsFull"},
             {14, nullptr, "GetAttribute"},
@@ -583,32 +297,15 @@ public:
 
         RegisterHandlers(functions);
     }
-
-private:
-    void Initialize(HLERequestContext& ctx) {
-        LOG_INFO(Service_Mii, "called");
-
-        IPC::ResponseBuilder rb{ctx, 2};
-        rb.Push(ResultSuccess);
-    }
-
-    void GetCount(HLERequestContext& ctx) {
-        LOG_DEBUG(Service_Mii, "called");
-
-        IPC::ResponseBuilder rb{ctx, 3};
-        rb.Push(ResultSuccess);
-        rb.Push(0);
-    }
 };
 
 void LoopProcess(Core::System& system) {
     auto server_manager = std::make_unique<ServerManager>(system);
-    std::shared_ptr<MiiManager> manager = nullptr;
 
-    server_manager->RegisterNamedService(
-        "mii:e", std::make_shared<MiiDBModule>(system, "mii:e", manager, true));
-    server_manager->RegisterNamedService(
-        "mii:u", std::make_shared<MiiDBModule>(system, "mii:u", manager, false));
+    server_manager->RegisterNamedService("mii:e",
+                                         std::make_shared<MiiDBModule>(system, "mii:e", true));
+    server_manager->RegisterNamedService("mii:u",
+                                         std::make_shared<MiiDBModule>(system, "mii:u", false));
     server_manager->RegisterNamedService("miiimg", std::make_shared<MiiImg>(system));
     ServerManager::RunServer(std::move(server_manager));
 }

src/core/hle/service/mii/mii.h

@@ -3,29 +3,11 @@
 
 #pragma once
 
-#include "core/hle/service/service.h"
-
 namespace Core {
 class System;
 }
 
 namespace Service::Mii {
-class MiiManager;
-
-class MiiDBModule final : public ServiceFramework<MiiDBModule> {
-public:
-    explicit MiiDBModule(Core::System& system_, const char* name_,
-                         std::shared_ptr<MiiManager> mii_manager, bool is_system_);
-    ~MiiDBModule() override;
-
-    std::shared_ptr<MiiManager> GetMiiManager();
-
-private:
-    void GetDatabaseService(HLERequestContext& ctx);
-
-    std::shared_ptr<MiiManager> manager = nullptr;
-    bool is_system{};
-};
 
 void LoopProcess(Core::System& system);
 

src/core/hle/service/mii/mii_database.cpp

@@ -1,142 +0,0 @@
-// SPDX-FileCopyrightText: Copyright 2023 yuzu Emulator Project
-// SPDX-License-Identifier: GPL-2.0-or-later
-
-#include "core/hle/service/mii/mii_database.h"
-#include "core/hle/service/mii/mii_result.h"
-#include "core/hle/service/mii/mii_util.h"
-
-namespace Service::Mii {
-
-u8 NintendoFigurineDatabase::GetDatabaseLength() const {
-    return database_length;
-}
-
-bool NintendoFigurineDatabase::IsFull() const {
-    return database_length >= MaxDatabaseLength;
-}
-
-StoreData NintendoFigurineDatabase::Get(std::size_t index) const {
-    StoreData store_data = miis.at(index);
-
-    // This hack is to make external database dumps compatible
-    store_data.SetDeviceChecksum();
-
-    return store_data;
-}
-
-u32 NintendoFigurineDatabase::GetCount(const DatabaseSessionMetadata& metadata) const {
-    if (magic == MiiMagic) {
-        return GetDatabaseLength();
-    }
-
-    u32 mii_count{};
-    for (std::size_t index = 0; index < mii_count; ++index) {
-        const auto& store_data = Get(index);
-        if (!store_data.IsSpecial()) {
-            mii_count++;
-        }
-    }
-
-    return mii_count;
-}
-
-bool NintendoFigurineDatabase::GetIndexByCreatorId(u32& out_index,
-                                                   const Common::UUID& create_id) const {
-    for (std::size_t index = 0; index < database_length; ++index) {
-        if (miis[index].GetCreateId() == create_id) {
-            out_index = static_cast<u32>(index);
-            return true;
-        }
-    }
-
-    return false;
-}
-
-Result NintendoFigurineDatabase::Move(u32 current_index, u32 new_index) {
-    if (current_index == new_index) {
-        return ResultNotUpdated;
-    }
-
-    const StoreData store_data = miis[current_index];
-
-    if (new_index > current_index) {
-        // Shift left
-        const u32 index_diff = new_index - current_index;
-        for (std::size_t i = 0; i < index_diff; i++) {
-            miis[current_index + i] = miis[current_index + i + 1];
-        }
-    } else {
-        // Shift right
-        const u32 index_diff = current_index - new_index;
-        for (std::size_t i = 0; i < index_diff; i++) {
-            miis[current_index - i] = miis[current_index - i - 1];
-        }
-    }
-
-    miis[new_index] = store_data;
-    crc = GenerateDatabaseCrc();
-    return ResultSuccess;
-}
-
-void NintendoFigurineDatabase::Replace(u32 index, const StoreData& store_data) {
-    miis[index] = store_data;
-    crc = GenerateDatabaseCrc();
-}
-
-void NintendoFigurineDatabase::Add(const StoreData& store_data) {
-    miis[database_length] = store_data;
-    database_length++;
-    crc = GenerateDatabaseCrc();
-}
-
-void NintendoFigurineDatabase::Delete(u32 index) {
-    // Shift left
-    const s32 new_database_size = database_length - 1;
-    if (static_cast<s32>(index) < new_database_size) {
-        for (std::size_t i = index; i < static_cast<std::size_t>(new_database_size); i++) {
-            miis[i] = miis[i + 1];
-        }
-    }
-
-    database_length = static_cast<u8>(new_database_size);
-    crc = GenerateDatabaseCrc();
-}
-
-void NintendoFigurineDatabase::CleanDatabase() {
-    miis = {};
-    version = 1;
-    magic = DatabaseMagic;
-    database_length = 0;
-    crc = GenerateDatabaseCrc();
-}
-
-void NintendoFigurineDatabase::CorruptCrc() {
-    crc = GenerateDatabaseCrc();
-    crc = ~crc;
-}
-
-Result NintendoFigurineDatabase::CheckIntegrity() {
-    if (magic != DatabaseMagic) {
-        return ResultInvalidDatabaseSignature;
-    }
-
-    if (version != 1) {
-        return ResultInvalidDatabaseVersion;
-    }
-
-    if (crc != GenerateDatabaseCrc()) {
-        return ResultInvalidDatabaseChecksum;
-    }
-
-    if (database_length >= MaxDatabaseLength) {
-        return ResultInvalidDatabaseLength;
-    }
-
-    return ResultSuccess;
-}
-
-u16 NintendoFigurineDatabase::GenerateDatabaseCrc() {
-    return MiiUtil::CalculateCrc16(&magic, sizeof(NintendoFigurineDatabase) - sizeof(crc));
-}
-
-} // namespace Service::Mii

src/core/hle/service/mii/mii_database.h

@@ -1,66 +0,0 @@
-// SPDX-FileCopyrightText: Copyright 2023 yuzu Emulator Project
-// SPDX-License-Identifier: GPL-2.0-or-later
-
-#pragma once
-
-#include "core/hle/result.h"
-#include "core/hle/service/mii/types/store_data.h"
-
-namespace Service::Mii {
-
-constexpr std::size_t MaxDatabaseLength{100};
-constexpr u32 MiiMagic{0xa523b78f};
-constexpr u32 DatabaseMagic{0x4244464e}; // NFDB
-
-class NintendoFigurineDatabase {
-public:
-    /// Returns the total mii count.
-    u8 GetDatabaseLength() const;
-
-    /// Returns true if database is full.
-    bool IsFull() const;
-
-    /// Returns the mii of the specified index.
-    StoreData Get(std::size_t index) const;
-
-    /// Returns the total mii count. Ignoring special mii.
-    u32 GetCount(const DatabaseSessionMetadata& metadata) const;
-
-    /// Returns the index of a mii. If the mii isn't found returns false.
-    bool GetIndexByCreatorId(u32& out_index, const Common::UUID& create_id) const;
-
-    /// Moves the location of a specific mii.
-    Result Move(u32 current_index, u32 new_index);
-
-    /// Replaces mii with new data.
-    void Replace(u32 index, const StoreData& store_data);
-
-    /// Adds a new mii to the end of the database.
-    void Add(const StoreData& store_data);
-
-    /// Removes mii from database and shifts left the remainding data.
-    void Delete(u32 index);
-
-    /// Deletes all contents with a fresh database
-    void CleanDatabase();
-
-    /// Intentionally sets a bad checksum
-    void CorruptCrc();
-
-    /// Returns success if database is valid otherwise returns the corresponding error code.
-    Result CheckIntegrity();
-
-private:
-    /// Returns the checksum of the database
-    u16 GenerateDatabaseCrc();
-
-    u32 magic{}; // 'NFDB'
-    std::array<StoreData, MaxDatabaseLength> miis{};
-    u8 version{};
-    u8 database_length{};
-    u16 crc{};
-};
-static_assert(sizeof(NintendoFigurineDatabase) == 0x1A98,
-              "NintendoFigurineDatabase has incorrect size.");
-
-}; // namespace Service::Mii

src/core/hle/service/mii/mii_database_manager.cpp

@@ -1,420 +0,0 @@
-// SPDX-FileCopyrightText: Copyright 2023 yuzu Emulator Project
-// SPDX-License-Identifier: GPL-2.0-or-later
-
-#include "common/assert.h"
-#include "common/fs/file.h"
-#include "common/fs/fs.h"
-#include "common/fs/path_util.h"
-#include "common/logging/log.h"
-#include "common/string_util.h"
-
-#include "core/hle/service/mii/mii_database_manager.h"
-#include "core/hle/service/mii/mii_result.h"
-#include "core/hle/service/mii/mii_util.h"
-#include "core/hle/service/mii/types/char_info.h"
-#include "core/hle/service/mii/types/store_data.h"
-
-namespace Service::Mii {
-const char* DbFileName = "MiiDatabase.dat";
-
-DatabaseManager::DatabaseManager() {}
-
-Result DatabaseManager::MountSaveData() {
-    if (!is_save_data_mounted) {
-        system_save_dir =
-            Common::FS::GetYuzuPath(Common::FS::YuzuPath::NANDDir) / "system/save/8000000000000030";
-        if (is_test_db) {
-            system_save_dir = Common::FS::GetYuzuPath(Common::FS::YuzuPath::NANDDir) /
-                              "system/save/8000000000000031";
-        }
-
-        // mount point should be "mii:"
-
-        if (!Common::FS::CreateDirs(system_save_dir)) {
-            return ResultUnknown;
-        }
-    }
-
-    is_save_data_mounted = true;
-    return ResultSuccess;
-}
-
-Result DatabaseManager::Initialize(DatabaseSessionMetadata& metadata, bool& is_database_broken) {
-    is_database_broken = false;
-    if (!is_save_data_mounted) {
-        return ResultInvalidArgument;
-    }
-
-    database.CleanDatabase();
-    update_counter++;
-    metadata.update_counter = update_counter;
-
-    const Common::FS::IOFile db_file{system_save_dir / DbFileName, Common::FS::FileAccessMode::Read,
-                                     Common::FS::FileType::BinaryFile};
-
-    if (!db_file.IsOpen()) {
-        return SaveDatabase();
-    }
-
-    if (Common::FS::GetSize(system_save_dir / DbFileName) != sizeof(NintendoFigurineDatabase)) {
-        is_database_broken = true;
-    }
-
-    if (db_file.Read(database) != 1) {
-        is_database_broken = true;
-    }
-
-    if (is_database_broken) {
-        // Dragons happen here for simplicity just clean the database
-        LOG_ERROR(Service_Mii, "Mii database is corrupted");
-        database.CleanDatabase();
-        return ResultUnknown;
-    }
-
-    const auto result = database.CheckIntegrity();
-
-    if (result.IsError()) {
-        LOG_ERROR(Service_Mii, "Mii database is corrupted 0x{:0x}", result.raw);
-        database.CleanDatabase();
-        return ResultSuccess;
-    }
-
-    LOG_INFO(Service_Mii, "Successfully loaded mii database. size={}",
-             database.GetDatabaseLength());
-    return ResultSuccess;
-}
-
-bool DatabaseManager::IsFullDatabase() const {
-    return database.GetDatabaseLength() == MaxDatabaseLength;
-}
-
-bool DatabaseManager::IsModified() const {
-    return is_moddified;
-}
-
-u64 DatabaseManager::GetUpdateCounter() const {
-    return update_counter;
-}
-
-u32 DatabaseManager::GetCount(const DatabaseSessionMetadata& metadata) const {
-    const u32 database_size = database.GetDatabaseLength();
-    if (metadata.magic == MiiMagic) {
-        return database_size;
-    }
-
-    // Special mii can't be used. Skip those.
-
-    u32 mii_count{};
-    for (std::size_t index = 0; index < database_size; ++index) {
-        const auto& store_data = database.Get(index);
-        if (store_data.IsSpecial()) {
-            continue;
-        }
-        mii_count++;
-    }
-
-    return mii_count;
-}
-
-void DatabaseManager::Get(StoreData& out_store_data, std::size_t index,
-                          const DatabaseSessionMetadata& metadata) const {
-    if (metadata.magic == MiiMagic) {
-        out_store_data = database.Get(index);
-        return;
-    }
-
-    // The index refeers to the mii index without special mii.
-    // Search on the database until we find it
-
-    u32 virtual_index = 0;
-    const u32 database_size = database.GetDatabaseLength();
-    for (std::size_t i = 0; i < database_size; ++i) {
-        const auto& store_data = database.Get(i);
-        if (store_data.IsSpecial()) {
-            continue;
-        }
-        if (virtual_index == index) {
-            out_store_data = store_data;
-            return;
-        }
-        virtual_index++;
-    }
-
-    // This function doesn't fail. It returns the first mii instead
-    out_store_data = database.Get(0);
-}
-
-Result DatabaseManager::FindIndex(s32& out_index, const Common::UUID& create_id,
-                                  bool is_special) const {
-    u32 index{};
-    const bool is_found = database.GetIndexByCreatorId(index, create_id);
-
-    if (!is_found) {
-        return ResultNotFound;
-    }
-
-    if (is_special) {
-        out_index = index;
-        return ResultSuccess;
-    }
-
-    if (database.Get(index).IsSpecial()) {
-        return ResultNotFound;
-    }
-
-    out_index = 0;
-
-    if (index < 1) {
-        return ResultSuccess;
-    }
-
-    for (std::size_t i = 0; i < index; ++i) {
-        if (database.Get(i).IsSpecial()) {
-            continue;
-        }
-        out_index++;
-    }
-    return ResultSuccess;
-}
-
-Result DatabaseManager::FindIndex(const DatabaseSessionMetadata& metadata, u32& out_index,
-                                  const Common::UUID& create_id) const {
-    u32 index{};
-    const bool is_found = database.GetIndexByCreatorId(index, create_id);
-
-    if (!is_found) {
-        return ResultNotFound;
-    }
-
-    if (metadata.magic == MiiMagic) {
-        out_index = index;
-        return ResultSuccess;
-    }
-
-    if (database.Get(index).IsSpecial()) {
-        return ResultNotFound;
-    }
-
-    out_index = 0;
-
-    if (index < 1) {
-        return ResultSuccess;
-    }
-
-    // The index refeers to the mii index without special mii.
-    // Search on the database until we find it
-
-    for (std::size_t i = 0; i <= index; ++i) {
-        const auto& store_data = database.Get(i);
-        if (store_data.IsSpecial()) {
-            continue;
-        }
-        out_index++;
-    }
-    return ResultSuccess;
-}
-
-Result DatabaseManager::FindMoveIndex(u32& out_index, u32 new_index,
-                                      const Common::UUID& create_id) const {
-    const auto database_size = database.GetDatabaseLength();
-
-    if (database_size >= 1) {
-        u32 virtual_index{};
-        for (std::size_t i = 0; i < database_size; ++i) {
-            const StoreData& store_data = database.Get(i);
-            if (store_data.IsSpecial()) {
-                continue;
-            }
-            if (virtual_index == new_index) {
-                const bool is_found = database.GetIndexByCreatorId(out_index, create_id);
-                if (!is_found) {
-                    return ResultNotFound;
-                }
-                if (store_data.IsSpecial()) {
-                    return ResultInvalidOperation;
-                }
-                return ResultSuccess;
-            }
-            virtual_index++;
-        }
-    }
-
-    const bool is_found = database.GetIndexByCreatorId(out_index, create_id);
-    if (!is_found) {
-        return ResultNotFound;
-    }
-    const StoreData& store_data = database.Get(out_index);
-    if (store_data.IsSpecial()) {
-        return ResultInvalidOperation;
-    }
-    return ResultSuccess;
-}
-
-Result DatabaseManager::Move(DatabaseSessionMetadata& metadata, u32 new_index,
-                             const Common::UUID& create_id) {
-    u32 current_index{};
-    if (metadata.magic == MiiMagic) {
-        const bool is_found = database.GetIndexByCreatorId(current_index, create_id);
-        if (!is_found) {
-            return ResultNotFound;
-        }
-    } else {
-        const auto result = FindMoveIndex(current_index, new_index, create_id);
-        if (result.IsError()) {
-            return result;
-        }
-    }
-
-    const auto result = database.Move(current_index, new_index);
-    if (result.IsFailure()) {
-        return result;
-    }
-
-    is_moddified = true;
-    update_counter++;
-    metadata.update_counter = update_counter;
-    return ResultSuccess;
-}
-
-Result DatabaseManager::AddOrReplace(DatabaseSessionMetadata& metadata,
-                                     const StoreData& store_data) {
-    if (store_data.IsValid() != ValidationResult::NoErrors) {
-        return ResultInvalidStoreData;
-    }
-    if (metadata.magic != MiiMagic && store_data.IsSpecial()) {
-        return ResultInvalidOperation;
-    }
-
-    u32 index{};
-    const bool is_found = database.GetIndexByCreatorId(index, store_data.GetCreateId());
-    if (is_found) {
-        const StoreData& old_store_data = database.Get(index);
-
-        if (store_data.IsSpecial() != old_store_data.IsSpecial()) {
-            return ResultInvalidOperation;
-        }
-
-        database.Replace(index, store_data);
-    } else {
-        if (database.IsFull()) {
-            return ResultDatabaseFull;
-        }
-
-        database.Add(store_data);
-    }
-
-    is_moddified = true;
-    update_counter++;
-    metadata.update_counter = update_counter;
-    return ResultSuccess;
-}
-
-Result DatabaseManager::Delete(DatabaseSessionMetadata& metadata, const Common::UUID& create_id) {
-    u32 index{};
-    const bool is_found = database.GetIndexByCreatorId(index, create_id);
-    if (!is_found) {
-        return ResultNotFound;
-    }
-
-    if (metadata.magic != MiiMagic) {
-        const auto& store_data = database.Get(index);
-        if (store_data.IsSpecial()) {
-            return ResultInvalidOperation;
-        }
-    }
-
-    database.Delete(index);
-
-    is_moddified = true;
-    update_counter++;
-    metadata.update_counter = update_counter;
-    return ResultSuccess;
-}
-
-Result DatabaseManager::Append(DatabaseSessionMetadata& metadata, const CharInfo& char_info) {
-    if (char_info.Verify() != ValidationResult::NoErrors) {
-        return ResultInvalidCharInfo2;
-    }
-    if (char_info.GetType() == 1) {
-        return ResultInvalidCharInfoType;
-    }
-
-    u32 index{};
-    StoreData store_data{};
-
-    // Loop until the mii we created is not on the database
-    do {
-        store_data.BuildWithCharInfo(char_info);
-    } while (database.GetIndexByCreatorId(index, store_data.GetCreateId()));
-
-    const Result result = store_data.Restore();
-
-    if (result.IsSuccess() || result == ResultNotUpdated) {
-        return AddOrReplace(metadata, store_data);
-    }
-
-    return result;
-}
-
-Result DatabaseManager::DestroyFile(DatabaseSessionMetadata& metadata) {
-    database.CorruptCrc();
-
-    is_moddified = true;
-    update_counter++;
-    metadata.update_counter = update_counter;
-
-    const auto result = SaveDatabase();
-    database.CleanDatabase();
-
-    return result;
-}
-
-Result DatabaseManager::DeleteFile() {
-    const bool result = Common::FS::RemoveFile(system_save_dir / DbFileName);
-    // TODO: Return proper FS error here
-    return result ? ResultSuccess : ResultUnknown;
-}
-
-void DatabaseManager::Format(DatabaseSessionMetadata& metadata) {
-    database.CleanDatabase();
-    is_moddified = true;
-    update_counter++;
-    metadata.update_counter = update_counter;
-}
-
-Result DatabaseManager::SaveDatabase() {
-    // TODO: Replace unknown error codes with proper FS error codes when available
-
-    if (!Common::FS::Exists(system_save_dir / DbFileName)) {
-        if (!Common::FS::NewFile(system_save_dir / DbFileName)) {
-            LOG_ERROR(Service_Mii, "Failed to create mii database");
-            return ResultUnknown;
-        }
-    }
-
-    const auto file_size = Common::FS::GetSize(system_save_dir / DbFileName);
-    if (file_size != 0 && file_size != sizeof(NintendoFigurineDatabase)) {
-        if (!Common::FS::RemoveFile(system_save_dir / DbFileName)) {
-            LOG_ERROR(Service_Mii, "Failed to delete mii database");
-            return ResultUnknown;
-        }
-        if (!Common::FS::NewFile(system_save_dir / DbFileName)) {
-            LOG_ERROR(Service_Mii, "Failed to create mii database");
-            return ResultUnknown;
-        }
-    }
-
-    const Common::FS::IOFile db_file{system_save_dir / DbFileName,
-                                     Common::FS::FileAccessMode::ReadWrite,
-                                     Common::FS::FileType::BinaryFile};
-
-    if (db_file.Write(database) != 1) {
-        LOG_ERROR(Service_Mii, "Failed to save mii database");
-        return ResultUnknown;
-    }
-
-    is_moddified = false;
-    return ResultSuccess;
-}
-
-} // namespace Service::Mii

src/core/hle/service/mii/mii_database_manager.h

@@ -1,58 +0,0 @@
-// SPDX-FileCopyrightText: Copyright 2023 yuzu Emulator Project
-// SPDX-License-Identifier: GPL-2.0-or-later
-
-#pragma once
-
-#include "common/fs/fs.h"
-#include "core/hle/result.h"
-#include "core/hle/service/mii/mii_database.h"
-
-namespace Service::Mii {
-class CharInfo;
-class StoreData;
-
-class DatabaseManager {
-public:
-    DatabaseManager();
-    Result MountSaveData();
-    Result Initialize(DatabaseSessionMetadata& metadata, bool& is_database_broken);
-
-    bool IsFullDatabase() const;
-    bool IsModified() const;
-    u64 GetUpdateCounter() const;
-
-    void Get(StoreData& out_store_data, std::size_t index,
-             const DatabaseSessionMetadata& metadata) const;
-    u32 GetCount(const DatabaseSessionMetadata& metadata) const;
-
-    Result FindIndex(s32& out_index, const Common::UUID& create_id, bool is_special) const;
-    Result FindIndex(const DatabaseSessionMetadata& metadata, u32& out_index,
-                     const Common::UUID& create_id) const;
-    Result FindMoveIndex(u32& out_index, u32 new_index, const Common::UUID& create_id) const;
-
-    Result Move(DatabaseSessionMetadata& metadata, u32 current_index,
-                const Common::UUID& create_id);
-    Result AddOrReplace(DatabaseSessionMetadata& metadata, const StoreData& out_store_data);
-    Result Delete(DatabaseSessionMetadata& metadata, const Common::UUID& create_id);
-    Result Append(DatabaseSessionMetadata& metadata, const CharInfo& char_info);
-
-    Result DestroyFile(DatabaseSessionMetadata& metadata);
-    Result DeleteFile();
-    void Format(DatabaseSessionMetadata& metadata);
-
-    Result SaveDatabase();
-
-private:
-    // This is the global value of
-    // nn::settings::fwdbg::GetSettingsItemValue("is_db_test_mode_enabled");
-    bool is_test_db{};
-
-    bool is_moddified{};
-    bool is_save_data_mounted{};
-    u64 update_counter{};
-    NintendoFigurineDatabase database{};
-
-    std::filesystem::path system_save_dir{};
-};
-
-}; // namespace Service::Mii

src/core/hle/service/mii/mii_manager.cpp

@@ -1,26 +1,59 @@
 // SPDX-FileCopyrightText: Copyright 2020 yuzu Emulator Project
 // SPDX-License-Identifier: GPL-2.0-or-later
 
+#include <cstring>
+#include <random>
+
+#include "common/assert.h"
 #include "common/logging/log.h"
-#include "core/hle/service/mii/mii_database_manager.h"
+#include "common/string_util.h"
+
+#include "core/hle/service/acc/profile_manager.h"
 #include "core/hle/service/mii/mii_manager.h"
 #include "core/hle/service/mii/mii_result.h"
 #include "core/hle/service/mii/mii_util.h"
-#include "core/hle/service/mii/types/char_info.h"
 #include "core/hle/service/mii/types/core_data.h"
 #include "core/hle/service/mii/types/raw_data.h"
-#include "core/hle/service/mii/types/store_data.h"
-#include "core/hle/service/mii/types/ver3_store_data.h"
 
 namespace Service::Mii {
 constexpr std::size_t DefaultMiiCount{RawData::DefaultMii.size()};
 
 MiiManager::MiiManager() {}
 
-Result MiiManager::Initialize(DatabaseSessionMetadata& metadata) {
-    database_manager.MountSaveData();
-    database_manager.Initialize(metadata, is_broken_with_clear_flag);
-    return ResultSuccess;
+bool MiiManager::IsUpdated(DatabaseSessionMetadata& metadata, SourceFlag source_flag) const {
+    if ((source_flag & SourceFlag::Database) == SourceFlag::None) {
+        return false;
+    }
+
+    const auto metadata_update_counter = metadata.update_counter;
+    metadata.update_counter = update_counter;
+    return metadata_update_counter != update_counter;
+}
+
+bool MiiManager::IsFullDatabase() const {
+    // TODO(bunnei): We don't implement the Mii database, so it cannot be full
+    return false;
+}
+
+u32 MiiManager::GetCount(const DatabaseSessionMetadata& metadata, SourceFlag source_flag) const {
+    u32 mii_count{};
+    if ((source_flag & SourceFlag::Default) != SourceFlag::None) {
+        mii_count += DefaultMiiCount;
+    }
+    if ((source_flag & SourceFlag::Database) != SourceFlag::None) {
+        // TODO(bunnei): We don't implement the Mii database, but when we do, update this
+    }
+    return mii_count;
+}
+
+Result MiiManager::UpdateLatest(DatabaseSessionMetadata& metadata, CharInfo& out_char_info,
+                                const CharInfo& char_info, SourceFlag source_flag) {
+    if ((source_flag & SourceFlag::Database) == SourceFlag::None) {
+        return ResultNotFound;
+    }
+
+    // TODO(bunnei): We don't implement the Mii database, so we can't have an entry
+    return ResultNotFound;
 }
 
 void MiiManager::BuildDefault(CharInfo& out_char_info, u32 index) const {
@@ -41,368 +74,39 @@ void MiiManager::BuildRandom(CharInfo& out_char_info, Age age, Gender gender, Ra
     out_char_info.SetFromStoreData(store_data);
 }
 
-bool MiiManager::IsFullDatabase() const {
-    return database_manager.IsFullDatabase();
-}
-
-void MiiManager::SetInterfaceVersion(DatabaseSessionMetadata& metadata, u32 version) const {
-    metadata.interface_version = version;
-}
-
-bool MiiManager::IsUpdated(DatabaseSessionMetadata& metadata, SourceFlag source_flag) const {
-    if ((source_flag & SourceFlag::Database) == SourceFlag::None) {
-        return false;
-    }
-
-    const u64 metadata_update_counter = metadata.update_counter;
-    const u64 database_update_counter = database_manager.GetUpdateCounter();
-    metadata.update_counter = database_update_counter;
-    return metadata_update_counter != database_update_counter;
-}
-
-u32 MiiManager::GetCount(const DatabaseSessionMetadata& metadata, SourceFlag source_flag) const {
-    u32 mii_count{};
-    if ((source_flag & SourceFlag::Default) != SourceFlag::None) {
-        mii_count += DefaultMiiCount;
-    }
-    if ((source_flag & SourceFlag::Database) != SourceFlag::None) {
-        mii_count += database_manager.GetCount(metadata);
-    }
-    return mii_count;
-}
-
-Result MiiManager::Move(DatabaseSessionMetadata& metadata, u32 index,
-                        const Common::UUID& create_id) {
-    const auto result = database_manager.Move(metadata, index, create_id);
-
-    if (result.IsFailure()) {
-        return result;
-    }
-
-    if (!database_manager.IsModified()) {
-        return ResultNotUpdated;
-    }
-
-    return database_manager.SaveDatabase();
-}
-
-Result MiiManager::AddOrReplace(DatabaseSessionMetadata& metadata, const StoreData& store_data) {
-    const auto result = database_manager.AddOrReplace(metadata, store_data);
-
-    if (result.IsFailure()) {
-        return result;
-    }
-
-    if (!database_manager.IsModified()) {
-        return ResultNotUpdated;
-    }
-
-    return database_manager.SaveDatabase();
-}
-
-Result MiiManager::Delete(DatabaseSessionMetadata& metadata, const Common::UUID& create_id) {
-    const auto result = database_manager.Delete(metadata, create_id);
-
-    if (result.IsFailure()) {
-        return result;
-    }
-
-    if (!database_manager.IsModified()) {
-        return ResultNotUpdated;
-    }
-
-    return database_manager.SaveDatabase();
-}
-
-s32 MiiManager::FindIndex(const Common::UUID& create_id, bool is_special) const {
-    s32 index{};
-    const auto result = database_manager.FindIndex(index, create_id, is_special);
-    if (result.IsError()) {
-        index = -1;
-    }
-    return index;
-}
-
-Result MiiManager::GetIndex(const DatabaseSessionMetadata& metadata, const CharInfo& char_info,
-                            s32& out_index) const {
-    if (char_info.Verify() != ValidationResult::NoErrors) {
-        return ResultInvalidCharInfo;
-    }
-
-    s32 index{};
-    const bool is_special = metadata.magic == MiiMagic;
-    const auto result = database_manager.FindIndex(index, char_info.GetCreateId(), is_special);
-
-    if (result.IsError()) {
-        index = -1;
-    }
-
-    if (index == -1) {
-        return ResultNotFound;
-    }
-
-    out_index = index;
-    return ResultSuccess;
-}
-
-Result MiiManager::Append(DatabaseSessionMetadata& metadata, const CharInfo& char_info) {
-    const auto result = database_manager.Append(metadata, char_info);
-
-    if (result.IsError()) {
-        return ResultNotFound;
-    }
-
-    if (!database_manager.IsModified()) {
-        return ResultNotUpdated;
-    }
-
-    return database_manager.SaveDatabase();
-}
-
-bool MiiManager::IsBrokenWithClearFlag(DatabaseSessionMetadata& metadata) {
-    const bool is_broken = is_broken_with_clear_flag;
-    if (is_broken_with_clear_flag) {
-        is_broken_with_clear_flag = false;
-        database_manager.Format(metadata);
-        database_manager.SaveDatabase();
-    }
-    return is_broken;
-}
-
-Result MiiManager::DestroyFile(DatabaseSessionMetadata& metadata) {
-    is_broken_with_clear_flag = true;
-    return database_manager.DestroyFile(metadata);
-}
-
-Result MiiManager::DeleteFile() {
-    return database_manager.DeleteFile();
-}
-
-Result MiiManager::Format(DatabaseSessionMetadata& metadata) {
-    database_manager.Format(metadata);
-
-    if (!database_manager.IsModified()) {
-        return ResultNotUpdated;
-    }
-    return database_manager.SaveDatabase();
-}
-
-Result MiiManager::ConvertV3ToCharInfo(CharInfo& out_char_info, const Ver3StoreData& mii_v3) const {
-    if (!mii_v3.IsValid()) {
-        return ResultInvalidCharInfo;
-    }
-
+void MiiManager::ConvertV3ToCharInfo(CharInfo& out_char_info, const Ver3StoreData& mii_v3) const {
     StoreData store_data{};
     mii_v3.BuildToStoreData(store_data);
-    const auto name = store_data.GetNickname();
-    if (!MiiUtil::IsFontRegionValid(store_data.GetFontRegion(), name.data)) {
-        store_data.SetInvalidName();
-    }
-
     out_char_info.SetFromStoreData(store_data);
-    return ResultSuccess;
-}
-
-Result MiiManager::ConvertCoreDataToCharInfo(CharInfo& out_char_info,
-                                             const CoreData& core_data) const {
-    if (core_data.IsValid() != ValidationResult::NoErrors) {
-        return ResultInvalidCharInfo;
-    }
-
-    StoreData store_data{};
-    store_data.BuildWithCoreData(core_data);
-    const auto name = store_data.GetNickname();
-    if (!MiiUtil::IsFontRegionValid(store_data.GetFontRegion(), name.data)) {
-        store_data.SetInvalidName();
-    }
-
-    out_char_info.SetFromStoreData(store_data);
-    return ResultSuccess;
-}
-
-Result MiiManager::ConvertCharInfoToCoreData(CoreData& out_core_data,
-                                             const CharInfo& char_info) const {
-    if (char_info.Verify() != ValidationResult::NoErrors) {
-        return ResultInvalidCharInfo;
-    }
-
-    out_core_data.BuildFromCharInfo(char_info);
-    const auto name = out_core_data.GetNickname();
-    if (!MiiUtil::IsFontRegionValid(out_core_data.GetFontRegion(), name.data)) {
-        out_core_data.SetNickname(out_core_data.GetInvalidNickname());
-    }
-
-    return ResultSuccess;
-}
-
-Result MiiManager::UpdateLatest(const DatabaseSessionMetadata& metadata, CharInfo& out_char_info,
-                                const CharInfo& char_info, SourceFlag source_flag) const {
-    if ((source_flag & SourceFlag::Database) == SourceFlag::None) {
-        return ResultNotFound;
-    }
-
-    if (metadata.IsInterfaceVersionSupported(1)) {
-        if (char_info.Verify() != ValidationResult::NoErrors) {
-            return ResultInvalidCharInfo;
-        }
-    }
-
-    u32 index{};
-    Result result = database_manager.FindIndex(metadata, index, char_info.GetCreateId());
-
-    if (result.IsError()) {
-        return result;
-    }
-
-    StoreData store_data{};
-    database_manager.Get(store_data, index, metadata);
-
-    if (store_data.GetType() != char_info.GetType()) {
-        return ResultNotFound;
-    }
-
-    out_char_info.SetFromStoreData(store_data);
-
-    if (char_info == out_char_info) {
-        return ResultNotUpdated;
-    }
-
-    return ResultSuccess;
-}
-
-Result MiiManager::UpdateLatest(const DatabaseSessionMetadata& metadata, StoreData& out_store_data,
-                                const StoreData& store_data, SourceFlag source_flag) const {
-    if ((source_flag & SourceFlag::Database) == SourceFlag::None) {
-        return ResultNotFound;
-    }
-
-    if (metadata.IsInterfaceVersionSupported(1)) {
-        if (store_data.IsValid() != ValidationResult::NoErrors) {
-            return ResultInvalidCharInfo;
-        }
-    }
-
-    u32 index{};
-    Result result = database_manager.FindIndex(metadata, index, store_data.GetCreateId());
-
-    if (result.IsError()) {
-        return result;
-    }
-
-    database_manager.Get(out_store_data, index, metadata);
-
-    if (out_store_data.GetType() != store_data.GetType()) {
-        return ResultNotFound;
-    }
-
-    if (store_data == out_store_data) {
-        return ResultNotUpdated;
-    }
-
-    return ResultSuccess;
 }
 
 Result MiiManager::Get(const DatabaseSessionMetadata& metadata,
                        std::span<CharInfoElement> out_elements, u32& out_count,
-                       SourceFlag source_flag) const {
+                       SourceFlag source_flag) {
     if ((source_flag & SourceFlag::Database) == SourceFlag::None) {
         return BuildDefault(out_elements, out_count, source_flag);
     }
 
-    const auto mii_count = database_manager.GetCount(metadata);
-
-    for (std::size_t index = 0; index < mii_count; ++index) {
-        if (out_elements.size() <= static_cast<std::size_t>(out_count)) {
-            return ResultInvalidArgumentSize;
-        }
-
-        StoreData store_data{};
-        database_manager.Get(store_data, index, metadata);
-
-        out_elements[out_count].source = Source::Database;
-        out_elements[out_count].char_info.SetFromStoreData(store_data);
-        out_count++;
-    }
+    // TODO(bunnei): We don't implement the Mii database, so we can't have an entry
 
     // Include default Mii at the end of the list
     return BuildDefault(out_elements, out_count, source_flag);
 }
 
 Result MiiManager::Get(const DatabaseSessionMetadata& metadata, std::span<CharInfo> out_char_info,
-                       u32& out_count, SourceFlag source_flag) const {
+                       u32& out_count, SourceFlag source_flag) {
     if ((source_flag & SourceFlag::Database) == SourceFlag::None) {
         return BuildDefault(out_char_info, out_count, source_flag);
     }
 
-    const auto mii_count = database_manager.GetCount(metadata);
-
-    for (std::size_t index = 0; index < mii_count; ++index) {
-        if (out_char_info.size() <= static_cast<std::size_t>(out_count)) {
-            return ResultInvalidArgumentSize;
-        }
-
-        StoreData store_data{};
-        database_manager.Get(store_data, index, metadata);
-
-        out_char_info[out_count].SetFromStoreData(store_data);
-        out_count++;
-    }
+    // TODO(bunnei): We don't implement the Mii database, so we can't have an entry
 
     // Include default Mii at the end of the list
     return BuildDefault(out_char_info, out_count, source_flag);
 }
 
-Result MiiManager::Get(const DatabaseSessionMetadata& metadata,
-                       std::span<StoreDataElement> out_elements, u32& out_count,
-                       SourceFlag source_flag) const {
-    if ((source_flag & SourceFlag::Database) == SourceFlag::None) {
-        return BuildDefault(out_elements, out_count, source_flag);
-    }
-
-    const auto mii_count = database_manager.GetCount(metadata);
-
-    for (std::size_t index = 0; index < mii_count; ++index) {
-        if (out_elements.size() <= static_cast<std::size_t>(out_count)) {
-            return ResultInvalidArgumentSize;
-        }
-
-        StoreData store_data{};
-        database_manager.Get(store_data, index, metadata);
-
-        out_elements[out_count].store_data = store_data;
-        out_elements[out_count].source = Source::Database;
-        out_count++;
-    }
-
-    // Include default Mii at the end of the list
-    return BuildDefault(out_elements, out_count, source_flag);
-}
-
-Result MiiManager::Get(const DatabaseSessionMetadata& metadata, std::span<StoreData> out_store_data,
-                       u32& out_count, SourceFlag source_flag) const {
-    if ((source_flag & SourceFlag::Database) == SourceFlag::None) {
-        return BuildDefault(out_store_data, out_count, source_flag);
-    }
-
-    const auto mii_count = database_manager.GetCount(metadata);
-
-    for (std::size_t index = 0; index < mii_count; ++index) {
-        if (out_store_data.size() <= static_cast<std::size_t>(out_count)) {
-            return ResultInvalidArgumentSize;
-        }
-
-        StoreData store_data{};
-        database_manager.Get(store_data, index, metadata);
-
-        out_store_data[out_count] = store_data;
-        out_count++;
-    }
-
-    // Include default Mii at the end of the list
-    return BuildDefault(out_store_data, out_count, source_flag);
-}
 Result MiiManager::BuildDefault(std::span<CharInfoElement> out_elements, u32& out_count,
-                                SourceFlag source_flag) const {
+                                SourceFlag source_flag) {
     if ((source_flag & SourceFlag::Default) == SourceFlag::None) {
         return ResultSuccess;
     }
@@ -425,7 +129,7 @@ Result MiiManager::BuildDefault(std::span<CharInfoElement> out_elements, u32& ou
 }
 
 Result MiiManager::BuildDefault(std::span<CharInfo> out_char_info, u32& out_count,
-                                SourceFlag source_flag) const {
+                                SourceFlag source_flag) {
     if ((source_flag & SourceFlag::Default) == SourceFlag::None) {
         return ResultSuccess;
     }
@@ -446,41 +150,23 @@ Result MiiManager::BuildDefault(std::span<CharInfo> out_char_info, u32& out_coun
     return ResultSuccess;
 }
 
-Result MiiManager::BuildDefault(std::span<StoreDataElement> out_elements, u32& out_count,
-                                SourceFlag source_flag) const {
-    if ((source_flag & SourceFlag::Default) == SourceFlag::None) {
-        return ResultSuccess;
+Result MiiManager::GetIndex(const DatabaseSessionMetadata& metadata, const CharInfo& char_info,
+                            s32& out_index) {
+
+    if (char_info.Verify() != ValidationResult::NoErrors) {
+        return ResultInvalidCharInfo;
     }
 
-    for (std::size_t index = 0; index < DefaultMiiCount; ++index) {
-        if (out_elements.size() <= static_cast<std::size_t>(out_count)) {
-            return ResultInvalidArgumentSize;
-        }
+    constexpr u32 INVALID_INDEX{0xFFFFFFFF};
 
-        out_elements[out_count].store_data.BuildDefault(static_cast<u32>(index));
-        out_elements[out_count].source = Source::Default;
-        out_count++;
-    }
+    out_index = INVALID_INDEX;
 
-    return ResultSuccess;
+    // TODO(bunnei): We don't implement the Mii database, so we can't have an index
+    return ResultNotFound;
 }
 
-Result MiiManager::BuildDefault(std::span<StoreData> out_char_info, u32& out_count,
-                                SourceFlag source_flag) const {
-    if ((source_flag & SourceFlag::Default) == SourceFlag::None) {
-        return ResultSuccess;
-    }
-
-    for (std::size_t index = 0; index < DefaultMiiCount; ++index) {
-        if (out_char_info.size() <= static_cast<std::size_t>(out_count)) {
-            return ResultInvalidArgumentSize;
-        }
-
-        out_char_info[out_count].BuildDefault(static_cast<u32>(index));
-        out_count++;
-    }
-
-    return ResultSuccess;
+void MiiManager::SetInterfaceVersion(DatabaseSessionMetadata& metadata, u32 version) {
+    metadata.interface_version = version;
 }
 
 } // namespace Service::Mii

src/core/hle/service/mii/mii_manager.h

@@ -3,85 +3,47 @@
 
 #pragma once
 
-#include <span>
+#include <vector>
 
 #include "core/hle/result.h"
-#include "core/hle/service/mii/mii_database_manager.h"
 #include "core/hle/service/mii/mii_types.h"
+#include "core/hle/service/mii/types/char_info.h"
+#include "core/hle/service/mii/types/store_data.h"
+#include "core/hle/service/mii/types/ver3_store_data.h"
 
 namespace Service::Mii {
-class CharInfo;
-class CoreData;
-class StoreData;
-class Ver3StoreData;
 
-struct CharInfoElement;
-struct StoreDataElement;
-
-// The Mii manager is responsible for handling mii operations along with providing an easy interface
-// for HLE emulation of the mii service.
+// The Mii manager is responsible for loading and storing the Miis to the database in NAND along
+// with providing an easy interface for HLE emulation of the mii service.
 class MiiManager {
 public:
     MiiManager();
-    Result Initialize(DatabaseSessionMetadata& metadata);
 
-    // Auto generated mii
+    bool IsUpdated(DatabaseSessionMetadata& metadata, SourceFlag source_flag) const;
+
+    bool IsFullDatabase() const;
+    u32 GetCount(const DatabaseSessionMetadata& metadata, SourceFlag source_flag) const;
+    Result UpdateLatest(DatabaseSessionMetadata& metadata, CharInfo& out_char_info,
+                        const CharInfo& char_info, SourceFlag source_flag);
+    Result Get(const DatabaseSessionMetadata& metadata, std::span<CharInfoElement> out_elements,
+               u32& out_count, SourceFlag source_flag);
+    Result Get(const DatabaseSessionMetadata& metadata, std::span<CharInfo> out_char_info,
+               u32& out_count, SourceFlag source_flag);
     void BuildDefault(CharInfo& out_char_info, u32 index) const;
     void BuildBase(CharInfo& out_char_info, Gender gender) const;
     void BuildRandom(CharInfo& out_char_info, Age age, Gender gender, Race race) const;
-
-    // Database operations
-    bool IsFullDatabase() const;
-    void SetInterfaceVersion(DatabaseSessionMetadata& metadata, u32 version) const;
-    bool IsUpdated(DatabaseSessionMetadata& metadata, SourceFlag source_flag) const;
-    u32 GetCount(const DatabaseSessionMetadata& metadata, SourceFlag source_flag) const;
-    Result Move(DatabaseSessionMetadata& metadata, u32 index, const Common::UUID& create_id);
-    Result AddOrReplace(DatabaseSessionMetadata& metadata, const StoreData& store_data);
-    Result Delete(DatabaseSessionMetadata& metadata, const Common::UUID& create_id);
-    s32 FindIndex(const Common::UUID& create_id, bool is_special) const;
+    void ConvertV3ToCharInfo(CharInfo& out_char_info, const Ver3StoreData& mii_v3) const;
+    std::vector<CharInfoElement> GetDefault(SourceFlag source_flag);
     Result GetIndex(const DatabaseSessionMetadata& metadata, const CharInfo& char_info,
-                    s32& out_index) const;
-    Result Append(DatabaseSessionMetadata& metadata, const CharInfo& char_info);
-
-    // Test database operations
-    bool IsBrokenWithClearFlag(DatabaseSessionMetadata& metadata);
-    Result DestroyFile(DatabaseSessionMetadata& metadata);
-    Result DeleteFile();
-    Result Format(DatabaseSessionMetadata& metadata);
-
-    // Mii conversions
-    Result ConvertV3ToCharInfo(CharInfo& out_char_info, const Ver3StoreData& mii_v3) const;
-    Result ConvertCoreDataToCharInfo(CharInfo& out_char_info, const CoreData& core_data) const;
-    Result ConvertCharInfoToCoreData(CoreData& out_core_data, const CharInfo& char_info) const;
-    Result UpdateLatest(const DatabaseSessionMetadata& metadata, CharInfo& out_char_info,
-                        const CharInfo& char_info, SourceFlag source_flag) const;
-    Result UpdateLatest(const DatabaseSessionMetadata& metadata, StoreData& out_store_data,
-                        const StoreData& store_data, SourceFlag source_flag) const;
-
-    // Overloaded getters
-    Result Get(const DatabaseSessionMetadata& metadata, std::span<CharInfoElement> out_elements,
-               u32& out_count, SourceFlag source_flag) const;
-    Result Get(const DatabaseSessionMetadata& metadata, std::span<CharInfo> out_char_info,
-               u32& out_count, SourceFlag source_flag) const;
-    Result Get(const DatabaseSessionMetadata& metadata, std::span<StoreDataElement> out_elements,
-               u32& out_count, SourceFlag source_flag) const;
-    Result Get(const DatabaseSessionMetadata& metadata, std::span<StoreData> out_store_data,
-               u32& out_count, SourceFlag source_flag) const;
+                    s32& out_index);
+    void SetInterfaceVersion(DatabaseSessionMetadata& metadata, u32 version);
 
 private:
     Result BuildDefault(std::span<CharInfoElement> out_elements, u32& out_count,
-                        SourceFlag source_flag) const;
-    Result BuildDefault(std::span<CharInfo> out_char_info, u32& out_count,
-                        SourceFlag source_flag) const;
-    Result BuildDefault(std::span<StoreDataElement> out_char_info, u32& out_count,
-                        SourceFlag source_flag) const;
-    Result BuildDefault(std::span<StoreData> out_char_info, u32& out_count,
-                        SourceFlag source_flag) const;
+                        SourceFlag source_flag);
+    Result BuildDefault(std::span<CharInfo> out_char_info, u32& out_count, SourceFlag source_flag);
 
-    DatabaseManager database_manager{};
-
-    // This should be a global value
-    bool is_broken_with_clear_flag{};
+    u64 update_counter{};
 };
 
 }; // namespace Service::Mii

src/core/hle/service/mii/mii_result.h

@@ -1,4 +1,4 @@
-// SPDX-FileCopyrightText: Copyright 2023 yuzu Emulator Project
+// SPDX-FileCopyrightText: Copyright 2020 yuzu Emulator Project
 // SPDX-License-Identifier: GPL-2.0-or-later
 
 #pragma once
@@ -13,15 +13,8 @@ constexpr Result ResultNotUpdated{ErrorModule::Mii, 3};
 constexpr Result ResultNotFound{ErrorModule::Mii, 4};
 constexpr Result ResultDatabaseFull{ErrorModule::Mii, 5};
 constexpr Result ResultInvalidCharInfo{ErrorModule::Mii, 100};
-constexpr Result ResultInvalidDatabaseChecksum{ErrorModule::Mii, 101};
-constexpr Result ResultInvalidDatabaseSignature{ErrorModule::Mii, 103};
-constexpr Result ResultInvalidDatabaseVersion{ErrorModule::Mii, 104};
-constexpr Result ResultInvalidDatabaseLength{ErrorModule::Mii, 105};
-constexpr Result ResultInvalidCharInfo2{ErrorModule::Mii, 107};
 constexpr Result ResultInvalidStoreData{ErrorModule::Mii, 109};
 constexpr Result ResultInvalidOperation{ErrorModule::Mii, 202};
 constexpr Result ResultPermissionDenied{ErrorModule::Mii, 203};
-constexpr Result ResultTestModeOnly{ErrorModule::Mii, 204};
-constexpr Result ResultInvalidCharInfoType{ErrorModule::Mii, 205};
 
 }; // namespace Service::Mii

src/core/hle/service/mii/mii_types.h

@@ -1,4 +1,4 @@
-// SPDX-FileCopyrightText: Copyright 2023 yuzu Emulator Project
+// SPDX-FileCopyrightText: Copyright 2020 yuzu Emulator Project
 // SPDX-License-Identifier: GPL-2.0-or-later
 
 #pragma once
@@ -13,7 +13,6 @@
 
 namespace Service::Mii {
 
-constexpr std::size_t MaxNameSize = 10;
 constexpr u8 MaxHeight = 127;
 constexpr u8 MaxBuild = 127;
 constexpr u8 MaxType = 1;
@@ -27,14 +26,14 @@ constexpr u8 MaxEyebrowScale = 8;
 constexpr u8 MaxEyebrowAspect = 6;
 constexpr u8 MaxEyebrowRotate = 11;
 constexpr u8 MaxEyebrowX = 12;
-constexpr u8 MaxEyebrowY = 15;
+constexpr u8 MaxEyebrowY = 18;
 constexpr u8 MaxNoseScale = 8;
 constexpr u8 MaxNoseY = 18;
 constexpr u8 MaxMouthScale = 8;
 constexpr u8 MaxMoutAspect = 6;
 constexpr u8 MaxMouthY = 18;
 constexpr u8 MaxMustacheScale = 8;
-constexpr u8 MaxMustacheY = 16;
+constexpr u8 MasMustacheY = 16;
 constexpr u8 MaxGlassScale = 7;
 constexpr u8 MaxGlassY = 20;
 constexpr u8 MaxMoleScale = 8;
@@ -600,12 +599,12 @@ enum class ValidationResult : u32 {
     InvalidRegionMove = 0x31,
     InvalidCreateId = 0x32,
     InvalidName = 0x33,
-    InvalidChecksum = 0x34,
     InvalidType = 0x35,
 };
 
 struct Nickname {
-    std::array<char16_t, MaxNameSize> data{};
+    static constexpr std::size_t MaxNameSize = 10;
+    std::array<char16_t, MaxNameSize> data;
 
     // Checks for null or dirty strings
     bool IsValid() const {
@@ -614,7 +613,7 @@ struct Nickname {
         }
 
         std::size_t index = 1;
-        while (index < MaxNameSize && data[index] != 0) {
+        while (data[index] != 0) {
             index++;
         }
         while (index < MaxNameSize && data[index] == 0) {

src/core/hle/service/mii/mii_util.h

@@ -28,32 +28,6 @@ public:
         return Common::swap16(static_cast<u16>(crc));
     }
 
-    static u16 CalculateDeviceCrc16(const Common::UUID& uuid, std::size_t data_size) {
-        constexpr u16 magic{0x1021};
-        s32 crc{};
-
-        for (std::size_t i = 0; i < uuid.uuid.size(); i++) {
-            for (std::size_t j = 0; j < 8; j++) {
-                crc <<= 1;
-                if ((crc & 0x10000) != 0) {
-                    crc = crc ^ magic;
-                }
-            }
-            crc ^= uuid.uuid[i];
-        }
-
-        // As much as this looks wrong this is what N's does
-
-        for (std::size_t i = 0; i < data_size * 8; i++) {
-            crc <<= 1;
-            if ((crc & 0x10000) != 0) {
-                crc = crc ^ magic;
-            }
-        }
-
-        return Common::swap16(static_cast<u16>(crc));
-    }
-
     static Common::UUID MakeCreateId() {
         return Common::UUID::MakeRandomRFC4122V4();
     }

src/core/hle/service/mii/types/char_info.cpp

@@ -37,7 +37,7 @@ void CharInfo::SetFromStoreData(const StoreData& store_data) {
     eyebrow_aspect = store_data.GetEyebrowAspect();
     eyebrow_rotate = store_data.GetEyebrowRotate();
     eyebrow_x = store_data.GetEyebrowX();
-    eyebrow_y = store_data.GetEyebrowY() + 3;
+    eyebrow_y = store_data.GetEyebrowY();
     nose_type = store_data.GetNoseType();
     nose_scale = store_data.GetNoseScale();
     nose_y = store_data.GetNoseY();
@@ -150,7 +150,7 @@ ValidationResult CharInfo::Verify() const {
     if (eyebrow_x > MaxEyebrowX) {
         return ValidationResult::InvalidEyebrowX;
     }
-    if (eyebrow_y - 3 > MaxEyebrowY) {
+    if (eyebrow_y > MaxEyebrowY) {
         return ValidationResult::InvalidEyebrowY;
     }
     if (nose_type > NoseType::Max) {
@@ -189,7 +189,7 @@ ValidationResult CharInfo::Verify() const {
     if (mustache_scale > MaxMustacheScale) {
         return ValidationResult::InvalidMustacheScale;
     }
-    if (mustache_y > MaxMustacheY) {
+    if (mustache_y > MasMustacheY) {
         return ValidationResult::InvalidMustacheY;
     }
     if (glass_type > GlassType::Max) {

src/core/hle/service/mii/types/char_info.h

@@ -70,59 +70,59 @@ public:
     bool operator==(const CharInfo& info);
 
 private:
-    Common::UUID create_id{};
-    Nickname name{};
-    u16 null_terminator{};
-    FontRegion font_region{};
-    FavoriteColor favorite_color{};
-    Gender gender{};
-    u8 height{};
-    u8 build{};
-    u8 type{};
-    u8 region_move{};
-    FacelineType faceline_type{};
-    FacelineColor faceline_color{};
-    FacelineWrinkle faceline_wrinkle{};
-    FacelineMake faceline_make{};
-    HairType hair_type{};
-    CommonColor hair_color{};
-    HairFlip hair_flip{};
-    EyeType eye_type{};
-    CommonColor eye_color{};
-    u8 eye_scale{};
-    u8 eye_aspect{};
-    u8 eye_rotate{};
-    u8 eye_x{};
-    u8 eye_y{};
-    EyebrowType eyebrow_type{};
-    CommonColor eyebrow_color{};
-    u8 eyebrow_scale{};
-    u8 eyebrow_aspect{};
-    u8 eyebrow_rotate{};
-    u8 eyebrow_x{};
-    u8 eyebrow_y{};
-    NoseType nose_type{};
-    u8 nose_scale{};
-    u8 nose_y{};
-    MouthType mouth_type{};
-    CommonColor mouth_color{};
-    u8 mouth_scale{};
-    u8 mouth_aspect{};
-    u8 mouth_y{};
-    CommonColor beard_color{};
-    BeardType beard_type{};
-    MustacheType mustache_type{};
-    u8 mustache_scale{};
-    u8 mustache_y{};
-    GlassType glass_type{};
-    CommonColor glass_color{};
-    u8 glass_scale{};
-    u8 glass_y{};
-    MoleType mole_type{};
-    u8 mole_scale{};
-    u8 mole_x{};
-    u8 mole_y{};
-    u8 padding{};
+    Common::UUID create_id;
+    Nickname name;
+    u16 null_terminator;
+    FontRegion font_region;
+    FavoriteColor favorite_color;
+    Gender gender;
+    u8 height;
+    u8 build;
+    u8 type;
+    u8 region_move;
+    FacelineType faceline_type;
+    FacelineColor faceline_color;
+    FacelineWrinkle faceline_wrinkle;
+    FacelineMake faceline_make;
+    HairType hair_type;
+    CommonColor hair_color;
+    HairFlip hair_flip;
+    EyeType eye_type;
+    CommonColor eye_color;
+    u8 eye_scale;
+    u8 eye_aspect;
+    u8 eye_rotate;
+    u8 eye_x;
+    u8 eye_y;
+    EyebrowType eyebrow_type;
+    CommonColor eyebrow_color;
+    u8 eyebrow_scale;
+    u8 eyebrow_aspect;
+    u8 eyebrow_rotate;
+    u8 eyebrow_x;
+    u8 eyebrow_y;
+    NoseType nose_type;
+    u8 nose_scale;
+    u8 nose_y;
+    MouthType mouth_type;
+    CommonColor mouth_color;
+    u8 mouth_scale;
+    u8 mouth_aspect;
+    u8 mouth_y;
+    CommonColor beard_color;
+    BeardType beard_type;
+    MustacheType mustache_type;
+    u8 mustache_scale;
+    u8 mustache_y;
+    GlassType glass_type;
+    CommonColor glass_color;
+    u8 glass_scale;
+    u8 glass_y;
+    MoleType mole_type;
+    u8 mole_scale;
+    u8 mole_x;
+    u8 mole_y;
+    u8 padding;
 };
 static_assert(sizeof(CharInfo) == 0x58, "CharInfo has incorrect size.");
 static_assert(std::has_unique_object_representations_v<CharInfo>,

src/core/hle/service/mii/types/core_data.cpp

@@ -3,7 +3,6 @@
 
 #include "common/assert.h"
 #include "core/hle/service/mii/mii_util.h"
-#include "core/hle/service/mii/types/char_info.h"
 #include "core/hle/service/mii/types/core_data.h"
 #include "core/hle/service/mii/types/raw_data.h"
 
@@ -113,7 +112,7 @@ void CoreData::BuildRandom(Age age, Gender gender, Race race) {
             .values[MiiUtil::GetRandomValue<std::size_t>(eyebrow_type_info.values_count)]);
 
     const auto eyebrow_rotate_1{race == Race::Asian ? 6 : 0};
-    const auto eyebrow_y{race == Race::Asian ? 6 : 7};
+    const auto eyebrow_y{race == Race::Asian ? 9 : 10};
     const auto eyebrow_rotate_offset{32 - RawData::EyebrowRotateLookup[eyebrow_rotate_1] + 6};
     const auto eyebrow_rotate{
         32 - RawData::EyebrowRotateLookup[static_cast<std::size_t>(data.eyebrow_type.Value())]};
@@ -171,7 +170,7 @@ void CoreData::BuildRandom(Age age, Gender gender, Race race) {
     u8 glasses_type{};
     while (glasses_type_start < glasses_type_info.values[glasses_type]) {
         if (++glasses_type >= glasses_type_info.values_count) {
-            glasses_type = 0;
+            ASSERT(false);
             break;
         }
     }
@@ -179,7 +178,6 @@ void CoreData::BuildRandom(Age age, Gender gender, Race race) {
     SetGlassType(static_cast<GlassType>(glasses_type));
     SetGlassColor(RawData::GetGlassColorFromVer3(0));
     SetGlassScale(4);
-    SetGlassY(static_cast<u8>(axis_y + 10));
 
     SetMoleType(MoleType::None);
     SetMoleScale(4);
@@ -187,211 +185,9 @@ void CoreData::BuildRandom(Age age, Gender gender, Race race) {
     SetMoleY(20);
 }
 
-void CoreData::BuildFromCharInfo(const CharInfo& char_info) {
-    name = char_info.GetNickname();
-    SetFontRegion(char_info.GetFontRegion());
-    SetFavoriteColor(char_info.GetFavoriteColor());
-    SetGender(char_info.GetGender());
-    SetHeight(char_info.GetHeight());
-    SetBuild(char_info.GetBuild());
-    SetType(char_info.GetType());
-    SetRegionMove(char_info.GetRegionMove());
-    SetFacelineType(char_info.GetFacelineType());
-    SetFacelineColor(char_info.GetFacelineColor());
-    SetFacelineWrinkle(char_info.GetFacelineWrinkle());
-    SetFacelineMake(char_info.GetFacelineMake());
-    SetHairType(char_info.GetHairType());
-    SetHairColor(char_info.GetHairColor());
-    SetHairFlip(char_info.GetHairFlip());
-    SetEyeType(char_info.GetEyeType());
-    SetEyeColor(char_info.GetEyeColor());
-    SetEyeScale(char_info.GetEyeScale());
-    SetEyeAspect(char_info.GetEyeAspect());
-    SetEyeRotate(char_info.GetEyeRotate());
-    SetEyeX(char_info.GetEyeX());
-    SetEyeY(char_info.GetEyeY());
-    SetEyebrowType(char_info.GetEyebrowType());
-    SetEyebrowColor(char_info.GetEyebrowColor());
-    SetEyebrowScale(char_info.GetEyebrowScale());
-    SetEyebrowAspect(char_info.GetEyebrowAspect());
-    SetEyebrowRotate(char_info.GetEyebrowRotate());
-    SetEyebrowX(char_info.GetEyebrowX());
-    SetEyebrowY(char_info.GetEyebrowY() - 3);
-    SetNoseType(char_info.GetNoseType());
-    SetNoseScale(char_info.GetNoseScale());
-    SetNoseY(char_info.GetNoseY());
-    SetMouthType(char_info.GetMouthType());
-    SetMouthColor(char_info.GetMouthColor());
-    SetMouthScale(char_info.GetMouthScale());
-    SetMouthAspect(char_info.GetMouthAspect());
-    SetMouthY(char_info.GetMouthY());
-    SetBeardColor(char_info.GetBeardColor());
-    SetBeardType(char_info.GetBeardType());
-    SetMustacheType(char_info.GetMustacheType());
-    SetMustacheScale(char_info.GetMustacheScale());
-    SetMustacheY(char_info.GetMustacheY());
-    SetGlassType(char_info.GetGlassType());
-    SetGlassColor(char_info.GetGlassColor());
-    SetGlassScale(char_info.GetGlassScale());
-    SetGlassY(char_info.GetGlassY());
-    SetMoleType(char_info.GetMoleType());
-    SetMoleScale(char_info.GetMoleScale());
-    SetMoleX(char_info.GetMoleX());
-    SetMoleY(char_info.GetMoleY());
-}
-
-ValidationResult CoreData::IsValid() const {
-    if (!name.IsValid()) {
-        return ValidationResult::InvalidName;
-    }
-    if (GetFontRegion() > FontRegion::Max) {
-        return ValidationResult::InvalidFont;
-    }
-    if (GetFavoriteColor() > FavoriteColor::Max) {
-        return ValidationResult::InvalidColor;
-    }
-    if (GetGender() > Gender::Max) {
-        return ValidationResult::InvalidGender;
-    }
-    if (GetHeight() > MaxHeight) {
-        return ValidationResult::InvalidHeight;
-    }
-    if (GetBuild() > MaxBuild) {
-        return ValidationResult::InvalidBuild;
-    }
-    if (GetType() > MaxType) {
-        return ValidationResult::InvalidType;
-    }
-    if (GetRegionMove() > MaxRegionMove) {
-        return ValidationResult::InvalidRegionMove;
-    }
-    if (GetFacelineType() > FacelineType::Max) {
-        return ValidationResult::InvalidFacelineType;
-    }
-    if (GetFacelineColor() > FacelineColor::Max) {
-        return ValidationResult::InvalidFacelineColor;
-    }
-    if (GetFacelineWrinkle() > FacelineWrinkle::Max) {
-        return ValidationResult::InvalidFacelineWrinkle;
-    }
-    if (GetFacelineMake() > FacelineMake::Max) {
-        return ValidationResult::InvalidFacelineMake;
-    }
-    if (GetHairType() > HairType::Max) {
-        return ValidationResult::InvalidHairType;
-    }
-    if (GetHairColor() > CommonColor::Max) {
-        return ValidationResult::InvalidHairColor;
-    }
-    if (GetHairFlip() > HairFlip::Max) {
-        return ValidationResult::InvalidHairFlip;
-    }
-    if (GetEyeType() > EyeType::Max) {
-        return ValidationResult::InvalidEyeType;
-    }
-    if (GetEyeColor() > CommonColor::Max) {
-        return ValidationResult::InvalidEyeColor;
-    }
-    if (GetEyeScale() > MaxEyeScale) {
-        return ValidationResult::InvalidEyeScale;
-    }
-    if (GetEyeAspect() > MaxEyeAspect) {
-        return ValidationResult::InvalidEyeAspect;
-    }
-    if (GetEyeRotate() > MaxEyeRotate) {
-        return ValidationResult::InvalidEyeRotate;
-    }
-    if (GetEyeX() > MaxEyeX) {
-        return ValidationResult::InvalidEyeX;
-    }
-    if (GetEyeY() > MaxEyeY) {
-        return ValidationResult::InvalidEyeY;
-    }
-    if (GetEyebrowType() > EyebrowType::Max) {
-        return ValidationResult::InvalidEyebrowType;
-    }
-    if (GetEyebrowColor() > CommonColor::Max) {
-        return ValidationResult::InvalidEyebrowColor;
-    }
-    if (GetEyebrowScale() > MaxEyebrowScale) {
-        return ValidationResult::InvalidEyebrowScale;
-    }
-    if (GetEyebrowAspect() > MaxEyebrowAspect) {
-        return ValidationResult::InvalidEyebrowAspect;
-    }
-    if (GetEyebrowRotate() > MaxEyebrowRotate) {
-        return ValidationResult::InvalidEyebrowRotate;
-    }
-    if (GetEyebrowX() > MaxEyebrowX) {
-        return ValidationResult::InvalidEyebrowX;
-    }
-    if (GetEyebrowY() > MaxEyebrowY) {
-        return ValidationResult::InvalidEyebrowY;
-    }
-    if (GetNoseType() > NoseType::Max) {
-        return ValidationResult::InvalidNoseType;
-    }
-    if (GetNoseScale() > MaxNoseScale) {
-        return ValidationResult::InvalidNoseScale;
-    }
-    if (GetNoseY() > MaxNoseY) {
-        return ValidationResult::InvalidNoseY;
-    }
-    if (GetMouthType() > MouthType::Max) {
-        return ValidationResult::InvalidMouthType;
-    }
-    if (GetMouthColor() > CommonColor::Max) {
-        return ValidationResult::InvalidMouthColor;
-    }
-    if (GetMouthScale() > MaxMouthScale) {
-        return ValidationResult::InvalidMouthScale;
-    }
-    if (GetMouthAspect() > MaxMoutAspect) {
-        return ValidationResult::InvalidMouthAspect;
-    }
-    if (GetMouthY() > MaxMouthY) {
-        return ValidationResult::InvalidMouthY;
-    }
-    if (GetBeardColor() > CommonColor::Max) {
-        return ValidationResult::InvalidBeardColor;
-    }
-    if (GetBeardType() > BeardType::Max) {
-        return ValidationResult::InvalidBeardType;
-    }
-    if (GetMustacheType() > MustacheType::Max) {
-        return ValidationResult::InvalidMustacheType;
-    }
-    if (GetMustacheScale() > MaxMustacheScale) {
-        return ValidationResult::InvalidMustacheScale;
-    }
-    if (GetMustacheY() > MaxMustacheY) {
-        return ValidationResult::InvalidMustacheY;
-    }
-    if (GetGlassType() > GlassType::Max) {
-        return ValidationResult::InvalidGlassType;
-    }
-    if (GetGlassColor() > CommonColor::Max) {
-        return ValidationResult::InvalidGlassColor;
-    }
-    if (GetGlassScale() > MaxGlassScale) {
-        return ValidationResult::InvalidGlassScale;
-    }
-    if (GetGlassY() > MaxGlassY) {
-        return ValidationResult::InvalidGlassY;
-    }
-    if (GetMoleType() > MoleType::Max) {
-        return ValidationResult::InvalidMoleType;
-    }
-    if (GetMoleScale() > MaxMoleScale) {
-        return ValidationResult::InvalidMoleScale;
-    }
-    if (GetMoleX() > MaxMoleX) {
-        return ValidationResult::InvalidMoleX;
-    }
-    if (GetMoleY() > MaxMoleY) {
-        return ValidationResult::InvalidMoleY;
-    }
-    return ValidationResult::NoErrors;
+u32 CoreData::IsValid() const {
+    // TODO: Complete this
+    return 0;
 }
 
 void CoreData::SetFontRegion(FontRegion value) {
@@ -518,8 +314,8 @@ void CoreData::SetNoseY(u8 value) {
     data.nose_y.Assign(value);
 }
 
-void CoreData::SetMouthType(MouthType value) {
-    data.mouth_type.Assign(static_cast<u32>(value));
+void CoreData::SetMouthType(u8 value) {
+    data.mouth_type.Assign(value);
 }
 
 void CoreData::SetMouthColor(CommonColor value) {

src/core/hle/service/mii/types/core_data.h

@@ -6,7 +6,6 @@
 #include "core/hle/service/mii/mii_types.h"
 
 namespace Service::Mii {
-class CharInfo;
 
 struct StoreDataBitFields {
     union {
@@ -101,9 +100,8 @@ class CoreData {
 public:
     void SetDefault();
     void BuildRandom(Age age, Gender gender, Race race);
-    void BuildFromCharInfo(const CharInfo& char_info);
 
-    ValidationResult IsValid() const;
+    u32 IsValid() const;
 
     void SetFontRegion(FontRegion value);
     void SetFavoriteColor(FavoriteColor value);
@@ -136,7 +134,7 @@ public:
     void SetNoseType(NoseType value);
     void SetNoseScale(u8 value);
     void SetNoseY(u8 value);
-    void SetMouthType(MouthType value);
+    void SetMouthType(u8 value);
     void SetMouthColor(CommonColor value);
     void SetMouthScale(u8 value);
     void SetMouthAspect(u8 value);
@@ -214,6 +212,5 @@ private:
     Nickname name{};
 };
 static_assert(sizeof(CoreData) == 0x30, "CoreData has incorrect size.");
-static_assert(std::is_trivially_copyable_v<CoreData>, "CoreData type must be trivially copyable.");
 
 }; // namespace Service::Mii

src/core/hle/service/mii/types/raw_data.cpp

@@ -1716,18 +1716,18 @@ const std::array<RandomMiiData4, 18> RandomMiiMouthType{
 const std::array<RandomMiiData2, 3> RandomMiiGlassType{
     RandomMiiData2{
         .arg_1 = 0,
-        .values_count = 4,
-        .values = {90, 94, 96, 100},
+        .values_count = 9,
+        .values = {90, 94, 96, 100, 0, 0, 0, 0, 0},
     },
     RandomMiiData2{
         .arg_1 = 1,
-        .values_count = 8,
-        .values = {83, 86, 90, 93, 94, 96, 98, 100},
+        .values_count = 9,
+        .values = {83, 86, 90, 93, 94, 96, 98, 100, 0},
     },
     RandomMiiData2{
         .arg_1 = 2,
-        .values_count = 8,
-        .values = {78, 83, 0, 93, 0, 0, 98, 100},
+        .values_count = 9,
+        .values = {78, 83, 0, 93, 0, 0, 98, 100, 0},
     },
 };
 

src/core/hle/service/mii/types/store_data.cpp

@@ -1,7 +1,6 @@
 // SPDX-FileCopyrightText: Copyright 2023 yuzu Emulator Project
 // SPDX-License-Identifier: GPL-2.0-or-later
 
-#include "core/hle/service/mii/mii_result.h"
 #include "core/hle/service/mii/mii_util.h"
 #include "core/hle/service/mii/types/raw_data.h"
 #include "core/hle/service/mii/types/store_data.h"
@@ -36,13 +35,13 @@ void StoreData::BuildDefault(u32 mii_index) {
     core_data.SetEyebrowAspect(static_cast<u8>(default_mii.eyebrow_aspect));
     core_data.SetEyebrowRotate(static_cast<u8>(default_mii.eyebrow_rotate));
     core_data.SetEyebrowX(static_cast<u8>(default_mii.eyebrow_x));
-    core_data.SetEyebrowY(static_cast<u8>(default_mii.eyebrow_y - 3));
+    core_data.SetEyebrowY(static_cast<u8>(default_mii.eyebrow_y));
 
     core_data.SetNoseType(static_cast<NoseType>(default_mii.nose_type));
     core_data.SetNoseScale(static_cast<u8>(default_mii.nose_scale));
     core_data.SetNoseY(static_cast<u8>(default_mii.nose_y));
 
-    core_data.SetMouthType(static_cast<MouthType>(default_mii.mouth_type));
+    core_data.SetMouthType(static_cast<u8>(default_mii.mouth_type));
     core_data.SetMouthColor(
         RawData::GetMouthColorFromVer3(static_cast<u8>(default_mii.mouth_color)));
     core_data.SetMouthScale(static_cast<u8>(default_mii.mouth_scale));
@@ -76,8 +75,10 @@ void StoreData::BuildDefault(u32 mii_index) {
     core_data.SetType(static_cast<u8>(default_mii.type));
     core_data.SetNickname(default_mii.nickname);
 
+    const auto device_id = MiiUtil::GetDeviceId();
     create_id = MiiUtil::MakeCreateId();
-    SetChecksum();
+    device_crc = MiiUtil::CalculateCrc16(&device_id, sizeof(Common::UUID));
+    data_crc = MiiUtil::CalculateCrc16(&core_data, sizeof(CoreData));
 }
 
 void StoreData::BuildBase(Gender gender) {
@@ -108,13 +109,13 @@ void StoreData::BuildBase(Gender gender) {
     core_data.SetEyebrowAspect(static_cast<u8>(default_mii.eyebrow_aspect));
     core_data.SetEyebrowRotate(static_cast<u8>(default_mii.eyebrow_rotate));
     core_data.SetEyebrowX(static_cast<u8>(default_mii.eyebrow_x));
-    core_data.SetEyebrowY(static_cast<u8>(default_mii.eyebrow_y - 3));
+    core_data.SetEyebrowY(static_cast<u8>(default_mii.eyebrow_y));
 
     core_data.SetNoseType(static_cast<NoseType>(default_mii.nose_type));
     core_data.SetNoseScale(static_cast<u8>(default_mii.nose_scale));
     core_data.SetNoseY(static_cast<u8>(default_mii.nose_y));
 
-    core_data.SetMouthType(static_cast<MouthType>(default_mii.mouth_type));
+    core_data.SetMouthType(static_cast<u8>(default_mii.mouth_type));
     core_data.SetMouthColor(
         RawData::GetMouthColorFromVer3(static_cast<u8>(default_mii.mouth_color)));
     core_data.SetMouthScale(static_cast<u8>(default_mii.mouth_scale));
@@ -148,51 +149,37 @@ void StoreData::BuildBase(Gender gender) {
     core_data.SetType(static_cast<u8>(default_mii.type));
     core_data.SetNickname(default_mii.nickname);
 
+    const auto device_id = MiiUtil::GetDeviceId();
     create_id = MiiUtil::MakeCreateId();
-    SetChecksum();
+    device_crc = MiiUtil::CalculateCrc16(&device_id, sizeof(Common::UUID));
+    data_crc = MiiUtil::CalculateCrc16(&core_data, sizeof(CoreData));
 }
 
 void StoreData::BuildRandom(Age age, Gender gender, Race race) {
     core_data.BuildRandom(age, gender, race);
-    create_id = MiiUtil::MakeCreateId();
-    SetChecksum();
-}
-
-void StoreData::BuildWithCharInfo(const CharInfo& char_info) {
-    core_data.BuildFromCharInfo(char_info);
-    create_id = MiiUtil::MakeCreateId();
-    SetChecksum();
-}
-
-void StoreData::BuildWithCoreData(const CoreData& in_core_data) {
-    core_data = in_core_data;
-    create_id = MiiUtil::MakeCreateId();
-    SetChecksum();
-}
-
-Result StoreData::Restore() {
-    // TODO: Implement this
-    return ResultNotUpdated;
-}
-
-ValidationResult StoreData::IsValid() const {
-    if (core_data.IsValid() != ValidationResult::NoErrors) {
-        return core_data.IsValid();
-    }
-    if (data_crc != MiiUtil::CalculateCrc16(&core_data, sizeof(CoreData) + sizeof(Common::UUID))) {
-        return ValidationResult::InvalidChecksum;
-    }
     const auto device_id = MiiUtil::GetDeviceId();
-    if (device_crc != MiiUtil::CalculateDeviceCrc16(device_id, sizeof(StoreData))) {
-        return ValidationResult::InvalidChecksum;
-    }
-    return ValidationResult::NoErrors;
+    create_id = MiiUtil::MakeCreateId();
+    device_crc = MiiUtil::CalculateCrc16(&device_id, sizeof(Common::UUID));
+    data_crc = MiiUtil::CalculateCrc16(&core_data, sizeof(CoreData));
+}
+
+void StoreData::SetInvalidName() {
+    const auto& invalid_name = core_data.GetInvalidNickname();
+    const auto device_id = MiiUtil::GetDeviceId();
+    core_data.SetNickname(invalid_name);
+    device_crc = MiiUtil::CalculateCrc16(&device_id, sizeof(Common::UUID));
+    data_crc = MiiUtil::CalculateCrc16(&core_data, sizeof(CoreData));
 }
 
 bool StoreData::IsSpecial() const {
     return GetType() == 1;
 }
 
+u32 StoreData::IsValid() const {
+    // TODO: complete this
+    return 0;
+}
+
 void StoreData::SetFontRegion(FontRegion value) {
     core_data.SetFontRegion(value);
 }
@@ -317,7 +304,7 @@ void StoreData::SetNoseY(u8 value) {
     core_data.SetNoseY(value);
 }
 
-void StoreData::SetMouthType(MouthType value) {
+void StoreData::SetMouthType(u8 value) {
     core_data.SetMouthType(value);
 }
 
@@ -393,26 +380,6 @@ void StoreData::SetNickname(Nickname value) {
     core_data.SetNickname(value);
 }
 
-void StoreData::SetInvalidName() {
-    const auto& invalid_name = core_data.GetInvalidNickname();
-    core_data.SetNickname(invalid_name);
-    SetChecksum();
-}
-
-void StoreData::SetChecksum() {
-    SetDataChecksum();
-    SetDeviceChecksum();
-}
-
-void StoreData::SetDataChecksum() {
-    data_crc = MiiUtil::CalculateCrc16(&core_data, sizeof(CoreData) + sizeof(Common::UUID));
-}
-
-void StoreData::SetDeviceChecksum() {
-    const auto device_id = MiiUtil::GetDeviceId();
-    device_crc = MiiUtil::CalculateDeviceCrc16(device_id, sizeof(StoreData));
-}
-
 Common::UUID StoreData::GetCreateId() const {
     return create_id;
 }
@@ -618,7 +585,7 @@ Nickname StoreData::GetNickname() const {
 }
 
 bool StoreData::operator==(const StoreData& data) {
-    bool is_identical = data.core_data.IsValid() == ValidationResult::NoErrors;
+    bool is_identical = data.core_data.IsValid() == 0;
     is_identical &= core_data.GetNickname().data == data.core_data.GetNickname().data;
     is_identical &= GetCreateId() == data.GetCreateId();
     is_identical &= GetFontRegion() == data.GetFontRegion();

src/core/hle/service/mii/types/store_data.h

@@ -3,7 +3,6 @@
 
 #pragma once
 
-#include "core/hle/result.h"
 #include "core/hle/service/mii/mii_types.h"
 #include "core/hle/service/mii/types/core_data.h"
 
@@ -11,17 +10,18 @@ namespace Service::Mii {
 
 class StoreData {
 public:
+    // nn::mii::detail::StoreDataRaw::BuildDefault
     void BuildDefault(u32 mii_index);
-    void BuildBase(Gender gender);
-    void BuildRandom(Age age, Gender gender, Race race);
-    void BuildWithCharInfo(const CharInfo& char_info);
-    void BuildWithCoreData(const CoreData& in_core_data);
-    Result Restore();
+    // nn::mii::detail::StoreDataRaw::BuildDefault
 
-    ValidationResult IsValid() const;
+    void BuildBase(Gender gender);
+    // nn::mii::detail::StoreDataRaw::BuildRandom
+    void BuildRandom(Age age, Gender gender, Race race);
 
     bool IsSpecial() const;
 
+    u32 IsValid() const;
+
     void SetFontRegion(FontRegion value);
     void SetFavoriteColor(FavoriteColor value);
     void SetGender(Gender value);
@@ -53,7 +53,7 @@ public:
     void SetNoseType(NoseType value);
     void SetNoseScale(u8 value);
     void SetNoseY(u8 value);
-    void SetMouthType(MouthType value);
+    void SetMouthType(u8 value);
     void SetMouthColor(CommonColor value);
     void SetMouthScale(u8 value);
     void SetMouthAspect(u8 value);
@@ -73,9 +73,6 @@ public:
     void SetMoleY(u8 value);
     void SetNickname(Nickname nickname);
     void SetInvalidName();
-    void SetChecksum();
-    void SetDataChecksum();
-    void SetDeviceChecksum();
 
     Common::UUID GetCreateId() const;
     FontRegion GetFontRegion() const;
@@ -138,8 +135,6 @@ private:
     u16 device_crc{};
 };
 static_assert(sizeof(StoreData) == 0x44, "StoreData has incorrect size.");
-static_assert(std::is_trivially_copyable_v<StoreData>,
-              "StoreData type must be trivially copyable.");
 
 struct StoreDataElement {
     StoreData store_data{};

src/core/hle/service/mii/types/ver3_store_data.cpp

@@ -22,6 +22,12 @@ void NfpStoreDataExtension::SetFromStoreData(const StoreData& store_data) {
 void Ver3StoreData::BuildToStoreData(StoreData& out_store_data) const {
     out_store_data.BuildBase(Gender::Male);
 
+    if (!IsValid()) {
+        return;
+    }
+
+    // TODO: We are ignoring a bunch of data from the mii_v3
+
     out_store_data.SetGender(static_cast<Gender>(mii_information.gender.Value()));
     out_store_data.SetFavoriteColor(
         static_cast<FavoriteColor>(mii_information.favorite_color.Value()));
@@ -30,71 +36,65 @@ void Ver3StoreData::BuildToStoreData(StoreData& out_store_data) const {
 
     out_store_data.SetNickname(mii_name);
     out_store_data.SetFontRegion(
-        static_cast<FontRegion>(static_cast<u8>(region_information.font_region.Value())));
+        static_cast<FontRegion>(static_cast<u8>(region_information.font_region)));
 
     out_store_data.SetFacelineType(
         static_cast<FacelineType>(appearance_bits1.faceline_type.Value()));
     out_store_data.SetFacelineColor(
-        RawData::GetFacelineColorFromVer3(appearance_bits1.faceline_color.Value()));
+        static_cast<FacelineColor>(appearance_bits1.faceline_color.Value()));
     out_store_data.SetFacelineWrinkle(
         static_cast<FacelineWrinkle>(appearance_bits2.faceline_wrinkle.Value()));
     out_store_data.SetFacelineMake(
         static_cast<FacelineMake>(appearance_bits2.faceline_make.Value()));
 
     out_store_data.SetHairType(static_cast<HairType>(hair_type));
-    out_store_data.SetHairColor(RawData::GetHairColorFromVer3(appearance_bits3.hair_color.Value()));
+    out_store_data.SetHairColor(static_cast<CommonColor>(appearance_bits3.hair_color.Value()));
     out_store_data.SetHairFlip(static_cast<HairFlip>(appearance_bits3.hair_flip.Value()));
 
     out_store_data.SetEyeType(static_cast<EyeType>(appearance_bits4.eye_type.Value()));
-    out_store_data.SetEyeColor(RawData::GetEyeColorFromVer3(appearance_bits4.eye_color.Value()));
-    out_store_data.SetEyeScale(static_cast<u8>(appearance_bits4.eye_scale.Value()));
-    out_store_data.SetEyeAspect(static_cast<u8>(appearance_bits4.eye_aspect.Value()));
-    out_store_data.SetEyeRotate(static_cast<u8>(appearance_bits4.eye_rotate.Value()));
-    out_store_data.SetEyeX(static_cast<u8>(appearance_bits4.eye_x.Value()));
-    out_store_data.SetEyeY(static_cast<u8>(appearance_bits4.eye_y.Value()));
+    out_store_data.SetEyeColor(static_cast<CommonColor>(appearance_bits4.eye_color.Value()));
+    out_store_data.SetEyeScale(static_cast<u8>(appearance_bits4.eye_scale));
+    out_store_data.SetEyeAspect(static_cast<u8>(appearance_bits4.eye_aspect));
+    out_store_data.SetEyeRotate(static_cast<u8>(appearance_bits4.eye_rotate));
+    out_store_data.SetEyeX(static_cast<u8>(appearance_bits4.eye_x));
+    out_store_data.SetEyeY(static_cast<u8>(appearance_bits4.eye_y));
 
     out_store_data.SetEyebrowType(static_cast<EyebrowType>(appearance_bits5.eyebrow_type.Value()));
     out_store_data.SetEyebrowColor(
-        RawData::GetHairColorFromVer3(appearance_bits5.eyebrow_color.Value()));
-    out_store_data.SetEyebrowScale(static_cast<u8>(appearance_bits5.eyebrow_scale.Value()));
-    out_store_data.SetEyebrowAspect(static_cast<u8>(appearance_bits5.eyebrow_aspect.Value()));
-    out_store_data.SetEyebrowRotate(static_cast<u8>(appearance_bits5.eyebrow_rotate.Value()));
-    out_store_data.SetEyebrowX(static_cast<u8>(appearance_bits5.eyebrow_x.Value()));
-    out_store_data.SetEyebrowY(static_cast<u8>(appearance_bits5.eyebrow_y.Value() - 3));
+        static_cast<CommonColor>(appearance_bits5.eyebrow_color.Value()));
+    out_store_data.SetEyebrowScale(static_cast<u8>(appearance_bits5.eyebrow_scale));
+    out_store_data.SetEyebrowAspect(static_cast<u8>(appearance_bits5.eyebrow_aspect));
+    out_store_data.SetEyebrowRotate(static_cast<u8>(appearance_bits5.eyebrow_rotate));
+    out_store_data.SetEyebrowX(static_cast<u8>(appearance_bits5.eyebrow_x));
+    out_store_data.SetEyebrowY(static_cast<u8>(appearance_bits5.eyebrow_y));
 
     out_store_data.SetNoseType(static_cast<NoseType>(appearance_bits6.nose_type.Value()));
-    out_store_data.SetNoseScale(static_cast<u8>(appearance_bits6.nose_scale.Value()));
-    out_store_data.SetNoseY(static_cast<u8>(appearance_bits6.nose_y.Value()));
+    out_store_data.SetNoseScale(static_cast<u8>(appearance_bits6.nose_scale));
+    out_store_data.SetNoseY(static_cast<u8>(appearance_bits6.nose_y));
 
-    out_store_data.SetMouthType(static_cast<MouthType>(appearance_bits7.mouth_type.Value()));
-    out_store_data.SetMouthColor(
-        RawData::GetMouthColorFromVer3(appearance_bits7.mouth_color.Value()));
-    out_store_data.SetMouthScale(static_cast<u8>(appearance_bits7.mouth_scale.Value()));
-    out_store_data.SetMouthAspect(static_cast<u8>(appearance_bits7.mouth_aspect.Value()));
-    out_store_data.SetMouthY(static_cast<u8>(appearance_bits8.mouth_y.Value()));
+    out_store_data.SetMouthType(static_cast<u8>(appearance_bits7.mouth_type));
+    out_store_data.SetMouthColor(static_cast<CommonColor>(appearance_bits7.mouth_color.Value()));
+    out_store_data.SetMouthScale(static_cast<u8>(appearance_bits7.mouth_scale));
+    out_store_data.SetMouthAspect(static_cast<u8>(appearance_bits7.mouth_aspect));
+    out_store_data.SetMouthY(static_cast<u8>(appearance_bits8.mouth_y));
 
     out_store_data.SetMustacheType(
         static_cast<MustacheType>(appearance_bits8.mustache_type.Value()));
-    out_store_data.SetMustacheScale(static_cast<u8>(appearance_bits9.mustache_scale.Value()));
-    out_store_data.SetMustacheY(static_cast<u8>(appearance_bits9.mustache_y.Value()));
+    out_store_data.SetMustacheScale(static_cast<u8>(appearance_bits9.mustache_scale));
+    out_store_data.SetMustacheY(static_cast<u8>(appearance_bits9.mustache_y));
 
     out_store_data.SetBeardType(static_cast<BeardType>(appearance_bits9.beard_type.Value()));
-    out_store_data.SetBeardColor(
-        RawData::GetHairColorFromVer3(appearance_bits9.beard_color.Value()));
+    out_store_data.SetBeardColor(static_cast<CommonColor>(appearance_bits9.beard_color.Value()));
 
-    // Glass type is compatible as it is. It doesn't need a table
     out_store_data.SetGlassType(static_cast<GlassType>(appearance_bits10.glass_type.Value()));
-    out_store_data.SetGlassColor(
-        RawData::GetGlassColorFromVer3(appearance_bits10.glass_color.Value()));
-    out_store_data.SetGlassScale(static_cast<u8>(appearance_bits10.glass_scale.Value()));
-    out_store_data.SetGlassY(static_cast<u8>(appearance_bits10.glass_y.Value()));
+    out_store_data.SetGlassColor(static_cast<CommonColor>(appearance_bits10.glass_color.Value()));
+    out_store_data.SetGlassScale(static_cast<u8>(appearance_bits10.glass_scale));
+    out_store_data.SetGlassY(static_cast<u8>(appearance_bits10.glass_y));
 
     out_store_data.SetMoleType(static_cast<MoleType>(appearance_bits11.mole_type.Value()));
-    out_store_data.SetMoleScale(static_cast<u8>(appearance_bits11.mole_scale.Value()));
-    out_store_data.SetMoleX(static_cast<u8>(appearance_bits11.mole_x.Value()));
-    out_store_data.SetMoleY(static_cast<u8>(appearance_bits11.mole_y.Value()));
-
-    out_store_data.SetChecksum();
+    out_store_data.SetMoleScale(static_cast<u8>(appearance_bits11.mole_scale));
+    out_store_data.SetMoleX(static_cast<u8>(appearance_bits11.mole_x));
+    out_store_data.SetMoleY(static_cast<u8>(appearance_bits11.mole_y));
 }
 
 void Ver3StoreData::BuildFromStoreData(const StoreData& store_data) {
@@ -220,7 +220,7 @@ u32 Ver3StoreData::IsValid() const {
 
     is_valid = is_valid && (appearance_bits8.mustache_type <= static_cast<u8>(MustacheType::Max));
     is_valid = is_valid && (appearance_bits9.mustache_scale < MaxMustacheScale);
-    is_valid = is_valid && (appearance_bits9.mustache_y <= MaxMustacheY);
+    is_valid = is_valid && (appearance_bits9.mustache_y <= MasMustacheY);
 
     is_valid = is_valid && (appearance_bits9.beard_type <= static_cast<u8>(BeardType::Max));
     is_valid = is_valid && (appearance_bits9.beard_color <= MaxVer3CommonColor);
@@ -228,7 +228,7 @@ u32 Ver3StoreData::IsValid() const {
     is_valid = is_valid && (appearance_bits10.glass_type <= MaxVer3GlassType);
     is_valid = is_valid && (appearance_bits10.glass_color <= MaxVer3CommonColor - 2);
     is_valid = is_valid && (appearance_bits10.glass_scale <= MaxGlassScale);
-    is_valid = is_valid && (appearance_bits10.glass_y <= MaxGlassY);
+    is_valid = is_valid && (appearance_bits10.glass_y <= MaxGlassScale);
 
     is_valid = is_valid && (appearance_bits11.mole_type <= static_cast<u8>(MoleType::Max));
     is_valid = is_valid && (appearance_bits11.mole_scale <= MaxMoleScale);

src/core/hle/service/nfc/common/device.cpp

@@ -439,7 +439,6 @@ Result NfcDevice::Mount(NFP::ModelType model_type, NFP::MountTarget mount_target
 
     device_state = DeviceState::TagMounted;
     mount_target = mount_target_;
-
     return ResultSuccess;
 }
 
@@ -717,13 +716,12 @@ Result NfcDevice::GetRegisterInfoPrivate(NFP::RegisterInfoPrivate& register_info
         return ResultRegistrationIsNotInitialized;
     }
 
-    Mii::StoreData store_data{};
+    Service::Mii::MiiManager manager;
     const auto& settings = tag_data.settings;
-    tag_data.owner_mii.BuildToStoreData(store_data);
 
     // TODO: Validate and complete this data
     register_info = {
-        .mii_store_data = store_data,
+        .mii_store_data = {},
         .creation_date = settings.init_date.GetWriteDate(),
         .amiibo_name = GetAmiiboName(settings),
         .font_region = settings.settings.font_region,

src/core/hle/service/ns/iplatform_service_manager.cpp

@@ -144,7 +144,7 @@ IPlatformServiceManager::IPlatformServiceManager(Core::System& system_, const ch
         {3, &IPlatformServiceManager::GetSharedMemoryAddressOffset, "GetSharedMemoryAddressOffset"},
         {4, &IPlatformServiceManager::GetSharedMemoryNativeHandle, "GetSharedMemoryNativeHandle"},
         {5, &IPlatformServiceManager::GetSharedFontInOrderOfPriority, "GetSharedFontInOrderOfPriority"},
-        {6, &IPlatformServiceManager::GetSharedFontInOrderOfPriority, "GetSharedFontInOrderOfPriorityForSystem"},
+        {6, nullptr, "GetSharedFontInOrderOfPriorityForSystem"},
         {100, nullptr, "RequestApplicationFunctionAuthorization"},
         {101, nullptr, "RequestApplicationFunctionAuthorizationByProcessId"},
         {102, nullptr, "RequestApplicationFunctionAuthorizationByApplicationId"},
@@ -262,17 +262,8 @@ void IPlatformServiceManager::GetSharedMemoryNativeHandle(HLERequestContext& ctx
 }
 
 void IPlatformServiceManager::GetSharedFontInOrderOfPriority(HLERequestContext& ctx) {
-    // The maximum number of elements that can be returned is 6. Regardless of the available fonts
-    // or buffer size.
-    constexpr std::size_t MaxElementCount = 6;
     IPC::RequestParser rp{ctx};
     const u64 language_code{rp.Pop<u64>()}; // TODO(ogniK): Find out what this is used for
-    const std::size_t font_codes_count =
-        std::min(MaxElementCount, ctx.GetWriteBufferNumElements<u32>(0));
-    const std::size_t font_offsets_count =
-        std::min(MaxElementCount, ctx.GetWriteBufferNumElements<u32>(1));
-    const std::size_t font_sizes_count =
-        std::min(MaxElementCount, ctx.GetWriteBufferNumElements<u32>(2));
     LOG_DEBUG(Service_NS, "called, language_code={:X}", language_code);
 
     IPC::ResponseBuilder rb{ctx, 4};
@@ -289,9 +280,9 @@ void IPlatformServiceManager::GetSharedFontInOrderOfPriority(HLERequestContext&
     }
 
     // Resize buffers if game requests smaller size output
-    font_codes.resize(std::min(font_codes.size(), font_codes_count));
-    font_offsets.resize(std::min(font_offsets.size(), font_offsets_count));
-    font_sizes.resize(std::min(font_sizes.size(), font_sizes_count));
+    font_codes.resize(std::min(font_codes.size(), ctx.GetWriteBufferNumElements<u32>(0)));
+    font_offsets.resize(std::min(font_offsets.size(), ctx.GetWriteBufferNumElements<u32>(1)));
+    font_sizes.resize(std::min(font_sizes.size(), ctx.GetWriteBufferNumElements<u32>(2)));
 
     ctx.WriteBuffer(font_codes, 0);
     ctx.WriteBuffer(font_offsets, 1);

src/core/tools/renderdoc.cpp

@@ -7,7 +7,7 @@
 #include "common/dynamic_library.h"
 #include "core/tools/renderdoc.h"
 
-#ifdef _WIN32
+#ifdef WIN32
 #include <windows.h>
 #else
 #include <dlfcn.h>

src/shader_recompiler/backend/spirv/emit_spirv_image_atomic.cpp

@@ -7,12 +7,15 @@
 
 namespace Shader::Backend::SPIRV {
 namespace {
-Id Image(EmitContext& ctx, IR::TextureInstInfo info) {
+Id Image(EmitContext& ctx, const IR::Value& index, IR::TextureInstInfo info) {
+    if (!index.IsImmediate()) {
+        throw NotImplementedException("Indirect image indexing");
+    }
     if (info.type == TextureType::Buffer) {
-        const ImageBufferDefinition def{ctx.image_buffers.at(info.descriptor_index)};
+        const ImageBufferDefinition def{ctx.image_buffers.at(index.U32())};
         return def.id;
     } else {
-        const ImageDefinition def{ctx.images.at(info.descriptor_index)};
+        const ImageDefinition def{ctx.images.at(index.U32())};
         return def.id;
     }
 }
@@ -25,12 +28,8 @@ std::pair<Id, Id> AtomicArgs(EmitContext& ctx) {
 
 Id ImageAtomicU32(EmitContext& ctx, IR::Inst* inst, const IR::Value& index, Id coords, Id value,
                   Id (Sirit::Module::*atomic_func)(Id, Id, Id, Id, Id)) {
-    if (!index.IsImmediate() || index.U32() != 0) {
-        // TODO: handle layers
-        throw NotImplementedException("Image indexing");
-    }
     const auto info{inst->Flags<IR::TextureInstInfo>()};
-    const Id image{Image(ctx, info)};
+    const Id image{Image(ctx, index, info)};
     const Id pointer{ctx.OpImageTexelPointer(ctx.image_u32, image, coords, ctx.Const(0U))};
     const auto [scope, semantics]{AtomicArgs(ctx)};
     return (ctx.*atomic_func)(ctx.U32[1], pointer, scope, semantics, value);

src/shader_recompiler/backend/spirv/spirv_emit_context.cpp

@@ -74,6 +74,11 @@ spv::ImageFormat GetImageFormat(ImageFormat format) {
     throw InvalidArgument("Invalid image format {}", format);
 }
 
+spv::ImageFormat GetImageFormatForBuffer(ImageFormat format) {
+    const auto spv_format = GetImageFormat(format);
+    return spv_format == spv::ImageFormat::Unknown ? spv::ImageFormat::R32ui : spv_format;
+}
+
 Id ImageType(EmitContext& ctx, const ImageDescriptor& desc) {
     const spv::ImageFormat format{GetImageFormat(desc.format)};
     const Id type{ctx.U32[1]};
@@ -1270,7 +1275,7 @@ void EmitContext::DefineImageBuffers(const Info& info, u32& binding) {
         if (desc.count != 1) {
             throw NotImplementedException("Array of image buffers");
         }
-        const spv::ImageFormat format{GetImageFormat(desc.format)};
+        const spv::ImageFormat format{GetImageFormatForBuffer(desc.format)};
         const Id image_type{TypeImage(U32[1], spv::Dim::Buffer, false, false, false, 2, format)};
         const Id pointer_type{TypePointer(spv::StorageClass::UniformConstant, image_type)};
         const Id id{AddGlobalVariable(pointer_type, spv::StorageClass::UniformConstant)};

src/video_core/CMakeLists.txt

@@ -95,12 +95,6 @@ add_library(video_core STATIC
     memory_manager.h
     precompiled_headers.h
     pte_kind.h
-    query_cache/bank_base.h
-    query_cache/query_base.h
-    query_cache/query_cache_base.h
-    query_cache/query_cache.h
-    query_cache/query_stream.h
-    query_cache/types.h
     query_cache.h
     rasterizer_accelerated.cpp
     rasterizer_accelerated.h

src/video_core/buffer_cache/buffer_cache.h

@@ -272,19 +272,13 @@ std::pair<typename P::Buffer*, u32> BufferCache<P>::ObtainBuffer(GPUVAddr gpu_ad
     if (!cpu_addr) {
         return {&slot_buffers[NULL_BUFFER_ID], 0};
     }
-    return ObtainCPUBuffer(*cpu_addr, size, sync_info, post_op);
-}
-
-template <class P>
-std::pair<typename P::Buffer*, u32> BufferCache<P>::ObtainCPUBuffer(
-    VAddr cpu_addr, u32 size, ObtainBufferSynchronize sync_info, ObtainBufferOperation post_op) {
-    const BufferId buffer_id = FindBuffer(cpu_addr, size);
+    const BufferId buffer_id = FindBuffer(*cpu_addr, size);
     Buffer& buffer = slot_buffers[buffer_id];
 
     // synchronize op
     switch (sync_info) {
     case ObtainBufferSynchronize::FullSynchronize:
-        SynchronizeBuffer(buffer, cpu_addr, size);
+        SynchronizeBuffer(buffer, *cpu_addr, size);
         break;
     default:
         break;
@@ -292,11 +286,11 @@ std::pair<typename P::Buffer*, u32> BufferCache<P>::ObtainCPUBuffer(
 
     switch (post_op) {
     case ObtainBufferOperation::MarkAsWritten:
-        MarkWrittenBuffer(buffer_id, cpu_addr, size);
+        MarkWrittenBuffer(buffer_id, *cpu_addr, size);
         break;
     case ObtainBufferOperation::DiscardWrite: {
-        VAddr cpu_addr_start = Common::AlignDown(cpu_addr, 64);
-        VAddr cpu_addr_end = Common::AlignUp(cpu_addr + size, 64);
+        VAddr cpu_addr_start = Common::AlignDown(*cpu_addr, 64);
+        VAddr cpu_addr_end = Common::AlignUp(*cpu_addr + size, 64);
         IntervalType interval{cpu_addr_start, cpu_addr_end};
         ClearDownload(interval);
         common_ranges.subtract(interval);
@@ -306,7 +300,7 @@ std::pair<typename P::Buffer*, u32> BufferCache<P>::ObtainCPUBuffer(
         break;
     }
 
-    return {&buffer, buffer.Offset(cpu_addr)};
+    return {&buffer, buffer.Offset(*cpu_addr)};
 }
 
 template <class P>

src/video_core/buffer_cache/buffer_cache_base.h

@@ -295,10 +295,6 @@ public:
     [[nodiscard]] std::pair<Buffer*, u32> ObtainBuffer(GPUVAddr gpu_addr, u32 size,
                                                        ObtainBufferSynchronize sync_info,
                                                        ObtainBufferOperation post_op);
-
-    [[nodiscard]] std::pair<Buffer*, u32> ObtainCPUBuffer(VAddr gpu_addr, u32 size,
-                                                          ObtainBufferSynchronize sync_info,
-                                                          ObtainBufferOperation post_op);
     void FlushCachedWrites();
 
     /// Return true when there are uncommitted buffers to be downloaded
@@ -339,14 +335,6 @@ public:
 
     [[nodiscard]] std::pair<Buffer*, u32> GetDrawIndirectBuffer();
 
-    template <typename Func>
-    void BufferOperations(Func&& func) {
-        do {
-            channel_state->has_deleted_buffers = false;
-            func();
-        } while (channel_state->has_deleted_buffers);
-    }
-
     std::recursive_mutex mutex;
     Runtime& runtime;
 

src/video_core/control/channel_state_cache.h

@@ -51,7 +51,7 @@ public:
     virtual void CreateChannel(Tegra::Control::ChannelState& channel);
 
     /// Bind a channel for execution.
-    virtual void BindToChannel(s32 id);
+    void BindToChannel(s32 id);
 
     /// Erase channel's state.
     void EraseChannel(s32 id);