piwalker/dolphin
1
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2025-07-23 22:29:39 -06:00
Code Issues Packages Projects Releases Wiki Activity

NANDImporter: Make superblocks less magical

Browse Source 
Create a struct describing the superblock layout and use it directly
without needing to specify offsets and such.
This commit is contained in:
Starsam80
2021-12-29 20:40:00 -07:00
parent 73151a5753
commit 80012ae253
2 changed files with 41 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
Source/Core/DiscIO/NANDImporter.h
View File

@ -4,6 +4,7 @@
#pragma once
#include <functional>
#include <memory>
#include <string>
#include <vector>
@ -47,11 +48,22 @@ public:
Common::BigEndianValue<u32> x3;
};
static_assert(sizeof(NANDFSTEntry) == 0x20, "Wrong size");
struct NANDSuperblock
{
char magic[4]; // "SFFS"
Common::BigEndianValue<u32> version;
Common::BigEndianValue<u32> unknown;
Common::BigEndianValue<u16> fat[0x8000];
NANDFSTEntry fst[0x17FF];
u8 pad[0x14];
};
static_assert(sizeof(NANDSuperblock) == 0x40000, "Wrong size");
#pragma pack(pop)
private:
bool ReadNANDBin(const std::string& path_to_bin, std::function<std::string()> get_otp_dump_path);
void FindSuperblock();
bool FindSuperblock();
std::string GetPath(const NANDFSTEntry& entry, const std::string& parent_path);
std::string FormatDebugString(const NANDFSTEntry& entry);
void ProcessEntry(u16 entry_number, const std::string& parent_path);
@ -61,8 +73,7 @@ private:
std::string m_nand_root;
std::vector<u8> m_nand;
std::vector<u8> m_nand_keys;
size_t m_nand_fat_offset = 0;
size_t m_nand_fst_offset = 0;
std::unique_ptr<NANDSuperblock> m_superblock;
std::function<void()> m_update_callback;
};
} // namespace DiscIO