Android 201

.reuse/dep5

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

README.md

@@ -1,9 +1,7 @@
 | Pull Request | Commit | Title | Author | Merged? |
 |----|----|----|----|----|
-| [12749](https://github.com/yuzu-emu/yuzu-android//pull/12749) | [`e3171486d`](https://github.com/yuzu-emu/yuzu-android//pull/12749/files) | general: workarounds for SMMU syncing issues | [liamwhite](https://github.com/liamwhite/) | Yes |
-| [12759](https://github.com/yuzu-emu/yuzu-android//pull/12759) | [`a120f8ff4`](https://github.com/yuzu-emu/yuzu-android//pull/12759/files) | core: miscellaneous fixes | [liamwhite](https://github.com/liamwhite/) | Yes |
-| [12769](https://github.com/yuzu-emu/yuzu-android//pull/12769) | [`ad4622da2`](https://github.com/yuzu-emu/yuzu-android//pull/12769/files) | core: hid: Reduce controller requests | [german77](https://github.com/german77/) | Yes |
-| [12777](https://github.com/yuzu-emu/yuzu-android//pull/12777) | [`b8be8dff6`](https://github.com/yuzu-emu/yuzu-android//pull/12777/files) | android: Add key warning | [t895](https://github.com/t895/) | Yes |
+| [12499](https://github.com/yuzu-emu/yuzu-android//pull/12499) | [`69acb6e3b`](https://github.com/yuzu-emu/yuzu-android//pull/12499/files) | Rework time services | [Kelebek1](https://github.com/Kelebek1/) | Yes |
+| [12579](https://github.com/yuzu-emu/yuzu-android//pull/12579) | [`748465f5a`](https://github.com/yuzu-emu/yuzu-android//pull/12579/files) | Core: Implement Device Mapping & GPU SMMU | [FernandoS27](https://github.com/FernandoS27/) | Yes |
 
 
 End of merge log. You can find the original README.md below the break.

src/android/app/build.gradle.kts

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

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

@@ -23,7 +23,6 @@ import org.yuzu.yuzu_emu.utils.Log
 import org.yuzu.yuzu_emu.utils.SerializableHelper.serializable
 import org.yuzu.yuzu_emu.model.InstallResult
 import org.yuzu.yuzu_emu.model.Patch
-import org.yuzu.yuzu_emu.model.GameVerificationResult
 
 /**
  * Class which contains methods that interact
@@ -303,11 +302,6 @@ object NativeLibrary {
      */
     external fun getCpuBackend(): String
 
-    /**
-     * Returns the current GPU Driver.
-     */
-    external fun getGpuDriver(): String
-
     external fun applySettings()
 
     external fun logSettings()
@@ -570,26 +564,6 @@ object NativeLibrary {
      */
     external fun removeMod(programId: String, name: String)
 
-    /**
-     * Verifies all installed content
-     * @param callback UI callback for verification progress. Return true in the callback to cancel.
-     * @return Array of content that failed verification. Successful if empty.
-     */
-    external fun verifyInstalledContents(
-        callback: (max: Long, progress: Long) -> Boolean
-    ): Array<String>
-
-    /**
-     * Verifies the contents of a game
-     * @param path String path to a game
-     * @param callback UI callback for verification progress. Return true in the callback to cancel.
-     * @return Int that is meant to be converted to a [GameVerificationResult]
-     */
-    external fun verifyGameContents(
-        path: String,
-        callback: (max: Long, progress: Long) -> Boolean
-    ): Int
-
     /**
      * Gets the save location for a specific game
      *
@@ -619,11 +593,6 @@ object NativeLibrary {
      */
     external fun clearFilesystemProvider()
 
-    /**
-     * Checks if all necessary keys are present for decryption
-     */
-    external fun areKeysPresent(): Boolean
-
     /**
      * Button type for use in onTouchEvent
      */

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

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

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

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

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

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

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

@@ -38,6 +38,7 @@ import androidx.window.layout.WindowLayoutInfo
 import com.google.android.material.dialog.MaterialAlertDialogBuilder
 import com.google.android.material.slider.Slider
 import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.flow.collect
 import kotlinx.coroutines.flow.collectLatest
 import kotlinx.coroutines.launch
 import org.yuzu.yuzu_emu.HomeNavigationDirections
@@ -140,9 +141,7 @@ class EmulationFragment : Fragment(), SurfaceHolder.Callback {
 
         // So this fragment doesn't restart on configuration changes; i.e. rotation.
         retainInstance = true
-        emulationState = EmulationState(game.path) {
-            return@EmulationState driverViewModel.isInteractionAllowed.value
-        }
+        emulationState = EmulationState(game.path)
     }
 
     /**
@@ -183,11 +182,11 @@ class EmulationFragment : Fragment(), SurfaceHolder.Callback {
             }
 
             override fun onDrawerOpened(drawerView: View) {
-                binding.drawerLayout.setDrawerLockMode(DrawerLayout.LOCK_MODE_UNLOCKED)
+                // No op
             }
 
             override fun onDrawerClosed(drawerView: View) {
-                binding.drawerLayout.setDrawerLockMode(IntSetting.LOCK_DRAWER.getInt())
+                // No op
             }
 
             override fun onDrawerStateChanged(newState: Int) {
@@ -197,28 +196,6 @@ class EmulationFragment : Fragment(), SurfaceHolder.Callback {
         binding.drawerLayout.setDrawerLockMode(DrawerLayout.LOCK_MODE_LOCKED_CLOSED)
         binding.inGameMenu.getHeaderView(0).findViewById<TextView>(R.id.text_game_title).text =
             game.title
-
-        binding.inGameMenu.menu.findItem(R.id.menu_lock_drawer).apply {
-            val lockMode = IntSetting.LOCK_DRAWER.getInt()
-            val titleId = if (lockMode == DrawerLayout.LOCK_MODE_LOCKED_CLOSED) {
-                R.string.unlock_drawer
-            } else {
-                R.string.lock_drawer
-            }
-            val iconId = if (lockMode == DrawerLayout.LOCK_MODE_UNLOCKED) {
-                R.drawable.ic_unlock
-            } else {
-                R.drawable.ic_lock
-            }
-
-            title = getString(titleId)
-            icon = ResourcesCompat.getDrawable(
-                resources,
-                iconId,
-                requireContext().theme
-            )
-        }
-
         binding.inGameMenu.setNavigationItemSelectedListener {
             when (it.itemId) {
                 R.id.menu_pause_emulation -> {
@@ -265,32 +242,6 @@ class EmulationFragment : Fragment(), SurfaceHolder.Callback {
                     true
                 }
 
-                R.id.menu_lock_drawer -> {
-                    when (IntSetting.LOCK_DRAWER.getInt()) {
-                        DrawerLayout.LOCK_MODE_UNLOCKED -> {
-                            IntSetting.LOCK_DRAWER.setInt(DrawerLayout.LOCK_MODE_LOCKED_CLOSED)
-                            it.title = resources.getString(R.string.unlock_drawer)
-                            it.icon = ResourcesCompat.getDrawable(
-                                resources,
-                                R.drawable.ic_lock,
-                                requireContext().theme
-                            )
-                        }
-
-                        DrawerLayout.LOCK_MODE_LOCKED_CLOSED -> {
-                            IntSetting.LOCK_DRAWER.setInt(DrawerLayout.LOCK_MODE_UNLOCKED)
-                            it.title = resources.getString(R.string.lock_drawer)
-                            it.icon = ResourcesCompat.getDrawable(
-                                resources,
-                                R.drawable.ic_unlock,
-                                requireContext().theme
-                            )
-                        }
-                    }
-                    NativeConfig.saveGlobalConfig()
-                    true
-                }
-
                 R.id.menu_exit -> {
                     emulationState.stop()
                     emulationViewModel.setIsEmulationStopping(true)
@@ -371,20 +322,11 @@ class EmulationFragment : Fragment(), SurfaceHolder.Callback {
                     }
                 }
             }
-            launch {
-                repeatOnLifecycle(Lifecycle.State.RESUMED) {
-                    driverViewModel.isInteractionAllowed.collect {
-                        if (it) {
-                            startEmulation()
-                        }
-                    }
-                }
-            }
             launch {
                 repeatOnLifecycle(Lifecycle.State.CREATED) {
                     emulationViewModel.emulationStarted.collectLatest {
                         if (it) {
-                            binding.drawerLayout.setDrawerLockMode(IntSetting.LOCK_DRAWER.getInt())
+                            binding.drawerLayout.setDrawerLockMode(DrawerLayout.LOCK_MODE_UNLOCKED)
                             ViewUtils.showView(binding.surfaceInputOverlay)
                             ViewUtils.hideView(binding.loadingIndicator)
 
@@ -408,10 +350,19 @@ class EmulationFragment : Fragment(), SurfaceHolder.Callback {
                     }
                 }
             }
+            launch {
+                repeatOnLifecycle(Lifecycle.State.RESUMED) {
+                    driverViewModel.isInteractionAllowed.collect {
+                        if (it) {
+                            onEmulationStart()
+                        }
+                    }
+                }
+            }
         }
     }
 
-    private fun startEmulation() {
+    private fun onEmulationStart() {
         if (!NativeLibrary.isRunning() && !NativeLibrary.isPaused()) {
             if (!DirectoryInitialization.areDirectoriesReady) {
                 DirectoryInitialization.start()
@@ -486,15 +437,12 @@ class EmulationFragment : Fragment(), SurfaceHolder.Callback {
             val FRAMETIME = 2
             val SPEED = 3
             perfStatsUpdater = {
-                if (emulationViewModel.emulationStarted.value &&
-                    !emulationViewModel.isEmulationStopping.value
-                ) {
+                if (emulationViewModel.emulationStarted.value) {
                     val perfStats = NativeLibrary.getPerfStats()
                     val cpuBackend = NativeLibrary.getCpuBackend()
-                    val gpuDriver = NativeLibrary.getGpuDriver()
                     if (_binding != null) {
                         binding.showFpsText.text =
-                            String.format("FPS: %.1f\n%s/%s", perfStats[FPS], cpuBackend, gpuDriver)
+                            String.format("FPS: %.1f\n%s", perfStats[FPS], cpuBackend)
                     }
                     perfStatsUpdateHandler.postDelayed(perfStatsUpdater!!, 800)
                 }
@@ -811,10 +759,7 @@ class EmulationFragment : Fragment(), SurfaceHolder.Callback {
         }
     }
 
-    private class EmulationState(
-        private val gamePath: String,
-        private val emulationCanStart: () -> Boolean
-    ) {
+    private class EmulationState(private val gamePath: String) {
         private var state: State
         private var surface: Surface? = null
 
@@ -908,7 +853,6 @@ class EmulationFragment : Fragment(), SurfaceHolder.Callback {
                     State.PAUSED -> Log.warning(
                         "[EmulationFragment] Surface cleared while emulation paused."
                     )
-
                     else -> Log.warning(
                         "[EmulationFragment] Surface cleared while emulation stopped."
                     )
@@ -918,10 +862,6 @@ class EmulationFragment : Fragment(), SurfaceHolder.Callback {
 
         private fun runWithValidSurface() {
             NativeLibrary.surfaceChanged(surface)
-            if (!emulationCanStart.invoke()) {
-                return
-            }
-
             when (state) {
                 State.STOPPED -> {
                     val emulationThread = Thread({

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

@@ -21,10 +21,8 @@ import androidx.fragment.app.activityViewModels
 import androidx.navigation.findNavController
 import androidx.navigation.fragment.navArgs
 import com.google.android.material.transition.MaterialSharedAxis
-import org.yuzu.yuzu_emu.NativeLibrary
 import org.yuzu.yuzu_emu.R
 import org.yuzu.yuzu_emu.databinding.FragmentGameInfoBinding
-import org.yuzu.yuzu_emu.model.GameVerificationResult
 import org.yuzu.yuzu_emu.model.HomeViewModel
 import org.yuzu.yuzu_emu.utils.GameMetadata
 
@@ -103,38 +101,6 @@ class GameInfoFragment : Fragment() {
                 """.trimIndent()
                 copyToClipboard(args.game.title, details)
             }
-
-            buttonVerifyIntegrity.setOnClickListener {
-                ProgressDialogFragment.newInstance(
-                    requireActivity(),
-                    R.string.verifying,
-                    true
-                ) { progressCallback, _ ->
-                    val result = GameVerificationResult.from(
-                        NativeLibrary.verifyGameContents(
-                            args.game.path,
-                            progressCallback
-                        )
-                    )
-                    return@newInstance when (result) {
-                        GameVerificationResult.Success ->
-                            MessageDialogFragment.newInstance(
-                                titleId = R.string.verify_success,
-                                descriptionId = R.string.operation_completed_successfully
-                            )
-                        GameVerificationResult.Failed ->
-                            MessageDialogFragment.newInstance(
-                                titleId = R.string.verify_failure,
-                                descriptionId = R.string.verify_failure_description
-                            )
-                        GameVerificationResult.NotImplemented ->
-                            MessageDialogFragment.newInstance(
-                                titleId = R.string.verify_no_result,
-                                descriptionId = R.string.verify_no_result_description
-                            )
-                    }
-                }.show(parentFragmentManager, ProgressDialogFragment.TAG)
-            }
         }
 
         setInsets()

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

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

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

@@ -32,7 +32,6 @@ import org.yuzu.yuzu_emu.BuildConfig
 import org.yuzu.yuzu_emu.HomeNavigationDirections
 import org.yuzu.yuzu_emu.NativeLibrary
 import org.yuzu.yuzu_emu.R
-import org.yuzu.yuzu_emu.YuzuApplication
 import org.yuzu.yuzu_emu.adapters.HomeSettingAdapter
 import org.yuzu.yuzu_emu.databinding.FragmentHomeSettingsBinding
 import org.yuzu.yuzu_emu.features.DocumentProvider
@@ -141,38 +140,6 @@ class HomeSettingsFragment : Fragment() {
                     }
                 )
             )
-            add(
-                HomeSetting(
-                    R.string.verify_installed_content,
-                    R.string.verify_installed_content_description,
-                    R.drawable.ic_check_circle,
-                    {
-                        ProgressDialogFragment.newInstance(
-                            requireActivity(),
-                            titleId = R.string.verifying,
-                            cancellable = true
-                        ) { progressCallback, _ ->
-                            val result = NativeLibrary.verifyInstalledContents(progressCallback)
-                            return@newInstance if (result.isEmpty()) {
-                                MessageDialogFragment.newInstance(
-                                    titleId = R.string.verify_success,
-                                    descriptionId = R.string.operation_completed_successfully
-                                )
-                            } else {
-                                val failedNames = result.joinToString("\n")
-                                val errorMessage = YuzuApplication.appContext.getString(
-                                    R.string.verification_failed_for,
-                                    failedNames
-                                )
-                                MessageDialogFragment.newInstance(
-                                    titleId = R.string.verify_failure,
-                                    descriptionString = errorMessage
-                                )
-                            }
-                        }.show(parentFragmentManager, ProgressDialogFragment.TAG)
-                    }
-                )
-            )
             add(
                 HomeSetting(
                     R.string.share_log,

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

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

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

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

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

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

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

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

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

@@ -1,15 +0,0 @@
-// SPDX-FileCopyrightText: 2024 yuzu Emulator Project
-// SPDX-License-Identifier: GPL-2.0-or-later
-
-package org.yuzu.yuzu_emu.model
-
-enum class GameVerificationResult(val int: Int) {
-    Success(0),
-    Failed(1),
-    NotImplemented(2);
-
-    companion object {
-        fun from(int: Int): GameVerificationResult =
-            entries.firstOrNull { it.int == int } ?: Success
-    }
-}

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

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

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

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

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

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

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

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

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

@@ -247,7 +247,6 @@ Core::SystemResultStatus EmulationSession::InitializeEmulation(const std::string
     m_system.GetCpuManager().OnGpuReady();
     m_system.RegisterExitCallback([&] { HaltEmulation(); });
 
-    OnEmulationStarted();
     return Core::SystemResultStatus::Success;
 }
 
@@ -464,8 +463,8 @@ int Java_org_yuzu_yuzu_1emu_NativeLibrary_installFileToNand(JNIEnv* env, jobject
     };
 
     return static_cast<int>(
-        ContentManager::InstallNSP(EmulationSession::GetInstance().System(),
-                                   *EmulationSession::GetInstance().System().GetFilesystem(),
+        ContentManager::InstallNSP(&EmulationSession::GetInstance().System(),
+                                   EmulationSession::GetInstance().System().GetFilesystem().get(),
                                    GetJString(env, j_file), callback));
 }
 
@@ -675,11 +674,6 @@ jstring Java_org_yuzu_yuzu_1emu_NativeLibrary_getCpuBackend(JNIEnv* env, jclass
     return ToJString(env, "JIT");
 }
 
-jstring Java_org_yuzu_yuzu_1emu_NativeLibrary_getGpuDriver(JNIEnv* env, jobject jobj) {
-    return ToJString(env,
-                     EmulationSession::GetInstance().System().GPU().Renderer().GetDeviceVendor());
-}
-
 void Java_org_yuzu_yuzu_1emu_NativeLibrary_applySettings(JNIEnv* env, jobject jobj) {
     EmulationSession::GetInstance().System().ApplySettings();
 }
@@ -825,7 +819,7 @@ void Java_org_yuzu_yuzu_1emu_NativeLibrary_removeUpdate(JNIEnv* env, jobject job
 void Java_org_yuzu_yuzu_1emu_NativeLibrary_removeDLC(JNIEnv* env, jobject jobj,
                                                      jstring jprogramId) {
     auto program_id = EmulationSession::GetProgramId(env, jprogramId);
-    ContentManager::RemoveAllDLC(EmulationSession::GetInstance().System(), program_id);
+    ContentManager::RemoveAllDLC(&EmulationSession::GetInstance().System(), program_id);
 }
 
 void Java_org_yuzu_yuzu_1emu_NativeLibrary_removeMod(JNIEnv* env, jobject jobj, jstring jprogramId,
@@ -835,44 +829,6 @@ void Java_org_yuzu_yuzu_1emu_NativeLibrary_removeMod(JNIEnv* env, jobject jobj,
                               program_id, GetJString(env, jname));
 }
 
-jobjectArray Java_org_yuzu_yuzu_1emu_NativeLibrary_verifyInstalledContents(JNIEnv* env,
-                                                                           jobject jobj,
-                                                                           jobject jcallback) {
-    auto jlambdaClass = env->GetObjectClass(jcallback);
-    auto jlambdaInvokeMethod = env->GetMethodID(
-        jlambdaClass, "invoke", "(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;");
-    const auto callback = [env, jcallback, jlambdaInvokeMethod](size_t max, size_t progress) {
-        auto jwasCancelled = env->CallObjectMethod(jcallback, jlambdaInvokeMethod,
-                                                   ToJDouble(env, max), ToJDouble(env, progress));
-        return GetJBoolean(env, jwasCancelled);
-    };
-
-    auto& session = EmulationSession::GetInstance();
-    std::vector<std::string> result = ContentManager::VerifyInstalledContents(
-        session.System(), *session.GetContentProvider(), callback);
-    jobjectArray jresult =
-        env->NewObjectArray(result.size(), IDCache::GetStringClass(), ToJString(env, ""));
-    for (size_t i = 0; i < result.size(); ++i) {
-        env->SetObjectArrayElement(jresult, i, ToJString(env, result[i]));
-    }
-    return jresult;
-}
-
-jint Java_org_yuzu_yuzu_1emu_NativeLibrary_verifyGameContents(JNIEnv* env, jobject jobj,
-                                                              jstring jpath, jobject jcallback) {
-    auto jlambdaClass = env->GetObjectClass(jcallback);
-    auto jlambdaInvokeMethod = env->GetMethodID(
-        jlambdaClass, "invoke", "(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;");
-    const auto callback = [env, jcallback, jlambdaInvokeMethod](size_t max, size_t progress) {
-        auto jwasCancelled = env->CallObjectMethod(jcallback, jlambdaInvokeMethod,
-                                                   ToJDouble(env, max), ToJDouble(env, progress));
-        return GetJBoolean(env, jwasCancelled);
-    };
-    auto& session = EmulationSession::GetInstance();
-    return static_cast<jint>(
-        ContentManager::VerifyGameContents(session.System(), GetJString(env, jpath), callback));
-}
-
 jstring Java_org_yuzu_yuzu_1emu_NativeLibrary_getSavePath(JNIEnv* env, jobject jobj,
                                                           jstring jprogramId) {
     auto program_id = EmulationSession::GetProgramId(env, jprogramId);
@@ -919,10 +875,4 @@ void Java_org_yuzu_yuzu_1emu_NativeLibrary_clearFilesystemProvider(JNIEnv* env,
     EmulationSession::GetInstance().GetContentProvider()->ClearAllEntries();
 }
 
-jboolean Java_org_yuzu_yuzu_1emu_NativeLibrary_areKeysPresent(JNIEnv* env, jobject jobj) {
-    auto& system = EmulationSession::GetInstance().System();
-    system.GetFileSystemController().CreateFactories(*system.GetFilesystem());
-    return ContentManager::AreKeysPresent();
-}
-
 } // extern "C"

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

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

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

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

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

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

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

@@ -118,14 +118,6 @@
                 android:layout_marginTop="16dp"
                 android:text="@string/copy_details" />
 
-            <com.google.android.material.button.MaterialButton
-                android:id="@+id/button_verify_integrity"
-                style="@style/Widget.Material3.Button"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_marginTop="10dp"
-                android:text="@string/verify_integrity" />
-
         </LinearLayout>
 
     </androidx.core.widget.NestedScrollView>

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

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

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

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

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

@@ -142,11 +142,6 @@
         <item quantity="other">Successfully imported %d saves</item>
     </plurals>
     <string name="no_save_data_found">No save data found</string>
-    <string name="verify_installed_content">Verify installed content</string>
-    <string name="verify_installed_content_description">Checks all installed content for corruption</string>
-    <string name="keys_missing">Encryption keys are missing</string>
-    <string name="keys_missing_description">Firmware and retail games cannot be decrypted</string>
-    <string name="keys_missing_help">https://yuzu-emu.org/help/quickstart/#dumping-decryption-keys</string>
 
     <!-- Applet launcher strings -->
     <string name="applets">Applet launcher</string>
@@ -293,7 +288,6 @@
     <string name="import_complete">Import complete</string>
     <string name="more_options">More options</string>
     <string name="use_global_setting">Use global setting</string>
-    <string name="operation_completed_successfully">The operation completed successfully</string>
 
     <!-- GPU driver installation -->
     <string name="select_gpu_driver">Select GPU driver</string>
@@ -358,14 +352,6 @@
     <string name="content_install_notice_description">The content that you selected does not match this game.\nInstall anyway?</string>
     <string name="confirm_uninstall">Confirm uninstall</string>
     <string name="confirm_uninstall_description">Are you sure you want to uninstall this addon?</string>
-    <string name="verify_integrity">Verify integrity</string>
-    <string name="verifying">Verifying…</string>
-    <string name="verify_success">Integrity verification succeeded!</string>
-    <string name="verify_failure">Integrity verification failed!</string>
-    <string name="verify_failure_description">File contents may be corrupt</string>
-    <string name="verify_no_result">Integrity verification couldn\'t be performed</string>
-    <string name="verify_no_result_description">File contents were not checked for validity</string>
-    <string name="verification_failed_for">Verification failed for the following files:\n%1$s</string>
 
     <!-- ROM loading errors -->
     <string name="loader_error_encrypted">Your ROM is encrypted</string>
@@ -395,8 +381,6 @@
     <string name="emulation_unpause">Unpause emulation</string>
     <string name="emulation_input_overlay">Overlay options</string>
     <string name="touchscreen">Touchscreen</string>
-    <string name="lock_drawer">Lock drawer</string>
-    <string name="unlock_drawer">Unlock drawer</string>
 
     <string name="load_settings">Loading settings…</string>
 

src/common/CMakeLists.txt

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

src/common/arm64/native_clock.cpp

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

src/common/arm64/native_clock.h

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

src/common/range_mutex.h

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

src/common/settings.h

@@ -420,15 +420,10 @@ struct Values {
     SwitchableSetting<s64> custom_rtc{
         linkage, 0,    "custom_rtc",       Category::System, Specialization::Time,
         false,   true, &custom_rtc_enabled};
-    SwitchableSetting<s64, true> custom_rtc_offset{linkage,
-                                                   0,
-                                                   std::numeric_limits<int>::min(),
-                                                   std::numeric_limits<int>::max(),
-                                                   "custom_rtc_offset",
-                                                   Category::System,
-                                                   Specialization::Countable,
-                                                   true,
-                                                   true};
+    SwitchableSetting<s64, false> custom_rtc_offset{
+        linkage, 0, "custom_rtc_offset", Category::System, Specialization::Countable, true, true};
+    // Set on game boot, reset on stop. Seconds difference between current time and `custom_rtc`
+    s64 custom_rtc_differential;
     SwitchableSetting<bool> rng_seed_enabled{
         linkage, false, "rng_seed_enabled", Category::System, Specialization::Paired, true, true};
     SwitchableSetting<u32> rng_seed{

src/common/wall_clock.cpp

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

src/common/wall_clock.h

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

src/common/x64/native_clock.cpp

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

src/common/x64/native_clock.h

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

src/core/core_timing.cpp

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

src/core/device_memory_manager.h

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

src/core/device_memory_manager.inc

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

src/core/file_sys/system_archive/system_archive.cpp

@@ -67,29 +67,25 @@ constexpr std::array<SystemArchiveDescriptor, SYSTEM_ARCHIVE_COUNT> SYSTEM_ARCHI
 }};
 
 VirtualFile SynthesizeSystemArchive(const u64 title_id) {
-    if (title_id < SYSTEM_ARCHIVES.front().title_id || title_id > SYSTEM_ARCHIVES.back().title_id) {
+    if (title_id < SYSTEM_ARCHIVES.front().title_id || title_id > SYSTEM_ARCHIVES.back().title_id)
         return nullptr;
-    }
 
     const auto& desc = SYSTEM_ARCHIVES[title_id - SYSTEM_ARCHIVE_BASE_TITLE_ID];
 
     LOG_INFO(Service_FS, "Synthesizing system archive '{}' (0x{:016X}).", desc.name, desc.title_id);
 
-    if (desc.supplier == nullptr) {
+    if (desc.supplier == nullptr)
         return nullptr;
-    }
 
     const auto dir = desc.supplier();
 
-    if (dir == nullptr) {
+    if (dir == nullptr)
         return nullptr;
-    }
 
     const auto romfs = CreateRomFS(dir);
 
-    if (romfs == nullptr) {
+    if (romfs == nullptr)
         return nullptr;
-    }
 
     LOG_INFO(Service_FS, "    - System archive generation successful!");
     return romfs;

src/core/hle/kernel/k_page_table_base.cpp

@@ -69,14 +69,9 @@ public:
 };
 
 template <typename AddressType>
-void InvalidateInstructionCache(KernelCore& kernel, KPageTableBase* table, AddressType addr,
-                                u64 size) {
+void InvalidateInstructionCache(KernelCore& kernel, AddressType addr, u64 size) {
     // TODO: lock the process list
     for (auto& process : kernel.GetProcessList()) {
-        if (std::addressof(process->GetPageTable().GetBasePageTable()) != table) {
-            continue;
-        }
-
         for (size_t i = 0; i < Core::Hardware::NUM_CPU_CORES; i++) {
             auto* interface = process->GetArmInterface(i);
             if (interface) {
@@ -1307,7 +1302,7 @@ Result KPageTableBase::UnmapCodeMemory(KProcessAddress dst_address, KProcessAddr
     bool reprotected_pages = false;
     SCOPE_EXIT({
         if (reprotected_pages && any_code_pages) {
-            InvalidateInstructionCache(m_kernel, this, dst_address, size);
+            InvalidateInstructionCache(m_kernel, dst_address, size);
         }
     });
 
@@ -2041,7 +2036,7 @@ Result KPageTableBase::SetProcessMemoryPermission(KProcessAddress addr, size_t s
         for (const auto& block : pg) {
             StoreDataCache(GetHeapVirtualPointer(m_kernel, block.GetAddress()), block.GetSize());
         }
-        InvalidateInstructionCache(m_kernel, this, addr, size);
+        InvalidateInstructionCache(m_kernel, addr, size);
     }
 
     R_SUCCEED();
@@ -3282,7 +3277,7 @@ Result KPageTableBase::WriteDebugMemory(KProcessAddress dst_address, KProcessAdd
     R_TRY(PerformCopy());
 
     // Invalidate the instruction cache, as this svc allows modifying executable pages.
-    InvalidateInstructionCache(m_kernel, this, dst_address, size);
+    InvalidateInstructionCache(m_kernel, dst_address, size);
 
     R_SUCCEED();
 }

src/core/hle/service/glue/time/manager.cpp

@@ -89,8 +89,7 @@ Service::PSC::Time::LocationName GetTimeZoneString(Service::PSC::Time::LocationN
                     std::min(configured_name.name.size(), configured_zone.size()));
     }
 
-    ASSERT_MSG(IsTimeZoneBinaryValid(configured_name), "Invalid time zone {}!",
-               configured_name.name.data());
+    ASSERT_MSG(IsTimeZoneBinaryValid(configured_name), "Invalid time zone!");
 
     return configured_name;
 }

src/core/hle/service/glue/time/static.cpp

@@ -284,10 +284,9 @@ void StaticService::Handle_GetClockSnapshotFromSystemClockContext(HLERequestCont
     LOG_DEBUG(Service_Time, "called.");
 
     IPC::RequestParser rp{ctx};
-    auto clock_type{rp.PopEnum<Service::PSC::Time::TimeType>()};
-    [[maybe_unused]] auto alignment{rp.Pop<u32>()};
     auto user_context{rp.PopRaw<Service::PSC::Time::SystemClockContext>()};
     auto network_context{rp.PopRaw<Service::PSC::Time::SystemClockContext>()};
+    auto clock_type{rp.PopEnum<Service::PSC::Time::TimeType>()};
 
     Service::PSC::Time::ClockSnapshot snapshot{};
     auto res =

src/core/hle/service/glue/time/time_zone_binary.cpp

@@ -61,16 +61,6 @@ Result MountTimeZoneBinary(Core::System& system) {
         g_time_zone_binary_romfs = FileSys::ExtractRomFS(nca->GetRomFS());
     }
 
-    if (g_time_zone_binary_romfs) {
-        // Validate that the romfs is readable, using invalid firmware keys can cause this to get
-        // set but the files to be garbage. In that case, we want to hit the next path and
-        // synthesise them instead.
-        Service::PSC::Time::LocationName name{"Etc/GMT"};
-        if (!IsTimeZoneBinaryValid(name)) {
-            ResetTimeZoneBinary();
-        }
-    }
-
     if (!g_time_zone_binary_romfs) {
         g_time_zone_binary_romfs = FileSys::ExtractRomFS(
             FileSys::SystemArchive::SynthesizeSystemArchive(TimeZoneBinaryId));
@@ -112,7 +102,6 @@ bool IsTimeZoneBinaryValid(Service::PSC::Time::LocationName& name) {
 
     auto vfs_file{g_time_zone_binary_romfs->GetFileRelative(path)};
     if (!vfs_file) {
-        LOG_INFO(Service_Time, "Could not find timezone file {}", path);
         return false;
     }
     return vfs_file->GetSize() != 0;

src/core/hle/service/hid/hid_system_server.cpp

@@ -533,7 +533,7 @@ void IHidSystemServer::EnableAppletToGetInput(HLERequestContext& ctx) {
              parameters.is_enabled, parameters.applet_resource_user_id);
 
     GetResourceManager()->EnableInput(parameters.applet_resource_user_id, parameters.is_enabled);
-    GetResourceManager()->GetNpad()->EnableAppletToGetInput(parameters.applet_resource_user_id);
+    // GetResourceManager()->GetNpad()->EnableInput(parameters.applet_resource_user_id);
 
     IPC::ResponseBuilder rb{ctx, 2};
     rb.Push(ResultSuccess);
@@ -596,7 +596,7 @@ void IHidSystemServer::EnableAppletToGetPadInput(HLERequestContext& ctx) {
              parameters.is_enabled, parameters.applet_resource_user_id);
 
     GetResourceManager()->EnablePadInput(parameters.applet_resource_user_id, parameters.is_enabled);
-    GetResourceManager()->GetNpad()->EnableAppletToGetInput(parameters.applet_resource_user_id);
+    // GetResourceManager()->GetNpad()->EnableInput(parameters.applet_resource_user_id);
 
     IPC::ResponseBuilder rb{ctx, 2};
     rb.Push(ResultSuccess);

src/core/hle/service/nvdrv/core/container.cpp

@@ -112,7 +112,6 @@ SessionId Container::OpenSession(Kernel::KProcess* process) {
 
 void Container::CloseSession(SessionId session_id) {
     std::scoped_lock lk(impl->session_guard);
-    impl->file.UnmapAllHandles(session_id);
     auto& session = impl->sessions[session_id.id];
     auto& smmu = impl->host1x.MemoryManager();
     if (session.has_preallocated_area) {

src/core/hle/service/nvdrv/core/nvmap.cpp

@@ -326,17 +326,4 @@ std::optional<NvMap::FreeInfo> NvMap::FreeHandle(Handle::Id handle, bool interna
     return freeInfo;
 }
 
-void NvMap::UnmapAllHandles(NvCore::SessionId session_id) {
-    auto handles_copy = [&] {
-        std::scoped_lock lk{handles_lock};
-        return handles;
-    }();
-
-    for (auto& [id, handle] : handles_copy) {
-        if (handle->session_id.id == session_id.id) {
-            FreeHandle(id, false);
-        }
-    }
-}
-
 } // namespace Service::Nvidia::NvCore

src/core/hle/service/nvdrv/core/nvmap.h

@@ -152,8 +152,6 @@ public:
      */
     std::optional<FreeInfo> FreeHandle(Handle::Id handle, bool internal_session);
 
-    void UnmapAllHandles(NvCore::SessionId session_id);
-
 private:
     std::list<std::shared_ptr<Handle>> unmap_queue{};
     std::mutex unmap_queue_lock{}; //!< Protects access to `unmap_queue`

src/core/hle/service/nvdrv/nvdrv_interface.cpp

@@ -4,7 +4,6 @@
 
 #include "common/logging/log.h"
 #include "common/scope_exit.h"
-#include "common/string_util.h"
 #include "core/core.h"
 #include "core/hle/kernel/k_event.h"
 #include "core/hle/kernel/k_process.h"
@@ -30,7 +29,7 @@ void NVDRV::Open(HLERequestContext& ctx) {
     }
 
     const auto& buffer = ctx.ReadBuffer();
-    const std::string device_name(Common::StringFromBuffer(buffer));
+    const std::string device_name(buffer.begin(), buffer.end());
 
     if (device_name == "/dev/nvhost-prof-gpu") {
         rb.Push<DeviceFD>(0);

src/core/hle/service/psc/time/service_manager.cpp

@@ -119,21 +119,15 @@ void ServiceManager::Handle_GetStaticServiceAsServiceManager(HLERequestContext&
 void ServiceManager::Handle_SetupStandardSteadyClockCore(HLERequestContext& ctx) {
     LOG_DEBUG(Service_Time, "called.");
 
-    struct Parameters {
-        bool reset_detected;
-        Common::UUID clock_source_id;
-        s64 rtc_offset;
-        s64 internal_offset;
-        s64 test_offset;
-    };
-    static_assert(sizeof(Parameters) == 0x30);
-
     IPC::RequestParser rp{ctx};
-    auto params{rp.PopRaw<Parameters>()};
+    auto clock_source_id{rp.PopRaw<Common::UUID>()};
+    auto rtc_offset{rp.Pop<s64>()};
+    auto internal_offset{rp.Pop<s64>()};
+    auto test_offset{rp.Pop<s64>()};
+    auto is_rtc_reset_detected{rp.Pop<bool>()};
 
-    auto res = SetupStandardSteadyClockCore(params.clock_source_id, params.rtc_offset,
-                                            params.internal_offset, params.test_offset,
-                                            params.reset_detected);
+    auto res = SetupStandardSteadyClockCore(clock_source_id, rtc_offset, internal_offset,
+                                            test_offset, is_rtc_reset_detected);
 
     IPC::ResponseBuilder rb{ctx, 2};
     rb.Push(res);
@@ -168,16 +162,11 @@ void ServiceManager::Handle_SetupStandardNetworkSystemClockCore(HLERequestContex
 void ServiceManager::Handle_SetupStandardUserSystemClockCore(HLERequestContext& ctx) {
     LOG_DEBUG(Service_Time, "called.");
 
-    struct Parameters {
-        bool automatic_correction;
-        SteadyClockTimePoint time_point;
-    };
-    static_assert(sizeof(Parameters) == 0x20);
-
     IPC::RequestParser rp{ctx};
-    auto params{rp.PopRaw<Parameters>()};
+    auto time_point{rp.PopRaw<SteadyClockTimePoint>()};
+    auto automatic_correction{rp.Pop<bool>()};
 
-    auto res = SetupStandardUserSystemClockCore(params.time_point, params.automatic_correction);
+    auto res = SetupStandardUserSystemClockCore(time_point, automatic_correction);
 
     IPC::ResponseBuilder rb{ctx, 2};
     rb.Push(res);
@@ -186,21 +175,16 @@ void ServiceManager::Handle_SetupStandardUserSystemClockCore(HLERequestContext&
 void ServiceManager::Handle_SetupTimeZoneServiceCore(HLERequestContext& ctx) {
     LOG_DEBUG(Service_Time, "called.");
 
-    struct Parameters {
-        u32 location_count;
-        LocationName name;
-        SteadyClockTimePoint time_point;
-        RuleVersion rule_version;
-    };
-    static_assert(sizeof(Parameters) == 0x50);
-
     IPC::RequestParser rp{ctx};
-    auto params{rp.PopRaw<Parameters>()};
+    auto name{rp.PopRaw<LocationName>()};
+    auto time_point{rp.PopRaw<SteadyClockTimePoint>()};
+    auto rule_version{rp.PopRaw<RuleVersion>()};
+    auto location_count{rp.Pop<u32>()};
 
     auto rule_buffer{ctx.ReadBuffer()};
 
-    auto res = SetupTimeZoneServiceCore(params.name, params.time_point, params.rule_version,
-                                        params.location_count, rule_buffer);
+    auto res =
+        SetupTimeZoneServiceCore(name, time_point, rule_version, location_count, rule_buffer);
 
     IPC::ResponseBuilder rb{ctx, 2};
     rb.Push(res);
@@ -302,22 +286,11 @@ void ServiceManager::Handle_GetClosestAlarmInfo(HLERequestContext& ctx) {
     s64 time{};
     auto res = GetClosestAlarmInfo(is_valid, alarm_info, time);
 
-    struct OutParameters {
-        bool is_valid;
-        AlarmInfo alarm_info;
-        s64 time;
-    };
-    static_assert(sizeof(OutParameters) == 0x20);
-
-    OutParameters out_params{
-        .is_valid = is_valid,
-        .alarm_info = alarm_info,
-        .time = time,
-    };
-
-    IPC::ResponseBuilder rb{ctx, 2 + sizeof(OutParameters) / sizeof(u32)};
+    IPC::ResponseBuilder rb{ctx, 5 + sizeof(AlarmInfo) / sizeof(u32)};
     rb.Push(res);
-    rb.PushRaw<OutParameters>(out_params);
+    rb.PushRaw<AlarmInfo>(alarm_info);
+    rb.Push<bool>(is_valid);
+    rb.Push<s64>(time);
 }
 
 // =============================== Implementations ===========================

src/core/hle/service/psc/time/static.cpp

@@ -277,10 +277,9 @@ void StaticService::Handle_GetClockSnapshotFromSystemClockContext(HLERequestCont
     LOG_DEBUG(Service_Time, "called.");
 
     IPC::RequestParser rp{ctx};
-    auto clock_type{rp.PopEnum<TimeType>()};
-    [[maybe_unused]] auto alignment{rp.Pop<u32>()};
     auto user_context{rp.PopRaw<SystemClockContext>()};
     auto network_context{rp.PopRaw<SystemClockContext>()};
+    auto clock_type{rp.PopEnum<TimeType>()};
 
     ClockSnapshot snapshot{};
     auto res =

src/core/hle/service/psc/time/steady_clock.cpp

@@ -15,12 +15,12 @@ SteadyClock::SteadyClock(Core::System& system_, std::shared_ptr<TimeManager> man
     // clang-format off
          static const FunctionInfo functions[] = {
         {0, &SteadyClock::Handle_GetCurrentTimePoint, "GetCurrentTimePoint"},
-        {2, &SteadyClock::Handle_GetTestOffset, "GetTestOffset"},
-        {3, &SteadyClock::Handle_SetTestOffset, "SetTestOffset"},
-        {100, &SteadyClock::Handle_GetRtcValue, "GetRtcValue"},
-        {101, &SteadyClock::Handle_IsRtcResetDetected, "IsRtcResetDetected"},
-        {102, &SteadyClock::Handle_GetSetupResultValue, "GetSetupResultValue"},
-        {200, &SteadyClock::Handle_GetInternalOffset, "GetInternalOffset"},
+        {1, &SteadyClock::Handle_GetTestOffset, "GetTestOffset"},
+        {2, &SteadyClock::Handle_SetTestOffset, "SetTestOffset"},
+        {3, &SteadyClock::Handle_GetRtcValue, "GetRtcValue"},
+        {4, &SteadyClock::Handle_IsRtcResetDetected, "IsRtcResetDetected"},
+        {5, &SteadyClock::Handle_GetSetupResultValue, "GetSetupResultValue"},
+        {6, &SteadyClock::Handle_GetInternalOffset, "GetInternalOffset"},
     };
     // clang-format on
     RegisterHandlers(functions);

src/core/hle/service/set/system_settings_server.cpp

@@ -709,12 +709,12 @@ void ISystemSettingsServer::GetSettingsItemValueSize(HLERequestContext& ctx) {
     // The category of the setting. This corresponds to the top-level keys of
     // system_settings.ini.
     const auto setting_category_buf{ctx.ReadBuffer(0)};
-    const std::string setting_category{Common::StringFromBuffer(setting_category_buf)};
+    const std::string setting_category{setting_category_buf.begin(), setting_category_buf.end()};
 
     // The name of the setting. This corresponds to the second-level keys of
     // system_settings.ini.
     const auto setting_name_buf{ctx.ReadBuffer(1)};
-    const std::string setting_name{Common::StringFromBuffer(setting_name_buf)};
+    const std::string setting_name{setting_name_buf.begin(), setting_name_buf.end()};
 
     auto settings{GetSettings()};
     u64 response_size{0};
@@ -732,12 +732,12 @@ void ISystemSettingsServer::GetSettingsItemValue(HLERequestContext& ctx) {
     // The category of the setting. This corresponds to the top-level keys of
     // system_settings.ini.
     const auto setting_category_buf{ctx.ReadBuffer(0)};
-    const std::string setting_category{Common::StringFromBuffer(setting_category_buf)};
+    const std::string setting_category{setting_category_buf.begin(), setting_category_buf.end()};
 
     // The name of the setting. This corresponds to the second-level keys of
     // system_settings.ini.
     const auto setting_name_buf{ctx.ReadBuffer(1)};
-    const std::string setting_name{Common::StringFromBuffer(setting_name_buf)};
+    const std::string setting_name{setting_name_buf.begin(), setting_name_buf.end()};
 
     std::vector<u8> value;
     auto response = GetSettingsItemValue(value, setting_category, setting_name);

src/core/hle/service/vi/vi.cpp

@@ -15,7 +15,6 @@
 #include "common/logging/log.h"
 #include "common/math_util.h"
 #include "common/settings.h"
-#include "common/string_util.h"
 #include "common/swap.h"
 #include "core/core_timing.h"
 #include "core/hle/kernel/k_readable_event.h"
@@ -695,7 +694,9 @@ private:
     void OpenLayer(HLERequestContext& ctx) {
         IPC::RequestParser rp{ctx};
         const auto name_buf = rp.PopRaw<std::array<u8, 0x40>>();
-        const std::string display_name(Common::StringFromBuffer(name_buf));
+        const auto end = std::find(name_buf.begin(), name_buf.end(), '\0');
+
+        const std::string display_name(name_buf.begin(), end);
 
         const u64 layer_id = rp.Pop<u64>();
         const u64 aruid = rp.Pop<u64>();

src/core/loader/nsp.cpp

@@ -10,7 +10,6 @@
 #include "core/file_sys/nca_metadata.h"
 #include "core/file_sys/patch_manager.h"
 #include "core/file_sys/registered_cache.h"
-#include "core/file_sys/romfs_factory.h"
 #include "core/file_sys/submission_package.h"
 #include "core/hle/kernel/k_process.h"
 #include "core/hle/service/filesystem/filesystem.h"
@@ -110,13 +109,6 @@ AppLoader_NSP::LoadResult AppLoader_NSP::Load(Kernel::KProcess& process, Core::S
         return result;
     }
 
-    if (nsp->IsExtractedType()) {
-        system.GetFileSystemController().RegisterProcess(
-            process.GetProcessId(), {},
-            std::make_shared<FileSys::RomFSFactory>(*this, system.GetContentProvider(),
-                                                    system.GetFileSystemController()));
-    }
-
     FileSys::VirtualFile update_raw;
     if (ReadUpdateRaw(update_raw) == ResultStatus::Success && update_raw != nullptr) {
         system.GetFileSystemController().SetPackedUpdate(process.GetProcessId(),

src/core/memory.cpp

@@ -1093,20 +1093,6 @@ bool Memory::InvalidateNCE(Common::ProcessAddress vaddr, size_t size) {
         [&] { rasterizer = true; });
     if (rasterizer) {
         impl->InvalidateGPUMemory(ptr, size);
-
-        const auto type = impl->current_page_table->pointers[vaddr >> YUZU_PAGEBITS].Type();
-        if (type == Common::PageType::RasterizerCachedMemory) {
-            // Check if device mapped. If not, this bugged and we can unmark.
-            DAddr addr{};
-            Common::ScratchBuffer<u32> buffer;
-            impl->gpu_device_memory->ApplyOpOnPointer(ptr, buffer,
-                                                      [&](DAddr address) { addr = address; });
-
-            if (addr == 0) {
-                LOG_ERROR(HW_Memory, "Fixing unmapped cached region {:#x}", GetInteger(vaddr));
-                impl->RasterizerMarkRegionCached(GetInteger(vaddr), size, false);
-            }
-        }
     }
 
 #ifdef __linux__

src/frontend_common/content_manager.h

@@ -11,12 +11,10 @@
 #include "core/file_sys/content_archive.h"
 #include "core/file_sys/mode.h"
 #include "core/file_sys/nca_metadata.h"
-#include "core/file_sys/patch_manager.h"
 #include "core/file_sys/registered_cache.h"
 #include "core/file_sys/submission_package.h"
 #include "core/hle/service/filesystem/filesystem.h"
 #include "core/loader/loader.h"
-#include "core/loader/nca.h"
 
 namespace ContentManager {
 
@@ -27,12 +25,6 @@ enum class InstallResult {
     BaseInstallAttempted,
 };
 
-enum class GameVerificationResult {
-    Success,
-    Failed,
-    NotImplemented,
-};
-
 /**
  * \brief Removes a single installed DLC
  * \param fs_controller [FileSystemController] reference from the Core::System instance
@@ -47,14 +39,14 @@ inline bool RemoveDLC(const Service::FileSystem::FileSystemController& fs_contro
 
 /**
  * \brief Removes all DLC for a game
- * \param system Reference to the system instance
+ * \param system Raw pointer to the system instance
  * \param program_id Program ID for the game that will have all of its DLC removed
  * \return Number of DLC removed
  */
-inline size_t RemoveAllDLC(Core::System& system, const u64 program_id) {
+inline size_t RemoveAllDLC(Core::System* system, const u64 program_id) {
     size_t count{};
-    const auto& fs_controller = system.GetFileSystemController();
-    const auto dlc_entries = system.GetContentProvider().ListEntriesFilter(
+    const auto& fs_controller = system->GetFileSystemController();
+    const auto dlc_entries = system->GetContentProvider().ListEntriesFilter(
         FileSys::TitleType::AOC, FileSys::ContentRecordType::Data);
     std::vector<u64> program_dlc_entries;
 
@@ -124,17 +116,17 @@ inline bool RemoveMod(const Service::FileSystem::FileSystemController& fs_contro
 
 /**
  * \brief Installs an NSP
- * \param system Reference to the system instance
- * \param vfs Reference to the VfsFilesystem instance in Core::System
+ * \param system Raw pointer to the system instance
+ * \param vfs Raw pointer to the VfsFilesystem instance in Core::System
  * \param filename Path to the NSP file
- * \param callback Callback to report the progress of the installation. The first size_t
+ * \param callback Optional callback to report the progress of the installation. The first size_t
  * parameter is the total size of the virtual file and the second is the current progress. If you
- * return true to the callback, it will cancel the installation as soon as possible.
+ * return false to the callback, it will cancel the installation as soon as possible.
  * \return [InstallResult] representing how the installation finished
  */
-inline InstallResult InstallNSP(Core::System& system, FileSys::VfsFilesystem& vfs,
-                                const std::string& filename,
-                                const std::function<bool(size_t, size_t)>& callback) {
+inline InstallResult InstallNSP(
+    Core::System* system, FileSys::VfsFilesystem* vfs, const std::string& filename,
+    const std::function<bool(size_t, size_t)>& callback = std::function<bool(size_t, size_t)>()) {
     const auto copy = [callback](const FileSys::VirtualFile& src, const FileSys::VirtualFile& dest,
                                  std::size_t block_size) {
         if (src == nullptr || dest == nullptr) {
@@ -159,7 +151,7 @@ inline InstallResult InstallNSP(Core::System& system, FileSys::VfsFilesystem& vf
     };
 
     std::shared_ptr<FileSys::NSP> nsp;
-    FileSys::VirtualFile file = vfs.OpenFile(filename, FileSys::Mode::Read);
+    FileSys::VirtualFile file = vfs->OpenFile(filename, FileSys::Mode::Read);
     if (boost::to_lower_copy(file->GetName()).ends_with(std::string("nsp"))) {
         nsp = std::make_shared<FileSys::NSP>(file);
         if (nsp->IsExtractedType()) {
@@ -173,7 +165,7 @@ inline InstallResult InstallNSP(Core::System& system, FileSys::VfsFilesystem& vf
         return InstallResult::Failure;
     }
     const auto res =
-        system.GetFileSystemController().GetUserNANDContents()->InstallEntry(*nsp, true, copy);
+        system->GetFileSystemController().GetUserNANDContents()->InstallEntry(*nsp, true, copy);
     switch (res) {
     case FileSys::InstallResult::Success:
         return InstallResult::Success;
@@ -188,19 +180,19 @@ inline InstallResult InstallNSP(Core::System& system, FileSys::VfsFilesystem& vf
 
 /**
  * \brief Installs an NCA
- * \param vfs Reference to the VfsFilesystem instance in Core::System
+ * \param vfs Raw pointer to the VfsFilesystem instance in Core::System
  * \param filename Path to the NCA file
- * \param registered_cache Reference to the registered cache that the NCA will be installed to
+ * \param registered_cache Raw pointer to the registered cache that the NCA will be installed to
  * \param title_type Type of NCA package to install
- * \param callback Callback to report the progress of the installation. The first size_t
+ * \param callback Optional callback to report the progress of the installation. The first size_t
  * parameter is the total size of the virtual file and the second is the current progress. If you
- * return true to the callback, it will cancel the installation as soon as possible.
+ * return false to the callback, it will cancel the installation as soon as possible.
  * \return [InstallResult] representing how the installation finished
  */
-inline InstallResult InstallNCA(FileSys::VfsFilesystem& vfs, const std::string& filename,
-                                FileSys::RegisteredCache& registered_cache,
-                                const FileSys::TitleType title_type,
-                                const std::function<bool(size_t, size_t)>& callback) {
+inline InstallResult InstallNCA(
+    FileSys::VfsFilesystem* vfs, const std::string& filename,
+    FileSys::RegisteredCache* registered_cache, const FileSys::TitleType title_type,
+    const std::function<bool(size_t, size_t)>& callback = std::function<bool(size_t, size_t)>()) {
     const auto copy = [callback](const FileSys::VirtualFile& src, const FileSys::VirtualFile& dest,
                                  std::size_t block_size) {
         if (src == nullptr || dest == nullptr) {
@@ -224,7 +216,7 @@ inline InstallResult InstallNCA(FileSys::VfsFilesystem& vfs, const std::string&
         return true;
     };
 
-    const auto nca = std::make_shared<FileSys::NCA>(vfs.OpenFile(filename, FileSys::Mode::Read));
+    const auto nca = std::make_shared<FileSys::NCA>(vfs->OpenFile(filename, FileSys::Mode::Read));
     const auto id = nca->GetStatus();
 
     // Game updates necessary are missing base RomFS
@@ -233,7 +225,7 @@ inline InstallResult InstallNCA(FileSys::VfsFilesystem& vfs, const std::string&
         return InstallResult::Failure;
     }
 
-    const auto res = registered_cache.InstallEntry(*nca, title_type, true, copy);
+    const auto res = registered_cache->InstallEntry(*nca, title_type, true, copy);
     if (res == FileSys::InstallResult::Success) {
         return InstallResult::Success;
     } else if (res == FileSys::InstallResult::OverwriteExisting) {
@@ -243,136 +235,4 @@ inline InstallResult InstallNCA(FileSys::VfsFilesystem& vfs, const std::string&
     }
 }
 
-/**
- * \brief Verifies the installed contents for a given ManualContentProvider
- * \param system Reference to the system instance
- * \param provider Reference to the content provider that's tracking indexed games
- * \param callback Callback to report the progress of the installation. The first size_t
- * parameter is the total size of the installed contents and the second is the current progress. If
- * you return true to the callback, it will cancel the installation as soon as possible.
- * \return A list of entries that failed to install. Returns an empty vector if successful.
- */
-inline std::vector<std::string> VerifyInstalledContents(
-    Core::System& system, FileSys::ManualContentProvider& provider,
-    const std::function<bool(size_t, size_t)>& callback) {
-    // Get content registries.
-    auto bis_contents = system.GetFileSystemController().GetSystemNANDContents();
-    auto user_contents = system.GetFileSystemController().GetUserNANDContents();
-
-    std::vector<FileSys::RegisteredCache*> content_providers;
-    if (bis_contents) {
-        content_providers.push_back(bis_contents);
-    }
-    if (user_contents) {
-        content_providers.push_back(user_contents);
-    }
-
-    // Get associated NCA files.
-    std::vector<FileSys::VirtualFile> nca_files;
-
-    // Get all installed IDs.
-    size_t total_size = 0;
-    for (auto nca_provider : content_providers) {
-        const auto entries = nca_provider->ListEntriesFilter();
-
-        for (const auto& entry : entries) {
-            auto nca_file = nca_provider->GetEntryRaw(entry.title_id, entry.type);
-            if (!nca_file) {
-                continue;
-            }
-
-            total_size += nca_file->GetSize();
-            nca_files.push_back(std::move(nca_file));
-        }
-    }
-
-    // Declare a list of file names which failed to verify.
-    std::vector<std::string> failed;
-
-    size_t processed_size = 0;
-    bool cancelled = false;
-    auto nca_callback = [&](size_t nca_processed, size_t nca_total) {
-        cancelled = callback(total_size, processed_size + nca_processed);
-        return !cancelled;
-    };
-
-    // Using the NCA loader, determine if all NCAs are valid.
-    for (auto& nca_file : nca_files) {
-        Loader::AppLoader_NCA nca_loader(nca_file);
-
-        auto status = nca_loader.VerifyIntegrity(nca_callback);
-        if (cancelled) {
-            break;
-        }
-        if (status != Loader::ResultStatus::Success) {
-            FileSys::NCA nca(nca_file);
-            const auto title_id = nca.GetTitleId();
-            std::string title_name = "unknown";
-
-            const auto control = provider.GetEntry(FileSys::GetBaseTitleID(title_id),
-                                                   FileSys::ContentRecordType::Control);
-            if (control && control->GetStatus() == Loader::ResultStatus::Success) {
-                const FileSys::PatchManager pm{title_id, system.GetFileSystemController(),
-                                               provider};
-                const auto [nacp, logo] = pm.ParseControlNCA(*control);
-                if (nacp) {
-                    title_name = nacp->GetApplicationName();
-                }
-            }
-
-            if (title_id > 0) {
-                failed.push_back(
-                    fmt::format("{} ({:016X}) ({})", nca_file->GetName(), title_id, title_name));
-            } else {
-                failed.push_back(fmt::format("{} (unknown)", nca_file->GetName()));
-            }
-        }
-
-        processed_size += nca_file->GetSize();
-    }
-    return failed;
-}
-
-/**
- * \brief Verifies the contents of a given game
- * \param system Reference to the system instance
- * \param game_path Patch to the game file
- * \param callback Callback to report the progress of the installation. The first size_t
- * parameter is the total size of the installed contents and the second is the current progress. If
- * you return true to the callback, it will cancel the installation as soon as possible.
- * \return GameVerificationResult representing how the verification process finished
- */
-inline GameVerificationResult VerifyGameContents(
-    Core::System& system, const std::string& game_path,
-    const std::function<bool(size_t, size_t)>& callback) {
-    const auto loader =
-        Loader::GetLoader(system, system.GetFilesystem()->OpenFile(game_path, FileSys::Mode::Read));
-    if (loader == nullptr) {
-        return GameVerificationResult::NotImplemented;
-    }
-
-    bool cancelled = false;
-    auto loader_callback = [&](size_t processed, size_t total) {
-        cancelled = callback(total, processed);
-        return !cancelled;
-    };
-
-    const auto status = loader->VerifyIntegrity(loader_callback);
-    if (cancelled || status == Loader::ResultStatus::ErrorIntegrityVerificationNotImplemented) {
-        return GameVerificationResult::NotImplemented;
-    }
-
-    if (status == Loader::ResultStatus::ErrorIntegrityVerificationFailed) {
-        return GameVerificationResult::Failed;
-    }
-    return GameVerificationResult::Success;
-}
-
-/**
- * Checks if the keys required for decrypting firmware and games are available
- */
-inline bool AreKeysPresent() {
-    return !Core::Crypto::KeyManager::Instance().BaseDeriveNecessary();
-}
-
 } // namespace ContentManager

src/hid_core/frontend/emulated_controller.cpp

@@ -110,11 +110,7 @@ void EmulatedController::ReloadFromSettings() {
         original_npad_type = npad_type;
     }
 
-    // Disable special features before disconnecting
-    if (controller.right_polling_mode != Common::Input::PollingMode::Active) {
-        SetPollingMode(EmulatedDeviceIndex::RightIndex, Common::Input::PollingMode::Active);
-    }
-
+    SetPollingMode(EmulatedDeviceIndex::RightIndex, Common::Input::PollingMode::Active);
     Disconnect();
     if (player.connected) {
         Connect();
@@ -1244,22 +1240,12 @@ bool EmulatedController::SetVibration(DeviceIndex device_index, const VibrationV
     if (!output_devices[index]) {
         return false;
     }
-
-    // Skip duplicated vibrations
-    if (last_vibration_value[index] == vibration) {
-        return Settings::values.vibration_enabled.GetValue();
-    }
-
-    last_vibration_value[index] = vibration;
-
-    if (!Settings::values.vibration_enabled) {
-        return false;
-    }
-
     const auto player_index = Service::HID::NpadIdTypeToIndex(npad_id_type);
     const auto& player = Settings::values.players.GetValue()[player_index];
     const f32 strength = static_cast<f32>(player.vibration_strength) / 100.0f;
 
+    last_vibration_value = vibration;
+
     if (!player.vibration_enabled) {
         return false;
     }
@@ -1281,10 +1267,7 @@ bool EmulatedController::SetVibration(DeviceIndex device_index, const VibrationV
 }
 
 VibrationValue EmulatedController::GetActualVibrationValue(DeviceIndex device_index) const {
-    if (device_index >= DeviceIndex::MaxDeviceIndex) {
-        return Core::HID::DEFAULT_VIBRATION_VALUE;
-    }
-    return last_vibration_value[static_cast<std::size_t>(device_index)];
+    return last_vibration_value;
 }
 
 bool EmulatedController::IsVibrationEnabled(std::size_t device_index) {

src/hid_core/frontend/emulated_controller.h

@@ -581,8 +581,7 @@ private:
     f32 motion_sensitivity{Core::HID::MotionInput::IsAtRestStandard};
     u32 turbo_button_state{0};
     std::size_t nfc_handles{0};
-    std::array<VibrationValue, 2> last_vibration_value{DEFAULT_VIBRATION_VALUE,
-                                                       DEFAULT_VIBRATION_VALUE};
+    VibrationValue last_vibration_value{DEFAULT_VIBRATION_VALUE};
 
     // Temporary values to avoid doing changes while the controller is in configuring mode
     NpadStyleIndex tmp_npad_type{NpadStyleIndex::None};

src/hid_core/hid_types.h

@@ -639,15 +639,6 @@ struct VibrationValue {
     f32 low_frequency{};
     f32 high_amplitude{};
     f32 high_frequency{};
-    bool operator==(const VibrationValue& b) {
-        if (low_amplitude != b.low_amplitude || high_amplitude != b.high_amplitude) {
-            return false;
-        }
-        if (low_frequency != b.low_amplitude || high_frequency != b.high_frequency) {
-            return false;
-        }
-        return true;
-    }
 };
 static_assert(sizeof(VibrationValue) == 0x10, "VibrationValue has incorrect size.");
 

src/hid_core/resources/npad/npad.cpp

@@ -480,10 +480,6 @@ void NPad::OnUpdate(const Core::Timing::CoreTiming& core_timing) {
                 continue;
             }
 
-            if (!data->flag.enable_pad_input) {
-                continue;
-            }
-
             RequestPadStateUpdate(aruid, controller.device->GetNpadIdType());
             auto& pad_state = controller.npad_pad_state;
             auto& libnx_state = controller.npad_libnx_state;
@@ -1320,13 +1316,4 @@ void NPad::UpdateHandheldAbstractState() {
     abstracted_pads[NpadIdTypeToIndex(Core::HID::NpadIdType::Handheld)].Update();
 }
 
-void NPad::EnableAppletToGetInput(u64 aruid) {
-    std::scoped_lock lock{mutex};
-    std::scoped_lock shared_lock{*applet_resource_holder.shared_mutex};
-
-    for (auto& abstract_pad : abstracted_pads) {
-        abstract_pad.EnableAppletToGetInput(aruid);
-    }
-}
-
 } // namespace Service::HID

src/hid_core/resources/npad/npad.h

@@ -153,8 +153,6 @@ public:
 
     void UpdateHandheldAbstractState();
 
-    void EnableAppletToGetInput(u64 aruid);
-
 private:
     struct NpadControllerData {
         NpadInternalState* shared_memory = nullptr;

src/video_core/buffer_cache/buffer_cache.h

@@ -1546,10 +1546,7 @@ void BufferCache<P>::ImmediateUploadMemory([[maybe_unused]] Buffer& buffer,
             std::span<const u8> upload_span;
             const DAddr device_addr = buffer.CpuAddr() + copy.dst_offset;
             if (IsRangeGranular(device_addr, copy.size)) {
-                auto* const ptr = device_memory.GetPointer<u8>(device_addr);
-                if (ptr != nullptr) {
-                    upload_span = std::span(ptr, copy.size);
-                }
+                upload_span = std::span(device_memory.GetPointer<u8>(device_addr), copy.size);
             } else {
                 if (immediate_buffer.empty()) {
                     immediate_buffer = ImmediateBuffer(largest_copy);

src/video_core/renderer_opengl/renderer_opengl.cpp

@@ -243,12 +243,10 @@ void RendererOpenGL::LoadFBToScreenInfo(const Tegra::FramebufferConfig& framebuf
     const u64 size_in_bytes{Tegra::Texture::CalculateSize(
         true, bytes_per_pixel, framebuffer.stride, framebuffer.height, 1, block_height_log2, 0)};
     const u8* const host_ptr{device_memory.GetPointer<u8>(framebuffer_addr)};
-    if (host_ptr != nullptr) {
-        const std::span<const u8> input_data(host_ptr, size_in_bytes);
-        Tegra::Texture::UnswizzleTexture(gl_framebuffer_data, input_data, bytes_per_pixel,
-                                         framebuffer.width, framebuffer.height, 1,
-                                         block_height_log2, 0);
-    }
+    const std::span<const u8> input_data(host_ptr, size_in_bytes);
+    Tegra::Texture::UnswizzleTexture(gl_framebuffer_data, input_data, bytes_per_pixel,
+                                     framebuffer.width, framebuffer.height, 1, block_height_log2,
+                                     0);
 
     glBindBuffer(GL_PIXEL_UNPACK_BUFFER, 0);
     glPixelStorei(GL_UNPACK_ROW_LENGTH, static_cast<GLint>(framebuffer.stride));

src/video_core/renderer_vulkan/vk_blit_screen.cpp

@@ -230,11 +230,9 @@ void BlitScreen::Draw(const Tegra::FramebufferConfig& framebuffer,
         const u64 tiled_size{Tegra::Texture::CalculateSize(true, bytes_per_pixel,
                                                            framebuffer.stride, framebuffer.height,
                                                            1, block_height_log2, 0)};
-        if (host_ptr != nullptr) {
-            Tegra::Texture::UnswizzleTexture(
-                mapped_span.subspan(image_offset, linear_size), std::span(host_ptr, tiled_size),
-                bytes_per_pixel, framebuffer.width, framebuffer.height, 1, block_height_log2, 0);
-        }
+        Tegra::Texture::UnswizzleTexture(
+            mapped_span.subspan(image_offset, linear_size), std::span(host_ptr, tiled_size),
+            bytes_per_pixel, framebuffer.width, framebuffer.height, 1, block_height_log2, 0);
 
         const VkBufferImageCopy copy{
             .bufferOffset = image_offset,

src/video_core/renderer_vulkan/vk_query_cache.cpp

@@ -1064,6 +1064,8 @@ public:
                 }
             });
         }
+        auto* ptr = device_memory.GetPointer<u8>(new_query->dependant_address);
+        ASSERT(ptr != nullptr);
 
         new_query->dependant_manage = must_manage_dependance;
         pending_flush_queries.push_back(index);
@@ -1102,11 +1104,9 @@ public:
                 tfb_streamer.Free(query->dependant_index);
             } else {
                 u8* pointer = device_memory.GetPointer<u8>(query->dependant_address);
-                if (pointer != nullptr) {
-                    u32 result;
-                    std::memcpy(&result, pointer, sizeof(u32));
-                    num_vertices = static_cast<u64>(result) / query->stride;
-                }
+                u32 result;
+                std::memcpy(&result, pointer, sizeof(u32));
+                num_vertices = static_cast<u64>(result) / query->stride;
             }
             query->value = [&]() -> u64 {
                 switch (query->topology) {
@@ -1360,9 +1360,7 @@ bool QueryCacheRuntime::HostConditionalRenderingCompareValues(VideoCommon::Looku
     const auto check_value = [&](DAddr address) {
         u8* ptr = impl->device_memory.GetPointer<u8>(address);
         u64 value{};
-        if (ptr != nullptr) {
-            std::memcpy(&value, ptr, sizeof(value));
-        }
+        std::memcpy(&value, ptr, sizeof(value));
         return value == 0;
     };
     std::array<VideoCommon::LookupData*, 2> objects{&object_1, &object_2};

src/video_core/vulkan_common/vulkan_wrapper.cpp

@@ -39,10 +39,6 @@ void SortPhysicalDevicesPerVendor(std::vector<VkPhysicalDevice>& devices,
     }
 }
 
-bool IsMicrosoftDozen(const char* device_name) {
-    return std::strstr(device_name, "Microsoft") != nullptr;
-}
-
 void SortPhysicalDevices(std::vector<VkPhysicalDevice>& devices, const InstanceDispatch& dld) {
     // Sort by name, this will set a base and make GPUs with higher numbers appear first
     // (e.g. GTX 1650 will intentionally be listed before a GTX 1080).
@@ -56,12 +52,6 @@ void SortPhysicalDevices(std::vector<VkPhysicalDevice>& devices, const InstanceD
     });
     // Prefer Nvidia over AMD, AMD over Intel, Intel over the rest.
     SortPhysicalDevicesPerVendor(devices, dld, {0x10DE, 0x1002, 0x8086});
-    // Demote Microsoft's Dozen devices to the bottom.
-    SortPhysicalDevices(
-        devices, dld,
-        [](const VkPhysicalDeviceProperties& lhs, const VkPhysicalDeviceProperties& rhs) {
-            return IsMicrosoftDozen(rhs.deviceName) && !IsMicrosoftDozen(lhs.deviceName);
-        });
 }
 
 template <typename T>

src/yuzu/main.cpp

@@ -423,7 +423,7 @@ GMainWindow::GMainWindow(std::unique_ptr<QtConfig> config_, bool has_broken_vulk
     RemoveCachedContents();
 
     // Gen keys if necessary
-    OnCheckFirmwareDecryption();
+    OnReinitializeKeys(ReinitializeKeyBehavior::NoWarning);
 
     game_list->LoadCompatibilityList();
     game_list->PopulateAsync(UISettings::values.game_dirs);
@@ -1574,6 +1574,8 @@ void GMainWindow::ConnectMenuEvents() {
     connect(multiplayer_state, &MultiplayerState::SaveConfig, this, &GMainWindow::OnSaveConfig);
 
     // Tools
+    connect_menu(ui->action_Rederive, std::bind(&GMainWindow::OnReinitializeKeys, this,
+                                                ReinitializeKeyBehavior::Warning));
     connect_menu(ui->action_Load_Album, &GMainWindow::OnAlbum);
     connect_menu(ui->action_Load_Cabinet_Nickname_Owner,
                  [this]() { OnCabinet(Service::NFP::CabinetMode::StartNicknameAndOwnerSettings); });
@@ -2499,7 +2501,7 @@ void GMainWindow::RemoveUpdateContent(u64 program_id, InstalledEntryType type) {
 }
 
 void GMainWindow::RemoveAddOnContent(u64 program_id, InstalledEntryType type) {
-    const size_t count = ContentManager::RemoveAllDLC(*system, program_id);
+    const size_t count = ContentManager::RemoveAllDLC(system.get(), program_id);
     if (count == 0) {
         QMessageBox::warning(this, GetGameListErrorRemoving(type),
                              tr("There are no DLC installed for this title."));
@@ -2784,6 +2786,16 @@ void GMainWindow::OnGameListVerifyIntegrity(const std::string& game_path) {
         QMessageBox::warning(this, tr("Integrity verification couldn't be performed!"),
                              tr("File contents were not checked for validity."));
     };
+    const auto Failed = [this] {
+        QMessageBox::critical(this, tr("Integrity verification failed!"),
+                              tr("File contents may be corrupt."));
+    };
+
+    const auto loader = Loader::GetLoader(*system, vfs->OpenFile(game_path, FileSys::Mode::Read));
+    if (loader == nullptr) {
+        NotImplemented();
+        return;
+    }
 
     QProgressDialog progress(tr("Verifying integrity..."), tr("Cancel"), 0, 100, this);
     progress.setWindowModality(Qt::WindowModal);
@@ -2791,25 +2803,30 @@ void GMainWindow::OnGameListVerifyIntegrity(const std::string& game_path) {
     progress.setAutoClose(false);
     progress.setAutoReset(false);
 
-    const auto QtProgressCallback = [&](size_t total_size, size_t processed_size) {
+    const auto QtProgressCallback = [&](size_t processed_size, size_t total_size) {
+        if (progress.wasCanceled()) {
+            return false;
+        }
+
         progress.setValue(static_cast<int>((processed_size * 100) / total_size));
-        return progress.wasCanceled();
+        return true;
     };
 
-    const auto result = ContentManager::VerifyGameContents(*system, game_path, QtProgressCallback);
-    progress.close();
-    switch (result) {
-    case ContentManager::GameVerificationResult::Success:
-        QMessageBox::information(this, tr("Integrity verification succeeded!"),
-                                 tr("The operation completed successfully."));
-        break;
-    case ContentManager::GameVerificationResult::Failed:
-        QMessageBox::critical(this, tr("Integrity verification failed!"),
-                              tr("File contents may be corrupt."));
-        break;
-    case ContentManager::GameVerificationResult::NotImplemented:
+    const auto status = loader->VerifyIntegrity(QtProgressCallback);
+    if (progress.wasCanceled() ||
+        status == Loader::ResultStatus::ErrorIntegrityVerificationNotImplemented) {
         NotImplemented();
+        return;
     }
+
+    if (status == Loader::ResultStatus::ErrorIntegrityVerificationFailed) {
+        Failed();
+        return;
+    }
+
+    progress.close();
+    QMessageBox::information(this, tr("Integrity verification succeeded!"),
+                             tr("The operation completed successfully."));
 }
 
 void GMainWindow::OnGameListCopyTID(u64 program_id) {
@@ -3265,7 +3282,7 @@ void GMainWindow::OnMenuInstallToNAND() {
                 return false;
             };
             future = QtConcurrent::run([this, &file, progress_callback] {
-                return ContentManager::InstallNSP(*system, *vfs, file.toStdString(),
+                return ContentManager::InstallNSP(system.get(), vfs.get(), file.toStdString(),
                                                   progress_callback);
             });
 
@@ -3368,7 +3385,7 @@ ContentManager::InstallResult GMainWindow::InstallNCA(const QString& filename) {
         }
         return false;
     };
-    return ContentManager::InstallNCA(*vfs, filename.toStdString(), *registered_cache,
+    return ContentManager::InstallNCA(vfs.get(), filename.toStdString(), registered_cache,
                                       static_cast<FileSys::TitleType>(index), progress_callback);
 }
 
@@ -4104,6 +4121,10 @@ void GMainWindow::OnOpenYuzuFolder() {
 }
 
 void GMainWindow::OnVerifyInstalledContents() {
+    // Declare sizes.
+    size_t total_size = 0;
+    size_t processed_size = 0;
+
     // Initialize a progress dialog.
     QProgressDialog progress(tr("Verifying integrity..."), tr("Cancel"), 0, 100, this);
     progress.setWindowModality(Qt::WindowModal);
@@ -4111,25 +4132,93 @@ void GMainWindow::OnVerifyInstalledContents() {
     progress.setAutoClose(false);
     progress.setAutoReset(false);
 
+    // Declare a list of file names which failed to verify.
+    std::vector<std::string> failed;
+
     // Declare progress callback.
-    auto QtProgressCallback = [&](size_t total_size, size_t processed_size) {
-        progress.setValue(static_cast<int>((processed_size * 100) / total_size));
-        return progress.wasCanceled();
+    auto QtProgressCallback = [&](size_t nca_processed, size_t nca_total) {
+        if (progress.wasCanceled()) {
+            return false;
+        }
+        progress.setValue(static_cast<int>(((processed_size + nca_processed) * 100) / total_size));
+        return true;
     };
 
-    const std::vector<std::string> result =
-        ContentManager::VerifyInstalledContents(*system, *provider, QtProgressCallback);
+    // Get content registries.
+    auto bis_contents = system->GetFileSystemController().GetSystemNANDContents();
+    auto user_contents = system->GetFileSystemController().GetUserNANDContents();
+
+    std::vector<FileSys::RegisteredCache*> content_providers;
+    if (bis_contents) {
+        content_providers.push_back(bis_contents);
+    }
+    if (user_contents) {
+        content_providers.push_back(user_contents);
+    }
+
+    // Get associated NCA files.
+    std::vector<FileSys::VirtualFile> nca_files;
+
+    // Get all installed IDs.
+    for (auto nca_provider : content_providers) {
+        const auto entries = nca_provider->ListEntriesFilter();
+
+        for (const auto& entry : entries) {
+            auto nca_file = nca_provider->GetEntryRaw(entry.title_id, entry.type);
+            if (!nca_file) {
+                continue;
+            }
+
+            total_size += nca_file->GetSize();
+            nca_files.push_back(std::move(nca_file));
+        }
+    }
+
+    // Using the NCA loader, determine if all NCAs are valid.
+    for (auto& nca_file : nca_files) {
+        Loader::AppLoader_NCA nca_loader(nca_file);
+
+        auto status = nca_loader.VerifyIntegrity(QtProgressCallback);
+        if (progress.wasCanceled()) {
+            break;
+        }
+        if (status != Loader::ResultStatus::Success) {
+            FileSys::NCA nca(nca_file);
+            const auto title_id = nca.GetTitleId();
+            std::string title_name = "unknown";
+
+            const auto control = provider->GetEntry(FileSys::GetBaseTitleID(title_id),
+                                                    FileSys::ContentRecordType::Control);
+            if (control && control->GetStatus() == Loader::ResultStatus::Success) {
+                const FileSys::PatchManager pm{title_id, system->GetFileSystemController(),
+                                               *provider};
+                const auto [nacp, logo] = pm.ParseControlNCA(*control);
+                if (nacp) {
+                    title_name = nacp->GetApplicationName();
+                }
+            }
+
+            if (title_id > 0) {
+                failed.push_back(
+                    fmt::format("{} ({:016X}) ({})", nca_file->GetName(), title_id, title_name));
+            } else {
+                failed.push_back(fmt::format("{} (unknown)", nca_file->GetName()));
+            }
+        }
+
+        processed_size += nca_file->GetSize();
+    }
+
     progress.close();
 
-    if (result.empty()) {
-        QMessageBox::information(this, tr("Integrity verification succeeded!"),
-                                 tr("The operation completed successfully."));
-    } else {
-        const auto failed_names =
-            QString::fromStdString(fmt::format("{}", fmt::join(result, "\n")));
+    if (failed.size() > 0) {
+        auto failed_names = QString::fromStdString(fmt::format("{}", fmt::join(failed, "\n")));
         QMessageBox::critical(
             this, tr("Integrity verification failed!"),
             tr("Verification failed for the following files:\n\n%1").arg(failed_names));
+    } else {
+        QMessageBox::information(this, tr("Integrity verification succeeded!"),
+                                 tr("The operation completed successfully."));
     }
 }
 
@@ -4548,20 +4637,122 @@ void GMainWindow::OnMouseActivity() {
     }
 }
 
-void GMainWindow::OnCheckFirmwareDecryption() {
+void GMainWindow::OnReinitializeKeys(ReinitializeKeyBehavior behavior) {
+    if (behavior == ReinitializeKeyBehavior::Warning) {
+        const auto res = QMessageBox::information(
+            this, tr("Confirm Key Rederivation"),
+            tr("You are about to force rederive all of your keys. \nIf you do not know what "
+               "this "
+               "means or what you are doing, \nthis is a potentially destructive action. "
+               "\nPlease "
+               "make sure this is what you want \nand optionally make backups.\n\nThis will "
+               "delete "
+               "your autogenerated key files and re-run the key derivation module."),
+            QMessageBox::StandardButtons{QMessageBox::Ok, QMessageBox::Cancel});
+
+        if (res == QMessageBox::Cancel)
+            return;
+
+        const auto keys_dir = Common::FS::GetYuzuPath(Common::FS::YuzuPath::KeysDir);
+
+        Common::FS::RemoveFile(keys_dir / "prod.keys_autogenerated");
+        Common::FS::RemoveFile(keys_dir / "console.keys_autogenerated");
+        Common::FS::RemoveFile(keys_dir / "title.keys_autogenerated");
+    }
+
+    Core::Crypto::KeyManager& keys = Core::Crypto::KeyManager::Instance();
+    bool all_keys_present{true};
+
+    if (keys.BaseDeriveNecessary()) {
+        Core::Crypto::PartitionDataManager pdm{vfs->OpenDirectory("", FileSys::Mode::Read)};
+
+        const auto function = [this, &keys, &pdm] {
+            keys.PopulateFromPartitionData(pdm);
+
+            system->GetFileSystemController().CreateFactories(*vfs);
+            keys.DeriveETicket(pdm, system->GetContentProvider());
+        };
+
+        QString errors;
+        if (!pdm.HasFuses()) {
+            errors += tr("Missing fuses");
+        }
+        if (!pdm.HasBoot0()) {
+            errors += tr(" - Missing BOOT0");
+        }
+        if (!pdm.HasPackage2()) {
+            errors += tr(" - Missing BCPKG2-1-Normal-Main");
+        }
+        if (!pdm.HasProdInfo()) {
+            errors += tr(" - Missing PRODINFO");
+        }
+        if (!errors.isEmpty()) {
+            all_keys_present = false;
+            QMessageBox::warning(
+                this, tr("Derivation Components Missing"),
+                tr("Encryption keys are missing. "
+                   "<br>Please follow <a href='https://yuzu-emu.org/help/quickstart/'>the yuzu "
+                   "quickstart guide</a> to get all your keys, firmware and "
+                   "games.<br><br><small>(%1)</small>")
+                    .arg(errors));
+        }
+
+        QProgressDialog prog(this);
+        prog.setRange(0, 0);
+        prog.setLabelText(tr("Deriving keys...\nThis may take up to a minute depending \non your "
+                             "system's performance."));
+        prog.setWindowTitle(tr("Deriving Keys"));
+
+        prog.show();
+
+        auto future = QtConcurrent::run(function);
+        while (!future.isFinished()) {
+            QCoreApplication::processEvents();
+        }
+
+        prog.close();
+    }
+
     system->GetFileSystemController().CreateFactories(*vfs);
-    if (!ContentManager::AreKeysPresent()) {
+
+    if (all_keys_present && !this->CheckSystemArchiveDecryption()) {
+        LOG_WARNING(Frontend, "Mii model decryption failed");
         QMessageBox::warning(
-            this, tr("Derivation Components Missing"),
-            tr("Encryption keys are missing. "
+            this, tr("System Archive Decryption Failed"),
+            tr("Encryption keys failed to decrypt firmware. "
                "<br>Please follow <a href='https://yuzu-emu.org/help/quickstart/'>the yuzu "
                "quickstart guide</a> to get all your keys, firmware and "
                "games."));
     }
+
     SetFirmwareVersion();
+
+    if (behavior == ReinitializeKeyBehavior::Warning) {
+        game_list->PopulateAsync(UISettings::values.game_dirs);
+    }
+
     UpdateMenuState();
 }
 
+bool GMainWindow::CheckSystemArchiveDecryption() {
+    constexpr u64 MiiModelId = 0x0100000000000802;
+
+    auto bis_system = system->GetFileSystemController().GetSystemNANDContents();
+    if (!bis_system) {
+        // Not having system BIS files is not an error.
+        return true;
+    }
+
+    auto mii_nca = bis_system->GetEntry(MiiModelId, FileSys::ContentRecordType::Data);
+    if (!mii_nca) {
+        // Not having the Mii model is not an error.
+        return true;
+    }
+
+    // Return whether we are able to decrypt the RomFS of the Mii model.
+    return mii_nca->GetRomFS().get() != nullptr;
+}
+
 bool GMainWindow::CheckFirmwarePresence() {
     constexpr u64 MiiEditId = static_cast<u64>(Service::AM::Applets::AppletProgramId::MiiEdit);
 

src/yuzu/main.h

@@ -125,6 +125,11 @@ enum class EmulatedDirectoryTarget {
     SDMC,
 };
 
+enum class ReinitializeKeyBehavior {
+    NoWarning,
+    Warning,
+};
+
 namespace VkDeviceInfo {
 class Record;
 }
@@ -395,7 +400,7 @@ private slots:
     void OnMiiEdit();
     void OnOpenControllerMenu();
     void OnCaptureScreenshot();
-    void OnCheckFirmwareDecryption();
+    void OnReinitializeKeys(ReinitializeKeyBehavior behavior);
     void OnLanguageChanged(const QString& locale);
     void OnMouseActivity();
     bool OnShutdownBegin();
@@ -436,6 +441,7 @@ private:
     void LoadTranslation();
     void OpenPerGameConfiguration(u64 title_id, const std::string& file_name);
     bool CheckDarkMode();
+    bool CheckSystemArchiveDecryption();
     bool CheckFirmwarePresence();
     void SetFirmwareVersion();
     void ConfigureFilesystemProvider(const std::string& filepath);

src/yuzu/main.ui

@@ -224,6 +224,11 @@
     <string>&amp;Stop</string>
    </property>
   </action>
+  <action name="action_Rederive">
+   <property name="text">
+    <string>&amp;Reinitialize keys...</string>
+   </property>
+  </action>
   <action name="action_Verify_installed_contents">
    <property name="text">
     <string>&amp;Verify Installed Contents</string>