summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/core/file_sys/card_image.cpp114
-rw-r--r--src/core/file_sys/card_image.h23
-rw-r--r--src/core/file_sys/partition_filesystem.cpp11
-rw-r--r--src/core/file_sys/partition_filesystem.h6
-rw-r--r--src/yuzu/configuration/configure_input_player.cpp22
5 files changed, 146 insertions, 30 deletions
diff --git a/src/core/file_sys/card_image.cpp b/src/core/file_sys/card_image.cpp
index db54113a0..07d0c8d5d 100644
--- a/src/core/file_sys/card_image.cpp
+++ b/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(partition_names.size()), partitions_raw(partition_names.size()) {
if (file->ReadObject(&header) != sizeof(GamecardHeader)) {
status = Loader::ResultStatus::ErrorBadXCIHeader;
return;
@@ -42,8 +42,10 @@ XCI::XCI(VirtualFile file_)
return;
}
- PartitionFilesystem main_hfs(
- std::make_shared<OffsetVfsFile>(file, header.hfs_size, header.hfs_offset));
+ PartitionFilesystem main_hfs(std::make_shared<OffsetVfsFile>(
+ file, file->GetSize() - header.hfs_offset, header.hfs_offset));
+
+ update_normal_partition_end = main_hfs.GetFileOffsets()["secure"];
if (main_hfs.GetStatus() != Loader::ResultStatus::Success) {
status = main_hfs.GetStatus();
@@ -55,9 +57,7 @@ XCI::XCI(VirtualFile file_)
const auto partition_idx = static_cast<std::size_t>(partition);
auto raw = main_hfs.GetFile(partition_names[partition_idx]);
- if (raw != nullptr) {
- partitions[partition_idx] = std::make_shared<PartitionFilesystem>(std::move(raw));
- }
+ partitions_raw[static_cast<std::size_t>(partition)] = std::move(raw);
}
secure_partition = std::make_shared<NSP>(
@@ -71,13 +71,7 @@ XCI::XCI(VirtualFile file_)
program_nca_status = Loader::ResultStatus::ErrorXCIMissingProgramNCA;
}
- auto result = AddNCAFromPartition(XCIPartition::Update);
- if (result != Loader::ResultStatus::Success) {
- status = result;
- return;
- }
-
- result = AddNCAFromPartition(XCIPartition::Normal);
+ auto result = AddNCAFromPartition(XCIPartition::Normal);
if (result != Loader::ResultStatus::Success) {
status = result;
return;
@@ -104,34 +98,114 @@ Loader::ResultStatus XCI::GetProgramNCAStatus() const {
return program_nca_status;
}
-VirtualDir XCI::GetPartition(XCIPartition partition) const {
+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]);
+ }
+
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() const {
+VirtualDir XCI::GetSecurePartition() {
return GetPartition(XCIPartition::Secure);
}
-VirtualDir XCI::GetNormalPartition() const {
+VirtualDir XCI::GetNormalPartition() {
return GetPartition(XCIPartition::Normal);
}
-VirtualDir XCI::GetUpdatePartition() const {
+VirtualDir XCI::GetUpdatePartition() {
return GetPartition(XCIPartition::Update);
}
-VirtualDir XCI::GetLogoPartition() const {
+VirtualDir XCI::GetLogoPartition() {
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;
}
@@ -201,7 +275,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 = partitions[partition_index];
+ const auto partition = GetPartition(part);
if (partition == nullptr) {
return Loader::ResultStatus::ErrorXCIMissingPartition;
@@ -232,7 +306,7 @@ Loader::ResultStatus XCI::AddNCAFromPartition(XCIPartition part) {
return Loader::ResultStatus::Success;
}
-u8 XCI::GetFormatVersion() const {
+u8 XCI::GetFormatVersion() {
return GetLogoPartition() == nullptr ? 0x1 : 0x2;
}
} // namespace FileSys
diff --git a/src/core/file_sys/card_image.h b/src/core/file_sys/card_image.h
index 3e6b92ff3..c2ee0ea99 100644
--- a/src/core/file_sys/card_image.h
+++ b/src/core/file_sys/card_image.h
@@ -81,14 +81,24 @@ public:
Loader::ResultStatus GetStatus() const;
Loader::ResultStatus GetProgramNCAStatus() const;
- u8 GetFormatVersion() const;
+ u8 GetFormatVersion();
+
+ VirtualDir GetPartition(XCIPartition partition);
+ std::vector<VirtualDir> GetPartitions();
- VirtualDir GetPartition(XCIPartition partition) const;
std::shared_ptr<NSP> GetSecurePartitionNSP() const;
- VirtualDir GetSecurePartition() const;
- VirtualDir GetNormalPartition() const;
- VirtualDir GetUpdatePartition() const;
- VirtualDir GetLogoPartition() 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;
u64 GetProgramTitleID() const;
u32 GetSystemUpdateVersion();
@@ -123,6 +133,7 @@ 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;
diff --git a/src/core/file_sys/partition_filesystem.cpp b/src/core/file_sys/partition_filesystem.cpp
index a5259a593..846986736 100644
--- a/src/core/file_sys/partition_filesystem.cpp
+++ b/src/core/file_sys/partition_filesystem.cpp
@@ -65,6 +65,9 @@ PartitionFilesystem::PartitionFilesystem(std::shared_ptr<VfsFile> file) {
std::string name(
reinterpret_cast<const char*>(&file_data[strtab_offset + entry.strtab_offset]));
+ offsets.insert_or_assign(name, content_offset + entry.offset);
+ sizes.insert_or_assign(name, entry.size);
+
pfs_files.emplace_back(std::make_shared<OffsetVfsFile>(
file, entry.size, content_offset + entry.offset, std::move(name)));
}
@@ -78,6 +81,14 @@ 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;
}
diff --git a/src/core/file_sys/partition_filesystem.h b/src/core/file_sys/partition_filesystem.h
index 248fdfdeb..279193b19 100644
--- a/src/core/file_sys/partition_filesystem.h
+++ b/src/core/file_sys/partition_filesystem.h
@@ -29,6 +29,9 @@ 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;
@@ -80,6 +83,9 @@ 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;
};
diff --git a/src/yuzu/configuration/configure_input_player.cpp b/src/yuzu/configuration/configure_input_player.cpp
index a968cfb5d..67c9a7c6d 100644
--- a/src/yuzu/configuration/configure_input_player.cpp
+++ b/src/yuzu/configuration/configure_input_player.cpp
@@ -245,10 +245,24 @@ ConfigureInputPlayer::ConfigureInputPlayer(QWidget* parent, std::size_t player_i
button->setContextMenuPolicy(Qt::CustomContextMenu);
connect(button, &QPushButton::clicked, [=] {
- HandleClick(
- button_map[button_id],
- [=](const Common::ParamPackage& params) { buttons_param[button_id] = params; },
- InputCommon::Polling::DeviceType::Button);
+ HandleClick(button_map[button_id],
+ [=](Common::ParamPackage params) {
+ // Workaround for ZL & ZR for analog triggers like on XBOX controllors.
+ // Analog triggers (from controllers like the XBOX controller) would not
+ // work due to a different range of their signals (from 0 to 255 on
+ // analog triggers instead of -32768 to 32768 on analog joysticks). The
+ // SDL driver misinterprets analog triggers as analog joysticks.
+ // TODO: reinterpret the signal range for analog triggers to map the
+ // values correctly. This is required for the correct emulation of the
+ // analog triggers of the GameCube controller.
+ if (button_id == Settings::NativeButton::ZL ||
+ button_id == Settings::NativeButton::ZR) {
+ params.Set("direction", "+");
+ params.Set("threshold", "0.5");
+ }
+ buttons_param[button_id] = std::move(params);
+ },
+ InputCommon::Polling::DeviceType::Button);
});
connect(button, &QPushButton::customContextMenuRequested, [=](const QPoint& menu_location) {
QMenu context_menu;
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-23 02:30:53 +0100