michaelh/zephyr
1
0
Fork 0
Code Releases Activity

Rename _IsrTable to _sw_isr_table

Browse source 
Updating global variable's name to follow a consistent naming convention.

Change accomplished with the following script:

   #!/bin/bash
   echo "Searching for ${1} to replace with ${2}"
   find ./ \( -name "*.[chs]" -o -name "sysgen.py" -o -name "*.kconf" -o -name "*.arch" \) \
            ! -path "./host/src/genIdt/*" \
            ! -path "*/outdir/*" | xargs sed -i 's/\b'${1}'\b/'${2}'/g';

Change-Id: I7fc572f869c5f104538cfb3f84b1b36071e54dde
Signed-off-by: Yonattan Louise <yonattan.a.louise.mendoza@intel.com>
This commit is contained in:
Yonattan Louise 2015-05-08 17:12:46 -05:00 • committed by Anas Nashif
commit 092f1132fe
7 changed files with 18 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

10
arch/arc/core/irq_manage.c
View file

@ -73,12 +73,12 @@ void irq_handler_set(
int key = irq_lock_inline(); int key = irq_lock_inline();
int index = irq - 16; int index = irq - 16;
__ASSERT(old == _IsrTable[index].isr, __ASSERT(old == _sw_isr_table[index].isr,
"expected ISR not found in table"); "expected ISR not found in table");
if (old == _IsrTable[index].isr) { if (old == _sw_isr_table[index].isr) {
_IsrTable[index].isr = new; _sw_isr_table[index].isr = new;
_IsrTable[index].arg = arg; _sw_isr_table[index].arg = arg;
} }
irq_unlock_inline(key); irq_unlock_inline(key);
@ -201,5 +201,5 @@ void irq_disconnect(unsigned int irq)
{ {
int index = irq - 16; int index = irq - 16;
irq_handler_set(irq, _IsrTable[index].isr, _irq_spurious, NULL); irq_handler_set(irq, _sw_isr_table[index].isr, _irq_spurious, NULL);
} }

2
arch/arc/core/isr_wrapper.s
View file

@ -227,7 +227,7 @@ SECTION_FUNC(TEXT, _isr_demux)
lr r0, [_ARC_V2_ICAUSE] lr r0, [_ARC_V2_ICAUSE]
sub r0, r0, 16 sub r0, r0, 16
mov r1, _IsrTable mov r1, _sw_isr_table
add3 r0, r1, r0 /* table entries are 8-bytes wide */ add3 r0, r1, r0 /* table entries are 8-bytes wide */
ld r1, [r0, 4] /* ISR into r1 */ ld r1, [r0, 4] /* ISR into r1 */

10
arch/arm/core/irq_manage.c
View file

@ -66,11 +66,11 @@ void irq_handler_set(unsigned int irq,
{ {
int key = irq_lock_inline(); int key = irq_lock_inline();
__ASSERT(old == _IsrTable[irq].isr, "expected ISR not found in table"); __ASSERT(old == _sw_isr_table[irq].isr, "expected ISR not found in table");
if (old == _IsrTable[irq].isr) { if (old == _sw_isr_table[irq].isr) {
_IsrTable[irq].isr = new; _sw_isr_table[irq].isr = new;
_IsrTable[irq].arg = arg; _sw_isr_table[irq].arg = arg;
} }
irq_unlock_inline(key); irq_unlock_inline(key);
@ -185,5 +185,5 @@ int irq_connect(unsigned int irq,
void irq_disconnect(unsigned int irq) void irq_disconnect(unsigned int irq)
{ {
irq_handler_set(irq, _IsrTable[irq].isr, _irq_spurious, NULL); irq_handler_set(irq, _sw_isr_table[irq].isr, _irq_spurious, NULL);
} }

4
arch/arm/core/isr_wrapper.s
View file

@ -48,7 +48,7 @@ a parameter.
_ASM_FILE_PROLOGUE _ASM_FILE_PROLOGUE
GDATA(_IsrTable) GDATA(_sw_isr_table)
GTEXT(_isr_wrapper) GTEXT(_isr_wrapper)
GTEXT(_IntExit) GTEXT(_IntExit)
@ -99,7 +99,7 @@ SECTION_FUNC(TEXT, _isr_wrapper)
mrs r0, IPSR /* get exception number */ mrs r0, IPSR /* get exception number */
sub r0, r0, #16 /* get IRQ number */ sub r0, r0, #16 /* get IRQ number */
lsl r0, r0, #3 /* table is 8-byte wide */ lsl r0, r0, #3 /* table is 8-byte wide */
ldr r1, =_IsrTable ldr r1, =_sw_isr_table
add r1, r1, r0 /* table entry: ISRs must have their MSB set to stay add r1, r1, r0 /* table entry: ISRs must have their MSB set to stay
* in thumb mode */ * in thumb mode */

4
arch/arm/fsl_frdm_k64f/sw_isr_table.c
View file

@ -55,7 +55,7 @@ extern void _irq_spurious(void *arg);
#if defined(CONFIG_SW_ISR_TABLE_DYNAMIC) #if defined(CONFIG_SW_ISR_TABLE_DYNAMIC)
_IsrTableEntry_t __isr_table_section _IsrTable[CONFIG_NUM_IRQS] = { _IsrTableEntry_t __isr_table_section _sw_isr_table[CONFIG_NUM_IRQS] = {
[0 ...(CONFIG_NUM_IRQS - 1)].arg = (void *)0xABAD1DEA, [0 ...(CONFIG_NUM_IRQS - 1)].arg = (void *)0xABAD1DEA,
[0 ...(CONFIG_NUM_IRQS - 1)].isr = _irq_spurious, [0 ...(CONFIG_NUM_IRQS - 1)].isr = _irq_spurious,
#if defined(CONFIG_CONSOLE_HANDLER) #if defined(CONFIG_CONSOLE_HANDLER)
@ -70,7 +70,7 @@ _IsrTableEntry_t __isr_table_section _IsrTable[CONFIG_NUM_IRQS] = {
/* placeholders: fill with real ISRs */ /* placeholders: fill with real ISRs */
_IsrTableEntry_t __isr_table_section _IsrTable[CONFIG_NUM_IRQS] = { _IsrTableEntry_t __isr_table_section _sw_isr_table[CONFIG_NUM_IRQS] = {
[0 ...(CONFIG_NUM_IRQS - 1)].arg = (void *)0xABAD1DEA, [0 ...(CONFIG_NUM_IRQS - 1)].arg = (void *)0xABAD1DEA,
[0 ...(CONFIG_NUM_IRQS - 1)].isr = _irq_spurious, [0 ...(CONFIG_NUM_IRQS - 1)].isr = _irq_spurious,
#if defined(CONFIG_CONSOLE_HANDLER) #if defined(CONFIG_CONSOLE_HANDLER)

4
arch/arm/ti_lm3s6965/sw_isr_table.c
View file

@ -55,7 +55,7 @@ extern void _irq_spurious(void *arg);
#if defined(CONFIG_SW_ISR_TABLE_DYNAMIC) #if defined(CONFIG_SW_ISR_TABLE_DYNAMIC)
_IsrTableEntry_t __isr_table_section _IsrTable[CONFIG_NUM_IRQS] = { _IsrTableEntry_t __isr_table_section _sw_isr_table[CONFIG_NUM_IRQS] = {
[0 ...(CONFIG_NUM_IRQS - 1)].arg = (void *)0xABAD1DEA, [0 ...(CONFIG_NUM_IRQS - 1)].arg = (void *)0xABAD1DEA,
[0 ...(CONFIG_NUM_IRQS - 1)].isr = _irq_spurious, [0 ...(CONFIG_NUM_IRQS - 1)].isr = _irq_spurious,
#if defined(CONFIG_CONSOLE_HANDLER) #if defined(CONFIG_CONSOLE_HANDLER)
@ -70,7 +70,7 @@ _IsrTableEntry_t __isr_table_section _IsrTable[CONFIG_NUM_IRQS] = {
/* placeholders: fill with real ISRs */ /* placeholders: fill with real ISRs */
_IsrTableEntry_t __isr_table_section _IsrTable[CONFIG_NUM_IRQS] = { _IsrTableEntry_t __isr_table_section _sw_isr_table[CONFIG_NUM_IRQS] = {
[0 ...(CONFIG_NUM_IRQS - 1)].arg = (void *)0xABAD1DEA, [0 ...(CONFIG_NUM_IRQS - 1)].arg = (void *)0xABAD1DEA,
[0 ...(CONFIG_NUM_IRQS - 1)].isr = _irq_spurious, [0 ...(CONFIG_NUM_IRQS - 1)].isr = _irq_spurious,
#if defined(CONFIG_CONSOLE_HANDLER) #if defined(CONFIG_CONSOLE_HANDLER)

2
include/sw_isr_table.h
View file

@ -51,7 +51,7 @@ struct _IsrTableEntry {
typedef struct _IsrTableEntry _IsrTableEntry_t; typedef struct _IsrTableEntry _IsrTableEntry_t;
extern _IsrTableEntry_t _IsrTable[CONFIG_NUM_IRQS]; extern _IsrTableEntry_t _sw_isr_table[CONFIG_NUM_IRQS];
#endif /* _ASMLANGUAGE */ #endif /* _ASMLANGUAGE */
#endif /* _SW_ISR_TABLE__H_ */ #endif /* _SW_ISR_TABLE__H_ */