Whitespace removal.

16 files changed, 225 insertions, 225 deletions

diff --git a/c/src/lib/libbsp/shared/umon/cli.h b/c/src/lib/libbsp/shared/umon/cli.h
index 6384816b1b..cedb295efe 100644
--- a/c/src/lib/libbsp/shared/umon/cli.h
+++ b/c/src/lib/libbsp/shared/umon/cli.h
@@ -68,7 +68,7 @@ struct	monCommand {
  *		reason. The docommand() function does not print a message here, it
  *		is assumed that the error message was printed by the local function.
  *	CMD_PARAM_ERROR:
- *		Command line did not parse properly.  Control was passed to a 
+ *		Command line did not parse properly.  Control was passed to a
  *		local command function, but argument syntax caused it to choke.
  *		In this case docommand() will print out the generic CLI syntax error
  *		message.
@@ -96,7 +96,7 @@ struct	monCommand {
 #define CMD_MONRC_DENIED	-6
 
 /* Notes on help text array:
- * The monitor's CLI processor assumes that every command's help text 
+ * The monitor's CLI processor assumes that every command's help text
  * array abides by a few basic rules...
  * First of all, it assumes that every array has AT LEAST two strings.
  * The first string in the array of strings is assumed to be a one-line
diff --git a/c/src/lib/libbsp/shared/umon/monlib.c b/c/src/lib/libbsp/shared/umon/monlib.c
index f43390f0a2..0e315d15c9 100644
--- a/c/src/lib/libbsp/shared/umon/monlib.c
+++ b/c/src/lib/libbsp/shared/umon/monlib.c
@@ -3,7 +3,7 @@
  *	the application.  It is built with (but not linked with) the monitor,
  *	then the monlib.o file is linked with the application.
  *	The only requirement on the application is that it know where the address
- *	of the monCom function is in the monitor's space.  
+ *	of the monCom function is in the monitor's space.
  *	The monCom function will be accessible in some "well-known" way (processor
  *	and platform dependent) so that this will not be a problem.
  *
@@ -132,7 +132,7 @@ static int	(*_moncom)(int,void *,void *, void *);
  * is to be used, then simply redefine them here.  Refer to the monitor
  * app note that discusses multi-tasking access to the monitor API for more
  * information.
- * 
+ *
  * TFS_MONLOCK/UNLOCK:
  * Lock/unlock for functions that access TFS flash space:
  */
@@ -158,7 +158,7 @@ static int	(*_moncom)(int,void *,void *, void *);
 #define HEAP_MONUNLOCK		monUnlock
 
 /* BLOCKING_MONLOCK/UNLOCK:
- * Lock/unlock for functions in the monitor that block waiting for 
+ * Lock/unlock for functions in the monitor that block waiting for
  * console input.
  */
 #define BLOCKING_MONLOCK	monLock
@@ -182,7 +182,7 @@ static int	(*_moncom)(int,void *,void *, void *);
  *			know it.
  *	lock:	Points to a function in the application code that will be
  *			used by the monitor as a lock-out function (some kind of
- *			semaphore in the application).  
+ *			semaphore in the application).
  *	unlock:	Points to a function in the application code that will be
  *			used by the monitor as an un-lock-out function (undo whatever
  *			lock-out mechanism was done by lock).
@@ -288,7 +288,7 @@ monConnect(int (*mon)(int,void *,void *,void *),
  * is already active, so when the function tries to call some other mon_xxx
  * function it won't be able to because of the lock already being set.
  *
- * With these functions in the application space, the user can do the 
+ * With these functions in the application space, the user can do the
  * following:
  *	call %DisableLock
  *  call %Func_with_monXXX_in_it
@@ -319,7 +319,7 @@ EnableMonLock(void)
  * These functions must test both the function pointer and the state
  * of the ignorelock variable.  The function DisableMonLock() sets the
  * ignorelock variable to 2 because it is being executed through "call"
- * which means that the lock is active.  
+ * which means that the lock is active.
  */
 static void
 monLock(void)
@@ -358,7 +358,7 @@ int
 mon_com(int cmd, void *arg1, void *arg2, void *arg3)
 {
 	int	ret;
-	
+
 	GENERIC_MONLOCK();
 	ret = _moncom(cmd,arg1,arg2,arg3);
 	GENERIC_MONUNLOCK();
@@ -369,7 +369,7 @@ int
 mon_putchar(char c)
 {
 	int	ret;
-	
+
 	CONSOLE_MONLOCK();
 	ret = _rputchar(c);
 	CONSOLE_MONUNLOCK();
diff --git a/c/src/lib/libbsp/shared/umon/tfs.h b/c/src/lib/libbsp/shared/umon/tfs.h
index f83d518237..9f8aa9804c 100644
--- a/c/src/lib/libbsp/shared/umon/tfs.h
+++ b/c/src/lib/libbsp/shared/umon/tfs.h
@@ -1,6 +1,6 @@
 /* tfs.h:
  *	Header file for TFS transactions, used by both application and monitor.
- * 
+ *
  *	General notice:
  *	This code is part of a boot-monitor package developed as a generic base
  *	platform for embedded system designs.  As such, it is likely to be
@@ -62,8 +62,8 @@
 #define TFS_ULVL2	0x00000400	/* '2'	level 2 */
 #define TFS_ULVL3	0x00000600	/* '3'	level 3 */
 #define TFS_NSTALE	0x00000800	/* File is NOT stale, invisible to user.
-								 * When this bit is clear, the file is 
-								 * considered stale (see notes in tfsadd()). 
+								 * When this bit is clear, the file is
+								 * considered stale (see notes in tfsadd()).
 								 * See notes in tfsclose() for this.
 								 */
 #define TFS_ACTIVE	0x00008000	/* Used to indicate that file is not deleted. */
diff --git a/c/src/lib/libbsp/shared/umon/umoncons.c b/c/src/lib/libbsp/shared/umon/umoncons.c
index 408eb5cd6d..9ccde1d2a2 100644
--- a/c/src/lib/libbsp/shared/umon/umoncons.c
+++ b/c/src/lib/libbsp/shared/umon/umoncons.c
@@ -28,8 +28,8 @@ static void    umoncons_write_polled(int minor, char c);
 static int     umoncons_set_attributes(int minor, const struct termios *t);
 
 /* Pointers to functions for handling the UART. */
-console_fns umoncons_fns = 
-{ 
+console_fns umoncons_fns =
+{
   libchip_serial_default_probe,
   umoncons_first_open,
   umoncons_last_close,
@@ -45,23 +45,23 @@ console_fns umoncons_fns =
 /* Functions called via callbacks (i.e. the ones in uart_fns */
 /*********************************************************************/
 
-/* 
+/*
  * This is called the first time each device is opened. Since
- * the driver is polled, we don't have to do anything. If the driver 
- * were interrupt driven, we'd enable interrupts here. 
+ * the driver is polled, we don't have to do anything. If the driver
+ * were interrupt driven, we'd enable interrupts here.
 */
-static int umoncons_first_open(int major, int minor, void *arg) 
+static int umoncons_first_open(int major, int minor, void *arg)
 {
   return 0;
 }
 
 
-/* 
+/*
  * This is called the last time each device is closed.  Since
- * the driver is polled, we don't have to do anything. If the driver 
- * were interrupt driven, we'd disable interrupts here. 
+ * the driver is polled, we don't have to do anything. If the driver
+ * were interrupt driven, we'd disable interrupts here.
 */
-static int umoncons_last_close(int major, int minor, void *arg) 
+static int umoncons_last_close(int major, int minor, void *arg)
 {
   return 0;
 }
@@ -73,7 +73,7 @@ static int umoncons_last_close(int major, int minor, void *arg)
  * return -1 if there's no data, otherwise return
  * the character in lowest 8 bits of returned int.
 */
-static int umoncons_read(int minor) 
+static int umoncons_read(int minor)
 {
   if ( !mon_gotachar() )
     return -1;
@@ -81,8 +81,8 @@ static int umoncons_read(int minor)
 }
 
 
-/* 
- * Write buffer to LCD 
+/*
+ * Write buffer to LCD
  *
  * return 1 on success, -1 on error
 */
@@ -110,7 +110,7 @@ static void umoncons_write_polled(int minor, char c)
 }
 
 /* This is for setting baud rate, bits, etc. */
-static int umoncons_set_attributes(int minor, const struct termios *t) 
+static int umoncons_set_attributes(int minor, const struct termios *t)
 {
   return 0;
 }
@@ -121,7 +121,7 @@ static int umoncons_set_attributes(int minor, const struct termios *t)
  * functions use them instead.
  */
 /***********************************************************************/
-/* 
+/*
  * Read from UART. This is used in the exit code, and can't
  * rely on interrupts.
 */
diff --git a/c/src/lib/libbsp/shared/vmeUniverse/VME.h b/c/src/lib/libbsp/shared/vmeUniverse/VME.h
index 0d03743f19..886994bad4 100644
--- a/c/src/lib/libbsp/shared/vmeUniverse/VME.h
+++ b/c/src/lib/libbsp/shared/vmeUniverse/VME.h
@@ -4,19 +4,19 @@
 
 /* SVGM et al. BSP's VME support */
 
-/* 
+/*
  * Authorship
  * ----------
  * This software was created by
  *     Till Straumann <strauman@slac.stanford.edu>, 2002,
  * 	   Stanford Linear Accelerator Center, Stanford University.
- * 
+ *
  * Acknowledgement of sponsorship
  * ------------------------------
  * This software was produced by
  *     the Stanford Linear Accelerator Center, Stanford University,
  * 	   under Contract DE-AC03-76SFO0515 with the Department of Energy.
- * 
+ *
  * Government disclaimer of liability
  * ----------------------------------
  * Neither the United States nor the United States Department of Energy,
@@ -25,18 +25,18 @@
  * completeness, or usefulness of any data, apparatus, product, or process
  * disclosed, or represents that its use would not infringe privately owned
  * rights.
- * 
+ *
  * Stanford disclaimer of liability
  * --------------------------------
  * Stanford University makes no representations or warranties, express or
  * implied, nor assumes any liability for the use of this software.
- * 
+ *
  * Stanford disclaimer of copyright
  * --------------------------------
  * Stanford University, owner of the copyright, hereby disclaims its
  * copyright and all other rights in this software.  Hence, anyone may
- * freely use it for any purpose without restriction.  
- * 
+ * freely use it for any purpose without restriction.
+ *
  * Maintenance of notices
  * ----------------------
  * In the interest of clarity regarding the origin and status of this
@@ -45,9 +45,9 @@
  * or distributed by the recipient and are to be affixed to any copy of
  * software made or distributed by the recipient that contains a copy or
  * derivative of this software.
- * 
+ *
  * ------------------ SLAC Software Notices, Set 4 OTT.002a, 2004 FEB 03
- */ 
+ */
 
 #include <stdio.h>
 
diff --git a/c/src/lib/libbsp/shared/vmeUniverse/VMEDMA.h b/c/src/lib/libbsp/shared/vmeUniverse/VMEDMA.h
index 9c56b13ca5..6e2fc94f17 100644
--- a/c/src/lib/libbsp/shared/vmeUniverse/VMEDMA.h
+++ b/c/src/lib/libbsp/shared/vmeUniverse/VMEDMA.h
@@ -5,19 +5,19 @@
 
 /* Public interface of DMA routines */
 
-/* 
+/*
  * Authorship
  * ----------
  * This software was created by
  *     Till Straumann <strauman@slac.stanford.edu>, 2006, 2007
  * 	   Stanford Linear Accelerator Center, Stanford University.
- * 
+ *
  * Acknowledgement of sponsorship
  * ------------------------------
  * This software was produced by
  *     the Stanford Linear Accelerator Center, Stanford University,
  * 	   under Contract DE-AC03-76SFO0515 with the Department of Energy.
- * 
+ *
  * Government disclaimer of liability
  * ----------------------------------
  * Neither the United States nor the United States Department of Energy,
@@ -26,18 +26,18 @@
  * completeness, or usefulness of any data, apparatus, product, or process
  * disclosed, or represents that its use would not infringe privately owned
  * rights.
- * 
+ *
  * Stanford disclaimer of liability
  * --------------------------------
  * Stanford University makes no representations or warranties, express or
  * implied, nor assumes any liability for the use of this software.
- * 
+ *
  * Stanford disclaimer of copyright
  * --------------------------------
  * Stanford University, owner of the copyright, hereby disclaims its
  * copyright and all other rights in this software.  Hence, anyone may
- * freely use it for any purpose without restriction.  
- * 
+ * freely use it for any purpose without restriction.
+ *
  * Maintenance of notices
  * ----------------------
  * In the interest of clarity regarding the origin and status of this
@@ -46,9 +46,9 @@
  * or distributed by the recipient and are to be affixed to any copy of
  * software made or distributed by the recipient that contains a copy or
  * derivative of this software.
- * 
+ *
  * ------------------ SLAC Software Notices, Set 4 OTT.002a, 2004 FEB 03
- */ 
+ */
 
 #include <stdint.h>
 
@@ -120,7 +120,7 @@ typedef void *BSP_VMEDmaListDescriptor;
  *
  *  'bus_mode': one of the ...VMEDMA_OPT... choices
  *              listed above.
- * 'xfer_mode': VME address-modifier optionally ORed with 
+ * 'xfer_mode': VME address-modifier optionally ORed with
  *              ...VMEDMA_MODE... bits listed above.
  *    'custom': (only used if bus_mode is VMEDMA_OPT_CUSTOM)
  *              pointer to a list of setup parameters (chip-driver
@@ -277,7 +277,7 @@ BSP_VMEDmaListDescriptorGetUsr(BSP_VMEDmaListDescriptor d);
 
 int
 BSP_VMEDmaListRefresh(BSP_VMEDmaListDescriptor anchor);
-	
+
 /* Start linked-list operation.
  *
  * RETURNS: 0 on success, nonzero on failure
diff --git a/c/src/lib/libbsp/shared/vmeUniverse/bspVmeDmaList.c b/c/src/lib/libbsp/shared/vmeUniverse/bspVmeDmaList.c
index 80a464b9bd..ad1fc861c4 100644
--- a/c/src/lib/libbsp/shared/vmeUniverse/bspVmeDmaList.c
+++ b/c/src/lib/libbsp/shared/vmeUniverse/bspVmeDmaList.c
@@ -4,19 +4,19 @@
  * implementation of generic parts of the 'linked-list VME DMA' API.
  */
 
-/* 
+/*
  * Authorship
  * ----------
  * This software was created by
  *     Till Straumann <strauman@slac.stanford.edu>, 2006, 2007,
  * 	   Stanford Linear Accelerator Center, Stanford University.
- * 
+ *
  * Acknowledgement of sponsorship
  * ------------------------------
  * This software was produced by
  *     the Stanford Linear Accelerator Center, Stanford University,
  * 	   under Contract DE-AC03-76SFO0515 with the Department of Energy.
- * 
+ *
  * Government disclaimer of liability
  * ----------------------------------
  * Neither the United States nor the United States Department of Energy,
@@ -25,18 +25,18 @@
  * completeness, or usefulness of any data, apparatus, product, or process
  * disclosed, or represents that its use would not infringe privately owned
  * rights.
- * 
+ *
  * Stanford disclaimer of liability
  * --------------------------------
  * Stanford University makes no representations or warranties, express or
  * implied, nor assumes any liability for the use of this software.
- * 
+ *
  * Stanford disclaimer of copyright
  * --------------------------------
  * Stanford University, owner of the copyright, hereby disclaims its
  * copyright and all other rights in this software.  Hence, anyone may
- * freely use it for any purpose without restriction.  
- * 
+ * freely use it for any purpose without restriction.
+ *
  * Maintenance of notices
  * ----------------------
  * In the interest of clarity regarding the origin and status of this
@@ -45,9 +45,9 @@
  * or distributed by the recipient and are to be affixed to any copy of
  * software made or distributed by the recipient that contains a copy or
  * derivative of this software.
- * 
+ *
  * ------------------ SLAC Software Notices, Set 4 OTT.002a, 2004 FEB 03
- */ 
+ */
 
 #include <stdint.h>
 #include <stdlib.h>
@@ -88,9 +88,9 @@ int i;
 		pc->freeList = calloc( (LCHUNK),  sizeof(*pc->freeList));
 
 		if ( ! (pc->freeList) ) {
-			return 0;	
+			return 0;
 		}
-		
+
 		/* link together and set 'class' pointer */
 		for (i=0; i<(LCHUNK)-1; i++) {
 			pc->freeList[i].n     = &pc->freeList[i+1];
@@ -150,7 +150,7 @@ lfree(VMEDmaListNode d)
 	if ( d->p || d->n )
 		return -1;
 	d->n = d->class->freeList;
-	d->class->freeList = d;	
+	d->class->freeList = d;
 	return 0;
 }
 
@@ -269,7 +269,7 @@ DmaDescriptorSetNxt setnxt = d->class->desc_setnxt;
 	}
 	if ( lenq(anchor, d) )
 		return -1;
-	/* update descriptor pointers */ 
+	/* update descriptor pointers */
 	if ( anchor ) {
 		setnxt(d->d,      d->n ? d->n->d : 0);
 		setnxt(anchor->d, d->d);
diff --git a/c/src/lib/libbsp/shared/vmeUniverse/bspVmeDmaList.h b/c/src/lib/libbsp/shared/vmeUniverse/bspVmeDmaList.h
index c95d866f50..25b1e9d16b 100644
--- a/c/src/lib/libbsp/shared/vmeUniverse/bspVmeDmaList.h
+++ b/c/src/lib/libbsp/shared/vmeUniverse/bspVmeDmaList.h
@@ -29,7 +29,7 @@
  * BSP_VMEDmaListDescriptorNewTool(),
  * BSP_VMEDmaListDescriptorSetupTool(),
  *
- * and 
+ * and
  *
  * BSP_VMEDmaListDescriptorStartTool()
  *
@@ -37,19 +37,19 @@
  * chosing to use bspVmeDmaList for implementing VMEDMA.h
  */
 
-/* 
+/*
  * Authorship
  * ----------
  * This software was created by
  *     Till Straumann <strauman@slac.stanford.edu>, 2006, 2007
  * 	   Stanford Linear Accelerator Center, Stanford University.
- * 
+ *
  * Acknowledgement of sponsorship
  * ------------------------------
  * This software was produced by
  *     the Stanford Linear Accelerator Center, Stanford University,
  * 	   under Contract DE-AC03-76SFO0515 with the Department of Energy.
- * 
+ *
  * Government disclaimer of liability
  * ----------------------------------
  * Neither the United States nor the United States Department of Energy,
@@ -58,18 +58,18 @@
  * completeness, or usefulness of any data, apparatus, product, or process
  * disclosed, or represents that its use would not infringe privately owned
  * rights.
- * 
+ *
  * Stanford disclaimer of liability
  * --------------------------------
  * Stanford University makes no representations or warranties, express or
  * implied, nor assumes any liability for the use of this software.
- * 
+ *
  * Stanford disclaimer of copyright
  * --------------------------------
  * Stanford University, owner of the copyright, hereby disclaims its
  * copyright and all other rights in this software.  Hence, anyone may
- * freely use it for any purpose without restriction.  
- * 
+ * freely use it for any purpose without restriction.
+ *
  * Maintenance of notices
  * ----------------------
  * In the interest of clarity regarding the origin and status of this
@@ -78,9 +78,9 @@
  * or distributed by the recipient and are to be affixed to any copy of
  * software made or distributed by the recipient that contains a copy or
  * derivative of this software.
- * 
+ *
  * ------------------ SLAC Software Notices, Set 4 OTT.002a, 2004 FEB 03
- */ 
+ */
 #include <stdint.h>
 
 #include <bsp/VMEDMA.h>
diff --git a/c/src/lib/libbsp/shared/vmeUniverse/bspVmeDmaListP.h b/c/src/lib/libbsp/shared/vmeUniverse/bspVmeDmaListP.h
index e609cf7698..e32d1cd09c 100644
--- a/c/src/lib/libbsp/shared/vmeUniverse/bspVmeDmaListP.h
+++ b/c/src/lib/libbsp/shared/vmeUniverse/bspVmeDmaListP.h
@@ -12,19 +12,19 @@
  * the device in an abstract manner.
  */
 
-/* 
+/*
  * Authorship
  * ----------
  * This software was created by
  *     Till Straumann <strauman@slac.stanford.edu>, 2006, 2007
  * 	   Stanford Linear Accelerator Center, Stanford University.
- * 
+ *
  * Acknowledgement of sponsorship
  * ------------------------------
  * This software was produced by
  *     the Stanford Linear Accelerator Center, Stanford University,
  * 	   under Contract DE-AC03-76SFO0515 with the Department of Energy.
- * 
+ *
  * Government disclaimer of liability
  * ----------------------------------
  * Neither the United States nor the United States Department of Energy,
@@ -33,18 +33,18 @@
  * completeness, or usefulness of any data, apparatus, product, or process
  * disclosed, or represents that its use would not infringe privately owned
  * rights.
- * 
+ *
  * Stanford disclaimer of liability
  * --------------------------------
  * Stanford University makes no representations or warranties, express or
  * implied, nor assumes any liability for the use of this software.
- * 
+ *
  * Stanford disclaimer of copyright
  * --------------------------------
  * Stanford University, owner of the copyright, hereby disclaims its
  * copyright and all other rights in this software.  Hence, anyone may
- * freely use it for any purpose without restriction.  
- * 
+ * freely use it for any purpose without restriction.
+ *
  * Maintenance of notices
  * ----------------------
  * In the interest of clarity regarding the origin and status of this
@@ -53,9 +53,9 @@
  * or distributed by the recipient and are to be affixed to any copy of
  * software made or distributed by the recipient that contains a copy or
  * derivative of this software.
- * 
+ *
  * ------------------ SLAC Software Notices, Set 4 OTT.002a, 2004 FEB 03
- */ 
+ */
 #ifdef __cplusplus
 extern "C" {
 #endif
diff --git a/c/src/lib/libbsp/shared/vmeUniverse/vmeTsi148.c b/c/src/lib/libbsp/shared/vmeUniverse/vmeTsi148.c
index 306feb3847..f3930b051b 100644
--- a/c/src/lib/libbsp/shared/vmeUniverse/vmeTsi148.c
+++ b/c/src/lib/libbsp/shared/vmeUniverse/vmeTsi148.c
@@ -2,19 +2,19 @@
 
 /* Driver for the Tundra Tsi148 pci-vme bridge */
 
-/* 
+/*
  * Authorship
  * ----------
  * This software was created by
  *     Till Straumann <strauman@slac.stanford.edu>, 2005-2007,
  * 	   Stanford Linear Accelerator Center, Stanford University.
- * 
+ *
  * Acknowledgement of sponsorship
  * ------------------------------
  * This software was produced by
  *     the Stanford Linear Accelerator Center, Stanford University,
  * 	   under Contract DE-AC03-76SFO0515 with the Department of Energy.
- * 
+ *
  * Government disclaimer of liability
  * ----------------------------------
  * Neither the United States nor the United States Department of Energy,
@@ -23,18 +23,18 @@
  * completeness, or usefulness of any data, apparatus, product, or process
  * disclosed, or represents that its use would not infringe privately owned
  * rights.
- * 
+ *
  * Stanford disclaimer of liability
  * --------------------------------
  * Stanford University makes no representations or warranties, express or
  * implied, nor assumes any liability for the use of this software.
- * 
+ *
  * Stanford disclaimer of copyright
  * --------------------------------
  * Stanford University, owner of the copyright, hereby disclaims its
  * copyright and all other rights in this software.  Hence, anyone may
- * freely use it for any purpose without restriction.  
- * 
+ * freely use it for any purpose without restriction.
+ *
  * Maintenance of notices
  * ----------------------
  * In the interest of clarity regarding the origin and status of this
@@ -43,9 +43,9 @@
  * or distributed by the recipient and are to be affixed to any copy of
  * software made or distributed by the recipient that contains a copy or
  * derivative of this software.
- * 
+ *
  * ------------------ SLAC Software Notices, Set 4 OTT.002a, 2004 FEB 03
- */ 
+ */
 
 #include <rtems.h>
 #include <stdio.h>
@@ -405,7 +405,7 @@ static Tsi148Dev devs[NUM_TSI_DEVS] = {{0}};
 extern int vmeTsi148RegPort;
 extern int vmeTsi148RegCSR;
 
-/* registers should be mapped to guarded, non-cached memory; hence 
+/* registers should be mapped to guarded, non-cached memory; hence
  * subsequent stores are ordered. eieio is only needed to enforce
  * ordering of loads with respect to stores.
  */
@@ -421,7 +421,7 @@ va_list	ap;
 		 * to a buffer.
 		 */
 		vprintk(fmt,ap);
-	} else 
+	} else
 	{
 		vfprintf(f,fmt,ap);
 	}
@@ -524,7 +524,7 @@ uint32_t v;
 	/* Clear BDFAIL / (--> SYSFAIL) */
 #	define TSI_VSTAT_BDFAIL		(1<<14)
 	TSI_WR(base, TSI_VSTAT_REG, TSI_RD(base, TSI_VSTAT_REG) & ~TSI_VSTAT_BDFAIL);
-	/* Set (long) bus master timeout; the timeout actually overrides 
+	/* Set (long) bus master timeout; the timeout actually overrides
 	 * the DMA block size so that the DMA settings would effectively
 	 * not be used.
 	 * Also, we enable 'release on request' mode so that we normally
@@ -1015,14 +1015,14 @@ unsigned long		tsau_reg, tat_reg, gran, skip;
 		break;
 
 		case VME_MODE_AS_MATCH:
-			if ( outbound ) 
+			if ( outbound )
 				mode_msk = TSI_OTAT_ADMODE(-1) | TSI_OTAT_EN;
 			else
 				mode_msk = TSI_ITAT_AS(-1) | TSI_ITAT_EN;
 		break;
 
 		default:
-			if ( outbound ) 
+			if ( outbound )
 				mode_msk = TSI_OTAT_PGM | TSI_OTAT_SUP | TSI_OTAT_ADMODE(-1) | TSI_OTAT_EN;
 			else
 				mode_msk = TSI_ITAT_PGM | TSI_ITAT_DATA | TSI_ITAT_SUP | TSI_ITAT_USR | TSI_ITAT_AS(-1) | TSI_ITAT_EN;
@@ -1059,7 +1059,7 @@ unsigned long		tsau_reg, tat_reg, gran, skip;
 			limit += gran;
 
 			if ( !reverse ) {
-				start += offst;	
+				start += offst;
 				limit += offst;
 				offst  = -offst;
 			}
@@ -1295,10 +1295,10 @@ uint32_t mode;
 
 	if ( VME_AM_IS_SHORT(as) ) {
 		mode |= TSI_CRGAT_A16;
-	} else 
+	} else
 	if ( VME_AM_IS_STD(as) ) {
 		mode |= TSI_CRGAT_A24;
-	} else 
+	} else
 	if ( VME_AM_IS_EXT(as) ) {
 		mode |= TSI_CRGAT_A32;
 	} else {
@@ -1597,7 +1597,7 @@ rtems_irq_connect_data	xx;
 	xx.off    = my_no_op;
 	xx.isOn   = my_isOn;
 	xx.hdl    = isr;
-	xx.handle = (rtems_irq_hdl_param)slot; 
+	xx.handle = (rtems_irq_hdl_param)slot;
 	xx.name   = pic_line;
 
 	if ( shared ) {
@@ -1685,7 +1685,7 @@ unsigned long cpu_base, vme_reg_base;
 	pic_pin[0] = pic_pin0 < 0 ? devs[0].irqLine : pic_pin0;
 	i = 1;
 	while ( (tsi_pin[i] = va_arg(ap, int)) >= 0 ) {
-		
+
 		if ( i >= TSI_NUM_WIRES ) {
 			                                       return -5;
 		}
@@ -1772,7 +1772,7 @@ unsigned long cpu_base, vme_reg_base;
 	specialPin = tsi_pin[1] >= 0 ? 1 : 0;
 
 	/* setup routing */
-	
+
 	/* IntRoute checks for mgr being installed */
 	vmeTsi148IrqMgrInstalled=1;
 
@@ -1944,7 +1944,7 @@ unsigned long v;
 	TSI_WR(base, TSI_VICR_REG, v);
 
 	return 0;
-	
+
 }
 
 int
@@ -2020,7 +2020,7 @@ LoopbackTstArgs		a;
 
 	if ( !vmeTsi148IntIsEnabled(level) && 0==vmeTsi148IntEnable(level) )
 		doDisable = 1;
-	
+
 	/* make sure there are no pending interrupts */
 	TSI_WR(b, TSI_INTC_REG, TSI_INTC_IACKC);
 
@@ -2133,9 +2133,9 @@ vmeTsi148ClearVMEBusErrors(uint32_t *paddr)
 
 /* descriptor must be 8-byte aligned */
 typedef struct VmeTsi148DmaListDescriptorRec_ {
-	BEValue						dsau,  dsal;	
-	BEValue						ddau,  ddal;	
-	BEValue						dsat,  ddat;	
+	BEValue						dsau,  dsal;
+	BEValue						ddau,  ddal;
+	BEValue						dsat,  ddat;
 	BEValue						dnlau, dnlal;
 	BEValue						dcnt,  ddbs;
 } VmeTsi148DmaListDescriptorRec;
@@ -2161,7 +2161,7 @@ VMEDmaListClassRec	vmeTsi148DmaListClass = {
 };
 
 /* DMA Control */
-#define TSI_DMA_REG(off,i)	((off)+(((i)&1)<<7))	
+#define TSI_DMA_REG(off,i)	((off)+(((i)&1)<<7))
 
 #define TSI_DCTL_REG(i)		TSI_DMA_REG(0x500,i)
 #define TSI_DCTL0_REG		0x500
@@ -2437,10 +2437,10 @@ uint32_t vmeatt, pciatt, sat, dat;
 
 	switch ( mode ) {
 		case BSP_VMEDMA_OPT_THROUGHPUT:
-			ctl |= TSI_DCTL_VBKS_1024;		
+			ctl |= TSI_DCTL_VBKS_1024;
 			ctl |= TSI_DCTL_VBOT_0us;
 		break;
-		
+
 		case BSP_VMEDMA_OPT_LOWLATENCY:
 			ctl |= TSI_DCTL_VBKS_32;
 			ctl |= TSI_DCTL_VBOT_0us;
@@ -2541,7 +2541,7 @@ uint32_t src, dst, ctl;
 	asm volatile("":::"memory");
 
 	/* Start transfer */
-	ctl  = TSI_RD(base, TSI_DCTL_REG(channel)) | TSI_DCTL_DGO | TSI_DCTL_MOD;		
+	ctl  = TSI_RD(base, TSI_DCTL_REG(channel)) | TSI_DCTL_DGO | TSI_DCTL_MOD;
 	TSI_WR(base, TSI_DCTL_REG(channel), ctl);
 
 	return 0;
diff --git a/c/src/lib/libbsp/shared/vmeUniverse/vmeTsi148.h b/c/src/lib/libbsp/shared/vmeUniverse/vmeTsi148.h
index b0d122429c..0eb703b60b 100644
--- a/c/src/lib/libbsp/shared/vmeUniverse/vmeTsi148.h
+++ b/c/src/lib/libbsp/shared/vmeUniverse/vmeTsi148.h
@@ -4,19 +4,19 @@
 
 /* Driver for the Tundra Tsi148 pci-vme bridge */
 
-/* 
+/*
  * Authorship
  * ----------
  * This software was created by
  *     Till Straumann <strauman@slac.stanford.edu>, 2005-2007,
  * 	   Stanford Linear Accelerator Center, Stanford University.
- * 
+ *
  * Acknowledgement of sponsorship
  * ------------------------------
  * This software was produced by
  *     the Stanford Linear Accelerator Center, Stanford University,
  * 	   under Contract DE-AC03-76SFO0515 with the Department of Energy.
- * 
+ *
  * Government disclaimer of liability
  * ----------------------------------
  * Neither the United States nor the United States Department of Energy,
@@ -25,18 +25,18 @@
  * completeness, or usefulness of any data, apparatus, product, or process
  * disclosed, or represents that its use would not infringe privately owned
  * rights.
- * 
+ *
  * Stanford disclaimer of liability
  * --------------------------------
  * Stanford University makes no representations or warranties, express or
  * implied, nor assumes any liability for the use of this software.
- * 
+ *
  * Stanford disclaimer of copyright
  * --------------------------------
  * Stanford University, owner of the copyright, hereby disclaims its
  * copyright and all other rights in this software.  Hence, anyone may
- * freely use it for any purpose without restriction.  
- * 
+ * freely use it for any purpose without restriction.
+ *
  * Maintenance of notices
  * ----------------------
  * In the interest of clarity regarding the origin and status of this
@@ -45,9 +45,9 @@
  * or distributed by the recipient and are to be affixed to any copy of
  * software made or distributed by the recipient that contains a copy or
  * derivative of this software.
- * 
+ *
  * ------------------ SLAC Software Notices, Set 4 OTT.002a, 2004 FEB 03
- */ 
+ */
 
 #include <stdint.h>
 #include <bsp/vme_am_defs.h>
@@ -79,7 +79,7 @@ typedef volatile uint32_t BERegister; /* emphasize contents are big endian */
 
 /*
  * Scan the PCI busses for the Nth (N=='instance') Tsi148 VME bridge.
- * 
+ *
  * RETURNS:
  *    contents of the IRQ_LINE PCI config register on Success,
  *    the base address of the Tsi148 register block is stored in
@@ -245,7 +245,7 @@ vmeTsi148XlateAddr(
  */
 #ifdef _VME_TSI148_DECLARE_SHOW_ROUTINES
 
-/* Print the current configuration of all outbound ports to 
+/* Print the current configuration of all outbound ports to
  * f (stdout if NULL)
  */
 
@@ -255,7 +255,7 @@ vmeTsi148OutboundPortsShowXX(BERegister *base, FILE *f);
 void
 vmeTsi148OutboundPortsShow(FILE *f);
 
-/* Print the current configuration of all inbound ports to 
+/* Print the current configuration of all inbound ports to
  * f (stdout if NULL)
  */
 
@@ -295,7 +295,7 @@ vmeTsi148DisableAllOutboundPorts(void);
 #	define TSI_VEAT_AM(v)		(((v)>>8)&63)
 #	define TSI_VEAT_XAM(v)		((v)&255)
 
-/* Check and clear the error (AKA 'exception') register. 
+/* Check and clear the error (AKA 'exception') register.
  * Note that the Tsi148 does *not* propagate VME bus errors of any kind to
  * the PCI status register and hence this routine (or registering an ISR
  * to the TSI_VERR_INT_VEC) is the only means for detecting a bus error.
@@ -320,7 +320,7 @@ vmeTsi148ClearVMEBusErrors(uint32_t *paddr);
 /* Map internal register block to VME.
  *
  * This routine is intended for BSP implementors. The registers must be
- * accessible from VME so that the interrupt handler can flush the 
+ * accessible from VME so that the interrupt handler can flush the
  * bridge FIFO (see below).
  *
  *            vme_base: VME address where the TSI registers (4k) can be mapped.
@@ -399,8 +399,8 @@ vmeTsi148IntDisable(unsigned int level);
 /* Check if an interrupt level or internal source is enabled:
  *
  * 'level': VME level 1..7 or internal special vector > 255
- * 
- * RETURNS: value > 0 if interrupt is currently enabled, 
+ *
+ * RETURNS: value > 0 if interrupt is currently enabled,
  *          zero      if interrupt is currently disabled,
  *          -1        on error (invalid argument).
  */
@@ -432,7 +432,7 @@ vmeTsi148SetIackWidth(int level, int width);
  * different hardware priorities of the PIC. Let's
  * say you want to give IRQ level 7 the highest priority.
  * You could then give 'pin 0' a higher priority (at the
- * PIC) and 'pin 1' a lower priority and issue. 
+ * PIC) and 'pin 1' a lower priority and issue.
  *
  *   for ( i=1; i<7; i++ ) vmeTsi148IntRoute(i, 1);
  *
@@ -446,7 +446,7 @@ vmeTsi148SetIackWidth(int level, int width);
  *              etc.
  *
  * RETURNS: 0 on success, nonzero on error (invalid arguments)
- * 
+ *
  * NOTES:	- DONT change the tsi148 'map' registers
  *            directly. The driver caches routing internally.
  *          - support for the extra wires (beyond wire #0) is
@@ -460,7 +460,7 @@ vmeTsi148IntRoute(unsigned int level, unsigned int pin);
 /* Raise a VME Interrupt at 'level' and respond with 'vector' to a
  * handler on the VME bus. (The handler could be a different board
  * or the tsi148 itself.
- * 
+ *
  * Note that you could install a interrupt handler at TSI_VME_SW_IACK_INT_VEC
  * to be notified of an IACK cycle having completed.
  *
@@ -497,7 +497,7 @@ vmeTsi148IntRaise(int level, unsigned vector);
  *  - waits for both interrupts: 'ordinary' VME interrupt of 'level' and
  *    IACK completion interrupt ('special' vector TSI_VME_SW_IACK_INT_VEC).
  *
- * NOTES: 
+ * NOTES:
  *  - make sure no other handler responds to 'level'.
  *  - make sure no ISR is installed on both vectors yet.
  *  - ISRs installed by this routine are removed after completion.
@@ -529,7 +529,7 @@ vmeTsi148IntLoopbackTst(int level, unsigned vector);
  * DO NOT CHANGE THE ORDER OF THESE VECTORS - THE DRIVER
  * DEPENDS ON IT
  * !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
- * 
+ *
  * Deliberately, these vectors match the universe driver's
  */
 /* 256 no VOWN interrupt */
@@ -584,14 +584,14 @@ vmeTsi148IntLoopbackTst(int level, unsigned vector);
  * are wired.
  * Optionally, the first PIC input line can be read from PCI config space
  * but the second must be passed to this routine. Note that the info read
- * from PCI config space is wrong for some boards! 
+ * from PCI config space is wrong for some boards!
  *
  * PARAMETERS:
- *              flags:  VMETSI148_IRQ_MGR_FLAG_SHARED:  
+ *              flags:  VMETSI148_IRQ_MGR_FLAG_SHARED:
  *                      use the BSP_install_rtems_shared_irq_handler() instead
  *                      of BSP_install_rtems_irq_handler(). Use this if the PIC
  *                      line is used by other devices, too.
- *                      CAVEAT: shared interrupts need RTEMS workspace, i.e., the 
+ *                      CAVEAT: shared interrupts need RTEMS workspace, i.e., the
  *                      VME interrupt manager can only be installed
  *                      *after workspace is initialized* if 'shared' is nonzero
  *                      (i.e., *not* from bspstart()).
diff --git a/c/src/lib/libbsp/shared/vmeUniverse/vmeTsi148DMA.h b/c/src/lib/libbsp/shared/vmeUniverse/vmeTsi148DMA.h
index 11543a96bf..addb315178 100644
--- a/c/src/lib/libbsp/shared/vmeUniverse/vmeTsi148DMA.h
+++ b/c/src/lib/libbsp/shared/vmeUniverse/vmeTsi148DMA.h
@@ -4,19 +4,19 @@
 
 #include <bsp/vmeTsi148.h>
 
-/* 
+/*
  * Authorship
  * ----------
  * This software was created by
  *     Till Straumann <strauman@slac.stanford.edu>, 2006, 2007
  * 	   Stanford Linear Accelerator Center, Stanford University.
- * 
+ *
  * Acknowledgement of sponsorship
  * ------------------------------
  * This software was produced by
  *     the Stanford Linear Accelerator Center, Stanford University,
  * 	   under Contract DE-AC03-76SFO0515 with the Department of Energy.
- * 
+ *
  * Government disclaimer of liability
  * ----------------------------------
  * Neither the United States nor the United States Department of Energy,
@@ -25,18 +25,18 @@
  * completeness, or usefulness of any data, apparatus, product, or process
  * disclosed, or represents that its use would not infringe privately owned
  * rights.
- * 
+ *
  * Stanford disclaimer of liability
  * --------------------------------
  * Stanford University makes no representations or warranties, express or
  * implied, nor assumes any liability for the use of this software.
- * 
+ *
  * Stanford disclaimer of copyright
  * --------------------------------
  * Stanford University, owner of the copyright, hereby disclaims its
  * copyright and all other rights in this software.  Hence, anyone may
- * freely use it for any purpose without restriction.  
- * 
+ * freely use it for any purpose without restriction.
+ *
  * Maintenance of notices
  * ----------------------
  * In the interest of clarity regarding the origin and status of this
@@ -45,9 +45,9 @@
  * or distributed by the recipient and are to be affixed to any copy of
  * software made or distributed by the recipient that contains a copy or
  * derivative of this software.
- * 
+ *
  * ------------------ SLAC Software Notices, Set 4 OTT.002a, 2004 FEB 03
- */ 
+ */
 #ifdef __cplusplus
 extern "C" {
 #endif
diff --git a/c/src/lib/libbsp/shared/vmeUniverse/vmeUniverse.c b/c/src/lib/libbsp/shared/vmeUniverse/vmeUniverse.c
index 3f5683f084..ef2403f4f8 100644
--- a/c/src/lib/libbsp/shared/vmeUniverse/vmeUniverse.c
+++ b/c/src/lib/libbsp/shared/vmeUniverse/vmeUniverse.c
@@ -2,19 +2,19 @@
 
 /* Driver for the Tundra Universe II pci-vme bridge */
 
-/* 
+/*
  * Authorship
  * ----------
  * This software was created by
  *     Till Straumann <strauman@slac.stanford.edu>, 2000-2007,
  * 	   Stanford Linear Accelerator Center, Stanford University.
- * 
+ *
  * Acknowledgement of sponsorship
  * ------------------------------
  * This software was produced by
  *     the Stanford Linear Accelerator Center, Stanford University,
  * 	   under Contract DE-AC03-76SFO0515 with the Department of Energy.
- * 
+ *
  * Government disclaimer of liability
  * ----------------------------------
  * Neither the United States nor the United States Department of Energy,
@@ -23,18 +23,18 @@
  * completeness, or usefulness of any data, apparatus, product, or process
  * disclosed, or represents that its use would not infringe privately owned
  * rights.
- * 
+ *
  * Stanford disclaimer of liability
  * --------------------------------
  * Stanford University makes no representations or warranties, express or
  * implied, nor assumes any liability for the use of this software.
- * 
+ *
  * Stanford disclaimer of copyright
  * --------------------------------
  * Stanford University, owner of the copyright, hereby disclaims its
  * copyright and all other rights in this software.  Hence, anyone may
- * freely use it for any purpose without restriction.  
- * 
+ * freely use it for any purpose without restriction.
+ *
  * Maintenance of notices
  * ----------------------
  * In the interest of clarity regarding the origin and status of this
@@ -43,9 +43,9 @@
  * or distributed by the recipient and are to be affixed to any copy of
  * software made or distributed by the recipient that contains a copy or
  * derivative of this software.
- * 
+ *
  * ------------------ SLAC Software Notices, Set 4 OTT.002a, 2004 FEB 03
- */ 
+ */
 
 #include <stdio.h>
 #include <inttypes.h>
@@ -224,7 +224,7 @@ WRITE_LE(
 #warning "SYNC instruction unknown for this architecture"
 #endif
 
-/* registers should be mapped to guarded, non-cached memory; hence 
+/* registers should be mapped to guarded, non-cached memory; hence
  * subsequent stores are ordered. eieio is only needed to enforce
  * ordering of loads with respect to stores.
  */
@@ -267,11 +267,11 @@ return READ_LE0((volatile LERegister *)(((unsigned long)adrs)+off));
 }
 
 #define PORT_UNALIGNED(addr,port) \
-	( (port)%4 ? ((addr) & 0xffff) : ((addr) & 4095) ) 
+	( (port)%4 ? ((addr) & 0xffff) : ((addr) & 4095) )
 
 
 #define UNIV_REV(base) (READ_LE(base,2*sizeof(LERegister)) & 0xff)
-	
+
 #if defined(__rtems__) && 0
 static int
 uprintk(char *fmt, va_list ap)
@@ -306,7 +306,7 @@ va_list	ap;
 		 * to a buffer.
 		 */
 		vprintk(fmt,ap);
-	} else 
+	} else
 #endif
 	{
 		vfprintf(f,fmt,ap);
@@ -440,7 +440,7 @@ unsigned long vdw =0;
 
 			mode |= UNIV_CTL_VAS24;
 			break;
-	
+
 
 		case VME_AM_EXT_SUP_PGM:
 		case VME_AM_EXT_USR_PGM:
@@ -736,7 +736,7 @@ showUniversePort(
 		if ( cntrl & UNIV_MCTL_PWEN )
 			uprintf(f,", PWEN");
 	} else {
-		uprintf(f,"%s %s %s %s", 
+		uprintf(f,"%s %s %s %s",
 			cntrl&UNIV_SCTL_PGM ?   "Pgm," : "    ",
 			cntrl&UNIV_SCTL_DAT ?   "Dat," : "    ",
 			cntrl&UNIV_SCTL_SUPER ? "Sup," : "    ",
@@ -859,7 +859,7 @@ int	rval;
 
 	CHECK_DFLT_BASE(base);
 
-	rptr = (base + 
+	rptr = (base +
 		(ismaster ? UNIV_REGOFF_PCITGT0_CTRL : UNIV_REGOFF_VMESLV0_CTRL)/sizeof(LERegister));
 #undef TSILL
 #ifdef TSILL
@@ -874,7 +874,7 @@ int	rval;
 	/* only rev. 2 has 8 ports */
 	if (UNIV_REV(base)<2) return -1;
 
-	rptr = (base + 
+	rptr = (base +
 		(ismaster ? UNIV_REGOFF_PCITGT4_CTRL : UNIV_REGOFF_VMESLV4_CTRL)/sizeof(LERegister));
 	for (port=4; port<UNIV_NUM_MPORTS; port++) {
 		if ((rval=func(ismaster,port,rptr,arg))) return rval;
@@ -998,7 +998,7 @@ vmeUniverseReset(void)
 	vmeUniverseDisableAllSlaves();
 
 	vmeUniverseDisableAllMasters();
-	
+
 	vmeUniverseWriteReg(UNIV_VCSR_CLR_SYSFAIL, UNIV_REGOFF_VCSR_CLR);
 
 	/* clear interrupt status bits */
@@ -1235,7 +1235,7 @@ unsigned long b;
 	vmeUniverseWriteRegXX(base, v |  b, UNIV_REGOFF_VINT_EN );
 
 	return 0;
-	
+
 }
 
 int
@@ -1267,10 +1267,10 @@ uint32_t mode;
 
 	if ( VME_AM_IS_SHORT(as) ) {
 		mode |= UNIV_VRAI_CTL_VAS_A16;
-	} else 
+	} else
 	if ( VME_AM_IS_STD(as) ) {
 		mode |= UNIV_VRAI_CTL_VAS_A24;
-	} else 
+	} else
 	if ( VME_AM_IS_EXT(as) ) {
 		mode |= UNIV_VRAI_CTL_VAS_A32;
 	} else {
@@ -1327,7 +1327,7 @@ uint32_t dctl;
 	/* Luckily DCTL bits match MCTL bits so we can use am2mode */
 	if ( am2mode( 1, xfer_mode, &dctl ) )
 		return BSP_VMEDMA_STATUS_UNSUP;
-	
+
 	/* However, the book says that for DMA VAS==5 [which would
 	 * be a CSR access] is reserved. Tests indicate that
 	 * CSR access works on the IIb/d but not really (odd 32-bit
@@ -1371,7 +1371,7 @@ uint32_t dctl;
 			dctl |= UNIV_DCTL_VDW_32;
 		}
 	}
-	
+
 	/* Set direction flag */
 
 	if ( BSP_VMEDMA_MODE_PCI2VME & xfer_mode )
@@ -1406,7 +1406,7 @@ uint32_t dctl, dgcs;
 			dgcs |= ( xfer_mode & BSP_VMEDMA_MODE_NOINC_VME ) ?
 					UNIV_DGCS_VON_2048 : UNIV_DGCS_VON_1024;
 		break;
-		
+
 		case BSP_VMEDMA_OPT_LOWLATENCY:
 			dgcs |= UNIV_DGCS_VOFF_0_US;
 			/* VON counts are different in NO_VINC mode :-( */
@@ -1857,14 +1857,14 @@ register unsigned long		s;
  * like this:
  *
  *
- *   VME IRQ ------ 
- *                  & ----- LINT_STAT ---- 
+ *   VME IRQ ------
+ *                  & ----- LINT_STAT ----
  *                  |                       &  ---------- PCI LINE
  *                  |                       |
- *                  |                       | 
- *       LINT_EN --------------------------- 
+ *                  |                       |
+ *       LINT_EN ---------------------------
  *
- *  I.e. 
+ *  I.e.
  *   - if LINT_EN is disabled, a VME IRQ will not set LINT_STAT.
  *   - while LINT_STAT is set, it will pull the PCI line unless
  *     masked by LINT_EN.
@@ -1926,7 +1926,7 @@ unsigned long 		linten;
 				/* try the special handler */
 				universeSpecialISR( lintstat & SPECIAL_IRQ_MSK );
 
-				/* 
+				/*
 				 * let the pic end this cycle
 				 */
 				if ( 0 == pin )
@@ -2114,7 +2114,7 @@ unsigned long cpu_base, vme_reg_base;
 	pic_pin[0] = pic_pin0 < 0 ? vmeUniverse0PciIrqLine : pic_pin0;
 	i = 1;
 	while ( (uni_pin[i] = va_arg(ap, int)) >= 0 ) {
-		
+
 		if ( i >= UNIV_NUM_WIRES ) {
 			                                       return -5;
 		}
@@ -2315,9 +2315,9 @@ int				shift;
 
 	rtems_interrupt_disable(flags);
 	if ( dis<0 )
-		vmeUniverseWriteReg( vmeUniverseReadReg(UNIV_REGOFF_LINT_EN) & ~v, UNIV_REGOFF_LINT_EN ); 
+		vmeUniverseWriteReg( vmeUniverseReadReg(UNIV_REGOFF_LINT_EN) & ~v, UNIV_REGOFF_LINT_EN );
 	else {
-		vmeUniverseWriteReg( vmeUniverseReadReg(UNIV_REGOFF_LINT_EN) |  v, UNIV_REGOFF_LINT_EN  ); 
+		vmeUniverseWriteReg( vmeUniverseReadReg(UNIV_REGOFF_LINT_EN) |  v, UNIV_REGOFF_LINT_EN  );
 	}
 	rtems_interrupt_enable(flags);
 		return 0;
@@ -2425,14 +2425,14 @@ LoopbackTstArgs		a;
 
 	if ( !vmeUniverseIntIsEnabled(level) && 0==vmeUniverseIntEnable(level) )
 		doDisable = 1;
-	
+
 	/* make sure there are no pending interrupts */
 	vmeUniverseWriteReg( UNIV_LINT_STAT_SW_IACK,  UNIV_REGOFF_LINT_STAT );
 
 	if ( vmeUniverseIntEnable( UNIV_VME_SW_IACK_INT_VEC ) ) {
 		fprintf(stderr,"Unable to enable IACK interrupt\n");
 		goto bail;
-	}	
+	}
 
 	printf("vmeUniverse VME interrupt loopback test; STARTING...\n");
 	printf(" --> asserting VME IRQ level %i\n", level);
diff --git a/c/src/lib/libbsp/shared/vmeUniverse/vmeUniverse.h b/c/src/lib/libbsp/shared/vmeUniverse/vmeUniverse.h
index 3d6c5ea941..179f2648d7 100644
--- a/c/src/lib/libbsp/shared/vmeUniverse/vmeUniverse.h
+++ b/c/src/lib/libbsp/shared/vmeUniverse/vmeUniverse.h
@@ -4,19 +4,19 @@
 
 /* Driver for the Tundra Universe II pci-vme bridge */
 
-/* 
+/*
  * Authorship
  * ----------
  * This software was created by
  *     Till Straumann <strauman@slac.stanford.edu>, 2000-2007,
  * 	   Stanford Linear Accelerator Center, Stanford University.
- * 
+ *
  * Acknowledgement of sponsorship
  * ------------------------------
  * This software was produced by
  *     the Stanford Linear Accelerator Center, Stanford University,
  * 	   under Contract DE-AC03-76SFO0515 with the Department of Energy.
- * 
+ *
  * Government disclaimer of liability
  * ----------------------------------
  * Neither the United States nor the United States Department of Energy,
@@ -25,18 +25,18 @@
  * completeness, or usefulness of any data, apparatus, product, or process
  * disclosed, or represents that its use would not infringe privately owned
  * rights.
- * 
+ *
  * Stanford disclaimer of liability
  * --------------------------------
  * Stanford University makes no representations or warranties, express or
  * implied, nor assumes any liability for the use of this software.
- * 
+ *
  * Stanford disclaimer of copyright
  * --------------------------------
  * Stanford University, owner of the copyright, hereby disclaims its
  * copyright and all other rights in this software.  Hence, anyone may
- * freely use it for any purpose without restriction.  
- * 
+ * freely use it for any purpose without restriction.
+ *
  * Maintenance of notices
  * ----------------------
  * In the interest of clarity regarding the origin and status of this
@@ -45,9 +45,9 @@
  * or distributed by the recipient and are to be affixed to any copy of
  * software made or distributed by the recipient that contains a copy or
  * derivative of this software.
- * 
+ *
  * ------------------ SLAC Software Notices, Set 4 OTT.002a, 2004 FEB 03
- */ 
+ */
 
 /* Register definitions */
 /* NOTE: all registers contents in PCI space are LITTLE ENDIAN */
@@ -413,7 +413,7 @@ typedef struct VmeUniverseDMAPacketRec_ {
 
 /* Location Monitor control register */
 #define		UNIV_REGOFF_LM_CTL		0xf64
-# define	UNIV_LM_CTL_EN				(1<<31)	/* image enable */ 
+# define	UNIV_LM_CTL_EN				(1<<31)	/* image enable */
 # define	UNIV_LM_CTL_PGM				(1<<23)	/* program AM */
 # define	UNIV_LM_CTL_DATA			(1<<22)	/* data AM */
 # define	UNIV_LM_CTL_SUPER			(1<<21)	/* supervisor AM */
@@ -427,7 +427,7 @@ typedef struct VmeUniverseDMAPacketRec_ {
 
 /* VMEbus register access image control register */
 #define		UNIV_REGOFF_VRAI_CTL	0xf70
-# define	UNIV_VRAI_CTL_EN			(1<<31)	/* image enable */ 
+# define	UNIV_VRAI_CTL_EN			(1<<31)	/* image enable */
 # define	UNIV_VRAI_CTL_PGM			(1<<23)	/* program AM */
 # define	UNIV_VRAI_CTL_DATA			(1<<22)	/* data AM */
 # define	UNIV_VRAI_CTL_SUPER			(1<<21)	/* supervisor AM */
@@ -508,7 +508,7 @@ vmeUniverseReset(void);
  *  #define _VME_UNIVERSE_DECLARE_SHOW_ROUTINES
  *  #include <vmeUniverse.h>
  */
-/* print the current configuration of all master ports to 
+/* print the current configuration of all master ports to
  * f (stderr if NULL)
  */
 void
@@ -684,7 +684,7 @@ vmeUniverseDisableAllMastersXX(volatile LERegister *ubase);
 void
 vmeUniverseDisableAllSlavesXX(volatile LERegister *ubase);
 
-/* print the current configuration of all master ports to 
+/* print the current configuration of all master ports to
  * f (stderr if NULL)
  */
 void
@@ -701,7 +701,7 @@ vmeUniverseSlavePortsShowXX(
 /* Raise a VME Interrupt at 'level' and respond with 'vector' to a
  * handler on the VME bus. (The handler could be a different board
  * or the universe itself - [only works with universe II]).
- * 
+ *
  * Note that you could install a interrupt handler at UNIV_VME_SW_IACK_INT_VEC
  * to be notified of an IACK cycle having completed.
  *
@@ -740,7 +740,7 @@ vmeUniverseIntRaise(int level, unsigned vector);
 /* Map internal register block to VME.
  *
  * This routine is intended for BSP implementors. The registers can be
- * made accessible from VME so that the interrupt handler can flush the 
+ * made accessible from VME so that the interrupt handler can flush the
  * bridge FIFO (see below). The preferred method is by accessing VME CSR,
  * though, if these are mapped [and the BSP provides an outbound window].
  * On the universe we can also disable posted writes in the 'ordinary'
@@ -790,7 +790,7 @@ vmeUniverseMapCRG(unsigned long vme_base, unsigned long address_space);
 typedef void (*VmeUniverseISR) (void *usrArg, unsigned long vector);
 
 /* use these special vectors to connect a handler to the
- * universe specific interrupts (such as "DMA done", 
+ * universe specific interrupts (such as "DMA done",
  * VOWN, error irqs etc.)
  * NOTE: The wrapper clears all status LINT bits (except
  * for regular VME irqs). Also note that it is the user's
@@ -801,7 +801,7 @@ typedef void (*VmeUniverseISR) (void *usrArg, unsigned long vector);
  * DO NOT CHANGE THE ORDER OF THESE VECTORS - THE DRIVER
  * DEPENDS ON IT
  * !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
- * 
+ *
  */
 #define UNIV_VOWN_INT_VEC			256
 #define UNIV_DMA_INT_VEC			257
@@ -844,7 +844,7 @@ VmeUniverseISR
 vmeUniverseISRGet(unsigned long vector, void **parg);
 
 /* utility routines to enable/disable a VME IRQ level.
- * 
+ *
  * To enable/disable the internal interrupt sources (special vectors above)
  * pass a vector argument > 255.
  *
@@ -858,8 +858,8 @@ vmeUniverseIntDisable(unsigned int level);
 /* Check if an interrupt level or internal source is enabled:
  *
  * 'level': VME level 1..7 or internal special vector > 255
- * 
- * RETURNS: value > 0 if interrupt is currently enabled, 
+ *
+ * RETURNS: value > 0 if interrupt is currently enabled,
  *          zero      if interrupt is currently disabled,
  *          -1        on error (invalid argument).
  */
@@ -879,7 +879,7 @@ vmeUniverseIntIsEnabled(unsigned int level);
  * different hardware priorities of the PIC. Let's
  * say you want to give IRQ level 7 the highest priority.
  * You could then give 'pin 0' a higher priority (at the
- * PIC) and 'pin 1' a lower priority and issue. 
+ * PIC) and 'pin 1' a lower priority and issue.
  *
  *   for ( i=1; i<7; i++ ) vmeUniverseIntRoute(i, 1);
  *
@@ -893,7 +893,7 @@ vmeUniverseIntIsEnabled(unsigned int level);
  *              routes it to the alternate wire
  *              (specialIrqUnivOut)
  * RETURNS: 0 on success, nonzero on error (invalid arguments)
- * 
+ *
  * NOTES:	- DONT change the universe 'map' registers
  *            directly. The driver caches routing internally.
  *          - support for the 'specialIrqUnivOut' wire is
@@ -910,7 +910,7 @@ vmeUniverseIntRoute(unsigned int level, unsigned int pin);
  *  - waits for both interrupts: 'ordinary' VME interrupt of 'level' and
  *    IACK completion interrupt ('special' vector UNIV_VME_SW_IACK_INT_VEC).
  *
- * NOTES: 
+ * NOTES:
  *  - make sure no other handler responds to 'level'.
  *  - make sure no ISR is installed on both vectors yet.
  *  - ISRs installed by this routine are removed after completion.
@@ -956,7 +956,7 @@ vmeUniverseIntLoopbackTst(int level, unsigned vector);
  * are wired.
  * Optionally, the first PIC input line can be read from PCI config space
  * but the second must be passed to this routine. Note that the info read
- * from PCI config space is wrong for many boards! 
+ * from PCI config space is wrong for many boards!
  *
  * PARAMETERS:
  *       vmeIrqUnivOut: to which output pin (of the universe) should the 7
@@ -972,7 +972,7 @@ vmeUniverseIntLoopbackTst(int level, unsigned vector);
  *                      the PIC is determined by reading PCI config space.
  *
  * RETURNS: 0 on success, -1 on failure.
- *						
+ *
  */
 
 /* This routine is outside of the __INSIDE_RTEMS_BSP__ test for bwrds compatibility ONLY */
@@ -988,13 +988,13 @@ vmeUniverseInstallIrqMgr(int vmeIrqUnivOut,
 
 /* up to 4 universe outputs are now supported by this alternate
  * entry point.
- * Terminate the vararg list (uni_pin/pic_pin pairs) with a 
+ * Terminate the vararg list (uni_pin/pic_pin pairs) with a
  * '-1' uni_pin.
- * E.g., the old interface is now just a wrapper to 
+ * E.g., the old interface is now just a wrapper to
  *   vmeUniverseInstallIrqMgrAlt(0, vmeUnivOut, vmePicLint, specUnivOut, specPicLine, -1);
  *
  * The 'IRQ_MGR_SHARED' flag uses the BSP_install_rtems_shared_irq_handler()
- * API. CAVEAT: shared interrupts need RTEMS workspace, i.e., the 
+ * API. CAVEAT: shared interrupts need RTEMS workspace, i.e., the
  * VME interrupt manager can only be installed *after workspace is initialized*
  * if 'shared' is nonzero (i.e., *not* from bspstart()).
  *
diff --git a/c/src/lib/libbsp/shared/vmeUniverse/vmeUniverseDMA.h b/c/src/lib/libbsp/shared/vmeUniverse/vmeUniverseDMA.h
index 0b1f93b7b3..03ff3d147f 100644
--- a/c/src/lib/libbsp/shared/vmeUniverse/vmeUniverseDMA.h
+++ b/c/src/lib/libbsp/shared/vmeUniverse/vmeUniverseDMA.h
@@ -2,19 +2,19 @@
 #ifndef VME_UNIVERSE_DMA_H
 #define VME_UNIVERSE_DMA_H
 
-/* 
+/*
  * Authorship
  * ----------
  * This software was created by
  *     Till Straumann <strauman@slac.stanford.edu>, 2006, 2007
  * 	   Stanford Linear Accelerator Center, Stanford University.
- * 
+ *
  * Acknowledgement of sponsorship
  * ------------------------------
  * This software was produced by
  *     the Stanford Linear Accelerator Center, Stanford University,
  * 	   under Contract DE-AC03-76SFO0515 with the Department of Energy.
- * 
+ *
  * Government disclaimer of liability
  * ----------------------------------
  * Neither the United States nor the United States Department of Energy,
@@ -23,18 +23,18 @@
  * completeness, or usefulness of any data, apparatus, product, or process
  * disclosed, or represents that its use would not infringe privately owned
  * rights.
- * 
+ *
  * Stanford disclaimer of liability
  * --------------------------------
  * Stanford University makes no representations or warranties, express or
  * implied, nor assumes any liability for the use of this software.
- * 
+ *
  * Stanford disclaimer of copyright
  * --------------------------------
  * Stanford University, owner of the copyright, hereby disclaims its
  * copyright and all other rights in this software.  Hence, anyone may
- * freely use it for any purpose without restriction.  
- * 
+ * freely use it for any purpose without restriction.
+ *
  * Maintenance of notices
  * ----------------------
  * In the interest of clarity regarding the origin and status of this
@@ -43,9 +43,9 @@
  * or distributed by the recipient and are to be affixed to any copy of
  * software made or distributed by the recipient that contains a copy or
  * derivative of this software.
- * 
+ *
  * ------------------ SLAC Software Notices, Set 4 OTT.002a, 2004 FEB 03
- */ 
+ */
 #include <bsp/vmeUniverse.h>
 #include <stdint.h>
 
diff --git a/c/src/lib/libbsp/shared/vmeUniverse/vme_am_defs.h b/c/src/lib/libbsp/shared/vmeUniverse/vme_am_defs.h
index ed42e37a38..fb6b72bc8b 100644
--- a/c/src/lib/libbsp/shared/vmeUniverse/vme_am_defs.h
+++ b/c/src/lib/libbsp/shared/vmeUniverse/vme_am_defs.h
@@ -3,19 +3,19 @@
 
 /* vxworks compatible addressing modes */
 
-/* 
+/*
  * Authorship
  * ----------
  * This software was created by
  *     Till Straumann <strauman@slac.stanford.edu>, 2002-2007,
  * 	   Stanford Linear Accelerator Center, Stanford University.
- * 
+ *
  * Acknowledgement of sponsorship
  * ------------------------------
  * This software was produced by
  *     the Stanford Linear Accelerator Center, Stanford University,
  * 	   under Contract DE-AC03-76SFO0515 with the Department of Energy.
- * 
+ *
  * Government disclaimer of liability
  * ----------------------------------
  * Neither the United States nor the United States Department of Energy,
@@ -24,18 +24,18 @@
  * completeness, or usefulness of any data, apparatus, product, or process
  * disclosed, or represents that its use would not infringe privately owned
  * rights.
- * 
+ *
  * Stanford disclaimer of liability
  * --------------------------------
  * Stanford University makes no representations or warranties, express or
  * implied, nor assumes any liability for the use of this software.
- * 
+ *
  * Stanford disclaimer of copyright
  * --------------------------------
  * Stanford University, owner of the copyright, hereby disclaims its
  * copyright and all other rights in this software.  Hence, anyone may
- * freely use it for any purpose without restriction.  
- * 
+ * freely use it for any purpose without restriction.
+ *
  * Maintenance of notices
  * ----------------------
  * In the interest of clarity regarding the origin and status of this
@@ -44,9 +44,9 @@
  * or distributed by the recipient and are to be affixed to any copy of
  * software made or distributed by the recipient that contains a copy or
  * derivative of this software.
- * 
+ *
  * ------------------ SLAC Software Notices, Set 4 OTT.002a, 2004 FEB 03
- */ 
+ */
 /* NOTE: 64-bit *addresses* are not supported [data are]. */
 
 #ifndef VME_AM_STD_SUP_BLT
@@ -143,7 +143,7 @@
 #define VME_AM_MASK					0x3f
 #endif
 
-/* Hint that a window is mapping memory; the 
+/* Hint that a window is mapping memory; the
  * driver may assume it to be safe to enable decoupled
  * cycles, caching and the like...
  */
@@ -154,7 +154,7 @@
 /* I don't know AMs for 2eSST so we use some extra bits;
  * HOWEVER: these are just qualifiers to the VME_AM_2eVME_xx modes
  *          i.e., if you want 2eSST you must also select 2eVME...
- */ 
+ */
 
 /* 2eSST broadcast; you still need to set one of the speed bits */
 #define VME_AM_2eSST_BCST			(1<<9)