diff --git a/trunk/ConsoleDataMigration/sources/tools/ExportedDataVerifier/ExportedDataVerifier.rsf b/trunk/ConsoleDataMigration/sources/tools/ExportedDataVerifier/ExportedDataVerifier.rsf index 4fefd93..f14df4d 100644 --- a/trunk/ConsoleDataMigration/sources/tools/ExportedDataVerifier/ExportedDataVerifier.rsf +++ b/trunk/ConsoleDataMigration/sources/tools/ExportedDataVerifier/ExportedDataVerifier.rsf @@ -6,23 +6,17 @@ BasicInfo: TitleInfo: Use: Evaluation Category: Application - UniqueId: 0xf8023 + UniqueId: 0xf8021 Version: 0 SystemControlInfo: AppType : Application - StackSize : 0xF000 + StackSize : 0x4000 Dependency : - - gpio - - pdn - - spi - - i2c - - mcu - - ptm - codec - - cfg - hid - gsp + - nwm AccessControlInfo: Priority : 16 diff --git a/trunk/ConsoleDataMigration/sources/tools/ExportedDataVerifier/main.cpp b/trunk/ConsoleDataMigration/sources/tools/ExportedDataVerifier/main.cpp index d72d44e..0c837c0 100644 --- a/trunk/ConsoleDataMigration/sources/tools/ExportedDataVerifier/main.cpp +++ b/trunk/ConsoleDataMigration/sources/tools/ExportedDataVerifier/main.cpp @@ -83,6 +83,7 @@ void GenerateNandPath(wchar_t* toPath, const wchar_t* fromPath) { // 切り詰める std::string tmp(common::GetCharStr(fromPath)); + std::string twlRoot(common::GetCharStr(common::SD_SAVEDATA_TWL_ROOT_NAME)); std::string twlPhotoRoot(common::GetCharStr(common::SD_SAVEDATA_TWL_PHOTO_ROOT_NAME)); std::string twlSoundRoot(common::GetCharStr(common::SD_SAVEDATA_TWL_SOUND_ROOT_NAME)); std::string ctrRoot(common::GetCharStr(common::SD_SAVEDATA_ROOT_NAME)); @@ -99,8 +100,17 @@ void GenerateNandPath(wchar_t* toPath, const wchar_t* fromPath) size = tmp.find(ctrRoot.c_str()); if(size == std::string::npos) { - // 想定外のパスへの出力のためreturn - return; + size = tmp.find(twlRoot.c_str()); + if(size == std::string::npos) + { + // 想定外のパスへの出力のためreturn + return; + } + else + { + output += std::string("twln:/"); + output += tmp.substr(size + twlRoot.size()); + } } else { @@ -368,6 +378,16 @@ void VerifyThreadFunc() void* buf = heap.GetAddr(); if (buf != NULL) { + + result = nn::fs::MountSpecialArchive(common::NAND_TWL_ARCHIVE_NAME, nn::fs::CTR::ARCHIVE_TYPE_TWL_NAND); + if(result.IsSuccess()) + { + VerifyDirectory( + (std::wstring(common::SDMC_ROOT_DIRECTORY_PATH) + ::std::wstring( + common::SD_SAVEDATA_TWL_ROOT_NAME)).c_str(), buf, bufSize); + } + nn::fs::Unmount(common::NAND_TWL_ARCHIVE_NAME); + u32 i = 0; result = nn::fs::MountSpecialArchive(common::TWL_ARCHIVE_NAME_TABLE[i], common::TWL_FS_ARCHIVE_KIND[i]); if (result.IsSuccess()) @@ -408,6 +428,11 @@ void VerifyThreadFunc() COMMON_LOGGER("Verify Finished, success = %d, fail = %d\n", s_VerifySuccess, s_VerifyFail); } +extern "C" void nninitSetupDaemons(void) +{ +} + + extern "C" void nnMain(void) { nn::Result result; @@ -423,7 +448,7 @@ extern "C" void nnMain(void) // hid の初期化 result = nn::hid::Initialize(); - NN_UTIL_PANIC_IF_FAILED(result); + NN_ERR_THROW_FATAL_IF_FATAL_ONLY(result); // ヒープの確保 common::InitializeHeap();