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/arm/core/irq_manage.c
View file

@ -66,11 +66,11 @@ void irq_handler_set(unsigned int irq,
{
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) {
_IsrTable[irq].isr = new;
_IsrTable[irq].arg = arg;
if (old == _sw_isr_table[irq].isr) {
_sw_isr_table[irq].isr = new;
_sw_isr_table[irq].arg = arg;
}
irq_unlock_inline(key);
@ -185,5 +185,5 @@ int irq_connect(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
GDATA(_IsrTable)
GDATA(_sw_isr_table)
GTEXT(_isr_wrapper)
GTEXT(_IntExit)
@ -99,7 +99,7 @@ SECTION_FUNC(TEXT, _isr_wrapper)
mrs r0, IPSR /* get exception number */
sub r0, r0, #16 /* get IRQ number */
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
* in thumb mode */