rvtr/TwlIPL
1
Fork 0
mirror of https://github.com/rvtr/TwlIPL.git synced 2025-10-31 06:01:12 -04:00
Code Issues Actions Packages Projects Releases Wiki Activity

・ランチャ画面に挿されたカードのカードIDを表示するように変更

Browse Source 
・文字コードに問題がある部分を修正

git-svn-id: file:///Users/lillianskinner/Downloads/platinum/twl/TwlIPL/branches/20130213_card_id@3069 b08762b0-b915-fc4b-9d8c-17b2551a87ff
This commit is contained in:
N2205 2013-02-13 08:37:01 +00:00
parent adc966102b
commit d8f463bfa5
4 changed files with 24 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
build/libraries_sysmenu/hotsw/ARM7/src/hotsw.c
View File

@ -399,6 +399,8 @@ static HotSwState LoadCardData(void)
state = ReadIDNormal(&s_cbData);
retval = (retval == HOTSW_SUCCESS) ? state : retval;
SYSMi_GetWork()->flags.hotsw.id_n = s_cbData.id_nml;
// カードタイプを判別をして、使う関数を切替える IDの最上位ビットが1なら3DM
s_cbData.cardType = (s_cbData.id_nml & HOTSW_ROMID_1TROM_MASK) ? DS_CARD_TYPE_2 : DS_CARD_TYPE_1;
@ -554,6 +556,8 @@ static HotSwState LoadCardData(void)
// カードIDの比較をして、一致しなければFALSEを返す
{
u32 secure_ID = (s_cbData.modeType == HOTSW_MODE1) ? s_cbData.id_scr : s_cbData.id_scr2;
SYSMi_GetWork()->flags.hotsw.id_g = s_cbData.id_gam;
if(secure_ID != s_cbData.id_gam){
retval = (retval == HOTSW_SUCCESS) ? HOTSW_ID_CHECK_ERROR : retval;
@ -694,6 +698,8 @@ static HotSwState ReadSecureModeCardData(void)
// カードIDの比較をして、一致しなければFALSEを返す
secure_ID = (s_cbData.modeType == HOTSW_MODE1) ? s_cbData.id_scr : s_cbData.id_scr2;
SYSMi_GetWork()->flags.hotsw.id_s = secure_ID;
if(s_cbData.id_nml != secure_ID){
retval = (retval == HOTSW_SUCCESS) ? HOTSW_ID_CHECK_ERROR : retval;
}
@ -1761,6 +1767,10 @@ static void PulledOutSequence(void)
s_isPulledOut = TRUE;
s_gameID = 0;
SYSMi_GetWork()->flags.hotsw.id_n = 0;
SYSMi_GetWork()->flags.hotsw.id_s = 0;
SYSMi_GetWork()->flags.hotsw.id_g = 0;
// ワンセグのスリープ時シャットダウン対策を戻す
MCU_EnableDeepSleepToPowerLine( MCU_PWR_LINE_33, TRUE );

2
build/libraries_sysmenu/sysmenu/ARM9/src/title.c
View File

@ -2253,7 +2253,7 @@ static void SYSMi_makeTitleIdList( void )
list->sameMakerFlag[count/8] |= (u8)(0x1 << (count%8));
}
// ジャンプ可能フラグON or ブートアプリ自身 or ジャンプ元アプリ ならばジャンプ可能
// ジャンプ可能フラグON or ブートアプリ自身 or ジャンプ元アプリ ならばジャンプ可能
if( pe_hs->permit_landing_normal_jump || hs->titleID == id ||
( SYSMi_GetWork()->flags.arm7.isValidLauncherParam && SYSM_GetLauncherParamBody()->v1.bootTitleID && ( SYSM_GetLauncherParamBody()->v1.prevTitleID == id ) )
)

13
build/systemMenu_RED/Launcher/ARM9/src/launcher.c
View File

@ -619,6 +619,13 @@ static TitleProperty *ProcessPads( TitleProperty *pTitleList )
PutStringUTF16( 0, 175, TXT_COLOR_RED, L"HotSw Disable" );
}
}
NNS_G2dCharCanvasClearArea( &gCanvas, TXT_COLOR_NULL, 0, 70, 100, 100 );
PrintfSJIS( 0, 85, TXT_COLOR_GREEN, "GmCmd:%x", SYSMi_GetWork()->gameCommondParam );
PrintfSJIS( 0, 100, TXT_COLOR_GREEN, "IDn:%x", SYSMi_GetWork()->flags.hotsw.id_n );
PrintfSJIS( 0, 115, TXT_COLOR_GREEN, "IDs:%x", SYSMi_GetWork()->flags.hotsw.id_s );
PrintfSJIS( 0, 130, TXT_COLOR_GREEN, "IDg:%x", SYSMi_GetWork()->flags.hotsw.id_g );
return ret;
}
@ -782,12 +789,12 @@ static void DrawScrollBar( TitleProperty *pTitleList )
PutStringUTF16( (int)(BAR_ZERO_X + l * (ITEM_SIZE + ITEM_INTERVAL)),
BAR_ZERO_Y,
(pTitleList[l].flags.isValid ? (TXT_UCOLOR_G0 + colc_cold) : TXT_COLOR_BLACK),
(const u16 *)L"・" );
L"\x30FB" );
}
for(l=0; l<4; l++)
{
oldx = (int)(bar_left - l%2);
PutStringUTF16( oldx, BAR_ZERO_Y - l/2, TXT_UCOLOR_G1, (const u16 *)L"□" );
PutStringUTF16( oldx, BAR_ZERO_Y - l/2, TXT_UCOLOR_G1, L"\x25A1" );
}
}
@ -864,7 +871,7 @@ static void DrawBackLightSwitch(void)
NNS_G2dCharCanvasClearArea( &gCanvas, TXT_COLOR_NULL, B_LIGHT_DW_BUTTON_TOP_X + 24, B_LIGHT_DW_BUTTON_TOP_Y, 40, 13 );
PutStringUTF16( B_LIGHT_DW_BUTTON_TOP_X, B_LIGHT_DW_BUTTON_TOP_Y, TXT_COLOR_RED,
L"\xE01c　　　\xE01b" );
L"\xE01c \xE01b" );
PrintfSJIS( B_LIGHT_DW_BUTTON_TOP_X + 11, B_LIGHT_DW_BUTTON_TOP_Y, TXT_COLOR_RED,
"BL:%2d\n", brightness );
}

3
include/sysmenu/sysmenu_lib/common/sysmenu_work.h
View File

@ -127,6 +127,9 @@ typedef struct SYSM_work {
vu8 isCardStateChanged; // カード状態更新フラグ
vu8 isBusyHotSW; // 活線挿抜処理中？
vu8 isKeyTableLoadReady; // Key Tableのロード準備完了？
vu32 id_n;
vu32 id_s;
vu32 id_g;
}hotsw;
}flags; // 9B