rvtr/ctr_Repair
1
Fork 0
mirror of https://github.com/rvtr/ctr_Repair.git synced 2025-10-31 13:51:08 -04:00
Code Issues Actions Packages Projects Releases Wiki Activity

calに依存したcfgデータを移行していたので修正

Browse Source 
git-svn-id: file:///Volumes/Transfer/gigaleak_20231201/2020-05-23%20-%20ctr.7z%20+%20svn_v1.068.zip/ctr/svn/ctr_Repair@819 385bec56-5757-e545-9c3a-d8741f4650f1
This commit is contained in:
N2614 2014-08-20 07:12:46 +00:00
parent f710c3e298
commit 7e589fe709
2 changed files with 69 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

77
trunk/ConsoleDataMigration/sources/ConsoleRestore/Importer.cpp
View File

@ -1675,18 +1675,38 @@ 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 = 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);
@ -1785,18 +1805,43 @@ 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);
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");
COMMON_LOGGER_RETURN_RESULT_IF_FAILED(result);

12
trunk/ConsoleDataMigration/sources/ConsoleRestore/RestoreTypes.h
View File

@ -34,11 +34,15 @@ struct CfgCalData
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;
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;
};
}