NPNSデバイストークンは移行先本体の値を使うように

バージョン番号を更新

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
This commit is contained in:
N2614 2014-09-18 08:01:43 +00:00
parent b22b0d6f79
commit 9c19d7f565
3 changed files with 9 additions and 1 deletions

View File

@ -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
コンパイラ
-------

View File

@ -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");

View File

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