diff --git a/build/components/hyena.TWL/src/main.c b/build/components/hyena.TWL/src/main.c index 182be191..83c22aea 100644 --- a/build/components/hyena.TWL/src/main.c +++ b/build/components/hyena.TWL/src/main.c @@ -95,9 +95,8 @@ TwlSpMain(void) OSHeapHandle heapHandle; { - SCFG_SetJtagControl(TRUE,TRUE,FALSE);//JTAG Enable - //*((u32 *)0x04000300) = 2; - while(1){} + *((u16 *)0x04004006) = *((u16 *)0x04004006) || 0x0102; + //SCFG_SetJtagControl(TRUE,TRUE,FALSE);//JTAG Enable } // SYSMワークのクリア diff --git a/build/systemMenu_RED/Launcher/ARM9/src/main.c b/build/systemMenu_RED/Launcher/ARM9/src/main.c index 02093a62..7b9989e5 100644 --- a/build/systemMenu_RED/Launcher/ARM9/src/main.c +++ b/build/systemMenu_RED/Launcher/ARM9/src/main.c @@ -66,17 +66,9 @@ void TwlMain( void ) // デバグ用 ResetParam debugresetparam; - ResetParam debugresetparam2; + MI_CpuCopy32 ( SYSMi_GetResetParamAddr(), &debugresetparam, sizeof(ResetParam) ); - /* - SYSMi_GetResetParamAddr()->body.v1.bootTitleID = 0x000100015445534d; - MI_CpuCopyFast( SYSM_RESET_PARAM_MAGIC_CODE, (char *)&SYSMi_GetResetParamAddr()->header.magicCode, SYSM_RESET_PARAM_MAGIC_CODE_LEN); - DC_FlushAll(); - DC_WaitWriteBufferEmpty( ); - MI_CpuCopy32 ( SYSMi_GetResetParamAddr(), &debugresetparam2, sizeof(ResetParam) ); - */ - // システムメニュー初期化---------- SYSM_Init( Alloc, Free ); // OS_Initの前でコール。 @@ -168,14 +160,6 @@ void TwlMain( void ) PrintfSJIS( 30, 134, TXT_COLOR_RED, "bootTitleID:0x%llx", debugresetparam.body.v1.bootTitleID ); break; case LOAD_START: - - SYSMi_GetResetParamAddr()->body.v1.bootTitleID = 0x000100015445534d; - MI_CpuCopyFast( SYSM_RESET_PARAM_MAGIC_CODE, (char *)&SYSMi_GetResetParamAddr()->header.magicCode, SYSM_RESET_PARAM_MAGIC_CODE_LEN); - DC_FlushAll(); - DC_WaitWriteBufferEmpty(); - // デバグ用 never return. - ResetHardware(); - SYSM_StartLoadTitle( pBootTitle ); state = LOADING; diff --git a/build/systemMenu_RED/MachineSettings/ARM9/src/MachineSetting.c b/build/systemMenu_RED/MachineSettings/ARM9/src/MachineSetting.c index 633a132e..82e91cde 100644 --- a/build/systemMenu_RED/MachineSettings/ARM9/src/MachineSetting.c +++ b/build/systemMenu_RED/MachineSettings/ARM9/src/MachineSetting.c @@ -186,17 +186,16 @@ void MachineSettingInit( void ) #include static void ResetHardware( NAMTitleId id, BootFlags *flag) { - /* // リセットパラメータの設定 - SYSMi_GetResetParamAddr()->body.v1.bootTitleID = 0x1234567887654321; + SYSMi_GetResetParamAddr()->body.v1.bootTitleID = 0x0; //SYSMi_GetResetParamAddr()->body.v1.flags = *flag; SYSMi_GetResetParamAddr()->body.v1.flags = (BootFlags){TRUE, 0, TRUE, FALSE, FALSE, FALSE, 0}; MI_CpuCopyFast( SYSM_RESET_PARAM_MAGIC_CODE, (char *)&SYSMi_GetResetParamAddr()->header.magicCode, SYSM_RESET_PARAM_MAGIC_CODE_LEN); SYSMi_GetResetParamAddr()->header.bodyLength = sizeof(ResetParamBody); SYSMi_GetResetParamAddr()->header.crc16 = SVC_GetCRC16( 65535, &SYSMi_GetResetParamAddr()->body, SYSMi_GetResetParamAddr()->header.bodyLength ); - DC_FlushAll(); - */ + DC_WaitWriteBufferEmpty(); + // リセット命令発行 PM_ForceToResetHardware(); OS_Terminate();