From b22b0d6f797ab8a2930cbd366f633bba12f5c472 Mon Sep 17 00:00:00 2001 From: N2614 Date: Wed, 20 Aug 2014 07:45:44 +0000 Subject: [PATCH] =?UTF-8?q?trunk/ConsoleDataMigration=E3=81=8B=E3=82=89?= =?UTF-8?q?=E3=83=AA=E3=83=93=E3=82=B8=E3=83=A7=E3=83=B3817-816=E3=82=92?= =?UTF-8?q?=E9=80=86=E3=83=9E=E3=83=BC=E3=82=B8:=20cal=E3=81=AB=E4=BE=9D?= =?UTF-8?q?=E5=AD=98=E3=81=97=E3=81=9Fcfg=E3=83=87=E3=83=BC=E3=82=BF?= =?UTF-8?q?=E3=82=92=E7=A7=BB=E8=A1=8C=E3=81=97=E3=81=A6=E3=81=84=E3=81=9F?= =?UTF-8?q?=E3=81=AE=E3=81=A7=E4=BF=AE=E6=AD=A3=20........=20=E6=A9=9F?= =?UTF-8?q?=E7=A8=AE=E4=BE=9D=E5=AD=98=E3=81=AE=E3=83=91=E3=83=A9=E3=83=A1?= =?UTF-8?q?=E3=83=BC=E3=82=BF=E3=81=A7=E3=81=82=E3=82=8A=E3=80=81=E7=A7=BB?= =?UTF-8?q?=E8=A1=8C=E3=81=97=E3=81=A6=E3=82=82=E5=95=8F=E9=A1=8C=E3=81=AA?= =?UTF-8?q?=E3=81=8B=E3=81=A3=E3=81=9F=E3=81=AE=E3=81=A7=E5=B7=BB=E3=81=8D?= =?UTF-8?q?=E6=88=BB=E3=81=97=E3=80=82?= 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@820 385bec56-5757-e545-9c3a-d8741f4650f1 --- .../sources/ConsoleRestore/Importer.cpp | 68 ------------------- .../sources/ConsoleRestore/RestoreTypes.h | 10 --- 2 files changed, 78 deletions(-) diff --git a/trunk/ConsoleDataMigration/sources/ConsoleRestore/Importer.cpp b/trunk/ConsoleDataMigration/sources/ConsoleRestore/Importer.cpp index cc383a9..38a394e 100644 --- a/trunk/ConsoleDataMigration/sources/ConsoleRestore/Importer.cpp +++ b/trunk/ConsoleDataMigration/sources/ConsoleRestore/Importer.cpp @@ -1675,38 +1675,6 @@ 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.surroundCfgData, sizeof(SurroundCfgData), - GET_CFG_KEY(NN_CFG_SOUND, NN_CFG_SOUND_SURROUND_CAL)); - COMMON_LOGGER_RETURN_RESULT_IF_FAILED(result); - - result = nn::cfg::CTR::init::GetConfig(&cfgCalData.backlightPwmTableCfgData, sizeof(BacklightPwmTableCfgData), - GET_CFG_KEY(NN_CFG_LCD, NN_CFG_LCD_BACKLIGHT_PWM_TABLE)); - COMMON_LOGGER_RETURN_RESULT_IF_FAILED(result); - - result = nn::cfg::CTR::init::GetConfig(&cfgCalData.ablDetailCfgData, sizeof(AblDetailCfgData), - GET_CFG_KEY(NN_CFG_LCD, NN_CFG_LCD_ABL_DETAIL)); - COMMON_LOGGER_RETURN_RESULT_IF_FAILED(result); - - result = nn::cfg::CTR::init::GetConfig(&cfgCalData.ulcdLibAssumptionCfgData, sizeof(UlcdLibAssumptionCfgData), - GET_CFG_KEY(NN_CFG_LCD, NN_CFG_LCD_ULCDLIB_ASSUMPTION)); - COMMON_LOGGER_RETURN_RESULT_IF_FAILED(result); - - result = nn::cfg::CTR::init::GetConfig(&cfgCalData.ulcdDelayCfgData, sizeof(UlcdDelayCfgData), - GET_CFG_KEY(NN_CFG_LCD, NN_CFG_LCD_ULCD_DELAY)); - COMMON_LOGGER_RETURN_RESULT_IF_FAILED(result); - - result = nn::cfg::CTR::init::GetConfig(&cfgCalData.echoCancelCfgData, sizeof(EchoCancelCfgData), - GET_CFG_KEY(NN_CFG_SOUND, NN_CFG_SOUND_ECHO_CANCEL)); - COMMON_LOGGER_RETURN_RESULT_IF_FAILED(result); - - result = nn::cfg::CTR::init::GetConfig(&cfgCalData.ablAppendCfgData, sizeof(AblAppendCfgData), - GET_CFG_KEY(NN_CFG_LCD, NN_CFG_LCD_ABL_APPEND)); - COMMON_LOGGER_RETURN_RESULT_IF_FAILED(result); - - result = nn::cfg::CTR::init::GetConfig(&cfgCalData.pitCfgData, sizeof(PitCfgData), - GET_CFG_KEY(NN_CFG_LCD, NN_CFG_LCD_PIT)); - COMMON_LOGGER_RETURN_RESULT_IF_FAILED(result); - result = sdWriter.WriteBufWithCmac(common::CFG_CALIBRATION_PATHNAME, &cfgCalData, sizeof(cfgCalData)); COMMON_LOGGER_RETURN_RESULT_IF_FAILED(result); @@ -1805,42 +1773,6 @@ 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_SOUND, NN_CFG_SOUND_SURROUND_CAL), - &cfgCalData.surroundCfgData, sizeof(SurroundCfgData)); - COMMON_LOGGER_RETURN_RESULT_IF_FAILED(result); - - result = nn::cfg::CTR::init::SetConfig(GET_CFG_KEY(NN_CFG_LCD, NN_CFG_LCD_BACKLIGHT_PWM_TABLE), - &cfgCalData.backlightPwmTableCfgData, sizeof(BacklightPwmTableCfgData)); - COMMON_LOGGER_RETURN_RESULT_IF_FAILED(result); - - result = nn::cfg::CTR::init::SetConfig(GET_CFG_KEY(NN_CFG_LCD, NN_CFG_LCD_ABL_DETAIL), - &cfgCalData.ablDetailCfgData, sizeof(AblDetailCfgData)); - COMMON_LOGGER_RETURN_RESULT_IF_FAILED(result); - - // LGY - result = nn::cfg::CTR::init::SetConfig(GET_CFG_KEY(NN_CFG_LCD, NN_CFG_LCD_ABL_DETAIL_LGY), - &cfgCalData.ablDetailCfgData, sizeof(AblDetailCfgData)); - COMMON_LOGGER_RETURN_RESULT_IF_FAILED(result); - - result = nn::cfg::CTR::init::SetConfig(GET_CFG_KEY(NN_CFG_LCD, NN_CFG_LCD_ULCDLIB_ASSUMPTION), - &cfgCalData.ulcdLibAssumptionCfgData, sizeof(UlcdLibAssumptionCfgData)); - COMMON_LOGGER_RETURN_RESULT_IF_FAILED(result); - - result = nn::cfg::CTR::init::SetConfig(GET_CFG_KEY(NN_CFG_LCD, NN_CFG_LCD_ULCD_DELAY), - &cfgCalData.ulcdDelayCfgData, sizeof(UlcdDelayCfgData)); - COMMON_LOGGER_RETURN_RESULT_IF_FAILED(result); - - result = nn::cfg::CTR::init::SetConfig(GET_CFG_KEY(NN_CFG_SOUND, NN_CFG_SOUND_ECHO_CANCEL), - &cfgCalData.echoCancelCfgData, sizeof(EchoCancelCfgData)); - COMMON_LOGGER_RETURN_RESULT_IF_FAILED(result); - - result = nn::cfg::CTR::init::SetConfig(GET_CFG_KEY(NN_CFG_LCD, NN_CFG_LCD_ABL_APPEND), - &cfgCalData.ablAppendCfgData, sizeof(AblAppendCfgData)); - COMMON_LOGGER_RETURN_RESULT_IF_FAILED(result); - - result = nn::cfg::CTR::init::SetConfig(GET_CFG_KEY(NN_CFG_LCD, NN_CFG_LCD_PIT), - &cfgCalData.pitCfgData, sizeof(PitCfgData)); - 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 42c8196..182bcac 100644 --- a/trunk/ConsoleDataMigration/sources/ConsoleRestore/RestoreTypes.h +++ b/trunk/ConsoleDataMigration/sources/ConsoleRestore/RestoreTypes.h @@ -31,18 +31,8 @@ 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::SurroundCfgData surroundCfgData; - nn::cfg::CTR::detail::BacklightPwmTableCfgData backlightPwmTableCfgData; - nn::cfg::CTR::detail::AblDetailCfgData ablDetailCfgData; - nn::cfg::CTR::detail::UlcdLibAssumptionCfgData ulcdLibAssumptionCfgData; - nn::cfg::CTR::detail::UlcdDelayCfgData ulcdDelayCfgData; - NN_PADDING2; - nn::cfg::CTR::detail::EchoCancelCfgData echoCancelCfgData; - nn::cfg::CTR::detail::AblAppendCfgData ablAppendCfgData; - nn::cfg::CTR::detail::PitCfgData pitCfgData; }; }