"Merge PR 1012"

.ci/scripts/linux/docker.sh

@@ -5,11 +5,10 @@ cd /yuzu
 ccache -s
 
 mkdir build || true && cd build
-cmake .. -G Ninja -DDISPLAY_VERSION=$1 -DYUZU_USE_BUNDLED_UNICORN=ON -DYUZU_USE_QT_WEB_ENGINE=ON -DCMAKE_BUILD_TYPE=Release -DCMAKE_C_COMPILER=/usr/lib/ccache/gcc -DCMAKE_CXX_COMPILER=/usr/lib/ccache/g++ -DYUZU_ENABLE_COMPATIBILITY_REPORTING=${ENABLE_COMPATIBILITY_REPORTING:-"OFF"} -DENABLE_COMPATIBILITY_LIST_DOWNLOAD=ON -DUSE_DISCORD_PRESENCE=ON
+cmake .. -G Ninja -DYUZU_USE_BUNDLED_UNICORN=ON -DYUZU_USE_QT_WEB_ENGINE=ON -DCMAKE_BUILD_TYPE=Release -DCMAKE_C_COMPILER=/usr/lib/ccache/gcc -DCMAKE_CXX_COMPILER=/usr/lib/ccache/g++ -DYUZU_ENABLE_COMPATIBILITY_REPORTING=${ENABLE_COMPATIBILITY_REPORTING:-"OFF"} -DENABLE_COMPATIBILITY_LIST_DOWNLOAD=ON -DUSE_DISCORD_PRESENCE=ON
 
 ninja
 
 ccache -s
 
-# Ignore zlib's tests, since they aren't gated behind a CMake option.
-ctest -VV -E "(example|example64)" -C Release
+ctest -VV -C Release

.ci/scripts/linux/exec.sh

@@ -2,4 +2,4 @@
 
 mkdir -p "ccache"  || true
 chmod a+x ./.ci/scripts/linux/docker.sh
-docker run -e ENABLE_COMPATIBILITY_REPORTING -e CCACHE_DIR=/yuzu/ccache -v $(pwd):/yuzu yuzuemu/build-environments:linux-fresh /bin/bash /yuzu/.ci/scripts/linux/docker.sh $1
+docker run -e ENABLE_COMPATIBILITY_REPORTING -e CCACHE_DIR=/yuzu/ccache -v $(pwd):/yuzu yuzuemu/build-environments:linux-fresh /bin/bash /yuzu/.ci/scripts/linux/docker.sh

.ci/scripts/merge/apply-patches-by-label-private.py

@@ -1,45 +0,0 @@
-# Download all pull requests as patches that match a specific label
-# Usage: python download-patches-by-label.py <Label to Match> <Root Path Folder to DL to>
-
-import requests, sys, json, shutil, subprocess, os, traceback
-
-org = os.getenv("PRIVATEMERGEORG", "yuzu-emu")
-repo = os.getenv("PRIVATEMERGEREPO", "yuzu-private")
-tagline = sys.argv[3]
-user = sys.argv[1]
-
-dl_list = {}
-
-TAG_NAME = sys.argv[2]
-
-def check_individual(repo_id, pr_id):
-    url = 'https://%sdev.azure.com/%s/%s/_apis/git/repositories/%s/pullRequests/%s/labels?api-version=5.1-preview.1' % (user, org, repo, repo_id, pr_id)
-    response = requests.get(url)
-    if (response.ok):
-        try:
-            js = response.json()
-            return any(tag.get('name') == TAG_NAME for tag in js['value'])
-        except:
-            return False
-    return False
-
-def merge_pr(pn, ref):
-    print("Matched PR# %s" % pn)
-    print(subprocess.check_output(["git", "fetch", "https://%sdev.azure.com/%s/_git/%s" % (user, org, repo), ref, "-f"]))
-    print(subprocess.check_output(["git", "merge", "--squash", 'origin/' + ref.replace('refs/heads/','')]))
-    print(subprocess.check_output(["git", "commit", "-m\"Merge %s PR %s\"" % (tagline, pn)]))
-
-def main():
-    url = 'https://%sdev.azure.com/%s/%s/_apis/git/pullrequests?api-version=5.1' % (user, org, repo)
-    response = requests.get(url)
-    if (response.ok):
-        js = response.json()
-        tagged_prs = filter(lambda pr: check_individual(pr['repository']['id'], pr['pullRequestId']), js['value'])
-        map(lambda pr: merge_pr(pr['pullRequestId'], pr['sourceRefName']), tagged_prs)
-
-if __name__ == '__main__':
-    try:
-        main()
-    except:
-        traceback.print_exc(file=sys.stdout)
-        sys.exit(-1)

.ci/scripts/merge/apply-patches-by-label.py

@@ -1,9 +1,7 @@
 # Download all pull requests as patches that match a specific label
 # Usage: python download-patches-by-label.py <Label to Match> <Root Path Folder to DL to>
 
-import requests, sys, json, urllib3.request, shutil, subprocess, os
-
-tagline = sys.argv[2]
+import requests, sys, json, urllib3.request, shutil, subprocess
 
 http = urllib3.PoolManager()
 dl_list = {}
@@ -14,23 +12,17 @@ def check_individual(labels):
             return True
     return False
 
-def do_page(page):
-    url = 'https://api.github.com/repos/yuzu-emu/yuzu/pulls?page=%s' % page
+try:
+    url = 'https://api.github.com/repos/yuzu-emu/yuzu/pulls'
     response = requests.get(url)
     if (response.ok):
         j = json.loads(response.content)
-        if j == []:
-            return
         for pr in j:
             if (check_individual(pr["labels"])):
                 pn = pr["number"]
                 print("Matched PR# %s" % pn)
                 print(subprocess.check_output(["git", "fetch", "https://github.com/yuzu-emu/yuzu.git", "pull/%s/head:pr-%s" % (pn, pn), "-f"]))
                 print(subprocess.check_output(["git", "merge", "--squash", "pr-%s" % pn]))
-                print(subprocess.check_output(["git", "commit", "-m\"Merge %s PR %s\"" % (tagline, pn)]))
-
-try:
-    for i in range(1,30):
-        do_page(i)
+                print(subprocess.check_output(["git", "commit", "-m\"Merge PR %s\"" % pn]))
 except:
     sys.exit(-1)

.ci/scripts/windows/docker.sh

@@ -13,7 +13,7 @@ echo '' >> /bin/cmd
 chmod +x /bin/cmd
 
 mkdir build || true && cd build
-cmake .. -G Ninja -DDISPLAY_VERSION=$1 -DCMAKE_TOOLCHAIN_FILE="$(pwd)/../CMakeModules/MinGWCross.cmake" -DUSE_CCACHE=ON -DYUZU_USE_BUNDLED_UNICORN=ON -DENABLE_COMPATIBILITY_LIST_DOWNLOAD=ON -DCMAKE_BUILD_TYPE=Release
+cmake .. -G Ninja -DCMAKE_TOOLCHAIN_FILE="$(pwd)/../CMakeModules/MinGWCross.cmake" -DUSE_CCACHE=ON -DYUZU_USE_BUNDLED_UNICORN=ON -DENABLE_COMPATIBILITY_LIST_DOWNLOAD=ON -DCMAKE_BUILD_TYPE=Release
 ninja
 
 # Clean up the dirty hacks

.ci/scripts/windows/exec.sh

@@ -2,4 +2,4 @@
 
 mkdir -p "ccache" || true
 chmod a+x ./.ci/scripts/windows/docker.sh
-docker run -e CCACHE_DIR=/yuzu/ccache -v $(pwd):/yuzu yuzuemu/build-environments:linux-mingw /bin/bash -ex /yuzu/.ci/scripts/windows/docker.sh $1
+docker run -e CCACHE_DIR=/yuzu/ccache -v $(pwd):/yuzu yuzuemu/build-environments:linux-mingw /bin/bash -ex /yuzu/.ci/scripts/windows/docker.sh

.ci/scripts/windows/upload.ps1

@@ -1,38 +0,0 @@
-$GITDATE = $(git show -s --date=short --format='%ad') -replace "-",""
-$GITREV = $(git show -s --format='%h')
-$RELEASE_DIST = "yuzu-windows-msvc"
-
-$MSVC_BUILD_ZIP = "yuzu-windows-msvc-$GITDATE-$GITREV.zip" -replace " ", ""
-$MSVC_BUILD_PDB = "yuzu-windows-msvc-$GITDATE-$GITREV-debugsymbols.zip" -replace " ", ""
-$MSVC_SEVENZIP = "yuzu-windows-msvc-$GITDATE-$GITREV.7z" -replace " ", ""
-$MSVC_TAR = "yuzu-windows-msvc-$GITDATE-$GITREV.tar" -replace " ", ""
-$MSVC_TARXZ = "yuzu-windows-msvc-$GITDATE-$GITREV.tar.xz" -replace " ", ""
-
-$env:BUILD_ZIP = $MSVC_BUILD_ZIP
-$env:BUILD_SYMBOLS = $MSVC_BUILD_PDB
-$env:BUILD_UPDATE = $MSVC_SEVENZIP
-
-$BUILD_DIR = ".\build\bin\Release"
-
-mkdir pdb
-Get-ChildItem "$BUILD_DIR\" -Recurse -Filter "*.pdb" | Copy-Item -destination .\pdb
-7z a -tzip $MSVC_BUILD_PDB .\pdb\*.pdb
-rm "$BUILD_DIR\*.pdb"
-mkdir $RELEASE_DIST
-mkdir "artifacts"
-
-Copy-Item "$BUILD_DIR\*" -Destination $RELEASE_DIST -Recurse
-rm "$RELEASE_DIST\*.exe"
-Get-ChildItem "$BUILD_DIR" -Recurse -Filter "yuzu*.exe" | Copy-Item -destination $RELEASE_DIST
-Get-ChildItem "$BUILD_DIR" -Recurse -Filter "QtWebEngineProcess*.exe" | Copy-Item -destination $RELEASE_DIST
-Copy-Item .\license.txt -Destination $RELEASE_DIST
-Copy-Item .\README.md -Destination $RELEASE_DIST
-7z a -tzip $MSVC_BUILD_ZIP $RELEASE_DIST\*
-7z a $MSVC_SEVENZIP $RELEASE_DIST
-
-7z a -r -ttar $MSVC_TAR $RELEASE_DIST
-7z a -r -txz $MSVC_TARXZ $MSVC_TAR
-
-Get-ChildItem . -Filter "*.zip" | Copy-Item -destination "artifacts"
-Get-ChildItem . -Filter "*.7z" | Copy-Item -destination "artifacts"
-Get-ChildItem . -Filter "*.tar.xz" | Copy-Item -destination "artifacts"

.ci/templates/build-mock.yml

@@ -1,5 +1,5 @@
 steps:
   - script: mkdir artifacts || echo 'X' > artifacts/T1.txt
   - publish: artifacts
-    artifact: 'yuzu-$(BuildName)-mock'
+    artifact: 'yuzu-$(BuildName)-$(BuildSuffix)'
     displayName: 'Upload Artifacts'

.ci/templates/build-msvc.yml

@@ -1,22 +0,0 @@
-parameters:
-  artifactSource: 'true'
-  cache: 'false'
-  version: ''
-
-steps:
-- script: mkdir build && cd build && cmake -G "Visual Studio 15 2017 Win64" --config Release -DYUZU_USE_BUNDLED_QT=1 -DYUZU_USE_BUNDLED_SDL2=1 -DYUZU_USE_BUNDLED_UNICORN=1 -DYUZU_USE_QT_WEB_ENGINE=ON -DENABLE_COMPATIBILITY_LIST_DOWNLOAD=ON -DYUZU_ENABLE_COMPATIBILITY_REPORTING=${COMPAT} -DUSE_DISCORD_PRESENCE=ON -DDISPLAY_VERSION=${{ parameters['version'] }} .. && cd ..
-  displayName: 'Configure CMake'
-- task: MSBuild@1
-  displayName: 'Build'
-  inputs:
-    solution: 'build/yuzu.sln'
-    maximumCpuCount: true
-    configuration: release
-- task: PowerShell@2
-  displayName: 'Package Artifacts'
-  inputs:
-    targetType: 'filePath'
-    filePath: './.ci/scripts/windows/upload.ps1'
-- publish: artifacts
-  artifact: 'yuzu-$(BuildName)-windows-msvc'
-  displayName: 'Upload Artifacts'

.ci/templates/build-single.yml

@@ -1,9 +1,10 @@
 parameters:
   artifactSource: 'true'
   cache: 'false'
-  version: ''
 
 steps:
+- script: export DATE=`date '+%Y.%m.%d'` && export CI=true && AZURE_REPO_NAME=yuzu-emu/yuzu-$(BuildName) && AZURE_REPO_TAG=$(BuildName)-$DATE
+  displayName: 'Determine Build Name'
 - task: DockerInstaller@0
   displayName: 'Prepare Environment'
   inputs:
@@ -14,7 +15,7 @@ steps:
     key: yuzu-v1-$(BuildName)-$(BuildSuffix)-$(CacheSuffix)
     path: $(System.DefaultWorkingDirectory)/ccache
     cacheHitVar: CACHE_RESTORED
-- script: chmod a+x ./.ci/scripts/$(ScriptFolder)/exec.sh && ./.ci/scripts/$(ScriptFolder)/exec.sh ${{ parameters['version'] }}
+- script: chmod a+x ./.ci/scripts/$(ScriptFolder)/exec.sh && ./.ci/scripts/$(ScriptFolder)/exec.sh
   displayName: 'Build'
 - script: chmod a+x ./.ci/scripts/$(ScriptFolder)/upload.sh && RELEASE_NAME=$(BuildName) ./.ci/scripts/$(ScriptFolder)/upload.sh
   displayName: 'Package Artifacts'

.ci/templates/build-standard.yml

@@ -1,6 +1,3 @@
-parameters:
-  version: ''
-
 jobs:
 - job: build
   displayName: 'standard'
@@ -23,5 +20,4 @@ jobs:
   - template: ./build-single.yml
     parameters:
       artifactSource: 'false'
-      cache: $(parameters.cache)
-      version: $(parameters.version)
+      cache: $(parameters.cache)

.ci/templates/build-testing.yml

@@ -1,6 +1,3 @@
-parameters:
-  version: ''
-
 jobs:
 - job: build_test
   displayName: 'testing'
@@ -34,4 +31,3 @@ jobs:
       parameters:
         artifactSource: 'false'
         cache: 'false'
-        version: $(parameters.version)

.ci/templates/merge-private.yml

@@ -1,37 +0,0 @@
-jobs:
-- job: merge
-  displayName: 'pull requests'
-  steps:
-  - checkout: self
-    submodules: recursive
-  - template: ./mergebot-private.yml
-    parameters:
-      matchLabel: '$(BuildName)-merge'
-      matchLabelPublic: '$(PublicBuildName)-merge'
-  - task: ArchiveFiles@2
-    displayName: 'Package Source'
-    inputs:
-      rootFolderOrFile: '$(System.DefaultWorkingDirectory)'
-      includeRootFolder: false
-      archiveType: '7z'
-      archiveFile: '$(Build.ArtifactStagingDirectory)/yuzu-$(BuildName)-source.7z'
-  - task: PublishPipelineArtifact@1
-    displayName: 'Upload Artifacts'
-    inputs:
-      targetPath: '$(Build.ArtifactStagingDirectory)/yuzu-$(BuildName)-source.7z'
-      artifact: 'yuzu-$(BuildName)-source'
-      replaceExistingArchive: true
-- job: upload_source
-  displayName: 'upload'
-  dependsOn: merge
-  steps:
-  - template: ./sync-source.yml
-    parameters:
-      artifactSource: 'true'
-      needSubmodules: 'true'
-  - script: chmod a+x $(System.DefaultWorkingDirectory)/.ci/scripts/merge/yuzubot-git-config.sh && $(System.DefaultWorkingDirectory)/.ci/scripts/merge/yuzubot-git-config.sh
-    displayName: 'Apply Git Configuration'
-  - script: git remote add other $(GitRepoPushChangesURL)
-    displayName: 'Register Repository'
-  - script: git push --force other HEAD:$(GitPushBranch)
-    displayName: 'Update Code'

.ci/templates/merge.yml

@@ -30,7 +30,17 @@ jobs:
       needSubmodules: 'true'
   - script: chmod a+x $(System.DefaultWorkingDirectory)/.ci/scripts/merge/yuzubot-git-config.sh && $(System.DefaultWorkingDirectory)/.ci/scripts/merge/yuzubot-git-config.sh
     displayName: 'Apply Git Configuration'
+  - script: git tag -a $(BuildName)-$(Build.BuildId) -m "yuzu $(BuildName) $(Build.BuildNumber) $(Build.DefinitionName)"
+    displayName: 'Tag Source'
   - script: git remote add other $(GitRepoPushChangesURL)
     displayName: 'Register Repository'
-  - script: git push --force other HEAD:$(GitPushBranch)
+  - script: git push --follow-tags --force other HEAD:$(GitPushBranch)
     displayName: 'Update Code'
+  - script: git rev-list -n 1 $(BuildName)-$(Build.BuildId) > $(Build.ArtifactStagingDirectory)/tag-commit.sha
+    displayName: 'Calculate Release Point'
+  - task: PublishPipelineArtifact@1
+    displayName: 'Upload Release Point'
+    inputs:
+      targetPath: '$(Build.ArtifactStagingDirectory)/tag-commit.sha'
+      artifact: 'yuzu-$(BuildName)-release-point'
+      replaceExistingArchive: true

.ci/templates/mergebot-private.yml

@@ -1,30 +0,0 @@
-parameters:
-  matchLabel: 'dummy-merge'
-  matchLabelPublic: 'dummy-merge'
-
-steps:
-  - script: mkdir $(System.DefaultWorkingDirectory)/patches && pip install requests urllib3
-    displayName: 'Prepare Environment'
-  - script: chmod a+x $(System.DefaultWorkingDirectory)/.ci/scripts/merge/yuzubot-git-config.sh && $(System.DefaultWorkingDirectory)/.ci/scripts/merge/yuzubot-git-config.sh
-    displayName: 'Apply Git Configuration'
-  - task: PythonScript@0
-    displayName: 'Discover, Download, and Apply Patches (Mainline)'
-    inputs:
-      scriptSource: 'filePath'
-      scriptPath: '.ci/scripts/merge/apply-patches-by-label.py'
-      arguments: '${{ parameters.matchLabelPublic }} $(MergeTaglinePublic) patches-public'
-      workingDirectory: '$(System.DefaultWorkingDirectory)'
-  - task: PythonScript@0
-    displayName: 'Discover, Download, and Apply Patches (Patreon Public)'
-    inputs:
-      scriptSource: 'filePath'
-      scriptPath: '.ci/scripts/merge/apply-patches-by-label.py'
-      arguments: '${{ parameters.matchLabel }} "$(MergeTaglinePrivate) Public" patches-mixed-public'
-      workingDirectory: '$(System.DefaultWorkingDirectory)'
-  - task: PythonScript@0
-    displayName: 'Discover, Download, and Apply Patches (Patreon Private)'
-    inputs:
-      scriptSource: 'filePath'
-      scriptPath: '.ci/scripts/merge/apply-patches-by-label-private.py'
-      arguments: '$(PrivateMergeUser) ${{ parameters.matchLabel }} "$(MergeTaglinePrivate) Private" patches-private'
-      workingDirectory: '$(System.DefaultWorkingDirectory)'

.ci/templates/mergebot.yml

@@ -11,5 +11,5 @@ steps:
     inputs:
       scriptSource: 'filePath'
       scriptPath: '.ci/scripts/merge/apply-patches-by-label.py'
-      arguments: '${{ parameters.matchLabel }} Tagged patches'
+      arguments: '${{ parameters.matchLabel }} patches'
       workingDirectory: '$(System.DefaultWorkingDirectory)'

.ci/templates/release-download.yml

@@ -2,7 +2,7 @@ steps:
   - task: DownloadPipelineArtifact@2
     displayName: 'Download Windows Release'
     inputs:
-      artifactName: 'yuzu-$(BuildName)-windows-msvc'
+      artifactName: 'yuzu-$(BuildName)-windows-mingw'
       buildType: 'current'
       targetPath: '$(Build.ArtifactStagingDirectory)'
   - task: DownloadPipelineArtifact@2

.ci/templates/release-github.yml

@@ -1,13 +1,11 @@
 steps:
   - template: ./release-download.yml
   - task: GitHubRelease@0
-    displayName: 'GitHub Release'
     inputs:
       action: 'create'
-      title: '$(ReleasePrefix) $(DisplayVersion)'
+      title: 'yuzu $(BuildName) #$(Build.BuildId)'
       assets: '$(Build.ArtifactStagingDirectory)/*'
       gitHubConnection: $(GitHubReleaseConnectionName)
       repositoryName: '$(Build.Repository.Name)'
       target: '$(Build.SourceVersion)'
-      tagSource: manual
-      tag: $(BuildName)-$(DisplayPrefix)-$(DisplayVersion)
+      tagSource: 'auto'

.ci/templates/release-private-tag.yml

@@ -1,9 +0,0 @@
-steps:
-  - script: chmod a+x $(System.DefaultWorkingDirectory)/.ci/scripts/merge/yuzubot-git-config.sh && $(System.DefaultWorkingDirectory)/.ci/scripts/merge/yuzubot-git-config.sh
-    displayName: 'Apply Git Configuration'
-  - script: git tag -a $(BuildName)-$(DisplayPrefix)-$(DisplayVersion) -m "yuzu $(BuildName) $(Build.BuildNumber) $(Build.DefinitionName) $(DisplayPrefix)-$(DisplayVersion)"
-    displayName: 'Tag Source'
-  - script: git remote add other $(GitRepoPushChangesURL)
-    displayName: 'Register Repository'
-  - script: git push other $(BuildName)-$(DisplayPrefix)-$(DisplayVersion)
-    displayName: 'Update Code'

.ci/yuzu-mainline-step2.yml

@@ -1,9 +1,6 @@
 trigger:
 - master
 
-variables:
-  DisplayVersion: $[counter(variables['DisplayPrefix'], 1)]
-
 stages:
 - stage: format
   displayName: 'format'
@@ -18,51 +15,14 @@ stages:
   dependsOn: format
   displayName: 'build'
   jobs:
-  - job: build
-    displayName: 'standard'
-    pool:
-      vmImage: ubuntu-latest
-    strategy:
-      maxParallel: 10
-      matrix:
-        linux:
-          BuildSuffix: 'linux'
-          ScriptFolder: 'linux'
-    steps:
-    - template: ./templates/sync-source.yml
-      parameters:
-        artifactSource: $(parameters.artifactSource)
-        needSubmodules: 'true'
-    - template: ./templates/build-single.yml
-      parameters:
-        artifactSource: 'false'
-        cache: 'true'
-        version: $(DisplayVersion)
-- stage: build_win
-  dependsOn: format
-  displayName: 'build-windows'
-  jobs:
-  - job: build
-    displayName: 'msvc'
-    pool:
-      vmImage: vs2017-win2016
-    steps:
-    - template: ./templates/sync-source.yml
-      parameters:
-        artifactSource: $(parameters.artifactSource)
-        needSubmodules: 'true'
-    - template: ./templates/build-msvc.yml
-      parameters:
-        artifactSource: 'false'
-        cache: 'true'
-        version: $(DisplayVersion)
+  - template: ./templates/build-standard.yml
+    parameters:
+      cache: 'true'
 - stage: release
-  displayName: 'release'
-  dependsOn:
-  - build
-  - build_win
+  displayName: 'Release'
+  dependsOn: build
   jobs:
   - job: github
-    displayName: 'github'
+    displayName: 'GitHub Release'
     steps:
     - template: ./templates/release-github.yml

.ci/yuzu-patreon-step1.yml

@@ -1,8 +0,0 @@
-trigger:
-- master
-
-stages:
-- stage: merge
-  displayName: 'merge'
-  jobs:
-  - template: ./templates/merge-private.yml

.ci/yuzu-patreon-step2.yml

@@ -1,42 +0,0 @@
-trigger:
-- master
-
-variables:
-  DisplayVersion: $[counter(variables['DisplayPrefix'], 1)]
-
-stages:
-- stage: format
-  displayName: 'format'
-  jobs:
-  - job: format
-    displayName: 'clang'
-    pool:
-      vmImage: ubuntu-latest
-    steps:
-    - template: ./templates/format-check.yml
-- stage: build
-  dependsOn: format
-  displayName: 'build'
-  jobs:
-  - job: build
-    displayName: 'windows-msvc'
-    pool:
-      vmImage: vs2017-win2016
-    steps:
-    - template: ./templates/sync-source.yml
-      parameters:
-        artifactSource: $(parameters.artifactSource)
-        needSubmodules: 'true'
-    - template: ./templates/build-msvc.yml
-      parameters:
-        artifactSource: 'false'
-        cache: $(parameters.cache)
-        version: $(DisplayVersion)
-- stage: release
-  displayName: 'release'
-  dependsOn: build
-  jobs:
-    - job: release
-      displayName: 'source'
-      steps:
-        - template: ./templates/release-private-tag.yml

.ci/yuzu-patreon.yml

@@ -0,0 +1,19 @@
+# Starter pipeline
+# Start with a minimal pipeline that you can customize to build and deploy your code.
+# Add steps that build, run tests, deploy, and more:
+# https://aka.ms/yaml
+
+trigger:
+- master
+
+pool:
+  vmImage: 'ubuntu-latest'
+
+steps:
+- script: echo Hello, world!
+  displayName: 'Run a one-line script'
+
+- script: |
+    echo Add other tasks to build, test, and deploy your project.
+    echo See https://aka.ms/yaml
+  displayName: 'Run a multi-line script'

.gitmodules

@@ -46,9 +46,3 @@
 [submodule "sirit"]
     path = externals/sirit
     url = https://github.com/ReinUsesLisp/sirit
-[submodule "libzip"]
-    path = externals/libzip
-    url = https://github.com/DarkLordZach/libzip
-[submodule "zlib"]
-    path = externals/zlib
-    url = https://github.com/madler/zlib

CMakeLists.txt

@@ -21,8 +21,6 @@ option(YUZU_USE_BUNDLED_UNICORN "Build/Download bundled Unicorn" ON)
 
 option(YUZU_USE_QT_WEB_ENGINE "Use QtWebEngine for web applet implementation" OFF)
 
-option(YUZU_ENABLE_BOXCAT "Enable the Boxcat service, a yuzu high-level implementation of BCAT" ON)
-
 option(ENABLE_CUBEB "Enables the cubeb audio backend" ON)
 
 option(ENABLE_VULKAN "Enables Vulkan backend" ON)

CMakeModules/GenerateSCMRev.cmake

@@ -83,15 +83,9 @@ set(HASH_FILES
     "${VIDEO_CORE}/shader/decode/video.cpp"
     "${VIDEO_CORE}/shader/decode/warp.cpp"
     "${VIDEO_CORE}/shader/decode/xmad.cpp"
-    "${VIDEO_CORE}/shader/ast.cpp"
-    "${VIDEO_CORE}/shader/ast.h"
     "${VIDEO_CORE}/shader/control_flow.cpp"
     "${VIDEO_CORE}/shader/control_flow.h"
-    "${VIDEO_CORE}/shader/compiler_settings.cpp"
-    "${VIDEO_CORE}/shader/compiler_settings.h"
     "${VIDEO_CORE}/shader/decode.cpp"
-    "${VIDEO_CORE}/shader/expr.cpp"
-    "${VIDEO_CORE}/shader/expr.h"
     "${VIDEO_CORE}/shader/node.h"
     "${VIDEO_CORE}/shader/node_helper.cpp"
     "${VIDEO_CORE}/shader/node_helper.h"

README.md

@@ -1,6 +1,7 @@
 yuzu emulator
 =============
 [![Travis CI Build Status](https://travis-ci.org/yuzu-emu/yuzu.svg?branch=master)](https://travis-ci.org/yuzu-emu/yuzu)
+[![AppVeyor CI Build Status](https://ci.appveyor.com/api/projects/status/77k97svb2usreu68?svg=true)](https://ci.appveyor.com/project/bunnei/yuzu)
 [![Azure Mainline CI Build Status](https://dev.azure.com/yuzu-emu/yuzu/_apis/build/status/yuzu%20mainline?branchName=master)](https://dev.azure.com/yuzu-emu/yuzu/)
 
 yuzu is an experimental open-source emulator for the Nintendo Switch from the creators of [Citra](https://citra-emu.org/).

dist/yuzu.svg

@@ -1 +1,86 @@
-<svg id="svg815" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 614.4 682.67"><defs><style>.cls-1{fill:none;}.cls-2{clip-path:url(#clip-path);}.cls-3{fill:#ff3c28;}.cls-4{fill:#0ab9e6;}</style><clipPath id="clip-path"><rect class="cls-1" x="-43" y="-46.67" width="699.6" height="777.33"/></clipPath></defs><title>Artboard 1</title><g id="g823"><g id="right"><g class="cls-2"><g id="g827"><g id="g833"><path id="path835" class="cls-3" d="M340.81,138V682.08c150.26,0,272.06-121.81,272.06-272.06S491.07,138,340.81,138M394,197.55a219.06,219.06,0,0,1,0,424.94V197.55"/></g></g></g></g><g id="left"><g class="cls-2"><g id="g839"><g id="g845"><path id="path847" class="cls-4" d="M272.79,1.92C122.53,1.92.73,123.73.73,274s121.8,272.07,272.06,272.07ZM219.65,61.51v425A219,219,0,0,1,118,119.18,217.51,217.51,0,0,1,219.65,61.51"/></g></g></g></g></g></svg>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   version="1.1"
+   id="svg815"
+   xml:space="preserve"
+   width="72"
+   height="80"
+   viewBox="0 0 72 80"
+   sodipodi:docname="center-logo-v3.svg"
+   inkscape:version="0.92.2 (5c3e80d, 2017-08-06)"><metadata
+     id="metadata821"><rdf:RDF><cc:Work
+         rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" /><dc:title></dc:title></cc:Work></rdf:RDF></metadata><defs
+     id="defs819"><clipPath
+       clipPathUnits="userSpaceOnUse"
+       id="clipPath831"><path
+         d="M 0,60 H 54 V 0 H 0 Z"
+         id="path829"
+         inkscape:connector-curvature="0" /></clipPath><clipPath
+       clipPathUnits="userSpaceOnUse"
+       id="clipPath843"><path
+         d="M 0,60 H 54 V 0 H 0 Z"
+         id="path841"
+         inkscape:connector-curvature="0" /></clipPath><clipPath
+       clipPathUnits="userSpaceOnUse"
+       id="clipPath855"><path
+         d="M 0,60 H 54 V 0 H 0 Z"
+         id="path853"
+         inkscape:connector-curvature="0" /></clipPath><clipPath
+       clipPathUnits="userSpaceOnUse"
+       id="clipPath867"><path
+         d="M 0,60 H 54 V 0 H 0 Z"
+         id="path865"
+         inkscape:connector-curvature="0" /></clipPath></defs><sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="1920"
+     inkscape:window-height="1017"
+     id="namedview817"
+     showgrid="false"
+     inkscape:zoom="7.4953319"
+     inkscape:cx="28.177201"
+     inkscape:cy="44.348084"
+     inkscape:window-x="-8"
+     inkscape:window-y="-8"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="g823" /><g
+     id="g823"
+     inkscape:groupmode="layer"
+     inkscape:label="center-logo-v3"
+     transform="matrix(1.3333333,0,0,-1.3333333,0,80)"><g
+       id="right"
+       inkscape:label="#g825"><g
+         id="g827"
+         clip-path="url(#clipPath831)"><g
+           id="g833"
+           transform="translate(30,48)"><path
+             d="m 0,0 v -48 c 13.255,0 24,10.745 24,24 C 24,-10.745 13.255,0 0,0 M 3,-3.214 C 13.163,-4.674 21,-13.439 21,-24 21,-34.561 13.163,-43.326 3,-44.786 v 41.572"
+             style="fill:#ff3c28;fill-opacity:1;fill-rule:nonzero;stroke:none"
+             id="path835"
+             inkscape:connector-curvature="0" /></g></g></g><g
+       id="left"
+       inkscape:label="#g837"><g
+         id="g839"
+         clip-path="url(#clipPath843)"><g
+           id="g845"
+           transform="translate(24,60)"><path
+             d="m 0,0 c -13.255,0 -24,-10.745 -24,-24 0,-13.255 10.745,-24 24,-24 z m -3,-3.214 v -41.572 c -10.163,1.46 -18,10.225 -18,20.786 0,10.561 7.837,19.326 18,20.786"
+             style="fill:#0ab9e6;fill-opacity:1;fill-rule:nonzero;stroke:none"
+             id="path847"
+             inkscape:connector-curvature="0" /></g></g></g></g></svg>

externals/CMakeLists.txt

@@ -77,12 +77,6 @@ if (ENABLE_VULKAN)
     add_subdirectory(sirit)
 endif()
 
-# zlib
-add_subdirectory(zlib EXCLUDE_FROM_ALL)
-
-# libzip
-add_subdirectory(libzip EXCLUDE_FROM_ALL)
-
 if (ENABLE_WEB_SERVICE)
     # LibreSSL
     set(LIBRESSL_SKIP_INSTALL ON CACHE BOOL "")

license.txt

@@ -341,24 +341,15 @@ Public License instead of this License.
 
 The icons used in this project have the following licenses:
 
-Icon Name                                   | License       | Origin/Author
----                                         | ---           | ---
-checked.png                                 | Free for non-commercial use
-failed.png                                  | Free for non-commercial use
-lock.png                                    | CC BY-ND 3.0  | https://icons8.com
-plus_folder.png (Default, Dark)             | CC BY-ND 3.0  | https://icons8.com
-bad_folder.png (Default, Dark)              | CC BY-ND 3.0  | https://icons8.com
-chip.png (Default, Dark)                    | CC BY-ND 3.0  | https://icons8.com
-folder.png (Default, Dark)                  | CC BY-ND 3.0  | https://icons8.com
-plus.png (Default, Dark)                    | CC0 1.0       | Designed by BreadFish64 from the Citra team
-sd_card.png (Default, Dark)                 | CC BY-ND 3.0  | https://icons8.com
-plus_folder.png (Colorful, Colorful Dark)   | CC BY-ND 3.0  | https://icons8.com
-bad_folder.png (Colorful, Colorful Dark)    | CC BY-ND 3.0  | https://icons8.com
-chip.png (Colorful, Colorful Dark)          | CC BY-ND 3.0  | https://icons8.com
-folder.png (Colorful, Colorful Dark)        | CC BY-ND 3.0  | https://icons8.com
-plus.png (Colorful, Colorful Dark)          | CC BY-ND 3.0  | https://icons8.com
-sd_card.png (Colorful, Colorful Dark)       | CC BY-ND 3.0  | https://icons8.com
-
-Note:
-Some icons are different in different themes, and they are separately listed
-only when they have different licenses/origins.
+Icon Name                          | License       | Origin/Author
+---                                | ---           | ---
+checked.png                        | Free for non-commercial use
+failed.png                         | Free for non-commercial use
+lock.png                           | CC BY-ND 3.0  | https://icons8.com
+plus_folder.png                    | CC BY-ND 3.0  | https://icons8.com
+bad_folder.png                     | CC BY-ND 3.0  | https://icons8.com
+chip.png                           | CC BY-ND 3.0  | https://icons8.com
+folder.png                         | CC BY-ND 3.0  | https://icons8.com
+plus.png (Default, Dark)           | CC0 1.0       | Designed by BreadFish64 from the Citra team
+plus.png (Colorful, Colorful Dark) | CC BY-ND 3.0  | https://icons8.com
+sd_card.png | CC BY-ND 3.0 | https://icons8.com

src/common/CMakeLists.txt

@@ -15,23 +15,11 @@ if (DEFINED ENV{CI})
     set(BUILD_TAG $ENV{AZURE_REPO_TAG})
   endif()
 endif()
-if (DEFINED ENV{TITLEBARFORMATIDLE})
-  set(TITLE_BAR_FORMAT_IDLE $ENV{TITLEBARFORMATIDLE})
-endif ()
-if (DEFINED ENV{TITLEBARFORMATRUNNING})
-  set(TITLE_BAR_FORMAT_RUNNING $ENV{TITLEBARFORMATRUNNING})
-endif ()
-if (DEFINED ENV{DISPLAYVERSION})
-  set(DISPLAY_VERSION $ENV{DISPLAYVERSION})
-endif ()
 add_custom_command(OUTPUT scm_rev.cpp
     COMMAND ${CMAKE_COMMAND}
       -DSRC_DIR="${CMAKE_SOURCE_DIR}"
       -DBUILD_REPOSITORY="${BUILD_REPOSITORY}"
-      -DTITLE_BAR_FORMAT_IDLE="${TITLE_BAR_FORMAT_IDLE}"
-      -DTITLE_BAR_FORMAT_RUNNING="${TITLE_BAR_FORMAT_RUNNING}"
       -DBUILD_TAG="${BUILD_TAG}"
-      -DBUILD_ID="${DISPLAY_VERSION}"
       -P "${CMAKE_SOURCE_DIR}/CMakeModules/GenerateSCMRev.cmake"
     DEPENDS
       # WARNING! It was too much work to try and make a common location for this list,
@@ -72,15 +60,9 @@ add_custom_command(OUTPUT scm_rev.cpp
       "${VIDEO_CORE}/shader/decode/video.cpp"
       "${VIDEO_CORE}/shader/decode/warp.cpp"
       "${VIDEO_CORE}/shader/decode/xmad.cpp"
-      "${VIDEO_CORE}/shader/ast.cpp"
-      "${VIDEO_CORE}/shader/ast.h"
       "${VIDEO_CORE}/shader/control_flow.cpp"
       "${VIDEO_CORE}/shader/control_flow.h"
-      "${VIDEO_CORE}/shader/compiler_settings.cpp"
-      "${VIDEO_CORE}/shader/compiler_settings.h"
       "${VIDEO_CORE}/shader/decode.cpp"
-      "${VIDEO_CORE}/shader/expr.cpp"
-      "${VIDEO_CORE}/shader/expr.h"
       "${VIDEO_CORE}/shader/node.h"
       "${VIDEO_CORE}/shader/node_helper.cpp"
       "${VIDEO_CORE}/shader/node_helper.h"

src/common/alignment.h

@@ -51,17 +51,7 @@ public:
     using reference = T&;
     using const_reference = const T&;
 
-    using propagate_on_container_copy_assignment = std::true_type;
-    using propagate_on_container_move_assignment = std::true_type;
-    using propagate_on_container_swap = std::true_type;
-    using is_always_equal = std::true_type;
-
 public:
-    constexpr AlignmentAllocator() noexcept = default;
-
-    template <typename T2>
-    constexpr AlignmentAllocator(const AlignmentAllocator<T2, Align>&) noexcept {}
-
     pointer address(reference r) noexcept {
         return std::addressof(r);
     }

src/common/common_paths.h

@@ -36,6 +36,7 @@
 #define LOAD_DIR "load"
 #define DUMP_DIR "dump"
 #define SHADER_DIR "shader"
+#define RESCALING_DIR "rescaling"
 #define LOG_DIR "log"
 
 // Filenames

src/common/file_util.cpp

@@ -695,6 +695,7 @@ const std::string& GetUserPath(UserPath path, const std::string& new_path) {
         paths.emplace(UserPath::LoadDir, user_path + LOAD_DIR DIR_SEP);
         paths.emplace(UserPath::DumpDir, user_path + DUMP_DIR DIR_SEP);
         paths.emplace(UserPath::ShaderDir, user_path + SHADER_DIR DIR_SEP);
+        paths.emplace(UserPath::RescalingDir, user_path + RESCALING_DIR DIR_SEP);
         paths.emplace(UserPath::SysDataDir, user_path + SYSDATA_DIR DIR_SEP);
         paths.emplace(UserPath::KeysDir, user_path + KEYS_DIR DIR_SEP);
         // TODO: Put the logs in a better location for each OS
@@ -713,6 +714,7 @@ const std::string& GetUserPath(UserPath path, const std::string& new_path) {
         case UserPath::RootDir:
             user_path = paths[UserPath::RootDir] + DIR_SEP;
             break;
+
         case UserPath::UserDir:
             user_path = paths[UserPath::RootDir] + DIR_SEP;
             paths[UserPath::ConfigDir] = user_path + CONFIG_DIR DIR_SEP;
@@ -720,8 +722,6 @@ const std::string& GetUserPath(UserPath path, const std::string& new_path) {
             paths[UserPath::SDMCDir] = user_path + SDMC_DIR DIR_SEP;
             paths[UserPath::NANDDir] = user_path + NAND_DIR DIR_SEP;
             break;
-        default:
-            break;
         }
     }
 

src/common/file_util.h

@@ -33,6 +33,7 @@ enum class UserPath {
     LoadDir,
     DumpDir,
     ShaderDir,
+    RescalingDir,
     SysDataDir,
     UserDir,
 };

src/common/scm_rev.cpp.in

@@ -11,9 +11,6 @@
 #define BUILD_DATE   "@BUILD_DATE@"
 #define BUILD_FULLNAME "@BUILD_FULLNAME@"
 #define BUILD_VERSION "@BUILD_VERSION@"
-#define BUILD_ID "@BUILD_ID@"
-#define TITLE_BAR_FORMAT_IDLE "@TITLE_BAR_FORMAT_IDLE@"
-#define TITLE_BAR_FORMAT_RUNNING "@TITLE_BAR_FORMAT_RUNNING@"
 #define SHADER_CACHE_VERSION "@SHADER_CACHE_VERSION@"
 
 namespace Common {
@@ -25,9 +22,6 @@ const char g_build_name[]   = BUILD_NAME;
 const char g_build_date[]   = BUILD_DATE;
 const char g_build_fullname[] = BUILD_FULLNAME;
 const char g_build_version[]  = BUILD_VERSION;
-const char g_build_id[] = BUILD_ID;
-const char g_title_bar_format_idle[] = TITLE_BAR_FORMAT_IDLE;
-const char g_title_bar_format_running[] = TITLE_BAR_FORMAT_RUNNING;
 const char g_shader_cache_version[] = SHADER_CACHE_VERSION;
 
 } // namespace

src/common/scm_rev.h

@@ -13,9 +13,6 @@ extern const char g_build_name[];
 extern const char g_build_date[];
 extern const char g_build_fullname[];
 extern const char g_build_version[];
-extern const char g_build_id[];
-extern const char g_title_bar_format_idle[];
-extern const char g_title_bar_format_running[];
 extern const char g_shader_cache_version[];
 
 } // namespace Common

src/core/CMakeLists.txt

@@ -1,9 +1,3 @@
-if (YUZU_ENABLE_BOXCAT)
-    set(BCAT_BOXCAT_ADDITIONAL_SOURCES hle/service/bcat/backend/boxcat.cpp hle/service/bcat/backend/boxcat.h)
-else()
-    set(BCAT_BOXCAT_ADDITIONAL_SOURCES)
-endif()
-
 add_library(core STATIC
     arm/arm_interface.h
     arm/arm_interface.cpp
@@ -88,8 +82,6 @@ add_library(core STATIC
     file_sys/vfs_concat.h
     file_sys/vfs_layered.cpp
     file_sys/vfs_layered.h
-    file_sys/vfs_libzip.cpp
-    file_sys/vfs_libzip.h
     file_sys/vfs_offset.cpp
     file_sys/vfs_offset.h
     file_sys/vfs_real.cpp
@@ -249,9 +241,6 @@ add_library(core STATIC
     hle/service/audio/errors.h
     hle/service/audio/hwopus.cpp
     hle/service/audio/hwopus.h
-    hle/service/bcat/backend/backend.cpp
-    hle/service/bcat/backend/backend.h
-    ${BCAT_BOXCAT_ADDITIONAL_SOURCES}
     hle/service/bcat/bcat.cpp
     hle/service/bcat/bcat.h
     hle/service/bcat/module.cpp
@@ -335,8 +324,6 @@ add_library(core STATIC
     hle/service/ldr/ldr.h
     hle/service/lm/lm.cpp
     hle/service/lm/lm.h
-    hle/service/lm/manager.cpp
-    hle/service/lm/manager.h
     hle/service/mig/mig.cpp
     hle/service/mig/mig.h
     hle/service/mii/mii.cpp
@@ -512,15 +499,6 @@ create_target_directory_groups(core)
 
 target_link_libraries(core PUBLIC common PRIVATE audio_core video_core)
 target_link_libraries(core PUBLIC Boost::boost PRIVATE fmt json-headers mbedtls opus unicorn open_source_archives)
-
-if (YUZU_ENABLE_BOXCAT)
-    get_directory_property(OPENSSL_LIBS
-        DIRECTORY ${PROJECT_SOURCE_DIR}/externals/libressl
-        DEFINITION OPENSSL_LIBS)
-    target_compile_definitions(core PRIVATE -DCPPHTTPLIB_OPENSSL_SUPPORT -DYUZU_ENABLE_BOXCAT)
-    target_link_libraries(core PRIVATE httplib json-headers ${OPENSSL_LIBS} zip)
-endif()
-
 if (ENABLE_WEB_SERVICE)
     target_compile_definitions(core PRIVATE -DENABLE_WEB_SERVICE)
     target_link_libraries(core PRIVATE web_service)

src/core/arm/dynarmic/arm_dynarmic.cpp

@@ -248,6 +248,9 @@ void ARM_Dynarmic::LoadContext(const ThreadContext& ctx) {
 }
 
 void ARM_Dynarmic::PrepareReschedule() {
+    if (jit == nullptr)
+        return;
+
     jit->HaltExecution();
 }
 

src/core/core.cpp

@@ -35,7 +35,6 @@
 #include "core/hle/service/apm/controller.h"
 #include "core/hle/service/filesystem/filesystem.h"
 #include "core/hle/service/glue/manager.h"
-#include "core/hle/service/lm/manager.h"
 #include "core/hle/service/service.h"
 #include "core/hle/service/sm/sm.h"
 #include "core/loader/loader.h"
@@ -112,8 +111,7 @@ FileSys::VirtualFile GetGameFileFromPath(const FileSys::VirtualFilesystem& vfs,
 }
 struct System::Impl {
     explicit Impl(System& system)
-        : kernel{system}, fs_controller{system}, cpu_core_manager{system},
-          applet_manager{system}, reporter{system} {}
+        : kernel{system}, cpu_core_manager{system}, applet_manager{system}, reporter{system} {}
 
     Cpu& CurrentCpuCore() {
         return cpu_core_manager.GetCurrentCore();
@@ -251,13 +249,9 @@ struct System::Impl {
         telemetry_session->AddField(Telemetry::FieldType::Performance, "Mean_Frametime_MS",
                                     perf_stats->GetMeanFrametime());
 
-        lm_manager.Flush();
-
         is_powered_on = false;
         exit_lock = false;
 
-        gpu_core->WaitIdle();
-
         // Shutdown emulation session
         renderer.reset();
         GDBStub::Shutdown();
@@ -343,10 +337,8 @@ struct System::Impl {
     bool is_powered_on = false;
     bool exit_lock = false;
 
-    Reporter reporter;
     std::unique_ptr<Memory::CheatEngine> cheat_engine;
     std::unique_ptr<Tools::Freezer> memory_freezer;
-    std::array<u8, 0x20> build_id{};
 
     /// Frontend applets
     Service::AM::Applets::AppletManager applet_manager;
@@ -354,9 +346,8 @@ struct System::Impl {
     /// APM (Performance) services
     Service::APM::Controller apm_controller{core_timing};
 
-    /// Service State
+    /// Glue services
     Service::Glue::ARPManager arp_manager;
-    Service::LM::Manager lm_manager{reporter};
 
     /// Service manager
     std::shared_ptr<Service::SM::ServiceManager> service_manager;
@@ -364,6 +355,8 @@ struct System::Impl {
     /// Telemetry session for this emulation session
     std::unique_ptr<Core::TelemetrySession> telemetry_session;
 
+    Reporter reporter;
+
     ResultStatus status = ResultStatus::Success;
     std::string status_details = "";
 
@@ -655,14 +648,6 @@ const Service::APM::Controller& System::GetAPMController() const {
     return impl->apm_controller;
 }
 
-Service::LM::Manager& System::GetLogManager() {
-    return impl->lm_manager;
-}
-
-const Service::LM::Manager& System::GetLogManager() const {
-    return impl->lm_manager;
-}
-
 void System::SetExitLock(bool locked) {
     impl->exit_lock = locked;
 }
@@ -671,14 +656,6 @@ bool System::GetExitLock() const {
     return impl->exit_lock;
 }
 
-void System::SetCurrentProcessBuildID(const CurrentBuildProcessID& id) {
-    impl->build_id = id;
-}
-
-const System::CurrentBuildProcessID& System::GetCurrentProcessBuildID() const {
-    return impl->build_id;
-}
-
 System::ResultStatus System::Init(Frontend::EmuWindow& emu_window) {
     return impl->Init(*this, emu_window);
 }

src/core/core.h

@@ -8,6 +8,7 @@
 #include <memory>
 #include <string>
 
+#include <map>
 #include "common/common_types.h"
 #include "core/file_sys/vfs_types.h"
 #include "core/hle/kernel/object.h"
@@ -58,10 +59,6 @@ namespace Glue {
 class ARPManager;
 }
 
-namespace LM {
-class Manager;
-} // namespace LM
-
 namespace SM {
 class ServiceManager;
 } // namespace SM
@@ -102,8 +99,6 @@ FileSys::VirtualFile GetGameFileFromPath(const FileSys::VirtualFilesystem& vfs,
 
 class System {
 public:
-    using CurrentBuildProcessID = std::array<u8, 0x20>;
-
     System(const System&) = delete;
     System& operator=(const System&) = delete;
 
@@ -341,18 +336,10 @@ public:
 
     const Service::APM::Controller& GetAPMController() const;
 
-    Service::LM::Manager& GetLogManager();
-
-    const Service::LM::Manager& GetLogManager() const;
-
     void SetExitLock(bool locked);
 
     bool GetExitLock() const;
 
-    void SetCurrentProcessBuildID(const CurrentBuildProcessID& id);
-
-    const CurrentBuildProcessID& GetCurrentProcessBuildID() const;
-
 private:
     System();
 
@@ -376,4 +363,8 @@ private:
     static System s_instance;
 };
 
+inline Kernel::Process* CurrentProcess() {
+    return System::GetInstance().CurrentProcess();
+}
+
 } // namespace Core

src/core/crypto/key_manager.cpp

@@ -423,7 +423,7 @@ static std::optional<u64> FindTicketOffset(const std::array<u8, size>& data) {
 std::optional<std::pair<Key128, Key128>> ParseTicket(const Ticket& ticket,
                                                      const RSAKeyPair<2048>& key) {
     const auto issuer = ticket.GetData().issuer;
-    if (IsAllZeroArray(issuer))
+    if (issuer == std::array<u8, 0x40>{})
         return {};
     if (issuer[0] != 'R' || issuer[1] != 'o' || issuer[2] != 'o' || issuer[3] != 't') {
         LOG_INFO(Crypto, "Attempting to parse ticket with non-standard certificate authority.");

src/core/file_sys/bis_factory.cpp

@@ -136,9 +136,4 @@ u64 BISFactory::GetFullNANDTotalSpace() const {
     return static_cast<u64>(Settings::values.nand_total_size);
 }
 
-VirtualDir BISFactory::GetBCATDirectory(u64 title_id) const {
-    return GetOrCreateDirectoryRelative(nand_root,
-                                        fmt::format("/system/save/bcat/{:016X}", title_id));
-}
-
 } // namespace FileSys

src/core/file_sys/bis_factory.h

@@ -61,8 +61,6 @@ public:
     u64 GetUserNANDTotalSpace() const;
     u64 GetFullNANDTotalSpace() const;
 
-    VirtualDir GetBCATDirectory(u64 title_id) const;
-
 private:
     VirtualDir nand_root;
     VirtualDir load_root;

src/core/file_sys/card_image.cpp

@@ -31,7 +31,7 @@ constexpr std::array partition_names{
 
 XCI::XCI(VirtualFile file_)
     : file(std::move(file_)), program_nca_status{Loader::ResultStatus::ErrorXCIMissingProgramNCA},
-      partitions(partition_names.size()), partitions_raw(partition_names.size()) {
+      partitions(partition_names.size()) {
     if (file->ReadObject(&header) != sizeof(GamecardHeader)) {
         status = Loader::ResultStatus::ErrorBadXCIHeader;
         return;
@@ -42,10 +42,8 @@ XCI::XCI(VirtualFile file_)
         return;
     }
 
-    PartitionFilesystem main_hfs(std::make_shared<OffsetVfsFile>(
-        file, file->GetSize() - header.hfs_offset, header.hfs_offset));
-
-    update_normal_partition_end = main_hfs.GetFileOffsets()["secure"];
+    PartitionFilesystem main_hfs(
+        std::make_shared<OffsetVfsFile>(file, header.hfs_size, header.hfs_offset));
 
     if (main_hfs.GetStatus() != Loader::ResultStatus::Success) {
         status = main_hfs.GetStatus();
@@ -57,7 +55,9 @@ XCI::XCI(VirtualFile file_)
         const auto partition_idx = static_cast<std::size_t>(partition);
         auto raw = main_hfs.GetFile(partition_names[partition_idx]);
 
-        partitions_raw[static_cast<std::size_t>(partition)] = raw;
+        if (raw != nullptr) {
+            partitions[partition_idx] = std::make_shared<PartitionFilesystem>(std::move(raw));
+        }
     }
 
     secure_partition = std::make_shared<NSP>(
@@ -71,7 +71,13 @@ XCI::XCI(VirtualFile file_)
         program_nca_status = Loader::ResultStatus::ErrorXCIMissingProgramNCA;
     }
 
-    auto result = AddNCAFromPartition(XCIPartition::Normal);
+    auto result = AddNCAFromPartition(XCIPartition::Update);
+    if (result != Loader::ResultStatus::Success) {
+        status = result;
+        return;
+    }
+
+    result = AddNCAFromPartition(XCIPartition::Normal);
     if (result != Loader::ResultStatus::Success) {
         status = result;
         return;
@@ -98,114 +104,34 @@ Loader::ResultStatus XCI::GetProgramNCAStatus() const {
     return program_nca_status;
 }
 
-VirtualDir XCI::GetPartition(XCIPartition partition) {
-    const auto id = static_cast<std::size_t>(partition);
-    if (partitions[id] == nullptr && partitions_raw[id] != nullptr) {
-        partitions[id] = std::make_shared<PartitionFilesystem>(partitions_raw[id]);
-    }
-
+VirtualDir XCI::GetPartition(XCIPartition partition) const {
     return partitions[static_cast<std::size_t>(partition)];
 }
 
-std::vector<VirtualDir> XCI::GetPartitions() {
-    std::vector<VirtualDir> out;
-    for (const auto& id :
-         {XCIPartition::Update, XCIPartition::Normal, XCIPartition::Secure, XCIPartition::Logo}) {
-        const auto part = GetPartition(id);
-        if (part != nullptr) {
-            out.push_back(part);
-        }
-    }
-    return out;
-}
-
 std::shared_ptr<NSP> XCI::GetSecurePartitionNSP() const {
     return secure_partition;
 }
 
-VirtualDir XCI::GetSecurePartition() {
+VirtualDir XCI::GetSecurePartition() const {
     return GetPartition(XCIPartition::Secure);
 }
 
-VirtualDir XCI::GetNormalPartition() {
+VirtualDir XCI::GetNormalPartition() const {
     return GetPartition(XCIPartition::Normal);
 }
 
-VirtualDir XCI::GetUpdatePartition() {
+VirtualDir XCI::GetUpdatePartition() const {
     return GetPartition(XCIPartition::Update);
 }
 
-VirtualDir XCI::GetLogoPartition() {
+VirtualDir XCI::GetLogoPartition() const {
     return GetPartition(XCIPartition::Logo);
 }
 
-VirtualFile XCI::GetPartitionRaw(XCIPartition partition) const {
-    return partitions_raw[static_cast<std::size_t>(partition)];
-}
-
-VirtualFile XCI::GetSecurePartitionRaw() const {
-    return GetPartitionRaw(XCIPartition::Secure);
-}
-
-VirtualFile XCI::GetStoragePartition0() const {
-    return std::make_shared<OffsetVfsFile>(file, update_normal_partition_end, 0, "partition0");
-}
-
-VirtualFile XCI::GetStoragePartition1() const {
-    return std::make_shared<OffsetVfsFile>(file, file->GetSize() - update_normal_partition_end,
-                                           update_normal_partition_end, "partition1");
-}
-
-VirtualFile XCI::GetNormalPartitionRaw() const {
-    return GetPartitionRaw(XCIPartition::Normal);
-}
-
-VirtualFile XCI::GetUpdatePartitionRaw() const {
-    return GetPartitionRaw(XCIPartition::Update);
-}
-
-VirtualFile XCI::GetLogoPartitionRaw() const {
-    return GetPartitionRaw(XCIPartition::Logo);
-}
-
 u64 XCI::GetProgramTitleID() const {
     return secure_partition->GetProgramTitleID();
 }
 
-u32 XCI::GetSystemUpdateVersion() {
-    const auto update = GetPartition(XCIPartition::Update);
-    if (update == nullptr)
-        return 0;
-
-    for (const auto& file : update->GetFiles()) {
-        NCA nca{file, nullptr, 0, keys};
-
-        if (nca.GetStatus() != Loader::ResultStatus::Success)
-            continue;
-
-        if (nca.GetType() == NCAContentType::Meta && nca.GetTitleId() == 0x0100000000000816) {
-            const auto dir = nca.GetSubdirectories()[0];
-            const auto cnmt = dir->GetFile("SystemUpdate_0100000000000816.cnmt");
-            if (cnmt == nullptr)
-                continue;
-
-            CNMT cnmt_data{cnmt};
-
-            const auto metas = cnmt_data.GetMetaRecords();
-            if (metas.empty())
-                continue;
-
-            return metas[0].title_version;
-        }
-    }
-
-    return 0;
-}
-
-u64 XCI::GetSystemUpdateTitleID() const {
-    return 0x0100000000000816;
-}
-
 bool XCI::HasProgramNCA() const {
     return program != nullptr;
 }
@@ -275,7 +201,7 @@ std::array<u8, 0x200> XCI::GetCertificate() const {
 
 Loader::ResultStatus XCI::AddNCAFromPartition(XCIPartition part) {
     const auto partition_index = static_cast<std::size_t>(part);
-    const auto partition = GetPartition(part);
+    const auto& partition = partitions[partition_index];
 
     if (partition == nullptr) {
         return Loader::ResultStatus::ErrorXCIMissingPartition;
@@ -306,7 +232,7 @@ Loader::ResultStatus XCI::AddNCAFromPartition(XCIPartition part) {
     return Loader::ResultStatus::Success;
 }
 
-u8 XCI::GetFormatVersion() {
+u8 XCI::GetFormatVersion() const {
     return GetLogoPartition() == nullptr ? 0x1 : 0x2;
 }
 } // namespace FileSys

src/core/file_sys/card_image.h

@@ -81,24 +81,14 @@ public:
     Loader::ResultStatus GetStatus() const;
     Loader::ResultStatus GetProgramNCAStatus() const;
 
-    u8 GetFormatVersion();
-
-    VirtualDir GetPartition(XCIPartition partition);
-    std::vector<VirtualDir> GetPartitions();
+    u8 GetFormatVersion() const;
 
+    VirtualDir GetPartition(XCIPartition partition) const;
     std::shared_ptr<NSP> GetSecurePartitionNSP() const;
-    VirtualDir GetSecurePartition();
-    VirtualDir GetNormalPartition();
-    VirtualDir GetUpdatePartition();
-    VirtualDir GetLogoPartition();
-
-    VirtualFile GetPartitionRaw(XCIPartition partition) const;
-    VirtualFile GetSecurePartitionRaw() const;
-    VirtualFile GetStoragePartition0() const;
-    VirtualFile GetStoragePartition1() const;
-    VirtualFile GetNormalPartitionRaw() const;
-    VirtualFile GetUpdatePartitionRaw() const;
-    VirtualFile GetLogoPartitionRaw() const;
+    VirtualDir GetSecurePartition() const;
+    VirtualDir GetNormalPartition() const;
+    VirtualDir GetUpdatePartition() const;
+    VirtualDir GetLogoPartition() const;
 
     u64 GetProgramTitleID() const;
     u32 GetSystemUpdateVersion();
@@ -133,7 +123,6 @@ private:
     Loader::ResultStatus program_nca_status;
 
     std::vector<VirtualDir> partitions;
-    std::vector<VirtualFile> partitions_raw;
     std::shared_ptr<NSP> secure_partition;
     std::shared_ptr<NCA> program;
     std::vector<std::shared_ptr<NCA>> ncas;

src/core/file_sys/partition_filesystem.cpp

@@ -65,9 +65,6 @@ PartitionFilesystem::PartitionFilesystem(std::shared_ptr<VfsFile> file) {
         std::string name(
             reinterpret_cast<const char*>(&file_data[strtab_offset + entry.strtab_offset]));
 
-        offsets[name] = content_offset + entry.offset;
-        sizes[name] = entry.size;
-
         pfs_files.emplace_back(std::make_shared<OffsetVfsFile>(
             file, entry.size, content_offset + entry.offset, std::move(name)));
     }
@@ -81,14 +78,6 @@ Loader::ResultStatus PartitionFilesystem::GetStatus() const {
     return status;
 }
 
-std::map<std::string, u64> PartitionFilesystem::GetFileOffsets() const {
-    return offsets;
-}
-
-std::map<std::string, u64> PartitionFilesystem::GetFileSizes() const {
-    return sizes;
-}
-
 std::vector<std::shared_ptr<VfsFile>> PartitionFilesystem::GetFiles() const {
     return pfs_files;
 }

src/core/file_sys/partition_filesystem.h

@@ -29,9 +29,6 @@ public:
 
     Loader::ResultStatus GetStatus() const;
 
-    std::map<std::string, u64> GetFileOffsets() const;
-    std::map<std::string, u64> GetFileSizes() const;
-
     std::vector<std::shared_ptr<VfsFile>> GetFiles() const override;
     std::vector<std::shared_ptr<VfsDirectory>> GetSubdirectories() const override;
     std::string GetName() const override;
@@ -83,9 +80,6 @@ private:
     bool is_hfs = false;
     std::size_t content_offset = 0;
 
-    std::map<std::string, u64> offsets;
-    std::map<std::string, u64> sizes;
-
     std::vector<VirtualFile> pfs_files;
 };
 

src/core/file_sys/romfs_factory.cpp

@@ -35,11 +35,11 @@ void RomFSFactory::SetPackedUpdate(VirtualFile update_raw) {
     this->update_raw = std::move(update_raw);
 }
 
-ResultVal<VirtualFile> RomFSFactory::OpenCurrentProcess(u64 current_process_title_id) const {
+ResultVal<VirtualFile> RomFSFactory::OpenCurrentProcess() const {
     if (!updatable)
         return MakeResult<VirtualFile>(file);
 
-    const PatchManager patch_manager(current_process_title_id);
+    const PatchManager patch_manager(Core::CurrentProcess()->GetTitleID());
     return MakeResult<VirtualFile>(
         patch_manager.PatchRomFS(file, ivfc_offset, ContentRecordType::Program, update_raw));
 }

src/core/file_sys/romfs_factory.h

@@ -33,7 +33,7 @@ public:
     ~RomFSFactory();
 
     void SetPackedUpdate(VirtualFile update_raw);
-    ResultVal<VirtualFile> OpenCurrentProcess(u64 current_process_title_id) const;
+    ResultVal<VirtualFile> OpenCurrentProcess() const;
     ResultVal<VirtualFile> Open(u64 title_id, StorageId storage, ContentRecordType type) const;
 
 private:

src/core/file_sys/savedata_factory.cpp

@@ -127,9 +127,8 @@ std::string SaveDataFactory::GetFullPath(SaveDataSpaceId space, SaveDataType typ
                                          u128 user_id, u64 save_id) {
     // According to switchbrew, if a save is of type SaveData and the title id field is 0, it should
     // be interpreted as the title id of the current process.
-    if (type == SaveDataType::SaveData && title_id == 0) {
-        title_id = Core::System::GetInstance().CurrentProcess()->GetTitleID();
-    }
+    if (type == SaveDataType::SaveData && title_id == 0)
+        title_id = Core::CurrentProcess()->GetTitleID();
 
     std::string out = GetSaveDataSpaceIdPath(space);
 

src/core/file_sys/vfs_libzip.cpp

@@ -1,79 +0,0 @@
-// Copyright 2019 yuzu emulator team
-// Licensed under GPLv2 or any later version
-// Refer to the license.txt file included.
-
-#include <string>
-#include <zip.h>
-#include "common/logging/backend.h"
-#include "core/file_sys/vfs.h"
-#include "core/file_sys/vfs_libzip.h"
-#include "core/file_sys/vfs_vector.h"
-
-namespace FileSys {
-
-VirtualDir ExtractZIP(VirtualFile file) {
-    zip_error_t error{};
-
-    const auto data = file->ReadAllBytes();
-    std::unique_ptr<zip_source_t, decltype(&zip_source_close)> src{
-        zip_source_buffer_create(data.data(), data.size(), 0, &error), zip_source_close};
-    if (src == nullptr)
-        return nullptr;
-
-    std::unique_ptr<zip_t, decltype(&zip_close)> zip{zip_open_from_source(src.get(), 0, &error),
-                                                     zip_close};
-    if (zip == nullptr)
-        return nullptr;
-
-    std::shared_ptr<VectorVfsDirectory> out = std::make_shared<VectorVfsDirectory>();
-
-    const auto num_entries = zip_get_num_entries(zip.get(), 0);
-
-    zip_stat_t stat{};
-    zip_stat_init(&stat);
-
-    for (std::size_t i = 0; i < num_entries; ++i) {
-        const auto stat_res = zip_stat_index(zip.get(), i, 0, &stat);
-        if (stat_res == -1)
-            return nullptr;
-
-        const std::string name(stat.name);
-        if (name.empty())
-            continue;
-
-        if (name.back() != '/') {
-            std::unique_ptr<zip_file_t, decltype(&zip_fclose)> file{
-                zip_fopen_index(zip.get(), i, 0), zip_fclose};
-
-            std::vector<u8> buf(stat.size);
-            if (zip_fread(file.get(), buf.data(), buf.size()) != buf.size())
-                return nullptr;
-
-            const auto parts = FileUtil::SplitPathComponents(stat.name);
-            const auto new_file = std::make_shared<VectorVfsFile>(buf, parts.back());
-
-            std::shared_ptr<VectorVfsDirectory> dtrv = out;
-            for (std::size_t j = 0; j < parts.size() - 1; ++j) {
-                if (dtrv == nullptr)
-                    return nullptr;
-                const auto subdir = dtrv->GetSubdirectory(parts[j]);
-                if (subdir == nullptr) {
-                    const auto temp = std::make_shared<VectorVfsDirectory>(
-                        std::vector<VirtualFile>{}, std::vector<VirtualDir>{}, parts[j]);
-                    dtrv->AddDirectory(temp);
-                    dtrv = temp;
-                } else {
-                    dtrv = std::dynamic_pointer_cast<VectorVfsDirectory>(subdir);
-                }
-            }
-
-            if (dtrv == nullptr)
-                return nullptr;
-            dtrv->AddFile(new_file);
-        }
-    }
-
-    return out;
-}
-
-} // namespace FileSys

src/core/file_sys/vfs_libzip.h

@@ -1,13 +0,0 @@
-// Copyright 2019 yuzu emulator team
-// Licensed under GPLv2 or any later version
-// Refer to the license.txt file included.
-
-#pragma once
-
-#include "core/file_sys/vfs_types.h"
-
-namespace FileSys {
-
-VirtualDir ExtractZIP(VirtualFile zip);
-
-} // namespace FileSys

src/core/gdbstub/gdbstub.cpp

@@ -639,8 +639,7 @@ static void HandleQuery() {
                        strlen("Xfer:features:read:target.xml:")) == 0) {
         SendReply(target_xml);
     } else if (strncmp(query, "Offsets", strlen("Offsets")) == 0) {
-        const VAddr base_address =
-            Core::System::GetInstance().CurrentProcess()->VMManager().GetCodeRegionBaseAddress();
+        const VAddr base_address = Core::CurrentProcess()->VMManager().GetCodeRegionBaseAddress();
         std::string buffer = fmt::format("TextSeg={:0x}", base_address);
         SendReply(buffer.c_str());
     } else if (strncmp(query, "fThreadInfo", strlen("fThreadInfo")) == 0) {

src/core/hle/kernel/handle_table.cpp

@@ -103,7 +103,7 @@ SharedPtr<Object> HandleTable::GetGeneric(Handle handle) const {
     if (handle == CurrentThread) {
         return GetCurrentThread();
     } else if (handle == CurrentProcess) {
-        return Core::System::GetInstance().CurrentProcess();
+        return Core::CurrentProcess();
     }
 
     if (!IsValid(handle)) {

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

@@ -31,7 +31,6 @@
 #include "core/hle/service/am/tcap.h"
 #include "core/hle/service/apm/controller.h"
 #include "core/hle/service/apm/interface.h"
-#include "core/hle/service/bcat/backend/backend.h"
 #include "core/hle/service/filesystem/filesystem.h"
 #include "core/hle/service/ns/ns.h"
 #include "core/hle/service/nvflinger/nvflinger.h"
@@ -47,20 +46,15 @@ constexpr ResultCode ERR_NO_DATA_IN_CHANNEL{ErrorModule::AM, 0x2};
 constexpr ResultCode ERR_NO_MESSAGES{ErrorModule::AM, 0x3};
 constexpr ResultCode ERR_SIZE_OUT_OF_BOUNDS{ErrorModule::AM, 0x1F7};
 
-enum class LaunchParameterKind : u32 {
-    ApplicationSpecific = 1,
-    AccountPreselectedUser = 2,
-};
+constexpr u32 POP_LAUNCH_PARAMETER_MAGIC = 0xC79497CA;
 
-constexpr u32 LAUNCH_PARAMETER_ACCOUNT_PRESELECTED_USER_MAGIC = 0xC79497CA;
-
-struct LaunchParameterAccountPreselectedUser {
+struct LaunchParameters {
     u32_le magic;
     u32_le is_account_selected;
     u128 current_user;
     INSERT_PADDING_BYTES(0x70);
 };
-static_assert(sizeof(LaunchParameterAccountPreselectedUser) == 0x88);
+static_assert(sizeof(LaunchParameters) == 0x88);
 
 IWindowController::IWindowController(Core::System& system_)
     : ServiceFramework("IWindowController"), system{system_} {
@@ -1133,55 +1127,26 @@ void IApplicationFunctions::EndBlockingHomeButton(Kernel::HLERequestContext& ctx
 }
 
 void IApplicationFunctions::PopLaunchParameter(Kernel::HLERequestContext& ctx) {
-    IPC::RequestParser rp{ctx};
-    const auto kind = rp.PopEnum<LaunchParameterKind>();
+    LOG_DEBUG(Service_AM, "called");
 
-    LOG_DEBUG(Service_AM, "called, kind={:08X}", static_cast<u8>(kind));
+    LaunchParameters params{};
 
-    if (kind == LaunchParameterKind::ApplicationSpecific && !launch_popped_application_specific) {
-        const auto backend = BCAT::CreateBackendFromSettings(
-            [this](u64 tid) { return system.GetFileSystemController().GetBCATDirectory(tid); });
-        const auto build_id_full = system.GetCurrentProcessBuildID();
-        u64 build_id{};
-        std::memcpy(&build_id, build_id_full.data(), sizeof(u64));
+    params.magic = POP_LAUNCH_PARAMETER_MAGIC;
+    params.is_account_selected = 1;
 
-        const auto data =
-            backend->GetLaunchParameter({system.CurrentProcess()->GetTitleID(), build_id});
+    Account::ProfileManager profile_manager{};
+    const auto uuid = profile_manager.GetUser(Settings::values.current_user);
+    ASSERT(uuid);
+    params.current_user = uuid->uuid;
 
-        if (data.has_value()) {
-            IPC::ResponseBuilder rb{ctx, 2, 0, 1};
-            rb.Push(RESULT_SUCCESS);
-            rb.PushIpcInterface<AM::IStorage>(*data);
-            launch_popped_application_specific = true;
-            return;
-        }
-    } else if (kind == LaunchParameterKind::AccountPreselectedUser &&
-               !launch_popped_account_preselect) {
-        LaunchParameterAccountPreselectedUser params{};
+    IPC::ResponseBuilder rb{ctx, 2, 0, 1};
 
-        params.magic = LAUNCH_PARAMETER_ACCOUNT_PRESELECTED_USER_MAGIC;
-        params.is_account_selected = 1;
+    rb.Push(RESULT_SUCCESS);
 
-        Account::ProfileManager profile_manager{};
-        const auto uuid = profile_manager.GetUser(Settings::values.current_user);
-        ASSERT(uuid);
-        params.current_user = uuid->uuid;
+    std::vector<u8> buffer(sizeof(LaunchParameters));
+    std::memcpy(buffer.data(), &params, buffer.size());
 
-        IPC::ResponseBuilder rb{ctx, 2, 0, 1};
-
-        rb.Push(RESULT_SUCCESS);
-
-        std::vector<u8> buffer(sizeof(LaunchParameterAccountPreselectedUser));
-        std::memcpy(buffer.data(), &params, buffer.size());
-
-        rb.PushIpcInterface<AM::IStorage>(buffer);
-        launch_popped_account_preselect = true;
-        return;
-    }
-
-    LOG_ERROR(Service_AM, "Attempted to load launch parameter but none was found!");
-    IPC::ResponseBuilder rb{ctx, 2};
-    rb.Push(ERR_NO_DATA_IN_CHANNEL);
+    rb.PushIpcInterface<AM::IStorage>(buffer);
 }
 
 void IApplicationFunctions::CreateApplicationAndRequestToStartForQuest(
@@ -1199,7 +1164,7 @@ void IApplicationFunctions::EnsureSaveData(Kernel::HLERequestContext& ctx) {
     LOG_DEBUG(Service_AM, "called, uid={:016X}{:016X}", user_id[1], user_id[0]);
 
     FileSys::SaveDataDescriptor descriptor{};
-    descriptor.title_id = system.CurrentProcess()->GetTitleID();
+    descriptor.title_id = Core::CurrentProcess()->GetTitleID();
     descriptor.user_id = user_id;
     descriptor.type = FileSys::SaveDataType::SaveData;
     const auto res = system.GetFileSystemController().CreateSaveData(

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

@@ -147,7 +147,6 @@ private:
     void GetAccumulatedSuspendedTickValue(Kernel::HLERequestContext& ctx);
     void GetAccumulatedSuspendedTickChangedEvent(Kernel::HLERequestContext& ctx);
 
-    Core::System& system;
     std::shared_ptr<NVFlinger::NVFlinger> nvflinger;
     Kernel::EventPair launchable_event;
     Kernel::EventPair accumulated_suspended_tick_changed_event;
@@ -155,6 +154,8 @@ private:
     u32 idle_time_detection_extension = 0;
     u64 num_fatal_sections_entered = 0;
     bool is_auto_sleep_disabled = false;
+
+    Core::System& system;
 };
 
 class ICommonStateGetter final : public ServiceFramework<ICommonStateGetter> {
@@ -254,8 +255,6 @@ private:
     void EnableApplicationCrashReport(Kernel::HLERequestContext& ctx);
     void GetGpuErrorDetectedSystemEvent(Kernel::HLERequestContext& ctx);
 
-    bool launch_popped_application_specific = false;
-    bool launch_popped_account_preselect = false;
     Kernel::EventPair gpu_error_detected_event;
     Core::System& system;
 };

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

@@ -157,10 +157,6 @@ AppletManager::AppletManager(Core::System& system_) : system{system_} {}
 
 AppletManager::~AppletManager() = default;
 
-const AppletFrontendSet& AppletManager::GetAppletFrontendSet() const {
-    return frontend;
-}
-
 void AppletManager::SetAppletFrontendSet(AppletFrontendSet set) {
     if (set.parental_controls != nullptr)
         frontend.parental_controls = std::move(set.parental_controls);

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

@@ -190,8 +190,6 @@ public:
     explicit AppletManager(Core::System& system_);
     ~AppletManager();
 
-    const AppletFrontendSet& GetAppletFrontendSet() const;
-
     void SetAppletFrontendSet(AppletFrontendSet set);
     void SetDefaultAppletFrontendSet();
     void SetDefaultAppletsIfMissing();

src/core/hle/service/apm/controller.cpp

@@ -13,7 +13,7 @@ constexpr PerformanceConfiguration DEFAULT_PERFORMANCE_CONFIGURATION =
     PerformanceConfiguration::Config7;
 
 Controller::Controller(Core::Timing::CoreTiming& core_timing)
-    : core_timing{core_timing}, configs{
+    : core_timing(core_timing), configs{
                                     {PerformanceMode::Handheld, DEFAULT_PERFORMANCE_CONFIGURATION},
                                     {PerformanceMode::Docked, DEFAULT_PERFORMANCE_CONFIGURATION},
                                 } {}
@@ -63,7 +63,6 @@ PerformanceConfiguration Controller::GetCurrentPerformanceConfiguration(Performa
 void Controller::SetClockSpeed(u32 mhz) {
     LOG_INFO(Service_APM, "called, mhz={:08X}", mhz);
     // TODO(DarkLordZach): Actually signal core_timing to change clock speed.
-    // TODO(Rodrigo): Remove [[maybe_unused]] when core_timing is used.
 }
 
 } // namespace Service::APM

src/core/hle/service/apm/controller.h

@@ -50,7 +50,7 @@ enum class PerformanceMode : u8 {
 // system during times of high load -- this simply maps to different PerformanceConfigs to use.
 class Controller {
 public:
-    explicit Controller(Core::Timing::CoreTiming& core_timing);
+    Controller(Core::Timing::CoreTiming& core_timing);
     ~Controller();
 
     void SetPerformanceConfiguration(PerformanceMode mode, PerformanceConfiguration config);
@@ -62,9 +62,9 @@ public:
 private:
     void SetClockSpeed(u32 mhz);
 
-    [[maybe_unused]] Core::Timing::CoreTiming& core_timing;
-
     std::map<PerformanceMode, PerformanceConfiguration> configs;
+
+    Core::Timing::CoreTiming& core_timing;
 };
 
 } // namespace Service::APM

src/core/hle/service/audio/audout_u.cpp

@@ -205,7 +205,7 @@ private:
     AudioCore::StreamPtr stream;
     std::string device_name;
 
-    [[maybe_unused]] AudoutParams audio_params {};
+    AudoutParams audio_params{};
 
     /// This is the event handle used to check if the audio buffer was released
     Kernel::EventPair buffer_event;

src/core/hle/service/bcat/backend/backend.cpp

@@ -1,137 +0,0 @@
-// Copyright 2019 yuzu emulator team
-// Licensed under GPLv2 or any later version
-// Refer to the license.txt file included.
-
-#include "common/hex_util.h"
-#include "common/logging/log.h"
-#include "core/core.h"
-#include "core/hle/lock.h"
-#include "core/hle/service/bcat/backend/backend.h"
-
-namespace Service::BCAT {
-
-ProgressServiceBackend::ProgressServiceBackend(std::string_view event_name) {
-    auto& kernel{Core::System::GetInstance().Kernel()};
-    event = Kernel::WritableEvent::CreateEventPair(
-        kernel, Kernel::ResetType::Automatic,
-        std::string("ProgressServiceBackend:UpdateEvent:").append(event_name));
-}
-
-Kernel::SharedPtr<Kernel::ReadableEvent> ProgressServiceBackend::GetEvent() const {
-    return event.readable;
-}
-
-DeliveryCacheProgressImpl& ProgressServiceBackend::GetImpl() {
-    return impl;
-}
-
-void ProgressServiceBackend::SetNeedHLELock(bool need) {
-    need_hle_lock = need;
-}
-
-void ProgressServiceBackend::SetTotalSize(u64 size) {
-    impl.total_bytes = size;
-    SignalUpdate();
-}
-
-void ProgressServiceBackend::StartConnecting() {
-    impl.status = DeliveryCacheProgressImpl::Status::Connecting;
-    SignalUpdate();
-}
-
-void ProgressServiceBackend::StartProcessingDataList() {
-    impl.status = DeliveryCacheProgressImpl::Status::ProcessingDataList;
-    SignalUpdate();
-}
-
-void ProgressServiceBackend::StartDownloadingFile(std::string_view dir_name,
-                                                  std::string_view file_name, u64 file_size) {
-    impl.status = DeliveryCacheProgressImpl::Status::Downloading;
-    impl.current_downloaded_bytes = 0;
-    impl.current_total_bytes = file_size;
-    std::memcpy(impl.current_directory.data(), dir_name.data(),
-                std::min<u64>(dir_name.size(), 0x31ull));
-    std::memcpy(impl.current_file.data(), file_name.data(),
-                std::min<u64>(file_name.size(), 0x31ull));
-    SignalUpdate();
-}
-
-void ProgressServiceBackend::UpdateFileProgress(u64 downloaded) {
-    impl.current_downloaded_bytes = downloaded;
-    SignalUpdate();
-}
-
-void ProgressServiceBackend::FinishDownloadingFile() {
-    impl.total_downloaded_bytes += impl.current_total_bytes;
-    SignalUpdate();
-}
-
-void ProgressServiceBackend::CommitDirectory(std::string_view dir_name) {
-    impl.status = DeliveryCacheProgressImpl::Status::Committing;
-    impl.current_file.fill(0);
-    impl.current_downloaded_bytes = 0;
-    impl.current_total_bytes = 0;
-    std::memcpy(impl.current_directory.data(), dir_name.data(),
-                std::min<u64>(dir_name.size(), 0x31ull));
-    SignalUpdate();
-}
-
-void ProgressServiceBackend::FinishDownload(ResultCode result) {
-    impl.total_downloaded_bytes = impl.total_bytes;
-    impl.status = DeliveryCacheProgressImpl::Status::Done;
-    impl.result = result;
-    SignalUpdate();
-}
-
-void ProgressServiceBackend::SignalUpdate() const {
-    if (need_hle_lock) {
-        std::lock_guard<std::recursive_mutex> lock(HLE::g_hle_lock);
-        event.writable->Signal();
-    } else {
-        event.writable->Signal();
-    }
-}
-
-Backend::Backend(DirectoryGetter getter) : dir_getter(std::move(getter)) {}
-
-Backend::~Backend() = default;
-
-NullBackend::NullBackend(DirectoryGetter getter) : Backend(std::move(getter)) {}
-
-NullBackend::~NullBackend() = default;
-
-bool NullBackend::Synchronize(TitleIDVersion title, ProgressServiceBackend& progress) {
-    LOG_DEBUG(Service_BCAT, "called, title_id={:016X}, build_id={:016X}", title.title_id,
-              title.build_id);
-
-    progress.FinishDownload(RESULT_SUCCESS);
-    return true;
-}
-
-bool NullBackend::SynchronizeDirectory(TitleIDVersion title, std::string name,
-                                       ProgressServiceBackend& progress) {
-    LOG_DEBUG(Service_BCAT, "called, title_id={:016X}, build_id={:016X}, name={}", title.title_id,
-              title.build_id, name);
-
-    progress.FinishDownload(RESULT_SUCCESS);
-    return true;
-}
-
-bool NullBackend::Clear(u64 title_id) {
-    LOG_DEBUG(Service_BCAT, "called, title_id={:016X}");
-
-    return true;
-}
-
-void NullBackend::SetPassphrase(u64 title_id, const Passphrase& passphrase) {
-    LOG_DEBUG(Service_BCAT, "called, title_id={:016X}, passphrase = {}", title_id,
-              Common::HexToString(passphrase));
-}
-
-std::optional<std::vector<u8>> NullBackend::GetLaunchParameter(TitleIDVersion title) {
-    LOG_DEBUG(Service_BCAT, "called, title_id={:016X}, build_id={:016X}", title.title_id,
-              title.build_id);
-    return std::nullopt;
-}
-
-} // namespace Service::BCAT

src/core/hle/service/bcat/backend/backend.h

@@ -1,150 +0,0 @@
-// Copyright 2019 yuzu emulator team
-// Licensed under GPLv2 or any later version
-// Refer to the license.txt file included.
-
-#pragma once
-
-#include <functional>
-#include <optional>
-#include <string>
-#include <string_view>
-
-#include "common/common_types.h"
-#include "core/file_sys/vfs_types.h"
-#include "core/hle/kernel/readable_event.h"
-#include "core/hle/kernel/writable_event.h"
-#include "core/hle/result.h"
-
-namespace Service::BCAT {
-
-struct DeliveryCacheProgressImpl;
-
-using DirectoryGetter = std::function<FileSys::VirtualDir(u64)>;
-using Passphrase = std::array<u8, 0x20>;
-
-struct TitleIDVersion {
-    u64 title_id;
-    u64 build_id;
-};
-
-using DirectoryName = std::array<char, 0x20>;
-using FileName = std::array<char, 0x20>;
-
-struct DeliveryCacheProgressImpl {
-    enum class Status : s32 {
-        None = 0x0,
-        Queued = 0x1,
-        Connecting = 0x2,
-        ProcessingDataList = 0x3,
-        Downloading = 0x4,
-        Committing = 0x5,
-        Done = 0x9,
-    };
-
-    Status status;
-    ResultCode result = RESULT_SUCCESS;
-    DirectoryName current_directory;
-    FileName current_file;
-    s64 current_downloaded_bytes; ///< Bytes downloaded on current file.
-    s64 current_total_bytes;      ///< Bytes total on current file.
-    s64 total_downloaded_bytes;   ///< Bytes downloaded on overall download.
-    s64 total_bytes;              ///< Bytes total on overall download.
-    INSERT_PADDING_BYTES(
-        0x198); ///< Appears to be unused in official code, possibly reserved for future use.
-};
-static_assert(sizeof(DeliveryCacheProgressImpl) == 0x200,
-              "DeliveryCacheProgressImpl has incorrect size.");
-
-// A class to manage the signalling to the game about BCAT download progress.
-// Some of this class is implemented in module.cpp to avoid exposing the implementation structure.
-class ProgressServiceBackend {
-    friend class IBcatService;
-
-public:
-    // Clients should call this with true if any of the functions are going to be called from a
-    // non-HLE thread and this class need to lock the hle mutex. (default is false)
-    void SetNeedHLELock(bool need);
-
-    // Sets the number of bytes total in the entire download.
-    void SetTotalSize(u64 size);
-
-    // Notifies the application that the backend has started connecting to the server.
-    void StartConnecting();
-    // Notifies the application that the backend has begun accumulating and processing metadata.
-    void StartProcessingDataList();
-
-    // Notifies the application that a file is starting to be downloaded.
-    void StartDownloadingFile(std::string_view dir_name, std::string_view file_name, u64 file_size);
-    // Updates the progress of the current file to the size passed.
-    void UpdateFileProgress(u64 downloaded);
-    // Notifies the application that the current file has completed download.
-    void FinishDownloadingFile();
-
-    // Notifies the application that all files in this directory have completed and are being
-    // finalized.
-    void CommitDirectory(std::string_view dir_name);
-
-    // Notifies the application that the operation completed with result code result.
-    void FinishDownload(ResultCode result);
-
-private:
-    explicit ProgressServiceBackend(std::string_view event_name);
-
-    Kernel::SharedPtr<Kernel::ReadableEvent> GetEvent() const;
-    DeliveryCacheProgressImpl& GetImpl();
-
-    void SignalUpdate() const;
-
-    DeliveryCacheProgressImpl impl{};
-    Kernel::EventPair event;
-    bool need_hle_lock = false;
-};
-
-// A class representing an abstract backend for BCAT functionality.
-class Backend {
-public:
-    explicit Backend(DirectoryGetter getter);
-    virtual ~Backend();
-
-    // Called when the backend is needed to synchronize the data for the game with title ID and
-    // version in title. A ProgressServiceBackend object is provided to alert the application of
-    // status.
-    virtual bool Synchronize(TitleIDVersion title, ProgressServiceBackend& progress) = 0;
-    // Very similar to Synchronize, but only for the directory provided. Backends should not alter
-    // the data for any other directories.
-    virtual bool SynchronizeDirectory(TitleIDVersion title, std::string name,
-                                      ProgressServiceBackend& progress) = 0;
-
-    // Removes all cached data associated with title id provided.
-    virtual bool Clear(u64 title_id) = 0;
-
-    // Sets the BCAT Passphrase to be used with the associated title ID.
-    virtual void SetPassphrase(u64 title_id, const Passphrase& passphrase) = 0;
-
-    // Gets the launch parameter used by AM associated with the title ID and version provided.
-    virtual std::optional<std::vector<u8>> GetLaunchParameter(TitleIDVersion title) = 0;
-
-protected:
-    DirectoryGetter dir_getter;
-};
-
-// A backend of BCAT that provides no operation.
-class NullBackend : public Backend {
-public:
-    explicit NullBackend(DirectoryGetter getter);
-    ~NullBackend() override;
-
-    bool Synchronize(TitleIDVersion title, ProgressServiceBackend& progress) override;
-    bool SynchronizeDirectory(TitleIDVersion title, std::string name,
-                              ProgressServiceBackend& progress) override;
-
-    bool Clear(u64 title_id) override;
-
-    void SetPassphrase(u64 title_id, const Passphrase& passphrase) override;
-
-    std::optional<std::vector<u8>> GetLaunchParameter(TitleIDVersion title) override;
-};
-
-std::unique_ptr<Backend> CreateBackendFromSettings(DirectoryGetter getter);
-
-} // namespace Service::BCAT

src/core/hle/service/bcat/backend/boxcat.cpp

@@ -1,504 +0,0 @@
-// Copyright 2019 yuzu emulator team
-// Licensed under GPLv2 or any later version
-// Refer to the license.txt file included.
-
-#include <fmt/ostream.h>
-#include <httplib.h>
-#include <json.hpp>
-#include <mbedtls/sha256.h>
-#include "common/hex_util.h"
-#include "common/logging/backend.h"
-#include "common/logging/log.h"
-#include "core/core.h"
-#include "core/file_sys/vfs.h"
-#include "core/file_sys/vfs_libzip.h"
-#include "core/file_sys/vfs_vector.h"
-#include "core/frontend/applets/error.h"
-#include "core/hle/service/am/applets/applets.h"
-#include "core/hle/service/bcat/backend/boxcat.h"
-#include "core/settings.h"
-
-namespace {
-
-// Prevents conflicts with windows macro called CreateFile
-FileSys::VirtualFile VfsCreateFileWrap(FileSys::VirtualDir dir, std::string_view name) {
-    return dir->CreateFile(name);
-}
-
-// Prevents conflicts with windows macro called DeleteFile
-bool VfsDeleteFileWrap(FileSys::VirtualDir dir, std::string_view name) {
-    return dir->DeleteFile(name);
-}
-
-} // Anonymous namespace
-
-namespace Service::BCAT {
-
-constexpr ResultCode ERROR_GENERAL_BCAT_FAILURE{ErrorModule::BCAT, 1};
-
-constexpr char BOXCAT_HOSTNAME[] = "api.yuzu-emu.org";
-
-// Formatted using fmt with arg[0] = hex title id
-constexpr char BOXCAT_PATHNAME_DATA[] = "/game-assets/{:016X}/boxcat";
-constexpr char BOXCAT_PATHNAME_LAUNCHPARAM[] = "/game-assets/{:016X}/launchparam";
-
-constexpr char BOXCAT_PATHNAME_EVENTS[] = "/game-assets/boxcat/events";
-
-constexpr char BOXCAT_API_VERSION[] = "1";
-constexpr char BOXCAT_CLIENT_TYPE[] = "yuzu";
-
-// HTTP status codes for Boxcat
-enum class ResponseStatus {
-    Ok = 200,               ///< Operation completed successfully.
-    BadClientVersion = 301, ///< The Boxcat-Client-Version doesn't match the server.
-    NoUpdate = 304,         ///< The digest provided would match the new data, no need to update.
-    NoMatchTitleId = 404,   ///< The title ID provided doesn't have a boxcat implementation.
-    NoMatchBuildId = 406,   ///< The build ID provided is blacklisted (potentially because of format
-                            ///< issues or whatnot) and has no data.
-};
-
-enum class DownloadResult {
-    Success = 0,
-    NoResponse,
-    GeneralWebError,
-    NoMatchTitleId,
-    NoMatchBuildId,
-    InvalidContentType,
-    GeneralFSError,
-    BadClientVersion,
-};
-
-constexpr std::array<const char*, 8> DOWNLOAD_RESULT_LOG_MESSAGES{
-    "Success",
-    "There was no response from the server.",
-    "There was a general web error code returned from the server.",
-    "The title ID of the current game doesn't have a boxcat implementation. If you believe an "
-    "implementation should be added, contact yuzu support.",
-    "The build ID of the current version of the game is marked as incompatible with the current "
-    "BCAT distribution. Try upgrading or downgrading your game version or contacting yuzu support.",
-    "The content type of the web response was invalid.",
-    "There was a general filesystem error while saving the zip file.",
-    "The server is either too new or too old to serve the request. Try using the latest version of "
-    "an official release of yuzu.",
-};
-
-std::ostream& operator<<(std::ostream& os, DownloadResult result) {
-    return os << DOWNLOAD_RESULT_LOG_MESSAGES.at(static_cast<std::size_t>(result));
-}
-
-constexpr u32 PORT = 443;
-constexpr u32 TIMEOUT_SECONDS = 30;
-[[maybe_unused]] constexpr u64 VFS_COPY_BLOCK_SIZE = 1ULL << 24; // 4MB
-
-namespace {
-
-std::string GetBINFilePath(u64 title_id) {
-    return fmt::format("{}bcat/{:016X}/launchparam.bin",
-                       FileUtil::GetUserPath(FileUtil::UserPath::CacheDir), title_id);
-}
-
-std::string GetZIPFilePath(u64 title_id) {
-    return fmt::format("{}bcat/{:016X}/data.zip",
-                       FileUtil::GetUserPath(FileUtil::UserPath::CacheDir), title_id);
-}
-
-// If the error is something the user should know about (build ID mismatch, bad client version),
-// display an error.
-void HandleDownloadDisplayResult(DownloadResult res) {
-    if (res == DownloadResult::Success || res == DownloadResult::NoResponse ||
-        res == DownloadResult::GeneralWebError || res == DownloadResult::GeneralFSError ||
-        res == DownloadResult::NoMatchTitleId || res == DownloadResult::InvalidContentType) {
-        return;
-    }
-
-    const auto& frontend{Core::System::GetInstance().GetAppletManager().GetAppletFrontendSet()};
-    frontend.error->ShowCustomErrorText(
-        ResultCode(-1), "There was an error while attempting to use Boxcat.",
-        DOWNLOAD_RESULT_LOG_MESSAGES[static_cast<std::size_t>(res)], [] {});
-}
-
-bool VfsRawCopyProgress(FileSys::VirtualFile src, FileSys::VirtualFile dest,
-                        std::string_view dir_name, ProgressServiceBackend& progress,
-                        std::size_t block_size = 0x1000) {
-    if (src == nullptr || dest == nullptr || !src->IsReadable() || !dest->IsWritable())
-        return false;
-    if (!dest->Resize(src->GetSize()))
-        return false;
-
-    progress.StartDownloadingFile(dir_name, src->GetName(), src->GetSize());
-
-    std::vector<u8> temp(std::min(block_size, src->GetSize()));
-    for (std::size_t i = 0; i < src->GetSize(); i += block_size) {
-        const auto read = std::min(block_size, src->GetSize() - i);
-
-        if (src->Read(temp.data(), read, i) != read) {
-            return false;
-        }
-
-        if (dest->Write(temp.data(), read, i) != read) {
-            return false;
-        }
-
-        progress.UpdateFileProgress(i);
-    }
-
-    progress.FinishDownloadingFile();
-
-    return true;
-}
-
-bool VfsRawCopyDProgressSingle(FileSys::VirtualDir src, FileSys::VirtualDir dest,
-                               ProgressServiceBackend& progress, std::size_t block_size = 0x1000) {
-    if (src == nullptr || dest == nullptr || !src->IsReadable() || !dest->IsWritable())
-        return false;
-
-    for (const auto& file : src->GetFiles()) {
-        const auto out_file = VfsCreateFileWrap(dest, file->GetName());
-        if (!VfsRawCopyProgress(file, out_file, src->GetName(), progress, block_size)) {
-            return false;
-        }
-    }
-    progress.CommitDirectory(src->GetName());
-
-    return true;
-}
-
-bool VfsRawCopyDProgress(FileSys::VirtualDir src, FileSys::VirtualDir dest,
-                         ProgressServiceBackend& progress, std::size_t block_size = 0x1000) {
-    if (src == nullptr || dest == nullptr || !src->IsReadable() || !dest->IsWritable())
-        return false;
-
-    for (const auto& dir : src->GetSubdirectories()) {
-        const auto out = dest->CreateSubdirectory(dir->GetName());
-        if (!VfsRawCopyDProgressSingle(dir, out, progress, block_size)) {
-            return false;
-        }
-    }
-
-    return true;
-}
-
-} // Anonymous namespace
-
-class Boxcat::Client {
-public:
-    Client(std::string path, u64 title_id, u64 build_id)
-        : path(std::move(path)), title_id(title_id), build_id(build_id) {}
-
-    DownloadResult DownloadDataZip() {
-        return DownloadInternal(fmt::format(BOXCAT_PATHNAME_DATA, title_id), TIMEOUT_SECONDS,
-                                "application/zip");
-    }
-
-    DownloadResult DownloadLaunchParam() {
-        return DownloadInternal(fmt::format(BOXCAT_PATHNAME_LAUNCHPARAM, title_id),
-                                TIMEOUT_SECONDS / 3, "application/octet-stream");
-    }
-
-private:
-    DownloadResult DownloadInternal(const std::string& resolved_path, u32 timeout_seconds,
-                                    const std::string& content_type_name) {
-        if (client == nullptr) {
-            client = std::make_unique<httplib::SSLClient>(BOXCAT_HOSTNAME, PORT, timeout_seconds);
-        }
-
-        httplib::Headers headers{
-            {std::string("Game-Assets-API-Version"), std::string(BOXCAT_API_VERSION)},
-            {std::string("Boxcat-Client-Type"), std::string(BOXCAT_CLIENT_TYPE)},
-            {std::string("Game-Build-Id"), fmt::format("{:016X}", build_id)},
-        };
-
-        if (FileUtil::Exists(path)) {
-            FileUtil::IOFile file{path, "rb"};
-            if (file.IsOpen()) {
-                std::vector<u8> bytes(file.GetSize());
-                file.ReadBytes(bytes.data(), bytes.size());
-                const auto digest = DigestFile(bytes);
-                headers.insert({std::string("If-None-Match"), Common::HexToString(digest, false)});
-            }
-        }
-
-        const auto response = client->Get(resolved_path.c_str(), headers);
-        if (response == nullptr)
-            return DownloadResult::NoResponse;
-
-        if (response->status == static_cast<int>(ResponseStatus::NoUpdate))
-            return DownloadResult::Success;
-        if (response->status == static_cast<int>(ResponseStatus::BadClientVersion))
-            return DownloadResult::BadClientVersion;
-        if (response->status == static_cast<int>(ResponseStatus::NoMatchTitleId))
-            return DownloadResult::NoMatchTitleId;
-        if (response->status == static_cast<int>(ResponseStatus::NoMatchBuildId))
-            return DownloadResult::NoMatchBuildId;
-        if (response->status != static_cast<int>(ResponseStatus::Ok))
-            return DownloadResult::GeneralWebError;
-
-        const auto content_type = response->headers.find("content-type");
-        if (content_type == response->headers.end() ||
-            content_type->second.find(content_type_name) == std::string::npos) {
-            return DownloadResult::InvalidContentType;
-        }
-
-        FileUtil::CreateFullPath(path);
-        FileUtil::IOFile file{path, "wb"};
-        if (!file.IsOpen())
-            return DownloadResult::GeneralFSError;
-        if (!file.Resize(response->body.size()))
-            return DownloadResult::GeneralFSError;
-        if (file.WriteBytes(response->body.data(), response->body.size()) != response->body.size())
-            return DownloadResult::GeneralFSError;
-
-        return DownloadResult::Success;
-    }
-
-    using Digest = std::array<u8, 0x20>;
-    static Digest DigestFile(std::vector<u8> bytes) {
-        Digest out{};
-        mbedtls_sha256(bytes.data(), bytes.size(), out.data(), 0);
-        return out;
-    }
-
-    std::unique_ptr<httplib::Client> client;
-    std::string path;
-    u64 title_id;
-    u64 build_id;
-};
-
-Boxcat::Boxcat(DirectoryGetter getter) : Backend(std::move(getter)) {}
-
-Boxcat::~Boxcat() = default;
-
-void SynchronizeInternal(DirectoryGetter dir_getter, TitleIDVersion title,
-                         ProgressServiceBackend& progress,
-                         std::optional<std::string> dir_name = {}) {
-    progress.SetNeedHLELock(true);
-
-    if (Settings::values.bcat_boxcat_local) {
-        LOG_INFO(Service_BCAT, "Boxcat using local data by override, skipping download.");
-        const auto dir = dir_getter(title.title_id);
-        if (dir)
-            progress.SetTotalSize(dir->GetSize());
-        progress.FinishDownload(RESULT_SUCCESS);
-        return;
-    }
-
-    const auto zip_path{GetZIPFilePath(title.title_id)};
-    Boxcat::Client client{zip_path, title.title_id, title.build_id};
-
-    progress.StartConnecting();
-
-    const auto res = client.DownloadDataZip();
-    if (res != DownloadResult::Success) {
-        LOG_ERROR(Service_BCAT, "Boxcat synchronization failed with error '{}'!", res);
-
-        if (res == DownloadResult::NoMatchBuildId || res == DownloadResult::NoMatchTitleId) {
-            FileUtil::Delete(zip_path);
-        }
-
-        HandleDownloadDisplayResult(res);
-        progress.FinishDownload(ERROR_GENERAL_BCAT_FAILURE);
-        return;
-    }
-
-    progress.StartProcessingDataList();
-
-    FileUtil::IOFile zip{zip_path, "rb"};
-    const auto size = zip.GetSize();
-    std::vector<u8> bytes(size);
-    if (!zip.IsOpen() || size == 0 || zip.ReadBytes(bytes.data(), bytes.size()) != bytes.size()) {
-        LOG_ERROR(Service_BCAT, "Boxcat failed to read ZIP file at path '{}'!", zip_path);
-        progress.FinishDownload(ERROR_GENERAL_BCAT_FAILURE);
-        return;
-    }
-
-    const auto extracted = FileSys::ExtractZIP(std::make_shared<FileSys::VectorVfsFile>(bytes));
-    if (extracted == nullptr) {
-        LOG_ERROR(Service_BCAT, "Boxcat failed to extract ZIP file!");
-        progress.FinishDownload(ERROR_GENERAL_BCAT_FAILURE);
-        return;
-    }
-
-    if (dir_name == std::nullopt) {
-        progress.SetTotalSize(extracted->GetSize());
-
-        const auto target_dir = dir_getter(title.title_id);
-        if (target_dir == nullptr || !VfsRawCopyDProgress(extracted, target_dir, progress)) {
-            LOG_ERROR(Service_BCAT, "Boxcat failed to copy extracted ZIP to target directory!");
-            progress.FinishDownload(ERROR_GENERAL_BCAT_FAILURE);
-            return;
-        }
-    } else {
-        const auto target_dir = dir_getter(title.title_id);
-        if (target_dir == nullptr) {
-            LOG_ERROR(Service_BCAT, "Boxcat failed to get directory for title ID!");
-            progress.FinishDownload(ERROR_GENERAL_BCAT_FAILURE);
-            return;
-        }
-
-        const auto target_sub = target_dir->GetSubdirectory(*dir_name);
-        const auto source_sub = extracted->GetSubdirectory(*dir_name);
-
-        progress.SetTotalSize(source_sub->GetSize());
-
-        std::vector<std::string> filenames;
-        {
-            const auto files = target_sub->GetFiles();
-            std::transform(files.begin(), files.end(), std::back_inserter(filenames),
-                           [](const auto& vfile) { return vfile->GetName(); });
-        }
-
-        for (const auto& filename : filenames) {
-            VfsDeleteFileWrap(target_sub, filename);
-        }
-
-        if (target_sub == nullptr || source_sub == nullptr ||
-            !VfsRawCopyDProgressSingle(source_sub, target_sub, progress)) {
-            LOG_ERROR(Service_BCAT, "Boxcat failed to copy extracted ZIP to target directory!");
-            progress.FinishDownload(ERROR_GENERAL_BCAT_FAILURE);
-            return;
-        }
-    }
-
-    progress.FinishDownload(RESULT_SUCCESS);
-}
-
-bool Boxcat::Synchronize(TitleIDVersion title, ProgressServiceBackend& progress) {
-    is_syncing.exchange(true);
-    std::thread([this, title, &progress] { SynchronizeInternal(dir_getter, title, progress); })
-        .detach();
-    return true;
-}
-
-bool Boxcat::SynchronizeDirectory(TitleIDVersion title, std::string name,
-                                  ProgressServiceBackend& progress) {
-    is_syncing.exchange(true);
-    std::thread(
-        [this, title, name, &progress] { SynchronizeInternal(dir_getter, title, progress, name); })
-        .detach();
-    return true;
-}
-
-bool Boxcat::Clear(u64 title_id) {
-    if (Settings::values.bcat_boxcat_local) {
-        LOG_INFO(Service_BCAT, "Boxcat using local data by override, skipping clear.");
-        return true;
-    }
-
-    const auto dir = dir_getter(title_id);
-
-    std::vector<std::string> dirnames;
-
-    for (const auto& subdir : dir->GetSubdirectories())
-        dirnames.push_back(subdir->GetName());
-
-    for (const auto& subdir : dirnames) {
-        if (!dir->DeleteSubdirectoryRecursive(subdir))
-            return false;
-    }
-
-    return true;
-}
-
-void Boxcat::SetPassphrase(u64 title_id, const Passphrase& passphrase) {
-    LOG_DEBUG(Service_BCAT, "called, title_id={:016X}, passphrase={}", title_id,
-              Common::HexToString(passphrase));
-}
-
-std::optional<std::vector<u8>> Boxcat::GetLaunchParameter(TitleIDVersion title) {
-    const auto path{GetBINFilePath(title.title_id)};
-
-    if (Settings::values.bcat_boxcat_local) {
-        LOG_INFO(Service_BCAT, "Boxcat using local data by override, skipping download.");
-    } else {
-        Boxcat::Client client{path, title.title_id, title.build_id};
-
-        const auto res = client.DownloadLaunchParam();
-        if (res != DownloadResult::Success) {
-            LOG_ERROR(Service_BCAT, "Boxcat synchronization failed with error '{}'!", res);
-
-            if (res == DownloadResult::NoMatchBuildId || res == DownloadResult::NoMatchTitleId) {
-                FileUtil::Delete(path);
-            }
-
-            HandleDownloadDisplayResult(res);
-            return std::nullopt;
-        }
-    }
-
-    FileUtil::IOFile bin{path, "rb"};
-    const auto size = bin.GetSize();
-    std::vector<u8> bytes(size);
-    if (!bin.IsOpen() || size == 0 || bin.ReadBytes(bytes.data(), bytes.size()) != bytes.size()) {
-        LOG_ERROR(Service_BCAT, "Boxcat failed to read launch parameter binary at path '{}'!",
-                  path);
-        return std::nullopt;
-    }
-
-    return bytes;
-}
-
-Boxcat::StatusResult Boxcat::GetStatus(std::optional<std::string>& global,
-                                       std::map<std::string, EventStatus>& games) {
-    httplib::SSLClient client{BOXCAT_HOSTNAME, static_cast<int>(PORT),
-                              static_cast<int>(TIMEOUT_SECONDS)};
-
-    httplib::Headers headers{
-        {std::string("Game-Assets-API-Version"), std::string(BOXCAT_API_VERSION)},
-        {std::string("Boxcat-Client-Type"), std::string(BOXCAT_CLIENT_TYPE)},
-    };
-
-    const auto response = client.Get(BOXCAT_PATHNAME_EVENTS, headers);
-    if (response == nullptr)
-        return StatusResult::Offline;
-
-    if (response->status == static_cast<int>(ResponseStatus::BadClientVersion))
-        return StatusResult::BadClientVersion;
-
-    try {
-        nlohmann::json json = nlohmann::json::parse(response->body);
-
-        if (!json["online"].get<bool>())
-            return StatusResult::Offline;
-
-        if (json["global"].is_null())
-            global = std::nullopt;
-        else
-            global = json["global"].get<std::string>();
-
-        if (json["games"].is_array()) {
-            for (const auto object : json["games"]) {
-                if (object.is_object() && object.find("name") != object.end()) {
-                    EventStatus detail{};
-                    if (object["header"].is_string()) {
-                        detail.header = object["header"].get<std::string>();
-                    } else {
-                        detail.header = std::nullopt;
-                    }
-
-                    if (object["footer"].is_string()) {
-                        detail.footer = object["footer"].get<std::string>();
-                    } else {
-                        detail.footer = std::nullopt;
-                    }
-
-                    if (object["events"].is_array()) {
-                        for (const auto& event : object["events"]) {
-                            if (!event.is_string())
-                                continue;
-                            detail.events.push_back(event.get<std::string>());
-                        }
-                    }
-
-                    games.insert_or_assign(object["name"], std::move(detail));
-                }
-            }
-        }
-
-        return StatusResult::Success;
-    } catch (const nlohmann::json::parse_error& error) {
-        LOG_ERROR(Service_BCAT, "{}", error.what());
-        return StatusResult::ParseError;
-    }
-}
-
-} // namespace Service::BCAT

src/core/hle/service/bcat/backend/boxcat.h

@@ -1,58 +0,0 @@
-// Copyright 2019 yuzu emulator team
-// Licensed under GPLv2 or any later version
-// Refer to the license.txt file included.
-
-#pragma once
-
-#include <atomic>
-#include <map>
-#include <optional>
-#include "core/hle/service/bcat/backend/backend.h"
-
-namespace Service::BCAT {
-
-struct EventStatus {
-    std::optional<std::string> header;
-    std::optional<std::string> footer;
-    std::vector<std::string> events;
-};
-
-/// Boxcat is yuzu's custom backend implementation of Nintendo's BCAT service. It is free to use and
-/// doesn't require a switch or nintendo account. The content is controlled by the yuzu team.
-class Boxcat final : public Backend {
-    friend void SynchronizeInternal(DirectoryGetter dir_getter, TitleIDVersion title,
-                                    ProgressServiceBackend& progress,
-                                    std::optional<std::string> dir_name);
-
-public:
-    explicit Boxcat(DirectoryGetter getter);
-    ~Boxcat() override;
-
-    bool Synchronize(TitleIDVersion title, ProgressServiceBackend& progress) override;
-    bool SynchronizeDirectory(TitleIDVersion title, std::string name,
-                              ProgressServiceBackend& progress) override;
-
-    bool Clear(u64 title_id) override;
-
-    void SetPassphrase(u64 title_id, const Passphrase& passphrase) override;
-
-    std::optional<std::vector<u8>> GetLaunchParameter(TitleIDVersion title) override;
-
-    enum class StatusResult {
-        Success,
-        Offline,
-        ParseError,
-        BadClientVersion,
-    };
-
-    static StatusResult GetStatus(std::optional<std::string>& global,
-                                  std::map<std::string, EventStatus>& games);
-
-private:
-    std::atomic_bool is_syncing{false};
-
-    class Client;
-    std::unique_ptr<Client> client;
-};
-
-} // namespace Service::BCAT

src/core/hle/service/bcat/bcat.cpp

@@ -6,16 +6,11 @@
 
 namespace Service::BCAT {
 
-BCAT::BCAT(Core::System& system, std::shared_ptr<Module> module,
-           FileSystem::FileSystemController& fsc, const char* name)
-    : Interface(system, std::move(module), fsc, name) {
-    // clang-format off
+BCAT::BCAT(std::shared_ptr<Module> module, const char* name)
+    : Module::Interface(std::move(module), name) {
     static const FunctionInfo functions[] = {
         {0, &BCAT::CreateBcatService, "CreateBcatService"},
-        {1, &BCAT::CreateDeliveryCacheStorageService, "CreateDeliveryCacheStorageService"},
-        {2, &BCAT::CreateDeliveryCacheStorageServiceWithApplicationId, "CreateDeliveryCacheStorageServiceWithApplicationId"},
     };
-    // clang-format on
     RegisterHandlers(functions);
 }
 

src/core/hle/service/bcat/bcat.h

@@ -6,16 +6,11 @@
 
 #include "core/hle/service/bcat/module.h"
 
-namespace Core {
-class System;
-}
-
 namespace Service::BCAT {
 
 class BCAT final : public Module::Interface {
 public:
-    explicit BCAT(Core::System& system, std::shared_ptr<Module> module,
-                  FileSystem::FileSystemController& fsc, const char* name);
+    explicit BCAT(std::shared_ptr<Module> module, const char* name);
     ~BCAT() override;
 };
 

src/core/hle/service/bcat/module.cpp

@@ -2,257 +2,34 @@
 // Licensed under GPLv2 or any later version
 // Refer to the license.txt file included.
 
-#include <cctype>
-#include <mbedtls/md5.h>
-#include "backend/boxcat.h"
-#include "common/hex_util.h"
 #include "common/logging/log.h"
-#include "common/string_util.h"
-#include "core/file_sys/vfs.h"
 #include "core/hle/ipc_helpers.h"
-#include "core/hle/kernel/process.h"
-#include "core/hle/kernel/readable_event.h"
-#include "core/hle/kernel/writable_event.h"
-#include "core/hle/service/bcat/backend/backend.h"
 #include "core/hle/service/bcat/bcat.h"
 #include "core/hle/service/bcat/module.h"
-#include "core/hle/service/filesystem/filesystem.h"
-#include "core/settings.h"
 
 namespace Service::BCAT {
 
-constexpr ResultCode ERROR_INVALID_ARGUMENT{ErrorModule::BCAT, 1};
-constexpr ResultCode ERROR_FAILED_OPEN_ENTITY{ErrorModule::BCAT, 2};
-constexpr ResultCode ERROR_ENTITY_ALREADY_OPEN{ErrorModule::BCAT, 6};
-constexpr ResultCode ERROR_NO_OPEN_ENTITY{ErrorModule::BCAT, 7};
-
-// The command to clear the delivery cache just calls fs IFileSystem DeleteFile on all of the files
-// and if any of them have a non-zero result it just forwards that result. This is the FS error code
-// for permission denied, which is the closest approximation of this scenario.
-constexpr ResultCode ERROR_FAILED_CLEAR_CACHE{ErrorModule::FS, 6400};
-
-using BCATDigest = std::array<u8, 0x10>;
-
-namespace {
-
-u64 GetCurrentBuildID(const Core::System::CurrentBuildProcessID& id) {
-    u64 out{};
-    std::memcpy(&out, id.data(), sizeof(u64));
-    return out;
-}
-
-// The digest is only used to determine if a file is unique compared to others of the same name.
-// Since the algorithm isn't ever checked in game, MD5 is safe.
-BCATDigest DigestFile(const FileSys::VirtualFile& file) {
-    BCATDigest out{};
-    const auto bytes = file->ReadAllBytes();
-    mbedtls_md5(bytes.data(), bytes.size(), out.data());
-    return out;
-}
-
-// For a name to be valid it must be non-empty, must have a null terminating character as the final
-// char, can only contain numbers, letters, underscores and a hyphen if directory and a period if
-// file.
-bool VerifyNameValidInternal(Kernel::HLERequestContext& ctx, std::array<char, 0x20> name,
-                             char match_char) {
-    const auto null_chars = std::count(name.begin(), name.end(), 0);
-    const auto bad_chars = std::count_if(name.begin(), name.end(), [match_char](char c) {
-        return !std::isalnum(static_cast<u8>(c)) && c != '_' && c != match_char && c != '\0';
-    });
-    if (null_chars == 0x20 || null_chars == 0 || bad_chars != 0 || name[0x1F] != '\0') {
-        LOG_ERROR(Service_BCAT, "Name passed was invalid!");
-        IPC::ResponseBuilder rb{ctx, 2};
-        rb.Push(ERROR_INVALID_ARGUMENT);
-        return false;
-    }
-
-    return true;
-}
-
-bool VerifyNameValidDir(Kernel::HLERequestContext& ctx, DirectoryName name) {
-    return VerifyNameValidInternal(ctx, name, '-');
-}
-
-bool VerifyNameValidFile(Kernel::HLERequestContext& ctx, FileName name) {
-    return VerifyNameValidInternal(ctx, name, '.');
-}
-
-} // Anonymous namespace
-
-struct DeliveryCacheDirectoryEntry {
-    FileName name;
-    u64 size;
-    BCATDigest digest;
-};
-
-class IDeliveryCacheProgressService final : public ServiceFramework<IDeliveryCacheProgressService> {
-public:
-    IDeliveryCacheProgressService(Kernel::SharedPtr<Kernel::ReadableEvent> event,
-                                  const DeliveryCacheProgressImpl& impl)
-        : ServiceFramework{"IDeliveryCacheProgressService"}, event(std::move(event)), impl(impl) {
-        // clang-format off
-        static const FunctionInfo functions[] = {
-            {0, &IDeliveryCacheProgressService::GetEvent, "GetEvent"},
-            {1, &IDeliveryCacheProgressService::GetImpl, "GetImpl"},
-        };
-        // clang-format on
-
-        RegisterHandlers(functions);
-    }
-
-private:
-    void GetEvent(Kernel::HLERequestContext& ctx) {
-        LOG_DEBUG(Service_BCAT, "called");
-
-        IPC::ResponseBuilder rb{ctx, 2, 1};
-        rb.Push(RESULT_SUCCESS);
-        rb.PushCopyObjects(event);
-    }
-
-    void GetImpl(Kernel::HLERequestContext& ctx) {
-        LOG_DEBUG(Service_BCAT, "called");
-
-        ctx.WriteBuffer(&impl, sizeof(DeliveryCacheProgressImpl));
-
-        IPC::ResponseBuilder rb{ctx, 2};
-        rb.Push(RESULT_SUCCESS);
-    }
-
-    Kernel::SharedPtr<Kernel::ReadableEvent> event;
-    const DeliveryCacheProgressImpl& impl;
-};
-
 class IBcatService final : public ServiceFramework<IBcatService> {
 public:
-    explicit IBcatService(Core::System& system_, Backend& backend_)
-        : ServiceFramework("IBcatService"), system{system_}, backend{backend_} {
-        // clang-format off
+    IBcatService() : ServiceFramework("IBcatService") {
         static const FunctionInfo functions[] = {
-            {10100, &IBcatService::RequestSyncDeliveryCache, "RequestSyncDeliveryCache"},
-            {10101, &IBcatService::RequestSyncDeliveryCacheWithDirectoryName, "RequestSyncDeliveryCacheWithDirectoryName"},
+            {10100, nullptr, "RequestSyncDeliveryCache"},
+            {10101, nullptr, "RequestSyncDeliveryCacheWithDirectoryName"},
             {10200, nullptr, "CancelSyncDeliveryCacheRequest"},
             {20100, nullptr, "RequestSyncDeliveryCacheWithApplicationId"},
             {20101, nullptr, "RequestSyncDeliveryCacheWithApplicationIdAndDirectoryName"},
-            {30100, &IBcatService::SetPassphrase, "SetPassphrase"},
+            {30100, nullptr, "SetPassphrase"},
             {30200, nullptr, "RegisterBackgroundDeliveryTask"},
             {30201, nullptr, "UnregisterBackgroundDeliveryTask"},
             {30202, nullptr, "BlockDeliveryTask"},
             {30203, nullptr, "UnblockDeliveryTask"},
             {90100, nullptr, "EnumerateBackgroundDeliveryTask"},
             {90200, nullptr, "GetDeliveryList"},
-            {90201, &IBcatService::ClearDeliveryCacheStorage, "ClearDeliveryCacheStorage"},
+            {90201, nullptr, "ClearDeliveryCacheStorage"},
             {90300, nullptr, "GetPushNotificationLog"},
         };
-        // clang-format on
         RegisterHandlers(functions);
     }
-
-private:
-    enum class SyncType {
-        Normal,
-        Directory,
-        Count,
-    };
-
-    std::shared_ptr<IDeliveryCacheProgressService> CreateProgressService(SyncType type) {
-        auto& backend{progress.at(static_cast<std::size_t>(type))};
-        return std::make_shared<IDeliveryCacheProgressService>(backend.GetEvent(),
-                                                               backend.GetImpl());
-    }
-
-    void RequestSyncDeliveryCache(Kernel::HLERequestContext& ctx) {
-        LOG_DEBUG(Service_BCAT, "called");
-
-        backend.Synchronize({system.CurrentProcess()->GetTitleID(),
-                             GetCurrentBuildID(system.GetCurrentProcessBuildID())},
-                            progress.at(static_cast<std::size_t>(SyncType::Normal)));
-
-        IPC::ResponseBuilder rb{ctx, 2, 0, 1};
-        rb.Push(RESULT_SUCCESS);
-        rb.PushIpcInterface(CreateProgressService(SyncType::Normal));
-    }
-
-    void RequestSyncDeliveryCacheWithDirectoryName(Kernel::HLERequestContext& ctx) {
-        IPC::RequestParser rp{ctx};
-        const auto name_raw = rp.PopRaw<DirectoryName>();
-        const auto name =
-            Common::StringFromFixedZeroTerminatedBuffer(name_raw.data(), name_raw.size());
-
-        LOG_DEBUG(Service_BCAT, "called, name={}", name);
-
-        backend.SynchronizeDirectory({system.CurrentProcess()->GetTitleID(),
-                                      GetCurrentBuildID(system.GetCurrentProcessBuildID())},
-                                     name,
-                                     progress.at(static_cast<std::size_t>(SyncType::Directory)));
-
-        IPC::ResponseBuilder rb{ctx, 2, 0, 1};
-        rb.Push(RESULT_SUCCESS);
-        rb.PushIpcInterface(CreateProgressService(SyncType::Directory));
-    }
-
-    void SetPassphrase(Kernel::HLERequestContext& ctx) {
-        IPC::RequestParser rp{ctx};
-        const auto title_id = rp.PopRaw<u64>();
-
-        const auto passphrase_raw = ctx.ReadBuffer();
-
-        LOG_DEBUG(Service_BCAT, "called, title_id={:016X}, passphrase={}", title_id,
-                  Common::HexToString(passphrase_raw));
-
-        if (title_id == 0) {
-            LOG_ERROR(Service_BCAT, "Invalid title ID!");
-            IPC::ResponseBuilder rb{ctx, 2};
-            rb.Push(ERROR_INVALID_ARGUMENT);
-        }
-
-        if (passphrase_raw.size() > 0x40) {
-            LOG_ERROR(Service_BCAT, "Passphrase too large!");
-            IPC::ResponseBuilder rb{ctx, 2};
-            rb.Push(ERROR_INVALID_ARGUMENT);
-            return;
-        }
-
-        Passphrase passphrase{};
-        std::memcpy(passphrase.data(), passphrase_raw.data(),
-                    std::min(passphrase.size(), passphrase_raw.size()));
-
-        backend.SetPassphrase(title_id, passphrase);
-
-        IPC::ResponseBuilder rb{ctx, 2};
-        rb.Push(RESULT_SUCCESS);
-    }
-
-    void ClearDeliveryCacheStorage(Kernel::HLERequestContext& ctx) {
-        IPC::RequestParser rp{ctx};
-        const auto title_id = rp.PopRaw<u64>();
-
-        LOG_DEBUG(Service_BCAT, "called, title_id={:016X}", title_id);
-
-        if (title_id == 0) {
-            LOG_ERROR(Service_BCAT, "Invalid title ID!");
-            IPC::ResponseBuilder rb{ctx, 2};
-            rb.Push(ERROR_INVALID_ARGUMENT);
-            return;
-        }
-
-        if (!backend.Clear(title_id)) {
-            LOG_ERROR(Service_BCAT, "Could not clear the directory successfully!");
-            IPC::ResponseBuilder rb{ctx, 2};
-            rb.Push(ERROR_FAILED_CLEAR_CACHE);
-            return;
-        }
-
-        IPC::ResponseBuilder rb{ctx, 2};
-        rb.Push(RESULT_SUCCESS);
-    }
-
-    Core::System& system;
-    Backend& backend;
-
-    std::array<ProgressServiceBackend, static_cast<std::size_t>(SyncType::Count)> progress{
-        ProgressServiceBackend{"Normal"},
-        ProgressServiceBackend{"Directory"},
-    };
 };
 
 void Module::Interface::CreateBcatService(Kernel::HLERequestContext& ctx) {
@@ -260,332 +37,20 @@ void Module::Interface::CreateBcatService(Kernel::HLERequestContext& ctx) {
 
     IPC::ResponseBuilder rb{ctx, 2, 0, 1};
     rb.Push(RESULT_SUCCESS);
-    rb.PushIpcInterface<IBcatService>(system, *backend);
+    rb.PushIpcInterface<IBcatService>();
 }
 
-class IDeliveryCacheFileService final : public ServiceFramework<IDeliveryCacheFileService> {
-public:
-    IDeliveryCacheFileService(FileSys::VirtualDir root_)
-        : ServiceFramework{"IDeliveryCacheFileService"}, root(std::move(root_)) {
-        // clang-format off
-        static const FunctionInfo functions[] = {
-            {0, &IDeliveryCacheFileService::Open, "Open"},
-            {1, &IDeliveryCacheFileService::Read, "Read"},
-            {2, &IDeliveryCacheFileService::GetSize, "GetSize"},
-            {3, &IDeliveryCacheFileService::GetDigest, "GetDigest"},
-        };
-        // clang-format on
-
-        RegisterHandlers(functions);
-    }
-
-private:
-    void Open(Kernel::HLERequestContext& ctx) {
-        IPC::RequestParser rp{ctx};
-        const auto dir_name_raw = rp.PopRaw<DirectoryName>();
-        const auto file_name_raw = rp.PopRaw<FileName>();
-
-        const auto dir_name =
-            Common::StringFromFixedZeroTerminatedBuffer(dir_name_raw.data(), dir_name_raw.size());
-        const auto file_name =
-            Common::StringFromFixedZeroTerminatedBuffer(file_name_raw.data(), file_name_raw.size());
-
-        LOG_DEBUG(Service_BCAT, "called, dir_name={}, file_name={}", dir_name, file_name);
-
-        if (!VerifyNameValidDir(ctx, dir_name_raw) || !VerifyNameValidFile(ctx, file_name_raw))
-            return;
-
-        if (current_file != nullptr) {
-            LOG_ERROR(Service_BCAT, "A file has already been opened on this interface!");
-            IPC::ResponseBuilder rb{ctx, 2};
-            rb.Push(ERROR_ENTITY_ALREADY_OPEN);
-            return;
-        }
-
-        const auto dir = root->GetSubdirectory(dir_name);
-
-        if (dir == nullptr) {
-            LOG_ERROR(Service_BCAT, "The directory of name={} couldn't be opened!", dir_name);
-            IPC::ResponseBuilder rb{ctx, 2};
-            rb.Push(ERROR_FAILED_OPEN_ENTITY);
-            return;
-        }
-
-        current_file = dir->GetFile(file_name);
-
-        if (current_file == nullptr) {
-            LOG_ERROR(Service_BCAT, "The file of name={} couldn't be opened!", file_name);
-            IPC::ResponseBuilder rb{ctx, 2};
-            rb.Push(ERROR_FAILED_OPEN_ENTITY);
-            return;
-        }
-
-        IPC::ResponseBuilder rb{ctx, 2};
-        rb.Push(RESULT_SUCCESS);
-    }
-
-    void Read(Kernel::HLERequestContext& ctx) {
-        IPC::RequestParser rp{ctx};
-        const auto offset{rp.PopRaw<u64>()};
-
-        auto size = ctx.GetWriteBufferSize();
-
-        LOG_DEBUG(Service_BCAT, "called, offset={:016X}, size={:016X}", offset, size);
-
-        if (current_file == nullptr) {
-            LOG_ERROR(Service_BCAT, "There is no file currently open!");
-            IPC::ResponseBuilder rb{ctx, 2};
-            rb.Push(ERROR_NO_OPEN_ENTITY);
-        }
-
-        size = std::min<u64>(current_file->GetSize() - offset, size);
-        const auto buffer = current_file->ReadBytes(size, offset);
-        ctx.WriteBuffer(buffer);
-
-        IPC::ResponseBuilder rb{ctx, 4};
-        rb.Push(RESULT_SUCCESS);
-        rb.Push<u64>(buffer.size());
-    }
-
-    void GetSize(Kernel::HLERequestContext& ctx) {
-        LOG_DEBUG(Service_BCAT, "called");
-
-        if (current_file == nullptr) {
-            LOG_ERROR(Service_BCAT, "There is no file currently open!");
-            IPC::ResponseBuilder rb{ctx, 2};
-            rb.Push(ERROR_NO_OPEN_ENTITY);
-        }
-
-        IPC::ResponseBuilder rb{ctx, 4};
-        rb.Push(RESULT_SUCCESS);
-        rb.Push<u64>(current_file->GetSize());
-    }
-
-    void GetDigest(Kernel::HLERequestContext& ctx) {
-        LOG_DEBUG(Service_BCAT, "called");
-
-        if (current_file == nullptr) {
-            LOG_ERROR(Service_BCAT, "There is no file currently open!");
-            IPC::ResponseBuilder rb{ctx, 2};
-            rb.Push(ERROR_NO_OPEN_ENTITY);
-        }
-
-        IPC::ResponseBuilder rb{ctx, 6};
-        rb.Push(RESULT_SUCCESS);
-        rb.PushRaw(DigestFile(current_file));
-    }
-
-    FileSys::VirtualDir root;
-    FileSys::VirtualFile current_file;
-};
-
-class IDeliveryCacheDirectoryService final
-    : public ServiceFramework<IDeliveryCacheDirectoryService> {
-public:
-    IDeliveryCacheDirectoryService(FileSys::VirtualDir root_)
-        : ServiceFramework{"IDeliveryCacheDirectoryService"}, root(std::move(root_)) {
-        // clang-format off
-        static const FunctionInfo functions[] = {
-            {0, &IDeliveryCacheDirectoryService::Open, "Open"},
-            {1, &IDeliveryCacheDirectoryService::Read, "Read"},
-            {2, &IDeliveryCacheDirectoryService::GetCount, "GetCount"},
-        };
-        // clang-format on
-
-        RegisterHandlers(functions);
-    }
-
-private:
-    void Open(Kernel::HLERequestContext& ctx) {
-        IPC::RequestParser rp{ctx};
-        const auto name_raw = rp.PopRaw<DirectoryName>();
-        const auto name =
-            Common::StringFromFixedZeroTerminatedBuffer(name_raw.data(), name_raw.size());
-
-        LOG_DEBUG(Service_BCAT, "called, name={}", name);
-
-        if (!VerifyNameValidDir(ctx, name_raw))
-            return;
-
-        if (current_dir != nullptr) {
-            LOG_ERROR(Service_BCAT, "A file has already been opened on this interface!");
-            IPC::ResponseBuilder rb{ctx, 2};
-            rb.Push(ERROR_ENTITY_ALREADY_OPEN);
-            return;
-        }
-
-        current_dir = root->GetSubdirectory(name);
-
-        if (current_dir == nullptr) {
-            LOG_ERROR(Service_BCAT, "Failed to open the directory name={}!", name);
-            IPC::ResponseBuilder rb{ctx, 2};
-            rb.Push(ERROR_FAILED_OPEN_ENTITY);
-            return;
-        }
-
-        IPC::ResponseBuilder rb{ctx, 2};
-        rb.Push(RESULT_SUCCESS);
-    }
-
-    void Read(Kernel::HLERequestContext& ctx) {
-        auto write_size = ctx.GetWriteBufferSize() / sizeof(DeliveryCacheDirectoryEntry);
-
-        LOG_DEBUG(Service_BCAT, "called, write_size={:016X}", write_size);
-
-        if (current_dir == nullptr) {
-            LOG_ERROR(Service_BCAT, "There is no open directory!");
-            IPC::ResponseBuilder rb{ctx, 2};
-            rb.Push(ERROR_NO_OPEN_ENTITY);
-            return;
-        }
-
-        const auto files = current_dir->GetFiles();
-        write_size = std::min<u64>(write_size, files.size());
-        std::vector<DeliveryCacheDirectoryEntry> entries(write_size);
-        std::transform(
-            files.begin(), files.begin() + write_size, entries.begin(), [](const auto& file) {
-                FileName name{};
-                std::memcpy(name.data(), file->GetName().data(),
-                            std::min(file->GetName().size(), name.size()));
-                return DeliveryCacheDirectoryEntry{name, file->GetSize(), DigestFile(file)};
-            });
-
-        ctx.WriteBuffer(entries);
-
-        IPC::ResponseBuilder rb{ctx, 3};
-        rb.Push(RESULT_SUCCESS);
-        rb.Push(static_cast<u32>(write_size * sizeof(DeliveryCacheDirectoryEntry)));
-    }
-
-    void GetCount(Kernel::HLERequestContext& ctx) {
-        LOG_DEBUG(Service_BCAT, "called");
-
-        if (current_dir == nullptr) {
-            LOG_ERROR(Service_BCAT, "There is no open directory!");
-            IPC::ResponseBuilder rb{ctx, 2};
-            rb.Push(ERROR_NO_OPEN_ENTITY);
-            return;
-        }
-
-        const auto files = current_dir->GetFiles();
-
-        IPC::ResponseBuilder rb{ctx, 3};
-        rb.Push(RESULT_SUCCESS);
-        rb.Push(static_cast<u32>(files.size()));
-    }
-
-    FileSys::VirtualDir root;
-    FileSys::VirtualDir current_dir;
-};
-
-class IDeliveryCacheStorageService final : public ServiceFramework<IDeliveryCacheStorageService> {
-public:
-    IDeliveryCacheStorageService(FileSys::VirtualDir root_)
-        : ServiceFramework{"IDeliveryCacheStorageService"}, root(std::move(root_)) {
-        // clang-format off
-        static const FunctionInfo functions[] = {
-            {0, &IDeliveryCacheStorageService::CreateFileService, "CreateFileService"},
-            {1, &IDeliveryCacheStorageService::CreateDirectoryService, "CreateDirectoryService"},
-            {10, &IDeliveryCacheStorageService::EnumerateDeliveryCacheDirectory, "EnumerateDeliveryCacheDirectory"},
-        };
-        // clang-format on
-
-        RegisterHandlers(functions);
-
-        for (const auto& subdir : root->GetSubdirectories()) {
-            DirectoryName name{};
-            std::memcpy(name.data(), subdir->GetName().data(),
-                        std::min(sizeof(DirectoryName) - 1, subdir->GetName().size()));
-            entries.push_back(name);
-        }
-    }
-
-private:
-    void CreateFileService(Kernel::HLERequestContext& ctx) {
-        LOG_DEBUG(Service_BCAT, "called");
-
-        IPC::ResponseBuilder rb{ctx, 2, 0, 1};
-        rb.Push(RESULT_SUCCESS);
-        rb.PushIpcInterface<IDeliveryCacheFileService>(root);
-    }
-
-    void CreateDirectoryService(Kernel::HLERequestContext& ctx) {
-        LOG_DEBUG(Service_BCAT, "called");
-
-        IPC::ResponseBuilder rb{ctx, 2, 0, 1};
-        rb.Push(RESULT_SUCCESS);
-        rb.PushIpcInterface<IDeliveryCacheDirectoryService>(root);
-    }
-
-    void EnumerateDeliveryCacheDirectory(Kernel::HLERequestContext& ctx) {
-        auto size = ctx.GetWriteBufferSize() / sizeof(DirectoryName);
-
-        LOG_DEBUG(Service_BCAT, "called, size={:016X}", size);
-
-        size = std::min<u64>(size, entries.size() - next_read_index);
-        ctx.WriteBuffer(entries.data() + next_read_index, size * sizeof(DirectoryName));
-        next_read_index += size;
-
-        IPC::ResponseBuilder rb{ctx, 3};
-        rb.Push(RESULT_SUCCESS);
-        rb.Push(static_cast<u32>(size));
-    }
-
-    FileSys::VirtualDir root;
-    std::vector<DirectoryName> entries;
-    u64 next_read_index = 0;
-};
-
-void Module::Interface::CreateDeliveryCacheStorageService(Kernel::HLERequestContext& ctx) {
-    LOG_DEBUG(Service_BCAT, "called");
-
-    IPC::ResponseBuilder rb{ctx, 2, 0, 1};
-    rb.Push(RESULT_SUCCESS);
-    rb.PushIpcInterface<IDeliveryCacheStorageService>(
-        fsc.GetBCATDirectory(system.CurrentProcess()->GetTitleID()));
-}
-
-void Module::Interface::CreateDeliveryCacheStorageServiceWithApplicationId(
-    Kernel::HLERequestContext& ctx) {
-    IPC::RequestParser rp{ctx};
-    const auto title_id = rp.PopRaw<u64>();
-
-    LOG_DEBUG(Service_BCAT, "called, title_id={:016X}", title_id);
-
-    IPC::ResponseBuilder rb{ctx, 2, 0, 1};
-    rb.Push(RESULT_SUCCESS);
-    rb.PushIpcInterface<IDeliveryCacheStorageService>(fsc.GetBCATDirectory(title_id));
-}
-
-std::unique_ptr<Backend> CreateBackendFromSettings(DirectoryGetter getter) {
-    const auto backend = Settings::values.bcat_backend;
-
-#ifdef YUZU_ENABLE_BOXCAT
-    if (backend == "boxcat")
-        return std::make_unique<Boxcat>(std::move(getter));
-#endif
-
-    return std::make_unique<NullBackend>(std::move(getter));
-}
-
-Module::Interface::Interface(Core::System& system_, std::shared_ptr<Module> module_,
-                             FileSystem::FileSystemController& fsc_, const char* name)
-    : ServiceFramework(name), fsc{fsc_}, module{std::move(module_)},
-      backend{CreateBackendFromSettings([&fsc_](u64 tid) { return fsc_.GetBCATDirectory(tid); })},
-      system{system_} {}
+Module::Interface::Interface(std::shared_ptr<Module> module, const char* name)
+    : ServiceFramework(name), module(std::move(module)) {}
 
 Module::Interface::~Interface() = default;
 
-void InstallInterfaces(Core::System& system) {
+void InstallInterfaces(SM::ServiceManager& service_manager) {
     auto module = std::make_shared<Module>();
-    std::make_shared<BCAT>(system, module, system.GetFileSystemController(), "bcat:a")
-        ->InstallAsService(system.ServiceManager());
-    std::make_shared<BCAT>(system, module, system.GetFileSystemController(), "bcat:m")
-        ->InstallAsService(system.ServiceManager());
-    std::make_shared<BCAT>(system, module, system.GetFileSystemController(), "bcat:u")
-        ->InstallAsService(system.ServiceManager());
-    std::make_shared<BCAT>(system, module, system.GetFileSystemController(), "bcat:s")
-        ->InstallAsService(system.ServiceManager());
+    std::make_shared<BCAT>(module, "bcat:a")->InstallAsService(service_manager);
+    std::make_shared<BCAT>(module, "bcat:m")->InstallAsService(service_manager);
+    std::make_shared<BCAT>(module, "bcat:u")->InstallAsService(service_manager);
+    std::make_shared<BCAT>(module, "bcat:s")->InstallAsService(service_manager);
 }
 
 } // namespace Service::BCAT

src/core/hle/service/bcat/module.h

@@ -6,46 +6,23 @@
 
 #include "core/hle/service/service.h"
 
-namespace Core {
-class System;
-}
-
-namespace Service {
-
-namespace FileSystem {
-class FileSystemController;
-} // namespace FileSystem
-
-namespace BCAT {
-
-class Backend;
+namespace Service::BCAT {
 
 class Module final {
 public:
     class Interface : public ServiceFramework<Interface> {
     public:
-        explicit Interface(Core::System& system_, std::shared_ptr<Module> module_,
-                           FileSystem::FileSystemController& fsc_, const char* name);
+        explicit Interface(std::shared_ptr<Module> module, const char* name);
         ~Interface() override;
 
         void CreateBcatService(Kernel::HLERequestContext& ctx);
-        void CreateDeliveryCacheStorageService(Kernel::HLERequestContext& ctx);
-        void CreateDeliveryCacheStorageServiceWithApplicationId(Kernel::HLERequestContext& ctx);
 
     protected:
-        FileSystem::FileSystemController& fsc;
-
         std::shared_ptr<Module> module;
-        std::unique_ptr<Backend> backend;
-
-    private:
-        Core::System& system;
     };
 };
 
 /// Registers all BCAT services with the specified service manager.
-void InstallInterfaces(Core::System& system);
+void InstallInterfaces(SM::ServiceManager& service_manager);
 
-} // namespace BCAT
-
-} // namespace Service
+} // namespace Service::BCAT

src/core/hle/service/es/es.cpp

@@ -128,7 +128,7 @@ private:
     void CountCommonTicket(Kernel::HLERequestContext& ctx) {
         LOG_DEBUG(Service_ETicket, "called");
 
-        const u32 count = static_cast<u32>(keys.GetCommonTickets().size());
+        const auto count = keys.GetCommonTickets().size();
 
         IPC::ResponseBuilder rb{ctx, 3};
         rb.Push(RESULT_SUCCESS);
@@ -138,7 +138,7 @@ private:
     void CountPersonalizedTicket(Kernel::HLERequestContext& ctx) {
         LOG_DEBUG(Service_ETicket, "called");
 
-        const u32 count = static_cast<u32>(keys.GetPersonalizedTickets().size());
+        const auto count = keys.GetPersonalizedTickets().size();
 
         IPC::ResponseBuilder rb{ctx, 3};
         rb.Push(RESULT_SUCCESS);
@@ -150,7 +150,7 @@ private:
         if (keys.GetCommonTickets().empty())
             out_entries = 0;
         else
-            out_entries = static_cast<u32>(ctx.GetWriteBufferSize() / sizeof(u128));
+            out_entries = ctx.GetWriteBufferSize() / sizeof(u128);
 
         LOG_DEBUG(Service_ETicket, "called, entries={:016X}", out_entries);
 
@@ -160,7 +160,7 @@ private:
         std::transform(tickets.begin(), tickets.end(), std::back_inserter(ids),
                        [](const auto& pair) { return pair.first; });
 
-        out_entries = static_cast<u32>(std::min<std::size_t>(ids.size(), out_entries));
+        out_entries = std::min<u32>(ids.size(), out_entries);
         ctx.WriteBuffer(ids.data(), out_entries * sizeof(u128));
 
         IPC::ResponseBuilder rb{ctx, 3};
@@ -173,7 +173,7 @@ private:
         if (keys.GetPersonalizedTickets().empty())
             out_entries = 0;
         else
-            out_entries = static_cast<u32>(ctx.GetWriteBufferSize() / sizeof(u128));
+            out_entries = ctx.GetWriteBufferSize() / sizeof(u128);
 
         LOG_DEBUG(Service_ETicket, "called, entries={:016X}", out_entries);
 
@@ -183,7 +183,7 @@ private:
         std::transform(tickets.begin(), tickets.end(), std::back_inserter(ids),
                        [](const auto& pair) { return pair.first; });
 
-        out_entries = static_cast<u32>(std::min<std::size_t>(ids.size(), out_entries));
+        out_entries = std::min<u32>(ids.size(), out_entries);
         ctx.WriteBuffer(ids.data(), out_entries * sizeof(u128));
 
         IPC::ResponseBuilder rb{ctx, 3};

src/core/hle/service/fatal/fatal.cpp

@@ -66,7 +66,7 @@ enum class FatalType : u32 {
 
 static void GenerateErrorReport(Core::System& system, ResultCode error_code,
                                 const FatalInfo& info) {
-    const auto title_id = system.CurrentProcess()->GetTitleID();
+    const auto title_id = Core::CurrentProcess()->GetTitleID();
     std::string crash_report = fmt::format(
         "Yuzu {}-{} crash report\n"
         "Title ID:                        {:016x}\n"

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

@@ -244,7 +244,7 @@ ResultVal<FileSys::EntryType> VfsDirectoryServiceWrapper::GetEntryType(
     return FileSys::ERROR_PATH_NOT_FOUND;
 }
 
-FileSystemController::FileSystemController(Core::System& system_) : system{system_} {}
+FileSystemController::FileSystemController() = default;
 
 FileSystemController::~FileSystemController() = default;
 
@@ -293,7 +293,7 @@ ResultVal<FileSys::VirtualFile> FileSystemController::OpenRomFSCurrentProcess()
         return ResultCode(-1);
     }
 
-    return romfs_factory->OpenCurrentProcess(system.CurrentProcess()->GetTitleID());
+    return romfs_factory->OpenCurrentProcess();
 }
 
 ResultVal<FileSys::VirtualFile> FileSystemController::OpenRomFS(
@@ -450,10 +450,10 @@ FileSys::SaveDataSize FileSystemController::ReadSaveDataSize(FileSys::SaveDataTy
         FileSys::SaveDataSize new_size{SUFFICIENT_SAVE_DATA_SIZE, SUFFICIENT_SAVE_DATA_SIZE};
 
         FileSys::NACP nacp;
-        const auto res = system.GetAppLoader().ReadControlData(nacp);
+        const auto res = Core::System::GetInstance().GetAppLoader().ReadControlData(nacp);
 
         if (res != Loader::ResultStatus::Success) {
-            FileSys::PatchManager pm{system.CurrentProcess()->GetTitleID()};
+            FileSys::PatchManager pm{Core::CurrentProcess()->GetTitleID()};
             auto [nacp_unique, discard] = pm.GetControlMetadata();
 
             if (nacp_unique != nullptr) {
@@ -677,15 +677,6 @@ FileSys::VirtualDir FileSystemController::GetModificationDumpRoot(u64 title_id)
     return bis_factory->GetModificationDumpRoot(title_id);
 }
 
-FileSys::VirtualDir FileSystemController::GetBCATDirectory(u64 title_id) const {
-    LOG_TRACE(Service_FS, "Opening BCAT root for tid={:016X}", title_id);
-
-    if (bis_factory == nullptr)
-        return nullptr;
-
-    return bis_factory->GetBCATDirectory(title_id);
-}
-
 void FileSystemController::CreateFactories(FileSys::VfsFilesystem& vfs, bool overwrite) {
     if (overwrite) {
         bis_factory = nullptr;
@@ -705,10 +696,10 @@ void FileSystemController::CreateFactories(FileSys::VfsFilesystem& vfs, bool ove
     if (bis_factory == nullptr) {
         bis_factory =
             std::make_unique<FileSys::BISFactory>(nand_directory, load_directory, dump_directory);
-        system.RegisterContentProvider(FileSys::ContentProviderUnionSlot::SysNAND,
-                                       bis_factory->GetSystemNANDContents());
-        system.RegisterContentProvider(FileSys::ContentProviderUnionSlot::UserNAND,
-                                       bis_factory->GetUserNANDContents());
+        Core::System::GetInstance().RegisterContentProvider(
+            FileSys::ContentProviderUnionSlot::SysNAND, bis_factory->GetSystemNANDContents());
+        Core::System::GetInstance().RegisterContentProvider(
+            FileSys::ContentProviderUnionSlot::UserNAND, bis_factory->GetUserNANDContents());
     }
 
     if (save_data_factory == nullptr) {
@@ -717,8 +708,8 @@ void FileSystemController::CreateFactories(FileSys::VfsFilesystem& vfs, bool ove
 
     if (sdmc_factory == nullptr) {
         sdmc_factory = std::make_unique<FileSys::SDMCFactory>(std::move(sd_directory));
-        system.RegisterContentProvider(FileSys::ContentProviderUnionSlot::SDMC,
-                                       sdmc_factory->GetSDMCContents());
+        Core::System::GetInstance().RegisterContentProvider(FileSys::ContentProviderUnionSlot::SDMC,
+                                                            sdmc_factory->GetSDMCContents());
     }
 }
 

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

@@ -10,10 +10,6 @@
 #include "core/file_sys/vfs.h"
 #include "core/hle/result.h"
 
-namespace Core {
-class System;
-}
-
 namespace FileSys {
 class BISFactory;
 class RegisteredCache;
@@ -56,7 +52,7 @@ enum class ImageDirectoryId : u32 {
 
 class FileSystemController {
 public:
-    explicit FileSystemController(Core::System& system_);
+    FileSystemController();
     ~FileSystemController();
 
     ResultCode RegisterRomFS(std::unique_ptr<FileSys::RomFSFactory>&& factory);
@@ -114,8 +110,6 @@ public:
     FileSys::VirtualDir GetModificationLoadRoot(u64 title_id) const;
     FileSys::VirtualDir GetModificationDumpRoot(u64 title_id) const;
 
-    FileSys::VirtualDir GetBCATDirectory(u64 title_id) const;
-
     // Creates the SaveData, SDMC, and BIS Factories. Should be called once and before any function
     // above is called.
     void CreateFactories(FileSys::VfsFilesystem& vfs, bool overwrite = true);
@@ -129,8 +123,6 @@ private:
     std::unique_ptr<FileSys::XCI> gamecard;
     std::unique_ptr<FileSys::RegisteredCache> gamecard_registered;
     std::unique_ptr<FileSys::PlaceholderCache> gamecard_placeholder;
-
-    Core::System& system;
 };
 
 void InstallInterfaces(Core::System& system);

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

@@ -803,7 +803,7 @@ void FSP_SRV::CreateSaveDataFileSystem(Kernel::HLERequestContext& ctx) {
     IPC::RequestParser rp{ctx};
 
     auto save_struct = rp.PopRaw<FileSys::SaveDataDescriptor>();
-    [[maybe_unused]] auto save_create_struct = rp.PopRaw<std::array<u8, 0x40>>();
+    auto save_create_struct = rp.PopRaw<std::array<u8, 0x40>>();
     u128 uid = rp.PopRaw<u128>();
 
     LOG_DEBUG(Service_FS, "called save_struct = {}, uid = {:016X}{:016X}", save_struct.DebugInfo(),

src/core/hle/service/friend/friend.cpp

@@ -237,6 +237,7 @@ private:
     };
 
     Common::UUID uuid;
+    bool is_event_created = false;
     Kernel::EventPair notification_event;
     std::queue<SizedNotificationInfo> notifications;
     States states{};

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

@@ -11,10 +11,11 @@
 namespace Service::HID {
 
 constexpr s32 HID_JOYSTICK_MAX = 0x7fff;
-[[maybe_unused]] constexpr s32 HID_JOYSTICK_MIN = -0x7fff;
+constexpr s32 HID_JOYSTICK_MIN = -0x7fff;
 enum class JoystickId : std::size_t { Joystick_Left, Joystick_Right };
 
-Controller_DebugPad::Controller_DebugPad(Core::System& system) : ControllerBase(system) {}
+Controller_DebugPad::Controller_DebugPad(Core::System& system)
+    : ControllerBase(system), system(system) {}
 Controller_DebugPad::~Controller_DebugPad() = default;
 
 void Controller_DebugPad::OnInit() {}

src/core/hle/service/hid/controllers/debug_pad.h

@@ -89,5 +89,6 @@ private:
         buttons;
     std::array<std::unique_ptr<Input::AnalogDevice>, Settings::NativeAnalog::NUM_STICKS_HID>
         analogs;
+    Core::System& system;
 };
 } // namespace Service::HID

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

@@ -10,7 +10,8 @@
 namespace Service::HID {
 constexpr std::size_t SHARED_MEMORY_OFFSET = 0x3BA00;
 
-Controller_Gesture::Controller_Gesture(Core::System& system) : ControllerBase(system) {}
+Controller_Gesture::Controller_Gesture(Core::System& system)
+    : ControllerBase(system), system(system) {}
 Controller_Gesture::~Controller_Gesture() = default;
 
 void Controller_Gesture::OnInit() {}

src/core/hle/service/hid/controllers/gesture.h

@@ -59,5 +59,6 @@ private:
         std::array<GestureState, 17> gesture_states;
     };
     SharedMemory shared_memory{};
+    Core::System& system;
 };
 } // namespace Service::HID

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

@@ -12,7 +12,8 @@ namespace Service::HID {
 constexpr std::size_t SHARED_MEMORY_OFFSET = 0x3800;
 constexpr u8 KEYS_PER_BYTE = 8;
 
-Controller_Keyboard::Controller_Keyboard(Core::System& system) : ControllerBase(system) {}
+Controller_Keyboard::Controller_Keyboard(Core::System& system)
+    : ControllerBase(system), system(system) {}
 Controller_Keyboard::~Controller_Keyboard() = default;
 
 void Controller_Keyboard::OnInit() {}

src/core/hle/service/hid/controllers/keyboard.h

@@ -53,5 +53,6 @@ private:
         keyboard_keys;
     std::array<std::unique_ptr<Input::ButtonDevice>, Settings::NativeKeyboard::NumKeyboardMods>
         keyboard_mods;
+    Core::System& system;
 };
 } // namespace Service::HID

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

@@ -11,7 +11,7 @@
 namespace Service::HID {
 constexpr std::size_t SHARED_MEMORY_OFFSET = 0x3400;
 
-Controller_Mouse::Controller_Mouse(Core::System& system) : ControllerBase(system) {}
+Controller_Mouse::Controller_Mouse(Core::System& system) : ControllerBase(system), system(system) {}
 Controller_Mouse::~Controller_Mouse() = default;
 
 void Controller_Mouse::OnInit() {}

src/core/hle/service/hid/controllers/mouse.h

@@ -53,5 +53,6 @@ private:
     std::unique_ptr<Input::MouseDevice> mouse_device;
     std::array<std::unique_ptr<Input::ButtonDevice>, Settings::NativeMouseButton::NumMouseButtons>
         mouse_button_devices;
+    Core::System& system;
 };
 } // namespace Service::HID

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

@@ -20,7 +20,7 @@
 
 namespace Service::HID {
 constexpr s32 HID_JOYSTICK_MAX = 0x7fff;
-[[maybe_unused]] constexpr s32 HID_JOYSTICK_MIN = -0x7fff;
+constexpr s32 HID_JOYSTICK_MIN = -0x7fff;
 constexpr std::size_t NPAD_OFFSET = 0x9A00;
 constexpr u32 BATTERY_FULL = 2;
 constexpr u32 MAX_NPAD_ID = 7;
@@ -105,8 +105,6 @@ void Controller_NPad::InitNewlyAddedControler(std::size_t controller_idx) {
     controller.joy_styles.raw = 0; // Zero out
     controller.device_type.raw = 0;
     switch (controller_type) {
-    case NPadControllerType::None:
-        UNREACHABLE();
     case NPadControllerType::Handheld:
         controller.joy_styles.handheld.Assign(1);
         controller.device_type.handheld.Assign(1);
@@ -167,14 +165,13 @@ void Controller_NPad::InitNewlyAddedControler(std::size_t controller_idx) {
     controller.battery_level[0] = BATTERY_FULL;
     controller.battery_level[1] = BATTERY_FULL;
     controller.battery_level[2] = BATTERY_FULL;
-    styleset_changed_events[controller_idx].writable->Signal();
 }
 
 void Controller_NPad::OnInit() {
     auto& kernel = system.Kernel();
     for (std::size_t i = 0; i < styleset_changed_events.size(); i++) {
         styleset_changed_events[i] = Kernel::WritableEvent::CreateEventPair(
-            kernel, Kernel::ResetType::Manual, fmt::format("npad:NpadStyleSetChanged_{}", i));
+            kernel, Kernel::ResetType::Automatic, fmt::format("npad:NpadStyleSetChanged_{}", i));
     }
 
     if (!IsControllerActivated()) {
@@ -241,7 +238,7 @@ void Controller_NPad::OnRelease() {}
 
 void Controller_NPad::RequestPadStateUpdate(u32 npad_id) {
     const auto controller_idx = NPadIdToIndex(npad_id);
-    [[maybe_unused]] const auto controller_type = connected_controllers[controller_idx].type;
+    const auto controller_type = connected_controllers[controller_idx].type;
     if (!connected_controllers[controller_idx].is_connected) {
         return;
     }
@@ -348,8 +345,6 @@ void Controller_NPad::OnUpdate(const Core::Timing::CoreTiming& core_timing, u8*
         libnx_entry.connection_status.raw = 0;
 
         switch (controller_type) {
-        case NPadControllerType::None:
-            UNREACHABLE();
         case NPadControllerType::Handheld:
             handheld_entry.connection_status.raw = 0;
             handheld_entry.connection_status.IsWired.Assign(1);
@@ -438,6 +433,7 @@ void Controller_NPad::SetSupportedNPadIdTypes(u8* data, std::size_t length) {
     supported_npad_id_types.clear();
     supported_npad_id_types.resize(length / sizeof(u32));
     std::memcpy(supported_npad_id_types.data(), data, length);
+    bool had_controller_update = false;
     for (std::size_t i = 0; i < connected_controllers.size(); i++) {
         auto& controller = connected_controllers[i];
         if (!controller.is_connected) {
@@ -456,6 +452,10 @@ void Controller_NPad::SetSupportedNPadIdTypes(u8* data, std::size_t length) {
                 controller.type = requested_controller;
                 InitNewlyAddedControler(i);
             }
+            had_controller_update = true;
+        }
+        if (had_controller_update) {
+            styleset_changed_events[i].writable->Signal();
         }
     }
 }
@@ -481,6 +481,7 @@ void Controller_NPad::SetNpadMode(u32 npad_id, NPadAssignments assignment_mode)
     const std::size_t npad_index = NPadIdToIndex(npad_id);
     ASSERT(npad_index < shared_memory_entries.size());
     if (shared_memory_entries[npad_index].pad_assignment != assignment_mode) {
+        styleset_changed_events[npad_index].writable->Signal();
         shared_memory_entries[npad_index].pad_assignment = assignment_mode;
     }
 }
@@ -506,6 +507,7 @@ Kernel::SharedPtr<Kernel::ReadableEvent> Controller_NPad::GetStyleSetChangedEven
     // TODO(ogniK): Figure out the best time to signal this event. This event seems that it should
     // be signalled at least once, and signaled after a new controller is connected?
     const auto& styleset_event = styleset_changed_events[NPadIdToIndex(npad_id)];
+    styleset_event.writable->Signal();
     return styleset_event.readable;
 }
 

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

@@ -9,7 +9,8 @@
 
 namespace Service::HID {
 
-Controller_Stubbed::Controller_Stubbed(Core::System& system) : ControllerBase(system) {}
+Controller_Stubbed::Controller_Stubbed(Core::System& system)
+    : ControllerBase(system), system(system) {}
 Controller_Stubbed::~Controller_Stubbed() = default;
 
 void Controller_Stubbed::OnInit() {}

src/core/hle/service/hid/controllers/stubbed.h

@@ -30,5 +30,6 @@ public:
 private:
     bool smart_update{};
     std::size_t common_offset{};
+    Core::System& system;
 };
 } // namespace Service::HID

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

@@ -13,7 +13,8 @@
 namespace Service::HID {
 constexpr std::size_t SHARED_MEMORY_OFFSET = 0x400;
 
-Controller_Touchscreen::Controller_Touchscreen(Core::System& system) : ControllerBase(system) {}
+Controller_Touchscreen::Controller_Touchscreen(Core::System& system)
+    : ControllerBase(system), system(system) {}
 Controller_Touchscreen::~Controller_Touchscreen() = default;
 
 void Controller_Touchscreen::OnInit() {}

src/core/hle/service/hid/controllers/touchscreen.h

@@ -69,5 +69,6 @@ private:
     TouchScreenSharedMemory shared_memory{};
     std::unique_ptr<Input::TouchDevice> touch_device;
     s64_le last_touch{};
+    Core::System& system;
 };
 } // namespace Service::HID

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

@@ -10,7 +10,7 @@
 namespace Service::HID {
 constexpr std::size_t SHARED_MEMORY_OFFSET = 0x3C00;
 
-Controller_XPad::Controller_XPad(Core::System& system) : ControllerBase(system) {}
+Controller_XPad::Controller_XPad(Core::System& system) : ControllerBase(system), system(system) {}
 Controller_XPad::~Controller_XPad() = default;
 
 void Controller_XPad::OnInit() {}

src/core/hle/service/hid/controllers/xpad.h

@@ -56,5 +56,6 @@ private:
     };
     static_assert(sizeof(SharedMemory) == 0x1000, "SharedMemory is an invalid size");
     SharedMemory shared_memory{};
+    Core::System& system;
 };
 } // namespace Service::HID

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

@@ -38,10 +38,8 @@ namespace Service::HID {
 // Updating period for each HID device.
 // TODO(ogniK): Find actual polling rate of hid
 constexpr s64 pad_update_ticks = static_cast<s64>(Core::Timing::BASE_CLOCK_RATE / 66);
-[[maybe_unused]] constexpr s64 accelerometer_update_ticks =
-    static_cast<s64>(Core::Timing::BASE_CLOCK_RATE / 100);
-[[maybe_unused]] constexpr s64 gyroscope_update_ticks =
-    static_cast<s64>(Core::Timing::BASE_CLOCK_RATE / 100);
+constexpr s64 accelerometer_update_ticks = static_cast<s64>(Core::Timing::BASE_CLOCK_RATE / 100);
+constexpr s64 gyroscope_update_ticks = static_cast<s64>(Core::Timing::BASE_CLOCK_RATE / 100);
 constexpr std::size_t SHARED_MEMORY_SIZE = 0x40000;
 
 IAppletResource::IAppletResource(Core::System& system)
@@ -195,7 +193,7 @@ Hid::Hid(Core::System& system) : ServiceFramework("hid"), system(system) {
         {101, &Hid::GetSupportedNpadStyleSet, "GetSupportedNpadStyleSet"},
         {102, &Hid::SetSupportedNpadIdType, "SetSupportedNpadIdType"},
         {103, &Hid::ActivateNpad, "ActivateNpad"},
-        {104, &Hid::DeactivateNpad, "DeactivateNpad"},
+        {104, nullptr, "DeactivateNpad"},
         {106, &Hid::AcquireNpadStyleSetUpdateEventHandle, "AcquireNpadStyleSetUpdateEventHandle"},
         {107, &Hid::DisconnectNpad, "DisconnectNpad"},
         {108, &Hid::GetPlayerLedPattern, "GetPlayerLedPattern"},
@@ -470,17 +468,6 @@ void Hid::ActivateNpad(Kernel::HLERequestContext& ctx) {
     applet_resource->ActivateController(HidController::NPad);
 }
 
-void Hid::DeactivateNpad(Kernel::HLERequestContext& ctx) {
-    IPC::RequestParser rp{ctx};
-    const auto applet_resource_user_id{rp.Pop<u64>()};
-
-    LOG_DEBUG(Service_HID, "called, applet_resource_user_id={}", applet_resource_user_id);
-
-    IPC::ResponseBuilder rb{ctx, 2};
-    rb.Push(RESULT_SUCCESS);
-    applet_resource->DeactivateController(HidController::NPad);
-}
-
 void Hid::AcquireNpadStyleSetUpdateEventHandle(Kernel::HLERequestContext& ctx) {
     IPC::RequestParser rp{ctx};
     const auto npad_id{rp.Pop<u32>()};

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

@@ -99,7 +99,6 @@ private:
     void GetSupportedNpadStyleSet(Kernel::HLERequestContext& ctx);
     void SetSupportedNpadIdType(Kernel::HLERequestContext& ctx);
     void ActivateNpad(Kernel::HLERequestContext& ctx);
-    void DeactivateNpad(Kernel::HLERequestContext& ctx);
     void AcquireNpadStyleSetUpdateEventHandle(Kernel::HLERequestContext& ctx);
     void DisconnectNpad(Kernel::HLERequestContext& ctx);
     void GetPlayerLedPattern(Kernel::HLERequestContext& ctx);

src/core/hle/service/ldr/ldr.cpp

@@ -163,7 +163,7 @@ public:
             return;
         }
 
-        if (system.CurrentProcess()->GetTitleID() != header.title_id) {
+        if (Core::CurrentProcess()->GetTitleID() != header.title_id) {
             LOG_ERROR(Service_LDR,
                       "Attempting to load NRR with title ID other than current process. (actual "
                       "{:016X})!",
@@ -327,7 +327,7 @@ public:
         }
 
         // Load NRO as new executable module
-        auto* process = system.CurrentProcess();
+        auto* process = Core::CurrentProcess();
         auto& vm_manager = process->VMManager();
         auto map_address = vm_manager.FindFreeRegion(nro_size + bss_size);
 
@@ -411,7 +411,7 @@ public:
             return;
         }
 
-        auto& vm_manager = system.CurrentProcess()->VMManager();
+        auto& vm_manager = Core::CurrentProcess()->VMManager();
         const auto& nro_info = iter->second;
 
         // Unmap the mirrored memory