From fbb1526d1af4a934f7f81f16ba45b6ce4d80c1e6 Mon Sep 17 00:00:00 2001 From: Andrei Emeltchenko Date: Fri, 24 Apr 2015 10:40:17 +0300 Subject: [PATCH] Rename _IsrWrapper camelCase to _isr_wrapper Change-Id: I217eced3965fbf313a7e0fbef38db9dd876fcf80 Signed-off-by: Andrei Emeltchenko --- arch/arc/bsp/vector_table.h | 2 +- arch/arm/bsp/CortexM/vector_table.h | 2 +- arch/arm/core/exc_exit.s | 2 +- arch/arm/core/isr_wrapper.s | 8 ++++---- arch/arm/fsl_frdm_k64f/irq_vector_table.c | 6 +++--- arch/arm/ti_lm3s6965/irq_vector_table.c | 6 +++--- include/sw_isr_table.h | 2 +- 7 files changed, 14 insertions(+), 14 deletions(-) diff --git a/arch/arc/bsp/vector_table.h b/arch/arc/bsp/vector_table.h index 8fa6c4ef81..9a806870ac 100644 --- a/arch/arc/bsp/vector_table.h +++ b/arch/arc/bsp/vector_table.h @@ -71,7 +71,7 @@ GTEXT(__ev_dc_error) GTEXT(__ev_maligned) GTEXT(_PrepC) -GTEXT(_IsrWrapper) +GTEXT(_isr_wrapper) #else diff --git a/arch/arm/bsp/CortexM/vector_table.h b/arch/arm/bsp/CortexM/vector_table.h index 8319cf41b1..6079590a6a 100644 --- a/arch/arm/bsp/CortexM/vector_table.h +++ b/arch/arm/bsp/CortexM/vector_table.h @@ -71,7 +71,7 @@ GTEXT(__pendsv) GTEXT(__reserved) GTEXT(_PrepC) -GTEXT(_IsrWrapper) +GTEXT(_isr_wrapper) #endif /* _ASMLANGUAGE */ diff --git a/arch/arm/core/exc_exit.s b/arch/arm/core/exc_exit.s index 460b468a8f..31f3bdb053 100644 --- a/arch/arm/core/exc_exit.s +++ b/arch/arm/core/exc_exit.s @@ -35,7 +35,7 @@ DESCRIPTION Provides functions for performing kernel handling when exiting exceptions or interrupts that are installed directly in the vector table (i.e. that are not -wrapped around by _IsrWrapper()). +wrapped around by _isr_wrapper()). */ #define _ASMLANGUAGE diff --git a/arch/arm/core/isr_wrapper.s b/arch/arm/core/isr_wrapper.s index 3f3d6be802..8da828bfcc 100644 --- a/arch/arm/core/isr_wrapper.s +++ b/arch/arm/core/isr_wrapper.s @@ -50,14 +50,14 @@ _ASM_FILE_PROLOGUE GDATA(_IsrTable) -GTEXT(_IsrWrapper) +GTEXT(_isr_wrapper) GTEXT(_IntExit) /******************************************************************************* * -* _IsrWrapper - wrapper around ISRs when inserted in software ISR table +* _isr_wrapper - wrapper around ISRs when inserted in software ISR table * -* When inserted in the vector table, _IsrWrapper() demuxes the ISR table using +* When inserted in the vector table, _isr_wrapper() demuxes the ISR table using * the running interrupt number as the index, and invokes the registered ISR * with its correspoding argument. When returning from the ISR, it determines * if a context switch needs to happen (see documentation for __pendsv()) and @@ -66,7 +66,7 @@ GTEXT(_IntExit) * * RETURNS: N/A */ -SECTION_FUNC(TEXT, _IsrWrapper) +SECTION_FUNC(TEXT, _isr_wrapper) _GDB_STUB_EXC_ENTRY diff --git a/arch/arm/fsl_frdm_k64f/irq_vector_table.c b/arch/arm/fsl_frdm_k64f/irq_vector_table.c index 130f0db0f2..f2d549e5f0 100644 --- a/arch/arm/fsl_frdm_k64f/irq_vector_table.c +++ b/arch/arm/fsl_frdm_k64f/irq_vector_table.c @@ -36,7 +36,7 @@ This file contains the IRQ part of the vector table. It is meant to be used for one of two cases: a) When software-managed ISRs (SW_ISR_TABLE) is enabled, and in that case it - binds _IsrWrapper() to all the IRQ entries in the vector table. + binds _isr_wrapper() to all the IRQ entries in the vector table. b) When the BSP is written so that device ISRs are installed directly in the vector table, they are enumerated here. @@ -50,13 +50,13 @@ b) When the BSP is written so that device ISRs are installed directly in the #include #endif /* CONFIG_CONSOLE_HANDLER */ -extern void _IsrWrapper(void); +extern void _isr_wrapper(void); typedef void (*vth)(void); /* Vector Table Handler */ #if defined(CONFIG_SW_ISR_TABLE) vth __irq_vector_table _IrqVectorTable[CONFIG_NUM_IRQS] = { - [0 ...(CONFIG_NUM_IRQS - 1)] = _IsrWrapper, + [0 ...(CONFIG_NUM_IRQS - 1)] = _isr_wrapper, }; #elif !defined(CONFIG_IRQ_VECTOR_TABLE_CUSTOM) diff --git a/arch/arm/ti_lm3s6965/irq_vector_table.c b/arch/arm/ti_lm3s6965/irq_vector_table.c index 130f0db0f2..f2d549e5f0 100644 --- a/arch/arm/ti_lm3s6965/irq_vector_table.c +++ b/arch/arm/ti_lm3s6965/irq_vector_table.c @@ -36,7 +36,7 @@ This file contains the IRQ part of the vector table. It is meant to be used for one of two cases: a) When software-managed ISRs (SW_ISR_TABLE) is enabled, and in that case it - binds _IsrWrapper() to all the IRQ entries in the vector table. + binds _isr_wrapper() to all the IRQ entries in the vector table. b) When the BSP is written so that device ISRs are installed directly in the vector table, they are enumerated here. @@ -50,13 +50,13 @@ b) When the BSP is written so that device ISRs are installed directly in the #include #endif /* CONFIG_CONSOLE_HANDLER */ -extern void _IsrWrapper(void); +extern void _isr_wrapper(void); typedef void (*vth)(void); /* Vector Table Handler */ #if defined(CONFIG_SW_ISR_TABLE) vth __irq_vector_table _IrqVectorTable[CONFIG_NUM_IRQS] = { - [0 ...(CONFIG_NUM_IRQS - 1)] = _IsrWrapper, + [0 ...(CONFIG_NUM_IRQS - 1)] = _isr_wrapper, }; #elif !defined(CONFIG_IRQ_VECTOR_TABLE_CUSTOM) diff --git a/include/sw_isr_table.h b/include/sw_isr_table.h index c9e4465d4d..dbbc180b67 100644 --- a/include/sw_isr_table.h +++ b/include/sw_isr_table.h @@ -41,7 +41,7 @@ Data types for a software-managed ISR table, with a parameter per-ISR. #if !defined(_ASMLANGUAGE) /* * Note the order: arg first, then ISR. This allows a table entry to be - * loaded arg -> r0, isr -> r3 in _IsrWrapper with one ldmia instruction, + * loaded arg -> r0, isr -> r3 in _isr_wrapper with one ldmia instruction, * on ARM Cortex-M (Thumb2). */ struct _IsrTableEntry {