michaelh/zephyr
1
0
Fork 0
Code Releases Activity

sw_isr_table.h: fix __COUNTER__ usage

Browse source 
We can't pass __COUNTER__ and then use it with '##' directly, because
the result is that the actual token __COUNTER__ is what gets pasted.

Fix that with another expansion, so __COUNTER__ is replaced with a
number before '## can' see it.

Signed-off-by: Martí Bolívar <marti.bolivar@nordicsemi.no>
This commit is contained in:
Martí Bolívar 2020-04-14 22:26:04 -07:00 • committed by Carles Cufí
commit 63c936df7d
1 changed files with 2 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

3
include/sw_isr_table.h
View file

@ -58,7 +58,8 @@ struct _isr_list {
/** This interrupt gets put directly in the vector table */ /** This interrupt gets put directly in the vector table */
#define ISR_FLAG_DIRECT BIT(0) #define ISR_FLAG_DIRECT BIT(0)
#define _MK_ISR_NAME(x, y) __isr_ ## x ## _irq_ ## y #define _MK_ISR_NAME(x, y) __MK_ISR_NAME(x, y)
#define __MK_ISR_NAME(x, y) __isr_ ## x ## _irq_ ## y
/* Create an instance of struct _isr_list which gets put in the .intList /* Create an instance of struct _isr_list which gets put in the .intList
* section. This gets consumed by gen_isr_tables.py which creates the vector * section. This gets consumed by gen_isr_tables.py which creates the vector