From b572173445356128639cef66668fe12eced882eb Mon Sep 17 00:00:00 2001
From: N2614 <N2614@385bec56-5757-e545-9c3a-d8741f4650f1>
Date: Wed, 31 Aug 2011 08:45:51 +0000
Subject: [PATCH] =?UTF-8?q?=E7=A7=BB=E8=A1=8C=E5=8F=AF=E8=83=BDID=E3=82=82?=
 =?UTF-8?q?=E5=8F=96=E5=BE=97=E3=81=99=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@422 385bec56-5757-e545-9c3a-d8741f4650f1
---
 trunk/FlickerCalCollector/main.cpp | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/trunk/FlickerCalCollector/main.cpp b/trunk/FlickerCalCollector/main.cpp
index 122eccd..893ae41 100644
--- a/trunk/FlickerCalCollector/main.cpp
+++ b/trunk/FlickerCalCollector/main.cpp
@@ -40,6 +40,7 @@ namespace
 nn::drivers::cal::CTR::LcdFlickerInfo        s_LcdFlickerInfo;
 bool s_LcdFlickerInfoIsValid = false;
 u8 s_SerialNo[nn::cfg::CTR::CFG_SECURE_INFO_SERIAL_NO_LEN];
+bit64 s_TranferableId;
 bool s_CanReadSerialNumber = false;
 u32 s_CalVersion = 0;
 
@@ -166,11 +167,15 @@ extern "C" void nnMain()
         s_CanReadSerialNumber = true;
     }
 
+    // 移行可能IDの取得
+    s_TranferableId = nn::cfg::CTR::GetTransferableId(0);
+
     if(s_LcdFlickerInfoIsValid)
     {
         s32 writeSize;
         char writeData[256];
-        nn::nstd::TSNPrintf(writeData, sizeof(writeData), "%s, %0x, %0x\n", s_SerialNo, s_LcdFlickerInfo.vcomTop, s_LcdFlickerInfo.vcomBottom);
+        nn::nstd::TSNPrintf(writeData, sizeof(writeData), "%s, %llx, %0x, %0x\n", s_SerialNo, s_TranferableId,
+                s_LcdFlickerInfo.vcomTop, s_LcdFlickerInfo.vcomBottom);
         NN_LOG("%s", writeData);
         // SD書き込み
         result = file.TryWrite(&writeSize, writeData, std::strlen(writeData), true);
@@ -194,8 +199,9 @@ extern "C" void nnMain()
         {
             s_RenderSystem.DrawText(0, 10, "serial = %s", s_SerialNo);
         }
-        s_RenderSystem.DrawText(0, 20, "calVersion = %d\n", s_CalVersion);
-        s_RenderSystem.DrawText(0, 30, "Flicker = %0x, %0x", s_LcdFlickerInfo.vcomTop, s_LcdFlickerInfo.vcomBottom);
+        s_RenderSystem.DrawText(0, 20, "TransferrableId = %llx\n", s_TranferableId);
+        s_RenderSystem.DrawText(0, 30, "calVersion = %d\n", s_CalVersion);
+        s_RenderSystem.DrawText(0, 40, "Flicker = %0x, %0x", s_LcdFlickerInfo.vcomTop, s_LcdFlickerInfo.vcomBottom);
         s_RenderSystem.SwapBuffers();
 
         s_RenderSystem.SetRenderTarget(NN_GX_DISPLAY1);