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/mvme147 | |
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/mvme147')
-rw-r--r-- | c/src/lib/libbsp/m68k/mvme147/clock/ckinit.c | 26 | ||||
-rw-r--r-- | c/src/lib/libbsp/m68k/mvme147/console/console.c | 14 | ||||
-rw-r--r-- | c/src/lib/libbsp/m68k/mvme147/include/bsp.h | 8 | ||||
-rw-r--r-- | c/src/lib/libbsp/m68k/mvme147/startup/bspstart.c | 4 | ||||
-rw-r--r-- | c/src/lib/libbsp/m68k/mvme147/timer/timer.c | 4 | ||||
-rw-r--r-- | c/src/lib/libbsp/m68k/mvme147/timer/timerisr.S | 2 |
6 files changed, 29 insertions, 29 deletions
diff --git a/c/src/lib/libbsp/m68k/mvme147/clock/ckinit.c b/c/src/lib/libbsp/m68k/mvme147/clock/ckinit.c index 0c36a9a172..9898fabb70 100644 --- a/c/src/lib/libbsp/m68k/mvme147/clock/ckinit.c +++ b/c/src/lib/libbsp/m68k/mvme147/clock/ckinit.c @@ -35,14 +35,14 @@ volatile uint32_t Clock_driver_ticks; /* ticks since initialization */ 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; - + /* * ISR Handler @@ -57,7 +57,7 @@ rtems_isr Clock_isr(rtems_vector_number vector) rtems_clock_tick(); Clock_isrs = BSP_Configuration.microseconds_per_tick / 1000; } - else + else Clock_isrs -= 1; } @@ -75,7 +75,7 @@ void Install_clock(rtems_isr_entry clock_isr ) pcc->timer2_control = 0x07; /* clear T2 overflow counter, enable counter */ pcc->timer2_int_control = CLOCK_INT_LEVEL|0x08; /* Enable Timer 2 and set its int. level */ - + atexit( Clock_exit ); } @@ -91,17 +91,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, @@ -110,15 +110,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(TIMER_2_VECTOR); @@ -129,7 +129,7 @@ rtems_device_driver Clock_control( (void) set_vector( args->buffer, TIMER_2_VECTOR, 1 ); rtems_interrupt_enable( isrlevel ); } - + done: return RTEMS_SUCCESSFUL; } diff --git a/c/src/lib/libbsp/m68k/mvme147/console/console.c b/c/src/lib/libbsp/m68k/mvme147/console/console.c index d065aa62af..130ecf6473 100644 --- a/c/src/lib/libbsp/m68k/mvme147/console/console.c +++ b/c/src/lib/libbsp/m68k/mvme147/console/console.c @@ -34,7 +34,7 @@ * * Return values: */ - + rtems_device_driver console_initialize( rtems_device_major_number major, rtems_device_minor_number minor, @@ -42,16 +42,16 @@ rtems_device_driver console_initialize( ) { rtems_status_code status; - + status = rtems_io_register_name( "/dev/console", major, (rtems_device_minor_number) 0 ); - + if (status != RTEMS_SUCCESSFUL) rtems_fatal_error_occurred(status); - + return RTEMS_SUCCESSFUL; } @@ -164,7 +164,7 @@ rtems_device_driver console_open( { return RTEMS_SUCCESSFUL; } - + /* * Close entry point */ @@ -192,7 +192,7 @@ rtems_device_driver console_read( char *buffer; int maximum; int count = 0; - + rw_args = (rtems_libio_rw_args_t *) arg; buffer = rw_args->buffer; @@ -211,7 +211,7 @@ rtems_device_driver console_read( } /* - * write bytes to the serial port. Stdout and stderr are the same. + * write bytes to the serial port. Stdout and stderr are the same. */ rtems_device_driver console_write( diff --git a/c/src/lib/libbsp/m68k/mvme147/include/bsp.h b/c/src/lib/libbsp/m68k/mvme147/include/bsp.h index e3f2d4ce24..57d6f6915a 100644 --- a/c/src/lib/libbsp/m68k/mvme147/include/bsp.h +++ b/c/src/lib/libbsp/m68k/mvme147/include/bsp.h @@ -44,7 +44,7 @@ extern "C" { #define RAM_START 0x00005000 #define RAM_END 0x00400000 - /* MVME 147 Peripheral controller chip + /* MVME 147 Peripheral controller chip see MVME147/D1, 3.4 */ struct pcc_map { @@ -99,9 +99,9 @@ struct pcc_map { #define PCC_BASE_VECTOR 0x40 /* First user int */ #define SCC_VECTOR PCC_BASE_VECTOR+3 #define TIMER_1_VECTOR PCC_BASE_VECTOR+8 -#define TIMER_2_VECTOR PCC_BASE_VECTOR+9 +#define TIMER_2_VECTOR PCC_BASE_VECTOR+9 #define SOFT_1_VECTOR PCC_BASE_VECTOR+10 -#define SOFT_2_VECTOR PCC_BASE_VECTOR+11 +#define SOFT_2_VECTOR PCC_BASE_VECTOR+11 #define USE_CHANNEL_A 1 /* 1 = use channel A for console */ #define USE_CHANNEL_B 0 /* 1 = use channel B for console */ @@ -169,7 +169,7 @@ extern m68k_isr_entry M68Kvec[]; /* vector table address */ /* * NOTE: Use the standard Console driver entry */ - + /* * NOTE: Use the standard Clock driver entry */ diff --git a/c/src/lib/libbsp/m68k/mvme147/startup/bspstart.c b/c/src/lib/libbsp/m68k/mvme147/startup/bspstart.c index 88e3a4040d..ea84a67fdb 100644 --- a/c/src/lib/libbsp/m68k/mvme147/startup/bspstart.c +++ b/c/src/lib/libbsp/m68k/mvme147/startup/bspstart.c @@ -39,7 +39,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 */ @@ -75,7 +75,7 @@ void bsp_start( void ) pcc->int_base_vector = PCC_BASE_VECTOR; /* Set the PCC int vectors base */ - (*(uint8_t*)0xfffe2001) = 0x08; + (*(uint8_t*)0xfffe2001) = 0x08; /* make VME access round-robin */ rtems_cache_enable_instruction(); diff --git a/c/src/lib/libbsp/m68k/mvme147/timer/timer.c b/c/src/lib/libbsp/m68k/mvme147/timer/timer.c index b533b5a8ba..857c391c78 100644 --- a/c/src/lib/libbsp/m68k/mvme147/timer/timer.c +++ b/c/src/lib/libbsp/m68k/mvme147/timer/timer.c @@ -46,9 +46,9 @@ void Timer_initialize() /* write countdown preload value */ pcc->timer1_control = 0x00; /* load preload value */ pcc->timer1_control = 0x07; /* clear T1 overflow counter, enable counter */ - pcc->timer1_int_control = TIMER_INT_LEVEL|0x08; + pcc->timer1_int_control = TIMER_INT_LEVEL|0x08; /* Enable Timer 1 and set its int. level */ - + } #define AVG_OVERHEAD 0 /* No need to start/stop the timer to read diff --git a/c/src/lib/libbsp/m68k/mvme147/timer/timerisr.S b/c/src/lib/libbsp/m68k/mvme147/timer/timerisr.S index 3e3c1b4394..2f93c005cc 100644 --- a/c/src/lib/libbsp/m68k/mvme147/timer/timerisr.S +++ b/c/src/lib/libbsp/m68k/mvme147/timer/timerisr.S @@ -22,7 +22,7 @@ SYM (timerisr): orb #0x80, T1_CONTROL_REGISTER | clear T1 int status bit addql #1, SYM (Ttimer_val) | increment timer value end_timerisr: - rte + rte END_CODE END |