From 3d20d57c64c49780a1f9ee657b9db371e5ae6bc4 Mon Sep 17 00:00:00 2001
From: kamikawa <kamikawa@b08762b0-b915-fc4b-9d8c-17b2551a87ff>
Date: Tue, 15 Jul 2008 06:22:00 +0000
Subject: [PATCH] =?UTF-8?q?share=E3=83=95=E3=82=A1=E3=82=A4=E3=83=AB?=
 =?UTF-8?q?=E3=81=8C=E8=A6=8B=E3=81=A4=E3=81=8B=E3=82=89=E3=81=AA=E3=81=8B?=
 =?UTF-8?q?=E3=81=A3=E3=81=9F=E5=A0=B4=E5=90=88=E3=81=AE=E5=87=A6=E7=90=86?=
 =?UTF-8?q?=E3=82=92=E4=BF=AE=E6=AD=A3=E3=80=82=20share=E3=83=87=E3=83=BC?=
 =?UTF-8?q?=E3=82=BF=E3=81=AE=E3=83=95=E3=82=A9=E3=83=BC=E3=83=9E=E3=83=83?=
 =?UTF-8?q?=E3=83=88=E9=96=A2=E6=95=B0=E3=82=92FATFS=E9=96=A2=E6=95=B0?=
 =?UTF-8?q?=E3=81=8B=E3=82=89FS=E9=96=A2=E6=95=B0=E3=81=B8=E5=A4=89?=
 =?UTF-8?q?=E6=9B=B4=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@1895 b08762b0-b915-fc4b-9d8c-17b2551a87ff
---
 .../libraries_sysmenu/namut/ARM9/src/namut.c  | 29 +++++--------------
 1 file changed, 8 insertions(+), 21 deletions(-)

diff --git a/build/libraries_sysmenu/namut/ARM9/src/namut.c b/build/libraries_sysmenu/namut/ARM9/src/namut.c
index d8b7b87e..001d0a58 100644
--- a/build/libraries_sysmenu/namut/ARM9/src/namut.c
+++ b/build/libraries_sysmenu/namut/ARM9/src/namut.c
@@ -522,7 +522,6 @@ static BOOL NAMUTi_MountAndFormatOtherTitleSaveData(u64 titleID, const char *arc
         OS_TWarning("Allocation failed. (%d)\n");
 		return FALSE;
 	}
-	MI_CpuClear8( pWork, sizeof(FSFATFSArchiveWork) );
 
     // マウント試行。
     result = FSi_MountSpecialArchive(titleID, arcname, pWork);
@@ -587,7 +586,6 @@ static BOOL NAMUTi_InitShareData(void)
         OS_TWarning("Allocation failed. (%d)\n");
 		return FALSE;
 	}
-	MI_CpuClear8( pWork, sizeof(FSFATFSArchiveWork) );
 
 	for (i=0;i<NAMUT_SHARE_ARCHIVE_MAX;i++)
 	{
@@ -595,9 +593,9 @@ static BOOL NAMUTi_InitShareData(void)
 		STD_TSNPrintf(path, NAM_PATH_LEN, "nand:/shared2/000%d", i);
 		if (NAMUTi_RandClearFile(path) == FALSE)
 		{
-			// ファイルが存在しないものとみなし終了
+			// ファイルが存在しないものとみなす
 	        OS_TPrintf("%s is not exist\n", path);
-			break;
+			continue;
 		}
 
 	    // マウント
@@ -609,23 +607,13 @@ static BOOL NAMUTi_InitShareData(void)
 			continue;
 	    }
 
-        // Mediaフォーマット
-        if (!FATFSi_FormatMedia("share:/"))
-        {
+		// 再フォーマット
+		result = FSi_FormatSpecialArchive("share:/");
+		if (result != FS_RESULT_SUCCESS)
+		{
 			succeeded = FALSE;
-            OS_TWarning("FATFSi_FormatMedia failed. (%d)\n", FATFS_GetLastError());
-			FSi_MountSpecialArchive(0, NULL, pWork);
-			continue;
-        }
-
-		// Driveフォーマット
-        if (!FATFS_FormatDrive("share:/"))
-        {
-			succeeded = FALSE;
-            OS_TWarning("FATFS_FormatDrive failed. (%d)\n", FATFS_GetLastError());
-			FSi_MountSpecialArchive(0, NULL, pWork);
-			continue;
-        }
+	        OS_TWarning("FSi_MountSpecialArchive failed. (%d)\n", result);
+		}
 
 		// アンマウント
 		result = FSi_MountSpecialArchive((OSTitleId)i, NULL, pWork);
@@ -633,7 +621,6 @@ static BOOL NAMUTi_InitShareData(void)
 		{
 			succeeded = FALSE;
             OS_TWarning("FSi_MountSpecialArchive failed. (%d)\n", result);
-			continue;
 		}
 	}