From 8bd2222bd20e36376d65cab58eeeb0a559047020 Mon Sep 17 00:00:00 2001 From: nakasima Date: Wed, 14 Jan 2009 09:42:18 +0000 Subject: [PATCH] =?UTF-8?q?ARM11=E3=81=AE=E3=82=BF=E3=82=A4=E3=83=9E?= =?UTF-8?q?=E3=83=BC=E5=89=B2=E3=82=8A=E8=BE=BC=E3=81=BF=E9=96=93=E9=9A=94?= =?UTF-8?q?=E3=82=92=E9=95=B7=E3=82=81=E3=81=AB=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@172 b871894f-2f95-9b40-918c-086798483c85 --- trunk/bootrom/build/libraries/os/common/os_alarm.c | 4 ++++ trunk/bootrom/include/brom/os/common/tick.h | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/trunk/bootrom/build/libraries/os/common/os_alarm.c b/trunk/bootrom/build/libraries/os/common/os_alarm.c index c9f1507..2f37fcb 100644 --- a/trunk/bootrom/build/libraries/os/common/os_alarm.c +++ b/trunk/bootrom/build/libraries/os/common/os_alarm.c @@ -64,7 +64,11 @@ static void i_osSetTimer(OSAlarm *alarm) delta = (s64)(alarm->fire - tick); //---- let timer be disable +#ifdef SDK_ARM11 + osClearTimerEventFlag(OSi_ALARM_TIMER); +#else // SDK_ARM9 osSetTimerControl(OSi_ALARM_TIMER, 0); +#endif // SDK_ARM9 //---- set interrupt callback osSetInterruptHandler( OSi_ALARM_IE_TIMER_ID, i_osArrangeTimer ); diff --git a/trunk/bootrom/include/brom/os/common/tick.h b/trunk/bootrom/include/brom/os/common/tick.h index 0149ac3..b010d94 100644 --- a/trunk/bootrom/include/brom/os/common/tick.h +++ b/trunk/bootrom/include/brom/os/common/tick.h @@ -53,7 +53,7 @@ extern void i_osSetTick( u64 ); #ifdef SDK_ARM11 #define OS_TICK_CLOCK HW_CPU_CLOCK #define OS_TICK_PRESCALE 1 -#define OS_TICK_HI_SHIFT 24 // 2の累乗単位でチック管理するのであれば32は指定できない（ロード値0では割り込みが発生しないため。最大31） +#define OS_TICK_HI_SHIFT 28 // 2の累乗単位でチック管理するのであれば32は指定できない（ロード値0では割り込みが発生しないため。最大31） #define OS_TICK_HI_LSB (1ULL<>1))