From 9c19d7f5657e9a4e7f886beeee768e81eed6fcde Mon Sep 17 00:00:00 2001 From: N2614 Date: Thu, 18 Sep 2014 08:01:43 +0000 Subject: [PATCH] =?UTF-8?q?NPNS=E3=83=87=E3=83=90=E3=82=A4=E3=82=B9?= =?UTF-8?q?=E3=83=88=E3=83=BC=E3=82=AF=E3=83=B3=E3=81=AF=E7=A7=BB=E8=A1=8C?= =?UTF-8?q?=E5=85=88=E6=9C=AC=E4=BD=93=E3=81=AE=E5=80=A4=E3=82=92=E4=BD=BF?= =?UTF-8?q?=E3=81=86=E3=82=88=E3=81=86=E3=81=AB=20=E3=83=90=E3=83=BC?= =?UTF-8?q?=E3=82=B8=E3=83=A7=E3=83=B3=E7=95=AA=E5=8F=B7=E3=82=92=E6=9B=B4?= =?UTF-8?q?=E6=96=B0?= 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@821 385bec56-5757-e545-9c3a-d8741f4650f1 --- trunk/ConsoleDataMigration/documents/Readme.txt | 2 +- .../sources/ConsoleRestore/Importer.cpp | 7 +++++++ .../sources/ConsoleRestore/RestoreTypes.h | 1 + 3 files changed, 9 insertions(+), 1 deletion(-) diff --git a/trunk/ConsoleDataMigration/documents/Readme.txt b/trunk/ConsoleDataMigration/documents/Readme.txt index d7aba81..63a50da 100644 --- a/trunk/ConsoleDataMigration/documents/Readme.txt +++ b/trunk/ConsoleDataMigration/documents/Readme.txt @@ -4,7 +4,7 @@ SDK ---- Backup CTR_SDK-3_3 branch r45925 + r51434 + r54939 -Restore http://10.114.1.195/horizon/branches/CTR_SDK-9_12 branch r58087 +Restore http://10.114.1.195/horizon/branches/CTR_SDK-10_0 branch r59203 コンパイラ ------- diff --git a/trunk/ConsoleDataMigration/sources/ConsoleRestore/Importer.cpp b/trunk/ConsoleDataMigration/sources/ConsoleRestore/Importer.cpp index 38a394e..53ae623 100644 --- a/trunk/ConsoleDataMigration/sources/ConsoleRestore/Importer.cpp +++ b/trunk/ConsoleDataMigration/sources/ConsoleRestore/Importer.cpp @@ -1675,6 +1675,10 @@ nn::Result ExportCalData() GET_CFG_KEY(NN_CFG_HID, NN_CFG_HID_CAL_RIGHT_STICK)); COMMON_LOGGER_RETURN_RESULT_IF_FAILED(result); + result = nn::cfg::CTR::init::GetConfig(&cfgCalData.npnsDeviceTokenCfgData, sizeof(NpnsDeviceTokenCfgData), + GET_CFG_KEY(NN_CFG_SYSTEM, NN_CFG_SYSTEM_NPNS_DEVICE_TOKEN)); + COMMON_LOGGER_RETURN_RESULT_IF_FAILED(result); + result = sdWriter.WriteBufWithCmac(common::CFG_CALIBRATION_PATHNAME, &cfgCalData, sizeof(cfgCalData)); COMMON_LOGGER_RETURN_RESULT_IF_FAILED(result); @@ -1773,6 +1777,9 @@ nn::Result InitializeHardwareDependentSetting() &cfgCalData.rightStickCfgData, sizeof(RightStickCfgData)); COMMON_LOGGER_RETURN_RESULT_IF_FAILED(result); + result = nn::cfg::CTR::init::SetConfig(GET_CFG_KEY(NN_CFG_SYSTEM, NN_CFG_SYSTEM_NPNS_DEVICE_TOKEN), + &cfgCalData.npnsDeviceTokenCfgData, sizeof(NpnsDeviceTokenCfgData)); + COMMON_LOGGER_RETURN_RESULT_IF_FAILED(result); NN_LOG("Set cfgCalData\n"); diff --git a/trunk/ConsoleDataMigration/sources/ConsoleRestore/RestoreTypes.h b/trunk/ConsoleDataMigration/sources/ConsoleRestore/RestoreTypes.h index 182bcac..21857ab 100644 --- a/trunk/ConsoleDataMigration/sources/ConsoleRestore/RestoreTypes.h +++ b/trunk/ConsoleDataMigration/sources/ConsoleRestore/RestoreTypes.h @@ -33,6 +33,7 @@ struct CfgCalData NN_PADDING2; nn::cfg::CTR::detail::QtmCameraCfgData qtmCameraCfgData; nn::cfg::CTR::detail::RightStickCfgData rightStickCfgData; + nn::cfg::CTR::detail::NpnsDeviceTokenCfgData npnsDeviceTokenCfgData; }; }