From 28bbf8c9d7346d7dff48a9a250f1414576d9aef6 Mon Sep 17 00:00:00 2001 From: N2614 Date: Wed, 23 Feb 2011 02:25:39 +0000 Subject: [PATCH] =?UTF-8?q?=E3=83=97=E3=83=A9=E3=82=A4=E3=83=99=E3=83=BC?= =?UTF-8?q?=E3=83=88=E3=83=91=E3=83=83=E3=82=B1=E3=83=BC=E3=82=B8=E3=81=A7?= =?UTF-8?q?=E3=83=93=E3=83=AB=E3=83=89=E3=81=8C=E9=80=9A=E3=82=8B=E3=82=88?= =?UTF-8?q?=E3=81=86=E3=81=AB?= 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@78 385bec56-5757-e545-9c3a-d8741f4650f1 --- .../ConsoleBackup/ConsoleBackup.rsf | 3 ++ .../ConsoleBackup/OMakefile | 16 ++----- .../ConsoleRestore/ConsoleRestore.rsf | 3 ++ .../ConsoleRestore/Controller.cpp | 45 +++++++++++++++++++ .../ConsoleRestore/OMakefile | 16 ++----- 5 files changed, 57 insertions(+), 26 deletions(-) diff --git a/branches/work/2_0_RepairToolKit/ConsoleDataMigration/ConsoleBackup/ConsoleBackup.rsf b/branches/work/2_0_RepairToolKit/ConsoleDataMigration/ConsoleBackup/ConsoleBackup.rsf index 5c3cb01..ac09ef3 100644 --- a/branches/work/2_0_RepairToolKit/ConsoleDataMigration/ConsoleBackup/ConsoleBackup.rsf +++ b/branches/work/2_0_RepairToolKit/ConsoleDataMigration/ConsoleBackup/ConsoleBackup.rsf @@ -3,6 +3,9 @@ BasicInfo: ProductCode: ConsoleBackup BackupMemoryType: None +CardInfo: + CardDevice: None + TitleInfo: Use: Evaluation Category: Application diff --git a/branches/work/2_0_RepairToolKit/ConsoleDataMigration/ConsoleBackup/OMakefile b/branches/work/2_0_RepairToolKit/ConsoleDataMigration/ConsoleBackup/OMakefile index b152d3d..a2515d5 100644 --- a/branches/work/2_0_RepairToolKit/ConsoleDataMigration/ConsoleBackup/OMakefile +++ b/branches/work/2_0_RepairToolKit/ConsoleDataMigration/ConsoleBackup/OMakefile @@ -21,7 +21,7 @@ CTR_MAKE_DEVELOPMENT_IMAGE = true TARGET_PROGRAM = ConsoleBackup -SAMPLED_DEMOS_COMMON_INCLUDE_DIR = $(dir $(HORIZON_ROOT)/../CTR/SampleDemos/common/include) +SAMPLED_DEMOS_COMMON_INCLUDE_DIR = $(dir $(HORIZON_ROOT)/../SampleDemos/common/include) INCLUDES += $(SAMPLED_DEMOS_COMMON_INCLUDE_DIR) \ ../common @@ -49,19 +49,9 @@ CTR_BANNER_SPEC = $(TARGET_PROGRAM).bsf ROMFS_ROOT = ../common/romfiles LIBS += libnn_cfg \ - libnn_driversEeprom \ - libnn_driversi2c \ - libnn_driversCal \ + libnn_mcu \ libnn_crypto \ - libnn_driversCodec \ - libnn_spi \ - libnn_gpio \ - libnn_pdn \ - libnn_mcu \ - libnn_i2c \ - libnn_driversCamera \ libnn_ps \ - libnn_driversRsa \ lib_demo \ libnn_nwm \ libnn_friends \ @@ -70,7 +60,7 @@ LIBS += libnn_cfg \ INSTALL_SDK_TOOL = true ROM_SPEC_FILE = $(TARGET_PROGRAM).rsf -DESCRIPTOR = $(HORIZON_ROOT)/resources/specfiles/_private/RepairTool.desc +DESCRIPTOR = $(HORIZON_ROOT)/resources/specfiles/RepairTool.desc include $(ROOT_OMAKE)/modulerules diff --git a/branches/work/2_0_RepairToolKit/ConsoleDataMigration/ConsoleRestore/ConsoleRestore.rsf b/branches/work/2_0_RepairToolKit/ConsoleDataMigration/ConsoleRestore/ConsoleRestore.rsf index 5ea9ee8..19aaaae 100644 --- a/branches/work/2_0_RepairToolKit/ConsoleDataMigration/ConsoleRestore/ConsoleRestore.rsf +++ b/branches/work/2_0_RepairToolKit/ConsoleDataMigration/ConsoleRestore/ConsoleRestore.rsf @@ -3,6 +3,9 @@ BasicInfo: ProductCode: ConsoleRestore BackupMemoryType: None +CardInfo: + CardDevice: None + TitleInfo: Use: Evaluation Category: Application diff --git a/branches/work/2_0_RepairToolKit/ConsoleDataMigration/ConsoleRestore/Controller.cpp b/branches/work/2_0_RepairToolKit/ConsoleDataMigration/ConsoleRestore/Controller.cpp index 04aea77..df65749 100644 --- a/branches/work/2_0_RepairToolKit/ConsoleDataMigration/ConsoleRestore/Controller.cpp +++ b/branches/work/2_0_RepairToolKit/ConsoleDataMigration/ConsoleRestore/Controller.cpp @@ -86,6 +86,10 @@ bool s_PlayedStartCursor = false; bool s_PlayedRebootCursor = false; // SD抜き出し前サウンドを鳴らしたかどうか bool s_PlayedSdPullOutCursor = false; +// バージョンデータが無い警告サウンドを鳴らしたかどうか +bool s_ExistsVersionDataAnnotation = false; +// バージョンデータを読んだかどうか +bool s_ReadVersionDone = false; // ネットワークアップデートを開始したかどうか bool s_ExecuteFgNup = false; @@ -141,6 +145,47 @@ bool CheckAndReadAPSetting(::std::vector& operationMessage) return s_ReadSettingSuccess; } +bool CheckAndReadVersionData(::std::vector& operationMessage) +{ + using namespace common; + + if (!ExistsVersionData()) + { + if(!s_ExistsVersionDataAnnotation) + { + s_ExistsVersionDataAnnotation = true; + common::PlaySound(common::SOUND_ANNOTATION); + } + operationMessage.push_back(::std::string("Version Data does not exist!")); + return false; + } + + // バージョン情報ファイルを読み込む + if (!s_ReadVersionDone) + { + s_ReadVersionDone = true; + s_ReadSettingSuccess = ReadSetting(&s_NupOnlyMode); + } + + if(s_NupOnlyMode) + { + s_RestoreMode = RESTORE_MODE_NUP_ONLY; + } + + if (!s_ReadSettingSuccess) + { + operationMessage.push_back(::std::string("Invalid Accsess_Point_Setting format!")); + if(!s_APSettingAnnotation) + { + s_APSettingAnnotation = true; + common::PlaySound(common::SOUND_ANNOTATION); + } + + } + + return s_ReadSettingSuccess; +} + void PutAliveMessage(::std::vector& operationMessage, const char* str) { std::string message = std::string(str); diff --git a/branches/work/2_0_RepairToolKit/ConsoleDataMigration/ConsoleRestore/OMakefile b/branches/work/2_0_RepairToolKit/ConsoleDataMigration/ConsoleRestore/OMakefile index 90b2103..6b3d98d 100644 --- a/branches/work/2_0_RepairToolKit/ConsoleDataMigration/ConsoleRestore/OMakefile +++ b/branches/work/2_0_RepairToolKit/ConsoleDataMigration/ConsoleRestore/OMakefile @@ -21,7 +21,7 @@ CTR_MAKE_DEVELOPMENT_IMAGE = true TARGET_PROGRAM = ConsoleRestore -SAMPLED_DEMOS_COMMON_INCLUDE_DIR = $(dir $(HORIZON_ROOT)/../CTR/SampleDemos/common/include) +SAMPLED_DEMOS_COMMON_INCLUDE_DIR = $(dir $(HORIZON_ROOT)/../SampleDemos/common/include) INCLUDES += $(SAMPLED_DEMOS_COMMON_INCLUDE_DIR) \ ../common @@ -52,19 +52,9 @@ CTR_BANNER_SPEC = $(TARGET_PROGRAM).bsf ROMFS_ROOT = ../common/romfiles LIBS += libnn_cfg \ - libnn_driversEeprom \ - libnn_driversi2c \ - libnn_driversCal \ + libnn_mcu \ libnn_crypto \ - libnn_driversCodec \ - libnn_spi \ - libnn_gpio \ - libnn_pdn \ - libnn_mcu \ - libnn_i2c \ - libnn_driversCamera \ libnn_ps \ - libnn_driversRsa \ lib_demo \ libnn_nwm \ libnn_friends \ @@ -75,7 +65,7 @@ LIBS += libnn_cfg \ INSTALL_SDK_TOOL = true ROM_SPEC_FILE = $(TARGET_PROGRAM).rsf -DESCRIPTOR = $(HORIZON_ROOT)/resources/specfiles/_private/RepairTool.desc +DESCRIPTOR = $(HORIZON_ROOT)/resources/specfiles/RepairTool.desc include $(ROOT_OMAKE)/modulerules