From 5af2bfd34b9dfbbd430988218ffd5d7e66a2e1f3 Mon Sep 17 00:00:00 2001 From: N2614 Date: Wed, 20 Aug 2014 02:35:26 +0000 Subject: [PATCH] =?UTF-8?q?cal=E3=81=AB=E4=BE=9D=E5=AD=98=E3=81=97?= =?UTF-8?q?=E3=81=9Fcfg=E3=83=87=E3=83=BC=E3=82=BF=E3=82=92=E7=A7=BB?= =?UTF-8?q?=E8=A1=8C=E3=81=97=E3=81=A6=E3=81=84=E3=81=9F=E3=81=AE=E3=81=A7?= =?UTF-8?q?=E4=BF=AE=E6=AD=A3?= 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@817 385bec56-5757-e545-9c3a-d8741f4650f1 --- .../sources/ConsoleRestore/Importer.cpp | 23 +++++++++++++++++++ .../sources/ConsoleRestore/RestoreTypes.h | 6 +++++ 2 files changed, 29 insertions(+) diff --git a/trunk/ConsoleDataMigration/sources/ConsoleRestore/Importer.cpp b/trunk/ConsoleDataMigration/sources/ConsoleRestore/Importer.cpp index 38a394e..471168e 100644 --- a/trunk/ConsoleDataMigration/sources/ConsoleRestore/Importer.cpp +++ b/trunk/ConsoleDataMigration/sources/ConsoleRestore/Importer.cpp @@ -1675,6 +1675,18 @@ 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.analogStickCfgData, sizeof(AnalogStickCfgData), + GET_CFG_KEY(NN_CFG_HID, NN_CFG_HID_CAL_ANALOGSTICK)); + COMMON_LOGGER_RETURN_RESULT_IF_FAILED(result); + + result = nn::cfg::CTR::init::GetConfig(&cfgCalData.cameraCfgData, sizeof(CameraCfgData), + GET_CFG_KEY(NN_CFG_CAMERA, NN_CFG_CAMERA_CAL)); + COMMON_LOGGER_RETURN_RESULT_IF_FAILED(result); + + result = nn::cfg::CTR::init::GetConfig(&cfgCalData.surroundCfgData, sizeof(SurroundCfgData), + GET_CFG_KEY(NN_CFG_SOUND, NN_CFG_SOUND_SURROUND_CAL)); + 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 +1785,17 @@ 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_HID, NN_CFG_HID_CAL_ANALOGSTICK), + &cfgCalData.analogStickCfgData, sizeof(AnalogStickCfgData)); + COMMON_LOGGER_RETURN_RESULT_IF_FAILED(result); + + result = nn::cfg::CTR::init::SetConfig(GET_CFG_KEY(NN_CFG_CAMERA, NN_CFG_CAMERA_CAL), + &cfgCalData.cameraCfgData, sizeof(CameraCfgData)); + COMMON_LOGGER_RETURN_RESULT_IF_FAILED(result); + + result = nn::cfg::CTR::init::SetConfig(GET_CFG_KEY(NN_CFG_SOUND, NN_CFG_SOUND_SURROUND_CAL), + &cfgCalData.surroundCfgData, sizeof(SurroundCfgData)); + 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..62b59e7 100644 --- a/trunk/ConsoleDataMigration/sources/ConsoleRestore/RestoreTypes.h +++ b/trunk/ConsoleDataMigration/sources/ConsoleRestore/RestoreTypes.h @@ -31,8 +31,14 @@ struct CfgCalData nn::cfg::CTR::detail::CodecCfgData codecCfgData; nn::cfg::CTR::detail::McuSlideVolumeRangeCfgData mcuSlideVolumeRangeCfgData; NN_PADDING2; + nn::cfg::CTR::detail::QtmCameraCfgData qtmCameraCfgData; nn::cfg::CTR::detail::RightStickCfgData rightStickCfgData; + nn::cfg::CTR::detail::AnalogStickCfgData analogStickCfgData; + nn::cfg::CTR::detail::CameraCfgData cameraCfgData; + NN_PADDING2; + + nn::cfg::CTR::detail::SurroundCfgData surroundCfgData; }; }