rvtr/ctr_firmware
1
Fork 0
mirror of https://github.com/rvtr/ctr_firmware.git synced 2025-10-31 07:51:08 -04:00
Code Issues Actions Packages Projects Releases Wiki Activity

osSetTick修正かつ非公開化。

Browse Source 
git-svn-id: file:///Volumes/Transfer/gigaleak_20231201/2020-09-30%20-%20paladin.7z/paladin/ctr_firmware@116 b871894f-2f95-9b40-918c-086798483c85
This commit is contained in:
nakasima 2008-12-17 10:33:52 +00:00
parent a8d868b3dd
commit 83a1b88e57
3 changed files with 22 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
trunk/bootrom/build/libraries/os/ARM11/os_interrupt.c
View File

@ -178,7 +178,7 @@ BOOL osRestoreInterruptID( OSIntrID id, BOOL state )
} }
/*---------------------------------------------------------------------------* /*---------------------------------------------------------------------------*
Name: osSetInterruptPending Name: osSetInterruptPendingID
Description: set Interrupt Set Pending Register Description: set Interrupt Set Pending Register
@ -187,7 +187,7 @@ BOOL osRestoreInterruptID( OSIntrID id, BOOL state )
Returns: TRUE if last state is pending Returns: TRUE if last state is pending
*---------------------------------------------------------------------------*/ *---------------------------------------------------------------------------*/
BOOL osSetInterruptPending( OSIntrID id ) BOOL osSetInterruptPendingID( OSIntrID id )
{ {
u32 ofs = id/32; u32 ofs = id/32;
u32 sft = id%32; u32 sft = id%32;
@ -201,7 +201,7 @@ BOOL osSetInterruptPending( OSIntrID id )
} }
/*---------------------------------------------------------------------------* /*---------------------------------------------------------------------------*
Name: osClearInterruptPending Name: osClearInterruptPendingID
Description: set Interrupt Clear Pending Register Description: set Interrupt Clear Pending Register
@ -210,7 +210,7 @@ BOOL osSetInterruptPending( OSIntrID id )
Returns: TRUE if last state is pending Returns: TRUE if last state is pending
*---------------------------------------------------------------------------*/ *---------------------------------------------------------------------------*/
BOOL osClearInterruptPending( OSIntrID id ) BOOL osClearInterruptPendingID( OSIntrID id )
{ {
u32 ofs = id/32; u32 ofs = id/32;
u32 sft = id%32; u32 sft = id%32;
@ -224,7 +224,7 @@ BOOL osClearInterruptPending( OSIntrID id )
} }
/*---------------------------------------------------------------------------* /*---------------------------------------------------------------------------*
Name: osRestoreInterruptPending Name: osRestoreInterruptPendingID
Description: restore Interrupt Pending Description: restore Interrupt Pending
@ -234,7 +234,7 @@ BOOL osClearInterruptPending( OSIntrID id )
Returns: TRUE if last state is pending Returns: TRUE if last state is pending
*---------------------------------------------------------------------------*/ *---------------------------------------------------------------------------*/
BOOL osRestoreInterruptPending( OSIntrID id, BOOL state ) BOOL osRestoreInterruptPendingID( OSIntrID id, BOOL state )
{ {
u32 ofs = id/32; u32 ofs = id/32;
u32 sft = id%32; u32 sft = id%32;

20
trunk/bootrom/build/libraries/os/common/os_tick.c
View File

@ -202,7 +202,7 @@ u16 osGetTickLo(void)
#endif // SDK_ARM9 #endif // SDK_ARM9
/*---------------------------------------------------------------------------* /*---------------------------------------------------------------------------*
Name: osSetTick Name: i_osSetTick
Description: set tick value Description: set tick value
@ -210,7 +210,7 @@ u16 osGetTickLo(void)
Returns: None Returns: None
*---------------------------------------------------------------------------*/ *---------------------------------------------------------------------------*/
void osSetTick(u64 count) void i_osSetTick(u64 count)
{ {
OSIntrMode prev; OSIntrMode prev;
@ -219,21 +219,21 @@ void osSetTick(u64 count)
i_osNeedResetTimer = TRUE; i_osNeedResetTimer = TRUE;
i_osTickCounter = (u64)(count >> OS_TICK_HI_SHIFT);
#ifdef SDK_ARM11 #ifdef SDK_ARM11
osClearInterruptPending(OSi_TICK_IE_TIMER_ID);
i_osTickCounter = (u64)(count >> OS_TICK_HI_SHIFT);
osStopTimer(); osStopTimer();
osClearInterruptPendingID(OSi_TICK_IE_TIMER_ID);
osStartTimer((u32)(count & OS_TICK_LO_MASK), 0); osStartTimer((u32)(count & OS_TICK_LO_MASK), 0);
#else // SDK_ARM9 #else // SDK_ARM9
reg_OS_IF = OSi_TICK_IE_TIMER;
i_osTickCounter = (u64)(count >> OS_TICK_HI_SHIFT);
osSetTimerControl(OSi_TICK_TIMER, 0); osSetTimerControl(OSi_TICK_TIMER, 0);
osClearInterruptPendingID(OSi_TICK_IE_TIMER_ID);
osSetTimerCount((OSTimer)OSi_TICK_TIMER, (u16)(count & OS_TICK_LO_MASK)); osSetTimerCount((OSTimer)OSi_TICK_TIMER, (u16)(count & OS_TICK_LO_MASK));
osSetTimerControl(OSi_TICK_TIMER, (u16)OSi_TICK_TIMERCONTROL); osSetTimerControl(OSi_TICK_TIMER, (u16)OSi_TICK_TIMERCONTROL);
#endif // SDK_ARM9 #endif // SDK_ARM9
(void)osRestoreInterrupts(prev); (void)osRestoreInterrupts(prev);

12
trunk/bootrom/include/brom/os/ARM11/interrupt.h
View File

@ -77,7 +77,7 @@ BOOL osDisableInterruptID( OSIntrID id );
BOOL osRestoreInterruptID( OSIntrID id, BOOL state ); BOOL osRestoreInterruptID( OSIntrID id, BOOL state );
/*---------------------------------------------------------------------------* /*---------------------------------------------------------------------------*
Name: osSetInterruptPending Name: osSetInterruptPendingID
Description: set Interrupt Set Pending Register Description: set Interrupt Set Pending Register
@ -85,10 +85,10 @@ BOOL osRestoreInterruptID( OSIntrID id, BOOL state );
Returns: TRUE if last state is pending Returns: TRUE if last state is pending
*---------------------------------------------------------------------------*/ *---------------------------------------------------------------------------*/
BOOL osSetInterruptPending( OSIntrID id ); BOOL osSetInterruptPendingID( OSIntrID id );
/*---------------------------------------------------------------------------* /*---------------------------------------------------------------------------*
Name: osClearInterruptPending Name: osClearInterruptPendingID
Description: set Interrupt Clear Pending Register Description: set Interrupt Clear Pending Register
@ -96,10 +96,10 @@ BOOL osSetInterruptPending( OSIntrID id );
Returns: TRUE if last state is pending Returns: TRUE if last state is pending
*---------------------------------------------------------------------------*/ *---------------------------------------------------------------------------*/
BOOL osClearInterruptPending( OSIntrID id ); BOOL osClearInterruptPendingID( OSIntrID id );
/*---------------------------------------------------------------------------* /*---------------------------------------------------------------------------*
Name: osRestoreInterruptPending Name: osRestoreInterruptPendingID
Description: restore Interrupt Pending Description: restore Interrupt Pending
@ -108,7 +108,7 @@ BOOL osClearInterruptPending( OSIntrID id );
Returns: TRUE if last state is pending Returns: TRUE if last state is pending
*---------------------------------------------------------------------------*/ *---------------------------------------------------------------------------*/
BOOL osRestoreInterruptPending( OSIntrID id, BOOL state ); BOOL osRestoreInterruptPendingID( OSIntrID id, BOOL state );
/*---------------------------------------------------------------------------* /*---------------------------------------------------------------------------*
Name: osSetEndOfInterruptRegister Name: osSetEndOfInterruptRegister