Skip to content

VERY experimental Nintendo Switch 2 emulator

C++

[fs] Remove remaining files from NCA bypass and fix some asserts (#2502)

MaranBr8ac495aceea5
diff --git a/src/core/CMakeLists.txt b/src/core/CMakeLists.txt
index 89c97eb1aa..4d9566a60f 100644
--- a/src/core/CMakeLists.txt
+++ b/src/core/CMakeLists.txt
@@ -107,7 +107,6 @@ add_library(core STATIC
file_sys/fssystem/fssystem_nca_header.cpp
file_sys/fssystem/fssystem_nca_header.h
file_sys/fssystem/fssystem_nca_reader.cpp
- file_sys/fssystem/fssystem_passthrough_storage.h
file_sys/fssystem/fssystem_pooled_buffer.cpp
file_sys/fssystem/fssystem_pooled_buffer.h
file_sys/fssystem/fssystem_sparse_storage.cpp
diff --git a/src/core/file_sys/fssystem/fssystem_bucket_tree.cpp b/src/core/file_sys/fssystem/fssystem_bucket_tree.cpp
index 71ba458cef..f58b154968 100644
--- a/src/core/file_sys/fssystem/fssystem_bucket_tree.cpp
+++ b/src/core/file_sys/fssystem/fssystem_bucket_tree.cpp
@@ -4,7 +4,6 @@
// SPDX-FileCopyrightText: Copyright 2023 yuzu Emulator Project
// SPDX-License-Identifier: GPL-2.0-or-later
-#include "common/settings.h"
#include "core/file_sys/errors.h"
#include "core/file_sys/fssystem/fssystem_bucket_tree.h"
#include "core/file_sys/fssystem/fssystem_bucket_tree_utils.h"
diff --git a/src/core/file_sys/fssystem/fssystem_nca_file_system_driver.cpp b/src/core/file_sys/fssystem/fssystem_nca_file_system_driver.cpp
index 37fb71e9e3..25036b02c1 100644
--- a/src/core/file_sys/fssystem/fssystem_nca_file_system_driver.cpp
+++ b/src/core/file_sys/fssystem/fssystem_nca_file_system_driver.cpp
@@ -4,7 +4,6 @@
// SPDX-FileCopyrightText: Copyright 2023 yuzu Emulator Project
// SPDX-License-Identifier: GPL-2.0-or-later
-#include "common/settings.h"
#include "core/file_sys/fssystem/fssystem_aes_ctr_counter_extended_storage.h"
#include "core/file_sys/fssystem/fssystem_aes_ctr_storage.h"
#include "core/file_sys/fssystem/fssystem_aes_xts_storage.h"
@@ -14,7 +13,6 @@
#include "core/file_sys/fssystem/fssystem_hierarchical_sha256_storage.h"
#include "core/file_sys/fssystem/fssystem_indirect_storage.h"
#include "core/file_sys/fssystem/fssystem_integrity_romfs_storage.h"
-#include "core/file_sys/fssystem/fssystem_passthrough_storage.h"
#include "core/file_sys/fssystem/fssystem_memory_resource_buffer_hold_storage.h"
#include "core/file_sys/fssystem/fssystem_nca_file_system_driver.h"
#include "core/file_sys/fssystem/fssystem_sparse_storage.h"
diff --git a/src/core/file_sys/fssystem/fssystem_nca_header.cpp b/src/core/file_sys/fssystem/fssystem_nca_header.cpp
index 2226c087c0..77042dfd43 100644
--- a/src/core/file_sys/fssystem/fssystem_nca_header.cpp
+++ b/src/core/file_sys/fssystem/fssystem_nca_header.cpp
@@ -13,13 +13,11 @@ u8 NcaHeader::GetProperKeyGeneration() const {
}
bool NcaPatchInfo::HasIndirectTable() const {
- static constexpr unsigned char BKTR[4] = {'B', 'K', 'T', 'R'};
- return std::memcmp(indirect_header.data(), BKTR, sizeof(BKTR)) == 0;
+ return this->indirect_size != 0;
}
bool NcaPatchInfo::HasAesCtrExTable() const {
- static constexpr unsigned char BKTR[4] = {'B', 'K', 'T', 'R'};
- return std::memcmp(aes_ctr_ex_header.data(), BKTR, sizeof(BKTR)) == 0;
+ return this->aes_ctr_ex_size != 0;
}
} // namespace FileSys
diff --git a/src/core/file_sys/fssystem/fssystem_passthrough_storage.h b/src/core/file_sys/fssystem/fssystem_passthrough_storage.h
deleted file mode 100644
index 8fc6f4962a..0000000000
--- a/src/core/file_sys/fssystem/fssystem_passthrough_storage.h
+++ /dev/null
@@ -1,32 +0,0 @@
-// SPDX-FileCopyrightText: Copyright 2025 Eden Emulator Project
-// SPDX-License-Identifier: GPL-3.0-or-later
-
-#pragma once
-#include "core/file_sys/fssystem/fs_i_storage.h"
-#include "core/file_sys/vfs/vfs.h"
-
-namespace FileSys {
-
-//TODO: No integrity verification.
-class PassthroughStorage final : public IReadOnlyStorage {
- YUZU_NON_COPYABLE(PassthroughStorage);
- YUZU_NON_MOVEABLE(PassthroughStorage);
-
-public:
- explicit PassthroughStorage(VirtualFile base) : base_(std::move(base)) {}
- ~PassthroughStorage() override = default;
-
- size_t Read(u8* buffer, size_t size, size_t offset) const override {
- if (!base_ || size == 0)
- return 0;
- return base_->Read(buffer, size, offset);
- }
- size_t GetSize() const override {
- return base_ ? base_->GetSize() : 0;
- }
-
-private:
- VirtualFile base_{};
-};
-
-} // namespace FileSys