mirror of
https://github.com/rvtr/twl_wrapsdk.git
synced 2025-10-31 06:11:10 -04:00
change NitroMain to TwlMain.
git-svn-id: file:///Users/lillianskinner/Downloads/platinum/twl/twl_wrapsdk/trunk@24 4ee2a332-4b2b-5046-8439-1ba90f034370
This commit is contained in:
nakasima
parent
7d7d2f8281
commit
9d40291ea9
@ -16,7 +16,7 @@
|
||||
#include <nitro/code32.h>
|
||||
#include <twl.h>
|
||||
|
||||
extern void NitroSpMain(void);
|
||||
extern void TwlMain(void);
|
||||
extern void OS_IrqHandler(void);
|
||||
extern void *const _start_ModuleParams[];
|
||||
static void do_autoload(void);
|
||||
@ -131,12 +131,12 @@ SDK_WEAK_SYMBOL asm void _start( void )
|
||||
#ifndef SDK_NOINIT
|
||||
//---- for C++
|
||||
bl _fp_init
|
||||
bl NitroSpStartUp
|
||||
bl TwlSpStartUp
|
||||
bl __call_static_initializers
|
||||
#endif
|
||||
|
||||
//---- start (to 16bit code)
|
||||
ldr r1, =NitroSpMain
|
||||
ldr r1, =TwlSpMain
|
||||
ldr lr, =HW_RESET_VECTOR
|
||||
|
||||
bx r1
|
||||
@ -261,7 +261,7 @@ static asm void detect_main_memory_size( void )
|
||||
}
|
||||
|
||||
/*---------------------------------------------------------------------------*
|
||||
Name: NitroSpStartUp
|
||||
Name: TwlSpStartUp
|
||||
|
||||
Description: hook for user start up
|
||||
|
||||
@ -269,6 +269,6 @@ static asm void detect_main_memory_size( void )
|
||||
|
||||
Returns: None.
|
||||
*---------------------------------------------------------------------------*/
|
||||
SDK_WEAK_SYMBOL void NitroSpStartUp(void)
|
||||
SDK_WEAK_SYMBOL void TwlSpStartUp(void)
|
||||
{
|
||||
}
|
||||
|
||||
@ -19,7 +19,7 @@
|
||||
#include <nitro/code32.h>
|
||||
#include <twl.h>
|
||||
|
||||
extern void NitroMain(void);
|
||||
extern void TwlMain(void);
|
||||
extern void OS_IrqHandler(void);
|
||||
static void do_autoload(void);
|
||||
static void init_cp15(void);
|
||||
@ -160,11 +160,11 @@ SDK_WEAK_SYMBOL asm void _start( void )
|
||||
#ifndef SDK_NOINIT
|
||||
//---- for C++
|
||||
bl _fp_init
|
||||
bl NitroStartUp
|
||||
bl TwlStartUp
|
||||
bl __call_static_initializers
|
||||
#endif
|
||||
//---- start (to 16bit code)
|
||||
ldr r1, =NitroMain
|
||||
ldr r1, =TwlMain
|
||||
ldr lr, =HW_RESET_VECTOR
|
||||
|
||||
tst sp, #4
|
||||
@ -614,7 +614,7 @@ static asm void init_cp15(void)
|
||||
|
||||
|
||||
/*---------------------------------------------------------------------------*
|
||||
Name: NitroStartUp
|
||||
Name: TwlStartUp
|
||||
|
||||
Description: hook for user start up
|
||||
|
||||
@ -622,7 +622,7 @@ static asm void init_cp15(void)
|
||||
|
||||
Returns: None.
|
||||
*---------------------------------------------------------------------------*/
|
||||
SDK_WEAK_SYMBOL void NitroStartUp(void)
|
||||
SDK_WEAK_SYMBOL void TwlStartUp(void)
|
||||
{
|
||||
}
|
||||
|
||||
|
||||
@ -89,7 +89,7 @@ int count;
|
||||
|
||||
//================================================================================
|
||||
/*---------------------------------------------------------------------------*
|
||||
Name: NitroMain
|
||||
Name: TwlMain
|
||||
|
||||
Description: main
|
||||
|
||||
@ -97,7 +97,7 @@ int count;
|
||||
|
||||
Returns: None
|
||||
*---------------------------------------------------------------------------*/
|
||||
void NitroMain()
|
||||
void TwlMain()
|
||||
{
|
||||
#ifdef SDK_DEBUGGER_ARM
|
||||
OS_Printf("ARM7 before OS_Init.\n");
|
||||
|
||||
@ -77,7 +77,7 @@ static u16 keyData;
|
||||
|
||||
//================================================================================
|
||||
/*---------------------------------------------------------------------------*
|
||||
Name: NitroMain
|
||||
Name: TwlMain
|
||||
|
||||
Description: main
|
||||
|
||||
@ -85,7 +85,7 @@ static u16 keyData;
|
||||
|
||||
Returns: None
|
||||
*---------------------------------------------------------------------------*/
|
||||
void NitroMain()
|
||||
void TwlMain()
|
||||
{
|
||||
OS_InitPrintServer();
|
||||
|
||||
|
||||
68
include/nitro/init/crt0.h
Normal file
68
include/nitro/init/crt0.h
Normal file
@ -0,0 +1,68 @@
|
||||
/*---------------------------------------------------------------------------*
|
||||
Project: NitroSDK - init - include
|
||||
File: crt0.h
|
||||
|
||||
Copyright 2003-2006 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.
|
||||
|
||||
$Log: crt0.h,v $
|
||||
Revision 1.8 2006/01/18 02:11:20 kitase_hirotake
|
||||
do-indent
|
||||
|
||||
Revision 1.7 2005/02/28 05:26:03 yosizaki
|
||||
do-indent.
|
||||
|
||||
Revision 1.6 2004/04/07 02:03:17 yada
|
||||
fix header comment
|
||||
|
||||
Revision 1.5 2004/02/18 02:38:06 yada
|
||||
StartUp 関数定義追加
|
||||
|
||||
Revision 1.4 2004/02/14 10:14:10 yasu
|
||||
aliased NitroMain -> NitroSpMain when ARM7
|
||||
|
||||
Revision 1.3 2004/02/13 08:17:52 yasu
|
||||
support ARM7
|
||||
|
||||
Revision 1.2 2004/02/05 07:09:03 yasu
|
||||
change SDK prefix iris -> nitro
|
||||
|
||||
Revision 1.1 2003/11/12 12:24:00 yasu
|
||||
crt0.o を base ライブラリから開放した
|
||||
|
||||
Revision 1.1 2003/11/10 09:03:04 yada
|
||||
void IrisMain(void) を設定
|
||||
|
||||
$NoKeywords: $
|
||||
*---------------------------------------------------------------------------*/
|
||||
|
||||
#ifndef NITRO_INIT_CRT0_H_
|
||||
#define NITRO_INIT_CRT0_H_
|
||||
|
||||
#ifdef __cplusplus
|
||||
extern "C" {
|
||||
#endif
|
||||
|
||||
#ifdef SDK_ARM9
|
||||
void TwlMain(void);
|
||||
void NitroStartUp(void);
|
||||
#define TwlStartUp NitroStartUp
|
||||
#else
|
||||
void TwlSpMain(void);
|
||||
#define TwlMain TwlSpMain
|
||||
void NitroSpStartUp(void);
|
||||
#define TwlSpStartUp NitroSpStartUp
|
||||
#define TwlStartUp TwlSpStartUp
|
||||
#endif
|
||||
|
||||
#ifdef __cplusplus
|
||||
} /* extern "C" */
|
||||
#endif
|
||||
|
||||
/* NITRO_INIT_CRT0_H_ */
|
||||
#endif
|
||||
@ -68,7 +68,7 @@ SECTIONS
|
||||
crt0.o (.text)
|
||||
crt0.o (.rodata)
|
||||
* (.version)
|
||||
OBJECT(NitroMain,*)
|
||||
OBJECT(TwlMain,*)
|
||||
<FOREACH.STATIC.OBJECTS=.text>
|
||||
<STATIC.OBJECT=.text:t>
|
||||
<END.STATIC.OBJECTS>
|
||||
|
||||
Loading…
Reference in New Issue
Block a user