From 6128a4aa5e791ed4e0a655bfd346a52d92da7883 Mon Sep 17 00:00:00 2001 From: Ralf Corsepius Date: Wed, 21 Apr 2004 10:43:04 +0000 Subject: Remove stray white spaces. --- c/src/lib/libbsp/arm/edb7312/clock/clockdrv.c | 2 +- c/src/lib/libbsp/arm/edb7312/console/uart.c | 16 +++---- c/src/lib/libbsp/arm/edb7312/include/bsp.h | 10 ++--- c/src/lib/libbsp/arm/edb7312/include/ep7312.h | 2 +- c/src/lib/libbsp/arm/edb7312/irq/bsp_irq_asm.S | 10 ++--- c/src/lib/libbsp/arm/edb7312/irq/bsp_irq_init.c | 2 +- c/src/lib/libbsp/arm/edb7312/irq/irq.c | 20 ++++----- c/src/lib/libbsp/arm/edb7312/irq/irq.h | 12 +++--- c/src/lib/libbsp/arm/edb7312/network/network.c | 14 +++---- c/src/lib/libbsp/arm/edb7312/start/start.S | 56 ++++++++++++------------- c/src/lib/libbsp/arm/edb7312/startup/bspstart.c | 28 ++++++------- c/src/lib/libbsp/arm/edb7312/startup/exit.c | 2 +- c/src/lib/libbsp/arm/edb7312/timer/timer.c | 4 +- 13 files changed, 89 insertions(+), 89 deletions(-) (limited to 'c/src/lib/libbsp/arm/edb7312') diff --git a/c/src/lib/libbsp/arm/edb7312/clock/clockdrv.c b/c/src/lib/libbsp/arm/edb7312/clock/clockdrv.c index 5e2898affe..5850436de3 100644 --- a/c/src/lib/libbsp/arm/edb7312/clock/clockdrv.c +++ b/c/src/lib/libbsp/arm/edb7312/clock/clockdrv.c @@ -44,7 +44,7 @@ rtems_irq_connect_data clock_isr_data = {BSP_TC1OI, } while(0) -/* +/* * Set up the clock hardware */ #define Clock_driver_support_initialize_hardware() \ diff --git a/c/src/lib/libbsp/arm/edb7312/console/uart.c b/c/src/lib/libbsp/arm/edb7312/console/uart.c index 4bb897a0d4..c2628756e0 100644 --- a/c/src/lib/libbsp/arm/edb7312/console/uart.c +++ b/c/src/lib/libbsp/arm/edb7312/console/uart.c @@ -34,8 +34,8 @@ static int uart_set_attributes(int minor, const struct termios *t); unsigned long Console_Port_Count = NUM_DEVS; console_data Console_Port_Data[NUM_DEVS]; rtems_device_minor_number Console_Port_Minor = 0; -console_fns uart_fns = -{ +console_fns uart_fns = +{ libchip_serial_default_probe, uart_first_open, uart_last_close, @@ -69,7 +69,7 @@ console_tbl Console_Port_Tbl[] = { static int uart_first_open(int major, int minor, void *arg) {return 0;} static int uart_last_close(int major, int minor, void *arg) {return 0;} -static int uart_read(int minor) +static int uart_read(int minor) { return uart_poll_read(minor); } @@ -79,7 +79,7 @@ static void uart_write_polled(int minor, char c) uart_write(minor, &c, 1); } -static int uart_set_attributes(int minor, const struct termios *t) +static int uart_set_attributes(int minor, const struct termios *t) { return 0; } @@ -100,7 +100,7 @@ int uart_poll_read(int minor) return -1; } - + err = *data_reg; c = err & 0xff; @@ -133,7 +133,7 @@ static int uart_write(int minor, const char *buf, int len) c = (char) buf[i]; *data_reg = c; } - + return 1; } @@ -142,7 +142,7 @@ static void uart_init(int minor) volatile uint32_t *data_reg; volatile uint32_t *ctrl_reg1; volatile uint32_t *ctrl_reg2; - + data_reg = (uint32_t*)Console_Port_Tbl[minor].ulDataPort; ctrl_reg1 = (uint32_t*)Console_Port_Tbl[minor].ulCtrlPort1; ctrl_reg2 = (uint32_t*)Console_Port_Tbl[minor].ulCtrlPort2; @@ -156,6 +156,6 @@ static void uart_init(int minor) *ctrl_reg1 = (EP7312_UART_WRDLEN8 | EP7312_UART_FIFOEN | 0x17); /* 9600 baud */ - + } diff --git a/c/src/lib/libbsp/arm/edb7312/include/bsp.h b/c/src/lib/libbsp/arm/edb7312/include/bsp.h index 181d4702bc..1c86164ced 100644 --- a/c/src/lib/libbsp/arm/edb7312/include/bsp.h +++ b/c/src/lib/libbsp/arm/edb7312/include/bsp.h @@ -24,7 +24,7 @@ extern "C" { #include #include #include - + /* * Define the interrupt mechanism for Time Test 27 * @@ -42,16 +42,16 @@ extern rtems_configuration_table BSP_Configuration; #define MUST_WAIT_FOR_INTERRUPT 0 -#define Install_tm27_vector( handler ) +#define Install_tm27_vector( handler ) -#define Cause_tm27_intr() +#define Cause_tm27_intr() -#define Clear_tm27_intr() +#define Clear_tm27_intr() #define Lower_tm27_intr() - + /* * Network driver configuration */ diff --git a/c/src/lib/libbsp/arm/edb7312/include/ep7312.h b/c/src/lib/libbsp/arm/edb7312/include/ep7312.h index b2e0b9f806..13bcc3b7bf 100644 --- a/c/src/lib/libbsp/arm/edb7312/include/ep7312.h +++ b/c/src/lib/libbsp/arm/edb7312/include/ep7312.h @@ -2,7 +2,7 @@ * Cirrus EP7312 register declarations * * Copyright (c) 2002 by Charlie Steader - * + * * Copyright (c) 2002 by Jay Monkman * * The license and distribution terms for this file may be diff --git a/c/src/lib/libbsp/arm/edb7312/irq/bsp_irq_asm.S b/c/src/lib/libbsp/arm/edb7312/irq/bsp_irq_asm.S index 8540b68294..69a41828b7 100644 --- a/c/src/lib/libbsp/arm/edb7312/irq/bsp_irq_asm.S +++ b/c/src/lib/libbsp/arm/edb7312/irq/bsp_irq_asm.S @@ -2,7 +2,7 @@ * Cirrus EP7312 Intererrupt handler * * Copyright (c) 2002 by Jay Monkman - * + * * Copyright (c) 2002 by Charlie Steader * * The license and distribution terms for this file may be @@ -15,11 +15,11 @@ */ #define __asm__ #include "irq.h" - + #define VECTOR_TABLE 0x40 - -/* - * Function to obtain, execute an IT handler and acknowledge the IT + +/* + * Function to obtain, execute an IT handler and acknowledge the IT */ .globl ExecuteITHandler diff --git a/c/src/lib/libbsp/arm/edb7312/irq/bsp_irq_init.c b/c/src/lib/libbsp/arm/edb7312/irq/bsp_irq_init.c index f55b7baf1a..c8c3c7154f 100644 --- a/c/src/lib/libbsp/arm/edb7312/irq/bsp_irq_init.c +++ b/c/src/lib/libbsp/arm/edb7312/irq/bsp_irq_init.c @@ -2,7 +2,7 @@ * Cirrus EP7312 Intererrupt handler * * Copyright (c) 2002 by Jay Monkman - * + * * Copyright (c) 2002 by Charlie Steader * * The license and distribution terms for this file may be diff --git a/c/src/lib/libbsp/arm/edb7312/irq/irq.c b/c/src/lib/libbsp/arm/edb7312/irq/irq.c index e48c2cb999..31f24fc82a 100644 --- a/c/src/lib/libbsp/arm/edb7312/irq/irq.c +++ b/c/src/lib/libbsp/arm/edb7312/irq/irq.c @@ -2,7 +2,7 @@ * Cirrus EP7312 Intererrupt handler * * Copyright (c) 2002 by Jay Monkman - * + * * Copyright (c) 2002 by Charlie Steader * * The license and distribution terms for this file may be @@ -39,7 +39,7 @@ int BSP_install_rtems_irq_handler (const rtems_irq_connect_data* irq) { rtems_irq_hdl *HdlTable; rtems_interrupt_level level; - + if (!isValidInterrupt(irq->name)) { return 0; } @@ -50,7 +50,7 @@ int BSP_install_rtems_irq_handler (const rtems_irq_connect_data* irq) if (*(HdlTable + irq->name) != default_int_handler) { return 0; } - + _CPU_ISR_Disable(level); /* @@ -81,7 +81,7 @@ int BSP_install_rtems_irq_handler (const rtems_irq_connect_data* irq) /* interrupt managed by INTMR3 and INTSR3 */ *EP7312_INTMR3 |= (1 << (irq->name - 21)); } - + /* * Enable interrupt on device */ @@ -89,9 +89,9 @@ int BSP_install_rtems_irq_handler (const rtems_irq_connect_data* irq) { irq->on(irq); } - + _CPU_ISR_Enable(level); - + return 1; } @@ -99,7 +99,7 @@ int BSP_remove_rtems_irq_handler (const rtems_irq_connect_data* irq) { rtems_irq_hdl *HdlTable; rtems_interrupt_level level; - + if (!isValidInterrupt(irq->name)) { return 0; } @@ -135,18 +135,18 @@ int BSP_remove_rtems_irq_handler (const rtems_irq_connect_data* irq) /* interrupt managed by INTMR3 and INTSR3 */ *EP7312_INTMR3 &= ~(1 << (irq->name - 21)); } - + /* * Disable interrupt on device */ if(irq->off) irq->off(irq); - + /* * restore the default irq value */ *(HdlTable + irq->name) = default_int_handler; - + _CPU_ISR_Enable(level); return 1; diff --git a/c/src/lib/libbsp/arm/edb7312/irq/irq.h b/c/src/lib/libbsp/arm/edb7312/irq/irq.h index 58189b462e..b87586f459 100644 --- a/c/src/lib/libbsp/arm/edb7312/irq/irq.h +++ b/c/src/lib/libbsp/arm/edb7312/irq/irq.h @@ -2,7 +2,7 @@ * Cirrus EP7312 Intererrupt handler * * Copyright (c) 2002 by Jay Monkman - * + * * Copyright (c) 2002 by Charlie Steader * * The license and distribution terms for this file may be @@ -29,7 +29,7 @@ extern "C" { /* * Include some preprocessor value also used by assember code */ - + #include extern void default_int_handler(); @@ -68,7 +68,7 @@ typedef enum { } rtems_irq_symbolic_name; - + /* * Type definition for RTEMS managed interrupts */ @@ -98,9 +98,9 @@ typedef struct __rtems_irq_connect_data__ { * It is usually called immediately AFTER connecting the interrupt handler. * RTEMS may well need such a function when restoring normal interrupt * processing after a debug session. - * + * */ - rtems_irq_enable on; + rtems_irq_enable on; /* * function for disabling interrupts at device level (ONLY!). * The code will disable it at i8259s level. RATIONALE : anyway @@ -170,7 +170,7 @@ void BSP_rtems_irq_mngt_init(); * 4) perform rescheduling when necessary, * 5) restore the C scratch registers... * 6) restore initial execution flow - * + * */ int BSP_install_rtems_irq_handler (const rtems_irq_connect_data*); diff --git a/c/src/lib/libbsp/arm/edb7312/network/network.c b/c/src/lib/libbsp/arm/edb7312/network/network.c index e8a02019fb..a622722020 100644 --- a/c/src/lib/libbsp/arm/edb7312/network/network.c +++ b/c/src/lib/libbsp/arm/edb7312/network/network.c @@ -28,8 +28,8 @@ void cs8900_io_set_reg (int dev, unsigned short reg, unsigned short data) { /* works the same for all values of dev */ /* - printf("cs8900_io_set_reg: reg: %#6x, val %#6x\n", - CS8900_BASE + reg, + printf("cs8900_io_set_reg: reg: %#6x, val %#6x\n", + CS8900_BASE + reg, data); */ *(unsigned short *)(CS8900_BASE + reg) = data; @@ -47,7 +47,7 @@ unsigned short cs8900_io_get_reg (int dev, unsigned short reg) return val; } -/* cs8900_mem_set_reg - sets one of the registers mapped through +/* cs8900_mem_set_reg - sets one of the registers mapped through * PacketPage */ void cs8900_mem_set_reg (int dev, unsigned long reg, unsigned short data) @@ -57,7 +57,7 @@ void cs8900_mem_set_reg (int dev, unsigned long reg, unsigned short data) cs8900_io_set_reg(dev, CS8900_IO_PP_DATA_PORT0, data); } -/* cs8900_mem_get_reg - reads one of the registers mapped through +/* cs8900_mem_get_reg - reads one of the registers mapped through * PacketPage */ unsigned short cs8900_mem_get_reg (int dev, unsigned long reg) @@ -96,7 +96,7 @@ unsigned short cs8900_get_data_block (int dev, unsigned char *data) len = cs8900_mem_get_reg(dev, CS8900_PP_RxLength); for (i = 0; i < ((len + 1) / 2); i++) { - ((short *)data)[i] = cs8900_io_get_reg(dev, + ((short *)data)[i] = cs8900_io_get_reg(dev, CS8900_IO_RX_TX_DATA_PORT0); } return len; @@ -115,10 +115,10 @@ void cs8900_tx_load (int dev, struct mbuf *m) len += m->m_len; m = m->m_next; } while (m != 0); - + data = (unsigned short *) &g_enetbuf[0]; for (i = 0; i < ((len + 1) / 2); i++) { - cs8900_io_set_reg(dev, + cs8900_io_set_reg(dev, CS8900_IO_RX_TX_DATA_PORT0, data[i]); } diff --git a/c/src/lib/libbsp/arm/edb7312/start/start.S b/c/src/lib/libbsp/arm/edb7312/start/start.S index b7db4d4d42..95b3bc88fa 100644 --- a/c/src/lib/libbsp/arm/edb7312/start/start.S +++ b/c/src/lib/libbsp/arm/edb7312/start/start.S @@ -2,7 +2,7 @@ * Cirrus EP7312 Startup code * * Copyright (c) 2002 by Jay Monkman - * + * * Copyright (c) 2002 by Charlie Steader * * The license and distribution terms for this file may be @@ -14,7 +14,7 @@ * $Id$ */ - + /* Some standard definitions...*/ .equ Mode_USR, 0x10 @@ -33,7 +33,7 @@ .text .globl _start - + _start: /* store the sp */ mov r12, sp @@ -41,19 +41,19 @@ _start: * Here is the code to initialize the low-level BSP environment * (Chip Select, PLL, ....?) */ - + /* zero the bss */ LDR r1, =_bss_end_ /* get end of ZI region */ LDR r0, =_bss_start_ /* load base address of ZI region */ -zi_init: +zi_init: MOV r2, #0 CMP r0, r1 /* loop whilst r0 < r1 */ STRLOT r2, [r0], #4 - BLO zi_init - + BLO zi_init + /* Load basic ARM7 interrupt table */ -VectorInit: +VectorInit: MOV R0, #0 ADR R1, Vector_Init_Block LDMIA R1!, {R2, r3} /* Copy the Vectors (8 words) */ @@ -78,10 +78,10 @@ VectorInit: /******************************************************* standard exception vectors table - *** Must be located at address 0 -********************************************************/ + *** Must be located at address 0 +********************************************************/ -Vector_Init_Block: +Vector_Init_Block: LDR PC, Reset_Addr LDR PC, Undefined_Addr LDR PC, SWI_Addr @@ -92,45 +92,45 @@ Vector_Init_Block: LDR PC, FIQ_Addr .globl Reset_Addr -Reset_Addr: .long _start +Reset_Addr: .long _start Undefined_Addr: .long Undefined_Handler SWI_Addr: .long SWI_Handler Prefetch_Addr: .long Prefetch_Handler Abort_Addr: .long Abort_Handler - .long 0 + .long 0 IRQ_Addr: .long IRQ_Handler FIQ_Addr: .long FIQ_Handler - + /* The following handlers do not do anything useful */ .globl Undefined_Handler -Undefined_Handler: +Undefined_Handler: B Undefined_Handler .globl SWI_Handler -SWI_Handler: - B SWI_Handler +SWI_Handler: + B SWI_Handler .globl Prefetch_Handler -Prefetch_Handler: +Prefetch_Handler: B Prefetch_Handler .globl Abort_Handler -Abort_Handler: +Abort_Handler: B Abort_Handler .globl IRQ_Handler -IRQ_Handler: +IRQ_Handler: B IRQ_Handler .globl FIQ_Handler -FIQ_Handler: +FIQ_Handler: B FIQ_Handler -init2 : +init2 : /* --- Initialise stack pointer registers */ - + /* Enter IRQ mode and set up the IRQ stack pointer */ MOV r0, #Mode_IRQ | I_Bit | F_Bit /* No interrupts */ MSR cpsr, r0 ldr r1, =_irq_stack_size LDR sp, =_irq_stack add sp, sp, r1 - sub sp, sp, #0x64 + sub sp, sp, #0x64 /* Enter FIQ mode and set up the FIQ stack pointer */ MOV r0, #Mode_FIQ | I_Bit | F_Bit /* No interrupts */ @@ -138,7 +138,7 @@ init2 : ldr r1, =_fiq_stack_size LDR sp, =_fiq_stack add sp, sp, r1 - sub sp, sp, #0x64 + sub sp, sp, #0x64 /* Enter ABT mode and set up the ABT stack pointer */ MOV r0, #Mode_ABT | I_Bit | F_Bit /* No interrupts */ @@ -146,15 +146,15 @@ init2 : ldr r1, =_abt_stack_size LDR sp, =_abt_stack add sp, sp, r1 - sub sp, sp, #0x64 - + sub sp, sp, #0x64 + /* Set up the SVC stack pointer last and stay in SVC mode */ MOV r0, #Mode_SVC | I_Bit | F_Bit /* No interrupts */ MSR cpsr, r0 ldr r1, =_svc_stack_size LDR sp, =_svc_stack add sp, sp, r1 - sub sp, sp, #0x64 + sub sp, sp, #0x64 /* save the original registers */ stmdb sp!, {r4-r12, lr} diff --git a/c/src/lib/libbsp/arm/edb7312/startup/bspstart.c b/c/src/lib/libbsp/arm/edb7312/startup/bspstart.c index 62ba300662..714a134d26 100644 --- a/c/src/lib/libbsp/arm/edb7312/startup/bspstart.c +++ b/c/src/lib/libbsp/arm/edb7312/startup/bspstart.c @@ -2,7 +2,7 @@ * Cirrus EP7312 Startup code * * Copyright (c) 2002 by Jay Monkman - * + * * The license and distribution terms for this file may be * found in the file LICENSE in this distribution or at * @@ -79,12 +79,12 @@ void bsp_pretasking_hook(void) uint32_t heap_size; - /* + /* * Set up the heap. It uses all free SDRAM except that reserved * for non-cached uses. */ heap_start = free_mem_start; - + /* heap_size = (free_mem_end - heap_start - MEM_NOCACHE_SIZE); */ heap_size = 0x200000; @@ -97,7 +97,7 @@ void bsp_pretasking_hook(void) #endif /* RTEMS_DEBUG */ } /* bsp_pretasking_hook */ - + /**************************************************************************/ /* */ @@ -133,26 +133,26 @@ void bsp_start_default( void ) Cpu_table.pretasking_hook = bsp_pretasking_hook; Cpu_table.postdriver_hook = bsp_postdriver_hook; Cpu_table.do_zero_of_workspace = TRUE; - + /* Place RTEMS workspace at beginning of free memory. */ BSP_Configuration.work_space_start = (void *)&_bss_free_start; - - free_mem_start = ((uint32_t)&_bss_free_start + + + free_mem_start = ((uint32_t)&_bss_free_start + BSP_Configuration.work_space_size); - + free_mem_end = ((uint32_t)&_sdram_base + (uint32_t)&_sdram_size); - + /* * Init rtems exceptions management */ rtems_exception_init_mngt(); - + /* * Init rtems interrupt management */ - rtems_irq_mngt_init(); - - + rtems_irq_mngt_init(); + + /* * The following information is very useful when debugging. */ @@ -168,7 +168,7 @@ void bsp_start_default( void ) BSP_Configuration.number_of_device_drivers ); printk( "Device_driver_table = 0x%x\n", BSP_Configuration.Device_driver_table ); - + /* printk( "_stack_size = 0x%x\n", _stack_size );*/ printk( "work_space_start = 0x%x\n", BSP_Configuration.work_space_start ); printk( "work_space_size = 0x%x\n", BSP_Configuration.work_space_size ); diff --git a/c/src/lib/libbsp/arm/edb7312/startup/exit.c b/c/src/lib/libbsp/arm/edb7312/startup/exit.c index 23e12fa54b..abdbed15a8 100644 --- a/c/src/lib/libbsp/arm/edb7312/startup/exit.c +++ b/c/src/lib/libbsp/arm/edb7312/startup/exit.c @@ -2,7 +2,7 @@ * Cirrus EP7312 BSP Shutdown code * * Copyright (c) 2002 by Jay Monkman - * + * * The license and distribution terms for this file may be * found in the file LICENSE in this distribution or at * diff --git a/c/src/lib/libbsp/arm/edb7312/timer/timer.c b/c/src/lib/libbsp/arm/edb7312/timer/timer.c index efc59beeed..9acacb89d6 100644 --- a/c/src/lib/libbsp/arm/edb7312/timer/timer.c +++ b/c/src/lib/libbsp/arm/edb7312/timer/timer.c @@ -2,7 +2,7 @@ * Cirrus EP7312 Timer driver * * Copyright (c) 2002 by Jay Monkman - * + * * The license and distribution terms for this file may be * found in the file LICENSE in this distribution or at * @@ -14,7 +14,7 @@ * Timer_initialize() and Read_timer(). Read_timer() usually returns * the number of microseconds since Timer_initialize() exitted. * - * It is important that the timer start/stop overhead be determined + * It is important that the timer start/stop overhead be determined * when porting or modifying this code. * * $Id$ -- cgit v1.2.3