Remove stray white spaces.

5 files changed, 124 insertions, 124 deletions

diff --git a/c/src/lib/libbsp/arm/shared/comm/console.c b/c/src/lib/libbsp/arm/shared/comm/console.c
index a6c4c58cca..fc6cec3f31 100644
--- a/c/src/lib/libbsp/arm/shared/comm/console.c
+++ b/c/src/lib/libbsp/arm/shared/comm/console.c
@@ -1,11 +1,11 @@
 /*-------------------------------------------------------------------------+
-| console.c - ARM BSP 
+| console.c - ARM BSP
 +--------------------------------------------------------------------------+
 | This file contains the ARM console I/O package.
 +--------------------------------------------------------------------------+
 |   COPYRIGHT (c) 2000 Canon Research France SA.
 |   Emmanuel Raguet, mailto:raguet@crf.canon.fr
-| 
+|
 |   The license and distribution terms for this file may be
 |   found in found in the file LICENSE in this distribution or at
 |   http://www.rtems.com/license/LICENSE.
@@ -65,9 +65,9 @@ static int  isr_is_on(const rtems_irq_connect_data *);
  */
 
 /* for printk support */
-BSP_output_char_function_type BSP_output_char = 
+BSP_output_char_function_type BSP_output_char =
    (BSP_output_char_function_type) BSP_output_char_via_serial;
-BSP_polling_getchar_function_type BSP_poll_char = 
+BSP_polling_getchar_function_type BSP_poll_char =
    (BSP_polling_getchar_function_type) BSP_poll_char_via_serial;
 
 
@@ -82,7 +82,7 @@ isr_on(const rtems_irq_connect_data *unused)
 {
   return;
 }
-						   
+
 static void
 isr_off(const rtems_irq_connect_data *unused)
 {
@@ -102,9 +102,9 @@ void __assert (const char *file, int line, const char *msg)
 {
     static   char exit_msg[] = "EXECUTIVE SHUTDOWN! Any key to reboot...";
   unsigned char  ch;
-   
+
   /*
-   * Note we cannot call exit or printf from here, 
+   * Note we cannot call exit or printf from here,
    * assert can fail inside ISR too
    */
 
@@ -121,7 +121,7 @@ void __assert (const char *file, int line, const char *msg)
   printk(exit_msg);
   ch = BSP_poll_char();
   printk("\n\n");
-  rtemsReboot(); 
+  rtemsReboot();
 
 }
 
@@ -142,21 +142,21 @@ console_initialize(rtems_device_major_number major,
    * Set up TERMIOS
    */
   rtems_termios_initialize ();
-  
+
   /*
    * Do device-specific initialization
    */
-      
+
   /* 38400-8-N-1 */
   BSP_uart_init(BSPConsolePort, 38400, 0);
-      
-      
+
+
   /* Set interrupt handler */
   console_isr_data.name = BSP_UART;
   console_isr_data.hdl  = BSP_uart_termios_isr_com1;
   console_isr_data.irqLevel = 3;
   console_isr_data.irqTrigger = 0;
-    
+
   status = BSP_install_rtems_irq_handler(&console_isr_data);
 
   if (!status){
@@ -196,7 +196,7 @@ console_open(rtems_device_major_number major,
                 void                      *arg)
 {
   rtems_status_code              status;
-  static rtems_termios_callbacks cb = 
+  static rtems_termios_callbacks cb =
   {
     NULL,	              /* firstOpen */
     console_last_close,       /* lastClose */
@@ -219,9 +219,9 @@ console_open(rtems_device_major_number major,
   /*
    * Pass data area info down to driver
    */
-  BSP_uart_termios_set(BSPConsolePort, 
+  BSP_uart_termios_set(BSPConsolePort,
 			 ((rtems_libio_open_close_args_t *)arg)->iop->data1);
-  
+
   /* Enable interrupts  on channel */
   BSP_uart_intr_ctrl(BSPConsolePort, BSP_UART_INTR_CTRL_TERMIOS);
 
@@ -243,7 +243,7 @@ console_close(rtems_device_major_number major,
   return res;
 } /* console_close */
 
- 
+
 /*-------------------------------------------------------------------------+
 | Console device driver READ entry point.
 +--------------------------------------------------------------------------+
@@ -256,9 +256,9 @@ console_read(rtems_device_major_number major,
 {
 
   return rtems_termios_read (arg);
-  
+
 } /* console_read */
- 
+
 
 /*-------------------------------------------------------------------------+
 | Console device driver WRITE entry point.
@@ -272,20 +272,20 @@ console_write(rtems_device_major_number major,
 {
 
   return rtems_termios_write (arg);
- 
+
 } /* console_write */
 
 
- 
+
 /*
  * Handle ioctl request.
  */
-rtems_device_driver 
+rtems_device_driver
 console_control(rtems_device_major_number major,
 		rtems_device_minor_number minor,
 		void                      * arg
 )
-{ 
+{
   return rtems_termios_ioctl (arg);
 }
 
@@ -294,45 +294,45 @@ conSetAttr(int minor, const struct termios *t)
 {
   int baud;
 
-  switch (t->c_cflag & CBAUD) 
+  switch (t->c_cflag & CBAUD)
     {
-    case B50:	
+    case B50:
       baud = 50;
       break;
-    case B75:	
-      baud = 75;	
+    case B75:
+      baud = 75;
       break;
-    case B110:	
-      baud = 110;	
+    case B110:
+      baud = 110;
       break;
-    case B134:	
-      baud = 134;	
+    case B134:
+      baud = 134;
       break;
-    case B150:	
-      baud = 150;	
+    case B150:
+      baud = 150;
       break;
     case B200:
-      baud = 200;	
+      baud = 200;
       break;
-    case B300:	
+    case B300:
       baud = 300;
       break;
-    case B600:	
-      baud = 600;	
+    case B600:
+      baud = 600;
       break;
-    case B1200:	
+    case B1200:
       baud = 1200;
       break;
-    case B1800:	
-      baud = 1800;	
+    case B1800:
+      baud = 1800;
       break;
-    case B2400:	
+    case B2400:
       baud = 2400;
       break;
-    case B4800:	
+    case B4800:
       baud = 4800;
       break;
-    case B9600:	
+    case B9600:
       baud = 9600;
       break;
     case B19200:
@@ -341,7 +341,7 @@ conSetAttr(int minor, const struct termios *t)
     case B38400:
       baud = 38400;
       break;
-    case B57600:	
+    case B57600:
       baud = 57600;
       break;
     case B115200:
diff --git a/c/src/lib/libbsp/arm/shared/comm/uart.c b/c/src/lib/libbsp/arm/shared/comm/uart.c
index 5b57e923a1..21ba31dcdf 100644
--- a/c/src/lib/libbsp/arm/shared/comm/uart.c
+++ b/c/src/lib/libbsp/arm/shared/comm/uart.c
@@ -33,10 +33,10 @@ struct uart_data
 
 static struct uart_data uart_data[2];
 
-/* 
+/*
  * Macros to read/wirte register of uart, if configuration is
  * different just rewrite these macros
- */ 
+ */
 
 static inline unsigned char
 uread(int uart, unsigned int reg)
@@ -44,11 +44,11 @@ uread(int uart, unsigned int reg)
   register unsigned char val;
 
   val = Regs[reg];
-  
+
   return val;
 }
 
-static inline void      
+static inline void
 uwrite(int uart, int reg, unsigned int val)
 {
 
@@ -81,13 +81,13 @@ uartError(int uart)
 inline void uartError(int uart)
 {
   unsigned char uartStatus;
-  
+
   uartStatus = uread(uart, LSR);
   uartStatus = uread(uart, RBR);
 }
 #endif
 
-/* 
+/*
  * Uart initialization, it is hardcoded to 8 bit, no parity,
  * one stop bit, FIFO, things to be changed
  * are baud rate and nad hw flow control,
@@ -97,10 +97,10 @@ void
 BSP_uart_init(int uart, int baud, int hwFlow)
 {
   unsigned char tmp;
-  
+
   /* Sanity check */
   assert(uart == BSP_UART_COM1 || uart == BSP_UART_COM2);
-  
+
   switch(baud)
     {
     case 50:
@@ -121,20 +121,20 @@ BSP_uart_init(int uart, int baud, int hwFlow)
       assert(0);
       return;
     }
-  
+
   /* Enable UART block */
   uwrite(uart, CNT, UART_ENABLE | PAD_ENABLE);
 
   /* Set DLAB bit to 1 */
   uwrite(uart, LCR, DLAB);
-  
+
   /* Set baud rate */
-  uwrite(uart, DLL,  (BSPBaseBaud/baud) & 0xff); 
-  uwrite(uart, DLM,  ((BSPBaseBaud/baud) >> 8) & 0xff); 
+  uwrite(uart, DLL,  (BSPBaseBaud/baud) & 0xff);
+  uwrite(uart, DLM,  ((BSPBaseBaud/baud) >> 8) & 0xff);
 
   /* 8-bit, no parity , 1 stop */
   uwrite(uart, LCR, CHR_8_BITS);
-  
+
   /* Enable FIFO */
   uwrite(uart, FCR, FIFO_EN | XMIT_RESET | RCV_RESET | RECEIVE_FIFO_TRIGGER12);
 
@@ -151,7 +151,7 @@ BSP_uart_init(int uart, int baud, int hwFlow)
   return;
 }
 
-/* 
+/*
  * Set baud
  */
 void
@@ -161,10 +161,10 @@ BSP_uart_set_baud(int uart, int baud)
 
   /* Sanity check */
   assert(uart == BSP_UART_COM1 || uart == BSP_UART_COM2);
-  
-  /* 
+
+  /*
    * This function may be called whenever TERMIOS parameters
-   * are changed, so we have to make sure that baud change is 
+   * are changed, so we have to make sure that baud change is
    * indeed required
    */
 
@@ -178,14 +178,14 @@ BSP_uart_set_baud(int uart, int baud)
   BSP_uart_init(uart, baud, uart_data[uart].hwFlow);
 
   uwrite(uart, IER, ier);
-  
+
   return;
 }
 
 /*
- * Enable/disable interrupts 
+ * Enable/disable interrupts
  */
-void 
+void
 BSP_uart_intr_ctrl(int uart, int cmd)
 {
 
@@ -218,7 +218,7 @@ BSP_uart_intr_ctrl(int uart, int cmd)
       assert(0);
       break;
     }
- 
+
   return;
 }
 
@@ -227,12 +227,12 @@ BSP_uart_intr_ctrl(int uart, int cmd)
  * Status function, -1 if error
  * detected, 0 if no received chars available,
  * 1 if received char available, 2 if break
- * is detected, it will eat break and error 
- * chars. It ignores overruns - we cannot do 
+ * is detected, it will eat break and error
+ * chars. It ignores overruns - we cannot do
  * anything about - it execpt count statistics
  * and we are not counting it.
  */
-int 
+int
 BSP_uart_polled_status(int uart)
 {
   unsigned char val;
@@ -250,7 +250,7 @@ BSP_uart_polled_status(int uart)
 
   if((val & (DR | OE | FE)) ==  1)
     {
-      /* No error, character present */ 
+      /* No error, character present */
       return BSP_UART_STATUS_CHAR;
     }
 
@@ -260,12 +260,12 @@ BSP_uart_polled_status(int uart)
       return BSP_UART_STATUS_NOCHAR;
     }
 
-  /* 
+  /*
    * Framing or parity error
    * eat character
    */
   uread(uart, RBR);
- 
+
   return BSP_UART_STATUS_ERROR;
 }
 
@@ -273,24 +273,24 @@ BSP_uart_polled_status(int uart)
 /*
  * Polled mode write function
  */
-void 
+void
 BSP_uart_polled_write(int uart, int val)
 {
   unsigned char val1;
-  
+
   /* Sanity check */
   assert(uart == BSP_UART_COM1 || uart == BSP_UART_COM2);
-  
+
   for(;;)
     {
-      if((val1=uread(uart, LSR)) & THRE) 
+      if((val1=uread(uart, LSR)) & THRE)
 	{
 	  break;
 	}
     }
 
   uwrite(uart, THR, val & 0xff);
-      
+
   return;
 }
 
@@ -301,16 +301,16 @@ BSP_output_char_via_serial(int val)
   if (val == '\n') BSP_uart_polled_write(BSPConsolePort,'\r');
 }
 
-/* 
+/*
  * Polled mode read function
  */
-int 
+int
 BSP_uart_polled_read(int uart)
 {
   unsigned char val;
 
   assert(uart == BSP_UART_COM1 || uart == BSP_UART_COM2);
-  
+
   for(;;)
     {
       if(uread(uart, LSR) & DR)
@@ -318,13 +318,13 @@ BSP_uart_polled_read(int uart)
 	  break;
 	}
     }
-  
+
   val = uread(uart, RBR);
 
   return (int)(val & 0xff);
 }
 
-unsigned 
+unsigned
 BSP_poll_char_via_serial()
 {
 	return BSP_uart_polled_read(BSPConsolePort);
@@ -346,19 +346,19 @@ static char          termios_tx_hold_com2        = 0;
 static volatile char termios_tx_hold_valid_com2  = 0;
 
 /*
- * Set channel parameters 
+ * Set channel parameters
  */
 void
 BSP_uart_termios_set(int uart, void *ttyp)
 {
   assert(uart == BSP_UART_COM1 || uart == BSP_UART_COM2);
-  
+
   if(uart == BSP_UART_COM1)
     {
       termios_stopped_com1 = 0;
       termios_tx_active_com1      = 0;
       termios_ttyp_com1           = ttyp;
-      termios_tx_hold_com1        = 0; 
+      termios_tx_hold_com1        = 0;
       termios_tx_hold_valid_com1  = 0;
     }
   else
@@ -366,7 +366,7 @@ BSP_uart_termios_set(int uart, void *ttyp)
       termios_stopped_com2 = 0;
       termios_tx_active_com2      = 0;
       termios_ttyp_com2           = ttyp;
-      termios_tx_hold_com2        = 0; 
+      termios_tx_hold_com2        = 0;
       termios_tx_hold_valid_com2  = 0;
     }
 
@@ -384,7 +384,7 @@ BSP_uart_termios_write_com1(int minor, const char *buf, int len)
     }
 
   /* If there TX buffer is busy - something is royally screwed up */
-  assert((uread(BSP_UART_COM1, LSR) & THRE) != 0); 
+  assert((uread(BSP_UART_COM1, LSR) & THRE) != 0);
 
   if(termios_stopped_com1)
     {
@@ -401,7 +401,7 @@ BSP_uart_termios_write_com1(int minor, const char *buf, int len)
   if(!termios_tx_active_com1)
     {
       termios_tx_active_com1 = 1;
-      uwrite(BSP_UART_COM1, IER, 
+      uwrite(BSP_UART_COM1, IER,
 	     (RECEIVE_ENABLE  |
 	      TRANSMIT_ENABLE |
 	      RECEIVER_LINE_ST_ENABLE
@@ -465,7 +465,7 @@ BSP_uart_termios_isr_com1(void)
   for(;;)
     {
       vect = uread(BSP_UART_COM1, IIR) & 0xf;
-      
+
       switch(vect)
 	{
 	case NO_MORE_INTR :
@@ -479,9 +479,9 @@ BSP_uart_termios_isr_com1(void)
 	    }
 	  return;
 	case TRANSMITTER_HODING_REGISTER_EMPTY :
-	  /* 
-	   * TX holding empty: we have to disable these interrupts 
-	   * if there is nothing more to send. 
+	  /*
+	   * TX holding empty: we have to disable these interrupts
+	   * if there is nothing more to send.
 	   */
 
 	  ret = rtems_termios_dequeue_characters(termios_ttyp_com1, 1);
@@ -514,7 +514,7 @@ BSP_uart_termios_isr_com1(void)
 	}
     }
 }
-	  
+
 void
 BSP_uart_termios_isr_com2()
 {
@@ -526,7 +526,7 @@ BSP_uart_termios_isr_com2()
   for(;;)
     {
       vect = uread(BSP_UART_COM2, IIR) & 0xf;
-      
+
       switch(vect)
 	{
 	case NO_MORE_INTR :
@@ -540,8 +540,8 @@ BSP_uart_termios_isr_com2()
 	    }
 	  return;
 	case TRANSMITTER_HODING_REGISTER_EMPTY :
-	  /* 
-	   * TX holding empty: we have to disable these interrupts 
+	  /*
+	   * TX holding empty: we have to disable these interrupts
 	   * if there is nothing more to send.
 	   */
 
diff --git a/c/src/lib/libbsp/arm/shared/comm/uart.h b/c/src/lib/libbsp/arm/shared/comm/uart.h
index c472d8296e..18322cedee 100644
--- a/c/src/lib/libbsp/arm/shared/comm/uart.h
+++ b/c/src/lib/libbsp/arm/shared/comm/uart.h
@@ -38,7 +38,7 @@ extern int BSPConsolePort;
 extern int BSPBaseBaud;
 /*
  * Command values for BSP_uart_intr_ctrl(),
- * values are strange in order to catch errors 
+ * values are strange in order to catch errors
  * with assert
  */
 #define BSP_UART_INTR_CTRL_DISABLE  (0)
@@ -71,20 +71,20 @@ extern int BSPBaseBaud;
 #define RBR  RSRBR   /* Rx Buffer Register (read) */
 #define THR  RSTHR   /* Tx Buffer Register (write) */
 #define IER  RSIER   /* Interrupt Enable Register */
-  
+
 /* DLAB X */
 #define IIR  RSIIR   /* Interrupt Ident Register (read) */
 #define FCR  RSFCR   /* FIFO Control Register (write) */
 #define LCR  RSLCR   /* Line Control Register */
 #define LSR  RSLSR   /* Line Status Register */
-  
+
 /* DLAB 1 */
 #define DLL  RSDLL   /* Divisor Latch, LSB */
 #define DLM  RSDLH   /* Divisor Latch, MSB */
-  
+
 /* Uart control */
 #define CNT  RSCNT   /* General Control register */
-  
+
 /*
  * define bit for CNT
  */
diff --git a/c/src/lib/libbsp/arm/shared/irq/irq_asm.S b/c/src/lib/libbsp/arm/shared/irq/irq_asm.S
index 348533e385..52a1692819 100644
--- a/c/src/lib/libbsp/arm/shared/irq/irq_asm.S
+++ b/c/src/lib/libbsp/arm/shared/irq/irq_asm.S
@@ -25,16 +25,16 @@
 _ISR_Handler:
         stmdb   sp!, {r0, r1, r2, r3, r12}   /* save regs on INT stack */
         stmdb   sp!, {lr}               /*    now safe to call C funcs */
-        
+
 
 /* one nest level deeper */
-        ldr     r0, =_ISR_Nest_level 
+        ldr     r0, =_ISR_Nest_level
         ldr     r1, [r0]
         add     r1, r1,#1
         str     r1, [r0]
-        
+
 /* disable multitasking */
-        ldr     r0, =_Thread_Dispatch_disable_level          
+        ldr     r0, =_Thread_Dispatch_disable_level
         ldr     r1, [r0]
         add     r1, r1,#1
         str     r1, [r0]
@@ -42,14 +42,14 @@ _ISR_Handler:
 /* BSP specific function to INT handler */
         /* FIXME: I'm not sure why I can't save just r12. I'm also  */
         /*     not sure which of r1-r3 are important.               */
-        bl      ExecuteITHandler 
+        bl      ExecuteITHandler
 
-/* one less nest level  */      
+/* one less nest level  */
         ldr     r0, =_ISR_Nest_level
         ldr     r1, [r0]
         sub     r1, r1,#1
         str     r1, [r0]
-        
+
 /* unnest multitasking */
         ldr     r0, =_Thread_Dispatch_disable_level
         ldr     r1, [r0]
@@ -59,7 +59,7 @@ _ISR_Handler:
 /* check to see if we interrupted nd INT (with FIQ?) */
         mrs   r0, spsr
         and   r0, r0, #0x1f
-        cmp   r0, #0x12        /* is it INT mode? */  
+        cmp   r0, #0x12        /* is it INT mode? */
         beq   exitit
 
 /* If thread dispatching is disabled, exit */
@@ -70,18 +70,18 @@ _ISR_Handler:
         ldr     r0, =_Context_Switch_necessary
         ldr     r1, [r0]
         cmp     r1, #0
-        
+
         /* since bframe is going to clear _ISR_Signals_to_thread_executing, */
         /*    we need to load it here */
-        ldr     r0, =_ISR_Signals_to_thread_executing   
+        ldr     r0, =_ISR_Signals_to_thread_executing
         ldr     r1, [r0]
         bne     bframe
-        
+
 /* If a signals to be sent (_ISR_Signals_to_thread_executing != 0),        */
 /*  call scheduler */
         cmp     r1, #0
         beq     exitit
-        
+
 /* _ISR_Signals_to_thread_executing = FALSE */
         mov     r1, #0
         str     r1, [r0]
@@ -94,7 +94,7 @@ bframe:
         mrs     r0, spsr
         ldmia   sp!, {r1}       /* get lr off stack */
         stmdb   sp!, {r1}
-        mrs     r2, cpsr    
+        mrs     r2, cpsr
         orr     r3, r2, #0x1    /* change to SVC mode */
         msr     cpsr_c, r3
 
@@ -111,10 +111,10 @@ bframe:
         ldmia   sp!, {r1}                 /* out with the old          */
         stmdb   sp!, {lr}                 /*    in with the new (lr) */
 
-        
+
         orr     r0, r0, #0xc0
         msr     spsr, r0
-                                        
+
 exitit:
         ldmia   sp!, {lr}                     /* restore regs from INT stack */
         ldmia   sp!, {r0, r1, r2, r3, r12}    /* restore regs from INT stack */
@@ -122,7 +122,7 @@ exitit:
 
 
 
-        /* on entry to _ISR_Dispatch, we're in SVC mode */      
+        /* on entry to _ISR_Dispatch, we're in SVC mode */
         .globl _ISR_Dispatch
 _ISR_Dispatch:
         stmdb   sp!, {r0-r3, r12,lr}      /* save regs on SVC stack */
@@ -130,15 +130,15 @@ _ISR_Dispatch:
                                           /*    we don't save lr, since  */
                                           /*    it's just going to get   */
                                           /*    overwritten              */
-_ISR_Dispatch_p_4:	
+_ISR_Dispatch_p_4:
         bl      _Thread_Dispatch
 	ldmia	sp!, {r0-r3, r12, lr}
 
 	stmdb   sp!, {r0-r2}
         /* Now we have to screw with the stack */
         mov     r0, sp                  /* copy the SVC stack pointer */
-        
-        mrs     r1, cpsr    
+
+        mrs     r1, cpsr
         bic     r2, r1, #0x1            /* change to INT mode */
         orr     r2, r2, #0xc0           /* disable interrupts */
         msr     cpsr_c, r2
@@ -147,7 +147,7 @@ _ISR_Dispatch_p_4:
         stmdb   sp!, {r4, r5, r6}   /* save temp vars on INT stack */
         ldmia   r0!, {r4, r5, r6}   /* Get r0-r3 from SVC stack */
         stmdb   sp!, {r4, r5, r6}   /*    and save them on INT stack */
-        
+
         ldmia   r0!, {r4, r5}           /* get saved values from SVC stack */
                                         /*      r4=spsr, r5=lr */
         mov     lr,   r5                /* restore lr_int */
diff --git a/c/src/lib/libbsp/arm/shared/irq/irq_init.c b/c/src/lib/libbsp/arm/shared/irq/irq_init.c
index b92bcac7e5..7e60fbd032 100644
--- a/c/src/lib/libbsp/arm/shared/irq/irq_init.c
+++ b/c/src/lib/libbsp/arm/shared/irq/irq_init.c
@@ -32,14 +32,14 @@ void  rtems_irq_mngt_init()
     int 			i;
     long			*vectorTable;
     rtems_interrupt_level       level;
-    
+
     vectorTable = (long *) VECTOR_TABLE;
-    
+
     _CPU_ISR_Disable(level);
 
     /* First, connect the ISR_Handler for IRQ and FIQ interrupts */
-    _CPU_ISR_install_vector(ARM_EXCEPTION_IRQ, _ISR_Handler, NULL); 	
-    _CPU_ISR_install_vector(ARM_EXCEPTION_FIQ, _ISR_Handler, NULL); 	   
+    _CPU_ISR_install_vector(ARM_EXCEPTION_IRQ, _ISR_Handler, NULL);
+    _CPU_ISR_install_vector(ARM_EXCEPTION_FIQ, _ISR_Handler, NULL);
 
      /* Initialize the vector table contents with default handler */
     for (i=0; i<BSP_MAX_INT; i++)