ARMmbed
/
mbed-os
mirror of https://github.com/ARMmbed/mbed-os.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Properly configure PRS API so it actually delegates the shared interrupt slot to the appropriate peripheral

pull/12160/head
George Beckstein 2019-12-20 13:56:40 -05:00
parent dc6320239b
commit b6befee4cf
3 changed files with 74 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
targets/TARGET_NORDIC/TARGET_NRF5x/TARGET_NRF52/TARGET_MCU_NRF52832/config/sdk_config.h
View File

@ -4038,9 +4038,45 @@
// </e> // </e>
// <e> NRFX_PRS_ENABLED - nrfx_prs - Peripheral Resource Sharing module
//==========================================================
#ifndef NRFX_PRS_ENABLED #ifndef NRFX_PRS_ENABLED
#define NRFX_PRS_ENABLED 1 #define NRFX_PRS_ENABLED 1
#endif #endif
// <q> NRFX_PRS_BOX_0_ENABLED - Enables box 0 in the module.
#ifndef NRFX_PRS_BOX_0_ENABLED
#define NRFX_PRS_BOX_0_ENABLED 1
#endif
// <q> NRFX_PRS_BOX_1_ENABLED - Enables box 1 in the module.
#ifndef NRFX_PRS_BOX_1_ENABLED
#define NRFX_PRS_BOX_1_ENABLED 1
#endif
// <q> NRFX_PRS_BOX_2_ENABLED - Enables box 2 in the module.
#ifndef NRFX_PRS_BOX_2_ENABLED
#define NRFX_PRS_BOX_2_ENABLED 1
#endif
// <q> NRFX_PRS_BOX_3_ENABLED - Enables box 3 in the module.
#ifndef NRFX_PRS_BOX_3_ENABLED
#define NRFX_PRS_BOX_3_ENABLED 1
#endif
// <q> NRFX_PRS_BOX_4_ENABLED - Enables box 4 in the module.
#ifndef NRFX_PRS_BOX_4_ENABLED
#define NRFX_PRS_BOX_4_ENABLED 1
#endif
// </e> // </e>

38
targets/TARGET_NORDIC/TARGET_NRF5x/TARGET_NRF52/TARGET_MCU_NRF52840/config/sdk_config.h
View File

@ -4040,9 +4040,47 @@
// </e> // </e>
// <e> NRFX_PRS_ENABLED - nrfx_prs - Peripheral Resource Sharing module
//==========================================================
#ifndef NRFX_PRS_ENABLED #ifndef NRFX_PRS_ENABLED
#define NRFX_PRS_ENABLED 1 #define NRFX_PRS_ENABLED 1
#endif #endif
// <q> NRFX_PRS_BOX_0_ENABLED - Enables box 0 in the module.
#ifndef NRFX_PRS_BOX_0_ENABLED
#define NRFX_PRS_BOX_0_ENABLED 1
#endif
// <q> NRFX_PRS_BOX_1_ENABLED - Enables box 1 in the module.
#ifndef NRFX_PRS_BOX_1_ENABLED
#define NRFX_PRS_BOX_1_ENABLED 1
#endif
// <q> NRFX_PRS_BOX_2_ENABLED - Enables box 2 in the module.
#ifndef NRFX_PRS_BOX_2_ENABLED
#define NRFX_PRS_BOX_2_ENABLED 1
#endif
// <q> NRFX_PRS_BOX_3_ENABLED - Enables box 3 in the module.
#ifndef NRFX_PRS_BOX_3_ENABLED
#define NRFX_PRS_BOX_3_ENABLED 1
#endif
// <q> NRFX_PRS_BOX_4_ENABLED - Enables box 4 in the module.
#ifndef NRFX_PRS_BOX_4_ENABLED
#define NRFX_PRS_BOX_4_ENABLED 1
#endif
// </e>
// <e> NRFX_TWI_ENABLED - nrfx_twi - TWI peripheral driver // <e> NRFX_TWI_ENABLED - nrfx_twi - TWI peripheral driver
//========================================================== //==========================================================

4
targets/TARGET_NORDIC/TARGET_NRF5x/TARGET_SDK_15_0/modules/nrfx/drivers/src/nrfx_twi.c
View File

@ -706,22 +706,18 @@ static void twi_irq_handler(NRF_TWI_Type * p_twi, twi_control_block_t * p_cb)
} }
#if 0
#if NRFX_CHECK(NRFX_TWI0_ENABLED) #if NRFX_CHECK(NRFX_TWI0_ENABLED)
void nrfx_twi_0_irq_handler(void) void nrfx_twi_0_irq_handler(void)
{ {
twi_irq_handler(NRF_TWI0, &m_cb[NRFX_TWI0_INST_IDX]); twi_irq_handler(NRF_TWI0, &m_cb[NRFX_TWI0_INST_IDX]);
} }
#endif #endif
#endif
#if 0
#if NRFX_CHECK(NRFX_TWI1_ENABLED) #if NRFX_CHECK(NRFX_TWI1_ENABLED)
void nrfx_twi_1_irq_handler(void) void nrfx_twi_1_irq_handler(void)
{ {
twi_irq_handler(NRF_TWI1, &m_cb[NRFX_TWI1_INST_IDX]); twi_irq_handler(NRF_TWI1, &m_cb[NRFX_TWI1_INST_IDX]);
} }
#endif #endif
#endif
#endif // NRFX_CHECK(NRFX_TWI_ENABLED) #endif // NRFX_CHECK(NRFX_TWI_ENABLED)