rvtr/TwlIPL
1
Fork 0
mirror of https://github.com/rvtr/TwlIPL.git synced 2025-10-31 06:01:12 -04:00
Code Issues Actions Packages Projects Releases Wiki Activity

libraries_sysmenu/bootをhyenaとLauncherに組み込み。

Browse Source 
とりあえずビルドが通る状態になったので一時保存。しかし定数が適当なのでbootは呼んでもまともに機能せず。
Launcherはnamライブラリに手を加えない限り起動不可能。

git-svn-id: file:///Users/lillianskinner/Downloads/platinum/twl/TwlIPL/trunk@117 b08762b0-b915-fc4b-9d8c-17b2551a87ff
This commit is contained in:
yoshida_teruhisa 2007-11-08 06:30:53 +00:00
parent 9a408ca5c9
commit 2f5c2bdf79
13 changed files with 115 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
build/components/hyena.TWL/hyena.lsf
View File

@ -55,6 +55,8 @@ Autoload WRAM
librtc_sp.TWL$(CODEGEN).a \
libwvr_sp.TWL$(CODEGEN).a \
libaes_sp.TWL$(CODEGEN).a \
libaes_sp.TWL$(CODEGEN).a \
libboot_sp.TWL$(CODEGEN).a \
$(ISTD_LIBS)
Library libsdio_hcd_twl.TWL$(CODEGEN).a \

4
build/components/hyena.TWL/src/main.c
View File

@ -34,6 +34,7 @@
#include <twl/cdc.h>
#include <twl/aes.h>
#include "nvram_sp.h"
#include <sysmenu/boot/common/boot.h>
/*---------------------------------------------------------------------------*
’è<EFBFBD>”’è‹`
@ -124,6 +125,8 @@ TwlSpMain(void)
// SPI <20>‰Šú‰»
SPI_Init(THREAD_PRIO_SPI);
BOOT_Init();
while (TRUE)
{
@ -133,6 +136,7 @@ TwlSpMain(void)
{
OS_ResetSystem();
}
BOOT_WaitStart();
}
}

4
build/libraries_sysmenu/boot/ARM7/Makefile
View File

@ -26,11 +26,11 @@ TWL_PROC = ARM7
#----------------------------------------------------------------------------
SRCDIR = ../common/src
SRCDIR = ./src
INCDIR = ../common/include
SRCS = boot.c
SRCS = bootAPI.c boot.c
TARGET_LIB = libboot_sp$(TWL_LIBSUFFIX).a

6
build/libraries_sysmenu/boot/ARM7/src/boot.c
View File

@ -16,6 +16,7 @@
*---------------------------------------------------------------------------*/
#include <twl.h>
#include <sysmenu/boot/common/boot.h>
//#include "loader.h"
//#include "mb_child.h"
@ -24,7 +25,6 @@
// extern data-------------------------------------------------------
// function's prototype----------------------------------------------
void BOOT_Core( void );
static void Venner_R1( void );
static void ClearMemory( void );
@ -58,7 +58,7 @@ static asm void ClearMemory( void )
// bl CpuClear32Byte
ldr r0, = HW_WRAM // ARM7WRAM‚̃NƒŠƒA
ldr r1, = RETURN_FROM_MAIN_ARM7_FUNCP
ldr r1, = 1//RETURN_FROM_MAIN_ARM7_FUNCP
bl CpuClear32Byte
@ -107,7 +107,7 @@ static asm void ClearBankREG_Stack( void )
bl CpuClear32Byte
#endif // ISDBG_MB_CHILD_
sub r0, r2, #( HW_PRV_WRAM_END - RETURN_FROM_MAIN_ARM7_FUNCP )
sub r0, r2, #1 //#( HW_PRV_WRAM_END - RETURN_FROM_MAIN_ARM7_FUNCP )
ldr r1, = ClearMemory
bl CpuClear32Byte

6
build/libraries_sysmenu/boot/ARM7/src/bootAPI.c
View File

@ -16,6 +16,7 @@
*---------------------------------------------------------------------------*/
#include <twl.h>
#include <sysmenu/boot/common/boot.h>
//#include "loader.h"
//#include "mb_child.h"
@ -25,8 +26,6 @@
// extern data-------------------------------------------------------
// function's prototype----------------------------------------------
void BOOT_Init( void );
void BOOT_WaitStart( void );
static void BOOTi_ClearREG_RAM( void );
@ -55,7 +54,7 @@ BOOL BOOT_WaitStart( void )
InsertWLPatch();
}
*/
BOOi_ClearREG_RAM(); // ARM7側のメモリ＆レジスタクリア。
BOOTi_ClearREG_RAM(); // ARM7側のメモリ＆レジスタクリア。
reg_PXI_MAINPINTF = MAINP_SEND_IF | 0x0100; // ARM9に対してブートするようIRQで要求＋ARM7のステートを１にする。
BOOT_Core(); // never return
}
@ -82,4 +81,3 @@ static void BOOTi_ClearREG_RAM( void )
// クリアしていないレジスタは、VCOUNT, JOY, PIFCNT, MC-, EXMEMCNT, IME, PAUSE, POWLCDCNT, 他セキュリティ系です。
(void)OS_ResetRequestIrqMask(~0);
}
}

4
build/libraries_sysmenu/boot/ARM9/Makefile
View File

@ -26,11 +26,11 @@ TWL_PROC = ARM9
#----------------------------------------------------------------------------
SRCDIR = ../common/src
SRCDIR = ./src
INCDIR = ../common/include
SRCS = boot.c
SRCS = boot.c bootAPI.c
TARGET_LIB = libboot$(TWL_LIBSUFFIX).a

3
build/libraries_sysmenu/boot/ARM9/src/boot.c
View File

@ -16,6 +16,7 @@
*---------------------------------------------------------------------------*/
#include <twl.h>
#include <sysmenu/boot/common/boot.h>
//#include <nitro/mb.h>
//#include "IPL2_work.h"
//#include "define.h"
@ -29,7 +30,7 @@
// extern data-------------------------------------------------------
// from LCF
extern void SDK_IRQ_STACKSIZE( void );
//extern void SDK_IRQ_STACKSIZE( void );
// function's prototype----------------------------------------------
void BOOT_Core( void );

3
build/libraries_sysmenu/boot/ARM9/src/bootAPI.c
View File

@ -16,6 +16,7 @@
*---------------------------------------------------------------------------*/
#include <twl.h>
#include <sysmenu/boot/common/boot.h>
//#include <nitro/mb.h>
//#include "IPL2_work.h"
//#include "define.h"
@ -56,7 +57,7 @@ void BOOT_Ready( void )
(void)GX_VBlankIntr( FALSE );
(void)OS_SetIrqFunction( OS_IE_SUBP, NULL );
(void)OS_SetIrqMask( OS_IE_SUBP ); // サブプロセッサ割り込みのみを許可。
reg_PXI_SUBPINTF = SUBP_RECV_IF_ENABLE | 0x0f00; // ARM9ステートを "0x0f" に
// reg_PXI_SUBPINTF = SUBP_RECV_IF_ENABLE | 0x0f00; // ARM9ステートを "0x0f" に
// ※もうFIFOはクリア済みなので、使わない。
// ARM7からの通知待ち

9
build/libraries_sysmenu/sysmenu/ARM9/src/sysmenu_lib.c
View File

@ -22,6 +22,7 @@
#include "sysmenu_card.h"
#include "spi.h"
#include "mb_child.h"
#include <sysmenu/boot/common/boot.h>
// define data-----------------------------------------------------------------
@ -357,9 +358,11 @@ AuthResult SYSM_LoadAndAuthenticateTitle( TitleProperty *pBootTitle )
// アプリロード
// アプリ認証
// 実験用。実際にはこれ使えない（静的に8MBも退避メモリを確保してくれるので無理）
// ので、自前のロードプログラムが必要。
//NAM_LaunchTitle(pBootTitle->titleID);
// 実験用。namを改造している。ロードするだけ。
NAM_LaunchTitle(pBootTitle->titleID);
// 起動。
BOOT_Ready();
// パラメータチェック
if( !SYSMi_CheckTitlePointer( pBootTitle ) ) {

4
build/systemMenu_RED/Launcher/ARM9/Makefile
View File

@ -41,8 +41,10 @@ LINCLUDES = $(SRCDIR)/$(LOGO_DIR)
#LDEPENDS_NEF =
LLIBRARIES += libnam$(TWL_LIBSUFFIX).a\
libese$(TWL_LIBSUFFIX).a
libese$(TWL_LIBSUFFIX).a\
libboot$(TWL_LIBSUFFIX).a
ADDRESS_DTCM = 0x0e000000
DEFAULT_COMP_ARM7 = hyena
DEFAULT_MAKEROM_ARM7_BASE = $(TWLIPL_ROOT)/components/$(DEFAULT_COMP_ARM7)/$(TWL_BUILDTYPE_ARM7)/$(DEFAULT_COMP_ARM7)

6
build/systemMenu_RED/Launcher/ARM9/src/launcher.c
View File

@ -312,7 +312,7 @@ void LauncherInit( TitleProperty *pTitleList )
int i;
GX_DispOff();
GXS_DispOff();
NNS_G2dCharCanvasClear( &gCanvas, TXT_UCOLOR_GRAY );
NNS_G2dCharCanvasClear( &gCanvas, TXT_COLOR_WHITE );
DrawBackLightSwitch();
@ -414,8 +414,8 @@ TitleProperty *LauncherMain( TitleProperty *pTitleList )
if(pTitleList[selected].titleID != 0)
{
NNS_G2dCharCanvasClear( &gCanvas, TXT_COLOR_WHITE );
//return &pTitleList[selected];
return NULL;
return &pTitleList[selected];
//return NULL;
}
}

3
build/systemMenu_RED/Launcher/ARM9/src/main.c
View File

@ -68,6 +68,9 @@ void TwlMain( void )
FS_Init( FS_DMA_NOT_USE );
GX_Init();
// プロテクションユニット領域変更
OS_SetProtectionRegion( 2, 0x02280000, 512KB );
// 割り込み許可--------------------
(void)OS_SetIrqFunction(OS_IE_V_BLANK, INTR_VBlank);

81
include/sysmenu/boot/common/boot.h Normal file
View File

@ -0,0 +1,81 @@
/*---------------------------------------------------------------------------*
Project: TwlIPL
File: boot.h
Copyright 2007 Nintendo. All rights reserved.
These coded instructions, statements, and computer programs contain
proprietary information of Nintendo of America Inc. and/or Nintendo
Company Ltd., and are protected by Federal copyright law. They may
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.
$Date:: 2007-11-8#$
$Rev: $
$Author: yoshida_teruhisa $
*---------------------------------------------------------------------------*/
#if !defined(_SYSMENU_BOOT_H_)
#define _SYSMENU_BOOT_H_
#ifdef __cplusplus
extern "C" {
#endif
/*---------------------------------------------------------------------------*
Type definition
*---------------------------------------------------------------------------*/
/*---------------------------------------------------------------------------*
functions
*---------------------------------------------------------------------------*/
/*---------------------------------------------------------------------------*
Name: BOOT_Core
Description: ブートのコア関数
Arguments: None.
Returns: None.
*---------------------------------------------------------------------------*/
void BOOT_Core( void );
/*---------------------------------------------------------------------------*
Name: BOOT_Init
Description: ブートのための初期化
Arguments: None.
Returns: None.
*---------------------------------------------------------------------------*/
void BOOT_Init( void );
/*---------------------------------------------------------------------------*
Name: BOOT_WaitStart
Description: スタート待ち(ARM7)
Arguments: None.
Returns: None.
*---------------------------------------------------------------------------*/
BOOL BOOT_WaitStart( void );
/*---------------------------------------------------------------------------*
Name: BOOT_WaitStart
Description: ブート開始及びARM7への通知及び待機(ARM9)
Arguments: None.
Returns: None.
*---------------------------------------------------------------------------*/
void BOOT_Ready( void );
#ifdef __cplusplus
}
#endif
#endif /* _SYSMENU_BOOT_H_ */