rvtr/TwlIPL
1
Fork 0
mirror of https://github.com/rvtr/TwlIPL.git synced 2025-10-31 06:01:12 -04:00
Code Issues Actions Packages Projects Releases Wiki Activity

(NandInitializer)オートプロセスでのファイルエントリの順番が、生産工程に準じたものになるように、実行プロセスを変更。

Browse Source 
ERRORLOG_Init()を呼び出してsysmenu.logを生成するようにした。

git-svn-id: file:///Users/lillianskinner/Downloads/platinum/twl/TwlIPL/trunk@2763 b08762b0-b915-fc4b-9d8c-17b2551a87ff
This commit is contained in:
aoki_ryoma 2009-03-11 07:05:24 +00:00
parent e8469bbba1
commit a9f5ce559b
8 changed files with 104 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
build/systemMenu_tools/NandInitializerProduction/ARM9.TWL/Makefile
View File

@ -131,7 +131,9 @@ SDK_APPEND_LIBS = \
libnam$(TWL_LIBSUFFIX).a \
libsea$(TWL_LIBSUFFIX).a \
liblcfg$(TWL_LIBSUFFIX).a \
libna$(TWL_LIBSUFFIX).a
libna$(TWL_LIBSUFFIX).a \
liberrorlog$(TWL_LIBSUFFIX).a
LLIBRARIES += $(SYSMENU_LIBS) $(SDK_APPEND_LIBS)

3
build/systemMenu_tools/NandInitializerRed/ARM9.TWL/Makefile
View File

@ -126,7 +126,8 @@ SDK_APPEND_LIBS = \
libnam$(TWL_LIBSUFFIX).a \
libsea$(TWL_LIBSUFFIX).a \
liblcfg$(TWL_LIBSUFFIX).a \
libna$(TWL_LIBSUFFIX).a
libna$(TWL_LIBSUFFIX).a \
liberrorlog$(TWL_LIBSUFFIX).a
LLIBRARIES += $(SYSMENU_LIBS) $(SDK_APPEND_LIBS)

6
build/systemMenu_tools/NandInitializerRed/ARM9.TWL/include/process_auto.h
View File

@ -32,11 +32,15 @@ extern "C" {
enum {
AUTO_PROCESS_MENU_FORMAT = 0,
#ifdef USE_WRITE_VARIOUS_DATA
AUTO_PROCESS_MENU_VARIOUS_DATA_1,
#endif // USE_WRITE_VARIOUS_DATA
#ifndef TWL_CAPTURE_VERSION
AUTO_PROCESS_MENU_HARDWARE_INFO,
#endif // TWL_CAPTURE_VERSION
#ifdef USE_WRITE_VARIOUS_DATA
AUTO_PROCESS_MENU_VARIOUS_DATA,
AUTO_PROCESS_MENU_VARIOUS_DATA_2,
#endif // USE_WRITE_VARIOUS_DATA
AUTO_PROCESS_MENU_IMPORT_TAD,
AUTO_PROCESS_MENU_IMPORT_NANDFIRM,

2
build/systemMenu_tools/NandInitializerRed/ARM9.TWL/include/process_write_data.h
View File

@ -39,6 +39,8 @@ extern "C" {
ŠÖ<EFBFBD>”’è‹`
*---------------------------------------------------------------------------*/
void* WriteDataProcessPre0(void);
void* WriteDataProcessAfter0(void);
void* WriteDataProcess0(void);
void* WriteDataProcess1(void);
void* WriteDataProcess2(void);

16
build/systemMenu_tools/NandInitializerRed/ARM9.TWL/src/process_auto.c
View File

@ -114,15 +114,20 @@ void* AutoProcess1(void)
case AUTO_PROCESS_MENU_FORMAT:
return FormatProcess0;
#ifdef USE_WRITE_VARIOUS_DATA
case AUTO_PROCESS_MENU_VARIOUS_DATA_1:
return WriteDataProcessPre0;
#endif // USE_WRITE_VARIOUS_DATA_1
#ifndef TWL_CAPTURE_VERSION
case AUTO_PROCESS_MENU_HARDWARE_INFO:
return HWInfoProcess0;
#endif // TWL_CAPTURE_VERSION
#ifdef USE_WRITE_VARIOUS_DATA
case AUTO_PROCESS_MENU_VARIOUS_DATA:
return WriteDataProcess0;
#endif // USE_WRITE_VARIOUS_DATA
case AUTO_PROCESS_MENU_VARIOUS_DATA_2:
return WriteDataProcessAfter0;
#endif // USE_WRITE_VARIOUS_DATA_2
#ifdef TWL_CAPTURE_VERSION
@ -187,11 +192,14 @@ void* AutoProcess2(void)
// ƒ<>ƒjƒ…<C692>[ˆê——
kamiFontPrintf(3, line += 2, FONT_COLOR_BLACK, " FORMAT NAND ");
#ifdef USE_WRITE_VARIOUS_DATA
kamiFontPrintf(3, line += 2, FONT_COLOR_BLACK, " WRITE VARIOUS DATA1 ");
#endif // USE_WRITE_VARIOUS_DATA
#ifndef TWL_CAPTURE_VERSION
kamiFontPrintf(3, line += 2, FONT_COLOR_BLACK, " WRITE HARDWARE INFO ");
#endif
#ifdef USE_WRITE_VARIOUS_DATA
kamiFontPrintf(3, line += 2, FONT_COLOR_BLACK, " WRITE VARIOUS DATA ");
kamiFontPrintf(3, line += 2, FONT_COLOR_BLACK, " WRITE VARIOUS DATA2 ");
#endif // USE_WRITE_VARIOUS_DATA
kamiFontPrintf(3, line += 2, FONT_COLOR_BLACK, " INPORT TAD FROM SD ");
kamiFontPrintf(3, line += 2, FONT_COLOR_BLACK, " INPORT NANDFIRM FROM SD");

20
build/systemMenu_tools/NandInitializerRed/ARM9.TWL/src/process_hw_info.c
View File

@ -300,6 +300,16 @@ BOOL WriteHWInfoFile( u8 region, BOOL wirelessForceOff )
u32 installedSoftBoxCount = 0;
BOOL result = TRUE;
// HWID署名ファイルのライト
kamiFontPrintfConsoleEx(CONSOLE_ORANGE, pMsgSignWriting );
if( HWI_WriteHWIDSignFile() ) {
kamiFontPrintfConsoleEx(CONSOLE_ORANGE, pMsgSucceeded );
}else {
kamiFontPrintfConsoleEx(CONSOLE_RED, pMsgFailed );
result = FALSE;
}
// セキュアファイルのライト
kamiFontPrintfConsoleEx(CONSOLE_ORANGE, pMsgSecureWriting );
@ -320,16 +330,6 @@ BOOL WriteHWInfoFile( u8 region, BOOL wirelessForceOff )
result = FALSE;
}
// HWID署名ファイルのライト
kamiFontPrintfConsoleEx(CONSOLE_ORANGE, pMsgSignWriting );
if( HWI_WriteHWIDSignFile() ) {
kamiFontPrintfConsoleEx(CONSOLE_ORANGE, pMsgSucceeded );
}else {
kamiFontPrintfConsoleEx(CONSOLE_RED, pMsgFailed );
result = FALSE;
}
// CFGデータの修正
if (!HWI_ModifyLanguage( region ))
{

2
build/systemMenu_tools/NandInitializerRed/ARM9.TWL/src/process_topmenu.c
View File

@ -232,7 +232,7 @@ void* TopmenuProcess2(void)
#ifdef USE_WRITE_VARIOUS_DATA
case MENU_WRITE_DATA:
FADE_OUT_RETURN( WriteDataProcess0 );
FADE_OUT_RETURN( WriteDataProcessPre0 );
#endif // USE_WRITE_VARIOUS_DATA
#ifndef NAND_INITIALIZER_LIMITED_MODE

81
build/systemMenu_tools/NandInitializerRed/ARM9.TWL/src/process_write_data.c
View File

@ -28,15 +28,18 @@
#include "cursor.h"
#include "keypad.h"
#include "common_utility.h"
#include <sysmenu/errorLog.h>
/*---------------------------------------------------------------------------*
型定義
*---------------------------------------------------------------------------*/
enum {
MENU_FONT=0,
MENU_CERT=0,
MENU_WRAP,
MENU_CERT,
MENU_FONT,
#ifdef WRITE_DEVKP_ENABLE
MENU_DEVKP,
#endif
@ -66,6 +69,7 @@ static s8 sMenuSelectNo;
内部関数宣言
*---------------------------------------------------------------------------*/
void WriteDataProcessDrawMenu(void);
static BOOL WriteFontData(void);
static BOOL WriteDummyData(const char* nandpath);
static BOOL WriteCertData(void);
@ -84,7 +88,42 @@ static BOOL WriteCertData(void);
Returns: next sequence
*---------------------------------------------------------------------------*/
void* WriteDataProcess0(void)
void* WriteDataProcessPre0(void)
{
WriteDataProcessDrawMenu();
#ifndef NAND_INITIALIZER_LIMITED_MODE
// オート実行用
if (gAutoFlag)
{
sMenuSelectNo = MENU_CERT;
FADE_IN_RETURN( WriteDataProcess2 );
}
#endif
FADE_IN_RETURN( WriteDataProcess1 );
}
void* WriteDataProcessAfter0(void)
{
WriteDataProcessDrawMenu();
#ifndef NAND_INITIALIZER_LIMITED_MODE
// オート実行用
if (gAutoFlag)
{
sMenuSelectNo = MENU_WRAP;
FADE_IN_RETURN( WriteDataProcess2 );
}
#endif
FADE_IN_RETURN( WriteDataProcess1 );
}
void WriteDataProcessDrawMenu(void)
{
int i;
@ -97,11 +136,11 @@ void* WriteDataProcess0(void)
// メニュー一覧
kamiFontPrintf(3, 6, FONT_COLOR_BLACK, "+-------------------+-----+");
kamiFontPrintf(3, 7, FONT_COLOR_BLACK, "l WRITE FONT DATA l l");
kamiFontPrintf(3, 7, FONT_COLOR_BLACK, "l WRITE CERT.SYS l l");
kamiFontPrintf(3, 8, FONT_COLOR_BLACK, "+-------------------+-----+");
kamiFontPrintf(3, 9, FONT_COLOR_BLACK, "l WRITE WRAP DATA l l");
kamiFontPrintf(3, 10, FONT_COLOR_BLACK, "+-------------------+-----+");
kamiFontPrintf(3, 11, FONT_COLOR_BLACK, "l WRITE CERT.SYS l l");
kamiFontPrintf(3, 11, FONT_COLOR_BLACK, "l WRITE FONT DATA l l");
kamiFontPrintf(3, 12, FONT_COLOR_BLACK, "+-------------------+-----+");
#ifdef WRITE_DEVKP_ENABLE
kamiFontPrintf(3, 13, FONT_COLOR_BLACK, "l WRITE DEV.KP l l");
@ -127,7 +166,6 @@ void* WriteDataProcess0(void)
// カーソル消去
SetCursorPos((u16)200, (u16)200);
FADE_IN_RETURN( WriteDataProcess1 );
}
/*---------------------------------------------------------------------------*
@ -195,15 +233,18 @@ void* WriteDataProcess2(void)
switch( sMenuSelectNo )
{
case MENU_FONT:
result = WriteFontData();
case MENU_CERT:
result = WriteCertData();
// sysmenu.logの生成をこのタイミングで行っておく
ERRORLOG_Init(OS_AllocFromMain, OS_FreeToMain);
break;
case MENU_WRAP:
// ダミーのDSメニューラッピング用ファイル作成（UIGランチャーが作っているもの）
result = WriteDummyData(WRAP_DATA_FILE_PATH_IN_NAND);
break;
case MENU_CERT:
result = WriteCertData();
case MENU_FONT:
result = WriteFontData();
break;
#ifdef WRITE_DEVKP_ENABLE
case MENU_DEVKP:
@ -232,13 +273,25 @@ void* WriteDataProcess2(void)
switch(sMenuSelectNo)
{
case MENU_FONT:
case MENU_CERT:
if (total_result)
{
gAutoProcessResult[AUTO_PROCESS_MENU_VARIOUS_DATA_1] = AUTO_PROCESS_RESULT_SUCCESS;
FADE_OUT_RETURN( AutoProcess1 );
}
else
{
gAutoProcessResult[AUTO_PROCESS_MENU_VARIOUS_DATA_1] = AUTO_PROCESS_RESULT_FAILURE;
FADE_OUT_RETURN( AutoProcess2);
}
/* NOTREACHED */
case MENU_WRAP:
#ifdef MARIOCLUB_VERSION
sMenuSelectNo++;
return WriteDataProcess2;
#endif //MARIOCLUB_VERSION
case MENU_CERT:
case MENU_FONT:
#ifdef WRITE_DEVKP_ENABLE
sMenuSelectNo = MENU_DEVKP;
return WriteDataProcess2;
@ -246,12 +299,12 @@ void* WriteDataProcess2(void)
#endif //WRITE_DEVKP_ENABLE
if (total_result)
{
gAutoProcessResult[AUTO_PROCESS_MENU_VARIOUS_DATA] = AUTO_PROCESS_RESULT_SUCCESS;
gAutoProcessResult[AUTO_PROCESS_MENU_VARIOUS_DATA_2] = AUTO_PROCESS_RESULT_SUCCESS;
FADE_OUT_RETURN( AutoProcess1 );
}
else
{
gAutoProcessResult[AUTO_PROCESS_MENU_VARIOUS_DATA] = AUTO_PROCESS_RESULT_FAILURE;
gAutoProcessResult[AUTO_PROCESS_MENU_VARIOUS_DATA_2] = AUTO_PROCESS_RESULT_FAILURE;
FADE_OUT_RETURN( AutoProcess2);
}
}