同一本体への書き戻し試行ファイルを使わない

git-svn-id: file:///Volumes/Transfer/gigaleak_20231201/2020-05-23%20-%20ctr.7z%20+%20svn_v1.068.zip/ctr/svn/ctr_Repair@111 385bec56-5757-e545-9c3a-d8741f4650f1
This commit is contained in:
N2614 2011-03-11 06:01:22 +00:00
parent 0d64a3599e
commit 01091849fb
6 changed files with 3 additions and 31 deletions

View File

@ -325,19 +325,8 @@ void ControlState(::std::vector<std::string>& operationMessage, bool& nextStep,
{
COMMON_LOGGER("Initialize Console\n");
// SDカードのデバイスIDと本体のデバイスIDは異なるか
if (EqualsDeviceIdFileandDeviceId())
{
// 同一本体に書き戻そうとしたファイルを作る
COMMON_LOGGER("Restore to the same console. Initialize.\n");
CreateTryRestoreSameConsoleFile();
}
else
{
// 本体初期化完了ファイルを作る
CreateConsoleInitializedFile();
}
// 本体初期化完了ファイルを作る
CreateConsoleInitializedFile();
// ファイルシステムの初期化を行う
InitializeFileSystem();

View File

@ -817,11 +817,6 @@ void CreateRtcSyncFinishedFile()
CreateEmptyFile(common::RTC_SYNC_CHECK_PATHNAME);
}
void CreateTryRestoreSameConsoleFile()
{
CreateEmptyFile(common::TRY_RESTORE_SAME_CONSOLE_PATHNAME);
}
u32 GetImportProgress()
{
return common::GetProgress();

View File

@ -36,7 +36,6 @@ void CreateWriteFinishedFile();
void CreateUpdateFinishedFile();
void CreateConsoleInitializedFile();
void CreateRtcSyncFinishedFile();
void CreateTryRestoreSameConsoleFile();
u32 GetImportProgress();
// NANDのごみを削除する
@ -48,7 +47,6 @@ const wchar_t* const CHECK_FILENAME_TABLE[] =
common::INITIALIZED_CHECK_PATHNAME,
common::WRITE_FINISHED_CHECK_PATHNAME,
common::RTC_SYNC_CHECK_PATHNAME,
common::TRY_RESTORE_SAME_CONSOLE_PATHNAME
};
void DeleteAllCheckFiles();

View File

@ -83,8 +83,7 @@ bool ExistsIVSFile()
bool ExistsConsoleInitializedFile()
{
// どちらかのファイルがあれば初期化済み
return ExistsFile(EXISTS_CONSOLE_INTIALIZED) ||
ExistsFile(EXISTS_TRY_RESTORE_SAME_CONSOLE);
return ExistsFile(EXISTS_CONSOLE_INTIALIZED);
}
bool ExistsWriteFinishedFile()
@ -107,11 +106,6 @@ bool ExistsCountryLanguageFile()
return ExistsFile(EXISTS_COUNTRY_LANGUAGE);
}
bool ExistsTryRestoreSameConsoleFile()
{
return ExistsFile(EXISTS_TRY_RESTORE_SAME_CONSOLE);
}
bool ExistsVersionData()
{
return ExistsFile(EXISTS_VERSION_DATA);

View File

@ -31,7 +31,6 @@ typedef enum FILE_EXISTS_CHECK
EXISTS_AP_SETTING,
EXISTS_RTC_SYNC_FINISHED,
EXISTS_COUNTRY_LANGUAGE,
EXISTS_TRY_RESTORE_SAME_CONSOLE,
EXISTS_VERSION_DATA,
EXISTS_REGION_DATA,
EXISTS_MAX
@ -47,7 +46,6 @@ const wchar_t* const FILENAME_TABLE[EXISTS_MAX] =
common::AP_SETTING_PATHNAME,
common::RTC_SYNC_CHECK_PATHNAME,
common::COUNTRY_SETTING_PATHNAME,
common::TRY_RESTORE_SAME_CONSOLE_PATHNAME,
common::VERSION_DATA_PATHNAME,
common::REGION_DATA_PATHNAME
};
@ -61,7 +59,6 @@ bool ExistsWriteFinishedFile();
bool ExistsAPSetting();
bool ExistsRtcSyncFinishedFile();
bool ExistsCountryLanguageFile();
bool ExistsTryRestoreSameConsoleFile();
bool ExistsVersionData();
bool ExistsRegionData();

View File

@ -48,7 +48,6 @@ const wchar_t* const SDMC_ROOT_DIRECTORY_PATH = L"sdmc:/";
const wchar_t* const WRITE_FINISHED_CHECK_PATHNAME = L"sdmc:/CTR_Console_Repair/WriteFinished";
const wchar_t* const UPDATE_CHECK_PATHNAME = L"sdmc:/CTR_Console_Repair/UpdateFinished";
const wchar_t* const INITIALIZED_CHECK_PATHNAME = L"sdmc:/CTR_Console_Repair/ConsoleInitialized";
const wchar_t* const TRY_RESTORE_SAME_CONSOLE_PATHNAME = L"sdmc:/CTR_Console_Repair/TryRestoreSameConsole";
const wchar_t* const RTC_SYNC_CHECK_PATHNAME = L"sdmc:/CTR_Console_Repair/RtcSyncFinished";
const wchar_t* const PLAYHISTORY_PATHNAME = L"sdmc:/CTR_Console_Repair/playhistory.bin";
const wchar_t* const PLAYHISTORY_COUNT_PATHNAME = L"sdmc:/CTR_Console_Repair/playhistoryCount.bin";