diff options
author | Ralf Corsepius <ralf.corsepius@rtems.org> | 2004-04-21 10:43:04 +0000 |
---|---|---|
committer | Ralf Corsepius <ralf.corsepius@rtems.org> | 2004-04-21 10:43:04 +0000 |
commit | 6128a4aa5e791ed4e0a655bfd346a52d92da7883 (patch) | |
tree | af53ca3f67ce405b6fbc6c98399c8e0c87e01a9e /c/src/lib/libbsp/m68k/mrm332 | |
parent | 2004-04-20 Ralf Corsepius <ralf_corsepius@rtems.org> (diff) | |
download | rtems-6128a4aa5e791ed4e0a655bfd346a52d92da7883.tar.bz2 |
Remove stray white spaces.
Diffstat (limited to 'c/src/lib/libbsp/m68k/mrm332')
-rw-r--r-- | c/src/lib/libbsp/m68k/mrm332/clock/ckinit.c | 24 | ||||
-rw-r--r-- | c/src/lib/libbsp/m68k/mrm332/console/console.c | 12 | ||||
-rw-r--r-- | c/src/lib/libbsp/m68k/mrm332/console/sci.c | 19 | ||||
-rw-r--r-- | c/src/lib/libbsp/m68k/mrm332/include/bsp.h | 8 | ||||
-rw-r--r-- | c/src/lib/libbsp/m68k/mrm332/include/mrm332.h | 2 | ||||
-rw-r--r-- | c/src/lib/libbsp/m68k/mrm332/spurious/spinit.c | 42 | ||||
-rw-r--r-- | c/src/lib/libbsp/m68k/mrm332/start/start.S | 6 | ||||
-rw-r--r-- | c/src/lib/libbsp/m68k/mrm332/startup/bspclean.c | 2 | ||||
-rw-r--r-- | c/src/lib/libbsp/m68k/mrm332/startup/bspstart.c | 6 | ||||
-rw-r--r-- | c/src/lib/libbsp/m68k/mrm332/startup/except_vect_332_ROM.S | 16 | ||||
-rw-r--r-- | c/src/lib/libbsp/m68k/mrm332/startup/start_c.c | 8 | ||||
-rw-r--r-- | c/src/lib/libbsp/m68k/mrm332/timer/timer.c | 2 |
12 files changed, 75 insertions, 72 deletions
diff --git a/c/src/lib/libbsp/m68k/mrm332/clock/ckinit.c b/c/src/lib/libbsp/m68k/mrm332/clock/ckinit.c index 367e3dc86f..6b43a81917 100644 --- a/c/src/lib/libbsp/m68k/mrm332/clock/ckinit.c +++ b/c/src/lib/libbsp/m68k/mrm332/clock/ckinit.c @@ -30,14 +30,14 @@ volatile uint32_t Clock_driver_ticks; rtems_isr_entry Old_ticker; void Clock_exit( void ); - + /* * These are set by clock driver during its init */ - + rtems_device_major_number rtems_clock_major = ~0; rtems_device_minor_number rtems_clock_minor; - + rtems_isr Clock_isr(rtems_vector_number vector) { Clock_driver_ticks += 1; @@ -63,7 +63,7 @@ void Install_clock( *PITR = (unsigned short int)( SAM(0x09,0,PITM) );/* load counter */ *PICR = (unsigned short int) /* enable interrupt */ ( SAM(ISRL_PIT,8,PIRQL) | SAM(CLOCK_VECTOR,0,PIV) ); - + atexit( Clock_exit ); } @@ -84,17 +84,17 @@ rtems_device_driver Clock_initialize( ) { Install_clock( Clock_isr ); - + /* * make major/minor avail to others such as shared memory driver */ - + rtems_clock_major = major; rtems_clock_minor = minor; - + return RTEMS_SUCCESSFUL; } - + rtems_device_driver Clock_control( rtems_device_major_number major, rtems_device_minor_number minor, @@ -103,15 +103,15 @@ rtems_device_driver Clock_control( { uint32_t isrlevel; rtems_libio_ioctl_args_t *args = pargp; - + if (args == 0) goto done; - + /* * This is hokey, but until we get a defined interface * to do this, it will just be this simple... */ - + if (args->command == rtems_build_name('I', 'S', 'R', ' ')) { Clock_isr(CLOCK_VECTOR); @@ -122,7 +122,7 @@ rtems_device_driver Clock_control( (void) set_vector( args->buffer, CLOCK_VECTOR, 1 ); rtems_interrupt_enable( isrlevel ); } - + done: return RTEMS_SUCCESSFUL; } diff --git a/c/src/lib/libbsp/m68k/mrm332/console/console.c b/c/src/lib/libbsp/m68k/mrm332/console/console.c index 33bfb1fa8e..757b196dc6 100644 --- a/c/src/lib/libbsp/m68k/mrm332/console/console.c +++ b/c/src/lib/libbsp/m68k/mrm332/console/console.c @@ -49,11 +49,11 @@ rtems_device_driver console_open( /* SCI internal uart */ - status = rtems_termios_open( major, minor, arg, SciGetTermiosHandlers( TRUE ) ); + status = rtems_termios_open( major, minor, arg, SciGetTermiosHandlers( TRUE ) ); return status; } - + /*PAGE * * console_close @@ -69,7 +69,7 @@ rtems_device_driver console_close( { return rtems_termios_close (arg); } - + /*PAGE * * console_read @@ -85,7 +85,7 @@ rtems_device_driver console_read( { return rtems_termios_read (arg); } - + /*PAGE * * console_write @@ -101,7 +101,7 @@ rtems_device_driver console_write( { return rtems_termios_write (arg); } - + /*PAGE * * console_control @@ -167,7 +167,7 @@ rtems_device_driver console_initialize( if ( link( "/dev/sci", "/dev/console") < 0 ) { rtems_fatal_error_occurred( RTEMS_IO_ERROR ); - } + } #endif /* diff --git a/c/src/lib/libbsp/m68k/mrm332/console/sci.c b/c/src/lib/libbsp/m68k/mrm332/console/sci.c index 7e92a5a293..97c4a5c1b5 100644 --- a/c/src/lib/libbsp/m68k/mrm332/console/sci.c +++ b/c/src/lib/libbsp/m68k/mrm332/console/sci.c @@ -36,6 +36,9 @@ * $Id$ * * $Log$ +* Revision 1.6 2004/04/15 13:26:13 ralf +* Remove stray white spaces. +* * Revision 1.5 2004/03/31 04:37:05 ralf * 2004-03-31 Ralf Corsepius <ralf_corsepius@rtems.org> * @@ -486,7 +489,7 @@ static int8_t SciRcvBufGetChar() { rtems_interrupt_level level; uint8_t ch; - + if ( SciRcvBufCount == 0 ) { rtems_fatal_error_occurred(0xDEAD); // check the count first! @@ -521,7 +524,7 @@ static int8_t SciRcvBufGetChar() static void SciRcvBufPutChar( uint8_t ch ) { rtems_interrupt_level level; - + if ( SciRcvBufCount == SCI_RCV_BUF_SIZE ) // is there room? { return; // no, throw it away @@ -556,7 +559,7 @@ static void SciRcvBufPutChar( uint8_t ch ) static void SciRcvBufFlush( void ) { rtems_interrupt_level level; - + rtems_interrupt_disable( level ); // disable interrupts memset( SciRcvBuffer, 0, sizeof(SciRcvBuffer) ); @@ -740,7 +743,7 @@ int32_t SciSetAttributes( uint16_t sci_databits = 0; if ( minor != SCI_MINOR ) // check the minor dev num - { + { return -1; // return error } @@ -754,7 +757,7 @@ int32_t SciSetAttributes( // baud_requested = B9600; // default to 9600 baud baud_requested = B19200; // default to 19200 baud } - + sci_rate = termios_baud_to_number( baud_requested ); // parity error detection @@ -1123,7 +1126,7 @@ rtems_device_driver SciRead ( rtems_libio_rw_args_t *rw_args; // ptr to argument struct uint8_t *buffer; uint16_t length; - + rw_args = (rtems_libio_rw_args_t *) arg; // arguments to read() @@ -1184,7 +1187,7 @@ rtems_device_driver SciWrite ( rtems_libio_rw_args_t *rw_args; // ptr to argument struct uint8_t *buffer; uint16_t length; - + rw_args = (rtems_libio_rw_args_t *) arg; if (minor != SCI_MINOR) @@ -1234,7 +1237,7 @@ rtems_device_driver SciControl ( uint16_t command; // the cmd to execute uint16_t unused; // maybe later uint16_t *ptr; // ptr to user data - + //printk("%s major=%d minor=%d\r\n", __FUNCTION__,major,minor); // do some sanity checking diff --git a/c/src/lib/libbsp/m68k/mrm332/include/bsp.h b/c/src/lib/libbsp/m68k/mrm332/include/bsp.h index 79be6d6e71..1aa26d9310 100644 --- a/c/src/lib/libbsp/m68k/mrm332/include/bsp.h +++ b/c/src/lib/libbsp/m68k/mrm332/include/bsp.h @@ -57,7 +57,7 @@ extern "C" { /* XXX - JRS - I want to compile the tmtests */ -#define MUST_WAIT_FOR_INTERRUPT 1 +#define MUST_WAIT_FOR_INTERRUPT 1 #define Install_tm27_vector( handler ) @@ -65,7 +65,7 @@ extern "C" { #define Clear_tm27_intr() -#define Lower_tm27_intr() +#define Lower_tm27_intr() /* * Simple spin delay in microsecond units for device drivers. @@ -130,11 +130,11 @@ extern int stack_start; /* * Device Driver Table Entries */ - + /* * NOTE: Use the standard Console driver entry */ - + /* * NOTE: Use the standard Clock driver entry */ diff --git a/c/src/lib/libbsp/m68k/mrm332/include/mrm332.h b/c/src/lib/libbsp/m68k/mrm332/include/mrm332.h index d6e97f1cec..8e385f8079 100644 --- a/c/src/lib/libbsp/m68k/mrm332/include/mrm332.h +++ b/c/src/lib/libbsp/m68k/mrm332/include/mrm332.h @@ -64,7 +64,7 @@ /* * This prototype really should have the noreturn attribute but - * that causes a warning. Not sure how to fix that. + * that causes a warning. Not sure how to fix that. */ /* static void reboot(void) __attribute__ ((noreturn)); */ static void reboot(void); diff --git a/c/src/lib/libbsp/m68k/mrm332/spurious/spinit.c b/c/src/lib/libbsp/m68k/mrm332/spurious/spinit.c index 4e5e0e542a..52796ca03a 100644 --- a/c/src/lib/libbsp/m68k/mrm332/spurious/spinit.c +++ b/c/src/lib/libbsp/m68k/mrm332/spurious/spinit.c @@ -36,27 +36,27 @@ rtems_isr Spurious_Isr( //int sp = 0; #if 0 const char * const VectDescrip[] = { - _Spurious_Error_[0], _Spurious_Error_[0], _Spurious_Error_[1], - _Spurious_Error_[2], _Spurious_Error_[3], _Spurious_Error_[4], - _Spurious_Error_[5], _Spurious_Error_[6], _Spurious_Error_[7], - _Spurious_Error_[8], _Spurious_Error_[9], _Spurious_Error_[10], - _Spurious_Error_[11], _Spurious_Error_[12], _Spurious_Error_[13], - _Spurious_Error_[13], _Spurious_Error_[14], _Spurious_Error_[14], - _Spurious_Error_[14], _Spurious_Error_[14], _Spurious_Error_[14], - _Spurious_Error_[14], _Spurious_Error_[14], _Spurious_Error_[14], - _Spurious_Error_[15], _Spurious_Error_[16], _Spurious_Error_[17], - _Spurious_Error_[18], _Spurious_Error_[19], _Spurious_Error_[20], - _Spurious_Error_[21], _Spurious_Error_[22], _Spurious_Error_[23], - _Spurious_Error_[24], _Spurious_Error_[23], _Spurious_Error_[23], - _Spurious_Error_[23], _Spurious_Error_[23], _Spurious_Error_[23], - _Spurious_Error_[23], _Spurious_Error_[23], _Spurious_Error_[23], - _Spurious_Error_[23], _Spurious_Error_[23], _Spurious_Error_[23], - _Spurious_Error_[23], _Spurious_Error_[23], _Spurious_Error_[25], - _Spurious_Error_[26], _Spurious_Error_[26], _Spurious_Error_[26], - _Spurious_Error_[26], _Spurious_Error_[26], _Spurious_Error_[26], - _Spurious_Error_[26], _Spurious_Error_[26], _Spurious_Error_[26], - _Spurious_Error_[26], _Spurious_Error_[26], _Spurious_Error_[27], - _Spurious_Error_[27], _Spurious_Error_[27], _Spurious_Error_[27], + _Spurious_Error_[0], _Spurious_Error_[0], _Spurious_Error_[1], + _Spurious_Error_[2], _Spurious_Error_[3], _Spurious_Error_[4], + _Spurious_Error_[5], _Spurious_Error_[6], _Spurious_Error_[7], + _Spurious_Error_[8], _Spurious_Error_[9], _Spurious_Error_[10], + _Spurious_Error_[11], _Spurious_Error_[12], _Spurious_Error_[13], + _Spurious_Error_[13], _Spurious_Error_[14], _Spurious_Error_[14], + _Spurious_Error_[14], _Spurious_Error_[14], _Spurious_Error_[14], + _Spurious_Error_[14], _Spurious_Error_[14], _Spurious_Error_[14], + _Spurious_Error_[15], _Spurious_Error_[16], _Spurious_Error_[17], + _Spurious_Error_[18], _Spurious_Error_[19], _Spurious_Error_[20], + _Spurious_Error_[21], _Spurious_Error_[22], _Spurious_Error_[23], + _Spurious_Error_[24], _Spurious_Error_[23], _Spurious_Error_[23], + _Spurious_Error_[23], _Spurious_Error_[23], _Spurious_Error_[23], + _Spurious_Error_[23], _Spurious_Error_[23], _Spurious_Error_[23], + _Spurious_Error_[23], _Spurious_Error_[23], _Spurious_Error_[23], + _Spurious_Error_[23], _Spurious_Error_[23], _Spurious_Error_[25], + _Spurious_Error_[26], _Spurious_Error_[26], _Spurious_Error_[26], + _Spurious_Error_[26], _Spurious_Error_[26], _Spurious_Error_[26], + _Spurious_Error_[26], _Spurious_Error_[26], _Spurious_Error_[26], + _Spurious_Error_[26], _Spurious_Error_[26], _Spurious_Error_[27], + _Spurious_Error_[27], _Spurious_Error_[27], _Spurious_Error_[27], _Spurious_Error_[27], _Spurious_Error_[28]}; #endif diff --git a/c/src/lib/libbsp/m68k/mrm332/start/start.S b/c/src/lib/libbsp/m68k/mrm332/start/start.S index 359b2e5f7c..fec7bbee81 100644 --- a/c/src/lib/libbsp/m68k/mrm332/start/start.S +++ b/c/src/lib/libbsp/m68k/mrm332/start/start.S @@ -88,7 +88,7 @@ END_CODE /* see section 9 of the SIM Reference Manual */ *DDRE = (unsigned char) 0xff; *DDRF = (unsigned char) 0xfd; - + /* Port E and F Pin Assignment Register */ /* see section 9 of the SIM Reference Manual */ *PEPAR = (unsigned char) 0; @@ -109,7 +109,7 @@ END_CODE /* ROM has data at end of text; copy it. */ while (dst < _edata) *dst++ = *src++; - + /* Zero bss */ for (dst = _clear_start; dst< end; dst++) { @@ -130,7 +130,7 @@ END_CODE M68Kvec[ 31 ] = monitors_vector_table[ 31 ]; /* level 7 interrupt */ M68Kvec[ 47 ] = monitors_vector_table[ 47 ]; /* system call vector */ M68Kvec[ 66 ] = monitors_vector_table[ 66 ]; /* user defined */ - + m68k_set_vbr(&M68Kvec); } diff --git a/c/src/lib/libbsp/m68k/mrm332/startup/bspclean.c b/c/src/lib/libbsp/m68k/mrm332/startup/bspclean.c index 3379492b72..472ce4ba14 100644 --- a/c/src/lib/libbsp/m68k/mrm332/startup/bspclean.c +++ b/c/src/lib/libbsp/m68k/mrm332/startup/bspclean.c @@ -1,7 +1,7 @@ /* bsp_cleanup() * * This routine cleans up in the sense that it places the board - * in a safe state and flushes the I/O buffers before exiting. + * in a safe state and flushes the I/O buffers before exiting. * * INPUT: NONE * diff --git a/c/src/lib/libbsp/m68k/mrm332/startup/bspstart.c b/c/src/lib/libbsp/m68k/mrm332/startup/bspstart.c index 4c5c577f80..f40fa2153d 100644 --- a/c/src/lib/libbsp/m68k/mrm332/startup/bspstart.c +++ b/c/src/lib/libbsp/m68k/mrm332/startup/bspstart.c @@ -16,9 +16,9 @@ #include <bsp.h> #include <rtems/libio.h> - + #include <string.h> - + /* * The original table from the application and our copy of it with * some changes. @@ -34,7 +34,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 ); void bsp_pretasking_hook(void); /* m68k version */ diff --git a/c/src/lib/libbsp/m68k/mrm332/startup/except_vect_332_ROM.S b/c/src/lib/libbsp/m68k/mrm332/startup/except_vect_332_ROM.S index cb8ce4cf5c..edc0b633f4 100644 --- a/c/src/lib/libbsp/m68k/mrm332/startup/except_vect_332_ROM.S +++ b/c/src/lib/libbsp/m68k/mrm332/startup/except_vect_332_ROM.S @@ -2,18 +2,18 @@ * $Id$ */ -/* Exception Vector definitions follow */ +/* Exception Vector definitions follow */ /* !!! Warning !!! This table is not tested, and the user must make sure it is complete. */ - /* If we use TRAP #15 for reboot, note that group 0 and 1 exceptions + /* If we use TRAP #15 for reboot, note that group 0 and 1 exceptions will have priority. */ /* This is the "magic word" that CPU32bug uses to indicate that there is a bootable image here. */ .long 0xBEEFBEEF - + /* Vector 0: RESET: Initial SSP */ .long _RamEnd /* Vector 1: RESET: Initial PC */ @@ -21,7 +21,7 @@ /* default action for undefined vectors is to re-boot */ - /* Note group 0 and 1 exception (like trace) have priority + /* Note group 0 and 1 exception (like trace) have priority over other exceptions (like trap #15) that may call this. */ /* Vectors 2-255 */ @@ -287,8 +287,8 @@ _reboot: movea.l (0x4).w,%a0 /* jmp to location of reset vector */ jmp (%a0) -reboot: - trap #15 /* use trap exception to enter supervisor - state. Trace mode ( and other group 0 - and 1 exceptions) *could* screw this up if +reboot: + trap #15 /* use trap exception to enter supervisor + state. Trace mode ( and other group 0 + and 1 exceptions) *could* screw this up if not vectored to reboot or did not return. */ diff --git a/c/src/lib/libbsp/m68k/mrm332/startup/start_c.c b/c/src/lib/libbsp/m68k/mrm332/startup/start_c.c index acab7b4696..4cb7ab2c65 100644 --- a/c/src/lib/libbsp/m68k/mrm332/startup/start_c.c +++ b/c/src/lib/libbsp/m68k/mrm332/startup/start_c.c @@ -62,7 +62,7 @@ void start_c() { /* see section 9 of the SIM Reference Manual */ *DDRE = (unsigned char) 0xff; *DDRF = (unsigned char) 0xfd; - + /* Port E and F Pin Assignment Register */ /* see section 9 of the SIM Reference Manual */ *PEPAR = (unsigned char) 0; @@ -83,7 +83,7 @@ void start_c() { /* ROM has data at end of text; copy it. */ while (dst < _edata) *dst++ = *src++; - + /* Zero bss */ for (dst = _clear_start; dst< end; dst++) { @@ -104,14 +104,14 @@ void start_c() { M68Kvec[ 31 ] = monitors_vector_table[ 31 ]; /* level 7 interrupt */ M68Kvec[ 47 ] = monitors_vector_table[ 47 ]; /* system call vector */ M68Kvec[ 66 ] = monitors_vector_table[ 66 ]; /* user defined */ - + m68k_set_vbr(&M68Kvec); } /* * Initalize the board. */ - + /* Spurious should be called in the predriver hook */ /* Spurious_Initialize(); */ //console_init(); diff --git a/c/src/lib/libbsp/m68k/mrm332/timer/timer.c b/c/src/lib/libbsp/m68k/mrm332/timer/timer.c index d497e4580d..8100914286 100644 --- a/c/src/lib/libbsp/m68k/mrm332/timer/timer.c +++ b/c/src/lib/libbsp/m68k/mrm332/timer/timer.c @@ -6,7 +6,7 @@ * * Output parameters: NONE * - * NOTE: It is important that the timer start/stop overhead be + * NOTE: It is important that the timer start/stop overhead be * determined when porting or modifying this code. * * COPYRIGHT (c) 1989-1999. |