From dff70c8bf8d778a5321ea332bb76274716522e6d Mon Sep 17 00:00:00 2001
From: N2614 <N2614@385bec56-5757-e545-9c3a-d8741f4650f1>
Date: Mon, 30 May 2011 06:08:41 +0000
Subject: [PATCH] =?UTF-8?q?NUP=E3=82=B9=E3=82=AD=E3=83=83=E3=83=97?=
 =?UTF-8?q?=E3=83=A2=E3=83=BC=E3=83=89=E3=81=AE=E8=BF=BD=E5=8A=A0=20?=
 =?UTF-8?q?=E3=83=87=E3=83=BC=E3=82=BF=E3=81=AE=E6=9B=B8=E3=81=8D=E8=BE=BC?=
 =?UTF-8?q?=E3=81=BF=E3=82=92=E8=A1=8C=E3=81=86=E5=A0=B4=E5=90=88=E5=BF=85?=
 =?UTF-8?q?=E3=81=9ARTC=E3=81=8C=E8=AA=AD=E3=81=BF=E8=BE=BC=E3=81=BE?=
 =?UTF-8?q?=E3=82=8C=E3=82=8B=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@290 385bec56-5757-e545-9c3a-d8741f4650f1
---
 .../sources/ConsoleRestore/Controller.cpp     | 66 +++++++++++++------
 .../sources/ConsoleRestore/Importer.cpp       | 16 ++++-
 .../sources/ConsoleRestore/Importer.h         |  2 +-
 3 files changed, 61 insertions(+), 23 deletions(-)

diff --git a/trunk/ConsoleDataMigration/sources/ConsoleRestore/Controller.cpp b/trunk/ConsoleDataMigration/sources/ConsoleRestore/Controller.cpp
index 1679df9..2a6ad50 100644
--- a/trunk/ConsoleDataMigration/sources/ConsoleRestore/Controller.cpp
+++ b/trunk/ConsoleDataMigration/sources/ConsoleRestore/Controller.cpp
@@ -50,6 +50,8 @@ bool s_NupOnlyMode = false;
 bool s_GetIvsOnlyMode = false;
 // SDカード確認専用モード
 bool s_CheckSdOnlyMode = false;
+// NUPスキップモードかどうか
+bool s_SkipNupMode = false;
 
 // APSettingの書式が無い警告サウンドを鳴らしたかどうか
 bool s_ExistAPSettingAnnotation = false;
@@ -94,6 +96,11 @@ bool NeedsAcAdater(common::HardwareStateManager& manager)
     return manager.IsBatteryLower() && !manager.IsAdapterConnected();
 }
 
+bool HasValidRtcData()
+{
+    return !s_CheckSdOnlyMode && !s_NupOnlyMode && !s_GetIvsOnlyMode;
+}
+
 typedef enum RestoreState
 {
     STARTUP, // 初期値
@@ -216,16 +223,12 @@ void CheckSdWritable(common::HardwareStateManager& manager, ::std::vector<std::s
 // 設定ファイル書式チェック
 void CheckApSetting(common::HardwareStateManager& manager, ::std::vector<std::string>& message, bool& goNextStep)
 {
+    NN_UNUSED_VAR(manager);
+    NN_UNUSED_VAR(goNextStep);
+
     if (CheckAndReadAPSetting(message))
     {
-        if(s_CheckSdOnlyMode)
-        {
-            s_RestoreState = CHECK_IVS;
-        }
-        else
-        {
-            CheckNupExecuted(manager, message, goNextStep);
-        }
+        s_RestoreState = IMPORT_RTC;
     }
     else
     {
@@ -680,7 +683,7 @@ bool CheckAndReadAPSetting(::std::vector<std::string>& operationMessage)
     if (!s_ReadSettingDone)
     {
         s_ReadSettingDone = true;
-        s_ReadSettingIsSuccess = ReadSetting(&s_NupOnlyMode, &s_GetIvsOnlyMode, &s_CheckSdOnlyMode);
+        s_ReadSettingIsSuccess = ReadSetting(&s_NupOnlyMode, &s_GetIvsOnlyMode, &s_CheckSdOnlyMode, &s_SkipNupMode);
     }
 
     if (s_NupOnlyMode && s_GetIvsOnlyMode
@@ -690,6 +693,11 @@ bool CheckAndReadAPSetting(::std::vector<std::string>& operationMessage)
         operationMessage.push_back("Only one special mode setting is valid!!");
         s_ReadSettingIsSuccess = false;
     }
+    else if(s_NupOnlyMode && s_SkipNupMode)
+    {
+        operationMessage.push_back("Both NUP_ONLY and SKIP_NUP are described!!");
+        s_ReadSettingIsSuccess = false;
+    }
     else
     {
         if (s_NupOnlyMode)
@@ -804,14 +812,7 @@ void ControlState(common::HardwareStateManager& manager, ::std::vector<std::stri
             if (nextStep)
             {
                 COMMON_LOGGER("Start Network Update\n");
-                if(s_GetIvsOnlyMode)
-                {
-                    s_RestoreState = UPDATE_IN_PROGRESS;
-                }
-                else
-                {
-                    s_RestoreState = IMPORT_RTC;
-                }
+                s_RestoreState = UPDATE_IN_PROGRESS;
             }
         }
         break;
@@ -865,14 +866,36 @@ void ControlState(common::HardwareStateManager& manager, ::std::vector<std::stri
 
         case IMPORT_RTC:
         {
-            result = ExecSyncMcuRtc(manager);
-            if (result <= nn::fs::ResultVerificationFailed())
+            result = nn::ResultSuccess();
+            if (HasValidRtcData())
             {
-                s_RestoreState = FAIL;
+                result = ExecSyncMcuRtc(manager);
+                if (result <= nn::fs::ResultVerificationFailed())
+                {
+                    s_RestoreState = FAIL;
+                }
+                else
+                {
+                    if (s_SkipNupMode)
+                    {
+                        CheckAccountTransfered(manager, operationMessage, nextStep);
+                    }
+                    else
+                    {
+                        CheckNupExecuted(manager, operationMessage, nextStep);
+                    }
+                }
             }
             else
             {
-                s_RestoreState = UPDATE_IN_PROGRESS;
+                if (s_CheckSdOnlyMode)
+                {
+                    s_RestoreState = CHECK_IVS;
+                }
+                else
+                {
+                    CheckNupExecuted(manager, operationMessage, nextStep);
+                }
             }
         }
         break;
@@ -1572,6 +1595,7 @@ void InitializeState()
     s_SdWriteProetctAnnotation = false;
     s_WifiStatusOffAnnotation = false;
     s_CheckSdOnlyMode = false;
+    s_SkipNupMode = false;
 }
 
 u32 GetProgress()
diff --git a/trunk/ConsoleDataMigration/sources/ConsoleRestore/Importer.cpp b/trunk/ConsoleDataMigration/sources/ConsoleRestore/Importer.cpp
index c147e67..1150aa9 100644
--- a/trunk/ConsoleDataMigration/sources/ConsoleRestore/Importer.cpp
+++ b/trunk/ConsoleDataMigration/sources/ConsoleRestore/Importer.cpp
@@ -1015,7 +1015,7 @@ bool UpdateNetworkSetting(nn::ac::NetworkSetting& networkSetting)
     return retval;
 }
 
-bool ReadSetting(bool* nupOnly, bool* getIvs, bool* checkSd)
+bool ReadSetting(bool* nupOnly, bool* getIvs, bool* checkSd, bool* skipNup)
 {
     nn::Result result;
     bool retval = true;
@@ -1358,6 +1358,20 @@ bool ReadSetting(bool* nupOnly, bool* getIvs, bool* checkSd)
                 }
             }
 
+            {
+                const wchar_t* const SKIP_NUP_STR = L"SKIP_NUP";
+                NN_NULL_ASSERT(skipNup);
+                if (configfileLoader.ReadAsChar(SKIP_NUP_STR) != NULL)
+                {
+                    s32 num = configfileLoader.ReadAsInteger(SKIP_NUP_STR);
+                    if (num == 1)
+                    {
+                        *skipNup = true;
+                        COMMON_LOGGER("Skip NUP Mode.\n");
+                    }
+                }
+            }
+
             configfileLoader.Finalize();
 
             // 書き込み完了しなければfalse
diff --git a/trunk/ConsoleDataMigration/sources/ConsoleRestore/Importer.h b/trunk/ConsoleDataMigration/sources/ConsoleRestore/Importer.h
index 86d9b8a..cbe3cb5 100644
--- a/trunk/ConsoleDataMigration/sources/ConsoleRestore/Importer.h
+++ b/trunk/ConsoleDataMigration/sources/ConsoleRestore/Importer.h
@@ -108,7 +108,7 @@ struct TimeZone
 };
 
 // ネットワーク設定ファイルを読み込む
-bool ReadSetting(bool* nupOnly, bool* getIvs, bool* checkSd);
+bool ReadSetting(bool* nupOnly, bool* getIvs, bool* checkSd, bool* skipNup);
 
 // ネットワーク設定ファイルからNTPサーバの名前を取得する
 // 先にReadSettingが成功している必要がある