From 2c02be2d289639cbe99852e1a64ce0a3bee4bd4d Mon Sep 17 00:00:00 2001
From: "(no author)" <(no author)@b08762b0-b915-fc4b-9d8c-17b2551a87ff>
Date: Wed, 3 Sep 2008 09:07:14 +0000
Subject: [PATCH] =?UTF-8?q?nishimoto=20@=20PSEG1=20=E3=82=B8=E3=83=A3?=
 =?UTF-8?q?=E3=83=B3=E3=83=97=E5=85=88=E3=81=AE=E3=82=BF=E3=82=A4=E3=83=88?=
 =?UTF-8?q?=E3=83=AB=EF=BC=A9=EF=BC=A4=E3=82=92=E5=8F=96=E3=82=8A=E9=81=95?=
 =?UTF-8?q?=E3=81=88=E3=81=A6=E3=81=84=E3=81=9F=E3=81=AE=E3=82=92=E4=BF=AE?=
 =?UTF-8?q?=E6=AD=A3=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@2384 b08762b0-b915-fc4b-9d8c-17b2551a87ff
---
 build/debugsoft/ApplicationJump/Nand-1/src/main.c | 14 ++++++++++++--
 build/debugsoft/ApplicationJump/Nand-2/src/main.c | 14 ++++++++++++--
 build/debugsoft/ApplicationJump/include/common.h  |  4 +++-
 3 files changed, 27 insertions(+), 5 deletions(-)

diff --git a/build/debugsoft/ApplicationJump/Nand-1/src/main.c b/build/debugsoft/ApplicationJump/Nand-1/src/main.c
index 39ccd409..dcf737de 100644
--- a/build/debugsoft/ApplicationJump/Nand-1/src/main.c
+++ b/build/debugsoft/ApplicationJump/Nand-1/src/main.c
@@ -166,11 +166,14 @@ void TwlMain(void)
 	        PutSubScreen(0, 18, 0xff, "   B: RETURN JUMP");
 	    break;
 	    case JUMPTYPE_ANOTHER_CARD:
-	    	PutSubScreen(0, 18, 0xfe, "   B: JUMP TO CARD APP");
+	    	PutSubScreen(0, 18, 0xfe, "   B: JUMP TO CARD APP (ANO)");
 	    break;
 	    case JUMPTYPE_SYSMENU:
 	    	PutSubScreen(0, 18, 0xff, "   B: JUMP TO SYSMENU");
 	    break;
+	    case JUMPTYPE_FAIL_CARD:
+	    	PutSubScreen(0, 18, 0xfe, "   B: JUMP TO CARD APP (FAIL)");
+	    break;
 	    }
 
 		PutSubScreen(0, 20, 0xff, " UP DOWN: SWITCH JUMP TYPE (B) ");
@@ -257,7 +260,14 @@ void TwlMain(void)
 	        	break;
 	        case JUMPTYPE_SYSMENU:
 	        	OS_JumpToSystemMenu();
-	        break;
+		        break;
+	        case JUMPTYPE_FAIL_CARD:
+	        	if ( !OS_DoApplicationJump(CARDAPP_FAIL_TITLEID, OS_APP_JUMP_NORMAL) )
+	        	{
+					OS_TPrintf("Failed to Jump.\n");
+					PutMainScreen(1, 16, 0xf1, "ERROR!: Failed to Jump.");
+				}
+				break;
 	        }
         }
         
diff --git a/build/debugsoft/ApplicationJump/Nand-2/src/main.c b/build/debugsoft/ApplicationJump/Nand-2/src/main.c
index e4a43429..58ed785b 100644
--- a/build/debugsoft/ApplicationJump/Nand-2/src/main.c
+++ b/build/debugsoft/ApplicationJump/Nand-2/src/main.c
@@ -168,11 +168,14 @@ void TwlMain(void)
 	        PutSubScreen(0, 18, 0xff, "   B: RETURN JUMP");
 	    break;
 	    case JUMPTYPE_ANOTHER_CARD:
-	    	PutSubScreen(0, 18, 0xfe, "   B: JUMP TO CARD APP");
+	    	PutSubScreen(0, 18, 0xfe, "   B: JUMP TO CARD APP (ANO)");
 	    break;
 	    case JUMPTYPE_SYSMENU:
 	    	PutSubScreen(0, 18, 0xff, "   B: JUMP TO SYSMENU");
 	    break;
+	    case JUMPTYPE_FAIL_CARD:
+	    	PutSubScreen(0, 18, 0xfe, "   B: JUMP TO CARD APP (FAIL)");
+	    break;
 	    }
 
 		PutSubScreen(0, 20, 0xff, " UP DOWN: SWITCH JUMP TYPE (B) ");
@@ -258,7 +261,14 @@ void TwlMain(void)
 	        	break;
 	        case JUMPTYPE_SYSMENU:
 	        	OS_JumpToSystemMenu();
-	        break;
+	    	    break;
+	        case JUMPTYPE_FAIL_CARD:
+	        	if ( !OS_DoApplicationJump(CARDAPP_FAIL_TITLEID, OS_APP_JUMP_NORMAL) )
+	        	{
+					OS_TPrintf("Failed to Jump.\n");
+					PutMainScreen(1, 16, 0xf1, "ERROR!: Failed to Jump.");
+				}
+				break;
 	        }
         }
         
diff --git a/build/debugsoft/ApplicationJump/include/common.h b/build/debugsoft/ApplicationJump/include/common.h
index 3636a922..d591dc81 100644
--- a/build/debugsoft/ApplicationJump/include/common.h
+++ b/build/debugsoft/ApplicationJump/include/common.h
@@ -31,7 +31,8 @@ extern "C" {
 
 /* TitleID */
 #define CARDAPP_TITLEID		(u64)(0x0003000034333041)	// 430A
-#define CARDAPP_ANO_TITLEID	(u64)(0x0003000034363041)	// 460A
+#define CARDAPP_FAIL_TITLEID	(u64)(0x0003000034363041)	// 460A
+#define CARDAPP_ANO_TITLEID	(u64)(0x0003000034363141)	// 461A
 
 #define NANDAPP1_TITLEID	(u64)(0x0003000434333141)	// 431A
 #define NANDAPP2_TITLEID	(u64)(0x0003000434333241)	// 432A
@@ -51,6 +52,7 @@ typedef enum JumpTypeForB
 	JUMPTYPE_RETURN = 0,
 	JUMPTYPE_ANOTHER_CARD,
 	JUMPTYPE_SYSMENU,
+	JUMPTYPE_FAIL_CARD,
 	
 	JUMPTYPE_NUM
 } JumpTypeForB;