From dee8f26f9632c5b3987fbd466ecfe313c18e5054 Mon Sep 17 00:00:00 2001 From: nakasima Date: Tue, 6 Jan 2009 02:21:55 +0000 Subject: [PATCH] =?UTF-8?q?=E3=82=B9=E3=83=AC=E3=83=83=E3=83=89=E3=83=A9?= =?UTF-8?q?=E3=82=A4=E3=83=96=E3=83=A9=E3=83=AA=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:///Volumes/Transfer/gigaleak_20231201/2020-09-30%20-%20paladin.7z/paladin/ctr_firmware@154 b871894f-2f95-9b40-918c-086798483c85 --- trunk/bootrom/build/libraries/os/common/os_thread.c | 10 ++++++++-- .../include/brom/specfiles/ARM11.ldscript.template | 6 +++--- .../include/brom/specfiles/ARM9.ldscript.template | 6 +++--- trunk/include/ctr/hw/ARM9/arm9_reg.h | 2 +- 4 files changed, 15 insertions(+), 9 deletions(-) diff --git a/trunk/bootrom/build/libraries/os/common/os_thread.c b/trunk/bootrom/build/libraries/os/common/os_thread.c index b4a1518..ba51230 100644 --- a/trunk/bootrom/build/libraries/os/common/os_thread.c +++ b/trunk/bootrom/build/libraries/os/common/os_thread.c @@ -2,7 +2,7 @@ Project: CtrBrom - libraries - OS File: os_init.c - Copyright 2008 Nintendo. All rights reserved. + Copyright 2008-2009 Nintendo. All rights reserved. These coded instructions, statements, and computer programs contain proprietary information of Nintendo of America Inc. and/or Nintendo @@ -22,10 +22,15 @@ //--------------------------------------------------------------------------- +#ifdef BROM_TARGET_BROM +#define OSi_SYS_STACKSIZE HW_BROM_SYS_STACK_SIZE +#define OSi_IRQ_STACKSIZE HW_BROM_IRQ_STACK_SIZE +#else // BROM_TARGET_APP extern unsigned long SDK_SYS_STACKSIZE[]; extern unsigned long SDK_IRQ_STACKSIZE[]; #define OSi_SYS_STACKSIZE ((s32)SDK_SYS_STACKSIZE) #define OSi_IRQ_STACKSIZE ((s32)SDK_IRQ_STACKSIZE) +#endif // BROM_TARGET_APP //---- Stack CheckNumber #ifdef SDK_ARM9 @@ -497,6 +502,7 @@ void osInitThread(void) { return; } + osInitAlarm(); i_osIsThreadInitialized = TRUE; #ifndef SDK_THREAD_INFINITY @@ -1571,7 +1577,7 @@ void i_osCheckStack(const char *file, int line, const OSThread *thread) Returns: Stack Pointer *---------------------------------------------------------------------------*/ -static u32 i_osSystemStackBuffer; +u32 i_osSystemStackBuffer; #include asm u32 i_osGetSystemStackPointer( void ) diff --git a/trunk/bootrom/include/brom/specfiles/ARM11.ldscript.template b/trunk/bootrom/include/brom/specfiles/ARM11.ldscript.template index 44bbf94..32f9304 100644 --- a/trunk/bootrom/include/brom/specfiles/ARM11.ldscript.template +++ b/trunk/bootrom/include/brom/specfiles/ARM11.ldscript.template @@ -1,8 +1,8 @@ /*---------------------------------------------------------------------------* - Project: TwlBrom - specfiles - File: ARM11-TEG.ldscript.template + Project: CtrBrom - specfiles + File: ARM11.ldscript.template - Copyright 2008 Nintendo. All rights reserved. + Copyright 2008-2009 Nintendo. All rights reserved. These coded instructions, statements, and computer programs contain proprietary information of Nintendo of America Inc. and/or Nintendo diff --git a/trunk/bootrom/include/brom/specfiles/ARM9.ldscript.template b/trunk/bootrom/include/brom/specfiles/ARM9.ldscript.template index 6ce7116..51d69f1 100644 --- a/trunk/bootrom/include/brom/specfiles/ARM9.ldscript.template +++ b/trunk/bootrom/include/brom/specfiles/ARM9.ldscript.template @@ -1,8 +1,8 @@ /*---------------------------------------------------------------------------* - Project: TwlBrom - specfiles - File: ARM9-TEG.ldscript.template + Project: CtrBrom - specfiles + File: ARM9.ldscript.template - Copyright 2008 Nintendo. All rights reserved. + Copyright 2008-2009 Nintendo. All rights reserved. These coded instructions, statements, and computer programs contain proprietary information of Nintendo of America Inc. and/or Nintendo diff --git a/trunk/include/ctr/hw/ARM9/arm9_reg.h b/trunk/include/ctr/hw/ARM9/arm9_reg.h index 0b5419d..ce6ebce 100644 --- a/trunk/include/ctr/hw/ARM9/arm9_reg.h +++ b/trunk/include/ctr/hw/ARM9/arm9_reg.h @@ -32,7 +32,7 @@ extern "C" { #define HW_DC_SIZE 0x1000 // データキャッシュ #define HW_CACHE_LINE_SIZE 32 -#define HW_SYSTEM_CLOCK 33514000 // 正確には33513982? +#define HW_SYSTEM_CLOCK (33514000 * 2) // 正確には33513982? //----------------------------------------------------------------------