From 01091849fbe7ead10259d04e50143748868e9353 Mon Sep 17 00:00:00 2001 From: N2614 Date: Fri, 11 Mar 2011 06:01:22 +0000 Subject: [PATCH] =?UTF-8?q?=E5=90=8C=E4=B8=80=E6=9C=AC=E4=BD=93=E3=81=B8?= =?UTF-8?q?=E3=81=AE=E6=9B=B8=E3=81=8D=E6=88=BB=E3=81=97=E8=A9=A6=E8=A1=8C?= =?UTF-8?q?=E3=83=95=E3=82=A1=E3=82=A4=E3=83=AB=E3=82=92=E4=BD=BF=E3=82=8F?= =?UTF-8?q?=E3=81=AA=E3=81=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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 --- .../ConsoleRestore/Controller.cpp | 15 ++------------- .../ConsoleRestore/Importer.cpp | 5 ----- .../ConsoleRestore/Importer.h | 2 -- trunk/ConsoleDataMigration/common/FileChecker.cpp | 8 +------- trunk/ConsoleDataMigration/common/FileChecker.h | 3 --- trunk/ConsoleDataMigration/common/FileName.h | 1 - 6 files changed, 3 insertions(+), 31 deletions(-) diff --git a/trunk/ConsoleDataMigration/ConsoleRestore/Controller.cpp b/trunk/ConsoleDataMigration/ConsoleRestore/Controller.cpp index 1d5a5e2..cbe5ae5 100644 --- a/trunk/ConsoleDataMigration/ConsoleRestore/Controller.cpp +++ b/trunk/ConsoleDataMigration/ConsoleRestore/Controller.cpp @@ -325,19 +325,8 @@ void ControlState(::std::vector& 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(); diff --git a/trunk/ConsoleDataMigration/ConsoleRestore/Importer.cpp b/trunk/ConsoleDataMigration/ConsoleRestore/Importer.cpp index 9ae6d45..6b1d440 100644 --- a/trunk/ConsoleDataMigration/ConsoleRestore/Importer.cpp +++ b/trunk/ConsoleDataMigration/ConsoleRestore/Importer.cpp @@ -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(); diff --git a/trunk/ConsoleDataMigration/ConsoleRestore/Importer.h b/trunk/ConsoleDataMigration/ConsoleRestore/Importer.h index 6585e77..bdd4a93 100644 --- a/trunk/ConsoleDataMigration/ConsoleRestore/Importer.h +++ b/trunk/ConsoleDataMigration/ConsoleRestore/Importer.h @@ -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(); diff --git a/trunk/ConsoleDataMigration/common/FileChecker.cpp b/trunk/ConsoleDataMigration/common/FileChecker.cpp index c7e1f97..05f8b41 100644 --- a/trunk/ConsoleDataMigration/common/FileChecker.cpp +++ b/trunk/ConsoleDataMigration/common/FileChecker.cpp @@ -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); diff --git a/trunk/ConsoleDataMigration/common/FileChecker.h b/trunk/ConsoleDataMigration/common/FileChecker.h index fc1ac42..96b189c 100644 --- a/trunk/ConsoleDataMigration/common/FileChecker.h +++ b/trunk/ConsoleDataMigration/common/FileChecker.h @@ -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(); diff --git a/trunk/ConsoleDataMigration/common/FileName.h b/trunk/ConsoleDataMigration/common/FileName.h index 9a1b006..2aeda6f 100644 --- a/trunk/ConsoleDataMigration/common/FileName.h +++ b/trunk/ConsoleDataMigration/common/FileName.h @@ -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";