From 9ce5ed8cfdfe4e508e9c75e754dd1bef4ca412bd Mon Sep 17 00:00:00 2001
From: N2614 <N2614@385bec56-5757-e545-9c3a-d8741f4650f1>
Date: Wed, 9 Nov 2011 02:44:36 +0000
Subject: [PATCH] =?UTF-8?q?2ndNUP=E4=BB=A5=E9=99=8D=E3=81=AE=E6=9C=AC?=
 =?UTF-8?q?=E4=BD=93=E3=81=AA=E3=82=89=E3=81=B0=E3=82=A8=E3=83=A9=E3=83=BC?=
 =?UTF-8?q?=E3=81=AB=E3=81=99=E3=82=8B?=
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@488 385bec56-5757-e545-9c3a-d8741f4650f1
---
 .../sources/ConsoleBackup/Controller.cpp      | 24 ++++++++++++++++++-
 .../sources/common/common_Types.h             |  2 ++
 2 files changed, 25 insertions(+), 1 deletion(-)

diff --git a/branches/1stNUP_for_2ndNUP/sources/ConsoleBackup/Controller.cpp b/branches/1stNUP_for_2ndNUP/sources/ConsoleBackup/Controller.cpp
index 6175c8d..9eb2c89 100644
--- a/branches/1stNUP_for_2ndNUP/sources/ConsoleBackup/Controller.cpp
+++ b/branches/1stNUP_for_2ndNUP/sources/ConsoleBackup/Controller.cpp
@@ -62,6 +62,20 @@ bool s_PlayedFailSound = false;
 
 } // namespace <unnamed>
 
+bool RequiresNewerVersionTool(common::HardwareStateManager& manager)
+{
+    common::VerDef versionData;
+    manager.GetVersionData(&versionData);
+    if(common::CUP_MAJOR_VER_2ND_NUP <= versionData.cup.majorVersion)
+    {
+        return true;
+    }
+    else
+    {
+        return false;
+    }
+}
+
 void PutAliveMessage(::std::vector<std::string>& operationMessage, const char* str)
 {
     std::string message = std::string(str);
@@ -115,7 +129,7 @@ void ControlState(common::HardwareStateManager& manager, ::std::vector<std::stri
                             s_SdWriteProetctAnnotation = true;
                             common::PlaySound(common::SOUND_ANNOTATION);
                         }
-                        operationMessage.push_back(::std::string("Can*t Write SD Card!!\n"));
+                        operationMessage.push_back(::std::string("Can't Write SD Card!!\n"));
                         break;
                     }
 
@@ -174,6 +188,14 @@ void ControlState(common::HardwareStateManager& manager, ::std::vector<std::stri
                 }
             }
 
+            // 2ndNUP本体ならばエラー表示
+            if(RequiresNewerVersionTool(manager))
+            {
+                COMMON_LOGGER("Newer Console Backup required.\n");
+                s_BackupState = FAIL;
+                break;
+            }
+
             if (nextStep && !error)
             {
                 COMMON_LOGGER("Checking SaveData\n");
diff --git a/branches/1stNUP_for_2ndNUP/sources/common/common_Types.h b/branches/1stNUP_for_2ndNUP/sources/common/common_Types.h
index 581b718..e158c53 100644
--- a/branches/1stNUP_for_2ndNUP/sources/common/common_Types.h
+++ b/branches/1stNUP_for_2ndNUP/sources/common/common_Types.h
@@ -41,6 +41,8 @@ const u64 INFRA_DEVICE_ID_OFFSET            = 0x400000000;
 
 const size_t FILE_COPY_HEAP_SIZE            = 16 * 1024 * 1024;
 
+const u8 CUP_MAJOR_VER_2ND_NUP = 3;
+
 // NOR領域のみにある設定データ用構造体
 struct NtrNorData
 {