patrick/zephyr
1
0
Fork 0
Code Issues Pull requests Actions 8 Packages Projects Releases Wiki Activity

serial_console: Rename console_uart_isr to uart_console_isr

Browse source 
Following comments received during review rename console_uart_isr to
uart_console_isr for consistency reason.

Change-Id: Ibee1dec40ee19a9095f78969a07ffb73518fffbb
Signed-off-by: Andrei Emeltchenko <andrei.emeltchenko@intel.com>
Signed-off-by: Anas Nashif <anas.nashif@intel.com>
This commit is contained in:
Andrei Emeltchenko 2015-04-23 10:20:32 +03:00 committed by Anas Nashif
parent 425437037d
commit dfa5f2371b
5 changed files with 9 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -58,7 +58,7 @@ typedef void (*vth)(void); /* Vector Table Handler */
vth __irq_vector_table _IrqVectorTable[CONFIG_NUM_IRQS] = { vth __irq_vector_table _IrqVectorTable[CONFIG_NUM_IRQS] = {
[0 ...(CONFIG_NUM_IRQS - 1)] = _IsrWrapper, [0 ...(CONFIG_NUM_IRQS - 1)] = _IsrWrapper,
#if defined(CONFIG_CONSOLE_HANDLER) #if defined(CONFIG_CONSOLE_HANDLER)
[CONFIG_UART_CONSOLE_IRQ] = (vth)console_uart_isr, [CONFIG_UART_CONSOLE_IRQ] = (vth)uart_console_isr,
#endif #endif
}; };
@ -71,7 +71,7 @@ extern void _SpuriousIRQ(void);
vth __irq_vector_table _IrqVectorTable[CONFIG_NUM_IRQS] = { vth __irq_vector_table _IrqVectorTable[CONFIG_NUM_IRQS] = {
[0 ...(CONFIG_NUM_IRQS - 1)] = _SpuriousIRQ, [0 ...(CONFIG_NUM_IRQS - 1)] = _SpuriousIRQ,
#if defined(CONFIG_CONSOLE_HANDLER) #if defined(CONFIG_CONSOLE_HANDLER)
[CONFIG_UART_CONSOLE_IRQ] = (vth)console_uart_isr, [CONFIG_UART_CONSOLE_IRQ] = (vth)uart_console_isr,
#endif #endif
}; };

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

@ -58,7 +58,7 @@ typedef void (*vth)(void); /* Vector Table Handler */
vth __irq_vector_table _IrqVectorTable[CONFIG_NUM_IRQS] = { vth __irq_vector_table _IrqVectorTable[CONFIG_NUM_IRQS] = {
[0 ...(CONFIG_NUM_IRQS - 1)] = _IsrWrapper, [0 ...(CONFIG_NUM_IRQS - 1)] = _IsrWrapper,
#if defined(CONFIG_CONSOLE_HANDLER) #if defined(CONFIG_CONSOLE_HANDLER)
[CONFIG_UART_CONSOLE_IRQ] = (vth)console_uart_isr, [CONFIG_UART_CONSOLE_IRQ] = (vth)uart_console_isr,
#endif #endif
}; };
@ -71,7 +71,7 @@ extern void _SpuriousIRQ(void);
vth __irq_vector_table _IrqVectorTable[CONFIG_NUM_IRQS] = { vth __irq_vector_table _IrqVectorTable[CONFIG_NUM_IRQS] = {
[0 ...(CONFIG_NUM_IRQS - 1)] = _SpuriousIRQ, [0 ...(CONFIG_NUM_IRQS - 1)] = _SpuriousIRQ,
#if defined(CONFIG_CONSOLE_HANDLER) #if defined(CONFIG_CONSOLE_HANDLER)
[CONFIG_UART_CONSOLE_IRQ] = (vth)console_uart_isr, [CONFIG_UART_CONSOLE_IRQ] = (vth)uart_console_isr,
#endif #endif
}; };

4
arch/x86/bsp/driver_static_irq_stubs.s
View file

@ -176,7 +176,7 @@ SECTION_FUNC(TEXT, _bluetooth_uart_stub)
SECTION_FUNC(TEXT, _console_uart_stub) SECTION_FUNC(TEXT, _console_uart_stub)
call _IntEnt /* Inform kernel interrupt has begun */ call _IntEnt /* Inform kernel interrupt has begun */
pushl $0 /* Push dummy parameter */ pushl $0 /* Push dummy parameter */
call console_uart_isr /* Call actual interrupt handler */ call uart_console_isr /* Call actual interrupt handler */
call _i8259_eoi_master /* Inform the PIC interrupt is done */ call _i8259_eoi_master /* Inform the PIC interrupt is done */
addl $4, %esp /* Clean-up stack from push above */ addl $4, %esp /* Clean-up stack from push above */
jmp _IntExit /* Inform kernel interrupt is done */ jmp _IntExit /* Inform kernel interrupt is done */
@ -184,7 +184,7 @@ SECTION_FUNC(TEXT, _console_uart_stub)
SECTION_FUNC(TEXT, _console_uart_stub) SECTION_FUNC(TEXT, _console_uart_stub)
call _IntEnt /* Inform kernel interrupt has begun */ call _IntEnt /* Inform kernel interrupt has begun */
pushl $0 /* Push dummy parameter */ pushl $0 /* Push dummy parameter */
call console_uart_isr /* Call actual interrupt handler */ call uart_console_isr /* Call actual interrupt handler */
call _ioapic_eoi /* Inform the PIC interrupt is done */ call _ioapic_eoi /* Inform the PIC interrupt is done */
addl $4, %esp /* Clean-up stack from push above */ addl $4, %esp /* Clean-up stack from push above */
jmp _IntExit /* Inform kernel interrupt is done */ jmp _IntExit /* Inform kernel interrupt is done */

4
drivers/console/uart_console.c
View file

@ -131,7 +131,7 @@ static int read_uart(int uart, uint8_t *buf, unsigned int size)
return rx; return rx;
} }
void console_uart_isr(void *unused) void uart_console_isr(void *unused)
{ {
ARG_UNUSED(unused); ARG_UNUSED(unused);
@ -170,7 +170,7 @@ static void console_handler_init(void)
uart_irq_rx_disable(UART); uart_irq_rx_disable(UART);
uart_irq_tx_disable(UART); uart_irq_tx_disable(UART);
uart_int_connect(UART, console_uart_isr, NULL, NULL); uart_int_connect(UART, uart_console_isr, NULL, NULL);
/* Drain the fifo */ /* Drain the fifo */
while (uart_irq_rx_ready(UART)) while (uart_irq_rx_ready(UART))

2
drivers/console/uart_console.h
View file

@ -48,7 +48,7 @@ extern void uartConsoleInit(void);
*/ */
void uart_register_handler(void (*cb) (const char *string)); void uart_register_handler(void (*cb) (const char *string));
void console_uart_isr(void *unused); void uart_console_isr(void *unused);
#ifdef __cplusplus #ifdef __cplusplus
} }