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. --- .../lib/libbsp/arm/armulator/console/console-io.c | 2 +- c/src/lib/libbsp/arm/armulator/include/bsp.h | 2 +- c/src/lib/libbsp/arm/armulator/start/start.S | 28 +++++++++++----------- c/src/lib/libbsp/arm/armulator/startup/bspstart.c | 10 ++++---- c/src/lib/libbsp/arm/armulator/startup/libcfunc.c | 2 +- c/src/lib/libbsp/arm/armulator/startup/syscalls.c | 14 +++++------ c/src/lib/libbsp/arm/armulator/startup/trap.S | 2 +- 7 files changed, 30 insertions(+), 30 deletions(-) (limited to 'c/src/lib/libbsp/arm/armulator') diff --git a/c/src/lib/libbsp/arm/armulator/console/console-io.c b/c/src/lib/libbsp/arm/armulator/console/console-io.c index cf844d1c79..3151e3fe20 100644 --- a/c/src/lib/libbsp/arm/armulator/console/console-io.c +++ b/c/src/lib/libbsp/arm/armulator/console/console-io.c @@ -55,7 +55,7 @@ void console_outbyte_polled( } /* - * console_inbyte_nonblocking + * console_inbyte_nonblocking * * This routine polls for a character. */ diff --git a/c/src/lib/libbsp/arm/armulator/include/bsp.h b/c/src/lib/libbsp/arm/armulator/include/bsp.h index 02aae789f6..680bec84b8 100644 --- a/c/src/lib/libbsp/arm/armulator/include/bsp.h +++ b/c/src/lib/libbsp/arm/armulator/include/bsp.h @@ -68,7 +68,7 @@ extern rtems_configuration_table BSP_Configuration; /* * NOTE: Use the standard Console driver entry */ - + /* * NOTE: Use the standard Clock driver entry */ diff --git a/c/src/lib/libbsp/arm/armulator/start/start.S b/c/src/lib/libbsp/arm/armulator/start/start.S index 191aa8d436..bd725115f1 100644 --- a/c/src/lib/libbsp/arm/armulator/start/start.S +++ b/c/src/lib/libbsp/arm/armulator/start/start.S @@ -59,11 +59,11 @@ _mainCRTStartup: mov a2, #0 /* Second arg: fill value */ mov fp, a2 /* Null frame pointer */ mov r7, a2 /* Null frame pointer for Thumb */ - + ldr a1, .LC1 /* First arg: start of memory block */ - ldr a3, .LC2 + ldr a3, .LC2 sub a3, a3, a1 /* Third arg: length of block */ - + #ifdef __thumb__ /* Enter Thumb mode.... */ @@ -73,9 +73,9 @@ _mainCRTStartup: .code 16 .global __change_mode .thumb_func -__change_mode: +__change_mode: #endif - + bl FUNCTION (memset) #if !defined (ARM_RDP_MONITOR) && !defined (ARM_RDI_MONITOR) mov r0, #0 /* no arguments */ @@ -83,9 +83,9 @@ __change_mode: #else /* Need to set up standard file handles */ bl FUNCTION (initialize_monitor_handles) - + /* XXX for now let's just get the code up :) */ -#if 0 +#if 0 #ifdef ARM_RDP_MONITOR swi SWI_GetEnv /* sets r0 to point to the command line */ mov r1, r0 @@ -171,7 +171,7 @@ __change_mode: str r4, [r3] add r3, #4 b .LC15 -.LC14: +.LC14: #else add r2, sp, r0, LSL #2 /* End of args */ mov r3, sp /* Start of args */ @@ -206,10 +206,10 @@ change_back: */ swi SWI_Exit #endif - - /* For Thumb, constants must be after the code since only + + /* For Thumb, constants must be after the code since only positive offsets are supported for PC relative addresses. */ - + .align 0 .LC0: #ifdef ARM_RDI_MONITOR @@ -241,9 +241,9 @@ StackLimit: .word 0 CommandLine: .space 256,0 /* Maximum length of 255 chars handled */ #endif .globl SWI_Handler -SWI_Handler: - B SWI_Handler - +SWI_Handler: + B SWI_Handler + #ifdef __pe__ .section .idata$3 .long 0,0,0,0,0,0,0,0 diff --git a/c/src/lib/libbsp/arm/armulator/startup/bspstart.c b/c/src/lib/libbsp/arm/armulator/startup/bspstart.c index 424a90c49a..8fc4230681 100644 --- a/c/src/lib/libbsp/arm/armulator/startup/bspstart.c +++ b/c/src/lib/libbsp/arm/armulator/startup/bspstart.c @@ -15,11 +15,11 @@ */ #include - + #include #include #include - + /* * The original table from the application and our copy of it with * some changes. @@ -36,7 +36,7 @@ char *rtems_progname; /* * Use the shared implementations of the following routines */ - + void bsp_postdriver_hook(void); void bsp_libc_init( void *, uint32_t, int ); @@ -53,7 +53,7 @@ void bsp_libc_init( void *, uint32_t, int ); * not yet initialized. * */ - + void bsp_pretasking_hook(void) { extern int HeapBase; @@ -68,7 +68,7 @@ void bsp_pretasking_hook(void) #endif } - + /* * bsp_start * diff --git a/c/src/lib/libbsp/arm/armulator/startup/libcfunc.c b/c/src/lib/libbsp/arm/armulator/startup/libcfunc.c index 1eb8f7034b..09714436dd 100644 --- a/c/src/lib/libbsp/arm/armulator/startup/libcfunc.c +++ b/c/src/lib/libbsp/arm/armulator/startup/libcfunc.c @@ -1,7 +1,7 @@ /* Support files for GNU libc. Files in the C namespace go here. Files in the system namespace (ie those that start with an underscore) go in syscalls.c. - + Note: These functions are in a seperate file so that OS providers can overrride the system call stubs (defined in syscalls.c) without having to provide libc funcitons as well. */ diff --git a/c/src/lib/libbsp/arm/armulator/startup/syscalls.c b/c/src/lib/libbsp/arm/armulator/startup/syscalls.c index 801e3d7aa1..9af21c352a 100644 --- a/c/src/lib/libbsp/arm/armulator/startup/syscalls.c +++ b/c/src/lib/libbsp/arm/armulator/startup/syscalls.c @@ -40,7 +40,7 @@ initialize_monitor_handles (void) { #ifdef ARM_RDI_MONITOR int volatile block[3]; - + block[0] = (int) ":tt"; block[2] = 3; /* length of filename */ block[1] = 0; /* mode "r" */ @@ -80,11 +80,11 @@ _swiread (int file, int fh = file; #ifdef ARM_RDI_MONITOR int block[3]; - + block[0] = fh; block[1] = (int) ptr; block[2] = len; - + return do_AngelSWI (AngelSWI_Reason_Read, block); #else asm ("mov r0, %1; mov r1, %2;mov r2, %3; swi %a0" @@ -104,11 +104,11 @@ _swiwrite ( int fh = file; #ifdef ARM_RDI_MONITOR int block[3]; - + block[0] = fh; block[1] = (int) ptr; block[2] = len; - + return do_AngelSWI (AngelSWI_Reason_Write, block); #else asm ("mov r0, %1; mov r1, %2;mov r2, %3; swi %a0" @@ -119,14 +119,14 @@ _swiwrite ( } /* - * Move me + * Move me */ void bsp_cleanup (void ) { /* FIXME: return code is thrown away */ - + #ifdef ARM_RDI_MONITOR do_AngelSWI (AngelSWI_Reason_ReportException, (void *) ADP_Stopped_ApplicationExit); diff --git a/c/src/lib/libbsp/arm/armulator/startup/trap.S b/c/src/lib/libbsp/arm/armulator/startup/trap.S index 328fabca5c..4021ea1d18 100644 --- a/c/src/lib/libbsp/arm/armulator/startup/trap.S +++ b/c/src/lib/libbsp/arm/armulator/startup/trap.S @@ -78,7 +78,7 @@ __rt_stkovf_split_big: @ dummy space on the stack and passing in a "phantom" arg1 into @ the function. This means that we do not need to worry about @ preserving the stack under "sp" even on function return. - @ + @ @ Code should never poke values beneath sp. The sp register @ should always be "dropped" first to cover the data. This @ protects the data against any events that may try and use -- cgit v1.2.3