From a57a5629039e7fdb787ae9a1cefb5feb006b80f9 Mon Sep 17 00:00:00 2001
From: yosiokat <yosiokat@b08762b0-b915-fc4b-9d8c-17b2551a87ff>
Date: Wed, 14 Nov 2007 02:56:14 +0000
Subject: [PATCH] =?UTF-8?q?=E3=82=BD=E3=83=BC=E3=82=B9=E6=95=B4=E7=90=86?=
 =?UTF-8?q?=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@168 b08762b0-b915-fc4b-9d8c-17b2551a87ff
---
 .../sysmenu/ARM9/src/sysmenu_card.c               |  6 +++---
 .../sysmenu/ARM9/src/sysmenu_lib.c                |  4 ++++
 .../sysmenu/ARM9/src/sysmenu_util.c               | 15 +++------------
 3 files changed, 10 insertions(+), 15 deletions(-)

diff --git a/build/libraries_sysmenu/sysmenu/ARM9/src/sysmenu_card.c b/build/libraries_sysmenu/sysmenu/ARM9/src/sysmenu_card.c
index 1bc09cdb..317f11b0 100644
--- a/build/libraries_sysmenu/sysmenu/ARM9/src/sysmenu_card.c
+++ b/build/libraries_sysmenu/sysmenu/ARM9/src/sysmenu_card.c
@@ -77,8 +77,8 @@ BOOL SYSM_IsCardPulledOut(void)
 		case CARD_DETECTING:
 				if (SYSMi_IsCardDataReady()) {
 					u32 cardID = *(vu32 *)REG_CARD_DATA;
-					if (cardID != GetSYSMWork()->nCardID
-					  && SYSM_IsNITROCard())
+					if ( ( cardID != GetSYSMWork()->nCardID ) &&
+						 SYSM_IsExistCard() )
 					{
 						cpw.detectPullOut = TRUE;
 					}
@@ -121,7 +121,7 @@ BOOL SYSM_IsDetectingCardPulledOut(void)
 
 BOOL SYSMi_IsDetectableCardPulledOut(void)
 {
-	return  (SYSM_GetBootFlag() & BFLG_LOAD_CARD_COMPLETED ) ? TRUE : FALSE;
+	return  SYSM_IsExistCard();
 }
 
 
diff --git a/build/libraries_sysmenu/sysmenu/ARM9/src/sysmenu_lib.c b/build/libraries_sysmenu/sysmenu/ARM9/src/sysmenu_lib.c
index dfa6fa2e..1a23f2fc 100644
--- a/build/libraries_sysmenu/sysmenu/ARM9/src/sysmenu_lib.c
+++ b/build/libraries_sysmenu/sysmenu/ARM9/src/sysmenu_lib.c
@@ -662,6 +662,10 @@ static void SYSMi_CheckRTC( void )
 	}
 }
 
+BOOL SYSM_IsExistCard( void )
+{
+	return TRUE;
+}
 
 //======================================================================
 //  デバッグ
diff --git a/build/libraries_sysmenu/sysmenu/ARM9/src/sysmenu_util.c b/build/libraries_sysmenu/sysmenu/ARM9/src/sysmenu_util.c
index 06a1f992..03070110 100644
--- a/build/libraries_sysmenu/sysmenu/ARM9/src/sysmenu_util.c
+++ b/build/libraries_sysmenu/sysmenu/ARM9/src/sysmenu_util.c
@@ -130,22 +130,13 @@ u32 SYSM_GetDayNum( u32 year, u32 month )
 	return dayNum;
 }
 
-/*
-u32 SYSM_GetDayNum( u32 year, u32 month )
-{
-	u8 date_tbl[] = { 31, 28, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31};
-	
-	if( ( month == 2 ) && SYSM_IsLeapYear100( year ) ) {
-		return 29;
-	}
-	return date_tbl[ month - 1 ];									// １月から１２月だから１引く
-}
-*/
-
 
 // 簡易うるう年の判定 (うるう年：1、通常の年：0）※RTCのとりうる範2000〜2100年に限定する。
 BOOL SYSM_IsLeapYear100( u32 year )
 {
+	if( ( year < 2000 ) || ( year >= 2100 ) ) {
+		OS_Panic( "year = %d : need 2000 - 2099\n", year );
+	}
 	if( ( year & 0x03 ) || ( year == 100 ) ) {						// うるう年は、「4で割り切れ　かつ　100で割り切れない年」または「400で割り切れる年」
 		return FALSE;
 	}else {