diff options
| -rw-r--r-- | ecos/packages/hal/cortexm/vybrid/var/current/include/var_io.h | 4 | ||||
| -rw-r--r-- | ecos/packages/hal/cortexm/vybrid/var/current/src/vybrid_misc.c | 5 |
2 files changed, 6 insertions, 3 deletions
diff --git a/ecos/packages/hal/cortexm/vybrid/var/current/include/var_io.h b/ecos/packages/hal/cortexm/vybrid/var/current/include/var_io.h index 4e01990..33824f7 100644 --- a/ecos/packages/hal/cortexm/vybrid/var/current/include/var_io.h +++ b/ecos/packages/hal/cortexm/vybrid/var/current/include/var_io.h @@ -129,9 +129,9 @@ #define CYGHWR_HAL_VYBRID_MSCM_IRCPGIR_TLF_S 24 #define CYGHWR_HAL_VYBRID_MSCM_IRSPRCn_BASE (CYGHWR_HAL_VYBRID_MSCM_BASE + 0x880) #define CYGHWR_HAL_VYBRID_MSCM_IRSPRCn_CP1En_M 0x0002 -#define CYGHWR_HAL_VYBRID_MSCM_IRSPRCn_CP1En_S 0 +#define CYGHWR_HAL_VYBRID_MSCM_IRSPRCn_CP1En_S 1 #define CYGHWR_HAL_VYBRID_MSCM_IRSPRCn_CP0En_M 0x0001 -#define CYGHWR_HAL_VYBRID_MSCM_IRSPRCn_CP0En_S 1 +#define CYGHWR_HAL_VYBRID_MSCM_IRSPRCn_CP0En_S 0 #define CYGHWR_HAL_VYBRID_MSCM_IRSPRCn_RO_M 0x8000 #define CYGHWR_HAL_VYBRID_MSCM_IRSPRCn_RO_S 15 diff --git a/ecos/packages/hal/cortexm/vybrid/var/current/src/vybrid_misc.c b/ecos/packages/hal/cortexm/vybrid/var/current/src/vybrid_misc.c index 751b8c0..aa0e4fa 100644 --- a/ecos/packages/hal/cortexm/vybrid/var/current/src/vybrid_misc.c +++ b/ecos/packages/hal/cortexm/vybrid/var/current/src/vybrid_misc.c @@ -231,7 +231,10 @@ hal_clock_disable(cyg_uint32 ccgr) int hal_get_core_num(void) { - return CYGHWR_HAL_VYBRID_MSCM_CPxNUM & CYGHWR_HAL_VYBRID_MSCM_CPxNUM_CPN_M; + cyg_uint32 reg; + HAL_READ_UINT32(CYGHWR_HAL_VYBRID_MSCM_CPxNUM, reg); + + return (reg & CYGHWR_HAL_VYBRID_MSCM_CPxNUM_CPN_M); } //========================================================================== |