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

SMPビルドスイッチ追加。

Browse Source 
git-svn-id: file:///Volumes/Transfer/gigaleak_20231201/2020-09-30%20-%20paladin.7z/paladin/ctr_firmware@218 b871894f-2f95-9b40-918c-086798483c85
This commit is contained in:
nakasima 2009-01-27 09:06:36 +00:00
parent d08f115de8
commit 5c54d429f3
4 changed files with 80 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
trunk/bootrom/build/buildtools/commondefs.config
View File

@ -22,6 +22,7 @@ BROM_COMMONDEFS_CONFIG_ = TRUE
#BROM_DEV_EARLY_RELEASE = TRUE
#BROM_DEF_LINK_SCATLD = TRUE
BROM_ENABLE_SCATLD_VFP = TRUE
#BROM_ENABLE_SMP_CODE = TRUE
ifdef BROM_ENABLE_BOOTROM_WRITE
MACRO_FLAGS += -DBROM_ENABLE_BOOTROM_WRITE
@ -37,6 +38,9 @@ ifeq ($(CODEGEN_PROC),ARM11)
MACRO_FLAGS += -DBROM_ENABLE_SCATLD_VFP
endif
endif
ifdef BROM_ENABLE_SMP_CODE
MACRO_FLAGS += -DBROM_ENABLE_SMP_CODE
endif
#----------------------------------------------------------------------------
endif # BROM_COMMONDEFS_CONFIG_

33
trunk/bootrom/build/libraries/os/common/os_interrupt.c
View File

@ -836,7 +836,7 @@ BOOL osSetInterruptCheckID( OSIntrID id )
#ifdef SDK_ARM11
u32 ofs = id/32;
u32 sft = id%32;
u32 *buf = &((OSIntrMask *)HW_INTR_CHECK0_BUF)->w[ofs];
u32 *buf = &((OSIntrMask *)OS_INTR_CHECK_BUF())->w[ofs];
#else // SDK_ARM9
u32 sft = id;
u32 *buf = (OSIntrMask *)HW_INTR_CHECK_BUF;
@ -865,7 +865,7 @@ BOOL osClearInterruptCheckID( OSIntrID id )
#ifdef SDK_ARM11
u32 ofs = id/32;
u32 sft = id%32;
u32 *buf = &((OSIntrMask *)HW_INTR_CHECK0_BUF)->w[ofs];
u32 *buf = &((OSIntrMask *)OS_INTR_CHECK_BUF())->w[ofs];
#else // SDK_ARM9
u32 sft = id;
u32 *buf = (OSIntrMask *)HW_INTR_CHECK_BUF;
@ -893,7 +893,7 @@ BOOL osIsInterruptCheckID( OSIntrID id )
#ifdef SDK_ARM11
u32 ofs = id/32;
u32 sft = id%32;
u32 *buf = &((OSIntrMask *)HW_INTR_CHECK0_BUF)->w[ofs];
u32 *buf = &((OSIntrMask *)OS_INTR_CHECK_BUF())->w[ofs];
#else // SDK_ARM9
u32 sft = id;
u32 *buf = (OSIntrMask *)HW_INTR_CHECK_BUF;
@ -917,10 +917,11 @@ void osSetInterruptCheckMask( OSIntrMask mask )
{
OSIntrMode enabled = osDisableInterrupts();
#ifdef SDK_ARM11
((OSIntrMask *)HW_INTR_CHECK0_BUF)->w[0] |= mask.w[0];
((OSIntrMask *)HW_INTR_CHECK0_BUF)->w[1] |= mask.w[1];
((OSIntrMask *)HW_INTR_CHECK0_BUF)->w[2] |= mask.w[2];
((OSIntrMask *)HW_INTR_CHECK0_BUF)->w[3] |= mask.w[3];
OSIntrMask *buf = (void *)OS_INTR_CHECK_BUF();
buf->w[0] |= mask.w[0];
buf->w[1] |= mask.w[1];
buf->w[2] |= mask.w[2];
buf->w[3] |= mask.w[3];
#else // SDK_ARM9
*(OSIntrMask *)HW_INTR_CHECK_BUF |= mask;
#endif // SDK_ARM9
@ -940,10 +941,11 @@ void osClearInterruptCheckMask( OSIntrMask mask )
{
OSIntrMode enabled = osDisableInterrupts();
#ifdef SDK_ARM11
((OSIntrMask *)HW_INTR_CHECK0_BUF)->w[0] &= ~mask.w[0];
((OSIntrMask *)HW_INTR_CHECK0_BUF)->w[1] &= ~mask.w[1];
((OSIntrMask *)HW_INTR_CHECK0_BUF)->w[2] &= ~mask.w[2];
((OSIntrMask *)HW_INTR_CHECK0_BUF)->w[3] &= ~mask.w[3];
OSIntrMask *buf = (void *)OS_INTR_CHECK_BUF();
buf->w[0] &= ~mask.w[0];
buf->w[1] &= ~mask.w[1];
buf->w[2] &= ~mask.w[2];
buf->w[3] &= ~mask.w[3];
#else // SDK_ARM9
*(OSIntrMask *)HW_INTR_CHECK_BUF &= ~mask;
#endif // SDK_ARM9
@ -964,10 +966,11 @@ BOOL osIsInterruptCheckMask( OSIntrMask mask )
u32 tmp;
#ifdef SDK_ARM11
OSIntrMode enabled = osDisableInterrupts();
tmp = ((OSIntrMask *)HW_INTR_CHECK0_BUF)->w[0] & mask.w[0];
tmp |= ((OSIntrMask *)HW_INTR_CHECK0_BUF)->w[1] & mask.w[1];
tmp |= ((OSIntrMask *)HW_INTR_CHECK0_BUF)->w[2] & mask.w[2];
tmp |= ((OSIntrMask *)HW_INTR_CHECK0_BUF)->w[3] & mask.w[3];
OSIntrMask *buf = (void *)OS_INTR_CHECK_BUF();
tmp = buf->w[0] & mask.w[0];
tmp |= buf->w[1] & mask.w[1];
tmp |= buf->w[2] & mask.w[2];
tmp |= buf->w[3] & mask.w[3];
(void)osRestoreInterrupts( enabled );
#else // SDK_ARM9
tmp = osGetInterruptCheckMask() & mask;

27
trunk/bootrom/build/libraries/os/common/os_system.c
View File

@ -18,6 +18,33 @@
#define osTPrintf(...) ((void)0)
#ifdef SDK_ARM11
#ifdef BROM_ENABLE_SMP_CODE
//============================================================================
// MULTI CORE
//============================================================================
/*---------------------------------------------------------------------------*
Name: osGetCpuID
Description: Get CPU-ID
Arguments: None.
Returns: CPU-ID (field 0-3)
*---------------------------------------------------------------------------*/
#include <brom/code32.h>
asm u8 osGetCpuID( void )
{
mrc p15,0, r0, c0, c0, 5
and r0, r0, #HW_C0_AP_CPU_ID_MASK
bx lr
}
#include <brom/codereset.h>
#endif // BROM_ENABLE_SMP_CODE
#endif // SDK_ARM11
//============================================================================
// PROCESSER MODE

33
trunk/bootrom/include/brom/os/common/system.h
View File

@ -75,8 +75,16 @@ OSProcMode;
#ifdef SDK_ARM9
#define OS_SVC_STACK_SIZE 0x1000
#define OS_IRQ_STACK_SIZE 0x1000
#else // SDK_MPCORE
#endif // SDK_MPCORE
#endif // SDK_ARM9
#ifdef SDK_ARM11
#ifdef BROM_ENABLE_SMP_CODE
#define OS_INTR_CHECK_BUF_OFFSET() (-osGetCpuID()*16)
#else // BROM_ENABLE_SMP_CODE
#define OS_INTR_CHECK_BUF_OFFSET() 0
#endif // BROM_ENABLE_SMP_CODE
#define OS_INTR_CHECK_BUF() (HW_INTR_CHECK0_BUF + OS_INTR_CHECK_BUF_OFFSET())
#endif // SDK_ARM11
//---- sec to cpu cycle
@ -124,6 +132,27 @@ static inline u32 i_osCpuCycleToNSec( OSCpuCycle cyc )
}
//============================================================================
// MULTI CORE
//============================================================================
/*---------------------------------------------------------------------------*
Name: osGetCpuID
Description: Get CPU-ID
Arguments: None.
Returns: CPU-ID (field 0-3)
*---------------------------------------------------------------------------*/
#ifdef BROM_ENABLE_SMP_CODE
u8 osGetCpuID( void );
#else // BROM_ENABLE_SMP_CODE
static inline u8 osGetCpuID( void )
{
return 0;
}
#endif // BROM_ENABLE_SMP_CODE
//============================================================================
// PROCESSER MODE
//============================================================================