From be95586af308a18375fd71caad227e9a4bc952e6 Mon Sep 17 00:00:00 2001
From: N2614 <N2614@385bec56-5757-e545-9c3a-d8741f4650f1>
Date: Mon, 27 May 2013 01:32:45 +0000
Subject: [PATCH] =?UTF-8?q?X=E3=83=9C=E3=82=BF=E3=83=B3=E3=81=AB=E3=82=88?=
 =?UTF-8?q?=E3=82=8B=E7=84=A1=E7=B7=9A=E3=83=88=E3=82=B0=E3=83=AB=E6=A9=9F?=
 =?UTF-8?q?=E8=83=BD=E3=82=92=E5=89=8A=E9=99=A4?=
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@733 385bec56-5757-e545-9c3a-d8741f4650f1
---
 .../sources/ConsoleBackup/ConsoleBackup.cpp   |  6 --
 .../sources/ConsoleRestore/ConsoleRestore.cpp |  5 --
 .../sources/common/Util.cpp                   | 58 +++----------------
 .../sources/common/Util.h                     | 23 +++-----
 4 files changed, 15 insertions(+), 77 deletions(-)

diff --git a/trunk/ConsoleDataMigration/sources/ConsoleBackup/ConsoleBackup.cpp b/trunk/ConsoleDataMigration/sources/ConsoleBackup/ConsoleBackup.cpp
index 48d3f46..9922b62 100644
--- a/trunk/ConsoleDataMigration/sources/ConsoleBackup/ConsoleBackup.cpp
+++ b/trunk/ConsoleDataMigration/sources/ConsoleBackup/ConsoleBackup.cpp
@@ -187,12 +187,6 @@ extern "C" void nnMain(void)
             flip = !flip;
         }
 
-        // XボタンでWiFi On/Off
-        if(padStatus.trigger & nn::hid::BUTTON_X)
-        {
-            s_HwUtility.ToggleWifiStatus();
-        }
-
         // コンソールスクロール
         if(padStatus.hold & nn::hid::BUTTON_UP)
         {
diff --git a/trunk/ConsoleDataMigration/sources/ConsoleRestore/ConsoleRestore.cpp b/trunk/ConsoleDataMigration/sources/ConsoleRestore/ConsoleRestore.cpp
index 59dfaf9..aa61417 100644
--- a/trunk/ConsoleDataMigration/sources/ConsoleRestore/ConsoleRestore.cpp
+++ b/trunk/ConsoleDataMigration/sources/ConsoleRestore/ConsoleRestore.cpp
@@ -212,11 +212,6 @@ extern "C" void nnMain(void)
             flip = !flip;
         }
 
-        // XボタンでWiFi On/Off
-        if(padStatus.trigger & nn::hid::BUTTON_X)
-        {
-            s_HwUtility.ToggleWifiStatus();
-        }
 
 
         // 左ボタンでQR切替
diff --git a/trunk/ConsoleDataMigration/sources/common/Util.cpp b/trunk/ConsoleDataMigration/sources/common/Util.cpp
index cf3c5ae..5482866 100644
--- a/trunk/ConsoleDataMigration/sources/common/Util.cpp
+++ b/trunk/ConsoleDataMigration/sources/common/Util.cpp
@@ -111,9 +111,6 @@ void Util::Initialize()
     // IVSの取得
     ReadIvs(m_VerData.cup.majorVersion);
 
-    // モデルの取得
-    GetModel();
-
     // nwmの初期化
     nn::nwm::InitializeExtControl();
 
@@ -142,25 +139,16 @@ void Util::Finalize()
     nn::mcu::CTR::FinalizeHwCheck(&m_McuSession);
 }
 
-void Util::ToggleWifiStatus()
+void SetWifiOn()
 {
-    if(!CanChangeWifi())
-    {
-        return;
-    }
+    COMMON_LOGGER_RESULT_IF_FAILED(
+            nn::nwm::Ext::SetWifiOn());
+}
 
-    if(nn::nwm::IsWifiOn())
-    {
-        COMMON_LOGGER_RESULT_IF_FAILED(
-                nn::nwm::Ext::SetWifiOff()
-        );
-    }
-    else
-    {
-        COMMON_LOGGER_RESULT_IF_FAILED(
-                nn::nwm::Ext::SetWifiOn()
-        );
-    }
+void SetWifiOff()
+{
+    COMMON_LOGGER_RESULT_IF_FAILED(
+            nn::nwm::Ext::SetWifiOff());
 }
 
 // 無線状態を取得する
@@ -224,36 +212,6 @@ void Util::ReadIvs(u8 cupMajorVersion)
     }
 }
 
-void Util::GetModel()
-{
-    nn::mcu::CTR::HwCheck mcu(m_McuSession);
-    u8 buf[10];
-    const u8 RETRY = 10;
-
-    for(u8 i = 0; i < RETRY; i++)
-    {
-        nn::Result result = mcu.GetInfoRegisters(buf, sizeof(buf));
-        if(result.IsSuccess())
-        {
-            break;
-        }
-        nn::os::Thread::Sleep(nn::fnd::TimeSpan::FromMilliSeconds(16));
-    }
-
-    // 機種情報を cfg に反映
-    m_Model= buf[9];
-}
-
-bool Util::CanChangeWifi()
-{
-    if(m_Model == TARGET_MODEL_CTR || m_Model == TARGET_MODEL_SPR)
-    {
-        return false;
-    }
-
-    return true;
-}
-
 // NULL終端されたシリアルナンバーを受け取る
 // NULL終端された場所にチェックデジットを付加して新たにNULL終端する
 void Util::AddCheckDigit(char* serial)
diff --git a/trunk/ConsoleDataMigration/sources/common/Util.h b/trunk/ConsoleDataMigration/sources/common/Util.h
index 8af0484..dcd1cc5 100644
--- a/trunk/ConsoleDataMigration/sources/common/Util.h
+++ b/trunk/ConsoleDataMigration/sources/common/Util.h
@@ -30,17 +30,6 @@ namespace common
 class Util
 {
 public:
-    enum TargetModel
-    {
-        TARGET_MODEL_CTR,                   //!< CTR を表します。
-        TARGET_MODEL_SPR,                   //!< SPR を表します。
-        TARGET_MODEL_RESERVE_2,             //!< 予約
-        TARGET_MODEL_RESERVE_3,             //!< 予約
-        TARGET_MODEL_RESERVE_4,             //!< 予約
-        TARGET_MODEL_RESERVE_5,             //!< 予約
-        TARGET_MODEL_RESERVE_6,             //!< 予約
-        TARGET_MODEL_RESERVE_7              //!< 予約
-    };
 
     Util();
     virtual ~Util();
@@ -54,6 +43,12 @@ public:
     // 無線状態を変更する
     void ToggleWifiStatus();
 
+    // 無線状態をONにする
+    void SetWifiOn();
+
+    // 無線状態をOFFにする
+    void SetWifiOff();
+
     // 無線状態を取得する
     bool IsWifiOn();
 
@@ -141,8 +136,6 @@ private:
     void Initialize();
     void Finalize();
     void ReadIvs(u8 cupMajorVersion);
-    void GetModel();
-    bool CanChangeWifi();
 
     NN_PADDING4;
     // フレンドコード
@@ -189,9 +182,7 @@ private:
 
     // FriendCodeを読んだかどうか
     bool m_HasReadFriendCode;
-    // 機種情報
-    u8 m_Model;
-    NN_PADDING2;
+    NN_PADDING3;
     NN_PADDING4;
 
 };