From 665c0076cb79b76b83e8c4780a4520f721aec057 Mon Sep 17 00:00:00 2001
From: N2614 <N2614@385bec56-5757-e545-9c3a-d8741f4650f1>
Date: Thu, 30 May 2013 01:29:33 +0000
Subject: [PATCH] =?UTF-8?q?=E7=84=A1=E7=B7=9AON=E3=81=A7=E3=81=AF=E3=83=90?=
 =?UTF-8?q?=E3=83=83=E3=82=AF=E3=82=A2=E3=83=83=E3=83=97=E9=96=8B=E5=A7=8B?=
 =?UTF-8?q?=E3=81=A7=E3=81=8D=E3=81=AA=E3=81=84=E3=82=88=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@749 385bec56-5757-e545-9c3a-d8741f4650f1
---
 .../sources/ConsoleBackup/ConsoleBackup.cpp                | 3 ---
 .../1stNUP_for_2ndNUP/sources/ConsoleBackup/Controller.cpp | 7 +++++++
 .../sources/common/HardwareStateManager.cpp                | 5 +++++
 .../sources/common/HardwareStateManager.h                  | 1 +
 4 files changed, 13 insertions(+), 3 deletions(-)

diff --git a/branches/1stNUP_for_2ndNUP/sources/ConsoleBackup/ConsoleBackup.cpp b/branches/1stNUP_for_2ndNUP/sources/ConsoleBackup/ConsoleBackup.cpp
index 16160c7..d475b24 100644
--- a/branches/1stNUP_for_2ndNUP/sources/ConsoleBackup/ConsoleBackup.cpp
+++ b/branches/1stNUP_for_2ndNUP/sources/ConsoleBackup/ConsoleBackup.cpp
@@ -139,9 +139,6 @@ 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/branches/1stNUP_for_2ndNUP/sources/ConsoleBackup/Controller.cpp b/branches/1stNUP_for_2ndNUP/sources/ConsoleBackup/Controller.cpp
index b201e96..d906189 100644
--- a/branches/1stNUP_for_2ndNUP/sources/ConsoleBackup/Controller.cpp
+++ b/branches/1stNUP_for_2ndNUP/sources/ConsoleBackup/Controller.cpp
@@ -115,6 +115,13 @@ void ControlState(common::HardwareStateManager& manager, ::std::vector<std::stri
     case STARTUP:
         {
             bool error = false;
+
+            if(manager.IsWifiOn())
+            {
+                error = true;
+                operationMessage.push_back(::std::string("Wireless is On"));
+            }
+
             // 完全性検証SEEDを読めるか？
             if (manager.CanReadIvs())
             {
diff --git a/branches/1stNUP_for_2ndNUP/sources/common/HardwareStateManager.cpp b/branches/1stNUP_for_2ndNUP/sources/common/HardwareStateManager.cpp
index 6ad1ee7..cbece29 100644
--- a/branches/1stNUP_for_2ndNUP/sources/common/HardwareStateManager.cpp
+++ b/branches/1stNUP_for_2ndNUP/sources/common/HardwareStateManager.cpp
@@ -83,4 +83,9 @@ void HardwareStateManager::SetWifiOff()
     m_pUtil->SetWifiOff();
 }
 
+bool HardwareStateManager::IsWifiOn()
+{
+    m_pUtil->IsWifiOn();
+}
+
 }
diff --git a/branches/1stNUP_for_2ndNUP/sources/common/HardwareStateManager.h b/branches/1stNUP_for_2ndNUP/sources/common/HardwareStateManager.h
index d5c292f..f6f22a7 100644
--- a/branches/1stNUP_for_2ndNUP/sources/common/HardwareStateManager.h
+++ b/branches/1stNUP_for_2ndNUP/sources/common/HardwareStateManager.h
@@ -40,6 +40,7 @@ public:
     void GetVersionData(common::VerDef* version);
     void SetWifiOn();
     void SetWifiOff();
+    bool IsWifiOn();
 
 private:
     NN_PADDING4;