diff --git a/trunk/CardSaveDataMover/Imp/OMakefile b/trunk/CardSaveDataMover/Imp/OMakefile index a84aa99..99b79e8 100644 --- a/trunk/CardSaveDataMover/Imp/OMakefile +++ b/trunk/CardSaveDataMover/Imp/OMakefile @@ -39,9 +39,9 @@ LIBS += libnn_ps IMPORTEE_CIA = importee.cia -SRC_IMPORTEE_PATH = ../body/images/$(BUILD_TARGET_DIR)/$(BUILD_TYPE_DIR)/CtrSaveDataMover.cia +#SRC_IMPORTEE_PATH = ../body/images/$(BUILD_TARGET_DIR)/$(BUILD_TYPE_DIR)/CtrSaveDataMover.cia #とりあえず、マスタリング時は直おき、配置時に改名 -#SRC_IMPORTEE_PATH = CtrSaveDataMover_master.cia +SRC_IMPORTEE_PATH = CtrSaveDataMover_master.cia # ビルドタイプ別に romfs を作る #ROMFS_ROOT = $`(TARGET.getObjectDirectory)/romfsroot diff --git a/trunk/CardSaveDataMover/Imp/imp_list/batch/csm_list.txt b/trunk/CardSaveDataMover/Imp/imp_list/batch/csm_list.txt index 3f03a97..ab848b6 100644 --- a/trunk/CardSaveDataMover/Imp/imp_list/batch/csm_list.txt +++ b/trunk/CardSaveDataMover/Imp/imp_list/batch/csm_list.txt @@ -1,3 +1,16 @@ -#Rg +#쐬ł +#VA͍lŔp̂ +#lp͂܂ꂽDigit͏Ȃ +#Rg͑SpOK + +#O[vA CJN10001372 -#-- END -- \ No newline at end of file +EJF10000237 +EJF10001230 + +#O[vB +EJF10002236 +EJF10003232 +EJF10004231 +EJF10005237 +#-- END -- diff --git a/trunk/CardSaveDataMover/Imp/imp_list/batch/csm_sign.dat b/trunk/CardSaveDataMover/Imp/imp_list/batch/csm_sign.dat index 6e213ef..f067b18 100644 Binary files a/trunk/CardSaveDataMover/Imp/imp_list/batch/csm_sign.dat and b/trunk/CardSaveDataMover/Imp/imp_list/batch/csm_sign.dat differ diff --git a/trunk/CardSaveDataMover/Imp/imp_list/key/private_key.der b/trunk/CardSaveDataMover/Imp/imp_list/key/private_key.der deleted file mode 100644 index 4eae7a3..0000000 Binary files a/trunk/CardSaveDataMover/Imp/imp_list/key/private_key.der and /dev/null differ diff --git a/trunk/CardSaveDataMover/Imp/romfiles/importee.cia b/trunk/CardSaveDataMover/Imp/romfiles/importee.cia index c2d7f02..12fdec1 100644 Binary files a/trunk/CardSaveDataMover/Imp/romfiles/importee.cia and b/trunk/CardSaveDataMover/Imp/romfiles/importee.cia differ diff --git a/trunk/CardSaveDataMover/Imp/source/main.cpp b/trunk/CardSaveDataMover/Imp/source/main.cpp index 250af14..1390bd7 100644 --- a/trunk/CardSaveDataMover/Imp/source/main.cpp +++ b/trunk/CardSaveDataMover/Imp/source/main.cpp @@ -21,6 +21,7 @@ #include #include #include +#include #include #include #include @@ -127,6 +128,14 @@ u32 WaitKey(u32 mask) hpr->ReadLatest(&padStatus); if(padStatus.trigger & mask)return padStatus.trigger; CheckSysBreak(); + int i = nn::ndm::GetDaemonStatus( nn::ndm::DN_CEC ); + if (i !=3 )NN_LOG("DN_CEC %d\n",i); + i = nn::ndm::GetDaemonStatus( nn::ndm::DN_BOSS ); + if (i !=3 )NN_LOG("DN_BOSS %d\n",i); + i = nn::ndm::GetDaemonStatus( nn::ndm::DN_NIM ); + if (i !=3 )NN_LOG("DN_NIM %d\n",i); + i = nn::ndm::GetDaemonStatus( nn::ndm::DN_FRIENDS ); + if (i !=3 )NN_LOG("DN_FRIENDS %d\n",i); } } @@ -249,7 +258,9 @@ void nnMain( void ) //DEA-SUPにて推奨のフリーズ暫定対策:無線デーモンを停止 (2011.3.1 現在) //ただし、スリープ時の"いつのまに通信"は止まらない //無線は使わないので本体横スイッチ切っとくのが確実 - nn::ndm::SuspendScheduler(); + nn::ndm::Initialize(); + result = nn::ndm::SuspendScheduler(); + NN_LOG("%d",result.GetDescription()); //中断処理の準備 InitSysBreak((uptr)endfunc); diff --git a/trunk/CardSaveDataMover/body/OMakefile b/trunk/CardSaveDataMover/body/OMakefile index 8ecce68..ec44a33 100644 --- a/trunk/CardSaveDataMover/body/OMakefile +++ b/trunk/CardSaveDataMover/body/OMakefile @@ -57,7 +57,7 @@ CTR_BANNER_SPEC = banner_null_icon.bsf #Cia o[W:}X^OɍXV邱 #W[rsfŎw(Remasterversion) -MAKECIAFLAGS = -minor 0 -micro 9 +MAKECIAFLAGS = -minor 0 -micro 10 include $(ROOT_OMAKE)/modulerules diff --git a/trunk/CardSaveDataMover/body/source/main.cpp b/trunk/CardSaveDataMover/body/source/main.cpp index 81a41ad..90e60b1 100644 --- a/trunk/CardSaveDataMover/body/source/main.cpp +++ b/trunk/CardSaveDataMover/body/source/main.cpp @@ -20,6 +20,7 @@ //#include #include #include +#include #include #include #include @@ -1086,6 +1087,15 @@ void WaitUI() CheckSysBreak();//中断処理 + int i = nn::ndm::GetDaemonStatus( nn::ndm::DN_CEC ); + if (i !=3 )NN_LOG("DN_CEC %d\n",i); + i = nn::ndm::GetDaemonStatus( nn::ndm::DN_BOSS ); + if (i !=3 )NN_LOG("DN_BOSS %d\n",i); + i = nn::ndm::GetDaemonStatus( nn::ndm::DN_NIM ); + if (i !=3 )NN_LOG("DN_NIM %d\n",i); + i = nn::ndm::GetDaemonStatus( nn::ndm::DN_FRIENDS ); + if (i !=3 )NN_LOG("DN_FRIENDS %d\n",i); + //挿抜を検知したら中断して抜ける //トップ以外ではトップメニューへ戻るようする if (ejectEvnt.TryWait()){ @@ -1148,6 +1158,7 @@ void nnMain() //DEA-SUPにて推奨のフリーズ暫定対策:無線デーモンを停止 (2011.3.1 現在) //ただし、スリープ時は止まらない //心配なら本体スイッチで切っとく + nn::ndm::Initialize(); nn::ndm::SuspendScheduler(); //中断処理の準備