From f05b2ac0bc4626e854afc6e6a5d1b88071adbd7c Mon Sep 17 00:00:00 2001 From: Ralf Corsepius Date: Wed, 21 Apr 2004 16:01:48 +0000 Subject: Remove duplicate white lines. --- c/src/lib/libbsp/arm/shared/comm/console.c | 9 --------- c/src/lib/libbsp/arm/shared/comm/uart.c | 5 ----- c/src/lib/libbsp/arm/shared/irq/irq_asm.S | 4 ---- 3 files changed, 18 deletions(-) (limited to 'c/src/lib/libbsp/arm/shared') diff --git a/c/src/lib/libbsp/arm/shared/comm/console.c b/c/src/lib/libbsp/arm/shared/comm/console.c index fc6cec3f31..2af1359051 100644 --- a/c/src/lib/libbsp/arm/shared/comm/console.c +++ b/c/src/lib/libbsp/arm/shared/comm/console.c @@ -47,7 +47,6 @@ int BSPPrintkPort = BSP_UART_COM1; int BSPBaseBaud = 115200; - /*-------------------------------------------------------------------------+ | External Prototypes +--------------------------------------------------------------------------*/ @@ -70,7 +69,6 @@ BSP_output_char_function_type BSP_output_char = BSP_polling_getchar_function_type BSP_poll_char = (BSP_polling_getchar_function_type) BSP_poll_char_via_serial; - static rtems_irq_connect_data console_isr_data = {BSP_UART, BSP_uart_termios_isr_com1, isr_on, @@ -125,7 +123,6 @@ void __assert (const char *file, int line, const char *msg) } - /*-------------------------------------------------------------------------+ | Console device driver INITIALIZE entry point. +--------------------------------------------------------------------------+ @@ -150,7 +147,6 @@ console_initialize(rtems_device_major_number major, /* 38400-8-N-1 */ BSP_uart_init(BSPConsolePort, 38400, 0); - /* Set interrupt handler */ console_isr_data.name = BSP_UART; console_isr_data.hdl = BSP_uart_termios_isr_com1; @@ -179,7 +175,6 @@ console_initialize(rtems_device_major_number major, return RTEMS_SUCCESSFUL; } /* console_initialize */ - static int console_last_close(int major, int minor, void *arg) { BSP_remove_rtems_irq_handler (&console_isr_data); @@ -243,7 +238,6 @@ console_close(rtems_device_major_number major, return res; } /* console_close */ - /*-------------------------------------------------------------------------+ | Console device driver READ entry point. +--------------------------------------------------------------------------+ @@ -259,7 +253,6 @@ console_read(rtems_device_major_number major, } /* console_read */ - /*-------------------------------------------------------------------------+ | Console device driver WRITE entry point. +--------------------------------------------------------------------------+ @@ -275,8 +268,6 @@ console_write(rtems_device_major_number major, } /* console_write */ - - /* * Handle ioctl request. */ diff --git a/c/src/lib/libbsp/arm/shared/comm/uart.c b/c/src/lib/libbsp/arm/shared/comm/uart.c index 21ba31dcdf..6b21395ce8 100644 --- a/c/src/lib/libbsp/arm/shared/comm/uart.c +++ b/c/src/lib/libbsp/arm/shared/comm/uart.c @@ -222,7 +222,6 @@ BSP_uart_intr_ctrl(int uart, int cmd) return; } - /* * Status function, -1 if error * detected, 0 if no received chars available, @@ -269,7 +268,6 @@ BSP_uart_polled_status(int uart) return BSP_UART_STATUS_ERROR; } - /* * Polled mode write function */ @@ -330,7 +328,6 @@ BSP_poll_char_via_serial() return BSP_uart_polled_read(BSPConsolePort); } - /* ================ Termios support =================*/ static volatile int termios_stopped_com1 = 0; @@ -422,7 +419,6 @@ BSP_uart_termios_write_com2(int minor, const char *buf, int len) return 0; } - /* If there TX buffer is busy - something is royally screwed up */ assert((uread(BSP_UART_COM2, LSR) & THRE) != 0); @@ -453,7 +449,6 @@ BSP_uart_termios_write_com2(int minor, const char *buf, int len) return 0; } - void BSP_uart_termios_isr_com1(void) { diff --git a/c/src/lib/libbsp/arm/shared/irq/irq_asm.S b/c/src/lib/libbsp/arm/shared/irq/irq_asm.S index 52a1692819..8bc5680205 100644 --- a/c/src/lib/libbsp/arm/shared/irq/irq_asm.S +++ b/c/src/lib/libbsp/arm/shared/irq/irq_asm.S @@ -26,7 +26,6 @@ _ISR_Handler: stmdb sp!, {r0, r1, r2, r3, r12} /* save regs on INT stack */ stmdb sp!, {lr} /* now safe to call C funcs */ - /* one nest level deeper */ ldr r0, =_ISR_Nest_level ldr r1, [r0] @@ -111,7 +110,6 @@ bframe: ldmia sp!, {r1} /* out with the old */ stmdb sp!, {lr} /* in with the new (lr) */ - orr r0, r0, #0xc0 msr spsr, r0 @@ -120,8 +118,6 @@ exitit: ldmia sp!, {r0, r1, r2, r3, r12} /* restore regs from INT stack */ subs pc, lr, #4 /* return */ - - /* on entry to _ISR_Dispatch, we're in SVC mode */ .globl _ISR_Dispatch _ISR_Dispatch: -- cgit v1.2.3