(変更者：akabane_jumpei)活栓挿抜ライブラリの名称変更。Card→hotsw

git-svn-id: file:///Users/lillianskinner/Downloads/platinum/twl/TwlIPL/trunk@264 b08762b0-b915-fc4b-9d8c-17b2551a87ff

build/components/hyena.TWL/src/main.c

@@ -172,9 +172,10 @@ TwlSpMain(void)
     BOOT_Init();
 
     // 活栓挿抜機能初期化
-    Cardm_Init();
+    HOTSW_Init();
+    
     // カードがささっていたらブート開始
-    (void)Card_Boot();
+    (void)HOTSW_Boot();
 	
     while (TRUE)
     {

build/libraries_sysmenu/Makefile

@@ -22,7 +22,7 @@ include	$(TWLIPL_ROOT)/build/buildtools/commondefs
 
 #----------------------------------------------------------------------------
 
-SUBDIRS				=	sysmenu settings mb_loader acsign boot card
+SUBDIRS				=	sysmenu settings mb_loader acsign boot hotsw
 
 #----------------------------------------------------------------------------
 

build/libraries_sysmenu/hotsw/ARM7/src/Card.c

@@ -81,11 +81,11 @@ static CardBootFunction  	s_funcTable[] = {
 // 	Function Describe
 // ===========================================================================
 /*---------------------------------------------------------------------------*
-  Name:         Card_Init
+  Name:         HOTSW_Init
   Arguments:    None.
   Returns:      None.
  *---------------------------------------------------------------------------*/
-void Cardm_Init(void)
+void HOTSW_Init(void)
 {
 	OS_InitTick();
     OS_InitThread();
@@ -118,10 +118,10 @@ void Cardm_Init(void)
     OS_WakeupThreadDirect(&s_MCThread);
 
     // Boot Segment バッファの設定
-	Card_SetBootSegmentBuffer((void *)SYSM_CARD_ROM_HEADER_BAK, SYSM_CARD_ROM_HEADER_SIZE );
+	HOTSW_SetBootSegmentBuffer((void *)SYSM_CARD_ROM_HEADER_BAK, SYSM_CARD_ROM_HEADER_SIZE );
 
     // Secure Segment バッファの設定
-    Card_SetSecureSegmentBuffer((void *)SYSM_CARD_NTR_SECURE_BUF, SECURE_AREA_SIZE );
+    HOTSW_SetSecureSegmentBuffer((void *)SYSM_CARD_NTR_SECURE_BUF, SECURE_AREA_SIZE );
 
 	// モジュールロード用スレッドの生成
 /*	OS_CreateThread(&s_MLThread,
@@ -142,14 +142,14 @@ void Cardm_Init(void)
 }
 
 /* -----------------------------------------------------------------
- * Card_BootŠÖ<EFBFBD>”
+ * HOTSW_BootŠÖ<EFBFBD>”
  *
  * カード起動をスタート
  *
  * ※BootSegmentBuffer SecureSegmentBufferの設定を行ってから
  *   この関数を呼んでください。
  * ----------------------------------------------------------------- */
-BOOL Card_Boot(void)
+BOOL HOTSW_Boot(void)
 {
 	s32 tempLockID;
 	BOOL retval = TRUE;
@@ -258,7 +258,7 @@ BOOL Card_Boot(void)
 	    	// ID読み込み
 			s_funcTable[s_cbData.cardType].ReadID_G(&s_cbData);
 			// 常駐モジュール残りを指定先に転送
-			Card_LoadStaticModule();
+			HOTSW_LoadStaticModule();
 	
 			// デバッグ出力
 			ShowRomHeaderData();
@@ -290,13 +290,13 @@ BOOL Card_Boot(void)
 }
 
 /* -----------------------------------------------------------------
- * Card_LoadStaticModulerŠÖ<EFBFBD>”
+ * HOTSW_LoadStaticModuleŠÖ<EFBFBD>”
  *
  * ARM7,9の常駐モジュールを展開する関数
  * 
  * 注：一度カードブートしてゲームモードになってから呼び出してください
  * ----------------------------------------------------------------- */
-void Card_LoadStaticModule(void)
+void HOTSW_LoadStaticModule(void)
 {
 #ifdef DEBUG_USED_CARD_SLOT_B_
 	// バナーリード
@@ -348,13 +348,13 @@ void Card_LoadStaticModule(void)
 
 
 /* -----------------------------------------------------------------
- * Card_SetBootSegmentBufferŠÖ<EFBFBD>”
+ * HOTSW_SetBootSegmentBufferŠÖ<EFBFBD>”
  *
  * Boot Segment バッファの指定
  *
  * 注：カードブート処理中は呼び出さないようにする
  * ----------------------------------------------------------------- */
-void Card_SetBootSegmentBuffer(void* buf, u32 size)
+void HOTSW_SetBootSegmentBuffer(void* buf, u32 size)
 {
 	SDK_ASSERT(size > BOOT_SEGMENT_SIZE);
 
@@ -370,13 +370,13 @@ void Card_SetBootSegmentBuffer(void* buf, u32 size)
 }
 
 /* -----------------------------------------------------------------
- * Card_SetSecureSegmentBufferŠÖ<EFBFBD>”
+ * HOTSW_SetSecureSegmentBufferŠÖ<EFBFBD>”
  *
  * Secure Segment バッファの指定
  * 
  * 注：カードブート処理中は呼び出さないようにする
  * ----------------------------------------------------------------- */
-void Card_SetSecureSegmentBuffer(void* buf, u32 size)
+void HOTSW_SetSecureSegmentBuffer(void* buf, u32 size)
 {
     SDK_ASSERT(size > SECURE_SEGMENT_SIZE);
     
@@ -480,7 +480,7 @@ static void McThread(void *arg)
 		OS_SleepThread(NULL);
 
         // カードブート
-        Card_Boot();
+        HOTSW_Boot();
     }
 }
 

build/libraries_sysmenu/hotsw/ARM7/src/blowfish.c

@@ -11,7 +11,7 @@
   in whole or in part, without the prior written consent of Nintendo.
  *---------------------------------------------------------------------------*/
 #include <twl.h>
-#include <sysmenu/card/common/blowfish.h>
+#include <sysmenu.h>
 
 #define MAXKEYBYTES			56          /* 448 bits */
 #define	N					16

build/libraries_sysmenu/hotsw/ARM7/src/dsCardType1.c

@@ -4,10 +4,7 @@
  *---------------------------------------------------------------------------*/
 
 #include 	<twl.h>
-
+#include 	<sysmenu.h>
-#include 	<sysmenu/card/common/blowfish.h>
-#include 	<sysmenu/card/common/Card.h>
-#include	<sysmenu/card/common/dsCardType1.h>
 
 // Define data --------------------------------------------------------------
 #define 	PAGE_SIZE								512

build/libraries_sysmenu/hotsw/ARM7/src/dsCardType2.c

@@ -4,10 +4,7 @@
  *---------------------------------------------------------------------------*/
 
 #include 	<twl.h>
-
+#include 	<sysmenu.h>
-#include 	<sysmenu/card/common/blowfish.h>
-#include 	<sysmenu/card/common/Card.h>
-#include	<sysmenu/card/common/dsCardType2.h>
 
 // Define Data --------------------------------------------------------------
 #define		SECURE_SEGMENT_NUM					4

build/libraries_sysmenu/hotsw/ARM7/src/ds_blowfish_table.c

@@ -10,7 +10,7 @@
   not be disclosed to third parties or copied or duplicated in any form,
   in whole or in part, without the prior written consent of Nintendo.
  *---------------------------------------------------------------------------*/
-#include <sysmenu/card/common/blowfish.h>
+#include <sysmenu.h>
 
 
 const BLOWFISH_CTX GCDi_BlowfishInitTableDS = {

build/systemMenu_RED/Launcher/ARM9/Makefile

@@ -19,7 +19,7 @@
 SUBDIRS					=	\
 							../../../libraries_sysmenu/sysmenu \
 							../../../libraries_sysmenu/boot \
-							../../../libraries_sysmenu/card \
+							../../../libraries_sysmenu/hotsw \
 							../../../components/hyena.TWL
 
 #----------------------------------------------------------------------------