From 2beb4ad7b1aeed6e5b56b9dcfae27ad96005ae3f Mon Sep 17 00:00:00 2001
From: kamikawa <kamikawa@b08762b0-b915-fc4b-9d8c-17b2551a87ff>
Date: Tue, 20 May 2008 04:34:01 +0000
Subject: [PATCH] =?UTF-8?q?SD=E3=82=AB=E3=83=BC=E3=83=89=E3=81=AE=E3=83=AB?=
 =?UTF-8?q?=E3=83=BC=E3=83=88=E3=81=AB=E8=A8=AD=E5=AE=9A=E3=83=95=E3=82=A1?=
 =?UTF-8?q?=E3=82=A4=E3=83=AB=20nandinitializer.ini=20=E3=82=92=E7=94=A8?=
 =?UTF-8?q?=E6=84=8F=E3=81=97=E3=81=A6=E3=81=8A=E3=81=8F=E3=81=93=E3=81=A8?=
 =?UTF-8?q?=E3=81=A7=E3=82=AA=E3=83=BC=E3=83=88=E5=88=9D=E6=9C=9F=E5=8C=96?=
 =?UTF-8?q?=E6=99=82=E3=81=AE=20=E3=83=AA=E3=83=BC=E3=82=B8=E3=83=A7?=
 =?UTF-8?q?=E3=83=B3=E5=8F=8A=E3=81=B3=E5=BC=B7=E5=88=B6=E3=83=AF=E3=82=A4?=
 =?UTF-8?q?=E3=83=A4=E3=83=AC=E3=82=B9=E3=82=AA=E3=83=97=E3=82=B7=E3=83=A7?=
 =?UTF-8?q?=E3=83=B3=E3=82=92=E6=8C=87=E5=AE=9A=E5=8F=AF=E8=83=BD=E3=81=AB?=
 =?UTF-8?q?=E3=81=AA=E3=82=8A=E3=81=BE=E3=81=97=E3=81=9F=E3=80=82=20nandin?=
 =?UTF-8?q?itializer.ini=20=E3=81=AE=E3=83=95=E3=82=A9=E3=83=BC=E3=83=9E?=
 =?UTF-8?q?=E3=83=83=E3=83=88=E3=81=AB=E3=81=A4=E3=81=84=E3=81=A6=E3=81=AF?=
 =?UTF-8?q?=20NandInitializer=E3=81=AE=E5=88=86=E9=A1=9E=E3=81=AB=E3=81=A4?=
 =?UTF-8?q?=E3=81=84=E3=81=A6.txt=20=E3=82=92=E5=8F=82=E7=85=A7=E3=81=97?=
 =?UTF-8?q?=E3=81=A6=E3=81=8F=E3=81=A0=E3=81=95=E3=81=84=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@1416 b08762b0-b915-fc4b-9d8c-17b2551a87ff
---
 .../ARM9.TWL/src/process_hw_info.c            | 130 ++++++++++++++++--
 docs/NandInitializerの分類について.txt        |   8 ++
 2 files changed, 129 insertions(+), 9 deletions(-)

diff --git a/build/systemMenu_tools/NandInitializerRed/ARM9.TWL/src/process_hw_info.c b/build/systemMenu_tools/NandInitializerRed/ARM9.TWL/src/process_hw_info.c
index 3d5abae8..a708b600 100644
--- a/build/systemMenu_tools/NandInitializerRed/ARM9.TWL/src/process_hw_info.c
+++ b/build/systemMenu_tools/NandInitializerRed/ARM9.TWL/src/process_hw_info.c
@@ -60,11 +60,17 @@ enum {
 #define CURSOR_ORIGIN_X      32
 #define CURSOR_ORIGIN_Y      40
 
+#define NANDINITIALIZER_SETTING_FILE_PATH_IN_SD  "sdmc:/nandinitializer.ini"
+
+#define ROUND_UP(value, alignment) \
+    (((u32)(value) + (alignment-1)) & ~(alignment-1))
+
 /*---------------------------------------------------------------------------*
     �����ϐ���`
  *---------------------------------------------------------------------------*/
 
-static s8 sMenuSelectNo;
+static s8   sMenuSelectNo;
+static BOOL sWirelessForceOff;
 
 /*---------------------------------------------------------------------------*
     �����֐��錾
@@ -73,11 +79,7 @@ static s8 sMenuSelectNo;
 static BOOL WriteHWNormalInfoFile( void );
 static BOOL WriteHWSecureInfoFile( u8 region );
 //static BOOL DeleteHWInfoFile( void );
-
-const LCFGTWLHWNormalInfo *LCFG_THW_GetDefaultNormalInfo( void );
-const LCFGTWLHWSecureInfo *LCFG_THW_GetDefaultSecureInfo( void );
-const LCFGTWLHWNormalInfo *LCFG_THW_GetNormalInfo( void );
-const LCFGTWLHWSecureInfo *LCFG_THW_GetSecureInfo( void );
+static BOOL GetNandInitializerSetting(u8* region, u8* wireless);
 
 /*---------------------------------------------------------------------------*
     �v���Z�X�֐���`
@@ -157,7 +159,6 @@ void* HWInfoProcess1(void)
 	// �I�[�g���s�p
 	if (gAutoFlag)
 	{
-		sMenuSelectNo = 0;
 		return HWInfoProcess2;
 	}
 #endif
@@ -204,6 +205,24 @@ void* HWInfoProcess2(void)
 	int i;
 	BOOL result;
 
+#ifndef NAND_INITIALIZER_LIMITED_MODE
+	// �I�[�g���s�p
+	if (gAutoFlag)
+	{
+		// SD�J�[�h��nandinitializer.ini���ݒ���擾
+		if (!GetNandInitializerSetting((u8 *)&sMenuSelectNo, (u8 *)&sWirelessForceOff))
+		{
+			// �ݒ�̎擾�Ɏ��s�����ꍇ�̓f�t�H���g�ݒ�(REGION_JAPAN/WIRELESS_ENABLE)
+			sMenuSelectNo = 0;
+			sWirelessForceOff = FALSE;
+		}
+	}
+	else
+#endif
+	{
+		sWirelessForceOff = LCFG_THW_IsForceDisableWireless();
+	}
+
 	switch( sMenuSelectNo )
 	{
 	case MENU_REGION_JAPAN:
@@ -212,8 +231,8 @@ void* HWInfoProcess2(void)
 	case MENU_REGION_AUSTRALIA:
 	case MENU_REGION_CHINA:
 	case MENU_REGION_KOREA:
-		OS_TPrintf( "Write Start.\n" );
-		result = WriteHWInfoFile( (u8)sMenuSelectNo, LCFG_THW_IsForceDisableWireless() );
+
+		result = WriteHWInfoFile( (u8)sMenuSelectNo, sWirelessForceOff );
 
 		// �S���[�W�����̌��ʂ��N���A
 		for (i=0;i<NUM_OF_MENU_SELECT;i++)
@@ -396,3 +415,96 @@ void UpdateNandBoxCount( void )
     }
 }
 
+/*---------------------------------------------------------------------------*
+  Name:         GetNandInitializerSetting
+
+  Description:  SD�J�[�h��nandinitializer.ini�̐ݒ���m�F���܂�
+
+  Arguments:    None.
+
+  Returns:      None.
+ *---------------------------------------------------------------------------*/
+static BOOL GetNandInitializerSetting(u8* region, u8* wireless)
+{
+    FSFile  file;	
+    BOOL    open_is_ok;
+	BOOL    read_is_ok;
+	void* pTempBuf;
+	char* pStr;
+	u8    temp_region;
+	u8    temp_wireless;
+	u32 file_size;
+	u32 alloc_size;
+
+	// ROM�t�@�C���I�[�v��
+    FS_InitFile(&file);
+    open_is_ok = FS_OpenFile(&file, NANDINITIALIZER_SETTING_FILE_PATH_IN_SD);
+	if (!open_is_ok)
+	{
+    	OS_Printf("%s is not exist.\n", NANDINITIALIZER_SETTING_FILE_PATH_IN_SD);
+		return FALSE;
+	}
+
+	// ROM�t�@�C�����[�h
+	file_size  = FS_GetFileLength(&file) ;
+	alloc_size = ROUND_UP(file_size, 32) ;
+	pTempBuf = OS_Alloc( alloc_size );
+	SDK_NULL_ASSERT(pTempBuf);
+	DC_InvalidateRange(pTempBuf, alloc_size);
+	read_is_ok = FS_ReadFile( &file, pTempBuf, (s32)file_size );
+	if (!read_is_ok)
+	{
+	    OS_Printf("%s could not be read.\n", NANDINITIALIZER_SETTING_FILE_PATH_IN_SD);
+		FS_CloseFile(&file);
+		OS_Free(pTempBuf);
+		return FALSE;
+	}
+
+	// ROM�t�@�C���N���[�Y
+	FS_CloseFile(&file);
+
+	// REGION: ��ǂݎ��
+	pStr = STD_SearchString( pTempBuf, "REGION:");
+	if (pStr == NULL)
+	{
+		OS_Free(pTempBuf);
+		return FALSE;
+	}
+
+	pStr += STD_GetStringLength("REGION:");
+	temp_region = (u8)(*pStr - '0');
+
+	if (OS_TWL_REGION_JAPAN <= temp_region && temp_region < OS_TWL_REGION_MAX)
+	{
+		*region = temp_region;
+	}
+	else
+	{
+		OS_Free(pTempBuf);
+		return FALSE;		
+	}
+
+	// �������C�����XOFF�ݒ��ǂݎ��
+	pStr = STD_SearchString( pTempBuf, "WIRELESS_FORCE_OFF:");
+	if (pStr == NULL)
+	{
+		OS_Free(pTempBuf);
+		return FALSE;
+	}
+
+	pStr += STD_GetStringLength("WIRELESS_FORCE_OFF:");
+	temp_wireless = (u8)(*pStr - '0');
+
+	if (0 <= temp_wireless && temp_wireless <= 1)
+	{ 
+		*wireless = temp_wireless; 
+	}
+	else
+	{
+		OS_Free(pTempBuf);
+		return FALSE;
+	}
+
+	OS_Free(pTempBuf);
+	return TRUE;
+}
diff --git a/docs/NandInitializerの分類について.txt b/docs/NandInitializerの分類について.txt
index 38b90057..65ea89d7 100644
--- a/docs/NandInitializerの分類について.txt
+++ b/docs/NandInitializerの分類について.txt
@@ -55,6 +55,14 @@
 4. IMPORT TAD FROM SD      -> OVERWRITE ALL
 5. IMPORT NANDFIRM FROM SD -> �ŏ��Ɍ��‚���*.nand�t�@�C��
 
+�� SD�J�[�h�̃��[�g��nandinitializer.ini�Ƃ����t�@�C����p�ӂ��邱�Ƃ�
+   ����������ۂ� Region �� ���C�����X�ݒ���w�肷�邱�Ƃ��ł��܂��B
+   nandinitializer.ini �̃t�H�[�}�b�g�͈ȉ��̂Ƃ���ł��B
+
+--- �������� ----
+REGION:0               //(0:JAPAN, 1:AMERICA, 2:EUROPE, 3:AUSTRALIA, 4:CHINA, 5:KOREA)
+WIRELESS_FORCE_OFF:0   //(0:Wireless Enable, 1:Wireless Disable)
+--- �����܂� ----
 
 �`�`�` NandInitializer �`�`�`