From c472feca0dffcf2edbe98bea9f9e4839af1e48ac Mon Sep 17 00:00:00 2001 From: N2614 Date: Thu, 17 Feb 2011 02:11:43 +0000 Subject: [PATCH] =?UTF-8?q?=E3=83=90=E3=83=83=E3=82=AF=E3=82=B0=E3=83=A9?= =?UTF-8?q?=E3=82=A6=E3=83=B3=E3=83=89=E9=80=9A=E4=BF=A1=E3=82=92=E5=81=9C?= =?UTF-8?q?=E6=AD=A2=E3=81=99=E3=82=8B=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@66 385bec56-5757-e545-9c3a-d8741f4650f1 --- .../ConsoleBackup/ConsoleBackup.cpp | 15 +++++++++++ .../ConsoleBackup/ConsoleBackup.rsf | 2 ++ .../ConsoleRestore/ConsoleRestore.cpp | 26 ++++++++++--------- 3 files changed, 31 insertions(+), 12 deletions(-) diff --git a/trunk/ConsoleDataMigration/ConsoleBackup/ConsoleBackup.cpp b/trunk/ConsoleDataMigration/ConsoleBackup/ConsoleBackup.cpp index d46a2d6..fb59b42 100644 --- a/trunk/ConsoleDataMigration/ConsoleBackup/ConsoleBackup.cpp +++ b/trunk/ConsoleDataMigration/ConsoleBackup/ConsoleBackup.cpp @@ -33,6 +33,7 @@ #include #include #include +#include #include "demo.h" @@ -143,6 +144,20 @@ extern "C" void nnMain(void) result = nn::hid::Initialize(); NN_UTIL_PANIC_IF_FAILED(result); + // ndmの初期化 + result = nn::ndm::Initialize(); + NN_ERR_THROW_FATAL_IF_FATAL_ONLY(result); + + // デーモンの自律動作を停止 + result = nn::ndm::Suspend(nn::ndm::DN_CEC); + NN_ERR_THROW_FATAL_IF_FATAL_ONLY(result); + result = nn::ndm::Suspend(nn::ndm::DN_BOSS); + NN_ERR_THROW_FATAL_IF_FATAL_ONLY(result); + result = nn::ndm::Suspend(nn::ndm::DN_FRIENDS); + NN_ERR_THROW_FATAL_IF_FATAL_ONLY(result); + result = nn::ndm::Suspend(nn::ndm::DN_NIM); + NN_ERR_THROW_FATAL_IF_FATAL_ONLY(result); + // cfg の初期化 nn::cfg::CTR::init::Initialize(); nn::cfg::CTR::system::Initialize(); diff --git a/trunk/ConsoleDataMigration/ConsoleBackup/ConsoleBackup.rsf b/trunk/ConsoleDataMigration/ConsoleBackup/ConsoleBackup.rsf index b9d1208..5c3cb01 100644 --- a/trunk/ConsoleDataMigration/ConsoleBackup/ConsoleBackup.rsf +++ b/trunk/ConsoleDataMigration/ConsoleBackup/ConsoleBackup.rsf @@ -25,6 +25,8 @@ SystemControlInfo: - gsp - friends - nim + - ac + - ndm AccessControlInfo: Priority : 16 diff --git a/trunk/ConsoleDataMigration/ConsoleRestore/ConsoleRestore.cpp b/trunk/ConsoleDataMigration/ConsoleRestore/ConsoleRestore.cpp index ce7f020..adcb305 100644 --- a/trunk/ConsoleDataMigration/ConsoleRestore/ConsoleRestore.cpp +++ b/trunk/ConsoleDataMigration/ConsoleRestore/ConsoleRestore.cpp @@ -159,6 +159,20 @@ extern "C" void nnMain(void) result = nn::hid::Initialize(); NN_ERR_THROW_FATAL_IF_FATAL_ONLY(result); + // ndmの初期化 + result = nn::ndm::Initialize(); + NN_ERR_THROW_FATAL_IF_FATAL_ONLY(result); + + // デーモンの自律動作を停止 + result = nn::ndm::Suspend(nn::ndm::DN_CEC); + NN_ERR_THROW_FATAL_IF_FATAL_ONLY(result); + result = nn::ndm::Suspend(nn::ndm::DN_BOSS); + NN_ERR_THROW_FATAL_IF_FATAL_ONLY(result); + result = nn::ndm::Suspend(nn::ndm::DN_FRIENDS); + NN_ERR_THROW_FATAL_IF_FATAL_ONLY(result); + result = nn::ndm::Suspend(nn::ndm::DN_NIM); + NN_ERR_THROW_FATAL_IF_FATAL_ONLY(result); + // cfg の初期化 nn::cfg::CTR::init::Initialize(); nn::cfg::CTR::system::Initialize(); @@ -176,18 +190,6 @@ extern "C" void nnMain(void) nn::mcu::CTR::InitializeHwCheck(&s_McuSession); nn::mcu::CTR::HwCheck mcu(s_McuSession); - // ndmの初期化 - result = nn::ndm::Initialize(); - NN_ERR_THROW_FATAL_IF_FATAL_ONLY(result); - - // NIM以外のデーモンの自律動作を停止 - result = nn::ndm::Suspend(nn::ndm::DN_CEC); - NN_ERR_THROW_FATAL_IF_FATAL_ONLY(result); - result = nn::ndm::Suspend(nn::ndm::DN_BOSS); - NN_ERR_THROW_FATAL_IF_FATAL_ONLY(result); - result = nn::ndm::Suspend(nn::ndm::DN_FRIENDS); - NN_ERR_THROW_FATAL_IF_FATAL_ONLY(result); - // amの初期化 nn::am::InitializeForSystemMenu();