ns:sでシャットダウンするように

git-svn-id: file:///Volumes/Transfer/gigaleak_20231201/2020-05-23%20-%20ctr.7z%20+%20svn_v1.068.zip/ctr/svn/ctr_Repair@798 385bec56-5757-e545-9c3a-d8741f4650f1
This commit is contained in:
N2614 2014-05-02 02:50:10 +00:00
parent 84aac69652
commit 60aeff8c28
2 changed files with 8 additions and 1 deletions

View File

@ -31,6 +31,7 @@
#include <nn/ndm.h> #include <nn/ndm.h>
#include <nn/nim.h> #include <nn/nim.h>
#include <nn/am.h> #include <nn/am.h>
#include <nn/ns.h>
#include "demo.h" #include "demo.h"
#include <vector> #include <vector>
@ -74,6 +75,7 @@ void FinalizeAll()
s_RenderSystem.Finalize(); s_RenderSystem.Finalize();
s_HwUtility.FinalizeForRestore(); s_HwUtility.FinalizeForRestore();
nn::ns::FinalizeForShell();
nn::am::FinalizeForSystemMenu(); nn::am::FinalizeForSystemMenu();
nn::ptm::CTR::Finalize(); nn::ptm::CTR::Finalize();
nn::cfg::CTR::system::Finalize(); nn::cfg::CTR::system::Finalize();
@ -121,6 +123,9 @@ extern "C" void nnMain(void)
// ptmの初期化 // ptmの初期化
nn::ptm::CTR::Initialize(); nn::ptm::CTR::Initialize();
// nsの初期化
nn::ns::CTR::InitializeForShell();
// ヒープの確保 // ヒープの確保
common::InitializeHeap(); common::InitializeHeap();

View File

@ -366,7 +366,9 @@ void ControlState(common::HardwareStateManager& manager, common::OperationMessag
case SHUTDOWN: case SHUTDOWN:
{ {
// シャットダウンする // シャットダウンする
nn::ptm::CTR::ShutdownAsync(0, nn::fnd::TimeSpan::FromSeconds(0)); COMMON_LOGGER_RESULT_IF_FAILED(
nn::ns::ShutdownAsync());
} }
break; break;