diff options
author | Ralf Corsepius <ralf.corsepius@rtems.org> | 2004-04-16 21:51:30 +0000 |
---|---|---|
committer | Ralf Corsepius <ralf.corsepius@rtems.org> | 2004-04-16 21:51:30 +0000 |
commit | 0fdc09947386f72e261d0fc474e35e7bfa560dc4 (patch) | |
tree | 3057e0e8a3de5f7ec37e5a58d1d562bb6fccabb5 /c/src/lib/libbsp/sh/shsim | |
parent | Remove stray white spaces. (diff) | |
download | rtems-0fdc09947386f72e261d0fc474e35e7bfa560dc4.tar.bz2 |
Remove stray white spaces.
Diffstat (limited to 'c/src/lib/libbsp/sh/shsim')
-rw-r--r-- | c/src/lib/libbsp/sh/shsim/gdbsci/gdbsci.c | 52 | ||||
-rw-r--r-- | c/src/lib/libbsp/sh/shsim/include/bsp.h | 10 | ||||
-rw-r--r-- | c/src/lib/libbsp/sh/shsim/include/gdbsci.h | 4 | ||||
-rw-r--r-- | c/src/lib/libbsp/sh/shsim/start/start.S | 4 | ||||
-rw-r--r-- | c/src/lib/libbsp/sh/shsim/startup/bspstart.c | 22 | ||||
-rw-r--r-- | c/src/lib/libbsp/sh/shsim/trap34/console-io.c | 4 | ||||
-rw-r--r-- | c/src/lib/libbsp/sh/shsim/trap34/console-support.S | 2 |
7 files changed, 49 insertions, 49 deletions
diff --git a/c/src/lib/libbsp/sh/shsim/gdbsci/gdbsci.c b/c/src/lib/libbsp/sh/shsim/gdbsci/gdbsci.c index 24e17e98ed..db6b4b1fa2 100644 --- a/c/src/lib/libbsp/sh/shsim/gdbsci/gdbsci.c +++ b/c/src/lib/libbsp/sh/shsim/gdbsci/gdbsci.c @@ -33,12 +33,12 @@ #include <sh/sh7_pfc.h> #include <sh/sci.h> -/* - * gdb assumes area 5/char access (base address & 0x0500000), +/* + * gdb assumes area 5/char access (base address & 0x0500000), * the RTEMS's sh7045 code however defaults to area 5/int/short/char access * [Very likely a bug in the sh7045 code, RC.] */ - + #define GDBSCI_BASE 0x05ffffff #define GDBSCI0_SMR (SCI0_SMR & GDBSCI_BASE) @@ -58,7 +58,7 @@ /* * NOTE: Only device 1 is valid for the simulator */ - + #define SH_GDBSCI_MINOR_DEVICES 2 /* Force SIGBUS by using an unsupported address for /dev/gdbsci0 */ @@ -91,13 +91,13 @@ static int _sci_set_cflags( { uint8_t smr; uint8_t brr; - + if ( c_cflag & CBAUD ) { if ( _sci_get_brparms( c_cflag, &smr, &brr ) != 0 ) return -1 ; } - + if ( c_cflag & CSIZE ) { if ( c_cflag & CS8 ) @@ -122,28 +122,28 @@ static int _sci_set_cflags( smr |= SCI_ODD_PARITY ; else smr &= ~SCI_ODD_PARITY; - + write8( smr, sci_dev->addr + SCI_SMR ); write8( brr, sci_dev->addr + SCI_BRR ); - + return 0 ; } #endif -static void _sci_init( +static void _sci_init( rtems_device_minor_number minor ) { #if NOT_SUPPORTED_BY_GDB uint16_t temp16 ; - /* Pin function controller initialisation for asynchronous mode */ + /* Pin function controller initialisation for asynchronous mode */ if( minor == 0) { temp16 = read16( PFC_PBCR1); temp16 &= ~( PB8MD | PB9MD ); temp16 |= (PB_TXD0 | PB_RXD0); write16( temp16, PFC_PBCR1); - } + } else { temp16 = read16( PFC_PBCR1); @@ -173,7 +173,7 @@ static void _sci_tx_polled( const char buf ) { struct scidev_t *scidev = &sci_device[minor] ; -#if NOT_SUPPORTED_BY_GDB +#if NOT_SUPPORTED_BY_GDB int8_t ssr ; while ( !inb((scidev->addr + SCI_SSR) & SCI_TDRE )) @@ -181,18 +181,18 @@ static void _sci_tx_polled( #endif write8(buf,scidev->addr+SCI_TDR); -#if NOT_SUPPORTED_BY_GDB +#if NOT_SUPPORTED_BY_GDB ssr = inb(scidev->addr+SCI_SSR); ssr &= ~SCI_TDRE ; write8(ssr,scidev->addr+SCI_SSR); #endif -} +} static int _sci_rx_polled ( int minor) { struct scidev_t *scidev = &sci_device[minor] ; - + unsigned char c; #if NOT_SUPPORTED_BY_GDB char ssr ; @@ -203,9 +203,9 @@ static int _sci_rx_polled ( if ( !(ssr & SCI_RDRF) ) return -1; -#endif +#endif c = read8(scidev->addr + SCI_RDR) ; -#if NOT_SUPPORTED_BY_GDB +#if NOT_SUPPORTED_BY_GDB write8(ssr & ~SCI_RDRF,scidev->addr + SCI_SSR); #endif return c; @@ -222,7 +222,7 @@ rtems_device_driver sh_gdbsci_initialize( { rtems_device_driver status ; rtems_device_minor_number i; - + /* * register all possible devices. * the initialization of the hardware is done by sci_open @@ -239,7 +239,7 @@ rtems_device_driver sh_gdbsci_initialize( } /* default hardware setup */ - + return RTEMS_SUCCESSFUL; } @@ -261,14 +261,14 @@ rtems_device_driver sh_gdbsci_open( { return RTEMS_INVALID_NUMBER; } - + /* device already opened */ if ( sci_device[minor].opened > 0 ) { sci_device[minor].opened++ ; return RTEMS_SUCCESSFUL ; } - + _sci_init( minor ); #if NOT_SUPPORTED_BY_GDB @@ -291,17 +291,17 @@ rtems_device_driver sh_gdbsci_open( /* FIXME: Should be one bit delay */ CPU_delay(50000); /* microseconds */ - + temp8 |= SCI_RE | SCI_TE; write8(temp8, sci_device[minor].addr + SCI_SCR); /* Enable clock output */ - } + } #endif sci_device[minor].opened++ ; return RTEMS_SUCCESSFUL ; } - + /* * Close entry point */ @@ -318,7 +318,7 @@ rtems_device_driver sh_gdbsci_close( } sci_device[minor].opened-- ; - + return RTEMS_SUCCESSFUL ; } @@ -333,7 +333,7 @@ rtems_device_driver sh_gdbsci_read( ) { int count = 0; - + rtems_libio_rw_args_t *rw_args = (rtems_libio_rw_args_t *) arg; char * buffer = rw_args->buffer; int maximum = rw_args->count; diff --git a/c/src/lib/libbsp/sh/shsim/include/bsp.h b/c/src/lib/libbsp/sh/shsim/include/bsp.h index 96cca6dc7a..787800f7b6 100644 --- a/c/src/lib/libbsp/sh/shsim/include/bsp.h +++ b/c/src/lib/libbsp/sh/shsim/include/bsp.h @@ -10,7 +10,7 @@ * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. - * + * * COPYRIGHT (c) 2001. * On-Line Applications Research Corporation (OAR). * @@ -78,9 +78,9 @@ extern "C" { /* * Simple spin delay in microsecond units for device drivers. * This is very dependent on the clock speed of the target. - * + * * FIXME: Not applicable with gdb's simulator - * Kept for sourcecode compatibility with other sh-BSPs + * Kept for sourcecode compatibility with other sh-BSPs */ #define rtems_bsp_delay( microseconds ) CPU_delay(microseconds) #define sh_delay( microseconds ) CPU_delay(microseconds) @@ -97,7 +97,7 @@ extern uint32_t WorkSpaceEnd ; extern void *CPU_Interrupt_stack_low ; extern void *CPU_Interrupt_stack_high ; - + /* miscellaneous stuff assumed to exist */ extern rtems_configuration_table BSP_Configuration; @@ -116,7 +116,7 @@ extern void bsp_cleanup( void ); BSP_CONSOLE_DRIVER_TABLE_ENTRY, \ { console_initialize, console_open, console_close, \ console_read, console_write, console_control } - + /* * NOTE: Use the standard Clock driver entry */ diff --git a/c/src/lib/libbsp/sh/shsim/include/gdbsci.h b/c/src/lib/libbsp/sh/shsim/include/gdbsci.h index 5234fc253a..837aa5fd16 100644 --- a/c/src/lib/libbsp/sh/shsim/include/gdbsci.h +++ b/c/src/lib/libbsp/sh/shsim/include/gdbsci.h @@ -8,7 +8,7 @@ * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. - * + * * $Id$ */ @@ -20,7 +20,7 @@ extern "C" { #endif /* - */ + */ #define DEVGDBSCI_DRIVER_TABLE_ENTRY \ { sh_gdbsci_initialize, sh_gdbsci_open, sh_gdbsci_close, sh_gdbsci_read, \ diff --git a/c/src/lib/libbsp/sh/shsim/start/start.S b/c/src/lib/libbsp/sh/shsim/start/start.S index 246a32c0a6..f2e5d62b92 100644 --- a/c/src/lib/libbsp/sh/shsim/start/start.S +++ b/c/src/lib/libbsp/sh/shsim/start/start.S @@ -53,7 +53,7 @@ SYM (start): mov.l vects_k,r0 ! update vbr to point to vectab ldc r0,vbr - ! call the mainline + ! call the mainline mov #0,r4 ! argc mov.l main_k,r0 jsr @r0 @@ -69,7 +69,7 @@ SYM (start): .align 2 stack_k: - .long SYM(stack) + .long SYM(stack) edata_k: .long SYM(edata) end_k: diff --git a/c/src/lib/libbsp/sh/shsim/startup/bspstart.c b/c/src/lib/libbsp/sh/shsim/startup/bspstart.c index 02cb7c1892..83027db6f3 100644 --- a/c/src/lib/libbsp/sh/shsim/startup/bspstart.c +++ b/c/src/lib/libbsp/sh/shsim/startup/bspstart.c @@ -43,7 +43,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 ); @@ -59,11 +59,11 @@ void bsp_libc_init( void *, uint32_t, int ); * not yet initialized. * */ - + void bsp_pretasking_hook(void) { bsp_libc_init(&HeapStart, (char *)&HeapEnd - (char *)&HeapStart, 0); - + #ifdef RTEMS_DEBUG rtems_debug_enable( RTEMS_DEBUG_ALL_MASK ); #endif @@ -78,13 +78,13 @@ void bsp_pretasking_hook(void) void bsp_start( void ) { /* - For real boards you need to setup the hardware + For real boards you need to setup the hardware and need to copy the vector table from rom to ram. - Depending on the board this can either be done from inside the rom + Depending on the board this can either be done from inside the rom startup code, rtems startup code or here. */ - + /* * Allocate the memory for the RTEMS Work Space. This can come from * a variety of places: hard coded address, malloc'ed from outside @@ -100,10 +100,10 @@ void bsp_start( void ) */ BSP_Configuration.work_space_start = (void *) &WorkSpaceStart ; - BSP_Configuration.work_space_size = - (uint32_t) &WorkSpaceEnd - + BSP_Configuration.work_space_size = + (uint32_t) &WorkSpaceEnd - (uint32_t) &WorkSpaceStart ; - + /* * initialize the CPU table for this BSP */ @@ -112,7 +112,7 @@ void bsp_start( void ) _CPU_Interrupt_stack_low = &CPU_Interrupt_stack_low ; _CPU_Interrupt_stack_high = &CPU_Interrupt_stack_high ; - Cpu_table.interrupt_stack_size = + Cpu_table.interrupt_stack_size = (uint32_t) (&CPU_Interrupt_stack_high) - (uint32_t) (&CPU_Interrupt_stack_low) ; #endif @@ -120,7 +120,7 @@ void bsp_start( void ) Cpu_table.pretasking_hook = bsp_pretasking_hook; /* init libc, etc. */ Cpu_table.postdriver_hook = bsp_postdriver_hook; - + #if ( CPU_ALLOCATE_INTERRUPT_STACK == TRUE ) Cpu_table.interrupt_stack_size = CONFIGURE_INTERRUPT_STACK_MEMORY; #endif diff --git a/c/src/lib/libbsp/sh/shsim/trap34/console-io.c b/c/src/lib/libbsp/sh/shsim/trap34/console-io.c index 953aea6dae..b8088886bd 100644 --- a/c/src/lib/libbsp/sh/shsim/trap34/console-io.c +++ b/c/src/lib/libbsp/sh/shsim/trap34/console-io.c @@ -2,7 +2,7 @@ * This file contains the hardware specific portions of the TTY driver * for the simulators stdin/out. * - * Logic based on newlib-1.8.2/newlib/libc/sys/sh/syscalls.c + * Logic based on newlib-1.8.2/newlib/libc/sys/sh/syscalls.c * * COPYRIGHT (c) 1989-2000. * On-Line Applications Research Corporation (OAR). @@ -56,7 +56,7 @@ void console_outbyte_polled( } /* - * console_inbyte_nonblocking + * console_inbyte_nonblocking * * This routine polls for a character. */ diff --git a/c/src/lib/libbsp/sh/shsim/trap34/console-support.S b/c/src/lib/libbsp/sh/shsim/trap34/console-support.S index a317d755cc..3aef9c7e24 100644 --- a/c/src/lib/libbsp/sh/shsim/trap34/console-support.S +++ b/c/src/lib/libbsp/sh/shsim/trap34/console-support.S @@ -14,7 +14,7 @@ ___trap34: ret: rts nop - + .align 2 perrno: .long _errno |