CFG: Implemented the GetConfigInfoBlk2 function.

Added a "config" file to the CFG process service (CFG:U), and added a few default blocks to it.

Implemented GetSystemModel and GetModelNintendo2DS

3 files changed, 9 insertions, 3 deletions

diff --git a/src/core/file_sys/archive_backend.h b/src/core/file_sys/archive_backend.h
index eb1fdaa1..e2979be1 100644
--- a/src/core/file_sys/archive_backend.h
+++ b/src/core/file_sys/archive_backend.h
@@ -45,6 +45,11 @@ public:
     {
     }
 
+    Path(const char* path):
+        type(Char), string(path)
+    {
+    }
+
     Path(LowPathType type, u32 size, u32 pointer):
         type(type)
     {
diff --git a/src/core/file_sys/archive_systemsavedata.cpp b/src/core/file_sys/archive_systemsavedata.cpp
index 5da1ec94..392c3cd3 100644
--- a/src/core/file_sys/archive_systemsavedata.cpp
+++ b/src/core/file_sys/archive_systemsavedata.cpp
@@ -16,8 +16,9 @@
 
 namespace FileSys {
 
-Archive_SystemSaveData::Archive_SystemSaveData(const std::string& mount_point)
-        : DiskArchive(mount_point) {
+Archive_SystemSaveData::Archive_SystemSaveData(const std::string& mount_point, u64 save_id)
+        : DiskArchive(Common::StringFromFormat("%s%08X/%08X/", mount_point.c_str(),
+        static_cast<u32>(save_id & 0xFFFFFFFF), static_cast<u32>((save_id >> 31) & 0xFFFFFFFF))) {
     LOG_INFO(Service_FS, "Directory %s set as SystemSaveData.", this->mount_point.c_str());
 }
 
diff --git a/src/core/file_sys/archive_systemsavedata.h b/src/core/file_sys/archive_systemsavedata.h
index c3ebb7c9..443e2709 100644
--- a/src/core/file_sys/archive_systemsavedata.h
+++ b/src/core/file_sys/archive_systemsavedata.h
@@ -19,7 +19,7 @@ namespace FileSys {
 /// specifically nand:/data/<ID0>/sysdata/<SaveID-Low>/<SaveID-High>
 class Archive_SystemSaveData final : public DiskArchive {
 public:
-    Archive_SystemSaveData(const std::string& mount_point);
+    Archive_SystemSaveData(const std::string& mount_point, u64 save_id);
 
     /**
      * Initialize the archive.