From 3ad1f0eeb84056d64bb58f035cfc9d4efa3a0272 Mon Sep 17 00:00:00 2001
From: N2614 <N2614@385bec56-5757-e545-9c3a-d8741f4650f1>
Date: Wed, 22 Jun 2011 07:00:10 +0000
Subject: [PATCH] =?UTF-8?q?NOR=E3=82=92=E7=A7=BB=E8=A1=8C=E3=81=97?=
 =?UTF-8?q?=E3=81=AA=E3=81=84=E5=A0=B4=E5=90=88=E3=81=AF=E3=82=AF=E3=83=AA?=
 =?UTF-8?q?=E3=82=A2=E3=81=97=E3=81=A6=E3=81=8A=E3=81=8F=E3=82=88=E3=81=86?=
 =?UTF-8?q?=E3=81=AB=20=E5=90=B8=E3=81=84=E5=87=BA=E3=81=97=E3=81=9FNOR?=
 =?UTF-8?q?=E3=82=92=E6=9B=B8=E3=81=8D=E8=BE=BC=E3=82=93=E3=81=A0=E5=BE=8C?=
 =?UTF-8?q?=E3=81=AFac=E3=82=92=E6=AD=A2=E3=82=81=E3=81=A6NOR=E3=81=AB?=
 =?UTF-8?q?=E6=9B=B8=E3=81=8D=E8=BE=BC=E3=81=BE=E3=82=8C=E3=81=AA=E3=81=84?=
 =?UTF-8?q?=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@341 385bec56-5757-e545-9c3a-d8741f4650f1
---
 .../sources/ConsoleRestore/Importer.cpp            | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/trunk/ConsoleDataMigration/sources/ConsoleRestore/Importer.cpp b/trunk/ConsoleDataMigration/sources/ConsoleRestore/Importer.cpp
index aa7589e..446f25d 100644
--- a/trunk/ConsoleDataMigration/sources/ConsoleRestore/Importer.cpp
+++ b/trunk/ConsoleDataMigration/sources/ConsoleRestore/Importer.cpp
@@ -33,6 +33,7 @@
 #include <nn/nwm/CTR/nwm_InfraAPI.h>
 #include <nn/mcu.h>
 #include <nn/drivers/mcu/CTR/driverMcuRegisterMap.h>
+#include <nn/ndm.h>
 
 #include "FileName.h"
 #include "Importer.h"
@@ -796,6 +797,15 @@ nn::Result ImportNorData()
                         reinterpret_cast<common::NtrNorData*> (buf)->NtrWiFiSetting, common::NTR_WIFI_SETTING_SIZE);
                 COMMON_LOGGER_RESULT_IF_FAILED_WITH_LINE(result);
             }
+            else
+            {
+                // クリアしておく
+                result = nn::cfg::nor::CTR::ClearTwlWifiSetting();
+                COMMON_LOGGER_RESULT_IF_FAILED_WITH_LINE(result);
+
+                result = nn::cfg::nor::CTR::ClearNtrWifiSetting();
+                COMMON_LOGGER_RESULT_IF_FAILED_WITH_LINE(result);
+            }
         }
 
         common::HeapManager::GetHeap()->Free(buf);
@@ -1839,6 +1849,10 @@ nn::Result ImportData()
     {
         init = false;
 
+        // インポート前にACを止める
+        result = nn::ndm::SuspendScheduler();
+        NN_UTIL_RETURN_IF_FAILED(result);
+
         // NANDのごみを削除する
         Cleanup();