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/m68k/gen68340/clock/ckinit.c | 28 ++++++------ .../libbsp/m68k/gen68340/console/Modif_cpu_asm.S | 6 +-- c/src/lib/libbsp/m68k/gen68340/console/console.c | 46 ++++++++++---------- c/src/lib/libbsp/m68k/gen68340/console/m340uart.c | 50 +++++++++++----------- c/src/lib/libbsp/m68k/gen68340/include/bsp.h | 4 +- c/src/lib/libbsp/m68k/gen68340/include/m340timer.h | 4 +- c/src/lib/libbsp/m68k/gen68340/include/m340uart.h | 4 +- c/src/lib/libbsp/m68k/gen68340/include/m68340.h | 4 +- c/src/lib/libbsp/m68k/gen68340/start/start.S | 6 +-- .../libbsp/m68k/gen68340/start/startfor340only.S | 6 +-- c/src/lib/libbsp/m68k/gen68340/startup/bspstart.c | 2 +- c/src/lib/libbsp/m68k/gen68340/startup/dumpanic.c | 4 +- c/src/lib/libbsp/m68k/gen68340/startup/init68340.c | 4 +- c/src/lib/libbsp/m68k/gen68340/timer/timer.c | 22 +++++----- 14 files changed, 95 insertions(+), 95 deletions(-) (limited to 'c/src/lib/libbsp/m68k/gen68340') diff --git a/c/src/lib/libbsp/m68k/gen68340/clock/ckinit.c b/c/src/lib/libbsp/m68k/gen68340/clock/ckinit.c index 6634fc270a..3078046cf5 100644 --- a/c/src/lib/libbsp/m68k/gen68340/clock/ckinit.c +++ b/c/src/lib/libbsp/m68k/gen68340/clock/ckinit.c @@ -1,4 +1,4 @@ -/* +/* * This routine initializes the MC68340/349 Periodic Interval Timer * * Based on the `gen68360' board support package, and covered by the @@ -9,7 +9,7 @@ * 4, rue du Clos Courtel * 35512 CESSON-SEVIGNE * FRANCE - * + * * e-mail: g_montel@yahoo.com * * $Id$ @@ -54,7 +54,7 @@ rtems_device_minor_number rtems_clock_minor; /****************************************************** Name: Clock_isr - Input parameters: irq vector + Input parameters: irq vector Output parameters: none Description: update # of clock ticks *****************************************************/ @@ -79,7 +79,7 @@ Clock_exit (void) { /* * Turn off periodic interval timer - */ + */ SIMPITR = 0; } @@ -99,23 +99,23 @@ Install_clock (rtems_isr_entry clock_isr) Clock_driver_ticks = 0; set_vector (clock_isr, CLOCK_VECTOR, 1); - + /* sets the Periodic Interrupt Control Register PICR */ /* voir a quoi correspond exactement le Clock Vector */ - SIMPICR = ( CLOCK_IRQ_LEVEL << 8 ) | ( CLOCK_VECTOR ); - + SIMPICR = ( CLOCK_IRQ_LEVEL << 8 ) | ( CLOCK_VECTOR ); + /* sets the PITR count value */ /* this assumes a 32.765 kHz crystal */ - + usecs_per_tick = BSP_Configuration.microseconds_per_tick; /* find out whether prescaler should be enabled or not */ if ( usecs_per_tick <= 31128 ) { pitr_tmp = ( usecs_per_tick * 8192 ) / 1000000 ; } else { pitr_tmp = ( usecs_per_tick / 1000000 ) * 16; - /* enable it */ - pitr_tmp |= 0x100; + /* enable it */ + pitr_tmp |= 0x100; } SIMPITR = (unsigned char) pitr_tmp; @@ -126,7 +126,7 @@ Install_clock (rtems_isr_entry clock_isr) /****************************************************** Name: Clock_initialize Input parameters: major & minor numbers - Output parameters: - + Output parameters: - Description: main entry for clock initialization calls the bsp dependant routine *****************************************************/ @@ -138,16 +138,16 @@ 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; } - + /****************************************************** Name: Clock_control Input parameters: major & minor number diff --git a/c/src/lib/libbsp/m68k/gen68340/console/Modif_cpu_asm.S b/c/src/lib/libbsp/m68k/gen68340/console/Modif_cpu_asm.S index 38ba6f2646..3895962722 100644 --- a/c/src/lib/libbsp/m68k/gen68340/console/Modif_cpu_asm.S +++ b/c/src/lib/libbsp/m68k/gen68340/console/Modif_cpu_asm.S @@ -49,7 +49,7 @@ * permitted by the new interrupt level mask, and (2) when * the original context regains the cpu. */ - + #if ( M68K_HAS_VBR == 1) .set SR_OFFSET, 0 | Status register offset .set PC_OFFSET, 2 | Program Counter offset @@ -59,7 +59,7 @@ .set PC_OFFSET, 4 | Program Counter offset .set FVO_OFFSET, 0 | Format/vector offset placed in the stack #endif /* M68K_HAS_VBR */ - + .set SAVED, 16 | space for saved registers .align 4 @@ -68,7 +68,7 @@ SYM (_Debug_ISR_Handler_Console): | - tst.w 0x14000000 | ALLUME CS5 + tst.w 0x14000000 | ALLUME CS5 | addql #1,SYM (_Thread_Dispatch_disable_level) | disable multitasking diff --git a/c/src/lib/libbsp/m68k/gen68340/console/console.c b/c/src/lib/libbsp/m68k/gen68340/console/console.c index 6035fcb8a5..bfde76f00b 100644 --- a/c/src/lib/libbsp/m68k/gen68340/console/console.c +++ b/c/src/lib/libbsp/m68k/gen68340/console/console.c @@ -7,7 +7,7 @@ * 4, rue du Clos Courtel * 35512 CESSON-SEVIGNE * FRANCE - * + * * e-mail: g_montel@yahoo.com * * COPYRIGHT (c) 1989-1999. @@ -102,7 +102,7 @@ InterruptHandler (rtems_vector_number v) else { /* this is necessary, otherwise it blocks when FIFO is full */ ch = DURBA; - rtems_termios_enqueue_raw_characters(ttypA,&ch,1); + rtems_termios_enqueue_raw_characters(ttypA,&ch,1); } } while (DUSRA & m340_Rx_RDY); Restart_Fifo_Full_A_Timer(); /* only if necessary (pointer to a fake function if @@ -142,9 +142,9 @@ InterruptHandler (rtems_vector_number v) /* push them in a trash */ ch = DURBB; } - else { + else { ch = DURBB; - rtems_termios_enqueue_raw_characters(ttypB,&ch,1); + rtems_termios_enqueue_raw_characters(ttypB,&ch,1); } } while (DUSRB & m340_Rx_RDY); @@ -189,16 +189,16 @@ InterruptWrite (int minor, const char *buf, int len) Input parameters: channel, character to emit Output parameters: - Description: wait for the UART to be ready to emit - a character and send it + a character and send it *****************************************************/ void dbug_out_char( int minor, int ch ) { if (minor==UART_CHANNEL_A) { - while (!(DUSRA & m340_Tx_RDY)) continue; + while (!(DUSRA & m340_Tx_RDY)) continue; DUTBA=ch; } else if (minor==UART_CHANNEL_B) { - while (!(DUSRB & m340_Tx_RDY)) continue; + while (!(DUSRB & m340_Tx_RDY)) continue; DUTBB=ch; } } @@ -262,7 +262,7 @@ dbugInitialise () DUCRB = m340_Reset_Transmitter; /* - * Enable serial module for normal operation, ignore FREEZE, select the crystal clock, + * Enable serial module for normal operation, ignore FREEZE, select the crystal clock, * supervisor/user serial registers unrestricted * interrupt arbitration at priority CONSOLE_INTERRUPT_ARBITRATION * WARNING : 8 bits access only on this UART! @@ -322,17 +322,17 @@ dbugInitialise () */ unset_DUIER(m340_RxRDYA&m340_TxRDYA); } - + /* * Change set of baud speeds * disable input control */ /* no good uart configuration ? */ if (uart_config.nb<1) rtems_fatal_error_occurred (-1); - - if (uart_config.baud_speed_table[UART_CHANNEL_A].set==1) + + if (uart_config.baud_speed_table[UART_CHANNEL_A].set==1) DUACR = m340_BRG_Set1; - else + else DUACR = m340_BRG_Set2; /* @@ -347,13 +347,13 @@ dbugInitialise () /* * Serial Channel Baud Speed */ - DUCSRA = (uart_config.baud_speed_table[UART_CHANNEL_A].rcs << 4) + DUCSRA = (uart_config.baud_speed_table[UART_CHANNEL_A].rcs << 4) | (uart_config.baud_speed_table[UART_CHANNEL_A].tcs); /* * Serial Channel Configuration */ - DUMR1A = m340_uart_config[UART_CHANNEL_A].parity_mode + DUMR1A = m340_uart_config[UART_CHANNEL_A].parity_mode | m340_uart_config[UART_CHANNEL_A].bits_per_char | m340_RxRTS; @@ -376,7 +376,7 @@ dbugInitialise () if (CHANNEL_ENABLED_B) { /* we mustn't set the console vector twice! */ - if ((USE_INTERRUPTS_B && !(CHANNEL_ENABLED_A)) + if ((USE_INTERRUPTS_B && !(CHANNEL_ENABLED_A)) || (USE_INTERRUPTS_B && CHANNEL_ENABLED_A && !USE_INTERRUPTS_A)) { rtems_isr_entry old_handler; rtems_status_code sc; @@ -408,7 +408,7 @@ dbugInitialise () */ unset_DUIER(m340_RxRDYB&m340_TxRDYB); } - + /* * Change set of baud speeds * disable input control @@ -416,7 +416,7 @@ dbugInitialise () /* no good uart configuration ? */ if (uart_config.nb<2) rtems_fatal_error_occurred (-1); - + /* don't set DUACR twice! */ if (!CHANNEL_ENABLED_A) { if (uart_config.baud_speed_table[UART_CHANNEL_B].set==1) @@ -437,13 +437,13 @@ dbugInitialise () /* * Serial Channel Baud Speed */ - DUCSRB = (uart_config.baud_speed_table[UART_CHANNEL_B].rcs << 4) + DUCSRB = (uart_config.baud_speed_table[UART_CHANNEL_B].rcs << 4) | (uart_config.baud_speed_table[UART_CHANNEL_B].tcs); /* * Serial Channel Configuration */ - DUMR1B = m340_uart_config[UART_CHANNEL_B].parity_mode + DUMR1B = m340_uart_config[UART_CHANNEL_B].parity_mode | m340_uart_config[UART_CHANNEL_B].bits_per_char | m340_RxRTS; @@ -479,7 +479,7 @@ SetAttributes (int minor, const struct termios *t) /* output speed */ if (t->c_cflag & CBAUDEX) osp = (t->c_cflag & CBAUD) + CBAUD + 1; - else + else osp = t->c_cflag & CBAUD; /* input speed */ @@ -633,7 +633,7 @@ rtems_device_driver console_open( return sc; } - + /****************************************************** Name: console_close Input parameters: channel #, termios args @@ -692,9 +692,9 @@ rtems_device_driver console_control( ) { rtems_libio_ioctl_args_t *args = arg; - + if (args->command == RTEMS_IO_SET_ATTRIBUTES) SetAttributes (minor, (struct termios *)args->buffer); - + return rtems_termios_ioctl (arg); } diff --git a/c/src/lib/libbsp/m68k/gen68340/console/m340uart.c b/c/src/lib/libbsp/m68k/gen68340/console/m340uart.c index 94160b011c..75b3d97e77 100644 --- a/c/src/lib/libbsp/m68k/gen68340/console/m340uart.c +++ b/c/src/lib/libbsp/m68k/gen68340/console/m340uart.c @@ -7,8 +7,8 @@ * 4, rue du Clos Courtel * 35512 CESSON-SEVIGNE * FRANCE - * - * e-mail: g_montel@yahoo.com + * + * e-mail: g_montel@yahoo.com * * COPYRIGHT (c) 1989-1999. * On-Line Applications Research Corporation (OAR). @@ -69,9 +69,9 @@ uart_channel_config m340_uart_config[UART_NUMBER_OF_CHANNELS]; Output parameters: - Description: Init the m340_uart_config THIS SHOULD NOT BE HERE! - Its aim was to let the user configure + Its aim was to let the user configure UARTs for each application. - As we can't pass args to the console + As we can't pass args to the console driver initialisation routine at the moment, this was not done. ATTENTION: TERMIOS init presupposes that the channel @@ -109,18 +109,18 @@ void Init_UART_Table(void) /****************************************************** Name: Find_Right_m340_UART_Channel_Config - Input parameters: Send/Receive baud rates for a + Input parameters: Send/Receive baud rates for a given channel Output parameters: UART compatible configs for this channel - Description: returns which uart configurations fit - Receiver Baud Rate and Transmitter Baud + Description: returns which uart configurations fit + Receiver Baud Rate and Transmitter Baud Rate for a given channel - For instance, according to the + For instance, according to the m340_Baud_Rates_Table: - Output Speed = 50, Input Speed = 75 is not a correct config, because - 50 bauds implies set 1 and 75 bauds + 50 bauds implies set 1 and 75 bauds implies set 2 - Output Speed = 9600, Input Speed = 9600 two correct configs for this: @@ -142,7 +142,7 @@ Find_Right_m340_UART_Channel_Config(float ReceiverBaudRate, float TransmitterBau int i,j; /* Receiver and Transmitter baud rates must be compatible, ie in the same set */ - + /* search for configurations for ReceiverBaudRate - there can't be more than two (only two sets) */ for (i=0;i<16;i++) for (j=0;j<2;j++) @@ -151,7 +151,7 @@ Find_Right_m340_UART_Channel_Config(float ReceiverBaudRate, float TransmitterBau Receiver[Receiver_nb_of_config].set=j; Receiver_nb_of_config++; } - + /* search for configurations for TransmitterBaudRate - there can't be more than two (only two sets) */ for (i=0;i<16;i++) for (j=0;j<2;j++) @@ -161,15 +161,15 @@ Find_Right_m340_UART_Channel_Config(float ReceiverBaudRate, float TransmitterBau Transmitter_nb_of_config++; } - /* now check if there's a compatible config */ + /* now check if there's a compatible config */ return_value.nb=0; - + for (i=0; i #include #include - + /* * The original table from the application and our copy of it with * some changes. diff --git a/c/src/lib/libbsp/m68k/gen68340/startup/dumpanic.c b/c/src/lib/libbsp/m68k/gen68340/startup/dumpanic.c index 7a84dff20e..9310ca9f87 100644 --- a/c/src/lib/libbsp/m68k/gen68340/startup/dumpanic.c +++ b/c/src/lib/libbsp/m68k/gen68340/startup/dumpanic.c @@ -7,7 +7,7 @@ * 4, rue du Clos Courtel * 35512 CESSON-SEVIGNE * FRANCE - * + * * COPYRIGHT (c) 1989-1999. * On-Line Applications Research Corporation (OAR). * @@ -104,7 +104,7 @@ extern char RAW_GETC(int minor); /****************************************************** Name: _dbug_dump - Input parameters: sr, pc, stack pointer, + Input parameters: sr, pc, stack pointer, size to display Output parameters: - Description: display the supervisor stack diff --git a/c/src/lib/libbsp/m68k/gen68340/startup/init68340.c b/c/src/lib/libbsp/m68k/gen68340/startup/init68340.c index 96caf9e585..d7e7831e4d 100644 --- a/c/src/lib/libbsp/m68k/gen68340/startup/init68340.c +++ b/c/src/lib/libbsp/m68k/gen68340/startup/init68340.c @@ -6,9 +6,9 @@ * 4, rue du Clos Courtel * 35512 CESSON-SEVIGNE * FRANCE - * + * * e-mail: g_montel@yahoo.com - * + * * $Id$ */ diff --git a/c/src/lib/libbsp/m68k/gen68340/timer/timer.c b/c/src/lib/libbsp/m68k/gen68340/timer/timer.c index b4298e150d..84060ae68c 100644 --- a/c/src/lib/libbsp/m68k/gen68340/timer/timer.c +++ b/c/src/lib/libbsp/m68k/gen68340/timer/timer.c @@ -13,7 +13,7 @@ * 4, rue du Clos Courtel * 35512 CESSON-SEVIGNE * FRANCE - * + * * e-mail: g_montel@yahoo.com * * $Id$ @@ -25,7 +25,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. @@ -66,7 +66,7 @@ int preload = 0; Input parameters: - Output parameters: - Description: when a character is received, sets - the TIMER to raise an interrupt at + the TIMER to raise an interrupt at TIMEOUT. It's necessary to prevent from not getting n-1 characters (with n the @@ -128,7 +128,7 @@ void Fifo_Full_Timer_initialize (void) * USE TIMER 1 for UART FIFO FULL mode */ - if ( Fifo_Full_on_A || Fifo_Full_on_B ) + if ( Fifo_Full_on_A || Fifo_Full_on_B ) { /* Disable the timer */ TCR1 &= ~m340_SWR; @@ -145,8 +145,8 @@ void Fifo_Full_Timer_initialize (void) /* compute prescaler */ if ( Fifo_Full_on_A && Fifo_Full_on_B) - max_baud_rate = max(m340_uart_config[UART_CHANNEL_A].rx_baudrate, m340_uart_config[UART_CHANNEL_B].rx_baudrate); - else if ( Fifo_Full_on_A ) + max_baud_rate = max(m340_uart_config[UART_CHANNEL_A].rx_baudrate, m340_uart_config[UART_CHANNEL_B].rx_baudrate); + else if ( Fifo_Full_on_A ) max_baud_rate = m340_uart_config[UART_CHANNEL_A].rx_baudrate; else max_baud_rate = m340_uart_config[UART_CHANNEL_B].rx_baudrate; @@ -154,7 +154,7 @@ void Fifo_Full_Timer_initialize (void) nb_of_clock_ticks = (10/max_baud_rate)*(CLOCK_SPEED*1000000)*1.2; if (nb_of_clock_ticks < 0xFFFF) { preload = nb_of_clock_ticks; - prescaler_output_tap = -1; + prescaler_output_tap = -1; } else if (nb_of_clock_ticks/2 < 0xFFFF) { preload = nb_of_clock_ticks/2; prescaler_output_tap = m340_Divide_by_2; @@ -179,7 +179,7 @@ void Fifo_Full_Timer_initialize (void) } else if (nb_of_clock_ticks/256 < 0xFFFF) { preload = nb_of_clock_ticks/256; prescaler_output_tap = m340_Divide_by_256; - } + } /* Input Capture/Output Compare (ICOC) */ TCR1 = m340_SWR | m340_TO_Enabled | m340_ICOC; @@ -250,7 +250,7 @@ void Timer_initialize (void) } /****************************************************** - Name: Read_timer + Name: Read_timer Input parameters: - Output parameters: - Description: Return timer value in microsecond units @@ -263,10 +263,10 @@ Read_timer (void) } /****************************************************** - Name: Empty_function + Name: Empty_function Input parameters: - Output parameters: - - Description: Empty function call used in loops to + Description: Empty function call used in loops to measure basic cost of looping in Timing Test Suite. *****************************************************/ -- cgit v1.2.3