From 187c212bc6f91c4f3c530c52176595f90671dd0b Mon Sep 17 00:00:00 2001 From: nakasima Date: Fri, 29 Feb 2008 10:11:55 +0000 Subject: [PATCH] =?UTF-8?q?SDK=E3=83=87=E3=83=A2=E3=81=A7=E3=81=AF?= =?UTF-8?q?=E3=82=AB=E3=83=BC=E3=83=89=E3=82=BB=E3=82=AD=E3=83=A5=E3=82=A2?= =?UTF-8?q?=E9=A0=98=E5=9F=9F=E3=81=8C0=E3=83=91=E3=83=87=E3=82=A3?= =?UTF-8?q?=E3=83=B3=E3=82=B0=E3=81=95=E3=82=8C=E3=81=A6=E3=81=84=E3=82=8B?= =?UTF-8?q?=E3=81=A0=E3=81=91=E3=81=A7=E5=BF=85=E3=81=9A=E8=A4=87=E5=90=88?= =?UTF-8?q?=E5=8C=96=E3=81=AB=E5=A4=B1=E6=95=97=E3=81=99=E3=82=8B=E3=81=9F?= =?UTF-8?q?=E3=82=81=E3=82=A8=E3=83=A9=E3=83=BC=E3=81=AB=E3=81=AF=E3=81=97?= =?UTF-8?q?=E3=81=AA=E3=81=84=E3=80=82=20=E3=82=AB=E3=83=BC=E3=83=89?= =?UTF-8?q?=E3=83=90=E3=83=8A=E3=83=BC=E3=82=92=E5=91=BC=E3=82=93=E3=81=A0?= =?UTF-8?q?=E3=82=891st=E3=83=81=E3=82=A7=E3=83=83=E3=82=AF=E5=AE=8C?= =?UTF-8?q?=E4=BA=86=E3=81=AB=E3=81=99=E3=82=8B=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit git-svn-id: file:///Users/lillianskinner/Downloads/platinum/twl/TwlIPL/trunk@772 b08762b0-b915-fc4b-9d8c-17b2551a87ff --- build/libraries_sysmenu/hotsw/ARM7/src/hotsw.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/build/libraries_sysmenu/hotsw/ARM7/src/hotsw.c b/build/libraries_sysmenu/hotsw/ARM7/src/hotsw.c index 343f7267..8dd300cd 100644 --- a/build/libraries_sysmenu/hotsw/ARM7/src/hotsw.c +++ b/build/libraries_sysmenu/hotsw/ARM7/src/hotsw.c @@ -447,8 +447,7 @@ static HotSwState LoadCardData(void) retval = (retval == HOTSW_SUCCESS) ? state : retval; // ARM9常駐モジュールの先頭2KBの暗号化領域を複合化 - state = DecryptObjectFile(); - retval = (retval == HOTSW_SUCCESS) ? state : retval; + (void)DecryptObjectFile(); // 認証コード読み込み＆ワーク領域にコピー state = CheckCardAuthCode(); @@ -512,6 +511,7 @@ static HotSwState LoadBannerData(void) SYSMi_GetWork()->flags.hotsw.isValidCardBanner = FALSE; SYSMi_GetWork()->flags.hotsw.isExistCard = TRUE; SYSMi_GetWork()->flags.hotsw.isCardStateChanged = TRUE; + SYSMi_GetWork()->flags.hotsw.is1stCardChecked = TRUE; return retval; } @@ -519,8 +519,9 @@ static HotSwState LoadBannerData(void) // バナーリードが成功していたら各種フラグTRUE その他の場合はFALSE (この関数の外で排他制御されているからここでは排他制御しないでOK) state = (retval == HOTSW_SUCCESS) ? TRUE : FALSE; SYSMi_GetWork()->flags.hotsw.isValidCardBanner = state; - SYSMi_GetWork()->flags.hotsw.isCardStateChanged = (u8)state; - SYSMi_GetWork()->flags.hotsw.isExistCard = state; + SYSMi_GetWork()->flags.hotsw.isCardStateChanged = (u8)state; + SYSMi_GetWork()->flags.hotsw.isExistCard = state; + SYSMi_GetWork()->flags.hotsw.is1stCardChecked = TRUE; return retval; }