From 1a68b9d4df7daa2064f0eb78192d89281cc412ee Mon Sep 17 00:00:00 2001 From: nakasima Date: Thu, 29 Jan 2009 06:56:19 +0000 Subject: [PATCH] =?UTF-8?q?thread=E3=83=87=E3=83=A2=E4=BF=AE=E6=AD=A3?= =?UTF-8?q?=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@232 b871894f-2f95-9b40-918c-086798483c85 --- .../build/bootrom/thread/ARM11/Makefile | 3 +- .../bootrom/build/bootrom/thread/ARM11/main.c | 38 ------------------- .../build/bootrom/thread/ARM9/Makefile | 3 +- .../bootrom/build/bootrom/thread/ARM9/main.c | 35 ----------------- trunk/bootrom/build/tests/thread/ARM11/main.c | 6 +-- 5 files changed, 7 insertions(+), 78 deletions(-) delete mode 100644 trunk/bootrom/build/bootrom/thread/ARM11/main.c delete mode 100644 trunk/bootrom/build/bootrom/thread/ARM9/main.c diff --git a/trunk/bootrom/build/bootrom/thread/ARM11/Makefile b/trunk/bootrom/build/bootrom/thread/ARM11/Makefile index 589f7f6..a664fa5 100644 --- a/trunk/bootrom/build/bootrom/thread/ARM11/Makefile +++ b/trunk/bootrom/build/bootrom/thread/ARM11/Makefile @@ -29,11 +29,12 @@ TARGET_BIN = thread11.padbin SRCS = \ main.c \ -SRCDIR = . # $(ROOT)/bootrom/build/tests/thread/ARM11 #LCFILE = # using default include $(CTRBROM_ROOT)/build/buildtools/commondefs +SRCDIR += $(ROOT)/bootrom/build/tests/thread/ARM11 + INSTALL_DIR = .. INSTALL_TARGETS = $(BINDIR)/$(TARGET_BIN_BASENAME).axf diff --git a/trunk/bootrom/build/bootrom/thread/ARM11/main.c b/trunk/bootrom/build/bootrom/thread/ARM11/main.c deleted file mode 100644 index eedb896..0000000 --- a/trunk/bootrom/build/bootrom/thread/ARM11/main.c +++ /dev/null @@ -1,38 +0,0 @@ -/*---------------------------------------------------------------------------* - Project: TwlBrom - thread - File: main.c - - Copyright 2008 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:: $ - $Rev$ - $Author$ - *---------------------------------------------------------------------------*/ -#include - -void BromMain( void ) -{ - osInitException(); - osInitBROM(); - - osPrintf( "ARM11: start\n" ); - - osInitThread(); - while (1) - { - OSTick tick = osGetTick(); - u32 mon = osGetPerfMonitor(OS_MONITOR_1); - osSleep(1000); - mon = osGetPerfMonitor(OS_MONITOR_1) - mon; - tick = osGetTick() - tick; - osTPrintf( "sleep mon = %llu msec\n", OS_TICK_TO_MSEC(mon) ); // MG20ではパフォーマンスモニタのクロックが違う - osTPrintf( "sleep tick = %llu msec\n", OS_TICK_TO_MSEC(tick) ); - } -} - diff --git a/trunk/bootrom/build/bootrom/thread/ARM9/Makefile b/trunk/bootrom/build/bootrom/thread/ARM9/Makefile index ef2465f..f49250a 100644 --- a/trunk/bootrom/build/bootrom/thread/ARM9/Makefile +++ b/trunk/bootrom/build/bootrom/thread/ARM9/Makefile @@ -31,11 +31,12 @@ TARGET_BIN = thread9.padbin SRCS = \ main.c \ -SRCDIR = . # $(ROOT)/bootrom/build/tests/thread/ARM9 #LCFILE = # using default include $(CTRBROM_ROOT)/build/buildtools/commondefs +SRCDIR = $(ROOT)/bootrom/build/tests/thread/ARM9 + INSTALL_DIR = .. INSTALL_TARGETS = $(BINDIR)/$(TARGET_BIN_BASENAME).axf diff --git a/trunk/bootrom/build/bootrom/thread/ARM9/main.c b/trunk/bootrom/build/bootrom/thread/ARM9/main.c deleted file mode 100644 index 2de8660..0000000 --- a/trunk/bootrom/build/bootrom/thread/ARM9/main.c +++ /dev/null @@ -1,35 +0,0 @@ -/*---------------------------------------------------------------------------* - Project: TwlBrom - thread - File: main.c - - Copyright 2008 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:: $ - $Rev$ - $Author$ - *---------------------------------------------------------------------------*/ -#include - -void BromSpMain( void ) -{ - osInitException(); - osInitBROM(); - - osPrintf( "ARM9: start\n" ); - - osInitThread(); - while (1) - { - OSTick tick = osGetTick(); - osSleep(1000); - tick = osGetTick() - tick; - osTPrintf( "sleep tick = %llu msec\n", OS_TICK_TO_MSEC(tick) ); - } -} - diff --git a/trunk/bootrom/build/tests/thread/ARM11/main.c b/trunk/bootrom/build/tests/thread/ARM11/main.c index 01f07c4..94e38ed 100644 --- a/trunk/bootrom/build/tests/thread/ARM11/main.c +++ b/trunk/bootrom/build/tests/thread/ARM11/main.c @@ -26,13 +26,13 @@ void BromMain( void ) osInitThread(); while (1) { - u32 mon = osGetPerfMonitor(OS_MONITOR_1); + u32 pmon = osGetPerfMonitor(OS_MONITOR_1); OSTick tick = osGetTick(); osSleep(1000); tick = osGetTick() - tick; - mon = osGetPerfMonitor(OS_MONITOR_1) - mon; + pmon = osGetPerfMonitor(OS_MONITOR_1) - pmon; osTPrintf( "sleep tick = %llu msec\n", OS_TICK_TO_MSEC(tick) ); - osTPrintf( "sleep mon = %llu msec\n", OS_PMON_TO_MSEC(mon) ); + osTPrintf( "sleep mon = %llu msec\n", OS_PMON_TO_MSEC(pmon) ); } }