From 8f6e72dbe6940478fd008575b488049e5e095a37 Mon Sep 17 00:00:00 2001
From: "(no author)" <(no author)@b08762b0-b915-fc4b-9d8c-17b2551a87ff>
Date: Wed, 29 Dec 2010 04:40:57 +0000
Subject: [PATCH] =?UTF-8?q?[WirelessChecker]=20CTR=20=E4=BA=92=E6=8F=9B?=
 =?UTF-8?q?=E3=83=A2=E3=83=BC=E3=83=89=E3=81=A7=E3=81=AE=E3=83=81=E3=82=A7?=
 =?UTF-8?q?=E3=83=83=E3=82=AF=E4=BB=95=E6=A7=98=E3=82=92=E8=BF=BD=E5=8A=A0?=
 =?UTF-8?q?=E3=80=82=20($=20make=20CHECK=5FON=5FCTR=3DTRUE=20=E3=81=A7CTR?=
 =?UTF-8?q?=E4=BA=92=E6=8F=9B=E3=83=81=E3=82=A7=E3=83=83=E3=82=AF=E4=BB=95?=
 =?UTF-8?q?=E6=A7=98=E3=81=A7=E3=83=93=E3=83=AB=E3=83=89=E3=81=A7=E3=81=8D?=
 =?UTF-8?q?=E3=81=BE=E3=81=99=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@2985 b08762b0-b915-fc4b-9d8c-17b2551a87ff
---
 build/tests/WirelessChecker/Makefile          | 17 ++++++++++--
 build/tests/WirelessChecker/src/frame.cpp     | 26 +++++++++++++++++--
 build/tests/WirelessChecker/src/main.cpp      |  3 ++-
 .../WirelessChecker/src/test_recovery.cpp     |  3 ++-
 4 files changed, 43 insertions(+), 6 deletions(-)

diff --git a/build/tests/WirelessChecker/Makefile b/build/tests/WirelessChecker/Makefile
index b8b4ad89..14b1c89d 100644
--- a/build/tests/WirelessChecker/Makefile
+++ b/build/tests/WirelessChecker/Makefile
@@ -58,12 +58,25 @@ MACRO_FLAGS	+= -DTWLNMENU_USE_LC_FONT
 
 LDIRT_CLEAN	+=	$(FONT_RES_LC) $(FONT_RES_NO_LC) *.rsf $(REVISION_C)
 
+#-----------------------------------
+# For CTR compatibility check
+#
+# To build this imeage, add CHECK_ON_CTR=TRUE.
+# make CHECK_ON_CTR=TRUE
+
+ifeq	($(CHECK_ON_CTR),TRUE)
+BASENAME    += WirelessChecker_for_CTRcheck
+MACRO_FLAGS += -DCHECK_ON_CTR
+else
+BASENAME    += WirelessChecker
+endif
+
 #----------------------------------------------------------------------------
 
 ifeq	($(TWL_NANDAPP),TRUE)
-TARGET_BIN       = WirelessChecker_nand.tad
+TARGET_BIN       = $(BASENAME)_nand.tad
 else
-TARGET_BIN       = WirelessChecker.srl
+TARGET_BIN       = $(BASENAME).srl
 endif
 
 ifeq	($(TWL_NANDAPP),TRUE)
diff --git a/build/tests/WirelessChecker/src/frame.cpp b/build/tests/WirelessChecker/src/frame.cpp
index c8582dc0..1d46f3ca 100644
--- a/build/tests/WirelessChecker/src/frame.cpp
+++ b/build/tests/WirelessChecker/src/frame.cpp
@@ -49,7 +49,17 @@ CFrame::InitDisp()
   
     pcm->Clear(util::COLOR_BLACK);
     pcs->Clear(util::COLOR_BLACK);
-    pcm->Printf(16*5, 0, util::COLOR_WHITE, L"無線機能確認ツール");
+    pcm->Printf(
+#ifdef CHECK_ON_CTR
+        16*1,
+#else
+        16*5,
+#endif
+        0, util::COLOR_WHITE, L"無線機能確認ツール"
+#ifdef CHECK_ON_CTR
+                              L"(CTR互換モードチェック用)"
+#endif
+    );
     pcm->Printf(96, 16*1, util::COLOR_WHITE, L"BUILD TIME: %s %s", L""__DATE__, L""__TIME__);
 
     DrawBorder(pcm, 4, 16*2 + 4, 256 - 8, 192 - (16*2 + 4), util::COLOR_WHITE);
@@ -59,8 +69,11 @@ CFrame::InitDisp()
     pcm->Printf(16*2,  16*5, util::COLOR_WHITE, L"DS無線の初期化テスト");
     pcm->Printf(16*2,  16*6, util::COLOR_WHITE, L"TWL無線の初期化テスト");
     pcm->Printf(16*2,  16*7, util::COLOR_WHITE, L"FATALエラーエミュレーション");
+#ifdef CHECK_ON_CTR
+    pcm->Printf(16*2,  16*8, util::COLOR_WHITE, L"アプリジャンプテスト");
+#else
     pcm->Printf(16*2,  16*8, util::COLOR_WHITE, L"FATALエラーリカバリテスト");
-
+#endif
     DrawBorder(pcs, 4, 16*9 + 4, 256 - 8, 192 - (16*9 + 4), util::COLOR_WHITE);
 }
 
@@ -92,11 +105,20 @@ CFrame::HelpDisp(util::PaletteColor color)
     break;
     case ITEM_TEST_FATAL:
     pHelpString1 = L"FATALエラーを発生させ、TWL無線を使えなくします";
+#ifdef CHECK_ON_CTR
+    pHelpString2 = L"HWリセットで回復します。CTRでは無効です。";
+#else
     pHelpString2 = L"HWリセットで回復します。";
+#endif
     break;
     case ITEM_TEST_RECOVERY:
+#ifdef CHECK_ON_CTR
+    pHelpString1 = L"アプリジャンプをテストします。";
+    pHelpString2 = L"再起動後にDS/TWL無線初期化を確認してください。";
+#else
     pHelpString1 = L"FATALエラーのリカバリーをテストします。";
     pHelpString2 = L"再起動後にTWL無線初期化を確認してください。";
+#endif
     break;
   }
   pcs->Print(8, 16*9 + 8, color, pHelpString1);
diff --git a/build/tests/WirelessChecker/src/main.cpp b/build/tests/WirelessChecker/src/main.cpp
index 0069788b..06a3cd6a 100644
--- a/build/tests/WirelessChecker/src/main.cpp
+++ b/build/tests/WirelessChecker/src/main.cpp
@@ -47,6 +47,7 @@ TwlMain(void)
     util::Init();
 
     OSDeliverArgInfo argInfo;
+#ifndef CHECK_ON_CTR
     if (TRUE == OS_IsValidDeliverArg())
     {
       OS_InitDeliverArgInfo(&argInfo, 0);
@@ -56,7 +57,7 @@ TwlMain(void)
         isFatalChecking = TRUE;
       }
     }
-
+#endif
     // display on
     util::WaitVBlankIntr();
     util::dispOn();
diff --git a/build/tests/WirelessChecker/src/test_recovery.cpp b/build/tests/WirelessChecker/src/test_recovery.cpp
index ab8ae1f0..625bcc36 100644
--- a/build/tests/WirelessChecker/src/test_recovery.cpp
+++ b/build/tests/WirelessChecker/src/test_recovery.cpp
@@ -47,7 +47,7 @@ CTestRecovery::RecoveryTest(void)
       End();
       throw L"Enable() 失敗.\n";
     }
-
+#ifndef CHECK_ON_CTR
     if (FALSE == Wrack())
     {
       Disable();
@@ -65,6 +65,7 @@ CTestRecovery::RecoveryTest(void)
     }
 
     LogPrintf(m_pc, L"FATALエラーが発生しました.\n");
+#endif
   }
   catch (const wchar_t* string)
   {