From 34407ba9a2c3eac177c177f12224e01c8206d36f Mon Sep 17 00:00:00 2001
From: N2614 <N2614@385bec56-5757-e545-9c3a-d8741f4650f1>
Date: Thu, 7 Jul 2011 06:31:05 +0000
Subject: [PATCH] =?UTF-8?q?Restore=E3=82=82=E5=90=8C=E4=B8=80=E6=9C=AC?=
 =?UTF-8?q?=E4=BD=93=E4=B8=8B=E8=A8=98=E6=88=BB=E3=81=97=E3=81=AE=E5=A0=B4?=
 =?UTF-8?q?=E5=90=88=E3=82=A8=E3=83=BC=E3=82=B8=E3=83=B3=E3=82=B0=E3=81=A7?=
 =?UTF-8?q?=E3=81=8D=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@368 385bec56-5757-e545-9c3a-d8741f4650f1
---
 .../sources/ConsoleRestore/Controller.cpp     | 31 +++++++------
 .../work/RW_Aging/sources/common/Util.cpp     | 43 +++++++++----------
 2 files changed, 38 insertions(+), 36 deletions(-)

diff --git a/branches/work/RW_Aging/sources/ConsoleRestore/Controller.cpp b/branches/work/RW_Aging/sources/ConsoleRestore/Controller.cpp
index 102b17b..b337cd4 100644
--- a/branches/work/RW_Aging/sources/ConsoleRestore/Controller.cpp
+++ b/branches/work/RW_Aging/sources/ConsoleRestore/Controller.cpp
@@ -339,7 +339,18 @@ void CheckAccountTransfered(common::HardwareStateManager& manager, ::std::vector
     }
     else
     {
-        s_RestoreState = WAIT_START_TRANSFER_ACCOUNT;
+        // エージングのため同一本体下記書き戻しの場合は本体初期化からはじめる
+        if(EqualsDeviceIdFileandDeviceId(manager).IsSuccess())
+        {
+            CreateTransferAccountFinishedFile();
+            CreateDownloadIvsFinishedFile();
+            CheckWriteFinished(manager, message, goNextStep);
+        }
+        else
+        {
+            s_RestoreState = WAIT_START_TRANSFER_ACCOUNT;
+        }
+
     }
 }
 
@@ -838,10 +849,7 @@ void ControlState(common::HardwareStateManager& manager, ::std::vector<std::stri
                 s_PlayedStartCursor = true;
             }
 
-            if (nextStep)
-            {
-                s_RestoreState = READ_FILELIST;
-            }
+            s_RestoreState = READ_FILELIST;
         }
         break;
 
@@ -912,10 +920,7 @@ void ControlState(common::HardwareStateManager& manager, ::std::vector<std::stri
                 PlaySound(SOUND_ANNOTATION);
             }
 
-            if (nextStep)
-            {
-                s_RestoreState = READ_FILELIST;
-            }
+            s_RestoreState = READ_FILELIST;
         }
         break;
 
@@ -1313,10 +1318,10 @@ void ControlState(common::HardwareStateManager& manager, ::std::vector<std::stri
                 s_PlayedRebootCursor = true;
             }
 
-            if (nextStep)
-            {
-                s_RestoreState = REBOOTING;
-            }
+            // リストア状態チェックファイルをすべて削除
+            DeleteAllCheckFiles();
+
+            s_RestoreState = REBOOTING;
         }
         break;
 
diff --git a/branches/work/RW_Aging/sources/common/Util.cpp b/branches/work/RW_Aging/sources/common/Util.cpp
index eb455b8..35b1b19 100644
--- a/branches/work/RW_Aging/sources/common/Util.cpp
+++ b/branches/work/RW_Aging/sources/common/Util.cpp
@@ -129,30 +129,27 @@ void Util::Initialize()
 
     // エージング回数の変更
     SdMountManager::Mount();
-    size_t bufSize = GetAllocatableSize();
-    common::HeapManager heap(bufSize);
-    void* buf = heap.GetAddr();
-    if (buf != NULL)
+    const size_t BUF_SIZE = 1024;
+    u8* buf[BUF_SIZE];
+    common::SdReaderWriter sdReaderWriter;
+    size_t readSize;
+    result = sdReaderWriter.ReadBufWithCmac(common::AGING_COUNTER_PATHNAME, buf, BUF_SIZE, &readSize);
+    if (result.IsSuccess())
     {
-        common::SdReaderWriter sdReaderWriter;
-
-        size_t readSize;
-        result = sdReaderWriter.ReadBufWithCmac(common::AGING_COUNTER_PATHNAME, buf, bufSize, &readSize);
-        if(result.IsSuccess())
-        {
-            // SDから読み出し成功
-            std::memcpy(&m_AgingCounter, buf, readSize);
-            m_AgingCounter++;
-            result = sdReaderWriter.WriteBufWithCmac(common::AGING_COUNTER_PATHNAME, &m_AgingCounter, sizeof(m_AgingCounter));
-            COMMON_LOGGER_RESULT_IF_FAILED_WITH_LINE(result);
-        }
-        else
-        {
-            // 初期値
-            m_AgingCounter = 1;
-            result = sdReaderWriter.WriteBufWithCmac(common::AGING_COUNTER_PATHNAME, &m_AgingCounter, sizeof(m_AgingCounter));
-            COMMON_LOGGER_RESULT_IF_FAILED_WITH_LINE(result);
-        }
+        // SDから読み出し成功
+        std::memcpy(&m_AgingCounter, buf, readSize);
+        m_AgingCounter++;
+        result = sdReaderWriter.WriteBufWithCmac(common::AGING_COUNTER_PATHNAME, &m_AgingCounter,
+                sizeof(m_AgingCounter));
+        COMMON_LOGGER_RESULT_IF_FAILED_WITH_LINE(result);
+    }
+    else
+    {
+        // 初期値
+        m_AgingCounter = 1;
+        result = sdReaderWriter.WriteBufWithCmac(common::AGING_COUNTER_PATHNAME, &m_AgingCounter,
+                sizeof(m_AgingCounter));
+        COMMON_LOGGER_RESULT_IF_FAILED_WITH_LINE(result);
     }
 
     SdMountManager::Unmount();