rvtr/ctr_Repair
1
Fork 0
mirror of https://github.com/rvtr/ctr_Repair.git synced 2025-10-31 13:51:08 -04:00
Code Issues Actions Packages Projects Releases Wiki Activity

シリアルナンバー存在チェックとリージョンチェックの順番入れ替え

Browse Source 
新たに追加した進捗管理ファイルを削除するように

git-svn-id: file:///Volumes/Transfer/gigaleak_20231201/2020-05-23%20-%20ctr.7z%20+%20svn_v1.068.zip/ctr/svn/ctr_Repair@208 385bec56-5757-e545-9c3a-d8741f4650f1
This commit is contained in:
N2614 2011-04-20 09:58:13 +00:00
parent 2551da56f7
commit b9926341de
3 changed files with 21 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
trunk/ConsoleDataMigration/ConsoleRestore/Controller.cpp
View File

@ -264,7 +264,7 @@ void CheckDownloadIvs(::std::vector<std::string>& message, bool& goNextStep)
// IVS取得確認ファイルがあるか？ // IVS取得確認ファイルがあるか？
if (common::ExistsDownloadIvsCheckedFile()) if (common::ExistsDownloadIvsCheckedFile())
{ {
s_RestoreState = CONNECT_ONLY; CheckWriteFinished(message, goNextStep);
} }
else else
{ {
@ -349,7 +349,7 @@ void CheckConsoleInitialized(::std::vector<std::string>& message, bool& goNextSt
// 本体初期化完了ファイルがあるか？ // 本体初期化完了ファイルがあるか？
if (common::ExistsConsoleInitializedFile()) if (common::ExistsConsoleInitializedFile())
{ {
CheckExistsSerialNumber(message, goNextStep); CheckRegioinSd(message, goNextStep);
} }
else else
{ {
@ -369,9 +369,7 @@ void CheckExistsSerialNumber(::std::vector<std::string>& message, bool& goNextSt
nn::Result result = ReadSerialNumber(serial); nn::Result result = ReadSerialNumber(serial);
if (result.IsSuccess()) if (result.IsSuccess())
{ {
::std::string serialStr(reinterpret_cast<char*> (serial)); s_RestoreState = WAIT_START_IMPORT;
message.push_back(::std::string("Serial Number in SD : ") + serialStr);
CheckRegioinSd(message, goNextStep);
} }
else else
{ {
@ -382,7 +380,6 @@ void CheckExistsSerialNumber(::std::vector<std::string>& message, bool& goNextSt
{ {
COMMON_LOGGER("Can't Read Serial Number in SD Card!!\n"); COMMON_LOGGER("Can't Read Serial Number in SD Card!!\n");
s_RestoreState = SERIAL_IS_NOT_IN_SD; s_RestoreState = SERIAL_IS_NOT_IN_SD;
CheckRegioinSd(message, goNextStep);
} }
} }
@ -421,7 +418,7 @@ void CheckRegioinSd(::std::vector<std::string>& message, bool& goNextStep)
} }
else else
{ {
s_RestoreState = WAIT_START_IMPORT; CheckExistsSerialNumber(message, goNextStep);
} }
} }
@ -564,6 +561,18 @@ void ControlState(::std::vector<std::string>& operationMessage, bool& nextStep)
case WAIT_START_IMPORT: case WAIT_START_IMPORT:
{ {
u8 serial[nn::cfg::CTR::CFG_SECURE_INFO_SERIAL_NO_LEN];
result = ReadSerialNumber(serial);
if (result.IsSuccess())
{
::std::string serialStr(reinterpret_cast<char*> (serial));
operationMessage.push_back(::std::string("Serial Number in SD : ") + serialStr);
}
else
{
s_RestoreState = FAIL;
}
operationMessage.push_back(::std::string("Push A or START Button")); operationMessage.push_back(::std::string("Push A or START Button"));
operationMessage.push_back(::std::string("Import Data Mode")); operationMessage.push_back(::std::string("Import Data Mode"));
if (!s_PlayedStartCursor) if (!s_PlayedStartCursor)
@ -943,7 +952,7 @@ void ControlState(::std::vector<std::string>& operationMessage, bool& nextStep)
{ {
COMMON_LOGGER("Shop Connect Finished.\n"); COMMON_LOGGER("Shop Connect Finished.\n");
CheckWriteFinished(operationMessage, nextStep); s_RestoreState = DOWNLOAD_TWL;
} }
else else
{ {
@ -1148,7 +1157,7 @@ void ControlState(::std::vector<std::string>& operationMessage, bool& nextStep)
init = false; init = false;
} }
s_RestoreState = DOWNLOAD_TWL; s_RestoreState = CONNECT_ONLY;
} }
case DOWNLOAD_TWL: case DOWNLOAD_TWL:

2
trunk/ConsoleDataMigration/ConsoleRestore/Importer.h
View File

@ -51,6 +51,8 @@ const wchar_t* const CHECK_FILENAME_TABLE[] =
common::INITIALIZED_CHECK_PATHNAME, common::INITIALIZED_CHECK_PATHNAME,
common::WRITE_FINISHED_CHECK_PATHNAME, common::WRITE_FINISHED_CHECK_PATHNAME,
common::RTC_SYNC_CHECK_PATHNAME, common::RTC_SYNC_CHECK_PATHNAME,
common::DOWNLOAD_IVS_CHECK_PATHNAME,
common::DELETE_ACCOUNT_CHECK_PATHNAME
}; };
void DeleteAllCheckFiles(); void DeleteAllCheckFiles();

2
trunk/ConsoleDataMigration/ConsoleRestore/Shop.cpp
View File

@ -296,7 +296,7 @@ void ShopOperationSingleThreadFunc(ShopOperation op)
void StartShopOperationSingle(ShopOperation op) void StartShopOperationSingle(ShopOperation op)
{ {
NN_LOG("Start ShopOperationSingle"); NN_LOG("Start ShopOperationSingle\n");
s_Result = nn::ResultSuccess(); s_Result = nn::ResultSuccess();
s_UnregisterThread.Start(ShopOperationSingleThreadFunc, op, s_UnregisterThreadStack); s_UnregisterThread.Start(ShopOperationSingleThreadFunc, op, s_UnregisterThreadStack);
} }