From ef040ca3126093d3cf0ab4d77903a2eb661d26b5 Mon Sep 17 00:00:00 2001
From: N2614 <N2614@385bec56-5757-e545-9c3a-d8741f4650f1>
Date: Mon, 23 Jan 2012 08:08:10 +0000
Subject: [PATCH] =?UTF-8?q?=E3=83=97=E3=83=AA=E3=82=A4=E3=83=B3=E3=82=B9?=
 =?UTF-8?q?=E3=83=88=E3=83=BC=E3=83=AB=E3=82=A2=E3=83=97=E3=83=AA=E3=83=80?=
 =?UTF-8?q?=E3=82=A6=E3=83=B3=E3=83=AD=E3=83=BC=E3=83=89=E5=89=8D=E3=81=AB?=
 =?UTF-8?q?=E3=83=A6=E3=83=BC=E3=82=B6=E3=81=AESD=E3=82=AB=E3=83=BC?=
 =?UTF-8?q?=E3=83=89=E3=82=92=E7=A2=BA=E8=AA=8D=E3=81=99=E3=82=8B=E3=82=88?=
 =?UTF-8?q?=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@595 385bec56-5757-e545-9c3a-d8741f4650f1
---
 .../sources/ConsoleRestore/Controller.cpp     | 79 ++++++++++++++++++-
 .../sources/ConsoleRestore/TitleDownloader.h  |  2 +-
 2 files changed, 77 insertions(+), 4 deletions(-)

diff --git a/trunk/ConsoleDataMigration/sources/ConsoleRestore/Controller.cpp b/trunk/ConsoleDataMigration/sources/ConsoleRestore/Controller.cpp
index 856e2f4..c6a3a39 100644
--- a/trunk/ConsoleDataMigration/sources/ConsoleRestore/Controller.cpp
+++ b/trunk/ConsoleDataMigration/sources/ConsoleRestore/Controller.cpp
@@ -101,7 +101,7 @@ bool NeedsAcAdater(common::HardwareStateManager& manager)
 
 bool HasValidRtcData()
 {
-    return !s_CheckSdOnlyMode && !s_NupOnlyMode && !s_GetIvsOnlyMode;
+    return !s_CheckSdOnlyMode && !s_NupOnlyMode && !s_GetIvsOnlyMode && s_DownloadPreinstallMode;
 }
 
 typedef enum RestoreState
@@ -147,7 +147,13 @@ typedef enum RestoreState
     WAIT_SD_EJECT, // SDカードぬき待ち
     ALL_DONE, // すべて完了
     INITIALIZE_AND_SHUTDOWN, //　本体初期化後にシャットダウン中
-    FAIL // 失敗
+    FAIL, // 失敗
+
+    PREINSTALL_WAIT_USER_SD_INSERT, // プリインストールダウンロードモード・ユーザSD挿入待ち
+    PREINSTALL_CHECK_SD, // プリインストールダウンロードモード・ユーザSDのチェック
+    PREINSTALL_CHECK_SD_FAIL, // プリインストールダウンロードモード・ユーザSDのチェック失敗
+    PREINSTALL_DOWNLOAD_APP, // プリインストールダウンロードモード・アプリダウンロード
+    PREINSTALL_WAIT_USER_SD_EJECT // プリインストールダウンロードモード・ユーザSD抜き出し待ち
 } RestoreState;
 
 
@@ -247,6 +253,10 @@ void CheckNupExecuted(common::HardwareStateManager& manager, ::std::vector<std::
         {
             s_RestoreState = WAIT_START_DELETE_ACCOUNT;
         }
+        else if(s_DownloadPreinstallMode)
+        {
+            s_RestoreState = SYNC_TICKET;
+        }
         else
         {
             CheckAccountDeleted(manager, message, goNextStep);
@@ -882,6 +892,7 @@ void ControlState(common::HardwareStateManager& manager, ::std::vector<std::stri
         }
         break;
 
+        // ここから各設定で処理が分岐する
         case IMPORT_RTC:
         {
             result = nn::ResultSuccess();
@@ -995,6 +1006,7 @@ void ControlState(common::HardwareStateManager& manager, ::std::vector<std::stri
         break;
 
         case CHECK_IVS:
+        case PREINSTALL_WAIT_USER_SD_INSERT:
         {
             operationMessage.push_back(::std::string("Insert User's SD Card"));
         }
@@ -1365,6 +1377,11 @@ void ControlState(common::HardwareStateManager& manager, ::std::vector<std::stri
                 ShopOperationSingleTemplate(manager, operationMessage, SHOP_OPERATION_CONNECT, "Shop Connect",
                         "Shop Connect Finished.\n", "Shop Connect Failed. Retrying...", WAIT_SD_EJECT);
             }
+            else if(s_DownloadPreinstallMode)
+            {
+                ShopOperationSingleTemplate(manager, operationMessage, SHOP_OPERATION_CONNECT, "Shop Connect",
+                        "Shop Connect Finished.\n", "Shop Connect Failed. Retrying...", REPAIR_SIMPLE_ADDRESS_ID);
+            }
             else
             {
                 ShopOperationSingleTemplate(manager, operationMessage, SHOP_OPERATION_CONNECT, "Shop Connect",
@@ -1472,7 +1489,14 @@ void ControlState(common::HardwareStateManager& manager, ::std::vector<std::stri
             {
                 if (IsTimeAdjustSuccessed())
                 {
-                    s_RestoreState = WAIT_SD_EJECT;
+                    if(s_DownloadPreinstallMode)
+                    {
+                        s_RestoreState = PREINSTALL_WAIT_USER_SD_INSERT;
+                    }
+                    else
+                    {
+                        s_RestoreState = WAIT_SD_EJECT;
+                    }
                 }
                 else
                 {
@@ -1581,6 +1605,46 @@ void ControlState(common::HardwareStateManager& manager, ::std::vector<std::stri
         }
         break;
 
+        case PREINSTALL_CHECK_SD:
+        {
+            if (nn::fs::IsSdmcInserted())
+            {
+                NN_LOG("Check User's SD Card\n");
+                // ユーザのSDカードにはAP設定ファイルは無いはず
+                if (ExistsAPSetting())
+                {
+                    NN_LOG("AP Setting Exists. Retry\n");
+                    s_RestoreState = PREINSTALL_WAIT_USER_SD_INSERT;
+                }
+                else
+                {
+                    if(PreparePreinstallTitleDownload())
+                    {
+                        s_RestoreState = PREINSTALL_DOWNLOAD_APP;
+                    }
+                    else
+                    {
+                        COMMON_LOGGER("Error: Valid User Savedata Exists.\n");
+                        s_RestoreState = PREINSTALL_CHECK_SD_FAIL;
+                    }
+                }
+            }
+        }
+        break;
+
+        case PREINSTALL_CHECK_SD_FAIL:
+        {
+            operationMessage.push_back(::std::string("Check User's SD Card Failed."));
+            operationMessage.push_back(::std::string("Pull Out SD Card"));
+        }
+        break;
+
+        case PREINSTALL_DOWNLOAD_APP:
+        {
+
+        }
+        break;
+
     }
 }
 
@@ -1621,6 +1685,15 @@ void OnSdEjected()
         InitializeState();
         ClearFileReadResult();
     }
+    else if(s_RestoreState == PREINSTALL_WAIT_USER_SD_INSERT)
+    {
+        s_RestoreState = PREINSTALL_CHECK_SD;
+    }
+    // ユーザのSDが抜かれてからFAILにする
+    else if(s_RestoreState == PREINSTALL_CHECK_SD_FAIL)
+    {
+        s_RestoreState = FAIL;
+    }
 }
 
 void OnSdInserted()
diff --git a/trunk/ConsoleDataMigration/sources/ConsoleRestore/TitleDownloader.h b/trunk/ConsoleDataMigration/sources/ConsoleRestore/TitleDownloader.h
index 5bce020..6dd9617 100644
--- a/trunk/ConsoleDataMigration/sources/ConsoleRestore/TitleDownloader.h
+++ b/trunk/ConsoleDataMigration/sources/ConsoleRestore/TitleDownloader.h
@@ -25,7 +25,7 @@ namespace ConsoleRestore
 void StartTwlTitleDownload();
 
 //! @brief SDカードをインポート可能状態にします
-//! @return    すでに初期化済みかどうか
+//! @return    正常に初期化できたかどうか
 bool PreparePreinstallTitleDownload();
 
 //! @brief 新たにスレッドを立て、プリインストールタイトルのダウンロードを開始します <BR/>