From e37b1cbc1fa5912eb8d9e72d2dc6e85905eb353c Mon Sep 17 00:00:00 2001 From: N2614 Date: Thu, 31 Jul 2014 04:42:35 +0000 Subject: [PATCH] =?UTF-8?q?=E7=A7=BB=E8=A1=8C=E3=81=97=E3=81=AA=E3=81=84cf?= =?UTF-8?q?g=E3=83=87=E3=83=BC=E3=82=BF=E7=BE=A4=E3=81=AE=E6=A7=8B?= =?UTF-8?q?=E9=80=A0=E4=BD=93=E3=82=92ConsoleRestore=E3=81=AB=E5=88=87?= =?UTF-8?q?=E3=82=8A=E5=87=BA=E3=81=97=20QUANTUM=E3=81=A8DECADE=E3=81=AE?= =?UTF-8?q?=E3=80=81cal=E3=81=AB=E5=9F=BA=E3=81=A5=E3=81=8Fcfg=E3=83=87?= =?UTF-8?q?=E3=83=BC=E3=82=BF=E3=82=92=E7=A7=BB=E8=A1=8C=E3=81=97=E3=81=AA?= =?UTF-8?q?=E3=81=84=E3=82=88=E3=81=86=E3=81=AB?= 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@805 385bec56-5757-e545-9c3a-d8741f4650f1 --- .../sources/ConsoleRestore/Importer.cpp | 32 +++++++++++++-- .../sources/ConsoleRestore/RestoreTypes.h | 41 +++++++++++++++++++ .../sources/common/common_Types.h | 15 ------- 3 files changed, 70 insertions(+), 18 deletions(-) create mode 100644 trunk/ConsoleDataMigration/sources/ConsoleRestore/RestoreTypes.h diff --git a/trunk/ConsoleDataMigration/sources/ConsoleRestore/Importer.cpp b/trunk/ConsoleDataMigration/sources/ConsoleRestore/Importer.cpp index a9aa069..7534055 100644 --- a/trunk/ConsoleDataMigration/sources/ConsoleRestore/Importer.cpp +++ b/trunk/ConsoleDataMigration/sources/ConsoleRestore/Importer.cpp @@ -53,6 +53,7 @@ #include "VersionDetect.h" #include "SaveDataMover.h" #include "RegionIdModifier.h" +#include "RestoreTypes.h" #include #include @@ -1626,7 +1627,7 @@ nn::Result ExportCalData() using namespace nn::cfg::CTR::detail; nn::Result result; - common::CfgCalData cfgCalData; + CfgCalData cfgCalData; common::SdReaderWriter sdWriter; COMMON_LOGGER("Export CalData\n"); @@ -1666,6 +1667,18 @@ nn::Result ExportCalData() GET_CFG_KEY(NN_CFG_MCU, NN_CFG_MCU_SLIDE_VOLUME)); COMMON_LOGGER_RETURN_RESULT_IF_FAILED(result); + result = nn::cfg::CTR::init::GetConfig(&cfgCalData.qtmCameraCfgData, sizeof(QtmCameraCfgData), + GET_CFG_KEY(NN_CFG_QTM, NN_CFG_QTM_CAL_CAMERA)); + COMMON_LOGGER_RETURN_RESULT_IF_FAILED(result); + + result = nn::cfg::CTR::init::GetConfig(&cfgCalData.qtmCfgData, sizeof(QtmCfgData), + GET_CFG_KEY(NN_CFG_QTM, NN_CFG_QTM_ACTIVATION_MODE)); + COMMON_LOGGER_RETURN_RESULT_IF_FAILED(result); + + result = nn::cfg::CTR::init::GetConfig(&cfgCalData.rightStickCfgData, sizeof(RightStickCfgData), + GET_CFG_KEY(NN_CFG_HID, NN_CFG_HID_CAL_RIGHT_STICK)); + COMMON_LOGGER_RETURN_RESULT_IF_FAILED(result); + result = sdWriter.WriteBufWithCmac(common::CFG_CALIBRATION_PATHNAME, &cfgCalData, sizeof(cfgCalData)); COMMON_LOGGER_RETURN_RESULT_IF_FAILED(result); @@ -1675,7 +1688,7 @@ nn::Result ExportCalData() return nn::ResultSuccess(); } -nn::Result ImportCalData(common::CfgCalData *data) +nn::Result ImportCalData(CfgCalData *data) { using namespace nn::cfg::CTR::detail; @@ -1720,7 +1733,7 @@ nn::Result InitializeHardwareDependentSetting() using namespace nn::cfg::CTR::detail; nn::Result result = nn::ResultSuccess(); - common::CfgCalData cfgCalData; + CfgCalData cfgCalData; result = ImportCalData(&cfgCalData); COMMON_LOGGER_RETURN_RESULT_IF_FAILED(result); @@ -1756,6 +1769,19 @@ nn::Result InitializeHardwareDependentSetting() &cfgCalData.mcuSlideVolumeRangeCfgData, sizeof(McuSlideVolumeRangeCfgData)); COMMON_LOGGER_RETURN_RESULT_IF_FAILED(result); + result = nn::cfg::CTR::init::SetConfig(GET_CFG_KEY(NN_CFG_QTM, NN_CFG_QTM_CAL_CAMERA), + &cfgCalData.qtmCameraCfgData, sizeof(QtmCameraCfgData)); + COMMON_LOGGER_RETURN_RESULT_IF_FAILED(result); + + result = nn::cfg::CTR::init::SetConfig(GET_CFG_KEY(NN_CFG_QTM, NN_CFG_QTM_ACTIVATION_MODE), + &cfgCalData.qtmCfgData, sizeof(QtmCfgData)); + COMMON_LOGGER_RETURN_RESULT_IF_FAILED(result); + + result = nn::cfg::CTR::init::SetConfig(GET_CFG_KEY(NN_CFG_HID, NN_CFG_HID_CAL_RIGHT_STICK), + &cfgCalData.rightStickCfgData, sizeof(RightStickCfgData)); + COMMON_LOGGER_RETURN_RESULT_IF_FAILED(result); + + NN_LOG("Set cfgCalData\n"); COMMON_LOGGER_RETURN_RESULT_IF_FAILED(result); diff --git a/trunk/ConsoleDataMigration/sources/ConsoleRestore/RestoreTypes.h b/trunk/ConsoleDataMigration/sources/ConsoleRestore/RestoreTypes.h new file mode 100644 index 0000000..40cd442 --- /dev/null +++ b/trunk/ConsoleDataMigration/sources/ConsoleRestore/RestoreTypes.h @@ -0,0 +1,41 @@ +/*---------------------------------------------------------------------------* + Project: Horizon + File: RestoreTypes.h + + Copyright (C)2014 Nintendo Co., Ltd. All rights reserved. + + These coded instructions, statements, and computer programs contain + proprietary information of Nintendo of America Inc. and/or Nintendo + Company Ltd., and are protected by Federal copyright law. They may + not be disclosed to third parties or copied or duplicated in any form, + in whole or in part, without the prior written consent of Nintendo. + + $Rev$ + *---------------------------------------------------------------------------*/ + +#ifndef REOSTORE_TYPES_H_ +#define REOSTORE_TYPES_H_ + +namespace ConsoleRestore +{ + +// CALに依存するCFGパラメータ +struct CfgCalData +{ + nn::cfg::CTR::detail::TouchPanelCfgData touchPanelCfgData; + nn::cfg::CTR::detail::LcdFlickerCfgData lcdFlickerCfgData; + nn::cfg::CTR::detail::FcramCfgData fcramCfgData; + nn::cfg::CTR::detail::RtcCfgData rtcCfgData; + nn::cfg::CTR::detail::GyroscopeCfgData gyroscopeCfgData; + nn::cfg::CTR::detail::AccelCfgData accelCfgData; + nn::cfg::CTR::detail::CodecCfgData codecCfgData; + nn::cfg::CTR::detail::McuSlideVolumeRangeCfgData mcuSlideVolumeRangeCfgData; + NN_PADDING2; + nn::cfg::CTR::detail::QtmCameraCfgData qtmCameraCfgData; + nn::cfg::CTR::detail::QtmCfgData qtmCfgData; + nn::cfg::CTR::detail::RightStickCfgData rightStickCfgData; +}; + +} + +#endif /* REOSTORE_TYPES_H_ */ diff --git a/trunk/ConsoleDataMigration/sources/common/common_Types.h b/trunk/ConsoleDataMigration/sources/common/common_Types.h index b43db57..6fb0b6d 100644 --- a/trunk/ConsoleDataMigration/sources/common/common_Types.h +++ b/trunk/ConsoleDataMigration/sources/common/common_Types.h @@ -64,21 +64,6 @@ struct VerDef nn::pl::CTR::NetworkUpdateVersion nup; }; -// CALに依存するCFGパラメータ -struct CfgCalData -{ - nn::cfg::CTR::detail::TouchPanelCfgData touchPanelCfgData; - nn::cfg::CTR::detail::LcdFlickerCfgData lcdFlickerCfgData; - nn::cfg::CTR::detail::FcramCfgData fcramCfgData; - nn::cfg::CTR::detail::RtcCfgData rtcCfgData; - nn::cfg::CTR::detail::GyroscopeCfgData gyroscopeCfgData; - nn::cfg::CTR::detail::AccelCfgData accelCfgData; - nn::cfg::CTR::detail::CodecCfgData codecCfgData; - nn::cfg::CTR::detail::McuSlideVolumeRangeCfgData mcuSlideVolumeRangeCfgData; - NN_PADDING2; - -}; - // TODO:リージョン追加時に範囲外アクセスにならないよう注意 const nn::ProgramId cCupVerId[] = {