From 13138335c3e5684bcaafa78ccd5ba7e86da9cb4c Mon Sep 17 00:00:00 2001
From: yosiokat <yosiokat@b08762b0-b915-fc4b-9d8c-17b2551a87ff>
Date: Thu, 28 May 2009 11:13:43 +0000
Subject: [PATCH] =?UTF-8?q?SDK=E3=81=ABES=E3=83=91=E3=83=83=E3=82=B1?=
 =?UTF-8?q?=E3=83=BC=E3=82=B8=E3=81=8C=E3=81=AA=E3=81=8F=E3=81=A6=E3=82=82?=
 =?UTF-8?q?=E3=83=93=E3=83=AB=E3=83=89=E3=81=A7=E3=81=8D=E3=82=8B=E3=82=88?=
 =?UTF-8?q?=E3=81=86=E4=BF=AE=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@2826 b08762b0-b915-fc4b-9d8c-17b2551a87ff
---
 build/libraries_sysmenu/namut/ARM9/Makefile   |  4 ----
 .../libraries_sysmenu/namut/ARM9/src/namut.c  | 24 +++++++++++++++----
 2 files changed, 20 insertions(+), 8 deletions(-)

diff --git a/build/libraries_sysmenu/namut/ARM9/Makefile b/build/libraries_sysmenu/namut/ARM9/Makefile
index 7a366d25..4e2cd989 100644
--- a/build/libraries_sysmenu/namut/ARM9/Makefile
+++ b/build/libraries_sysmenu/namut/ARM9/Makefile
@@ -27,15 +27,11 @@ TWL_PROC	    	=	ARM9
 
 INCDIR				= 	include
 
-# es のヘッダを参照します。
-LINCLUDES		+=	$(ES_ROOT)/twl/include
-
 SRCS				=	namut.c
 
 TARGET_LIB			=	libnamut$(TWL_LIBSUFFIX).a
 
 
-include	$(TWLSDK_ROOT)/add-ins/es/commondefs.es
 include	$(TWL_IPL_RED_ROOT)/build/buildtools/commondefs
 
 INSTALL_TARGETS		=	$(TARGETS)
diff --git a/build/libraries_sysmenu/namut/ARM9/src/namut.c b/build/libraries_sysmenu/namut/ARM9/src/namut.c
index 0673e71e..439b80b3 100644
--- a/build/libraries_sysmenu/namut/ARM9/src/namut.c
+++ b/build/libraries_sysmenu/namut/ARM9/src/namut.c
@@ -21,8 +21,6 @@
 #include <twl/fatfs.h>
 #include <twl/os/common/format_rom.h>
 #include <twl/nam.h>
-#include <es.h>
-#include <estypes.h>
 #include <twl/aes.h>
 #include <twl/os/common/banner.h>
 #include <sysmenu/namut.h>
@@ -40,6 +38,18 @@ typedef enum ETicketType {
 	ETICKET_TYPE_PERSONALIZED = 1
 }ETicketType;
 
+typedef struct {
+	u8               pad1[ 12 ];
+    u32              deviceId;
+	u8				 pad2[ 216 - 16 ];
+} ESTicketView;
+
+typedef s32 ESError;
+#define ES_ERR_OK                                   0
+
+extern ESError ES_GetTicketViews(u64 titleId,  ESTicketView* ticketViewList, 
+        u32* ticketViewCnt);
+
 // 本体初期化(NAND初期化)で消去しないタイトルを
 // TitleProperty (TitleID 32bit）のビットで指定します。
 // どれか1つでもビットが立っていれば消去の対象から外します。
@@ -1220,6 +1230,7 @@ static s32 GetETicketType(NAMTitleId titleId, ETicketType *pETicketType )
   Returns:      NAM_OK     : 取得成功
 	            それ以外   : 取得失敗
  *---------------------------------------------------------------------------*/
+
 static s32 GetTicketViews(ESTicketView** pptv, u32* pNumTicket, NAMTitleId titleId)
 {
     s32 result;
@@ -1319,6 +1330,7 @@ BOOL NAMUT_PrintInstalledTitleETicketType( void )
         }
     }
 
+	OS_TPrintf( "gameCode : titleID       : numTicket : ticket type\n" );
     for (i=0;i<title_num_all;i++)
     {
 		ETicketType eTicketType = ETICKET_TYPE_PERSONALIZED; // default
@@ -1331,9 +1343,13 @@ BOOL NAMUT_PrintInstalledTitleETicketType( void )
 		{
 			u32 titleID_Lo = NAM_GetTitleIdLo( pTitleIdArray[i] );
 			u8 *p = (u8 *)&titleID_Lo;
-			OS_TPrintf( "%c%c%c%c : %llx : %s\n",
+			u32 numTicket = 0;
+			(void)ES_GetTicketViews( pTitleIdArray[i], NULL, &numTicket);
+			OS_TPrintf( "%c%c%c%c     : %llx : %2d        : %s\n",
 						*p++, *p++,	*p++, *p++,
-						pTitleIdArray[i], eTicketType == ETICKET_TYPE_COMMON ? "Common":"Personalized" );
+						pTitleIdArray[i],
+						numTicket,
+						eTicketType == ETICKET_TYPE_COMMON ? "Common":"Personalized" );
 		}
     }