From 821ef47f7fe121706ab1824dec43d61e767d69ea Mon Sep 17 00:00:00 2001 From: kamikawa Date: Wed, 1 Oct 2008 11:42:21 +0000 Subject: [PATCH] =?UTF-8?q?=E8=A6=8B=E3=81=9F=E7=9B=AE=E6=94=B9=E5=96=84?= =?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@2567 b08762b0-b915-fc4b-9d8c-17b2551a87ff --- .../ARM9.TWL/src/process_hwinfo.c | 10 +++++----- .../ARM9.TWL/src/process_nandfirm.c | 2 ++ .../ARM9.TWL/src/process_select_region.c | 4 ++++ .../ARM9.TWL/src/process_write_files.c | 3 ++- 4 files changed, 13 insertions(+), 6 deletions(-) diff --git a/build/systemMenu_tools/SystemUpdaterRegionSelect/ARM9.TWL/src/process_hwinfo.c b/build/systemMenu_tools/SystemUpdaterRegionSelect/ARM9.TWL/src/process_hwinfo.c index d5696f18..a831cfa8 100644 --- a/build/systemMenu_tools/SystemUpdaterRegionSelect/ARM9.TWL/src/process_hwinfo.c +++ b/build/systemMenu_tools/SystemUpdaterRegionSelect/ARM9.TWL/src/process_hwinfo.c @@ -78,12 +78,12 @@ BOOL ProcessHwinfo(void) } } - if ( hw_info_result) - { - return TRUE; - } + if ( !hw_info_result) { kamiFontPrintfConsole(FONT_COLOR_RED, "Write Hardware Info Failure!\n"); - return FALSE; } + + OS_WaitVBlankIntr(); + kamiFontLoadScreenData(); + return hw_info_result; } diff --git a/build/systemMenu_tools/SystemUpdaterRegionSelect/ARM9.TWL/src/process_nandfirm.c b/build/systemMenu_tools/SystemUpdaterRegionSelect/ARM9.TWL/src/process_nandfirm.c index b2382583..e5d12fb6 100644 --- a/build/systemMenu_tools/SystemUpdaterRegionSelect/ARM9.TWL/src/process_nandfirm.c +++ b/build/systemMenu_tools/SystemUpdaterRegionSelect/ARM9.TWL/src/process_nandfirm.c @@ -120,5 +120,7 @@ BOOL ProcessNandfirm(void) } } + OS_WaitVBlankIntr(); + kamiFontLoadScreenData(); return result; } diff --git a/build/systemMenu_tools/SystemUpdaterRegionSelect/ARM9.TWL/src/process_select_region.c b/build/systemMenu_tools/SystemUpdaterRegionSelect/ARM9.TWL/src/process_select_region.c index e3a76366..a809e732 100644 --- a/build/systemMenu_tools/SystemUpdaterRegionSelect/ARM9.TWL/src/process_select_region.c +++ b/build/systemMenu_tools/SystemUpdaterRegionSelect/ARM9.TWL/src/process_select_region.c @@ -126,6 +126,10 @@ void ProcessSelectRegion(void) if (kamiPadIsTrigger(PAD_BUTTON_B)) { + while (!FadeOutTick()) + { + OS_WaitVBlankIntr(); + } ProcessCancel((const char *)L"\n Update was Canceld."); } else if (kamiPadIsTrigger(PAD_BUTTON_A)) diff --git a/build/systemMenu_tools/SystemUpdaterRegionSelect/ARM9.TWL/src/process_write_files.c b/build/systemMenu_tools/SystemUpdaterRegionSelect/ARM9.TWL/src/process_write_files.c index 888f254b..0fa67ce4 100644 --- a/build/systemMenu_tools/SystemUpdaterRegionSelect/ARM9.TWL/src/process_write_files.c +++ b/build/systemMenu_tools/SystemUpdaterRegionSelect/ARM9.TWL/src/process_write_files.c @@ -131,6 +131,7 @@ BOOL ProcessWriteFiles(void) } } + OS_WaitVBlankIntr(); + kamiFontLoadScreenData(); return result; } -