From e8f67991348cb079f637f2c6301d0fcef61feecd Mon Sep 17 00:00:00 2001 From: N2614 Date: Mon, 27 May 2013 02:17:40 +0000 Subject: [PATCH] =?UTF-8?q?Backup=E8=B5=B7=E5=8B=95=E6=99=82=E3=81=AB?= =?UTF-8?q?=E7=84=A1=E7=B7=9AOFF=E3=80=81Restore=E8=B5=B7=E5=8B=95?= =?UTF-8?q?=E6=99=82=E3=81=AB=E7=84=A1=E7=B7=9AON=E3=80=81Restore=E3=81=AE?= =?UTF-8?q?=E7=B5=82=E4=BA=86=E3=82=B9=E3=83=86=E3=83=BC=E3=83=88=E3=81=A7?= =?UTF-8?q?=E7=84=A1=E7=B7=9AOFF=E3=81=99=E3=82=8B=E3=82=88=E3=81=86?= =?UTF-8?q?=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@735 385bec56-5757-e545-9c3a-d8741f4650f1 --- .../sources/ConsoleBackup/ConsoleBackup.cpp | 3 +++ .../sources/ConsoleRestore/ConsoleRestore.cpp | 3 +++ .../sources/ConsoleRestore/Controller.cpp | 4 ++++ .../sources/common/HardwareStateManager.cpp | 10 ++++++++++ .../sources/common/HardwareStateManager.h | 2 ++ 5 files changed, 22 insertions(+) diff --git a/trunk/ConsoleDataMigration/sources/ConsoleBackup/ConsoleBackup.cpp b/trunk/ConsoleDataMigration/sources/ConsoleBackup/ConsoleBackup.cpp index 9922b62..538147a 100644 --- a/trunk/ConsoleDataMigration/sources/ConsoleBackup/ConsoleBackup.cpp +++ b/trunk/ConsoleDataMigration/sources/ConsoleBackup/ConsoleBackup.cpp @@ -148,6 +148,9 @@ extern "C" void nnMain(void) s_HwUtility.InitializeForBackup(); common::HardwareStateManager manager(s_HwUtility); + // 無線OFF + s_HwUtility.SetWifiOff(); + // 情報出力 COMMON_LOGGER("CTR Console Backup %s-%s-%s\n", CONSOLE_REPAIR_VERSION_MAJOR, CONSOLE_REPAIR_VERSION_MINOR, CONSOLE_REPAIR_VERSION_MICRO); COMMON_LOGGER("System Ver. %d.%d.%d-%d\n", diff --git a/trunk/ConsoleDataMigration/sources/ConsoleRestore/ConsoleRestore.cpp b/trunk/ConsoleDataMigration/sources/ConsoleRestore/ConsoleRestore.cpp index aa61417..e47469a 100644 --- a/trunk/ConsoleDataMigration/sources/ConsoleRestore/ConsoleRestore.cpp +++ b/trunk/ConsoleDataMigration/sources/ConsoleRestore/ConsoleRestore.cpp @@ -163,6 +163,9 @@ extern "C" void nnMain(void) s_HwUtility.InitializeForRestore(); common::HardwareStateManager manager(s_HwUtility); + // 無線ON + s_HwUtility.SetWifiOn(); + // 情報出力 COMMON_LOGGER("CTR Console Restore %s-%s-%s\n", CONSOLE_REPAIR_VERSION_MAJOR, CONSOLE_REPAIR_VERSION_MINOR, CONSOLE_REPAIR_VERSION_MICRO); COMMON_LOGGER("System Ver. %d.%d.%d-%d\n", s_HwUtility.GetCupMajorVersion(), diff --git a/trunk/ConsoleDataMigration/sources/ConsoleRestore/Controller.cpp b/trunk/ConsoleDataMigration/sources/ConsoleRestore/Controller.cpp index c7a3cf5..4a371cd 100644 --- a/trunk/ConsoleDataMigration/sources/ConsoleRestore/Controller.cpp +++ b/trunk/ConsoleDataMigration/sources/ConsoleRestore/Controller.cpp @@ -1548,6 +1548,7 @@ void ControlState(common::HardwareStateManager& manager, common::OperationMessag if (init) { PlaySound(SOUND_OK); + manager.SetWifiOff(); init = false; } } @@ -1561,6 +1562,7 @@ void ControlState(common::HardwareStateManager& manager, common::OperationMessag { // 状態初期化 DeleteAllCheckFiles(); + manager.SetWifiOff(); init = false; } @@ -1610,6 +1612,8 @@ void ControlState(common::HardwareStateManager& manager, common::OperationMessag s_RestoreState = FAIL; } + manager.SetWifiOff(); + // シャットダウンする nn::ptm::CTR::ShutdownAsync(0, nn::fnd::TimeSpan::FromSeconds(0)); } diff --git a/trunk/ConsoleDataMigration/sources/common/HardwareStateManager.cpp b/trunk/ConsoleDataMigration/sources/common/HardwareStateManager.cpp index c2371a2..fb44c7c 100644 --- a/trunk/ConsoleDataMigration/sources/common/HardwareStateManager.cpp +++ b/trunk/ConsoleDataMigration/sources/common/HardwareStateManager.cpp @@ -78,4 +78,14 @@ void HardwareStateManager::GetVersionData(common::VerDef* version) return m_pUtil->GetVersionData(version); } +void HardwareStateManager::SetWifiOn() +{ + m_pUtil->SetWifiOn(); +} + +void HardwareStateManager::SetWifiOff() +{ + m_pUtil->SetWifiOff(); +} + } diff --git a/trunk/ConsoleDataMigration/sources/common/HardwareStateManager.h b/trunk/ConsoleDataMigration/sources/common/HardwareStateManager.h index b852d47..7b66156 100644 --- a/trunk/ConsoleDataMigration/sources/common/HardwareStateManager.h +++ b/trunk/ConsoleDataMigration/sources/common/HardwareStateManager.h @@ -39,6 +39,8 @@ public: void GetSerialNumber(u8** serial, size_t* size); void GetSerialNumberWithoutCD(u8* serial); void GetVersionData(common::VerDef* version); + void SetWifiOn(); + void SetWifiOff(); private: NN_PADDING4;