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;