From 6743c532cb87b1a04143585590bd44efbc9223ce Mon Sep 17 00:00:00 2001
From: kamikawa <kamikawa@b08762b0-b915-fc4b-9d8c-17b2551a87ff>
Date: Thu, 12 Jun 2008 08:41:02 +0000
Subject: [PATCH] =?UTF-8?q?system=5Ftools=20=E3=83=84=E3=83=BC=E3=83=AB?=
 =?UTF-8?q?=E7=BE=A4=E3=81=AE=E3=81=9F=E3=82=81=E3=81=AB=20NAMUT=5FUpdateS?=
 =?UTF-8?q?oftBoxCount=20=E3=82=92=E5=BE=A9=E6=B4=BB=E3=81=95=E3=81=9B?=
 =?UTF-8?q?=E3=81=BE=E3=81=97=E3=81=9F=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@1620 b08762b0-b915-fc4b-9d8c-17b2551a87ff
---
 .../libraries_sysmenu/namut/ARM9/src/namut.c  | 78 +++++++++++--------
 1 file changed, 45 insertions(+), 33 deletions(-)

diff --git a/build/libraries_sysmenu/namut/ARM9/src/namut.c b/build/libraries_sysmenu/namut/ARM9/src/namut.c
index 1ba188a3..7303c698 100644
--- a/build/libraries_sysmenu/namut/ARM9/src/namut.c
+++ b/build/libraries_sysmenu/namut/ARM9/src/namut.c
@@ -567,46 +567,58 @@ static BOOL NAMUTi_RandClearFile(const char* path)
  *---------------------------------------------------------------------------*/
 BOOL NAMUT_GetSoftBoxCount( u8* installed, u8* free )
 {
-	s32 title_num;	
-	NAMTitleInfo namTitleInfo;
-	u8 count = 0;
-	BOOL result = TRUE;
-	s32 i;
+	u32 installedSoftBoxCount;
 
-	// タイトルリスト取得
-	if (NAM_GetTitleList(sTitleIdArray, TITLE_LIST_MAX) != NAM_OK)
-	{
-		OS_TWarning("Fail! NAM_GetTitleList() in %s\n", __func__);
+	// installedSoftBoxCountの取得
+	if ( NAM_OK != NAM_GetInstalledSoftBoxCount( &installedSoftBoxCount ) ) {
 		return FALSE;
 	}
-	
-	// タイトル数取得
-	title_num = NAM_GetNumTitles();
-
-	for (i=0;i<title_num;i++)
-	{
-		// タイトル情報取得
-	    if( NAM_ReadTitleInfo(&namTitleInfo, sTitleIdArray[i]) == NAM_OK )
-	    {
-			// NOT_LAUNCH_FLAG または DATA_ONLY_FLAG が立っているタイトルはカウントしない
-			if (!(namTitleInfo.titleId & (TITLE_ID_NOT_LAUNCH_FLAG_MASK | TITLE_ID_DATA_ONLY_FLAG_MASK)))
-			{
-				count++;
-			}
-		}
-		else
-		{
-			result = FALSE;
-		}
-	}
 
     // installed count
-    *installed = count;
+    *installed = (u8)installedSoftBoxCount;
 
     // free count
-    *free = (u8)(LCFG_TWL_FREE_SOFT_BOX_COUNT_MAX - count);
+    *free = (u8)(LCFG_TWL_FREE_SOFT_BOX_COUNT_MAX - installedSoftBoxCount);
 
-	return result;
+	return TRUE;
+}
+
+/*---------------------------------------------------------------------------*
+  Name:         NAMUT_UpdateSoftBoxCount
+
+  Description:  InstalledSoftBoxCount, FreeSoftBoxCount の値を
+				現在のNANDの状態に合わせて更新します。
+
+  Arguments:    None.
+
+  Returns:      成功ならTRUE
+ *---------------------------------------------------------------------------*/
+BOOL NAMUT_UpdateSoftBoxCount( void )
+{
+	u8 installedSoftBoxCount;
+	u8 freeSoftBoxCount;
+	u8 *pBuffer;
+	BOOL retval = TRUE;
+
+	// InstalledSoftBoxCount, FreeSoftBoxCount を数えなおす
+	if (!NAMUT_GetSoftBoxCount(&installedSoftBoxCount, &freeSoftBoxCount))
+	{
+		return FALSE;
+	}
+
+	// LCFGライブラリの静的変数に対する更新
+    LCFG_TSD_SetInstalledSoftBoxCount( installedSoftBoxCount );	
+    LCFG_TSD_SetFreeSoftBoxCount( freeSoftBoxCount );
+
+	// LCFGライブラリの静的変数の値をNANDに反映
+    pBuffer = spAllocFunc( LCFG_WRITE_TEMP );
+	if (!pBuffer) { return FALSE; }
+	// ミラーリングデータの両方に書き込みを行う。
+	retval &= LCFG_WriteTWLSettings( (u8 (*)[ LCFG_WRITE_TEMP ] )pBuffer );
+	retval &= LCFG_WriteTWLSettings( (u8 (*)[ LCFG_WRITE_TEMP ] )pBuffer );
+    spFreeFunc( pBuffer );
+
+	return retval;
 }
 
 /*---------------------------------------------------------------------------*
@@ -647,7 +659,7 @@ BOOL NAMUT_ClearTWLSettings( BOOL doWriteback )
     	spFreeFunc( pBuffer );
 	}
 
-	return TRUE;
+	return retval;
 }
 
 /*---------------------------------------------------------------------------*