Android 235

.ci/scripts/android/eabuild.sh

@@ -1,21 +0,0 @@
-#!/bin/bash -ex
-
-# SPDX-FileCopyrightText: 2024 yuzu Emulator Project
-# SPDX-License-Identifier: GPL-3.0-or-later
-
-export NDK_CCACHE="$(which ccache)"
-ccache -s
-
-export ANDROID_KEYSTORE_FILE="${GITHUB_WORKSPACE}/ks.jks"
-base64 --decode <<< "${EA_PLAY_ANDROID_KEYSTORE_B64}" > "${ANDROID_KEYSTORE_FILE}"
-export ANDROID_KEY_ALIAS="${PLAY_ANDROID_KEY_ALIAS}"
-export ANDROID_KEYSTORE_PASS="${PLAY_ANDROID_KEYSTORE_PASS}"
-export SERVICE_ACCOUNT_KEY_PATH="${GITHUB_WORKSPACE}/sa.json"
-base64 --decode <<< "${EA_SERVICE_ACCOUNT_KEY_B64}" > "${SERVICE_ACCOUNT_KEY_PATH}"
-./gradlew "publishEaReleaseBundle"
-
-ccache -s
-
-if [ ! -z "${ANDROID_KEYSTORE_B64}" ]; then
-    rm "${ANDROID_KEYSTORE_FILE}"
-fi

.ci/scripts/android/mainlinebuild.sh

@@ -1,21 +0,0 @@
-#!/bin/bash -ex
-
-# SPDX-FileCopyrightText: 2024 yuzu Emulator Project
-# SPDX-License-Identifier: GPL-3.0-or-later
-
-export NDK_CCACHE="$(which ccache)"
-ccache -s
-
-export ANDROID_KEYSTORE_FILE="${GITHUB_WORKSPACE}/ks.jks"
-base64 --decode <<< "${MAINLINE_PLAY_ANDROID_KEYSTORE_B64}" > "${ANDROID_KEYSTORE_FILE}"
-export ANDROID_KEY_ALIAS="${PLAY_ANDROID_KEY_ALIAS}"
-export ANDROID_KEYSTORE_PASS="${PLAY_ANDROID_KEYSTORE_PASS}"
-export SERVICE_ACCOUNT_KEY_PATH="${GITHUB_WORKSPACE}/sa.json"
-base64 --decode <<< "${MAINLINE_SERVICE_ACCOUNT_KEY_B64}" > "${SERVICE_ACCOUNT_KEY_PATH}"
-./gradlew "publishMainlineReleaseBundle"
-
-ccache -s
-
-if [ ! -z "${ANDROID_KEYSTORE_B64}" ]; then
-    rm "${ANDROID_KEYSTORE_FILE}"
-fi

.github/workflows/android-ea-play-release.yml

@@ -1,66 +0,0 @@
-# SPDX-FileCopyrightText: 2024 yuzu Emulator Project
-# SPDX-License-Identifier: GPL-2.0-or-later
-
-name: yuzu-android-ea-play-release
-
-on:
-  workflow_dispatch:
-    inputs:
-      release-track:
-        description: 'Play store release track (internal/alpha/beta/production)'
-        required: true
-        default: 'alpha'
-
-jobs:
-  android:
-    runs-on: ubuntu-latest
-    if: ${{ github.repository == 'yuzu-emu/yuzu' }}
-    steps:
-      - uses: actions/checkout@v3
-        name: Checkout
-        with:
-          fetch-depth: 0
-          submodules: true
-          token: ${{ secrets.ALT_GITHUB_TOKEN }}
-      - run: npm install execa@5
-      - uses: actions/github-script@v5
-        name: 'Merge and publish Android EA changes'
-        env:
-          ALT_GITHUB_TOKEN: ${{ secrets.ALT_GITHUB_TOKEN }}
-          BUILD_EA: true
-        with:
-          script: |
-            const execa = require("execa");
-            const mergebot = require('./.github/workflows/android-merge.js').mergebot;
-            process.chdir('${{ github.workspace }}');
-            mergebot(github, context, execa);
-      - name: Get tag name
-        run: echo "GIT_TAG_NAME=$(cat tag-name.txt)" >> $GITHUB_ENV
-      - name: Set up JDK 17
-        uses: actions/setup-java@v3
-        with:
-          java-version: '17'
-          distribution: 'temurin'
-      - name: Install dependencies
-        run: |
-          sudo apt-get update
-          sudo apt-get install -y ccache apksigner glslang-dev glslang-tools
-      - name: Build
-        run: ./.ci/scripts/android/eabuild.sh
-        env:
-          EA_PLAY_ANDROID_KEYSTORE_B64: ${{ secrets.PLAY_ANDROID_KEYSTORE_B64 }}
-          PLAY_ANDROID_KEY_ALIAS: ${{ secrets.PLAY_ANDROID_KEY_ALIAS }}
-          PLAY_ANDROID_KEYSTORE_PASS: ${{ secrets.PLAY_ANDROID_KEYSTORE_PASS }}
-          EA_SERVICE_ACCOUNT_KEY_B64: ${{ secrets.EA_SERVICE_ACCOUNT_KEY_B64 }}
-          STORE_TRACK: ${{ github.event.inputs.release-track }}
-          AUTO_VERSIONED: true
-          BUILD_EA: true
-      - name: Create release
-        uses: softprops/action-gh-release@v1
-        with:
-          tag_name: ${{ env.EA_TAG_NAME }}
-          name: ${{ env.EA_TAG_NAME }}
-          draft: false
-          prerelease: false
-          repository: yuzu/yuzu-android
-          token: ${{ secrets.ALT_GITHUB_TOKEN }}

.github/workflows/android-mainline-play-release.yml

@@ -1,59 +0,0 @@
-# SPDX-FileCopyrightText: 2024 yuzu Emulator Project
-# SPDX-License-Identifier: GPL-2.0-or-later
-
-name: yuzu-android-mainline-play-release
-
-on:
-  workflow_dispatch:
-    inputs:
-      release-tag:
-        description: 'Tag # from yuzu-android that you want to build and publish'
-        required: true
-        default: '200'
-      release-track:
-        description: 'Play store release track (internal/alpha/beta/production)'
-        required: true
-        default: 'alpha'
-
-jobs:
-  android:
-    runs-on: ubuntu-latest
-    if: ${{ github.repository == 'yuzu-emu/yuzu' }}
-    steps:
-      - uses: actions/checkout@v3
-        name: Checkout
-        with:
-          fetch-depth: 0
-          submodules: true
-          token: ${{ secrets.ALT_GITHUB_TOKEN }}
-      - run: npm install execa@5
-      - uses: actions/github-script@v5
-        name: 'Pull mainline tag'
-        env:
-          MAINLINE_TAG: ${{ github.event.inputs.release-tag }}
-        with:
-          script: |
-            const execa = require("execa");
-            const mergebot = require('./.github/workflows/android-merge.js').getMainlineTag;
-            process.chdir('${{ github.workspace }}');
-            mergebot(execa);
-      - name: Set up JDK 17
-        uses: actions/setup-java@v3
-        with:
-          java-version: '17'
-          distribution: 'temurin'
-      - name: Install dependencies
-        run: |
-          sudo apt-get update
-          sudo apt-get install -y ccache apksigner glslang-dev glslang-tools
-      - name: Build
-        run: |
-          echo "GIT_TAG_NAME=android-${{ github.event.inputs.releast-tag }}" >> $GITHUB_ENV
-          ./.ci/scripts/android/mainlinebuild.sh
-        env:
-          MAINLINE_PLAY_ANDROID_KEYSTORE_B64: ${{ secrets.PLAY_ANDROID_KEYSTORE_B64 }}
-          PLAY_ANDROID_KEY_ALIAS: ${{ secrets.PLAY_ANDROID_KEY_ALIAS }}
-          PLAY_ANDROID_KEYSTORE_PASS: ${{ secrets.PLAY_ANDROID_KEYSTORE_PASS }}
-          SERVICE_ACCOUNT_KEY_B64: ${{ secrets.MAINLINE_SERVICE_ACCOUNT_KEY_B64 }}
-          STORE_TRACK: ${{ github.event.inputs.release-track }}
-          AUTO_VERSIONED: true

.github/workflows/android-merge.js

@@ -6,12 +6,9 @@
 
 const fs = require("fs");
 // which label to check for changes
-const CHANGE_LABEL_MAINLINE = 'android-merge';
-const CHANGE_LABEL_EA = 'android-ea-merge';
+const CHANGE_LABEL = 'android-merge';
 // how far back in time should we consider the changes are "recent"? (default: 24 hours)
 const DETECTION_TIME_FRAME = (parseInt(process.env.DETECTION_TIME_FRAME)) || (24 * 3600 * 1000);
-const BUILD_EA = process.env.BUILD_EA == 'true';
-const MAINLINE_TAG = process.env.MAINLINE_TAG;
 
 async function checkBaseChanges(github) {
     // query the commit date of the latest commit on this branch
@@ -43,7 +40,20 @@ async function checkBaseChanges(github) {
 
 async function checkAndroidChanges(github) {
     if (checkBaseChanges(github)) return true;
-    const pulls = getPulls(github, false);
+    const query = `query($owner:String!, $name:String!, $label:String!) {
+        repository(name:$name, owner:$owner) {
+            pullRequests(labels: [$label], states: OPEN, first: 100) {
+                nodes { number headRepository { pushedAt } }
+            }
+        }
+    }`;
+    const variables = {
+        owner: 'yuzu-emu',
+        name: 'yuzu',
+        label: CHANGE_LABEL,
+    };
+    const result = await github.graphql(query, variables);
+    const pulls = result.repository.pullRequests.nodes;
     for (let i = 0; i < pulls.length; i++) {
         let pull = pulls[i];
         if (new Date() - new Date(pull.headRepository.pushedAt) <= DETECTION_TIME_FRAME) {
@@ -73,13 +83,7 @@ async function tagAndPush(github, owner, repo, execa, commit=false) {
     };
     const tags = await github.graphql(query, variables);
     const tagList = tags.repository.refs.nodes;
-    let lastTag = 'android-1';
-    for (let i = 0; i < tagList.length; ++i) {
-        if (tagList[i].name.includes('android-')) {
-            lastTag = tagList[i].name;
-            break;
-        }
-    }
+    const lastTag = tagList[0] ? tagList[0].name : 'dummy-0';
     const tagNumber = /\w+-(\d+)/.exec(lastTag)[1] | 0;
     const channel = repo.split('-')[1];
     const newTag = `${channel}-${tagNumber + 1}`;
@@ -97,48 +101,6 @@ async function tagAndPush(github, owner, repo, execa, commit=false) {
     console.info('Successfully pushed new changes.');
 }
 
-async function tagAndPushEA(github, owner, repo, execa) {
-    let altToken = process.env.ALT_GITHUB_TOKEN;
-    if (!altToken) {
-        throw `Please set ALT_GITHUB_TOKEN environment variable. This token should have write access to ${owner}/${repo}.`;
-    }
-    const query = `query ($owner:String!, $name:String!) {
-        repository(name:$name, owner:$owner) {
-            refs(refPrefix: "refs/tags/", orderBy: {field: TAG_COMMIT_DATE, direction: DESC}, first: 10) {
-                nodes { name }
-            }
-        }
-    }`;
-    const variables = {
-        owner: owner,
-        name: repo,
-    };
-    const tags = await github.graphql(query, variables);
-    const tagList = tags.repository.refs.nodes;
-    let lastTag = 'ea-1';
-    for (let i = 0; i < tagList.length; ++i) {
-        if (tagList[i].name.includes('ea-')) {
-            lastTag = tagList[i].name;
-            break;
-        }
-    }
-    const tagNumber = /\w+-(\d+)/.exec(lastTag)[1] | 0;
-    const newTag = `ea-${tagNumber + 1}`;
-    console.log(`New tag: ${newTag}`);
-    console.info('Pushing tags to GitHub ...');
-    await execa("git", ["remote", "add", "android", "https://github.com/yuzu-emu/yuzu-android.git"]);
-    await execa("git", ["fetch", "android"]);
-
-    await execa("git", ['tag', newTag]);
-    await execa("git", ['push', 'android', `${newTag}`]);
-
-    fs.writeFile('tag-name.txt', newTag, (err) => {
-        if (err) throw 'Could not write tag name to file!'
-    })
-
-    console.info('Successfully pushed new changes.');
-}
-
 async function generateReadme(pulls, context, mergeResults, execa) {
     let baseUrl = `https://github.com/${context.repo.owner}/${context.repo.repo}/`;
     let output =
@@ -240,7 +202,10 @@ async function resetBranch(execa) {
     }
 }
 
-async function getPulls(github) {
+async function mergebot(github, context, execa) {
+    // Reset our local copy of master to what appears on yuzu-emu/yuzu - master
+    await resetBranch(execa);
+
     const query = `query ($owner:String!, $name:String!, $label:String!) {
         repository(name:$name, owner:$owner) {
             pullRequests(labels: [$label], states: OPEN, first: 100) {
@@ -250,49 +215,13 @@ async function getPulls(github) {
             }
         }
     }`;
-    const mainlineVariables = {
+    const variables = {
         owner: 'yuzu-emu',
         name: 'yuzu',
-        label: CHANGE_LABEL_MAINLINE,
+        label: CHANGE_LABEL,
     };
-    const mainlineResult = await github.graphql(query, mainlineVariables);
-    const pulls = mainlineResult.repository.pullRequests.nodes;
-    if (BUILD_EA) {
-        const eaVariables = {
-            owner: 'yuzu-emu',
-            name: 'yuzu',
-            label: CHANGE_LABEL_EA,
-        };
-        const eaResult = await github.graphql(query, eaVariables);
-        const eaPulls = eaResult.repository.pullRequests.nodes;
-        return pulls.concat(eaPulls);
-    }
-    return pulls;
-}
-
-async function getMainlineTag(execa) {
-    console.log(`::group::Getting mainline tag android-${MAINLINE_TAG}`);
-    let hasFailed = false;
-    try {
-        await execa("git", ["remote", "add", "mainline", "https://github.com/yuzu-emu/yuzu-android.git"]);
-        await execa("git", ["fetch", "mainline", "--tags"]);
-        await execa("git", ["checkout", `tags/android-${MAINLINE_TAG}`]);
-        await execa("git", ["submodule", "update", "--init", "--recursive"]);
-    } catch (err) {
-        console.log('::error title=Failed pull tag');
-        hasFailed = true;
-    }
-    console.log("::endgroup::");
-    if (hasFailed) {
-        throw 'Failed pull mainline tag. Aborting!';
-    }
-}
-
-async function mergebot(github, context, execa) {
-    // Reset our local copy of master to what appears on yuzu-emu/yuzu - master
-    await resetBranch(execa);
-
-    const pulls = await getPulls(github);
+    const result = await github.graphql(query, variables);
+    const pulls = result.repository.pullRequests.nodes;
     let displayList = [];
     for (let i = 0; i < pulls.length; i++) {
         let pull = pulls[i];
@@ -302,17 +231,11 @@ async function mergebot(github, context, execa) {
     console.table(displayList);
     await fetchPullRequests(pulls, "https://github.com/yuzu-emu/yuzu", execa);
     const mergeResults = await mergePullRequests(pulls, execa);
-
-    if (BUILD_EA) {
-        await tagAndPushEA(github, 'yuzu-emu', `yuzu-android`, execa);
-    } else {
-        await generateReadme(pulls, context, mergeResults, execa);
-        await tagAndPush(github, 'yuzu-emu', `yuzu-android`, execa, true);
-    }
+    await generateReadme(pulls, context, mergeResults, execa);
+    await tagAndPush(github, 'yuzu-emu', `yuzu-android`, execa, true);
 }
 
 module.exports.mergebot = mergebot;
 module.exports.checkAndroidChanges = checkAndroidChanges;
 module.exports.tagAndPush = tagAndPush;
 module.exports.checkBaseChanges = checkBaseChanges;
-module.exports.getMainlineTag = getMainlineTag;

.github/workflows/android-publish.yml

@@ -1,4 +1,4 @@
-# SPDX-FileCopyrightText: 2024 yuzu Emulator Project
+# SPDX-FileCopyrightText: 2023 yuzu Emulator Project
 # SPDX-License-Identifier: GPL-2.0-or-later
 
 name: yuzu-android-publish
@@ -16,7 +16,7 @@ on:
 jobs:
   android:
     runs-on: ubuntu-latest
-    if: ${{ github.event.inputs.android != 'false' && github.repository == 'yuzu-emu/yuzu' }}
+    if: ${{ github.event.inputs.android != 'false' && github.repository == 'yuzu-emu/yuzu-android' }}
     steps:
       # this checkout is required to make sure the GitHub Actions scripts are available
       - uses: actions/checkout@v3

README.md

@@ -1,14 +1,11 @@
 | Pull Request | Commit | Title | Author | Merged? |
 |----|----|----|----|----|
-| [12461](https://github.com/yuzu-emu/yuzu//pull/12461) | [`54eb8dcc9`](https://github.com/yuzu-emu/yuzu//pull/12461/files) | Rework Nvdec and VIC to fix out-of-order videos, and speed up decoding. | [Kelebek1](https://github.com/Kelebek1/) | Yes |
-| [12749](https://github.com/yuzu-emu/yuzu//pull/12749) | [`aad4b0d6f`](https://github.com/yuzu-emu/yuzu//pull/12749/files) | general: workarounds for SMMU syncing issues | [liamwhite](https://github.com/liamwhite/) | Yes |
-| [12756](https://github.com/yuzu-emu/yuzu//pull/12756) | [`cd3de0848`](https://github.com/yuzu-emu/yuzu//pull/12756/files) | general: applet multiprocess | [liamwhite](https://github.com/liamwhite/) | Yes |
-| [12920](https://github.com/yuzu-emu/yuzu//pull/12920) | [`2600ac65c`](https://github.com/yuzu-emu/yuzu//pull/12920/files) | android: Move JNI setup and helpers to common | [t895](https://github.com/t895/) | Yes |
-| [12949](https://github.com/yuzu-emu/yuzu//pull/12949) | [`5a64a77df`](https://github.com/yuzu-emu/yuzu//pull/12949/files) | service: add os types and multi wait API | [liamwhite](https://github.com/liamwhite/) | Yes |
-| [12951](https://github.com/yuzu-emu/yuzu//pull/12951) | [`fee263c59`](https://github.com/yuzu-emu/yuzu//pull/12951/files) | ipc: additional fixes | [liamwhite](https://github.com/liamwhite/) | Yes |
-| [12955](https://github.com/yuzu-emu/yuzu//pull/12955) | [`8d2ad3d8f`](https://github.com/yuzu-emu/yuzu//pull/12955/files) | dmnt: cheat: Avoid invalidating cache on 32bit | [german77](https://github.com/german77/) | Yes |
-| [12964](https://github.com/yuzu-emu/yuzu//pull/12964) | [`af8736567`](https://github.com/yuzu-emu/yuzu//pull/12964/files) | android: Remove foreground service | [t895](https://github.com/t895/) | Yes |
-| [12968](https://github.com/yuzu-emu/yuzu//pull/12968) | [`f44183db9`](https://github.com/yuzu-emu/yuzu//pull/12968/files) | android: Thermal throttling indicator | [t895](https://github.com/t895/) | Yes |
+| [12461](https://github.com/yuzu-emu/yuzu-android//pull/12461) | [`4c08a0e6d`](https://github.com/yuzu-emu/yuzu-android//pull/12461/files) | Rework Nvdec and VIC to fix out-of-order videos, and speed up decoding. | [Kelebek1](https://github.com/Kelebek1/) | Yes |
+| [12749](https://github.com/yuzu-emu/yuzu-android//pull/12749) | [`aad4b0d6f`](https://github.com/yuzu-emu/yuzu-android//pull/12749/files) | general: workarounds for SMMU syncing issues | [liamwhite](https://github.com/liamwhite/) | Yes |
+| [12756](https://github.com/yuzu-emu/yuzu-android//pull/12756) | [`cd3de0848`](https://github.com/yuzu-emu/yuzu-android//pull/12756/files) | general: applet multiprocess | [liamwhite](https://github.com/liamwhite/) | Yes |
+| [12903](https://github.com/yuzu-emu/yuzu-android//pull/12903) | [`f296a9ce9`](https://github.com/yuzu-emu/yuzu-android//pull/12903/files) | shader_recompiler: use only ConstOffset for OpImageFetch | [liamwhite](https://github.com/liamwhite/) | Yes |
+| [12914](https://github.com/yuzu-emu/yuzu-android//pull/12914) | [`fa47ac1c9`](https://github.com/yuzu-emu/yuzu-android//pull/12914/files) | VideoCore Refactor Part 1. | [FernandoS27](https://github.com/FernandoS27/) | Yes |
+| [12920](https://github.com/yuzu-emu/yuzu-android//pull/12920) | [`62fc6d5c3`](https://github.com/yuzu-emu/yuzu-android//pull/12920/files) | android: Move JNI setup and helpers to common | [t895](https://github.com/t895/) | Yes |
 
 
 End of merge log. You can find the original README.md below the break.

src/android/app/build.gradle.kts

@@ -3,8 +3,8 @@
 
 import android.annotation.SuppressLint
 import kotlin.collections.setOf
+import org.jetbrains.kotlin.konan.properties.Properties
 import org.jlleitschuh.gradle.ktlint.reporter.ReporterType
-import com.github.triplet.gradle.androidpublisher.ReleaseStatus
 
 plugins {
     id("com.android.application")
@@ -13,7 +13,6 @@ plugins {
     kotlin("plugin.serialization") version "1.9.20"
     id("androidx.navigation.safeargs.kotlin")
     id("org.jlleitschuh.gradle.ktlint") version "11.4.0"
-    id("com.github.triplet.play") version "3.8.6"
 }
 
 /**
@@ -59,7 +58,15 @@ android {
         targetSdk = 34
         versionName = getGitVersion()
 
-        versionCode = if (System.getenv("AUTO_VERSIONED") == "true") {
+        // If you want to use autoVersion for the versionCode, create a property in local.properties
+        // named "autoVersioned" and set it to "true"
+        val properties = Properties()
+        val versionProperty = try {
+            properties.load(project.rootProject.file("local.properties").inputStream())
+            properties.getProperty("autoVersioned") ?: ""
+        } catch (e: Exception) { "" }
+
+        versionCode = if (versionProperty == "true") {
             autoVersion
         } else {
             1
@@ -214,15 +221,6 @@ ktlint {
     }
 }
 
-play {
-    val keyPath = System.getenv("SERVICE_ACCOUNT_KEY_PATH")
-    if (keyPath != null) {
-        serviceAccountCredentials.set(File(keyPath))
-    }
-    track.set(System.getenv("STORE_TRACK") ?: "internal")
-    releaseStatus.set(ReleaseStatus.COMPLETED)
-}
-
 dependencies {
     implementation("androidx.core:core-ktx:1.12.0")
     implementation("androidx.appcompat:appcompat:1.6.1")
@@ -259,18 +257,12 @@ fun runGitCommand(command: List<String>): String {
 }
 
 fun getGitVersion(): String {
-    val gitVersion = runGitCommand(
-        listOf(
-            "git",
-            "describe",
-            "--always",
-            "--long"
-        )
-    ).replace(Regex("(-0)?-[^-]+$"), "")
     val versionName = if (System.getenv("GITHUB_ACTIONS") != null) {
-        System.getenv("GIT_TAG_NAME") ?: gitVersion
+        val gitTag = System.getenv("GIT_TAG_NAME") ?: ""
+        gitTag
     } else {
-        gitVersion
+        runGitCommand(listOf("git", "describe", "--always", "--long"))
+            .replace(Regex("(-0)?-[^-]+$"), "")
     }
     return versionName.ifEmpty { "0.0" }
 }

src/android/app/src/main/AndroidManifest.xml

@@ -12,6 +12,8 @@ SPDX-License-Identifier: GPL-3.0-or-later
     <uses-feature android:name="android.hardware.vulkan.version" android:version="0x401000" android:required="true" />
 
     <uses-permission android:name="android.permission.INTERNET" />
+    <uses-permission android:name="android.permission.FOREGROUND_SERVICE" />
+    <uses-permission android:name="android.permission.FOREGROUND_SERVICE_SPECIAL_USE" />
     <uses-permission android:name="android.permission.NFC" />
     <uses-permission android:name="android.permission.POST_NOTIFICATIONS" />
 
@@ -78,6 +80,10 @@ SPDX-License-Identifier: GPL-3.0-or-later
                 android:resource="@xml/nfc_tech_filter" />
         </activity>
 
+        <service android:name="org.yuzu.yuzu_emu.utils.ForegroundService" android:foregroundServiceType="specialUse">
+            <property android:name="android.app.PROPERTY_SPECIAL_USE_FGS_SUBTYPE" android:value="Keep emulation running in background"/>
+        </service>
+
         <provider
             android:name=".features.DocumentProvider"
             android:authorities="${applicationId}.user"

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

@@ -17,6 +17,17 @@ fun Context.getPublicFilesDir(): File = getExternalFilesDir(null) ?: filesDir
 
 class YuzuApplication : Application() {
     private fun createNotificationChannels() {
+        val emulationChannel = NotificationChannel(
+            getString(R.string.emulation_notification_channel_id),
+            getString(R.string.emulation_notification_channel_name),
+            NotificationManager.IMPORTANCE_LOW
+        )
+        emulationChannel.description = getString(
+            R.string.emulation_notification_channel_description
+        )
+        emulationChannel.setSound(null, null)
+        emulationChannel.vibrationPattern = null
+
         val noticeChannel = NotificationChannel(
             getString(R.string.notice_notification_channel_id),
             getString(R.string.notice_notification_channel_name),
@@ -28,6 +39,7 @@ class YuzuApplication : Application() {
         // Register the channel with the system; you can't change the importance
         // or other notification behaviors after this
         val notificationManager = getSystemService(NotificationManager::class.java)
+        notificationManager.createNotificationChannel(emulationChannel)
         notificationManager.createNotificationChannel(noticeChannel)
     }
 

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

@@ -4,6 +4,7 @@
 package org.yuzu.yuzu_emu.activities
 
 import android.annotation.SuppressLint
+import android.app.Activity
 import android.app.PendingIntent
 import android.app.PictureInPictureParams
 import android.app.RemoteAction
@@ -44,6 +45,7 @@ import org.yuzu.yuzu_emu.features.settings.model.IntSetting
 import org.yuzu.yuzu_emu.features.settings.model.Settings
 import org.yuzu.yuzu_emu.model.EmulationViewModel
 import org.yuzu.yuzu_emu.model.Game
+import org.yuzu.yuzu_emu.utils.ForegroundService
 import org.yuzu.yuzu_emu.utils.InputHandler
 import org.yuzu.yuzu_emu.utils.Log
 import org.yuzu.yuzu_emu.utils.MemoryUtil
@@ -72,6 +74,11 @@ class EmulationActivity : AppCompatActivity(), SensorEventListener {
 
     private val emulationViewModel: EmulationViewModel by viewModels()
 
+    override fun onDestroy() {
+        stopForegroundService(this)
+        super.onDestroy()
+    }
+
     override fun onCreate(savedInstanceState: Bundle?) {
         Log.gameLaunched = true
         ThemeHelper.setTheme(this)
@@ -118,6 +125,10 @@ class EmulationActivity : AppCompatActivity(), SensorEventListener {
                     .apply()
             }
         }
+
+        // Start a foreground service to prevent the app from getting killed in the background
+        val startIntent = Intent(this, ForegroundService::class.java)
+        startForegroundService(startIntent)
     }
 
     override fun onKeyDown(keyCode: Int, event: KeyEvent): Boolean {
@@ -470,6 +481,12 @@ class EmulationActivity : AppCompatActivity(), SensorEventListener {
             activity.startActivity(launcher)
         }
 
+        fun stopForegroundService(activity: Activity) {
+            val startIntent = Intent(activity, ForegroundService::class.java)
+            startIntent.action = ForegroundService.ACTION_STOP
+            activity.startForegroundService(startIntent)
+        }
+
         private fun areCoordinatesOutside(view: View?, x: Float, y: Float): Boolean {
             if (view == null) {
                 return true

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

@@ -25,8 +25,7 @@ enum class BooleanSetting(override val key: String) : AbstractBooleanSetting {
     HAPTIC_FEEDBACK("haptic_feedback"),
     SHOW_PERFORMANCE_OVERLAY("show_performance_overlay"),
     SHOW_INPUT_OVERLAY("show_input_overlay"),
-    TOUCHSCREEN("touchscreen"),
-    SHOW_THERMAL_OVERLAY("show_thermal_overlay");
+    TOUCHSCREEN("touchscreen");
 
     override fun getBoolean(needsGlobal: Boolean): Boolean =
         NativeConfig.getBoolean(key, needsGlobal)

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

@@ -8,6 +8,7 @@ import android.os.Bundle
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
+import android.view.ViewGroup.MarginLayoutParams
 import androidx.core.view.ViewCompat
 import androidx.core.view.WindowInsetsCompat
 import androidx.core.view.updatePadding
@@ -26,7 +27,6 @@ import org.yuzu.yuzu_emu.R
 import org.yuzu.yuzu_emu.databinding.FragmentSettingsBinding
 import org.yuzu.yuzu_emu.features.settings.model.Settings
 import org.yuzu.yuzu_emu.model.SettingsViewModel
-import org.yuzu.yuzu_emu.utils.ViewUtils.updateMargins
 
 class SettingsFragment : Fragment() {
     private lateinit var presenter: SettingsFragmentPresenter
@@ -125,10 +125,18 @@ class SettingsFragment : Fragment() {
             val leftInsets = barInsets.left + cutoutInsets.left
             val rightInsets = barInsets.right + cutoutInsets.right
 
-            binding.listSettings.updateMargins(left = leftInsets, right = rightInsets)
-            binding.listSettings.updatePadding(bottom = barInsets.bottom)
+            val mlpSettingsList = binding.listSettings.layoutParams as MarginLayoutParams
+            mlpSettingsList.leftMargin = leftInsets
+            mlpSettingsList.rightMargin = rightInsets
+            binding.listSettings.layoutParams = mlpSettingsList
+            binding.listSettings.updatePadding(
+                bottom = barInsets.bottom
+            )
 
-            binding.appbarSettings.updateMargins(left = leftInsets, right = rightInsets)
+            val mlpAppBar = binding.appbarSettings.layoutParams as MarginLayoutParams
+            mlpAppBar.leftMargin = leftInsets
+            mlpAppBar.rightMargin = rightInsets
+            binding.appbarSettings.layoutParams = mlpAppBar
             windowInsets
         }
     }

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

@@ -13,6 +13,7 @@ import android.os.Bundle
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
+import android.view.ViewGroup.MarginLayoutParams
 import android.widget.Toast
 import androidx.core.view.ViewCompat
 import androidx.core.view.WindowInsetsCompat
@@ -25,7 +26,6 @@ import org.yuzu.yuzu_emu.BuildConfig
 import org.yuzu.yuzu_emu.R
 import org.yuzu.yuzu_emu.databinding.FragmentAboutBinding
 import org.yuzu.yuzu_emu.model.HomeViewModel
-import org.yuzu.yuzu_emu.utils.ViewUtils.updateMargins
 
 class AboutFragment : Fragment() {
     private var _binding: FragmentAboutBinding? = null
@@ -114,8 +114,15 @@ class AboutFragment : Fragment() {
             val leftInsets = barInsets.left + cutoutInsets.left
             val rightInsets = barInsets.right + cutoutInsets.right
 
-            binding.toolbarAbout.updateMargins(left = leftInsets, right = rightInsets)
-            binding.scrollAbout.updateMargins(left = leftInsets, right = rightInsets)
+            val mlpToolbar = binding.toolbarAbout.layoutParams as MarginLayoutParams
+            mlpToolbar.leftMargin = leftInsets
+            mlpToolbar.rightMargin = rightInsets
+            binding.toolbarAbout.layoutParams = mlpToolbar
+
+            val mlpScrollAbout = binding.scrollAbout.layoutParams as MarginLayoutParams
+            mlpScrollAbout.leftMargin = leftInsets
+            mlpScrollAbout.rightMargin = rightInsets
+            binding.scrollAbout.layoutParams = mlpScrollAbout
 
             binding.contentAbout.updatePadding(bottom = barInsets.bottom)
 

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

@@ -31,7 +31,6 @@ import org.yuzu.yuzu_emu.model.AddonViewModel
 import org.yuzu.yuzu_emu.model.HomeViewModel
 import org.yuzu.yuzu_emu.utils.AddonUtil
 import org.yuzu.yuzu_emu.utils.FileUtil.copyFilesTo
-import org.yuzu.yuzu_emu.utils.ViewUtils.updateMargins
 import java.io.File
 
 class AddonsFragment : Fragment() {
@@ -203,19 +202,27 @@ class AddonsFragment : Fragment() {
             val leftInsets = barInsets.left + cutoutInsets.left
             val rightInsets = barInsets.right + cutoutInsets.right
 
-            binding.toolbarAddons.updateMargins(left = leftInsets, right = rightInsets)
-            binding.listAddons.updateMargins(left = leftInsets, right = rightInsets)
+            val mlpToolbar = binding.toolbarAddons.layoutParams as ViewGroup.MarginLayoutParams
+            mlpToolbar.leftMargin = leftInsets
+            mlpToolbar.rightMargin = rightInsets
+            binding.toolbarAddons.layoutParams = mlpToolbar
+
+            val mlpAddonsList = binding.listAddons.layoutParams as ViewGroup.MarginLayoutParams
+            mlpAddonsList.leftMargin = leftInsets
+            mlpAddonsList.rightMargin = rightInsets
+            binding.listAddons.layoutParams = mlpAddonsList
             binding.listAddons.updatePadding(
                 bottom = barInsets.bottom +
                     resources.getDimensionPixelSize(R.dimen.spacing_bottom_list_fab)
             )
 
             val fabSpacing = resources.getDimensionPixelSize(R.dimen.spacing_fab)
-            binding.buttonInstall.updateMargins(
-                left = leftInsets + fabSpacing,
-                right = rightInsets + fabSpacing,
-                bottom = barInsets.bottom + fabSpacing
-            )
+            val mlpFab =
+                binding.buttonInstall.layoutParams as ViewGroup.MarginLayoutParams
+            mlpFab.leftMargin = leftInsets + fabSpacing
+            mlpFab.rightMargin = rightInsets + fabSpacing
+            mlpFab.bottomMargin = barInsets.bottom + fabSpacing
+            binding.buttonInstall.layoutParams = mlpFab
 
             windowInsets
         }

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

@@ -21,7 +21,6 @@ import org.yuzu.yuzu_emu.databinding.FragmentAppletLauncherBinding
 import org.yuzu.yuzu_emu.model.Applet
 import org.yuzu.yuzu_emu.model.AppletInfo
 import org.yuzu.yuzu_emu.model.HomeViewModel
-import org.yuzu.yuzu_emu.utils.ViewUtils.updateMargins
 
 class AppletLauncherFragment : Fragment() {
     private var _binding: FragmentAppletLauncherBinding? = null
@@ -96,8 +95,16 @@ class AppletLauncherFragment : Fragment() {
             val leftInsets = barInsets.left + cutoutInsets.left
             val rightInsets = barInsets.right + cutoutInsets.right
 
-            binding.toolbarApplets.updateMargins(left = leftInsets, right = rightInsets)
-            binding.listApplets.updateMargins(left = leftInsets, right = rightInsets)
+            val mlpAppBar = binding.toolbarApplets.layoutParams as ViewGroup.MarginLayoutParams
+            mlpAppBar.leftMargin = leftInsets
+            mlpAppBar.rightMargin = rightInsets
+            binding.toolbarApplets.layoutParams = mlpAppBar
+
+            val mlpListApplets =
+                binding.listApplets.layoutParams as ViewGroup.MarginLayoutParams
+            mlpListApplets.leftMargin = leftInsets
+            mlpListApplets.rightMargin = rightInsets
+            binding.listApplets.layoutParams = mlpListApplets
 
             binding.listApplets.updatePadding(bottom = barInsets.bottom)
 

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

@@ -34,7 +34,6 @@ import org.yuzu.yuzu_emu.model.HomeViewModel
 import org.yuzu.yuzu_emu.utils.FileUtil
 import org.yuzu.yuzu_emu.utils.GpuDriverHelper
 import org.yuzu.yuzu_emu.utils.NativeConfig
-import org.yuzu.yuzu_emu.utils.ViewUtils.updateMargins
 import java.io.File
 import java.io.IOException
 
@@ -142,15 +141,23 @@ class DriverManagerFragment : Fragment() {
             val leftInsets = barInsets.left + cutoutInsets.left
             val rightInsets = barInsets.right + cutoutInsets.right
 
-            binding.toolbarDrivers.updateMargins(left = leftInsets, right = rightInsets)
-            binding.listDrivers.updateMargins(left = leftInsets, right = rightInsets)
+            val mlpAppBar = binding.toolbarDrivers.layoutParams as ViewGroup.MarginLayoutParams
+            mlpAppBar.leftMargin = leftInsets
+            mlpAppBar.rightMargin = rightInsets
+            binding.toolbarDrivers.layoutParams = mlpAppBar
+
+            val mlplistDrivers = binding.listDrivers.layoutParams as ViewGroup.MarginLayoutParams
+            mlplistDrivers.leftMargin = leftInsets
+            mlplistDrivers.rightMargin = rightInsets
+            binding.listDrivers.layoutParams = mlplistDrivers
 
             val fabSpacing = resources.getDimensionPixelSize(R.dimen.spacing_fab)
-            binding.buttonInstall.updateMargins(
-                left = leftInsets + fabSpacing,
-                right = rightInsets + fabSpacing,
-                bottom = barInsets.bottom + fabSpacing
-            )
+            val mlpFab =
+                binding.buttonInstall.layoutParams as ViewGroup.MarginLayoutParams
+            mlpFab.leftMargin = leftInsets + fabSpacing
+            mlpFab.rightMargin = rightInsets + fabSpacing
+            mlpFab.bottomMargin = barInsets.bottom + fabSpacing
+            binding.buttonInstall.layoutParams = mlpFab
 
             binding.listDrivers.updatePadding(
                 bottom = barInsets.bottom +

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

@@ -19,7 +19,6 @@ import com.google.android.material.transition.MaterialSharedAxis
 import org.yuzu.yuzu_emu.R
 import org.yuzu.yuzu_emu.databinding.FragmentEarlyAccessBinding
 import org.yuzu.yuzu_emu.model.HomeViewModel
-import org.yuzu.yuzu_emu.utils.ViewUtils.updateMargins
 
 class EarlyAccessFragment : Fragment() {
     private var _binding: FragmentEarlyAccessBinding? = null
@@ -74,7 +73,10 @@ class EarlyAccessFragment : Fragment() {
             val leftInsets = barInsets.left + cutoutInsets.left
             val rightInsets = barInsets.right + cutoutInsets.right
 
-            binding.appbarEa.updateMargins(left = leftInsets, right = rightInsets)
+            val mlpAppBar = binding.appbarEa.layoutParams as ViewGroup.MarginLayoutParams
+            mlpAppBar.leftMargin = leftInsets
+            mlpAppBar.rightMargin = rightInsets
+            binding.appbarEa.layoutParams = mlpAppBar
 
             binding.scrollEa.updatePadding(
                 left = leftInsets,

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

@@ -13,7 +13,6 @@ import android.net.Uri
 import android.os.Bundle
 import android.os.Handler
 import android.os.Looper
-import android.os.PowerManager
 import android.os.SystemClock
 import android.view.*
 import android.widget.TextView
@@ -24,7 +23,6 @@ import androidx.core.content.res.ResourcesCompat
 import androidx.core.graphics.Insets
 import androidx.core.view.ViewCompat
 import androidx.core.view.WindowInsetsCompat
-import androidx.core.view.updatePadding
 import androidx.drawerlayout.widget.DrawerLayout
 import androidx.drawerlayout.widget.DrawerLayout.DrawerListener
 import androidx.fragment.app.Fragment
@@ -40,6 +38,7 @@ import androidx.window.layout.WindowLayoutInfo
 import com.google.android.material.dialog.MaterialAlertDialogBuilder
 import com.google.android.material.slider.Slider
 import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.flow.collect
 import kotlinx.coroutines.flow.collectLatest
 import kotlinx.coroutines.launch
 import org.yuzu.yuzu_emu.HomeNavigationDirections
@@ -65,7 +64,6 @@ class EmulationFragment : Fragment(), SurfaceHolder.Callback {
     private lateinit var emulationState: EmulationState
     private var emulationActivity: EmulationActivity? = null
     private var perfStatsUpdater: (() -> Unit)? = null
-    private var thermalStatsUpdater: (() -> Unit)? = null
 
     private var _binding: FragmentEmulationBinding? = null
     private val binding get() = _binding!!
@@ -79,8 +77,6 @@ class EmulationFragment : Fragment(), SurfaceHolder.Callback {
 
     private var isInFoldableLayout = false
 
-    private lateinit var powerManager: PowerManager
-
     override fun onAttach(context: Context) {
         super.onAttach(context)
         if (context is EmulationActivity) {
@@ -106,8 +102,6 @@ class EmulationFragment : Fragment(), SurfaceHolder.Callback {
         super.onCreate(savedInstanceState)
         updateOrientation()
 
-        powerManager = requireContext().getSystemService(Context.POWER_SERVICE) as PowerManager
-
         val intentUri: Uri? = requireActivity().intent.data
         var intentGame: Game? = null
         if (intentUri != null) {
@@ -400,9 +394,8 @@ class EmulationFragment : Fragment(), SurfaceHolder.Callback {
 
                             emulationState.updateSurface()
 
-                            // Setup overlays
+                            // Setup overlay
                             updateShowFpsOverlay()
-                            updateThermalOverlay()
                         }
                     }
                 }
@@ -560,38 +553,6 @@ class EmulationFragment : Fragment(), SurfaceHolder.Callback {
         }
     }
 
-    private fun updateThermalOverlay() {
-        if (BooleanSetting.SHOW_THERMAL_OVERLAY.getBoolean()) {
-            thermalStatsUpdater = {
-                if (emulationViewModel.emulationStarted.value &&
-                    !emulationViewModel.isEmulationStopping.value
-                ) {
-                    val thermalStatus = when (powerManager.currentThermalStatus) {
-                        PowerManager.THERMAL_STATUS_LIGHT -> "😥"
-                        PowerManager.THERMAL_STATUS_MODERATE -> "🥵"
-                        PowerManager.THERMAL_STATUS_SEVERE -> "🔥"
-                        PowerManager.THERMAL_STATUS_CRITICAL,
-                        PowerManager.THERMAL_STATUS_EMERGENCY,
-                        PowerManager.THERMAL_STATUS_SHUTDOWN -> "☢️"
-
-                        else -> "🙂"
-                    }
-                    if (_binding != null) {
-                        binding.showThermalsText.text = thermalStatus
-                    }
-                    thermalStatsUpdateHandler.postDelayed(thermalStatsUpdater!!, 1000)
-                }
-            }
-            thermalStatsUpdateHandler.post(thermalStatsUpdater!!)
-            binding.showThermalsText.visibility = View.VISIBLE
-        } else {
-            if (thermalStatsUpdater != null) {
-                thermalStatsUpdateHandler.removeCallbacks(thermalStatsUpdater!!)
-            }
-            binding.showThermalsText.visibility = View.GONE
-        }
-    }
-
     @SuppressLint("SourceLockedOrientationActivity")
     private fun updateOrientation() {
         emulationActivity?.let {
@@ -680,8 +641,6 @@ class EmulationFragment : Fragment(), SurfaceHolder.Callback {
         popup.menu.apply {
             findItem(R.id.menu_toggle_fps).isChecked =
                 BooleanSetting.SHOW_PERFORMANCE_OVERLAY.getBoolean()
-            findItem(R.id.thermal_indicator).isChecked =
-                BooleanSetting.SHOW_THERMAL_OVERLAY.getBoolean()
             findItem(R.id.menu_rel_stick_center).isChecked =
                 BooleanSetting.JOYSTICK_REL_CENTER.getBoolean()
             findItem(R.id.menu_dpad_slide).isChecked = BooleanSetting.DPAD_SLIDE.getBoolean()
@@ -701,13 +660,6 @@ class EmulationFragment : Fragment(), SurfaceHolder.Callback {
                     true
                 }
 
-                R.id.thermal_indicator -> {
-                    it.isChecked = !it.isChecked
-                    BooleanSetting.SHOW_THERMAL_OVERLAY.setBoolean(it.isChecked)
-                    updateThermalOverlay()
-                    true
-                }
-
                 R.id.menu_edit_overlay -> {
                     binding.drawerLayout.close()
                     binding.surfaceInputOverlay.requestFocus()
@@ -898,7 +850,7 @@ class EmulationFragment : Fragment(), SurfaceHolder.Callback {
                 right = cutInsets.right
             }
 
-            v.updatePadding(left = left, top = cutInsets.top, right = right)
+            v.setPadding(left, cutInsets.top, right, 0)
             windowInsets
         }
     }
@@ -1051,6 +1003,5 @@ class EmulationFragment : Fragment(), SurfaceHolder.Callback {
 
     companion object {
         private val perfStatsUpdateHandler = Handler(Looper.myLooper()!!)
-        private val thermalStatsUpdateHandler = Handler(Looper.myLooper()!!)
     }
 }

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

@@ -26,7 +26,6 @@ import org.yuzu.yuzu_emu.databinding.FragmentFoldersBinding
 import org.yuzu.yuzu_emu.model.GamesViewModel
 import org.yuzu.yuzu_emu.model.HomeViewModel
 import org.yuzu.yuzu_emu.ui.main.MainActivity
-import org.yuzu.yuzu_emu.utils.ViewUtils.updateMargins
 
 class GameFoldersFragment : Fragment() {
     private var _binding: FragmentFoldersBinding? = null
@@ -101,16 +100,23 @@ class GameFoldersFragment : Fragment() {
             val leftInsets = barInsets.left + cutoutInsets.left
             val rightInsets = barInsets.right + cutoutInsets.right
 
-            binding.toolbarFolders.updateMargins(left = leftInsets, right = rightInsets)
+            val mlpToolbar = binding.toolbarFolders.layoutParams as ViewGroup.MarginLayoutParams
+            mlpToolbar.leftMargin = leftInsets
+            mlpToolbar.rightMargin = rightInsets
+            binding.toolbarFolders.layoutParams = mlpToolbar
 
             val fabSpacing = resources.getDimensionPixelSize(R.dimen.spacing_fab)
-            binding.buttonAdd.updateMargins(
-                left = leftInsets + fabSpacing,
-                right = rightInsets + fabSpacing,
-                bottom = barInsets.bottom + fabSpacing
-            )
+            val mlpFab =
+                binding.buttonAdd.layoutParams as ViewGroup.MarginLayoutParams
+            mlpFab.leftMargin = leftInsets + fabSpacing
+            mlpFab.rightMargin = rightInsets + fabSpacing
+            mlpFab.bottomMargin = barInsets.bottom + fabSpacing
+            binding.buttonAdd.layoutParams = mlpFab
 
-            binding.listFolders.updateMargins(left = leftInsets, right = rightInsets)
+            val mlpListFolders = binding.listFolders.layoutParams as ViewGroup.MarginLayoutParams
+            mlpListFolders.leftMargin = leftInsets
+            mlpListFolders.rightMargin = rightInsets
+            binding.listFolders.layoutParams = mlpListFolders
 
             binding.listFolders.updatePadding(
                 bottom = barInsets.bottom +

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

@@ -27,7 +27,6 @@ import org.yuzu.yuzu_emu.databinding.FragmentGameInfoBinding
 import org.yuzu.yuzu_emu.model.GameVerificationResult
 import org.yuzu.yuzu_emu.model.HomeViewModel
 import org.yuzu.yuzu_emu.utils.GameMetadata
-import org.yuzu.yuzu_emu.utils.ViewUtils.updateMargins
 
 class GameInfoFragment : Fragment() {
     private var _binding: FragmentGameInfoBinding? = null
@@ -123,13 +122,11 @@ class GameInfoFragment : Fragment() {
                                 titleId = R.string.verify_success,
                                 descriptionId = R.string.operation_completed_successfully
                             )
-
                         GameVerificationResult.Failed ->
                             MessageDialogFragment.newInstance(
                                 titleId = R.string.verify_failure,
                                 descriptionId = R.string.verify_failure_description
                             )
-
                         GameVerificationResult.NotImplemented ->
                             MessageDialogFragment.newInstance(
                                 titleId = R.string.verify_no_result,
@@ -168,8 +165,15 @@ class GameInfoFragment : Fragment() {
             val leftInsets = barInsets.left + cutoutInsets.left
             val rightInsets = barInsets.right + cutoutInsets.right
 
-            binding.toolbarInfo.updateMargins(left = leftInsets, right = rightInsets)
-            binding.scrollInfo.updateMargins(left = leftInsets, right = rightInsets)
+            val mlpToolbar = binding.toolbarInfo.layoutParams as ViewGroup.MarginLayoutParams
+            mlpToolbar.leftMargin = leftInsets
+            mlpToolbar.rightMargin = rightInsets
+            binding.toolbarInfo.layoutParams = mlpToolbar
+
+            val mlpScrollAbout = binding.scrollInfo.layoutParams as ViewGroup.MarginLayoutParams
+            mlpScrollAbout.leftMargin = leftInsets
+            mlpScrollAbout.rightMargin = rightInsets
+            binding.scrollInfo.layoutParams = mlpScrollAbout
 
             binding.contentInfo.updatePadding(bottom = barInsets.bottom)
 

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

@@ -46,7 +46,6 @@ import org.yuzu.yuzu_emu.utils.FileUtil
 import org.yuzu.yuzu_emu.utils.GameIconUtils
 import org.yuzu.yuzu_emu.utils.GpuDriverHelper
 import org.yuzu.yuzu_emu.utils.MemoryUtil
-import org.yuzu.yuzu_emu.utils.ViewUtils.updateMargins
 import java.io.BufferedOutputStream
 import java.io.File
 
@@ -321,25 +320,46 @@ class GamePropertiesFragment : Fragment() {
 
             val smallLayout = resources.getBoolean(R.bool.small_layout)
             if (smallLayout) {
-                binding.listAll.updateMargins(left = leftInsets, right = rightInsets)
+                val mlpListAll =
+                    binding.listAll.layoutParams as ViewGroup.MarginLayoutParams
+                mlpListAll.leftMargin = leftInsets
+                mlpListAll.rightMargin = rightInsets
+                binding.listAll.layoutParams = mlpListAll
             } else {
                 if (ViewCompat.getLayoutDirection(binding.root) ==
                     ViewCompat.LAYOUT_DIRECTION_LTR
                 ) {
-                    binding.listAll.updateMargins(right = rightInsets)
-                    binding.iconLayout!!.updateMargins(top = barInsets.top, left = leftInsets)
+                    val mlpListAll =
+                        binding.listAll.layoutParams as ViewGroup.MarginLayoutParams
+                    mlpListAll.rightMargin = rightInsets
+                    binding.listAll.layoutParams = mlpListAll
+
+                    val mlpIconLayout =
+                        binding.iconLayout!!.layoutParams as ViewGroup.MarginLayoutParams
+                    mlpIconLayout.topMargin = barInsets.top
+                    mlpIconLayout.leftMargin = leftInsets
+                    binding.iconLayout!!.layoutParams = mlpIconLayout
                 } else {
-                    binding.listAll.updateMargins(left = leftInsets)
-                    binding.iconLayout!!.updateMargins(top = barInsets.top, right = rightInsets)
+                    val mlpListAll =
+                        binding.listAll.layoutParams as ViewGroup.MarginLayoutParams
+                    mlpListAll.leftMargin = leftInsets
+                    binding.listAll.layoutParams = mlpListAll
+
+                    val mlpIconLayout =
+                        binding.iconLayout!!.layoutParams as ViewGroup.MarginLayoutParams
+                    mlpIconLayout.topMargin = barInsets.top
+                    mlpIconLayout.rightMargin = rightInsets
+                    binding.iconLayout!!.layoutParams = mlpIconLayout
                 }
             }
 
             val fabSpacing = resources.getDimensionPixelSize(R.dimen.spacing_fab)
-            binding.buttonStart.updateMargins(
-                left = leftInsets + fabSpacing,
-                right = rightInsets + fabSpacing,
-                bottom = barInsets.bottom + fabSpacing
-            )
+            val mlpFab =
+                binding.buttonStart.layoutParams as ViewGroup.MarginLayoutParams
+            mlpFab.leftMargin = leftInsets + fabSpacing
+            mlpFab.rightMargin = rightInsets + fabSpacing
+            mlpFab.bottomMargin = barInsets.bottom + fabSpacing
+            binding.buttonStart.layoutParams = mlpFab
 
             binding.layoutAll.updatePadding(
                 top = barInsets.top,

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

@@ -12,6 +12,7 @@ import android.provider.DocumentsContract
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
+import android.view.ViewGroup.MarginLayoutParams
 import android.widget.Toast
 import androidx.appcompat.app.AppCompatActivity
 import androidx.core.app.ActivityCompat
@@ -43,7 +44,6 @@ import org.yuzu.yuzu_emu.ui.main.MainActivity
 import org.yuzu.yuzu_emu.utils.FileUtil
 import org.yuzu.yuzu_emu.utils.GpuDriverHelper
 import org.yuzu.yuzu_emu.utils.Log
-import org.yuzu.yuzu_emu.utils.ViewUtils.updateMargins
 
 class HomeSettingsFragment : Fragment() {
     private var _binding: FragmentHomeSettingsBinding? = null
@@ -408,7 +408,10 @@ class HomeSettingsFragment : Fragment() {
                 bottom = barInsets.bottom
             )
 
-            binding.scrollViewSettings.updateMargins(left = leftInsets, right = rightInsets)
+            val mlpScrollSettings = binding.scrollViewSettings.layoutParams as MarginLayoutParams
+            mlpScrollSettings.leftMargin = leftInsets
+            mlpScrollSettings.rightMargin = rightInsets
+            binding.scrollViewSettings.layoutParams = mlpScrollSettings
 
             binding.linearLayoutSettings.updatePadding(bottom = spacingNavigation)
 

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

@@ -34,7 +34,6 @@ import org.yuzu.yuzu_emu.model.TaskState
 import org.yuzu.yuzu_emu.ui.main.MainActivity
 import org.yuzu.yuzu_emu.utils.DirectoryInitialization
 import org.yuzu.yuzu_emu.utils.FileUtil
-import org.yuzu.yuzu_emu.utils.ViewUtils.updateMargins
 import java.io.BufferedOutputStream
 import java.io.File
 import java.math.BigInteger
@@ -173,8 +172,16 @@ class InstallableFragment : Fragment() {
             val leftInsets = barInsets.left + cutoutInsets.left
             val rightInsets = barInsets.right + cutoutInsets.right
 
-            binding.toolbarInstallables.updateMargins(left = leftInsets, right = rightInsets)
-            binding.listInstallables.updateMargins(left = leftInsets, right = rightInsets)
+            val mlpAppBar = binding.toolbarInstallables.layoutParams as ViewGroup.MarginLayoutParams
+            mlpAppBar.leftMargin = leftInsets
+            mlpAppBar.rightMargin = rightInsets
+            binding.toolbarInstallables.layoutParams = mlpAppBar
+
+            val mlpScrollAbout =
+                binding.listInstallables.layoutParams as ViewGroup.MarginLayoutParams
+            mlpScrollAbout.leftMargin = leftInsets
+            mlpScrollAbout.rightMargin = rightInsets
+            binding.listInstallables.layoutParams = mlpScrollAbout
 
             binding.listInstallables.updatePadding(bottom = barInsets.bottom)
 

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

@@ -7,6 +7,7 @@ import android.os.Bundle
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
+import android.view.ViewGroup.MarginLayoutParams
 import androidx.appcompat.app.AppCompatActivity
 import androidx.core.view.ViewCompat
 import androidx.core.view.WindowInsetsCompat
@@ -21,7 +22,6 @@ import org.yuzu.yuzu_emu.adapters.LicenseAdapter
 import org.yuzu.yuzu_emu.databinding.FragmentLicensesBinding
 import org.yuzu.yuzu_emu.model.HomeViewModel
 import org.yuzu.yuzu_emu.model.License
-import org.yuzu.yuzu_emu.utils.ViewUtils.updateMargins
 
 class LicensesFragment : Fragment() {
     private var _binding: FragmentLicensesBinding? = null
@@ -122,8 +122,15 @@ class LicensesFragment : Fragment() {
             val leftInsets = barInsets.left + cutoutInsets.left
             val rightInsets = barInsets.right + cutoutInsets.right
 
-            binding.appbarLicenses.updateMargins(left = leftInsets, right = rightInsets)
-            binding.listLicenses.updateMargins(left = leftInsets, right = rightInsets)
+            val mlpAppBar = binding.appbarLicenses.layoutParams as MarginLayoutParams
+            mlpAppBar.leftMargin = leftInsets
+            mlpAppBar.rightMargin = rightInsets
+            binding.appbarLicenses.layoutParams = mlpAppBar
+
+            val mlpScrollAbout = binding.listLicenses.layoutParams as MarginLayoutParams
+            mlpScrollAbout.leftMargin = leftInsets
+            mlpScrollAbout.rightMargin = rightInsets
+            binding.listLicenses.layoutParams = mlpScrollAbout
 
             binding.listLicenses.updatePadding(bottom = barInsets.bottom)
 

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

@@ -29,7 +29,6 @@ import org.yuzu.yuzu_emu.features.settings.model.view.SettingsItem
 import org.yuzu.yuzu_emu.features.settings.ui.SettingsAdapter
 import org.yuzu.yuzu_emu.model.SettingsViewModel
 import org.yuzu.yuzu_emu.utils.NativeConfig
-import org.yuzu.yuzu_emu.utils.ViewUtils.updateMargins
 
 class SettingsSearchFragment : Fragment() {
     private var _binding: FragmentSettingsSearchBinding? = null
@@ -175,14 +174,15 @@ class SettingsSearchFragment : Fragment() {
                 bottom = barInsets.bottom
             )
 
-            binding.settingsList.updateMargins(
-                left = leftInsets + sideMargin,
-                right = rightInsets + sideMargin
-            )
-            binding.divider.updateMargins(
-                left = leftInsets + sideMargin,
-                right = rightInsets + sideMargin
-            )
+            val mlpSettingsList = binding.settingsList.layoutParams as ViewGroup.MarginLayoutParams
+            mlpSettingsList.leftMargin = leftInsets + sideMargin
+            mlpSettingsList.rightMargin = rightInsets + sideMargin
+            binding.settingsList.layoutParams = mlpSettingsList
+
+            val mlpDivider = binding.divider.layoutParams as ViewGroup.MarginLayoutParams
+            mlpDivider.leftMargin = leftInsets + sideMargin
+            mlpDivider.rightMargin = rightInsets + sideMargin
+            binding.divider.layoutParams = mlpDivider
 
             windowInsets
         }

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

@@ -8,6 +8,7 @@ import android.os.Bundle
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
+import android.view.ViewGroup.MarginLayoutParams
 import androidx.appcompat.app.AppCompatActivity
 import androidx.core.view.ViewCompat
 import androidx.core.view.WindowInsetsCompat
@@ -26,7 +27,6 @@ import org.yuzu.yuzu_emu.databinding.FragmentGamesBinding
 import org.yuzu.yuzu_emu.layout.AutofitGridLayoutManager
 import org.yuzu.yuzu_emu.model.GamesViewModel
 import org.yuzu.yuzu_emu.model.HomeViewModel
-import org.yuzu.yuzu_emu.utils.ViewUtils.updateMargins
 
 class GamesFragment : Fragment() {
     private var _binding: FragmentGamesBinding? = null
@@ -169,16 +169,15 @@ class GamesFragment : Fragment() {
 
             val leftInsets = barInsets.left + cutoutInsets.left
             val rightInsets = barInsets.right + cutoutInsets.right
-            val left: Int
-            val right: Int
+            val mlpSwipe = binding.swipeRefresh.layoutParams as MarginLayoutParams
             if (ViewCompat.getLayoutDirection(view) == ViewCompat.LAYOUT_DIRECTION_LTR) {
-                left = leftInsets + spacingNavigationRail
-                right = rightInsets
+                mlpSwipe.leftMargin = leftInsets + spacingNavigationRail
+                mlpSwipe.rightMargin = rightInsets
             } else {
-                left = leftInsets
-                right = rightInsets + spacingNavigationRail
+                mlpSwipe.leftMargin = leftInsets
+                mlpSwipe.rightMargin = rightInsets + spacingNavigationRail
             }
-            binding.swipeRefresh.updateMargins(left = left, right = right)
+            binding.swipeRefresh.layoutParams = mlpSwipe
 
             binding.noticeText.updatePadding(bottom = spacingNavigation)
 

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

@@ -34,6 +34,7 @@ import kotlinx.coroutines.launch
 import org.yuzu.yuzu_emu.HomeNavigationDirections
 import org.yuzu.yuzu_emu.NativeLibrary
 import org.yuzu.yuzu_emu.R
+import org.yuzu.yuzu_emu.activities.EmulationActivity
 import org.yuzu.yuzu_emu.databinding.ActivityMainBinding
 import org.yuzu.yuzu_emu.features.settings.model.Settings
 import org.yuzu.yuzu_emu.fragments.AddGameFolderDialogFragment
@@ -176,6 +177,9 @@ class MainActivity : AppCompatActivity(), ThemeProvider {
             }
         }
 
+        // Dismiss previous notifications (should not happen unless a crash occurred)
+        EmulationActivity.stopForegroundService(this)
+
         setInsets()
     }
 
@@ -294,6 +298,11 @@ class MainActivity : AppCompatActivity(), ThemeProvider {
         super.onResume()
     }
 
+    override fun onDestroy() {
+        EmulationActivity.stopForegroundService(this)
+        super.onDestroy()
+    }
+
     private fun setInsets() =
         ViewCompat.setOnApplyWindowInsetsListener(
             binding.root

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

@@ -0,0 +1,70 @@
+// SPDX-FileCopyrightText: 2023 yuzu Emulator Project
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+package org.yuzu.yuzu_emu.utils
+
+import android.app.PendingIntent
+import android.app.Service
+import android.content.Intent
+import android.os.IBinder
+import androidx.core.app.NotificationCompat
+import androidx.core.app.NotificationManagerCompat
+import org.yuzu.yuzu_emu.R
+import org.yuzu.yuzu_emu.activities.EmulationActivity
+
+/**
+ * A service that shows a permanent notification in the background to avoid the app getting
+ * cleared from memory by the system.
+ */
+class ForegroundService : Service() {
+    companion object {
+        const val EMULATION_RUNNING_NOTIFICATION = 0x1000
+
+        const val ACTION_STOP = "stop"
+    }
+
+    private fun showRunningNotification() {
+        // Intent is used to resume emulation if the notification is clicked
+        val contentIntent = PendingIntent.getActivity(
+            this,
+            0,
+            Intent(this, EmulationActivity::class.java),
+            PendingIntent.FLAG_IMMUTABLE
+        )
+        val builder =
+            NotificationCompat.Builder(this, getString(R.string.emulation_notification_channel_id))
+                .setSmallIcon(R.drawable.ic_stat_notification_logo)
+                .setContentTitle(getString(R.string.app_name))
+                .setContentText(getString(R.string.emulation_notification_running))
+                .setPriority(NotificationCompat.PRIORITY_LOW)
+                .setOngoing(true)
+                .setVibrate(null)
+                .setSound(null)
+                .setContentIntent(contentIntent)
+        startForeground(EMULATION_RUNNING_NOTIFICATION, builder.build())
+    }
+
+    override fun onBind(intent: Intent): IBinder? {
+        return null
+    }
+
+    override fun onCreate() {
+        showRunningNotification()
+    }
+
+    override fun onStartCommand(intent: Intent?, flags: Int, startId: Int): Int {
+        if (intent == null) {
+            return START_NOT_STICKY
+        }
+        if (intent.action == ACTION_STOP) {
+            NotificationManagerCompat.from(this).cancel(EMULATION_RUNNING_NOTIFICATION)
+            stopForeground(STOP_FOREGROUND_REMOVE)
+            stopSelfResult(startId)
+        }
+        return START_STICKY
+    }
+
+    override fun onDestroy() {
+        NotificationManagerCompat.from(this).cancel(EMULATION_RUNNING_NOTIFICATION)
+    }
+}

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

@@ -4,7 +4,6 @@
 package org.yuzu.yuzu_emu.utils
 
 import android.view.View
-import android.view.ViewGroup
 
 object ViewUtils {
     fun showView(view: View, length: Long = 300) {
@@ -33,28 +32,4 @@ object ViewUtils {
             view.visibility = View.INVISIBLE
         }.start()
     }
-
-    fun View.updateMargins(
-        left: Int = -1,
-        top: Int = -1,
-        right: Int = -1,
-        bottom: Int = -1
-    ) {
-        val layoutParams = this.layoutParams as ViewGroup.MarginLayoutParams
-        layoutParams.apply {
-            if (left != -1) {
-                leftMargin = left
-            }
-            if (top != -1) {
-                topMargin = top
-            }
-            if (right != -1) {
-                rightMargin = right
-            }
-            if (bottom != -1) {
-                bottomMargin = bottom
-            }
-        }
-        this.layoutParams = layoutParams
-    }
 }

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

@@ -60,8 +60,6 @@ struct Values {
                                             Settings::Category::Overlay};
     Settings::Setting<bool> show_performance_overlay{linkage, true, "show_performance_overlay",
                                                      Settings::Category::Overlay};
-    Settings::Setting<bool> show_thermal_overlay{linkage, false, "show_thermal_overlay",
-                                                 Settings::Category::Overlay};
     Settings::Setting<bool> show_input_overlay{linkage, true, "show_input_overlay",
                                                Settings::Category::Overlay};
     Settings::Setting<bool> touchscreen{linkage, true, "touchscreen", Settings::Category::Overlay};

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

@@ -140,7 +140,6 @@
             android:id="@+id/overlay_container"
             android:layout_width="match_parent"
             android:layout_height="match_parent"
-            android:layout_marginHorizontal="20dp"
             android:fitsSystemWindows="true">
 
             <com.google.android.material.textview.MaterialTextView
@@ -151,19 +150,7 @@
                 android:layout_gravity="left"
                 android:clickable="false"
                 android:focusable="false"
-                android:textColor="@android:color/white"
-                android:shadowColor="@android:color/black"
-                android:shadowRadius="3"
-                tools:ignore="RtlHardcoded" />
-
-            <com.google.android.material.textview.MaterialTextView
-                android:id="@+id/show_thermals_text"
-                style="@style/TextAppearance.Material3.BodySmall"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_gravity="right"
-                android:clickable="false"
-                android:focusable="false"
+                android:paddingHorizontal="20dp"
                 android:textColor="@android:color/white"
                 android:shadowColor="@android:color/black"
                 android:shadowRadius="3"

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

@@ -6,11 +6,6 @@
         android:title="@string/emulation_fps_counter"
         android:checkable="true" />
 
-    <item
-        android:id="@+id/thermal_indicator"
-        android:title="@string/emulation_thermal_indicator"
-        android:checkable="true" />
-
     <item
         android:id="@+id/menu_edit_overlay"
         android:title="@string/emulation_touch_overlay_edit" />

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

@@ -1,6 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources xmlns:tools="http://schemas.android.com/tools" tools:ignore="MissingTranslation">
 
+    <string name="emulation_notification_channel_name">المحاكي نشط</string>
+    <string name="emulation_notification_channel_description">اظهار اشعار دائم عندما يكون المحاكي نشطاً</string>
+    <string name="emulation_notification_running">يوزو قيد التشغيل</string>
     <string name="notice_notification_channel_name">الإشعارات والأخطاء</string>
     <string name="notice_notification_channel_description">اظهار اشعار عند حصول اي مشكلة.</string>
     <string name="notification_permission_not_granted">لم يتم منح إذن الإشعار</string>

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

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

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

@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources xmlns:tools="http://schemas.android.com/tools" tools:ignore="MissingTranslation">
 
+    <string name="emulation_notification_channel_name">Emulace je aktivní</string>
     <string name="notice_notification_channel_name">Upozornění a chyby</string>
     <string name="notice_notification_channel_description">Ukáže oznámení v případě chyby.</string>
     <string name="notification_permission_not_granted">Oznámení nejsou oprávněna!</string>

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

@@ -2,6 +2,9 @@
 <resources xmlns:tools="http://schemas.android.com/tools" tools:ignore="MissingTranslation">
 
     <string name="app_disclaimer">此軟體可以執行 Nintendo Switch 主機遊戲，但不包含任何遊戲和金鑰。&lt;br /&gt;&lt;br /&gt;在您開始前，請找到放置於您的裝置儲存空間的 <![CDATA[<b> prod.keys </b>]]> 檔案。&lt;br /&gt;&lt;br /&gt;<![CDATA[<a href=\"https://yuzu-emu.org/help/quickstart\">深入瞭解</a>]]></string>
+    <string name="emulation_notification_channel_name">模擬進行中</string>
+    <string name="emulation_notification_channel_description">在模擬執行時顯示持續通知。</string>
+    <string name="emulation_notification_running">yuzu 正在執行</string>
     <string name="notice_notification_channel_name">通知和錯誤</string>
     <string name="notice_notification_channel_description">發生錯誤時顯示通知。</string>
     <string name="notification_permission_not_granted">未授予通知權限！</string>

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

@@ -4,6 +4,10 @@
     <!-- General application strings -->
     <string name="app_name" translatable="false">yuzu</string>
     <string name="app_disclaimer">This software will run games for the Nintendo Switch game console. No game titles or keys are included.&lt;br /&gt;&lt;br /&gt;Before you begin, please locate your <![CDATA[<b> prod.keys </b>]]> file on your device storage.&lt;br /&gt;&lt;br /&gt;<![CDATA[<a href="https://yuzu-emu.org/help/quickstart">Learn more</a>]]></string>
+    <string name="emulation_notification_channel_name">Emulation is Active</string>
+    <string name="emulation_notification_channel_id" translatable="false">emulationIsActive</string>
+    <string name="emulation_notification_channel_description">Shows a persistent notification when emulation is running.</string>
+    <string name="emulation_notification_running">yuzu is running</string>
     <string name="notice_notification_channel_name">Notices and errors</string>
     <string name="notice_notification_channel_id" translatable="false">noticesAndErrors</string>
     <string name="notice_notification_channel_description">Shows notifications when something goes wrong.</string>
@@ -376,7 +380,6 @@
     <string name="emulation_exit">Exit emulation</string>
     <string name="emulation_done">Done</string>
     <string name="emulation_fps_counter">FPS counter</string>
-    <string name="emulation_thermal_indicator">Thermal indicator</string>
     <string name="emulation_toggle_controls">Toggle controls</string>
     <string name="emulation_rel_stick_center">Relative stick center</string>
     <string name="emulation_dpad_slide">D-pad slide</string>

src/common/android/android_common.cpp

@@ -8,8 +8,8 @@
 
 #include <jni.h>
 
-#include "common/android/id_cache.h"
 #include "common/string_util.h"
+#include "id_cache.h"
 
 namespace Common::Android {
 

src/common/android/id_cache.cpp

@@ -4,9 +4,9 @@
 #include <jni.h>
 
 #include "applets/software_keyboard.h"
-#include "common/android/id_cache.h"
 #include "common/assert.h"
 #include "common/fs/fs_android.h"
+#include "id_cache.h"
 #include "video_core/rasterizer_interface.h"
 
 static JavaVM* s_java_vm;

src/common/fs/fs_android.cpp

@@ -44,7 +44,7 @@ bool IsContentUri(const std::string& path) {
     return path.find(prefix) == 0;
 }
 
-s32 OpenContentUri(const std::string& filepath, OpenMode openmode) {
+int OpenContentUri(const std::string& filepath, OpenMode openmode) {
     if (s_open_content_uri == nullptr)
         return -1;
 
@@ -63,7 +63,7 @@ s32 OpenContentUri(const std::string& filepath, OpenMode openmode) {
     return env->CallStaticIntMethod(native_library, s_open_content_uri, j_filepath, j_mode);
 }
 
-u64 GetSize(const std::string& filepath) {
+std::uint64_t GetSize(const std::string& filepath) {
     if (s_get_size == nullptr) {
         return 0;
     }

src/core/CMakeLists.txt

@@ -548,6 +548,8 @@ add_library(core STATIC
     hle/service/es/es.h
     hle/service/eupld/eupld.cpp
     hle/service/eupld/eupld.h
+    hle/service/event.cpp
+    hle/service/event.h
     hle/service/fatal/fatal.cpp
     hle/service/fatal/fatal.h
     hle/service/fatal/fatal_p.cpp
@@ -674,6 +676,8 @@ add_library(core STATIC
     hle/service/mm/mm_u.h
     hle/service/mnpp/mnpp_app.cpp
     hle/service/mnpp/mnpp_app.h
+    hle/service/mutex.cpp
+    hle/service/mutex.h
     hle/service/ncm/ncm.cpp
     hle/service/ncm/ncm.h
     hle/service/nfc/common/amiibo_crypto.cpp
@@ -786,15 +790,6 @@ add_library(core STATIC
     hle/service/nvnflinger/window.h
     hle/service/olsc/olsc.cpp
     hle/service/olsc/olsc.h
-    hle/service/os/event.cpp
-    hle/service/os/event.h
-    hle/service/os/multi_wait_holder.cpp
-    hle/service/os/multi_wait_holder.h
-    hle/service/os/multi_wait_utils.h
-    hle/service/os/multi_wait.cpp
-    hle/service/os/multi_wait.h
-    hle/service/os/mutex.cpp
-    hle/service/os/mutex.h
     hle/service/pcie/pcie.cpp
     hle/service/pcie/pcie.h
     hle/service/pctl/pctl.cpp

src/core/device_memory_manager.inc

@@ -532,7 +532,6 @@ void DeviceMemoryManager<Traits>::UpdatePagesCachedCount(DAddr addr, size_t size
             cache_bytes = 0;
         }
     };
-    size_t old_vpage = (base_vaddress >> Memory::YUZU_PAGEBITS) - 1;
     for (; page != page_end; ++page) {
         CounterAtomicType& count = cached_pages->at(page >> subentries_shift).Count(page);
         auto [asid_2, vpage] = ExtractCPUBacking(page);
@@ -548,12 +547,6 @@ void DeviceMemoryManager<Traits>::UpdatePagesCachedCount(DAddr addr, size_t size
             memory_device_inter = registered_processes[asid_2.id];
         }
 
-        if (vpage != old_vpage + 1) [[unlikely]] {
-            release_pending();
-        }
-
-        old_vpage = vpage;
-
         // Adds or subtracts 1, as count is a unsigned 8-bit value
         count.fetch_add(static_cast<CounterType>(delta), std::memory_order_release);
 

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

@@ -9,8 +9,8 @@
 #include "common/math_util.h"
 #include "core/hle/service/apm/apm_controller.h"
 #include "core/hle/service/caps/caps_types.h"
+#include "core/hle/service/event.h"
 #include "core/hle/service/kernel_helpers.h"
-#include "core/hle/service/os/event.h"
 #include "core/hle/service/service.h"
 
 #include "core/hle/service/am/am_types.h"

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

@@ -7,8 +7,8 @@
 #include <memory>
 #include <mutex>
 
+#include "core/hle/service/event.h"
 #include "core/hle/service/kernel_helpers.h"
-#include "core/hle/service/os/event.h"
 
 union Result;
 

src/core/hle/service/cmif_serialization.h

@@ -280,7 +280,7 @@ void ReadInArgument(bool is_domain, CallArguments& args, const u8* raw_data, HLE
 
             u32 value{};
             std::memcpy(&value, raw_data + ArgOffset, ArgSize);
-            std::get<ArgIndex>(args) = ctx.GetDomainHandler<typename ArgType::element_type>(value - 1);
+            std::get<ArgIndex>(args) = ctx.GetDomainHandler<ArgType::Type>(value - 1);
 
             return ReadInArgument<MethodArguments, CallArguments, ArgAlign, ArgEnd, HandleIndex, InBufferIndex, OutBufferIndex, true, ArgIndex + 1>(is_domain, args, raw_data, ctx, temp);
         } else if constexpr (ArgumentTraits<ArgType>::Type == ArgumentType::InCopyHandle) {

src/core/hle/service/cmif_types.h

@@ -65,14 +65,6 @@ struct ClientProcessId {
 };
 
 struct ProcessId {
-    explicit ProcessId() : pid() {}
-    explicit ProcessId(u64 p) : pid(p) {}
-    /* implicit */ ProcessId(const ClientProcessId& c) : pid(c.pid) {}
-
-    bool operator==(const ProcessId& rhs) const {
-        return pid == rhs.pid;
-    }
-
     explicit operator bool() const {
         return pid != 0;
     }
@@ -270,7 +262,7 @@ class OutLargeData {
 public:
     static_assert(std::is_trivially_copyable_v<T>, "LargeData type must be trivially copyable");
     static_assert((A & BufferAttr_In) == 0, "OutLargeData attr must not be In");
-    static constexpr BufferAttr Attr = static_cast<BufferAttr>(A | BufferAttr_Out | BufferAttr_FixedSize);
+    static constexpr BufferAttr Attr = static_cast<BufferAttr>(A | BufferAttr_In | BufferAttr_FixedSize);
     using Type = T;
 
     /* implicit */ OutLargeData(const OutLargeData& t) : raw(t.raw) {}
@@ -299,4 +291,4 @@ private:
 };
 // clang-format on
 
-} // namespace Service
+} // namespace Service

src/core/hle/service/event.cpp

@@ -2,8 +2,8 @@
 // SPDX-License-Identifier: GPL-2.0-or-later
 
 #include "core/hle/kernel/k_event.h"
+#include "core/hle/service/event.h"
 #include "core/hle/service/kernel_helpers.h"
-#include "core/hle/service/os/event.h"
 
 namespace Service {
 

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

@@ -7,7 +7,6 @@
 #include "core/hle/service/glue/time/file_timestamp_worker.h"
 #include "core/hle/service/glue/time/standard_steady_clock_resource.h"
 #include "core/hle/service/glue/time/worker.h"
-#include "core/hle/service/os/multi_wait_utils.h"
 #include "core/hle/service/psc/time/common.h"
 #include "core/hle/service/psc/time/service_manager.h"
 #include "core/hle/service/psc/time/static.h"
@@ -144,46 +143,82 @@ void TimeWorker::ThreadFunc(std::stop_token stop_token) {
     Common::SetCurrentThreadName("TimeWorker");
     Common::SetCurrentThreadPriority(Common::ThreadPriority::Low);
 
+    enum class EventType {
+        Exit = 0,
+        IpmModuleService_GetEvent = 1,
+        PowerStateChange = 2,
+        SignalAlarms = 3,
+        UpdateLocalSystemClock = 4,
+        UpdateNetworkSystemClock = 5,
+        UpdateEphemeralSystemClock = 6,
+        UpdateSteadyClock = 7,
+        UpdateFileTimestamp = 8,
+        AutoCorrect = 9,
+        Max = 10,
+    };
+
+    s32 num_objs{};
+    std::array<Kernel::KSynchronizationObject*, static_cast<u32>(EventType::Max)> wait_objs{};
+    std::array<EventType, static_cast<u32>(EventType::Max)> wait_indices{};
+
+    const auto AddWaiter{
+        [&](Kernel::KSynchronizationObject* synchronization_object, EventType type) {
+            // Open a new reference to the object.
+            synchronization_object->Open();
+
+            // Insert into the list.
+            wait_indices[num_objs] = type;
+            wait_objs[num_objs++] = synchronization_object;
+        }};
+
     while (!stop_token.stop_requested()) {
-        enum class EventType : s32 {
-            Exit = 0,
-            PowerStateChange = 1,
-            SignalAlarms = 2,
-            UpdateLocalSystemClock = 3,
-            UpdateNetworkSystemClock = 4,
-            UpdateEphemeralSystemClock = 5,
-            UpdateSteadyClock = 6,
-            UpdateFileTimestamp = 7,
-            AutoCorrect = 8,
-        };
-
-        s32 index{};
+        SCOPE_EXIT({
+            for (s32 i = 0; i < num_objs; i++) {
+                wait_objs[i]->Close();
+            }
+        });
 
+        num_objs = {};
+        wait_objs = {};
         if (m_pm_state_change_handler.m_priority != 0) {
-            // TODO: gIPmModuleService::GetEvent() 1
-            index = WaitAny(m_system.Kernel(),
-                            &m_event->GetReadableEvent(), // 0
-                            &m_alarm_worker.GetEvent()    // 1
-            );
+            AddWaiter(&m_event->GetReadableEvent(), EventType::Exit);
+            // TODO
+            // AddWaiter(gIPmModuleService::GetEvent(), 1);
+            AddWaiter(&m_alarm_worker.GetEvent(), EventType::PowerStateChange);
         } else {
-            // TODO: gIPmModuleService::GetEvent() 1
-            index = WaitAny(m_system.Kernel(),
-                            &m_event->GetReadableEvent(),                       // 0
-                            &m_alarm_worker.GetEvent(),                         // 1
-                            &m_alarm_worker.GetTimerEvent().GetReadableEvent(), // 2
-                            m_local_clock_event,                                // 3
-                            m_network_clock_event,                              // 4
-                            m_ephemeral_clock_event,                            // 5
-                            &m_timer_steady_clock->GetReadableEvent(),          // 6
-                            &m_timer_file_system->GetReadableEvent(),           // 7
-                            m_standard_user_auto_correct_clock_event            // 8
-            );
+            AddWaiter(&m_event->GetReadableEvent(), EventType::Exit);
+            // TODO
+            // AddWaiter(gIPmModuleService::GetEvent(), 1);
+            AddWaiter(&m_alarm_worker.GetEvent(), EventType::PowerStateChange);
+            AddWaiter(&m_alarm_worker.GetTimerEvent().GetReadableEvent(), EventType::SignalAlarms);
+            AddWaiter(m_local_clock_event, EventType::UpdateLocalSystemClock);
+            AddWaiter(m_network_clock_event, EventType::UpdateNetworkSystemClock);
+            AddWaiter(m_ephemeral_clock_event, EventType::UpdateEphemeralSystemClock);
+            AddWaiter(&m_timer_steady_clock->GetReadableEvent(), EventType::UpdateSteadyClock);
+            AddWaiter(&m_timer_file_system->GetReadableEvent(), EventType::UpdateFileTimestamp);
+            AddWaiter(m_standard_user_auto_correct_clock_event, EventType::AutoCorrect);
         }
 
-        switch (static_cast<EventType>(index)) {
+        s32 out_index{-1};
+        Kernel::KSynchronizationObject::Wait(m_system.Kernel(), &out_index, wait_objs.data(),
+                                             num_objs, -1);
+        ASSERT(out_index >= 0 && out_index < num_objs);
+
+        if (stop_token.stop_requested()) {
+            return;
+        }
+
+        switch (wait_indices[out_index]) {
         case EventType::Exit:
             return;
 
+        case EventType::IpmModuleService_GetEvent:
+            // TODO
+            // IPmModuleService::GetEvent()
+            // clear the event
+            // Handle power state change event
+            break;
+
         case EventType::PowerStateChange:
             m_alarm_worker.GetEvent().Clear();
             if (m_pm_state_change_handler.m_priority <= 1) {
@@ -200,19 +235,19 @@ void TimeWorker::ThreadFunc(std::stop_token stop_token) {
             m_local_clock_event->Clear();
 
             Service::PSC::Time::SystemClockContext context{};
-            R_ASSERT(m_local_clock->GetSystemClockContext(&context));
+            auto res = m_local_clock->GetSystemClockContext(&context);
+            ASSERT(res == ResultSuccess);
 
             m_set_sys->SetUserSystemClockContext(context);
+
             m_file_timestamp_worker.SetFilesystemPosixTime();
-            break;
-        }
+        } break;
 
         case EventType::UpdateNetworkSystemClock: {
             m_network_clock_event->Clear();
-
             Service::PSC::Time::SystemClockContext context{};
-            R_ASSERT(m_network_clock->GetSystemClockContext(&context));
-
+            auto res = m_network_clock->GetSystemClockContext(&context);
+            ASSERT(res == ResultSuccess);
             m_set_sys->SetNetworkSystemClockContext(context);
 
             s64 time{};
@@ -232,8 +267,7 @@ void TimeWorker::ThreadFunc(std::stop_token stop_token) {
             }
 
             m_file_timestamp_worker.SetFilesystemPosixTime();
-            break;
-        }
+        } break;
 
         case EventType::UpdateEphemeralSystemClock: {
             m_ephemeral_clock_event->Clear();
@@ -261,8 +295,7 @@ void TimeWorker::ThreadFunc(std::stop_token stop_token) {
             if (!g_ig_report_ephemeral_clock_context_set) {
                 g_ig_report_ephemeral_clock_context_set = true;
             }
-            break;
-        }
+        } break;
 
         case EventType::UpdateSteadyClock:
             m_timer_steady_clock->Clear();
@@ -281,20 +314,21 @@ void TimeWorker::ThreadFunc(std::stop_token stop_token) {
             m_standard_user_auto_correct_clock_event->Clear();
 
             bool automatic_correction{};
-            R_ASSERT(m_time_sm->IsStandardUserSystemClockAutomaticCorrectionEnabled(
-                &automatic_correction));
+            auto res = m_time_sm->IsStandardUserSystemClockAutomaticCorrectionEnabled(
+                &automatic_correction);
+            ASSERT(res == ResultSuccess);
 
             Service::PSC::Time::SteadyClockTimePoint time_point{};
-            R_ASSERT(
-                m_time_sm->GetStandardUserSystemClockAutomaticCorrectionUpdatedTime(&time_point));
+            res = m_time_sm->GetStandardUserSystemClockAutomaticCorrectionUpdatedTime(&time_point);
+            ASSERT(res == ResultSuccess);
 
             m_set_sys->SetUserSystemClockAutomaticCorrectionEnabled(automatic_correction);
             m_set_sys->SetUserSystemClockAutomaticCorrectionUpdatedTime(time_point);
-            break;
-        }
+        } break;
 
         default:
             UNREACHABLE();
+            break;
         }
     }
 }

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

@@ -36,7 +36,7 @@ void LoopProcess(Core::System& system) {
     server_manager->RegisterNamedService(
         "hid:sys", std::make_shared<IHidSystemServer>(system, resource_manager, firmware_settings));
 
-    server_manager->RegisterNamedService("hidbus", std::make_shared<Hidbus>(system));
+    server_manager->RegisterNamedService("hidbus", std::make_shared<HidBus>(system));
 
     server_manager->RegisterNamedService("irs", std::make_shared<IRS::IRS>(system));
     server_manager->RegisterNamedService("irs:sys", std::make_shared<IRS::IRS_SYS>(system));

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

@@ -9,7 +9,6 @@
 #include "core/hle/kernel/k_readable_event.h"
 #include "core/hle/kernel/k_shared_memory.h"
 #include "core/hle/kernel/k_transfer_memory.h"
-#include "core/hle/service/cmif_serialization.h"
 #include "core/hle/service/hid/hidbus.h"
 #include "core/hle/service/ipc_helpers.h"
 #include "core/hle/service/service.h"
@@ -23,25 +22,25 @@ namespace Service::HID {
 // (15ms, 66Hz)
 constexpr auto hidbus_update_ns = std::chrono::nanoseconds{15 * 1000 * 1000};
 
-Hidbus::Hidbus(Core::System& system_)
+HidBus::HidBus(Core::System& system_)
     : ServiceFramework{system_, "hidbus"}, service_context{system_, service_name} {
 
     // clang-format off
     static const FunctionInfo functions[] = {
-            {1, C<&Hidbus::GetBusHandle>, "GetBusHandle"},
-            {2, C<&Hidbus::IsExternalDeviceConnected>, "IsExternalDeviceConnected"},
-            {3, C<&Hidbus::Initialize>, "Initialize"},
-            {4, C<&Hidbus::Finalize>, "Finalize"},
-            {5, C<&Hidbus::EnableExternalDevice>, "EnableExternalDevice"},
-            {6, C<&Hidbus::GetExternalDeviceId>, "GetExternalDeviceId"},
-            {7, C<&Hidbus::SendCommandAsync>, "SendCommandAsync"},
-            {8, C<&Hidbus::GetSendCommandAsynceResult>, "GetSendCommandAsynceResult"},
-            {9, C<&Hidbus::SetEventForSendCommandAsycResult>, "SetEventForSendCommandAsycResult"},
-            {10, C<&Hidbus::GetSharedMemoryHandle>, "GetSharedMemoryHandle"},
-            {11, C<&Hidbus::EnableJoyPollingReceiveMode>, "EnableJoyPollingReceiveMode"},
-            {12, C<&Hidbus::DisableJoyPollingReceiveMode>, "DisableJoyPollingReceiveMode"},
+            {1, &HidBus::GetBusHandle, "GetBusHandle"},
+            {2, &HidBus::IsExternalDeviceConnected, "IsExternalDeviceConnected"},
+            {3, &HidBus::Initialize, "Initialize"},
+            {4, &HidBus::Finalize, "Finalize"},
+            {5, &HidBus::EnableExternalDevice, "EnableExternalDevice"},
+            {6, &HidBus::GetExternalDeviceId, "GetExternalDeviceId"},
+            {7, &HidBus::SendCommandAsync, "SendCommandAsync"},
+            {8, &HidBus::GetSendCommandAsynceResult, "GetSendCommandAsynceResult"},
+            {9, &HidBus::SetEventForSendCommandAsycResult, "SetEventForSendCommandAsycResult"},
+            {10, &HidBus::GetSharedMemoryHandle, "GetSharedMemoryHandle"},
+            {11, &HidBus::EnableJoyPollingReceiveMode, "EnableJoyPollingReceiveMode"},
+            {12, &HidBus::DisableJoyPollingReceiveMode, "DisableJoyPollingReceiveMode"},
             {13, nullptr, "GetPollingData"},
-            {14, C<&Hidbus::SetStatusManagerType>, "SetStatusManagerType"},
+            {14, &HidBus::SetStatusManagerType, "SetStatusManagerType"},
     };
     // clang-format on
 
@@ -61,11 +60,11 @@ Hidbus::Hidbus(Core::System& system_)
                                               hidbus_update_event);
 }
 
-Hidbus::~Hidbus() {
+HidBus::~HidBus() {
     system.CoreTiming().UnscheduleEvent(hidbus_update_event);
 }
 
-void Hidbus::UpdateHidbus(std::chrono::nanoseconds ns_late) {
+void HidBus::UpdateHidbus(std::chrono::nanoseconds ns_late) {
     if (is_hidbus_enabled) {
         for (std::size_t i = 0; i < devices.size(); ++i) {
             if (!devices[i].is_device_initialized) {
@@ -85,7 +84,7 @@ void Hidbus::UpdateHidbus(std::chrono::nanoseconds ns_late) {
     }
 }
 
-std::optional<std::size_t> Hidbus::GetDeviceIndexFromHandle(BusHandle handle) const {
+std::optional<std::size_t> HidBus::GetDeviceIndexFromHandle(BusHandle handle) const {
     for (std::size_t i = 0; i < devices.size(); ++i) {
         const auto& device_handle = devices[i].handle;
         if (handle.abstracted_pad_id == device_handle.abstracted_pad_id &&
@@ -99,11 +98,20 @@ std::optional<std::size_t> Hidbus::GetDeviceIndexFromHandle(BusHandle handle) co
     return std::nullopt;
 }
 
-Result Hidbus::GetBusHandle(Out<bool> out_is_valid, Out<BusHandle> out_bus_handle,
-                            Core::HID::NpadIdType npad_id, BusType bus_type,
-                            AppletResourceUserId aruid) {
-    LOG_INFO(Service_HID, "called, npad_id={}, bus_type={}, applet_resource_user_id={}", npad_id,
-             bus_type, aruid.pid);
+void HidBus::GetBusHandle(HLERequestContext& ctx) {
+    IPC::RequestParser rp{ctx};
+    struct Parameters {
+        Core::HID::NpadIdType npad_id;
+        INSERT_PADDING_WORDS_NOINIT(1);
+        BusType bus_type;
+        u64 applet_resource_user_id;
+    };
+    static_assert(sizeof(Parameters) == 0x18, "Parameters has incorrect size.");
+
+    const auto parameters{rp.PopRaw<Parameters>()};
+
+    LOG_INFO(Service_HID, "called, npad_id={}, bus_type={}, applet_resource_user_id={}",
+             parameters.npad_id, parameters.bus_type, parameters.applet_resource_user_id);
 
     bool is_handle_found = 0;
     std::size_t handle_index = 0;
@@ -113,8 +121,8 @@ Result Hidbus::GetBusHandle(Out<bool> out_is_valid, Out<BusHandle> out_bus_handl
         if (!handle.is_valid) {
             continue;
         }
-        if (handle.player_number.As<Core::HID::NpadIdType>() == npad_id &&
-            handle.bus_type_id == static_cast<u8>(bus_type)) {
+        if (static_cast<Core::HID::NpadIdType>(handle.player_number) == parameters.npad_id &&
+            handle.bus_type_id == static_cast<u8>(parameters.bus_type)) {
             is_handle_found = true;
             handle_index = i;
             break;
@@ -127,231 +135,388 @@ Result Hidbus::GetBusHandle(Out<bool> out_is_valid, Out<BusHandle> out_bus_handl
             if (devices[i].handle.is_valid) {
                 continue;
             }
-            devices[i].handle.raw = 0;
-            devices[i].handle.abstracted_pad_id.Assign(i);
-            devices[i].handle.internal_index.Assign(i);
-            devices[i].handle.player_number.Assign(static_cast<u8>(npad_id));
-            devices[i].handle.bus_type_id.Assign(static_cast<u8>(bus_type));
-            devices[i].handle.is_valid.Assign(true);
+            devices[i].handle = {
+                .abstracted_pad_id = static_cast<u8>(i),
+                .internal_index = static_cast<u8>(i),
+                .player_number = static_cast<u8>(parameters.npad_id),
+                .bus_type_id = static_cast<u8>(parameters.bus_type),
+                .is_valid = true,
+            };
             handle_index = i;
             break;
         }
     }
 
-    *out_is_valid = true;
-    *out_bus_handle = devices[handle_index].handle;
-    R_SUCCEED();
+    struct OutData {
+        bool is_valid;
+        INSERT_PADDING_BYTES(7);
+        BusHandle handle;
+    };
+    static_assert(sizeof(OutData) == 0x10, "OutData has incorrect size.");
+
+    const OutData out_data{
+        .is_valid = true,
+        .handle = devices[handle_index].handle,
+    };
+
+    IPC::ResponseBuilder rb{ctx, 6};
+    rb.Push(ResultSuccess);
+    rb.PushRaw(out_data);
 }
 
-Result Hidbus::IsExternalDeviceConnected(Out<bool> out_is_connected, BusHandle bus_handle) {
+void HidBus::IsExternalDeviceConnected(HLERequestContext& ctx) {
+    IPC::RequestParser rp{ctx};
+    const auto bus_handle_{rp.PopRaw<BusHandle>()};
+
     LOG_INFO(Service_HID,
              "Called, abstracted_pad_id={}, bus_type={}, internal_index={}, "
              "player_number={}, is_valid={}",
-             bus_handle.abstracted_pad_id, bus_handle.bus_type_id, bus_handle.internal_index,
-             bus_handle.player_number, bus_handle.is_valid);
+             bus_handle_.abstracted_pad_id, bus_handle_.bus_type_id, bus_handle_.internal_index,
+             bus_handle_.player_number, bus_handle_.is_valid);
 
-    const auto device_index = GetDeviceIndexFromHandle(bus_handle);
+    const auto device_index = GetDeviceIndexFromHandle(bus_handle_);
 
-    R_UNLESS(device_index.has_value(), ResultUnknown);
+    if (device_index) {
+        const auto& device = devices[device_index.value()].device;
+        const bool is_attached = device->IsDeviceActivated();
 
-    *out_is_connected = devices[device_index.value()].device->IsDeviceActivated();
-    R_SUCCEED();
+        IPC::ResponseBuilder rb{ctx, 3};
+        rb.Push(ResultSuccess);
+        rb.Push(is_attached);
+        return;
+    }
+
+    LOG_ERROR(Service_HID, "Invalid handle");
+    IPC::ResponseBuilder rb{ctx, 2};
+    rb.Push(ResultUnknown);
+    return;
 }
 
-Result Hidbus::Initialize(BusHandle bus_handle, AppletResourceUserId aruid) {
+void HidBus::Initialize(HLERequestContext& ctx) {
+    IPC::RequestParser rp{ctx};
+    const auto bus_handle_{rp.PopRaw<BusHandle>()};
+    const auto applet_resource_user_id{rp.Pop<u64>()};
+
     LOG_INFO(Service_HID,
              "called, abstracted_pad_id={} bus_type={} internal_index={} "
              "player_number={} is_valid={}, applet_resource_user_id={}",
-             bus_handle.abstracted_pad_id, bus_handle.bus_type_id, bus_handle.internal_index,
-             bus_handle.player_number, bus_handle.is_valid, aruid.pid);
+             bus_handle_.abstracted_pad_id, bus_handle_.bus_type_id, bus_handle_.internal_index,
+             bus_handle_.player_number, bus_handle_.is_valid, applet_resource_user_id);
 
     is_hidbus_enabled = true;
 
-    const auto device_index = GetDeviceIndexFromHandle(bus_handle);
+    const auto device_index = GetDeviceIndexFromHandle(bus_handle_);
 
-    R_UNLESS(device_index.has_value(), ResultUnknown);
+    if (device_index) {
+        const auto entry_index = devices[device_index.value()].handle.internal_index;
+        auto& cur_entry = hidbus_status.entries[entry_index];
 
-    const auto entry_index = devices[device_index.value()].handle.internal_index;
-    auto& cur_entry = hidbus_status.entries[entry_index];
+        if (bus_handle_.internal_index == 0 && Settings::values.enable_ring_controller) {
+            MakeDevice<RingController>(bus_handle_);
+            devices[device_index.value()].is_device_initialized = true;
+            devices[device_index.value()].device->ActivateDevice();
+            cur_entry.is_in_focus = true;
+            cur_entry.is_connected = true;
+            cur_entry.is_connected_result = ResultSuccess;
+            cur_entry.is_enabled = false;
+            cur_entry.is_polling_mode = false;
+        } else {
+            MakeDevice<HidbusStubbed>(bus_handle_);
+            devices[device_index.value()].is_device_initialized = true;
+            cur_entry.is_in_focus = true;
+            cur_entry.is_connected = false;
+            cur_entry.is_connected_result = ResultSuccess;
+            cur_entry.is_enabled = false;
+            cur_entry.is_polling_mode = false;
+        }
+
+        std::memcpy(system.Kernel().GetHidBusSharedMem().GetPointer(), &hidbus_status,
+                    sizeof(hidbus_status));
+
+        IPC::ResponseBuilder rb{ctx, 2};
+        rb.Push(ResultSuccess);
+        return;
+    }
+
+    LOG_ERROR(Service_HID, "Invalid handle");
+    IPC::ResponseBuilder rb{ctx, 2};
+    rb.Push(ResultUnknown);
+    return;
+}
+
+void HidBus::Finalize(HLERequestContext& ctx) {
+    IPC::RequestParser rp{ctx};
+    const auto bus_handle_{rp.PopRaw<BusHandle>()};
+    const auto applet_resource_user_id{rp.Pop<u64>()};
+
+    LOG_INFO(Service_HID,
+             "called, abstracted_pad_id={}, bus_type={}, internal_index={}, "
+             "player_number={}, is_valid={}, applet_resource_user_id={}",
+             bus_handle_.abstracted_pad_id, bus_handle_.bus_type_id, bus_handle_.internal_index,
+             bus_handle_.player_number, bus_handle_.is_valid, applet_resource_user_id);
+
+    const auto device_index = GetDeviceIndexFromHandle(bus_handle_);
+
+    if (device_index) {
+        const auto entry_index = devices[device_index.value()].handle.internal_index;
+        auto& cur_entry = hidbus_status.entries[entry_index];
+        auto& device = devices[device_index.value()].device;
+        devices[device_index.value()].is_device_initialized = false;
+        device->DeactivateDevice();
 
-    if (bus_handle.internal_index == 0 && Settings::values.enable_ring_controller) {
-        MakeDevice<RingController>(bus_handle);
-        devices[device_index.value()].is_device_initialized = true;
-        devices[device_index.value()].device->ActivateDevice();
-        cur_entry.is_in_focus = true;
-        cur_entry.is_connected = true;
-        cur_entry.is_connected_result = ResultSuccess;
-        cur_entry.is_enabled = false;
-        cur_entry.is_polling_mode = false;
-    } else {
-        MakeDevice<HidbusStubbed>(bus_handle);
-        devices[device_index.value()].is_device_initialized = true;
         cur_entry.is_in_focus = true;
         cur_entry.is_connected = false;
         cur_entry.is_connected_result = ResultSuccess;
         cur_entry.is_enabled = false;
         cur_entry.is_polling_mode = false;
+        std::memcpy(system.Kernel().GetHidBusSharedMem().GetPointer(), &hidbus_status,
+                    sizeof(hidbus_status));
+
+        IPC::ResponseBuilder rb{ctx, 2};
+        rb.Push(ResultSuccess);
+        return;
     }
 
-    std::memcpy(system.Kernel().GetHidBusSharedMem().GetPointer(), &hidbus_status,
-                sizeof(hidbus_status));
-    R_SUCCEED();
+    LOG_ERROR(Service_HID, "Invalid handle");
+    IPC::ResponseBuilder rb{ctx, 2};
+    rb.Push(ResultUnknown);
+    return;
 }
 
-Result Hidbus::Finalize(BusHandle bus_handle, AppletResourceUserId aruid) {
-    LOG_INFO(Service_HID,
-             "called, abstracted_pad_id={}, bus_type={}, internal_index={}, "
-             "player_number={}, is_valid={}, applet_resource_user_id={}",
-             bus_handle.abstracted_pad_id, bus_handle.bus_type_id, bus_handle.internal_index,
-             bus_handle.player_number, bus_handle.is_valid, aruid.pid);
+void HidBus::EnableExternalDevice(HLERequestContext& ctx) {
+    IPC::RequestParser rp{ctx};
+    struct Parameters {
+        bool enable;
+        INSERT_PADDING_BYTES_NOINIT(7);
+        BusHandle bus_handle;
+        u64 inval;
+        u64 applet_resource_user_id;
+    };
+    static_assert(sizeof(Parameters) == 0x20, "Parameters has incorrect size.");
 
-    const auto device_index = GetDeviceIndexFromHandle(bus_handle);
+    const auto parameters{rp.PopRaw<Parameters>()};
 
-    R_UNLESS(device_index.has_value(), ResultUnknown);
-
-    const auto entry_index = devices[device_index.value()].handle.internal_index;
-    auto& cur_entry = hidbus_status.entries[entry_index];
-    auto& device = devices[device_index.value()].device;
-    devices[device_index.value()].is_device_initialized = false;
-    device->DeactivateDevice();
-
-    cur_entry.is_in_focus = true;
-    cur_entry.is_connected = false;
-    cur_entry.is_connected_result = ResultSuccess;
-    cur_entry.is_enabled = false;
-    cur_entry.is_polling_mode = false;
-    std::memcpy(system.Kernel().GetHidBusSharedMem().GetPointer(), &hidbus_status,
-                sizeof(hidbus_status));
-    R_SUCCEED();
-}
-
-Result Hidbus::EnableExternalDevice(bool is_enabled, BusHandle bus_handle, u64 inval,
-                                    AppletResourceUserId aruid) {
     LOG_DEBUG(Service_HID,
               "called, enable={}, abstracted_pad_id={}, bus_type={}, internal_index={}, "
               "player_number={}, is_valid={}, inval={}, applet_resource_user_id{}",
-              is_enabled, bus_handle.abstracted_pad_id, bus_handle.bus_type_id,
-              bus_handle.internal_index, bus_handle.player_number, bus_handle.is_valid, inval,
-              aruid.pid);
+              parameters.enable, parameters.bus_handle.abstracted_pad_id,
+              parameters.bus_handle.bus_type_id, parameters.bus_handle.internal_index,
+              parameters.bus_handle.player_number, parameters.bus_handle.is_valid, parameters.inval,
+              parameters.applet_resource_user_id);
 
-    const auto device_index = GetDeviceIndexFromHandle(bus_handle);
+    const auto device_index = GetDeviceIndexFromHandle(parameters.bus_handle);
 
-    R_UNLESS(device_index.has_value(), ResultUnknown);
-    devices[device_index.value()].device->Enable(is_enabled);
-    R_SUCCEED();
+    if (device_index) {
+        auto& device = devices[device_index.value()].device;
+        device->Enable(parameters.enable);
+
+        IPC::ResponseBuilder rb{ctx, 2};
+        rb.Push(ResultSuccess);
+        return;
+    }
+
+    LOG_ERROR(Service_HID, "Invalid handle");
+    IPC::ResponseBuilder rb{ctx, 2};
+    rb.Push(ResultUnknown);
+    return;
 }
 
-Result Hidbus::GetExternalDeviceId(Out<u32> out_device_id, BusHandle bus_handle) {
+void HidBus::GetExternalDeviceId(HLERequestContext& ctx) {
+    IPC::RequestParser rp{ctx};
+    const auto bus_handle_{rp.PopRaw<BusHandle>()};
+
     LOG_DEBUG(Service_HID,
               "called, abstracted_pad_id={}, bus_type={}, internal_index={}, player_number={}, "
               "is_valid={}",
-              bus_handle.abstracted_pad_id, bus_handle.bus_type_id, bus_handle.internal_index,
-              bus_handle.player_number, bus_handle.is_valid);
+              bus_handle_.abstracted_pad_id, bus_handle_.bus_type_id, bus_handle_.internal_index,
+              bus_handle_.player_number, bus_handle_.is_valid);
 
-    const auto device_index = GetDeviceIndexFromHandle(bus_handle);
+    const auto device_index = GetDeviceIndexFromHandle(bus_handle_);
 
-    R_UNLESS(device_index.has_value(), ResultUnknown);
+    if (device_index) {
+        const auto& device = devices[device_index.value()].device;
+        u32 device_id = device->GetDeviceId();
+        IPC::ResponseBuilder rb{ctx, 3};
+        rb.Push(ResultSuccess);
+        rb.Push<u32>(device_id);
+        return;
+    }
 
-    *out_device_id = devices[device_index.value()].device->GetDeviceId();
-    R_SUCCEED();
+    LOG_ERROR(Service_HID, "Invalid handle");
+    IPC::ResponseBuilder rb{ctx, 2};
+    rb.Push(ResultUnknown);
+    return;
 }
 
-Result Hidbus::SendCommandAsync(BusHandle bus_handle,
-                                InBuffer<BufferAttr_HipcAutoSelect> buffer_data) {
+void HidBus::SendCommandAsync(HLERequestContext& ctx) {
+    IPC::RequestParser rp{ctx};
+    const auto data = ctx.ReadBuffer();
+    const auto bus_handle_{rp.PopRaw<BusHandle>()};
+
     LOG_DEBUG(Service_HID,
               "called, data_size={}, abstracted_pad_id={}, bus_type={}, internal_index={}, "
               "player_number={}, is_valid={}",
-              buffer_data.size(), bus_handle.abstracted_pad_id, bus_handle.bus_type_id,
-              bus_handle.internal_index, bus_handle.player_number, bus_handle.is_valid);
+              data.size(), bus_handle_.abstracted_pad_id, bus_handle_.bus_type_id,
+              bus_handle_.internal_index, bus_handle_.player_number, bus_handle_.is_valid);
 
-    const auto device_index = GetDeviceIndexFromHandle(bus_handle);
+    const auto device_index = GetDeviceIndexFromHandle(bus_handle_);
 
-    R_UNLESS(device_index.has_value(), ResultUnknown);
+    if (device_index) {
+        auto& device = devices[device_index.value()].device;
+        device->SetCommand(data);
 
-    devices[device_index.value()].device->SetCommand(buffer_data);
-    R_SUCCEED();
+        IPC::ResponseBuilder rb{ctx, 2};
+        rb.Push(ResultSuccess);
+        return;
+    }
+
+    LOG_ERROR(Service_HID, "Invalid handle");
+    IPC::ResponseBuilder rb{ctx, 2};
+    rb.Push(ResultUnknown);
+    return;
 };
 
-Result Hidbus::GetSendCommandAsynceResult(Out<u64> out_data_size, BusHandle bus_handle,
-                                          OutBuffer<BufferAttr_HipcAutoSelect> out_buffer_data) {
+void HidBus::GetSendCommandAsynceResult(HLERequestContext& ctx) {
+    IPC::RequestParser rp{ctx};
+    const auto bus_handle_{rp.PopRaw<BusHandle>()};
+
     LOG_DEBUG(Service_HID,
               "called, abstracted_pad_id={}, bus_type={}, internal_index={}, player_number={}, "
               "is_valid={}",
-              bus_handle.abstracted_pad_id, bus_handle.bus_type_id, bus_handle.internal_index,
-              bus_handle.player_number, bus_handle.is_valid);
+              bus_handle_.abstracted_pad_id, bus_handle_.bus_type_id, bus_handle_.internal_index,
+              bus_handle_.player_number, bus_handle_.is_valid);
 
-    const auto device_index = GetDeviceIndexFromHandle(bus_handle);
+    const auto device_index = GetDeviceIndexFromHandle(bus_handle_);
 
-    R_UNLESS(device_index.has_value(), ResultUnknown);
+    if (device_index) {
+        const auto& device = devices[device_index.value()].device;
+        const std::vector<u8> data = device->GetReply();
+        const u64 data_size = ctx.WriteBuffer(data);
 
-    *out_data_size = devices[device_index.value()].device->GetReply(out_buffer_data);
-    R_SUCCEED();
+        IPC::ResponseBuilder rb{ctx, 4};
+        rb.Push(ResultSuccess);
+        rb.Push<u64>(data_size);
+        return;
+    }
+
+    LOG_ERROR(Service_HID, "Invalid handle");
+    IPC::ResponseBuilder rb{ctx, 2};
+    rb.Push(ResultUnknown);
+    return;
 };
 
-Result Hidbus::SetEventForSendCommandAsycResult(OutCopyHandle<Kernel::KReadableEvent> out_event,
-                                                BusHandle bus_handle) {
+void HidBus::SetEventForSendCommandAsycResult(HLERequestContext& ctx) {
+    IPC::RequestParser rp{ctx};
+    const auto bus_handle_{rp.PopRaw<BusHandle>()};
+
     LOG_INFO(Service_HID,
              "called, abstracted_pad_id={}, bus_type={}, internal_index={}, player_number={}, "
              "is_valid={}",
-             bus_handle.abstracted_pad_id, bus_handle.bus_type_id, bus_handle.internal_index,
-             bus_handle.player_number, bus_handle.is_valid);
+             bus_handle_.abstracted_pad_id, bus_handle_.bus_type_id, bus_handle_.internal_index,
+             bus_handle_.player_number, bus_handle_.is_valid);
 
-    const auto device_index = GetDeviceIndexFromHandle(bus_handle);
+    const auto device_index = GetDeviceIndexFromHandle(bus_handle_);
 
-    R_UNLESS(device_index.has_value(), ResultUnknown);
+    if (device_index) {
+        const auto& device = devices[device_index.value()].device;
+        IPC::ResponseBuilder rb{ctx, 2, 1};
+        rb.Push(ResultSuccess);
+        rb.PushCopyObjects(device->GetSendCommandAsycEvent());
+        return;
+    }
 
-    *out_event = &devices[device_index.value()].device->GetSendCommandAsycEvent();
-    R_SUCCEED();
+    LOG_ERROR(Service_HID, "Invalid handle");
+    IPC::ResponseBuilder rb{ctx, 2};
+    rb.Push(ResultUnknown);
+    return;
 };
 
-Result Hidbus::GetSharedMemoryHandle(OutCopyHandle<Kernel::KSharedMemory> out_shared_memory) {
+void HidBus::GetSharedMemoryHandle(HLERequestContext& ctx) {
     LOG_DEBUG(Service_HID, "called");
 
-    *out_shared_memory = &system.Kernel().GetHidBusSharedMem();
-    R_SUCCEED();
+    IPC::ResponseBuilder rb{ctx, 2, 1};
+    rb.Push(ResultSuccess);
+    rb.PushCopyObjects(&system.Kernel().GetHidBusSharedMem());
 }
 
-Result Hidbus::EnableJoyPollingReceiveMode(u32 t_mem_size, JoyPollingMode polling_mode,
-                                           BusHandle bus_handle,
-                                           InCopyHandle<Kernel::KTransferMemory> t_mem) {
+void HidBus::EnableJoyPollingReceiveMode(HLERequestContext& ctx) {
+    IPC::RequestParser rp{ctx};
+    const auto t_mem_size{rp.Pop<u32>()};
+    const auto t_mem_handle{ctx.GetCopyHandle(0)};
+    const auto polling_mode_{rp.PopEnum<JoyPollingMode>()};
+    const auto bus_handle_{rp.PopRaw<BusHandle>()};
+
     ASSERT_MSG(t_mem_size == 0x1000, "t_mem_size is not 0x1000 bytes");
-    ASSERT_MSG(t_mem->GetSize() == t_mem_size, "t_mem has incorrect size");
+
+    auto t_mem = ctx.GetObjectFromHandle<Kernel::KTransferMemory>(t_mem_handle);
+
+    if (t_mem.IsNull()) {
+        LOG_ERROR(Service_HID, "t_mem is a nullptr for handle=0x{:08X}", t_mem_handle);
+        IPC::ResponseBuilder rb{ctx, 2};
+        rb.Push(ResultUnknown);
+        return;
+    }
+
+    ASSERT_MSG(t_mem->GetSize() == 0x1000, "t_mem has incorrect size");
 
     LOG_INFO(Service_HID,
-             "called, polling_mode={}, abstracted_pad_id={}, bus_type={}, "
+             "called, t_mem_handle=0x{:08X}, polling_mode={}, abstracted_pad_id={}, bus_type={}, "
              "internal_index={}, player_number={}, is_valid={}",
-             polling_mode, bus_handle.abstracted_pad_id, bus_handle.bus_type_id,
-             bus_handle.internal_index, bus_handle.player_number, bus_handle.is_valid);
+             t_mem_handle, polling_mode_, bus_handle_.abstracted_pad_id, bus_handle_.bus_type_id,
+             bus_handle_.internal_index, bus_handle_.player_number, bus_handle_.is_valid);
 
-    const auto device_index = GetDeviceIndexFromHandle(bus_handle);
+    const auto device_index = GetDeviceIndexFromHandle(bus_handle_);
 
-    R_UNLESS(device_index.has_value(), ResultUnknown);
+    if (device_index) {
+        auto& device = devices[device_index.value()].device;
+        device->SetPollingMode(polling_mode_);
+        device->SetTransferMemoryAddress(t_mem->GetSourceAddress());
 
-    auto& device = devices[device_index.value()].device;
-    device->SetPollingMode(polling_mode);
-    device->SetTransferMemoryAddress(t_mem->GetSourceAddress());
-    R_SUCCEED();
+        IPC::ResponseBuilder rb{ctx, 2};
+        rb.Push(ResultSuccess);
+        return;
+    }
+
+    LOG_ERROR(Service_HID, "Invalid handle");
+    IPC::ResponseBuilder rb{ctx, 2};
+    rb.Push(ResultUnknown);
+    return;
 }
 
-Result Hidbus::DisableJoyPollingReceiveMode(BusHandle bus_handle) {
+void HidBus::DisableJoyPollingReceiveMode(HLERequestContext& ctx) {
+    IPC::RequestParser rp{ctx};
+    const auto bus_handle_{rp.PopRaw<BusHandle>()};
+
     LOG_INFO(Service_HID,
              "called, abstracted_pad_id={}, bus_type={}, internal_index={}, player_number={}, "
              "is_valid={}",
-             bus_handle.abstracted_pad_id, bus_handle.bus_type_id, bus_handle.internal_index,
-             bus_handle.player_number, bus_handle.is_valid);
+             bus_handle_.abstracted_pad_id, bus_handle_.bus_type_id, bus_handle_.internal_index,
+             bus_handle_.player_number, bus_handle_.is_valid);
 
-    const auto device_index = GetDeviceIndexFromHandle(bus_handle);
+    const auto device_index = GetDeviceIndexFromHandle(bus_handle_);
 
-    R_UNLESS(device_index.has_value(), ResultUnknown);
+    if (device_index) {
+        auto& device = devices[device_index.value()].device;
+        device->DisablePollingMode();
 
-    auto& device = devices[device_index.value()].device;
-    device->DisablePollingMode();
-    R_SUCCEED();
+        IPC::ResponseBuilder rb{ctx, 2};
+        rb.Push(ResultSuccess);
+        return;
+    }
+
+    LOG_ERROR(Service_HID, "Invalid handle");
+    IPC::ResponseBuilder rb{ctx, 2};
+    rb.Push(ResultUnknown);
+    return;
 }
 
-Result Hidbus::SetStatusManagerType(StatusManagerType manager_type) {
-    LOG_WARNING(Service_HID, "(STUBBED) called, manager_type={}", manager_type);
-    R_SUCCEED();
-};
+void HidBus::SetStatusManagerType(HLERequestContext& ctx) {
+    IPC::RequestParser rp{ctx};
+    const auto manager_type{rp.PopEnum<StatusManagerType>()};
 
+    LOG_WARNING(Service_HID, "(STUBBED) called, manager_type={}", manager_type);
+
+    IPC::ResponseBuilder rb{ctx, 2};
+    rb.Push(ResultSuccess);
+};
 } // namespace Service::HID

src/core/hle/service/hid/hidbus.h

@@ -5,10 +5,8 @@
 
 #include <functional>
 
-#include "core/hle/service/cmif_types.h"
 #include "core/hle/service/kernel_helpers.h"
 #include "core/hle/service/service.h"
-#include "hid_core/hid_types.h"
 #include "hid_core/hidbus/hidbus_base.h"
 
 namespace Core::Timing {
@@ -21,10 +19,10 @@ class System;
 
 namespace Service::HID {
 
-class Hidbus final : public ServiceFramework<Hidbus> {
+class HidBus final : public ServiceFramework<HidBus> {
 public:
-    explicit Hidbus(Core::System& system_);
-    ~Hidbus() override;
+    explicit HidBus(Core::System& system_);
+    ~HidBus() override;
 
 private:
     static const std::size_t max_number_of_handles = 0x13;
@@ -43,7 +41,7 @@ private:
     };
 
     // This is nn::hidbus::BusType
-    enum class BusType : u64 {
+    enum class BusType : u32 {
         LeftJoyRail,
         RightJoyRail,
         InternalBus, // Lark microphone
@@ -53,15 +51,11 @@ private:
 
     // This is nn::hidbus::BusHandle
     struct BusHandle {
-        union {
-            u64 raw{};
-
-            BitField<0, 32, u64> abstracted_pad_id;
-            BitField<32, 8, u64> internal_index;
-            BitField<40, 8, u64> player_number;
-            BitField<48, 8, u64> bus_type_id;
-            BitField<56, 1, u64> is_valid;
-        };
+        u32 abstracted_pad_id;
+        u8 internal_index;
+        u8 player_number;
+        u8 bus_type_id;
+        bool is_valid;
     };
     static_assert(sizeof(BusHandle) == 0x8, "BusHandle is an invalid size");
 
@@ -100,38 +94,19 @@ private:
         std::unique_ptr<HidbusBase> device{nullptr};
     };
 
-    Result GetBusHandle(Out<bool> out_is_valid, Out<BusHandle> out_bus_handle,
-                        Core::HID::NpadIdType npad_id, BusType bus_type,
-                        AppletResourceUserId aruid);
-
-    Result IsExternalDeviceConnected(Out<bool> out_is_connected, BusHandle bus_handle);
-
-    Result Initialize(BusHandle bus_handle, AppletResourceUserId aruid);
-
-    Result Finalize(BusHandle bus_handle, AppletResourceUserId aruid);
-
-    Result EnableExternalDevice(bool is_enabled, BusHandle bus_handle, u64 inval,
-                                AppletResourceUserId aruid);
-
-    Result GetExternalDeviceId(Out<u32> out_device_id, BusHandle bus_handle);
-
-    Result SendCommandAsync(BusHandle bus_handle, InBuffer<BufferAttr_HipcAutoSelect> buffer_data);
-
-    Result GetSendCommandAsynceResult(Out<u64> out_data_size, BusHandle bus_handle,
-                                      OutBuffer<BufferAttr_HipcAutoSelect> out_buffer_data);
-
-    Result SetEventForSendCommandAsycResult(OutCopyHandle<Kernel::KReadableEvent> out_event,
-                                            BusHandle bus_handle);
-
-    Result GetSharedMemoryHandle(OutCopyHandle<Kernel::KSharedMemory> out_shared_memory);
-
-    Result EnableJoyPollingReceiveMode(u32 t_mem_size, JoyPollingMode polling_mode,
-                                       BusHandle bus_handle,
-                                       InCopyHandle<Kernel::KTransferMemory> t_mem);
-
-    Result DisableJoyPollingReceiveMode(BusHandle bus_handle);
-
-    Result SetStatusManagerType(StatusManagerType manager_type);
+    void GetBusHandle(HLERequestContext& ctx);
+    void IsExternalDeviceConnected(HLERequestContext& ctx);
+    void Initialize(HLERequestContext& ctx);
+    void Finalize(HLERequestContext& ctx);
+    void EnableExternalDevice(HLERequestContext& ctx);
+    void GetExternalDeviceId(HLERequestContext& ctx);
+    void SendCommandAsync(HLERequestContext& ctx);
+    void GetSendCommandAsynceResult(HLERequestContext& ctx);
+    void SetEventForSendCommandAsycResult(HLERequestContext& ctx);
+    void GetSharedMemoryHandle(HLERequestContext& ctx);
+    void EnableJoyPollingReceiveMode(HLERequestContext& ctx);
+    void DisableJoyPollingReceiveMode(HLERequestContext& ctx);
+    void SetStatusManagerType(HLERequestContext& ctx);
 
     void UpdateHidbus(std::chrono::nanoseconds ns_late);
     std::optional<std::size_t> GetDeviceIndexFromHandle(BusHandle handle) const;

src/core/hle/service/hle_ipc.cpp

@@ -299,12 +299,8 @@ Result HLERequestContext::WriteToOutgoingCommandBuffer() {
     if (GetManager()->IsDomain()) {
         current_offset = domain_offset - static_cast<u32>(outgoing_domain_objects.size());
         for (auto& object : outgoing_domain_objects) {
-            if (object) {
-                GetManager()->AppendDomainHandler(std::move(object));
-                cmd_buf[current_offset++] = static_cast<u32_le>(GetManager()->DomainHandlerCount());
-            } else {
-                cmd_buf[current_offset++] = 0;
-            }
+            GetManager()->AppendDomainHandler(std::move(object));
+            cmd_buf[current_offset++] = static_cast<u32_le>(GetManager()->DomainHandlerCount());
         }
     }
 

src/core/hle/service/mutex.cpp

@@ -4,7 +4,7 @@
 #include "core/core.h"
 #include "core/hle/kernel/k_event.h"
 #include "core/hle/kernel/k_synchronization_object.h"
-#include "core/hle/service/os/mutex.h"
+#include "core/hle/service/mutex.h"
 
 namespace Service {
 

src/core/hle/service/os/multi_wait.cpp

@@ -1,59 +0,0 @@
-// SPDX-FileCopyrightText: Copyright 2024 yuzu Emulator Project
-// SPDX-License-Identifier: GPL-2.0-or-later
-
-#include "core/hle/kernel/k_hardware_timer.h"
-#include "core/hle/kernel/k_synchronization_object.h"
-#include "core/hle/kernel/kernel.h"
-#include "core/hle/kernel/svc_common.h"
-#include "core/hle/service/os/multi_wait.h"
-
-namespace Service {
-
-MultiWait::MultiWait() = default;
-MultiWait::~MultiWait() = default;
-
-MultiWaitHolder* MultiWait::WaitAny(Kernel::KernelCore& kernel) {
-    return this->TimedWaitImpl(kernel, -1);
-}
-
-MultiWaitHolder* MultiWait::TryWaitAny(Kernel::KernelCore& kernel) {
-    return this->TimedWaitImpl(kernel, 0);
-}
-
-MultiWaitHolder* MultiWait::TimedWaitAny(Kernel::KernelCore& kernel, s64 timeout_ns) {
-    return this->TimedWaitImpl(kernel, kernel.HardwareTimer().GetTick() + timeout_ns);
-}
-
-MultiWaitHolder* MultiWait::TimedWaitImpl(Kernel::KernelCore& kernel, s64 timeout_tick) {
-    std::array<MultiWaitHolder*, Kernel::Svc::ArgumentHandleCountMax> holders{};
-    std::array<Kernel::KSynchronizationObject*, Kernel::Svc::ArgumentHandleCountMax> objects{};
-
-    s32 out_index = -1;
-    s32 num_objects = 0;
-
-    for (auto it = m_wait_list.begin(); it != m_wait_list.end(); it++) {
-        ASSERT(num_objects < Kernel::Svc::ArgumentHandleCountMax);
-        holders[num_objects] = std::addressof(*it);
-        objects[num_objects] = it->GetNativeHandle();
-        num_objects++;
-    }
-
-    Kernel::KSynchronizationObject::Wait(kernel, std::addressof(out_index), objects.data(),
-                                         num_objects, timeout_tick);
-
-    if (out_index == -1) {
-        return nullptr;
-    } else {
-        return holders[out_index];
-    }
-}
-
-void MultiWait::MoveAll(MultiWait* other) {
-    while (!other->m_wait_list.empty()) {
-        MultiWaitHolder& holder = other->m_wait_list.front();
-        holder.UnlinkFromMultiWait();
-        holder.LinkToMultiWait(this);
-    }
-}
-
-} // namespace Service

src/core/hle/service/os/multi_wait.h

@@ -1,36 +0,0 @@
-// SPDX-FileCopyrightText: Copyright 2024 yuzu Emulator Project
-// SPDX-License-Identifier: GPL-2.0-or-later
-
-#pragma once
-
-#include "core/hle/service/os/multi_wait_holder.h"
-
-namespace Kernel {
-class KernelCore;
-}
-
-namespace Service {
-
-class MultiWait final {
-public:
-    explicit MultiWait();
-    ~MultiWait();
-
-public:
-    MultiWaitHolder* WaitAny(Kernel::KernelCore& kernel);
-    MultiWaitHolder* TryWaitAny(Kernel::KernelCore& kernel);
-    MultiWaitHolder* TimedWaitAny(Kernel::KernelCore& kernel, s64 timeout_ns);
-    // TODO: SdkReplyAndReceive?
-
-    void MoveAll(MultiWait* other);
-
-private:
-    MultiWaitHolder* TimedWaitImpl(Kernel::KernelCore& kernel, s64 timeout_tick);
-
-private:
-    friend class MultiWaitHolder;
-    using ListType = Common::IntrusiveListMemberTraits<&MultiWaitHolder::m_list_node>::ListType;
-    ListType m_wait_list{};
-};
-
-} // namespace Service

src/core/hle/service/os/multi_wait_holder.cpp

@@ -1,25 +0,0 @@
-// SPDX-FileCopyrightText: Copyright 2024 yuzu Emulator Project
-// SPDX-License-Identifier: GPL-2.0-or-later
-
-#include "core/hle/service/os/multi_wait.h"
-#include "core/hle/service/os/multi_wait_holder.h"
-
-namespace Service {
-
-void MultiWaitHolder::LinkToMultiWait(MultiWait* multi_wait) {
-    if (m_multi_wait != nullptr) {
-        UNREACHABLE();
-    }
-
-    m_multi_wait = multi_wait;
-    m_multi_wait->m_wait_list.push_back(*this);
-}
-
-void MultiWaitHolder::UnlinkFromMultiWait() {
-    if (m_multi_wait) {
-        m_multi_wait->m_wait_list.erase(m_multi_wait->m_wait_list.iterator_to(*this));
-        m_multi_wait = nullptr;
-    }
-}
-
-} // namespace Service

src/core/hle/service/os/multi_wait_holder.h

@@ -1,44 +0,0 @@
-// SPDX-FileCopyrightText: Copyright 2024 yuzu Emulator Project
-// SPDX-License-Identifier: GPL-2.0-or-later
-
-#pragma once
-
-#include "common/intrusive_list.h"
-
-namespace Kernel {
-class KSynchronizationObject;
-} // namespace Kernel
-
-namespace Service {
-
-class MultiWait;
-
-class MultiWaitHolder {
-public:
-    explicit MultiWaitHolder(Kernel::KSynchronizationObject* native_handle)
-        : m_native_handle(native_handle) {}
-
-    void LinkToMultiWait(MultiWait* multi_wait);
-    void UnlinkFromMultiWait();
-
-    void SetUserData(uintptr_t user_data) {
-        m_user_data = user_data;
-    }
-
-    uintptr_t GetUserData() const {
-        return m_user_data;
-    }
-
-    Kernel::KSynchronizationObject* GetNativeHandle() const {
-        return m_native_handle;
-    }
-
-private:
-    friend class MultiWait;
-    Common::IntrusiveListNode m_list_node{};
-    MultiWait* m_multi_wait{};
-    Kernel::KSynchronizationObject* m_native_handle{};
-    uintptr_t m_user_data{};
-};
-
-} // namespace Service

src/core/hle/service/os/multi_wait_utils.h

@@ -1,109 +0,0 @@
-// SPDX-FileCopyrightText: Copyright 2024 yuzu Emulator Project
-// SPDX-License-Identifier: GPL-2.0-or-later
-
-#pragma once
-
-#include "core/hle/service/os/multi_wait.h"
-
-namespace Service {
-
-namespace impl {
-
-class AutoMultiWaitHolder {
-private:
-    MultiWaitHolder m_holder;
-
-public:
-    template <typename T>
-    explicit AutoMultiWaitHolder(MultiWait* multi_wait, T&& arg) : m_holder(arg) {
-        m_holder.LinkToMultiWait(multi_wait);
-    }
-
-    ~AutoMultiWaitHolder() {
-        m_holder.UnlinkFromMultiWait();
-    }
-
-    std::pair<MultiWaitHolder*, int> ConvertResult(const std::pair<MultiWaitHolder*, int> result,
-                                                   int index) {
-        if (result.first == std::addressof(m_holder)) {
-            return std::make_pair(static_cast<MultiWaitHolder*>(nullptr), index);
-        } else {
-            return result;
-        }
-    }
-};
-
-using WaitAnyFunction = decltype(&MultiWait::WaitAny);
-
-inline std::pair<MultiWaitHolder*, int> WaitAnyImpl(Kernel::KernelCore& kernel,
-                                                    MultiWait* multi_wait, WaitAnyFunction func,
-                                                    int) {
-    return std::pair<MultiWaitHolder*, int>((multi_wait->*func)(kernel), -1);
-}
-
-template <typename T, typename... Args>
-inline std::pair<MultiWaitHolder*, int> WaitAnyImpl(Kernel::KernelCore& kernel,
-                                                    MultiWait* multi_wait, WaitAnyFunction func,
-                                                    int index, T&& x, Args&&... args) {
-    AutoMultiWaitHolder holder(multi_wait, std::forward<T>(x));
-    return holder.ConvertResult(
-        WaitAnyImpl(kernel, multi_wait, func, index + 1, std::forward<Args>(args)...), index);
-}
-
-template <typename... Args>
-inline std::pair<MultiWaitHolder*, int> WaitAnyImpl(Kernel::KernelCore& kernel,
-                                                    MultiWait* multi_wait, WaitAnyFunction func,
-                                                    Args&&... args) {
-    return WaitAnyImpl(kernel, multi_wait, func, 0, std::forward<Args>(args)...);
-}
-
-template <typename... Args>
-inline std::pair<MultiWaitHolder*, int> WaitAnyImpl(Kernel::KernelCore& kernel,
-                                                    WaitAnyFunction func, Args&&... args) {
-    MultiWait temp_multi_wait;
-    return WaitAnyImpl(kernel, std::addressof(temp_multi_wait), func, 0,
-                       std::forward<Args>(args)...);
-}
-
-class NotBoolButInt {
-public:
-    constexpr NotBoolButInt(int v) : m_value(v) {}
-    constexpr operator int() const {
-        return m_value;
-    }
-    explicit operator bool() const = delete;
-
-private:
-    int m_value;
-};
-
-} // namespace impl
-
-template <typename... Args>
-    requires(sizeof...(Args) > 0)
-inline std::pair<MultiWaitHolder*, int> WaitAny(Kernel::KernelCore& kernel, MultiWait* multi_wait,
-                                                Args&&... args) {
-    return impl::WaitAnyImpl(kernel, &MultiWait::WaitAny, multi_wait, std::forward<Args>(args)...);
-}
-
-template <typename... Args>
-    requires(sizeof...(Args) > 0)
-inline int WaitAny(Kernel::KernelCore& kernel, Args&&... args) {
-    return impl::WaitAnyImpl(kernel, &MultiWait::WaitAny, std::forward<Args>(args)...).second;
-}
-
-template <typename... Args>
-    requires(sizeof...(Args) > 0)
-inline std::pair<MultiWaitHolder*, int> TryWaitAny(Kernel::KernelCore& kernel,
-                                                   MultiWait* multi_wait, Args&&... args) {
-    return impl::WaitAnyImpl(kernel, &MultiWait::TryWaitAny, multi_wait,
-                             std::forward<Args>(args)...);
-}
-
-template <typename... Args>
-    requires(sizeof...(Args) > 0)
-inline impl::NotBoolButInt TryWaitAny(Kernel::KernelCore& kernel, Args&&... args) {
-    return impl::WaitAnyImpl(kernel, &MultiWait::TryWaitAny, std::forward<Args>(args)...).second;
-}
-
-} // namespace Service

src/core/hle/service/server_manager.cpp

@@ -20,91 +20,50 @@
 
 namespace Service {
 
-enum class UserDataTag {
+constexpr size_t MaximumWaitObjects = 0x40;
+
+enum HandleType {
     Port,
     Session,
     DeferEvent,
+    Event,
 };
 
-class Port : public MultiWaitHolder, public Common::IntrusiveListBaseNode<Port> {
-public:
-    explicit Port(Kernel::KServerPort* server_port, SessionRequestHandlerFactory&& handler_factory)
-        : MultiWaitHolder(server_port), m_handler_factory(std::move(handler_factory)) {
-        this->SetUserData(static_cast<uintptr_t>(UserDataTag::Port));
-    }
-
-    ~Port() {
-        this->GetNativeHandle()->Close();
-    }
-
-    SessionRequestHandlerPtr CreateHandler() {
-        return m_handler_factory();
-    }
-
-private:
-    const SessionRequestHandlerFactory m_handler_factory;
-};
-
-class Session : public MultiWaitHolder, public Common::IntrusiveListBaseNode<Session> {
-public:
-    explicit Session(Kernel::KServerSession* server_session,
-                     std::shared_ptr<SessionRequestManager>&& manager)
-        : MultiWaitHolder(server_session), m_manager(std::move(manager)) {
-        this->SetUserData(static_cast<uintptr_t>(UserDataTag::Session));
-    }
-
-    ~Session() {
-        this->GetNativeHandle()->Close();
-    }
-
-    std::shared_ptr<SessionRequestManager>& GetManager() {
-        return m_manager;
-    }
-
-    std::shared_ptr<HLERequestContext>& GetContext() {
-        return m_context;
-    }
-
-private:
-    std::shared_ptr<SessionRequestManager> m_manager;
-    std::shared_ptr<HLERequestContext> m_context;
-};
-
-ServerManager::ServerManager(Core::System& system) : m_system{system}, m_selection_mutex{system} {
+ServerManager::ServerManager(Core::System& system) : m_system{system}, m_serve_mutex{system} {
     // Initialize event.
-    m_wakeup_event = Kernel::KEvent::Create(system.Kernel());
-    m_wakeup_event->Initialize(nullptr);
+    m_event = Kernel::KEvent::Create(system.Kernel());
+    m_event->Initialize(nullptr);
 
     // Register event.
-    Kernel::KEvent::Register(system.Kernel(), m_wakeup_event);
-
-    // Link to holder.
-    m_wakeup_holder.emplace(std::addressof(m_wakeup_event->GetReadableEvent()));
-    m_wakeup_holder->LinkToMultiWait(std::addressof(m_deferred_list));
+    Kernel::KEvent::Register(system.Kernel(), m_event);
 }
 
 ServerManager::~ServerManager() {
     // Signal stop.
     m_stop_source.request_stop();
-    m_wakeup_event->Signal();
+    m_event->Signal();
 
     // Wait for processing to stop.
     m_stopped.Wait();
     m_threads.clear();
 
-    // Clean up ports.
-    for (auto it = m_servers.begin(); it != m_servers.end(); it = m_servers.erase(it)) {
-        delete std::addressof(*it);
+    // Clean up server ports.
+    for (const auto& [port, handler] : m_ports) {
+        port->Close();
     }
 
     // Clean up sessions.
-    for (auto it = m_sessions.begin(); it != m_sessions.end(); it = m_sessions.erase(it)) {
-        delete std::addressof(*it);
+    for (const auto& [session, manager] : m_sessions) {
+        session->Close();
     }
 
-    // Close wakeup event.
-    m_wakeup_event->GetReadableEvent().Close();
-    m_wakeup_event->Close();
+    for (const auto& request : m_deferrals) {
+        request.session->Close();
+    }
+
+    // Close event.
+    m_event->GetReadableEvent().Close();
+    m_event->Close();
 
     if (m_deferral_event) {
         m_deferral_event->GetReadableEvent().Close();
@@ -116,19 +75,19 @@ void ServerManager::RunServer(std::unique_ptr<ServerManager>&& server_manager) {
     server_manager->m_system.RunServer(std::move(server_manager));
 }
 
-Result ServerManager::RegisterSession(Kernel::KServerSession* server_session,
+Result ServerManager::RegisterSession(Kernel::KServerSession* session,
                                       std::shared_ptr<SessionRequestManager> manager) {
-    // We are taking ownership of the server session, so don't open it.
-    auto* session = new Session(server_session, std::move(manager));
+    ASSERT(m_sessions.size() + m_ports.size() < MaximumWaitObjects);
 
+    // We are taking ownership of the server session, so don't open it.
     // Begin tracking the server session.
     {
-        std::scoped_lock ll{m_deferred_list_mutex};
-        m_sessions.push_back(*session);
+        std::scoped_lock ll{m_list_mutex};
+        m_sessions.emplace(session, std::move(manager));
     }
 
-    // Register to wait on the session.
-    this->LinkToDeferredList(session);
+    // Signal the wakeup event.
+    m_event->Signal();
 
     R_SUCCEED();
 }
@@ -136,22 +95,21 @@ Result ServerManager::RegisterSession(Kernel::KServerSession* server_session,
 Result ServerManager::RegisterNamedService(const std::string& service_name,
                                            SessionRequestHandlerFactory&& handler_factory,
                                            u32 max_sessions) {
+    ASSERT(m_sessions.size() + m_ports.size() < MaximumWaitObjects);
+
     // Add the new server to sm: and get the moved server port.
     Kernel::KServerPort* server_port{};
     R_ASSERT(m_system.ServiceManager().RegisterService(std::addressof(server_port), service_name,
                                                        max_sessions, handler_factory));
 
-    // We are taking ownership of the server port, so don't open it.
-    auto* server = new Port(server_port, std::move(handler_factory));
-
     // Begin tracking the server port.
     {
-        std::scoped_lock ll{m_deferred_list_mutex};
-        m_servers.push_back(*server);
+        std::scoped_lock ll{m_list_mutex};
+        m_ports.emplace(server_port, std::move(handler_factory));
     }
 
-    // Register to wait on the server port.
-    this->LinkToDeferredList(server);
+    // Signal the wakeup event.
+    m_event->Signal();
 
     R_SUCCEED();
 }
@@ -169,6 +127,8 @@ Result ServerManager::RegisterNamedService(const std::string& service_name,
 Result ServerManager::ManageNamedPort(const std::string& service_name,
                                       SessionRequestHandlerFactory&& handler_factory,
                                       u32 max_sessions) {
+    ASSERT(m_sessions.size() + m_ports.size() < MaximumWaitObjects);
+
     // Create a new port.
     auto* port = Kernel::KPort::Create(m_system.Kernel());
     port->Initialize(max_sessions, false, 0);
@@ -189,18 +149,12 @@ Result ServerManager::ManageNamedPort(const std::string& service_name,
     // Open a new reference to the server port.
     port->GetServerPort().Open();
 
-    // Transfer ownership into a new port object.
-    auto* server = new Port(std::addressof(port->GetServerPort()), std::move(handler_factory));
-
-    // Begin tracking the port.
+    // Begin tracking the server port.
     {
-        std::scoped_lock ll{m_deferred_list_mutex};
-        m_servers.push_back(*server);
+        std::scoped_lock ll{m_list_mutex};
+        m_ports.emplace(std::addressof(port->GetServerPort()), std::move(handler_factory));
     }
 
-    // Register to wait on the port.
-    this->LinkToDeferredList(server);
-
     // We succeeded.
     R_SUCCEED();
 }
@@ -219,11 +173,6 @@ Result ServerManager::ManageDeferral(Kernel::KEvent** out_event) {
     // Set the output.
     *out_event = m_deferral_event;
 
-    // Register to wait on the event.
-    m_deferral_holder.emplace(std::addressof(m_deferral_event->GetReadableEvent()));
-    m_deferral_holder->SetUserData(static_cast<uintptr_t>(UserDataTag::DeferEvent));
-    this->LinkToDeferredList(std::addressof(*m_deferral_holder));
-
     // We succeeded.
     R_SUCCEED();
 }
@@ -242,185 +191,270 @@ Result ServerManager::LoopProcess() {
     R_RETURN(this->LoopProcessImpl());
 }
 
-void ServerManager::LinkToDeferredList(MultiWaitHolder* holder) {
-    // Link.
-    {
-        std::scoped_lock lk{m_deferred_list_mutex};
-        holder->LinkToMultiWait(std::addressof(m_deferred_list));
-    }
-
-    // Signal the wakeup event.
-    m_wakeup_event->Signal();
-}
-
-void ServerManager::LinkDeferred() {
-    std::scoped_lock lk{m_deferred_list_mutex};
-    m_multi_wait.MoveAll(std::addressof(m_deferred_list));
-}
-
-MultiWaitHolder* ServerManager::WaitSignaled() {
-    // Ensure we are the only thread waiting for this server.
-    std::scoped_lock lk{m_selection_mutex};
-
-    while (true) {
-        this->LinkDeferred();
-
-        // If we're done, return before we start waiting.
-        if (m_stop_source.stop_requested()) {
-            return nullptr;
-        }
-
-        auto* selected = m_multi_wait.WaitAny(m_system.Kernel());
-        if (selected == std::addressof(*m_wakeup_holder)) {
-            // Clear and restart if we were woken up.
-            m_wakeup_event->Clear();
-        } else {
-            // Unlink and handle the event.
-            selected->UnlinkFromMultiWait();
-            return selected;
-        }
-    }
-}
-
-Result ServerManager::Process(MultiWaitHolder* holder) {
-    switch (static_cast<UserDataTag>(holder->GetUserData())) {
-    case UserDataTag::Session:
-        R_RETURN(this->OnSessionEvent(static_cast<Session*>(holder)));
-    case UserDataTag::Port:
-        R_RETURN(this->OnPortEvent(static_cast<Port*>(holder)));
-    case UserDataTag::DeferEvent:
-        R_RETURN(this->OnDeferralEvent());
-    default:
-        UNREACHABLE();
-    }
-}
-
-bool ServerManager::WaitAndProcessImpl() {
-    if (auto* signaled_holder = this->WaitSignaled(); signaled_holder != nullptr) {
-        R_ASSERT(this->Process(signaled_holder));
-        return true;
-    } else {
-        return false;
-    }
-}
-
 Result ServerManager::LoopProcessImpl() {
     while (!m_stop_source.stop_requested()) {
-        this->WaitAndProcessImpl();
+        R_TRY(this->WaitAndProcessImpl());
     }
 
     R_SUCCEED();
 }
 
-Result ServerManager::OnPortEvent(Port* server) {
+Result ServerManager::WaitAndProcessImpl() {
+    Kernel::KScopedAutoObject<Kernel::KSynchronizationObject> wait_obj;
+    HandleType wait_type{};
+
+    // Ensure we are the only thread waiting for this server.
+    std::unique_lock sl{m_serve_mutex};
+
+    // If we're done, return before we start waiting.
+    R_SUCCEED_IF(m_stop_source.stop_requested());
+
+    // Wait for a tracked object to become signaled.
+    {
+        s32 num_objs{};
+        std::array<HandleType, MaximumWaitObjects> wait_types{};
+        std::array<Kernel::KSynchronizationObject*, MaximumWaitObjects> wait_objs{};
+
+        const auto AddWaiter{
+            [&](Kernel::KSynchronizationObject* synchronization_object, HandleType type) {
+                // Open a new reference to the object.
+                synchronization_object->Open();
+
+                // Insert into the list.
+                wait_types[num_objs] = type;
+                wait_objs[num_objs++] = synchronization_object;
+            }};
+
+        {
+            std::scoped_lock ll{m_list_mutex};
+
+            // Add all of our ports.
+            for (const auto& [port, handler] : m_ports) {
+                AddWaiter(port, HandleType::Port);
+            }
+
+            // Add all of our sessions.
+            for (const auto& [session, manager] : m_sessions) {
+                AddWaiter(session, HandleType::Session);
+            }
+        }
+
+        // Add the deferral wakeup event.
+        if (m_deferral_event != nullptr) {
+            AddWaiter(std::addressof(m_deferral_event->GetReadableEvent()), HandleType::DeferEvent);
+        }
+
+        // Add the wakeup event.
+        AddWaiter(std::addressof(m_event->GetReadableEvent()), HandleType::Event);
+
+        // Clean up extra references on exit.
+        SCOPE_EXIT({
+            for (s32 i = 0; i < num_objs; i++) {
+                wait_objs[i]->Close();
+            }
+        });
+
+        // Wait for a signal.
+        s32 out_index{-1};
+        R_TRY_CATCH(Kernel::KSynchronizationObject::Wait(m_system.Kernel(), &out_index,
+                                                         wait_objs.data(), num_objs, -1)) {
+            R_CATCH(Kernel::ResultSessionClosed) {
+                // On session closed, index is updated and we don't want to return an error.
+            }
+        }
+        R_END_TRY_CATCH;
+        ASSERT(out_index >= 0 && out_index < num_objs);
+
+        // Set the output index.
+        wait_obj = wait_objs[out_index];
+        wait_type = wait_types[out_index];
+    }
+
+    // Process what we just received, temporarily removing the object so it is
+    // not processed concurrently by another thread.
+    {
+        switch (wait_type) {
+        case HandleType::Port: {
+            // Port signaled.
+            auto* port = wait_obj->DynamicCast<Kernel::KServerPort*>();
+            SessionRequestHandlerFactory handler_factory;
+
+            // Remove from tracking.
+            {
+                std::scoped_lock ll{m_list_mutex};
+                ASSERT(m_ports.contains(port));
+                m_ports.at(port).swap(handler_factory);
+                m_ports.erase(port);
+            }
+
+            // Allow other threads to serve.
+            sl.unlock();
+
+            // Finish.
+            R_RETURN(this->OnPortEvent(port, std::move(handler_factory)));
+        }
+        case HandleType::Session: {
+            // Session signaled.
+            auto* session = wait_obj->DynamicCast<Kernel::KServerSession*>();
+            std::shared_ptr<SessionRequestManager> manager;
+
+            // Remove from tracking.
+            {
+                std::scoped_lock ll{m_list_mutex};
+                ASSERT(m_sessions.contains(session));
+                m_sessions.at(session).swap(manager);
+                m_sessions.erase(session);
+            }
+
+            // Allow other threads to serve.
+            sl.unlock();
+
+            // Finish.
+            R_RETURN(this->OnSessionEvent(session, std::move(manager)));
+        }
+        case HandleType::DeferEvent: {
+            // Clear event.
+            ASSERT(R_SUCCEEDED(m_deferral_event->Clear()));
+
+            // Drain the list of deferrals while we process.
+            std::list<RequestState> deferrals;
+            {
+                std::scoped_lock ll{m_list_mutex};
+                m_deferrals.swap(deferrals);
+            }
+
+            // Allow other threads to serve.
+            sl.unlock();
+
+            // Finish.
+            R_RETURN(this->OnDeferralEvent(std::move(deferrals)));
+        }
+        case HandleType::Event: {
+            // Clear event and finish.
+            R_RETURN(m_event->Clear());
+        }
+        default: {
+            UNREACHABLE();
+        }
+        }
+    }
+}
+
+Result ServerManager::OnPortEvent(Kernel::KServerPort* port,
+                                  SessionRequestHandlerFactory&& handler_factory) {
     // Accept a new server session.
-    auto* server_port = static_cast<Kernel::KServerPort*>(server->GetNativeHandle());
-    Kernel::KServerSession* server_session = server_port->AcceptSession();
-    ASSERT(server_session != nullptr);
+    Kernel::KServerSession* session = port->AcceptSession();
+    ASSERT(session != nullptr);
 
     // Create the session manager and install the handler.
     auto manager = std::make_shared<SessionRequestManager>(m_system.Kernel(), *this);
-    manager->SetSessionHandler(server->CreateHandler());
+    manager->SetSessionHandler(handler_factory());
 
-    // Create and register the new session.
-    this->RegisterSession(server_session, std::move(manager));
+    // Track the server session.
+    {
+        std::scoped_lock ll{m_list_mutex};
+        m_ports.emplace(port, std::move(handler_factory));
+        m_sessions.emplace(session, std::move(manager));
+    }
 
-    // Resume tracking the port.
-    this->LinkToDeferredList(server);
+    // Signal the wakeup event.
+    m_event->Signal();
 
     // We succeeded.
     R_SUCCEED();
 }
 
-Result ServerManager::OnSessionEvent(Session* session) {
-    Result res = ResultSuccess;
+Result ServerManager::OnSessionEvent(Kernel::KServerSession* session,
+                                     std::shared_ptr<SessionRequestManager>&& manager) {
+    Result rc{ResultSuccess};
 
     // Try to receive a message.
-    auto* server_session = static_cast<Kernel::KServerSession*>(session->GetNativeHandle());
-    res = server_session->ReceiveRequestHLE(&session->GetContext(), session->GetManager());
+    std::shared_ptr<HLERequestContext> context;
+    rc = session->ReceiveRequestHLE(&context, manager);
 
     // If the session has been closed, we're done.
-    if (res == Kernel::ResultSessionClosed) {
-        this->DestroySession(session);
+    if (rc == Kernel::ResultSessionClosed) {
+        // Close the session.
+        session->Close();
+
+        // Finish.
         R_SUCCEED();
     }
+    ASSERT(R_SUCCEEDED(rc));
 
-    R_ASSERT(res);
+    RequestState request{
+        .session = session,
+        .context = std::move(context),
+        .manager = std::move(manager),
+    };
 
     // Complete the sync request with deferral handling.
-    R_RETURN(this->CompleteSyncRequest(session));
+    R_RETURN(this->CompleteSyncRequest(std::move(request)));
 }
 
-Result ServerManager::CompleteSyncRequest(Session* session) {
-    Result res = ResultSuccess;
-    Result service_res = ResultSuccess;
+Result ServerManager::CompleteSyncRequest(RequestState&& request) {
+    Result rc{ResultSuccess};
+    Result service_rc{ResultSuccess};
 
     // Mark the request as not deferred.
-    session->GetContext()->SetIsDeferred(false);
+    request.context->SetIsDeferred(false);
 
     // Complete the request. We have exclusive access to this session.
-    auto* server_session = static_cast<Kernel::KServerSession*>(session->GetNativeHandle());
-    service_res =
-        session->GetManager()->CompleteSyncRequest(server_session, *session->GetContext());
+    service_rc = request.manager->CompleteSyncRequest(request.session, *request.context);
 
     // If we've been deferred, we're done.
-    if (session->GetContext()->GetIsDeferred()) {
-        // Insert into deferred session list.
-        std::scoped_lock ll{m_deferred_list_mutex};
-        m_deferred_sessions.push_back(session);
+    if (request.context->GetIsDeferred()) {
+        // Insert into deferral list.
+        std::scoped_lock ll{m_list_mutex};
+        m_deferrals.emplace_back(std::move(request));
 
         // Finish.
         R_SUCCEED();
     }
 
     // Send the reply.
-    res = server_session->SendReplyHLE();
+    rc = request.session->SendReplyHLE();
 
     // If the session has been closed, we're done.
-    if (res == Kernel::ResultSessionClosed || service_res == IPC::ResultSessionClosed) {
-        this->DestroySession(session);
+    if (rc == Kernel::ResultSessionClosed || service_rc == IPC::ResultSessionClosed) {
+        // Close the session.
+        request.session->Close();
+
+        // Finish.
         R_SUCCEED();
     }
 
-    R_ASSERT(res);
-    R_ASSERT(service_res);
+    ASSERT(R_SUCCEEDED(rc));
+    ASSERT(R_SUCCEEDED(service_rc));
 
-    // We succeeded, so we can process future messages on this session.
-    this->LinkToDeferredList(session);
-
-    R_SUCCEED();
-}
-
-Result ServerManager::OnDeferralEvent() {
-    // Clear event before grabbing the list.
-    m_deferral_event->Clear();
-
-    // Get and clear list.
-    const auto deferrals = [&] {
-        std::scoped_lock lk{m_deferred_list_mutex};
-        return std::move(m_deferred_sessions);
-    }();
-
-    // Relink deferral event.
-    this->LinkToDeferredList(std::addressof(*m_deferral_holder));
-
-    // For each session, try again to complete the request.
-    for (auto* session : deferrals) {
-        R_ASSERT(this->CompleteSyncRequest(session));
-    }
-
-    R_SUCCEED();
-}
-
-void ServerManager::DestroySession(Session* session) {
-    // Unlink.
+    // Reinsert the session.
     {
-        std::scoped_lock lk{m_deferred_list_mutex};
-        m_sessions.erase(m_sessions.iterator_to(*session));
+        std::scoped_lock ll{m_list_mutex};
+        m_sessions.emplace(request.session, std::move(request.manager));
     }
 
-    // Free the session.
-    delete session;
+    // Signal the wakeup event.
+    m_event->Signal();
+
+    // We succeeded.
+    R_SUCCEED();
+}
+
+Result ServerManager::OnDeferralEvent(std::list<RequestState>&& deferrals) {
+    ON_RESULT_FAILURE {
+        std::scoped_lock ll{m_list_mutex};
+        m_deferrals.splice(m_deferrals.end(), deferrals);
+    };
+
+    while (!deferrals.empty()) {
+        RequestState request = deferrals.front();
+        deferrals.pop_front();
+
+        // Try again to complete the request.
+        R_TRY(this->CompleteSyncRequest(std::move(request)));
+    }
+
+    R_SUCCEED();
 }
 
 } // namespace Service

src/core/hle/service/server_manager.h

@@ -3,17 +3,18 @@
 
 #pragma once
 
+#include <functional>
 #include <list>
+#include <map>
 #include <mutex>
-#include <optional>
+#include <string_view>
 #include <vector>
 
 #include "common/polyfill_thread.h"
 #include "common/thread.h"
 #include "core/hle/result.h"
 #include "core/hle/service/hle_ipc.h"
-#include "core/hle/service/os/multi_wait.h"
-#include "core/hle/service/os/mutex.h"
+#include "core/hle/service/mutex.h"
 
 namespace Core {
 class System;
@@ -23,13 +24,11 @@ namespace Kernel {
 class KEvent;
 class KServerPort;
 class KServerSession;
+class KSynchronizationObject;
 } // namespace Kernel
 
 namespace Service {
 
-class Port;
-class Session;
-
 class ServerManager {
 public:
     explicit ServerManager(Core::System& system);
@@ -53,40 +52,34 @@ public:
     static void RunServer(std::unique_ptr<ServerManager>&& server);
 
 private:
-    void LinkToDeferredList(MultiWaitHolder* holder);
-    void LinkDeferred();
-    MultiWaitHolder* WaitSignaled();
-    Result Process(MultiWaitHolder* holder);
-    bool WaitAndProcessImpl();
+    struct RequestState;
+
     Result LoopProcessImpl();
-
-    Result OnPortEvent(Port* port);
-    Result OnSessionEvent(Session* session);
-    Result OnDeferralEvent();
-    Result CompleteSyncRequest(Session* session);
-
-private:
-    void DestroySession(Session* session);
+    Result WaitAndProcessImpl();
+    Result OnPortEvent(Kernel::KServerPort* port, SessionRequestHandlerFactory&& handler_factory);
+    Result OnSessionEvent(Kernel::KServerSession* session,
+                          std::shared_ptr<SessionRequestManager>&& manager);
+    Result OnDeferralEvent(std::list<RequestState>&& deferrals);
+    Result CompleteSyncRequest(RequestState&& state);
 
 private:
     Core::System& m_system;
-    Mutex m_selection_mutex;
-
-    // Events
-    Kernel::KEvent* m_wakeup_event{};
-    Kernel::KEvent* m_deferral_event{};
-
-    // Deferred wait list
-    std::mutex m_deferred_list_mutex{};
-    MultiWait m_deferred_list{};
+    Mutex m_serve_mutex;
+    std::mutex m_list_mutex;
 
     // Guest state tracking
-    MultiWait m_multi_wait{};
-    Common::IntrusiveListBaseTraits<Port>::ListType m_servers{};
-    Common::IntrusiveListBaseTraits<Session>::ListType m_sessions{};
-    std::list<Session*> m_deferred_sessions{};
-    std::optional<MultiWaitHolder> m_wakeup_holder{};
-    std::optional<MultiWaitHolder> m_deferral_holder{};
+    std::map<Kernel::KServerPort*, SessionRequestHandlerFactory> m_ports{};
+    std::map<Kernel::KServerSession*, std::shared_ptr<SessionRequestManager>> m_sessions{};
+    Kernel::KEvent* m_event{};
+    Kernel::KEvent* m_deferral_event{};
+
+    // Deferral tracking
+    struct RequestState {
+        Kernel::KServerSession* session;
+        std::shared_ptr<HLERequestContext> context;
+        std::shared_ptr<SessionRequestManager> manager;
+    };
+    std::list<RequestState> m_deferrals{};
 
     // Host state tracking
     Common::Event m_stopped{};

src/core/memory/cheat_engine.cpp

@@ -5,7 +5,6 @@
 #include "common/hex_util.h"
 #include "common/microprofile.h"
 #include "common/swap.h"
-#include "core/arm/debug.h"
 #include "core/core.h"
 #include "core/core_timing.h"
 #include "core/hle/kernel/k_page_table.h"
@@ -64,10 +63,7 @@ void StandardVmCallbacks::MemoryWriteUnsafe(VAddr address, const void* data, u64
         return;
     }
 
-    if (system.ApplicationMemory().WriteBlock(address, data, size) &&
-        system.ApplicationProcess()->Is64Bit()) {
-        Core::InvalidateInstructionCacheRange(system.ApplicationProcess(), address, size);
-    }
+    system.ApplicationMemory().WriteBlock(address, data, size);
 }
 
 u64 StandardVmCallbacks::HidKeysDown() {

src/hid_core/hidbus/hidbus_base.h

@@ -160,7 +160,7 @@ public:
     }
 
     // Returns a reply from a command
-    virtual u64 GetReply(std::span<u8> out_data) const {
+    virtual std::vector<u8> GetReply() const {
         return {};
     }
 

src/hid_core/hidbus/ringcon.cpp

@@ -90,32 +90,32 @@ u8 RingController::GetDeviceId() const {
     return device_id;
 }
 
-u64 RingController::GetReply(std::span<u8> out_data) const {
+std::vector<u8> RingController::GetReply() const {
     const RingConCommands current_command = command;
 
     switch (current_command) {
     case RingConCommands::GetFirmwareVersion:
-        return GetFirmwareVersionReply(out_data);
+        return GetFirmwareVersionReply();
     case RingConCommands::ReadId:
-        return GetReadIdReply(out_data);
+        return GetReadIdReply();
     case RingConCommands::c20105:
-        return GetC020105Reply(out_data);
+        return GetC020105Reply();
     case RingConCommands::ReadUnkCal:
-        return GetReadUnkCalReply(out_data);
+        return GetReadUnkCalReply();
     case RingConCommands::ReadFactoryCal:
-        return GetReadFactoryCalReply(out_data);
+        return GetReadFactoryCalReply();
     case RingConCommands::ReadUserCal:
-        return GetReadUserCalReply(out_data);
+        return GetReadUserCalReply();
     case RingConCommands::ReadRepCount:
-        return GetReadRepCountReply(out_data);
+        return GetReadRepCountReply();
     case RingConCommands::ReadTotalPushCount:
-        return GetReadTotalPushCountReply(out_data);
+        return GetReadTotalPushCountReply();
     case RingConCommands::ResetRepCount:
-        return GetResetRepCountReply(out_data);
+        return GetResetRepCountReply();
     case RingConCommands::SaveCalData:
-        return GetSaveDataReply(out_data);
+        return GetSaveDataReply();
     default:
-        return GetErrorReply(out_data);
+        return GetErrorReply();
     }
 }
 
@@ -163,16 +163,16 @@ bool RingController::SetCommand(std::span<const u8> data) {
     }
 }
 
-u64 RingController::GetFirmwareVersionReply(std::span<u8> out_data) const {
+std::vector<u8> RingController::GetFirmwareVersionReply() const {
     const FirmwareVersionReply reply{
         .status = DataValid::Valid,
         .firmware = version,
     };
 
-    return GetData(reply, out_data);
+    return GetDataVector(reply);
 }
 
-u64 RingController::GetReadIdReply(std::span<u8> out_data) const {
+std::vector<u8> RingController::GetReadIdReply() const {
     // The values are hardcoded from a real joycon
     const ReadIdReply reply{
         .status = DataValid::Valid,
@@ -184,83 +184,83 @@ u64 RingController::GetReadIdReply(std::span<u8> out_data) const {
         .id_h_x4 = 8245,
     };
 
-    return GetData(reply, out_data);
+    return GetDataVector(reply);
 }
 
-u64 RingController::GetC020105Reply(std::span<u8> out_data) const {
+std::vector<u8> RingController::GetC020105Reply() const {
     const Cmd020105Reply reply{
         .status = DataValid::Valid,
         .data = 1,
     };
 
-    return GetData(reply, out_data);
+    return GetDataVector(reply);
 }
 
-u64 RingController::GetReadUnkCalReply(std::span<u8> out_data) const {
+std::vector<u8> RingController::GetReadUnkCalReply() const {
     const ReadUnkCalReply reply{
         .status = DataValid::Valid,
         .data = 0,
     };
 
-    return GetData(reply, out_data);
+    return GetDataVector(reply);
 }
 
-u64 RingController::GetReadFactoryCalReply(std::span<u8> out_data) const {
+std::vector<u8> RingController::GetReadFactoryCalReply() const {
     const ReadFactoryCalReply reply{
         .status = DataValid::Valid,
         .calibration = factory_calibration,
     };
 
-    return GetData(reply, out_data);
+    return GetDataVector(reply);
 }
 
-u64 RingController::GetReadUserCalReply(std::span<u8> out_data) const {
+std::vector<u8> RingController::GetReadUserCalReply() const {
     const ReadUserCalReply reply{
         .status = DataValid::Valid,
         .calibration = user_calibration,
     };
 
-    return GetData(reply, out_data);
+    return GetDataVector(reply);
 }
 
-u64 RingController::GetReadRepCountReply(std::span<u8> out_data) const {
+std::vector<u8> RingController::GetReadRepCountReply() const {
     const GetThreeByteReply reply{
         .status = DataValid::Valid,
         .data = {total_rep_count, 0, 0},
         .crc = GetCrcValue({total_rep_count, 0, 0, 0}),
     };
 
-    return GetData(reply, out_data);
+    return GetDataVector(reply);
 }
 
-u64 RingController::GetReadTotalPushCountReply(std::span<u8> out_data) const {
+std::vector<u8> RingController::GetReadTotalPushCountReply() const {
     const GetThreeByteReply reply{
         .status = DataValid::Valid,
         .data = {total_push_count, 0, 0},
         .crc = GetCrcValue({total_push_count, 0, 0, 0}),
     };
 
-    return GetData(reply, out_data);
+    return GetDataVector(reply);
 }
 
-u64 RingController::GetResetRepCountReply(std::span<u8> out_data) const {
-    return GetReadRepCountReply(out_data);
+std::vector<u8> RingController::GetResetRepCountReply() const {
+    return GetReadRepCountReply();
 }
 
-u64 RingController::GetSaveDataReply(std::span<u8> out_data) const {
+std::vector<u8> RingController::GetSaveDataReply() const {
     const StatusReply reply{
         .status = DataValid::Valid,
     };
 
-    return GetData(reply, out_data);
+    return GetDataVector(reply);
 }
 
-u64 RingController::GetErrorReply(std::span<u8> out_data) const {
+std::vector<u8> RingController::GetErrorReply() const {
     const ErrorReply reply{
         .status = DataValid::BadCRC,
     };
 
-    return GetData(reply, out_data);
+    return GetDataVector(reply);
 }
 
 u8 RingController::GetCrcValue(const std::vector<u8>& data) const {
@@ -281,11 +281,12 @@ u8 RingController::GetCrcValue(const std::vector<u8>& data) const {
 }
 
 template <typename T>
-u64 RingController::GetData(const T& reply, std::span<u8> out_data) const {
+std::vector<u8> RingController::GetDataVector(const T& reply) const {
     static_assert(std::is_trivially_copyable_v<T>);
-    const auto data_size = static_cast<u64>(std::min(sizeof(reply), out_data.size()));
-    std::memcpy(out_data.data(), &reply, data_size);
-    return data_size;
+    std::vector<u8> data;
+    data.resize(sizeof(reply));
+    std::memcpy(data.data(), &reply, sizeof(reply));
+    return data;
 }
 
 } // namespace Service::HID

src/hid_core/hidbus/ringcon.h

@@ -34,7 +34,7 @@ public:
     bool SetCommand(std::span<const u8> data) override;
 
     // Returns a reply from a command
-    u64 GetReply(std::span<u8> data) const override;
+    std::vector<u8> GetReply() const override;
 
 private:
     // These values are obtained from a real ring controller
@@ -184,44 +184,44 @@ private:
     RingConData GetSensorValue() const;
 
     // Returns 8 byte reply with firmware version
-    u64 GetFirmwareVersionReply(std::span<u8> out_data) const;
+    std::vector<u8> GetFirmwareVersionReply() const;
 
     // Returns 16 byte reply with ID values
-    u64 GetReadIdReply(std::span<u8> out_data) const;
+    std::vector<u8> GetReadIdReply() const;
 
     // (STUBBED) Returns 8 byte reply
-    u64 GetC020105Reply(std::span<u8> out_data) const;
+    std::vector<u8> GetC020105Reply() const;
 
     // (STUBBED) Returns 8 byte empty reply
-    u64 GetReadUnkCalReply(std::span<u8> out_data) const;
+    std::vector<u8> GetReadUnkCalReply() const;
 
     // Returns 20 byte reply with factory calibration values
-    u64 GetReadFactoryCalReply(std::span<u8> out_data) const;
+    std::vector<u8> GetReadFactoryCalReply() const;
 
     // Returns 20 byte reply with user calibration values
-    u64 GetReadUserCalReply(std::span<u8> out_data) const;
+    std::vector<u8> GetReadUserCalReply() const;
 
     // Returns 8 byte reply
-    u64 GetReadRepCountReply(std::span<u8> out_data) const;
+    std::vector<u8> GetReadRepCountReply() const;
 
     // Returns 8 byte reply
-    u64 GetReadTotalPushCountReply(std::span<u8> out_data) const;
+    std::vector<u8> GetReadTotalPushCountReply() const;
 
     // Returns 8 byte reply
-    u64 GetResetRepCountReply(std::span<u8> out_data) const;
+    std::vector<u8> GetResetRepCountReply() const;
 
     // Returns 4 byte save data reply
-    u64 GetSaveDataReply(std::span<u8> out_data) const;
+    std::vector<u8> GetSaveDataReply() const;
 
     // Returns 8 byte error reply
-    u64 GetErrorReply(std::span<u8> out_data) const;
+    std::vector<u8> GetErrorReply() const;
 
     // Returns 8 bit redundancy check from provided data
     u8 GetCrcValue(const std::vector<u8>& data) const;
 
     // Converts structs to an u8 vector equivalent
     template <typename T>
-    u64 GetData(const T& reply, std::span<u8> out_data) const;
+    std::vector<u8> GetDataVector(const T& reply) const;
 
     RingConCommands command{RingConCommands::Error};
 

src/hid_core/hidbus/starlink.cpp

@@ -38,7 +38,7 @@ u8 Starlink::GetDeviceId() const {
     return DEVICE_ID;
 }
 
-u64 Starlink::GetReply(std::span<u8> out_data) const {
+std::vector<u8> Starlink::GetReply() const {
     return {};
 }
 

src/hid_core/hidbus/starlink.h

@@ -31,7 +31,7 @@ public:
     bool SetCommand(std::span<const u8> data) override;
 
     // Returns a reply from a command
-    u64 GetReply(std::span<u8> out_data) const override;
+    std::vector<u8> GetReply() const override;
 };
 
 } // namespace Service::HID

src/hid_core/hidbus/stubbed.cpp

@@ -38,7 +38,7 @@ u8 HidbusStubbed::GetDeviceId() const {
     return DEVICE_ID;
 }
 
-u64 HidbusStubbed::GetReply(std::span<u8> out_data) const {
+std::vector<u8> HidbusStubbed::GetReply() const {
     return {};
 }
 

src/hid_core/hidbus/stubbed.h

@@ -31,7 +31,7 @@ public:
     bool SetCommand(std::span<const u8> data) override;
 
     // Returns a reply from a command
-    u64 GetReply(std::span<u8> out_data) const override;
+    std::vector<u8> GetReply() const override;
 };
 
 } // namespace Service::HID

src/video_core/host1x/codecs/decoder.cpp

@@ -1,4 +1,4 @@
-// SPDX-FileCopyrightText: Copyright 2023 yuzu Emulator Project
+// SPDX-FileCopyrightText: Copyright 2020 yuzu Emulator Project
 // SPDX-License-Identifier: GPL-2.0-or-later
 
 #include "common/assert.h"
@@ -40,8 +40,7 @@ void Decoder::Decode() {
         auto frame_copy = frame;
 
         if (!frame.get()) {
-            LOG_ERROR(HW_GPU,
-                      "Nvdec {} dailed to decode interlaced frame for top 0x{:X} bottom 0x{:X}", id,
+            LOG_ERROR(HW_GPU, "Failed to decode interlaced frame for top 0x{:X} bottom 0x{:X}",
                       luma_top, luma_bottom);
         }
 
@@ -56,8 +55,7 @@ void Decoder::Decode() {
         auto [luma_offset, chroma_offset] = GetProgressiveOffsets();
 
         if (!frame.get()) {
-            LOG_ERROR(HW_GPU, "Nvdec {} failed to decode progressive frame for luma 0x{:X}", id,
-                      luma_offset);
+            LOG_ERROR(HW_GPU, "Failed to decode progressive frame for luma 0x{:X}", luma_offset);
         }
 
         if (UsingDecodeOrder()) {

src/video_core/host1x/codecs/decoder.h

@@ -1,4 +1,4 @@
-// SPDX-FileCopyrightText: Copyright 2023 yuzu Emulator Project
+// SPDX-FileCopyrightText: Copyright 2020 yuzu Emulator Project
 // SPDX-License-Identifier: GPL-2.0-or-later
 
 #pragma once

src/video_core/host1x/codecs/h264.cpp

@@ -1,5 +1,5 @@
-// SPDX-FileCopyrightText: Copyright 2023 yuzu Emulator Project
-// SPDX-License-Identifier: GPL-2.0-or-later
+// SPDX-FileCopyrightText: Ryujinx Team and Contributors
+// SPDX-License-Identifier: MIT
 
 #include <array>
 #include <bit>

src/video_core/host1x/codecs/h264.h

@@ -1,5 +1,5 @@
-// SPDX-FileCopyrightText: Copyright 2023 yuzu Emulator Project
-// SPDX-License-Identifier: GPL-2.0-or-later
+// SPDX-FileCopyrightText: Ryujinx Team and Contributors
+// SPDX-License-Identifier: MIT
 
 #pragma once
 

src/video_core/host1x/host1x.h

@@ -66,18 +66,12 @@ public:
     void PushPresentOrder(s32 fd, u64 offset, std::shared_ptr<FFmpeg::Frame>&& frame) {
         std::scoped_lock l{m_mutex};
         auto map = m_presentation_order.find(fd);
-        if (map == m_presentation_order.end()) {
-            return;
-        }
         map->second.emplace_back(offset, std::move(frame));
     }
 
     void PushDecodeOrder(s32 fd, u64 offset, std::shared_ptr<FFmpeg::Frame>&& frame) {
         std::scoped_lock l{m_mutex};
         auto map = m_decode_order.find(fd);
-        if (map == m_decode_order.end()) {
-            return;
-        }
         map->second.insert_or_assign(offset, std::move(frame));
     }
 
@@ -88,12 +82,12 @@ public:
 
         std::scoped_lock l{m_mutex};
         auto present_map = m_presentation_order.find(fd);
-        if (present_map != m_presentation_order.end() && present_map->second.size() > 0) {
+        if (present_map->second.size() > 0) {
             return GetPresentOrderLocked(fd);
         }
 
         auto decode_map = m_decode_order.find(fd);
-        if (decode_map != m_decode_order.end() && decode_map->second.size() > 0) {
+        if (decode_map->second.size() > 0) {
             return GetDecodeOrderLocked(fd, offset);
         }
 
@@ -103,7 +97,7 @@ public:
 private:
     std::shared_ptr<FFmpeg::Frame> GetPresentOrderLocked(s32 fd) {
         auto map = m_presentation_order.find(fd);
-        if (map == m_presentation_order.end() || map->second.size() == 0) {
+        if (map->second.size() == 0) {
             return {};
         }
         auto frame = std::move(map->second.front().second);
@@ -113,9 +107,6 @@ private:
 
     std::shared_ptr<FFmpeg::Frame> GetDecodeOrderLocked(s32 fd, u64 offset) {
         auto map = m_decode_order.find(fd);
-        if (map == m_decode_order.end() || map->second.size() == 0) {
-            return {};
-        }
         auto it = map->second.find(offset);
         if (it == map->second.end()) {
             return {};

src/video_core/host1x/nvdec.cpp

@@ -24,6 +24,7 @@ Nvdec::Nvdec(Host1x& host1x_, s32 id_, u32 syncpt, FrameQueue& frame_queue_)
 
 Nvdec::~Nvdec() {
     LOG_INFO(HW_GPU, "Destroying nvdec {}", id);
+    frame_queue.Close(id);
 }
 
 void Nvdec::ProcessMethod(u32 method, u32 argument) {

src/video_core/host1x/vic.cpp

@@ -100,11 +100,10 @@ Vic::Vic(Host1x& host1x_, s32 id_, u32 syncpt, FrameQueue& frame_queue_)
 
 Vic::~Vic() {
     LOG_INFO(HW_GPU, "Destroying vic {}", id);
-    frame_queue.Close(id);
 }
 
 void Vic::ProcessMethod(u32 method, u32 arg) {
-    LOG_TRACE(HW_GPU, "Vic {} method 0x{:X}", id, static_cast<u32>(method));
+    LOG_TRACE(HW_GPU, "Vic method 0x{:X}", static_cast<u32>(method));
     regs.reg_array[method] = arg;
 
     switch (static_cast<Method>(method * sizeof(u32))) {
@@ -141,7 +140,7 @@ void Vic::Execute() {
 
             auto frame = frame_queue.GetFrame(nvdec_id, luma_offset);
             if (!frame.get()) {
-                LOG_ERROR(HW_GPU, "Vic {} failed to get frame with offset 0x{:X}", id, luma_offset);
+                LOG_ERROR(HW_GPU, "Vic failed to get frame with offset 0x{:X}", luma_offset);
                 continue;
             }
 

src/web_service/web_backend.cpp

@@ -32,14 +32,9 @@ struct Client::Impl {
     Impl(std::string host_, std::string username_, std::string token_)
         : host{std::move(host_)}, username{std::move(username_)}, token{std::move(token_)} {
         std::scoped_lock lock{jwt_cache.mutex};
-        if (this->username == jwt_cache.username && this->token == jwt_cache.token) {
+        if (username == jwt_cache.username && token == jwt_cache.token) {
             jwt = jwt_cache.jwt;
         }
-
-        // Normalize host expression
-        if (!this->host.empty() && this->host.back() == '/') {
-            static_cast<void>(this->host.pop_back());
-        }
     }
 
     /// A generic function handles POST, GET and DELETE request together
@@ -76,16 +71,18 @@ struct Client::Impl {
                              const std::string& jwt_ = "", const std::string& username_ = "",
                              const std::string& token_ = "") {
         if (cli == nullptr) {
-            cli = std::make_unique<httplib::Client>(host.c_str());
-            cli->set_connection_timeout(TIMEOUT_SECONDS);
-            cli->set_read_timeout(TIMEOUT_SECONDS);
-            cli->set_write_timeout(TIMEOUT_SECONDS);
+            cli = std::make_unique<httplib::Client>(host);
         }
+
         if (!cli->is_valid()) {
-            LOG_ERROR(WebService, "Invalid URL {}", host + path);
-            return WebResult{WebResult::Code::InvalidURL, "Invalid URL", ""};
+            LOG_ERROR(WebService, "Client is invalid, skipping request!");
+            return {};
         }
 
+        cli->set_connection_timeout(TIMEOUT_SECONDS);
+        cli->set_read_timeout(TIMEOUT_SECONDS);
+        cli->set_write_timeout(TIMEOUT_SECONDS);
+
         httplib::Headers params;
         if (!jwt_.empty()) {
             params = {
@@ -110,15 +107,15 @@ struct Client::Impl {
         request.headers = params;
         request.body = data;
 
-        httplib::Result result = cli->send(request);
+        httplib::Response response;
+        httplib::Error error;
 
-        if (!result) {
-            LOG_ERROR(WebService, "{} to {} returned null", method, host + path);
+        if (!cli->send(request, response, error)) {
+            LOG_ERROR(WebService, "{} to {} returned null (httplib Error: {})", method, host + path,
+                      httplib::to_string(error));
             return WebResult{WebResult::Code::LibError, "Null response", ""};
         }
 
-        httplib::Response response = result.value();
-
         if (response.status >= 400) {
             LOG_ERROR(WebService, "{} to {} returned error status code: {}", method, host + path,
                       response.status);

src/yuzu/configuration/configure_hotkeys.cpp

@@ -45,23 +45,15 @@ ConfigureHotkeys::ConfigureHotkeys(Core::HID::HIDCore& hid_core, QWidget* parent
 
     controller = hid_core.GetEmulatedController(Core::HID::NpadIdType::Player1);
 
-    connect(timeout_timer.get(), &QTimer::timeout, [this] {
-        const bool is_button_pressed = pressed_buttons != Core::HID::NpadButton::None ||
-                                       pressed_home_button || pressed_capture_button;
-        SetPollingResult(!is_button_pressed);
-    });
+    connect(timeout_timer.get(), &QTimer::timeout, [this] { SetPollingResult({}, true); });
 
     connect(poll_timer.get(), &QTimer::timeout, [this] {
-        pressed_buttons |= controller->GetNpadButtons().raw;
-        pressed_home_button |= this->controller->GetHomeButtons().home != 0;
-        pressed_capture_button |= this->controller->GetCaptureButtons().capture != 0;
-        if (pressed_buttons != Core::HID::NpadButton::None || pressed_home_button ||
-            pressed_capture_button) {
-            const QString button_name =
-                GetButtonCombinationName(pressed_buttons, pressed_home_button,
-                                         pressed_capture_button) +
-                QStringLiteral("...");
-            model->setData(button_model_index, button_name);
+        const auto buttons = controller->GetNpadButtons();
+        const auto home_pressed = controller->GetHomeButtons().home != 0;
+        const auto capture_pressed = controller->GetCaptureButtons().capture != 0;
+        if (home_pressed || capture_pressed) {
+            SetPollingResult(buttons.raw, false);
+            return;
         }
     });
     RetranslateUI();
@@ -162,14 +154,16 @@ void ConfigureHotkeys::ConfigureController(QModelIndex index) {
 
     const auto previous_key = model->data(index);
 
-    input_setter = [this, index, previous_key](const bool cancel) {
+    input_setter = [this, index, previous_key](const Core::HID::NpadButton button,
+                                               const bool cancel) {
         if (cancel) {
             model->setData(index, previous_key);
             return;
         }
-
+        const auto home_pressed = this->controller->GetHomeButtons().home != 0;
+        const auto capture_pressed = this->controller->GetCaptureButtons().capture != 0;
         const QString button_string =
-            GetButtonCombinationName(pressed_buttons, pressed_home_button, pressed_capture_button);
+            GetButtonCombinationName(button, home_pressed, capture_pressed);
 
         const auto [key_sequence_used, used_action] = IsUsedControllerKey(button_string);
 
@@ -183,22 +177,17 @@ void ConfigureHotkeys::ConfigureController(QModelIndex index) {
         }
     };
 
-    button_model_index = index;
-    pressed_buttons = Core::HID::NpadButton::None;
-    pressed_home_button = false;
-    pressed_capture_button = false;
-
     model->setData(index, tr("[waiting]"));
     timeout_timer->start(2500); // Cancel after 2.5 seconds
-    poll_timer->start(100);     // Check for new inputs every 100ms
+    poll_timer->start(200);     // Check for new inputs every 200ms
     // We need to disable configuration to be able to read npad buttons
     controller->DisableConfiguration();
 }
 
-void ConfigureHotkeys::SetPollingResult(const bool cancel) {
+void ConfigureHotkeys::SetPollingResult(Core::HID::NpadButton button, const bool cancel) {
     timeout_timer->stop();
     poll_timer->stop();
-    (*input_setter)(cancel);
+    (*input_setter)(button, cancel);
     // Re-Enable configuration
     controller->EnableConfiguration();
 

src/yuzu/configuration/configure_hotkeys.h

@@ -4,7 +4,6 @@
 #pragma once
 
 #include <memory>
-#include <QStandardItemModel>
 #include <QWidget>
 
 namespace Common {
@@ -55,20 +54,14 @@ private:
     void RestoreControllerHotkey(QModelIndex index);
     void RestoreHotkey(QModelIndex index);
 
-    void SetPollingResult(bool cancel);
-    QString GetButtonCombinationName(Core::HID::NpadButton button, bool home, bool capture) const;
-
     std::unique_ptr<Ui::ConfigureHotkeys> ui;
 
     QStandardItemModel* model;
 
-    bool pressed_home_button;
-    bool pressed_capture_button;
-    QModelIndex button_model_index;
-    Core::HID::NpadButton pressed_buttons;
-
+    void SetPollingResult(Core::HID::NpadButton button, bool cancel);
+    QString GetButtonCombinationName(Core::HID::NpadButton button, bool home, bool capture) const;
     Core::HID::EmulatedController* controller;
     std::unique_ptr<QTimer> timeout_timer;
     std::unique_ptr<QTimer> poll_timer;
-    std::optional<std::function<void(bool)>> input_setter;
+    std::optional<std::function<void(Core::HID::NpadButton, bool)>> input_setter;
 };

src/yuzu/configuration/configure_ui.cpp

@@ -248,22 +248,82 @@ void ConfigureUi::RetranslateUI() {
 }
 
 void ConfigureUi::InitializeLanguageComboBox() {
+    // This is a list of lexicographically sorted languages, only the available translations are
+    // shown to the user.
+    static const struct {
+        const QString name;
+        const char* id;
+    } languages[] = {
+        // clang-format off
+        {QStringLiteral(u"Bahasa Indonesia"), "id"},                                 // Indonesian
+        {QStringLiteral(u"Bahasa Melayu"), "ms"},                                    // Malay
+        {QStringLiteral(u"Catal\u00E0"), "ca"},                                      // Catalan
+        {QStringLiteral(u"\u010Ce\u0161tina"), "cs"},                                // Czech
+        {QStringLiteral(u"Dansk"), "da"},                                            // Danish
+        {QStringLiteral(u"Deutsch"), "de"},                                          // German
+        {QStringLiteral(u"English"), "en"},                                          // English
+        {QStringLiteral(u"Espa\u00F1ol"), "es"},                                     // Spanish
+        {QStringLiteral(u"Fran\u00E7ais"), "fr"},                                    // French
+        {QStringLiteral(u"Hrvatski"), "hr"},                                         // Croatian
+        {QStringLiteral(u"Italiano"), "it"},                                         // Italian
+        {QStringLiteral(u"Magyar"), "hu"},                                           // Hungarian
+        {QStringLiteral(u"Nederlands"), "nl"},                                       // Dutch
+        {QStringLiteral(u"Norsk bokm\u00E5l"), "nb"},                                // Norwegian
+        {QStringLiteral(u"Polski"), "pl"},                                           // Polish
+        {QStringLiteral(u"Portugu\u00EAs"), "pt_PT"},                                // Portuguese
+        {QStringLiteral(u"Portugu\u00EAs (Brasil)"), "pt_BR"},                       // Portuguese (Brazil)
+        {QStringLiteral(u"Rom\u00E2n\u0103"), "ro"},                                 // Romanian
+        {QStringLiteral(u"Srpski"), "sr"},                                           // Serbian
+        {QStringLiteral(u"Suomi"), "fi"},                                            // Finnish
+        {QStringLiteral(u"Svenska"), "sv"},                                          // Swedish
+        {QStringLiteral(u"Ti\u1EBFng Vi\u1EC7t"), "vi"},                             // Vietnamese
+        {QStringLiteral(u"Ti\u1EBFng Vi\u1EC7t (Vi\u1EC7t Nam)"), "vi_VN"},          // Vietnamese
+        {QStringLiteral(u"T\u00FCrk\u00E7e"), "tr_TR"},                              // Turkish
+        {QStringLiteral(u"\u0395\u03BB\u03BB\u03B7\u03BD\u03B9\u03BA\u03AC"), "el"}, // Greek
+        {QStringLiteral(u"\u0420\u0443\u0441\u0441\u043A\u0438\u0439"), "ru_RU"},    // Russian
+        {QStringLiteral(u"\u0423\u043A\u0440\u0430\u0457\u043D\u0441\u044C\u043A\u0430"),
+         "uk"},                                                                      // Ukrainian
+        {QStringLiteral(u"\u0627\u0644\u0639\u0631\u0628\u064A\u0629"), "ar"},       // Arabic
+        {QStringLiteral(u"\u0641\u0627\u0631\u0633\u06CC"), "fa"},                   // Farsi
+        {QStringLiteral(u"\uD55C\uAD6D\uC5B4"), "ko_KR"},                            // Korean
+        {QStringLiteral(u"\u65E5\u672C\u8A9E"), "ja_JP"},                            // Japanese
+        {QStringLiteral(u"\u7B80\u4F53\u4E2D\u6587"), "zh_CN"},                      // Simplified Chinese
+        {QStringLiteral(u"\u7E41\u9AD4\u4E2D\u6587"), "zh_TW"},                      // Traditional Chinese
+        // clang-format on
+    };
     ui->language_combobox->addItem(tr("<System>"), QString{});
-    ui->language_combobox->addItem(tr("English"), QStringLiteral("en"));
-    QDirIterator it(QStringLiteral(":/languages"), QDirIterator::NoIteratorFlags);
-    while (it.hasNext()) {
-        QString locale = it.next();
+    QDir languages_dir{QStringLiteral(":/languages")};
+    QStringList language_files = languages_dir.entryList();
+    for (const auto& lang : languages) {
+        if (QString::fromLatin1(lang.id) == QStringLiteral("en")) {
+            ui->language_combobox->addItem(lang.name, QStringLiteral("en"));
+            language_files.removeOne(QStringLiteral("en.qm"));
+            continue;
+        }
+        for (int i = 0; i < language_files.size(); ++i) {
+            QString locale = language_files[i];
+            locale.truncate(locale.lastIndexOf(QLatin1Char{'.'}));
+            if (QString::fromLatin1(lang.id) == locale) {
+                ui->language_combobox->addItem(lang.name, locale);
+                language_files.removeAt(i);
+                break;
+            }
+        }
+    }
+    // Anything remaining will be at the bottom
+    for (const QString& file : language_files) {
+        LOG_CRITICAL(Frontend, "Unexpected Language File: {}", file.toStdString());
+        QString locale = file;
         locale.truncate(locale.lastIndexOf(QLatin1Char{'.'}));
-        locale.remove(0, locale.lastIndexOf(QLatin1Char{'/'}) + 1);
-        const QString lang = QLocale::languageToString(QLocale(locale).language());
-        const QString country = QLocale::countryToString(QLocale(locale).country());
-        ui->language_combobox->addItem(QStringLiteral("%1 (%2)").arg(lang, country), locale);
+        const QString language_name = QLocale::languageToString(QLocale(locale).language());
+        const QString lang = QStringLiteral("%1 [%2]").arg(language_name, locale);
+        ui->language_combobox->addItem(lang, locale);
     }
 
     // Unlike other configuration changes, interface language changes need to be reflected on the
     // interface immediately. This is done by passing a signal to the main window, and then
     // retranslating when passing back.
-    connect(ui->language_combobox, qOverload<int>(&QComboBox::currentIndexChanged), this,
+    connect(ui->language_combobox, QOverload<int>::of(&QComboBox::currentIndexChanged), this,
             &ConfigureUi::OnLanguageChanged);
 }
 

src/yuzu/hotkeys.cpp

@@ -193,7 +193,8 @@ void ControllerShortcut::ControllerUpdateEvent(Core::HID::ControllerTriggerType
     if (!Settings::values.controller_navigation) {
         return;
     }
-    if (button_sequence.npad.raw == Core::HID::NpadButton::None) {
+    if (button_sequence.npad.raw == Core::HID::NpadButton::None &&
+        button_sequence.capture.raw == 0 && button_sequence.home.raw == 0) {
         return;
     }