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; }; }