From cd48a3fd5f74d366762b984b096ec0d4ea3a86bf Mon Sep 17 00:00:00 2001 From: "(no author)" <(no author)@b08762b0-b915-fc4b-9d8c-17b2551a87ff> Date: Tue, 27 Nov 2007 05:57:35 +0000 Subject: [PATCH] =?UTF-8?q?(=E5=A4=89=E6=9B=B4=E8=80=85=EF=BC=9Aakabane=5F?= =?UTF-8?q?jumpei)=E6=B4=BB=E6=A0=93=E6=8C=BF=E6=8A=9C=E3=83=A9=E3=82=A4?= =?UTF-8?q?=E3=83=96=E3=83=A9=E3=83=AA=E3=81=AE=E5=90=8D=E7=A7=B0=E5=A4=89?= =?UTF-8?q?=E6=9B=B4=E3=80=82Card=E2=86=92hotsw?= 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@264 b08762b0-b915-fc4b-9d8c-17b2551a87ff --- build/components/hyena.TWL/src/main.c | 5 ++-- build/libraries_sysmenu/Makefile | 2 +- .../{card => hotsw}/ARM7/Makefile | 0 .../{card => hotsw}/ARM7/src/Card.c | 28 +++++++++---------- .../{card => hotsw}/ARM7/src/blowfish.c | 2 +- .../{card => hotsw}/ARM7/src/dsCardType1.c | 5 +--- .../{card => hotsw}/ARM7/src/dsCardType2.c | 5 +--- .../ARM7/src/ds_blowfish_table.c | 2 +- .../{card => hotsw}/Makefile | 0 build/systemMenu_RED/Launcher/ARM9/Makefile | 2 +- 10 files changed, 23 insertions(+), 28 deletions(-) rename build/libraries_sysmenu/{card => hotsw}/ARM7/Makefile (100%) rename build/libraries_sysmenu/{card => hotsw}/ARM7/src/Card.c (95%) rename build/libraries_sysmenu/{card => hotsw}/ARM7/src/blowfish.c (94%) rename build/libraries_sysmenu/{card => hotsw}/ARM7/src/dsCardType1.c (96%) rename build/libraries_sysmenu/{card => hotsw}/ARM7/src/dsCardType2.c (95%) rename build/libraries_sysmenu/{card => hotsw}/ARM7/src/ds_blowfish_table.c (97%) rename build/libraries_sysmenu/{card => hotsw}/Makefile (100%) diff --git a/build/components/hyena.TWL/src/main.c b/build/components/hyena.TWL/src/main.c index c6734d0a..62b08e50 100644 --- a/build/components/hyena.TWL/src/main.c +++ b/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) { diff --git a/build/libraries_sysmenu/Makefile b/build/libraries_sysmenu/Makefile index 5b20286f..c3c36134 100644 --- a/build/libraries_sysmenu/Makefile +++ b/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 #---------------------------------------------------------------------------- diff --git a/build/libraries_sysmenu/card/ARM7/Makefile b/build/libraries_sysmenu/hotsw/ARM7/Makefile similarity index 100% rename from build/libraries_sysmenu/card/ARM7/Makefile rename to build/libraries_sysmenu/hotsw/ARM7/Makefile diff --git a/build/libraries_sysmenu/card/ARM7/src/Card.c b/build/libraries_sysmenu/hotsw/ARM7/src/Card.c similarity index 95% rename from build/libraries_sysmenu/card/ARM7/src/Card.c rename to build/libraries_sysmenu/hotsw/ARM7/src/Card.c index d5e7d9c9..05ee8e00 100644 --- a/build/libraries_sysmenu/card/ARM7/src/Card.c +++ b/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関数 + * HOTSW_Boot関数 * * カード起動をスタート * * ※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関数 + * HOTSW_LoadStaticModule関数 * * 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関数 + * HOTSW_SetBootSegmentBuffer関数 * * 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関数 + * HOTSW_SetSecureSegmentBuffer関数 * * 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(); } } diff --git a/build/libraries_sysmenu/card/ARM7/src/blowfish.c b/build/libraries_sysmenu/hotsw/ARM7/src/blowfish.c similarity index 94% rename from build/libraries_sysmenu/card/ARM7/src/blowfish.c rename to build/libraries_sysmenu/hotsw/ARM7/src/blowfish.c index 78e31b47..b72166b3 100644 --- a/build/libraries_sysmenu/card/ARM7/src/blowfish.c +++ b/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 -#include +#include #define MAXKEYBYTES 56 /* 448 bits */ #define N 16 diff --git a/build/libraries_sysmenu/card/ARM7/src/dsCardType1.c b/build/libraries_sysmenu/hotsw/ARM7/src/dsCardType1.c similarity index 96% rename from build/libraries_sysmenu/card/ARM7/src/dsCardType1.c rename to build/libraries_sysmenu/hotsw/ARM7/src/dsCardType1.c index 8042650b..d650bdbe 100644 --- a/build/libraries_sysmenu/card/ARM7/src/dsCardType1.c +++ b/build/libraries_sysmenu/hotsw/ARM7/src/dsCardType1.c @@ -4,10 +4,7 @@ *---------------------------------------------------------------------------*/ #include - -#include -#include -#include +#include // Define data -------------------------------------------------------------- #define PAGE_SIZE 512 diff --git a/build/libraries_sysmenu/card/ARM7/src/dsCardType2.c b/build/libraries_sysmenu/hotsw/ARM7/src/dsCardType2.c similarity index 95% rename from build/libraries_sysmenu/card/ARM7/src/dsCardType2.c rename to build/libraries_sysmenu/hotsw/ARM7/src/dsCardType2.c index b4910c7b..88b115ed 100644 --- a/build/libraries_sysmenu/card/ARM7/src/dsCardType2.c +++ b/build/libraries_sysmenu/hotsw/ARM7/src/dsCardType2.c @@ -4,10 +4,7 @@ *---------------------------------------------------------------------------*/ #include - -#include -#include -#include +#include // Define Data -------------------------------------------------------------- #define SECURE_SEGMENT_NUM 4 diff --git a/build/libraries_sysmenu/card/ARM7/src/ds_blowfish_table.c b/build/libraries_sysmenu/hotsw/ARM7/src/ds_blowfish_table.c similarity index 97% rename from build/libraries_sysmenu/card/ARM7/src/ds_blowfish_table.c rename to build/libraries_sysmenu/hotsw/ARM7/src/ds_blowfish_table.c index 46136d22..89a4bf27 100644 --- a/build/libraries_sysmenu/card/ARM7/src/ds_blowfish_table.c +++ b/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 +#include const BLOWFISH_CTX GCDi_BlowfishInitTableDS = { diff --git a/build/libraries_sysmenu/card/Makefile b/build/libraries_sysmenu/hotsw/Makefile similarity index 100% rename from build/libraries_sysmenu/card/Makefile rename to build/libraries_sysmenu/hotsw/Makefile diff --git a/build/systemMenu_RED/Launcher/ARM9/Makefile b/build/systemMenu_RED/Launcher/ARM9/Makefile index 4264caf7..af8d4d47 100644 --- a/build/systemMenu_RED/Launcher/ARM9/Makefile +++ b/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 #----------------------------------------------------------------------------