* Code cleanup: - remove trailing white space, trailing empty lines, C++ comments, etc. - split cmd_boot.c (separate cmd_bdinfo.c and cmd_load.c) * Patches by Kenneth Johansson, 25 Jun 2003: - major rework of command structure (work done mostly by Michal Cendrowski and Joakim Kristiansen)

commit: 8bde7f776c77b343aca29b8c7b58464d915ac245 [log] [tgz]
author: wdenk <wdenk> Fri Jun 27 21:31:46 2003 +0000
committer: wdenk <wdenk> Fri Jun 27 21:31:46 2003 +0000
tree: 20f1fd99975215e7c658454a15cdb4ed4694e2d4
parent: 993cad9364c6b87ae429d1ed1130d8153f6f027e [diff]
diff --git a/board/LEOX/elpt860/Makefile b/board/LEOX/elpt860/Makefile
index abca765..3e73163 100644
--- a/board/LEOX/elpt860/Makefile
+++ b/board/LEOX/elpt860/Makefile

@@ -1,3 +1,4 @@
+
 #######################################################################
 #
 # Copyright (C) 2000, 2001, 2002, 2003
@@ -35,7 +36,7 @@
 OBJS	= $(BOARD).o flash.o
 
 $(LIB):	.depend $(OBJS)
-	$(AR) crv $@ $^
+	$(AR) crv $@ $(OBJS)
 
 #########################################################################
 

diff --git a/board/LEOX/elpt860/README.LEOX b/board/LEOX/elpt860/README.LEOX
index 9ace97b..23bc302 100644
--- a/board/LEOX/elpt860/README.LEOX
+++ b/board/LEOX/elpt860/README.LEOX

@@ -1,20 +1,20 @@
 =============================================================================
 
-             U-Boot port on the LEOX's ELPT860 CPU board
-             -------------------------------------------
+	     U-Boot port on the LEOX's ELPT860 CPU board
+	     -------------------------------------------
 
 LEOX.org is about the development of free hardware and software resources
-         for system on chip.
+	 for system on chip.
 
 For more information, contact The LEOX team <team@leox.org>
 
 References:
 ~~~~~~~~~~
     1) Get the last stable release from denx.de:
-           o ftp://ftp.denx.de/pub/u-boot/u-boot-0.2.0.tar.bz2
+	   o ftp://ftp.denx.de/pub/u-boot/u-boot-0.2.0.tar.bz2
     2) Get the current CVS snapshot:
-           o cvs -d:pserver:anonymous@cvs.u-boot.sourceforge.net:/cvsroot/u-boot login
-           o cvs -z6 -d:pserver:anonymous@cvs.u-boot.sourceforge.net:/cvsroot/u-boot co -P u-boot
+	   o cvs -d:pserver:anonymous@cvs.u-boot.sourceforge.net:/cvsroot/u-boot login
+	   o cvs -z6 -d:pserver:anonymous@cvs.u-boot.sourceforge.net:/cvsroot/u-boot co -P u-boot
 
 =============================================================================
 
@@ -42,7 +42,7 @@
 
 =============================================================================
 
-                        U-Boot test results
+			U-Boot test results
 
 =============================================================================
 
@@ -54,7 +54,7 @@
 U-Boot 0.2.2 (Jan 19 2003 - 11:08:39)
 
 CPU:   XPC860xxZPnnB at 50 MHz: 4 kB I-Cache 4 kB D-Cache FEC present
-         *** Warning: CPU Core has Silicon Bugs -- Check the Errata ***
+	 *** Warning: CPU Core has Silicon Bugs -- Check the Errata ***
 Board: ### No HW ID - assuming ELPT860
 DRAM:  16 MB
 FLASH: 512 kB
@@ -101,7 +101,7 @@
 setenv  - set environment variables
 sleep   - delay execution for some time
 tftpboot- boot image via network using TFTP protocol
-               and env variables ipaddr and serverip
+	       and env variables ipaddr and serverip
 version - print monitor version
 ?       - alias for 'help'
 
@@ -143,8 +143,8 @@
 Bank # 1: AMD AM29F040   (4 Mbits)
   Size: 512 KB in 8 Sectors
   Sector Start Addresses:
-    02000000 (RO) 02010000 (RO) 02020000 (RO) 02030000 (RO) 02040000     
-    02050000      02060000      02070000     
+    02000000 (RO) 02010000 (RO) 02020000 (RO) 02030000 (RO) 02040000
+    02050000      02060000      02070000
 
 ##################################################
 # Board Information Structure
@@ -177,7 +177,7 @@
 U-Boot 0.2.2 (Jan 19 2003 - 11:08:39)
 
 CPU:   XPC860xxZPnnB at 50 MHz: 4 kB I-Cache 4 kB D-Cache FEC present
-         *** Warning: CPU Core has Silicon Bugs -- Check the Errata ***
+	 *** Warning: CPU Core has Silicon Bugs -- Check the Errata ***
 Board: ### No HW ID - assuming ELPT860
 DRAM:  16 MB
 FLASH: 512 kB
@@ -219,7 +219,7 @@
 U-Boot 0.2.2 (Jan 19 2003 - 11:08:39)
 
 CPU:   XPC860xxZPnnB at 50 MHz: 4 kB I-Cache 4 kB D-Cache FEC present
-         *** Warning: CPU Core has Silicon Bugs -- Check the Errata ***
+	 *** Warning: CPU Core has Silicon Bugs -- Check the Errata ***
 Board: ### No HW ID - assuming ELPT860
 DRAM:  16 MB
 FLASH: 512 kB
@@ -237,7 +237,7 @@
 Filename '/home/leox/uImage'.
 Load address: 0x400000
 Loading: #################################################################
-         #############################
+	 #############################
 done
 Bytes transferred = 477294 (7486e hex)
 ## Booting image at 00400000 ...
@@ -282,8 +282,8 @@
 VFS: Mounted root (nfs filesystem).
 Freeing unused kernel memory: 44k init
 INIT: version 2.78 booting
-                Welcome to DENX Embedded Linux Environment
-                Press 'I' to enter interactive startup.
+		Welcome to DENX Embedded Linux Environment
+		Press 'I' to enter interactive startup.
 Mounting proc filesystem:  [  OK  ]
 Configuring kernel parameters:  [  OK  ]
 Cannot access the Hardware Clock via any known method.
@@ -316,7 +316,7 @@
 U-Boot 0.2.2 (Jan 19 2003 - 11:08:39)
 
 CPU:   XPC860xxZPnnB at 50 MHz: 4 kB I-Cache 4 kB D-Cache FEC present
-         *** Warning: CPU Core has Silicon Bugs -- Check the Errata ***
+	 *** Warning: CPU Core has Silicon Bugs -- Check the Errata ***
 Board: ### No HW ID - assuming ELPT860
 DRAM:  16 MB
 FLASH: 512 kB
@@ -334,11 +334,11 @@
 Filename '/home/leox/pMulti'.
 Load address: 0x400000
 Loading: #################################################################
-         #################################################################
-         #################################################################
-         #################################################################
-         #################################################################
-         ########################################################
+	 #################################################################
+	 #################################################################
+	 #################################################################
+	 #################################################################
+	 ########################################################
 done
 Bytes transferred = 1947816 (1db8a8 hex)
 ## Booting image at 00400000 ...
@@ -398,22 +398,22 @@
 Password:
 Welcome to Linux-2.4.4 for ELPT CPU board (MPC860T @ 50MHz)
 
-                                              a8888b.
-                                             d888888b.
-                                             8P"YP"Y88
+					      a8888b.
+					     d888888b.
+					     8P"YP"Y88
      _      _                                8|o||o|88
     | |    |_|                               8'    .88
     | |     _ ____  _   _  _  _              8`._.' Y8.
     | |    | |  _ \| | | |\ \/ /            d/      `8b.
     | |___ | | | | | |_| |/    \          .dP   .     Y8b.
     |_____||_|_| |_|\____|\_/\_/         d8:'   "   `::88b.
-                                        d8"           `Y88b
-                                       :8P     '       :888
-                                        8a.    :      _a88P
-                                      ._/"Yaa_ :    .| 88P|
-                                      \    YP"      `| 8P  `.
-                                      /     \._____.d|    .'
-                                      `--..__)888888P`._.'
+					d8"           `Y88b
+				       :8P     '       :888
+					8a.    :      _a88P
+				      ._/"Yaa_ :    .| 88P|
+				      \    YP"      `| 8P  `.
+				      /     \._____.d|    .'
+				      `--..__)888888P`._.'
 login[21]: root login  on `ttyS0'
 
 

diff --git a/board/LEOX/elpt860/elpt860.c b/board/LEOX/elpt860/elpt860.c
index 2564546..254497f 100644
--- a/board/LEOX/elpt860/elpt860.c
+++ b/board/LEOX/elpt860/elpt860.c

@@ -95,7 +95,7 @@
   /*
    * Single Read. (Offset 0 in UPMA RAM)
    */
-  0x0F0FFC24, 0x0F0CFC04, 0xFF0FFC04, 0x00AF3C04, 
+  0x0F0FFC24, 0x0F0CFC04, 0xFF0FFC04, 0x00AF3C04,
   0xFF0FFC00, /* last */
   /*
    * SDRAM Initialization (offset 5 in UPMA RAM)
@@ -109,28 +109,28 @@
   /*
    * Burst Read. (Offset 8 in UPMA RAM)
    */
-  0x0F0FFC24, 0x0F0CFC04, 0xFF0FFC04, 0x00AF3C04, 
+  0x0F0FFC24, 0x0F0CFC04, 0xFF0FFC04, 0x00AF3C04,
   0xF00FFC00, 0xF00FFC00, 0xF00FFC00, 0xFF0FFC00,
-  0x0FFCCC04, 0xFFAFFC05, 0xFFAFFC04, 0xFFAFFC04, 
+  0x0FFCCC04, 0xFFAFFC05, 0xFFAFFC04, 0xFFAFFC04,
   0xFFAFFC04, 0xFFAFFC04, 0xFFAFFC04, 0xFFAFFC04, /* last */
   /*
    * Single Write. (Offset 18 in UPMA RAM)
    */
-  0x0F0FFC24, 0x0F0CFC04, 0xFF0FFC04, 0x00AF0C00, 
+  0x0F0FFC24, 0x0F0CFC04, 0xFF0FFC04, 0x00AF0C00,
   0xFF0FFC04, 0x0FFCCC04, 0xFFAFFC05, /* last */
-  _NOT_USED_, 
+  _NOT_USED_,
   /*
    * Burst Write. (Offset 20 in UPMA RAM)
    */
-  0x0F0FFC24, 0x0F0CFC04, 0xFF0FFC00, 0x00AF0C00, 
-  0xF00FFC00, 0xF00FFC00, 0xF00FFC04, 0x0FFCCC04, 
-  0xFFAFFC04, 0xFFAFFC05, 0xFFAFFC04, 0xFFAFFC04, 
+  0x0F0FFC24, 0x0F0CFC04, 0xFF0FFC00, 0x00AF0C00,
+  0xF00FFC00, 0xF00FFC00, 0xF00FFC04, 0x0FFCCC04,
+  0xFFAFFC04, 0xFFAFFC05, 0xFFAFFC04, 0xFFAFFC04,
   0xFFAFFC04, 0xFFAFFC04, 0xFFAFFC04, 0xFFAFFC04, /* last */
   /*
    * Refresh  (Offset 30 in UPMA RAM)
    */
-  0x0FFC3C04, 0xFFFFFC04, 0xFFFFFC04, 0xFFFFFC04, 
-  0xFFFFFC05, 0xFFFFFC04, 0xFFFFFC05, _NOT_USED_, 
+  0x0FFC3C04, 0xFFFFFC04, 0xFFFFFC04, 0xFFFFFC04,
+  0xFFFFFC05, 0xFFFFFC04, 0xFFFFFC05, _NOT_USED_,
   0xFFAFFC04, 0xFFAFFC04, 0xFFAFFC04, 0xFFAFFC04, /* last */
   /*
    * Exception. (Offset 3c in UPMA RAM)
@@ -152,8 +152,8 @@
 {
   volatile immap_t *immr = (immap_t *) CFG_IMMR;
 
-  /* 
-   * Light up the red led on ELPT860 pcb (DS1) (PCDAT) 
+  /*
+   * Light up the red led on ELPT860 pcb (DS1) (PCDAT)
    */
   immr->im_ioport.iop_pcdat &= ~CFG_DS1;   /* PCDAT (DS1 = 0)                */
   immr->im_ioport.iop_pcpar &= ~CFG_DS1;   /* PCPAR (0=general purpose I/O)  */
@@ -170,20 +170,20 @@
  * Return 1 if no second DRAM bank, otherwise returns 0
  */
 
-int 
+int
 checkboard (void)
 {
     unsigned char *s = getenv("serial#");
 
     if ( !s || strncmp(s, "ELPT860", 7) )
       printf ("### No HW ID - assuming ELPT860\n");
-    
+
     return ( 0 );    /* success */
 }
 
 /* ------------------------------------------------------------------------- */
 
-long int 
+long int
 initdram (int board_type)
 {
     volatile immap_t     *immap  = (immap_t *)CFG_IMMR;
@@ -194,7 +194,7 @@
     /*
      * This sequence initializes SDRAM chips on ELPT860 board
      */
-    upmconfig(UPMA, (uint *)init_sdram_table, 
+    upmconfig(UPMA, (uint *)init_sdram_table,
 	      sizeof(init_sdram_table)/sizeof(uint));
 
     memctl->memc_mptpr = 0x0200;
@@ -203,7 +203,7 @@
     memctl->memc_mar   = 0x00000088;
     memctl->memc_mcr   = 0x80002000;	/* CS1: SDRAM bank 0 */
 
-    upmconfig(UPMA, (uint *)sdram_table, 
+    upmconfig(UPMA, (uint *)sdram_table,
 	      sizeof(sdram_table)/sizeof(uint));
 
     /*
@@ -257,8 +257,8 @@
      *
      * try 8 column mode
      */
-    size8 = dram_size (CFG_MAMR_8COL, 
-		       (ulong *) SDRAM_BASE1_PRELIM, 
+    size8 = dram_size (CFG_MAMR_8COL,
+		       (ulong *) SDRAM_BASE1_PRELIM,
 		       SDRAM_MAX_SIZE);
 
     udelay (1000);
@@ -266,15 +266,15 @@
     /*
      * try 9 column mode
      */
-    size9 = dram_size (CFG_MAMR_9COL, 
-		       (ulong *) SDRAM_BASE1_PRELIM, 
+    size9 = dram_size (CFG_MAMR_9COL,
+		       (ulong *) SDRAM_BASE1_PRELIM,
 		       SDRAM_MAX_SIZE);
 
     if ( size8 < size9 )    /* leave configuration at 9 columns	*/
       {
 	size_b0 = size9;
 	/* debug ("SDRAM Bank 0 in 9 column mode: %ld MB\n", size >> 20); */
-      } 
+      }
     else                  /* back to 8 columns			*/
       {
 	size_b0 = size8;
@@ -282,14 +282,14 @@
 	udelay (500);
 	/* debug ("SDRAM Bank 0 in 8 column mode: %ld MB\n", size >> 20); */
       }
-    
+
     udelay (1000);
 
     /*
      * Adjust refresh rate depending on SDRAM type, both banks
      * For types > 128 MBit leave it at the current (fast) rate
      */
-    if ( size_b0 < 0x02000000 ) 
+    if ( size_b0 < 0x02000000 )
       {
 	/* reduce to 15.6 us (62.4 us / quad) */
 	memctl->memc_mptpr = CFG_MPTPR_2BK_4K;
@@ -304,7 +304,7 @@
 
     {
       unsigned long reg;
-      
+
       /* adjust refresh rate depending on SDRAM type, one bank */
       reg = memctl->memc_mptpr;
       reg >>= 1;	/* reduce to CFG_MPTPR_1BK_8K / _4K */
@@ -312,7 +312,7 @@
     }
 
     udelay(10000);
-    
+
     return (size_b0);
 }
 
@@ -326,9 +326,9 @@
  * - short between data lines
  */
 
-static long int 
-dram_size (long int   mamr_value, 
-	   long int  *base, 
+static long int
+dram_size (long int   mamr_value,
+	   long int  *base,
 	   long int   maxsize)
 {
   volatile immap_t     *immap  = (immap_t *)CFG_IMMR;
@@ -337,38 +337,38 @@
   ulong                 cnt, val;
   ulong                 save[32];    /* to make test non-destructive */
   unsigned char         i = 0;
-  
+
   memctl->memc_mamr = mamr_value;
-  
-  for (cnt = maxsize/sizeof(long); cnt > 0; cnt >>= 1) 
+
+  for (cnt = maxsize/sizeof(long); cnt > 0; cnt >>= 1)
     {
       addr = base + cnt;    /* pointer arith! */
-      
+
       save[i++] = *addr;
       *addr     = ~cnt;
     }
-  
+
   /* write 0 to base address */
   addr    = base;
   save[i] = *addr;
   *addr   = 0;
-  
+
   /* check at base address */
-  if ( (val = *addr) != 0 ) 
+  if ( (val = *addr) != 0 )
     {
       *addr = save[i];
 
       return (0);
     }
-  
-  for (cnt = 1; cnt <= maxsize/sizeof(long); cnt <<= 1) 
+
+  for (cnt = 1; cnt <= maxsize/sizeof(long); cnt <<= 1)
     {
       addr = base + cnt;    /* pointer arith! */
-      
+
       val   = *addr;
       *addr = save[--i];
-      
-      if ( val != (~cnt) ) 
+
+      if ( val != (~cnt) )
 	{
 	  return (cnt * sizeof(long));
 	}
@@ -388,7 +388,7 @@
 reset_phy (void)
 {
   volatile immap_t *immr = (immap_t *) CFG_IMMR;
-  
+
   /*
    * Ensure LBK LXT901 ethernet 1 & 2 = 0 ... for normal loopback in effect
    *                                          and no AUI loopback

diff --git a/board/LEOX/elpt860/flash.c b/board/LEOX/elpt860/flash.c
index 7107aaa..c1b3b85 100644
--- a/board/LEOX/elpt860/flash.c
+++ b/board/LEOX/elpt860/flash.c

@@ -79,41 +79,41 @@
 /*-----------------------------------------------------------------------
  */
 
-unsigned long 
+unsigned long
 flash_init (void)
 {
   volatile immap_t     *immap  = (immap_t *)CFG_IMMR;
   volatile memctl8xx_t *memctl = &immap->im_memctl;
   unsigned long         size_b0;
   int i;
-  
+
   /* Init: no FLASHes known */
-  for (i=0; i<CFG_MAX_FLASH_BANKS; ++i) 
+  for (i=0; i<CFG_MAX_FLASH_BANKS; ++i)
     {
       flash_info[i].flash_id = FLASH_UNKNOWN;
     }
-  
+
   /* Static FLASH Bank configuration here - FIXME XXX */
-  
-  size_b0 = flash_get_size ((volatile unsigned char *)FLASH_BASE0_PRELIM, 
+
+  size_b0 = flash_get_size ((volatile unsigned char *)FLASH_BASE0_PRELIM,
 			    &flash_info[0]);
-  
-  if ( flash_info[0].flash_id == FLASH_UNKNOWN ) 
+
+  if ( flash_info[0].flash_id == FLASH_UNKNOWN )
     {
       printf ("## Unknown FLASH on Bank 0 - Size = 0x%08lx = %ld MB\n",
 	      size_b0, size_b0<<20);
     }
-  
+
   /* Remap FLASH according to real size */
   memctl->memc_or0 = CFG_OR_TIMING_FLASH | (-size_b0 & OR_AM_MSK);
   memctl->memc_br0 = (CFG_FLASH_BASE & BR_BA_MSK) | BR_MS_GPCM | BR_PS_8 | BR_V;
-  
+
   /* Re-do sizing to get full correct info */
-  size_b0 = flash_get_size ((volatile unsigned char *)CFG_FLASH_BASE, 
+  size_b0 = flash_get_size ((volatile unsigned char *)CFG_FLASH_BASE,
 			    &flash_info[0]);
-  
+
   flash_get_offsets (CFG_FLASH_BASE, &flash_info[0]);
-  
+
 #if CFG_MONITOR_BASE >= CFG_FLASH_BASE
   /* monitor protection ON by default */
   flash_protect (FLAG_PROTECT_SET,
@@ -121,7 +121,7 @@
 		 CFG_MONITOR_BASE + monitor_flash_len-1,
 		 &flash_info[0]);
 #endif
-  
+
 #ifdef	CFG_ENV_IS_IN_FLASH
   /* ENV protection ON by default */
   flash_protect(FLAG_PROTECT_SET,
@@ -131,14 +131,14 @@
 #endif
 
   flash_info[0].size = size_b0;
-  
+
   return (size_b0);
 }
 
 /*-----------------------------------------------------------------------
  */
-static void 
-flash_get_offsets (ulong          base, 
+static void
+flash_get_offsets (ulong          base,
 		   flash_info_t  *info)
 {
   int i;
@@ -146,7 +146,7 @@
 #define SECTOR_64KB    0x00010000
 
   /* set up sector start adress table */
-  for (i = 0; i < info->sector_count; i++) 
+  for (i = 0; i < info->sector_count; i++)
     {
       info->start[i] = base + (i * SECTOR_64KB);
     }
@@ -154,38 +154,38 @@
 
 /*-----------------------------------------------------------------------
  */
-void 
+void
 flash_print_info (flash_info_t *info)
 {
   int i;
-  
-  if ( info->flash_id == FLASH_UNKNOWN ) 
+
+  if ( info->flash_id == FLASH_UNKNOWN )
     {
       printf ("missing or unknown FLASH type\n");
       return;
     }
 
-  switch ( info->flash_id & FLASH_VENDMASK ) 
+  switch ( info->flash_id & FLASH_VENDMASK )
     {
     case FLASH_MAN_AMD:	printf ("AMD ");		break;
     case FLASH_MAN_FUJ:	printf ("FUJITSU ");		break;
     case FLASH_MAN_STM: printf ("STM (Thomson) ");      break;
     default:		printf ("Unknown Vendor ");	break;
     }
-  
-  switch ( info->flash_id & FLASH_TYPEMASK ) 
+
+  switch ( info->flash_id & FLASH_TYPEMASK )
     {
     case FLASH_AM040:   printf ("AM29F040   (4 Mbits)\n");
       break;
     default:	        printf ("Unknown Chip Type\n");
       break;
     }
-  
-  printf ("  Size: %ld KB in %d Sectors\n", 
+
+  printf ("  Size: %ld KB in %d Sectors\n",
 	  info->size >> 10, info->sector_count);
-  
+
   printf ("  Sector Start Addresses:");
-  for (i=0; i<info->sector_count; ++i) 
+  for (i=0; i<info->sector_count; ++i)
     {
       if ((i % 5) == 0)
 	printf ("\n   ");
@@ -210,9 +210,9 @@
  * The following code cannot be run from FLASH!
  */
 
-static ulong 
-flash_get_size (volatile unsigned char *addr, 
-                flash_info_t           *info)
+static ulong
+flash_get_size (volatile unsigned char *addr,
+		flash_info_t           *info)
 {
   short i;
   uchar value;
@@ -222,10 +222,10 @@
   addr[0x0555] = 0xAA;
   addr[0x02AA] = 0x55;
   addr[0x0555] = 0x90;
-  
+
   value = addr[0];
 
-  switch ( value ) 
+  switch ( value )
     {
       /*    case AMD_MANUFACT: */
     case 0x01:
@@ -246,10 +246,10 @@
       info->size = 0;
       return (0);			/* no or unknown flash	*/
     }
-  
+
   value = addr[1];			/* device ID		*/
-  
-  switch ( value ) 
+
+  switch ( value )
     {
     case STM_ID_F040B:
     case AMD_ID_F040B:
@@ -264,13 +264,13 @@
     }
 
   /* set up sector start adress table */
-  for (i = 0; i < info->sector_count; i++) 
+  for (i = 0; i < info->sector_count; i++)
     {
       info->start[i] = base + (i * 0x00010000);
     }
-  
+
   /* check for protected sectors */
-  for (i = 0; i < info->sector_count; i++) 
+  for (i = 0; i < info->sector_count; i++)
     {
       /* read sector protection at sector address, (A7 .. A0) = 0x02 */
       /* D0 = 1 if protected */
@@ -281,13 +281,13 @@
   /*
    * Prevent writes to uninitialized FLASH.
    */
-  if ( info->flash_id != FLASH_UNKNOWN ) 
+  if ( info->flash_id != FLASH_UNKNOWN )
     {
       addr = (volatile unsigned char *)info->start[0];
-      
+
       *addr = 0xF0;	/* reset bank */
     }
-  
+
   return (info->size);
 }
 
@@ -296,21 +296,21 @@
  */
 
 int
-flash_erase (flash_info_t  *info, 
-	     int            s_first, 
+flash_erase (flash_info_t  *info,
+	     int            s_first,
 	     int            s_last)
 {
   volatile unsigned char *addr = (volatile unsigned char *)(info->start[0]);
   int flag, prot, sect, l_sect;
   ulong start, now, last;
-  
-  if ( (s_first < 0) || (s_first > s_last) ) 
+
+  if ( (s_first < 0) || (s_first > s_last) )
     {
-      if ( info->flash_id == FLASH_UNKNOWN ) 
+      if ( info->flash_id == FLASH_UNKNOWN )
 	{
 	  printf ("- missing\n");
-	} 
-      else 
+	}
+      else
 	{
 	  printf ("- no sectors to erase\n");
 	}
@@ -318,44 +318,44 @@
     }
 
   if ( (info->flash_id == FLASH_UNKNOWN) ||
-       (info->flash_id > FLASH_AMD_COMP) ) 
+       (info->flash_id > FLASH_AMD_COMP) )
     {
       printf ("Can't erase unknown flash type %08lx - aborted\n",
 	      info->flash_id);
       return ( 1 );
     }
-  
+
   prot = 0;
-  for (sect=s_first; sect<=s_last; ++sect) 
+  for (sect=s_first; sect<=s_last; ++sect)
     {
-      if ( info->protect[sect] ) 
+      if ( info->protect[sect] )
 	{
 	  prot++;
 	}
     }
-  
-  if ( prot ) 
+
+  if ( prot )
     {
       printf ("- Warning: %d protected sectors will not be erased!\n", prot);
-    } 
-  else 
+    }
+  else
     {
       printf ("\n");
     }
-  
+
   l_sect = -1;
-  
+
   /* Disable interrupts which might cause a timeout here */
   flag = disable_interrupts();
-  
+
   addr[0x0555] = 0xAA;
   addr[0x02AA] = 0x55;
   addr[0x0555] = 0x80;
   addr[0x0555] = 0xAA;
   addr[0x02AA] = 0x55;
-  
+
   /* Start erase on unprotected sectors */
-  for (sect = s_first; sect<=s_last; sect++) 
+  for (sect = s_first; sect<=s_last; sect++)
     {
       if (info->protect[sect] == 0)    /* not protected */
 	{
@@ -364,26 +364,26 @@
 	  l_sect = sect;
 	}
     }
-  
+
   /* re-enable interrupts if necessary */
   if ( flag )
     enable_interrupts();
-  
+
   /* wait at least 80us - let's wait 1 ms */
   udelay (1000);
-  
+
   /*
    * We wait for the last triggered sector
    */
   if ( l_sect < 0 )
     goto DONE;
-  
+
   start = get_timer (0);
   last  = start;
   addr = (volatile unsigned char *)(info->start[l_sect]);
-  while ( (addr[0] & 0x80) != 0x80 ) 
+  while ( (addr[0] & 0x80) != 0x80 )
     {
-      if ( (now = get_timer(start)) > CFG_FLASH_ERASE_TOUT ) 
+      if ( (now = get_timer(start)) > CFG_FLASH_ERASE_TOUT )
 	{
 	  printf ("Timeout\n");
 	  return ( 1 );
@@ -395,14 +395,14 @@
 	  last = now;
 	}
     }
-  
+
 DONE:
   /* reset to read mode */
   addr = (volatile unsigned char *)info->start[0];
   addr[0] = 0xF0;	/* reset bank */
-  
+
   printf (" done\n");
-  
+
   return ( 0 );
 }
 
@@ -413,10 +413,10 @@
  * 2 - Flash not erased
  */
 
-int 
-write_buff (flash_info_t  *info, 
-	    uchar         *src, 
-	    ulong          addr, 
+int
+write_buff (flash_info_t  *info,
+	    uchar         *src,
+	    ulong          addr,
 	    ulong          cnt)
 {
   ulong cp, wp, data;
@@ -428,16 +428,16 @@
       /* Width of the data bus: 8 bits */
 
       wp = addr;
-      
+
       while ( cnt )
 	{
 	  bdata = *src++;
-	  
+
 	  if ( (rc = write_byte(info, wp, bdata)) != 0 )
 	    {
 	      return (rc);
 	    }
-	  
+
 	  ++wp;
 	  --cnt;
 	}
@@ -449,72 +449,72 @@
       /* Width of the data bus: 32 bits */
 
       wp = (addr & ~3);	/* get lower word aligned address */
-      
+
       /*
        * handle unaligned start bytes
        */
-      if ( (l = addr - wp) != 0 ) 
+      if ( (l = addr - wp) != 0 )
 	{
 	  data = 0;
-	  for (i=0, cp=wp; i<l; ++i, ++cp) 
+	  for (i=0, cp=wp; i<l; ++i, ++cp)
 	    {
 	      data = (data << 8) | (*(uchar *)cp);
 	    }
-	  for (; i<4 && cnt>0; ++i) 
+	  for (; i<4 && cnt>0; ++i)
 	    {
 	      data = (data << 8) | *src++;
 	      --cnt;
 	      ++cp;
 	    }
-	  for (; cnt==0 && i<4; ++i, ++cp) 
+	  for (; cnt==0 && i<4; ++i, ++cp)
 	    {
 	      data = (data << 8) | (*(uchar *)cp);
 	    }
-	  
-	  if ( (rc = write_word(info, wp, data)) != 0 ) 
+
+	  if ( (rc = write_word(info, wp, data)) != 0 )
 	    {
 	      return (rc);
 	    }
 	  wp += 4;
 	}
-      
+
       /*
        * handle word aligned part
        */
-      while ( cnt >= 4 ) 
+      while ( cnt >= 4 )
 	{
 	  data = 0;
-	  for (i=0; i<4; ++i) 
+	  for (i=0; i<4; ++i)
 	    {
 	      data = (data << 8) | *src++;
 	    }
-	  if ( (rc = write_word(info, wp, data)) != 0 ) 
+	  if ( (rc = write_word(info, wp, data)) != 0 )
 	    {
 	      return (rc);
 	    }
 	  wp  += 4;
 	  cnt -= 4;
 	}
-      
-      if ( cnt == 0 ) 
+
+      if ( cnt == 0 )
 	{
 	  return (0);
 	}
-      
+
       /*
        * handle unaligned tail bytes
        */
       data = 0;
-      for (i=0, cp=wp; i<4 && cnt>0; ++i, ++cp) 
+      for (i=0, cp=wp; i<4 && cnt>0; ++i, ++cp)
 	{
 	  data = (data << 8) | *src++;
 	  --cnt;
 	}
-      for (; i<4; ++i, ++cp) 
+      for (; i<4; ++i, ++cp)
 	{
 	  data = (data << 8) | (*(uchar *)cp);
 	}
-      
+
       return (write_word(info, wp, data));
     }
 }
@@ -525,38 +525,38 @@
  * 1 - write timeout
  * 2 - Flash not erased
  */
-static int 
-write_word (flash_info_t  *info, 
-	    ulong          dest, 
+static int
+write_word (flash_info_t  *info,
+	    ulong          dest,
 	    ulong          data)
 {
   vu_long *addr = (vu_long*)(info->start[0]);
   ulong start;
   int flag;
-  
+
   /* Check if Flash is (sufficiently) erased */
-  if ( (*((vu_long *)dest) & data) != data ) 
+  if ( (*((vu_long *)dest) & data) != data )
     {
       return (2);
     }
   /* Disable interrupts which might cause a timeout here */
   flag = disable_interrupts();
-  
+
   addr[0x0555] = 0x00AA00AA;
   addr[0x02AA] = 0x00550055;
   addr[0x0555] = 0x00A000A0;
-  
+
   *((vu_long *)dest) = data;
-  
+
   /* re-enable interrupts if necessary */
   if ( flag )
     enable_interrupts();
 
   /* data polling for D7 */
   start = get_timer (0);
-  while ( (*((vu_long *)dest) & 0x00800080) != (data & 0x00800080) ) 
+  while ( (*((vu_long *)dest) & 0x00800080) != (data & 0x00800080) )
     {
-      if ( get_timer(start) > CFG_FLASH_WRITE_TOUT ) 
+      if ( get_timer(start) > CFG_FLASH_WRITE_TOUT )
 	{
 	  return (1);
 	}
@@ -571,38 +571,38 @@
  * 1 - write timeout
  * 2 - Flash not erased
  */
-static int 
-write_byte (flash_info_t  *info, 
-	    ulong          dest, 
+static int
+write_byte (flash_info_t  *info,
+	    ulong          dest,
 	    uchar          data)
 {
   volatile unsigned char *addr = (volatile unsigned char *)(info->start[0]);
   ulong  start;
   int    flag;
-  
+
   /* Check if Flash is (sufficiently) erased */
-  if ( (*((volatile unsigned char *)dest) & data) != data ) 
+  if ( (*((volatile unsigned char *)dest) & data) != data )
     {
       return (2);
     }
   /* Disable interrupts which might cause a timeout here */
   flag = disable_interrupts();
-  
+
   addr[0x0555] = 0xAA;
   addr[0x02AA] = 0x55;
   addr[0x0555] = 0xA0;
-  
+
   *((volatile unsigned char *)dest) = data;
-  
+
   /* re-enable interrupts if necessary */
   if ( flag )
     enable_interrupts();
 
   /* data polling for D7 */
   start = get_timer (0);
-  while ( (*((volatile unsigned char *)dest) & 0x80) != (data & 0x80) ) 
+  while ( (*((volatile unsigned char *)dest) & 0x80) != (data & 0x80) )
     {
-      if ( get_timer(start) > CFG_FLASH_WRITE_TOUT ) 
+      if ( get_timer(start) > CFG_FLASH_WRITE_TOUT )
 	{
 	  return (1);
 	}

diff --git a/board/LEOX/elpt860/u-boot.lds b/board/LEOX/elpt860/u-boot.lds
index cecb210..d23af96 100644
--- a/board/LEOX/elpt860/u-boot.lds
+++ b/board/LEOX/elpt860/u-boot.lds

@@ -123,6 +123,10 @@
   _edata  =  .;
   PROVIDE (edata = .);
 
+  __u_boot_cmd_start = .;
+  .u_boot_cmd : { *(.u_boot_cmd) }
+  __u_boot_cmd_end = .;
+
   __start___ex_table = .;
   __ex_table : { *(__ex_table) }
   __stop___ex_table = .;

diff --git a/board/LEOX/elpt860/u-boot.lds.debug b/board/LEOX/elpt860/u-boot.lds.debug
index b81235f..269e8d9 100644
--- a/board/LEOX/elpt860/u-boot.lds.debug
+++ b/board/LEOX/elpt860/u-boot.lds.debug

@@ -137,4 +137,3 @@
   _end = . ;
   PROVIDE (end = .);
 }
-

diff --git a/board/MAI/AmigaOneG3SE/AmigaOneG3SE.c b/board/MAI/AmigaOneG3SE/AmigaOneG3SE.c
index 1d6ca81..0934e1b 100644
--- a/board/MAI/AmigaOneG3SE/AmigaOneG3SE.c
+++ b/board/MAI/AmigaOneG3SE/AmigaOneG3SE.c

@@ -30,47 +30,47 @@
 #include "via686.h"
 
 __asm(" .globl send_kb                                      \n
-        send_kb:                                            \n
-                lis     r9, 0xfe00                          \n
-                                                            \n
-                li      r4, 0x10        # retries           \n
-                mtctr   r4                                  \n
-                                                            \n
-        idle:                                               \n
-                lbz     r4, 0x64(r9)                        \n
-                andi.   r4, r4, 0x02                        \n
-                bne     idle                                \n
-                                                            \n
-        ready:                                              \n
-                stb     r3, 0x60(r9)                        \n
-                                                            \n
-        check:                                              \n
-                lbz     r4, 0x64(r9)                        \n
-                andi.   r4, r4, 0x01                        \n
-                beq     check                               \n
-                                                            \n
-                lbz     r4, 0x60(r9)                        \n
-                cmpwi   r4, 0xfa                            \n
-                beq     done                                \n
-                                                            \n
-                bdnz    idle                                \n
-                                                            \n
-                li      r3, 0                               \n
-                blr                                         \n
-                                                            \n
-        done:                                               \n
-                li      r3, 1                               \n
-                blr                                         \n
-                                                            \n
-        .globl test_kb                                      \n
-        test_kb:                                            \n
-                mflr    r10                                 \n
-	        li      r3, 0xed                            \n
-                bl      send_kb                             \n
-                li      r3, 0x01                            \n
-                bl      send_kb                             \n
-                mtlr    r10                                 \n
-                blr                                         \n
+	send_kb:                                            \n
+		lis     r9, 0xfe00                          \n
+							    \n
+		li      r4, 0x10        # retries           \n
+		mtctr   r4                                  \n
+							    \n
+	idle:                                               \n
+		lbz     r4, 0x64(r9)                        \n
+		andi.   r4, r4, 0x02                        \n
+		bne     idle                                \n
+							    \n
+	ready:                                              \n
+		stb     r3, 0x60(r9)                        \n
+							    \n
+	check:                                              \n
+		lbz     r4, 0x64(r9)                        \n
+		andi.   r4, r4, 0x01                        \n
+		beq     check                               \n
+							    \n
+		lbz     r4, 0x60(r9)                        \n
+		cmpwi   r4, 0xfa                            \n
+		beq     done                                \n
+							    \n
+		bdnz    idle                                \n
+							    \n
+		li      r3, 0                               \n
+		blr                                         \n
+							    \n
+	done:                                               \n
+		li      r3, 1                               \n
+		blr                                         \n
+							    \n
+	.globl test_kb                                      \n
+	test_kb:                                            \n
+		mflr    r10                                 \n
+		li      r3, 0xed                            \n
+		bl      send_kb                             \n
+		li      r3, 0x01                            \n
+		bl      send_kb                             \n
+		mtlr    r10                                 \n
+		blr                                         \n
 ");
 
 
@@ -86,7 +86,6 @@
 }
 
 
-
 void after_reloc (ulong dest_addr, gd_t *gd)
 {
 /* HJF:	DECLARE_GLOBAL_DATA_PTR; */

diff --git a/board/MAI/AmigaOneG3SE/Makefile b/board/MAI/AmigaOneG3SE/Makefile
index 785f01f..b1247fe 100644
--- a/board/MAI/AmigaOneG3SE/Makefile
+++ b/board/MAI/AmigaOneG3SE/Makefile

@@ -33,14 +33,14 @@
 
 AOBJS	= board_asm_init.o memio.o
 
-OBJS	= $(COBJS) $(AOBJS) 
+OBJS	= $(COBJS) $(AOBJS)
 
 EMUDIR  = ../bios_emulator/scitech/src/x86emu/
 EMUOBJ  = $(EMUDIR)decode.o $(EMUDIR)ops2.o $(EMUDIR)fpu.o $(EMUDIR)prim_ops.o \
 		$(EMUDIR)ops.o $(EMUDIR)sys.o
 EMUSRC = $(EMUOBJ:.o=.c)
 
-$(LIB):	.depend $(OBJS) $(EMUSRC) 
+$(LIB):	.depend $(OBJS) $(EMUSRC)
 	make libx86emu.a -C ../bios_emulator/scitech/src/x86emu -f makefile.uboot CROSS_COMPILE=$(CROSS_COMPILE)
 	-rm $(LIB)
 	$(AR) crv $@ $(OBJS) $(EMUOBJ)

diff --git a/board/MAI/AmigaOneG3SE/articiaS.c b/board/MAI/AmigaOneG3SE/articiaS.c
index 5eddfc6..9fd6b95 100644
--- a/board/MAI/AmigaOneG3SE/articiaS.c
+++ b/board/MAI/AmigaOneG3SE/articiaS.c

@@ -1,6 +1,6 @@
 /*
  * (C) Copyright 2002
- * Hyperion Entertainment, ThomasF@hyperion-entertainment.com 
+ * Hyperion Entertainment, ThomasF@hyperion-entertainment.com
  *
  * See file CREDITS for list of people who contributed to this
  * project.
@@ -572,7 +572,7 @@
 	if (banks[3].used)
 		burst_support = banks[3].burst_len;
 
-	/* 
+	/*
 	   ** Mode register:
 	   ** Bits         Use
 	   ** 0-2          Burst len

diff --git a/board/MAI/AmigaOneG3SE/articiaS.h b/board/MAI/AmigaOneG3SE/articiaS.h
index 158d70a..ce20d03 100644
--- a/board/MAI/AmigaOneG3SE/articiaS.h
+++ b/board/MAI/AmigaOneG3SE/articiaS.h

@@ -99,14 +99,14 @@
 #define XDBCR_HWTOXD          (1<<0)
 #define XDBCR_KBTOXD          (1<<1)
 #define XDBCR_RTCTOXD         (1<<2)
-#define XDBCR_SCALE_1_1       (0x0<<3)       
-#define XDBCR_SCALE_2_2       (0x1<<3)       
-#define XDBCR_SCALE_3_2       (0x2<<3)       
-#define XDBCR_SCALE_4_4       (0x3<<3)       
-#define XDBCR_SCALE_5_8       (0x4<<3)       
-#define XDBCR_SCALE_6_8       (0x5<<3)       
-#define XDBCR_SCALE_8_8       (0x6<<3)       
-#define XDBCR_SCALE_0_16      (0x7<<3)       
+#define XDBCR_SCALE_1_1       (0x0<<3)
+#define XDBCR_SCALE_2_2       (0x1<<3)
+#define XDBCR_SCALE_3_2       (0x2<<3)
+#define XDBCR_SCALE_4_4       (0x3<<3)
+#define XDBCR_SCALE_5_8       (0x4<<3)
+#define XDBCR_SCALE_6_8       (0x5<<3)
+#define XDBCR_SCALE_8_8       (0x6<<3)
+#define XDBCR_SCALE_0_16      (0x7<<3)
 #define XDBCR_XDPROM          (1<<7)
 
 
@@ -134,7 +134,6 @@
 #define ARTICIAS_ISAIO_PHYS    0xfe002000
 
 
-
 /* Prototypes */
 long articiaS_ram_init(void);
 void articiaS_pci_init(void);

diff --git a/board/MAI/AmigaOneG3SE/articiaS_pci.c b/board/MAI/AmigaOneG3SE/articiaS_pci.c
index 2a7763d..d2e9f29 100644
--- a/board/MAI/AmigaOneG3SE/articiaS_pci.c
+++ b/board/MAI/AmigaOneG3SE/articiaS_pci.c

@@ -123,14 +123,14 @@
 {
     { 0, 0, 0, 0xff},        /* Articia S host bridge */
     { 0, 1, 0, 0xff},        /* Articia S AGP bridge */
-//    { 0, 6, 0, 0x05},        /* 3COM ethernet */
+/*    { 0, 6, 0, 0x05},        /###* 3COM ethernet */
     { 0, 7, 0, 0xff},        /* VIA southbridge */
     { 0, 7, 1, 0x0e},        /* IDE controller in legacy mode */
-//    { 0, 7, 2, 0x05},        /* First USB controller */
-//    { 0, 7, 3, 0x0c},        /* Second USB controller (shares interrupt with ethernet) */
+/*    { 0, 7, 2, 0x05},        /###* First USB controller */
+/*    { 0, 7, 3, 0x0c},        /###* Second USB controller (shares interrupt with ethernet) */
     { 0, 7, 4, 0xff},        /* ACPI Power Management */
-//    { 0, 7, 5, 0x08},        /* AC97 */
-//    { 0, 7, 6, 0x08},        /* MC97 */
+/*    { 0, 7, 5, 0x08},        /###* AC97 */
+/*    { 0, 7, 6, 0x08},        /###* MC97 */
     { 0xff, 0xff, 0xff, 0xff}
 };
 
@@ -287,7 +287,7 @@
 
     PRINTF("atriciaS_pci_init\n");
 
-    // Why aren't these relocated??
+    /* Why aren't these relocated?? */
     for (i=0; config_table[i].config_device; i++)
     {
 	switch((int)config_table[i].config_device)
@@ -335,7 +335,6 @@
 		   PCI_REGION_IO);
 
 
-
     articiaS_hose.region_count = 4;
 
     pci_setup_indirect(&articiaS_hose, ARTICIAS_PCI_CFGADDR, ARTICIAS_PCI_CFGDATA);
@@ -410,8 +409,8 @@
 	    pci_hose_read_config_byte(hose, dev, 0x0B, &c1);
 	    pci_hose_read_config_byte(hose, dev, 0x0A, &c2);
 	    class = c1<<8 | c2;
-	    //printf("At %02x:%02x:%02x: class %x\n",
-	    //	   PCI_BUS(dev), PCI_DEV(dev), PCI_FUNC(dev), class);
+	    /*printf("At %02x:%02x:%02x: class %x\n", */
+	    /*	   PCI_BUS(dev), PCI_DEV(dev), PCI_FUNC(dev), class); */
 	    if (class == find_class)
 	    {
 		if (index == 0)
@@ -441,7 +440,7 @@
 
     if (hose == NULL) hose = &articiaS_hose;
 
-    if (busnr < hose->first_busno || busnr > hose->last_busno) return PCI_ANY_ID; // Not in range
+    if (busnr < hose->first_busno || busnr > hose->last_busno) return PCI_ANY_ID; /* Not in range */
 
     /*
      * The bridge must be on a lower bus number
@@ -467,7 +466,7 @@
 
 		if (!PCI_FUNC(dev))
 		    found_multi = header_type & 0x80;
-		if (header_type == 1) // Bridge device header
+		if (header_type == 1) /* Bridge device header */
 		{
 		    pci_hose_read_config_byte(hose, dev, PCI_SECONDARY_BUS, &secondary_bus);
 		    if ((int)secondary_bus == busnr) return dev;
@@ -512,7 +511,7 @@
 	PRINTF("Searching for class 0x%x on bus %d\n", classes[classnr], busnr);
 	/* Find the first of this class on this bus */
 	dev = pci_hose_find_class(&articiaS_hose, busnr, classes[classnr], 0);
-	if (dev != ~0) 
+	if (dev != ~0)
 	{
 	    PRINTF("Found VGA Card at %02x:%02x:%02x\n", PCI_BUS(dev), PCI_DEV(dev), PCI_FUNC(dev));
 	    break;

diff --git a/board/MAI/AmigaOneG3SE/board_asm_init.S b/board/MAI/AmigaOneG3SE/board_asm_init.S
index a421c5d..086b19c 100644
--- a/board/MAI/AmigaOneG3SE/board_asm_init.S
+++ b/board/MAI/AmigaOneG3SE/board_asm_init.S

@@ -1,14 +1,13 @@
-	#include	"macros.h"
-	
-	
+#include	"macros.h"
 
-#define GLOBALINFO0	      0x50	
+
+#define GLOBALINFO0	      0x50
 #define GLOBALINFO0_BO        (1<<7)
 #define GLOBALINFO2_B1ARBITER (1<<6)
 #define HBUSACR0              0x5c
 #define HBUSACR2_BURST        (1<<0)
 #define HBUSACR2_LAT          (1<<1)
-	
+
 #define RECEIVER_HOLDING 0
 #define TRANSMITTER_HOLDING 0
 #define INTERRUPT_ENABLE 1
@@ -35,9 +34,9 @@
 
 #define SUPERIO_1               ((7 << 3) | (0))
 #define SUPERIO_2               ((7 << 3) | (1))
-	
+
 	.globl	board_asm_init
-	
+
 board_asm_init:
 	mflr	r29
 	/* Set 'Must-set' register */
@@ -77,7 +76,7 @@
 	li	r5, 0x47
 	bl	pci_write_cfg_byte*/
 
-	
+
 	/* Enable NVRAM for environment */
 	li	r3, 0
 	li	r4, 0
@@ -91,7 +90,7 @@
 	siowb	0x40, 0x08
 	siowb	0x41, 0x01
 	siowb	0x45, 0x80
-	siowb	0x46, 0x60	
+	siowb	0x46, 0x60
 	siowb	0x47, 0x20
 	siowb	0x48, 0x01
 	siowb	0x4a, 0xc4
@@ -103,7 +102,7 @@
 	siowb	0x56, 0x99
 	siowb	0x57, 0x90
 	siowb	0x85, 0x01
-		
+
 	/* Enable configuration mode for SuperIO */
 	li	r3, 0
 	li	r4, (7<<3)
@@ -128,7 +127,7 @@
 	ori	r3, r3, 0x0c
 	outb	0x3f0, 0xe2
 	outbr	0x3f1, r3
-	
+
 	/* Disable configuration mode */
 	li	r3, 0
 	li	r4, (7<<3)
@@ -145,7 +144,7 @@
 	mtlr	r29
 	blr
 
-		
+
 	.globl	new_reset
 	.globl	new_reset_end
 new_reset:
@@ -153,5 +152,5 @@
 	oris	r0, r0, 0xFFF0
 	mtlr	r0
 	blr
-	
-new_reset_end:	
\ No newline at end of file
+
+new_reset_end:

diff --git a/board/MAI/AmigaOneG3SE/cmd_boota.c b/board/MAI/AmigaOneG3SE/cmd_boota.c
index 140aaff..db1ecfc 100644
--- a/board/MAI/AmigaOneG3SE/cmd_boota.c
+++ b/board/MAI/AmigaOneG3SE/cmd_boota.c

@@ -1,6 +1,5 @@
 #include <common.h>
 #include <command.h>
-#include <cmd_boota.h>
 #include "../disk/part_amiga.h"
 #include <asm/cache.h>
 
@@ -121,3 +120,10 @@
 
 	return 0;
 }
+#if defined(CONFIG_AMIGAONEG3SE) && (CONFIG_COMMANDS & CFG_CMD_BSP)
+cmd_tbl_t U_BOOT_CMD(BOOTA) = MK_CMD_ENTRY(
+	"boota",   3,      1,      do_boota,
+	"boota   - boot an Amiga kernel\n",
+	"address disk"
+);
+#endif /* _CMD_BOOTA_H */

diff --git a/board/MAI/AmigaOneG3SE/config.mk b/board/MAI/AmigaOneG3SE/config.mk
index d7d0e6b..930a793 100644
--- a/board/MAI/AmigaOneG3SE/config.mk
+++ b/board/MAI/AmigaOneG3SE/config.mk

@@ -29,5 +29,4 @@
 
 TEXT_BASE = 0xfff00000
 
-PLATFORM_CPPFLAGS += -DTEXT_BASE=$(TEXT_BASE) -Wa,-mregnames -DEASTEREGG $(X86EMU) -Dprintk=printf #-DDEBUG 
-
+PLATFORM_CPPFLAGS += -DTEXT_BASE=$(TEXT_BASE) -Wa,-mregnames -DEASTEREGG $(X86EMU) -Dprintk=printf #-DDEBUG

diff --git a/board/MAI/AmigaOneG3SE/enet.c b/board/MAI/AmigaOneG3SE/enet.c
index 0aaa8bf..d4be889 100644
--- a/board/MAI/AmigaOneG3SE/enet.c
+++ b/board/MAI/AmigaOneG3SE/enet.c

@@ -36,45 +36,45 @@
 
 /* 3Com Ethernet PCI definitions*/
 
-// #define PCI_VENDOR_ID_3COM		0x10B7
+/* #define PCI_VENDOR_ID_3COM		0x10B7 */
 #define PCI_DEVICE_ID_3COM_3C905C	0x9200
 
 /* 3Com Commands, top 5 bits are command and bottom 11 bits are parameters */
 
-#define TotalReset 		(0<<11) 
+#define TotalReset 		(0<<11)
 #define SelectWindow 		(1<<11)
 #define StartCoax 		(2<<11)
-#define RxDisable 		(3<<11) 
-#define RxEnable 		(4<<11) 
+#define RxDisable 		(3<<11)
+#define RxEnable 		(4<<11)
 #define RxReset 		(5<<11)
-#define UpStall 		(6<<11) 
+#define UpStall 		(6<<11)
 #define UpUnstall 		(6<<11)+1
-#define DownStall 		(6<<11)+2 
+#define DownStall 		(6<<11)+2
 #define DownUnstall 		(6<<11)+3
 #define RxDiscard 		(8<<11)
 #define TxEnable 		(9<<11)
-#define TxDisable 		(10<<11) 
+#define TxDisable 		(10<<11)
 #define TxReset 		(11<<11)
-#define FakeIntr 		(12<<11) 
-#define AckIntr 		(13<<11) 
+#define FakeIntr 		(12<<11)
+#define AckIntr 		(13<<11)
 #define SetIntrEnb 		(14<<11)
-#define SetStatusEnb 		(15<<11) 
+#define SetStatusEnb 		(15<<11)
 #define SetRxFilter 		(16<<11)
 #define SetRxThreshold 		(17<<11)
-#define SetTxThreshold 		(18<<11) 
+#define SetTxThreshold 		(18<<11)
 #define SetTxStart 		(19<<11)
 #define StartDMAUp 		(20<<11)
 #define StartDMADown 		(20<<11)+1
 #define StatsEnable		(21<<11)
-#define StatsDisable		(22<<11) 
+#define StatsDisable		(22<<11)
 #define StopCoax 		(23<<11)
 #define SetFilterBit 		(25<<11)
 
 /* The SetRxFilter command accepts the following classes */
 
-#define RxStation 		1 
-#define RxMulticast		2 
-#define RxBroadcast		4 
+#define RxStation 		1
+#define RxMulticast		2
+#define RxBroadcast		4
 #define RxProm 			8
 
 /* 3Com status word defnitions */
@@ -83,12 +83,12 @@
 #define HostError 		0x0002
 #define TxComplete 		0x0004
 #define TxAvailable 		0x0008
-#define RxComplete 		0x0010 
+#define RxComplete 		0x0010
 #define RxEarly 		0x0020
 #define IntReq 			0x0040
 #define StatsFull 		0x0080
 #define DMADone 		(1<<8)
-#define DownComplete 		(1<<9) 
+#define DownComplete 		(1<<9)
 #define UpComplete 		(1<<10)
 #define DMAInProgress 		(1<<11)			/* DMA controller is still busy.*/
 #define CmdInProgress 		(1<<12)           	/* EL3_CMD is still busy.*/
@@ -114,31 +114,31 @@
 
 /* EEPROM locations. */
 
-#define PhysAddr01		0 
+#define PhysAddr01		0
 #define PhysAddr23		1
-#define PhysAddr45		2 
+#define PhysAddr45		2
 #define ModelID			3
-#define EtherLink3ID		7 
-#define IFXcvrIO		8 
+#define EtherLink3ID		7
+#define IFXcvrIO		8
 #define IRQLine			9
-#define NodeAddr01		10 
-#define NodeAddr23		11 
+#define NodeAddr01		10
+#define NodeAddr23		11
 #define NodeAddr45		12
-#define DriverTune		13 
+#define DriverTune		13
 #define Checksum		15
 
 /* Register window 1 offsets, the window used in normal operation */
 
-#define TX_FIFO 		0x10  
-#define RX_FIFO 		0x10  
+#define TX_FIFO 		0x10
+#define RX_FIFO 		0x10
 #define RxErrors 		0x14
-#define RxStatus 		0x18  
-#define Timer			0x1A 
+#define RxStatus 		0x18
+#define Timer			0x1A
 #define TxStatus 		0x1B
 #define TxFree 			0x1C	 		/* Remaining free bytes in Tx buffer. */
 
 /* Register Window 2 */
-        
+
 #define Wn2_ResetOptions	12
 
 /* Register Window 3: MAC/config bits */
@@ -148,11 +148,11 @@
 #define Wn3_Options		8
 
 #define BFEXT(value, offset, bitcount)  					\
-    	((((unsigned long)(value)) >> (offset)) & ((1 << (bitcount)) - 1))
+	((((unsigned long)(value)) >> (offset)) & ((1 << (bitcount)) - 1))
 
 #define BFINS(lhs, rhs, offset, bitcount)                                       \
-        (((lhs) & ~((((1 << (bitcount)) - 1)) << (offset))) |   		\
-        (((rhs) & ((1 << (bitcount)) - 1)) << (offset)))
+	(((lhs) & ~((((1 << (bitcount)) - 1)) << (offset))) |   		\
+	(((rhs) & ((1 << (bitcount)) - 1)) << (offset)))
 
 #define RAM_SIZE(v)             BFEXT(v, 0, 3)
 #define RAM_WIDTH(v)    	BFEXT(v, 3, 1)
@@ -163,7 +163,7 @@
 #define AUTOSELECT(v)   	BFEXT(v, 24, 1)
 
 /* Register Window 4: Xcvr/media bits */
-        
+
 #define Wn4_FIFODiag 		4
 #define Wn4_NetDiag 		6
 #define Wn4_PhysicalMgmt	8
@@ -196,28 +196,28 @@
 #define DN_COMPLETE     0x00010000                      /* This packet has been downloaded */
 
 struct rx_desc_3com {
-        u32 next;                                       /* Last entry points to 0	   	*/
-        u32 status;					/* FSH -> Frame Start Header 		*/
-        u32 addr;                                       /* Up to 63 addr/len pairs possible 	*/
-        u32 length;                                     /* Set LAST_FRAG to indicate last pair	*/
+	u32 next;                                       /* Last entry points to 0	   	*/
+	u32 status;					/* FSH -> Frame Start Header 		*/
+	u32 addr;                                       /* Up to 63 addr/len pairs possible 	*/
+	u32 length;                                     /* Set LAST_FRAG to indicate last pair	*/
 };
 
 /* Values for the Rx status entry. */
 
 #define RxDComplete		0x00008000
 #define RxDError		0x4000
-#define IPChksumErr		(1<<25) 
-#define TCPChksumErr		(1<<26) 
+#define IPChksumErr		(1<<25)
+#define TCPChksumErr		(1<<26)
 #define UDPChksumErr		(1<<27)
-#define IPChksumValid		(1<<29) 
+#define IPChksumValid		(1<<29)
 #define TCPChksumValid		(1<<30)
 #define UDPChksumValid		(1<<31)
 
 struct tx_desc_3com {
-        u32 next;                                       /* Last entry points to 0		*/
-        u32 status;                                     /* bits 0:12 length, others see below	*/
-        u32 addr;
-        u32 length;
+	u32 next;                                       /* Last entry points to 0		*/
+	u32 status;                                     /* bits 0:12 length, others see below	*/
+	u32 addr;
+	u32 length;
 };
 
 /* Values for the Tx status entry. */
@@ -232,9 +232,9 @@
 /* XCVR Types */
 
 #define XCVR_10baseT		0
-#define XCVR_AUI		1 
+#define XCVR_AUI		1
 #define XCVR_10baseTOnly	2
-#define XCVR_10base2		3 
+#define XCVR_10base2		3
 #define XCVR_100baseTx		4
 #define XCVR_100baseFx		5
 #define XCVR_MII		6
@@ -243,10 +243,10 @@
 #define XCVR_Default		10			/* I don't think this is correct -> should have been 0x10 if Auto Negotiate */
 
 struct descriptor {			    		/* A generic descriptor. */
-        u32 next;                                       /* Last entry points to 0	   	*/
-        u32 status;					/* FSH -> Frame Start Header 		*/
-        u32 addr;                                       /* Up to 63 addr/len pairs possible 	*/
-        u32 length;                                     /* Set LAST_FRAG to indicate last pair	*/
+	u32 next;                                       /* Last entry points to 0	   	*/
+	u32 status;					/* FSH -> Frame Start Header 		*/
+	u32 addr;                                       /* Up to 63 addr/len pairs possible 	*/
+	u32 length;                                     /* Set LAST_FRAG to indicate last pair	*/
 };
 
 /* Misc. definitions */
@@ -338,7 +338,7 @@
 
 static inline void ETH_CMD(struct eth_device* dev, int command)
 {
-	*(volatile u16 *)io_to_phys(EL3_CMD + dev->iobase) = cpu_to_le16(command); 
+	*(volatile u16 *)io_to_phys(EL3_CMD + dev->iobase) = cpu_to_le16(command);
     __asm volatile ("eieio");
 }
 
@@ -348,24 +348,24 @@
 static int issue_and_wait(struct eth_device* dev, int command)
 {
 
-        int i, status;
+	int i, status;
 
 	ETH_CMD(dev, command);
-        for (i = 0; i < 2000; i++) {
-                status = ETH_STATUS(dev);
-		//printf ("Issue: status 0x%4x.\n", status);
+	for (i = 0; i < 2000; i++) {
+		status = ETH_STATUS(dev);
+		/*printf ("Issue: status 0x%4x.\n", status); */
 		if (!(status & CmdInProgress))
-                        return 1;
-        }
+			return 1;
+	}
 
-        /* OK, that didn't work.  Do it the slow way.  One second */
-        for (i = 0; i < 100000; i++) {
-                status = ETH_STATUS(dev);
-		//printf ("Issue: status 0x%4x.\n", status);
-                        return 1;
-                udelay(10);
-        }
-        PRINTF("Ethernet command: 0x%4x did not complete! Status: 0x%4x\n", command, ETH_STATUS(dev) );
+	/* OK, that didn't work.  Do it the slow way.  One second */
+	for (i = 0; i < 100000; i++) {
+		status = ETH_STATUS(dev);
+		/*printf ("Issue: status 0x%4x.\n", status); */
+			return 1;
+		udelay(10);
+	}
+	PRINTF("Ethernet command: 0x%4x did not complete! Status: 0x%4x\n", command, ETH_STATUS(dev) );
 	return 0;
 }
 
@@ -378,7 +378,7 @@
 
     EL3WINDOW(dev, 1);
 
-    // Wait for Auto negotiation to complete
+    /* Wait for Auto negotiation to complete */
     for (i = 0; i <= 1000; i++)
     {
 	if (ETH_INW(dev, 2) & 0x04)
@@ -391,7 +391,6 @@
 	    return 0;
 	}
     }
-    
 
 
     return 1;
@@ -430,10 +429,10 @@
 
 int eth_3com_initialize(bd_t *bis)
 {
-        u32 eth_iobase = 0, status;
-        int card_number = 0, ret;
-        struct eth_device* dev;
-        pci_dev_t devno;
+	u32 eth_iobase = 0, status;
+	int card_number = 0, ret;
+	struct eth_device* dev;
+	pci_dev_t devno;
 	char *s;
 
 	s = getenv("3com_base");
@@ -453,10 +452,10 @@
 	}
 
 	ret = pci_read_config_dword(devno, PCI_BASE_ADDRESS_0, &eth_iobase);
-        eth_iobase &= ~0xf;
+	eth_iobase &= ~0xf;
 
 	PRINTF("eth: 3Com Found at Address: 0x%x\n", eth_iobase);
-  
+
 	pci_write_config_dword(devno, PCI_COMMAND, PCI_COMMAND_IO | PCI_COMMAND_MEMORY | PCI_COMMAND_MASTER);
 
 	 /* Check if I/O accesses and Bus Mastering are enabled */
@@ -481,28 +480,28 @@
 		goto Done;
 	}
 
-        dev = (struct eth_device*) malloc(sizeof(*dev)); //struct eth_device));
+	dev = (struct eth_device*) malloc(sizeof(*dev)); /*struct eth_device)); */
 
-        sprintf(dev->name, "3Com 3c920c#%d", card_number);
-        dev->iobase = eth_iobase;
-        dev->priv   = (void*) devno;
-        dev->init   = eth_3com_init;
-        dev->halt   = eth_3com_halt;
-        dev->send   = eth_3com_send;
-        dev->recv   = eth_3com_recv;
+	sprintf(dev->name, "3Com 3c920c#%d", card_number);
+	dev->iobase = eth_iobase;
+	dev->priv   = (void*) devno;
+	dev->init   = eth_3com_init;
+	dev->halt   = eth_3com_halt;
+	dev->send   = eth_3com_send;
+	dev->recv   = eth_3com_recv;
 
-        eth_register(dev);
+	eth_register(dev);
 
 /* 	{ */
 /* 	    char interrupt; */
 /* 	    devno = pci_find_device(PCI_VENDOR_ID_3COM, PCI_DEVICE_ID_3COM_3C905C, 0); */
 /* 	    pci_read_config_byte(devno, PCI_INTERRUPT_LINE, &interrupt); */
-	    
+
 /* 	    printf("Installing eth0 interrupt handler to %d\n", interrupt); */
 /* 	    irq_install_handler(interrupt, eth_interrupt, dev); */
 /* 	} */
 
-        card_number++;
+	card_number++;
 
 	/* Set the latency timer for value */
 	s = getenv("3com_latency");
@@ -532,13 +531,13 @@
 		PRINTF ("Cannot allocate memory for RX_RING.....\n");
 		goto Done;
 	}
-	
+
 	if (!(tx_ring = memalign(sizeof(struct tx_desc_3com) * NUM_TX_DESC, 16)))
 	{
 		PRINTF ("Cannot allocate memory for TX_RING.....\n");
 		goto Done;
 	}
-	
+
 Done:
 	return status;
 }
@@ -552,7 +551,7 @@
 	struct descriptor *ias_cmd;
 
 	/* Determine what type of network the machine is connected to	*/
-	/* presently drops the connect to 10Mbps			*/	     
+	/* presently drops the connect to 10Mbps			*/
 
 	if (!auto_negotiate(dev))
 	{
@@ -560,43 +559,43 @@
 		goto Done;
 	}
 
-        issue_and_wait(dev, TxReset);
-        issue_and_wait(dev, RxReset|0x04);
+	issue_and_wait(dev, TxReset);
+	issue_and_wait(dev, RxReset|0x04);
 
-        /* Switch to register set 7 for normal use. */
-        EL3WINDOW(dev, 7);
+	/* Switch to register set 7 for normal use. */
+	EL3WINDOW(dev, 7);
 
 	/* Initialize Rx and Tx rings */
 
 	init_rx_ring(dev);
 	purge_tx_ring(dev);
 
- 	ETH_CMD(dev, SetRxFilter | RxStation | RxBroadcast | RxProm);
+	ETH_CMD(dev, SetRxFilter | RxStation | RxBroadcast | RxProm);
 
-        issue_and_wait(dev,SetTxStart|0x07ff);
+	issue_and_wait(dev,SetTxStart|0x07ff);
 
-        /* Below sets which indication bits to be seen. */
+	/* Below sets which indication bits to be seen. */
 
-        status_enable = SetStatusEnb | HostError | DownComplete | UpComplete | (1<<6);
-        ETH_CMD(dev, status_enable);
+	status_enable = SetStatusEnb | HostError | DownComplete | UpComplete | (1<<6);
+	ETH_CMD(dev, status_enable);
 
 	/* Below sets no bits are to cause an interrupt since this is just polling */
 
-        intr_enable   = SetIntrEnb;
-//	intr_enable = SetIntrEnb | (1<<9) | (1<<10) | (1<<6);
-        ETH_CMD(dev, intr_enable);
+	intr_enable   = SetIntrEnb;
+/*	intr_enable = SetIntrEnb | (1<<9) | (1<<10) | (1<<6); */
+	ETH_CMD(dev, intr_enable);
 	ETH_OUTB(dev, 127, UpPoll);
 
-        /* Ack all pending events, and set active indicator mask */
+	/* Ack all pending events, and set active indicator mask */
 
-        ETH_CMD(dev, AckIntr | IntLatch | TxAvailable | RxEarly | IntReq);
-        ETH_CMD(dev, intr_enable);
+	ETH_CMD(dev, AckIntr | IntLatch | TxAvailable | RxEarly | IntReq);
+	ETH_CMD(dev, intr_enable);
 
 	/* Tell the adapter where the RX ring is located */
 
 	issue_and_wait(dev,UpStall);				/* Stall and set the UplistPtr 		*/
 	ETH_OUTL(dev, (u32)&rx_ring[rx_next], UpListPtr);
-        ETH_CMD(dev, RxEnable); 				/* Enable the receiver. 		*/
+	ETH_CMD(dev, RxEnable); 				/* Enable the receiver. 		*/
 	issue_and_wait(dev,UpUnstall);
 
 	/* Send the Individual Address Setup frame */
@@ -612,7 +611,7 @@
 
 	/* Tell the adapter where the TX ring is located */
 
-        ETH_CMD(dev, TxEnable); 				/* Enable transmitter. 			*/
+	ETH_CMD(dev, TxEnable); 				/* Enable transmitter. 			*/
 	issue_and_wait(dev, DownStall);				/* Stall and set the DownListPtr. 	*/
 	ETH_OUTL(dev, (u32)&tx_ring[tx_cur], DownListPtr);
 	issue_and_wait(dev, DownUnstall);
@@ -627,13 +626,13 @@
 	}
 	if (ETH_STATUS(dev) & DownComplete)			/* If DownLoad Complete ACK the bit 	*/
 	{
-        	ETH_CMD(dev, AckIntr | DownComplete);		/* acknowledge the indication bit	*/
- 		issue_and_wait(dev, DownStall);			/* stall and clear DownListPtr 		*/
+		ETH_CMD(dev, AckIntr | DownComplete);		/* acknowledge the indication bit	*/
+		issue_and_wait(dev, DownStall);			/* stall and clear DownListPtr 		*/
 		ETH_OUTL(dev, 0, DownListPtr);
 		issue_and_wait(dev, DownUnstall);
 	}
 	status = 1;
-	    
+
 Done:
 	return status;
 }
@@ -673,8 +672,8 @@
 	}
 	if (ETH_STATUS(dev) & DownComplete)			/* If DownLoad Complete ACK the bit 	*/
 	{
-        	ETH_CMD(dev, AckIntr | DownComplete);		/* acknowledge the indication bit	*/
- 		issue_and_wait(dev, DownStall);			/* stall and clear DownListPtr 		*/
+		ETH_CMD(dev, AckIntr | DownComplete);		/* acknowledge the indication bit	*/
+		issue_and_wait(dev, DownStall);			/* stall and clear DownListPtr 		*/
 		ETH_OUTL(dev, 0, DownListPtr);
 		issue_and_wait(dev, DownUnstall);
 	}
@@ -710,15 +709,15 @@
 	status = le32_to_cpu(rx_ring[rx_next].status);		/* packet status		*/
 
 	while (status & (1<<15))
-	{		
+	{
 		/* A packet has been received */
 
-		if (status & (1<<15))		
+		if (status & (1<<15))
 		{
 			/* A valid frame received  */
-			
+
 			length = le32_to_cpu(rx_ring[rx_next].status) & 0x1fff;		/* length is in bits 0 - 12 	*/
-			
+
 			/* Pass the packet up to the protocol layers */
 
 			NetReceive((uchar *)le32_to_cpu(rx_ring[rx_next].addr), length);
@@ -748,7 +747,7 @@
 
 void eth_3com_halt(struct eth_device* dev)
 {
-	if (!(dev->iobase)) 
+	if (!(dev->iobase))
 	{
 		goto Done;
 	}
@@ -758,14 +757,14 @@
 	issue_and_wait(dev, RxDisable);
 	issue_and_wait(dev, TxDisable);
 
-//	free(tx_ring);				/* release memory allocated to the DPD and UPD rings */
-//	free(rx_ring);
+/*	free(tx_ring);				/###* release memory allocated to the DPD and UPD rings */
+/*	free(rx_ring); */
 
 Done:
 	return;
 }
 
-static void init_rx_ring(struct eth_device* dev) 
+static void init_rx_ring(struct eth_device* dev)
 {
 	int i;
 
@@ -782,7 +781,7 @@
 	rx_next = 0;
 }
 
-static void purge_tx_ring(struct eth_device* dev) 
+static void purge_tx_ring(struct eth_device* dev)
 {
 	int i;
 
@@ -799,39 +798,39 @@
 	}
 }
 
-static void read_hw_addr(struct eth_device* dev, bd_t *bis) 
+static void read_hw_addr(struct eth_device* dev, bd_t *bis)
 {
 	u8 hw_addr[ETH_ALEN];
 	unsigned int eeprom[0x40];
 	unsigned int checksum = 0;
 	int i, j, timer;
 
-        /* Read the station address from the EEPROM. */
+	/* Read the station address from the EEPROM. */
 
-        EL3WINDOW(dev, 0);
+	EL3WINDOW(dev, 0);
 	for (i = 0; i < 0x40; i++)
 	{
-        	ETH_OUTW(dev, EEPROM_Read + i, Wn0EepromCmd);
-                /* Pause for at least 162 us. for the read to take place. */
-                for (timer = 10; timer >= 0; timer--) 
+		ETH_OUTW(dev, EEPROM_Read + i, Wn0EepromCmd);
+		/* Pause for at least 162 us. for the read to take place. */
+		for (timer = 10; timer >= 0; timer--)
 		{
-                	udelay(162);
-                        if ((ETH_INW(dev, Wn0EepromCmd) & 0x8000) == 0)
-                        	break;
-                }
-                eeprom[i] = ETH_INW(dev, Wn0EepromData);
-        }
+			udelay(162);
+			if ((ETH_INW(dev, Wn0EepromCmd) & 0x8000) == 0)
+				break;
+		}
+		eeprom[i] = ETH_INW(dev, Wn0EepromData);
+	}
 
 	/* Checksum calculation.  I'm not sure about this part and there seems to be a bug on the 3com side of things */
 
-        for (i = 0; i < 0x21; i++)
-                checksum  ^= eeprom[i];
-        checksum = (checksum ^ (checksum >> 8)) & 0xff;
+	for (i = 0; i < 0x21; i++)
+		checksum  ^= eeprom[i];
+	checksum = (checksum ^ (checksum >> 8)) & 0xff;
 
-        if (checksum != 0xbb)
-                printf(" *** INVALID EEPROM CHECKSUM %4.4x *** \n", checksum);
+	if (checksum != 0xbb)
+		printf(" *** INVALID EEPROM CHECKSUM %4.4x *** \n", checksum);
 
-        for (i = 0, j = 0; i < 3; i++)
+	for (i = 0, j = 0; i < 3; i++)
 	{
 		hw_addr[j++] = (u8)((eeprom[i+10] >> 8) & 0xff);
 		hw_addr[j++] = (u8)(eeprom[i+10] & 0xff);
@@ -839,9 +838,9 @@
 
 	/*  MAC Address is in window 2, write value from EEPROM to window 2 */
 
-        EL3WINDOW(dev, 2);
-        for (i = 0; i < 6; i++)
-                ETH_OUTB(dev, hw_addr[i], i);
+	EL3WINDOW(dev, 2);
+	for (i = 0; i < 6; i++)
+		ETH_OUTB(dev, hw_addr[i], i);
 
 	for (j = 0; j < ETH_ALEN; j+=2)
 	{
@@ -849,9 +848,9 @@
 		hw_addr[j+1] = (u8)((ETH_INW(dev, j) >> 8) & 0xff);
 	}
 
-	for (i=0;i<ETH_ALEN;i++) 
+	for (i=0;i<ETH_ALEN;i++)
 	{
-		if (hw_addr[i] != bis->bi_enetaddr[i]) 
+		if (hw_addr[i] != bis->bi_enetaddr[i])
 		{
 /* 			printf("Warning: HW address don't match:\n"); */
 /* 			printf("Address in 3Com Window 2 is         " */
@@ -870,9 +869,9 @@
 			bis->bi_enetaddr[4] == 0 && bis->bi_enetaddr[5] == 0)
 		    {
 
-			sprintf(buffer, "%02X:%02X:%02X:%02X:%02X:%02X", 
-				hw_addr[0], hw_addr[1], hw_addr[2], 
-				hw_addr[3], hw_addr[4], hw_addr[5]); 
+			sprintf(buffer, "%02X:%02X:%02X:%02X:%02X:%02X",
+				hw_addr[0], hw_addr[1], hw_addr[2],
+				hw_addr[3], hw_addr[4], hw_addr[5]);
 			setenv("ethaddr", buffer);
 		    }
 		}
@@ -883,4 +882,3 @@
 Done:
 	return;
 }
-

diff --git a/board/MAI/AmigaOneG3SE/flash_new.c b/board/MAI/AmigaOneG3SE/flash_new.c
index 3fb9f12..d46bf46 100644
--- a/board/MAI/AmigaOneG3SE/flash_new.c
+++ b/board/MAI/AmigaOneG3SE/flash_new.c

@@ -27,11 +27,10 @@
 #include <common.h>
 #include <flash.h>
 #include <asm/io.h>
-#include "memio.h" 
+#include "memio.h"
 
 /*---------------------------------------------------------------------*/
 #undef DEBUG_FLASH
-//#define DEBUG_FLASH
 
 #ifdef DEBUG_FLASH
 #define DEBUGF(fmt,args...) printf(fmt ,##args)
@@ -68,7 +67,7 @@
     unsigned char x;
 
     flash_xd_nest --;
-   
+
     if (flash_xd_nest == 0)
     {
 	DEBUGF("Flash on memory bus\n");
@@ -327,7 +326,7 @@
 			/* set sector offsets for uniform sector type	*/
 			for (i = 0; i < info->sector_count; i++) {
 				info->start[i] = base + i * info->size /
-				                            info->sector_count;
+							    info->sector_count;
 			}
 			break;
 		default:
@@ -478,7 +477,7 @@
 		}
 
 		if ((rc = write_word(info, wp, data)) != 0) {
-		        flash_to_mem();
+			flash_to_mem();
 			return (rc);
 		}
 		wp += 4;
@@ -493,7 +492,7 @@
 			data = (data << 8) | *src++;
 		}
 		if ((rc = write_word(info, wp, data)) != 0) {
-		        flash_to_mem();
+			flash_to_mem();
 			return (rc);
 		}
 		wp  += 4;
@@ -582,7 +581,7 @@
  */
 static void flash_reset (ulong addr)
 {
-        flash_to_xd();
+	flash_to_xd();
 	out8(addr, 0xF0);	/* reset bank */
 	iobarrier_rw();
 	flash_to_mem();
@@ -633,10 +632,10 @@
 			info->size / 0x100000, info->sector_count);
 	} else if (info->size % 0x400 == 0) {
 		printf ("  Size: %ld KB in %d Sectors\n",
-		        info->size / 0x400, info->sector_count);
+			info->size / 0x400, info->sector_count);
 	} else {
 		printf ("  Size: %ld B in %d Sectors\n",
-		        info->size, info->sector_count);
+			info->size, info->sector_count);
 	}
 
 	printf ("  Sector Start Addresses:");

diff --git a/board/MAI/AmigaOneG3SE/i8259.c b/board/MAI/AmigaOneG3SE/i8259.c
index 6cdfc60..34f489f 100644
--- a/board/MAI/AmigaOneG3SE/i8259.c
+++ b/board/MAI/AmigaOneG3SE/i8259.c

@@ -75,16 +75,16 @@
 	char dummy;
 	PRINTF("Initializing Interrupt controller\n");
 	/* init master interrupt controller */
-	out8(0x20, 0x11); //0x19); // was: 0x11); /* Start init sequence */
+	out8(0x20, 0x11); /* 0x19); /###* Start init sequence */
 	out8(0x21, 0x00); /* Vector base */
 	out8(0x21, 0x04); /* edge tiggered, Cascade (slave) on IRQ2 */
-	out8(0x21, 0x11); // was: 0x01); /* Select 8086 mode */
+	out8(0x21, 0x11); /* was: 0x01); /###* Select 8086 mode */
 
 	/* init slave interrupt controller */
-	out8(0xA0, 0x11); //0x19); // was: 0x11); /* Start init sequence */
+	out8(0xA0, 0x11); /* 0x19); /###* Start init sequence */
 	out8(0xA1, 0x08); /* Vector base */
 	out8(0xA1, 0x02); /* edge triggered, Cascade (slave) on IRQ2 */
-	out8(0xA1, 0x11); // was: 0x01); /* Select 8086 mode */
+	out8(0xA1, 0x11); /* was: 0x01); /###* Select 8086 mode */
 
 	/* always read ISR */
 	out8(0x20, 0x0B);

diff --git a/board/MAI/AmigaOneG3SE/interrupts.c b/board/MAI/AmigaOneG3SE/interrupts.c
index bb93ea0..5b314a8 100644
--- a/board/MAI/AmigaOneG3SE/interrupts.c
+++ b/board/MAI/AmigaOneG3SE/interrupts.c

@@ -73,7 +73,7 @@
 static __inline__ void
 set_msr(unsigned long msr)
 {
-	asm volatile("mtmsr %0" : : "r" (msr)); 
+	asm volatile("mtmsr %0" : : "r" (msr));
 }
 
 static __inline__ unsigned long
@@ -89,7 +89,7 @@
 static __inline__ void
 set_dec(unsigned long val)
 {
-	asm volatile("mtdec %0" : : "r" (val)); 
+	asm volatile("mtdec %0" : : "r" (val));
 }
 
 
@@ -167,8 +167,8 @@
 
 	int irq, unmask = 1;
 
-	irq = i8259_irq(); //i8259_get_irq(regs);
-//	printf("irq = %d, handler at %p ack=%d\n", irq, irq_handlers[irq].handler, *(volatile unsigned char *)0xFEF00000);
+	irq = i8259_irq(); /*i8259_get_irq(regs); */
+/*	printf("irq = %d, handler at %p ack=%d\n", irq, irq_handlers[irq].handler, *(volatile unsigned char *)0xFEF00000); */
 	i8259_mask_and_ack(irq);
 
 	if (irq_handlers[irq].handler != NULL)
@@ -264,5 +264,3 @@
 {
 	puts("IRQ related functions are unimplemented currently.\n");
 }
-
-

diff --git a/board/MAI/AmigaOneG3SE/macros.h b/board/MAI/AmigaOneG3SE/macros.h
index 0fbe39b..6020d7e 100644
--- a/board/MAI/AmigaOneG3SE/macros.h
+++ b/board/MAI/AmigaOneG3SE/macros.h

@@ -5,20 +5,20 @@
 	/*
 	** Load a long integer into a register
 	*/
-      	.macro liw reg, value
-                lis \reg, \value@h
-                ori \reg, \reg, \value@l
-        .endm
+	.macro liw reg, value
+		lis \reg, \value@h
+		ori \reg, \reg, \value@l
+	.endm
 
 
-	/* 
+	/*
 	** Generate config_addr request
 	** This macro expects the values in registers:
 	** r3 - bus
 	** r4 - devfn
 	** r5 - offset
 	*/
-	.macro config_addr 	
+	.macro config_addr
 		rlwinm	r9, r5, 24, 0, 6
 		rlwinm	r8, r4, 16, 0, 31
 		rlwinm	r7, r3, 8, 0, 31
@@ -31,7 +31,7 @@
 		sync
 	.endm
 
-	
+
 	/*
 	** Generate config_data address
 	*/
@@ -45,40 +45,40 @@
 	/*
 	** Write a byte value to an output port
 	*/
-        .macro outb port, value
-                lis     r2, 0xfe00
-                li      r0, \value
-                stb     r0, \port(r2)
-        .endm
+	.macro outb port, value
+		lis     r2, 0xfe00
+		li      r0, \value
+		stb     r0, \port(r2)
+	.endm
 
 
 	/*
 	** Write a register byte value to an output port
 	*/
-        .macro outbr port, value
-                lis     r2, 0xfe00
-                stb     \value, \port(r2)
-        .endm
+	.macro outbr port, value
+		lis     r2, 0xfe00
+		stb     \value, \port(r2)
+	.endm
 
 
-	/* 
+	/*
 	** Read a byte value from a port into a specified register
 	*/
-        .macro inb reg, port
-                lis     r2, 0xfe00
-                lbz     \reg, \port(r2)
-        .endm
+	.macro inb reg, port
+		lis     r2, 0xfe00
+		lbz     \reg, \port(r2)
+	.endm
 
 
 	/*
 	** Write a byte to the SuperIO config area
 	*/
-        .macro siowb offset, value
-                li      r3, 0
-                li      r4, (7<<3)
-                li      r5, \offset
-                li      r6, \value
-                bl      pci_write_cfg_byte
-        .endm
+	.macro siowb offset, value
+		li      r3, 0
+		li      r4, (7<<3)
+		li      r5, \offset
+		li      r6, \value
+		bl      pci_write_cfg_byte
+	.endm
 
 #endif

diff --git a/board/MAI/AmigaOneG3SE/memio.S b/board/MAI/AmigaOneG3SE/memio.S
index c4a09aa..980d343 100644
--- a/board/MAI/AmigaOneG3SE/memio.S
+++ b/board/MAI/AmigaOneG3SE/memio.S

@@ -1,9 +1,8 @@
 #include	"macros.h"
 
-	
 
 	.globl pci_read_cfg_byte
-	
+
 pci_read_cfg_byte:
 	config_addr
 	config_data	3
@@ -12,11 +11,10 @@
 	lbz	r3, 0(r9)
 	blr
 
-	
 
 	.globl pci_write_cfg_byte
-	
-pci_write_cfg_byte:	
+
+pci_write_cfg_byte:
 	config_addr
 	config_data	3
 	stb	r6, 0(r9)
@@ -25,9 +23,8 @@
 	blr
 
 
-
 	.globl pci_read_cfg_word
-	
+
 pci_read_cfg_word:
 	config_addr
 	config_data	2
@@ -37,9 +34,8 @@
 	blr
 
 
-	
 	.globl pci_write_cfg_word
-	
+
 pci_write_cfg_word:
 	config_addr
 	config_data	2
@@ -48,10 +44,9 @@
 	sync
 	blr
 
-	
 
 	.globl pci_read_cfg_long
-	
+
 pci_read_cfg_long:
 	config_addr
 	config_data	0
@@ -61,9 +56,8 @@
 	blr
 
 
-
 	.globl pci_write_cfg_long
-	
+
 pci_write_cfg_long:
 	config_addr
 	config_data	0
@@ -71,4 +65,3 @@
 	eieio
 	sync
 	blr
-

diff --git a/board/MAI/AmigaOneG3SE/memio.h b/board/MAI/AmigaOneG3SE/memio.h
index df0839f..f5ce303 100644
--- a/board/MAI/AmigaOneG3SE/memio.h
+++ b/board/MAI/AmigaOneG3SE/memio.h

@@ -2,7 +2,7 @@
  * Memory mapped IO
  *
  * (C) Copyright 2002
- * Hyperion Entertainment, ThomasF@hyperion-entertainment.com 
+ * Hyperion Entertainment, ThomasF@hyperion-entertainment.com
  *
  * See file CREDITS for list of people who contributed to this
  * project.
@@ -15,9 +15,9 @@
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.	
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
  *
- */ 
+ */
 
 #ifndef _MEMIO_H
 #define _MEMIO_H
@@ -97,8 +97,8 @@
 
 #define CONFIG_ADDR(bus, devfn, offset) \
     write_long_big((uint32 *)0xFEC00CF8,           \
-                   ((offset & 0xFC)<<24) | (devfn << 16)  \
-                   | (bus<<8) | 0x80);
+		   ((offset & 0xFC)<<24) | (devfn << 16)  \
+		   | (bus<<8) | 0x80);
 #define CONFIG_DATA(offset,mask) ((void *)(0xFEE00CFC+(offset & mask)))
 
 

diff --git a/board/MAI/AmigaOneG3SE/nvram.c b/board/MAI/AmigaOneG3SE/nvram.c
index 5dde15b..d37eec1 100644
--- a/board/MAI/AmigaOneG3SE/nvram.c
+++ b/board/MAI/AmigaOneG3SE/nvram.c

@@ -1,6 +1,6 @@
 /*
  * (C) Copyright 2002
- * Thomas Frieden, Hyperion Entertainment 
+ * Thomas Frieden, Hyperion Entertainment
  * ThomasF@hyperion-entertainment.com
  *
  * See file CREDITS for list of people who contributed to this
@@ -34,4 +34,3 @@
 {
     pci_write_cfg_byte(0, 0, 0x56, 0x0);
 }
-

diff --git a/board/MAI/AmigaOneG3SE/ps2kbd.c b/board/MAI/AmigaOneG3SE/ps2kbd.c
index a6d67be..bfe5eb3 100644
--- a/board/MAI/AmigaOneG3SE/ps2kbd.c
+++ b/board/MAI/AmigaOneG3SE/ps2kbd.c

@@ -1,7 +1,7 @@
 /*
  * (C) Copyright 2002
  * John W. Linville, linville@tuxdriver.com
- * 
+ *
  * Modified from code for support of MIP405 and PIP405 boards.  Previous
  * copyright follows.
  *
@@ -48,7 +48,6 @@
 
 
 #undef KBG_DEBUG
-//#define KBG_DEBUG
 
 #ifdef KBG_DEBUG
 #define	PRINTF(fmt,args...)	printf (fmt ,##args)
@@ -143,8 +142,6 @@
 #define 	KBD_BUFFER_LEN 0x20  /* size of the keyboardbuffer */
 
 
-
-
 static volatile char kbd_buffer[KBD_BUFFER_LEN];
 static volatile int in_pointer = 0;
 static volatile int out_pointer = 0;
@@ -172,7 +169,7 @@
 	 '2', '3', '0', '.',0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,  /* 0x50 - 0x5F */
 	'\r',0xff,0xff
 	};
-	  	  
+
 static unsigned char kbd_shift_xlate[] = {
 	0xff,0x1b, '!', '@', '#', '$', '%', '^', '&', '*', '(', ')', '_', '+','\b','\t',	/* 0x00 - 0x0f */
 	 'Q', 'W', 'E', 'R', 'T', 'Y', 'U', 'I', 'O', 'P', '{', '}','\r',0xff, 'A', 'S',	/* 0x10 - 0x1f */
@@ -194,7 +191,7 @@
 	};
 
 /******************************************************************
- * Init 
+ * Init
  ******************************************************************/
 
 int isa_kbd_init(void)
@@ -252,7 +249,7 @@
 			error=console_assign(stdin,DEVNAME);
 			if(error==0)
 				return 1;
-			else 
+			else
 				return error;
 		}
 		return 1;
@@ -261,7 +258,7 @@
 }
 
 /******************************************************************
- * Queue handling 
+ * Queue handling
  ******************************************************************/
 /* puts character in the queue and sets up the in and out pointer */
 void kbd_put_queue(char data)
@@ -287,7 +284,7 @@
 	if(in_pointer==out_pointer)
 		return(0); /* no data */
 	else
-		return(1);	
+		return(1);
 }
 /* gets the character from the queue */
 int kbd_getc(void)
@@ -295,13 +292,13 @@
 	char c;
 
 	while(in_pointer==out_pointer);
-	if((out_pointer+1)==KBD_BUFFER_LEN) 
+	if((out_pointer+1)==KBD_BUFFER_LEN)
 		out_pointer=0;
 	else
 		out_pointer++;
 	c=kbd_buffer[out_pointer];
 	return (int)c;
-	
+
 }
 
 
@@ -324,7 +321,7 @@
 	kbd_send_data(KBD_CMD_SET_LEDS);
 	kbd_send_data(leds);
 }
-	
+
 
 void handle_keyboard_event(unsigned char scancode)
 {
@@ -381,11 +378,11 @@
 		console_changed = 1;
 	    }
 	    return;
-	case 0x2A: 
+	case 0x2A:
 		case 0x36: /* shift pressed */
 			shift=1;
 			return; /* do nothing else */
-		case 0xAA: 
+		case 0xAA:
 		case 0xB6: /* shift released */
 			shift=0;
 			return; /* do nothing else */
@@ -408,15 +405,15 @@
 		case 0x3A: /* capslock pressed */
 			caps_lock=~caps_lock;
 			kbd_set_leds();
-			return; 
+			return;
 		case 0x45: /* numlock pressed */
 			num_lock=~num_lock;
 			kbd_set_leds();
-			return; 
+			return;
 		case 0xC6: /* scroll lock released */
 		case 0xC5: /* num lock released */
 		case 0xBA: /* caps lock released */
-			return; /* just swallow */ 
+			return; /* just swallow */
 	}
 	if((scancode&0x80)==0x80) /* key released */
 		return;
@@ -456,7 +453,7 @@
 		PRINTF("unkown scancode %X\n",scancode);
 		return; /* swallow unknown codes */
 	}
-	
+
 	kbd_put_queue(keycode);
 	PRINTF("%x\n",keycode);
 }
@@ -494,30 +491,29 @@
 }
 
 
-
 /******************************************************************************
  * Lowlevel Part of keyboard section
- */  
+ */
 unsigned char kbd_read_status(void)
 {
 	return(in8(CFG_ISA_IO_BASE_ADDRESS + KDB_COMMAND_PORT));
-} 
-  
+}
+
 unsigned char kbd_read_input(void)
 {
 	return(in8(CFG_ISA_IO_BASE_ADDRESS + KDB_DATA_PORT));
-} 
+}
 
 void kbd_write_command(unsigned char cmd)
 {
 	out8(CFG_ISA_IO_BASE_ADDRESS + KDB_COMMAND_PORT,cmd);
-} 
-  
+}
+
 void kbd_write_output(unsigned char data)
 {
 	out8(CFG_ISA_IO_BASE_ADDRESS + KDB_DATA_PORT, data);
-} 
- 
+}
+
 int kbd_read_data(void)
 {
 	int val;
@@ -537,7 +533,7 @@
 {
 	unsigned long timeout;
 	int val;
-	
+
 	timeout = KBD_TIMEOUT;
 	val=kbd_read_data();
 	while(val < 0)
@@ -602,7 +598,7 @@
 	 * If the test is successful a x55 is placed in the input buffer.
 	 */
 	kbd_write_command_w(KBD_CCMD_SELF_TEST);
-	if (kbd_wait_for_input() != 0x55) 
+	if (kbd_wait_for_input() != 0x55)
 		return "Kbd:   failed self test";
 	/*
 	 * Perform a keyboard interface test.  This causes the controller
@@ -610,7 +606,7 @@
 	 * test are placed in the input buffer.
 	 */
 	kbd_write_command_w(KBD_CCMD_KBD_TEST);
-	if (kbd_wait_for_input() != 0x00) 
+	if (kbd_wait_for_input() != 0x00)
 		return "Kbd:   interface failed self test";
 	/*
 	 * Enable the keyboard by allowing the keyboard clock to run.
@@ -628,7 +624,7 @@
 	do {
 		kbd_write_output_w(KBD_CMD_RESET);
 		status = kbd_wait_for_input();
-		if (status == KBD_REPLY_ACK) 
+		if (status == KBD_REPLY_ACK)
 			break;
 		if (status != KBD_REPLY_RESEND)
 		{
@@ -692,8 +688,3 @@
 {
 	handle_kbd_event();
 }
-
-
-
-/* eof */
-

diff --git a/board/MAI/AmigaOneG3SE/ps2kbd.h b/board/MAI/AmigaOneG3SE/ps2kbd.h
index 95fc14d..fc5c422 100644
--- a/board/MAI/AmigaOneG3SE/ps2kbd.h
+++ b/board/MAI/AmigaOneG3SE/ps2kbd.h

@@ -1,7 +1,7 @@
 /*
  * (C) Copyright 2002
  * John W. Linville, linville@tuxdriver.com
- * 
+ *
  * Modified from code for support of MIP405 and PIP405 boards.  Previous
  * copyright follows.
  *
@@ -30,7 +30,7 @@
 
 #ifndef _KBD_H_
 #define _KBD_H_
-   
+
 extern int kbd_testc(void);
 extern int kbd_getc(void);
 extern void kbd_interrupt(void);

diff --git a/board/MAI/AmigaOneG3SE/short_types.h b/board/MAI/AmigaOneG3SE/short_types.h
index 22df3c9..1840d28 100644
--- a/board/MAI/AmigaOneG3SE/short_types.h
+++ b/board/MAI/AmigaOneG3SE/short_types.h

@@ -2,7 +2,7 @@
  * short type names
  *
  * (C) Copyright 2002
- * Hyperion Entertainment, ThomasF@hyperion-entertainment.com 
+ * Hyperion Entertainment, ThomasF@hyperion-entertainment.com
  *
  * See file CREDITS for list of people who contributed to this
  * project.

diff --git a/board/MAI/AmigaOneG3SE/smbus.c b/board/MAI/AmigaOneG3SE/smbus.c
index 616005e..de13977 100644
--- a/board/MAI/AmigaOneG3SE/smbus.c
+++ b/board/MAI/AmigaOneG3SE/smbus.c

@@ -26,18 +26,18 @@
 {
     int i;
     int level;
-    
+
     out_byte(0xA539, 0x00);
 
     level = 0;
 
     for (i=0; i<8; i++)
     {
-	if ((writeme & 0x80) == (level<<7)) 
-        {
+	if ((writeme & 0x80) == (level<<7))
+	{
 	    /* Bit did not change, rewrite strobe */
 	    out_byte(0xA539, level | 0x02);
-	    out_byte(0xA539, level); 
+	    out_byte(0xA539, level);
 	}
 	else
 	{
@@ -68,7 +68,7 @@
     }
 
     return retme;
-} 
+}
 
 int sm_get_ack(void)
 {
@@ -106,36 +106,36 @@
 
 int sm_read_byte_from_device(uint8 addr, uint8 reg, uint8 *storage)
 {
-    // S Addr Wr
+    /* S Addr Wr */
     sm_write_mode();
     sm_send_start();
     sm_write_byte((addr<<1));
-    
-    // [A]
+
+    /* [A] */
     sm_read_mode();
     if (sm_get_ack() == FALSE) return FALSE;
 
-    // Comm
+    /* Comm */
     sm_write_mode();
     sm_write_byte(reg);
-    
-    // [A]
+
+    /* [A] */
     sm_read_mode();
     if (sm_get_ack() == FALSE) return FALSE;
 
-    // S Addr Rd
+    /* S Addr Rd */
     sm_write_mode();
     sm_send_start();
     sm_write_byte((addr<<1)|1);
-    
-    // [A]
+
+    /* [A] */
     sm_read_mode();
     if (sm_get_ack() == FALSE) return FALSE;
 
-    // [Data]
+    /* [Data] */
     *storage = sm_read_byte();
-    
-    // NA
+
+    /* NA */
     sm_write_mode();
     sm_write_nack();
     sm_send_stop();
@@ -144,10 +144,10 @@
 }
 
 void sm_init(void)
-{  
+{
     /* Switch to PMC mode */
     pci_write_cfg_byte(0, 0, REG_GROUP, (uint8)(REG_GROUP_SPECIAL|REG_GROUP_POWER));
- 
+
     /* Set GPIO Base */
     pci_write_cfg_long(0, 0, 0x40, 0xa500);
 
@@ -155,12 +155,12 @@
     pci_write_cfg_byte(0, 0, 0x44, 0x11);
 
     /* Set both GPIO 0 and 1 as output */
-    out_byte(0xA53A, 0x03); 
+    out_byte(0xA53A, 0x03);
 }
 
 
 void sm_term(void)
-{  
+{
     /* Switch to normal mode */
     pci_write_cfg_byte(0, 0, REG_GROUP, 0);
 }
@@ -173,7 +173,7 @@
 #if 0
     /* Switch to PMC mode */
     pci_write_cfg_byte(0, 0, REG_GROUP, (uint8)(REG_GROUP_SPECIAL|REG_GROUP_POWER));
- 
+
     /* Set GPIO Base */
     pci_write_cfg_long(0, 0, 0x40, 0xa500);
 
@@ -181,7 +181,7 @@
     pci_write_cfg_byte(0, 0, 0x44, 0x11);
 
     /* Set both GPIO 0 and 1 as output */
-    out_byte(0xA53A, 0x03); 
+    out_byte(0xA53A, 0x03);
 #endif
 
     sm_init();

diff --git a/board/MAI/AmigaOneG3SE/start.txt b/board/MAI/AmigaOneG3SE/start.txt
index 5c7b541..e421462 100644
--- a/board/MAI/AmigaOneG3SE/start.txt
+++ b/board/MAI/AmigaOneG3SE/start.txt

@@ -1,201 +1,198 @@
-

-	/*------------------------------------------------------*/

-        /*              TERON Articia / SDRAM Init              */

-        /*------------------------------------------------------*/

-

-*       XD_CTL  = 0x81000000			(0x74)

-

-*       HBUS_ACC_CTL_0 &= 0xFFFFFDFF		(0x5c)

-                       /* host bus access ctl reg 2(5e) */

-                       /* set - CPU read from memory data one clock after data is latched */

-

-*       GLOBL_INFO_0 |= 0x00004000		(0x50)

-                      /* global info register 2 (52), AGP/PCI bus 1 arbiter is addressed in Articia S */

-

-        PCI_1_SB_CONFIG_0 |= 0x00000400         (0x80d0)

-                        /* PCI1 side band config reg 2 (d2), enable read acces while write buffer not empty */

-

-        MEM_RAS_CTL_0 |= 0x3f000000		(0xcc)

-		      &= 0x3fffffff

-                      /* RAS park control reg 0(cc), park access enable is set */

-		      

-        HOST_RDBUF_CTL |= 0x10000000		(0x70)

-	               &= 0x10ffffff

-                      /* host read buffer control reg, enable prefetch for CPU read from DRAM control */

-

-        HBUS_ACC_CTL_0 |= 0x0100001f		(0x5c)

-		       &= 0xf1ffffff

-                      /* host bus access control register, enable CPU address bus pipe control	*/

-                      /* two outstanding requests,  *** changed to 2 from 3				*/

-                      /* enable line merge write control for CPU write to system memory, PCI 1	*/

-                      /* and PCI 0 bus memory; enable page merge write control for write to		*/

-                      /* PCI bus 0 & bus 1 memory							*/

-

-        SRAM_CTL |= 0x00004000			(0xc8)

-		 &= 0xffbff7ff

-                      /* DRAM detail timing control register 1 (ca), bit 3 set to 0	*/

-                      /* DRAM start access latency control - wait for one clock	*/

-                      /* ff9f changed to ffbf						*/

-    

-        DIM0_TIM_CTL_0 = 0x737d737d             (0xc9)

-                      /* DRAM timing control for dimm0 & dimm1; set wait one clock	*/

-                      /* cycle for next data access 					*/

-

-        DIM2_TIM_CTL_0 = 0x737d737d             (0xca)

-                      /* DRAM timing control for dimm2 & dimm3; set wait one clock	*/

-                      /* cycle for next data access 					*/

-

-        DIM0_BNK0_CTL_0 = BNK0_RAM_SIZ_128MB    (0x90)

-	              /* set dimm0 bank0 for 128 MB	*/

-

-        DIM0_BNK1_CTL_0 = BNK1_RAM_SIZ_128MB    (0x94)

-                      /* set dimm0 for  bank1		*/

-

-        DIM0_TIM_CTL_0 = 0xf3bf0000             (0xc9)

-                      /* dimm0 timing control register; RAS - CAS latency - 4 clock		*/

-                      /* CAS access latency - 3 wait; pre-charge latency - 3 wait		*/

-                      /* pre-charge command period control - 5 clock; wait one clock		*/

-                      /* cycle for next data access; read to write access latency control	*/

-                      /* - 2 clock cycles							*/

-

-        DRAM_GBL_CTL_0 |= 0x00000100            (0xc0)

-		       &= 0xffff01ff

-                      /* memory global control register - support buffer sdram on bank 0	*/

-

-        DRAM_ECC_CTL_0 |= 0x00260000		(0xc4)

-		       &= 0xff26ffff

-                      /* enable ECC; enable read, modify, write control	*/

- 

-        DRAM_REF_CTL_0 = DRAM_REF_DATA          (0xb8)

-		      /* set DRAM refresh parameters *** changed to 00940100	*/

-

-        nop

-        nop

-        nop

-        nop

-        nop

-

-        DRAM_ECC_CTL_0 |= 0x20243280		(0xc4)

-                      /* turn off ecc		*/

-                      /* for SDRAM bank 0	*/

-

-        DRAM_ECC_CTL_0 |= 0x20243290            (0xc4) ?

-                      /* for SDRAM bank 1	*/

- 

-

-/* Additional Stuff...*/

-

-        GLOBL_CTRL |= 0x20000b00		(0x54)

-

-        PCI_0_SB_CONFIG |= 0x04100007		(0xd0)

-                      /* PCI 0 Side band config reg*/

-

-        0x8000083c |= 0x00080000

-                      /* Disable VGA decode on PCI Bus 1 */

-

-

-/*End Additional Stuff..*/

-

-        /*--------------------------------------------------------------*/

-        /*              TERON serial port initialization code           */

-        /*--------------------------------------------------------------*/

-

-	0x84380080 |= 0x00030000

-                     /* enable super IO configuration VIA chip Register 85	*/

-		     /* Enable super I/O config mode */

-

-        0xfe0003f0 = 0xe2

-        bl delay1

-

-        0xfe0003f1 = 0x0f

-	bl delay1

-	            /* enable com1 & com2, parallel port disabled */ 

-	

-	0xfe0003f0 = 0xe7

-        bl delay1

-	            /* let's make com1 base as 0x3f8 */

-        

-        0xfe0003f1 = 0xfe

-        bl delay1

-

-        0xfe0003f0 = 0xe8

-        bl delay1           

-		    /* let's make com2 base as 0x2f8 */

-

-	0xfe0003f1 = 0xbe

-

-	0x84380080 &= 0xfffdffff

-                    /* closing super IO configuration VIA chip Register 85   */

-     

-

-/* -------------------------------*/

-

-        0xfe0003fb = 0x83

-	bl delay1

-                   /*latch enable word length -8 bit */         /* set mslab bit	*/

-        0xfe0003f8 = 0x0c

-	bl delay1

-                   /* set baud rate lsb for 9600 baud	*/

-        0xfe0003f9 = 0x0

-	bl delay1

-                   /* set baud rate msb for 9600 baud	*/

-        0xfe0003fb  = 0x03

-	bl delay1

-                      /* reset mslab	*/

-

-	/*--------------------------------------------------------------*/

-        /*              END TERON Serial Port Initialization Code       */

-        /*--------------------------------------------------------------*/

-

-   

-

-        /*--------------------------------------------------------------*/

-        /*      END TERON Articia / SDRAM Initialization code           */

-        /*--------------------------------------------------------------*/

-

-Proposed from Documentation:

-

-write dmem 0xfec00cf8 0x50000080

-write dmem 0xfee00cfc 0xc0305411

-

-      Writes to index 0x50-0x53. 

-      0x50: Global Information Register 0

-	    0xC0 = Little Endian CPU, Sequential order Burst

-      0x51: Global Information Register 1

-	    Read only, 0x30 = Provides PowerPC and X86 support

-      0x52: Global Information Register 2

-	    0x05 = 64/128 bit CPU bus support

-      0x53: Global Information Register 3

-	    0x80 = PCI Bus 0 grant active time is 1 clock after REQ# deasserted

-

-write dmem 0xfec00cf8 0x5c000080

-write dmem 0xfee00cfc 0xb300011F

-

-write dmem 0xfec00cf8 0xc8000080

-write dmem 0xfee00cfc 0x0020f100

-

-write dmem 0xfec00cf8 0x90000080

-write dmem 0xfee00cfc 0x007fe700

-

-write dmem 0xfec00cf8 0x9400080

-write dmem 0xfee00cfc 0x007fe700

-

-write dmem 0xfec00cf8 0xb0000080

-write dmem 0xfee00cfc 0x737d737d

-

-write dmem 0xfec00cf8 0xb4000080

-write dmem 0xfee00cfc 0x737d737d

-

-write dmem 0xfec00cf8 0xc0000080

-write dmem 0xfee00cfc 0x40005500

-

-write dmem 0xfec00cf8 0xb8000080

-write dmem 0xfee00cfc 0x00940100

-

-write dmem 0xfec00cf8 0xc4000080

-write dmem 0xfee00cfc 0x00003280

-

-write dmem 0xfec00cf8 0xc4000080

-write dmem 0xfee00cfc 0x00003290

-

-

+
+	/*------------------------------------------------------*/
+	/*              TERON Articia / SDRAM Init              */
+	/*------------------------------------------------------*/
+
+*       XD_CTL  = 0x81000000			(0x74)
+
+*       HBUS_ACC_CTL_0 &= 0xFFFFFDFF		(0x5c)
+		       /* host bus access ctl reg 2(5e) */
+		       /* set - CPU read from memory data one clock after data is latched */
+
+*       GLOBL_INFO_0 |= 0x00004000		(0x50)
+		      /* global info register 2 (52), AGP/PCI bus 1 arbiter is addressed in Articia S */
+
+	PCI_1_SB_CONFIG_0 |= 0x00000400         (0x80d0)
+			/* PCI1 side band config reg 2 (d2), enable read acces while write buffer not empty */
+
+	MEM_RAS_CTL_0 |= 0x3f000000		(0xcc)
+		      &= 0x3fffffff
+		      /* RAS park control reg 0(cc), park access enable is set */
+
+	HOST_RDBUF_CTL |= 0x10000000		(0x70)
+		       &= 0x10ffffff
+		      /* host read buffer control reg, enable prefetch for CPU read from DRAM control */
+
+	HBUS_ACC_CTL_0 |= 0x0100001f		(0x5c)
+		       &= 0xf1ffffff
+		      /* host bus access control register, enable CPU address bus pipe control	*/
+		      /* two outstanding requests,  *** changed to 2 from 3				*/
+		      /* enable line merge write control for CPU write to system memory, PCI 1	*/
+		      /* and PCI 0 bus memory; enable page merge write control for write to		*/
+		      /* PCI bus 0 & bus 1 memory							*/
+
+	SRAM_CTL |= 0x00004000			(0xc8)
+		 &= 0xffbff7ff
+		      /* DRAM detail timing control register 1 (ca), bit 3 set to 0	*/
+		      /* DRAM start access latency control - wait for one clock	*/
+		      /* ff9f changed to ffbf						*/
+
+	DIM0_TIM_CTL_0 = 0x737d737d             (0xc9)
+		      /* DRAM timing control for dimm0 & dimm1; set wait one clock	*/
+		      /* cycle for next data access 					*/
+
+	DIM2_TIM_CTL_0 = 0x737d737d             (0xca)
+		      /* DRAM timing control for dimm2 & dimm3; set wait one clock	*/
+		      /* cycle for next data access 					*/
+
+	DIM0_BNK0_CTL_0 = BNK0_RAM_SIZ_128MB    (0x90)
+		      /* set dimm0 bank0 for 128 MB	*/
+
+	DIM0_BNK1_CTL_0 = BNK1_RAM_SIZ_128MB    (0x94)
+		      /* set dimm0 for  bank1		*/
+
+	DIM0_TIM_CTL_0 = 0xf3bf0000             (0xc9)
+		      /* dimm0 timing control register; RAS - CAS latency - 4 clock		*/
+		      /* CAS access latency - 3 wait; pre-charge latency - 3 wait		*/
+		      /* pre-charge command period control - 5 clock; wait one clock		*/
+		      /* cycle for next data access; read to write access latency control	*/
+		      /* - 2 clock cycles							*/
+
+	DRAM_GBL_CTL_0 |= 0x00000100            (0xc0)
+		       &= 0xffff01ff
+		      /* memory global control register - support buffer sdram on bank 0	*/
+
+	DRAM_ECC_CTL_0 |= 0x00260000		(0xc4)
+		       &= 0xff26ffff
+		      /* enable ECC; enable read, modify, write control	*/
+
+	DRAM_REF_CTL_0 = DRAM_REF_DATA          (0xb8)
+		      /* set DRAM refresh parameters *** changed to 00940100	*/
+
+	nop
+	nop
+	nop
+	nop
+	nop
+
+	DRAM_ECC_CTL_0 |= 0x20243280		(0xc4)
+		      /* turn off ecc		*/
+		      /* for SDRAM bank 0	*/
+
+	DRAM_ECC_CTL_0 |= 0x20243290            (0xc4) ?
+		      /* for SDRAM bank 1	*/
+
+
+/* Additional Stuff...*/
+
+	GLOBL_CTRL |= 0x20000b00		(0x54)
+
+	PCI_0_SB_CONFIG |= 0x04100007		(0xd0)
+		      /* PCI 0 Side band config reg*/
+
+	0x8000083c |= 0x00080000
+		      /* Disable VGA decode on PCI Bus 1 */
+
+
+/*End Additional Stuff..*/
+
+	/*--------------------------------------------------------------*/
+	/*              TERON serial port initialization code           */
+	/*--------------------------------------------------------------*/
+
+	0x84380080 |= 0x00030000
+		     /* enable super IO configuration VIA chip Register 85	*/
+		     /* Enable super I/O config mode */
+
+	0xfe0003f0 = 0xe2
+	bl delay1
+
+	0xfe0003f1 = 0x0f
+	bl delay1
+		    /* enable com1 & com2, parallel port disabled */
+
+	0xfe0003f0 = 0xe7
+	bl delay1
+		    /* let's make com1 base as 0x3f8 */
+
+	0xfe0003f1 = 0xfe
+	bl delay1
+
+	0xfe0003f0 = 0xe8
+	bl delay1
+		    /* let's make com2 base as 0x2f8 */
+
+	0xfe0003f1 = 0xbe
+
+	0x84380080 &= 0xfffdffff
+		    /* closing super IO configuration VIA chip Register 85   */
+
+
+/* -------------------------------*/
+
+	0xfe0003fb = 0x83
+	bl delay1
+		   /*latch enable word length -8 bit */         /* set mslab bit	*/
+	0xfe0003f8 = 0x0c
+	bl delay1
+		   /* set baud rate lsb for 9600 baud	*/
+	0xfe0003f9 = 0x0
+	bl delay1
+		   /* set baud rate msb for 9600 baud	*/
+	0xfe0003fb  = 0x03
+	bl delay1
+		      /* reset mslab	*/
+
+	/*--------------------------------------------------------------*/
+	/*              END TERON Serial Port Initialization Code       */
+	/*--------------------------------------------------------------*/
+
+
+	/*--------------------------------------------------------------*/
+	/*      END TERON Articia / SDRAM Initialization code           */
+	/*--------------------------------------------------------------*/
+
+Proposed from Documentation:
+
+write dmem 0xfec00cf8 0x50000080
+write dmem 0xfee00cfc 0xc0305411
+
+      Writes to index 0x50-0x53.
+      0x50: Global Information Register 0
+	    0xC0 = Little Endian CPU, Sequential order Burst
+      0x51: Global Information Register 1
+	    Read only, 0x30 = Provides PowerPC and X86 support
+      0x52: Global Information Register 2
+	    0x05 = 64/128 bit CPU bus support
+      0x53: Global Information Register 3
+	    0x80 = PCI Bus 0 grant active time is 1 clock after REQ# deasserted
+
+write dmem 0xfec00cf8 0x5c000080
+write dmem 0xfee00cfc 0xb300011F
+
+write dmem 0xfec00cf8 0xc8000080
+write dmem 0xfee00cfc 0x0020f100
+
+write dmem 0xfec00cf8 0x90000080
+write dmem 0xfee00cfc 0x007fe700
+
+write dmem 0xfec00cf8 0x9400080
+write dmem 0xfee00cfc 0x007fe700
+
+write dmem 0xfec00cf8 0xb0000080
+write dmem 0xfee00cfc 0x737d737d
+
+write dmem 0xfec00cf8 0xb4000080
+write dmem 0xfee00cfc 0x737d737d
+
+write dmem 0xfec00cf8 0xc0000080
+write dmem 0xfee00cfc 0x40005500
+
+write dmem 0xfec00cf8 0xb8000080
+write dmem 0xfee00cfc 0x00940100
+
+write dmem 0xfec00cf8 0xc4000080
+write dmem 0xfee00cfc 0x00003280
+
+write dmem 0xfec00cf8 0xc4000080
+write dmem 0xfee00cfc 0x00003290

diff --git a/board/MAI/AmigaOneG3SE/u-boot.lds b/board/MAI/AmigaOneG3SE/u-boot.lds
index 10c0c3d..2281d35 100644
--- a/board/MAI/AmigaOneG3SE/u-boot.lds
+++ b/board/MAI/AmigaOneG3SE/u-boot.lds

@@ -63,7 +63,7 @@
     cpu/74xx_7xx/start.o	(.text)
 /* store the environment in a seperate sector in the boot flash */
 /*    . = env_offset; */
-    common/environment.o(.text) 
+    common/environment.o(.text)
 
     *(.text)
     *(.fixup)
@@ -87,7 +87,7 @@
   PROVIDE (erotext = .);
   .reloc   :
   {
-    *(.got) 
+    *(.got)
     _GOT2_TABLE_ = .;
     *(.got2)
     _FIXUP_TABLE_ = .;
@@ -108,6 +108,11 @@
   _edata  =  .;
   PROVIDE (edata = .);
 
+  __u_boot_cmd_start = .;
+  .u_boot_cmd : { *(.u_boot_cmd) }
+  __u_boot_cmd_end = .;
+
+
   __start___ex_table = .;
   __ex_table : { *(__ex_table) }
   __stop___ex_table = .;

diff --git a/board/MAI/AmigaOneG3SE/usb_uhci.c b/board/MAI/AmigaOneG3SE/usb_uhci.c
index fd8cb4e..14e8043 100644
--- a/board/MAI/AmigaOneG3SE/usb_uhci.c
+++ b/board/MAI/AmigaOneG3SE/usb_uhci.c

@@ -83,7 +83,7 @@
 #define USB_MAX_TEMP_INT_TD  32   /* number of temporary TDs for Interrupt transfers */
 
 
-//#define USB_UHCI_DEBUG
+/*#define USB_UHCI_DEBUG */
 
 #ifdef	USB_UHCI_DEBUG
 #define	USB_UHCI_PRINTF(fmt,args...)	printf (fmt ,##args)
@@ -599,7 +599,7 @@
 		printf("Error USB UHCI (%04X,%04X) not found\n",USB_UHCI_VEND_ID,USB_UHCI_DEV_ID);
 		return -1;
 	}
-	
+
 #if 1
 	s = getenv("usb_irq");
 	if (s)
@@ -1115,7 +1115,6 @@
 #endif
 
 
-
 #ifdef	USB_UHCI_DEBUG
 
 static int usb_display_td(uhci_td_t *td)

diff --git a/board/MAI/AmigaOneG3SE/usb_uhci.h b/board/MAI/AmigaOneG3SE/usb_uhci.h
index 7fda60b..3387157 100644
--- a/board/MAI/AmigaOneG3SE/usb_uhci.h
+++ b/board/MAI/AmigaOneG3SE/usb_uhci.h

@@ -190,5 +190,3 @@
 
 
 #endif /* _USB_UHCI_H_ */
-
-

diff --git a/board/MAI/AmigaOneG3SE/via686.c b/board/MAI/AmigaOneG3SE/via686.c
index 0483ca9..c797e47 100644
--- a/board/MAI/AmigaOneG3SE/via686.c
+++ b/board/MAI/AmigaOneG3SE/via686.c

@@ -211,18 +211,18 @@
 
 __asm         ("    .globl via_calibrate_time_base \n"
 	       "via_calibrate_time_base: 	   \n"
-               "   lis     9, 0xfe00		   \n"
-               "   li      0, 0x00		   \n"
+	       "   lis     9, 0xfe00		   \n"
+	       "   li      0, 0x00		   \n"
 	       "   mttbu   0			   \n"
 	       "   mttbl   0			   \n"
 	       "ctb_loop:			   \n"
-               "   lbz     0, 0x61(9)		   \n"
-               "   eieio			   \n"
-               "   andi.   0, 0, 0x20		   \n"
-               "   beq     ctb_loop		   \n"
-               "ctb_done:			   \n"
-               "   mftb    3			   \n"
-               "   blr");
+	       "   lbz     0, 0x61(9)		   \n"
+	       "   eieio			   \n"
+	       "   andi.   0, 0, 0x20		   \n"
+	       "   beq     ctb_loop		   \n"
+	       "ctb_done:			   \n"
+	       "   mftb    3			   \n"
+	       "   blr");
 
 extern unsigned long via_calibrate_time_base(void);
 

diff --git a/board/MAI/AmigaOneG3SE/video.c b/board/MAI/AmigaOneG3SE/video.c
index e80288b..36e3c62 100644
--- a/board/MAI/AmigaOneG3SE/video.c
+++ b/board/MAI/AmigaOneG3SE/video.c

@@ -1,6 +1,6 @@
 /*
  * (C) Copyright 2002
- * Hyperion Entertainment, Hans-JoergF@hyperion-entertainment.com 
+ * Hyperion Entertainment, Hans-JoergF@hyperion-entertainment.com
  *
  * See file CREDITS for list of people who contributed to this
  * project.
@@ -100,7 +100,7 @@
     video_inited = 1;
     video_init();
     memset (&vgadev, 0, sizeof(vgadev));
-    
+
     strcpy(vgadev.name, VIDEO_NAME);
     vgadev.flags =  DEV_FLAGS_OUTPUT | DEV_FLAGS_SYSTEM;
     vgadev.putc = video_putc;
@@ -108,7 +108,7 @@
     vgadev.getc = NULL;
     vgadev.tstc = NULL;
     vgadev.start = video_start;
-    
+
     error = device_register (&vgadev);
 
     if (error == 0)
@@ -129,11 +129,11 @@
 
 int video_init(void)
 {
-    cursor_position = VIDEO_BASE; // Color text display base
+    cursor_position = VIDEO_BASE; /* Color text display base */
     cursor_row = 0;
     cursor_col = 0;
-    current_attr = video_get_attr(); // Currently selected value for attribute.
-//    video_test();
+    current_attr = video_get_attr(); /* Currently selected value for attribute. */
+/*    video_test(); */
     video_set_color(current_attr);
 
     return 0;
@@ -283,7 +283,7 @@
 
 void video_draw_box(int style, int attr, char *title, int separate, int x, int y, int w, int h)
 {
-    unsigned char *fb, *fb2; 
+    unsigned char *fb, *fb2;
     unsigned char *st = (style == SINGLE_BOX)?video_single_box : video_double_box;
     unsigned char *ti = (style == SINGLE_BOX)?video_single_title : video_double_title;
     int i;
@@ -324,11 +324,11 @@
 	*fb = st[3];
 	*(fb+1) = attr; fb += 2*VIDEO_COLS;
 
-	*fb2 = st[4]; 
+	*fb2 = st[4];
 	*(fb2+1) = attr; fb2 += 2*VIDEO_COLS;
     }
-    
-    // Draw title
+
+    /* Draw title */
     if (title)
     {
 	if (separate == 0)
@@ -370,7 +370,7 @@
 		fb += 2;
 	    }
 	    fb = video_addr(x+2, y+1);
-	    
+
 	    while (*title)
 	    {
 		*fb = *title;
@@ -414,7 +414,7 @@
 }
 
 void video_restore_rect(int x, int y, int w, int h, void *save_area)
-{   
+{
     unsigned char *save = (unsigned char *)save_area;
     unsigned char *fb = video_addr(x,y);
     int i,j;
@@ -484,7 +484,7 @@
     int i;
     char *s;
     int maxdev;
-    
+
 
     if (video_inited == 0) return;
 #ifdef EASTEREGG

diff --git a/board/MAI/bios_emulator/bios.c b/board/MAI/bios_emulator/bios.c
index 4707bd9..d51eb64 100644
--- a/board/MAI/bios_emulator/bios.c
+++ b/board/MAI/bios_emulator/bios.c

@@ -130,14 +130,14 @@
 
     switch(M.x86.R_AX)
     {
-    case 0xB101: // PCI Bios Present?
+    case 0xB101: /* PCI Bios Present? */
 	M.x86.R_AL  = 0x00;
 	M.x86.R_EDX = 0x20494350;
 	M.x86.R_BX  = 0x0210;
 	M.x86.R_CL  = 3;
 	CLEAR_FLAG(F_CF);
 	break;
-    case 0xB102: // Find device
+    case 0xB102: /* Find device */
 	device = mypci_find_device(M.x86.R_DX, M.x86.R_CX, M.x86.R_SI);
 	if (device != -1)
 	{
@@ -151,52 +151,52 @@
 	}
 	CONDITIONAL_SET_FLAG((M.x86.R_AH != PCIBIOS_SUCCESSFUL), F_CF);
 	break;
-    case 0xB103: // Find PCI class code
+    case 0xB103: /* Find PCI class code */
 	M.x86.R_AH = PCIBIOS_DEVICE_NOT_FOUND;
-	//printf("Find by class not yet implmented");
+	/*printf("Find by class not yet implmented"); */
 	CONDITIONAL_SET_FLAG((M.x86.R_AH != PCIBIOS_SUCCESSFUL), F_CF);
 	break;
-    case 0xB108: // read config byte
+    case 0xB108: /* read config byte */
 	M.x86.R_CL = mypci_read_cfg_byte(M.x86.R_BH, M.x86.R_BL, M.x86.R_DI);
 	M.x86.R_AH = PCIBIOS_SUCCESSFUL;
 	CONDITIONAL_SET_FLAG((M.x86.R_AH != PCIBIOS_SUCCESSFUL), F_CF);
-	//printf("read_config_byte %x,%x,%x -> %x\n", M.x86.R_BH, M.x86.R_BL, M.x86.R_DI,
-	//	    M.x86.R_CL);
+	/*printf("read_config_byte %x,%x,%x -> %x\n", M.x86.R_BH, M.x86.R_BL, M.x86.R_DI, */
+	/*	    M.x86.R_CL); */
 	break;
-    case 0xB109: // read config word
+    case 0xB109: /* read config word */
 	M.x86.R_CX = mypci_read_cfg_word(M.x86.R_BH, M.x86.R_BL, M.x86.R_DI);
 	M.x86.R_AH = PCIBIOS_SUCCESSFUL;
 	CONDITIONAL_SET_FLAG((M.x86.R_AH != PCIBIOS_SUCCESSFUL), F_CF);
-	//printf("read_config_word %x,%x,%x -> %x\n", M.x86.R_BH, M.x86.R_BL, M.x86.R_DI,
-	//	    M.x86.R_CX);
+	/*printf("read_config_word %x,%x,%x -> %x\n", M.x86.R_BH, M.x86.R_BL, M.x86.R_DI, */
+	/*	    M.x86.R_CX); */
 	break;
-    case 0xB10A: // read config dword
+    case 0xB10A: /* read config dword */
 	M.x86.R_ECX = mypci_read_cfg_long(M.x86.R_BH, M.x86.R_BL, M.x86.R_DI);
 	M.x86.R_AH = PCIBIOS_SUCCESSFUL;
 	CONDITIONAL_SET_FLAG((M.x86.R_AH != PCIBIOS_SUCCESSFUL), F_CF);
-	//printf("read_config_long %x,%x,%x -> %x\n", M.x86.R_BH, M.x86.R_BL, M.x86.R_DI,
-	//    M.x86.R_ECX);
+	/*printf("read_config_long %x,%x,%x -> %x\n", M.x86.R_BH, M.x86.R_BL, M.x86.R_DI, */
+	/*    M.x86.R_ECX); */
 	break;
-    case 0xB10B: // write config byte
+    case 0xB10B: /* write config byte */
 	mypci_write_cfg_byte(M.x86.R_BH, M.x86.R_BL, M.x86.R_DI, M.x86.R_CL);
 	M.x86.R_AH = PCIBIOS_SUCCESSFUL;
 	CONDITIONAL_SET_FLAG((M.x86.R_AH != PCIBIOS_SUCCESSFUL), F_CF);
-	//printf("write_config_byte %x,%x,%x <- %x\n", M.x86.R_BH, M.x86.R_BL, M.x86.R_DI,
-	//    M.x86.R_CL);
+	/*printf("write_config_byte %x,%x,%x <- %x\n", M.x86.R_BH, M.x86.R_BL, M.x86.R_DI, */
+	/*    M.x86.R_CL); */
 	break;
-    case 0xB10C: // write config word
+    case 0xB10C: /* write config word */
 	mypci_write_cfg_word(M.x86.R_BH, M.x86.R_BL, M.x86.R_DI, M.x86.R_CX);
 	M.x86.R_AH = PCIBIOS_SUCCESSFUL;
 	CONDITIONAL_SET_FLAG((M.x86.R_AH != PCIBIOS_SUCCESSFUL), F_CF);
-	//printf("write_config_word %x,%x,%x <- %x\n", M.x86.R_BH, M.x86.R_BL, M.x86.R_DI,
-	//	    M.x86.R_CX);
+	/*printf("write_config_word %x,%x,%x <- %x\n", M.x86.R_BH, M.x86.R_BL, M.x86.R_DI, */
+	/*	    M.x86.R_CX); */
 	break;
-    case 0xB10D: // write config dword
+    case 0xB10D: /* write config dword */
 	mypci_write_cfg_long(M.x86.R_BH, M.x86.R_BL, M.x86.R_DI, M.x86.R_ECX);
 	M.x86.R_AH = PCIBIOS_SUCCESSFUL;
 	CONDITIONAL_SET_FLAG((M.x86.R_AH != PCIBIOS_SUCCESSFUL), F_CF);
-	//printf("write_config_long %x,%x,%x <- %x\n", M.x86.R_BH, M.x86.R_BL, M.x86.R_DI,
-	//	    M.x86.R_ECX);
+	/*printf("write_config_long %x,%x,%x <- %x\n", M.x86.R_BH, M.x86.R_BL, M.x86.R_DI, */
+	/*	    M.x86.R_ECX); */
 	break;
     default:
 	PRINTF("BIOS int %xh: Unknown function AX=%04xh\n", intno, M.x86.R_AX);
@@ -208,7 +208,7 @@
 {
     int i;
     X86EMU_intrFuncs bios_intr_tab[256];
-    
+
     for (i=0; i<256; i++)
     {
 	write_long_little(M.mem_base+i*4, BIOS_SEG<<16);
@@ -221,7 +221,7 @@
     bios_intr_tab[0x15] = int15;
 
     bios_intr_tab[0x6D] = int42;
-    
+
     X86EMU_setupIntrFuncs(bios_intr_tab);
     video_init();
 }
@@ -252,14 +252,14 @@
 
 unsigned char * setup_modes[] =
 {
-    setup_40x25,     // mode 0: 40x25 bw text
-    setup_40x25,     // mode 1: 40x25 col text
-    setup_80x25,     // mode 2: 80x25 bw text
-    setup_80x25,     // mode 3: 80x25 col text
-    setup_graphics,  // mode 4: 320x200 col graphics
-    setup_graphics,  // mode 5: 320x200 bw graphics
-    setup_graphics,  // mode 6: 640x200 bw graphics
-    setup_bw         // mode 7: 80x25 mono text
+    setup_40x25,     /* mode 0: 40x25 bw text */
+    setup_40x25,     /* mode 1: 40x25 col text */
+    setup_80x25,     /* mode 2: 80x25 bw text */
+    setup_80x25,     /* mode 3: 80x25 col text */
+    setup_graphics,  /* mode 4: 320x200 col graphics */
+    setup_graphics,  /* mode 5: 320x200 bw graphics */
+    setup_graphics,  /* mode 6: 640x200 bw graphics */
+    setup_bw         /* mode 7: 80x25 mono text */
 };
 
 unsigned int setup_cols[] =
@@ -280,13 +280,13 @@
 void bios_set_mode(int mode)
 {
     int i;
-    unsigned char mode_set = setup_modesets[mode]; // Control register value
-    unsigned char *setup_regs = setup_modes[mode]; // Register 3D4 Array
+    unsigned char mode_set = setup_modesets[mode]; /* Control register value */
+    unsigned char *setup_regs = setup_modes[mode]; /* Register 3D4 Array */
 
-    // Switch video off
+    /* Switch video off */
     out_byte(0x3D8, mode_set & 0x37);
 
-    // Set up parameters at 3D4h
+    /* Set up parameters at 3D4h */
     for (i=0; i<16; i++)
     {
 	out_byte(0x3D4, (unsigned char)i);
@@ -294,10 +294,10 @@
 	setup_regs++;
     }
 
-    // Enable video
+    /* Enable video */
     out_byte(0x3D8, mode_set);
 
-    // Set overscan
+    /* Set overscan */
     if (mode == 6) out_byte(0x3D9, 0x3F);
     else           out_byte(0x3D9, 0x30);
 }

diff --git a/board/MAI/bios_emulator/glue.c b/board/MAI/bios_emulator/glue.c
index f59ffaa..b380f0d 100644
--- a/board/MAI/bios_emulator/glue.c
+++ b/board/MAI/bios_emulator/glue.c

@@ -401,7 +401,7 @@
 {
     int i = 0;
     unsigned char *rom = (unsigned char *)rom_address;
-    /* if (*rom != 0x55 || *(rom+1) != 0xAA) return 0; // No bios rom this is, yes. */
+    /* if (*rom != 0x55 || *(rom+1) != 0xAA) return 0; /* No bios rom this is, yes. */ */
 
     for (;;)
     {
@@ -479,7 +479,6 @@
 }
 
 
-
 void remove_init_data(void)
 {
     char *s;
@@ -497,19 +496,19 @@
     }
     else if (s)
     {
-        if (strcmp(s, "dcache")==0)
-        {
-            dcache_enable();
-        }
-        else if (strcmp(s, "icache") == 0)
-        {
-            icache_enable();
-        }
-        else if (strcmp(s, "on")== 0 || strcmp(s, "both") == 0)
-        {
-            dcache_enable();
-            icache_enable();
-        }
+	if (strcmp(s, "dcache")==0)
+	{
+	    dcache_enable();
+	}
+	else if (strcmp(s, "icache") == 0)
+	{
+	    icache_enable();
+	}
+	else if (strcmp(s, "on")== 0 || strcmp(s, "both") == 0)
+	{
+	    dcache_enable();
+	    icache_enable();
+	}
     }
 
     /*   show_bat_mapping();*/

diff --git a/board/MAI/bios_emulator/scitech/include/biosemu.h b/board/MAI/bios_emulator/scitech/include/biosemu.h
index e38ff31..82c33a7 100644
--- a/board/MAI/bios_emulator/scitech/include/biosemu.h
+++ b/board/MAI/bios_emulator/scitech/include/biosemu.h

@@ -152,4 +152,3 @@
 #endif
 
 #endif /* __BIOSEMU_H */
-

diff --git a/board/MAI/bios_emulator/scitech/include/event.h b/board/MAI/bios_emulator/scitech/include/event.h
index 0de4517..beeac87 100644
--- a/board/MAI/bios_emulator/scitech/include/event.h
+++ b/board/MAI/bios_emulator/scitech/include/event.h

@@ -201,9 +201,9 @@
 the country code pages in use.
 
 NOTE:   Scan codes in the event library are not really hardware scan codes,
-        but rather virtual scan codes as generated by a low level keyboard
-        interface driver. All virtual codes begin with scan code 0x60 and
-        range up from there.
+	but rather virtual scan codes as generated by a low level keyboard
+	interface driver. All virtual codes begin with scan code 0x60 and
+	range up from there.
 
 HEADER:
 event.h
@@ -496,38 +496,38 @@
 
 MEMBERS:
 which       - Window identifier for message for use by high level window manager
-              code (i.e. MegaVision GUI or Windows API).
+	      code (i.e. MegaVision GUI or Windows API).
 what        - Type of event that occurred. Will be one of the values defined by
-              the EVT_eventType enumeration.
+	      the EVT_eventType enumeration.
 when        - Time that the event occurred in milliseconds since startup
 where_x     - X coordinate of the mouse cursor location at the time of the event
-              (in screen coordinates). For joystick events this represents
-              the position of the first joystick X axis.
+	      (in screen coordinates). For joystick events this represents
+	      the position of the first joystick X axis.
 where_y     - Y coordinate of the mouse cursor location at the time of the event
-              (in screen coordinates). For joystick events this represents
-              the position of the first joystick Y axis.
+	      (in screen coordinates). For joystick events this represents
+	      the position of the first joystick Y axis.
 relative_x  - Relative movement of the mouse cursor in the X direction (in
-              units of mickeys, or 1/200th of an inch). For joystick events
-              this represents the position of the second joystick X axis.
+	      units of mickeys, or 1/200th of an inch). For joystick events
+	      this represents the position of the second joystick X axis.
 relative_y  - Relative movement of the mouse cursor in the Y direction (in
-              units of mickeys, or 1/200th of an inch). For joystick events
-              this represents the position of the second joystick Y axis.
+	      units of mickeys, or 1/200th of an inch). For joystick events
+	      this represents the position of the second joystick Y axis.
 message     - Event specific message for the event. For use events this can be
-              any user specific information. For keyboard events this contains
-              the ASCII code in bits 0-7, the keyboard scan code in bits 8-15 and
-              the character repeat count in bits 16-30. You can use the
-              EVT_asciiCode, EVT_scanCode and EVT_repeatCount macros to extract
-              this information from the message field. For mouse events this
-              contains information about which button was pressed, and will be a
-              combination of the flags defined by the EVT_eventMouseMaskType
-              enumeration. For joystick events, this conatins information
-              about which buttons were pressed, and will be a combination of
-              the flags defined by the EVT_eventJoyMaskType enumeration.
+	      any user specific information. For keyboard events this contains
+	      the ASCII code in bits 0-7, the keyboard scan code in bits 8-15 and
+	      the character repeat count in bits 16-30. You can use the
+	      EVT_asciiCode, EVT_scanCode and EVT_repeatCount macros to extract
+	      this information from the message field. For mouse events this
+	      contains information about which button was pressed, and will be a
+	      combination of the flags defined by the EVT_eventMouseMaskType
+	      enumeration. For joystick events, this conatins information
+	      about which buttons were pressed, and will be a combination of
+	      the flags defined by the EVT_eventJoyMaskType enumeration.
 modifiers   - Contains additional information about the state of the keyboard
-              shift modifiers (Ctrl, Alt and Shift keys) when the event
-              occurred. For mouse events it will also contain the state of
-              the mouse buttons. Will be a combination of the values defined
-              by the EVT_eventModMaskType enumeration.
+	      shift modifiers (Ctrl, Alt and Shift keys) when the event
+	      occurred. For mouse events it will also contain the state of
+	      the mouse buttons. Will be a combination of the values defined
+	      by the EVT_eventModMaskType enumeration.
 next        - Internal use; do not use.
 prev        - Internal use; do not use.
 ****************************************************************************/
@@ -555,8 +555,8 @@
 other than the US English keyboard (the default).
 
 NOTE:   Entries in code page tables *must* be in ascending order for the
-        scan codes as we do a binary search on the tables for the ASCII
-        code equivalents.
+	scan codes as we do a binary search on the tables for the ASCII
+	code equivalents.
 
 HEADER:
 event.h

diff --git a/board/MAI/bios_emulator/scitech/include/pcilib.h b/board/MAI/bios_emulator/scitech/include/pcilib.h
index e2d58b0..238f8ef 100644
--- a/board/MAI/bios_emulator/scitech/include/pcilib.h
+++ b/board/MAI/bios_emulator/scitech/include/pcilib.h

@@ -103,14 +103,14 @@
 
 typedef union {
     struct {
-        uint    Zero:2;
-        uint    Register:6;
-        uint    Function:3;
-        uint    Device:5;
-        uint    Bus:8;
-        uint    Reserved:7;
-        uint    Enable:1;
-        } p;
+	uint    Zero:2;
+	uint    Register:6;
+	uint    Function:3;
+	uint    Device:5;
+	uint    Bus:8;
+	uint    Reserved:7;
+	uint    Enable:1;
+	} p;
     ulong   i;
     } PCIslot;
 
@@ -194,9 +194,9 @@
     uchar   SubordinateBus;
     uchar   SecondaryLatency;
     struct  {
-        ulong   Base;
-        ulong   Limit;
-        } Range[4];
+	ulong   Base;
+	ulong   Limit;
+	} Range[4];
     uchar   InterruptLine;
     uchar   InterruptPin;
     ushort  BridgeControl;
@@ -224,10 +224,10 @@
     uchar               HeaderType;
     uchar               BIST;
     union {
-        PCIType0Info    type0;
-        PCIType1Info    type1;
-        PCIType2Info    type2;
-        } u;
+	PCIType0Info    type0;
+	PCIType1Info    type1;
+	PCIType2Info    type2;
+	} u;
     } PCIDeviceInfo;
 
 /* PCI Capability header structure. All PCI capabilities have the
@@ -411,4 +411,3 @@
 #endif
 
 #endif  /* __PCILIB_H */
-

diff --git a/board/MAI/bios_emulator/scitech/include/pm_help.h b/board/MAI/bios_emulator/scitech/include/pm_help.h
index 60a7c25..536a2ba 100644
--- a/board/MAI/bios_emulator/scitech/include/pm_help.h
+++ b/board/MAI/bios_emulator/scitech/include/pm_help.h

@@ -164,4 +164,3 @@
 #endif  /* !__OS2__ */
 
 #endif  /* __PMHELP_H */
-

diff --git a/board/MAI/bios_emulator/scitech/include/pm_wctl.h b/board/MAI/bios_emulator/scitech/include/pm_wctl.h
index 088c19e..20aa15e 100644
--- a/board/MAI/bios_emulator/scitech/include/pm_wctl.h
+++ b/board/MAI/bios_emulator/scitech/include/pm_wctl.h

@@ -73,4 +73,3 @@
 PMHELP_CTL_CODE(GAGETEXPORTS                ,0x002E),
 PMHELP_CTL_CODE(GATHUNK                     ,0x002F),
 PMHELP_CTL_CODE(SETNUCLEUSPATH              ,0x0030),
-

diff --git a/board/MAI/bios_emulator/scitech/include/pmapi.h b/board/MAI/bios_emulator/scitech/include/pmapi.h
index 3affe67..7ddace7 100644
--- a/board/MAI/bios_emulator/scitech/include/pmapi.h
+++ b/board/MAI/bios_emulator/scitech/include/pmapi.h

@@ -1146,4 +1146,3 @@
 #endif
 
 #endif /* __PMAPI_H */
-

diff --git a/board/MAI/bios_emulator/scitech/include/pmimp.h b/board/MAI/bios_emulator/scitech/include/pmimp.h
index d6c5cdb..817f5e6 100644
--- a/board/MAI/bios_emulator/scitech/include/pmimp.h
+++ b/board/MAI/bios_emulator/scitech/include/pmimp.h

@@ -191,4 +191,3 @@
     NULL,
 #endif
     };
-

diff --git a/board/MAI/bios_emulator/scitech/include/scitech.h b/board/MAI/bios_emulator/scitech/include/scitech.h
index 1dbffac..8d5eee9 100644
--- a/board/MAI/bios_emulator/scitech/include/scitech.h
+++ b/board/MAI/bios_emulator/scitech/include/scitech.h

@@ -80,7 +80,7 @@
 
 #ifdef  __GNUC__
 #ifdef  __cplusplus
-// G++ currently fucks this up!
+/* G++ currently fucks this up! */
 #define __cdecl
 #define __stdcall
 #else
@@ -605,18 +605,18 @@
 {                                   \
     static ibool firstTime = true;  \
     if (firstTime) {                \
-        firstTime = false;          \
-        DebugInt();                 \
-        }                           \
+	firstTime = false;          \
+	DebugInt();                 \
+	}                           \
 }
 
 #define DebugVxDOnce()              \
 {                                   \
     static ibool firstTime = true;  \
     if (firstTime) {                \
-        firstTime = false;          \
-        DebugVxD();                 \
-        }                           \
+	firstTime = false;          \
+	DebugVxD();                 \
+	}                           \
 }
 
 /* Macros for linux string compatibility functions */
@@ -636,10 +636,10 @@
 /* Get rid of some helaciously annoying Visual C++ warnings! */
 
 #if defined(_MSC_VER) && !defined(__MWERKS__) && !defined(__SC__)
-#pragma warning(disable:4761)   // integral size mismatch in argument; conversion supplied
-#pragma warning(disable:4244)   // conversion from 'unsigned short ' to 'unsigned char ', possible loss of data
-#pragma warning(disable:4018)   // '<' : signed/unsigned mismatch
-#pragma warning(disable:4305)   // 'initializing' : truncation from 'const double' to 'float'
+#pragma warning(disable:4761)   /* integral size mismatch in argument; conversion supplied */
+#pragma warning(disable:4244)   /* conversion from 'unsigned short ' to 'unsigned char ', possible loss of data */
+#pragma warning(disable:4018)   /* '<' : signed/unsigned mismatch */
+#pragma warning(disable:4305)   /* 'initializing' : truncation from 'const double' to 'float' */
 #endif
 
 /*---------------------------------------------------------------------------
@@ -674,29 +674,29 @@
 #       define  CHK(x)      x
 #if     CHECKED > 1
 #       define  CHECK(p)                                            \
-        ((p) ? (void)0 : DebugInt(),                                \
-            _CHK_fail(1,"Check failed: '%s', file %s, line %d\n",   \
-            #p, __FILE__, __LINE__))
+	((p) ? (void)0 : DebugInt(),                                \
+	    _CHK_fail(1,"Check failed: '%s', file %s, line %d\n",   \
+	    #p, __FILE__, __LINE__))
 #       define  WARN(p)                                             \
-        ((p) ? (void)0 : DebugInt(),                                \
-            _CHK_fail(0,"Warning: '%s', file %s, line %d\n",        \
-            #p, __FILE__, __LINE__))
+	((p) ? (void)0 : DebugInt(),                                \
+	    _CHK_fail(0,"Warning: '%s', file %s, line %d\n",        \
+	    #p, __FILE__, __LINE__))
 #else
 #       define  CHECK(p)                                            \
-        ((p) ? (void)0 :                                            \
-            _CHK_fail(1,"Check failed: '%s', file %s, line %d\n",   \
-            #p, __FILE__, __LINE__))
+	((p) ? (void)0 :                                            \
+	    _CHK_fail(1,"Check failed: '%s', file %s, line %d\n",   \
+	    #p, __FILE__, __LINE__))
 #       define  WARN(p)                                             \
-        ((p) ? (void)0 :                                            \
-            _CHK_fail(0,"Warning: '%s', file %s, line %d\n",        \
-            #p, __FILE__, __LINE__))
+	((p) ? (void)0 :                                            \
+	    _CHK_fail(0,"Warning: '%s', file %s, line %d\n",        \
+	    #p, __FILE__, __LINE__))
 #endif
 #       define  LOGFATAL(msg)                                       \
-            _CHK_fail(1,"Fatal error: '%s', file %s, line %d\n",    \
-            msg, __FILE__, __LINE__)
+	    _CHK_fail(1,"Fatal error: '%s', file %s, line %d\n",    \
+	    msg, __FILE__, __LINE__)
 #       define  LOGWARN(msg)                                        \
-            _CHK_fail(0,"Warning: '%s', file %s, line %d\n",        \
-            msg, __FILE__, __LINE__)
+	    _CHK_fail(0,"Warning: '%s', file %s, line %d\n",        \
+	    msg, __FILE__, __LINE__)
 #else
 #       define  CHK(x)
 #       define  CHECK(p)        ((void)0)

diff --git a/board/MAI/bios_emulator/scitech/include/x86emu/regs.h b/board/MAI/bios_emulator/scitech/include/x86emu/regs.h
index c6ce884..a12017b 100644
--- a/board/MAI/bios_emulator/scitech/include/x86emu/regs.h
+++ b/board/MAI/bios_emulator/scitech/include/x86emu/regs.h

@@ -105,7 +105,7 @@
     u32 FLAGS;
     };
 
-/*  
+/*
  * Segment registers here represent the 16 bit quantities
  * CS, DS, ES, SS.
  */
@@ -183,8 +183,8 @@
 #define F_ALWAYS_ON  (0x0002)   /* flag bits always on */
 
 /*
- * Define a mask for only those flag bits we will ever pass back 
- * (via PUSHF) 
+ * Define a mask for only those flag bits we will ever pass back
+ * (via PUSHF)
  */
 #define F_MSK (FB_CF|FB_PF|FB_AF|FB_ZF|FB_SF|FB_TF|FB_IF|FB_DF|FB_OF)
 
@@ -235,21 +235,21 @@
 #define SYSMODE_HALTED          0x40000000
 
 #define SYSMODE_SEGMASK (SYSMODE_SEG_DS_SS      | \
-                         SYSMODE_SEGOVR_CS      | \
-                         SYSMODE_SEGOVR_DS      | \
-                         SYSMODE_SEGOVR_ES      | \
-                         SYSMODE_SEGOVR_FS      | \
-                         SYSMODE_SEGOVR_GS      | \
-                         SYSMODE_SEGOVR_SS)
+			 SYSMODE_SEGOVR_CS      | \
+			 SYSMODE_SEGOVR_DS      | \
+			 SYSMODE_SEGOVR_ES      | \
+			 SYSMODE_SEGOVR_FS      | \
+			 SYSMODE_SEGOVR_GS      | \
+			 SYSMODE_SEGOVR_SS)
 #define SYSMODE_CLRMASK (SYSMODE_SEG_DS_SS      | \
-                         SYSMODE_SEGOVR_CS      | \
-                         SYSMODE_SEGOVR_DS      | \
-                         SYSMODE_SEGOVR_ES      | \
-                         SYSMODE_SEGOVR_FS      | \
-                         SYSMODE_SEGOVR_GS      | \
-                         SYSMODE_SEGOVR_SS      | \
-                         SYSMODE_PREFIX_DATA    | \
-                         SYSMODE_PREFIX_ADDR)
+			 SYSMODE_SEGOVR_CS      | \
+			 SYSMODE_SEGOVR_DS      | \
+			 SYSMODE_SEGOVR_ES      | \
+			 SYSMODE_SEGOVR_FS      | \
+			 SYSMODE_SEGOVR_GS      | \
+			 SYSMODE_SEGOVR_SS      | \
+			 SYSMODE_PREFIX_DATA    | \
+			 SYSMODE_PREFIX_ADDR)
 
 #define  INTR_SYNCH           0x1
 #define  INTR_ASYNCH          0x2
@@ -266,8 +266,8 @@
      *  Delayed flag set        3 bits  (zero, signed, parity)
      *  reserved                6 bits
      *  interrupt #             8 bits  instruction raised interrupt
-     *  BIOS video segregs      4 bits  
-     *  Interrupt Pending       1 bits  
+     *  BIOS video segregs      4 bits
+     *  Interrupt Pending       1 bits
      *  Extern interrupt        1 bits
      *  Halted                  1 bits
      */
@@ -317,12 +317,12 @@
 
 extern    X86EMU_sysEnv _X86EMU_env;
 #define   M             _X86EMU_env
-        
+
 /*-------------------------- Function Prototypes --------------------------*/
 
 /* Function to log information at runtime */
 
-//void    printk(const char *fmt, ...);
+/*void    printk(const char *fmt, ...); */
 
 #ifdef  __cplusplus
 }                                   /* End of "C" linkage for C++       */

diff --git a/board/MAI/bios_emulator/scitech/makedefs/common.mk b/board/MAI/bios_emulator/scitech/makedefs/common.mk
index da2364f..d337152 100644
--- a/board/MAI/bios_emulator/scitech/makedefs/common.mk
+++ b/board/MAI/bios_emulator/scitech/makedefs/common.mk

@@ -178,4 +178,3 @@
 # Include file dependencies
 
 .INCLUDE .IGNORE: "makefile.dep"
-

diff --git a/board/MAI/bios_emulator/scitech/makedefs/gcc_linux.mk b/board/MAI/bios_emulator/scitech/makedefs/gcc_linux.mk
index 361ed4a..72c4ced 100644
--- a/board/MAI/bios_emulator/scitech/makedefs/gcc_linux.mk
+++ b/board/MAI/bios_emulator/scitech/makedefs/gcc_linux.mk

@@ -178,4 +178,3 @@
 # Define which file contains our rules
 
    RULES_MAK	:= gcc_linux.mk
-

diff --git a/board/MAI/bios_emulator/scitech/makedefs/gcc_win32.mk b/board/MAI/bios_emulator/scitech/makedefs/gcc_win32.mk
index 1709d88..21ccf97 100644
--- a/board/MAI/bios_emulator/scitech/makedefs/gcc_win32.mk
+++ b/board/MAI/bios_emulator/scitech/makedefs/gcc_win32.mk

@@ -133,4 +133,3 @@
 # Define which file contains our rules
 
    RULES_MAK	:= gcc_win32.mk
-

diff --git a/board/MAI/bios_emulator/scitech/makedefs/qnx4.mk b/board/MAI/bios_emulator/scitech/makedefs/qnx4.mk
index 56dfa4d..f583af3 100644
--- a/board/MAI/bios_emulator/scitech/makedefs/qnx4.mk
+++ b/board/MAI/bios_emulator/scitech/makedefs/qnx4.mk

@@ -162,4 +162,3 @@
 # Define which file contains our rules
 
    RULES_MAK	:= qnx4.mk
-

diff --git a/board/MAI/bios_emulator/scitech/makedefs/rules/gcc_beos.mk b/board/MAI/bios_emulator/scitech/makedefs/rules/gcc_beos.mk
index 4b59328..681b698 100644
--- a/board/MAI/bios_emulator/scitech/makedefs/rules/gcc_beos.mk
+++ b/board/MAI/bios_emulator/scitech/makedefs/rules/gcc_beos.mk

@@ -44,5 +44,4 @@
 %$L:     ; $(LIB) $(LIBFLAGS) $@ $&
 
 # Implicit rule for building an executable file
-%$E:     ; $(LD) $(LDFLAGS) -o $@ $& $(EXELIBS) $(PMLIB) 
-
+%$E:     ; $(LD) $(LDFLAGS) -o $@ $& $(EXELIBS) $(PMLIB)

diff --git a/board/MAI/bios_emulator/scitech/makedefs/rules/gcc_linux.mk b/board/MAI/bios_emulator/scitech/makedefs/rules/gcc_linux.mk
index 56719ed..5f91fe5 100644
--- a/board/MAI/bios_emulator/scitech/makedefs/rules/gcc_linux.mk
+++ b/board/MAI/bios_emulator/scitech/makedefs/rules/gcc_linux.mk

@@ -91,4 +91,3 @@
     @$(ECHO) ld $@
     @$(LD) $(LDFLAGS) -o $@ $& $(EXELIBS) $(PMLIB) -lm
 .ENDIF
-

diff --git a/board/MAI/bios_emulator/scitech/makedefs/rules/gcc_win32.mk b/board/MAI/bios_emulator/scitech/makedefs/rules/gcc_win32.mk
index 36b24b1..485d166 100644
--- a/board/MAI/bios_emulator/scitech/makedefs/rules/gcc_win32.mk
+++ b/board/MAI/bios_emulator/scitech/makedefs/rules/gcc_win32.mk

@@ -88,4 +88,3 @@
     @$(ECHO) ld $@
     @$(LD) $(LDFLAGS) -o $@ @$(mktmp $(&:s/\/\\) $(EXELIBS) $(PMLIB) -lm)
 .ENDIF
-

diff --git a/board/MAI/bios_emulator/scitech/makedefs/rules/va32.mk b/board/MAI/bios_emulator/scitech/makedefs/rules/va32.mk
index 588028f..1a20319 100644
--- a/board/MAI/bios_emulator/scitech/makedefs/rules/va32.mk
+++ b/board/MAI/bios_emulator/scitech/makedefs/rules/va32.mk

@@ -69,14 +69,14 @@
 # Implicit rule for building an executable file using response file
 .IF $(USE_OS2GUI)
 %$E: ;
-        rclink $(LD) $(RC) $@ $(mktmp $(LDFLAGS) $(&:t"+\n":s/\/\\)\n$@\n$*.map\n$(EXELIBS) $(PMLIB)\n$*.def\n)
+	rclink $(LD) $(RC) $@ $(mktmp $(LDFLAGS) $(&:t"+\n":s/\/\\)\n$@\n$*.map\n$(EXELIBS) $(PMLIB)\n$*.def\n)
 .IF $(LXLITE)
-        lxlite $@
+	lxlite $@
 .ENDIF
 .ELSE
 %$E: ;
-        rclink $(LD) $(RC) $@ $(mktmp $(LDFLAGS) $(&:t"+\n":s/\/\\)\n$@\n$*.map\n$(EXELIBS) $(PMLIB)\n\n)
+	rclink $(LD) $(RC) $@ $(mktmp $(LDFLAGS) $(&:t"+\n":s/\/\\)\n$@\n$*.map\n$(EXELIBS) $(PMLIB)\n\n)
 .IF $(LXLITE)
-        lxlite $@
+	lxlite $@
 .ENDIF
 .ENDIF

diff --git a/board/MAI/bios_emulator/scitech/makedefs/rules/va365.mk b/board/MAI/bios_emulator/scitech/makedefs/rules/va365.mk
index 0c149b7..2b41801 100644
--- a/board/MAI/bios_emulator/scitech/makedefs/rules/va365.mk
+++ b/board/MAI/bios_emulator/scitech/makedefs/rules/va365.mk

@@ -66,14 +66,14 @@
 # Implicit rule for building an executable file using response file
 .IF $(USE_OS2GUI)
 %$E: ;
-        rclink $(LD) $(RC) $@ $(mktmp $(LDFLAGS) $(&:t"+\n":s/\/\\)\n$@\n$*.map\n$(EXELIBS) $(PMLIB)\n$*.def\n)
+	rclink $(LD) $(RC) $@ $(mktmp $(LDFLAGS) $(&:t"+\n":s/\/\\)\n$@\n$*.map\n$(EXELIBS) $(PMLIB)\n$*.def\n)
 .IF $(LXLITE)
-        lxlite $@
+	lxlite $@
 .ENDIF
 .ELSE
 %$E: ;
-        rclink $(LD) $(RC) $@ $(mktmp $(LDFLAGS) $(&:t"+\n":s/\/\\)\n$@\n$*.map\n$(EXELIBS) $(PMLIB)\n\n)
+	rclink $(LD) $(RC) $@ $(mktmp $(LDFLAGS) $(&:t"+\n":s/\/\\)\n$@\n$*.map\n$(EXELIBS) $(PMLIB)\n\n)
 .IF $(LXLITE)
-        lxlite $@
+	lxlite $@
 .ENDIF
 .ENDIF

diff --git a/board/MAI/bios_emulator/scitech/makedefs/rules/wc32.mk b/board/MAI/bios_emulator/scitech/makedefs/rules/wc32.mk
index 68bfd83..39b8819 100644
--- a/board/MAI/bios_emulator/scitech/makedefs/rules/wc32.mk
+++ b/board/MAI/bios_emulator/scitech/makedefs/rules/wc32.mk

@@ -109,7 +109,7 @@
 	@gcpp -DNASM_ASSEMBLER -D__WATCOMC__ -EP $(<:s,/,\) > $(*:s,/,\).asm
 	nasm @$(mktmp -f obj -o $@) $(*:s,/,\).asm
 	@$(RM) -S $(mktmp $(*:s,/,\).asm)
-.ENDIF	
+.ENDIF
 
 # Special target to build dllstart.asm using Borland TASM
 dllstart.obj: dllstart.asm
@@ -126,26 +126,26 @@
 	@trimlib $(mktmp $(LDFLAGS) OP quiet SYS os2v2 dll\nN $@\nF $(&:t",\n":s/\/\\)\nLIBR $(EXELIBS:t",")) $*.lnk
 	rclink $(LD) $(RC) $@ $*.lnk
 .IF $(LEAVE_LINKFILE)
-.ELSE	
+.ELSE
 	@$(RM) -S $(mktmp *.lnk)
-.ENDIF	
+.ENDIF
 .ELIF $(USE_WIN32)
 %$D: ;
 	@trimlib $(mktmp $(LDFLAGS) OP quiet SYS nt_dll\nN $@\nF $(&:t",\n":s/\/\\)\nLIBR $(PMLIB)$(DEFLIBS)$(EXELIBS:t",")) $*.lnk
 	rclink $(LD) $(RC) $@ $*.lnk
 .IF $(LEAVE_LINKFILE)
-.ELSE	
+.ELSE
 	@$(RM) -S $(mktmp *.lnk)
-.ENDIF	
+.ENDIF
 .ELSE
 %$D: ;
 	@trimlib $(mktmp $(LDFLAGS) OP quiet SYS win386\nN $*.rex\nF $(&:t",\n":s/\/\\)\nLIBR $(EXELIBS:t",")) $*.lnk
 	rclink $(LD) $(RC) $@ $*.lnk
 	wbind $* -d -q -n
 .IF $(LEAVE_LINKFILE)
-.ELSE	
+.ELSE
 	@$(RM) -S $(mktmp *.lnk)
-.ENDIF	
+.ENDIF
 .ENDIF
 .ENDIF
 
@@ -171,18 +171,18 @@
 	$(LD) $(LDFLAGS) @$*.lnk
 	x32fix $@
 .IF $(LEAVE_LINKFILE)
-.ELSE	
+.ELSE
 	@$(RM) -S $(mktmp *.lnk)
-.ENDIF	
+.ENDIF
 .ELIF $(USE_OS232)
 .IF $(USE_OS2GUI)
 %$E: ;
 	@trimlib $(mktmp $(LDFLAGS) OP quiet SYS os2v2_pm\nN $@\nF $(&:t",":s/\/\\)\nLIBR $(PMLIB)$(EXELIBS:t",")) $*.lnk
 	rclink $(LD) $(RC) $@ $*.lnk
 .IF $(LEAVE_LINKFILE)
-.ELSE	
+.ELSE
 	@$(RM) -S $(mktmp *.lnk)
-.ENDIF	
+.ENDIF
 .IF $(LXLITE)
  	lxlite $@
 .ENDIF
@@ -191,9 +191,9 @@
 	@trimlib $(mktmp $(LDFLAGS) OP quiet SYS os2v2\nN $@\nF $(&:t",":s/\/\\)\nLIBR $(PMLIB)$(EXELIBS:t",")) $*.lnk
 	rclink $(LD) $(RC) $@ $*.lnk
 .IF $(LEAVE_LINKFILE)
-.ELSE	
+.ELSE
 	@$(RM) -S $(mktmp *.lnk)
-.ENDIF	
+.ENDIF
 .IF $(LXLITE)
  	lxlite $@
 .ENDIF
@@ -203,43 +203,43 @@
 	@trimlib $(mktmp $(LDFLAGS) OP quiet SYS nt\nN $@\nF $(&:t",":s/\/\\)\nLIBR $(DEFLIBS)$(EXELIBS:t",")) $*.lnk
 	rclink $(LD) $(RC) $@ $*.lnk
 .IF $(LEAVE_LINKFILE)
-.ELSE	
+.ELSE
 	@$(RM) -S $(mktmp *.lnk)
-.ENDIF	
+.ENDIF
 .ELIF $(USE_WIN32)
 .IF $(WIN32_GUI)
 %$E: ;
 	@trimlib $(mktmp $(LDFLAGS) OP quiet SYS win95\nN $@\nF $(&:t",":s/\/\\)\nLIBR $(PMLIB)$(DEFLIBS)$(EXELIBS:t",")) $*.lnk
 	rclink $(LD) $(RC) $@ $*.lnk
 .IF $(LEAVE_LINKFILE)
-.ELSE	
+.ELSE
 	@$(RM) -S $(mktmp *.lnk)
-.ENDIF	
+.ENDIF
 .ELSE
 %$E: ;
 	@trimlib $(mktmp $(LDFLAGS) OP quiet SYS nt\nN $@\nF $(&:t",":s/\/\\)\nLIBR $(PMLIB)$(DEFLIBS)$(EXELIBS:t",")) $*.lnk
 	rclink $(LD) $(RC) $@ $*.lnk
 .IF $(LEAVE_LINKFILE)
-.ELSE	
+.ELSE
 	@$(RM) -S $(mktmp *.lnk)
-.ENDIF	
+.ENDIF
 .ENDIF
 .ELIF $(USE_WIN386)
 %$E: ;
 	@trimlib $(mktmp $(LDFLAGS) OP quiet SYS win386\nN $*.rex\nF $(&:t",":s/\/\\)\nLIBR $(PMLIB)$(EXELIBS:t",")) $*.lnk
 	rclink $(LD) wbind $*.rex $*.lnk
 .IF $(LEAVE_LINKFILE)
-.ELSE	
+.ELSE
 	@$(RM) -S $(mktmp *.lnk)
-.ENDIF	
+.ENDIF
 .ELIF $(USE_TNT)
 %$E: ;
 	@trimlib $(mktmp $(LDFLAGS) OP quiet\nN $@\nF $(&:t",":s/\/\\)\nLIBR dosx32.lib,tntapi.lib,$(PMLIB)$(EXELIBS:t",")) $*.lnk
 	$(LD) @$*.lnk
 .IF $(LEAVE_LINKFILE)
-.ELSE	
+.ELSE
 	@$(RM) -S $(mktmp *.lnk)
-.ENDIF	
+.ENDIF
 .IF $(DOSSTYLE)
 	@markphar $@
 .ENDIF
@@ -250,16 +250,15 @@
 	$(LD) @$*.lnk
 	@attrib +s $*.exe
 .IF $(LEAVE_LINKFILE)
-.ELSE	
+.ELSE
 	@$(RM) -S $(mktmp *.lnk)
-.ENDIF	
+.ENDIF
 .ELSE
 %$E: ;
 	@trimlib $(mktmp $(LDFLAGS) OP quiet\nN $@\nF $(&:t",":s/\/\\)\nLIBR $(PMLIB)$(EXELIBS:t",")) $*.lnk
 	$(LD) @$*.lnk
 .IF $(LEAVE_LINKFILE)
-.ELSE	
+.ELSE
 	@$(RM) -S $(mktmp *.lnk)
-.ENDIF	
 .ENDIF
-
+.ENDIF

diff --git a/board/MAI/bios_emulator/scitech/makedefs/startup.mk b/board/MAI/bios_emulator/scitech/makedefs/startup.mk
index 1d67a97..d8b2ba2 100644
--- a/board/MAI/bios_emulator/scitech/makedefs/startup.mk
+++ b/board/MAI/bios_emulator/scitech/makedefs/startup.mk

@@ -159,4 +159,3 @@
 
 # We dont use TABS in our makefiles
 .NOTABS         := yes
-

diff --git a/board/MAI/bios_emulator/scitech/makedefs/wc32.mk b/board/MAI/bios_emulator/scitech/makedefs/wc32.mk
index ff03511..e5175ca 100644
--- a/board/MAI/bios_emulator/scitech/makedefs/wc32.mk
+++ b/board/MAI/bios_emulator/scitech/makedefs/wc32.mk

@@ -351,4 +351,3 @@
 # Define which file contains our rules
 
    RULES_MAK	:= wc32.mk
-

diff --git a/board/MAI/bios_emulator/scitech/src/biosemu/besys.c b/board/MAI/bios_emulator/scitech/src/biosemu/besys.c
index 7f7ea99..1512ce9 100644
--- a/board/MAI/bios_emulator/scitech/src/biosemu/besys.c
+++ b/board/MAI/bios_emulator/scitech/src/biosemu/besys.c

@@ -77,20 +77,20 @@
     u8 val = 0;
 
     if (addr >= 0xC0000 && addr <= _BE_env.biosmem_limit) {
-        val = *(u8*)(_BE_env.biosmem_base + addr - 0xC0000);
-        }
+	val = *(u8*)(_BE_env.biosmem_base + addr - 0xC0000);
+	}
     else if (addr >= 0xA0000 && addr <= 0xFFFFF) {
-        val = readb(_BE_env.busmem_base, addr - 0xA0000);
-        }
+	val = readb(_BE_env.busmem_base, addr - 0xA0000);
+	}
     else if (addr > M.mem_size - 1) {
 DB(     printk("mem_read: address %#lx out of range!\n", addr);)
-        HALT_SYS();
-        }
+	HALT_SYS();
+	}
     else {
-        val = *(u8*)(M.mem_base + addr);
-        }
+	val = *(u8*)(M.mem_base + addr);
+	}
 DB( if (DEBUG_MEM())
-        printk("%#08x 1 -> %#x\n", addr, val);)
+	printk("%#08x 1 -> %#x\n", addr, val);)
     return val;
 }
 
@@ -112,42 +112,42 @@
 
     if (addr >= 0xC0000 && addr <= _BE_env.biosmem_limit) {
 #ifdef __BIG_ENDIAN__
-        if (addr & 0x1) {
-            addr -= 0xC0000;
-            val = ( *(u8*)(_BE_env.biosmem_base + addr) |
-                   (*(u8*)(_BE_env.biosmem_base + addr + 1) << 8));
-            }
-        else
+	if (addr & 0x1) {
+	    addr -= 0xC0000;
+	    val = ( *(u8*)(_BE_env.biosmem_base + addr) |
+		   (*(u8*)(_BE_env.biosmem_base + addr + 1) << 8));
+	    }
+	else
 #endif
-            val = *(u16*)(_BE_env.biosmem_base + addr - 0xC0000);
-        }
+	    val = *(u16*)(_BE_env.biosmem_base + addr - 0xC0000);
+	}
     else if (addr >= 0xA0000 && addr <= 0xFFFFF) {
 #ifdef __BIG_ENDIAN__
-        if (addr & 0x1) {
-            addr -= 0xA0000;
-            val = ( readb(_BE_env.busmem_base, addr) |
-                   (readb(_BE_env.busmem_base, addr + 1) << 8));
-            }
-        else
+	if (addr & 0x1) {
+	    addr -= 0xA0000;
+	    val = ( readb(_BE_env.busmem_base, addr) |
+		   (readb(_BE_env.busmem_base, addr + 1) << 8));
+	    }
+	else
 #endif
-            val = readw(_BE_env.busmem_base, addr - 0xA0000);
-        }
+	    val = readw(_BE_env.busmem_base, addr - 0xA0000);
+	}
     else if (addr > M.mem_size - 2) {
 DB(     printk("mem_read: address %#lx out of range!\n", addr);)
-        HALT_SYS();
-        }
+	HALT_SYS();
+	}
     else {
 #ifdef __BIG_ENDIAN__
-        if (addr & 0x1) {
-            val = ( *(u8*)(M.mem_base + addr) |
-                   (*(u8*)(M.mem_base + addr + 1) << 8));
-            }
-        else
+	if (addr & 0x1) {
+	    val = ( *(u8*)(M.mem_base + addr) |
+		   (*(u8*)(M.mem_base + addr + 1) << 8));
+	    }
+	else
 #endif
-            val = *(u16*)(M.mem_base + addr);
-        }
+	    val = *(u16*)(M.mem_base + addr);
+	}
 DB( if (DEBUG_MEM())
-        printk("%#08x 2 -> %#x\n", addr, val);)
+	printk("%#08x 2 -> %#x\n", addr, val);)
     return val;
 }
 
@@ -169,48 +169,48 @@
 
     if (addr >= 0xC0000 && addr <= _BE_env.biosmem_limit) {
 #ifdef __BIG_ENDIAN__
-        if (addr & 0x3) {
-            addr -= 0xC0000;
-            val = ( *(u8*)(_BE_env.biosmem_base + addr + 0) |
-                   (*(u8*)(_BE_env.biosmem_base + addr + 1) << 8) |
-                   (*(u8*)(_BE_env.biosmem_base + addr + 2) << 16) |
-                   (*(u8*)(_BE_env.biosmem_base + addr + 3) << 24));
-            }
-        else
+	if (addr & 0x3) {
+	    addr -= 0xC0000;
+	    val = ( *(u8*)(_BE_env.biosmem_base + addr + 0) |
+		   (*(u8*)(_BE_env.biosmem_base + addr + 1) << 8) |
+		   (*(u8*)(_BE_env.biosmem_base + addr + 2) << 16) |
+		   (*(u8*)(_BE_env.biosmem_base + addr + 3) << 24));
+	    }
+	else
 #endif
-            val = *(u32*)(_BE_env.biosmem_base + addr - 0xC0000);
-        }
+	    val = *(u32*)(_BE_env.biosmem_base + addr - 0xC0000);
+	}
     else if (addr >= 0xA0000 && addr <= 0xFFFFF) {
 #ifdef __BIG_ENDIAN__
-        if (addr & 0x3) {
-            addr -= 0xA0000;
-            val = ( readb(_BE_env.busmem_base, addr) |
-                   (readb(_BE_env.busmem_base, addr + 1) <<  8) |
-                   (readb(_BE_env.busmem_base, addr + 2) << 16) |
-                   (readb(_BE_env.busmem_base, addr + 3) << 24));
-            }
-        else
+	if (addr & 0x3) {
+	    addr -= 0xA0000;
+	    val = ( readb(_BE_env.busmem_base, addr) |
+		   (readb(_BE_env.busmem_base, addr + 1) <<  8) |
+		   (readb(_BE_env.busmem_base, addr + 2) << 16) |
+		   (readb(_BE_env.busmem_base, addr + 3) << 24));
+	    }
+	else
 #endif
-            val = readl(_BE_env.busmem_base, addr - 0xA0000);
-        }
+	    val = readl(_BE_env.busmem_base, addr - 0xA0000);
+	}
     else if (addr > M.mem_size - 4) {
 DB(     printk("mem_read: address %#lx out of range!\n", addr);)
-        HALT_SYS();
-        }
+	HALT_SYS();
+	}
     else {
 #ifdef __BIG_ENDIAN__
-        if (addr & 0x3) {
-            val = ( *(u8*)(M.mem_base + addr + 0) |
-                   (*(u8*)(M.mem_base + addr + 1) << 8) |
-                   (*(u8*)(M.mem_base + addr + 2) << 16) |
-                   (*(u8*)(M.mem_base + addr + 3) << 24));
-            }
-        else
+	if (addr & 0x3) {
+	    val = ( *(u8*)(M.mem_base + addr + 0) |
+		   (*(u8*)(M.mem_base + addr + 1) << 8) |
+		   (*(u8*)(M.mem_base + addr + 2) << 16) |
+		   (*(u8*)(M.mem_base + addr + 3) << 24));
+	    }
+	else
 #endif
-            val = *(u32*)(M.mem_base + addr);
-        }
+	    val = *(u32*)(M.mem_base + addr);
+	}
 DB( if (DEBUG_MEM())
-        printk("%#08x 4 -> %#x\n", addr, val);)
+	printk("%#08x 4 -> %#x\n", addr, val);)
     return val;
 }
 
@@ -228,20 +228,20 @@
     u8 val)
 {
 DB( if (DEBUG_MEM())
-        printk("%#08x 1 <- %#x\n", addr, val);)
+	printk("%#08x 1 <- %#x\n", addr, val);)
     if (addr >= 0xC0000 && addr <= _BE_env.biosmem_limit) {
-        *(u8*)(_BE_env.biosmem_base + addr - 0xC0000) = val;
-        }
+	*(u8*)(_BE_env.biosmem_base + addr - 0xC0000) = val;
+	}
     else if (addr >= 0xA0000 && addr <= 0xFFFFF) {
-        writeb(val, _BE_env.busmem_base, addr - 0xA0000);
-        }
+	writeb(val, _BE_env.busmem_base, addr - 0xA0000);
+	}
     else if (addr > M.mem_size-1) {
 DB(     printk("mem_write: address %#lx out of range!\n", addr);)
-        HALT_SYS();
-        }
+	HALT_SYS();
+	}
     else {
-        *(u8*)(M.mem_base + addr) = val;
-        }
+	*(u8*)(M.mem_base + addr) = val;
+	}
 }
 
 /****************************************************************************
@@ -258,43 +258,43 @@
     u16 val)
 {
 DB( if (DEBUG_MEM())
-        printk("%#08x 2 <- %#x\n", addr, val);)
+	printk("%#08x 2 <- %#x\n", addr, val);)
     if (addr >= 0xC0000 && addr <= _BE_env.biosmem_limit) {
 #ifdef __BIG_ENDIAN__
-        if (addr & 0x1) {
-            addr -= 0xC0000;
-            *(u8*)(_BE_env.biosmem_base + addr + 0) = (val >> 0) & 0xff;
-            *(u8*)(_BE_env.biosmem_base + addr + 1) = (val >> 8) & 0xff;
-            }
-        else
+	if (addr & 0x1) {
+	    addr -= 0xC0000;
+	    *(u8*)(_BE_env.biosmem_base + addr + 0) = (val >> 0) & 0xff;
+	    *(u8*)(_BE_env.biosmem_base + addr + 1) = (val >> 8) & 0xff;
+	    }
+	else
 #endif
-            *(u16*)(_BE_env.biosmem_base + addr - 0xC0000) = val;
-        }
+	    *(u16*)(_BE_env.biosmem_base + addr - 0xC0000) = val;
+	}
     else if (addr >= 0xA0000 && addr <= 0xFFFFF) {
 #ifdef __BIG_ENDIAN__
-        if (addr & 0x1) {
-            addr -= 0xA0000;
-            writeb(val >> 0, _BE_env.busmem_base, addr);
-            writeb(val >> 8, _BE_env.busmem_base, addr + 1);
-            }
-        else
+	if (addr & 0x1) {
+	    addr -= 0xA0000;
+	    writeb(val >> 0, _BE_env.busmem_base, addr);
+	    writeb(val >> 8, _BE_env.busmem_base, addr + 1);
+	    }
+	else
 #endif
-            writew(val, _BE_env.busmem_base, addr - 0xA0000);
-        }
+	    writew(val, _BE_env.busmem_base, addr - 0xA0000);
+	}
     else if (addr > M.mem_size-2) {
 DB(     printk("mem_write: address %#lx out of range!\n", addr);)
-        HALT_SYS();
-        }
+	HALT_SYS();
+	}
     else {
 #ifdef __BIG_ENDIAN__
-        if (addr & 0x1) {
-            *(u8*)(M.mem_base + addr + 0) = (val >> 0) & 0xff;
-            *(u8*)(M.mem_base + addr + 1) = (val >> 8) & 0xff;
-            }
-        else
+	if (addr & 0x1) {
+	    *(u8*)(M.mem_base + addr + 0) = (val >> 0) & 0xff;
+	    *(u8*)(M.mem_base + addr + 1) = (val >> 8) & 0xff;
+	    }
+	else
 #endif
-            *(u16*)(M.mem_base + addr) = val;
-        }
+	    *(u16*)(M.mem_base + addr) = val;
+	}
 }
 
 /****************************************************************************
@@ -311,49 +311,49 @@
     u32 val)
 {
 DB( if (DEBUG_MEM())
-        printk("%#08x 4 <- %#x\n", addr, val);)
+	printk("%#08x 4 <- %#x\n", addr, val);)
     if (addr >= 0xC0000 && addr <= _BE_env.biosmem_limit) {
 #ifdef __BIG_ENDIAN__
-        if (addr & 0x1) {
-            addr -= 0xC0000;
-            *(u8*)(M.mem_base + addr + 0) = (val >>  0) & 0xff;
-            *(u8*)(M.mem_base + addr + 1) = (val >>  8) & 0xff;
-            *(u8*)(M.mem_base + addr + 2) = (val >> 16) & 0xff;
-            *(u8*)(M.mem_base + addr + 3) = (val >> 24) & 0xff;
-            }
-        else
+	if (addr & 0x1) {
+	    addr -= 0xC0000;
+	    *(u8*)(M.mem_base + addr + 0) = (val >>  0) & 0xff;
+	    *(u8*)(M.mem_base + addr + 1) = (val >>  8) & 0xff;
+	    *(u8*)(M.mem_base + addr + 2) = (val >> 16) & 0xff;
+	    *(u8*)(M.mem_base + addr + 3) = (val >> 24) & 0xff;
+	    }
+	else
 #endif
-            *(u32*)(M.mem_base + addr - 0xC0000) = val;
-        }
+	    *(u32*)(M.mem_base + addr - 0xC0000) = val;
+	}
     else if (addr >= 0xA0000 && addr <= 0xFFFFF) {
 #ifdef __BIG_ENDIAN__
-        if (addr & 0x3) {
-            addr -= 0xA0000;
-            writeb(val >>  0, _BE_env.busmem_base, addr);
-            writeb(val >>  8, _BE_env.busmem_base, addr + 1);
-            writeb(val >> 16, _BE_env.busmem_base, addr + 1);
-            writeb(val >> 24, _BE_env.busmem_base, addr + 1);
-            }
-        else
+	if (addr & 0x3) {
+	    addr -= 0xA0000;
+	    writeb(val >>  0, _BE_env.busmem_base, addr);
+	    writeb(val >>  8, _BE_env.busmem_base, addr + 1);
+	    writeb(val >> 16, _BE_env.busmem_base, addr + 1);
+	    writeb(val >> 24, _BE_env.busmem_base, addr + 1);
+	    }
+	else
 #endif
-            writel(val, _BE_env.busmem_base, addr - 0xA0000);
-        }
+	    writel(val, _BE_env.busmem_base, addr - 0xA0000);
+	}
     else if (addr > M.mem_size-4) {
 DB(     printk("mem_write: address %#lx out of range!\n", addr);)
-        HALT_SYS();
-        }
+	HALT_SYS();
+	}
     else {
 #ifdef __BIG_ENDIAN__
-        if (addr & 0x1) {
-            *(u8*)(M.mem_base + addr + 0) = (val >>  0) & 0xff;
-            *(u8*)(M.mem_base + addr + 1) = (val >>  8) & 0xff;
-            *(u8*)(M.mem_base + addr + 2) = (val >> 16) & 0xff;
-            *(u8*)(M.mem_base + addr + 3) = (val >> 24) & 0xff;
-            }
-        else
+	if (addr & 0x1) {
+	    *(u8*)(M.mem_base + addr + 0) = (val >>  0) & 0xff;
+	    *(u8*)(M.mem_base + addr + 1) = (val >>  8) & 0xff;
+	    *(u8*)(M.mem_base + addr + 2) = (val >> 16) & 0xff;
+	    *(u8*)(M.mem_base + addr + 3) = (val >> 24) & 0xff;
+	    }
+	else
 #endif
-            *(u32*)(M.mem_base + addr) = val;
-        }
+	    *(u32*)(M.mem_base + addr) = val;
+	}
 }
 
 /* Debug functions to do ISA/PCI bus port I/O */
@@ -365,7 +365,7 @@
 {
     u8 val = PM_inpb(port);
     if (DEBUG_IO())
-        printk("%04X:%04X:  inb.%04X -> %02X\n",M.x86.saved_cs, M.x86.saved_ip, (ushort)port, val);
+	printk("%04X:%04X:  inb.%04X -> %02X\n",M.x86.saved_cs, M.x86.saved_ip, (ushort)port, val);
     return val;
 }
 
@@ -373,7 +373,7 @@
 {
     u16 val = PM_inpw(port);
     if (DEBUG_IO())
-        printk("%04X:%04X:  inw.%04X -> %04X\n",M.x86.saved_cs, M.x86.saved_ip, (ushort)port, val);
+	printk("%04X:%04X:  inw.%04X -> %04X\n",M.x86.saved_cs, M.x86.saved_ip, (ushort)port, val);
     return val;
 }
 
@@ -381,28 +381,28 @@
 {
     u32 val = PM_inpd(port);
     if (DEBUG_IO())
-        printk("%04X:%04X:  inl.%04X -> %08X\n",M.x86.saved_cs, M.x86.saved_ip, (ushort)port, val);
+	printk("%04X:%04X:  inl.%04X -> %08X\n",M.x86.saved_cs, M.x86.saved_ip, (ushort)port, val);
     return val;
 }
 
 void X86API BE_outb(int port, u8 val)
 {
     if (DEBUG_IO())
-        printk("%04X:%04X: outb.%04X <- %02X\n",M.x86.saved_cs, M.x86.saved_ip, (ushort)port, val);
+	printk("%04X:%04X: outb.%04X <- %02X\n",M.x86.saved_cs, M.x86.saved_ip, (ushort)port, val);
     PM_outpb(port,val);
 }
 
 void X86API BE_outw(int port, u16 val)
 {
     if (DEBUG_IO())
-        printk("%04X:%04X: outw.%04X <- %04X\n",M.x86.saved_cs, M.x86.saved_ip, (ushort)port, val);
+	printk("%04X:%04X: outw.%04X <- %04X\n",M.x86.saved_cs, M.x86.saved_ip, (ushort)port, val);
     PM_outpw(port,val);
 }
 
 void X86API BE_outl(int port, u32 val)
 {
     if (DEBUG_IO())
-        printk("%04X:%04X: outl.%04X <- %08X\n",M.x86.saved_cs, M.x86.saved_ip, (ushort)port, val);
+	printk("%04X:%04X: outl.%04X <- %08X\n",M.x86.saved_cs, M.x86.saved_ip, (ushort)port, val);
     PM_outpd(port,val);
 }
 #endif

diff --git a/board/MAI/bios_emulator/scitech/src/biosemu/bios.c b/board/MAI/bios_emulator/scitech/src/biosemu/bios.c
index 3fb4c36..c0f4a4b 100644
--- a/board/MAI/bios_emulator/scitech/src/biosemu/bios.c
+++ b/board/MAI/bios_emulator/scitech/src/biosemu/bios.c

@@ -50,9 +50,9 @@
     int intno)
 {
     if (BE_rdw(intno * 4 + 2) == BIOS_SEG)
-        printk("biosEmu: undefined interrupt %xh called!\n",intno);
+	printk("biosEmu: undefined interrupt %xh called!\n",intno);
     else
-        X86EMU_prepareForInt(intno);
+	X86EMU_prepareForInt(intno);
 }
 
 /****************************************************************************
@@ -68,26 +68,26 @@
     int intno)
 {
     if (M.x86.R_AH == 0x12 && M.x86.R_BL == 0x32) {
-        if (M.x86.R_AL == 0) {
-            /* Enable CPU accesses to video memory */
-            PM_outpb(0x3c2, PM_inpb(0x3cc) | (u8)0x02);
-            return;
-            }
-        else if (M.x86.R_AL == 1) {
-            /* Disable CPU accesses to video memory */
-            PM_outpb(0x3c2, PM_inpb(0x3cc) & (u8)~0x02);
-            return;
-            }
+	if (M.x86.R_AL == 0) {
+	    /* Enable CPU accesses to video memory */
+	    PM_outpb(0x3c2, PM_inpb(0x3cc) | (u8)0x02);
+	    return;
+	    }
+	else if (M.x86.R_AL == 1) {
+	    /* Disable CPU accesses to video memory */
+	    PM_outpb(0x3c2, PM_inpb(0x3cc) & (u8)~0x02);
+	    return;
+	    }
 #ifdef  DEBUG
-        else {
-            printk("biosEmu/bios.int42: unknown function AH=0x12, BL=0x32, AL=%#02x\n",M.x86.R_AL);
-            }
+	else {
+	    printk("biosEmu/bios.int42: unknown function AH=0x12, BL=0x32, AL=%#02x\n",M.x86.R_AL);
+	    }
 #endif
-        }
+	}
 #ifdef  DEBUG
     else {
-        printk("biosEmu/bios.int42: unknown function AH=%#02x, AL=%#02x, BL=%#02x\n",M.x86.R_AH, M.x86.R_AL, M.x86.R_BL);
-        }
+	printk("biosEmu/bios.int42: unknown function AH=%#02x, AL=%#02x, BL=%#02x\n",M.x86.R_AH, M.x86.R_AL, M.x86.R_BL);
+	}
 #endif
 }
 
@@ -106,9 +106,9 @@
     int intno)
 {
     if (BE_rdw(intno * 4 + 2) == BIOS_SEG)
-        int42(intno);
+	int42(intno);
     else
-        X86EMU_prepareForInt(intno);
+	X86EMU_prepareForInt(intno);
 }
 
 /* Result codes returned by the PCI BIOS */
@@ -142,87 +142,87 @@
 
     /* Fail if no PCI device information has been registered */
     if (!_BE_env.vgaInfo.pciInfo)
-        return;
+	return;
     pciSlot = (u16)(_BE_env.vgaInfo.pciInfo->slot.i >> 8);
     switch (M.x86.R_AX) {
-        case 0xB101:                    /* PCI bios present? */
-            M.x86.R_AL  = 0x00;         /* no config space/special cycle generation support */
-            M.x86.R_EDX = 0x20494350;   /* " ICP" */
-            M.x86.R_BX  = 0x0210;       /* Version 2.10 */
-            M.x86.R_CL  = 0;            /* Max bus number in system */
-            CLEAR_FLAG(F_CF);
-            break;
-        case 0xB102:                    /* Find PCI device */
-            M.x86.R_AH = DEVICE_NOT_FOUND;
-            if (M.x86.R_DX == _BE_env.vgaInfo.pciInfo->VendorID &&
-                    M.x86.R_CX == _BE_env.vgaInfo.pciInfo->DeviceID &&
-                    M.x86.R_SI == 0) {
-                M.x86.R_AH = SUCCESSFUL;
-                M.x86.R_BX = pciSlot;
-                }
-            CONDITIONAL_SET_FLAG((M.x86.R_AH != SUCCESSFUL), F_CF);
-            break;
-        case 0xB103:                    /* Find PCI class code */
-            M.x86.R_AH = DEVICE_NOT_FOUND;
-            if (M.x86.R_CL == _BE_env.vgaInfo.pciInfo->Interface &&
-                    M.x86.R_CH == _BE_env.vgaInfo.pciInfo->SubClass &&
-                    (u8)(M.x86.R_ECX >> 16) == _BE_env.vgaInfo.pciInfo->BaseClass) {
-                M.x86.R_AH = SUCCESSFUL;
-                M.x86.R_BX = pciSlot;
-                }
-            CONDITIONAL_SET_FLAG((M.x86.R_AH != SUCCESSFUL), F_CF);
-            break;
-        case 0xB108:                    /* Read configuration byte */
-            M.x86.R_AH = BAD_REGISTER_NUMBER;
-            if (M.x86.R_BX == pciSlot) {
-                M.x86.R_AH = SUCCESSFUL;
-                M.x86.R_CL = (u8)PCI_accessReg(M.x86.R_DI,0,PCI_READ_BYTE,_BE_env.vgaInfo.pciInfo);
-                }
-            CONDITIONAL_SET_FLAG((M.x86.R_AH != SUCCESSFUL), F_CF);
-            break;
-        case 0xB109:                    /* Read configuration word */
-            M.x86.R_AH = BAD_REGISTER_NUMBER;
-            if (M.x86.R_BX == pciSlot) {
-                M.x86.R_AH = SUCCESSFUL;
-                M.x86.R_CX = (u16)PCI_accessReg(M.x86.R_DI,0,PCI_READ_WORD,_BE_env.vgaInfo.pciInfo);
-                }
-            CONDITIONAL_SET_FLAG((M.x86.R_AH != SUCCESSFUL), F_CF);
-            break;
-        case 0xB10A:                    /* Read configuration dword */
-            M.x86.R_AH = BAD_REGISTER_NUMBER;
-            if (M.x86.R_BX == pciSlot) {
-                M.x86.R_AH = SUCCESSFUL;
-                M.x86.R_ECX = (u32)PCI_accessReg(M.x86.R_DI,0,PCI_READ_DWORD,_BE_env.vgaInfo.pciInfo);
-                }
-            CONDITIONAL_SET_FLAG((M.x86.R_AH != SUCCESSFUL), F_CF);
-            break;
-        case 0xB10B:                    /* Write configuration byte */
-            M.x86.R_AH = BAD_REGISTER_NUMBER;
-            if (M.x86.R_BX == pciSlot) {
-                M.x86.R_AH = SUCCESSFUL;
-                PCI_accessReg(M.x86.R_DI,M.x86.R_CL,PCI_WRITE_BYTE,_BE_env.vgaInfo.pciInfo);
-                }
-            CONDITIONAL_SET_FLAG((M.x86.R_AH != SUCCESSFUL), F_CF);
-            break;
-        case 0xB10C:                    /* Write configuration word */
-            M.x86.R_AH = BAD_REGISTER_NUMBER;
-            if (M.x86.R_BX == pciSlot) {
-                M.x86.R_AH = SUCCESSFUL;
-                PCI_accessReg(M.x86.R_DI,M.x86.R_CX,PCI_WRITE_WORD,_BE_env.vgaInfo.pciInfo);
-                }
-            CONDITIONAL_SET_FLAG((M.x86.R_AH != SUCCESSFUL), F_CF);
-            break;
-        case 0xB10D:                    /* Write configuration dword */
-            M.x86.R_AH = BAD_REGISTER_NUMBER;
-            if (M.x86.R_BX == pciSlot) {
-                M.x86.R_AH = SUCCESSFUL;
-                PCI_accessReg(M.x86.R_DI,M.x86.R_ECX,PCI_WRITE_DWORD,_BE_env.vgaInfo.pciInfo);
-                }
-            CONDITIONAL_SET_FLAG((M.x86.R_AH != SUCCESSFUL), F_CF);
-            break;
-        default:
-            printk("biosEmu/bios.int1a: unknown function AX=%#04x\n", M.x86.R_AX);
-        }
+	case 0xB101:                    /* PCI bios present? */
+	    M.x86.R_AL  = 0x00;         /* no config space/special cycle generation support */
+	    M.x86.R_EDX = 0x20494350;   /* " ICP" */
+	    M.x86.R_BX  = 0x0210;       /* Version 2.10 */
+	    M.x86.R_CL  = 0;            /* Max bus number in system */
+	    CLEAR_FLAG(F_CF);
+	    break;
+	case 0xB102:                    /* Find PCI device */
+	    M.x86.R_AH = DEVICE_NOT_FOUND;
+	    if (M.x86.R_DX == _BE_env.vgaInfo.pciInfo->VendorID &&
+		    M.x86.R_CX == _BE_env.vgaInfo.pciInfo->DeviceID &&
+		    M.x86.R_SI == 0) {
+		M.x86.R_AH = SUCCESSFUL;
+		M.x86.R_BX = pciSlot;
+		}
+	    CONDITIONAL_SET_FLAG((M.x86.R_AH != SUCCESSFUL), F_CF);
+	    break;
+	case 0xB103:                    /* Find PCI class code */
+	    M.x86.R_AH = DEVICE_NOT_FOUND;
+	    if (M.x86.R_CL == _BE_env.vgaInfo.pciInfo->Interface &&
+		    M.x86.R_CH == _BE_env.vgaInfo.pciInfo->SubClass &&
+		    (u8)(M.x86.R_ECX >> 16) == _BE_env.vgaInfo.pciInfo->BaseClass) {
+		M.x86.R_AH = SUCCESSFUL;
+		M.x86.R_BX = pciSlot;
+		}
+	    CONDITIONAL_SET_FLAG((M.x86.R_AH != SUCCESSFUL), F_CF);
+	    break;
+	case 0xB108:                    /* Read configuration byte */
+	    M.x86.R_AH = BAD_REGISTER_NUMBER;
+	    if (M.x86.R_BX == pciSlot) {
+		M.x86.R_AH = SUCCESSFUL;
+		M.x86.R_CL = (u8)PCI_accessReg(M.x86.R_DI,0,PCI_READ_BYTE,_BE_env.vgaInfo.pciInfo);
+		}
+	    CONDITIONAL_SET_FLAG((M.x86.R_AH != SUCCESSFUL), F_CF);
+	    break;
+	case 0xB109:                    /* Read configuration word */
+	    M.x86.R_AH = BAD_REGISTER_NUMBER;
+	    if (M.x86.R_BX == pciSlot) {
+		M.x86.R_AH = SUCCESSFUL;
+		M.x86.R_CX = (u16)PCI_accessReg(M.x86.R_DI,0,PCI_READ_WORD,_BE_env.vgaInfo.pciInfo);
+		}
+	    CONDITIONAL_SET_FLAG((M.x86.R_AH != SUCCESSFUL), F_CF);
+	    break;
+	case 0xB10A:                    /* Read configuration dword */
+	    M.x86.R_AH = BAD_REGISTER_NUMBER;
+	    if (M.x86.R_BX == pciSlot) {
+		M.x86.R_AH = SUCCESSFUL;
+		M.x86.R_ECX = (u32)PCI_accessReg(M.x86.R_DI,0,PCI_READ_DWORD,_BE_env.vgaInfo.pciInfo);
+		}
+	    CONDITIONAL_SET_FLAG((M.x86.R_AH != SUCCESSFUL), F_CF);
+	    break;
+	case 0xB10B:                    /* Write configuration byte */
+	    M.x86.R_AH = BAD_REGISTER_NUMBER;
+	    if (M.x86.R_BX == pciSlot) {
+		M.x86.R_AH = SUCCESSFUL;
+		PCI_accessReg(M.x86.R_DI,M.x86.R_CL,PCI_WRITE_BYTE,_BE_env.vgaInfo.pciInfo);
+		}
+	    CONDITIONAL_SET_FLAG((M.x86.R_AH != SUCCESSFUL), F_CF);
+	    break;
+	case 0xB10C:                    /* Write configuration word */
+	    M.x86.R_AH = BAD_REGISTER_NUMBER;
+	    if (M.x86.R_BX == pciSlot) {
+		M.x86.R_AH = SUCCESSFUL;
+		PCI_accessReg(M.x86.R_DI,M.x86.R_CX,PCI_WRITE_WORD,_BE_env.vgaInfo.pciInfo);
+		}
+	    CONDITIONAL_SET_FLAG((M.x86.R_AH != SUCCESSFUL), F_CF);
+	    break;
+	case 0xB10D:                    /* Write configuration dword */
+	    M.x86.R_AH = BAD_REGISTER_NUMBER;
+	    if (M.x86.R_BX == pciSlot) {
+		M.x86.R_AH = SUCCESSFUL;
+		PCI_accessReg(M.x86.R_DI,M.x86.R_ECX,PCI_WRITE_DWORD,_BE_env.vgaInfo.pciInfo);
+		}
+	    CONDITIONAL_SET_FLAG((M.x86.R_AH != SUCCESSFUL), F_CF);
+	    break;
+	default:
+	    printk("biosEmu/bios.int1a: unknown function AX=%#04x\n", M.x86.R_AX);
+	}
 }
 
 /****************************************************************************
@@ -240,9 +240,9 @@
     X86EMU_intrFuncs    bios_intr_tab[256];
 
     for (i = 0; i < 256; ++i) {
-        intrTab[i] = BIOS_SEG << 16;
-        bios_intr_tab[i] = undefined_intr;
-        }
+	intrTab[i] = BIOS_SEG << 16;
+	bios_intr_tab[i] = undefined_intr;
+	}
     bios_intr_tab[0x10] = int10;
     bios_intr_tab[0x1A] = int1A;
     bios_intr_tab[0x42] = int42;

diff --git a/board/MAI/bios_emulator/scitech/src/biosemu/biosemu.c b/board/MAI/bios_emulator/scitech/src/biosemu/biosemu.c
index ed2717c..0052709 100644
--- a/board/MAI/bios_emulator/scitech/src/biosemu/biosemu.c
+++ b/board/MAI/bios_emulator/scitech/src/biosemu/biosemu.c

@@ -100,9 +100,9 @@
 #endif
     memset(&M,0,sizeof(M));
     if (memSize < 20480)
-        PM_fatalError("Emulator requires at least 20Kb of memory!\n");
+	PM_fatalError("Emulator requires at least 20Kb of memory!\n");
     if ((M.mem_base = (unsigned long)malloc(memSize)) == NULL)
-        PM_fatalError("Out of memory!");
+	PM_fatalError("Out of memory!");
     M.mem_size = memSize;
     _BE_env.busmem_base = (ulong)PM_mapPhysicalAddr(0xA0000,0x5FFFF,true);
     M.x86.debug = debugFlags;
@@ -144,15 +144,15 @@
     _BE_env.vgaInfo.pciInfo = info->pciInfo;
     _BE_env.vgaInfo.BIOSImage = info->BIOSImage;
     if (info->BIOSImage) {
-        _BE_env.biosmem_base = (ulong)info->BIOSImage;
-        _BE_env.biosmem_limit = 0xC0000 + info->BIOSImageLen-1;
-        }
+	_BE_env.biosmem_base = (ulong)info->BIOSImage;
+	_BE_env.biosmem_limit = 0xC0000 + info->BIOSImageLen-1;
+	}
     else {
-        _BE_env.biosmem_base = _BE_env.busmem_base + 0x20000;
-        _BE_env.biosmem_limit = 0xC7FFF;
-        }
+	_BE_env.biosmem_base = _BE_env.busmem_base + 0x20000;
+	_BE_env.biosmem_limit = 0xC7FFF;
+	}
     if (*((u32*)info->LowMem) == 0)
-        _BE_bios_init((u32*)info->LowMem);
+	_BE_bios_init((u32*)info->LowMem);
     memcpy((u8*)M.mem_base,info->LowMem,sizeof(info->LowMem));
 }
 
@@ -182,8 +182,8 @@
 mode pointer that can be used to directly access the memory.
 
 NOTE:   The memory is *always* in little endian format, son on non-x86
-        systems you will need to do endian translations to access this
-        memory.
+	systems you will need to do endian translations to access this
+	memory.
 ****************************************************************************/
 void * PMAPI BE_mapRealPointer(
     uint r_seg,
@@ -192,11 +192,11 @@
     u32 addr = ((u32)r_seg << 4) + r_off;
 
     if (addr >= 0xC0000 && addr <= _BE_env.biosmem_limit) {
-        return (void*)(_BE_env.biosmem_base + addr - 0xC0000);
-        }
+	return (void*)(_BE_env.biosmem_base + addr - 0xC0000);
+	}
     else if (addr >= 0xA0000 && addr <= 0xFFFFF) {
-        return (void*)(_BE_env.busmem_base + addr - 0xA0000);
-        }
+	return (void*)(_BE_env.busmem_base + addr - 0xA0000);
+	}
     return (void*)(M.mem_base + addr);
 }
 
@@ -213,8 +213,8 @@
 we put the real mode code we execute for issuing interrupts).
 
 NOTE:   The memory is *always* in little endian format, son on non-x86
-        systems you will need to do endian translations to access this
-        memory.
+	systems you will need to do endian translations to access this
+	memory.
 ****************************************************************************/
 void * PMAPI BE_getVESABuf(
     uint *len,
@@ -416,28 +416,28 @@
     PM_imports *pmImp)
 {
     static BE_exports _BE_exports = {
-        sizeof(BE_exports),
-        BE_init,
-        BE_setVGA,
-        BE_getVGA,
-        BE_mapRealPointer,
-        BE_getVESABuf,
-        BE_callRealMode,
-        BE_int86,
-        BE_int86x,
-        NULL,
-        BE_exit,
-        };
+	sizeof(BE_exports),
+	BE_init,
+	BE_setVGA,
+	BE_getVGA,
+	BE_mapRealPointer,
+	BE_getVESABuf,
+	BE_callRealMode,
+	BE_int86,
+	BE_int86x,
+	NULL,
+	BE_exit,
+	};
     int     i,max;
     ulong   *p;
 
-    // Initialize all default imports to point to fatal error handler
-    // for upwards compatibility.
+    /* Initialize all default imports to point to fatal error handler */
+    /* for upwards compatibility. */
     max = sizeof(_PM_imports)/sizeof(BE_initLibrary_t);
     for (i = 0,p = (ulong*)&_PM_imports; i < max; i++)
-        *p++ = (ulong)_PM_fatalErrorHandler;
+	*p++ = (ulong)_PM_fatalErrorHandler;
 
-    // Now copy all our imported functions
+    /* Now copy all our imported functions */
     memcpy(&_PM_imports,pmImp,MIN(sizeof(_PM_imports),pmImp->dwSize));
     return &_BE_exports;
 }

diff --git a/board/MAI/bios_emulator/scitech/src/biosemu/warmboot.c b/board/MAI/bios_emulator/scitech/src/biosemu/warmboot.c
index 96fa5a0..98d5fb8 100644
--- a/board/MAI/bios_emulator/scitech/src/biosemu/warmboot.c
+++ b/board/MAI/bios_emulator/scitech/src/biosemu/warmboot.c

@@ -112,16 +112,16 @@
     int     bar;
 
     for (bar = 0x10; bar <= 0x14; bar++) {
-        base = PCI_readPCIRegL(bar,device) & ~0xFF;
-        if (!(base & 0x1)) {
-            PCI_writePCIRegL(bar,0xFFFFFFFF,device);
-            size = PCI_readPCIRegL(bar,device) & ~0xFF;
-            size = ~size+1;
-            PCI_writePCIRegL(bar,0,device);
-            if (size >= MAX_BIOSLEN)
-                return base;
-            }
-        }
+	base = PCI_readPCIRegL(bar,device) & ~0xFF;
+	if (!(base & 0x1)) {
+	    PCI_writePCIRegL(bar,0xFFFFFFFF,device);
+	    size = PCI_readPCIRegL(bar,device) & ~0xFF;
+	    size = ~size+1;
+	    PCI_writePCIRegL(bar,0,device);
+	    if (size >= MAX_BIOSLEN)
+		return base;
+	    }
+	}
     return 0;
 }
 
@@ -138,13 +138,13 @@
     int i;
 
     for (i = 0; i < NumDevices; i++) {
-        PCI_writePCIRegL(0x10,PCI[DeviceIndex[i]].BaseAddress10,i);
-        PCI_writePCIRegL(0x14,PCI[DeviceIndex[i]].BaseAddress14,i);
-        PCI_writePCIRegL(0x18,PCI[DeviceIndex[i]].BaseAddress18,i);
-        PCI_writePCIRegL(0x1C,PCI[DeviceIndex[i]].BaseAddress1C,i);
-        PCI_writePCIRegL(0x20,PCI[DeviceIndex[i]].BaseAddress20,i);
-        PCI_writePCIRegL(0x24,PCI[DeviceIndex[i]].BaseAddress24,i);
-        }
+	PCI_writePCIRegL(0x10,PCI[DeviceIndex[i]].BaseAddress10,i);
+	PCI_writePCIRegL(0x14,PCI[DeviceIndex[i]].BaseAddress14,i);
+	PCI_writePCIRegL(0x18,PCI[DeviceIndex[i]].BaseAddress18,i);
+	PCI_writePCIRegL(0x1C,PCI[DeviceIndex[i]].BaseAddress1C,i);
+	PCI_writePCIRegL(0x20,PCI[DeviceIndex[i]].BaseAddress20,i);
+	PCI_writePCIRegL(0x24,PCI[DeviceIndex[i]].BaseAddress24,i);
+	}
 }
 
 /****************************************************************************
@@ -165,29 +165,29 @@
     RMREGS          regs;
     RMSREGS         sregs;
 
-    // Determine the value to store in AX for BIOS POST
+    /* Determine the value to store in AX for BIOS POST */
     regs.x.ax = (u16)(PCI[DeviceIndex[device]].slot.i >> 8);
     if (useV86) {
-        // Post the BIOS using the PM functions (ie: v86 mode on Linux)
-        if (!PM_doBIOSPOST(regs.x.ax,BIOSPhysAddr,mappedBIOS,BIOSLen)) {
-            // If the PM function fails, this probably means are we are on
-            // DOS and can't re-map the real mode 0xC0000 region. In thise
-            // case if the device is the primary, we can use the real
-            // BIOS at 0xC0000 directly.
-            if (device == 0)
-                PM_doBIOSPOST(regs.x.ax,0xC0000,mappedBIOS,BIOSLen);
-            }
-        }
+	/* Post the BIOS using the PM functions (ie: v86 mode on Linux) */
+	if (!PM_doBIOSPOST(regs.x.ax,BIOSPhysAddr,mappedBIOS,BIOSLen)) {
+	    /* If the PM function fails, this probably means are we are on */
+	    /* DOS and can't re-map the real mode 0xC0000 region. In thise */
+	    /* case if the device is the primary, we can use the real */
+	    /* BIOS at 0xC0000 directly. */
+	    if (device == 0)
+		PM_doBIOSPOST(regs.x.ax,0xC0000,mappedBIOS,BIOSLen);
+	    }
+	}
     else {
-        // Setup the X86 emulator for the VGA BIOS
-        BE_setVGA(&VGAInfo[device]);
+	/* Setup the X86 emulator for the VGA BIOS */
+	BE_setVGA(&VGAInfo[device]);
 
-        // Execute the BIOS POST code
-        BE_callRealMode(0xC000,0x0003,&regs,&sregs);
+	/* Execute the BIOS POST code */
+	BE_callRealMode(0xC000,0x0003,&regs,&sregs);
 
-        // Cleanup and exit
-        BE_getVGA(&VGAInfo[device]);
-        }
+	/* Cleanup and exit */
+	BE_getVGA(&VGAInfo[device]);
+	}
 }
 
 /****************************************************************************
@@ -206,113 +206,113 @@
     char    filename[_MAX_PATH];
     FILE    *f;
 
-    // Disable the primary display controller and AGP VGA pass-through
+    /* Disable the primary display controller and AGP VGA pass-through */
     DISABLE_DEVICE(0);
     if (AGPBridge)
-        DISABLE_AGP_VGA();
+	DISABLE_AGP_VGA();
 
-    // Now POST all the secondary controllers
+    /* Now POST all the secondary controllers */
     for (device = 0; device < NumDevices; device++) {
-        // Skip the device if it is not enabled (probably an ISA device)
-        if (DeviceIndex[device] == -1)
-            continue;
+	/* Skip the device if it is not enabled (probably an ISA device) */
+	if (DeviceIndex[device] == -1)
+	    continue;
 
-        // Enable secondary display controller. If the secondary controller
-        // is on the AGP bus, then enable VGA resources for the AGP device.
-        ENABLE_DEVICE(device);
-        if (AGPBridge && AGPBridge->SecondayBusNumber == PCI[DeviceIndex[device]].slot.p.Bus)
-            ENABLE_AGP_VGA();
+	/* Enable secondary display controller. If the secondary controller */
+	/* is on the AGP bus, then enable VGA resources for the AGP device. */
+	ENABLE_DEVICE(device);
+	if (AGPBridge && AGPBridge->SecondayBusNumber == PCI[DeviceIndex[device]].slot.p.Bus)
+	    ENABLE_AGP_VGA();
 
-        // Check if the controller has already been POST'ed
-        if (VGA_NOT_ACTIVE()) {
-            // Find a viable place to map the secondary PCI BIOS image and map it
-            printk("Device %d not enabled, so attempting warm boot it\n", device);
+	/* Check if the controller has already been POST'ed */
+	if (VGA_NOT_ACTIVE()) {
+	    /* Find a viable place to map the secondary PCI BIOS image and map it */
+	    printk("Device %d not enabled, so attempting warm boot it\n", device);
 
-            // For AGP devices (and PCI devices that do have the ROM base
-            // address zero'ed out) we have to map the BIOS to a location
-            // that is passed by the AGP bridge to the bus. Some AGP devices
-            // have the ROM base address already set up for us, and some
-            // do not (we map to one of the existing BAR locations in
-            // this case).
-            mappedBIOS = NULL;
-            if (PCI[DeviceIndex[device]].ROMBaseAddress != 0)
-                mappedBIOSPhys = PCI[DeviceIndex[device]].ROMBaseAddress & ~0xF;
-            else
-                mappedBIOSPhys = PCI_findBIOSAddr(device);
-            printk("Mapping BIOS image to 0x%08X\n", mappedBIOSPhys);
-            mappedBIOS = PM_mapPhysicalAddr(mappedBIOSPhys,MAX_BIOSLEN-1,false);
-            PCI_writePCIRegL(0x30,mappedBIOSPhys | 0x1,device);
-            BIOSImageLen = mappedBIOS[2] * 512;
-            if ((copyOfBIOS = malloc(BIOSImageLen)) == NULL)
-                return false;
-            memcpy(copyOfBIOS,mappedBIOS,BIOSImageLen);
-            PM_freePhysicalAddr(mappedBIOS,MAX_BIOSLEN-1);
+	    /* For AGP devices (and PCI devices that do have the ROM base */
+	    /* address zero'ed out) we have to map the BIOS to a location */
+	    /* that is passed by the AGP bridge to the bus. Some AGP devices */
+	    /* have the ROM base address already set up for us, and some */
+	    /* do not (we map to one of the existing BAR locations in */
+	    /* this case). */
+	    mappedBIOS = NULL;
+	    if (PCI[DeviceIndex[device]].ROMBaseAddress != 0)
+		mappedBIOSPhys = PCI[DeviceIndex[device]].ROMBaseAddress & ~0xF;
+	    else
+		mappedBIOSPhys = PCI_findBIOSAddr(device);
+	    printk("Mapping BIOS image to 0x%08X\n", mappedBIOSPhys);
+	    mappedBIOS = PM_mapPhysicalAddr(mappedBIOSPhys,MAX_BIOSLEN-1,false);
+	    PCI_writePCIRegL(0x30,mappedBIOSPhys | 0x1,device);
+	    BIOSImageLen = mappedBIOS[2] * 512;
+	    if ((copyOfBIOS = malloc(BIOSImageLen)) == NULL)
+		return false;
+	    memcpy(copyOfBIOS,mappedBIOS,BIOSImageLen);
+	    PM_freePhysicalAddr(mappedBIOS,MAX_BIOSLEN-1);
 
-            // Allocate memory to store copy of BIOS from secondary controllers
-            VGAInfo[device].pciInfo = &PCI[DeviceIndex[device]];
-            VGAInfo[device].BIOSImage = copyOfBIOS;
-            VGAInfo[device].BIOSImageLen = BIOSImageLen;
+	    /* Allocate memory to store copy of BIOS from secondary controllers */
+	    VGAInfo[device].pciInfo = &PCI[DeviceIndex[device]];
+	    VGAInfo[device].BIOSImage = copyOfBIOS;
+	    VGAInfo[device].BIOSImageLen = BIOSImageLen;
 
-            // Restore device mappings
-            PCI_writePCIRegL(0x30,PCI[DeviceIndex[device]].ROMBaseAddress,device);
-            PCI_writePCIRegL(0x10,PCI[DeviceIndex[device]].BaseAddress10,device);
-            PCI_writePCIRegL(0x14,PCI[DeviceIndex[device]].BaseAddress14,device);
+	    /* Restore device mappings */
+	    PCI_writePCIRegL(0x30,PCI[DeviceIndex[device]].ROMBaseAddress,device);
+	    PCI_writePCIRegL(0x10,PCI[DeviceIndex[device]].BaseAddress10,device);
+	    PCI_writePCIRegL(0x14,PCI[DeviceIndex[device]].BaseAddress14,device);
 
-            // Now execute the BIOS POST for the device
-            if (copyOfBIOS[0] == 0x55 && copyOfBIOS[1] == 0xAA) {
-                printk("Executing BIOS POST for controller.\n");
-                PCI_doBIOSPOST(device,mappedBIOSPhys,copyOfBIOS,BIOSImageLen);
-                }
+	    /* Now execute the BIOS POST for the device */
+	    if (copyOfBIOS[0] == 0x55 && copyOfBIOS[1] == 0xAA) {
+		printk("Executing BIOS POST for controller.\n");
+		PCI_doBIOSPOST(device,mappedBIOSPhys,copyOfBIOS,BIOSImageLen);
+		}
 
-            // Reset the size of the BIOS image to the final size
-            VGAInfo[device].BIOSImageLen = FINAL_BIOSLEN;
+	    /* Reset the size of the BIOS image to the final size */
+	    VGAInfo[device].BIOSImageLen = FINAL_BIOSLEN;
 
-            // Save the BIOS and interrupt vector information to disk
-            sprintf(filename,"%s/bios.%02d",PM_getNucleusConfigPath(),device);
-            if ((f = fopen(filename,"wb")) != NULL) {
-                fwrite(copyOfBIOS,1,FINAL_BIOSLEN,f);
-                fwrite(VGAInfo[device].LowMem,1,sizeof(VGAInfo[device].LowMem),f);
-                fclose(f);
-                }
-            }
-        else {
-            // Allocate memory to store copy of BIOS from secondary controllers
-            if ((copyOfBIOS = malloc(FINAL_BIOSLEN)) == NULL)
-                return false;
-            VGAInfo[device].pciInfo = &PCI[DeviceIndex[device]];
-            VGAInfo[device].BIOSImage = copyOfBIOS;
-            VGAInfo[device].BIOSImageLen = FINAL_BIOSLEN;
+	    /* Save the BIOS and interrupt vector information to disk */
+	    sprintf(filename,"%s/bios.%02d",PM_getNucleusConfigPath(),device);
+	    if ((f = fopen(filename,"wb")) != NULL) {
+		fwrite(copyOfBIOS,1,FINAL_BIOSLEN,f);
+		fwrite(VGAInfo[device].LowMem,1,sizeof(VGAInfo[device].LowMem),f);
+		fclose(f);
+		}
+	    }
+	else {
+	    /* Allocate memory to store copy of BIOS from secondary controllers */
+	    if ((copyOfBIOS = malloc(FINAL_BIOSLEN)) == NULL)
+		return false;
+	    VGAInfo[device].pciInfo = &PCI[DeviceIndex[device]];
+	    VGAInfo[device].BIOSImage = copyOfBIOS;
+	    VGAInfo[device].BIOSImageLen = FINAL_BIOSLEN;
 
-            // Load the BIOS and interrupt vector information from disk
-            sprintf(filename,"%s/bios.%02d",PM_getNucleusConfigPath(),device);
-            if ((f = fopen(filename,"rb")) != NULL) {
-                fread(copyOfBIOS,1,FINAL_BIOSLEN,f);
-                fread(VGAInfo[device].LowMem,1,sizeof(VGAInfo[device].LowMem),f);
-                fclose(f);
-                }
-            }
+	    /* Load the BIOS and interrupt vector information from disk */
+	    sprintf(filename,"%s/bios.%02d",PM_getNucleusConfigPath(),device);
+	    if ((f = fopen(filename,"rb")) != NULL) {
+		fread(copyOfBIOS,1,FINAL_BIOSLEN,f);
+		fread(VGAInfo[device].LowMem,1,sizeof(VGAInfo[device].LowMem),f);
+		fclose(f);
+		}
+	    }
 
-        // Fix up all the secondary PCI base address registers
-        // (restores them all from the values we read previously)
-        _PCI_fixupSecondaryBARs();
+	/* Fix up all the secondary PCI base address registers */
+	/* (restores them all from the values we read previously) */
+	_PCI_fixupSecondaryBARs();
 
-        // Disable the secondary controller and AGP VGA pass-through
-        DISABLE_DEVICE(device);
-        if (AGPBridge)
-            DISABLE_AGP_VGA();
-        }
+	/* Disable the secondary controller and AGP VGA pass-through */
+	DISABLE_DEVICE(device);
+	if (AGPBridge)
+	    DISABLE_AGP_VGA();
+	}
 
-    // Reenable primary display controller and reset AGP bridge control
+    /* Reenable primary display controller and reset AGP bridge control */
     if (AGPBridge)
-        RESTORE_AGP_VGA();
+	RESTORE_AGP_VGA();
     ENABLE_DEVICE(0);
 
-    // Free physical BIOS image mapping
+    /* Free physical BIOS image mapping */
     PM_freePhysicalAddr(mappedBIOS,MAX_BIOSLEN-1);
 
-    // Restore the X86 emulator BIOS info to primary controller
+    /* Restore the X86 emulator BIOS info to primary controller */
     if (!useV86)
-        BE_setVGA(&VGAInfo[0]);
+	BE_setVGA(&VGAInfo[0]);
     return true;
 }
 
@@ -327,123 +327,123 @@
     PCIBridgeInfo   *info;
 
     printk("Displaying enumeration of PCI bus (%d devices, %d display devices)\n",
-        NumPCI, NumDevices);
+	NumPCI, NumDevices);
     for (index = 0; index < NumDevices; index++)
-        printk("  Display device %d is PCI device %d\n",index,DeviceIndex[index]);
+	printk("  Display device %d is PCI device %d\n",index,DeviceIndex[index]);
     printk("\n");
     printk("Bus Slot Fnc DeviceID  SubSystem Rev Class IRQ Int Cmd\n");
     for (i = 0; i < NumPCI; i++) {
-        printk("%2d   %2d  %2d  %04X:%04X %04X:%04X %02X  %02X:%02X %02X  %02X  %04X   ",
-            PCI[i].slot.p.Bus,
-            PCI[i].slot.p.Device,
-            PCI[i].slot.p.Function,
-            PCI[i].VendorID,
-            PCI[i].DeviceID,
-            PCI[i].SubSystemVendorID,
-            PCI[i].SubSystemID,
-            PCI[i].RevID,
-            PCI[i].BaseClass,
-            PCI[i].SubClass,
-            PCI[i].InterruptLine,
-            PCI[i].InterruptPin,
-            PCI[i].Command);
-        for (index = 0; index < NumDevices; index++) {
-            if (DeviceIndex[index] == i)
-                break;
-            }
-        if (index < NumDevices)
-            printk("<- %d\n", index);
-        else
-            printk("\n");
-        }
+	printk("%2d   %2d  %2d  %04X:%04X %04X:%04X %02X  %02X:%02X %02X  %02X  %04X   ",
+	    PCI[i].slot.p.Bus,
+	    PCI[i].slot.p.Device,
+	    PCI[i].slot.p.Function,
+	    PCI[i].VendorID,
+	    PCI[i].DeviceID,
+	    PCI[i].SubSystemVendorID,
+	    PCI[i].SubSystemID,
+	    PCI[i].RevID,
+	    PCI[i].BaseClass,
+	    PCI[i].SubClass,
+	    PCI[i].InterruptLine,
+	    PCI[i].InterruptPin,
+	    PCI[i].Command);
+	for (index = 0; index < NumDevices; index++) {
+	    if (DeviceIndex[index] == i)
+		break;
+	    }
+	if (index < NumDevices)
+	    printk("<- %d\n", index);
+	else
+	    printk("\n");
+	}
     printk("\n");
     printk("DeviceID  Stat Ifc Cch Lat Hdr BIST\n");
     for (i = 0; i < NumPCI; i++) {
-        printk("%04X:%04X %04X  %02X  %02X  %02X  %02X  %02X   ",
-            PCI[i].VendorID,
-            PCI[i].DeviceID,
-            PCI[i].Status,
-            PCI[i].Interface,
-            PCI[i].CacheLineSize,
-            PCI[i].LatencyTimer,
-            PCI[i].HeaderType,
-            PCI[i].BIST);
-        for (index = 0; index < NumDevices; index++) {
-            if (DeviceIndex[index] == i)
-                break;
-            }
-        if (index < NumDevices)
-            printk("<- %d\n", index);
-        else
-            printk("\n");
-        }
+	printk("%04X:%04X %04X  %02X  %02X  %02X  %02X  %02X   ",
+	    PCI[i].VendorID,
+	    PCI[i].DeviceID,
+	    PCI[i].Status,
+	    PCI[i].Interface,
+	    PCI[i].CacheLineSize,
+	    PCI[i].LatencyTimer,
+	    PCI[i].HeaderType,
+	    PCI[i].BIST);
+	for (index = 0; index < NumDevices; index++) {
+	    if (DeviceIndex[index] == i)
+		break;
+	    }
+	if (index < NumDevices)
+	    printk("<- %d\n", index);
+	else
+	    printk("\n");
+	}
     printk("\n");
     printk("DeviceID  Base10h  Base14h  Base18h  Base1Ch  Base20h  Base24h  ROMBase\n");
     for (i = 0; i < NumPCI; i++) {
-        printk("%04X:%04X %08X %08X %08X %08X %08X %08X %08X ",
-            PCI[i].VendorID,
-            PCI[i].DeviceID,
-            PCI[i].BaseAddress10,
-            PCI[i].BaseAddress14,
-            PCI[i].BaseAddress18,
-            PCI[i].BaseAddress1C,
-            PCI[i].BaseAddress20,
-            PCI[i].BaseAddress24,
-            PCI[i].ROMBaseAddress);
-        for (index = 0; index < NumDevices; index++) {
-            if (DeviceIndex[index] == i)
-                break;
-            }
-        if (index < NumDevices)
-            printk("<- %d\n", index);
-        else
-            printk("\n");
-        }
+	printk("%04X:%04X %08X %08X %08X %08X %08X %08X %08X ",
+	    PCI[i].VendorID,
+	    PCI[i].DeviceID,
+	    PCI[i].BaseAddress10,
+	    PCI[i].BaseAddress14,
+	    PCI[i].BaseAddress18,
+	    PCI[i].BaseAddress1C,
+	    PCI[i].BaseAddress20,
+	    PCI[i].BaseAddress24,
+	    PCI[i].ROMBaseAddress);
+	for (index = 0; index < NumDevices; index++) {
+	    if (DeviceIndex[index] == i)
+		break;
+	    }
+	if (index < NumDevices)
+	    printk("<- %d\n", index);
+	else
+	    printk("\n");
+	}
     printk("\n");
     printk("DeviceID  BAR10Len BAR14Len BAR18Len BAR1CLen BAR20Len BAR24Len ROMLen\n");
     for (i = 0; i < NumPCI; i++) {
-        printk("%04X:%04X %08X %08X %08X %08X %08X %08X %08X ",
-            PCI[i].VendorID,
-            PCI[i].DeviceID,
-            PCI[i].BaseAddress10Len,
-            PCI[i].BaseAddress14Len,
-            PCI[i].BaseAddress18Len,
-            PCI[i].BaseAddress1CLen,
-            PCI[i].BaseAddress20Len,
-            PCI[i].BaseAddress24Len,
-            PCI[i].ROMBaseAddressLen);
-        for (index = 0; index < NumDevices; index++) {
-            if (DeviceIndex[index] == i)
-                break;
-            }
-        if (index < NumDevices)
-            printk("<- %d\n", index);
-        else
-            printk("\n");
-        }
+	printk("%04X:%04X %08X %08X %08X %08X %08X %08X %08X ",
+	    PCI[i].VendorID,
+	    PCI[i].DeviceID,
+	    PCI[i].BaseAddress10Len,
+	    PCI[i].BaseAddress14Len,
+	    PCI[i].BaseAddress18Len,
+	    PCI[i].BaseAddress1CLen,
+	    PCI[i].BaseAddress20Len,
+	    PCI[i].BaseAddress24Len,
+	    PCI[i].ROMBaseAddressLen);
+	for (index = 0; index < NumDevices; index++) {
+	    if (DeviceIndex[index] == i)
+		break;
+	    }
+	if (index < NumDevices)
+	    printk("<- %d\n", index);
+	else
+	    printk("\n");
+	}
     printk("\n");
     printk("Displaying enumeration of %d bridge devices\n",NumBridges);
     printk("\n");
     printk("DeviceID  P# S# B# IOB  IOL  MemBase  MemLimit PreBase  PreLimit Ctrl\n");
     for (i = 0; i < NumBridges; i++) {
-        info = (PCIBridgeInfo*)&PCI[BridgeIndex[i]];
-        printk("%04X:%04X %02X %02X %02X %04X %04X %08X %08X %08X %08X %04X\n",
-            info->VendorID,
-            info->DeviceID,
-            info->PrimaryBusNumber,
-            info->SecondayBusNumber,
-            info->SubordinateBusNumber,
-            ((u16)info->IOBase << 8) & 0xF000,
-            info->IOLimit ?
-                ((u16)info->IOLimit << 8) | 0xFFF : 0,
-            ((u32)info->MemoryBase << 16) & 0xFFF00000,
-            info->MemoryLimit ?
-                ((u32)info->MemoryLimit << 16) | 0xFFFFF : 0,
-            ((u32)info->PrefetchableMemoryBase << 16) & 0xFFF00000,
-            info->PrefetchableMemoryLimit ?
-                ((u32)info->PrefetchableMemoryLimit << 16) | 0xFFFFF : 0,
-            info->BridgeControl);
-        }
+	info = (PCIBridgeInfo*)&PCI[BridgeIndex[i]];
+	printk("%04X:%04X %02X %02X %02X %04X %04X %08X %08X %08X %08X %04X\n",
+	    info->VendorID,
+	    info->DeviceID,
+	    info->PrimaryBusNumber,
+	    info->SecondayBusNumber,
+	    info->SubordinateBusNumber,
+	    ((u16)info->IOBase << 8) & 0xF000,
+	    info->IOLimit ?
+		((u16)info->IOLimit << 8) | 0xFFF : 0,
+	    ((u32)info->MemoryBase << 16) & 0xFFF00000,
+	    info->MemoryLimit ?
+		((u32)info->MemoryLimit << 16) | 0xFFFFF : 0,
+	    ((u32)info->PrefetchableMemoryBase << 16) & 0xFFF00000,
+	    info->PrefetchableMemoryLimit ?
+		((u32)info->PrefetchableMemoryLimit << 16) | 0xFFFFF : 0,
+	    info->BridgeControl);
+	}
     printk("\n");
 }
 
@@ -460,51 +460,51 @@
     int             i,j;
     PCIBridgeInfo   *info;
 
-    // If this is the first time we have been called, enumerate all
-    // devices on the PCI bus.
+    /* If this is the first time we have been called, enumerate all */
+    /* devices on the PCI bus. */
     if (NumPCI == -1) {
-        for (i = 0; i < MAX_PCI_DEVICES; i++)
-            PCI[i].dwSize = sizeof(PCI[i]);
-        if ((NumPCI = PCI_enumerate(PCI,MAX_PCI_DEVICES)) == 0)
-            return -1;
+	for (i = 0; i < MAX_PCI_DEVICES; i++)
+	    PCI[i].dwSize = sizeof(PCI[i]);
+	if ((NumPCI = PCI_enumerate(PCI,MAX_PCI_DEVICES)) == 0)
+	    return -1;
 
-        // Build a list of all PCI bridge devices
-        for (i = 0,NumBridges = 0,BridgeIndex[0] = -1; i < NumPCI; i++) {
-            if (PCI[i].BaseClass == PCI_BRIDGE_CLASS) {
-                if (NumBridges < MAX_PCI_DEVICES)
-                    BridgeIndex[NumBridges++] = i;
-                }
-            }
+	/* Build a list of all PCI bridge devices */
+	for (i = 0,NumBridges = 0,BridgeIndex[0] = -1; i < NumPCI; i++) {
+	    if (PCI[i].BaseClass == PCI_BRIDGE_CLASS) {
+		if (NumBridges < MAX_PCI_DEVICES)
+		    BridgeIndex[NumBridges++] = i;
+		}
+	    }
 
-        // Now build a list of all display class devices
-        for (i = 0,NumDevices = 1,DeviceIndex[0] = -1; i < NumPCI; i++) {
-            if (PCI_IS_DISPLAY_CLASS(&PCI[i])) {
-                if ((PCI[i].Command & 0x3) == 0x3) {
-                    DeviceIndex[0] = i;
-                    }
-                else {
-                    if (NumDevices < MAX_PCI_DEVICES)
-                        DeviceIndex[NumDevices++] = i;
-                    }
-                if (PCI[i].slot.p.Bus != 0) {
-                    // This device is on a different bus than the primary
-                    // PCI bus, so it is probably an AGP device. Find the
-                    // AGP bus device that controls that bus so we can
-                    // control it.
-                    for (j = 0; j < NumBridges; j++) {
-                        info = (PCIBridgeInfo*)&PCI[BridgeIndex[j]];
-                        if (info->SecondayBusNumber == PCI[i].slot.p.Bus) {
-                            AGPBridge = info;
-                            break;
-                            }
-                        }
-                    }
-                }
-            }
+	/* Now build a list of all display class devices */
+	for (i = 0,NumDevices = 1,DeviceIndex[0] = -1; i < NumPCI; i++) {
+	    if (PCI_IS_DISPLAY_CLASS(&PCI[i])) {
+		if ((PCI[i].Command & 0x3) == 0x3) {
+		    DeviceIndex[0] = i;
+		    }
+		else {
+		    if (NumDevices < MAX_PCI_DEVICES)
+			DeviceIndex[NumDevices++] = i;
+		    }
+		if (PCI[i].slot.p.Bus != 0) {
+		    /* This device is on a different bus than the primary */
+		    /* PCI bus, so it is probably an AGP device. Find the */
+		    /* AGP bus device that controls that bus so we can */
+		    /* control it. */
+		    for (j = 0; j < NumBridges; j++) {
+			info = (PCIBridgeInfo*)&PCI[BridgeIndex[j]];
+			if (info->SecondayBusNumber == PCI[i].slot.p.Bus) {
+			    AGPBridge = info;
+			    break;
+			    }
+			}
+		    }
+		}
+	    }
 
-        // Enumerate all PCI and bridge devices to log file
-        EnumeratePCI();
-        }
+	/* Enumerate all PCI and bridge devices to log file */
+	EnumeratePCI();
+	}
     return NumDevices;
 }
 
@@ -522,48 +522,48 @@
 int main(int argc,char *argv[])
 {
     while (argc > 1) {
-        if (stricmp(argv[1],"-usev86") == 0) {
-            useV86 = true;
-            }
-        else if (stricmp(argv[1],"-force") == 0) {
-            forcePost = true;
-            }
+	if (stricmp(argv[1],"-usev86") == 0) {
+	    useV86 = true;
+	    }
+	else if (stricmp(argv[1],"-force") == 0) {
+	    forcePost = true;
+	    }
 #ifdef  DEBUG
-        else if (stricmp(argv[1],"-decode") == 0) {
-            debugFlags |= DEBUG_DECODE_F;
-            }
-        else if (stricmp(argv[1],"-iotrace") == 0) {
-            debugFlags |= DEBUG_IO_TRACE_F;
-            }
+	else if (stricmp(argv[1],"-decode") == 0) {
+	    debugFlags |= DEBUG_DECODE_F;
+	    }
+	else if (stricmp(argv[1],"-iotrace") == 0) {
+	    debugFlags |= DEBUG_IO_TRACE_F;
+	    }
 #endif
-        else {
-            printf("Usage: warmboot [-usev86] [-force] [-decode] [-iotrace]\n");
-            exit(-1);
-            }
-        argc--;
-        argv++;
-        }
+	else {
+	    printf("Usage: warmboot [-usev86] [-force] [-decode] [-iotrace]\n");
+	    exit(-1);
+	    }
+	argc--;
+	argv++;
+	}
     if ((logfile = fopen("warmboot.log","w")) == NULL)
-        exit(1);
+	exit(1);
 
     PM_init();
     if (!useV86) {
-        // Initialise the x86 BIOS emulator
-        BE_init(false,debugFlags,65536,&VGAInfo[0]);
-        }
+	/* Initialise the x86 BIOS emulator */
+	BE_init(false,debugFlags,65536,&VGAInfo[0]);
+	}
 
-    // Enumerate all devices (which POST's them at the same time)
+    /* Enumerate all devices (which POST's them at the same time) */
     if (PCI_enumerateDevices() < 1) {
-        printk("No PCI display devices found!\n");
-        return -1;
-        }
+	printk("No PCI display devices found!\n");
+	return -1;
+	}
 
-    // Post all the display controller BIOS'es
+    /* Post all the display controller BIOS'es */
     PCI_postControllers();
 
-    // Cleanup and exit the emulator
+    /* Cleanup and exit the emulator */
     if (!useV86)
-        BE_exit();
+	BE_exit();
     fclose(logfile);
     return 0;
 }

diff --git a/board/MAI/bios_emulator/scitech/src/common/aabeos.c b/board/MAI/bios_emulator/scitech/src/common/aabeos.c
index ba86459..ad5698a 100644
--- a/board/MAI/bios_emulator/scitech/src/common/aabeos.c
+++ b/board/MAI/bios_emulator/scitech/src/common/aabeos.c

@@ -70,7 +70,7 @@
 ibool NAPI GA_TimerInit(void)
 {
     if (_GA_haveCPUID() && (_GA_getCPUIDFeatures() & CPU_HaveRDTSC) != 0)
-        haveRDTSC = true;
+	haveRDTSC = true;
     return true;
 }
 
@@ -82,11 +82,11 @@
     GA_largeInteger *value)
 {
     if (haveRDTSC)
-        _GA_readTimeStamp(value);
+	_GA_readTimeStamp(value);
     else {
-        struct timeval t;
-        gettimeofday(&t, NULL);
-        value->low = t.tv_sec*1000000 + t.tv_usec;
-        value->high = 0;
-        }
+	struct timeval t;
+	gettimeofday(&t, NULL);
+	value->low = t.tv_sec*1000000 + t.tv_usec;
+	value->high = 0;
+	}
 }

diff --git a/board/MAI/bios_emulator/scitech/src/common/aados.c b/board/MAI/bios_emulator/scitech/src/common/aados.c
index e994f93..342d2f3 100644
--- a/board/MAI/bios_emulator/scitech/src/common/aados.c
+++ b/board/MAI/bios_emulator/scitech/src/common/aados.c

@@ -49,7 +49,7 @@
 ibool NAPI GA_TimerInit(void)
 {
     if (_GA_haveCPUID() && (_GA_getCPUIDFeatures() & CPU_HaveRDTSC) != 0)
-        return true;
+	return true;
     return false;
 }
 

diff --git a/board/MAI/bios_emulator/scitech/src/common/aalib.c b/board/MAI/bios_emulator/scitech/src/common/aalib.c
index 84bf7b3..5003b22 100644
--- a/board/MAI/bios_emulator/scitech/src/common/aalib.c
+++ b/board/MAI/bios_emulator/scitech/src/common/aalib.c

@@ -100,35 +100,35 @@
 
     /* Check if we have already loaded the driver */
     if (loaded)
-        return true;
+	return true;
     PM_init();
     _AA_exports.dwSize = sizeof(_AA_exports);
 
     /* Open the BPD file */
     if (!PM_findBPD(DLL_NAME,bpdpath))
-        return false;
+	return false;
     strcpy(filename,bpdpath);
     strcat(filename,DLL_NAME);
     if ((hModBPD = PE_loadLibrary(filename,false)) == NULL)
-        return false;
+	return false;
     if ((AA_initLibrary = (AA_initLibrary_t)PE_getProcAddress(hModBPD,"_AA_initLibrary")) == NULL)
-        return false;
+	return false;
     bpdpath[strlen(bpdpath)-1] = 0;
     if (strcmp(bpdpath,PM_getNucleusPath()) == 0)
-        strcpy(bpdpath,PM_getNucleusConfigPath());
+	strcpy(bpdpath,PM_getNucleusConfigPath());
     else {
-        PM_backslash(bpdpath);
-        strcat(bpdpath,"config");
-        }
+	PM_backslash(bpdpath);
+	strcat(bpdpath,"config");
+	}
     if ((aaExp = AA_initLibrary(bpdpath,filename,&_PM_imports,&_N_imports,&_AA_imports)) == NULL)
-        PM_fatalError("AA_initLibrary failed!\n");
+	PM_fatalError("AA_initLibrary failed!\n");
 
     /* Initialize all default imports to point to fatal error handler
      * for upwards compatibility, and copy the exported functions.
      */
     max = sizeof(_AA_exports)/sizeof(AA_initLibrary_t);
     for (i = 0,p = (ulong*)&_AA_exports; i < max; i++)
-        *p++ = (ulong)_AA_fatalErrorHandler;
+	*p++ = (ulong)_AA_fatalErrorHandler;
     memcpy(&_AA_exports,aaExp,MIN(sizeof(_AA_exports),aaExp->dwSize));
     loaded = true;
     return true;
@@ -143,7 +143,7 @@
 int NAPI AA_status(void)
 {
     if (!loaded)
-        return nDriverNotFound;
+	return nDriverNotFound;
     return _AA_exports.AA_status();
 }
 
@@ -152,7 +152,7 @@
     N_int32 status)
 {
     if (!loaded)
-        return "Unable to load Nucleus device driver!";
+	return "Unable to load Nucleus device driver!";
     return _AA_exports.AA_errorMsg(status);
 }
 
@@ -160,7 +160,7 @@
 int NAPI AA_getDaysLeft(void)
 {
     if (!LoadDriver())
-        return -1;
+	return -1;
     return _AA_exports.AA_getDaysLeft();
 }
 
@@ -168,7 +168,7 @@
 int NAPI AA_registerLicense(uchar *license)
 {
     if (!LoadDriver())
-        return 0;
+	return 0;
     return _AA_exports.AA_registerLicense(license);
 }
 
@@ -176,7 +176,7 @@
 int NAPI AA_enumerateDevices(void)
 {
     if (!LoadDriver())
-        return 0;
+	return 0;
     return _AA_exports.AA_enumerateDevices();
 }
 
@@ -184,7 +184,7 @@
 AA_devCtx * NAPI AA_loadDriver(N_int32 deviceIndex)
 {
     if (!LoadDriver())
-        return NULL;
+	return NULL;
     return _AA_exports.AA_loadDriver(deviceIndex);
 }
 #endif
@@ -211,15 +211,15 @@
     LZTimerObject   tm;
 
     if (_GA_haveCPUID() && (_GA_getCPUIDFeatures() & CPU_HaveRDTSC) != 0) {
-        if (!inited) {
-            ZTimerInit();
-            inited = true;
-            }
-        LZTimerOnExt(&tm);
-        while (LZTimerLapExt(&tm) < microSeconds)
-            ;
-        LZTimerOnExt(&tm);
-        }
+	if (!inited) {
+	    ZTimerInit();
+	    inited = true;
+	    }
+	LZTimerOnExt(&tm);
+	while (LZTimerLapExt(&tm) < microSeconds)
+	    ;
+	LZTimerOnExt(&tm);
+	}
     else
-        _OS_delay8253(microSeconds);
+	_OS_delay8253(microSeconds);
 }

diff --git a/board/MAI/bios_emulator/scitech/src/common/aalinux.c b/board/MAI/bios_emulator/scitech/src/common/aalinux.c
index 4385b23..d3d468e 100644
--- a/board/MAI/bios_emulator/scitech/src/common/aalinux.c
+++ b/board/MAI/bios_emulator/scitech/src/common/aalinux.c

@@ -72,7 +72,7 @@
 ibool NAPI GA_TimerInit(void)
 {
     if (_GA_haveCPUID() && (_GA_getCPUIDFeatures() & CPU_HaveRDTSC) != 0)
-        haveRDTSC = true;
+	haveRDTSC = true;
     return true;
 }
 
@@ -84,11 +84,11 @@
     GA_largeInteger *value)
 {
     if (haveRDTSC)
-        _GA_readTimeStamp(value);
+	_GA_readTimeStamp(value);
     else {
-        struct timeval t;
-        gettimeofday(&t, NULL);
-        value->low = t.tv_sec*1000000 + t.tv_usec;
-        value->high = 0;
-        }
+	struct timeval t;
+	gettimeofday(&t, NULL);
+	value->low = t.tv_sec*1000000 + t.tv_usec;
+	value->high = 0;
+	}
 }

diff --git a/board/MAI/bios_emulator/scitech/src/common/aaos2.c b/board/MAI/bios_emulator/scitech/src/common/aaos2.c
index 486b96a..0ec8c9f 100644
--- a/board/MAI/bios_emulator/scitech/src/common/aaos2.c
+++ b/board/MAI/bios_emulator/scitech/src/common/aaos2.c

@@ -65,25 +65,25 @@
 
     /* Open our helper device driver */
     if (DosOpen(PMHELP_NAME,&hSDDHelp,&result,0,0,
-            FILE_OPEN, OPEN_SHARE_DENYNONE | OPEN_ACCESS_READWRITE,
-            NULL))
-        PM_fatalError("Unable to open SDDHELP$ helper device driver!");
+	    FILE_OPEN, OPEN_SHARE_DENYNONE | OPEN_ACCESS_READWRITE,
+	    NULL))
+	PM_fatalError("Unable to open SDDHELP$ helper device driver!");
     outLen = sizeof(result);
     DosDevIOCtl(hSDDHelp,PMHELP_IOCTL,PMHELP_GETSHAREDINFO,
-        NULL, 0, NULL,
-        &result, outLen, &outLen);
+	NULL, 0, NULL,
+	&result, outLen, &outLen);
     DosClose(hSDDHelp);
     if (result) {
-        /* We have found the shared Nucleus packet. Because not all processes
-         * map to SDDPMI.DLL, we need to ensure that we connect to this
-         * DLL so that it gets mapped into our address space (that is
-         * where the shared Nucleus packet is located). Simply doing a
-         * DosLoadModule on it is enough for this.
-         */
-        HMODULE hModSDDPMI;
-        char    buf[80];
-        DosLoadModule((PSZ)buf,sizeof(buf),(PSZ)"SDDPMI.DLL",&hModSDDPMI);
-        }
+	/* We have found the shared Nucleus packet. Because not all processes
+	 * map to SDDPMI.DLL, we need to ensure that we connect to this
+	 * DLL so that it gets mapped into our address space (that is
+	 * where the shared Nucleus packet is located). Simply doing a
+	 * DosLoadModule on it is enough for this.
+	 */
+	HMODULE hModSDDPMI;
+	char    buf[80];
+	DosLoadModule((PSZ)buf,sizeof(buf),(PSZ)"SDDPMI.DLL",&hModSDDPMI);
+	}
     return (GA_sharedInfo*)result;
 }
 
@@ -106,7 +106,7 @@
 ibool NAPI GA_TimerInit(void)
 {
     if (_GA_haveCPUID() && (_GA_getCPUIDFeatures() & CPU_HaveRDTSC) != 0)
-        haveRDTSC = true;
+	haveRDTSC = true;
     return true;
 }
 
@@ -118,7 +118,7 @@
     GA_largeInteger *value)
 {
     if (haveRDTSC)
-        _GA_readTimeStamp(value);
+	_GA_readTimeStamp(value);
     else
-        DosTmrQueryTime((QWORD*)value);
+	DosTmrQueryTime((QWORD*)value);
 }

diff --git a/board/MAI/bios_emulator/scitech/src/common/aaqnx.c b/board/MAI/bios_emulator/scitech/src/common/aaqnx.c
index 2e26c9a..13531be 100644
--- a/board/MAI/bios_emulator/scitech/src/common/aaqnx.c
+++ b/board/MAI/bios_emulator/scitech/src/common/aaqnx.c

@@ -72,7 +72,7 @@
 ibool NAPI GA_TimerInit(void)
 {
     if (_GA_haveCPUID() && (_GA_getCPUIDFeatures() & CPU_HaveRDTSC) != 0)
-        haveRDTSC = true;
+	haveRDTSC = true;
     return true;
 }
 
@@ -84,12 +84,12 @@
     GA_largeInteger *value)
 {
     if (haveRDTSC)
-        _GA_readTimeStamp(value);
+	_GA_readTimeStamp(value);
     else {
-        struct timespec ts;
+	struct timespec ts;
 
-        clock_gettime(CLOCK_REALTIME, &ts);
-        value->low = (ts.tv_nsec / 1000 + ts.tv_sec * 1000000);
-        value->high = 0;
-        }
+	clock_gettime(CLOCK_REALTIME, &ts);
+	value->low = (ts.tv_nsec / 1000 + ts.tv_sec * 1000000);
+	value->high = 0;
+	}
 }

diff --git a/board/MAI/bios_emulator/scitech/src/common/aartt.c b/board/MAI/bios_emulator/scitech/src/common/aartt.c
index 17a06b5..1a5a67a 100644
--- a/board/MAI/bios_emulator/scitech/src/common/aartt.c
+++ b/board/MAI/bios_emulator/scitech/src/common/aartt.c

@@ -71,9 +71,9 @@
 ibool NAPI GA_TimerInit(void)
 {
     if (_GA_haveCPUID() && (_GA_getCPUIDFeatures() & CPU_HaveRDTSC) != 0) {
-        haveRDTSC = true;
-        return true;
-        }
+	haveRDTSC = true;
+	return true;
+	}
     return false;
 }
 
@@ -85,5 +85,5 @@
     GA_largeInteger *value)
 {
     if (haveRDTSC)
-        _GA_readTimeStamp(value);
+	_GA_readTimeStamp(value);
 }

diff --git a/board/MAI/bios_emulator/scitech/src/common/aasmx.c b/board/MAI/bios_emulator/scitech/src/common/aasmx.c
index 56cbd5b..163060f 100644
--- a/board/MAI/bios_emulator/scitech/src/common/aasmx.c
+++ b/board/MAI/bios_emulator/scitech/src/common/aasmx.c

@@ -68,7 +68,7 @@
 ibool NAPI GA_TimerInit(void)
 {
     if (_GA_haveCPUID() && (_GA_getCPUIDFeatures() & CPU_HaveRDTSC) != 0)
-        return true;
+	return true;
     return false;
 }
 

diff --git a/board/MAI/bios_emulator/scitech/src/common/aavxd.c b/board/MAI/bios_emulator/scitech/src/common/aavxd.c
index 295533d..221b02b 100644
--- a/board/MAI/bios_emulator/scitech/src/common/aavxd.c
+++ b/board/MAI/bios_emulator/scitech/src/common/aavxd.c

@@ -71,8 +71,8 @@
 ibool NAPI GA_TimerInit(void)
 {
     if (_GA_haveCPUID() && (_GA_getCPUIDFeatures() & CPU_HaveRDTSC) != 0) {
-        haveRDTSC = true;
-        }
+	haveRDTSC = true;
+	}
     return true;
 }
 
@@ -84,7 +84,7 @@
     GA_largeInteger *value)
 {
     if (haveRDTSC)
-        _GA_readTimeStamp(value);
+	_GA_readTimeStamp(value);
     else
-        VTD_Get_Real_Time(&value->high,&value->low);
+	VTD_Get_Real_Time(&value->high,&value->low);
 }

diff --git a/board/MAI/bios_emulator/scitech/src/common/aawin32.c b/board/MAI/bios_emulator/scitech/src/common/aawin32.c
index f63f004..541df4a 100644
--- a/board/MAI/bios_emulator/scitech/src/common/aawin32.c
+++ b/board/MAI/bios_emulator/scitech/src/common/aawin32.c

@@ -75,9 +75,9 @@
     PM_init();
     inBuf[0] = device;
     if (DeviceIoControl(_PM_hDevice, PMHELP_GETSHAREDINFO32, inBuf, sizeof(inBuf),
-            outBuf, sizeof(outBuf), &count, NULL)) {
-        return (GA_sharedInfo*)outBuf[0];
-        }
+	    outBuf, sizeof(outBuf), &count, NULL)) {
+	return (GA_sharedInfo*)outBuf[0];
+	}
     return NULL;
 }
 
@@ -102,16 +102,16 @@
     GA_devCtx *dc)
 {
     if (_PM_hDevice) {
-        DWORD   inBuf[1];   /* Buffer to send data to VxD       */
-        DWORD   outBuf[1];  /* Buffer to receive data from VxD  */
-        DWORD   count;      /* Count of bytes returned from VxD */
+	DWORD   inBuf[1];   /* Buffer to send data to VxD       */
+	DWORD   outBuf[1];  /* Buffer to receive data from VxD  */
+	DWORD   count;      /* Count of bytes returned from VxD */
 
-        inBuf[0] = (ulong)dc;
-        if (DeviceIoControl(_PM_hDevice, PMHELP_GASTEREOINIT32, inBuf, sizeof(inBuf),
-                outBuf, sizeof(outBuf), &count, NULL)) {
-            return outBuf[0];
-            }
-        }
+	inBuf[0] = (ulong)dc;
+	if (DeviceIoControl(_PM_hDevice, PMHELP_GASTEREOINIT32, inBuf, sizeof(inBuf),
+		outBuf, sizeof(outBuf), &count, NULL)) {
+	    return outBuf[0];
+	    }
+	}
     return false;
 }
 
@@ -122,9 +122,9 @@
 static void NAPI _GA_softStereoOn(void)
 {
     if (_PM_hDevice) {
-        DeviceIoControl(_PM_hDevice, PMHELP_GASTEREOON32, NULL, 0,
-            NULL, 0, NULL, NULL);
-        }
+	DeviceIoControl(_PM_hDevice, PMHELP_GASTEREOON32, NULL, 0,
+	    NULL, 0, NULL, NULL);
+	}
 }
 
 /****************************************************************************
@@ -137,14 +137,14 @@
     N_uint32 rightAddr)
 {
     if (_PM_hDevice) {
-        DWORD   inBuf[2];   /* Buffer to send data to VxD       */
-        DWORD   count;      /* Count of bytes returned from VxD */
+	DWORD   inBuf[2];   /* Buffer to send data to VxD       */
+	DWORD   count;      /* Count of bytes returned from VxD */
 
-        inBuf[0] = (ulong)leftAddr;
-        inBuf[1] = (ulong)rightAddr;
-        DeviceIoControl(_PM_hDevice, PMHELP_GASTEREOFLIP32, inBuf, sizeof(inBuf),
-            NULL, 0, &count, NULL);
-        }
+	inBuf[0] = (ulong)leftAddr;
+	inBuf[1] = (ulong)rightAddr;
+	DeviceIoControl(_PM_hDevice, PMHELP_GASTEREOFLIP32, inBuf, sizeof(inBuf),
+	    NULL, 0, &count, NULL);
+	}
 }
 
 /****************************************************************************
@@ -154,14 +154,14 @@
 static N_int32 NAPI _GA_softStereoGetFlipStatus(void)
 {
     if (_PM_hDevice) {
-        DWORD   outBuf[1];  /* Buffer to receive data from VxD  */
-        DWORD   count;      /* Count of bytes returned from VxD */
+	DWORD   outBuf[1];  /* Buffer to receive data from VxD  */
+	DWORD   count;      /* Count of bytes returned from VxD */
 
-        if (DeviceIoControl(_PM_hDevice, PMHELP_GASTEREOFLIPSTATUS32, NULL, 0,
-                outBuf, sizeof(outBuf), &count, NULL)) {
-            return outBuf[0];
-            }
-        }
+	if (DeviceIoControl(_PM_hDevice, PMHELP_GASTEREOFLIPSTATUS32, NULL, 0,
+		outBuf, sizeof(outBuf), &count, NULL)) {
+	    return outBuf[0];
+	    }
+	}
     return 0;
 }
 
@@ -172,7 +172,7 @@
 static void NAPI _GA_softStereoWaitTillFlipped(void)
 {
     while (!_GA_softStereoGetFlipStatus())
-        ;
+	;
 }
 
 /****************************************************************************
@@ -182,9 +182,9 @@
 static void NAPI _GA_softStereoOff(void)
 {
     if (_PM_hDevice) {
-        DeviceIoControl(_PM_hDevice, PMHELP_GASTEREOOFF32, NULL, 0,
-            NULL, 0, NULL, NULL);
-        }
+	DeviceIoControl(_PM_hDevice, PMHELP_GASTEREOOFF32, NULL, 0,
+	    NULL, 0, NULL, NULL);
+	}
 }
 
 /****************************************************************************
@@ -195,9 +195,9 @@
 static void NAPI _GA_softStereoExit(void)
 {
     if (_PM_hDevice) {
-        DeviceIoControl(_PM_hDevice, PMHELP_GASTEREOEXIT32, NULL, 0,
-            NULL, 0, NULL, NULL);
-        }
+	DeviceIoControl(_PM_hDevice, PMHELP_GASTEREOEXIT32, NULL, 0,
+	    NULL, 0, NULL, NULL);
+	}
 }
 
 /****************************************************************************
@@ -217,14 +217,14 @@
     N_int32     totalMemory = 0,oldIOPL;
 
     if (deviceIndex >= GA_MAX_DEVICES)
-        PM_fatalError("DeviceIndex too large in GA_loadDriver!");
+	PM_fatalError("DeviceIndex too large in GA_loadDriver!");
     PM_init();
     inBuf[0] = deviceIndex;
     if (DeviceIoControl(_PM_hDevice, PMHELP_GETMEMSIZE32,
-            inBuf, sizeof(inBuf), outBuf, sizeof(outBuf), NULL, NULL))
-        totalMemory = outBuf[0];
+	    inBuf, sizeof(inBuf), outBuf, sizeof(outBuf), NULL, NULL))
+	totalMemory = outBuf[0];
     if (totalMemory == 0)
-        totalMemory = 8192;
+	totalMemory = 8192;
     _GA_exports.GA_forceMemSize(totalMemory,shared);
     oldIOPL = PM_setIOPL(3);
     dc = ORG_GA_loadDriver(deviceIndex,shared);
@@ -240,13 +240,13 @@
 ibool NAPI GA_TimerInit(void)
 {
     if (_GA_haveCPUID() && (_GA_getCPUIDFeatures() & CPU_HaveRDTSC) != 0) {
-        haveRDTSC = true;
-        return true;
-        }
+	haveRDTSC = true;
+	return true;
+	}
     else if (QueryPerformanceFrequency((LARGE_INTEGER*)&countFreq)) {
-        haveRDTSC = false;
-        return true;
-        }
+	haveRDTSC = false;
+	return true;
+	}
     return false;
 }
 
@@ -258,7 +258,7 @@
     GA_largeInteger *value)
 {
     if (haveRDTSC)
-        _GA_readTimeStamp(value);
+	_GA_readTimeStamp(value);
     else
-        QueryPerformanceCounter((LARGE_INTEGER*)value);
+	QueryPerformanceCounter((LARGE_INTEGER*)value);
 }

diff --git a/board/MAI/bios_emulator/scitech/src/common/agplib.c b/board/MAI/bios_emulator/scitech/src/common/agplib.c
index df8f932..476eedc 100644
--- a/board/MAI/bios_emulator/scitech/src/common/agplib.c
+++ b/board/MAI/bios_emulator/scitech/src/common/agplib.c

@@ -88,31 +88,31 @@
 
     /* Check if we have already loaded the driver */
     if (loaded)
-        return true;
+	return true;
     PM_init();
 
     /* Open the BPD file */
     if (!PM_findBPD(DLL_NAME,bpdpath))
-        return false;
+	return false;
     strcpy(filename,bpdpath);
     strcat(filename,DLL_NAME);
     if ((hModBPD = PE_loadLibrary(filename,false)) == NULL)
-        return false;
+	return false;
     if ((AGP_initLibrary = (AGP_initLibrary_t)PE_getProcAddress(hModBPD,"_AGP_initLibrary")) == NULL)
-        return false;
+	return false;
     bpdpath[strlen(bpdpath)-1] = 0;
     if (strcmp(bpdpath,PM_getNucleusPath()) == 0)
-        strcpy(bpdpath,PM_getNucleusConfigPath());
+	strcpy(bpdpath,PM_getNucleusConfigPath());
     else {
-        PM_backslash(bpdpath);
-        strcat(bpdpath,"config");
-        }
+	PM_backslash(bpdpath);
+	strcat(bpdpath,"config");
+	}
     if ((agpExp = AGP_initLibrary(bpdpath,filename,GA_getSystemPMImports(),&_N_imports,&_AGP_imports)) == NULL)
-        PM_fatalError("AGP_initLibrary failed!\n");
+	PM_fatalError("AGP_initLibrary failed!\n");
     _AGP_exports.dwSize = sizeof(_AGP_exports);
     max = sizeof(_AGP_exports)/sizeof(AGP_initLibrary_t);
     for (i = 0,p = (ulong*)&_AGP_exports; i < max; i++)
-        *p++ = (ulong)_AGP_fatalErrorHandler;
+	*p++ = (ulong)_AGP_fatalErrorHandler;
     memcpy(&_AGP_exports,agpExp,MIN(sizeof(_AGP_exports),agpExp->dwSize));
     loaded = true;
     return true;
@@ -127,7 +127,7 @@
 int NAPI AGP_status(void)
 {
     if (!loaded)
-        return nDriverNotFound;
+	return nDriverNotFound;
     return _AGP_exports.AGP_status();
 }
 
@@ -136,7 +136,7 @@
     N_int32 status)
 {
     if (!loaded)
-        return "Unable to load Nucleus device driver!";
+	return "Unable to load Nucleus device driver!";
     return _AGP_exports.AGP_errorMsg(status);
 }
 
@@ -144,7 +144,7 @@
 AGP_devCtx * NAPI AGP_loadDriver(N_int32 deviceIndex)
 {
     if (!LoadDriver())
-        return NULL;
+	return NULL;
     return _AGP_exports.AGP_loadDriver(deviceIndex);
 }
 
@@ -153,7 +153,7 @@
     AGP_devCtx *dc)
 {
     if (loaded)
-        _AGP_exports.AGP_unloadDriver(dc);
+	_AGP_exports.AGP_unloadDriver(dc);
 }
 
 /* {secret} */
@@ -161,7 +161,7 @@
     AGP_globalOptions *options)
 {
     if (LoadDriver())
-        _AGP_exports.AGP_getGlobalOptions(options);
+	_AGP_exports.AGP_getGlobalOptions(options);
 }
 
 /* {secret} */
@@ -169,7 +169,7 @@
     AGP_globalOptions *options)
 {
     if (LoadDriver())
-        _AGP_exports.AGP_setGlobalOptions(options);
+	_AGP_exports.AGP_setGlobalOptions(options);
 }
 
 /* {secret} */
@@ -177,7 +177,7 @@
     AGP_globalOptions *options)
 {
     if (loaded)
-        _AGP_exports.AGP_saveGlobalOptions(options);
+	_AGP_exports.AGP_saveGlobalOptions(options);
 }
 #endif
 
@@ -197,24 +197,23 @@
 
     if (!inited) {
 #ifndef __WIN32_VXD__
-        // This has been causing problems in VxD's for some reason, so for now
-        // we avoid using it.
-        if (_GA_haveCPUID() && (_GA_getCPUIDFeatures() & CPU_HaveRDTSC) != 0) {
-            ZTimerInit();
-            haveRDTSC = true;
-            }
-        else
+	/* This has been causing problems in VxD's for some reason, so for now */
+	/* we avoid using it. */
+	if (_GA_haveCPUID() && (_GA_getCPUIDFeatures() & CPU_HaveRDTSC) != 0) {
+	    ZTimerInit();
+	    haveRDTSC = true;
+	    }
+	else
 #endif
-            haveRDTSC = false;
-        inited = true;
-        }
+	    haveRDTSC = false;
+	inited = true;
+	}
     if (haveRDTSC) {
-        LZTimerOnExt(&tm);
-        while (LZTimerLapExt(&tm) < microSeconds)
-            ;
-        LZTimerOnExt(&tm);
-        }
+	LZTimerOnExt(&tm);
+	while (LZTimerLapExt(&tm) < microSeconds)
+	    ;
+	LZTimerOnExt(&tm);
+	}
     else
-        _OS_delay8253(microSeconds);
+	_OS_delay8253(microSeconds);
 }
-

diff --git a/board/MAI/bios_emulator/scitech/src/common/center.c b/board/MAI/bios_emulator/scitech/src/common/center.c
index 7eb368f..68e17c2 100644
--- a/board/MAI/bios_emulator/scitech/src/common/center.c
+++ b/board/MAI/bios_emulator/scitech/src/common/center.c

@@ -60,19 +60,19 @@
     CenterY = ((RectParent.bottom - RectParent.top) - Height) / 2;
 
     if ((CenterX < 0) || (CenterY < 0)) {
-        /* The Center Window is smaller than the parent window. */
-        if (hWndParent != GetDesktopWindow()) {
-            /* If the parent window is not the desktop use the desktop size. */
-            CenterX = (GetSystemMetrics(SM_CXSCREEN) - Width) / 2;
-            CenterY = (GetSystemMetrics(SM_CYSCREEN) - Height) / 2;
-            }
-        CenterX = (CenterX < 0) ? 0: CenterX;
-        CenterY = (CenterY < 0) ? 0: CenterY;
-        }
+	/* The Center Window is smaller than the parent window. */
+	if (hWndParent != GetDesktopWindow()) {
+	    /* If the parent window is not the desktop use the desktop size. */
+	    CenterX = (GetSystemMetrics(SM_CXSCREEN) - Width) / 2;
+	    CenterY = (GetSystemMetrics(SM_CYSCREEN) - Height) / 2;
+	    }
+	CenterX = (CenterX < 0) ? 0: CenterX;
+	CenterY = (CenterY < 0) ? 0: CenterY;
+	}
     else {
-        CenterX += RectParent.left;
-        CenterY += RectParent.top;
-        }
+	CenterX += RectParent.left;
+	CenterY += RectParent.top;
+	}
 
     /* Copy the values into RectCenter */
     RectCenter.left = CenterX;
@@ -82,8 +82,8 @@
 
     /* Move the window to the new location */
     MoveWindow(hWndCenter, RectCenter.left, RectCenter.top,
-            (RectCenter.right - RectCenter.left),
-            (RectCenter.bottom - RectCenter.top), repaint);
+	    (RectCenter.right - RectCenter.left),
+	    (RectCenter.bottom - RectCenter.top), repaint);
 }
 
 void _EXPORT CenterLogo(HWND hWndLogo, HWND hWndParent, int CenterY)
@@ -117,7 +117,6 @@
 
     /* Move the window to the new location */
     MoveWindow(hWndLogo, RectCenter.left, RectCenter.top,
-            (RectCenter.right - RectCenter.left),
-            (RectCenter.bottom - RectCenter.top), false);
+	    (RectCenter.right - RectCenter.left),
+	    (RectCenter.bottom - RectCenter.top), false);
 }
-

diff --git a/board/MAI/bios_emulator/scitech/src/common/cmdline.c b/board/MAI/bios_emulator/scitech/src/common/cmdline.c
index 872fae9..531e5e1 100644
--- a/board/MAI/bios_emulator/scitech/src/common/cmdline.c
+++ b/board/MAI/bios_emulator/scitech/src/common/cmdline.c

@@ -106,49 +106,49 @@
     char    *formatchar;
 
     if (argc > nextargv) {
-        if (nextchar == NULL) {
-            nextchar = argv[nextargv];      /* Index next argument      */
-            if (nextchar == NULL) {
-                nextargv++;
-                return ALLDONE;             /* No more options          */
-                }
-            if (IS_NOT_SWITCH_CHAR(*nextchar)) {
-                nextchar = NULL;
-                return PARAMETER;           /* We have a parameter      */
-                }
-            nextchar++;                     /* Move past switch operator */
-            if (IS_SWITCH_CHAR(*nextchar)) {
-                nextchar = NULL;
-                return INVALID;             /* Ignore rest of line      */
-                }
-            }
-        if ((ch = *(nextchar++)) == 0) {
-            nextchar = NULL;
-            return INVALID;                 /* No options on line       */
-            }
+	if (nextchar == NULL) {
+	    nextchar = argv[nextargv];      /* Index next argument      */
+	    if (nextchar == NULL) {
+		nextargv++;
+		return ALLDONE;             /* No more options          */
+		}
+	    if (IS_NOT_SWITCH_CHAR(*nextchar)) {
+		nextchar = NULL;
+		return PARAMETER;           /* We have a parameter      */
+		}
+	    nextchar++;                     /* Move past switch operator */
+	    if (IS_SWITCH_CHAR(*nextchar)) {
+		nextchar = NULL;
+		return INVALID;             /* Ignore rest of line      */
+		}
+	    }
+	if ((ch = *(nextchar++)) == 0) {
+	    nextchar = NULL;
+	    return INVALID;                 /* No options on line       */
+	    }
 
-        if (ch == ':' ||  (formatchar = strchr(format, ch)) == NULL)
-            return INVALID;
+	if (ch == ':' ||  (formatchar = strchr(format, ch)) == NULL)
+	    return INVALID;
 
-        if (*(++formatchar) == ':') {   /* Expect an argument after option */
-            nextargv++;
-            if (*nextchar == 0) {
-                if (argc <= nextargv)
-                    return INVALID;
-                nextchar = argv[nextargv++];
-                }
-            *argument = nextchar;
-            nextchar = NULL;
-            }
-        else {                      /* We have a switch style option    */
-            if (*nextchar == 0) {
-                nextargv++;
-                nextchar = NULL;
-                }
-            *argument = NULL;
-            }
-        return ch;                  /* return the option specifier      */
-        }
+	if (*(++formatchar) == ':') {   /* Expect an argument after option */
+	    nextargv++;
+	    if (*nextchar == 0) {
+		if (argc <= nextargv)
+		    return INVALID;
+		nextchar = argv[nextargv++];
+		}
+	    *argument = nextchar;
+	    nextchar = NULL;
+	    }
+	else {                      /* We have a switch style option    */
+	    if (*nextchar == 0) {
+		nextargv++;
+		nextchar = NULL;
+		}
+	    *argument = NULL;
+	    }
+	return ch;                  /* return the option specifier      */
+	}
     nextchar = NULL;
     nextargv++;
     return ALLDONE;                 /* no arguments on command line     */
@@ -174,51 +174,51 @@
     int     num_read;
 
     switch ((int)(optarr->type)) {
-        case OPT_INTEGER:
-            num_read = sscanf(argument,"%d",(int*)optarr->arg);
-            break;
-        case OPT_HEX:
-            num_read = sscanf(argument,"%x",(int*)optarr->arg);
-            break;
-        case OPT_OCTAL:
-            num_read = sscanf(argument,"%o",(int*)optarr->arg);
-            break;
-        case OPT_UNSIGNED:
-            num_read = sscanf(argument,"%u",(uint*)optarr->arg);
-            break;
-        case OPT_LINTEGER:
-            num_read = sscanf(argument,"%ld",(long*)optarr->arg);
-            break;
-        case OPT_LHEX:
-            num_read = sscanf(argument,"%lx",(long*)optarr->arg);
-            break;
-        case OPT_LOCTAL:
-            num_read = sscanf(argument,"%lo",(long*)optarr->arg);
-            break;
-        case OPT_LUNSIGNED:
-            num_read = sscanf(argument,"%lu",(ulong*)optarr->arg);
-            break;
-        case OPT_FLOAT:
-            num_read = sscanf(argument,"%f",(float*)optarr->arg);
-            break;
-        case OPT_DOUBLE:
-            num_read = sscanf(argument,"%lf",(double*)optarr->arg);
-            break;
-        case OPT_LDOUBLE:
-            num_read = sscanf(argument,"%Lf",(long double*)optarr->arg);
-            break;
-        case OPT_STRING:
-            num_read = 1;           /* This always works    */
-            *((char**)optarr->arg) = argument;
-            break;
-        default:
-            return INVALID;
-        }
+	case OPT_INTEGER:
+	    num_read = sscanf(argument,"%d",(int*)optarr->arg);
+	    break;
+	case OPT_HEX:
+	    num_read = sscanf(argument,"%x",(int*)optarr->arg);
+	    break;
+	case OPT_OCTAL:
+	    num_read = sscanf(argument,"%o",(int*)optarr->arg);
+	    break;
+	case OPT_UNSIGNED:
+	    num_read = sscanf(argument,"%u",(uint*)optarr->arg);
+	    break;
+	case OPT_LINTEGER:
+	    num_read = sscanf(argument,"%ld",(long*)optarr->arg);
+	    break;
+	case OPT_LHEX:
+	    num_read = sscanf(argument,"%lx",(long*)optarr->arg);
+	    break;
+	case OPT_LOCTAL:
+	    num_read = sscanf(argument,"%lo",(long*)optarr->arg);
+	    break;
+	case OPT_LUNSIGNED:
+	    num_read = sscanf(argument,"%lu",(ulong*)optarr->arg);
+	    break;
+	case OPT_FLOAT:
+	    num_read = sscanf(argument,"%f",(float*)optarr->arg);
+	    break;
+	case OPT_DOUBLE:
+	    num_read = sscanf(argument,"%lf",(double*)optarr->arg);
+	    break;
+	case OPT_LDOUBLE:
+	    num_read = sscanf(argument,"%Lf",(long double*)optarr->arg);
+	    break;
+	case OPT_STRING:
+	    num_read = 1;           /* This always works    */
+	    *((char**)optarr->arg) = argument;
+	    break;
+	default:
+	    return INVALID;
+	}
 
     if (num_read == 0)
-        return INVALID;
+	return INVALID;
     else
-        return ALLDONE;
+	return ALLDONE;
 }
 
 /****************************************************************************
@@ -261,8 +261,8 @@
     int num_opt,
     Option optarr[],
     int (*do_param)(
-        char *param,
-        int num))
+	char *param,
+	int num))
 {
     int     i,opt;
     char    *argument;
@@ -273,51 +273,51 @@
 
     strcpy(cmdstr,"hH?");
     for (i = 0,opt = 3; i < num_opt; i++,opt++) {
-        cmdstr[opt] = optarr[i].opt;
-        if (optarr[i].type != OPT_SWITCH) {
-            cmdstr[++opt] = ':';
-            }
-        }
+	cmdstr[opt] = optarr[i].opt;
+	if (optarr[i].type != OPT_SWITCH) {
+	    cmdstr[++opt] = ':';
+	    }
+	}
     cmdstr[opt] = '\0';
 
     for (;;) {
-        opt = getcmdopt(argc,argv,cmdstr,&argument);
-        switch (opt) {
-            case 'H':
-            case 'h':
-            case '?':
-                return HELP;
-            case ALLDONE:
-                return ALLDONE;
-            case INVALID:
-                return INVALID;
-            case PARAMETER:
-                if (do_param == NULL)
-                    return INVALID;
-                if (do_param(argv[nextargv],param_num) == INVALID)
-                    return INVALID;
-                nextargv++;
-                param_num++;
-                break;
-            default:
+	opt = getcmdopt(argc,argv,cmdstr,&argument);
+	switch (opt) {
+	    case 'H':
+	    case 'h':
+	    case '?':
+		return HELP;
+	    case ALLDONE:
+		return ALLDONE;
+	    case INVALID:
+		return INVALID;
+	    case PARAMETER:
+		if (do_param == NULL)
+		    return INVALID;
+		if (do_param(argv[nextargv],param_num) == INVALID)
+		    return INVALID;
+		nextargv++;
+		param_num++;
+		break;
+	    default:
 
-                /* Search for the option in the option array. We are
-                 * guaranteed to find it.
-                 */
+		/* Search for the option in the option array. We are
+		 * guaranteed to find it.
+		 */
 
-                for (i = 0; i < num_opt; i++) {
-                    if (optarr[i].opt == opt)
-                        break;
-                    }
-                if (optarr[i].type == OPT_SWITCH)
-                    *((ibool*)optarr[i].arg) = true;
-                else {
-                    if (parse_option(&optarr[i],argument) == INVALID)
-                        return INVALID;
-                    }
-                break;
-            }
-        }
+		for (i = 0; i < num_opt; i++) {
+		    if (optarr[i].opt == opt)
+			break;
+		    }
+		if (optarr[i].type == OPT_SWITCH)
+		    *((ibool*)optarr[i].arg) = true;
+		else {
+		    if (parse_option(&optarr[i],argument) == INVALID)
+			return INVALID;
+		    }
+		break;
+	    }
+	}
 }
 
 /****************************************************************************
@@ -340,11 +340,11 @@
     int     i;
 
     for (i = 0; i < num_opt; i++) {
-        if (optarr[i].type == OPT_SWITCH)
-            printf("  -%c       %s\n",optarr[i].opt,optarr[i].desc);
-        else
-            printf("  -%c<arg>  %s\n",optarr[i].opt,optarr[i].desc);
-        }
+	if (optarr[i].type == OPT_SWITCH)
+	    printf("  -%c       %s\n",optarr[i].opt,optarr[i].desc);
+	else
+	    printf("  -%c<arg>  %s\n",optarr[i].opt,optarr[i].desc);
+	}
 }
 
 /****************************************************************************
@@ -382,45 +382,45 @@
     argv[argc++] = filename;
     cmdLine = strncpy(str, cmdLine, sizeof(str)-1);
     while (*cmdLine) {
-        switch (*cmdLine) {
-            case '"' :
-                if (prevWord != NULL) {
-                    if (inQuote) {
-                        if (!noStrip)
-                            *cmdLine = '\0';
-                        argv [argc++] = prevWord;
-                        prevWord = NULL;
-                        }
-                    else
-                        noStrip = TRUE;
-                    }
-                inQuote = !inQuote;
-                break;
-            case ' ' :
-            case '\t' :
-                if (!inQuote) {
-                    if (prevWord != NULL) {
-                        *cmdLine = '\0';
-                        argv [argc++] = prevWord;
-                        prevWord = NULL;
-                        noStrip = FALSE;
-                        }
-                    }
-                break;
-            default :
-                if (prevWord == NULL)
-                    prevWord = cmdLine;
-                break;
-                }
-        if (argc >= maxArgv - 1)
-            break;
-        cmdLine++;
-        }
+	switch (*cmdLine) {
+	    case '"' :
+		if (prevWord != NULL) {
+		    if (inQuote) {
+			if (!noStrip)
+			    *cmdLine = '\0';
+			argv [argc++] = prevWord;
+			prevWord = NULL;
+			}
+		    else
+			noStrip = TRUE;
+		    }
+		inQuote = !inQuote;
+		break;
+	    case ' ' :
+	    case '\t' :
+		if (!inQuote) {
+		    if (prevWord != NULL) {
+			*cmdLine = '\0';
+			argv [argc++] = prevWord;
+			prevWord = NULL;
+			noStrip = FALSE;
+			}
+		    }
+		break;
+	    default :
+		if (prevWord == NULL)
+		    prevWord = cmdLine;
+		break;
+		}
+	if (argc >= maxArgv - 1)
+	    break;
+	cmdLine++;
+	}
 
     if ((prevWord != NULL || (inQuote && prevWord != NULL)) && argc < maxArgv - 1) {
-        *cmdLine = '\0';
-        argv [argc++] = prevWord;
-        }
+	*cmdLine = '\0';
+	argv [argc++] = prevWord;
+	}
     argv[argc] = NULL;
 
     /* Return updated parameters */

diff --git a/board/MAI/bios_emulator/scitech/src/common/gabeos.c b/board/MAI/bios_emulator/scitech/src/common/gabeos.c
index 1d8a543..a934bd1 100644
--- a/board/MAI/bios_emulator/scitech/src/common/gabeos.c
+++ b/board/MAI/bios_emulator/scitech/src/common/gabeos.c

@@ -70,10 +70,10 @@
 ****************************************************************************/
 PM_imports * NAPI GA_getSystemPMImports(void)
 {
-    // TODO: We may very well want to provide a system shared library
-    //       that eports the PM functions required by the Nucleus library
-    //       for BeOS here. That will eliminate fatal errors loading new
-    //       drivers on BeOS!
+    /* TODO: We may very well want to provide a system shared library */
+    /*       that eports the PM functions required by the Nucleus library */
+    /*       for BeOS here. That will eliminate fatal errors loading new */
+    /*       drivers on BeOS! */
     return &_PM_imports;
 }
 
@@ -124,7 +124,7 @@
 ibool NAPI GA_TimerInit(void)
 {
     if (_GA_haveCPUID() && (_GA_getCPUIDFeatures() & CPU_HaveRDTSC) != 0)
-        haveRDTSC = true;
+	haveRDTSC = true;
     return true;
 }
 
@@ -136,11 +136,11 @@
     GA_largeInteger *value)
 {
     if (haveRDTSC)
-        _GA_readTimeStamp(value);
+	_GA_readTimeStamp(value);
     else {
-        struct timeval t;
-        gettimeofday(&t, NULL);
-        value->low = t.tv_sec*1000000 + t.tv_usec;
-        value->high = 0;
-        }
+	struct timeval t;
+	gettimeofday(&t, NULL);
+	value->low = t.tv_sec*1000000 + t.tv_usec;
+	value->high = 0;
+	}
 }

diff --git a/board/MAI/bios_emulator/scitech/src/common/gados.c b/board/MAI/bios_emulator/scitech/src/common/gados.c
index 4c90e80..d2be776 100644
--- a/board/MAI/bios_emulator/scitech/src/common/gados.c
+++ b/board/MAI/bios_emulator/scitech/src/common/gados.c

@@ -120,7 +120,7 @@
 ibool NAPI GA_TimerInit(void)
 {
     if (_GA_haveCPUID() && (_GA_getCPUIDFeatures() & CPU_HaveRDTSC) != 0)
-        return true;
+	return true;
     return false;
 }
 
@@ -133,4 +133,3 @@
 {
     _GA_readTimeStamp(value);
 }
-

diff --git a/board/MAI/bios_emulator/scitech/src/common/galib.c b/board/MAI/bios_emulator/scitech/src/common/galib.c
index 7c1fbe3..f2eacc3 100644
--- a/board/MAI/bios_emulator/scitech/src/common/galib.c
+++ b/board/MAI/bios_emulator/scitech/src/common/galib.c

@@ -107,7 +107,7 @@
 
     /* Check if we have already loaded the driver */
     if (loaded)
-        return true;
+	return true;
     PM_init();
 
     /* First try to see if we can find the system wide shared exports
@@ -116,33 +116,33 @@
      */
     __GA_exports.dwSize = sizeof(__GA_exports);
     if (GA_getSharedExports(&__GA_exports,shared))
-        return loaded = true;
+	return loaded = true;
 
     /* Open the BPD file */
     if (!PM_findBPD(DLL_NAME,bpdpath))
-        return false;
+	return false;
     strcpy(filename,bpdpath);
     strcat(filename,DLL_NAME);
     if ((hModBPD = PE_loadLibrary(filename,shared)) == NULL)
-        return false;
+	return false;
     if ((GA_initLibrary = (GA_initLibrary_t)PE_getProcAddress(hModBPD,"_GA_initLibrary")) == NULL)
-        return false;
+	return false;
     bpdpath[strlen(bpdpath)-1] = 0;
     if (strcmp(bpdpath,PM_getNucleusPath()) == 0)
-        strcpy(bpdpath,PM_getNucleusConfigPath());
+	strcpy(bpdpath,PM_getNucleusConfigPath());
     else {
-        PM_backslash(bpdpath);
-        strcat(bpdpath,"config");
-        }
+	PM_backslash(bpdpath);
+	strcat(bpdpath,"config");
+	}
     if ((gaExp = GA_initLibrary(shared,bpdpath,filename,GA_getSystemPMImports(),&_N_imports,&_GA_imports)) == NULL)
-        PM_fatalError("GA_initLibrary failed!\n");
+	PM_fatalError("GA_initLibrary failed!\n");
 
     /* Initialize all default imports to point to fatal error handler
      * for upwards compatibility, and copy the exported functions.
      */
     max = sizeof(__GA_exports)/sizeof(GA_initLibrary_t);
     for (i = 0,p = (ulong*)&__GA_exports; i < max; i++)
-        *p++ = (ulong)_GA_fatalErrorHandler;
+	*p++ = (ulong)_GA_fatalErrorHandler;
     memcpy(&__GA_exports,gaExp,MIN(sizeof(__GA_exports),gaExp->dwSize));
     loaded = true;
     return true;
@@ -157,7 +157,7 @@
 int NAPI GA_status(void)
 {
     if (!loaded)
-        return nDriverNotFound;
+	return nDriverNotFound;
     return __GA_exports.GA_status();
 }
 
@@ -166,7 +166,7 @@
     N_int32 status)
 {
     if (!loaded)
-        return "Unable to load Nucleus device driver!";
+	return "Unable to load Nucleus device driver!";
     return __GA_exports.GA_errorMsg(status);
 }
 
@@ -174,7 +174,7 @@
 int NAPI GA_getDaysLeft(N_int32 shared)
 {
     if (!LoadDriver(shared))
-        return -1;
+	return -1;
     return __GA_exports.GA_getDaysLeft(shared);
 }
 
@@ -182,7 +182,7 @@
 int NAPI GA_registerLicense(uchar *license,N_int32 shared)
 {
     if (!LoadDriver(shared))
-        return 0;
+	return 0;
     return __GA_exports.GA_registerLicense(license,shared);
 }
 
@@ -190,7 +190,7 @@
 ibool NAPI GA_loadInGUI(N_int32 shared)
 {
     if (!LoadDriver(shared))
-        return false;
+	return false;
     return __GA_exports.GA_loadInGUI(shared);
 }
 
@@ -198,7 +198,7 @@
 int NAPI GA_enumerateDevices(N_int32 shared)
 {
     if (!LoadDriver(shared))
-        return 0;
+	return 0;
     return __GA_exports.GA_enumerateDevices(shared);
 }
 
@@ -206,7 +206,7 @@
 GA_devCtx * NAPI GA_loadDriver(N_int32 deviceIndex,N_int32 shared)
 {
     if (!LoadDriver(shared))
-        return NULL;
+	return NULL;
     return __GA_exports.GA_loadDriver(deviceIndex,shared);
 }
 
@@ -216,7 +216,7 @@
     ibool shared)
 {
     if (LoadDriver(shared))
-        __GA_exports.GA_getGlobalOptions(options,shared);
+	__GA_exports.GA_getGlobalOptions(options,shared);
 }
 
 /* {secret} */
@@ -226,7 +226,7 @@
     ibool shared)
 {
     if (!LoadDriver(shared))
-        return NULL;
+	return NULL;
     return __GA_exports.GA_loadLibrary(szBPDName,size,shared);
 }
 
@@ -236,7 +236,7 @@
 {
     /* Bail for older drivers that didn't export this function! */
     if (!__GA_exports.GA_getCurrentDriver)
-        return NULL;
+	return NULL;
     return __GA_exports.GA_getCurrentDriver(deviceIndex);
 }
 
@@ -246,7 +246,7 @@
 {
     /* Bail for older drivers that didn't export this function! */
     if (!__GA_exports.GA_getCurrentRef2d)
-        return NULL;
+	return NULL;
     return __GA_exports.GA_getCurrentRef2d(deviceIndex);
 }
 
@@ -254,7 +254,7 @@
 int NAPI GA_isOEMVersion(ibool shared)
 {
     if (!LoadDriver(shared))
-        return 0;
+	return 0;
     return __GA_exports.GA_isOEMVersion(shared);
 }
 
@@ -262,8 +262,7 @@
 N_uint32 * NAPI GA_getLicensedDevices(ibool shared)
 {
     if (!LoadDriver(shared))
-        return 0;
+	return 0;
     return __GA_exports.GA_getLicensedDevices(shared);
 }
 #endif
-

diff --git a/board/MAI/bios_emulator/scitech/src/common/galinux.c b/board/MAI/bios_emulator/scitech/src/common/galinux.c
index cbd9d7f..47e4e85 100644
--- a/board/MAI/bios_emulator/scitech/src/common/galinux.c
+++ b/board/MAI/bios_emulator/scitech/src/common/galinux.c

@@ -72,10 +72,10 @@
 ****************************************************************************/
 PM_imports * NAPI GA_getSystemPMImports(void)
 {
-    // TODO: We may very well want to provide a system shared library
-    //       that eports the PM functions required by the Nucleus library
-    //       for Linux here. That will eliminate fatal errors loading new
-    //       drivers on Linux!
+    /* TODO: We may very well want to provide a system shared library */
+    /*       that eports the PM functions required by the Nucleus library */
+    /*       for Linux here. That will eliminate fatal errors loading new */
+    /*       drivers on Linux! */
     return &_PM_imports;
 }
 
@@ -126,7 +126,7 @@
 ibool NAPI GA_TimerInit(void)
 {
     if (_GA_haveCPUID() && (_GA_getCPUIDFeatures() & CPU_HaveRDTSC) != 0)
-        haveRDTSC = true;
+	haveRDTSC = true;
     return true;
 }
 
@@ -138,11 +138,11 @@
     GA_largeInteger *value)
 {
     if (haveRDTSC)
-        _GA_readTimeStamp(value);
+	_GA_readTimeStamp(value);
     else {
-        struct timeval t;
-        gettimeofday(&t, NULL);
-        value->low = t.tv_sec*1000000 + t.tv_usec;
-        value->high = 0;
-        }
+	struct timeval t;
+	gettimeofday(&t, NULL);
+	value->low = t.tv_sec*1000000 + t.tv_usec;
+	value->high = 0;
+	}
 }

diff --git a/board/MAI/bios_emulator/scitech/src/common/gantdrv.c b/board/MAI/bios_emulator/scitech/src/common/gantdrv.c
index d9944c5..050f737 100644
--- a/board/MAI/bios_emulator/scitech/src/common/gantdrv.c
+++ b/board/MAI/bios_emulator/scitech/src/common/gantdrv.c

@@ -117,8 +117,8 @@
 ibool NAPI GA_TimerInit(void)
 {
     if (_GA_haveCPUID() && (_GA_getCPUIDFeatures() & CPU_HaveRDTSC) != 0) {
-        haveRDTSC = true;
-        }
+	haveRDTSC = true;
+	}
     return true;
 }
 
@@ -130,8 +130,7 @@
     GA_largeInteger *value)
 {
     if (haveRDTSC)
-        _GA_readTimeStamp(value);
+	_GA_readTimeStamp(value);
     else
-        KeQuerySystemTime((LARGE_INTEGER*)value);
+	KeQuerySystemTime((LARGE_INTEGER*)value);
 }
-

diff --git a/board/MAI/bios_emulator/scitech/src/common/gaos2.c b/board/MAI/bios_emulator/scitech/src/common/gaos2.c
index 822e93c..26e6503 100644
--- a/board/MAI/bios_emulator/scitech/src/common/gaos2.c
+++ b/board/MAI/bios_emulator/scitech/src/common/gaos2.c

@@ -83,11 +83,11 @@
      * can't fail here.
      */
     DosOpen(PMHELP_NAME,&hSDDHelp,&result[0],0,0,
-            FILE_OPEN, OPEN_SHARE_DENYNONE | OPEN_ACCESS_READWRITE,
-            NULL);
+	    FILE_OPEN, OPEN_SHARE_DENYNONE | OPEN_ACCESS_READWRITE,
+	    NULL);
     DosDevIOCtl(hSDDHelp,PMHELP_IOCTL,func,
-             &parms, inLen = sizeof(parms), &inLen,
-            &result, outLen = sizeof(result), &outLen);
+	     &parms, inLen = sizeof(parms), &inLen,
+	    &result, outLen = sizeof(result), &outLen);
     DosClose(hSDDHelp);
     return result[0];
 }
@@ -147,17 +147,17 @@
     /* Initialise the PM library and connect to our runtime DLL's */
     PM_init();
     if (CallSDDHelp(PMHELP_GETSHAREDEXP) != 0) {
-        /* We have found the shared Nucleus exports. Because not all processes
-         * map to SDDPMI.DLL, we need to ensure that we connect to this
-         * DLL so that it gets mapped into our address space (that is
-         * where the shared Nucleus loader code is located). Simply doing a
-         * DosLoadModule on it is enough for this.
-         */
-        DosLoadModule((PSZ)buf,sizeof(buf),(PSZ)"SDDPMI.DLL",&hModSDDPMI);
-        exp = (GA_exports*)result[0];
-        memcpy(gaExp,exp,MIN(gaExp->dwSize,exp->dwSize));
-        return true;
-        }
+	/* We have found the shared Nucleus exports. Because not all processes
+	 * map to SDDPMI.DLL, we need to ensure that we connect to this
+	 * DLL so that it gets mapped into our address space (that is
+	 * where the shared Nucleus loader code is located). Simply doing a
+	 * DosLoadModule on it is enough for this.
+	 */
+	DosLoadModule((PSZ)buf,sizeof(buf),(PSZ)"SDDPMI.DLL",&hModSDDPMI);
+	exp = (GA_exports*)result[0];
+	memcpy(gaExp,exp,MIN(gaExp->dwSize,exp->dwSize));
+	return true;
+	}
 #endif
     (void)shared;
     return false;
@@ -197,7 +197,7 @@
 ibool NAPI GA_TimerInit(void)
 {
     if (_GA_haveCPUID() && (_GA_getCPUIDFeatures() & CPU_HaveRDTSC) != 0)
-        haveRDTSC = true;
+	haveRDTSC = true;
     return true;
 }
 
@@ -209,9 +209,9 @@
     GA_largeInteger *value)
 {
     if (haveRDTSC)
-        _GA_readTimeStamp(value);
+	_GA_readTimeStamp(value);
     else
-        DosTmrQueryTime((QWORD*)value);
+	DosTmrQueryTime((QWORD*)value);
 }
 
 /****************************************************************************

diff --git a/board/MAI/bios_emulator/scitech/src/common/gaqnx.c b/board/MAI/bios_emulator/scitech/src/common/gaqnx.c
index 0846ccc..525d662 100644
--- a/board/MAI/bios_emulator/scitech/src/common/gaqnx.c
+++ b/board/MAI/bios_emulator/scitech/src/common/gaqnx.c

@@ -72,10 +72,10 @@
 ****************************************************************************/
 PM_imports * NAPI GA_getSystemPMImports(void)
 {
-    // TODO: We may very well want to provide a system shared library
-    //       that eports the PM functions required by the Nucleus library
-    //       for QNX here. That will eliminate fatal errors loading new
-    //       drivers on QNX!
+    /* TODO: We may very well want to provide a system shared library */
+    /*       that eports the PM functions required by the Nucleus library */
+    /*       for QNX here. That will eliminate fatal errors loading new */
+    /*       drivers on QNX! */
     return &_PM_imports;
 }
 
@@ -126,7 +126,7 @@
 ibool NAPI GA_TimerInit(void)
 {
     if (_GA_haveCPUID() && (_GA_getCPUIDFeatures() & CPU_HaveRDTSC) != 0)
-        haveRDTSC = true;
+	haveRDTSC = true;
     return true;
 }
 
@@ -138,12 +138,12 @@
     GA_largeInteger *value)
 {
     if (haveRDTSC)
-        _GA_readTimeStamp(value);
+	_GA_readTimeStamp(value);
     else {
-        struct timespec ts;
+	struct timespec ts;
 
-        clock_gettime(CLOCK_REALTIME, &ts);
-        value->low = (ts.tv_nsec / 1000 + ts.tv_sec * 1000000);
-        value->high = 0;
-        }
+	clock_gettime(CLOCK_REALTIME, &ts);
+	value->low = (ts.tv_nsec / 1000 + ts.tv_sec * 1000000);
+	value->high = 0;
+	}
 }

diff --git a/board/MAI/bios_emulator/scitech/src/common/gartt.c b/board/MAI/bios_emulator/scitech/src/common/gartt.c
index 003e1e7..3a41f59 100644
--- a/board/MAI/bios_emulator/scitech/src/common/gartt.c
+++ b/board/MAI/bios_emulator/scitech/src/common/gartt.c

@@ -121,9 +121,9 @@
 ibool NAPI GA_TimerInit(void)
 {
     if (_GA_haveCPUID() && (_GA_getCPUIDFeatures() & CPU_HaveRDTSC) != 0) {
-        haveRDTSC = true;
-        return true;
-        }
+	haveRDTSC = true;
+	return true;
+	}
     return false;
 }
 
@@ -135,5 +135,5 @@
     GA_largeInteger *value)
 {
     if (haveRDTSC)
-        _GA_readTimeStamp(value);
+	_GA_readTimeStamp(value);
 }

diff --git a/board/MAI/bios_emulator/scitech/src/common/gasmx.c b/board/MAI/bios_emulator/scitech/src/common/gasmx.c
index 62e68dc..ae31941 100644
--- a/board/MAI/bios_emulator/scitech/src/common/gasmx.c
+++ b/board/MAI/bios_emulator/scitech/src/common/gasmx.c

@@ -118,7 +118,7 @@
 ibool NAPI GA_TimerInit(void)
 {
     if (_GA_haveCPUID() && (_GA_getCPUIDFeatures() & CPU_HaveRDTSC) != 0)
-        return true;
+	return true;
     return false;
 }
 

diff --git a/board/MAI/bios_emulator/scitech/src/common/gavxd.c b/board/MAI/bios_emulator/scitech/src/common/gavxd.c
index 62173cc..fc8ba8d 100644
--- a/board/MAI/bios_emulator/scitech/src/common/gavxd.c
+++ b/board/MAI/bios_emulator/scitech/src/common/gavxd.c

@@ -117,8 +117,8 @@
 ibool NAPI GA_TimerInit(void)
 {
     if (_GA_haveCPUID() && (_GA_getCPUIDFeatures() & CPU_HaveRDTSC) != 0) {
-        haveRDTSC = true;
-        }
+	haveRDTSC = true;
+	}
     return true;
 }
 
@@ -130,8 +130,7 @@
     GA_largeInteger *value)
 {
     if (haveRDTSC)
-        _GA_readTimeStamp(value);
+	_GA_readTimeStamp(value);
     else
-        VTD_Get_Real_Time(&value->high,&value->low);
+	VTD_Get_Real_Time(&value->high,&value->low);
 }
-

diff --git a/board/MAI/bios_emulator/scitech/src/common/gawin32.c b/board/MAI/bios_emulator/scitech/src/common/gawin32.c
index a2a4150..6944334 100644
--- a/board/MAI/bios_emulator/scitech/src/common/gawin32.c
+++ b/board/MAI/bios_emulator/scitech/src/common/gawin32.c

@@ -67,16 +67,16 @@
 
     /* Check if we have already loaded the DLL */
     if (hModDLL)
-        return true;
+	return true;
     PM_init();
 
     /* Open the DLL file */
     if (!PM_findBPD(DLL_NAME,bpdpath))
-        return false;
+	return false;
     strcpy(filename,bpdpath);
     strcat(filename,DLL_NAME);
     if ((hModDLL = LoadLibrary(filename)) == NULL)
-        return false;
+	return false;
     return true;
 }
 
@@ -103,10 +103,10 @@
 
     PM_setLocalBPDPath(path);
     if (_PM_hDevice != INVALID_HANDLE_VALUE) {
-        inBuf[0] = (DWORD)path;
-        DeviceIoControl(_PM_hDevice, PMHELP_GASETLOCALPATH32,
-            inBuf, sizeof(inBuf), outBuf, sizeof(outBuf), &outCnt, NULL);
-        }
+	inBuf[0] = (DWORD)path;
+	DeviceIoControl(_PM_hDevice, PMHELP_GASETLOCALPATH32,
+	    inBuf, sizeof(inBuf), outBuf, sizeof(outBuf), &outCnt, NULL);
+	}
 }
 
 /****************************************************************************
@@ -126,18 +126,18 @@
     PM_imports * (NAPIP _GA_getSystemPMImports)(void);
 
     if (LoadSharedDLL()) {
-        /* Note that Visual C++ build DLL's with only a single underscore in front
-         * of the exported name while Watcom C provides two of them. We check for
-         * both to allow working with either compiled DLL.
-         */
-        if ((_GA_getSystemPMImports = (void*)GetProcAddress(hModDLL,"_GA_getSystemPMImports")) != NULL) {
-            if ((_GA_getSystemPMImports = (void*)GetProcAddress(hModDLL,"__GA_getSystemPMImports")) != NULL) {
-                pmImp = _GA_getSystemPMImports();
-                memcpy(&_PM_imports,pmImp,MIN(_PM_imports.dwSize,pmImp->dwSize));
-                return pmImp;
-                }
-            }
-        }
+	/* Note that Visual C++ build DLL's with only a single underscore in front
+	 * of the exported name while Watcom C provides two of them. We check for
+	 * both to allow working with either compiled DLL.
+	 */
+	if ((_GA_getSystemPMImports = (void*)GetProcAddress(hModDLL,"_GA_getSystemPMImports")) != NULL) {
+	    if ((_GA_getSystemPMImports = (void*)GetProcAddress(hModDLL,"__GA_getSystemPMImports")) != NULL) {
+		pmImp = _GA_getSystemPMImports();
+		memcpy(&_PM_imports,pmImp,MIN(_PM_imports.dwSize,pmImp->dwSize));
+		return pmImp;
+		}
+	    }
+	}
     return &_PM_imports;
 }
 
@@ -162,16 +162,16 @@
 
     useRing0Driver = false;
     if (shared) {
-        if (!LoadSharedDLL())
-            PM_fatalError("Unable to load " DLL_NAME "!");
-        if ((_GA_getSystemGAExports = (void*)GetProcAddress(hModDLL,"_GA_getSystemGAExports")) == NULL)
-            if ((_GA_getSystemGAExports = (void*)GetProcAddress(hModDLL,"__GA_getSystemGAExports")) == NULL)
-                PM_fatalError("Unable to load " DLL_NAME "!");
-        exp = _GA_getSystemGAExports();
-        memcpy(gaExp,exp,MIN(gaExp->dwSize,exp->dwSize));
-        useRing0Driver = true;
-        return true;
-        }
+	if (!LoadSharedDLL())
+	    PM_fatalError("Unable to load " DLL_NAME "!");
+	if ((_GA_getSystemGAExports = (void*)GetProcAddress(hModDLL,"_GA_getSystemGAExports")) == NULL)
+	    if ((_GA_getSystemGAExports = (void*)GetProcAddress(hModDLL,"__GA_getSystemGAExports")) == NULL)
+		PM_fatalError("Unable to load " DLL_NAME "!");
+	exp = _GA_getSystemGAExports();
+	memcpy(gaExp,exp,MIN(gaExp->dwSize,exp->dwSize));
+	useRing0Driver = true;
+	return true;
+	}
     return false;
 }
 
@@ -188,14 +188,14 @@
     static ibool (NAPIP _GA_queryFunctions)(GA_devCtx *dc,N_uint32 id,void _FAR_ *funcs) = NULL;
 
     if (useRing0Driver) {
-        // Call the version in nga_w32.dll if it is loaded
-        if (!_GA_queryFunctions) {
-            if ((_GA_queryFunctions = (void*)GetProcAddress(hModDLL,"_GA_queryFunctions")) == NULL)
-                if ((_GA_queryFunctions = (void*)GetProcAddress(hModDLL,"__GA_queryFunctions")) == NULL)
-                    PM_fatalError("Unable to get exports from " DLL_NAME "!");
-            }
-        return _GA_queryFunctions(dc,id,funcs);
-        }
+	/* Call the version in nga_w32.dll if it is loaded */
+	if (!_GA_queryFunctions) {
+	    if ((_GA_queryFunctions = (void*)GetProcAddress(hModDLL,"_GA_queryFunctions")) == NULL)
+		if ((_GA_queryFunctions = (void*)GetProcAddress(hModDLL,"__GA_queryFunctions")) == NULL)
+		    PM_fatalError("Unable to get exports from " DLL_NAME "!");
+	    }
+	return _GA_queryFunctions(dc,id,funcs);
+	}
     return __GA_exports.GA_queryFunctions(dc,id,funcs);
 }
 
@@ -211,14 +211,14 @@
     static ibool (NAPIP _REF2D_queryFunctions)(REF2D_driver *ref2d,N_uint32 id,void _FAR_ *funcs) = NULL;
 
     if (useRing0Driver) {
-        // Call the version in nga_w32.dll if it is loaded
-        if (!_REF2D_queryFunctions) {
-            if ((_REF2D_queryFunctions = (void*)GetProcAddress(hModDLL,"_REF2D_queryFunctions")) == NULL)
-                if ((_REF2D_queryFunctions = (void*)GetProcAddress(hModDLL,"__REF2D_queryFunctions")) == NULL)
-                    PM_fatalError("Unable to get exports from " DLL_NAME "!");
-            }
-        return _REF2D_queryFunctions(ref2d,id,funcs);
-        }
+	/* Call the version in nga_w32.dll if it is loaded */
+	if (!_REF2D_queryFunctions) {
+	    if ((_REF2D_queryFunctions = (void*)GetProcAddress(hModDLL,"_REF2D_queryFunctions")) == NULL)
+		if ((_REF2D_queryFunctions = (void*)GetProcAddress(hModDLL,"__REF2D_queryFunctions")) == NULL)
+		    PM_fatalError("Unable to get exports from " DLL_NAME "!");
+	    }
+	return _REF2D_queryFunctions(ref2d,id,funcs);
+	}
     return __GA_exports.REF2D_queryFunctions(ref2d,id,funcs);
 }
 #endif
@@ -231,13 +231,13 @@
 ibool NAPI GA_TimerInit(void)
 {
     if (_GA_haveCPUID() && (_GA_getCPUIDFeatures() & CPU_HaveRDTSC) != 0) {
-        haveRDTSC = true;
-        return true;
-        }
+	haveRDTSC = true;
+	return true;
+	}
     else if (QueryPerformanceFrequency((LARGE_INTEGER*)&countFreq)) {
-        haveRDTSC = false;
-        return true;
-        }
+	haveRDTSC = false;
+	return true;
+	}
     return false;
 }
 
@@ -249,8 +249,7 @@
     GA_largeInteger *value)
 {
     if (haveRDTSC)
-        _GA_readTimeStamp(value);
+	_GA_readTimeStamp(value);
     else
-        QueryPerformanceCounter((LARGE_INTEGER*)value);
+	QueryPerformanceCounter((LARGE_INTEGER*)value);
 }
-

diff --git a/board/MAI/bios_emulator/scitech/src/common/gtfcalc.c b/board/MAI/bios_emulator/scitech/src/common/gtfcalc.c
index 5a03ac5..1d547e9 100644
--- a/board/MAI/bios_emulator/scitech/src/common/gtfcalc.c
+++ b/board/MAI/bios_emulator/scitech/src/common/gtfcalc.c

@@ -107,9 +107,9 @@
     c->hSync = GC.hSync;
     c->minVSyncBP = GC.minVSyncBP;
     if (GC.k == 0)
-        c->k = 0.001;
+	c->k = 0.001;
     else
-        c->k = GC.k;
+	c->k = GC.k;
     c->m = (c->k / 256) * GC.m;
     c->c = (GC.c - GC.j) * (c->k / 256) + GC.j;
     c->j = GC.j;
@@ -165,89 +165,89 @@
     vFieldRate = vFreq;
     interlace = 0;
     if (wantInterlace)
-        dotClock *= 2;
+	dotClock *= 2;
 
     /* Determine the lines for margins */
     if (wantMargins) {
-        topMarginLines = round(c.margin / 100 * vLines);
-        botMarginLines = round(c.margin / 100 * vLines);
-        }
+	topMarginLines = round(c.margin / 100 * vLines);
+	botMarginLines = round(c.margin / 100 * vLines);
+	}
     else {
-        topMarginLines = 0;
-        botMarginLines = 0;
-        }
+	topMarginLines = 0;
+	botMarginLines = 0;
+	}
 
     if (type != GTF_lockPF) {
-        if (type == GTF_lockVF) {
-            /* Estimate the horizontal period */
-            hPeriodEst = ((1/vFieldRate) - (c.minVSyncBP/1000000)) /
-                (vLines + (2*topMarginLines) + c.minPorch + interlace) * 1000000;
+	if (type == GTF_lockVF) {
+	    /* Estimate the horizontal period */
+	    hPeriodEst = ((1/vFieldRate) - (c.minVSyncBP/1000000)) /
+		(vLines + (2*topMarginLines) + c.minPorch + interlace) * 1000000;
 
-            /* Find the number of lines in vSync + back porch */
-            vSyncBP = round(c.minVSyncBP / hPeriodEst);
-            }
-        else if (type == GTF_lockHF) {
-            /* Find the number of lines in vSync + back porch */
-            vSyncBP = round((c.minVSyncBP * hFreq) / 1000);
-            }
+	    /* Find the number of lines in vSync + back porch */
+	    vSyncBP = round(c.minVSyncBP / hPeriodEst);
+	    }
+	else if (type == GTF_lockHF) {
+	    /* Find the number of lines in vSync + back porch */
+	    vSyncBP = round((c.minVSyncBP * hFreq) / 1000);
+	    }
 
-        /* Find the number of lines in the V back porch alone */
-        vBackPorch = vSyncBP - c.vSyncRqd;
+	/* Find the number of lines in the V back porch alone */
+	vBackPorch = vSyncBP - c.vSyncRqd;
 
-        /* Find the total number of lines in the vertical period */
-        vTotalLines = vLines + topMarginLines + botMarginLines + vSyncBP
-            + interlace + c.minPorch;
+	/* Find the total number of lines in the vertical period */
+	vTotalLines = vLines + topMarginLines + botMarginLines + vSyncBP
+	    + interlace + c.minPorch;
 
-        if (type == GTF_lockVF) {
-            /* Estimate the vertical frequency */
-            vFieldRateEst = 1000000 / (hPeriodEst * vTotalLines);
+	if (type == GTF_lockVF) {
+	    /* Estimate the vertical frequency */
+	    vFieldRateEst = 1000000 / (hPeriodEst * vTotalLines);
 
-            /* Find the actual horizontal period */
-            hPeriod = (hPeriodEst * vFieldRateEst) / vFieldRate;
+	    /* Find the actual horizontal period */
+	    hPeriod = (hPeriodEst * vFieldRateEst) / vFieldRate;
 
-            /* Find the actual vertical field frequency */
-            vFieldRate = 1000000 / (hPeriod * vTotalLines);
-            }
-        else if (type == GTF_lockHF) {
-            /* Find the actual vertical field frequency */
-            vFieldRate = (hFreq / vTotalLines) * 1000;
-            }
-        }
+	    /* Find the actual vertical field frequency */
+	    vFieldRate = 1000000 / (hPeriod * vTotalLines);
+	    }
+	else if (type == GTF_lockHF) {
+	    /* Find the actual vertical field frequency */
+	    vFieldRate = (hFreq / vTotalLines) * 1000;
+	    }
+	}
 
     /* Find the number of pixels in the left and right margins */
     if (wantMargins) {
-        leftMarginPixels = round(hPixels * c.margin) / (100 * c.cellGran);
-        rightMarginPixels = round(hPixels * c.margin) / (100 * c.cellGran);
-        }
+	leftMarginPixels = round(hPixels * c.margin) / (100 * c.cellGran);
+	rightMarginPixels = round(hPixels * c.margin) / (100 * c.cellGran);
+	}
     else {
-        leftMarginPixels = 0;
-        rightMarginPixels = 0;
-        }
+	leftMarginPixels = 0;
+	rightMarginPixels = 0;
+	}
 
     /* Find the total number of active pixels in image + margins */
     hTotalActivePixels = hPixels + leftMarginPixels + rightMarginPixels;
 
     if (type == GTF_lockVF) {
-        /* Find the ideal blanking duty cycle */
-        idealDutyCycle = c.c - ((c.m * hPeriod) / 1000);
-        }
+	/* Find the ideal blanking duty cycle */
+	idealDutyCycle = c.c - ((c.m * hPeriod) / 1000);
+	}
     else if (type == GTF_lockHF) {
-        /* Find the ideal blanking duty cycle */
-        idealDutyCycle = c.c - (c.m / hFreq);
-        }
+	/* Find the ideal blanking duty cycle */
+	idealDutyCycle = c.c - (c.m / hFreq);
+	}
     else if (type == GTF_lockPF) {
-        /* Find ideal horizontal period from blanking duty cycle formula */
-        idealHPeriod = (((c.c - 100) + (sqrt((pow(100-c.c,2)) +
-            (0.4 * c.m * (hTotalActivePixels + rightMarginPixels +
-            leftMarginPixels) / dotClock)))) / (2 * c.m)) * 1000;
+	/* Find ideal horizontal period from blanking duty cycle formula */
+	idealHPeriod = (((c.c - 100) + (sqrt((pow(100-c.c,2)) +
+	    (0.4 * c.m * (hTotalActivePixels + rightMarginPixels +
+	    leftMarginPixels) / dotClock)))) / (2 * c.m)) * 1000;
 
-        /* Find the ideal blanking duty cycle */
-        idealDutyCycle = c.c - ((c.m * idealHPeriod) / 1000);
-        }
+	/* Find the ideal blanking duty cycle */
+	idealDutyCycle = c.c - ((c.m * idealHPeriod) / 1000);
+	}
 
     /* Find the number of pixels in blanking time */
     hBlankPixels = round((hTotalActivePixels * idealDutyCycle) /
-        ((100 - idealDutyCycle) * c.cellGran)) * c.cellGran;
+	((100 - idealDutyCycle) * c.cellGran)) * c.cellGran;
 
     /* Find the total number of pixels */
     hTotalPixels = hTotalActivePixels + hBlankPixels;
@@ -262,35 +262,35 @@
     hSyncBP = hBackPorch + hSyncWidth;
 
     if (type == GTF_lockPF) {
-        /* Find the horizontal frequency */
-        hFreq = (dotClock / hTotalPixels) * 1000;
+	/* Find the horizontal frequency */
+	hFreq = (dotClock / hTotalPixels) * 1000;
 
-        /* Find the number of lines in vSync + back porch */
-        vSyncBP = round((c.minVSyncBP * hFreq) / 1000);
+	/* Find the number of lines in vSync + back porch */
+	vSyncBP = round((c.minVSyncBP * hFreq) / 1000);
 
-        /* Find the number of lines in the V back porch alone */
-        vBackPorch = vSyncBP - c.vSyncRqd;
+	/* Find the number of lines in the V back porch alone */
+	vBackPorch = vSyncBP - c.vSyncRqd;
 
-        /* Find the total number of lines in the vertical period */
-        vTotalLines = vLines + topMarginLines + botMarginLines + vSyncBP
-            + interlace + c.minPorch;
+	/* Find the total number of lines in the vertical period */
+	vTotalLines = vLines + topMarginLines + botMarginLines + vSyncBP
+	    + interlace + c.minPorch;
 
-        /* Find the actual vertical field frequency */
-        vFieldRate = (hFreq / vTotalLines) * 1000;
-        }
+	/* Find the actual vertical field frequency */
+	vFieldRate = (hFreq / vTotalLines) * 1000;
+	}
     else {
-        if (type == GTF_lockVF) {
-            /* Find the horizontal frequency */
-            hFreq = 1000 / hPeriod;
-            }
-        else if (type == GTF_lockHF) {
-            /* Find the horizontal frequency */
-            hPeriod = 1000 / hFreq;
-            }
+	if (type == GTF_lockVF) {
+	    /* Find the horizontal frequency */
+	    hFreq = 1000 / hPeriod;
+	    }
+	else if (type == GTF_lockHF) {
+	    /* Find the horizontal frequency */
+	    hPeriod = 1000 / hFreq;
+	    }
 
-        /* Find the pixel clock frequency */
-        dotClock = hTotalPixels / hPeriod;
-        }
+	/* Find the pixel clock frequency */
+	dotClock = hTotalPixels / hPeriod;
+	}
 
     /* Return the computed frequencies */
     t->vFreq = vFieldRate;
@@ -315,16 +315,16 @@
     t->v.vSyncWidth = (int)c.vSyncRqd;
     t->v.vBackPorch = (int)vBackPorch;
     if (wantInterlace) {
-        /* Halve the timings for interlaced modes */
-        t->v.vTotal /= 2;
-        t->v.vDisp /= 2;
-        t->v.vSyncStart /= 2;
-        t->v.vSyncEnd /= 2;
-        t->v.vFrontPorch /= 2;
-        t->v.vSyncWidth /= 2;
-        t->v.vBackPorch /= 2;
-        t->dotClock /= 2;
-        }
+	/* Halve the timings for interlaced modes */
+	t->v.vTotal /= 2;
+	t->v.vDisp /= 2;
+	t->v.vSyncStart /= 2;
+	t->v.vSyncEnd /= 2;
+	t->v.vFrontPorch /= 2;
+	t->v.vSyncWidth /= 2;
+	t->v.vBackPorch /= 2;
+	t->dotClock /= 2;
+	}
 
     /* Mark as GTF timing using the sync polarities */
     t->interlace = (wantInterlace) ? 'I' : 'N';
@@ -348,30 +348,30 @@
     GTF_timings t;
 
     if (argc != 5 && argc != 6) {
-        printf("Usage: GTFCALC <xPixels> <yPixels> <freq> [[Hz] [KHz] [MHz]] [I]\n");
-        printf("\n");
-        printf("where <xPixels> is the horizontal resolution of the mode, <yPixels> is the\n");
-        printf("vertical resolution of the mode. The <freq> value will be the frequency to\n");
-        printf("drive the calculations, and will be either the vertical frequency (in Hz)\n");
-        printf("the horizontal frequency (in KHz) or the dot clock (in MHz). To generate\n");
-        printf("timings for an interlaced mode, add 'I' to the end of the command line.\n");
-        printf("\n");
-        printf("For example to generate timings for 640x480 at 60Hz vertical:\n");
-        printf("\n");
-        printf("    GTFCALC 640 480 60 Hz\n");
-        printf("\n");
-        printf("For example to generate timings for 640x480 at 31.5KHz horizontal:\n");
-        printf("\n");
-        printf("    GTFCALC 640 480 31.5 KHz\n");
-        printf("\n");
-        printf("For example to generate timings for 640x480 with a 25.175Mhz dot clock:\n");
-        printf("\n");
-        printf("    GTFCALC 640 480 25.175 MHz\n");
-        printf("\n");
-        printf("GTFCALC will print a summary of the results found, and dump the CRTC\n");
-        printf("values to the UVCONFIG.CRT file in the format used by SciTech Display Doctor.\n");
-        exit(1);
-        }
+	printf("Usage: GTFCALC <xPixels> <yPixels> <freq> [[Hz] [KHz] [MHz]] [I]\n");
+	printf("\n");
+	printf("where <xPixels> is the horizontal resolution of the mode, <yPixels> is the\n");
+	printf("vertical resolution of the mode. The <freq> value will be the frequency to\n");
+	printf("drive the calculations, and will be either the vertical frequency (in Hz)\n");
+	printf("the horizontal frequency (in KHz) or the dot clock (in MHz). To generate\n");
+	printf("timings for an interlaced mode, add 'I' to the end of the command line.\n");
+	printf("\n");
+	printf("For example to generate timings for 640x480 at 60Hz vertical:\n");
+	printf("\n");
+	printf("    GTFCALC 640 480 60 Hz\n");
+	printf("\n");
+	printf("For example to generate timings for 640x480 at 31.5KHz horizontal:\n");
+	printf("\n");
+	printf("    GTFCALC 640 480 31.5 KHz\n");
+	printf("\n");
+	printf("For example to generate timings for 640x480 with a 25.175Mhz dot clock:\n");
+	printf("\n");
+	printf("    GTFCALC 640 480 25.175 MHz\n");
+	printf("\n");
+	printf("GTFCALC will print a summary of the results found, and dump the CRTC\n");
+	printf("values to the UVCONFIG.CRT file in the format used by SciTech Display Doctor.\n");
+	exit(1);
+	}
 
     /* Get values from command line */
     xPixels = atof(argv[1]);
@@ -381,33 +381,33 @@
 
     /* Compute the CRTC timings */
     if (toupper(argv[4][0]) == 'H')
-        GTF_calcTimings(xPixels,yPixels,freq,GTF_lockVF,false,interlace,&t);
+	GTF_calcTimings(xPixels,yPixels,freq,GTF_lockVF,false,interlace,&t);
     else if (toupper(argv[4][0]) == 'K')
-        GTF_calcTimings(xPixels,yPixels,freq,GTF_lockHF,false,interlace,&t);
+	GTF_calcTimings(xPixels,yPixels,freq,GTF_lockHF,false,interlace,&t);
     else if (toupper(argv[4][0]) == 'M')
-        GTF_calcTimings(xPixels,yPixels,freq,GTF_lockPF,false,interlace,&t);
+	GTF_calcTimings(xPixels,yPixels,freq,GTF_lockPF,false,interlace,&t);
     else {
-        printf("Unknown command line!\n");
-        exit(1);
-        }
+	printf("Unknown command line!\n");
+	exit(1);
+	}
 
     /* Dump summary info to standard output */
     printf("CRTC values for %.0fx%.0f @ %.2f %s\n", xPixels, yPixels, freq, argv[4]);
     printf("\n");
     printf("  hTotal      = %-4d    vTotal      = %-4d\n",
-        t.h.hTotal, t.v.vTotal);
+	t.h.hTotal, t.v.vTotal);
     printf("  hDisp       = %-4d    vDisp       = %-4d\n",
-        t.h.hDisp, t.v.vDisp);
+	t.h.hDisp, t.v.vDisp);
     printf("  hSyncStart  = %-4d    vSyncStart  = %-4d\n",
-        t.h.hSyncStart, t.v.vSyncStart);
+	t.h.hSyncStart, t.v.vSyncStart);
     printf("  hSyncEnd    = %-4d    vSyncEnd    = %-4d\n",
-        t.h.hSyncEnd, t.v.vSyncEnd);
+	t.h.hSyncEnd, t.v.vSyncEnd);
     printf("  hFrontPorch = %-4d    vFrontPorch = %-4d\n",
-        t.h.hFrontPorch, t.v.vFrontPorch);
+	t.h.hFrontPorch, t.v.vFrontPorch);
     printf("  hSyncWidth  = %-4d    vSyncWidth  = %-4d\n",
-        t.h.hSyncWidth, t.v.vSyncWidth);
+	t.h.hSyncWidth, t.v.vSyncWidth);
     printf("  hBackPorch  = %-4d    vBackPorch  = %-4d\n",
-        t.h.hBackPorch, t.v.vBackPorch);
+	t.h.hBackPorch, t.v.vBackPorch);
     printf("\n");
     printf("  Interlaced  = %s\n", (t.interlace == 'I') ? "Yes" : "No");
     printf("  H sync pol  = %c\n", t.hSyncPol);
@@ -419,18 +419,18 @@
 
     /* Dump to file in format used by SciTech Display Doctor */
     if ((f = fopen("UVCONFIG.CRT","w")) != NULL) {
-        fprintf(f, "[%.0f %.0f]\n", xPixels, yPixels);
-        fprintf(f, "%d %d %d %d '%c' %s\n",
-            t.h.hTotal, t.h.hDisp,
-            t.h.hSyncStart, t.h.hSyncEnd,
-            t.hSyncPol, (t.interlace == 'I') ? "I" : "NI");
-        fprintf(f, "%d %d %d %d '%c'\n",
-            t.v.vTotal, t.v.vDisp,
-            t.v.vSyncStart, t.v.vSyncEnd,
-            t.vSyncPol);
-        fprintf(f, "%.2f\n", t.dotClock);
-        fclose(f);
-        }
+	fprintf(f, "[%.0f %.0f]\n", xPixels, yPixels);
+	fprintf(f, "%d %d %d %d '%c' %s\n",
+	    t.h.hTotal, t.h.hDisp,
+	    t.h.hSyncStart, t.h.hSyncEnd,
+	    t.hSyncPol, (t.interlace == 'I') ? "I" : "NI");
+	fprintf(f, "%d %d %d %d '%c'\n",
+	    t.v.vTotal, t.v.vDisp,
+	    t.v.vSyncStart, t.v.vSyncEnd,
+	    t.vSyncPol);
+	fprintf(f, "%.2f\n", t.dotClock);
+	fclose(f);
+	}
 }
 
 #endif  /* TESTING */

diff --git a/board/MAI/bios_emulator/scitech/src/common/libcimp.c b/board/MAI/bios_emulator/scitech/src/common/libcimp.c
index 0eacd12..ab73ad5 100644
--- a/board/MAI/bios_emulator/scitech/src/common/libcimp.c
+++ b/board/MAI/bios_emulator/scitech/src/common/libcimp.c

@@ -270,27 +270,27 @@
 
     /* Find an empty file handle to use */
     for (i = 3; i < MAX_FILES; i++) {
-        if (!openHandles[i])
-            break;
-        }
+	if (!openHandles[i])
+	    break;
+	}
     if (openHandles[i])
-        return -1;
+	return -1;
 
     /* Find the open flags to use */
     if (_oflag & ___O_TRUNC)
-        strcpy(mode,"w");
+	strcpy(mode,"w");
     else if (_oflag & ___O_CREAT)
-        strcpy(mode,"a");
+	strcpy(mode,"a");
     else
-        strcpy(mode,"r");
+	strcpy(mode,"r");
     if (_oflag & ___O_BINARY)
-        strcat(mode,"b");
+	strcat(mode,"b");
     if (_oflag & ___O_TEXT)
-        strcat(mode,"t");
+	strcat(mode,"t");
 
     /* Open the file and store the file handle */
     if ((openHandles[i] = fopen(_path,mode)) == NULL)
-        return -1;
+	return -1;
     return i;
 }
 
@@ -300,25 +300,25 @@
 int _CDECL stub_close(int _fildes)
 {
     if (_fildes >= 3 && openHandles[_fildes]) {
-        fclose(openHandles[_fildes]);
-        openHandles[_fildes] = NULL;
-        }
+	fclose(openHandles[_fildes]);
+	openHandles[_fildes] = NULL;
+	}
     return 0;
 }
 
 off_t _CDECL stub_lseek(int _fildes, off_t _offset, int _whence)
 {
     if (_fildes >= 3) {
-        fseek(openHandles[_fildes],_offset,_whence);
-        return ftell(openHandles[_fildes]);
-        }
+	fseek(openHandles[_fildes],_offset,_whence);
+	return ftell(openHandles[_fildes]);
+	}
     return 0;
 }
 
 size_t _CDECL stub_read(int _fildes, void *_buf, size_t _nbyte)
 {
     if (_fildes >= 3)
-        return fread(_buf,1,_nbyte,openHandles[_fildes]);
+	return fread(_buf,1,_nbyte,openHandles[_fildes]);
     return 0;
 }
 
@@ -327,18 +327,18 @@
     WORD error;
 
     if (initComplete) {
-        if (R0_DeleteFile((char*)_path,0,&error))
-            return 0;
-        return -1;
-        }
+	if (R0_DeleteFile((char*)_path,0,&error))
+	    return 0;
+	return -1;
+	}
     else
-        return i_remove(_path);
+	return i_remove(_path);
 }
 
 size_t _CDECL stub_write(int _fildes, const void *_buf, size_t _nbyte)
 {
     if (_fildes >= 3)
-        return fwrite(_buf,1,_nbyte,openHandles[_fildes]);
+	return fwrite(_buf,1,_nbyte,openHandles[_fildes]);
     return _nbyte;
 }
 
@@ -356,7 +356,7 @@
 {
     WORD error;
     if (initComplete)
-        R0_SetFileAttributes((char*)filename,attrib,&error);
+	R0_SetFileAttributes((char*)filename,attrib,&error);
 }
 
 /* Return the current date in days since 1/1/1980 */
@@ -380,59 +380,59 @@
 
     /* Find an empty file handle to use */
     for (i = 3; i < MAX_FILES; i++) {
-        if (!openHandles[i])
-            break;
-        }
+	if (!openHandles[i])
+	    break;
+	}
     if (openHandles[i])
-        return -1;
+	return -1;
 
     /* Find the open flags to use */
     if (_oflag & ___O_TRUNC)
-        strcpy(mode,"w");
+	strcpy(mode,"w");
     else if (_oflag & ___O_CREAT)
-        strcpy(mode,"a");
+	strcpy(mode,"a");
     else
-        strcpy(mode,"r");
+	strcpy(mode,"r");
     if (_oflag & ___O_BINARY)
-        strcat(mode,"b");
+	strcat(mode,"b");
     if (_oflag & ___O_TEXT)
-        strcat(mode,"t");
+	strcat(mode,"t");
 
     /* Open the file and store the file handle */
     if ((openHandles[i] = fopen(_path,mode)) == NULL)
-        return -1;
+	return -1;
     return i;
 }
 
 int _CDECL stub_close(int _fildes)
 {
     if (_fildes >= 3 && openHandles[_fildes]) {
-        fclose(openHandles[_fildes]);
-        openHandles[_fildes] = NULL;
-        }
+	fclose(openHandles[_fildes]);
+	openHandles[_fildes] = NULL;
+	}
     return 0;
 }
 
 off_t _CDECL stub_lseek(int _fildes, off_t _offset, int _whence)
 {
     if (_fildes >= 3) {
-        fseek(openHandles[_fildes],_offset,_whence);
-        return ftell(openHandles[_fildes]);
-        }
+	fseek(openHandles[_fildes],_offset,_whence);
+	return ftell(openHandles[_fildes]);
+	}
     return 0;
 }
 
 size_t _CDECL stub_read(int _fildes, void *_buf, size_t _nbyte)
 {
     if (_fildes >= 3)
-        return fread(_buf,1,_nbyte,openHandles[_fildes]);
+	return fread(_buf,1,_nbyte,openHandles[_fildes]);
     return 0;
 }
 
 size_t _CDECL stub_write(int _fildes, const void *_buf, size_t _nbyte)
 {
     if (_fildes >= 3)
-        return fwrite(_buf,1,_nbyte,openHandles[_fildes]);
+	return fwrite(_buf,1,_nbyte,openHandles[_fildes]);
     return _nbyte;
 }
 
@@ -444,7 +444,7 @@
 
 int _CDECL stub_unlink(const char *_path)
 {
-    // TODO: Implement this!
+    /* TODO: Implement this! */
     return -1;
 }
 
@@ -454,7 +454,7 @@
 
 int _CDECL stub_rename(const char *_old, const char *_new)
 {
-    // TODO: Implement this!
+    /* TODO: Implement this! */
     return -1;
 }
 
@@ -462,11 +462,11 @@
 {
     uint _attr = 0;
     if (attrib & __A_RDONLY)
-        _attr |= FILE_ATTRIBUTE_READONLY;
+	_attr |= FILE_ATTRIBUTE_READONLY;
     if (attrib & __A_HIDDEN)
-        _attr |= FILE_ATTRIBUTE_HIDDEN;
+	_attr |= FILE_ATTRIBUTE_HIDDEN;
     if (attrib & __A_SYSTEM)
-        _attr |= FILE_ATTRIBUTE_SYSTEM;
+	_attr |= FILE_ATTRIBUTE_SYSTEM;
     PM_setFileAttr(filename,_attr);
 }
 
@@ -506,7 +506,7 @@
 {
     FILESTATUS3 s;
     if (DosQueryPathInfo((PSZ)filename,FIL_STANDARD,(PVOID)&s,sizeof(s)))
-        return;
+	return;
     s.attrFile = attrib;
     DosSetPathInfo((PSZ)filename,FIL_STANDARD,(PVOID)&s,sizeof(s),0L);
 }
@@ -528,25 +528,25 @@
 
     /* Determine open flags */
     if (_oflag & ___O_CREAT) {
-        if (_oflag & ___O_EXCL)
-            openflag = OPEN_ACTION_FAIL_IF_EXISTS | OPEN_ACTION_CREATE_IF_NEW;
-        else if (_oflag & ___O_TRUNC)
-            openflag = OPEN_ACTION_REPLACE_IF_EXISTS | OPEN_ACTION_CREATE_IF_NEW;
-        else
-            openflag = OPEN_ACTION_OPEN_IF_EXISTS | OPEN_ACTION_CREATE_IF_NEW;
-        }
+	if (_oflag & ___O_EXCL)
+	    openflag = OPEN_ACTION_FAIL_IF_EXISTS | OPEN_ACTION_CREATE_IF_NEW;
+	else if (_oflag & ___O_TRUNC)
+	    openflag = OPEN_ACTION_REPLACE_IF_EXISTS | OPEN_ACTION_CREATE_IF_NEW;
+	else
+	    openflag = OPEN_ACTION_OPEN_IF_EXISTS | OPEN_ACTION_CREATE_IF_NEW;
+	}
     else if (_oflag & ___O_TRUNC)
-        openflag = OPEN_ACTION_REPLACE_IF_EXISTS;
+	openflag = OPEN_ACTION_REPLACE_IF_EXISTS;
     else
-        openflag = OPEN_ACTION_OPEN_IF_EXISTS;
+	openflag = OPEN_ACTION_OPEN_IF_EXISTS;
 
     /* Determine open mode flags */
     if (_oflag & ___O_RDONLY)
-        openmode = OPEN_ACCESS_READONLY | OPEN_SHARE_DENYNONE;
+	openmode = OPEN_ACCESS_READONLY | OPEN_SHARE_DENYNONE;
     else if (_oflag & ___O_WRONLY)
-        openmode = OPEN_ACCESS_WRITEONLY | OPEN_SHARE_DENYWRITE;
+	openmode = OPEN_ACCESS_WRITEONLY | OPEN_SHARE_DENYWRITE;
     else
-        openmode = OPEN_ACCESS_READWRITE | OPEN_SHARE_DENYWRITE;
+	openmode = OPEN_ACCESS_READWRITE | OPEN_SHARE_DENYWRITE;
 
     /* Copy the path to a variable on the stack. We need to do this
      * for OS/2 as when the drivers are loaded into shared kernel
@@ -555,14 +555,14 @@
      */
     strcpy(path,_path);
     if (DosOpen(path, &handle, &actiontaken, 0, FILE_NORMAL,
-            openflag, openmode, NULL) != NO_ERROR)
-        return -1;
+	    openflag, openmode, NULL) != NO_ERROR)
+	return -1;
 
     /* Handle append mode of operation */
     if (_oflag & ___O_APPEND) {
-        if (DosSetFilePtr(handle, 0, FILE_END, &error) != NO_ERROR)
-            return -1;
-        }
+	if (DosSetFilePtr(handle, 0, FILE_END, &error) != NO_ERROR)
+	    return -1;
+	}
     return handle;
 }
 
@@ -578,16 +578,16 @@
      */
     strcpy(path,_path);
     if (DosQueryPathInfo(path, FIL_STANDARD, &fs, sizeof(fs)) != NO_ERROR)
-        return -1;
+	return -1;
     if ((_amode & W_OK) && (fs.attrFile & FILE_READONLY))
-        return -1;
+	return -1;
     return 0;
 }
 
 int _CDECL stub_close(int _fildes)
 {
     if (DosClose(_fildes) != NO_ERROR)
-        return -1;
+	return -1;
     return 0;
 }
 
@@ -596,17 +596,17 @@
     ULONG  cbActual, origin;
 
     switch (_whence) {
-        case SEEK_CUR:
-            origin = FILE_CURRENT;
-            break;
-        case SEEK_END:
-            origin = FILE_END;
-            break;
-        default:
-            origin = FILE_BEGIN;
-        }
+	case SEEK_CUR:
+	    origin = FILE_CURRENT;
+	    break;
+	case SEEK_END:
+	    origin = FILE_END;
+	    break;
+	default:
+	    origin = FILE_BEGIN;
+	}
     if (DosSetFilePtr(_fildes, _offset, origin, &cbActual) != NO_ERROR)
-        return -1;
+	return -1;
     return cbActual;
 }
 
@@ -621,19 +621,19 @@
      * in kernel space and will cause DosRead to bail internally.
      */
     while (_nbyte > BUF_SIZE) {
-        if (DosRead(_fildes, file_io_buf, BUF_SIZE, &cbRead) != NO_ERROR)
-            return -1;
-        cbActual += cbRead;
-        memcpy(p,file_io_buf,BUF_SIZE);
-        p += BUF_SIZE;
-        _nbyte -= BUF_SIZE;
-        }
+	if (DosRead(_fildes, file_io_buf, BUF_SIZE, &cbRead) != NO_ERROR)
+	    return -1;
+	cbActual += cbRead;
+	memcpy(p,file_io_buf,BUF_SIZE);
+	p += BUF_SIZE;
+	_nbyte -= BUF_SIZE;
+	}
     if (_nbyte) {
-        if (DosRead(_fildes, file_io_buf, _nbyte, &cbRead) != NO_ERROR)
-            return -1;
-        cbActual += cbRead;
-        memcpy(p,file_io_buf,_nbyte);
-        }
+	if (DosRead(_fildes, file_io_buf, _nbyte, &cbRead) != NO_ERROR)
+	    return -1;
+	cbActual += cbRead;
+	memcpy(p,file_io_buf,_nbyte);
+	}
     return cbActual;
 }
 
@@ -648,19 +648,19 @@
      * in kernel space and will cause DosWrite to bail internally.
      */
     while (_nbyte > BUF_SIZE) {
-        memcpy(file_io_buf,p,BUF_SIZE);
-        if (DosWrite(_fildes, file_io_buf, BUF_SIZE, &cbWrite) != NO_ERROR)
-            return -1;
-        cbActual += cbWrite;
-        p += BUF_SIZE;
-        _nbyte -= BUF_SIZE;
-        }
+	memcpy(file_io_buf,p,BUF_SIZE);
+	if (DosWrite(_fildes, file_io_buf, BUF_SIZE, &cbWrite) != NO_ERROR)
+	    return -1;
+	cbActual += cbWrite;
+	p += BUF_SIZE;
+	_nbyte -= BUF_SIZE;
+	}
     if (_nbyte) {
-        memcpy(file_io_buf,p,_nbyte);
-        if (DosWrite(_fildes, file_io_buf, _nbyte, &cbWrite) != NO_ERROR)
-            return -1;
-        cbActual += cbWrite;
-        }
+	memcpy(file_io_buf,p,_nbyte);
+	if (DosWrite(_fildes, file_io_buf, _nbyte, &cbWrite) != NO_ERROR)
+	    return -1;
+	cbActual += cbWrite;
+	}
     return cbActual;
 }
 
@@ -675,7 +675,7 @@
      */
     strcpy(path,_path);
     if (DosDelete(path) != NO_ERROR)
-        return -1;
+	return -1;
     return 0;
 }
 
@@ -684,7 +684,7 @@
     ULONG  htype, flags;
 
     if (DosQueryHType(_fildes, &htype, &flags) != NO_ERROR)
-        return 0;
+	return 0;
     return ((htype & 0xFF) == HANDTYPE_DEVICE);
 }
 
@@ -700,7 +700,7 @@
      */
     strcpy(path,_path);
     if (DosDelete(path) != NO_ERROR)
-        return -1;
+	return -1;
     return 0;
 }
 
@@ -717,7 +717,7 @@
     strcpy(old,_old);
     strcpy(new,_new);
     if (DosMove(old, new) != NO_ERROR)
-        return -1;
+	return -1;
     return 0;
 }
 
@@ -734,23 +734,23 @@
 int _CDECL stub_open(const char *_path, int _oflag, unsigned _mode)
 {
     int oflag_tab[] = {
-        ___O_RDONLY,    O_RDONLY,
-        ___O_WRONLY,    O_WRONLY,
-        ___O_RDWR,      O_RDWR,
-        ___O_BINARY,    O_BINARY,
-        ___O_TEXT,      O_TEXT,
-        ___O_CREAT,     O_CREAT,
-        ___O_EXCL,      O_EXCL,
-        ___O_TRUNC,     O_TRUNC,
-        ___O_APPEND,    O_APPEND,
-        };
+	___O_RDONLY,    O_RDONLY,
+	___O_WRONLY,    O_WRONLY,
+	___O_RDWR,      O_RDWR,
+	___O_BINARY,    O_BINARY,
+	___O_TEXT,      O_TEXT,
+	___O_CREAT,     O_CREAT,
+	___O_EXCL,      O_EXCL,
+	___O_TRUNC,     O_TRUNC,
+	___O_APPEND,    O_APPEND,
+	};
     int i,oflag = 0;
 
     /* Translate the oflag's to the OS dependent versions */
     for (i = 0; i < sizeof(oflag_tab) / sizeof(int); i += 2) {
-        if (_oflag & oflag_tab[i])
-            oflag |= oflag_tab[i+1];
-        }
+	if (_oflag & oflag_tab[i])
+	    oflag |= oflag_tab[i+1];
+	}
     return open(_path,oflag,_mode);
 }
 
@@ -825,4 +825,3 @@
     return (void*)signal(sig,(__code_ptr)handler);
 #endif
 }
-

diff --git a/board/MAI/bios_emulator/scitech/src/common/peloader.c b/board/MAI/bios_emulator/scitech/src/common/peloader.c
index b9bec4a..a134bb0 100644
--- a/board/MAI/bios_emulator/scitech/src/common/peloader.c
+++ b/board/MAI/bios_emulator/scitech/src/common/peloader.c

@@ -79,35 +79,35 @@
     result = PE_invalidDLLImage;
     fseek(f, startOffset, SEEK_SET);
     if (fread(&exehdr, 1, sizeof(exehdr), f) != sizeof(exehdr))
-        return false;
+	return false;
     if (exehdr.signature != 0x5A4D)
-        return false;
+	return false;
 
     /* Now seek to the start of the PE header defined at offset 0x3C
      * in the MS-DOS EXE header, and read the signature and check it.
      */
     fseek(f, startOffset+0x3C, SEEK_SET);
     if (fread(&offset, 1, sizeof(offset), f) != sizeof(offset))
-        return false;
+	return false;
     fseek(f, startOffset+offset, SEEK_SET);
     if (fread(&signature, 1, sizeof(signature), f) != sizeof(signature))
-        return false;
+	return false;
     if (signature != 0x00004550)
-        return false;
+	return false;
 
     /* Now read the PE file header and check that it is correct */
     if (fread(filehdr, 1, sizeof(*filehdr), f) != sizeof(*filehdr))
-        return false;
+	return false;
     if (filehdr->Machine != IMAGE_FILE_MACHINE_I386)
-        return false;
+	return false;
     if (!(filehdr->Characteristics & IMAGE_FILE_32BIT_MACHINE))
-        return false;
+	return false;
     if (!(filehdr->Characteristics & IMAGE_FILE_DLL))
-        return false;
+	return false;
     if (fread(opthdr, 1, sizeof(*opthdr), f) != sizeof(*opthdr))
-        return false;
+	return false;
     if (opthdr->Magic != 0x10B)
-        return false;
+	return false;
 
     /* Success, so return true! */
     return true;
@@ -138,15 +138,15 @@
 
     /* Read the PE file headers from disk */
     if (!PE_readHeader(f,startOffset,&filehdr,&opthdr))
-        return 0xFFFFFFFF;
+	return 0xFFFFFFFF;
 
     /* Scan all the section headers summing up the total size */
     size = opthdr.SizeOfHeaders;
     for (i = 0; i < filehdr.NumberOfSections; i++) {
-        if (fread(&secthdr, 1, sizeof(secthdr), f) != sizeof(secthdr))
-            return 0xFFFFFFFF;
-        size += secthdr.SizeOfRawData;
-        }
+	if (fread(&secthdr, 1, sizeof(secthdr), f) != sizeof(secthdr))
+	    return 0xFFFFFFFF;
+	size += secthdr.SizeOfRawData;
+	}
     return size;
 }
 
@@ -199,7 +199,7 @@
 
     /* Read the PE file headers from disk */
     if (!PE_readHeader(f,startOffset,&filehdr,&opthdr))
-        return NULL;
+	return NULL;
 
     /* Scan all the section headers and find the necessary sections */
     text_off = data_off = reloc_off = export_off = 0;
@@ -208,56 +208,56 @@
     export_addr = export_size = export_end = 0;
     reloc_size = 0;
     for (i = 0; i < filehdr.NumberOfSections; i++) {
-        if (fread(&secthdr, 1, sizeof(secthdr), f) != sizeof(secthdr))
-            goto Error;
-        if (strcmp(secthdr.Name, ".edata") == 0 || strcmp(secthdr.Name, ".rdata") == 0) {
-            /* Exports section */
-            export_off = secthdr.PointerToRawData;
-            export_addr = secthdr.VirtualAddress;
-            export_size = secthdr.SizeOfRawData;
-            export_end = export_addr + export_size;
-            }
-        else if (strcmp(secthdr.Name, ".idata") == 0) {
-            /* Imports section, ignore */
-            }
-        else if (strcmp(secthdr.Name, ".reloc") == 0) {
-            /* Relocations section */
-            reloc_off = secthdr.PointerToRawData;
-            reloc_size = secthdr.SizeOfRawData;
-            }
-        else if (!text_off && secthdr.Characteristics & IMAGE_SCN_CNT_CODE) {
-            /* Code section */
-            text_off = secthdr.PointerToRawData;
-            text_addr = secthdr.VirtualAddress;
-            text_size = secthdr.SizeOfRawData;
-            }
-        else if (!data_off && secthdr.Characteristics & IMAGE_SCN_CNT_INITIALIZED_DATA) {
-            /* Data section */
-            data_off = secthdr.PointerToRawData;
-            data_addr = secthdr.VirtualAddress;
-            data_size = secthdr.SizeOfRawData;
-            data_end = data_addr + data_size;
-            }
-        }
+	if (fread(&secthdr, 1, sizeof(secthdr), f) != sizeof(secthdr))
+	    goto Error;
+	if (strcmp(secthdr.Name, ".edata") == 0 || strcmp(secthdr.Name, ".rdata") == 0) {
+	    /* Exports section */
+	    export_off = secthdr.PointerToRawData;
+	    export_addr = secthdr.VirtualAddress;
+	    export_size = secthdr.SizeOfRawData;
+	    export_end = export_addr + export_size;
+	    }
+	else if (strcmp(secthdr.Name, ".idata") == 0) {
+	    /* Imports section, ignore */
+	    }
+	else if (strcmp(secthdr.Name, ".reloc") == 0) {
+	    /* Relocations section */
+	    reloc_off = secthdr.PointerToRawData;
+	    reloc_size = secthdr.SizeOfRawData;
+	    }
+	else if (!text_off && secthdr.Characteristics & IMAGE_SCN_CNT_CODE) {
+	    /* Code section */
+	    text_off = secthdr.PointerToRawData;
+	    text_addr = secthdr.VirtualAddress;
+	    text_size = secthdr.SizeOfRawData;
+	    }
+	else if (!data_off && secthdr.Characteristics & IMAGE_SCN_CNT_INITIALIZED_DATA) {
+	    /* Data section */
+	    data_off = secthdr.PointerToRawData;
+	    data_addr = secthdr.VirtualAddress;
+	    data_size = secthdr.SizeOfRawData;
+	    data_end = data_addr + data_size;
+	    }
+	}
 
     /* Check to make sure that we have all the sections we need */
     if (!text_off || !data_off || !export_off || !reloc_off) {
-        result = PE_invalidDLLImage;
-        goto Error;
-        }
+	result = PE_invalidDLLImage;
+	goto Error;
+	}
 
     /* Find the size of the image to load allocate memory for it */
     image_size = MAX(export_end,data_end) - text_addr;
     *size = sizeof(PE_MODULE) + image_size + 4096;
     if (shared)
-        hMod = PM_mallocShared(*size);
+	hMod = PM_mallocShared(*size);
     else
-        hMod = PM_malloc(*size);
+	hMod = PM_malloc(*size);
     reloc = PM_malloc(reloc_size);
     if (!hMod || !reloc) {
-        result = PE_outOfMemory;
-        goto Error;
-        }
+	result = PE_outOfMemory;
+	goto Error;
+	}
 
     hMod->text = (uchar*)ROUND_4K((ulong)hMod + sizeof(PE_MODULE));
     hMod->data = (uchar*)((ulong)hMod->text + (data_addr - text_addr));
@@ -272,48 +272,48 @@
     result = PE_invalidDLLImage;
     fseek(f, startOffset+text_off, SEEK_SET);
     if (fread(hMod->text, 1, text_size, f) != text_size)
-        goto Error;
+	goto Error;
     fseek(f, startOffset+data_off, SEEK_SET);
     if (fread(hMod->data, 1, data_size, f) != data_size)
-        goto Error;
+	goto Error;
     fseek(f, startOffset+export_off, SEEK_SET);
     if (fread(hMod->export, 1, export_size, f) != export_size)
-        goto Error;
+	goto Error;
     fseek(f, startOffset+reloc_off, SEEK_SET);
     if (fread(reloc, 1, reloc_size, f) != reloc_size)
-        goto Error;
+	goto Error;
 
     /* Now perform relocations on all sections in the image */
     delta = (ulong)hMod->text - opthdr.ImageBase - text_addr;
     baseReloc = (BASE_RELOCATION*)reloc;
     for (;;) {
-        /* Check for termination condition */
-        if (!baseReloc->PageRVA || !baseReloc->BlockSize)
-            break;
+	/* Check for termination condition */
+	if (!baseReloc->PageRVA || !baseReloc->BlockSize)
+	    break;
 
-        /* Do fixups */
-        pageOffset = baseReloc->PageRVA - hMod->textBase;
-        numFixups = (baseReloc->BlockSize - sizeof(BASE_RELOCATION)) / sizeof(ushort);
-        fixup = (ushort*)(baseReloc + 1);
-        for (i = 0; i < numFixups; i++) {
-            relocType = *fixup >> 12;
-            if (relocType) {
-                offset = pageOffset + (*fixup & 0x0FFF);
-                *(ulong*)(hMod->text + offset) += delta;
-                }
-            fixup++;
-            }
+	/* Do fixups */
+	pageOffset = baseReloc->PageRVA - hMod->textBase;
+	numFixups = (baseReloc->BlockSize - sizeof(BASE_RELOCATION)) / sizeof(ushort);
+	fixup = (ushort*)(baseReloc + 1);
+	for (i = 0; i < numFixups; i++) {
+	    relocType = *fixup >> 12;
+	    if (relocType) {
+		offset = pageOffset + (*fixup & 0x0FFF);
+		*(ulong*)(hMod->text + offset) += delta;
+		}
+	    fixup++;
+	    }
 
-        /* Move to next relocation block */
-        baseReloc = (BASE_RELOCATION*)((ulong)baseReloc + baseReloc->BlockSize);
-        }
+	/* Move to next relocation block */
+	baseReloc = (BASE_RELOCATION*)((ulong)baseReloc + baseReloc->BlockSize);
+	}
 
     /* Initialise the C runtime library for the loaded DLL */
     result = PE_unableToInitLibC;
     if ((InitLibC = (InitLibC_t)PE_getProcAddress(hMod,"_InitLibC")) == NULL)
-        goto Error;
+	goto Error;
     if (!InitLibC(&___imports,PM_getOSType()))
-        goto Error;
+	goto Error;
 
     /* Clean up, close the file and return the loaded module handle */
     PM_free(reloc);
@@ -322,9 +322,9 @@
 
 Error:
     if (shared)
-        PM_freeShared(hMod);
+	PM_freeShared(hMod);
     else
-        PM_free(hMod);
+	PM_free(hMod);
     PM_free(reloc);
     return NULL;
 }
@@ -360,53 +360,53 @@
 
 #if (defined(__WINDOWS32__) || defined(__DRIVER__)) && defined(CHECKED)
     if (!shared) {
-        PM_MODULE       hInst;
-        InitLibC_t      InitLibC;
+	PM_MODULE       hInst;
+	InitLibC_t      InitLibC;
 
-        /* For Win32 if are building checked libraries for debugging, we use
-         * the real Win32 DLL functions so that we can debug the resulting DLL
-         * files with the Win32 debuggers. Note that we can't do this if
-         * we need to load the files into a shared memory context.
-         */
-        if ((hInst = PM_loadLibrary(szDLLName)) == NULL) {
-            result = PE_fileNotFound;
-            return NULL;
-            }
+	/* For Win32 if are building checked libraries for debugging, we use
+	 * the real Win32 DLL functions so that we can debug the resulting DLL
+	 * files with the Win32 debuggers. Note that we can't do this if
+	 * we need to load the files into a shared memory context.
+	 */
+	if ((hInst = PM_loadLibrary(szDLLName)) == NULL) {
+	    result = PE_fileNotFound;
+	    return NULL;
+	    }
 
-        /* Initialise the C runtime library for the loaded DLL */
-        result = PE_unableToInitLibC;
-        if ((InitLibC = (void*)PM_getProcAddress(hInst,"_InitLibC")) == NULL)
-            return NULL;
-        if (!InitLibC(&___imports,PM_getOSType()))
-            return NULL;
+	/* Initialise the C runtime library for the loaded DLL */
+	result = PE_unableToInitLibC;
+	if ((InitLibC = (void*)PM_getProcAddress(hInst,"_InitLibC")) == NULL)
+	    return NULL;
+	if (!InitLibC(&___imports,PM_getOSType()))
+	    return NULL;
 
-        /* Allocate the PE_MODULE structure */
-        if ((hMod = PM_malloc(sizeof(*hMod))) == NULL)
-            return NULL;
-        hMod->text = (void*)hInst;
-        hMod->shared = -1;
+	/* Allocate the PE_MODULE structure */
+	if ((hMod = PM_malloc(sizeof(*hMod))) == NULL)
+	    return NULL;
+	hMod->text = (void*)hInst;
+	hMod->shared = -1;
 
-        /* DLL loaded successfully so return module handle */
-        result = PE_ok;
-        return hMod;
-        }
+	/* DLL loaded successfully so return module handle */
+	result = PE_ok;
+	return hMod;
+	}
     else
 #endif
-        {
-        FILE        *f;
-        ulong       size;
+	{
+	FILE        *f;
+	ulong       size;
 
-        /* Attempt to open the file on disk */
-        if (shared < 0)
-            shared = 0;
-        if ((f = fopen(szDLLName,"rb")) == NULL) {
-            result = PE_fileNotFound;
-            return NULL;
-            }
-        hMod = PE_loadLibraryExt(f,0,&size,shared);
-        fclose(f);
-        return hMod;
-        }
+	/* Attempt to open the file on disk */
+	if (shared < 0)
+	    shared = 0;
+	if ((f = fopen(szDLLName,"rb")) == NULL) {
+	    result = PE_fileNotFound;
+	    return NULL;
+	    }
+	hMod = PE_loadLibraryExt(f,0,&size,shared);
+	fclose(f);
+	return hMod;
+	}
 }
 
 /****************************************************************************
@@ -445,14 +445,14 @@
      */
 #if !defined(__WIN32_VXD__) && !defined(__NT_DRIVER__)
     if (getenv("MGL_ROOT")) {
-        strcpy(path,getenv("MGL_ROOT"));
-        PM_backslash(path);
-        }
+	strcpy(path,getenv("MGL_ROOT"));
+	PM_backslash(path);
+	}
     strcat(path,"drivers");
     PM_backslash(path);
     strcat(path,szDLLName);
     if ((hMod = PE_loadLibrary(path,shared)) != NULL)
-        return hMod;
+	return hMod;
 #endif
     strcpy(path,"drivers");
     PM_backslash(path);
@@ -488,39 +488,39 @@
 {
 #if (defined(__WINDOWS32__) || defined(__DRIVER__)) && defined(CHECKED)
     if (hModule->shared == -1)
-        return (void*)PM_getProcAddress(hModule->text,szProcName);
+	return (void*)PM_getProcAddress(hModule->text,szProcName);
     else
 #endif
-        {
-        uint                i;
-        EXPORT_DIRECTORY    *exports;
-        ulong               funcOffset;
-        ulong               *AddressTable;
-        ulong               *NameTable;
-        ushort              *OrdinalTable;
-        char                *name;
+	{
+	uint                i;
+	EXPORT_DIRECTORY    *exports;
+	ulong               funcOffset;
+	ulong               *AddressTable;
+	ulong               *NameTable;
+	ushort              *OrdinalTable;
+	char                *name;
 
-        /* Find the address of the export tables from the export section */
-        if (!hModule)
-            return NULL;
-        exports = (EXPORT_DIRECTORY*)(hModule->export + hModule->exportDir);
-        AddressTable = (ulong*)(hModule->export + exports->AddressTableRVA - hModule->exportBase);
-        NameTable = (ulong*)(hModule->export + exports->NameTableRVA - hModule->exportBase);
-        OrdinalTable = (ushort*)(hModule->export + exports->OrdinalTableRVA - hModule->exportBase);
+	/* Find the address of the export tables from the export section */
+	if (!hModule)
+	    return NULL;
+	exports = (EXPORT_DIRECTORY*)(hModule->export + hModule->exportDir);
+	AddressTable = (ulong*)(hModule->export + exports->AddressTableRVA - hModule->exportBase);
+	NameTable = (ulong*)(hModule->export + exports->NameTableRVA - hModule->exportBase);
+	OrdinalTable = (ushort*)(hModule->export + exports->OrdinalTableRVA - hModule->exportBase);
 
-        /* Search the export name table to find the function name */
-        for (i = 0; i < exports->NumberOfNamePointers; i++) {
-            name = (char*)(hModule->export + NameTable[i] - hModule->exportBase);
-            if (strcmp(name,szProcName) == 0)
-                break;
-            }
-        if (i == exports->NumberOfNamePointers)
-            return NULL;
-        funcOffset = AddressTable[OrdinalTable[i]];
-        if (!funcOffset)
-            return NULL;
-        return (void*)(hModule->text + funcOffset - hModule->textBase);
-        }
+	/* Search the export name table to find the function name */
+	for (i = 0; i < exports->NumberOfNamePointers; i++) {
+	    name = (char*)(hModule->export + NameTable[i] - hModule->exportBase);
+	    if (strcmp(name,szProcName) == 0)
+		break;
+	    }
+	if (i == exports->NumberOfNamePointers)
+	    return NULL;
+	funcOffset = AddressTable[OrdinalTable[i]];
+	if (!funcOffset)
+	    return NULL;
+	return (void*)(hModule->text + funcOffset - hModule->textBase);
+	}
 }
 
 /****************************************************************************
@@ -546,25 +546,25 @@
 
 #if (defined(__WINDOWS32__) || defined(__DRIVER__)) && defined(CHECKED)
     if (hModule->shared == -1) {
-        /* Run the C runtime library exit code on module unload */
-        if ((TerminateLibC = (TerminateLibC_t)PM_getProcAddress(hModule->text,"_TerminateLibC")) != NULL)
-            TerminateLibC();
-        PM_freeLibrary(hModule->text);
-        PM_free(hModule);
-        }
+	/* Run the C runtime library exit code on module unload */
+	if ((TerminateLibC = (TerminateLibC_t)PM_getProcAddress(hModule->text,"_TerminateLibC")) != NULL)
+	    TerminateLibC();
+	PM_freeLibrary(hModule->text);
+	PM_free(hModule);
+	}
     else
 #endif
-        {
-        if (hModule) {
-            /* Run the C runtime library exit code on module unload */
-            if ((TerminateLibC = (TerminateLibC_t)PE_getProcAddress(hModule,"_TerminateLibC")) != NULL)
-                TerminateLibC();
-            if (hModule->shared)
-                PM_freeShared(hModule);
-            else
-                PM_free(hModule);
-            }
-        }
+	{
+	if (hModule) {
+	    /* Run the C runtime library exit code on module unload */
+	    if ((TerminateLibC = (TerminateLibC_t)PE_getProcAddress(hModule,"_TerminateLibC")) != NULL)
+		TerminateLibC();
+	    if (hModule->shared)
+		PM_freeShared(hModule);
+	    else
+		PM_free(hModule);
+	    }
+	}
 }
 
 /****************************************************************************
@@ -584,4 +584,3 @@
 {
     return result;
 }
-

diff --git a/board/MAI/bios_emulator/scitech/src/common/vesavbe.c b/board/MAI/bios_emulator/scitech/src/common/vesavbe.c
index 2be57e2..a669e5c 100644
--- a/board/MAI/bios_emulator/scitech/src/common/vesavbe.c
+++ b/board/MAI/bios_emulator/scitech/src/common/vesavbe.c

@@ -73,10 +73,10 @@
 ****************************************************************************/
 {
     if (!state->VESABuf_ptr) {
-        /* Allocate a global buffer for communicating with the VESA VBE */
-        if ((state->VESABuf_ptr = PM_getVESABuf(&VESABuf_len, &state->VESABuf_rseg, &state->VESABuf_roff)) == NULL)
-            PM_fatalError("VESAVBE.C: Real mode memory allocation failed!");
-        }
+	/* Allocate a global buffer for communicating with the VESA VBE */
+	if ((state->VESABuf_ptr = PM_getVESABuf(&VESABuf_len, &state->VESABuf_rseg, &state->VESABuf_roff)) == NULL)
+	    PM_fatalError("VESAVBE.C: Real mode memory allocation failed!");
+	}
 }
 
 void * VBEAPI VBE_getRMBuf(uint *len,uint *rseg,uint *roff)
@@ -129,7 +129,7 @@
     RMSREGS sregs;
 
     if (!state->VESABuf_ptr)
-        PM_fatalError("You *MUST* call VBE_init() before you can call the VESAVBE.C module!");
+	PM_fatalError("You *MUST* call VBE_init() before you can call the VESAVBE.C module!");
     sregs.es = (ushort)state->VESABuf_rseg;
     regs->x.di = (ushort)state->VESABuf_roff;
     memcpy(state->VESABuf_ptr, buffer, size);
@@ -157,7 +157,7 @@
 
     v = PM_mapRealPointer((uint)((ulong)realPtr >> 16), (uint)((ulong)realPtr & 0xFFFF));
     while (*v != 0 && p < max)
-        *p++ = *v++;
+	*p++ = *v++;
     *p++ = 0;
     return p;
 }
@@ -178,7 +178,7 @@
 
     v = PM_mapRealPointer((uint)((ulong)realPtr >> 16),(uint)((ulong)realPtr & 0xFFFF));
     while (*v != 0xFFFF)
-        *p++ = *v++;
+	*p++ = *v++;
     *p = 0xFFFF;
 }
 #endif
@@ -200,26 +200,26 @@
 
     regs.x.ax = 0x4F00;     /* Get SuperVGA information */
     if (forceUniVBE) {
-        regs.x.bx = 0x1234;
-        regs.x.cx = 0x4321;
-        }
+	regs.x.bx = 0x1234;
+	regs.x.cx = 0x4321;
+	}
     else {
-        regs.x.bx = 0;
-        regs.x.cx = 0;
-        }
+	regs.x.bx = 0;
+	regs.x.cx = 0;
+	}
     strncpy(vgaInfo->VESASignature,"VBE2",4);
     VBE_callESDI(&regs, vgaInfo, sizeof(*vgaInfo));
     if (regs.x.ax != VBE_SUCCESS)
-        return 0;
+	return 0;
     if (strncmp(vgaInfo->VESASignature,"VESA",4) != 0)
-        return 0;
+	return 0;
 
     /* Check for bogus BIOSes that return a VBE version number that is
      * not correct, and fix it up. We also check the OemVendorNamePtr for a
      * valid value, and if it is invalid then we also reset to VBE 1.2.
      */
     if (vgaInfo->VESAVersion >= 0x200 && vgaInfo->OemVendorNamePtr == 0)
-        vgaInfo->VESAVersion = 0x102;
+	vgaInfo->VESAVersion = 0x102;
 #ifndef REALMODE
     /* Relocate all the indirect information (mode tables, OEM strings
      * etc) from the low 1Mb memory region into a static buffer in
@@ -227,23 +227,23 @@
      * from mapping the strings from real mode to protected mode.
      */
     {
-        char *p,*p2;
+	char *p,*p2;
      p2 = VBE_copyStrToLocal(localBuf,vgaInfo->OemStringPtr,MAX_LOCAL_BUF);
      vgaInfo->OemStringPtr = localBuf;
      if (vgaInfo->VESAVersion >= 0x200) {
-         p = VBE_copyStrToLocal(p2,vgaInfo->OemVendorNamePtr,MAX_LOCAL_BUF);
-         vgaInfo->OemVendorNamePtr = p2;
-         p2 = VBE_copyStrToLocal(p,vgaInfo->OemProductNamePtr,MAX_LOCAL_BUF);
-         vgaInfo->OemProductNamePtr = p;
-         p = VBE_copyStrToLocal(p2,vgaInfo->OemProductRevPtr,MAX_LOCAL_BUF);
-         vgaInfo->OemProductRevPtr = p2;
-         VBE_copyShortToLocal((ushort*)p,vgaInfo->VideoModePtr);
-         vgaInfo->VideoModePtr = (ushort*)p;
-         }
+	 p = VBE_copyStrToLocal(p2,vgaInfo->OemVendorNamePtr,MAX_LOCAL_BUF);
+	 vgaInfo->OemVendorNamePtr = p2;
+	 p2 = VBE_copyStrToLocal(p,vgaInfo->OemProductNamePtr,MAX_LOCAL_BUF);
+	 vgaInfo->OemProductNamePtr = p;
+	 p = VBE_copyStrToLocal(p2,vgaInfo->OemProductRevPtr,MAX_LOCAL_BUF);
+	 vgaInfo->OemProductRevPtr = p2;
+	 VBE_copyShortToLocal((ushort*)p,vgaInfo->VideoModePtr);
+	 vgaInfo->VideoModePtr = (ushort*)p;
+	 }
      else {
-         VBE_copyShortToLocal((ushort*)p2,vgaInfo->VideoModePtr);
-         vgaInfo->VideoModePtr = (ushort*)p2;
-         }
+	 VBE_copyShortToLocal((ushort*)p2,vgaInfo->VideoModePtr);
+	 vgaInfo->VideoModePtr = (ushort*)p2;
+	 }
     }
 #endif
     state->VBEMemory = vgaInfo->TotalMemory * 64;
@@ -253,17 +253,17 @@
      */
     haveRiva128 = false;
     if (vgaInfo->VESAVersion >= 0x300 &&
-           (strstr(vgaInfo->OemStringPtr,"NVidia") != NULL ||
-            strstr(vgaInfo->OemStringPtr,"Riva") != NULL)) {
-        haveRiva128 = true;
-        }
+	   (strstr(vgaInfo->OemStringPtr,"NVidia") != NULL ||
+	    strstr(vgaInfo->OemStringPtr,"Riva") != NULL)) {
+	haveRiva128 = true;
+	}
 
     /* Check for Matrox G400 cards which claim to be VBE 3.0
      * compliant yet they don't implement the refresh rate control
      * functions.
      */
     if (vgaInfo->VESAVersion >= 0x300 && (strcmp(vgaInfo->OemProductNamePtr,"Matrox G400") == 0))
-        vgaInfo->VESAVersion = 0x200;
+	vgaInfo->VESAVersion = 0x200;
     return (state->VBEVersion = vgaInfo->VESAVersion);
 }
 
@@ -305,70 +305,70 @@
     regs.x.cx = (ushort)mode;
     VBE_callESDI(&regs, modeInfo, sizeof(*modeInfo));
     if (regs.x.ax != VBE_SUCCESS)
-        return false;
+	return false;
     if ((modeInfo->ModeAttributes & vbeMdAvailable) == 0)
-        return false;
+	return false;
 
     /* Map out triple buffer and stereo flags for NVidia Riva128
      * chips.
      */
     if (haveRiva128) {
-        modeInfo->ModeAttributes &= ~vbeMdTripleBuf;
-        modeInfo->ModeAttributes &= ~vbeMdStereo;
-        }
+	modeInfo->ModeAttributes &= ~vbeMdTripleBuf;
+	modeInfo->ModeAttributes &= ~vbeMdStereo;
+	}
 
     /* Support old style RGB definitions for VBE 1.1 BIOSes */
     bits = modeInfo->BitsPerPixel;
     if (modeInfo->MemoryModel == vbeMemPK && bits > 8) {
-        modeInfo->MemoryModel = vbeMemRGB;
-        switch (bits) {
-            case 15:
-                modeInfo->RedMaskSize = 5;
-                modeInfo->RedFieldPosition = 10;
-                modeInfo->GreenMaskSize = 5;
-                modeInfo->GreenFieldPosition = 5;
-                modeInfo->BlueMaskSize = 5;
-                modeInfo->BlueFieldPosition = 0;
-                modeInfo->RsvdMaskSize = 1;
-                modeInfo->RsvdFieldPosition = 15;
-                break;
-            case 16:
-                modeInfo->RedMaskSize = 5;
-                modeInfo->RedFieldPosition = 11;
-                modeInfo->GreenMaskSize = 5;
-                modeInfo->GreenFieldPosition = 5;
-                modeInfo->BlueMaskSize = 5;
-                modeInfo->BlueFieldPosition = 0;
-                modeInfo->RsvdMaskSize = 0;
-                modeInfo->RsvdFieldPosition = 0;
-                break;
-            case 24:
-                modeInfo->RedMaskSize = 8;
-                modeInfo->RedFieldPosition = 16;
-                modeInfo->GreenMaskSize = 8;
-                modeInfo->GreenFieldPosition = 8;
-                modeInfo->BlueMaskSize = 8;
-                modeInfo->BlueFieldPosition = 0;
-                modeInfo->RsvdMaskSize = 0;
-                modeInfo->RsvdFieldPosition = 0;
-                break;
-            }
-        }
+	modeInfo->MemoryModel = vbeMemRGB;
+	switch (bits) {
+	    case 15:
+		modeInfo->RedMaskSize = 5;
+		modeInfo->RedFieldPosition = 10;
+		modeInfo->GreenMaskSize = 5;
+		modeInfo->GreenFieldPosition = 5;
+		modeInfo->BlueMaskSize = 5;
+		modeInfo->BlueFieldPosition = 0;
+		modeInfo->RsvdMaskSize = 1;
+		modeInfo->RsvdFieldPosition = 15;
+		break;
+	    case 16:
+		modeInfo->RedMaskSize = 5;
+		modeInfo->RedFieldPosition = 11;
+		modeInfo->GreenMaskSize = 5;
+		modeInfo->GreenFieldPosition = 5;
+		modeInfo->BlueMaskSize = 5;
+		modeInfo->BlueFieldPosition = 0;
+		modeInfo->RsvdMaskSize = 0;
+		modeInfo->RsvdFieldPosition = 0;
+		break;
+	    case 24:
+		modeInfo->RedMaskSize = 8;
+		modeInfo->RedFieldPosition = 16;
+		modeInfo->GreenMaskSize = 8;
+		modeInfo->GreenFieldPosition = 8;
+		modeInfo->BlueMaskSize = 8;
+		modeInfo->BlueFieldPosition = 0;
+		modeInfo->RsvdMaskSize = 0;
+		modeInfo->RsvdFieldPosition = 0;
+		break;
+	    }
+	}
 
     /* Convert the 32k direct color modes of VBE 1.2+ BIOSes to
      * be recognised as 15 bits per pixel modes.
      */
     if (bits == 16 && modeInfo->RsvdMaskSize == 1)
-        modeInfo->BitsPerPixel = 15;
+	modeInfo->BitsPerPixel = 15;
 
     /* Fix up bogus BIOS'es that report incorrect reserved pixel masks
      * for 32K color modes. Quite a number of BIOS'es have this problem,
      * and this affects our OS/2 drivers in VBE fallback mode.
      */
     if (bits == 15 && (modeInfo->RsvdMaskSize != 1 || modeInfo->RsvdFieldPosition != 15)) {
-        modeInfo->RsvdMaskSize = 1;
-        modeInfo->RsvdFieldPosition = 15;
-        }
+	modeInfo->RsvdMaskSize = 1;
+	modeInfo->RsvdFieldPosition = 15;
+	}
     return true;
 }
 
@@ -391,20 +391,20 @@
 
     size = (long)mi->BytesPerScanLine * (long)mi->YResolution;
     if (mi->BitsPerPixel == 4) {
-        /* We have a 16 color video mode, so round up the page size to
-         * 8k, 16k, 32k or 64k boundaries depending on how large it is.
-         */
+	/* We have a 16 color video mode, so round up the page size to
+	 * 8k, 16k, 32k or 64k boundaries depending on how large it is.
+	 */
 
-        size = (size + 0x1FFFL) & 0xFFFFE000L;
-        if (size != 0x2000) {
-            size = (size + 0x3FFFL) & 0xFFFFC000L;
-            if (size != 0x4000) {
-                size = (size + 0x7FFFL) & 0xFFFF8000L;
-                if (size != 0x8000)
-                    size = (size + 0xFFFFL) & 0xFFFF0000L;
-                }
-            }
-        }
+	size = (size + 0x1FFFL) & 0xFFFFE000L;
+	if (size != 0x2000) {
+	    size = (size + 0x3FFFL) & 0xFFFFC000L;
+	    if (size != 0x4000) {
+		size = (size + 0x7FFFL) & 0xFFFF8000L;
+		if (size != 0x8000)
+		    size = (size + 0xFFFFL) & 0xFFFF0000L;
+		}
+	    }
+	}
     else size = (size + 0xFFFFL) & 0xFFFF0000L;
     return size;
 }
@@ -425,26 +425,26 @@
     RMREGS  regs;
 
     if (state->VBEVersion < 0x200 && mode < 0x100) {
-        /* Some VBE implementations barf terribly if you try to set non-VBE
-         * video modes with the VBE set mode call. VBE 2.0 implementations
-         * must be able to handle this.
-         */
-        regs.h.al = (ushort)mode;
-        regs.h.ah = 0;
-        PM_int86(0x10,&regs,&regs);
-        }
+	/* Some VBE implementations barf terribly if you try to set non-VBE
+	 * video modes with the VBE set mode call. VBE 2.0 implementations
+	 * must be able to handle this.
+	 */
+	regs.h.al = (ushort)mode;
+	regs.h.ah = 0;
+	PM_int86(0x10,&regs,&regs);
+	}
     else {
-        if (state->VBEVersion < 0x300 && (mode & vbeRefreshCtrl))
-            return false;
-        regs.x.ax = 0x4F02;
-        regs.x.bx = (ushort)mode;
-        if ((mode & vbeRefreshCtrl) && crtc)
-            VBE_callESDI(&regs, crtc, sizeof(*crtc));
-        else
-            PM_int86(0x10,&regs,&regs);
-        if (regs.x.ax != VBE_SUCCESS)
-            return false;
-        }
+	if (state->VBEVersion < 0x300 && (mode & vbeRefreshCtrl))
+	    return false;
+	regs.x.ax = 0x4F02;
+	regs.x.bx = (ushort)mode;
+	if ((mode & vbeRefreshCtrl) && crtc)
+	    VBE_callESDI(&regs, crtc, sizeof(*crtc));
+	else
+	    PM_int86(0x10,&regs,&regs);
+	if (regs.x.ax != VBE_SUCCESS)
+	    return false;
+	}
     return true;
 }
 
@@ -475,7 +475,7 @@
     regs.x.ax = 0x4F03;
     PM_int86(0x10,&regs,&regs);
     if (regs.x.ax != VBE_SUCCESS)
-        return -1;
+	return -1;
     return regs.x.bx;
 }
 
@@ -515,7 +515,7 @@
     regs.h.bl = window;
     PM_int86(0x10,&regs,&regs);
     if (regs.x.ax != VBE_SUCCESS)
-        return -1;
+	return -1;
     return regs.x.dx;
 }
 
@@ -637,7 +637,7 @@
 
     regs.x.ax = 0x4F07;
     if (waitVRT)
-        regs.x.bx = 0x80;
+	regs.x.bx = 0x80;
     else regs.x.bx = 0x00;
     regs.x.cx = x;
     regs.x.dx = y;
@@ -685,12 +685,12 @@
     RMREGS  regs;
 
     if (state->VBEVersion >= 0x300) {
-        regs.x.ax = 0x4F07;
-        regs.x.bx = waitVRT ? 0x82 : 0x02;
-        regs.e.ecx = startAddr;
-        PM_int86(0x10,&regs,&regs);
-        return regs.x.ax == VBE_SUCCESS;
-        }
+	regs.x.ax = 0x4F07;
+	regs.x.bx = waitVRT ? 0x82 : 0x02;
+	regs.e.ecx = startAddr;
+	PM_int86(0x10,&regs,&regs);
+	return regs.x.ax == VBE_SUCCESS;
+	}
     return false;
 }
 
@@ -712,12 +712,12 @@
     RMREGS  regs;
 
     if (state->VBEVersion >= 0x300) {
-        regs.x.ax = 0x4F07;
-        regs.x.bx = 0x0004;
-        PM_int86(0x10,&regs,&regs);
-        if (regs.x.ax == VBE_SUCCESS)
-            return (regs.x.cx != 0);
-        }
+	regs.x.ax = 0x4F07;
+	regs.x.bx = 0x0004;
+	PM_int86(0x10,&regs,&regs);
+	if (regs.x.ax == VBE_SUCCESS)
+	    return (regs.x.cx != 0);
+	}
     return -1;
 }
 
@@ -738,11 +738,11 @@
     RMREGS  regs;
 
     if (state->VBEVersion >= 0x300) {
-        regs.x.ax = 0x4F07;
-        regs.x.bx = 0x0005;
-        PM_int86(0x10,&regs,&regs);
-        return regs.x.ax == VBE_SUCCESS;
-        }
+	regs.x.ax = 0x4F07;
+	regs.x.bx = 0x0005;
+	PM_int86(0x10,&regs,&regs);
+	return regs.x.ax == VBE_SUCCESS;
+	}
     return false;
 }
 
@@ -762,11 +762,11 @@
     RMREGS  regs;
 
     if (state->VBEVersion >= 0x300) {
-        regs.x.ax = 0x4F07;
-        regs.x.bx = 0x0006;
-        PM_int86(0x10,&regs,&regs);
-        return regs.x.ax == VBE_SUCCESS;
-        }
+	regs.x.ax = 0x4F07;
+	regs.x.bx = 0x0006;
+	PM_int86(0x10,&regs,&regs);
+	return regs.x.ax == VBE_SUCCESS;
+	}
     return false;
 }
 
@@ -793,13 +793,13 @@
     RMREGS  regs;
 
     if (state->VBEVersion >= 0x300) {
-        regs.x.ax = 0x4F07;
-        regs.x.bx = waitVRT ? 0x83 : 0x03;
-        regs.e.ecx = leftAddr;
-        regs.e.edx = rightAddr;
-        PM_int86(0x10,&regs,&regs);
-        return regs.x.ax == VBE_SUCCESS;
-        }
+	regs.x.ax = 0x4F07;
+	regs.x.bx = waitVRT ? 0x83 : 0x03;
+	regs.e.ecx = leftAddr;
+	regs.e.edx = rightAddr;
+	PM_int86(0x10,&regs,&regs);
+	return regs.x.ax == VBE_SUCCESS;
+	}
     return false;
 }
 
@@ -832,14 +832,14 @@
     RMREGS  regs;
 
     if (state->VBEVersion >= 0x300) {
-        regs.x.ax = 0x4F0B;
-        regs.h.bl = 0x00;
-        regs.e.ecx = pixelClock;
-        regs.x.dx = mode;
-        PM_int86(0x10,&regs,&regs);
-        if (regs.x.ax == VBE_SUCCESS)
-            return regs.e.ecx;
-        }
+	regs.x.ax = 0x4F0B;
+	regs.h.bl = 0x00;
+	regs.e.ecx = pixelClock;
+	regs.x.dx = mode;
+	PM_int86(0x10,&regs,&regs);
+	if (regs.x.ax == VBE_SUCCESS)
+	    return regs.e.ecx;
+	}
     return -1;
 }
 
@@ -875,7 +875,7 @@
     regs.h.bl = 0x01;
     PM_int86(0x10,&regs,&regs);
     if (regs.x.ax != VBE_SUCCESS)
-        return -1;
+	return -1;
     return regs.h.bh;
 }
 
@@ -927,11 +927,11 @@
      */
     ulong seg = (ushort)modeInfo->WinASegment;
     if (seg != 0) {
-        if (seg == 0xA000)
-            return (void*)PM_getA0000Pointer();
-        else
-            return (void*)PM_mapPhysicalAddr(seg << 4,0xFFFF,true);
-        }
+	if (seg == 0xA000)
+	    return (void*)PM_getA0000Pointer();
+	else
+	    return (void*)PM_mapPhysicalAddr(seg << 4,0xFFFF,true);
+	}
     return NULL;
 }
 
@@ -956,14 +956,14 @@
 
     /* Search for an already mapped pointer */
     for (i = 0; i < numPtrs; i++) {
-        if (physPtr[i] == modeInfo->PhysBasePtr)
-            return linPtr[i];
-        }
+	if (physPtr[i] == modeInfo->PhysBasePtr)
+	    return linPtr[i];
+	}
     if (numPtrs < MAX_LIN_PTRS) {
-        physPtr[numPtrs] = modeInfo->PhysBasePtr;
-        linPtr[numPtrs] = PM_mapPhysicalAddr(modeInfo->PhysBasePtr,(state->VBEMemory * 1024L)-1,true);
-        return linPtr[numPtrs++];
-        }
+	physPtr[numPtrs] = modeInfo->PhysBasePtr;
+	linPtr[numPtrs] = PM_mapPhysicalAddr(modeInfo->PhysBasePtr,(state->VBEMemory * 1024L)-1,true);
+	return linPtr[numPtrs++];
+	}
     return NULL;
 }
 
@@ -989,56 +989,56 @@
     int         pmLen;
 
     if (!state->pmInfo && state->VBEVersion >= 0x200) {
-        regs.x.ax = 0x4F0A;
-        regs.x.bx = 0;
-        PM_int86x(0x10,&regs,&regs,&sregs);
-        if (regs.x.ax != VBE_SUCCESS)
-            return;
-        if (VBE_shared)
-            state->pmInfo = PM_mallocShared(regs.x.cx);
-        else
-            state->pmInfo = PM_malloc(regs.x.cx);
-        if (state->pmInfo == NULL)
-            return;
-        state->pmInfo32 = state->pmInfo;
-        pmLen = regs.x.cx;
+	regs.x.ax = 0x4F0A;
+	regs.x.bx = 0;
+	PM_int86x(0x10,&regs,&regs,&sregs);
+	if (regs.x.ax != VBE_SUCCESS)
+	    return;
+	if (VBE_shared)
+	    state->pmInfo = PM_mallocShared(regs.x.cx);
+	else
+	    state->pmInfo = PM_malloc(regs.x.cx);
+	if (state->pmInfo == NULL)
+	    return;
+	state->pmInfo32 = state->pmInfo;
+	pmLen = regs.x.cx;
 
-        /* Relocate the block into our local data segment */
-        code = PM_mapRealPointer(sregs.es,regs.x.di);
-        memcpy(state->pmInfo,code,pmLen);
+	/* Relocate the block into our local data segment */
+	code = PM_mapRealPointer(sregs.es,regs.x.di);
+	memcpy(state->pmInfo,code,pmLen);
 
-        /* Now do a sanity check on the information we recieve to ensure
-         * that is is correct. Some BIOS return totally bogus information
-         * in here (Matrox is one)! Under DOS this works OK, but under OS/2
-         * we are screwed.
-         */
-        if (state->pmInfo->setWindow >= pmLen ||
-            state->pmInfo->setDisplayStart >= pmLen ||
-            state->pmInfo->setPalette >= pmLen ||
-            state->pmInfo->IOPrivInfo >= pmLen) {
-            if (VBE_shared)
-                PM_freeShared(state->pmInfo);
-            else
-                PM_free(state->pmInfo);
-            state->pmInfo32 = state->pmInfo = NULL;
-            return;
-            }
+	/* Now do a sanity check on the information we recieve to ensure
+	 * that is is correct. Some BIOS return totally bogus information
+	 * in here (Matrox is one)! Under DOS this works OK, but under OS/2
+	 * we are screwed.
+	 */
+	if (state->pmInfo->setWindow >= pmLen ||
+	    state->pmInfo->setDisplayStart >= pmLen ||
+	    state->pmInfo->setPalette >= pmLen ||
+	    state->pmInfo->IOPrivInfo >= pmLen) {
+	    if (VBE_shared)
+		PM_freeShared(state->pmInfo);
+	    else
+		PM_free(state->pmInfo);
+	    state->pmInfo32 = state->pmInfo = NULL;
+	    return;
+	    }
 
-        /* Read the IO priveledge info and determine if we need to
-         * pass a selector to MMIO registers to the bank switch code.
-         * Since we no longer support selector allocation, we no longer
-         * support this mechanism so we disable the protected mode
-         * interface in this case.
-         */
-        if (state->pmInfo->IOPrivInfo && !state->MMIOSel) {
-            ushort *p = (ushort*)((uchar*)state->pmInfo + state->pmInfo->IOPrivInfo);
-            while (*p != 0xFFFF)
-                p++;
-            p++;
-            if (*p != 0xFFFF)
-                VBE_freePMCode();
-            }
-        }
+	/* Read the IO priveledge info and determine if we need to
+	 * pass a selector to MMIO registers to the bank switch code.
+	 * Since we no longer support selector allocation, we no longer
+	 * support this mechanism so we disable the protected mode
+	 * interface in this case.
+	 */
+	if (state->pmInfo->IOPrivInfo && !state->MMIOSel) {
+	    ushort *p = (ushort*)((uchar*)state->pmInfo + state->pmInfo->IOPrivInfo);
+	    while (*p != 0xFFFF)
+		p++;
+	    p++;
+	    if (*p != 0xFFFF)
+		VBE_freePMCode();
+	    }
+	}
 }
 
 void * VBEAPI VBE_getSetBank(void)
@@ -1050,10 +1050,10 @@
 ****************************************************************************/
 {
     if (state->VBEVersion >= 0x200) {
-        InitPMCode();
-        if (state->pmInfo)
-            return (uchar*)state->pmInfo + state->pmInfo->setWindow;
-        }
+	InitPMCode();
+	if (state->pmInfo)
+	    return (uchar*)state->pmInfo + state->pmInfo->setWindow;
+	}
     return NULL;
 }
 
@@ -1066,10 +1066,10 @@
 ****************************************************************************/
 {
     if (state->VBEVersion >= 0x200) {
-        InitPMCode();
-        if (state->pmInfo)
-            return (uchar*)state->pmInfo + state->pmInfo->setDisplayStart;
-        }
+	InitPMCode();
+	if (state->pmInfo)
+	    return (uchar*)state->pmInfo + state->pmInfo->setDisplayStart;
+	}
     return NULL;
 }
 
@@ -1082,10 +1082,10 @@
 ****************************************************************************/
 {
     if (state->VBEVersion >= 0x200) {
-        InitPMCode();
-        if (state->pmInfo)
-            return (uchar*)state->pmInfo + state->pmInfo->setPalette;
-        }
+	InitPMCode();
+	if (state->pmInfo)
+	    return (uchar*)state->pmInfo + state->pmInfo->setPalette;
+	}
     return NULL;
 }
 
@@ -1104,13 +1104,13 @@
 ****************************************************************************/
 {
     if (state->pmInfo) {
-        if (VBE_shared)
-            PM_freeShared(state->pmInfo);
-        else
-            PM_free(state->pmInfo);
-        state->pmInfo = NULL;
-        state->pmInfo32 = NULL;
-        }
+	if (VBE_shared)
+	    PM_freeShared(state->pmInfo);
+	else
+	    PM_free(state->pmInfo);
+	state->pmInfo = NULL;
+	state->pmInfo32 = NULL;
+	}
 }
 
 void VBEAPI VBE_sharePMCode(void)
@@ -1183,31 +1183,31 @@
 
     InitPMCode();
     if (state->VBEVersion >= 0x200 && state->pmInfo32 && !state->MMIOSel) {
-        code = (uchar*)state->pmInfo32 + state->pmInfo32->setWindow;
-        if (state->pmInfo32->extensionSig == VBE20_EXT_SIG)
-            len = state->pmInfo32->setWindowLen-1;
-        else {
-            /* We are running on a system without the UniVBE 5.2 extension.
-             * We do as best we can by scanning through the code for the
-             * ret function to determine the length. This is not foolproof,
-             * but is the best we can do.
-             */
-            p = code;
-            while (*p != 0xC3)
-                p++;
-            len = p - code;
-            }
-        if ((len + sizeof(VBE20A_bankFunc32_Start) + sizeof(VBE20_bankFunc32_End)) > sizeof(bankFunc32))
-            PM_fatalError("32-bit bank switch function too long!");
-        copy(p,bankFunc32,VBE20A_bankFunc32_Start);
-        memcpy(p,code,len);
-        p += len;
-        copy(p,p,VBE20_bankFunc32_End);
-        *codeLen = p - bankFunc32;
-        bankFunc32[VBE20_adjustOffset] = (uchar)bankAdjust;
-        *bankFunc = bankFunc32;
-        return true;
-        }
+	code = (uchar*)state->pmInfo32 + state->pmInfo32->setWindow;
+	if (state->pmInfo32->extensionSig == VBE20_EXT_SIG)
+	    len = state->pmInfo32->setWindowLen-1;
+	else {
+	    /* We are running on a system without the UniVBE 5.2 extension.
+	     * We do as best we can by scanning through the code for the
+	     * ret function to determine the length. This is not foolproof,
+	     * but is the best we can do.
+	     */
+	    p = code;
+	    while (*p != 0xC3)
+		p++;
+	    len = p - code;
+	    }
+	if ((len + sizeof(VBE20A_bankFunc32_Start) + sizeof(VBE20_bankFunc32_End)) > sizeof(bankFunc32))
+	    PM_fatalError("32-bit bank switch function too long!");
+	copy(p,bankFunc32,VBE20A_bankFunc32_Start);
+	memcpy(p,code,len);
+	p += len;
+	copy(p,p,VBE20_bankFunc32_End);
+	*codeLen = p - bankFunc32;
+	bankFunc32[VBE20_adjustOffset] = (uchar)bankAdjust;
+	*bankFunc = bankFunc32;
+	return true;
+	}
     return false;
 }
 

diff --git a/board/MAI/bios_emulator/scitech/src/pm/beos/cpuinfo.c b/board/MAI/bios_emulator/scitech/src/pm/beos/cpuinfo.c
index c8f825e..cb3afe2 100644
--- a/board/MAI/bios_emulator/scitech/src/pm/beos/cpuinfo.c
+++ b/board/MAI/bios_emulator/scitech/src/pm/beos/cpuinfo.c

@@ -64,8 +64,8 @@
 static void GetCounterFrequency(
     CPU_largeInteger *freq)
 {
-    // TODO: Return the frequency of the counter in here. You should try to
-    //       normalise this value to be around 100,000 ticks per second.
+    /* TODO: Return the frequency of the counter in here. You should try to */
+    /*       normalise this value to be around 100,000 ticks per second. */
     freq->low = 1000000;
     freq->high = 0;
 }

diff --git a/board/MAI/bios_emulator/scitech/src/pm/beos/event.c b/board/MAI/bios_emulator/scitech/src/pm/beos/event.c
index 4c32ce7..93c6c0a 100644
--- a/board/MAI/bios_emulator/scitech/src/pm/beos/event.c
+++ b/board/MAI/bios_emulator/scitech/src/pm/beos/event.c

@@ -59,7 +59,7 @@
 ****************************************************************************/
 ulong _EVT_getTicks(void)
 {
-    // TODO: Implement this for your OS!
+    /* TODO: Implement this for your OS! */
 }
 
 /****************************************************************************
@@ -68,36 +68,36 @@
 ****************************************************************************/
 static void _EVT_pumpMessages(void)
 {
-    // TODO: The purpose of this function is to read all keyboard and mouse
-    //       events from the OS specific event queue, translate them and post
-    //       them into the SciTech event queue.
-    //
-    // NOTE: There are a couple of important things that this function must
-    //       take care of:
-    //
-    //  1. Support for KEYDOWN, KEYREPEAT and KEYUP is required.
-    //
-    //  2. Support for reading hardware scan code as well as ASCII
-    //     translated values is required. Games use the scan codes rather
-    //     than ASCII values. Scan codes go into the high order byte of the
-    //     keyboard message field.
-    //
-    //  3. Support for at least reading mouse motion data (mickeys) from the
-    //     mouse is required. Using the mickey values, we can then translate
-    //     to mouse cursor coordinates scaled to the range of the current
-    //     graphics display mode. Mouse values are scaled based on the
-    //     global 'rangeX' and 'rangeY'.
-    //
-    //  4. Support for a timestamp for the events is required, which is
-    //     defined as the number of milliseconds since some event (usually
-    //     system startup). This is the timestamp when the event occurred
-    //     (ie: at interrupt time) not when it was stuff into the SciTech
-    //     event queue.
-    //
-    //  5. Support for mouse double click events. If the OS has a native
-    //     mechanism to determine this, it should be used. Otherwise the
-    //     time stamp information will be used by the generic event code
-    //     to generate double click events.
+    /* TODO: The purpose of this function is to read all keyboard and mouse */
+    /*       events from the OS specific event queue, translate them and post */
+    /*       them into the SciTech event queue. */
+    /* */
+    /* NOTE: There are a couple of important things that this function must */
+    /*       take care of: */
+    /* */
+    /*  1. Support for KEYDOWN, KEYREPEAT and KEYUP is required. */
+    /* */
+    /*  2. Support for reading hardware scan code as well as ASCII */
+    /*     translated values is required. Games use the scan codes rather */
+    /*     than ASCII values. Scan codes go into the high order byte of the */
+    /*     keyboard message field. */
+    /* */
+    /*  3. Support for at least reading mouse motion data (mickeys) from the */
+    /*     mouse is required. Using the mickey values, we can then translate */
+    /*     to mouse cursor coordinates scaled to the range of the current */
+    /*     graphics display mode. Mouse values are scaled based on the */
+    /*     global 'rangeX' and 'rangeY'. */
+    /* */
+    /*  4. Support for a timestamp for the events is required, which is */
+    /*     defined as the number of milliseconds since some event (usually */
+    /*     system startup). This is the timestamp when the event occurred */
+    /*     (ie: at interrupt time) not when it was stuff into the SciTech */
+    /*     event queue. */
+    /* */
+    /*  5. Support for mouse double click events. If the OS has a native */
+    /*     mechanism to determine this, it should be used. Otherwise the */
+    /*     time stamp information will be used by the generic event code */
+    /*     to generate double click events. */
 }
 
 /****************************************************************************
@@ -141,7 +141,7 @@
     initEventQueue();
     memset(keyUpMsg,0,sizeof(keyUpMsg));
 
-    // TODO: Do any OS specific initialisation here
+    /* TODO: Do any OS specific initialisation here */
 
     /* Catch program termination signals so we can clean up properly */
     signal(SIGABRT, _EVT_abort);
@@ -171,7 +171,7 @@
 ****************************************************************************/
 void EVT_resume(void)
 {
-    // Do nothing for non DOS systems
+    /* Do nothing for non DOS systems */
 }
 
 /****************************************************************************
@@ -181,7 +181,7 @@
 ****************************************************************************/
 void EVT_suspend(void)
 {
-    // Do nothing for non DOS systems
+    /* Do nothing for non DOS systems */
 }
 
 /****************************************************************************
@@ -195,5 +195,5 @@
     signal(SIGFPE, SIG_DFL);
     signal(SIGINT, SIG_DFL);
 
-    // TODO: Do any OS specific cleanup in here
+    /* TODO: Do any OS specific cleanup in here */
 }

diff --git a/board/MAI/bios_emulator/scitech/src/pm/beos/oshdr.h b/board/MAI/bios_emulator/scitech/src/pm/beos/oshdr.h
index ab423d4..043d73e 100644
--- a/board/MAI/bios_emulator/scitech/src/pm/beos/oshdr.h
+++ b/board/MAI/bios_emulator/scitech/src/pm/beos/oshdr.h

@@ -28,5 +28,5 @@
 *
 ****************************************************************************/
 
-// This is where you include OS specific headers for the event handling
-// library.
+/* This is where you include OS specific headers for the event handling */
+/* library. */

diff --git a/board/MAI/bios_emulator/scitech/src/pm/beos/pm.c b/board/MAI/bios_emulator/scitech/src/pm/beos/pm.c
index c57d82a..2dcb1b8 100644
--- a/board/MAI/bios_emulator/scitech/src/pm/beos/pm.c
+++ b/board/MAI/bios_emulator/scitech/src/pm/beos/pm.c

@@ -38,7 +38,7 @@
 #include <stdlib.h>
 #include <string.h>
 
-// TODO: Include any BeOS specific headers here!
+/* TODO: Include any BeOS specific headers here! */
 
 /*--------------------------- Global variables ----------------------------*/
 
@@ -48,12 +48,12 @@
 
 void PMAPI PM_init(void)
 {
-    // TODO: Do any initialisation in here. This includes getting IOPL
-    //       access for the process calling PM_init. This will get called
-    //       more than once.
+    /* TODO: Do any initialisation in here. This includes getting IOPL */
+    /*       access for the process calling PM_init. This will get called */
+    /*       more than once. */
 
-    // TODO: If you support the supplied MTRR register stuff (you need to
-    //       be at ring 0 for this!), you should initialise it in here.
+    /* TODO: If you support the supplied MTRR register stuff (you need to */
+    /*       be at ring 0 for this!), you should initialise it in here. */
 
 /* MTRR_init(); */
 }
@@ -68,9 +68,9 @@
 {
     uint pos = strlen(s);
     if (s[pos-1] != '/') {
-        s[pos] = '/';
-        s[pos+1] = '\0';
-        }
+	s[pos] = '/';
+	s[pos+1] = '\0';
+	}
 }
 
 void PMAPI PM_setFatalErrorCleanup(
@@ -81,112 +81,112 @@
 
 void PMAPI PM_fatalError(const char *msg)
 {
-    // TODO: If you are running in a GUI environment without a console,
-    //       this needs to be changed to bring up a fatal error message
-    //       box and terminate the program.
+    /* TODO: If you are running in a GUI environment without a console, */
+    /*       this needs to be changed to bring up a fatal error message */
+    /*       box and terminate the program. */
     if (fatalErrorCleanup)
-        fatalErrorCleanup();
+	fatalErrorCleanup();
     fprintf(stderr,"%s\n", msg);
     exit(1);
 }
 
 void * PMAPI PM_getVESABuf(uint *len,uint *rseg,uint *roff)
 {
-    // No BIOS access for the BeOS
+    /* No BIOS access for the BeOS */
     return NULL;
 }
 
 int PMAPI PM_kbhit(void)
 {
-    // TODO: This function checks if a key is available to be read. This
-    //       should be implemented, but is mostly used by the test programs
-    //       these days.
+    /* TODO: This function checks if a key is available to be read. This */
+    /*       should be implemented, but is mostly used by the test programs */
+    /*       these days. */
     return true;
 }
 
 int PMAPI PM_getch(void)
 {
-    // TODO: This returns the ASCII code of the key pressed. This
-    //       should be implemented, but is mostly used by the test programs
-    //       these days.
+    /* TODO: This returns the ASCII code of the key pressed. This */
+    /*       should be implemented, but is mostly used by the test programs */
+    /*       these days. */
     return 0xD;
 }
 
 int PMAPI PM_openConsole(void)
 {
-    // TODO: Opens up a fullscreen console for graphics output. If your
-    //       console does not have graphics/text modes, this can be left
-    //       empty. The main purpose of this is to disable console switching
-    //       when in graphics modes if you can switch away from fullscreen
-    //       consoles (if you want to allow switching, this can be done
-    //       elsewhere with a full save/restore state of the graphics mode).
+    /* TODO: Opens up a fullscreen console for graphics output. If your */
+    /*       console does not have graphics/text modes, this can be left */
+    /*       empty. The main purpose of this is to disable console switching */
+    /*       when in graphics modes if you can switch away from fullscreen */
+    /*       consoles (if you want to allow switching, this can be done */
+    /*       elsewhere with a full save/restore state of the graphics mode). */
     return 0;
 }
 
 int PMAPI PM_getConsoleStateSize(void)
 {
-    // TODO: Returns the size of the console state buffer used to save the
-    //       state of the console before going into graphics mode. This is
-    //       used to restore the console back to normal when we are done.
+    /* TODO: Returns the size of the console state buffer used to save the */
+    /*       state of the console before going into graphics mode. This is */
+    /*       used to restore the console back to normal when we are done. */
     return 1;
 }
 
 void PMAPI PM_saveConsoleState(void *stateBuf,int console_id)
 {
-    // TODO: Saves the state of the console into the state buffer. This is
-    //       used to restore the console back to normal when we are done.
-    //       We will always restore 80x25 text mode after being in graphics
-    //       mode, so if restoring text mode is all you need to do this can
-    //       be left empty.
+    /* TODO: Saves the state of the console into the state buffer. This is */
+    /*       used to restore the console back to normal when we are done. */
+    /*       We will always restore 80x25 text mode after being in graphics */
+    /*       mode, so if restoring text mode is all you need to do this can */
+    /*       be left empty. */
 }
 
 void PMAPI PM_restoreConsoleState(const void *stateBuf,int console_id)
 {
-    // TODO: Restore the state of the console from the state buffer. This is
-    //       used to restore the console back to normal when we are done.
-    //       We will always restore 80x25 text mode after being in graphics
-    //       mode, so if restoring text mode is all you need to do this can
-    //       be left empty.
+    /* TODO: Restore the state of the console from the state buffer. This is */
+    /*       used to restore the console back to normal when we are done. */
+    /*       We will always restore 80x25 text mode after being in graphics */
+    /*       mode, so if restoring text mode is all you need to do this can */
+    /*       be left empty. */
 }
 
 void PMAPI PM_closeConsole(int console_id)
 {
-    // TODO: Close the console when we are done, going back to text mode.
+    /* TODO: Close the console when we are done, going back to text mode. */
 }
 
 void PM_setOSCursorLocation(int x,int y)
 {
-    // TODO: Set the OS console cursor location to the new value. This is
-    //       generally used for new OS ports (used mostly for DOS).
+    /* TODO: Set the OS console cursor location to the new value. This is */
+    /*       generally used for new OS ports (used mostly for DOS). */
 }
 
 void PM_setOSScreenWidth(int width,int height)
 {
-    // TODO: Set the OS console screen width. This is generally unused for
-    //       new OS ports.
+    /* TODO: Set the OS console screen width. This is generally unused for */
+    /*       new OS ports. */
 }
 
 ibool PMAPI PM_setRealTimeClockHandler(PM_intHandler ih, int frequency)
 {
-    // TODO: Install a real time clock interrupt handler. Normally this
-    //       will not be supported from most OS'es in user land, so an
-    //       alternative mechanism is needed to enable software stereo.
-    //       Hence leave this unimplemented unless you have a high priority
-    //       mechanism to call the 32-bit callback when the real time clock
-    //       interrupt fires.
+    /* TODO: Install a real time clock interrupt handler. Normally this */
+    /*       will not be supported from most OS'es in user land, so an */
+    /*       alternative mechanism is needed to enable software stereo. */
+    /*       Hence leave this unimplemented unless you have a high priority */
+    /*       mechanism to call the 32-bit callback when the real time clock */
+    /*       interrupt fires. */
     return false;
 }
 
 void PMAPI PM_setRealTimeClockFrequency(int frequency)
 {
-    // TODO: Set the real time clock interrupt frequency. Used for stereo
-    //       LC shutter glasses when doing software stereo. Usually sets
-    //       the frequency to around 2048 Hz.
+    /* TODO: Set the real time clock interrupt frequency. Used for stereo */
+    /*       LC shutter glasses when doing software stereo. Usually sets */
+    /*       the frequency to around 2048 Hz. */
 }
 
 void PMAPI PM_restoreRealTimeClockHandler(void)
 {
-    // TODO: Restores the real time clock handler.
+    /* TODO: Restores the real time clock handler. */
 }
 
 char * PMAPI PM_getCurrentPath(
@@ -219,8 +219,8 @@
 
 const char * PMAPI PM_getUniqueID(void)
 {
-    // TODO: Return a unique ID for the machine. If a unique ID is not
-    //       available, return the machine name.
+    /* TODO: Return a unique ID for the machine. If a unique ID is not */
+    /*       available, return the machine name. */
     static char buf[128];
     gethostname(buf, 128);
     return buf;
@@ -228,7 +228,7 @@
 
 const char * PMAPI PM_getMachineName(void)
 {
-    // TODO: Return the network machine name for the machine.
+    /* TODO: Return the network machine name for the machine. */
     static char buf[128];
     gethostname(buf, 128);
     return buf;
@@ -236,7 +236,7 @@
 
 void * PMAPI PM_getBIOSPointer(void)
 {
-    // No BIOS access on the BeOS
+    /* No BIOS access on the BeOS */
     return NULL;
 }
 
@@ -244,212 +244,212 @@
 {
     static void *bankPtr;
     if (!bankPtr)
-        bankPtr = PM_mapPhysicalAddr(0xA0000,0xFFFF,true);
+	bankPtr = PM_mapPhysicalAddr(0xA0000,0xFFFF,true);
     return bankPtr;
 }
 
 void * PMAPI PM_mapPhysicalAddr(ulong base,ulong limit,ibool isCached)
 {
-    // TODO: This function maps a physical memory address to a linear
-    //       address in the address space of the calling process.
+    /* TODO: This function maps a physical memory address to a linear */
+    /*       address in the address space of the calling process. */
 
-    // NOTE: This function *must* be able to handle any phsyical base
-    //       address, and hence you will have to handle rounding of
-    //       the physical base address to a page boundary (ie: 4Kb on
-    //       x86 CPU's) to be able to properly map in the memory
-    //       region.
+    /* NOTE: This function *must* be able to handle any phsyical base */
+    /*       address, and hence you will have to handle rounding of */
+    /*       the physical base address to a page boundary (ie: 4Kb on */
+    /*       x86 CPU's) to be able to properly map in the memory */
+    /*       region. */
 
-    // NOTE: If possible the isCached bit should be used to ensure that
-    //       the PCD (Page Cache Disable) and PWT (Page Write Through)
-    //       bits are set to disable caching for a memory mapping used
-    //       for MMIO register access. We also disable caching using
-    //       the MTRR registers for Pentium Pro and later chipsets so if
-    //       MTRR support is enabled for your OS then you can safely ignore
-    //       the isCached flag and always enable caching in the page
-    //       tables.
+    /* NOTE: If possible the isCached bit should be used to ensure that */
+    /*       the PCD (Page Cache Disable) and PWT (Page Write Through) */
+    /*       bits are set to disable caching for a memory mapping used */
+    /*       for MMIO register access. We also disable caching using */
+    /*       the MTRR registers for Pentium Pro and later chipsets so if */
+    /*       MTRR support is enabled for your OS then you can safely ignore */
+    /*       the isCached flag and always enable caching in the page */
+    /*       tables. */
     return NULL;
 }
 
 void PMAPI PM_freePhysicalAddr(void *ptr,ulong limit)
 {
-    // TODO: This function will free a physical memory mapping previously
-    //       allocated with PM_mapPhysicalAddr() if at all possible. If
-    //       you can't free physical memory mappings, simply do nothing.
+    /* TODO: This function will free a physical memory mapping previously */
+    /*       allocated with PM_mapPhysicalAddr() if at all possible. If */
+    /*       you can't free physical memory mappings, simply do nothing. */
 }
 
 ulong PMAPI PM_getPhysicalAddr(void *p)
 {
-    // TODO: This function should find the physical address of a linear
-    //       address.
+    /* TODO: This function should find the physical address of a linear */
+    /*       address. */
     return 0xFFFFFFFFUL;
 }
 
 void PMAPI PM_sleep(ulong milliseconds)
 {
-    // TODO: Put the process to sleep for milliseconds
+    /* TODO: Put the process to sleep for milliseconds */
 }
 
 int PMAPI PM_getCOMPort(int port)
 {
-    // TODO: Re-code this to determine real values using the Plug and Play
-    //       manager for the OS.
+    /* TODO: Re-code this to determine real values using the Plug and Play */
+    /*       manager for the OS. */
     switch (port) {
-        case 0: return 0x3F8;
-        case 1: return 0x2F8;
-        }
+	case 0: return 0x3F8;
+	case 1: return 0x2F8;
+	}
     return 0;
 }
 
 int PMAPI PM_getLPTPort(int port)
 {
-    // TODO: Re-code this to determine real values using the Plug and Play
-    //       manager for the OS.
+    /* TODO: Re-code this to determine real values using the Plug and Play */
+    /*       manager for the OS. */
     switch (port) {
-        case 0: return 0x3BC;
-        case 1: return 0x378;
-        case 2: return 0x278;
-        }
+	case 0: return 0x3BC;
+	case 1: return 0x378;
+	case 2: return 0x278;
+	}
     return 0;
 }
 
 void * PMAPI PM_mallocShared(long size)
 {
-    // TODO: This is used to allocate memory that is shared between process
-    //       that all access the common Nucleus drivers via a common display
-    //       driver DLL. If your OS does not support shared memory (or if
-    //       the display driver does not need to allocate shared memory
-    //       for each process address space), this should just call PM_malloc.
+    /* TODO: This is used to allocate memory that is shared between process */
+    /*       that all access the common Nucleus drivers via a common display */
+    /*       driver DLL. If your OS does not support shared memory (or if */
+    /*       the display driver does not need to allocate shared memory */
+    /*       for each process address space), this should just call PM_malloc. */
     return PM_malloc(size);
 }
 
 void PMAPI PM_freeShared(void *ptr)
 {
-    // TODO: Free the shared memory block. This will be called in the context
-    //       of the original calling process that allocated the shared
-    //       memory with PM_mallocShared. Simply call free if you do not
-    //       need this.
+    /* TODO: Free the shared memory block. This will be called in the context */
+    /*       of the original calling process that allocated the shared */
+    /*       memory with PM_mallocShared. Simply call free if you do not */
+    /*       need this. */
     PM_free(ptr);
 }
 
 void * PMAPI PM_mapToProcess(void *base,ulong limit)
 {
-    // TODO: This function is used to map a physical memory mapping
-    //       previously allocated with PM_mapPhysicalAddr into the
-    //       address space of the calling process. If the memory mapping
-    //       allocated by PM_mapPhysicalAddr is global to all processes,
-    //       simply return the pointer.
+    /* TODO: This function is used to map a physical memory mapping */
+    /*       previously allocated with PM_mapPhysicalAddr into the */
+    /*       address space of the calling process. If the memory mapping */
+    /*       allocated by PM_mapPhysicalAddr is global to all processes, */
+    /*       simply return the pointer. */
     return base;
 }
 
 void * PMAPI PM_mapRealPointer(uint r_seg,uint r_off)
 {
-    // No BIOS access on the BeOS
+    /* No BIOS access on the BeOS */
     return NULL;
 }
 
 void * PMAPI PM_allocRealSeg(uint size,uint *r_seg,uint *r_off)
 {
-    // No BIOS access on the BeOS
+    /* No BIOS access on the BeOS */
     return NULL;
 }
 
 void PMAPI PM_freeRealSeg(void *mem)
 {
-    // No BIOS access on the BeOS
+    /* No BIOS access on the BeOS */
 }
 
 void PMAPI DPMI_int86(int intno, DPMI_regs *regs)
 {
-    // No BIOS access on the BeOS
+    /* No BIOS access on the BeOS */
 }
 
 int PMAPI PM_int86(int intno, RMREGS *in, RMREGS *out)
 {
-    // No BIOS access on the BeOS
+    /* No BIOS access on the BeOS */
     return 0;
 }
 
 int PMAPI PM_int86x(int intno, RMREGS *in, RMREGS *out,
     RMSREGS *sregs)
 {
-    // No BIOS access on the BeOS
+    /* No BIOS access on the BeOS */
     return 0;
 }
 
 void PMAPI PM_callRealMode(uint seg,uint off, RMREGS *in,
     RMSREGS *sregs)
 {
-    // No BIOS access on the BeOS
+    /* No BIOS access on the BeOS */
 }
 
 void PMAPI PM_availableMemory(ulong *physical,ulong *total)
 {
-    // TODO: Report the amount of available memory, both the amount of
-    //       physical memory left and the amount of virtual memory left.
-    //       If the OS does not provide these services, report 0's.
+    /* TODO: Report the amount of available memory, both the amount of */
+    /*       physical memory left and the amount of virtual memory left. */
+    /*       If the OS does not provide these services, report 0's. */
     *physical = *total = 0;
 }
 
 void * PMAPI PM_allocLockedMem(uint size,ulong *physAddr,ibool contiguous,ibool below16Meg)
 {
-    // TODO: Allocate a block of locked, physical memory of the specified
-    //       size. This is used for bus master operations. If this is not
-    //       supported by the OS, return NULL and bus mastering will not
-    //       be used.
+    /* TODO: Allocate a block of locked, physical memory of the specified */
+    /*       size. This is used for bus master operations. If this is not */
+    /*       supported by the OS, return NULL and bus mastering will not */
+    /*       be used. */
     return NULL;
 }
 
 void PMAPI PM_freeLockedMem(void *p,uint size,ibool contiguous)
 {
-    // TODO: Free a memory block allocated with PM_allocLockedMem.
+    /* TODO: Free a memory block allocated with PM_allocLockedMem. */
 }
 
 void PMAPI PM_setBankA(int bank)
 {
-    // No BIOS access on the BeOS
+    /* No BIOS access on the BeOS */
 }
 
 void PMAPI PM_setBankAB(int bank)
 {
-    // No BIOS access on the BeOS
+    /* No BIOS access on the BeOS */
 }
 
 void PMAPI PM_setCRTStart(int x,int y,int waitVRT)
 {
-    // No BIOS access on the BeOS
+    /* No BIOS access on the BeOS */
 }
 
 ibool PMAPI PM_enableWriteCombine(ulong base,ulong length,uint type)
 {
-    // TODO: This function should enable Pentium Pro and Pentium II MTRR
-    //       write combining for the passed in physical memory base address
-    //       and length. Normally this is done via calls to an OS specific
-    //       device driver as this can only be done at ring 0.
-    //
-    // NOTE: This is a *very* important function to implement! If you do
-    //       not implement, graphics performance on the latest Intel chips
-    //       will be severly impaired. For sample code that can be used
-    //       directly in a ring 0 device driver, see the MSDOS implementation
-    //       which includes assembler code to do this directly (if the
-    //       program is running at ring 0).
+    /* TODO: This function should enable Pentium Pro and Pentium II MTRR */
+    /*       write combining for the passed in physical memory base address */
+    /*       and length. Normally this is done via calls to an OS specific */
+    /*       device driver as this can only be done at ring 0. */
+    /* */
+    /* NOTE: This is a *very* important function to implement! If you do */
+    /*       not implement, graphics performance on the latest Intel chips */
+    /*       will be severly impaired. For sample code that can be used */
+    /*       directly in a ring 0 device driver, see the MSDOS implementation */
+    /*       which includes assembler code to do this directly (if the */
+    /*       program is running at ring 0). */
     return false;
 }
 
 ibool PMAPI PM_doBIOSPOST(ushort axVal,ulong BIOSPhysAddr,void *mappedBIOS)
 {
-    // TODO: This function is used to run the BIOS POST code on a secondary
-    //       controller to initialise it for use. This is not necessary
-    //       for multi-controller operation, but it will make it a lot
-    //       more convenicent for end users (otherwise they have to boot
-    //       the system once with the secondary controller as primary, and
-    //       then boot with both controllers installed).
-    //
-    //       Even if you don't support full BIOS access, it would be
-    //       adviseable to be able to POST the secondary controllers in the
-    //       system using this function as a minimum requirement. Some
-    //       graphics hardware has registers that contain values that only
-    //       the BIOS knows about, which makes bring up a card from cold
-    //       reset difficult if the BIOS has not POST'ed it.
+    /* TODO: This function is used to run the BIOS POST code on a secondary */
+    /*       controller to initialise it for use. This is not necessary */
+    /*       for multi-controller operation, but it will make it a lot */
+    /*       more convenicent for end users (otherwise they have to boot */
+    /*       the system once with the secondary controller as primary, and */
+    /*       then boot with both controllers installed). */
+    /* */
+    /*       Even if you don't support full BIOS access, it would be */
+    /*       adviseable to be able to POST the secondary controllers in the */
+    /*       system using this function as a minimum requirement. Some */
+    /*       graphics hardware has registers that contain values that only */
+    /*       the BIOS knows about, which makes bring up a card from cold */
+    /*       reset difficult if the BIOS has not POST'ed it. */
     return false;
 }
 
@@ -506,7 +506,7 @@
     char drive)
 {
     if (drive == 3)
-        return true;
+	return true;
     return false;
 }
 
@@ -533,7 +533,7 @@
     const char *filename,
     uint attrib)
 {
-    // TODO: Set the file attributes for a file
+    /* TODO: Set the file attributes for a file */
     (void)filename;
     (void)attrib;
 }

diff --git a/board/MAI/bios_emulator/scitech/src/pm/beos/ztimer.c b/board/MAI/bios_emulator/scitech/src/pm/beos/ztimer.c
index a5637a5..a528b73 100644
--- a/board/MAI/bios_emulator/scitech/src/pm/beos/ztimer.c
+++ b/board/MAI/bios_emulator/scitech/src/pm/beos/ztimer.c

@@ -36,7 +36,7 @@
 ****************************************************************************/
 void _ZTimerInit(void)
 {
-    // TODO: Do any specific internal initialisation in here
+    /* TODO: Do any specific internal initialisation in here */
 }
 
 /****************************************************************************
@@ -46,8 +46,8 @@
 static void _LZTimerOn(
     LZTimerObject *tm)
 {
-    // TODO: Start the Zen Timer counting. This should be a macro if
-    //       possible.
+    /* TODO: Start the Zen Timer counting. This should be a macro if */
+    /*       possible. */
 }
 
 /****************************************************************************
@@ -57,8 +57,8 @@
 static ulong _LZTimerLap(
     LZTimerObject *tm)
 {
-    // TODO: Compute the lap time between the current time and when the
-    //       timer was started.
+    /* TODO: Compute the lap time between the current time and when the */
+    /*       timer was started. */
     return 0;
 }
 
@@ -69,7 +69,7 @@
 static void _LZTimerOff(
     LZTimerObject *tm)
 {
-    // TODO: Stop the timer counting. Should be a macro if possible.
+    /* TODO: Stop the timer counting. Should be a macro if possible. */
 }
 
 /****************************************************************************
@@ -79,7 +79,7 @@
 static ulong _LZTimerCount(
     LZTimerObject *tm)
 {
-    // TODO: Compute the elapsed time and return it. Always microseconds.
+    /* TODO: Compute the elapsed time and return it. Always microseconds. */
     return 0;
 }
 
@@ -95,9 +95,9 @@
 ****************************************************************************/
 static ulong _ULZReadTime(void)
 {
-    // TODO: Read the long period timer from the OS. The resolution of this
-    //       timer should be around 1/20 of a second for timing long
-    //       periods if possible.
+    /* TODO: Read the long period timer from the OS. The resolution of this */
+    /*       timer should be around 1/20 of a second for timing long */
+    /*       periods if possible. */
 }
 
 /****************************************************************************

diff --git a/board/MAI/bios_emulator/scitech/src/pm/common.c b/board/MAI/bios_emulator/scitech/src/pm/common.c
index b100b8a..d5a8e8f 100644
--- a/board/MAI/bios_emulator/scitech/src/pm/common.c
+++ b/board/MAI/bios_emulator/scitech/src/pm/common.c

@@ -98,9 +98,9 @@
     strcpy(filename,bpdpath);
     strcat(filename,dllname);
     if ((f = fopen(filename,"rb")) == NULL)
-        return false;
+	return false;
     if (cachedpath)
-        strcpy(cachedpath,bpdpath);
+	strcpy(cachedpath,bpdpath);
     fclose(f);
     return true;
 }
@@ -121,20 +121,20 @@
     static ibool    local_override = -1;
 
     if (local_override == -1) {
-        local_override = false;
-        strcpy(filename,PM_getNucleusPath());
-        PM_backslash(filename);
-        strcat(filename,"graphics.ini");
-        if ((f = fopen(filename,"r")) != NULL) {
-            while (!feof(f) && fgets(filename,sizeof(filename),f)) {
-                if (strnicmp(filename,"uselocal",8) == 0) {
-                    local_override = ((*(filename+9) - '0') == 1);
-                    break;
-                    }
-                }
-            fclose(f);
-            }
-        }
+	local_override = false;
+	strcpy(filename,PM_getNucleusPath());
+	PM_backslash(filename);
+	strcat(filename,"graphics.ini");
+	if ((f = fopen(filename,"r")) != NULL) {
+	    while (!feof(f) && fgets(filename,sizeof(filename),f)) {
+		if (strnicmp(filename,"uselocal",8) == 0) {
+		    local_override = ((*(filename+9) - '0') == 1);
+		    break;
+		    }
+		}
+	    fclose(f);
+	    }
+	}
     return local_override;
 }
 
@@ -164,44 +164,44 @@
 
     /* On the first call determine the path to the Nucleus drivers */
     if (cachedpath[0] == 0) {
-        /* First try in the global system Nucleus driver path if
-         * the local override setting is not enabled.
-         */
-        PM_init();
-        if (!GetLocalOverride()) {
-            if (TryPath(bpdpath,cachedpath,PM_getNucleusPath(),"",dllname))
-                return true;
-            }
+	/* First try in the global system Nucleus driver path if
+	 * the local override setting is not enabled.
+	 */
+	PM_init();
+	if (!GetLocalOverride()) {
+	    if (TryPath(bpdpath,cachedpath,PM_getNucleusPath(),"",dllname))
+		return true;
+	    }
 
-        /* Next try in the local application directory if available */
-        if (localBPDPath[0] != 0) {
-            if (TryPath(bpdpath,cachedpath,localBPDPath,"",dllname))
-                return true;
-            }
-        else {
+	/* Next try in the local application directory if available */
+	if (localBPDPath[0] != 0) {
+	    if (TryPath(bpdpath,cachedpath,localBPDPath,"",dllname))
+		return true;
+	    }
+	else {
 #if !defined(__WIN32_VXD__) && !defined(__NT_DRIVER__)
-            char    *mgl_root;
-            if ((mgl_root = getenv("MGL_ROOT")) != NULL) {
-                if (TryPath(bpdpath,cachedpath,mgl_root,"drivers",dllname))
-                    return true;
-                }
+	    char    *mgl_root;
+	    if ((mgl_root = getenv("MGL_ROOT")) != NULL) {
+		if (TryPath(bpdpath,cachedpath,mgl_root,"drivers",dllname))
+		    return true;
+		}
 #endif
-            PM_getCurrentPath(bpdpath,PM_MAX_PATH);
-            if (TryPath(bpdpath,cachedpath,bpdpath,"drivers",dllname))
-                return true;
-            }
+	    PM_getCurrentPath(bpdpath,PM_MAX_PATH);
+	    if (TryPath(bpdpath,cachedpath,bpdpath,"drivers",dllname))
+		return true;
+	    }
 
-        /* Finally try in the global system path again so that we
-         * will still find the drivers in the global system path if
-         * the local override option is on, but the application does
-         * not have any local override drivers.
-         */
-        if (TryPath(bpdpath,cachedpath,PM_getNucleusPath(),"",dllname))
-            return true;
+	/* Finally try in the global system path again so that we
+	 * will still find the drivers in the global system path if
+	 * the local override option is on, but the application does
+	 * not have any local override drivers.
+	 */
+	if (TryPath(bpdpath,cachedpath,PM_getNucleusPath(),"",dllname))
+	    return true;
 
-        /* Whoops, we can't find the BPD file! */
-        return false;
-        }
+	/* Whoops, we can't find the BPD file! */
+	return false;
+	}
 
     /* Always try in the previously discovered path */
     return TryPath(bpdpath,NULL,cachedpath,"",dllname);
@@ -216,9 +216,9 @@
     const char *_src)
 {
     if (!_dest || !_src)
-        return 0;
+	return 0;
     while ((*_dest++ = *_src++) != 0)
-        ;
+	;
     return --_dest;
 }
 
@@ -233,13 +233,13 @@
     unsigned maxlen)
 {
     if (dst) {
-        if(strlen(src) >= maxlen) {
-            strncpy(dst, src, maxlen);
-            dst[maxlen] = 0;
-            }
-        else
-            strcpy(dst, src);
-        }
+	if(strlen(src) >= maxlen) {
+	    strncpy(dst, src, maxlen);
+	    dst[maxlen] = 0;
+	    }
+	else
+	    strcpy(dst, src);
+	}
 }
 
 /****************************************************************************
@@ -250,16 +250,16 @@
     char *p)
 {
     if (*(p-1) == '.')
-        p--;
+	p--;
     switch (*--p) {
-        case ':':
-            if (*(p-2) != '\0')
-                break;
-        case '/':
-        case '\\':
-        case '\0':
-            return true;
-        }
+	case ':':
+	    if (*(p-2) != '\0')
+		break;
+	case '/':
+	case '\\':
+	case '\0':
+	    return true;
+	}
     return false;
 }
 
@@ -299,25 +299,25 @@
     const char *ext)
 {
     if (drive && *drive) {
-        *path++ = *drive;
-        *path++ = ':';
-        }
+	*path++ = *drive;
+	*path++ = ':';
+	}
     if (dir && *dir) {
-        path = _stpcpy(path,dir);
-        if (*(path-1) != '\\' && *(path-1) != '/')
+	path = _stpcpy(path,dir);
+	if (*(path-1) != '\\' && *(path-1) != '/')
 #ifdef  __UNIX__
-            *path++ = '/';
+	    *path++ = '/';
 #else
-            *path++ = '\\';
+	    *path++ = '\\';
 #endif
-        }
+	}
     if (name)
-        path = _stpcpy(path,name);
+	path = _stpcpy(path,name);
     if (ext && *ext) {
-        if (*ext != '.')
-            *path++ = '.';
-        path = _stpcpy(path,ext);
-        }
+	if (*ext != '.')
+	    *path++ = '.';
+	path = _stpcpy(path,ext);
+	}
     *path = 0;
 }
 
@@ -377,7 +377,7 @@
     /* Copy filename into template up to PM_MAX_PATH characters */
     p = buf;
     if ((temp = strlen(path)) > PM_MAX_PATH)
-        temp = PM_MAX_PATH;
+	temp = PM_MAX_PATH;
     *p++ = 0;
     strncpy(p, path, temp);
     *(p += temp) = 0;
@@ -385,53 +385,53 @@
     /* Split the filename and fill corresponding nonzero pointers */
     temp = 0;
     for (;;) {
-        switch (*--p) {
-            case '.':
-                if (!temp && (*(p+1) == '\0'))
-                    temp = findDot(p);
-                if ((!temp) && ((ret & PM_HAS_EXTENSION) == 0)) {
-                    ret |= PM_HAS_EXTENSION;
-                    safe_strncpy(ext, p, PM_MAX_PATH - 1);
-                    *p = 0;
-                    }
-                continue;
-            case ':':
-                if (p != &buf[2])
-                    continue;
-            case '\0':
-                if (temp) {
-                    if (*++p)
-                        ret |= PM_HAS_DIRECTORY;
-                    safe_strncpy(dir, p, PM_MAX_PATH - 1);
-                    *p-- = 0;
-                    break;
-                    }
-            case '/':
-            case '\\':
-                if (!temp) {
-                    temp++;
-                    if (*++p)
-                        ret |= PM_HAS_FILENAME;
-                    safe_strncpy(name, p, PM_MAX_PATH - 1);
-                    *p-- = 0;
-                    if (*p == 0 || (*p == ':' && p == &buf[2]))
-                        break;
-                    }
-                continue;
-            case '*':
-            case '?':
-                if (!temp)
-                    ret |= PM_HAS_WILDCARDS;
-            default:
-                continue;
-            }
-        break;
-        }
+	switch (*--p) {
+	    case '.':
+		if (!temp && (*(p+1) == '\0'))
+		    temp = findDot(p);
+		if ((!temp) && ((ret & PM_HAS_EXTENSION) == 0)) {
+		    ret |= PM_HAS_EXTENSION;
+		    safe_strncpy(ext, p, PM_MAX_PATH - 1);
+		    *p = 0;
+		    }
+		continue;
+	    case ':':
+		if (p != &buf[2])
+		    continue;
+	    case '\0':
+		if (temp) {
+		    if (*++p)
+			ret |= PM_HAS_DIRECTORY;
+		    safe_strncpy(dir, p, PM_MAX_PATH - 1);
+		    *p-- = 0;
+		    break;
+		    }
+	    case '/':
+	    case '\\':
+		if (!temp) {
+		    temp++;
+		    if (*++p)
+			ret |= PM_HAS_FILENAME;
+		    safe_strncpy(name, p, PM_MAX_PATH - 1);
+		    *p-- = 0;
+		    if (*p == 0 || (*p == ':' && p == &buf[2]))
+			break;
+		    }
+		continue;
+	    case '*':
+	    case '?':
+		if (!temp)
+		    ret |= PM_HAS_WILDCARDS;
+	    default:
+		continue;
+	    }
+	break;
+	}
     if (*p == ':') {
-        if (buf[1])
-            ret |= PM_HAS_DRIVE;
-        safe_strncpy(drive, &buf[1], PM_MAX_DRIVE - 1);
-        }
+	if (buf[1])
+	    ret |= PM_HAS_DRIVE;
+	safe_strncpy(drive, &buf[1], PM_MAX_DRIVE - 1);
+	}
     return ret;
 }
 
@@ -466,15 +466,15 @@
     static ibool            firstTime = true;
 
     if (firstTime) {
-        firstTime = false;
-        LZTimerOnExt(&tm);
-        }
+	firstTime = false;
+	LZTimerOnExt(&tm);
+	}
     else {
-        if ((msDelay = (microseconds - LZTimerLapExt(&tm)) / 1000L) > 0)
-            PM_sleep(msDelay);
-        while (LZTimerLapExt(&tm) < microseconds)
-            ;
-        LZTimerOffExt(&tm);
-        LZTimerOnExt(&tm);
-        }
+	if ((msDelay = (microseconds - LZTimerLapExt(&tm)) / 1000L) > 0)
+	    PM_sleep(msDelay);
+	while (LZTimerLapExt(&tm) < microseconds)
+	    ;
+	LZTimerOffExt(&tm);
+	LZTimerOnExt(&tm);
+	}
 }

diff --git a/board/MAI/bios_emulator/scitech/src/pm/common/agp.c b/board/MAI/bios_emulator/scitech/src/pm/common/agp.c
index 23f7e1e..d53bc88 100644
--- a/board/MAI/bios_emulator/scitech/src/pm/common/agp.c
+++ b/board/MAI/bios_emulator/scitech/src/pm/common/agp.c

@@ -54,22 +54,22 @@
 ulong PMAPI PM_agpInit(void)
 {
     if ((agp = AGP_loadDriver(0)) == NULL)
-        return 0;
+	return 0;
     driver.dwSize = sizeof(driver);
     if (!agp->QueryFunctions(AGP_GET_DRIVERFUNCS,&driver))
-        return 0;
+	return 0;
     switch (driver.GetApertureSize()) {
-        case agpSize4MB:    return 4;
-        case agpSize8MB:    return 8;
-        case agpSize16MB:   return 16;
-        case agpSize32MB:   return 32;
-        case agpSize64MB:   return 64;
-        case agpSize128MB:  return 128;
-        case agpSize256MB:  return 256;
-        case agpSize512MB:  return 512;
-        case agpSize1GB:    return 1024;
-        case agpSize2GB:    return 2048;
-        }
+	case agpSize4MB:    return 4;
+	case agpSize8MB:    return 8;
+	case agpSize16MB:   return 16;
+	case agpSize32MB:   return 32;
+	case agpSize64MB:   return 64;
+	case agpSize128MB:  return 128;
+	case agpSize256MB:  return 256;
+	case agpSize512MB:  return 512;
+	case agpSize1GB:    return 1024;
+	case agpSize2GB:    return 2048;
+	}
     return 0;
 }
 
@@ -106,18 +106,18 @@
     PM_physAddr *physAddr)
 {
     switch (type) {
-        case PM_agpUncached:        
-            type = agpUncached;     
-            break;
-        case PM_agpWriteCombine:    
-            type = agpWriteCombine; 
-            break;
-        case PM_agpIntelDCACHE:     
-            type = agpIntelDCACHE;      
-            break;  
-        default:
-            return false;
-        }
+	case PM_agpUncached:
+	    type = agpUncached;
+	    break;
+	case PM_agpWriteCombine:
+	    type = agpWriteCombine;
+	    break;
+	case PM_agpIntelDCACHE:
+	    type = agpIntelDCACHE;
+	    break;
+	default:
+	    return false;
+	}
     return driver.ReservePhysical(numPages,type,physContext,physAddr) == nOK;
 }
 
@@ -187,4 +187,3 @@
 }
 
 #endif  /* !REALMODE */
-

diff --git a/board/MAI/bios_emulator/scitech/src/pm/common/keyboard.c b/board/MAI/bios_emulator/scitech/src/pm/common/keyboard.c
index 79b4040..36867bd 100644
--- a/board/MAI/bios_emulator/scitech/src/pm/common/keyboard.c
+++ b/board/MAI/bios_emulator/scitech/src/pm/common/keyboard.c

@@ -52,18 +52,18 @@
     int                 n,pivot,val;
 
     for (n = count; n > 0; ) {
-        pivot = n >> 1;
-        test = table + pivot;
-        val = scanCode - test->scanCode;
-        if (val < 0)
-            n = pivot;
-        else if (val == 0)
-            return test->asciiCode;
-        else {
-            table = test + 1;
-            n -= pivot + 1;
-            }
-        }
+	pivot = n >> 1;
+	test = table + pivot;
+	val = scanCode - test->scanCode;
+	if (val < 0)
+	    n = pivot;
+	else if (val == 0)
+	    return test->asciiCode;
+	else {
+	    table = test + 1;
+	    n -= pivot + 1;
+	    }
+	}
     return 0;
 }
 
@@ -84,35 +84,35 @@
 
     evt->message &= ~0xFF;
     if (evt->modifiers & EVT_NUMLOCK) {
-        if ((ascii = translateScan(scan,EVT.codePage->numPad,EVT.codePage->numPadLen)) != 0) {
-            evt->message |= ascii;
-            return;
-            }
-        }
+	if ((ascii = translateScan(scan,EVT.codePage->numPad,EVT.codePage->numPadLen)) != 0) {
+	    evt->message |= ascii;
+	    return;
+	    }
+	}
     if (evt->modifiers & EVT_CTRLSTATE) {
-        evt->message |= translateScan(scan,EVT.codePage->ctrl,EVT.codePage->ctrlLen);
-        return;
-        }
+	evt->message |= translateScan(scan,EVT.codePage->ctrl,EVT.codePage->ctrlLen);
+	return;
+	}
     if (evt->modifiers & EVT_CAPSLOCK) {
-        if (evt->modifiers & EVT_SHIFTKEY) {
-            if ((ascii = translateScan(scan,EVT.codePage->shiftCaps,EVT.codePage->shiftCapsLen)) != 0) {
-                evt->message |= ascii;
-                return;
-                }
-            }
-        else {
-            if ((ascii = translateScan(scan,EVT.codePage->caps,EVT.codePage->capsLen)) != 0) {
-                evt->message |= ascii;
-                return;
-                }
-            }
-        }
+	if (evt->modifiers & EVT_SHIFTKEY) {
+	    if ((ascii = translateScan(scan,EVT.codePage->shiftCaps,EVT.codePage->shiftCapsLen)) != 0) {
+		evt->message |= ascii;
+		return;
+		}
+	    }
+	else {
+	    if ((ascii = translateScan(scan,EVT.codePage->caps,EVT.codePage->capsLen)) != 0) {
+		evt->message |= ascii;
+		return;
+		}
+	    }
+	}
     if (evt->modifiers & EVT_SHIFTKEY) {
-        if ((ascii = translateScan(scan,EVT.codePage->shift,EVT.codePage->shiftLen)) != 0) {
-            evt->message |= ascii;
-            return;
-            }
-        }
+	if ((ascii = translateScan(scan,EVT.codePage->shift,EVT.codePage->shiftLen)) != 0) {
+	    evt->message |= ascii;
+	    return;
+	    }
+	}
     evt->message |= translateScan(scan,EVT.codePage->normal,EVT.codePage->normalLen);
 }
 
@@ -124,9 +124,9 @@
     uchar scanCode)
 {
     if (scanCode > 0x7F)
-        return false;
+	return false;
     else
-        return EVT.keyTable[scanCode] != 0;
+	return EVT.keyTable[scanCode] != 0;
 }
 
 /****************************************************************************
@@ -139,7 +139,7 @@
 within the keyboard interrupt subroutine!
 
 NOTE:   Interrupts are OFF when this routine is called by the keyboard ISR,
-        and we leave them OFF the entire time.
+	and we leave them OFF the entire time.
 ****************************************************************************/
 static void addKeyEvent(
     uint what,
@@ -148,31 +148,31 @@
     event_t evt;
 
     if (EVT.count < EVENTQSIZE) {
-        /* Save information in event record */
-        evt.when = _EVT_getTicks();
-        evt.what = what;
-        evt.message = message | 0x10000UL;
-        evt.where_x = 0;
-        evt.where_y = 0;
-        evt.relative_x = 0;
-        evt.relative_y = 0;
-        evt.modifiers = EVT.keyModifiers;
-        if (evt.what == EVT_KEYREPEAT) {
-            if (EVT.oldKey != -1)
-                EVT.evtq[EVT.oldKey].message += 0x10000UL;
-            else {
-                EVT.oldKey = EVT.freeHead;
-                addEvent(&evt);         /* Add to tail of event queue   */
-                }
-            }
-        else {
+	/* Save information in event record */
+	evt.when = _EVT_getTicks();
+	evt.what = what;
+	evt.message = message | 0x10000UL;
+	evt.where_x = 0;
+	evt.where_y = 0;
+	evt.relative_x = 0;
+	evt.relative_y = 0;
+	evt.modifiers = EVT.keyModifiers;
+	if (evt.what == EVT_KEYREPEAT) {
+	    if (EVT.oldKey != -1)
+		EVT.evtq[EVT.oldKey].message += 0x10000UL;
+	    else {
+		EVT.oldKey = EVT.freeHead;
+		addEvent(&evt);         /* Add to tail of event queue   */
+		}
+	    }
+	else {
 #ifdef __QNX__
-            _EVT_maskKeyCode(&evt);
+	    _EVT_maskKeyCode(&evt);
 #endif
-            addEvent(&evt);             /* Add to tail of event queue   */
-            }
-        EVT.oldMove = -1;
-        }
+	    addEvent(&evt);             /* Add to tail of event queue   */
+	    }
+	EVT.oldMove = -1;
+	}
 }
 
 /****************************************************************************
@@ -184,7 +184,7 @@
 {
     int timeout = 8192;
     while ((timeout > 0) && (PM_inpb(0x64) & 0x02))
-        timeout--;
+	timeout--;
     return (timeout > 0);
 }
 
@@ -197,7 +197,7 @@
 {
     int timeout = 8192;
     while ((timeout > 0) && (!(PM_inpb(0x64) & 0x01)))
-        timeout--;
+	timeout--;
     return (timeout > 0);
 }
 
@@ -215,20 +215,20 @@
     int timeout, temp;
 
     do {
-        if (!kbWaitForWriteReady())
-            return 0;
-        PM_outpb(0x60,data);
-        timeout = 8192;
-        while (--timeout > 0) {
-            if (!kbWaitForReadReady())
-                return 0;
-            temp = PM_inpb(0x60);
-            if (temp == 0xFA)
-                return 1;
-            if (temp == 0xFE)
-                break;
-            }
-        } while ((resends-- > 0) && (timeout > 0));
+	if (!kbWaitForWriteReady())
+	    return 0;
+	PM_outpb(0x60,data);
+	timeout = 8192;
+	while (--timeout > 0) {
+	    if (!kbWaitForReadReady())
+		return 0;
+	    temp = PM_inpb(0x60);
+	    if (temp == 0xFA)
+		return 1;
+	    if (temp == 0xFE)
+		break;
+	    }
+	} while ((resends-- > 0) && (timeout > 0));
     return 0;
 }
 
@@ -245,10 +245,10 @@
     uint modifiers)
 {
     if (EVT.allowLEDS) {
-        if (!kbSendData(0xED) || !kbSendData((modifiers>>9) & 7)) {
-            kbSendData(0xF4);
-            }
-        }
+	if (!kbSendData(0xED) || !kbSendData((modifiers>>9) & 7)) {
+	    kbSendData(0xF4);
+	    }
+	}
 }
 
 /****************************************************************************
@@ -256,7 +256,7 @@
 Function to process raw scan codes read from the keyboard controller.
 
 NOTE:   Interrupts are OFF when this routine is called by the keyboard ISR,
-        and we leave them OFF the entire time.
+	and we leave them OFF the entire time.
 {secret}
 ****************************************************************************/
 void processRawScanCode(
@@ -267,156 +267,156 @@
     int         what;
 
     if (pauseLoop) {
-        /* Skip scan codes until the pause key sequence has been read */
-        pauseLoop--;
-        }
+	/* Skip scan codes until the pause key sequence has been read */
+	pauseLoop--;
+	}
     else if (scan == 0xE0) {
-        /* This signals the start of an extended scan code sequence */
-        extended = 1;
-        }
+	/* This signals the start of an extended scan code sequence */
+	extended = 1;
+	}
     else if (scan == 0xE1) {
-        /* The Pause key sends a strange scan code sequence, which is:
-         *
-         *  E1 1D 52 E1 9D D2
-         *
-         * However there is never any release code nor any auto-repeat for
-         * this key. For this reason we simply ignore the key and skip the
-         * next 5 scan codes read from the keyboard.
-         */
-        pauseLoop = 5;
-        }
+	/* The Pause key sends a strange scan code sequence, which is:
+	 *
+	 *  E1 1D 52 E1 9D D2
+	 *
+	 * However there is never any release code nor any auto-repeat for
+	 * this key. For this reason we simply ignore the key and skip the
+	 * next 5 scan codes read from the keyboard.
+	 */
+	pauseLoop = 5;
+	}
     else {
-        /* Process the scan code normally (it may be an extended code
-         * however!). Bit 7 means key was released, and bits 0-6 are the
-         * scan code.
-         */
-        what = (scan & 0x80) ? EVT_KEYUP : EVT_KEYDOWN;
-        scan &= 0x7F;
-        if (extended) {
-            extended = 0;
-            if (scan == 0x2A || scan == 0x36) {
-                /* Ignore these extended scan code sequences. These are
-                 * used by the keyboard controller to wrap around certain
-                 * key sequences for the keypad (and when NUMLOCK is down
-                 * internally).
-                 */
-                return;
-                }
+	/* Process the scan code normally (it may be an extended code
+	 * however!). Bit 7 means key was released, and bits 0-6 are the
+	 * scan code.
+	 */
+	what = (scan & 0x80) ? EVT_KEYUP : EVT_KEYDOWN;
+	scan &= 0x7F;
+	if (extended) {
+	    extended = 0;
+	    if (scan == 0x2A || scan == 0x36) {
+		/* Ignore these extended scan code sequences. These are
+		 * used by the keyboard controller to wrap around certain
+		 * key sequences for the keypad (and when NUMLOCK is down
+		 * internally).
+		 */
+		return;
+		}
 
-            /* Convert extended codes for key sequences that we map to
-             * virtual scan codes so the user can detect them in their
-             * code.
-             */
-            switch (scan) {
-                case KB_leftCtrl:   scan = KB_rightCtrl;    break;
-                case KB_leftAlt:    scan = KB_rightAlt;     break;
-                case KB_divide:     scan = KB_padDivide;    break;
-                case KB_enter:      scan = KB_padEnter;     break;
-                case KB_padTimes:   scan = KB_sysReq;       break;
-                }
-            }
-        else {
-            /* Convert regular scan codes for key sequences that we map to
-             * virtual scan codes so the user can detect them in their
-             * code.
-             */
-            switch (scan) {
-                case KB_left:       scan = KB_padLeft;      break;
-                case KB_right:      scan = KB_padRight;     break;
-                case KB_up:         scan = KB_padUp;        break;
-                case KB_down:       scan = KB_padDown;      break;
-                case KB_insert:     scan = KB_padInsert;    break;
-                case KB_delete:     scan = KB_padDelete;    break;
-                case KB_home:       scan = KB_padHome;      break;
-                case KB_end:        scan = KB_padEnd;       break;
-                case KB_pageUp:     scan = KB_padPageUp;    break;
-                case KB_pageDown:   scan = KB_padPageDown;  break;
-                }
-            }
+	    /* Convert extended codes for key sequences that we map to
+	     * virtual scan codes so the user can detect them in their
+	     * code.
+	     */
+	    switch (scan) {
+		case KB_leftCtrl:   scan = KB_rightCtrl;    break;
+		case KB_leftAlt:    scan = KB_rightAlt;     break;
+		case KB_divide:     scan = KB_padDivide;    break;
+		case KB_enter:      scan = KB_padEnter;     break;
+		case KB_padTimes:   scan = KB_sysReq;       break;
+		}
+	    }
+	else {
+	    /* Convert regular scan codes for key sequences that we map to
+	     * virtual scan codes so the user can detect them in their
+	     * code.
+	     */
+	    switch (scan) {
+		case KB_left:       scan = KB_padLeft;      break;
+		case KB_right:      scan = KB_padRight;     break;
+		case KB_up:         scan = KB_padUp;        break;
+		case KB_down:       scan = KB_padDown;      break;
+		case KB_insert:     scan = KB_padInsert;    break;
+		case KB_delete:     scan = KB_padDelete;    break;
+		case KB_home:       scan = KB_padHome;      break;
+		case KB_end:        scan = KB_padEnd;       break;
+		case KB_pageUp:     scan = KB_padPageUp;    break;
+		case KB_pageDown:   scan = KB_padPageDown;  break;
+		}
+	    }
 
-        /* Determine if the key is an UP, DOWN or REPEAT and maintain the
-         * up/down status of all keys in our global key array.
-         */
-        if (what == EVT_KEYDOWN) {
-            if (EVT.keyTable[scan])
-                what = EVT_KEYREPEAT;
-            else
-                EVT.keyTable[scan] = scan;
-            }
-        else {
-            EVT.keyTable[scan] = 0;
-            }
+	/* Determine if the key is an UP, DOWN or REPEAT and maintain the
+	 * up/down status of all keys in our global key array.
+	 */
+	if (what == EVT_KEYDOWN) {
+	    if (EVT.keyTable[scan])
+		what = EVT_KEYREPEAT;
+	    else
+		EVT.keyTable[scan] = scan;
+	    }
+	else {
+	    EVT.keyTable[scan] = 0;
+	    }
 
-        /* Handle shift key modifiers */
-        if (what != EVT_KEYREPEAT) {
-            switch (scan) {
-                case KB_capsLock:
-                    if (what == EVT_KEYDOWN)
-                        EVT.keyModifiers ^= EVT_CAPSLOCK;
-                    setLEDS(EVT.keyModifiers);
-                    break;
-                case KB_numLock:
-                    if (what == EVT_KEYDOWN)
-                        EVT.keyModifiers ^= EVT_NUMLOCK;
-                    setLEDS(EVT.keyModifiers);
-                    break;
-                case KB_scrollLock:
-                    if (what == EVT_KEYDOWN)
-                        EVT.keyModifiers ^= EVT_SCROLLLOCK;
-                    setLEDS(EVT.keyModifiers);
-                    break;
-                case KB_leftShift:
-                    if (what == EVT_KEYUP)
-                        EVT.keyModifiers &= ~EVT_LEFTSHIFT;
-                    else
-                        EVT.keyModifiers |= EVT_LEFTSHIFT;
-                    break;
-                case KB_rightShift:
-                    if (what == EVT_KEYUP)
-                        EVT.keyModifiers &= ~EVT_RIGHTSHIFT;
-                    else
-                        EVT.keyModifiers |= EVT_RIGHTSHIFT;
-                    break;
-                case KB_leftCtrl:
-                    if (what == EVT_KEYUP)
-                        EVT.keyModifiers &= ~EVT_LEFTCTRL;
-                    else
-                        EVT.keyModifiers |= EVT_LEFTCTRL;
-                    break;
-                case KB_rightCtrl:
-                    if (what == EVT_KEYUP)
-                        EVT.keyModifiers &= ~EVT_RIGHTCTRL;
-                    else
-                        EVT.keyModifiers |= EVT_RIGHTCTRL;
-                    break;
-                case KB_leftAlt:
-                    if (what == EVT_KEYUP)
-                        EVT.keyModifiers &= ~EVT_LEFTALT;
-                    else
-                        EVT.keyModifiers |= EVT_LEFTALT;
-                    break;
-                case KB_rightAlt:
-                    if (what == EVT_KEYUP)
-                        EVT.keyModifiers &= ~EVT_RIGHTALT;
-                    else
-                        EVT.keyModifiers |= EVT_RIGHTALT;
-                    break;
+	/* Handle shift key modifiers */
+	if (what != EVT_KEYREPEAT) {
+	    switch (scan) {
+		case KB_capsLock:
+		    if (what == EVT_KEYDOWN)
+			EVT.keyModifiers ^= EVT_CAPSLOCK;
+		    setLEDS(EVT.keyModifiers);
+		    break;
+		case KB_numLock:
+		    if (what == EVT_KEYDOWN)
+			EVT.keyModifiers ^= EVT_NUMLOCK;
+		    setLEDS(EVT.keyModifiers);
+		    break;
+		case KB_scrollLock:
+		    if (what == EVT_KEYDOWN)
+			EVT.keyModifiers ^= EVT_SCROLLLOCK;
+		    setLEDS(EVT.keyModifiers);
+		    break;
+		case KB_leftShift:
+		    if (what == EVT_KEYUP)
+			EVT.keyModifiers &= ~EVT_LEFTSHIFT;
+		    else
+			EVT.keyModifiers |= EVT_LEFTSHIFT;
+		    break;
+		case KB_rightShift:
+		    if (what == EVT_KEYUP)
+			EVT.keyModifiers &= ~EVT_RIGHTSHIFT;
+		    else
+			EVT.keyModifiers |= EVT_RIGHTSHIFT;
+		    break;
+		case KB_leftCtrl:
+		    if (what == EVT_KEYUP)
+			EVT.keyModifiers &= ~EVT_LEFTCTRL;
+		    else
+			EVT.keyModifiers |= EVT_LEFTCTRL;
+		    break;
+		case KB_rightCtrl:
+		    if (what == EVT_KEYUP)
+			EVT.keyModifiers &= ~EVT_RIGHTCTRL;
+		    else
+			EVT.keyModifiers |= EVT_RIGHTCTRL;
+		    break;
+		case KB_leftAlt:
+		    if (what == EVT_KEYUP)
+			EVT.keyModifiers &= ~EVT_LEFTALT;
+		    else
+			EVT.keyModifiers |= EVT_LEFTALT;
+		    break;
+		case KB_rightAlt:
+		    if (what == EVT_KEYUP)
+			EVT.keyModifiers &= ~EVT_RIGHTALT;
+		    else
+			EVT.keyModifiers |= EVT_RIGHTALT;
+		    break;
 #ifdef SUPPORT_CTRL_ALT_DEL
-                case KB_delete:
-                    if ((EVT.keyModifiers & EVT_CTRLSTATE) && (EVT.keyModifiers & EVT_ALTSTATE))
-                        Reboot();
-                    break;
+		case KB_delete:
+		    if ((EVT.keyModifiers & EVT_CTRLSTATE) && (EVT.keyModifiers & EVT_ALTSTATE))
+			Reboot();
+		    break;
 #endif
-                }
-            }
+		}
+	    }
 
-        /* Add the untranslated key code to the event queue. All
-         * translation to ASCII from the key codes occurs when the key
-         * is extracted from the queue, saving time in the low level
-         * interrupt handler.
-         */
-        addKeyEvent(what,scan << 8);
-        }
+	/* Add the untranslated key code to the event queue. All
+	 * translation to ASCII from the key codes occurs when the key
+	 * is extracted from the queue, saving time in the low level
+	 * interrupt handler.
+	 */
+	addKeyEvent(what,scan << 8);
+	}
 }
 
 /****************************************************************************
@@ -442,9 +442,8 @@
 {
     EVT.allowLEDS = true;
     if (enable)
-        setLEDS(EVT.keyModifiers);
+	setLEDS(EVT.keyModifiers);
     else
-        setLEDS(0);
+	setLEDS(0);
     EVT.allowLEDS = enable;
 }
-

diff --git a/board/MAI/bios_emulator/scitech/src/pm/common/mtrr.c b/board/MAI/bios_emulator/scitech/src/pm/common/mtrr.c
index d6ced6e..eed5f45 100644
--- a/board/MAI/bios_emulator/scitech/src/pm/common/mtrr.c
+++ b/board/MAI/bios_emulator/scitech/src/pm/common/mtrr.c

@@ -106,26 +106,26 @@
     ulong   config,dummy;
 
     switch (cpuFamily) {
-        case CPU_AMD:
-            if (cpuType < CPU_AMDAthlon) {
-                /* AMD K6-2 stepping 8 and later support the MTRR registers.
-                 * The earlier K6-2 steppings (300Mhz models) do not
-                 * support MTRR's.
-                 */
-                if ((cpuType < CPU_AMDK6_2) || (cpuType == CPU_AMDK6_2 && cpuStepping < 8))
-                    return 0;
-                return 1;
-                }
-            /* Fall through for AMD Athlon which uses P6 style MTRR's */
-        case CPU_Intel:
-            _MTRR_readMSR(INTEL_cap_MSR,&config,&dummy);
-            return (config & (1 << 10));
-        case CPU_Cyrix:
-            /* Cyrix 6x86 and later support the MTRR registers */
-            if (cpuType < CPU_Cyrix6x86)
-                return 0;
-            return 1;
-        }
+	case CPU_AMD:
+	    if (cpuType < CPU_AMDAthlon) {
+		/* AMD K6-2 stepping 8 and later support the MTRR registers.
+		 * The earlier K6-2 steppings (300Mhz models) do not
+		 * support MTRR's.
+		 */
+		if ((cpuType < CPU_AMDK6_2) || (cpuType == CPU_AMDK6_2 && cpuStepping < 8))
+		    return 0;
+		return 1;
+		}
+	    /* Fall through for AMD Athlon which uses P6 style MTRR's */
+	case CPU_Intel:
+	    _MTRR_readMSR(INTEL_cap_MSR,&config,&dummy);
+	    return (config & (1 << 10));
+	case CPU_Cyrix:
+	    /* Cyrix 6x86 and later support the MTRR registers */
+	    if (cpuType < CPU_Cyrix6x86)
+		return 0;
+	    return 1;
+	}
     return 0;
 }
 
@@ -149,10 +149,10 @@
     ulong   lbase,lsize;
 
     for (i = 0; i < numMTRR; i++) {
-        getMTRR(i,&lbase,&lsize,&ltype);
-        if (lsize < 1)
-            return i;
-        }
+	getMTRR(i,&lbase,&lsize,&ltype);
+	if (lsize < 1)
+	    return i;
+	}
     (void)base;
     (void)size;
     return -1;
@@ -178,10 +178,10 @@
     ulong   lbase,lsize;
 
     for (i = 0; i < numMTRR; i++) {
-        getMTRR(i,&lbase,&lsize,&ltype);
-        if (lsize < 1)
-            return i;
-        }
+	getMTRR(i,&lbase,&lsize,&ltype);
+	if (lsize < 1)
+	    return i;
+	}
     (void)base;
     (void)size;
     return -1;
@@ -207,23 +207,23 @@
     ulong   lbase, lsize;
 
     if (size > 0x2000000UL) {
-        /* If we are to set up a region >32M then look at ARR7 immediately */
-        getMTRR(7,&lbase,&lsize,&ltype);
-        if (lsize < 1)
-            return 7;
-        }
+	/* If we are to set up a region >32M then look at ARR7 immediately */
+	getMTRR(7,&lbase,&lsize,&ltype);
+	if (lsize < 1)
+	    return 7;
+	}
     else {
-        /* Check ARR0-6 registers */
-        for (i = 0; i < 7; i++) {
-            getMTRR(i,&lbase,&lsize,&ltype);
-            if (lsize < 1)
-                return i;
-            }
-        /* Try ARR7 but its size must be at least 256K */
-        getMTRR(7,&lbase,&lsize,&ltype);
-        if ((lsize < 1) && (size >= 0x40000))
-            return i;
-        }
+	/* Check ARR0-6 registers */
+	for (i = 0; i < 7; i++) {
+	    getMTRR(i,&lbase,&lsize,&ltype);
+	    if (lsize < 1)
+		return i;
+	    }
+	/* Try ARR7 but its size must be at least 256K */
+	getMTRR(7,&lbase,&lsize,&ltype);
+	if ((lsize < 1) && (size >= 0x40000))
+	    return i;
+	}
     (void)base;
     return -1;
 }
@@ -240,20 +240,20 @@
 {
     c->flags = _MTRR_disableInt();
     if (cpuFamily != CPU_AMD || (cpuFamily == CPU_AMD && cpuType >= CPU_AMDAthlon)) {
-        switch (cpuFamily) {
-            case CPU_Intel:
-            case CPU_AMD:
-                /* Disable MTRRs, and set the default type to uncached */
-                c->cr4Val = _MTRR_saveCR4();
-                _MTRR_readMSR(INTEL_defType_MSR,&c->defTypeLo,&c->defTypeHi);
-                _MTRR_writeMSR(INTEL_defType_MSR,c->defTypeLo & 0xF300UL,c->defTypeHi);
-                break;
-            case CPU_Cyrix:
-                c->ccr3 = _MTRR_getCx86(CX86_CCR3);
-                _MTRR_setCx86(CX86_CCR3, (uchar)((c->ccr3 & 0x0F) | 0x10));
-                break;
-            }
-        }
+	switch (cpuFamily) {
+	    case CPU_Intel:
+	    case CPU_AMD:
+		/* Disable MTRRs, and set the default type to uncached */
+		c->cr4Val = _MTRR_saveCR4();
+		_MTRR_readMSR(INTEL_defType_MSR,&c->defTypeLo,&c->defTypeHi);
+		_MTRR_writeMSR(INTEL_defType_MSR,c->defTypeLo & 0xF300UL,c->defTypeHi);
+		break;
+	    case CPU_Cyrix:
+		c->ccr3 = _MTRR_getCx86(CX86_CCR3);
+		_MTRR_setCx86(CX86_CCR3, (uchar)((c->ccr3 & 0x0F) | 0x10));
+		break;
+	    }
+	}
 }
 
 /****************************************************************************
@@ -267,18 +267,18 @@
     MTRRContext *c)
 {
     if (cpuFamily != CPU_AMD || (cpuFamily == CPU_AMD && cpuType >= CPU_AMDAthlon)) {
-        PM_flushTLB();
-        switch (cpuFamily) {
-            case CPU_Intel:
-            case CPU_AMD:
-                _MTRR_writeMSR(INTEL_defType_MSR,c->defTypeLo,c->defTypeHi);
-                _MTRR_restoreCR4(c->cr4Val);
-                break;
-            case CPU_Cyrix:
-                _MTRR_setCx86(CX86_CCR3,(uchar)c->ccr3);
-                break;
-            }
-        }
+	PM_flushTLB();
+	switch (cpuFamily) {
+	    case CPU_Intel:
+	    case CPU_AMD:
+		_MTRR_writeMSR(INTEL_defType_MSR,c->defTypeLo,c->defTypeHi);
+		_MTRR_restoreCR4(c->cr4Val);
+		break;
+	    case CPU_Cyrix:
+		_MTRR_setCx86(CX86_CCR3,(uchar)c->ccr3);
+		break;
+	    }
+	}
 
     /* Re-enable interrupts (if enabled previously) */
     _MTRR_restoreInt(c->flags);
@@ -304,12 +304,12 @@
 
     _MTRR_readMSR(INTEL_physMask_MSR(reg),&maskLo,&hi);
     if ((maskLo & 0x800) == 0) {
-        /* MTRR is disabled, so it is free */
-        *base = 0;
-        *size = 0;
-        *type = 0;
-        return;
-        }
+	/* MTRR is disabled, so it is free */
+	*base = 0;
+	*size = 0;
+	*type = 0;
+	return;
+	}
     _MTRR_readMSR(INTEL_physBase_MSR(reg),&baseLo,&hi);
     maskLo = (maskLo & 0xFFFFF000UL);
     *size = ~(maskLo - 1);
@@ -338,15 +338,15 @@
 
     MTRR_beginUpdate(&c);
     if (size == 0) {
-        /* The invalid bit is kept in the mask, so we simply clear the
-         * relevant mask register to disable a range.
-         */
-        _MTRR_writeMSR(INTEL_physMask_MSR(reg),0,0);
-        }
+	/* The invalid bit is kept in the mask, so we simply clear the
+	 * relevant mask register to disable a range.
+	 */
+	_MTRR_writeMSR(INTEL_physMask_MSR(reg),0,0);
+	}
     else {
-        _MTRR_writeMSR(INTEL_physBase_MSR(reg),base | type,0);
-        _MTRR_writeMSR(INTEL_physMask_MSR(reg),~(size - 1) | 0x800,0);
-        }
+	_MTRR_writeMSR(INTEL_physBase_MSR(reg),base | type,0);
+	_MTRR_writeMSR(INTEL_physMask_MSR(reg),~(size - 1) | 0x800,0);
+	}
     MTRR_endUpdate(&c);
 }
 
@@ -386,19 +386,19 @@
     /*  Upper dword is region 1, lower is region 0  */
     _MTRR_readMSR(0xC0000085, &low, &high);
     if (reg == 1)
-        low = high;
+	low = high;
 
     /* Find the base and type for the region */
     *base = low & 0xFFFE0000;
     *type = 0;
     if (low & 1)
-        *type = PM_MTRR_UNCACHABLE;
+	*type = PM_MTRR_UNCACHABLE;
     if (low & 2)
-        *type = PM_MTRR_WRCOMB;
+	*type = PM_MTRR_WRCOMB;
     if ((low & 3) == 0) {
-        *size = 0;
-        return;
-        }
+	*size = 0;
+	return;
+	}
 
     /* This needs a little explaining. The size is stored as an
      * inverted mask of bits of 128K granularity 15 bits long offset
@@ -441,26 +441,26 @@
     MTRR_beginUpdate(&c);
     _MTRR_readMSR(0xC0000085, &low, &high);
     if (size == 0) {
-        /* Clear register to disable */
-        if (reg)
-            high = 0;
-        else
-            low = 0;
-        }
+	/* Clear register to disable */
+	if (reg)
+	    high = 0;
+	else
+	    low = 0;
+	}
     else {
-        /* Set the register to the base (already shifted for us), the
-         * type (off by one) and an inverted bitmask of the size
-         * The size is the only odd bit. We are fed say 512K
-         * We invert this and we get 111 1111 1111 1011 but
-         * if you subtract one and invert you get the desired
-         * 111 1111 1111 1100 mask
-         */
-        newVal = (((~(size-1)) >> 15) & 0x0001FFFC) | base | (type+1);
-        if (reg)
-            high = newVal;
-        else
-            low = newVal;
-        }
+	/* Set the register to the base (already shifted for us), the
+	 * type (off by one) and an inverted bitmask of the size
+	 * The size is the only odd bit. We are fed say 512K
+	 * We invert this and we get 111 1111 1111 1011 but
+	 * if you subtract one and invert you get the desired
+	 * 111 1111 1111 1100 mask
+	 */
+	newVal = (((~(size-1)) >> 15) & 0x0001FFFC) | base | (type+1);
+	if (reg)
+	    high = newVal;
+	else
+	    low = newVal;
+	}
 
     /* The writeback rule is quite specific. See the manual. Its
      * disable local interrupts, write back the cache, set the MTRR
@@ -507,29 +507,29 @@
      * Note: shift==0xF means 4G, this is unsupported.
      */
     if (shift)
-        *size = (reg < 7 ? 0x800UL : 0x20000UL) << shift;
+	*size = (reg < 7 ? 0x800UL : 0x20000UL) << shift;
     else
-        *size = 0;
+	*size = 0;
 
     /* Bit 0 is Cache Enable on ARR7, Cache Disable on ARR0-ARR6 */
     if (reg < 7) {
-        switch (rcr) {
-            case  1: *type = PM_MTRR_UNCACHABLE; break;
-            case  8: *type = PM_MTRR_WRBACK;     break;
-            case  9: *type = PM_MTRR_WRCOMB;     break;
-            case 24:
-            default: *type = PM_MTRR_WRTHROUGH;  break;
-            }
-        }
+	switch (rcr) {
+	    case  1: *type = PM_MTRR_UNCACHABLE; break;
+	    case  8: *type = PM_MTRR_WRBACK;     break;
+	    case  9: *type = PM_MTRR_WRCOMB;     break;
+	    case 24:
+	    default: *type = PM_MTRR_WRTHROUGH;  break;
+	    }
+	}
     else {
-        switch (rcr) {
-            case  0: *type = PM_MTRR_UNCACHABLE; break;
-            case  8: *type = PM_MTRR_WRCOMB;     break;
-            case  9: *type = PM_MTRR_WRBACK;     break;
-            case 25:
-            default: *type = PM_MTRR_WRTHROUGH;  break;
-            }
-        }
+	switch (rcr) {
+	    case  0: *type = PM_MTRR_UNCACHABLE; break;
+	    case  8: *type = PM_MTRR_WRCOMB;     break;
+	    case  9: *type = PM_MTRR_WRBACK;     break;
+	    case 25:
+	    default: *type = PM_MTRR_WRTHROUGH;  break;
+	    }
+	}
 }
 
 /****************************************************************************
@@ -557,23 +557,23 @@
     size >>= (reg < 7 ? 12 : 18);
     size &= 0x7FFF; /* Make sure arr_size <= 14 */
     for (arr_size = 0; size; arr_size++, size >>= 1)
-        ;
+	;
     if (reg < 7) {
-        switch (type) {
-            case PM_MTRR_UNCACHABLE:    arr_type =  1; break;
-            case PM_MTRR_WRCOMB:        arr_type =  9; break;
-            case PM_MTRR_WRTHROUGH:     arr_type = 24; break;
-            default:                    arr_type =  8; break;
-            }
-        }
+	switch (type) {
+	    case PM_MTRR_UNCACHABLE:    arr_type =  1; break;
+	    case PM_MTRR_WRCOMB:        arr_type =  9; break;
+	    case PM_MTRR_WRTHROUGH:     arr_type = 24; break;
+	    default:                    arr_type =  8; break;
+	    }
+	}
     else {
-        switch (type) {
-            case PM_MTRR_UNCACHABLE:    arr_type =  0; break;
-            case PM_MTRR_WRCOMB:        arr_type =  8; break;
-            case PM_MTRR_WRTHROUGH:     arr_type = 25; break;
-            default:                    arr_type =  9; break;
-            }
-        }
+	switch (type) {
+	    case PM_MTRR_UNCACHABLE:    arr_type =  0; break;
+	    case PM_MTRR_WRCOMB:        arr_type =  8; break;
+	    case PM_MTRR_WRTHROUGH:     arr_type = 25; break;
+	    default:                    arr_type =  9; break;
+	    }
+	}
     MTRR_beginUpdate(&c);
     _MTRR_setCx86((uchar)arr,     ((uchar*)&base)[3]);
     _MTRR_setCx86((uchar)(arr+1), ((uchar*)&base)[2]);
@@ -615,28 +615,28 @@
     ccr[5] = _MTRR_getCx86(CX86_CCR5);
     ccr[6] = _MTRR_getCx86(CX86_CCR6);
     if (ccr[3] & 1)
-        ccrc[3] = 1;
+	ccrc[3] = 1;
     else {
-        /* Disable SMM mode (bit 1), access to SMM memory (bit 2) and
-         * access to SMM memory through ARR3 (bit 7).
-         */
-        if (ccr[6] & 0x02) {
-            ccr[6] &= 0xFD;
-            ccrc[6] = 1;        /* Disable write protection of ARR3. */
-            _MTRR_setCx86(CX86_CCR6,ccr[6]);
-            }
-        }
+	/* Disable SMM mode (bit 1), access to SMM memory (bit 2) and
+	 * access to SMM memory through ARR3 (bit 7).
+	 */
+	if (ccr[6] & 0x02) {
+	    ccr[6] &= 0xFD;
+	    ccrc[6] = 1;        /* Disable write protection of ARR3. */
+	    _MTRR_setCx86(CX86_CCR6,ccr[6]);
+	    }
+	}
 
     /* If we changed CCR1 in memory, change it in the processor, too. */
     if (ccrc[1])
-        _MTRR_setCx86(CX86_CCR1,ccr[1]);
+	_MTRR_setCx86(CX86_CCR1,ccr[1]);
 
     /* Enable ARR usage by the processor */
     if (!(ccr[5] & 0x20)) {
-        ccr[5] |= 0x20;
-        ccrc[5] = 1;
-        _MTRR_setCx86(CX86_CCR5,ccr[5]);
-        }
+	ccr[5] |= 0x20;
+	ccrc[5] = 1;
+	_MTRR_setCx86(CX86_CCR5,ccr[5]);
+	}
 
     /* We are finished updating */
     MTRR_endUpdate(&c);
@@ -654,72 +654,72 @@
 
     /* Check that we have a compatible CPU */
     if (numMTRR == -1) {
-        numMTRR = 0;
-        if (!_MTRR_isRing0())
-            return;
-        cpu = CPU_getProcessorType();
-        cpuFamily = cpu & CPU_familyMask;
-        cpuType = cpu & CPU_mask;
-        cpuStepping = (cpu & CPU_steppingMask) >> CPU_steppingShift;
-        switch (cpuFamily) {
-            case CPU_Intel:
-                /* Intel Pentium Pro and later support the MTRR registers */
-                if (cpuType < CPU_PentiumPro)
-                    return;
-                _MTRR_readMSR(INTEL_cap_MSR,&eax,&edx);
-                numMTRR = eax & 0xFF;
-                getMTRR = INTEL_getMTRR;
-                setMTRR = INTEL_setMTRR;
-                getFreeRegion = GENERIC_getFreeRegion;
-                INTEL_disableBankedWriteCombine();
-                break;
-            case CPU_AMD:
-                /* AMD K6-2 and later support the MTRR registers */
-                if ((cpuType < CPU_AMDK6_2) || (cpuType == CPU_AMDK6_2 && cpuStepping < 8))
-                    return;
-                if (cpuType < CPU_AMDAthlon) {
-                    numMTRR = 2;        /* AMD CPU's have 2 MTRR's */
-                    getMTRR = AMD_getMTRR;
-                    setMTRR = AMD_setMTRR;
-                    getFreeRegion = AMDK6_getFreeRegion;
+	numMTRR = 0;
+	if (!_MTRR_isRing0())
+	    return;
+	cpu = CPU_getProcessorType();
+	cpuFamily = cpu & CPU_familyMask;
+	cpuType = cpu & CPU_mask;
+	cpuStepping = (cpu & CPU_steppingMask) >> CPU_steppingShift;
+	switch (cpuFamily) {
+	    case CPU_Intel:
+		/* Intel Pentium Pro and later support the MTRR registers */
+		if (cpuType < CPU_PentiumPro)
+		    return;
+		_MTRR_readMSR(INTEL_cap_MSR,&eax,&edx);
+		numMTRR = eax & 0xFF;
+		getMTRR = INTEL_getMTRR;
+		setMTRR = INTEL_setMTRR;
+		getFreeRegion = GENERIC_getFreeRegion;
+		INTEL_disableBankedWriteCombine();
+		break;
+	    case CPU_AMD:
+		/* AMD K6-2 and later support the MTRR registers */
+		if ((cpuType < CPU_AMDK6_2) || (cpuType == CPU_AMDK6_2 && cpuStepping < 8))
+		    return;
+		if (cpuType < CPU_AMDAthlon) {
+		    numMTRR = 2;        /* AMD CPU's have 2 MTRR's */
+		    getMTRR = AMD_getMTRR;
+		    setMTRR = AMD_setMTRR;
+		    getFreeRegion = AMDK6_getFreeRegion;
 
-                    /* For some reason some IBM systems with K6-2 processors
-                     * have write combined enabled for the system BIOS
-                     * region from 0xE0000 to 0xFFFFFF. We need *both* MTRR's
-                     * for our own graphics drivers, so if we detect any
-                     * regions below the 1Meg boundary, we remove them
-                     * so we can use this MTRR register ourselves.
-                     */
-                    for (i = 0; i < numMTRR; i++) {
-                        getMTRR(i,&lbase,&lsize,&ltype);
-                        if (lbase < 0x100000)
-                            setMTRR(i,0,0,0);
-                        }
-                    }
-                else {
-                    /* AMD Athlon uses P6 style MTRR's */
-                    _MTRR_readMSR(INTEL_cap_MSR,&eax,&edx);
-                    numMTRR = eax & 0xFF;
-                    getMTRR = INTEL_getMTRR;
-                    setMTRR = INTEL_setMTRR;
-                    getFreeRegion = GENERIC_getFreeRegion;
-                    INTEL_disableBankedWriteCombine();
-                    }
-                break;
-            case CPU_Cyrix:
-                /* Cyrix 6x86 and later support the MTRR registers */
-                if (cpuType < CPU_Cyrix6x86 || cpuType >= CPU_CyrixMediaGX)
-                    return;
-                numMTRR = 8;        /* Cyrix CPU's have 8 ARR's */
-                getMTRR = CYRIX_getMTRR;
-                setMTRR = CYRIX_setMTRR;
-                getFreeRegion = CYRIX_getFreeRegion;
-                CYRIX_initARR();
-                break;
-            default:
-                return;
-            }
-        }
+		    /* For some reason some IBM systems with K6-2 processors
+		     * have write combined enabled for the system BIOS
+		     * region from 0xE0000 to 0xFFFFFF. We need *both* MTRR's
+		     * for our own graphics drivers, so if we detect any
+		     * regions below the 1Meg boundary, we remove them
+		     * so we can use this MTRR register ourselves.
+		     */
+		    for (i = 0; i < numMTRR; i++) {
+			getMTRR(i,&lbase,&lsize,&ltype);
+			if (lbase < 0x100000)
+			    setMTRR(i,0,0,0);
+			}
+		    }
+		else {
+		    /* AMD Athlon uses P6 style MTRR's */
+		    _MTRR_readMSR(INTEL_cap_MSR,&eax,&edx);
+		    numMTRR = eax & 0xFF;
+		    getMTRR = INTEL_getMTRR;
+		    setMTRR = INTEL_setMTRR;
+		    getFreeRegion = GENERIC_getFreeRegion;
+		    INTEL_disableBankedWriteCombine();
+		    }
+		break;
+	    case CPU_Cyrix:
+		/* Cyrix 6x86 and later support the MTRR registers */
+		if (cpuType < CPU_Cyrix6x86 || cpuType >= CPU_CyrixMediaGX)
+		    return;
+		numMTRR = 8;        /* Cyrix CPU's have 8 ARR's */
+		getMTRR = CYRIX_getMTRR;
+		setMTRR = CYRIX_setMTRR;
+		getFreeRegion = CYRIX_getFreeRegion;
+		CYRIX_initARR();
+		break;
+	    default:
+		return;
+	    }
+	}
 }
 
 /****************************************************************************
@@ -745,93 +745,93 @@
 
     /* Check that we have a CPU that supports MTRR's and type is valid */
     if (numMTRR <= 0) {
-        if (!_MTRR_isRing0())
-            return PM_MTRR_ERR_NO_OS_SUPPORT;
-        return PM_MTRR_NOT_SUPPORTED;
-        }
+	if (!_MTRR_isRing0())
+	    return PM_MTRR_ERR_NO_OS_SUPPORT;
+	return PM_MTRR_NOT_SUPPORTED;
+	}
     if (type >= PM_MTRR_MAX)
-        return PM_MTRR_ERR_PARAMS;
+	return PM_MTRR_ERR_PARAMS;
 
     /* If the type is WC, check that this processor supports it */
     if (!MTRR_haveWriteCombine())
-        return PM_MTRR_ERR_NOWRCOMB;
+	return PM_MTRR_ERR_NOWRCOMB;
 
     /* Adjust the boundaries depending on the CPU type */
     switch (cpuFamily) {
-        case CPU_AMD:
-            if (cpuType < CPU_AMDAthlon) {
-                /* Apply the K6 block alignment and size rules. In order:
-                 *  o Uncached or gathering only
-                 *  o 128K or bigger block
-                 *  o Power of 2 block
-                 *  o base suitably aligned to the power
-                 */
-                if (type > PM_MTRR_WRCOMB && (size < (1 << 17) || (size & ~(size-1))-size || (base & (size-1))))
-                    return PM_MTRR_ERR_NOT_ALIGNED;
-                break;
-                }
-            /* Fall through for AMD Athlon which uses P6 style MTRR's */
-        case CPU_Intel:
-        case CPU_Cyrix:
-            if ((base & 0xFFF) || (size & 0xFFF)) {
-                /* Base and size must be multiples of 4Kb */
-                return PM_MTRR_ERR_NOT_4KB_ALIGNED;
-                }
-            if (base < 0x100000) {
-                /* Base must be >= 1Mb */
-                return PM_MTRR_ERR_BELOW_1MB;
-                }
+	case CPU_AMD:
+	    if (cpuType < CPU_AMDAthlon) {
+		/* Apply the K6 block alignment and size rules. In order:
+		 *  o Uncached or gathering only
+		 *  o 128K or bigger block
+		 *  o Power of 2 block
+		 *  o base suitably aligned to the power
+		 */
+		if (type > PM_MTRR_WRCOMB && (size < (1 << 17) || (size & ~(size-1))-size || (base & (size-1))))
+		    return PM_MTRR_ERR_NOT_ALIGNED;
+		break;
+		}
+	    /* Fall through for AMD Athlon which uses P6 style MTRR's */
+	case CPU_Intel:
+	case CPU_Cyrix:
+	    if ((base & 0xFFF) || (size & 0xFFF)) {
+		/* Base and size must be multiples of 4Kb */
+		return PM_MTRR_ERR_NOT_4KB_ALIGNED;
+		}
+	    if (base < 0x100000) {
+		/* Base must be >= 1Mb */
+		return PM_MTRR_ERR_BELOW_1MB;
+		}
 
-            /* Check upper bits of base and last are equal and lower bits
-             * are 0 for base and 1 for last
-             */
-            last = base + size - 1;
-            for (lbase = base; !(lbase & 1) && (last & 1); lbase = lbase >> 1, last = last >> 1)
-                ;
-            if (lbase != last) {
-                /* Base is not aligned on the correct boundary */
-                return PM_MTRR_ERR_NOT_ALIGNED;
-                }
-            break;
-        default:
-            return PM_MTRR_NOT_SUPPORTED;
-        }
+	    /* Check upper bits of base and last are equal and lower bits
+	     * are 0 for base and 1 for last
+	     */
+	    last = base + size - 1;
+	    for (lbase = base; !(lbase & 1) && (last & 1); lbase = lbase >> 1, last = last >> 1)
+		;
+	    if (lbase != last) {
+		/* Base is not aligned on the correct boundary */
+		return PM_MTRR_ERR_NOT_ALIGNED;
+		}
+	    break;
+	default:
+	    return PM_MTRR_NOT_SUPPORTED;
+	}
 
     /* Search for existing MTRR */
     for (i = 0; i < numMTRR; ++i) {
-        getMTRR(i,&lbase,&lsize,&ltype);
-        if (lbase == 0 && lsize == 0)
-            continue;
-        if (base > lbase + (lsize-1))
-            continue;
-        if ((base < lbase) && (base+size-1 < lbase))
-            continue;
+	getMTRR(i,&lbase,&lsize,&ltype);
+	if (lbase == 0 && lsize == 0)
+	    continue;
+	if (base > lbase + (lsize-1))
+	    continue;
+	if ((base < lbase) && (base+size-1 < lbase))
+	    continue;
 
-        /* Check that we don't overlap an existing region */
-        if (type != PM_MTRR_UNCACHABLE) {
-            if ((base < lbase) || (base+size-1 > lbase+lsize-1))
-                return PM_MTRR_ERR_OVERLAP;
-            }
-        else if (base == lbase && size == lsize) {
-            /* The region already exists so leave it alone */
-            return PM_MTRR_ERR_OK;
-            }
+	/* Check that we don't overlap an existing region */
+	if (type != PM_MTRR_UNCACHABLE) {
+	    if ((base < lbase) || (base+size-1 > lbase+lsize-1))
+		return PM_MTRR_ERR_OVERLAP;
+	    }
+	else if (base == lbase && size == lsize) {
+	    /* The region already exists so leave it alone */
+	    return PM_MTRR_ERR_OK;
+	    }
 
-        /* New region is enclosed by an existing region, so only allow
-         * a new type to be created if we are setting a region to be
-         * uncacheable (such as MMIO registers within a framebuffer).
-         */
-        if (ltype != (int)type) {
-            if (type == PM_MTRR_UNCACHABLE)
-                continue;
-            return PM_MTRR_ERR_TYPE_MISMATCH;
-            }
-        return PM_MTRR_ERR_OK;
-        }
+	/* New region is enclosed by an existing region, so only allow
+	 * a new type to be created if we are setting a region to be
+	 * uncacheable (such as MMIO registers within a framebuffer).
+	 */
+	if (ltype != (int)type) {
+	    if (type == PM_MTRR_UNCACHABLE)
+		continue;
+	    return PM_MTRR_ERR_TYPE_MISMATCH;
+	    }
+	return PM_MTRR_ERR_OK;
+	}
 
     /* Search for an empty MTRR */
     if ((i = getFreeRegion(base,size)) < 0)
-        return PM_MTRR_ERR_NONE_FREE;
+	return PM_MTRR_ERR_NONE_FREE;
     setMTRR(i,base,size,type);
     return PM_MTRR_ERR_OK;
 }
@@ -852,16 +852,16 @@
 
     /* Check that we have a CPU that supports MTRR's and type is valid */
     if (numMTRR <= 0) {
-        if (!_MTRR_isRing0())
-            return PM_MTRR_ERR_NO_OS_SUPPORT;
-        return PM_MTRR_NOT_SUPPORTED;
-        }
+	if (!_MTRR_isRing0())
+	    return PM_MTRR_ERR_NO_OS_SUPPORT;
+	return PM_MTRR_NOT_SUPPORTED;
+	}
 
     /* Enumerate all existing MTRR's */
     for (i = 0; i < numMTRR; ++i) {
-        getMTRR(i,&lbase,&lsize,&ltype);
-        callback(lbase,lsize,ltype);
-        }
+	getMTRR(i,&lbase,&lsize,&ltype);
+	callback(lbase,lsize,ltype);
+	}
     return PM_MTRR_ERR_OK;
 }
 #endif

diff --git a/board/MAI/bios_emulator/scitech/src/pm/common/pcilib.c b/board/MAI/bios_emulator/scitech/src/pm/common/pcilib.c
index 8dd6dd1..1d542fc 100644
--- a/board/MAI/bios_emulator/scitech/src/pm/common/pcilib.c
+++ b/board/MAI/bios_emulator/scitech/src/pm/common/pcilib.c

@@ -67,13 +67,13 @@
 
 typedef union {
     struct {
-        ulong signature;        /* _32_                                 */
-        ulong entry;            /* 32 bit physical address              */
-        uchar revision;         /* Revision level, 0                    */
-        uchar length;           /* Length in paragraphs should be 01    */
-        uchar checksum;         /* All bytes must add up to zero        */
-        uchar reserved[5];      /* Must be zero                         */
-        } fields;
+	ulong signature;        /* _32_                                 */
+	ulong entry;            /* 32 bit physical address              */
+	uchar revision;         /* Revision level, 0                    */
+	uchar length;           /* Length in paragraphs should be 01    */
+	uchar checksum;         /* All bytes must add up to zero        */
+	uchar reserved[5];      /* Must be zero                         */
+	} fields;
     char chars[16];
     } PCI_bios32;
 
@@ -143,54 +143,54 @@
 
     /* Bail if we have already detected no BIOS is present */
     if (PCIBIOSVersion == 0)
-        return 0;
+	return 0;
 
     /* First scan the memory from 0xE0000 to 0xFFFFF looking for the
      * BIOS32 service directory, so we can determine if we can call it
      * from 32-bit protected mode.
      */
     if (PCIBIOSVersion == -1) {
-        PCIBIOSVersion = 0;
-        BIOSImage = PM_mapPhysicalAddr(0xE0000,BIOS_LIMIT,false);
-        if (!BIOSImage)
-            return 0;
-        BIOSEnd = BIOSImage + 0x20000;
-        for (BIOSDir = (PCI_bios32*)BIOSImage; BIOSDir < (PCI_bios32*)BIOSEnd; BIOSDir++) {
-            uchar   sum;
-            int     i,length;
+	PCIBIOSVersion = 0;
+	BIOSImage = PM_mapPhysicalAddr(0xE0000,BIOS_LIMIT,false);
+	if (!BIOSImage)
+	    return 0;
+	BIOSEnd = BIOSImage + 0x20000;
+	for (BIOSDir = (PCI_bios32*)BIOSImage; BIOSDir < (PCI_bios32*)BIOSEnd; BIOSDir++) {
+	    uchar   sum;
+	    int     i,length;
 
-            if (BIOSDir->fields.signature != BIOS32_SIGNATURE)
-                continue;
-            length = BIOSDir->fields.length * 16;
-            if (!length)
-                continue;
-            for (sum = i = 0; i < length ; i++)
-                sum += BIOSDir->chars[i];
-            if (sum != 0)
-                continue;
-            BIOSEntry.address = (ulong)BIOSImage + (BIOSDir->fields.entry - 0xE0000);
-            BIOSEntry.segment = _PCI_getCS();
-            break;
-            }
+	    if (BIOSDir->fields.signature != BIOS32_SIGNATURE)
+		continue;
+	    length = BIOSDir->fields.length * 16;
+	    if (!length)
+		continue;
+	    for (sum = i = 0; i < length ; i++)
+		sum += BIOSDir->chars[i];
+	    if (sum != 0)
+		continue;
+	    BIOSEntry.address = (ulong)BIOSImage + (BIOSDir->fields.entry - 0xE0000);
+	    BIOSEntry.segment = _PCI_getCS();
+	    break;
+	    }
 
-        /* If we found the BIOS32 directory, call it to get the address of the
-         * PCI services.
-         */
-        if (BIOSEntry.address == 0)
-            return 0;
-        if (_BIOS32_service(PCI_SERVICE,0,&physBase,&length,&offset,BIOSEntry) != 0)
-            return 0;
-        PCIPhysEntry = physBase + offset;
-        PCIEntry.address = (ulong)BIOSImage + (PCIPhysEntry - 0xE0000);
-        PCIEntry.segment = _PCI_getCS();
-        }
+	/* If we found the BIOS32 directory, call it to get the address of the
+	 * PCI services.
+	 */
+	if (BIOSEntry.address == 0)
+	    return 0;
+	if (_BIOS32_service(PCI_SERVICE,0,&physBase,&length,&offset,BIOSEntry) != 0)
+	    return 0;
+	PCIPhysEntry = physBase + offset;
+	PCIEntry.address = (ulong)BIOSImage + (PCIPhysEntry - 0xE0000);
+	PCIEntry.segment = _PCI_getCS();
+	}
 #endif
     /* We found the BIOS entry, so now do the version check */
     version = _PCIBIOS_isPresent(PCI_BIOS_PRESENT,&signature,&stat,lastBus,PCIEntry);
     if (version > 0 && ((stat >> 8) == 0) && signature == PCI_SIGNATURE) {
-        *hwType = stat & 0xFF;
-        return PCIBIOSVersion = version;
-        }
+	*hwType = stat & 0xFF;
+	return PCIBIOSVersion = version;
+	}
     return 0;
 }
 
@@ -215,16 +215,16 @@
 {
     /* Ignore devices with a vendor ID of 0 */
     if (info->VendorID == 0)
-        return true;
+	return true;
 
     /* NOTE: We only check against the current device on
      *       the bus to ensure that we do not exclude
      *       multiple controllers of the same device ID.
      */
     if (info->slot.p.Bus == prev->slot.p.Bus &&
-        info->slot.p.Device == prev->slot.p.Device &&
-        info->DeviceID == prev->DeviceID)
-        return true;
+	info->slot.p.Device == prev->slot.p.Device &&
+	info->DeviceID == prev->DeviceID)
+	return true;
     return false;
 }
 
@@ -253,41 +253,41 @@
     tmp = PM_inpd(0xCF8);
     PM_outpd(0xCF8,slot.i);
     if ((PM_inpd(0xCF8) == slot.i) && (PM_inpd(0xCFC) != 0xFFFFFFFFUL)) {
-        /* PCI access mechanism 1 - the preferred mechanism */
-        for (bus = 0; bus < 8; bus++) {
-            slot.p.Bus = bus;
-            for (device = 0; device < 32; device++) {
-                slot.p.Device = device;
-                for (function = 0; function < 8; function++) {
-                    slot.p.Function = function;
-                    slot.p.Register = 0;
-                    PM_outpd(0xCF8,slot.i);
-                    if (PM_inpd(0xCFC) != 0xFFFFFFFFUL) {
-                        memset(&pci,0,sizeof(pci));
-                        pci.dwSize = sizeof(pci);
-                        pci.mech1 = 1;
-                        pci.slot = slot;
-                        lp = (ulong*)&(pci.VendorID);
-                        for (i = 0; i < NUM_PCI_REG; i++, lp++) {
-                            slot.p.Register = i;
-                            PM_outpd(0xCF8,slot.i);
-                            *lp = PM_inpd(0xCFC);
-                            }
-                        if (!CheckDuplicate(&pci,&prev)) {
-                            if (info)
-                                COPY_STRUCTURE(&info[numFound],&pci);
-                            ++numFound;
-                            }
-                        prev = pci;
-                        }
-                    }
-                }
-            }
+	/* PCI access mechanism 1 - the preferred mechanism */
+	for (bus = 0; bus < 8; bus++) {
+	    slot.p.Bus = bus;
+	    for (device = 0; device < 32; device++) {
+		slot.p.Device = device;
+		for (function = 0; function < 8; function++) {
+		    slot.p.Function = function;
+		    slot.p.Register = 0;
+		    PM_outpd(0xCF8,slot.i);
+		    if (PM_inpd(0xCFC) != 0xFFFFFFFFUL) {
+			memset(&pci,0,sizeof(pci));
+			pci.dwSize = sizeof(pci);
+			pci.mech1 = 1;
+			pci.slot = slot;
+			lp = (ulong*)&(pci.VendorID);
+			for (i = 0; i < NUM_PCI_REG; i++, lp++) {
+			    slot.p.Register = i;
+			    PM_outpd(0xCF8,slot.i);
+			    *lp = PM_inpd(0xCFC);
+			    }
+			if (!CheckDuplicate(&pci,&prev)) {
+			    if (info)
+				COPY_STRUCTURE(&info[numFound],&pci);
+			    ++numFound;
+			    }
+			prev = pci;
+			}
+		    }
+		}
+	    }
 
-        /* Disable PCI config cycle on exit */
-        PM_outpd(0xCF8,0);
-        return numFound;
-        }
+	/* Disable PCI config cycle on exit */
+	PM_outpd(0xCF8,0);
+	return numFound;
+	}
     PM_outpd(0xCF8,tmp);
 
     /* No hardware access mechanism 1 found */
@@ -320,42 +320,42 @@
     PM_outpb(0xCF8,0x00);
     PM_outpb(0xCFA,0x00);
     if (PM_inpb(0xCF8) == 0x00 && PM_inpb(0xCFB) == 0x00) {
-        /* PCI access mechanism 2 - the older mechanism for legacy busses */
-        for (bus = 0; bus < 2; bus++) {
-            slot.p.Bus = bus;
-            PM_outpb(0xCFA,(uchar)bus);
-            for (device = 0; device < 16; device++) {
-                slot.p.Device = device;
-                deviceIO = 0xC000 + (device << 8);
-                for (function = 0; function < 8; function++) {
-                    slot.p.Function = function;
-                    slot.p.Register = 0;
-                    PM_outpb(0xCF8,(uchar)((function << 1) | 0x10));
-                    if (PM_inpd(deviceIO) != 0xFFFFFFFFUL) {
-                        memset(&pci,0,sizeof(pci));
-                        pci.dwSize = sizeof(pci);
-                        pci.mech1 = 0;
-                        pci.slot = slot;
-                        lp = (ulong*)&(pci.VendorID);
-                        for (i = 0; i < NUM_PCI_REG; i++, lp++) {
-                            slot.p.Register = i;
-                            *lp = PM_inpd(deviceIO + (i << 2));
-                            }
-                        if (!CheckDuplicate(&pci,&prev)) {
-                            if (info)
-                                COPY_STRUCTURE(&info[numFound],&pci);
-                            ++numFound;
-                            }
-                        prev = pci;
-                        }
-                    }
-                }
-            }
+	/* PCI access mechanism 2 - the older mechanism for legacy busses */
+	for (bus = 0; bus < 2; bus++) {
+	    slot.p.Bus = bus;
+	    PM_outpb(0xCFA,(uchar)bus);
+	    for (device = 0; device < 16; device++) {
+		slot.p.Device = device;
+		deviceIO = 0xC000 + (device << 8);
+		for (function = 0; function < 8; function++) {
+		    slot.p.Function = function;
+		    slot.p.Register = 0;
+		    PM_outpb(0xCF8,(uchar)((function << 1) | 0x10));
+		    if (PM_inpd(deviceIO) != 0xFFFFFFFFUL) {
+			memset(&pci,0,sizeof(pci));
+			pci.dwSize = sizeof(pci);
+			pci.mech1 = 0;
+			pci.slot = slot;
+			lp = (ulong*)&(pci.VendorID);
+			for (i = 0; i < NUM_PCI_REG; i++, lp++) {
+			    slot.p.Register = i;
+			    *lp = PM_inpd(deviceIO + (i << 2));
+			    }
+			if (!CheckDuplicate(&pci,&prev)) {
+			    if (info)
+				COPY_STRUCTURE(&info[numFound],&pci);
+			    ++numFound;
+			    }
+			prev = pci;
+			}
+		    }
+		}
+	    }
 
-        /* Disable PCI config cycle on exit */
-        PM_outpb(0xCF8,0);
-        return numFound;
-        }
+	/* Disable PCI config cycle on exit */
+	PM_outpb(0xCF8,0);
+	return numFound;
+	}
 
     /* No hardware access mechanism 2 found */
     return 0;
@@ -394,32 +394,32 @@
     PCIDeviceInfo   pci,prev = {0};
 
     if (PCIBIOS_detect(&hwType,&lastBus)) {
-        /* PCI BIOS access - the ultimate fallback */
-        for (bus = 0; bus <= lastBus; bus++) {
-            slot.p.Bus = bus;
-            for (device = 0; device < 32; device++) {
-                slot.p.Device = device;
-                for (function = 0; function < 8; function++) {
-                    slot.p.Function = function;
-                    if (PCIBIOS_readDWORD(0,slot.i) != 0xFFFFFFFFUL) {
-                        memset(&pci,0,sizeof(pci));
-                        pci.dwSize = sizeof(pci);
-                        pci.mech1 = 2;
-                        pci.slot = slot;
-                        lp = (ulong*)&(pci.VendorID);
-                        for (i = 0; i < NUM_PCI_REG; i++, lp++)
-                            *lp = PCIBIOS_readDWORD(i << 2,slot.i);
-                        if (!CheckDuplicate(&pci,&prev)) {
-                            if (info)
-                                COPY_STRUCTURE(&info[numFound],&pci);
-                            ++numFound;
-                            }
-                        prev = pci;
-                        }
-                    }
-                }
-            }
-        }
+	/* PCI BIOS access - the ultimate fallback */
+	for (bus = 0; bus <= lastBus; bus++) {
+	    slot.p.Bus = bus;
+	    for (device = 0; device < 32; device++) {
+		slot.p.Device = device;
+		for (function = 0; function < 8; function++) {
+		    slot.p.Function = function;
+		    if (PCIBIOS_readDWORD(0,slot.i) != 0xFFFFFFFFUL) {
+			memset(&pci,0,sizeof(pci));
+			pci.dwSize = sizeof(pci);
+			pci.mech1 = 2;
+			pci.slot = slot;
+			lp = (ulong*)&(pci.VendorID);
+			for (i = 0; i < NUM_PCI_REG; i++, lp++)
+			    *lp = PCIBIOS_readDWORD(i << 2,slot.i);
+			if (!CheckDuplicate(&pci,&prev)) {
+			    if (info)
+				COPY_STRUCTURE(&info[numFound],&pci);
+			    ++numFound;
+			    }
+			prev = pci;
+			}
+		    }
+		}
+	    }
+	}
 
     /* Return number of devices found */
     return numFound;
@@ -447,11 +447,11 @@
      * stuff we can't do directly.
      */
     if ((numFound = PCI_enumerateMech1(info)) == 0) {
-        if ((numFound = PCI_enumerateMech2(info)) == 0) {
-            if ((numFound = PCI_enumerateBIOS(info)) == 0)
-                return 0;
-            }
-        }
+	if ((numFound = PCI_enumerateMech2(info)) == 0) {
+	    if ((numFound = PCI_enumerateBIOS(info)) == 0)
+		return 0;
+	    }
+	}
     return numFound;
 }
 
@@ -493,22 +493,22 @@
 
     base = PCI_accessReg(bar,0,PCI_READ_DWORD,pci);
     if (base && !(base & 0x1)) {
-        /* For some strange reason some devices don't properly decode
-         * their base address registers (Intel PCI/PCI bridges!), and
-         * we read completely bogus values. We check for that here
-         * and clear out those BAR's.
-         *
-         * We check for that here because at least the low 12 bits
-         * of the address range must be zeros, since the page size
-         * on IA32 processors is always 4Kb.
-         */
-        if ((base & 0xFFF) == 0) {
-            PCI_accessReg(bar,0xFFFFFFFF,PCI_WRITE_DWORD,pci);
-            size = PCI_accessReg(bar,0,PCI_READ_DWORD,pci) & ~0xFF;
-            size = ~size+1;
-            PCI_accessReg(bar,base,PCI_WRITE_DWORD,pci);
-            }
-        }
+	/* For some strange reason some devices don't properly decode
+	 * their base address registers (Intel PCI/PCI bridges!), and
+	 * we read completely bogus values. We check for that here
+	 * and clear out those BAR's.
+	 *
+	 * We check for that here because at least the low 12 bits
+	 * of the address range must be zeros, since the page size
+	 * on IA32 processors is always 4Kb.
+	 */
+	if ((base & 0xFFF) == 0) {
+	    PCI_accessReg(bar,0xFFFFFFFF,PCI_WRITE_DWORD,pci);
+	    size = PCI_accessReg(bar,0,PCI_READ_DWORD,pci) & ~0xFF;
+	    size = ~size+1;
+	    PCI_accessReg(bar,base,PCI_WRITE_DWORD,pci);
+	    }
+	}
     pci->slot.p.Register = 0;
     return size;
 }
@@ -542,49 +542,49 @@
     int iobase;
 
     if (info->mech1 == 2) {
-        /* Use PCI BIOS access since we dont have direct hardware access */
-        switch (func) {
-            case PCI_READ_BYTE:
-                return (uchar)_PCIBIOS_service(READ_CONFIG_BYTE,info->slot.i >> 8,index,0,PCIEntry);
-            case PCI_READ_WORD:
-                return (ushort)_PCIBIOS_service(READ_CONFIG_WORD,info->slot.i >> 8,index,0,PCIEntry);
-            case PCI_READ_DWORD:
-                return (ulong)_PCIBIOS_service(READ_CONFIG_DWORD,info->slot.i >> 8,index,0,PCIEntry);
-            case PCI_WRITE_BYTE:
-                _PCIBIOS_service(WRITE_CONFIG_BYTE,info->slot.i >> 8,index,value,PCIEntry);
-                break;
-            case PCI_WRITE_WORD:
-                _PCIBIOS_service(WRITE_CONFIG_WORD,info->slot.i >> 8,index,value,PCIEntry);
-                break;
-            case PCI_WRITE_DWORD:
-                _PCIBIOS_service(WRITE_CONFIG_DWORD,info->slot.i >> 8,index,value,PCIEntry);
-                break;
-            }
-        }
+	/* Use PCI BIOS access since we dont have direct hardware access */
+	switch (func) {
+	    case PCI_READ_BYTE:
+		return (uchar)_PCIBIOS_service(READ_CONFIG_BYTE,info->slot.i >> 8,index,0,PCIEntry);
+	    case PCI_READ_WORD:
+		return (ushort)_PCIBIOS_service(READ_CONFIG_WORD,info->slot.i >> 8,index,0,PCIEntry);
+	    case PCI_READ_DWORD:
+		return (ulong)_PCIBIOS_service(READ_CONFIG_DWORD,info->slot.i >> 8,index,0,PCIEntry);
+	    case PCI_WRITE_BYTE:
+		_PCIBIOS_service(WRITE_CONFIG_BYTE,info->slot.i >> 8,index,value,PCIEntry);
+		break;
+	    case PCI_WRITE_WORD:
+		_PCIBIOS_service(WRITE_CONFIG_WORD,info->slot.i >> 8,index,value,PCIEntry);
+		break;
+	    case PCI_WRITE_DWORD:
+		_PCIBIOS_service(WRITE_CONFIG_DWORD,info->slot.i >> 8,index,value,PCIEntry);
+		break;
+	    }
+	}
     else {
-        /* Use direct hardware access mechanisms */
-        if (info->mech1) {
-            /* PCI access mechanism 1 */
-            iobase = 0xCFC + (index & 3);
-            info->slot.p.Register = index >> 2;
-            PM_outpd(0xCF8,info->slot.i);
-            }
-        else {
-            /* PCI access mechanism 2 */
-            PM_outpb(0xCF8,(uchar)((info->slot.p.Function << 1) | 0x10));
-            PM_outpb(0xCFA,(uchar)info->slot.p.Bus);
-            iobase = 0xC000 + (info->slot.p.Device << 8) + index;
-            }
-        switch (func) {
-            case PCI_READ_BYTE:
-            case PCI_READ_WORD:
-            case PCI_READ_DWORD:    value = PM_inpd(iobase);        break;
-            case PCI_WRITE_BYTE:    PM_outpb(iobase,(uchar)value);  break;
-            case PCI_WRITE_WORD:    PM_outpw(iobase,(ushort)value); break;
-            case PCI_WRITE_DWORD:   PM_outpd(iobase,(ulong)value);  break;
-            }
-        PM_outpd(0xCF8,0);
-        }
+	/* Use direct hardware access mechanisms */
+	if (info->mech1) {
+	    /* PCI access mechanism 1 */
+	    iobase = 0xCFC + (index & 3);
+	    info->slot.p.Register = index >> 2;
+	    PM_outpd(0xCF8,info->slot.i);
+	    }
+	else {
+	    /* PCI access mechanism 2 */
+	    PM_outpb(0xCF8,(uchar)((info->slot.p.Function << 1) | 0x10));
+	    PM_outpb(0xCFA,(uchar)info->slot.p.Bus);
+	    iobase = 0xC000 + (info->slot.p.Device << 8) + index;
+	    }
+	switch (func) {
+	    case PCI_READ_BYTE:
+	    case PCI_READ_WORD:
+	    case PCI_READ_DWORD:    value = PM_inpd(iobase);        break;
+	    case PCI_WRITE_BYTE:    PM_outpb(iobase,(uchar)value);  break;
+	    case PCI_WRITE_WORD:    PM_outpw(iobase,(ushort)value); break;
+	    case PCI_WRITE_DWORD:   PM_outpd(iobase,(ulong)value);  break;
+	    }
+	PM_outpd(0xCF8,0);
+	}
     return value;
 }
 
@@ -608,14 +608,14 @@
     int                     ret;
 
     if (PCIPhysEntry) {
-        buf.BufferSize = numDevices * sizeof(PCIRouteInfo);
-        buf.DataBuffer = buffer;
-        if ((ret = _PCIBIOS_getRouting(&buf,PCIEntry)) == 0x89)
-            return buf.BufferSize / sizeof(PCIRouteInfo);
-        if (ret != 0)
-            return -1;
-        return 0;
-        }
+	buf.BufferSize = numDevices * sizeof(PCIRouteInfo);
+	buf.DataBuffer = buffer;
+	if ((ret = _PCIBIOS_getRouting(&buf,PCIEntry)) == 0x89)
+	    return buf.BufferSize / sizeof(PCIRouteInfo);
+	if (ret != 0)
+	    return -1;
+	return 0;
+	}
 
     /* We currently only support this via the PCI BIOS functions */
     return -1;
@@ -642,13 +642,13 @@
     uint IRQ)
 {
     if (PCIPhysEntry) {
-        if (_PCIBIOS_setIRQ(info->slot.i >> 8,intPin,IRQ,PCIEntry)) {
-            info->u.type0.InterruptPin = intPin;
-            info->u.type0.InterruptLine = IRQ;
-            return true;
-            }
-        return false;
-        }
+	if (_PCIBIOS_setIRQ(info->slot.i >> 8,intPin,IRQ,PCIEntry)) {
+	    info->u.type0.InterruptPin = intPin;
+	    info->u.type0.InterruptLine = IRQ;
+	    return true;
+	    }
+	return false;
+	}
 
     /* We currently only support this via the PCI BIOS functions */
     return false;
@@ -668,7 +668,7 @@
     ulong specialCycleData)
 {
     if (PCIPhysEntry)
-        _PCIBIOS_specialCycle(bus,specialCycleData,PCIEntry);
+	_PCIBIOS_specialCycle(bus,specialCycleData,PCIEntry);
     /* We currently only support this via the PCI BIOS functions */
 }
 
@@ -699,14 +699,14 @@
     int     endCount = count - middleCount * 4 - startCount;
 
     for (i = 0,pb = dst; i < startCount; i++, index++) {
-        *pb++ = (uchar)PCI_accessReg(index,0,PCI_READ_BYTE,info);
-        }
+	*pb++ = (uchar)PCI_accessReg(index,0,PCI_READ_BYTE,info);
+	}
     for (i = 0,pd = (ulong*)pb; i < middleCount; i++, index += 4) {
-        *pd++ = (ulong)PCI_accessReg(index,0,PCI_READ_DWORD,info);
-        }
+	*pd++ = (ulong)PCI_accessReg(index,0,PCI_READ_DWORD,info);
+	}
     for (i = 0,pb = (uchar*)pd; i < endCount; i++, index++) {
-        *pb++ = (uchar)PCI_accessReg(index,0,PCI_READ_BYTE,info);
-        }
+	*pb++ = (uchar)PCI_accessReg(index,0,PCI_READ_BYTE,info);
+	}
 }
 
 /****************************************************************************
@@ -736,12 +736,12 @@
     int     endCount = count - middleCount * 4 - startCount;
 
     for (i = 0,pb = src; i < startCount; i++, index++) {
-        PCI_accessReg(index,*pb++,PCI_WRITE_BYTE,info);
-        }
+	PCI_accessReg(index,*pb++,PCI_WRITE_BYTE,info);
+	}
     for (i = 0,pd = (ulong*)pb; i < middleCount; i++, index += 4) {
-        PCI_accessReg(index,*pd++,PCI_WRITE_DWORD,info);
-        }
+	PCI_accessReg(index,*pd++,PCI_WRITE_DWORD,info);
+	}
     for (i = 0,pb = (uchar*)pd; i < endCount; i++, index++) {
-        PCI_accessReg(index,*pb++,PCI_WRITE_BYTE,info);
-        }
+	PCI_accessReg(index,*pb++,PCI_WRITE_BYTE,info);
+	}
 }

diff --git a/board/MAI/bios_emulator/scitech/src/pm/common/unixio.c b/board/MAI/bios_emulator/scitech/src/pm/common/unixio.c
index 04aa470..c3a66a7 100644
--- a/board/MAI/bios_emulator/scitech/src/pm/common/unixio.c
+++ b/board/MAI/bios_emulator/scitech/src/pm/common/unixio.c

@@ -65,9 +65,9 @@
     strcat(filename,blk->d_name);
     stat(filename,&st);
     if (!(st.st_mode & S_IWRITE))
-        findData->attrib |= PM_FILE_READONLY;
+	findData->attrib |= PM_FILE_READONLY;
     if (st.st_mode & S_IFDIR)
-        findData->attrib |= PM_FILE_DIRECTORY;
+	findData->attrib |= PM_FILE_DIRECTORY;
     findData->sizeLo = st.st_size;
     findData->sizeHi = 0;
     strncpy(findData->name,blk->d_name,PM_MAX_PATH);
@@ -91,24 +91,24 @@
     PM_backslash(fullpath);
     strcat(fullpath, dire->d_name);
     if (stat(fullpath, &st) != 0)
-        return false;
+	return false;
     for (; i < (int)strlen(dire->d_name) && j < (int)strlen(pattern); i++, j++) {
-        if (pattern[j] == '*' && lastchar != '\\') {
-            if (pattern[j+1] == '\0')
-                return true;
-            while (dire->d_name[i++] != pattern[j+1]) {
-                if (dire->d_name[i] == '\0')
-                    return false;
-                }
-            i -= 2;
-            }
-        else if (dire->d_name[i] != pattern[j] &&
-                !(pattern[j] == '?' && lastchar != '\\'))
-            return false;
-        lastchar = pattern[i];
-        }
+	if (pattern[j] == '*' && lastchar != '\\') {
+	    if (pattern[j+1] == '\0')
+		return true;
+	    while (dire->d_name[i++] != pattern[j+1]) {
+		if (dire->d_name[i] == '\0')
+		    return false;
+		}
+	    i -= 2;
+	    }
+	else if (dire->d_name[i] != pattern[j] &&
+		!(pattern[j] == '?' && lastchar != '\\'))
+	    return false;
+	lastchar = pattern[i];
+	}
     if (j == (int)strlen(pattern) && i == (int)strlen(dire->d_name))
-        return true;
+	return true;
     return false;
 }
 
@@ -126,23 +126,23 @@
     char            ext[PM_MAX_PATH];
 
     if ((d = PM_malloc(sizeof(*d))) == NULL)
-        return PM_FILE_INVALID;
+	return PM_FILE_INVALID;
     PM_splitpath(filename,NULL,d->path,name,ext);
     strcpy(d->mask,name);
     strcat(d->mask,ext);
     if (strlen(d->path) == 0)
-        strcpy(d->path, ".");
+	strcpy(d->path, ".");
     if (d->path[strlen(d->path)-1] == '/')
-        d->path[strlen(d->path)-1] = 0;
+	d->path[strlen(d->path)-1] = 0;
     if ((d->d = opendir(d->path)) != NULL) {
-        while ((dire = readdir(d->d)) != NULL) {
-            if (filematch(d->mask,d->path,dire)) {
-                convertFindData(findData,dire,d->path);
-                return d;
-                }
-            }
-        closedir(d->d);
-        }
+	while ((dire = readdir(d->d)) != NULL) {
+	    if (filematch(d->mask,d->path,dire)) {
+		convertFindData(findData,dire,d->path);
+		return d;
+		}
+	    }
+	closedir(d->d);
+	}
     PM_free(d);
     return PM_FILE_INVALID;
 }
@@ -159,11 +159,11 @@
     struct dirent   *dire;
 
     while ((dire = readdir(d->d)) != NULL) {
-        if (filematch(d->mask,d->path,dire)) {
-            convertFindData(findData,dire,d->path);
-            return true;
-            }
-        }
+	if (filematch(d->mask,d->path,dire)) {
+	    convertFindData(findData,dire,d->path);
+	    return true;
+	    }
+	}
     return false;
 }
 
@@ -197,7 +197,7 @@
     char drive)
 {
     if (drive == 3)
-        return true;
+	return true;
     return false;
 }
 
@@ -230,9 +230,9 @@
     stat(filename,&st);
     mode = st.st_mode;
     if (attrib & PM_FILE_READONLY)
-        mode &= ~S_IWRITE;
+	mode &= ~S_IWRITE;
     else
-        mode |= S_IWRITE;
+	mode |= S_IWRITE;
     chmod(filename,mode);
 }
 
@@ -247,7 +247,7 @@
 
     stat(filename,&st);
     if (st.st_mode & S_IWRITE)
-        return 0;
+	return 0;
     return PM_FILE_READONLY;
 }
 
@@ -280,7 +280,7 @@
     ibool gmTime,
     PM_time *time)
 {
-    // TODO: Implement this!
+    /* TODO: Implement this! */
     (void)filename;
     (void)gmTime;
     (void)time;
@@ -297,7 +297,7 @@
     ibool gmTime,
     PM_time *time)
 {
-    // TODO: Implement this!
+    /* TODO: Implement this! */
     (void)filename;
     (void)gmTime;
     (void)time;

diff --git a/board/MAI/bios_emulator/scitech/src/pm/common/vgastate.c b/board/MAI/bios_emulator/scitech/src/pm/common/vgastate.c
index 3be14e8..8056e9a 100644
--- a/board/MAI/bios_emulator/scitech/src/pm/common/vgastate.c
+++ b/board/MAI/bios_emulator/scitech/src/pm/common/vgastate.c

@@ -104,7 +104,7 @@
      * what we need.
      */
     for (i = 0; i <= 10; i++)
-        PM_outpb(0x80, 0);
+	PM_outpb(0x80, 0);
 }
 
 /****************************************************************************
@@ -152,9 +152,9 @@
 
     _port_out(0, PEL_IR);
     for (i = 0; i < 768; i++) {
-        vga_delay();
-        *pal++ = _port_in(PEL_D);
-        }
+	vga_delay();
+	*pal++ = _port_in(PEL_D);
+	}
 }
 
 /****************************************************************************
@@ -169,9 +169,9 @@
     /* restore saved palette */
     _port_out(0, PEL_IW);
     for (i = 0; i < 768; i++) {
-        vga_delay();
-        _port_out(*pal++, PEL_D);
-        }
+	vga_delay();
+	_port_out(*pal++, PEL_D);
+	}
 }
 
 /****************************************************************************
@@ -247,25 +247,25 @@
 
     /* Save state of VGA registers */
     for (i = 0; i < CRT_C; i++) {
-        _port_out(i, CRT_I);
-        regs[CRT + i] = _port_in(CRT_D);
-        }
+	_port_out(i, CRT_I);
+	regs[CRT + i] = _port_in(CRT_D);
+	}
     for (i = 0; i < ATT_C; i++) {
-        _port_in(IS1_R);
-        vga_delay();
-        _port_out(i, ATT_IW);
-        vga_delay();
-        regs[ATT + i] = _port_in(ATT_R);
-        vga_delay();
-        }
+	_port_in(IS1_R);
+	vga_delay();
+	_port_out(i, ATT_IW);
+	vga_delay();
+	regs[ATT + i] = _port_in(ATT_R);
+	vga_delay();
+	}
     for (i = 0; i < GRA_C; i++) {
-        _port_out(i, GRA_I);
-        regs[GRA + i] = _port_in(GRA_D);
-        }
+	_port_out(i, GRA_I);
+	regs[GRA + i] = _port_in(GRA_D);
+	}
     for (i = 0; i < SEQ_C; i++) {
-        _port_out(i, SEQ_I);
-        regs[SEQ + i] = _port_in(SEQ_D);
-        }
+	_port_out(i, SEQ_I);
+	regs[SEQ + i] = _port_in(SEQ_D);
+	}
     regs[MIS] = _port_in(MIS_R);
 
     /* Save the VGA palette values */
@@ -302,7 +302,7 @@
 
     /* Delay to allow clock change to settle */
     for (i = 0; i < 10; i++)
-        vga_delay();
+	vga_delay();
 
     /* Synchronous reset on */
     _port_out(0x00,SEQ_I);
@@ -312,9 +312,9 @@
     _port_out(1, SEQ_I);
     _port_out(regs[SEQ + 1] | 0x20, SEQ_D);
     for (i = 2; i < SEQ_C; i++) {
-        _port_out(i, SEQ_I);
-        _port_out(regs[SEQ + i], SEQ_D);
-        }
+	_port_out(i, SEQ_I);
+	_port_out(regs[SEQ + i], SEQ_D);
+	}
 
     /* Synchronous reset off */
     _port_out(0x00,SEQ_I);
@@ -324,21 +324,21 @@
     _port_out(0x11, CRT_I);
     _port_out(_port_in(CRT_D) & 0x7F, CRT_D);
     for (i = 0; i < CRT_C; i++) {
-        _port_out(i, CRT_I);
-        _port_out(regs[CRT + i], CRT_D);
-        }
+	_port_out(i, CRT_I);
+	_port_out(regs[CRT + i], CRT_D);
+	}
     for (i = 0; i < GRA_C; i++) {
-        _port_out(i, GRA_I);
-        _port_out(regs[GRA + i], GRA_D);
-        }
+	_port_out(i, GRA_I);
+	_port_out(regs[GRA + i], GRA_D);
+	}
     for (i = 0; i < ATT_C; i++) {
-        _port_in(IS1_R);        /* reset flip-flop */
-        vga_delay();
-        _port_out(i, ATT_IW);
-        vga_delay();
-        _port_out(regs[ATT + i], ATT_IW);
-        vga_delay();
-        }
+	_port_in(IS1_R);        /* reset flip-flop */
+	vga_delay();
+	_port_out(i, ATT_IW);
+	vga_delay();
+	_port_out(regs[ATT + i], ATT_IW);
+	vga_delay();
+	}
 
     /* Ensure the VGA screen is turned on */
     PM_vgaUnblankDisplay();

diff --git a/board/MAI/bios_emulator/scitech/src/pm/cpuinfo.c b/board/MAI/bios_emulator/scitech/src/pm/cpuinfo.c
index e2446a4..ac62e81 100644
--- a/board/MAI/bios_emulator/scitech/src/pm/cpuinfo.c
+++ b/board/MAI/bios_emulator/scitech/src/pm/cpuinfo.c

@@ -168,144 +168,144 @@
     static ibool    firstTime = true;
 
     if (_CPU_haveCPUID()) {
-        cpu = _CPU_checkCPUID();
-        vendor = cpu & ~CPU_mask;
-        if (vendor == CPU_Intel) {
-            /* Check for Intel processors */
-            switch (cpu & CPU_mask) {
-                case 4: cpu = CPU_i486;         break;
-                case 5: cpu = CPU_Pentium;      break;
-                case 6:
-                    if ((model = _CPU_getCPUIDModel()) == 1)
-                        cpu = CPU_PentiumPro;
-                    else if (model <= 6) {
-                        cacheSize = _CPU_getCacheSize();
-                        if ((model == 5 && cacheSize == 0) ||
-                            (model == 5 && cacheSize == 256) ||
-                            (model == 6 && cacheSize == 128))
-                            cpu = CPU_Celeron;
-                        else
-                            cpu = CPU_PentiumII;
-                        }
-                    else if (model >= 7) {
-                        /* Model 7 == Pentium III */
-                        /* Model 8 == Celeron/Pentium III Coppermine */
-                        cacheSize = _CPU_getCacheSize();
-                        if ((model == 8 && cacheSize == 128))
-                            cpu = CPU_Celeron;
-                        else
-                            cpu = CPU_PentiumIII;
-                        }
-                    break;
-                default:
-                    cpu = CPU_UnkIntel;
-                }
-            }
-        else if (vendor == CPU_Cyrix) {
-            /* Check for Cyrix processors */
-            switch (cpu & CPU_mask) {
-                case 4:
-                    if ((model = _CPU_getCPUIDModel()) == 4)
-                        cpu = CPU_CyrixMediaGX;
-                    else
-                        cpu = CPU_UnkCyrix;
-                    break;
-                case 5:
-                    if ((model = _CPU_getCPUIDModel()) == 2)
-                        cpu = CPU_Cyrix6x86;
-                    else if (model == 4)
-                        cpu = CPU_CyrixMediaGXm;
-                    else
-                        cpu = CPU_UnkCyrix;
-                    break;
-                case 6:
-                    if ((model = _CPU_getCPUIDModel()) <= 1)
-                        cpu = CPU_Cyrix6x86MX;
-                    else
-                        cpu = CPU_UnkCyrix;
-                    break;
-                default:
-                    cpu = CPU_UnkCyrix;
-                }
-            }
-        else if (vendor == CPU_AMD) {
-            /* Check for AMD processors */
-            switch (cpu & CPU_mask) {
-                case 4:
-                    if ((model = _CPU_getCPUIDModel()) == 0)
-                        cpu = CPU_AMDAm5x86;
-                    else
-                        cpu = CPU_AMDAm486;
-                    break;
-                case 5:
-                    if ((model = _CPU_getCPUIDModel()) <= 3)
-                        cpu = CPU_AMDK5;
-                    else if (model <= 7)
-                        cpu = CPU_AMDK6;
-                    else if (model == 8)
-                        cpu = CPU_AMDK6_2;
-                    else if (model == 9)
-                        cpu = CPU_AMDK6_III;
-                    else if (model == 13) {
-                        if (_CPU_getCPUIDStepping() <= 3)
-                            cpu = CPU_AMDK6_IIIplus;
-                        else
-                            cpu = CPU_AMDK6_2plus;
-                        }
-                    else
-                        cpu = CPU_UnkAMD;
-                    break;
-                case 6:
-                    if ((model = _CPU_getCPUIDModel()) == 3)
-                        cpu = CPU_AMDDuron;
-                    else
-                        cpu = CPU_AMDAthlon;
-                    break;
-                default:
-                    cpu = CPU_UnkAMD;
-                }
-            }
-        else if (vendor == CPU_IDT) {
-            /* Check for IDT WinChip processors */
-            switch (cpu & CPU_mask) {
-                case 5:
-                    if ((model = _CPU_getCPUIDModel()) <= 4)
-                        cpu = CPU_WinChipC6;
-                    else if (model == 8)
-                        cpu = CPU_WinChip2;
-                    else
-                        cpu = CPU_UnkIDT;
-                    break;
-                default:
-                    cpu = CPU_UnkIDT;
-                }
-            }
-        else {
-            /* Assume a Pentium compatible Intel clone */
-            cpu = CPU_Pentium;
-            }
-        return cpu | vendor | (_CPU_getCPUIDStepping() << CPU_steppingShift);
-        }
+	cpu = _CPU_checkCPUID();
+	vendor = cpu & ~CPU_mask;
+	if (vendor == CPU_Intel) {
+	    /* Check for Intel processors */
+	    switch (cpu & CPU_mask) {
+		case 4: cpu = CPU_i486;         break;
+		case 5: cpu = CPU_Pentium;      break;
+		case 6:
+		    if ((model = _CPU_getCPUIDModel()) == 1)
+			cpu = CPU_PentiumPro;
+		    else if (model <= 6) {
+			cacheSize = _CPU_getCacheSize();
+			if ((model == 5 && cacheSize == 0) ||
+			    (model == 5 && cacheSize == 256) ||
+			    (model == 6 && cacheSize == 128))
+			    cpu = CPU_Celeron;
+			else
+			    cpu = CPU_PentiumII;
+			}
+		    else if (model >= 7) {
+			/* Model 7 == Pentium III */
+			/* Model 8 == Celeron/Pentium III Coppermine */
+			cacheSize = _CPU_getCacheSize();
+			if ((model == 8 && cacheSize == 128))
+			    cpu = CPU_Celeron;
+			else
+			    cpu = CPU_PentiumIII;
+			}
+		    break;
+		default:
+		    cpu = CPU_UnkIntel;
+		}
+	    }
+	else if (vendor == CPU_Cyrix) {
+	    /* Check for Cyrix processors */
+	    switch (cpu & CPU_mask) {
+		case 4:
+		    if ((model = _CPU_getCPUIDModel()) == 4)
+			cpu = CPU_CyrixMediaGX;
+		    else
+			cpu = CPU_UnkCyrix;
+		    break;
+		case 5:
+		    if ((model = _CPU_getCPUIDModel()) == 2)
+			cpu = CPU_Cyrix6x86;
+		    else if (model == 4)
+			cpu = CPU_CyrixMediaGXm;
+		    else
+			cpu = CPU_UnkCyrix;
+		    break;
+		case 6:
+		    if ((model = _CPU_getCPUIDModel()) <= 1)
+			cpu = CPU_Cyrix6x86MX;
+		    else
+			cpu = CPU_UnkCyrix;
+		    break;
+		default:
+		    cpu = CPU_UnkCyrix;
+		}
+	    }
+	else if (vendor == CPU_AMD) {
+	    /* Check for AMD processors */
+	    switch (cpu & CPU_mask) {
+		case 4:
+		    if ((model = _CPU_getCPUIDModel()) == 0)
+			cpu = CPU_AMDAm5x86;
+		    else
+			cpu = CPU_AMDAm486;
+		    break;
+		case 5:
+		    if ((model = _CPU_getCPUIDModel()) <= 3)
+			cpu = CPU_AMDK5;
+		    else if (model <= 7)
+			cpu = CPU_AMDK6;
+		    else if (model == 8)
+			cpu = CPU_AMDK6_2;
+		    else if (model == 9)
+			cpu = CPU_AMDK6_III;
+		    else if (model == 13) {
+			if (_CPU_getCPUIDStepping() <= 3)
+			    cpu = CPU_AMDK6_IIIplus;
+			else
+			    cpu = CPU_AMDK6_2plus;
+			}
+		    else
+			cpu = CPU_UnkAMD;
+		    break;
+		case 6:
+		    if ((model = _CPU_getCPUIDModel()) == 3)
+			cpu = CPU_AMDDuron;
+		    else
+			cpu = CPU_AMDAthlon;
+		    break;
+		default:
+		    cpu = CPU_UnkAMD;
+		}
+	    }
+	else if (vendor == CPU_IDT) {
+	    /* Check for IDT WinChip processors */
+	    switch (cpu & CPU_mask) {
+		case 5:
+		    if ((model = _CPU_getCPUIDModel()) <= 4)
+			cpu = CPU_WinChipC6;
+		    else if (model == 8)
+			cpu = CPU_WinChip2;
+		    else
+			cpu = CPU_UnkIDT;
+		    break;
+		default:
+		    cpu = CPU_UnkIDT;
+		}
+	    }
+	else {
+	    /* Assume a Pentium compatible Intel clone */
+	    cpu = CPU_Pentium;
+	    }
+	return cpu | vendor | (_CPU_getCPUIDStepping() << CPU_steppingShift);
+	}
     else {
-        if (_CPU_check80386())
-            cpu = CPU_i386;
-        else  if (_CPU_check80486()) {
-            /* If we get here we may have a Cyrix processor so we can try
-             * enabling the CPUID instruction and trying again.
-             */
-            if (firstTime) {
-                firstTime = false;
-                _CPU_enableCyrixCPUID();
-                return CPU_getProcessorType();
-                }
-            cpu = CPU_i486;
-            }
-        else
-            cpu = CPU_Pentium;
-        if (!_CPU_checkClone())
-            return cpu | CPU_Intel;
-        return cpu;
-        }
+	if (_CPU_check80386())
+	    cpu = CPU_i386;
+	else  if (_CPU_check80486()) {
+	    /* If we get here we may have a Cyrix processor so we can try
+	     * enabling the CPUID instruction and trying again.
+	     */
+	    if (firstTime) {
+		firstTime = false;
+		_CPU_enableCyrixCPUID();
+		return CPU_getProcessorType();
+		}
+	    cpu = CPU_i486;
+	    }
+	else
+	    cpu = CPU_Pentium;
+	if (!_CPU_checkClone())
+	    return cpu | CPU_Intel;
+	return cpu;
+	}
 #elif   defined(__ALPHA__)
     return CPU_Alpha;
 #elif   defined(__MIPS__)
@@ -337,7 +337,7 @@
 {
 #ifdef  __INTEL__
     if (_CPU_haveCPUID())
-        return (_CPU_getCPUIDFeatures() & CPU_HaveMMX) != 0;
+	return (_CPU_getCPUIDFeatures() & CPU_HaveMMX) != 0;
     return false;
 #else
     return false;
@@ -366,7 +366,7 @@
 {
 #ifdef  __INTEL__
     if (_CPU_haveCPUID())
-        return _CPU_have3DNow();
+	return _CPU_have3DNow();
     return false;
 #else
     return false;
@@ -395,7 +395,7 @@
 {
 #ifdef  __INTEL__
     if (_CPU_haveCPUID())
-        return (_CPU_getCPUIDFeatures() & CPU_HaveSSE) != 0;
+	return (_CPU_getCPUIDFeatures() & CPU_HaveSSE) != 0;
     return false;
 #else
     return false;
@@ -432,7 +432,7 @@
 {
 #ifdef  __INTEL__
     if (_CPU_haveCPUID())
-        return (_CPU_getCPUIDFeatures() & CPU_HaveRDTSC) != 0;
+	return (_CPU_getCPUIDFeatures() & CPU_HaveRDTSC) != 0;
     return false;
 #else
     return false;
@@ -464,22 +464,22 @@
     iPriority = SetMaxThreadPriority();
     GetCounterFrequency(&count_freq);
     for (i = 0; i < SAMPLINGS; i++) {
-        GetCounter(&t0);
-        for (j = 0; j < INNER_LOOPS; j++)
-            _CPU_runBSFLoop(ITERATIONS);
-        GetCounter(&t1);
-        current = t1.low - t0.low;
-        if (current < lowest)
-            lowest = current;
-        }
+	GetCounter(&t0);
+	for (j = 0; j < INNER_LOOPS; j++)
+	    _CPU_runBSFLoop(ITERATIONS);
+	GetCounter(&t1);
+	current = t1.low - t0.low;
+	if (current < lowest)
+	    lowest = current;
+	}
     RestoreThreadPriority(iPriority);
 
     /* Compute frequency */
     ticks = _CPU_mulDiv(lowest,1000000,count_freq.low);
     if ((ticks % count_freq.low) > (count_freq.low/2))
-        ticks++;            /* Round up if necessary */
+	ticks++;            /* Round up if necessary */
     if (ticks == 0)
-        return 0;
+	return 0;
     return ((cycles*INNER_LOOPS)/ticks);
 }
 
@@ -513,44 +513,44 @@
     GetCounterFrequency(&count_freq);
     PM_set64(freq,count_freq.high,count_freq.low);
     for (tries = 0; tries < 3; tries++) {
-        /* Loop until 100 ticks have passed since last read of hi-res
-         * counter. This accounts for overhead later.
-         */
-        GetCounter(&t0);
-        t1.low = t0.low;
-        t1.high = t0.high;
-        while ((t1.low - t0.low) < 100) {
-            GetCounter(&t1);
-            _CPU_readTimeStamp(&s0);
-            }
+	/* Loop until 100 ticks have passed since last read of hi-res
+	 * counter. This accounts for overhead later.
+	 */
+	GetCounter(&t0);
+	t1.low = t0.low;
+	t1.high = t0.high;
+	while ((t1.low - t0.low) < 100) {
+	    GetCounter(&t1);
+	    _CPU_readTimeStamp(&s0);
+	    }
 
-        /* Loop until 30000 ticks have passed since last read of hi-res counter.
-         * This allows for elapsed time for sampling. For a hi-res frequency
-         * of 1MHz, this is about 0.03 of a second. The frequency reported
-         * by the OS dependent code should be tuned to provide a good
-         * sample period depending on the accuracy of the OS timers (ie:
-         * if the accuracy is lower, lower the frequency to spend more time
-         * in the inner loop to get better accuracy).
-         */
-        t0.low = t1.low;
-        t0.high = t1.high;
-        while ((t1.low - t0.low) < maxCount) {
-            GetCounter(&t1);
-            _CPU_readTimeStamp(&s1);
-            }
+	/* Loop until 30000 ticks have passed since last read of hi-res counter.
+	 * This allows for elapsed time for sampling. For a hi-res frequency
+	 * of 1MHz, this is about 0.03 of a second. The frequency reported
+	 * by the OS dependent code should be tuned to provide a good
+	 * sample period depending on the accuracy of the OS timers (ie:
+	 * if the accuracy is lower, lower the frequency to spend more time
+	 * in the inner loop to get better accuracy).
+	 */
+	t0.low = t1.low;
+	t0.high = t1.high;
+	while ((t1.low - t0.low) < maxCount) {
+	    GetCounter(&t1);
+	    _CPU_readTimeStamp(&s1);
+	    }
 
-        /* Find the difference during the timing loop */
-        PM_set64(stamp0,s0.high,s0.low);
-        PM_set64(stamp1,s1.high,s1.low);
-        PM_set64(ticks0,t0.high,t0.low);
-        PM_set64(ticks1,t1.high,t1.low);
-        PM_sub64(cycles,stamp1,stamp0);
-        PM_sub64(ticks,ticks1,ticks0);
+	/* Find the difference during the timing loop */
+	PM_set64(stamp0,s0.high,s0.low);
+	PM_set64(stamp1,s1.high,s1.low);
+	PM_set64(ticks0,t0.high,t0.low);
+	PM_set64(ticks1,t1.high,t1.low);
+	PM_sub64(cycles,stamp1,stamp0);
+	PM_sub64(ticks,ticks1,ticks0);
 
-        /* Sum up the results */
-        PM_add64(total_ticks,total_ticks,ticks);
-        PM_add64(total_cycles,total_cycles,cycles);
-        }
+	/* Sum up the results */
+	PM_add64(total_ticks,total_ticks,ticks);
+	PM_add64(total_cycles,total_cycles,cycles);
+	}
     RestoreThreadPriority(iPriority);
 
     /* Compute frequency in Hz */
@@ -598,46 +598,46 @@
     ulong   cpuSpeed;
     uint    i;
     static  ulong intel_cycles[] = {
-        115,47,43,
-        };
+	115,47,43,
+	};
     static  ulong cyrix_cycles[] = {
-        38,38,52,52,
-        };
+	38,38,52,52,
+	};
     static  ulong amd_cycles[] = {
-        49,
-        };
+	49,
+	};
     static  ulong known_speeds[] = {
-        1000,950,900,850,800,750,700,650,600,550,500,450,433,400,350,
-        333,300,266,233,200,166,150,133,120,100,90,75,66,60,50,33,20,0,
-        };
+	1000,950,900,850,800,750,700,650,600,550,500,450,433,400,350,
+	333,300,266,233,200,166,150,133,120,100,90,75,66,60,50,33,20,0,
+	};
 
     if (CPU_haveRDTSC()) {
-        cpuSpeed = (GetRDTSCCpuSpeed(accurate) + 500000) / 1000000;
-        }
+	cpuSpeed = (GetRDTSCCpuSpeed(accurate) + 500000) / 1000000;
+	}
     else {
-        int type = CPU_getProcessorType();
-        int processor = type & CPU_mask;
-        int vendor = type & CPU_familyMask;
-        if (vendor == CPU_Intel)
-            cpuSpeed = GetBSFCpuSpeed(ITERATIONS * intel_cycles[processor - CPU_i386]);
-        else if (vendor == CPU_Cyrix)
-            cpuSpeed = GetBSFCpuSpeed(ITERATIONS * cyrix_cycles[processor - CPU_Cyrix6x86]);
-        else if (vendor == CPU_AMD)
-            cpuSpeed = GetBSFCpuSpeed(ITERATIONS * amd_cycles[0]);
-        else
-            return 0;
-        }
+	int type = CPU_getProcessorType();
+	int processor = type & CPU_mask;
+	int vendor = type & CPU_familyMask;
+	if (vendor == CPU_Intel)
+	    cpuSpeed = GetBSFCpuSpeed(ITERATIONS * intel_cycles[processor - CPU_i386]);
+	else if (vendor == CPU_Cyrix)
+	    cpuSpeed = GetBSFCpuSpeed(ITERATIONS * cyrix_cycles[processor - CPU_Cyrix6x86]);
+	else if (vendor == CPU_AMD)
+	    cpuSpeed = GetBSFCpuSpeed(ITERATIONS * amd_cycles[0]);
+	else
+	    return 0;
+	}
 
     /* Now normalise the results given known processors speeds, if the
      * speed we measure is within 2MHz of the expected values
      */
     if (!accurate) {
-        for (i = 0; known_speeds[i] != 0; i++) {
-            if (cpuSpeed >= (known_speeds[i]-3) && cpuSpeed <= (known_speeds[i]+3)) {
-                return known_speeds[i];
-                }
-            }
-        }
+	for (i = 0; known_speeds[i] != 0; i++) {
+	    if (cpuSpeed >= (known_speeds[i]-3) && cpuSpeed <= (known_speeds[i]+3)) {
+		return known_speeds[i];
+		}
+	    }
+	}
     return cpuSpeed;
 #else
     return 0;
@@ -674,8 +674,8 @@
 {
 #if defined(__INTEL__)
     if (CPU_haveRDTSC()) {
-        return GetRDTSCCpuSpeed(accurate);
-        }
+	return GetRDTSCCpuSpeed(accurate);
+	}
     return CPU_getProcessorSpeed(false) * 1000000;
 #else
     return 0;
@@ -706,101 +706,101 @@
     static char name[80];
 
     if (speed == -1) {
-        cpu = CPU_getProcessorType();
-        speed = CPU_getProcessorSpeed(false);
-        }
+	cpu = CPU_getProcessorType();
+	speed = CPU_getProcessorSpeed(false);
+	}
     sprintf(name,"%d MHz ", speed);
     switch (cpu & CPU_mask) {
-        case CPU_i386:
-            strcat(name,"Intel i386 processor");
-            break;
-        case CPU_i486:
-            strcat(name,"Intel i486 processor");
-            break;
-        case CPU_Pentium:
-            strcat(name,"Intel Pentium processor");
-            break;
-        case CPU_PentiumPro:
-            strcat(name,"Intel Pentium Pro processor");
-            break;
-        case CPU_PentiumII:
-            strcat(name,"Intel Pentium II processor");
-            break;
-        case CPU_Celeron:
-            strcat(name,"Intel Celeron processor");
-            break;
-        case CPU_PentiumIII:
-            strcat(name,"Intel Pentium III processor");
-            break;
-        case CPU_UnkIntel:
-            strcat(name,"Unknown Intel processor");
-            break;
-        case CPU_Cyrix6x86:
-            strcat(name,"Cyrix 6x86 processor");
-            break;
-        case CPU_Cyrix6x86MX:
-            strcat(name,"Cyrix 6x86MX processor");
-            break;
-        case CPU_CyrixMediaGX:
-            strcat(name,"Cyrix MediaGX processor");
-            break;
-        case CPU_CyrixMediaGXm:
-            strcat(name,"Cyrix MediaGXm processor");
-            break;
-        case CPU_UnkCyrix:
-            strcat(name,"Unknown Cyrix processor");
-            break;
-        case CPU_AMDAm486:
-            strcat(name,"AMD Am486 processor");
-            break;
-        case CPU_AMDAm5x86:
-            strcat(name,"AMD Am5x86 processor");
-            break;
-        case CPU_AMDK5:
-            strcat(name,"AMD K5 processor");
-            break;
-        case CPU_AMDK6:
-            strcat(name,"AMD K6 processor");
-            break;
-        case CPU_AMDK6_2:
-            strcat(name,"AMD K6-2 processor");
-            break;
-        case CPU_AMDK6_III:
-            strcat(name,"AMD K6-III processor");
-            break;
-        case CPU_AMDK6_2plus:
-            strcat(name,"AMD K6-2+ processor");
-            break;
-        case CPU_AMDK6_IIIplus:
-            strcat(name,"AMD K6-III+ processor");
-            break;
-        case CPU_UnkAMD:
-            strcat(name,"Unknown AMD processor");
-            break;
-        case CPU_AMDAthlon:
-            strcat(name,"AMD Athlon processor");
-            break;
-        case CPU_AMDDuron:
-            strcat(name,"AMD Duron processor");
-            break;
-        case CPU_WinChipC6:
-            strcat(name,"IDT WinChip C6 processor");
-            break;
-        case CPU_WinChip2:
-            strcat(name,"IDT WinChip 2 processor");
-            break;
-        case CPU_UnkIDT:
-            strcat(name,"Unknown IDT processor");
-            break;
-        default:
-            strcat(name,"Unknown processor");
-        }
+	case CPU_i386:
+	    strcat(name,"Intel i386 processor");
+	    break;
+	case CPU_i486:
+	    strcat(name,"Intel i486 processor");
+	    break;
+	case CPU_Pentium:
+	    strcat(name,"Intel Pentium processor");
+	    break;
+	case CPU_PentiumPro:
+	    strcat(name,"Intel Pentium Pro processor");
+	    break;
+	case CPU_PentiumII:
+	    strcat(name,"Intel Pentium II processor");
+	    break;
+	case CPU_Celeron:
+	    strcat(name,"Intel Celeron processor");
+	    break;
+	case CPU_PentiumIII:
+	    strcat(name,"Intel Pentium III processor");
+	    break;
+	case CPU_UnkIntel:
+	    strcat(name,"Unknown Intel processor");
+	    break;
+	case CPU_Cyrix6x86:
+	    strcat(name,"Cyrix 6x86 processor");
+	    break;
+	case CPU_Cyrix6x86MX:
+	    strcat(name,"Cyrix 6x86MX processor");
+	    break;
+	case CPU_CyrixMediaGX:
+	    strcat(name,"Cyrix MediaGX processor");
+	    break;
+	case CPU_CyrixMediaGXm:
+	    strcat(name,"Cyrix MediaGXm processor");
+	    break;
+	case CPU_UnkCyrix:
+	    strcat(name,"Unknown Cyrix processor");
+	    break;
+	case CPU_AMDAm486:
+	    strcat(name,"AMD Am486 processor");
+	    break;
+	case CPU_AMDAm5x86:
+	    strcat(name,"AMD Am5x86 processor");
+	    break;
+	case CPU_AMDK5:
+	    strcat(name,"AMD K5 processor");
+	    break;
+	case CPU_AMDK6:
+	    strcat(name,"AMD K6 processor");
+	    break;
+	case CPU_AMDK6_2:
+	    strcat(name,"AMD K6-2 processor");
+	    break;
+	case CPU_AMDK6_III:
+	    strcat(name,"AMD K6-III processor");
+	    break;
+	case CPU_AMDK6_2plus:
+	    strcat(name,"AMD K6-2+ processor");
+	    break;
+	case CPU_AMDK6_IIIplus:
+	    strcat(name,"AMD K6-III+ processor");
+	    break;
+	case CPU_UnkAMD:
+	    strcat(name,"Unknown AMD processor");
+	    break;
+	case CPU_AMDAthlon:
+	    strcat(name,"AMD Athlon processor");
+	    break;
+	case CPU_AMDDuron:
+	    strcat(name,"AMD Duron processor");
+	    break;
+	case CPU_WinChipC6:
+	    strcat(name,"IDT WinChip C6 processor");
+	    break;
+	case CPU_WinChip2:
+	    strcat(name,"IDT WinChip 2 processor");
+	    break;
+	case CPU_UnkIDT:
+	    strcat(name,"Unknown IDT processor");
+	    break;
+	default:
+	    strcat(name,"Unknown processor");
+	}
     if (CPU_haveMMX())
-        strcat(name," with MMX(R)");
+	strcat(name," with MMX(R)");
     if (CPU_have3DNow())
-        strcat(name,", 3DNow!(R)");
+	strcat(name,", 3DNow!(R)");
     if (CPU_haveSSE())
-        strcat(name,", SSE(R)");
+	strcat(name,", SSE(R)");
     return name;
 #else
     return "Unknown";

diff --git a/board/MAI/bios_emulator/scitech/src/pm/debug.c b/board/MAI/bios_emulator/scitech/src/pm/debug.c
index d86e3e6..751bf09 100644
--- a/board/MAI/bios_emulator/scitech/src/pm/debug.c
+++ b/board/MAI/bios_emulator/scitech/src/pm/debug.c

@@ -61,23 +61,23 @@
     char    buf[256];
 
     if (logFile[0] == 0) {
-        strcpy(logFile,PM_getNucleusPath());
-        PM_backslash(logFile);
-        strcat(logFile,"scitech.log");
-        }
+	strcpy(logFile,PM_getNucleusPath());
+	PM_backslash(logFile);
+	strcat(logFile,"scitech.log");
+	}
     if ((f = fopen(logFile,"a+")) != NULL) {
 #if defined(__WIN32_VXD__) || defined(__OS2_VDD__) || defined(__NT_DRIVER__)
-        sprintf(buf,msg,cond,file,line);
-        fwrite(buf,1,strlen(buf),f);
+	sprintf(buf,msg,cond,file,line);
+	fwrite(buf,1,strlen(buf),f);
 #else
-        fprintf(f,msg,cond,file,line);
+	fprintf(f,msg,cond,file,line);
 #endif
-        fclose(f);
-        }
+	fclose(f);
+	}
     if (fatal) {
-        sprintf(buf,"Check failed: check '%s' for details", logFile);
-        PM_fatalError(buf);
-        }
+	sprintf(buf,"Check failed: check '%s' for details", logFile);
+	PM_fatalError(buf);
+	}
 }
 #endif
 

diff --git a/board/MAI/bios_emulator/scitech/src/pm/dos/event.c b/board/MAI/bios_emulator/scitech/src/pm/dos/event.c
index 12ecb29..a969d11 100644
--- a/board/MAI/bios_emulator/scitech/src/pm/dos/event.c
+++ b/board/MAI/bios_emulator/scitech/src/pm/dos/event.c

@@ -75,7 +75,7 @@
 		_EVT_restoreInt(ps);
 		}
 
-    regs.x.ax = 0x0B;           // Reset Move Mouse
+    regs.x.ax = 0x0B;           /* Reset Move Mouse */
     PM_int86(0x33,&regs,&regs);
 }
 #endif
@@ -178,8 +178,8 @@
 the mouse interrupt subroutine, so it must be efficient.
 
 NOTE:   Interrupts MUST be OFF while this routine is called to ensure we have
-        mutually exclusive access to our internal data structures for
-        interrupt driven systems (like under DOS).
+	mutually exclusive access to our internal data structures for
+	interrupt driven systems (like under DOS).
 ****************************************************************************/
 static void addMouseEvent(
     uint what,
@@ -193,18 +193,18 @@
     event_t evt;
 
     if (EVT.count < EVENTQSIZE) {
-        /* Save information in event record. */
-        evt.when = _EVT_getTicks();
-        evt.what = what;
-        evt.message = message;
-        evt.modifiers = but_stat;
-        evt.where_x = x;                /* Save mouse event position    */
-        evt.where_y = y;
-        evt.relative_x = mickeyX;
-        evt.relative_y = mickeyY;
-        evt.modifiers |= EVT.keyModifiers;
-        addEvent(&evt);                 /* Add to tail of event queue   */
-        }
+	/* Save information in event record. */
+	evt.when = _EVT_getTicks();
+	evt.what = what;
+	evt.message = message;
+	evt.modifiers = but_stat;
+	evt.where_x = x;                /* Save mouse event position    */
+	evt.where_y = y;
+	evt.relative_x = mickeyX;
+	evt.relative_y = mickeyY;
+	evt.modifiers |= EVT.keyModifiers;
+	addEvent(&evt);                 /* Add to tail of event queue   */
+	}
 }
 
 /****************************************************************************
@@ -233,47 +233,47 @@
     uint    buttonMask;
 
     if (mask & 1) {
-        /* Save the current mouse coordinates */
-        EVT.mx = x; EVT.my = y;
+	/* Save the current mouse coordinates */
+	EVT.mx = x; EVT.my = y;
 
-        /* If the last event was a movement event, then modify the last
-         * event rather than post a new one, so that the queue will not
-         * become saturated. Before we modify the data structures, we
-         * MUST ensure that interrupts are off.
-         */
-        ps = _EVT_disableInt();
-        if (EVT.oldMove != -1) {
-            EVT.evtq[EVT.oldMove].where_x = x;  /* Modify existing one  */
-            EVT.evtq[EVT.oldMove].where_y = y;
-            EVT.evtq[EVT.oldMove].relative_x += mickeyX;
-            EVT.evtq[EVT.oldMove].relative_y += mickeyY;
-            }
-        else {
-            EVT.oldMove = EVT.freeHead;         /* Save id of this move event   */
-            addMouseEvent(EVT_MOUSEMOVE,0,x,y,mickeyX,mickeyY,butstate);
-            }
-        _EVT_restoreInt(ps);
-        }
+	/* If the last event was a movement event, then modify the last
+	 * event rather than post a new one, so that the queue will not
+	 * become saturated. Before we modify the data structures, we
+	 * MUST ensure that interrupts are off.
+	 */
+	ps = _EVT_disableInt();
+	if (EVT.oldMove != -1) {
+	    EVT.evtq[EVT.oldMove].where_x = x;  /* Modify existing one  */
+	    EVT.evtq[EVT.oldMove].where_y = y;
+	    EVT.evtq[EVT.oldMove].relative_x += mickeyX;
+	    EVT.evtq[EVT.oldMove].relative_y += mickeyY;
+	    }
+	else {
+	    EVT.oldMove = EVT.freeHead;         /* Save id of this move event   */
+	    addMouseEvent(EVT_MOUSEMOVE,0,x,y,mickeyX,mickeyY,butstate);
+	    }
+	_EVT_restoreInt(ps);
+	}
     if (mask & 0x2A) {
-        ps = _EVT_disableInt();
-        buttonMask = 0;
-        if (mask & 2)  buttonMask |= EVT_LEFTBMASK;
-        if (mask & 8)  buttonMask |= EVT_RIGHTBMASK;
-        if (mask & 32) buttonMask |= EVT_MIDDLEBMASK;
-        addMouseEvent(EVT_MOUSEDOWN,buttonMask,x,y,0,0,butstate);
-        EVT.oldMove = -1;
-        _EVT_restoreInt(ps);
-        }
+	ps = _EVT_disableInt();
+	buttonMask = 0;
+	if (mask & 2)  buttonMask |= EVT_LEFTBMASK;
+	if (mask & 8)  buttonMask |= EVT_RIGHTBMASK;
+	if (mask & 32) buttonMask |= EVT_MIDDLEBMASK;
+	addMouseEvent(EVT_MOUSEDOWN,buttonMask,x,y,0,0,butstate);
+	EVT.oldMove = -1;
+	_EVT_restoreInt(ps);
+	}
     if (mask & 0x54) {
-        ps = _EVT_disableInt();
-        buttonMask = 0;
-        if (mask & 2)  buttonMask |= EVT_LEFTBMASK;
-        if (mask & 8)  buttonMask |= EVT_RIGHTBMASK;
-        if (mask & 32) buttonMask |= EVT_MIDDLEBMASK;
-        addMouseEvent(EVT_MOUSEUP,buttonMask,x,y,0,0,butstate);
-        EVT.oldMove = -1;
-        _EVT_restoreInt(ps);
-        }
+	ps = _EVT_disableInt();
+	buttonMask = 0;
+	if (mask & 2)  buttonMask |= EVT_LEFTBMASK;
+	if (mask & 8)  buttonMask |= EVT_RIGHTBMASK;
+	if (mask & 32) buttonMask |= EVT_MIDDLEBMASK;
+	addMouseEvent(EVT_MOUSEUP,buttonMask,x,y,0,0,butstate);
+	EVT.oldMove = -1;
+	_EVT_restoreInt(ps);
+	}
     EVT.oldKey = -1;
 }
 
@@ -282,7 +282,7 @@
 Keyboard interrupt handler function.
 
 NOTE:   Interrupts are OFF when this routine is called by the keyboard ISR,
-        and we leave them OFF the entire time.
+	and we leave them OFF the entire time.
 ****************************************************************************/
 static void EVTAPI keyboardISR(void)
 {
@@ -327,7 +327,7 @@
      * while the program is initialising.
      */
     while ((i = _EVT_getKeyCode()) != 0)
-        addKeyEvent(EVT_KEYDOWN,i);
+	addKeyEvent(EVT_KEYDOWN,i);
 }
 
 /****************************************************************************
@@ -344,62 +344,62 @@
     PM_lockHandle   lh; /* Unused in DOS */
 
     if (_EVT_useEvents) {
-        /* Initialise the event queue and enable our interrupt handlers */
-        initEventQueue();
+	/* Initialise the event queue and enable our interrupt handlers */
+	initEventQueue();
 #ifndef NO_KEYBOARD_INTERRUPT
-        PM_setKeyHandler(keyboardISR);
+	PM_setKeyHandler(keyboardISR);
 #endif
 #ifndef NO_MOUSE_INTERRUPT
-        if ((haveMouse = detectMouse()) != 0) {
-            int oldmode = _EVT_foolMouse();
-            PM_setMouseHandler(0xFFFF,mouseISR);
-            _EVT_unfoolMouse(oldmode);
-            }
+	if ((haveMouse = detectMouse()) != 0) {
+	    int oldmode = _EVT_foolMouse();
+	    PM_setMouseHandler(0xFFFF,mouseISR);
+	    _EVT_unfoolMouse(oldmode);
+	    }
 #endif
 
-        /* Read the keyboard modifier flags from the BIOS to get the
-         * correct initialisation state. The only state we care about is
-         * the correct toggle state flags such as SCROLLLOCK, NUMLOCK and
-         * CAPSLOCK.
-         */
-        EVT.keyModifiers = 0;
-        mods = PM_getByte(_EVT_biosPtr+0x17);
-        if (mods & 0x10)
-            EVT.keyModifiers |= EVT_SCROLLLOCK;
-        if (mods & 0x20)
-            EVT.keyModifiers |= EVT_NUMLOCK;
-        if (mods & 0x40)
-            EVT.keyModifiers |= EVT_CAPSLOCK;
+	/* Read the keyboard modifier flags from the BIOS to get the
+	 * correct initialisation state. The only state we care about is
+	 * the correct toggle state flags such as SCROLLLOCK, NUMLOCK and
+	 * CAPSLOCK.
+	 */
+	EVT.keyModifiers = 0;
+	mods = PM_getByte(_EVT_biosPtr+0x17);
+	if (mods & 0x10)
+	    EVT.keyModifiers |= EVT_SCROLLLOCK;
+	if (mods & 0x20)
+	    EVT.keyModifiers |= EVT_NUMLOCK;
+	if (mods & 0x40)
+	    EVT.keyModifiers |= EVT_CAPSLOCK;
 
-        /* Lock all of the code and data used by our protected mode interrupt
-         * handling routines, so that it will continue to work correctly
-         * under real mode.
-         */
-        if (!locked) {
-            /* It is difficult to ensure that we lock our global data, so we
-             * do this by taking the address of a variable locking all data
-             * 2Kb on either side. This should properly cover the global data
-             * used by the module (the other alternative is to declare the
-             * variables in assembler, in which case we know it will be
-             * correct).
-             */
-            stat  = !PM_lockDataPages(&EVT,sizeof(EVT),&lh);
-            stat |= !PM_lockDataPages(&_EVT_biosPtr,sizeof(_EVT_biosPtr),&lh);
-            stat |= !PM_lockCodePages((__codePtr)_EVT_cCodeStart,(int)_EVT_cCodeEnd-(int)_EVT_cCodeStart,&lh);
-            stat |= !PM_lockCodePages((__codePtr)_EVT_codeStart,(int)_EVT_codeEnd-(int)_EVT_codeStart,&lh);
-            if (stat) {
-                PM_fatalError("Page locking services failed - interrupt handling not safe!");
-                exit(1);
-                }
-            locked = 1;
-            }
+	/* Lock all of the code and data used by our protected mode interrupt
+	 * handling routines, so that it will continue to work correctly
+	 * under real mode.
+	 */
+	if (!locked) {
+	    /* It is difficult to ensure that we lock our global data, so we
+	     * do this by taking the address of a variable locking all data
+	     * 2Kb on either side. This should properly cover the global data
+	     * used by the module (the other alternative is to declare the
+	     * variables in assembler, in which case we know it will be
+	     * correct).
+	     */
+	    stat  = !PM_lockDataPages(&EVT,sizeof(EVT),&lh);
+	    stat |= !PM_lockDataPages(&_EVT_biosPtr,sizeof(_EVT_biosPtr),&lh);
+	    stat |= !PM_lockCodePages((__codePtr)_EVT_cCodeStart,(int)_EVT_cCodeEnd-(int)_EVT_cCodeStart,&lh);
+	    stat |= !PM_lockCodePages((__codePtr)_EVT_codeStart,(int)_EVT_codeEnd-(int)_EVT_codeStart,&lh);
+	    if (stat) {
+		PM_fatalError("Page locking services failed - interrupt handling not safe!");
+		exit(1);
+		}
+	    locked = 1;
+	    }
 
-        /* Catch program termination signals so we can clean up properly */
-        signal(SIGABRT, _EVT_abort);
-        signal(SIGFPE, _EVT_abort);
-        signal(SIGINT, _EVT_abort);
-        _EVT_installed = true;
-        }
+	/* Catch program termination signals so we can clean up properly */
+	signal(SIGABRT, _EVT_abort);
+	signal(SIGFPE, _EVT_abort);
+	signal(SIGINT, _EVT_abort);
+	_EVT_installed = true;
+	}
 }
 
 /****************************************************************************
@@ -415,18 +415,18 @@
     RMREGS  regs;
 
     if (haveMouse) {
-        int oldmode = _EVT_foolMouse();
-        PM_resetMouseDriver(1);
-        regs.x.ax = 7;  /* Mouse function 7 - Set horizontal min and max */
-        regs.x.cx = 0;
-        regs.x.dx = xRes;
-        PM_int86(0x33,&regs,&regs);
-        regs.x.ax = 8;  /* Mouse function 8 - Set vertical min and max   */
-        regs.x.cx = 0;
-        regs.x.dx = yRes;
-        PM_int86(0x33,&regs,&regs);
-        _EVT_unfoolMouse(oldmode);
-        }
+	int oldmode = _EVT_foolMouse();
+	PM_resetMouseDriver(1);
+	regs.x.ax = 7;  /* Mouse function 7 - Set horizontal min and max */
+	regs.x.cx = 0;
+	regs.x.dx = xRes;
+	PM_int86(0x33,&regs,&regs);
+	regs.x.ax = 8;  /* Mouse function 8 - Set vertical min and max   */
+	regs.x.cx = 0;
+	regs.x.dx = yRes;
+	PM_int86(0x33,&regs,&regs);
+	_EVT_unfoolMouse(oldmode);
+	}
 }
 
 /****************************************************************************
@@ -441,13 +441,13 @@
     RMREGS  regs;
 
     if (haveMouse) {
-        int oldmode = _EVT_foolMouse();
-        regs.x.ax = 4;      /* Mouse function 4 - Set mouse position    */
-        regs.x.cx = *x;     /* New horizontal coordinate                */
-        regs.x.dx = *y;     /* New vertical coordinate                  */
-        PM_int86(0x33,&regs,&regs);
-        _EVT_unfoolMouse(oldmode);
-        }
+	int oldmode = _EVT_foolMouse();
+	regs.x.ax = 4;      /* Mouse function 4 - Set mouse position    */
+	regs.x.cx = *x;     /* New horizontal coordinate                */
+	regs.x.dx = *y;     /* New vertical coordinate                  */
+	PM_int86(0x33,&regs,&regs);
+	_EVT_unfoolMouse(oldmode);
+	}
 }
 
 /****************************************************************************
@@ -460,28 +460,28 @@
     uchar   mods;
 
     if (_EVT_installed) {
-        /* Restore the interrupt handlers */
-        PM_restoreKeyHandler();
-        if (haveMouse)
-            PM_restoreMouseHandler();
-        signal(SIGABRT, SIG_DFL);
-        signal(SIGFPE, SIG_DFL);
-        signal(SIGINT, SIG_DFL);
+	/* Restore the interrupt handlers */
+	PM_restoreKeyHandler();
+	if (haveMouse)
+	    PM_restoreMouseHandler();
+	signal(SIGABRT, SIG_DFL);
+	signal(SIGFPE, SIG_DFL);
+	signal(SIGINT, SIG_DFL);
 
-        /* Set the keyboard modifier flags in the BIOS to our values */
-        EVT_allowLEDS(true);
-        mods = PM_getByte(_EVT_biosPtr+0x17) & ~0x70;
-        if (EVT.keyModifiers & EVT_SCROLLLOCK)
-            mods |= 0x10;
-        if (EVT.keyModifiers & EVT_NUMLOCK)
-            mods |= 0x20;
-        if (EVT.keyModifiers & EVT_CAPSLOCK)
-            mods |= 0x40;
-        PM_setByte(_EVT_biosPtr+0x17,mods);
+	/* Set the keyboard modifier flags in the BIOS to our values */
+	EVT_allowLEDS(true);
+	mods = PM_getByte(_EVT_biosPtr+0x17) & ~0x70;
+	if (EVT.keyModifiers & EVT_SCROLLLOCK)
+	    mods |= 0x10;
+	if (EVT.keyModifiers & EVT_NUMLOCK)
+	    mods |= 0x20;
+	if (EVT.keyModifiers & EVT_CAPSLOCK)
+	    mods |= 0x40;
+	PM_setByte(_EVT_biosPtr+0x17,mods);
 
-        /* Flag that we are no longer installed */
-        _EVT_installed = false;
-        }
+	/* Flag that we are no longer installed */
+	_EVT_installed = false;
+	}
 }
 
 /****************************************************************************

diff --git a/board/MAI/bios_emulator/scitech/src/pm/dos/pm.c b/board/MAI/bios_emulator/scitech/src/pm/dos/pm.c
index 71acd68..2ad9e34 100644
--- a/board/MAI/bios_emulator/scitech/src/pm/dos/pm.c
+++ b/board/MAI/bios_emulator/scitech/src/pm/dos/pm.c

@@ -156,7 +156,7 @@
     VXD_regs *regs)
 {
     if (_PM_VXD_sel != 0 || _PM_VXD_off != 0)
-        _PM_VxDCall(regs,_PM_VXD_off,_PM_VXD_sel);
+	_PM_VxDCall(regs,_PM_VXD_off,_PM_VXD_sel);
 }
 
 /****************************************************************************
@@ -172,11 +172,11 @@
 
     /* Call the helper VxD to determine the version number */
     if (_PM_VXD_sel != 0 || _PM_VXD_off != 0) {
-        memset(&r,0,sizeof(r));
-        r.eax = API_NUM(PMHELP_GETVER);
-        _PM_VxDCall(&r,_PM_VXD_off,_PM_VXD_sel);
-        return VXD_version = (uint)r.eax;
-        }
+	memset(&r,0,sizeof(r));
+	r.eax = API_NUM(PMHELP_GETVER);
+	_PM_VxDCall(&r,_PM_VXD_off,_PM_VXD_sel);
+	return VXD_version = (uint)r.eax;
+	}
     return VXD_version = 0;
 }
 
@@ -199,7 +199,7 @@
 
     /* Bail early if we have alread connected */
     if (VXD_version != -1)
-        return VXD_version != 0;
+	return VXD_version != 0;
 
     /* Get the static SDDHELP.VXD entry point if available */
     PM_segread(&sregs);
@@ -211,9 +211,9 @@
     _PM_VXD_sel = sregs.es;
     _PM_VXD_off = regs.x.di;
     if (_PM_VXD_sel != 0 || _PM_VXD_off != 0) {
-        if (PMHELP_getVersion() >= PMHELP_VERSION)
-            return true;
-        }
+	if (PMHELP_getVersion() >= PMHELP_VERSION)
+	    return true;
+	}
 
     /* If we get here, then either SDDHELP.VXD is not loaded, or it is an
      * earlier version. In this case try to dynamically load the PMHELP.VXD
@@ -228,7 +228,7 @@
     VXD_loadSel = sregs.es;
     VXD_loadOff = regs.x.di;
     if (VXD_loadSel == 0 && VXD_loadOff == 0)
-        return VXD_version = 0;
+	return VXD_version = 0;
     r.eax = 1;
     r.ebx = 0;
     r.edx = (uint)VXD_name;
@@ -237,7 +237,7 @@
     r.es = sregs.es;
     _PM_VxDCall(&r,VXD_loadOff,VXD_loadSel);
     if (r.eax != 0)
-        return VXD_version = 0;
+	return VXD_version = 0;
 
     /* Get the dynamic VxD entry point so we can call it */
     atexit(UnloadVxD);
@@ -249,9 +249,9 @@
     _PM_VXD_sel = sregs.es;
     _PM_VXD_off = regs.x.di;
     if (_PM_VXD_sel == 0 && _PM_VXD_off == 0)
-        return VXD_version = 0;
+	return VXD_version = 0;
     if (PMHELP_getVersion() >= PMHELP_VERSION)
-        return true;
+	return true;
     return VXD_version = 0;
 }
 #endif
@@ -269,24 +269,24 @@
 
     /* Check if we are running under CauseWay under real DOS */
     if (_PM_haveCauseWay == -1) {
-        /* Check if we are running under DPMI in which case we will not be
-         * able to use our special ring 0 CauseWay functions.
-         */
-        _PM_haveCauseWay = false;
-        regs.x.ax = 0xFF00;
-        PM_int386(0x31,&regs,&regs);
-        if (regs.x.cflag || !(regs.e.edi & 8)) {
-            /* We are not under DPMI, so now check if CauseWay is active */
-            regs.x.ax = 0xFFF9;
-            PM_int386(0x31,&regs,&regs);
-            if (!regs.x.cflag && regs.e.ecx == 0x43415553 && regs.e.edx == 0x45574159)
-                _PM_haveCauseWay = true;
-            }
+	/* Check if we are running under DPMI in which case we will not be
+	 * able to use our special ring 0 CauseWay functions.
+	 */
+	_PM_haveCauseWay = false;
+	regs.x.ax = 0xFF00;
+	PM_int386(0x31,&regs,&regs);
+	if (regs.x.cflag || !(regs.e.edi & 8)) {
+	    /* We are not under DPMI, so now check if CauseWay is active */
+	    regs.x.ax = 0xFFF9;
+	    PM_int386(0x31,&regs,&regs);
+	    if (!regs.x.cflag && regs.e.ecx == 0x43415553 && regs.e.edx == 0x45574159)
+		_PM_haveCauseWay = true;
+	    }
 
-        /* Now connect to PMHELP.VXD and initialise MTRR module */
-        if (!PMHELP_connect())
-            MTRR_init();
-        }
+	/* Now connect to PMHELP.VXD and initialise MTRR module */
+	if (!PMHELP_connect())
+	    MTRR_init();
+	}
 #endif
 }
 
@@ -311,14 +311,14 @@
     VXD_regs    regs;
 
     if (PMHELP_connect()) {
-        memset(&regs,0,sizeof(regs));
-        regs.eax = API_NUM(PMHELP_ENABLELFBCOMB);
-        regs.ebx = base;
-        regs.ecx = size;
-        regs.edx = type;
-        _PM_VxDCall(&regs,_PM_VXD_off,_PM_VXD_sel);
-        return regs.eax;
-        }
+	memset(&regs,0,sizeof(regs));
+	regs.eax = API_NUM(PMHELP_ENABLELFBCOMB);
+	regs.ebx = base;
+	regs.ecx = size;
+	regs.edx = type;
+	_PM_VxDCall(&regs,_PM_VXD_off,_PM_VXD_sel);
+	return regs.eax;
+	}
     return MTRR_enableWriteCombine(base,size,type);
 #else
     return PM_MTRR_NOT_SUPPORTED;
@@ -346,9 +346,9 @@
 {
     uint pos = strlen(s);
     if (s[pos-1] != '\\') {
-        s[pos] = '\\';
-        s[pos+1] = '\0';
-        }
+	s[pos] = '\\';
+	s[pos+1] = '\0';
+	}
 }
 
 void PMAPI PM_setFatalErrorCleanup(
@@ -360,7 +360,7 @@
 void PMAPI PM_fatalError(const char *msg)
 {
     if (fatalErrorCleanup)
-        fatalErrorCleanup();
+	fatalErrorCleanup();
     fprintf(stderr,"%s\n", msg);
     exit(1);
 }
@@ -368,18 +368,18 @@
 static void ExitVBEBuf(void)
 {
     if (VESABuf_ptr)
-        PM_freeRealSeg(VESABuf_ptr);
+	PM_freeRealSeg(VESABuf_ptr);
     VESABuf_ptr = 0;
 }
 
 void * PMAPI PM_getVESABuf(uint *len,uint *rseg,uint *roff)
 {
     if (!VESABuf_ptr) {
-        /* Allocate a global buffer for communicating with the VESA VBE */
-        if ((VESABuf_ptr = PM_allocRealSeg(VESABuf_len, &VESABuf_rseg, &VESABuf_roff)) == NULL)
-            return NULL;
-        atexit(ExitVBEBuf);
-        }
+	/* Allocate a global buffer for communicating with the VESA VBE */
+	if ((VESABuf_ptr = PM_allocRealSeg(VESABuf_len, &VESABuf_rseg, &VESABuf_roff)) == NULL)
+	    return NULL;
+	atexit(ExitVBEBuf);
+	}
     *len = VESABuf_len;
     *rseg = VESABuf_rseg;
     *roff = VESABuf_roff;
@@ -429,12 +429,12 @@
     int i;
 
     for (i = 0; i < MAX_RM_BLOCKS; i++) {
-        if (rmBlocks[i].p == NULL) {
-            rmBlocks[i].p = mem;
-            rmBlocks[i].tag = tag;
-            return;
-            }
-        }
+	if (rmBlocks[i].p == NULL) {
+	    rmBlocks[i].p = mem;
+	    rmBlocks[i].tag = tag;
+	    return;
+	    }
+	}
     PM_fatalError("To many real mode memory block allocations!");
 }
 
@@ -443,9 +443,9 @@
     int i;
 
     for (i = 0; i < MAX_RM_BLOCKS; i++) {
-        if (rmBlocks[i].p == mem)
-            return rmBlocks[i].tag;
-        }
+	if (rmBlocks[i].p == mem)
+	    return rmBlocks[i].tag;
+	}
     PM_fatalError("Could not find prior real mode memory block allocation!");
     return 0;
 }
@@ -469,19 +469,19 @@
     char        *env;
 
     if ((env = getenv("NUCLEUS_PATH")) != NULL)
-        return env;
+	return env;
     if ((env = getenv("WINBOOTDIR")) != NULL) {
-        /* Running in a Windows 9x DOS box or DOS mode */
-        strcpy(path,env);
-        strcat(path,"\\system\\nucleus");
-        return path;
-        }
+	/* Running in a Windows 9x DOS box or DOS mode */
+	strcpy(path,env);
+	strcat(path,"\\system\\nucleus");
+	return path;
+	}
     if ((env = getenv("SystemRoot")) != NULL) {
-        /* Running in an NT/2K DOS box */
-        strcpy(path,env);
-        strcat(path,"\\system32\\nucleus");
-        return path;
-        }
+	/* Running in an NT/2K DOS box */
+	strcpy(path,env);
+	strcat(path,"\\system32\\nucleus");
+	return path;
+	}
     return "c:\\nucleus";
 }
 
@@ -538,12 +538,12 @@
     sb->oldMode = regs.h.al & 0x7F;
     sb->old50Lines = false;
     if (sb->oldMode == 0x3) {
-        regs.x.ax = 0x1130;
-        regs.x.bx = 0;
-        regs.x.dx = 0;
-        PM_int86(0x10,&regs,&regs);
-        sb->old50Lines = (regs.h.dl == 42 || regs.h.dl == 49);
-        }
+	regs.x.ax = 0x1130;
+	regs.x.bx = 0;
+	regs.x.dx = 0;
+	PM_int86(0x10,&regs,&regs);
+	sb->old50Lines = (regs.h.dl == 42 || regs.h.dl == 49);
+	}
     (void)hwndConsole;
 }
 
@@ -560,10 +560,10 @@
 
     /* Retore 50 line mode if set */
     if (sb->old50Lines) {
-        regs.x.ax = 0x1112;
-        regs.x.bx = 0;
-        PM_int86(0x10,&regs,&regs);
-        }
+	regs.x.ax = 0x1112;
+	regs.x.bx = 0;
+	PM_int86(0x10,&regs,&regs);
+	}
     (void)hwndConsole;
 }
 
@@ -587,13 +587,13 @@
     PM_setWord(_biosPtr+0x4C,width*2);
     PM_setByte(_biosPtr+0x84,height-1);
     if (height > 25) {
-        PM_setWord(_biosPtr+0x60,0x0607);
-        PM_setByte(_biosPtr+0x85,0x08);
-        }
+	PM_setWord(_biosPtr+0x60,0x0607);
+	PM_setByte(_biosPtr+0x85,0x08);
+	}
     else {
-        PM_setWord(_biosPtr+0x60,0x0D0E);
-        PM_setByte(_biosPtr+0x85,0x016);
-        }
+	PM_setWord(_biosPtr+0x60,0x0D0E);
+	PM_setByte(_biosPtr+0x85,0x016);
+	}
 }
 
 void * PMAPI PM_mallocShared(long size)
@@ -623,22 +623,22 @@
 
     /* Create a zero memory mapping for us to use */
     if (firstTime) {
-        rmZeroPtr = PM_mapPhysicalAddr(0,0x7FFF,true);
-        firstTime = false;
-        }
+	rmZeroPtr = PM_mapPhysicalAddr(0,0x7FFF,true);
+	firstTime = false;
+	}
 
     /* Remap the secondary BIOS to 0xC0000 physical */
     if (BIOSPhysAddr != 0xC0000L || BIOSLen > 32768) {
-        /* DOS cannot virtually remap the BIOS, so we can only work if all
-         * the secondary controllers are identical, and we then use the
-         * BIOS on the first controller for all the remaining controllers.
-         *
-         * For OS'es that do virtual memory, and remapping of 0xC0000
-         * physical (perhaps a copy on write mapping) should be all that
-         * is needed.
-         */
-        return false;
-        }
+	/* DOS cannot virtually remap the BIOS, so we can only work if all
+	 * the secondary controllers are identical, and we then use the
+	 * BIOS on the first controller for all the remaining controllers.
+	 *
+	 * For OS'es that do virtual memory, and remapping of 0xC0000
+	 * physical (perhaps a copy on write mapping) should be all that
+	 * is needed.
+	 */
+	return false;
+	}
 
     /* Save current handlers of int 10h and 6Dh */
     GetRMVect(0x10,&Current10);
@@ -656,9 +656,9 @@
 
     /* Second the primary BIOS mappin 1:1 for 0xC0000 physical */
     if (BIOSPhysAddr != 0xC0000L) {
-        /* DOS does not support this */
-        (void)mappedBIOS;
-        }
+	/* DOS does not support this */
+	(void)mappedBIOS;
+	}
     return true;
 }
 
@@ -669,26 +669,26 @@
 
     LZTimerOnExt(&tm);
     while (LZTimerLapExt(&tm) < microseconds)
-        ;
+	;
     LZTimerOffExt(&tm);
 }
 
 int PMAPI PM_getCOMPort(int port)
 {
     switch (port) {
-        case 0: return 0x3F8;
-        case 1: return 0x2F8;
-        }
+	case 0: return 0x3F8;
+	case 1: return 0x2F8;
+	}
     return 0;
 }
 
 int PMAPI PM_getLPTPort(int port)
 {
     switch (port) {
-        case 0: return 0x3BC;
-        case 1: return 0x378;
-        case 2: return 0x278;
-        }
+	case 0: return 0x3BC;
+	case 1: return 0x378;
+	case 2: return 0x278;
+	}
     return 0;
 }
 
@@ -733,15 +733,15 @@
     memset(findData,0,findData->dwSize);
     findData->dwSize = dwSize;
     if (blk->attrib & _A_RDONLY)
-        findData->attrib |= PM_FILE_READONLY;
+	findData->attrib |= PM_FILE_READONLY;
     if (blk->attrib & _A_SUBDIR)
-        findData->attrib |= PM_FILE_DIRECTORY;
+	findData->attrib |= PM_FILE_DIRECTORY;
     if (blk->attrib & _A_ARCH)
-        findData->attrib |= PM_FILE_ARCHIVE;
+	findData->attrib |= PM_FILE_ARCHIVE;
     if (blk->attrib & _A_HIDDEN)
-        findData->attrib |= PM_FILE_HIDDEN;
+	findData->attrib |= PM_FILE_HIDDEN;
     if (blk->attrib & _A_SYSTEM)
-        findData->attrib |= PM_FILE_SYSTEM;
+	findData->attrib |= PM_FILE_SYSTEM;
     findData->sizeLo = blk->size;
     strncpy(findData->name,blk->name,PM_MAX_PATH);
     findData->name[PM_MAX_PATH-1] = 0;
@@ -760,11 +760,11 @@
     struct find_t *blk;
 
     if ((blk = PM_malloc(sizeof(*blk))) == NULL)
-        return PM_FILE_INVALID;
+	return PM_FILE_INVALID;
     if (_dos_findfirst((char*)filename,FIND_MASK,blk) == 0) {
-        convertFindData(findData,blk);
-        return blk;
-        }
+	convertFindData(findData,blk);
+	return blk;
+	}
     return PM_FILE_INVALID;
 }
 
@@ -779,9 +779,9 @@
     struct find_t *blk = handle;
 
     if (_dos_findnext(blk) == 0) {
-        convertFindData(findData,blk);
-        return true;
-        }
+	convertFindData(findData,blk);
+	return true;
+	}
     return false;
 }
 
@@ -813,9 +813,9 @@
 {
     RMREGS  regs;
     regs.h.dl = (uchar)(drive - 'A' + 1);
-    regs.h.ah = 0x36;               // Get disk information service
+    regs.h.ah = 0x36;               /* Get disk information service */
     PM_int86(0x21,&regs,&regs);
-    return regs.x.ax != 0xFFFF;     // AX = 0xFFFF if disk is invalid
+    return regs.x.ax != 0xFFFF;     /* AX = 0xFFFF if disk is invalid */
 }
 
 /****************************************************************************
@@ -848,25 +848,25 @@
     DWORD attr = 0;
 
     if (attrib & PM_FILE_READONLY)
-        attr |= FILE_ATTRIBUTE_READONLY;
+	attr |= FILE_ATTRIBUTE_READONLY;
     if (attrib & PM_FILE_ARCHIVE)
-        attr |= FILE_ATTRIBUTE_ARCHIVE;
+	attr |= FILE_ATTRIBUTE_ARCHIVE;
     if (attrib & PM_FILE_HIDDEN)
-        attr |= FILE_ATTRIBUTE_HIDDEN;
+	attr |= FILE_ATTRIBUTE_HIDDEN;
     if (attrib & PM_FILE_SYSTEM)
-        attr |= FILE_ATTRIBUTE_SYSTEM;
+	attr |= FILE_ATTRIBUTE_SYSTEM;
     SetFileAttributes((LPSTR)filename, attr);
 #else
     uint attr = 0;
 
     if (attrib & PM_FILE_READONLY)
-        attr |= _A_RDONLY;
+	attr |= _A_RDONLY;
     if (attrib & PM_FILE_ARCHIVE)
-        attr |= _A_ARCH;
+	attr |= _A_ARCH;
     if (attrib & PM_FILE_HIDDEN)
-        attr |= _A_HIDDEN;
+	attr |= _A_HIDDEN;
     if (attrib & PM_FILE_SYSTEM)
-        attr |= _A_SYSTEM;
+	attr |= _A_SYSTEM;
     _dos_setfileattr(filename,attr);
 #endif
 }
@@ -910,7 +910,7 @@
      * mapped 1:1 for this memory anyway so we just return the base address.
      */
     if (physAddr < 0x100000L)
-        return physAddr;
+	return physAddr;
 
     /* Search table of existing mappings to see if we have already mapped
      * a region of memory that will serve this purpose. We do this because
@@ -919,20 +919,20 @@
      * more mappings than necessary.
      */
     for (i = 0; i < numMaps; i++) {
-        if (maps[i].physical == physAddr && maps[i].limit == limit)
-            return maps[i].linear;
-        }
+	if (maps[i].physical == physAddr && maps[i].limit == limit)
+	    return maps[i].linear;
+	}
 
     /* Find a free slot in our physical memory mapping table */
     for (i = 0; i < numMaps; i++) {
-        if (maps[i].limit == 0)
-            break;
-        }
+	if (maps[i].limit == 0)
+	    break;
+	}
     if (i == numMaps) {
-        i = numMaps++;
-        if (i == MAX_MEMORY_MAPPINGS)
-            return NULL;
-        }
+	i = numMaps++;
+	if (i == MAX_MEMORY_MAPPINGS)
+	    return NULL;
+	}
 
     /* Round the physical address to a 4Kb boundary and the limit to a
      * 4Kb-1 boundary before passing the values to DPMI as some extenders
@@ -950,7 +950,7 @@
     r.x.di = roundedLimit & 0xFFFF;
     PM_int386(0x31, &r, &r);
     if (r.x.cflag)
-        return 0xFFFFFFFFUL;
+	return 0xFFFFFFFFUL;
     maps[i].physical = physAddr;
     maps[i].limit = limit;
     maps[i].linear = ((ulong)r.x.bx << 16) + r.x.cx + baseOfs;
@@ -967,7 +967,7 @@
     r.x.dx = linAddr & 0xFFFF;
     PM_int386(0x31, &r, &r);
     if (r.x.cflag)
-        return 0;
+	return 0;
     return 1;
 }
 
@@ -991,7 +991,7 @@
     r.x.dx = limit & 0xFFFF;
     PM_int386(0x31, &r, &r);
     if (r.x.cflag)
-        return 0;
+	return 0;
     return 1;
 }
 
@@ -1011,19 +1011,19 @@
      * segment).
      */
     if (limit >= 0x10000L) {
-        r.x.ax = 9;
-        r.x.bx = sel;
-        r.x.cx = 0x40F3;
-        PM_int386(0x31, &r, &r);
-        }
+	r.x.ax = 9;
+	r.x.bx = sel;
+	r.x.cx = 0x40F3;
+	PM_int386(0x31, &r, &r);
+	}
 
     /* Map physical memory and create selector */
     if ((base = DPMI_mapPhysicalToLinear(base,limit)) == 0xFFFFFFFFUL)
-        return 0;
+	return 0;
     if (!DPMI_setSelectorBase(sel,base))
-        return 0;
+	return 0;
     if (!DPMI_setSelectorLimit(sel,limit))
-        return 0;
+	return 0;
     return sel;
 }
 
@@ -1083,39 +1083,39 @@
     andMask = ~0x18;
     orMask = (isCached) ? 0x00 : 0x18;
     if (_PM_pagingEnabled() == 1 && (PDB = _PM_getPDB()) != 0) {
-        if (_PM_haveCauseWay) {
-            /* CauseWay is a little different in the page table handling.
-             * The code that we use for DOS4G/W does not appear to work
-             * with CauseWay correctly as it does not appear to allow us
-             * to map the page tables directly. Instead we can directly
-             * access the page table entries in extended memory where
-             * CauseWay always locates them (starting at 1024*4096*1023)
-             */
-            startPage = (linear >> 12);
-            endPage = ((linear+limit) >> 12);
-            pPageTable = (ulong*)CW_PAGE_TABLE_START;
-            for (iPage = startPage; iPage <= endPage; iPage++)
-                pPageTable[iPage] = (pPageTable[iPage] & andMask) | orMask;
-            }
-        else {
-            pPDB = (ulong*)DPMI_mapPhysicalToLinear(PDB,0xFFF);
-            if (pPDB) {
-                startPDB = (linear >> 22) & 0x3FF;
-                startPage = (linear >> 12) & 0x3FF;
-                endPDB = ((linear+limit) >> 22) & 0x3FF;
-                endPage = ((linear+limit) >> 12) & 0x3FF;
-                for (iPDB = startPDB; iPDB <= endPDB; iPDB++) {
-                    pageTable = pPDB[iPDB] & ~0xFFF;
-                    pPageTable = (ulong*)DPMI_mapPhysicalToLinear(pageTable,0xFFF);
-                    start = (iPDB == startPDB) ? startPage : 0;
-                    end = (iPDB == endPDB) ? endPage : 0x3FF;
-                    for (iPage = start; iPage <= end; iPage++)
-                        pPageTable[iPage] = (pPageTable[iPage] & andMask) | orMask;
-                    }
-                }
-            }
-        PM_flushTLB();
-        }
+	if (_PM_haveCauseWay) {
+	    /* CauseWay is a little different in the page table handling.
+	     * The code that we use for DOS4G/W does not appear to work
+	     * with CauseWay correctly as it does not appear to allow us
+	     * to map the page tables directly. Instead we can directly
+	     * access the page table entries in extended memory where
+	     * CauseWay always locates them (starting at 1024*4096*1023)
+	     */
+	    startPage = (linear >> 12);
+	    endPage = ((linear+limit) >> 12);
+	    pPageTable = (ulong*)CW_PAGE_TABLE_START;
+	    for (iPage = startPage; iPage <= endPage; iPage++)
+		pPageTable[iPage] = (pPageTable[iPage] & andMask) | orMask;
+	    }
+	else {
+	    pPDB = (ulong*)DPMI_mapPhysicalToLinear(PDB,0xFFF);
+	    if (pPDB) {
+		startPDB = (linear >> 22) & 0x3FF;
+		startPage = (linear >> 12) & 0x3FF;
+		endPDB = ((linear+limit) >> 22) & 0x3FF;
+		endPage = ((linear+limit) >> 12) & 0x3FF;
+		for (iPDB = startPDB; iPDB <= endPDB; iPDB++) {
+		    pageTable = pPDB[iPDB] & ~0xFFF;
+		    pPageTable = (ulong*)DPMI_mapPhysicalToLinear(pageTable,0xFFF);
+		    start = (iPDB == startPDB) ? startPage : 0;
+		    end = (iPDB == endPDB) ? endPage : 0x3FF;
+		    for (iPage = start; iPage <= end; iPage++)
+			pPageTable[iPage] = (pPageTable[iPage] & andMask) | orMask;
+		    }
+		}
+	    }
+	PM_flushTLB();
+	}
 #endif
 }
 
@@ -1129,28 +1129,28 @@
     PM_segread(&sregs);
     DSBaseAddr = DPMI_getSelectorBase(sregs.ds);
     if ((base < 0x100000) && (DSBaseAddr == 0)) {
-        /* DS is zero based, so we can directly access the first 1Mb of
-         * system memory (like under DOS4GW).
-         */
-        return (void*)base;
-        }
+	/* DS is zero based, so we can directly access the first 1Mb of
+	 * system memory (like under DOS4GW).
+	 */
+	return (void*)base;
+	}
 
     /* Map the memory to a linear address using DPMI function 0x800 */
     if ((linAddr = DPMI_mapPhysicalToLinear(base,limit)) == 0xFFFFFFFF) {
-        if (base >= 0x100000)
-            return NULL;
-        /* If the linear address mapping fails but we are trying to
-         * map an area in the first 1Mb of system memory, then we must
-         * be running under a Windows or OS/2 DOS box. Under these
-         * environments we can use the segment wrap around as a fallback
-         * measure, as this does work properly.
-         */
-        linAddr = base;
-        }
+	if (base >= 0x100000)
+	    return NULL;
+	/* If the linear address mapping fails but we are trying to
+	 * map an area in the first 1Mb of system memory, then we must
+	 * be running under a Windows or OS/2 DOS box. Under these
+	 * environments we can use the segment wrap around as a fallback
+	 * measure, as this does work properly.
+	 */
+	linAddr = base;
+	}
 
     /* Now expand the default DS selector to 4Gb so we can access it */
     if (!DPMI_setSelectorLimit(sregs.ds,0xFFFFFFFFUL))
-        return NULL;
+	return NULL;
 
     /* Finally enable caching for the page tables that we just mapped in,
      * since DOS4GW and PMODE/W create the page table entries without
@@ -1162,7 +1162,7 @@
      * caching) so that MMIO register regions do not screw up.
      */
     if (DSBaseAddr == 0)
-        PM_adjustPageTables(linAddr,limit,isCached);
+	PM_adjustPageTables(linAddr,limit,isCached);
 
     /* Now return the base address of the memory into the default DS */
     return (void*)(linAddr - DSBaseAddr);
@@ -1192,10 +1192,10 @@
     uint    oldSeg,oldOff;
 
     if (!crPtr) {
-        /* Allocate and copy the memory block only once */
-        crPtr = PM_allocRealSeg(sizeof(int6AHandler), &crRSeg, &crROff);
-        memcpy(crPtr,int6AHandler,sizeof(int6AHandler));
-        }
+	/* Allocate and copy the memory block only once */
+	crPtr = PM_allocRealSeg(sizeof(int6AHandler), &crRSeg, &crROff);
+	memcpy(crPtr,int6AHandler,sizeof(int6AHandler));
+	}
     PM_setWord(crPtr,off);              /* Plug in address to call  */
     PM_setWord(crPtr+2,seg);
     p = PM_mapRealPointer(0,0x6A * 4);
@@ -1234,14 +1234,14 @@
      * helper VxD services to allocate the memory that we need.
      */
     if (VXD_version) {
-        memset(&regs,0,sizeof(regs));
-        regs.eax = API_NUM(PMHELP_ALLOCLOCKED);
-        regs.ebx = size;
-        regs.ecx = (ulong)physAddr;
-        regs.edx = contiguous | (below16Meg << 8);
-        _PM_VxDCall(&regs,_PM_VXD_off,_PM_VXD_sel);
-        return (void*)regs.eax;
-        }
+	memset(&regs,0,sizeof(regs));
+	regs.eax = API_NUM(PMHELP_ALLOCLOCKED);
+	regs.ebx = size;
+	regs.ecx = (ulong)physAddr;
+	regs.edx = contiguous | (below16Meg << 8);
+	_PM_VxDCall(&regs,_PM_VXD_off,_PM_VXD_sel);
+	return (void*)regs.eax;
+	}
 
     /* If the memory is not contiguous, we simply need to allocate it
      * using regular memory allocation services, and lock it down
@@ -1257,19 +1257,19 @@
      * size rounded up to the next 4K boundary.
      */
     if (!contiguous)
-        p = PM_malloc(roundedSize);
+	p = PM_malloc(roundedSize);
     else
 #endif
-        p = PM_allocRealSeg(roundedSize,&r_seg,&r_off);
+	p = PM_allocRealSeg(roundedSize,&r_seg,&r_off);
     if (p == NULL)
-        return NULL;
+	return NULL;
     roundedP = (void*)(((ulong)p + 0xFFF) & ~0xFFF);
     *((ulong*)(roundedP + size)) = (ulong)p;
     PM_lockDataPages(roundedP,size,&lh);
     if ((*physAddr = PM_getPhysicalAddr(roundedP)) == 0xFFFFFFFF) {
-        PM_freeLockedMem(roundedP,size,contiguous);
-        return NULL;
-        }
+	PM_freeLockedMem(roundedP,size,contiguous);
+	return NULL;
+	}
 
     /* Disable caching for the memory since it is probably a DMA buffer */
 #ifndef REALMODE
@@ -1289,22 +1289,22 @@
     PM_lockHandle   lh; /* Unused in DOS */
 
     if (!p)
-        return;
+	return;
     if (VXD_version) {
-        memset(&regs,0,sizeof(regs));
-        regs.eax = API_NUM(PMHELP_FREELOCKED);
-        regs.ebx = (ulong)p;
-        regs.ecx = size;
-        regs.edx = contiguous;
-        _PM_VxDCall(&regs,_PM_VXD_off,_PM_VXD_sel);
-        return;
-        }
+	memset(&regs,0,sizeof(regs));
+	regs.eax = API_NUM(PMHELP_FREELOCKED);
+	regs.ebx = (ulong)p;
+	regs.ecx = size;
+	regs.edx = contiguous;
+	_PM_VxDCall(&regs,_PM_VXD_off,_PM_VXD_sel);
+	return;
+	}
     PM_unlockDataPages(p,size,&lh);
     if (!contiguous)
-        free(*((void**)((uchar*)p + size)));
+	free(*((void**)((uchar*)p + size)));
     else
 #endif
-        PM_freeRealSeg(*((void**)((char*)p + size)));
+	PM_freeRealSeg(*((void**)((char*)p + size)));
 }
 
 #ifndef REALMODE
@@ -1321,11 +1321,11 @@
     /* Allocate memory for the new page block, and add to head of list */
     size = PAGES_PER_BLOCK * PM_PAGE_SIZE + (PM_PAGE_SIZE-1) + sizeof(pageblock);
     if ((newBlock = PM_malloc(size)) == NULL)
-        return NULL;
+	return NULL;
     newBlock->prev = NULL;
     newBlock->next = pageBlocks;
     if (pageBlocks)
-        pageBlocks->prev = newBlock;
+	pageBlocks->prev = newBlock;
     pageBlocks = newBlock;
 
     /* Initialise the page aligned free list for the page block */
@@ -1334,7 +1334,7 @@
     newBlock->freeListStart = newBlock->freeList;
     newBlock->freeListEnd = p + (PAGES_PER_BLOCK-1) * PM_PAGE_SIZE;
     for (i = 0; i < PAGES_PER_BLOCK; i++,p = next)
-        FREELIST_NEXT(p) = next = p + PM_PAGE_SIZE;
+	FREELIST_NEXT(p) = next = p + PM_PAGE_SIZE;
     FREELIST_NEXT(p - PM_PAGE_SIZE) = NULL;
     return newBlock;
 }
@@ -1355,27 +1355,27 @@
 
     /* Call the helper VxD for this service if we are running in a DOS box */
     if (VXD_version) {
-        memset(&regs,0,sizeof(regs));
-        regs.eax = API_NUM(PMHELP_ALLOCPAGE);
-        regs.ebx = locked;
-        _PM_VxDCall(&regs,_PM_VXD_off,_PM_VXD_sel);
-        return (void*)regs.eax;
-        }
+	memset(&regs,0,sizeof(regs));
+	regs.eax = API_NUM(PMHELP_ALLOCPAGE);
+	regs.ebx = locked;
+	_PM_VxDCall(&regs,_PM_VXD_off,_PM_VXD_sel);
+	return (void*)regs.eax;
+	}
 
     /* Scan the block list looking for any free blocks. Allocate a new
      * page block if no free blocks are found.
      */
     for (block = pageBlocks; block != NULL; block = block->next) {
-        if (block->freeCount)
-            break;
-        }
+	if (block->freeCount)
+	    break;
+	}
     if (block == NULL && (block = PM_addNewPageBlock()) == NULL)
-        return NULL;
+	return NULL;
     block->freeCount--;
     p = block->freeList;
     block->freeList = FREELIST_NEXT(p);
     if (locked)
-        PM_lockDataPages(p,PM_PAGE_SIZE,&lh);
+	PM_lockDataPages(p,PM_PAGE_SIZE,&lh);
     return p;
 #else
     return NULL;
@@ -1395,42 +1395,42 @@
 
     /* Call the helper VxD for this service if we are running in a DOS box */
     if (VXD_version) {
-        memset(&regs,0,sizeof(regs));
-        regs.eax = API_NUM(PMHELP_FREEPAGE);
-        regs.ebx = (ulong)p;
-        _PM_VxDCall(&regs,_PM_VXD_off,_PM_VXD_sel);
-        return;
-        }
+	memset(&regs,0,sizeof(regs));
+	regs.eax = API_NUM(PMHELP_FREEPAGE);
+	regs.ebx = (ulong)p;
+	_PM_VxDCall(&regs,_PM_VXD_off,_PM_VXD_sel);
+	return;
+	}
 
     /* First find the page block that this page belongs to */
     for (block = pageBlocks; block != NULL; block = block->next) {
-        if (p >= block->freeListStart && p <= block->freeListEnd)
-            break;
-        }
+	if (p >= block->freeListStart && p <= block->freeListEnd)
+	    break;
+	}
     CHECK(block != NULL);
 
     /* Now free the block by adding it to the free list */
     FREELIST_NEXT(p) = block->freeList;
     block->freeList = p;
     if (++block->freeCount == PAGES_PER_BLOCK) {
-        /* If all pages in the page block are now free, free the entire
-         * page block itself.
-         */
-        if (block == pageBlocks) {
-            /* Delete from head */
-            pageBlocks = block->next;
-            if (block->next)
-                block->next->prev = NULL;
-            }
-        else {
-            /* Delete from middle of list */
-            CHECK(block->prev != NULL);
-            block->prev->next = block->next;
-            if (block->next)
-                block->next->prev = block->prev;
-            }
-        PM_free(block);
-        }
+	/* If all pages in the page block are now free, free the entire
+	 * page block itself.
+	 */
+	if (block == pageBlocks) {
+	    /* Delete from head */
+	    pageBlocks = block->next;
+	    if (block->next)
+		block->next->prev = NULL;
+	    }
+	else {
+	    /* Delete from middle of list */
+	    CHECK(block->prev != NULL);
+	    block->prev->next = block->next;
+	    if (block->next)
+		block->next->prev = block->prev;
+	    }
+	PM_free(block);
+	}
 #else
     (void)p;
 #endif
@@ -1444,7 +1444,7 @@
 
 #ifndef MK_FP
 #define MK_FP(s,o)  ( (void far *)( ((ulong)(s) << 16) + \
-                    (ulong)(o) ))
+		    (ulong)(o) ))
 #endif
 
 void * PMAPI PM_mapRealPointer(uint r_seg,uint r_off)
@@ -1534,7 +1534,7 @@
 void * PMAPI PM_getBIOSPointer(void)
 {
     if (!zeroPtr)
-        zeroPtr = PM_mapPhysicalAddr(0,0xFFFFF,true);
+	zeroPtr = PM_mapPhysicalAddr(0,0xFFFFF,true);
     return (void*)(zeroPtr + 0x400);
 }
 
@@ -1542,7 +1542,7 @@
 {
     static void *bankPtr;
     if (!bankPtr)
-        bankPtr = PM_mapPhysicalAddr(0xA0000,0xFFFF,true);
+	bankPtr = PM_mapPhysicalAddr(0xA0000,0xFFFF,true);
     return bankPtr;
 }
 
@@ -1561,16 +1561,16 @@
      * running at ring 0 (ie: under real DOS).
      */
     if (VXD_version == -1)
-        PM_init();
+	PM_init();
     if (VXD_version) {
-        memset(&regs,0,sizeof(regs));
-        regs.eax = API_NUM(PMHELP_MAPPHYS);
-        regs.ebx = base;
-        regs.ecx = limit;
-        regs.edx = isCached;
-        _PM_VxDCall(&regs,_PM_VXD_off,_PM_VXD_sel);
-        return (void*)regs.eax;
-        }
+	memset(&regs,0,sizeof(regs));
+	regs.eax = API_NUM(PMHELP_MAPPHYS);
+	regs.ebx = base;
+	regs.ecx = limit;
+	regs.edx = isCached;
+	_PM_VxDCall(&regs,_PM_VXD_off,_PM_VXD_sel);
+	return (void*)regs.eax;
+	}
 
     /* Round the physical address to a 4Kb boundary and the limit to a
      * 4Kb-1 boundary before passing the values to TNT. If we round the
@@ -1583,15 +1583,15 @@
     _dx_config_inf(&config, (UCHAR*)&config);
     err = _dx_map_phys(config.c_ds_sel,baseAddr,(newLimit + 4095) / 4096,&offset);
     if (err == 130) {
-        /* If the TNT function failed, we are running in a DPMI environment
-         * and this function does not work. However we know how to handle
-         * DPMI properly, so we use our generic DPMI functions to do
-         * what the TNT runtime libraries can't.
-         */
-        return DPMI_mapPhysicalAddr(base,limit,isCached);
-        }
+	/* If the TNT function failed, we are running in a DPMI environment
+	 * and this function does not work. However we know how to handle
+	 * DPMI properly, so we use our generic DPMI functions to do
+	 * what the TNT runtime libraries can't.
+	 */
+	return DPMI_mapPhysicalAddr(base,limit,isCached);
+	}
     if (err == 0)
-        return (void*)(offset + baseOfs);
+	return (void*)(offset + baseOfs);
     return NULL;
 }
 
@@ -1611,7 +1611,7 @@
 void * PMAPI PM_mapRealPointer(uint r_seg,uint r_off)
 {
     if (!zeroPtr)
-        zeroPtr = PM_mapPhysicalAddr(0,0xFFFFF);
+	zeroPtr = PM_mapPhysicalAddr(0,0xFFFFF);
     return (void*)(zeroPtr + MK_PHYS(r_seg,r_off));
 }
 
@@ -1621,7 +1621,7 @@
     void    *p;
 
     if (_dx_real_alloc((size + 0xF) >> 4,&addr,&t) != 0)
-        return 0;
+	return 0;
     *r_seg = addr;                  /* Real mode segment address    */
     *r_off = 0;                     /* Real mode segment offset     */
     p = PM_mapRealPointer(*r_seg,*r_off);
@@ -1732,7 +1732,7 @@
     r.x.bx = (size + 0xF) >> 4;     /* Number of paragraphs to allocate */
     PM_int386(0x21, &r, &r);        /* Call DOS extender                */
     if (r.x.cflag)
-        return 0;                   /* Could not allocate the memory    */
+	return 0;                   /* Could not allocate the memory    */
     *r_seg = r.e.eax;
     *r_off = 0;
     return PM_mapRealPointer(*r_seg,*r_off);
@@ -1828,19 +1828,19 @@
      * running at ring 0 (ie: under real DOS).
      */
     if (VXD_version == -1)
-        PM_init();
+	PM_init();
     if (VXD_version) {
-        memset(&regs,0,sizeof(regs));
-        regs.eax = API_NUM(PMHELP_MAPPHYS);
-        regs.ebx = base;
-        regs.ecx = limit;
-        regs.edx = isCached;
-        _PM_VxDCall(&regs,_PM_VXD_off,_PM_VXD_sel);
-        return (void*)regs.eax;
-        }
+	memset(&regs,0,sizeof(regs));
+	regs.eax = API_NUM(PMHELP_MAPPHYS);
+	regs.ebx = base;
+	regs.ecx = limit;
+	regs.edx = isCached;
+	_PM_VxDCall(&regs,_PM_VXD_off,_PM_VXD_sel);
+	return (void*)regs.eax;
+	}
 
     if (base > 0x100000)
-        return _x386_map_physical_address((void*)base,limit);
+	return _x386_map_physical_address((void*)base,limit);
     return (void*)((ulong)_x386_zero_base_ptr + base);
 }
 
@@ -1872,7 +1872,7 @@
     /* Get physical memory available */
     *physical = _X32_getPhysMem();
     if (*physical > *total)
-        *physical = *total;
+	*physical = *total;
 }
 
 #endif
@@ -1908,16 +1908,16 @@
      * running at ring 0 (ie: under real DOS).
      */
     if (VXD_version == -1)
-        PM_init();
+	PM_init();
     if (VXD_version) {
-        memset(&regs,0,sizeof(regs));
-        regs.eax = API_NUM(PMHELP_MAPPHYS);
-        regs.ebx = base;
-        regs.ecx = limit;
-        regs.edx = isCached;
-        _PM_VxDCall(&regs,_PM_VXD_off,_PM_VXD_sel);
-        return (void*)regs.eax;
-        }
+	memset(&regs,0,sizeof(regs));
+	regs.eax = API_NUM(PMHELP_MAPPHYS);
+	regs.ebx = base;
+	regs.ecx = limit;
+	regs.edx = isCached;
+	_PM_VxDCall(&regs,_PM_VXD_off,_PM_VXD_sel);
+	return (void*)regs.eax;
+	}
     return DPMI_mapPhysicalAddr(base,limit,isCached);
 }
 
@@ -1932,7 +1932,7 @@
 {
     ulong   physAddr;
     if (!PM_getPhysicalAddrRange(p,1,&physAddr))
-        return 0xFFFFFFFF;
+	return 0xFFFFFFFF;
     return physAddr | ((ulong)p & 0xFFF);
 }
 
@@ -1950,14 +1950,14 @@
      * helper VxD services to find the physical address of an address.
      */
     if (VXD_version) {
-        memset(&regs,0,sizeof(regs));
-        regs.eax = API_NUM(PMHELP_GETPHYSICALADDRRANGE);
-        regs.ebx = (ulong)p;
-        regs.ecx = (ulong)length;
-        regs.edx = (ulong)physAddress;
-        _PM_VxDCall(&regs,_PM_VXD_off,_PM_VXD_sel);
-        return regs.eax;
-        }
+	memset(&regs,0,sizeof(regs));
+	regs.eax = API_NUM(PMHELP_GETPHYSICALADDRRANGE);
+	regs.ebx = (ulong)p;
+	regs.ecx = (ulong)length;
+	regs.edx = (ulong)physAddress;
+	_PM_VxDCall(&regs,_PM_VXD_off,_PM_VXD_sel);
+	return regs.eax;
+	}
 
     /* Find base address for default DS selector */
     PM_segread(&sregs);
@@ -1970,38 +1970,38 @@
     pte = *((ulong*)p);
 #ifdef  DOS4GW
     if (_PM_pagingEnabled() == 0) {
-        int     count;
-        ulong   linAddr = (ulong)p;
+	int     count;
+	ulong   linAddr = (ulong)p;
 
-        /* When paging is disabled physical=linear */
-        for (count = (length+0xFFF) >> 12; count > 0; count--) {
-            *physAddress++ = linAddr;
-            linAddr += 4096;
-            }
-        return true;
-        }
+	/* When paging is disabled physical=linear */
+	for (count = (length+0xFFF) >> 12; count > 0; count--) {
+	    *physAddress++ = linAddr;
+	    linAddr += 4096;
+	    }
+	return true;
+	}
     else if ((PDB = _PM_getPDB()) != 0 && DSBaseAddr == 0) {
-        int     startPDB,endPDB,iPDB,startPage,endPage,start,end,iPage;
-        ulong   pageTable,*pPageTable,linAddr = (ulong)p;
-        ulong   limit = length-1;
+	int     startPDB,endPDB,iPDB,startPage,endPage,start,end,iPage;
+	ulong   pageTable,*pPageTable,linAddr = (ulong)p;
+	ulong   limit = length-1;
 
-        pPDB = (ulong*)DPMI_mapPhysicalToLinear(PDB,0xFFF);
-        if (pPDB) {
-            startPDB = (linAddr >> 22) & 0x3FFL;
-            startPage = (linAddr >> 12) & 0x3FFL;
-            endPDB = ((linAddr+limit) >> 22) & 0x3FFL;
-            endPage = ((linAddr+limit) >> 12) & 0x3FFL;
-            for (iPDB = startPDB; iPDB <= endPDB; iPDB++) {
-                pageTable = pPDB[iPDB] & ~0xFFFL;
-                pPageTable = (ulong*)DPMI_mapPhysicalToLinear(pageTable,0xFFF);
-                start = (iPDB == startPDB) ? startPage : 0;
-                end = (iPDB == endPDB) ? endPage : 0x3FFL;
-                for (iPage = start; iPage <= end; iPage++)
-                    *physAddress++ = (pPageTable[iPage] & ~0xFFF);
-                }
-            return true;
-            }
-        }
+	pPDB = (ulong*)DPMI_mapPhysicalToLinear(PDB,0xFFF);
+	if (pPDB) {
+	    startPDB = (linAddr >> 22) & 0x3FFL;
+	    startPage = (linAddr >> 12) & 0x3FFL;
+	    endPDB = ((linAddr+limit) >> 22) & 0x3FFL;
+	    endPage = ((linAddr+limit) >> 12) & 0x3FFL;
+	    for (iPDB = startPDB; iPDB <= endPDB; iPDB++) {
+		pageTable = pPDB[iPDB] & ~0xFFFL;
+		pPageTable = (ulong*)DPMI_mapPhysicalToLinear(pageTable,0xFFF);
+		start = (iPDB == startPDB) ? startPage : 0;
+		end = (iPDB == endPDB) ? endPage : 0x3FFL;
+		for (iPage = start; iPage <= end; iPage++)
+		    *physAddress++ = (pPageTable[iPage] & ~0xFFF);
+		}
+	    return true;
+	    }
+	}
 #endif
     return false;
 }
@@ -2017,7 +2017,7 @@
     static uchar *zeroPtr = NULL;
 
     if (!zeroPtr)
-        zeroPtr = PM_mapPhysicalAddr(0,0xFFFFF,true);
+	zeroPtr = PM_mapPhysicalAddr(0,0xFFFFF,true);
     return (void*)(zeroPtr + MK_PHYS(r_seg,r_off));
 }
 
@@ -2030,7 +2030,7 @@
     r.x.bx = (size + 0xF) >> 4;     /* number of paragraphs             */
     PM_int386(0x31, &r, &r);
     if (r.x.cflag)
-        return NULL;                /* DPMI call failed                 */
+	return NULL;                /* DPMI call failed                 */
     *r_seg = r.x.ax;                /* Real mode segment                */
     *r_off = 0;
     p = PM_mapRealPointer(*r_seg,*r_off);
@@ -2043,10 +2043,10 @@
     PMREGS  r;
 
     if (mem) {
-        r.x.ax = 0x101;                     /* DPMI free DOS memory         */
-        r.x.dx = _PM_findRealModeBlock(mem);/* DX := selector from 0x100    */
-        PM_int386(0x31, &r, &r);
-        }
+	r.x.ax = 0x101;                     /* DPMI free DOS memory         */
+	r.x.dx = _PM_findRealModeBlock(mem);/* DX := selector from 0x100    */
+	PM_int386(0x31, &r, &r);
+	}
 }
 
 static DPMI_handler_t   DPMI_int10 = NULL;
@@ -2062,9 +2062,9 @@
     PMSREGS     sr;
 
     if (intno == 0x10 && DPMI_int10) {
-        if (DPMI_int10(regs))
-            return;
-        }
+	if (DPMI_int10(regs))
+	    return;
+	}
     PM_segread(&sr);
     r.x.ax = 0x300;                 /* DPMI issue real interrupt    */
     r.h.bl = intno;
@@ -2116,17 +2116,17 @@
 #pragma pack(1)
 
 typedef struct {
-        uint    LargestBlockAvail;
-        uint    MaxUnlockedPage;
-        uint    LargestLockablePage;
-        uint    LinAddrSpace;
-        uint    NumFreePagesAvail;
-        uint    NumPhysicalPagesFree;
-        uint    TotalPhysicalPages;
-        uint    FreeLinAddrSpace;
-        uint    SizeOfPageFile;
-        uint    res[3];
-        } MemInfo;
+	uint    LargestBlockAvail;
+	uint    MaxUnlockedPage;
+	uint    LargestLockablePage;
+	uint    LinAddrSpace;
+	uint    NumFreePagesAvail;
+	uint    NumPhysicalPagesFree;
+	uint    TotalPhysicalPages;
+	uint    FreeLinAddrSpace;
+	uint    SizeOfPageFile;
+	uint    res[3];
+	} MemInfo;
 
 #pragma pack()
 
@@ -2144,7 +2144,7 @@
     *physical = memInfo.NumPhysicalPagesFree * 4096;
     *total = memInfo.LargestBlockAvail;
     if (*total < *physical)
-        *physical = *total;
+	*physical = *total;
 }
 
 #endif
@@ -2212,7 +2212,7 @@
 uint PMAPI PM_getFileAttr(
     const char *filename)
 {
-    // TODO: Implement this!
+    /* TODO: Implement this! */
     return 0;
 }
 
@@ -2225,7 +2225,7 @@
     ibool gmTime,
     PM_time *time)
 {
-    // TODO: Implement this!
+    /* TODO: Implement this! */
     return false;
 }
 
@@ -2238,6 +2238,6 @@
     ibool gmTime,
     PM_time *time)
 {
-    // TODO: Implement this!
+    /* TODO: Implement this! */
     return false;
 }

diff --git a/board/MAI/bios_emulator/scitech/src/pm/dos/pmdos.c b/board/MAI/bios_emulator/scitech/src/pm/dos/pmdos.c
index 74f8427..eecc2da 100644
--- a/board/MAI/bios_emulator/scitech/src/pm/dos/pmdos.c
+++ b/board/MAI/bios_emulator/scitech/src/pm/dos/pmdos.c

@@ -160,47 +160,47 @@
     regs.x.ax = hardReset ? 0 : 33;
     PM_int86(0x33, &regs, &regs);
     if (oldHandler)
-        PM_setMouseHandler(_PM_mouseMask, oldHandler);
+	PM_setMouseHandler(_PM_mouseMask, oldHandler);
 }
 
 void PMAPI PM_setRealTimeClockFrequency(int frequency)
 {
     static short convert[] = {
-        8192,
-        4096,
-        2048,
-        1024,
-        512,
-        256,
-        128,
-        64,
-        32,
-        16,
-        8,
-        4,
-        2,
-        -1,
-        };
+	8192,
+	4096,
+	2048,
+	1024,
+	512,
+	256,
+	128,
+	64,
+	32,
+	16,
+	8,
+	4,
+	2,
+	-1,
+	};
     int i;
 
     /* First clear any pending RTC timeout if not cleared */
     _PM_readCMOS(0x0C);
     if (frequency == 0) {
-        /* Disable RTC timout */
-        _PM_writeCMOS(0x0A,_PM_oldCMOSRegA);
-        _PM_writeCMOS(0x0B,_PM_oldCMOSRegB & 0x0F);
-        }
+	/* Disable RTC timout */
+	_PM_writeCMOS(0x0A,_PM_oldCMOSRegA);
+	_PM_writeCMOS(0x0B,_PM_oldCMOSRegB & 0x0F);
+	}
     else {
-        /* Convert frequency value to RTC clock indexes */
-        for (i = 0; convert[i] != -1; i++) {
-            if (convert[i] == frequency)
-                break;
-            }
+	/* Convert frequency value to RTC clock indexes */
+	for (i = 0; convert[i] != -1; i++) {
+	    if (convert[i] == frequency)
+		break;
+	    }
 
-        /* Set RTC timout value and enable timeout */
-        _PM_writeCMOS(0x0A,0x20 | (i+3));
-        _PM_writeCMOS(0x0B,(_PM_oldCMOSRegB & 0x0F) | 0x40);
-        }
+	/* Set RTC timout value and enable timeout */
+	_PM_writeCMOS(0x0A,0x20 | (i+3));
+	_PM_writeCMOS(0x0B,(_PM_oldCMOSRegB & 0x0F) | 0x40);
+	}
 }
 
 #ifndef REALMODE
@@ -216,18 +216,18 @@
      * under real mode.
      */
     if (!locked) {
-        PM_saveDS();
-        stat  = !PM_lockDataPages(&globalDataStart-2048,4096,&lh);
-        stat |= !PM_lockDataPages(&_PM_pmdosDataStart,(int)&_PM_pmdosDataEnd - (int)&_PM_pmdosDataStart,&lh);
-        stat |= !PM_lockCodePages((__codePtr)_PM_pmdosCodeStart,(int)_PM_pmdosCodeEnd-(int)_PM_pmdosCodeStart,&lh);
-        stat |= !PM_lockDataPages(&_PM_DMADataStart,(int)&_PM_DMADataEnd - (int)&_PM_DMADataStart,&lh);
-        stat |= !PM_lockCodePages((__codePtr)_PM_DMACodeStart,(int)_PM_DMACodeEnd-(int)_PM_DMACodeStart,&lh);
-        if (stat) {
-            printf("Page locking services failed - interrupt handling not safe!\n");
-            exit(1);
-            }
-        locked = 1;
-        }
+	PM_saveDS();
+	stat  = !PM_lockDataPages(&globalDataStart-2048,4096,&lh);
+	stat |= !PM_lockDataPages(&_PM_pmdosDataStart,(int)&_PM_pmdosDataEnd - (int)&_PM_pmdosDataStart,&lh);
+	stat |= !PM_lockCodePages((__codePtr)_PM_pmdosCodeStart,(int)_PM_pmdosCodeEnd-(int)_PM_pmdosCodeStart,&lh);
+	stat |= !PM_lockDataPages(&_PM_DMADataStart,(int)&_PM_DMADataEnd - (int)&_PM_DMADataStart,&lh);
+	stat |= !PM_lockCodePages((__codePtr)_PM_DMACodeStart,(int)_PM_DMACodeEnd-(int)_PM_DMACodeStart,&lh);
+	if (stat) {
+	    printf("Page locking services failed - interrupt handling not safe!\n");
+	    exit(1);
+	    }
+	locked = 1;
+	}
 }
 
 #endif
@@ -240,7 +240,7 @@
 
 #ifndef MK_FP
 #define MK_FP(s,o)  ( (void far *)( ((ulong)(s) << 16) + \
-                    (ulong)(o) ))
+		    (ulong)(o) ))
 #endif
 
 int PMAPI PM_setMouseHandler(int mask, PM_mouseHandler mh)
@@ -256,10 +256,10 @@
     union REGS      regs;
 
     if (_PM_mouseHandler) {
-        regs.x.ax = 33;
-        int86(0x33, &regs, &regs);
-        _PM_mouseHandler = NULL;
-        }
+	regs.x.ax = 33;
+	int86(0x33, &regs, &regs);
+	_PM_mouseHandler = NULL;
+	}
 }
 
 void PMAPI PM_setTimerHandler(PM_intHandler th)
@@ -272,9 +272,9 @@
 void PMAPI PM_restoreTimerHandler(void)
 {
     if (_PM_timerHandler) {
-        _PM_setRMvect(0x8, (long)_PM_prevTimer);
-        _PM_timerHandler = NULL;
-        }
+	_PM_setRMvect(0x8, (long)_PM_prevTimer);
+	_PM_timerHandler = NULL;
+	}
 }
 
 ibool PMAPI PM_setRealTimeClockHandler(PM_intHandler th,int frequency)
@@ -300,15 +300,15 @@
 void PMAPI PM_restoreRealTimeClockHandler(void)
 {
     if (_PM_rtcHandler) {
-        /* Restore CMOS registers and mask RTC clock */
-        _PM_writeCMOS(0x0A,_PM_oldCMOSRegA);
-        _PM_writeCMOS(0x0B,_PM_oldCMOSRegB);
-        PM_outpb(0xA1,(PM_inpb(0xA1) & 0xFE) | (_PM_oldRTCPIC2 & ~0xFE));
+	/* Restore CMOS registers and mask RTC clock */
+	_PM_writeCMOS(0x0A,_PM_oldCMOSRegA);
+	_PM_writeCMOS(0x0B,_PM_oldCMOSRegB);
+	PM_outpb(0xA1,(PM_inpb(0xA1) & 0xFE) | (_PM_oldRTCPIC2 & ~0xFE));
 
-        /* Restore the interrupt vector */
-        _PM_setRMvect(0x70, (long)_PM_prevRTC);
-        _PM_rtcHandler = NULL;
-        }
+	/* Restore the interrupt vector */
+	_PM_setRMvect(0x70, (long)_PM_prevRTC);
+	_PM_rtcHandler = NULL;
+	}
 }
 
 void PMAPI PM_setKeyHandler(PM_intHandler kh)
@@ -321,9 +321,9 @@
 void PMAPI PM_restoreKeyHandler(void)
 {
     if (_PM_keyHandler) {
-        _PM_setRMvect(0x9, (long)_PM_prevKey);
-        _PM_keyHandler = NULL;
-        }
+	_PM_setRMvect(0x9, (long)_PM_prevKey);
+	_PM_keyHandler = NULL;
+	}
 }
 
 void PMAPI PM_setKey15Handler(PM_key15Handler kh)
@@ -336,9 +336,9 @@
 void PMAPI PM_restoreKey15Handler(void)
 {
     if (_PM_key15Handler) {
-        _PM_setRMvect(0x15, (long)_PM_prevKey15);
-        _PM_key15Handler = NULL;
-        }
+	_PM_setRMvect(0x15, (long)_PM_prevKey15);
+	_PM_key15Handler = NULL;
+	}
 }
 
 void PMAPI PM_installAltBreakHandler(PM_breakHandler bh)
@@ -362,11 +362,11 @@
 void PMAPI PM_restoreBreakHandler(void)
 {
     if (_PM_prevBreak) {
-        _PM_setRMvect(0x1B, (long)_PM_prevBreak);
-        _PM_setRMvect(0x23, (long)_PM_prevCtrlC);
-        _PM_prevBreak = NULL;
-        _PM_breakHandler = NULL;
-        }
+	_PM_setRMvect(0x1B, (long)_PM_prevBreak);
+	_PM_setRMvect(0x23, (long)_PM_prevCtrlC);
+	_PM_prevBreak = NULL;
+	_PM_breakHandler = NULL;
+	}
 }
 
 void PMAPI PM_installAltCriticalHandler(PM_criticalHandler ch)
@@ -387,10 +387,10 @@
 void PMAPI PM_restoreCriticalHandler(void)
 {
     if (_PM_prevCritical) {
-        _PM_setRMvect(0x24, (long)_PM_prevCritical);
-        _PM_prevCritical = NULL;
-        _PM_critHandler = NULL;
-        }
+	_PM_setRMvect(0x24, (long)_PM_prevCritical);
+	_PM_prevCritical = NULL;
+	_PM_critHandler = NULL;
+	}
 }
 
 int PMAPI PM_lockDataPages(void *p,uint len,PM_lockHandle *lh)
@@ -499,7 +499,7 @@
 
     /* Copy the real mode handler to real mode memory   */
     if ((p = PM_allocRealSeg(sizeof(realHandler),rseg,roff)) == NULL)
-        return NULL;
+	return NULL;
     memcpy(p,realHandler,sizeof(realHandler));
 
     /* Skip past global variabls in real mode code segment */
@@ -516,7 +516,7 @@
     lockPMHandlers();           /* Ensure our handlers are locked   */
 
     if ((mousePtr = installCallback(_PM_mouseISR, &rseg, &roff)) == NULL)
-        return 0;
+	return 0;
     _PM_mouseHandler = mh;
 
     /* Install the real mode mouse handler  */
@@ -533,11 +533,11 @@
     RMREGS  regs;
 
     if (_PM_mouseHandler) {
-        regs.x.ax = 33;
-        PM_int86(0x33, &regs, &regs);
-        PM_freeRealSeg(mousePtr);
-        _PM_mouseHandler = NULL;
-        }
+	regs.x.ax = 33;
+	PM_int86(0x33, &regs, &regs);
+	PM_freeRealSeg(mousePtr);
+	_PM_mouseHandler = NULL;
+	}
 }
 
 void PMAPI PM_getPMvect(int intno, PMFARPTR *isr)
@@ -602,9 +602,9 @@
 void PMAPI PM_restoreTimerHandler(void)
 {
     if (_PM_timerHandler) {
-        restoreISR(0x8, _PM_prevTimer, _PM_prevRealTimer);
-        _PM_timerHandler = NULL;
-        }
+	restoreISR(0x8, _PM_prevTimer, _PM_prevRealTimer);
+	_PM_timerHandler = NULL;
+	}
 }
 
 ibool PMAPI PM_setRealTimeClockHandler(PM_intHandler th,int frequency)
@@ -630,15 +630,15 @@
 void PMAPI PM_restoreRealTimeClockHandler(void)
 {
     if (_PM_rtcHandler) {
-        /* Restore CMOS registers and mask RTC clock */
-        _PM_writeCMOS(0x0A,_PM_oldCMOSRegA);
-        _PM_writeCMOS(0x0B,_PM_oldCMOSRegB);
-        PM_outpb(0xA1,(PM_inpb(0xA1) & 0xFE) | (_PM_oldRTCPIC2 & ~0xFE));
+	/* Restore CMOS registers and mask RTC clock */
+	_PM_writeCMOS(0x0A,_PM_oldCMOSRegA);
+	_PM_writeCMOS(0x0B,_PM_oldCMOSRegB);
+	PM_outpb(0xA1,(PM_inpb(0xA1) & 0xFE) | (_PM_oldRTCPIC2 & ~0xFE));
 
-        /* Restore the interrupt vector */
-        restoreISR(0x70, _PM_prevRTC, _PM_prevRealRTC);
-        _PM_rtcHandler = NULL;
-        }
+	/* Restore the interrupt vector */
+	restoreISR(0x70, _PM_prevRTC, _PM_prevRealRTC);
+	_PM_rtcHandler = NULL;
+	}
 }
 
 void PMAPI PM_setKeyHandler(PM_intHandler kh)
@@ -651,9 +651,9 @@
 void PMAPI PM_restoreKeyHandler(void)
 {
     if (_PM_keyHandler) {
-        restoreISR(0x9, _PM_prevKey, _PM_prevRealKey);
-        _PM_keyHandler = NULL;
-        }
+	restoreISR(0x9, _PM_prevKey, _PM_prevRealKey);
+	_PM_keyHandler = NULL;
+	}
 }
 
 void PMAPI PM_setKey15Handler(PM_key15Handler kh)
@@ -666,9 +666,9 @@
 void PMAPI PM_restoreKey15Handler(void)
 {
     if (_PM_key15Handler) {
-        restoreISR(0x15, _PM_prevKey15, _PM_prevRealKey15);
-        _PM_key15Handler = NULL;
-        }
+	restoreISR(0x15, _PM_prevKey15, _PM_prevRealKey15);
+	_PM_key15Handler = NULL;
+	}
 }
 
 void PMAPI PM_installAltBreakHandler(PM_breakHandler bh)
@@ -692,11 +692,11 @@
 void PMAPI PM_restoreBreakHandler(void)
 {
     if (_PM_prevBreak.sel) {
-        restoreISR(0x1B, _PM_prevBreak, prevRealBreak);
-        restoreISR(0x23, _PM_prevCtrlC, prevRealCtrlC);
-        _PM_prevBreak.sel = 0;
-        _PM_breakHandler = NULL;
-        }
+	restoreISR(0x1B, _PM_prevBreak, prevRealBreak);
+	restoreISR(0x23, _PM_prevCtrlC, prevRealCtrlC);
+	_PM_prevBreak.sel = 0;
+	_PM_breakHandler = NULL;
+	}
 }
 
 void PMAPI PM_installAltCriticalHandler(PM_criticalHandler ch)
@@ -717,10 +717,10 @@
 void PMAPI PM_restoreCriticalHandler(void)
 {
     if (_PM_prevCritical.sel) {
-        restoreISR(0x24, _PM_prevCritical, prevRealCritical);
-        _PM_prevCritical.sel = 0;
-        _PM_critHandler = NULL;
-        }
+	restoreISR(0x24, _PM_prevCritical, prevRealCritical);
+	_PM_prevCritical.sel = 0;
+	_PM_critHandler = NULL;
+	}
 }
 
 int PMAPI PM_lockDataPages(void *p,uint len,PM_lockHandle *lh)
@@ -816,9 +816,9 @@
      * buffer once since we cant dealloate it with X32).
      */
     if (*psel == 0) {
-        if (!PM_allocRealSeg(sizeof(realHandler),psel,poff,rseg,roff))
-            return 0;
-        }
+	if (!PM_allocRealSeg(sizeof(realHandler),psel,poff,rseg,roff))
+	    return 0;
+	}
     PM_memcpyfn(*psel,*poff,realHandler,sizeof(realHandler));
 
     /* Skip past global variables in real mode code segment */
@@ -835,7 +835,7 @@
     lockPMHandlers();           /* Ensure our handlers are locked   */
 
     if (!installCallback(_PM_mouseISR, &mouseSel, &mouseOff, &rseg, &roff))
-        return 0;
+	return 0;
     _PM_mouseHandler = mh;
 
     /* Install the real mode mouse handler  */
@@ -852,10 +852,10 @@
     RMREGS  regs;
 
     if (_PM_mouseHandler) {
-        regs.x.ax = 33;
-        PM_int86(0x33, &regs, &regs);
-        _PM_mouseHandler = NULL;
-        }
+	regs.x.ax = 33;
+	PM_int86(0x33, &regs, &regs);
+	_PM_mouseHandler = NULL;
+	}
 }
 
 void PMAPI PM_getPMvect(int intno, PMFARPTR *isr)
@@ -941,9 +941,9 @@
 void PMAPI PM_restoreTimerHandler(void)
 {
     if (_PM_timerHandler) {
-        restoreISR(0x8, _PM_prevTimer, _PM_prevRealTimer);
-        _PM_timerHandler = NULL;
-        }
+	restoreISR(0x8, _PM_prevTimer, _PM_prevRealTimer);
+	_PM_timerHandler = NULL;
+	}
 }
 
 ibool PMAPI PM_setRealTimeClockHandler(PM_intHandler th,int frequency)
@@ -969,15 +969,15 @@
 void PMAPI PM_restoreRealTimeClockHandler(void)
 {
     if (_PM_rtcHandler) {
-        /* Restore CMOS registers and mask RTC clock */
-        _PM_writeCMOS(0x0A,_PM_oldCMOSRegA);
-        _PM_writeCMOS(0x0B,_PM_oldCMOSRegB);
-        PM_outpb(0xA1,(PM_inpb(0xA1) & 0xFE) | (_PM_oldRTCPIC2 & ~0xFE));
+	/* Restore CMOS registers and mask RTC clock */
+	_PM_writeCMOS(0x0A,_PM_oldCMOSRegA);
+	_PM_writeCMOS(0x0B,_PM_oldCMOSRegB);
+	PM_outpb(0xA1,(PM_inpb(0xA1) & 0xFE) | (_PM_oldRTCPIC2 & ~0xFE));
 
-        /* Restore the interrupt vector */
-        restoreISR(0x70, _PM_prevRTC, _PM_prevRealRTC);
-        _PM_rtcHandler = NULL;
-        }
+	/* Restore the interrupt vector */
+	restoreISR(0x70, _PM_prevRTC, _PM_prevRealRTC);
+	_PM_rtcHandler = NULL;
+	}
 }
 
 void PMAPI PM_setKeyHandler(PM_intHandler kh)
@@ -990,9 +990,9 @@
 void PMAPI PM_restoreKeyHandler(void)
 {
     if (_PM_keyHandler) {
-        restoreISR(0x9, _PM_prevKey, _PM_prevRealKey);
-        _PM_keyHandler = NULL;
-        }
+	restoreISR(0x9, _PM_prevKey, _PM_prevRealKey);
+	_PM_keyHandler = NULL;
+	}
 }
 
 void PMAPI PM_setKey15Handler(PM_key15Handler kh)
@@ -1005,9 +1005,9 @@
 void PMAPI PM_restoreKey15Handler(void)
 {
     if (_PM_key15Handler) {
-        restoreISR(0x15, _PM_prevKey15, _PM_prevRealKey15);
-        _PM_key15Handler = NULL;
-        }
+	restoreISR(0x15, _PM_prevKey15, _PM_prevRealKey15);
+	_PM_key15Handler = NULL;
+	}
 }
 
 void PMAPI PM_installAltBreakHandler(PM_breakHandler bh)
@@ -1031,11 +1031,11 @@
 void PMAPI PM_restoreBreakHandler(void)
 {
     if (_PM_prevBreak.sel) {
-        restoreISR(0x1B, _PM_prevBreak, prevRealBreak);
-        restoreISR(0x23, _PM_prevCtrlC, prevRealCtrlC);
-        _PM_prevBreak.sel = 0;
-        _PM_breakHandler = NULL;
-        }
+	restoreISR(0x1B, _PM_prevBreak, prevRealBreak);
+	restoreISR(0x23, _PM_prevCtrlC, prevRealCtrlC);
+	_PM_prevBreak.sel = 0;
+	_PM_breakHandler = NULL;
+	}
 }
 
 void PMAPI PM_installAltCriticalHandler(PM_criticalHandler ch)
@@ -1056,10 +1056,10 @@
 void PMAPI PM_restoreCriticalHandler(void)
 {
     if (_PM_prevCritical.sel) {
-        restoreISR(0x24, _PM_prevCritical, prevRealCritical);
-        _PM_prevCritical.sel = 0;
-        _PM_critHandler = NULL;
-        }
+	restoreISR(0x24, _PM_prevCritical, prevRealCritical);
+	_PM_prevCritical.sel = 0;
+	_PM_critHandler = NULL;
+	}
 }
 
 int PMAPI PM_lockDataPages(void *p,uint len,PM_lockHandle *lh)
@@ -1199,10 +1199,10 @@
     PMREGS  regs;
 
     if (_PM_mouseHandler) {
-        regs.x.ax = 33;
-        PM_int386(0x33, &regs, &regs);
-        _PM_mouseHandler = NULL;
-        }
+	regs.x.ax = 33;
+	PM_int386(0x33, &regs, &regs);
+	_PM_mouseHandler = NULL;
+	}
 }
 
 #endif
@@ -1288,10 +1288,10 @@
 
     /* Copy the real mode handler to real mode memory   */
     if ((mousePtr = PM_allocRealSeg(sizeof(mouseHandler),&rseg,&roff)) == NULL)
-        return 0;
+	return 0;
     memcpy(mousePtr,mouseHandler,sizeof(mouseHandler));
     if (!_DPMI_allocateCallback(_PM_mousePMCB, mouseRegs, &mouseRMCB))
-        PM_fatalError("Unable to allocate real mode callback!\n");
+	PM_fatalError("Unable to allocate real mode callback!\n");
     PM_setLong(mousePtr,mouseRMCB);
 
     /* Install the real mode mouse handler  */
@@ -1309,12 +1309,12 @@
     RMREGS  regs;
 
     if (_PM_mouseHandler) {
-        regs.x.ax = 33;
-        PM_int86(0x33, &regs, &regs);
-        PM_freeRealSeg(mousePtr);
-        _DPMI_freeCallback(mouseRMCB);
-        _PM_mouseHandler = NULL;
-        }
+	regs.x.ax = 33;
+	PM_int86(0x33, &regs, &regs);
+	PM_freeRealSeg(mousePtr);
+	_DPMI_freeCallback(mouseRMCB);
+	_PM_mouseHandler = NULL;
+	}
 }
 
 #endif
@@ -1347,9 +1347,9 @@
 void PMAPI PM_restoreTimerHandler(void)
 {
     if (_PM_timerHandler) {
-        restoreISR(0x8, _PM_prevTimer, _PM_prevRealTimer);
-        _PM_timerHandler = NULL;
-        }
+	restoreISR(0x8, _PM_prevTimer, _PM_prevRealTimer);
+	_PM_timerHandler = NULL;
+	}
 }
 
 ibool PMAPI PM_setRealTimeClockHandler(PM_intHandler th,int frequency)
@@ -1375,15 +1375,15 @@
 void PMAPI PM_restoreRealTimeClockHandler(void)
 {
     if (_PM_rtcHandler) {
-        /* Restore CMOS registers and mask RTC clock */
-        _PM_writeCMOS(0x0A,_PM_oldCMOSRegA);
-        _PM_writeCMOS(0x0B,_PM_oldCMOSRegB);
-        PM_outpb(0xA1,(PM_inpb(0xA1) & 0xFE) | (_PM_oldRTCPIC2 & ~0xFE));
+	/* Restore CMOS registers and mask RTC clock */
+	_PM_writeCMOS(0x0A,_PM_oldCMOSRegA);
+	_PM_writeCMOS(0x0B,_PM_oldCMOSRegB);
+	PM_outpb(0xA1,(PM_inpb(0xA1) & 0xFE) | (_PM_oldRTCPIC2 & ~0xFE));
 
-        /* Restore the interrupt vector */
-        restoreISR(0x70, _PM_prevRTC, _PM_prevRealRTC);
-        _PM_rtcHandler = NULL;
-        }
+	/* Restore the interrupt vector */
+	restoreISR(0x70, _PM_prevRTC, _PM_prevRealRTC);
+	_PM_rtcHandler = NULL;
+	}
 }
 
 PM_IRQHandle PMAPI PM_setIRQHandler(
@@ -1396,20 +1396,20 @@
 
     thunkSize = (ulong)_PM_irqISRTemplateEnd - (ulong)_PM_irqISRTemplate;
     if ((handle = PM_malloc(sizeof(_PM_IRQHandle) + thunkSize)) == NULL)
-        return NULL;
+	return NULL;
     handle->IRQ = IRQ;
     handle->prevPIC = PM_inpb(0x21);
     handle->prevPIC2 = PM_inpb(0xA1);
     if (IRQ < 8) {
-        handle->IRQVect = (IRQ + 8);
-        PICmask = (1 << IRQ);
-        chainPrevious = ((handle->prevPIC & PICmask) == 0);
-        }
+	handle->IRQVect = (IRQ + 8);
+	PICmask = (1 << IRQ);
+	chainPrevious = ((handle->prevPIC & PICmask) == 0);
+	}
     else {
-        handle->IRQVect = (0x60 + IRQ + 8);
-        PICmask = ((1 << IRQ) | 0x4);
-        chainPrevious = ((handle->prevPIC2 & (PICmask >> 8)) == 0);
-        }
+	handle->IRQVect = (0x60 + IRQ + 8);
+	PICmask = ((1 << IRQ) | 0x4);
+	chainPrevious = ((handle->prevPIC2 & (PICmask >> 8)) == 0);
+	}
 
     /* Copy and setup the assembler thunk */
     offsetAdjust = (ulong)handle->thunk - (ulong)_PM_irqISRTemplate;
@@ -1417,13 +1417,13 @@
     *((ulong*)&handle->thunk[2]) = offsetAdjust;
     *((ulong*)&handle->thunk[11+0]) = (ulong)ih;
     if (chainPrevious) {
-        *((ulong*)&handle->thunk[11+4]) = handle->prevHandler.off;
-        *((ulong*)&handle->thunk[11+8]) = handle->prevHandler.sel;
-        }
+	*((ulong*)&handle->thunk[11+4]) = handle->prevHandler.off;
+	*((ulong*)&handle->thunk[11+8]) = handle->prevHandler.sel;
+	}
     else {
-        *((ulong*)&handle->thunk[11+4]) = 0;
-        *((ulong*)&handle->thunk[11+8]) = 0;
-        }
+	*((ulong*)&handle->thunk[11+4]) = 0;
+	*((ulong*)&handle->thunk[11+8]) = 0;
+	}
     *((ulong*)&handle->thunk[11+12]) = IRQ;
 
     /* Set the real time clock interrupt handler */
@@ -1444,9 +1444,9 @@
 
     /* Restore PIC mask for the interrupt */
     if (handle->IRQ < 8)
-        PICmask = (1 << handle->IRQ);
+	PICmask = (1 << handle->IRQ);
     else
-        PICmask = ((1 << handle->IRQ) | 0x4);
+	PICmask = ((1 << handle->IRQ) | 0x4);
     PM_outpb(0xA1,(PM_inpb(0xA1) & ~(PICmask >> 8)) | (handle->prevPIC2 & (PICmask >> 8)));
     PM_outpb(0x21,(PM_inpb(0x21) & ~PICmask) | (handle->prevPIC & PICmask));
 
@@ -1467,9 +1467,9 @@
 void PMAPI PM_restoreKeyHandler(void)
 {
     if (_PM_keyHandler) {
-        restoreISR(0x9, _PM_prevKey, _PM_prevRealKey);
-        _PM_keyHandler = NULL;
-        }
+	restoreISR(0x9, _PM_prevKey, _PM_prevRealKey);
+	_PM_keyHandler = NULL;
+	}
 }
 
 void PMAPI PM_setKey15Handler(PM_key15Handler kh)
@@ -1482,9 +1482,9 @@
 void PMAPI PM_restoreKey15Handler(void)
 {
     if (_PM_key15Handler) {
-        restoreISR(0x15, _PM_prevKey15, _PM_prevRealKey15);
-        _PM_key15Handler = NULL;
-        }
+	restoreISR(0x15, _PM_prevKey15, _PM_prevRealKey15);
+	_PM_key15Handler = NULL;
+	}
 }
 
 /* Real mode Ctrl-C and Ctrl-Break handler. This handler simply sets a
@@ -1540,14 +1540,14 @@
 void PMAPI PM_restoreBreakHandler(void)
 {
     if (_PM_prevBreak.sel) {
-        restoreISR(0x1B, _PM_prevBreak, prevRealBreak);
-        restoreISR(0x23, _PM_prevCtrlC, prevRealCtrlC);
-        _PM_prevBreak.sel = 0;
-        _PM_breakHandler = NULL;
+	restoreISR(0x1B, _PM_prevBreak, prevRealBreak);
+	restoreISR(0x23, _PM_prevCtrlC, prevRealCtrlC);
+	_PM_prevBreak.sel = 0;
+	_PM_breakHandler = NULL;
 #ifndef DOS4GW
-        PM_freeRealSeg(_PM_ctrlBPtr);
+	PM_freeRealSeg(_PM_ctrlBPtr);
 #endif
-        }
+	}
 }
 
 /* Real mode Critical Error handler. This handler simply saves the AX and
@@ -1599,11 +1599,11 @@
 void PMAPI PM_restoreCriticalHandler(void)
 {
     if (_PM_prevCritical.sel) {
-        restoreISR(0x24, _PM_prevCritical, prevRealCritical);
-        PM_freeRealSeg(_PM_critPtr);
-        _PM_prevCritical.sel = 0;
-        _PM_critHandler = NULL;
-        }
+	restoreISR(0x24, _PM_prevCritical, prevRealCritical);
+	PM_freeRealSeg(_PM_critPtr);
+	_PM_prevCritical.sel = 0;
+	_PM_critHandler = NULL;
+	}
 }
 
 int PMAPI PM_lockDataPages(void *p,uint len,PM_lockHandle *lh)

diff --git a/board/MAI/bios_emulator/scitech/src/pm/dos/vflat.c b/board/MAI/bios_emulator/scitech/src/pm/dos/vflat.c
index 2e78e25..c3e9b6c 100644
--- a/board/MAI/bios_emulator/scitech/src/pm/dos/vflat.c
+++ b/board/MAI/bios_emulator/scitech/src/pm/dos/vflat.c

@@ -79,7 +79,7 @@
     PMREGS  regs;
 
     if (haveDPMI)
-        return true;
+	return true;
 
     /* Check if we are running under DPMI in which case we will not be
      * able to install our page fault handlers. We can however use the
@@ -88,7 +88,7 @@
     regs.x.ax = 0xFF00;
     PM_int386(0x31,&regs,&regs);
     if (!regs.x.cflag && (regs.e.edi & 8))
-        return (haveDPMI = true);
+	return (haveDPMI = true);
     return false;
 }
 
@@ -101,13 +101,13 @@
 ****************************************************************************/
 {
     if (!VF_zeroPtr)
-        VF_zeroPtr = PM_mapPhysicalAddr(0,0xFFFFFFFF,true);
+	VF_zeroPtr = PM_mapPhysicalAddr(0,0xFFFFFFFF,true);
     if (CheckDPMI())
-        return false;
+	return false;
 
     /* Standard DOS4GW, PMODE/W and Causeway */
     if (InitPaging() == -1)
-        return false;
+	return false;
     ClosePaging();
     return true;
 }
@@ -153,21 +153,21 @@
     int     i;
 
     if (InitPaging() == -1)
-        return NULL;            /* Cannot do hardware paging!       */
+	return NULL;            /* Cannot do hardware paging!       */
 
     /* Map 4MB of video memory into linear address space (read/write) */
     if (bankSize == 64) {
-        for (i = 0; i < 64; i++) {
-            MapPhysical2Linear(baseAddr,VFLAT_START_ADDR+(i<<16),16,
-                PAGE_WRITE | PAGE_NOTPRESENT);
-            }
-        }
+	for (i = 0; i < 64; i++) {
+	    MapPhysical2Linear(baseAddr,VFLAT_START_ADDR+(i<<16),16,
+		PAGE_WRITE | PAGE_NOTPRESENT);
+	    }
+	}
     else {
-        for (i = 0; i < 1024; i++) {
-            MapPhysical2Linear(baseAddr,VFLAT_START_ADDR+(i<<12),1,
-                PAGE_WRITE | PAGE_NOTPRESENT);
-            }
-        }
+	for (i = 0; i < 1024; i++) {
+	    MapPhysical2Linear(baseAddr,VFLAT_START_ADDR+(i<<12),1,
+		PAGE_WRITE | PAGE_NOTPRESENT);
+	    }
+	}
 
     /* Install our page fault handler and banks switch function */
     InstallFaultHandler(baseAddr,bankSize);
@@ -191,13 +191,13 @@
 ****************************************************************************/
 {
     if (installed)
-        return (void*)VFLAT_START_ADDR;
+	return (void*)VFLAT_START_ADDR;
     if (codeLen > 100)
-        return NULL;                /* Bank function is too large!      */
+	return NULL;                /* Bank function is too large!      */
     if (!VF_zeroPtr)
-        VF_zeroPtr = PM_mapPhysicalAddr(0,0xFFFFFFFF,true);
+	VF_zeroPtr = PM_mapPhysicalAddr(0,0xFFFFFFFF,true);
     if (CheckDPMI())
-        return InitDPMI(baseAddr,bankSize,codeLen,bankFunc);
+	return InitDPMI(baseAddr,bankSize,codeLen,bankFunc);
     return InitDOS4GW(baseAddr,bankSize,codeLen,bankFunc);
 }
 
@@ -212,16 +212,16 @@
 ****************************************************************************/
 {
     if (installed) {
-        if (haveDPMI) {
-            /* DPMI support */
-            }
-        else {
-            /* Standard DOS4GW and PMODE/W support */
-            RemoveFaultHandler();
-            ClosePaging();
-            }
-        installed = false;
-        }
+	if (haveDPMI) {
+	    /* DPMI support */
+	    }
+	else {
+	    /* Standard DOS4GW and PMODE/W support */
+	    RemoveFaultHandler();
+	    ClosePaging();
+	    }
+	installed = false;
+	}
 }
 
 /*-------------------------------------------------------------------------*/

diff --git a/board/MAI/bios_emulator/scitech/src/pm/dos/ztimer.c b/board/MAI/bios_emulator/scitech/src/pm/dos/ztimer.c
index 960ed06..53ab16c 100644
--- a/board/MAI/bios_emulator/scitech/src/pm/dos/ztimer.c
+++ b/board/MAI/bios_emulator/scitech/src/pm/dos/ztimer.c

@@ -106,6 +106,6 @@
 ulong __ULZElapsedTime(ulong start,ulong finish)
 {
     if (finish < start)
-        finish += 1573040L;         /* Number of ticks in 24 hours      */
+	finish += 1573040L;         /* Number of ticks in 24 hours      */
     return finish - start;
 }

diff --git a/board/MAI/bios_emulator/scitech/src/pm/event.c b/board/MAI/bios_emulator/scitech/src/pm/event.c
index b284c68..b6f4586 100644
--- a/board/MAI/bios_emulator/scitech/src/pm/event.c
+++ b/board/MAI/bios_emulator/scitech/src/pm/event.c

@@ -106,8 +106,8 @@
 freeList for the event to be inserted.
 
 NOTE:   Interrupts MUST be OFF while this routine is called to ensure we have
-        mutually exclusive access to our internal data structures for
-        interrupt driven systems (like under DOS).
+	mutually exclusive access to our internal data structures for
+	interrupt driven systems (like under DOS).
 ****************************************************************************/
 static void addEvent(
     event_t *evt)
@@ -116,35 +116,35 @@
 
     /* Check for mouse double click events */
     if (evt->what & EVT_MOUSEEVT) {
-        EVT.autoMouse_x = evt->where_x;
-        EVT.autoMouse_y = evt->where_y;
-        if ((evt->what & EVT_MOUSEDOWN) && !(evt->message & EVT_DBLCLICK)) {
-            /* Determine if the last mouse event was a double click event */
-            uint diff_x = ABS(evt->where_x - EVT.downMouse.where_x);
-            uint diff_y = ABS(evt->where_y - EVT.downMouse.where_y);
-            if ((evt->message == EVT.downMouse.message)
-                && ((evt->when - EVT.downMouse.when) <= EVT.doubleClick)
-                && (diff_x <= EVT.doubleClickThresh)
-                && (diff_y <= EVT.doubleClickThresh)) {
-                evt->message |= EVT_DBLCLICK;
-                EVT.downMouse = *evt;
-                EVT.downMouse.when = 0;
-                }
-            else
-                EVT.downMouse = *evt;
-            EVT.autoTicks = _EVT_getTicks();
-            }
-        else if (evt->what & EVT_MOUSEUP) {
-            EVT.downMouse.what = EVT_NULLEVT;
-            EVT.firstAuto = true;
-            }
-        }
+	EVT.autoMouse_x = evt->where_x;
+	EVT.autoMouse_y = evt->where_y;
+	if ((evt->what & EVT_MOUSEDOWN) && !(evt->message & EVT_DBLCLICK)) {
+	    /* Determine if the last mouse event was a double click event */
+	    uint diff_x = ABS(evt->where_x - EVT.downMouse.where_x);
+	    uint diff_y = ABS(evt->where_y - EVT.downMouse.where_y);
+	    if ((evt->message == EVT.downMouse.message)
+		&& ((evt->when - EVT.downMouse.when) <= EVT.doubleClick)
+		&& (diff_x <= EVT.doubleClickThresh)
+		&& (diff_y <= EVT.doubleClickThresh)) {
+		evt->message |= EVT_DBLCLICK;
+		EVT.downMouse = *evt;
+		EVT.downMouse.when = 0;
+		}
+	    else
+		EVT.downMouse = *evt;
+	    EVT.autoTicks = _EVT_getTicks();
+	    }
+	else if (evt->what & EVT_MOUSEUP) {
+	    EVT.downMouse.what = EVT_NULLEVT;
+	    EVT.firstAuto = true;
+	    }
+	}
 
     /* Call user supplied callback to modify the event if desired */
     if (EVT.userEventCallback) {
-        if (!EVT.userEventCallback(evt))
-            return;
-        }
+	if (!EVT.userEventCallback(evt))
+	    return;
+	}
 
     /* Get spot to place the event from the free list */
     evtID = EVT.freeHead;
@@ -154,9 +154,9 @@
     evt->next = -1;
     evt->prev = EVT.tail;
     if (EVT.tail != -1)
-        EVT.evtq[EVT.tail].next = evtID;
+	EVT.evtq[EVT.tail].next = evtID;
     else
-        EVT.head = evtID;
+	EVT.head = evtID;
     EVT.tail = evtID;
     EVT.evtq[evtID] = *evt;
     EVT.count++;
@@ -172,7 +172,7 @@
 
     /* Build free list, and initialize global data structures */
     for (i = 0; i < EVENTQSIZE; i++)
-        EVT.evtq[i].next = i+1;
+	EVT.evtq[i].next = i+1;
     EVT.evtq[EVENTQSIZE-1].next = -1;       /* Terminate list           */
     EVT.count = EVT.freeHead = 0;
     EVT.head = EVT.tail = -1;
@@ -217,21 +217,21 @@
 
     /* Make sure the joystick is calibrated properly */
     if (EVT.joyCenter[axis] - EVT.joyMin[axis] < 5)
-        return raw;
+	return raw;
     if (EVT.joyMax[axis] - EVT.joyCenter[axis] < 5)
-        return raw;
+	return raw;
 
     /* Now scale the coordinates to -128 to 127 */
     raw -= EVT.joyCenter[axis];
     if (raw < 0)
-        range = EVT.joyCenter[axis]-EVT.joyMin[axis];
+	range = EVT.joyCenter[axis]-EVT.joyMin[axis];
     else
-        range = EVT.joyMax[axis]-EVT.joyCenter[axis];
+	range = EVT.joyMax[axis]-EVT.joyCenter[axis];
     scaled = (raw * 128) / range;
     if (scaled < -128)
-        scaled = -128;
+	scaled = -128;
     if (scaled > 127)
-        scaled = 127;
+	scaled = 127;
     return scaled;
 }
 #endif
@@ -308,9 +308,9 @@
 #endif
     mask = _EVT_readJoyAxis(EVT_JOY_AXIS_ALL,EVT.joyCenter);
     if (mask) {
-        for (i = 0; i < JOY_NUM_AXES; i++)
-            EVT.joyMax[i] = EVT.joyCenter[i]*2;
-        }
+	for (i = 0; i < JOY_NUM_AXES; i++)
+	    EVT.joyMax[i] = EVT.joyCenter[i]*2;
+	}
     return mask;
 }
 
@@ -329,9 +329,9 @@
 queue for later retrieval.
 
 Note:   Most analogue joysticks will provide readings that change even
-        though the joystick has not moved. Hence if you call this routine
-        you will likely get an EVT_JOYMOVE event every time through your
-        event loop.
+	though the joystick has not moved. Hence if you call this routine
+	you will likely get an EVT_JOYMOVE event every time through your
+	event loop.
 
 SEE ALSO:
 EVT_getNext, EVT_peekNext, EVT_joySetUpperLeft, EVT_joySetLowerRight,
@@ -343,68 +343,68 @@
     int     i,axis[JOY_NUM_AXES],newButState,mask,moved,ps;
 
     if (EVT.joyMask) {
-        /* Read joystick axes and post movement events if they have
-         * changed since the last time we polled. Until the events are
-         * actually flushed, we keep modifying the same joystick movement
-         * event, so you won't get multiple movement event
-         */
-        mask = _EVT_readJoyAxis(EVT.joyMask,axis);
-        newButState = _EVT_readJoyButtons();
-        moved = false;
-        for (i = 0; i < JOY_NUM_AXES; i++) {
-            if (mask & (EVT_JOY_AXIS_X1 << i))
-                axis[i] = scaleJoyAxis(axis[i],i);
-            else
-                axis[i] = EVT.joyPrev[i];
-            if (axis[i] != EVT.joyPrev[i])
-                moved = true;
-            }
-        if (moved) {
-            memcpy(EVT.joyPrev,axis,sizeof(EVT.joyPrev));
-            ps = _EVT_disableInt();
-            if (EVT.oldJoyMove != -1) {
-                /* Modify the existing joystick movement event */
-                EVT.evtq[EVT.oldJoyMove].message = newButState;
-                EVT.evtq[EVT.oldJoyMove].where_x = EVT.joyPrev[0];
-                EVT.evtq[EVT.oldJoyMove].where_y = EVT.joyPrev[1];
-                EVT.evtq[EVT.oldJoyMove].relative_x = EVT.joyPrev[2];
-                EVT.evtq[EVT.oldJoyMove].relative_y = EVT.joyPrev[3];
-                }
-            else if (EVT.count < EVENTQSIZE) {
-                /* Add a new joystick movement event */
-                EVT.oldJoyMove = EVT.freeHead;
-                memset(&evt,0,sizeof(evt));
-                evt.what = EVT_JOYMOVE;
-                evt.message = EVT.joyButState;
-                evt.where_x = EVT.joyPrev[0];
-                evt.where_y = EVT.joyPrev[1];
-                evt.relative_x = EVT.joyPrev[2];
-                evt.relative_y = EVT.joyPrev[3];
-                addEvent(&evt);
-                }
-            _EVT_restoreInt(ps);
-            }
+	/* Read joystick axes and post movement events if they have
+	 * changed since the last time we polled. Until the events are
+	 * actually flushed, we keep modifying the same joystick movement
+	 * event, so you won't get multiple movement event
+	 */
+	mask = _EVT_readJoyAxis(EVT.joyMask,axis);
+	newButState = _EVT_readJoyButtons();
+	moved = false;
+	for (i = 0; i < JOY_NUM_AXES; i++) {
+	    if (mask & (EVT_JOY_AXIS_X1 << i))
+		axis[i] = scaleJoyAxis(axis[i],i);
+	    else
+		axis[i] = EVT.joyPrev[i];
+	    if (axis[i] != EVT.joyPrev[i])
+		moved = true;
+	    }
+	if (moved) {
+	    memcpy(EVT.joyPrev,axis,sizeof(EVT.joyPrev));
+	    ps = _EVT_disableInt();
+	    if (EVT.oldJoyMove != -1) {
+		/* Modify the existing joystick movement event */
+		EVT.evtq[EVT.oldJoyMove].message = newButState;
+		EVT.evtq[EVT.oldJoyMove].where_x = EVT.joyPrev[0];
+		EVT.evtq[EVT.oldJoyMove].where_y = EVT.joyPrev[1];
+		EVT.evtq[EVT.oldJoyMove].relative_x = EVT.joyPrev[2];
+		EVT.evtq[EVT.oldJoyMove].relative_y = EVT.joyPrev[3];
+		}
+	    else if (EVT.count < EVENTQSIZE) {
+		/* Add a new joystick movement event */
+		EVT.oldJoyMove = EVT.freeHead;
+		memset(&evt,0,sizeof(evt));
+		evt.what = EVT_JOYMOVE;
+		evt.message = EVT.joyButState;
+		evt.where_x = EVT.joyPrev[0];
+		evt.where_y = EVT.joyPrev[1];
+		evt.relative_x = EVT.joyPrev[2];
+		evt.relative_y = EVT.joyPrev[3];
+		addEvent(&evt);
+		}
+	    _EVT_restoreInt(ps);
+	    }
 
-        /* Read the joystick buttons, and post events to reflect the change
-         * in state for the joystick buttons.
-         */
-        if (newButState != EVT.joyButState) {
-            if (EVT.count < EVENTQSIZE) {
-                /* Add a new joystick click event */
-                ps = _EVT_disableInt();
-                memset(&evt,0,sizeof(evt));
-                evt.what = EVT_JOYCLICK;
-                evt.message = newButState;
-                EVT.evtq[EVT.oldJoyMove].where_x = EVT.joyPrev[0];
-                EVT.evtq[EVT.oldJoyMove].where_y = EVT.joyPrev[1];
-                EVT.evtq[EVT.oldJoyMove].relative_x = EVT.joyPrev[2];
-                EVT.evtq[EVT.oldJoyMove].relative_y = EVT.joyPrev[3];
-                addEvent(&evt);
-                _EVT_restoreInt(ps);
-                }
-            EVT.joyButState = newButState;
-            }
-        }
+	/* Read the joystick buttons, and post events to reflect the change
+	 * in state for the joystick buttons.
+	 */
+	if (newButState != EVT.joyButState) {
+	    if (EVT.count < EVENTQSIZE) {
+		/* Add a new joystick click event */
+		ps = _EVT_disableInt();
+		memset(&evt,0,sizeof(evt));
+		evt.what = EVT_JOYCLICK;
+		evt.message = newButState;
+		EVT.evtq[EVT.oldJoyMove].where_x = EVT.joyPrev[0];
+		EVT.evtq[EVT.oldJoyMove].where_y = EVT.joyPrev[1];
+		EVT.evtq[EVT.oldJoyMove].relative_x = EVT.joyPrev[2];
+		EVT.evtq[EVT.oldJoyMove].relative_y = EVT.joyPrev[3];
+		addEvent(&evt);
+		_EVT_restoreInt(ps);
+		}
+	    EVT.joyButState = newButState;
+	    }
+	}
 }
 
 /****************************************************************************
@@ -526,19 +526,19 @@
     uint    ps;
 
     if (EVT.count < EVENTQSIZE) {
-        /* Save information in event record */
-        ps = _EVT_disableInt();
-        evt.which = which;
-        evt.when = _EVT_getTicks();
-        evt.what = what;
-        evt.message = message;
-        evt.modifiers = modifiers;
-        addEvent(&evt);             /* Add to EVT.tail of event queue   */
-        _EVT_restoreInt(ps);
-        return true;
-        }
+	/* Save information in event record */
+	ps = _EVT_disableInt();
+	evt.which = which;
+	evt.when = _EVT_getTicks();
+	evt.what = what;
+	evt.message = message;
+	evt.modifiers = modifiers;
+	addEvent(&evt);             /* Add to EVT.tail of event queue   */
+	_EVT_restoreInt(ps);
+	return true;
+	}
     else
-        return false;
+	return false;
 }
 
 /****************************************************************************
@@ -565,8 +565,8 @@
     event_t evt;
 
     do {                            /* Flush all events */
-        EVT_getNext(&evt,mask);
-        } while (evt.what != EVT_NULLEVT);
+	EVT_getNext(&evt,mask);
+	} while (evt.what != EVT_NULLEVT);
 }
 
 /****************************************************************************
@@ -596,10 +596,10 @@
     ulong mask)
 {
     do {                            /* Wait for an event    */
-        if (mask & (EVT_JOYEVT))
-            EVT_pollJoystick();
-        EVT_getNext(evt,EVT_EVERYEVT);
-        } while (!(evt->what & mask));
+	if (mask & (EVT_JOYEVT))
+	    EVT_pollJoystick();
+	EVT_getNext(evt,EVT_EVERYEVT);
+	} while (!(evt->what & mask));
 }
 
 /****************************************************************************
@@ -636,31 +636,31 @@
     uint    ps;
 
     if (EVT.heartBeat)
-        EVT.heartBeat(EVT.heartBeatParams);
+	EVT.heartBeat(EVT.heartBeatParams);
     _EVT_pumpMessages();                /* Pump all messages into queue */
     EVT.mouseMove(EVT.mx,EVT.my);       /* Move the mouse cursor        */
     evt->what = EVT_NULLEVT;            /* Default to null event        */
     if (EVT.count) {
-        /* It is possible that an event be posted while we are trying
-         * to access the event queue. This would create problems since
-         * we may end up with invalid data for our event queue pointers. To
-         * alleviate this, all interrupts are suspended while we manipulate
-         * our pointers.
-         */
-        ps = _EVT_disableInt();             /* disable interrupts       */
-        for (evtID = EVT.head; evtID != -1; evtID = EVT.evtq[evtID].next) {
-            if (EVT.evtq[evtID].what & mask)
-                break;                      /* Found an event           */
-            }
-        if (evtID == -1) {
-            _EVT_restoreInt(ps);
-            return false;                   /* Event was not found      */
-            }
-        *evt = EVT.evtq[evtID];                 /* Return the event         */
-        _EVT_restoreInt(ps);
-        if (evt->what & EVT_KEYEVT)
-            _EVT_maskKeyCode(evt);
-        }
+	/* It is possible that an event be posted while we are trying
+	 * to access the event queue. This would create problems since
+	 * we may end up with invalid data for our event queue pointers. To
+	 * alleviate this, all interrupts are suspended while we manipulate
+	 * our pointers.
+	 */
+	ps = _EVT_disableInt();             /* disable interrupts       */
+	for (evtID = EVT.head; evtID != -1; evtID = EVT.evtq[evtID].next) {
+	    if (EVT.evtq[evtID].what & mask)
+		break;                      /* Found an event           */
+	    }
+	if (evtID == -1) {
+	    _EVT_restoreInt(ps);
+	    return false;                   /* Event was not found      */
+	    }
+	*evt = EVT.evtq[evtID];                 /* Return the event         */
+	_EVT_restoreInt(ps);
+	if (evt->what & EVT_KEYEVT)
+	    _EVT_maskKeyCode(evt);
+	}
     return evt->what != EVT_NULLEVT;
 }
 
@@ -696,10 +696,10 @@
 of the event will be set to NULLEVT, and the return value will return false.
 
 Note:   You should /always/ use the EVT_EVERYEVT mask for extracting events
-        from your main event loop handler. Using a mask for only a specific
-        type of event for long periods of time will cause the event queue to
-        fill up with events of the type you are ignoring, eventually causing
-        the application to hang when the event queue becomes full.
+	from your main event loop handler. Using a mask for only a specific
+	type of event for long periods of time will cause the event queue to
+	fill up with events of the type you are ignoring, eventually causing
+	the application to hang when the event queue becomes full.
 
 SEE ALSO:
 EVT_flush, EVT_halt, EVT_peekNext
@@ -712,68 +712,68 @@
     uint    ps;
 
     if (EVT.heartBeat)
-        EVT.heartBeat(EVT.heartBeatParams);
+	EVT.heartBeat(EVT.heartBeatParams);
     _EVT_pumpMessages();                /* Pump all messages into queue */
     EVT.mouseMove(EVT.mx,EVT.my);       /* Move the mouse cursor        */
     evt->what = EVT_NULLEVT;            /* Default to null event        */
     if (EVT.count) {
-        /* It is possible that an event be posted while we are trying
-         * to access the event queue. This would create problems since
-         * we may end up with invalid data for our event queue pointers. To
-         * alleviate this, all interrupts are suspended while we manipulate
-         * our pointers.
-         */
-        ps = _EVT_disableInt();             /* disable interrupts       */
-        for (evtID = EVT.head; evtID != -1; evtID = EVT.evtq[evtID].next) {
-            if (EVT.evtq[evtID].what & mask)
-                break;                      /* Found an event           */
-            }
-        if (evtID == -1) {
-            _EVT_restoreInt(ps);
-            return false;                   /* Event was not found      */
-            }
-        next = EVT.evtq[evtID].next;
-        prev = EVT.evtq[evtID].prev;
-        if (prev != -1)
-            EVT.evtq[prev].next = next;
-        else
-            EVT.head = next;
-        if (next != -1)
-            EVT.evtq[next].prev = prev;
-        else
-            EVT.tail = prev;
-        *evt = EVT.evtq[evtID];                 /* Return the event         */
-        EVT.evtq[evtID].next = EVT.freeHead;        /* and return to free list  */
-        EVT.freeHead = evtID;
-        EVT.count--;
-        if (evt->what == EVT_MOUSEMOVE)
-            EVT.oldMove = -1;
-        if (evt->what == EVT_KEYREPEAT)
-            EVT.oldKey = -1;
-        if (evt->what == EVT_JOYMOVE)
-            EVT.oldJoyMove = -1;
-        _EVT_restoreInt(ps);                /* enable interrupts        */
-        if (evt->what & EVT_KEYEVT)
-            _EVT_maskKeyCode(evt);
-        }
+	/* It is possible that an event be posted while we are trying
+	 * to access the event queue. This would create problems since
+	 * we may end up with invalid data for our event queue pointers. To
+	 * alleviate this, all interrupts are suspended while we manipulate
+	 * our pointers.
+	 */
+	ps = _EVT_disableInt();             /* disable interrupts       */
+	for (evtID = EVT.head; evtID != -1; evtID = EVT.evtq[evtID].next) {
+	    if (EVT.evtq[evtID].what & mask)
+		break;                      /* Found an event           */
+	    }
+	if (evtID == -1) {
+	    _EVT_restoreInt(ps);
+	    return false;                   /* Event was not found      */
+	    }
+	next = EVT.evtq[evtID].next;
+	prev = EVT.evtq[evtID].prev;
+	if (prev != -1)
+	    EVT.evtq[prev].next = next;
+	else
+	    EVT.head = next;
+	if (next != -1)
+	    EVT.evtq[next].prev = prev;
+	else
+	    EVT.tail = prev;
+	*evt = EVT.evtq[evtID];                 /* Return the event         */
+	EVT.evtq[evtID].next = EVT.freeHead;        /* and return to free list  */
+	EVT.freeHead = evtID;
+	EVT.count--;
+	if (evt->what == EVT_MOUSEMOVE)
+	    EVT.oldMove = -1;
+	if (evt->what == EVT_KEYREPEAT)
+	    EVT.oldKey = -1;
+	if (evt->what == EVT_JOYMOVE)
+	    EVT.oldJoyMove = -1;
+	_EVT_restoreInt(ps);                /* enable interrupts        */
+	if (evt->what & EVT_KEYEVT)
+	    _EVT_maskKeyCode(evt);
+	}
 
     /* If there is no event pending, check if we should generate an auto
      * mouse down event if the mouse is still currently down.
      */
     if (evt->what == EVT_NULLEVT && EVT.autoRepeat && (mask & EVT_MOUSEAUTO) && (EVT.downMouse.what & EVT_MOUSEDOWN)) {
-        ulong ticks = _EVT_getTicks();
-        if ((ticks - EVT.autoTicks) >= (EVT.autoRepeat + (EVT.firstAuto ? EVT.autoDelay : 0))) {
-            evt->what = EVT_MOUSEAUTO;
-            evt->message = EVT.downMouse.message;
-            evt->modifiers = EVT.downMouse.modifiers;
-            evt->where_x = EVT.autoMouse_x;
-            evt->where_y = EVT.autoMouse_y;
-            evt->relative_x = 0;
-            evt->relative_y = 0;
-            EVT.autoTicks = evt->when = ticks;
-            EVT.firstAuto = false;
-            }
-        }
+	ulong ticks = _EVT_getTicks();
+	if ((ticks - EVT.autoTicks) >= (EVT.autoRepeat + (EVT.firstAuto ? EVT.autoDelay : 0))) {
+	    evt->what = EVT_MOUSEAUTO;
+	    evt->message = EVT.downMouse.message;
+	    evt->modifiers = EVT.downMouse.modifiers;
+	    evt->where_x = EVT.autoMouse_x;
+	    evt->where_y = EVT.autoMouse_y;
+	    evt->relative_x = 0;
+	    evt->relative_y = 0;
+	    EVT.autoTicks = evt->when = ticks;
+	    EVT.firstAuto = false;
+	    }
+	}
     return evt->what != EVT_NULLEVT;
 }
 
@@ -802,18 +802,18 @@
 recieved.
 
 Note:   Your event callback may be called in response to a hardware
-        interrupt and will be executing in the context of the hardware
-        interrupt handler under MSDOS (ie: keyboard interrupt or mouse
-        interrupt). For this reason the code pages for the callback that
-        you register must be locked in memory with the PM_lockCodePages
-        function. You must also lock down any data pages that your function
-        needs to reference as well.
+	interrupt and will be executing in the context of the hardware
+	interrupt handler under MSDOS (ie: keyboard interrupt or mouse
+	interrupt). For this reason the code pages for the callback that
+	you register must be locked in memory with the PM_lockCodePages
+	function. You must also lock down any data pages that your function
+	needs to reference as well.
 
 Note:   You can also use this filter callback to process events at the
-        time they are activated by the user (ie: when the user hits the
-        key or moves the mouse), but make sure your code runs as fast as
-        possible as it will be executing inside the context of an interrupt
-        handler on some systems.
+	time they are activated by the user (ie: when the user hits the
+	key or moves the mouse), but make sure your code runs as fast as
+	possible as it will be executing inside the context of an interrupt
+	handler on some systems.
 
 SEE ALSO:
 EVT_getNext, EVT_peekNext
@@ -1068,10 +1068,10 @@
     code = EVT_scanCode(EVT.myEvent.message);
 
 NOTE:   Scan codes in the event library are not really hardware scan codes,
-        but rather virtual scan codes as generated by a low level keyboard
-        interface driver. All virtual scan code values are defined by the
-        EVT_scanCodesType enumeration, and will be identical across all
-        supports OS'es and platforms.
+	but rather virtual scan codes as generated by a low level keyboard
+	interface driver. All virtual scan code values are defined by the
+	EVT_scanCodesType enumeration, and will be identical across all
+	supports OS'es and platforms.
 
 SEE ALSO:
 EVT_asciiCode, EVT_repeatCount

diff --git a/board/MAI/bios_emulator/scitech/src/pm/linux/event.c b/board/MAI/bios_emulator/scitech/src/pm/linux/event.c
index c2668ce..ce38732 100644
--- a/board/MAI/bios_emulator/scitech/src/pm/linux/event.c
+++ b/board/MAI/bios_emulator/scitech/src/pm/linux/event.c

@@ -89,7 +89,7 @@
     {"BusMouse",        STD_FLG,                            NULL,               {0xf8, 0x80, 0x00, 0x00}, 3, 3},
     {"MouseMan",        CS7 | STD_FLG,                      _EVT_mouse_init,    {0x40, 0x40, 0x40, 0x00}, 3, 1},
     {"IntelliMouse",    CS7 | STD_FLG,                      _EVT_pnpmouse_init, {0xc0, 0x40, 0xc0, 0x00}, 4, 1},
-    {"IMPS2",           CS7 | STD_FLG,                      NULL,               {0xc0, 0x40, 0xc0, 0x00}, 4, 1}, // ?
+    {"IMPS2",           CS7 | STD_FLG,                      NULL,               {0xc0, 0x40, 0xc0, 0x00}, 4, 1}, /* ? */
     };
 
 #define NB_MICE (sizeof(mouse_infos)/sizeof(mouse_info))
@@ -109,7 +109,7 @@
     int map;
     } keymap;
 
-// TODO: Fix this and set it up so we can do a binary search!
+/* TODO: Fix this and set it up so we can do a binary search! */
 
 keymap keymaps[] = {
     {96, KB_padEnter},
@@ -249,131 +249,131 @@
     /* Read the first byte to check for the protocol */
     drv = &mouse_infos[mouse_driver];
     if (read(_EVT_mouse_fd, data, drv->read) != drv->read) {
-        perror("read");
-        return false;
-        }
+	perror("read");
+	return false;
+	}
     if ((data[0] & drv->proto[0]) != drv->proto[1])
-        return false;
+	return false;
 
     /* Load a whole protocol packet */
     cnt += drv->read;
     while (cnt < drv->packet_len) {
-        ret = read(_EVT_mouse_fd, data+cnt, drv->read);
-        if (ret == drv->read)
-            cnt += ret;
-        else {
-            perror("read");
-            return false;
-            }
-        }
+	ret = read(_EVT_mouse_fd, data+cnt, drv->read);
+	if (ret == drv->read)
+	    cnt += ret;
+	else {
+	    perror("read");
+	    return false;
+	    }
+	}
     if ((data[1] & drv->proto[2]) != drv->proto[3])
-        return false;
+	return false;
 
     /* Now decode the protocol packet */
     switch (mouse_driver) {
-        case EVT_microsoft:
-            if (data[0] == 0x40 && !(prev|data[1]|data[2]))
-                *buttons = 2;   /* Third button on MS compatible mouse */
-            else
-                *buttons= ((data[0] & 0x20) >> 3) | ((data[0] & 0x10) >> 4);
-            prev = *buttons;
-            *dx = (char)(((data[0] & 0x03) << 6) | (data[1] & 0x3F));
-            *dy = (char)(((data[0] & 0x0C) << 4) | (data[2] & 0x3F));
-            break;
-        case EVT_ps2:
-            *buttons = !!(data[0]&1) * 4 + !!(data[0]&2) * 1 + !!(data[0]&4) * 2;
-            if (data[1] != 0)
-                *dx = (data[0] & 0x10) ? data[1]-256 : data[1];
-            else
-                *dx = 0;
-            if (data[2] != 0)
-                *dy = -((data[0] & 0x20) ? data[2]-256 : data[2]);
-            else
-                *dy = 0;
-            break;
-        case EVT_mousesystems: case EVT_gpm:
-            *buttons = (~data[0]) & 0x07;
-            *dx = (char)(data[1]) + (char)(data[3]);
-            *dy = -((char)(data[2]) + (char)(data[4]));
-            break;
-        case EVT_logitech:
-            *buttons= data[0] & 0x07;
-            *dx = (data[0] & 0x10) ?   data[1] : - data[1];
-            *dy = (data[0] & 0x08) ? - data[2] :   data[2];
-            break;
-        case EVT_busmouse:
-            *buttons= (~data[0]) & 0x07;
-            *dx = (char)data[1];
-            *dy = -(char)data[2];
-            break;
-        case EVT_MMseries:
-            *buttons = data[0] & 0x07;
-            *dx = (data[0] & 0x10) ?   data[1] : - data[1];
-            *dy = (data[0] & 0x08) ? - data[2] :   data[2];
-            break;
-        case EVT_intellimouse:
-            *buttons = ((data[0] & 0x20) >> 3)  /* left */
-                     | ((data[3] & 0x10) >> 3)  /* middle */
-                     | ((data[0] & 0x10) >> 4); /* right */
-            *dx = (char)(((data[0] & 0x03) << 6) | (data[1] & 0x3F));
-            *dy = (char)(((data[0] & 0x0C) << 4) | (data[2] & 0x3F));
-            break;
-        case EVT_intellimouse_ps2:
-            *buttons = (data[0] & 0x04) >> 1 /* Middle */
-                | (data[0] & 0x02) >> 1 /* Right */
-                | (data[0] & 0x01) << 2; /* Left */
-            *dx = (data[0] & 0x10) ?    data[1]-256  :  data[1];
-            *dy = (data[0] & 0x20) ?  -(data[2]-256) : -data[2];
-            break;
-        case EVT_mouseman: {
-            static int      getextra;
-            static uchar    prev=0;
-            uchar           b;
+	case EVT_microsoft:
+	    if (data[0] == 0x40 && !(prev|data[1]|data[2]))
+		*buttons = 2;   /* Third button on MS compatible mouse */
+	    else
+		*buttons= ((data[0] & 0x20) >> 3) | ((data[0] & 0x10) >> 4);
+	    prev = *buttons;
+	    *dx = (char)(((data[0] & 0x03) << 6) | (data[1] & 0x3F));
+	    *dy = (char)(((data[0] & 0x0C) << 4) | (data[2] & 0x3F));
+	    break;
+	case EVT_ps2:
+	    *buttons = !!(data[0]&1) * 4 + !!(data[0]&2) * 1 + !!(data[0]&4) * 2;
+	    if (data[1] != 0)
+		*dx = (data[0] & 0x10) ? data[1]-256 : data[1];
+	    else
+		*dx = 0;
+	    if (data[2] != 0)
+		*dy = -((data[0] & 0x20) ? data[2]-256 : data[2]);
+	    else
+		*dy = 0;
+	    break;
+	case EVT_mousesystems: case EVT_gpm:
+	    *buttons = (~data[0]) & 0x07;
+	    *dx = (char)(data[1]) + (char)(data[3]);
+	    *dy = -((char)(data[2]) + (char)(data[4]));
+	    break;
+	case EVT_logitech:
+	    *buttons= data[0] & 0x07;
+	    *dx = (data[0] & 0x10) ?   data[1] : - data[1];
+	    *dy = (data[0] & 0x08) ? - data[2] :   data[2];
+	    break;
+	case EVT_busmouse:
+	    *buttons= (~data[0]) & 0x07;
+	    *dx = (char)data[1];
+	    *dy = -(char)data[2];
+	    break;
+	case EVT_MMseries:
+	    *buttons = data[0] & 0x07;
+	    *dx = (data[0] & 0x10) ?   data[1] : - data[1];
+	    *dy = (data[0] & 0x08) ? - data[2] :   data[2];
+	    break;
+	case EVT_intellimouse:
+	    *buttons = ((data[0] & 0x20) >> 3)  /* left */
+		     | ((data[3] & 0x10) >> 3)  /* middle */
+		     | ((data[0] & 0x10) >> 4); /* right */
+	    *dx = (char)(((data[0] & 0x03) << 6) | (data[1] & 0x3F));
+	    *dy = (char)(((data[0] & 0x0C) << 4) | (data[2] & 0x3F));
+	    break;
+	case EVT_intellimouse_ps2:
+	    *buttons = (data[0] & 0x04) >> 1 /* Middle */
+		| (data[0] & 0x02) >> 1 /* Right */
+		| (data[0] & 0x01) << 2; /* Left */
+	    *dx = (data[0] & 0x10) ?    data[1]-256  :  data[1];
+	    *dy = (data[0] & 0x20) ?  -(data[2]-256) : -data[2];
+	    break;
+	case EVT_mouseman: {
+	    static int      getextra;
+	    static uchar    prev=0;
+	    uchar           b;
 
-            /* The damned MouseMan has 3/4 bytes packets. The extra byte
-             * is only there if the middle button is active.
-             * I get the extra byte as a packet with magic numbers in it.
-             * and then switch to 4-byte mode.
-             */
-            if (data[1] == 0xAA && data[2] == 0x55) {
-                /* Got unexpected fourth byte */
-                if ((b = (*data>>4)) > 0x3)
-                    return false;  /* just a sanity check */
-                *dx = *dy = 0;
-                drv->packet_len=4;
-                getextra=0;
-                }
-            else {
-                /* Got 3/4, as expected */
-                /* Motion is independent of packetlen... */
-                *dx = (char)(((data[0] & 0x03) << 6) | (data[1] & 0x3F));
-                *dy = (char)(((data[0] & 0x0C) << 4) | (data[2] & 0x3F));
-                prev = ((data[0] & 0x20) >> 3) | ((data[0] & 0x10) >> 4);
-                if (drv->packet_len==4)
-                    b = data[3]>>4;
-                }
-            if (drv->packet_len == 4) {
-                if (b == 0) {
-                    drv->packet_len = 3;
-                    getextra = 1;
-                    }
-                else {
-                    if (b & 0x2)
-                        prev |= 2;
-                    }
-                }
-            *buttons = prev;
+	    /* The damned MouseMan has 3/4 bytes packets. The extra byte
+	     * is only there if the middle button is active.
+	     * I get the extra byte as a packet with magic numbers in it.
+	     * and then switch to 4-byte mode.
+	     */
+	    if (data[1] == 0xAA && data[2] == 0x55) {
+		/* Got unexpected fourth byte */
+		if ((b = (*data>>4)) > 0x3)
+		    return false;  /* just a sanity check */
+		*dx = *dy = 0;
+		drv->packet_len=4;
+		getextra=0;
+		}
+	    else {
+		/* Got 3/4, as expected */
+		/* Motion is independent of packetlen... */
+		*dx = (char)(((data[0] & 0x03) << 6) | (data[1] & 0x3F));
+		*dy = (char)(((data[0] & 0x0C) << 4) | (data[2] & 0x3F));
+		prev = ((data[0] & 0x20) >> 3) | ((data[0] & 0x10) >> 4);
+		if (drv->packet_len==4)
+		    b = data[3]>>4;
+		}
+	    if (drv->packet_len == 4) {
+		if (b == 0) {
+		    drv->packet_len = 3;
+		    getextra = 1;
+		    }
+		else {
+		    if (b & 0x2)
+			prev |= 2;
+		    }
+		}
+	    *buttons = prev;
 
-            /* This "chord-middle" behaviour was reported by David A. van Leeuwen */
-            if (((prev ^ *buttons) & 5) == 5)
-                *buttons = *buttons ? 2 : 0;
-            prev = *buttons;
-            break;
-            }
-        case EVT_noMouse:
-            return false;
-            break;
-        }
+	    /* This "chord-middle" behaviour was reported by David A. van Leeuwen */
+	    if (((prev ^ *buttons) & 5) == 5)
+		*buttons = *buttons ? 2 : 0;
+	    prev = *buttons;
+	    break;
+	    }
+	case EVT_noMouse:
+	    return false;
+	    break;
+	}
     return true;
 }
 
@@ -389,9 +389,9 @@
     int i;
 
     for(i = 0; i < nb; i++) {
-        if (tab[i].scan == key)
-            return tab[i].map;
-        }
+	if (tab[i].scan == key)
+	    return tab[i].map;
+	}
     return key;
 }
 
@@ -411,21 +411,21 @@
 {
     evt->message = 0;
     if (buts0 && axis0) {
-        if (buts0[0]) evt->message |= EVT_JOY1_BUTTONA;
-        if (buts0[1]) evt->message |= EVT_JOY1_BUTTONB;
-        evt->where_x = axis0[0];
-        evt->where_y = axis0[1];
-        }
+	if (buts0[0]) evt->message |= EVT_JOY1_BUTTONA;
+	if (buts0[1]) evt->message |= EVT_JOY1_BUTTONB;
+	evt->where_x = axis0[0];
+	evt->where_y = axis0[1];
+	}
     else
-        evt->where_x = evt->where_y = 0;
+	evt->where_x = evt->where_y = 0;
     if (buts1 && axis1) {
-        if (buts1[0]) evt->message |= EVT_JOY2_BUTTONA;
-        if (buts1[1]) evt->message |= EVT_JOY2_BUTTONB;
-        evt->where_x = axis1[0];
-        evt->where_y = axis1[1];
-        }
+	if (buts1[0]) evt->message |= EVT_JOY2_BUTTONA;
+	if (buts1[1]) evt->message |= EVT_JOY2_BUTTONB;
+	evt->where_x = axis1[0];
+	evt->where_y = axis1[1];
+	}
     else
-        evt->where_x = evt->where_y = 0;
+	evt->where_x = evt->where_y = 0;
 }
 
 /****************************************************************************
@@ -439,39 +439,39 @@
     int mask = 0;
 
     if ((js_version & ~0xffff) == 0) {
-        /* Old 0.x driver */
-        struct JS_DATA_TYPE js;
-        if (joystick0_fd && read(joystick0_fd, &js, JS_RETURN) == JS_RETURN) {
-            if (jmask & EVT_JOY_AXIS_X1)
-                axis[0] = js.x;
-            if (jmask & EVT_JOY_AXIS_Y1)
-                axis[1] = js.y;
-            mask |= EVT_JOY_AXIS_X1|EVT_JOY_AXIS_Y1;
-            }
-        if (joystick1_fd && read(joystick1_fd, &js, JS_RETURN) == JS_RETURN) {
-            if (jmask & EVT_JOY_AXIS_X2)
-                axis[2] = js.x;
-            if (jmask & EVT_JOY_AXIS_Y2)
-                axis[3] = js.y;
-            mask |= EVT_JOY_AXIS_X2|EVT_JOY_AXIS_Y2;
-            }
-        }
+	/* Old 0.x driver */
+	struct JS_DATA_TYPE js;
+	if (joystick0_fd && read(joystick0_fd, &js, JS_RETURN) == JS_RETURN) {
+	    if (jmask & EVT_JOY_AXIS_X1)
+		axis[0] = js.x;
+	    if (jmask & EVT_JOY_AXIS_Y1)
+		axis[1] = js.y;
+	    mask |= EVT_JOY_AXIS_X1|EVT_JOY_AXIS_Y1;
+	    }
+	if (joystick1_fd && read(joystick1_fd, &js, JS_RETURN) == JS_RETURN) {
+	    if (jmask & EVT_JOY_AXIS_X2)
+		axis[2] = js.x;
+	    if (jmask & EVT_JOY_AXIS_Y2)
+		axis[3] = js.y;
+	    mask |= EVT_JOY_AXIS_X2|EVT_JOY_AXIS_Y2;
+	    }
+	}
     else {
-        if (axis0) {
-            if (jmask & EVT_JOY_AXIS_X1)
-                axis[0] = axis0[0];
-            if (jmask & EVT_JOY_AXIS_Y1)
-                axis[1] = axis0[1];
-            mask |= EVT_JOY_AXIS_X1 | EVT_JOY_AXIS_Y1;
-            }
-        if (axis1) {
-            if (jmask & EVT_JOY_AXIS_X2)
-                axis[2] = axis1[0];
-            if (jmask & EVT_JOY_AXIS_Y2)
-                axis[3] = axis1[1];
-            mask |= EVT_JOY_AXIS_X2 | EVT_JOY_AXIS_Y2;
-            }
-        }
+	if (axis0) {
+	    if (jmask & EVT_JOY_AXIS_X1)
+		axis[0] = axis0[0];
+	    if (jmask & EVT_JOY_AXIS_Y1)
+		axis[1] = axis0[1];
+	    mask |= EVT_JOY_AXIS_X1 | EVT_JOY_AXIS_Y1;
+	    }
+	if (axis1) {
+	    if (jmask & EVT_JOY_AXIS_X2)
+		axis[2] = axis1[0];
+	    if (jmask & EVT_JOY_AXIS_Y2)
+		axis[3] = axis1[1];
+	    mask |= EVT_JOY_AXIS_X2 | EVT_JOY_AXIS_Y2;
+	    }
+	}
     return mask;
 }
 
@@ -484,19 +484,19 @@
     int buts = 0;
 
     if ((js_version & ~0xffff) == 0) {
-        /* Old 0.x driver */
-        struct JS_DATA_TYPE js;
-        if (joystick0_fd && read(joystick0_fd, &js, JS_RETURN) == JS_RETURN)
-            buts = js.buttons;
-        if (joystick1_fd && read(joystick1_fd, &js, JS_RETURN) == JS_RETURN)
-            buts |= js.buttons << 2;
-        }
+	/* Old 0.x driver */
+	struct JS_DATA_TYPE js;
+	if (joystick0_fd && read(joystick0_fd, &js, JS_RETURN) == JS_RETURN)
+	    buts = js.buttons;
+	if (joystick1_fd && read(joystick1_fd, &js, JS_RETURN) == JS_RETURN)
+	    buts |= js.buttons << 2;
+	}
     else {
-        if (buts0)
-            buts |= EVT_JOY1_BUTTONA*buts0[0] + EVT_JOY1_BUTTONB*buts0[1];
-        if (buts1)
-            buts |= EVT_JOY2_BUTTONA*buts1[0] + EVT_JOY2_BUTTONB*buts1[1];
-        }
+	if (buts0)
+	    buts |= EVT_JOY1_BUTTONA*buts0[0] + EVT_JOY1_BUTTONB*buts0[1];
+	if (buts1)
+	    buts |= EVT_JOY2_BUTTONA*buts1[0] + EVT_JOY2_BUTTONB*buts1[1];
+	}
     return buts;
 }
 
@@ -525,97 +525,97 @@
     static ibool    inited = false;
 
     if (inited)
-        return mask;
+	return mask;
     memset(EVT.joyMin,0,sizeof(EVT.joyMin));
     memset(EVT.joyCenter,0,sizeof(EVT.joyCenter));
     memset(EVT.joyMax,0,sizeof(EVT.joyMax));
     memset(EVT.joyPrev,0,sizeof(EVT.joyPrev));
     EVT.joyButState = 0;
     if ((tmp = getenv(ENV_JOYDEV0)) != NULL)
-        strcpy(joystick0_dev,tmp);
+	strcpy(joystick0_dev,tmp);
     if ((tmp = getenv(ENV_JOYDEV1)) != NULL)
-        strcpy(joystick1_dev,tmp);
+	strcpy(joystick1_dev,tmp);
     if ((joystick0_fd = open(joystick0_dev, O_RDONLY)) < 0)
-        joystick0_fd = 0;
+	joystick0_fd = 0;
     if ((joystick1_fd = open(joystick1_dev, O_RDONLY)) < 0)
-        joystick1_fd = 0;
-    if (!joystick0_fd && !joystick1_fd) // No joysticks detected
-        return 0;
+	joystick1_fd = 0;
+    if (!joystick0_fd && !joystick1_fd) /* No joysticks detected */
+	return 0;
     inited = true;
     if (ioctl(joystick0_fd ? joystick0_fd : joystick1_fd, JSIOCGVERSION, &js_version) < 0)
-        return 0;
+	return 0;
 
     /* Initialise joystick 0 */
     if (joystick0_fd) {
-        ioctl(joystick0_fd, JSIOCGNAME(sizeof(name0)), name0);
-        if (js_version & ~0xffff) {
-            struct js_event js;
+	ioctl(joystick0_fd, JSIOCGNAME(sizeof(name0)), name0);
+	if (js_version & ~0xffff) {
+	    struct js_event js;
 
-            ioctl(joystick0_fd, JSIOCGAXES, &js0_axes);
-            ioctl(joystick0_fd, JSIOCGBUTTONS, &js0_buttons);
-            axis0 = PM_calloc((int)js0_axes, sizeof(short));
-            buts0 = PM_malloc((int)js0_buttons);
-            /* Read the initial events */
-            while(dataReady(joystick0_fd)
-                  && read(joystick0_fd, &js, sizeof(struct js_event)) == sizeof(struct js_event)
-                  && (js.type & JS_EVENT_INIT)
-                  ) {
-                if (js.type & JS_EVENT_BUTTON)
-                    buts0[js.number] = js.value;
-                else if (js.type & JS_EVENT_AXIS)
-                    axis0[js.number] = scaleJoyAxis(js.value,js.number);
-                }
-            }
-        else {
-            js0_axes = 2;
-            js0_buttons = 2;
-            axis0 = PM_calloc((int)js0_axes, sizeof(short));
-            buts0 = PM_malloc((int)js0_buttons);
-            }
-        }
+	    ioctl(joystick0_fd, JSIOCGAXES, &js0_axes);
+	    ioctl(joystick0_fd, JSIOCGBUTTONS, &js0_buttons);
+	    axis0 = PM_calloc((int)js0_axes, sizeof(short));
+	    buts0 = PM_malloc((int)js0_buttons);
+	    /* Read the initial events */
+	    while(dataReady(joystick0_fd)
+		  && read(joystick0_fd, &js, sizeof(struct js_event)) == sizeof(struct js_event)
+		  && (js.type & JS_EVENT_INIT)
+		  ) {
+		if (js.type & JS_EVENT_BUTTON)
+		    buts0[js.number] = js.value;
+		else if (js.type & JS_EVENT_AXIS)
+		    axis0[js.number] = scaleJoyAxis(js.value,js.number);
+		}
+	    }
+	else {
+	    js0_axes = 2;
+	    js0_buttons = 2;
+	    axis0 = PM_calloc((int)js0_axes, sizeof(short));
+	    buts0 = PM_malloc((int)js0_buttons);
+	    }
+	}
 
     /* Initialise joystick 1 */
     if (joystick1_fd) {
-        ioctl(joystick1_fd, JSIOCGNAME(sizeof(name1)), name1);
-        if (js_version & ~0xffff) {
-            struct js_event js;
+	ioctl(joystick1_fd, JSIOCGNAME(sizeof(name1)), name1);
+	if (js_version & ~0xffff) {
+	    struct js_event js;
 
-            ioctl(joystick1_fd, JSIOCGAXES, &js1_axes);
-            ioctl(joystick1_fd, JSIOCGBUTTONS, &js1_buttons);
-            axis1 = PM_calloc((int)js1_axes, sizeof(short));
-            buts1 = PM_malloc((int)js1_buttons);
-            /* Read the initial events */
-            while(dataReady(joystick1_fd)
-                  && read(joystick1_fd, &js, sizeof(struct js_event))==sizeof(struct js_event)
-                  && (js.type & JS_EVENT_INIT)
-                  ) {
-                if (js.type & JS_EVENT_BUTTON)
-                    buts1[js.number] = js.value;
-                else if (js.type & JS_EVENT_AXIS)
-                    axis1[js.number] = scaleJoyAxis(js.value,js.number<<2);
-                }
-            }
-        else {
-            js1_axes = 2;
-            js1_buttons = 2;
-            axis1 = PM_calloc((int)js1_axes, sizeof(short));
-            buts1 = PM_malloc((int)js1_buttons);
-            }
-        }
+	    ioctl(joystick1_fd, JSIOCGAXES, &js1_axes);
+	    ioctl(joystick1_fd, JSIOCGBUTTONS, &js1_buttons);
+	    axis1 = PM_calloc((int)js1_axes, sizeof(short));
+	    buts1 = PM_malloc((int)js1_buttons);
+	    /* Read the initial events */
+	    while(dataReady(joystick1_fd)
+		  && read(joystick1_fd, &js, sizeof(struct js_event))==sizeof(struct js_event)
+		  && (js.type & JS_EVENT_INIT)
+		  ) {
+		if (js.type & JS_EVENT_BUTTON)
+		    buts1[js.number] = js.value;
+		else if (js.type & JS_EVENT_AXIS)
+		    axis1[js.number] = scaleJoyAxis(js.value,js.number<<2);
+		}
+	    }
+	else {
+	    js1_axes = 2;
+	    js1_buttons = 2;
+	    axis1 = PM_calloc((int)js1_axes, sizeof(short));
+	    buts1 = PM_malloc((int)js1_buttons);
+	    }
+	}
 
 #ifdef  CHECKED
-    fprintf(stderr,"Using joystick driver version %d.%d.%d\n", 
-            js_version >> 16, (js_version >> 8) & 0xff, js_version & 0xff);
+    fprintf(stderr,"Using joystick driver version %d.%d.%d\n",
+	    js_version >> 16, (js_version >> 8) & 0xff, js_version & 0xff);
     if (joystick0_fd)
-        fprintf(stderr,"Joystick 1 (%s): %s\n", joystick0_dev, name0);
+	fprintf(stderr,"Joystick 1 (%s): %s\n", joystick0_dev, name0);
     if (joystick1_fd)
-        fprintf(stderr,"Joystick 2 (%s): %s\n", joystick1_dev, name1);
+	fprintf(stderr,"Joystick 2 (%s): %s\n", joystick1_dev, name1);
 #endif
     mask = _EVT_readJoyAxis(EVT_JOY_AXIS_ALL,EVT.joyCenter);
     if (mask) {
-        for (i = 0; i < JOY_NUM_AXES; i++)
-            EVT.joyMax[i] = EVT.joyCenter[i]*2;
-        }
+	for (i = 0; i < JOY_NUM_AXES; i++)
+	    EVT.joyMax[i] = EVT.joyCenter[i]*2;
+	}
     return mask;
 }
 
@@ -634,9 +634,9 @@
 queue for later retrieval.
 
 Note:   Most analogue joysticks will provide readings that change even
-        though the joystick has not moved. Hence if you call this routine
-        you will likely get an EVT_JOYMOVE event every time through your
-        event loop.
+	though the joystick has not moved. Hence if you call this routine
+	you will likely get an EVT_JOYMOVE event every time through your
+	event loop.
 
 SEE ALSO:
 EVT_getNext, EVT_peekNext, EVT_joySetUpperLeft, EVT_joySetLowerRight,
@@ -648,68 +648,68 @@
     int     i,axis[JOY_NUM_AXES],newButState,mask,moved,ps;
 
     if ((js_version & ~0xFFFF) == 0 && EVT.joyMask) {
-        /* Read joystick axes and post movement events if they have
-         * changed since the last time we polled. Until the events are
-         * actually flushed, we keep modifying the same joystick movement
-         * event, so you won't get multiple movement event
-         */
-        mask = _EVT_readJoyAxis(EVT.joyMask,axis);
-        newButState = _EVT_readJoyButtons();
-        moved = false;
-        for (i = 0; i < JOY_NUM_AXES; i++) {
-            if (mask & (EVT_JOY_AXIS_X1 << i))
-                axis[i] = scaleJoyAxis(axis[i],i);
-            else
-                axis[i] = EVT.joyPrev[i];
-            if (axis[i] != EVT.joyPrev[i])
-                moved = true;
-            }
-        if (moved) {
-            memcpy(EVT.joyPrev,axis,sizeof(EVT.joyPrev));
-            ps = _EVT_disableInt();
-            if (EVT.oldJoyMove != -1) {
-                /* Modify the existing joystick movement event */
-                EVT.evtq[EVT.oldJoyMove].message = newButState;
-                EVT.evtq[EVT.oldJoyMove].where_x = EVT.joyPrev[0];
-                EVT.evtq[EVT.oldJoyMove].where_y = EVT.joyPrev[1];
-                EVT.evtq[EVT.oldJoyMove].relative_x = EVT.joyPrev[2];
-                EVT.evtq[EVT.oldJoyMove].relative_y = EVT.joyPrev[3];
-                }
-            else if (EVT.count < EVENTQSIZE) {
-                /* Add a new joystick movement event */
-                EVT.oldJoyMove = EVT.freeHead;
-                memset(&evt,0,sizeof(evt));
-                evt.what = EVT_JOYMOVE;
-                evt.message = EVT.joyButState;
-                evt.where_x = EVT.joyPrev[0];
-                evt.where_y = EVT.joyPrev[1];
-                evt.relative_x = EVT.joyPrev[2];
-                evt.relative_y = EVT.joyPrev[3];
-                addEvent(&evt);
-                }
-            _EVT_restoreInt(ps);
-            }
+	/* Read joystick axes and post movement events if they have
+	 * changed since the last time we polled. Until the events are
+	 * actually flushed, we keep modifying the same joystick movement
+	 * event, so you won't get multiple movement event
+	 */
+	mask = _EVT_readJoyAxis(EVT.joyMask,axis);
+	newButState = _EVT_readJoyButtons();
+	moved = false;
+	for (i = 0; i < JOY_NUM_AXES; i++) {
+	    if (mask & (EVT_JOY_AXIS_X1 << i))
+		axis[i] = scaleJoyAxis(axis[i],i);
+	    else
+		axis[i] = EVT.joyPrev[i];
+	    if (axis[i] != EVT.joyPrev[i])
+		moved = true;
+	    }
+	if (moved) {
+	    memcpy(EVT.joyPrev,axis,sizeof(EVT.joyPrev));
+	    ps = _EVT_disableInt();
+	    if (EVT.oldJoyMove != -1) {
+		/* Modify the existing joystick movement event */
+		EVT.evtq[EVT.oldJoyMove].message = newButState;
+		EVT.evtq[EVT.oldJoyMove].where_x = EVT.joyPrev[0];
+		EVT.evtq[EVT.oldJoyMove].where_y = EVT.joyPrev[1];
+		EVT.evtq[EVT.oldJoyMove].relative_x = EVT.joyPrev[2];
+		EVT.evtq[EVT.oldJoyMove].relative_y = EVT.joyPrev[3];
+		}
+	    else if (EVT.count < EVENTQSIZE) {
+		/* Add a new joystick movement event */
+		EVT.oldJoyMove = EVT.freeHead;
+		memset(&evt,0,sizeof(evt));
+		evt.what = EVT_JOYMOVE;
+		evt.message = EVT.joyButState;
+		evt.where_x = EVT.joyPrev[0];
+		evt.where_y = EVT.joyPrev[1];
+		evt.relative_x = EVT.joyPrev[2];
+		evt.relative_y = EVT.joyPrev[3];
+		addEvent(&evt);
+		}
+	    _EVT_restoreInt(ps);
+	    }
 
-        /* Read the joystick buttons, and post events to reflect the change
-         * in state for the joystick buttons.
-         */
-        if (newButState != EVT.joyButState) {
-            if (EVT.count < EVENTQSIZE) {
-                /* Add a new joystick movement event */
-                ps = _EVT_disableInt();
-                memset(&evt,0,sizeof(evt));
-                evt.what = EVT_JOYCLICK;
-                evt.message = newButState;
-                EVT.evtq[EVT.oldJoyMove].where_x = EVT.joyPrev[0];
-                EVT.evtq[EVT.oldJoyMove].where_y = EVT.joyPrev[1];
-                EVT.evtq[EVT.oldJoyMove].relative_x = EVT.joyPrev[2];
-                EVT.evtq[EVT.oldJoyMove].relative_y = EVT.joyPrev[3];
-                addEvent(&evt);
-                _EVT_restoreInt(ps);
-                }
-            EVT.joyButState = newButState;
-            }
-        }
+	/* Read the joystick buttons, and post events to reflect the change
+	 * in state for the joystick buttons.
+	 */
+	if (newButState != EVT.joyButState) {
+	    if (EVT.count < EVENTQSIZE) {
+		/* Add a new joystick movement event */
+		ps = _EVT_disableInt();
+		memset(&evt,0,sizeof(evt));
+		evt.what = EVT_JOYCLICK;
+		evt.message = newButState;
+		EVT.evtq[EVT.oldJoyMove].where_x = EVT.joyPrev[0];
+		EVT.evtq[EVT.oldJoyMove].where_y = EVT.joyPrev[1];
+		EVT.evtq[EVT.oldJoyMove].relative_x = EVT.joyPrev[2];
+		EVT.evtq[EVT.oldJoyMove].relative_y = EVT.joyPrev[3];
+		addEvent(&evt);
+		_EVT_restoreInt(ps);
+		}
+	    EVT.joyButState = newButState;
+	    }
+	}
 }
 
 /****************************************************************************
@@ -815,287 +815,287 @@
 
     /* Poll keyboard events */
     while (dataReady(_PM_console_fd) && (numkeys = read(_PM_console_fd, buf, KBDREADBUFFERSIZE)) > 0) {
-        for (i = 0; i < numkeys; i++) {
-            c = buf[i];
-            release = c & 0x80;
-            c &= 0x7F;
+	for (i = 0; i < numkeys; i++) {
+	    c = buf[i];
+	    release = c & 0x80;
+	    c &= 0x7F;
 
-            // TODO:    This is wrong! We need this to be the time stamp at
-            //          ** interrupt ** time!! One solution would be to
-            //          put the keyboard and mouse polling loops into
-            //          a separate thread that can block on I/O to the
-            //          necessay file descriptor.
-            evt.when = _EVT_getTicks();
+	    /* TODO:    This is wrong! We need this to be the time stamp at */
+	    /*          ** interrupt ** time!! One solution would be to */
+	    /*          put the keyboard and mouse polling loops into */
+	    /*          a separate thread that can block on I/O to the */
+	    /*          necessay file descriptor. */
+	    evt.when = _EVT_getTicks();
 
-            if (release) {
-                /* Key released */
-                evt.what = EVT_KEYUP;
-                switch (c) {
-                    case KB_leftShift:
-                        _PM_modifiers &= ~EVT_LEFTSHIFT;
-                        break;
-                    case KB_rightShift:
-                        _PM_modifiers &= ~EVT_RIGHTSHIFT;
-                        break;
-                    case 29:
-                        _PM_modifiers &= ~(EVT_LEFTCTRL|EVT_CTRLSTATE);
-                        break;
-                    case 97:            /* Control */
-                        _PM_modifiers &= ~EVT_CTRLSTATE;
-                        break;
-                    case 56:
-                        _PM_modifiers &= ~(EVT_LEFTALT|EVT_ALTSTATE);
-                        break;
-                    case 100:
-                        _PM_modifiers &= ~EVT_ALTSTATE;
-                        break;
-                    default:
-                    }
-                evt.modifiers = _PM_modifiers;
-                evt.message = keyUpMsg[c];
-                if (EVT.count < EVENTQSIZE)
-                    addEvent(&evt);
-                keyUpMsg[c] = 0;
-                repeatKey[c] = 0;
-                }
-            else {
-                /* Key pressed */
-                evt.what = EVT_KEYDOWN;
-                switch (c) {
-                    case KB_leftShift:
-                        _PM_modifiers |= EVT_LEFTSHIFT;
-                        break;
-                    case KB_rightShift:
-                        _PM_modifiers |= EVT_RIGHTSHIFT;
-                        break;
-                    case 29:
-                        _PM_modifiers |= EVT_LEFTCTRL|EVT_CTRLSTATE;
-                        break;
-                    case 97:            /* Control */
-                        _PM_modifiers |= EVT_CTRLSTATE;
-                        break;
-                    case 56:
-                        _PM_modifiers |= EVT_LEFTALT|EVT_ALTSTATE;
-                        break;
-                    case 100:
-                        _PM_modifiers |= EVT_ALTSTATE;
-                        break;
-                    case KB_capsLock:   /* Caps Lock */
-                        _PM_leds ^= LED_CAP;
-                        ioctl(_PM_console_fd, KDSETLED, _PM_leds);
-                        break;
-                    case KB_numLock:    /* Num Lock */
-                        _PM_leds ^= LED_NUM;
-                        ioctl(_PM_console_fd, KDSETLED, _PM_leds);
-                        break;
-                    case KB_scrollLock: /* Scroll Lock */
-                        _PM_leds ^= LED_SCR;
-                        ioctl(_PM_console_fd, KDSETLED, _PM_leds);
-                        break;
-                    default:
-                    }
-                evt.modifiers = _PM_modifiers;
-                if (keyUpMsg[c]) {
-                    evt.what = EVT_KEYREPEAT;
-                    evt.message = keyUpMsg[c] | (repeatKey[c]++ << 16);
-                    }
-                else {
-                    int asc;
+	    if (release) {
+		/* Key released */
+		evt.what = EVT_KEYUP;
+		switch (c) {
+		    case KB_leftShift:
+			_PM_modifiers &= ~EVT_LEFTSHIFT;
+			break;
+		    case KB_rightShift:
+			_PM_modifiers &= ~EVT_RIGHTSHIFT;
+			break;
+		    case 29:
+			_PM_modifiers &= ~(EVT_LEFTCTRL|EVT_CTRLSTATE);
+			break;
+		    case 97:            /* Control */
+			_PM_modifiers &= ~EVT_CTRLSTATE;
+			break;
+		    case 56:
+			_PM_modifiers &= ~(EVT_LEFTALT|EVT_ALTSTATE);
+			break;
+		    case 100:
+			_PM_modifiers &= ~EVT_ALTSTATE;
+			break;
+		    default:
+		    }
+		evt.modifiers = _PM_modifiers;
+		evt.message = keyUpMsg[c];
+		if (EVT.count < EVENTQSIZE)
+		    addEvent(&evt);
+		keyUpMsg[c] = 0;
+		repeatKey[c] = 0;
+		}
+	    else {
+		/* Key pressed */
+		evt.what = EVT_KEYDOWN;
+		switch (c) {
+		    case KB_leftShift:
+			_PM_modifiers |= EVT_LEFTSHIFT;
+			break;
+		    case KB_rightShift:
+			_PM_modifiers |= EVT_RIGHTSHIFT;
+			break;
+		    case 29:
+			_PM_modifiers |= EVT_LEFTCTRL|EVT_CTRLSTATE;
+			break;
+		    case 97:            /* Control */
+			_PM_modifiers |= EVT_CTRLSTATE;
+			break;
+		    case 56:
+			_PM_modifiers |= EVT_LEFTALT|EVT_ALTSTATE;
+			break;
+		    case 100:
+			_PM_modifiers |= EVT_ALTSTATE;
+			break;
+		    case KB_capsLock:   /* Caps Lock */
+			_PM_leds ^= LED_CAP;
+			ioctl(_PM_console_fd, KDSETLED, _PM_leds);
+			break;
+		    case KB_numLock:    /* Num Lock */
+			_PM_leds ^= LED_NUM;
+			ioctl(_PM_console_fd, KDSETLED, _PM_leds);
+			break;
+		    case KB_scrollLock: /* Scroll Lock */
+			_PM_leds ^= LED_SCR;
+			ioctl(_PM_console_fd, KDSETLED, _PM_leds);
+			break;
+		    default:
+		    }
+		evt.modifiers = _PM_modifiers;
+		if (keyUpMsg[c]) {
+		    evt.what = EVT_KEYREPEAT;
+		    evt.message = keyUpMsg[c] | (repeatKey[c]++ << 16);
+		    }
+		else {
+		    int asc;
 
-                    evt.message = getKeyMapping(keymaps, NB_KEYMAPS, c) << 8;
-                    ke.kb_index = c;
-                    ke.kb_table = 0;
-                    if ((_PM_modifiers & EVT_SHIFTKEY) || (_PM_leds & LED_CAP))
-                        ke.kb_table |= K_SHIFTTAB;
-                    if (_PM_modifiers & (EVT_LEFTALT | EVT_ALTSTATE))
-                        ke.kb_table |= K_ALTTAB;
-                    if (ioctl(_PM_console_fd, KDGKBENT, (unsigned long)&ke)<0)
-                        perror("ioctl(KDGKBENT)");
-                    if ((_PM_leds & LED_NUM) && (getKeyMapping(keypad, NB_KEYPAD, c)!=c)) {
-                        asc = getKeyMapping(keypad, NB_KEYPAD, c);
-                        }
-                    else {
-                        switch (c) {
-                            case 14:
-                                asc = ASCII_backspace;
-                                break;
-                            case 15:
-                                asc = ASCII_tab;
-                                break;
-                            case 28:
-                            case 96:
-                                asc = ASCII_enter;
-                                break;
-                            case 1:
-                                asc = ASCII_esc;
-                            default:
-                                asc = ke.kb_value & 0xFF;
-                                if (asc < 0x1B)
-                                    asc = 0;
-                                break;
-                            }
-                        }
-                    if ((_PM_modifiers & (EVT_CTRLSTATE|EVT_LEFTCTRL)) && isalpha(asc))
-                        evt.message |= toupper(asc) - 'A' + 1;
-                    else
-                        evt.message |= asc;
-                    keyUpMsg[c] = evt.message;
-                    repeatKey[c]++;
-                    }
-                if (EVT.count < EVENTQSIZE)
-                    addEvent(&evt);
-                }
-            }
-        }
+		    evt.message = getKeyMapping(keymaps, NB_KEYMAPS, c) << 8;
+		    ke.kb_index = c;
+		    ke.kb_table = 0;
+		    if ((_PM_modifiers & EVT_SHIFTKEY) || (_PM_leds & LED_CAP))
+			ke.kb_table |= K_SHIFTTAB;
+		    if (_PM_modifiers & (EVT_LEFTALT | EVT_ALTSTATE))
+			ke.kb_table |= K_ALTTAB;
+		    if (ioctl(_PM_console_fd, KDGKBENT, (unsigned long)&ke)<0)
+			perror("ioctl(KDGKBENT)");
+		    if ((_PM_leds & LED_NUM) && (getKeyMapping(keypad, NB_KEYPAD, c)!=c)) {
+			asc = getKeyMapping(keypad, NB_KEYPAD, c);
+			}
+		    else {
+			switch (c) {
+			    case 14:
+				asc = ASCII_backspace;
+				break;
+			    case 15:
+				asc = ASCII_tab;
+				break;
+			    case 28:
+			    case 96:
+				asc = ASCII_enter;
+				break;
+			    case 1:
+				asc = ASCII_esc;
+			    default:
+				asc = ke.kb_value & 0xFF;
+				if (asc < 0x1B)
+				    asc = 0;
+				break;
+			    }
+			}
+		    if ((_PM_modifiers & (EVT_CTRLSTATE|EVT_LEFTCTRL)) && isalpha(asc))
+			evt.message |= toupper(asc) - 'A' + 1;
+		    else
+			evt.message |= asc;
+		    keyUpMsg[c] = evt.message;
+		    repeatKey[c]++;
+		    }
+		if (EVT.count < EVENTQSIZE)
+		    addEvent(&evt);
+		}
+	    }
+	}
 
     /* Poll mouse events */
     if (_EVT_mouse_fd) {
-        int         dx, dy, buts;
-        static int  oldbuts;
+	int         dx, dy, buts;
+	static int  oldbuts;
 
-        while (dataReady(_EVT_mouse_fd)) {
-            if (readMouseData(&buts, &dx, &dy)) {
-                EVT.mx += dx;
-                EVT.my += dy;
-                if (EVT.mx < 0) EVT.mx = 0;
-                if (EVT.my < 0) EVT.my = 0;
-                if (EVT.mx > range_x) EVT.mx = range_x;
-                if (EVT.my > range_y) EVT.my = range_y;
-                evt.where_x = EVT.mx;
-                evt.where_y = EVT.my;
-                evt.relative_x = dx;
-                evt.relative_y = dy;
+	while (dataReady(_EVT_mouse_fd)) {
+	    if (readMouseData(&buts, &dx, &dy)) {
+		EVT.mx += dx;
+		EVT.my += dy;
+		if (EVT.mx < 0) EVT.mx = 0;
+		if (EVT.my < 0) EVT.my = 0;
+		if (EVT.mx > range_x) EVT.mx = range_x;
+		if (EVT.my > range_y) EVT.my = range_y;
+		evt.where_x = EVT.mx;
+		evt.where_y = EVT.my;
+		evt.relative_x = dx;
+		evt.relative_y = dy;
 
-                // TODO:    This is wrong! We need this to be the time stamp at
-                //          ** interrupt ** time!! One solution would be to
-                //          put the keyboard and mouse polling loops into
-                //          a separate thread that can block on I/O to the
-                //          necessay file descriptor.
-                evt.when = _EVT_getTicks();
-                evt.modifiers = _PM_modifiers;
-                if (buts & 4)
-                    evt.modifiers |= EVT_LEFTBUT;
-                if (buts & 1)
-                    evt.modifiers |= EVT_RIGHTBUT;
-                if (buts & 2)
-                    evt.modifiers |= EVT_MIDDLEBUT;
+		/* TODO:    This is wrong! We need this to be the time stamp at */
+		/*          ** interrupt ** time!! One solution would be to */
+		/*          put the keyboard and mouse polling loops into */
+		/*          a separate thread that can block on I/O to the */
+		/*          necessay file descriptor. */
+		evt.when = _EVT_getTicks();
+		evt.modifiers = _PM_modifiers;
+		if (buts & 4)
+		    evt.modifiers |= EVT_LEFTBUT;
+		if (buts & 1)
+		    evt.modifiers |= EVT_RIGHTBUT;
+		if (buts & 2)
+		    evt.modifiers |= EVT_MIDDLEBUT;
 
-                /* Left click events */
-                if ((buts&4) != (oldbuts&4)) {
-                    if (buts&4)
-                        evt.what = EVT_MOUSEDOWN;
-                    else
-                        evt.what = EVT_MOUSEUP;
-                    evt.message = EVT_LEFTBMASK;
-                    EVT.oldMove = -1;
-                    if (EVT.count < EVENTQSIZE)
-                        addEvent(&evt);
-                    }
+		/* Left click events */
+		if ((buts&4) != (oldbuts&4)) {
+		    if (buts&4)
+			evt.what = EVT_MOUSEDOWN;
+		    else
+			evt.what = EVT_MOUSEUP;
+		    evt.message = EVT_LEFTBMASK;
+		    EVT.oldMove = -1;
+		    if (EVT.count < EVENTQSIZE)
+			addEvent(&evt);
+		    }
 
-                /* Right click events */
-                if ((buts&1) != (oldbuts&1)) {
-                    if (buts&1)
-                        evt.what = EVT_MOUSEDOWN;
-                    else
-                        evt.what = EVT_MOUSEUP;
-                    evt.message = EVT_RIGHTBMASK;
-                    EVT.oldMove = -1;
-                    if (EVT.count < EVENTQSIZE)
-                        addEvent(&evt);
-                    }
+		/* Right click events */
+		if ((buts&1) != (oldbuts&1)) {
+		    if (buts&1)
+			evt.what = EVT_MOUSEDOWN;
+		    else
+			evt.what = EVT_MOUSEUP;
+		    evt.message = EVT_RIGHTBMASK;
+		    EVT.oldMove = -1;
+		    if (EVT.count < EVENTQSIZE)
+			addEvent(&evt);
+		    }
 
-                /* Middle click events */
-                if ((buts&2) != (oldbuts&2)) {
-                    if (buts&2)
-                        evt.what = EVT_MOUSEDOWN;
-                    else
-                        evt.what = EVT_MOUSEUP;
-                    evt.message = EVT_MIDDLEBMASK;
-                    EVT.oldMove = -1;
-                    if (EVT.count < EVENTQSIZE)
-                        addEvent(&evt);
-                    }
+		/* Middle click events */
+		if ((buts&2) != (oldbuts&2)) {
+		    if (buts&2)
+			evt.what = EVT_MOUSEDOWN;
+		    else
+			evt.what = EVT_MOUSEUP;
+		    evt.message = EVT_MIDDLEBMASK;
+		    EVT.oldMove = -1;
+		    if (EVT.count < EVENTQSIZE)
+			addEvent(&evt);
+		    }
 
-                /* Mouse movement event */
-                if (dx || dy) {
-                    evt.what = EVT_MOUSEMOVE;
-                    evt.message = 0;
-                    if (EVT.oldMove != -1) {
-                        /* Modify existing movement event */
-                        EVT.evtq[EVT.oldMove].where_x = evt.where_x;
-                        EVT.evtq[EVT.oldMove].where_y = evt.where_y;
-                        }
-                    else {
-                        /* Save id of this movement event */
-                        EVT.oldMove = EVT.freeHead;
-                        if (EVT.count < EVENTQSIZE)
-                            addEvent(&evt);
-                        }
-                    }
-                oldbuts = buts;
-                }
-            }
-        }
+		/* Mouse movement event */
+		if (dx || dy) {
+		    evt.what = EVT_MOUSEMOVE;
+		    evt.message = 0;
+		    if (EVT.oldMove != -1) {
+			/* Modify existing movement event */
+			EVT.evtq[EVT.oldMove].where_x = evt.where_x;
+			EVT.evtq[EVT.oldMove].where_y = evt.where_y;
+			}
+		    else {
+			/* Save id of this movement event */
+			EVT.oldMove = EVT.freeHead;
+			if (EVT.count < EVENTQSIZE)
+			    addEvent(&evt);
+			}
+		    }
+		oldbuts = buts;
+		}
+	    }
+	}
 
 #ifdef USE_OS_JOYSTICK
-    // Poll joystick events using the 1.x joystick driver API in the 2.2 kernels
+    /* Poll joystick events using the 1.x joystick driver API in the 2.2 kernels */
     if (js_version & ~0xffff) {
-        static struct js_event  js;
+	static struct js_event  js;
 
-        /* Read joystick axis 0 */
-        evt.when = 0;
-        evt.modifiers = _PM_modifiers;
-        if (joystick0_fd && dataReady(joystick0_fd) &&
-                read(joystick0_fd, &js, sizeof(js)) == sizeof(js)) {
-            if (js.type & JS_EVENT_BUTTON) {
-                if (js.number < 2) { /* Only 2 buttons for now :( */
-                    buts0[js.number] = js.value;
-                    evt.what = EVT_JOYCLICK;
-                    makeJoyEvent(&evt);
-                    if (EVT.count < EVENTQSIZE)
-                        addEvent(&evt);
-                    }
-                }
-            else if (js.type & JS_EVENT_AXIS) {
-                axis0[js.number] = scaleJoyAxis(js.value,js.number);
-                evt.what = EVT_JOYMOVE;
-                if (EVT.oldJoyMove != -1) {
-                    makeJoyEvent(&EVT.evtq[EVT.oldJoyMove]);
-                    }
-                else if (EVT.count < EVENTQSIZE) {
-                    EVT.oldJoyMove = EVT.freeHead;
-                    makeJoyEvent(&evt);
-                    addEvent(&evt);
-                    }
-                }
-            }
+	/* Read joystick axis 0 */
+	evt.when = 0;
+	evt.modifiers = _PM_modifiers;
+	if (joystick0_fd && dataReady(joystick0_fd) &&
+		read(joystick0_fd, &js, sizeof(js)) == sizeof(js)) {
+	    if (js.type & JS_EVENT_BUTTON) {
+		if (js.number < 2) { /* Only 2 buttons for now :( */
+		    buts0[js.number] = js.value;
+		    evt.what = EVT_JOYCLICK;
+		    makeJoyEvent(&evt);
+		    if (EVT.count < EVENTQSIZE)
+			addEvent(&evt);
+		    }
+		}
+	    else if (js.type & JS_EVENT_AXIS) {
+		axis0[js.number] = scaleJoyAxis(js.value,js.number);
+		evt.what = EVT_JOYMOVE;
+		if (EVT.oldJoyMove != -1) {
+		    makeJoyEvent(&EVT.evtq[EVT.oldJoyMove]);
+		    }
+		else if (EVT.count < EVENTQSIZE) {
+		    EVT.oldJoyMove = EVT.freeHead;
+		    makeJoyEvent(&evt);
+		    addEvent(&evt);
+		    }
+		}
+	    }
 
-        /* Read joystick axis 1 */
-        if (joystick1_fd && dataReady(joystick1_fd) &&
-                read(joystick1_fd, &js, sizeof(js))==sizeof(js)) {
-            if (js.type & JS_EVENT_BUTTON) {
-                if (js.number < 2) { /* Only 2 buttons for now :( */
-                    buts1[js.number] = js.value;
-                    evt.what = EVT_JOYCLICK;
-                    makeJoyEvent(&evt);
-                    if (EVT.count < EVENTQSIZE)
-                        addEvent(&evt);
-                    }
-                }
-            else if (js.type & JS_EVENT_AXIS) {
-                axis1[js.number] = scaleJoyAxis(js.value,js.number<<2);
-                evt.what = EVT_JOYMOVE;
-                if (EVT.oldJoyMove != -1) {
-                    makeJoyEvent(&EVT.evtq[EVT.oldJoyMove]);
-                    }
-                else if (EVT.count < EVENTQSIZE) {
-                    EVT.oldJoyMove = EVT.freeHead;
-                    makeJoyEvent(&evt);
-                    addEvent(&evt);
-                    }
-                }
-            }
-        }
+	/* Read joystick axis 1 */
+	if (joystick1_fd && dataReady(joystick1_fd) &&
+		read(joystick1_fd, &js, sizeof(js))==sizeof(js)) {
+	    if (js.type & JS_EVENT_BUTTON) {
+		if (js.number < 2) { /* Only 2 buttons for now :( */
+		    buts1[js.number] = js.value;
+		    evt.what = EVT_JOYCLICK;
+		    makeJoyEvent(&evt);
+		    if (EVT.count < EVENTQSIZE)
+			addEvent(&evt);
+		    }
+		}
+	    else if (js.type & JS_EVENT_AXIS) {
+		axis1[js.number] = scaleJoyAxis(js.value,js.number<<2);
+		evt.what = EVT_JOYMOVE;
+		if (EVT.oldJoyMove != -1) {
+		    makeJoyEvent(&EVT.evtq[EVT.oldJoyMove]);
+		    }
+		else if (EVT.count < EVENTQSIZE) {
+		    EVT.oldJoyMove = EVT.freeHead;
+		    makeJoyEvent(&evt);
+		    addEvent(&evt);
+		    }
+		}
+	    }
+	}
 #endif
 }
 
@@ -1122,7 +1122,7 @@
 {
     struct termios tty;
     char *c;
-  
+
     tcgetattr(fd, &tty);
     tty.c_iflag = IGNBRK | IGNPAR;
     tty.c_oflag = 0;
@@ -1131,20 +1131,20 @@
     tty.c_cc[VTIME] = 0;
     tty.c_cc[VMIN] = 1;
     switch (old) {
-        case 9600:  tty.c_cflag = flags | B9600; break;
-        case 4800:  tty.c_cflag = flags | B4800; break;
-        case 2400:  tty.c_cflag = flags | B2400; break;
-        case 1200:
-        default:    tty.c_cflag = flags | B1200; break;
-        }
+	case 9600:  tty.c_cflag = flags | B9600; break;
+	case 4800:  tty.c_cflag = flags | B4800; break;
+	case 2400:  tty.c_cflag = flags | B2400; break;
+	case 1200:
+	default:    tty.c_cflag = flags | B1200; break;
+	}
     tcsetattr(fd, TCSAFLUSH, &tty);
     switch (new) {
-        case 9600:  c = "*q";  tty.c_cflag = flags | B9600; break;
-        case 4800:  c = "*p";  tty.c_cflag = flags | B4800; break;
-        case 2400:  c = "*o";  tty.c_cflag = flags | B2400; break;
-        case 1200:
-        default:    c = "*n";  tty.c_cflag = flags | B1200; break;
-        }
+	case 9600:  c = "*q";  tty.c_cflag = flags | B9600; break;
+	case 4800:  c = "*p";  tty.c_cflag = flags | B4800; break;
+	case 2400:  c = "*o";  tty.c_cflag = flags | B2400; break;
+	case 1200:
+	default:    c = "*n";  tty.c_cflag = flags | B1200; break;
+	}
     write(fd, c, 2);
     usleep(100000);
     tcsetattr(fd, TCSAFLUSH, &tty);
@@ -1161,7 +1161,7 @@
 
     /* Change from any available speed to the chosen one */
     for (i = 9600; i >= 1200; i /= 2)
-        setspeed(_EVT_mouse_fd, i, opt_baud, mouse_infos[mouse_driver].flags);
+	setspeed(_EVT_mouse_fd, i, opt_baud, mouse_infos[mouse_driver].flags);
 }
 
 /****************************************************************************
@@ -1173,29 +1173,29 @@
     int         i;
     struct stat buf;
     int         busmouse;
-    
+
     /* is this a serial- or a bus- mouse? */
     if (fstat(_EVT_mouse_fd,&buf) == -1)
-        perror("fstat");
+	perror("fstat");
     i = MAJOR(buf.st_rdev);
     if (stat("/dev/ttyS0",&buf) == -1)
-        perror("stat");
+	perror("stat");
     busmouse=(i != MAJOR(buf.st_rdev));
-    
+
     /* Fix the howmany field, so that serial mice have 1, while busmice have 3 */
     mouse_infos[mouse_driver].read = busmouse ? 3 : 1;
-    
+
     /* Change from any available speed to the chosen one */
     for (i = 9600; i >= 1200; i /= 2)
-        setspeed(_EVT_mouse_fd, i, opt_baud, mouse_infos[mouse_driver].flags);
-  
+	setspeed(_EVT_mouse_fd, i, opt_baud, mouse_infos[mouse_driver].flags);
+
     /* This stuff is peculiar of logitech mice, also for the serial ones */
     write(_EVT_mouse_fd, "S", 1);
     setspeed(_EVT_mouse_fd, opt_baud, opt_baud,CS8 |PARENB |PARODD |CREAD |CLOCAL |HUPCL);
-  
+
     /* Configure the sample rate */
     for (i = 0; opt_sample <= sampletab[i].sample; i++)
-        ;
+	;
     write(_EVT_mouse_fd,sampletab[i].code,1);
 }
 
@@ -1206,7 +1206,7 @@
 static void _EVT_pnpmouse_init(void)
 {
     struct termios tty;
-  
+
     tcgetattr(_EVT_mouse_fd, &tty);
     tty.c_iflag = IGNBRK | IGNPAR;
     tty.c_oflag = 0;
@@ -1240,53 +1240,53 @@
     EVT.mouseMove = mouseMove;
     initEventQueue();
     for (i = 0; i < 256; i++)
-        keyUpMsg[i] = 0;
+	keyUpMsg[i] = 0;
 
     /* Keyboard initialization */
     if (_PM_console_fd == -1)
-        PM_fatalError("You must first call PM_openConsole to use the EVT functions!");
+	PM_fatalError("You must first call PM_openConsole to use the EVT functions!");
     _PM_keyboard_rawmode();
     fcntl(_PM_console_fd,F_SETFL,fcntl(_PM_console_fd,F_GETFL) | O_NONBLOCK);
 
     /* Mouse initialization */
     if ((tmp = getenv(ENV_MOUSEDRV)) != NULL) {
-        for (i = 0; i < NB_MICE; i++) {
-            if (!strcasecmp(tmp, mouse_infos[i].name)) {
-                mouse_driver = i;
-                break;
-                }
-            }
-        if (i == NB_MICE) {
-            fprintf(stderr,"Unknown mouse driver: %s\n", tmp);
-            mouse_driver = EVT_noMouse;
-            _EVT_mouse_fd = 0;
-            }
-        }
+	for (i = 0; i < NB_MICE; i++) {
+	    if (!strcasecmp(tmp, mouse_infos[i].name)) {
+		mouse_driver = i;
+		break;
+		}
+	    }
+	if (i == NB_MICE) {
+	    fprintf(stderr,"Unknown mouse driver: %s\n", tmp);
+	    mouse_driver = EVT_noMouse;
+	    _EVT_mouse_fd = 0;
+	    }
+	}
     if (mouse_driver != EVT_noMouse) {
-        if (mouse_driver == EVT_gpm)
-            strcpy(mouse_dev,"/dev/gpmdata");
-        if ((tmp = getenv(ENV_MOUSEDEV)) != NULL)
-            strcpy(mouse_dev,tmp);
+	if (mouse_driver == EVT_gpm)
+	    strcpy(mouse_dev,"/dev/gpmdata");
+	if ((tmp = getenv(ENV_MOUSEDEV)) != NULL)
+	    strcpy(mouse_dev,tmp);
 #ifdef  CHECKED
-        fprintf(stderr,"Using the %s MGL mouse driver on %s.\n", mouse_infos[mouse_driver].name, mouse_dev);
+	fprintf(stderr,"Using the %s MGL mouse driver on %s.\n", mouse_infos[mouse_driver].name, mouse_dev);
 #endif
-        if ((_EVT_mouse_fd = open(mouse_dev, O_RDWR)) < 0) {
-            perror("open");
-            fprintf(stderr, "Unable to open mouse device %s, dropping mouse support.\n", mouse_dev);
-            sleep(1);
-            mouse_driver = EVT_noMouse;
-            _EVT_mouse_fd = 0;
-            }
-        else {
-            char c;
+	if ((_EVT_mouse_fd = open(mouse_dev, O_RDWR)) < 0) {
+	    perror("open");
+	    fprintf(stderr, "Unable to open mouse device %s, dropping mouse support.\n", mouse_dev);
+	    sleep(1);
+	    mouse_driver = EVT_noMouse;
+	    _EVT_mouse_fd = 0;
+	    }
+	else {
+	    char c;
 
-            /* Init and flush the mouse pending input queue */
-            if (mouse_infos[mouse_driver].init)
-                mouse_infos[mouse_driver].init();
-            while(dataReady(_EVT_mouse_fd) && read(_EVT_mouse_fd, &c, 1) == 1)
-                ;
-            }
-        }
+	    /* Init and flush the mouse pending input queue */
+	    if (mouse_infos[mouse_driver].init)
+		mouse_infos[mouse_driver].init();
+	    while(dataReady(_EVT_mouse_fd) && read(_EVT_mouse_fd, &c, 1) == 1)
+		;
+	    }
+	}
 }
 
 /****************************************************************************
@@ -1318,7 +1318,7 @@
 ****************************************************************************/
 void EVT_resume(void)
 {
-    // Do nothing for Linux
+    /* Do nothing for Linux */
 }
 
 /****************************************************************************
@@ -1328,7 +1328,7 @@
 ****************************************************************************/
 void EVT_suspend(void)
 {
-    // Do nothing for Linux
+    /* Do nothing for Linux */
 }
 
 /****************************************************************************
@@ -1340,22 +1340,21 @@
     /* Restore signal handlers */
     _PM_restore_kb_mode();
     if (_EVT_mouse_fd) {
-        close(_EVT_mouse_fd);
-        _EVT_mouse_fd = 0;
-        }
+	close(_EVT_mouse_fd);
+	_EVT_mouse_fd = 0;
+	}
 #ifdef USE_OS_JOYSTICK
     if (joystick0_fd) {
-        close(joystick0_fd);
-        free(axis0);
-        free(buts0);
-        joystick0_fd = 0;
-        }
+	close(joystick0_fd);
+	free(axis0);
+	free(buts0);
+	joystick0_fd = 0;
+	}
     if (joystick1_fd) {
-        close(joystick1_fd);
-        free(axis1);
-        free(buts1);
-        joystick1_fd = 0;
-        }
+	close(joystick1_fd);
+	free(axis1);
+	free(buts1);
+	joystick1_fd = 0;
+	}
 #endif
 }
-

diff --git a/board/MAI/bios_emulator/scitech/src/pm/linux/oshdr.h b/board/MAI/bios_emulator/scitech/src/pm/linux/oshdr.h
index 6023dff..eadedfb 100644
--- a/board/MAI/bios_emulator/scitech/src/pm/linux/oshdr.h
+++ b/board/MAI/bios_emulator/scitech/src/pm/linux/oshdr.h

@@ -58,4 +58,3 @@
 /* Linux needs the generic joystick scaling code */
 
 #define NEED_SCALE_JOY_AXIS
-

diff --git a/board/MAI/bios_emulator/scitech/src/pm/linux/pm.c b/board/MAI/bios_emulator/scitech/src/pm/linux/pm.c
index 1d52984..c12a835 100644
--- a/board/MAI/bios_emulator/scitech/src/pm/linux/pm.c
+++ b/board/MAI/bios_emulator/scitech/src/pm/linux/pm.c

@@ -148,7 +148,7 @@
     printk("%04X:%04X: outb.%04X <- %02X\n", traceAddr >> 16, traceAddr & 0xFFFF, (ushort)port, (uchar)value);
 #endif
     asm volatile ("outb %0,%1"
-          ::"a" ((unsigned char) value), "d"((unsigned short) port));
+	  ::"a" ((unsigned char) value), "d"((unsigned short) port));
 }
 
 static inline void port_outw(int value, int port)
@@ -157,7 +157,7 @@
     printk("%04X:%04X: outw.%04X <- %04X\n", traceAddr >> 16,traceAddr & 0xFFFF, (ushort)port, (ushort)value);
 #endif
     asm volatile ("outw %0,%1"
-         ::"a" ((unsigned short) value), "d"((unsigned short) port));
+	 ::"a" ((unsigned short) value), "d"((unsigned short) port));
 }
 
 static inline void port_outl(int value, int port)
@@ -166,15 +166,15 @@
     printk("%04X:%04X: outl.%04X <- %08X\n", traceAddr >> 16,traceAddr & 0xFFFF, (ushort)port, (ulong)value);
 #endif
     asm volatile ("outl %0,%1"
-         ::"a" ((unsigned long) value), "d"((unsigned short) port));
+	 ::"a" ((unsigned long) value), "d"((unsigned short) port));
 }
 
 static inline unsigned int port_in(int port)
 {
     unsigned char value;
     asm volatile ("inb %1,%0"
-              :"=a" ((unsigned char)value)
-              :"d"((unsigned short) port));
+	      :"=a" ((unsigned char)value)
+	      :"d"((unsigned short) port));
 #ifdef TRACE_IO
     printk("%04X:%04X:  inb.%04X -> %02X\n", traceAddr >> 16,traceAddr & 0xFFFF, (ushort)port, (uchar)value);
 #endif
@@ -185,8 +185,8 @@
 {
     unsigned short value;
     asm volatile ("inw %1,%0"
-              :"=a" ((unsigned short)value)
-              :"d"((unsigned short) port));
+	      :"=a" ((unsigned short)value)
+	      :"d"((unsigned short) port));
 #ifdef TRACE_IO
     printk("%04X:%04X:  inw.%04X -> %04X\n", traceAddr >> 16,traceAddr & 0xFFFF, (ushort)port, (ushort)value);
 #endif
@@ -197,8 +197,8 @@
 {
     unsigned long value;
     asm volatile ("inl %1,%0"
-              :"=a" ((unsigned long)value)
-              :"d"((unsigned short) port));
+	      :"=a" ((unsigned long)value)
+	      :"d"((unsigned short) port));
 #ifdef TRACE_IO
     printk("%04X:%04X:  inl.%04X -> %08X\n", traceAddr >> 16,traceAddr & 0xFFFF, (ushort)port, (ulong)value);
 #endif
@@ -211,16 +211,16 @@
     int     fd_zero;
 
     if (mem_info.ready)
-        return 1;
+	return 1;
 
     if ((fd_zero = open("/dev/zero", O_RDONLY)) == -1)
-        PM_fatalError("You must have root privledges to run this program!");
+	PM_fatalError("You must have root privledges to run this program!");
     if ((m = mmap((void *)REAL_MEM_BASE, REAL_MEM_SIZE,
-            PROT_READ | PROT_WRITE | PROT_EXEC,
-            MAP_FIXED | MAP_PRIVATE, fd_zero, 0)) == (void *)-1) {
-        close(fd_zero);
-        PM_fatalError("You must have root privledges to run this program!");
-        }
+	    PROT_READ | PROT_WRITE | PROT_EXEC,
+	    MAP_FIXED | MAP_PRIVATE, fd_zero, 0)) == (void *)-1) {
+	close(fd_zero);
+	PM_fatalError("You must have root privledges to run this program!");
+	}
     mem_info.ready = 1;
     mem_info.count = 1;
     mem_info.blocks[0].size = REAL_MEM_SIZE;
@@ -231,9 +231,9 @@
 static void insert_block(int i)
 {
     memmove(
-        mem_info.blocks + i + 1,
-        mem_info.blocks + i,
-        (mem_info.count - i) * sizeof(struct mem_block));
+	mem_info.blocks + i + 1,
+	mem_info.blocks + i,
+	(mem_info.count - i) * sizeof(struct mem_block));
     mem_info.count++;
 }
 
@@ -242,9 +242,9 @@
     mem_info.count--;
 
     memmove(
-        mem_info.blocks + i,
-        mem_info.blocks + i + 1,
-        (mem_info.count - i) * sizeof(struct mem_block));
+	mem_info.blocks + i,
+	mem_info.blocks + i + 1,
+	(mem_info.count - i) * sizeof(struct mem_block));
 }
 
 static inline void set_bit(unsigned int bit, void *array)
@@ -279,35 +279,35 @@
     uint    r_seg,r_off;
 
     if (inited)
-        return;
+	return;
 
     /* Map the Interrupt Vectors (0x0 - 0x400) + BIOS data (0x400 - 0x502)
      * and the physical framebuffer and ROM images from (0xa0000 - 0x100000)
      */
     real_mem_init();
     if (!fd_mem && (fd_mem = open("/dev/mem", O_RDWR)) == -1) {
-        PM_fatalError("You must have root privileges to run this program!");
-        }
+	PM_fatalError("You must have root privileges to run this program!");
+	}
     if ((m = mmap((void *)0, 0x502,
-            PROT_READ | PROT_WRITE | PROT_EXEC,
-            MAP_FIXED | MAP_PRIVATE, fd_mem, 0)) == (void *)-1) {
-        PM_fatalError("You must have root privileges to run this program!");
-        }
+	    PROT_READ | PROT_WRITE | PROT_EXEC,
+	    MAP_FIXED | MAP_PRIVATE, fd_mem, 0)) == (void *)-1) {
+	PM_fatalError("You must have root privileges to run this program!");
+	}
     if ((m = mmap((void *)0xA0000, 0xC0000 - 0xA0000,
-            PROT_READ | PROT_WRITE,
-            MAP_FIXED | MAP_SHARED, fd_mem, 0xA0000)) == (void *)-1) {
-        PM_fatalError("You must have root privileges to run this program!");
-        }
+	    PROT_READ | PROT_WRITE,
+	    MAP_FIXED | MAP_SHARED, fd_mem, 0xA0000)) == (void *)-1) {
+	PM_fatalError("You must have root privileges to run this program!");
+	}
     if ((m = mmap((void *)0xC0000, 0xD0000 - 0xC0000,
-            PROT_READ | PROT_WRITE | PROT_EXEC,
-            MAP_FIXED | MAP_PRIVATE, fd_mem, 0xC0000)) == (void *)-1) {
-        PM_fatalError("You must have root privileges to run this program!");
-        }
+	    PROT_READ | PROT_WRITE | PROT_EXEC,
+	    MAP_FIXED | MAP_PRIVATE, fd_mem, 0xC0000)) == (void *)-1) {
+	PM_fatalError("You must have root privileges to run this program!");
+	}
     if ((m = mmap((void *)0xD0000, 0x100000 - 0xD0000,
-            PROT_READ | PROT_WRITE,
-            MAP_FIXED | MAP_SHARED, fd_mem, 0xD0000)) == (void *)-1) {
-        PM_fatalError("You must have root privileges to run this program!");
-        }
+	    PROT_READ | PROT_WRITE,
+	    MAP_FIXED | MAP_SHARED, fd_mem, 0xD0000)) == (void *)-1) {
+	PM_fatalError("You must have root privileges to run this program!");
+	}
     inited = 1;
 
     /* Allocate a stack */
@@ -356,9 +356,9 @@
 {
     uint pos = strlen(s);
     if (s[pos-1] != '/') {
-        s[pos] = '/';
-        s[pos+1] = '\0';
-        }
+	s[pos] = '/';
+	s[pos+1] = '\0';
+	}
 }
 
 void PMAPI PM_setFatalErrorCleanup(
@@ -370,7 +370,7 @@
 void PMAPI PM_fatalError(const char *msg)
 {
     if (fatalErrorCleanup)
-        fatalErrorCleanup();
+	fatalErrorCleanup();
     fprintf(stderr,"%s\n", msg);
     fflush(stderr);
     exit(1);
@@ -379,18 +379,18 @@
 static void ExitVBEBuf(void)
 {
     if (VESABuf_ptr)
-        PM_freeRealSeg(VESABuf_ptr);
+	PM_freeRealSeg(VESABuf_ptr);
     VESABuf_ptr = 0;
 }
 
 void * PMAPI PM_getVESABuf(uint *len,uint *rseg,uint *roff)
 {
     if (!VESABuf_ptr) {
-        /* Allocate a global buffer for communicating with the VESA VBE */
-        if ((VESABuf_ptr = PM_allocRealSeg(VESABuf_len, &VESABuf_rseg, &VESABuf_roff)) == NULL)
-            return NULL;
-        atexit(ExitVBEBuf);
-        }
+	/* Allocate a global buffer for communicating with the VESA VBE */
+	if ((VESABuf_ptr = PM_allocRealSeg(VESABuf_len, &VESABuf_rseg, &VESABuf_roff)) == NULL)
+	    return NULL;
+	atexit(ExitVBEBuf);
+	}
     *len = VESABuf_len;
     *rseg = VESABuf_rseg;
     *roff = VESABuf_roff;
@@ -431,7 +431,7 @@
     char *path)
 {
     if (!PM_findBPD("graphics.bpd",path))
-        return NULL;
+	return NULL;
     PM_backslash(path);
     strcat(path,KBMODE_DAT);
     return fopen(path,mode);
@@ -448,18 +448,18 @@
     char            path[PM_MAX_PATH];
 
     if (_PM_console_fd != -1 && (kbmode = open_kb_mode("rb",path)) != NULL) {
-        if (fread(&mode,1,sizeof(mode),kbmode) == sizeof(mode)) {
-            if (mode.startup_vc > 0)
-                ioctl(_PM_console_fd, VT_ACTIVATE, mode.startup_vc);
-            ioctl(_PM_console_fd, KDSKBMODE, mode.kb_mode);
-            ioctl(_PM_console_fd, KDSETLED, mode.leds);
-            tcsetattr(_PM_console_fd, TCSAFLUSH, &mode.termios);
-            fcntl(_PM_console_fd,F_SETFL,mode.flags);
-            }
-        fclose(kbmode);
-        unlink(path);
-        in_raw_mode = false;
-        }
+	if (fread(&mode,1,sizeof(mode),kbmode) == sizeof(mode)) {
+	    if (mode.startup_vc > 0)
+		ioctl(_PM_console_fd, VT_ACTIVATE, mode.startup_vc);
+	    ioctl(_PM_console_fd, KDSKBMODE, mode.kb_mode);
+	    ioctl(_PM_console_fd, KDSETLED, mode.leds);
+	    tcsetattr(_PM_console_fd, TCSAFLUSH, &mode.termios);
+	    fcntl(_PM_console_fd,F_SETFL,mode.flags);
+	    }
+	fclose(kbmode);
+	unlink(path);
+	in_raw_mode = false;
+	}
 }
 
 /****************************************************************************
@@ -488,49 +488,49 @@
     char            path[PM_MAX_PATH];
     int             i;
     static int sig_list[] = {
-        SIGHUP,
-        SIGINT,
-        SIGQUIT,
-        SIGILL,
-        SIGTRAP,
-        SIGABRT,
-        SIGIOT,
-        SIGBUS,
-        SIGFPE,
-        SIGKILL,
-        SIGSEGV,
-        SIGTERM,
-        };
+	SIGHUP,
+	SIGINT,
+	SIGQUIT,
+	SIGILL,
+	SIGTRAP,
+	SIGABRT,
+	SIGIOT,
+	SIGBUS,
+	SIGFPE,
+	SIGKILL,
+	SIGSEGV,
+	SIGTERM,
+	};
 
     if ((kbmode = open_kb_mode("rb",path)) == NULL) {
-        if ((kbmode = open_kb_mode("wb",path)) == NULL)
-            PM_fatalError("Unable to open kbmode.dat file for writing!");
-        if (ioctl(_PM_console_fd, KDGKBMODE, &mode.kb_mode))
-            perror("KDGKBMODE");
-        ioctl(_PM_console_fd, KDGETLED, &mode.leds);
-        _PM_leds = mode.leds & 0xF;
-        _PM_modifiers = 0;
-        tcgetattr(_PM_console_fd, &mode.termios);
-        conf = mode.termios;
-        conf.c_lflag &= ~(ICANON | ECHO | ISIG);
-        conf.c_iflag &= ~(ISTRIP | IGNCR | ICRNL | INLCR | BRKINT | PARMRK | INPCK | IUCLC | IXON | IXOFF);
-        conf.c_iflag  |= (IGNBRK | IGNPAR);
-        conf.c_cc[VMIN] = 1;
-        conf.c_cc[VTIME] = 0;
-        conf.c_cc[VSUSP] = 0;
-        tcsetattr(_PM_console_fd, TCSAFLUSH, &conf);
-        mode.flags = fcntl(_PM_console_fd,F_GETFL);
-        if (ioctl(_PM_console_fd, KDSKBMODE, K_MEDIUMRAW))
-            perror("KDSKBMODE");
-        atexit(_PM_restore_kb_mode);
-        for (i = 0; i < sizeof(sig_list)/sizeof(sig_list[0]); i++)
-            signal(sig_list[i], _PM_abort);
-        mode.startup_vc = startup_vc;
-        if (fwrite(&mode,1,sizeof(mode),kbmode) != sizeof(mode))
-            PM_fatalError("Error writing kbmode.dat!");
-        fclose(kbmode);
-        in_raw_mode = true;
-        }
+	if ((kbmode = open_kb_mode("wb",path)) == NULL)
+	    PM_fatalError("Unable to open kbmode.dat file for writing!");
+	if (ioctl(_PM_console_fd, KDGKBMODE, &mode.kb_mode))
+	    perror("KDGKBMODE");
+	ioctl(_PM_console_fd, KDGETLED, &mode.leds);
+	_PM_leds = mode.leds & 0xF;
+	_PM_modifiers = 0;
+	tcgetattr(_PM_console_fd, &mode.termios);
+	conf = mode.termios;
+	conf.c_lflag &= ~(ICANON | ECHO | ISIG);
+	conf.c_iflag &= ~(ISTRIP | IGNCR | ICRNL | INLCR | BRKINT | PARMRK | INPCK | IUCLC | IXON | IXOFF);
+	conf.c_iflag  |= (IGNBRK | IGNPAR);
+	conf.c_cc[VMIN] = 1;
+	conf.c_cc[VTIME] = 0;
+	conf.c_cc[VSUSP] = 0;
+	tcsetattr(_PM_console_fd, TCSAFLUSH, &conf);
+	mode.flags = fcntl(_PM_console_fd,F_GETFL);
+	if (ioctl(_PM_console_fd, KDSKBMODE, K_MEDIUMRAW))
+	    perror("KDSKBMODE");
+	atexit(_PM_restore_kb_mode);
+	for (i = 0; i < sizeof(sig_list)/sizeof(sig_list[0]); i++)
+	    signal(sig_list[i], _PM_abort);
+	mode.startup_vc = startup_vc;
+	if (fwrite(&mode,1,sizeof(mode),kbmode) != sizeof(mode))
+	    PM_fatalError("Error writing kbmode.dat!");
+	fclose(kbmode);
+	in_raw_mode = true;
+	}
 }
 
 int PMAPI PM_kbhit(void)
@@ -539,9 +539,9 @@
     struct timeval tv = { 0, 0 };
 
     if (console_count == 0)
-        PM_fatalError("You *must* open a console before using PM_kbhit!");
+	PM_fatalError("You *must* open a console before using PM_kbhit!");
     if (!in_raw_mode)
-        _PM_keyboard_rawmode();
+	_PM_keyboard_rawmode();
     FD_ZERO(&s);
     FD_SET(_PM_console_fd, &s);
     return select(_PM_console_fd+1, &s, NULL, NULL, &tv) > 0;
@@ -554,62 +554,62 @@
     static struct kbentry ke;
 
     if (console_count == 0)
-        PM_fatalError("You *must* open a console before using PM_getch!");
+	PM_fatalError("You *must* open a console before using PM_getch!");
     if (!in_raw_mode)
-        _PM_keyboard_rawmode();
+	_PM_keyboard_rawmode();
     while (read(_PM_console_fd, &c, 1) > 0) {
-        release = c & 0x80;
-        c &= 0x7F;
-        if (release) {
-            switch(c){
-                case 42: case 54: // Shift
-                    _PM_modifiers &= ~KB_SHIFT;
-                    break;
-                case 29: case 97: // Control
-                    _PM_modifiers &= ~KB_CONTROL;
-                    break;
-                case 56: case 100: // Alt / AltGr
-                    _PM_modifiers &= ~KB_ALT;
-                    break;
-                }
-            continue;
-            }
-        switch (c) {
-            case 42: case 54: // Shift
-                _PM_modifiers |= KB_SHIFT;
-                 break;
-            case 29: case 97: // Control
-                _PM_modifiers |= KB_CONTROL;
-                break;
-            case 56: case 100: // Alt / AltGr
-                _PM_modifiers |= KB_ALT;
-                break;
-            case 58: // Caps Lock
-                _PM_modifiers ^= KB_CAPS;
-                ioctl(_PM_console_fd, KDSETLED, _PM_modifiers & 7);
-                break;
-            case 69: // Num Lock
-                _PM_modifiers ^= KB_NUMLOCK;
-                ioctl(_PM_console_fd, KDSETLED, _PM_modifiers & 7);
-                break;
-            case 70: // Scroll Lock
-                _PM_modifiers ^= KB_SCROLL;
-                ioctl(_PM_console_fd, KDSETLED, _PM_modifiers & 7);
-                break;
-            case 28:
-                return 0x1C;
-            default:
-                ke.kb_index = c;
-                ke.kb_table = 0;
-                if ((_PM_modifiers & KB_SHIFT) || (_PM_modifiers & KB_CAPS))
-                    ke.kb_table |= K_SHIFTTAB;
-                if (_PM_modifiers & KB_ALT)
-                    ke.kb_table |= K_ALTTAB;
-                ioctl(_PM_console_fd, KDGKBENT, (ulong)&ke);
-                c = ke.kb_value & 0xFF;
-                return c;
-            }
-        }
+	release = c & 0x80;
+	c &= 0x7F;
+	if (release) {
+	    switch(c){
+		case 42: case 54: /* Shift */
+		    _PM_modifiers &= ~KB_SHIFT;
+		    break;
+		case 29: case 97: /* Control */
+		    _PM_modifiers &= ~KB_CONTROL;
+		    break;
+		case 56: case 100: /* Alt / AltGr */
+		    _PM_modifiers &= ~KB_ALT;
+		    break;
+		}
+	    continue;
+	    }
+	switch (c) {
+	    case 42: case 54: /* Shift */
+		_PM_modifiers |= KB_SHIFT;
+		 break;
+	    case 29: case 97: /* Control */
+		_PM_modifiers |= KB_CONTROL;
+		break;
+	    case 56: case 100: /* Alt / AltGr */
+		_PM_modifiers |= KB_ALT;
+		break;
+	    case 58: /* Caps Lock */
+		_PM_modifiers ^= KB_CAPS;
+		ioctl(_PM_console_fd, KDSETLED, _PM_modifiers & 7);
+		break;
+	    case 69: /* Num Lock */
+		_PM_modifiers ^= KB_NUMLOCK;
+		ioctl(_PM_console_fd, KDSETLED, _PM_modifiers & 7);
+		break;
+	    case 70: /* Scroll Lock */
+		_PM_modifiers ^= KB_SCROLL;
+		ioctl(_PM_console_fd, KDSETLED, _PM_modifiers & 7);
+		break;
+	    case 28:
+		return 0x1C;
+	    default:
+		ke.kb_index = c;
+		ke.kb_table = 0;
+		if ((_PM_modifiers & KB_SHIFT) || (_PM_modifiers & KB_CAPS))
+		    ke.kb_table |= K_SHIFTTAB;
+		if (_PM_modifiers & KB_ALT)
+		    ke.kb_table |= K_ALTTAB;
+		ioctl(_PM_console_fd, KDGKBENT, (ulong)&ke);
+		c = ke.kb_value & 0xFF;
+		return c;
+	    }
+	}
     return 0;
 }
 
@@ -621,12 +621,12 @@
     int _PM_console_fd)
 {
     while (ioctl(_PM_console_fd, VT_WAITACTIVE, tty_vc) < 0) {
-        if ((errno != EAGAIN) && (errno != EINTR)) {
-            perror("ioctl(VT_WAITACTIVE)");
-            exit(1);
-            }
-        usleep(150000);
-        }
+	if ((errno != EAGAIN) && (errno != EINTR)) {
+	    perror("ioctl(VT_WAITACTIVE)");
+	    exit(1);
+	    }
+	usleep(150000);
+	}
 }
 
 /****************************************************************************
@@ -641,7 +641,7 @@
 
     sprintf(fname, "/dev/tty%d", vc);
     if ((stat(fname, &sbuf) >= 0) && (getuid() == sbuf.st_uid))
-        return 1;
+	return 1;
     printf("You must be the owner of the current console to use this program.\n");
     return 0;
 }
@@ -658,7 +658,7 @@
     int console_id)
 {
     if (ioctl(console_id, KDSETMODE, KD_TEXT) < 0)
-        LOGWARN("ioctl(KDSETMODE) failed");
+	LOGWARN("ioctl(KDSETMODE) failed");
     _PM_restore_kb_mode();
 }
 
@@ -682,7 +682,7 @@
 
     /* Check if we have already opened the console */
     if (console_count++)
-        return _PM_console_fd;
+	return _PM_console_fd;
 
     /* Now, it would be great if we could use /dev/tty and see what it is
      * connected to. Alas, we cannot find out reliably what VC /dev/tty is
@@ -690,26 +690,26 @@
      */
     startup_vc = 0;
     for (_PM_console_fd = 0; _PM_console_fd < 3; _PM_console_fd++) {
-        if (fstat(_PM_console_fd, &sbuf) < 0)
-            continue;
-        if (ioctl(_PM_console_fd, VT_GETMODE, &vtm) < 0)
-            continue;
-        if ((sbuf.st_rdev & 0xFF00) != 0x400)
-            continue;
-        if (!(sbuf.st_rdev & 0xFF))
-            continue;
-        tty_vc = sbuf.st_rdev & 0xFF;
-        restore_text_console(_PM_console_fd);
-        return _PM_console_fd;
-        }
+	if (fstat(_PM_console_fd, &sbuf) < 0)
+	    continue;
+	if (ioctl(_PM_console_fd, VT_GETMODE, &vtm) < 0)
+	    continue;
+	if ((sbuf.st_rdev & 0xFF00) != 0x400)
+	    continue;
+	if (!(sbuf.st_rdev & 0xFF))
+	    continue;
+	tty_vc = sbuf.st_rdev & 0xFF;
+	restore_text_console(_PM_console_fd);
+	return _PM_console_fd;
+	}
     if ((_PM_console_fd = open("/dev/console", O_RDWR)) < 0) {
-        printf("open_dev_console: can't open /dev/console \n");
-        exit(1);
-        }
+	printf("open_dev_console: can't open /dev/console \n");
+	exit(1);
+	}
     if (ioctl(_PM_console_fd, VT_OPENQRY, &tty_vc) < 0)
-        goto Error;
+	goto Error;
     if (tty_vc <= 0)
-        goto Error;
+	goto Error;
     sprintf(fname, "/dev/tty%d", tty_vc);
     close(_PM_console_fd);
 
@@ -718,40 +718,40 @@
 
     /* We must use RDWR to allow for output... */
     if (((_PM_console_fd = open(fname, O_RDWR)) >= 0) &&
-            (ioctl(_PM_console_fd, VT_GETSTATE, &vts) >= 0)) {
-        if (!check_owner(vts.v_active))
-            goto Error;
-        restore_text_console(_PM_console_fd);
+	    (ioctl(_PM_console_fd, VT_GETSTATE, &vts) >= 0)) {
+	if (!check_owner(vts.v_active))
+	    goto Error;
+	restore_text_console(_PM_console_fd);
 
-        /* Success, redirect all stdios */
-        fflush(stdin);
-        fflush(stdout);
-        fflush(stderr);
-        close(0);
-        close(1);
-        close(2);
-        dup(_PM_console_fd);
-        dup(_PM_console_fd);
-        dup(_PM_console_fd);
+	/* Success, redirect all stdios */
+	fflush(stdin);
+	fflush(stdout);
+	fflush(stderr);
+	close(0);
+	close(1);
+	close(2);
+	dup(_PM_console_fd);
+	dup(_PM_console_fd);
+	dup(_PM_console_fd);
 
-        /* clear screen and switch to it */
-        fwrite("\e[H\e[J", 6, 1, stderr);
-        fflush(stderr);
-        if (tty_vc != vts.v_active) {
-            startup_vc = vts.v_active;
-            ioctl(_PM_console_fd, VT_ACTIVATE, tty_vc);
-            wait_vt_active(_PM_console_fd);
-            }
-        }
+	/* clear screen and switch to it */
+	fwrite("\e[H\e[J", 6, 1, stderr);
+	fflush(stderr);
+	if (tty_vc != vts.v_active) {
+	    startup_vc = vts.v_active;
+	    ioctl(_PM_console_fd, VT_ACTIVATE, tty_vc);
+	    wait_vt_active(_PM_console_fd);
+	    }
+	}
     return _PM_console_fd;
 
 Error:
     if (_PM_console_fd > 2)
-        close(_PM_console_fd);
+	close(_PM_console_fd);
     console_count = 0;
     PM_fatalError(
-        "Not running in a graphics capable console,\n"
-        "and unable to find one.\n");
+	"Not running in a graphics capable console,\n"
+	"and unable to find one.\n");
     return -1;
 }
 
@@ -764,7 +764,7 @@
 int PMAPI PM_getConsoleStateSize(void)
 {
     if (!inited)
-        PM_init();
+	PM_init();
     return PM_getVGAStateSize() + FONT_C*2;
 }
 
@@ -778,11 +778,11 @@
 
     /* Save the current console font */
     if (ioctl(console_id,GIO_FONT,&regs[PM_getVGAStateSize()]) < 0)
-        perror("ioctl(GIO_FONT)");
+	perror("ioctl(GIO_FONT)");
 
     /* Inform the Linux console that we are going into graphics mode */
     if (ioctl(console_id, KDSETMODE, KD_GRAPHICS) < 0)
-        perror("ioctl(KDSETMODE)");
+	perror("ioctl(KDSETMODE)");
 
     /* Save state of VGA registers */
     PM_saveVGAState(stateBuf);
@@ -806,11 +806,11 @@
 
     /* Inform the Linux console that we are back from graphics modes */
     if (ioctl(console_id, KDSETMODE, KD_TEXT) < 0)
-        LOGWARN("ioctl(KDSETMODE) failed");
+	LOGWARN("ioctl(KDSETMODE) failed");
 
     /* Restore the old console font */
     if (ioctl(console_id,PIO_FONT,&regs[PM_getVGAStateSize()]) < 0)
-        LOGWARN("ioctl(KDSETMODE) failed");
+	LOGWARN("ioctl(KDSETMODE) failed");
 
     /* Coming back from graphics mode on Linux also restored the previous
      * text mode console contents, so we need to clear the screen to get
@@ -830,15 +830,15 @@
 {
     /* Restore console to normal operation */
     if (--console_count == 0) {
-        /* Re-activate the original virtual console */
-        if (startup_vc > 0)
-            ioctl(_PM_console_fd, VT_ACTIVATE, startup_vc);
+	/* Re-activate the original virtual console */
+	if (startup_vc > 0)
+	    ioctl(_PM_console_fd, VT_ACTIVATE, startup_vc);
 
-        /* Close the console file descriptor */
-        if (_PM_console_fd > 2)
-            close(_PM_console_fd);
-        _PM_console_fd = -1;
-        }
+	/* Close the console file descriptor */
+	if (_PM_console_fd > 2)
+	    close(_PM_console_fd);
+	_PM_console_fd = -1;
+	}
 }
 
 void PM_setOSCursorLocation(int x,int y)
@@ -855,12 +855,12 @@
     struct winsize  ws;
     struct vt_sizes vs;
 
-    // Resize the software terminal
+    /* Resize the software terminal */
     ws.ws_col = width;
     ws.ws_row = height;
     ioctl(_PM_console_fd, TIOCSWINSZ, &ws);
 
-    // And the hardware
+    /* And the hardware */
     vs.v_rows = height;
     vs.v_cols = width;
     vs.v_scrollsize = 0;
@@ -869,18 +869,18 @@
 
 ibool PMAPI PM_setRealTimeClockHandler(PM_intHandler ih, int frequency)
 {
-    // TODO: Implement this for Linux
+    /* TODO: Implement this for Linux */
     return false;
 }
 
 void PMAPI PM_setRealTimeClockFrequency(int frequency)
 {
-    // TODO: Implement this for Linux
+    /* TODO: Implement this for Linux */
 }
 
 void PMAPI PM_restoreRealTimeClockHandler(void)
 {
-    // TODO: Implement this for Linux
+    /* TODO: Implement this for Linux */
 }
 
 char * PMAPI PM_getCurrentPath(
@@ -929,7 +929,7 @@
 {
     static uchar *zeroPtr = NULL;
     if (!zeroPtr)
-        zeroPtr = PM_mapPhysicalAddr(0,0xFFFFF,true);
+	zeroPtr = PM_mapPhysicalAddr(0,0xFFFFF,true);
     return (void*)(zeroPtr + 0x400);
 }
 
@@ -939,7 +939,7 @@
      * address mapping, so we can return the address here.
      */
     if (!inited)
-        PM_init();
+	PM_init();
     return (void*)(0xA0000);
 }
 
@@ -949,11 +949,11 @@
     ulong   baseAddr,baseOfs;
 
     if (!inited)
-        PM_init();
+	PM_init();
     if (base >= 0xA0000 && base < 0x100000)
-        return (void*)base;
+	return (void*)base;
     if (!fd_mem && (fd_mem = open("/dev/mem", O_RDWR)) == -1)
-        return NULL;
+	return NULL;
 
     /* Round the physical address to a 4Kb boundary and the limit to a
      * 4Kb-1 boundary before passing the values to mmap. If we round the
@@ -964,57 +964,57 @@
     baseAddr = base & ~4095;
     limit = ((limit+baseOfs+1+4095) & ~4095)-1;
     if ((p = mmap(0, limit+1,
-            PROT_READ | PROT_WRITE, MAP_SHARED,
-            fd_mem, baseAddr)) == (void *)-1)
-        return NULL;
+	    PROT_READ | PROT_WRITE, MAP_SHARED,
+	    fd_mem, baseAddr)) == (void *)-1)
+	return NULL;
     return (void*)(p+baseOfs);
 }
 
 void PMAPI PM_freePhysicalAddr(void *ptr,ulong limit)
 {
     if ((ulong)ptr >= 0x100000)
-        munmap(ptr,limit+1);
+	munmap(ptr,limit+1);
 }
 
 ulong PMAPI PM_getPhysicalAddr(void *p)
 {
-    // TODO: This function should find the physical address of a linear
-    //       address.
+    /* TODO: This function should find the physical address of a linear */
+    /*       address. */
     return 0xFFFFFFFFUL;
 }
 
 ibool PMAPI PM_getPhysicalAddrRange(void *p,ulong length,ulong *physAddress)
 {
-    // TODO: This function should find a range of physical addresses
-    //       for a linear address.
+    /* TODO: This function should find a range of physical addresses */
+    /*       for a linear address. */
     return false;
 }
 
 void PMAPI PM_sleep(ulong milliseconds)
 {
-    // TODO: Put the process to sleep for milliseconds
+    /* TODO: Put the process to sleep for milliseconds */
 }
 
 int PMAPI PM_getCOMPort(int port)
 {
-    // TODO: Re-code this to determine real values using the Plug and Play
-    //       manager for the OS.
+    /* TODO: Re-code this to determine real values using the Plug and Play */
+    /*       manager for the OS. */
     switch (port) {
-        case 0: return 0x3F8;
-        case 1: return 0x2F8;
-        }
+	case 0: return 0x3F8;
+	case 1: return 0x2F8;
+	}
     return 0;
 }
 
 int PMAPI PM_getLPTPort(int port)
 {
-    // TODO: Re-code this to determine real values using the Plug and Play
-    //       manager for the OS.
+    /* TODO: Re-code this to determine real values using the Plug and Play */
+    /*       manager for the OS. */
     switch (port) {
-        case 0: return 0x3BC;
-        case 1: return 0x378;
-        case 2: return 0x278;
-        }
+	case 0: return 0x3BC;
+	case 1: return 0x378;
+	case 2: return 0x278;
+	}
     return 0;
 }
 
@@ -1038,7 +1038,7 @@
      * mapping so we can simply return the physical address in here.
      */
     if (!inited)
-        PM_init();
+	PM_init();
     return (void*)MK_PHYS(r_seg,r_off);
 }
 
@@ -1048,24 +1048,24 @@
     char    *r = (char *)REAL_MEM_BASE;
 
     if (!inited)
-        PM_init();
+	PM_init();
     if (!mem_info.ready)
-        return NULL;
+	return NULL;
     if (mem_info.count == REAL_MEM_BLOCKS)
-        return NULL;
+	return NULL;
     size = (size + 15) & ~15;
     for (i = 0; i < mem_info.count; i++) {
-        if (mem_info.blocks[i].free && size < mem_info.blocks[i].size) {
-            insert_block(i);
-            mem_info.blocks[i].size = size;
-            mem_info.blocks[i].free = 0;
-            mem_info.blocks[i + 1].size -= size;
-            *r_seg = (uint)(r) >> 4;
-            *r_off = (uint)(r) & 0xF;
-            return (void *)r;
-            }
-        r += mem_info.blocks[i].size;
-        }
+	if (mem_info.blocks[i].free && size < mem_info.blocks[i].size) {
+	    insert_block(i);
+	    mem_info.blocks[i].size = size;
+	    mem_info.blocks[i].free = 0;
+	    mem_info.blocks[i + 1].size -= size;
+	    *r_seg = (uint)(r) >> 4;
+	    *r_off = (uint)(r) & 0xF;
+	    return (void *)r;
+	    }
+	r += mem_info.blocks[i].size;
+	}
     return NULL;
 }
 
@@ -1075,23 +1075,23 @@
     char    *r = (char *)REAL_MEM_BASE;
 
     if (!mem_info.ready)
-        return;
+	return;
     i = 0;
     while (mem != (void *)r) {
-        r += mem_info.blocks[i].size;
-        i++;
-        if (i == mem_info.count)
-            return;
-        }
+	r += mem_info.blocks[i].size;
+	i++;
+	if (i == mem_info.count)
+	    return;
+	}
     mem_info.blocks[i].free = 1;
     if (i + 1 < mem_info.count && mem_info.blocks[i + 1].free) {
-        mem_info.blocks[i].size += mem_info.blocks[i + 1].size;
-        delete_block(i + 1);
-        }
+	mem_info.blocks[i].size += mem_info.blocks[i + 1].size;
+	delete_block(i + 1);
+	}
     if (i - 1 >= 0 && mem_info.blocks[i - 1].free) {
-        mem_info.blocks[i - 1].size += mem_info.blocks[i].size;
-        delete_block(i);
-        }
+	mem_info.blocks[i - 1].size += mem_info.blocks[i].size;
+	delete_block(i);
+	}
 }
 
 #define DIRECTION_FLAG  (1 << 10)
@@ -1104,27 +1104,27 @@
     edi = context.vm.regs.edi & 0xffff;
     edi += (unsigned int)context.vm.regs.ds << 4;
     if (context.vm.regs.eflags & DIRECTION_FLAG) {
-        if (size == 4)
-            asm volatile ("std; insl; cld"
-             : "=D" (edi) : "d" (edx), "0" (edi));
-        else if (size == 2)
-            asm volatile ("std; insw; cld"
-             : "=D" (edi) : "d" (edx), "0" (edi));
-        else
-            asm volatile ("std; insb; cld"
-             : "=D" (edi) : "d" (edx), "0" (edi));
-        }
+	if (size == 4)
+	    asm volatile ("std; insl; cld"
+	     : "=D" (edi) : "d" (edx), "0" (edi));
+	else if (size == 2)
+	    asm volatile ("std; insw; cld"
+	     : "=D" (edi) : "d" (edx), "0" (edi));
+	else
+	    asm volatile ("std; insb; cld"
+	     : "=D" (edi) : "d" (edx), "0" (edi));
+	}
     else {
-        if (size == 4)
-            asm volatile ("cld; insl"
-             : "=D" (edi) : "d" (edx), "0" (edi));
-        else if (size == 2)
-            asm volatile ("cld; insw"
-             : "=D" (edi) : "d" (edx), "0" (edi));
-        else
-            asm volatile ("cld; insb"
-             : "=D" (edi) : "d" (edx), "0" (edi));
-        }
+	if (size == 4)
+	    asm volatile ("cld; insl"
+	     : "=D" (edi) : "d" (edx), "0" (edi));
+	else if (size == 2)
+	    asm volatile ("cld; insw"
+	     : "=D" (edi) : "d" (edx), "0" (edi));
+	else
+	    asm volatile ("cld; insb"
+	     : "=D" (edi) : "d" (edx), "0" (edi));
+	}
     edi -= (unsigned int)context.vm.regs.ds << 4;
     context.vm.regs.edi &= 0xffff0000;
     context.vm.regs.edi |= edi & 0xffff;
@@ -1139,33 +1139,33 @@
     edi = context.vm.regs.edi & 0xffff;
     edi += (unsigned int)context.vm.regs.ds << 4;
     if (context.vm.regs.eflags & DIRECTION_FLAG) {
-        if (size == 4)
-            asm volatile ("std; rep; insl; cld"
-             : "=D" (edi), "=c" (ecx)
-             : "d" (edx), "0" (edi), "1" (ecx));
-        else if (size == 2)
-            asm volatile ("std; rep; insw; cld"
-             : "=D" (edi), "=c" (ecx)
-             : "d" (edx), "0" (edi), "1" (ecx));
-        else
-            asm volatile ("std; rep; insb; cld"
-             : "=D" (edi), "=c" (ecx)
-             : "d" (edx), "0" (edi), "1" (ecx));
-        }
+	if (size == 4)
+	    asm volatile ("std; rep; insl; cld"
+	     : "=D" (edi), "=c" (ecx)
+	     : "d" (edx), "0" (edi), "1" (ecx));
+	else if (size == 2)
+	    asm volatile ("std; rep; insw; cld"
+	     : "=D" (edi), "=c" (ecx)
+	     : "d" (edx), "0" (edi), "1" (ecx));
+	else
+	    asm volatile ("std; rep; insb; cld"
+	     : "=D" (edi), "=c" (ecx)
+	     : "d" (edx), "0" (edi), "1" (ecx));
+	}
     else {
-        if (size == 4)
-            asm volatile ("cld; rep; insl"
-             : "=D" (edi), "=c" (ecx)
-             : "d" (edx), "0" (edi), "1" (ecx));
-        else if (size == 2)
-            asm volatile ("cld; rep; insw"
-             : "=D" (edi), "=c" (ecx)
-             : "d" (edx), "0" (edi), "1" (ecx));
-        else
-            asm volatile ("cld; rep; insb"
-             : "=D" (edi), "=c" (ecx)
-             : "d" (edx), "0" (edi), "1" (ecx));
-        }
+	if (size == 4)
+	    asm volatile ("cld; rep; insl"
+	     : "=D" (edi), "=c" (ecx)
+	     : "d" (edx), "0" (edi), "1" (ecx));
+	else if (size == 2)
+	    asm volatile ("cld; rep; insw"
+	     : "=D" (edi), "=c" (ecx)
+	     : "d" (edx), "0" (edi), "1" (ecx));
+	else
+	    asm volatile ("cld; rep; insb"
+	     : "=D" (edi), "=c" (ecx)
+	     : "d" (edx), "0" (edi), "1" (ecx));
+	}
 
     edi -= (unsigned int)context.vm.regs.ds << 4;
     context.vm.regs.edi &= 0xffff0000;
@@ -1182,27 +1182,27 @@
     esi = context.vm.regs.esi & 0xffff;
     esi += (unsigned int)context.vm.regs.ds << 4;
     if (context.vm.regs.eflags & DIRECTION_FLAG) {
-        if (size == 4)
-            asm volatile ("std; outsl; cld"
-             : "=S" (esi) : "d" (edx), "0" (esi));
-        else if (size == 2)
-            asm volatile ("std; outsw; cld"
-             : "=S" (esi) : "d" (edx), "0" (esi));
-        else
-            asm volatile ("std; outsb; cld"
-             : "=S" (esi) : "d" (edx), "0" (esi));
-        }
+	if (size == 4)
+	    asm volatile ("std; outsl; cld"
+	     : "=S" (esi) : "d" (edx), "0" (esi));
+	else if (size == 2)
+	    asm volatile ("std; outsw; cld"
+	     : "=S" (esi) : "d" (edx), "0" (esi));
+	else
+	    asm volatile ("std; outsb; cld"
+	     : "=S" (esi) : "d" (edx), "0" (esi));
+	}
     else {
-        if (size == 4)
-            asm volatile ("cld; outsl"
-             : "=S" (esi) : "d" (edx), "0" (esi));
-        else if (size == 2)
-            asm volatile ("cld; outsw"
-             : "=S" (esi) : "d" (edx), "0" (esi));
-        else
-            asm volatile ("cld; outsb"
-             : "=S" (esi) : "d" (edx), "0" (esi));
-        }
+	if (size == 4)
+	    asm volatile ("cld; outsl"
+	     : "=S" (esi) : "d" (edx), "0" (esi));
+	else if (size == 2)
+	    asm volatile ("cld; outsw"
+	     : "=S" (esi) : "d" (edx), "0" (esi));
+	else
+	    asm volatile ("cld; outsb"
+	     : "=S" (esi) : "d" (edx), "0" (esi));
+	}
 
     esi -= (unsigned int)context.vm.regs.ds << 4;
     context.vm.regs.esi &= 0xffff0000;
@@ -1218,33 +1218,33 @@
     esi = context.vm.regs.esi & 0xffff;
     esi += (unsigned int)context.vm.regs.ds << 4;
     if (context.vm.regs.eflags & DIRECTION_FLAG) {
-        if (size == 4)
-            asm volatile ("std; rep; outsl; cld"
-             : "=S" (esi), "=c" (ecx)
-             : "d" (edx), "0" (esi), "1" (ecx));
-        else if (size == 2)
-            asm volatile ("std; rep; outsw; cld"
-             : "=S" (esi), "=c" (ecx)
-             : "d" (edx), "0" (esi), "1" (ecx));
-        else
-            asm volatile ("std; rep; outsb; cld"
-             : "=S" (esi), "=c" (ecx)
-             : "d" (edx), "0" (esi), "1" (ecx));
-        }
+	if (size == 4)
+	    asm volatile ("std; rep; outsl; cld"
+	     : "=S" (esi), "=c" (ecx)
+	     : "d" (edx), "0" (esi), "1" (ecx));
+	else if (size == 2)
+	    asm volatile ("std; rep; outsw; cld"
+	     : "=S" (esi), "=c" (ecx)
+	     : "d" (edx), "0" (esi), "1" (ecx));
+	else
+	    asm volatile ("std; rep; outsb; cld"
+	     : "=S" (esi), "=c" (ecx)
+	     : "d" (edx), "0" (esi), "1" (ecx));
+	}
     else {
-        if (size == 4)
-            asm volatile ("cld; rep; outsl"
-             : "=S" (esi), "=c" (ecx)
-             : "d" (edx), "0" (esi), "1" (ecx));
-        else if (size == 2)
-            asm volatile ("cld; rep; outsw"
-             : "=S" (esi), "=c" (ecx)
-             : "d" (edx), "0" (esi), "1" (ecx));
-        else
-            asm volatile ("cld; rep; outsb"
-             : "=S" (esi), "=c" (ecx)
-             : "d" (edx), "0" (esi), "1" (ecx));
-        }
+	if (size == 4)
+	    asm volatile ("cld; rep; outsl"
+	     : "=S" (esi), "=c" (ecx)
+	     : "d" (edx), "0" (esi), "1" (ecx));
+	else if (size == 2)
+	    asm volatile ("cld; rep; outsw"
+	     : "=S" (esi), "=c" (ecx)
+	     : "d" (edx), "0" (esi), "1" (ecx));
+	else
+	    asm volatile ("cld; rep; outsb"
+	     : "=S" (esi), "=c" (ecx)
+	     : "d" (edx), "0" (esi), "1" (ecx));
+	}
 
     esi -= (unsigned int)context.vm.regs.ds << 4;
     context.vm.regs.esi &= 0xffff0000;
@@ -1257,9 +1257,9 @@
 {
     unsigned char *insn;
     struct {
-        unsigned int size : 1;
-        unsigned int rep : 1;
-        } prefix = { 0, 0 };
+	unsigned int size : 1;
+	unsigned int rep : 1;
+	} prefix = { 0, 0 };
     int i = 0;
 
     insn = (unsigned char *)((unsigned int)context.vm.regs.cs << 4);
@@ -1267,101 +1267,101 @@
 
     while (1) {
 #ifdef TRACE_IO
-        traceAddr = ((ulong)context.vm.regs.cs << 16) + context.vm.regs.eip + i;
+	traceAddr = ((ulong)context.vm.regs.cs << 16) + context.vm.regs.eip + i;
 #endif
-        if (insn[i] == 0x66) {
-            prefix.size = 1 - prefix.size;
-            i++;
-            }
-        else if (insn[i] == 0xf3) {
-            prefix.rep = 1;
-            i++;
-            }
-        else if (insn[i] == 0xf0 || insn[i] == 0xf2
-             || insn[i] == 0x26 || insn[i] == 0x2e
-             || insn[i] == 0x36 || insn[i] == 0x3e
-             || insn[i] == 0x64 || insn[i] == 0x65
-             || insn[i] == 0x67) {
-            /* these prefixes are just ignored */
-            i++;
-            }
-        else if (insn[i] == 0x6c) {
-            if (prefix.rep)
-                em_rep_ins(1);
-            else
-                em_ins(1);
-            i++;
-            break;
-            }
-        else if (insn[i] == 0x6d) {
-            if (prefix.rep) {
-                if (prefix.size)
-                    em_rep_ins(4);
-                else
-                    em_rep_ins(2);
-                }
-            else {
-                if (prefix.size)
-                    em_ins(4);
-                else
-                    em_ins(2);
-                }
-            i++;
-            break;
-            }
-        else if (insn[i] == 0x6e) {
-            if (prefix.rep)
-                em_rep_outs(1);
-            else
-                em_outs(1);
-            i++;
-            break;
-            }
-        else if (insn[i] == 0x6f) {
-            if (prefix.rep) {
-                if (prefix.size)
-                    em_rep_outs(4);
-                else
-                    em_rep_outs(2);
-                }
-            else {
-                if (prefix.size)
-                    em_outs(4);
-                else
-                    em_outs(2);
-                }
-            i++;
-            break;
-            }
-        else if (insn[i] == 0xec) {
-            *((uchar*)&context.vm.regs.eax) = port_in(context.vm.regs.edx);
-            i++;
-            break;
-            }
-        else if (insn[i] == 0xed) {
-            if (prefix.size)
-                *((ulong*)&context.vm.regs.eax) = port_inl(context.vm.regs.edx);
-            else
-                *((ushort*)&context.vm.regs.eax) = port_inw(context.vm.regs.edx);
-            i++;
-            break;
-            }
-        else if (insn[i] == 0xee) {
-            port_out(context.vm.regs.eax,context.vm.regs.edx);
-            i++;
-            break;
-            }
-        else if (insn[i] == 0xef) {
-            if (prefix.size)
-                port_outl(context.vm.regs.eax,context.vm.regs.edx);
-            else
-                port_outw(context.vm.regs.eax,context.vm.regs.edx);
-            i++;
-            break;
-            }
-        else
-            return 0;
-        }
+	if (insn[i] == 0x66) {
+	    prefix.size = 1 - prefix.size;
+	    i++;
+	    }
+	else if (insn[i] == 0xf3) {
+	    prefix.rep = 1;
+	    i++;
+	    }
+	else if (insn[i] == 0xf0 || insn[i] == 0xf2
+	     || insn[i] == 0x26 || insn[i] == 0x2e
+	     || insn[i] == 0x36 || insn[i] == 0x3e
+	     || insn[i] == 0x64 || insn[i] == 0x65
+	     || insn[i] == 0x67) {
+	    /* these prefixes are just ignored */
+	    i++;
+	    }
+	else if (insn[i] == 0x6c) {
+	    if (prefix.rep)
+		em_rep_ins(1);
+	    else
+		em_ins(1);
+	    i++;
+	    break;
+	    }
+	else if (insn[i] == 0x6d) {
+	    if (prefix.rep) {
+		if (prefix.size)
+		    em_rep_ins(4);
+		else
+		    em_rep_ins(2);
+		}
+	    else {
+		if (prefix.size)
+		    em_ins(4);
+		else
+		    em_ins(2);
+		}
+	    i++;
+	    break;
+	    }
+	else if (insn[i] == 0x6e) {
+	    if (prefix.rep)
+		em_rep_outs(1);
+	    else
+		em_outs(1);
+	    i++;
+	    break;
+	    }
+	else if (insn[i] == 0x6f) {
+	    if (prefix.rep) {
+		if (prefix.size)
+		    em_rep_outs(4);
+		else
+		    em_rep_outs(2);
+		}
+	    else {
+		if (prefix.size)
+		    em_outs(4);
+		else
+		    em_outs(2);
+		}
+	    i++;
+	    break;
+	    }
+	else if (insn[i] == 0xec) {
+	    *((uchar*)&context.vm.regs.eax) = port_in(context.vm.regs.edx);
+	    i++;
+	    break;
+	    }
+	else if (insn[i] == 0xed) {
+	    if (prefix.size)
+		*((ulong*)&context.vm.regs.eax) = port_inl(context.vm.regs.edx);
+	    else
+		*((ushort*)&context.vm.regs.eax) = port_inw(context.vm.regs.edx);
+	    i++;
+	    break;
+	    }
+	else if (insn[i] == 0xee) {
+	    port_out(context.vm.regs.eax,context.vm.regs.edx);
+	    i++;
+	    break;
+	    }
+	else if (insn[i] == 0xef) {
+	    if (prefix.size)
+		port_outl(context.vm.regs.eax,context.vm.regs.edx);
+	    else
+		port_outw(context.vm.regs.eax,context.vm.regs.edx);
+	    i++;
+	    break;
+	    }
+	else
+	    return 0;
+	}
 
     context.vm.regs.eip += i;
     return 1;
@@ -1393,7 +1393,7 @@
     fputs("cs:ip = [ ", stderr);
     p = (unsigned char *)((context.vm.regs.cs << 4) + (context.vm.regs.eip & 0xffff));
     for (i = 0; i < 16; ++i)
-            fprintf(stderr, "%02x ", (unsigned int)p[i]);
+	    fprintf(stderr, "%02x ", (unsigned int)p[i]);
     fputs("]\n", stderr);
     fflush(stderr);
 }
@@ -1403,24 +1403,24 @@
     unsigned int vret;
 
     for (;;) {
-        vret = vm86(&context.vm);
-        if (VM86_TYPE(vret) == VM86_INTx) {
-            unsigned int v = VM86_ARG(vret);
-            if (v == RETURN_TO_32_INT)
-                return 1;
-            pushw(context.vm.regs.eflags);
-            pushw(context.vm.regs.cs);
-            pushw(context.vm.regs.eip);
-            context.vm.regs.cs = get_int_seg(v);
-            context.vm.regs.eip = get_int_off(v);
-            context.vm.regs.eflags &= ~(VIF_MASK | TF_MASK);
-            continue;
-            }
-        if (VM86_TYPE(vret) != VM86_UNKNOWN)
-            break;
-        if (!emulate())
-            break;
-        }
+	vret = vm86(&context.vm);
+	if (VM86_TYPE(vret) == VM86_INTx) {
+	    unsigned int v = VM86_ARG(vret);
+	    if (v == RETURN_TO_32_INT)
+		return 1;
+	    pushw(context.vm.regs.eflags);
+	    pushw(context.vm.regs.cs);
+	    pushw(context.vm.regs.eip);
+	    context.vm.regs.cs = get_int_seg(v);
+	    context.vm.regs.eip = get_int_off(v);
+	    context.vm.regs.eflags &= ~(VIF_MASK | TF_MASK);
+	    continue;
+	    }
+	if (VM86_TYPE(vret) != VM86_UNKNOWN)
+	    break;
+	if (!emulate())
+	    break;
+	}
     debug_info(vret);
     return 0;
 }
@@ -1431,7 +1431,7 @@
 void PMAPI DPMI_int86(int intno, DPMI_regs *regs)
 {
     if (!inited)
-        PM_init();
+	PM_init();
     memset(&context.vm.regs, 0, sizeof(context.vm.regs));
     IND(eax); IND(ebx); IND(ecx); IND(edx); IND(esi); IND(edi);
     context.vm.regs.eflags = DEFAULT_VM86_FLAGS;
@@ -1453,7 +1453,7 @@
 int PMAPI PM_int86(int intno, RMREGS *in, RMREGS *out)
 {
     if (!inited)
-        PM_init();
+	PM_init();
     memset(&context.vm.regs, 0, sizeof(context.vm.regs));
     IN(eax); IN(ebx); IN(ecx); IN(edx); IN(esi); IN(edi);
     context.vm.regs.eflags = DEFAULT_VM86_FLAGS;
@@ -1474,41 +1474,41 @@
     RMSREGS *sregs)
 {
     if (!inited)
-        PM_init();
+	PM_init();
     if (intno == 0x21) {
-        time_t today = time(NULL);
-        struct tm *t;
-        t = localtime(&today);
-        out->x.cx = t->tm_year + 1900;
-        out->h.dh = t->tm_mon + 1;
-        out->h.dl = t->tm_mday;
-        }
+	time_t today = time(NULL);
+	struct tm *t;
+	t = localtime(&today);
+	out->x.cx = t->tm_year + 1900;
+	out->h.dh = t->tm_mon + 1;
+	out->h.dl = t->tm_mday;
+	}
     else {
-        unsigned int seg, off;
-        seg = get_int_seg(intno);
-        off = get_int_off(intno);
-        memset(&context.vm.regs, 0, sizeof(context.vm.regs));
-        IN(eax); IN(ebx); IN(ecx); IN(edx); IN(esi); IN(edi);
-        context.vm.regs.eflags = DEFAULT_VM86_FLAGS;
-        context.vm.regs.cs = seg;
-        context.vm.regs.eip = off;
-        context.vm.regs.es = sregs->es;
-        context.vm.regs.ds = sregs->ds;
-        context.vm.regs.fs = sregs->fs;
-        context.vm.regs.gs = sregs->gs;
-        context.vm.regs.ss = context.stack_seg;
-        context.vm.regs.esp = context.stack_off;
-        pushw(DEFAULT_VM86_FLAGS);
-        pushw(context.ret_seg);
-        pushw(context.ret_off);
-        run_vm86();
-        OUT(eax); OUT(ebx); OUT(ecx); OUT(edx); OUT(esi); OUT(edi);
-        sregs->es = context.vm.regs.es;
-        sregs->ds = context.vm.regs.ds;
-        sregs->fs = context.vm.regs.fs;
-        sregs->gs = context.vm.regs.gs;
-        out->x.cflag = context.vm.regs.eflags & 1;
-        }
+	unsigned int seg, off;
+	seg = get_int_seg(intno);
+	off = get_int_off(intno);
+	memset(&context.vm.regs, 0, sizeof(context.vm.regs));
+	IN(eax); IN(ebx); IN(ecx); IN(edx); IN(esi); IN(edi);
+	context.vm.regs.eflags = DEFAULT_VM86_FLAGS;
+	context.vm.regs.cs = seg;
+	context.vm.regs.eip = off;
+	context.vm.regs.es = sregs->es;
+	context.vm.regs.ds = sregs->ds;
+	context.vm.regs.fs = sregs->fs;
+	context.vm.regs.gs = sregs->gs;
+	context.vm.regs.ss = context.stack_seg;
+	context.vm.regs.esp = context.stack_off;
+	pushw(DEFAULT_VM86_FLAGS);
+	pushw(context.ret_seg);
+	pushw(context.ret_off);
+	run_vm86();
+	OUT(eax); OUT(ebx); OUT(ecx); OUT(edx); OUT(esi); OUT(edi);
+	sregs->es = context.vm.regs.es;
+	sregs->ds = context.vm.regs.ds;
+	sregs->fs = context.vm.regs.fs;
+	sregs->gs = context.vm.regs.gs;
+	out->x.cflag = context.vm.regs.eflags & 1;
+	}
     return out->e.eax;
 }
 
@@ -1518,7 +1518,7 @@
     RMSREGS *sregs)
 {
     if (!inited)
-        PM_init();
+	PM_init();
     memset(&context.vm.regs, 0, sizeof(context.vm.regs));
     IN(eax); IN(ebx); IN(ecx); IN(edx); IN(esi); IN(edi);
     context.vm.regs.eflags = DEFAULT_VM86_FLAGS;
@@ -1558,32 +1558,32 @@
 
 void * PMAPI PM_allocLockedMem(uint size,ulong *physAddr,ibool contiguous,ibool below16M)
 {
-    // TODO: Implement this for Linux
+    /* TODO: Implement this for Linux */
     return NULL;
 }
 
 void PMAPI PM_freeLockedMem(void *p,uint size,ibool contiguous)
 {
-    // TODO: Implement this for Linux
+    /* TODO: Implement this for Linux */
 }
 
 void * PMAPI PM_allocPage(
     ibool locked)
 {
-    // TODO: Implement this for Linux
+    /* TODO: Implement this for Linux */
     return NULL;
 }
 
 void PMAPI PM_freePage(
     void *p)
 {
-    // TODO: Implement this for Linux
+    /* TODO: Implement this for Linux */
 }
 
 void PMAPI PM_setBankA(int bank)
 {
     if (!inited)
-        PM_init();
+	PM_init();
     memset(&context.vm.regs, 0, sizeof(context.vm.regs));
     context.vm.regs.eax = 0x4F05;
     context.vm.regs.ebx = 0x0000;
@@ -1602,7 +1602,7 @@
 void PMAPI PM_setBankAB(int bank)
 {
     if (!inited)
-        PM_init();
+	PM_init();
     memset(&context.vm.regs, 0, sizeof(context.vm.regs));
     context.vm.regs.eax = 0x4F05;
     context.vm.regs.ebx = 0x0000;
@@ -1633,7 +1633,7 @@
 void PMAPI PM_setCRTStart(int x,int y,int waitVRT)
 {
     if (!inited)
-        PM_init();
+	PM_init();
     memset(&context.vm.regs, 0, sizeof(context.vm.regs));
     context.vm.regs.eax = 0x4F07;
     context.vm.regs.ebx = waitVRT;
@@ -1656,14 +1656,14 @@
     struct mtrr_sentry sentry;
 
     if (mtrr_fd < 0)
-        return PM_MTRR_ERR_NO_OS_SUPPORT;
+	return PM_MTRR_ERR_NO_OS_SUPPORT;
     sentry.base = base;
     sentry.size = length;
     sentry.type = type;
     if (ioctl(mtrr_fd, MTRRIOC_ADD_ENTRY, &sentry) == -1) {
-        // TODO: Need to decode MTRR error codes!!
-        return PM_MTRR_NOT_SUPPORTED;
-        }
+	/* TODO: Need to decode MTRR error codes!! */
+	return PM_MTRR_NOT_SUPPORTED;
+	}
     return PM_MTRR_ERR_OK;
 #else
     return PM_MTRR_ERR_NO_OS_SUPPORT;
@@ -1685,15 +1685,15 @@
     struct mtrr_gentry gentry;
 
     if (mtrr_fd < 0)
-        return PM_MTRR_ERR_NO_OS_SUPPORT;
+	return PM_MTRR_ERR_NO_OS_SUPPORT;
 
     for (gentry.regnum = 0; ioctl (mtrr_fd, MTRRIOC_GET_ENTRY, &gentry) == 0;
-         ++gentry.regnum) {
-        if (gentry.size > 0) {
-            // WARNING: This code assumes that the types in pmapi.h match the ones
-            // in the Linux kernel (mtrr.h)
-            callback(gentry.base, gentry.size, gentry.type);
-        }
+	 ++gentry.regnum) {
+	if (gentry.size > 0) {
+	    /* WARNING: This code assumes that the types in pmapi.h match the ones */
+	    /* in the Linux kernel (mtrr.h) */
+	    callback(gentry.base, gentry.size, gentry.type);
+	}
     }
 
     return PM_MTRR_ERR_OK;
@@ -1719,13 +1719,13 @@
      * the secondary BIOS image over the top of the old one.
      */
     if (!inited)
-        PM_init();
+	PM_init();
     if ((old_bios = PM_malloc(BIOSLen)) == NULL)
-        return false;
+	return false;
     if (BIOSPhysAddr != 0xC0000) {
-        memcpy(old_bios,bios_ptr,BIOSLen);
-        memcpy(bios_ptr,copyOfBIOS,BIOSLen);
-        }
+	memcpy(old_bios,bios_ptr,BIOSLen);
+	memcpy(bios_ptr,copyOfBIOS,BIOSLen);
+	}
 
     /* The interrupt vectors should already be mmap()'ed from 0-0x400 in PM_init */
     Current10 = rvec[0x10];
@@ -1742,7 +1742,7 @@
 
     /* Restore original BIOS image */
     if (BIOSPhysAddr != 0xC0000)
-        memcpy(bios_ptr,old_bios,BIOSLen);
+	memcpy(bios_ptr,old_bios,BIOSLen);
     PM_free(old_bios);
     return true;
 }
@@ -1774,7 +1774,7 @@
 PM_MODULE PMAPI PM_loadLibrary(
     const char *szDLLName)
 {
-    // TODO: Implement this to load shared libraries!
+    /* TODO: Implement this to load shared libraries! */
     (void)szDLLName;
     return NULL;
 }
@@ -1783,7 +1783,7 @@
     PM_MODULE hModule,
     const char *szProcName)
 {
-    // TODO: Implement this!
+    /* TODO: Implement this! */
     (void)hModule;
     (void)szProcName;
     return NULL;
@@ -1792,19 +1792,18 @@
 void PMAPI PM_freeLibrary(
     PM_MODULE hModule)
 {
-    // TODO: Implement this!
+    /* TODO: Implement this! */
     (void)hModule;
 }
 
 int PMAPI PM_setIOPL(
     int level)
 {
-    // TODO: Move the IOPL switching into this function!!
+    /* TODO: Move the IOPL switching into this function!! */
     return level;
 }
 
 void PMAPI PM_flushTLB(void)
 {
-    // Do nothing on Linux.
+    /* Do nothing on Linux. */
 }
-

diff --git a/board/MAI/bios_emulator/scitech/src/pm/ntdrv/cpuinfo.c b/board/MAI/bios_emulator/scitech/src/pm/ntdrv/cpuinfo.c
index e72a856..d15b07c 100644
--- a/board/MAI/bios_emulator/scitech/src/pm/ntdrv/cpuinfo.c
+++ b/board/MAI/bios_emulator/scitech/src/pm/ntdrv/cpuinfo.c

@@ -62,4 +62,3 @@
     (t)->low = lt.LowPart;                                  \
     (t)->high = lt.HighPart;                                \
 }
-

diff --git a/board/MAI/bios_emulator/scitech/src/pm/ntdrv/int86.c b/board/MAI/bios_emulator/scitech/src/pm/ntdrv/int86.c
index f93d9c2..c82648b 100644
--- a/board/MAI/bios_emulator/scitech/src/pm/ntdrv/int86.c
+++ b/board/MAI/bios_emulator/scitech/src/pm/ntdrv/int86.c

@@ -1,7 +1,7 @@
 /****************************************************************************
 *
 *                   SciTech OS Portability Manager Library
-*																																			
+*
 *  ========================================================================
 *
 *    The contents of this file are subject to the SciTech MGL Public
@@ -43,7 +43,7 @@
 ****************************************************************************/
 ibool PMAPI PM_haveBIOSAccess(void)
 {
-    // Return false unless we have full buffer passing!
+    /* Return false unless we have full buffer passing! */
     return false;
 }
 
@@ -63,8 +63,8 @@
     uint *rseg,
     uint *roff)
 {
-    // No buffers supported under Windows NT (Windows XP has them however if
-    // we ever decide to support this!)
+    /* No buffers supported under Windows NT (Windows XP has them however if */
+    /* we ever decide to support this!) */
     return NULL;
 }
 
@@ -90,7 +90,7 @@
     uint r_seg,
     uint r_off)
 {
-    // Not used for Windows NT drivers!
+    /* Not used for Windows NT drivers! */
     return NULL;
 }
 
@@ -103,7 +103,7 @@
     uint *r_seg,
     uint *r_off)
 {
-    // Not supported in NT drivers
+    /* Not supported in NT drivers */
     (void)size;
     (void)r_seg;
     (void)r_off;
@@ -117,7 +117,7 @@
 void PMAPI PM_freeRealSeg(
     void *mem)
 {
-    // Not supported in NT drivers
+    /* Not supported in NT drivers */
     (void)mem;
 }
 
@@ -129,7 +129,7 @@
     int intno,
     DPMI_regs *regs)
 {
-    // Not used in NT drivers
+    /* Not used in NT drivers */
 }
 
 /****************************************************************************
@@ -143,7 +143,7 @@
     RMREGS *regs,
     RMSREGS *sregs)
 {
-    // TODO!!
+    /* TODO!! */
 #if 0
     CLIENT_STRUCT saveRegs;
 
@@ -151,7 +151,7 @@
      * loaded, and not statically loaded.
      */
     if (!_PM_haveBIOS)
-        return;
+	return;
 
     TRACE("SDDHELP: Entering PM_callRealMode()\n");
     Begin_Nest_V86_Exec();
@@ -174,7 +174,7 @@
     RMREGS *in,
     RMREGS *out)
 {
-    // TODO!!
+    /* TODO!! */
 #if 0
     RMSREGS         sregs = {0};
     CLIENT_STRUCT   saveRegs;
@@ -183,9 +183,9 @@
     /* Disable pass-up to our VxD handler so we directly call BIOS */
     TRACE("SDDHELP: Entering PM_int86()\n");
     if (disableTSRFlag) {
-        oldDisable = *disableTSRFlag;
-        *disableTSRFlag = 0;
-        }
+	oldDisable = *disableTSRFlag;
+	*disableTSRFlag = 0;
+	}
     Begin_Nest_V86_Exec();
     LoadV86Registers(&saveRegs,in,&sregs);
     Exec_Int(intno);
@@ -194,7 +194,7 @@
 
     /* Re-enable pass-up to our VxD handler if previously enabled */
     if (disableTSRFlag)
-        *disableTSRFlag = oldDisable;
+	*disableTSRFlag = oldDisable;
 
     TRACE("SDDHELP: Exiting PM_int86()\n");
 #else
@@ -214,7 +214,7 @@
     RMREGS *out,
     RMSREGS *sregs)
 {
-    // TODO!!
+    /* TODO!! */
 #if 0
     CLIENT_STRUCT   saveRegs;
     ushort          oldDisable;
@@ -223,16 +223,16 @@
      * loaded, and not statically loaded.
      */
     if (!_PM_haveBIOS) {
-        *out = *in;
-        return out->x.ax;
-        }
+	*out = *in;
+	return out->x.ax;
+	}
 
     /* Disable pass-up to our VxD handler so we directly call BIOS */
     TRACE("SDDHELP: Entering PM_int86x()\n");
     if (disableTSRFlag) {
-        oldDisable = *disableTSRFlag;
-        *disableTSRFlag = 0;
-        }
+	oldDisable = *disableTSRFlag;
+	*disableTSRFlag = 0;
+	}
     Begin_Nest_V86_Exec();
     LoadV86Registers(&saveRegs,in,sregs);
     Exec_Int(intno);
@@ -241,7 +241,7 @@
 
     /* Re-enable pass-up to our VxD handler if previously enabled */
     if (disableTSRFlag)
-        *disableTSRFlag = oldDisable;
+	*disableTSRFlag = oldDisable;
 
     TRACE("SDDHELP: Exiting PM_int86x()\n");
 #else
@@ -249,4 +249,3 @@
 #endif
     return out->x.ax;
 }
-

diff --git a/board/MAI/bios_emulator/scitech/src/pm/ntdrv/irq.c b/board/MAI/bios_emulator/scitech/src/pm/ntdrv/irq.c
index bc6b427..9cd52047 100644
--- a/board/MAI/bios_emulator/scitech/src/pm/ntdrv/irq.c
+++ b/board/MAI/bios_emulator/scitech/src/pm/ntdrv/irq.c

@@ -1,7 +1,7 @@
 /****************************************************************************
 *
 *                   SciTech OS Portability Manager Library
-*																																			
+*
 *  ========================================================================
 *
 *    The contents of this file are subject to the SciTech MGL Public
@@ -67,41 +67,41 @@
     int frequency)
 {
     static short convert[] = {
-        8192,
-        4096,
-        2048,
-        1024,
-        512,
-        256,
-        128,
-        64,
-        32,
-        16,
-        8,
-        4,
-        2,
-        -1,
-        };
+	8192,
+	4096,
+	2048,
+	1024,
+	512,
+	256,
+	128,
+	64,
+	32,
+	16,
+	8,
+	4,
+	2,
+	-1,
+	};
     int i;
 
     /* First clear any pending RTC timeout if not cleared */
     _PM_readCMOS(0x0C);
     if (frequency == 0) {
-        /* Disable RTC timout */
-        _PM_writeCMOS(0x0A,(uchar)_PM_oldCMOSRegA);
-        _PM_writeCMOS(0x0B,(uchar)(_PM_oldCMOSRegB & 0x0F));
-        }
+	/* Disable RTC timout */
+	_PM_writeCMOS(0x0A,(uchar)_PM_oldCMOSRegA);
+	_PM_writeCMOS(0x0B,(uchar)(_PM_oldCMOSRegB & 0x0F));
+	}
     else {
-        /* Convert frequency value to RTC clock indexes */
-        for (i = 0; convert[i] != -1; i++) {
-            if (convert[i] == frequency)
-                break;
-            }
+	/* Convert frequency value to RTC clock indexes */
+	for (i = 0; convert[i] != -1; i++) {
+	    if (convert[i] == frequency)
+		break;
+	    }
 
-        /* Set RTC timout value and enable timeout */
-        _PM_writeCMOS(0x0A,(uchar)(0x20 | (i+3)));
-        _PM_writeCMOS(0x0B,(uchar)((_PM_oldCMOSRegB & 0x0F) | 0x40));
-        }
+	/* Set RTC timout value and enable timeout */
+	_PM_writeCMOS(0x0A,(uchar)(0x20 | (i+3)));
+	_PM_writeCMOS(0x0B,(uchar)((_PM_oldCMOSRegB & 0x0F) | 0x40));
+	}
 }
 
 ibool PMAPI PM_setRealTimeClockHandler(PM_intHandler th,int frequency)
@@ -130,14 +130,13 @@
 void PMAPI PM_restoreRealTimeClockHandler(void)
 {
     if (_PM_rtcHandler) {
-        /* Restore CMOS registers and mask RTC clock */
-        _PM_writeCMOS(0x0A,_PM_oldCMOSRegA);
-        _PM_writeCMOS(0x0B,_PM_oldCMOSRegB);
-        PM_outpb(0xA1,(uchar)((PM_inpb(0xA1) & 0xFE) | (_PM_oldRTCPIC2 & ~0xFE)));
+	/* Restore CMOS registers and mask RTC clock */
+	_PM_writeCMOS(0x0A,_PM_oldCMOSRegA);
+	_PM_writeCMOS(0x0B,_PM_oldCMOSRegB);
+	PM_outpb(0xA1,(uchar)((PM_inpb(0xA1) & 0xFE) | (_PM_oldRTCPIC2 & ~0xFE)));
 
-        /* Restore the interrupt vector */
-        _PM_restoreISR(RTC_idtEntry, &_PM_prevRTC);
-        _PM_rtcHandler = NULL;
-        }
+	/* Restore the interrupt vector */
+	_PM_restoreISR(RTC_idtEntry, &_PM_prevRTC);
+	_PM_rtcHandler = NULL;
+	}
 }
-

diff --git a/board/MAI/bios_emulator/scitech/src/pm/ntdrv/mem.c b/board/MAI/bios_emulator/scitech/src/pm/ntdrv/mem.c
index b30d2be..3128c6a 100644
--- a/board/MAI/bios_emulator/scitech/src/pm/ntdrv/mem.c
+++ b/board/MAI/bios_emulator/scitech/src/pm/ntdrv/mem.c

@@ -1,7 +1,7 @@
 /****************************************************************************
 *
 *                   SciTech OS Portability Manager Library
-*																																			
+*
 *  ========================================================================
 *
 *    The contents of this file are subject to the SciTech MGL Public
@@ -70,7 +70,7 @@
 
 ulong   PMAPI _PM_getPDB(void);
 
-// Page table entry flags
+/* Page table entry flags */
 
 #define PAGE_FLAGS_PRESENT			0x00000001
 #define PAGE_FLAGS_WRITEABLE		0x00000002
@@ -100,14 +100,14 @@
     ulong               length = limit+1;
     PHYSICAL_ADDRESS    paIoBase = {0};
 
-    // NT loves large Ints
+    /* NT loves large Ints */
     paIoBase = RtlConvertUlongToLargeInteger( base );
 
-    // Map IO space into Kernel
+    /* Map IO space into Kernel */
     if (isCached)
-        return (ULONG)MmMapIoSpace(paIoBase, length, MmCached );
+	return (ULONG)MmMapIoSpace(paIoBase, length, MmCached );
     else
-        return (ULONG)MmMapIoSpace(paIoBase, length, MmNonCached );
+	return (ULONG)MmMapIoSpace(paIoBase, length, MmNonCached );
 }
 
 /****************************************************************************
@@ -135,7 +135,7 @@
 		mask &= ~PAGE_FLAGS_USER;
 		bits |= PAGE_FLAGS_USER;
 		}
-		
+
 	/* Disable PCD bit if page table entry should be uncached */
 	if (!isCached) {
 		mask &= ~(PAGE_FLAGS_CACHE_DISABLE | PAGE_FLAGS_WRITE_THROUGH);
@@ -144,30 +144,30 @@
 
     pPDB = (ulong*)_PM_mapPhysicalToLinear(_PM_getPDB(),0xFFF,true);
     if (pPDB) {
-        startPDB = (linear >> 22) & 0x3FF;
-        startPage = (linear >> 12) & 0x3FF;
-        endPDB = ((linear+limit) >> 22) & 0x3FF;
-        endPage = ((linear+limit) >> 12) & 0x3FF;
-        for (iPDB = startPDB; iPDB <= endPDB; iPDB++) {
-            // Set the bits in the page directory entry - required as per
-            // Pentium 4 manual. This also takes care of the 4MB page entries
-            pPDB[iPDB] = (pPDB[iPDB] & mask) | bits;
-            if (!(pPDB[iPDB] & PAGE_FLAGS_4MB)) {
-                // If we are dealing with 4KB pages then we need to iterate
-                // through each of the page table entries
-                pageTable = pPDB[iPDB] & ~0xFFF;
-                pPageTable = (ulong*)_PM_mapPhysicalToLinear(pageTable,0xFFF,true);
-                start = (iPDB == startPDB) ? startPage : 0;
-                end = (iPDB == endPDB) ? endPage : 0x3FF;
-                for (iPage = start; iPage <= end; iPage++) {
-                    pPageTable[iPage] = (pPageTable[iPage] & mask) | bits;
-                    }
-                MmUnmapIoSpace(pPageTable,0xFFF);
-                }
-            }
-        MmUnmapIoSpace(pPDB,0xFFF);
-        PM_flushTLB();
-        }
+	startPDB = (linear >> 22) & 0x3FF;
+	startPage = (linear >> 12) & 0x3FF;
+	endPDB = ((linear+limit) >> 22) & 0x3FF;
+	endPage = ((linear+limit) >> 12) & 0x3FF;
+	for (iPDB = startPDB; iPDB <= endPDB; iPDB++) {
+	    /* Set the bits in the page directory entry - required as per */
+	    /* Pentium 4 manual. This also takes care of the 4MB page entries */
+	    pPDB[iPDB] = (pPDB[iPDB] & mask) | bits;
+	    if (!(pPDB[iPDB] & PAGE_FLAGS_4MB)) {
+		/* If we are dealing with 4KB pages then we need to iterate */
+		/* through each of the page table entries */
+		pageTable = pPDB[iPDB] & ~0xFFF;
+		pPageTable = (ulong*)_PM_mapPhysicalToLinear(pageTable,0xFFF,true);
+		start = (iPDB == startPDB) ? startPage : 0;
+		end = (iPDB == endPDB) ? endPage : 0x3FF;
+		for (iPage = start; iPage <= end; iPage++) {
+		    pPageTable[iPage] = (pPageTable[iPage] & mask) | bits;
+		    }
+		MmUnmapIoSpace(pPageTable,0xFFF);
+		}
+	    }
+	MmUnmapIoSpace(pPDB,0xFFF);
+	PM_flushTLB();
+	}
 }
 
 /****************************************************************************
@@ -183,24 +183,24 @@
 {
     int         i;
 
-    // First find a free slot in our shared memory table
+    /* First find a free slot in our shared memory table */
     for (i = 0; i < MAX_MEMORY_SHARED; i++) {
-        if (shared[i].linear == 0)
-            break;
-        }
+	if (shared[i].linear == 0)
+	    break;
+	}
     if (i == MAX_MEMORY_SHARED)
-        return NULL;
+	return NULL;
 
-    // Allocate the paged pool
+    /* Allocate the paged pool */
     shared[i].linear = ExAllocatePool(PagedPool, size);
 
-    // Create a list to manage this allocation
+    /* Create a list to manage this allocation */
     shared[i].pMdl = IoAllocateMdl(shared[i].linear,size,FALSE,FALSE,(PIRP) NULL);
 
-    // Lock this allocation in memory
+    /* Lock this allocation in memory */
     MmProbeAndLockPages(shared[i].pMdl,KernelMode,IoModifyAccess);
 
-    // Modify bits to grant user access
+    /* Modify bits to grant user access */
     _PM_adjustPageTables((ulong)shared[i].linear, size, true, true);
     return (void*)shared[i].linear;
 }
@@ -214,23 +214,23 @@
 {
     int i;
 
-    // Find a shared memory block in our table and free it
+    /* Find a shared memory block in our table and free it */
     for (i = 0; i < MAX_MEMORY_SHARED; i++) {
-        if (shared[i].linear == p) {
-            // Unlock what we locked
-            MmUnlockPages(shared[i].pMdl);
+	if (shared[i].linear == p) {
+	    /* Unlock what we locked */
+	    MmUnlockPages(shared[i].pMdl);
 
-            // Free our MDL
-            IoFreeMdl(shared[i].pMdl);
+	    /* Free our MDL */
+	    IoFreeMdl(shared[i].pMdl);
 
-            // Free our mem
-            ExFreePool(shared[i].linear);
+	    /* Free our mem */
+	    ExFreePool(shared[i].linear);
 
-            // Flag that is entry is available
-            shared[i].linear = 0;
-            break;
-            }
-        }
+	    /* Flag that is entry is available */
+	    shared[i].linear = 0;
+	    break;
+	    }
+	}
 }
 
 /****************************************************************************
@@ -245,27 +245,27 @@
     ulong   linear,length = limit+1;
     int     i;
 
-    // Search table of existing mappings to see if we have already mapped
-    // a region of memory that will serve this purpose.
+    /* Search table of existing mappings to see if we have already mapped */
+    /* a region of memory that will serve this purpose. */
     for (i = 0; i < numMappings; i++) {
-        if (maps[i].physical == base && maps[i].length == length && maps[i].isCached == isCached) {
-            _PM_adjustPageTables((ulong)maps[i].linear, maps[i].length, true, isCached);
-            return (void*)maps[i].linear;
-            }
-        }
+	if (maps[i].physical == base && maps[i].length == length && maps[i].isCached == isCached) {
+	    _PM_adjustPageTables((ulong)maps[i].linear, maps[i].length, true, isCached);
+	    return (void*)maps[i].linear;
+	    }
+	}
     if (numMappings == MAX_MEMORY_MAPPINGS)
-        return NULL;
+	return NULL;
 
-    // We did not find any previously mapped memory region, so maps it in.
+    /* We did not find any previously mapped memory region, so maps it in. */
     if ((linear = _PM_mapPhysicalToLinear(base,limit,isCached)) == 0xFFFFFFFF)
-        return NULL;
+	return NULL;
     maps[numMappings].physical = base;
     maps[numMappings].length = length;
     maps[numMappings].linear = linear;
     maps[numMappings].isCached = isCached;
     numMappings++;
 
-    // Grant user access to this I/O space
+    /* Grant user access to this I/O space */
     _PM_adjustPageTables((ulong)linear, length, true, isCached);
     return (void*)linear;
 }
@@ -278,8 +278,8 @@
     void *ptr,
     ulong limit)
 {
-    // We don't free the memory mappings in here because we cache all
-    // the memory mappings we create in the system for later use.
+    /* We don't free the memory mappings in here because we cache all */
+    /* the memory mappings we create in the system for later use. */
 }
 
 /****************************************************************************
@@ -291,7 +291,7 @@
     int i;
 
     for (i = 0; i < numMappings; i++)
-        MmUnmapIoSpace((void *)maps[i].linear,maps[i].length);
+	MmUnmapIoSpace((void *)maps[i].linear,maps[i].length);
 }
 
 /****************************************************************************
@@ -320,10 +320,10 @@
     ulong   linear = (ulong)p & ~0xFFF;
 
     for (i = (length + 0xFFF) >> 12; i > 0; i--) {
-        if ((*physAddress++ = PM_getPhysicalAddr((void*)linear)) == 0xFFFFFFFF)
-            return false;
-        linear += 4096;
-        }
+	if ((*physAddress++ = PM_getPhysicalAddr((void*)linear)) == 0xFFFFFFFF)
+	    return false;
+	linear += 4096;
+	}
     return true;
 }
 
@@ -340,58 +340,58 @@
     int                 i;
     PHYSICAL_ADDRESS    paOurAddress;
 
-    // First find a free slot in our shared memory table
+    /* First find a free slot in our shared memory table */
     for (i = 0; i < MAX_MEMORY_LOCKED; i++) {
-        if (locked[i].linear == 0)
-            break;
-        }
+	if (locked[i].linear == 0)
+	    break;
+	}
     if (i == MAX_MEMORY_LOCKED)
-        return NULL;
+	return NULL;
 
-    // HighestAcceptableAddress - Specifies the highest valid physical address
-    // the driver can use. For example, if a device can only reference physical
-    // memory in the lower 16MB, this value would be set to 0x00000000FFFFFF.
+    /* HighestAcceptableAddress - Specifies the highest valid physical address */
+    /* the driver can use. For example, if a device can only reference physical */
+    /* memory in the lower 16MB, this value would be set to 0x00000000FFFFFF. */
     paOurAddress.HighPart = 0;
     if (below16M)
-        paOurAddress.LowPart = 0x00FFFFFF;
+	paOurAddress.LowPart = 0x00FFFFFF;
     else
-        paOurAddress.LowPart = 0xFFFFFFFF;
+	paOurAddress.LowPart = 0xFFFFFFFF;
 
     if (contiguous) {
-        // Allocate from the non-paged pool (unfortunately 4MB pages)
-        locked[i].linear = MmAllocateContiguousMemory(size, paOurAddress);
-        if (!locked[i].linear)
-            return NULL;
+	/* Allocate from the non-paged pool (unfortunately 4MB pages) */
+	locked[i].linear = MmAllocateContiguousMemory(size, paOurAddress);
+	if (!locked[i].linear)
+	    return NULL;
 
-        // Flag no MDL
-        locked[i].pMdl = NULL;
+	/* Flag no MDL */
+	locked[i].pMdl = NULL;
 
-        // Map the physical address for the memory so we can manage
-        // the page tables in 4KB chunks mapped into user space.
+	/* Map the physical address for the memory so we can manage */
+	/* the page tables in 4KB chunks mapped into user space. */
 
-        // TODO: Map this with the physical address to the linear addresss
-        locked[i].mmIoMapped = locked[i].linear;
+	/* TODO: Map this with the physical address to the linear addresss */
+	locked[i].mmIoMapped = locked[i].linear;
 
-        // Modify bits to grant user access, flag not cached
-        _PM_adjustPageTables((ulong)locked[i].mmIoMapped, size, true, false);
-        return (void*)locked[i].mmIoMapped;
-        }
+	/* Modify bits to grant user access, flag not cached */
+	_PM_adjustPageTables((ulong)locked[i].mmIoMapped, size, true, false);
+	return (void*)locked[i].mmIoMapped;
+	}
     else {
-        // Allocate from the paged pool
-        locked[i].linear = ExAllocatePool(PagedPool, size);
-        if (!locked[i].linear)
-            return NULL;
+	/* Allocate from the paged pool */
+	locked[i].linear = ExAllocatePool(PagedPool, size);
+	if (!locked[i].linear)
+	    return NULL;
 
-        // Create a list to manage this allocation
-        locked[i].pMdl = IoAllocateMdl(locked[i].linear,size,FALSE,FALSE,(PIRP) NULL);
+	/* Create a list to manage this allocation */
+	locked[i].pMdl = IoAllocateMdl(locked[i].linear,size,FALSE,FALSE,(PIRP) NULL);
 
-        // Lock this allocation in memory
-        MmProbeAndLockPages(locked[i].pMdl,KernelMode,IoModifyAccess);
+	/* Lock this allocation in memory */
+	MmProbeAndLockPages(locked[i].pMdl,KernelMode,IoModifyAccess);
 
-        // Modify bits to grant user access, flag not cached
-        _PM_adjustPageTables((ulong)locked[i].linear, size, true, false);
-        return (void*)locked[i].linear;
-        }
+	/* Modify bits to grant user access, flag not cached */
+	_PM_adjustPageTables((ulong)locked[i].linear, size, true, false);
+	return (void*)locked[i].linear;
+	}
 }
 
 /****************************************************************************
@@ -407,27 +407,27 @@
 
     /* Find a locked memory block in our table and free it */
     for (i = 0; i < MAX_MEMORY_LOCKED; i++) {
-        if (locked[i].linear == p) {
-            // An Mdl indicates that we used the paged pool, and locked it,
-            // so now we have to unlock, free the MDL, and free paged
-            if (locked[i].pMdl) {
-                // Unlock what we locked and free the Mdl
-                MmUnlockPages(locked[i].pMdl);
-                IoFreeMdl(locked[i].pMdl);
-                ExFreePool(locked[i].linear);
-                }
-            else {
-                // TODO: Free the mmIoMap mapping for the memory!
+	if (locked[i].linear == p) {
+	    /* An Mdl indicates that we used the paged pool, and locked it, */
+	    /* so now we have to unlock, free the MDL, and free paged */
+	    if (locked[i].pMdl) {
+		/* Unlock what we locked and free the Mdl */
+		MmUnlockPages(locked[i].pMdl);
+		IoFreeMdl(locked[i].pMdl);
+		ExFreePool(locked[i].linear);
+		}
+	    else {
+		/* TODO: Free the mmIoMap mapping for the memory! */
 
-                // Free non-paged pool
-                MmFreeContiguousMemory(locked[i].linear);
-                }
+		/* Free non-paged pool */
+		MmFreeContiguousMemory(locked[i].linear);
+		}
 
-            // Flag that is entry is available
-            locked[i].linear = 0;
-            break;
-            }
-        }
+	    /* Flag that is entry is available */
+	    locked[i].linear = 0;
+	    break;
+	    }
+	}
 }
 
 /****************************************************************************
@@ -437,11 +437,11 @@
 void * PMAPI PM_allocPage(
     ibool locked)
 {
-    // Allocate the memory from the non-paged pool if we want the memory
-    // to be locked.
+    /* Allocate the memory from the non-paged pool if we want the memory */
+    /* to be locked. */
     return ExAllocatePool(
-        locked ? NonPagedPoolCacheAligned : PagedPoolCacheAligned,
-        PAGE_SIZE);
+	locked ? NonPagedPoolCacheAligned : PagedPoolCacheAligned,
+	PAGE_SIZE);
 }
 
 /****************************************************************************
@@ -465,11 +465,11 @@
 {
     MDL *pMdl;
 
-    // Create a list to manage this allocation
+    /* Create a list to manage this allocation */
     if ((pMdl = IoAllocateMdl(p,len,FALSE,FALSE,(PIRP)NULL)) == NULL)
-        return false;
+	return false;
 
-    // Lock this allocation in memory
+    /* Lock this allocation in memory */
     MmProbeAndLockPages(pMdl,KernelMode,IoModifyAccess);
     *((PMDL*)(&lh->h)) = pMdl;
     return true;
@@ -485,11 +485,11 @@
     PM_lockHandle *lh)
 {
     if (p && lh) {
-        // Unlock what we locked
-        MDL *pMdl = *((PMDL*)(&lh->h));
-        MmUnlockPages(pMdl);
-        IoFreeMdl(pMdl);
-        }
+	/* Unlock what we locked */
+	MDL *pMdl = *((PMDL*)(&lh->h));
+	MmUnlockPages(pMdl);
+	IoFreeMdl(pMdl);
+	}
     return true;
 }
 
@@ -516,4 +516,3 @@
 {
     return PM_unlockDataPages((void*)p,len,lh);
 }
-

diff --git a/board/MAI/bios_emulator/scitech/src/pm/ntdrv/oshdr.h b/board/MAI/bios_emulator/scitech/src/pm/ntdrv/oshdr.h
index 3f747bb..65b7bae 100644
--- a/board/MAI/bios_emulator/scitech/src/pm/ntdrv/oshdr.h
+++ b/board/MAI/bios_emulator/scitech/src/pm/ntdrv/oshdr.h

@@ -42,5 +42,4 @@
 UNICODE_STRING *    _PM_CStringToUnicodeString(const char *cstr);
 void                _PM_FreeUnicodeString(UNICODE_STRING *uniStr);
 
-#endif  // __NTDRV_OSHDR_H
-
+#endif  /* __NTDRV_OSHDR_H */

diff --git a/board/MAI/bios_emulator/scitech/src/pm/ntdrv/pm.c b/board/MAI/bios_emulator/scitech/src/pm/ntdrv/pm.c
index d4bbe22..c660631 100644
--- a/board/MAI/bios_emulator/scitech/src/pm/ntdrv/pm.c
+++ b/board/MAI/bios_emulator/scitech/src/pm/ntdrv/pm.c

@@ -1,7 +1,7 @@
 /****************************************************************************
 *
 *                   SciTech OS Portability Manager Library
-*																																			
+*
 *  ========================================================================
 *
 *    The contents of this file are subject to the SciTech MGL Public
@@ -88,9 +88,9 @@
 {
     uint pos = strlen(s);
     if (s[pos-1] != '\\') {
-        s[pos] = '\\';
-        s[pos+1] = '\0';
-        }
+	s[pos] = '\\';
+	s[pos+1] = '\0';
+	}
 }
 
 /****************************************************************************
@@ -116,25 +116,25 @@
     ULONG   len;
 
     if (fatalErrorCleanup)
-        fatalErrorCleanup();
+	fatalErrorCleanup();
 
-#ifdef DBG	// Send output to debugger, just return so as not to force a reboot
-#pragma message("INFO: building for debug, PM_fatalError() re-routed")	
-	DBGMSG2("SDDHELP> PM_fatalError(): ERROR: %s\n", msg);	
+#ifdef DBG	/* Send output to debugger, just return so as not to force a reboot */
+#pragma message("INFO: building for debug, PM_fatalError() re-routed")
+	DBGMSG2("SDDHELP> PM_fatalError(): ERROR: %s\n", msg);
 	return ;
 #endif
-    // KeBugCheckEx brings down the system in a controlled
-    // manner when the caller discovers an unrecoverable
-    // inconsistency that would corrupt the system if
-    // the caller continued to run.
-    //
-    // hack - dump the first 20 chars in hex using the variables
-    //      provided - Each ULONG is equal to four characters...
+    /* KeBugCheckEx brings down the system in a controlled */
+    /* manner when the caller discovers an unrecoverable */
+    /* inconsistency that would corrupt the system if */
+    /* the caller continued to run. */
+    /* */
+    /* hack - dump the first 20 chars in hex using the variables */
+    /*      provided - Each ULONG is equal to four characters... */
     for(len = 0; len < 20; len++)
-        if (msg[len] == (char)0)
-            break;
+	if (msg[len] == (char)0)
+	    break;
 
-    // This looks bad but it's quick and reliable...
+    /* This looks bad but it's quick and reliable... */
     p = (char *)&BugCheckCode;
     if(len > 0) p[3] = msg[0];
     if(len > 1) p[2] = msg[1];
@@ -165,7 +165,7 @@
     if(len > 18) p[1] = msg[18];
     if(len > 19) p[0] = msg[19];
 
-    // Halt the system!
+    /* Halt the system! */
     KeBugCheckEx(BugCheckCode, MoreBugCheckData[0], MoreBugCheckData[1], MoreBugCheckData[2], MoreBugCheckData[3]);
 }
 
@@ -209,50 +209,50 @@
     STRING                          stringdata;
     UNICODE_STRING                  unidata;
 
-    // Convert strings to UniCode
+    /* Convert strings to UniCode */
     status = false;
     if ((uniKey = _PM_CStringToUnicodeString(szKey)) == NULL)
-        goto Exit;
+	goto Exit;
     if ((uniValue = _PM_CStringToUnicodeString(szValue)) == NULL)
-        goto Exit;
+	goto Exit;
 
-    // Open the key
+    /* Open the key */
     InitializeObjectAttributes( &keyAttributes,
-                                uniKey,
-                                OBJ_CASE_INSENSITIVE,
-                                NULL,
-                                NULL );
+				uniKey,
+				OBJ_CASE_INSENSITIVE,
+				NULL,
+				NULL );
     rval = ZwOpenKey( &Handle,
-                      KEY_ALL_ACCESS,
-                      &keyAttributes );
+		      KEY_ALL_ACCESS,
+		      &keyAttributes );
     if (!NT_SUCCESS(rval))
-        goto Exit;
+	goto Exit;
 
-    // Query the value
+    /* Query the value */
     length = sizeof (KEY_VALUE_FULL_INFORMATION)
-           + size * sizeof(WCHAR);
+	   + size * sizeof(WCHAR);
     if ((fullInfo = ExAllocatePool (PagedPool, length)) == NULL)
-        goto Exit;
+	goto Exit;
     RtlZeroMemory(fullInfo, length);
     rval = ZwQueryValueKey (Handle,
-                            uniValue,
-                            KeyValueFullInformation,
-                            fullInfo,
-                            length,
-                            &length);
+			    uniValue,
+			    KeyValueFullInformation,
+			    fullInfo,
+			    length,
+			    &length);
     if (NT_SUCCESS (rval)) {
-        // Create the UniCode string so we can convert it
-        unidata.Buffer = (PWCHAR)(((PCHAR)fullInfo) + fullInfo->DataOffset);
-        unidata.Length = (USHORT)fullInfo->DataLength;
-        unidata.MaximumLength = (USHORT)fullInfo->DataLength + sizeof(WCHAR);
+	/* Create the UniCode string so we can convert it */
+	unidata.Buffer = (PWCHAR)(((PCHAR)fullInfo) + fullInfo->DataOffset);
+	unidata.Length = (USHORT)fullInfo->DataLength;
+	unidata.MaximumLength = (USHORT)fullInfo->DataLength + sizeof(WCHAR);
 
-        // Convert unicode univalue to ansi string.
-        rval = RtlUnicodeStringToAnsiString(&stringdata, &unidata, TRUE);
-        if (NT_SUCCESS(rval)) {
-            strcpy(value,stringdata.Buffer);
-            status = true;
-            }
-        }
+	/* Convert unicode univalue to ansi string. */
+	rval = RtlUnicodeStringToAnsiString(&stringdata, &unidata, TRUE);
+	if (NT_SUCCESS(rval)) {
+	    strcpy(value,stringdata.Buffer);
+	    status = true;
+	    }
+	}
 
 Exit:
     if (fullInfo) ExFreePool(fullInfo);
@@ -269,7 +269,7 @@
 {
     char path[256];
     if (REG_queryString(szNTWindowsKey,szNTSystemRoot,path,sizeof(path)))
-        return 'c';
+	return 'c';
     return path[0];
 }
 
@@ -291,12 +291,12 @@
     static char path[256];
 
     if (strlen(_PM_nucleusPath) > 0) {
-        strcpy(path,_PM_nucleusPath);
-        PM_backslash(path);
-        return path;
-        }
+	strcpy(path,_PM_nucleusPath);
+	PM_backslash(path);
+	return path;
+	}
     if (!REG_queryString(szNTWindowsKey,szNTSystemRoot,path,sizeof(path)))
-        strcpy(path,"c:\\winnt");
+	strcpy(path,"c:\\winnt");
     PM_backslash(path);
     strcat(path,"system32\\nucleus");
     return path;
@@ -333,9 +333,9 @@
     static char name[256];
 
     if (REG_queryString(szMachineNameKey,szMachineName,name,sizeof(name)))
-        return name;
+	return name;
     if (REG_queryString(szMachineNameKeyNT,szMachineName,name,sizeof(name)))
-        return name;
+	return name;
     return "Unknown";
 }
 
@@ -345,7 +345,7 @@
 ****************************************************************************/
 int PMAPI PM_kbhit(void)
 {
-    // Not used in NT drivers
+    /* Not used in NT drivers */
     return true;
 }
 
@@ -355,7 +355,7 @@
 ****************************************************************************/
 int PMAPI PM_getch(void)
 {
-    // Not used in NT drivers
+    /* Not used in NT drivers */
     return 0xD;
 }
 
@@ -372,7 +372,7 @@
     int bpp,
     ibool fullScreen)
 {
-    // Not used in NT drivers
+    /* Not used in NT drivers */
     (void)hwndUser;
     (void)device;
     (void)xRes;
@@ -388,7 +388,7 @@
 ****************************************************************************/
 int PMAPI PM_getConsoleStateSize(void)
 {
-    // Not used in NT drivers
+    /* Not used in NT drivers */
     return 1;
 }
 
@@ -400,7 +400,7 @@
     void *stateBuf,
     PM_HWND hwndConsole)
 {
-    // Not used in NT drivers
+    /* Not used in NT drivers */
     (void)stateBuf;
     (void)hwndConsole;
 }
@@ -412,7 +412,7 @@
 void PMAPI PM_setSuspendAppCallback(
     PM_saveState_cb saveState)
 {
-    // Not used in NT drivers
+    /* Not used in NT drivers */
     (void)saveState;
 }
 
@@ -424,7 +424,7 @@
     const void *stateBuf,
     PM_HWND hwndConsole)
 {
-    // Not used in NT drivers
+    /* Not used in NT drivers */
     (void)stateBuf;
     (void)hwndConsole;
 }
@@ -436,7 +436,7 @@
 void PMAPI PM_closeConsole(
     PM_HWND hwndConsole)
 {
-    // Not used in NT drivers
+    /* Not used in NT drivers */
     (void)hwndConsole;
 }
 
@@ -475,7 +475,7 @@
     void *base,
     ulong limit)
 {
-    // Not used anymore
+    /* Not used anymore */
     (void)base;
     (void)limit;
     return NULL;
@@ -491,7 +491,7 @@
     void *mappedBIOS,
     ulong BIOSLen)
 {
-    // This may not be possible in NT and should be done by the OS anyway
+    /* This may not be possible in NT and should be done by the OS anyway */
     (void)axVal;
     (void)BIOSPhysAddr;
     (void)mappedBIOS;
@@ -505,7 +505,7 @@
 ****************************************************************************/
 void * PMAPI PM_getBIOSPointer(void)
 {
-    // Note that on NT this probably does not do what we expect!
+    /* Note that on NT this probably does not do what we expect! */
     return PM_mapPhysicalAddr(0x400, 0x1000, true);
 }
 
@@ -525,7 +525,7 @@
 void PMAPI PM_sleep(
     ulong milliseconds)
 {
-    // We never use this in NT drivers
+    /* We never use this in NT drivers */
     (void)milliseconds;
 }
 
@@ -535,14 +535,14 @@
 ****************************************************************************/
 int PMAPI PM_getCOMPort(int port)
 {
-    // TODO: Re-code this to determine real values using the Plug and Play
-    //       manager for the OS.
+    /* TODO: Re-code this to determine real values using the Plug and Play */
+    /*       manager for the OS. */
     switch (port) {
-        case 0: return 0x3F8;
-        case 1: return 0x2F8;
-        case 2: return 0x3E8;
-        case 3: return 0x2E8;
-        }
+	case 0: return 0x3F8;
+	case 1: return 0x2F8;
+	case 2: return 0x3E8;
+	case 3: return 0x2E8;
+	}
     return 0;
 }
 
@@ -552,13 +552,13 @@
 ****************************************************************************/
 int PMAPI PM_getLPTPort(int port)
 {
-    // TODO: Re-code this to determine real values using the Plug and Play
-    //       manager for the OS.
+    /* TODO: Re-code this to determine real values using the Plug and Play */
+    /*       manager for the OS. */
     switch (port) {
-        case 0: return 0x3BC;
-        case 1: return 0x378;
-        case 2: return 0x278;
-        }
+	case 0: return 0x3BC;
+	case 1: return 0x378;
+	case 2: return 0x278;
+	}
     return 0;
 }
 
@@ -580,7 +580,7 @@
 PM_MODULE PMAPI PM_loadLibrary(
     const char *szDLLName)
 {
-    // Not used in NT drivers
+    /* Not used in NT drivers */
     (void)szDLLName;
     return NULL;
 }
@@ -593,7 +593,7 @@
     PM_MODULE hModule,
     const char *szProcName)
 {
-    // Not used in NT drivers
+    /* Not used in NT drivers */
     (void)hModule;
     (void)szProcName;
     return NULL;
@@ -606,7 +606,7 @@
 void PMAPI PM_freeLibrary(
     PM_MODULE hModule)
 {
-    // Not used in NT drivers
+    /* Not used in NT drivers */
     (void)hModule;
 }
 
@@ -618,9 +618,9 @@
     const char *filename,
     PM_findData *findData)
 {
-    // TODO: This function should start a directory enumeration search
-    //       given the filename (with wildcards). The data should be
-    //       converted and returned in the findData standard form.
+    /* TODO: This function should start a directory enumeration search */
+    /*       given the filename (with wildcards). The data should be */
+    /*       converted and returned in the findData standard form. */
     (void)filename;
     (void)findData;
     return PM_FILE_INVALID;
@@ -634,10 +634,10 @@
     void *handle,
     PM_findData *findData)
 {
-    // TODO: This function should find the next file in directory enumeration
-    //       search given the search criteria defined in the call to
-    //       PM_findFirstFile. The data should be converted and returned
-    //       in the findData standard form.
+    /* TODO: This function should find the next file in directory enumeration */
+    /*       search given the search criteria defined in the call to */
+    /*       PM_findFirstFile. The data should be converted and returned */
+    /*       in the findData standard form. */
     (void)handle;
     (void)findData;
     return false;
@@ -650,8 +650,8 @@
 void PMAPI PM_findClose(
     void *handle)
 {
-    // TODO: This function should close the find process. This may do
-    //       nothing for some OS'es.
+    /* TODO: This function should close the find process. This may do */
+    /*       nothing for some OS'es. */
     (void)handle;
 }
 
@@ -671,7 +671,7 @@
 ibool PMAPI PM_driveValid(
     char drive)
 {
-    // Not supported in NT drivers
+    /* Not supported in NT drivers */
     (void)drive;
     return false;
 }
@@ -687,7 +687,7 @@
     char *dir,
     int len)
 {
-    // Not supported in NT drivers
+    /* Not supported in NT drivers */
     (void)drive;
     (void)dir;
     (void)len;
@@ -733,67 +733,67 @@
     char                    kernelFilename[PM_MAX_PATH+5];
     ULONG                   FileAttributes = 0;
 
-    // Convert file attribute flags
+    /* Convert file attribute flags */
     if (attrib & PM_FILE_READONLY)
-        FileAttributes |= FILE_ATTRIBUTE_READONLY;
+	FileAttributes |= FILE_ATTRIBUTE_READONLY;
     if (attrib & PM_FILE_ARCHIVE)
-        FileAttributes |= FILE_ATTRIBUTE_ARCHIVE;
+	FileAttributes |= FILE_ATTRIBUTE_ARCHIVE;
     if (attrib & PM_FILE_HIDDEN)
-        FileAttributes |= FILE_ATTRIBUTE_HIDDEN;
+	FileAttributes |= FILE_ATTRIBUTE_HIDDEN;
     if (attrib & PM_FILE_SYSTEM)
-        FileAttributes |= FILE_ATTRIBUTE_SYSTEM;
+	FileAttributes |= FILE_ATTRIBUTE_SYSTEM;
 
-    // Add prefix for addressing the file system. "\??\" is short for "\DosDevices\"
+    /* Add prefix for addressing the file system. "\??\" is short for "\DosDevices\" */
     strcpy(kernelFilename, "\\??\\");
     strcat(kernelFilename, filename);
 
-    // Convert filename string to ansi string
+    /* Convert filename string to ansi string */
     if ((uniFile = _PM_CStringToUnicodeString(kernelFilename)) == NULL)
-        goto Exit;
+	goto Exit;
 
-    // Must open a file to query it's attributes
+    /* Must open a file to query it's attributes */
     InitializeObjectAttributes (&ObjectAttributes,
-                                uniFile,
-                                OBJ_CASE_INSENSITIVE,
-                                NULL,
-                                NULL );
+				uniFile,
+				OBJ_CASE_INSENSITIVE,
+				NULL,
+				NULL );
     status = ZwCreateFile( &FileHandle,
-                            DesiredAccess | SYNCHRONIZE,
-                            &ObjectAttributes,
-                            &IoStatusBlock,
-                            NULL,                  //AllocationSize  OPTIONAL,
-                            FILE_ATTRIBUTE_NORMAL,
-                            ShareAccess,
-                            CreateDisposition,
-                            FILE_RANDOM_ACCESS,        //CreateOptions,
-                            NULL,                  //EaBuffer  OPTIONAL,
-                            0                      //EaLength (required if EaBuffer)
-                            );
+			    DesiredAccess | SYNCHRONIZE,
+			    &ObjectAttributes,
+			    &IoStatusBlock,
+			    NULL,                  /*AllocationSize  OPTIONAL, */
+			    FILE_ATTRIBUTE_NORMAL,
+			    ShareAccess,
+			    CreateDisposition,
+			    FILE_RANDOM_ACCESS,        /*CreateOptions, */
+			    NULL,                  /*EaBuffer  OPTIONAL, */
+			    0                      /*EaLength (required if EaBuffer) */
+			    );
     if (!NT_SUCCESS (status))
-        goto Exit;
+	goto Exit;
 
-    // Query timestamps
+    /* Query timestamps */
     status = ZwQueryInformationFile(FileHandle,
-                                    &IoStatusBlock,
-                                    &FileBasic,
-                                    sizeof(FILE_BASIC_INFORMATION),
-                                    FileBasicInformation
-                                    );
+				    &IoStatusBlock,
+				    &FileBasic,
+				    sizeof(FILE_BASIC_INFORMATION),
+				    FileBasicInformation
+				    );
     if (!NT_SUCCESS (status))
-        goto Exit;
+	goto Exit;
 
-    // Change the four bits we change
+    /* Change the four bits we change */
     FileBasic.FileAttributes &= ~(FILE_ATTRIBUTE_READONLY | FILE_ATTRIBUTE_ARCHIVE
-                                  | FILE_ATTRIBUTE_HIDDEN | FILE_ATTRIBUTE_SYSTEM);
+				  | FILE_ATTRIBUTE_HIDDEN | FILE_ATTRIBUTE_SYSTEM);
     FileBasic.FileAttributes |= FileAttributes;
 
-    // Set timestamps
+    /* Set timestamps */
     ZwSetInformationFile(   FileHandle,
-                            &IoStatusBlock,
-                            &FileBasic,
-                            sizeof(FILE_BASIC_INFORMATION),
-                            FileBasicInformation
-                            );
+			    &IoStatusBlock,
+			    &FileBasic,
+			    sizeof(FILE_BASIC_INFORMATION),
+			    FileBasicInformation
+			    );
 
 Exit:
     if (FileHandle) ZwClose(FileHandle);
@@ -821,54 +821,54 @@
     ULONG                   FileAttributes = 0;
     uint                    retval = 0;
 
-    // Add prefix for addressing the file system. "\??\" is short for "\DosDevices\"
+    /* Add prefix for addressing the file system. "\??\" is short for "\DosDevices\" */
     strcpy(kernelFilename, "\\??\\");
     strcat(kernelFilename, filename);
 
-    // Convert filename string to ansi string
+    /* Convert filename string to ansi string */
     if ((uniFile = _PM_CStringToUnicodeString(kernelFilename)) == NULL)
-        goto Exit;
+	goto Exit;
 
-    // Must open a file to query it's attributes
+    /* Must open a file to query it's attributes */
     InitializeObjectAttributes (&ObjectAttributes,
-                                uniFile,
-                                OBJ_CASE_INSENSITIVE,
-                                NULL,
-                                NULL );
+				uniFile,
+				OBJ_CASE_INSENSITIVE,
+				NULL,
+				NULL );
     status = ZwCreateFile( &FileHandle,
-                           DesiredAccess | SYNCHRONIZE,
-                           &ObjectAttributes,
-                           &IoStatusBlock,
-                           NULL,                  //AllocationSize  OPTIONAL,
-                           FILE_ATTRIBUTE_NORMAL,
-                           ShareAccess,
-                           CreateDisposition,
-                           FILE_RANDOM_ACCESS,        //CreateOptions,
-                           NULL,                  //EaBuffer  OPTIONAL,
-                           0                      //EaLength (required if EaBuffer)
-                           );
+			   DesiredAccess | SYNCHRONIZE,
+			   &ObjectAttributes,
+			   &IoStatusBlock,
+			   NULL,                  /*AllocationSize  OPTIONAL, */
+			   FILE_ATTRIBUTE_NORMAL,
+			   ShareAccess,
+			   CreateDisposition,
+			   FILE_RANDOM_ACCESS,        /*CreateOptions, */
+			   NULL,                  /*EaBuffer  OPTIONAL, */
+			   0                      /*EaLength (required if EaBuffer) */
+			   );
     if (!NT_SUCCESS (status))
-        goto Exit;
+	goto Exit;
 
-    // Query timestamps
+    /* Query timestamps */
     status = ZwQueryInformationFile(FileHandle,
-                                    &IoStatusBlock,
-                                    &FileBasic,
-                                    sizeof(FILE_BASIC_INFORMATION),
-                                    FileBasicInformation
-                                    );
+				    &IoStatusBlock,
+				    &FileBasic,
+				    sizeof(FILE_BASIC_INFORMATION),
+				    FileBasicInformation
+				    );
     if (!NT_SUCCESS (status))
-        goto Exit;
+	goto Exit;
 
-    // Translate the file attributes
+    /* Translate the file attributes */
     if (FileBasic.FileAttributes & FILE_ATTRIBUTE_READONLY)
-        retval |= PM_FILE_READONLY;
+	retval |= PM_FILE_READONLY;
     if (FileBasic.FileAttributes & FILE_ATTRIBUTE_ARCHIVE)
-        retval |= PM_FILE_ARCHIVE;
+	retval |= PM_FILE_ARCHIVE;
     if (FileBasic.FileAttributes & FILE_ATTRIBUTE_HIDDEN)
-        retval |= PM_FILE_HIDDEN;
+	retval |= PM_FILE_HIDDEN;
     if (FileBasic.FileAttributes & FILE_ATTRIBUTE_SYSTEM)
-        retval |= PM_FILE_SYSTEM;
+	retval |= PM_FILE_SYSTEM;
 
 Exit:
     if (FileHandle) ZwClose(FileHandle);
@@ -883,7 +883,7 @@
 ibool PMAPI PM_mkdir(
     const char *filename)
 {
-    // Not supported in NT drivers
+    /* Not supported in NT drivers */
     (void)filename;
     return false;
 }
@@ -895,7 +895,7 @@
 ibool PMAPI PM_rmdir(
     const char *filename)
 {
-    // Not supported in NT drivers
+    /* Not supported in NT drivers */
     (void)filename;
     return false;
 }
@@ -909,7 +909,7 @@
     ibool gmTime,
     PM_time *time)
 {
-    // Not supported in NT drivers
+    /* Not supported in NT drivers */
     (void)filename;
     (void)gmTime;
     (void)time;
@@ -925,10 +925,9 @@
     ibool gmTime,
     PM_time *time)
 {
-    // Not supported in NT drivers
+    /* Not supported in NT drivers */
     (void)filename;
     (void)gmTime;
     (void)time;
     return false;
 }
-

diff --git a/board/MAI/bios_emulator/scitech/src/pm/ntdrv/stdio.c b/board/MAI/bios_emulator/scitech/src/pm/ntdrv/stdio.c
index 8562152..658f1c8 100644
--- a/board/MAI/bios_emulator/scitech/src/pm/ntdrv/stdio.c
+++ b/board/MAI/bios_emulator/scitech/src/pm/ntdrv/stdio.c

@@ -42,7 +42,7 @@
     const char *filename,
     const char *mode)
 {
-    ACCESS_MASK                 DesiredAccess;      // for ZwCreateFile...
+    ACCESS_MASK                 DesiredAccess;      /* for ZwCreateFile... */
     OBJECT_ATTRIBUTES           ObjectAttributes;
     ULONG                       ShareAccess;
     ULONG                       CreateDisposition;
@@ -56,86 +56,86 @@
     char                        kernelFilename[PM_MAX_PATH+5];
     FILE                        *f;
 
-    // Add prefix for addressing the file system. "\??\" is short for "\DosDevices\"
+    /* Add prefix for addressing the file system. "\??\" is short for "\DosDevices\" */
     strcpy(kernelFilename, "\\??\\");
     strcat(kernelFilename, filename);
     if ((f = PM_malloc(sizeof(FILE))) == NULL)
-        goto Error;
+	goto Error;
     f->offset = 0;
     f->text = (mode[1] == 't' || mode[2] == 't');
     f->writemode = (mode[0] == 'w') || (mode[0] == 'a');
     if (mode[0] == 'r') {
-        // omode = OPEN_ACCESS_READONLY | OPEN_SHARE_COMPATIBLE;
-        // action = ACTION_IFEXISTS_OPEN | ACTION_IFNOTEXISTS_FAIL;
-        DesiredAccess = GENERIC_READ;
-        ShareAccess = FILE_SHARE_READ | FILE_SHARE_WRITE;
-        CreateDisposition = FILE_OPEN;
-        }
+	/* omode = OPEN_ACCESS_READONLY | OPEN_SHARE_COMPATIBLE; */
+	/* action = ACTION_IFEXISTS_OPEN | ACTION_IFNOTEXISTS_FAIL; */
+	DesiredAccess = GENERIC_READ;
+	ShareAccess = FILE_SHARE_READ | FILE_SHARE_WRITE;
+	CreateDisposition = FILE_OPEN;
+	}
     else if (mode[0] == 'w') {
-        // omode = OPEN_ACCESS_WRITEONLY | OPEN_SHARE_COMPATIBLE;
-        // action = ACTION_IFEXISTS_TRUNCATE | ACTION_IFNOTEXISTS_CREATE;
-        DesiredAccess = GENERIC_WRITE;
-        ShareAccess = FILE_SHARE_READ | FILE_SHARE_WRITE;
-        CreateDisposition = FILE_SUPERSEDE;
-        }
+	/* omode = OPEN_ACCESS_WRITEONLY | OPEN_SHARE_COMPATIBLE; */
+	/* action = ACTION_IFEXISTS_TRUNCATE | ACTION_IFNOTEXISTS_CREATE; */
+	DesiredAccess = GENERIC_WRITE;
+	ShareAccess = FILE_SHARE_READ | FILE_SHARE_WRITE;
+	CreateDisposition = FILE_SUPERSEDE;
+	}
     else {
-        // omode = OPEN_ACCESS_READWRITE | OPEN_SHARE_COMPATIBLE;
-        // action = ACTION_IFEXISTS_OPEN | ACTION_IFNOTEXISTS_CREATE;
-        DesiredAccess = GENERIC_READ | GENERIC_WRITE;
-        ShareAccess = FILE_SHARE_READ;
-        CreateDisposition = FILE_OPEN_IF;
-        }
+	/* omode = OPEN_ACCESS_READWRITE | OPEN_SHARE_COMPATIBLE; */
+	/* action = ACTION_IFEXISTS_OPEN | ACTION_IFNOTEXISTS_CREATE; */
+	DesiredAccess = GENERIC_READ | GENERIC_WRITE;
+	ShareAccess = FILE_SHARE_READ;
+	CreateDisposition = FILE_OPEN_IF;
+	}
 
-    // Convert filename string to ansi string and then to UniCode string
+    /* Convert filename string to ansi string and then to UniCode string */
     if ((uniFile = _PM_CStringToUnicodeString(kernelFilename)) == NULL)
-        return NULL;
+	return NULL;
 
-    // Create the file
+    /* Create the file */
     InitializeObjectAttributes (&ObjectAttributes,
-                                uniFile,
-                                OBJ_CASE_INSENSITIVE,
-                                NULL,
-                                NULL);
+				uniFile,
+				OBJ_CASE_INSENSITIVE,
+				NULL,
+				NULL);
     status = ZwCreateFile( &FileHandle,
-                            DesiredAccess | SYNCHRONIZE,
-                            &ObjectAttributes,
-                            &IoStatusBlock,
-                            NULL,                   // AllocationSize  OPTIONAL,
-                            FILE_ATTRIBUTE_NORMAL,
-                            ShareAccess,
-                            CreateDisposition,
-                            FILE_RANDOM_ACCESS,     // CreateOptions,
-                            NULL,                   // EaBuffer  OPTIONAL,
-                            0                       // EaLength (required if EaBuffer)
-                            );
+			    DesiredAccess | SYNCHRONIZE,
+			    &ObjectAttributes,
+			    &IoStatusBlock,
+			    NULL,                   /* AllocationSize  OPTIONAL, */
+			    FILE_ATTRIBUTE_NORMAL,
+			    ShareAccess,
+			    CreateDisposition,
+			    FILE_RANDOM_ACCESS,     /* CreateOptions, */
+			    NULL,                   /* EaBuffer  OPTIONAL, */
+			    0                       /* EaLength (required if EaBuffer) */
+			    );
     if (!NT_SUCCESS (status))
-        goto Error;
+	goto Error;
     f->handle = (int)FileHandle;
 
-    // Determine size of the file
+    /* Determine size of the file */
     status = ZwQueryInformationFile(  FileHandle,
-                                      &IoStatusBlock,
-                                      &FileInformation,
-                                      sizeof(FILE_STANDARD_INFORMATION),
-                                      FileStandardInformation
-                                      );
+				      &IoStatusBlock,
+				      &FileInformation,
+				      sizeof(FILE_STANDARD_INFORMATION),
+				      FileStandardInformation
+				      );
     if (!NT_SUCCESS (status))
-        goto Error;
+	goto Error;
     f->filesize = FileInformation.EndOfFile.LowPart;
 
-    // Move to the end of the file if we are appending
+    /* Move to the end of the file if we are appending */
     if (mode[0] == 'a') {
-        FilePosition.CurrentByteOffset.HighPart = 0;
-        FilePosition.CurrentByteOffset.LowPart = f->filesize;
-        status = ZwSetInformationFile(  FileHandle,
-                                        &IoStatusBlock,
-                                        &FilePosition,
-                                        sizeof(FILE_POSITION_INFORMATION),
-                                        FilePositionInformation
-                                        );
-        if (!NT_SUCCESS (status))
-            goto Error;
-        }
+	FilePosition.CurrentByteOffset.HighPart = 0;
+	FilePosition.CurrentByteOffset.LowPart = f->filesize;
+	status = ZwSetInformationFile(  FileHandle,
+					&IoStatusBlock,
+					&FilePosition,
+					sizeof(FILE_POSITION_INFORMATION),
+					FilePositionInformation
+					);
+	if (!NT_SUCCESS (status))
+	    goto Error;
+	}
     return f;
 
 Error:
@@ -158,21 +158,21 @@
     IO_STATUS_BLOCK IoStatusBlock;
     LARGE_INTEGER   ByteOffset;
 
-    // Read any extra bytes from the file
+    /* Read any extra bytes from the file */
     ByteOffset.HighPart = 0;
     ByteOffset.LowPart = f->offset;
     status = ZwReadFile( (HANDLE)f->handle,
-                         NULL,              //IN HANDLE  Event  OPTIONAL,
-                         NULL,              //  IN PIO_APC_ROUTINE  ApcRoutine  OPTIONAL,
-                         NULL,              //  IN PVOID  ApcContext  OPTIONAL,
-                         &IoStatusBlock,
-                         ptr,               //  OUT PVOID  Buffer,
-                         size * n,          //IN ULONG  Length,
-                         &ByteOffset,       //OPTIONAL,
-                         NULL               //IN PULONG  Key  OPTIONAL
-                         );
+			 NULL,              /*IN HANDLE  Event  OPTIONAL, */
+			 NULL,              /*  IN PIO_APC_ROUTINE  ApcRoutine  OPTIONAL, */
+			 NULL,              /*  IN PVOID  ApcContext  OPTIONAL, */
+			 &IoStatusBlock,
+			 ptr,               /*  OUT PVOID  Buffer, */
+			 size * n,          /*IN ULONG  Length, */
+			 &ByteOffset,       /*OPTIONAL, */
+			 NULL               /*IN PULONG  Key  OPTIONAL */
+			 );
     if (!NT_SUCCESS (status))
-        return 0;
+	return 0;
     f->offset += IoStatusBlock.Information;
     return IoStatusBlock.Information / size;
 }
@@ -192,24 +192,24 @@
     LARGE_INTEGER   ByteOffset;
 
     if (!f->writemode)
-        return 0;
+	return 0;
     ByteOffset.HighPart = 0;
     ByteOffset.LowPart = f->offset;
     status = ZwWriteFile( (HANDLE)f->handle,
-                          NULL,             //IN HANDLE  Event  OPTIONAL,
-                          NULL,             //  IN PIO_APC_ROUTINE  ApcRoutine  OPTIONAL,
-                          NULL,             //  IN PVOID  ApcContext  OPTIONAL,
-                          &IoStatusBlock,
-                          (void*)ptr,       //  OUT PVOID  Buffer,
-                          size * n,         //IN ULONG  Length,
-                          &ByteOffset,      //OPTIONAL,
-                          NULL              //IN PULONG  Key  OPTIONAL
-                          );
+			  NULL,             /*IN HANDLE  Event  OPTIONAL, */
+			  NULL,             /*  IN PIO_APC_ROUTINE  ApcRoutine  OPTIONAL, */
+			  NULL,             /*  IN PVOID  ApcContext  OPTIONAL, */
+			  &IoStatusBlock,
+			  (void*)ptr,       /*  OUT PVOID  Buffer, */
+			  size * n,         /*IN ULONG  Length, */
+			  &ByteOffset,      /*OPTIONAL, */
+			  NULL              /*IN PULONG  Key  OPTIONAL */
+			  );
     if (!NT_SUCCESS (status))
-        return 0;
+	return 0;
     f->offset += IoStatusBlock.Information;
     if (f->offset > f->filesize)
-        f->filesize = f->offset;
+	f->filesize = f->offset;
     return IoStatusBlock.Information / size;
 }
 
@@ -220,7 +220,7 @@
 int fflush(
     FILE *f)
 {
-    // Nothing to do here as we are not doing buffered I/O
+    /* Nothing to do here as we are not doing buffered I/O */
     (void)f;
     return 0;
 }
@@ -239,21 +239,21 @@
     IO_STATUS_BLOCK             IoStatusBlock;
 
     if (whence == 0)
-        f->offset = offset;
+	f->offset = offset;
     else if (whence == 1)
-        f->offset += offset;
+	f->offset += offset;
     else if (whence == 2)
-        f->offset = f->filesize + offset;
+	f->offset = f->filesize + offset;
     FilePosition.CurrentByteOffset.HighPart = 0;
     FilePosition.CurrentByteOffset.LowPart = f->offset;
     status = ZwSetInformationFile( (HANDLE)f->handle,
-                                   &IoStatusBlock,
-                                   &FilePosition,
-                                   sizeof(FILE_POSITION_INFORMATION),
-                                   FilePositionInformation
-                                   );
+				   &IoStatusBlock,
+				   &FilePosition,
+				   sizeof(FILE_POSITION_INFORMATION),
+				   FilePositionInformation
+				   );
     if (!NT_SUCCESS (status))
-        return -1;
+	return -1;
     return 0;
 }
 
@@ -289,19 +289,19 @@
     int     len;
     char    *cs;
 
-    // Read the entire buffer into memory (our functions are unbuffered!)
+    /* Read the entire buffer into memory (our functions are unbuffered!) */
     if ((len = fread(s,1,n,f)) == 0)
-        return NULL;
+	return NULL;
 
-    // Search for '\n' or end of string
+    /* Search for '\n' or end of string */
     if (n > len)
-        n = len;
+	n = len;
     cs = s;
     while (--n > 0) {
-        if (*cs == '\n')
-            break;
-        cs++;
-        }
+	if (*cs == '\n')
+	    break;
+	cs++;
+	}
     *cs = '\0';
     return s;
 }
@@ -328,4 +328,3 @@
     PM_free(f);
     return 0;
 }
-

diff --git a/board/MAI/bios_emulator/scitech/src/pm/ntdrv/stdlib.c b/board/MAI/bios_emulator/scitech/src/pm/ntdrv/stdlib.c
index d770513..bbf0cbf 100644
--- a/board/MAI/bios_emulator/scitech/src/pm/ntdrv/stdlib.c
+++ b/board/MAI/bios_emulator/scitech/src/pm/ntdrv/stdlib.c

@@ -54,7 +54,7 @@
 {
     void *p = PM_mallocShared(nelem * size);
     if (p)
-        memset(p,0,nelem * size);
+	memset(p,0,nelem * size);
     return p;
 }
 
@@ -68,9 +68,9 @@
 {
     void *p = PM_mallocShared(size);
     if (p) {
-        memcpy(p,ptr,size);
-        PM_freeShared(ptr);
-        }
+	memcpy(p,ptr,size);
+	PM_freeShared(ptr);
+	}
     return p;
 }
 
@@ -102,21 +102,21 @@
     ANSI_STRING     ansiStr;
     UNICODE_STRING  *uniStr;
 
-    // Allocate memory for the string structure
+    /* Allocate memory for the string structure */
     if ((uniStr = ExAllocatePool(NonPagedPool, sizeof(UNICODE_STRING))) == NULL)
-        return NULL;
+	return NULL;
 
-    // Allocate memory for the wide string itself
+    /* Allocate memory for the wide string itself */
     length = (strlen(cstr) * sizeof(WCHAR)) + sizeof(WCHAR);
     if ((uniStr->Buffer = ExAllocatePool(NonPagedPool, length)) == NULL) {
-        ExFreePool(uniStr);
-        return NULL;
-        }
+	ExFreePool(uniStr);
+	return NULL;
+	}
     RtlZeroMemory(uniStr->Buffer, length);
     uniStr->Length = 0;
     uniStr->MaximumLength = (USHORT)length;
 
-    // Convert filename string to ansi string and then to UniCode string
+    /* Convert filename string to ansi string and then to UniCode string */
     RtlInitAnsiString(&ansiStr, cstr);
     RtlAnsiStringToUnicodeString(uniStr, &ansiStr, FALSE);
     return uniStr;
@@ -133,8 +133,7 @@
     UNICODE_STRING *uniStr)
 {
     if (uniStr) {
-        ExFreePool(uniStr->Buffer);
-        ExFreePool(uniStr);
-        }
+	ExFreePool(uniStr->Buffer);
+	ExFreePool(uniStr);
+	}
 }
-

diff --git a/board/MAI/bios_emulator/scitech/src/pm/ntdrv/ztimer.c b/board/MAI/bios_emulator/scitech/src/pm/ntdrv/ztimer.c
index ef27294..f4c4bd4 100644
--- a/board/MAI/bios_emulator/scitech/src/pm/ntdrv/ztimer.c
+++ b/board/MAI/bios_emulator/scitech/src/pm/ntdrv/ztimer.c

@@ -121,4 +121,3 @@
 ****************************************************************************/
 ulong __ULZElapsedTime(ulong start,ulong finish)
 { return finish - start; }
-

diff --git a/board/MAI/bios_emulator/scitech/src/pm/os2/event.c b/board/MAI/bios_emulator/scitech/src/pm/os2/event.c
index 706e84d..91cc19b 100644
--- a/board/MAI/bios_emulator/scitech/src/pm/os2/event.c
+++ b/board/MAI/bios_emulator/scitech/src/pm/os2/event.c

@@ -87,8 +87,8 @@
 static int MickeyToPixel(
     int mickey)
 {
-    // TODO: We can add some code in here to handle 'acceleration' for
-    //       the mouse cursor. For now just use the mickeys.
+    /* TODO: We can add some code in here to handle 'acceleration' for */
+    /*       the mouse cursor. For now just use the mickeys. */
     return mickey;
 }
 
@@ -116,196 +116,196 @@
 
     /* Pump all keyboard messages from our circular buffer */
     for (;;) {
-        /* Check that the monitor thread is still running */
-        if (!bMonRunning)
-            PM_fatalError("Keyboard monitor thread died!");
+	/* Check that the monitor thread is still running */
+	if (!bMonRunning)
+	    PM_fatalError("Keyboard monitor thread died!");
 
-        /* Protect keypacket buffer with mutex */
-        DosRequestMutexSem(hmtxKeyBuf, SEM_INDEFINITE_WAIT);
-        if (kpHead == kpTail) {
-            DosReleaseMutexSem(hmtxKeyBuf);
-            break;
-            }
+	/* Protect keypacket buffer with mutex */
+	DosRequestMutexSem(hmtxKeyBuf, SEM_INDEFINITE_WAIT);
+	if (kpHead == kpTail) {
+	    DosReleaseMutexSem(hmtxKeyBuf);
+	    break;
+	    }
 
-        noInput = FALSE;
+	noInput = FALSE;
 
-        /* Read packet from circular buffer and remove it */
-        memcpy(&kp, &keyMonPkts[kpTail], sizeof(KEYPACKET));
-        if (++kpTail == KEYBUFSIZE)
-            kpTail = 0;
-        DosReleaseMutexSem(hmtxKeyBuf);
+	/* Read packet from circular buffer and remove it */
+	memcpy(&kp, &keyMonPkts[kpTail], sizeof(KEYPACKET));
+	if (++kpTail == KEYBUFSIZE)
+	    kpTail = 0;
+	DosReleaseMutexSem(hmtxKeyBuf);
 
-        /* Compensate for the 0xE0 character */
-        if (kp.XlatedScan && kp.XlatedChar == 0xE0)
-            kp.XlatedChar = 0;
+	/* Compensate for the 0xE0 character */
+	if (kp.XlatedScan && kp.XlatedChar == 0xE0)
+	    kp.XlatedChar = 0;
 
-        /* Determine type of keyboard event */
-        memset(&evt,0,sizeof(evt));
-        if (kp.KbdDDFlagWord & KEY_RELEASE)
-            evt.what = EVT_KEYUP;
-        else
-            evt.what = EVT_KEYDOWN;
+	/* Determine type of keyboard event */
+	memset(&evt,0,sizeof(evt));
+	if (kp.KbdDDFlagWord & KEY_RELEASE)
+	    evt.what = EVT_KEYUP;
+	else
+	    evt.what = EVT_KEYDOWN;
 
-        /* Convert keyboard codes */
-        scan = kp.MonFlagWord >> 8;
-        if (evt.what == EVT_KEYUP) {
-            /* Get message for keyup code from table of cached down values */
-            evt.message = keyUpMsg[scan];
-            keyUpMsg[scan] = 0;
-            oldKeyMessage = -1;
-            }
-        else {
-            evt.message = ((ulong)scan << 8) | kp.XlatedChar;
-            if (evt.message == keyUpMsg[scan]) {
-                evt.what = EVT_KEYREPEAT;
-                evt.message |= 0x10000;
-                }
-            oldKeyMessage = evt.message & 0x0FFFF;
-            keyUpMsg[scan] = (ushort)evt.message;
-            }
+	/* Convert keyboard codes */
+	scan = kp.MonFlagWord >> 8;
+	if (evt.what == EVT_KEYUP) {
+	    /* Get message for keyup code from table of cached down values */
+	    evt.message = keyUpMsg[scan];
+	    keyUpMsg[scan] = 0;
+	    oldKeyMessage = -1;
+	    }
+	else {
+	    evt.message = ((ulong)scan << 8) | kp.XlatedChar;
+	    if (evt.message == keyUpMsg[scan]) {
+		evt.what = EVT_KEYREPEAT;
+		evt.message |= 0x10000;
+		}
+	    oldKeyMessage = evt.message & 0x0FFFF;
+	    keyUpMsg[scan] = (ushort)evt.message;
+	    }
 
-         /* Convert shift state modifiers */
-         if (kp.u.ShiftState & 0x0001)
-             evt.modifiers |= EVT_RIGHTSHIFT;
-         if (kp.u.ShiftState & 0x0002)
-             evt.modifiers |= EVT_LEFTSHIFT;
-         if (kp.u.ShiftState & 0x0100)
-             evt.modifiers |= EVT_LEFTCTRL;
-         if (kp.u.ShiftState & 0x0200)
-             evt.modifiers |= EVT_LEFTALT;
-         if (kp.u.ShiftState & 0x0400)
-             evt.modifiers |= EVT_RIGHTCTRL;
-         if (kp.u.ShiftState & 0x0800)
-             evt.modifiers |= EVT_RIGHTALT;
-         EVT.oldMove = -1;
+	 /* Convert shift state modifiers */
+	 if (kp.u.ShiftState & 0x0001)
+	     evt.modifiers |= EVT_RIGHTSHIFT;
+	 if (kp.u.ShiftState & 0x0002)
+	     evt.modifiers |= EVT_LEFTSHIFT;
+	 if (kp.u.ShiftState & 0x0100)
+	     evt.modifiers |= EVT_LEFTCTRL;
+	 if (kp.u.ShiftState & 0x0200)
+	     evt.modifiers |= EVT_LEFTALT;
+	 if (kp.u.ShiftState & 0x0400)
+	     evt.modifiers |= EVT_RIGHTCTRL;
+	 if (kp.u.ShiftState & 0x0800)
+	     evt.modifiers |= EVT_RIGHTALT;
+	 EVT.oldMove = -1;
 
-         /* Add time stamp and add the event to the queue */
-         evt.when = key.time;
-         if (EVT.count < EVENTQSIZE)
-             addEvent(&evt);
-         }
+	 /* Add time stamp and add the event to the queue */
+	 evt.when = key.time;
+	 if (EVT.count < EVENTQSIZE)
+	     addEvent(&evt);
+	 }
 
     /* Don't just flush because that terminally confuses the monitor */
     do {
-        KbdCharIn(&key, IO_NOWAIT, 0);
-        } while (key.fbStatus & KBDTRF_FINAL_CHAR_IN);
+	KbdCharIn(&key, IO_NOWAIT, 0);
+	} while (key.fbStatus & KBDTRF_FINAL_CHAR_IN);
 
     /* Pump all mouse messages */
     KbdGetStatus(&keyInfo,0);
     /* Check return code - mouse may not be operational!! */
     if (MouGetNumQueEl(&mqueue,_EVT_hMouse) == NO_ERROR) {
-        while (mqueue.cEvents) {
-            while (mqueue.cEvents--) {
-                memset(&evt,0,sizeof(evt));
-                mWait = MOU_NOWAIT;
-                MouReadEventQue(&mouse,&mWait,_EVT_hMouse);
+	while (mqueue.cEvents) {
+	    while (mqueue.cEvents--) {
+		memset(&evt,0,sizeof(evt));
+		mWait = MOU_NOWAIT;
+		MouReadEventQue(&mouse,&mWait,_EVT_hMouse);
 
-                /* Update the mouse position. We get the mouse coordinates
-                 * in mickeys so we have to translate these into pixels and
-                 * move our mouse position. If we don't do this, OS/2 gives
-                 * us the coordinates in character positions since it still
-                 * thinks we are in text mode!
-                 */
-                EVT.mx += MickeyToPixel(mouse.col);
-                EVT.my += MickeyToPixel(mouse.row);
-                if (EVT.mx < 0) EVT.mx = 0;
-                if (EVT.my < 0) EVT.my = 0;
-                if (EVT.mx > rangeX)    EVT.mx = rangeX;
-                if (EVT.my > rangeY)    EVT.my = rangeY;
-                evt.where_x = EVT.mx;
-                evt.where_y = EVT.my;
-                evt.relative_x = mouse.col;
-                evt.relative_y = mouse.row;
-                evt.when = key.time;
-                if (mouse.fs & (MOUSE_BN1_DOWN | MOUSE_MOTION_WITH_BN1_DOWN))
-                    evt.modifiers |= EVT_LEFTBUT;
-                if (mouse.fs & (MOUSE_BN2_DOWN | MOUSE_MOTION_WITH_BN2_DOWN))
-                    evt.modifiers |= EVT_RIGHTBUT;
-                if (mouse.fs & (MOUSE_BN3_DOWN | MOUSE_MOTION_WITH_BN3_DOWN))
-                    evt.modifiers |= EVT_MIDDLEBUT;
-                if (keyInfo.fsState & 0x0001)
-                    evt.modifiers |= EVT_RIGHTSHIFT;
-                if (keyInfo.fsState & 0x0002)
-                    evt.modifiers |= EVT_LEFTSHIFT;
-                if (keyInfo.fsState & 0x0100)
-                    evt.modifiers |= EVT_LEFTCTRL;
-                if (keyInfo.fsState & 0x0200)
-                    evt.modifiers |= EVT_LEFTALT;
-                if (keyInfo.fsState & 0x0400)
-                    evt.modifiers |= EVT_RIGHTCTRL;
-                if (keyInfo.fsState & 0x0800)
-                    evt.modifiers |= EVT_RIGHTALT;
+		/* Update the mouse position. We get the mouse coordinates
+		 * in mickeys so we have to translate these into pixels and
+		 * move our mouse position. If we don't do this, OS/2 gives
+		 * us the coordinates in character positions since it still
+		 * thinks we are in text mode!
+		 */
+		EVT.mx += MickeyToPixel(mouse.col);
+		EVT.my += MickeyToPixel(mouse.row);
+		if (EVT.mx < 0) EVT.mx = 0;
+		if (EVT.my < 0) EVT.my = 0;
+		if (EVT.mx > rangeX)    EVT.mx = rangeX;
+		if (EVT.my > rangeY)    EVT.my = rangeY;
+		evt.where_x = EVT.mx;
+		evt.where_y = EVT.my;
+		evt.relative_x = mouse.col;
+		evt.relative_y = mouse.row;
+		evt.when = key.time;
+		if (mouse.fs & (MOUSE_BN1_DOWN | MOUSE_MOTION_WITH_BN1_DOWN))
+		    evt.modifiers |= EVT_LEFTBUT;
+		if (mouse.fs & (MOUSE_BN2_DOWN | MOUSE_MOTION_WITH_BN2_DOWN))
+		    evt.modifiers |= EVT_RIGHTBUT;
+		if (mouse.fs & (MOUSE_BN3_DOWN | MOUSE_MOTION_WITH_BN3_DOWN))
+		    evt.modifiers |= EVT_MIDDLEBUT;
+		if (keyInfo.fsState & 0x0001)
+		    evt.modifiers |= EVT_RIGHTSHIFT;
+		if (keyInfo.fsState & 0x0002)
+		    evt.modifiers |= EVT_LEFTSHIFT;
+		if (keyInfo.fsState & 0x0100)
+		    evt.modifiers |= EVT_LEFTCTRL;
+		if (keyInfo.fsState & 0x0200)
+		    evt.modifiers |= EVT_LEFTALT;
+		if (keyInfo.fsState & 0x0400)
+		    evt.modifiers |= EVT_RIGHTCTRL;
+		if (keyInfo.fsState & 0x0800)
+		    evt.modifiers |= EVT_RIGHTALT;
 
-                /* Check for left mouse click events */
-                /* 0x06 == (MOUSE_BN1_DOWN | MOUSE_MOTION_WITH_BN1_DOWN) */
-                if (((mouse.fs & 0x0006) && !(oldMouseState & 0x0006))
-                        || (!(mouse.fs & 0x0006) && (oldMouseState & 0x0006))) {
-                    if (mouse.fs & 0x0006)
-                        evt.what = EVT_MOUSEDOWN;
-                    else
-                        evt.what = EVT_MOUSEUP;
-                    evt.message = EVT_LEFTBMASK;
-                    EVT.oldMove = -1;
-                    if (EVT.count < EVENTQSIZE)
-                        addEvent(&evt);
-                    }
+		/* Check for left mouse click events */
+		/* 0x06 == (MOUSE_BN1_DOWN | MOUSE_MOTION_WITH_BN1_DOWN) */
+		if (((mouse.fs & 0x0006) && !(oldMouseState & 0x0006))
+			|| (!(mouse.fs & 0x0006) && (oldMouseState & 0x0006))) {
+		    if (mouse.fs & 0x0006)
+			evt.what = EVT_MOUSEDOWN;
+		    else
+			evt.what = EVT_MOUSEUP;
+		    evt.message = EVT_LEFTBMASK;
+		    EVT.oldMove = -1;
+		    if (EVT.count < EVENTQSIZE)
+			addEvent(&evt);
+		    }
 
-                /* Check for right mouse click events */
-                /* 0x0018 == (MOUSE_BN2_DOWN | MOUSE_MOTION_WITH_BN2_DOWN) */
-                if (((mouse.fs & 0x0018) && !(oldMouseState & 0x0018))
-                        || (!(mouse.fs & 0x0018) && (oldMouseState & 0x0018))) {
-                    if (mouse.fs & 0x0018)
-                        evt.what = EVT_MOUSEDOWN;
-                    else
-                        evt.what = EVT_MOUSEUP;
-                    evt.message = EVT_RIGHTBMASK;
-                    EVT.oldMove = -1;
-                    if (EVT.count < EVENTQSIZE)
-                        addEvent(&evt);
-                    }
+		/* Check for right mouse click events */
+		/* 0x0018 == (MOUSE_BN2_DOWN | MOUSE_MOTION_WITH_BN2_DOWN) */
+		if (((mouse.fs & 0x0018) && !(oldMouseState & 0x0018))
+			|| (!(mouse.fs & 0x0018) && (oldMouseState & 0x0018))) {
+		    if (mouse.fs & 0x0018)
+			evt.what = EVT_MOUSEDOWN;
+		    else
+			evt.what = EVT_MOUSEUP;
+		    evt.message = EVT_RIGHTBMASK;
+		    EVT.oldMove = -1;
+		    if (EVT.count < EVENTQSIZE)
+			addEvent(&evt);
+		    }
 
-                /* Check for middle mouse click events */
-                /* 0x0060 == (MOUSE_BN3_DOWN | MOUSE_MOTION_WITH_BN3_DOWN) */
-                if (((mouse.fs & 0x0060) && !(oldMouseState & 0x0060))
-                        || (!(mouse.fs & 0x0060) && (oldMouseState & 0x0060))) {
-                    if (mouse.fs & 0x0060)
-                        evt.what = EVT_MOUSEDOWN;
-                    else
-                        evt.what = EVT_MOUSEUP;
-                    evt.message = EVT_MIDDLEBMASK;
-                    EVT.oldMove = -1;
-                    if (EVT.count < EVENTQSIZE)
-                        addEvent(&evt);
-                    }
+		/* Check for middle mouse click events */
+		/* 0x0060 == (MOUSE_BN3_DOWN | MOUSE_MOTION_WITH_BN3_DOWN) */
+		if (((mouse.fs & 0x0060) && !(oldMouseState & 0x0060))
+			|| (!(mouse.fs & 0x0060) && (oldMouseState & 0x0060))) {
+		    if (mouse.fs & 0x0060)
+			evt.what = EVT_MOUSEDOWN;
+		    else
+			evt.what = EVT_MOUSEUP;
+		    evt.message = EVT_MIDDLEBMASK;
+		    EVT.oldMove = -1;
+		    if (EVT.count < EVENTQSIZE)
+			addEvent(&evt);
+		    }
 
-                /* Check for mouse movement event */
-                if (mouse.fs & 0x002B) {
-                    evt.what = EVT_MOUSEMOVE;
-                    if (EVT.oldMove != -1) {
-                        EVT.evtq[EVT.oldMove].where_x = evt.where_x;/* Modify existing one  */
-                        EVT.evtq[EVT.oldMove].where_y = evt.where_y;
-                        }
-                    else {
-                        EVT.oldMove = EVT.freeHead; /* Save id of this move event   */
-                        if (EVT.count < EVENTQSIZE)
-                            addEvent(&evt);
-                        }
-                    }
+		/* Check for mouse movement event */
+		if (mouse.fs & 0x002B) {
+		    evt.what = EVT_MOUSEMOVE;
+		    if (EVT.oldMove != -1) {
+			EVT.evtq[EVT.oldMove].where_x = evt.where_x;/* Modify existing one  */
+			EVT.evtq[EVT.oldMove].where_y = evt.where_y;
+			}
+		    else {
+			EVT.oldMove = EVT.freeHead; /* Save id of this move event   */
+			if (EVT.count < EVENTQSIZE)
+			    addEvent(&evt);
+			}
+		    }
 
-                /* Save current mouse state */
-                oldMouseState = mouse.fs;
-                }
-            MouGetNumQueEl(&mqueue,_EVT_hMouse);
-            }
-            noInput = FALSE;
-        }
+		/* Save current mouse state */
+		oldMouseState = mouse.fs;
+		}
+	    MouGetNumQueEl(&mqueue,_EVT_hMouse);
+	    }
+	    noInput = FALSE;
+	}
 
     /* If there was no input available, give up the current timeslice
      * Note: DosSleep(0) will effectively do nothing if no other thread is ready. Hence
      * DosSleep(0) will still use 100% CPU _but_ should not interfere with other programs.
      */
     if (noInput)
-        DosSleep(0);
+	DosSleep(0);
 }
 
 /****************************************************************************
@@ -341,78 +341,78 @@
 
     /* Register the buffers to be used for monitoring for current session */
     if (DosMonReg(_EVT_hKbdMon, &monInbuf, (ULONG*)&monOutbuf,MONITOR_END, -1)) {
-        DosPostEventSem(hevStart);  /* unblock the main thread */
-        return;
-        }
+	DosPostEventSem(hevStart);  /* unblock the main thread */
+	return;
+	}
 
     /* Unblock the main thread and tell it we're OK*/
     bMonRunning = TRUE;
     DosPostEventSem(hevStart);
     while (bMonRunning) {  /* Start an endless loop */
-        /* Read data from keyboard driver */
-        rc = DosMonRead((PBYTE)&monInbuf, IO_WAIT, (PBYTE)&kp, (PUSHORT)&count);
-        if (rc) {
+	/* Read data from keyboard driver */
+	rc = DosMonRead((PBYTE)&monInbuf, IO_WAIT, (PBYTE)&kp, (PUSHORT)&count);
+	if (rc) {
 #ifdef CHECKED
-            if (bMonRunning)
-                printf("Error in DosMonRead, rc = %ld\n", rc);
+	    if (bMonRunning)
+		printf("Error in DosMonRead, rc = %ld\n", rc);
 #endif
-            bMonRunning = FALSE;
-            return;
-            }
+	    bMonRunning = FALSE;
+	    return;
+	    }
 
-        /* Pass FLUSH packets immediately */
-        if (kp.MonFlagWord & 4) {
+	/* Pass FLUSH packets immediately */
+	if (kp.MonFlagWord & 4) {
 #ifdef CHECKED
-            printf("Flush packet!\n");
+	    printf("Flush packet!\n");
 #endif
-            DosMonWrite((PBYTE)&monOutbuf, (PBYTE)&kp, count);
-            continue;
-            }
+	    DosMonWrite((PBYTE)&monOutbuf, (PBYTE)&kp, count);
+	    continue;
+	    }
 
-        //TODO: to be removed
-        /* Skip extended scancodes & some others */
-        if (((kp.MonFlagWord >> 8) == 0xE0) || ((kp.KbdDDFlagWord & 0x0F) == 0x0F)) {
-            DosMonWrite((PBYTE)&monOutbuf, (PBYTE)&kp, count);
-            continue;
-            }
+	/*TODO: to be removed */
+	/* Skip extended scancodes & some others */
+	if (((kp.MonFlagWord >> 8) == 0xE0) || ((kp.KbdDDFlagWord & 0x0F) == 0x0F)) {
+	    DosMonWrite((PBYTE)&monOutbuf, (PBYTE)&kp, count);
+	    continue;
+	    }
 
-//      printf("RawScan = %X, XlatedScan = %X, fbStatus = %X, KbdDDFlags = %X\n",
-//          kp.MonFlagWord >> 8, kp.XlatedScan, kp.u.ShiftState, kp.KbdDDFlagWord);
+/*      printf("RawScan = %X, XlatedScan = %X, fbStatus = %X, KbdDDFlags = %X\n", */
+/*          kp.MonFlagWord >> 8, kp.XlatedScan, kp.u.ShiftState, kp.KbdDDFlagWord); */
 
-        /* Protect access to buffer with mutex semaphore */
-        rc = DosRequestMutexSem(hmtxKeyBuf, 1000);
-        if (rc) {
+	/* Protect access to buffer with mutex semaphore */
+	rc = DosRequestMutexSem(hmtxKeyBuf, 1000);
+	if (rc) {
 #ifdef CHECKED
-            printf("Can't get access to mutex, rc = %ld\n", rc);
+	    printf("Can't get access to mutex, rc = %ld\n", rc);
 #endif
-            bMonRunning = FALSE;
-            return;
-            }
+	    bMonRunning = FALSE;
+	    return;
+	    }
 
-        /* Store packet in circular buffer, drop it if it's full */
-        kpNew = kpHead + 1;
-        if (kpNew == KEYBUFSIZE)
-            kpNew = 0;
-        if (kpNew != kpTail) {
-            memcpy(&keyMonPkts[kpHead], &kp, sizeof(KEYPACKET));
-            // TODO: fix this!
-            /* Convert break to make code */
-            keyMonPkts[kpHead].MonFlagWord &= 0x7FFF;
-            kpHead = kpNew;
-            }
-        DosReleaseMutexSem(hmtxKeyBuf);
+	/* Store packet in circular buffer, drop it if it's full */
+	kpNew = kpHead + 1;
+	if (kpNew == KEYBUFSIZE)
+	    kpNew = 0;
+	if (kpNew != kpTail) {
+	    memcpy(&keyMonPkts[kpHead], &kp, sizeof(KEYPACKET));
+	    /* TODO: fix this! */
+	    /* Convert break to make code */
+	    keyMonPkts[kpHead].MonFlagWord &= 0x7FFF;
+	    kpHead = kpNew;
+	    }
+	DosReleaseMutexSem(hmtxKeyBuf);
 
-        /* Finally write the packet */
-        rc = DosMonWrite((PBYTE)&monOutbuf, (PBYTE)&kp, count);
-        if (rc) {
+	/* Finally write the packet */
+	rc = DosMonWrite((PBYTE)&monOutbuf, (PBYTE)&kp, count);
+	if (rc) {
 #ifdef CHECKED
-            if (bMonRunning)
-                printf("Error in DosMonWrite, rc = %ld\n", rc);
+	    if (bMonRunning)
+		printf("Error in DosMonWrite, rc = %ld\n", rc);
 #endif
-            bMonRunning = FALSE;
-            return;
-            }
-        }
+	    bMonRunning = FALSE;
+	    return;
+	    }
+	}
     (void)params;
 }
 
@@ -461,15 +461,15 @@
 
     /* Open the keyboard monitor  */
     if (DosMonOpen((PSZ)"KBD$", &_EVT_hKbdMon))
-        PM_fatalError("Unable to open keyboard monitor!");
+	PM_fatalError("Unable to open keyboard monitor!");
 
     /* Create event semaphore, the monitor will post it when it's initalized */
     if (DosCreateEventSem(NULL, &hevStart, 0, FALSE))
-        PM_fatalError("Unable to create event semaphore!");
+	PM_fatalError("Unable to create event semaphore!");
 
     /* Create mutex semaphore protecting the keypacket buffer */
     if (DosCreateMutexSem(NULL, &hmtxKeyBuf, 0, FALSE))
-        PM_fatalError("Unable to create mutex semaphore!");
+	PM_fatalError("Unable to create mutex semaphore!");
 
     /* Start keyboard monitor thread, use 32K stack */
     kbdMonTID = _beginthread(_kbdMonThread, NULL, 0x8000, NULL);
@@ -478,9 +478,9 @@
     /* Give the thread one second */
     DosWaitEventSem(hevStart, 1000);
     if (!bMonRunning) {  /* Check the thread is OK */
-        DosMonClose(_EVT_hKbdMon);
-        PM_fatalError("Keyboard monitor thread didn't initialize!");
-        }
+	DosMonClose(_EVT_hKbdMon);
+	PM_fatalError("Keyboard monitor thread didn't initialize!");
+	}
 
     /* Catch program termination signals so we can clean up properly */
     signal(SIGABRT, _EVT_abort);
@@ -517,7 +517,7 @@
 ****************************************************************************/
 void EVT_resume(void)
 {
-    // Do nothing for OS/2
+    /* Do nothing for OS/2 */
 }
 
 /****************************************************************************
@@ -527,7 +527,7 @@
 ****************************************************************************/
 void EVT_suspend(void)
 {
-    // Do nothing for OS/2
+    /* Do nothing for OS/2 */
 }
 
 /****************************************************************************
@@ -551,16 +551,15 @@
     rc = DosKillThread(kbdMonTID);
 #ifdef CHECKED
     if (rc)
-        printf("DosKillThread failed, rc = %ld\n", rc);
+	printf("DosKillThread failed, rc = %ld\n", rc);
 #endif
     rc = DosMonClose(_EVT_hKbdMon);
 #ifdef CHECKED
     if (rc) {
-        printf("DosMonClose failed, rc = %ld\n", rc);
-        }
+	printf("DosMonClose failed, rc = %ld\n", rc);
+	}
 #endif
     DosCloseEventSem(hevStart);
     DosCloseMutexSem(hmtxKeyBuf);
     KbdFlushBuffer(0);
 }
-

diff --git a/board/MAI/bios_emulator/scitech/src/pm/os2/mon.h b/board/MAI/bios_emulator/scitech/src/pm/os2/mon.h
index 52f12f0..28d39fb 100644
--- a/board/MAI/bios_emulator/scitech/src/pm/os2/mon.h
+++ b/board/MAI/bios_emulator/scitech/src/pm/os2/mon.h

@@ -63,55 +63,55 @@
   USHORT  KbdDDFlagWord;
 } MLNPACKET;
 
-// DBCSStatus
+/* DBCSStatus */
 
-#define SF_SHIFTS              1  // If set to 1, shift status returned without a character
-#define SF_NOTCHAR             2  // 0 - Scan code is a character
-                                  // 1 - Scan code is not a character;
-                                  //     instead it is an extended key code from the keyboard.
-#define SF_IMMEDIATE          32  // If set to 1, immediate conversion requested
-#define SF_TYPEMASK          192  // Has the following values:
-                                  // 00 - Undefined
-                                  // 01 - Final character; interim character flag is turned off
-                                  // 10 - Interim character
-                                  // 11 - Final character; interim character flag is turned on.
-// MonFlagWord
+#define SF_SHIFTS              1  /* If set to 1, shift status returned without a character */
+#define SF_NOTCHAR             2  /* 0 - Scan code is a character */
+				  /* 1 - Scan code is not a character; */
+				  /*     instead it is an extended key code from the keyboard. */
+#define SF_IMMEDIATE          32  /* If set to 1, immediate conversion requested */
+#define SF_TYPEMASK          192  /* Has the following values: */
+				  /* 00 - Undefined */
+				  /* 01 - Final character; interim character flag is turned off */
+				  /* 10 - Interim character */
+				  /* 11 - Final character; interim character flag is turned on. */
+/* MonFlagWord */
 
-#define MF_OPEN                1  // open
-#define MF_CLOSE               2  // close
-#define MF_FLUSH               4  // is flush packet
+#define MF_OPEN                1  /* open */
+#define MF_CLOSE               2  /* close */
+#define MF_FLUSH               4  /* is flush packet */
 
-// KbdDDFlagWord
+/* KbdDDFlagWord */
 
-#define KF_NOTSQPACKET      1024  // Don't put this packet in SQ buffer
-#define KF_ACCENTEDKEY       512  // Key was translated using previous accent.
-#define KF_MULTIMAKE         256  // Key was repeated make of a toggle key.
-#define KF_SECONDARYKEY      128  // Previous scan code was the E0 prefix code.
-#define KF_KEYBREAK           64  // This is the break of the key.
-#define KF_KEYTYPEMASK        63  // Isolates the Key Type field of DDFlags.
-#define KF_UNDEFKEY           63  // Key packet is undefined
-#define KF_SYSREQKEY          23  // This key packet is the SysReq key (4990)
-#define KF_PRINTFLUSHKEY      22  // This packet is Ct-Alt-PrtScr
-#define KF_PSPRINTECHOKEY     21  // This packet is Ctl-P
-#define KF_PRINTECHOKEY       20  // This packet is Ctl-PrtScr
-#define KF_PRTSCRKEY          19  // This packet is PrtScr
-#define KF_PSBREAKKEY         18  // This packet is Ctl-C
-#define KF_BREAKKEY           17  // This packet is Ctl-Break
-#define KF_ACCENTKEY          16  // This packet is an accent key
-#define KF_XRORPNOT           13  // This packet is a Read or Peek Notification Pct.
-#define KF_MLNOTIFICATION     14  // packet is a Multi-Layer NLS packet
-#define KF_HOTKEYPACKET       12  // This packet is the hot key.
-#define KF_BADKEYCOMBO        11  // Accent/char combo undefined, beep only.
-#define KF_WAKEUPKEY          10  // This packet is one following PAUSEKEY
-#define KF_PSPAUSEKEY          9  // This packet is Ctl-S
-#define KF_PAUSEKEY            8  // This packet is Ctl-Numlock or PAUSE
-#define KF_SHIFTMASK           7  // Key is a shift Key
-#define KF_DUMPKEY             6  // This packet is Ctl-Numlock-NumLock
-#define KF_REBOOTKEY           5  // This packet is Ctl-Alt-Del
-#define KF_RESENDCODE          4  // This packet is resend code from controller
-#define KF_OVERRUNCODE         3  // This packet is overrun code from controller
-#define KF_SECPREFIXCODE       2  // This packet is E0/E1 scan code
-#define KF_ACKCODE             1  // This packet is ack code from keyboard
+#define KF_NOTSQPACKET      1024  /* Don't put this packet in SQ buffer */
+#define KF_ACCENTEDKEY       512  /* Key was translated using previous accent. */
+#define KF_MULTIMAKE         256  /* Key was repeated make of a toggle key. */
+#define KF_SECONDARYKEY      128  /* Previous scan code was the E0 prefix code. */
+#define KF_KEYBREAK           64  /* This is the break of the key. */
+#define KF_KEYTYPEMASK        63  /* Isolates the Key Type field of DDFlags. */
+#define KF_UNDEFKEY           63  /* Key packet is undefined */
+#define KF_SYSREQKEY          23  /* This key packet is the SysReq key (4990) */
+#define KF_PRINTFLUSHKEY      22  /* This packet is Ct-Alt-PrtScr */
+#define KF_PSPRINTECHOKEY     21  /* This packet is Ctl-P */
+#define KF_PRINTECHOKEY       20  /* This packet is Ctl-PrtScr */
+#define KF_PRTSCRKEY          19  /* This packet is PrtScr */
+#define KF_PSBREAKKEY         18  /* This packet is Ctl-C */
+#define KF_BREAKKEY           17  /* This packet is Ctl-Break */
+#define KF_ACCENTKEY          16  /* This packet is an accent key */
+#define KF_XRORPNOT           13  /* This packet is a Read or Peek Notification Pct. */
+#define KF_MLNOTIFICATION     14  /* packet is a Multi-Layer NLS packet */
+#define KF_HOTKEYPACKET       12  /* This packet is the hot key. */
+#define KF_BADKEYCOMBO        11  /* Accent/char combo undefined, beep only. */
+#define KF_WAKEUPKEY          10  /* This packet is one following PAUSEKEY */
+#define KF_PSPAUSEKEY          9  /* This packet is Ctl-S */
+#define KF_PAUSEKEY            8  /* This packet is Ctl-Numlock or PAUSE */
+#define KF_SHIFTMASK           7  /* Key is a shift Key */
+#define KF_DUMPKEY             6  /* This packet is Ctl-Numlock-NumLock */
+#define KF_REBOOTKEY           5  /* This packet is Ctl-Alt-Del */
+#define KF_RESENDCODE          4  /* This packet is resend code from controller */
+#define KF_OVERRUNCODE         3  /* This packet is overrun code from controller */
+#define KF_SECPREFIXCODE       2  /* This packet is E0/E1 scan code */
+#define KF_ACKCODE             1  /* This packet is ack code from keyboard */
 
 
 typedef struct _MONBUF {
@@ -120,29 +120,29 @@
   BYTE      Reserved[20];
 } MONBUF;
 
-#define RS_SYSREG      32768  // Bit 15  SysReq key down
-#define RS_CAPSLOCK    16384  // Bit 14  Caps Lock key down
-#define RS_NUMLOCK      8192  // Bit 13  NumLock key down
-#define RS_SCROLLLOCK   4096  // Bit 12  Scroll Lock key down
-#define RS_RALT         2048  // Bit 11  Right Alt key down
-#define RS_RCONTROL     1024  // Bit 10  Right Ctrl key down
-#define RS_LALT          512  // Bit  9  Left Alt key down
-#define RS_LCONTROL      256  // Bit  8  Left Ctrl key down
-#define RS_INSERT        128  // Bit  7  Insert on
-#define RS_CAPS           64  // Bit  6  Caps Lock on
-#define RS_NUM            32  // Bit  5  NumLock on
-#define RS_SCROLL         16  // Bit  4  Scroll Lock on
-#define RS_ALT             8  // Bit  3  Either Alt key down
-#define RS_CONTROL         4  // Bit  2  Either Ctrl key down
-#define RS_LSHIFT          2  // Bit  1  Left Shift key down
-#define RS_RSHIFT          1  // Bit  0  Right Shift key down
+#define RS_SYSREG      32768  /* Bit 15  SysReq key down */
+#define RS_CAPSLOCK    16384  /* Bit 14  Caps Lock key down */
+#define RS_NUMLOCK      8192  /* Bit 13  NumLock key down */
+#define RS_SCROLLLOCK   4096  /* Bit 12  Scroll Lock key down */
+#define RS_RALT         2048  /* Bit 11  Right Alt key down */
+#define RS_RCONTROL     1024  /* Bit 10  Right Ctrl key down */
+#define RS_LALT          512  /* Bit  9  Left Alt key down */
+#define RS_LCONTROL      256  /* Bit  8  Left Ctrl key down */
+#define RS_INSERT        128  /* Bit  7  Insert on */
+#define RS_CAPS           64  /* Bit  6  Caps Lock on */
+#define RS_NUM            32  /* Bit  5  NumLock on */
+#define RS_SCROLL         16  /* Bit  4  Scroll Lock on */
+#define RS_ALT             8  /* Bit  3  Either Alt key down */
+#define RS_CONTROL         4  /* Bit  2  Either Ctrl key down */
+#define RS_LSHIFT          2  /* Bit  1  Left Shift key down */
+#define RS_RSHIFT          1  /* Bit  0  Right Shift key down */
 
 
-#define CS_RCONTROL     91    // Right Control
-#define CS_LSHIFT       42    // Left Shift
-#define CS_RSHIFT       54    // Right Shift
-#define CS_LALT         56    // Left Alt
-#define CS_RALT         94    // Right Alt
+#define CS_RCONTROL     91    /* Right Control */
+#define CS_LSHIFT       42    /* Left Shift */
+#define CS_RSHIFT       54    /* Right Shift */
+#define CS_LALT         56    /* Left Alt */
+#define CS_RALT         94    /* Right Alt */
 
 
 /* DosMon* prototypes */

diff --git a/board/MAI/bios_emulator/scitech/src/pm/os2/oshdr.h b/board/MAI/bios_emulator/scitech/src/pm/os2/oshdr.h
index ae1f97a..e7aa1c6 100644
--- a/board/MAI/bios_emulator/scitech/src/pm/os2/oshdr.h
+++ b/board/MAI/bios_emulator/scitech/src/pm/os2/oshdr.h

@@ -39,4 +39,3 @@
 #include "os2/mon.h"
 
 void __PM_checkConsoleSwitch(void);
-

diff --git a/board/MAI/bios_emulator/scitech/src/pm/os2/pm.c b/board/MAI/bios_emulator/scitech/src/pm/os2/pm.c
index 5025102..756eead 100644
--- a/board/MAI/bios_emulator/scitech/src/pm/os2/pm.c
+++ b/board/MAI/bios_emulator/scitech/src/pm/os2/pm.c

@@ -116,16 +116,16 @@
 /* PMIREQUEST_SOFTWAREINT structures from OS/2 DDK */
 
 typedef struct {
-    ULONG ulFlags;                              // VDM initialization type
-#define VDM_POSTLOAD                    0x1     // adapter just loaded, used internally for initialization
-#define VDM_INITIALIZE                  0x2     // force initialization of a permanently open VDM, even if previously initialized
-#define VDM_TERMINATE_POSTINITIALIZE    0x6     //start VDM with initialization, but close it afterwards (includes VDM_INITIALIZE)
-#define VDM_QUERY_CAPABILITY            0x10    // query the current int 10 capability
-#define VDM_FULL_VDM_CREATED            0x20    // a full VDM is created
-#define VDM_MINI_VDM_CREATED            0x40    // a mini VDM is created
-#define VDM_MINI_VDM_SUPPORTED          0x80    // mini VDM support is available
-    PCHAR szName;                               // VDM initialization program
-    PCHAR szArgs;                               // VDM initialization arguments
+    ULONG ulFlags;                              /* VDM initialization type */
+#define VDM_POSTLOAD                    0x1     /* adapter just loaded, used internally for initialization */
+#define VDM_INITIALIZE                  0x2     /* force initialization of a permanently open VDM, even if previously initialized */
+#define VDM_TERMINATE_POSTINITIALIZE    0x6     /*start VDM with initialization, but close it afterwards (includes VDM_INITIALIZE) */
+#define VDM_QUERY_CAPABILITY            0x10    /* query the current int 10 capability */
+#define VDM_FULL_VDM_CREATED            0x20    /* a full VDM is created */
+#define VDM_MINI_VDM_CREATED            0x40    /* a mini VDM is created */
+#define VDM_MINI_VDM_SUPPORTED          0x80    /* mini VDM support is available */
+    PCHAR szName;                               /* VDM initialization program */
+    PCHAR szArgs;                               /* VDM initialization arguments */
     }INITVDM;
 
 typedef struct {
@@ -218,7 +218,7 @@
     HEV             Event;          /* Posted after callback is called      */
     } SESWITCHREC;
 
-// Page sized block cache
+/* Page sized block cache */
 
 #define PAGES_PER_BLOCK     32
 #define PAGE_BLOCK_SIZE     (PAGES_PER_BLOCK * PM_PAGE_SIZE + (PM_PAGE_SIZE-1) + sizeof(pageblock))
@@ -269,29 +269,29 @@
     ulong           result;
 
     if ((rc = DosOpen(PMHELP_NAME,&hSDDHelp,&result,0,0,
-            FILE_OPEN, OPEN_SHARE_DENYNONE | OPEN_ACCESS_READWRITE,
-            NULL)) != 0) {
-        if (rc == 4) {  /* Did we run out of file handles? */
-            ULONG   ulNewFHs;
-            LONG    lAddFHs = 5;
+	    FILE_OPEN, OPEN_SHARE_DENYNONE | OPEN_ACCESS_READWRITE,
+	    NULL)) != 0) {
+	if (rc == 4) {  /* Did we run out of file handles? */
+	    ULONG   ulNewFHs;
+	    LONG    lAddFHs = 5;
 
-            if (DosSetRelMaxFH(&lAddFHs, &ulNewFHs) != 0)
-                PM_fatalError("Failed to raise the file handles limit!");
-            else {
-                if ((rc = DosOpen(PMHELP_NAME,&hSDDHelp,&result,0,0,
-                        FILE_OPEN, OPEN_SHARE_DENYNONE | OPEN_ACCESS_READWRITE,
-                        NULL)) != 0) {
-                    PM_fatalError("Unable to open SDDHELP$ helper device driver! (#2)");
-                    }
-                }
-            }
-        else
-            PM_fatalError("Unable to open SDDHELP$ helper device driver!");
-        }
+	    if (DosSetRelMaxFH(&lAddFHs, &ulNewFHs) != 0)
+		PM_fatalError("Failed to raise the file handles limit!");
+	    else {
+		if ((rc = DosOpen(PMHELP_NAME,&hSDDHelp,&result,0,0,
+			FILE_OPEN, OPEN_SHARE_DENYNONE | OPEN_ACCESS_READWRITE,
+			NULL)) != 0) {
+		    PM_fatalError("Unable to open SDDHELP$ helper device driver! (#2)");
+		    }
+		}
+	    }
+	else
+	    PM_fatalError("Unable to open SDDHELP$ helper device driver!");
+	}
     if (DosDevIOCtl(hSDDHelp,PMHELP_IOCTL,func,
-            &parmsIn, inLen = sizeof(parmsIn), &inLen,
-            &parmsOut, outLen = sizeof(parmsOut), &outLen) != 0)
-        PM_fatalError("Failure calling SDDHELP$ helper device driver!");
+	    &parmsIn, inLen = sizeof(parmsIn), &inLen,
+	    &parmsOut, outLen = sizeof(parmsOut), &outLen) != 0)
+	PM_fatalError("Failure calling SDDHELP$ helper device driver!");
     DosClose(hSDDHelp);
     return parmsOut[0];
 }
@@ -310,9 +310,9 @@
     /* Get the DBCS vector - if it's not empty, we're on DBCS */
     DosQueryDBCSEnv(sizeof(achDBCSInfo), &ccStruct, achDBCSInfo);
     if (achDBCSInfo[0] != 0)
-        return true;
+	return true;
     else
-        return false;
+	return false;
 }
 
 /****************************************************************************
@@ -324,9 +324,9 @@
     PVOID   ptr;
 
     if (DosGetNamedSharedMem(&ptr, (PSZ)"\\SHAREMEM\\PMGLOBAL.MEM", PAG_READ) == NO_ERROR) {
-        DosFreeMem(ptr);
-        return true;
-        }
+	DosFreeMem(ptr);
+	return true;
+	}
     return false;
 }
 
@@ -339,19 +339,19 @@
 void PMAPI PM_init(void)
 {
     if (!lowMem) {
-        /* Obtain the 32->16 callgate from the device driver to enable IOPL */
-        if ((_PM_gdt = CallSDDHelp(PMHELP_GETGDT32)) == 0)
-            PM_fatalError("Unable to obtain call gate selector!");
+	/* Obtain the 32->16 callgate from the device driver to enable IOPL */
+	if ((_PM_gdt = CallSDDHelp(PMHELP_GETGDT32)) == 0)
+	    PM_fatalError("Unable to obtain call gate selector!");
 
-        PM_setIOPL(3);
+	PM_setIOPL(3);
 
-        /* Map the first Mb of physical memory into lowMem */
-        if ((lowMem = PM_mapPhysicalAddr(0,0xFFFFF,true)) == NULL)
-            PM_fatalError("Unable to map first Mb physical memory!");
+	/* Map the first Mb of physical memory into lowMem */
+	if ((lowMem = PM_mapPhysicalAddr(0,0xFFFFF,true)) == NULL)
+	    PM_fatalError("Unable to map first Mb physical memory!");
 
-        /* Initialise the MTRR interface functions */
-        MTRR_init();
-        }
+	/* Initialise the MTRR interface functions */
+	MTRR_init();
+	}
 }
 
 /****************************************************************************
@@ -367,79 +367,79 @@
     RESULTCODES resCodes;
 
     if (haveInt10 == -1) {
-        /* Connect to VIDEOPMI and get entry point. Note that we only
-         * do this if GENPMI or SDDPMI are already loaded, since we need
-         * a GRADD based driver for this to work.
-         */
-        PM_init();
-        haveInt10 = false;
-        if (DosQueryModuleHandle((PSZ)"GENPMI.DLL",&hModGENPMI) != 0)
-            hModGENPMI = NULLHANDLE;
-        if (DosQueryModuleHandle((PSZ)"SDDPMI.DLL",&hModSDDPMI) != 0)
-            hModSDDPMI = NULLHANDLE;
-        if (hModGENPMI || hModSDDPMI) {
-            if (DosLoadModule((PSZ)buf,sizeof(buf),(PSZ)"VIDEOPMI.DLL",&hModVideoPMI) == 0) {
-                if (DosQueryProcAddr(hModVideoPMI,0,(PSZ)"VIDEOPMI32Request",(void*)&PM_VIDEOPMI32Request) != 0)
-                    PM_fatalError("Unable to get VIDEOPMI32Request entry point!");
-                strcpy(path,"X:\\OS2\\SVGADATA.PMI");
-                path[0] = PM_getBootDrive();
-                if (PM_VIDEOPMI32Request(&Adapter,PMIREQUEST_LOADPMIFILE,path,NULL) != 0) {
-                    DosFreeModule(hModVideoPMI);
-                    PM_VIDEOPMI32Request = NULL;
-                    haveInt10 = false;
-                    }
-                else {
-                    /* Attempt to initialise the full VDM in the system. This will only
-                     * work if VPRPMI.SYS is loaded, but it provides support for passing
-                     * values in ES/DS/ESI/EDI between the BIOS which does not work with
-                     * kernel VDM's in fixpacks earlier than FP15. FP15 and later and
-                     * the new Warp 4.51 and Warp Server convenience packs should work
-                     * fine with the kernel mini-VDM.
-                     *
-                     * Also the full VDM is the only solution for really old kernels
-                     * (but GRADD won't run on them so this is superfluous ;-).
-                     */
-                    INITVDM InitVDM = {VDM_INITIALIZE,NULL,NULL};
-                    PM_VIDEOPMI32Request(&Adapter,PMIREQUEST_SOFTWAREINT,&InitVDM,NULL);
-                    haveInt10 = true;
-                    }
-                }
-            }
-        else {
-            /* A GRADD driver isn't loaded, hence we can't use VIDEOPMI. But we will try
-             * to access the mini-VDM directly, first verifying that the support is
-             * available in the kernel (it should be for kernels that support GRADD).
-             * This may be needed in a command line boot or if non-GRADD driver is
-             * used (Matrox or classic VGA).
-             * Note: because of problems with mini-VDM support in the kernel, we have to
-             * spawn a daemon process that will do the actual mini-VDM access for us.
-             */
-             /* Try to open shared semaphore to see if our daemon is already up */
-            if (DosOpenEventSem(SHAREDSEM, &hevDaemon) == NO_ERROR) {
-                if (DosWaitEventSem(hevDaemon, 1) == NO_ERROR) {
-                    /* If semaphore is posted, all is well */
-                    useVPMI   = false;
-                    haveInt10 = true;
-                    }
-                }
-            else {
-                /* Create shared event semaphore */
-                if (DosCreateEventSem(SHAREDSEM, &hevDaemon, DC_SEM_SHARED, FALSE) == NO_ERROR) {
-                    PM_findBPD(DAEMON_NAME, path);
-                    strcat(path, DAEMON_NAME);
-                    if (DosExecPgm(buf, sizeof(buf), EXEC_BACKGROUND, (PSZ)DAEMON_NAME,
-                        NULL, &resCodes, (PSZ)path) == NO_ERROR) {
-                        /* The daemon was successfully spawned, now give it a sec to come up */
-                        if (DosWaitEventSem(hevDaemon, 2000) == NO_ERROR) {
-                            /* It's up! */
-                            useVPMI   = false;
-                            haveInt10 = true;
-                            }
-                        }
-                    }
-                }
-            }
-        }
+	/* Connect to VIDEOPMI and get entry point. Note that we only
+	 * do this if GENPMI or SDDPMI are already loaded, since we need
+	 * a GRADD based driver for this to work.
+	 */
+	PM_init();
+	haveInt10 = false;
+	if (DosQueryModuleHandle((PSZ)"GENPMI.DLL",&hModGENPMI) != 0)
+	    hModGENPMI = NULLHANDLE;
+	if (DosQueryModuleHandle((PSZ)"SDDPMI.DLL",&hModSDDPMI) != 0)
+	    hModSDDPMI = NULLHANDLE;
+	if (hModGENPMI || hModSDDPMI) {
+	    if (DosLoadModule((PSZ)buf,sizeof(buf),(PSZ)"VIDEOPMI.DLL",&hModVideoPMI) == 0) {
+		if (DosQueryProcAddr(hModVideoPMI,0,(PSZ)"VIDEOPMI32Request",(void*)&PM_VIDEOPMI32Request) != 0)
+		    PM_fatalError("Unable to get VIDEOPMI32Request entry point!");
+		strcpy(path,"X:\\OS2\\SVGADATA.PMI");
+		path[0] = PM_getBootDrive();
+		if (PM_VIDEOPMI32Request(&Adapter,PMIREQUEST_LOADPMIFILE,path,NULL) != 0) {
+		    DosFreeModule(hModVideoPMI);
+		    PM_VIDEOPMI32Request = NULL;
+		    haveInt10 = false;
+		    }
+		else {
+		    /* Attempt to initialise the full VDM in the system. This will only
+		     * work if VPRPMI.SYS is loaded, but it provides support for passing
+		     * values in ES/DS/ESI/EDI between the BIOS which does not work with
+		     * kernel VDM's in fixpacks earlier than FP15. FP15 and later and
+		     * the new Warp 4.51 and Warp Server convenience packs should work
+		     * fine with the kernel mini-VDM.
+		     *
+		     * Also the full VDM is the only solution for really old kernels
+		     * (but GRADD won't run on them so this is superfluous ;-).
+		     */
+		    INITVDM InitVDM = {VDM_INITIALIZE,NULL,NULL};
+		    PM_VIDEOPMI32Request(&Adapter,PMIREQUEST_SOFTWAREINT,&InitVDM,NULL);
+		    haveInt10 = true;
+		    }
+		}
+	    }
+	else {
+	    /* A GRADD driver isn't loaded, hence we can't use VIDEOPMI. But we will try
+	     * to access the mini-VDM directly, first verifying that the support is
+	     * available in the kernel (it should be for kernels that support GRADD).
+	     * This may be needed in a command line boot or if non-GRADD driver is
+	     * used (Matrox or classic VGA).
+	     * Note: because of problems with mini-VDM support in the kernel, we have to
+	     * spawn a daemon process that will do the actual mini-VDM access for us.
+	     */
+	     /* Try to open shared semaphore to see if our daemon is already up */
+	    if (DosOpenEventSem(SHAREDSEM, &hevDaemon) == NO_ERROR) {
+		if (DosWaitEventSem(hevDaemon, 1) == NO_ERROR) {
+		    /* If semaphore is posted, all is well */
+		    useVPMI   = false;
+		    haveInt10 = true;
+		    }
+		}
+	    else {
+		/* Create shared event semaphore */
+		if (DosCreateEventSem(SHAREDSEM, &hevDaemon, DC_SEM_SHARED, FALSE) == NO_ERROR) {
+		    PM_findBPD(DAEMON_NAME, path);
+		    strcat(path, DAEMON_NAME);
+		    if (DosExecPgm(buf, sizeof(buf), EXEC_BACKGROUND, (PSZ)DAEMON_NAME,
+			NULL, &resCodes, (PSZ)path) == NO_ERROR) {
+			/* The daemon was successfully spawned, now give it a sec to come up */
+			if (DosWaitEventSem(hevDaemon, 2000) == NO_ERROR) {
+			    /* It's up! */
+			    useVPMI   = false;
+			    haveInt10 = true;
+			    }
+			}
+		    }
+		}
+	    }
+	}
     return haveInt10;
 }
 
@@ -480,9 +480,9 @@
 {
     uint pos = strlen(s);
     if (s[pos-1] != '\\') {
-        s[pos] = '\\';
-        s[pos+1] = '\0';
-        }
+	s[pos] = '\\';
+	s[pos+1] = '\0';
+	}
 }
 
 /****************************************************************************
@@ -505,9 +505,9 @@
     /* Be prepare to be called recursively (failed to fail situation :-) */
     static int fatalErrorCount = 0;
     if (fatalErrorCount++ == 0) {
-        if (fatalErrorCleanup)
-            fatalErrorCleanup();
-        }
+	if (fatalErrorCleanup)
+	    fatalErrorCleanup();
+	}
     fprintf(stderr,"%s\n", msg);
     exit(1);
 }
@@ -522,10 +522,10 @@
     uint *roff)
 {
     if (!VESABuf_ptr) {
-        /* Allocate a global buffer for communicating with the VESA VBE */
-        if ((VESABuf_ptr = PM_allocRealSeg(VESABuf_len, &VESABuf_rseg, &VESABuf_roff)) == NULL)
-            return NULL;
-        }
+	/* Allocate a global buffer for communicating with the VESA VBE */
+	if ((VESABuf_ptr = PM_allocRealSeg(VESABuf_len, &VESABuf_rseg, &VESABuf_roff)) == NULL)
+	    return NULL;
+	}
     *len = VESABuf_len;
     *rseg = VESABuf_rseg;
     *roff = VESABuf_roff;
@@ -632,11 +632,11 @@
 
     /* Quick optimized path for most common case */
     if (SesSwitchRec.Flags == -1)
-        return;
+	return;
 
 again:
     if (DosRequestMutexSem(SesSwitchRec.Mutex, 100))
-        return;
+	return;
     Flags = SesSwitchRec.Flags;
     Callback = SesSwitchRec.Callback;
     SesSwitchRec.Flags = -1;
@@ -647,15 +647,15 @@
     isSessionSwitching = false;
     DosPostEventSem(SesSwitchRec.Event);
     if (Flags == PM_DEACTIVATE && Mode == PM_SUSPEND_APP)
-        /* Suspend application until we switch back to our application */
-        for (;;) {
-            DosSleep (500);
-            /* SesSwitchRec.Flags is volatile so optimizer
-             * won't load it into a register
-             */
-            if (SesSwitchRec.Flags != -1)
-                goto again;
-            }
+	/* Suspend application until we switch back to our application */
+	for (;;) {
+	    DosSleep (500);
+	    /* SesSwitchRec.Flags is volatile so optimizer
+	     * won't load it into a register
+	     */
+	    if (SesSwitchRec.Flags != -1)
+		goto again;
+	    }
 }
 
 /****************************************************************************
@@ -669,7 +669,7 @@
     ULONG Count;
 
     if (DosRequestMutexSem(SesSwitchRec.Mutex, 10000))
-        return;
+	return;
 
     /* We're going to wait on that semaphore */
     DosResetEventSem(SesSwitchRec.Event, &Count);
@@ -692,10 +692,10 @@
     USHORT NotifyType;
 
     for (;;) {
-        if (VioModeWait(VMWR_POPUP, &NotifyType, 0) != 0)
-            break;
-        _PM_SessionSwitchEvent(saveState, PM_REACTIVATE);
-        }
+	if (VioModeWait(VMWR_POPUP, &NotifyType, 0) != 0)
+	    break;
+	_PM_SessionSwitchEvent(saveState, PM_REACTIVATE);
+	}
     VioModeUndo(UNDOI_RELEASEOWNER, UNDOK_ERRORCODE, (HVIO)0);
 }
 
@@ -709,13 +709,13 @@
 {
     USHORT NotifyType;
     for (;;) {
-        if (VioSavRedrawWait(VSRWI_SAVEANDREDRAW, &NotifyType, 0) != 0)
-            break;
-        if (NotifyType == VSRWN_SAVE)
-            _PM_SessionSwitchEvent(saveState, PM_DEACTIVATE);
-        else if (NotifyType == VSRWN_REDRAW)
-            _PM_SessionSwitchEvent(saveState, PM_REACTIVATE);
-        }
+	if (VioSavRedrawWait(VSRWI_SAVEANDREDRAW, &NotifyType, 0) != 0)
+	    break;
+	if (NotifyType == VSRWN_SAVE)
+	    _PM_SessionSwitchEvent(saveState, PM_DEACTIVATE);
+	else if (NotifyType == VSRWN_REDRAW)
+	    _PM_SessionSwitchEvent(saveState, PM_REACTIVATE);
+	}
     VioSavRedrawUndo(UNDOI_RELEASEOWNER, UNDOK_ERRORCODE, (HVIO)0);
 }
 
@@ -726,24 +726,24 @@
 void PMAPI PM_setSuspendAppCallback(
     PM_saveState_cb saveState)
 {
-    // If PM isn't loaded, this stuff will cause crashes!
+    /* If PM isn't loaded, this stuff will cause crashes! */
     if (__isShellLoaded()) {
-        if (saveState) {
-            /* Create the threads responsible for tracking console switches */
-            SesSwitchRec.Flags = -1;
-            DosCreateMutexSem(NULL, &SesSwitchRec.Mutex, 0, FALSE);
-            DosCreateEventSem(NULL, &SesSwitchRec.Event, 0, FALSE);
-            _beginthread ((void(*)(void*))_PM_ConsoleSwitch,NULL,SESSION_SWITCH_STACK_SIZE, (void*)saveState);
-            _beginthread ((void(*)(void*))_PM_ConsolePopup,NULL,SESSION_SWITCH_STACK_SIZE, (void*)saveState);
-            }
-        else {
-            /* Kill the threads responsible for tracking console switches */
-            VioModeUndo(UNDOI_RELEASEOWNER, UNDOK_TERMINATE, (HVIO)0);
-            VioSavRedrawUndo(UNDOI_RELEASEOWNER, UNDOK_TERMINATE, (HVIO)0);
-            DosCloseEventSem(SesSwitchRec.Event);
-            DosCloseMutexSem(SesSwitchRec.Mutex);
-            }
-        }
+	if (saveState) {
+	    /* Create the threads responsible for tracking console switches */
+	    SesSwitchRec.Flags = -1;
+	    DosCreateMutexSem(NULL, &SesSwitchRec.Mutex, 0, FALSE);
+	    DosCreateEventSem(NULL, &SesSwitchRec.Event, 0, FALSE);
+	    _beginthread ((void(*)(void*))_PM_ConsoleSwitch,NULL,SESSION_SWITCH_STACK_SIZE, (void*)saveState);
+	    _beginthread ((void(*)(void*))_PM_ConsolePopup,NULL,SESSION_SWITCH_STACK_SIZE, (void*)saveState);
+	    }
+	else {
+	    /* Kill the threads responsible for tracking console switches */
+	    VioModeUndo(UNDOI_RELEASEOWNER, UNDOK_TERMINATE, (HVIO)0);
+	    VioSavRedrawUndo(UNDOI_RELEASEOWNER, UNDOK_TERMINATE, (HVIO)0);
+	    DosCloseEventSem(SesSwitchRec.Event);
+	    DosCloseMutexSem(SesSwitchRec.Mutex);
+	    }
+	}
 }
 
 /****************************************************************************
@@ -758,7 +758,7 @@
     VIOMODEINFO  vmi;
 
     if (!cs)
-        return;
+	return;
 
     memcpy(&vmi, &cs->vmi, sizeof (VIOMODEINFO));
     VioSetMode(&vmi, (HVIO)0);
@@ -789,7 +789,7 @@
     /* If session switch is in progress, calling into VIO causes deadlocks! */
     /* Also this call to VIO screws up our console library on DBCS boxes... */
     if (!isSessionSwitching && !__IsDBCSSystem())
-        VioSetCurPos(y,x,0);
+	VioSetCurPos(y,x,0);
 }
 
 /****************************************************************************
@@ -813,7 +813,7 @@
     PM_intHandler ih,
     int frequency)
 {
-    // TODO: Implement this!
+    /* TODO: Implement this! */
     (void)ih;
     (void)frequency;
     return false;
@@ -826,7 +826,7 @@
 void PMAPI PM_setRealTimeClockFrequency(
     int frequency)
 {
-    // TODO: Implement this!
+    /* TODO: Implement this! */
     (void)frequency;
 }
 
@@ -836,7 +836,7 @@
 ****************************************************************************/
 void PMAPI PM_restoreRealTimeClockHandler(void)
 {
-    // TODO: Implement this!
+    /* TODO: Implement this! */
 }
 
 /****************************************************************************
@@ -881,7 +881,7 @@
 {
     static char path[CCHMAXPATH];
     if (getenv("NUCLEUS_PATH") != NULL)
-        return getenv("NUCLEUS_PATH");
+	return getenv("NUCLEUS_PATH");
     strcpy(path,"x:\\os2\\drivers");
     path[0] = PM_getBootDrive();
     PM_backslash(path);
@@ -920,10 +920,10 @@
     static char name[40],*env;
 
     if ((env = getenv("HOSTNAME")) != NULL) {
-        strncpy(name,env,sizeof(name));
-        name[sizeof(name)-1] = 0;
-        return name;
-        }
+	strncpy(name,env,sizeof(name));
+	name[sizeof(name)-1] = 0;
+	return name;
+	}
     return "OS2";
 }
 
@@ -970,7 +970,7 @@
     parmsIn[1] = limit;
     parmsIn[2] = isCached;
     if ((linear = CallSDDHelp(PMHELP_MAPPHYS)) == 0)
-        return NULL;
+	return NULL;
     return (void*)(linear + baseOfs);
 }
 
@@ -1031,9 +1031,9 @@
     int port)
 {
     switch (port) {
-        case 0: return 0x3F8;
-        case 1: return 0x2F8;
-        }
+	case 0: return 0x3F8;
+	case 1: return 0x2F8;
+	}
     return 0;
 }
 
@@ -1045,10 +1045,10 @@
     int port)
 {
     switch (port) {
-        case 0: return 0x3BC;
-        case 1: return 0x378;
-        case 2: return 0x278;
-        }
+	case 0: return 0x3BC;
+	case 1: return 0x378;
+	case 2: return 0x278;
+	}
     return 0;
 }
 
@@ -1112,7 +1112,7 @@
     uint r_off)
 {
     if (r_seg == 0xFFFF)
-        return &RMBuf[r_off];
+	return &RMBuf[r_off];
     return lowMem + MK_PHYS(r_seg,r_off);
 }
 
@@ -1126,7 +1126,7 @@
     uint *r_off)
 {
     if (size > sizeof(RMBuf))
-        return NULL;
+	return NULL;
     *r_seg = 0xFFFF;
     *r_off = 0x0000;
     return &RMBuf;
@@ -1160,79 +1160,79 @@
     ulong   eax = 0;
 
     if (!InitInt10())
-        return;
+	return;
     memset(&rmregs, 0, sizeof(rmregs));
     rmregs.ulBIOSIntNo = intno;
     INDPMI(eax); INDPMI(ebx); INDPMI(ecx); INDPMI(edx); INDPMI(esi); INDPMI(edi);
     rmregs.aCRF.reg_ds = regs->ds;
     rmregs.aCRF.reg_es = regs->es;
     if (intno == 0x10) {
-        eax = rmregs.aCRF.reg_eax;
-        switch (eax & 0xFFFF) {
-            case 0x4F00:
-                /* We have to hack the way this function works, due to
-                 * some bugs in the IBM mini-VDM BIOS support. Specifically
-                 * we need to make the input buffer and output buffer the
-                 * 'same' buffer, and that ES:SI points to the output
-                 * buffer (ignored by the BIOS). The data will end up
-                 * being returned in the input buffer, except for the
-                 * first four bytes ('VESA') that will not be returned.
-                 */
-                rmregs.pB[0].bBufferType = INPUT_BUFFER;
-                rmregs.pB[0].bSelCRF = REG_OFFSET(reg_es);
-                rmregs.pB[0].bOffCRF = REG_OFFSET(reg_edi);
-                rmregs.pB[0].pAddress = RMBuf;
-                rmregs.pB[0].ulSize = 4;
-                rmregs.pB[1].bBufferType = OUTPUT_BUFFER;
-                rmregs.pB[1].bSelCRF = REG_OFFSET(reg_es);
-                rmregs.pB[1].bOffCRF = REG_OFFSET(reg_esi);
-                rmregs.pB[1].pAddress = ((PBYTE)RMBuf)+4;
-                rmregs.pB[1].ulSize = 512-4;
-                break;
-            case 0x4F01:
-                rmregs.pB[0].bBufferType = OUTPUT_BUFFER;
-                rmregs.pB[0].bSelCRF = REG_OFFSET(reg_es);
-                rmregs.pB[0].bOffCRF = REG_OFFSET(reg_edi);
-                rmregs.pB[0].pAddress = RMBuf;
-                rmregs.pB[0].ulSize = 256;
-                break;
-            case 0x4F02:
-                rmregs.pB[0].bBufferType = INPUT_BUFFER;
-                rmregs.pB[0].bSelCRF = REG_OFFSET(reg_es);
-                rmregs.pB[0].bOffCRF = REG_OFFSET(reg_edi);
-                rmregs.pB[0].pAddress = RMBuf;
-                rmregs.pB[0].ulSize = 256;
-                break;
-            case 0x4F09:
-                rmregs.pB[0].bBufferType = INPUT_BUFFER;
-                rmregs.pB[0].bSelCRF = REG_OFFSET(reg_es);
-                rmregs.pB[0].bOffCRF = REG_OFFSET(reg_edi);
-                rmregs.pB[0].pAddress = RMBuf;
-                rmregs.pB[0].ulSize = 1024;
-                break;
-            case 0x4F0A:
-                /* Due to bugs in the mini-VDM in OS/2, the 0x4F0A protected
-                 * mode interface functions will not work (we never get any
-                 * selectors returned), so we fail this function here. The
-                 * rest of the VBE/Core driver will work properly if this
-                 * function is failed, because the VBE 2.0 and 3.0 specs
-                 * allow for this.
-                 */
-                regs->eax = 0x014F;
-                return;
-            }
-        }
+	eax = rmregs.aCRF.reg_eax;
+	switch (eax & 0xFFFF) {
+	    case 0x4F00:
+		/* We have to hack the way this function works, due to
+		 * some bugs in the IBM mini-VDM BIOS support. Specifically
+		 * we need to make the input buffer and output buffer the
+		 * 'same' buffer, and that ES:SI points to the output
+		 * buffer (ignored by the BIOS). The data will end up
+		 * being returned in the input buffer, except for the
+		 * first four bytes ('VESA') that will not be returned.
+		 */
+		rmregs.pB[0].bBufferType = INPUT_BUFFER;
+		rmregs.pB[0].bSelCRF = REG_OFFSET(reg_es);
+		rmregs.pB[0].bOffCRF = REG_OFFSET(reg_edi);
+		rmregs.pB[0].pAddress = RMBuf;
+		rmregs.pB[0].ulSize = 4;
+		rmregs.pB[1].bBufferType = OUTPUT_BUFFER;
+		rmregs.pB[1].bSelCRF = REG_OFFSET(reg_es);
+		rmregs.pB[1].bOffCRF = REG_OFFSET(reg_esi);
+		rmregs.pB[1].pAddress = ((PBYTE)RMBuf)+4;
+		rmregs.pB[1].ulSize = 512-4;
+		break;
+	    case 0x4F01:
+		rmregs.pB[0].bBufferType = OUTPUT_BUFFER;
+		rmregs.pB[0].bSelCRF = REG_OFFSET(reg_es);
+		rmregs.pB[0].bOffCRF = REG_OFFSET(reg_edi);
+		rmregs.pB[0].pAddress = RMBuf;
+		rmregs.pB[0].ulSize = 256;
+		break;
+	    case 0x4F02:
+		rmregs.pB[0].bBufferType = INPUT_BUFFER;
+		rmregs.pB[0].bSelCRF = REG_OFFSET(reg_es);
+		rmregs.pB[0].bOffCRF = REG_OFFSET(reg_edi);
+		rmregs.pB[0].pAddress = RMBuf;
+		rmregs.pB[0].ulSize = 256;
+		break;
+	    case 0x4F09:
+		rmregs.pB[0].bBufferType = INPUT_BUFFER;
+		rmregs.pB[0].bSelCRF = REG_OFFSET(reg_es);
+		rmregs.pB[0].bOffCRF = REG_OFFSET(reg_edi);
+		rmregs.pB[0].pAddress = RMBuf;
+		rmregs.pB[0].ulSize = 1024;
+		break;
+	    case 0x4F0A:
+		/* Due to bugs in the mini-VDM in OS/2, the 0x4F0A protected
+		 * mode interface functions will not work (we never get any
+		 * selectors returned), so we fail this function here. The
+		 * rest of the VBE/Core driver will work properly if this
+		 * function is failed, because the VBE 2.0 and 3.0 specs
+		 * allow for this.
+		 */
+		regs->eax = 0x014F;
+		return;
+	    }
+	}
     if (useVPMI)
-        PM_VIDEOPMI32Request(&Adapter,PMIREQUEST_SOFTWAREINT,NULL,&rmregs);
+	PM_VIDEOPMI32Request(&Adapter,PMIREQUEST_SOFTWAREINT,NULL,&rmregs);
     else {
-        DosSysCtl(6, &rmregs);
-        }
+	DosSysCtl(6, &rmregs);
+	}
 
     OUTDPMI(eax); OUTDPMI(ebx); OUTDPMI(ecx); OUTDPMI(edx); OUTDPMI(esi); OUTDPMI(edi);
     if (((regs->eax & 0xFFFF) == 0x004F) && ((eax & 0xFFFF) == 0x4F00)) {
-        /* Hack to fix up the missing 'VESA' string for mini-VDM */
-        memcpy(RMBuf,"VESA",4);
-        }
+	/* Hack to fix up the missing 'VESA' string for mini-VDM */
+	memcpy(RMBuf,"VESA",4);
+	}
     regs->ds = rmregs.aCRF.reg_ds;
     regs->es = rmregs.aCRF.reg_es;
     regs->flags = rmregs.aCRF.reg_eflag;
@@ -1354,13 +1354,13 @@
 
     /* Allocate memory for the new page block, and add to head of list */
     if (DosAllocSharedMem((void**)&newBlock,NULL,PAGE_BLOCK_SIZE,OBJ_GETTABLE | PAG_READ | PAG_WRITE | PAG_COMMIT))
-        return NULL;
+	return NULL;
     if (!PM_lockDataPages(newBlock,PAGE_BLOCK_SIZE,&newBlock->lockHandle))
-        return NULL;
+	return NULL;
     newBlock->prev = NULL;
     newBlock->next = pageBlocks;
     if (pageBlocks)
-        pageBlocks->prev = newBlock;
+	pageBlocks->prev = newBlock;
     pageBlocks = newBlock;
 
     /* Initialise the page aligned free list for the page block */
@@ -1369,7 +1369,7 @@
     newBlock->freeListStart = newBlock->freeList;
     newBlock->freeListEnd = p + (PAGES_PER_BLOCK-1) * PM_PAGE_SIZE;
     for (i = 0; i < PAGES_PER_BLOCK; i++,p = next)
-        FREELIST_NEXT(p) = next = p + PM_PAGE_SIZE;
+	FREELIST_NEXT(p) = next = p + PM_PAGE_SIZE;
     FREELIST_NEXT(p - PM_PAGE_SIZE) = NULL;
     return newBlock;
 }
@@ -1388,11 +1388,11 @@
      * page block if no free blocks are found.
      */
     for (block = pageBlocks; block != NULL; block = block->next) {
-        if (block->freeCount)
-            break;
-        }
+	if (block->freeCount)
+	    break;
+	}
     if (block == NULL && (block = PM_addNewPageBlock()) == NULL)
-        return NULL;
+	return NULL;
     block->freeCount--;
     p = block->freeList;
     block->freeList = FREELIST_NEXT(p);
@@ -1411,36 +1411,36 @@
 
     /* First find the page block that this page belongs to */
     for (block = pageBlocks; block != NULL; block = block->next) {
-        if (p >= block->freeListStart && p <= block->freeListEnd)
-            break;
-        }
+	if (p >= block->freeListStart && p <= block->freeListEnd)
+	    break;
+	}
     CHECK(block != NULL);
 
     /* Now free the block by adding it to the free list */
     FREELIST_NEXT(p) = block->freeList;
     block->freeList = p;
     if (++block->freeCount == PAGES_PER_BLOCK) {
-        /* If all pages in the page block are now free, free the entire
-         * page block itself.
-         */
-        if (block == pageBlocks) {
-            /* Delete from head */
-            pageBlocks = block->next;
-            if (block->next)
-                block->next->prev = NULL;
-            }
-        else {
-            /* Delete from middle of list */
-            CHECK(block->prev != NULL);
-            block->prev->next = block->next;
-            if (block->next)
-                block->next->prev = block->prev;
-            }
+	/* If all pages in the page block are now free, free the entire
+	 * page block itself.
+	 */
+	if (block == pageBlocks) {
+	    /* Delete from head */
+	    pageBlocks = block->next;
+	    if (block->next)
+		block->next->prev = NULL;
+	    }
+	else {
+	    /* Delete from middle of list */
+	    CHECK(block->prev != NULL);
+	    block->prev->next = block->next;
+	    if (block->next)
+		block->next->prev = block->prev;
+	    }
 
-        /* Unlock the memory and free it */
-        PM_unlockDataPages(block,PAGE_BLOCK_SIZE,&block->lockHandle);
-        DosFreeMem(block);
-        }
+	/* Unlock the memory and free it */
+	PM_unlockDataPages(block,PAGE_BLOCK_SIZE,&block->lockHandle);
+	DosFreeMem(block);
+	}
 }
 
 /****************************************************************************
@@ -1453,8 +1453,8 @@
 
     /* Map all the page blocks above into the shared memory for process */
     for (block = pageBlocks; block != NULL; block = block->next) {
-        DosGetSharedMem(block, PAG_READ | PAG_WRITE);
-        }
+	DosGetSharedMem(block, PAG_READ | PAG_WRITE);
+	}
 }
 
 /****************************************************************************
@@ -1533,7 +1533,7 @@
     INTCRF  rmregs;
 
     if (!InitInt10())
-        return;
+	return;
     memset(&rmregs, 0, sizeof(rmregs));
     rmregs.ulBIOSIntNo = 0x10;
     rmregs.aCRF.reg_eax = 0x4F05;
@@ -1552,7 +1552,7 @@
     INTCRF  rmregs;
 
     if (!InitInt10())
-        return;
+	return;
     memset(&rmregs, 0, sizeof(rmregs));
     rmregs.ulBIOSIntNo = 0x10;
     rmregs.aCRF.reg_eax = 0x4F05;
@@ -1578,7 +1578,7 @@
     INTCRF  rmregs;
 
     if (!InitInt10())
-        return;
+	return;
     memset(&rmregs, 0, sizeof(rmregs));
     rmregs.ulBIOSIntNo = 0x10;
     rmregs.aCRF.reg_eax = 0x4F07;
@@ -1625,8 +1625,8 @@
     return MTRR_enableWriteCombine(base,size,type);
 }
 
-// TODO: Move the MTRR helper stuff into the call gate, or better yet
-//       entirely into the ring 0 helper driver!!
+/* TODO: Move the MTRR helper stuff into the call gate, or better yet */
+/*       entirely into the ring 0 helper driver!! */
 
 /* MTRR helper functions. To make it easier to implement the MTRR support
  * under OS/2, we simply put our ring 0 helper functions into the
@@ -1705,7 +1705,7 @@
 PM_MODULE PMAPI PM_loadLibrary(
     const char *szDLLName)
 {
-    // TODO: Implement this to load shared libraries!
+    /* TODO: Implement this to load shared libraries! */
     (void)szDLLName;
     return NULL;
 }
@@ -1714,7 +1714,7 @@
     PM_MODULE hModule,
     const char *szProcName)
 {
-    // TODO: Implement this!
+    /* TODO: Implement this! */
     (void)hModule;
     (void)szProcName;
     return NULL;
@@ -1723,7 +1723,7 @@
 void PMAPI PM_freeLibrary(
     PM_MODULE hModule)
 {
-    // TODO: Implement this!
+    /* TODO: Implement this! */
     (void)hModule;
 }
 
@@ -1740,15 +1740,15 @@
     memset(findData,0,findData->dwSize);
     findData->dwSize = dwSize;
     if (blk->attrFile & FILE_READONLY)
-        findData->attrib |= PM_FILE_READONLY;
+	findData->attrib |= PM_FILE_READONLY;
     if (blk->attrFile & FILE_DIRECTORY)
-        findData->attrib |= PM_FILE_DIRECTORY;
+	findData->attrib |= PM_FILE_DIRECTORY;
     if (blk->attrFile & FILE_ARCHIVED)
-        findData->attrib |= PM_FILE_ARCHIVE;
+	findData->attrib |= PM_FILE_ARCHIVE;
     if (blk->attrFile & FILE_HIDDEN)
-        findData->attrib |= PM_FILE_HIDDEN;
+	findData->attrib |= PM_FILE_HIDDEN;
     if (blk->attrFile & FILE_SYSTEM)
-        findData->attrib |= PM_FILE_SYSTEM;
+	findData->attrib |= PM_FILE_SYSTEM;
     findData->sizeLo = blk->cbFile;
     findData->sizeHi = 0;
     strncpy(findData->name,blk->achName,PM_MAX_PATH);
@@ -1770,9 +1770,9 @@
     ulong           count = 1;
 
     if (DosFindFirst((PSZ)filename,&hdir,FIND_MASK,&blk,sizeof(blk),&count,FIL_STANDARD) == NO_ERROR) {
-        convertFindData(findData,&blk);
-        return (void*)hdir;
-        }
+	convertFindData(findData,&blk);
+	return (void*)hdir;
+	}
     return PM_FILE_INVALID;
 }
 
@@ -1788,9 +1788,9 @@
     ulong           count = 1;
 
     if (DosFindNext((HDIR)handle,&blk,sizeof(blk),&count) == NO_ERROR) {
-        convertFindData(findData,&blk);
-        return true;
-        }
+	convertFindData(findData,&blk);
+	return true;
+	}
     return false;
 }
 
@@ -1857,16 +1857,16 @@
     FILESTATUS3 s;
 
     if (DosQueryPathInfo((PSZ)filename,FIL_STANDARD,(PVOID)&s,sizeof(s)))
-        return;
+	return;
     s.attrFile = 0;
     if (attrib & PM_FILE_READONLY)
-        s.attrFile |= FILE_READONLY;
+	s.attrFile |= FILE_READONLY;
     if (attrib & PM_FILE_ARCHIVE)
-        s.attrFile |= FILE_ARCHIVED;
+	s.attrFile |= FILE_ARCHIVED;
     if (attrib & PM_FILE_HIDDEN)
-        s.attrFile |= FILE_HIDDEN;
+	s.attrFile |= FILE_HIDDEN;
     if (attrib & PM_FILE_SYSTEM)
-        s.attrFile |= FILE_SYSTEM;
+	s.attrFile |= FILE_SYSTEM;
     DosSetPathInfo((PSZ)filename,FIL_STANDARD,(PVOID)&s,sizeof(s),0L);
 }
 
@@ -1881,15 +1881,15 @@
     uint        retval = 0;
 
     if (DosQueryPathInfo((PSZ)filename, FIL_STANDARD, &fs3, sizeof(FILESTATUS3)))
-        return 0;
+	return 0;
     if (fs3.attrFile & FILE_READONLY)
-        retval |= PM_FILE_READONLY;
+	retval |= PM_FILE_READONLY;
     if (fs3.attrFile & FILE_ARCHIVED)
-        retval |= PM_FILE_ARCHIVE;
+	retval |= PM_FILE_ARCHIVE;
     if (fs3.attrFile & FILE_HIDDEN)
-        retval |= PM_FILE_HIDDEN;
+	retval |= PM_FILE_HIDDEN;
     if (fs3.attrFile & FILE_SYSTEM)
-        retval |= PM_FILE_SYSTEM;
+	retval |= PM_FILE_SYSTEM;
     return retval;
 }
 
@@ -1928,33 +1928,33 @@
     time_t      tt;
 
     if (DosQueryPathInfo((PSZ)filename, FIL_STANDARD, &fs3, sizeof(FILESTATUS3)))
-        return false;
+	return false;
     if (gmTime) {
-        tc.tm_year = fs3.fdateLastWrite.year + 80;
-        tc.tm_mon = fs3.fdateLastWrite.month - 1;
-        tc.tm_mday = fs3.fdateLastWrite.day;
-        tc.tm_hour = fs3.ftimeLastWrite.hours;
-        tc.tm_min = fs3.ftimeLastWrite.minutes;
-        tc.tm_sec = fs3.ftimeLastWrite.twosecs * 2;
-        if((tt = mktime(&tc)) == -1)
-            return false;
-        if(!(ret = gmtime(&tt)))
-            return false;
-        time->sec = ret->tm_sec;
-        time->day = ret->tm_mday;
-        time->mon = ret->tm_mon + 1;
-        time->year = ret->tm_year - 80;
-        time->min = ret->tm_min;
-        time->hour = ret->tm_hour;
-        }
+	tc.tm_year = fs3.fdateLastWrite.year + 80;
+	tc.tm_mon = fs3.fdateLastWrite.month - 1;
+	tc.tm_mday = fs3.fdateLastWrite.day;
+	tc.tm_hour = fs3.ftimeLastWrite.hours;
+	tc.tm_min = fs3.ftimeLastWrite.minutes;
+	tc.tm_sec = fs3.ftimeLastWrite.twosecs * 2;
+	if((tt = mktime(&tc)) == -1)
+	    return false;
+	if(!(ret = gmtime(&tt)))
+	    return false;
+	time->sec = ret->tm_sec;
+	time->day = ret->tm_mday;
+	time->mon = ret->tm_mon + 1;
+	time->year = ret->tm_year - 80;
+	time->min = ret->tm_min;
+	time->hour = ret->tm_hour;
+	}
     else {
-        time->sec = fs3.ftimeLastWrite.twosecs * 2;
-        time->day = fs3.fdateLastWrite.day;
-        time->mon = fs3.fdateLastWrite.month;
-        time->year = fs3.fdateLastWrite.year;
-        time->min = fs3.ftimeLastWrite.minutes;
-        time->hour = fs3.ftimeLastWrite.hours;
-        }
+	time->sec = fs3.ftimeLastWrite.twosecs * 2;
+	time->day = fs3.fdateLastWrite.day;
+	time->mon = fs3.fdateLastWrite.month;
+	time->year = fs3.fdateLastWrite.year;
+	time->min = fs3.ftimeLastWrite.minutes;
+	time->hour = fs3.ftimeLastWrite.hours;
+	}
     return true;
 }
 
@@ -1973,32 +1973,32 @@
     time_t      tt;
 
     if (DosQueryPathInfo((PSZ)filename,FIL_STANDARD,(PVOID)&fs3,sizeof(fs3)))
-        return false;
+	return false;
     if (gmTime) {
-        tc.tm_year = time->year + 80;
-        tc.tm_mon = time->mon - 1;
-        tc.tm_mday = time->day;
-        tc.tm_hour = time->hour;
-        tc.tm_min = time->min;
-        tc.tm_sec = time->sec;
-        if((tt = mktime(&tc)) == -1)
-            return false;
-        ret = localtime(&tt);
-        fs3.ftimeLastWrite.twosecs = ret->tm_sec / 2;
-        fs3.fdateLastWrite.day = ret->tm_mday;
-        fs3.fdateLastWrite.month = ret->tm_mon + 1;
-        fs3.fdateLastWrite.year = ret->tm_year - 80;
-        fs3.ftimeLastWrite.minutes = ret->tm_min;
-        fs3.ftimeLastWrite.hours = ret->tm_hour;
-        }
+	tc.tm_year = time->year + 80;
+	tc.tm_mon = time->mon - 1;
+	tc.tm_mday = time->day;
+	tc.tm_hour = time->hour;
+	tc.tm_min = time->min;
+	tc.tm_sec = time->sec;
+	if((tt = mktime(&tc)) == -1)
+	    return false;
+	ret = localtime(&tt);
+	fs3.ftimeLastWrite.twosecs = ret->tm_sec / 2;
+	fs3.fdateLastWrite.day = ret->tm_mday;
+	fs3.fdateLastWrite.month = ret->tm_mon + 1;
+	fs3.fdateLastWrite.year = ret->tm_year - 80;
+	fs3.ftimeLastWrite.minutes = ret->tm_min;
+	fs3.ftimeLastWrite.hours = ret->tm_hour;
+	}
     else {
-        fs3.ftimeLastWrite.twosecs = time->sec / 2;
-        fs3.fdateLastWrite.day = time->day;
-        fs3.fdateLastWrite.month = time->mon;
-        fs3.fdateLastWrite.year = time->year;
-        fs3.ftimeLastWrite.minutes = time->min;
-        fs3.ftimeLastWrite.hours = time->hour;
-        }
+	fs3.ftimeLastWrite.twosecs = time->sec / 2;
+	fs3.fdateLastWrite.day = time->day;
+	fs3.fdateLastWrite.month = time->mon;
+	fs3.fdateLastWrite.year = time->year;
+	fs3.ftimeLastWrite.minutes = time->min;
+	fs3.ftimeLastWrite.hours = time->hour;
+	}
     memcpy(&fs3.fdateLastAccess, &fs3.fdateLastWrite, sizeof(FDATE));
     memcpy(&fs3.fdateCreation, &fs3.fdateLastWrite, sizeof(FDATE));
     memcpy(&fs3.ftimeLastAccess, &fs3.ftimeLastWrite, sizeof(FTIME));

diff --git a/board/MAI/bios_emulator/scitech/src/pm/os2pm/event.c b/board/MAI/bios_emulator/scitech/src/pm/os2pm/event.c
index 97c2caa..7af20a9 100644
--- a/board/MAI/bios_emulator/scitech/src/pm/os2pm/event.c
+++ b/board/MAI/bios_emulator/scitech/src/pm/os2pm/event.c

@@ -59,7 +59,7 @@
 ****************************************************************************/
 static void _EVT_pumpMessages(void)
 {
-    // TODO: Implement this for OS/2 Presentation Manager apps!
+    /* TODO: Implement this for OS/2 Presentation Manager apps! */
 }
 
 /****************************************************************************
@@ -105,7 +105,7 @@
     oldKeyMessage = 0;
     memset(keyUpMsg,0,sizeof(keyUpMsg));
 
-    // TODO: OS/2 PM specific initialisation code!
+    /* TODO: OS/2 PM specific initialisation code! */
 
     /* Catch program termination signals so we can clean up properly */
     signal(SIGABRT, _EVT_abort);
@@ -135,7 +135,7 @@
 ****************************************************************************/
 void EVT_resume(void)
 {
-    // Do nothing for OS/2
+    /* Do nothing for OS/2 */
 }
 
 /****************************************************************************
@@ -145,7 +145,7 @@
 ****************************************************************************/
 void EVT_suspend(void)
 {
-    // Do nothing for OS/2
+    /* Do nothing for OS/2 */
 }
 
 /****************************************************************************
@@ -159,7 +159,7 @@
     signal(SIGFPE, SIG_DFL);
     signal(SIGINT, SIG_DFL);
 
-    // TODO: OS/2 PM specific exit code
+    /* TODO: OS/2 PM specific exit code */
 }
 
 /****************************************************************************

diff --git a/board/MAI/bios_emulator/scitech/src/pm/photon/event.c b/board/MAI/bios_emulator/scitech/src/pm/photon/event.c
index 738dfea..581da16 100644
--- a/board/MAI/bios_emulator/scitech/src/pm/photon/event.c
+++ b/board/MAI/bios_emulator/scitech/src/pm/photon/event.c

@@ -51,7 +51,7 @@
     uchar scancode)
 {
     return (KeyState[(scancode & 0xf8) >> 3] & (1 << (scancode & 0x7)) ?
-        true : false);
+	true : false);
 }
 
 /****************************************************************************
@@ -71,100 +71,100 @@
     event_t         _evt;
 
     while (count < EVENTQSIZE) {
-        uint    mods = 0, keyp = 0;
+	uint    mods = 0, keyp = 0;
 
-        pid = Creceive(0, &msg, sizeof (msg));
+	pid = Creceive(0, &msg, sizeof (msg));
 
-        if (pid == -1)
-            return;
+	if (pid == -1)
+	    return;
 
-        if (PhEventRead(pid, event, sizeof (evt)) == Ph_EVENT_MSG) {
-            memset(&evt, 0, sizeof (evt));
-            if (event->type == Ph_EV_KEY) {
-                key = PhGetData(event);
+	if (PhEventRead(pid, event, sizeof (evt)) == Ph_EVENT_MSG) {
+	    memset(&evt, 0, sizeof (evt));
+	    if (event->type == Ph_EV_KEY) {
+		key = PhGetData(event);
 
-                if (key->key_flags & KEY_SCAN_VALID) {
-                    keyp = key->key_scan;
-                    if (key->key_flags & KEY_DOWN)
-                        KeyState[(keyp & 0xf800) >> 11]
-                            |= 1 << ((keyp & 0x700) >> 8);
-                    else
-                        KeyState[(keyp & 0xf800) >> 11]
-                            &= ~(1 << ((keyp & 0x700) >> 8));
-                }
-                if ((key->key_flags & KEY_SYM_VALID) || extended)
-                    keyp |= key->key_sym;
+		if (key->key_flags & KEY_SCAN_VALID) {
+		    keyp = key->key_scan;
+		    if (key->key_flags & KEY_DOWN)
+			KeyState[(keyp & 0xf800) >> 11]
+			    |= 1 << ((keyp & 0x700) >> 8);
+		    else
+			KeyState[(keyp & 0xf800) >> 11]
+			    &= ~(1 << ((keyp & 0x700) >> 8));
+		}
+		if ((key->key_flags & KEY_SYM_VALID) || extended)
+		    keyp |= key->key_sym;
 
-                /* No way to tell left from right... */
-                if (key->key_mods & KEYMOD_SHIFT)
-                    mods = (EVT_LEFTSHIFT | EVT_RIGHTSHIFT);
-                if (key->key_mods & KEYMOD_CTRL)
-                    mods |= (EVT_CTRLSTATE | EVT_LEFTCTRL);
-                if (key->key_mods & KEYMOD_ALT)
-                    mods |= (EVT_ALTSTATE | EVT_LEFTALT);
+		/* No way to tell left from right... */
+		if (key->key_mods & KEYMOD_SHIFT)
+		    mods = (EVT_LEFTSHIFT | EVT_RIGHTSHIFT);
+		if (key->key_mods & KEYMOD_CTRL)
+		    mods |= (EVT_CTRLSTATE | EVT_LEFTCTRL);
+		if (key->key_mods & KEYMOD_ALT)
+		    mods |= (EVT_ALTSTATE | EVT_LEFTALT);
 
-                _evt.when = evt->timestamp;
-                if (key->key_flags & KEY_REPEAT) {
-                    _evt.what = EVT_KEYREPEAT;
-                    _evt.message = 0x10000;
-                    }
-                else if (key->key_flags & KEY_DOWN)
-                    _evt.what = EVT_KEYDOWN;
-                else
-                    _evt.what = EVT_KEYUP;
-                _evt.modifiers = mods;
-                _evt.message |= keyp;
+		_evt.when = evt->timestamp;
+		if (key->key_flags & KEY_REPEAT) {
+		    _evt.what = EVT_KEYREPEAT;
+		    _evt.message = 0x10000;
+		    }
+		else if (key->key_flags & KEY_DOWN)
+		    _evt.what = EVT_KEYDOWN;
+		else
+		    _evt.what = EVT_KEYUP;
+		_evt.modifiers = mods;
+		_evt.message |= keyp;
 
-                addEvent(&_evt);
+		addEvent(&_evt);
 
-                switch(key->key_scan & 0xff00) {
-                    case 0xe000:
-                        extended = 1;
-                        break;
-                    case 0xe001:
-                        extended = 2;
-                        break;
-                    default:
-                        if (extended)
-                            extended--;
-                    }
-                }
-            else if (event->type & Ph_EV_PTR_ALL) {
-                but_stat = message = 0;
-                mouse = PhGetData(event);
+		switch(key->key_scan & 0xff00) {
+		    case 0xe000:
+			extended = 1;
+			break;
+		    case 0xe001:
+			extended = 2;
+			break;
+		    default:
+			if (extended)
+			    extended--;
+		    }
+		}
+	    else if (event->type & Ph_EV_PTR_ALL) {
+		but_stat = message = 0;
+		mouse = PhGetData(event);
 
-                if (mouse->button_state & Ph_BUTTON_3)
-                    but_stat = EVT_LEFTBUT;
-                if (mouse->buttons & Ph_BUTTON_3)
-                    message = EVT_LEFTBMASK;
+		if (mouse->button_state & Ph_BUTTON_3)
+		    but_stat = EVT_LEFTBUT;
+		if (mouse->buttons & Ph_BUTTON_3)
+		    message = EVT_LEFTBMASK;
 
-                if (mouse->button_state & Ph_BUTTON_1)
-                    but_stat |= EVT_RIGHTBUT;
-                if (mouse->buttons & Ph_BUTTON_1) 
-                    message |= EVT_RIGHTBMASK;
+		if (mouse->button_state & Ph_BUTTON_1)
+		    but_stat |= EVT_RIGHTBUT;
+		if (mouse->buttons & Ph_BUTTON_1)
+		    message |= EVT_RIGHTBMASK;
 
-                _evt.when = evt->timestamp;
-                if (event->type & Ph_EV_PTR_MOTION) {
-                    _evt.what = EVT_MOUSEMOVE;
-                    _evt.where_x = mouse->pos.x;
-                    _evt.where_y = mouse->pos.y;
-                    _evt.modifiers = but_stat;
-                    addEvent(&_evt);
-                    }
-                if (event->type & Ph_EV_BUT_PRESS)
-                    _evt.what = EVT_MOUSEDOWN;
-                else
-                    _evt.what = EVT_MOUSEUP;
-                _evt.where_x = mouse->pos.x;
-                _evt.where_y = mouse->pos.y;
-                _evt.modifiers = but_stat;
-                _evt.message = message;
-                addEvent(&_evt);
-                }
-            }
-        else
-            return;
-        }
+		_evt.when = evt->timestamp;
+		if (event->type & Ph_EV_PTR_MOTION) {
+		    _evt.what = EVT_MOUSEMOVE;
+		    _evt.where_x = mouse->pos.x;
+		    _evt.where_y = mouse->pos.y;
+		    _evt.modifiers = but_stat;
+		    addEvent(&_evt);
+		    }
+		if (event->type & Ph_EV_BUT_PRESS)
+		    _evt.what = EVT_MOUSEDOWN;
+		else
+		    _evt.what = EVT_MOUSEUP;
+		_evt.where_x = mouse->pos.x;
+		_evt.where_y = mouse->pos.y;
+		_evt.modifiers = but_stat;
+		_evt.message = message;
+		addEvent(&_evt);
+		}
+	    }
+	else
+	    return;
+	}
 }
 
 /****************************************************************************
@@ -230,8 +230,8 @@
     int xRes,
     int yRes)
 {
-    // TODO: Need to call Input to change the coordinates that it returns
-    //       for mouse events!!
+    /* TODO: Need to call Input to change the coordinates that it returns */
+    /*       for mouse events!! */
 }
 
 /****************************************************************************
@@ -242,7 +242,7 @@
 ****************************************************************************/
 void EVT_resume(void)
 {
-    // Do nothing for Photon
+    /* Do nothing for Photon */
 }
 
 /****************************************************************************
@@ -252,7 +252,7 @@
 ****************************************************************************/
 void EVT_suspend(void)
 {
-    // Do nothing for Photon
+    /* Do nothing for Photon */
 }
 
 /****************************************************************************

diff --git a/board/MAI/bios_emulator/scitech/src/pm/qnx/event.c b/board/MAI/bios_emulator/scitech/src/pm/qnx/event.c
index e16f8a5..45cd514 100644
--- a/board/MAI/bios_emulator/scitech/src/pm/qnx/event.c
+++ b/board/MAI/bios_emulator/scitech/src/pm/qnx/event.c

@@ -37,7 +37,7 @@
 #ifndef __QNXNTO__
 static struct _mouse_ctrl   *_PM_mouse_ctl;
 static int          _PM_keyboard_fd = -1;
-//static int            _PM_modifiers, _PM_leds;
+/*static int            _PM_modifiers, _PM_leds; */
 #else
 static int          kbd_fd = -1, mouse_fd = -1;
 #endif
@@ -58,7 +58,7 @@
     int map;
     } keymap;
 
-// TODO: Fix this and set it up so we can do a binary search!
+/* TODO: Fix this and set it up so we can do a binary search! */
 
 keymap keymaps[] = {
     {96, KB_padEnter},
@@ -146,8 +146,8 @@
 static int MickeyToPixel(
     int mickey)
 {
-    // TODO: We can add some code in here to handle 'acceleration' for
-    //       the mouse cursor. For now just use the mickeys.
+    /* TODO: We can add some code in here to handle 'acceleration' for */
+    /*       the mouse cursor. For now just use the mickeys. */
     return mickey;
 }
 
@@ -167,110 +167,110 @@
     event_t         evt;
 
     while (EVT.count < EVENTQSIZE) {
-        rc1 = read(kbd_fd, (void *)&key, sizeof(key));
-        if (rc1 == -1) {
-            if (errno == EAGAIN)
-                rc1 = 0;
-            else {
-                perror("getEvents");
-                PM_fatalError("Keyboard error");
-                }
-            }
-        if (rc1 > 0) {
-            memset(&evt, 0, sizeof(evt));
-            if (key.data.modifiers & KEYMOD_SHIFT)
-                mods |= EVT_LEFTSHIFT;
-            if (key.data.modifiers & KEYMOD_CTRL)
-                mods |= EVT_CTRLSTATE;
-            if (key.data.modifiers & KEYMOD_ALT)
-                mods |= EVT_ALTSTATE;
+	rc1 = read(kbd_fd, (void *)&key, sizeof(key));
+	if (rc1 == -1) {
+	    if (errno == EAGAIN)
+		rc1 = 0;
+	    else {
+		perror("getEvents");
+		PM_fatalError("Keyboard error");
+		}
+	    }
+	if (rc1 > 0) {
+	    memset(&evt, 0, sizeof(evt));
+	    if (key.data.modifiers & KEYMOD_SHIFT)
+		mods |= EVT_LEFTSHIFT;
+	    if (key.data.modifiers & KEYMOD_CTRL)
+		mods |= EVT_CTRLSTATE;
+	    if (key.data.modifiers & KEYMOD_ALT)
+		mods |= EVT_ALTSTATE;
 
-            /* Now store the keyboard event data */
-            evt.when = TIME_TO_MSEC(key.time);
-            if (key.data.flags & KEY_SCAN_VALID)
-                evt.message |= (key.data.key_scan & 0x7F) << 8;
-            if ((key.data.flags & KEY_SYM_VALID) &&
-                (((key.data.key_sym & 0xff00) == 0xf000 &&
-                (key.data.key_sym & 0xff) < 0x20) ||
-                key.data.key_sym < 0x80))
-                evt.message |= (key.data.key_sym & 0xFF);
-            evt.modifiers = mods;
-            if (key.data.flags & KEY_DOWN) {
-                evt.what = EVT_KEYDOWN;
-                keyUpMsg[evt.message >> 8] = (ushort)evt.message;
-                }
-            else if (key.data.flags & KEY_REPEAT) {
-                evt.message |= 0x10000;
-                evt.what = EVT_KEYREPEAT;
-                }
-            else {
-                evt.what = EVT_KEYUP;
-                evt.message = keyUpMsg[evt.message >> 8];
-                if (evt.message == 0)
-                    continue;
-                keyUpMsg[evt.message >> 8] = 0;
-                }
+	    /* Now store the keyboard event data */
+	    evt.when = TIME_TO_MSEC(key.time);
+	    if (key.data.flags & KEY_SCAN_VALID)
+		evt.message |= (key.data.key_scan & 0x7F) << 8;
+	    if ((key.data.flags & KEY_SYM_VALID) &&
+		(((key.data.key_sym & 0xff00) == 0xf000 &&
+		(key.data.key_sym & 0xff) < 0x20) ||
+		key.data.key_sym < 0x80))
+		evt.message |= (key.data.key_sym & 0xFF);
+	    evt.modifiers = mods;
+	    if (key.data.flags & KEY_DOWN) {
+		evt.what = EVT_KEYDOWN;
+		keyUpMsg[evt.message >> 8] = (ushort)evt.message;
+		}
+	    else if (key.data.flags & KEY_REPEAT) {
+		evt.message |= 0x10000;
+		evt.what = EVT_KEYREPEAT;
+		}
+	    else {
+		evt.what = EVT_KEYUP;
+		evt.message = keyUpMsg[evt.message >> 8];
+		if (evt.message == 0)
+		    continue;
+		keyUpMsg[evt.message >> 8] = 0;
+		}
 
-            /* Now add the new event to the event queue */
-            addEvent(&evt);
-            }
-        rc2 = read(mouse_fd, (void *)&ms, sizeof (ms));
-        if (rc2 == -1) {
-            if (errno == EAGAIN)
-                rc2 = 0;
-            else {
-                perror("getEvents");
-                PM_fatalError("Mouse error");
-                }
-            }
-        if (rc2 > 0) {
-            memset(&evt, 0, sizeof(evt));
-            ms.hdr.buttons &=
-                (_POINTER_BUTTON_LEFT | _POINTER_BUTTON_RIGHT);
-            if (ms.hdr.buttons & _POINTER_BUTTON_LEFT)
-                but_stat = EVT_LEFTBUT;
-            if ((ms.hdr.buttons & _POINTER_BUTTON_LEFT) !=
-                (old_buttons & _POINTER_BUTTON_LEFT))
-                message = EVT_LEFTBMASK;
-            if (ms.hdr.buttons & _POINTER_BUTTON_RIGHT)
-                but_stat |= EVT_RIGHTBUT;
-            if ((ms.hdr.buttons & _POINTER_BUTTON_RIGHT) !=
-                (old_buttons & _POINTER_BUTTON_RIGHT))
-                message |= EVT_RIGHTBMASK;
-            if (ms.dx || ms.dy) {
-                ms.dy = -ms.dy;
-                EVT.mx += MickeyToPixel(ms.dx);
-                EVT.my += MickeyToPixel(ms.dy);
-                if (EVT.mx < 0) EVT.mx = 0;
-                if (EVT.my < 0) EVT.my = 0;
-                if (EVT.mx > rangeX)    EVT.mx = rangeX;
-                if (EVT.my > rangeY)    EVT.my = rangeY;
-                evt.what = EVT_MOUSEMOVE;
-                evt.when = TIME_TO_MSEC(ms.hdr.time);
-                evt.where_x = EVT.mx;
-                evt.where_y = EVT.my;
-                evt.relative_x = ms.dx;
-                evt.relative_y = ms.dy;
-                evt.modifiers = but_stat;
-                addEvent(&evt);
-                }
-            evt.what = ms.hdr.buttons < old_buttons ?
-                EVT_MOUSEUP : EVT_MOUSEDOWN;
-            evt.when = TIME_TO_MSEC(ms.hdr.time);
-            evt.where_x = EVT.mx;
-            evt.where_y = EVT.my;
-            evt.relative_x = ms.dx;
-            evt.relative_y = ms.dy;
-            evt.modifiers = but_stat;
-            evt.message = message;
-            if (ms.hdr.buttons != old_buttons) {
-                addEvent(&evt);
-                old_buttons = ms.hdr.buttons;
-                }
-            }
-        if (rc1 + rc2 == 0)
-            break;
-        }
+	    /* Now add the new event to the event queue */
+	    addEvent(&evt);
+	    }
+	rc2 = read(mouse_fd, (void *)&ms, sizeof (ms));
+	if (rc2 == -1) {
+	    if (errno == EAGAIN)
+		rc2 = 0;
+	    else {
+		perror("getEvents");
+		PM_fatalError("Mouse error");
+		}
+	    }
+	if (rc2 > 0) {
+	    memset(&evt, 0, sizeof(evt));
+	    ms.hdr.buttons &=
+		(_POINTER_BUTTON_LEFT | _POINTER_BUTTON_RIGHT);
+	    if (ms.hdr.buttons & _POINTER_BUTTON_LEFT)
+		but_stat = EVT_LEFTBUT;
+	    if ((ms.hdr.buttons & _POINTER_BUTTON_LEFT) !=
+		(old_buttons & _POINTER_BUTTON_LEFT))
+		message = EVT_LEFTBMASK;
+	    if (ms.hdr.buttons & _POINTER_BUTTON_RIGHT)
+		but_stat |= EVT_RIGHTBUT;
+	    if ((ms.hdr.buttons & _POINTER_BUTTON_RIGHT) !=
+		(old_buttons & _POINTER_BUTTON_RIGHT))
+		message |= EVT_RIGHTBMASK;
+	    if (ms.dx || ms.dy) {
+		ms.dy = -ms.dy;
+		EVT.mx += MickeyToPixel(ms.dx);
+		EVT.my += MickeyToPixel(ms.dy);
+		if (EVT.mx < 0) EVT.mx = 0;
+		if (EVT.my < 0) EVT.my = 0;
+		if (EVT.mx > rangeX)    EVT.mx = rangeX;
+		if (EVT.my > rangeY)    EVT.my = rangeY;
+		evt.what = EVT_MOUSEMOVE;
+		evt.when = TIME_TO_MSEC(ms.hdr.time);
+		evt.where_x = EVT.mx;
+		evt.where_y = EVT.my;
+		evt.relative_x = ms.dx;
+		evt.relative_y = ms.dy;
+		evt.modifiers = but_stat;
+		addEvent(&evt);
+		}
+	    evt.what = ms.hdr.buttons < old_buttons ?
+		EVT_MOUSEUP : EVT_MOUSEDOWN;
+	    evt.when = TIME_TO_MSEC(ms.hdr.time);
+	    evt.where_x = EVT.mx;
+	    evt.where_y = EVT.my;
+	    evt.relative_x = ms.dx;
+	    evt.relative_y = ms.dy;
+	    evt.modifiers = but_stat;
+	    evt.message = message;
+	    if (ms.hdr.buttons != old_buttons) {
+		addEvent(&evt);
+		old_buttons = ms.hdr.buttons;
+		}
+	    }
+	if (rc1 + rc2 == 0)
+	    break;
+	}
 }
 #else
 /****************************************************************************
@@ -290,66 +290,66 @@
 
     /* Poll keyboard events */
     while ((numkeys = read(_PM_keyboard_fd, buf, sizeof buf)) > 0) {
-        for (i = 0; i < numkeys; i++) {
-            processRawScanCode(buf[i]);
-            }
-        }
+	for (i = 0; i < numkeys; i++) {
+	    processRawScanCode(buf[i]);
+	    }
+	}
 
     if (_PM_mouse_ctl == NULL)
-        return;
+	return;
 
     /* Gobble pending mouse events */
     while (EVT.count < EVENTQSIZE) {
-        rc = mouse_read(_PM_mouse_ctl, &ev, 1, 0, NULL);
-        if (rc == -1) {
-            perror("getEvents");
-            PM_fatalError("Mouse error (Input terminated?)");
-            }
-        if (rc == 0)
-            break;
+	rc = mouse_read(_PM_mouse_ctl, &ev, 1, 0, NULL);
+	if (rc == -1) {
+	    perror("getEvents");
+	    PM_fatalError("Mouse error (Input terminated?)");
+	    }
+	if (rc == 0)
+	    break;
 
-        message = 0, but_stat = 0;
-        memset(&evt, 0, sizeof(evt));
+	message = 0, but_stat = 0;
+	memset(&evt, 0, sizeof(evt));
 
-        ev.buttons &= (_MOUSE_LEFT | _MOUSE_RIGHT);
-        if (ev.buttons & _MOUSE_LEFT)
-            but_stat = EVT_LEFTBUT;
-        if ((ev.buttons & _MOUSE_LEFT) != (old_buttons & _MOUSE_LEFT))
-            message = EVT_LEFTBMASK;
-        if (ev.buttons & _MOUSE_RIGHT)
-            but_stat |= EVT_RIGHTBUT;
-        if ((ev.buttons & _MOUSE_RIGHT) != (old_buttons & _MOUSE_RIGHT))
-            message |= EVT_RIGHTBMASK;
-        if (ev.dx || ev.dy) {
-            ev.dy = -ev.dy;
-            EVT.mx += MickeyToPixel(ev.dx);
-            EVT.my += MickeyToPixel(ev.dy);
-            if (EVT.mx < 0) EVT.mx = 0;
-            if (EVT.my < 0) EVT.my = 0;
-            if (EVT.mx > rangeX)    EVT.mx = rangeX;
-            if (EVT.my > rangeY)    EVT.my = rangeY;
-            evt.what = EVT_MOUSEMOVE;
-            evt.when = ev.timestamp*100;
-            evt.where_x = EVT.mx;
-            evt.where_y = EVT.my;
-            evt.relative_x = ev.dx;
-            evt.relative_y = ev.dy;
-            evt.modifiers = but_stat;
-            addEvent(&evt);
-            }
-        evt.what = ev.buttons < old_buttons ? EVT_MOUSEUP : EVT_MOUSEDOWN;
-        evt.when = ev.timestamp*100;
-        evt.where_x = EVT.mx;
-        evt.where_y = EVT.my;
-        evt.relative_x = ev.dx;
-        evt.relative_y = ev.dy;
-        evt.modifiers = but_stat;
-        evt.message = message;
-        if (ev.buttons != old_buttons) {
-            addEvent(&evt);
-            old_buttons = ev.buttons;
-            }
-        }
+	ev.buttons &= (_MOUSE_LEFT | _MOUSE_RIGHT);
+	if (ev.buttons & _MOUSE_LEFT)
+	    but_stat = EVT_LEFTBUT;
+	if ((ev.buttons & _MOUSE_LEFT) != (old_buttons & _MOUSE_LEFT))
+	    message = EVT_LEFTBMASK;
+	if (ev.buttons & _MOUSE_RIGHT)
+	    but_stat |= EVT_RIGHTBUT;
+	if ((ev.buttons & _MOUSE_RIGHT) != (old_buttons & _MOUSE_RIGHT))
+	    message |= EVT_RIGHTBMASK;
+	if (ev.dx || ev.dy) {
+	    ev.dy = -ev.dy;
+	    EVT.mx += MickeyToPixel(ev.dx);
+	    EVT.my += MickeyToPixel(ev.dy);
+	    if (EVT.mx < 0) EVT.mx = 0;
+	    if (EVT.my < 0) EVT.my = 0;
+	    if (EVT.mx > rangeX)    EVT.mx = rangeX;
+	    if (EVT.my > rangeY)    EVT.my = rangeY;
+	    evt.what = EVT_MOUSEMOVE;
+	    evt.when = ev.timestamp*100;
+	    evt.where_x = EVT.mx;
+	    evt.where_y = EVT.my;
+	    evt.relative_x = ev.dx;
+	    evt.relative_y = ev.dy;
+	    evt.modifiers = but_stat;
+	    addEvent(&evt);
+	    }
+	evt.what = ev.buttons < old_buttons ? EVT_MOUSEUP : EVT_MOUSEDOWN;
+	evt.when = ev.timestamp*100;
+	evt.where_x = EVT.mx;
+	evt.where_y = EVT.my;
+	evt.relative_x = ev.dx;
+	evt.relative_y = ev.dy;
+	evt.modifiers = but_stat;
+	evt.message = message;
+	if (ev.buttons != old_buttons) {
+	    addEvent(&evt);
+	    old_buttons = ev.buttons;
+	    }
+	}
 }
 #endif  /* __QNXNTO__ */
 
@@ -400,7 +400,7 @@
     char        buf[128];
     FILE        *p;
     int         argno,len;
-#endif  
+#endif
 
 #ifdef __QNXNTO__
     ThreadCtl(_NTO_TCTL_IO, 0); /* So joystick code won't blow up */
@@ -410,7 +410,7 @@
     EVT.mouseMove = mouseMove;
     initEventQueue();
     memset(keyUpMsg,0,sizeof(keyUpMsg));
-    
+
 #ifdef __QNXNTO__
     /*
      * User may already have input running with the right parameters.
@@ -419,82 +419,82 @@
      * manager.
      */
     if ((mouse_fd = open("/dev/mouse0", O_RDONLY | O_NONBLOCK)) < 0) {
-        /* Run inputtrap to get the args for input */
-        if ((p = popen("inputtrap", "r")) == NULL)
-            PM_fatalError("Error running 'inputtrap'");
-        fgets(buf, sizeof(buf), p);
-        pclose(p);
+	/* Run inputtrap to get the args for input */
+	if ((p = popen("inputtrap", "r")) == NULL)
+	    PM_fatalError("Error running 'inputtrap'");
+	fgets(buf, sizeof(buf), p);
+	pclose(p);
 
-        /* Build the argument list */
-        len = strlen(buf);
-        iarg[0] = buf;
-        for (i = 0, argno = 0; i < len && argno < 15;) {
-            if (argno == 1) {
-                /*
-                 * Add flags to input's arg list.
-                 * '-r' means run as resource
-                 * manager, providing the /dev/mouse
-                 * and /dev/keyboard interfaces.
-                 * '-P' supresses the /dev/photon
-                 * mechanism.
-                 */
-                iarg[argno++] = "-Pr";
-                continue;
-                }
-            while (buf[i] == ' ')
-                i++;
-            if (buf[i] == '\0' || buf[i] == '\n')
-                break;
-            iarg[argno++] = &buf[i];
-            while (buf[i] != ' '
-                && buf[i] != '\0' && buf[i] != '\n')
-                i++;
-            buf[i++] = '\0';
-            }
-        iarg[argno] = NULL;
-            
-        if ((kill_pid = spawnvp(P_NOWAITO, iarg[0], iarg)) == -1) {
-            perror("spawning input resmgr");
-            PM_fatalError("Could not start input resmgr");
-            }
-        for (i = 0; i < 10; i++) {
-            if (stat("/dev/mouse0", &st) == 0)
-                break;
-            sleep(1);
-            }
-        if ((mouse_fd = open("/dev/mouse0", O_RDONLY|O_NONBLOCK)) < 0) {
-            perror("/dev/mouse0");
-            PM_fatalError("Could not open /dev/mouse0");
-            }
-        }
+	/* Build the argument list */
+	len = strlen(buf);
+	iarg[0] = buf;
+	for (i = 0, argno = 0; i < len && argno < 15;) {
+	    if (argno == 1) {
+		/*
+		 * Add flags to input's arg list.
+		 * '-r' means run as resource
+		 * manager, providing the /dev/mouse
+		 * and /dev/keyboard interfaces.
+		 * '-P' supresses the /dev/photon
+		 * mechanism.
+		 */
+		iarg[argno++] = "-Pr";
+		continue;
+		}
+	    while (buf[i] == ' ')
+		i++;
+	    if (buf[i] == '\0' || buf[i] == '\n')
+		break;
+	    iarg[argno++] = &buf[i];
+	    while (buf[i] != ' '
+		&& buf[i] != '\0' && buf[i] != '\n')
+		i++;
+	    buf[i++] = '\0';
+	    }
+	iarg[argno] = NULL;
+
+	if ((kill_pid = spawnvp(P_NOWAITO, iarg[0], iarg)) == -1) {
+	    perror("spawning input resmgr");
+	    PM_fatalError("Could not start input resmgr");
+	    }
+	for (i = 0; i < 10; i++) {
+	    if (stat("/dev/mouse0", &st) == 0)
+		break;
+	    sleep(1);
+	    }
+	if ((mouse_fd = open("/dev/mouse0", O_RDONLY|O_NONBLOCK)) < 0) {
+	    perror("/dev/mouse0");
+	    PM_fatalError("Could not open /dev/mouse0");
+	    }
+	}
     if ((kbd_fd = open("/dev/keyboard0", O_RDONLY|O_NONBLOCK)) < 0) {
-        perror("/dev/keyboard0");
-        PM_fatalError("Could not open /dev/keyboard0");
-        }
+	perror("/dev/keyboard0");
+	PM_fatalError("Could not open /dev/keyboard0");
+	}
 #else
     /* Connect to Input/Mouse for event handling */
     if (_PM_mouse_ctl == NULL) {
-        _PM_mouse_ctl = mouse_open(0, "/dev/mouse", 0);
+	_PM_mouse_ctl = mouse_open(0, "/dev/mouse", 0);
 
-        /* "Mouse" is not running; attempt to start it */
-        if (_PM_mouse_ctl == NULL) {
-            iarg[0] = "mousetrap";
-            iarg[1] = "start";
-            iarg[2] = NULL;
-            if ((kill_pid = spawnvp(P_NOWAITO, iarg[0], (void*)iarg)) == -1)
-                perror("spawn (mousetrap)");
-            else {
-                for (i = 0; i < 10; i++) {
-                    if (stat("/dev/mouse", &st) == 0)
-                        break;
-                    sleep(1);
-                    }
-                _PM_mouse_ctl = mouse_open(0, "/dev/mouse", 0);
-                }
-            }
-        }
+	/* "Mouse" is not running; attempt to start it */
+	if (_PM_mouse_ctl == NULL) {
+	    iarg[0] = "mousetrap";
+	    iarg[1] = "start";
+	    iarg[2] = NULL;
+	    if ((kill_pid = spawnvp(P_NOWAITO, iarg[0], (void*)iarg)) == -1)
+		perror("spawn (mousetrap)");
+	    else {
+		for (i = 0; i < 10; i++) {
+		    if (stat("/dev/mouse", &st) == 0)
+			break;
+		    sleep(1);
+		    }
+		_PM_mouse_ctl = mouse_open(0, "/dev/mouse", 0);
+		}
+	    }
+	}
     if (_PM_keyboard_fd == -1)
-        _PM_keyboard_fd = open("/dev/kbd", O_RDONLY|O_NONBLOCK);
+	_PM_keyboard_fd = open("/dev/kbd", O_RDONLY|O_NONBLOCK);
 #endif
 
     /* Catch program termination signals so we can clean up properly */
@@ -532,7 +532,7 @@
 ****************************************************************************/
 void EVT_resume(void)
 {
-    // Do nothing for QNX
+    /* Do nothing for QNX */
 }
 
 /****************************************************************************
@@ -542,7 +542,7 @@
 ****************************************************************************/
 void EVT_suspend(void)
 {
-    // Do nothing for QNX
+    /* Do nothing for QNX */
 }
 
 /****************************************************************************
@@ -556,13 +556,13 @@
     int flags;
 
     if (kbd_fd != -1) {
-        close(kbd_fd);
-        kbd_fd = -1;
-        }
+	close(kbd_fd);
+	kbd_fd = -1;
+	}
     if (mouse_fd != -1) {
-        close(mouse_fd);
-        mouse_fd = -1;
-        }
+	close(mouse_fd);
+	mouse_fd = -1;
+	}
 #endif
 
     /* Restore signal handlers */
@@ -573,30 +573,29 @@
 #ifndef __QNXNTO__
     /* Kill the Input/Mouse driver if we have spawned it */
     if (_PM_mouse_ctl != NULL) {
-        struct _fd_entry    fde;
-        uint            pid = 0;
+	struct _fd_entry    fde;
+	uint            pid = 0;
 
-        /* Find out the pid of the mouse driver */
-        if (kill_pid > 0) {
-            if (qnx_fd_query(0,
-                0, _PM_mouse_ctl->fd, &fde) != -1)
-                pid = fde.pid;
-            }
-        mouse_close(_PM_mouse_ctl);
-        _PM_mouse_ctl = NULL;
+	/* Find out the pid of the mouse driver */
+	if (kill_pid > 0) {
+	    if (qnx_fd_query(0,
+		0, _PM_mouse_ctl->fd, &fde) != -1)
+		pid = fde.pid;
+	    }
+	mouse_close(_PM_mouse_ctl);
+	_PM_mouse_ctl = NULL;
 
-        if (pid > 0) {
-            /* For some reasons the PID's are different under QNX4,
-             * so we use the old mechanism to kill the mouse server.
-             */
-            kill(pid, SIGTERM);
-            kill_pid = 0;
-            }
-        }
+	if (pid > 0) {
+	    /* For some reasons the PID's are different under QNX4,
+	     * so we use the old mechanism to kill the mouse server.
+	     */
+	    kill(pid, SIGTERM);
+	    kill_pid = 0;
+	    }
+	}
 #endif
     if (kill_pid > 0) {
-        kill(kill_pid, SIGTERM);
-        kill_pid = 0;
-        }
+	kill(kill_pid, SIGTERM);
+	kill_pid = 0;
+	}
 }
-

diff --git a/board/MAI/bios_emulator/scitech/src/pm/qnx/mtrrqnx.c b/board/MAI/bios_emulator/scitech/src/pm/qnx/mtrrqnx.c
index de749e3..f960c75 100644
--- a/board/MAI/bios_emulator/scitech/src/pm/qnx/mtrrqnx.c
+++ b/board/MAI/bios_emulator/scitech/src/pm/qnx/mtrrqnx.c

@@ -75,7 +75,7 @@
 ibool _ASMAPI _MTRR_isRing0(void)
 {
 #ifdef __QNXNTO__
-    return false;   // Not implemented yet!
+    return false;   /* Not implemented yet! */
 #else
     return true;
 #endif
@@ -101,15 +101,15 @@
 #endif
 #ifdef __QNXNTO__
     if ((intrid = InterruptAttach(_NTO_INTR_CLASS_EXTERNAL | clock_intno,
-        _PM_ring0_isr, (void*)&_PM_R0, sizeof(_PM_R0), _NTO_INTR_FLAGS_END)) == -1) {
+	_PM_ring0_isr, (void*)&_PM_R0, sizeof(_PM_R0), _NTO_INTR_FLAGS_END)) == -1) {
 #else
     if ((intrid = qnx_hint_attach(clock_intno, _PM_ring0_isr, FP_SEG(&_PM_R0))) == -1) {
 #endif
-        perror("Attach");
-        exit(-1);
-        }
+	perror("Attach");
+	exit(-1);
+	}
     while (_PM_R0.service != -1)
-        ;
+	;
 #ifdef __QNXNTO__
     InterruptDetachId(intrid);
 #else

diff --git a/board/MAI/bios_emulator/scitech/src/pm/qnx/pm.c b/board/MAI/bios_emulator/scitech/src/pm/qnx/pm.c
index c2b41eb..c993ee0 100644
--- a/board/MAI/bios_emulator/scitech/src/pm/qnx/pm.c
+++ b/board/MAI/bios_emulator/scitech/src/pm/qnx/pm.c

@@ -77,11 +77,11 @@
 
     if (VRegs == NULL) {
 #ifdef  __QNXNTO__
-        ThreadCtl(_NTO_TCTL_IO, 0); /* Get IO privilidge */
+	ThreadCtl(_NTO_TCTL_IO, 0); /* Get IO privilidge */
 #endif
-        force = getenv("VBIOS_METHOD");
-        VRegs = VBIOSinit(force ? atoi(force) : 0);
-        }
+	force = getenv("VBIOS_METHOD");
+	VRegs = VBIOSinit(force ? atoi(force) : 0);
+	}
 #ifndef  __QNXNTO__
     MTRR_init();
 #endif
@@ -100,9 +100,9 @@
 {
     uint pos = strlen(s);
     if (s[pos-1] != '/') {
-        s[pos] = '/';
-        s[pos+1] = '\0';
-        }
+	s[pos] = '/';
+	s[pos+1] = '\0';
+	}
 }
 
 void PMAPI PM_setFatalErrorCleanup(
@@ -114,7 +114,7 @@
 void PMAPI PM_fatalError(const char *msg)
 {
     if (fatalErrorCleanup)
-        fatalErrorCleanup();
+	fatalErrorCleanup();
     fprintf(stderr,"%s\n", msg);
     exit(1);
 }
@@ -122,18 +122,18 @@
 static void ExitVBEBuf(void)
 {
     if (VESABuf_ptr)
-        PM_freeRealSeg(VESABuf_ptr);
+	PM_freeRealSeg(VESABuf_ptr);
     VESABuf_ptr = 0;
 }
 
 void * PMAPI PM_getVESABuf(uint *len,uint *rseg,uint *roff)
 {
     if (!VESABuf_ptr) {
-        /* Allocate a global buffer for communicating with the VESA VBE */
-        if ((VESABuf_ptr = PM_allocRealSeg(VESABuf_len, &VESABuf_rseg, &VESABuf_roff)) == NULL)
-            return NULL;
-        atexit(ExitVBEBuf);
-        }
+	/* Allocate a global buffer for communicating with the VESA VBE */
+	if ((VESABuf_ptr = PM_allocRealSeg(VESABuf_len, &VESABuf_rseg, &VESABuf_roff)) == NULL)
+	    return NULL;
+	atexit(ExitVBEBuf);
+	}
     *len = VESABuf_len;
     *rseg = VESABuf_rseg;
     *roff = VESABuf_roff;
@@ -145,11 +145,11 @@
     struct termios  termios_p;
 
     if (raw_count++ > 0)
-        return 0;
+	return 0;
 
     /* Go into "raw" input mode */
     if (tcgetattr(STDIN_FILENO, &termios_p))
-        return -1;
+	return -1;
 
     termios_p.c_cc[VMIN] =  1;
     termios_p.c_cc[VTIME] =  0;
@@ -163,7 +163,7 @@
     struct termios  termios_p;
 
     if (raw_count-- != 1)
-        return;
+	return;
 
     tcgetattr(STDIN_FILENO, &termios_p);
     termios_p.c_lflag |= (ECHO|ICANON|ISIG|ECHOE|ECHOK|ECHONL);
@@ -176,7 +176,7 @@
     int blocking, c;
 
     if (term_raw() == -1)
-        return 0;
+	return 0;
 
     /* Go into non blocking mode */
     blocking = fcntl(STDIN_FILENO, F_GETFL) | O_NONBLOCK;
@@ -187,9 +187,9 @@
     fcntl(STDIN_FILENO, F_SETFL, blocking & ~O_NONBLOCK);
     term_restore();
     if (c != EOF) {
-        ungetc(c, stdin);
-        return c;
-        }
+	ungetc(c, stdin);
+	return c;
+	}
     clearerr(stdin);
     return 0;
 }
@@ -199,13 +199,13 @@
     int c;
 
     if (term_raw() == -1)
-        return (0);
+	return (0);
     c = getc(stdin);
 #if defined(__QNX__) && !defined(__QNXNTO__)
     if (c == 0xA)
-        c = 0x0D;
+	c = 0x0D;
     else if (c == 0x7F)
-        c = 0x08;
+	c = 0x08;
 #endif
     term_restore();
     return c;
@@ -223,13 +223,13 @@
     int fd;
 
     if (console_count++)
-        return 0;
+	return 0;
     if ((fd = open("/dev/con1", O_RDWR)) == -1)
-        return -1;
+	return -1;
     cc = console_open(fd, O_RDWR);
     close(fd);
     if (cc == NULL)
-        return -1;
+	return -1;
 #endif
     return 1;
 }
@@ -246,7 +246,7 @@
     int     flags;
 
     if ((fd = open("/dev/con1", O_RDWR)) == -1)
-        return;
+	return;
     flags = _CONCTL_INVISIBLE_CHG | _CONCTL_INVISIBLE;
     devctl(fd, DCMD_CHR_SERCTL, &flags, sizeof flags, 0);
     close(fd);
@@ -255,10 +255,10 @@
 
     /* Save QNX 4 console state */
     console_read(cc, -1, 0, NULL, 0,
-        (int *)buf+1, (int *)buf+2, NULL);
+	(int *)buf+1, (int *)buf+2, NULL);
     *(int *)buf = console_ctrl(cc, -1,
-        CONSOLE_NORESIZE | CONSOLE_NOSWITCH | CONSOLE_INVISIBLE,
-        CONSOLE_NORESIZE | CONSOLE_NOSWITCH | CONSOLE_INVISIBLE);
+	CONSOLE_NORESIZE | CONSOLE_NOSWITCH | CONSOLE_INVISIBLE,
+	CONSOLE_NORESIZE | CONSOLE_NOSWITCH | CONSOLE_INVISIBLE);
 
     /* Save state of VGA registers */
     PM_saveVGAState(stateBuf);
@@ -277,7 +277,7 @@
     int     flags;
 
     if ((fd = open("/dev/con1", O_RDWR)) == -1)
-        return;
+	return;
     flags = _CONCTL_INVISIBLE_CHG;
     devctl(fd, DCMD_CHR_SERCTL, &flags, sizeof flags, 0);
     close(fd);
@@ -289,9 +289,9 @@
 
     /* Restore QNX 4 console state */
     console_ctrl(cc, -1, *(int *)buf,
-        CONSOLE_NORESIZE | CONSOLE_NOSWITCH | CONSOLE_INVISIBLE);
+	CONSOLE_NORESIZE | CONSOLE_NOSWITCH | CONSOLE_INVISIBLE);
     console_write(cc, -1, 0, NULL, 0,
-        (int *)buf+1, (int *)buf+2, NULL);
+	(int *)buf+1, (int *)buf+2, NULL);
 #endif
 }
 
@@ -299,16 +299,16 @@
 {
 #ifndef __QNXNTO__
     if (--console_count == 0) {
-        console_close(cc);
-        cc = NULL;
-        }
+	console_close(cc);
+	cc = NULL;
+	}
 #endif
 }
 
 void PM_setOSCursorLocation(int x,int y)
 {
     if (!cc)
-        return;
+	return;
 #ifndef __QNXNTO__
     console_write(cc, -1, 0, NULL, 0, &y, &x, NULL);
 #endif
@@ -320,18 +320,18 @@
 
 ibool PMAPI PM_setRealTimeClockHandler(PM_intHandler ih, int frequency)
 {
-    // TODO: Implement this for QNX
+    /* TODO: Implement this for QNX */
     return false;
 }
 
 void PMAPI PM_setRealTimeClockFrequency(int frequency)
 {
-    // TODO: Implement this for QNX
+    /* TODO: Implement this for QNX */
 }
 
 void PMAPI PM_restoreRealTimeClockHandler(void)
 {
-    // TODO: Implement this for QNX
+    /* TODO: Implement this for QNX */
 }
 
 char * PMAPI PM_getCurrentPath(
@@ -388,10 +388,10 @@
     sprintf(path,"/etc/config/scitech/%d/config", getnid());
 #endif
     if ((env = getenv("NUCLEUS_PATH")) != NULL) {
-        strcpy(path,env);
-        PM_backslash(path);
-        strcat(path,"config");
-        }
+	strcpy(path,env);
+	PM_backslash(path);
+	strcat(path,"config");
+	}
     return path;
 }
 
@@ -429,26 +429,26 @@
     unsigned offset, i, maplen;
 
     if (ptr != NULL)
-        return ptr;
+	return ptr;
 
     /* Some trickery is required to get the linear address 64K aligned */
     for (i = 0; i < 5; i++) {
-        ptr = PM_mapPhysicalAddr(0xA0000,0xFFFF,true);
-        offset = 0x10000 - ((unsigned)ptr % 0x10000);
-        if (!offset)
-            break;
-        munmap(ptr, 0x10000);
-        maplen = 0x10000 + offset;
-        freeptr = PM_mapPhysicalAddr(0xA0000-offset, maplen-1,true);
-        ptr = (void *)(offset + (unsigned)freeptr);
-        if (0x10000 - ((unsigned)ptr % 0x10000))
-            break;
-        munmap(freeptr, maplen);
-        }
+	ptr = PM_mapPhysicalAddr(0xA0000,0xFFFF,true);
+	offset = 0x10000 - ((unsigned)ptr % 0x10000);
+	if (!offset)
+	    break;
+	munmap(ptr, 0x10000);
+	maplen = 0x10000 + offset;
+	freeptr = PM_mapPhysicalAddr(0xA0000-offset, maplen-1,true);
+	ptr = (void *)(offset + (unsigned)freeptr);
+	if (0x10000 - ((unsigned)ptr % 0x10000))
+	    break;
+	munmap(freeptr, maplen);
+	}
     if (i == 5) {
-        printf("Could not get a 64K aligned linear address for A0000 region\n");
-        exit(1);
-        }
+	printf("Could not get a 64K aligned linear address for A0000 region\n");
+	exit(1);
+	}
     return ptr;
 }
 
@@ -468,31 +468,31 @@
 #endif
 
     if (rounddown) {
-        if (base < rounddown)
-            return NULL;
-        base -= rounddown;
-        limit += rounddown;
-        }
+	if (base < rounddown)
+	    return NULL;
+	base -= rounddown;
+	limit += rounddown;
+	}
 
 #ifndef __QNXNTO__
     if (__VidFD < 0) {
-        if ((__VidFD = shm_open( "Physical", O_RDWR, 0777 )) == -1) {
-            perror( "Cannot open Physical memory" );
-            exit(1);
-            }
-        }
+	if ((__VidFD = shm_open( "Physical", O_RDWR, 0777 )) == -1) {
+	    perror( "Cannot open Physical memory" );
+	    exit(1);
+	    }
+	}
     o = base & 0xFFF;
     limit = (limit + o + 0xFFF) & ~0xFFF;
     if ((int)(p = mmap( 0, limit, prot, MAP_SHARED,
-            __VidFD, base )) == -1 ) {
-        return NULL;
-        }
+	    __VidFD, base )) == -1 ) {
+	return NULL;
+	}
     p += o;
 #else
     if ((p = mmap(0, limit, prot, MAP_PHYS | MAP_SHARED,
-            NOFD, base)) == MAP_FAILED) {
-        return (void *)-1;
-        }
+	    NOFD, base)) == MAP_FAILED) {
+	return (void *)-1;
+	}
 #endif
     return (p + rounddown);
 }
@@ -504,8 +504,8 @@
 
 ulong PMAPI PM_getPhysicalAddr(void *p)
 {
-    // TODO: This function should find the physical address of a linear
-    //       address.
+    /* TODO: This function should find the physical address of a linear */
+    /*       address. */
     return 0xFFFFFFFFUL;
 }
 
@@ -514,35 +514,35 @@
     ulong length,
     ulong *physAddress)
 {
-    // TODO: Implement this!
+    /* TODO: Implement this! */
     return false;
 }
 
 void PMAPI PM_sleep(ulong milliseconds)
 {
-    // TODO: Put the process to sleep for milliseconds
+    /* TODO: Put the process to sleep for milliseconds */
 }
 
 int PMAPI PM_getCOMPort(int port)
 {
-    // TODO: Re-code this to determine real values using the Plug and Play
-    //       manager for the OS.
+    /* TODO: Re-code this to determine real values using the Plug and Play */
+    /*       manager for the OS. */
     switch (port) {
-        case 0: return 0x3F8;
-        case 1: return 0x2F8;
-        }
+	case 0: return 0x3F8;
+	case 1: return 0x2F8;
+	}
     return 0;
 }
 
 int PMAPI PM_getLPTPort(int port)
 {
-    // TODO: Re-code this to determine real values using the Plug and Play
-    //       manager for the OS.
+    /* TODO: Re-code this to determine real values using the Plug and Play */
+    /*       manager for the OS. */
     switch (port) {
-        case 0: return 0x3BC;
-        case 1: return 0x378;
-        case 2: return 0x278;
-        }
+	case 0: return 0x3BC;
+	case 1: return 0x378;
+	case 2: return 0x278;
+	}
     return 0;
 }
 
@@ -566,20 +566,20 @@
     PM_init();
 
     if ((p = VBIOSgetmemptr(r_seg, r_off, VRegs)) == (void *)-1)
-        return NULL;
+	return NULL;
     return p;
 }
 
 void * PMAPI PM_allocRealSeg(uint size,uint *r_seg,uint *r_off)
 {
     if (size > 1024) {
-        printf("PM_allocRealSeg: can't handle %d bytes\n", size);
-        return 0;
-        }
+	printf("PM_allocRealSeg: can't handle %d bytes\n", size);
+	return 0;
+	}
     if (rmbuf_inuse != 0) {
-        printf("PM_allocRealSeg: transfer area already in use\n");
-        return 0;
-        }
+	printf("PM_allocRealSeg: transfer area already in use\n");
+	return 0;
+	}
     PM_init();
     rmbuf_inuse = 1;
     *r_seg = VBIOS_TransBufVSeg(VRegs);
@@ -590,9 +590,9 @@
 void PMAPI PM_freeRealSeg(void *mem)
 {
     if (rmbuf_inuse == 0) {
-        printf("PM_freeRealSeg: nothing was allocated\n");
-        return;
-        }
+	printf("PM_freeRealSeg: nothing was allocated\n");
+	return;
+	}
     rmbuf_inuse = 0;
 }
 
@@ -600,7 +600,7 @@
 {
     PM_init();
     if (VRegs == NULL)
-        return;
+	return;
 
     VRegs->l.eax = regs->eax;
     VRegs->l.ebx = regs->ebx;
@@ -624,7 +624,7 @@
 {
     PM_init();
     if (VRegs == NULL)
-        return 0;
+	return 0;
 
     VRegs->l.eax = in->e.eax;
     VRegs->l.ebx = in->e.ebx;
@@ -651,41 +651,41 @@
 {
     PM_init();
     if (VRegs == NULL)
-        return 0;
+	return 0;
 
     if (intno == 0x21) {
-        time_t today = time(NULL);
-        struct tm *t;
-        t = localtime(&today);
-        out->x.cx = t->tm_year + 1900;
-        out->h.dh = t->tm_mon + 1;
-        out->h.dl = t->tm_mday;
-        return 0;
-        }
+	time_t today = time(NULL);
+	struct tm *t;
+	t = localtime(&today);
+	out->x.cx = t->tm_year + 1900;
+	out->h.dh = t->tm_mon + 1;
+	out->h.dl = t->tm_mday;
+	return 0;
+	}
     else {
-        VRegs->l.eax = in->e.eax;
-        VRegs->l.ebx = in->e.ebx;
-        VRegs->l.ecx = in->e.ecx;
-        VRegs->l.edx = in->e.edx;
-        VRegs->l.esi = in->e.esi;
-        VRegs->l.edi = in->e.edi;
-        VRegs->w.es = sregs->es;
-        VRegs->w.ds = sregs->ds;
+	VRegs->l.eax = in->e.eax;
+	VRegs->l.ebx = in->e.ebx;
+	VRegs->l.ecx = in->e.ecx;
+	VRegs->l.edx = in->e.edx;
+	VRegs->l.esi = in->e.esi;
+	VRegs->l.edi = in->e.edi;
+	VRegs->w.es = sregs->es;
+	VRegs->w.ds = sregs->ds;
 
-        VBIOSint(intno, VRegs, 1024);
+	VBIOSint(intno, VRegs, 1024);
 
-        out->e.eax = VRegs->l.eax;
-        out->e.ebx = VRegs->l.ebx;
-        out->e.ecx = VRegs->l.ecx;
-        out->e.edx = VRegs->l.edx;
-        out->e.esi = VRegs->l.esi;
-        out->e.edi = VRegs->l.edi;
-        out->x.cflag = VRegs->w.flags & 0x1;
-        sregs->es = VRegs->w.es;
-        sregs->ds = VRegs->w.ds;
+	out->e.eax = VRegs->l.eax;
+	out->e.ebx = VRegs->l.ebx;
+	out->e.ecx = VRegs->l.ecx;
+	out->e.edx = VRegs->l.edx;
+	out->e.esi = VRegs->l.esi;
+	out->e.edi = VRegs->l.edi;
+	out->x.cflag = VRegs->w.flags & 0x1;
+	sregs->es = VRegs->w.es;
+	sregs->ds = VRegs->w.ds;
 
-        return out->x.ax;
-        }
+	return out->x.ax;
+	}
 }
 
 void PMAPI PM_callRealMode(uint seg,uint off, RMREGS *in,
@@ -693,7 +693,7 @@
 {
     PM_init();
     if (VRegs == NULL)
-        return;
+	return;
 
     VRegs->l.eax = in->e.eax;
     VRegs->l.ebx = in->e.ebx;
@@ -730,7 +730,7 @@
     ibool contiguous,
     ibool below16M)
 {
-    // TODO: Implement this on QNX
+    /* TODO: Implement this on QNX */
     return NULL;
 }
 
@@ -739,27 +739,27 @@
     uint size,
     ibool contiguous)
 {
-    // TODO: Implement this on QNX
+    /* TODO: Implement this on QNX */
 }
 
 void * PMAPI PM_allocPage(
     ibool locked)
 {
-    // TODO: Implement this on QNX
+    /* TODO: Implement this on QNX */
     return NULL;
 }
 
 void PMAPI PM_freePage(
     void *p)
 {
-    // TODO: Implement this on QNX
+    /* TODO: Implement this on QNX */
 }
 
 void PMAPI PM_setBankA(int bank)
 {
     PM_init();
     if (VRegs == NULL)
-        return;
+	return;
 
     VRegs->l.eax = 0x4F05;
     VRegs->l.ebx = 0x0000;
@@ -771,7 +771,7 @@
 {
     PM_init();
     if (VRegs == NULL)
-        return;
+	return;
 
     VRegs->l.eax = 0x4F05;
     VRegs->l.ebx = 0x0000;
@@ -788,7 +788,7 @@
 {
     PM_init();
     if (VRegs == NULL)
-        return;
+	return;
 
     VRegs->l.eax = 0x4F07;
     VRegs->l.ebx = waitVRT;
@@ -837,7 +837,7 @@
 PM_MODULE PMAPI PM_loadLibrary(
     const char *szDLLName)
 {
-    // TODO: Implement this to load shared libraries!
+    /* TODO: Implement this to load shared libraries! */
     (void)szDLLName;
     return NULL;
 }
@@ -846,7 +846,7 @@
     PM_MODULE hModule,
     const char *szProcName)
 {
-    // TODO: Implement this!
+    /* TODO: Implement this! */
     (void)hModule;
     (void)szProcName;
     return NULL;
@@ -855,14 +855,14 @@
 void PMAPI PM_freeLibrary(
     PM_MODULE hModule)
 {
-    // TODO: Implement this!
+    /* TODO: Implement this! */
     (void)hModule;
 }
 
 int PMAPI PM_setIOPL(
     int level)
 {
-    // QNX handles IOPL selection at the program link level.
+    /* QNX handles IOPL selection at the program link level. */
     return level;
 }
 

diff --git a/board/MAI/bios_emulator/scitech/src/pm/rttarget/cpuinfo.c b/board/MAI/bios_emulator/scitech/src/pm/rttarget/cpuinfo.c
index 3d6dd44..4f32c3e 100644
--- a/board/MAI/bios_emulator/scitech/src/pm/rttarget/cpuinfo.c
+++ b/board/MAI/bios_emulator/scitech/src/pm/rttarget/cpuinfo.c

@@ -46,7 +46,7 @@
 
     oldPriority = GetThreadPriority(hThread);
     if (oldPriority != THREAD_PRIORITY_ERROR_RETURN)
-        SetThreadPriority(hThread, THREAD_PRIORITY_TIME_CRITICAL);
+	SetThreadPriority(hThread, THREAD_PRIORITY_TIME_CRITICAL);
     return oldPriority;
 }
 
@@ -60,7 +60,7 @@
     HANDLE  hThread = GetCurrentThread();
 
     if (oldPriority != THREAD_PRIORITY_ERROR_RETURN)
-        SetThreadPriority(hThread, oldPriority);
+	SetThreadPriority(hThread, oldPriority);
 }
 
 /****************************************************************************
@@ -71,12 +71,12 @@
     CPU_largeInteger *freq)
 {
     if (!QueryPerformanceFrequency((LARGE_INTEGER*)freq)) {
-        havePerformanceCounter = false;
-        freq->low = 100000;
-        freq->high = 0;
-        }
+	havePerformanceCounter = false;
+	freq->low = 100000;
+	freq->high = 0;
+	}
     else
-        havePerformanceCounter = true;
+	havePerformanceCounter = true;
 }
 
 /****************************************************************************
@@ -86,9 +86,9 @@
 #define GetCounter(t)                                       \
 {                                                           \
     if (havePerformanceCounter)                             \
-        QueryPerformanceCounter((LARGE_INTEGER*)t);         \
+	QueryPerformanceCounter((LARGE_INTEGER*)t);         \
     else {                                                  \
-        (t)->low = timeGetTime() * 100;                     \
-        (t)->high = 0;                                      \
-        }                                                   \
+	(t)->low = timeGetTime() * 100;                     \
+	(t)->high = 0;                                      \
+	}                                                   \
 }

diff --git a/board/MAI/bios_emulator/scitech/src/pm/rttarget/event.c b/board/MAI/bios_emulator/scitech/src/pm/rttarget/event.c
index e9aba21..962a14a 100644
--- a/board/MAI/bios_emulator/scitech/src/pm/rttarget/event.c
+++ b/board/MAI/bios_emulator/scitech/src/pm/rttarget/event.c

@@ -71,113 +71,113 @@
     event_t evt;
 
     while (PeekMessage(&msg,NULL,0,0,PM_REMOVE)) {
-        memset(&evt,0,sizeof(evt));
-        switch (msg.message) {
-            case WM_MOUSEMOVE:
-                evt.what = EVT_MOUSEMOVE;
-                break;
-            case WM_LBUTTONDBLCLK:
-                evt.what = EVT_MOUSEDOWN;
-                evt.message = EVT_LEFTBMASK | EVT_DBLCLICK;
-                break;
-            case WM_LBUTTONDOWN:
-                evt.what = EVT_MOUSEDOWN;
-                evt.message = EVT_LEFTBMASK;
-                break;
-            case WM_LBUTTONUP:
-                evt.what = EVT_MOUSEUP;
-                evt.message = EVT_LEFTBMASK;
-                break;
-            case WM_RBUTTONDBLCLK:
-                evt.what = EVT_MOUSEDOWN | EVT_DBLCLICK;
-                evt.message = EVT_RIGHTBMASK;
-                break;
-            case WM_RBUTTONDOWN:
-                evt.what = EVT_MOUSEDOWN;
-                evt.message = EVT_RIGHTBMASK;
-                break;
-            case WM_RBUTTONUP:
-                evt.what = EVT_MOUSEUP;
-                evt.message = EVT_RIGHTBMASK;
-                break;
-            case WM_KEYDOWN:
-            case WM_SYSKEYDOWN:
-                if (HIWORD(msg.lParam) & KF_REPEAT) {
-                    evt.what = EVT_KEYREPEAT;
-                    }
-                else {
-                    evt.what = EVT_KEYDOWN;
-                    }
-                break;
-            case WM_KEYUP:
-            case WM_SYSKEYUP:
-                evt.what = EVT_KEYUP;
-                break;
-            }
+	memset(&evt,0,sizeof(evt));
+	switch (msg.message) {
+	    case WM_MOUSEMOVE:
+		evt.what = EVT_MOUSEMOVE;
+		break;
+	    case WM_LBUTTONDBLCLK:
+		evt.what = EVT_MOUSEDOWN;
+		evt.message = EVT_LEFTBMASK | EVT_DBLCLICK;
+		break;
+	    case WM_LBUTTONDOWN:
+		evt.what = EVT_MOUSEDOWN;
+		evt.message = EVT_LEFTBMASK;
+		break;
+	    case WM_LBUTTONUP:
+		evt.what = EVT_MOUSEUP;
+		evt.message = EVT_LEFTBMASK;
+		break;
+	    case WM_RBUTTONDBLCLK:
+		evt.what = EVT_MOUSEDOWN | EVT_DBLCLICK;
+		evt.message = EVT_RIGHTBMASK;
+		break;
+	    case WM_RBUTTONDOWN:
+		evt.what = EVT_MOUSEDOWN;
+		evt.message = EVT_RIGHTBMASK;
+		break;
+	    case WM_RBUTTONUP:
+		evt.what = EVT_MOUSEUP;
+		evt.message = EVT_RIGHTBMASK;
+		break;
+	    case WM_KEYDOWN:
+	    case WM_SYSKEYDOWN:
+		if (HIWORD(msg.lParam) & KF_REPEAT) {
+		    evt.what = EVT_KEYREPEAT;
+		    }
+		else {
+		    evt.what = EVT_KEYDOWN;
+		    }
+		break;
+	    case WM_KEYUP:
+	    case WM_SYSKEYUP:
+		evt.what = EVT_KEYUP;
+		break;
+	    }
 
-        /* Convert mouse event modifier flags */
-        if (evt.what & EVT_MOUSEEVT) {
-            evt.where_x = msg.pt.x;
-            evt.where_y = msg.pt.y;
-            if (evt.what == EVT_MOUSEMOVE) {
-                if (oldMove != -1) {
-                    evtq[oldMove].where_x = evt.where_x;/* Modify existing one  */
-                    evtq[oldMove].where_y = evt.where_y;
-                    evt.what = 0;
-                    }
-                else {
-                    oldMove = freeHead; /* Save id of this move event   */
-                    }
-                }
-            else
-                oldMove = -1;
-            if (msg.wParam & MK_LBUTTON)
-                evt.modifiers |= EVT_LEFTBUT;
-            if (msg.wParam & MK_RBUTTON)
-                evt.modifiers |= EVT_RIGHTBUT;
-            if (msg.wParam & MK_SHIFT)
-                evt.modifiers |= EVT_SHIFTKEY;
-            if (msg.wParam & MK_CONTROL)
-                evt.modifiers |= EVT_CTRLSTATE;
-            }
+	/* Convert mouse event modifier flags */
+	if (evt.what & EVT_MOUSEEVT) {
+	    evt.where_x = msg.pt.x;
+	    evt.where_y = msg.pt.y;
+	    if (evt.what == EVT_MOUSEMOVE) {
+		if (oldMove != -1) {
+		    evtq[oldMove].where_x = evt.where_x;/* Modify existing one  */
+		    evtq[oldMove].where_y = evt.where_y;
+		    evt.what = 0;
+		    }
+		else {
+		    oldMove = freeHead; /* Save id of this move event   */
+		    }
+		}
+	    else
+		oldMove = -1;
+	    if (msg.wParam & MK_LBUTTON)
+		evt.modifiers |= EVT_LEFTBUT;
+	    if (msg.wParam & MK_RBUTTON)
+		evt.modifiers |= EVT_RIGHTBUT;
+	    if (msg.wParam & MK_SHIFT)
+		evt.modifiers |= EVT_SHIFTKEY;
+	    if (msg.wParam & MK_CONTROL)
+		evt.modifiers |= EVT_CTRLSTATE;
+	    }
 
-        /* Convert keyboard codes */
-        TranslateMessage(&msg);
-        if (evt.what & EVT_KEYEVT) {
-            int scanCode = (msg.lParam >> 16) & 0xFF;
-            if (evt.what == EVT_KEYUP) {
-                /* Get message for keyup code from table of cached down values */
-                evt.message = keyUpMsg[scanCode];
-                keyUpMsg[scanCode] = 0;
-                }
-            else {
-                if (PeekMessage(&charMsg,NULL,WM_CHAR,WM_CHAR,PM_REMOVE))
-                    evt.message = charMsg.wParam;
-                if (PeekMessage(&charMsg,NULL,WM_SYSCHAR,WM_SYSCHAR,PM_REMOVE))
-                    evt.message = charMsg.wParam;
-                evt.message |= ((msg.lParam >> 8) & 0xFF00);
-                keyUpMsg[scanCode] = (ushort)evt.message;
-                }
-            if (evt.what == EVT_KEYREPEAT)
-                evt.message |= (msg.lParam << 16);
-            if (HIWORD(msg.lParam) & KF_ALTDOWN)
-                evt.modifiers |= EVT_ALTSTATE;
-            if (GetKeyState(VK_SHIFT) & 0x8000U)
-                evt.modifiers |= EVT_SHIFTKEY;
-            if (GetKeyState(VK_CONTROL) & 0x8000U)
-                evt.modifiers |= EVT_CTRLSTATE;
-            oldMove = -1;
-            }
+	/* Convert keyboard codes */
+	TranslateMessage(&msg);
+	if (evt.what & EVT_KEYEVT) {
+	    int scanCode = (msg.lParam >> 16) & 0xFF;
+	    if (evt.what == EVT_KEYUP) {
+		/* Get message for keyup code from table of cached down values */
+		evt.message = keyUpMsg[scanCode];
+		keyUpMsg[scanCode] = 0;
+		}
+	    else {
+		if (PeekMessage(&charMsg,NULL,WM_CHAR,WM_CHAR,PM_REMOVE))
+		    evt.message = charMsg.wParam;
+		if (PeekMessage(&charMsg,NULL,WM_SYSCHAR,WM_SYSCHAR,PM_REMOVE))
+		    evt.message = charMsg.wParam;
+		evt.message |= ((msg.lParam >> 8) & 0xFF00);
+		keyUpMsg[scanCode] = (ushort)evt.message;
+		}
+	    if (evt.what == EVT_KEYREPEAT)
+		evt.message |= (msg.lParam << 16);
+	    if (HIWORD(msg.lParam) & KF_ALTDOWN)
+		evt.modifiers |= EVT_ALTSTATE;
+	    if (GetKeyState(VK_SHIFT) & 0x8000U)
+		evt.modifiers |= EVT_SHIFTKEY;
+	    if (GetKeyState(VK_CONTROL) & 0x8000U)
+		evt.modifiers |= EVT_CTRLSTATE;
+	    oldMove = -1;
+	    }
 
-        if (evt.what != 0) {
-            /* Add time stamp and add the event to the queue */
-            evt.when = msg.time;
-            if (count < EVENTQSIZE) {
-                addEvent(&evt);
-                }
-            }
-        DispatchMessage(&msg);
-        }
+	if (evt.what != 0) {
+	    /* Add time stamp and add the event to the queue */
+	    evt.when = msg.time;
+	    if (count < EVENTQSIZE) {
+		addEvent(&evt);
+		}
+	    }
+	DispatchMessage(&msg);
+	}
 }
 
 /****************************************************************************
@@ -261,7 +261,7 @@
 ****************************************************************************/
 void EVT_resume(void)
 {
-    // Do nothing for Win32
+    /* Do nothing for Win32 */
 }
 
 /****************************************************************************
@@ -271,7 +271,7 @@
 ****************************************************************************/
 void EVT_suspend(void)
 {
-    // Do nothing for Win32
+    /* Do nothing for Win32 */
 }
 
 /****************************************************************************

diff --git a/board/MAI/bios_emulator/scitech/src/pm/rttarget/pm.c b/board/MAI/bios_emulator/scitech/src/pm/rttarget/pm.c
index e6c1fbd..47d7ed6 100644
--- a/board/MAI/bios_emulator/scitech/src/pm/rttarget/pm.c
+++ b/board/MAI/bios_emulator/scitech/src/pm/rttarget/pm.c

@@ -59,7 +59,7 @@
 ****************************************************************************/
 void PMAPI PM_init(void)
 {
-    // TODO: dO any special init code in here.
+    /* TODO: dO any special init code in here. */
     MTRR_init();
 }
 
@@ -90,9 +90,9 @@
 {
     uint pos = strlen(s);
     if (s[pos-1] != '\\') {
-        s[pos] = '\\';
-        s[pos+1] = '\0';
-        }
+	s[pos] = '\\';
+	s[pos+1] = '\0';
+	}
 }
 
 /****************************************************************************
@@ -113,9 +113,9 @@
     const char *msg)
 {
     if (fatalErrorCleanup)
-        fatalErrorCleanup();
-    // TODO: Display a fatal error message and exit!
-//  MessageBox(NULL,msg,"Fatal Error!", MB_ICONEXCLAMATION);
+	fatalErrorCleanup();
+    /* TODO: Display a fatal error message and exit! */
+/*  MessageBox(NULL,msg,"Fatal Error!", MB_ICONEXCLAMATION); */
     exit(1);
 }
 
@@ -138,7 +138,7 @@
 ****************************************************************************/
 int PMAPI PM_kbhit(void)
 {
-    // TODO: Need to check if a key is waiting on the keyboard queue
+    /* TODO: Need to check if a key is waiting on the keyboard queue */
     return true;
 }
 
@@ -148,7 +148,7 @@
 ****************************************************************************/
 int PMAPI PM_getch(void)
 {
-    // TODO: Need to obtain the next keypress, and block until one is hit
+    /* TODO: Need to obtain the next keypress, and block until one is hit */
     return 0xD;
 }
 
@@ -240,7 +240,7 @@
 ****************************************************************************/
 const char * PMAPI PM_getNucleusPath(void)
 {
-    // TODO: Point this at the path when the Nucleus drivers will be found
+    /* TODO: Point this at the path when the Nucleus drivers will be found */
     return "c:\\nucleus";
 }
 
@@ -294,7 +294,7 @@
 {
     static void *bankPtr;
     if (!bankPtr)
-        bankPtr = PM_mapPhysicalAddr(0xA0000,0xFFFF,true);
+	bankPtr = PM_mapPhysicalAddr(0xA0000,0xFFFF,true);
     return bankPtr;
 }
 
@@ -307,7 +307,7 @@
     ulong limit,
     ibool isCached)
 {
-    // TODO: Map a physical memory address to a linear address
+    /* TODO: Map a physical memory address to a linear address */
     return NULL;
 }
 
@@ -319,13 +319,13 @@
     void *ptr,
     ulong limit)
 {
-    // TODO: Free the physical address mapping
+    /* TODO: Free the physical address mapping */
 }
 
 ulong PMAPI PM_getPhysicalAddr(void *p)
 {
-    // TODO: This function should find the physical address of a linear
-    //       address.
+    /* TODO: This function should find the physical address of a linear */
+    /*       address. */
     return 0xFFFFFFFFUL;
 }
 
@@ -336,24 +336,24 @@
 
 int PMAPI PM_getCOMPort(int port)
 {
-    // TODO: Re-code this to determine real values using the Plug and Play
-    //       manager for the OS.
+    /* TODO: Re-code this to determine real values using the Plug and Play */
+    /*       manager for the OS. */
     switch (port) {
-        case 0: return 0x3F8;
-        case 1: return 0x2F8;
-        }
+	case 0: return 0x3F8;
+	case 1: return 0x2F8;
+	}
     return 0;
 }
 
 int PMAPI PM_getLPTPort(int port)
 {
-    // TODO: Re-code this to determine real values using the Plug and Play
-    //       manager for the OS.
+    /* TODO: Re-code this to determine real values using the Plug and Play */
+    /*       manager for the OS. */
     switch (port) {
-        case 0: return 0x3BC;
-        case 1: return 0x378;
-        case 2: return 0x278;
-        }
+	case 0: return 0x3BC;
+	case 1: return 0x378;
+	case 2: return 0x278;
+	}
     return 0;
 }
 
@@ -484,8 +484,8 @@
     ulong *physical,
     ulong *total)
 {
-    // TODO: Figure out how to determine the available memory. Not entirely
-    //       critical so returning 0 is OK.
+    /* TODO: Figure out how to determine the available memory. Not entirely */
+    /*       critical so returning 0 is OK. */
     *physical = *total = 0;
 }
 
@@ -499,7 +499,7 @@
     ibool contiguous,
     ibool below16M)
 {
-    // TODO: Allocate a block of locked, phsyically contigous memory for DMA
+    /* TODO: Allocate a block of locked, phsyically contigous memory for DMA */
     return 0;
 }
 
@@ -510,10 +510,10 @@
 void PMAPI PM_freeLockedMem(
     void *p,
     uint size,
-    
+
     ibool contiguous)
 {
-    // TODO: Free a locked memory buffer
+    /* TODO: Free a locked memory buffer */
 }
 
 /****************************************************************************
@@ -564,7 +564,7 @@
 PM_MODULE PMAPI PM_loadLibrary(
     const char *szDLLName)
 {
-    // TODO: Implement this to load shared libraries!
+    /* TODO: Implement this to load shared libraries! */
     (void)szDLLName;
     return NULL;
 }
@@ -573,7 +573,7 @@
     PM_MODULE hModule,
     const char *szProcName)
 {
-    // TODO: Implement this!
+    /* TODO: Implement this! */
     (void)hModule;
     (void)szProcName;
     return NULL;
@@ -582,7 +582,7 @@
 void PMAPI PM_freeLibrary(
     PM_MODULE hModule)
 {
-    // TODO: Implement this!
+    /* TODO: Implement this! */
     (void)hModule;
 }
 
@@ -594,9 +594,9 @@
     const char *filename,
     PM_findData *findData)
 {
-    // TODO: This function should start a directory enumeration search
-    //       given the filename (with wildcards). The data should be
-    //       converted and returned in the findData standard form.
+    /* TODO: This function should start a directory enumeration search */
+    /*       given the filename (with wildcards). The data should be */
+    /*       converted and returned in the findData standard form. */
     (void)filename;
     (void)findData;
     return PM_FILE_INVALID;
@@ -610,10 +610,10 @@
     ulong handle,
     PM_findData *findData)
 {
-    // TODO: This function should find the next file in directory enumeration
-    //       search given the search criteria defined in the call to
-    //       PM_findFirstFile. The data should be converted and returned
-    //       in the findData standard form.
+    /* TODO: This function should find the next file in directory enumeration */
+    /*       search given the search criteria defined in the call to */
+    /*       PM_findFirstFile. The data should be converted and returned */
+    /*       in the findData standard form. */
     (void)handle;
     (void)findData;
     return false;
@@ -626,8 +626,8 @@
 void PMAPI PM_findClose(
     ulong handle)
 {
-    // TODO: This function should close the find process. This may do
-    //       nothing for some OS'es.
+    /* TODO: This function should close the find process. This may do */
+    /*       nothing for some OS'es. */
     (void)handle;
 }
 
@@ -648,7 +648,7 @@
     char drive)
 {
     if (drive == 3)
-        return true;
+	return true;
     return false;
 }
 
@@ -675,7 +675,7 @@
     const char *filename,
     uint attrib)
 {
-    // TODO: Set the file attributes for a file
+    /* TODO: Set the file attributes for a file */
     (void)filename;
     (void)attrib;
 }

diff --git a/board/MAI/bios_emulator/scitech/src/pm/rttarget/ztimer.c b/board/MAI/bios_emulator/scitech/src/pm/rttarget/ztimer.c
index 52472c3..80c184d 100644
--- a/board/MAI/bios_emulator/scitech/src/pm/rttarget/ztimer.c
+++ b/board/MAI/bios_emulator/scitech/src/pm/rttarget/ztimer.c

@@ -57,9 +57,9 @@
     LZTimerObject *tm)
 {
     if (havePerformanceCounter)
-        QueryPerformanceCounter((LARGE_INTEGER*)&tm->start);
+	QueryPerformanceCounter((LARGE_INTEGER*)&tm->start);
     else
-        tm->start.low = timeGetTime();
+	tm->start.low = timeGetTime();
 }
 
 /****************************************************************************
@@ -72,14 +72,14 @@
     CPU_largeInteger    tmLap,tmCount;
 
     if (havePerformanceCounter) {
-        QueryPerformanceCounter((LARGE_INTEGER*)&tmLap);
-        _CPU_diffTime64(&tm->start,&tmLap,&tmCount);
-        return _CPU_calcMicroSec(&tmCount,countFreq.low);
-        }
+	QueryPerformanceCounter((LARGE_INTEGER*)&tmLap);
+	_CPU_diffTime64(&tm->start,&tmLap,&tmCount);
+	return _CPU_calcMicroSec(&tmCount,countFreq.low);
+	}
     else {
-        tmLap.low = timeGetTime();
-        return (tmLap.low - tm->start.low) * 1000L;
-        }
+	tmLap.low = timeGetTime();
+	return (tmLap.low - tm->start.low) * 1000L;
+	}
 }
 
 /****************************************************************************
@@ -90,9 +90,9 @@
     LZTimerObject *tm)
 {
     if (havePerformanceCounter)
-        QueryPerformanceCounter((LARGE_INTEGER*)&tm->end);
+	QueryPerformanceCounter((LARGE_INTEGER*)&tm->end);
     else
-        tm->end.low = timeGetTime();
+	tm->end.low = timeGetTime();
 }
 
 /****************************************************************************
@@ -105,11 +105,11 @@
     CPU_largeInteger    tmCount;
 
     if (havePerformanceCounter) {
-        _CPU_diffTime64(&tm->start,&tm->end,&tmCount);
-        return _CPU_calcMicroSec(&tmCount,countFreq.low);
-        }
+	_CPU_diffTime64(&tm->start,&tm->end,&tmCount);
+	return _CPU_calcMicroSec(&tmCount,countFreq.low);
+	}
     else
-        return (tm->end.low - tm->start.low) * 1000L;
+	return (tm->end.low - tm->start.low) * 1000L;
 }
 
 /****************************************************************************

diff --git a/board/MAI/bios_emulator/scitech/src/pm/smx/event.c b/board/MAI/bios_emulator/scitech/src/pm/smx/event.c
index fc13bbb..533c261 100644
--- a/board/MAI/bios_emulator/scitech/src/pm/smx/event.c
+++ b/board/MAI/bios_emulator/scitech/src/pm/smx/event.c

@@ -98,8 +98,8 @@
 the mouse interrupt subroutine, so it must be efficient.
 
 NOTE:   Interrupts MUST be OFF while this routine is called to ensure we have
-        mutually exclusive access to our internal data structures for
-        interrupt driven systems (like under DOS).
+	mutually exclusive access to our internal data structures for
+	interrupt driven systems (like under DOS).
 ****************************************************************************/
 static void addMouseEvent(
     uint what,
@@ -113,18 +113,18 @@
     event_t evt;
 
     if (EVT.count < EVENTQSIZE) {
-        /* Save information in event record. */
-        evt.when = _EVT_getTicks();
-        evt.what = what;
-        evt.message = message;
-        evt.modifiers = but_stat;
-        evt.where_x = x;                /* Save mouse event position    */
-        evt.where_y = y;
-        evt.relative_x = mickeyX;
-        evt.relative_y = mickeyY;
-        evt.modifiers |= EVT.keyModifiers;
-        addEvent(&evt);                 /* Add to tail of event queue   */
-        }
+	/* Save information in event record. */
+	evt.when = _EVT_getTicks();
+	evt.what = what;
+	evt.message = message;
+	evt.modifiers = but_stat;
+	evt.where_x = x;                /* Save mouse event position    */
+	evt.where_y = y;
+	evt.relative_x = mickeyX;
+	evt.relative_y = mickeyY;
+	evt.modifiers |= EVT.keyModifiers;
+	addEvent(&evt);                 /* Add to tail of event queue   */
+	}
 }
 
 /****************************************************************************
@@ -140,8 +140,8 @@
 to the event queue.
 
 Note: Interrupts are ON when this routine is called by the mouse driver code.
-//AM: NOTE: This function has not actually been ported from DOS yet and should not
-//AM: be installed until it is.
+/*AM: NOTE: This function has not actually been ported from DOS yet and should not */
+/*AM: be installed until it is. */
 ****************************************************************************/
 static void EVTAPI mouseISR(
     uint mask,
@@ -155,39 +155,39 @@
     uint    ps;
 
     if (mask & 1) {
-        /* Save the current mouse coordinates */
-        EVT.mx = x; EVT.my = y;
+	/* Save the current mouse coordinates */
+	EVT.mx = x; EVT.my = y;
 
-        /* If the last event was a movement event, then modify the last
-         * event rather than post a new one, so that the queue will not
-         * become saturated. Before we modify the data structures, we
-         * MUST ensure that interrupts are off.
-         */
-        ps = _EVT_disableInt();
-        if (EVT.oldMove != -1) {
-            EVT.evtq[EVT.oldMove].where_x = x;          /* Modify existing one  */
-            EVT.evtq[EVT.oldMove].where_y = y;
-            EVT.evtq[EVT.oldMove].relative_x += mickeyX;
-            EVT.evtq[EVT.oldMove].relative_y += mickeyY;
-            }
-        else {
-            EVT.oldMove = EVT.freeHead;         /* Save id of this move event   */
-            addMouseEvent(EVT_MOUSEMOVE,0,x,y,mickeyX,mickeyY,butstate);
-            }
-        _EVT_restoreInt(ps);
-        }
+	/* If the last event was a movement event, then modify the last
+	 * event rather than post a new one, so that the queue will not
+	 * become saturated. Before we modify the data structures, we
+	 * MUST ensure that interrupts are off.
+	 */
+	ps = _EVT_disableInt();
+	if (EVT.oldMove != -1) {
+	    EVT.evtq[EVT.oldMove].where_x = x;          /* Modify existing one  */
+	    EVT.evtq[EVT.oldMove].where_y = y;
+	    EVT.evtq[EVT.oldMove].relative_x += mickeyX;
+	    EVT.evtq[EVT.oldMove].relative_y += mickeyY;
+	    }
+	else {
+	    EVT.oldMove = EVT.freeHead;         /* Save id of this move event   */
+	    addMouseEvent(EVT_MOUSEMOVE,0,x,y,mickeyX,mickeyY,butstate);
+	    }
+	_EVT_restoreInt(ps);
+	}
     if (mask & 0x2A) {
-        ps = _EVT_disableInt();
-        addMouseEvent(EVT_MOUSEDOWN,mask >> 1,x,y,0,0,butstate);
-        EVT.oldMove = -1;
-        _EVT_restoreInt(ps);
-        }
+	ps = _EVT_disableInt();
+	addMouseEvent(EVT_MOUSEDOWN,mask >> 1,x,y,0,0,butstate);
+	EVT.oldMove = -1;
+	_EVT_restoreInt(ps);
+	}
     if (mask & 0x54) {
-        ps = _EVT_disableInt();
-        addMouseEvent(EVT_MOUSEUP,mask >> 2,x,y,0,0,butstate);
-        EVT.oldMove = -1;
-        _EVT_restoreInt(ps);
-        }
+	ps = _EVT_disableInt();
+	addMouseEvent(EVT_MOUSEUP,mask >> 2,x,y,0,0,butstate);
+	EVT.oldMove = -1;
+	_EVT_restoreInt(ps);
+	}
     EVT.oldKey = -1;
 }
 
@@ -196,7 +196,7 @@
 Keyboard interrupt handler function.
 
 NOTE:   Interrupts are OFF when this routine is called by the keyboard ISR,
-        and we leave them OFF the entire time. This has been modified to work
+	and we leave them OFF the entire time. This has been modified to work
       in conjunction with smx keyboard handler.
 ****************************************************************************/
 static void EVTAPI keyboardISR(void)
@@ -252,51 +252,51 @@
     PM_lockHandle   lh;
 
     if (_EVT_useEvents) {
-        /* Initialise the event queue and enable our interrupt handlers */
-        initEventQueue();
-        PM_setKeyHandler(keyboardISR);
-        if ((haveMouse = detectMouse()) != 0)
-            PM_setMouseHandler(0xFFFF,mouseISR);
+	/* Initialise the event queue and enable our interrupt handlers */
+	initEventQueue();
+	PM_setKeyHandler(keyboardISR);
+	if ((haveMouse = detectMouse()) != 0)
+	    PM_setMouseHandler(0xFFFF,mouseISR);
 
-        /* Read the keyboard modifier flags from the BIOS to get the
-         * correct initialisation state. The only state we care about is
-         * the correct toggle state flags such as SCROLLLOCK, NUMLOCK and
-         * CAPSLOCK.
-         */
-        EVT.keyModifiers = 0;
-        mods = PM_getByte(_EVT_biosPtr+0x17);
-        if (mods & 0x10)
-            EVT.keyModifiers |= EVT_SCROLLLOCK;
-        if (mods & 0x20)
-            EVT.keyModifiers |= EVT_NUMLOCK;
-        if (mods & 0x40)
-            EVT.keyModifiers |= EVT_CAPSLOCK;
+	/* Read the keyboard modifier flags from the BIOS to get the
+	 * correct initialisation state. The only state we care about is
+	 * the correct toggle state flags such as SCROLLLOCK, NUMLOCK and
+	 * CAPSLOCK.
+	 */
+	EVT.keyModifiers = 0;
+	mods = PM_getByte(_EVT_biosPtr+0x17);
+	if (mods & 0x10)
+	    EVT.keyModifiers |= EVT_SCROLLLOCK;
+	if (mods & 0x20)
+	    EVT.keyModifiers |= EVT_NUMLOCK;
+	if (mods & 0x40)
+	    EVT.keyModifiers |= EVT_CAPSLOCK;
 
-        /* Lock all of the code and data used by our protected mode interrupt
-         * handling routines, so that it will continue to work correctly
-         * under real mode.
-         */
-        if (!locked) {
-            /* It is difficult to ensure that we lock our global data, so we
-             * do this by taking the address of a variable locking all data
-             * 2Kb on either side. This should properly cover the global data
-             * used by the module (the other alternative is to declare the
-             * variables in assembler, in which case we know it will be
-             * correct).
-             */
-            stat  = !PM_lockDataPages(&EVT,sizeof(EVT),&lh);
-            stat |= !PM_lockDataPages(&_EVT_biosPtr,sizeof(_EVT_biosPtr),&lh);
-            stat |= !PM_lockCodePages((__codePtr)_EVT_cCodeStart,(int)_EVT_cCodeEnd-(int)_EVT_cCodeStart,&lh);
-            stat |= !PM_lockCodePages((__codePtr)_EVT_codeStart,(int)_EVT_codeEnd-(int)_EVT_codeStart,&lh);
-            if (stat) {
-                PM_fatalError("Page locking services failed - interrupt handling not safe!");
-                exit(1);
-                }
-            locked = 1;
-            }
+	/* Lock all of the code and data used by our protected mode interrupt
+	 * handling routines, so that it will continue to work correctly
+	 * under real mode.
+	 */
+	if (!locked) {
+	    /* It is difficult to ensure that we lock our global data, so we
+	     * do this by taking the address of a variable locking all data
+	     * 2Kb on either side. This should properly cover the global data
+	     * used by the module (the other alternative is to declare the
+	     * variables in assembler, in which case we know it will be
+	     * correct).
+	     */
+	    stat  = !PM_lockDataPages(&EVT,sizeof(EVT),&lh);
+	    stat |= !PM_lockDataPages(&_EVT_biosPtr,sizeof(_EVT_biosPtr),&lh);
+	    stat |= !PM_lockCodePages((__codePtr)_EVT_cCodeStart,(int)_EVT_cCodeEnd-(int)_EVT_cCodeStart,&lh);
+	    stat |= !PM_lockCodePages((__codePtr)_EVT_codeStart,(int)_EVT_codeEnd-(int)_EVT_codeStart,&lh);
+	    if (stat) {
+		PM_fatalError("Page locking services failed - interrupt handling not safe!");
+		exit(1);
+		}
+	    locked = 1;
+	    }
 
-        _EVT_installed = true;
-        }
+	_EVT_installed = true;
+	}
 }
 
 /****************************************************************************
@@ -310,9 +310,9 @@
     int yRes)
 {
     if (haveMouse) {
-        ps2MouseStop();
-        ps2MouseStart( 0, xRes, 0, yRes, -1, -1, -1);
-        }
+	ps2MouseStop();
+	ps2MouseStart( 0, xRes, 0, yRes, -1, -1, -1);
+	}
 }
 
 /****************************************************************************
@@ -325,7 +325,7 @@
     int *y)
 {
     if (haveMouse)
-        ps2MouseMove(*x, *y);
+	ps2MouseMove(*x, *y);
 }
 
 /****************************************************************************
@@ -338,24 +338,24 @@
     uchar   mods;
 
     if (_EVT_installed) {
-        PM_restoreKeyHandler();
+	PM_restoreKeyHandler();
     if (haveMouse)
-        PM_restoreMouseHandler();
+	PM_restoreMouseHandler();
 
-        /* Set the keyboard modifier flags in the BIOS to our values */
-        EVT_allowLEDS(true);
-        mods = PM_getByte(_EVT_biosPtr+0x17) & ~0x70;
-        if (EVT.keyModifiers & EVT_SCROLLLOCK)
-            mods |= 0x10;
-        if (EVT.keyModifiers & EVT_NUMLOCK)
-            mods |= 0x20;
-        if (EVT.keyModifiers & EVT_CAPSLOCK)
-            mods |= 0x40;
-        PM_setByte(_EVT_biosPtr+0x17,mods);
+	/* Set the keyboard modifier flags in the BIOS to our values */
+	EVT_allowLEDS(true);
+	mods = PM_getByte(_EVT_biosPtr+0x17) & ~0x70;
+	if (EVT.keyModifiers & EVT_SCROLLLOCK)
+	    mods |= 0x10;
+	if (EVT.keyModifiers & EVT_NUMLOCK)
+	    mods |= 0x20;
+	if (EVT.keyModifiers & EVT_CAPSLOCK)
+	    mods |= 0x40;
+	PM_setByte(_EVT_biosPtr+0x17,mods);
 
-        /* Flag that we are no longer installed */
-        _EVT_installed = false;
-        }
+	/* Flag that we are no longer installed */
+	_EVT_installed = false;
+	}
 }
 
 /****************************************************************************

diff --git a/board/MAI/bios_emulator/scitech/src/pm/smx/pm.c b/board/MAI/bios_emulator/scitech/src/pm/smx/pm.c
index d6c95d6..99ee3d4 100644
--- a/board/MAI/bios_emulator/scitech/src/pm/smx/pm.c
+++ b/board/MAI/bios_emulator/scitech/src/pm/smx/pm.c

@@ -147,9 +147,9 @@
 {
     uint pos = strlen(s);
     if (s[pos-1] != '\\') {
-        s[pos] = '\\';
-        s[pos+1] = '\0';
-        }
+	s[pos] = '\\';
+	s[pos+1] = '\0';
+	}
 }
 
 void PMAPI PM_setFatalErrorCleanup(
@@ -163,28 +163,28 @@
 void PMAPI PM_fatalError(const char *msg)
 {
     if (fatalErrorCleanup)
-        fatalErrorCleanup();
+	fatalErrorCleanup();
     MGLOutput(msg);
-// No support for fprintf() under smx currently!
-//  fprintf(stderr,"%s\n", msg);
+/* No support for fprintf() under smx currently! */
+/*  fprintf(stderr,"%s\n", msg); */
     exit(1);
 }
 
 static void ExitVBEBuf(void)
 {
     if (VESABuf_ptr)
-        PM_freeRealSeg(VESABuf_ptr);
+	PM_freeRealSeg(VESABuf_ptr);
     VESABuf_ptr = 0;
 }
 
 void * PMAPI PM_getVESABuf(uint *len,uint *rseg,uint *roff)
 {
     if (!VESABuf_ptr) {
-        /* Allocate a global buffer for communicating with the VESA VBE */
-        if ((VESABuf_ptr = PM_allocRealSeg(VESABuf_len, &VESABuf_rseg, &VESABuf_roff)) == NULL)
-            return NULL;
-        atexit(ExitVBEBuf);
-        }
+	/* Allocate a global buffer for communicating with the VESA VBE */
+	if ((VESABuf_ptr = PM_allocRealSeg(VESABuf_len, &VESABuf_rseg, &VESABuf_roff)) == NULL)
+	    return NULL;
+	atexit(ExitVBEBuf);
+	}
     *len = VESABuf_len;
     *rseg = VESABuf_rseg;
     *roff = VESABuf_roff;
@@ -234,12 +234,12 @@
     int i;
 
     for (i = 0; i < MAX_RM_BLOCKS; i++) {
-        if (rmBlocks[i].p == NULL) {
-            rmBlocks[i].p = mem;
-            rmBlocks[i].tag = tag;
-            return;
-            }
-        }
+	if (rmBlocks[i].p == NULL) {
+	    rmBlocks[i].p = mem;
+	    rmBlocks[i].tag = tag;
+	    return;
+	    }
+	}
     PM_fatalError("To many real mode memory block allocations!");
 }
 
@@ -248,9 +248,9 @@
     int i;
 
     for (i = 0; i < MAX_RM_BLOCKS; i++) {
-        if (rmBlocks[i].p == mem)
-            return rmBlocks[i].tag;
-        }
+	if (rmBlocks[i].p == mem)
+	    return rmBlocks[i].tag;
+	}
     PM_fatalError("Could not find prior real mode memory block allocation!");
     return 0;
 }
@@ -274,7 +274,7 @@
     char        *env;
 
     if ((env = getenv("NUCLEUS_PATH")) != NULL)
-        return env;
+	return env;
     return "c:\\nucleus";
 }
 
@@ -339,12 +339,12 @@
     sb->oldMode = regs.h.al & 0x7F;
     sb->old50Lines = false;
     if (sb->oldMode == 0x3) {
-        regs.x.ax = 0x1130;
-        regs.x.bx = 0;
-        regs.x.dx = 0;
-        PM_int86(0x10,&regs,&regs);
-        sb->old50Lines = (regs.h.dl == 42 || regs.h.dl == 49);
-        }
+	regs.x.ax = 0x1130;
+	regs.x.bx = 0;
+	regs.x.dx = 0;
+	PM_int86(0x10,&regs,&regs);
+	sb->old50Lines = (regs.h.dl == 42 || regs.h.dl == 49);
+	}
     (void)hwndConsole;
 }
 
@@ -361,10 +361,10 @@
 
     /* Retore 50 line mode if set */
     if (sb->old50Lines) {
-        regs.x.ax = 0x1112;
-        regs.x.bx = 0;
-        PM_int86(0x10,&regs,&regs);
-        }
+	regs.x.ax = 0x1112;
+	regs.x.bx = 0;
+	PM_int86(0x10,&regs,&regs);
+	}
     (void)hwndConsole;
 }
 
@@ -388,13 +388,13 @@
     PM_setWord(_biosPtr+0x4C,width*2);
     PM_setByte(_biosPtr+0x84,height-1);
     if (height > 25) {
-        PM_setWord(_biosPtr+0x60,0x0607);
-        PM_setByte(_biosPtr+0x85,0x08);
-        }
+	PM_setWord(_biosPtr+0x60,0x0607);
+	PM_setByte(_biosPtr+0x85,0x08);
+	}
     else {
-        PM_setWord(_biosPtr+0x60,0x0D0E);
-        PM_setByte(_biosPtr+0x85,0x016);
-        }
+	PM_setWord(_biosPtr+0x60,0x0D0E);
+	PM_setByte(_biosPtr+0x85,0x016);
+	}
 }
 
 void * PMAPI PM_mallocShared(long size)
@@ -424,22 +424,22 @@
 
     /* Create a zero memory mapping for us to use */
     if (firstTime) {
-        rmZeroPtr = PM_mapPhysicalAddr(0,0x7FFF,true);
-        firstTime = false;
-        }
+	rmZeroPtr = PM_mapPhysicalAddr(0,0x7FFF,true);
+	firstTime = false;
+	}
 
     /* Remap the secondary BIOS to 0xC0000 physical */
     if (BIOSPhysAddr != 0xC0000L || BIOSLen > 32768) {
-        /* SMX cannot virtually remap the BIOS, so we can only work if all
-         * the secondary controllers are identical, and we then use the
-         * BIOS on the first controller for all the remaining controllers.
-         *
-         * For OS'es that do virtual memory, and remapping of 0xC0000
-         * physical (perhaps a copy on write mapping) should be all that
-         * is needed.
-         */
-        return false;
-        }
+	/* SMX cannot virtually remap the BIOS, so we can only work if all
+	 * the secondary controllers are identical, and we then use the
+	 * BIOS on the first controller for all the remaining controllers.
+	 *
+	 * For OS'es that do virtual memory, and remapping of 0xC0000
+	 * physical (perhaps a copy on write mapping) should be all that
+	 * is needed.
+	 */
+	return false;
+	}
 
     /* Save current handlers of int 10h and 6Dh */
     GetRMVect(0x10,&Current10);
@@ -457,9 +457,9 @@
 
     /* Second the primary BIOS mappin 1:1 for 0xC0000 physical */
     if (BIOSPhysAddr != 0xC0000L) {
-        /* SMX does not support this */
-        (void)mappedBIOS;
-        }
+	/* SMX does not support this */
+	(void)mappedBIOS;
+	}
     return true;
 }
 
@@ -470,26 +470,26 @@
 
     LZTimerOnExt(&tm);
     while (LZTimerLapExt(&tm) < microseconds)
-        ;
+	;
     LZTimerOffExt(&tm);
 }
 
 int PMAPI PM_getCOMPort(int port)
 {
     switch (port) {
-        case 0: return 0x3F8;
-        case 1: return 0x2F8;
-        }
+	case 0: return 0x3F8;
+	case 1: return 0x2F8;
+	}
     return 0;
 }
 
 int PMAPI PM_getLPTPort(int port)
 {
     switch (port) {
-        case 0: return 0x3BC;
-        case 1: return 0x378;
-        case 2: return 0x278;
-        }
+	case 0: return 0x3BC;
+	case 1: return 0x378;
+	case 2: return 0x278;
+	}
     return 0;
 }
 
@@ -534,15 +534,15 @@
     memset(findData,0,findData->dwSize);
     findData->dwSize = dwSize;
     if (blk->attrib & _A_RDONLY)
-        findData->attrib |= PM_FILE_READONLY;
+	findData->attrib |= PM_FILE_READONLY;
     if (blk->attrib & _A_SUBDIR)
-        findData->attrib |= PM_FILE_DIRECTORY;
+	findData->attrib |= PM_FILE_DIRECTORY;
     if (blk->attrib & _A_ARCH)
-        findData->attrib |= PM_FILE_ARCHIVE;
+	findData->attrib |= PM_FILE_ARCHIVE;
     if (blk->attrib & _A_HIDDEN)
-        findData->attrib |= PM_FILE_HIDDEN;
+	findData->attrib |= PM_FILE_HIDDEN;
     if (blk->attrib & _A_SYSTEM)
-        findData->attrib |= PM_FILE_SYSTEM;
+	findData->attrib |= PM_FILE_SYSTEM;
     findData->sizeLo = blk->size;
     strncpy(findData->name,blk->name,PM_MAX_PATH);
     findData->name[PM_MAX_PATH-1] = 0;
@@ -561,11 +561,11 @@
     struct find_t *blk;
 
     if ((blk = PM_malloc(sizeof(*blk))) == NULL)
-        return PM_FILE_INVALID;
+	return PM_FILE_INVALID;
     if (_dos_findfirst((char*)filename,FIND_MASK,blk) == 0) {
-        convertFindData(findData,blk);
-        return blk;
-        }
+	convertFindData(findData,blk);
+	return blk;
+	}
     return PM_FILE_INVALID;
 }
 
@@ -580,9 +580,9 @@
     struct find_t *blk = handle;
 
     if (_dos_findnext(blk) == 0) {
-        convertFindData(findData,blk);
-        return true;
-        }
+	convertFindData(findData,blk);
+	return true;
+	}
     return false;
 }
 
@@ -614,9 +614,9 @@
 {
     RMREGS  regs;
     regs.h.dl = (uchar)(drive - 'A' + 1);
-    regs.h.ah = 0x36;               // Get disk information service
+    regs.h.ah = 0x36;               /* Get disk information service */
     PM_int86(0x21,&regs,&regs);
-    return regs.x.ax != 0xFFFF;     // AX = 0xFFFF if disk is invalid
+    return regs.x.ax != 0xFFFF;     /* AX = 0xFFFF if disk is invalid */
 }
 
 /****************************************************************************
@@ -649,25 +649,25 @@
     DWORD attr = 0;
 
     if (attrib & PM_FILE_READONLY)
-        attr |= FILE_ATTRIBUTE_READONLY;
+	attr |= FILE_ATTRIBUTE_READONLY;
     if (attrib & PM_FILE_ARCHIVE)
-        attr |= FILE_ATTRIBUTE_ARCHIVE;
+	attr |= FILE_ATTRIBUTE_ARCHIVE;
     if (attrib & PM_FILE_HIDDEN)
-        attr |= FILE_ATTRIBUTE_HIDDEN;
+	attr |= FILE_ATTRIBUTE_HIDDEN;
     if (attrib & PM_FILE_SYSTEM)
-        attr |= FILE_ATTRIBUTE_SYSTEM;
+	attr |= FILE_ATTRIBUTE_SYSTEM;
     SetFileAttributes((LPSTR)filename, attr);
 #else
     uint attr = 0;
 
     if (attrib & PM_FILE_READONLY)
-        attr |= _A_RDONLY;
+	attr |= _A_RDONLY;
     if (attrib & PM_FILE_ARCHIVE)
-        attr |= _A_ARCH;
+	attr |= _A_ARCH;
     if (attrib & PM_FILE_HIDDEN)
-        attr |= _A_HIDDEN;
+	attr |= _A_HIDDEN;
     if (attrib & PM_FILE_SYSTEM)
-        attr |= _A_SYSTEM;
+	attr |= _A_SYSTEM;
     _dos_setfileattr(filename,attr);
 #endif
 }
@@ -682,7 +682,7 @@
 #ifdef  __GNUC__
     return mkdir(filename,S_IRUSR) == 0;
 #else
-//AM:   return mkdir(filename) == 0;
+/*AM:   return mkdir(filename) == 0; */
     return(false);
 #endif
 }
@@ -694,7 +694,7 @@
 ibool PMAPI PM_rmdir(
     const char *filename)
 {
-//AM:   return rmdir(filename) == 0;
+/*AM:   return rmdir(filename) == 0; */
     return(false);
 }
 
@@ -719,9 +719,9 @@
      * properly page align the start of the memory block for DMA operations.
      */
     if (size > 4096)
-        return NULL;
+	return NULL;
     if ((p = PM_allocRealSeg((size + 0xFFF) & ~0xFFF,&r_seg,&r_off)) == NULL)
-        return NULL;
+	return NULL;
     *physAddr = ((r_seg << 4) + r_off + 0xFFF) & ~0xFFF;
     PM_lockDataPages(p,size*2,&lh);
     return p;
@@ -743,11 +743,11 @@
     ulong   physOfs;
 
     if (physAddr < 0x100000L) {
-        /* We can't map memory below 1Mb, but the linear address are already
-         * mapped 1:1 for this memory anyway so we just return the base address.
-         */
-        return physAddr;
-        }
+	/* We can't map memory below 1Mb, but the linear address are already
+	 * mapped 1:1 for this memory anyway so we just return the base address.
+	 */
+	return physAddr;
+	}
 
     /* Round the physical address to a 4Kb boundary and the limit to a
      * 4Kb-1 boundary before passing the values to DPMI as some extenders
@@ -766,7 +766,7 @@
     r.x.di = limit & 0xFFFF;
     PM_int386(0x31, &r, &r);
     if (r.x.cflag)
-        return 0xFFFFFFFFUL;
+	return 0xFFFFFFFFUL;
     return ((ulong)r.x.bx << 16) + r.x.cx + physOfs;
 }
 
@@ -780,7 +780,7 @@
     r.x.dx = linAddr & 0xFFFF;
     PM_int386(0x31, &r, &r);
     if (r.x.cflag)
-        return 0;
+	return 0;
     return 1;
 }
 
@@ -804,7 +804,7 @@
     r.x.dx = limit & 0xFFFF;
     PM_int386(0x31, &r, &r);
     if (r.x.cflag)
-        return 0;
+	return 0;
     return 1;
 }
 
@@ -830,11 +830,11 @@
 
     /* Map physical memory and create selector */
     if ((base = DPMI_mapPhysicalToLinear(base,limit)) == 0xFFFFFFFFUL)
-        return 0;
+	return 0;
     if (!DPMI_setSelectorBase(sel,base))
-        return 0;
+	return 0;
     if (!DPMI_setSelectorLimit(sel,limit))
-        return 0;
+	return 0;
     return sel;
 }
 
@@ -883,28 +883,28 @@
     PM_segread(&sregs);
     DSBaseAddr = DPMI_getSelectorBase(sregs.ds);
     if ((base < 0x100000) && (DSBaseAddr == 0)) {
-        /* DS is zero based, so we can directly access the first 1Mb of
-         * system memory (like under DOS4GW).
-         */
-        return (void*)base;
-        }
+	/* DS is zero based, so we can directly access the first 1Mb of
+	 * system memory (like under DOS4GW).
+	 */
+	return (void*)base;
+	}
 
     /* Map the memory to a linear address using DPMI function 0x800 */
     if ((linAddr = DPMI_mapPhysicalToLinear(base,limit)) == 0) {
-        if (base >= 0x100000)
-            return NULL;
-        /* If the linear address mapping fails but we are trying to
-         * map an area in the first 1Mb of system memory, then we must
-         * be running under a Windows or OS/2 DOS box. Under these
-         * environments we can use the segment wrap around as a fallback
-         * measure, as this does work properly.
-         */
-        linAddr = base;
-        }
+	if (base >= 0x100000)
+	    return NULL;
+	/* If the linear address mapping fails but we are trying to
+	 * map an area in the first 1Mb of system memory, then we must
+	 * be running under a Windows or OS/2 DOS box. Under these
+	 * environments we can use the segment wrap around as a fallback
+	 * measure, as this does work properly.
+	 */
+	linAddr = base;
+	}
 
     /* Now expand the default DS selector to 4Gb so we can access it */
     if (!DPMI_setSelectorLimit(sregs.ds,0xFFFFFFFFUL))
-        return NULL;
+	return NULL;
 
     /* Finally enable caching for the page tables that we just mapped in,
      * since DOS4GW and PMODE/W create the page table entries without
@@ -916,34 +916,34 @@
      * caching) so that MMIO register regions do not screw up.
      */
     if (isCached) {
-        if ((PDB = _PM_getPDB()) != 0 && DSBaseAddr == 0) {
-            int     startPDB,endPDB,iPDB,startPage,endPage,start,end,iPage;
-            ulong   pageTable,*pPageTable;
-            if (!pPDB) {
-                if (PDB >= 0x100000)
-                    pPDB = (ulong*)DPMI_mapPhysicalToLinear(PDB,0xFFF);
-                else
-                    pPDB = (ulong*)PDB;
-                }
-            if (pPDB) {
-                startPDB = (linAddr >> 22) & 0x3FF;
-                startPage = (linAddr >> 12) & 0x3FF;
-                endPDB = ((linAddr+limit) >> 22) & 0x3FF;
-                endPage = ((linAddr+limit) >> 12) & 0x3FF;
-                for (iPDB = startPDB; iPDB <= endPDB; iPDB++) {
-                    pageTable = pPDB[iPDB] & ~0xFFF;
-                    if (pageTable >= 0x100000)
-                        pPageTable = (ulong*)DPMI_mapPhysicalToLinear(pageTable,0xFFF);
-                    else
-                        pPageTable = (ulong*)pageTable;
-                    start = (iPDB == startPDB) ? startPage : 0;
-                    end = (iPDB == endPDB) ? endPage : 0x3FF;
-                    for (iPage = start; iPage <= end; iPage++)
-                        pPageTable[iPage] &= ~0x18;
-                    }
-                }
-            }
-        }
+	if ((PDB = _PM_getPDB()) != 0 && DSBaseAddr == 0) {
+	    int     startPDB,endPDB,iPDB,startPage,endPage,start,end,iPage;
+	    ulong   pageTable,*pPageTable;
+	    if (!pPDB) {
+		if (PDB >= 0x100000)
+		    pPDB = (ulong*)DPMI_mapPhysicalToLinear(PDB,0xFFF);
+		else
+		    pPDB = (ulong*)PDB;
+		}
+	    if (pPDB) {
+		startPDB = (linAddr >> 22) & 0x3FF;
+		startPage = (linAddr >> 12) & 0x3FF;
+		endPDB = ((linAddr+limit) >> 22) & 0x3FF;
+		endPage = ((linAddr+limit) >> 12) & 0x3FF;
+		for (iPDB = startPDB; iPDB <= endPDB; iPDB++) {
+		    pageTable = pPDB[iPDB] & ~0xFFF;
+		    if (pageTable >= 0x100000)
+			pPageTable = (ulong*)DPMI_mapPhysicalToLinear(pageTable,0xFFF);
+		    else
+			pPageTable = (ulong*)pageTable;
+		    start = (iPDB == startPDB) ? startPage : 0;
+		    end = (iPDB == endPDB) ? endPage : 0x3FF;
+		    for (iPage = start; iPage <= end; iPage++)
+			pPageTable[iPage] &= ~0x18;
+		    }
+		}
+	    }
+	}
 
     /* Now return the base address of the memory into the default DS */
     return (void*)(linAddr - DSBaseAddr);
@@ -971,10 +971,10 @@
     uint    oldSeg,oldOff;
 
     if (!crPtr) {
-        /* Allocate and copy the memory block only once */
-        crPtr = PM_allocRealSeg(sizeof(int6AHandler), &crRSeg, &crROff);
-        memcpy(crPtr,int6AHandler,sizeof(int6AHandler));
-        }
+	/* Allocate and copy the memory block only once */
+	crPtr = PM_allocRealSeg(sizeof(int6AHandler), &crRSeg, &crROff);
+	memcpy(crPtr,int6AHandler,sizeof(int6AHandler));
+	}
     PM_setWord(crPtr,off);              /* Plug in address to call  */
     PM_setWord(crPtr+2,seg);
     p = PM_mapRealPointer(0,0x6A * 4);
@@ -1003,8 +1003,8 @@
 
 ulong PMAPI PM_getPhysicalAddr(void *p)
 {
-    // TODO: This function should find the physical address of a linear
-    //       address.
+    /* TODO: This function should find the physical address of a linear */
+    /*       address. */
     (void)p;
     return 0xFFFFFFFFUL;
 }
@@ -1020,7 +1020,7 @@
     static uchar *zeroPtr = NULL;
 
     if (!zeroPtr)
-        zeroPtr = PM_mapPhysicalAddr(0,0xFFFFF,true);
+	zeroPtr = PM_mapPhysicalAddr(0,0xFFFFF,true);
     return (void*)(zeroPtr + MK_PHYS(r_seg,r_off));
 }
 
@@ -1033,7 +1033,7 @@
     r.x.bx = (size + 0xF) >> 4;     /* number of paragraphs             */
     PM_int386(0x31, &r, &r);
     if (r.x.cflag)
-        return NULL;                /* DPMI call failed                 */
+	return NULL;                /* DPMI call failed                 */
     *r_seg = r.x.ax;                /* Real mode segment                */
     *r_off = 0;
     p = PM_mapRealPointer(*r_seg,*r_off);
@@ -1063,9 +1063,9 @@
     PMSREGS     sr;
 
     if (intno == 0x10 && DPMI_int10) {
-        if (DPMI_int10(regs))
-            return;
-        }
+	if (DPMI_int10(regs))
+	    return;
+	}
     PM_segread(&sr);
     r.x.ax = 0x300;                 /* DPMI issue real interrupt    */
     r.h.bl = intno;
@@ -1086,8 +1086,8 @@
     memset(&rmregs, 0, sizeof(rmregs));
     IN(eax); IN(ebx); IN(ecx); IN(edx); IN(esi); IN(edi);
 
-// These real mode ints may cause crashes.
-//AM:   DPMI_int86(intno,&rmregs);      /* DPMI issue real interrupt    */
+/* These real mode ints may cause crashes. */
+/*AM:   DPMI_int86(intno,&rmregs);      /###* DPMI issue real interrupt    */
 
     OUT(eax); OUT(ebx); OUT(ecx); OUT(edx); OUT(esi); OUT(edi);
     out->x.cflag = rmregs.flags & 0x1;
@@ -1104,7 +1104,7 @@
     rmregs.es = sregs->es;
     rmregs.ds = sregs->ds;
 
-//AM:   DPMI_int86(intno,&rmregs);      /* DPMI issue real interrupt    */
+/*AM:   DPMI_int86(intno,&rmregs);      /###* DPMI issue real interrupt    */
 
     OUT(eax); OUT(ebx); OUT(ecx); OUT(edx); OUT(esi); OUT(edi);
     sregs->es = rmregs.es;
@@ -1118,17 +1118,17 @@
 #pragma pack(1)
 
 typedef struct {
-        uint    LargestBlockAvail;
-        uint    MaxUnlockedPage;
-        uint    LargestLockablePage;
-        uint    LinAddrSpace;
-        uint    NumFreePagesAvail;
-        uint    NumPhysicalPagesFree;
-        uint    TotalPhysicalPages;
-        uint    FreeLinAddrSpace;
-        uint    SizeOfPageFile;
-        uint    res[3];
-        } MemInfo;
+	uint    LargestBlockAvail;
+	uint    MaxUnlockedPage;
+	uint    LargestLockablePage;
+	uint    LinAddrSpace;
+	uint    NumFreePagesAvail;
+	uint    NumPhysicalPagesFree;
+	uint    TotalPhysicalPages;
+	uint    FreeLinAddrSpace;
+	uint    SizeOfPageFile;
+	uint    res[3];
+	} MemInfo;
 
 #pragma pack()
 
@@ -1146,7 +1146,7 @@
     *physical = memInfo.NumPhysicalPagesFree * 4096;
     *total = memInfo.LargestBlockAvail;
     if (*total < *physical)
-        *physical = *total;
+	*physical = *total;
 }
 
 /****************************************************************************
@@ -1156,7 +1156,7 @@
 uint PMAPI PM_getFileAttr(
     const char *filename)
 {
-    // TODO: Implement this!
+    /* TODO: Implement this! */
     return 0;
 }
 
@@ -1169,7 +1169,7 @@
     ibool gmTime,
     PM_time *time)
 {
-    // TODO: Implement this!
+    /* TODO: Implement this! */
     return false;
 }
 
@@ -1182,6 +1182,6 @@
     ibool gmTime,
     PM_time *time)
 {
-    // TODO: Implement this!
+    /* TODO: Implement this! */
     return false;
 }

diff --git a/board/MAI/bios_emulator/scitech/src/pm/smx/pmsmx.c b/board/MAI/bios_emulator/scitech/src/pm/smx/pmsmx.c
index 2596c76..98e31bc 100644
--- a/board/MAI/bios_emulator/scitech/src/pm/smx/pmsmx.c
+++ b/board/MAI/bios_emulator/scitech/src/pm/smx/pmsmx.c

@@ -134,41 +134,41 @@
 void PMAPI PM_setRealTimeClockFrequency(int frequency)
 {
     static short convert[] = {
-        8192,
-        4096,
-        2048,
-        1024,
-        512,
-        256,
-        128,
-        64,
-        32,
-        16,
-        8,
-        4,
-        2,
-        -1,
-        };
+	8192,
+	4096,
+	2048,
+	1024,
+	512,
+	256,
+	128,
+	64,
+	32,
+	16,
+	8,
+	4,
+	2,
+	-1,
+	};
     int i;
 
     /* First clear any pending RTC timeout if not cleared */
     _PM_readCMOS(0x0C);
     if (frequency == 0) {
-        /* Disable RTC timout */
-        _PM_writeCMOS(0x0A,_PM_oldCMOSRegA);
-        _PM_writeCMOS(0x0B,_PM_oldCMOSRegB & 0x0F);
-        }
+	/* Disable RTC timout */
+	_PM_writeCMOS(0x0A,_PM_oldCMOSRegA);
+	_PM_writeCMOS(0x0B,_PM_oldCMOSRegB & 0x0F);
+	}
     else {
-        /* Convert frequency value to RTC clock indexes */
-        for (i = 0; convert[i] != -1; i++) {
-            if (convert[i] == frequency)
-                break;
-            }
+	/* Convert frequency value to RTC clock indexes */
+	for (i = 0; convert[i] != -1; i++) {
+	    if (convert[i] == frequency)
+		break;
+	    }
 
-        /* Set RTC timout value and enable timeout */
-        _PM_writeCMOS(0x0A,(_PM_oldCMOSRegA & 0xF0) | (i+3));
-        _PM_writeCMOS(0x0B,(_PM_oldCMOSRegB & 0x0F) | 0x40);
-        }
+	/* Set RTC timout value and enable timeout */
+	_PM_writeCMOS(0x0A,(_PM_oldCMOSRegA & 0xF0) | (i+3));
+	_PM_writeCMOS(0x0B,(_PM_oldCMOSRegB & 0x0F) | 0x40);
+	}
 }
 
 static void PMAPI lockPMHandlers(void)
@@ -176,22 +176,22 @@
     static int      locked = 0;
     int             stat = 0;
     PM_lockHandle   lh;
-    
+
     /* Lock all of the code and data used by our protected mode interrupt
      * handling routines, so that it will continue to work correctly
      * under real mode.
      */
     if (!locked) {
-        PM_saveDS();
-        stat  = !PM_lockDataPages(&globalDataStart-2048,4096,&lh);
-        stat |= !PM_lockDataPages(&_PM_pmsmxDataStart,(int)&_PM_pmsmxDataEnd - (int)&_PM_pmsmxDataStart,&lh);
-        stat |= !PM_lockCodePages((__codePtr)_PM_pmsmxCodeStart,(int)_PM_pmsmxCodeEnd-(int)_PM_pmsmxCodeStart,&lh);
-        if (stat) {
-            printf("Page locking services failed - interrupt handling not safe!\n");
-            exit(1);
-            }
-        locked = 1;
-        }
+	PM_saveDS();
+	stat  = !PM_lockDataPages(&globalDataStart-2048,4096,&lh);
+	stat |= !PM_lockDataPages(&_PM_pmsmxDataStart,(int)&_PM_pmsmxDataEnd - (int)&_PM_pmsmxDataStart,&lh);
+	stat |= !PM_lockCodePages((__codePtr)_PM_pmsmxCodeStart,(int)_PM_pmsmxCodeEnd-(int)_PM_pmsmxCodeStart,&lh);
+	if (stat) {
+	    printf("Page locking services failed - interrupt handling not safe!\n");
+	    exit(1);
+	    }
+	locked = 1;
+	}
 }
 
 void PMAPI PM_getPMvect(int intno, PMFARPTR *isr)
@@ -245,7 +245,7 @@
 void PMAPI PM_restoreMouseHandler(void)
 {
     if (_PM_mouseHandler)
-        _PM_mouseHandler = NULL;
+	_PM_mouseHandler = NULL;
 }
 
 static void getISR(int intno, PMFARPTR *pmisr, long *realisr)
@@ -274,9 +274,9 @@
 void PMAPI PM_restoreTimerHandler(void)
 {
     if (_PM_timerHandler) {
-        restoreISR(PM_IRQ0, _PM_prevTimer, _PM_prevRealTimer);
-        _PM_timerHandler = NULL;
-        }
+	restoreISR(PM_IRQ0, _PM_prevTimer, _PM_prevRealTimer);
+	_PM_timerHandler = NULL;
+	}
 }
 
 ibool PMAPI PM_setRealTimeClockHandler(PM_intHandler th,int frequency)
@@ -302,15 +302,15 @@
 void PMAPI PM_restoreRealTimeClockHandler(void)
 {
     if (_PM_rtcHandler) {
-        /* Restore CMOS registers and mask RTC clock */
-        _PM_writeCMOS(0x0A,_PM_oldCMOSRegA);
-        _PM_writeCMOS(0x0B,_PM_oldCMOSRegB);
-        PM_outpb(0xA1,(PM_inpb(0xA1) & 0xFE) | (_PM_oldRTCPIC2 & ~0xFE));
+	/* Restore CMOS registers and mask RTC clock */
+	_PM_writeCMOS(0x0A,_PM_oldCMOSRegA);
+	_PM_writeCMOS(0x0B,_PM_oldCMOSRegB);
+	PM_outpb(0xA1,(PM_inpb(0xA1) & 0xFE) | (_PM_oldRTCPIC2 & ~0xFE));
 
-        /* Restore the interrupt vector */
-        restoreISR(0x70, _PM_prevRTC, _PM_prevRealRTC);
-        _PM_rtcHandler = NULL;
-        }
+	/* Restore the interrupt vector */
+	restoreISR(0x70, _PM_prevRTC, _PM_prevRealRTC);
+	_PM_rtcHandler = NULL;
+	}
 }
 
 void PMAPI PM_setKeyHandler(PM_intHandler kh)
@@ -323,9 +323,9 @@
 void PMAPI PM_restoreKeyHandler(void)
 {
     if (_PM_keyHandler) {
-        restoreISR(PM_IRQ1, _PM_prevKey, _PM_prevRealKey);
-        _PM_keyHandler = NULL;
-        }
+	restoreISR(PM_IRQ1, _PM_prevKey, _PM_prevRealKey);
+	_PM_keyHandler = NULL;
+	}
 }
 
 void PMAPI PM_setKey15Handler(PM_key15Handler kh)
@@ -338,9 +338,9 @@
 void PMAPI PM_restoreKey15Handler(void)
 {
     if (_PM_key15Handler) {
-        restoreISR(0x15, _PM_prevKey15, _PM_prevRealKey15);
-        _PM_key15Handler = NULL;
-        }
+	restoreISR(0x15, _PM_prevKey15, _PM_prevRealKey15);
+	_PM_key15Handler = NULL;
+	}
 }
 
 /* Real mode Ctrl-C and Ctrl-Break handler. This handler simply sets a
@@ -385,12 +385,12 @@
 void PMAPI PM_restoreBreakHandler(void)
 {
     if (_PM_prevBreak.sel) {
-        restoreISR(0x1B, _PM_prevBreak, prevRealBreak);
-        restoreISR(0x23, _PM_prevCtrlC, prevRealCtrlC);
-        _PM_prevBreak.sel = 0;
-        _PM_breakHandler = NULL;
-        PM_freeRealSeg(_PM_ctrlBPtr);
-        }
+	restoreISR(0x1B, _PM_prevBreak, prevRealBreak);
+	restoreISR(0x23, _PM_prevCtrlC, prevRealCtrlC);
+	_PM_prevBreak.sel = 0;
+	_PM_breakHandler = NULL;
+	PM_freeRealSeg(_PM_ctrlBPtr);
+	}
 }
 
 /* Real mode Critical Error handler. This handler simply saves the AX and
@@ -432,11 +432,11 @@
 void PMAPI PM_restoreCriticalHandler(void)
 {
     if (_PM_prevCritical.sel) {
-        restoreISR(0x24, _PM_prevCritical, prevRealCritical);
-        PM_freeRealSeg(_PM_critPtr);
-        _PM_prevCritical.sel = 0;
-        _PM_critHandler = NULL;
-        }
+	restoreISR(0x24, _PM_prevCritical, prevRealCritical);
+	PM_freeRealSeg(_PM_critPtr);
+	_PM_prevCritical.sel = 0;
+	_PM_critHandler = NULL;
+	}
 }
 
 int PMAPI PM_lockDataPages(void *p,uint len,PM_lockHandle *lh)
@@ -457,9 +457,9 @@
 {
     PMSREGS sregs;
     PM_segread(&sregs);
-//AM: causes minor glitch with
-//AM: older versions pmEasy which don't allow DPMI 06 on
-//AM: Code selector 0x0C -- assume base is 0 which it should be.
+/*AM: causes minor glitch with */
+/*AM: older versions pmEasy which don't allow DPMI 06 on */
+/*AM: Code selector 0x0C -- assume base is 0 which it should be. */
     return DPMI_lockLinearPages((uint)p,len);
 }
 

diff --git a/board/MAI/bios_emulator/scitech/src/pm/smx/ztimer.c b/board/MAI/bios_emulator/scitech/src/pm/smx/ztimer.c
index 01e180b..7941192 100644
--- a/board/MAI/bios_emulator/scitech/src/pm/smx/ztimer.c
+++ b/board/MAI/bios_emulator/scitech/src/pm/smx/ztimer.c

@@ -110,6 +110,6 @@
 ulong __ULZElapsedTime(ulong start,ulong finish)
 {
     if (finish < start)
-        finish += xticks_per_second() * 3600 *24;       /* Number of ticks in 24 hours      */
+	finish += xticks_per_second() * 3600 *24;       /* Number of ticks in 24 hours      */
     return finish - start;
 }

diff --git a/board/MAI/bios_emulator/scitech/src/pm/stub/cpuinfo.c b/board/MAI/bios_emulator/scitech/src/pm/stub/cpuinfo.c
index 2833a72..0615e90 100644
--- a/board/MAI/bios_emulator/scitech/src/pm/stub/cpuinfo.c
+++ b/board/MAI/bios_emulator/scitech/src/pm/stub/cpuinfo.c

@@ -37,8 +37,8 @@
 ****************************************************************************/
 static int SetMaxThreadPriority(void)
 {
-    // TODO: If you have thread priorities, increase it to maximum for the
-    //       thread for timing the CPU frequency.
+    /* TODO: If you have thread priorities, increase it to maximum for the */
+    /*       thread for timing the CPU frequency. */
     return oldPriority;
 }
 
@@ -49,7 +49,7 @@
 static void RestoreThreadPriority(
     int priority)
 {
-    // TODO: Restore the original thread priority on exit.
+    /* TODO: Restore the original thread priority on exit. */
 }
 
 /****************************************************************************
@@ -59,8 +59,8 @@
 static void GetCounterFrequency(
     CPU_largeInteger *freq)
 {
-    // TODO: Return the frequency of the counter in here. You should try to
-    //       normalise this value to be around 100,000 ticks per second.
+    /* TODO: Return the frequency of the counter in here. You should try to */
+    /*       normalise this value to be around 100,000 ticks per second. */
     freq->low = 0;
     freq->high = 0;
 }

diff --git a/board/MAI/bios_emulator/scitech/src/pm/stub/event.c b/board/MAI/bios_emulator/scitech/src/pm/stub/event.c
index 8e805d0..204c492 100644
--- a/board/MAI/bios_emulator/scitech/src/pm/stub/event.c
+++ b/board/MAI/bios_emulator/scitech/src/pm/stub/event.c

@@ -59,7 +59,7 @@
 ****************************************************************************/
 ulong _EVT_getTicks(void)
 {
-    // TODO: Implement this for your OS!
+    /* TODO: Implement this for your OS! */
 }
 
 /****************************************************************************
@@ -68,36 +68,36 @@
 ****************************************************************************/
 static void _EVT_pumpMessages(void)
 {
-    // TODO: The purpose of this function is to read all keyboard and mouse
-    //       events from the OS specific event queue, translate them and post
-    //       them into the SciTech event queue.
-    //
-    // NOTE: There are a couple of important things that this function must
-    //       take care of:
-    //
-    //  1. Support for KEYDOWN, KEYREPEAT and KEYUP is required.
-    //
-    //  2. Support for reading hardware scan code as well as ASCII
-    //     translated values is required. Games use the scan codes rather
-    //     than ASCII values. Scan codes go into the high order byte of the
-    //     keyboard message field.
-    //
-    //  3. Support for at least reading mouse motion data (mickeys) from the
-    //     mouse is required. Using the mickey values, we can then translate
-    //     to mouse cursor coordinates scaled to the range of the current
-    //     graphics display mode. Mouse values are scaled based on the
-    //     global 'rangeX' and 'rangeY'.
-    //
-    //  4. Support for a timestamp for the events is required, which is
-    //     defined as the number of milliseconds since some event (usually
-    //     system startup). This is the timestamp when the event occurred
-    //     (ie: at interrupt time) not when it was stuff into the SciTech
-    //     event queue.
-    //
-    //  5. Support for mouse double click events. If the OS has a native
-    //     mechanism to determine this, it should be used. Otherwise the
-    //     time stamp information will be used by the generic event code
-    //     to generate double click events.
+    /* TODO: The purpose of this function is to read all keyboard and mouse */
+    /*       events from the OS specific event queue, translate them and post */
+    /*       them into the SciTech event queue. */
+    /* */
+    /* NOTE: There are a couple of important things that this function must */
+    /*       take care of: */
+    /* */
+    /*  1. Support for KEYDOWN, KEYREPEAT and KEYUP is required. */
+    /* */
+    /*  2. Support for reading hardware scan code as well as ASCII */
+    /*     translated values is required. Games use the scan codes rather */
+    /*     than ASCII values. Scan codes go into the high order byte of the */
+    /*     keyboard message field. */
+    /* */
+    /*  3. Support for at least reading mouse motion data (mickeys) from the */
+    /*     mouse is required. Using the mickey values, we can then translate */
+    /*     to mouse cursor coordinates scaled to the range of the current */
+    /*     graphics display mode. Mouse values are scaled based on the */
+    /*     global 'rangeX' and 'rangeY'. */
+    /* */
+    /*  4. Support for a timestamp for the events is required, which is */
+    /*     defined as the number of milliseconds since some event (usually */
+    /*     system startup). This is the timestamp when the event occurred */
+    /*     (ie: at interrupt time) not when it was stuff into the SciTech */
+    /*     event queue. */
+    /* */
+    /*  5. Support for mouse double click events. If the OS has a native */
+    /*     mechanism to determine this, it should be used. Otherwise the */
+    /*     time stamp information will be used by the generic event code */
+    /*     to generate double click events. */
 }
 
 /****************************************************************************
@@ -141,7 +141,7 @@
     initEventQueue();
     memset(keyUpMsg,0,sizeof(keyUpMsg));
 
-    // TODO: Do any OS specific initialisation here
+    /* TODO: Do any OS specific initialisation here */
 
     /* Catch program termination signals so we can clean up properly */
     signal(SIGABRT, _EVT_abort);
@@ -171,7 +171,7 @@
 ****************************************************************************/
 void EVT_resume(void)
 {
-    // Do nothing for non DOS systems
+    /* Do nothing for non DOS systems */
 }
 
 /****************************************************************************
@@ -181,7 +181,7 @@
 ****************************************************************************/
 void EVT_suspend(void)
 {
-    // Do nothing for non DOS systems
+    /* Do nothing for non DOS systems */
 }
 
 /****************************************************************************
@@ -195,5 +195,5 @@
     signal(SIGFPE, SIG_DFL);
     signal(SIGINT, SIG_DFL);
 
-    // TODO: Do any OS specific cleanup in here
+    /* TODO: Do any OS specific cleanup in here */
 }

diff --git a/board/MAI/bios_emulator/scitech/src/pm/stub/oshdr.h b/board/MAI/bios_emulator/scitech/src/pm/stub/oshdr.h
index 81a20aa..1395cbc 100644
--- a/board/MAI/bios_emulator/scitech/src/pm/stub/oshdr.h
+++ b/board/MAI/bios_emulator/scitech/src/pm/stub/oshdr.h

@@ -28,6 +28,6 @@
 *
 ****************************************************************************/
 
-// TODO: This is where you include OS specific headers for the event handling
-//       library. You may leave this empty if you have no OS specific headers
-//       to include.
+/* TODO: This is where you include OS specific headers for the event handling */
+/*       library. You may leave this empty if you have no OS specific headers */
+/*       to include. */

diff --git a/board/MAI/bios_emulator/scitech/src/pm/stub/pm.c b/board/MAI/bios_emulator/scitech/src/pm/stub/pm.c
index 51656b0..5f278c3 100644
--- a/board/MAI/bios_emulator/scitech/src/pm/stub/pm.c
+++ b/board/MAI/bios_emulator/scitech/src/pm/stub/pm.c

@@ -38,13 +38,13 @@
 #include <stdlib.h>
 #include <string.h>
 
-// TODO: Include any OS specific headers here!
+/* TODO: Include any OS specific headers here! */
 
 /*--------------------------- Global variables ----------------------------*/
 
-// TODO: If you support access to the BIOS, the following VESABuf globals
-//       keep track of a single VESA transfer buffer. If you don't support
-//       access to the BIOS, remove these variables.
+/* TODO: If you support access to the BIOS, the following VESABuf globals */
+/*       keep track of a single VESA transfer buffer. If you don't support */
+/*       access to the BIOS, remove these variables. */
 
 static uint VESABuf_len = 1024;     /* Length of the VESABuf buffer     */
 static void *VESABuf_ptr = NULL;    /* Near pointer to VESABuf          */
@@ -61,12 +61,12 @@
 ****************************************************************************/
 void PMAPI PM_init(void)
 {
-    // TODO: Do any initialisation in here. This includes getting IOPL
-    //       access for the process calling PM_init. This will get called
-    //       more than once.
+    /* TODO: Do any initialisation in here. This includes getting IOPL */
+    /*       access for the process calling PM_init. This will get called */
+    /*       more than once. */
 
-    // TODO: If you support the supplied MTRR register stuff (you need to
-    //       be at ring 0 for this!), you should initialise it in here.
+    /* TODO: If you support the supplied MTRR register stuff (you need to */
+    /*       be at ring 0 for this!), you should initialise it in here. */
 
 /* MTRR_init(); */
 }
@@ -77,7 +77,7 @@
 ****************************************************************************/
 long PMAPI PM_getOSType(void)
 {
-    // TODO: Change this to return the define for your OS from drvlib/os.h
+    /* TODO: Change this to return the define for your OS from drvlib/os.h */
     return _OS_MYOS;
 }
 
@@ -97,9 +97,9 @@
 {
     uint pos = strlen(s);
     if (s[pos-1] != '/') {
-        s[pos] = '/';
-        s[pos+1] = '\0';
-        }
+	s[pos] = '/';
+	s[pos+1] = '\0';
+	}
 }
 
 /****************************************************************************
@@ -119,11 +119,11 @@
 void PMAPI PM_fatalError(
     const char *msg)
 {
-    // TODO: If you are running in a GUI environment without a console,
-    //       this needs to be changed to bring up a fatal error message
-    //       box and terminate the program.
+    /* TODO: If you are running in a GUI environment without a console, */
+    /*       this needs to be changed to bring up a fatal error message */
+    /*       box and terminate the program. */
     if (fatalErrorCleanup)
-        fatalErrorCleanup();
+	fatalErrorCleanup();
     fprintf(stderr,"%s\n", msg);
     exit(1);
 }
@@ -134,9 +134,9 @@
 ****************************************************************************/
 static void ExitVBEBuf(void)
 {
-    // TODO: If you do not have BIOS access, remove this function.
+    /* TODO: If you do not have BIOS access, remove this function. */
     if (VESABuf_ptr)
-        PM_freeRealSeg(VESABuf_ptr);
+	PM_freeRealSeg(VESABuf_ptr);
     VESABuf_ptr = 0;
 }
 
@@ -149,14 +149,14 @@
     uint *rseg,
     uint *roff)
 {
-    // TODO: If you do not have BIOS access, simply delete the guts of
-    //       this function and return NULL.
+    /* TODO: If you do not have BIOS access, simply delete the guts of */
+    /*       this function and return NULL. */
     if (!VESABuf_ptr) {
-        /* Allocate a global buffer for communicating with the VESA VBE */
-        if ((VESABuf_ptr = PM_allocRealSeg(VESABuf_len, &VESABuf_rseg, &VESABuf_roff)) == NULL)
-            return NULL;
-        atexit(ExitVBEBuf);
-        }
+	/* Allocate a global buffer for communicating with the VESA VBE */
+	if ((VESABuf_ptr = PM_allocRealSeg(VESABuf_len, &VESABuf_rseg, &VESABuf_roff)) == NULL)
+	    return NULL;
+	atexit(ExitVBEBuf);
+	}
     *len = VESABuf_len;
     *rseg = VESABuf_rseg;
     *roff = VESABuf_roff;
@@ -169,9 +169,9 @@
 ****************************************************************************/
 int PMAPI PM_kbhit(void)
 {
-    // TODO: This function checks if a key is available to be read. This
-    //       should be implemented, but is mostly used by the test programs
-    //       these days.
+    /* TODO: This function checks if a key is available to be read. This */
+    /*       should be implemented, but is mostly used by the test programs */
+    /*       these days. */
     return true;
 }
 
@@ -181,9 +181,9 @@
 ****************************************************************************/
 int PMAPI PM_getch(void)
 {
-    // TODO: This returns the ASCII code of the key pressed. This
-    //       should be implemented, but is mostly used by the test programs
-    //       these days.
+    /* TODO: This returns the ASCII code of the key pressed. This */
+    /*       should be implemented, but is mostly used by the test programs */
+    /*       these days. */
     return 0xD;
 }
 
@@ -193,12 +193,12 @@
 ****************************************************************************/
 int PMAPI PM_openConsole(void)
 {
-    // TODO: Opens up a fullscreen console for graphics output. If your
-    //       console does not have graphics/text modes, this can be left
-    //       empty. The main purpose of this is to disable console switching
-    //       when in graphics modes if you can switch away from fullscreen
-    //       consoles (if you want to allow switching, this can be done
-    //       elsewhere with a full save/restore state of the graphics mode).
+    /* TODO: Opens up a fullscreen console for graphics output. If your */
+    /*       console does not have graphics/text modes, this can be left */
+    /*       empty. The main purpose of this is to disable console switching */
+    /*       when in graphics modes if you can switch away from fullscreen */
+    /*       consoles (if you want to allow switching, this can be done */
+    /*       elsewhere with a full save/restore state of the graphics mode). */
     return 0;
 }
 
@@ -208,9 +208,9 @@
 ****************************************************************************/
 int PMAPI PM_getConsoleStateSize(void)
 {
-    // TODO: Returns the size of the console state buffer used to save the
-    //       state of the console before going into graphics mode. This is
-    //       used to restore the console back to normal when we are done.
+    /* TODO: Returns the size of the console state buffer used to save the */
+    /*       state of the console before going into graphics mode. This is */
+    /*       used to restore the console back to normal when we are done. */
     return 1;
 }
 
@@ -222,11 +222,11 @@
     void *stateBuf,
     int console_id)
 {
-    // TODO: Saves the state of the console into the state buffer. This is
-    //       used to restore the console back to normal when we are done.
-    //       We will always restore 80x25 text mode after being in graphics
-    //       mode, so if restoring text mode is all you need to do this can
-    //       be left empty.
+    /* TODO: Saves the state of the console into the state buffer. This is */
+    /*       used to restore the console back to normal when we are done. */
+    /*       We will always restore 80x25 text mode after being in graphics */
+    /*       mode, so if restoring text mode is all you need to do this can */
+    /*       be left empty. */
 }
 
 /****************************************************************************
@@ -237,11 +237,11 @@
     const void *stateBuf,
     int console_id)
 {
-    // TODO: Restore the state of the console from the state buffer. This is
-    //       used to restore the console back to normal when we are done.
-    //       We will always restore 80x25 text mode after being in graphics
-    //       mode, so if restoring text mode is all you need to do this can
-    //       be left empty.
+    /* TODO: Restore the state of the console from the state buffer. This is */
+    /*       used to restore the console back to normal when we are done. */
+    /*       We will always restore 80x25 text mode after being in graphics */
+    /*       mode, so if restoring text mode is all you need to do this can */
+    /*       be left empty. */
 }
 
 /****************************************************************************
@@ -251,7 +251,7 @@
 void PMAPI PM_closeConsole(
     int console_id)
 {
-    // TODO: Close the console when we are done, going back to text mode.
+    /* TODO: Close the console when we are done, going back to text mode. */
 }
 
 /****************************************************************************
@@ -262,8 +262,8 @@
     int x,
     int y)
 {
-    // TODO: Set the OS console cursor location to the new value. This is
-    //       generally used for new OS ports (used mostly for DOS).
+    /* TODO: Set the OS console cursor location to the new value. This is */
+    /*       generally used for new OS ports (used mostly for DOS). */
 }
 
 /****************************************************************************
@@ -274,8 +274,8 @@
     int width,
     int height)
 {
-    // TODO: Set the OS console screen width. This is generally unused for
-    //       new OS ports.
+    /* TODO: Set the OS console screen width. This is generally unused for */
+    /*       new OS ports. */
 }
 
 /****************************************************************************
@@ -286,12 +286,12 @@
     PM_intHandler ih,
     int frequency)
 {
-    // TODO: Install a real time clock interrupt handler. Normally this
-    //       will not be supported from most OS'es in user land, so an
-    //       alternative mechanism is needed to enable software stereo.
-    //       Hence leave this unimplemented unless you have a high priority
-    //       mechanism to call the 32-bit callback when the real time clock
-    //       interrupt fires.
+    /* TODO: Install a real time clock interrupt handler. Normally this */
+    /*       will not be supported from most OS'es in user land, so an */
+    /*       alternative mechanism is needed to enable software stereo. */
+    /*       Hence leave this unimplemented unless you have a high priority */
+    /*       mechanism to call the 32-bit callback when the real time clock */
+    /*       interrupt fires. */
     return false;
 }
 
@@ -302,9 +302,9 @@
 void PMAPI PM_setRealTimeClockFrequency(
     int frequency)
 {
-    // TODO: Set the real time clock interrupt frequency. Used for stereo
-    //       LC shutter glasses when doing software stereo. Usually sets
-    //       the frequency to around 2048 Hz.
+    /* TODO: Set the real time clock interrupt frequency. Used for stereo */
+    /*       LC shutter glasses when doing software stereo. Usually sets */
+    /*       the frequency to around 2048 Hz. */
 }
 
 /****************************************************************************
@@ -313,7 +313,7 @@
 ****************************************************************************/
 void PMAPI PM_restoreRealTimeClockHandler(void)
 {
-    // TODO: Restores the real time clock handler.
+    /* TODO: Restores the real time clock handler. */
 }
 
 /****************************************************************************
@@ -333,8 +333,8 @@
 ****************************************************************************/
 char PMAPI PM_getBootDrive(void)
 {
-    // TODO: Return the boot drive letter for the OS. Normally this is 'c'
-    //       for DOS based OS'es and '/' for Unices.
+    /* TODO: Return the boot drive letter for the OS. Normally this is 'c' */
+    /*       for DOS based OS'es and '/' for Unices. */
     return '/';
 }
 
@@ -353,8 +353,8 @@
 ****************************************************************************/
 const char * PMAPI PM_getNucleusPath(void)
 {
-    // TODO: Change this to the default path to Nucleus driver files. The
-    //       following is the default for Unices.
+    /* TODO: Change this to the default path to Nucleus driver files. The */
+    /*       following is the default for Unices. */
     char *env = getenv("NUCLEUS_PATH");
     return env ? env : "/usr/lib/nucleus";
 }
@@ -378,8 +378,8 @@
 ****************************************************************************/
 const char * PMAPI PM_getUniqueID(void)
 {
-    // TODO: Return a unique ID for the machine. If a unique ID is not
-    //       available, return the machine name.
+    /* TODO: Return a unique ID for the machine. If a unique ID is not */
+    /*       available, return the machine name. */
     static char buf[128];
     gethostname(buf, 128);
     return buf;
@@ -391,7 +391,7 @@
 ****************************************************************************/
 const char * PMAPI PM_getMachineName(void)
 {
-    // TODO: Return the network machine name for the machine.
+    /* TODO: Return the network machine name for the machine. */
     static char buf[128];
     gethostname(buf, 128);
     return buf;
@@ -403,10 +403,10 @@
 ****************************************************************************/
 void * PMAPI PM_getBIOSPointer(void)
 {
-    // TODO: This returns a pointer to the real mode BIOS data area. If you
-    //       do not support BIOS access, you can simply return NULL here.
+    /* TODO: This returns a pointer to the real mode BIOS data area. If you */
+    /*       do not support BIOS access, you can simply return NULL here. */
     if (!zeroPtr)
-        zeroPtr = PM_mapPhysicalAddr(0,0xFFFFF,true);
+	zeroPtr = PM_mapPhysicalAddr(0,0xFFFFF,true);
     return (void*)(zeroPtr + 0x400);
 }
 
@@ -418,7 +418,7 @@
 {
     static void *bankPtr;
     if (!bankPtr)
-        bankPtr = PM_mapPhysicalAddr(0xA0000,0xFFFF,true);
+	bankPtr = PM_mapPhysicalAddr(0xA0000,0xFFFF,true);
     return bankPtr;
 }
 
@@ -431,23 +431,23 @@
     ulong limit,
     ibool isCached)
 {
-    // TODO: This function maps a physical memory address to a linear
-    //       address in the address space of the calling process.
+    /* TODO: This function maps a physical memory address to a linear */
+    /*       address in the address space of the calling process. */
 
-    // NOTE: This function *must* be able to handle any phsyical base
-    //       address, and hence you will have to handle rounding of
-    //       the physical base address to a page boundary (ie: 4Kb on
-    //       x86 CPU's) to be able to properly map in the memory
-    //       region.
+    /* NOTE: This function *must* be able to handle any phsyical base */
+    /*       address, and hence you will have to handle rounding of */
+    /*       the physical base address to a page boundary (ie: 4Kb on */
+    /*       x86 CPU's) to be able to properly map in the memory */
+    /*       region. */
 
-    // NOTE: If possible the isCached bit should be used to ensure that
-    //       the PCD (Page Cache Disable) and PWT (Page Write Through)
-    //       bits are set to disable caching for a memory mapping used
-    //       for MMIO register access. We also disable caching using
-    //       the MTRR registers for Pentium Pro and later chipsets so if
-    //       MTRR support is enabled for your OS then you can safely ignore
-    //       the isCached flag and always enable caching in the page
-    //       tables.
+    /* NOTE: If possible the isCached bit should be used to ensure that */
+    /*       the PCD (Page Cache Disable) and PWT (Page Write Through) */
+    /*       bits are set to disable caching for a memory mapping used */
+    /*       for MMIO register access. We also disable caching using */
+    /*       the MTRR registers for Pentium Pro and later chipsets so if */
+    /*       MTRR support is enabled for your OS then you can safely ignore */
+    /*       the isCached flag and always enable caching in the page */
+    /*       tables. */
     return NULL;
 }
 
@@ -459,9 +459,9 @@
     void *ptr,
     ulong limit)
 {
-    // TODO: This function will free a physical memory mapping previously
-    //       allocated with PM_mapPhysicalAddr() if at all possible. If
-    //       you can't free physical memory mappings, simply do nothing.
+    /* TODO: This function will free a physical memory mapping previously */
+    /*       allocated with PM_mapPhysicalAddr() if at all possible. If */
+    /*       you can't free physical memory mappings, simply do nothing. */
 }
 
 /****************************************************************************
@@ -470,36 +470,36 @@
 ****************************************************************************/
 ulong PMAPI PM_getPhysicalAddr(void *p)
 {
-    // TODO: This function should find the physical address of a linear
-    //       address.
+    /* TODO: This function should find the physical address of a linear */
+    /*       address. */
     return 0xFFFFFFFFUL;
 }
 
 void PMAPI PM_sleep(ulong milliseconds)
 {
-    // TODO: Put the process to sleep for milliseconds
+    /* TODO: Put the process to sleep for milliseconds */
 }
 
 int PMAPI PM_getCOMPort(int port)
 {
-    // TODO: Re-code this to determine real values using the Plug and Play
-    //       manager for the OS.
+    /* TODO: Re-code this to determine real values using the Plug and Play */
+    /*       manager for the OS. */
     switch (port) {
-        case 0: return 0x3F8;
-        case 1: return 0x2F8;
-        }
+	case 0: return 0x3F8;
+	case 1: return 0x2F8;
+	}
     return 0;
 }
 
 int PMAPI PM_getLPTPort(int port)
 {
-    // TODO: Re-code this to determine real values using the Plug and Play
-    //       manager for the OS.
+    /* TODO: Re-code this to determine real values using the Plug and Play */
+    /*       manager for the OS. */
     switch (port) {
-        case 0: return 0x3BC;
-        case 1: return 0x378;
-        case 2: return 0x278;
-        }
+	case 0: return 0x3BC;
+	case 1: return 0x378;
+	case 2: return 0x278;
+	}
     return 0;
 }
 
@@ -510,11 +510,11 @@
 void * PMAPI PM_mallocShared(
     long size)
 {
-    // TODO: This is used to allocate memory that is shared between process
-    //       that all access the common Nucleus drivers via a common display
-    //       driver DLL. If your OS does not support shared memory (or if
-    //       the display driver does not need to allocate shared memory
-    //       for each process address space), this should just call PM_malloc.
+    /* TODO: This is used to allocate memory that is shared between process */
+    /*       that all access the common Nucleus drivers via a common display */
+    /*       driver DLL. If your OS does not support shared memory (or if */
+    /*       the display driver does not need to allocate shared memory */
+    /*       for each process address space), this should just call PM_malloc. */
     return PM_malloc(size);
 }
 
@@ -525,10 +525,10 @@
 void PMAPI PM_freeShared(
     void *ptr)
 {
-    // TODO: Free the shared memory block. This will be called in the context
-    //       of the original calling process that allocated the shared
-    //       memory with PM_mallocShared. Simply call PM_free if you do not
-    //       need this.
+    /* TODO: Free the shared memory block. This will be called in the context */
+    /*       of the original calling process that allocated the shared */
+    /*       memory with PM_mallocShared. Simply call PM_free if you do not */
+    /*       need this. */
     PM_free(ptr);
 }
 
@@ -542,16 +542,16 @@
     void *base,
     ulong limit)
 {
-    // TODO: This function is used to map a physical memory mapping
-    //       previously allocated with PM_mapPhysicalAddr into the
-    //       address space of the calling process. If the memory mapping
-    //       allocated by PM_mapPhysicalAddr is global to all processes,
-    //       simply return the pointer.
+    /* TODO: This function is used to map a physical memory mapping */
+    /*       previously allocated with PM_mapPhysicalAddr into the */
+    /*       address space of the calling process. If the memory mapping */
+    /*       allocated by PM_mapPhysicalAddr is global to all processes, */
+    /*       simply return the pointer. */
 
-    // NOTE: This function must also handle rounding to page boundaries,
-    //       since this function is used to map in shared memory buffers
-    //       allocated with PM_mapPhysicalAddr(). Hence if you aligned
-    //       the physical address above, then you also need to do it here.
+    /* NOTE: This function must also handle rounding to page boundaries, */
+    /*       since this function is used to map in shared memory buffers */
+    /*       allocated with PM_mapPhysicalAddr(). Hence if you aligned */
+    /*       the physical address above, then you also need to do it here. */
     return base;
 }
 
@@ -563,11 +563,11 @@
     uint r_seg,
     uint r_off)
 {
-    // TODO: This function maps a real mode memory pointer into the
-    //       calling processes address space as a 32-bit near pointer. If
-    //       you do not support BIOS access, simply return NULL here.
+    /* TODO: This function maps a real mode memory pointer into the */
+    /*       calling processes address space as a 32-bit near pointer. If */
+    /*       you do not support BIOS access, simply return NULL here. */
     if (!zeroPtr)
-        zeroPtr = PM_mapPhysicalAddr(0,0xFFFFF);
+	zeroPtr = PM_mapPhysicalAddr(0,0xFFFFF);
     return (void*)(zeroPtr + MK_PHYS(r_seg,r_off));
 }
 
@@ -580,10 +580,10 @@
     uint *r_seg,
     uint *r_off)
 {
-    // TODO: This function allocates a block of real mode memory for the
-    //       calling process used to communicate with real mode BIOS
-    //       functions. If you do not support BIOS access, simply return
-    //       NULL here.
+    /* TODO: This function allocates a block of real mode memory for the */
+    /*       calling process used to communicate with real mode BIOS */
+    /*       functions. If you do not support BIOS access, simply return */
+    /*       NULL here. */
     return NULL;
 }
 
@@ -594,8 +594,8 @@
 void PMAPI PM_freeRealSeg(
     void *mem)
 {
-    // TODO: Frees a previously allocated real mode memory block. If you
-    //       do not support BIOS access, this function should be empty.
+    /* TODO: Frees a previously allocated real mode memory block. If you */
+    /*       do not support BIOS access, this function should be empty. */
 }
 
 /****************************************************************************
@@ -606,9 +606,9 @@
     int intno,
     DPMI_regs *regs)
 {
-    // TODO: This function calls the real mode BIOS using the passed in
-    //       register structure. If you do not support real mode BIOS
-    //       access, this function should be empty.
+    /* TODO: This function calls the real mode BIOS using the passed in */
+    /*       register structure. If you do not support real mode BIOS */
+    /*       access, this function should be empty. */
 }
 
 /****************************************************************************
@@ -620,9 +620,9 @@
     RMREGS *in,
     RMREGS *out)
 {
-    // TODO: This function calls the real mode BIOS using the passed in
-    //       register structure. If you do not support real mode BIOS
-    //       access, this function should return 0.
+    /* TODO: This function calls the real mode BIOS using the passed in */
+    /*       register structure. If you do not support real mode BIOS */
+    /*       access, this function should return 0. */
     return 0;
 }
 
@@ -636,9 +636,9 @@
     RMREGS *out,
     RMSREGS *sregs)
 {
-    // TODO: This function calls the real mode BIOS using the passed in
-    //       register structure. If you do not support real mode BIOS
-    //       access, this function should return 0.
+    /* TODO: This function calls the real mode BIOS using the passed in */
+    /*       register structure. If you do not support real mode BIOS */
+    /*       access, this function should return 0. */
     return 0;
 }
 
@@ -652,9 +652,9 @@
     RMREGS *in,
     RMSREGS *sregs)
 {
-    // TODO: This function calls a real mode far function with a far call.
-    //       If you do not support BIOS access, this function should be
-    //       empty.
+    /* TODO: This function calls a real mode far function with a far call. */
+    /*       If you do not support BIOS access, this function should be */
+    /*       empty. */
 }
 
 /****************************************************************************
@@ -665,9 +665,9 @@
     ulong *physical,
     ulong *total)
 {
-    // TODO: Report the amount of available memory, both the amount of
-    //       physical memory left and the amount of virtual memory left.
-    //       If the OS does not provide these services, report 0's.
+    /* TODO: Report the amount of available memory, both the amount of */
+    /*       physical memory left and the amount of virtual memory left. */
+    /*       If the OS does not provide these services, report 0's. */
     *physical = *total = 0;
 }
 
@@ -681,10 +681,10 @@
     ibool contiguous,
     ibool below16M)
 {
-    // TODO: Allocate a block of locked, physical memory of the specified
-    //       size. This is used for bus master operations. If this is not
-    //       supported by the OS, return NULL and bus mastering will not
-    //       be used.
+    /* TODO: Allocate a block of locked, physical memory of the specified */
+    /*       size. This is used for bus master operations. If this is not */
+    /*       supported by the OS, return NULL and bus mastering will not */
+    /*       be used. */
     return NULL;
 }
 
@@ -697,7 +697,7 @@
     uint size,
     ibool contiguous)
 {
-    // TODO: Free a memory block allocated with PM_allocLockedMem.
+    /* TODO: Free a memory block allocated with PM_allocLockedMem. */
 }
 
 /****************************************************************************
@@ -709,9 +709,9 @@
 {
     RMREGS  regs;
 
-    // TODO: This does a bank switch function by calling the real mode
-    //       VESA BIOS. If you do not support BIOS access, this function should
-    //       be empty.
+    /* TODO: This does a bank switch function by calling the real mode */
+    /*       VESA BIOS. If you do not support BIOS access, this function should */
+    /*       be empty. */
     regs.x.ax = 0x4F05;
     regs.x.bx = 0x0000;
     regs.x.dx = bank;
@@ -727,9 +727,9 @@
 {
     RMREGS  regs;
 
-    // TODO: This does a bank switch function by calling the real mode
-    //       VESA BIOS. If you do not support BIOS access, this function should
-    //       be empty.
+    /* TODO: This does a bank switch function by calling the real mode */
+    /*       VESA BIOS. If you do not support BIOS access, this function should */
+    /*       be empty. */
     regs.x.ax = 0x4F05;
     regs.x.bx = 0x0000;
     regs.x.dx = bank;
@@ -751,9 +751,9 @@
 {
     RMREGS  regs;
 
-    // TODO: This changes the display start address by calling the real mode
-    //       VESA BIOS. If you do not support BIOS access, this function
-    //       should be empty.
+    /* TODO: This changes the display start address by calling the real mode */
+    /*       VESA BIOS. If you do not support BIOS access, this function */
+    /*       should be empty. */
     regs.x.ax = 0x4F07;
     regs.x.bx = waitVRT;
     regs.x.cx = x;
@@ -770,17 +770,17 @@
     ulong length,
     uint type)
 {
-    // TODO: This function should enable Pentium Pro and Pentium II MTRR
-    //       write combining for the passed in physical memory base address
-    //       and length. Normally this is done via calls to an OS specific
-    //       device driver as this can only be done at ring 0.
-    //
-    // NOTE: This is a *very* important function to implement! If you do
-    //       not implement, graphics performance on the latest Intel chips
-    //       will be severly impaired. For sample code that can be used
-    //       directly in a ring 0 device driver, see the MSDOS implementation
-    //       which includes assembler code to do this directly (if the
-    //       program is running at ring 0).
+    /* TODO: This function should enable Pentium Pro and Pentium II MTRR */
+    /*       write combining for the passed in physical memory base address */
+    /*       and length. Normally this is done via calls to an OS specific */
+    /*       device driver as this can only be done at ring 0. */
+    /* */
+    /* NOTE: This is a *very* important function to implement! If you do */
+    /*       not implement, graphics performance on the latest Intel chips */
+    /*       will be severly impaired. For sample code that can be used */
+    /*       directly in a ring 0 device driver, see the MSDOS implementation */
+    /*       which includes assembler code to do this directly (if the */
+    /*       program is running at ring 0). */
     return false;
 }
 
@@ -793,19 +793,19 @@
     ulong BIOSPhysAddr,
     void *mappedBIOS)
 {
-    // TODO: This function is used to run the BIOS POST code on a secondary
-    //       controller to initialise it for use. This is not necessary
-    //       for multi-controller operation, but it will make it a lot
-    //       more convenicent for end users (otherwise they have to boot
-    //       the system once with the secondary controller as primary, and
-    //       then boot with both controllers installed).
-    //
-    //       Even if you don't support full BIOS access, it would be
-    //       adviseable to be able to POST the secondary controllers in the
-    //       system using this function as a minimum requirement. Some
-    //       graphics hardware has registers that contain values that only
-    //       the BIOS knows about, which makes bring up a card from cold
-    //       reset difficult if the BIOS has not POST'ed it.
+    /* TODO: This function is used to run the BIOS POST code on a secondary */
+    /*       controller to initialise it for use. This is not necessary */
+    /*       for multi-controller operation, but it will make it a lot */
+    /*       more convenicent for end users (otherwise they have to boot */
+    /*       the system once with the secondary controller as primary, and */
+    /*       then boot with both controllers installed). */
+    /* */
+    /*       Even if you don't support full BIOS access, it would be */
+    /*       adviseable to be able to POST the secondary controllers in the */
+    /*       system using this function as a minimum requirement. Some */
+    /*       graphics hardware has registers that contain values that only */
+    /*       the BIOS knows about, which makes bring up a card from cold */
+    /*       reset difficult if the BIOS has not POST'ed it. */
     return false;
 }
 
@@ -817,8 +817,8 @@
 PM_MODULE PMAPI PM_loadLibrary(
     const char *szDLLName)
 {
-    // TODO: This function should load a native shared library from disk
-    //       given the path to the library.
+    /* TODO: This function should load a native shared library from disk */
+    /*       given the path to the library. */
     (void)szDLLName;
     return NULL;
 }
@@ -831,8 +831,8 @@
     PM_MODULE hModule,
     const char *szProcName)
 {
-    // TODO: This function should return the address of a named procedure
-    //       from a native shared library.
+    /* TODO: This function should return the address of a named procedure */
+    /*       from a native shared library. */
     (void)hModule;
     (void)szProcName;
     return NULL;
@@ -845,7 +845,7 @@
 void PMAPI PM_freeLibrary(
     PM_MODULE hModule)
 {
-    // TODO: This function free a previously loaded native shared library.
+    /* TODO: This function free a previously loaded native shared library. */
     (void)hModule;
 }
 
@@ -860,8 +860,8 @@
 int PMAPI PM_setIOPL(
     int level)
 {
-    // TODO: This function should enable IOPL for the task (if IOPL is
-    //       not always enabled for the app through some other means).
+    /* TODO: This function should enable IOPL for the task (if IOPL is */
+    /*       not always enabled for the app through some other means). */
     return level;
 }
 
@@ -873,9 +873,9 @@
     const char *filename,
     PM_findData *findData)
 {
-    // TODO: This function should start a directory enumeration search
-    //       given the filename (with wildcards). The data should be
-    //       converted and returned in the findData standard form.
+    /* TODO: This function should start a directory enumeration search */
+    /*       given the filename (with wildcards). The data should be */
+    /*       converted and returned in the findData standard form. */
     (void)filename;
     (void)findData;
     return PM_FILE_INVALID;
@@ -889,10 +889,10 @@
     void *handle,
     PM_findData *findData)
 {
-    // TODO: This function should find the next file in directory enumeration
-    //       search given the search criteria defined in the call to
-    //       PM_findFirstFile. The data should be converted and returned
-    //       in the findData standard form.
+    /* TODO: This function should find the next file in directory enumeration */
+    /*       search given the search criteria defined in the call to */
+    /*       PM_findFirstFile. The data should be converted and returned */
+    /*       in the findData standard form. */
     (void)handle;
     (void)findData;
     return false;
@@ -905,8 +905,8 @@
 void PMAPI PM_findClose(
     void *handle)
 {
-    // TODO: This function should close the find process. This may do
-    //       nothing for some OS'es.
+    /* TODO: This function should close the find process. This may do */
+    /*       nothing for some OS'es. */
     (void)handle;
 }
 
@@ -927,7 +927,7 @@
     char drive)
 {
     if (drive == 3)
-        return true;
+	return true;
     return false;
 }
 
@@ -954,7 +954,7 @@
     const char *filename,
     uint attrib)
 {
-    // TODO: Set the file attributes for a file
+    /* TODO: Set the file attributes for a file */
     (void)filename;
     (void)attrib;
 }

diff --git a/board/MAI/bios_emulator/scitech/src/pm/stub/ztimer.c b/board/MAI/bios_emulator/scitech/src/pm/stub/ztimer.c
index 9bad6c0..820e292 100644
--- a/board/MAI/bios_emulator/scitech/src/pm/stub/ztimer.c
+++ b/board/MAI/bios_emulator/scitech/src/pm/stub/ztimer.c

@@ -36,7 +36,7 @@
 ****************************************************************************/
 void __ZTimerInit(void)
 {
-    // TODO: Do any specific internal initialisation in here
+    /* TODO: Do any specific internal initialisation in here */
 }
 
 /****************************************************************************
@@ -46,8 +46,8 @@
 static void __LZTimerOn(
     LZTimerObject *tm)
 {
-    // TODO: Start the Zen Timer counting. This should be a macro if
-    //       possible.
+    /* TODO: Start the Zen Timer counting. This should be a macro if */
+    /*       possible. */
 }
 
 /****************************************************************************
@@ -57,8 +57,8 @@
 static ulong __LZTimerLap(
     LZTimerObject *tm)
 {
-    // TODO: Compute the lap time between the current time and when the
-    //       timer was started.
+    /* TODO: Compute the lap time between the current time and when the */
+    /*       timer was started. */
     return 0;
 }
 
@@ -69,7 +69,7 @@
 static void __LZTimerOff(
     LZTimerObject *tm)
 {
-    // TODO: Stop the timer counting. Should be a macro if possible.
+    /* TODO: Stop the timer counting. Should be a macro if possible. */
 }
 
 /****************************************************************************
@@ -79,7 +79,7 @@
 static ulong __LZTimerCount(
     LZTimerObject *tm)
 {
-    // TODO: Compute the elapsed time and return it. Always microseconds.
+    /* TODO: Compute the elapsed time and return it. Always microseconds. */
     return 0;
 }
 
@@ -95,9 +95,9 @@
 ****************************************************************************/
 static ulong __ULZReadTime(void)
 {
-    // TODO: Read the long period timer from the OS. The resolution of this
-    //       timer should be around 1/20 of a second for timing long
-    //       periods if possible.
+    /* TODO: Read the long period timer from the OS. The resolution of this */
+    /*       timer should be around 1/20 of a second for timing long */
+    /*       periods if possible. */
 }
 
 /****************************************************************************

diff --git a/board/MAI/bios_emulator/scitech/src/pm/tests/altbrk.c b/board/MAI/bios_emulator/scitech/src/pm/tests/altbrk.c
index 5d899b7..ba90262 100644
--- a/board/MAI/bios_emulator/scitech/src/pm/tests/altbrk.c
+++ b/board/MAI/bios_emulator/scitech/src/pm/tests/altbrk.c

@@ -47,43 +47,43 @@
 void PMAPI breakHandler(uint bHit)
 {
     if (bHit)
-        breakHit = true;
+	breakHit = true;
     else
-        ctrlCHit = true;
+	ctrlCHit = true;
 }
 
 int main(void)
 {
     printf("Program running in ");
     switch (PM_getModeType()) {
-        case PM_realMode:
-            printf("real mode.\n\n");
-            break;
-        case PM_286:
-            printf("16 bit protected mode.\n\n");
-            break;
-        case PM_386:
-            printf("32 bit protected mode.\n\n");
-            break;
-        }
+	case PM_realMode:
+	    printf("real mode.\n\n");
+	    break;
+	case PM_286:
+	    printf("16 bit protected mode.\n\n");
+	    break;
+	case PM_386:
+	    printf("32 bit protected mode.\n\n");
+	    break;
+	}
 
     PM_installAltBreakHandler(breakHandler);
     printf("Control C/Break interrupt handler installed\n");
     while (1) {
-        if (ctrlCHit) {
-            printf("Code termimated with Ctrl-C.\n");
-            break;
-            }
-        if (breakHit) {
-            printf("Code termimated with Ctrl-Break.\n");
-            break;
-            }
-        if (PM_kbhit() && PM_getch() == 0x1B) {
-            printf("No break code detected!\n");
-            break;
-            }
-        printf("Hit Ctrl-C or Ctrl-Break to exit!\n");
-        }
+	if (ctrlCHit) {
+	    printf("Code termimated with Ctrl-C.\n");
+	    break;
+	    }
+	if (breakHit) {
+	    printf("Code termimated with Ctrl-Break.\n");
+	    break;
+	    }
+	if (PM_kbhit() && PM_getch() == 0x1B) {
+	    printf("No break code detected!\n");
+	    break;
+	    }
+	printf("Hit Ctrl-C or Ctrl-Break to exit!\n");
+	}
 
     PM_restoreBreakHandler();
     return 0;

diff --git a/board/MAI/bios_emulator/scitech/src/pm/tests/altcrit.c b/board/MAI/bios_emulator/scitech/src/pm/tests/altcrit.c
index c5390f6..e137307 100644
--- a/board/MAI/bios_emulator/scitech/src/pm/tests/altcrit.c
+++ b/board/MAI/bios_emulator/scitech/src/pm/tests/altcrit.c

@@ -59,27 +59,27 @@
 
     printf("Program running in ");
     switch (PM_getModeType()) {
-        case PM_realMode:
-            printf("real mode.\n\n");
-            break;
-        case PM_286:
-            printf("16 bit protected mode.\n\n");
-            break;
-        case PM_386:
-            printf("32 bit protected mode.\n\n");
-            break;
-        }
+	case PM_realMode:
+	    printf("real mode.\n\n");
+	    break;
+	case PM_286:
+	    printf("16 bit protected mode.\n\n");
+	    break;
+	case PM_386:
+	    printf("32 bit protected mode.\n\n");
+	    break;
+	}
 
     PM_installAltCriticalHandler(criticalHandler);
     printf("Critical Error handler installed - trying to read from A: drive...\n");
     f = fopen("a:\bog.bog","rb");
     if (f) fclose(f);
     if (criticalError) {
-        printf("Critical error occured on INT 21h function %02X!\n",
-            axValue >> 8);
-        }
+	printf("Critical error occured on INT 21h function %02X!\n",
+	    axValue >> 8);
+	}
     else
-        printf("Critical error was not caught!\n");
+	printf("Critical error was not caught!\n");
     PM_restoreCriticalHandler();
     return 0;
 }

diff --git a/board/MAI/bios_emulator/scitech/src/pm/tests/biosptr.c b/board/MAI/bios_emulator/scitech/src/pm/tests/biosptr.c
index 4366848..5fa3382 100644
--- a/board/MAI/bios_emulator/scitech/src/pm/tests/biosptr.c
+++ b/board/MAI/bios_emulator/scitech/src/pm/tests/biosptr.c

@@ -64,29 +64,29 @@
 
     printf("Program running in ");
     switch (PM_getModeType()) {
-        case PM_realMode:
-            printf("real mode.\n\n");
-            break;
-        case PM_286:
-            printf("16 bit protected mode.\n\n");
-            break;
-        case PM_386:
-            printf("32 bit protected mode.\n\n");
-            break;
-        }
+	case PM_realMode:
+	    printf("real mode.\n\n");
+	    break;
+	case PM_286:
+	    printf("16 bit protected mode.\n\n");
+	    break;
+	case PM_386:
+	    printf("32 bit protected mode.\n\n");
+	    break;
+	}
 
     bios = PM_getBIOSPointer();
     printf("Hit any key to test, Ctrl-Shift-Esc to quit\n");
     while (!done) {
-        if (KB_HIT()) {
-            c = PM_getch();
-            if (c == 0) PM_getch();
-            printf("TIME=%-8lX ST=%02X CHAR=%02X ", TICKS(), KB_STAT, c);
-            printf("\n");
-            if ((c == ESC) && SHIFT() && CTRL())/* Ctrl-Shift-Esc */
-                break;
-            }
-        }
+	if (KB_HIT()) {
+	    c = PM_getch();
+	    if (c == 0) PM_getch();
+	    printf("TIME=%-8lX ST=%02X CHAR=%02X ", TICKS(), KB_STAT, c);
+	    printf("\n");
+	    if ((c == ESC) && SHIFT() && CTRL())/* Ctrl-Shift-Esc */
+		break;
+	    }
+	}
 
     return 0;
 }

diff --git a/board/MAI/bios_emulator/scitech/src/pm/tests/block.c b/board/MAI/bios_emulator/scitech/src/pm/tests/block.c
index e948872..15d503c 100644
--- a/board/MAI/bios_emulator/scitech/src/pm/tests/block.c
+++ b/board/MAI/bios_emulator/scitech/src/pm/tests/block.c

@@ -61,9 +61,9 @@
     ZTimerInit();
     LZTimerOn();
     for (i = 0; i < LOOPS; i++) {
-        PM_blockUntilTimeout(DELAY_MSECS);
-        ReportTime(LZTimerLap());
-        }
+	PM_blockUntilTimeout(DELAY_MSECS);
+	ReportTime(LZTimerLap());
+	}
     LZTimerOff();
     return 0;
 }

diff --git a/board/MAI/bios_emulator/scitech/src/pm/tests/brk.c b/board/MAI/bios_emulator/scitech/src/pm/tests/brk.c
index 3561fee..10b6446 100644
--- a/board/MAI/bios_emulator/scitech/src/pm/tests/brk.c
+++ b/board/MAI/bios_emulator/scitech/src/pm/tests/brk.c

@@ -44,34 +44,34 @@
 {
     printf("Program running in ");
     switch (PM_getModeType()) {
-        case PM_realMode:
-            printf("real mode.\n\n");
-            break;
-        case PM_286:
-            printf("16 bit protected mode.\n\n");
-            break;
-        case PM_386:
-            printf("32 bit protected mode.\n\n");
-            break;
-        }
+	case PM_realMode:
+	    printf("real mode.\n\n");
+	    break;
+	case PM_286:
+	    printf("16 bit protected mode.\n\n");
+	    break;
+	case PM_386:
+	    printf("32 bit protected mode.\n\n");
+	    break;
+	}
 
     PM_installBreakHandler();
     printf("Control C/Break interrupt handler installed\n");
     while (1) {
-        if (PM_ctrlCHit(1)) {
-            printf("Code termimated with Ctrl-C.\n");
-            break;
-            }
-        if (PM_ctrlBreakHit(1)) {
-            printf("Code termimated with Ctrl-Break.\n");
-            break;
-            }
-        if (PM_kbhit() && PM_getch() == 0x1B) {
-            printf("No break code detected!\n");
-            break;
-            }
-        printf("Hit Ctrl-C or Ctrl-Break to exit!\n");
-        }
+	if (PM_ctrlCHit(1)) {
+	    printf("Code termimated with Ctrl-C.\n");
+	    break;
+	    }
+	if (PM_ctrlBreakHit(1)) {
+	    printf("Code termimated with Ctrl-Break.\n");
+	    break;
+	    }
+	if (PM_kbhit() && PM_getch() == 0x1B) {
+	    printf("No break code detected!\n");
+	    break;
+	    }
+	printf("Hit Ctrl-C or Ctrl-Break to exit!\n");
+	}
 
     PM_restoreBreakHandler();
     return 0;

diff --git a/board/MAI/bios_emulator/scitech/src/pm/tests/callreal.c b/board/MAI/bios_emulator/scitech/src/pm/tests/callreal.c
index 3897ce9..4d37cab 100644
--- a/board/MAI/bios_emulator/scitech/src/pm/tests/callreal.c
+++ b/board/MAI/bios_emulator/scitech/src/pm/tests/callreal.c

@@ -58,22 +58,22 @@
 
     printf("Program running in ");
     switch (PM_getModeType()) {
-        case PM_realMode:
-            printf("real mode.\n\n");
-            break;
-        case PM_286:
-            printf("16 bit protected mode.\n\n");
-            break;
-        case PM_386:
-            printf("32 bit protected mode.\n\n");
-            break;
-        }
+	case PM_realMode:
+	    printf("real mode.\n\n");
+	    break;
+	case PM_286:
+	    printf("16 bit protected mode.\n\n");
+	    break;
+	case PM_386:
+	    printf("32 bit protected mode.\n\n");
+	    break;
+	}
 
     /* Allocate a the block of real mode memory */
     if ((p = PM_allocRealSeg(sizeof(realModeCode), &r_seg, &r_off)) == NULL) {
-        printf("Unable to allocate real mode memory!\n");
-        exit(1);
-        }
+	printf("Unable to allocate real mode memory!\n");
+	exit(1);
+	}
 
     /* Copy the real mode code */
     memcpy(p,realModeCode,sizeof(realModeCode));
@@ -89,17 +89,17 @@
     sregs.ds = 8;
     PM_callRealMode(r_seg,r_off,&regs,&sregs);
     if (regs.x.ax != 2 || regs.x.bx != 1 || regs.x.cx != 4 || regs.x.dx != 3
-            || regs.x.si != 5 || regs.x.di != 6 || sregs.es != 7
-            || sregs.ds != 8) {
-        printf("Real mode call failed!\n");
-        printf("\n");
-        printf("ax = %04X, bx = %04X, cx = %04X, dx = %04X\n",
-            regs.x.ax,regs.x.bx,regs.x.cx,regs.x.dx);
-        printf("si = %04X, di = %04X, es = %04X, ds = %04X\n",
-            regs.x.si,regs.x.di,sregs.es,sregs.ds);
-        }
+	    || regs.x.si != 5 || regs.x.di != 6 || sregs.es != 7
+	    || sregs.ds != 8) {
+	printf("Real mode call failed!\n");
+	printf("\n");
+	printf("ax = %04X, bx = %04X, cx = %04X, dx = %04X\n",
+	    regs.x.ax,regs.x.bx,regs.x.cx,regs.x.dx);
+	printf("si = %04X, di = %04X, es = %04X, ds = %04X\n",
+	    regs.x.si,regs.x.di,sregs.es,sregs.ds);
+	}
     else
-        printf("Real mode call succeeded!\n");
+	printf("Real mode call succeeded!\n");
 
     /* Free the memory we allocated */
     PM_freeRealSeg(p);

diff --git a/board/MAI/bios_emulator/scitech/src/pm/tests/checks.c b/board/MAI/bios_emulator/scitech/src/pm/tests/checks.c
index 81737e1..5933ac9 100644
--- a/board/MAI/bios_emulator/scitech/src/pm/tests/checks.c
+++ b/board/MAI/bios_emulator/scitech/src/pm/tests/checks.c

@@ -80,21 +80,21 @@
 
     sprintf(buf,msg,cond,file,line);
     if (log) {
-        fputs(buf,log);
-        fflush(log);
-        fclose(log);
+	fputs(buf,log);
+	fflush(log);
+	fclose(log);
 #ifdef  __WINDOWS__
-        OutputDebugStr(buf);
+	OutputDebugStr(buf);
 #endif
-        }
+	}
     if (fatal) {
 #ifdef  __WINDOWS__
-        MessageBox(NULL, buf,"Fatal Error!",MB_ICONEXCLAMATION);
+	MessageBox(NULL, buf,"Fatal Error!",MB_ICONEXCLAMATION);
 #else
-        fputs(buf,stderr);
+	fputs(buf,stderr);
 #endif
-        exit(-1);
-        }
+	exit(-1);
+	}
 }
 
 #endif  /* CHECKED */

diff --git a/board/MAI/bios_emulator/scitech/src/pm/tests/cpu.c b/board/MAI/bios_emulator/scitech/src/pm/tests/cpu.c
index 34abb24..30e5dd3 100644
--- a/board/MAI/bios_emulator/scitech/src/pm/tests/cpu.c
+++ b/board/MAI/bios_emulator/scitech/src/pm/tests/cpu.c

@@ -41,6 +41,6 @@
     fflush(stdout);
     printf("\n\n%s\n", CPU_getProcessorName());
     if (CPU_haveRDTSC())
-        printf("\nProcessor supports Read Time Stamp Counter performance timer.\n");
+	printf("\nProcessor supports Read Time Stamp Counter performance timer.\n");
     return 0;
 }

diff --git a/board/MAI/bios_emulator/scitech/src/pm/tests/critical.c b/board/MAI/bios_emulator/scitech/src/pm/tests/critical.c
index 21ec994..60f1251 100644
--- a/board/MAI/bios_emulator/scitech/src/pm/tests/critical.c
+++ b/board/MAI/bios_emulator/scitech/src/pm/tests/critical.c

@@ -45,25 +45,25 @@
 
     printf("Program running in ");
     switch (PM_getModeType()) {
-        case PM_realMode:
-            printf("real mode.\n\n");
-            break;
-        case PM_286:
-            printf("16 bit protected mode.\n\n");
-            break;
-        case PM_386:
-            printf("32 bit protected mode.\n\n");
-            break;
-        }
+	case PM_realMode:
+	    printf("real mode.\n\n");
+	    break;
+	case PM_286:
+	    printf("16 bit protected mode.\n\n");
+	    break;
+	case PM_386:
+	    printf("32 bit protected mode.\n\n");
+	    break;
+	}
 
     PM_installCriticalHandler();
     printf("Critical Error handler installed - trying to read from A: drive...\n");
     f = fopen("a:\bog.bog","rb");
     if (f) fclose(f);
     if (PM_criticalError(&axcode,&dicode,1)) {
-        printf("Critical error occured on INT 21h function %02X!\n",
-            axcode >> 8);
-        }
+	printf("Critical error occured on INT 21h function %02X!\n",
+	    axcode >> 8);
+	}
     else printf("Critical error was not caught!\n");
     PM_restoreCriticalHandler();
     return 0;

diff --git a/board/MAI/bios_emulator/scitech/src/pm/tests/getch.c b/board/MAI/bios_emulator/scitech/src/pm/tests/getch.c
index c70f7ee..06c2180 100644
--- a/board/MAI/bios_emulator/scitech/src/pm/tests/getch.c
+++ b/board/MAI/bios_emulator/scitech/src/pm/tests/getch.c

@@ -309,9 +309,9 @@
     KeyEntry    *key;
 
     for (key = keys; key->code != 0; key++) {
-        if (key->code == code)
-            break;
-        }
+	if (key->code == code)
+	    break;
+	}
     return key;
 }
 
@@ -326,29 +326,29 @@
     event_t *evt)
 {
     if (evt->modifiers & EVT_LEFTBUT)
-        printf(", LBUT");
+	printf(", LBUT");
     if (evt->modifiers & EVT_RIGHTBUT)
-        printf(", RBUT");
+	printf(", RBUT");
     if (evt->modifiers & EVT_MIDDLEBUT)
-        printf(", MBUT");
+	printf(", MBUT");
     if (evt->modifiers & EVT_SHIFTKEY) {
-        if (evt->modifiers & EVT_LEFTSHIFT)
-            printf(", LSHIFT");
-        if (evt->modifiers & EVT_RIGHTSHIFT)
-            printf(", RSHIFT");
-        }
+	if (evt->modifiers & EVT_LEFTSHIFT)
+	    printf(", LSHIFT");
+	if (evt->modifiers & EVT_RIGHTSHIFT)
+	    printf(", RSHIFT");
+	}
     if (evt->modifiers & EVT_CTRLSTATE) {
-        if (evt->modifiers & EVT_LEFTCTRL)
-            printf(", LCTRL");
-        if (evt->modifiers & EVT_RIGHTCTRL)
-            printf(", RCTRL");
-        }
+	if (evt->modifiers & EVT_LEFTCTRL)
+	    printf(", LCTRL");
+	if (evt->modifiers & EVT_RIGHTCTRL)
+	    printf(", RCTRL");
+	}
     if (evt->modifiers & EVT_ALTSTATE) {
-        if (evt->modifiers & EVT_LEFTALT)
-            printf(", LALT");
-        if (evt->modifiers & EVT_RIGHTALT)
-            printf(", RALT");
-        }
+	if (evt->modifiers & EVT_LEFTALT)
+	    printf(", LALT");
+	if (evt->modifiers & EVT_RIGHTALT)
+	    printf(", RALT");
+	}
 }
 
 /****************************************************************************
@@ -369,7 +369,7 @@
     ascii = FindKey(ch,ASCIICodes);
     scan = FindKey(EVT_scanCode(evt->message),ScanCodes);
     printf("%s: 0x%04X -> %s, %s, '%c'",
-        msg, (int)evt->message & 0xFFFF, scan->name, ascii->name, isprint(ch) ? ch : ' ');
+	msg, (int)evt->message & 0xFFFF, scan->name, ascii->name, isprint(ch) ? ch : ' ');
     DisplayModifiers(evt);
     printf("\n");
 }
@@ -388,15 +388,15 @@
 {
     printf("%s: ", msg);
     if (evt->message & EVT_LEFTBMASK)
-        printf("LEFT ");
+	printf("LEFT ");
     if (evt->message & EVT_RIGHTBMASK)
-        printf("RIGHT ");
+	printf("RIGHT ");
     if (evt->message & EVT_MIDDLEBMASK)
-        printf("MIDDLE ");
+	printf("MIDDLE ");
     printf("abs(%d,%d), rel(%d,%d)", evt->where_x, evt->where_y, evt->relative_x, evt->relative_y);
     DisplayModifiers(evt);
     if (evt->message & EVT_DBLCLICK)
-        printf(", DBLCLICK");
+	printf(", DBLCLICK");
     printf("\n");
 }
 
@@ -413,12 +413,12 @@
     event_t *evt)
 {
     printf("%s: Joy1(%4d,%4d,%c%c), Joy2(%4d,%4d,%c%c)\n", msg,
-        evt->where_x,evt->where_y,
-        (evt->message & EVT_JOY1_BUTTONA) ? 'A' : 'a',
-        (evt->message & EVT_JOY1_BUTTONB) ? 'B' : 'b',
-        evt->relative_x,evt->relative_y,
-        (evt->message & EVT_JOY2_BUTTONA) ? 'A' : 'a',
-        (evt->message & EVT_JOY2_BUTTONB) ? 'B' : 'b');
+	evt->where_x,evt->where_y,
+	(evt->message & EVT_JOY1_BUTTONA) ? 'A' : 'a',
+	(evt->message & EVT_JOY1_BUTTONB) ? 'B' : 'b',
+	evt->relative_x,evt->relative_y,
+	(evt->message & EVT_JOY2_BUTTONA) ? 'A' : 'a',
+	(evt->message & EVT_JOY2_BUTTONB) ? 'B' : 'b');
 }
 
 /****************************************************************************
@@ -460,41 +460,41 @@
     EVT_setMouseRange(1024,768);
     CalibrateJoy();
     do {
-        EVT_pollJoystick();
-        if (EVT_getNext(&evt,EVT_EVERYEVT)) {
-            switch (evt.what) {
-                case EVT_KEYDOWN:
-                    DisplayKey("EVT_KEYDOWN  ", &evt);
-                    if (EVT_scanCode(evt.message) == KB_esc)
-                        done = true;
-                    break;
-                case EVT_KEYREPEAT:
-                    DisplayKey("EVT_KEYREPEAT", &evt);
-                    break;
-                case EVT_KEYUP:
-                    DisplayKey("EVT_KEYUP    ", &evt);
-                    break;
-                case EVT_MOUSEDOWN:
-                    DisplayMouse("EVT_MOUSEDOWN", &evt);
-                    break;
-                case EVT_MOUSEAUTO:
-                    DisplayMouse("EVT_MOUSEAUTO", &evt);
-                    break;
-                case EVT_MOUSEUP:
-                    DisplayMouse("EVT_MOUSEUP  ", &evt);
-                    break;
-                case EVT_MOUSEMOVE:
-                    DisplayMouse("EVT_MOUSEMOVE", &evt);
-                    break;
-                case EVT_JOYCLICK:
-                    DisplayJoy("EVT_JOYCLICK ", &evt);
-                    break;
-                case EVT_JOYMOVE:
-                    DisplayJoy("EVT_JOYMOVE  ", &evt);
-                    break;
-                }
-            }
-        } while (!done);
+	EVT_pollJoystick();
+	if (EVT_getNext(&evt,EVT_EVERYEVT)) {
+	    switch (evt.what) {
+		case EVT_KEYDOWN:
+		    DisplayKey("EVT_KEYDOWN  ", &evt);
+		    if (EVT_scanCode(evt.message) == KB_esc)
+			done = true;
+		    break;
+		case EVT_KEYREPEAT:
+		    DisplayKey("EVT_KEYREPEAT", &evt);
+		    break;
+		case EVT_KEYUP:
+		    DisplayKey("EVT_KEYUP    ", &evt);
+		    break;
+		case EVT_MOUSEDOWN:
+		    DisplayMouse("EVT_MOUSEDOWN", &evt);
+		    break;
+		case EVT_MOUSEAUTO:
+		    DisplayMouse("EVT_MOUSEAUTO", &evt);
+		    break;
+		case EVT_MOUSEUP:
+		    DisplayMouse("EVT_MOUSEUP  ", &evt);
+		    break;
+		case EVT_MOUSEMOVE:
+		    DisplayMouse("EVT_MOUSEMOVE", &evt);
+		    break;
+		case EVT_JOYCLICK:
+		    DisplayJoy("EVT_JOYCLICK ", &evt);
+		    break;
+		case EVT_JOYMOVE:
+		    DisplayJoy("EVT_JOYMOVE  ", &evt);
+		    break;
+		}
+	    }
+	} while (!done);
     EVT_exit();
     PM_closeConsole(hwndConsole);
     return 0;

diff --git a/board/MAI/bios_emulator/scitech/src/pm/tests/isvesa.c b/board/MAI/bios_emulator/scitech/src/pm/tests/isvesa.c
index 9c02452..67ad245 100644
--- a/board/MAI/bios_emulator/scitech/src/pm/tests/isvesa.c
+++ b/board/MAI/bios_emulator/scitech/src/pm/tests/isvesa.c

@@ -68,24 +68,24 @@
 
     printf("Program running in ");
     switch (PM_getModeType()) {
-        case PM_realMode:
-            printf("real mode.\n\n");
-            break;
-        case PM_286:
-            printf("16 bit protected mode.\n\n");
-            break;
-        case PM_386:
-            printf("32 bit protected mode.\n\n");
-            break;
-        }
+	case PM_realMode:
+	    printf("real mode.\n\n");
+	    break;
+	case PM_286:
+	    printf("16 bit protected mode.\n\n");
+	    break;
+	case PM_386:
+	    printf("32 bit protected mode.\n\n");
+	    break;
+	}
 
     /* Allocate a 256 byte block of real memory for communicating with
      * the VESA BIOS.
      */
     if ((vgPtr = PM_getVESABuf(&vgLen,&r_vgseg,&r_vgoff)) == NULL) {
-        printf("Unable to allocate VESA memory buffer!\n");
-        exit(1);
-        }
+	printf("Unable to allocate VESA memory buffer!\n");
+	exit(1);
+	}
 
     /* Call the VESA VBE to see if it is out there */
     regs.x.ax = 0x4F00;
@@ -95,16 +95,16 @@
     PM_int86x(0x10, &regs, &regs, &sregs);
     memcpy(&vgaInfo,vgPtr,sizeof(VgaInfoBlock));
     if (regs.x.ax == 0x4F && strncmp(vgaInfo.VESASignature,"VESA",4) == 0) {
-        printf("VESA VBE version %d.%d BIOS detected\n\n",
-            vgaInfo.VESAVersion >> 8, vgaInfo.VESAVersion & 0xF);
-        printf("Available video modes:\n");
-        mode = PM_mapRealPointer(vgaInfo.VideoModePtr >> 16, vgaInfo.VideoModePtr & 0xFFFF);
-        while (*mode != 0xFFFF) {
-            printf("    %04hXh (%08X)\n", *mode, (int)mode);
-            mode++;
-            }
-        }
+	printf("VESA VBE version %d.%d BIOS detected\n\n",
+	    vgaInfo.VESAVersion >> 8, vgaInfo.VESAVersion & 0xF);
+	printf("Available video modes:\n");
+	mode = PM_mapRealPointer(vgaInfo.VideoModePtr >> 16, vgaInfo.VideoModePtr & 0xFFFF);
+	while (*mode != 0xFFFF) {
+	    printf("    %04hXh (%08X)\n", *mode, (int)mode);
+	    mode++;
+	    }
+	}
     else
-        printf("VESA VBE not found\n");
+	printf("VESA VBE not found\n");
     return 0;
 }

diff --git a/board/MAI/bios_emulator/scitech/src/pm/tests/key.c b/board/MAI/bios_emulator/scitech/src/pm/tests/key.c
index cf89f79..dba8885 100644
--- a/board/MAI/bios_emulator/scitech/src/pm/tests/key.c
+++ b/board/MAI/bios_emulator/scitech/src/pm/tests/key.c

@@ -56,16 +56,16 @@
 
     printf("Program running in ");
     switch (PM_getModeType()) {
-        case PM_realMode:
-            printf("real mode.\n\n");
-            break;
-        case PM_286:
-            printf("16 bit protected mode.\n\n");
-            break;
-        case PM_386:
-            printf("32 bit protected mode.\n\n");
-            break;
-        }
+	case PM_realMode:
+	    printf("real mode.\n\n");
+	    break;
+	case PM_286:
+	    printf("16 bit protected mode.\n\n");
+	    break;
+	case PM_386:
+	    printf("32 bit protected mode.\n\n");
+	    break;
+	}
 
     /* Install our timer handler and lock handler pages in memory. It is
      * difficult to get the size of a function in C, but we know our
@@ -79,9 +79,9 @@
     printf("Keyboard interrupt handler installed - Type some characters and\n");
     printf("hit ESC to exit\n");
     while ((ch = PM_getch()) != 0x1B) {
-        printf("%c", ch);
-        fflush(stdout);
-        }
+	printf("%c", ch);
+	fflush(stdout);
+	}
 
     PM_restoreKeyHandler();
     PM_restoreBreakHandler();

diff --git a/board/MAI/bios_emulator/scitech/src/pm/tests/key15.c b/board/MAI/bios_emulator/scitech/src/pm/tests/key15.c
index 5c0d27a..b0b94be 100644
--- a/board/MAI/bios_emulator/scitech/src/pm/tests/key15.c
+++ b/board/MAI/bios_emulator/scitech/src/pm/tests/key15.c

@@ -59,16 +59,16 @@
 
     printf("Program running in ");
     switch (PM_getModeType()) {
-        case PM_realMode:
-            printf("real mode.\n\n");
-            break;
-        case PM_286:
-            printf("16 bit protected mode.\n\n");
-            break;
-        case PM_386:
-            printf("32 bit protected mode.\n\n");
-            break;
-        }
+	case PM_realMode:
+	    printf("real mode.\n\n");
+	    break;
+	case PM_286:
+	    printf("16 bit protected mode.\n\n");
+	    break;
+	case PM_386:
+	    printf("32 bit protected mode.\n\n");
+	    break;
+	}
 
     /* Install our timer handler and lock handler pages in memory. It is
      * difficult to get the size of a function in C, but we know our
@@ -82,9 +82,9 @@
     printf("Keyboard interrupt handler installed - Type some characters and\n");
     printf("hit ESC to exit\n");
     while ((ch = PM_getch()) != 0x1B) {
-        printf("%c", ch);
-        fflush(stdout);
-        }
+	printf("%c", ch);
+	fflush(stdout);
+	}
 
     PM_restoreKey15Handler();
     PM_restoreBreakHandler();

diff --git a/board/MAI/bios_emulator/scitech/src/pm/tests/memtest.c b/board/MAI/bios_emulator/scitech/src/pm/tests/memtest.c
index 221bfb1..a2c655b 100644
--- a/board/MAI/bios_emulator/scitech/src/pm/tests/memtest.c
+++ b/board/MAI/bios_emulator/scitech/src/pm/tests/memtest.c

@@ -56,16 +56,16 @@
 
     printf("Program running in ");
     switch (PM_getModeType()) {
-        case PM_realMode:
-            printf("real mode.\n\n");
-            break;
-        case PM_286:
-            printf("16 bit protected mode.\n\n");
-            break;
-        case PM_386:
-            printf("32 bit protected mode.\n\n");
-            break;
-        }
+	case PM_realMode:
+	    printf("real mode.\n\n");
+	    break;
+	case PM_286:
+	    printf("16 bit protected mode.\n\n");
+	    break;
+	case PM_386:
+	    printf("32 bit protected mode.\n\n");
+	    break;
+	}
 
     printf("Memory available at start:\n");
     PM_availableMemory(&physical,&total);
@@ -73,18 +73,18 @@
     printf("   Total (including virtual): %ld Kb\n", total / 1024);
     printf("\n");
     for (allocs = i = 0; i < MAXALLOC; i++) {
-        if ((pa[i] = PM_malloc(10*1024)) != 0) {    /* in 10k blocks    */
-            p = pa[allocs];
-            memset(p, 0, 10*1024); /* touch every byte              */
-            *p = 'x';           /* do something, anything with      */
-            p[1023] = 'y';      /* the allocated memory             */
-            allocs++;
-            printf("Allocated %lu bytes\r", 10*(allocs << 10));
-            }
-        else break;
-        if (PM_kbhit() && (PM_getch() == 0x1B))
-            break;
-        }
+	if ((pa[i] = PM_malloc(10*1024)) != 0) {    /* in 10k blocks    */
+	    p = pa[allocs];
+	    memset(p, 0, 10*1024); /* touch every byte              */
+	    *p = 'x';           /* do something, anything with      */
+	    p[1023] = 'y';      /* the allocated memory             */
+	    allocs++;
+	    printf("Allocated %lu bytes\r", 10*(allocs << 10));
+	    }
+	else break;
+	if (PM_kbhit() && (PM_getch() == 0x1B))
+	    break;
+	}
 
     printf("\n\nAllocated total of %lu bytes\n", 10 * (allocs << 10));
 
@@ -94,7 +94,7 @@
     printf("   Total (including virtual): %ld Kb\n", total / 1024);
 
     for (i = allocs-1; i >= 0; i--)
-        PM_free(pa[i]);
+	PM_free(pa[i]);
 
     printf("\nMemory available after freeing all blocks (note that under protected mode\n");
     printf("this will most likely not be correct after freeing blocks):\n\n");

diff --git a/board/MAI/bios_emulator/scitech/src/pm/tests/mouse.c b/board/MAI/bios_emulator/scitech/src/pm/tests/mouse.c
index 5b42651..2765a0d 100644
--- a/board/MAI/bios_emulator/scitech/src/pm/tests/mouse.c
+++ b/board/MAI/bios_emulator/scitech/src/pm/tests/mouse.c

@@ -69,23 +69,23 @@
 
     printf("Program running in ");
     switch (PM_getModeType()) {
-        case PM_realMode:
-            printf("real mode.\n\n");
-            break;
-        case PM_286:
-            printf("16 bit protected mode.\n\n");
-            break;
-        case PM_386:
-            printf("32 bit protected mode.\n\n");
-            break;
-        }
+	case PM_realMode:
+	    printf("real mode.\n\n");
+	    break;
+	case PM_286:
+	    printf("16 bit protected mode.\n\n");
+	    break;
+	case PM_386:
+	    printf("32 bit protected mode.\n\n");
+	    break;
+	}
 
     regs.x.ax = 33;     /* Mouse function 33 - Software reset       */
     PM_int86(0x33,&regs,&regs);
     if (regs.x.bx == 0) {
-        printf("No mouse installed.\n");
-        exit(1);
-        }
+	printf("No mouse installed.\n");
+	exit(1);
+	}
 
     /* Install our mouse handler and lock handler pages in memory. It is
      * difficult to get the size of a function in C, but we know our
@@ -95,9 +95,9 @@
     PM_lockCodePages((__codePtr)mouseHandler,100,&lh);
     PM_lockDataPages((void*)&count,sizeof(count),&lh);
     if (!PM_setMouseHandler(0xFFFF, mouseHandler)) {
-        printf("Unable to install mouse handler!\n");
-        exit(1);
-        }
+	printf("Unable to install mouse handler!\n");
+	exit(1);
+	}
     printf("Mouse handler installed - Hit any key to exit\n");
     PM_getch();
 

diff --git a/board/MAI/bios_emulator/scitech/src/pm/tests/restore.c b/board/MAI/bios_emulator/scitech/src/pm/tests/restore.c
index b808052..e00be75 100644
--- a/board/MAI/bios_emulator/scitech/src/pm/tests/restore.c
+++ b/board/MAI/bios_emulator/scitech/src/pm/tests/restore.c

@@ -45,24 +45,24 @@
 int main(void)
 {
     PM_HWND hwndConsole;
-    ulong   stateSize;      
+    ulong   stateSize;
     void    *stateBuf;
     FILE    *f;
 
     /* Write the saved console state buffer to disk */
     if ((f = fopen("/etc/pmsave.dat","rb")) == NULL) {
-        printf("Unable to open /etc/pmsave.dat for reading!\n");
-        return -1;
-        }
+	printf("Unable to open /etc/pmsave.dat for reading!\n");
+	return -1;
+	}
     fread(&stateSize,1,sizeof(stateSize),f);
     if (stateSize != PM_getConsoleStateSize()) {
-        printf("Size mismatch in /etc/pmsave.dat!\n");
-        return -1;
-        }
+	printf("Size mismatch in /etc/pmsave.dat!\n");
+	return -1;
+	}
     if ((stateBuf = PM_malloc(stateSize)) == NULL) {
-        printf("Unable to allocate console state buffer!\n");
-        return -1;
-        }
+	printf("Unable to allocate console state buffer!\n");
+	return -1;
+	}
     fread(stateBuf,1,stateSize,f);
     fclose(f);
 
@@ -71,7 +71,7 @@
 
     /* Forcibly set 80x25 text mode using the BIOS */
     setVideoMode(0x3);
-    
+
     /* Restore the previous console state */
     PM_restoreConsoleState(stateBuf,0);
     PM_closeConsole(hwndConsole);
@@ -79,4 +79,3 @@
     printf("Console state successfully restored from /etc/pmsave.dat\n");
     return 0;
 }
-

diff --git a/board/MAI/bios_emulator/scitech/src/pm/tests/rtc.c b/board/MAI/bios_emulator/scitech/src/pm/tests/rtc.c
index 07c6eaa..acef922 100644
--- a/board/MAI/bios_emulator/scitech/src/pm/tests/rtc.c
+++ b/board/MAI/bios_emulator/scitech/src/pm/tests/rtc.c

@@ -52,16 +52,16 @@
 
     printf("Program running in ");
     switch (PM_getModeType()) {
-        case PM_realMode:
-            printf("real mode.\n\n");
-            break;
-        case PM_286:
-            printf("16 bit protected mode.\n\n");
-            break;
-        case PM_386:
-            printf("32 bit protected mode.\n\n");
-            break;
-        }
+	case PM_realMode:
+	    printf("real mode.\n\n");
+	    break;
+	case PM_286:
+	    printf("16 bit protected mode.\n\n");
+	    break;
+	case PM_386:
+	    printf("32 bit protected mode.\n\n");
+	    break;
+	}
 
     /* Install our timer handler and lock handler pages in memory. It is
      * difficult to get the size of a function in C, but we know our
@@ -75,13 +75,13 @@
     printf("RealTimeClock interrupt handler installed - Hit ESC to exit\n");
     oldCount = count;
     while (1) {
-        if (PM_kbhit() && (PM_getch() == 0x1B))
-            break;
-        if (count != oldCount) {
-            printf("Tick, Tock: %ld\n", count);
-            oldCount = count;
-            }
-        }
+	if (PM_kbhit() && (PM_getch() == 0x1B))
+	    break;
+	if (count != oldCount) {
+	    printf("Tick, Tock: %ld\n", count);
+	    oldCount = count;
+	    }
+	}
 
     PM_restoreRealTimeClockHandler();
     PM_restoreBreakHandler();

diff --git a/board/MAI/bios_emulator/scitech/src/pm/tests/save.c b/board/MAI/bios_emulator/scitech/src/pm/tests/save.c
index be96968..f732456 100644
--- a/board/MAI/bios_emulator/scitech/src/pm/tests/save.c
+++ b/board/MAI/bios_emulator/scitech/src/pm/tests/save.c

@@ -37,7 +37,7 @@
 int main(void)
 {
     PM_HWND hwndConsole;
-    ulong   stateSize;      
+    ulong   stateSize;
     void    *stateBuf;
     FILE    *f;
 
@@ -45,26 +45,25 @@
     hwndConsole = PM_openConsole(0,0,0,0,0,true);
     stateSize = PM_getConsoleStateSize();
     if ((stateBuf = PM_malloc(stateSize)) == NULL) {
-        PM_closeConsole(hwndConsole);
-        printf("Unable to allocate console state buffer!\n");
-        return -1;
-        }
+	PM_closeConsole(hwndConsole);
+	printf("Unable to allocate console state buffer!\n");
+	return -1;
+	}
     PM_saveConsoleState(stateBuf,0);
-    
+
     /* Restore the console state on exit */
     PM_restoreConsoleState(stateBuf,0);
     PM_closeConsole(hwndConsole);
-    
+
     /* Write the saved console state buffer to disk */
     if ((f = fopen("/etc/pmsave.dat","wb")) == NULL)
-        printf("Unable to open /etc/pmsave/dat for writing!\n");
+	printf("Unable to open /etc/pmsave/dat for writing!\n");
     else {
-        fwrite(&stateSize,1,sizeof(stateSize),f);
-        fwrite(stateBuf,1,stateSize,f);
-        fclose(f);
-        printf("Console state successfully saved to /etc/pmsave.dat\n");
-        }   
+	fwrite(&stateSize,1,sizeof(stateSize),f);
+	fwrite(stateBuf,1,stateSize,f);
+	fclose(f);
+	printf("Console state successfully saved to /etc/pmsave.dat\n");
+	}
     PM_free(stateBuf);
     return 0;
 }
-

diff --git a/board/MAI/bios_emulator/scitech/src/pm/tests/showpci.c b/board/MAI/bios_emulator/scitech/src/pm/tests/showpci.c
index 8222b86..be275e1 100644
--- a/board/MAI/bios_emulator/scitech/src/pm/tests/showpci.c
+++ b/board/MAI/bios_emulator/scitech/src/pm/tests/showpci.c

@@ -58,123 +58,123 @@
     PCIDeviceInfo   *info;
 
     printf("Displaying enumeration of PCI bus (%d devices, %d display devices)\n",
-        NumPCI, NumDevices);
+	NumPCI, NumDevices);
     for (index = 0; index < NumDevices; index++)
-        printf("  Display device %d is PCI device %d\n",index,DeviceIndex[index]);
+	printf("  Display device %d is PCI device %d\n",index,DeviceIndex[index]);
     printf("\n");
     printf("Bus Slot Fnc DeviceID  SubSystem Rev Class IRQ Int Cmd\n");
     for (i = 0; i < NumPCI; i++) {
-        printf("%2d   %2d  %2d  %04X:%04X %04X:%04X %02X  %02X:%02X %02X  %02X  %04X   ",
-            PCI[i].slot.p.Bus,
-            PCI[i].slot.p.Device,
-            PCI[i].slot.p.Function,
-            PCI[i].VendorID,
-            PCI[i].DeviceID,
-            PCI[i].u.type0.SubSystemVendorID,
-            PCI[i].u.type0.SubSystemID,
-            PCI[i].RevID,
-            PCI[i].BaseClass,
-            PCI[i].SubClass,
-            PCI[i].u.type0.InterruptLine,
-            PCI[i].u.type0.InterruptPin,
-            PCI[i].Command);
-        for (index = 0; index < NumDevices; index++) {
-            if (DeviceIndex[index] == i)
-                break;
-            }
-        if (index < NumDevices)
-            printf("<- %d\n", index);
-        else
-            printf("\n");
-        }
+	printf("%2d   %2d  %2d  %04X:%04X %04X:%04X %02X  %02X:%02X %02X  %02X  %04X   ",
+	    PCI[i].slot.p.Bus,
+	    PCI[i].slot.p.Device,
+	    PCI[i].slot.p.Function,
+	    PCI[i].VendorID,
+	    PCI[i].DeviceID,
+	    PCI[i].u.type0.SubSystemVendorID,
+	    PCI[i].u.type0.SubSystemID,
+	    PCI[i].RevID,
+	    PCI[i].BaseClass,
+	    PCI[i].SubClass,
+	    PCI[i].u.type0.InterruptLine,
+	    PCI[i].u.type0.InterruptPin,
+	    PCI[i].Command);
+	for (index = 0; index < NumDevices; index++) {
+	    if (DeviceIndex[index] == i)
+		break;
+	    }
+	if (index < NumDevices)
+	    printf("<- %d\n", index);
+	else
+	    printf("\n");
+	}
     printf("\n");
     printf("DeviceID  Stat Ifc Cch Lat Hdr BIST\n");
     for (i = 0; i < NumPCI; i++) {
-        printf("%04X:%04X %04X  %02X  %02X  %02X  %02X  %02X   ",
-            PCI[i].VendorID,
-            PCI[i].DeviceID,
-            PCI[i].Status,
-            PCI[i].Interface,
-            PCI[i].CacheLineSize,
-            PCI[i].LatencyTimer,
-            PCI[i].HeaderType,
-            PCI[i].BIST);
-        for (index = 0; index < NumDevices; index++) {
-            if (DeviceIndex[index] == i)
-                break;
-            }
-        if (index < NumDevices)
-            printf("<- %d\n", index);
-        else
-            printf("\n");
-        }
+	printf("%04X:%04X %04X  %02X  %02X  %02X  %02X  %02X   ",
+	    PCI[i].VendorID,
+	    PCI[i].DeviceID,
+	    PCI[i].Status,
+	    PCI[i].Interface,
+	    PCI[i].CacheLineSize,
+	    PCI[i].LatencyTimer,
+	    PCI[i].HeaderType,
+	    PCI[i].BIST);
+	for (index = 0; index < NumDevices; index++) {
+	    if (DeviceIndex[index] == i)
+		break;
+	    }
+	if (index < NumDevices)
+	    printf("<- %d\n", index);
+	else
+	    printf("\n");
+	}
     printf("\n");
     printf("DeviceID  Base10h  Base14h  Base18h  Base1Ch  Base20h  Base24h  ROMBase\n");
     for (i = 0; i < NumPCI; i++) {
-        printf("%04X:%04X %08lX %08lX %08lX %08lX %08lX %08lX %08lX ",
-            PCI[i].VendorID,
-            PCI[i].DeviceID,
-            PCI[i].u.type0.BaseAddress10,
-            PCI[i].u.type0.BaseAddress14,
-            PCI[i].u.type0.BaseAddress18,
-            PCI[i].u.type0.BaseAddress1C,
-            PCI[i].u.type0.BaseAddress20,
-            PCI[i].u.type0.BaseAddress24,
-            PCI[i].u.type0.ROMBaseAddress);
-        for (index = 0; index < NumDevices; index++) {
-            if (DeviceIndex[index] == i)
-                break;
-            }
-        if (index < NumDevices)
-            printf("<- %d\n", index);
-        else
-            printf("\n");
-        }
+	printf("%04X:%04X %08lX %08lX %08lX %08lX %08lX %08lX %08lX ",
+	    PCI[i].VendorID,
+	    PCI[i].DeviceID,
+	    PCI[i].u.type0.BaseAddress10,
+	    PCI[i].u.type0.BaseAddress14,
+	    PCI[i].u.type0.BaseAddress18,
+	    PCI[i].u.type0.BaseAddress1C,
+	    PCI[i].u.type0.BaseAddress20,
+	    PCI[i].u.type0.BaseAddress24,
+	    PCI[i].u.type0.ROMBaseAddress);
+	for (index = 0; index < NumDevices; index++) {
+	    if (DeviceIndex[index] == i)
+		break;
+	    }
+	if (index < NumDevices)
+	    printf("<- %d\n", index);
+	else
+	    printf("\n");
+	}
     printf("\n");
     printf("DeviceID  BAR10Len BAR14Len BAR18Len BAR1CLen BAR20Len BAR24Len ROMLen\n");
     for (i = 0; i < NumPCI; i++) {
-        printf("%04X:%04X %08lX %08lX %08lX %08lX %08lX %08lX %08lX ",
-            PCI[i].VendorID,
-            PCI[i].DeviceID,
-            PCI[i].u.type0.BaseAddress10Len,
-            PCI[i].u.type0.BaseAddress14Len,
-            PCI[i].u.type0.BaseAddress18Len,
-            PCI[i].u.type0.BaseAddress1CLen,
-            PCI[i].u.type0.BaseAddress20Len,
-            PCI[i].u.type0.BaseAddress24Len,
-            PCI[i].u.type0.ROMBaseAddressLen);
-        for (index = 0; index < NumDevices; index++) {
-            if (DeviceIndex[index] == i)
-                break;
-            }
-        if (index < NumDevices)
-            printf("<- %d\n", index);
-        else
-            printf("\n");
-        }
+	printf("%04X:%04X %08lX %08lX %08lX %08lX %08lX %08lX %08lX ",
+	    PCI[i].VendorID,
+	    PCI[i].DeviceID,
+	    PCI[i].u.type0.BaseAddress10Len,
+	    PCI[i].u.type0.BaseAddress14Len,
+	    PCI[i].u.type0.BaseAddress18Len,
+	    PCI[i].u.type0.BaseAddress1CLen,
+	    PCI[i].u.type0.BaseAddress20Len,
+	    PCI[i].u.type0.BaseAddress24Len,
+	    PCI[i].u.type0.ROMBaseAddressLen);
+	for (index = 0; index < NumDevices; index++) {
+	    if (DeviceIndex[index] == i)
+		break;
+	    }
+	if (index < NumDevices)
+	    printf("<- %d\n", index);
+	else
+	    printf("\n");
+	}
     printf("\n");
     printf("Displaying enumeration of %d bridge devices\n",NumBridges);
     printf("\n");
     printf("DeviceID  P# S# B# IOB  IOL  MemBase  MemLimit PreBase  PreLimit Ctrl\n");
     for (i = 0; i < NumBridges; i++) {
-        info = (PCIDeviceInfo*)&PCI[BridgeIndex[i]];
-        printf("%04X:%04X %02X %02X %02X %04X %04X %08X %08X %08X %08X %04X\n",
-            info->VendorID,
-            info->DeviceID,
-            info->u.type1.PrimaryBusNumber,
-            info->u.type1.SecondayBusNumber,
-            info->u.type1.SubordinateBusNumber,
-            ((u16)info->u.type1.IOBase << 8) & 0xF000,
-            info->u.type1.IOLimit ?
-                ((u16)info->u.type1.IOLimit << 8) | 0xFFF : 0,
-            ((u32)info->u.type1.MemoryBase << 16) & 0xFFF00000,
-            info->u.type1.MemoryLimit ?
-                ((u32)info->u.type1.MemoryLimit << 16) | 0xFFFFF : 0,
-            ((u32)info->u.type1.PrefetchableMemoryBase << 16) & 0xFFF00000,
-            info->u.type1.PrefetchableMemoryLimit ?
-                ((u32)info->u.type1.PrefetchableMemoryLimit << 16) | 0xFFFFF : 0,
-            info->u.type1.BridgeControl);
-        }
+	info = (PCIDeviceInfo*)&PCI[BridgeIndex[i]];
+	printf("%04X:%04X %02X %02X %02X %04X %04X %08X %08X %08X %08X %04X\n",
+	    info->VendorID,
+	    info->DeviceID,
+	    info->u.type1.PrimaryBusNumber,
+	    info->u.type1.SecondayBusNumber,
+	    info->u.type1.SubordinateBusNumber,
+	    ((u16)info->u.type1.IOBase << 8) & 0xF000,
+	    info->u.type1.IOLimit ?
+		((u16)info->u.type1.IOLimit << 8) | 0xFFF : 0,
+	    ((u32)info->u.type1.MemoryBase << 16) & 0xFFF00000,
+	    info->u.type1.MemoryLimit ?
+		((u32)info->u.type1.MemoryLimit << 16) | 0xFFFFF : 0,
+	    ((u32)info->u.type1.PrefetchableMemoryBase << 16) & 0xFFF00000,
+	    info->u.type1.PrefetchableMemoryLimit ?
+		((u32)info->u.type1.PrefetchableMemoryLimit << 16) | 0xFFFFF : 0,
+	    info->u.type1.BridgeControl);
+	}
     printf("\n");
 }
 
@@ -191,63 +191,63 @@
     int             i,j;
     PCIDeviceInfo   *info;
 
-    // If this is the first time we have been called, enumerate all
-    // devices on the PCI bus.
+    /* If this is the first time we have been called, enumerate all */
+    /* devices on the PCI bus. */
     if (NumPCI == -1) {
-        if ((NumPCI = PCI_getNumDevices()) == 0)
-            return -1;
-        PCI = malloc(NumPCI * sizeof(PCI[0]));
-        BridgeIndex = malloc(NumPCI * sizeof(BridgeIndex[0]));
-        DeviceIndex = malloc(NumPCI * sizeof(DeviceIndex[0]));
-        if (!PCI || !BridgeIndex || !DeviceIndex)
-            return -1;
-        for (i = 0; i < NumPCI; i++)
-            PCI[i].dwSize = sizeof(PCI[i]);
-        if (PCI_enumerate(PCI) == 0)
-            return -1;
+	if ((NumPCI = PCI_getNumDevices()) == 0)
+	    return -1;
+	PCI = malloc(NumPCI * sizeof(PCI[0]));
+	BridgeIndex = malloc(NumPCI * sizeof(BridgeIndex[0]));
+	DeviceIndex = malloc(NumPCI * sizeof(DeviceIndex[0]));
+	if (!PCI || !BridgeIndex || !DeviceIndex)
+	    return -1;
+	for (i = 0; i < NumPCI; i++)
+	    PCI[i].dwSize = sizeof(PCI[i]);
+	if (PCI_enumerate(PCI) == 0)
+	    return -1;
 
-        // Build a list of all PCI bridge devices
-        for (i = 0,NumBridges = 0,BridgeIndex[0] = -1; i < NumPCI; i++) {
-            if (PCI[i].BaseClass == PCI_BRIDGE_CLASS)
-                BridgeIndex[NumBridges++] = i;
-            }
+	/* Build a list of all PCI bridge devices */
+	for (i = 0,NumBridges = 0,BridgeIndex[0] = -1; i < NumPCI; i++) {
+	    if (PCI[i].BaseClass == PCI_BRIDGE_CLASS)
+		BridgeIndex[NumBridges++] = i;
+	    }
 
-        // Now build a list of all display class devices
-        for (i = 0,NumDevices = 1,DeviceIndex[0] = -1; i < NumPCI; i++) {
-            if (PCI_IS_DISPLAY_CLASS(&PCI[i])) {
-                if ((PCI[i].Command & 0x3) == 0x3)
-                    DeviceIndex[0] = i;
-                else
-                    DeviceIndex[NumDevices++] = i;
-                if (PCI[i].slot.p.Bus != 0) {
-                    // This device is on a different bus than the primary
-                    // PCI bus, so it is probably an AGP device. Find the
-                    // AGP bus device that controls that bus so we can
-                    // control it.
-                    for (j = 0; j < NumBridges; j++) {
-                        info = (PCIDeviceInfo*)&PCI[BridgeIndex[j]];
-                        if (info->u.type1.SecondayBusNumber == PCI[i].slot.p.Bus) {
-                            AGPBridge = info;
-                            break;
-                            }
-                        }
-                    }
-                }
-            }
+	/* Now build a list of all display class devices */
+	for (i = 0,NumDevices = 1,DeviceIndex[0] = -1; i < NumPCI; i++) {
+	    if (PCI_IS_DISPLAY_CLASS(&PCI[i])) {
+		if ((PCI[i].Command & 0x3) == 0x3)
+		    DeviceIndex[0] = i;
+		else
+		    DeviceIndex[NumDevices++] = i;
+		if (PCI[i].slot.p.Bus != 0) {
+		    /* This device is on a different bus than the primary */
+		    /* PCI bus, so it is probably an AGP device. Find the */
+		    /* AGP bus device that controls that bus so we can */
+		    /* control it. */
+		    for (j = 0; j < NumBridges; j++) {
+			info = (PCIDeviceInfo*)&PCI[BridgeIndex[j]];
+			if (info->u.type1.SecondayBusNumber == PCI[i].slot.p.Bus) {
+			    AGPBridge = info;
+			    break;
+			    }
+			}
+		    }
+		}
+	    }
 
-        // Enumerate all PCI and bridge devices to standard output
-        EnumeratePCI();
-        }
+	/* Enumerate all PCI and bridge devices to standard output */
+	EnumeratePCI();
+	}
     return NumDevices;
 }
 
 int main(void)
 {
-    // Enumerate all PCI devices
+    /* Enumerate all PCI devices */
     PM_init();
     if (PCI_enumerateDevices() < 1) {
-        printf("No PCI display devices found!\n");
-        return -1;
-        }
+	printf("No PCI display devices found!\n");
+	return -1;
+	}
     return 0;
 }

diff --git a/board/MAI/bios_emulator/scitech/src/pm/tests/tick.c b/board/MAI/bios_emulator/scitech/src/pm/tests/tick.c
index ee1014f..378725e 100644
--- a/board/MAI/bios_emulator/scitech/src/pm/tests/tick.c
+++ b/board/MAI/bios_emulator/scitech/src/pm/tests/tick.c

@@ -54,16 +54,16 @@
 
     printf("Program running in ");
     switch (PM_getModeType()) {
-        case PM_realMode:
-            printf("real mode.\n\n");
-            break;
-        case PM_286:
-            printf("16 bit protected mode.\n\n");
-            break;
-        case PM_386:
-            printf("32 bit protected mode.\n\n");
-            break;
-        }
+	case PM_realMode:
+	    printf("real mode.\n\n");
+	    break;
+	case PM_286:
+	    printf("16 bit protected mode.\n\n");
+	    break;
+	case PM_386:
+	    printf("32 bit protected mode.\n\n");
+	    break;
+	}
 
     /* Install our timer handler and lock handler pages in memory. It is
      * difficult to get the size of a function in C, but we know our
@@ -77,13 +77,13 @@
     printf("Timer interrupt handler installed - Hit ESC to exit\n");
     oldCount = count;
     while (1) {
-        if (PM_kbhit() && (PM_getch() == 0x1B))
-            break;
-        if (count != oldCount) {
-            printf("Tick, Tock: %ld\n", count);
-            oldCount = count;
-            }
-        }
+	if (PM_kbhit() && (PM_getch() == 0x1B))
+	    break;
+	if (count != oldCount) {
+	    printf("Tick, Tock: %ld\n", count);
+	    oldCount = count;
+	    }
+	}
 
     PM_restoreTimerHandler();
     PM_restoreBreakHandler();

diff --git a/board/MAI/bios_emulator/scitech/src/pm/tests/timerc.c b/board/MAI/bios_emulator/scitech/src/pm/tests/timerc.c
index 55e95a8..7fa77b7 100644
--- a/board/MAI/bios_emulator/scitech/src/pm/tests/timerc.c
+++ b/board/MAI/bios_emulator/scitech/src/pm/tests/timerc.c

@@ -69,8 +69,8 @@
 
     LZTimerOn();
     for (j = 0; j < 10; j++)
-        for (i = 0; i < 20000; i++)
-            i = i;
+	for (i = 0; i < 20000; i++)
+	    i = i;
     LZTimerOff();
     ReportTime(LZTimerCount());
 
@@ -80,7 +80,7 @@
     delay(DELAY_SECS * 1000);
     finish = ULZReadTime();
     printf("Delay of %d secs took %d 1/10ths of a second\n",
-        DELAY_SECS,ULZElapsedTime(start,finish));
+	DELAY_SECS,ULZElapsedTime(start,finish));
 #endif
 
     return 0;

diff --git a/board/MAI/bios_emulator/scitech/src/pm/tests/uswc.c b/board/MAI/bios_emulator/scitech/src/pm/tests/uswc.c
index 0892e25..f0c7bd6 100644
--- a/board/MAI/bios_emulator/scitech/src/pm/tests/uswc.c
+++ b/board/MAI/bios_emulator/scitech/src/pm/tests/uswc.c

@@ -66,50 +66,50 @@
     int             i,j;
     PCIDeviceInfo   *info;
 
-    // If this is the first time we have been called, enumerate all
-    // devices on the PCI bus.
+    /* If this is the first time we have been called, enumerate all */
+    /* devices on the PCI bus. */
     if (NumPCI == -1) {
-        if ((NumPCI = PCI_getNumDevices()) == 0)
-            return -1;
-        PCI = malloc(NumPCI * sizeof(PCI[0]));
-        BridgeIndex = malloc(NumPCI * sizeof(BridgeIndex[0]));
-        DeviceIndex = malloc(NumPCI * sizeof(DeviceIndex[0]));
-        if (!PCI || !BridgeIndex || !DeviceIndex)
-            return -1;
-        for (i = 0; i < NumPCI; i++)
-            PCI[i].dwSize = sizeof(PCI[i]);
-        if (PCI_enumerate(PCI) == 0)
-            return -1;
+	if ((NumPCI = PCI_getNumDevices()) == 0)
+	    return -1;
+	PCI = malloc(NumPCI * sizeof(PCI[0]));
+	BridgeIndex = malloc(NumPCI * sizeof(BridgeIndex[0]));
+	DeviceIndex = malloc(NumPCI * sizeof(DeviceIndex[0]));
+	if (!PCI || !BridgeIndex || !DeviceIndex)
+	    return -1;
+	for (i = 0; i < NumPCI; i++)
+	    PCI[i].dwSize = sizeof(PCI[i]);
+	if (PCI_enumerate(PCI) == 0)
+	    return -1;
 
-        // Build a list of all PCI bridge devices
-        for (i = 0,NumBridges = 0,BridgeIndex[0] = -1; i < NumPCI; i++) {
-            if (PCI[i].BaseClass == PCI_BRIDGE_CLASS)
-                BridgeIndex[NumBridges++] = i;
-            }
+	/* Build a list of all PCI bridge devices */
+	for (i = 0,NumBridges = 0,BridgeIndex[0] = -1; i < NumPCI; i++) {
+	    if (PCI[i].BaseClass == PCI_BRIDGE_CLASS)
+		BridgeIndex[NumBridges++] = i;
+	    }
 
-        // Now build a list of all display class devices
-        for (i = 0,NumDevices = 1,DeviceIndex[0] = -1; i < NumPCI; i++) {
-            if (PCI_IS_DISPLAY_CLASS(&PCI[i])) {
-                if ((PCI[i].Command & 0x3) == 0x3)
-                    DeviceIndex[0] = i;
-                else
-                    DeviceIndex[NumDevices++] = i;
-                if (PCI[i].slot.p.Bus != 0) {
-                    // This device is on a different bus than the primary
-                    // PCI bus, so it is probably an AGP device. Find the
-                    // AGP bus device that controls that bus so we can
-                    // control it.
-                    for (j = 0; j < NumBridges; j++) {
-                        info = (PCIDeviceInfo*)&PCI[BridgeIndex[j]];
-                        if (info->u.type1.SecondayBusNumber == PCI[i].slot.p.Bus) {
-                            AGPBridge = info;
-                            break;
-                            }
-                        }
-                    }
-                }
-            }
-        }
+	/* Now build a list of all display class devices */
+	for (i = 0,NumDevices = 1,DeviceIndex[0] = -1; i < NumPCI; i++) {
+	    if (PCI_IS_DISPLAY_CLASS(&PCI[i])) {
+		if ((PCI[i].Command & 0x3) == 0x3)
+		    DeviceIndex[0] = i;
+		else
+		    DeviceIndex[NumDevices++] = i;
+		if (PCI[i].slot.p.Bus != 0) {
+		    /* This device is on a different bus than the primary */
+		    /* PCI bus, so it is probably an AGP device. Find the */
+		    /* AGP bus device that controls that bus so we can */
+		    /* control it. */
+		    for (j = 0; j < NumBridges; j++) {
+			info = (PCIDeviceInfo*)&PCI[BridgeIndex[j]];
+			if (info->u.type1.SecondayBusNumber == PCI[i].slot.p.Bus) {
+			    AGPBridge = info;
+			    break;
+			    }
+			}
+		    }
+		}
+	    }
+	}
     return NumDevices;
 }
 
@@ -125,17 +125,17 @@
     printf("\n");
     printf("DeviceID  SubSystem  Base10h  (length  )  Base14h  (length  )\n");
     for (index = 0; index < NumDevices; index++) {
-        i = DeviceIndex[index];
-        printf("%04X:%04X %04X:%04X  %08lX (%6ld KB) %08lX (%6ld KB)\n",
-            PCI[i].VendorID,
-            PCI[i].DeviceID,
-            PCI[i].u.type0.SubSystemVendorID,
-            PCI[i].u.type0.SubSystemID,
-            PCI[i].u.type0.BaseAddress10,
-            PCI[i].u.type0.BaseAddress10Len / 1024,
-            PCI[i].u.type0.BaseAddress14,
-            PCI[i].u.type0.BaseAddress14Len / 1024);
-        }
+	i = DeviceIndex[index];
+	printf("%04X:%04X %04X:%04X  %08lX (%6ld KB) %08lX (%6ld KB)\n",
+	    PCI[i].VendorID,
+	    PCI[i].DeviceID,
+	    PCI[i].u.type0.SubSystemVendorID,
+	    PCI[i].u.type0.SubSystemID,
+	    PCI[i].u.type0.BaseAddress10,
+	    PCI[i].u.type0.BaseAddress10Len / 1024,
+	    PCI[i].u.type0.BaseAddress14,
+	    PCI[i].u.type0.BaseAddress14Len / 1024);
+	}
     printf("\n");
 }
 
@@ -147,16 +147,16 @@
     uint type)
 {
     static char *names[] = {
-        "UNCACHABLE",
-        "WRCOMB",
-        "UNKNOWN",
-        "UNKNOWN",
-        "WRTHROUGH",
-        "WRPROT",
-        "WRBACK",
-        };
+	"UNCACHABLE",
+	"WRCOMB",
+	"UNKNOWN",
+	"UNKNOWN",
+	"WRTHROUGH",
+	"WRPROT",
+	"WRBACK",
+	};
     if (type <= PM_MTRR_MAX)
-        return names[type];
+	return names[type];
     return "UNKNOWN";
 }
 
@@ -183,42 +183,42 @@
     int err)
 {
     if (err == PM_MTRR_ERR_OK)
-        return;
+	return;
     switch (err) {
-        case PM_MTRR_NOT_SUPPORTED:
-            printf("Failed: MTRR is not supported by host CPU\n");
-            break;
-        case PM_MTRR_ERR_PARAMS:
-            printf("Failed: Invalid parameters passed to PM_enableWriteCombined!\n");
-            break;
-        case PM_MTRR_ERR_NOT_4KB_ALIGNED:
-            printf("Failed: Address is not 4Kb aligned!\n");
-            break;
-        case PM_MTRR_ERR_BELOW_1MB:
-            printf("Failed: Addresses below 1Mb cannot be write combined!\n");
-            break;
-        case PM_MTRR_ERR_NOT_ALIGNED:
-            printf("Failed: Address is not correctly aligned for processor!\n");
-            break;
-        case PM_MTRR_ERR_OVERLAP:
-            printf("Failed: Address overlaps an existing region!\n");
-            break;
-        case PM_MTRR_ERR_TYPE_MISMATCH:
-            printf("Failed: Adress is contained with existing region, but type is different!\n");
-            break;
-        case PM_MTRR_ERR_NONE_FREE:
-            printf("Failed: Out of MTRR registers!\n");
-            break;
-        case PM_MTRR_ERR_NOWRCOMB:
-            printf("Failed: This processor does not support write combining!\n");
-            break;
-        case PM_MTRR_ERR_NO_OS_SUPPORT:
-            printf("Failed: MTRR is not supported by host OS\n");
-            break;
-        default:
-            printf("Failed: UNKNOWN ERROR!\n");
-            break;
-        }
+	case PM_MTRR_NOT_SUPPORTED:
+	    printf("Failed: MTRR is not supported by host CPU\n");
+	    break;
+	case PM_MTRR_ERR_PARAMS:
+	    printf("Failed: Invalid parameters passed to PM_enableWriteCombined!\n");
+	    break;
+	case PM_MTRR_ERR_NOT_4KB_ALIGNED:
+	    printf("Failed: Address is not 4Kb aligned!\n");
+	    break;
+	case PM_MTRR_ERR_BELOW_1MB:
+	    printf("Failed: Addresses below 1Mb cannot be write combined!\n");
+	    break;
+	case PM_MTRR_ERR_NOT_ALIGNED:
+	    printf("Failed: Address is not correctly aligned for processor!\n");
+	    break;
+	case PM_MTRR_ERR_OVERLAP:
+	    printf("Failed: Address overlaps an existing region!\n");
+	    break;
+	case PM_MTRR_ERR_TYPE_MISMATCH:
+	    printf("Failed: Adress is contained with existing region, but type is different!\n");
+	    break;
+	case PM_MTRR_ERR_NONE_FREE:
+	    printf("Failed: Out of MTRR registers!\n");
+	    break;
+	case PM_MTRR_ERR_NOWRCOMB:
+	    printf("Failed: This processor does not support write combining!\n");
+	    break;
+	case PM_MTRR_ERR_NO_OS_SUPPORT:
+	    printf("Failed: MTRR is not supported by host OS\n");
+	    break;
+	default:
+	    printf("Failed: UNKNOWN ERROR!\n");
+	    break;
+	}
     exit(-1);
 }
 
@@ -242,20 +242,20 @@
     int i,index;
 
     for (index = 0; index < NumDevices; index++) {
-        i = DeviceIndex[index];
-        if (PCI[i].u.type0.BaseAddress10 & 0x8) {
-            LogMTRRError(PM_enableWriteCombine(
-                PCI[i].u.type0.BaseAddress10 & 0xFFFFFFF0,
-                PCI[i].u.type0.BaseAddress10Len,
-                PM_MTRR_WRCOMB));
-            }
-        if (PCI[i].u.type0.BaseAddress14 & 0x8) {
-            LogMTRRError(PM_enableWriteCombine(
-                PCI[i].u.type0.BaseAddress14 & 0xFFFFFFF0,
-                PCI[i].u.type0.BaseAddress14Len,
-                PM_MTRR_WRCOMB));
-            }
-        }
+	i = DeviceIndex[index];
+	if (PCI[i].u.type0.BaseAddress10 & 0x8) {
+	    LogMTRRError(PM_enableWriteCombine(
+		PCI[i].u.type0.BaseAddress10 & 0xFFFFFFF0,
+		PCI[i].u.type0.BaseAddress10Len,
+		PM_MTRR_WRCOMB));
+	    }
+	if (PCI[i].u.type0.BaseAddress14 & 0x8) {
+	    LogMTRRError(PM_enableWriteCombine(
+		PCI[i].u.type0.BaseAddress14 & 0xFFFFFFF0,
+		PCI[i].u.type0.BaseAddress14Len,
+		PM_MTRR_WRCOMB));
+	    }
+	}
     printf("\n");
     ShowDisplayDevices();
     ShowWriteCombine();
@@ -270,20 +270,20 @@
     int i,index;
 
     for (index = 0; index < NumDevices; index++) {
-        i = DeviceIndex[index];
-        if (PCI[i].u.type0.BaseAddress10 & 0x8) {
-            LogMTRRError(PM_enableWriteCombine(
-                PCI[i].u.type0.BaseAddress10 & 0xFFFFFFF0,
-                PCI[i].u.type0.BaseAddress10Len,
-                PM_MTRR_UNCACHABLE));
-            }
-        if (PCI[i].u.type0.BaseAddress14 & 0x8) {
-            LogMTRRError(PM_enableWriteCombine(
-                PCI[i].u.type0.BaseAddress14 & 0xFFFFFFF0,
-                PCI[i].u.type0.BaseAddress14Len,
-                PM_MTRR_UNCACHABLE));
-            }
-        }
+	i = DeviceIndex[index];
+	if (PCI[i].u.type0.BaseAddress10 & 0x8) {
+	    LogMTRRError(PM_enableWriteCombine(
+		PCI[i].u.type0.BaseAddress10 & 0xFFFFFFF0,
+		PCI[i].u.type0.BaseAddress10Len,
+		PM_MTRR_UNCACHABLE));
+	    }
+	if (PCI[i].u.type0.BaseAddress14 & 0x8) {
+	    LogMTRRError(PM_enableWriteCombine(
+		PCI[i].u.type0.BaseAddress14 & 0xFFFFFFF0,
+		PCI[i].u.type0.BaseAddress14Len,
+		PM_MTRR_UNCACHABLE));
+	    }
+	}
     printf("\n");
     ShowDisplayDevices();
     ShowWriteCombine();
@@ -293,19 +293,19 @@
 {
     PM_init();
     if (PCI_enumerateDevices() < 1) {
-        printf("No PCI display devices found!\n");
-        return -1;
-        }
+	printf("No PCI display devices found!\n");
+	return -1;
+	}
     if (argc < 2) {
-        printf("usage: uswc [-show -on -off]\n\n");
-        ShowDisplayDevices();
-        return -1;
-        }
+	printf("usage: uswc [-show -on -off]\n\n");
+	ShowDisplayDevices();
+	return -1;
+	}
     if (stricmp(argv[1],"-show") == 0)
-        ShowWriteCombine();
+	ShowWriteCombine();
     else if (stricmp(argv[1],"-on") == 0)
-        EnableWriteCombine();
+	EnableWriteCombine();
     else if (stricmp(argv[1],"-off") == 0)
-        DisableWriteCombine();
+	DisableWriteCombine();
     return 0;
 }

diff --git a/board/MAI/bios_emulator/scitech/src/pm/tests/vftest.c b/board/MAI/bios_emulator/scitech/src/pm/tests/vftest.c
index 633a76d..b7e3bb7 100644
--- a/board/MAI/bios_emulator/scitech/src/pm/tests/vftest.c
+++ b/board/MAI/bios_emulator/scitech/src/pm/tests/vftest.c

@@ -51,27 +51,27 @@
 
     printf("Program running in ");
     switch (PM_getModeType()) {
-        case PM_realMode:
-            printf("real mode.\n\n");
-            break;
-        case PM_286:
-            printf("16 bit protected mode.\n\n");
-            break;
-        case PM_386:
-            printf("32 bit protected mode.\n\n");
-            break;
-        }
+	case PM_realMode:
+	    printf("real mode.\n\n");
+	    break;
+	case PM_286:
+	    printf("16 bit protected mode.\n\n");
+	    break;
+	case PM_386:
+	    printf("32 bit protected mode.\n\n");
+	    break;
+	}
 
     if (!VF_available()) {
-        printf("Virtual Linear Framebuffer not available.\n");
-        exit(1);
-        }
+	printf("Virtual Linear Framebuffer not available.\n");
+	exit(1);
+	}
 
     vfBuffer = VF_init(0xA0000,64,sizeof(code),code);
     if (!vfBuffer) {
-        printf("Failure to initialise Virtual Linear Framebuffer!\n");
-        exit(1);
-        }
+	printf("Failure to initialise Virtual Linear Framebuffer!\n");
+	exit(1);
+	}
     VF_exit();
     printf("Virtual Linear Framebuffer set up successfully!\n");
     return 0;

diff --git a/board/MAI/bios_emulator/scitech/src/pm/tests/video.c b/board/MAI/bios_emulator/scitech/src/pm/tests/video.c
index 7f6f67f..92adcdd 100644
--- a/board/MAI/bios_emulator/scitech/src/pm/tests/video.c
+++ b/board/MAI/bios_emulator/scitech/src/pm/tests/video.c

@@ -90,12 +90,12 @@
     int             x,y;
 
     for (y = starty; y <= endy; y++) {
-        v = SCREEN(startx,y);
-        for (x = startx; x <= endx; x++) {
-            *v++ = c;
-            *v++ = attr;
-            }
-        }
+	v = SCREEN(startx,y);
+	for (x = startx; x <= endx; x++) {
+	    *v++ = c;
+	    *v++ = attr;
+	    }
+	}
 }
 
 /* Routine to display a single character using direct video writes */
@@ -124,18 +124,18 @@
     b = border_chars;
 
     for (i = starty+1; i < endy; i++) {
-        writeChar(startx, i, *b, attr);
-        writeChar(endx, i, *b, attr);
-        }
+	writeChar(startx, i, *b, attr);
+	writeChar(endx, i, *b, attr);
+	}
     b++;
     for (i = startx+1, v = SCREEN(startx+1, starty); i < endx; i++) {
-        *v++ = *b;
-        *v++ = attr;
-        }
+	*v++ = *b;
+	*v++ = attr;
+	}
     for (i = startx+1, v = SCREEN(startx+1, endy); i < endx; i++) {
-        *v++ = *b;
-        *v++ = attr;
-        }
+	*v++ = *b;
+	*v++ = attr;
+	}
     b++;
     writeChar(startx, starty, *b++, attr);
     writeChar(endx, starty, *b++, attr);
@@ -150,16 +150,16 @@
 
     printf("Program running in ");
     switch (PM_getModeType()) {
-        case PM_realMode:
-            printf("real mode.\n\n");
-            break;
-        case PM_286:
-            printf("16 bit protected mode.\n\n");
-            break;
-        case PM_386:
-            printf("32 bit protected mode.\n\n");
-            break;
-        }
+	case PM_realMode:
+	    printf("real mode.\n\n");
+	    break;
+	case PM_286:
+	    printf("16 bit protected mode.\n\n");
+	    break;
+	case PM_386:
+	    printf("32 bit protected mode.\n\n");
+	    break;
+	}
 
     hwndConsole = PM_openConsole(0,0,0,0,0,true);
     printf("Hit any key to start 80x25 text mode and perform some direct video output.\n");
@@ -167,17 +167,17 @@
 
     /* Allocate a buffer to save console state and save the state */
     if ((stateBuf = PM_malloc(PM_getConsoleStateSize())) == NULL) {
-        printf("Unable to allocate console state buffer!\n");
-        exit(1);
-        }
+	printf("Unable to allocate console state buffer!\n");
+	exit(1);
+	}
     PM_saveConsoleState(stateBuf,0);
     bios = PM_getBIOSPointer();
     orgMode = getVideoMode();
     setVideoMode(0x3);
     if ((videoPtr = PM_mapPhysicalAddr(0xB8000,0xFFFF,true)) == NULL) {
-        printf("Unable to obtain pointer to framebuffer!\n");
-        exit(1);
-        }
+	printf("Unable to obtain pointer to framebuffer!\n");
+	exit(1);
+	}
 
     /* Draw some text on the screen */
     fill(0, 0, 79, 24, 176, 0x1E);
@@ -197,4 +197,3 @@
     printf("Video Memory = %08X\n", (int)videoPtr);
     return 0;
 }
-

diff --git a/board/MAI/bios_emulator/scitech/src/pm/vdd/fileio.c b/board/MAI/bios_emulator/scitech/src/pm/vdd/fileio.c
index dbbaf37..93742de 100644
--- a/board/MAI/bios_emulator/scitech/src/pm/vdd/fileio.c
+++ b/board/MAI/bios_emulator/scitech/src/pm/vdd/fileio.c

@@ -63,54 +63,54 @@
     ULONG   omode, oflags;
 
     if (f != NULL) {
-        f->offset = 0;
-        f->text = (mode[1] == 't' || mode[2] == 't');
-        f->writemode = (mode[0] == 'w') || (mode[0] == 'a');
-        f->unputc = EOF;
-        f->endp = f->buf + sizeof(f->buf);
-        f->curp = f->startp = f->buf;
+	f->offset = 0;
+	f->text = (mode[1] == 't' || mode[2] == 't');
+	f->writemode = (mode[0] == 'w') || (mode[0] == 'a');
+	f->unputc = EOF;
+	f->endp = f->buf + sizeof(f->buf);
+	f->curp = f->startp = f->buf;
 
-        if (mode[0] == 'r') {
-            #ifdef __OS2_VDD__
-            omode  = VDHOPEN_ACCESS_READONLY | VDHOPEN_SHARE_DENYNONE;
-            oflags = VDHOPEN_ACTION_OPEN_IF_EXISTS | VDHOPEN_ACTION_FAIL_IF_NEW;
-            #else
-            omode  = OPEN_ACCESS_READONLY | OPEN_SHARE_DENYNONE;
-            oflags = OPEN_ACTION_OPEN_IF_EXISTS | OPEN_ACTION_FAIL_IF_NEW;
-            #endif
-            }
-        else if (mode[0] == 'w') {
-            #ifdef __OS2_VDD__
-            omode  = VDHOPEN_ACCESS_WRITEONLY | VDHOPEN_SHARE_DENYWRITE;
-            oflags = VDHOPEN_ACTION_REPLACE_IF_EXISTS | VDHOPEN_ACTION_CREATE_IF_NEW;
-            #else
-            omode  = OPEN_ACCESS_WRITEONLY | OPEN_SHARE_DENYWRITE;
-            oflags = OPEN_ACTION_REPLACE_IF_EXISTS | OPEN_ACTION_CREATE_IF_NEW;
-            #endif
-            }
-        else {
-            #ifdef __OS2_VDD__
-            omode  = VDHOPEN_ACCESS_READWRITE | VDHOPEN_SHARE_DENYWRITE;
-            oflags = VDHOPEN_ACTION_OPEN_IF_EXISTS | VDHOPEN_ACTION_CREATE_IF_NEW;
-            #else
-            omode  = OPEN_ACCESS_READWRITE | OPEN_SHARE_DENYWRITE;
-            oflags = OPEN_ACTION_OPEN_IF_EXISTS | OPEN_ACTION_CREATE_IF_NEW;
-            #endif
-            }
-        rc = _OS2Open((PSZ)filename, (PHFILE)&f->handle, &ulAction, 0, VDHOPEN_FILE_NORMAL, oflags, omode, NULL);
-        if (rc != 0) {
-            PM_free(f);
-            return NULL;
-            }
+	if (mode[0] == 'r') {
+	    #ifdef __OS2_VDD__
+	    omode  = VDHOPEN_ACCESS_READONLY | VDHOPEN_SHARE_DENYNONE;
+	    oflags = VDHOPEN_ACTION_OPEN_IF_EXISTS | VDHOPEN_ACTION_FAIL_IF_NEW;
+	    #else
+	    omode  = OPEN_ACCESS_READONLY | OPEN_SHARE_DENYNONE;
+	    oflags = OPEN_ACTION_OPEN_IF_EXISTS | OPEN_ACTION_FAIL_IF_NEW;
+	    #endif
+	    }
+	else if (mode[0] == 'w') {
+	    #ifdef __OS2_VDD__
+	    omode  = VDHOPEN_ACCESS_WRITEONLY | VDHOPEN_SHARE_DENYWRITE;
+	    oflags = VDHOPEN_ACTION_REPLACE_IF_EXISTS | VDHOPEN_ACTION_CREATE_IF_NEW;
+	    #else
+	    omode  = OPEN_ACCESS_WRITEONLY | OPEN_SHARE_DENYWRITE;
+	    oflags = OPEN_ACTION_REPLACE_IF_EXISTS | OPEN_ACTION_CREATE_IF_NEW;
+	    #endif
+	    }
+	else {
+	    #ifdef __OS2_VDD__
+	    omode  = VDHOPEN_ACCESS_READWRITE | VDHOPEN_SHARE_DENYWRITE;
+	    oflags = VDHOPEN_ACTION_OPEN_IF_EXISTS | VDHOPEN_ACTION_CREATE_IF_NEW;
+	    #else
+	    omode  = OPEN_ACCESS_READWRITE | OPEN_SHARE_DENYWRITE;
+	    oflags = OPEN_ACTION_OPEN_IF_EXISTS | OPEN_ACTION_CREATE_IF_NEW;
+	    #endif
+	    }
+	rc = _OS2Open((PSZ)filename, (PHFILE)&f->handle, &ulAction, 0, VDHOPEN_FILE_NORMAL, oflags, omode, NULL);
+	if (rc != 0) {
+	    PM_free(f);
+	    return NULL;
+	    }
 
-        #ifdef __OS2_VDD__
-        f->filesize = VDHSeek((HFILE)f->handle, 0, VDHSK_END_OF_FILE);
-        #else
-        rc = DosSetFilePtr((HFILE)f->handle, 0, FILE_END, &f->filesize);
-        #endif
+	#ifdef __OS2_VDD__
+	f->filesize = VDHSeek((HFILE)f->handle, 0, VDHSK_END_OF_FILE);
+	#else
+	rc = DosSetFilePtr((HFILE)f->handle, 0, FILE_END, &f->filesize);
+	#endif
 
-        if (mode[0] == 'a')
-            fseek(f,0,2);
+	if (mode[0] == 'a')
+	    fseek(f,0,2);
     }
     return f;
 }
@@ -131,23 +131,23 @@
 
     /* First copy any data already read into our buffer */
     if ((bytes = (f->curp - f->startp)) > 0) {
-        memcpy(buf,f->curp,bytes);
-        f->startp = f->curp = f->buf;
-        buf += bytes;
-        totalbytes += bytes;
-        bytes = (size * n) - bytes;
-        }
+	memcpy(buf,f->curp,bytes);
+	f->startp = f->curp = f->buf;
+	buf += bytes;
+	totalbytes += bytes;
+	bytes = (size * n) - bytes;
+	}
     else
-        bytes = size * n;
+	bytes = size * n;
     if (bytes) {
-        #ifdef __OS2_VDD__
-        readbytes = VDHRead((HFILE)f->handle, buf, bytes);
-        #else
-        DosRead((HFILE)f->handle, buf, bytes, &readbytes);
-        #endif
-        totalbytes += readbytes;
-        f->offset += readbytes;
-        }
+	#ifdef __OS2_VDD__
+	readbytes = VDHRead((HFILE)f->handle, buf, bytes);
+	#else
+	DosRead((HFILE)f->handle, buf, bytes, &readbytes);
+	#endif
+	totalbytes += readbytes;
+	f->offset += readbytes;
+	}
     return totalbytes / size;
 }
 
@@ -166,7 +166,7 @@
 
     /* Flush anything already in the buffer */
     if (!f->writemode)
-        return 0;
+	return 0;
     fflush(f);
     bytes = size * n;
     #ifdef __OS2_VDD__
@@ -177,7 +177,7 @@
     totalbytes += writtenbytes;
     f->offset += writtenbytes;
     if (f->offset > f->filesize)
-        f->filesize = f->offset;
+	f->filesize = f->offset;
     return totalbytes / size;
 }
 
@@ -192,16 +192,16 @@
 
     /* First copy any data already written into our buffer */
     if (f->writemode && (bytes = (f->curp - f->startp)) > 0) {
-        #ifdef __OS2_VDD__
-        bytes = VDHWrite((HFILE)f->handle, f->startp, bytes);
-        #else
-        DosWrite((HFILE)f->handle, f->startp, bytes, &bytes);
-        #endif
-        f->offset += bytes;
-        if (f->offset > f->filesize)
-            f->filesize = f->offset;
-        f->startp = f->curp = f->buf;
-        }
+	#ifdef __OS2_VDD__
+	bytes = VDHWrite((HFILE)f->handle, f->startp, bytes);
+	#else
+	DosWrite((HFILE)f->handle, f->startp, bytes, &bytes);
+	#endif
+	f->offset += bytes;
+	if (f->offset > f->filesize)
+	    f->filesize = f->offset;
+	f->startp = f->curp = f->buf;
+	}
     return 0;
 }
 
@@ -217,11 +217,11 @@
     fflush(f);
 
     if (whence == 0)
-        f->offset = offset;
+	f->offset = offset;
     else if (whence == 1)
-        f->offset += offset;
+	f->offset += offset;
     else if (whence == 2)
-        f->offset = f->filesize + offset;
+	f->offset = f->filesize + offset;
 
     #ifdef __OS2_VDD__
     VDHSeek((HFILE)f->handle, f->offset, VDHSK_ABSOLUTE);
@@ -267,23 +267,23 @@
     int c;
 
     if (f->unputc != EOF) {
-        c = f->unputc;
-        f->unputc = EOF;
-        }
+	c = f->unputc;
+	f->unputc = EOF;
+	}
     else {
-        if (f->startp == f->curp) {
-            int bytes = fread(f->buf,1,sizeof(f->buf),f);
-            if (bytes == 0)
-                return EOF;
-            f->curp = f->startp + bytes;
-            }
-        c = *f->startp++;
-        if (f->text && c == '\r') {
-            int nc = __getc(f);
-            if (nc != '\n')
-                f->unputc = nc;
-            }
-        }
+	if (f->startp == f->curp) {
+	    int bytes = fread(f->buf,1,sizeof(f->buf),f);
+	    if (bytes == 0)
+		return EOF;
+	    f->curp = f->startp + bytes;
+	    }
+	c = *f->startp++;
+	if (f->text && c == '\r') {
+	    int nc = __getc(f);
+	    if (nc != '\n')
+		f->unputc = nc;
+	    }
+	}
     return c;
 }
 
@@ -296,11 +296,11 @@
 {
     int count = 1;
     if (f->text && c == '\n') {
-        __putc('\r',f);
-        count = 2;
-        }
+	__putc('\r',f);
+	count = 2;
+	}
     if (f->curp == f->endp)
-        fflush(f);
+	fflush(f);
     *f->curp++ = c;
     return count;
 }
@@ -319,12 +319,12 @@
 
     cs = s;
     while (--n > 0 && (c = __getc(f)) != EOF) {
-        *cs++ = c;
-        if (c == '\n')
-            break;
-        }
+	*cs++ = c;
+	if (c == '\n')
+	    break;
+	}
     if (c == EOF && cs == s)
-        return NULL;
+	return NULL;
     *cs = '\0';
     return s;
 }
@@ -341,7 +341,7 @@
     int c;
 
     while ((c = *s++) != 0)
-        r = __putc(c, f);
+	r = __putc(c, f);
     return r;
 }
 

diff --git a/board/MAI/bios_emulator/scitech/src/pm/vdd/pm.c b/board/MAI/bios_emulator/scitech/src/pm/vdd/pm.c
index 32177f8..6688bab 100644
--- a/board/MAI/bios_emulator/scitech/src/pm/vdd/pm.c
+++ b/board/MAI/bios_emulator/scitech/src/pm/vdd/pm.c

@@ -44,7 +44,7 @@
 #define MAX_MEMORY_SHARED           100
 #define MAX_MEMORY_MAPPINGS         100
 
-// TODO: I think the global and linear members will be the same, but not sure yet.
+/* TODO: I think the global and linear members will be the same, but not sure yet. */
 typedef struct {
     void    *linear;
     ulong   global;
@@ -90,18 +90,18 @@
 {
     MTRR_init();
 
-    // Initialize VDD-specific data
-    // Note: PM_init must be (obviously) called in VDM task context!
+    /* Initialize VDD-specific data */
+    /* Note: PM_init must be (obviously) called in VDM task context! */
     VDHCreateSem(&hevFarCallRet, VDH_EVENTSEM);
     VDHCreateSem(&hevIRet, VDH_EVENTSEM);
     hhookUserReturnHook = VDHAllocHook(VDH_RETURN_HOOK, (PFNARM)UserReturnHook, 0);
     hhookUserIRetHook   = VDHAllocHook(VDH_RETURN_HOOK, (PFNARM)UserIRetHook, 0);
 
     if ((hevIRet == NULL) || (hevFarCallRet == NULL) ||
-        (hhookUserReturnHook == NULL) || (hhookUserIRetHook == NULL)) {
-        // something failed, we can't go on
-        // TODO: take some action here!
-        }
+	(hhookUserReturnHook == NULL) || (hhookUserIRetHook == NULL)) {
+	/* something failed, we can't go on */
+	/* TODO: take some action here! */
+	}
 }
 
 /* Do some cleaning up */
@@ -109,17 +109,17 @@
 {
     /* Note: Hooks allocated during or after VDM creation are deallocated automatically */
     if (hevIRet != NULL)
-        VDHDestroySem(hevIRet);
+	VDHDestroySem(hevIRet);
 
     if (hevFarCallRet != NULL)
-        VDHDestroySem(hevFarCallRet);
+	VDHDestroySem(hevFarCallRet);
 }
 
 ibool PMAPI PM_haveBIOSAccess(void)
 { return _PM_haveBIOS; }
 
 long PMAPI PM_getOSType(void)
-{ return /*_OS_OS2VDD*/ _OS_OS2; }  //FIX!!
+{ return /*_OS_OS2VDD*/ _OS_OS2; }  /*FIX!! */
 
 int PMAPI PM_getModeType(void)
 { return PM_386; }
@@ -128,9 +128,9 @@
 {
     uint pos = strlen(s);
     if (s[pos-1] != '\\') {
-        s[pos] = '\\';
-        s[pos+1] = '\0';
-        }
+	s[pos] = '\\';
+	s[pos+1] = '\0';
+	}
 }
 
 void PMAPI PM_setFatalErrorCleanup(
@@ -142,8 +142,8 @@
 void PMAPI PM_fatalError(const char *msg)
 {
     if (fatalErrorCleanup)
-        fatalErrorCleanup();
-//    Fatal_Error_Handler(msg,0);  TODO: implement somehow!
+	fatalErrorCleanup();
+/*    Fatal_Error_Handler(msg,0);  TODO: implement somehow! */
 }
 
 /****************************************************************************
@@ -162,11 +162,11 @@
     uint *roff)
 {
     if (_PM_rmBufAddr) {
-        *len = 0; //VESA_BUF_SIZE;
-        *rseg = (ulong)(_PM_rmBufAddr) >> 4;
-        *roff = (ulong)(_PM_rmBufAddr) & 0xF;
-        return _PM_rmBufAddr;
-        }
+	*len = 0; /*VESA_BUF_SIZE; */
+	*rseg = (ulong)(_PM_rmBufAddr) >> 4;
+	*roff = (ulong)(_PM_rmBufAddr) & 0xF;
+	return _PM_rmBufAddr;
+	}
     return NULL;
 }
 
@@ -200,12 +200,12 @@
 
 const char * PMAPI PM_getNucleusPath(void)
 {
-        static char path[CCHMAXPATH];
-        strcpy(path,"x:\\os2\\drivers");
-        path[0] = PM_getBootDrive();
-        PM_backslash(path);
-        strcat(path,"nucleus");
-        return path;
+	static char path[CCHMAXPATH];
+	strcpy(path,"x:\\os2\\drivers");
+	path[0] = PM_getBootDrive();
+	PM_backslash(path);
+	strcat(path,"nucleus");
+	return path;
 }
 
 const char * PMAPI PM_getNucleusConfigPath(void)
@@ -292,15 +292,15 @@
 
     /* First find a free slot in our shared memory table */
     for (i = 0; i < MAX_MEMORY_SHARED; i++) {
-        if (shared[i].linear == 0)
-            break;
-        }
+	if (shared[i].linear == 0)
+	    break;
+	}
     if (i < MAX_MEMORY_SHARED) {
-        shared[i].linear = VDHAllocPages(NULL, nPages, VDHAP_SYSTEM | VDHAP_FIXED);
-        shared[i].npages = nPages;
-        shared[i].global = (ULONG)shared[i].linear;
-        return (void*)shared[i].global;
-        }
+	shared[i].linear = VDHAllocPages(NULL, nPages, VDHAP_SYSTEM | VDHAP_FIXED);
+	shared[i].npages = nPages;
+	shared[i].global = (ULONG)shared[i].linear;
+	return (void*)shared[i].global;
+	}
     return NULL;
 }
 
@@ -314,12 +314,12 @@
 
     /* Find a shared memory block in our table and free it */
     for (i = 0; i < MAX_MEMORY_SHARED; i++) {
-        if (shared[i].global == (ulong)p) {
-            VDHFreePages(shared[i].linear);
-            shared[i].linear = 0;
-            break;
-            }
-        }
+	if (shared[i].global == (ulong)p) {
+	    VDHFreePages(shared[i].linear);
+	    shared[i].linear = 0;
+	    break;
+	    }
+	}
 }
 
 void * PMAPI PM_mapToProcess(void *base,ulong limit)
@@ -331,7 +331,7 @@
     void *mappedBIOS,
     ulong BIOSLen)
 {
-    // TODO: Figure out how to do this
+    /* TODO: Figure out how to do this */
     return false;
 }
 
@@ -364,18 +364,18 @@
     *npages = (length + (base & 0xFFF) + 4095) >> 12;
     flags = PR_FIXED | PR_STATIC;
     if (base == 0xA0000) {
-        /* We require the linear address to be aligned to a 64Kb boundary
-         * for mapping the banked framebuffer (so we can do efficient
-         * carry checking for bank changes in the assembler code). The only
-         * way to ensure this is to force the linear address to be aligned
-         * to a 4Mb boundary.
-         */
-        flags |= PR_4MEG;
-        }
+	/* We require the linear address to be aligned to a 64Kb boundary
+	 * for mapping the banked framebuffer (so we can do efficient
+	 * carry checking for bank changes in the assembler code). The only
+	 * way to ensure this is to force the linear address to be aligned
+	 * to a 4Mb boundary.
+	 */
+	flags |= PR_4MEG;
+	}
     if ((linear = (ulong)PageReserve(PR_SYSTEM,*npages,flags)) == (ulong)-1)
-        return 0;
+	return 0;
     if (!PageCommitPhys(linear >> 12,*npages,ppage,PC_INCR | PC_USER | PC_WRITEABLE))
-        return 0;
+	return 0;
 #endif
     return linear + (base & 0xFFF);
 }
@@ -397,9 +397,9 @@
 sticky paws.
 
 NOTE:   If the memory is not expected to be cached, this function will
-        directly re-program the PCD (Page Cache Disable) bit in the
-        page tables. There does not appear to be a mechanism in the VMM
-        to control this bit via the regular interface.
+	directly re-program the PCD (Page Cache Disable) bit in the
+	page tables. There does not appear to be a mechanism in the VMM
+	to control this bit via the regular interface.
 ****************************************************************************/
 void * PMAPI PM_mapPhysicalAddr(
     ulong base,
@@ -414,11 +414,11 @@
      * a region of memory that will serve this purpose.
      */
     for (i = 0; i < numMappings; i++) {
-        if (maps[i].physical == base && maps[i].length == length && maps[i].isCached == isCached)
-            return (void*)maps[i].linear;
-        }
+	if (maps[i].physical == base && maps[i].length == length && maps[i].isCached == isCached)
+	    return (void*)maps[i].linear;
+	}
     if (numMappings == MAX_MEMORY_MAPPINGS)
-        return NULL;
+	return NULL;
 
     /* We did not find any previously mapped memory region, so map it in.
      * Note that we do not use MapPhysToLinear, since this function appears
@@ -426,7 +426,7 @@
      * Hence we use PageReserve and PageCommitPhys.
      */
     if ((linear = MapPhysicalToLinear(base,limit,&npages)) == 0)
-        return NULL;
+	return NULL;
     maps[numMappings].physical = base;
     maps[numMappings].length = length;
     maps[numMappings].linear = linear;
@@ -437,33 +437,33 @@
 #if 0
     /* Finally disable caching where necessary */
     if (!isCached && (PDB = _PM_getPDB()) != 0) {
-        int     startPDB,endPDB,iPDB,startPage,endPage,start,end,iPage;
-        ulong   pageTable,*pPageTable;
+	int     startPDB,endPDB,iPDB,startPage,endPage,start,end,iPage;
+	ulong   pageTable,*pPageTable;
 
-        if (PDB >= 0x100000)
-            pPDB = (ulong*)MapPhysicalToLinear(PDB,0xFFF,&npages);
-        else
-            pPDB = (ulong*)PDB;
-        if (pPDB) {
-            startPDB = (linear >> 22) & 0x3FF;
-            startPage = (linear >> 12) & 0x3FF;
-            endPDB = ((linear+limit) >> 22) & 0x3FF;
-            endPage = ((linear+limit) >> 12) & 0x3FF;
-            for (iPDB = startPDB; iPDB <= endPDB; iPDB++) {
-                pageTable = pPDB[iPDB] & ~0xFFF;
-                if (pageTable >= 0x100000)
-                    pPageTable = (ulong*)MapPhysicalToLinear(pageTable,0xFFF,&npages);
-                else
-                    pPageTable = (ulong*)pageTable;
-                start = (iPDB == startPDB) ? startPage : 0;
-                end = (iPDB == endPDB) ? endPage : 0x3FF;
-                for (iPage = start; iPage <= end; iPage++)
-                    pPageTable[iPage] |= 0x10;
-                PageFree((ulong)pPageTable,PR_STATIC);
-                }
-            PageFree((ulong)pPDB,PR_STATIC);
-            }
-        }
+	if (PDB >= 0x100000)
+	    pPDB = (ulong*)MapPhysicalToLinear(PDB,0xFFF,&npages);
+	else
+	    pPDB = (ulong*)PDB;
+	if (pPDB) {
+	    startPDB = (linear >> 22) & 0x3FF;
+	    startPage = (linear >> 12) & 0x3FF;
+	    endPDB = ((linear+limit) >> 22) & 0x3FF;
+	    endPage = ((linear+limit) >> 12) & 0x3FF;
+	    for (iPDB = startPDB; iPDB <= endPDB; iPDB++) {
+		pageTable = pPDB[iPDB] & ~0xFFF;
+		if (pageTable >= 0x100000)
+		    pPageTable = (ulong*)MapPhysicalToLinear(pageTable,0xFFF,&npages);
+		else
+		    pPageTable = (ulong*)pageTable;
+		start = (iPDB == startPDB) ? startPage : 0;
+		end = (iPDB == endPDB) ? endPage : 0x3FF;
+		for (iPage = start; iPage <= end; iPage++)
+		    pPageTable[iPage] |= 0x10;
+		PageFree((ulong)pPageTable,PR_STATIC);
+		}
+	    PageFree((ulong)pPDB,PR_STATIC);
+	    }
+	}
 #endif
     return (void*)linear;
 }
@@ -480,39 +480,39 @@
 
 int PMAPI PM_getCOMPort(int port)
 {
-    // TODO: Re-code this to determine real values using the Plug and Play
-    //       manager for the OS.
+    /* TODO: Re-code this to determine real values using the Plug and Play */
+    /*       manager for the OS. */
     switch (port) {
-        case 0: return 0x3F8;
-        case 1: return 0x2F8;
-        }
+	case 0: return 0x3F8;
+	case 1: return 0x2F8;
+	}
     return 0;
 }
 
 int PMAPI PM_getLPTPort(int port)
 {
-    // TODO: Re-code this to determine real values using the Plug and Play
-    //       manager for the OS.
+    /* TODO: Re-code this to determine real values using the Plug and Play */
+    /*       manager for the OS. */
     switch (port) {
-        case 0: return 0x3BC;
-        case 1: return 0x378;
-        case 2: return 0x278;
-        }
+	case 0: return 0x3BC;
+	case 1: return 0x378;
+	case 2: return 0x278;
+	}
     return 0;
 }
 
 ulong PMAPI PM_getPhysicalAddr(void *p)
 {
-        // TODO: This function should find the physical address of a linear
-        //               address.
-        return 0xFFFFFFFFUL;
+	/* TODO: This function should find the physical address of a linear */
+	/*               address. */
+	return 0xFFFFFFFFUL;
 }
 
 void PMAPI _PM_freeMemoryMappings(void)
 {
     int i;
-//    for (i = 0; i < numMappings; i++)
-//        PageFree(maps[i].linear,PR_STATIC);
+/*    for (i = 0; i < numMappings; i++) */
+/*        PageFree(maps[i].linear,PR_STATIC); */
 }
 
 void * PMAPI PM_mapRealPointer(uint r_seg,uint r_off)
@@ -539,16 +539,16 @@
     RMREGS *in,
     RMSREGS *sregs)
 {
-    PCRF            pcrf;     // current client register frame
+    PCRF            pcrf;     /* current client register frame */
 
-    // get pointer to registers
+    /* get pointer to registers */
     pcrf = (PCRF)VDHQuerySysValue(CURRENT_VDM, VDHLSV_PCRF);
 
-    // Note: We could do VDHPushRegs instead but this should be safer as it
-    // doesn't rely on the VDM session having enough free stack space.
-    *saveRegs = *pcrf;        // save all registers
+    /* Note: We could do VDHPushRegs instead but this should be safer as it */
+    /* doesn't rely on the VDM session having enough free stack space. */
+    *saveRegs = *pcrf;        /* save all registers */
 
-    pcrf->crf_eax = in->e.eax;    // load new values
+    pcrf->crf_eax = in->e.eax;    /* load new values */
     pcrf->crf_ebx = in->e.ebx;
     pcrf->crf_ecx = in->e.ecx;
     pcrf->crf_edx = in->e.edx;
@@ -568,12 +568,12 @@
     RMREGS *out,
     RMSREGS *sregs)
 {
-    PCRF            pcrf;     // current client register frame
+    PCRF            pcrf;     /* current client register frame */
 
-    // get pointer to registers
+    /* get pointer to registers */
     pcrf = (PCRF)VDHQuerySysValue(CURRENT_VDM, VDHLSV_PCRF);
 
-    // read new register values
+    /* read new register values */
     out->e.eax = pcrf->crf_eax;
     out->e.ebx = pcrf->crf_ebx;
     out->e.ecx = pcrf->crf_ecx;
@@ -583,7 +583,7 @@
     sregs->es  = pcrf->crf_es;
     sregs->ds  = pcrf->crf_ds;
 
-    // restore original client registers
+    /* restore original client registers */
     *pcrf = *saveRegs;
 }
 
@@ -626,18 +626,18 @@
     TRACE("SDDHELP: Entering PM_callRealMode()\n");
     LoadV86Registers(SSToDS(&saveRegs),regs,sregs);
 
-    // set up return hook for call
+    /* set up return hook for call */
     rc = VDHArmReturnHook(hhookUserReturnHook, VDHARH_CSEIP_HOOK);
 
     VDHResetEventSem(hevFarCallRet);
 
-    // the address is a 16:32 pointer
+    /* the address is a 16:32 pointer */
     OFFSETOF32(fnAddress)  = off;
     SEGMENTOF32(fnAddress) = seg;
     rc = VDHPushFarCall(fnAddress);
     VDHYield(0);
 
-    // wait until the V86 call returns - our return hook posts the semaphore
+    /* wait until the V86 call returns - our return hook posts the semaphore */
     rc = VDHWaitEventSem(hevFarCallRet, SEM_INDEFINITE_WAIT);
 
     ReadV86Registers(SSToDS(&saveRegs),regs,sregs);
@@ -662,13 +662,13 @@
 
     memset(SSToDS(&sregs), 0, sizeof(sregs));
 
-#if 0   // do we need this??
+#if 0   /* do we need this?? */
     /* Disable pass-up to our VDD handler so we directly call BIOS */
     TRACE("SDDHELP: Entering PM_int86()\n");
     if (disableTSRFlag) {
-        oldDisable = *disableTSRFlag;
-        *disableTSRFlag = 0;
-        }
+	oldDisable = *disableTSRFlag;
+	*disableTSRFlag = 0;
+	}
 #endif
 
     LoadV86Registers(SSToDS(&saveRegs), in, SSToDS(&sregs));
@@ -676,20 +676,20 @@
     VDHResetEventSem(hevIRet);
     rc = VDHPushInt(intno);
 
-    // set up return hook for interrupt
+    /* set up return hook for interrupt */
     rc = VDHArmReturnHook(hhookUserIRetHook, VDHARH_NORMAL_IRET);
 
     VDHYield(0);
 
-    // wait until the V86 IRETs - our return hook posts the semaphore
-    rc = VDHWaitEventSem(hevIRet, 5000); //SEM_INDEFINITE_WAIT);
+    /* wait until the V86 IRETs - our return hook posts the semaphore */
+    rc = VDHWaitEventSem(hevIRet, 5000); /*SEM_INDEFINITE_WAIT); */
 
     ReadV86Registers(SSToDS(&saveRegs), out, SSToDS(&sregs));
 
 #if 0
     /* Re-enable pass-up to our VDD handler if previously enabled */
     if (disableTSRFlag)
-        *disableTSRFlag = oldDisable;
+	*disableTSRFlag = oldDisable;
 #endif
 
     TRACE("SDDHELP: Exiting PM_int86()\n");
@@ -716,29 +716,29 @@
     /* Disable pass-up to our VxD handler so we directly call BIOS */
     TRACE("SDDHELP: Entering PM_int86x()\n");
     if (disableTSRFlag) {
-        oldDisable = *disableTSRFlag;
-        *disableTSRFlag = 0;
-        }
+	oldDisable = *disableTSRFlag;
+	*disableTSRFlag = 0;
+	}
 #endif
     LoadV86Registers(SSToDS(&saveRegs), in, sregs);
 
     VDHResetEventSem(hevIRet);
     rc = VDHPushInt(intno);
 
-    // set up return hook for interrupt
+    /* set up return hook for interrupt */
     rc = VDHArmReturnHook(hhookUserIRetHook, VDHARH_NORMAL_IRET);
 
     VDHYield(0);
 
-    // wait until the V86 IRETs - our return hook posts the semaphore
-    rc = VDHWaitEventSem(hevIRet, 5000); //SEM_INDEFINITE_WAIT);
+    /* wait until the V86 IRETs - our return hook posts the semaphore */
+    rc = VDHWaitEventSem(hevIRet, 5000); /*SEM_INDEFINITE_WAIT); */
 
     ReadV86Registers(SSToDS(&saveRegs), out, sregs);
 
 #if 0
     /* Re-enable pass-up to our VxD handler if previously enabled */
     if (disableTSRFlag)
-        *disableTSRFlag = oldDisable;
+	*disableTSRFlag = oldDisable;
 #endif
 
     TRACE("SDDHELP: Exiting PM_int86x()\n");
@@ -776,7 +776,7 @@
     ibool contiguous)
 {
     if (p)
-        VDHFreePages((PVOID)p);
+	VDHFreePages((PVOID)p);
 }
 
 /****************************************************************************
@@ -787,7 +787,7 @@
 {
     ULONG  lockHandle;
 
-    // TODO: the lock handle is essential for the unlock operation!!
+    /* TODO: the lock handle is essential for the unlock operation!! */
     lockHandle = VDHLockMem(p, len, 0, (PVOID)VDHLM_NO_ADDR, NULL);
 
     if (lockHandle != NULL)
@@ -802,8 +802,8 @@
 ****************************************************************************/
 int PMAPI PM_unlockDataPages(void *p,uint len,PM_lockHandle *lh)
 {
-    // TODO: implement - use a table of lock handles?
-    // VDHUnlockPages(lockHandle);
+    /* TODO: implement - use a table of lock handles? */
+    /* VDHUnlockPages(lockHandle); */
     return 0;
 }
 
@@ -867,9 +867,9 @@
     const char *filename,
     PM_findData *findData)
 {
-    // TODO: This function should start a directory enumeration search
-    //       given the filename (with wildcards). The data should be
-    //       converted and returned in the findData standard form.
+    /* TODO: This function should start a directory enumeration search */
+    /*       given the filename (with wildcards). The data should be */
+    /*       converted and returned in the findData standard form. */
     (void)filename;
     (void)findData;
     return PM_FILE_INVALID;
@@ -883,10 +883,10 @@
     void *handle,
     PM_findData *findData)
 {
-    // TODO: This function should find the next file in directory enumeration
-    //       search given the search criteria defined in the call to
-    //       PM_findFirstFile. The data should be converted and returned
-    //       in the findData standard form.
+    /* TODO: This function should find the next file in directory enumeration */
+    /*       search given the search criteria defined in the call to */
+    /*       PM_findFirstFile. The data should be converted and returned */
+    /*       in the findData standard form. */
     (void)handle;
     (void)findData;
     return false;
@@ -899,8 +899,8 @@
 void PMAPI PM_findClose(
     void *handle)
 {
-    // TODO: This function should close the find process. This may do
-    //       nothing for some OS'es.
+    /* TODO: This function should close the find process. This may do */
+    /*       nothing for some OS'es. */
     (void)handle;
 }
 
@@ -920,7 +920,7 @@
 ibool PMAPI PM_driveValid(
     char drive)
 {
-    // Not applicable in a VDD
+    /* Not applicable in a VDD */
     (void)drive;
     return false;
 }
@@ -936,7 +936,7 @@
     char *dir,
     int len)
 {
-    // Not applicable in a VDD
+    /* Not applicable in a VDD */
     (void)drive;
     (void)dir;
     (void)len;
@@ -970,7 +970,7 @@
     const char *filename,
     uint attrib)
 {
-    // TODO: Implement this ?
+    /* TODO: Implement this ? */
     (void)filename;
     (void)attrib;
     PM_fatalError("PM_setFileAttr not implemented!");
@@ -983,7 +983,7 @@
 uint PMAPI PM_getFileAttr(
     const char *filename)
 {
-    // TODO: Implement this ?
+    /* TODO: Implement this ? */
     (void)filename;
     PM_fatalError("PM_getFileAttr not implemented!");
     return 0;
@@ -996,7 +996,7 @@
 ibool PMAPI PM_mkdir(
     const char *filename)
 {
-    // TODO: Implement this ?
+    /* TODO: Implement this ? */
     (void)filename;
     PM_fatalError("PM_mkdir not implemented!");
     return false;
@@ -1009,7 +1009,7 @@
 ibool PMAPI PM_rmdir(
     const char *filename)
 {
-    // TODO: Implement this ?
+    /* TODO: Implement this ? */
     (void)filename;
     PM_fatalError("PM_rmdir not implemented!");
     return false;
@@ -1024,7 +1024,7 @@
     ibool gmTime,
     PM_time *time)
 {
-    // TODO: Implement this ?
+    /* TODO: Implement this ? */
     (void)filename;
     (void)gmTime;
     (void)time;
@@ -1041,7 +1041,7 @@
     ibool gmTime,
     PM_time *time)
 {
-    // TODO: Implement this ?
+    /* TODO: Implement this ? */
     (void)filename;
     (void)gmTime;
     (void)time;

diff --git a/board/MAI/bios_emulator/scitech/src/pm/vdd/vflat.c b/board/MAI/bios_emulator/scitech/src/pm/vdd/vflat.c
index 10c63e3..2163928 100644
--- a/board/MAI/bios_emulator/scitech/src/pm/vdd/vflat.c
+++ b/board/MAI/bios_emulator/scitech/src/pm/vdd/vflat.c

@@ -32,12 +32,12 @@
 
 ibool PMAPI VF_available(void)
 {
-        return false;
+	return false;
 }
 
 void * PMAPI VF_init(ulong baseAddr,int bankSize,int codeLen,void *bankFunc)
 {
-        return NULL;
+	return NULL;
 }
 
 void PMAPI VF_exit(void)

diff --git a/board/MAI/bios_emulator/scitech/src/pm/vxd/fileio.c b/board/MAI/bios_emulator/scitech/src/pm/vxd/fileio.c
index e2ff585..3c6ce99 100644
--- a/board/MAI/bios_emulator/scitech/src/pm/vxd/fileio.c
+++ b/board/MAI/bios_emulator/scitech/src/pm/vxd/fileio.c

@@ -47,62 +47,62 @@
     long    oldpos;
 
     if (f) {
-        f->offset = 0;
-        f->text = (mode[1] == 't' || mode[2] == 't');
-        f->writemode = (mode[0] == 'w') || (mode[0] == 'a');
-        if (initComplete) {
-            WORD    omode,error;
-            BYTE    action;
+	f->offset = 0;
+	f->text = (mode[1] == 't' || mode[2] == 't');
+	f->writemode = (mode[0] == 'w') || (mode[0] == 'a');
+	if (initComplete) {
+	    WORD    omode,error;
+	    BYTE    action;
 
-            if (mode[0] == 'r') {
-                omode = OPEN_ACCESS_READONLY | OPEN_SHARE_COMPATIBLE;
-                action = ACTION_IFEXISTS_OPEN | ACTION_IFNOTEXISTS_FAIL;
-                }
-            else if (mode[0] == 'w') {
-                omode = OPEN_ACCESS_WRITEONLY | OPEN_SHARE_COMPATIBLE;
-                action = ACTION_IFEXISTS_TRUNCATE | ACTION_IFNOTEXISTS_CREATE;
-                }
-            else {
-                omode = OPEN_ACCESS_READWRITE | OPEN_SHARE_COMPATIBLE;
-                action = ACTION_IFEXISTS_OPEN | ACTION_IFNOTEXISTS_CREATE;
-                }
-            f->handle = (int)R0_OpenCreateFile(false,(char*)filename,omode,ATTR_NORMAL,action,0,&error,&action);
-            if (f->handle == 0) {
-                PM_free(f);
-                return NULL;
-                }
-            f->filesize = R0_GetFileSize((HANDLE)f->handle,&error);
-            if (mode[0] == 'a')
-                fseek(f,0,2);
-            }
-        else {
-            int oflag,pmode;
+	    if (mode[0] == 'r') {
+		omode = OPEN_ACCESS_READONLY | OPEN_SHARE_COMPATIBLE;
+		action = ACTION_IFEXISTS_OPEN | ACTION_IFNOTEXISTS_FAIL;
+		}
+	    else if (mode[0] == 'w') {
+		omode = OPEN_ACCESS_WRITEONLY | OPEN_SHARE_COMPATIBLE;
+		action = ACTION_IFEXISTS_TRUNCATE | ACTION_IFNOTEXISTS_CREATE;
+		}
+	    else {
+		omode = OPEN_ACCESS_READWRITE | OPEN_SHARE_COMPATIBLE;
+		action = ACTION_IFEXISTS_OPEN | ACTION_IFNOTEXISTS_CREATE;
+		}
+	    f->handle = (int)R0_OpenCreateFile(false,(char*)filename,omode,ATTR_NORMAL,action,0,&error,&action);
+	    if (f->handle == 0) {
+		PM_free(f);
+		return NULL;
+		}
+	    f->filesize = R0_GetFileSize((HANDLE)f->handle,&error);
+	    if (mode[0] == 'a')
+		fseek(f,0,2);
+	    }
+	else {
+	    int oflag,pmode;
 
-            if (mode[0] == 'r') {
-                pmode = _S_IREAD;
-                oflag = _O_RDONLY;
-                }
-            else if (mode[0] == 'w') {
-                pmode = _S_IWRITE;
-                oflag = _O_WRONLY | _O_CREAT | _O_TRUNC;
-                }
-            else {
-                pmode = _S_IWRITE;
-                oflag = _O_RDWR | _O_CREAT | _O_APPEND;
-                }
-            if (f->text)
-                oflag |= _O_TEXT;
-            else
-                oflag |= _O_BINARY;
-            if ((f->handle = i_open(filename,oflag,pmode)) == -1) {
-                PM_free(f);
-                return NULL;
-                }
-            oldpos = i_lseek(f->handle,0,1);
-            f->filesize = i_lseek(f->handle,0,2);
-            i_lseek(f->handle,oldpos,0);
-            }
-        }
+	    if (mode[0] == 'r') {
+		pmode = _S_IREAD;
+		oflag = _O_RDONLY;
+		}
+	    else if (mode[0] == 'w') {
+		pmode = _S_IWRITE;
+		oflag = _O_WRONLY | _O_CREAT | _O_TRUNC;
+		}
+	    else {
+		pmode = _S_IWRITE;
+		oflag = _O_RDWR | _O_CREAT | _O_APPEND;
+		}
+	    if (f->text)
+		oflag |= _O_TEXT;
+	    else
+		oflag |= _O_BINARY;
+	    if ((f->handle = i_open(filename,oflag,pmode)) == -1) {
+		PM_free(f);
+		return NULL;
+		}
+	    oldpos = i_lseek(f->handle,0,1);
+	    f->filesize = i_lseek(f->handle,0,2);
+	    i_lseek(f->handle,oldpos,0);
+	    }
+	}
     return f;
 }
 
@@ -125,27 +125,27 @@
     int     readbytes,totalbytes = 0;
 
     while (bytes > 0x10000) {
-        if (initComplete) {
-            readbytes  = R0_ReadFile(false,(HANDLE)f->handle,buf,0x8000,f->offset,&error);
-            readbytes += R0_ReadFile(false,(HANDLE)f->handle,buf+0x8000,0x8000,f->offset+0x8000,&error);
-            }
-        else {
-            readbytes  = i_read(f->handle,buf,0x8000);
-            readbytes += i_read(f->handle,buf+0x8000,0x8000);
-            }
-        totalbytes += readbytes;
-        f->offset += readbytes;
-        buf += 0x10000;
-        bytes -= 0x10000;
-        }
+	if (initComplete) {
+	    readbytes  = R0_ReadFile(false,(HANDLE)f->handle,buf,0x8000,f->offset,&error);
+	    readbytes += R0_ReadFile(false,(HANDLE)f->handle,buf+0x8000,0x8000,f->offset+0x8000,&error);
+	    }
+	else {
+	    readbytes  = i_read(f->handle,buf,0x8000);
+	    readbytes += i_read(f->handle,buf+0x8000,0x8000);
+	    }
+	totalbytes += readbytes;
+	f->offset += readbytes;
+	buf += 0x10000;
+	bytes -= 0x10000;
+	}
     if (bytes) {
-        if (initComplete)
-            readbytes = R0_ReadFile(false,(HANDLE)f->handle,buf,bytes,f->offset,&error);
-        else
-            readbytes = i_read(f->handle,buf,bytes);
-        totalbytes += readbytes;
-        f->offset += readbytes;
-        }
+	if (initComplete)
+	    readbytes = R0_ReadFile(false,(HANDLE)f->handle,buf,bytes,f->offset,&error);
+	else
+	    readbytes = i_read(f->handle,buf,bytes);
+	totalbytes += readbytes;
+	f->offset += readbytes;
+	}
     return totalbytes / size;
 }
 
@@ -168,29 +168,29 @@
     int         writtenbytes,totalbytes = 0;
 
     if (!f->writemode)
-        return 0;
+	return 0;
     while (bytes > 0x10000) {
-        if (initComplete) {
-            writtenbytes  = R0_WriteFile(false,(HANDLE)f->handle,buf,0x8000,f->offset,&error);
-            writtenbytes += R0_WriteFile(false,(HANDLE)f->handle,buf+0x8000,0x8000,f->offset+0x8000,&error);
-            }
-        else {
-            writtenbytes  = i_write(f->handle,buf,0x8000);
-            writtenbytes += i_write(f->handle,buf+0x8000,0x8000);
-            }
-        totalbytes += writtenbytes;
-        f->offset += writtenbytes;
-        buf += 0x10000;
-        bytes -= 0x10000;
-        }
+	if (initComplete) {
+	    writtenbytes  = R0_WriteFile(false,(HANDLE)f->handle,buf,0x8000,f->offset,&error);
+	    writtenbytes += R0_WriteFile(false,(HANDLE)f->handle,buf+0x8000,0x8000,f->offset+0x8000,&error);
+	    }
+	else {
+	    writtenbytes  = i_write(f->handle,buf,0x8000);
+	    writtenbytes += i_write(f->handle,buf+0x8000,0x8000);
+	    }
+	totalbytes += writtenbytes;
+	f->offset += writtenbytes;
+	buf += 0x10000;
+	bytes -= 0x10000;
+	}
     if (initComplete)
-        writtenbytes = R0_WriteFile(false,(HANDLE)f->handle,buf,bytes,f->offset,&error);
+	writtenbytes = R0_WriteFile(false,(HANDLE)f->handle,buf,bytes,f->offset,&error);
     else
-        writtenbytes = i_write(f->handle,buf,bytes);
+	writtenbytes = i_write(f->handle,buf,bytes);
     totalbytes += writtenbytes;
     f->offset += writtenbytes;
     if (f->offset > f->filesize)
-        f->filesize = f->offset;
+	f->filesize = f->offset;
     return totalbytes / size;
 }
 
@@ -201,7 +201,7 @@
 int fflush(
     FILE *f)
 {
-    // Nothing to do since we are not doing buffered file I/O
+    /* Nothing to do since we are not doing buffered file I/O */
     (void)f;
     return 0;
 }
@@ -216,13 +216,13 @@
     int whence)
 {
     if (whence == 0)
-        f->offset = offset;
+	f->offset = offset;
     else if (whence == 1)
-        f->offset += offset;
+	f->offset += offset;
     else if (whence == 2)
-        f->offset = f->filesize + offset;
+	f->offset = f->filesize + offset;
     if (!initComplete)
-        i_lseek(f->handle,f->offset,0);
+	i_lseek(f->handle,f->offset,0);
     return 0;
 }
 
@@ -258,19 +258,19 @@
     int     len;
     char    *cs;
 
-    // Read the entire buffer into memory (our functions are unbuffered!)
+    /* Read the entire buffer into memory (our functions are unbuffered!) */
     if ((len = fread(s,1,n,f)) == 0)
-        return NULL;
+	return NULL;
 
-    // Search for '\n' or end of string
+    /* Search for '\n' or end of string */
     if (n > len)
-        n = len;
+	n = len;
     cs = s;
     while (--n > 0) {
-        if (*cs == '\n')
-            break;
-        cs++;
-        }
+	if (*cs == '\n')
+	    break;
+	cs++;
+	}
     *cs = '\0';
     return s;
 }
@@ -296,10 +296,9 @@
     WORD error;
 
     if (initComplete)
-        R0_CloseFile((HANDLE)f->handle,&error);
+	R0_CloseFile((HANDLE)f->handle,&error);
     else
-        i_close(f->handle);
+	i_close(f->handle);
     PM_free(f);
     return 0;
 }
-

diff --git a/board/MAI/bios_emulator/scitech/src/pm/vxd/pm.c b/board/MAI/bios_emulator/scitech/src/pm/vxd/pm.c
index 8d00df9..4cb7f19 100644
--- a/board/MAI/bios_emulator/scitech/src/pm/vxd/pm.c
+++ b/board/MAI/bios_emulator/scitech/src/pm/vxd/pm.c

@@ -105,7 +105,7 @@
 {
     void *p = PM_mallocShared(nelem * size);
     if (p)
-        memset(p,0,nelem * size);
+	memset(p,0,nelem * size);
     return p;
 }
 
@@ -119,9 +119,9 @@
 {
     void *p = PM_mallocShared(size);
     if (p) {
-        memcpy(p,ptr,size);
-        PM_freeShared(ptr);
-        }
+	memcpy(p,ptr,size);
+	PM_freeShared(ptr);
+	}
     return p;
 }
 
@@ -166,9 +166,9 @@
 {
     uint pos = strlen(s);
     if (s[pos-1] != '\\') {
-        s[pos] = '\\';
-        s[pos+1] = '\0';
-        }
+	s[pos] = '\\';
+	s[pos+1] = '\0';
+	}
 }
 
 void PMAPI PM_setFatalErrorCleanup(
@@ -180,7 +180,7 @@
 void PMAPI PM_fatalError(const char *msg)
 {
     if (fatalErrorCleanup)
-        fatalErrorCleanup();
+	fatalErrorCleanup();
     Fatal_Error_Handler(msg,0);
 }
 
@@ -204,11 +204,11 @@
      * transfer buffer to return, so we fail the call.
      */
     if (_PM_rmBufAddr) {
-        *len = VESA_BUF_SIZE;
-        *rseg = (ulong)(_PM_rmBufAddr) >> 4;
-        *roff = (ulong)(_PM_rmBufAddr) & 0xF;
-        return _PM_rmBufAddr;
-        }
+	*len = VESA_BUF_SIZE;
+	*rseg = (ulong)(_PM_rmBufAddr) >> 4;
+	*roff = (ulong)(_PM_rmBufAddr) & 0xF;
+	return _PM_rmBufAddr;
+	}
     return NULL;
 }
 
@@ -276,10 +276,10 @@
 
     memset(value,0,sizeof(value));
     if (RegOpenKey(HKEY_LOCAL_MACHINE,szKey,&hKey) == ERROR_SUCCESS) {
-        if (RegQueryValueEx(hKey,(PCHAR)szValue,(ulong*)NULL,(ulong*)&type,value,(ulong*)&size) == ERROR_SUCCESS)
-            status = true;
-        RegCloseKey(hKey);
-        }
+	if (RegQueryValueEx(hKey,(PCHAR)szValue,(ulong*)NULL,(ulong*)&type,value,(ulong*)&size) == ERROR_SUCCESS)
+	    status = true;
+	RegCloseKey(hKey);
+	}
     return status;
 }
 
@@ -288,12 +288,12 @@
     static char path[256];
 
     if (strlen(_PM_nucleusPath) > 0) {
-        strcpy(path,_PM_nucleusPath);
-        PM_backslash(path);
-        return path;
-        }
+	strcpy(path,_PM_nucleusPath);
+	PM_backslash(path);
+	return path;
+	}
     if (!REG_queryString(szWindowsKey,szSystemRoot,path,sizeof(path)))
-        strcpy(path,"c:\\windows");
+	strcpy(path,"c:\\windows");
     PM_backslash(path);
     strcat(path,"system\\nucleus");
     return path;
@@ -315,7 +315,7 @@
 {
     static char name[256];
     if (REG_queryString(szMachineNameKey,szMachineName,name,sizeof(name)))
-        return name;
+	return name;
     return "Unknown";
 }
 
@@ -352,7 +352,7 @@
 
 void PMAPI PM_setSuspendAppCallback(
     int (_ASMAPIP saveState)(
-        int flags))
+	int flags))
 {
     /* Unused in VxDs */
 }
@@ -405,16 +405,16 @@
 
     /* First find a free slot in our shared memory table */
     for (i = 0; i < MAX_MEMORY_SHARED; i++) {
-        if (shared[i].linear == 0)
-            break;
-        }
+	if (shared[i].linear == 0)
+	    break;
+	}
     if (i < MAX_MEMORY_SHARED) {
-        PageAllocate(nPages,PG_SYS,0,0,0,0,NULL,0,&hMem,&shared[i].linear);
-        shared[i].npages = nPages;
-        pgNum = (ulong)shared[i].linear >> 12;
-        shared[i].global = LinPageLock(pgNum,nPages,PAGEMAPGLOBAL);
-        return (void*)shared[i].global;
-        }
+	PageAllocate(nPages,PG_SYS,0,0,0,0,NULL,0,&hMem,&shared[i].linear);
+	shared[i].npages = nPages;
+	pgNum = (ulong)shared[i].linear >> 12;
+	shared[i].global = LinPageLock(pgNum,nPages,PAGEMAPGLOBAL);
+	return (void*)shared[i].global;
+	}
     return NULL;
 }
 
@@ -428,13 +428,13 @@
 
     /* Find a shared memory block in our table and free it */
     for (i = 0; i < MAX_MEMORY_SHARED; i++) {
-        if (shared[i].global == (ulong)p) {
-            LinPageUnLock(shared[i].global >> 12,shared[i].npages,PAGEMAPGLOBAL);
-            PageFree((ulong)shared[i].linear,0);
-            shared[i].linear = 0;
-            break;
-            }
-        }
+	if (shared[i].global == (ulong)p) {
+	    LinPageUnLock(shared[i].global >> 12,shared[i].npages,PAGEMAPGLOBAL);
+	    PageFree((ulong)shared[i].linear,0);
+	    shared[i].linear = 0;
+	    break;
+	    }
+	}
 }
 
 /****************************************************************************
@@ -455,7 +455,7 @@
     void *mappedBIOS,
     ulong BIOSLen)
 {
-    // TODO: Figure out how to do this
+    /* TODO: Figure out how to do this */
     return false;
 }
 
@@ -485,29 +485,29 @@
     int     i,ppage,flags;
 
     if (base < 0x100000) {
-        /* Windows 9x is zero based for the first meg of memory */
-        return base;
-        }
+	/* Windows 9x is zero based for the first meg of memory */
+	return base;
+	}
     ppage = base >> 12;
     *npages = (length + (base & 0xFFF) + 4095) >> 12;
     flags = PR_FIXED | PR_STATIC;
     if (base == 0xA0000) {
-        /* We require the linear address to be aligned to a 64Kb boundary
-         * for mapping the banked framebuffer (so we can do efficient
-         * carry checking for bank changes in the assembler code). The only
-         * way to ensure this is to force the linear address to be aligned
-         * to a 4Mb boundary.
-         */
-        flags |= PR_4MEG;
-        }
+	/* We require the linear address to be aligned to a 64Kb boundary
+	 * for mapping the banked framebuffer (so we can do efficient
+	 * carry checking for bank changes in the assembler code). The only
+	 * way to ensure this is to force the linear address to be aligned
+	 * to a 4Mb boundary.
+	 */
+	flags |= PR_4MEG;
+	}
     if ((linear = (ulong)PageReserve(PR_SYSTEM,*npages,flags)) == (ulong)-1)
-        return 0xFFFFFFFF;
+	return 0xFFFFFFFF;
     if (!PageCommitPhys(linear >> 12,*npages,ppage,PC_INCR | PC_USER | PC_WRITEABLE))
-        return 0xFFFFFFFF;
+	return 0xFFFFFFFF;
     return linear + (base & 0xFFF);
 }
 
-// Page table flags
+/* Page table flags */
 
 #define PAGE_FLAGS_PRESENT			0x00000001
 #define PAGE_FLAGS_WRITEABLE		0x00000002
@@ -535,9 +535,9 @@
 sticky paws.
 
 NOTE:   If the memory is not expected to be cached, this function will
-        directly re-program the PCD (Page Cache Disable) bit in the
-        page tables. There does not appear to be a mechanism in the VMM
-        to control this bit via the regular interface.
+	directly re-program the PCD (Page Cache Disable) bit in the
+	page tables. There does not appear to be a mechanism in the VMM
+	to control this bit via the regular interface.
 ****************************************************************************/
 void * PMAPI PM_mapPhysicalAddr(
     ulong base,
@@ -552,11 +552,11 @@
      * a region of memory that will serve this purpose.
      */
     for (i = 0; i < numMappings; i++) {
-        if (maps[i].physical == base && maps[i].length == length && maps[i].isCached == isCached)
-            return (void*)maps[i].linear;
-        }
+	if (maps[i].physical == base && maps[i].length == length && maps[i].isCached == isCached)
+	    return (void*)maps[i].linear;
+	}
     if (numMappings == MAX_MEMORY_MAPPINGS)
-        return NULL;
+	return NULL;
 
     /* We did not find any previously mapped memory region, so maps it in.
      * Note that we do not use MapPhysToLinear, since this function appears
@@ -564,7 +564,7 @@
      * Hence we use PageReserve and PageCommitPhys.
      */
     if ((linear = _PM_mapPhysicalToLinear(base,limit,&npages)) == 0xFFFFFFFF)
-        return NULL;
+	return NULL;
     maps[numMappings].physical = base;
     maps[numMappings].length = length;
     maps[numMappings].linear = linear;
@@ -574,34 +574,34 @@
 
     /* Finally disable caching where necessary */
     if (!isCached && (PDB = _PM_getPDB()) != 0) {
-        int     startPDB,endPDB,iPDB,startPage,endPage,start,end,iPage;
-        ulong   pageTable,*pPageTable;
-        pPDB = (ulong*)_PM_mapPhysicalToLinear(PDB,0xFFF,&npages);
-        if (pPDB) {
-            startPDB = (linear >> 22) & 0x3FF;
-            startPage = (linear >> 12) & 0x3FF;
-            endPDB = ((linear+limit) >> 22) & 0x3FF;
-            endPage = ((linear+limit) >> 12) & 0x3FF;
-            for (iPDB = startPDB; iPDB <= endPDB; iPDB++) {
-                // Set the bits in the page directory entry - required as per
-                // Pentium 4 manual. This also takes care of the 4MB page entries
-                pPDB[iPDB] = pPDB[iPDB] |= (PAGE_FLAGS_WRITE_THROUGH | PAGE_FLAGS_CACHE_DISABLE);
-                if (!(pPDB[iPDB] & PAGE_FLAGS_4MB)) {
-                    // If we are dealing with 4KB pages then we need to iterate
-                    // through each of the page table entries
-                    pageTable = pPDB[iPDB] & ~0xFFF;
-                    pPageTable = (ulong*)_PM_mapPhysicalToLinear(pageTable,0xFFF,&npages);
-                    start = (iPDB == startPDB) ? startPage : 0;
-                    end = (iPDB == endPDB) ? endPage : 0x3FF;
-                    for (iPage = start; iPage <= end; iPage++)
-                        pPageTable[iPage] |= (PAGE_FLAGS_WRITE_THROUGH | PAGE_FLAGS_CACHE_DISABLE);
-                    PageFree((ulong)pPageTable,PR_STATIC);
-                    }
-                }
-            PageFree((ulong)pPDB,PR_STATIC);
-            PM_flushTLB();
-            }
-        }
+	int     startPDB,endPDB,iPDB,startPage,endPage,start,end,iPage;
+	ulong   pageTable,*pPageTable;
+	pPDB = (ulong*)_PM_mapPhysicalToLinear(PDB,0xFFF,&npages);
+	if (pPDB) {
+	    startPDB = (linear >> 22) & 0x3FF;
+	    startPage = (linear >> 12) & 0x3FF;
+	    endPDB = ((linear+limit) >> 22) & 0x3FF;
+	    endPage = ((linear+limit) >> 12) & 0x3FF;
+	    for (iPDB = startPDB; iPDB <= endPDB; iPDB++) {
+		/* Set the bits in the page directory entry - required as per */
+		/* Pentium 4 manual. This also takes care of the 4MB page entries */
+		pPDB[iPDB] = pPDB[iPDB] |= (PAGE_FLAGS_WRITE_THROUGH | PAGE_FLAGS_CACHE_DISABLE);
+		if (!(pPDB[iPDB] & PAGE_FLAGS_4MB)) {
+		    /* If we are dealing with 4KB pages then we need to iterate */
+		    /* through each of the page table entries */
+		    pageTable = pPDB[iPDB] & ~0xFFF;
+		    pPageTable = (ulong*)_PM_mapPhysicalToLinear(pageTable,0xFFF,&npages);
+		    start = (iPDB == startPDB) ? startPage : 0;
+		    end = (iPDB == endPDB) ? endPage : 0x3FF;
+		    for (iPage = start; iPage <= end; iPage++)
+			pPageTable[iPage] |= (PAGE_FLAGS_WRITE_THROUGH | PAGE_FLAGS_CACHE_DISABLE);
+		    PageFree((ulong)pPageTable,PR_STATIC);
+		    }
+		}
+	    PageFree((ulong)pPDB,PR_STATIC);
+	    PM_flushTLB();
+	    }
+	}
     return (void*)linear;
 }
 
@@ -619,26 +619,26 @@
 
 int PMAPI PM_getCOMPort(int port)
 {
-    // TODO: Re-code this to determine real values using the Plug and Play
-    //       manager for the OS.
+    /* TODO: Re-code this to determine real values using the Plug and Play */
+    /*       manager for the OS. */
     switch (port) {
-        case 0: return 0x3F8;
-        case 1: return 0x2F8;
-        case 2: return 0x3E8;
-        case 3: return 0x2E8;
-        }
+	case 0: return 0x3F8;
+	case 1: return 0x2F8;
+	case 2: return 0x3E8;
+	case 3: return 0x2E8;
+	}
     return 0;
 }
 
 int PMAPI PM_getLPTPort(int port)
 {
-    // TODO: Re-code this to determine real values using the Plug and Play
-    //       manager for the OS.
+    /* TODO: Re-code this to determine real values using the Plug and Play */
+    /*       manager for the OS. */
     switch (port) {
-        case 0: return 0x3BC;
-        case 1: return 0x378;
-        case 2: return 0x278;
-        }
+	case 0: return 0x3BC;
+	case 1: return 0x378;
+	case 2: return 0x278;
+	}
     return 0;
 }
 
@@ -647,18 +647,18 @@
 {
     DWORD   pte;
 
-    // Touch the memory before calling CopyPageTable. For some reason
-    // we need to do this on Windows 9x, otherwise the memory may not
-    // be paged in correctly. Of course if the passed in pointer is
-    // invalid, this function will fault, but we shouldn't be passed bogus
-    // pointers anyway ;-)
+    /* Touch the memory before calling CopyPageTable. For some reason */
+    /* we need to do this on Windows 9x, otherwise the memory may not */
+    /* be paged in correctly. Of course if the passed in pointer is */
+    /* invalid, this function will fault, but we shouldn't be passed bogus */
+    /* pointers anyway ;-) */
     pte = *((ulong*)p);
 
-    // Return assembled address value only if VMM service succeeds
+    /* Return assembled address value only if VMM service succeeds */
     if (CopyPageTable(((DWORD)p) >> 12, 1, (PVOID*)&pte, 0))
-        return (pte & ~0xFFF) | (((DWORD)p) & 0xFFF);
+	return (pte & ~0xFFF) | (((DWORD)p) & 0xFFF);
 
-    // Return failure to the caller!
+    /* Return failure to the caller! */
     return 0xFFFFFFFFUL;
 }
 
@@ -671,10 +671,10 @@
     ulong   linear = (ulong)p & ~0xFFF;
 
     for (i = (length + 0xFFF) >> 12; i > 0; i--) {
-        if ((*physAddress++ = PM_getPhysicalAddr((void*)linear)) == 0xFFFFFFFF)
-            return false;
-        linear += 4096;
-        }
+	if ((*physAddress++ = PM_getPhysicalAddr((void*)linear)) == 0xFFFFFFFF)
+	    return false;
+	linear += 4096;
+	}
     return true;
 }
 
@@ -682,7 +682,7 @@
 {
     int i;
     for (i = 0; i < numMappings; i++)
-        PageFree(maps[i].linear,PR_STATIC);
+	PageFree(maps[i].linear,PR_STATIC);
 }
 
 void * PMAPI PM_mapRealPointer(
@@ -777,7 +777,7 @@
      * loaded, and not statically loaded.
      */
     if (!_PM_haveBIOS)
-        return;
+	return;
 
     _TRACE("SDDHELP: Entering PM_callRealMode()\n");
     Begin_Nest_V86_Exec();
@@ -807,16 +807,16 @@
      * loaded, and not statically loaded.
      */
     if (!_PM_haveBIOS) {
-        *out = *in;
-        return out->x.ax;
-        }
+	*out = *in;
+	return out->x.ax;
+	}
 
     /* Disable pass-up to our VxD handler so we directly call BIOS */
     _TRACE("SDDHELP: Entering PM_int86()\n");
     if (disableTSRFlag) {
-        oldDisable = *disableTSRFlag;
-        *disableTSRFlag = 0;
-        }
+	oldDisable = *disableTSRFlag;
+	*disableTSRFlag = 0;
+	}
     Begin_Nest_V86_Exec();
     LoadV86Registers(&saveRegs,in,&sregs);
     Exec_Int(intno);
@@ -825,7 +825,7 @@
 
     /* Re-enable pass-up to our VxD handler if previously enabled */
     if (disableTSRFlag)
-        *disableTSRFlag = oldDisable;
+	*disableTSRFlag = oldDisable;
 
     _TRACE("SDDHELP: Exiting PM_int86()\n");
     return out->x.ax;
@@ -849,16 +849,16 @@
      * loaded, and not statically loaded.
      */
     if (!_PM_haveBIOS) {
-        *out = *in;
-        return out->x.ax;
-        }
+	*out = *in;
+	return out->x.ax;
+	}
 
     /* Disable pass-up to our VxD handler so we directly call BIOS */
     _TRACE("SDDHELP: Entering PM_int86x()\n");
     if (disableTSRFlag) {
-        oldDisable = *disableTSRFlag;
-        *disableTSRFlag = 0;
-        }
+	oldDisable = *disableTSRFlag;
+	*disableTSRFlag = 0;
+	}
     Begin_Nest_V86_Exec();
     LoadV86Registers(&saveRegs,in,sregs);
     Exec_Int(intno);
@@ -867,7 +867,7 @@
 
     /* Re-enable pass-up to our VxD handler if previously enabled */
     if (disableTSRFlag)
-        *disableTSRFlag = oldDisable;
+	*disableTSRFlag = oldDisable;
 
     _TRACE("SDDHELP: Exiting PM_int86x()\n");
     return out->x.ax;
@@ -900,14 +900,14 @@
     DWORD       maxPhys = below16M ? 0x00FFFFFF : 0xFFFFFFFF;
     void        *p;
 
-    // TODO: This may need to be modified if the memory needs to be globally
-    //       accessible. Check how we implemented PM_mallocShared() as we
-    //       may need to do something similar in here.
+    /* TODO: This may need to be modified if the memory needs to be globally */
+    /*       accessible. Check how we implemented PM_mallocShared() as we */
+    /*       may need to do something similar in here. */
     PageAllocate(nPages,PG_SYS,0,0,0,maxPhys,physAddr,flags,&hMem,&p);
 
-    // TODO: We may need to modify the memory blocks to disable caching via
-    //       the page tables (PCD|PWT) since DMA memory blocks *cannot* be
-    //       cached!
+    /* TODO: We may need to modify the memory blocks to disable caching via */
+    /*       the page tables (PCD|PWT) since DMA memory blocks *cannot* be */
+    /*       cached! */
     return p;
 }
 
@@ -921,7 +921,7 @@
     ibool contiguous)
 {
     if (p)
-        PageFree((ulong)p,0);
+	PageFree((ulong)p,0);
 }
 
 /****************************************************************************
@@ -934,9 +934,9 @@
     MEMHANDLE   hMem;
     void        *p;
 
-    // TODO: This will need to be modified if the memory needs to be globally
-    //       accessible. Check how we implemented PM_mallocShared() as we
-    //       may need to do something similar in here.
+    /* TODO: This will need to be modified if the memory needs to be globally */
+    /*       accessible. Check how we implemented PM_mallocShared() as we */
+    /*       may need to do something similar in here. */
     PageAllocate(1,PG_SYS,0,0,0,0,0,PAGEFIXED,&hMem,&p);
     return p;
 }
@@ -949,7 +949,7 @@
     void *p)
 {
     if (p)
-        PageFree((ulong)p,0);
+	PageFree((ulong)p,0);
 }
 
 /****************************************************************************
@@ -1012,41 +1012,41 @@
     int frequency)
 {
     static short convert[] = {
-        8192,
-        4096,
-        2048,
-        1024,
-        512,
-        256,
-        128,
-        64,
-        32,
-        16,
-        8,
-        4,
-        2,
-        -1,
-        };
+	8192,
+	4096,
+	2048,
+	1024,
+	512,
+	256,
+	128,
+	64,
+	32,
+	16,
+	8,
+	4,
+	2,
+	-1,
+	};
     int i;
 
     /* First clear any pending RTC timeout if not cleared */
     _PM_readCMOS(0x0C);
     if (frequency == 0) {
-        /* Disable RTC timout */
-        _PM_writeCMOS(0x0A,_PM_oldCMOSRegA);
-        _PM_writeCMOS(0x0B,_PM_oldCMOSRegB & 0x0F);
-        }
+	/* Disable RTC timout */
+	_PM_writeCMOS(0x0A,_PM_oldCMOSRegA);
+	_PM_writeCMOS(0x0B,_PM_oldCMOSRegB & 0x0F);
+	}
     else {
-        /* Convert frequency value to RTC clock indexes */
-        for (i = 0; convert[i] != -1; i++) {
-            if (convert[i] == frequency)
-                break;
-            }
+	/* Convert frequency value to RTC clock indexes */
+	for (i = 0; convert[i] != -1; i++) {
+	    if (convert[i] == frequency)
+		break;
+	    }
 
-        /* Set RTC timout value and enable timeout */
-        _PM_writeCMOS(0x0A,0x20 | (i+3));
-        _PM_writeCMOS(0x0B,(_PM_oldCMOSRegB & 0x0F) | 0x40);
-        }
+	/* Set RTC timout value and enable timeout */
+	_PM_writeCMOS(0x0A,0x20 | (i+3));
+	_PM_writeCMOS(0x0B,(_PM_oldCMOSRegB & 0x0F) | 0x40);
+	}
 }
 
 /****************************************************************************
@@ -1072,11 +1072,11 @@
      * new one comes along; if that happens we ignore the old one).
      */
     if (!inside) {
-        inside = 1;
-        enable();
-        _PM_rtcHandler();
-        inside = 0;
-        }
+	inside = 1;
+	enable();
+	_PM_rtcHandler();
+	inside = 0;
+	}
     return TRUE;
 }
 
@@ -1106,7 +1106,7 @@
     IRQdesc.VID_IRET_Proc       = 0;
     IRQdesc.VID_IRET_Time_Out   = 500;
     if ((RTCIRQHandle = VPICD_Virtualize_IRQ(&IRQdesc)) == 0)
-        return false;
+	return false;
 
     /* Program the real time clock default frequency */
     PM_setRealTimeClockFrequency(frequency);
@@ -1123,15 +1123,15 @@
 void PMAPI PM_restoreRealTimeClockHandler(void)
 {
     if (RTCIRQHandle) {
-        /* Restore CMOS registers and mask RTC clock */
-        _PM_writeCMOS(0x0A,_PM_oldCMOSRegA);
-        _PM_writeCMOS(0x0B,_PM_oldCMOSRegB);
+	/* Restore CMOS registers and mask RTC clock */
+	_PM_writeCMOS(0x0A,_PM_oldCMOSRegA);
+	_PM_writeCMOS(0x0B,_PM_oldCMOSRegB);
 
-        /* Restore the interrupt vector */
-        VPICD_Set_Auto_Masking(RTCIRQHandle);
-        VPICD_Force_Default_Behavior(RTCIRQHandle);
-        RTCIRQHandle = 0;
-        }
+	/* Restore the interrupt vector */
+	VPICD_Set_Auto_Masking(RTCIRQHandle);
+	VPICD_Force_Default_Behavior(RTCIRQHandle);
+	RTCIRQHandle = 0;
+	}
 }
 
 /****************************************************************************
@@ -1176,9 +1176,9 @@
     const char *filename,
     PM_findData *findData)
 {
-    // TODO: This function should start a directory enumeration search
-    //       given the filename (with wildcards). The data should be
-    //       converted and returned in the findData standard form.
+    /* TODO: This function should start a directory enumeration search */
+    /*       given the filename (with wildcards). The data should be */
+    /*       converted and returned in the findData standard form. */
     (void)filename;
     (void)findData;
     return PM_FILE_INVALID;
@@ -1192,10 +1192,10 @@
     void *handle,
     PM_findData *findData)
 {
-    // TODO: This function should find the next file in directory enumeration
-    //       search given the search criteria defined in the call to
-    //       PM_findFirstFile. The data should be converted and returned
-    //       in the findData standard form.
+    /* TODO: This function should find the next file in directory enumeration */
+    /*       search given the search criteria defined in the call to */
+    /*       PM_findFirstFile. The data should be converted and returned */
+    /*       in the findData standard form. */
     (void)handle;
     (void)findData;
     return false;
@@ -1208,8 +1208,8 @@
 void PMAPI PM_findClose(
     void *handle)
 {
-    // TODO: This function should close the find process. This may do
-    //       nothing for some OS'es.
+    /* TODO: This function should close the find process. This may do */
+    /*       nothing for some OS'es. */
     (void)handle;
 }
 
@@ -1229,7 +1229,7 @@
 ibool PMAPI PM_driveValid(
     char drive)
 {
-    // Not supported in a VxD
+    /* Not supported in a VxD */
     (void)drive;
     return false;
 }
@@ -1245,7 +1245,7 @@
     char *dir,
     int len)
 {
-    // Not supported in a VxD
+    /* Not supported in a VxD */
     (void)drive;
     (void)dir;
     (void)len;
@@ -1279,7 +1279,7 @@
     const char *filename,
     uint attrib)
 {
-    // TODO: Implement this
+    /* TODO: Implement this */
     (void)filename;
     (void)attrib;
     PM_fatalError("PM_setFileAttr not implemented yet!");
@@ -1292,7 +1292,7 @@
 uint PMAPI PM_getFileAttr(
     const char *filename)
 {
-    // TODO: Implement this
+    /* TODO: Implement this */
     (void)filename;
     PM_fatalError("PM_getFileAttr not implemented yet!");
     return 0;
@@ -1305,7 +1305,7 @@
 ibool PMAPI PM_mkdir(
     const char *filename)
 {
-    // TODO: Implement this
+    /* TODO: Implement this */
     (void)filename;
     PM_fatalError("PM_mkdir not implemented yet!");
     return false;
@@ -1318,7 +1318,7 @@
 ibool PMAPI PM_rmdir(
     const char *filename)
 {
-    // TODO: Implement this
+    /* TODO: Implement this */
     (void)filename;
     PM_fatalError("PM_rmdir not implemented yet!");
     return false;
@@ -1333,7 +1333,7 @@
     ibool gmTime,
     PM_time *time)
 {
-    // TODO: Implement this!
+    /* TODO: Implement this! */
     (void)filename;
     (void)gmTime;
     (void)time;
@@ -1350,11 +1350,10 @@
     ibool gmTime,
     PM_time *time)
 {
-    // TODO: Implement this!
+    /* TODO: Implement this! */
     (void)filename;
     (void)gmTime;
     (void)time;
     PM_fatalError("PM_setFileTime not implemented yet!");
     return false;
 }
-

diff --git a/board/MAI/bios_emulator/scitech/src/pm/win32/cpuinfo.c b/board/MAI/bios_emulator/scitech/src/pm/win32/cpuinfo.c
index 5978b9f..7da9752 100644
--- a/board/MAI/bios_emulator/scitech/src/pm/win32/cpuinfo.c
+++ b/board/MAI/bios_emulator/scitech/src/pm/win32/cpuinfo.c

@@ -46,7 +46,7 @@
 
     oldPriority = GetThreadPriority(hThread);
     if (oldPriority != THREAD_PRIORITY_ERROR_RETURN)
-        SetThreadPriority(hThread, THREAD_PRIORITY_TIME_CRITICAL);
+	SetThreadPriority(hThread, THREAD_PRIORITY_TIME_CRITICAL);
     return oldPriority;
 }
 
@@ -60,7 +60,7 @@
     HANDLE  hThread = GetCurrentThread();
 
     if (oldPriority != THREAD_PRIORITY_ERROR_RETURN)
-        SetThreadPriority(hThread, oldPriority);
+	SetThreadPriority(hThread, oldPriority);
 }
 
 /****************************************************************************
@@ -71,12 +71,12 @@
     CPU_largeInteger *freq)
 {
     if (!QueryPerformanceFrequency((LARGE_INTEGER*)freq)) {
-        havePerformanceCounter = false;
-        freq->low = 100000;
-        freq->high = 0;
-        }
+	havePerformanceCounter = false;
+	freq->low = 100000;
+	freq->high = 0;
+	}
     else
-        havePerformanceCounter = true;
+	havePerformanceCounter = true;
 }
 
 /****************************************************************************
@@ -86,9 +86,9 @@
 #define GetCounter(t)                                       \
 {                                                           \
     if (havePerformanceCounter)                             \
-        QueryPerformanceCounter((LARGE_INTEGER*)t);         \
+	QueryPerformanceCounter((LARGE_INTEGER*)t);         \
     else {                                                  \
-        (t)->low = timeGetTime() * 100;                     \
-        (t)->high = 0;                                      \
-        }                                                   \
+	(t)->low = timeGetTime() * 100;                     \
+	(t)->high = 0;                                      \
+	}                                                   \
 }

diff --git a/board/MAI/bios_emulator/scitech/src/pm/win32/ddraw.c b/board/MAI/bios_emulator/scitech/src/pm/win32/ddraw.c
index cf89401..d6c3f60 100644
--- a/board/MAI/bios_emulator/scitech/src/pm/win32/ddraw.c
+++ b/board/MAI/bios_emulator/scitech/src/pm/win32/ddraw.c

@@ -85,11 +85,11 @@
     HKEY    hKey;
 
     if (RegOpenKeyEx(HKEY_CURRENT_USER,szAutoPlayKey,0,KEY_EXECUTE | KEY_WRITE,&hKey) == ERROR_SUCCESS) {
-        RegQueryValueEx(hKey,szAutoPlayValue,NULL,NULL,(void*)&dwAutoPlay,&dwSize);
-        dwAutoPlay |= AUTOPLAY_DRIVE_CDROM;
-        RegSetValueEx(hKey,szAutoPlayValue,0,REG_DWORD,(void*)&dwAutoPlay,dwSize);
-        RegCloseKey(hKey);
-        }
+	RegQueryValueEx(hKey,szAutoPlayValue,NULL,NULL,(void*)&dwAutoPlay,&dwSize);
+	dwAutoPlay |= AUTOPLAY_DRIVE_CDROM;
+	RegSetValueEx(hKey,szAutoPlayValue,0,REG_DWORD,(void*)&dwAutoPlay,dwSize);
+	RegCloseKey(hKey);
+	}
 }
 
 /****************************************************************************
@@ -102,11 +102,11 @@
     HKEY    hKey;
 
     if (RegOpenKeyEx(HKEY_CURRENT_USER,szAutoPlayKey,0,KEY_EXECUTE | KEY_WRITE,&hKey) == ERROR_SUCCESS) {
-        RegQueryValueEx(hKey,szAutoPlayValue,NULL,NULL,(void*)&dwAutoPlay,&dwSize);
-        dwAutoPlay &= ~AUTOPLAY_DRIVE_CDROM;
-        RegSetValueEx(hKey,szAutoPlayValue,0,REG_DWORD,(void*)&dwAutoPlay,dwSize);
-        RegCloseKey(hKey);
-        }
+	RegQueryValueEx(hKey,szAutoPlayValue,NULL,NULL,(void*)&dwAutoPlay,&dwSize);
+	dwAutoPlay &= ~AUTOPLAY_DRIVE_CDROM;
+	RegSetValueEx(hKey,szAutoPlayValue,0,REG_DWORD,(void*)&dwAutoPlay,dwSize);
+	RegCloseKey(hKey);
+	}
 }
 
 /****************************************************************************
@@ -121,20 +121,20 @@
     int retCode = PM_SUSPEND_APP;
 
     if (backInGDI)
-        return;
+	return;
     if (suspendApp)
-        retCode = suspendApp(PM_DEACTIVATE);
+	retCode = suspendApp(PM_DEACTIVATE);
     RestoreAutoPlay();
     backInGDI = true;
 
     /* Now process messages normally until we are re-activated */
     waitActive = true;
     if (retCode != PM_NO_SUSPEND_APP) {
-        while (waitActive) {
-            _EVT_pumpMessages();
-            Sleep(200);
-            }
-        }
+	while (waitActive) {
+	    _EVT_pumpMessages();
+	    Sleep(200);
+	    }
+	}
 }
 
 /****************************************************************************
@@ -147,27 +147,27 @@
     static ibool    firstTime = true;
 
     if (firstTime) {
-        /* Clear the message queue while waiting for the surfaces to be
-         * restored.
-         */
-        firstTime = false;
-        while (1) {
-            /* Continue looping until out application has been restored
-             * and we have reset the display mode.
-             */
-            _EVT_pumpMessages();
-            if (GetActiveWindow() == _PM_hwndConsole) {
-                if (suspendApp)
-                    suspendApp(PM_REACTIVATE);
-                DisableAutoPlay();
-                backInGDI = false;
-                waitActive = false;
-                firstTime = true;
-                return;
-                }
-            Sleep(200);
-            }
-        }
+	/* Clear the message queue while waiting for the surfaces to be
+	 * restored.
+	 */
+	firstTime = false;
+	while (1) {
+	    /* Continue looping until out application has been restored
+	     * and we have reset the display mode.
+	     */
+	    _EVT_pumpMessages();
+	    if (GetActiveWindow() == _PM_hwndConsole) {
+		if (suspendApp)
+		    suspendApp(PM_REACTIVATE);
+		DisableAutoPlay();
+		backInGDI = false;
+		waitActive = false;
+		firstTime = true;
+		return;
+		}
+	    Sleep(200);
+	    }
+	}
 }
 
 /****************************************************************************
@@ -192,17 +192,17 @@
 
     /* Call system DLL version if found */
     if (_PM_imports.PM_doSuspendApp != PM_doSuspendApp) {
-        _PM_imports.PM_doSuspendApp();
-        return;
-        }
+	_PM_imports.PM_doSuspendApp();
+	return;
+	}
 
     if (firstTime) {
-        if (suspendApp)
-            suspendApp(PM_DEACTIVATE);
-        RestoreAutoPlay();
-        firstTime = false;
-        backInGDI = true;
-        }
+	if (suspendApp)
+	    suspendApp(PM_DEACTIVATE);
+	RestoreAutoPlay();
+	firstTime = false;
+	backInGDI = true;
+	}
     RestoreFullScreen();
     firstTime = true;
 }
@@ -220,60 +220,60 @@
     LONG lParam)
 {
     switch (msg) {
-        case WM_SYSCHAR:
-            /* Stop Alt-Space from pausing our application */
-            return 0;
-        case WM_KEYDOWN:
-        case WM_SYSKEYDOWN:
-            if (HIWORD(lParam) & KF_REPEAT) {
-                if (msg == WM_SYSKEYDOWN)
-                    return 0;
-                break;
-                }
-            /* Fall through for keydown events */
-        case WM_KEYUP:
-        case WM_SYSKEYUP:
-            if (msg == WM_SYSKEYDOWN || msg == WM_SYSKEYUP) {
-                if ((HIWORD(lParam) & KF_ALTDOWN) && wParam == VK_RETURN)
-                    break;
-                /* We ignore the remainder of the system keys to stop the
-                 * system menu from being activated from the keyboard and pausing
-                 * our app while fullscreen (ie: pressing the Alt key).
-                 */
-                return 0;
-                }
-            break;
-        case WM_SYSCOMMAND:
-            switch (wParam & ~0x0F) {
-                case SC_SCREENSAVE:
-                case SC_MONITORPOWER:
-                    /* Ignore screensaver requests in fullscreen modes */
-                    return 0;
-                }
-            break;
-        case WM_SIZE:
-            if (waitActive && backInGDI && (wParam != SIZE_MINIMIZED)) {
-                /* Start the re-activation process */
-                PostMessage(hwnd,WM_DO_SUSPEND_APP,WM_PM_RESTORE_FULLSCREEN,0);
-                }
-            else if (!waitActive && isFullScreen && !backInGDI && (wParam == SIZE_MINIMIZED)) {
-                /* Start the de-activation process */
-                PostMessage(hwnd,WM_DO_SUSPEND_APP,WM_PM_LEAVE_FULLSCREEN,0);
-                }
-            break;
-        case WM_DO_SUSPEND_APP:
-            switch (wParam) {
+	case WM_SYSCHAR:
+	    /* Stop Alt-Space from pausing our application */
+	    return 0;
+	case WM_KEYDOWN:
+	case WM_SYSKEYDOWN:
+	    if (HIWORD(lParam) & KF_REPEAT) {
+		if (msg == WM_SYSKEYDOWN)
+		    return 0;
+		break;
+		}
+	    /* Fall through for keydown events */
+	case WM_KEYUP:
+	case WM_SYSKEYUP:
+	    if (msg == WM_SYSKEYDOWN || msg == WM_SYSKEYUP) {
+		if ((HIWORD(lParam) & KF_ALTDOWN) && wParam == VK_RETURN)
+		    break;
+		/* We ignore the remainder of the system keys to stop the
+		 * system menu from being activated from the keyboard and pausing
+		 * our app while fullscreen (ie: pressing the Alt key).
+		 */
+		return 0;
+		}
+	    break;
+	case WM_SYSCOMMAND:
+	    switch (wParam & ~0x0F) {
+		case SC_SCREENSAVE:
+		case SC_MONITORPOWER:
+		    /* Ignore screensaver requests in fullscreen modes */
+		    return 0;
+		}
+	    break;
+	case WM_SIZE:
+	    if (waitActive && backInGDI && (wParam != SIZE_MINIMIZED)) {
+		/* Start the re-activation process */
+		PostMessage(hwnd,WM_DO_SUSPEND_APP,WM_PM_RESTORE_FULLSCREEN,0);
+		}
+	    else if (!waitActive && isFullScreen && !backInGDI && (wParam == SIZE_MINIMIZED)) {
+		/* Start the de-activation process */
+		PostMessage(hwnd,WM_DO_SUSPEND_APP,WM_PM_LEAVE_FULLSCREEN,0);
+		}
+	    break;
+	case WM_DO_SUSPEND_APP:
+	    switch (wParam) {
 				case WM_PM_RESTORE_FULLSCREEN:
 					RestoreFullScreen();
 					break;
 				case WM_PM_LEAVE_FULLSCREEN:
 					LeaveFullScreen();
 					break;
-                }
-            return 0;
-        }
+		}
+	    return 0;
+	}
     if (oldWinProc)
-        return oldWinProc(hwnd,msg,wParam,lParam);
+	return oldWinProc(hwnd,msg,wParam,lParam);
     return DefWindowProc(hwnd,msg,wParam,lParam);
 }
 
@@ -349,32 +349,32 @@
 
     /* Call system DLL version if found */
     if (_PM_imports.PM_loadDirectDraw != PM_loadDirectDraw)
-        return _PM_imports.PM_loadDirectDraw(device);
+	return _PM_imports.PM_loadDirectDraw(device);
 
-    // TODO: Handle multi-monitor!!
+    /* TODO: Handle multi-monitor!! */
     if (device != 0)
-        return NULL;
+	return NULL;
 
     /* Load the DirectDraw DLL if not presently loaded */
     GET_DEFAULT_CW();
     if (!hInstDD) {
-        hdc = GetDC(NULL);
-        bits = GetDeviceCaps(hdc,BITSPIXEL);
-        ReleaseDC(NULL,hdc);
-        if (bits < 8)
-            return NULL;
-        if ((hInstDD = LoadLibrary("ddraw.dll")) == NULL)
-            return NULL;
-        pDirectDrawCreate = (void*)GetProcAddress(hInstDD,"DirectDrawCreate");
-        if (!pDirectDrawCreate)
-            return NULL;
-        }
+	hdc = GetDC(NULL);
+	bits = GetDeviceCaps(hdc,BITSPIXEL);
+	ReleaseDC(NULL,hdc);
+	if (bits < 8)
+	    return NULL;
+	if ((hInstDD = LoadLibrary("ddraw.dll")) == NULL)
+	    return NULL;
+	pDirectDrawCreate = (void*)GetProcAddress(hInstDD,"DirectDrawCreate");
+	if (!pDirectDrawCreate)
+	    return NULL;
+	}
 
     /* Create the DirectDraw object */
     if (!lpDD && pDirectDrawCreate(NULL, &lpDD, NULL) != DD_OK) {
-        lpDD = NULL;
-        return NULL;
-        }
+	lpDD = NULL;
+	return NULL;
+	}
     RESET_DEFAULT_CW();
     return lpDD;
 }
@@ -394,13 +394,13 @@
 {
     /* Call system DLL version if found */
     if (_PM_imports.PM_unloadDirectDraw != PM_unloadDirectDraw) {
-        _PM_imports.PM_unloadDirectDraw(device);
-        return;
-        }
+	_PM_imports.PM_unloadDirectDraw(device);
+	return;
+	}
     if (lpDD) {
-        IDirectDraw_Release(lpDD);
-        lpDD = NULL;
-        }
+	IDirectDraw_Release(lpDD);
+	lpDD = NULL;
+	}
     (void)device;
 }
 
@@ -423,56 +423,56 @@
     /* Call system DLL version if found */
     GA_getSystemPMImports();
     if (_PM_imports.PM_openConsole != PM_openConsole) {
-        if (fullScreen) {
-            _PM_deskX = xRes;
-            _PM_deskY = yRes;
-            }
-        return _PM_imports.PM_openConsole(hWndUser,device,xRes,yRes,bpp,fullScreen);
-        }
+	if (fullScreen) {
+	    _PM_deskX = xRes;
+	    _PM_deskY = yRes;
+	    }
+	return _PM_imports.PM_openConsole(hWndUser,device,xRes,yRes,bpp,fullScreen);
+	}
 
     /* Create the fullscreen window if necessary */
     hwndUser = hWndUser;
     if (fullScreen) {
-        if (!classRegistered) {
-            /* Create a Window class for the fullscreen window in here, since
-             * we need to register one that will do all our event handling for
-             * us.
-             */
-            hInstApp            = GetModuleHandle(NULL);
-            cls.hCursor         = LoadCursor(NULL,IDC_ARROW);
-            cls.hIcon           = LoadIcon(hInstApp,MAKEINTRESOURCE(1));
-            cls.lpszMenuName    = NULL;
-            cls.lpszClassName   = szWinClassName;
-            cls.hbrBackground   = GetStockObject(BLACK_BRUSH);
-            cls.hInstance       = hInstApp;
-            cls.style           = CS_DBLCLKS;
-            cls.lpfnWndProc     = PM_winProc;
-            cls.cbWndExtra      = 0;
-            cls.cbClsExtra      = 0;
-            if (!RegisterClass(&cls))
-                return NULL;
-            classRegistered = true;
-            }
-        _PM_deskX = xRes;
-        _PM_deskY = yRes;
-        if (!hwndUser) {
-            char windowTitle[80];
-            if (LoadString(hInstApp,1,windowTitle,sizeof(windowTitle)) == 0)
-                strcpy(windowTitle,"MGL Fullscreen Application");
-            _PM_hwndConsole = CreateWindowEx(WS_EX_APPWINDOW,szWinClassName,
-                windowTitle,WS_POPUP | WS_SYSMENU,0,0,xRes,yRes,
-                NULL,NULL,hInstApp,NULL);
-            }
-        else {
-            _PM_hwndConsole = _PM_convertUserWindow(hwndUser,xRes,yRes);
-            }
-        ShowCursor(false);
-        isFullScreen = true;
-        }
+	if (!classRegistered) {
+	    /* Create a Window class for the fullscreen window in here, since
+	     * we need to register one that will do all our event handling for
+	     * us.
+	     */
+	    hInstApp            = GetModuleHandle(NULL);
+	    cls.hCursor         = LoadCursor(NULL,IDC_ARROW);
+	    cls.hIcon           = LoadIcon(hInstApp,MAKEINTRESOURCE(1));
+	    cls.lpszMenuName    = NULL;
+	    cls.lpszClassName   = szWinClassName;
+	    cls.hbrBackground   = GetStockObject(BLACK_BRUSH);
+	    cls.hInstance       = hInstApp;
+	    cls.style           = CS_DBLCLKS;
+	    cls.lpfnWndProc     = PM_winProc;
+	    cls.cbWndExtra      = 0;
+	    cls.cbClsExtra      = 0;
+	    if (!RegisterClass(&cls))
+		return NULL;
+	    classRegistered = true;
+	    }
+	_PM_deskX = xRes;
+	_PM_deskY = yRes;
+	if (!hwndUser) {
+	    char windowTitle[80];
+	    if (LoadString(hInstApp,1,windowTitle,sizeof(windowTitle)) == 0)
+		strcpy(windowTitle,"MGL Fullscreen Application");
+	    _PM_hwndConsole = CreateWindowEx(WS_EX_APPWINDOW,szWinClassName,
+		windowTitle,WS_POPUP | WS_SYSMENU,0,0,xRes,yRes,
+		NULL,NULL,hInstApp,NULL);
+	    }
+	else {
+	    _PM_hwndConsole = _PM_convertUserWindow(hwndUser,xRes,yRes);
+	    }
+	ShowCursor(false);
+	isFullScreen = true;
+	}
     else {
-        _PM_hwndConsole = hwndUser;
-        isFullScreen = false;
-        }
+	_PM_hwndConsole = hwndUser;
+	isFullScreen = false;
+	}
     SetFocus(_PM_hwndConsole);
     SetForegroundWindow(_PM_hwndConsole);
     DisableAutoPlay();
@@ -488,7 +488,7 @@
 {
     /* Call system DLL version if found */
     if (_PM_imports.PM_getConsoleStateSize != PM_getConsoleStateSize)
-        return _PM_imports.PM_getConsoleStateSize();
+	return _PM_imports.PM_getConsoleStateSize();
 
     /* Not used in Windows */
     return 1;
@@ -504,9 +504,9 @@
 {
     /* Call system DLL version if found */
     if (_PM_imports.PM_saveConsoleState != PM_saveConsoleState) {
-        _PM_imports.PM_saveConsoleState(stateBuf,hwndConsole);
-        return;
-        }
+	_PM_imports.PM_saveConsoleState(stateBuf,hwndConsole);
+	return;
+	}
 
     /* Not used in Windows */
     (void)stateBuf;
@@ -522,9 +522,9 @@
 {
     /* Call system DLL version if found */
     if (_PM_imports.PM_setSuspendAppCallback != PM_setSuspendAppCallback) {
-        _PM_imports.PM_setSuspendAppCallback(saveState);
-        return;
-        }
+	_PM_imports.PM_setSuspendAppCallback(saveState);
+	return;
+	}
     suspendApp = saveState;
 }
 
@@ -538,9 +538,9 @@
 {
     /* Call system DLL version if found */
     if (_PM_imports.PM_restoreConsoleState != PM_restoreConsoleState) {
-        _PM_imports.PM_restoreConsoleState(stateBuf,hwndConsole);
-        return;
-        }
+	_PM_imports.PM_restoreConsoleState(stateBuf,hwndConsole);
+	return;
+	}
 
     /* Not used in Windows */
     (void)stateBuf;
@@ -556,15 +556,15 @@
 {
     /* Call system DLL version if found */
     if (_PM_imports.PM_closeConsole != PM_closeConsole) {
-        _PM_imports.PM_closeConsole(hwndConsole);
-        return;
-        }
+	_PM_imports.PM_closeConsole(hwndConsole);
+	return;
+	}
     ShowCursor(true);
     RestoreAutoPlay();
     if (hwndUser)
-        _PM_restoreUserWindow(hwndConsole);
+	_PM_restoreUserWindow(hwndConsole);
     else
-        DestroyWindow(hwndConsole);
+	DestroyWindow(hwndConsole);
     hwndUser = NULL;
     _PM_hwndConsole = NULL;
 }
@@ -577,7 +577,6 @@
 {
     /* Call system DLL version if found */
     if (_PM_imports.PM_getDirectDrawWindow != PM_getDirectDrawWindow)
-        return _PM_imports.PM_getDirectDrawWindow();
+	return _PM_imports.PM_getDirectDrawWindow();
     return _PM_hwndConsole;
 }
-

diff --git a/board/MAI/bios_emulator/scitech/src/pm/win32/event.c b/board/MAI/bios_emulator/scitech/src/pm/win32/event.c
index c14377d..86448e3 100644
--- a/board/MAI/bios_emulator/scitech/src/pm/win32/event.c
+++ b/board/MAI/bios_emulator/scitech/src/pm/win32/event.c

@@ -70,143 +70,143 @@
     MSG     charMsg;
     event_t evt;
 
-    // TODO: Add support for DirectInput! We can't support relative mouse
-    //       movement motion counters without DirectInput ;-(.
+    /* TODO: Add support for DirectInput! We can't support relative mouse */
+    /*       movement motion counters without DirectInput ;-(. */
     while (PeekMessage(&msg,NULL,0,0,PM_REMOVE)) {
-        memset(&evt,0,sizeof(evt));
-        switch (msg.message) {
-            case WM_MOUSEMOVE:
-                evt.what = EVT_MOUSEMOVE;
-                break;
-            case WM_LBUTTONDBLCLK:
-                evt.what = EVT_MOUSEDOWN;
-                evt.message = EVT_LEFTBMASK | EVT_DBLCLICK;
-                break;
-            case WM_LBUTTONDOWN:
-                evt.what = EVT_MOUSEDOWN;
-                evt.message = EVT_LEFTBMASK;
-                break;
-            case WM_LBUTTONUP:
-                evt.what = EVT_MOUSEUP;
-                evt.message = EVT_LEFTBMASK;
-                break;
-            case WM_RBUTTONDBLCLK:
-                evt.what = EVT_MOUSEDOWN | EVT_DBLCLICK;
-                evt.message = EVT_RIGHTBMASK;
-                break;
-            case WM_RBUTTONDOWN:
-                evt.what = EVT_MOUSEDOWN;
-                evt.message = EVT_RIGHTBMASK;
-                break;
-            case WM_RBUTTONUP:
-                evt.what = EVT_MOUSEUP;
-                evt.message = EVT_RIGHTBMASK;
-                break;
-            case WM_MBUTTONDBLCLK:
-                evt.what = EVT_MOUSEDOWN | EVT_DBLCLICK;
-                evt.message = EVT_MIDDLEBMASK;
-                break;
-            case WM_MBUTTONDOWN:
-                evt.what = EVT_MOUSEDOWN;
-                evt.message = EVT_MIDDLEBMASK;
-                break;
-            case WM_MBUTTONUP:
-                evt.what = EVT_MOUSEUP;
-                evt.message = EVT_MIDDLEBMASK;
-                break;
-            case WM_KEYDOWN:
-            case WM_SYSKEYDOWN:
-                if (HIWORD(msg.lParam) & KF_REPEAT) {
-                    evt.what = EVT_KEYREPEAT;
-                    }
-                else {
-                    evt.what = EVT_KEYDOWN;
-                    }
-                break;
-            case WM_KEYUP:
-            case WM_SYSKEYUP:
-                evt.what = EVT_KEYUP;
-                break;
-            }
+	memset(&evt,0,sizeof(evt));
+	switch (msg.message) {
+	    case WM_MOUSEMOVE:
+		evt.what = EVT_MOUSEMOVE;
+		break;
+	    case WM_LBUTTONDBLCLK:
+		evt.what = EVT_MOUSEDOWN;
+		evt.message = EVT_LEFTBMASK | EVT_DBLCLICK;
+		break;
+	    case WM_LBUTTONDOWN:
+		evt.what = EVT_MOUSEDOWN;
+		evt.message = EVT_LEFTBMASK;
+		break;
+	    case WM_LBUTTONUP:
+		evt.what = EVT_MOUSEUP;
+		evt.message = EVT_LEFTBMASK;
+		break;
+	    case WM_RBUTTONDBLCLK:
+		evt.what = EVT_MOUSEDOWN | EVT_DBLCLICK;
+		evt.message = EVT_RIGHTBMASK;
+		break;
+	    case WM_RBUTTONDOWN:
+		evt.what = EVT_MOUSEDOWN;
+		evt.message = EVT_RIGHTBMASK;
+		break;
+	    case WM_RBUTTONUP:
+		evt.what = EVT_MOUSEUP;
+		evt.message = EVT_RIGHTBMASK;
+		break;
+	    case WM_MBUTTONDBLCLK:
+		evt.what = EVT_MOUSEDOWN | EVT_DBLCLICK;
+		evt.message = EVT_MIDDLEBMASK;
+		break;
+	    case WM_MBUTTONDOWN:
+		evt.what = EVT_MOUSEDOWN;
+		evt.message = EVT_MIDDLEBMASK;
+		break;
+	    case WM_MBUTTONUP:
+		evt.what = EVT_MOUSEUP;
+		evt.message = EVT_MIDDLEBMASK;
+		break;
+	    case WM_KEYDOWN:
+	    case WM_SYSKEYDOWN:
+		if (HIWORD(msg.lParam) & KF_REPEAT) {
+		    evt.what = EVT_KEYREPEAT;
+		    }
+		else {
+		    evt.what = EVT_KEYDOWN;
+		    }
+		break;
+	    case WM_KEYUP:
+	    case WM_SYSKEYUP:
+		evt.what = EVT_KEYUP;
+		break;
+	    }
 
-        /* Convert mouse event modifier flags */
-        if (evt.what & EVT_MOUSEEVT) {
-            if (_PM_deskX) {
-                evt.where_x = ((long)msg.pt.x * rangeX) / _PM_deskX;
-                evt.where_y = ((long)msg.pt.y * rangeY) / _PM_deskY;
-                }
-            else {
-                ScreenToClient(_PM_hwndConsole, &msg.pt);
-                evt.where_x = msg.pt.x;
-                evt.where_y = msg.pt.y;
-                }
-            if (evt.what == EVT_MOUSEMOVE) {
-                /* Save the current mouse position */
-                EVT.mx = evt.where_x;
-                EVT.my = evt.where_y;
-                if (EVT.oldMove != -1) {
-                    EVT.evtq[EVT.oldMove].where_x = evt.where_x;/* Modify existing one  */
-                    EVT.evtq[EVT.oldMove].where_y = evt.where_y;
-//                  EVT.evtq[EVT.oldMove].relative_x += mickeyX;    // TODO!
-//                  EVT.evtq[EVT.oldMove].relative_y += mickeyY;    // TODO!
-                    evt.what = 0;
-                    }
-                else {
-                    EVT.oldMove = EVT.freeHead; /* Save id of this move event   */
-//                  evt.relative_x = mickeyX;    // TODO!
-//                  evt.relative_y = mickeyY;    // TODO!
-                    }
-                }
-            else
-                EVT.oldMove = -1;
-            if (msg.wParam & MK_LBUTTON)
-                evt.modifiers |= EVT_LEFTBUT;
-            if (msg.wParam & MK_RBUTTON)
-                evt.modifiers |= EVT_RIGHTBUT;
-            if (msg.wParam & MK_MBUTTON)
-                evt.modifiers |= EVT_MIDDLEBUT;
-            if (msg.wParam & MK_SHIFT)
-                evt.modifiers |= EVT_SHIFTKEY;
-            if (msg.wParam & MK_CONTROL)
-                evt.modifiers |= EVT_CTRLSTATE;
-            }
+	/* Convert mouse event modifier flags */
+	if (evt.what & EVT_MOUSEEVT) {
+	    if (_PM_deskX) {
+		evt.where_x = ((long)msg.pt.x * rangeX) / _PM_deskX;
+		evt.where_y = ((long)msg.pt.y * rangeY) / _PM_deskY;
+		}
+	    else {
+		ScreenToClient(_PM_hwndConsole, &msg.pt);
+		evt.where_x = msg.pt.x;
+		evt.where_y = msg.pt.y;
+		}
+	    if (evt.what == EVT_MOUSEMOVE) {
+		/* Save the current mouse position */
+		EVT.mx = evt.where_x;
+		EVT.my = evt.where_y;
+		if (EVT.oldMove != -1) {
+		    EVT.evtq[EVT.oldMove].where_x = evt.where_x;/* Modify existing one  */
+		    EVT.evtq[EVT.oldMove].where_y = evt.where_y;
+/*                  EVT.evtq[EVT.oldMove].relative_x += mickeyX;    // TODO! */
+/*                  EVT.evtq[EVT.oldMove].relative_y += mickeyY;    // TODO! */
+		    evt.what = 0;
+		    }
+		else {
+		    EVT.oldMove = EVT.freeHead; /* Save id of this move event   */
+/*                  evt.relative_x = mickeyX;    // TODO! */
+/*                  evt.relative_y = mickeyY;    // TODO! */
+		    }
+		}
+	    else
+		EVT.oldMove = -1;
+	    if (msg.wParam & MK_LBUTTON)
+		evt.modifiers |= EVT_LEFTBUT;
+	    if (msg.wParam & MK_RBUTTON)
+		evt.modifiers |= EVT_RIGHTBUT;
+	    if (msg.wParam & MK_MBUTTON)
+		evt.modifiers |= EVT_MIDDLEBUT;
+	    if (msg.wParam & MK_SHIFT)
+		evt.modifiers |= EVT_SHIFTKEY;
+	    if (msg.wParam & MK_CONTROL)
+		evt.modifiers |= EVT_CTRLSTATE;
+	    }
 
-        /* Convert keyboard codes */
-        TranslateMessage(&msg);
-        if (evt.what & EVT_KEYEVT) {
-            int scanCode = (msg.lParam >> 16) & 0xFF;
-            if (evt.what == EVT_KEYUP) {
-                /* Get message for keyup code from table of cached down values */
-                evt.message = keyUpMsg[scanCode];
-                keyUpMsg[scanCode] = 0;
-                }
-            else {
-                if (PeekMessage(&charMsg,NULL,WM_CHAR,WM_CHAR,PM_REMOVE))
-                    evt.message = charMsg.wParam;
-                if (PeekMessage(&charMsg,NULL,WM_SYSCHAR,WM_SYSCHAR,PM_REMOVE))
-                    evt.message = charMsg.wParam;
-                evt.message |= ((msg.lParam >> 8) & 0xFF00);
-                keyUpMsg[scanCode] = (ushort)evt.message;
-                }
-            if (evt.what == EVT_KEYREPEAT)
-                evt.message |= (msg.lParam << 16);
-            if (HIWORD(msg.lParam) & KF_ALTDOWN)
-                evt.modifiers |= EVT_ALTSTATE;
-            if (GetKeyState(VK_SHIFT) & 0x8000U)
-                evt.modifiers |= EVT_SHIFTKEY;
-            if (GetKeyState(VK_CONTROL) & 0x8000U)
-                evt.modifiers |= EVT_CTRLSTATE;
-            EVT.oldMove = -1;
-            }
+	/* Convert keyboard codes */
+	TranslateMessage(&msg);
+	if (evt.what & EVT_KEYEVT) {
+	    int scanCode = (msg.lParam >> 16) & 0xFF;
+	    if (evt.what == EVT_KEYUP) {
+		/* Get message for keyup code from table of cached down values */
+		evt.message = keyUpMsg[scanCode];
+		keyUpMsg[scanCode] = 0;
+		}
+	    else {
+		if (PeekMessage(&charMsg,NULL,WM_CHAR,WM_CHAR,PM_REMOVE))
+		    evt.message = charMsg.wParam;
+		if (PeekMessage(&charMsg,NULL,WM_SYSCHAR,WM_SYSCHAR,PM_REMOVE))
+		    evt.message = charMsg.wParam;
+		evt.message |= ((msg.lParam >> 8) & 0xFF00);
+		keyUpMsg[scanCode] = (ushort)evt.message;
+		}
+	    if (evt.what == EVT_KEYREPEAT)
+		evt.message |= (msg.lParam << 16);
+	    if (HIWORD(msg.lParam) & KF_ALTDOWN)
+		evt.modifiers |= EVT_ALTSTATE;
+	    if (GetKeyState(VK_SHIFT) & 0x8000U)
+		evt.modifiers |= EVT_SHIFTKEY;
+	    if (GetKeyState(VK_CONTROL) & 0x8000U)
+		evt.modifiers |= EVT_CTRLSTATE;
+	    EVT.oldMove = -1;
+	    }
 
-        if (evt.what != 0) {
-            /* Add time stamp and add the event to the queue */
-            evt.when = msg.time;
-            if (EVT.count < EVENTQSIZE)
-                addEvent(&evt);
-            }
-        DispatchMessage(&msg);
-        }
+	if (evt.what != 0) {
+	    /* Add time stamp and add the event to the queue */
+	    evt.when = msg.time;
+	    if (EVT.count < EVENTQSIZE)
+		addEvent(&evt);
+	    }
+	DispatchMessage(&msg);
+	}
 }
 
 /****************************************************************************
@@ -299,7 +299,7 @@
 ****************************************************************************/
 void EVT_resume(void)
 {
-    // Do nothing for Win32
+    /* Do nothing for Win32 */
 }
 
 /****************************************************************************
@@ -309,7 +309,7 @@
 ****************************************************************************/
 void EVT_suspend(void)
 {
-    // Do nothing for Win32
+    /* Do nothing for Win32 */
 }
 
 /****************************************************************************
@@ -343,7 +343,7 @@
 ****************************************************************************/
 int EVTAPI EVT_joyIsPresent(void)
 {
-    // TODO: Implement joystick code based on DirectX!
+    /* TODO: Implement joystick code based on DirectX! */
     return 0;
 }
 
@@ -362,9 +362,9 @@
 queue for later retrieval.
 
 Note:   Most analogue joysticks will provide readings that change even
-        though the joystick has not moved. Hence if you call this routine
-        you will likely get an EVT_JOYMOVE event every time through your
-        event loop.
+	though the joystick has not moved. Hence if you call this routine
+	you will likely get an EVT_JOYMOVE event every time through your
+	event loop.
 
 SEE ALSO:
 EVT_getNext, EVT_peekNext, EVT_joySetUpperLeft, EVT_joySetLowerRight,
@@ -457,4 +457,3 @@
 void EVTAPI EVT_joySetCenter(void)
 {
 }
-

diff --git a/board/MAI/bios_emulator/scitech/src/pm/win32/ntservc.c b/board/MAI/bios_emulator/scitech/src/pm/win32/ntservc.c
index a3324d3..59d9aa0 100644
--- a/board/MAI/bios_emulator/scitech/src/pm/win32/ntservc.c
+++ b/board/MAI/bios_emulator/scitech/src/pm/win32/ntservc.c

@@ -64,63 +64,63 @@
     char        keyPath[MAX_PATH];
     ulong       status;
 
-    // Obtain a handle to the service control manager requesting all access
+    /* Obtain a handle to the service control manager requesting all access */
     if ((scmHandle = OpenSCManager(NULL, NULL, SC_MANAGER_ALL_ACCESS)) == NULL)
-        return GetLastError();
+	return GetLastError();
 
-    // Find the path to the driver in system directory
+    /* Find the path to the driver in system directory */
     GetSystemDirectory(szDriverPath, sizeof(szDriverPath));
     strcat(szDriverPath, "\\drivers\\");
     strcat(szDriverPath, szDriverName);
 
-    // Create the service with the Service Control Manager.
+    /* Create the service with the Service Control Manager. */
     driverHandle = CreateService(scmHandle,
-                                 szServiceName,
-                                 szServiceName,
-                                 SERVICE_ALL_ACCESS,
-                                 dwServiceType,
-                                 SERVICE_BOOT_START,
-                                 SERVICE_ERROR_NORMAL,
-                                 szDriverPath,
-                                 szLoadGroup,
-                                 NULL,
-                                 NULL,
-                                 NULL,
-                                 NULL);
+				 szServiceName,
+				 szServiceName,
+				 SERVICE_ALL_ACCESS,
+				 dwServiceType,
+				 SERVICE_BOOT_START,
+				 SERVICE_ERROR_NORMAL,
+				 szDriverPath,
+				 szLoadGroup,
+				 NULL,
+				 NULL,
+				 NULL,
+				 NULL);
 
-    // Check to see if the driver could actually be installed.
+    /* Check to see if the driver could actually be installed. */
     if (!driverHandle) {
-        status = GetLastError();
-        CloseServiceHandle(scmHandle);
-        return status;
-        }
+	status = GetLastError();
+	CloseServiceHandle(scmHandle);
+	return status;
+	}
 
-    // Get a handle to the key for driver so that it can be altered in the
-    // next step.
+    /* Get a handle to the key for driver so that it can be altered in the */
+    /* next step. */
     strcpy(keyPath, "SYSTEM\\CurrentControlSet\\Services\\");
     strcat(keyPath, szServiceName);
     if ((status = RegOpenKeyEx(HKEY_LOCAL_MACHINE,keyPath,0,KEY_ALL_ACCESS,&key)) != ERROR_SUCCESS) {
-        // A problem has occured. Delete the service so that it is not installed.
-        status = GetLastError();
-        DeleteService(driverHandle);
-        CloseServiceHandle(driverHandle);
-        CloseServiceHandle(scmHandle);
-        return status;
-        }
+	/* A problem has occured. Delete the service so that it is not installed. */
+	status = GetLastError();
+	DeleteService(driverHandle);
+	CloseServiceHandle(driverHandle);
+	CloseServiceHandle(scmHandle);
+	return status;
+	}
 
-    // Delete the ImagePath value in the newly created key so that the
-    // system looks for the driver in the normal location.
+    /* Delete the ImagePath value in the newly created key so that the */
+    /* system looks for the driver in the normal location. */
     if ((status = RegDeleteValue(key, "ImagePath")) != ERROR_SUCCESS) {
-        // A problem has occurred. Delete the service so that it is not
-        // installed and will not try to start.
-        RegCloseKey(key);
-        DeleteService(driverHandle);
-        CloseServiceHandle(driverHandle);
-        CloseServiceHandle(scmHandle);
-        return status;
-        }
+	/* A problem has occurred. Delete the service so that it is not */
+	/* installed and will not try to start. */
+	RegCloseKey(key);
+	DeleteService(driverHandle);
+	CloseServiceHandle(driverHandle);
+	CloseServiceHandle(scmHandle);
+	return status;
+	}
 
-    // Clean up and exit
+    /* Clean up and exit */
     RegCloseKey(key);
     CloseServiceHandle(driverHandle);
     CloseServiceHandle(scmHandle);
@@ -145,32 +145,32 @@
     SERVICE_STATUS	serviceStatus;
     ulong           status;
 
-    // Obtain a handle to the service control manager requesting all access
+    /* Obtain a handle to the service control manager requesting all access */
     if ((scmHandle = OpenSCManager(NULL, NULL, SC_MANAGER_ALL_ACCESS)) == NULL)
-        return GetLastError();
+	return GetLastError();
 
-    // Open the service with the Service Control Manager.
+    /* Open the service with the Service Control Manager. */
     if ((driverHandle = OpenService(scmHandle,szServiceName,SERVICE_ALL_ACCESS)) == NULL) {
-        status = GetLastError();
-        CloseServiceHandle(scmHandle);
-        return status;
-        }
+	status = GetLastError();
+	CloseServiceHandle(scmHandle);
+	return status;
+	}
 
-    // Start the service
+    /* Start the service */
     if (!StartService(driverHandle,0,NULL)) {
-        status = GetLastError();
-        CloseServiceHandle(driverHandle);
-        CloseServiceHandle(scmHandle);
-        return status;
-        }
+	status = GetLastError();
+	CloseServiceHandle(driverHandle);
+	CloseServiceHandle(scmHandle);
+	return status;
+	}
 
-    // Query the service to make sure it is there
-    if (!QueryServiceStatus(driverHandle,&serviceStatus)) {	
-        status = GetLastError();
-        CloseServiceHandle(driverHandle);
-        CloseServiceHandle(scmHandle);
-        return status;
-        }
+    /* Query the service to make sure it is there */
+    if (!QueryServiceStatus(driverHandle,&serviceStatus)) {
+	status = GetLastError();
+	CloseServiceHandle(driverHandle);
+	CloseServiceHandle(scmHandle);
+	return status;
+	}
     CloseServiceHandle(driverHandle);
     CloseServiceHandle(scmHandle);
     return ERROR_SUCCESS;
@@ -194,24 +194,24 @@
     SERVICE_STATUS	serviceStatus;
     ulong           status;
 
-    // Obtain a handle to the service control manager requesting all access
+    /* Obtain a handle to the service control manager requesting all access */
     if ((scmHandle = OpenSCManager(NULL, NULL, SC_MANAGER_ALL_ACCESS)) == NULL)
-        return GetLastError();
+	return GetLastError();
 
-    // Open the service with the Service Control Manager.
+    /* Open the service with the Service Control Manager. */
     if ((driverHandle = OpenService(scmHandle,szServiceName,SERVICE_ALL_ACCESS)) == NULL) {
-        status = GetLastError();
-        CloseServiceHandle(scmHandle);
-        return status;
-        }
+	status = GetLastError();
+	CloseServiceHandle(scmHandle);
+	return status;
+	}
 
-    // Stop the service from running
+    /* Stop the service from running */
     if (!ControlService(driverHandle, SERVICE_CONTROL_STOP, &serviceStatus)) {
-        status = GetLastError();
-        CloseServiceHandle(driverHandle);
-        CloseServiceHandle(scmHandle);
-        return status;
-        }
+	status = GetLastError();
+	CloseServiceHandle(driverHandle);
+	CloseServiceHandle(scmHandle);
+	return status;
+	}
     CloseServiceHandle(driverHandle);
     CloseServiceHandle(scmHandle);
     return ERROR_SUCCESS;
@@ -234,26 +234,25 @@
     SC_HANDLE   driverHandle;
     ulong       status;
 
-    // Obtain a handle to the service control manager requesting all access
+    /* Obtain a handle to the service control manager requesting all access */
     if ((scmHandle = OpenSCManager(NULL, NULL, SC_MANAGER_ALL_ACCESS)) == NULL)
-        return GetLastError();
+	return GetLastError();
 
-    // Open the service with the Service Control Manager.
+    /* Open the service with the Service Control Manager. */
     if ((driverHandle = OpenService(scmHandle,szServiceName,SERVICE_ALL_ACCESS)) == NULL) {
-        status = GetLastError();
-        CloseServiceHandle(scmHandle);
-        return status;
-        }
+	status = GetLastError();
+	CloseServiceHandle(scmHandle);
+	return status;
+	}
 
-    // Remove the service
+    /* Remove the service */
     if (!DeleteService(driverHandle)) {
-        status = GetLastError();
-        CloseServiceHandle(driverHandle);
-        CloseServiceHandle(scmHandle);
-        return status;
-        }
+	status = GetLastError();
+	CloseServiceHandle(driverHandle);
+	CloseServiceHandle(scmHandle);
+	return status;
+	}
     CloseServiceHandle(driverHandle);
     CloseServiceHandle(scmHandle);
     return ERROR_SUCCESS;
 }
-

diff --git a/board/MAI/bios_emulator/scitech/src/pm/win32/oshdr.h b/board/MAI/bios_emulator/scitech/src/pm/win32/oshdr.h
index 018c936..0c59e90 100644
--- a/board/MAI/bios_emulator/scitech/src/pm/win32/oshdr.h
+++ b/board/MAI/bios_emulator/scitech/src/pm/win32/oshdr.h

@@ -47,7 +47,7 @@
 #define GET_DEFAULT_CW()                    \
 {                                           \
     if (_PM_cw_default == 0)                \
-        _PM_cw_default = _control87(0,0);   \
+	_PM_cw_default = _control87(0,0);   \
 }
 #define RESET_DEFAULT_CW()                  \
     _control87(_PM_cw_default,0xFFFFFFFF)
@@ -77,4 +77,3 @@
 /*-------------------------- Internal Functions ---------------------------*/
 
 void _EVT_pumpMessages(void);
-

diff --git a/board/MAI/bios_emulator/scitech/src/pm/win32/pm.c b/board/MAI/bios_emulator/scitech/src/pm/win32/pm.c
index d08da4c..1ffdbcc 100644
--- a/board/MAI/bios_emulator/scitech/src/pm/win32/pm.c
+++ b/board/MAI/bios_emulator/scitech/src/pm/win32/pm.c

@@ -69,10 +69,10 @@
 #define CHECK_FOR_PMHELP()                                                  \
 {                                                                           \
     if (_PM_hDevice == INVALID_HANDLE_VALUE)                                \
-        if (_PM_haveWinNT)                                                  \
-            PM_fatalError("Unable to connect to PMHELP.SYS or SDDHELP.SYS!"); \
-        else                                                                  \
-            PM_fatalError("Unable to connect to PMHELP.VXD or SDDHELP.VXD!"); \
+	if (_PM_haveWinNT)                                                  \
+	    PM_fatalError("Unable to connect to PMHELP.SYS or SDDHELP.SYS!"); \
+	else                                                                  \
+	    PM_fatalError("Unable to connect to PMHELP.VXD or SDDHELP.VXD!"); \
 }
 
 /****************************************************************************
@@ -95,71 +95,71 @@
      * of SDD is loaded, we use the PMHELP VxD instead.
      */
     if (!inited) {
-        /* Determine if we are running under Windows NT or not and
-         * set the global OS type variable.
-         */
-        _PM_haveWinNT = false;
-        if ((GetVersion() & 0x80000000UL) == 0)
-            _PM_haveWinNT = true;
-        ___drv_os_type = (_PM_haveWinNT) ? _OS_WINNT : _OS_WIN95;
+	/* Determine if we are running under Windows NT or not and
+	 * set the global OS type variable.
+	 */
+	_PM_haveWinNT = false;
+	if ((GetVersion() & 0x80000000UL) == 0)
+	    _PM_haveWinNT = true;
+	___drv_os_type = (_PM_haveWinNT) ? _OS_WINNT : _OS_WIN95;
 
-        /* Now try to connect to SDDHELP.VXD or SDDHELP.SYS */
-        _PM_hDevice = CreateFile(SDDHELP_MODULE_PATH, 0,0,0, CREATE_NEW, FILE_FLAG_DELETE_ON_CLOSE, 0);
-        if (_PM_hDevice != INVALID_HANDLE_VALUE) {
-            if (!DeviceIoControl(_PM_hDevice, PMHELP_GETVER32, NULL, 0,
-                    outBuf, sizeof(outBuf), &count, NULL) || outBuf[0] < PMHELP_VERSION) {
-                /* Old version of SDDHELP loaded, so use PMHELP instead */
-                CloseHandle(_PM_hDevice);
-                _PM_hDevice = INVALID_HANDLE_VALUE;
-                }
-            }
-        if (_PM_hDevice == INVALID_HANDLE_VALUE) {
-            /* First try to see if there is a currently loaded PMHELP driver.
-             * This is usually the case when we are running under Windows NT/2K.
-             */
-            _PM_hDevice = CreateFile(PMHELP_MODULE_PATH, 0,0,0, CREATE_NEW, FILE_FLAG_DELETE_ON_CLOSE, 0);
-            if (_PM_hDevice == INVALID_HANDLE_VALUE) {
-                /* The driver was not staticly loaded, so try creating a file handle
-                 * to a dynamic version of the VxD if possible. Note that on WinNT/2K we
-                 * cannot support dynamically loading the drivers.
-                 */
-                _PM_hDevice = CreateFile(PMHELP_VXD_PATH, 0,0,0, CREATE_NEW, FILE_FLAG_DELETE_ON_CLOSE, 0);
-                }
-            }
-        if (_PM_hDevice != INVALID_HANDLE_VALUE) {
-            /* Call the driver to determine the version number */
-            if (!DeviceIoControl(_PM_hDevice, PMHELP_GETVER32, inBuf, sizeof(inBuf),
-                    outBuf, sizeof(outBuf), &count, NULL) || outBuf[0] < PMHELP_VERSION) {
-                if (_PM_haveWinNT)
-                    PM_fatalError("Older version of PMHELP.SYS found!");
-                else
-                    PM_fatalError("Older version of PMHELP.VXD found!");
-                }
+	/* Now try to connect to SDDHELP.VXD or SDDHELP.SYS */
+	_PM_hDevice = CreateFile(SDDHELP_MODULE_PATH, 0,0,0, CREATE_NEW, FILE_FLAG_DELETE_ON_CLOSE, 0);
+	if (_PM_hDevice != INVALID_HANDLE_VALUE) {
+	    if (!DeviceIoControl(_PM_hDevice, PMHELP_GETVER32, NULL, 0,
+		    outBuf, sizeof(outBuf), &count, NULL) || outBuf[0] < PMHELP_VERSION) {
+		/* Old version of SDDHELP loaded, so use PMHELP instead */
+		CloseHandle(_PM_hDevice);
+		_PM_hDevice = INVALID_HANDLE_VALUE;
+		}
+	    }
+	if (_PM_hDevice == INVALID_HANDLE_VALUE) {
+	    /* First try to see if there is a currently loaded PMHELP driver.
+	     * This is usually the case when we are running under Windows NT/2K.
+	     */
+	    _PM_hDevice = CreateFile(PMHELP_MODULE_PATH, 0,0,0, CREATE_NEW, FILE_FLAG_DELETE_ON_CLOSE, 0);
+	    if (_PM_hDevice == INVALID_HANDLE_VALUE) {
+		/* The driver was not staticly loaded, so try creating a file handle
+		 * to a dynamic version of the VxD if possible. Note that on WinNT/2K we
+		 * cannot support dynamically loading the drivers.
+		 */
+		_PM_hDevice = CreateFile(PMHELP_VXD_PATH, 0,0,0, CREATE_NEW, FILE_FLAG_DELETE_ON_CLOSE, 0);
+		}
+	    }
+	if (_PM_hDevice != INVALID_HANDLE_VALUE) {
+	    /* Call the driver to determine the version number */
+	    if (!DeviceIoControl(_PM_hDevice, PMHELP_GETVER32, inBuf, sizeof(inBuf),
+		    outBuf, sizeof(outBuf), &count, NULL) || outBuf[0] < PMHELP_VERSION) {
+		if (_PM_haveWinNT)
+		    PM_fatalError("Older version of PMHELP.SYS found!");
+		else
+		    PM_fatalError("Older version of PMHELP.VXD found!");
+		}
 
-            /* Now set the current path inside the VxD so it knows what the
-             * current directory is for loading Nucleus drivers.
-             */
-            inBuf[0] = (ulong)PM_getCurrentPath(cntPath,sizeof(cntPath));
-            if (!DeviceIoControl(_PM_hDevice, PMHELP_SETCNTPATH32, inBuf, sizeof(inBuf), outBuf, sizeof(outBuf), &count, NULL))
-                PM_fatalError("Unable to set VxD current path!");
+	    /* Now set the current path inside the VxD so it knows what the
+	     * current directory is for loading Nucleus drivers.
+	     */
+	    inBuf[0] = (ulong)PM_getCurrentPath(cntPath,sizeof(cntPath));
+	    if (!DeviceIoControl(_PM_hDevice, PMHELP_SETCNTPATH32, inBuf, sizeof(inBuf), outBuf, sizeof(outBuf), &count, NULL))
+		PM_fatalError("Unable to set VxD current path!");
 
-            /* Now pass down the NUCLEUS_PATH environment variable to the device
-             * driver so it can use this value if it is found.
-             */
-            if ((env = getenv("NUCLEUS_PATH")) != NULL) {
-                inBuf[0] = (ulong)env;
-                if (!DeviceIoControl(_PM_hDevice, PMHELP_SETNUCLEUSPATH32, inBuf, sizeof(inBuf), outBuf, sizeof(outBuf), &count, NULL))
-                    PM_fatalError("Unable to set VxD Nucleus path!");
-                }
+	    /* Now pass down the NUCLEUS_PATH environment variable to the device
+	     * driver so it can use this value if it is found.
+	     */
+	    if ((env = getenv("NUCLEUS_PATH")) != NULL) {
+		inBuf[0] = (ulong)env;
+		if (!DeviceIoControl(_PM_hDevice, PMHELP_SETNUCLEUSPATH32, inBuf, sizeof(inBuf), outBuf, sizeof(outBuf), &count, NULL))
+		    PM_fatalError("Unable to set VxD Nucleus path!");
+		}
 
-            /* Enable IOPL for ring-3 code by default if driver is present */
-            if (_PM_haveWinNT)
-                PM_setIOPL(3);
-            }
+	    /* Enable IOPL for ring-3 code by default if driver is present */
+	    if (_PM_haveWinNT)
+		PM_setIOPL(3);
+	    }
 
-        /* Indicate that we have been initialised */
-        inited = true;
-        }
+	/* Indicate that we have been initialised */
+	inited = true;
+	}
 }
 
 /****************************************************************************
@@ -177,14 +177,14 @@
 
     /* Enable I/O by adjusting the I/O permissions map on Windows NT */
     if (_PM_haveWinNT) {
-        CHECK_FOR_PMHELP();
-        if (iopl == 3)
-            DeviceIoControl(_PM_hDevice, PMHELP_ENABLERING3IOPL, inBuf, sizeof(inBuf),outBuf, sizeof(outBuf), &count, NULL);
-        else
-            DeviceIoControl(_PM_hDevice, PMHELP_DISABLERING3IOPL, inBuf, sizeof(inBuf),outBuf, sizeof(outBuf), &count, NULL);
-        cntIOPL = iopl;
-        return oldIOPL;
-        }
+	CHECK_FOR_PMHELP();
+	if (iopl == 3)
+	    DeviceIoControl(_PM_hDevice, PMHELP_ENABLERING3IOPL, inBuf, sizeof(inBuf),outBuf, sizeof(outBuf), &count, NULL);
+	else
+	    DeviceIoControl(_PM_hDevice, PMHELP_DISABLERING3IOPL, inBuf, sizeof(inBuf),outBuf, sizeof(outBuf), &count, NULL);
+	cntIOPL = iopl;
+	return oldIOPL;
+	}
 
     /* We always have IOPL on Windows 9x */
     return 3;
@@ -197,9 +197,9 @@
 ibool PMAPI PM_haveBIOSAccess(void)
 {
     if (PM_getOSType() == _OS_WINNT)
-        return false;
+	return false;
     else
-        return _PM_hDevice != INVALID_HANDLE_VALUE;
+	return _PM_hDevice != INVALID_HANDLE_VALUE;
 }
 
 /****************************************************************************
@@ -209,9 +209,9 @@
 long PMAPI PM_getOSType(void)
 {
     if ((GetVersion() & 0x80000000UL) == 0)
-        return ___drv_os_type = _OS_WINNT;
+	return ___drv_os_type = _OS_WINNT;
     else
-        return ___drv_os_type = _OS_WIN95;
+	return ___drv_os_type = _OS_WIN95;
 }
 
 /****************************************************************************
@@ -232,9 +232,9 @@
 {
     uint pos = strlen(s);
     if (s[pos-1] != '\\') {
-        s[pos] = '\\';
-        s[pos+1] = '\0';
-        }
+	s[pos] = '\\';
+	s[pos+1] = '\0';
+	}
 }
 
 /****************************************************************************
@@ -255,7 +255,7 @@
     const char *msg)
 {
     if (fatalErrorCleanup)
-        fatalErrorCleanup();
+	fatalErrorCleanup();
     MessageBox(NULL,msg,"Fatal Error!", MB_ICONEXCLAMATION);
     exit(1);
 }
@@ -279,19 +279,19 @@
      * memory blocks out of order).
      */
     if (!inited)
-        PM_init();
+	PM_init();
     if (!VESABuf_ptr) {
-        CHECK_FOR_PMHELP();
-        if (DeviceIoControl(_PM_hDevice, PMHELP_GETVESABUF32, NULL, 0,
-                outBuf, sizeof(outBuf), &count, NULL)) {
-            if (!outBuf[0])
-                return NULL;
-            VESABuf_ptr = (void*)outBuf[0];
-            VESABuf_len = outBuf[1];
-            VESABuf_rseg = outBuf[2];
-            VESABuf_roff = outBuf[3];
-            }
-        }
+	CHECK_FOR_PMHELP();
+	if (DeviceIoControl(_PM_hDevice, PMHELP_GETVESABUF32, NULL, 0,
+		outBuf, sizeof(outBuf), &count, NULL)) {
+	    if (!outBuf[0])
+		return NULL;
+	    VESABuf_ptr = (void*)outBuf[0];
+	    VESABuf_len = outBuf[1];
+	    VESABuf_rseg = outBuf[2];
+	    VESABuf_roff = outBuf[3];
+	    }
+	}
     *len = VESABuf_len;
     *rseg = VESABuf_rseg;
     *roff = VESABuf_roff;
@@ -405,7 +405,7 @@
     DWORD   type;
 
     if (RegQueryValueEx(hKey,(PCHAR)szValue,(PDWORD)NULL,(PDWORD)&type,(LPBYTE)value,(PDWORD)&size) == ERROR_SUCCESS)
-        return true;
+	return true;
     return false;
 }
 
@@ -424,9 +424,9 @@
 
     memset(value,0,sizeof(value));
     if (RegOpenKey(HKEY_LOCAL_MACHINE,szKey,&hKey) == ERROR_SUCCESS) {
-        status = REG_queryStringEx(hKey,szValue,value,size);
-        RegCloseKey(hKey);
-        }
+	status = REG_queryStringEx(hKey,szValue,value,size);
+	RegCloseKey(hKey);
+	}
     return status;
 }
 
@@ -460,7 +460,7 @@
     char        *env;
 
     if ((env = getenv("NUCLEUS_PATH")) != NULL)
-        return env;
+	return env;
     GetSystemDirectory(path,sizeof(path));
     strcat(path,"\\nucleus");
     return path;
@@ -497,9 +497,9 @@
     static char name[256];
 
     if (REG_queryString(szMachineNameKey,szMachineName,name,sizeof(name)))
-        return name;
+	return name;
     if (REG_queryString(szMachineNameKeyNT,szMachineName,name,sizeof(name)))
-        return name;
+	return name;
     return "Unknown";
 }
 
@@ -510,13 +510,13 @@
 void * PMAPI PM_getBIOSPointer(void)
 {
     if (_PM_haveWinNT) {
-        /* On Windows NT we have to map it physically directly */
+	/* On Windows NT we have to map it physically directly */
 	    return PM_mapPhysicalAddr(0x400, 0x1000, true);
-        }
+	}
     else {
-        /* For Windows 9x we can access this memory directly */
-        return (void*)0x400;
-        }
+	/* For Windows 9x we can access this memory directly */
+	return (void*)0x400;
+	}
 }
 
 /****************************************************************************
@@ -526,16 +526,16 @@
 void * PMAPI PM_getA0000Pointer(void)
 {
     if (_PM_haveWinNT) {
-        /* On Windows NT we have to map it physically directly */
+	/* On Windows NT we have to map it physically directly */
 	    return PM_mapPhysicalAddr(0xA0000, 0x0FFFF, false);
-        }
+	}
     else {
-        /* Always use the 0xA0000 linear address so that we will use
-         * whatever page table mappings are set up for us (ie: for virtual
-         * bank switching.
-         */
-        return (void*)0xA0000;
-        }
+	/* Always use the 0xA0000 linear address so that we will use
+	 * whatever page table mappings are set up for us (ie: for virtual
+	 * bank switching.
+	 */
+	return (void*)0xA0000;
+	}
 }
 
 /****************************************************************************
@@ -552,14 +552,14 @@
     DWORD   count;      /* Count of bytes returned from VxD */
 
     if (!inited)
-        PM_init();
+	PM_init();
     inBuf[0] = base;
     inBuf[1] = limit;
     inBuf[2] = isCached;
     CHECK_FOR_PMHELP();
     if (DeviceIoControl(_PM_hDevice, PMHELP_MAPPHYS32, inBuf, sizeof(inBuf),
-            outBuf, sizeof(outBuf), &count, NULL))
-        return (void*)outBuf[0];
+	    outBuf, sizeof(outBuf), &count, NULL))
+	return (void*)outBuf[0];
     return NULL;
 }
 
@@ -590,12 +590,12 @@
     DWORD   count;      /* Count of bytes returned from VxD */
 
     if (!inited)
-        PM_init();
+	PM_init();
     inBuf[0] = (ulong)p;
     CHECK_FOR_PMHELP();
     if (DeviceIoControl(_PM_hDevice, PMHELP_GETPHYSICALADDR32, inBuf, sizeof(inBuf),
-            outBuf, sizeof(outBuf), &count, NULL))
-        return outBuf[0];
+	    outBuf, sizeof(outBuf), &count, NULL))
+	return outBuf[0];
     return 0xFFFFFFFFUL;
 }
 
@@ -613,14 +613,14 @@
     DWORD   count;      /* Count of bytes returned from VxD */
 
     if (!inited)
-        PM_init();
+	PM_init();
     inBuf[0] = (ulong)p;
     inBuf[1] = (ulong)length;
     inBuf[2] = (ulong)physAddress;
     CHECK_FOR_PMHELP();
     if (DeviceIoControl(_PM_hDevice, PMHELP_GETPHYSICALADDRRANGE32, inBuf, sizeof(inBuf),
-            outBuf, sizeof(outBuf), &count, NULL))
-        return outBuf[0];
+	    outBuf, sizeof(outBuf), &count, NULL))
+	return outBuf[0];
     return false;
 }
 
@@ -640,14 +640,14 @@
 ****************************************************************************/
 int PMAPI PM_getCOMPort(int port)
 {
-    // TODO: Re-code this to determine real values using the Plug and Play
-    //       manager for the OS.
+    /* TODO: Re-code this to determine real values using the Plug and Play */
+    /*       manager for the OS. */
     switch (port) {
-        case 0: return 0x3F8;
-        case 1: return 0x2F8;
-        case 2: return 0x3E8;
-        case 3: return 0x2E8;
-        }
+	case 0: return 0x3F8;
+	case 1: return 0x2F8;
+	case 2: return 0x3E8;
+	case 3: return 0x2E8;
+	}
     return 0;
 }
 
@@ -657,13 +657,13 @@
 ****************************************************************************/
 int PMAPI PM_getLPTPort(int port)
 {
-    // TODO: Re-code this to determine real values using the Plug and Play
-    //       manager for the OS.
+    /* TODO: Re-code this to determine real values using the Plug and Play */
+    /*       manager for the OS. */
     switch (port) {
-        case 0: return 0x3BC;
-        case 1: return 0x378;
-        case 2: return 0x278;
-        }
+	case 0: return 0x3BC;
+	case 1: return 0x378;
+	case 2: return 0x278;
+	}
     return 0;
 }
 
@@ -685,8 +685,8 @@
     inBuf[0] = size;
     CHECK_FOR_PMHELP();
     if (DeviceIoControl(_PM_hDevice, PMHELP_MALLOCSHARED32, inBuf, sizeof(inBuf),
-            outBuf, sizeof(outBuf), &count, NULL))
-        return (void*)outBuf[0];
+	    outBuf, sizeof(outBuf), &count, NULL))
+	return (void*)outBuf[0];
     return NULL;
 }
 
@@ -772,12 +772,12 @@
     DWORD   count;      /* Count of bytes returned from VxD */
 
     if (!inited)
-        PM_init();
+	PM_init();
     inBuf[0] = intno;
     inBuf[1] = (ulong)regs;
     CHECK_FOR_PMHELP();
     DeviceIoControl(_PM_hDevice, PMHELP_DPMIINT8632, inBuf, sizeof(inBuf),
-        NULL, 0, &count, NULL);
+	NULL, 0, &count, NULL);
 }
 
 /****************************************************************************
@@ -794,14 +794,14 @@
     DWORD   count;      /* Count of bytes returned from VxD */
 
     if (!inited)
-        PM_init();
+	PM_init();
     inBuf[0] = intno;
     inBuf[1] = (ulong)in;
     inBuf[2] = (ulong)out;
     CHECK_FOR_PMHELP();
     if (DeviceIoControl(_PM_hDevice, PMHELP_INT8632, inBuf, sizeof(inBuf),
-            outBuf, sizeof(outBuf), &count, NULL))
-        return outBuf[0];
+	    outBuf, sizeof(outBuf), &count, NULL))
+	return outBuf[0];
     return 0;
 }
 
@@ -820,15 +820,15 @@
     DWORD   count;      /* Count of bytes returned from VxD */
 
     if (!inited)
-        PM_init();
+	PM_init();
     inBuf[0] = intno;
     inBuf[1] = (ulong)in;
     inBuf[2] = (ulong)out;
     inBuf[3] = (ulong)sregs;
     CHECK_FOR_PMHELP();
     if (DeviceIoControl(_PM_hDevice, PMHELP_INT86X32, inBuf, sizeof(inBuf),
-            outBuf, sizeof(outBuf), &count, NULL))
-        return outBuf[0];
+	    outBuf, sizeof(outBuf), &count, NULL))
+	return outBuf[0];
     return 0;
 }
 
@@ -846,14 +846,14 @@
     DWORD   count;      /* Count of bytes returned from VxD */
 
     if (!inited)
-        PM_init();
+	PM_init();
     inBuf[0] = seg;
     inBuf[1] = off;
     inBuf[2] = (ulong)in;
     inBuf[3] = (ulong)sregs;
     CHECK_FOR_PMHELP();
     DeviceIoControl(_PM_hDevice, PMHELP_CALLREALMODE32, inBuf, sizeof(inBuf),
-        NULL, 0, &count, NULL);
+	NULL, 0, &count, NULL);
 }
 
 /****************************************************************************
@@ -883,15 +883,15 @@
     DWORD   count;      /* Count of bytes returned from VxD */
 
     if (!inited)
-        PM_init();
+	PM_init();
     inBuf[0] = size;
     inBuf[1] = (ulong)physAddr;
     inBuf[2] = (ulong)contiguous;
     inBuf[3] = (ulong)below16M;
     CHECK_FOR_PMHELP();
     if (DeviceIoControl(_PM_hDevice, PMHELP_ALLOCLOCKED32, inBuf, sizeof(inBuf),
-            outBuf, sizeof(outBuf), &count, NULL))
-        return (void*)outBuf[0];
+	    outBuf, sizeof(outBuf), &count, NULL))
+	return (void*)outBuf[0];
     return NULL;
 }
 
@@ -908,13 +908,13 @@
     DWORD   count;      /* Count of bytes returned from VxD */
 
     if (!inited)
-        PM_init();
+	PM_init();
     inBuf[0] = (ulong)p;
     inBuf[1] = size;
     inBuf[2] = contiguous;
     CHECK_FOR_PMHELP();
     DeviceIoControl(_PM_hDevice, PMHELP_FREELOCKED32, inBuf, sizeof(inBuf),
-        NULL, 0, &count, NULL);
+	NULL, 0, &count, NULL);
 }
 
 /****************************************************************************
@@ -929,12 +929,12 @@
     DWORD   count;      /* Count of bytes returned from VxD */
 
     if (!inited)
-        PM_init();
+	PM_init();
     inBuf[0] = locked;
     CHECK_FOR_PMHELP();
     if (DeviceIoControl(_PM_hDevice, PMHELP_ALLOCPAGE32, inBuf, sizeof(inBuf),
-            outBuf, sizeof(outBuf), &count, NULL))
-        return (void*)outBuf[0];
+	    outBuf, sizeof(outBuf), &count, NULL))
+	return (void*)outBuf[0];
     return NULL;
 }
 
@@ -949,11 +949,11 @@
     DWORD   count;      /* Count of bytes returned from VxD */
 
     if (!inited)
-        PM_init();
+	PM_init();
     inBuf[0] = (ulong)p;
     CHECK_FOR_PMHELP();
     DeviceIoControl(_PM_hDevice, PMHELP_FREEPAGE32, inBuf, sizeof(inBuf),
-        NULL, 0, &count, NULL);
+	NULL, 0, &count, NULL);
 }
 
 /****************************************************************************
@@ -971,8 +971,8 @@
     inBuf[2] = (ulong)lh;
     CHECK_FOR_PMHELP();
     if (DeviceIoControl(_PM_hDevice, PMHELP_LOCKDATAPAGES32, inBuf, sizeof(inBuf),
-            outBuf, sizeof(outBuf), &count, NULL))
-        return outBuf[0];
+	    outBuf, sizeof(outBuf), &count, NULL))
+	return outBuf[0];
     return 0;
 }
 
@@ -991,8 +991,8 @@
     inBuf[2] = (ulong)lh;
     CHECK_FOR_PMHELP();
     if (DeviceIoControl(_PM_hDevice, PMHELP_UNLOCKDATAPAGES32, inBuf, sizeof(inBuf),
-            outBuf, sizeof(outBuf), &count, NULL))
-        return outBuf[0];
+	    outBuf, sizeof(outBuf), &count, NULL))
+	return outBuf[0];
     return 0;
 }
 
@@ -1011,8 +1011,8 @@
     inBuf[2] = (ulong)lh;
     CHECK_FOR_PMHELP();
     if (DeviceIoControl(_PM_hDevice, PMHELP_LOCKCODEPAGES32, inBuf, sizeof(inBuf),
-            outBuf, sizeof(outBuf), &count, NULL))
-        return outBuf[0];
+	    outBuf, sizeof(outBuf), &count, NULL))
+	return outBuf[0];
     return 0;
 }
 
@@ -1031,8 +1031,8 @@
     inBuf[2] = (ulong)lh;
     CHECK_FOR_PMHELP();
     if (DeviceIoControl(_PM_hDevice, PMHELP_UNLOCKCODEPAGES32, inBuf, sizeof(inBuf),
-            outBuf, sizeof(outBuf), &count, NULL))
-        return outBuf[0];
+	    outBuf, sizeof(outBuf), &count, NULL))
+	return outBuf[0];
     return 0;
 }
 
@@ -1099,14 +1099,14 @@
     DWORD   count;      /* Count of bytes returned from VxD */
 
     if (!inited)
-        PM_init();
+	PM_init();
     inBuf[0] = base;
     inBuf[1] = length;
     inBuf[2] = type;
     CHECK_FOR_PMHELP();
     if (DeviceIoControl(_PM_hDevice, PMHELP_ENABLELFBCOMB32, inBuf, sizeof(inBuf),
-            outBuf, sizeof(outBuf), &count, NULL))
-        return outBuf[0];
+	    outBuf, sizeof(outBuf), &count, NULL))
+	return outBuf[0];
     return false;
 }
 
@@ -1121,8 +1121,8 @@
 
     CHECK_FOR_PMHELP();
     if (DeviceIoControl(_PM_hDevice, PMHELP_GETPDB32, NULL, 0,
-            outBuf, sizeof(outBuf), &count, NULL))
-        return outBuf[0];
+	    outBuf, sizeof(outBuf), &count, NULL))
+	return outBuf[0];
     return 0;
 }
 
@@ -1201,15 +1201,15 @@
     memset(findData,0,findData->dwSize);
     findData->dwSize = dwSize;
     if (blk->dwFileAttributes & FILE_ATTRIBUTE_READONLY)
-        findData->attrib |= PM_FILE_READONLY;
+	findData->attrib |= PM_FILE_READONLY;
     if (blk->dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY)
-        findData->attrib |= PM_FILE_DIRECTORY;
+	findData->attrib |= PM_FILE_DIRECTORY;
     if (blk->dwFileAttributes & FILE_ATTRIBUTE_ARCHIVE)
-        findData->attrib |= PM_FILE_ARCHIVE;
+	findData->attrib |= PM_FILE_ARCHIVE;
     if (blk->dwFileAttributes & FILE_ATTRIBUTE_HIDDEN)
-        findData->attrib |= PM_FILE_HIDDEN;
+	findData->attrib |= PM_FILE_HIDDEN;
     if (blk->dwFileAttributes & FILE_ATTRIBUTE_SYSTEM)
-        findData->attrib |= PM_FILE_SYSTEM;
+	findData->attrib |= PM_FILE_SYSTEM;
     findData->sizeLo = blk->nFileSizeLow;
     findData->sizeHi = blk->nFileSizeHigh;
     strncpy(findData->name,blk->cFileName,PM_MAX_PATH);
@@ -1228,9 +1228,9 @@
     HANDLE          hfile;
 
     if ((hfile = FindFirstFile(filename,&blk)) != INVALID_HANDLE_VALUE) {
-        convertFindData(findData,&blk);
-        return (void*)hfile;
-        }
+	convertFindData(findData,&blk);
+	return (void*)hfile;
+	}
     return PM_FILE_INVALID;
 }
 
@@ -1245,9 +1245,9 @@
     WIN32_FIND_DATA blk;
 
     if (FindNextFile((HANDLE)handle,&blk)) {
-        convertFindData(findData,&blk);
-        return true;
-        }
+	convertFindData(findData,&blk);
+	return true;
+	}
     return false;
 }
 
@@ -1295,8 +1295,8 @@
     char *dir,
     int len)
 {
-    // NT stores the current directory for drive N in the magic environment
-    // variable =N: so we simply look for that environment variable.
+    /* NT stores the current directory for drive N in the magic environment */
+    /* variable =N: so we simply look for that environment variable. */
     char envname[4];
 
     envname[0] = '=';
@@ -1304,14 +1304,14 @@
     envname[2] = ':';
     envname[3] = '\0';
     if (GetEnvironmentVariable(envname,dir,len) == 0) {
-        // The current directory or the drive has not been set yet, so
-        // simply set it to the root.
-        dir[0] = envname[1];
-        dir[1] = ':';
-        dir[2] = '\\';
-        dir[3] = '\0';
-        SetEnvironmentVariable(envname,dir);
-        }
+	/* The current directory or the drive has not been set yet, so */
+	/* simply set it to the root. */
+	dir[0] = envname[1];
+	dir[1] = ':';
+	dir[2] = '\\';
+	dir[3] = '\0';
+	SetEnvironmentVariable(envname,dir);
+	}
 }
 
 /****************************************************************************
@@ -1325,13 +1325,13 @@
     DWORD attr = 0;
 
     if (attrib & PM_FILE_READONLY)
-        attr |= FILE_ATTRIBUTE_READONLY;
+	attr |= FILE_ATTRIBUTE_READONLY;
     if (attrib & PM_FILE_ARCHIVE)
-        attr |= FILE_ATTRIBUTE_ARCHIVE;
+	attr |= FILE_ATTRIBUTE_ARCHIVE;
     if (attrib & PM_FILE_HIDDEN)
-        attr |= FILE_ATTRIBUTE_HIDDEN;
+	attr |= FILE_ATTRIBUTE_HIDDEN;
     if (attrib & PM_FILE_SYSTEM)
-        attr |= FILE_ATTRIBUTE_SYSTEM;
+	attr |= FILE_ATTRIBUTE_SYSTEM;
     SetFileAttributes((LPSTR)filename, attr);
 }
 
@@ -1346,13 +1346,13 @@
     uint    attrib = 0;
 
     if (attr & FILE_ATTRIBUTE_READONLY)
-        attrib |= PM_FILE_READONLY;
+	attrib |= PM_FILE_READONLY;
     if (attr & FILE_ATTRIBUTE_ARCHIVE)
-        attrib |= PM_FILE_ARCHIVE;
+	attrib |= PM_FILE_ARCHIVE;
     if (attr & FILE_ATTRIBUTE_HIDDEN)
-        attrib |= PM_FILE_HIDDEN;
+	attrib |= PM_FILE_HIDDEN;
     if (attr & FILE_ATTRIBUTE_SYSTEM)
-        attrib |= PM_FILE_SYSTEM;
+	attrib |= PM_FILE_SYSTEM;
     return attrib;
 }
 
@@ -1393,17 +1393,17 @@
 
     of.cBytes = sizeof(of);
     if ((f = OpenFile(filename,&of,OF_READ)) == HFILE_ERROR)
-        return false;
+	return false;
     if (!GetFileTime((HANDLE)f,NULL,NULL,&utcTime))
-        goto Exit;
+	goto Exit;
     if (!gmTime) {
-        if (!FileTimeToLocalFileTime(&utcTime,&localTime))
-            goto Exit;
-        }
+	if (!FileTimeToLocalFileTime(&utcTime,&localTime))
+	    goto Exit;
+	}
     else
-        localTime = utcTime;
+	localTime = utcTime;
     if (!FileTimeToSystemTime(&localTime,&sysTime))
-        goto Exit;
+	goto Exit;
     time->year = sysTime.wYear;
     time->mon = sysTime.wMonth-1;
     time->day = sysTime.wYear;
@@ -1434,7 +1434,7 @@
 
     of.cBytes = sizeof(of);
     if ((f = OpenFile(filename,&of,OF_WRITE)) == HFILE_ERROR)
-        return false;
+	return false;
     sysTime.wYear = time->year;
     sysTime.wMonth = time->mon+1;
     sysTime.wYear = time->day;
@@ -1442,19 +1442,18 @@
     sysTime.wMinute = time->min;
     sysTime.wSecond = time->sec;
     if (!SystemTimeToFileTime(&sysTime,&localTime))
-        goto Exit;
+	goto Exit;
     if (!gmTime) {
-        if (!LocalFileTimeToFileTime(&localTime,&utcTime))
-            goto Exit;
-        }
+	if (!LocalFileTimeToFileTime(&localTime,&utcTime))
+	    goto Exit;
+	}
     else
-        utcTime = localTime;
+	utcTime = localTime;
     if (!SetFileTime((HANDLE)f,NULL,NULL,&utcTime))
-        goto Exit;
+	goto Exit;
     status = true;
 
 Exit:
     CloseHandle((HANDLE)f);
     return status;
 }
-

diff --git a/board/MAI/bios_emulator/scitech/src/pm/win32/ztimer.c b/board/MAI/bios_emulator/scitech/src/pm/win32/ztimer.c
index 318929a..5a901a4 100644
--- a/board/MAI/bios_emulator/scitech/src/pm/win32/ztimer.c
+++ b/board/MAI/bios_emulator/scitech/src/pm/win32/ztimer.c

@@ -57,9 +57,9 @@
     LZTimerObject *tm)
 {
     if (havePerformanceCounter)
-        QueryPerformanceCounter((LARGE_INTEGER*)&tm->start);
+	QueryPerformanceCounter((LARGE_INTEGER*)&tm->start);
     else
-        tm->start.low = timeGetTime();
+	tm->start.low = timeGetTime();
 }
 
 /****************************************************************************
@@ -72,14 +72,14 @@
     CPU_largeInteger    tmLap,tmCount;
 
     if (havePerformanceCounter) {
-        QueryPerformanceCounter((LARGE_INTEGER*)&tmLap);
-        _CPU_diffTime64(&tm->start,&tmLap,&tmCount);
-        return _CPU_calcMicroSec(&tmCount,countFreq.low);
-        }
+	QueryPerformanceCounter((LARGE_INTEGER*)&tmLap);
+	_CPU_diffTime64(&tm->start,&tmLap,&tmCount);
+	return _CPU_calcMicroSec(&tmCount,countFreq.low);
+	}
     else {
-        tmLap.low = timeGetTime();
-        return (tmLap.low - tm->start.low) * 1000L;
-        }
+	tmLap.low = timeGetTime();
+	return (tmLap.low - tm->start.low) * 1000L;
+	}
 }
 
 /****************************************************************************
@@ -90,9 +90,9 @@
     LZTimerObject *tm)
 {
     if (havePerformanceCounter)
-        QueryPerformanceCounter((LARGE_INTEGER*)&tm->end);
+	QueryPerformanceCounter((LARGE_INTEGER*)&tm->end);
     else
-        tm->end.low = timeGetTime();
+	tm->end.low = timeGetTime();
 }
 
 /****************************************************************************
@@ -105,11 +105,11 @@
     CPU_largeInteger    tmCount;
 
     if (havePerformanceCounter) {
-        _CPU_diffTime64(&tm->start,&tm->end,&tmCount);
-        return _CPU_calcMicroSec(&tmCount,countFreq.low);
-        }
+	_CPU_diffTime64(&tm->start,&tm->end,&tmCount);
+	return _CPU_calcMicroSec(&tmCount,countFreq.low);
+	}
     else
-        return (tm->end.low - tm->start.low) * 1000L;
+	return (tm->end.low - tm->start.low) * 1000L;
 }
 
 /****************************************************************************

diff --git a/board/MAI/bios_emulator/scitech/src/pm/x11/event.c b/board/MAI/bios_emulator/scitech/src/pm/x11/event.c
index 23b9380..b34bfac 100644
--- a/board/MAI/bios_emulator/scitech/src/pm/x11/event.c
+++ b/board/MAI/bios_emulator/scitech/src/pm/x11/event.c

@@ -83,7 +83,7 @@
 {
   static unsigned starttime = 0;
   struct timeval t;
-  
+
   gettimeofday(&t, NULL);
   if (starttime == 0)
     starttime = t.tv_sec * 1000 + (t.tv_usec/1000);
@@ -105,14 +105,14 @@
 static void _EVT_pumpMessages(void)
 #endif
 {
-  // TODO: The purpose of this function is to read all keyboard and mouse
-  //         events from the OS specific event queue, translate them and post
-  //         them into the SciTech event queue.
+  /* TODO: The purpose of this function is to read all keyboard and mouse */
+  /*         events from the OS specific event queue, translate them and post */
+  /*         them into the SciTech event queue. */
   event_t evt;
   XEvent  ev;
   static int old_mx = 0, old_my = 0, buts = 0, c;
   char buf[2];
-  
+
   while (XPending(_EVT_dpy) && XNextEvent(_EVT_dpy,&ev)) {
     evt.when = _MGL_getTicks();
 
@@ -129,36 +129,36 @@
       evt.what = EVT_KEYUP;
       evt.message = keyUpMsg[c];
       if(count < EVENTQSIZE)
-        addEvent(&evt);
+	addEvent(&evt);
       keyUpMsg[c] = 0;
       repeatKey[c] = 0;
       break;
     case ButtonPress:
       evt.what = EVT_MOUSEDOWN;
       if(ev.xbutton.button == 1){
-        buts |= EVT_LEFTBUT;
-        evt.message = EVT_LEFTBMASK;
+	buts |= EVT_LEFTBUT;
+	evt.message = EVT_LEFTBMASK;
       }else if(ev.xbutton.button == 2){
-        buts |= EVT_MIDDLEBUT;
-        evt.message = EVT_MIDDLEBMASK;
+	buts |= EVT_MIDDLEBUT;
+	evt.message = EVT_MIDDLEBMASK;
       }else if(ev.xbutton.button == 3){
-        buts |= EVT_RIGHTBUT;
-        evt.message = EVT_RIGHTBMASK;
+	buts |= EVT_RIGHTBUT;
+	evt.message = EVT_RIGHTBMASK;
       }
       evt.modifiers = modifiers | buts;
-      
+
       break;
     case ButtonRelease:
       evt.what = EVT_MOUSEUP;
       if(ev.xbutton.button == 1){
-        buts &= ~EVT_LEFTBUT;
-        evt.message = EVT_LEFTBMASK;
+	buts &= ~EVT_LEFTBUT;
+	evt.message = EVT_LEFTBMASK;
       }else if(ev.xbutton.button == 2){
-        buts &= ~EVT_MIDDLEBUT;
-        evt.message = EVT_MIDDLEBMASK;
+	buts &= ~EVT_MIDDLEBUT;
+	evt.message = EVT_MIDDLEBMASK;
       }else if(ev.xbutton.button == 3){
-        buts &= ~EVT_RIGHTBUT;
-        evt.message = EVT_RIGHTBMASK;
+	buts &= ~EVT_RIGHTBUT;
+	evt.message = EVT_RIGHTBMASK;
       }
       evt.modifiers = modifiers | buts;
 
@@ -226,7 +226,7 @@
   _mouseMove = mouseMove;
   initEventQueue();
   memset(keyUpMsg,0,sizeof(keyUpMsg));
-  
+
 
   /* query server for input extensions */
   result =XQueryExtension(_EVT_dpy,"XInputExtension",&i,&j,&k);
@@ -269,7 +269,7 @@
 ****************************************************************************/
 void EVT_resume(void)
 {
-    // Do nothing for non DOS systems
+    /* Do nothing for non DOS systems */
 }
 
 /****************************************************************************
@@ -279,7 +279,7 @@
 ****************************************************************************/
 void EVT_suspend(void)
 {
-    // Do nothing for non DOS systems
+    /* Do nothing for non DOS systems */
 }
 
 /****************************************************************************
@@ -293,7 +293,7 @@
     signal(SIGFPE, SIG_DFL);
     signal(SIGINT, SIG_DFL);
 
-    // TODO: Do any OS specific cleanup in here
+    /* TODO: Do any OS specific cleanup in here */
 }
 
 /****************************************************************************

diff --git a/board/MAI/bios_emulator/scitech/src/pm/ztimer.c b/board/MAI/bios_emulator/scitech/src/pm/ztimer.c
index 35081e9..5acf7b1 100644
--- a/board/MAI/bios_emulator/scitech/src/pm/ztimer.c
+++ b/board/MAI/bios_emulator/scitech/src/pm/ztimer.c

@@ -104,12 +104,12 @@
     ibool accurate)
 {
     if (cpuSpeed == -1) {
-        __ZTimerInit();
+	__ZTimerInit();
 #ifdef  __INTEL__
-        cpuSpeed = CPU_getProcessorSpeedInHZ(accurate);
-        haveRDTSC = CPU_haveRDTSC() && (cpuSpeed > 0);
+	cpuSpeed = CPU_getProcessorSpeedInHZ(accurate);
+	haveRDTSC = CPU_haveRDTSC() && (cpuSpeed > 0);
 #endif
-        }
+	}
 }
 
 /****************************************************************************
@@ -174,11 +174,11 @@
 {
 #ifdef  __INTEL__
     if (haveRDTSC) {
-        _CPU_readTimeStamp(&tm->start);
-        }
+	_CPU_readTimeStamp(&tm->start);
+	}
     else
 #endif
-        __LZTimerOn(tm);
+	__LZTimerOn(tm);
 }
 
 /****************************************************************************
@@ -210,13 +210,13 @@
     CPU_largeInteger    tmLap,tmCount;
 
     if (haveRDTSC) {
-        _CPU_readTimeStamp(&tmLap);
-        _CPU_diffTime64(&tm->start,&tmLap,&tmCount);
-        return _CPU_calcMicroSec(&tmCount,cpuSpeed);
-        }
+	_CPU_readTimeStamp(&tmLap);
+	_CPU_diffTime64(&tm->start,&tmLap,&tmCount);
+	return _CPU_calcMicroSec(&tmCount,cpuSpeed);
+	}
     else
 #endif
-        return __LZTimerLap(tm);
+	return __LZTimerLap(tm);
 }
 
 /****************************************************************************
@@ -244,11 +244,11 @@
 {
 #ifdef  __INTEL__
     if (haveRDTSC) {
-        _CPU_readTimeStamp(&tm->end);
-        }
+	_CPU_readTimeStamp(&tm->end);
+	}
     else
 #endif
-        __LZTimerOff(tm);
+	__LZTimerOff(tm);
 }
 
 /****************************************************************************
@@ -278,12 +278,12 @@
     CPU_largeInteger    tmCount;
 
     if (haveRDTSC) {
-        _CPU_diffTime64(&tm->start,&tm->end,&tmCount);
-        return _CPU_calcMicroSec(&tmCount,cpuSpeed);
-        }
+	_CPU_diffTime64(&tm->start,&tm->end,&tmCount);
+	return _CPU_calcMicroSec(&tmCount,cpuSpeed);
+	}
     else
 #endif
-        return __LZTimerCount(tm);
+	return __LZTimerCount(tm);
 }
 
 /****************************************************************************
@@ -514,4 +514,3 @@
 void ZAPI ULZTimerResolution(
 	ulong *resolution)
 { *resolution = ULZTIMER_RESOLUTION; }
-

diff --git a/board/MAI/bios_emulator/scitech/src/v86bios/AsmMacros.h b/board/MAI/bios_emulator/scitech/src/v86bios/AsmMacros.h
index e824299..77c545a 100644
--- a/board/MAI/bios_emulator/scitech/src/v86bios/AsmMacros.h
+++ b/board/MAI/bios_emulator/scitech/src/v86bios/AsmMacros.h

@@ -2,24 +2,24 @@
 /*
  * (c) Copyright 1993,1994 by David Wexelblat <dwex@xfree86.org>
  *
- * Permission is hereby granted, free of charge, to any person obtaining a 
- * copy of this software and associated documentation files (the "Software"), 
- * to deal in the Software without restriction, including without limitation 
- * the rights to use, copy, modify, merge, publish, distribute, sublicense, 
- * and/or sell copies of the Software, and to permit persons to whom the 
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
  * Software is furnished to do so, subject to the following conditions:
  *
  * The above copyright notice and this permission notice shall be included in
  * all copies or substantial portions of the Software.
- * 
+ *
  * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
  * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL 
- * DAVID WEXELBLAT BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, 
- * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF 
- * OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE 
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+ * DAVID WEXELBLAT BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+ * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF
+ * OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  * SOFTWARE.
- * 
+ *
  * Except as contained in this notice, the name of David Wexelblat shall not be
  * used in advertising or otherwise to promote the sale, use or other dealings
  * in this Software without prior written authorization from David Wexelblat.
@@ -28,32 +28,32 @@
 /*
  * Copyright 1997
  * Digital Equipment Corporation. All rights reserved.
- * This software is furnished under license and may be used and copied only in 
- * accordance with the following terms and conditions.  Subject to these 
- * conditions, you may download, copy, install, use, modify and distribute 
- * this software in source and/or binary form. No title or ownership is 
+ * This software is furnished under license and may be used and copied only in
+ * accordance with the following terms and conditions.  Subject to these
+ * conditions, you may download, copy, install, use, modify and distribute
+ * this software in source and/or binary form. No title or ownership is
  * transferred hereby.
  *
- * 1) Any source code used, modified or distributed must reproduce and retain 
+ * 1) Any source code used, modified or distributed must reproduce and retain
  *    this copyright notice and list of conditions as they appear in the source
  *    file.
  *
- * 2) No right is granted to use any trade name, trademark, or logo of Digital 
- *    Equipment Corporation. Neither the "Digital Equipment Corporation" name 
- *    nor any trademark or logo of Digital Equipment Corporation may be used 
- *    to endorse or promote products derived from this software without the 
+ * 2) No right is granted to use any trade name, trademark, or logo of Digital
+ *    Equipment Corporation. Neither the "Digital Equipment Corporation" name
+ *    nor any trademark or logo of Digital Equipment Corporation may be used
+ *    to endorse or promote products derived from this software without the
  *    prior written permission of Digital Equipment Corporation.
  *
- * 3) This software is provided "AS-IS" and any express or implied warranties, 
- *    including but not limited to, any implied warranties of merchantability, 
- *    fitness for a particular purpose, or non-infringement are disclaimed. In 
- *    no event shall DIGITAL be liable for any damages whatsoever, and in 
- *    particular, DIGITAL shall not be liable for special, indirect, 
- *    consequential, or incidental damages or damages for 
- *    lost profits, loss of revenue or loss of use, whether such damages arise 
- *    in contract, 
- *    negligence, tort, under statute, in equity, at law or otherwise, even if 
- *    advised of the possibility of such damage. 
+ * 3) This software is provided "AS-IS" and any express or implied warranties,
+ *    including but not limited to, any implied warranties of merchantability,
+ *    fitness for a particular purpose, or non-infringement are disclaimed. In
+ *    no event shall DIGITAL be liable for any damages whatsoever, and in
+ *    particular, DIGITAL shall not be liable for special, indirect,
+ *    consequential, or incidental damages or damages for
+ *    lost profits, loss of revenue or loss of use, whether such damages arise
+ *    in contract,
+ *    negligence, tort, under statute, in equity, at law or otherwise, even if
+ *    advised of the possibility of such damage.
  *
  */
 
@@ -356,8 +356,8 @@
 {
   unsigned int ret;
   __asm__ __volatile__("in%B0 (%1)" :
-                   "=a" (ret) :
-                   "d" (port));
+		   "=a" (ret) :
+		   "d" (port));
   return ret;
 }
 
@@ -367,8 +367,8 @@
 {
   unsigned int ret;
   __asm__ __volatile__("in%W0 (%1)" :
-                   "=a" (ret) :
-                   "d" (port));
+		   "=a" (ret) :
+		   "d" (port));
   return ret;
 }
 
@@ -378,8 +378,8 @@
 {
   unsigned int ret;
   __asm__ __volatile__("in%L0 (%1)" :
-                   "=a" (ret) :
-                   "d" (port));
+		   "=a" (ret) :
+		   "d" (port));
   return ret;
 }
 
@@ -395,7 +395,7 @@
 #define intr_disable()
 #define intr_enable()
 
-#else 
+#else
 
 static __inline__ void
 intr_disable()

diff --git a/board/MAI/bios_emulator/scitech/src/v86bios/README b/board/MAI/bios_emulator/scitech/src/v86bios/README
index 4b7d0fa..cb65674 100644
--- a/board/MAI/bios_emulator/scitech/src/v86bios/README
+++ b/board/MAI/bios_emulator/scitech/src/v86bios/README

@@ -2,12 +2,12 @@
 This is a preliminary version of a VGA softbooter for LINUX.
 
 It makes use of the of the vm86() call and is therefore only
-usable on ix86 systems. 
+usable on ix86 systems.
 There are plans to port this program to use a x86 emulator
 like x86emu. Also it may be ported to other operating systems.
 
 So far it has been tested on a small number of cards. It might
-well be that it will fail on your card. 
+well be that it will fail on your card.
 
 If you need to make modifications to the programs to be able
 to boot your card please let the author know.
@@ -16,20 +16,17 @@
 to be hardcoded. You can do this by editing debug.h. You can
 turn on a bunch of debug output. Other options allow you to
 boot the primary card (CONFIG_ACTIVE_DEVICE), save the bios
-to a file (SAVE_BIOS), and map the original system bios 
+to a file (SAVE_BIOS), and map the original system bios
 (MAP_SYS_BIOS).
 
 The author wants to thank
  Hans Lermen   (dosemu)
  and
  Kendall Bennett (x86emu)
-for their support. 
+for their support.
 
 Parts of the code - especially in v86.c and io.c - are based on code
 taken from dosemu. Parts of the code in int.c are based on code taken
 from x86emu
 
 Egbert Eich.  <Egbert.Eich@Physik.TU-Darmstadt.DE>
-
-
-

diff --git a/board/MAI/bios_emulator/scitech/src/v86bios/cbios.c b/board/MAI/bios_emulator/scitech/src/v86bios/cbios.c
index 4173c95..6b12dff 100644
--- a/board/MAI/bios_emulator/scitech/src/v86bios/cbios.c
+++ b/board/MAI/bios_emulator/scitech/src/v86bios/cbios.c

@@ -57,18 +57,18 @@
     Config.IoStatistics = IO_STATISTICS;
     Config.PrintIrq = PRINT_IRQ;
     Config.PrintPci = PRINT_PCI;
-    Config.ShowAllDev = SHOW_ALL_DEV;        
-    Config.PrintIp = PRINT_IP;           
-    Config.SaveBios = SAVE_BIOS;          
-    Config.Trace = TRACE;             
-    Config.ConfigActiveOnly = CONFIG_ACTIVE_ONLY;  
+    Config.ShowAllDev = SHOW_ALL_DEV;
+    Config.PrintIp = PRINT_IP;
+    Config.SaveBios = SAVE_BIOS;
+    Config.Trace = TRACE;
+    Config.ConfigActiveOnly = CONFIG_ACTIVE_ONLY;
     Config.ConfigActiveDevice = CONFIG_ACTIVE_DEVICE;
-    Config.MapSysBios = MAP_SYS_BIOS;        
-    Config.Resort = RESORT;            
-    Config.FixRom = FIX_ROM;            
-    Config.NoConsole = NO_CONSOLE;         
+    Config.MapSysBios = MAP_SYS_BIOS;
+    Config.Resort = RESORT;
+    Config.FixRom = FIX_ROM;
+    Config.NoConsole = NO_CONSOLE;
     Config.Verbose = VERBOSE;
-    
+
     if (!map())
     exit(1);
     if (!copy_sys_bios())
@@ -79,7 +79,7 @@
     exit(1);
     if (!copy_vbios(vbios_base))
     exit(1);
-    
+
     iopl(3);
     setup_io();
     runBIOS(argc,argv);
@@ -91,18 +91,18 @@
     exit (1);
 }
 
-int  
+int
 map(void)
 {
     void* mem;
 
     mem = mmap(0, (size_t)SIZE,
-               PROT_EXEC | PROT_READ | PROT_WRITE,
-               MAP_FIXED | MAP_PRIVATE | MAP_ANON,
-               -1, 0 ); 
+	       PROT_EXEC | PROT_READ | PROT_WRITE,
+	       MAP_FIXED | MAP_PRIVATE | MAP_ANON,
+	       -1, 0 );
     if (mem != 0) {
-        perror("anonymous map");
-        return (0);
+	perror("anonymous map");
+	return (0);
     }
     memset(mem,0,SIZE);
 
@@ -117,14 +117,14 @@
     int mem_fd;
 
     if ((mem_fd = open(MEM_FILE,O_RDONLY))<0) {
-        perror("opening memory");
-        return (0);
+	perror("opening memory");
+	return (0);
     }
-  
-    if (lseek(mem_fd,(off_t) SYS_BIOS,SEEK_SET) != (off_t) SYS_BIOS) 
-        goto Error;
-    if (read(mem_fd, (char *)SYS_BIOS, (size_t) 0xFFFF) != (size_t) 0xFFFF) 
-        goto Error;
+
+    if (lseek(mem_fd,(off_t) SYS_BIOS,SEEK_SET) != (off_t) SYS_BIOS)
+	goto Error;
+    if (read(mem_fd, (char *)SYS_BIOS, (size_t) 0xFFFF) != (size_t) 0xFFFF)
+	goto Error;
 
     close(mem_fd);
     return (1);
@@ -141,33 +141,33 @@
     int mem_fd;
 
 #ifdef __ia64__
-    if ((mem_fd = open(MEM_FILE,O_RDWR | O_SYNC))<0) 
+    if ((mem_fd = open(MEM_FILE,O_RDWR | O_SYNC))<0)
 #else
-    if ((mem_fd = open(MEM_FILE,O_RDWR))<0) 
+    if ((mem_fd = open(MEM_FILE,O_RDWR))<0)
 #endif
       {
-        perror("opening memory");
-        return 0;
+	perror("opening memory");
+	return 0;
     }
 
 #ifndef __alpha__
     if (mmap((void *) VRAM_START, (size_t) VRAM_SIZE,
-                     PROT_EXEC | PROT_READ | PROT_WRITE, MAP_SHARED | MAP_FIXED,
-                     mem_fd, VRAM_START) == (void *) -1) 
+		     PROT_EXEC | PROT_READ | PROT_WRITE, MAP_SHARED | MAP_FIXED,
+		     mem_fd, VRAM_START) == (void *) -1)
 #else
-         if (!_bus_base()) sparse_shift = 7; /* Uh, oh, JENSEN... */
-         if (!_bus_base_sparse()) sparse_shift = 0;
-         if ((vram_map = mmap(0,(size_t) (VRAM_SIZE << sparse_shift),
-                                                 PROT_READ | PROT_WRITE,
-                                                 MAP_SHARED,
-                                                 mem_fd, (VRAM_START << sparse_shift)
-                                                 | _bus_base_sparse())) == (void *) -1)
+	 if (!_bus_base()) sparse_shift = 7; /* Uh, oh, JENSEN... */
+	 if (!_bus_base_sparse()) sparse_shift = 0;
+	 if ((vram_map = mmap(0,(size_t) (VRAM_SIZE << sparse_shift),
+						 PROT_READ | PROT_WRITE,
+						 MAP_SHARED,
+						 mem_fd, (VRAM_START << sparse_shift)
+						 | _bus_base_sparse())) == (void *) -1)
 #endif
       {
-        perror("mmap error in map_hardware_ram");
-            close(mem_fd);
-            return (0);
-        }
+	perror("mmap error in map_hardware_ram");
+	    close(mem_fd);
+	    return (0);
+	}
     vram_mapped = 1;
     close(mem_fd);
     return (1);
@@ -181,39 +181,39 @@
     int size;
 
     if ((mem_fd = open(MEM_FILE,O_RDONLY))<0) {
-        perror("opening memory");
-        return (0);
+	perror("opening memory");
+	return (0);
     }
 
-    if (lseek(mem_fd,(off_t) v_base, SEEK_SET) != (off_t) v_base) { 
-          fprintf(stderr,"Cannot lseek\n");
-          goto Error;
+    if (lseek(mem_fd,(off_t) v_base, SEEK_SET) != (off_t) v_base) {
+	  fprintf(stderr,"Cannot lseek\n");
+	  goto Error;
       }
     tmp = (unsigned char *)malloc(3);
     if (read(mem_fd, (char *)tmp, (size_t) 3) != (size_t) 3) {
-            fprintf(stderr,"Cannot read\n");
-        goto Error;
+	    fprintf(stderr,"Cannot read\n");
+	goto Error;
     }
-    if (lseek(mem_fd,(off_t) v_base,SEEK_SET) != (off_t) v_base) 
-        goto Error;
+    if (lseek(mem_fd,(off_t) v_base,SEEK_SET) != (off_t) v_base)
+	goto Error;
 
     if (*tmp != 0x55 || *(tmp+1) != 0xAA ) {
-        fprintf(stderr,"No bios found at: 0x%lx\n",v_base);
-        goto Error;
+	fprintf(stderr,"No bios found at: 0x%lx\n",v_base);
+	goto Error;
     }
 #ifdef DEBUG
-        dprint((unsigned long)tmp,0x100);
+	dprint((unsigned long)tmp,0x100);
 #endif
     size = *(tmp+2) * 512;
 
     if (read(mem_fd, (char *)v_base, (size_t) size) != (size_t) size) {
-            fprintf(stderr,"Cannot read\n");
-        goto Error;
+	    fprintf(stderr,"Cannot read\n");
+	goto Error;
     }
     free(tmp);
     close(mem_fd);
     if (!chksum((CARD8*)v_base))
-        return (0);
+	return (0);
 
     return (1);
 
@@ -233,7 +233,7 @@
 unmap_vram(void)
 {
     if (!vram_mapped) return;
-    
+
     munmap((void*)VRAM_START,VRAM_SIZE);
     vram_mapped = 0;
 }
@@ -259,15 +259,15 @@
     int mem_fd;
     CARD32 vbase;
     void *map;
-    
+
     if ((mem_fd = open(MEM_FILE,O_RDONLY))<0) {
     perror("opening memory");
     return (0);
     }
-  
+
     if ((map = mmap((void *) 0, (size_t) 0x2000,
-         PROT_EXEC | PROT_READ | PROT_WRITE, MAP_SHARED,
-         mem_fd, 0)) == (void *)-1)   {
+	 PROT_EXEC | PROT_READ | PROT_WRITE, MAP_SHARED,
+	 mem_fd, 0)) == (void *)-1)   {
     perror("mmap error in map_hardware_ram");
     close(mem_fd);
     return (0);
@@ -282,7 +282,7 @@
      */
     bios_var = (char *)malloc(BIOS_MEM);
     memcpy(bios_var,0,BIOS_MEM);
-    
+
     vbase = (*((CARD16*)(0x10 << 2) + 1)) << 4;
     fprintf(stderr,"vbase: 0x%x\n",vbase);
     return vbase;
@@ -294,28 +294,28 @@
     int mem_fd;
     void *map;
     memType i;
-    
+
 #ifdef __ia64__
-    if ((mem_fd = open(MEM_FILE,O_RDWR | O_SYNC))<0) 
+    if ((mem_fd = open(MEM_FILE,O_RDWR | O_SYNC))<0)
 #else
-    if ((mem_fd = open(MEM_FILE,O_RDWR))<0) 
+    if ((mem_fd = open(MEM_FILE,O_RDWR))<0)
 #endif
       {
-        perror("opening memory");
-        return;
+	perror("opening memory");
+	return;
       }
-  
+
     if ((map = mmap((void *) 0, (size_t) 0x2000,
-         PROT_EXEC | PROT_READ | PROT_WRITE, MAP_SHARED,
-         mem_fd, 0)) == (void *)-1)   {
+	 PROT_EXEC | PROT_READ | PROT_WRITE, MAP_SHARED,
+	 mem_fd, 0)) == (void *)-1)   {
     perror("mmap error in map_hardware_ram");
     close(mem_fd);
     return;
     }
 
     for (i = 0; i < BIOS_MEM; i++) {
-    if (bios_var[i] != *(CARD8*)i) 
-        *((CARD8*)map + i) = *(CARD8*)i;
+    if (bios_var[i] != *(CARD8*)i)
+	*((CARD8*)map + i) = *(CARD8*)i;
     }
 
     munmap(map,0x2000);
@@ -338,23 +338,23 @@
     while ((c = getopt(argc,argv,"a:b:c:d:e:i:")) != EOF) {
     switch (c) {
     case 'a':
-        regs->ax = strtol(optarg,NULL,0);
-        break;
+	regs->ax = strtol(optarg,NULL,0);
+	break;
     case 'b':
-        regs->bx = strtol(optarg,NULL,0);
-        break;
+	regs->bx = strtol(optarg,NULL,0);
+	break;
     case 'c':
-        regs->cx = strtol(optarg,NULL,0);
-        break;
+	regs->cx = strtol(optarg,NULL,0);
+	break;
     case 'd':
-        regs->dx = strtol(optarg,NULL,0);
-        break;
+	regs->dx = strtol(optarg,NULL,0);
+	break;
     case 'e':
-        regs->es = strtol(optarg,NULL,0);
-        break;
+	regs->es = strtol(optarg,NULL,0);
+	break;
     case 'i':
-        regs->di = strtol(optarg,NULL,0);
-        break;
+	regs->di = strtol(optarg,NULL,0);
+	break;
     }
     }
 }
@@ -367,10 +367,10 @@
   CARD8 val = 0;
   int i;
 
-  size = *(start+2) * 512;  
+  size = *(start+2) * 512;
   for (i = 0; i<size; i++)
     val += *(start + i);
-    
+
   if (!val)
     return 1;
 
@@ -391,25 +391,25 @@
 {
     int i;
     CARD8 val;
-    
+
     for ( i=0;;i++) {
-        val = code[i];
-        *ptr++ = val;
-        if (val == 0xf4) break;
+	val = code[i];
+	*ptr++ = val;
+	if (val == 0xf4) break;
     }
     return;
 }
 
-void 
+void
 dprint(unsigned long start, unsigned long size)
 {
     int i,j;
     char *c = (char *)start;
 
     for (j = 0; j < (size >> 4); j++) {
-        printf ("\n0x%lx:  ",(unsigned long)c);
-        for (i = 0; i<16; i++) 
-            printf("%x ",(unsigned char) (*(c++)));
+	printf ("\n0x%lx:  ",(unsigned long)c);
+	for (i = 0; i<16; i++)
+	    printf("%x ",(unsigned char) (*(c++)));
     }
     printf("\n");
 }

diff --git a/board/MAI/bios_emulator/scitech/src/v86bios/command.c b/board/MAI/bios_emulator/scitech/src/v86bios/command.c
index 5494ff8..e2bce6d 100644
--- a/board/MAI/bios_emulator/scitech/src/v86bios/command.c
+++ b/board/MAI/bios_emulator/scitech/src/v86bios/command.c

@@ -15,24 +15,24 @@
     static int len = 0;
     int tmp_len;
     char *buff;
-    
+
     if (len <= 0) {
     buff = readline(PROMPT);
     add_history(buff);
-    
+
     if ((tmp_len = strlen(buff)) > line_len) {
-        free(line);
-        line = malloc(tmp_len);
-        line_len = tmp_len;
+	free(line);
+	line = malloc(tmp_len);
+	line_len = tmp_len;
     }
     sprintf(line,"%s\n",buff);
     free(buff);
     line_pointer = line;
     len = strlen(line);
     }
-    
-    *num = max_num > len? len : max_num; 
-    strncpy(buf,line_pointer,*num); 
+
+    *num = max_num > len? len : max_num;
+    strncpy(buf,line_pointer,*num);
     line_pointer = line_pointer + *num;
     len = len - *num;
 }

diff --git a/board/MAI/bios_emulator/scitech/src/v86bios/console.c b/board/MAI/bios_emulator/scitech/src/v86bios/console.c
index 4680515..5e9c924 100644
--- a/board/MAI/bios_emulator/scitech/src/v86bios/console.c
+++ b/board/MAI/bios_emulator/scitech/src/v86bios/console.c

@@ -36,43 +36,43 @@
     char VTname[11];
     console Con = {-1,-1};
     struct vt_stat vts;
-    
+
     if (NO_CONSOLE)
-            return Con;
-    
+	    return Con;
+
     if ((fd = open("/dev/tty0",O_WRONLY,0)) < 0)
-        return Con;
+	return Con;
 
     if ((ioctl(fd, VT_OPENQRY, &VTno) < 0) || (VTno == -1)) {
-        fprintf(stderr,"cannot get a vt\n");    
-        return Con;
+	fprintf(stderr,"cannot get a vt\n");
+	return Con;
     }
-    
+
     close(fd);
     sprintf(VTname,"/dev/tty%i",VTno);
-    
+
     if ((fd = open(VTname, O_RDWR|O_NDELAY, 0)) < 0) {
-        fprintf(stderr,"cannot open console\n");
-        return Con;
+	fprintf(stderr,"cannot open console\n");
+	return Con;
     }
-    
-    if (ioctl(fd, VT_GETSTATE, &vts) == 0) 
-        Con.vt = vts.v_active;
+
+    if (ioctl(fd, VT_GETSTATE, &vts) == 0)
+	Con.vt = vts.v_active;
 
     if (ioctl(fd, VT_ACTIVATE, VTno) != 0) {
-        fprintf(stderr,"cannot activate console\n");
-        close(fd);
-        return Con;
+	fprintf(stderr,"cannot activate console\n");
+	close(fd);
+	return Con;
     }
     if (ioctl(fd, VT_WAITACTIVE, VTno) != 0) {
-        fprintf(stderr,"wait for active console failed\n");
-        close(fd);
-        return Con;
+	fprintf(stderr,"wait for active console failed\n");
+	close(fd);
+	return Con;
     }
 #if 0
     if (ioctl(fd, KDSETMODE, KD_GRAPHICS) < 0) {
-        close(fd);
-        return Con;
+	close(fd);
+	return Con;
     }
 #endif
     Con.fd = fd;
@@ -83,22 +83,13 @@
 close_console(console Con)
 {
     if (Con.fd == -1)
-        return;
-    
+	return;
+
 #if 0
     ioctl(Con.fd, KDSETMODE, KD_TEXT);
 #endif
     if (Con.vt >=0)
-        ioctl(Con.fd, VT_ACTIVATE, Con.vt);
-    
+	ioctl(Con.fd, VT_ACTIVATE, Con.vt);
+
     close(Con.fd);
 }
-
-
-    
-
-
-
-
-
-

diff --git a/board/MAI/bios_emulator/scitech/src/v86bios/debug.h b/board/MAI/bios_emulator/scitech/src/v86bios/debug.h
index bc0b111..c5c906b 100644
--- a/board/MAI/bios_emulator/scitech/src/v86bios/debug.h
+++ b/board/MAI/bios_emulator/scitech/src/v86bios/debug.h

@@ -19,7 +19,7 @@
  * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
  * PERFORMANCE OF THIS SOFTWARE.
  */
-//#define V86BIOS_DEBUG
+/*#define V86BIOS_DEBUG */
 
 /*
  * uncomment the following if needed
@@ -32,7 +32,7 @@
 #define PRINT_PCI 1
 #define PRINT_IP 0    /* print IP address with PIO information */
 #define TRACE 0       /* turn on debugger in x86emu            */
-                      /* requires x86emu compiled with -DDEBUG */
+		      /* requires x86emu compiled with -DDEBUG */
 
 /*
  * these should not be here.
@@ -48,10 +48,8 @@
 #define SHOW_ALL_DEV 0
 #define VERBOSE 0
 
-//#define V_BIOS 0xe0000
-//#define V_BIOS 0xe4000
-
-
+/*#define V_BIOS 0xe0000 */
+/*#define V_BIOS 0xe4000 */
 
 
 #if (PRINT_IO == 1) && (PRINT_PORT == 0)

diff --git a/board/MAI/bios_emulator/scitech/src/v86bios/int.c b/board/MAI/bios_emulator/scitech/src/v86bios/int.c
index 40b17b1..3504c6c 100644
--- a/board/MAI/bios_emulator/scitech/src/v86bios/int.c
+++ b/board/MAI/bios_emulator/scitech/src/v86bios/int.c

@@ -37,11 +37,11 @@
     switch (num) {
     case 0x10:
     case 0x42:
-        return (int42_handler(num,regs));
+	return (int42_handler(num,regs));
     case 0x1A:
-        return (int1A_handler(regs));
+	return (int1A_handler(regs));
     default:
-        return 0;
+	return 0;
     }
     return 0;
 }
@@ -53,38 +53,38 @@
     CARD32 val;
 
     i_printf("int 0x%x: ax:0x%lx bx:0x%lx cx:0x%lx dx:0x%lx\n",num,
-           regs->eax,regs->ebx, regs->ecx, regs->edx);
-    
+	   regs->eax,regs->ebx, regs->ecx, regs->edx);
+
     /*
      * video bios has modified these -
      * leave it to the video bios to do this
      */
 
     val = getIntVect(num);
-    if (val != 0xF000F065) 
+    if (val != 0xF000F065)
       return 0;
-    
+
     if ((regs->ebx & 0xff) == 0x32) {
-        switch (regs->eax & 0xFFFF) {
-        case 0x1200:
-            i_printf("enabling video\n");
-            c = inb(0x3cc);
-            c |= 0x02;
-            outb(0x3c2,c);
-            return 1;
-        case 0x1201:
-            i_printf("disabling video\n");
-            c = inb(0x3cc);
-            c &= ~0x02;
-            outb(0x3c2,c);
-            return 1;
-        default:
-        }
+	switch (regs->eax & 0xFFFF) {
+	case 0x1200:
+	    i_printf("enabling video\n");
+	    c = inb(0x3cc);
+	    c |= 0x02;
+	    outb(0x3c2,c);
+	    return 1;
+	case 0x1201:
+	    i_printf("disabling video\n");
+	    c = inb(0x3cc);
+	    c &= ~0x02;
+	    outb(0x3c2,c);
+	    return 1;
+	default:
+	}
     }
     if (num == 0x42)
-        return 1;
+	return 1;
     else
-        return 0;
+	return 0;
 }
 
 #define SUCCESSFUL              0x00
@@ -100,139 +100,139 @@
     if (! CurrentPci) return 0; /* oops */
 
     i_printf("int 0x1a: ax=0x%lx bx=0x%lx cx=0x%lx dx=0x%lx di=0x%lx"
-         " si=0x%lx\n", regs->eax,regs->ebx,regs->ecx,regs->edx,
-         regs->edi,regs->esi);
+	 " si=0x%lx\n", regs->eax,regs->ebx,regs->ecx,regs->edx,
+	 regs->edi,regs->esi);
     switch (regs->eax & 0xFFFF) {
     case 0xb101:
-        regs->eax  &= 0xFF00;   /* no config space/special cycle support */
-        regs->edx = 0x20494350; /* " ICP" */
-        regs->ebx  = 0x0210;    /* Version 2.10 */
-        regs->ecx  &= 0xFF00;
-        regs->ecx |= (pciMaxBus & 0xFF);   /* Max bus number in system */
-        regs->eflags &= ~((unsigned long)0x01); /* clear carry flag */
-        i_printf("ax=0x%lx dx=0x%lx bx=0x%lx cx=0x%lx flags=0x%lx\n",
-                 regs->eax,regs->edx,regs->ebx,regs->ecx,regs->eflags);
-        return 1;
+	regs->eax  &= 0xFF00;   /* no config space/special cycle support */
+	regs->edx = 0x20494350; /* " ICP" */
+	regs->ebx  = 0x0210;    /* Version 2.10 */
+	regs->ecx  &= 0xFF00;
+	regs->ecx |= (pciMaxBus & 0xFF);   /* Max bus number in system */
+	regs->eflags &= ~((unsigned long)0x01); /* clear carry flag */
+	i_printf("ax=0x%lx dx=0x%lx bx=0x%lx cx=0x%lx flags=0x%lx\n",
+		 regs->eax,regs->edx,regs->ebx,regs->ecx,regs->eflags);
+	return 1;
     case 0xb102:
-        if (((regs->edx & 0xFFFF) == CurrentPci->VendorID) &&
-            ((regs->ecx & 0xFFFF) == CurrentPci->DeviceID) &&
-            (regs->esi == 0)) {
-            regs->eax = (regs->eax & 0x00FF) | (SUCCESSFUL << 8);
-            regs->eflags &= ~((unsigned long)0x01); /* clear carry flag */
-            regs->ebx = pciSlotBX(CurrentPci);
-        }
-        else if (Config.ShowAllDev &&
-             (pPci = findPciDevice(regs->edx,regs->ecx,regs->esi)) != NULL) {
-            regs->eax = (regs->eax & 0x00FF) | (SUCCESSFUL << 8);
-            regs->eflags &= ~((unsigned long)0x01); /* clear carry flag */
-            regs->ebx = pciSlotBX(pPci);
-        } else  {
-            regs->eax = (regs->eax & 0x00FF) | (DEVICE_NOT_FOUND << 8);
-            regs->eflags |= ((unsigned long)0x01); /* set carry flag */
-        }
-        i_printf("ax=0x%lx bx=0x%lx flags=0x%lx\n",
-                 regs->eax,regs->ebx,regs->eflags);
-        return 1;
+	if (((regs->edx & 0xFFFF) == CurrentPci->VendorID) &&
+	    ((regs->ecx & 0xFFFF) == CurrentPci->DeviceID) &&
+	    (regs->esi == 0)) {
+	    regs->eax = (regs->eax & 0x00FF) | (SUCCESSFUL << 8);
+	    regs->eflags &= ~((unsigned long)0x01); /* clear carry flag */
+	    regs->ebx = pciSlotBX(CurrentPci);
+	}
+	else if (Config.ShowAllDev &&
+	     (pPci = findPciDevice(regs->edx,regs->ecx,regs->esi)) != NULL) {
+	    regs->eax = (regs->eax & 0x00FF) | (SUCCESSFUL << 8);
+	    regs->eflags &= ~((unsigned long)0x01); /* clear carry flag */
+	    regs->ebx = pciSlotBX(pPci);
+	} else  {
+	    regs->eax = (regs->eax & 0x00FF) | (DEVICE_NOT_FOUND << 8);
+	    regs->eflags |= ((unsigned long)0x01); /* set carry flag */
+	}
+	i_printf("ax=0x%lx bx=0x%lx flags=0x%lx\n",
+		 regs->eax,regs->ebx,regs->eflags);
+	return 1;
     case 0xb103:
-        if (((regs->ecx & 0xFF) == CurrentPci->Interface) &&
-            (((regs->ecx & 0xFF00) >> 8) == CurrentPci->SubClass) &&
-            (((regs->ecx & 0xFFFF0000) >> 16) == CurrentPci->BaseClass) && 
-            ((regs->esi & 0xff) == 0)) {
-            regs->eax = (regs->eax & 0x00FF) | (SUCCESSFUL << 8);
-            regs->ebx = pciSlotBX(CurrentPci);
-            regs->eflags &= ~((unsigned long)0x01); /* clear carry flag */
-        }
-        else if (Config.ShowAllDev
-             && (pPci = findPciClass(regs->ecx & 0xFF, (regs->ecx & 0xff00) >> 8,
-                         (regs->ecx & 0xffff0000) >> 16, regs->esi)) != NULL) {
-            regs->eax = (regs->eax & 0x00FF) | (SUCCESSFUL << 8);
-            regs->ebx = pciSlotBX(pPci);
-            regs->eflags &= ~((unsigned long)0x01); /* clear carry flag */
-        } else {
-            regs->eax = (regs->eax & 0x00FF) | (DEVICE_NOT_FOUND << 8);
-            regs->eflags |= ((unsigned long)0x01); /* set carry flag */
-        }
-        i_printf("ax=0x%lx flags=0x%lx\n",regs->eax,regs->eflags);
-        return 1;
+	if (((regs->ecx & 0xFF) == CurrentPci->Interface) &&
+	    (((regs->ecx & 0xFF00) >> 8) == CurrentPci->SubClass) &&
+	    (((regs->ecx & 0xFFFF0000) >> 16) == CurrentPci->BaseClass) &&
+	    ((regs->esi & 0xff) == 0)) {
+	    regs->eax = (regs->eax & 0x00FF) | (SUCCESSFUL << 8);
+	    regs->ebx = pciSlotBX(CurrentPci);
+	    regs->eflags &= ~((unsigned long)0x01); /* clear carry flag */
+	}
+	else if (Config.ShowAllDev
+	     && (pPci = findPciClass(regs->ecx & 0xFF, (regs->ecx & 0xff00) >> 8,
+			 (regs->ecx & 0xffff0000) >> 16, regs->esi)) != NULL) {
+	    regs->eax = (regs->eax & 0x00FF) | (SUCCESSFUL << 8);
+	    regs->ebx = pciSlotBX(pPci);
+	    regs->eflags &= ~((unsigned long)0x01); /* clear carry flag */
+	} else {
+	    regs->eax = (regs->eax & 0x00FF) | (DEVICE_NOT_FOUND << 8);
+	    regs->eflags |= ((unsigned long)0x01); /* set carry flag */
+	}
+	i_printf("ax=0x%lx flags=0x%lx\n",regs->eax,regs->eflags);
+	return 1;
     case 0xb108:
-        i_printf("Slot=0x%x\n",CurrentPci->Slot.l);
-        if ((Slot = findPci(regs->ebx))) {
-            regs->ecx &= 0xFFFFFF00;
-            regs->ecx |= PciRead8(regs->edi,Slot);
-            regs->eax = (regs->eax & 0x00FF) | (SUCCESSFUL << 8);
-            regs->eflags &= ~((unsigned long)0x01); /* clear carry flag */
-        } else {
-            regs->eax = (regs->eax & 0x00FF) | (BAD_REGISTER_NUMBER << 8);
-            regs->eflags |= ((unsigned long)0x01); /* set carry flag */
-        }
-        i_printf("ax=0x%lx cx=0x%lx flags=0x%lx\n",
-                 regs->eax,regs->ecx,regs->eflags);
-        return 1;
+	i_printf("Slot=0x%x\n",CurrentPci->Slot.l);
+	if ((Slot = findPci(regs->ebx))) {
+	    regs->ecx &= 0xFFFFFF00;
+	    regs->ecx |= PciRead8(regs->edi,Slot);
+	    regs->eax = (regs->eax & 0x00FF) | (SUCCESSFUL << 8);
+	    regs->eflags &= ~((unsigned long)0x01); /* clear carry flag */
+	} else {
+	    regs->eax = (regs->eax & 0x00FF) | (BAD_REGISTER_NUMBER << 8);
+	    regs->eflags |= ((unsigned long)0x01); /* set carry flag */
+	}
+	i_printf("ax=0x%lx cx=0x%lx flags=0x%lx\n",
+		 regs->eax,regs->ecx,regs->eflags);
+	return 1;
     case 0xb109:
-        i_printf("Slot=0x%x\n",CurrentPci->Slot.l);
-        if ((Slot = findPci(regs->ebx))) {
-            regs->ecx &= 0xFFFF0000;
-            regs->ecx |= PciRead16(regs->edi,Slot);
-            regs->eax = (regs->eax & 0x00FF) | (SUCCESSFUL << 8);
-            regs->eflags &= ~((unsigned long)0x01); /* clear carry flag */
-        } else {
-            regs->eax = (regs->eax & 0x00FF) | (BAD_REGISTER_NUMBER << 8);
-            regs->eflags |= ((unsigned long)0x01); /* set carry flag */
-        }
-        i_printf("ax=0x%lx cx=0x%lx flags=0x%lx\n",
-                 regs->eax,regs->ecx,regs->eflags);
-        return 1;
+	i_printf("Slot=0x%x\n",CurrentPci->Slot.l);
+	if ((Slot = findPci(regs->ebx))) {
+	    regs->ecx &= 0xFFFF0000;
+	    regs->ecx |= PciRead16(regs->edi,Slot);
+	    regs->eax = (regs->eax & 0x00FF) | (SUCCESSFUL << 8);
+	    regs->eflags &= ~((unsigned long)0x01); /* clear carry flag */
+	} else {
+	    regs->eax = (regs->eax & 0x00FF) | (BAD_REGISTER_NUMBER << 8);
+	    regs->eflags |= ((unsigned long)0x01); /* set carry flag */
+	}
+	i_printf("ax=0x%lx cx=0x%lx flags=0x%lx\n",
+		 regs->eax,regs->ecx,regs->eflags);
+	return 1;
     case 0xb10a:
-        i_printf("Slot=0x%x\n",CurrentPci->Slot.l);
-        if ((Slot = findPci(regs->ebx))) {
-            regs->ecx &= 0;
-            regs->ecx |= PciRead32(regs->edi,Slot);
-            regs->eax = (regs->eax & 0x00FF) | (SUCCESSFUL << 8);
-            regs->eflags &= ~((unsigned long)0x01); /* clear carry flag */
-        } else {
-            regs->eax = (regs->eax & 0x00FF) | (BAD_REGISTER_NUMBER << 8);
-            regs->eflags |= ((unsigned long)0x01); /* set carry flag */
-        }
-        i_printf("ax=0x%lx cx=0x%lx flags=0x%lx\n",
-                 regs->eax,regs->ecx,regs->eflags);
-        return 1;
+	i_printf("Slot=0x%x\n",CurrentPci->Slot.l);
+	if ((Slot = findPci(regs->ebx))) {
+	    regs->ecx &= 0;
+	    regs->ecx |= PciRead32(regs->edi,Slot);
+	    regs->eax = (regs->eax & 0x00FF) | (SUCCESSFUL << 8);
+	    regs->eflags &= ~((unsigned long)0x01); /* clear carry flag */
+	} else {
+	    regs->eax = (regs->eax & 0x00FF) | (BAD_REGISTER_NUMBER << 8);
+	    regs->eflags |= ((unsigned long)0x01); /* set carry flag */
+	}
+	i_printf("ax=0x%lx cx=0x%lx flags=0x%lx\n",
+		 regs->eax,regs->ecx,regs->eflags);
+	return 1;
     case 0xb10b:
-        i_printf("Slot=0x%x\n",CurrentPci->Slot.l);
-        if ((Slot = findPci(regs->ebx))) {
-            PciWrite8(regs->edi,(CARD8)regs->ecx,Slot);
-            regs->eax = (regs->eax & 0x00FF) | (SUCCESSFUL << 8);
-            regs->eflags &= ~((unsigned long)0x01); /* clear carry flag */
-        } else {
-            regs->eax = (regs->eax & 0x00FF) | (BAD_REGISTER_NUMBER << 8);
-            regs->eflags |= ((unsigned long)0x01); /* set carry flag */
-        }
-        i_printf("ax=0x%lx flags=0x%lx\n", regs->eax,regs->eflags);
-        return 1;
+	i_printf("Slot=0x%x\n",CurrentPci->Slot.l);
+	if ((Slot = findPci(regs->ebx))) {
+	    PciWrite8(regs->edi,(CARD8)regs->ecx,Slot);
+	    regs->eax = (regs->eax & 0x00FF) | (SUCCESSFUL << 8);
+	    regs->eflags &= ~((unsigned long)0x01); /* clear carry flag */
+	} else {
+	    regs->eax = (regs->eax & 0x00FF) | (BAD_REGISTER_NUMBER << 8);
+	    regs->eflags |= ((unsigned long)0x01); /* set carry flag */
+	}
+	i_printf("ax=0x%lx flags=0x%lx\n", regs->eax,regs->eflags);
+	return 1;
     case 0xb10c:
-        i_printf("Slot=0x%x\n",CurrentPci->Slot.l);
-        if ((Slot = findPci(regs->ebx))) {
-            PciWrite16(regs->edi,(CARD16)regs->ecx,Slot);
-            regs->eax = (regs->eax & 0x00FF) | (SUCCESSFUL << 8);
-            regs->eflags &= ~((unsigned long)0x01); /* clear carry flag */
-        } else {
-            regs->eax = (regs->eax & 0x00FF) | (BAD_REGISTER_NUMBER << 8);
-            regs->eflags |= ((unsigned long)0x01); /* set carry flag */
-        }
-        i_printf("ax=0x%lx flags=0x%lx\n", regs->eax,regs->eflags);
-        return 1;
+	i_printf("Slot=0x%x\n",CurrentPci->Slot.l);
+	if ((Slot = findPci(regs->ebx))) {
+	    PciWrite16(regs->edi,(CARD16)regs->ecx,Slot);
+	    regs->eax = (regs->eax & 0x00FF) | (SUCCESSFUL << 8);
+	    regs->eflags &= ~((unsigned long)0x01); /* clear carry flag */
+	} else {
+	    regs->eax = (regs->eax & 0x00FF) | (BAD_REGISTER_NUMBER << 8);
+	    regs->eflags |= ((unsigned long)0x01); /* set carry flag */
+	}
+	i_printf("ax=0x%lx flags=0x%lx\n", regs->eax,regs->eflags);
+	return 1;
     case 0xb10d:
-        i_printf("Slot=0x%x\n",CurrentPci->Slot.l);
-        if ((Slot = findPci(regs->ebx))) {
-            PciWrite32(regs->edi,(CARD32)regs->ecx,Slot);
-            regs->eax = (regs->eax & 0x00FF) | (SUCCESSFUL << 8);
-            regs->eflags &= ~((unsigned long)0x01); /* clear carry flag */
-        } else {
-            regs->eax = (regs->eax & 0x00FF) | (BAD_REGISTER_NUMBER << 8);
-            regs->eflags |= ((unsigned long)0x01); /* set carry flag */
-        }
-        i_printf("ax=0x%lx flags=0x%lx\n", regs->eax,regs->eflags);
-        return 1;
+	i_printf("Slot=0x%x\n",CurrentPci->Slot.l);
+	if ((Slot = findPci(regs->ebx))) {
+	    PciWrite32(regs->edi,(CARD32)regs->ecx,Slot);
+	    regs->eax = (regs->eax & 0x00FF) | (SUCCESSFUL << 8);
+	    regs->eflags &= ~((unsigned long)0x01); /* clear carry flag */
+	} else {
+	    regs->eax = (regs->eax & 0x00FF) | (BAD_REGISTER_NUMBER << 8);
+	    regs->eflags |= ((unsigned long)0x01); /* set carry flag */
+	}
+	i_printf("ax=0x%lx flags=0x%lx\n", regs->eax,regs->eflags);
+	return 1;
     default:
-        return 0;
+	return 0;
     }
 }

diff --git a/board/MAI/bios_emulator/scitech/src/v86bios/io.c b/board/MAI/bios_emulator/scitech/src/v86bios/io.c
index 129e24f..f35b43e 100644
--- a/board/MAI/bios_emulator/scitech/src/v86bios/io.c
+++ b/board/MAI/bios_emulator/scitech/src/v86bios/io.c

@@ -38,17 +38,17 @@
 {
     register int inc = d_f ? -1 : 1;
     CARD8 *dst = base;
-    
+
     p_printf(" rep_insb(%#x) %d bytes at %p %s",
-             port, count, base, d_f?"up":"down");
+	     port, count, base, d_f?"up":"down");
     if (Config.PrintIp)
-        p_printf(" %x\n",getIP());
+	p_printf(" %x\n",getIP());
     else p_printf("\n");
 
     r_inb++;
     while (count--) {
-        *dst = inb(port);
-        dst += inc;
+	*dst = inb(port);
+	dst += inc;
     }
     return (dst-base);
 }
@@ -58,17 +58,17 @@
 {
     register int inc = d_f ? -1 : 1;
     CARD16 *dst = base;
-    
+
     p_printf(" rep_insw(%#x) %d bytes at %p %s",
-             port, count, base, d_f?"up":"down");
+	     port, count, base, d_f?"up":"down");
     if (Config.PrintIp)
-        p_printf(" %x\n",getIP());
+	p_printf(" %x\n",getIP());
     else p_printf("\n");
 
     r_inw++;
     while (count--) {
-        *dst = inw(port);
-        dst += inc;
+	*dst = inw(port);
+	dst += inc;
     }
     return (dst-base);
 }
@@ -78,17 +78,17 @@
 {
     register int inc = d_f ? -1 : 1;
     CARD32 *dst = base;
-    
+
     p_printf(" rep_insl(%#x) %d bytes at %p %s",
-             port, count, base, d_f?"up":"down");
+	     port, count, base, d_f?"up":"down");
     if (Config.PrintIp)
-        p_printf(" %x\n",getIP());
+	p_printf(" %x\n",getIP());
     else p_printf("\n");
 
     r_inl++;
     while (count--) {
-        *dst = inl(port);
-        dst += inc;
+	*dst = inl(port);
+	dst += inc;
     }
     return (dst-base);
 }
@@ -98,17 +98,17 @@
 {
     register int inc = d_f ? -1 : 1;
     CARD8 *dst = base;
-    
+
     p_printf(" rep_outb(%#x) %d bytes at %p %s",
-             port, count, base, d_f?"up":"down");
+	     port, count, base, d_f?"up":"down");
     if (Config.PrintIp)
-        p_printf(" %x\n",getIP());
+	p_printf(" %x\n",getIP());
     else p_printf("\n");
 
     r_outb++;
     while (count--) {
-        outb(port,*dst);
-        dst += inc;
+	outb(port,*dst);
+	dst += inc;
     }
     return (dst-base);
 }
@@ -118,17 +118,17 @@
 {
     register int inc = d_f ? -1 : 1;
     CARD16 *dst = base;
-    
+
     p_printf(" rep_outw(%#x) %d bytes at %p %s",
-             port, count, base, d_f?"up":"down");
+	     port, count, base, d_f?"up":"down");
     if (Config.PrintIp)
-        p_printf(" %x\n",getIP());
+	p_printf(" %x\n",getIP());
     else p_printf("\n");
 
     r_outw++;
     while (count--) {
-        outw(port,*dst);
-        dst += inc;
+	outw(port,*dst);
+	dst += inc;
     }
     return (dst-base);
 }
@@ -138,17 +138,17 @@
 {
     register int inc = d_f ? -1 : 1;
     CARD32 *dst = base;
-    
+
     p_printf(" rep_outl(%#x) %d bytes at %p %s",
-             port, count, base, d_f?"up":"down");
+	     port, count, base, d_f?"up":"down");
     if (Config.PrintIp)
-        p_printf(" %x\n",getIP());
+	p_printf(" %x\n",getIP());
     else p_printf("\n");
 
     r_outl++;
     while (count--) {
-        outl(port,*dst);
-        dst += inc;
+	outl(port,*dst);
+	dst += inc;
     }
     return (dst-base);
 }
@@ -161,7 +161,7 @@
     val = inb(port);
     p_printf(" inb(%#x) = %2.2x",port,val);
     if (Config.PrintIp)
-        p_printf(" %x\n",getIP());
+	p_printf(" %x\n",getIP());
     else p_printf("\n");
 
     return val;
@@ -175,7 +175,7 @@
     val = inw(port);
     p_printf(" inw(%#x) = %4.4x",port,val);
     if (Config.PrintIp)
-        p_printf(" %x\n",getIP());
+	p_printf(" %x\n",getIP());
     else p_printf("\n");
 
     return val;
@@ -188,13 +188,13 @@
     in_l++;
 #ifdef NEED_PCI_IO
     if (cfg1in(port,&val))
-        return val;
+	return val;
     else
 #endif
     val = inl(port);
     p_printf(" inl(%#x) = %8.8x",port,val);
     if (Config.PrintIp)
-        p_printf(" %x\n",getIP());
+	p_printf(" %x\n",getIP());
     else p_printf("\n");
 
     return val;
@@ -206,7 +206,7 @@
     out_b++;
     p_printf(" outb(%#x, %2.2x)",port,val);
     if (Config.PrintIp)
-        p_printf(" %x\n",getIP());
+	p_printf(" %x\n",getIP());
     else p_printf("\n");
 
     outb(port,val);
@@ -218,7 +218,7 @@
     out_w++;
     p_printf(" outw(%#x, %4.4x)",port,val);
     if (Config.PrintIp)
-        p_printf(" %x\n",getIP());
+	p_printf(" %x\n",getIP());
     else p_printf("\n");
 
     outw(port,val);
@@ -230,12 +230,12 @@
     out_l++;
     p_printf(" outl(%#x, %8.8x)",port,val);
     if (Config.PrintIp)
-        p_printf(" %x\n",getIP());
+	p_printf(" %x\n",getIP());
     else p_printf("\n");
 
 #ifdef NEED_PCI_IO
     if (cfg1out(port,val))
-        return;
+	return;
 #endif
     outl(port,val);
 }
@@ -244,9 +244,9 @@
 io_statistics(void)
 {
     p_printf("rep: inb: %i, inw: %i, inl: %i, outb: %i, outw: %i, outl: %i\n",
-         r_inb,r_inw,r_inl,r_outb,r_outw,r_outl);
+	 r_inb,r_inw,r_inl,r_outb,r_outw,r_outl);
     p_printf("inb: %i, inw: %i, inl: %i, outb: %i, outw: %i, outl: %i\n",
-         in_b,in_w,in_l,out_b,out_w,out_l);
+	 in_b,in_w,in_l,out_b,out_w,out_l);
 }
 
 void

diff --git a/board/MAI/bios_emulator/scitech/src/v86bios/main.c b/board/MAI/bios_emulator/scitech/src/v86bios/main.c
index b73d057..15f9115 100644
--- a/board/MAI/bios_emulator/scitech/src/v86bios/main.c
+++ b/board/MAI/bios_emulator/scitech/src/v86bios/main.c

@@ -45,12 +45,12 @@
 #define V_BIOS_SIZE 0x1FFFF
 #define BIOS_START 0x7C00            /* default BIOS entry */
 
-//CARD8 code[] = { 0xb8 , 0xf0 , 0xf0, 0xf4 };
+/*CARD8 code[] = { 0xb8 , 0xf0 , 0xf0, 0xf4 }; */
 #define VB_X(x) (V_BIOS >> x) & 0xFF
 CARD8 code[] = { 0x9a, 0x03, 0x00, 0x00, VB_X(12), 0xf4 };
-//CARD8 code[] = { 0x9a, 0x03, 0x00, 0x00, VB_X(12), 0xb8, 0x03, 0x00,
-//0xcd, 0x10, 0xf4 };
-//CARD8 code[] = {  0xb8 , 0xf0 , 0xf0 ,0xf4 };
+/*CARD8 code[] = { 0x9a, 0x03, 0x00, 0x00, VB_X(12), 0xb8, 0x03, 0x00, */
+/*0xcd, 0x10, 0xf4 }; */
+/*CARD8 code[] = {  0xb8 , 0xf0 , 0xf0 ,0xf4 }; */
 
 static void sig_handler(int);
 static int map(void);
@@ -87,154 +87,154 @@
     Config.IoStatistics = IO_STATISTICS;
     Config.PrintIrq = PRINT_IRQ;
     Config.PrintPci = PRINT_PCI;
-    Config.ShowAllDev = SHOW_ALL_DEV;        
-    Config.PrintIp = PRINT_IP;           
-    Config.SaveBios = SAVE_BIOS;          
-    Config.Trace = TRACE;             
-    Config.ConfigActiveOnly = CONFIG_ACTIVE_ONLY;  
+    Config.ShowAllDev = SHOW_ALL_DEV;
+    Config.PrintIp = PRINT_IP;
+    Config.SaveBios = SAVE_BIOS;
+    Config.Trace = TRACE;
+    Config.ConfigActiveOnly = CONFIG_ACTIVE_ONLY;
     Config.ConfigActiveDevice = CONFIG_ACTIVE_DEVICE;
-    Config.MapSysBios = MAP_SYS_BIOS;        
-    Config.Resort = RESORT;            
-    Config.FixRom = FIX_ROM;            
-    Config.NoConsole = NO_CONSOLE;         
+    Config.MapSysBios = MAP_SYS_BIOS;
+    Config.Resort = RESORT;
+    Config.FixRom = FIX_ROM;
+    Config.NoConsole = NO_CONSOLE;
     Config.Verbose = VERBOSE;
 
     if (!map())
-        exit(1);
-    
+	exit(1);
+
     if (!setup_system_bios())
-        exit(1);
-    
+	exit(1);
+
     iopl(3);
     setup_io();
-    
+
     scan_pci();
     if (!CurrentPci && !Config.ConfigActiveDevice && !Config.ConfigActiveOnly)
-        exit (1);
+	exit (1);
 #endif
     Console = open_console();
 
     if (Config.ConfigActiveOnly) {
-        CARD16 ax;
-        int activePci = 0;
-        int error = 0;
-        
-        while (CurrentPci) {
-            if (CurrentPci->active) {
-                activePci = 1;
-                            if (!(mapPciRom(NULL) && chksum((CARD8*)V_BIOS)))
-                                error = 1;
-                            break;
-            }
-            CurrentPci = CurrentPci->next;
-        }
-        ax = ((CARD16)(CurrentPci->bus) << 8)
-            | (CurrentPci->dev << 3) | (CurrentPci->func & 0x7);
-        P_printf("ax: 0x%x\n",ax);
-        setup_int_vect();
-        if (!error && (activePci || copy_vbios())) {
-            
-            if (Config.SaveBios) save_bios_to_file();
-            if  (map_vram()) {
-                printf("initializing ISA\n");
-                            bootBIOS(0);
-            }
-        }
-        unmap_vram();
-        sleep(1);       
+	CARD16 ax;
+	int activePci = 0;
+	int error = 0;
+
+	while (CurrentPci) {
+	    if (CurrentPci->active) {
+		activePci = 1;
+			    if (!(mapPciRom(NULL) && chksum((CARD8*)V_BIOS)))
+				error = 1;
+			    break;
+	    }
+	    CurrentPci = CurrentPci->next;
+	}
+	ax = ((CARD16)(CurrentPci->bus) << 8)
+	    | (CurrentPci->dev << 3) | (CurrentPci->func & 0x7);
+	P_printf("ax: 0x%x\n",ax);
+	setup_int_vect();
+	if (!error && (activePci || copy_vbios())) {
+
+	    if (Config.SaveBios) save_bios_to_file();
+	    if  (map_vram()) {
+		printf("initializing ISA\n");
+			    bootBIOS(0);
+	    }
+	}
+	unmap_vram();
+	sleep(1);
     } else {
-        /* disable primary card */
-        save_msr = inb(0x3CC);
-        save_vse = inb(0x3C3);
-        save_46e8 = inb(0x46e8);
-        save_pos102 = inb(0x102);
-        
-        signal(2,sig_handler);
-        signal(11,sig_handler);
-        
-        outb(0x3C2,~(CARD8)0x03 & save_msr);
-        outb(0x3C3,~(CARD8)0x01 & save_vse);
-        outb(0x46e8, ~(CARD8)0x08 & save_46e8);
-        outb(0x102, ~(CARD8)0x01 & save_pos102);
-        
-        pciVideoDisable();
-        
-        while (CurrentPci) {
-            CARD16 ax;
-            
-            if (CurrentPci->active) {
-                Active_is_Pci = 1;
-                if (!Config.ConfigActiveDevice) {
-                    CurrentPci = CurrentPci->next;
-                    continue;
-                }
-            }
-            
-            EnableCurrent();
-            
-            if (CurrentPci->active) {
-                outb(0x102, save_pos102);
-                outb(0x46e8, save_46e8);
-                outb(0x3C3, save_vse);
-                outb(0x3C2, save_msr);
-            }
-            
-            /* clear interrupt vectors */
-            setup_int_vect();
-            
-            ax = ((CARD16)(CurrentPci->bus) << 8)
-                | (CurrentPci->dev << 3) | (CurrentPci->func & 0x7);
-            P_printf("ax: 0x%x\n",ax);
-            
-            if (!((mapPciRom(NULL) && chksum((CARD8*)V_BIOS))
-                  || (CurrentPci->active && copy_vbios()))) {
-                CurrentPci = CurrentPci->next;
-                continue;
-            }
-            if (!map_vram()) {
-                CurrentPci = CurrentPci->next;
-                continue;
-            }
-            if (Config.SaveBios) save_bios_to_file();
-            printf("initializing PCI bus: %i dev: %i func: %i\n",CurrentPci->bus,
-                   CurrentPci->dev,CurrentPci->func);
-            bootBIOS(ax);
-            unmap_vram();
-            
-            CurrentPci = CurrentPci->next;
-        }
-        
-        /* We have an ISA device - configure if requested */
-        if (!Active_is_Pci && Config.ConfigActiveDevice) {
-            pciVideoDisable();
-            
-            outb(0x102, save_pos102);
-            outb(0x46e8, save_46e8);
-            outb(0x3C3, save_vse);
-            outb(0x3C2, save_msr);
+	/* disable primary card */
+	save_msr = inb(0x3CC);
+	save_vse = inb(0x3C3);
+	save_46e8 = inb(0x46e8);
+	save_pos102 = inb(0x102);
 
-            setup_int_vect();
-            if (copy_vbios()) {
-                
-                if (Config.SaveBios) save_bios_to_file();
-                if  (map_vram()) {
-                    printf("initializing ISA\n");
-                    bootBIOS(0);
-                }
-            }
-        
-            unmap_vram();
-            sleep(1);
-        }
-        
-        pciVideoRestore();
+	signal(2,sig_handler);
+	signal(11,sig_handler);
 
-        outb(0x102, save_pos102);
-        outb(0x46e8, save_46e8);
-        outb(0x3C3, save_vse);
-        outb(0x3C2, save_msr);
+	outb(0x3C2,~(CARD8)0x03 & save_msr);
+	outb(0x3C3,~(CARD8)0x01 & save_vse);
+	outb(0x46e8, ~(CARD8)0x08 & save_46e8);
+	outb(0x102, ~(CARD8)0x01 & save_pos102);
+
+	pciVideoDisable();
+
+	while (CurrentPci) {
+	    CARD16 ax;
+
+	    if (CurrentPci->active) {
+		Active_is_Pci = 1;
+		if (!Config.ConfigActiveDevice) {
+		    CurrentPci = CurrentPci->next;
+		    continue;
+		}
+	    }
+
+	    EnableCurrent();
+
+	    if (CurrentPci->active) {
+		outb(0x102, save_pos102);
+		outb(0x46e8, save_46e8);
+		outb(0x3C3, save_vse);
+		outb(0x3C2, save_msr);
+	    }
+
+	    /* clear interrupt vectors */
+	    setup_int_vect();
+
+	    ax = ((CARD16)(CurrentPci->bus) << 8)
+		| (CurrentPci->dev << 3) | (CurrentPci->func & 0x7);
+	    P_printf("ax: 0x%x\n",ax);
+
+	    if (!((mapPciRom(NULL) && chksum((CARD8*)V_BIOS))
+		  || (CurrentPci->active && copy_vbios()))) {
+		CurrentPci = CurrentPci->next;
+		continue;
+	    }
+	    if (!map_vram()) {
+		CurrentPci = CurrentPci->next;
+		continue;
+	    }
+	    if (Config.SaveBios) save_bios_to_file();
+	    printf("initializing PCI bus: %i dev: %i func: %i\n",CurrentPci->bus,
+		   CurrentPci->dev,CurrentPci->func);
+	    bootBIOS(ax);
+	    unmap_vram();
+
+	    CurrentPci = CurrentPci->next;
+	}
+
+	/* We have an ISA device - configure if requested */
+	if (!Active_is_Pci && Config.ConfigActiveDevice) {
+	    pciVideoDisable();
+
+	    outb(0x102, save_pos102);
+	    outb(0x46e8, save_46e8);
+	    outb(0x3C3, save_vse);
+	    outb(0x3C2, save_msr);
+
+	    setup_int_vect();
+	    if (copy_vbios()) {
+
+		if (Config.SaveBios) save_bios_to_file();
+		if  (map_vram()) {
+		    printf("initializing ISA\n");
+		    bootBIOS(0);
+		}
+	    }
+
+	    unmap_vram();
+	    sleep(1);
+	}
+
+	pciVideoRestore();
+
+	outb(0x102, save_pos102);
+	outb(0x46e8, save_46e8);
+	outb(0x3C3, save_vse);
+	outb(0x3C2, save_msr);
     }
-    
+
     close_console(Console);
 #ifdef DELETE
     iopl(0);
@@ -243,24 +243,24 @@
     printf("done !\n");
 #endif
     if (Config.IoStatistics)
-        io_statistics();
+	io_statistics();
 #ifdef DELETE
     exit(0);
 #endif
 }
 
-int  
+int
 map(void)
 {
     void* mem;
 
     mem = mmap(0, (size_t)SIZE,
-               PROT_EXEC | PROT_READ | PROT_WRITE,
-               MAP_FIXED | MAP_PRIVATE | MAP_ANON,
-               -1, 0 ); 
+	       PROT_EXEC | PROT_READ | PROT_WRITE,
+	       MAP_FIXED | MAP_PRIVATE | MAP_ANON,
+	       -1, 0 );
     if (mem != 0) {
-        perror("anonymous map");
-        return (0);
+	perror("anonymous map");
+	return (0);
     }
     memset(mem,0,SIZE);
 
@@ -294,33 +294,33 @@
     int mem_fd;
 
 #ifdef __ia64__
-    if ((mem_fd = open(MEM_FILE,O_RDWR | O_SYNC))<0) 
+    if ((mem_fd = open(MEM_FILE,O_RDWR | O_SYNC))<0)
 #else
-    if ((mem_fd = open(MEM_FILE,O_RDWR))<0) 
+    if ((mem_fd = open(MEM_FILE,O_RDWR))<0)
 #endif
       {
-        perror("opening memory");
-        return 0;
+	perror("opening memory");
+	return 0;
     }
 
 #ifndef __alpha__
     if (mmap((void *) VRAM_START, (size_t) VRAM_SIZE,
-                     PROT_EXEC | PROT_READ | PROT_WRITE, MAP_SHARED | MAP_FIXED,
-                     mem_fd, VRAM_START) == (void *) -1) 
+		     PROT_EXEC | PROT_READ | PROT_WRITE, MAP_SHARED | MAP_FIXED,
+		     mem_fd, VRAM_START) == (void *) -1)
 #else
-         if (!_bus_base()) sparse_shift = 7; /* Uh, oh, JENSEN... */
-         if (!_bus_base_sparse()) sparse_shift = 0;
-         if ((vram_map = mmap(0,(size_t) (VRAM_SIZE << sparse_shift),
-                                                 PROT_READ | PROT_WRITE,
-                                                 MAP_SHARED,
-                                                 mem_fd, (VRAM_START << sparse_shift)
-                                                 | _bus_base_sparse())) == (void *) -1)
+	 if (!_bus_base()) sparse_shift = 7; /* Uh, oh, JENSEN... */
+	 if (!_bus_base_sparse()) sparse_shift = 0;
+	 if ((vram_map = mmap(0,(size_t) (VRAM_SIZE << sparse_shift),
+						 PROT_READ | PROT_WRITE,
+						 MAP_SHARED,
+						 mem_fd, (VRAM_START << sparse_shift)
+						 | _bus_base_sparse())) == (void *) -1)
 #endif
       {
-        perror("mmap error in map_hardware_ram");
-            close(mem_fd);
-            return (0);
-        }
+	perror("mmap error in map_hardware_ram");
+	    close(mem_fd);
+	    return (0);
+	}
     vram_mapped = 1;
     close(mem_fd);
     return (1);
@@ -330,7 +330,7 @@
 unmap_vram(void)
 {
     if (!vram_mapped) return;
-    
+
     munmap((void*)VRAM_START,VRAM_SIZE);
     vram_mapped = 0;
 }
@@ -343,39 +343,39 @@
     int size;
 
     if ((mem_fd = open(MEM_FILE,O_RDONLY))<0) {
-        perror("opening memory");
-        return (0);
+	perror("opening memory");
+	return (0);
     }
 
-    if (lseek(mem_fd,(off_t) V_BIOS, SEEK_SET) != (off_t) V_BIOS) { 
-          fprintf(stderr,"Cannot lseek\n");
-          goto Error;
+    if (lseek(mem_fd,(off_t) V_BIOS, SEEK_SET) != (off_t) V_BIOS) {
+	  fprintf(stderr,"Cannot lseek\n");
+	  goto Error;
       }
     tmp = (unsigned char *)malloc(3);
     if (read(mem_fd, (char *)tmp, (size_t) 3) != (size_t) 3) {
-            fprintf(stderr,"Cannot read\n");
-        goto Error;
+	    fprintf(stderr,"Cannot read\n");
+	goto Error;
     }
-    if (lseek(mem_fd,(off_t) V_BIOS,SEEK_SET) != (off_t) V_BIOS) 
-        goto Error;
+    if (lseek(mem_fd,(off_t) V_BIOS,SEEK_SET) != (off_t) V_BIOS)
+	goto Error;
 
     if (*tmp != 0x55 || *(tmp+1) != 0xAA ) {
 #ifdef DEBUG
-        dprint((unsigned long)tmp,0x100);
+	dprint((unsigned long)tmp,0x100);
 #endif
-        fprintf(stderr,"No bios found at: 0x%x\n",V_BIOS);
-        goto Error;
+	fprintf(stderr,"No bios found at: 0x%x\n",V_BIOS);
+	goto Error;
     }
     size = *(tmp+2) * 512;
 
     if (read(mem_fd, (char *)V_BIOS, (size_t) size) != (size_t) size) {
-            fprintf(stderr,"Cannot read\n");
-        goto Error;
+	    fprintf(stderr,"Cannot read\n");
+	goto Error;
     }
     free(tmp);
     close(mem_fd);
     if (!chksum((CARD8)V_BIOS))
-        return (0);
+	return (0);
 
     return (1);
 
@@ -392,14 +392,14 @@
     int mem_fd;
 
     if ((mem_fd = open(MEM_FILE,O_RDONLY))<0) {
-        perror("opening memory");
-        return (0);
+	perror("opening memory");
+	return (0);
     }
-  
-    if (lseek(mem_fd,(off_t) SYS_BIOS,SEEK_SET) != (off_t) SYS_BIOS) 
-        goto Error;
-    if (read(mem_fd, (char *)SYS_BIOS, (size_t) 0xFFFF) != (size_t) 0xFFFF) 
-        goto Error;
+
+    if (lseek(mem_fd,(off_t) SYS_BIOS,SEEK_SET) != (off_t) SYS_BIOS)
+	goto Error;
+    if (read(mem_fd, (char *)SYS_BIOS, (size_t) 0xFFFF) != (size_t) 0xFFFF)
+	goto Error;
 
     close(mem_fd);
     return (1);
@@ -415,16 +415,16 @@
 {
     int i;
     CARD8 val;
-    
+
     for ( i=0;;i++) {
-        val = code[i];
-        *ptr++ = val;
-        if (val == 0xf4) break;
+	val = code[i];
+	*ptr++ = val;
+	if (val == 0xf4) break;
     }
     return;
 }
-        
-void 
+
+void
 dprint(unsigned long start, unsigned long size)
 {
     int i,j;
@@ -433,13 +433,13 @@
     for (j = 0; j < (size >> 4); j++) {
     char *d = c;
     printf("\n0x%lx:  ",(unsigned long)c);
-    for (i = 0; i<16; i++) 
-        printf("%2.2x ",(unsigned char) (*(c++)));
+    for (i = 0; i<16; i++)
+	printf("%2.2x ",(unsigned char) (*(c++)));
     c = d;
     for (i = 0; i<16; i++) {
-        printf("%c",((((CARD8)(*c)) > 32) && (((CARD8)(*c)) < 128)) ?
-           (unsigned char) (*(c)): '.');
-        c++;
+	printf("%c",((((CARD8)(*c)) > 32) && (((CARD8)(*c)) < 128)) ?
+	   (unsigned char) (*(c)): '.');
+	c++;
     }
     }
     printf("\n");
@@ -452,16 +452,16 @@
     int size, count;
     char file_name[256];
     int fd;
-    
+
     sprintf(file_name,"bios_%i.fil",num);
     if ((fd =  open(file_name,O_WRONLY | O_CREAT | O_TRUNC,00644)) == -1)
-        return;
+	return;
     size = (*(unsigned char*)(V_BIOS + 2)) * 512;
 #ifdef V86BIOS_DEBUG
     dprint(V_BIOS,20);
 #endif
     if ((count = write(fd,(void *)(V_BIOS),size)) != size)
-        fprintf(stderr,"only saved %i of %i bytes\n",size,count);
+	fprintf(stderr,"only saved %i of %i bytes\n",size,count);
     num++;
 }
 
@@ -511,11 +511,11 @@
     const CARD16 cs = 0x0000;
     const CARD16 ip = 0x0;
     int i;
-    
+
     /* let the int vects point to the SYS_BIOS seg */
     for (i=0; i<0x80; i++) {
-        ((CARD16*)0)[i<<1] = ip;
-        ((CARD16*)0)[(i<<1)+1] = cs;
+	((CARD16*)0)[i<<1] = ip;
+	((CARD16*)0)[(i<<1)+1] = cs;
     }
     /* video interrupts default location */
     ((CARD16*)0)[(0x42<<1)+1] = 0xf000;
@@ -566,13 +566,13 @@
 {
     char *date = "06/01/99";
     char *eisa_ident = "PCI/ISA";
-    
+
 #if MAP_SYS_BIOS
     if (!copy_sys_bios()) return 0;
     return 1;
 #endif
-//    memset((void *)0xF0000,0xf4,0xfff7);
-    
+/*    memset((void *)0xF0000,0xf4,0xfff7); */
+
     /*
      * we trap the "industry standard entry points" to the BIOS
      * and all other locations by filling them with "hlt"
@@ -586,7 +586,7 @@
      * and the font tables (0xfa6e-0xfe6d)
      * from the original bios here
      */
-    
+
     /* set bios date */
     strcpy((char *)0xFFFF5,date);
     /* set up eisa ident string */
@@ -604,10 +604,10 @@
   CARD8 val = 0;
   int i;
 
-  size = *(start+2) * 512;  
+  size = *(start+2) * 512;
   for (i = 0; i<size; i++)
     val += *(start + i);
-    
+
   if (!val)
     return 1;
 

diff --git a/board/MAI/bios_emulator/scitech/src/v86bios/mem.c b/board/MAI/bios_emulator/scitech/src/v86bios/mem.c
index 50dc55f..24c1aef 100644
--- a/board/MAI/bios_emulator/scitech/src/v86bios/mem.c
+++ b/board/MAI/bios_emulator/scitech/src/v86bios/mem.c

@@ -43,7 +43,7 @@
     result = *(vuip) ((unsigned long)vram_map + (addr << sparse_shift));
     result >>= shift;
     return 0xffUL & result;
-  } else 
+  } else
 #endif
     return rdb(addr);
 }
@@ -52,15 +52,15 @@
 mem_rw(CARD32 addr)
 {
   unsigned long result, shift;
-#if 1  
+#if 1
   if (addr >= 0xA0000 && addr <= 0xBFFFF) {
     addr -= 0xA0000;
     shift = (addr & 0x2) * 8;
     result = *(vuip)((unsigned long)vram_map+(addr<<sparse_shift)
-             +(1<<(sparse_shift-2)));
+	     +(1<<(sparse_shift-2)));
     result >>= shift;
     return 0xffffUL & result;
-  } else 
+  } else
 #endif
     return rdw(addr);
 }
@@ -69,12 +69,12 @@
 mem_rl(CARD32 addr)
 {
   unsigned long result;
-#if 1  
+#if 1
   if (addr >= 0xA0000 && addr <= 0xBFFFF) {
     addr -= 0xA0000;
     result = *(vuip)((unsigned long)vram_map+(addr<<sparse_shift)+(3<<(sparse_shift-2)));
     return result;
-  } else 
+  } else
 #endif
     return rdl(addr);
 }
@@ -83,12 +83,12 @@
 mem_wb(CARD32 addr, CARD8 val)
 {
     unsigned int b = val & 0xffU;
-#if 1  
+#if 1
   if (addr >= 0xA0000 && addr <= 0xBFFFF) {
     addr -= 0xA0000;
     *(vuip) ((unsigned long)vram_map + (addr << sparse_shift)) = b * 0x01010101;
     mem_barrier();
-  } else 
+  } else
 #endif
     wrb(addr,val);
 }
@@ -97,13 +97,13 @@
 mem_ww(CARD32 addr, CARD16 val)
 {
   unsigned int w = val & 0xffffU;
-#if 1  
+#if 1
   if (addr >= 0xA0000 && addr <= 0xBFFFF) {
     addr -= 0xA0000;
     *(vuip)((unsigned long)vram_map+(addr<<sparse_shift)
-        +(1<<(sparse_shift-2))) = w * 0x00010001;
+	+(1<<(sparse_shift-2))) = w * 0x00010001;
     mem_barrier();
-  } else 
+  } else
 #endif
     wrw(addr,val);
 }
@@ -111,16 +111,14 @@
 void
 mem_wl(CARD32 addr, CARD32 val)
 {
-#if 1  
+#if 1
   if (addr >= 0xA0000 && addr <= 0xBFFFF) {
     addr -= 0xA0000;
     *(vuip)((unsigned long)vram_map+(addr<<sparse_shift)
-        +(3<<(sparse_shift-2))) = val;
+	+(3<<(sparse_shift-2))) = val;
     mem_barrier();
-  } else 
+  } else
 #endif
     wrl(addr,val);
 }
 #endif
-
-

diff --git a/board/MAI/bios_emulator/scitech/src/v86bios/pci.c b/board/MAI/bios_emulator/scitech/src/v86bios/pci.c
index e68c61d..b58a571 100644
--- a/board/MAI/bios_emulator/scitech/src/v86bios/pci.c
+++ b/board/MAI/bios_emulator/scitech/src/v86bios/pci.c

@@ -51,12 +51,12 @@
 static CARD32 PciCfg1Addr;
 
 static void readConfigSpaceCfg1(CARD32 bus, CARD32 dev, CARD32 func,
-                CARD32 *reg);
+		CARD32 *reg);
 static int checkSlotCfg1(CARD32 bus, CARD32 dev, CARD32 func);
 static int checkSlotCfg2(CARD32 bus, int dev);
 static void readConfigSpaceCfg2(CARD32 bus, int dev, CARD32 *reg);
 static CARD8 interpretConfigSpace(CARD32 *reg, int busidx,
-                  CARD8 dev, CARD8 func);
+		  CARD8 dev, CARD8 func);
 static CARD32 findBIOSMap(PciStructPtr pciP, CARD32 *biosSize);
 static void restoreMem(PciStructPtr pciP);
 
@@ -72,10 +72,10 @@
 {
     int bus, dfn;
     CARD32 val = 0xffffffff;
-    
+
     bus = PCI_BUS_FROM_TAG(tag);
     dfn = PCI_DFN_FROM_TAG(tag);
-    
+
     syscall(__NR_pciconfig_read, bus, dfn, tag & 0xff, 4, &val);
     return(val);
 }
@@ -84,10 +84,10 @@
 axpPciCfgWrite(CARD32 tag, CARD32 val)
 {
     int bus, dfn;
-    
+
     bus = PCI_BUS_FROM_TAG(tag);
     dfn = PCI_DFN_FROM_TAG(tag);
-    
+
     syscall(__NR_pciconfig_write, bus, dfn, tag & 0xff, 4, &val);
 }
 
@@ -115,22 +115,21 @@
 static unsigned long pciMinMemReg = ~0;
 
 
-
 void
 scan_pci(void)
 {
     unsigned short configtype;
-    
+
     CARD32 reg[64];
     int busidx;
     CARD8 cardnum;
     CARD8 func;
     int idx;
-    
+
     int i;
     PciStructPtr pci1;
     PciBusPtr pci_b1,pci_b2;
-    
+
 #if defined(__alpha__) || defined(__powerpc__) || defined(__sparc__) || defined(__ia64__)
     configtype = 1;
 #else
@@ -141,111 +140,111 @@
     tmp1 = inb(PCI_MODE2_ENABLE_REG);
     tmp2 = inb(PCI_MODE2_FORWARD_REG);
     if ((tmp1 == 0x00) && (tmp2 == 0x00)) {
-        configtype = 2;
-        readPci = readPciCfg2;
-        writePci = writePciCfg2;
-        P_printf("PCI says configuration type 2\n");
+	configtype = 2;
+	readPci = readPciCfg2;
+	writePci = writePciCfg2;
+	P_printf("PCI says configuration type 2\n");
     } else {
-        tmp32_1 = inl(PCI_MODE1_ADDRESS_REG);
-        outl(PCI_MODE1_ADDRESS_REG, PCI_EN);
-        tmp32_2 = inl(PCI_MODE1_ADDRESS_REG);
-        outl(PCI_MODE1_ADDRESS_REG, tmp32_1);
-        if (tmp32_2 == PCI_EN) {
-            configtype = 1;
-            P_printf("PCI says configuration type 1\n");
-        } else {
-            P_printf("No PCI !\n");
-            return;
-        }
+	tmp32_1 = inl(PCI_MODE1_ADDRESS_REG);
+	outl(PCI_MODE1_ADDRESS_REG, PCI_EN);
+	tmp32_2 = inl(PCI_MODE1_ADDRESS_REG);
+	outl(PCI_MODE1_ADDRESS_REG, tmp32_1);
+	if (tmp32_2 == PCI_EN) {
+	    configtype = 1;
+	    P_printf("PCI says configuration type 1\n");
+	} else {
+	    P_printf("No PCI !\n");
+	    return;
+	}
     }
 #endif
-    
+
     if (configtype == 1) {
-        P_printf("PCI probing configuration type 1\n");
-        busidx = 0;
-        numbus = 1;
-        idx = 0;
-        do {
-            P_printf("\nProbing for devices on PCI bus %d:\n", busidx);
-            for (cardnum = 0; cardnum < MAX_DEV_PER_VENDOR_CFG1; cardnum++) {
-                func = 0;
-                do {
-                    /* loop over the different functions, if present */
-                    if (!checkSlotCfg1(busidx,cardnum,func))
-                        break;
-                    readConfigSpaceCfg1(busidx,cardnum,func,reg);
-            
-                    func = interpretConfigSpace(reg,busidx,
-                                                cardnum,func);
-            
-                    if (idx++ > MAX_PCI_DEVICES)
-                        continue;
-                } while (func < 8);
-            }
-        } while (++busidx < PCI_MAXBUS);
+	P_printf("PCI probing configuration type 1\n");
+	busidx = 0;
+	numbus = 1;
+	idx = 0;
+	do {
+	    P_printf("\nProbing for devices on PCI bus %d:\n", busidx);
+	    for (cardnum = 0; cardnum < MAX_DEV_PER_VENDOR_CFG1; cardnum++) {
+		func = 0;
+		do {
+		    /* loop over the different functions, if present */
+		    if (!checkSlotCfg1(busidx,cardnum,func))
+			break;
+		    readConfigSpaceCfg1(busidx,cardnum,func,reg);
+
+		    func = interpretConfigSpace(reg,busidx,
+						cardnum,func);
+
+		    if (idx++ > MAX_PCI_DEVICES)
+			continue;
+		} while (func < 8);
+	    }
+	} while (++busidx < PCI_MAXBUS);
 #if defined(__alpha__) || defined(__powerpc__) || defined(__sparc__) || defined(__ia64__)
-        /* don't use outl()  ;-) */
+	/* don't use outl()  ;-) */
 #else
-        outl(PCI_MODE1_ADDRESS_REG, 0);
+	outl(PCI_MODE1_ADDRESS_REG, 0);
 #endif
     } else {
-        int slot;
-    
-        P_printf("PCI probing configuration type 2\n");
-        busidx = 0;
-        numbus = 1;
-        idx = 0;
-        do {
-            for (slot=0xc0; slot<0xd0; i++) {
-                if (!checkSlotCfg2(busidx,slot))
-                    break;
-                readConfigSpaceCfg2(busidx,slot,reg);
-        
-                interpretConfigSpace(reg,busidx,
-                                     slot,0);
-                if (idx++ > MAX_PCI_DEVICES)
-                    continue;
-            }
-        }  while (++busidx < PCI_MAXBUS);
+	int slot;
+
+	P_printf("PCI probing configuration type 2\n");
+	busidx = 0;
+	numbus = 1;
+	idx = 0;
+	do {
+	    for (slot=0xc0; slot<0xd0; i++) {
+		if (!checkSlotCfg2(busidx,slot))
+		    break;
+		readConfigSpaceCfg2(busidx,slot,reg);
+
+		interpretConfigSpace(reg,busidx,
+				     slot,0);
+		if (idx++ > MAX_PCI_DEVICES)
+		    continue;
+	    }
+	}  while (++busidx < PCI_MAXBUS);
     }
-    
-    
+
+
     pciMaxBus = numbus - 1;
     P_printf("Number of buses in system: %i\n",pciMaxBus + 1);
     P_printf("Min PCI mem address: 0x%lx\n",pciMinMemReg);
-    
+
     /* link buses */
     pci_b1 = PciBuses;
     while (pci_b1) {
-        pci_b2 = PciBuses;
-        pci_b1->pBus = NULL;
-        while (pci_b2) {
-            if (pci_b1->primary == pci_b2->secondary)
-                pci_b1->pBus = pci_b2;
-            pci_b2 = pci_b2->next;
-        }
-        pci_b1 = pci_b1->next;
+	pci_b2 = PciBuses;
+	pci_b1->pBus = NULL;
+	while (pci_b2) {
+	    if (pci_b1->primary == pci_b2->secondary)
+		pci_b1->pBus = pci_b2;
+	    pci_b2 = pci_b2->next;
+	}
+	pci_b1 = pci_b1->next;
     }
     pci1 = PciStruct;
     while (pci1) {
-        pci_b2 = PciBuses;
-        pci1->pBus = NULL;
-        while (pci_b2) {
-            if (pci1->bus == pci_b2->secondary)
-                pci1->pBus = pci_b2;
-            pci_b2 = pci_b2->next;
-        }
-        pci1 = pci1->next;
+	pci_b2 = PciBuses;
+	pci1->pBus = NULL;
+	while (pci_b2) {
+	    if (pci1->bus == pci_b2->secondary)
+		pci1->pBus = pci_b2;
+	    pci_b2 = pci_b2->next;
+	}
+	pci1 = pci1->next;
     }
     if (RESORT) {
-        PciStructPtr tmp = PciStruct, tmp1;
-        PciStruct = NULL;
-        while (tmp) {
-            tmp1 = tmp->next;
-            tmp->next = PciStruct;
-            PciStruct = tmp;
-            tmp = tmp1;
-        }
+	PciStructPtr tmp = PciStruct, tmp1;
+	PciStruct = NULL;
+	while (tmp) {
+	    tmp1 = tmp->next;
+	    tmp->next = PciStruct;
+	    PciStruct = tmp;
+	    tmp = tmp1;
+	}
     }
     PciList = CurrentPci = PciStruct;
 }
@@ -255,7 +254,7 @@
 readPciCfg1(CARD32 reg)
 {
     CARD32 val;
-    
+
     outl(PCI_MODE1_ADDRESS_REG, reg);
     val = inl(PCI_MODE1_DATA_REG);
     outl(PCI_MODE1_ADDRESS_REG, 0);
@@ -279,7 +278,7 @@
     CARD8 bus = (reg >> 16) & 0xff;
     CARD8 dev = (reg >> 11) & 0x1f;
     CARD8 num = reg & 0xff;
-    
+
     outb(PCI_MODE2_ENABLE_REG, 0xF1);
     outb(PCI_MODE2_FORWARD_REG, bus);
     val = inl((dev << 8) + num);
@@ -309,16 +308,16 @@
     /* disable VGA routing on bridges */
     PciBusPtr pbp = PciBuses;
     PciStructPtr pcp = PciStruct;
-    
+
     while (pbp) {
-        writePci(pbp->Slot.l | 0x3c, pbp->bctl & ~(CARD32)(8<<16));
-        pbp = pbp->next;
+	writePci(pbp->Slot.l | 0x3c, pbp->bctl & ~(CARD32)(8<<16));
+	pbp = pbp->next;
     }
     /* disable display devices */
     while (pcp) {
-        writePci(pcp->Slot.l | 0x04, pcp->cmd_st & ~(CARD32)3);
-        writePci(pcp->Slot.l | 0x30, pcp->RomBase & ~(CARD32)1);
-        pcp = pcp->next;
+	writePci(pcp->Slot.l | 0x04, pcp->cmd_st & ~(CARD32)3);
+	writePci(pcp->Slot.l | 0x30, pcp->RomBase & ~(CARD32)1);
+	pcp = pcp->next;
     }
 }
 
@@ -328,16 +327,16 @@
     /* disable VGA routing on bridges */
     PciBusPtr pbp = PciBuses;
     PciStructPtr pcp = PciStruct;
-    
+
     while (pbp) {
-        writePci(pbp->Slot.l | 0x3c, pbp->bctl);
-        pbp = pbp->next;
+	writePci(pbp->Slot.l | 0x3c, pbp->bctl);
+	pbp = pbp->next;
     }
     /* disable display devices */
     while (pcp) {
-        writePci(pcp->Slot.l | 0x04, pcp->cmd_st);
-        writePci(pcp->Slot.l | 0x30, pcp->RomBase);
-        pcp = pcp->next;
+	writePci(pcp->Slot.l | 0x04, pcp->cmd_st);
+	writePci(pcp->Slot.l | 0x30, pcp->RomBase);
+	pcp = pcp->next;
     }
 }
 
@@ -346,13 +345,13 @@
 {
     PciBusPtr pbp;
     PciStructPtr pcp = CurrentPci;
-    
+
     pciVideoDisable();
-    
+
     pbp = pcp->pBus;
     while (pbp) { /* enable bridges */
-        writePci(pbp->Slot.l | 0x3c, pbp->bctl | (CARD32)(8<<16));
-        pbp = pbp->pBus;
+	writePci(pbp->Slot.l | 0x3c, pbp->bctl | (CARD32)(8<<16));
+	pbp = pbp->pBus;
     }
     writePci(pcp->Slot.l | 0x04, pcp->cmd_st | (CARD32)3);
     writePci(pcp->Slot.l | 0x30, pcp->RomBase | (CARD32)1);
@@ -427,35 +426,35 @@
       pciP = CurrentPci;
 
     if (FIX_ROM) {
-        RomBase = findBIOSMap(pciP, &biosSize);
-        if (!RomBase) {
-            fprintf(stderr,"Cannot remap BIOS of %i:%i:%i "
-                    "- trying preset address\n",pciP->bus,pciP->dev,
-                    pciP->func);
-            RomBase = pciP->RomBase & ~(CARD32)0xFF;
-        }
+	RomBase = findBIOSMap(pciP, &biosSize);
+	if (!RomBase) {
+	    fprintf(stderr,"Cannot remap BIOS of %i:%i:%i "
+		    "- trying preset address\n",pciP->bus,pciP->dev,
+		    pciP->func);
+	    RomBase = pciP->RomBase & ~(CARD32)0xFF;
+	}
     }  else {
-        RomBase = pciP->RomBase & ~(CARD32)0xFF;
-        if (~RomBase + 1 < biosSize || !RomBase)
-            RomBase = findBIOSMap(pciP, &biosSize);
+	RomBase = pciP->RomBase & ~(CARD32)0xFF;
+	if (~RomBase + 1 < biosSize || !RomBase)
+	    RomBase = findBIOSMap(pciP, &biosSize);
     }
 
     P_printf("RomBase: 0x%lx\n",RomBase);
-    
+
     if ((mem_fd = open(MEM_FILE,O_RDONLY))<0) {
-        perror("opening memory");
-        restoreMem(pciP);
-        return (0);
+	perror("opening memory");
+	restoreMem(pciP);
+	return (0);
     }
 
     PciWrite32(0x30,RomBase | 1,pciP->Slot.l);
 
 #ifdef __alpha__
     mem = ptr = (unsigned char *)mmap(0, biosSize, PROT_READ,
-                                      MAP_SHARED, mem_fd, RomBase | _bus_base());
+				      MAP_SHARED, mem_fd, RomBase | _bus_base());
 #else
     mem = ptr = (unsigned char *)mmap(0, biosSize, PROT_READ,
-                                      MAP_SHARED, mem_fd, RomBase);
+				      MAP_SHARED, mem_fd, RomBase);
 #endif
     if (pciP != CurrentPci) {
       enablePci = PciRead32(0x4,pciP->Slot.l);
@@ -466,37 +465,37 @@
     dprint((unsigned long)ptr,0x30);
 #endif
     while ( *ptr == 0x55 && *(ptr+1) == 0xAA) {
-        unsigned short data_off = *(ptr+0x18) | (*(ptr+0x19)<< 8);
-        unsigned char *data = ptr + data_off;
-        unsigned char type;
-        int i;
+	unsigned short data_off = *(ptr+0x18) | (*(ptr+0x19)<< 8);
+	unsigned char *data = ptr + data_off;
+	unsigned char type;
+	int i;
 
-        if (*data!='P' || *(data+1)!='C' || *(data+2)!='I' || *(data+3)!='R') {
-            break;
-        }
-        type = *(data + 0x14);
-        P_printf("data segment in BIOS: 0x%x, type: 0x%x ",data_off,type);
-        
-        if (type != 0)  { /* not PC-AT image: find next one */
-            unsigned int image_length;
-            unsigned char indicator = *(data + 0x15);
-            if (indicator & 0x80) /* last image */
-                break;
-            image_length = (*(data + 0x10)
-                            | (*(data + 0x11) << 8)) << 9;
-            P_printf("data image length: 0x%x, ind: 0x%x\n",
-                     image_length,indicator);
-            ptr = ptr + image_length;
-            continue;
-        }
-        /* OK, we have a PC Image */
-        length = (*(ptr + 2) << 9);
-        P_printf("BIOS length: 0x%x\n",length);
-        scratch = (unsigned char *)malloc(length);
-        /* don't use memcpy() here: Reading from bus! */
-        for (i=0;i<length;i++)
-            *(scratch + i)=*(ptr + i);
-        break;
+	if (*data!='P' || *(data+1)!='C' || *(data+2)!='I' || *(data+3)!='R') {
+	    break;
+	}
+	type = *(data + 0x14);
+	P_printf("data segment in BIOS: 0x%x, type: 0x%x ",data_off,type);
+
+	if (type != 0)  { /* not PC-AT image: find next one */
+	    unsigned int image_length;
+	    unsigned char indicator = *(data + 0x15);
+	    if (indicator & 0x80) /* last image */
+		break;
+	    image_length = (*(data + 0x10)
+			    | (*(data + 0x11) << 8)) << 9;
+	    P_printf("data image length: 0x%x, ind: 0x%x\n",
+		     image_length,indicator);
+	    ptr = ptr + image_length;
+	    continue;
+	}
+	/* OK, we have a PC Image */
+	length = (*(ptr + 2) << 9);
+	P_printf("BIOS length: 0x%x\n",length);
+	scratch = (unsigned char *)malloc(length);
+	/* don't use memcpy() here: Reading from bus! */
+	for (i=0;i<length;i++)
+	    *(scratch + i)=*(ptr + i);
+	break;
     }
 
     if (pciP != CurrentPci)
@@ -509,10 +508,10 @@
     writePci(pciP->Slot.l | 0x30, pciP->RomBase & ~(CARD32)1);
 
     if (scratch && length) {
-        memcpy((unsigned char *)V_BIOS, scratch, length);
-        free(scratch);
+	memcpy((unsigned char *)V_BIOS, scratch, length);
+	free(scratch);
     }
-    
+
     restoreMem(pciP);
     return length;
 }
@@ -523,24 +522,24 @@
     CARD32 slot = slotBX << 8;
 
     if (slot == (CurrentPci->Slot.l & ~PCI_EN))
-        return (CurrentPci->Slot.l | PCI_EN);
+	return (CurrentPci->Slot.l | PCI_EN);
     else {
 #if !SHOW_ALL_DEV
-        PciBusPtr pBus = CurrentPci->pBus;
-        while (pBus) {
-          //      fprintf(stderr,"slot: 0x%x  bridge: 0x%x\n",slot, pBus->Slot.l);
-            if (slot == (pBus->Slot.l & ~PCI_EN))
-                return pBus->Slot.l | PCI_EN;
-            pBus = pBus->next;
-        }
+	PciBusPtr pBus = CurrentPci->pBus;
+	while (pBus) {
+	  /*      fprintf(stderr,"slot: 0x%x  bridge: 0x%x\n",slot, pBus->Slot.l); */
+	    if (slot == (pBus->Slot.l & ~PCI_EN))
+		return pBus->Slot.l | PCI_EN;
+	    pBus = pBus->next;
+	}
 #else
-        PciStructPtr pPci = PciStruct;
-        while (pPci) {
-          //fprintf(stderr,"slot: 0x%x  bridge: 0x%x\n",slot, pPci->Slot.l);
-            if (slot == (pPci->Slot.l & ~PCI_EN))
-                return pPci->Slot.l | PCI_EN;
-            pPci = pPci->next;
-        }
+	PciStructPtr pPci = PciStruct;
+	while (pPci) {
+	  /*fprintf(stderr,"slot: 0x%x  bridge: 0x%x\n",slot, pPci->Slot.l); */
+	    if (slot == (pPci->Slot.l & ~PCI_EN))
+		return pPci->Slot.l | PCI_EN;
+	    pPci = pPci->next;
+	}
 #endif
     }
     return 0;
@@ -559,9 +558,9 @@
     n++;
 
     while (pPci)  {
-        if ((pPci->VendorID == vendorID) && (pPci->DeviceID == deviceID)) {
-        if (!(--n)) break;
-        }
+	if ((pPci->VendorID == vendorID) && (pPci->DeviceID == deviceID)) {
+	if (!(--n)) break;
+	}
     pPci = pPci->next;
     }
     return pPci;
@@ -574,10 +573,10 @@
     n++;
 
     while (pPci)  {
-        if ((pPci->Interface == intf) && (pPci->SubClass == subClass)
-         && (pPci->BaseClass == class)) {
-        if (!(--n)) break;
-        }
+	if ((pPci->Interface == intf) && (pPci->SubClass == subClass)
+	 && (pPci->BaseClass == class)) {
+	if (!(--n)) break;
+	}
     pPci = pPci->next;
     }
     return pPci;
@@ -592,14 +591,14 @@
 
     for (i = 0; i<64;i+=4) {
 #ifdef __alpha__
-        reg[i] = axpPciCfgRead(config_cmd | i);
+	reg[i] = axpPciCfgRead(config_cmd | i);
 #else
-        outl(PCI_MODE1_ADDRESS_REG, config_cmd | i);
-        reg[i] = inl(PCI_MODE1_DATA_REG);
+	outl(PCI_MODE1_ADDRESS_REG, config_cmd | i);
+	reg[i] = inl(PCI_MODE1_DATA_REG);
 #endif
 
 #ifdef V86BIOS_DEBUG
-        P_printf("0x%lx\n",reg[i]);
+	P_printf("0x%lx\n",reg[i]);
 #endif
     }
 }
@@ -611,15 +610,15 @@
       (dev<<11) | (func<<8);
     CARD32 reg;
 #ifdef __alpha__
-        reg = axpPciCfgRead(config_cmd);
+	reg = axpPciCfgRead(config_cmd);
 #else
-        outl(PCI_MODE1_ADDRESS_REG, config_cmd);
-        reg = inl(PCI_MODE1_DATA_REG);
+	outl(PCI_MODE1_ADDRESS_REG, config_cmd);
+	reg = inl(PCI_MODE1_DATA_REG);
 #endif
     if (reg != 0xFFFFFFFF)
-        return 1;
+	return 1;
     else
-        return 0;
+	return 0;
 }
 
 static int
@@ -633,9 +632,9 @@
     outb(PCI_MODE2_FORWARD_REG, 0x00);
     outb(PCI_MODE2_ENABLE_REG, 0x00);
     if (val == 0xFFFFFFFF)
-        return 0;
+	return 0;
     if (val == 0xF0F0F0F0)
-        return 0;
+	return 0;
     return 1;
 }
 
@@ -647,9 +646,9 @@
     outb(PCI_MODE2_ENABLE_REG, 0xF1);
     outb(PCI_MODE2_FORWARD_REG, bus);
     for (i = 0; i<64;i+=4) {
-        reg[i] = inl((dev << 8) + i);
+	reg[i] = inl((dev << 8) + i);
 #ifdef V86BIOS_DEBUG
-        P_printf("0x%lx\n",reg[i]);
+	P_printf("0x%lx\n",reg[i]);
 #endif
     }
     outb(PCI_MODE2_ENABLE_REG, 0x00);
@@ -664,22 +663,22 @@
     CARD8 primary, secondary;
     CARD8 header, interface;
     int i;
-    
+
     config_cmd = PCI_EN | busidx<<16 |
-        (dev<<11) | (func<<8);
+	(dev<<11) | (func<<8);
 
     for (i = 0x10; i < 0x28; i+=4) {
-        if (IS_MEM32(reg[i]))
-            if ((reg[i] & 0xFFFFFFF0) < pciMinMemReg)
-                pciMinMemReg = (reg[i] & 0xFFFFFFF0);
+	if (IS_MEM32(reg[i]))
+	    if ((reg[i] & 0xFFFFFFF0) < pciMinMemReg)
+		pciMinMemReg = (reg[i] & 0xFFFFFFF0);
 #ifdef __alpha__
-        if (IS_MEM64(reg[i])) {
-                unsigned long addr = reg[i] | 
-              (unsigned long)(reg[i+4]) << 32;
-            if ((addr & ~0xfL) < pciMinMemReg)
-                pciMinMemReg = (addr & ~0xfL);
-            i+=4;
-        }
+	if (IS_MEM64(reg[i])) {
+		unsigned long addr = reg[i] |
+	      (unsigned long)(reg[i+4]) << 32;
+	    if ((addr & ~0xfL) < pciMinMemReg)
+		pciMinMemReg = (addr & ~0xfL);
+	    i+=4;
+	}
 #endif
     }
     vendor = reg[0] & 0xFFFF;
@@ -691,49 +690,49 @@
 
     header = (reg[0x0c] >> 16) & 0xff;
     P_printf("bc 0x%x, sub 0x%x, if 0x%x, hdr 0x%x\n",
-             baseclass,subclass,interface,header);
+	     baseclass,subclass,interface,header);
     if (BRIDGE_CLASS(baseclass)) {
-        if (BRIDGE_PCI_CLASS(subclass)) {
-            PciBusPtr pbp = malloc(sizeof(PciBusRec));
-            P_printf("Pci-Pci Bridge found; ");
-            primary = reg[0x18] & 0xFF;
-            secondary = (reg[0x18] >> 8) & 0xFF;
-            P_printf("primary: 0x%x secondary: 0x%x\n",
-                     primary,secondary);
-            pbp->bctl = reg[0x3c];
-            pbp->primary = primary;
-            pbp->secondary = secondary;
-            pbp->Slot.l = config_cmd;
-            pbp->next = PciBuses;
-            PciBuses = pbp;
-            numbus++;
-        } else if (BRIDGE_HOST_CLASS(subclass)
-                   && (hostbridges++ > 1)) {
-            numbus++;
-        }
+	if (BRIDGE_PCI_CLASS(subclass)) {
+	    PciBusPtr pbp = malloc(sizeof(PciBusRec));
+	    P_printf("Pci-Pci Bridge found; ");
+	    primary = reg[0x18] & 0xFF;
+	    secondary = (reg[0x18] >> 8) & 0xFF;
+	    P_printf("primary: 0x%x secondary: 0x%x\n",
+		     primary,secondary);
+	    pbp->bctl = reg[0x3c];
+	    pbp->primary = primary;
+	    pbp->secondary = secondary;
+	    pbp->Slot.l = config_cmd;
+	    pbp->next = PciBuses;
+	    PciBuses = pbp;
+	    numbus++;
+	} else if (BRIDGE_HOST_CLASS(subclass)
+		   && (hostbridges++ > 1)) {
+	    numbus++;
+	}
     } else if (VIDEO_CLASS(baseclass,subclass)) {
-        PciStructPtr pcp = malloc(sizeof(PciStructRec));
-        P_printf("Display adapter found\n");
-        pcp->RomBase = reg[0x30];
-        pcp->cmd_st = reg[4];
-        pcp->active = (reg[4] & 0x03) == 3 ? 1 : 0;
-        pcp->VendorID = vendor;
-        pcp->DeviceID = device;
-        pcp->Interface = interface;
-        pcp->BaseClass = baseclass;
-        pcp->SubClass = subclass;
-        pcp->Slot.l = config_cmd;
-        pcp->bus = busidx;
-        pcp->dev = dev;
-        pcp->func = func;
-        pcp->next = PciStruct;
-        PciStruct = pcp;
+	PciStructPtr pcp = malloc(sizeof(PciStructRec));
+	P_printf("Display adapter found\n");
+	pcp->RomBase = reg[0x30];
+	pcp->cmd_st = reg[4];
+	pcp->active = (reg[4] & 0x03) == 3 ? 1 : 0;
+	pcp->VendorID = vendor;
+	pcp->DeviceID = device;
+	pcp->Interface = interface;
+	pcp->BaseClass = baseclass;
+	pcp->SubClass = subclass;
+	pcp->Slot.l = config_cmd;
+	pcp->bus = busidx;
+	pcp->dev = dev;
+	pcp->func = func;
+	pcp->next = PciStruct;
+	PciStruct = pcp;
     }
     if ((func == 0)
-        && ((header & PCI_MULTIFUNC_DEV) == 0))
-        func = 8;
+	&& ((header & PCI_MULTIFUNC_DEV) == 0))
+	func = 8;
     else
-        func++;
+	func++;
     return func;
 }
 
@@ -748,36 +747,36 @@
     CARD32 org;
     CARD32 val;
     CARD32 size_n;
-    
-    org = PciRead32(num + 0x10,pciP->Slot.l);
-    
-    while (pciPtr) {
-        for (i = 0; i < 20; i=i+4) {
 
-            val = PciRead32(i + 0x10,pciPtr->Slot.l);
-            /* don't map it on itself */
-            if ((org & 0xfffffff0) == (val & 0xfffffff0))
-                continue;
-            if (val && !(val & 1))
-                PciWrite32(i + 0x10,0xffffffff,pciPtr->Slot.l);
-            else
-                continue;
-            size_n = PciRead32(i + 0x10,pciPtr->Slot.l);
-            PciWrite32(i + 0x10,val,pciPtr->Slot.l);
-            size_n = ~(CARD32)(size_n  & 0xfffffff0) + 1;
-                    
-            if (size_n >= size) {
-                PciWrite32(num + 0x10,val,pciP->Slot.l);
-                return 1;
-            }
-        }
-        pciPtr = pciPtr->next;
+    org = PciRead32(num + 0x10,pciP->Slot.l);
+
+    while (pciPtr) {
+	for (i = 0; i < 20; i=i+4) {
+
+	    val = PciRead32(i + 0x10,pciPtr->Slot.l);
+	    /* don't map it on itself */
+	    if ((org & 0xfffffff0) == (val & 0xfffffff0))
+		continue;
+	    if (val && !(val & 1))
+		PciWrite32(i + 0x10,0xffffffff,pciPtr->Slot.l);
+	    else
+		continue;
+	    size_n = PciRead32(i + 0x10,pciPtr->Slot.l);
+	    PciWrite32(i + 0x10,val,pciPtr->Slot.l);
+	    size_n = ~(CARD32)(size_n  & 0xfffffff0) + 1;
+
+	    if (size_n >= size) {
+		PciWrite32(num + 0x10,val,pciP->Slot.l);
+		return 1;
+	    }
+	}
+	pciPtr = pciPtr->next;
     }
     /* last resort: try to go below lowest PCI mem address */
     val = ((pciMinMemReg & ~(CARD32)(size - 1)) - size);
     if (val > 0x7fffffff) {
-        PciWrite32(num + 0x10,val, pciP->Slot.l);
-        return 1;
+	PciWrite32(num + 0x10,val, pciP->Slot.l);
+	return 1;
     }
 
     return 0;
@@ -798,7 +797,7 @@
     int i;
     CARD32 val;
     CARD32 size;
-    
+
     PciWrite32(0x30,0xffffffff,pciP->Slot.l);
     *biosSize = PciRead32(0x30,pciP->Slot.l);
     P_printf("bios size: 0x%x\n",*biosSize);
@@ -810,43 +809,43 @@
       P_printf("fixing broken BIOS size: 0x%x\n",*biosSize);
     }
     while (pciPtr) {
-        if (pciPtr->bus != pciP->bus) {
-            pciPtr = pciPtr->next;
-            continue;
-        }
-        for (i = 0; i < 20; i=i+4) {
-            
-            val = PciRead32(i + 0x10,pciPtr->Slot.l);
-            if (!(val & 1))
-    
-            PciWrite32(i + 0x10,0xffffffff,pciPtr->Slot.l);
-            else
-                continue;
-            size = PciRead32(i + 0x10,pciPtr->Slot.l);
-            PciWrite32(i + 0x10,val,pciPtr->Slot.l);
-            size = ~(CARD32)(size & 0xFFFFFFF0) + 1;
+	if (pciPtr->bus != pciP->bus) {
+	    pciPtr = pciPtr->next;
+	    continue;
+	}
+	for (i = 0; i < 20; i=i+4) {
+
+	    val = PciRead32(i + 0x10,pciPtr->Slot.l);
+	    if (!(val & 1))
+
+	    PciWrite32(i + 0x10,0xffffffff,pciPtr->Slot.l);
+	    else
+		continue;
+	    size = PciRead32(i + 0x10,pciPtr->Slot.l);
+	    PciWrite32(i + 0x10,val,pciPtr->Slot.l);
+	    size = ~(CARD32)(size & 0xFFFFFFF0) + 1;
 #ifdef V86_BIOS_DEBUG
-            P_printf("size: 0x%x\n",size);
+	    P_printf("size: 0x%x\n",size);
 #endif
-            if (size >= *biosSize) {
-                if (pciP == pciPtr) { /* if same device remap ram*/
-                    if (!(remapMem(pciP,i,size)))
-                        continue;
-                    remapMEM_val = val;
-                    remapMEM_num = i;
-                } else {
-                    remapMEM_val = 0;
-                }
-                return val & 0xFFFFFF00;
-            }
-        }
-        pciPtr = pciPtr->next;
+	    if (size >= *biosSize) {
+		if (pciP == pciPtr) { /* if same device remap ram*/
+		    if (!(remapMem(pciP,i,size)))
+			continue;
+		    remapMEM_val = val;
+		    remapMEM_num = i;
+		} else {
+		    remapMEM_val = 0;
+		}
+		return val & 0xFFFFFF00;
+	    }
+	}
+	pciPtr = pciPtr->next;
     }
     remapMEM_val = 0;
     /* very last resort */
-    if (pciP->bus == 0 && (pciMinMemReg > *biosSize)) 
+    if (pciP->bus == 0 && (pciMinMemReg > *biosSize))
       return (pciMinMemReg - size) & ~(size - 1);
-      
+
     return 0;
 }
 
@@ -863,7 +862,7 @@
   return 0;
 }
 
-int 
+int
 cfg1in(CARD16 addr, CARD32 *val)
 {
   if (addr == 0xCF8) {
@@ -883,8 +882,8 @@
 
     while (pci) {
     printf("[0x%x:0x%x:0x%x] vendor: 0x%4.4x dev: 0x%4.4x class: 0x%4.4x"
-           " subclass: 0x%4.4x\n",pci->bus,pci->dev,pci->func,
-           pci->VendorID,pci->DeviceID,pci->BaseClass,pci->SubClass);
+	   " subclass: 0x%4.4x\n",pci->bus,pci->dev,pci->func,
+	   pci->VendorID,pci->DeviceID,pci->BaseClass,pci->SubClass);
     pci = pci->next;
     }
 }
@@ -893,7 +892,7 @@
 findPciByIDs(int bus, int dev, int func)
 {
   PciStructPtr pciP = PciList;
-  
+
   while (pciP) {
     if (pciP->bus == bus && pciP->dev == dev && pciP->func == func)
       return pciP;

diff --git a/board/MAI/bios_emulator/scitech/src/v86bios/pci.h b/board/MAI/bios_emulator/scitech/src/v86bios/pci.h
index 0ab7363..58ad522 100644
--- a/board/MAI/bios_emulator/scitech/src/v86bios/pci.h
+++ b/board/MAI/bios_emulator/scitech/src/v86bios/pci.h

@@ -26,13 +26,13 @@
 
 typedef union {
     struct {
-        unsigned int    zero:2;
-        unsigned int    reg:6;
-        unsigned int    func:3;
-        unsigned int    dev:5;
-        unsigned int    bus:8;
-        unsigned int    reserved:7;
-        unsigned int    enable:1;
+	unsigned int    zero:2;
+	unsigned int    reg:6;
+	unsigned int    func:3;
+	unsigned int    dev:5;
+	unsigned int    bus:8;
+	unsigned int    reserved:7;
+	unsigned int    enable:1;
     } pci;
     CARD32 l;
 } PciSlot;

diff --git a/board/MAI/bios_emulator/scitech/src/v86bios/v86.c b/board/MAI/bios_emulator/scitech/src/v86bios/v86.c
index 3170a9c..4deed04 100644
--- a/board/MAI/bios_emulator/scitech/src/v86bios/v86.c
+++ b/board/MAI/bios_emulator/scitech/src/v86bios/v86.c

@@ -46,14 +46,14 @@
 #define CPU_REG_HW(reg)      (*((CARD16 *)&CPU_REG(reg) + 1))
 #define CPU_REG_LB(reg)      (*(CARD8 *)&CPU_REG(e##reg))
 #define SEG_ADR(type, seg, reg)  type((CPU_REG_LW(seg) << 4) \
-                                      + CPU_REG_LW(e##reg))
+				      + CPU_REG_LW(e##reg))
 #define DF (1 << 10)
 
 struct pio P;
 
 
 void
-setup_io(void) 
+setup_io(void)
 {
     if (!Config.PrintPort && !Config.IoStatistics) {
     P.inb = (CARD8(*)(CARD16))inb;
@@ -72,13 +72,13 @@
     }
 }
 
-    
+
 static void
 setup_vm86(unsigned long bios_start, i86biosRegsPtr regs)
 {
     CARD32 eip;
     CARD16 cs;
-    
+
     vm86s.flags = VM86_SCREEN_BITMAP;
     vm86s.flags = 0;
     vm86s.screen_bitmap = 0;
@@ -88,7 +88,7 @@
 
     eip = bios_start & 0xFFFF;
     cs = (bios_start & 0xFF0000) >> 4;
-    
+
     CPU_REG(eax) = regs->ax;
     CPU_REG(ebx) = regs->bx;
     CPU_REG(ecx) = regs->cx;
@@ -97,7 +97,7 @@
     CPU_REG(edi) = regs->di;
     CPU_REG(ebp) = 0;
     CPU_REG(eip) = eip;
-    CPU_REG(cs) = cs;               
+    CPU_REG(cs) = cs;
     CPU_REG(esp) = 0x100;
     CPU_REG(ss) = 0x30;               /* This is the standard pc bios stack */
     CPU_REG(es) = regs->es;
@@ -124,44 +124,44 @@
 do_vm86(void)
 {
     int retval;
-    
+
 #ifdef V86BIOS_DEBUG
     dump_registers();
 #endif
-//    retval = SYS_vm86old(&vm86s);
-//    retval = syscall(SYS_vm86old,&vm86s);
+/*    retval = SYS_vm86old(&vm86s); */
+/*    retval = syscall(SYS_vm86old,&vm86s); */
 
     retval = vm86_rep(&vm86s);
-    
+
     switch (VM86_TYPE(retval)) {
     case VM86_UNKNOWN:
-        if (!vm86_GP_fault()) return 0;
-        break;
+	if (!vm86_GP_fault()) return 0;
+	break;
     case VM86_STI:
-        fprintf(stderr,"vm86_sti :-((\n");
-        stack_trace();
-        dump_code();
-        return 0;
+	fprintf(stderr,"vm86_sti :-((\n");
+	stack_trace();
+	dump_code();
+	return 0;
     case VM86_INTx:
-        if (!vm86_do_int(VM86_ARG(retval))) {
-            fprintf(stderr,"\nUnknown vm86_int: %X\n\n",VM86_ARG(retval));
-            dump_registers();
-            return 0;
-        }
-        /* I'm not sure yet what to do if we can handle ints */
-        break;
+	if (!vm86_do_int(VM86_ARG(retval))) {
+	    fprintf(stderr,"\nUnknown vm86_int: %X\n\n",VM86_ARG(retval));
+	    dump_registers();
+	    return 0;
+	}
+	/* I'm not sure yet what to do if we can handle ints */
+	break;
     case VM86_SIGNAL:
-        fprintf(stderr,"received signal\n");
-        return 0;
+	fprintf(stderr,"received signal\n");
+	return 0;
     default:
-        fprintf(stderr,"unknown type(0x%x)=0x%x\n",
-                VM86_ARG(retval),VM86_TYPE(retval));
-        dump_registers();
-        dump_code();
-        stack_trace();
-        return 0;
+	fprintf(stderr,"unknown type(0x%x)=0x%x\n",
+		VM86_ARG(retval),VM86_TYPE(retval));
+	dump_registers();
+	dump_code();
+	stack_trace();
+	return 0;
     }
-    
+
     return 1;
 }
 
@@ -176,17 +176,17 @@
 do_x86(unsigned long bios_start, i86biosRegsPtr regs)
 {
     static void (*org_handler)(int);
-    
+
     setup_vm86(bios_start, regs);
     if (setjmp(x86_esc) == 0) {
-        org_handler = signal(2,vmexit);
-        while(do_vm86()) {};
-        signal(2,org_handler);
-        collect_bios_regs(regs);
+	org_handler = signal(2,vmexit);
+	while(do_vm86()) {};
+	signal(2,org_handler);
+	collect_bios_regs(regs);
     } else {
-        signal(2,org_handler);
-        printf("interrupted at 0x%x\n",((CARD16)CPU_REG(cs)) << 4
-           | (CARD16)CPU_REG(eip));
+	signal(2,org_handler);
+	printf("interrupted at 0x%x\n",((CARD16)CPU_REG(cs)) << 4
+	   | (CARD16)CPU_REG(eip));
     }
 }
 
@@ -217,19 +217,19 @@
     /* eat up prefixes */
     done = 0;
     do {
-        switch (*(csp++)) {
-        case 0x66:      /* operand prefix */  prefix66=1; break;
-        case 0x67:      /* address prefix */  prefix67=1; break;
-        case 0x2e:      /* CS */              pref_seg=CPU_REG(cs); break;
-        case 0x3e:      /* DS */              pref_seg=CPU_REG(ds); break;
-        case 0x26:      /* ES */              pref_seg=CPU_REG(es); break;
-        case 0x36:      /* SS */              pref_seg=CPU_REG(ss); break;
-        case 0x65:      /* GS */              pref_seg=CPU_REG(gs); break;
-        case 0x64:      /* FS */              pref_seg=CPU_REG(fs); break;
-        case 0xf2:      /* repnz */
-        case 0xf3:      /* rep */             is_rep=1; break;
-        default: done=1;
-        }
+	switch (*(csp++)) {
+	case 0x66:      /* operand prefix */  prefix66=1; break;
+	case 0x67:      /* address prefix */  prefix67=1; break;
+	case 0x2e:      /* CS */              pref_seg=CPU_REG(cs); break;
+	case 0x3e:      /* DS */              pref_seg=CPU_REG(ds); break;
+	case 0x26:      /* ES */              pref_seg=CPU_REG(es); break;
+	case 0x36:      /* SS */              pref_seg=CPU_REG(ss); break;
+	case 0x65:      /* GS */              pref_seg=CPU_REG(gs); break;
+	case 0x64:      /* FS */              pref_seg=CPU_REG(fs); break;
+	case 0xf2:      /* repnz */
+	case 0xf3:      /* rep */             is_rep=1; break;
+	default: done=1;
+	}
     } while (!done);
     csp--;   /* oops one too many */
     org_eip = CPU_REG(eip);
@@ -238,125 +238,125 @@
     switch (*csp) {
 
     case 0x6c:                    /* insb */
-        /* NOTE: ES can't be overwritten; prefixes 66,67 should use esi,edi,ecx
-         * but is anyone using extended regs in real mode? */
-        /* WARNING: no test for DI wrapping! */
-        CPU_REG_LW(edi) += port_rep_inb(CPU_REG_LW(edx), 
-                                        SEG_ADR((CARD8 *),es,di),
-                                        CPU_REG_LW(eflags)&DF,
-                                        (is_rep? LWECX:1));
-        if (is_rep) LWECX = 0;
-        CPU_REG_LW(eip)++;
-        break;
+	/* NOTE: ES can't be overwritten; prefixes 66,67 should use esi,edi,ecx
+	 * but is anyone using extended regs in real mode? */
+	/* WARNING: no test for DI wrapping! */
+	CPU_REG_LW(edi) += port_rep_inb(CPU_REG_LW(edx),
+					SEG_ADR((CARD8 *),es,di),
+					CPU_REG_LW(eflags)&DF,
+					(is_rep? LWECX:1));
+	if (is_rep) LWECX = 0;
+	CPU_REG_LW(eip)++;
+	break;
 
     case 0x6d:                  /* (rep) insw / insd */
-        /* NOTE: ES can't be overwritten */
-        /* WARNING: no test for _DI wrapping! */
-        if (prefix66) {
-            CPU_REG_LW(edi) += port_rep_inl(CPU_REG_LW(edx),
-                                            SEG_ADR((CARD32 *),es,di),
-                                            CPU_REG_LW(eflags)&DF,
-                                            (is_rep? LWECX:1));
-        }
-        else {
-            CPU_REG_LW(edi) += port_rep_inw(CPU_REG_LW(edx), 
-                                            SEG_ADR((CARD16 *),es,di),
-                                            CPU_REG_LW(eflags)&DF,
-                                            (is_rep? LWECX:1));
-        }
-        if (is_rep) LWECX = 0;
-        CPU_REG_LW(eip)++;
-        break;
+	/* NOTE: ES can't be overwritten */
+	/* WARNING: no test for _DI wrapping! */
+	if (prefix66) {
+	    CPU_REG_LW(edi) += port_rep_inl(CPU_REG_LW(edx),
+					    SEG_ADR((CARD32 *),es,di),
+					    CPU_REG_LW(eflags)&DF,
+					    (is_rep? LWECX:1));
+	}
+	else {
+	    CPU_REG_LW(edi) += port_rep_inw(CPU_REG_LW(edx),
+					    SEG_ADR((CARD16 *),es,di),
+					    CPU_REG_LW(eflags)&DF,
+					    (is_rep? LWECX:1));
+	}
+	if (is_rep) LWECX = 0;
+	CPU_REG_LW(eip)++;
+	break;
 
     case 0x6e:                  /* (rep) outsb */
-        if (pref_seg < 0) pref_seg = CPU_REG_LW(ds);
-        /* WARNING: no test for _SI wrapping! */
-        CPU_REG_LW(esi) += port_rep_outb(CPU_REG_LW(edx),(CARD8*)LIN_PREF_SI,
-                                         CPU_REG_LW(eflags)&DF,
-                                         (is_rep? LWECX:1));
-        if (is_rep) LWECX = 0;
-        CPU_REG_LW(eip)++;
-        break;
+	if (pref_seg < 0) pref_seg = CPU_REG_LW(ds);
+	/* WARNING: no test for _SI wrapping! */
+	CPU_REG_LW(esi) += port_rep_outb(CPU_REG_LW(edx),(CARD8*)LIN_PREF_SI,
+					 CPU_REG_LW(eflags)&DF,
+					 (is_rep? LWECX:1));
+	if (is_rep) LWECX = 0;
+	CPU_REG_LW(eip)++;
+	break;
 
     case 0x6f:                  /* (rep) outsw / outsd */
-        if (pref_seg < 0) pref_seg = CPU_REG_LW(ds);
-        /* WARNING: no test for _SI wrapping! */
-        if (prefix66) {
-            CPU_REG_LW(esi) += port_rep_outl(CPU_REG_LW(edx),
-                                             (CARD32 *)LIN_PREF_SI,
-                                             CPU_REG_LW(eflags)&DF,
-                                             (is_rep? LWECX:1));
-        }
-        else {
-            CPU_REG_LW(esi) += port_rep_outw(CPU_REG_LW(edx),
-                                             (CARD16 *)LIN_PREF_SI,
-                                             CPU_REG_LW(eflags)&DF,
-                                             (is_rep? LWECX:1));
-        } 
-        if (is_rep) LWECX = 0;
-        CPU_REG_LW(eip)++;
-        break;
+	if (pref_seg < 0) pref_seg = CPU_REG_LW(ds);
+	/* WARNING: no test for _SI wrapping! */
+	if (prefix66) {
+	    CPU_REG_LW(esi) += port_rep_outl(CPU_REG_LW(edx),
+					     (CARD32 *)LIN_PREF_SI,
+					     CPU_REG_LW(eflags)&DF,
+					     (is_rep? LWECX:1));
+	}
+	else {
+	    CPU_REG_LW(esi) += port_rep_outw(CPU_REG_LW(edx),
+					     (CARD16 *)LIN_PREF_SI,
+					     CPU_REG_LW(eflags)&DF,
+					     (is_rep? LWECX:1));
+	}
+	if (is_rep) LWECX = 0;
+	CPU_REG_LW(eip)++;
+	break;
 
     case 0xe5:                  /* inw xx, inl xx */
-        if (prefix66) CPU_REG(eax) = P.inl((int) csp[1]);
-        else CPU_REG_LW(eax) = P.inw((int) csp[1]);  
-        CPU_REG_LW(eip) += 2;
-        break;
+	if (prefix66) CPU_REG(eax) = P.inl((int) csp[1]);
+	else CPU_REG_LW(eax) = P.inw((int) csp[1]);
+	CPU_REG_LW(eip) += 2;
+	break;
     case 0xe4:                  /* inb xx */
-        CPU_REG_LW(eax) &= ~(CARD32)0xff;
-        CPU_REG_LB(ax) |= P.inb((int) csp[1]);
-        CPU_REG_LW(eip) += 2;
-        break;
+	CPU_REG_LW(eax) &= ~(CARD32)0xff;
+	CPU_REG_LB(ax) |= P.inb((int) csp[1]);
+	CPU_REG_LW(eip) += 2;
+	break;
     case 0xed:                  /* inw dx, inl dx */
-        if (prefix66) CPU_REG(eax) = P.inl(CPU_REG_LW(edx)); 
-        else CPU_REG_LW(eax) = P.inw(CPU_REG_LW(edx));
-        CPU_REG_LW(eip) += 1;
-        break;
+	if (prefix66) CPU_REG(eax) = P.inl(CPU_REG_LW(edx));
+	else CPU_REG_LW(eax) = P.inw(CPU_REG_LW(edx));
+	CPU_REG_LW(eip) += 1;
+	break;
     case 0xec:                  /* inb dx */
-        CPU_REG_LW(eax) &= ~(CARD32)0xff;
-        CPU_REG_LB(ax) |= P.inb(CPU_REG_LW(edx));
-        CPU_REG_LW(eip) += 1;
-        break;
+	CPU_REG_LW(eax) &= ~(CARD32)0xff;
+	CPU_REG_LB(ax) |= P.inb(CPU_REG_LW(edx));
+	CPU_REG_LW(eip) += 1;
+	break;
 
     case 0xe7:                  /* outw xx */
-        if (prefix66) P.outl((int)csp[1], CPU_REG(eax));
-        else P.outw((int)csp[1], CPU_REG_LW(eax));
-        CPU_REG_LW(eip) += 2;
-        break;
+	if (prefix66) P.outl((int)csp[1], CPU_REG(eax));
+	else P.outw((int)csp[1], CPU_REG_LW(eax));
+	CPU_REG_LW(eip) += 2;
+	break;
     case 0xe6:                  /* outb xx */
-        P.outb((int) csp[1], CPU_REG_LB(ax));
-        CPU_REG_LW(eip) += 2;
-        break;
+	P.outb((int) csp[1], CPU_REG_LB(ax));
+	CPU_REG_LW(eip) += 2;
+	break;
     case 0xef:                  /* outw dx */
-        if (prefix66) P.outl(CPU_REG_LW(edx), CPU_REG(eax));
-        else P.outw(CPU_REG_LW(edx), CPU_REG_LW(eax));
-        CPU_REG_LW(eip) += 1;
-        break;
+	if (prefix66) P.outl(CPU_REG_LW(edx), CPU_REG(eax));
+	else P.outw(CPU_REG_LW(edx), CPU_REG_LW(eax));
+	CPU_REG_LW(eip) += 1;
+	break;
     case 0xee:                  /* outb dx */
-        P.outb(CPU_REG_LW(edx), CPU_REG_LB(ax));
-        CPU_REG_LW(eip) += 1;
-        break;
+	P.outb(CPU_REG_LW(edx), CPU_REG_LB(ax));
+	CPU_REG_LW(eip) += 1;
+	break;
 
     case 0xf4:
 #ifdef V86BIOS_DEBUG
-        printf("hlt at %p\n", lina);
+	printf("hlt at %p\n", lina);
 #endif
-        return 0;
+	return 0;
 
-    case 0x0f: 
-        fprintf(stderr,"CPU 0x0f Trap at eip=0x%lx\n",CPU_REG(eip));
-        goto op0ferr; 
-        break;
+    case 0x0f:
+	fprintf(stderr,"CPU 0x0f Trap at eip=0x%lx\n",CPU_REG(eip));
+	goto op0ferr;
+	break;
 
     case 0xf0:                  /* lock */
     default:
-        fprintf(stderr,"unknown reason for exception\n");
-        dump_registers();
-        stack_trace();
+	fprintf(stderr,"unknown reason for exception\n");
+	dump_registers();
+	stack_trace();
     op0ferr:
-        dump_code();
-        fprintf(stderr,"cannot continue\n");
-        return 0;
+	dump_code();
+	fprintf(stderr,"cannot continue\n");
+	return 0;
     }                           /* end of switch() */
     return 1;
 }
@@ -369,16 +369,16 @@
 
     i_printf("int 0x%x received: ax:0x%lx",num,CPU_REG(eax));
     if (Config.PrintIp)
-        i_printf(" at: 0x%x\n",getIP());
+	i_printf(" at: 0x%x\n",getIP());
     else
-        i_printf("\n");
+	i_printf("\n");
 
     /* try to run bios interrupt */
-    
+
     /* if not installed fall back */
 #define COPY(x) regs.##x = CPU_REG(x)
 #define COPY_R(x) CPU_REG(x) = regs.##x
-    
+
     COPY(eax);
     COPY(ebx);
     COPY(ecx);
@@ -397,9 +397,9 @@
     COPY(eflags);
 
     if (!(val = int_handler(num,&regs)))
-        if (!(val = run_bios_int(num,&regs)))
-            return val;
-        
+	if (!(val = run_bios_int(num,&regs)))
+	    return val;
+
     COPY_R(eax);
     COPY_R(ebx);
     COPY_R(ecx);
@@ -429,11 +429,11 @@
     unsigned char *lina = SEG_ADR((unsigned char *), cs, ip);
 
     fprintf(stderr,"code at 0x%8.8x: ",(CARD32)lina);
-    for (i=0; i<0x10; i++) 
-        fprintf(stderr,"%2.2x ",*(lina + i));
+    for (i=0; i<0x10; i++)
+	fprintf(stderr,"%2.2x ",*(lina + i));
     fprintf(stderr,"\n                    ");
-    for (; i<0x20; i++) 
-        fprintf(stderr,"%2.2x ",*(lina + i));
+    for (; i<0x20; i++)
+	fprintf(stderr,"%2.2x ",*(lina + i));
     fprintf(stderr,"\n");
 }
 
@@ -466,41 +466,41 @@
 stack_trace(void)
 {
     int i;
-    unsigned char *stack = SEG_ADR((unsigned char *), ss, sp);    
+    unsigned char *stack = SEG_ADR((unsigned char *), ss, sp);
 
     fprintf(stderr,"stack at 0x%8.8lx:\n",(unsigned long)stack);
-    for (i=0; i < 0x10; i++) 
-        fprintf(stderr,"%2.2x ",*(stack + i));
+    for (i=0; i < 0x10; i++)
+	fprintf(stderr,"%2.2x ",*(stack + i));
     fprintf(stderr,"\n");
-    
+
 }
 
 static int
-vm86_rep(struct vm86_struct *ptr) 
+vm86_rep(struct vm86_struct *ptr)
 {
 
     int __res;
 
     __asm__ __volatile__("int $0x80\n"
-                         :"=a" (__res):"a" ((int)113),
-                         "b" ((struct vm86_struct *)ptr));
+			 :"=a" (__res):"a" ((int)113),
+			 "b" ((struct vm86_struct *)ptr));
 
-            if ((__res) < 0) {
-                errno = -__res;
-                __res=-1;
-            }
-            else errno = 0;
-            return __res;
+	    if ((__res) < 0) {
+		errno = -__res;
+		__res=-1;
+	    }
+	    else errno = 0;
+	    return __res;
 }
 
 #define pushw(base, ptr, val) \
 __asm__ __volatile__( \
-        "decw %w0\n\t" \
-        "movb %h2,(%1,%0)\n\t" \
-        "decw %w0\n\t" \
-        "movb %b2,(%1,%0)" \
-        : "=r" (ptr) \
-        : "r" (base), "q" (val), "0" (ptr))
+	"decw %w0\n\t" \
+	"movb %h2,(%1,%0)\n\t" \
+	"decw %w0\n\t" \
+	"movb %b2,(%1,%0)" \
+	: "=r" (ptr) \
+	: "r" (base), "q" (val), "0" (ptr))
 
 int
 run_bios_int(int num, struct regs86 *regs)
@@ -515,25 +515,25 @@
     /* check if bios vector is initialized */
     if (((CARD16*)0)[(num<<1)+1] == 0x0000) { /* SYS_BIOS_SEG ?*/
 #ifdef V86BIOS_DEBUG
-        i_printf("card BIOS not loaded\n");
+	i_printf("card BIOS not loaded\n");
 #endif
-        return 0;
+	return 0;
     }
-    
+
 #ifdef V86BIOS_DEBUG
     if (firsttime) {
-        dprint(0,0x3D0);
-        firsttime = 0;
+	dprint(0,0x3D0);
+	firsttime = 0;
     }
 #endif
-    
+
     i_printf("calling card BIOS at: ");
     ssp = (CARD16*)(CPU_REG(ss)<<4);
     sp = (CARD32) CPU_REG_LW(esp);
 
     eflags = regs->eflags;
     eflags = ((eflags & VIF_MASK) != 0)
-        ? (eflags | IF_MASK) : (eflags & ~(CARD32) IF_MASK);
+	? (eflags | IF_MASK) : (eflags & ~(CARD32) IF_MASK);
     pushw(ssp, sp, eflags);
     pushw(ssp, sp, regs->cs);
     pushw(ssp, sp, (CARD16)regs->eip);
@@ -545,7 +545,7 @@
     dump_code();
 #endif
     regs->eflags = regs->eflags
-                       & ~(VIF_MASK | TF_MASK | IF_MASK | NT_MASK);
+		       & ~(VIF_MASK | TF_MASK | IF_MASK | NT_MASK);
     return 1;
 }
 

diff --git a/board/MAI/bios_emulator/scitech/src/v86bios/v86bios.c b/board/MAI/bios_emulator/scitech/src/v86bios/v86bios.c
index 7a3fb36..101c1f2 100644
--- a/board/MAI/bios_emulator/scitech/src/v86bios/v86bios.c
+++ b/board/MAI/bios_emulator/scitech/src/v86bios/v86bios.c

@@ -48,12 +48,12 @@
 #define BIOS_START 0x7C00            /* default BIOS entry */
 #define BIOS_MEM 0x600
 
-//CARD8 code[] = { 0xb8 , 0xf0 , 0xf0, 0xf4 };
+/*CARD8 code[] = { 0xb8 , 0xf0 , 0xf0, 0xf4 }; */
 #define VB_X(x) (V_BIOS >> x) & 0xFF
 CARD8 code[] = { 6, 0x9a, 0x03, 0x00, 0x00, VB_X(12), 0xf4 };
-//CARD8 code[] = { 0x9a, 0x03, 0x00, 0x00, VB_X(12), 0xb8, 0x03, 0x00,
-//0xcd, 0x10, 0xf4 };
-//CARD8 code[] = {  0xb8 , 0xf0 , 0xf0 ,0xf4 };
+/*CARD8 code[] = { 0x9a, 0x03, 0x00, 0x00, VB_X(12), 0xb8, 0x03, 0x00, */
+/*0xcd, 0x10, 0xf4 }; */
+/*CARD8 code[] = {  0xb8 , 0xf0 , 0xf0 ,0xf4 }; */
 
 int ioperm_list[IOPERM_BITS] = {0,};
 
@@ -97,87 +97,87 @@
 int main(int argc,char **argv)
 {
     int c;
-    
+
     Config.PrintPort = PRINT_PORT;
     Config.IoStatistics = IO_STATISTICS;
     Config.PrintIrq = PRINT_IRQ;
     Config.PrintPci = PRINT_PCI;
-    Config.ShowAllDev = SHOW_ALL_DEV;        
-    Config.PrintIp = PRINT_IP;           
-    Config.SaveBios = SAVE_BIOS;          
-    Config.Trace = TRACE;             
+    Config.ShowAllDev = SHOW_ALL_DEV;
+    Config.PrintIp = PRINT_IP;
+    Config.SaveBios = SAVE_BIOS;
+    Config.Trace = TRACE;
     Config.ConfigActiveOnly = CONFIG_ACTIVE_ONLY;  /* boot */
     Config.ConfigActiveDevice = CONFIG_ACTIVE_DEVICE; /* boot */
-    Config.MapSysBios = MAP_SYS_BIOS;        
-    Config.Resort = RESORT;  /* boot */          
-    Config.FixRom = FIX_ROM;            
+    Config.MapSysBios = MAP_SYS_BIOS;
+    Config.Resort = RESORT;  /* boot */
+    Config.FixRom = FIX_ROM;
     Config.NoConsole = NO_CONSOLE;
     Config.BootOnly = FALSE;
     Config.Verbose = VERBOSE;
-    
-    opterr = 0;    
+
+    opterr = 0;
     while ((c = getopt(argc,argv,"psicaPStAdbrfnv:?")) != EOF) {
     switch(c) {
     case 'p':
-        Config.PrintPort = TRUE;
-        break;
+	Config.PrintPort = TRUE;
+	break;
     case 's':
-        Config.IoStatistics = TRUE;
-        break;
+	Config.IoStatistics = TRUE;
+	break;
     case 'i':
-        Config.PrintIrq = TRUE;
-        break;
+	Config.PrintIrq = TRUE;
+	break;
     case 'c':
-        Config.PrintPci = TRUE;
-        break;
+	Config.PrintPci = TRUE;
+	break;
     case 'a':
-        Config.ShowAllDev = TRUE;
-        break;
+	Config.ShowAllDev = TRUE;
+	break;
     case 'P':
-        Config.PrintIp = TRUE;
-        break;
+	Config.PrintIp = TRUE;
+	break;
     case 'S':
-        Config.SaveBios = TRUE;
-        break;
+	Config.SaveBios = TRUE;
+	break;
     case 't':
-        Config.Trace = TRUE;
-        break;
+	Config.Trace = TRUE;
+	break;
     case 'A':
-        Config.ConfigActiveOnly = TRUE;
-        break;
+	Config.ConfigActiveOnly = TRUE;
+	break;
     case 'd':
-        Config.ConfigActiveDevice = TRUE;
-        break;
+	Config.ConfigActiveDevice = TRUE;
+	break;
     case 'b':
-        Config.MapSysBios = TRUE;
-        break;
+	Config.MapSysBios = TRUE;
+	break;
     case 'r':
-        Config.Resort = TRUE;
-        break;
+	Config.Resort = TRUE;
+	break;
     case 'f':
-        Config.FixRom = TRUE;
-        break;
+	Config.FixRom = TRUE;
+	break;
     case 'n':
-        Config.NoConsole = TRUE;
-        break;
+	Config.NoConsole = TRUE;
+	break;
     case 'v':
-        Config.Verbose = strtol(optarg,NULL,0);
-        break;
+	Config.Verbose = strtol(optarg,NULL,0);
+	break;
     case '?':
-        print_usage();
-        break;
+	print_usage();
+	break;
     default:
-        break;
+	break;
     }
     }
-    
-    
+
+
     if (!map())
     exit(1);
-    
+
     if (!setup_system_bios())
     exit(1);
-    
+
     iopl(3);
 
     scan_pci();
@@ -188,23 +188,23 @@
     save_pos102 = inb(0x102);
 
     if (Config.BootOnly) {
-    
+
     if (!CurrentPci && !Config.ConfigActiveDevice
-        && !Config.ConfigActiveOnly) {
-        iopl(0);
-        unmap();
-        exit (1);
+	&& !Config.ConfigActiveOnly) {
+	iopl(0);
+	unmap();
+	exit (1);
     }
     call_boot(NULL);
     } else {
     using_history();
     yyparse();
     }
-    
+
     unmap();
 
     pciVideoRestore();
-    
+
     outb(0x102, save_pos102);
     outb(0x46e8, save_46e8);
     outb(0x3C3, save_vse);
@@ -223,139 +223,139 @@
 {
     int Active_is_Pci = 0;
     CARD32 vbios_base;
-    
+
     CurrentPci = PciList;
     Console = open_console();
-    
+
     set_ioperm();
 
-    
+
     signal(2,sig_handler);
     signal(11,sig_handler);
-    
+
     /* disable primary card */
     pciVideoRestore(); /* reset PCI state to see primary card */
     outb(0x3C2,~(CARD8)0x03 & save_msr);
     outb(0x3C3,~(CARD8)0x01 & save_vse);
     outb(0x46e8, ~(CARD8)0x08 & save_46e8);
     outb(0x102, ~(CARD8)0x01 & save_pos102);
-    
+
     pciVideoDisable();
-    
+
     while (CurrentPci) {
     CARD16 ax;
-    
+
     if (CurrentPci->active) {
-        Active_is_Pci = 1;
-        if (!Config.ConfigActiveDevice && !dev) {
-        CurrentPci = CurrentPci->next;
-        continue;
-        }
+	Active_is_Pci = 1;
+	if (!Config.ConfigActiveDevice && !dev) {
+	CurrentPci = CurrentPci->next;
+	continue;
+	}
     } else if (Config.ConfigActiveOnly && !dev) {
-        CurrentPci = CurrentPci->next;
-        continue;
+	CurrentPci = CurrentPci->next;
+	continue;
     }
     if (dev && ((dev->type != PCI)
-            || (dev->type == PCI
-            && (dev->loc.pci.dev != CurrentPci->dev
-                || dev->loc.pci.bus != CurrentPci->bus
-                || dev->loc.pci.func != CurrentPci->func)))) {
-        CurrentPci = CurrentPci->next;
-        continue;
+	    || (dev->type == PCI
+	    && (dev->loc.pci.dev != CurrentPci->dev
+		|| dev->loc.pci.bus != CurrentPci->bus
+		|| dev->loc.pci.func != CurrentPci->func)))) {
+	CurrentPci = CurrentPci->next;
+	continue;
     }
-    
+
     EnableCurrent();
-    
+
     if (CurrentPci->active) {
-        outb(0x102, save_pos102);
-        outb(0x46e8, save_46e8);
-        outb(0x3C3, save_vse);
-        outb(0x3C2, save_msr);
+	outb(0x102, save_pos102);
+	outb(0x46e8, save_46e8);
+	outb(0x3C3, save_vse);
+	outb(0x3C2, save_msr);
     }
-    
+
     /* clear interrupt vectors */
 #ifdef __ia32__
     vbios_base = CurrentPci->active ? setup_primary_int_vect()
-        : setup_int_vect();
+	: setup_int_vect();
 #else
     vbios_base = setup_int_vect();
 #endif
     ax = ((CARD16)(CurrentPci->bus) << 8)
-        | (CurrentPci->dev << 3) | (CurrentPci->func & 0x7);
+	| (CurrentPci->dev << 3) | (CurrentPci->func & 0x7);
     if (Config.Verbose > 1) P_printf("ax: 0x%x\n",ax);
-    
+
     BootBios = findPciByIDs(CurrentPci->bus,CurrentPci->dev,
-                   CurrentPci->func);
+		   CurrentPci->func);
     if (!((mapPciRom(BootBios) && chksum((CARD8*)V_BIOS))
-          || (CurrentPci->active && copy_vbios(vbios_base)))) {
-        CurrentPci = CurrentPci->next;
-        continue;
+	  || (CurrentPci->active && copy_vbios(vbios_base)))) {
+	CurrentPci = CurrentPci->next;
+	continue;
     }
     if (!map_vram()) {
-        CurrentPci = CurrentPci->next;
-        continue;
+	CurrentPci = CurrentPci->next;
+	continue;
     }
     if (Config.SaveBios) save_bios_to_file();
     printf("initializing PCI bus: %i dev: %i func: %i\n",CurrentPci->bus,
-           CurrentPci->dev,CurrentPci->func);
+	   CurrentPci->dev,CurrentPci->func);
     bootBIOS(ax);
     unmap_vram();
 
     if (CurrentPci->active)
-        close_console(Console);
+	close_console(Console);
 
     if (dev) return;
-    
+
     CurrentPci = CurrentPci->next;
     }
-    
+
     /* We have an ISA device - configure if requested */
     if (!Active_is_Pci /* no isa card in system! */
     && ((!dev && (Config.ConfigActiveDevice || Config.ConfigActiveOnly))
-        || (dev && dev->type == ISA))) {
+	|| (dev && dev->type == ISA))) {
 
     pciVideoDisable();
 
     if (!dev || dev->type == ISA) {
-        outb(0x102, save_pos102);
-        outb(0x46e8, save_46e8);
-        outb(0x3C3, save_vse);
-        outb(0x3C2, save_msr);
-        
+	outb(0x102, save_pos102);
+	outb(0x46e8, save_46e8);
+	outb(0x3C3, save_vse);
+	outb(0x3C2, save_msr);
+
 #ifdef __ia32__
-        vbios_base = setup_primary_int_vect();
+	vbios_base = setup_primary_int_vect();
 #else
-        vbios_base = setup_int_vect();
+	vbios_base = setup_int_vect();
 #endif
-        if (copy_vbios(vbios_base)) {
-        
-        if (Config.SaveBios) save_bios_to_file();
-        if  (map_vram()) {
-            printf("initializing ISA bus\n");
-            bootBIOS(0);
-        }
-        }
-    
-        unmap_vram();
-        sleep(1);
-        close_console(Console);
+	if (copy_vbios(vbios_base)) {
+
+	if (Config.SaveBios) save_bios_to_file();
+	if  (map_vram()) {
+	    printf("initializing ISA bus\n");
+	    bootBIOS(0);
+	}
+	}
+
+	unmap_vram();
+	sleep(1);
+	close_console(Console);
     }
     }
-    
-    
+
+
 }
 
-int  
+int
 map(void)
 {
     void* mem;
     mem = mmap(0, (size_t)SIZE,
-               PROT_EXEC | PROT_READ | PROT_WRITE,
-               MAP_FIXED | MAP_PRIVATE | MAP_ANON,
-               -1, 0 ); 
+	       PROT_EXEC | PROT_READ | PROT_WRITE,
+	       MAP_FIXED | MAP_PRIVATE | MAP_ANON,
+	       -1, 0 );
     if (mem != 0) {
-        perror("anonymous map");
-        return (0);
+	perror("anonymous map");
+	return (0);
     }
     memset(mem,0,SIZE);
 
@@ -390,33 +390,33 @@
     int mem_fd;
 
 #ifdef __ia64__
-    if ((mem_fd = open(MEM_FILE,O_RDWR | O_SYNC))<0) 
+    if ((mem_fd = open(MEM_FILE,O_RDWR | O_SYNC))<0)
 #else
-    if ((mem_fd = open(MEM_FILE,O_RDWR))<0) 
+    if ((mem_fd = open(MEM_FILE,O_RDWR))<0)
 #endif
-        {
-        perror("opening memory");
-        return 0;
+	{
+	perror("opening memory");
+	return 0;
     }
 
 #ifdef __alpha__
        if (!_bus_base()) sparse_shift = 7; /* Uh, oh, JENSEN... */
-         if (!_bus_base_sparse()) sparse_shift = 0;
-         if ((vram_map = mmap(0,(size_t) (VRAM_SIZE << sparse_shift),
-                                                 PROT_READ | PROT_WRITE,
-                                                 MAP_SHARED,
-                                                 mem_fd, (VRAM_START << sparse_shift)
-                                                 | _bus_base_sparse())) == (void *) -1)
+	 if (!_bus_base_sparse()) sparse_shift = 0;
+	 if ((vram_map = mmap(0,(size_t) (VRAM_SIZE << sparse_shift),
+						 PROT_READ | PROT_WRITE,
+						 MAP_SHARED,
+						 mem_fd, (VRAM_START << sparse_shift)
+						 | _bus_base_sparse())) == (void *) -1)
 #else
       if (mmap((void *) VRAM_START, (size_t) VRAM_SIZE,
-                         PROT_EXEC | PROT_READ | PROT_WRITE, MAP_SHARED | MAP_FIXED,
-                         mem_fd, VRAM_START) == (void *) -1) 
+			 PROT_EXEC | PROT_READ | PROT_WRITE, MAP_SHARED | MAP_FIXED,
+			 mem_fd, VRAM_START) == (void *) -1)
 #endif
       {
-        perror("mmap error in map_hardware_ram (1)");
-            close(mem_fd);
-            return (0);
-        }
+	perror("mmap error in map_hardware_ram (1)");
+	    close(mem_fd);
+	    return (0);
+	}
     vram_mapped = 1;
     close(mem_fd);
     return (1);
@@ -426,7 +426,7 @@
 unmap_vram(void)
 {
     if (!vram_mapped) return;
-    
+
     munmap((void*)VRAM_START,VRAM_SIZE);
     vram_mapped = 0;
 }
@@ -439,39 +439,39 @@
     int size;
 
     if ((mem_fd = open(MEM_FILE,O_RDONLY))<0) {
-        perror("opening memory");
-        return (0);
+	perror("opening memory");
+	return (0);
     }
 
-    if (lseek(mem_fd,(off_t) v_base, SEEK_SET) != (off_t) v_base) { 
-          fprintf(stderr,"Cannot lseek\n");
-          goto Error;
+    if (lseek(mem_fd,(off_t) v_base, SEEK_SET) != (off_t) v_base) {
+	  fprintf(stderr,"Cannot lseek\n");
+	  goto Error;
       }
     tmp = (unsigned char *)malloc(3);
     if (read(mem_fd, (char *)tmp, (size_t) 3) != (size_t) 3) {
-            fprintf(stderr,"Cannot read\n");
-        goto Error;
+	    fprintf(stderr,"Cannot read\n");
+	goto Error;
     }
-    if (lseek(mem_fd,(off_t) v_base,SEEK_SET) != (off_t) v_base) 
-        goto Error;
+    if (lseek(mem_fd,(off_t) v_base,SEEK_SET) != (off_t) v_base)
+	goto Error;
 
     if (*tmp != 0x55 || *(tmp+1) != 0xAA ) {
-        fprintf(stderr,"No bios found at: 0x%lx\n",v_base);
-        goto Error;
+	fprintf(stderr,"No bios found at: 0x%lx\n",v_base);
+	goto Error;
     }
 #ifdef DEBUG
-        dprint((unsigned long)tmp,0x100);
+	dprint((unsigned long)tmp,0x100);
 #endif
     size = *(tmp+2) * 512;
 
     if (read(mem_fd, (char *)v_base, (size_t) size) != (size_t) size) {
-            fprintf(stderr,"Cannot read\n");
-        goto Error;
+	    fprintf(stderr,"Cannot read\n");
+	goto Error;
     }
     free(tmp);
     close(mem_fd);
     if (!chksum((CARD8*)v_base))
-        return (0);
+	return (0);
 
     return (1);
 
@@ -488,14 +488,14 @@
     int mem_fd;
 
     if ((mem_fd = open(MEM_FILE,O_RDONLY))<0) {
-        perror("opening memory");
-        return (0);
+	perror("opening memory");
+	return (0);
     }
-  
-    if (lseek(mem_fd,(off_t) SYS_BIOS,SEEK_SET) != (off_t) SYS_BIOS) 
-        goto Error;
-    if (read(mem_fd, (char *)SYS_BIOS, (size_t) 0xFFFF) != (size_t) 0xFFFF) 
-        goto Error;
+
+    if (lseek(mem_fd,(off_t) SYS_BIOS,SEEK_SET) != (off_t) SYS_BIOS)
+	goto Error;
+    if (read(mem_fd, (char *)SYS_BIOS, (size_t) 0xFFFF) != (size_t) 0xFFFF)
+	goto Error;
 
     close(mem_fd);
     return (1);
@@ -512,15 +512,15 @@
     int i;
     CARD8 val;
     int size = code[0];
-    
+
     for ( i=1;i<=size;i++) {
-        val = code[i];
-        *ptr++ = val;
+	val = code[i];
+	*ptr++ = val;
     }
     return;
 }
-        
-void 
+
+void
 dprint(unsigned long start, unsigned long size)
 {
     int i,j;
@@ -529,13 +529,13 @@
     for (j = 0; j < (size >> 4); j++) {
     char *d = c;
     printf("\n0x%lx:  ",(unsigned long)c);
-    for (i = 0; i<16; i++) 
-        printf("%2.2x ",(unsigned char) (*(c++)));
+    for (i = 0; i<16; i++)
+	printf("%2.2x ",(unsigned char) (*(c++)));
     c = d;
     for (i = 0; i<16; i++) {
-        printf("%c",((((CARD8)(*c)) > 32) && (((CARD8)(*c)) < 128)) ?
-           (unsigned char) (*(c)): '.');
-        c++;
+	printf("%c",((((CARD8)(*c)) > 32) && (((CARD8)(*c)) < 128)) ?
+	   (unsigned char) (*(c)): '.');
+	c++;
     }
     }
     printf("\n");
@@ -548,16 +548,16 @@
     int size, count;
     char file_name[256];
     int fd;
-    
+
     sprintf(file_name,"bios_%i.fil",num);
     if ((fd =  open(file_name,O_WRONLY | O_CREAT | O_TRUNC,00644)) == -1)
-        return;
+	return;
     size = (*(unsigned char*)(V_BIOS + 2)) * 512;
 #ifdef V86BIOS_DEBUG
     dprint(V_BIOS,20);
 #endif
     if ((count = write(fd,(void *)(V_BIOS),size)) != size)
-        fprintf(stderr,"only saved %i of %i bytes\n",size,count);
+	fprintf(stderr,"only saved %i of %i bytes\n",size,count);
     num++;
 }
 
@@ -612,15 +612,15 @@
     CARD32 vbase;
     void *map;
 
-    if ((mem_fd = open(MEM_FILE,O_RDWR))<0) 
-            {
+    if ((mem_fd = open(MEM_FILE,O_RDWR))<0)
+	    {
     perror("opening memory");
     return (0);
     }
-  
+
     if ((map = mmap((void *) 0, (size_t) 0x2000,
-         PROT_EXEC | PROT_READ | PROT_WRITE, MAP_SHARED,
-         mem_fd, 0)) == (void *)-1)   {
+	 PROT_EXEC | PROT_READ | PROT_WRITE, MAP_SHARED,
+	 mem_fd, 0)) == (void *)-1)   {
     perror("mmap error in map_hardware_ram (2)");
     close(mem_fd);
     return (0);
@@ -636,7 +636,7 @@
     if (!bios_var)
     bios_var = (char *)malloc(BIOS_MEM);
     memcpy(bios_var,0,BIOS_MEM);
-    
+
     vbase = (*((CARD16*)(0x10 << 2) + 1)) << 4;
     if (Config.Verbose > 0) printf("vbase: 0x%x\n",vbase);
     return vbase;
@@ -649,11 +649,11 @@
     const CARD16 cs = 0x0;
     const CARD16 ip = 0x0;
     int i;
-    
+
     /* let the int vects point to the SYS_BIOS seg */
     for (i=0; i<0x80; i++) {
-        ((CARD16*)0)[i<<1] = ip;
-        ((CARD16*)0)[(i<<1)+1] = cs;
+	((CARD16*)0)[i<<1] = ip;
+	((CARD16*)0)[(i<<1)+1] = cs;
     }
     /* video interrupts default location */
     ((CARD16*)0)[(0x42<<1)+1] = 0xf000;
@@ -705,40 +705,40 @@
 {
     char *date = "06/01/99";
     char *eisa_ident = "PCI/ISA";
-    
+
     if (Config.MapSysBios) {
 
-        if (!copy_sys_bios()) return 0;
-        return 1;
+	if (!copy_sys_bios()) return 0;
+	return 1;
 
     } else {
 
-//    memset((void *)0xF0000,0xf4,0xfff7);
-    
-        /*
-         * we trap the "industry standard entry points" to the BIOS
-         * and all other locations by filling them with "hlt"
-         * TODO: implement hlt-handler for these
-         */
-        memset((void *)0xF0000,0xf4,0x10000);
-        
-        /*
-         * TODO: we should copy the fdd table (0xfec59-0xfec5b)
-         * the video parameter table (0xf0ac-0xf0fb)
-         * and the font tables (0xfa6e-0xfe6d)
-         * from the original bios here
-         */
-    
-        /* set bios date */
-        strcpy((char *)0xFFFF5,date);
-        /* set up eisa ident string */
-        strcpy((char *)0xFFFD9,eisa_ident);
-        /* write system model id for IBM-AT */
-        ((char *)0)[0xFFFFE] = 0xfc;
+/*    memset((void *)0xF0000,0xf4,0xfff7); */
 
-        return 1;
+	/*
+	 * we trap the "industry standard entry points" to the BIOS
+	 * and all other locations by filling them with "hlt"
+	 * TODO: implement hlt-handler for these
+	 */
+	memset((void *)0xF0000,0xf4,0x10000);
+
+	/*
+	 * TODO: we should copy the fdd table (0xfec59-0xfec5b)
+	 * the video parameter table (0xf0ac-0xf0fb)
+	 * and the font tables (0xfa6e-0xfe6d)
+	 * from the original bios here
+	 */
+
+	/* set bios date */
+	strcpy((char *)0xFFFF5,date);
+	/* set up eisa ident string */
+	strcpy((char *)0xFFFD9,eisa_ident);
+	/* write system model id for IBM-AT */
+	((char *)0)[0xFFFFE] = 0xfc;
+
+	return 1;
     }
-    
+
 }
 
 static void
@@ -747,28 +747,28 @@
     int mem_fd;
     void *map;
     memType i;
-    
+
 #ifdef __ia64__
-    if ((mem_fd = open(MEM_FILE,O_RDWR | O_SYNC))<0) 
+    if ((mem_fd = open(MEM_FILE,O_RDWR | O_SYNC))<0)
 #else
-    if ((mem_fd = open(MEM_FILE,O_RDWR))<0) 
+    if ((mem_fd = open(MEM_FILE,O_RDWR))<0)
 #endif
-            {
+	    {
     perror("opening memory");
     return;
     }
-  
+
     if ((map = mmap((void *) 0, (size_t) 0x2000,
-         PROT_EXEC | PROT_READ | PROT_WRITE, MAP_SHARED,
-         mem_fd, 0)) == (void *)-1)   {
+	 PROT_EXEC | PROT_READ | PROT_WRITE, MAP_SHARED,
+	 mem_fd, 0)) == (void *)-1)   {
     perror("mmap error in map_hardware_ram (3)");
     close(mem_fd);
     return;
     }
 
     for (i = 0; i < BIOS_MEM; i++) {
-    if (bios_var[i] != *(CARD8*)i) 
-        *((CARD8*)map + i) = *(CARD8*)i;
+    if (bios_var[i] != *(CARD8*)i)
+	*((CARD8*)map + i) = *(CARD8*)i;
     }
 
     munmap(map,0x2000);
@@ -782,10 +782,10 @@
   CARD8 val = 0;
   int i;
 
-  size = *(start+2) * 512;  
+  size = *(start+2) * 512;
   for (i = 0; i<size; i++)
     val += *(start + i);
-    
+
   if (!val)
     return 1;
 
@@ -800,10 +800,10 @@
     CARD8 code_int[] = { 3, 0xcd, 0x00, 0xf4 };
 
     code_int[2] = (CARD8) num;
-    
+
     if (num == 0x10)
     isVideo = TRUE;
-    
+
     if (!setup_system_bios())
     return;
 
@@ -815,16 +815,16 @@
 #else
     if (!(vbios_base = setup_int_vect()))
 #endif
-        return;
+	return;
     if (!copy_vbios(vbios_base))
-        return;
+	return;
     }
-    
+
     if (!map_vram())
     return;
-    
+
 #ifdef V86BIOS_DEBUG
-        printf("starting BIOS\n");
+	printf("starting BIOS\n");
 #endif
     loadCodeToMem((unsigned char *) BIOS_START, code_int);
     setup_io();
@@ -834,12 +834,12 @@
     do_x86(BIOS_START,Regs);
     set_hlt(FALSE);
     print_regs(Regs);
-    
+
 #ifdef V86BIOS_DEBUG
     printf("done\n");
 #endif
 
-    if ((isVideo && (!CurrentPci || CurrentPci->active)) || !isVideo) 
+    if ((isVideo && (!CurrentPci || CurrentPci->active)) || !isVideo)
     update_bios_vars();
 }
 
@@ -867,11 +867,11 @@
     printf("address out of range\n");
     return;
     }
-    
+
     for (i=0; i<20; i++) {
     if (hltp[i].address == 0) {
-        hltp[i].address = (void*)val;
-        break;
+	hltp[i].address = (void*)val;
+	break;
     }
     }
     if (i == 20) printf("no more hltpoints available\n");
@@ -884,7 +884,7 @@
     int i;
     printf("clearing all hltpoints\n");
     for (i=0; i <20; i++)
-        hltp[i].address = NULL;
+	hltp[i].address = NULL;
     } else if (val >= 0 &&  val <20)
     hltp[val].address = NULL;
     else printf("hltpoint %i out of range: valid range 0-19\n",val);
@@ -894,22 +894,22 @@
 list_hlt()
 {
     int i;
-    for (i=0; i<20; i++) 
+    for (i=0; i<20; i++)
     if (hltp[i].address)
-        printf("hltpoint[%i]: 0x%lx\n",i,(unsigned long)hltp[i].address);
+	printf("hltpoint[%i]: 0x%lx\n",i,(unsigned long)hltp[i].address);
 }
 
 static void
 set_hlt(Bool set)
 {
     int i;
-    for (i=0; i<20; i++) 
+    for (i=0; i<20; i++)
     if (hltp[i].address) {
-        if (set) {
-        hltp[i].orgval = *(CARD8*)hltp[i].address;
-        *(CARD8*)hltp[i].address = 0xf4;
-        } else 
-        *(CARD8*)hltp[i].address = hltp[i].orgval;
+	if (set) {
+	hltp[i].orgval = *(CARD8*)hltp[i].address;
+	*(CARD8*)hltp[i].address = 0xf4;
+	} else
+	*(CARD8*)hltp[i].address = hltp[i].orgval;
     }
 }
 
@@ -922,12 +922,12 @@
 
     for (i = 0; i < IOPERM_BITS;i++)
     if (ioperm_list[i]) {
-        start = i;
-        for (;i < IOPERM_BITS; i++) {
-        if (!ioperm_list[i]) {
-            ioperm(start,i - start, 1);
-            break;
-        }
-        }
+	start = i;
+	for (;i < IOPERM_BITS; i++) {
+	if (!ioperm_list[i]) {
+	    ioperm(start,i - start, 1);
+	    break;
+	}
+	}
     }
 }

diff --git a/board/MAI/bios_emulator/scitech/src/v86bios/v86bios.h b/board/MAI/bios_emulator/scitech/src/v86bios/v86bios.h
index 06d0f9f..a8f3f8e 100644
--- a/board/MAI/bios_emulator/scitech/src/v86bios/v86bios.h
+++ b/board/MAI/bios_emulator/scitech/src/v86bios/v86bios.h

@@ -31,11 +31,11 @@
 #include <stdio.h>
 
 #define p_printf(f,a...) do {if (Config.PrintPort) lprintf(f,##a);} \
-                         while(0)
+			 while(0)
 #define i_printf(f,a...) do  {if (Config.PrintIrq) lprintf(f,##a);} \
-                          while(0)
+			  while(0)
 #define P_printf(f,a...) do {if (Config.PrintPci) lprintf(f,##a);} \
-                          while(0)
+			  while(0)
 
 typedef unsigned char CARD8;
 typedef unsigned short CARD16;
@@ -65,7 +65,7 @@
     Bool MapSysBios;
     Bool Resort;
     Bool FixRom;
-    Bool NoConsole;         
+    Bool NoConsole;
     Bool BootOnly;
     int  Verbose;
 };
@@ -80,21 +80,21 @@
 };
 
 struct regs86 {
-        long ebx;
-        long ecx;
-        long edx;
-        long esi;
-        long edi;
-        long ebp;
-        long eax;
-        long eip;
-        long esp;
-        unsigned short cs;
-        unsigned short ss;
-        unsigned short es;
-        unsigned short ds;
-        unsigned short fs;
-        unsigned short gs;
+	long ebx;
+	long ecx;
+	long edx;
+	long esi;
+	long edi;
+	long ebp;
+	long eax;
+	long eip;
+	long esp;
+	unsigned short cs;
+	unsigned short ss;
+	unsigned short es;
+	unsigned short ds;
+	unsigned short fs;
+	unsigned short gs;
     long eflags;
 };
 
@@ -127,9 +127,9 @@
     union {
       int none;
       struct pci {
-        int bus;
-        int dev;
-        int func;
+	int bus;
+	int dev;
+	int func;
       } pci;
     } loc;
 };
@@ -212,4 +212,3 @@
 #endif
 
 #endif
-

diff --git a/board/MAI/bios_emulator/scitech/src/v86bios/x86emu.c b/board/MAI/bios_emulator/scitech/src/v86bios/x86emu.c
index 2cc72df..b5c99d7 100644
--- a/board/MAI/bios_emulator/scitech/src/v86bios/x86emu.c
+++ b/board/MAI/bios_emulator/scitech/src/v86bios/x86emu.c

@@ -28,7 +28,7 @@
 #include </usr/include/unistd.h>
 #include <errno.h>
 #include <asm/unistd.h>
-//#include <syscall-list.h>
+/*#include <syscall-list.h> */
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
@@ -50,10 +50,10 @@
 struct pio P;
 
 void
-setup_io(void) 
+setup_io(void)
 {
     if (!Config.PrintPort && !Config.IoStatistics) {
-    
+
 #if defined (__i386__)
     P.inb = (u8(*)(u16))inb;
     P.inw = (u16(*)(u16))inw;
@@ -86,19 +86,19 @@
 x86emu_do_int(int num)
 {
     struct regs86 regs;
-        
+
     i_printf("int 0x%x received: ax:0x%x",num,CPU_REG(AX));
     if (Config.PrintIp)
-        i_printf(" at: 0x%x\n",getIP());
+	i_printf(" at: 0x%x\n",getIP());
     else
-        i_printf("\n");
-    
+	i_printf("\n");
+
     /* try to run bios interrupt */
-    
+
     /* if not installed fall back */
 #define COPY(x,y) regs.y = M.x86.x
 #define COPY_R(x,y) M.x86.x = regs.y
-    
+
     COPY(R_EAX,eax);
     COPY(R_EBX,ebx);
     COPY(R_ECX,ecx);
@@ -117,12 +117,12 @@
     COPY(R_EFLG,eflags);
 
     if (!(int_handler(num,&regs))) {
-        if (!run_bios_int(num,&regs))
-            goto unknown_int;
-        else
-            return;
+	if (!run_bios_int(num,&regs))
+	    goto unknown_int;
+	else
+	    return;
     }
-    
+
     COPY_R(R_EAX,eax);
     COPY_R(R_EBX,ebx);
     COPY_R(R_ECX,ecx);
@@ -145,7 +145,7 @@
     fprintf(stderr,"\nUnknown vm86_int: %X\n\n",num);
     X86EMU_halt_sys();
     return;
-    
+
 #undef COPY
 #undef COPY_R
 }
@@ -159,12 +159,12 @@
     X86EMU_intrFuncs intFuncs[256];
 
     X86EMU_pioFuncs pioFuncs = {
-        (u8(*)(u16))P.inb,
-        (u16(*)(u16))P.inw,
-        (u32(*)(u16))P.inl,
-        (void(*)(u16,u8))P.outb,
-        (void(*)(u16,u16))P.outw,
-        (void(*)(u16,u32))P.outl
+	(u8(*)(u16))P.inb,
+	(u16(*)(u16))P.inw,
+	(u32(*)(u16))P.inl,
+	(void(*)(u16,u8))P.outb,
+	(void(*)(u16,u16))P.outw,
+	(void(*)(u16,u32))P.outl
     };
 #ifdef __alpha__
     X86EMU_memFuncs memFuncs = {
@@ -178,29 +178,29 @@
 #endif
     M.mem_base = 0;
     M.mem_size = 1024*1024 + 1024;
-    //  M.x86.debug = DEBUG_DISASSEMBLE_F | DEBUG_TRACE_F | DEBUG_DECODE_F;
-    //  M.x86.debug |= DEBUG_DECODE_F |  DEBUG_TRACE_F;
+    /*  M.x86.debug = DEBUG_DISASSEMBLE_F | DEBUG_TRACE_F | DEBUG_DECODE_F; */
+    /*  M.x86.debug |= DEBUG_DECODE_F |  DEBUG_TRACE_F; */
 /*
  * For single step tracing compile x86emu with option -DDEBUG
  */
     M.x86.debug = 0;
     if (Config.PrintIp)
-        M.x86.debug = DEBUG_SAVE_CS_IP;
+	M.x86.debug = DEBUG_SAVE_CS_IP;
 
     if (Config.Trace)
-        X86EMU_trace_on();
+	X86EMU_trace_on();
 
     X86EMU_setupPioFuncs(&pioFuncs);
 #ifdef __alpha__
     X86EMU_setupMemFuncs(&memFuncs);
 #endif
     for (i=0;i<256;i++)
-        intFuncs[i] = x86emu_do_int;
+	intFuncs[i] = x86emu_do_int;
     X86EMU_setupIntrFuncs(intFuncs);
 
     eip = bios_start & 0xFFFF;
     cs = (bios_start & 0xFF0000) >> 4;
-    
+
     CPU_REG(EAX) = regs->ax;
     CPU_REG(EBX) = regs->bx;
     CPU_REG(ECX) = regs->cx;
@@ -209,7 +209,7 @@
     CPU_REG(EDI) = regs->di;
     CPU_REG(EBP) = 0;
     CPU_REG(EIP) = eip;
-    CPU_REG(CS) = cs;               
+    CPU_REG(CS) = cs;
     CPU_REG(SP) = 0x100;
     CPU_REG(SS) = 0x30;               /* This is the standard pc bios stack */
     CPU_REG(ES) = regs->es;
@@ -252,14 +252,14 @@
 
     setup_x86emu(bios_start,regs);
     if (setjmp(x86_esc) == 0) {
-        org_handler = signal(2,vmexit);
-        do_x86emu();
-        signal(2,org_handler);
-        collect_bios_regs(regs);
+	org_handler = signal(2,vmexit);
+	do_x86emu();
+	signal(2,org_handler);
+	collect_bios_regs(regs);
     } else {
-        signal(2,org_handler);
-        printf("interrupted at 0x%x\n",((CARD16)CPU_REG(CS)) << 4
-               | (CARD16)CPU_REG(EIP));
+	signal(2,org_handler);
+	printf("interrupted at 0x%x\n",((CARD16)CPU_REG(CS)) << 4
+	       | (CARD16)CPU_REG(EIP));
     }
 }
 
@@ -272,23 +272,23 @@
     /* check if bios vector is initialized */
     if (((CARD16*)0)[(num<<1)+1] == 0x0000) { /* SYS_BIOS_SEG ?*/
 #ifdef V86BIOS_DEBUG
-        i_printf("card BIOS not loaded\n");
+	i_printf("card BIOS not loaded\n");
 #endif
-        return 0;
+	return 0;
     }
-    
+
 #ifdef V86BIOS_DEBUG
     if (firsttime) {
-        dprint(0,0x3D0);
-        firsttime = 0;
+	dprint(0,0x3D0);
+	firsttime = 0;
     }
 #endif
-    
+
     i_printf("calling card BIOS at: ");
     i_printf("0x%x:%x\n",((CARD16 *) 0)[(num << 1) + 1],
-             (CARD32)((CARD16 *) 0)[num << 1]);
+	     (CARD32)((CARD16 *) 0)[num << 1]);
     X86EMU_prepareForInt(num);
-    
+
     return 1;
 }
 

diff --git a/board/MAI/bios_emulator/scitech/src/x86emu/debug.c b/board/MAI/bios_emulator/scitech/src/x86emu/debug.c
index 050008c..235e6ac 100644
--- a/board/MAI/bios_emulator/scitech/src/x86emu/debug.c
+++ b/board/MAI/bios_emulator/scitech/src/x86emu/debug.c

@@ -48,7 +48,7 @@
 static void     print_encoded_bytes (u16 s, u16 o);
 static void     print_decoded_instruction (void);
 static int      parse_line (char *s, int *ps, int *n);
-  
+
 /* should look something like debug's output. */
 void X86EMU_trace_regs (void)
 {
@@ -94,11 +94,11 @@
      * SINGLE_STEP(r,m); which disappear if DEBUG is not defined to
      * the preprocessor.  The TRACE_REGS macro expands to:
      *
-     * if (debug&DEBUG_DISASSEMBLE) 
+     * if (debug&DEBUG_DISASSEMBLE)
      *     {just_disassemble(); goto EndOfInstruction;}
      *     if (debug&DEBUG_TRACE) trace_regs(r,m);
      *
-     * ......  and at the last line of the routine. 
+     * ......  and at the last line of the routine.
      *
      * EndOfInstruction: end_instr();
      *
@@ -112,14 +112,14 @@
 	tregs = M;
     tregs.x86.R_IP = off;
     tregs.x86.R_CS = seg;
-    
+
     /* reset the decoding buffers */
     tregs.x86.enc_str_pos = 0;
     tregs.x86.enc_pos = 0;
-    
+
     /* turn on the "disassemble only, no execute" flag */
     tregs.x86.debug |= DEBUG_DISASSEMBLE_F;
- 
+
     /* DUMP NEXT n instructions to screen in straight_line fashion */
     /*
      * This looks like the regular instruction fetch stream, except
@@ -210,7 +210,7 @@
     u32 end  = (off+16) & 0xfffffff0;
     u32 i;
     u32 current;
-    
+
     current = start;
     while (end <= off + amt) {
 	printk("%04x:%04x ", seg, start);
@@ -235,7 +235,7 @@
     int offset;
     static int breakpoint;
     static int noDecode = 1;
-    
+
     char *p;
 
     if (DEBUG_BREAK()) {
@@ -249,19 +249,19 @@
 	    X86EMU_trace_regs();
 	}
     }
-    
+
     done=0;
     offset = M.x86.saved_ip;
     while (!done) {
-        printk("-");
-        //p = fgets(s, 1023, stdin);
+	printk("-");
+	/*p = fgets(s, 1023, stdin); */
 	cons_gets(s);
-        cmd = parse_line(s, ps, &ntok);
-        switch(cmd) {
+	cmd = parse_line(s, ps, &ntok);
+	switch(cmd) {
 	case 'u':
 	    disassemble_forward(M.x86.saved_cs,(u16)offset,10);
-            break;
-	case 'd':  
+	    break;
+	case 'd':
 	    if (ntok == 2) {
 		segment = M.x86.saved_cs;
 		offset = ps[1];
@@ -277,22 +277,22 @@
 		X86EMU_dump_memory(segment,(u16)offset,16);
 		offset += 16;
 	    }
-            break;
+	    break;
 	case 'c':
 	    M.x86.debug ^= DEBUG_TRACECALL_F;
-            break;
+	    break;
 	case 's':
 	    M.x86.debug ^= DEBUG_SVC_F | DEBUG_SYS_F | DEBUG_SYSINT_F;
-            break;
+	    break;
 	case 'r':
 	    X86EMU_trace_regs();
-            break;
+	    break;
 	case 'x':
 	    X86EMU_trace_xregs();
-            break;
+	    break;
 	case 'g':
-            if (ntok == 2) {
-                breakpoint = ps[1];
+	    if (ntok == 2) {
+		breakpoint = ps[1];
 		printk("breakpoint set to 0x%X\n", breakpoint);
 		if (noDecode) {
 		    M.x86.debug |= DEBUG_DECODE_NOPRINT_F;
@@ -302,8 +302,8 @@
 		M.x86.debug &= ~DEBUG_TRACE_F;
 		M.x86.debug |= DEBUG_BREAK_F;
 		done = 1;
-            }
-            break;
+	    }
+	    break;
 	case 'q':
 	    M.x86.debug |= DEBUG_EXIT;
 	    return;
@@ -313,9 +313,9 @@
 	    break;
 	case 't':
 	case 0:
-            done = 1;
-            break;
-        }   
+	    done = 1;
+	    break;
+	}
     }
 }
 
@@ -338,23 +338,23 @@
     ps[*n] = *s;
     switch (*s) {
       case '\n':
-        *n += 1;
-        return 0;
+	*n += 1;
+	return 0;
       default:
-        cmd = *s;
-        *n += 1;
+	cmd = *s;
+	*n += 1;
     }
 
 	while (1) {
 		while (*s != ' ' && *s != '\t' && *s != '\n')  s++;
-		
+
 		if (*s == '\n')
 			return cmd;
-		
+
 		while(*s == ' ' || *s == '\t') s++;
-		
+
 		ps[*n]=atoi(s);
-		//sscanf(s,"%x",&ps[*n]);
+		/*sscanf(s,"%x",&ps[*n]); */
 		*n += 1;
 	}
 }
@@ -405,7 +405,7 @@
 	if (ACCESS_FLAG(F_CF))    printk("CY ");
 	else                        printk("NC ");
 	printk("\n");
-	//x86emu_dump_stack();
+	/*x86emu_dump_stack(); */
 }
 
 void x86emu_dump_xregs (void)

diff --git a/board/MAI/bios_emulator/scitech/src/x86emu/decode.c b/board/MAI/bios_emulator/scitech/src/x86emu/decode.c
index bb204e6..832b1f5 100644
--- a/board/MAI/bios_emulator/scitech/src/x86emu/decode.c
+++ b/board/MAI/bios_emulator/scitech/src/x86emu/decode.c

@@ -93,7 +93,7 @@
 
     M.x86.intr = 0;
     DB(x86emu_end_instr();)
-	
+
     for (;;) {
 	DB(if (CHECK_IP_FETCH()) x86emu_check_ip_access();)
 	/* If debugging, save the IP and CS values. */
@@ -745,11 +745,11 @@
 		return M.x86.R_ECX;
 	    case 2:
 		DECODE_PRINTF("[EDX]");
-//		M.x86.mode |= SYSMODE_SEG_DS_SS;
+/*		M.x86.mode |= SYSMODE_SEG_DS_SS; */
 		return M.x86.R_EDX;
 	    case 3:
 		DECODE_PRINTF("[EBX]");
-//		M.x86.mode |= SYSMODE_SEG_DS_SS;
+/*		M.x86.mode |= SYSMODE_SEG_DS_SS; */
 		return M.x86.R_EBX;
 	    case 4:
 		printk("Unsupported SIB encoding\n");
@@ -933,7 +933,7 @@
     }
     else
     {
-	int displacement = (s16)fetch_word_imm(); 
+	int displacement = (s16)fetch_word_imm();
 	switch (rm) {
 	case 0:
 	    DECODE_PRINTF2("%d[BX+SI]", displacement);

diff --git a/board/MAI/bios_emulator/scitech/src/x86emu/fpu.c b/board/MAI/bios_emulator/scitech/src/x86emu/fpu.c
index 08aea42..7f7c345 100644
--- a/board/MAI/bios_emulator/scitech/src/x86emu/fpu.c
+++ b/board/MAI/bios_emulator/scitech/src/x86emu/fpu.c

@@ -102,24 +102,24 @@
     FETCH_DECODE_MODRM(mod, rh, rl);
 #ifdef DEBUG
     if (mod != 3) {
-        DECODE_PRINTINSTR32(x86emu_fpu_op_d9_tab, mod, rh, rl);
+	DECODE_PRINTINSTR32(x86emu_fpu_op_d9_tab, mod, rh, rl);
     } else {
-        DECODE_PRINTF(x86emu_fpu_op_d9_tab1[(rh << 3) + rl]);
+	DECODE_PRINTF(x86emu_fpu_op_d9_tab1[(rh << 3) + rl]);
     }
 #endif
     switch (mod) {
       case 0:
-        destoffset = decode_rm00_address(rl);
-        DECODE_PRINTF("\n");
-        break;
+	destoffset = decode_rm00_address(rl);
+	DECODE_PRINTF("\n");
+	break;
       case 1:
-        destoffset = decode_rm01_address(rl);
-        DECODE_PRINTF("\n");
-        break;
+	destoffset = decode_rm01_address(rl);
+	DECODE_PRINTF("\n");
+	break;
       case 2:
-        destoffset = decode_rm10_address(rl);
-        DECODE_PRINTF("\n");
-        break;
+	destoffset = decode_rm10_address(rl);
+	DECODE_PRINTF("\n");
+	break;
       case 3:                   /* register to register */
 		stkelem = (u8)rl;
 		if (rh < 4) {
@@ -127,167 +127,167 @@
 		} else {
 				DECODE_PRINTF("\n");
 		}
-        break;
+	break;
     }
 #ifdef X86EMU_FPU_PRESENT
     /* execute */
     switch (mod) {
       case 3:
-        switch (rh) {
-          case 0:
-            x86emu_fpu_R_fld(X86EMU_FPU_STKTOP, stkelem);
-            break;
-          case 1:
-            x86emu_fpu_R_fxch(X86EMU_FPU_STKTOP, stkelem);
-            break;
-          case 2:
-            switch (rl) {
-              case 0:
-                x86emu_fpu_R_nop();
-                break;
-              default:
-                x86emu_fpu_illegal();
-                break;
-            }
-          case 3:
-            x86emu_fpu_R_fstp(X86EMU_FPU_STKTOP, stkelem);
-            break;
-          case 4:
-            switch (rl) {
-            case 0:
-                x86emu_fpu_R_fchs(X86EMU_FPU_STKTOP);
-                break;
-            case 1:
-                x86emu_fpu_R_fabs(X86EMU_FPU_STKTOP);
-                break;
-            case 4:
-                x86emu_fpu_R_ftst(X86EMU_FPU_STKTOP);
-                break;
-            case 5:
-                x86emu_fpu_R_fxam(X86EMU_FPU_STKTOP);
-                break;
-            default:
-                /* 2,3,6,7 */
-                x86emu_fpu_illegal();
-                break;
-            }
-            break;
+	switch (rh) {
+	  case 0:
+	    x86emu_fpu_R_fld(X86EMU_FPU_STKTOP, stkelem);
+	    break;
+	  case 1:
+	    x86emu_fpu_R_fxch(X86EMU_FPU_STKTOP, stkelem);
+	    break;
+	  case 2:
+	    switch (rl) {
+	      case 0:
+		x86emu_fpu_R_nop();
+		break;
+	      default:
+		x86emu_fpu_illegal();
+		break;
+	    }
+	  case 3:
+	    x86emu_fpu_R_fstp(X86EMU_FPU_STKTOP, stkelem);
+	    break;
+	  case 4:
+	    switch (rl) {
+	    case 0:
+		x86emu_fpu_R_fchs(X86EMU_FPU_STKTOP);
+		break;
+	    case 1:
+		x86emu_fpu_R_fabs(X86EMU_FPU_STKTOP);
+		break;
+	    case 4:
+		x86emu_fpu_R_ftst(X86EMU_FPU_STKTOP);
+		break;
+	    case 5:
+		x86emu_fpu_R_fxam(X86EMU_FPU_STKTOP);
+		break;
+	    default:
+		/* 2,3,6,7 */
+		x86emu_fpu_illegal();
+		break;
+	    }
+	    break;
 
-          case 5:
-            switch (rl) {
-              case 0:
-                x86emu_fpu_R_fld1(X86EMU_FPU_STKTOP);
-                break;
-              case 1:
-                x86emu_fpu_R_fldl2t(X86EMU_FPU_STKTOP);
-                break;
-              case 2:
-                x86emu_fpu_R_fldl2e(X86EMU_FPU_STKTOP);
-                break;
-              case 3:
-                x86emu_fpu_R_fldpi(X86EMU_FPU_STKTOP);
-                break;
-              case 4:
-                x86emu_fpu_R_fldlg2(X86EMU_FPU_STKTOP);
-                break;
-              case 5:
-                x86emu_fpu_R_fldln2(X86EMU_FPU_STKTOP);
-                break;
-              case 6:
-                x86emu_fpu_R_fldz(X86EMU_FPU_STKTOP);
-                break;
-              default:
-                /* 7 */
-                x86emu_fpu_illegal();
-                break;
-            }
-            break;
+	  case 5:
+	    switch (rl) {
+	      case 0:
+		x86emu_fpu_R_fld1(X86EMU_FPU_STKTOP);
+		break;
+	      case 1:
+		x86emu_fpu_R_fldl2t(X86EMU_FPU_STKTOP);
+		break;
+	      case 2:
+		x86emu_fpu_R_fldl2e(X86EMU_FPU_STKTOP);
+		break;
+	      case 3:
+		x86emu_fpu_R_fldpi(X86EMU_FPU_STKTOP);
+		break;
+	      case 4:
+		x86emu_fpu_R_fldlg2(X86EMU_FPU_STKTOP);
+		break;
+	      case 5:
+		x86emu_fpu_R_fldln2(X86EMU_FPU_STKTOP);
+		break;
+	      case 6:
+		x86emu_fpu_R_fldz(X86EMU_FPU_STKTOP);
+		break;
+	      default:
+		/* 7 */
+		x86emu_fpu_illegal();
+		break;
+	    }
+	    break;
 
-          case 6:
-            switch (rl) {
-              case 0:
-                x86emu_fpu_R_f2xm1(X86EMU_FPU_STKTOP);
-                break;
-              case 1:
-                x86emu_fpu_R_fyl2x(X86EMU_FPU_STKTOP);
-                break;
-              case 2:
-                x86emu_fpu_R_fptan(X86EMU_FPU_STKTOP);
-                break;
-              case 3:
-                x86emu_fpu_R_fpatan(X86EMU_FPU_STKTOP);
-                break;
-              case 4:
-                x86emu_fpu_R_fxtract(X86EMU_FPU_STKTOP);
-                break;
-              case 5:
-                x86emu_fpu_illegal();
-                break;
-              case 6:
-                x86emu_fpu_R_decstp();
-                break;
-              case 7:
-                x86emu_fpu_R_incstp();
-                break;
-            }
-            break;
+	  case 6:
+	    switch (rl) {
+	      case 0:
+		x86emu_fpu_R_f2xm1(X86EMU_FPU_STKTOP);
+		break;
+	      case 1:
+		x86emu_fpu_R_fyl2x(X86EMU_FPU_STKTOP);
+		break;
+	      case 2:
+		x86emu_fpu_R_fptan(X86EMU_FPU_STKTOP);
+		break;
+	      case 3:
+		x86emu_fpu_R_fpatan(X86EMU_FPU_STKTOP);
+		break;
+	      case 4:
+		x86emu_fpu_R_fxtract(X86EMU_FPU_STKTOP);
+		break;
+	      case 5:
+		x86emu_fpu_illegal();
+		break;
+	      case 6:
+		x86emu_fpu_R_decstp();
+		break;
+	      case 7:
+		x86emu_fpu_R_incstp();
+		break;
+	    }
+	    break;
 
-          case 7:
-            switch (rl) {
-              case 0:
-                x86emu_fpu_R_fprem(X86EMU_FPU_STKTOP);
-                break;
-              case 1:
-                x86emu_fpu_R_fyl2xp1(X86EMU_FPU_STKTOP);
-                break;
-              case 2:
-                x86emu_fpu_R_fsqrt(X86EMU_FPU_STKTOP);
-                break;
-              case 3:
-                x86emu_fpu_illegal();
-                break;
-              case 4:
-                x86emu_fpu_R_frndint(X86EMU_FPU_STKTOP);
-                break;
-              case 5:
-                x86emu_fpu_R_fscale(X86EMU_FPU_STKTOP);
-                break;
-              case 6:
-              case 7:
-              default:
-                x86emu_fpu_illegal();
-                break;
-            }
-            break;
+	  case 7:
+	    switch (rl) {
+	      case 0:
+		x86emu_fpu_R_fprem(X86EMU_FPU_STKTOP);
+		break;
+	      case 1:
+		x86emu_fpu_R_fyl2xp1(X86EMU_FPU_STKTOP);
+		break;
+	      case 2:
+		x86emu_fpu_R_fsqrt(X86EMU_FPU_STKTOP);
+		break;
+	      case 3:
+		x86emu_fpu_illegal();
+		break;
+	      case 4:
+		x86emu_fpu_R_frndint(X86EMU_FPU_STKTOP);
+		break;
+	      case 5:
+		x86emu_fpu_R_fscale(X86EMU_FPU_STKTOP);
+		break;
+	      case 6:
+	      case 7:
+	      default:
+		x86emu_fpu_illegal();
+		break;
+	    }
+	    break;
 
-          default:
-            switch (rh) {
-              case 0:
-                x86emu_fpu_M_fld(X86EMU_FPU_FLOAT, destoffset);
-                break;
-              case 1:
-                x86emu_fpu_illegal();
-                break;
-              case 2:
-                x86emu_fpu_M_fst(X86EMU_FPU_FLOAT, destoffset);
-                break;
-              case 3:
-                x86emu_fpu_M_fstp(X86EMU_FPU_FLOAT, destoffset);
-                break;
-              case 4:
-                x86emu_fpu_M_fldenv(X86EMU_FPU_WORD, destoffset);
-                break;
-              case 5:
-                x86emu_fpu_M_fldcw(X86EMU_FPU_WORD, destoffset);
-                break;
-              case 6:
-                x86emu_fpu_M_fstenv(X86EMU_FPU_WORD, destoffset);
-                break;
-              case 7:
-                x86emu_fpu_M_fstcw(X86EMU_FPU_WORD, destoffset);
-                break;
-            }
-        }
+	  default:
+	    switch (rh) {
+	      case 0:
+		x86emu_fpu_M_fld(X86EMU_FPU_FLOAT, destoffset);
+		break;
+	      case 1:
+		x86emu_fpu_illegal();
+		break;
+	      case 2:
+		x86emu_fpu_M_fst(X86EMU_FPU_FLOAT, destoffset);
+		break;
+	      case 3:
+		x86emu_fpu_M_fstp(X86EMU_FPU_FLOAT, destoffset);
+		break;
+	      case 4:
+		x86emu_fpu_M_fldenv(X86EMU_FPU_WORD, destoffset);
+		break;
+	      case 5:
+		x86emu_fpu_M_fldcw(X86EMU_FPU_WORD, destoffset);
+		break;
+	      case 6:
+		x86emu_fpu_M_fstenv(X86EMU_FPU_WORD, destoffset);
+		break;
+	      case 7:
+		x86emu_fpu_M_fstcw(X86EMU_FPU_WORD, destoffset);
+		break;
+	    }
+	}
     }
 #endif /* X86EMU_FPU_PRESENT */
     DECODE_CLEAR_SEGOVR();
@@ -306,7 +306,7 @@
     "FICOMP\tDWORD PTR ",
     "FISUB\tDWORD PTR ", "FISUBR\tDWORD PTR ", "FIDIV\tDWORD PTR ",
     "FIDIVR\tDWORD PTR ",
-    
+
     "FIADD\tDWORD PTR ", "FIMUL\tDWORD PTR ", "FICOM\tDWORD PTR ",
     "FICOMP\tDWORD PTR ",
     "FISUB\tDWORD PTR ", "FISUBR\tDWORD PTR ", "FIDIV\tDWORD PTR ",
@@ -330,54 +330,54 @@
     DECODE_PRINTINSTR32(x86emu_fpu_op_da_tab, mod, rh, rl);
     switch (mod) {
       case 0:
-        destoffset = decode_rm00_address(rl);
-        DECODE_PRINTF("\n");
-        break;
+	destoffset = decode_rm00_address(rl);
+	DECODE_PRINTF("\n");
+	break;
       case 1:
-        destoffset = decode_rm01_address(rl);
-        DECODE_PRINTF("\n");
-        break;
+	destoffset = decode_rm01_address(rl);
+	DECODE_PRINTF("\n");
+	break;
       case 2:
-        destoffset = decode_rm10_address(rl);
-        DECODE_PRINTF("\n");
-        break;
+	destoffset = decode_rm10_address(rl);
+	DECODE_PRINTF("\n");
+	break;
       case 3:           /* register to register */
 		stkelem = (u8)rl;
-        DECODE_PRINTF2("\tST(%d),ST\n", stkelem);
-        break;
+	DECODE_PRINTF2("\tST(%d),ST\n", stkelem);
+	break;
     }
 #ifdef X86EMU_FPU_PRESENT
     switch (mod) {
       case 3:
-        x86emu_fpu_illegal();
-        break;
+	x86emu_fpu_illegal();
+	break;
       default:
-        switch (rh) {
-          case 0:
-            x86emu_fpu_M_iadd(X86EMU_FPU_SHORT, destoffset);
-            break;
-          case 1:
-            x86emu_fpu_M_imul(X86EMU_FPU_SHORT, destoffset);
-            break;
-          case 2:
-            x86emu_fpu_M_icom(X86EMU_FPU_SHORT, destoffset);
-            break;
-          case 3:
-            x86emu_fpu_M_icomp(X86EMU_FPU_SHORT, destoffset);
-            break;
-          case 4:
-            x86emu_fpu_M_isub(X86EMU_FPU_SHORT, destoffset);
-            break;
-          case 5:
-            x86emu_fpu_M_isubr(X86EMU_FPU_SHORT, destoffset);
-            break;
-          case 6:
-            x86emu_fpu_M_idiv(X86EMU_FPU_SHORT, destoffset);
-            break;
-          case 7:
-            x86emu_fpu_M_idivr(X86EMU_FPU_SHORT, destoffset);
-            break;
-        }
+	switch (rh) {
+	  case 0:
+	    x86emu_fpu_M_iadd(X86EMU_FPU_SHORT, destoffset);
+	    break;
+	  case 1:
+	    x86emu_fpu_M_imul(X86EMU_FPU_SHORT, destoffset);
+	    break;
+	  case 2:
+	    x86emu_fpu_M_icom(X86EMU_FPU_SHORT, destoffset);
+	    break;
+	  case 3:
+	    x86emu_fpu_M_icomp(X86EMU_FPU_SHORT, destoffset);
+	    break;
+	  case 4:
+	    x86emu_fpu_M_isub(X86EMU_FPU_SHORT, destoffset);
+	    break;
+	  case 5:
+	    x86emu_fpu_M_isubr(X86EMU_FPU_SHORT, destoffset);
+	    break;
+	  case 6:
+	    x86emu_fpu_M_idiv(X86EMU_FPU_SHORT, destoffset);
+	    break;
+	  case 7:
+	    x86emu_fpu_M_idivr(X86EMU_FPU_SHORT, destoffset);
+	    break;
+	}
     }
 #endif
     DECODE_CLEAR_SEGOVR();
@@ -409,95 +409,95 @@
     FETCH_DECODE_MODRM(mod, rh, rl);
 #ifdef DEBUG
     if (mod != 3) {
-        DECODE_PRINTINSTR32(x86emu_fpu_op_db_tab, mod, rh, rl);
+	DECODE_PRINTINSTR32(x86emu_fpu_op_db_tab, mod, rh, rl);
     } else if (rh == 4) {       /* === 11 10 0 nnn */
-        switch (rl) {
-          case 0:
-            DECODE_PRINTF("FENI\n");
-            break;
-          case 1:
-            DECODE_PRINTF("FDISI\n");
-            break;
-          case 2:
-            DECODE_PRINTF("FCLEX\n");
-            break;
-          case 3:
-            DECODE_PRINTF("FINIT\n");
-            break;
-        }
+	switch (rl) {
+	  case 0:
+	    DECODE_PRINTF("FENI\n");
+	    break;
+	  case 1:
+	    DECODE_PRINTF("FDISI\n");
+	    break;
+	  case 2:
+	    DECODE_PRINTF("FCLEX\n");
+	    break;
+	  case 3:
+	    DECODE_PRINTF("FINIT\n");
+	    break;
+	}
     } else {
-        DECODE_PRINTF2("ESC_DB %0x\n", (mod << 6) + (rh << 3) + (rl));
+	DECODE_PRINTF2("ESC_DB %0x\n", (mod << 6) + (rh << 3) + (rl));
     }
 #endif /* DEBUG */
     switch (mod) {
       case 0:
-        destoffset = decode_rm00_address(rl);
-        break;
+	destoffset = decode_rm00_address(rl);
+	break;
       case 1:
-        destoffset = decode_rm01_address(rl);
-        break;
+	destoffset = decode_rm01_address(rl);
+	break;
       case 2:
-        destoffset = decode_rm10_address(rl);
-        break;
+	destoffset = decode_rm10_address(rl);
+	break;
       case 3:                   /* register to register */
-        break;
+	break;
     }
 #ifdef X86EMU_FPU_PRESENT
     /* execute */
     switch (mod) {
       case 3:
-        switch (rh) {
-          case 4:
-            switch (rl) {
-              case 0:
-                x86emu_fpu_R_feni();
-                break;
-              case 1:
-                x86emu_fpu_R_fdisi();
-                break;
-              case 2:
-                x86emu_fpu_R_fclex();
-                break;
-              case 3:
-                x86emu_fpu_R_finit();
-                break;
-              default:
-                x86emu_fpu_illegal();
-                break;
-            }
-            break;
-          default:
-            x86emu_fpu_illegal();
-            break;
-        }
-        break;
+	switch (rh) {
+	  case 4:
+	    switch (rl) {
+	      case 0:
+		x86emu_fpu_R_feni();
+		break;
+	      case 1:
+		x86emu_fpu_R_fdisi();
+		break;
+	      case 2:
+		x86emu_fpu_R_fclex();
+		break;
+	      case 3:
+		x86emu_fpu_R_finit();
+		break;
+	      default:
+		x86emu_fpu_illegal();
+		break;
+	    }
+	    break;
+	  default:
+	    x86emu_fpu_illegal();
+	    break;
+	}
+	break;
       default:
-        switch (rh) {
-          case 0:
-            x86emu_fpu_M_fild(X86EMU_FPU_SHORT, destoffset);
-            break;
-          case 1:
-            x86emu_fpu_illegal();
-            break;
-          case 2:
-            x86emu_fpu_M_fist(X86EMU_FPU_SHORT, destoffset);
-            break;
-          case 3:
-            x86emu_fpu_M_fistp(X86EMU_FPU_SHORT, destoffset);
-            break;
-          case 4:
-            x86emu_fpu_illegal();
-            break;
-          case 5:
-            x86emu_fpu_M_fld(X86EMU_FPU_LDBL, destoffset);
-            break;
-                      case 6:
-            x86emu_fpu_illegal();
-            break;
-          case 7:
-            x86emu_fpu_M_fstp(X86EMU_FPU_LDBL, destoffset);
-            break;
-        }
+	switch (rh) {
+	  case 0:
+	    x86emu_fpu_M_fild(X86EMU_FPU_SHORT, destoffset);
+	    break;
+	  case 1:
+	    x86emu_fpu_illegal();
+	    break;
+	  case 2:
+	    x86emu_fpu_M_fist(X86EMU_FPU_SHORT, destoffset);
+	    break;
+	  case 3:
+	    x86emu_fpu_M_fistp(X86EMU_FPU_SHORT, destoffset);
+	    break;
+	  case 4:
+	    x86emu_fpu_illegal();
+	    break;
+	  case 5:
+	    x86emu_fpu_M_fld(X86EMU_FPU_LDBL, destoffset);
+	    break;
+		      case 6:
+	    x86emu_fpu_illegal();
+	    break;
+	  case 7:
+	    x86emu_fpu_M_fstp(X86EMU_FPU_LDBL, destoffset);
+	    break;
+	}
     }
 #endif
     DECODE_CLEAR_SEGOVR();
@@ -538,80 +538,80 @@
     DECODE_PRINTINSTR32(x86emu_fpu_op_dc_tab, mod, rh, rl);
     switch (mod) {
       case 0:
-        destoffset = decode_rm00_address(rl);
-        DECODE_PRINTF("\n");
-        break;
+	destoffset = decode_rm00_address(rl);
+	DECODE_PRINTF("\n");
+	break;
       case 1:
-        destoffset = decode_rm01_address(rl);
-        DECODE_PRINTF("\n");
-        break;
+	destoffset = decode_rm01_address(rl);
+	DECODE_PRINTF("\n");
+	break;
       case 2:
-        destoffset = decode_rm10_address(rl);
-        DECODE_PRINTF("\n");
-        break;
+	destoffset = decode_rm10_address(rl);
+	DECODE_PRINTF("\n");
+	break;
       case 3:                   /* register to register */
 		stkelem = (u8)rl;
-        DECODE_PRINTF2("\tST(%d),ST\n", stkelem);
-        break;
+	DECODE_PRINTF2("\tST(%d),ST\n", stkelem);
+	break;
     }
 #ifdef X86EMU_FPU_PRESENT
     /* execute */
     switch (mod) {
       case 3:
-        switch (rh) {
-          case 0:
-            x86emu_fpu_R_fadd(stkelem, X86EMU_FPU_STKTOP);
-            break;
-          case 1:
-            x86emu_fpu_R_fmul(stkelem, X86EMU_FPU_STKTOP);
-            break;
-          case 2:
-            x86emu_fpu_R_fcom(stkelem, X86EMU_FPU_STKTOP);
-            break;
-          case 3:
-            x86emu_fpu_R_fcomp(stkelem, X86EMU_FPU_STKTOP);
-            break;
-          case 4:
-            x86emu_fpu_R_fsubr(stkelem, X86EMU_FPU_STKTOP);
-            break;
-          case 5:
-            x86emu_fpu_R_fsub(stkelem, X86EMU_FPU_STKTOP);
-            break;
-          case 6:
-            x86emu_fpu_R_fdivr(stkelem, X86EMU_FPU_STKTOP);
-            break;
-          case 7:
-            x86emu_fpu_R_fdiv(stkelem, X86EMU_FPU_STKTOP);
-            break;
-        }
-        break;
+	switch (rh) {
+	  case 0:
+	    x86emu_fpu_R_fadd(stkelem, X86EMU_FPU_STKTOP);
+	    break;
+	  case 1:
+	    x86emu_fpu_R_fmul(stkelem, X86EMU_FPU_STKTOP);
+	    break;
+	  case 2:
+	    x86emu_fpu_R_fcom(stkelem, X86EMU_FPU_STKTOP);
+	    break;
+	  case 3:
+	    x86emu_fpu_R_fcomp(stkelem, X86EMU_FPU_STKTOP);
+	    break;
+	  case 4:
+	    x86emu_fpu_R_fsubr(stkelem, X86EMU_FPU_STKTOP);
+	    break;
+	  case 5:
+	    x86emu_fpu_R_fsub(stkelem, X86EMU_FPU_STKTOP);
+	    break;
+	  case 6:
+	    x86emu_fpu_R_fdivr(stkelem, X86EMU_FPU_STKTOP);
+	    break;
+	  case 7:
+	    x86emu_fpu_R_fdiv(stkelem, X86EMU_FPU_STKTOP);
+	    break;
+	}
+	break;
       default:
-        switch (rh) {
-          case 0:
-            x86emu_fpu_M_fadd(X86EMU_FPU_DOUBLE, destoffset);
-            break;
-          case 1:
-            x86emu_fpu_M_fmul(X86EMU_FPU_DOUBLE, destoffset);
-            break;
-          case 2:
-            x86emu_fpu_M_fcom(X86EMU_FPU_DOUBLE, destoffset);
-            break;
-          case 3:
-            x86emu_fpu_M_fcomp(X86EMU_FPU_DOUBLE, destoffset);
-            break;
-          case 4:
-            x86emu_fpu_M_fsub(X86EMU_FPU_DOUBLE, destoffset);
-            break;
-          case 5:
-            x86emu_fpu_M_fsubr(X86EMU_FPU_DOUBLE, destoffset);
-            break;
-          case 6:
-            x86emu_fpu_M_fdiv(X86EMU_FPU_DOUBLE, destoffset);
-            break;
-          case 7:
-            x86emu_fpu_M_fdivr(X86EMU_FPU_DOUBLE, destoffset);
-            break;
-        }
+	switch (rh) {
+	  case 0:
+	    x86emu_fpu_M_fadd(X86EMU_FPU_DOUBLE, destoffset);
+	    break;
+	  case 1:
+	    x86emu_fpu_M_fmul(X86EMU_FPU_DOUBLE, destoffset);
+	    break;
+	  case 2:
+	    x86emu_fpu_M_fcom(X86EMU_FPU_DOUBLE, destoffset);
+	    break;
+	  case 3:
+	    x86emu_fpu_M_fcomp(X86EMU_FPU_DOUBLE, destoffset);
+	    break;
+	  case 4:
+	    x86emu_fpu_M_fsub(X86EMU_FPU_DOUBLE, destoffset);
+	    break;
+	  case 5:
+	    x86emu_fpu_M_fsubr(X86EMU_FPU_DOUBLE, destoffset);
+	    break;
+	  case 6:
+	    x86emu_fpu_M_fdiv(X86EMU_FPU_DOUBLE, destoffset);
+	    break;
+	  case 7:
+	    x86emu_fpu_M_fdivr(X86EMU_FPU_DOUBLE, destoffset);
+	    break;
+	}
     }
 #endif
     DECODE_CLEAR_SEGOVR();
@@ -648,70 +648,70 @@
     DECODE_PRINTINSTR32(x86emu_fpu_op_dd_tab, mod, rh, rl);
     switch (mod) {
       case 0:
-        destoffset = decode_rm00_address(rl);
-        DECODE_PRINTF("\n");
-        break;
+	destoffset = decode_rm00_address(rl);
+	DECODE_PRINTF("\n");
+	break;
       case 1:
-        destoffset = decode_rm01_address(rl);
-        DECODE_PRINTF("\n");
-        break;
+	destoffset = decode_rm01_address(rl);
+	DECODE_PRINTF("\n");
+	break;
       case 2:
-        destoffset = decode_rm10_address(rl);
-        DECODE_PRINTF("\n");
-        break;
+	destoffset = decode_rm10_address(rl);
+	DECODE_PRINTF("\n");
+	break;
       case 3:                   /* register to register */
 		stkelem = (u8)rl;
-        DECODE_PRINTF2("\tST(%d),ST\n", stkelem);
-        break;
+	DECODE_PRINTF2("\tST(%d),ST\n", stkelem);
+	break;
     }
 #ifdef X86EMU_FPU_PRESENT
     switch (mod) {
       case 3:
-        switch (rh) {
-          case 0:
-            x86emu_fpu_R_ffree(stkelem);
-            break;
-          case 1:
-            x86emu_fpu_R_fxch(stkelem);
-            break;
-          case 2:
-            x86emu_fpu_R_fst(stkelem);  /* register version */
-            break;
-          case 3:
-            x86emu_fpu_R_fstp(stkelem); /* register version */
-            break;
-          default:
-            x86emu_fpu_illegal();
-            break;
-        }
-        break;
+	switch (rh) {
+	  case 0:
+	    x86emu_fpu_R_ffree(stkelem);
+	    break;
+	  case 1:
+	    x86emu_fpu_R_fxch(stkelem);
+	    break;
+	  case 2:
+	    x86emu_fpu_R_fst(stkelem);  /* register version */
+	    break;
+	  case 3:
+	    x86emu_fpu_R_fstp(stkelem); /* register version */
+	    break;
+	  default:
+	    x86emu_fpu_illegal();
+	    break;
+	}
+	break;
       default:
-        switch (rh) {
-          case 0:
-            x86emu_fpu_M_fld(X86EMU_FPU_DOUBLE, destoffset);
-            break;
-          case 1:
-            x86emu_fpu_illegal();
-            break;
-          case 2:
-            x86emu_fpu_M_fst(X86EMU_FPU_DOUBLE, destoffset);
-            break;
-          case 3:
-            x86emu_fpu_M_fstp(X86EMU_FPU_DOUBLE, destoffset);
-            break;
-          case 4:
-            x86emu_fpu_M_frstor(X86EMU_FPU_WORD, destoffset);
-            break;
-          case 5:
-            x86emu_fpu_illegal();
-            break;
-          case 6:
-            x86emu_fpu_M_fsave(X86EMU_FPU_WORD, destoffset);
-            break;
-          case 7:
-            x86emu_fpu_M_fstsw(X86EMU_FPU_WORD, destoffset);
-            break;
-        }
+	switch (rh) {
+	  case 0:
+	    x86emu_fpu_M_fld(X86EMU_FPU_DOUBLE, destoffset);
+	    break;
+	  case 1:
+	    x86emu_fpu_illegal();
+	    break;
+	  case 2:
+	    x86emu_fpu_M_fst(X86EMU_FPU_DOUBLE, destoffset);
+	    break;
+	  case 3:
+	    x86emu_fpu_M_fstp(X86EMU_FPU_DOUBLE, destoffset);
+	    break;
+	  case 4:
+	    x86emu_fpu_M_frstor(X86EMU_FPU_WORD, destoffset);
+	    break;
+	  case 5:
+	    x86emu_fpu_illegal();
+	    break;
+	  case 6:
+	    x86emu_fpu_M_fsave(X86EMU_FPU_WORD, destoffset);
+	    break;
+	  case 7:
+	    x86emu_fpu_M_fstsw(X86EMU_FPU_WORD, destoffset);
+	    break;
+	}
     }
 #endif
     DECODE_CLEAR_SEGOVR();
@@ -755,82 +755,82 @@
     DECODE_PRINTINSTR32(x86emu_fpu_op_de_tab, mod, rh, rl);
     switch (mod) {
       case 0:
-        destoffset = decode_rm00_address(rl);
-        DECODE_PRINTF("\n");
-        break;
+	destoffset = decode_rm00_address(rl);
+	DECODE_PRINTF("\n");
+	break;
       case 1:
-        destoffset = decode_rm01_address(rl);
-        DECODE_PRINTF("\n");
-        break;
+	destoffset = decode_rm01_address(rl);
+	DECODE_PRINTF("\n");
+	break;
       case 2:
-        destoffset = decode_rm10_address(rl);
-        DECODE_PRINTF("\n");
-        break;
+	destoffset = decode_rm10_address(rl);
+	DECODE_PRINTF("\n");
+	break;
       case 3:                   /* register to register */
 		stkelem = (u8)rl;
-        DECODE_PRINTF2("\tST(%d),ST\n", stkelem);
-        break;
+	DECODE_PRINTF2("\tST(%d),ST\n", stkelem);
+	break;
     }
 #ifdef X86EMU_FPU_PRESENT
     switch (mod) {
       case 3:
-        switch (rh) {
-          case 0:
-            x86emu_fpu_R_faddp(stkelem, X86EMU_FPU_STKTOP);
-            break;
-          case 1:
-            x86emu_fpu_R_fmulp(stkelem, X86EMU_FPU_STKTOP);
-            break;
-          case 2:
-            x86emu_fpu_R_fcomp(stkelem, X86EMU_FPU_STKTOP);
-            break;
-          case 3:
-            if (stkelem == 1)
-              x86emu_fpu_R_fcompp(stkelem, X86EMU_FPU_STKTOP);
-            else
-              x86emu_fpu_illegal();
-            break;
-          case 4:
-            x86emu_fpu_R_fsubrp(stkelem, X86EMU_FPU_STKTOP);
-            break;
-          case 5:
-            x86emu_fpu_R_fsubp(stkelem, X86EMU_FPU_STKTOP);
-            break;
-          case 6:
-            x86emu_fpu_R_fdivrp(stkelem, X86EMU_FPU_STKTOP);
-            break;
-          case 7:
-            x86emu_fpu_R_fdivp(stkelem, X86EMU_FPU_STKTOP);
-            break;
-        }
-        break;
+	switch (rh) {
+	  case 0:
+	    x86emu_fpu_R_faddp(stkelem, X86EMU_FPU_STKTOP);
+	    break;
+	  case 1:
+	    x86emu_fpu_R_fmulp(stkelem, X86EMU_FPU_STKTOP);
+	    break;
+	  case 2:
+	    x86emu_fpu_R_fcomp(stkelem, X86EMU_FPU_STKTOP);
+	    break;
+	  case 3:
+	    if (stkelem == 1)
+	      x86emu_fpu_R_fcompp(stkelem, X86EMU_FPU_STKTOP);
+	    else
+	      x86emu_fpu_illegal();
+	    break;
+	  case 4:
+	    x86emu_fpu_R_fsubrp(stkelem, X86EMU_FPU_STKTOP);
+	    break;
+	  case 5:
+	    x86emu_fpu_R_fsubp(stkelem, X86EMU_FPU_STKTOP);
+	    break;
+	  case 6:
+	    x86emu_fpu_R_fdivrp(stkelem, X86EMU_FPU_STKTOP);
+	    break;
+	  case 7:
+	    x86emu_fpu_R_fdivp(stkelem, X86EMU_FPU_STKTOP);
+	    break;
+	}
+	break;
       default:
-        switch (rh) {
-          case 0:
-            x86emu_fpu_M_fiadd(X86EMU_FPU_WORD, destoffset);
-            break;
-          case 1:
-            x86emu_fpu_M_fimul(X86EMU_FPU_WORD, destoffset);
-            break;
-          case 2:
-            x86emu_fpu_M_ficom(X86EMU_FPU_WORD, destoffset);
-            break;
-          case 3:
-            x86emu_fpu_M_ficomp(X86EMU_FPU_WORD, destoffset);
-            break;
-          case 4:
-            x86emu_fpu_M_fisub(X86EMU_FPU_WORD, destoffset);
-            break;
-          case 5:
-            x86emu_fpu_M_fisubr(X86EMU_FPU_WORD, destoffset);
-            break;
-          case 6:
-            x86emu_fpu_M_fidiv(X86EMU_FPU_WORD, destoffset);
-            break;
-          case 7:
-            x86emu_fpu_M_fidivr(X86EMU_FPU_WORD, destoffset);
-            break;
-        }
+	switch (rh) {
+	  case 0:
+	    x86emu_fpu_M_fiadd(X86EMU_FPU_WORD, destoffset);
+	    break;
+	  case 1:
+	    x86emu_fpu_M_fimul(X86EMU_FPU_WORD, destoffset);
+	    break;
+	  case 2:
+	    x86emu_fpu_M_ficom(X86EMU_FPU_WORD, destoffset);
+	    break;
+	  case 3:
+	    x86emu_fpu_M_ficomp(X86EMU_FPU_WORD, destoffset);
+	    break;
+	  case 4:
+	    x86emu_fpu_M_fisub(X86EMU_FPU_WORD, destoffset);
+	    break;
+	  case 5:
+	    x86emu_fpu_M_fisubr(X86EMU_FPU_WORD, destoffset);
+	    break;
+	  case 6:
+	    x86emu_fpu_M_fidiv(X86EMU_FPU_WORD, destoffset);
+	    break;
+	  case 7:
+	    x86emu_fpu_M_fidivr(X86EMU_FPU_WORD, destoffset);
+	    break;
+	}
     }
 #endif
     DECODE_CLEAR_SEGOVR();
@@ -874,70 +874,70 @@
     DECODE_PRINTINSTR32(x86emu_fpu_op_df_tab, mod, rh, rl);
     switch (mod) {
       case 0:
-        destoffset = decode_rm00_address(rl);
-        DECODE_PRINTF("\n");
-        break;
+	destoffset = decode_rm00_address(rl);
+	DECODE_PRINTF("\n");
+	break;
       case 1:
-        destoffset = decode_rm01_address(rl);
-        DECODE_PRINTF("\n");
-        break;
+	destoffset = decode_rm01_address(rl);
+	DECODE_PRINTF("\n");
+	break;
       case 2:
-        destoffset = decode_rm10_address(rl);
-        DECODE_PRINTF("\n");
-        break;
+	destoffset = decode_rm10_address(rl);
+	DECODE_PRINTF("\n");
+	break;
       case 3:                   /* register to register */
 		stkelem = (u8)rl;
-        DECODE_PRINTF2("\tST(%d)\n", stkelem);
-        break;
+	DECODE_PRINTF2("\tST(%d)\n", stkelem);
+	break;
     }
 #ifdef X86EMU_FPU_PRESENT
     switch (mod) {
       case 3:
-        switch (rh) {
-          case 0:
-            x86emu_fpu_R_ffree(stkelem);
-            break;
-          case 1:
-            x86emu_fpu_R_fxch(stkelem);
-            break;
-          case 2:
-            x86emu_fpu_R_fst(stkelem);  /* register version */
-            break;
-          case 3:
-            x86emu_fpu_R_fstp(stkelem); /* register version */
-            break;
-          default:
-            x86emu_fpu_illegal();
-            break;
-        }
-        break;
+	switch (rh) {
+	  case 0:
+	    x86emu_fpu_R_ffree(stkelem);
+	    break;
+	  case 1:
+	    x86emu_fpu_R_fxch(stkelem);
+	    break;
+	  case 2:
+	    x86emu_fpu_R_fst(stkelem);  /* register version */
+	    break;
+	  case 3:
+	    x86emu_fpu_R_fstp(stkelem); /* register version */
+	    break;
+	  default:
+	    x86emu_fpu_illegal();
+	    break;
+	}
+	break;
       default:
-        switch (rh) {
-          case 0:
-            x86emu_fpu_M_fild(X86EMU_FPU_WORD, destoffset);
-            break;
-          case 1:
-            x86emu_fpu_illegal();
-            break;
-          case 2:
-            x86emu_fpu_M_fist(X86EMU_FPU_WORD, destoffset);
-            break;
-          case 3:
-            x86emu_fpu_M_fistp(X86EMU_FPU_WORD, destoffset);
-            break;
-          case 4:
-            x86emu_fpu_M_fbld(X86EMU_FPU_BSD, destoffset);
-            break;
-          case 5:
-            x86emu_fpu_M_fild(X86EMU_FPU_LONG, destoffset);
-            break;
-          case 6:
-            x86emu_fpu_M_fbstp(X86EMU_FPU_BSD, destoffset);
-            break;
-          case 7:
-            x86emu_fpu_M_fistp(X86EMU_FPU_LONG, destoffset);
-            break;
-        }
+	switch (rh) {
+	  case 0:
+	    x86emu_fpu_M_fild(X86EMU_FPU_WORD, destoffset);
+	    break;
+	  case 1:
+	    x86emu_fpu_illegal();
+	    break;
+	  case 2:
+	    x86emu_fpu_M_fist(X86EMU_FPU_WORD, destoffset);
+	    break;
+	  case 3:
+	    x86emu_fpu_M_fistp(X86EMU_FPU_WORD, destoffset);
+	    break;
+	  case 4:
+	    x86emu_fpu_M_fbld(X86EMU_FPU_BSD, destoffset);
+	    break;
+	  case 5:
+	    x86emu_fpu_M_fild(X86EMU_FPU_LONG, destoffset);
+	    break;
+	  case 6:
+	    x86emu_fpu_M_fbstp(X86EMU_FPU_BSD, destoffset);
+	    break;
+	  case 7:
+	    x86emu_fpu_M_fistp(X86EMU_FPU_LONG, destoffset);
+	    break;
+	}
     }
 #endif
     DECODE_CLEAR_SEGOVR();

diff --git a/board/MAI/bios_emulator/scitech/src/x86emu/ops.c b/board/MAI/bios_emulator/scitech/src/x86emu/ops.c
index 0d79776..2d4f93e 100644
--- a/board/MAI/bios_emulator/scitech/src/x86emu/ops.c
+++ b/board/MAI/bios_emulator/scitech/src/x86emu/ops.c

@@ -88,7 +88,7 @@
     DECODE_PRINTF("ILLEGAL X86 OPCODE\n");
     TRACE_REGS();
     printk("%04x:%04x: %02X ILLEGAL X86 OPCODE!\n",
-        M.x86.R_CS, M.x86.R_IP-1,op1);
+	M.x86.R_CS, M.x86.R_IP-1,op1);
     HALT_SYS();
     END_OF_INSTR();
 }
@@ -109,43 +109,43 @@
     FETCH_DECODE_MODRM(mod, rh, rl);
     switch (mod) {
     case 0:
-        destoffset = decode_rm00_address(rl);
-        DECODE_PRINTF(",");
-        destval = fetch_data_byte(destoffset);
-        srcreg = DECODE_RM_BYTE_REGISTER(rh);
-        DECODE_PRINTF("\n");
-        TRACE_AND_STEP();
-        destval = add_byte(destval, *srcreg);
-        store_data_byte(destoffset, destval);
-        break;
+	destoffset = decode_rm00_address(rl);
+	DECODE_PRINTF(",");
+	destval = fetch_data_byte(destoffset);
+	srcreg = DECODE_RM_BYTE_REGISTER(rh);
+	DECODE_PRINTF("\n");
+	TRACE_AND_STEP();
+	destval = add_byte(destval, *srcreg);
+	store_data_byte(destoffset, destval);
+	break;
     case 1:
-        destoffset = decode_rm01_address(rl);
-        DECODE_PRINTF(",");
-        destval = fetch_data_byte(destoffset);
-        srcreg = DECODE_RM_BYTE_REGISTER(rh);
-        DECODE_PRINTF("\n");
-        TRACE_AND_STEP();
-        destval = add_byte(destval, *srcreg);
-        store_data_byte(destoffset, destval);
-        break;
+	destoffset = decode_rm01_address(rl);
+	DECODE_PRINTF(",");
+	destval = fetch_data_byte(destoffset);
+	srcreg = DECODE_RM_BYTE_REGISTER(rh);
+	DECODE_PRINTF("\n");
+	TRACE_AND_STEP();
+	destval = add_byte(destval, *srcreg);
+	store_data_byte(destoffset, destval);
+	break;
     case 2:
-        destoffset = decode_rm10_address(rl);
-        DECODE_PRINTF(",");
-        destval = fetch_data_byte(destoffset);
-        srcreg = DECODE_RM_BYTE_REGISTER(rh);
-        DECODE_PRINTF("\n");
-        TRACE_AND_STEP();
-        destval = add_byte(destval, *srcreg);
-        store_data_byte(destoffset, destval);
-        break;
+	destoffset = decode_rm10_address(rl);
+	DECODE_PRINTF(",");
+	destval = fetch_data_byte(destoffset);
+	srcreg = DECODE_RM_BYTE_REGISTER(rh);
+	DECODE_PRINTF("\n");
+	TRACE_AND_STEP();
+	destval = add_byte(destval, *srcreg);
+	store_data_byte(destoffset, destval);
+	break;
     case 3:                     /* register to register */
-        destreg = DECODE_RM_BYTE_REGISTER(rl);
-        DECODE_PRINTF(",");
-        srcreg = DECODE_RM_BYTE_REGISTER(rh);
-        DECODE_PRINTF("\n");
-        TRACE_AND_STEP();
-        *destreg = add_byte(*destreg, *srcreg);
-        break;
+	destreg = DECODE_RM_BYTE_REGISTER(rl);
+	DECODE_PRINTF(",");
+	srcreg = DECODE_RM_BYTE_REGISTER(rh);
+	DECODE_PRINTF("\n");
+	TRACE_AND_STEP();
+	*destreg = add_byte(*destreg, *srcreg);
+	break;
     }
     DECODE_CLEAR_SEGOVR();
     END_OF_INSTR();
@@ -165,107 +165,107 @@
     FETCH_DECODE_MODRM(mod, rh, rl);
     switch (mod) {
     case 0:
-        if (M.x86.mode & SYSMODE_PREFIX_DATA) {
-            u32 destval;
-            u32 *srcreg;
+	if (M.x86.mode & SYSMODE_PREFIX_DATA) {
+	    u32 destval;
+	    u32 *srcreg;
 
-            destoffset = decode_rm00_address(rl);
-            DECODE_PRINTF(",");
-            destval = fetch_data_long(destoffset);
-            srcreg = DECODE_RM_LONG_REGISTER(rh);
-            DECODE_PRINTF("\n");
-            TRACE_AND_STEP();
-            destval = add_long(destval, *srcreg);
-            store_data_long(destoffset, destval);
-        } else {
-            u16 destval;
-            u16 *srcreg;
+	    destoffset = decode_rm00_address(rl);
+	    DECODE_PRINTF(",");
+	    destval = fetch_data_long(destoffset);
+	    srcreg = DECODE_RM_LONG_REGISTER(rh);
+	    DECODE_PRINTF("\n");
+	    TRACE_AND_STEP();
+	    destval = add_long(destval, *srcreg);
+	    store_data_long(destoffset, destval);
+	} else {
+	    u16 destval;
+	    u16 *srcreg;
 
-            destoffset = decode_rm00_address(rl);
-            DECODE_PRINTF(",");
-            destval = fetch_data_word(destoffset);
-            srcreg = DECODE_RM_WORD_REGISTER(rh);
-            DECODE_PRINTF("\n");
-            TRACE_AND_STEP();
-            destval = add_word(destval, *srcreg);
-            store_data_word(destoffset, destval);
-        }
-        break;
+	    destoffset = decode_rm00_address(rl);
+	    DECODE_PRINTF(",");
+	    destval = fetch_data_word(destoffset);
+	    srcreg = DECODE_RM_WORD_REGISTER(rh);
+	    DECODE_PRINTF("\n");
+	    TRACE_AND_STEP();
+	    destval = add_word(destval, *srcreg);
+	    store_data_word(destoffset, destval);
+	}
+	break;
     case 1:
-        if (M.x86.mode & SYSMODE_PREFIX_DATA) {
-            u32 destval;
-            u32 *srcreg;
+	if (M.x86.mode & SYSMODE_PREFIX_DATA) {
+	    u32 destval;
+	    u32 *srcreg;
 
-            destoffset = decode_rm01_address(rl);
-            DECODE_PRINTF(",");
-            destval = fetch_data_long(destoffset);
-            srcreg = DECODE_RM_LONG_REGISTER(rh);
-            DECODE_PRINTF("\n");
-            TRACE_AND_STEP();
-            destval = add_long(destval, *srcreg);
-            store_data_long(destoffset, destval);
-        } else {
-            u16 destval;
-            u16 *srcreg;
+	    destoffset = decode_rm01_address(rl);
+	    DECODE_PRINTF(",");
+	    destval = fetch_data_long(destoffset);
+	    srcreg = DECODE_RM_LONG_REGISTER(rh);
+	    DECODE_PRINTF("\n");
+	    TRACE_AND_STEP();
+	    destval = add_long(destval, *srcreg);
+	    store_data_long(destoffset, destval);
+	} else {
+	    u16 destval;
+	    u16 *srcreg;
 
-            destoffset = decode_rm01_address(rl);
-            DECODE_PRINTF(",");
-            destval = fetch_data_word(destoffset);
-            srcreg = DECODE_RM_WORD_REGISTER(rh);
-            DECODE_PRINTF("\n");
-            TRACE_AND_STEP();
-            destval = add_word(destval, *srcreg);
-            store_data_word(destoffset, destval);
-        }
-        break;
+	    destoffset = decode_rm01_address(rl);
+	    DECODE_PRINTF(",");
+	    destval = fetch_data_word(destoffset);
+	    srcreg = DECODE_RM_WORD_REGISTER(rh);
+	    DECODE_PRINTF("\n");
+	    TRACE_AND_STEP();
+	    destval = add_word(destval, *srcreg);
+	    store_data_word(destoffset, destval);
+	}
+	break;
     case 2:
-        if (M.x86.mode & SYSMODE_PREFIX_DATA) {
-            u32 destval;
-            u32 *srcreg;
+	if (M.x86.mode & SYSMODE_PREFIX_DATA) {
+	    u32 destval;
+	    u32 *srcreg;
 
-            destoffset = decode_rm10_address(rl);
-            DECODE_PRINTF(",");
-            destval = fetch_data_long(destoffset);
-            srcreg = DECODE_RM_LONG_REGISTER(rh);
-            DECODE_PRINTF("\n");
-            TRACE_AND_STEP();
-            destval = add_long(destval, *srcreg);
-            store_data_long(destoffset, destval);
-        } else {
-            u16 destval;
-            u16 *srcreg;
+	    destoffset = decode_rm10_address(rl);
+	    DECODE_PRINTF(",");
+	    destval = fetch_data_long(destoffset);
+	    srcreg = DECODE_RM_LONG_REGISTER(rh);
+	    DECODE_PRINTF("\n");
+	    TRACE_AND_STEP();
+	    destval = add_long(destval, *srcreg);
+	    store_data_long(destoffset, destval);
+	} else {
+	    u16 destval;
+	    u16 *srcreg;
 
-            destoffset = decode_rm10_address(rl);
-            DECODE_PRINTF(",");
-            destval = fetch_data_word(destoffset);
-            srcreg = DECODE_RM_WORD_REGISTER(rh);
-            DECODE_PRINTF("\n");
-            TRACE_AND_STEP();
-            destval = add_word(destval, *srcreg);
-            store_data_word(destoffset, destval);
-        }
-        break;
+	    destoffset = decode_rm10_address(rl);
+	    DECODE_PRINTF(",");
+	    destval = fetch_data_word(destoffset);
+	    srcreg = DECODE_RM_WORD_REGISTER(rh);
+	    DECODE_PRINTF("\n");
+	    TRACE_AND_STEP();
+	    destval = add_word(destval, *srcreg);
+	    store_data_word(destoffset, destval);
+	}
+	break;
     case 3:                     /* register to register */
-        if (M.x86.mode & SYSMODE_PREFIX_DATA) {
-            u32 *destreg,*srcreg;
+	if (M.x86.mode & SYSMODE_PREFIX_DATA) {
+	    u32 *destreg,*srcreg;
 
-            destreg = DECODE_RM_LONG_REGISTER(rl);
-            DECODE_PRINTF(",");
-            srcreg = DECODE_RM_LONG_REGISTER(rh);
-            DECODE_PRINTF("\n");
-            TRACE_AND_STEP();
-            *destreg = add_long(*destreg, *srcreg);
-        } else {
-            u16 *destreg,*srcreg;
+	    destreg = DECODE_RM_LONG_REGISTER(rl);
+	    DECODE_PRINTF(",");
+	    srcreg = DECODE_RM_LONG_REGISTER(rh);
+	    DECODE_PRINTF("\n");
+	    TRACE_AND_STEP();
+	    *destreg = add_long(*destreg, *srcreg);
+	} else {
+	    u16 *destreg,*srcreg;
 
-            destreg = DECODE_RM_WORD_REGISTER(rl);
-            DECODE_PRINTF(",");
-            srcreg = DECODE_RM_WORD_REGISTER(rh);
-            DECODE_PRINTF("\n");
-            TRACE_AND_STEP();
-            *destreg = add_word(*destreg, *srcreg);
-        }
-        break;
+	    destreg = DECODE_RM_WORD_REGISTER(rl);
+	    DECODE_PRINTF(",");
+	    srcreg = DECODE_RM_WORD_REGISTER(rh);
+	    DECODE_PRINTF("\n");
+	    TRACE_AND_STEP();
+	    *destreg = add_word(*destreg, *srcreg);
+	}
+	break;
     }
     DECODE_CLEAR_SEGOVR();
     END_OF_INSTR();
@@ -287,40 +287,40 @@
     FETCH_DECODE_MODRM(mod, rh, rl);
     switch (mod) {
     case 0:
-        destreg = DECODE_RM_BYTE_REGISTER(rh);
-        DECODE_PRINTF(",");
-        srcoffset = decode_rm00_address(rl);
-        srcval = fetch_data_byte(srcoffset);
-        DECODE_PRINTF("\n");
-        TRACE_AND_STEP();
-        *destreg = add_byte(*destreg, srcval);
-        break;
+	destreg = DECODE_RM_BYTE_REGISTER(rh);
+	DECODE_PRINTF(",");
+	srcoffset = decode_rm00_address(rl);
+	srcval = fetch_data_byte(srcoffset);
+	DECODE_PRINTF("\n");
+	TRACE_AND_STEP();
+	*destreg = add_byte(*destreg, srcval);
+	break;
     case 1:
-        destreg = DECODE_RM_BYTE_REGISTER(rh);
-        DECODE_PRINTF(",");
-        srcoffset = decode_rm01_address(rl);
-        srcval = fetch_data_byte(srcoffset);
-        DECODE_PRINTF("\n");
-        TRACE_AND_STEP();
-        *destreg = add_byte(*destreg, srcval);
-        break;
+	destreg = DECODE_RM_BYTE_REGISTER(rh);
+	DECODE_PRINTF(",");
+	srcoffset = decode_rm01_address(rl);
+	srcval = fetch_data_byte(srcoffset);
+	DECODE_PRINTF("\n");
+	TRACE_AND_STEP();
+	*destreg = add_byte(*destreg, srcval);
+	break;
     case 2:
-        destreg = DECODE_RM_BYTE_REGISTER(rh);
-        DECODE_PRINTF(",");
-        srcoffset = decode_rm10_address(rl);
-        srcval = fetch_data_byte(srcoffset);
-        DECODE_PRINTF("\n");
-        TRACE_AND_STEP();
-        *destreg = add_byte(*destreg, srcval);
-        break;
+	destreg = DECODE_RM_BYTE_REGISTER(rh);
+	DECODE_PRINTF(",");
+	srcoffset = decode_rm10_address(rl);
+	srcval = fetch_data_byte(srcoffset);
+	DECODE_PRINTF("\n");
+	TRACE_AND_STEP();
+	*destreg = add_byte(*destreg, srcval);
+	break;
     case 3:                     /* register to register */
-        destreg = DECODE_RM_BYTE_REGISTER(rh);
-        DECODE_PRINTF(",");
-        srcreg = DECODE_RM_BYTE_REGISTER(rl);
-        DECODE_PRINTF("\n");
-        TRACE_AND_STEP();
-        *destreg = add_byte(*destreg, *srcreg);
-        break;
+	destreg = DECODE_RM_BYTE_REGISTER(rh);
+	DECODE_PRINTF(",");
+	srcreg = DECODE_RM_BYTE_REGISTER(rl);
+	DECODE_PRINTF("\n");
+	TRACE_AND_STEP();
+	*destreg = add_byte(*destreg, *srcreg);
+	break;
     }
     DECODE_CLEAR_SEGOVR();
     END_OF_INSTR();
@@ -340,101 +340,101 @@
     FETCH_DECODE_MODRM(mod, rh, rl);
     switch (mod) {
     case 0:
-        if (M.x86.mode & SYSMODE_PREFIX_DATA) {
-            u32 *destreg;
-            u32 srcval;
+	if (M.x86.mode & SYSMODE_PREFIX_DATA) {
+	    u32 *destreg;
+	    u32 srcval;
 
-            destreg = DECODE_RM_LONG_REGISTER(rh);
-            DECODE_PRINTF(",");
-            srcoffset = decode_rm00_address(rl);
-            srcval = fetch_data_long(srcoffset);
-            DECODE_PRINTF("\n");
-            TRACE_AND_STEP();
-            *destreg = add_long(*destreg, srcval);
-        } else {
-            u16 *destreg;
-            u16 srcval;
+	    destreg = DECODE_RM_LONG_REGISTER(rh);
+	    DECODE_PRINTF(",");
+	    srcoffset = decode_rm00_address(rl);
+	    srcval = fetch_data_long(srcoffset);
+	    DECODE_PRINTF("\n");
+	    TRACE_AND_STEP();
+	    *destreg = add_long(*destreg, srcval);
+	} else {
+	    u16 *destreg;
+	    u16 srcval;
 
-            destreg = DECODE_RM_WORD_REGISTER(rh);
-            DECODE_PRINTF(",");
-            srcoffset = decode_rm00_address(rl);
-            srcval = fetch_data_word(srcoffset);
-            DECODE_PRINTF("\n");
-            TRACE_AND_STEP();
-            *destreg = add_word(*destreg, srcval);
-        }
-        break;
+	    destreg = DECODE_RM_WORD_REGISTER(rh);
+	    DECODE_PRINTF(",");
+	    srcoffset = decode_rm00_address(rl);
+	    srcval = fetch_data_word(srcoffset);
+	    DECODE_PRINTF("\n");
+	    TRACE_AND_STEP();
+	    *destreg = add_word(*destreg, srcval);
+	}
+	break;
     case 1:
-        if (M.x86.mode & SYSMODE_PREFIX_DATA) {
-            u32 *destreg;
-            u32 srcval;
+	if (M.x86.mode & SYSMODE_PREFIX_DATA) {
+	    u32 *destreg;
+	    u32 srcval;
 
-            destreg = DECODE_RM_LONG_REGISTER(rh);
-            DECODE_PRINTF(",");
-            srcoffset = decode_rm01_address(rl);
-            srcval = fetch_data_long(srcoffset);
-            DECODE_PRINTF("\n");
-            TRACE_AND_STEP();
-            *destreg = add_long(*destreg, srcval);
-        } else {
-            u16 *destreg;
-            u16 srcval;
+	    destreg = DECODE_RM_LONG_REGISTER(rh);
+	    DECODE_PRINTF(",");
+	    srcoffset = decode_rm01_address(rl);
+	    srcval = fetch_data_long(srcoffset);
+	    DECODE_PRINTF("\n");
+	    TRACE_AND_STEP();
+	    *destreg = add_long(*destreg, srcval);
+	} else {
+	    u16 *destreg;
+	    u16 srcval;
 
-            destreg = DECODE_RM_WORD_REGISTER(rh);
-            DECODE_PRINTF(",");
-            srcoffset = decode_rm01_address(rl);
-            srcval = fetch_data_word(srcoffset);
-            DECODE_PRINTF("\n");
-            TRACE_AND_STEP();
-            *destreg = add_word(*destreg, srcval);
-        }
-        break;
+	    destreg = DECODE_RM_WORD_REGISTER(rh);
+	    DECODE_PRINTF(",");
+	    srcoffset = decode_rm01_address(rl);
+	    srcval = fetch_data_word(srcoffset);
+	    DECODE_PRINTF("\n");
+	    TRACE_AND_STEP();
+	    *destreg = add_word(*destreg, srcval);
+	}
+	break;
     case 2:
-        if (M.x86.mode & SYSMODE_PREFIX_DATA) {
-            u32 *destreg;
-            u32 srcval;
+	if (M.x86.mode & SYSMODE_PREFIX_DATA) {
+	    u32 *destreg;
+	    u32 srcval;
 
-            destreg = DECODE_RM_LONG_REGISTER(rh);
-            DECODE_PRINTF(",");
-            srcoffset = decode_rm10_address(rl);
-            srcval = fetch_data_long(srcoffset);
-            DECODE_PRINTF("\n");
-            TRACE_AND_STEP();
-            *destreg = add_long(*destreg, srcval);
-        } else {
-            u16 *destreg;
-            u16 srcval;
+	    destreg = DECODE_RM_LONG_REGISTER(rh);
+	    DECODE_PRINTF(",");
+	    srcoffset = decode_rm10_address(rl);
+	    srcval = fetch_data_long(srcoffset);
+	    DECODE_PRINTF("\n");
+	    TRACE_AND_STEP();
+	    *destreg = add_long(*destreg, srcval);
+	} else {
+	    u16 *destreg;
+	    u16 srcval;
 
-            destreg = DECODE_RM_WORD_REGISTER(rh);
-            DECODE_PRINTF(",");
-            srcoffset = decode_rm10_address(rl);
-            srcval = fetch_data_word(srcoffset);
-            DECODE_PRINTF("\n");
-            TRACE_AND_STEP();
-            *destreg = add_word(*destreg, srcval);
-        }
-        break;
+	    destreg = DECODE_RM_WORD_REGISTER(rh);
+	    DECODE_PRINTF(",");
+	    srcoffset = decode_rm10_address(rl);
+	    srcval = fetch_data_word(srcoffset);
+	    DECODE_PRINTF("\n");
+	    TRACE_AND_STEP();
+	    *destreg = add_word(*destreg, srcval);
+	}
+	break;
     case 3:                     /* register to register */
-        if (M.x86.mode & SYSMODE_PREFIX_DATA) {
-            u32 *destreg,*srcreg;
+	if (M.x86.mode & SYSMODE_PREFIX_DATA) {
+	    u32 *destreg,*srcreg;
 
-            destreg = DECODE_RM_LONG_REGISTER(rh);
-            DECODE_PRINTF(",");
-            srcreg = DECODE_RM_LONG_REGISTER(rl);
-            DECODE_PRINTF("\n");
-            TRACE_AND_STEP();
-            *destreg = add_long(*destreg, *srcreg);
-        } else {
-            u16 *destreg,*srcreg;
+	    destreg = DECODE_RM_LONG_REGISTER(rh);
+	    DECODE_PRINTF(",");
+	    srcreg = DECODE_RM_LONG_REGISTER(rl);
+	    DECODE_PRINTF("\n");
+	    TRACE_AND_STEP();
+	    *destreg = add_long(*destreg, *srcreg);
+	} else {
+	    u16 *destreg,*srcreg;
 
-            destreg = DECODE_RM_WORD_REGISTER(rh);
-            DECODE_PRINTF(",");
-            srcreg = DECODE_RM_WORD_REGISTER(rl);
-            DECODE_PRINTF("\n");
-            TRACE_AND_STEP();
-            *destreg = add_word(*destreg, *srcreg);
-        }
-        break;
+	    destreg = DECODE_RM_WORD_REGISTER(rh);
+	    DECODE_PRINTF(",");
+	    srcreg = DECODE_RM_WORD_REGISTER(rl);
+	    DECODE_PRINTF("\n");
+	    TRACE_AND_STEP();
+	    *destreg = add_word(*destreg, *srcreg);
+	}
+	break;
     }
     DECODE_CLEAR_SEGOVR();
     END_OF_INSTR();
@@ -468,18 +468,18 @@
 
     START_OF_INSTR();
     if (M.x86.mode & SYSMODE_PREFIX_DATA) {
-        DECODE_PRINTF("ADD\tEAX,");
-        srcval = fetch_long_imm();
+	DECODE_PRINTF("ADD\tEAX,");
+	srcval = fetch_long_imm();
     } else {
-        DECODE_PRINTF("ADD\tAX,");
-        srcval = fetch_word_imm();
+	DECODE_PRINTF("ADD\tAX,");
+	srcval = fetch_word_imm();
     }
     DECODE_PRINTF2("%x\n", srcval);
     TRACE_AND_STEP();
     if (M.x86.mode & SYSMODE_PREFIX_DATA) {
-        M.x86.R_EAX = add_long(M.x86.R_EAX, srcval);
+	M.x86.R_EAX = add_long(M.x86.R_EAX, srcval);
     } else {
-        M.x86.R_AX = add_word(M.x86.R_AX, (u16)srcval);
+	M.x86.R_AX = add_word(M.x86.R_AX, (u16)srcval);
     }
     DECODE_CLEAR_SEGOVR();
     END_OF_INSTR();
@@ -529,43 +529,43 @@
     FETCH_DECODE_MODRM(mod, rh, rl);
     switch (mod) {
     case 0:
-        destoffset = decode_rm00_address(rl);
-        DECODE_PRINTF(",");
-        destval = fetch_data_byte(destoffset);
-        srcreg = DECODE_RM_BYTE_REGISTER(rh);
-        DECODE_PRINTF("\n");
-        TRACE_AND_STEP();
-        destval = or_byte(destval, *srcreg);
-        store_data_byte(destoffset, destval);
-        break;
+	destoffset = decode_rm00_address(rl);
+	DECODE_PRINTF(",");
+	destval = fetch_data_byte(destoffset);
+	srcreg = DECODE_RM_BYTE_REGISTER(rh);
+	DECODE_PRINTF("\n");
+	TRACE_AND_STEP();
+	destval = or_byte(destval, *srcreg);
+	store_data_byte(destoffset, destval);
+	break;
     case 1:
-        destoffset = decode_rm01_address(rl);
-        DECODE_PRINTF(",");
-        destval = fetch_data_byte(destoffset);
-        srcreg = DECODE_RM_BYTE_REGISTER(rh);
-        DECODE_PRINTF("\n");
-        TRACE_AND_STEP();
-        destval = or_byte(destval, *srcreg);
-        store_data_byte(destoffset, destval);
-        break;
+	destoffset = decode_rm01_address(rl);
+	DECODE_PRINTF(",");
+	destval = fetch_data_byte(destoffset);
+	srcreg = DECODE_RM_BYTE_REGISTER(rh);
+	DECODE_PRINTF("\n");
+	TRACE_AND_STEP();
+	destval = or_byte(destval, *srcreg);
+	store_data_byte(destoffset, destval);
+	break;
     case 2:
-        destoffset = decode_rm10_address(rl);
-        DECODE_PRINTF(",");
-        destval = fetch_data_byte(destoffset);
-        srcreg = DECODE_RM_BYTE_REGISTER(rh);
-        DECODE_PRINTF("\n");
-        TRACE_AND_STEP();
-        destval = or_byte(destval, *srcreg);
-        store_data_byte(destoffset, destval);
-        break;
+	destoffset = decode_rm10_address(rl);
+	DECODE_PRINTF(",");
+	destval = fetch_data_byte(destoffset);
+	srcreg = DECODE_RM_BYTE_REGISTER(rh);
+	DECODE_PRINTF("\n");
+	TRACE_AND_STEP();
+	destval = or_byte(destval, *srcreg);
+	store_data_byte(destoffset, destval);
+	break;
     case 3:                     /* register to register */
-        destreg = DECODE_RM_BYTE_REGISTER(rl);
-        DECODE_PRINTF(",");
-        srcreg = DECODE_RM_BYTE_REGISTER(rh);
-        DECODE_PRINTF("\n");
-        TRACE_AND_STEP();
-        *destreg = or_byte(*destreg, *srcreg);
-        break;
+	destreg = DECODE_RM_BYTE_REGISTER(rl);
+	DECODE_PRINTF(",");
+	srcreg = DECODE_RM_BYTE_REGISTER(rh);
+	DECODE_PRINTF("\n");
+	TRACE_AND_STEP();
+	*destreg = or_byte(*destreg, *srcreg);
+	break;
     }
     DECODE_CLEAR_SEGOVR();
     END_OF_INSTR();
@@ -585,107 +585,107 @@
     FETCH_DECODE_MODRM(mod, rh, rl);
     switch (mod) {
     case 0:
-        if (M.x86.mode & SYSMODE_PREFIX_DATA) {
-            u32 destval;
-            u32 *srcreg;
+	if (M.x86.mode & SYSMODE_PREFIX_DATA) {
+	    u32 destval;
+	    u32 *srcreg;
 
-            destoffset = decode_rm00_address(rl);
-            DECODE_PRINTF(",");
-            destval = fetch_data_long(destoffset);
-            srcreg = DECODE_RM_LONG_REGISTER(rh);
-            DECODE_PRINTF("\n");
-            TRACE_AND_STEP();
-            destval = or_long(destval, *srcreg);
-            store_data_long(destoffset, destval);
-        } else {
-            u16 destval;
-            u16 *srcreg;
+	    destoffset = decode_rm00_address(rl);
+	    DECODE_PRINTF(",");
+	    destval = fetch_data_long(destoffset);
+	    srcreg = DECODE_RM_LONG_REGISTER(rh);
+	    DECODE_PRINTF("\n");
+	    TRACE_AND_STEP();
+	    destval = or_long(destval, *srcreg);
+	    store_data_long(destoffset, destval);
+	} else {
+	    u16 destval;
+	    u16 *srcreg;
 
-            destoffset = decode_rm00_address(rl);
-            DECODE_PRINTF(",");
-            destval = fetch_data_word(destoffset);
-            srcreg = DECODE_RM_WORD_REGISTER(rh);
-            DECODE_PRINTF("\n");
-            TRACE_AND_STEP();
-            destval = or_word(destval, *srcreg);
-            store_data_word(destoffset, destval);
-        }
-        break;
+	    destoffset = decode_rm00_address(rl);
+	    DECODE_PRINTF(",");
+	    destval = fetch_data_word(destoffset);
+	    srcreg = DECODE_RM_WORD_REGISTER(rh);
+	    DECODE_PRINTF("\n");
+	    TRACE_AND_STEP();
+	    destval = or_word(destval, *srcreg);
+	    store_data_word(destoffset, destval);
+	}
+	break;
     case 1:
-        if (M.x86.mode & SYSMODE_PREFIX_DATA) {
-            u32 destval;
-            u32 *srcreg;
+	if (M.x86.mode & SYSMODE_PREFIX_DATA) {
+	    u32 destval;
+	    u32 *srcreg;
 
-            destoffset = decode_rm01_address(rl);
-            DECODE_PRINTF(",");
-            destval = fetch_data_long(destoffset);
-            srcreg = DECODE_RM_LONG_REGISTER(rh);
-            DECODE_PRINTF("\n");
-            TRACE_AND_STEP();
-            destval = or_long(destval, *srcreg);
-            store_data_long(destoffset, destval);
-        } else {
-            u16 destval;
-            u16 *srcreg;
+	    destoffset = decode_rm01_address(rl);
+	    DECODE_PRINTF(",");
+	    destval = fetch_data_long(destoffset);
+	    srcreg = DECODE_RM_LONG_REGISTER(rh);
+	    DECODE_PRINTF("\n");
+	    TRACE_AND_STEP();
+	    destval = or_long(destval, *srcreg);
+	    store_data_long(destoffset, destval);
+	} else {
+	    u16 destval;
+	    u16 *srcreg;
 
-            destoffset = decode_rm01_address(rl);
-            DECODE_PRINTF(",");
-            destval = fetch_data_word(destoffset);
-            srcreg = DECODE_RM_WORD_REGISTER(rh);
-            DECODE_PRINTF("\n");
-            TRACE_AND_STEP();
-            destval = or_word(destval, *srcreg);
-            store_data_word(destoffset, destval);
-        }
-        break;
+	    destoffset = decode_rm01_address(rl);
+	    DECODE_PRINTF(",");
+	    destval = fetch_data_word(destoffset);
+	    srcreg = DECODE_RM_WORD_REGISTER(rh);
+	    DECODE_PRINTF("\n");
+	    TRACE_AND_STEP();
+	    destval = or_word(destval, *srcreg);
+	    store_data_word(destoffset, destval);
+	}
+	break;
     case 2:
-        if (M.x86.mode & SYSMODE_PREFIX_DATA) {
-            u32 destval;
-            u32 *srcreg;
+	if (M.x86.mode & SYSMODE_PREFIX_DATA) {
+	    u32 destval;
+	    u32 *srcreg;
 
-            destoffset = decode_rm10_address(rl);
-            DECODE_PRINTF(",");
-            destval = fetch_data_long(destoffset);
-            srcreg = DECODE_RM_LONG_REGISTER(rh);
-            DECODE_PRINTF("\n");
-            TRACE_AND_STEP();
-            destval = or_long(destval, *srcreg);
-            store_data_long(destoffset, destval);
-        } else {
-            u16 destval;
-            u16 *srcreg;
+	    destoffset = decode_rm10_address(rl);
+	    DECODE_PRINTF(",");
+	    destval = fetch_data_long(destoffset);
+	    srcreg = DECODE_RM_LONG_REGISTER(rh);
+	    DECODE_PRINTF("\n");
+	    TRACE_AND_STEP();
+	    destval = or_long(destval, *srcreg);
+	    store_data_long(destoffset, destval);
+	} else {
+	    u16 destval;
+	    u16 *srcreg;
 
-            destoffset = decode_rm10_address(rl);
-            DECODE_PRINTF(",");
-            destval = fetch_data_word(destoffset);
-            srcreg = DECODE_RM_WORD_REGISTER(rh);
-            DECODE_PRINTF("\n");
-            TRACE_AND_STEP();
-            destval = or_word(destval, *srcreg);
-            store_data_word(destoffset, destval);
-        }
-        break;
+	    destoffset = decode_rm10_address(rl);
+	    DECODE_PRINTF(",");
+	    destval = fetch_data_word(destoffset);
+	    srcreg = DECODE_RM_WORD_REGISTER(rh);
+	    DECODE_PRINTF("\n");
+	    TRACE_AND_STEP();
+	    destval = or_word(destval, *srcreg);
+	    store_data_word(destoffset, destval);
+	}
+	break;
     case 3:                     /* register to register */
-        if (M.x86.mode & SYSMODE_PREFIX_DATA) {
-            u32 *destreg,*srcreg;
+	if (M.x86.mode & SYSMODE_PREFIX_DATA) {
+	    u32 *destreg,*srcreg;
 
-            destreg = DECODE_RM_LONG_REGISTER(rl);
-            DECODE_PRINTF(",");
-            srcreg = DECODE_RM_LONG_REGISTER(rh);
-            DECODE_PRINTF("\n");
-            TRACE_AND_STEP();
-            *destreg = or_long(*destreg, *srcreg);
-        } else {
-            u16 *destreg,*srcreg;
+	    destreg = DECODE_RM_LONG_REGISTER(rl);
+	    DECODE_PRINTF(",");
+	    srcreg = DECODE_RM_LONG_REGISTER(rh);
+	    DECODE_PRINTF("\n");
+	    TRACE_AND_STEP();
+	    *destreg = or_long(*destreg, *srcreg);
+	} else {
+	    u16 *destreg,*srcreg;
 
-            destreg = DECODE_RM_WORD_REGISTER(rl);
-            DECODE_PRINTF(",");
-            srcreg = DECODE_RM_WORD_REGISTER(rh);
-            DECODE_PRINTF("\n");
-            TRACE_AND_STEP();
-            *destreg = or_word(*destreg, *srcreg);
-        }
-        break;
+	    destreg = DECODE_RM_WORD_REGISTER(rl);
+	    DECODE_PRINTF(",");
+	    srcreg = DECODE_RM_WORD_REGISTER(rh);
+	    DECODE_PRINTF("\n");
+	    TRACE_AND_STEP();
+	    *destreg = or_word(*destreg, *srcreg);
+	}
+	break;
     }
     DECODE_CLEAR_SEGOVR();
     END_OF_INSTR();
@@ -707,40 +707,40 @@
     FETCH_DECODE_MODRM(mod, rh, rl);
     switch (mod) {
     case 0:
-        destreg = DECODE_RM_BYTE_REGISTER(rh);
-        DECODE_PRINTF(",");
-        srcoffset = decode_rm00_address(rl);
-        srcval = fetch_data_byte(srcoffset);
-        DECODE_PRINTF("\n");
-        TRACE_AND_STEP();
-        *destreg = or_byte(*destreg, srcval);
-        break;
+	destreg = DECODE_RM_BYTE_REGISTER(rh);
+	DECODE_PRINTF(",");
+	srcoffset = decode_rm00_address(rl);
+	srcval = fetch_data_byte(srcoffset);
+	DECODE_PRINTF("\n");
+	TRACE_AND_STEP();
+	*destreg = or_byte(*destreg, srcval);
+	break;
     case 1:
-        destreg = DECODE_RM_BYTE_REGISTER(rh);
-        DECODE_PRINTF(",");
-        srcoffset = decode_rm01_address(rl);
-        srcval = fetch_data_byte(srcoffset);
-        DECODE_PRINTF("\n");
-        TRACE_AND_STEP();
-        *destreg = or_byte(*destreg, srcval);
-        break;
+	destreg = DECODE_RM_BYTE_REGISTER(rh);
+	DECODE_PRINTF(",");
+	srcoffset = decode_rm01_address(rl);
+	srcval = fetch_data_byte(srcoffset);
+	DECODE_PRINTF("\n");
+	TRACE_AND_STEP();
+	*destreg = or_byte(*destreg, srcval);
+	break;
     case 2:
-        destreg = DECODE_RM_BYTE_REGISTER(rh);
-        DECODE_PRINTF(",");
-        srcoffset = decode_rm10_address(rl);
-        srcval = fetch_data_byte(srcoffset);
-        DECODE_PRINTF("\n");
-        TRACE_AND_STEP();
-        *destreg = or_byte(*destreg, srcval);
-        break;
+	destreg = DECODE_RM_BYTE_REGISTER(rh);
+	DECODE_PRINTF(",");
+	srcoffset = decode_rm10_address(rl);
+	srcval = fetch_data_byte(srcoffset);
+	DECODE_PRINTF("\n");
+	TRACE_AND_STEP();
+	*destreg = or_byte(*destreg, srcval);
+	break;
     case 3:                     /* register to register */
-        destreg = DECODE_RM_BYTE_REGISTER(rh);
-        DECODE_PRINTF(",");
-        srcreg = DECODE_RM_BYTE_REGISTER(rl);
-        DECODE_PRINTF("\n");
-        TRACE_AND_STEP();
-        *destreg = or_byte(*destreg, *srcreg);
-        break;
+	destreg = DECODE_RM_BYTE_REGISTER(rh);
+	DECODE_PRINTF(",");
+	srcreg = DECODE_RM_BYTE_REGISTER(rl);
+	DECODE_PRINTF("\n");
+	TRACE_AND_STEP();
+	*destreg = or_byte(*destreg, *srcreg);
+	break;
     }
     DECODE_CLEAR_SEGOVR();
     END_OF_INSTR();
@@ -760,101 +760,101 @@
     FETCH_DECODE_MODRM(mod, rh, rl);
     switch (mod) {
     case 0:
-        if (M.x86.mode & SYSMODE_PREFIX_DATA) {
-            u32 *destreg;
-            u32 srcval;
+	if (M.x86.mode & SYSMODE_PREFIX_DATA) {
+	    u32 *destreg;
+	    u32 srcval;
 
-            destreg = DECODE_RM_LONG_REGISTER(rh);
-            DECODE_PRINTF(",");
-            srcoffset = decode_rm00_address(rl);
-            srcval = fetch_data_long(srcoffset);
-            DECODE_PRINTF("\n");
-            TRACE_AND_STEP();
-            *destreg = or_long(*destreg, srcval);
-        } else {
-            u16 *destreg;
-            u16 srcval;
+	    destreg = DECODE_RM_LONG_REGISTER(rh);
+	    DECODE_PRINTF(",");
+	    srcoffset = decode_rm00_address(rl);
+	    srcval = fetch_data_long(srcoffset);
+	    DECODE_PRINTF("\n");
+	    TRACE_AND_STEP();
+	    *destreg = or_long(*destreg, srcval);
+	} else {
+	    u16 *destreg;
+	    u16 srcval;
 
-            destreg = DECODE_RM_WORD_REGISTER(rh);
-            DECODE_PRINTF(",");
-            srcoffset = decode_rm00_address(rl);
-            srcval = fetch_data_word(srcoffset);
-            DECODE_PRINTF("\n");
-            TRACE_AND_STEP();
-            *destreg = or_word(*destreg, srcval);
-        }
-        break;
+	    destreg = DECODE_RM_WORD_REGISTER(rh);
+	    DECODE_PRINTF(",");
+	    srcoffset = decode_rm00_address(rl);
+	    srcval = fetch_data_word(srcoffset);
+	    DECODE_PRINTF("\n");
+	    TRACE_AND_STEP();
+	    *destreg = or_word(*destreg, srcval);
+	}
+	break;
     case 1:
-        if (M.x86.mode & SYSMODE_PREFIX_DATA) {
-            u32 *destreg;
-            u32 srcval;
+	if (M.x86.mode & SYSMODE_PREFIX_DATA) {
+	    u32 *destreg;
+	    u32 srcval;
 
-            destreg = DECODE_RM_LONG_REGISTER(rh);
-            DECODE_PRINTF(",");
-            srcoffset = decode_rm01_address(rl);
-            srcval = fetch_data_long(srcoffset);
-            DECODE_PRINTF("\n");
-            TRACE_AND_STEP();
-            *destreg = or_long(*destreg, srcval);
-        } else {
-            u16 *destreg;
-            u16 srcval;
+	    destreg = DECODE_RM_LONG_REGISTER(rh);
+	    DECODE_PRINTF(",");
+	    srcoffset = decode_rm01_address(rl);
+	    srcval = fetch_data_long(srcoffset);
+	    DECODE_PRINTF("\n");
+	    TRACE_AND_STEP();
+	    *destreg = or_long(*destreg, srcval);
+	} else {
+	    u16 *destreg;
+	    u16 srcval;
 
-            destreg = DECODE_RM_WORD_REGISTER(rh);
-            DECODE_PRINTF(",");
-            srcoffset = decode_rm01_address(rl);
-            srcval = fetch_data_word(srcoffset);
-            DECODE_PRINTF("\n");
-            TRACE_AND_STEP();
-            *destreg = or_word(*destreg, srcval);
-        }
-        break;
+	    destreg = DECODE_RM_WORD_REGISTER(rh);
+	    DECODE_PRINTF(",");
+	    srcoffset = decode_rm01_address(rl);
+	    srcval = fetch_data_word(srcoffset);
+	    DECODE_PRINTF("\n");
+	    TRACE_AND_STEP();
+	    *destreg = or_word(*destreg, srcval);
+	}
+	break;
     case 2:
-        if (M.x86.mode & SYSMODE_PREFIX_DATA) {
-            u32 *destreg;
-            u32 srcval;
+	if (M.x86.mode & SYSMODE_PREFIX_DATA) {
+	    u32 *destreg;
+	    u32 srcval;
 
-            destreg = DECODE_RM_LONG_REGISTER(rh);
-            DECODE_PRINTF(",");
-            srcoffset = decode_rm10_address(rl);
-            srcval = fetch_data_long(srcoffset);
-            DECODE_PRINTF("\n");
-            TRACE_AND_STEP();
-            *destreg = or_long(*destreg, srcval);
-        } else {
-            u16 *destreg;
-            u16 srcval;
+	    destreg = DECODE_RM_LONG_REGISTER(rh);
+	    DECODE_PRINTF(",");
+	    srcoffset = decode_rm10_address(rl);
+	    srcval = fetch_data_long(srcoffset);
+	    DECODE_PRINTF("\n");
+	    TRACE_AND_STEP();
+	    *destreg = or_long(*destreg, srcval);
+	} else {
+	    u16 *destreg;
+	    u16 srcval;
 
-            destreg = DECODE_RM_WORD_REGISTER(rh);
-            DECODE_PRINTF(",");
-            srcoffset = decode_rm10_address(rl);
-            srcval = fetch_data_word(srcoffset);
-            DECODE_PRINTF("\n");
-            TRACE_AND_STEP();
-            *destreg = or_word(*destreg, srcval);
-        }
-        break;
+	    destreg = DECODE_RM_WORD_REGISTER(rh);
+	    DECODE_PRINTF(",");
+	    srcoffset = decode_rm10_address(rl);
+	    srcval = fetch_data_word(srcoffset);
+	    DECODE_PRINTF("\n");
+	    TRACE_AND_STEP();
+	    *destreg = or_word(*destreg, srcval);
+	}
+	break;
     case 3:                     /* register to register */
-        if (M.x86.mode & SYSMODE_PREFIX_DATA) {
-            u32 *destreg,*srcreg;
+	if (M.x86.mode & SYSMODE_PREFIX_DATA) {
+	    u32 *destreg,*srcreg;
 
-            destreg = DECODE_RM_LONG_REGISTER(rh);
-            DECODE_PRINTF(",");
-            srcreg = DECODE_RM_LONG_REGISTER(rl);
-            DECODE_PRINTF("\n");
-            TRACE_AND_STEP();
-            *destreg = or_long(*destreg, *srcreg);
-        } else {
-            u16 *destreg,*srcreg;
+	    destreg = DECODE_RM_LONG_REGISTER(rh);
+	    DECODE_PRINTF(",");
+	    srcreg = DECODE_RM_LONG_REGISTER(rl);
+	    DECODE_PRINTF("\n");
+	    TRACE_AND_STEP();
+	    *destreg = or_long(*destreg, *srcreg);
+	} else {
+	    u16 *destreg,*srcreg;
 
-            destreg = DECODE_RM_WORD_REGISTER(rh);
-            DECODE_PRINTF(",");
-            srcreg = DECODE_RM_WORD_REGISTER(rl);
-            DECODE_PRINTF("\n");
-            TRACE_AND_STEP();
-            *destreg = or_word(*destreg, *srcreg);
-        }
-        break;
+	    destreg = DECODE_RM_WORD_REGISTER(rh);
+	    DECODE_PRINTF(",");
+	    srcreg = DECODE_RM_WORD_REGISTER(rl);
+	    DECODE_PRINTF("\n");
+	    TRACE_AND_STEP();
+	    *destreg = or_word(*destreg, *srcreg);
+	}
+	break;
     }
     DECODE_CLEAR_SEGOVR();
     END_OF_INSTR();
@@ -888,18 +888,18 @@
 
     START_OF_INSTR();
     if (M.x86.mode & SYSMODE_PREFIX_DATA) {
-        DECODE_PRINTF("OR\tEAX,");
-        srcval = fetch_long_imm();
+	DECODE_PRINTF("OR\tEAX,");
+	srcval = fetch_long_imm();
     } else {
-        DECODE_PRINTF("OR\tAX,");
-        srcval = fetch_word_imm();
+	DECODE_PRINTF("OR\tAX,");
+	srcval = fetch_word_imm();
     }
     DECODE_PRINTF2("%x\n", srcval);
     TRACE_AND_STEP();
     if (M.x86.mode & SYSMODE_PREFIX_DATA) {
-        M.x86.R_EAX = or_long(M.x86.R_EAX, srcval);
+	M.x86.R_EAX = or_long(M.x86.R_EAX, srcval);
     } else {
-        M.x86.R_AX = or_word(M.x86.R_AX, (u16)srcval);
+	M.x86.R_AX = or_word(M.x86.R_AX, (u16)srcval);
     }
     DECODE_CLEAR_SEGOVR();
     END_OF_INSTR();
@@ -946,43 +946,43 @@
     FETCH_DECODE_MODRM(mod, rh, rl);
     switch (mod) {
     case 0:
-        destoffset = decode_rm00_address(rl);
-        DECODE_PRINTF(",");
-        destval = fetch_data_byte(destoffset);
-        srcreg = DECODE_RM_BYTE_REGISTER(rh);
-        DECODE_PRINTF("\n");
-        TRACE_AND_STEP();
-        destval = adc_byte(destval, *srcreg);
-        store_data_byte(destoffset, destval);
-        break;
+	destoffset = decode_rm00_address(rl);
+	DECODE_PRINTF(",");
+	destval = fetch_data_byte(destoffset);
+	srcreg = DECODE_RM_BYTE_REGISTER(rh);
+	DECODE_PRINTF("\n");
+	TRACE_AND_STEP();
+	destval = adc_byte(destval, *srcreg);
+	store_data_byte(destoffset, destval);
+	break;
     case 1:
-        destoffset = decode_rm01_address(rl);
-        DECODE_PRINTF(",");
-        destval = fetch_data_byte(destoffset);
-        srcreg = DECODE_RM_BYTE_REGISTER(rh);
-        DECODE_PRINTF("\n");
-        TRACE_AND_STEP();
-        destval = adc_byte(destval, *srcreg);
-        store_data_byte(destoffset, destval);
-        break;
+	destoffset = decode_rm01_address(rl);
+	DECODE_PRINTF(",");
+	destval = fetch_data_byte(destoffset);
+	srcreg = DECODE_RM_BYTE_REGISTER(rh);
+	DECODE_PRINTF("\n");
+	TRACE_AND_STEP();
+	destval = adc_byte(destval, *srcreg);
+	store_data_byte(destoffset, destval);
+	break;
     case 2:
-        destoffset = decode_rm10_address(rl);
-        DECODE_PRINTF(",");
-        destval = fetch_data_byte(destoffset);
-        srcreg = DECODE_RM_BYTE_REGISTER(rh);
-        DECODE_PRINTF("\n");
-        TRACE_AND_STEP();
-        destval = adc_byte(destval, *srcreg);
-        store_data_byte(destoffset, destval);
-        break;
+	destoffset = decode_rm10_address(rl);
+	DECODE_PRINTF(",");
+	destval = fetch_data_byte(destoffset);
+	srcreg = DECODE_RM_BYTE_REGISTER(rh);
+	DECODE_PRINTF("\n");
+	TRACE_AND_STEP();
+	destval = adc_byte(destval, *srcreg);
+	store_data_byte(destoffset, destval);
+	break;
     case 3:                     /* register to register */
-        destreg = DECODE_RM_BYTE_REGISTER(rl);
-        DECODE_PRINTF(",");
-        srcreg = DECODE_RM_BYTE_REGISTER(rh);
-        DECODE_PRINTF("\n");
-        TRACE_AND_STEP();
-        *destreg = adc_byte(*destreg, *srcreg);
-        break;
+	destreg = DECODE_RM_BYTE_REGISTER(rl);
+	DECODE_PRINTF(",");
+	srcreg = DECODE_RM_BYTE_REGISTER(rh);
+	DECODE_PRINTF("\n");
+	TRACE_AND_STEP();
+	*destreg = adc_byte(*destreg, *srcreg);
+	break;
     }
     DECODE_CLEAR_SEGOVR();
     END_OF_INSTR();
@@ -1002,107 +1002,107 @@
     FETCH_DECODE_MODRM(mod, rh, rl);
     switch (mod) {
     case 0:
-        if (M.x86.mode & SYSMODE_PREFIX_DATA) {
-            u32 destval;
-            u32 *srcreg;
+	if (M.x86.mode & SYSMODE_PREFIX_DATA) {
+	    u32 destval;
+	    u32 *srcreg;
 
-            destoffset = decode_rm00_address(rl);
-            DECODE_PRINTF(",");
-            destval = fetch_data_long(destoffset);
-            srcreg = DECODE_RM_LONG_REGISTER(rh);
-            DECODE_PRINTF("\n");
-            TRACE_AND_STEP();
-            destval = adc_long(destval, *srcreg);
-            store_data_long(destoffset, destval);
-        } else {
-            u16 destval;
-            u16 *srcreg;
+	    destoffset = decode_rm00_address(rl);
+	    DECODE_PRINTF(",");
+	    destval = fetch_data_long(destoffset);
+	    srcreg = DECODE_RM_LONG_REGISTER(rh);
+	    DECODE_PRINTF("\n");
+	    TRACE_AND_STEP();
+	    destval = adc_long(destval, *srcreg);
+	    store_data_long(destoffset, destval);
+	} else {
+	    u16 destval;
+	    u16 *srcreg;
 
-            destoffset = decode_rm00_address(rl);
-            DECODE_PRINTF(",");
-            destval = fetch_data_word(destoffset);
-            srcreg = DECODE_RM_WORD_REGISTER(rh);
-            DECODE_PRINTF("\n");
-            TRACE_AND_STEP();
-            destval = adc_word(destval, *srcreg);
-            store_data_word(destoffset, destval);
-        }
-        break;
+	    destoffset = decode_rm00_address(rl);
+	    DECODE_PRINTF(",");
+	    destval = fetch_data_word(destoffset);
+	    srcreg = DECODE_RM_WORD_REGISTER(rh);
+	    DECODE_PRINTF("\n");
+	    TRACE_AND_STEP();
+	    destval = adc_word(destval, *srcreg);
+	    store_data_word(destoffset, destval);
+	}
+	break;
     case 1:
-        if (M.x86.mode & SYSMODE_PREFIX_DATA) {
-            u32 destval;
-            u32 *srcreg;
+	if (M.x86.mode & SYSMODE_PREFIX_DATA) {
+	    u32 destval;
+	    u32 *srcreg;
 
-            destoffset = decode_rm01_address(rl);
-            DECODE_PRINTF(",");
-            destval = fetch_data_long(destoffset);
-            srcreg = DECODE_RM_LONG_REGISTER(rh);
-            DECODE_PRINTF("\n");
-            TRACE_AND_STEP();
-            destval = adc_long(destval, *srcreg);
-            store_data_long(destoffset, destval);
-        } else {
-            u16 destval;
-            u16 *srcreg;
+	    destoffset = decode_rm01_address(rl);
+	    DECODE_PRINTF(",");
+	    destval = fetch_data_long(destoffset);
+	    srcreg = DECODE_RM_LONG_REGISTER(rh);
+	    DECODE_PRINTF("\n");
+	    TRACE_AND_STEP();
+	    destval = adc_long(destval, *srcreg);
+	    store_data_long(destoffset, destval);
+	} else {
+	    u16 destval;
+	    u16 *srcreg;
 
-            destoffset = decode_rm01_address(rl);
-            DECODE_PRINTF(",");
-            destval = fetch_data_word(destoffset);
-            srcreg = DECODE_RM_WORD_REGISTER(rh);
-            DECODE_PRINTF("\n");
-            TRACE_AND_STEP();
-            destval = adc_word(destval, *srcreg);
-            store_data_word(destoffset, destval);
-        }
-        break;
+	    destoffset = decode_rm01_address(rl);
+	    DECODE_PRINTF(",");
+	    destval = fetch_data_word(destoffset);
+	    srcreg = DECODE_RM_WORD_REGISTER(rh);
+	    DECODE_PRINTF("\n");
+	    TRACE_AND_STEP();
+	    destval = adc_word(destval, *srcreg);
+	    store_data_word(destoffset, destval);
+	}
+	break;
     case 2:
-        if (M.x86.mode & SYSMODE_PREFIX_DATA) {
-            u32 destval;
-            u32 *srcreg;
+	if (M.x86.mode & SYSMODE_PREFIX_DATA) {
+	    u32 destval;
+	    u32 *srcreg;
 
-            destoffset = decode_rm10_address(rl);
-            DECODE_PRINTF(",");
-            destval = fetch_data_long(destoffset);
-            srcreg = DECODE_RM_LONG_REGISTER(rh);
-            DECODE_PRINTF("\n");
-            TRACE_AND_STEP();
-            destval = adc_long(destval, *srcreg);
-            store_data_long(destoffset, destval);
-        } else {
-            u16 destval;
-            u16 *srcreg;
+	    destoffset = decode_rm10_address(rl);
+	    DECODE_PRINTF(",");
+	    destval = fetch_data_long(destoffset);
+	    srcreg = DECODE_RM_LONG_REGISTER(rh);
+	    DECODE_PRINTF("\n");
+	    TRACE_AND_STEP();
+	    destval = adc_long(destval, *srcreg);
+	    store_data_long(destoffset, destval);
+	} else {
+	    u16 destval;
+	    u16 *srcreg;
 
-            destoffset = decode_rm10_address(rl);
-            DECODE_PRINTF(",");
-            destval = fetch_data_word(destoffset);
-            srcreg = DECODE_RM_WORD_REGISTER(rh);
-            DECODE_PRINTF("\n");
-            TRACE_AND_STEP();
-            destval = adc_word(destval, *srcreg);
-            store_data_word(destoffset, destval);
-        }
-        break;
+	    destoffset = decode_rm10_address(rl);
+	    DECODE_PRINTF(",");
+	    destval = fetch_data_word(destoffset);
+	    srcreg = DECODE_RM_WORD_REGISTER(rh);
+	    DECODE_PRINTF("\n");
+	    TRACE_AND_STEP();
+	    destval = adc_word(destval, *srcreg);
+	    store_data_word(destoffset, destval);
+	}
+	break;
     case 3:                     /* register to register */
-        if (M.x86.mode & SYSMODE_PREFIX_DATA) {
-            u32 *destreg,*srcreg;
+	if (M.x86.mode & SYSMODE_PREFIX_DATA) {
+	    u32 *destreg,*srcreg;
 
-            destreg = DECODE_RM_LONG_REGISTER(rl);
-            DECODE_PRINTF(",");
-            srcreg = DECODE_RM_LONG_REGISTER(rh);
-            DECODE_PRINTF("\n");
-            TRACE_AND_STEP();
-            *destreg = adc_long(*destreg, *srcreg);
-        } else {
-            u16 *destreg,*srcreg;
+	    destreg = DECODE_RM_LONG_REGISTER(rl);
+	    DECODE_PRINTF(",");
+	    srcreg = DECODE_RM_LONG_REGISTER(rh);
+	    DECODE_PRINTF("\n");
+	    TRACE_AND_STEP();
+	    *destreg = adc_long(*destreg, *srcreg);
+	} else {
+	    u16 *destreg,*srcreg;
 
-            destreg = DECODE_RM_WORD_REGISTER(rl);
-            DECODE_PRINTF(",");
-            srcreg = DECODE_RM_WORD_REGISTER(rh);
-            DECODE_PRINTF("\n");
-            TRACE_AND_STEP();
-            *destreg = adc_word(*destreg, *srcreg);
-        }
-        break;
+	    destreg = DECODE_RM_WORD_REGISTER(rl);
+	    DECODE_PRINTF(",");
+	    srcreg = DECODE_RM_WORD_REGISTER(rh);
+	    DECODE_PRINTF("\n");
+	    TRACE_AND_STEP();
+	    *destreg = adc_word(*destreg, *srcreg);
+	}
+	break;
     }
     DECODE_CLEAR_SEGOVR();
     END_OF_INSTR();
@@ -1124,40 +1124,40 @@
     FETCH_DECODE_MODRM(mod, rh, rl);
     switch (mod) {
     case 0:
-        destreg = DECODE_RM_BYTE_REGISTER(rh);
-        DECODE_PRINTF(",");
-        srcoffset = decode_rm00_address(rl);
-        srcval = fetch_data_byte(srcoffset);
-        DECODE_PRINTF("\n");
-        TRACE_AND_STEP();
-        *destreg = adc_byte(*destreg, srcval);
-        break;
+	destreg = DECODE_RM_BYTE_REGISTER(rh);
+	DECODE_PRINTF(",");
+	srcoffset = decode_rm00_address(rl);
+	srcval = fetch_data_byte(srcoffset);
+	DECODE_PRINTF("\n");
+	TRACE_AND_STEP();
+	*destreg = adc_byte(*destreg, srcval);
+	break;
     case 1:
-        destreg = DECODE_RM_BYTE_REGISTER(rh);
-        DECODE_PRINTF(",");
-        srcoffset = decode_rm01_address(rl);
-        srcval = fetch_data_byte(srcoffset);
-        DECODE_PRINTF("\n");
-        TRACE_AND_STEP();
-        *destreg = adc_byte(*destreg, srcval);
-        break;
+	destreg = DECODE_RM_BYTE_REGISTER(rh);
+	DECODE_PRINTF(",");
+	srcoffset = decode_rm01_address(rl);
+	srcval = fetch_data_byte(srcoffset);
+	DECODE_PRINTF("\n");
+	TRACE_AND_STEP();
+	*destreg = adc_byte(*destreg, srcval);
+	break;
     case 2:
-        destreg = DECODE_RM_BYTE_REGISTER(rh);
-        DECODE_PRINTF(",");
-        srcoffset = decode_rm10_address(rl);
-        srcval = fetch_data_byte(srcoffset);
-        DECODE_PRINTF("\n");
-        TRACE_AND_STEP();
-        *destreg = adc_byte(*destreg, srcval);
-        break;
+	destreg = DECODE_RM_BYTE_REGISTER(rh);
+	DECODE_PRINTF(",");
+	srcoffset = decode_rm10_address(rl);
+	srcval = fetch_data_byte(srcoffset);
+	DECODE_PRINTF("\n");
+	TRACE_AND_STEP();
+	*destreg = adc_byte(*destreg, srcval);
+	break;
     case 3:                     /* register to register */
-        destreg = DECODE_RM_BYTE_REGISTER(rh);
-        DECODE_PRINTF(",");
-        srcreg = DECODE_RM_BYTE_REGISTER(rl);
-        DECODE_PRINTF("\n");
-        TRACE_AND_STEP();
-        *destreg = adc_byte(*destreg, *srcreg);
-        break;
+	destreg = DECODE_RM_BYTE_REGISTER(rh);
+	DECODE_PRINTF(",");
+	srcreg = DECODE_RM_BYTE_REGISTER(rl);
+	DECODE_PRINTF("\n");
+	TRACE_AND_STEP();
+	*destreg = adc_byte(*destreg, *srcreg);
+	break;
     }
     DECODE_CLEAR_SEGOVR();
     END_OF_INSTR();
@@ -1177,101 +1177,101 @@
     FETCH_DECODE_MODRM(mod, rh, rl);
     switch (mod) {
     case 0:
-        if (M.x86.mode & SYSMODE_PREFIX_DATA) {
-            u32 *destreg;
-            u32 srcval;
+	if (M.x86.mode & SYSMODE_PREFIX_DATA) {
+	    u32 *destreg;
+	    u32 srcval;
 
-            destreg = DECODE_RM_LONG_REGISTER(rh);
-            DECODE_PRINTF(",");
-            srcoffset = decode_rm00_address(rl);
-            srcval = fetch_data_long(srcoffset);
-            DECODE_PRINTF("\n");
-            TRACE_AND_STEP();
-            *destreg = adc_long(*destreg, srcval);
-        } else {
-            u16 *destreg;
-            u16 srcval;
+	    destreg = DECODE_RM_LONG_REGISTER(rh);
+	    DECODE_PRINTF(",");
+	    srcoffset = decode_rm00_address(rl);
+	    srcval = fetch_data_long(srcoffset);
+	    DECODE_PRINTF("\n");
+	    TRACE_AND_STEP();
+	    *destreg = adc_long(*destreg, srcval);
+	} else {
+	    u16 *destreg;
+	    u16 srcval;
 
-            destreg = DECODE_RM_WORD_REGISTER(rh);
-            DECODE_PRINTF(",");
-            srcoffset = decode_rm00_address(rl);
-            srcval = fetch_data_word(srcoffset);
-            DECODE_PRINTF("\n");
-            TRACE_AND_STEP();
-            *destreg = adc_word(*destreg, srcval);
-        }
-        break;
+	    destreg = DECODE_RM_WORD_REGISTER(rh);
+	    DECODE_PRINTF(",");
+	    srcoffset = decode_rm00_address(rl);
+	    srcval = fetch_data_word(srcoffset);
+	    DECODE_PRINTF("\n");
+	    TRACE_AND_STEP();
+	    *destreg = adc_word(*destreg, srcval);
+	}
+	break;
     case 1:
-        if (M.x86.mode & SYSMODE_PREFIX_DATA) {
-            u32 *destreg;
-            u32 srcval;
+	if (M.x86.mode & SYSMODE_PREFIX_DATA) {
+	    u32 *destreg;
+	    u32 srcval;
 
-            destreg = DECODE_RM_LONG_REGISTER(rh);
-            DECODE_PRINTF(",");
-            srcoffset = decode_rm01_address(rl);
-            srcval = fetch_data_long(srcoffset);
-            DECODE_PRINTF("\n");
-            TRACE_AND_STEP();
-            *destreg = adc_long(*destreg, srcval);
-        } else {
-            u16 *destreg;
-            u16 srcval;
+	    destreg = DECODE_RM_LONG_REGISTER(rh);
+	    DECODE_PRINTF(",");
+	    srcoffset = decode_rm01_address(rl);
+	    srcval = fetch_data_long(srcoffset);
+	    DECODE_PRINTF("\n");
+	    TRACE_AND_STEP();
+	    *destreg = adc_long(*destreg, srcval);
+	} else {
+	    u16 *destreg;
+	    u16 srcval;
 
-            destreg = DECODE_RM_WORD_REGISTER(rh);
-            DECODE_PRINTF(",");
-            srcoffset = decode_rm01_address(rl);
-            srcval = fetch_data_word(srcoffset);
-            DECODE_PRINTF("\n");
-            TRACE_AND_STEP();
-            *destreg = adc_word(*destreg, srcval);
-        }
-        break;
+	    destreg = DECODE_RM_WORD_REGISTER(rh);
+	    DECODE_PRINTF(",");
+	    srcoffset = decode_rm01_address(rl);
+	    srcval = fetch_data_word(srcoffset);
+	    DECODE_PRINTF("\n");
+	    TRACE_AND_STEP();
+	    *destreg = adc_word(*destreg, srcval);
+	}
+	break;
     case 2:
-        if (M.x86.mode & SYSMODE_PREFIX_DATA) {
-            u32 *destreg;
-            u32 srcval;
+	if (M.x86.mode & SYSMODE_PREFIX_DATA) {
+	    u32 *destreg;
+	    u32 srcval;
 
-            destreg = DECODE_RM_LONG_REGISTER(rh);
-            DECODE_PRINTF(",");
-            srcoffset = decode_rm10_address(rl);
-            srcval = fetch_data_long(srcoffset);
-            DECODE_PRINTF("\n");
-            TRACE_AND_STEP();
-            *destreg = adc_long(*destreg, srcval);
-        } else {
-            u16 *destreg;
-            u16 srcval;
+	    destreg = DECODE_RM_LONG_REGISTER(rh);
+	    DECODE_PRINTF(",");
+	    srcoffset = decode_rm10_address(rl);
+	    srcval = fetch_data_long(srcoffset);
+	    DECODE_PRINTF("\n");
+	    TRACE_AND_STEP();
+	    *destreg = adc_long(*destreg, srcval);
+	} else {
+	    u16 *destreg;
+	    u16 srcval;
 
-            destreg = DECODE_RM_WORD_REGISTER(rh);
-            DECODE_PRINTF(",");
-            srcoffset = decode_rm10_address(rl);
-            srcval = fetch_data_word(srcoffset);
-            DECODE_PRINTF("\n");
-            TRACE_AND_STEP();
-            *destreg = adc_word(*destreg, srcval);
-        }
-        break;
+	    destreg = DECODE_RM_WORD_REGISTER(rh);
+	    DECODE_PRINTF(",");
+	    srcoffset = decode_rm10_address(rl);
+	    srcval = fetch_data_word(srcoffset);
+	    DECODE_PRINTF("\n");
+	    TRACE_AND_STEP();
+	    *destreg = adc_word(*destreg, srcval);
+	}
+	break;
     case 3:                     /* register to register */
-        if (M.x86.mode & SYSMODE_PREFIX_DATA) {
-            u32 *destreg,*srcreg;
+	if (M.x86.mode & SYSMODE_PREFIX_DATA) {
+	    u32 *destreg,*srcreg;
 
-            destreg = DECODE_RM_LONG_REGISTER(rh);
-            DECODE_PRINTF(",");
-            srcreg = DECODE_RM_LONG_REGISTER(rl);
-            DECODE_PRINTF("\n");
-            TRACE_AND_STEP();
-            *destreg = adc_long(*destreg, *srcreg);
-        } else {
-            u16 *destreg,*srcreg;
+	    destreg = DECODE_RM_LONG_REGISTER(rh);
+	    DECODE_PRINTF(",");
+	    srcreg = DECODE_RM_LONG_REGISTER(rl);
+	    DECODE_PRINTF("\n");
+	    TRACE_AND_STEP();
+	    *destreg = adc_long(*destreg, *srcreg);
+	} else {
+	    u16 *destreg,*srcreg;
 
-            destreg = DECODE_RM_WORD_REGISTER(rh);
-            DECODE_PRINTF(",");
-            srcreg = DECODE_RM_WORD_REGISTER(rl);
-            DECODE_PRINTF("\n");
-            TRACE_AND_STEP();
-            *destreg = adc_word(*destreg, *srcreg);
-        }
-        break;
+	    destreg = DECODE_RM_WORD_REGISTER(rh);
+	    DECODE_PRINTF(",");
+	    srcreg = DECODE_RM_WORD_REGISTER(rl);
+	    DECODE_PRINTF("\n");
+	    TRACE_AND_STEP();
+	    *destreg = adc_word(*destreg, *srcreg);
+	}
+	break;
     }
     DECODE_CLEAR_SEGOVR();
     END_OF_INSTR();
@@ -1305,18 +1305,18 @@
 
     START_OF_INSTR();
     if (M.x86.mode & SYSMODE_PREFIX_DATA) {
-        DECODE_PRINTF("ADC\tEAX,");
-        srcval = fetch_long_imm();
+	DECODE_PRINTF("ADC\tEAX,");
+	srcval = fetch_long_imm();
     } else {
-        DECODE_PRINTF("ADC\tAX,");
-        srcval = fetch_word_imm();
+	DECODE_PRINTF("ADC\tAX,");
+	srcval = fetch_word_imm();
     }
     DECODE_PRINTF2("%x\n", srcval);
     TRACE_AND_STEP();
     if (M.x86.mode & SYSMODE_PREFIX_DATA) {
-        M.x86.R_EAX = adc_long(M.x86.R_EAX, srcval);
+	M.x86.R_EAX = adc_long(M.x86.R_EAX, srcval);
     } else {
-        M.x86.R_AX = adc_word(M.x86.R_AX, (u16)srcval);
+	M.x86.R_AX = adc_word(M.x86.R_AX, (u16)srcval);
     }
     DECODE_CLEAR_SEGOVR();
     END_OF_INSTR();
@@ -1366,43 +1366,43 @@
     FETCH_DECODE_MODRM(mod, rh, rl);
     switch (mod) {
     case 0:
-        destoffset = decode_rm00_address(rl);
-        DECODE_PRINTF(",");
-        destval = fetch_data_byte(destoffset);
-        srcreg = DECODE_RM_BYTE_REGISTER(rh);
-        DECODE_PRINTF("\n");
-        TRACE_AND_STEP();
-        destval = sbb_byte(destval, *srcreg);
-        store_data_byte(destoffset, destval);
-        break;
+	destoffset = decode_rm00_address(rl);
+	DECODE_PRINTF(",");
+	destval = fetch_data_byte(destoffset);
+	srcreg = DECODE_RM_BYTE_REGISTER(rh);
+	DECODE_PRINTF("\n");
+	TRACE_AND_STEP();
+	destval = sbb_byte(destval, *srcreg);
+	store_data_byte(destoffset, destval);
+	break;
     case 1:
-        destoffset = decode_rm01_address(rl);
-        DECODE_PRINTF(",");
-        destval = fetch_data_byte(destoffset);
-        srcreg = DECODE_RM_BYTE_REGISTER(rh);
-        DECODE_PRINTF("\n");
-        TRACE_AND_STEP();
-        destval = sbb_byte(destval, *srcreg);
-        store_data_byte(destoffset, destval);
-        break;
+	destoffset = decode_rm01_address(rl);
+	DECODE_PRINTF(",");
+	destval = fetch_data_byte(destoffset);
+	srcreg = DECODE_RM_BYTE_REGISTER(rh);
+	DECODE_PRINTF("\n");
+	TRACE_AND_STEP();
+	destval = sbb_byte(destval, *srcreg);
+	store_data_byte(destoffset, destval);
+	break;
     case 2:
-        destoffset = decode_rm10_address(rl);
-        DECODE_PRINTF(",");
-        destval = fetch_data_byte(destoffset);
-        srcreg = DECODE_RM_BYTE_REGISTER(rh);
-        DECODE_PRINTF("\n");
-        TRACE_AND_STEP();
-        destval = sbb_byte(destval, *srcreg);
-        store_data_byte(destoffset, destval);
-        break;
+	destoffset = decode_rm10_address(rl);
+	DECODE_PRINTF(",");
+	destval = fetch_data_byte(destoffset);
+	srcreg = DECODE_RM_BYTE_REGISTER(rh);
+	DECODE_PRINTF("\n");
+	TRACE_AND_STEP();
+	destval = sbb_byte(destval, *srcreg);
+	store_data_byte(destoffset, destval);
+	break;
     case 3:                     /* register to register */
-        destreg = DECODE_RM_BYTE_REGISTER(rl);
-        DECODE_PRINTF(",");
-        srcreg = DECODE_RM_BYTE_REGISTER(rh);
-        DECODE_PRINTF("\n");
-        TRACE_AND_STEP();
-        *destreg = sbb_byte(*destreg, *srcreg);
-        break;
+	destreg = DECODE_RM_BYTE_REGISTER(rl);
+	DECODE_PRINTF(",");
+	srcreg = DECODE_RM_BYTE_REGISTER(rh);
+	DECODE_PRINTF("\n");
+	TRACE_AND_STEP();
+	*destreg = sbb_byte(*destreg, *srcreg);
+	break;
     }
     DECODE_CLEAR_SEGOVR();
     END_OF_INSTR();
@@ -1422,107 +1422,107 @@
     FETCH_DECODE_MODRM(mod, rh, rl);
     switch (mod) {
     case 0:
-        if (M.x86.mode & SYSMODE_PREFIX_DATA) {
-            u32 destval;
-            u32 *srcreg;
+	if (M.x86.mode & SYSMODE_PREFIX_DATA) {
+	    u32 destval;
+	    u32 *srcreg;
 
-            destoffset = decode_rm00_address(rl);
-            DECODE_PRINTF(",");
-            destval = fetch_data_long(destoffset);
-            srcreg = DECODE_RM_LONG_REGISTER(rh);
-            DECODE_PRINTF("\n");
-            TRACE_AND_STEP();
-            destval = sbb_long(destval, *srcreg);
-            store_data_long(destoffset, destval);
-        } else {
-            u16 destval;
-            u16 *srcreg;
+	    destoffset = decode_rm00_address(rl);
+	    DECODE_PRINTF(",");
+	    destval = fetch_data_long(destoffset);
+	    srcreg = DECODE_RM_LONG_REGISTER(rh);
+	    DECODE_PRINTF("\n");
+	    TRACE_AND_STEP();
+	    destval = sbb_long(destval, *srcreg);
+	    store_data_long(destoffset, destval);
+	} else {
+	    u16 destval;
+	    u16 *srcreg;
 
-            destoffset = decode_rm00_address(rl);
-            DECODE_PRINTF(",");
-            destval = fetch_data_word(destoffset);
-            srcreg = DECODE_RM_WORD_REGISTER(rh);
-            DECODE_PRINTF("\n");
-            TRACE_AND_STEP();
-            destval = sbb_word(destval, *srcreg);
-            store_data_word(destoffset, destval);
-        }
-        break;
+	    destoffset = decode_rm00_address(rl);
+	    DECODE_PRINTF(",");
+	    destval = fetch_data_word(destoffset);
+	    srcreg = DECODE_RM_WORD_REGISTER(rh);
+	    DECODE_PRINTF("\n");
+	    TRACE_AND_STEP();
+	    destval = sbb_word(destval, *srcreg);
+	    store_data_word(destoffset, destval);
+	}
+	break;
     case 1:
-        if (M.x86.mode & SYSMODE_PREFIX_DATA) {
-            u32 destval;
-            u32 *srcreg;
+	if (M.x86.mode & SYSMODE_PREFIX_DATA) {
+	    u32 destval;
+	    u32 *srcreg;
 
-            destoffset = decode_rm01_address(rl);
-            DECODE_PRINTF(",");
-            destval = fetch_data_long(destoffset);
-            srcreg = DECODE_RM_LONG_REGISTER(rh);
-            DECODE_PRINTF("\n");
-            TRACE_AND_STEP();
-            destval = sbb_long(destval, *srcreg);
-            store_data_long(destoffset, destval);
-        } else {
-            u16 destval;
-            u16 *srcreg;
+	    destoffset = decode_rm01_address(rl);
+	    DECODE_PRINTF(",");
+	    destval = fetch_data_long(destoffset);
+	    srcreg = DECODE_RM_LONG_REGISTER(rh);
+	    DECODE_PRINTF("\n");
+	    TRACE_AND_STEP();
+	    destval = sbb_long(destval, *srcreg);
+	    store_data_long(destoffset, destval);
+	} else {
+	    u16 destval;
+	    u16 *srcreg;
 
-            destoffset = decode_rm01_address(rl);
-            DECODE_PRINTF(",");
-            destval = fetch_data_word(destoffset);
-            srcreg = DECODE_RM_WORD_REGISTER(rh);
-            DECODE_PRINTF("\n");
-            TRACE_AND_STEP();
-            destval = sbb_word(destval, *srcreg);
-            store_data_word(destoffset, destval);
-        }
-        break;
+	    destoffset = decode_rm01_address(rl);
+	    DECODE_PRINTF(",");
+	    destval = fetch_data_word(destoffset);
+	    srcreg = DECODE_RM_WORD_REGISTER(rh);
+	    DECODE_PRINTF("\n");
+	    TRACE_AND_STEP();
+	    destval = sbb_word(destval, *srcreg);
+	    store_data_word(destoffset, destval);
+	}
+	break;
     case 2:
-        if (M.x86.mode & SYSMODE_PREFIX_DATA) {
-            u32 destval;
-            u32 *srcreg;
+	if (M.x86.mode & SYSMODE_PREFIX_DATA) {
+	    u32 destval;
+	    u32 *srcreg;
 
-            destoffset = decode_rm10_address(rl);
-            DECODE_PRINTF(",");
-            destval = fetch_data_long(destoffset);
-            srcreg = DECODE_RM_LONG_REGISTER(rh);
-            DECODE_PRINTF("\n");
-            TRACE_AND_STEP();
-            destval = sbb_long(destval, *srcreg);
-            store_data_long(destoffset, destval);
-        } else {
-            u16 destval;
-            u16 *srcreg;
+	    destoffset = decode_rm10_address(rl);
+	    DECODE_PRINTF(",");
+	    destval = fetch_data_long(destoffset);
+	    srcreg = DECODE_RM_LONG_REGISTER(rh);
+	    DECODE_PRINTF("\n");
+	    TRACE_AND_STEP();
+	    destval = sbb_long(destval, *srcreg);
+	    store_data_long(destoffset, destval);
+	} else {
+	    u16 destval;
+	    u16 *srcreg;
 
-            destoffset = decode_rm10_address(rl);
-            DECODE_PRINTF(",");
-            destval = fetch_data_word(destoffset);
-            srcreg = DECODE_RM_WORD_REGISTER(rh);
-            DECODE_PRINTF("\n");
-            TRACE_AND_STEP();
-            destval = sbb_word(destval, *srcreg);
-            store_data_word(destoffset, destval);
-        }
-        break;
+	    destoffset = decode_rm10_address(rl);
+	    DECODE_PRINTF(",");
+	    destval = fetch_data_word(destoffset);
+	    srcreg = DECODE_RM_WORD_REGISTER(rh);
+	    DECODE_PRINTF("\n");
+	    TRACE_AND_STEP();
+	    destval = sbb_word(destval, *srcreg);
+	    store_data_word(destoffset, destval);
+	}
+	break;
     case 3:                     /* register to register */
-        if (M.x86.mode & SYSMODE_PREFIX_DATA) {
-            u32 *destreg,*srcreg;
+	if (M.x86.mode & SYSMODE_PREFIX_DATA) {
+	    u32 *destreg,*srcreg;
 
-            destreg = DECODE_RM_LONG_REGISTER(rl);
-            DECODE_PRINTF(",");
-            srcreg = DECODE_RM_LONG_REGISTER(rh);
-            DECODE_PRINTF("\n");
-            TRACE_AND_STEP();
-            *destreg = sbb_long(*destreg, *srcreg);
-        } else {
-            u16 *destreg,*srcreg;
+	    destreg = DECODE_RM_LONG_REGISTER(rl);
+	    DECODE_PRINTF(",");
+	    srcreg = DECODE_RM_LONG_REGISTER(rh);
+	    DECODE_PRINTF("\n");
+	    TRACE_AND_STEP();
+	    *destreg = sbb_long(*destreg, *srcreg);
+	} else {
+	    u16 *destreg,*srcreg;
 
-            destreg = DECODE_RM_WORD_REGISTER(rl);
-            DECODE_PRINTF(",");
-            srcreg = DECODE_RM_WORD_REGISTER(rh);
-            DECODE_PRINTF("\n");
-            TRACE_AND_STEP();
-            *destreg = sbb_word(*destreg, *srcreg);
-        }
-        break;
+	    destreg = DECODE_RM_WORD_REGISTER(rl);
+	    DECODE_PRINTF(",");
+	    srcreg = DECODE_RM_WORD_REGISTER(rh);
+	    DECODE_PRINTF("\n");
+	    TRACE_AND_STEP();
+	    *destreg = sbb_word(*destreg, *srcreg);
+	}
+	break;
     }
     DECODE_CLEAR_SEGOVR();
     END_OF_INSTR();
@@ -1544,40 +1544,40 @@
     FETCH_DECODE_MODRM(mod, rh, rl);
     switch (mod) {
     case 0:
-        destreg = DECODE_RM_BYTE_REGISTER(rh);
-        DECODE_PRINTF(",");
-        srcoffset = decode_rm00_address(rl);
-        srcval = fetch_data_byte(srcoffset);
-        DECODE_PRINTF("\n");
-        TRACE_AND_STEP();
-        *destreg = sbb_byte(*destreg, srcval);
-        break;
+	destreg = DECODE_RM_BYTE_REGISTER(rh);
+	DECODE_PRINTF(",");
+	srcoffset = decode_rm00_address(rl);
+	srcval = fetch_data_byte(srcoffset);
+	DECODE_PRINTF("\n");
+	TRACE_AND_STEP();
+	*destreg = sbb_byte(*destreg, srcval);
+	break;
     case 1:
-        destreg = DECODE_RM_BYTE_REGISTER(rh);
-        DECODE_PRINTF(",");
-        srcoffset = decode_rm01_address(rl);
-        srcval = fetch_data_byte(srcoffset);
-        DECODE_PRINTF("\n");
-        TRACE_AND_STEP();
-        *destreg = sbb_byte(*destreg, srcval);
-        break;
+	destreg = DECODE_RM_BYTE_REGISTER(rh);
+	DECODE_PRINTF(",");
+	srcoffset = decode_rm01_address(rl);
+	srcval = fetch_data_byte(srcoffset);
+	DECODE_PRINTF("\n");
+	TRACE_AND_STEP();
+	*destreg = sbb_byte(*destreg, srcval);
+	break;
     case 2:
-        destreg = DECODE_RM_BYTE_REGISTER(rh);
-        DECODE_PRINTF(",");
-        srcoffset = decode_rm10_address(rl);
-        srcval = fetch_data_byte(srcoffset);
-        DECODE_PRINTF("\n");
-        TRACE_AND_STEP();
-        *destreg = sbb_byte(*destreg, srcval);
-        break;
+	destreg = DECODE_RM_BYTE_REGISTER(rh);
+	DECODE_PRINTF(",");
+	srcoffset = decode_rm10_address(rl);
+	srcval = fetch_data_byte(srcoffset);
+	DECODE_PRINTF("\n");
+	TRACE_AND_STEP();
+	*destreg = sbb_byte(*destreg, srcval);
+	break;
     case 3:                     /* register to register */
-        destreg = DECODE_RM_BYTE_REGISTER(rh);
-        DECODE_PRINTF(",");
-        srcreg = DECODE_RM_BYTE_REGISTER(rl);
-        DECODE_PRINTF("\n");
-        TRACE_AND_STEP();
-        *destreg = sbb_byte(*destreg, *srcreg);
-        break;
+	destreg = DECODE_RM_BYTE_REGISTER(rh);
+	DECODE_PRINTF(",");
+	srcreg = DECODE_RM_BYTE_REGISTER(rl);
+	DECODE_PRINTF("\n");
+	TRACE_AND_STEP();
+	*destreg = sbb_byte(*destreg, *srcreg);
+	break;
     }
     DECODE_CLEAR_SEGOVR();
     END_OF_INSTR();
@@ -1597,101 +1597,101 @@
     FETCH_DECODE_MODRM(mod, rh, rl);
     switch (mod) {
     case 0:
-        if (M.x86.mode & SYSMODE_PREFIX_DATA) {
-            u32 *destreg;
-            u32 srcval;
+	if (M.x86.mode & SYSMODE_PREFIX_DATA) {
+	    u32 *destreg;
+	    u32 srcval;
 
-            destreg = DECODE_RM_LONG_REGISTER(rh);
-            DECODE_PRINTF(",");
-            srcoffset = decode_rm00_address(rl);
-            srcval = fetch_data_long(srcoffset);
-            DECODE_PRINTF("\n");
-            TRACE_AND_STEP();
-            *destreg = sbb_long(*destreg, srcval);
-        } else {
-            u16 *destreg;
-            u16 srcval;
+	    destreg = DECODE_RM_LONG_REGISTER(rh);
+	    DECODE_PRINTF(",");
+	    srcoffset = decode_rm00_address(rl);
+	    srcval = fetch_data_long(srcoffset);
+	    DECODE_PRINTF("\n");
+	    TRACE_AND_STEP();
+	    *destreg = sbb_long(*destreg, srcval);
+	} else {
+	    u16 *destreg;
+	    u16 srcval;
 
-            destreg = DECODE_RM_WORD_REGISTER(rh);
-            DECODE_PRINTF(",");
-            srcoffset = decode_rm00_address(rl);
-            srcval = fetch_data_word(srcoffset);
-            DECODE_PRINTF("\n");
-            TRACE_AND_STEP();
-            *destreg = sbb_word(*destreg, srcval);
-        }
-        break;
+	    destreg = DECODE_RM_WORD_REGISTER(rh);
+	    DECODE_PRINTF(",");
+	    srcoffset = decode_rm00_address(rl);
+	    srcval = fetch_data_word(srcoffset);
+	    DECODE_PRINTF("\n");
+	    TRACE_AND_STEP();
+	    *destreg = sbb_word(*destreg, srcval);
+	}
+	break;
     case 1:
-        if (M.x86.mode & SYSMODE_PREFIX_DATA) {
-            u32 *destreg;
-            u32 srcval;
+	if (M.x86.mode & SYSMODE_PREFIX_DATA) {
+	    u32 *destreg;
+	    u32 srcval;
 
-            destreg = DECODE_RM_LONG_REGISTER(rh);
-            DECODE_PRINTF(",");
-            srcoffset = decode_rm01_address(rl);
-            srcval = fetch_data_long(srcoffset);
-            DECODE_PRINTF("\n");
-            TRACE_AND_STEP();
-            *destreg = sbb_long(*destreg, srcval);
-        } else {
-            u16 *destreg;
-            u16 srcval;
+	    destreg = DECODE_RM_LONG_REGISTER(rh);
+	    DECODE_PRINTF(",");
+	    srcoffset = decode_rm01_address(rl);
+	    srcval = fetch_data_long(srcoffset);
+	    DECODE_PRINTF("\n");
+	    TRACE_AND_STEP();
+	    *destreg = sbb_long(*destreg, srcval);
+	} else {
+	    u16 *destreg;
+	    u16 srcval;
 
-            destreg = DECODE_RM_WORD_REGISTER(rh);
-            DECODE_PRINTF(",");
-            srcoffset = decode_rm01_address(rl);
-            srcval = fetch_data_word(srcoffset);
-            DECODE_PRINTF("\n");
-            TRACE_AND_STEP();
-            *destreg = sbb_word(*destreg, srcval);
-        }
-        break;
+	    destreg = DECODE_RM_WORD_REGISTER(rh);
+	    DECODE_PRINTF(",");
+	    srcoffset = decode_rm01_address(rl);
+	    srcval = fetch_data_word(srcoffset);
+	    DECODE_PRINTF("\n");
+	    TRACE_AND_STEP();
+	    *destreg = sbb_word(*destreg, srcval);
+	}
+	break;
     case 2:
-        if (M.x86.mode & SYSMODE_PREFIX_DATA) {
-            u32 *destreg;
-            u32 srcval;
+	if (M.x86.mode & SYSMODE_PREFIX_DATA) {
+	    u32 *destreg;
+	    u32 srcval;
 
-            destreg = DECODE_RM_LONG_REGISTER(rh);
-            DECODE_PRINTF(",");
-            srcoffset = decode_rm10_address(rl);
-            srcval = fetch_data_long(srcoffset);
-            DECODE_PRINTF("\n");
-            TRACE_AND_STEP();
-            *destreg = sbb_long(*destreg, srcval);
-        } else {
-            u16 *destreg;
-            u16 srcval;
+	    destreg = DECODE_RM_LONG_REGISTER(rh);
+	    DECODE_PRINTF(",");
+	    srcoffset = decode_rm10_address(rl);
+	    srcval = fetch_data_long(srcoffset);
+	    DECODE_PRINTF("\n");
+	    TRACE_AND_STEP();
+	    *destreg = sbb_long(*destreg, srcval);
+	} else {
+	    u16 *destreg;
+	    u16 srcval;
 
-            destreg = DECODE_RM_WORD_REGISTER(rh);
-            DECODE_PRINTF(",");
-            srcoffset = decode_rm10_address(rl);
-            srcval = fetch_data_word(srcoffset);
-            DECODE_PRINTF("\n");
-            TRACE_AND_STEP();
-            *destreg = sbb_word(*destreg, srcval);
-        }
-        break;
+	    destreg = DECODE_RM_WORD_REGISTER(rh);
+	    DECODE_PRINTF(",");
+	    srcoffset = decode_rm10_address(rl);
+	    srcval = fetch_data_word(srcoffset);
+	    DECODE_PRINTF("\n");
+	    TRACE_AND_STEP();
+	    *destreg = sbb_word(*destreg, srcval);
+	}
+	break;
     case 3:                     /* register to register */
-        if (M.x86.mode & SYSMODE_PREFIX_DATA) {
-            u32 *destreg,*srcreg;
+	if (M.x86.mode & SYSMODE_PREFIX_DATA) {
+	    u32 *destreg,*srcreg;
 
-            destreg = DECODE_RM_LONG_REGISTER(rh);
-            DECODE_PRINTF(",");
-            srcreg = DECODE_RM_LONG_REGISTER(rl);
-            DECODE_PRINTF("\n");
-            TRACE_AND_STEP();
-            *destreg = sbb_long(*destreg, *srcreg);
-        } else {
-            u16 *destreg,*srcreg;
+	    destreg = DECODE_RM_LONG_REGISTER(rh);
+	    DECODE_PRINTF(",");
+	    srcreg = DECODE_RM_LONG_REGISTER(rl);
+	    DECODE_PRINTF("\n");
+	    TRACE_AND_STEP();
+	    *destreg = sbb_long(*destreg, *srcreg);
+	} else {
+	    u16 *destreg,*srcreg;
 
-            destreg = DECODE_RM_WORD_REGISTER(rh);
-            DECODE_PRINTF(",");
-            srcreg = DECODE_RM_WORD_REGISTER(rl);
-            DECODE_PRINTF("\n");
-            TRACE_AND_STEP();
-            *destreg = sbb_word(*destreg, *srcreg);
-        }
-        break;
+	    destreg = DECODE_RM_WORD_REGISTER(rh);
+	    DECODE_PRINTF(",");
+	    srcreg = DECODE_RM_WORD_REGISTER(rl);
+	    DECODE_PRINTF("\n");
+	    TRACE_AND_STEP();
+	    *destreg = sbb_word(*destreg, *srcreg);
+	}
+	break;
     }
     DECODE_CLEAR_SEGOVR();
     END_OF_INSTR();
@@ -1725,18 +1725,18 @@
 
     START_OF_INSTR();
     if (M.x86.mode & SYSMODE_PREFIX_DATA) {
-        DECODE_PRINTF("SBB\tEAX,");
-        srcval = fetch_long_imm();
+	DECODE_PRINTF("SBB\tEAX,");
+	srcval = fetch_long_imm();
     } else {
-        DECODE_PRINTF("SBB\tAX,");
-        srcval = fetch_word_imm();
+	DECODE_PRINTF("SBB\tAX,");
+	srcval = fetch_word_imm();
     }
     DECODE_PRINTF2("%x\n", srcval);
     TRACE_AND_STEP();
     if (M.x86.mode & SYSMODE_PREFIX_DATA) {
-        M.x86.R_EAX = sbb_long(M.x86.R_EAX, srcval);
+	M.x86.R_EAX = sbb_long(M.x86.R_EAX, srcval);
     } else {
-        M.x86.R_AX = sbb_word(M.x86.R_AX, (u16)srcval);
+	M.x86.R_AX = sbb_word(M.x86.R_AX, (u16)srcval);
     }
     DECODE_CLEAR_SEGOVR();
     END_OF_INSTR();
@@ -1787,46 +1787,46 @@
 
     switch (mod) {
     case 0:
-        destoffset = decode_rm00_address(rl);
-        DECODE_PRINTF(",");
-        destval = fetch_data_byte(destoffset);
-        srcreg = DECODE_RM_BYTE_REGISTER(rh);
-        DECODE_PRINTF("\n");
-        TRACE_AND_STEP();
-        destval = and_byte(destval, *srcreg);
-        store_data_byte(destoffset, destval);
-        break;
+	destoffset = decode_rm00_address(rl);
+	DECODE_PRINTF(",");
+	destval = fetch_data_byte(destoffset);
+	srcreg = DECODE_RM_BYTE_REGISTER(rh);
+	DECODE_PRINTF("\n");
+	TRACE_AND_STEP();
+	destval = and_byte(destval, *srcreg);
+	store_data_byte(destoffset, destval);
+	break;
 
     case 1:
-        destoffset = decode_rm01_address(rl);
-        DECODE_PRINTF(",");
-        destval = fetch_data_byte(destoffset);
-        srcreg = DECODE_RM_BYTE_REGISTER(rh);
-        DECODE_PRINTF("\n");
-        TRACE_AND_STEP();
-        destval = and_byte(destval, *srcreg);
-        store_data_byte(destoffset, destval);
-        break;
+	destoffset = decode_rm01_address(rl);
+	DECODE_PRINTF(",");
+	destval = fetch_data_byte(destoffset);
+	srcreg = DECODE_RM_BYTE_REGISTER(rh);
+	DECODE_PRINTF("\n");
+	TRACE_AND_STEP();
+	destval = and_byte(destval, *srcreg);
+	store_data_byte(destoffset, destval);
+	break;
 
     case 2:
-        destoffset = decode_rm10_address(rl);
-        DECODE_PRINTF(",");
-        destval = fetch_data_byte(destoffset);
-        srcreg = DECODE_RM_BYTE_REGISTER(rh);
-        DECODE_PRINTF("\n");
-        TRACE_AND_STEP();
-        destval = and_byte(destval, *srcreg);
-        store_data_byte(destoffset, destval);
-        break;
+	destoffset = decode_rm10_address(rl);
+	DECODE_PRINTF(",");
+	destval = fetch_data_byte(destoffset);
+	srcreg = DECODE_RM_BYTE_REGISTER(rh);
+	DECODE_PRINTF("\n");
+	TRACE_AND_STEP();
+	destval = and_byte(destval, *srcreg);
+	store_data_byte(destoffset, destval);
+	break;
 
     case 3:                     /* register to register */
-        destreg = DECODE_RM_BYTE_REGISTER(rl);
-        DECODE_PRINTF(",");
-        srcreg = DECODE_RM_BYTE_REGISTER(rh);
-        DECODE_PRINTF("\n");
-        TRACE_AND_STEP();
-        *destreg = and_byte(*destreg, *srcreg);
-        break;
+	destreg = DECODE_RM_BYTE_REGISTER(rl);
+	DECODE_PRINTF(",");
+	srcreg = DECODE_RM_BYTE_REGISTER(rh);
+	DECODE_PRINTF("\n");
+	TRACE_AND_STEP();
+	*destreg = and_byte(*destreg, *srcreg);
+	break;
     }
     DECODE_CLEAR_SEGOVR();
     END_OF_INSTR();
@@ -1846,107 +1846,107 @@
     FETCH_DECODE_MODRM(mod, rh, rl);
     switch (mod) {
     case 0:
-        if (M.x86.mode & SYSMODE_PREFIX_DATA) {
-            u32 destval;
-            u32 *srcreg;
+	if (M.x86.mode & SYSMODE_PREFIX_DATA) {
+	    u32 destval;
+	    u32 *srcreg;
 
-            destoffset = decode_rm00_address(rl);
-            DECODE_PRINTF(",");
-            destval = fetch_data_long(destoffset);
-            srcreg = DECODE_RM_LONG_REGISTER(rh);
-            DECODE_PRINTF("\n");
-            TRACE_AND_STEP();
-            destval = and_long(destval, *srcreg);
-            store_data_long(destoffset, destval);
-        } else {
-            u16 destval;
-            u16 *srcreg;
+	    destoffset = decode_rm00_address(rl);
+	    DECODE_PRINTF(",");
+	    destval = fetch_data_long(destoffset);
+	    srcreg = DECODE_RM_LONG_REGISTER(rh);
+	    DECODE_PRINTF("\n");
+	    TRACE_AND_STEP();
+	    destval = and_long(destval, *srcreg);
+	    store_data_long(destoffset, destval);
+	} else {
+	    u16 destval;
+	    u16 *srcreg;
 
-            destoffset = decode_rm00_address(rl);
-            DECODE_PRINTF(",");
-            destval = fetch_data_word(destoffset);
-            srcreg = DECODE_RM_WORD_REGISTER(rh);
-            DECODE_PRINTF("\n");
-            TRACE_AND_STEP();
-            destval = and_word(destval, *srcreg);
-            store_data_word(destoffset, destval);
-        }
-        break;
+	    destoffset = decode_rm00_address(rl);
+	    DECODE_PRINTF(",");
+	    destval = fetch_data_word(destoffset);
+	    srcreg = DECODE_RM_WORD_REGISTER(rh);
+	    DECODE_PRINTF("\n");
+	    TRACE_AND_STEP();
+	    destval = and_word(destval, *srcreg);
+	    store_data_word(destoffset, destval);
+	}
+	break;
     case 1:
-        if (M.x86.mode & SYSMODE_PREFIX_DATA) {
-            u32 destval;
-            u32 *srcreg;
+	if (M.x86.mode & SYSMODE_PREFIX_DATA) {
+	    u32 destval;
+	    u32 *srcreg;
 
-            destoffset = decode_rm01_address(rl);
-            DECODE_PRINTF(",");
-            destval = fetch_data_long(destoffset);
-            srcreg = DECODE_RM_LONG_REGISTER(rh);
-            DECODE_PRINTF("\n");
-            TRACE_AND_STEP();
-            destval = and_long(destval, *srcreg);
-            store_data_long(destoffset, destval);
-        } else {
-            u16 destval;
-            u16 *srcreg;
+	    destoffset = decode_rm01_address(rl);
+	    DECODE_PRINTF(",");
+	    destval = fetch_data_long(destoffset);
+	    srcreg = DECODE_RM_LONG_REGISTER(rh);
+	    DECODE_PRINTF("\n");
+	    TRACE_AND_STEP();
+	    destval = and_long(destval, *srcreg);
+	    store_data_long(destoffset, destval);
+	} else {
+	    u16 destval;
+	    u16 *srcreg;
 
-            destoffset = decode_rm01_address(rl);
-            DECODE_PRINTF(",");
-            destval = fetch_data_word(destoffset);
-            srcreg = DECODE_RM_WORD_REGISTER(rh);
-            DECODE_PRINTF("\n");
-            TRACE_AND_STEP();
-            destval = and_word(destval, *srcreg);
-            store_data_word(destoffset, destval);
-        }
-        break;
+	    destoffset = decode_rm01_address(rl);
+	    DECODE_PRINTF(",");
+	    destval = fetch_data_word(destoffset);
+	    srcreg = DECODE_RM_WORD_REGISTER(rh);
+	    DECODE_PRINTF("\n");
+	    TRACE_AND_STEP();
+	    destval = and_word(destval, *srcreg);
+	    store_data_word(destoffset, destval);
+	}
+	break;
     case 2:
-        if (M.x86.mode & SYSMODE_PREFIX_DATA) {
-            u32 destval;
-            u32 *srcreg;
+	if (M.x86.mode & SYSMODE_PREFIX_DATA) {
+	    u32 destval;
+	    u32 *srcreg;
 
-            destoffset = decode_rm10_address(rl);
-            DECODE_PRINTF(",");
-            destval = fetch_data_long(destoffset);
-            srcreg = DECODE_RM_LONG_REGISTER(rh);
-            DECODE_PRINTF("\n");
-            TRACE_AND_STEP();
-            destval = and_long(destval, *srcreg);
-            store_data_long(destoffset, destval);
-        } else {
-            u16 destval;
-            u16 *srcreg;
+	    destoffset = decode_rm10_address(rl);
+	    DECODE_PRINTF(",");
+	    destval = fetch_data_long(destoffset);
+	    srcreg = DECODE_RM_LONG_REGISTER(rh);
+	    DECODE_PRINTF("\n");
+	    TRACE_AND_STEP();
+	    destval = and_long(destval, *srcreg);
+	    store_data_long(destoffset, destval);
+	} else {
+	    u16 destval;
+	    u16 *srcreg;
 
-            destoffset = decode_rm10_address(rl);
-            DECODE_PRINTF(",");
-            destval = fetch_data_word(destoffset);
-            srcreg = DECODE_RM_WORD_REGISTER(rh);
-            DECODE_PRINTF("\n");
-            TRACE_AND_STEP();
-            destval = and_word(destval, *srcreg);
-            store_data_word(destoffset, destval);
-        }
-        break;
+	    destoffset = decode_rm10_address(rl);
+	    DECODE_PRINTF(",");
+	    destval = fetch_data_word(destoffset);
+	    srcreg = DECODE_RM_WORD_REGISTER(rh);
+	    DECODE_PRINTF("\n");
+	    TRACE_AND_STEP();
+	    destval = and_word(destval, *srcreg);
+	    store_data_word(destoffset, destval);
+	}
+	break;
     case 3:                     /* register to register */
-        if (M.x86.mode & SYSMODE_PREFIX_DATA) {
-            u32 *destreg,*srcreg;
+	if (M.x86.mode & SYSMODE_PREFIX_DATA) {
+	    u32 *destreg,*srcreg;
 
-            destreg = DECODE_RM_LONG_REGISTER(rl);
-            DECODE_PRINTF(",");
-            srcreg = DECODE_RM_LONG_REGISTER(rh);
-            DECODE_PRINTF("\n");
-            TRACE_AND_STEP();
-            *destreg = and_long(*destreg, *srcreg);
-        } else {
-            u16 *destreg,*srcreg;
+	    destreg = DECODE_RM_LONG_REGISTER(rl);
+	    DECODE_PRINTF(",");
+	    srcreg = DECODE_RM_LONG_REGISTER(rh);
+	    DECODE_PRINTF("\n");
+	    TRACE_AND_STEP();
+	    *destreg = and_long(*destreg, *srcreg);
+	} else {
+	    u16 *destreg,*srcreg;
 
-            destreg = DECODE_RM_WORD_REGISTER(rl);
-            DECODE_PRINTF(",");
-            srcreg = DECODE_RM_WORD_REGISTER(rh);
-            DECODE_PRINTF("\n");
-            TRACE_AND_STEP();
-            *destreg = and_word(*destreg, *srcreg);
-        }
-        break;
+	    destreg = DECODE_RM_WORD_REGISTER(rl);
+	    DECODE_PRINTF(",");
+	    srcreg = DECODE_RM_WORD_REGISTER(rh);
+	    DECODE_PRINTF("\n");
+	    TRACE_AND_STEP();
+	    *destreg = and_word(*destreg, *srcreg);
+	}
+	break;
     }
     DECODE_CLEAR_SEGOVR();
     END_OF_INSTR();
@@ -1968,40 +1968,40 @@
     FETCH_DECODE_MODRM(mod, rh, rl);
     switch (mod) {
     case 0:
-        destreg = DECODE_RM_BYTE_REGISTER(rh);
-        DECODE_PRINTF(",");
-        srcoffset = decode_rm00_address(rl);
-        srcval = fetch_data_byte(srcoffset);
-        DECODE_PRINTF("\n");
-        TRACE_AND_STEP();
-        *destreg = and_byte(*destreg, srcval);
-        break;
+	destreg = DECODE_RM_BYTE_REGISTER(rh);
+	DECODE_PRINTF(",");
+	srcoffset = decode_rm00_address(rl);
+	srcval = fetch_data_byte(srcoffset);
+	DECODE_PRINTF("\n");
+	TRACE_AND_STEP();
+	*destreg = and_byte(*destreg, srcval);
+	break;
     case 1:
-        destreg = DECODE_RM_BYTE_REGISTER(rh);
-        DECODE_PRINTF(",");
-        srcoffset = decode_rm01_address(rl);
-        srcval = fetch_data_byte(srcoffset);
-        DECODE_PRINTF("\n");
-        TRACE_AND_STEP();
-        *destreg = and_byte(*destreg, srcval);
-        break;
+	destreg = DECODE_RM_BYTE_REGISTER(rh);
+	DECODE_PRINTF(",");
+	srcoffset = decode_rm01_address(rl);
+	srcval = fetch_data_byte(srcoffset);
+	DECODE_PRINTF("\n");
+	TRACE_AND_STEP();
+	*destreg = and_byte(*destreg, srcval);
+	break;
     case 2:
-        destreg = DECODE_RM_BYTE_REGISTER(rh);
-        DECODE_PRINTF(",");
-        srcoffset = decode_rm10_address(rl);
-        srcval = fetch_data_byte(srcoffset);
-        DECODE_PRINTF("\n");
-        TRACE_AND_STEP();
-        *destreg = and_byte(*destreg, srcval);
-        break;
+	destreg = DECODE_RM_BYTE_REGISTER(rh);
+	DECODE_PRINTF(",");
+	srcoffset = decode_rm10_address(rl);
+	srcval = fetch_data_byte(srcoffset);
+	DECODE_PRINTF("\n");
+	TRACE_AND_STEP();
+	*destreg = and_byte(*destreg, srcval);
+	break;
     case 3:                     /* register to register */
-        destreg = DECODE_RM_BYTE_REGISTER(rh);
-        DECODE_PRINTF(",");
-        srcreg = DECODE_RM_BYTE_REGISTER(rl);
-        DECODE_PRINTF("\n");
-        TRACE_AND_STEP();
-        *destreg = and_byte(*destreg, *srcreg);
-        break;
+	destreg = DECODE_RM_BYTE_REGISTER(rh);
+	DECODE_PRINTF(",");
+	srcreg = DECODE_RM_BYTE_REGISTER(rl);
+	DECODE_PRINTF("\n");
+	TRACE_AND_STEP();
+	*destreg = and_byte(*destreg, *srcreg);
+	break;
     }
     DECODE_CLEAR_SEGOVR();
     END_OF_INSTR();
@@ -2021,102 +2021,102 @@
     FETCH_DECODE_MODRM(mod, rh, rl);
     switch (mod) {
     case 0:
-        if (M.x86.mode & SYSMODE_PREFIX_DATA) {
-            u32 *destreg;
-            u32 srcval;
+	if (M.x86.mode & SYSMODE_PREFIX_DATA) {
+	    u32 *destreg;
+	    u32 srcval;
 
-            destreg = DECODE_RM_LONG_REGISTER(rh);
-            DECODE_PRINTF(",");
-            srcoffset = decode_rm00_address(rl);
-            srcval = fetch_data_long(srcoffset);
-            DECODE_PRINTF("\n");
-            TRACE_AND_STEP();
-            *destreg = and_long(*destreg, srcval);
-        } else {
-            u16 *destreg;
-            u16 srcval;
+	    destreg = DECODE_RM_LONG_REGISTER(rh);
+	    DECODE_PRINTF(",");
+	    srcoffset = decode_rm00_address(rl);
+	    srcval = fetch_data_long(srcoffset);
+	    DECODE_PRINTF("\n");
+	    TRACE_AND_STEP();
+	    *destreg = and_long(*destreg, srcval);
+	} else {
+	    u16 *destreg;
+	    u16 srcval;
 
-            destreg = DECODE_RM_WORD_REGISTER(rh);
-            DECODE_PRINTF(",");
-            srcoffset = decode_rm00_address(rl);
-            srcval = fetch_data_word(srcoffset);
-            DECODE_PRINTF("\n");
-            TRACE_AND_STEP();
-            *destreg = and_word(*destreg, srcval);
-        }
-        break;
+	    destreg = DECODE_RM_WORD_REGISTER(rh);
+	    DECODE_PRINTF(",");
+	    srcoffset = decode_rm00_address(rl);
+	    srcval = fetch_data_word(srcoffset);
+	    DECODE_PRINTF("\n");
+	    TRACE_AND_STEP();
+	    *destreg = and_word(*destreg, srcval);
+	}
+	break;
     case 1:
-        if (M.x86.mode & SYSMODE_PREFIX_DATA) {
-            u32 *destreg;
-            u32 srcval;
+	if (M.x86.mode & SYSMODE_PREFIX_DATA) {
+	    u32 *destreg;
+	    u32 srcval;
 
-            destreg = DECODE_RM_LONG_REGISTER(rh);
-            DECODE_PRINTF(",");
-            srcoffset = decode_rm01_address(rl);
-            srcval = fetch_data_long(srcoffset);
-            DECODE_PRINTF("\n");
-            TRACE_AND_STEP();
-            *destreg = and_long(*destreg, srcval);
-            break;
-        } else {
-            u16 *destreg;
-            u16 srcval;
+	    destreg = DECODE_RM_LONG_REGISTER(rh);
+	    DECODE_PRINTF(",");
+	    srcoffset = decode_rm01_address(rl);
+	    srcval = fetch_data_long(srcoffset);
+	    DECODE_PRINTF("\n");
+	    TRACE_AND_STEP();
+	    *destreg = and_long(*destreg, srcval);
+	    break;
+	} else {
+	    u16 *destreg;
+	    u16 srcval;
 
-            destreg = DECODE_RM_WORD_REGISTER(rh);
-            DECODE_PRINTF(",");
-            srcoffset = decode_rm01_address(rl);
-            srcval = fetch_data_word(srcoffset);
-            DECODE_PRINTF("\n");
-            TRACE_AND_STEP();
-            *destreg = and_word(*destreg, srcval);
-            break;
-        }
+	    destreg = DECODE_RM_WORD_REGISTER(rh);
+	    DECODE_PRINTF(",");
+	    srcoffset = decode_rm01_address(rl);
+	    srcval = fetch_data_word(srcoffset);
+	    DECODE_PRINTF("\n");
+	    TRACE_AND_STEP();
+	    *destreg = and_word(*destreg, srcval);
+	    break;
+	}
     case 2:
-        if (M.x86.mode & SYSMODE_PREFIX_DATA) {
-            u32 *destreg;
-            u32 srcval;
+	if (M.x86.mode & SYSMODE_PREFIX_DATA) {
+	    u32 *destreg;
+	    u32 srcval;
 
-            destreg = DECODE_RM_LONG_REGISTER(rh);
-            DECODE_PRINTF(",");
-            srcoffset = decode_rm10_address(rl);
-            srcval = fetch_data_long(srcoffset);
-            DECODE_PRINTF("\n");
-            TRACE_AND_STEP();
-            *destreg = and_long(*destreg, srcval);
-        } else {
-            u16 *destreg;
-            u16 srcval;
+	    destreg = DECODE_RM_LONG_REGISTER(rh);
+	    DECODE_PRINTF(",");
+	    srcoffset = decode_rm10_address(rl);
+	    srcval = fetch_data_long(srcoffset);
+	    DECODE_PRINTF("\n");
+	    TRACE_AND_STEP();
+	    *destreg = and_long(*destreg, srcval);
+	} else {
+	    u16 *destreg;
+	    u16 srcval;
 
-            destreg = DECODE_RM_WORD_REGISTER(rh);
-            DECODE_PRINTF(",");
-            srcoffset = decode_rm10_address(rl);
-            srcval = fetch_data_word(srcoffset);
-            DECODE_PRINTF("\n");
-            TRACE_AND_STEP();
-            *destreg = and_word(*destreg, srcval);
-        }
-        break;
+	    destreg = DECODE_RM_WORD_REGISTER(rh);
+	    DECODE_PRINTF(",");
+	    srcoffset = decode_rm10_address(rl);
+	    srcval = fetch_data_word(srcoffset);
+	    DECODE_PRINTF("\n");
+	    TRACE_AND_STEP();
+	    *destreg = and_word(*destreg, srcval);
+	}
+	break;
     case 3:                     /* register to register */
-        if (M.x86.mode & SYSMODE_PREFIX_DATA) {
-            u32 *destreg,*srcreg;
+	if (M.x86.mode & SYSMODE_PREFIX_DATA) {
+	    u32 *destreg,*srcreg;
 
-            destreg = DECODE_RM_LONG_REGISTER(rh);
-            DECODE_PRINTF(",");
-            srcreg = DECODE_RM_LONG_REGISTER(rl);
-            DECODE_PRINTF("\n");
-            TRACE_AND_STEP();
-            *destreg = and_long(*destreg, *srcreg);
-        } else {
-            u16 *destreg,*srcreg;
+	    destreg = DECODE_RM_LONG_REGISTER(rh);
+	    DECODE_PRINTF(",");
+	    srcreg = DECODE_RM_LONG_REGISTER(rl);
+	    DECODE_PRINTF("\n");
+	    TRACE_AND_STEP();
+	    *destreg = and_long(*destreg, *srcreg);
+	} else {
+	    u16 *destreg,*srcreg;
 
-            destreg = DECODE_RM_WORD_REGISTER(rh);
-            DECODE_PRINTF(",");
-            srcreg = DECODE_RM_WORD_REGISTER(rl);
-            DECODE_PRINTF("\n");
-            TRACE_AND_STEP();
-            *destreg = and_word(*destreg, *srcreg);
-        }
-        break;
+	    destreg = DECODE_RM_WORD_REGISTER(rh);
+	    DECODE_PRINTF(",");
+	    srcreg = DECODE_RM_WORD_REGISTER(rl);
+	    DECODE_PRINTF("\n");
+	    TRACE_AND_STEP();
+	    *destreg = and_word(*destreg, *srcreg);
+	}
+	break;
     }
     DECODE_CLEAR_SEGOVR();
     END_OF_INSTR();
@@ -2150,18 +2150,18 @@
 
     START_OF_INSTR();
     if (M.x86.mode & SYSMODE_PREFIX_DATA) {
-        DECODE_PRINTF("AND\tEAX,");
-        srcval = fetch_long_imm();
+	DECODE_PRINTF("AND\tEAX,");
+	srcval = fetch_long_imm();
     } else {
-        DECODE_PRINTF("AND\tAX,");
-        srcval = fetch_word_imm();
+	DECODE_PRINTF("AND\tAX,");
+	srcval = fetch_word_imm();
     }
     DECODE_PRINTF2("%x\n", srcval);
     TRACE_AND_STEP();
     if (M.x86.mode & SYSMODE_PREFIX_DATA) {
-        M.x86.R_EAX = and_long(M.x86.R_EAX, srcval);
+	M.x86.R_EAX = and_long(M.x86.R_EAX, srcval);
     } else {
-        M.x86.R_AX = and_word(M.x86.R_AX, (u16)srcval);
+	M.x86.R_AX = and_word(M.x86.R_AX, (u16)srcval);
     }
     DECODE_CLEAR_SEGOVR();
     END_OF_INSTR();
@@ -2214,43 +2214,43 @@
     FETCH_DECODE_MODRM(mod, rh, rl);
     switch (mod) {
     case 0:
-        destoffset = decode_rm00_address(rl);
-        DECODE_PRINTF(",");
-        destval = fetch_data_byte(destoffset);
-        srcreg = DECODE_RM_BYTE_REGISTER(rh);
-        DECODE_PRINTF("\n");
-        TRACE_AND_STEP();
-        destval = sub_byte(destval, *srcreg);
-        store_data_byte(destoffset, destval);
-        break;
+	destoffset = decode_rm00_address(rl);
+	DECODE_PRINTF(",");
+	destval = fetch_data_byte(destoffset);
+	srcreg = DECODE_RM_BYTE_REGISTER(rh);
+	DECODE_PRINTF("\n");
+	TRACE_AND_STEP();
+	destval = sub_byte(destval, *srcreg);
+	store_data_byte(destoffset, destval);
+	break;
     case 1:
-        destoffset = decode_rm01_address(rl);
-        DECODE_PRINTF(",");
-        destval = fetch_data_byte(destoffset);
-        srcreg = DECODE_RM_BYTE_REGISTER(rh);
-        DECODE_PRINTF("\n");
-        TRACE_AND_STEP();
-        destval = sub_byte(destval, *srcreg);
-        store_data_byte(destoffset, destval);
-        break;
+	destoffset = decode_rm01_address(rl);
+	DECODE_PRINTF(",");
+	destval = fetch_data_byte(destoffset);
+	srcreg = DECODE_RM_BYTE_REGISTER(rh);
+	DECODE_PRINTF("\n");
+	TRACE_AND_STEP();
+	destval = sub_byte(destval, *srcreg);
+	store_data_byte(destoffset, destval);
+	break;
     case 2:
-        destoffset = decode_rm10_address(rl);
-        DECODE_PRINTF(",");
-        destval = fetch_data_byte(destoffset);
-        srcreg = DECODE_RM_BYTE_REGISTER(rh);
-        DECODE_PRINTF("\n");
-        TRACE_AND_STEP();
-        destval = sub_byte(destval, *srcreg);
-        store_data_byte(destoffset, destval);
-        break;
+	destoffset = decode_rm10_address(rl);
+	DECODE_PRINTF(",");
+	destval = fetch_data_byte(destoffset);
+	srcreg = DECODE_RM_BYTE_REGISTER(rh);
+	DECODE_PRINTF("\n");
+	TRACE_AND_STEP();
+	destval = sub_byte(destval, *srcreg);
+	store_data_byte(destoffset, destval);
+	break;
     case 3:                     /* register to register */
-        destreg = DECODE_RM_BYTE_REGISTER(rl);
-        DECODE_PRINTF(",");
-        srcreg = DECODE_RM_BYTE_REGISTER(rh);
-        DECODE_PRINTF("\n");
-        TRACE_AND_STEP();
-        *destreg = sub_byte(*destreg, *srcreg);
-        break;
+	destreg = DECODE_RM_BYTE_REGISTER(rl);
+	DECODE_PRINTF(",");
+	srcreg = DECODE_RM_BYTE_REGISTER(rh);
+	DECODE_PRINTF("\n");
+	TRACE_AND_STEP();
+	*destreg = sub_byte(*destreg, *srcreg);
+	break;
     }
     DECODE_CLEAR_SEGOVR();
     END_OF_INSTR();
@@ -2270,107 +2270,107 @@
     FETCH_DECODE_MODRM(mod, rh, rl);
     switch (mod) {
     case 0:
-        if (M.x86.mode & SYSMODE_PREFIX_DATA) {
-            u32 destval;
-            u32 *srcreg;
+	if (M.x86.mode & SYSMODE_PREFIX_DATA) {
+	    u32 destval;
+	    u32 *srcreg;
 
-            destoffset = decode_rm00_address(rl);
-            DECODE_PRINTF(",");
-            destval = fetch_data_long(destoffset);
-            srcreg = DECODE_RM_LONG_REGISTER(rh);
-            DECODE_PRINTF("\n");
-            TRACE_AND_STEP();
-            destval = sub_long(destval, *srcreg);
-            store_data_long(destoffset, destval);
-        } else {
-            u16 destval;
-            u16 *srcreg;
+	    destoffset = decode_rm00_address(rl);
+	    DECODE_PRINTF(",");
+	    destval = fetch_data_long(destoffset);
+	    srcreg = DECODE_RM_LONG_REGISTER(rh);
+	    DECODE_PRINTF("\n");
+	    TRACE_AND_STEP();
+	    destval = sub_long(destval, *srcreg);
+	    store_data_long(destoffset, destval);
+	} else {
+	    u16 destval;
+	    u16 *srcreg;
 
-            destoffset = decode_rm00_address(rl);
-            DECODE_PRINTF(",");
-            destval = fetch_data_word(destoffset);
-            srcreg = DECODE_RM_WORD_REGISTER(rh);
-            DECODE_PRINTF("\n");
-            TRACE_AND_STEP();
-            destval = sub_word(destval, *srcreg);
-            store_data_word(destoffset, destval);
-        }
-        break;
+	    destoffset = decode_rm00_address(rl);
+	    DECODE_PRINTF(",");
+	    destval = fetch_data_word(destoffset);
+	    srcreg = DECODE_RM_WORD_REGISTER(rh);
+	    DECODE_PRINTF("\n");
+	    TRACE_AND_STEP();
+	    destval = sub_word(destval, *srcreg);
+	    store_data_word(destoffset, destval);
+	}
+	break;
     case 1:
-        if (M.x86.mode & SYSMODE_PREFIX_DATA) {
-            u32 destval;
-            u32 *srcreg;
+	if (M.x86.mode & SYSMODE_PREFIX_DATA) {
+	    u32 destval;
+	    u32 *srcreg;
 
-            destoffset = decode_rm01_address(rl);
-            DECODE_PRINTF(",");
-            destval = fetch_data_long(destoffset);
-            srcreg = DECODE_RM_LONG_REGISTER(rh);
-            DECODE_PRINTF("\n");
-            TRACE_AND_STEP();
-            destval = sub_long(destval, *srcreg);
-            store_data_long(destoffset, destval);
-        } else {
-            u16 destval;
-            u16 *srcreg;
+	    destoffset = decode_rm01_address(rl);
+	    DECODE_PRINTF(",");
+	    destval = fetch_data_long(destoffset);
+	    srcreg = DECODE_RM_LONG_REGISTER(rh);
+	    DECODE_PRINTF("\n");
+	    TRACE_AND_STEP();
+	    destval = sub_long(destval, *srcreg);
+	    store_data_long(destoffset, destval);
+	} else {
+	    u16 destval;
+	    u16 *srcreg;
 
-            destoffset = decode_rm01_address(rl);
-            DECODE_PRINTF(",");
-            destval = fetch_data_word(destoffset);
-            srcreg = DECODE_RM_WORD_REGISTER(rh);
-            DECODE_PRINTF("\n");
-            TRACE_AND_STEP();
-            destval = sub_word(destval, *srcreg);
-            store_data_word(destoffset, destval);
-        }
-        break;
+	    destoffset = decode_rm01_address(rl);
+	    DECODE_PRINTF(",");
+	    destval = fetch_data_word(destoffset);
+	    srcreg = DECODE_RM_WORD_REGISTER(rh);
+	    DECODE_PRINTF("\n");
+	    TRACE_AND_STEP();
+	    destval = sub_word(destval, *srcreg);
+	    store_data_word(destoffset, destval);
+	}
+	break;
     case 2:
-        if (M.x86.mode & SYSMODE_PREFIX_DATA) {
-            u32 destval;
-            u32 *srcreg;
+	if (M.x86.mode & SYSMODE_PREFIX_DATA) {
+	    u32 destval;
+	    u32 *srcreg;
 
-            destoffset = decode_rm10_address(rl);
-            DECODE_PRINTF(",");
-            destval = fetch_data_long(destoffset);
-            srcreg = DECODE_RM_LONG_REGISTER(rh);
-            DECODE_PRINTF("\n");
-            TRACE_AND_STEP();
-            destval = sub_long(destval, *srcreg);
-            store_data_long(destoffset, destval);
-        } else {
-            u16 destval;
-            u16 *srcreg;
+	    destoffset = decode_rm10_address(rl);
+	    DECODE_PRINTF(",");
+	    destval = fetch_data_long(destoffset);
+	    srcreg = DECODE_RM_LONG_REGISTER(rh);
+	    DECODE_PRINTF("\n");
+	    TRACE_AND_STEP();
+	    destval = sub_long(destval, *srcreg);
+	    store_data_long(destoffset, destval);
+	} else {
+	    u16 destval;
+	    u16 *srcreg;
 
-            destoffset = decode_rm10_address(rl);
-            DECODE_PRINTF(",");
-            destval = fetch_data_word(destoffset);
-            srcreg = DECODE_RM_WORD_REGISTER(rh);
-            DECODE_PRINTF("\n");
-            TRACE_AND_STEP();
-            destval = sub_word(destval, *srcreg);
-            store_data_word(destoffset, destval);
-        }
-        break;
+	    destoffset = decode_rm10_address(rl);
+	    DECODE_PRINTF(",");
+	    destval = fetch_data_word(destoffset);
+	    srcreg = DECODE_RM_WORD_REGISTER(rh);
+	    DECODE_PRINTF("\n");
+	    TRACE_AND_STEP();
+	    destval = sub_word(destval, *srcreg);
+	    store_data_word(destoffset, destval);
+	}
+	break;
     case 3:                     /* register to register */
-        if (M.x86.mode & SYSMODE_PREFIX_DATA) {
-            u32 *destreg,*srcreg;
+	if (M.x86.mode & SYSMODE_PREFIX_DATA) {
+	    u32 *destreg,*srcreg;
 
-            destreg = DECODE_RM_LONG_REGISTER(rl);
-            DECODE_PRINTF(",");
-            srcreg = DECODE_RM_LONG_REGISTER(rh);
-            DECODE_PRINTF("\n");
-            TRACE_AND_STEP();
-            *destreg = sub_long(*destreg, *srcreg);
-        } else {
-            u16 *destreg,*srcreg;
+	    destreg = DECODE_RM_LONG_REGISTER(rl);
+	    DECODE_PRINTF(",");
+	    srcreg = DECODE_RM_LONG_REGISTER(rh);
+	    DECODE_PRINTF("\n");
+	    TRACE_AND_STEP();
+	    *destreg = sub_long(*destreg, *srcreg);
+	} else {
+	    u16 *destreg,*srcreg;
 
-            destreg = DECODE_RM_WORD_REGISTER(rl);
-            DECODE_PRINTF(",");
-            srcreg = DECODE_RM_WORD_REGISTER(rh);
-            DECODE_PRINTF("\n");
-            TRACE_AND_STEP();
-            *destreg = sub_word(*destreg, *srcreg);
-        }
-        break;
+	    destreg = DECODE_RM_WORD_REGISTER(rl);
+	    DECODE_PRINTF(",");
+	    srcreg = DECODE_RM_WORD_REGISTER(rh);
+	    DECODE_PRINTF("\n");
+	    TRACE_AND_STEP();
+	    *destreg = sub_word(*destreg, *srcreg);
+	}
+	break;
     }
     DECODE_CLEAR_SEGOVR();
     END_OF_INSTR();
@@ -2392,40 +2392,40 @@
     FETCH_DECODE_MODRM(mod, rh, rl);
     switch (mod) {
     case 0:
-        destreg = DECODE_RM_BYTE_REGISTER(rh);
-        DECODE_PRINTF(",");
-        srcoffset = decode_rm00_address(rl);
-        srcval = fetch_data_byte(srcoffset);
-        DECODE_PRINTF("\n");
-        TRACE_AND_STEP();
-        *destreg = sub_byte(*destreg, srcval);
-        break;
+	destreg = DECODE_RM_BYTE_REGISTER(rh);
+	DECODE_PRINTF(",");
+	srcoffset = decode_rm00_address(rl);
+	srcval = fetch_data_byte(srcoffset);
+	DECODE_PRINTF("\n");
+	TRACE_AND_STEP();
+	*destreg = sub_byte(*destreg, srcval);
+	break;
     case 1:
-        destreg = DECODE_RM_BYTE_REGISTER(rh);
-        DECODE_PRINTF(",");
-        srcoffset = decode_rm01_address(rl);
-        srcval = fetch_data_byte(srcoffset);
-        DECODE_PRINTF("\n");
-        TRACE_AND_STEP();
-        *destreg = sub_byte(*destreg, srcval);
-        break;
+	destreg = DECODE_RM_BYTE_REGISTER(rh);
+	DECODE_PRINTF(",");
+	srcoffset = decode_rm01_address(rl);
+	srcval = fetch_data_byte(srcoffset);
+	DECODE_PRINTF("\n");
+	TRACE_AND_STEP();
+	*destreg = sub_byte(*destreg, srcval);
+	break;
     case 2:
-        destreg = DECODE_RM_BYTE_REGISTER(rh);
-        DECODE_PRINTF(",");
-        srcoffset = decode_rm10_address(rl);
-        srcval = fetch_data_byte(srcoffset);
-        DECODE_PRINTF("\n");
-        TRACE_AND_STEP();
-        *destreg = sub_byte(*destreg, srcval);
-        break;
+	destreg = DECODE_RM_BYTE_REGISTER(rh);
+	DECODE_PRINTF(",");
+	srcoffset = decode_rm10_address(rl);
+	srcval = fetch_data_byte(srcoffset);
+	DECODE_PRINTF("\n");
+	TRACE_AND_STEP();
+	*destreg = sub_byte(*destreg, srcval);
+	break;
     case 3:                     /* register to register */
-        destreg = DECODE_RM_BYTE_REGISTER(rh);
-        DECODE_PRINTF(",");
-        srcreg = DECODE_RM_BYTE_REGISTER(rl);
-        DECODE_PRINTF("\n");
-        TRACE_AND_STEP();
-        *destreg = sub_byte(*destreg, *srcreg);
-        break;
+	destreg = DECODE_RM_BYTE_REGISTER(rh);
+	DECODE_PRINTF(",");
+	srcreg = DECODE_RM_BYTE_REGISTER(rl);
+	DECODE_PRINTF("\n");
+	TRACE_AND_STEP();
+	*destreg = sub_byte(*destreg, *srcreg);
+	break;
     }
     DECODE_CLEAR_SEGOVR();
     END_OF_INSTR();
@@ -2445,101 +2445,101 @@
     FETCH_DECODE_MODRM(mod, rh, rl);
     switch (mod) {
     case 0:
-        if (M.x86.mode & SYSMODE_PREFIX_DATA) {
-            u32 *destreg;
-            u32 srcval;
+	if (M.x86.mode & SYSMODE_PREFIX_DATA) {
+	    u32 *destreg;
+	    u32 srcval;
 
-            destreg = DECODE_RM_LONG_REGISTER(rh);
-            DECODE_PRINTF(",");
-            srcoffset = decode_rm00_address(rl);
-            srcval = fetch_data_long(srcoffset);
-            DECODE_PRINTF("\n");
-            TRACE_AND_STEP();
-            *destreg = sub_long(*destreg, srcval);
-        } else {
-            u16 *destreg;
-            u16 srcval;
+	    destreg = DECODE_RM_LONG_REGISTER(rh);
+	    DECODE_PRINTF(",");
+	    srcoffset = decode_rm00_address(rl);
+	    srcval = fetch_data_long(srcoffset);
+	    DECODE_PRINTF("\n");
+	    TRACE_AND_STEP();
+	    *destreg = sub_long(*destreg, srcval);
+	} else {
+	    u16 *destreg;
+	    u16 srcval;
 
-            destreg = DECODE_RM_WORD_REGISTER(rh);
-            DECODE_PRINTF(",");
-            srcoffset = decode_rm00_address(rl);
-            srcval = fetch_data_word(srcoffset);
-            DECODE_PRINTF("\n");
-            TRACE_AND_STEP();
-            *destreg = sub_word(*destreg, srcval);
-        }
-        break;
+	    destreg = DECODE_RM_WORD_REGISTER(rh);
+	    DECODE_PRINTF(",");
+	    srcoffset = decode_rm00_address(rl);
+	    srcval = fetch_data_word(srcoffset);
+	    DECODE_PRINTF("\n");
+	    TRACE_AND_STEP();
+	    *destreg = sub_word(*destreg, srcval);
+	}
+	break;
     case 1:
-        if (M.x86.mode & SYSMODE_PREFIX_DATA) {
-            u32 *destreg;
-            u32 srcval;
+	if (M.x86.mode & SYSMODE_PREFIX_DATA) {
+	    u32 *destreg;
+	    u32 srcval;
 
-            destreg = DECODE_RM_LONG_REGISTER(rh);
-            DECODE_PRINTF(",");
-            srcoffset = decode_rm01_address(rl);
-            srcval = fetch_data_long(srcoffset);
-            DECODE_PRINTF("\n");
-            TRACE_AND_STEP();
-            *destreg = sub_long(*destreg, srcval);
-        } else {
-            u16 *destreg;
-            u16 srcval;
+	    destreg = DECODE_RM_LONG_REGISTER(rh);
+	    DECODE_PRINTF(",");
+	    srcoffset = decode_rm01_address(rl);
+	    srcval = fetch_data_long(srcoffset);
+	    DECODE_PRINTF("\n");
+	    TRACE_AND_STEP();
+	    *destreg = sub_long(*destreg, srcval);
+	} else {
+	    u16 *destreg;
+	    u16 srcval;
 
-            destreg = DECODE_RM_WORD_REGISTER(rh);
-            DECODE_PRINTF(",");
-            srcoffset = decode_rm01_address(rl);
-            srcval = fetch_data_word(srcoffset);
-            DECODE_PRINTF("\n");
-            TRACE_AND_STEP();
-            *destreg = sub_word(*destreg, srcval);
-        }
-        break;
+	    destreg = DECODE_RM_WORD_REGISTER(rh);
+	    DECODE_PRINTF(",");
+	    srcoffset = decode_rm01_address(rl);
+	    srcval = fetch_data_word(srcoffset);
+	    DECODE_PRINTF("\n");
+	    TRACE_AND_STEP();
+	    *destreg = sub_word(*destreg, srcval);
+	}
+	break;
     case 2:
-        if (M.x86.mode & SYSMODE_PREFIX_DATA) {
-            u32 *destreg;
-            u32 srcval;
+	if (M.x86.mode & SYSMODE_PREFIX_DATA) {
+	    u32 *destreg;
+	    u32 srcval;
 
-            destreg = DECODE_RM_LONG_REGISTER(rh);
-            DECODE_PRINTF(",");
-            srcoffset = decode_rm10_address(rl);
-            srcval = fetch_data_long(srcoffset);
-            DECODE_PRINTF("\n");
-            TRACE_AND_STEP();
-            *destreg = sub_long(*destreg, srcval);
-        } else {
-            u16 *destreg;
-            u16 srcval;
+	    destreg = DECODE_RM_LONG_REGISTER(rh);
+	    DECODE_PRINTF(",");
+	    srcoffset = decode_rm10_address(rl);
+	    srcval = fetch_data_long(srcoffset);
+	    DECODE_PRINTF("\n");
+	    TRACE_AND_STEP();
+	    *destreg = sub_long(*destreg, srcval);
+	} else {
+	    u16 *destreg;
+	    u16 srcval;
 
-            destreg = DECODE_RM_WORD_REGISTER(rh);
-            DECODE_PRINTF(",");
-            srcoffset = decode_rm10_address(rl);
-            srcval = fetch_data_word(srcoffset);
-            DECODE_PRINTF("\n");
-            TRACE_AND_STEP();
-            *destreg = sub_word(*destreg, srcval);
-        }
-        break;
+	    destreg = DECODE_RM_WORD_REGISTER(rh);
+	    DECODE_PRINTF(",");
+	    srcoffset = decode_rm10_address(rl);
+	    srcval = fetch_data_word(srcoffset);
+	    DECODE_PRINTF("\n");
+	    TRACE_AND_STEP();
+	    *destreg = sub_word(*destreg, srcval);
+	}
+	break;
     case 3:                     /* register to register */
-        if (M.x86.mode & SYSMODE_PREFIX_DATA) {
-            u32 *destreg,*srcreg;
+	if (M.x86.mode & SYSMODE_PREFIX_DATA) {
+	    u32 *destreg,*srcreg;
 
-            destreg = DECODE_RM_LONG_REGISTER(rh);
-            DECODE_PRINTF(",");
-            srcreg = DECODE_RM_LONG_REGISTER(rl);
-            DECODE_PRINTF("\n");
-            TRACE_AND_STEP();
-            *destreg = sub_long(*destreg, *srcreg);
-        } else {
-            u16 *destreg,*srcreg;
+	    destreg = DECODE_RM_LONG_REGISTER(rh);
+	    DECODE_PRINTF(",");
+	    srcreg = DECODE_RM_LONG_REGISTER(rl);
+	    DECODE_PRINTF("\n");
+	    TRACE_AND_STEP();
+	    *destreg = sub_long(*destreg, *srcreg);
+	} else {
+	    u16 *destreg,*srcreg;
 
-            destreg = DECODE_RM_WORD_REGISTER(rh);
-            DECODE_PRINTF(",");
-            srcreg = DECODE_RM_WORD_REGISTER(rl);
-            DECODE_PRINTF("\n");
-            TRACE_AND_STEP();
-            *destreg = sub_word(*destreg, *srcreg);
-        }
-        break;
+	    destreg = DECODE_RM_WORD_REGISTER(rh);
+	    DECODE_PRINTF(",");
+	    srcreg = DECODE_RM_WORD_REGISTER(rl);
+	    DECODE_PRINTF("\n");
+	    TRACE_AND_STEP();
+	    *destreg = sub_word(*destreg, *srcreg);
+	}
+	break;
     }
     DECODE_CLEAR_SEGOVR();
     END_OF_INSTR();
@@ -2573,18 +2573,18 @@
 
     START_OF_INSTR();
     if (M.x86.mode & SYSMODE_PREFIX_DATA) {
-        DECODE_PRINTF("SUB\tEAX,");
-        srcval = fetch_long_imm();
+	DECODE_PRINTF("SUB\tEAX,");
+	srcval = fetch_long_imm();
     } else {
-        DECODE_PRINTF("SUB\tAX,");
-        srcval = fetch_word_imm();
+	DECODE_PRINTF("SUB\tAX,");
+	srcval = fetch_word_imm();
     }
     DECODE_PRINTF2("%x\n", srcval);
     TRACE_AND_STEP();
     if (M.x86.mode & SYSMODE_PREFIX_DATA) {
-        M.x86.R_EAX = sub_long(M.x86.R_EAX, srcval);
+	M.x86.R_EAX = sub_long(M.x86.R_EAX, srcval);
     } else {
-        M.x86.R_AX = sub_word(M.x86.R_AX, (u16)srcval);
+	M.x86.R_AX = sub_word(M.x86.R_AX, (u16)srcval);
     }
     DECODE_CLEAR_SEGOVR();
     END_OF_INSTR();
@@ -2634,43 +2634,43 @@
     FETCH_DECODE_MODRM(mod, rh, rl);
     switch (mod) {
     case 0:
-        destoffset = decode_rm00_address(rl);
-        DECODE_PRINTF(",");
-        destval = fetch_data_byte(destoffset);
-        srcreg = DECODE_RM_BYTE_REGISTER(rh);
-        DECODE_PRINTF("\n");
-        TRACE_AND_STEP();
-        destval = xor_byte(destval, *srcreg);
-        store_data_byte(destoffset, destval);
-        break;
+	destoffset = decode_rm00_address(rl);
+	DECODE_PRINTF(",");
+	destval = fetch_data_byte(destoffset);
+	srcreg = DECODE_RM_BYTE_REGISTER(rh);
+	DECODE_PRINTF("\n");
+	TRACE_AND_STEP();
+	destval = xor_byte(destval, *srcreg);
+	store_data_byte(destoffset, destval);
+	break;
     case 1:
-        destoffset = decode_rm01_address(rl);
-        DECODE_PRINTF(",");
-        destval = fetch_data_byte(destoffset);
-        srcreg = DECODE_RM_BYTE_REGISTER(rh);
-        DECODE_PRINTF("\n");
-        TRACE_AND_STEP();
-        destval = xor_byte(destval, *srcreg);
-        store_data_byte(destoffset, destval);
-        break;
+	destoffset = decode_rm01_address(rl);
+	DECODE_PRINTF(",");
+	destval = fetch_data_byte(destoffset);
+	srcreg = DECODE_RM_BYTE_REGISTER(rh);
+	DECODE_PRINTF("\n");
+	TRACE_AND_STEP();
+	destval = xor_byte(destval, *srcreg);
+	store_data_byte(destoffset, destval);
+	break;
     case 2:
-        destoffset = decode_rm10_address(rl);
-        DECODE_PRINTF(",");
-        destval = fetch_data_byte(destoffset);
-        srcreg = DECODE_RM_BYTE_REGISTER(rh);
-        DECODE_PRINTF("\n");
-        TRACE_AND_STEP();
-        destval = xor_byte(destval, *srcreg);
-        store_data_byte(destoffset, destval);
-        break;
+	destoffset = decode_rm10_address(rl);
+	DECODE_PRINTF(",");
+	destval = fetch_data_byte(destoffset);
+	srcreg = DECODE_RM_BYTE_REGISTER(rh);
+	DECODE_PRINTF("\n");
+	TRACE_AND_STEP();
+	destval = xor_byte(destval, *srcreg);
+	store_data_byte(destoffset, destval);
+	break;
     case 3:                     /* register to register */
-        destreg = DECODE_RM_BYTE_REGISTER(rl);
-        DECODE_PRINTF(",");
-        srcreg = DECODE_RM_BYTE_REGISTER(rh);
-        DECODE_PRINTF("\n");
-        TRACE_AND_STEP();
-        *destreg = xor_byte(*destreg, *srcreg);
-        break;
+	destreg = DECODE_RM_BYTE_REGISTER(rl);
+	DECODE_PRINTF(",");
+	srcreg = DECODE_RM_BYTE_REGISTER(rh);
+	DECODE_PRINTF("\n");
+	TRACE_AND_STEP();
+	*destreg = xor_byte(*destreg, *srcreg);
+	break;
     }
     DECODE_CLEAR_SEGOVR();
     END_OF_INSTR();
@@ -2690,107 +2690,107 @@
     FETCH_DECODE_MODRM(mod, rh, rl);
     switch (mod) {
     case 0:
-        if (M.x86.mode & SYSMODE_PREFIX_DATA) {
-            u32 destval;
-            u32 *srcreg;
+	if (M.x86.mode & SYSMODE_PREFIX_DATA) {
+	    u32 destval;
+	    u32 *srcreg;
 
-            destoffset = decode_rm00_address(rl);
-            DECODE_PRINTF(",");
-            destval = fetch_data_long(destoffset);
-            srcreg = DECODE_RM_LONG_REGISTER(rh);
-            DECODE_PRINTF("\n");
-            TRACE_AND_STEP();
-            destval = xor_long(destval, *srcreg);
-            store_data_long(destoffset, destval);
-        } else {
-            u16 destval;
-            u16 *srcreg;
+	    destoffset = decode_rm00_address(rl);
+	    DECODE_PRINTF(",");
+	    destval = fetch_data_long(destoffset);
+	    srcreg = DECODE_RM_LONG_REGISTER(rh);
+	    DECODE_PRINTF("\n");
+	    TRACE_AND_STEP();
+	    destval = xor_long(destval, *srcreg);
+	    store_data_long(destoffset, destval);
+	} else {
+	    u16 destval;
+	    u16 *srcreg;
 
-            destoffset = decode_rm00_address(rl);
-            DECODE_PRINTF(",");
-            destval = fetch_data_word(destoffset);
-            srcreg = DECODE_RM_WORD_REGISTER(rh);
-            DECODE_PRINTF("\n");
-            TRACE_AND_STEP();
-            destval = xor_word(destval, *srcreg);
-            store_data_word(destoffset, destval);
-        }
-        break;
+	    destoffset = decode_rm00_address(rl);
+	    DECODE_PRINTF(",");
+	    destval = fetch_data_word(destoffset);
+	    srcreg = DECODE_RM_WORD_REGISTER(rh);
+	    DECODE_PRINTF("\n");
+	    TRACE_AND_STEP();
+	    destval = xor_word(destval, *srcreg);
+	    store_data_word(destoffset, destval);
+	}
+	break;
     case 1:
-        if (M.x86.mode & SYSMODE_PREFIX_DATA) {
-            u32 destval;
-            u32 *srcreg;
+	if (M.x86.mode & SYSMODE_PREFIX_DATA) {
+	    u32 destval;
+	    u32 *srcreg;
 
-            destoffset = decode_rm01_address(rl);
-            DECODE_PRINTF(",");
-            destval = fetch_data_long(destoffset);
-            srcreg = DECODE_RM_LONG_REGISTER(rh);
-            DECODE_PRINTF("\n");
-            TRACE_AND_STEP();
-            destval = xor_long(destval, *srcreg);
-            store_data_long(destoffset, destval);
-        } else {
-            u16 destval;
-            u16 *srcreg;
+	    destoffset = decode_rm01_address(rl);
+	    DECODE_PRINTF(",");
+	    destval = fetch_data_long(destoffset);
+	    srcreg = DECODE_RM_LONG_REGISTER(rh);
+	    DECODE_PRINTF("\n");
+	    TRACE_AND_STEP();
+	    destval = xor_long(destval, *srcreg);
+	    store_data_long(destoffset, destval);
+	} else {
+	    u16 destval;
+	    u16 *srcreg;
 
-            destoffset = decode_rm01_address(rl);
-            DECODE_PRINTF(",");
-            destval = fetch_data_word(destoffset);
-            srcreg = DECODE_RM_WORD_REGISTER(rh);
-            DECODE_PRINTF("\n");
-            TRACE_AND_STEP();
-            destval = xor_word(destval, *srcreg);
-            store_data_word(destoffset, destval);
-        }
-        break;
+	    destoffset = decode_rm01_address(rl);
+	    DECODE_PRINTF(",");
+	    destval = fetch_data_word(destoffset);
+	    srcreg = DECODE_RM_WORD_REGISTER(rh);
+	    DECODE_PRINTF("\n");
+	    TRACE_AND_STEP();
+	    destval = xor_word(destval, *srcreg);
+	    store_data_word(destoffset, destval);
+	}
+	break;
     case 2:
-        if (M.x86.mode & SYSMODE_PREFIX_DATA) {
-            u32 destval;
-            u32 *srcreg;
+	if (M.x86.mode & SYSMODE_PREFIX_DATA) {
+	    u32 destval;
+	    u32 *srcreg;
 
-            destoffset = decode_rm10_address(rl);
-            DECODE_PRINTF(",");
-            destval = fetch_data_long(destoffset);
-            srcreg = DECODE_RM_LONG_REGISTER(rh);
-            DECODE_PRINTF("\n");
-            TRACE_AND_STEP();
-            destval = xor_long(destval, *srcreg);
-            store_data_long(destoffset, destval);
-        } else {
-            u16 destval;
-            u16 *srcreg;
+	    destoffset = decode_rm10_address(rl);
+	    DECODE_PRINTF(",");
+	    destval = fetch_data_long(destoffset);
+	    srcreg = DECODE_RM_LONG_REGISTER(rh);
+	    DECODE_PRINTF("\n");
+	    TRACE_AND_STEP();
+	    destval = xor_long(destval, *srcreg);
+	    store_data_long(destoffset, destval);
+	} else {
+	    u16 destval;
+	    u16 *srcreg;
 
-            destoffset = decode_rm10_address(rl);
-            DECODE_PRINTF(",");
-            destval = fetch_data_word(destoffset);
-            srcreg = DECODE_RM_WORD_REGISTER(rh);
-            DECODE_PRINTF("\n");
-            TRACE_AND_STEP();
-            destval = xor_word(destval, *srcreg);
-            store_data_word(destoffset, destval);
-        }
-        break;
+	    destoffset = decode_rm10_address(rl);
+	    DECODE_PRINTF(",");
+	    destval = fetch_data_word(destoffset);
+	    srcreg = DECODE_RM_WORD_REGISTER(rh);
+	    DECODE_PRINTF("\n");
+	    TRACE_AND_STEP();
+	    destval = xor_word(destval, *srcreg);
+	    store_data_word(destoffset, destval);
+	}
+	break;
     case 3:                     /* register to register */
-        if (M.x86.mode & SYSMODE_PREFIX_DATA) {
-            u32 *destreg,*srcreg;
+	if (M.x86.mode & SYSMODE_PREFIX_DATA) {
+	    u32 *destreg,*srcreg;
 
-            destreg = DECODE_RM_LONG_REGISTER(rl);
-            DECODE_PRINTF(",");
-            srcreg = DECODE_RM_LONG_REGISTER(rh);
-            DECODE_PRINTF("\n");
-            TRACE_AND_STEP();
-            *destreg = xor_long(*destreg, *srcreg);
-        } else {
-            u16 *destreg,*srcreg;
+	    destreg = DECODE_RM_LONG_REGISTER(rl);
+	    DECODE_PRINTF(",");
+	    srcreg = DECODE_RM_LONG_REGISTER(rh);
+	    DECODE_PRINTF("\n");
+	    TRACE_AND_STEP();
+	    *destreg = xor_long(*destreg, *srcreg);
+	} else {
+	    u16 *destreg,*srcreg;
 
-            destreg = DECODE_RM_WORD_REGISTER(rl);
-            DECODE_PRINTF(",");
-            srcreg = DECODE_RM_WORD_REGISTER(rh);
-            DECODE_PRINTF("\n");
-            TRACE_AND_STEP();
-            *destreg = xor_word(*destreg, *srcreg);
-        }
-        break;
+	    destreg = DECODE_RM_WORD_REGISTER(rl);
+	    DECODE_PRINTF(",");
+	    srcreg = DECODE_RM_WORD_REGISTER(rh);
+	    DECODE_PRINTF("\n");
+	    TRACE_AND_STEP();
+	    *destreg = xor_word(*destreg, *srcreg);
+	}
+	break;
     }
     DECODE_CLEAR_SEGOVR();
     END_OF_INSTR();
@@ -2812,40 +2812,40 @@
     FETCH_DECODE_MODRM(mod, rh, rl);
     switch (mod) {
     case 0:
-        destreg = DECODE_RM_BYTE_REGISTER(rh);
-        DECODE_PRINTF(",");
-        srcoffset = decode_rm00_address(rl);
-        srcval = fetch_data_byte(srcoffset);
-        DECODE_PRINTF("\n");
-        TRACE_AND_STEP();
-        *destreg = xor_byte(*destreg, srcval);
-        break;
+	destreg = DECODE_RM_BYTE_REGISTER(rh);
+	DECODE_PRINTF(",");
+	srcoffset = decode_rm00_address(rl);
+	srcval = fetch_data_byte(srcoffset);
+	DECODE_PRINTF("\n");
+	TRACE_AND_STEP();
+	*destreg = xor_byte(*destreg, srcval);
+	break;
     case 1:
-        destreg = DECODE_RM_BYTE_REGISTER(rh);
-        DECODE_PRINTF(",");
-        srcoffset = decode_rm01_address(rl);
-        srcval = fetch_data_byte(srcoffset);
-        DECODE_PRINTF("\n");
-        TRACE_AND_STEP();
-        *destreg = xor_byte(*destreg, srcval);
-        break;
+	destreg = DECODE_RM_BYTE_REGISTER(rh);
+	DECODE_PRINTF(",");
+	srcoffset = decode_rm01_address(rl);
+	srcval = fetch_data_byte(srcoffset);
+	DECODE_PRINTF("\n");
+	TRACE_AND_STEP();
+	*destreg = xor_byte(*destreg, srcval);
+	break;
     case 2:
-        destreg = DECODE_RM_BYTE_REGISTER(rh);
-        DECODE_PRINTF(",");
-        srcoffset = decode_rm10_address(rl);
-        srcval = fetch_data_byte(srcoffset);
-        DECODE_PRINTF("\n");
-        TRACE_AND_STEP();
-        *destreg = xor_byte(*destreg, srcval);
-        break;
+	destreg = DECODE_RM_BYTE_REGISTER(rh);
+	DECODE_PRINTF(",");
+	srcoffset = decode_rm10_address(rl);
+	srcval = fetch_data_byte(srcoffset);
+	DECODE_PRINTF("\n");
+	TRACE_AND_STEP();
+	*destreg = xor_byte(*destreg, srcval);
+	break;
     case 3:                     /* register to register */
-        destreg = DECODE_RM_BYTE_REGISTER(rh);
-        DECODE_PRINTF(",");
-        srcreg = DECODE_RM_BYTE_REGISTER(rl);
-        DECODE_PRINTF("\n");
-        TRACE_AND_STEP();
-        *destreg = xor_byte(*destreg, *srcreg);
-        break;
+	destreg = DECODE_RM_BYTE_REGISTER(rh);
+	DECODE_PRINTF(",");
+	srcreg = DECODE_RM_BYTE_REGISTER(rl);
+	DECODE_PRINTF("\n");
+	TRACE_AND_STEP();
+	*destreg = xor_byte(*destreg, *srcreg);
+	break;
     }
     DECODE_CLEAR_SEGOVR();
     END_OF_INSTR();
@@ -2865,101 +2865,101 @@
     FETCH_DECODE_MODRM(mod, rh, rl);
     switch (mod) {
     case 0:
-        if (M.x86.mode & SYSMODE_PREFIX_DATA) {
-            u32 *destreg;
-            u32 srcval;
+	if (M.x86.mode & SYSMODE_PREFIX_DATA) {
+	    u32 *destreg;
+	    u32 srcval;
 
-            destreg = DECODE_RM_LONG_REGISTER(rh);
-            DECODE_PRINTF(",");
-            srcoffset = decode_rm00_address(rl);
-            srcval = fetch_data_long(srcoffset);
-            DECODE_PRINTF("\n");
-            TRACE_AND_STEP();
-            *destreg = xor_long(*destreg, srcval);
-        } else {
-            u16 *destreg;
-            u16 srcval;
+	    destreg = DECODE_RM_LONG_REGISTER(rh);
+	    DECODE_PRINTF(",");
+	    srcoffset = decode_rm00_address(rl);
+	    srcval = fetch_data_long(srcoffset);
+	    DECODE_PRINTF("\n");
+	    TRACE_AND_STEP();
+	    *destreg = xor_long(*destreg, srcval);
+	} else {
+	    u16 *destreg;
+	    u16 srcval;
 
-            destreg = DECODE_RM_WORD_REGISTER(rh);
-            DECODE_PRINTF(",");
-            srcoffset = decode_rm00_address(rl);
-            srcval = fetch_data_word(srcoffset);
-            DECODE_PRINTF("\n");
-            TRACE_AND_STEP();
-            *destreg = xor_word(*destreg, srcval);
-        }
-        break;
+	    destreg = DECODE_RM_WORD_REGISTER(rh);
+	    DECODE_PRINTF(",");
+	    srcoffset = decode_rm00_address(rl);
+	    srcval = fetch_data_word(srcoffset);
+	    DECODE_PRINTF("\n");
+	    TRACE_AND_STEP();
+	    *destreg = xor_word(*destreg, srcval);
+	}
+	break;
     case 1:
-        if (M.x86.mode & SYSMODE_PREFIX_DATA) {
-            u32 *destreg;
-            u32 srcval;
+	if (M.x86.mode & SYSMODE_PREFIX_DATA) {
+	    u32 *destreg;
+	    u32 srcval;
 
-            destreg = DECODE_RM_LONG_REGISTER(rh);
-            DECODE_PRINTF(",");
-            srcoffset = decode_rm01_address(rl);
-            srcval = fetch_data_long(srcoffset);
-            DECODE_PRINTF("\n");
-            TRACE_AND_STEP();
-            *destreg = xor_long(*destreg, srcval);
-        } else {
-            u16 *destreg;
-            u16 srcval;
+	    destreg = DECODE_RM_LONG_REGISTER(rh);
+	    DECODE_PRINTF(",");
+	    srcoffset = decode_rm01_address(rl);
+	    srcval = fetch_data_long(srcoffset);
+	    DECODE_PRINTF("\n");
+	    TRACE_AND_STEP();
+	    *destreg = xor_long(*destreg, srcval);
+	} else {
+	    u16 *destreg;
+	    u16 srcval;
 
-            destreg = DECODE_RM_WORD_REGISTER(rh);
-            DECODE_PRINTF(",");
-            srcoffset = decode_rm01_address(rl);
-            srcval = fetch_data_word(srcoffset);
-            DECODE_PRINTF("\n");
-            TRACE_AND_STEP();
-            *destreg = xor_word(*destreg, srcval);
-        }
-        break;
+	    destreg = DECODE_RM_WORD_REGISTER(rh);
+	    DECODE_PRINTF(",");
+	    srcoffset = decode_rm01_address(rl);
+	    srcval = fetch_data_word(srcoffset);
+	    DECODE_PRINTF("\n");
+	    TRACE_AND_STEP();
+	    *destreg = xor_word(*destreg, srcval);
+	}
+	break;
     case 2:
-        if (M.x86.mode & SYSMODE_PREFIX_DATA) {
-            u32 *destreg;
-            u32 srcval;
+	if (M.x86.mode & SYSMODE_PREFIX_DATA) {
+	    u32 *destreg;
+	    u32 srcval;
 
-            destreg = DECODE_RM_LONG_REGISTER(rh);
-            DECODE_PRINTF(",");
-            srcoffset = decode_rm10_address(rl);
-            srcval = fetch_data_long(srcoffset);
-            DECODE_PRINTF("\n");
-            TRACE_AND_STEP();
-            *destreg = xor_long(*destreg, srcval);
-        } else {
-            u16 *destreg;
-            u16 srcval;
+	    destreg = DECODE_RM_LONG_REGISTER(rh);
+	    DECODE_PRINTF(",");
+	    srcoffset = decode_rm10_address(rl);
+	    srcval = fetch_data_long(srcoffset);
+	    DECODE_PRINTF("\n");
+	    TRACE_AND_STEP();
+	    *destreg = xor_long(*destreg, srcval);
+	} else {
+	    u16 *destreg;
+	    u16 srcval;
 
-            destreg = DECODE_RM_WORD_REGISTER(rh);
-            DECODE_PRINTF(",");
-            srcoffset = decode_rm10_address(rl);
-            srcval = fetch_data_word(srcoffset);
-            DECODE_PRINTF("\n");
-            TRACE_AND_STEP();
-            *destreg = xor_word(*destreg, srcval);
-        }
-        break;
+	    destreg = DECODE_RM_WORD_REGISTER(rh);
+	    DECODE_PRINTF(",");
+	    srcoffset = decode_rm10_address(rl);
+	    srcval = fetch_data_word(srcoffset);
+	    DECODE_PRINTF("\n");
+	    TRACE_AND_STEP();
+	    *destreg = xor_word(*destreg, srcval);
+	}
+	break;
     case 3:                     /* register to register */
-        if (M.x86.mode & SYSMODE_PREFIX_DATA) {
-            u32 *destreg,*srcreg;
+	if (M.x86.mode & SYSMODE_PREFIX_DATA) {
+	    u32 *destreg,*srcreg;
 
-            destreg = DECODE_RM_LONG_REGISTER(rh);
-            DECODE_PRINTF(",");
-            srcreg = DECODE_RM_LONG_REGISTER(rl);
-            DECODE_PRINTF("\n");
-            TRACE_AND_STEP();
-            *destreg = xor_long(*destreg, *srcreg);
-        } else {
-            u16 *destreg,*srcreg;
+	    destreg = DECODE_RM_LONG_REGISTER(rh);
+	    DECODE_PRINTF(",");
+	    srcreg = DECODE_RM_LONG_REGISTER(rl);
+	    DECODE_PRINTF("\n");
+	    TRACE_AND_STEP();
+	    *destreg = xor_long(*destreg, *srcreg);
+	} else {
+	    u16 *destreg,*srcreg;
 
-            destreg = DECODE_RM_WORD_REGISTER(rh);
-            DECODE_PRINTF(",");
-            srcreg = DECODE_RM_WORD_REGISTER(rl);
-            DECODE_PRINTF("\n");
-            TRACE_AND_STEP();
-            *destreg = xor_word(*destreg, *srcreg);
-        }
-        break;
+	    destreg = DECODE_RM_WORD_REGISTER(rh);
+	    DECODE_PRINTF(",");
+	    srcreg = DECODE_RM_WORD_REGISTER(rl);
+	    DECODE_PRINTF("\n");
+	    TRACE_AND_STEP();
+	    *destreg = xor_word(*destreg, *srcreg);
+	}
+	break;
     }
     DECODE_CLEAR_SEGOVR();
     END_OF_INSTR();
@@ -2993,18 +2993,18 @@
 
     START_OF_INSTR();
     if (M.x86.mode & SYSMODE_PREFIX_DATA) {
-        DECODE_PRINTF("XOR\tEAX,");
-        srcval = fetch_long_imm();
+	DECODE_PRINTF("XOR\tEAX,");
+	srcval = fetch_long_imm();
     } else {
-        DECODE_PRINTF("XOR\tAX,");
-        srcval = fetch_word_imm();
+	DECODE_PRINTF("XOR\tAX,");
+	srcval = fetch_word_imm();
     }
     DECODE_PRINTF2("%x\n", srcval);
     TRACE_AND_STEP();
     if (M.x86.mode & SYSMODE_PREFIX_DATA) {
-        M.x86.R_EAX = xor_long(M.x86.R_EAX, srcval);
+	M.x86.R_EAX = xor_long(M.x86.R_EAX, srcval);
     } else {
-        M.x86.R_AX = xor_word(M.x86.R_AX, (u16)srcval);
+	M.x86.R_AX = xor_word(M.x86.R_AX, (u16)srcval);
     }
     DECODE_CLEAR_SEGOVR();
     END_OF_INSTR();
@@ -3054,40 +3054,40 @@
     FETCH_DECODE_MODRM(mod, rh, rl);
     switch (mod) {
     case 0:
-        destoffset = decode_rm00_address(rl);
-        DECODE_PRINTF(",");
-        destval = fetch_data_byte(destoffset);
-        srcreg = DECODE_RM_BYTE_REGISTER(rh);
-        DECODE_PRINTF("\n");
-        TRACE_AND_STEP();
-        cmp_byte(destval, *srcreg);
-        break;
+	destoffset = decode_rm00_address(rl);
+	DECODE_PRINTF(",");
+	destval = fetch_data_byte(destoffset);
+	srcreg = DECODE_RM_BYTE_REGISTER(rh);
+	DECODE_PRINTF("\n");
+	TRACE_AND_STEP();
+	cmp_byte(destval, *srcreg);
+	break;
     case 1:
-        destoffset = decode_rm01_address(rl);
-        DECODE_PRINTF(",");
-        destval = fetch_data_byte(destoffset);
-        srcreg = DECODE_RM_BYTE_REGISTER(rh);
-        DECODE_PRINTF("\n");
-        TRACE_AND_STEP();
-        cmp_byte(destval, *srcreg);
-        break;
+	destoffset = decode_rm01_address(rl);
+	DECODE_PRINTF(",");
+	destval = fetch_data_byte(destoffset);
+	srcreg = DECODE_RM_BYTE_REGISTER(rh);
+	DECODE_PRINTF("\n");
+	TRACE_AND_STEP();
+	cmp_byte(destval, *srcreg);
+	break;
     case 2:
-        destoffset = decode_rm10_address(rl);
-        DECODE_PRINTF(",");
-        destval = fetch_data_byte(destoffset);
-        srcreg = DECODE_RM_BYTE_REGISTER(rh);
-        DECODE_PRINTF("\n");
-        TRACE_AND_STEP();
-        cmp_byte(destval, *srcreg);
-        break;
+	destoffset = decode_rm10_address(rl);
+	DECODE_PRINTF(",");
+	destval = fetch_data_byte(destoffset);
+	srcreg = DECODE_RM_BYTE_REGISTER(rh);
+	DECODE_PRINTF("\n");
+	TRACE_AND_STEP();
+	cmp_byte(destval, *srcreg);
+	break;
     case 3:                     /* register to register */
-        destreg = DECODE_RM_BYTE_REGISTER(rl);
-        DECODE_PRINTF(",");
-        srcreg = DECODE_RM_BYTE_REGISTER(rh);
-        DECODE_PRINTF("\n");
-        TRACE_AND_STEP();
-        cmp_byte(*destreg, *srcreg);
-        break;
+	destreg = DECODE_RM_BYTE_REGISTER(rl);
+	DECODE_PRINTF(",");
+	srcreg = DECODE_RM_BYTE_REGISTER(rh);
+	DECODE_PRINTF("\n");
+	TRACE_AND_STEP();
+	cmp_byte(*destreg, *srcreg);
+	break;
     }
     DECODE_CLEAR_SEGOVR();
     END_OF_INSTR();
@@ -3107,101 +3107,101 @@
     FETCH_DECODE_MODRM(mod, rh, rl);
     switch (mod) {
     case 0:
-        if (M.x86.mode & SYSMODE_PREFIX_DATA) {
-            u32 destval;
-            u32 *srcreg;
+	if (M.x86.mode & SYSMODE_PREFIX_DATA) {
+	    u32 destval;
+	    u32 *srcreg;
 
-            destoffset = decode_rm00_address(rl);
-            DECODE_PRINTF(",");
-            destval = fetch_data_long(destoffset);
-            srcreg = DECODE_RM_LONG_REGISTER(rh);
-            DECODE_PRINTF("\n");
-            TRACE_AND_STEP();
-            cmp_long(destval, *srcreg);
-        } else {
-            u16 destval;
-            u16 *srcreg;
+	    destoffset = decode_rm00_address(rl);
+	    DECODE_PRINTF(",");
+	    destval = fetch_data_long(destoffset);
+	    srcreg = DECODE_RM_LONG_REGISTER(rh);
+	    DECODE_PRINTF("\n");
+	    TRACE_AND_STEP();
+	    cmp_long(destval, *srcreg);
+	} else {
+	    u16 destval;
+	    u16 *srcreg;
 
-            destoffset = decode_rm00_address(rl);
-            DECODE_PRINTF(",");
-            destval = fetch_data_word(destoffset);
-            srcreg = DECODE_RM_WORD_REGISTER(rh);
-            DECODE_PRINTF("\n");
-            TRACE_AND_STEP();
-            cmp_word(destval, *srcreg);
-        }
-        break;
+	    destoffset = decode_rm00_address(rl);
+	    DECODE_PRINTF(",");
+	    destval = fetch_data_word(destoffset);
+	    srcreg = DECODE_RM_WORD_REGISTER(rh);
+	    DECODE_PRINTF("\n");
+	    TRACE_AND_STEP();
+	    cmp_word(destval, *srcreg);
+	}
+	break;
     case 1:
-        if (M.x86.mode & SYSMODE_PREFIX_DATA) {
-            u32 destval;
-            u32 *srcreg;
+	if (M.x86.mode & SYSMODE_PREFIX_DATA) {
+	    u32 destval;
+	    u32 *srcreg;
 
-            destoffset = decode_rm01_address(rl);
-            DECODE_PRINTF(",");
-            destval = fetch_data_long(destoffset);
-            srcreg = DECODE_RM_LONG_REGISTER(rh);
-            DECODE_PRINTF("\n");
-            TRACE_AND_STEP();
-            cmp_long(destval, *srcreg);
-        } else {
-            u16 destval;
-            u16 *srcreg;
+	    destoffset = decode_rm01_address(rl);
+	    DECODE_PRINTF(",");
+	    destval = fetch_data_long(destoffset);
+	    srcreg = DECODE_RM_LONG_REGISTER(rh);
+	    DECODE_PRINTF("\n");
+	    TRACE_AND_STEP();
+	    cmp_long(destval, *srcreg);
+	} else {
+	    u16 destval;
+	    u16 *srcreg;
 
-            destoffset = decode_rm01_address(rl);
-            DECODE_PRINTF(",");
-            destval = fetch_data_word(destoffset);
-            srcreg = DECODE_RM_WORD_REGISTER(rh);
-            DECODE_PRINTF("\n");
-            TRACE_AND_STEP();
-            cmp_word(destval, *srcreg);
-        }
-        break;
+	    destoffset = decode_rm01_address(rl);
+	    DECODE_PRINTF(",");
+	    destval = fetch_data_word(destoffset);
+	    srcreg = DECODE_RM_WORD_REGISTER(rh);
+	    DECODE_PRINTF("\n");
+	    TRACE_AND_STEP();
+	    cmp_word(destval, *srcreg);
+	}
+	break;
     case 2:
-        if (M.x86.mode & SYSMODE_PREFIX_DATA) {
-            u32 destval;
-            u32 *srcreg;
+	if (M.x86.mode & SYSMODE_PREFIX_DATA) {
+	    u32 destval;
+	    u32 *srcreg;
 
-            destoffset = decode_rm10_address(rl);
-            DECODE_PRINTF(",");
-            destval = fetch_data_long(destoffset);
-            srcreg = DECODE_RM_LONG_REGISTER(rh);
-            DECODE_PRINTF("\n");
-            TRACE_AND_STEP();
-            cmp_long(destval, *srcreg);
-        } else {
-            u16 destval;
-            u16 *srcreg;
+	    destoffset = decode_rm10_address(rl);
+	    DECODE_PRINTF(",");
+	    destval = fetch_data_long(destoffset);
+	    srcreg = DECODE_RM_LONG_REGISTER(rh);
+	    DECODE_PRINTF("\n");
+	    TRACE_AND_STEP();
+	    cmp_long(destval, *srcreg);
+	} else {
+	    u16 destval;
+	    u16 *srcreg;
 
-            destoffset = decode_rm10_address(rl);
-            DECODE_PRINTF(",");
-            destval = fetch_data_word(destoffset);
-            srcreg = DECODE_RM_WORD_REGISTER(rh);
-            DECODE_PRINTF("\n");
-            TRACE_AND_STEP();
-            cmp_word(destval, *srcreg);
-        }
-        break;
+	    destoffset = decode_rm10_address(rl);
+	    DECODE_PRINTF(",");
+	    destval = fetch_data_word(destoffset);
+	    srcreg = DECODE_RM_WORD_REGISTER(rh);
+	    DECODE_PRINTF("\n");
+	    TRACE_AND_STEP();
+	    cmp_word(destval, *srcreg);
+	}
+	break;
     case 3:                     /* register to register */
-        if (M.x86.mode & SYSMODE_PREFIX_DATA) {
-            u32 *destreg,*srcreg;
+	if (M.x86.mode & SYSMODE_PREFIX_DATA) {
+	    u32 *destreg,*srcreg;
 
-            destreg = DECODE_RM_LONG_REGISTER(rl);
-            DECODE_PRINTF(",");
-            srcreg = DECODE_RM_LONG_REGISTER(rh);
-            DECODE_PRINTF("\n");
-            TRACE_AND_STEP();
-            cmp_long(*destreg, *srcreg);
-        } else {
-            u16 *destreg,*srcreg;
+	    destreg = DECODE_RM_LONG_REGISTER(rl);
+	    DECODE_PRINTF(",");
+	    srcreg = DECODE_RM_LONG_REGISTER(rh);
+	    DECODE_PRINTF("\n");
+	    TRACE_AND_STEP();
+	    cmp_long(*destreg, *srcreg);
+	} else {
+	    u16 *destreg,*srcreg;
 
-            destreg = DECODE_RM_WORD_REGISTER(rl);
-            DECODE_PRINTF(",");
-            srcreg = DECODE_RM_WORD_REGISTER(rh);
-            DECODE_PRINTF("\n");
-            TRACE_AND_STEP();
-            cmp_word(*destreg, *srcreg);
-        }
-        break;
+	    destreg = DECODE_RM_WORD_REGISTER(rl);
+	    DECODE_PRINTF(",");
+	    srcreg = DECODE_RM_WORD_REGISTER(rh);
+	    DECODE_PRINTF("\n");
+	    TRACE_AND_STEP();
+	    cmp_word(*destreg, *srcreg);
+	}
+	break;
     }
     DECODE_CLEAR_SEGOVR();
     END_OF_INSTR();
@@ -3223,40 +3223,40 @@
     FETCH_DECODE_MODRM(mod, rh, rl);
     switch (mod) {
     case 0:
-        destreg = DECODE_RM_BYTE_REGISTER(rh);
-        DECODE_PRINTF(",");
-        srcoffset = decode_rm00_address(rl);
-        srcval = fetch_data_byte(srcoffset);
-        DECODE_PRINTF("\n");
-        TRACE_AND_STEP();
-        cmp_byte(*destreg, srcval);
-        break;
+	destreg = DECODE_RM_BYTE_REGISTER(rh);
+	DECODE_PRINTF(",");
+	srcoffset = decode_rm00_address(rl);
+	srcval = fetch_data_byte(srcoffset);
+	DECODE_PRINTF("\n");
+	TRACE_AND_STEP();
+	cmp_byte(*destreg, srcval);
+	break;
     case 1:
-        destreg = DECODE_RM_BYTE_REGISTER(rh);
-        DECODE_PRINTF(",");
-        srcoffset = decode_rm01_address(rl);
-        srcval = fetch_data_byte(srcoffset);
-        DECODE_PRINTF("\n");
-        TRACE_AND_STEP();
-        cmp_byte(*destreg, srcval);
-        break;
+	destreg = DECODE_RM_BYTE_REGISTER(rh);
+	DECODE_PRINTF(",");
+	srcoffset = decode_rm01_address(rl);
+	srcval = fetch_data_byte(srcoffset);
+	DECODE_PRINTF("\n");
+	TRACE_AND_STEP();
+	cmp_byte(*destreg, srcval);
+	break;
     case 2:
-        destreg = DECODE_RM_BYTE_REGISTER(rh);
-        DECODE_PRINTF(",");
-        srcoffset = decode_rm10_address(rl);
-        srcval = fetch_data_byte(srcoffset);
-        DECODE_PRINTF("\n");
-        TRACE_AND_STEP();
-        cmp_byte(*destreg, srcval);
-        break;
+	destreg = DECODE_RM_BYTE_REGISTER(rh);
+	DECODE_PRINTF(",");
+	srcoffset = decode_rm10_address(rl);
+	srcval = fetch_data_byte(srcoffset);
+	DECODE_PRINTF("\n");
+	TRACE_AND_STEP();
+	cmp_byte(*destreg, srcval);
+	break;
     case 3:                     /* register to register */
-        destreg = DECODE_RM_BYTE_REGISTER(rh);
-        DECODE_PRINTF(",");
-        srcreg = DECODE_RM_BYTE_REGISTER(rl);
-        DECODE_PRINTF("\n");
-        TRACE_AND_STEP();
-        cmp_byte(*destreg, *srcreg);
-        break;
+	destreg = DECODE_RM_BYTE_REGISTER(rh);
+	DECODE_PRINTF(",");
+	srcreg = DECODE_RM_BYTE_REGISTER(rl);
+	DECODE_PRINTF("\n");
+	TRACE_AND_STEP();
+	cmp_byte(*destreg, *srcreg);
+	break;
     }
     DECODE_CLEAR_SEGOVR();
     END_OF_INSTR();
@@ -3276,101 +3276,101 @@
     FETCH_DECODE_MODRM(mod, rh, rl);
     switch (mod) {
     case 0:
-        if (M.x86.mode & SYSMODE_PREFIX_DATA) {
-            u32 *destreg;
-            u32 srcval;
+	if (M.x86.mode & SYSMODE_PREFIX_DATA) {
+	    u32 *destreg;
+	    u32 srcval;
 
-            destreg = DECODE_RM_LONG_REGISTER(rh);
-            DECODE_PRINTF(",");
-            srcoffset = decode_rm00_address(rl);
-            srcval = fetch_data_long(srcoffset);
-            DECODE_PRINTF("\n");
-            TRACE_AND_STEP();
-            cmp_long(*destreg, srcval);
-        } else {
-            u16 *destreg;
-            u16 srcval;
+	    destreg = DECODE_RM_LONG_REGISTER(rh);
+	    DECODE_PRINTF(",");
+	    srcoffset = decode_rm00_address(rl);
+	    srcval = fetch_data_long(srcoffset);
+	    DECODE_PRINTF("\n");
+	    TRACE_AND_STEP();
+	    cmp_long(*destreg, srcval);
+	} else {
+	    u16 *destreg;
+	    u16 srcval;
 
-            destreg = DECODE_RM_WORD_REGISTER(rh);
-            DECODE_PRINTF(",");
-            srcoffset = decode_rm00_address(rl);
-            srcval = fetch_data_word(srcoffset);
-            DECODE_PRINTF("\n");
-            TRACE_AND_STEP();
-            cmp_word(*destreg, srcval);
-        }
-        break;
+	    destreg = DECODE_RM_WORD_REGISTER(rh);
+	    DECODE_PRINTF(",");
+	    srcoffset = decode_rm00_address(rl);
+	    srcval = fetch_data_word(srcoffset);
+	    DECODE_PRINTF("\n");
+	    TRACE_AND_STEP();
+	    cmp_word(*destreg, srcval);
+	}
+	break;
     case 1:
-        if (M.x86.mode & SYSMODE_PREFIX_DATA) {
-            u32 *destreg;
-            u32 srcval;
+	if (M.x86.mode & SYSMODE_PREFIX_DATA) {
+	    u32 *destreg;
+	    u32 srcval;
 
-            destreg = DECODE_RM_LONG_REGISTER(rh);
-            DECODE_PRINTF(",");
-            srcoffset = decode_rm01_address(rl);
-            srcval = fetch_data_long(srcoffset);
-            DECODE_PRINTF("\n");
-            TRACE_AND_STEP();
-            cmp_long(*destreg, srcval);
-        } else {
-            u16 *destreg;
-            u16 srcval;
+	    destreg = DECODE_RM_LONG_REGISTER(rh);
+	    DECODE_PRINTF(",");
+	    srcoffset = decode_rm01_address(rl);
+	    srcval = fetch_data_long(srcoffset);
+	    DECODE_PRINTF("\n");
+	    TRACE_AND_STEP();
+	    cmp_long(*destreg, srcval);
+	} else {
+	    u16 *destreg;
+	    u16 srcval;
 
-            destreg = DECODE_RM_WORD_REGISTER(rh);
-            DECODE_PRINTF(",");
-            srcoffset = decode_rm01_address(rl);
-            srcval = fetch_data_word(srcoffset);
-            DECODE_PRINTF("\n");
-            TRACE_AND_STEP();
-            cmp_word(*destreg, srcval);
-        }
-        break;
+	    destreg = DECODE_RM_WORD_REGISTER(rh);
+	    DECODE_PRINTF(",");
+	    srcoffset = decode_rm01_address(rl);
+	    srcval = fetch_data_word(srcoffset);
+	    DECODE_PRINTF("\n");
+	    TRACE_AND_STEP();
+	    cmp_word(*destreg, srcval);
+	}
+	break;
     case 2:
-        if (M.x86.mode & SYSMODE_PREFIX_DATA) {
-            u32 *destreg;
-            u32 srcval;
+	if (M.x86.mode & SYSMODE_PREFIX_DATA) {
+	    u32 *destreg;
+	    u32 srcval;
 
-            destreg = DECODE_RM_LONG_REGISTER(rh);
-            DECODE_PRINTF(",");
-            srcoffset = decode_rm10_address(rl);
-            srcval = fetch_data_long(srcoffset);
-            DECODE_PRINTF("\n");
-            TRACE_AND_STEP();
-            cmp_long(*destreg, srcval);
-        } else {
-            u16 *destreg;
-            u16 srcval;
+	    destreg = DECODE_RM_LONG_REGISTER(rh);
+	    DECODE_PRINTF(",");
+	    srcoffset = decode_rm10_address(rl);
+	    srcval = fetch_data_long(srcoffset);
+	    DECODE_PRINTF("\n");
+	    TRACE_AND_STEP();
+	    cmp_long(*destreg, srcval);
+	} else {
+	    u16 *destreg;
+	    u16 srcval;
 
-            destreg = DECODE_RM_WORD_REGISTER(rh);
-            DECODE_PRINTF(",");
-            srcoffset = decode_rm10_address(rl);
-            srcval = fetch_data_word(srcoffset);
-            DECODE_PRINTF("\n");
-            TRACE_AND_STEP();
-            cmp_word(*destreg, srcval);
-        }
-        break;
+	    destreg = DECODE_RM_WORD_REGISTER(rh);
+	    DECODE_PRINTF(",");
+	    srcoffset = decode_rm10_address(rl);
+	    srcval = fetch_data_word(srcoffset);
+	    DECODE_PRINTF("\n");
+	    TRACE_AND_STEP();
+	    cmp_word(*destreg, srcval);
+	}
+	break;
     case 3:                     /* register to register */
-        if (M.x86.mode & SYSMODE_PREFIX_DATA) {
-            u32 *destreg,*srcreg;
+	if (M.x86.mode & SYSMODE_PREFIX_DATA) {
+	    u32 *destreg,*srcreg;
 
-            destreg = DECODE_RM_LONG_REGISTER(rh);
-            DECODE_PRINTF(",");
-            srcreg = DECODE_RM_LONG_REGISTER(rl);
-            DECODE_PRINTF("\n");
-            TRACE_AND_STEP();
-            cmp_long(*destreg, *srcreg);
-        } else {
-            u16 *destreg,*srcreg;
+	    destreg = DECODE_RM_LONG_REGISTER(rh);
+	    DECODE_PRINTF(",");
+	    srcreg = DECODE_RM_LONG_REGISTER(rl);
+	    DECODE_PRINTF("\n");
+	    TRACE_AND_STEP();
+	    cmp_long(*destreg, *srcreg);
+	} else {
+	    u16 *destreg,*srcreg;
 
-            destreg = DECODE_RM_WORD_REGISTER(rh);
-            DECODE_PRINTF(",");
-            srcreg = DECODE_RM_WORD_REGISTER(rl);
-            DECODE_PRINTF("\n");
-            TRACE_AND_STEP();
-            cmp_word(*destreg, *srcreg);
-        }
-        break;
+	    destreg = DECODE_RM_WORD_REGISTER(rh);
+	    DECODE_PRINTF(",");
+	    srcreg = DECODE_RM_WORD_REGISTER(rl);
+	    DECODE_PRINTF("\n");
+	    TRACE_AND_STEP();
+	    cmp_word(*destreg, *srcreg);
+	}
+	break;
     }
     DECODE_CLEAR_SEGOVR();
     END_OF_INSTR();
@@ -3404,18 +3404,18 @@
 
     START_OF_INSTR();
     if (M.x86.mode & SYSMODE_PREFIX_DATA) {
-        DECODE_PRINTF("CMP\tEAX,");
-        srcval = fetch_long_imm();
+	DECODE_PRINTF("CMP\tEAX,");
+	srcval = fetch_long_imm();
     } else {
-        DECODE_PRINTF("CMP\tAX,");
-        srcval = fetch_word_imm();
+	DECODE_PRINTF("CMP\tAX,");
+	srcval = fetch_word_imm();
     }
     DECODE_PRINTF2("%x\n", srcval);
     TRACE_AND_STEP();
     if (M.x86.mode & SYSMODE_PREFIX_DATA) {
-        cmp_long(M.x86.R_EAX, srcval);
+	cmp_long(M.x86.R_EAX, srcval);
     } else {
-        cmp_word(M.x86.R_AX, (u16)srcval);
+	cmp_word(M.x86.R_AX, (u16)srcval);
     }
     DECODE_CLEAR_SEGOVR();
     END_OF_INSTR();
@@ -3457,15 +3457,15 @@
 {
     START_OF_INSTR();
     if (M.x86.mode & SYSMODE_PREFIX_DATA) {
-        DECODE_PRINTF("INC\tEAX\n");
+	DECODE_PRINTF("INC\tEAX\n");
     } else {
-        DECODE_PRINTF("INC\tAX\n");
+	DECODE_PRINTF("INC\tAX\n");
     }
     TRACE_AND_STEP();
     if (M.x86.mode & SYSMODE_PREFIX_DATA) {
-        M.x86.R_EAX = inc_long(M.x86.R_EAX);
+	M.x86.R_EAX = inc_long(M.x86.R_EAX);
     } else {
-        M.x86.R_AX = inc_word(M.x86.R_AX);
+	M.x86.R_AX = inc_word(M.x86.R_AX);
     }
     DECODE_CLEAR_SEGOVR();
     END_OF_INSTR();
@@ -3479,15 +3479,15 @@
 {
     START_OF_INSTR();
     if (M.x86.mode & SYSMODE_PREFIX_DATA) {
-        DECODE_PRINTF("INC\tECX\n");
+	DECODE_PRINTF("INC\tECX\n");
     } else {
-        DECODE_PRINTF("INC\tCX\n");
+	DECODE_PRINTF("INC\tCX\n");
     }
     TRACE_AND_STEP();
     if (M.x86.mode & SYSMODE_PREFIX_DATA) {
-        M.x86.R_ECX = inc_long(M.x86.R_ECX);
+	M.x86.R_ECX = inc_long(M.x86.R_ECX);
     } else {
-        M.x86.R_CX = inc_word(M.x86.R_CX);
+	M.x86.R_CX = inc_word(M.x86.R_CX);
     }
     DECODE_CLEAR_SEGOVR();
     END_OF_INSTR();
@@ -3501,15 +3501,15 @@
 {
     START_OF_INSTR();
     if (M.x86.mode & SYSMODE_PREFIX_DATA) {
-        DECODE_PRINTF("INC\tEDX\n");
+	DECODE_PRINTF("INC\tEDX\n");
     } else {
-        DECODE_PRINTF("INC\tDX\n");
+	DECODE_PRINTF("INC\tDX\n");
     }
     TRACE_AND_STEP();
     if (M.x86.mode & SYSMODE_PREFIX_DATA) {
-        M.x86.R_EDX = inc_long(M.x86.R_EDX);
+	M.x86.R_EDX = inc_long(M.x86.R_EDX);
     } else {
-        M.x86.R_DX = inc_word(M.x86.R_DX);
+	M.x86.R_DX = inc_word(M.x86.R_DX);
     }
     DECODE_CLEAR_SEGOVR();
     END_OF_INSTR();
@@ -3523,15 +3523,15 @@
 {
     START_OF_INSTR();
     if (M.x86.mode & SYSMODE_PREFIX_DATA) {
-        DECODE_PRINTF("INC\tEBX\n");
+	DECODE_PRINTF("INC\tEBX\n");
     } else {
-        DECODE_PRINTF("INC\tBX\n");
+	DECODE_PRINTF("INC\tBX\n");
     }
     TRACE_AND_STEP();
     if (M.x86.mode & SYSMODE_PREFIX_DATA) {
-        M.x86.R_EBX = inc_long(M.x86.R_EBX);
+	M.x86.R_EBX = inc_long(M.x86.R_EBX);
     } else {
-        M.x86.R_BX = inc_word(M.x86.R_BX);
+	M.x86.R_BX = inc_word(M.x86.R_BX);
     }
     DECODE_CLEAR_SEGOVR();
     END_OF_INSTR();
@@ -3545,15 +3545,15 @@
 {
     START_OF_INSTR();
     if (M.x86.mode & SYSMODE_PREFIX_DATA) {
-        DECODE_PRINTF("INC\tESP\n");
+	DECODE_PRINTF("INC\tESP\n");
     } else {
-        DECODE_PRINTF("INC\tSP\n");
+	DECODE_PRINTF("INC\tSP\n");
     }
     TRACE_AND_STEP();
     if (M.x86.mode & SYSMODE_PREFIX_DATA) {
-        M.x86.R_ESP = inc_long(M.x86.R_ESP);
+	M.x86.R_ESP = inc_long(M.x86.R_ESP);
     } else {
-        M.x86.R_SP = inc_word(M.x86.R_SP);
+	M.x86.R_SP = inc_word(M.x86.R_SP);
     }
     DECODE_CLEAR_SEGOVR();
     END_OF_INSTR();
@@ -3567,15 +3567,15 @@
 {
     START_OF_INSTR();
     if (M.x86.mode & SYSMODE_PREFIX_DATA) {
-        DECODE_PRINTF("INC\tEBP\n");
+	DECODE_PRINTF("INC\tEBP\n");
     } else {
-        DECODE_PRINTF("INC\tBP\n");
+	DECODE_PRINTF("INC\tBP\n");
     }
     TRACE_AND_STEP();
     if (M.x86.mode & SYSMODE_PREFIX_DATA) {
-        M.x86.R_EBP = inc_long(M.x86.R_EBP);
+	M.x86.R_EBP = inc_long(M.x86.R_EBP);
     } else {
-        M.x86.R_BP = inc_word(M.x86.R_BP);
+	M.x86.R_BP = inc_word(M.x86.R_BP);
     }
     DECODE_CLEAR_SEGOVR();
     END_OF_INSTR();
@@ -3589,15 +3589,15 @@
 {
     START_OF_INSTR();
     if (M.x86.mode & SYSMODE_PREFIX_DATA) {
-        DECODE_PRINTF("INC\tESI\n");
+	DECODE_PRINTF("INC\tESI\n");
     } else {
-        DECODE_PRINTF("INC\tSI\n");
+	DECODE_PRINTF("INC\tSI\n");
     }
     TRACE_AND_STEP();
     if (M.x86.mode & SYSMODE_PREFIX_DATA) {
-        M.x86.R_ESI = inc_long(M.x86.R_ESI);
+	M.x86.R_ESI = inc_long(M.x86.R_ESI);
     } else {
-        M.x86.R_SI = inc_word(M.x86.R_SI);
+	M.x86.R_SI = inc_word(M.x86.R_SI);
     }
     DECODE_CLEAR_SEGOVR();
     END_OF_INSTR();
@@ -3611,15 +3611,15 @@
 {
     START_OF_INSTR();
     if (M.x86.mode & SYSMODE_PREFIX_DATA) {
-        DECODE_PRINTF("INC\tEDI\n");
+	DECODE_PRINTF("INC\tEDI\n");
     } else {
-        DECODE_PRINTF("INC\tDI\n");
+	DECODE_PRINTF("INC\tDI\n");
     }
     TRACE_AND_STEP();
     if (M.x86.mode & SYSMODE_PREFIX_DATA) {
-        M.x86.R_EDI = inc_long(M.x86.R_EDI);
+	M.x86.R_EDI = inc_long(M.x86.R_EDI);
     } else {
-        M.x86.R_DI = inc_word(M.x86.R_DI);
+	M.x86.R_DI = inc_word(M.x86.R_DI);
     }
     DECODE_CLEAR_SEGOVR();
     END_OF_INSTR();
@@ -3633,15 +3633,15 @@
 {
     START_OF_INSTR();
     if (M.x86.mode & SYSMODE_PREFIX_DATA) {
-        DECODE_PRINTF("DEC\tEAX\n");
+	DECODE_PRINTF("DEC\tEAX\n");
     } else {
-        DECODE_PRINTF("DEC\tAX\n");
+	DECODE_PRINTF("DEC\tAX\n");
     }
     TRACE_AND_STEP();
     if (M.x86.mode & SYSMODE_PREFIX_DATA) {
-        M.x86.R_EAX = dec_long(M.x86.R_EAX);
+	M.x86.R_EAX = dec_long(M.x86.R_EAX);
     } else {
-        M.x86.R_AX = dec_word(M.x86.R_AX);
+	M.x86.R_AX = dec_word(M.x86.R_AX);
     }
     DECODE_CLEAR_SEGOVR();
     END_OF_INSTR();
@@ -3655,15 +3655,15 @@
 {
     START_OF_INSTR();
     if (M.x86.mode & SYSMODE_PREFIX_DATA) {
-        DECODE_PRINTF("DEC\tECX\n");
+	DECODE_PRINTF("DEC\tECX\n");
     } else {
-        DECODE_PRINTF("DEC\tCX\n");
+	DECODE_PRINTF("DEC\tCX\n");
     }
     TRACE_AND_STEP();
     if (M.x86.mode & SYSMODE_PREFIX_DATA) {
-        M.x86.R_ECX = dec_long(M.x86.R_ECX);
+	M.x86.R_ECX = dec_long(M.x86.R_ECX);
     } else {
-        M.x86.R_CX = dec_word(M.x86.R_CX);
+	M.x86.R_CX = dec_word(M.x86.R_CX);
     }
     DECODE_CLEAR_SEGOVR();
     END_OF_INSTR();
@@ -3677,15 +3677,15 @@
 {
     START_OF_INSTR();
     if (M.x86.mode & SYSMODE_PREFIX_DATA) {
-        DECODE_PRINTF("DEC\tEDX\n");
+	DECODE_PRINTF("DEC\tEDX\n");
     } else {
-        DECODE_PRINTF("DEC\tDX\n");
+	DECODE_PRINTF("DEC\tDX\n");
     }
     TRACE_AND_STEP();
     if (M.x86.mode & SYSMODE_PREFIX_DATA) {
-        M.x86.R_EDX = dec_long(M.x86.R_EDX);
+	M.x86.R_EDX = dec_long(M.x86.R_EDX);
     } else {
-        M.x86.R_DX = dec_word(M.x86.R_DX);
+	M.x86.R_DX = dec_word(M.x86.R_DX);
     }
     DECODE_CLEAR_SEGOVR();
     END_OF_INSTR();
@@ -3699,15 +3699,15 @@
 {
     START_OF_INSTR();
     if (M.x86.mode & SYSMODE_PREFIX_DATA) {
-        DECODE_PRINTF("DEC\tEBX\n");
+	DECODE_PRINTF("DEC\tEBX\n");
     } else {
-        DECODE_PRINTF("DEC\tBX\n");
+	DECODE_PRINTF("DEC\tBX\n");
     }
     TRACE_AND_STEP();
     if (M.x86.mode & SYSMODE_PREFIX_DATA) {
-        M.x86.R_EBX = dec_long(M.x86.R_EBX);
+	M.x86.R_EBX = dec_long(M.x86.R_EBX);
     } else {
-        M.x86.R_BX = dec_word(M.x86.R_BX);
+	M.x86.R_BX = dec_word(M.x86.R_BX);
     }
     DECODE_CLEAR_SEGOVR();
     END_OF_INSTR();
@@ -3721,15 +3721,15 @@
 {
     START_OF_INSTR();
     if (M.x86.mode & SYSMODE_PREFIX_DATA) {
-        DECODE_PRINTF("DEC\tESP\n");
+	DECODE_PRINTF("DEC\tESP\n");
     } else {
-        DECODE_PRINTF("DEC\tSP\n");
+	DECODE_PRINTF("DEC\tSP\n");
     }
     TRACE_AND_STEP();
     if (M.x86.mode & SYSMODE_PREFIX_DATA) {
-        M.x86.R_ESP = dec_long(M.x86.R_ESP);
+	M.x86.R_ESP = dec_long(M.x86.R_ESP);
     } else {
-        M.x86.R_SP = dec_word(M.x86.R_SP);
+	M.x86.R_SP = dec_word(M.x86.R_SP);
     }
     DECODE_CLEAR_SEGOVR();
     END_OF_INSTR();
@@ -3743,15 +3743,15 @@
 {
     START_OF_INSTR();
     if (M.x86.mode & SYSMODE_PREFIX_DATA) {
-        DECODE_PRINTF("DEC\tEBP\n");
+	DECODE_PRINTF("DEC\tEBP\n");
     } else {
-        DECODE_PRINTF("DEC\tBP\n");
+	DECODE_PRINTF("DEC\tBP\n");
     }
     TRACE_AND_STEP();
     if (M.x86.mode & SYSMODE_PREFIX_DATA) {
-        M.x86.R_EBP = dec_long(M.x86.R_EBP);
+	M.x86.R_EBP = dec_long(M.x86.R_EBP);
     } else {
-        M.x86.R_BP = dec_word(M.x86.R_BP);
+	M.x86.R_BP = dec_word(M.x86.R_BP);
     }
     DECODE_CLEAR_SEGOVR();
     END_OF_INSTR();
@@ -3765,15 +3765,15 @@
 {
     START_OF_INSTR();
     if (M.x86.mode & SYSMODE_PREFIX_DATA) {
-        DECODE_PRINTF("DEC\tESI\n");
+	DECODE_PRINTF("DEC\tESI\n");
     } else {
-        DECODE_PRINTF("DEC\tSI\n");
+	DECODE_PRINTF("DEC\tSI\n");
     }
     TRACE_AND_STEP();
     if (M.x86.mode & SYSMODE_PREFIX_DATA) {
-        M.x86.R_ESI = dec_long(M.x86.R_ESI);
+	M.x86.R_ESI = dec_long(M.x86.R_ESI);
     } else {
-        M.x86.R_SI = dec_word(M.x86.R_SI);
+	M.x86.R_SI = dec_word(M.x86.R_SI);
     }
     DECODE_CLEAR_SEGOVR();
     END_OF_INSTR();
@@ -3787,15 +3787,15 @@
 {
     START_OF_INSTR();
     if (M.x86.mode & SYSMODE_PREFIX_DATA) {
-        DECODE_PRINTF("DEC\tEDI\n");
+	DECODE_PRINTF("DEC\tEDI\n");
     } else {
-        DECODE_PRINTF("DEC\tDI\n");
+	DECODE_PRINTF("DEC\tDI\n");
     }
     TRACE_AND_STEP();
     if (M.x86.mode & SYSMODE_PREFIX_DATA) {
-        M.x86.R_EDI = dec_long(M.x86.R_EDI);
+	M.x86.R_EDI = dec_long(M.x86.R_EDI);
     } else {
-        M.x86.R_DI = dec_word(M.x86.R_DI);
+	M.x86.R_DI = dec_word(M.x86.R_DI);
     }
     DECODE_CLEAR_SEGOVR();
     END_OF_INSTR();
@@ -3809,15 +3809,15 @@
 {
     START_OF_INSTR();
     if (M.x86.mode & SYSMODE_PREFIX_DATA) {
-        DECODE_PRINTF("PUSH\tEAX\n");
+	DECODE_PRINTF("PUSH\tEAX\n");
     } else {
-        DECODE_PRINTF("PUSH\tAX\n");
+	DECODE_PRINTF("PUSH\tAX\n");
     }
     TRACE_AND_STEP();
     if (M.x86.mode & SYSMODE_PREFIX_DATA) {
-        push_long(M.x86.R_EAX);
+	push_long(M.x86.R_EAX);
     } else {
-        push_word(M.x86.R_AX);
+	push_word(M.x86.R_AX);
     }
     DECODE_CLEAR_SEGOVR();
     END_OF_INSTR();
@@ -3831,15 +3831,15 @@
 {
     START_OF_INSTR();
     if (M.x86.mode & SYSMODE_PREFIX_DATA) {
-        DECODE_PRINTF("PUSH\tECX\n");
+	DECODE_PRINTF("PUSH\tECX\n");
     } else {
-        DECODE_PRINTF("PUSH\tCX\n");
+	DECODE_PRINTF("PUSH\tCX\n");
     }
     TRACE_AND_STEP();
     if (M.x86.mode & SYSMODE_PREFIX_DATA) {
-        push_long(M.x86.R_ECX);
+	push_long(M.x86.R_ECX);
     } else {
-        push_word(M.x86.R_CX);
+	push_word(M.x86.R_CX);
     }
     DECODE_CLEAR_SEGOVR();
     END_OF_INSTR();
@@ -3853,15 +3853,15 @@
 {
     START_OF_INSTR();
     if (M.x86.mode & SYSMODE_PREFIX_DATA) {
-        DECODE_PRINTF("PUSH\tEDX\n");
+	DECODE_PRINTF("PUSH\tEDX\n");
     } else {
-        DECODE_PRINTF("PUSH\tDX\n");
+	DECODE_PRINTF("PUSH\tDX\n");
     }
     TRACE_AND_STEP();
     if (M.x86.mode & SYSMODE_PREFIX_DATA) {
-        push_long(M.x86.R_EDX);
+	push_long(M.x86.R_EDX);
     } else {
-        push_word(M.x86.R_DX);
+	push_word(M.x86.R_DX);
     }
     DECODE_CLEAR_SEGOVR();
     END_OF_INSTR();
@@ -3875,15 +3875,15 @@
 {
     START_OF_INSTR();
     if (M.x86.mode & SYSMODE_PREFIX_DATA) {
-        DECODE_PRINTF("PUSH\tEBX\n");
+	DECODE_PRINTF("PUSH\tEBX\n");
     } else {
-        DECODE_PRINTF("PUSH\tBX\n");
+	DECODE_PRINTF("PUSH\tBX\n");
     }
     TRACE_AND_STEP();
     if (M.x86.mode & SYSMODE_PREFIX_DATA) {
-        push_long(M.x86.R_EBX);
+	push_long(M.x86.R_EBX);
     } else {
-        push_word(M.x86.R_BX);
+	push_word(M.x86.R_BX);
     }
     DECODE_CLEAR_SEGOVR();
     END_OF_INSTR();
@@ -3897,9 +3897,9 @@
 {
     START_OF_INSTR();
     if (M.x86.mode & SYSMODE_PREFIX_DATA) {
-        DECODE_PRINTF("PUSH\tESP\n");
+	DECODE_PRINTF("PUSH\tESP\n");
     } else {
-        DECODE_PRINTF("PUSH\tSP\n");
+	DECODE_PRINTF("PUSH\tSP\n");
     }
     TRACE_AND_STEP();
 	/* Always push (E)SP, since we are emulating an i386 and above
@@ -3923,15 +3923,15 @@
 {
     START_OF_INSTR();
     if (M.x86.mode & SYSMODE_PREFIX_DATA) {
-        DECODE_PRINTF("PUSH\tEBP\n");
+	DECODE_PRINTF("PUSH\tEBP\n");
     } else {
-        DECODE_PRINTF("PUSH\tBP\n");
+	DECODE_PRINTF("PUSH\tBP\n");
     }
     TRACE_AND_STEP();
     if (M.x86.mode & SYSMODE_PREFIX_DATA) {
-        push_long(M.x86.R_EBP);
+	push_long(M.x86.R_EBP);
     } else {
-        push_word(M.x86.R_BP);
+	push_word(M.x86.R_BP);
     }
     DECODE_CLEAR_SEGOVR();
     END_OF_INSTR();
@@ -3945,15 +3945,15 @@
 {
     START_OF_INSTR();
     if (M.x86.mode & SYSMODE_PREFIX_DATA) {
-        DECODE_PRINTF("PUSH\tESI\n");
+	DECODE_PRINTF("PUSH\tESI\n");
     } else {
-        DECODE_PRINTF("PUSH\tSI\n");
+	DECODE_PRINTF("PUSH\tSI\n");
     }
     TRACE_AND_STEP();
     if (M.x86.mode & SYSMODE_PREFIX_DATA) {
-        push_long(M.x86.R_ESI);
+	push_long(M.x86.R_ESI);
     } else {
-        push_word(M.x86.R_SI);
+	push_word(M.x86.R_SI);
     }
     DECODE_CLEAR_SEGOVR();
     END_OF_INSTR();
@@ -3967,15 +3967,15 @@
 {
     START_OF_INSTR();
     if (M.x86.mode & SYSMODE_PREFIX_DATA) {
-        DECODE_PRINTF("PUSH\tEDI\n");
+	DECODE_PRINTF("PUSH\tEDI\n");
     } else {
-        DECODE_PRINTF("PUSH\tDI\n");
+	DECODE_PRINTF("PUSH\tDI\n");
     }
     TRACE_AND_STEP();
     if (M.x86.mode & SYSMODE_PREFIX_DATA) {
-        push_long(M.x86.R_EDI);
+	push_long(M.x86.R_EDI);
     } else {
-        push_word(M.x86.R_DI);
+	push_word(M.x86.R_DI);
     }
     DECODE_CLEAR_SEGOVR();
     END_OF_INSTR();
@@ -3989,15 +3989,15 @@
 {
     START_OF_INSTR();
     if (M.x86.mode & SYSMODE_PREFIX_DATA) {
-        DECODE_PRINTF("POP\tEAX\n");
+	DECODE_PRINTF("POP\tEAX\n");
     } else {
-        DECODE_PRINTF("POP\tAX\n");
+	DECODE_PRINTF("POP\tAX\n");
     }
     TRACE_AND_STEP();
     if (M.x86.mode & SYSMODE_PREFIX_DATA) {
-        M.x86.R_EAX = pop_long();
+	M.x86.R_EAX = pop_long();
     } else {
-        M.x86.R_AX = pop_word();
+	M.x86.R_AX = pop_word();
     }
     DECODE_CLEAR_SEGOVR();
     END_OF_INSTR();
@@ -4011,15 +4011,15 @@
 {
     START_OF_INSTR();
     if (M.x86.mode & SYSMODE_PREFIX_DATA) {
-        DECODE_PRINTF("POP\tECX\n");
+	DECODE_PRINTF("POP\tECX\n");
     } else {
-        DECODE_PRINTF("POP\tCX\n");
+	DECODE_PRINTF("POP\tCX\n");
     }
     TRACE_AND_STEP();
     if (M.x86.mode & SYSMODE_PREFIX_DATA) {
-        M.x86.R_ECX = pop_long();
+	M.x86.R_ECX = pop_long();
     } else {
-        M.x86.R_CX = pop_word();
+	M.x86.R_CX = pop_word();
     }
     DECODE_CLEAR_SEGOVR();
     END_OF_INSTR();
@@ -4033,15 +4033,15 @@
 {
     START_OF_INSTR();
     if (M.x86.mode & SYSMODE_PREFIX_DATA) {
-        DECODE_PRINTF("POP\tEDX\n");
+	DECODE_PRINTF("POP\tEDX\n");
     } else {
-        DECODE_PRINTF("POP\tDX\n");
+	DECODE_PRINTF("POP\tDX\n");
     }
     TRACE_AND_STEP();
     if (M.x86.mode & SYSMODE_PREFIX_DATA) {
-        M.x86.R_EDX = pop_long();
+	M.x86.R_EDX = pop_long();
     } else {
-        M.x86.R_DX = pop_word();
+	M.x86.R_DX = pop_word();
     }
     DECODE_CLEAR_SEGOVR();
     END_OF_INSTR();
@@ -4055,15 +4055,15 @@
 {
     START_OF_INSTR();
     if (M.x86.mode & SYSMODE_PREFIX_DATA) {
-        DECODE_PRINTF("POP\tEBX\n");
+	DECODE_PRINTF("POP\tEBX\n");
     } else {
-        DECODE_PRINTF("POP\tBX\n");
+	DECODE_PRINTF("POP\tBX\n");
     }
     TRACE_AND_STEP();
     if (M.x86.mode & SYSMODE_PREFIX_DATA) {
-        M.x86.R_EBX = pop_long();
+	M.x86.R_EBX = pop_long();
     } else {
-        M.x86.R_BX = pop_word();
+	M.x86.R_BX = pop_word();
     }
     DECODE_CLEAR_SEGOVR();
     END_OF_INSTR();
@@ -4077,15 +4077,15 @@
 {
     START_OF_INSTR();
     if (M.x86.mode & SYSMODE_PREFIX_DATA) {
-        DECODE_PRINTF("POP\tESP\n");
+	DECODE_PRINTF("POP\tESP\n");
     } else {
-        DECODE_PRINTF("POP\tSP\n");
+	DECODE_PRINTF("POP\tSP\n");
     }
     TRACE_AND_STEP();
     if (M.x86.mode & SYSMODE_PREFIX_DATA) {
-        M.x86.R_ESP = pop_long();
+	M.x86.R_ESP = pop_long();
     } else {
-        M.x86.R_SP = pop_word();
+	M.x86.R_SP = pop_word();
     }
     DECODE_CLEAR_SEGOVR();
     END_OF_INSTR();
@@ -4099,15 +4099,15 @@
 {
     START_OF_INSTR();
     if (M.x86.mode & SYSMODE_PREFIX_DATA) {
-        DECODE_PRINTF("POP\tEBP\n");
+	DECODE_PRINTF("POP\tEBP\n");
     } else {
-        DECODE_PRINTF("POP\tBP\n");
+	DECODE_PRINTF("POP\tBP\n");
     }
     TRACE_AND_STEP();
     if (M.x86.mode & SYSMODE_PREFIX_DATA) {
-        M.x86.R_EBP = pop_long();
+	M.x86.R_EBP = pop_long();
     } else {
-        M.x86.R_BP = pop_word();
+	M.x86.R_BP = pop_word();
     }
     DECODE_CLEAR_SEGOVR();
     END_OF_INSTR();
@@ -4121,15 +4121,15 @@
 {
     START_OF_INSTR();
     if (M.x86.mode & SYSMODE_PREFIX_DATA) {
-        DECODE_PRINTF("POP\tESI\n");
+	DECODE_PRINTF("POP\tESI\n");
     } else {
-        DECODE_PRINTF("POP\tSI\n");
+	DECODE_PRINTF("POP\tSI\n");
     }
     TRACE_AND_STEP();
     if (M.x86.mode & SYSMODE_PREFIX_DATA) {
-        M.x86.R_ESI = pop_long();
+	M.x86.R_ESI = pop_long();
     } else {
-        M.x86.R_SI = pop_word();
+	M.x86.R_SI = pop_word();
     }
     DECODE_CLEAR_SEGOVR();
     END_OF_INSTR();
@@ -4143,15 +4143,15 @@
 {
     START_OF_INSTR();
     if (M.x86.mode & SYSMODE_PREFIX_DATA) {
-        DECODE_PRINTF("POP\tEDI\n");
+	DECODE_PRINTF("POP\tEDI\n");
     } else {
-        DECODE_PRINTF("POP\tDI\n");
+	DECODE_PRINTF("POP\tDI\n");
     }
     TRACE_AND_STEP();
     if (M.x86.mode & SYSMODE_PREFIX_DATA) {
-        M.x86.R_EDI = pop_long();
+	M.x86.R_EDI = pop_long();
     } else {
-        M.x86.R_DI = pop_word();
+	M.x86.R_DI = pop_word();
     }
     DECODE_CLEAR_SEGOVR();
     END_OF_INSTR();
@@ -4165,33 +4165,33 @@
 {
     START_OF_INSTR();
     if (M.x86.mode & SYSMODE_PREFIX_DATA) {
-        DECODE_PRINTF("PUSHAD\n");
+	DECODE_PRINTF("PUSHAD\n");
     } else {
-        DECODE_PRINTF("PUSHA\n");
+	DECODE_PRINTF("PUSHA\n");
     }
     TRACE_AND_STEP();
     if (M.x86.mode & SYSMODE_PREFIX_DATA) {
-        u32 old_sp = M.x86.R_ESP;
+	u32 old_sp = M.x86.R_ESP;
 
-        push_long(M.x86.R_EAX);
-        push_long(M.x86.R_ECX);
-        push_long(M.x86.R_EDX);
-        push_long(M.x86.R_EBX);
-        push_long(old_sp);
-        push_long(M.x86.R_EBP);
-        push_long(M.x86.R_ESI);
-        push_long(M.x86.R_EDI);
+	push_long(M.x86.R_EAX);
+	push_long(M.x86.R_ECX);
+	push_long(M.x86.R_EDX);
+	push_long(M.x86.R_EBX);
+	push_long(old_sp);
+	push_long(M.x86.R_EBP);
+	push_long(M.x86.R_ESI);
+	push_long(M.x86.R_EDI);
     } else {
-        u16 old_sp = M.x86.R_SP;
+	u16 old_sp = M.x86.R_SP;
 
-        push_word(M.x86.R_AX);
-        push_word(M.x86.R_CX);
-        push_word(M.x86.R_DX);
-        push_word(M.x86.R_BX);
-        push_word(old_sp);
-        push_word(M.x86.R_BP);
-        push_word(M.x86.R_SI);
-        push_word(M.x86.R_DI);
+	push_word(M.x86.R_AX);
+	push_word(M.x86.R_CX);
+	push_word(M.x86.R_DX);
+	push_word(M.x86.R_BX);
+	push_word(old_sp);
+	push_word(M.x86.R_BP);
+	push_word(M.x86.R_SI);
+	push_word(M.x86.R_DI);
     }
     DECODE_CLEAR_SEGOVR();
     END_OF_INSTR();
@@ -4205,29 +4205,29 @@
 {
     START_OF_INSTR();
     if (M.x86.mode & SYSMODE_PREFIX_DATA) {
-        DECODE_PRINTF("POPAD\n");
+	DECODE_PRINTF("POPAD\n");
     } else {
-        DECODE_PRINTF("POPA\n");
+	DECODE_PRINTF("POPA\n");
     }
     TRACE_AND_STEP();
     if (M.x86.mode & SYSMODE_PREFIX_DATA) {
-        M.x86.R_EDI = pop_long();
-        M.x86.R_ESI = pop_long();
-        M.x86.R_EBP = pop_long();
-        M.x86.R_ESP += 4;              /* skip ESP */
-        M.x86.R_EBX = pop_long();
-        M.x86.R_EDX = pop_long();
-        M.x86.R_ECX = pop_long();
-        M.x86.R_EAX = pop_long();
+	M.x86.R_EDI = pop_long();
+	M.x86.R_ESI = pop_long();
+	M.x86.R_EBP = pop_long();
+	M.x86.R_ESP += 4;              /* skip ESP */
+	M.x86.R_EBX = pop_long();
+	M.x86.R_EDX = pop_long();
+	M.x86.R_ECX = pop_long();
+	M.x86.R_EAX = pop_long();
     } else {
-        M.x86.R_DI = pop_word();
-        M.x86.R_SI = pop_word();
-        M.x86.R_BP = pop_word();
-        M.x86.R_SP += 2;               /* skip SP */
-        M.x86.R_BX = pop_word();
-        M.x86.R_DX = pop_word();
-        M.x86.R_CX = pop_word();
-        M.x86.R_AX = pop_word();
+	M.x86.R_DI = pop_word();
+	M.x86.R_SI = pop_word();
+	M.x86.R_BP = pop_word();
+	M.x86.R_SP += 2;               /* skip SP */
+	M.x86.R_BX = pop_word();
+	M.x86.R_DX = pop_word();
+	M.x86.R_CX = pop_word();
+	M.x86.R_AX = pop_word();
     }
     DECODE_CLEAR_SEGOVR();
     END_OF_INSTR();
@@ -4308,16 +4308,16 @@
 
     START_OF_INSTR();
     if (M.x86.mode & SYSMODE_PREFIX_DATA) {
-        imm = fetch_long_imm();
+	imm = fetch_long_imm();
     } else {
-        imm = fetch_word_imm();
+	imm = fetch_word_imm();
     }
     DECODE_PRINTF2("PUSH\t%x\n", imm);
     TRACE_AND_STEP();
     if (M.x86.mode & SYSMODE_PREFIX_DATA) {
-        push_long(imm);
+	push_long(imm);
     } else {
-        push_word((u16)imm);
+	push_word((u16)imm);
     }
     DECODE_CLEAR_SEGOVR();
     END_OF_INSTR();
@@ -4337,188 +4337,188 @@
     FETCH_DECODE_MODRM(mod, rh, rl);
     switch (mod) {
     case 0:
-        if (M.x86.mode & SYSMODE_PREFIX_DATA) {
-            u32 *destreg;
-            u32 srcval;
-            u32 res_lo,res_hi;
-            s32 imm;
+	if (M.x86.mode & SYSMODE_PREFIX_DATA) {
+	    u32 *destreg;
+	    u32 srcval;
+	    u32 res_lo,res_hi;
+	    s32 imm;
 
-            destreg = DECODE_RM_LONG_REGISTER(rh);
-            DECODE_PRINTF(",");
-            srcoffset = decode_rm00_address(rl);
-            srcval = fetch_data_long(srcoffset);
-            imm = fetch_long_imm();
-            DECODE_PRINTF2(",%d\n", (s32)imm);
-            TRACE_AND_STEP();
-            imul_long_direct(&res_lo,&res_hi,(s32)srcval,(s32)imm);
-            if (res_hi != 0) {
-                SET_FLAG(F_CF);
-                SET_FLAG(F_OF);
-            } else {
-                CLEAR_FLAG(F_CF);
-                CLEAR_FLAG(F_OF);
-            }
-            *destreg = (u32)res_lo;
-        } else {
-            u16 *destreg;
-            u16 srcval;
-            u32 res;
-            s16 imm;
+	    destreg = DECODE_RM_LONG_REGISTER(rh);
+	    DECODE_PRINTF(",");
+	    srcoffset = decode_rm00_address(rl);
+	    srcval = fetch_data_long(srcoffset);
+	    imm = fetch_long_imm();
+	    DECODE_PRINTF2(",%d\n", (s32)imm);
+	    TRACE_AND_STEP();
+	    imul_long_direct(&res_lo,&res_hi,(s32)srcval,(s32)imm);
+	    if (res_hi != 0) {
+		SET_FLAG(F_CF);
+		SET_FLAG(F_OF);
+	    } else {
+		CLEAR_FLAG(F_CF);
+		CLEAR_FLAG(F_OF);
+	    }
+	    *destreg = (u32)res_lo;
+	} else {
+	    u16 *destreg;
+	    u16 srcval;
+	    u32 res;
+	    s16 imm;
 
-            destreg = DECODE_RM_WORD_REGISTER(rh);
-            DECODE_PRINTF(",");
-            srcoffset = decode_rm00_address(rl);
-            srcval = fetch_data_word(srcoffset);
-            imm = fetch_word_imm();
-            DECODE_PRINTF2(",%d\n", (s32)imm);
-            TRACE_AND_STEP();
-            res = (s16)srcval * (s16)imm;
-            if (res > 0xFFFF) {
-                SET_FLAG(F_CF);
-                SET_FLAG(F_OF);
-            } else {
-                CLEAR_FLAG(F_CF);
-                CLEAR_FLAG(F_OF);
-            }
-            *destreg = (u16)res;
-        }
-        break;
+	    destreg = DECODE_RM_WORD_REGISTER(rh);
+	    DECODE_PRINTF(",");
+	    srcoffset = decode_rm00_address(rl);
+	    srcval = fetch_data_word(srcoffset);
+	    imm = fetch_word_imm();
+	    DECODE_PRINTF2(",%d\n", (s32)imm);
+	    TRACE_AND_STEP();
+	    res = (s16)srcval * (s16)imm;
+	    if (res > 0xFFFF) {
+		SET_FLAG(F_CF);
+		SET_FLAG(F_OF);
+	    } else {
+		CLEAR_FLAG(F_CF);
+		CLEAR_FLAG(F_OF);
+	    }
+	    *destreg = (u16)res;
+	}
+	break;
     case 1:
-        if (M.x86.mode & SYSMODE_PREFIX_DATA) {
-            u32 *destreg;
-            u32 srcval;
-            u32 res_lo,res_hi;
-            s32 imm;
+	if (M.x86.mode & SYSMODE_PREFIX_DATA) {
+	    u32 *destreg;
+	    u32 srcval;
+	    u32 res_lo,res_hi;
+	    s32 imm;
 
-            destreg = DECODE_RM_LONG_REGISTER(rh);
-            DECODE_PRINTF(",");
-            srcoffset = decode_rm01_address(rl);
-            srcval = fetch_data_long(srcoffset);
-            imm = fetch_long_imm();
-            DECODE_PRINTF2(",%d\n", (s32)imm);
-            TRACE_AND_STEP();
-            imul_long_direct(&res_lo,&res_hi,(s32)srcval,(s32)imm);
-            if (res_hi != 0) {
-                SET_FLAG(F_CF);
-                SET_FLAG(F_OF);
-            } else {
-                CLEAR_FLAG(F_CF);
-                CLEAR_FLAG(F_OF);
-            }
-            *destreg = (u32)res_lo;
-        } else {
-            u16 *destreg;
-            u16 srcval;
-            u32 res;
-            s16 imm;
+	    destreg = DECODE_RM_LONG_REGISTER(rh);
+	    DECODE_PRINTF(",");
+	    srcoffset = decode_rm01_address(rl);
+	    srcval = fetch_data_long(srcoffset);
+	    imm = fetch_long_imm();
+	    DECODE_PRINTF2(",%d\n", (s32)imm);
+	    TRACE_AND_STEP();
+	    imul_long_direct(&res_lo,&res_hi,(s32)srcval,(s32)imm);
+	    if (res_hi != 0) {
+		SET_FLAG(F_CF);
+		SET_FLAG(F_OF);
+	    } else {
+		CLEAR_FLAG(F_CF);
+		CLEAR_FLAG(F_OF);
+	    }
+	    *destreg = (u32)res_lo;
+	} else {
+	    u16 *destreg;
+	    u16 srcval;
+	    u32 res;
+	    s16 imm;
 
-            destreg = DECODE_RM_WORD_REGISTER(rh);
-            DECODE_PRINTF(",");
-            srcoffset = decode_rm01_address(rl);
-            srcval = fetch_data_word(srcoffset);
-            imm = fetch_word_imm();
-            DECODE_PRINTF2(",%d\n", (s32)imm);
-            TRACE_AND_STEP();
-            res = (s16)srcval * (s16)imm;
-            if (res > 0xFFFF) {
-                SET_FLAG(F_CF);
-                SET_FLAG(F_OF);
-            } else {
-                CLEAR_FLAG(F_CF);
-                CLEAR_FLAG(F_OF);
-            }
-            *destreg = (u16)res;
-        }
-        break;
+	    destreg = DECODE_RM_WORD_REGISTER(rh);
+	    DECODE_PRINTF(",");
+	    srcoffset = decode_rm01_address(rl);
+	    srcval = fetch_data_word(srcoffset);
+	    imm = fetch_word_imm();
+	    DECODE_PRINTF2(",%d\n", (s32)imm);
+	    TRACE_AND_STEP();
+	    res = (s16)srcval * (s16)imm;
+	    if (res > 0xFFFF) {
+		SET_FLAG(F_CF);
+		SET_FLAG(F_OF);
+	    } else {
+		CLEAR_FLAG(F_CF);
+		CLEAR_FLAG(F_OF);
+	    }
+	    *destreg = (u16)res;
+	}
+	break;
     case 2:
-        if (M.x86.mode & SYSMODE_PREFIX_DATA) {
-            u32 *destreg;
-            u32 srcval;
-            u32 res_lo,res_hi;
-            s32 imm;
+	if (M.x86.mode & SYSMODE_PREFIX_DATA) {
+	    u32 *destreg;
+	    u32 srcval;
+	    u32 res_lo,res_hi;
+	    s32 imm;
 
-            destreg = DECODE_RM_LONG_REGISTER(rh);
-            DECODE_PRINTF(",");
-            srcoffset = decode_rm10_address(rl);
-            srcval = fetch_data_long(srcoffset);
-            imm = fetch_long_imm();
-            DECODE_PRINTF2(",%d\n", (s32)imm);
-            TRACE_AND_STEP();
-            imul_long_direct(&res_lo,&res_hi,(s32)srcval,(s32)imm);
-            if (res_hi != 0) {
-                SET_FLAG(F_CF);
-                SET_FLAG(F_OF);
-            } else {
-                CLEAR_FLAG(F_CF);
-                CLEAR_FLAG(F_OF);
-            }
-            *destreg = (u32)res_lo;
-        } else {
-            u16 *destreg;
-            u16 srcval;
-            u32 res;
-            s16 imm;
+	    destreg = DECODE_RM_LONG_REGISTER(rh);
+	    DECODE_PRINTF(",");
+	    srcoffset = decode_rm10_address(rl);
+	    srcval = fetch_data_long(srcoffset);
+	    imm = fetch_long_imm();
+	    DECODE_PRINTF2(",%d\n", (s32)imm);
+	    TRACE_AND_STEP();
+	    imul_long_direct(&res_lo,&res_hi,(s32)srcval,(s32)imm);
+	    if (res_hi != 0) {
+		SET_FLAG(F_CF);
+		SET_FLAG(F_OF);
+	    } else {
+		CLEAR_FLAG(F_CF);
+		CLEAR_FLAG(F_OF);
+	    }
+	    *destreg = (u32)res_lo;
+	} else {
+	    u16 *destreg;
+	    u16 srcval;
+	    u32 res;
+	    s16 imm;
 
-            destreg = DECODE_RM_WORD_REGISTER(rh);
-            DECODE_PRINTF(",");
-            srcoffset = decode_rm10_address(rl);
-            srcval = fetch_data_word(srcoffset);
-            imm = fetch_word_imm();
-            DECODE_PRINTF2(",%d\n", (s32)imm);
-            TRACE_AND_STEP();
-            res = (s16)srcval * (s16)imm;
-            if (res > 0xFFFF) {
-                SET_FLAG(F_CF);
-                SET_FLAG(F_OF);
-            } else {
-                CLEAR_FLAG(F_CF);
-                CLEAR_FLAG(F_OF);
-            }
-            *destreg = (u16)res;
-        }
-        break;
+	    destreg = DECODE_RM_WORD_REGISTER(rh);
+	    DECODE_PRINTF(",");
+	    srcoffset = decode_rm10_address(rl);
+	    srcval = fetch_data_word(srcoffset);
+	    imm = fetch_word_imm();
+	    DECODE_PRINTF2(",%d\n", (s32)imm);
+	    TRACE_AND_STEP();
+	    res = (s16)srcval * (s16)imm;
+	    if (res > 0xFFFF) {
+		SET_FLAG(F_CF);
+		SET_FLAG(F_OF);
+	    } else {
+		CLEAR_FLAG(F_CF);
+		CLEAR_FLAG(F_OF);
+	    }
+	    *destreg = (u16)res;
+	}
+	break;
     case 3:                     /* register to register */
-        if (M.x86.mode & SYSMODE_PREFIX_DATA) {
-            u32 *destreg,*srcreg;
-            u32 res_lo,res_hi;
-            s32 imm;
+	if (M.x86.mode & SYSMODE_PREFIX_DATA) {
+	    u32 *destreg,*srcreg;
+	    u32 res_lo,res_hi;
+	    s32 imm;
 
-            destreg = DECODE_RM_LONG_REGISTER(rh);
-            DECODE_PRINTF(",");
-            srcreg = DECODE_RM_LONG_REGISTER(rl);
-            imm = fetch_long_imm();
-            DECODE_PRINTF2(",%d\n", (s32)imm);
-            TRACE_AND_STEP();
-            imul_long_direct(&res_lo,&res_hi,(s32)*srcreg,(s32)imm);
-            if (res_hi != 0) {
-                SET_FLAG(F_CF);
-                SET_FLAG(F_OF);
-            } else {
-                CLEAR_FLAG(F_CF);
-                CLEAR_FLAG(F_OF);
-            }
-            *destreg = (u32)res_lo;
-        } else {
-            u16 *destreg,*srcreg;
-            u32 res;
-            s16 imm;
+	    destreg = DECODE_RM_LONG_REGISTER(rh);
+	    DECODE_PRINTF(",");
+	    srcreg = DECODE_RM_LONG_REGISTER(rl);
+	    imm = fetch_long_imm();
+	    DECODE_PRINTF2(",%d\n", (s32)imm);
+	    TRACE_AND_STEP();
+	    imul_long_direct(&res_lo,&res_hi,(s32)*srcreg,(s32)imm);
+	    if (res_hi != 0) {
+		SET_FLAG(F_CF);
+		SET_FLAG(F_OF);
+	    } else {
+		CLEAR_FLAG(F_CF);
+		CLEAR_FLAG(F_OF);
+	    }
+	    *destreg = (u32)res_lo;
+	} else {
+	    u16 *destreg,*srcreg;
+	    u32 res;
+	    s16 imm;
 
-            destreg = DECODE_RM_WORD_REGISTER(rh);
-            DECODE_PRINTF(",");
-            srcreg = DECODE_RM_WORD_REGISTER(rl);
-            imm = fetch_word_imm();
-            DECODE_PRINTF2(",%d\n", (s32)imm);
-            res = (s16)*srcreg * (s16)imm;
-            if (res > 0xFFFF) {
-                SET_FLAG(F_CF);
-                SET_FLAG(F_OF);
-            } else {
-                CLEAR_FLAG(F_CF);
-                CLEAR_FLAG(F_OF);
-            }
-            *destreg = (u16)res;
-        }
-        break;
+	    destreg = DECODE_RM_WORD_REGISTER(rh);
+	    DECODE_PRINTF(",");
+	    srcreg = DECODE_RM_WORD_REGISTER(rl);
+	    imm = fetch_word_imm();
+	    DECODE_PRINTF2(",%d\n", (s32)imm);
+	    res = (s16)*srcreg * (s16)imm;
+	    if (res > 0xFFFF) {
+		SET_FLAG(F_CF);
+		SET_FLAG(F_OF);
+	    } else {
+		CLEAR_FLAG(F_CF);
+		CLEAR_FLAG(F_OF);
+	    }
+	    *destreg = (u16)res;
+	}
+	break;
     }
     DECODE_CLEAR_SEGOVR();
     END_OF_INSTR();
@@ -4556,180 +4556,180 @@
     FETCH_DECODE_MODRM(mod, rh, rl);
     switch (mod) {
     case 0:
-        if (M.x86.mode & SYSMODE_PREFIX_DATA) {
-            u32 *destreg;
-            u32 srcval;
-            u32 res_lo,res_hi;
+	if (M.x86.mode & SYSMODE_PREFIX_DATA) {
+	    u32 *destreg;
+	    u32 srcval;
+	    u32 res_lo,res_hi;
 
-            destreg = DECODE_RM_LONG_REGISTER(rh);
-            DECODE_PRINTF(",");
-            srcoffset = decode_rm00_address(rl);
-            srcval = fetch_data_long(srcoffset);
-            imm = fetch_byte_imm();
-            DECODE_PRINTF2(",%d\n", (s32)imm);
-            TRACE_AND_STEP();
-            imul_long_direct(&res_lo,&res_hi,(s32)srcval,(s32)imm);
-            if (res_hi != 0) {
-                SET_FLAG(F_CF);
-                SET_FLAG(F_OF);
-            } else {
-                CLEAR_FLAG(F_CF);
-                CLEAR_FLAG(F_OF);
-            }
-            *destreg = (u32)res_lo;
-        } else {
-            u16 *destreg;
-            u16 srcval;
-            u32 res;
+	    destreg = DECODE_RM_LONG_REGISTER(rh);
+	    DECODE_PRINTF(",");
+	    srcoffset = decode_rm00_address(rl);
+	    srcval = fetch_data_long(srcoffset);
+	    imm = fetch_byte_imm();
+	    DECODE_PRINTF2(",%d\n", (s32)imm);
+	    TRACE_AND_STEP();
+	    imul_long_direct(&res_lo,&res_hi,(s32)srcval,(s32)imm);
+	    if (res_hi != 0) {
+		SET_FLAG(F_CF);
+		SET_FLAG(F_OF);
+	    } else {
+		CLEAR_FLAG(F_CF);
+		CLEAR_FLAG(F_OF);
+	    }
+	    *destreg = (u32)res_lo;
+	} else {
+	    u16 *destreg;
+	    u16 srcval;
+	    u32 res;
 
-            destreg = DECODE_RM_WORD_REGISTER(rh);
-            DECODE_PRINTF(",");
-            srcoffset = decode_rm00_address(rl);
-            srcval = fetch_data_word(srcoffset);
-            imm = fetch_byte_imm();
-            DECODE_PRINTF2(",%d\n", (s32)imm);
-            TRACE_AND_STEP();
-            res = (s16)srcval * (s16)imm;
-            if (res > 0xFFFF) {
-                SET_FLAG(F_CF);
-                SET_FLAG(F_OF);
-            } else {
-                CLEAR_FLAG(F_CF);
-                CLEAR_FLAG(F_OF);
-            }
-            *destreg = (u16)res;
-        }
-        break;
+	    destreg = DECODE_RM_WORD_REGISTER(rh);
+	    DECODE_PRINTF(",");
+	    srcoffset = decode_rm00_address(rl);
+	    srcval = fetch_data_word(srcoffset);
+	    imm = fetch_byte_imm();
+	    DECODE_PRINTF2(",%d\n", (s32)imm);
+	    TRACE_AND_STEP();
+	    res = (s16)srcval * (s16)imm;
+	    if (res > 0xFFFF) {
+		SET_FLAG(F_CF);
+		SET_FLAG(F_OF);
+	    } else {
+		CLEAR_FLAG(F_CF);
+		CLEAR_FLAG(F_OF);
+	    }
+	    *destreg = (u16)res;
+	}
+	break;
     case 1:
-        if (M.x86.mode & SYSMODE_PREFIX_DATA) {
-            u32 *destreg;
-            u32 srcval;
-            u32 res_lo,res_hi;
+	if (M.x86.mode & SYSMODE_PREFIX_DATA) {
+	    u32 *destreg;
+	    u32 srcval;
+	    u32 res_lo,res_hi;
 
-            destreg = DECODE_RM_LONG_REGISTER(rh);
-            DECODE_PRINTF(",");
-            srcoffset = decode_rm01_address(rl);
-            srcval = fetch_data_long(srcoffset);
-            imm = fetch_byte_imm();
-            DECODE_PRINTF2(",%d\n", (s32)imm);
-            TRACE_AND_STEP();
-            imul_long_direct(&res_lo,&res_hi,(s32)srcval,(s32)imm);
-            if (res_hi != 0) {
-                SET_FLAG(F_CF);
-                SET_FLAG(F_OF);
-            } else {
-                CLEAR_FLAG(F_CF);
-                CLEAR_FLAG(F_OF);
-            }
-            *destreg = (u32)res_lo;
-        } else {
-            u16 *destreg;
-            u16 srcval;
-            u32 res;
+	    destreg = DECODE_RM_LONG_REGISTER(rh);
+	    DECODE_PRINTF(",");
+	    srcoffset = decode_rm01_address(rl);
+	    srcval = fetch_data_long(srcoffset);
+	    imm = fetch_byte_imm();
+	    DECODE_PRINTF2(",%d\n", (s32)imm);
+	    TRACE_AND_STEP();
+	    imul_long_direct(&res_lo,&res_hi,(s32)srcval,(s32)imm);
+	    if (res_hi != 0) {
+		SET_FLAG(F_CF);
+		SET_FLAG(F_OF);
+	    } else {
+		CLEAR_FLAG(F_CF);
+		CLEAR_FLAG(F_OF);
+	    }
+	    *destreg = (u32)res_lo;
+	} else {
+	    u16 *destreg;
+	    u16 srcval;
+	    u32 res;
 
-            destreg = DECODE_RM_WORD_REGISTER(rh);
-            DECODE_PRINTF(",");
-            srcoffset = decode_rm01_address(rl);
-            srcval = fetch_data_word(srcoffset);
-            imm = fetch_byte_imm();
-            DECODE_PRINTF2(",%d\n", (s32)imm);
-            TRACE_AND_STEP();
-            res = (s16)srcval * (s16)imm;
-            if (res > 0xFFFF) {
-                SET_FLAG(F_CF);
-                SET_FLAG(F_OF);
-            } else {
-                CLEAR_FLAG(F_CF);
-                CLEAR_FLAG(F_OF);
-            }
-            *destreg = (u16)res;
-        }
-        break;
+	    destreg = DECODE_RM_WORD_REGISTER(rh);
+	    DECODE_PRINTF(",");
+	    srcoffset = decode_rm01_address(rl);
+	    srcval = fetch_data_word(srcoffset);
+	    imm = fetch_byte_imm();
+	    DECODE_PRINTF2(",%d\n", (s32)imm);
+	    TRACE_AND_STEP();
+	    res = (s16)srcval * (s16)imm;
+	    if (res > 0xFFFF) {
+		SET_FLAG(F_CF);
+		SET_FLAG(F_OF);
+	    } else {
+		CLEAR_FLAG(F_CF);
+		CLEAR_FLAG(F_OF);
+	    }
+	    *destreg = (u16)res;
+	}
+	break;
     case 2:
-        if (M.x86.mode & SYSMODE_PREFIX_DATA) {
-            u32 *destreg;
-            u32 srcval;
-            u32 res_lo,res_hi;
+	if (M.x86.mode & SYSMODE_PREFIX_DATA) {
+	    u32 *destreg;
+	    u32 srcval;
+	    u32 res_lo,res_hi;
 
-            destreg = DECODE_RM_LONG_REGISTER(rh);
-            DECODE_PRINTF(",");
-            srcoffset = decode_rm10_address(rl);
-            srcval = fetch_data_long(srcoffset);
-            imm = fetch_byte_imm();
-            DECODE_PRINTF2(",%d\n", (s32)imm);
-            TRACE_AND_STEP();
-            imul_long_direct(&res_lo,&res_hi,(s32)srcval,(s32)imm);
-            if (res_hi != 0) {
-                SET_FLAG(F_CF);
-                SET_FLAG(F_OF);
-            } else {
-                CLEAR_FLAG(F_CF);
-                CLEAR_FLAG(F_OF);
-            }
-            *destreg = (u32)res_lo;
-        } else {
-            u16 *destreg;
-            u16 srcval;
-            u32 res;
+	    destreg = DECODE_RM_LONG_REGISTER(rh);
+	    DECODE_PRINTF(",");
+	    srcoffset = decode_rm10_address(rl);
+	    srcval = fetch_data_long(srcoffset);
+	    imm = fetch_byte_imm();
+	    DECODE_PRINTF2(",%d\n", (s32)imm);
+	    TRACE_AND_STEP();
+	    imul_long_direct(&res_lo,&res_hi,(s32)srcval,(s32)imm);
+	    if (res_hi != 0) {
+		SET_FLAG(F_CF);
+		SET_FLAG(F_OF);
+	    } else {
+		CLEAR_FLAG(F_CF);
+		CLEAR_FLAG(F_OF);
+	    }
+	    *destreg = (u32)res_lo;
+	} else {
+	    u16 *destreg;
+	    u16 srcval;
+	    u32 res;
 
-            destreg = DECODE_RM_WORD_REGISTER(rh);
-            DECODE_PRINTF(",");
-            srcoffset = decode_rm10_address(rl);
-            srcval = fetch_data_word(srcoffset);
-            imm = fetch_byte_imm();
-            DECODE_PRINTF2(",%d\n", (s32)imm);
-            TRACE_AND_STEP();
-            res = (s16)srcval * (s16)imm;
-            if (res > 0xFFFF) {
-                SET_FLAG(F_CF);
-                SET_FLAG(F_OF);
-            } else {
-                CLEAR_FLAG(F_CF);
-                CLEAR_FLAG(F_OF);
-            }
-            *destreg = (u16)res;
-        }
-        break;
+	    destreg = DECODE_RM_WORD_REGISTER(rh);
+	    DECODE_PRINTF(",");
+	    srcoffset = decode_rm10_address(rl);
+	    srcval = fetch_data_word(srcoffset);
+	    imm = fetch_byte_imm();
+	    DECODE_PRINTF2(",%d\n", (s32)imm);
+	    TRACE_AND_STEP();
+	    res = (s16)srcval * (s16)imm;
+	    if (res > 0xFFFF) {
+		SET_FLAG(F_CF);
+		SET_FLAG(F_OF);
+	    } else {
+		CLEAR_FLAG(F_CF);
+		CLEAR_FLAG(F_OF);
+	    }
+	    *destreg = (u16)res;
+	}
+	break;
     case 3:                     /* register to register */
-        if (M.x86.mode & SYSMODE_PREFIX_DATA) {
-            u32 *destreg,*srcreg;
-            u32 res_lo,res_hi;
+	if (M.x86.mode & SYSMODE_PREFIX_DATA) {
+	    u32 *destreg,*srcreg;
+	    u32 res_lo,res_hi;
 
-            destreg = DECODE_RM_LONG_REGISTER(rh);
-            DECODE_PRINTF(",");
-            srcreg = DECODE_RM_LONG_REGISTER(rl);
-            imm = fetch_byte_imm();
-            DECODE_PRINTF2(",%d\n", (s32)imm);
-            TRACE_AND_STEP();
-            imul_long_direct(&res_lo,&res_hi,(s32)*srcreg,(s32)imm);
-            if (res_hi != 0) {
-                SET_FLAG(F_CF);
-                SET_FLAG(F_OF);
-            } else {
-                CLEAR_FLAG(F_CF);
-                CLEAR_FLAG(F_OF);
-            }
-            *destreg = (u32)res_lo;
-        } else {
-            u16 *destreg,*srcreg;
-            u32 res;
+	    destreg = DECODE_RM_LONG_REGISTER(rh);
+	    DECODE_PRINTF(",");
+	    srcreg = DECODE_RM_LONG_REGISTER(rl);
+	    imm = fetch_byte_imm();
+	    DECODE_PRINTF2(",%d\n", (s32)imm);
+	    TRACE_AND_STEP();
+	    imul_long_direct(&res_lo,&res_hi,(s32)*srcreg,(s32)imm);
+	    if (res_hi != 0) {
+		SET_FLAG(F_CF);
+		SET_FLAG(F_OF);
+	    } else {
+		CLEAR_FLAG(F_CF);
+		CLEAR_FLAG(F_OF);
+	    }
+	    *destreg = (u32)res_lo;
+	} else {
+	    u16 *destreg,*srcreg;
+	    u32 res;
 
-            destreg = DECODE_RM_WORD_REGISTER(rh);
-            DECODE_PRINTF(",");
-            srcreg = DECODE_RM_WORD_REGISTER(rl);
-            imm = fetch_byte_imm();
-            DECODE_PRINTF2(",%d\n", (s32)imm);
-            res = (s16)*srcreg * (s16)imm;
-            if (res > 0xFFFF) {
-                SET_FLAG(F_CF);
-                SET_FLAG(F_OF);
-            } else {
-                CLEAR_FLAG(F_CF);
-                CLEAR_FLAG(F_OF);
-            }
-            *destreg = (u16)res;
-        }
-        break;
+	    destreg = DECODE_RM_WORD_REGISTER(rh);
+	    DECODE_PRINTF(",");
+	    srcreg = DECODE_RM_WORD_REGISTER(rl);
+	    imm = fetch_byte_imm();
+	    DECODE_PRINTF2(",%d\n", (s32)imm);
+	    res = (s16)*srcreg * (s16)imm;
+	    if (res > 0xFFFF) {
+		SET_FLAG(F_CF);
+		SET_FLAG(F_OF);
+	    } else {
+		CLEAR_FLAG(F_CF);
+		CLEAR_FLAG(F_OF);
+	    }
+	    *destreg = (u16)res;
+	}
+	break;
     }
     DECODE_CLEAR_SEGOVR();
     END_OF_INSTR();
@@ -4757,11 +4757,11 @@
 {
     START_OF_INSTR();
     if (M.x86.mode & SYSMODE_PREFIX_DATA) {
-        DECODE_PRINTF("INSD\n");
-        ins(4);
+	DECODE_PRINTF("INSD\n");
+	ins(4);
     } else {
-        DECODE_PRINTF("INSW\n");
-        ins(2);
+	DECODE_PRINTF("INSW\n");
+	ins(2);
     }
     TRACE_AND_STEP();
     DECODE_CLEAR_SEGOVR();
@@ -4790,11 +4790,11 @@
 {
     START_OF_INSTR();
     if (M.x86.mode & SYSMODE_PREFIX_DATA) {
-        DECODE_PRINTF("OUTSD\n");
-        outs(4);
+	DECODE_PRINTF("OUTSD\n");
+	outs(4);
     } else {
-        DECODE_PRINTF("OUTSW\n");
-        outs(2);
+	DECODE_PRINTF("OUTSW\n");
+	outs(2);
     }
     TRACE_AND_STEP();
     DECODE_CLEAR_SEGOVR();
@@ -4818,7 +4818,7 @@
     DECODE_PRINTF2("%x\n", target);
     TRACE_AND_STEP();
     if (ACCESS_FLAG(F_OF))
-        M.x86.R_IP = target;
+	M.x86.R_IP = target;
     DECODE_CLEAR_SEGOVR();
     END_OF_INSTR();
 }
@@ -4840,7 +4840,7 @@
     DECODE_PRINTF2("%x\n", target);
     TRACE_AND_STEP();
     if (!ACCESS_FLAG(F_OF))
-        M.x86.R_IP = target;
+	M.x86.R_IP = target;
     DECODE_CLEAR_SEGOVR();
     END_OF_INSTR();
 }
@@ -4862,7 +4862,7 @@
     DECODE_PRINTF2("%x\n", target);
     TRACE_AND_STEP();
     if (ACCESS_FLAG(F_CF))
-        M.x86.R_IP = target;
+	M.x86.R_IP = target;
     DECODE_CLEAR_SEGOVR();
     END_OF_INSTR();
 }
@@ -4884,7 +4884,7 @@
     DECODE_PRINTF2("%x\n", target);
     TRACE_AND_STEP();
     if (!ACCESS_FLAG(F_CF))
-        M.x86.R_IP = target;
+	M.x86.R_IP = target;
     DECODE_CLEAR_SEGOVR();
     END_OF_INSTR();
 }
@@ -4906,7 +4906,7 @@
     DECODE_PRINTF2("%x\n", target);
     TRACE_AND_STEP();
     if (ACCESS_FLAG(F_ZF))
-        M.x86.R_IP = target;
+	M.x86.R_IP = target;
     DECODE_CLEAR_SEGOVR();
     END_OF_INSTR();
 }
@@ -4928,7 +4928,7 @@
     DECODE_PRINTF2("%x\n", target);
     TRACE_AND_STEP();
     if (!ACCESS_FLAG(F_ZF))
-        M.x86.R_IP = target;
+	M.x86.R_IP = target;
     DECODE_CLEAR_SEGOVR();
     END_OF_INSTR();
 }
@@ -4951,7 +4951,7 @@
     DECODE_PRINTF2("%x\n", target);
     TRACE_AND_STEP();
     if (ACCESS_FLAG(F_CF) || ACCESS_FLAG(F_ZF))
-        M.x86.R_IP = target;
+	M.x86.R_IP = target;
     DECODE_CLEAR_SEGOVR();
     END_OF_INSTR();
 }
@@ -4974,7 +4974,7 @@
     DECODE_PRINTF2("%x\n", target);
     TRACE_AND_STEP();
     if (!(ACCESS_FLAG(F_CF) || ACCESS_FLAG(F_ZF)))
-        M.x86.R_IP = target;
+	M.x86.R_IP = target;
     DECODE_CLEAR_SEGOVR();
     END_OF_INSTR();
 }
@@ -4996,7 +4996,7 @@
     DECODE_PRINTF2("%x\n", target);
     TRACE_AND_STEP();
     if (ACCESS_FLAG(F_SF))
-        M.x86.R_IP = target;
+	M.x86.R_IP = target;
     DECODE_CLEAR_SEGOVR();
     END_OF_INSTR();
 }
@@ -5018,7 +5018,7 @@
     DECODE_PRINTF2("%x\n", target);
     TRACE_AND_STEP();
     if (!ACCESS_FLAG(F_SF))
-        M.x86.R_IP = target;
+	M.x86.R_IP = target;
     DECODE_CLEAR_SEGOVR();
     END_OF_INSTR();
 }
@@ -5040,7 +5040,7 @@
     DECODE_PRINTF2("%x\n", target);
     TRACE_AND_STEP();
     if (ACCESS_FLAG(F_PF))
-        M.x86.R_IP = target;
+	M.x86.R_IP = target;
     DECODE_CLEAR_SEGOVR();
     END_OF_INSTR();
 }
@@ -5062,7 +5062,7 @@
     DECODE_PRINTF2("%x\n", target);
     TRACE_AND_STEP();
     if (!ACCESS_FLAG(F_PF))
-        M.x86.R_IP = target;
+	M.x86.R_IP = target;
     DECODE_CLEAR_SEGOVR();
     END_OF_INSTR();
 }
@@ -5087,7 +5087,7 @@
     sf = ACCESS_FLAG(F_SF) != 0;
     of = ACCESS_FLAG(F_OF) != 0;
     if (sf ^ of)
-        M.x86.R_IP = target;
+	M.x86.R_IP = target;
     DECODE_CLEAR_SEGOVR();
     END_OF_INSTR();
 }
@@ -5113,7 +5113,7 @@
     of = ACCESS_FLAG(F_OF) != 0;
     /* note: inverse of above, but using == instead of xor. */
     if (sf == of)
-        M.x86.R_IP = target;
+	M.x86.R_IP = target;
     DECODE_CLEAR_SEGOVR();
     END_OF_INSTR();
 }
@@ -5139,7 +5139,7 @@
     sf = ACCESS_FLAG(F_SF) != 0;
     of = ACCESS_FLAG(F_OF) != 0;
     if ((sf ^ of) || ACCESS_FLAG(F_ZF))
-        M.x86.R_IP = target;
+	M.x86.R_IP = target;
     DECODE_CLEAR_SEGOVR();
     END_OF_INSTR();
 }
@@ -5165,7 +5165,7 @@
     sf = ACCESS_FLAG(F_SF) != 0;
     of = ACCESS_FLAG(F_OF) != 0;
     if ((sf == of) && !ACCESS_FLAG(F_ZF))
-        M.x86.R_IP = target;
+	M.x86.R_IP = target;
     DECODE_CLEAR_SEGOVR();
     END_OF_INSTR();
 }
@@ -5203,88 +5203,88 @@
     FETCH_DECODE_MODRM(mod, rh, rl);
 #ifdef DEBUG
     if (DEBUG_DECODE()) {
-        /* XXX DECODE_PRINTF may be changed to something more
-           general, so that it is important to leave the strings
-           in the same format, even though the result is that the 
-           above test is done twice. */
+	/* XXX DECODE_PRINTF may be changed to something more
+	   general, so that it is important to leave the strings
+	   in the same format, even though the result is that the
+	   above test is done twice. */
 
-        switch (rh) {
-        case 0:
-            DECODE_PRINTF("ADD\t");
-            break;
-        case 1:
-            DECODE_PRINTF("OR\t");
-            break;
-        case 2:
-            DECODE_PRINTF("ADC\t");
-            break;
-        case 3:
-            DECODE_PRINTF("SBB\t");
-            break;
-        case 4:
-            DECODE_PRINTF("AND\t");
-            break;
-        case 5:
-            DECODE_PRINTF("SUB\t");
-            break;
-        case 6:
-            DECODE_PRINTF("XOR\t");
-            break;
-        case 7:
-            DECODE_PRINTF("CMP\t");
-            break;
-        }
+	switch (rh) {
+	case 0:
+	    DECODE_PRINTF("ADD\t");
+	    break;
+	case 1:
+	    DECODE_PRINTF("OR\t");
+	    break;
+	case 2:
+	    DECODE_PRINTF("ADC\t");
+	    break;
+	case 3:
+	    DECODE_PRINTF("SBB\t");
+	    break;
+	case 4:
+	    DECODE_PRINTF("AND\t");
+	    break;
+	case 5:
+	    DECODE_PRINTF("SUB\t");
+	    break;
+	case 6:
+	    DECODE_PRINTF("XOR\t");
+	    break;
+	case 7:
+	    DECODE_PRINTF("CMP\t");
+	    break;
+	}
     }
 #endif
     /* know operation, decode the mod byte to find the addressing
        mode. */
     switch (mod) {
     case 0:
-        DECODE_PRINTF("BYTE PTR ");
-        destoffset = decode_rm00_address(rl);
-        DECODE_PRINTF(",");
-        destval = fetch_data_byte(destoffset);
-        imm = fetch_byte_imm();
-        DECODE_PRINTF2("%x\n", imm);
-        TRACE_AND_STEP();
-        destval = (*opc80_byte_operation[rh]) (destval, imm);
-        if (rh != 7)
-            store_data_byte(destoffset, destval);
-        break;
+	DECODE_PRINTF("BYTE PTR ");
+	destoffset = decode_rm00_address(rl);
+	DECODE_PRINTF(",");
+	destval = fetch_data_byte(destoffset);
+	imm = fetch_byte_imm();
+	DECODE_PRINTF2("%x\n", imm);
+	TRACE_AND_STEP();
+	destval = (*opc80_byte_operation[rh]) (destval, imm);
+	if (rh != 7)
+	    store_data_byte(destoffset, destval);
+	break;
     case 1:
-        DECODE_PRINTF("BYTE PTR ");
-        destoffset = decode_rm01_address(rl);
-        DECODE_PRINTF(",");
-        destval = fetch_data_byte(destoffset);
-        imm = fetch_byte_imm();
-        DECODE_PRINTF2("%x\n", imm);
-        TRACE_AND_STEP();
-        destval = (*opc80_byte_operation[rh]) (destval, imm);
-        if (rh != 7)
-            store_data_byte(destoffset, destval);
-        break;
+	DECODE_PRINTF("BYTE PTR ");
+	destoffset = decode_rm01_address(rl);
+	DECODE_PRINTF(",");
+	destval = fetch_data_byte(destoffset);
+	imm = fetch_byte_imm();
+	DECODE_PRINTF2("%x\n", imm);
+	TRACE_AND_STEP();
+	destval = (*opc80_byte_operation[rh]) (destval, imm);
+	if (rh != 7)
+	    store_data_byte(destoffset, destval);
+	break;
     case 2:
-        DECODE_PRINTF("BYTE PTR ");
-        destoffset = decode_rm10_address(rl);
-        DECODE_PRINTF(",");
-        destval = fetch_data_byte(destoffset);
-        imm = fetch_byte_imm();
-        DECODE_PRINTF2("%x\n", imm);
-        TRACE_AND_STEP();
-        destval = (*opc80_byte_operation[rh]) (destval, imm);
-        if (rh != 7)
-            store_data_byte(destoffset, destval);
-        break;
+	DECODE_PRINTF("BYTE PTR ");
+	destoffset = decode_rm10_address(rl);
+	DECODE_PRINTF(",");
+	destval = fetch_data_byte(destoffset);
+	imm = fetch_byte_imm();
+	DECODE_PRINTF2("%x\n", imm);
+	TRACE_AND_STEP();
+	destval = (*opc80_byte_operation[rh]) (destval, imm);
+	if (rh != 7)
+	    store_data_byte(destoffset, destval);
+	break;
     case 3:                     /* register to register */
-        destreg = DECODE_RM_BYTE_REGISTER(rl);
-        DECODE_PRINTF(",");
-        imm = fetch_byte_imm();
-        DECODE_PRINTF2("%x\n", imm);
-        TRACE_AND_STEP();
-        destval = (*opc80_byte_operation[rh]) (*destreg, imm);
-        if (rh != 7)
-            *destreg = destval;
-        break;
+	destreg = DECODE_RM_BYTE_REGISTER(rl);
+	DECODE_PRINTF(",");
+	imm = fetch_byte_imm();
+	DECODE_PRINTF2("%x\n", imm);
+	TRACE_AND_STEP();
+	destval = (*opc80_byte_operation[rh]) (*destreg, imm);
+	if (rh != 7)
+	    *destreg = destval;
+	break;
     }
     DECODE_CLEAR_SEGOVR();
     END_OF_INSTR();
@@ -5332,158 +5332,158 @@
     FETCH_DECODE_MODRM(mod, rh, rl);
 #ifdef DEBUG
     if (DEBUG_DECODE()) {
-        /* XXX DECODE_PRINTF may be changed to something more
-           general, so that it is important to leave the strings
-           in the same format, even though the result is that the 
-           above test is done twice. */
+	/* XXX DECODE_PRINTF may be changed to something more
+	   general, so that it is important to leave the strings
+	   in the same format, even though the result is that the
+	   above test is done twice. */
 
-        switch (rh) {
-        case 0:
-            DECODE_PRINTF("ADD\t");
-            break;
-        case 1:
-            DECODE_PRINTF("OR\t");
-            break;
-        case 2:
-            DECODE_PRINTF("ADC\t");
-            break;
-        case 3:
-            DECODE_PRINTF("SBB\t");
-            break;
-        case 4:
-            DECODE_PRINTF("AND\t");
-            break;
-        case 5:
-            DECODE_PRINTF("SUB\t");
-            break;
-        case 6:
-            DECODE_PRINTF("XOR\t");
-            break;
-        case 7:
-            DECODE_PRINTF("CMP\t");
-            break;
-        }
+	switch (rh) {
+	case 0:
+	    DECODE_PRINTF("ADD\t");
+	    break;
+	case 1:
+	    DECODE_PRINTF("OR\t");
+	    break;
+	case 2:
+	    DECODE_PRINTF("ADC\t");
+	    break;
+	case 3:
+	    DECODE_PRINTF("SBB\t");
+	    break;
+	case 4:
+	    DECODE_PRINTF("AND\t");
+	    break;
+	case 5:
+	    DECODE_PRINTF("SUB\t");
+	    break;
+	case 6:
+	    DECODE_PRINTF("XOR\t");
+	    break;
+	case 7:
+	    DECODE_PRINTF("CMP\t");
+	    break;
+	}
     }
 #endif
     /*
-     * Know operation, decode the mod byte to find the addressing 
+     * Know operation, decode the mod byte to find the addressing
      * mode.
      */
     switch (mod) {
     case 0:
-        if (M.x86.mode & SYSMODE_PREFIX_DATA) {
-            u32 destval,imm;
+	if (M.x86.mode & SYSMODE_PREFIX_DATA) {
+	    u32 destval,imm;
 
-            DECODE_PRINTF("DWORD PTR ");
-            destoffset = decode_rm00_address(rl);
-            DECODE_PRINTF(",");
-            destval = fetch_data_long(destoffset);
-            imm = fetch_long_imm();
-            DECODE_PRINTF2("%x\n", imm);
-            TRACE_AND_STEP();
-            destval = (*opc81_long_operation[rh]) (destval, imm);
-            if (rh != 7)
-                store_data_long(destoffset, destval);
-        } else {
-            u16 destval,imm;
+	    DECODE_PRINTF("DWORD PTR ");
+	    destoffset = decode_rm00_address(rl);
+	    DECODE_PRINTF(",");
+	    destval = fetch_data_long(destoffset);
+	    imm = fetch_long_imm();
+	    DECODE_PRINTF2("%x\n", imm);
+	    TRACE_AND_STEP();
+	    destval = (*opc81_long_operation[rh]) (destval, imm);
+	    if (rh != 7)
+		store_data_long(destoffset, destval);
+	} else {
+	    u16 destval,imm;
 
-            DECODE_PRINTF("WORD PTR ");
-            destoffset = decode_rm00_address(rl);
-            DECODE_PRINTF(",");
-            destval = fetch_data_word(destoffset);
-            imm = fetch_word_imm();
-            DECODE_PRINTF2("%x\n", imm);
-            TRACE_AND_STEP();
-            destval = (*opc81_word_operation[rh]) (destval, imm);
-            if (rh != 7)
-                store_data_word(destoffset, destval);
-        }
-        break;
+	    DECODE_PRINTF("WORD PTR ");
+	    destoffset = decode_rm00_address(rl);
+	    DECODE_PRINTF(",");
+	    destval = fetch_data_word(destoffset);
+	    imm = fetch_word_imm();
+	    DECODE_PRINTF2("%x\n", imm);
+	    TRACE_AND_STEP();
+	    destval = (*opc81_word_operation[rh]) (destval, imm);
+	    if (rh != 7)
+		store_data_word(destoffset, destval);
+	}
+	break;
     case 1:
-        if (M.x86.mode & SYSMODE_PREFIX_DATA) {
-            u32 destval,imm;
+	if (M.x86.mode & SYSMODE_PREFIX_DATA) {
+	    u32 destval,imm;
 
-            DECODE_PRINTF("DWORD PTR ");
-            destoffset = decode_rm01_address(rl);
-            DECODE_PRINTF(",");
-            destval = fetch_data_long(destoffset);
-            imm = fetch_long_imm();
-            DECODE_PRINTF2("%x\n", imm);
-            TRACE_AND_STEP();
-            destval = (*opc81_long_operation[rh]) (destval, imm);
-            if (rh != 7)
-                store_data_long(destoffset, destval);
-        } else {
-            u16 destval,imm;
+	    DECODE_PRINTF("DWORD PTR ");
+	    destoffset = decode_rm01_address(rl);
+	    DECODE_PRINTF(",");
+	    destval = fetch_data_long(destoffset);
+	    imm = fetch_long_imm();
+	    DECODE_PRINTF2("%x\n", imm);
+	    TRACE_AND_STEP();
+	    destval = (*opc81_long_operation[rh]) (destval, imm);
+	    if (rh != 7)
+		store_data_long(destoffset, destval);
+	} else {
+	    u16 destval,imm;
 
-            DECODE_PRINTF("WORD PTR ");
-            destoffset = decode_rm01_address(rl);
-            DECODE_PRINTF(",");
-            destval = fetch_data_word(destoffset);
-            imm = fetch_word_imm();
-            DECODE_PRINTF2("%x\n", imm);
-            TRACE_AND_STEP();
-            destval = (*opc81_word_operation[rh]) (destval, imm);
-            if (rh != 7)
-                store_data_word(destoffset, destval);
-        }
-        break;
+	    DECODE_PRINTF("WORD PTR ");
+	    destoffset = decode_rm01_address(rl);
+	    DECODE_PRINTF(",");
+	    destval = fetch_data_word(destoffset);
+	    imm = fetch_word_imm();
+	    DECODE_PRINTF2("%x\n", imm);
+	    TRACE_AND_STEP();
+	    destval = (*opc81_word_operation[rh]) (destval, imm);
+	    if (rh != 7)
+		store_data_word(destoffset, destval);
+	}
+	break;
     case 2:
-        if (M.x86.mode & SYSMODE_PREFIX_DATA) {
-            u32 destval,imm;
+	if (M.x86.mode & SYSMODE_PREFIX_DATA) {
+	    u32 destval,imm;
 
-            DECODE_PRINTF("DWORD PTR ");
-            destoffset = decode_rm10_address(rl);
-            DECODE_PRINTF(",");
-            destval = fetch_data_long(destoffset);
-            imm = fetch_long_imm();
-            DECODE_PRINTF2("%x\n", imm);
-            TRACE_AND_STEP();
-            destval = (*opc81_long_operation[rh]) (destval, imm);
-            if (rh != 7)
-                store_data_long(destoffset, destval);
-        } else {
-            u16 destval,imm;
+	    DECODE_PRINTF("DWORD PTR ");
+	    destoffset = decode_rm10_address(rl);
+	    DECODE_PRINTF(",");
+	    destval = fetch_data_long(destoffset);
+	    imm = fetch_long_imm();
+	    DECODE_PRINTF2("%x\n", imm);
+	    TRACE_AND_STEP();
+	    destval = (*opc81_long_operation[rh]) (destval, imm);
+	    if (rh != 7)
+		store_data_long(destoffset, destval);
+	} else {
+	    u16 destval,imm;
 
-            DECODE_PRINTF("WORD PTR ");
-            destoffset = decode_rm10_address(rl);
-            DECODE_PRINTF(",");
-            destval = fetch_data_word(destoffset);
-            imm = fetch_word_imm();
-            DECODE_PRINTF2("%x\n", imm);
-            TRACE_AND_STEP();
-            destval = (*opc81_word_operation[rh]) (destval, imm);
-            if (rh != 7)
-                store_data_word(destoffset, destval);
-        }
-        break;
+	    DECODE_PRINTF("WORD PTR ");
+	    destoffset = decode_rm10_address(rl);
+	    DECODE_PRINTF(",");
+	    destval = fetch_data_word(destoffset);
+	    imm = fetch_word_imm();
+	    DECODE_PRINTF2("%x\n", imm);
+	    TRACE_AND_STEP();
+	    destval = (*opc81_word_operation[rh]) (destval, imm);
+	    if (rh != 7)
+		store_data_word(destoffset, destval);
+	}
+	break;
     case 3:                     /* register to register */
-        if (M.x86.mode & SYSMODE_PREFIX_DATA) {
-            u32 *destreg;
-            u32 destval,imm;
+	if (M.x86.mode & SYSMODE_PREFIX_DATA) {
+	    u32 *destreg;
+	    u32 destval,imm;
 
-            destreg = DECODE_RM_LONG_REGISTER(rl);
-            DECODE_PRINTF(",");
-            imm = fetch_long_imm();
-            DECODE_PRINTF2("%x\n", imm);
-            TRACE_AND_STEP();
-            destval = (*opc81_long_operation[rh]) (*destreg, imm);
-            if (rh != 7)
-                *destreg = destval;
-        } else {
-            u16 *destreg;
-            u16 destval,imm;
+	    destreg = DECODE_RM_LONG_REGISTER(rl);
+	    DECODE_PRINTF(",");
+	    imm = fetch_long_imm();
+	    DECODE_PRINTF2("%x\n", imm);
+	    TRACE_AND_STEP();
+	    destval = (*opc81_long_operation[rh]) (*destreg, imm);
+	    if (rh != 7)
+		*destreg = destval;
+	} else {
+	    u16 *destreg;
+	    u16 destval,imm;
 
-            destreg = DECODE_RM_WORD_REGISTER(rl);
-            DECODE_PRINTF(",");
-            imm = fetch_word_imm();
-            DECODE_PRINTF2("%x\n", imm);
-            TRACE_AND_STEP();
-            destval = (*opc81_word_operation[rh]) (*destreg, imm);
-            if (rh != 7)
-                *destreg = destval;
-        }
-        break;
+	    destreg = DECODE_RM_WORD_REGISTER(rl);
+	    DECODE_PRINTF(",");
+	    imm = fetch_word_imm();
+	    DECODE_PRINTF2("%x\n", imm);
+	    TRACE_AND_STEP();
+	    destval = (*opc81_word_operation[rh]) (*destreg, imm);
+	    if (rh != 7)
+		*destreg = destval;
+	}
+	break;
     }
     DECODE_CLEAR_SEGOVR();
     END_OF_INSTR();
@@ -5492,12 +5492,12 @@
 static u8 (*opc82_byte_operation[])(u8 s, u8 d) =
 {
     add_byte,           /*00 */
-    or_byte,            /*01 *//*YYY UNUSED ???? */
+    or_byte,            /*01 */ /*YYY UNUSED ???? */
     adc_byte,           /*02 */
     sbb_byte,           /*03 */
-    and_byte,           /*04 *//*YYY UNUSED ???? */
+    and_byte,           /*04 */ /*YYY UNUSED ???? */
     sub_byte,           /*05 */
-    xor_byte,           /*06 *//*YYY UNUSED ???? */
+    xor_byte,           /*06 */ /*YYY UNUSED ???? */
     cmp_byte,           /*07 */
 };
 
@@ -5523,83 +5523,83 @@
     FETCH_DECODE_MODRM(mod, rh, rl);
 #ifdef DEBUG
     if (DEBUG_DECODE()) {
-        /* XXX DECODE_PRINTF may be changed to something more
-           general, so that it is important to leave the strings
-           in the same format, even though the result is that the 
-           above test is done twice. */
-        switch (rh) {
-        case 0:
-            DECODE_PRINTF("ADD\t");
-            break;
-        case 1:
-            DECODE_PRINTF("OR\t");
-            break;
-        case 2:
-            DECODE_PRINTF("ADC\t");
-            break;
-        case 3:
-            DECODE_PRINTF("SBB\t");
-            break;
-        case 4:
-            DECODE_PRINTF("AND\t");
-            break;
-        case 5:
-            DECODE_PRINTF("SUB\t");
-            break;
-        case 6:
-            DECODE_PRINTF("XOR\t");
-            break;
-        case 7:
-            DECODE_PRINTF("CMP\t");
-            break;
-        }
+	/* XXX DECODE_PRINTF may be changed to something more
+	   general, so that it is important to leave the strings
+	   in the same format, even though the result is that the
+	   above test is done twice. */
+	switch (rh) {
+	case 0:
+	    DECODE_PRINTF("ADD\t");
+	    break;
+	case 1:
+	    DECODE_PRINTF("OR\t");
+	    break;
+	case 2:
+	    DECODE_PRINTF("ADC\t");
+	    break;
+	case 3:
+	    DECODE_PRINTF("SBB\t");
+	    break;
+	case 4:
+	    DECODE_PRINTF("AND\t");
+	    break;
+	case 5:
+	    DECODE_PRINTF("SUB\t");
+	    break;
+	case 6:
+	    DECODE_PRINTF("XOR\t");
+	    break;
+	case 7:
+	    DECODE_PRINTF("CMP\t");
+	    break;
+	}
     }
 #endif
     /* know operation, decode the mod byte to find the addressing
        mode. */
     switch (mod) {
     case 0:
-        DECODE_PRINTF("BYTE PTR ");
-        destoffset = decode_rm00_address(rl);
-        destval = fetch_data_byte(destoffset);
-        imm = fetch_byte_imm();
-        DECODE_PRINTF2(",%x\n", imm);
-        TRACE_AND_STEP();
-        destval = (*opc82_byte_operation[rh]) (destval, imm);
-        if (rh != 7)
-            store_data_byte(destoffset, destval);
-        break;
+	DECODE_PRINTF("BYTE PTR ");
+	destoffset = decode_rm00_address(rl);
+	destval = fetch_data_byte(destoffset);
+	imm = fetch_byte_imm();
+	DECODE_PRINTF2(",%x\n", imm);
+	TRACE_AND_STEP();
+	destval = (*opc82_byte_operation[rh]) (destval, imm);
+	if (rh != 7)
+	    store_data_byte(destoffset, destval);
+	break;
     case 1:
-        DECODE_PRINTF("BYTE PTR ");
-        destoffset = decode_rm01_address(rl);
-        destval = fetch_data_byte(destoffset);
-        imm = fetch_byte_imm();
-        DECODE_PRINTF2(",%x\n", imm);
-        TRACE_AND_STEP();
-        destval = (*opc82_byte_operation[rh]) (destval, imm);
-        if (rh != 7)
-            store_data_byte(destoffset, destval);
-        break;
+	DECODE_PRINTF("BYTE PTR ");
+	destoffset = decode_rm01_address(rl);
+	destval = fetch_data_byte(destoffset);
+	imm = fetch_byte_imm();
+	DECODE_PRINTF2(",%x\n", imm);
+	TRACE_AND_STEP();
+	destval = (*opc82_byte_operation[rh]) (destval, imm);
+	if (rh != 7)
+	    store_data_byte(destoffset, destval);
+	break;
     case 2:
-        DECODE_PRINTF("BYTE PTR ");
-        destoffset = decode_rm10_address(rl);
-        destval = fetch_data_byte(destoffset);
-        imm = fetch_byte_imm();
-        DECODE_PRINTF2(",%x\n", imm);
-        TRACE_AND_STEP();
-        destval = (*opc82_byte_operation[rh]) (destval, imm);
-        if (rh != 7)
-            store_data_byte(destoffset, destval);
-        break;
+	DECODE_PRINTF("BYTE PTR ");
+	destoffset = decode_rm10_address(rl);
+	destval = fetch_data_byte(destoffset);
+	imm = fetch_byte_imm();
+	DECODE_PRINTF2(",%x\n", imm);
+	TRACE_AND_STEP();
+	destval = (*opc82_byte_operation[rh]) (destval, imm);
+	if (rh != 7)
+	    store_data_byte(destoffset, destval);
+	break;
     case 3:                     /* register to register */
-        destreg = DECODE_RM_BYTE_REGISTER(rl);
-        imm = fetch_byte_imm();
-        DECODE_PRINTF2(",%x\n", imm);
-        TRACE_AND_STEP();
-        destval = (*opc82_byte_operation[rh]) (*destreg, imm);
-        if (rh != 7)
-            *destreg = destval;
-        break;
+	destreg = DECODE_RM_BYTE_REGISTER(rl);
+	imm = fetch_byte_imm();
+	DECODE_PRINTF2(",%x\n", imm);
+	TRACE_AND_STEP();
+	destval = (*opc82_byte_operation[rh]) (*destreg, imm);
+	if (rh != 7)
+	    *destreg = destval;
+	break;
     }
     DECODE_CLEAR_SEGOVR();
     END_OF_INSTR();
@@ -5608,24 +5608,24 @@
 static u16 (*opc83_word_operation[])(u16 s, u16 d) =
 {
     add_word,           /*00 */
-    or_word,            /*01 *//*YYY UNUSED ???? */
+    or_word,            /*01 */ /*YYY UNUSED ???? */
     adc_word,           /*02 */
     sbb_word,           /*03 */
-    and_word,           /*04 *//*YYY UNUSED ???? */
+    and_word,           /*04 */ /*YYY UNUSED ???? */
     sub_word,           /*05 */
-    xor_word,           /*06 *//*YYY UNUSED ???? */
+    xor_word,           /*06 */ /*YYY UNUSED ???? */
     cmp_word,           /*07 */
 };
 
 static u32 (*opc83_long_operation[])(u32 s, u32 d) =
 {
     add_long,           /*00 */
-    or_long,            /*01 *//*YYY UNUSED ???? */
+    or_long,            /*01 */ /*YYY UNUSED ???? */
     adc_long,           /*02 */
     sbb_long,           /*03 */
-    and_long,           /*04 *//*YYY UNUSED ???? */
+    and_long,           /*04 */ /*YYY UNUSED ???? */
     sub_long,           /*05 */
-    xor_long,           /*06 *//*YYY UNUSED ???? */
+    xor_long,           /*06 */ /*YYY UNUSED ???? */
     cmp_long,           /*07 */
 };
 
@@ -5648,147 +5648,147 @@
     FETCH_DECODE_MODRM(mod, rh, rl);
 #ifdef DEBUG
     if (DEBUG_DECODE()) {
-        /* XXX DECODE_PRINTF may be changed to something more
-           general, so that it is important to leave the strings
-           in the same format, even though the result is that the 
-           above test is done twice. */
+	/* XXX DECODE_PRINTF may be changed to something more
+	   general, so that it is important to leave the strings
+	   in the same format, even though the result is that the
+	   above test is done twice. */
        switch (rh) {
-        case 0:
-            DECODE_PRINTF("ADD\t");
-            break;
-        case 1:
-            DECODE_PRINTF("OR\t");
-            break;
-        case 2:
-            DECODE_PRINTF("ADC\t");
-            break;
-        case 3:
-            DECODE_PRINTF("SBB\t");
-            break;
-        case 4:
-            DECODE_PRINTF("AND\t");
-            break;
-        case 5:
-            DECODE_PRINTF("SUB\t");
-            break;
-        case 6:
-            DECODE_PRINTF("XOR\t");
-            break;
-        case 7:
-            DECODE_PRINTF("CMP\t");
-            break;
-        }
+	case 0:
+	    DECODE_PRINTF("ADD\t");
+	    break;
+	case 1:
+	    DECODE_PRINTF("OR\t");
+	    break;
+	case 2:
+	    DECODE_PRINTF("ADC\t");
+	    break;
+	case 3:
+	    DECODE_PRINTF("SBB\t");
+	    break;
+	case 4:
+	    DECODE_PRINTF("AND\t");
+	    break;
+	case 5:
+	    DECODE_PRINTF("SUB\t");
+	    break;
+	case 6:
+	    DECODE_PRINTF("XOR\t");
+	    break;
+	case 7:
+	    DECODE_PRINTF("CMP\t");
+	    break;
+	}
     }
 #endif
     /* know operation, decode the mod byte to find the addressing
        mode. */
     switch (mod) {
     case 0:
-        if (M.x86.mode & SYSMODE_PREFIX_DATA) {
-            u32 destval,imm;
+	if (M.x86.mode & SYSMODE_PREFIX_DATA) {
+	    u32 destval,imm;
 
-            DECODE_PRINTF("DWORD PTR ");
-            destoffset = decode_rm00_address(rl);
-            destval = fetch_data_long(destoffset);
-            imm = (s8) fetch_byte_imm();
-            DECODE_PRINTF2(",%x\n", imm);
-            TRACE_AND_STEP();
-            destval = (*opc83_long_operation[rh]) (destval, imm);
-            if (rh != 7)
-                store_data_long(destoffset, destval);
-        } else {
-            u16 destval,imm;
+	    DECODE_PRINTF("DWORD PTR ");
+	    destoffset = decode_rm00_address(rl);
+	    destval = fetch_data_long(destoffset);
+	    imm = (s8) fetch_byte_imm();
+	    DECODE_PRINTF2(",%x\n", imm);
+	    TRACE_AND_STEP();
+	    destval = (*opc83_long_operation[rh]) (destval, imm);
+	    if (rh != 7)
+		store_data_long(destoffset, destval);
+	} else {
+	    u16 destval,imm;
 
-            DECODE_PRINTF("WORD PTR ");
-            destoffset = decode_rm00_address(rl);
-            destval = fetch_data_word(destoffset);
-            imm = (s8) fetch_byte_imm();
-            DECODE_PRINTF2(",%x\n", imm);
-            TRACE_AND_STEP();
-            destval = (*opc83_word_operation[rh]) (destval, imm);
-            if (rh != 7)
-                store_data_word(destoffset, destval);
-        }
-        break;
+	    DECODE_PRINTF("WORD PTR ");
+	    destoffset = decode_rm00_address(rl);
+	    destval = fetch_data_word(destoffset);
+	    imm = (s8) fetch_byte_imm();
+	    DECODE_PRINTF2(",%x\n", imm);
+	    TRACE_AND_STEP();
+	    destval = (*opc83_word_operation[rh]) (destval, imm);
+	    if (rh != 7)
+		store_data_word(destoffset, destval);
+	}
+	break;
     case 1:
-        if (M.x86.mode & SYSMODE_PREFIX_DATA) {
-            u32 destval,imm;
+	if (M.x86.mode & SYSMODE_PREFIX_DATA) {
+	    u32 destval,imm;
 
-            DECODE_PRINTF("DWORD PTR ");
-            destoffset = decode_rm01_address(rl);
-            destval = fetch_data_long(destoffset);
-            imm = (s8) fetch_byte_imm();
-            DECODE_PRINTF2(",%x\n", imm);
-            TRACE_AND_STEP();
-            destval = (*opc83_long_operation[rh]) (destval, imm);
-            if (rh != 7)
-                store_data_long(destoffset, destval);
-        } else {
-            u16 destval,imm;
+	    DECODE_PRINTF("DWORD PTR ");
+	    destoffset = decode_rm01_address(rl);
+	    destval = fetch_data_long(destoffset);
+	    imm = (s8) fetch_byte_imm();
+	    DECODE_PRINTF2(",%x\n", imm);
+	    TRACE_AND_STEP();
+	    destval = (*opc83_long_operation[rh]) (destval, imm);
+	    if (rh != 7)
+		store_data_long(destoffset, destval);
+	} else {
+	    u16 destval,imm;
 
-            DECODE_PRINTF("WORD PTR ");
-            destoffset = decode_rm01_address(rl);
-            destval = fetch_data_word(destoffset);
-            imm = (s8) fetch_byte_imm();
-            DECODE_PRINTF2(",%x\n", imm);
-            TRACE_AND_STEP();
-            destval = (*opc83_word_operation[rh]) (destval, imm);
-            if (rh != 7)
-                store_data_word(destoffset, destval);
-        }
-        break;
+	    DECODE_PRINTF("WORD PTR ");
+	    destoffset = decode_rm01_address(rl);
+	    destval = fetch_data_word(destoffset);
+	    imm = (s8) fetch_byte_imm();
+	    DECODE_PRINTF2(",%x\n", imm);
+	    TRACE_AND_STEP();
+	    destval = (*opc83_word_operation[rh]) (destval, imm);
+	    if (rh != 7)
+		store_data_word(destoffset, destval);
+	}
+	break;
     case 2:
-        if (M.x86.mode & SYSMODE_PREFIX_DATA) {
-            u32 destval,imm;
+	if (M.x86.mode & SYSMODE_PREFIX_DATA) {
+	    u32 destval,imm;
 
-            DECODE_PRINTF("DWORD PTR ");
-            destoffset = decode_rm10_address(rl);
-            destval = fetch_data_long(destoffset);
-            imm = (s8) fetch_byte_imm();
-            DECODE_PRINTF2(",%x\n", imm);
-            TRACE_AND_STEP();
-            destval = (*opc83_long_operation[rh]) (destval, imm);
-            if (rh != 7)
-                store_data_long(destoffset, destval);
-        } else {
-            u16 destval,imm;
+	    DECODE_PRINTF("DWORD PTR ");
+	    destoffset = decode_rm10_address(rl);
+	    destval = fetch_data_long(destoffset);
+	    imm = (s8) fetch_byte_imm();
+	    DECODE_PRINTF2(",%x\n", imm);
+	    TRACE_AND_STEP();
+	    destval = (*opc83_long_operation[rh]) (destval, imm);
+	    if (rh != 7)
+		store_data_long(destoffset, destval);
+	} else {
+	    u16 destval,imm;
 
-            DECODE_PRINTF("WORD PTR ");
-            destoffset = decode_rm10_address(rl);
-            destval = fetch_data_word(destoffset);
-            imm = (s8) fetch_byte_imm();
-            DECODE_PRINTF2(",%x\n", imm);
-            TRACE_AND_STEP();
-            destval = (*opc83_word_operation[rh]) (destval, imm);
-            if (rh != 7)
-                store_data_word(destoffset, destval);
-        }
-        break;
+	    DECODE_PRINTF("WORD PTR ");
+	    destoffset = decode_rm10_address(rl);
+	    destval = fetch_data_word(destoffset);
+	    imm = (s8) fetch_byte_imm();
+	    DECODE_PRINTF2(",%x\n", imm);
+	    TRACE_AND_STEP();
+	    destval = (*opc83_word_operation[rh]) (destval, imm);
+	    if (rh != 7)
+		store_data_word(destoffset, destval);
+	}
+	break;
     case 3:                     /* register to register */
-        if (M.x86.mode & SYSMODE_PREFIX_DATA) {
-            u32 *destreg;
-            u32 destval,imm;
+	if (M.x86.mode & SYSMODE_PREFIX_DATA) {
+	    u32 *destreg;
+	    u32 destval,imm;
 
-            destreg = DECODE_RM_LONG_REGISTER(rl);
-            imm = (s8) fetch_byte_imm();
-            DECODE_PRINTF2(",%x\n", imm);
-            TRACE_AND_STEP();
-            destval = (*opc83_long_operation[rh]) (*destreg, imm);
-            if (rh != 7)
-                *destreg = destval;
-        } else {
-            u16 *destreg;
-            u16 destval,imm;
+	    destreg = DECODE_RM_LONG_REGISTER(rl);
+	    imm = (s8) fetch_byte_imm();
+	    DECODE_PRINTF2(",%x\n", imm);
+	    TRACE_AND_STEP();
+	    destval = (*opc83_long_operation[rh]) (*destreg, imm);
+	    if (rh != 7)
+		*destreg = destval;
+	} else {
+	    u16 *destreg;
+	    u16 destval,imm;
 
-            destreg = DECODE_RM_WORD_REGISTER(rl);
-            imm = (s8) fetch_byte_imm();
-            DECODE_PRINTF2(",%x\n", imm);
-            TRACE_AND_STEP();
-            destval = (*opc83_word_operation[rh]) (*destreg, imm);
-            if (rh != 7)
-                *destreg = destval;
-        }
-        break;
+	    destreg = DECODE_RM_WORD_REGISTER(rl);
+	    imm = (s8) fetch_byte_imm();
+	    DECODE_PRINTF2(",%x\n", imm);
+	    TRACE_AND_STEP();
+	    destval = (*opc83_word_operation[rh]) (*destreg, imm);
+	    if (rh != 7)
+		*destreg = destval;
+	}
+	break;
     }
     DECODE_CLEAR_SEGOVR();
     END_OF_INSTR();
@@ -5810,40 +5810,40 @@
     FETCH_DECODE_MODRM(mod, rh, rl);
     switch (mod) {
     case 0:
-        destoffset = decode_rm00_address(rl);
-        DECODE_PRINTF(",");
-        destval = fetch_data_byte(destoffset);
-        srcreg = DECODE_RM_BYTE_REGISTER(rh);
-        DECODE_PRINTF("\n");
-        TRACE_AND_STEP();
-        test_byte(destval, *srcreg);
-        break;
+	destoffset = decode_rm00_address(rl);
+	DECODE_PRINTF(",");
+	destval = fetch_data_byte(destoffset);
+	srcreg = DECODE_RM_BYTE_REGISTER(rh);
+	DECODE_PRINTF("\n");
+	TRACE_AND_STEP();
+	test_byte(destval, *srcreg);
+	break;
     case 1:
-        destoffset = decode_rm01_address(rl);
-        DECODE_PRINTF(",");
-        destval = fetch_data_byte(destoffset);
-        srcreg = DECODE_RM_BYTE_REGISTER(rh);
-        DECODE_PRINTF("\n");
-        TRACE_AND_STEP();
-        test_byte(destval, *srcreg);
-        break;
+	destoffset = decode_rm01_address(rl);
+	DECODE_PRINTF(",");
+	destval = fetch_data_byte(destoffset);
+	srcreg = DECODE_RM_BYTE_REGISTER(rh);
+	DECODE_PRINTF("\n");
+	TRACE_AND_STEP();
+	test_byte(destval, *srcreg);
+	break;
     case 2:
-        destoffset = decode_rm10_address(rl);
-        DECODE_PRINTF(",");
-        destval = fetch_data_byte(destoffset);
-        srcreg = DECODE_RM_BYTE_REGISTER(rh);
-        DECODE_PRINTF("\n");
-        TRACE_AND_STEP();
-        test_byte(destval, *srcreg);
-        break;
+	destoffset = decode_rm10_address(rl);
+	DECODE_PRINTF(",");
+	destval = fetch_data_byte(destoffset);
+	srcreg = DECODE_RM_BYTE_REGISTER(rh);
+	DECODE_PRINTF("\n");
+	TRACE_AND_STEP();
+	test_byte(destval, *srcreg);
+	break;
     case 3:                     /* register to register */
-        destreg = DECODE_RM_BYTE_REGISTER(rl);
-        DECODE_PRINTF(",");
-        srcreg = DECODE_RM_BYTE_REGISTER(rh);
-        DECODE_PRINTF("\n");
-        TRACE_AND_STEP();
-        test_byte(*destreg, *srcreg);
-        break;
+	destreg = DECODE_RM_BYTE_REGISTER(rl);
+	DECODE_PRINTF(",");
+	srcreg = DECODE_RM_BYTE_REGISTER(rh);
+	DECODE_PRINTF("\n");
+	TRACE_AND_STEP();
+	test_byte(*destreg, *srcreg);
+	break;
     }
     DECODE_CLEAR_SEGOVR();
     END_OF_INSTR();
@@ -5863,101 +5863,101 @@
     FETCH_DECODE_MODRM(mod, rh, rl);
     switch (mod) {
     case 0:
-        if (M.x86.mode & SYSMODE_PREFIX_DATA) {
-            u32 destval;
-            u32 *srcreg;
+	if (M.x86.mode & SYSMODE_PREFIX_DATA) {
+	    u32 destval;
+	    u32 *srcreg;
 
-            destoffset = decode_rm00_address(rl);
-            DECODE_PRINTF(",");
-            destval = fetch_data_long(destoffset);
-            srcreg = DECODE_RM_LONG_REGISTER(rh);
-            DECODE_PRINTF("\n");
-            TRACE_AND_STEP();
-            test_long(destval, *srcreg);
-        } else {
-            u16 destval;
-            u16 *srcreg;
+	    destoffset = decode_rm00_address(rl);
+	    DECODE_PRINTF(",");
+	    destval = fetch_data_long(destoffset);
+	    srcreg = DECODE_RM_LONG_REGISTER(rh);
+	    DECODE_PRINTF("\n");
+	    TRACE_AND_STEP();
+	    test_long(destval, *srcreg);
+	} else {
+	    u16 destval;
+	    u16 *srcreg;
 
-            destoffset = decode_rm00_address(rl);
-            DECODE_PRINTF(",");
-            destval = fetch_data_word(destoffset);
-            srcreg = DECODE_RM_WORD_REGISTER(rh);
-            DECODE_PRINTF("\n");
-            TRACE_AND_STEP();
-            test_word(destval, *srcreg);
-        }
-        break;
+	    destoffset = decode_rm00_address(rl);
+	    DECODE_PRINTF(",");
+	    destval = fetch_data_word(destoffset);
+	    srcreg = DECODE_RM_WORD_REGISTER(rh);
+	    DECODE_PRINTF("\n");
+	    TRACE_AND_STEP();
+	    test_word(destval, *srcreg);
+	}
+	break;
     case 1:
-        if (M.x86.mode & SYSMODE_PREFIX_DATA) {
-            u32 destval;
-            u32 *srcreg;
+	if (M.x86.mode & SYSMODE_PREFIX_DATA) {
+	    u32 destval;
+	    u32 *srcreg;
 
-            destoffset = decode_rm01_address(rl);
-            DECODE_PRINTF(",");
-            destval = fetch_data_long(destoffset);
-            srcreg = DECODE_RM_LONG_REGISTER(rh);
-            DECODE_PRINTF("\n");
-            TRACE_AND_STEP();
-            test_long(destval, *srcreg);
-        } else {
-            u16 destval;
-            u16 *srcreg;
+	    destoffset = decode_rm01_address(rl);
+	    DECODE_PRINTF(",");
+	    destval = fetch_data_long(destoffset);
+	    srcreg = DECODE_RM_LONG_REGISTER(rh);
+	    DECODE_PRINTF("\n");
+	    TRACE_AND_STEP();
+	    test_long(destval, *srcreg);
+	} else {
+	    u16 destval;
+	    u16 *srcreg;
 
-            destoffset = decode_rm01_address(rl);
-            DECODE_PRINTF(",");
-            destval = fetch_data_word(destoffset);
-            srcreg = DECODE_RM_WORD_REGISTER(rh);
-            DECODE_PRINTF("\n");
-            TRACE_AND_STEP();
-            test_word(destval, *srcreg);
-        }
-        break;
+	    destoffset = decode_rm01_address(rl);
+	    DECODE_PRINTF(",");
+	    destval = fetch_data_word(destoffset);
+	    srcreg = DECODE_RM_WORD_REGISTER(rh);
+	    DECODE_PRINTF("\n");
+	    TRACE_AND_STEP();
+	    test_word(destval, *srcreg);
+	}
+	break;
     case 2:
-        if (M.x86.mode & SYSMODE_PREFIX_DATA) {
-            u32 destval;
-            u32 *srcreg;
+	if (M.x86.mode & SYSMODE_PREFIX_DATA) {
+	    u32 destval;
+	    u32 *srcreg;
 
-            destoffset = decode_rm10_address(rl);
-            DECODE_PRINTF(",");
-            destval = fetch_data_long(destoffset);
-            srcreg = DECODE_RM_LONG_REGISTER(rh);
-            DECODE_PRINTF("\n");
-            TRACE_AND_STEP();
-            test_long(destval, *srcreg);
-        } else {
-            u16 destval;
-            u16 *srcreg;
+	    destoffset = decode_rm10_address(rl);
+	    DECODE_PRINTF(",");
+	    destval = fetch_data_long(destoffset);
+	    srcreg = DECODE_RM_LONG_REGISTER(rh);
+	    DECODE_PRINTF("\n");
+	    TRACE_AND_STEP();
+	    test_long(destval, *srcreg);
+	} else {
+	    u16 destval;
+	    u16 *srcreg;
 
-            destoffset = decode_rm10_address(rl);
-            DECODE_PRINTF(",");
-            destval = fetch_data_word(destoffset);
-            srcreg = DECODE_RM_WORD_REGISTER(rh);
-            DECODE_PRINTF("\n");
-            TRACE_AND_STEP();
-            test_word(destval, *srcreg);
-        }
-        break;
+	    destoffset = decode_rm10_address(rl);
+	    DECODE_PRINTF(",");
+	    destval = fetch_data_word(destoffset);
+	    srcreg = DECODE_RM_WORD_REGISTER(rh);
+	    DECODE_PRINTF("\n");
+	    TRACE_AND_STEP();
+	    test_word(destval, *srcreg);
+	}
+	break;
     case 3:                     /* register to register */
-        if (M.x86.mode & SYSMODE_PREFIX_DATA) {
-            u32 *destreg,*srcreg;
+	if (M.x86.mode & SYSMODE_PREFIX_DATA) {
+	    u32 *destreg,*srcreg;
 
-            destreg = DECODE_RM_LONG_REGISTER(rl);
-            DECODE_PRINTF(",");
-            srcreg = DECODE_RM_LONG_REGISTER(rh);
-            DECODE_PRINTF("\n");
-            TRACE_AND_STEP();
-            test_long(*destreg, *srcreg);
-        } else {
-            u16 *destreg,*srcreg;
+	    destreg = DECODE_RM_LONG_REGISTER(rl);
+	    DECODE_PRINTF(",");
+	    srcreg = DECODE_RM_LONG_REGISTER(rh);
+	    DECODE_PRINTF("\n");
+	    TRACE_AND_STEP();
+	    test_long(*destreg, *srcreg);
+	} else {
+	    u16 *destreg,*srcreg;
 
-            destreg = DECODE_RM_WORD_REGISTER(rl);
-            DECODE_PRINTF(",");
-            srcreg = DECODE_RM_WORD_REGISTER(rh);
-            DECODE_PRINTF("\n");
-            TRACE_AND_STEP();
-            test_word(*destreg, *srcreg);
-        }
-        break;
+	    destreg = DECODE_RM_WORD_REGISTER(rl);
+	    DECODE_PRINTF(",");
+	    srcreg = DECODE_RM_WORD_REGISTER(rh);
+	    DECODE_PRINTF("\n");
+	    TRACE_AND_STEP();
+	    test_word(*destreg, *srcreg);
+	}
+	break;
     }
     DECODE_CLEAR_SEGOVR();
     END_OF_INSTR();
@@ -5980,51 +5980,51 @@
     FETCH_DECODE_MODRM(mod, rh, rl);
     switch (mod) {
     case 0:
-        destoffset = decode_rm00_address(rl);
-        DECODE_PRINTF(",");
-        destval = fetch_data_byte(destoffset);
-        srcreg = DECODE_RM_BYTE_REGISTER(rh);
-        DECODE_PRINTF("\n");
-        TRACE_AND_STEP();
-        tmp = *srcreg;
-        *srcreg = destval;
-        destval = tmp;
-        store_data_byte(destoffset, destval);
-        break;
+	destoffset = decode_rm00_address(rl);
+	DECODE_PRINTF(",");
+	destval = fetch_data_byte(destoffset);
+	srcreg = DECODE_RM_BYTE_REGISTER(rh);
+	DECODE_PRINTF("\n");
+	TRACE_AND_STEP();
+	tmp = *srcreg;
+	*srcreg = destval;
+	destval = tmp;
+	store_data_byte(destoffset, destval);
+	break;
     case 1:
-        destoffset = decode_rm01_address(rl);
-        DECODE_PRINTF(",");
-        destval = fetch_data_byte(destoffset);
-        srcreg = DECODE_RM_BYTE_REGISTER(rh);
-        DECODE_PRINTF("\n");
-        TRACE_AND_STEP();
-        tmp = *srcreg;
-        *srcreg = destval;
-        destval = tmp;
-        store_data_byte(destoffset, destval);
-        break;
+	destoffset = decode_rm01_address(rl);
+	DECODE_PRINTF(",");
+	destval = fetch_data_byte(destoffset);
+	srcreg = DECODE_RM_BYTE_REGISTER(rh);
+	DECODE_PRINTF("\n");
+	TRACE_AND_STEP();
+	tmp = *srcreg;
+	*srcreg = destval;
+	destval = tmp;
+	store_data_byte(destoffset, destval);
+	break;
     case 2:
-        destoffset = decode_rm10_address(rl);
-        DECODE_PRINTF(",");
-        destval = fetch_data_byte(destoffset);
-        srcreg = DECODE_RM_BYTE_REGISTER(rh);
-        DECODE_PRINTF("\n");
-        TRACE_AND_STEP();
-        tmp = *srcreg;
-        *srcreg = destval;
-        destval = tmp;
-        store_data_byte(destoffset, destval);
-        break;
+	destoffset = decode_rm10_address(rl);
+	DECODE_PRINTF(",");
+	destval = fetch_data_byte(destoffset);
+	srcreg = DECODE_RM_BYTE_REGISTER(rh);
+	DECODE_PRINTF("\n");
+	TRACE_AND_STEP();
+	tmp = *srcreg;
+	*srcreg = destval;
+	destval = tmp;
+	store_data_byte(destoffset, destval);
+	break;
     case 3:                     /* register to register */
-        destreg = DECODE_RM_BYTE_REGISTER(rl);
-        DECODE_PRINTF(",");
-        srcreg = DECODE_RM_BYTE_REGISTER(rh);
-        DECODE_PRINTF("\n");
-        TRACE_AND_STEP();
-        tmp = *srcreg;
-        *srcreg = *destreg;
-        *destreg = tmp;
-        break;
+	destreg = DECODE_RM_BYTE_REGISTER(rl);
+	DECODE_PRINTF(",");
+	srcreg = DECODE_RM_BYTE_REGISTER(rh);
+	DECODE_PRINTF("\n");
+	TRACE_AND_STEP();
+	tmp = *srcreg;
+	*srcreg = *destreg;
+	*destreg = tmp;
+	break;
     }
     DECODE_CLEAR_SEGOVR();
     END_OF_INSTR();
@@ -6044,125 +6044,125 @@
     FETCH_DECODE_MODRM(mod, rh, rl);
     switch (mod) {
     case 0:
-        if (M.x86.mode & SYSMODE_PREFIX_DATA) {
-            u32 *srcreg;
-            u32 destval,tmp;
+	if (M.x86.mode & SYSMODE_PREFIX_DATA) {
+	    u32 *srcreg;
+	    u32 destval,tmp;
 
-            destoffset = decode_rm00_address(rl);
-            DECODE_PRINTF(",");
-            destval = fetch_data_long(destoffset);
-            srcreg = DECODE_RM_LONG_REGISTER(rh);
-            DECODE_PRINTF("\n");
-            TRACE_AND_STEP();
-            tmp = *srcreg;
-            *srcreg = destval;
-            destval = tmp;
-            store_data_long(destoffset, destval);
-        } else {
-            u16 *srcreg;
-            u16 destval,tmp;
+	    destoffset = decode_rm00_address(rl);
+	    DECODE_PRINTF(",");
+	    destval = fetch_data_long(destoffset);
+	    srcreg = DECODE_RM_LONG_REGISTER(rh);
+	    DECODE_PRINTF("\n");
+	    TRACE_AND_STEP();
+	    tmp = *srcreg;
+	    *srcreg = destval;
+	    destval = tmp;
+	    store_data_long(destoffset, destval);
+	} else {
+	    u16 *srcreg;
+	    u16 destval,tmp;
 
-            destoffset = decode_rm00_address(rl);
-            DECODE_PRINTF(",");
-            destval = fetch_data_word(destoffset);
-            srcreg = DECODE_RM_WORD_REGISTER(rh);
-            DECODE_PRINTF("\n");
-            TRACE_AND_STEP();
-            tmp = *srcreg;
-            *srcreg = destval;
-            destval = tmp;
-            store_data_word(destoffset, destval);
-        }
-        break;
+	    destoffset = decode_rm00_address(rl);
+	    DECODE_PRINTF(",");
+	    destval = fetch_data_word(destoffset);
+	    srcreg = DECODE_RM_WORD_REGISTER(rh);
+	    DECODE_PRINTF("\n");
+	    TRACE_AND_STEP();
+	    tmp = *srcreg;
+	    *srcreg = destval;
+	    destval = tmp;
+	    store_data_word(destoffset, destval);
+	}
+	break;
     case 1:
-        if (M.x86.mode & SYSMODE_PREFIX_DATA) {
-            u32 *srcreg;
-            u32 destval,tmp;
+	if (M.x86.mode & SYSMODE_PREFIX_DATA) {
+	    u32 *srcreg;
+	    u32 destval,tmp;
 
-            destoffset = decode_rm01_address(rl);
-            DECODE_PRINTF(",");
-            destval = fetch_data_long(destoffset);
-            srcreg = DECODE_RM_LONG_REGISTER(rh);
-            DECODE_PRINTF("\n");
-            TRACE_AND_STEP();
-            tmp = *srcreg;
-            *srcreg = destval;
-            destval = tmp;
-            store_data_long(destoffset, destval);
-        } else {
-            u16 *srcreg;
-            u16 destval,tmp;
+	    destoffset = decode_rm01_address(rl);
+	    DECODE_PRINTF(",");
+	    destval = fetch_data_long(destoffset);
+	    srcreg = DECODE_RM_LONG_REGISTER(rh);
+	    DECODE_PRINTF("\n");
+	    TRACE_AND_STEP();
+	    tmp = *srcreg;
+	    *srcreg = destval;
+	    destval = tmp;
+	    store_data_long(destoffset, destval);
+	} else {
+	    u16 *srcreg;
+	    u16 destval,tmp;
 
-            destoffset = decode_rm01_address(rl);
-            DECODE_PRINTF(",");
-            destval = fetch_data_word(destoffset);
-            srcreg = DECODE_RM_WORD_REGISTER(rh);
-            DECODE_PRINTF("\n");
-            TRACE_AND_STEP();
-            tmp = *srcreg;
-            *srcreg = destval;
-            destval = tmp;
-            store_data_word(destoffset, destval);
-        }
-        break;
+	    destoffset = decode_rm01_address(rl);
+	    DECODE_PRINTF(",");
+	    destval = fetch_data_word(destoffset);
+	    srcreg = DECODE_RM_WORD_REGISTER(rh);
+	    DECODE_PRINTF("\n");
+	    TRACE_AND_STEP();
+	    tmp = *srcreg;
+	    *srcreg = destval;
+	    destval = tmp;
+	    store_data_word(destoffset, destval);
+	}
+	break;
     case 2:
-        if (M.x86.mode & SYSMODE_PREFIX_DATA) {
-            u32 *srcreg;
-            u32 destval,tmp;
+	if (M.x86.mode & SYSMODE_PREFIX_DATA) {
+	    u32 *srcreg;
+	    u32 destval,tmp;
 
-            destoffset = decode_rm10_address(rl);
-            DECODE_PRINTF(",");
-            destval = fetch_data_long(destoffset);
-            srcreg = DECODE_RM_LONG_REGISTER(rh);
-            DECODE_PRINTF("\n");
-            TRACE_AND_STEP();
-            tmp = *srcreg;
-            *srcreg = destval;
-            destval = tmp;
-            store_data_long(destoffset, destval);
-        } else {
-            u16 *srcreg;
-            u16 destval,tmp;
+	    destoffset = decode_rm10_address(rl);
+	    DECODE_PRINTF(",");
+	    destval = fetch_data_long(destoffset);
+	    srcreg = DECODE_RM_LONG_REGISTER(rh);
+	    DECODE_PRINTF("\n");
+	    TRACE_AND_STEP();
+	    tmp = *srcreg;
+	    *srcreg = destval;
+	    destval = tmp;
+	    store_data_long(destoffset, destval);
+	} else {
+	    u16 *srcreg;
+	    u16 destval,tmp;
 
-            destoffset = decode_rm10_address(rl);
-            DECODE_PRINTF(",");
-            destval = fetch_data_word(destoffset);
-            srcreg = DECODE_RM_WORD_REGISTER(rh);
-            DECODE_PRINTF("\n");
-            TRACE_AND_STEP();
-            tmp = *srcreg;
-            *srcreg = destval;
-            destval = tmp;
-            store_data_word(destoffset, destval);
-        }
-        break;
+	    destoffset = decode_rm10_address(rl);
+	    DECODE_PRINTF(",");
+	    destval = fetch_data_word(destoffset);
+	    srcreg = DECODE_RM_WORD_REGISTER(rh);
+	    DECODE_PRINTF("\n");
+	    TRACE_AND_STEP();
+	    tmp = *srcreg;
+	    *srcreg = destval;
+	    destval = tmp;
+	    store_data_word(destoffset, destval);
+	}
+	break;
     case 3:                     /* register to register */
-        if (M.x86.mode & SYSMODE_PREFIX_DATA) {
-            u32 *destreg,*srcreg;
-            u32 tmp;
+	if (M.x86.mode & SYSMODE_PREFIX_DATA) {
+	    u32 *destreg,*srcreg;
+	    u32 tmp;
 
-            destreg = DECODE_RM_LONG_REGISTER(rl);
-            DECODE_PRINTF(",");
-            srcreg = DECODE_RM_LONG_REGISTER(rh);
-            DECODE_PRINTF("\n");
-            TRACE_AND_STEP();
-            tmp = *srcreg;
-            *srcreg = *destreg;
-            *destreg = tmp;
-        } else {
-            u16 *destreg,*srcreg;
-            u16 tmp;
+	    destreg = DECODE_RM_LONG_REGISTER(rl);
+	    DECODE_PRINTF(",");
+	    srcreg = DECODE_RM_LONG_REGISTER(rh);
+	    DECODE_PRINTF("\n");
+	    TRACE_AND_STEP();
+	    tmp = *srcreg;
+	    *srcreg = *destreg;
+	    *destreg = tmp;
+	} else {
+	    u16 *destreg,*srcreg;
+	    u16 tmp;
 
-            destreg = DECODE_RM_WORD_REGISTER(rl);
-            DECODE_PRINTF(",");
-            srcreg = DECODE_RM_WORD_REGISTER(rh);
-            DECODE_PRINTF("\n");
-            TRACE_AND_STEP();
-            tmp = *srcreg;
-            *srcreg = *destreg;
-            *destreg = tmp;
-        }
-        break;
+	    destreg = DECODE_RM_WORD_REGISTER(rl);
+	    DECODE_PRINTF(",");
+	    srcreg = DECODE_RM_WORD_REGISTER(rh);
+	    DECODE_PRINTF("\n");
+	    TRACE_AND_STEP();
+	    tmp = *srcreg;
+	    *srcreg = *destreg;
+	    *destreg = tmp;
+	}
+	break;
     }
     DECODE_CLEAR_SEGOVR();
     END_OF_INSTR();
@@ -6183,37 +6183,37 @@
     FETCH_DECODE_MODRM(mod, rh, rl);
     switch (mod) {
     case 0:
-        destoffset = decode_rm00_address(rl);
-        DECODE_PRINTF(",");
-        srcreg = DECODE_RM_BYTE_REGISTER(rh);
-        DECODE_PRINTF("\n");
-        TRACE_AND_STEP();
-        store_data_byte(destoffset, *srcreg);
-        break;
+	destoffset = decode_rm00_address(rl);
+	DECODE_PRINTF(",");
+	srcreg = DECODE_RM_BYTE_REGISTER(rh);
+	DECODE_PRINTF("\n");
+	TRACE_AND_STEP();
+	store_data_byte(destoffset, *srcreg);
+	break;
     case 1:
-        destoffset = decode_rm01_address(rl);
-        DECODE_PRINTF(",");
-        srcreg = DECODE_RM_BYTE_REGISTER(rh);
-        DECODE_PRINTF("\n");
-        TRACE_AND_STEP();
-        store_data_byte(destoffset, *srcreg);
-        break;
+	destoffset = decode_rm01_address(rl);
+	DECODE_PRINTF(",");
+	srcreg = DECODE_RM_BYTE_REGISTER(rh);
+	DECODE_PRINTF("\n");
+	TRACE_AND_STEP();
+	store_data_byte(destoffset, *srcreg);
+	break;
     case 2:
-        destoffset = decode_rm10_address(rl);
-        DECODE_PRINTF(",");
-        srcreg = DECODE_RM_BYTE_REGISTER(rh);
-        DECODE_PRINTF("\n");
-        TRACE_AND_STEP();
-        store_data_byte(destoffset, *srcreg);
-        break;
+	destoffset = decode_rm10_address(rl);
+	DECODE_PRINTF(",");
+	srcreg = DECODE_RM_BYTE_REGISTER(rh);
+	DECODE_PRINTF("\n");
+	TRACE_AND_STEP();
+	store_data_byte(destoffset, *srcreg);
+	break;
     case 3:                     /* register to register */
-        destreg = DECODE_RM_BYTE_REGISTER(rl);
-        DECODE_PRINTF(",");
-        srcreg = DECODE_RM_BYTE_REGISTER(rh);
-        DECODE_PRINTF("\n");
-        TRACE_AND_STEP();
-        *destreg = *srcreg;
-        break;
+	destreg = DECODE_RM_BYTE_REGISTER(rl);
+	DECODE_PRINTF(",");
+	srcreg = DECODE_RM_BYTE_REGISTER(rh);
+	DECODE_PRINTF("\n");
+	TRACE_AND_STEP();
+	*destreg = *srcreg;
+	break;
     }
     DECODE_CLEAR_SEGOVR();
     END_OF_INSTR();
@@ -6233,89 +6233,89 @@
     FETCH_DECODE_MODRM(mod, rh, rl);
     switch (mod) {
     case 0:
-        if (M.x86.mode & SYSMODE_PREFIX_DATA) {
-            u32 *srcreg;
+	if (M.x86.mode & SYSMODE_PREFIX_DATA) {
+	    u32 *srcreg;
 
-            destoffset = decode_rm00_address(rl);
-            DECODE_PRINTF(",");
-            srcreg = DECODE_RM_LONG_REGISTER(rh);
-            DECODE_PRINTF("\n");
-            TRACE_AND_STEP();
-            store_data_long(destoffset, *srcreg);
-        } else {
-            u16 *srcreg;
+	    destoffset = decode_rm00_address(rl);
+	    DECODE_PRINTF(",");
+	    srcreg = DECODE_RM_LONG_REGISTER(rh);
+	    DECODE_PRINTF("\n");
+	    TRACE_AND_STEP();
+	    store_data_long(destoffset, *srcreg);
+	} else {
+	    u16 *srcreg;
 
-            destoffset = decode_rm00_address(rl);
-            DECODE_PRINTF(",");
-            srcreg = DECODE_RM_WORD_REGISTER(rh);
-            DECODE_PRINTF("\n");
-            TRACE_AND_STEP();
-            store_data_word(destoffset, *srcreg);
-        }
-        break;
+	    destoffset = decode_rm00_address(rl);
+	    DECODE_PRINTF(",");
+	    srcreg = DECODE_RM_WORD_REGISTER(rh);
+	    DECODE_PRINTF("\n");
+	    TRACE_AND_STEP();
+	    store_data_word(destoffset, *srcreg);
+	}
+	break;
     case 1:
-        if (M.x86.mode & SYSMODE_PREFIX_DATA) {
-            u32 *srcreg;
+	if (M.x86.mode & SYSMODE_PREFIX_DATA) {
+	    u32 *srcreg;
 
-            destoffset = decode_rm01_address(rl);
-            DECODE_PRINTF(",");
-            srcreg = DECODE_RM_LONG_REGISTER(rh);
-            DECODE_PRINTF("\n");
-            TRACE_AND_STEP();
-            store_data_long(destoffset, *srcreg);
-        } else {
-            u16 *srcreg;
+	    destoffset = decode_rm01_address(rl);
+	    DECODE_PRINTF(",");
+	    srcreg = DECODE_RM_LONG_REGISTER(rh);
+	    DECODE_PRINTF("\n");
+	    TRACE_AND_STEP();
+	    store_data_long(destoffset, *srcreg);
+	} else {
+	    u16 *srcreg;
 
-            destoffset = decode_rm01_address(rl);
-            DECODE_PRINTF(",");
-            srcreg = DECODE_RM_WORD_REGISTER(rh);
-            DECODE_PRINTF("\n");
-            TRACE_AND_STEP();
-            store_data_word(destoffset, *srcreg);
-        }
-        break;
+	    destoffset = decode_rm01_address(rl);
+	    DECODE_PRINTF(",");
+	    srcreg = DECODE_RM_WORD_REGISTER(rh);
+	    DECODE_PRINTF("\n");
+	    TRACE_AND_STEP();
+	    store_data_word(destoffset, *srcreg);
+	}
+	break;
     case 2:
-        if (M.x86.mode & SYSMODE_PREFIX_DATA) {
-            u32 *srcreg;
+	if (M.x86.mode & SYSMODE_PREFIX_DATA) {
+	    u32 *srcreg;
 
-            destoffset = decode_rm10_address(rl);
-            DECODE_PRINTF(",");
-            srcreg = DECODE_RM_LONG_REGISTER(rh);
-            DECODE_PRINTF("\n");
-            TRACE_AND_STEP();
-            store_data_long(destoffset, *srcreg);
-        } else {
-            u16 *srcreg;
+	    destoffset = decode_rm10_address(rl);
+	    DECODE_PRINTF(",");
+	    srcreg = DECODE_RM_LONG_REGISTER(rh);
+	    DECODE_PRINTF("\n");
+	    TRACE_AND_STEP();
+	    store_data_long(destoffset, *srcreg);
+	} else {
+	    u16 *srcreg;
 
-            destoffset = decode_rm10_address(rl);
-            DECODE_PRINTF(",");
-            srcreg = DECODE_RM_WORD_REGISTER(rh);
-            DECODE_PRINTF("\n");
-            TRACE_AND_STEP();
-            store_data_word(destoffset, *srcreg);
-        }
-        break;
+	    destoffset = decode_rm10_address(rl);
+	    DECODE_PRINTF(",");
+	    srcreg = DECODE_RM_WORD_REGISTER(rh);
+	    DECODE_PRINTF("\n");
+	    TRACE_AND_STEP();
+	    store_data_word(destoffset, *srcreg);
+	}
+	break;
     case 3:                     /* register to register */
-        if (M.x86.mode & SYSMODE_PREFIX_DATA) {
-            u32 *destreg,*srcreg;
+	if (M.x86.mode & SYSMODE_PREFIX_DATA) {
+	    u32 *destreg,*srcreg;
 
-            destreg = DECODE_RM_LONG_REGISTER(rl);
-            DECODE_PRINTF(",");
-            srcreg = DECODE_RM_LONG_REGISTER(rh);
-            DECODE_PRINTF("\n");
-            TRACE_AND_STEP();
-            *destreg = *srcreg;
-        } else {
-            u16 *destreg,*srcreg;
+	    destreg = DECODE_RM_LONG_REGISTER(rl);
+	    DECODE_PRINTF(",");
+	    srcreg = DECODE_RM_LONG_REGISTER(rh);
+	    DECODE_PRINTF("\n");
+	    TRACE_AND_STEP();
+	    *destreg = *srcreg;
+	} else {
+	    u16 *destreg,*srcreg;
 
-            destreg = DECODE_RM_WORD_REGISTER(rl);
-            DECODE_PRINTF(",");
-            srcreg = DECODE_RM_WORD_REGISTER(rh);
-            DECODE_PRINTF("\n");
-            TRACE_AND_STEP();
-            *destreg = *srcreg;
-        }
-        break;
+	    destreg = DECODE_RM_WORD_REGISTER(rl);
+	    DECODE_PRINTF(",");
+	    srcreg = DECODE_RM_WORD_REGISTER(rh);
+	    DECODE_PRINTF("\n");
+	    TRACE_AND_STEP();
+	    *destreg = *srcreg;
+	}
+	break;
     }
     DECODE_CLEAR_SEGOVR();
     END_OF_INSTR();
@@ -6337,40 +6337,40 @@
     FETCH_DECODE_MODRM(mod, rh, rl);
     switch (mod) {
     case 0:
-        destreg = DECODE_RM_BYTE_REGISTER(rh);
-        DECODE_PRINTF(",");
-        srcoffset = decode_rm00_address(rl);
-        srcval = fetch_data_byte(srcoffset);
-        DECODE_PRINTF("\n");
-        TRACE_AND_STEP();
-        *destreg = srcval;
-        break;
+	destreg = DECODE_RM_BYTE_REGISTER(rh);
+	DECODE_PRINTF(",");
+	srcoffset = decode_rm00_address(rl);
+	srcval = fetch_data_byte(srcoffset);
+	DECODE_PRINTF("\n");
+	TRACE_AND_STEP();
+	*destreg = srcval;
+	break;
     case 1:
-        destreg = DECODE_RM_BYTE_REGISTER(rh);
-        DECODE_PRINTF(",");
-        srcoffset = decode_rm01_address(rl);
-        srcval = fetch_data_byte(srcoffset);
-        DECODE_PRINTF("\n");
-        TRACE_AND_STEP();
-        *destreg = srcval;
-        break;
+	destreg = DECODE_RM_BYTE_REGISTER(rh);
+	DECODE_PRINTF(",");
+	srcoffset = decode_rm01_address(rl);
+	srcval = fetch_data_byte(srcoffset);
+	DECODE_PRINTF("\n");
+	TRACE_AND_STEP();
+	*destreg = srcval;
+	break;
     case 2:
-        destreg = DECODE_RM_BYTE_REGISTER(rh);
-        DECODE_PRINTF(",");
-        srcoffset = decode_rm10_address(rl);
-        srcval = fetch_data_byte(srcoffset);
-        DECODE_PRINTF("\n");
-        TRACE_AND_STEP();
-        *destreg = srcval;
-        break;
+	destreg = DECODE_RM_BYTE_REGISTER(rh);
+	DECODE_PRINTF(",");
+	srcoffset = decode_rm10_address(rl);
+	srcval = fetch_data_byte(srcoffset);
+	DECODE_PRINTF("\n");
+	TRACE_AND_STEP();
+	*destreg = srcval;
+	break;
     case 3:                     /* register to register */
-        destreg = DECODE_RM_BYTE_REGISTER(rh);
-        DECODE_PRINTF(",");
-        srcreg = DECODE_RM_BYTE_REGISTER(rl);
-        DECODE_PRINTF("\n");
-        TRACE_AND_STEP();
-        *destreg = *srcreg;
-        break;
+	destreg = DECODE_RM_BYTE_REGISTER(rh);
+	DECODE_PRINTF(",");
+	srcreg = DECODE_RM_BYTE_REGISTER(rl);
+	DECODE_PRINTF("\n");
+	TRACE_AND_STEP();
+	*destreg = *srcreg;
+	break;
     }
     DECODE_CLEAR_SEGOVR();
     END_OF_INSTR();
@@ -6390,101 +6390,101 @@
     FETCH_DECODE_MODRM(mod, rh, rl);
     switch (mod) {
     case 0:
-        if (M.x86.mode & SYSMODE_PREFIX_DATA) {
-            u32 *destreg;
-            u32 srcval;
+	if (M.x86.mode & SYSMODE_PREFIX_DATA) {
+	    u32 *destreg;
+	    u32 srcval;
 
-            destreg = DECODE_RM_LONG_REGISTER(rh);
-            DECODE_PRINTF(",");
-            srcoffset = decode_rm00_address(rl);
-            srcval = fetch_data_long(srcoffset);
-            DECODE_PRINTF("\n");
-            TRACE_AND_STEP();
-            *destreg = srcval;
-        } else {
-            u16 *destreg;
-            u16 srcval;
+	    destreg = DECODE_RM_LONG_REGISTER(rh);
+	    DECODE_PRINTF(",");
+	    srcoffset = decode_rm00_address(rl);
+	    srcval = fetch_data_long(srcoffset);
+	    DECODE_PRINTF("\n");
+	    TRACE_AND_STEP();
+	    *destreg = srcval;
+	} else {
+	    u16 *destreg;
+	    u16 srcval;
 
-            destreg = DECODE_RM_WORD_REGISTER(rh);
-            DECODE_PRINTF(",");
-            srcoffset = decode_rm00_address(rl);
-            srcval = fetch_data_word(srcoffset);
-            DECODE_PRINTF("\n");
-            TRACE_AND_STEP();
-            *destreg = srcval;
-        }
-        break;
+	    destreg = DECODE_RM_WORD_REGISTER(rh);
+	    DECODE_PRINTF(",");
+	    srcoffset = decode_rm00_address(rl);
+	    srcval = fetch_data_word(srcoffset);
+	    DECODE_PRINTF("\n");
+	    TRACE_AND_STEP();
+	    *destreg = srcval;
+	}
+	break;
     case 1:
-        if (M.x86.mode & SYSMODE_PREFIX_DATA) {
-            u32 *destreg;
-            u32 srcval;
+	if (M.x86.mode & SYSMODE_PREFIX_DATA) {
+	    u32 *destreg;
+	    u32 srcval;
 
-            destreg = DECODE_RM_LONG_REGISTER(rh);
-            DECODE_PRINTF(",");
-            srcoffset = decode_rm01_address(rl);
-            srcval = fetch_data_long(srcoffset);
-            DECODE_PRINTF("\n");
-            TRACE_AND_STEP();
-            *destreg = srcval;
-        } else {
-            u16 *destreg;
-            u16 srcval;
+	    destreg = DECODE_RM_LONG_REGISTER(rh);
+	    DECODE_PRINTF(",");
+	    srcoffset = decode_rm01_address(rl);
+	    srcval = fetch_data_long(srcoffset);
+	    DECODE_PRINTF("\n");
+	    TRACE_AND_STEP();
+	    *destreg = srcval;
+	} else {
+	    u16 *destreg;
+	    u16 srcval;
 
-            destreg = DECODE_RM_WORD_REGISTER(rh);
-            DECODE_PRINTF(",");
-            srcoffset = decode_rm01_address(rl);
-            srcval = fetch_data_word(srcoffset);
-            DECODE_PRINTF("\n");
-            TRACE_AND_STEP();
-            *destreg = srcval;
-        }
-        break;
+	    destreg = DECODE_RM_WORD_REGISTER(rh);
+	    DECODE_PRINTF(",");
+	    srcoffset = decode_rm01_address(rl);
+	    srcval = fetch_data_word(srcoffset);
+	    DECODE_PRINTF("\n");
+	    TRACE_AND_STEP();
+	    *destreg = srcval;
+	}
+	break;
     case 2:
-        if (M.x86.mode & SYSMODE_PREFIX_DATA) {
-            u32 *destreg;
-            u32 srcval;
+	if (M.x86.mode & SYSMODE_PREFIX_DATA) {
+	    u32 *destreg;
+	    u32 srcval;
 
-            destreg = DECODE_RM_LONG_REGISTER(rh);
-            DECODE_PRINTF(",");
-            srcoffset = decode_rm10_address(rl);
-            srcval = fetch_data_long(srcoffset);
-            DECODE_PRINTF("\n");
-            TRACE_AND_STEP();
-            *destreg = srcval;
-        } else {
-            u16 *destreg;
-            u16 srcval;
+	    destreg = DECODE_RM_LONG_REGISTER(rh);
+	    DECODE_PRINTF(",");
+	    srcoffset = decode_rm10_address(rl);
+	    srcval = fetch_data_long(srcoffset);
+	    DECODE_PRINTF("\n");
+	    TRACE_AND_STEP();
+	    *destreg = srcval;
+	} else {
+	    u16 *destreg;
+	    u16 srcval;
 
-            destreg = DECODE_RM_WORD_REGISTER(rh);
-            DECODE_PRINTF(",");
-            srcoffset = decode_rm10_address(rl);
-            srcval = fetch_data_word(srcoffset);
-            DECODE_PRINTF("\n");
-            TRACE_AND_STEP();
-            *destreg = srcval;
-        }
-        break;
+	    destreg = DECODE_RM_WORD_REGISTER(rh);
+	    DECODE_PRINTF(",");
+	    srcoffset = decode_rm10_address(rl);
+	    srcval = fetch_data_word(srcoffset);
+	    DECODE_PRINTF("\n");
+	    TRACE_AND_STEP();
+	    *destreg = srcval;
+	}
+	break;
     case 3:                     /* register to register */
-        if (M.x86.mode & SYSMODE_PREFIX_DATA) {
-            u32 *destreg, *srcreg;
+	if (M.x86.mode & SYSMODE_PREFIX_DATA) {
+	    u32 *destreg, *srcreg;
 
-            destreg = DECODE_RM_LONG_REGISTER(rh);
-            DECODE_PRINTF(",");
-            srcreg = DECODE_RM_LONG_REGISTER(rl);
-            DECODE_PRINTF("\n");
-            TRACE_AND_STEP();
-            *destreg = *srcreg;
-        } else {
-            u16 *destreg, *srcreg;
+	    destreg = DECODE_RM_LONG_REGISTER(rh);
+	    DECODE_PRINTF(",");
+	    srcreg = DECODE_RM_LONG_REGISTER(rl);
+	    DECODE_PRINTF("\n");
+	    TRACE_AND_STEP();
+	    *destreg = *srcreg;
+	} else {
+	    u16 *destreg, *srcreg;
 
-            destreg = DECODE_RM_WORD_REGISTER(rh);
-            DECODE_PRINTF(",");
-            srcreg = DECODE_RM_WORD_REGISTER(rl);
-            DECODE_PRINTF("\n");
-            TRACE_AND_STEP();
-            *destreg = *srcreg;
-        }
-        break;
+	    destreg = DECODE_RM_WORD_REGISTER(rh);
+	    DECODE_PRINTF(",");
+	    srcreg = DECODE_RM_WORD_REGISTER(rl);
+	    DECODE_PRINTF("\n");
+	    TRACE_AND_STEP();
+	    *destreg = *srcreg;
+	}
+	break;
     }
     DECODE_CLEAR_SEGOVR();
     END_OF_INSTR();
@@ -6506,40 +6506,40 @@
     FETCH_DECODE_MODRM(mod, rh, rl);
     switch (mod) {
     case 0:
-        destoffset = decode_rm00_address(rl);
-        DECODE_PRINTF(",");
-        srcreg = decode_rm_seg_register(rh);
-        DECODE_PRINTF("\n");
-        TRACE_AND_STEP();
-        destval = *srcreg;
-        store_data_word(destoffset, destval);
-        break;
+	destoffset = decode_rm00_address(rl);
+	DECODE_PRINTF(",");
+	srcreg = decode_rm_seg_register(rh);
+	DECODE_PRINTF("\n");
+	TRACE_AND_STEP();
+	destval = *srcreg;
+	store_data_word(destoffset, destval);
+	break;
     case 1:
-        destoffset = decode_rm01_address(rl);
-        DECODE_PRINTF(",");
-        srcreg = decode_rm_seg_register(rh);
-        DECODE_PRINTF("\n");
-        TRACE_AND_STEP();
-        destval = *srcreg;
-        store_data_word(destoffset, destval);
-        break;
+	destoffset = decode_rm01_address(rl);
+	DECODE_PRINTF(",");
+	srcreg = decode_rm_seg_register(rh);
+	DECODE_PRINTF("\n");
+	TRACE_AND_STEP();
+	destval = *srcreg;
+	store_data_word(destoffset, destval);
+	break;
     case 2:
-        destoffset = decode_rm10_address(rl);
-        DECODE_PRINTF(",");
-        srcreg = decode_rm_seg_register(rh);
-        DECODE_PRINTF("\n");
-        TRACE_AND_STEP();
-        destval = *srcreg;
-        store_data_word(destoffset, destval);
-        break;
+	destoffset = decode_rm10_address(rl);
+	DECODE_PRINTF(",");
+	srcreg = decode_rm_seg_register(rh);
+	DECODE_PRINTF("\n");
+	TRACE_AND_STEP();
+	destval = *srcreg;
+	store_data_word(destoffset, destval);
+	break;
     case 3:                     /* register to register */
-        destreg = DECODE_RM_WORD_REGISTER(rl);
-        DECODE_PRINTF(",");
-        srcreg = decode_rm_seg_register(rh);
-        DECODE_PRINTF("\n");
-        TRACE_AND_STEP();
-        *destreg = *srcreg;
-        break;
+	destreg = DECODE_RM_WORD_REGISTER(rl);
+	DECODE_PRINTF(",");
+	srcreg = decode_rm_seg_register(rh);
+	DECODE_PRINTF("\n");
+	TRACE_AND_STEP();
+	*destreg = *srcreg;
+	break;
     }
     DECODE_CLEAR_SEGOVR();
     END_OF_INSTR();
@@ -6560,38 +6560,38 @@
  *
  * lea  eax,[eax+ebx*2] ??
  */
-    
+
     START_OF_INSTR();
     DECODE_PRINTF("LEA\t");
     FETCH_DECODE_MODRM(mod, rh, rl);
     switch (mod) {
     case 0:
-        srcreg = DECODE_RM_WORD_REGISTER(rh);
-        DECODE_PRINTF(",");
-        destoffset = decode_rm00_address(rl);
-        DECODE_PRINTF("\n");
-        TRACE_AND_STEP();
-        *srcreg = (u16)destoffset;
-        break;
+	srcreg = DECODE_RM_WORD_REGISTER(rh);
+	DECODE_PRINTF(",");
+	destoffset = decode_rm00_address(rl);
+	DECODE_PRINTF("\n");
+	TRACE_AND_STEP();
+	*srcreg = (u16)destoffset;
+	break;
     case 1:
-        srcreg = DECODE_RM_WORD_REGISTER(rh);
-        DECODE_PRINTF(",");
-        destoffset = decode_rm01_address(rl);
-        DECODE_PRINTF("\n");
-        TRACE_AND_STEP();
-        *srcreg = (u16)destoffset;
-        break;
+	srcreg = DECODE_RM_WORD_REGISTER(rh);
+	DECODE_PRINTF(",");
+	destoffset = decode_rm01_address(rl);
+	DECODE_PRINTF("\n");
+	TRACE_AND_STEP();
+	*srcreg = (u16)destoffset;
+	break;
     case 2:
-        srcreg = DECODE_RM_WORD_REGISTER(rh);
-        DECODE_PRINTF(",");
-        destoffset = decode_rm10_address(rl);
-        DECODE_PRINTF("\n");
-        TRACE_AND_STEP();
-        *srcreg = (u16)destoffset;
-        break;
+	srcreg = DECODE_RM_WORD_REGISTER(rh);
+	DECODE_PRINTF(",");
+	destoffset = decode_rm10_address(rl);
+	DECODE_PRINTF("\n");
+	TRACE_AND_STEP();
+	*srcreg = (u16)destoffset;
+	break;
     case 3:                     /* register to register */
-        /* undefined.  Do nothing. */
-        break;
+	/* undefined.  Do nothing. */
+	break;
     }
     DECODE_CLEAR_SEGOVR();
     END_OF_INSTR();
@@ -6613,40 +6613,40 @@
     FETCH_DECODE_MODRM(mod, rh, rl);
     switch (mod) {
     case 0:
-        destreg = decode_rm_seg_register(rh);
-        DECODE_PRINTF(",");
-        srcoffset = decode_rm00_address(rl);
-        srcval = fetch_data_word(srcoffset);
-        DECODE_PRINTF("\n");
-        TRACE_AND_STEP();
-        *destreg = srcval;
-        break;
+	destreg = decode_rm_seg_register(rh);
+	DECODE_PRINTF(",");
+	srcoffset = decode_rm00_address(rl);
+	srcval = fetch_data_word(srcoffset);
+	DECODE_PRINTF("\n");
+	TRACE_AND_STEP();
+	*destreg = srcval;
+	break;
     case 1:
-        destreg = decode_rm_seg_register(rh);
-        DECODE_PRINTF(",");
-        srcoffset = decode_rm01_address(rl);
-        srcval = fetch_data_word(srcoffset);
-        DECODE_PRINTF("\n");
-        TRACE_AND_STEP();
-        *destreg = srcval;
-        break;
+	destreg = decode_rm_seg_register(rh);
+	DECODE_PRINTF(",");
+	srcoffset = decode_rm01_address(rl);
+	srcval = fetch_data_word(srcoffset);
+	DECODE_PRINTF("\n");
+	TRACE_AND_STEP();
+	*destreg = srcval;
+	break;
     case 2:
-        destreg = decode_rm_seg_register(rh);
-        DECODE_PRINTF(",");
-        srcoffset = decode_rm10_address(rl);
-        srcval = fetch_data_word(srcoffset);
-        DECODE_PRINTF("\n");
-        TRACE_AND_STEP();
-        *destreg = srcval;
-        break;
+	destreg = decode_rm_seg_register(rh);
+	DECODE_PRINTF(",");
+	srcoffset = decode_rm10_address(rl);
+	srcval = fetch_data_word(srcoffset);
+	DECODE_PRINTF("\n");
+	TRACE_AND_STEP();
+	*destreg = srcval;
+	break;
     case 3:                     /* register to register */
-        destreg = decode_rm_seg_register(rh);
-        DECODE_PRINTF(",");
-        srcreg = DECODE_RM_WORD_REGISTER(rl);
-        DECODE_PRINTF("\n");
-        TRACE_AND_STEP();
-        *destreg = *srcreg;
-        break;
+	destreg = decode_rm_seg_register(rh);
+	DECODE_PRINTF(",");
+	srcreg = DECODE_RM_WORD_REGISTER(rl);
+	DECODE_PRINTF("\n");
+	TRACE_AND_STEP();
+	*destreg = *srcreg;
+	break;
     }
     /*
      * Clean up, and reset all the R_xSP pointers to the correct
@@ -6671,84 +6671,84 @@
     DECODE_PRINTF("POP\t");
     FETCH_DECODE_MODRM(mod, rh, rl);
     if (rh != 0) {
-        DECODE_PRINTF("ILLEGAL DECODE OF OPCODE 8F\n");
-        HALT_SYS();
+	DECODE_PRINTF("ILLEGAL DECODE OF OPCODE 8F\n");
+	HALT_SYS();
     }
     switch (mod) {
     case 0:
-        if (M.x86.mode & SYSMODE_PREFIX_DATA) {
-            u32 destval;
+	if (M.x86.mode & SYSMODE_PREFIX_DATA) {
+	    u32 destval;
 
-            destoffset = decode_rm00_address(rl);
-            DECODE_PRINTF("\n");
-            TRACE_AND_STEP();
-            destval = pop_long();
-            store_data_long(destoffset, destval);
-        } else {
-            u16 destval;
+	    destoffset = decode_rm00_address(rl);
+	    DECODE_PRINTF("\n");
+	    TRACE_AND_STEP();
+	    destval = pop_long();
+	    store_data_long(destoffset, destval);
+	} else {
+	    u16 destval;
 
-            destoffset = decode_rm00_address(rl);
-            DECODE_PRINTF("\n");
-            TRACE_AND_STEP();
-            destval = pop_word();
-            store_data_word(destoffset, destval);
-        }
-        break;
+	    destoffset = decode_rm00_address(rl);
+	    DECODE_PRINTF("\n");
+	    TRACE_AND_STEP();
+	    destval = pop_word();
+	    store_data_word(destoffset, destval);
+	}
+	break;
     case 1:
-        if (M.x86.mode & SYSMODE_PREFIX_DATA) {
-            u32 destval;
+	if (M.x86.mode & SYSMODE_PREFIX_DATA) {
+	    u32 destval;
 
-            destoffset = decode_rm01_address(rl);
-            DECODE_PRINTF("\n");
-            TRACE_AND_STEP();
-            destval = pop_long();
-            store_data_long(destoffset, destval);
-        } else {
-            u16 destval;
+	    destoffset = decode_rm01_address(rl);
+	    DECODE_PRINTF("\n");
+	    TRACE_AND_STEP();
+	    destval = pop_long();
+	    store_data_long(destoffset, destval);
+	} else {
+	    u16 destval;
 
-            destoffset = decode_rm01_address(rl);
-            DECODE_PRINTF("\n");
-            TRACE_AND_STEP();
-            destval = pop_word();
-            store_data_word(destoffset, destval);
-        }
-        break;
+	    destoffset = decode_rm01_address(rl);
+	    DECODE_PRINTF("\n");
+	    TRACE_AND_STEP();
+	    destval = pop_word();
+	    store_data_word(destoffset, destval);
+	}
+	break;
     case 2:
-        if (M.x86.mode & SYSMODE_PREFIX_DATA) {
-            u32 destval;
+	if (M.x86.mode & SYSMODE_PREFIX_DATA) {
+	    u32 destval;
 
-            destoffset = decode_rm10_address(rl);
-            DECODE_PRINTF("\n");
-            TRACE_AND_STEP();
-            destval = pop_long();
-            store_data_long(destoffset, destval);
-        } else {
-            u16 destval;
+	    destoffset = decode_rm10_address(rl);
+	    DECODE_PRINTF("\n");
+	    TRACE_AND_STEP();
+	    destval = pop_long();
+	    store_data_long(destoffset, destval);
+	} else {
+	    u16 destval;
 
-            destoffset = decode_rm10_address(rl);
-            DECODE_PRINTF("\n");
-            TRACE_AND_STEP();
-            destval = pop_word();
-            store_data_word(destoffset, destval);
-        }
-        break;
+	    destoffset = decode_rm10_address(rl);
+	    DECODE_PRINTF("\n");
+	    TRACE_AND_STEP();
+	    destval = pop_word();
+	    store_data_word(destoffset, destval);
+	}
+	break;
     case 3:                     /* register to register */
-        if (M.x86.mode & SYSMODE_PREFIX_DATA) {
-            u32 *destreg;
+	if (M.x86.mode & SYSMODE_PREFIX_DATA) {
+	    u32 *destreg;
 
-            destreg = DECODE_RM_LONG_REGISTER(rl);
-            DECODE_PRINTF("\n");
-            TRACE_AND_STEP();
-            *destreg = pop_long();
-        } else {
-            u16 *destreg;
+	    destreg = DECODE_RM_LONG_REGISTER(rl);
+	    DECODE_PRINTF("\n");
+	    TRACE_AND_STEP();
+	    *destreg = pop_long();
+	} else {
+	    u16 *destreg;
 
-            destreg = DECODE_RM_WORD_REGISTER(rl);
-            DECODE_PRINTF("\n");
-            TRACE_AND_STEP();
-            *destreg = pop_word();
-        }
-        break;
+	    destreg = DECODE_RM_WORD_REGISTER(rl);
+	    DECODE_PRINTF("\n");
+	    TRACE_AND_STEP();
+	    *destreg = pop_word();
+	}
+	break;
     }
     DECODE_CLEAR_SEGOVR();
     END_OF_INSTR();
@@ -6777,19 +6777,19 @@
 
     START_OF_INSTR();
     if (M.x86.mode & SYSMODE_PREFIX_DATA) {
-        DECODE_PRINTF("XCHG\tEAX,ECX\n");
+	DECODE_PRINTF("XCHG\tEAX,ECX\n");
     } else {
-        DECODE_PRINTF("XCHG\tAX,CX\n");
+	DECODE_PRINTF("XCHG\tAX,CX\n");
     }
     TRACE_AND_STEP();
     if (M.x86.mode & SYSMODE_PREFIX_DATA) {
-        tmp = M.x86.R_EAX;
-        M.x86.R_EAX = M.x86.R_ECX;
-        M.x86.R_ECX = tmp;
+	tmp = M.x86.R_EAX;
+	M.x86.R_EAX = M.x86.R_ECX;
+	M.x86.R_ECX = tmp;
     } else {
-        tmp = M.x86.R_AX;
-        M.x86.R_AX = M.x86.R_CX;
-        M.x86.R_CX = (u16)tmp;
+	tmp = M.x86.R_AX;
+	M.x86.R_AX = M.x86.R_CX;
+	M.x86.R_CX = (u16)tmp;
     }
     DECODE_CLEAR_SEGOVR();
     END_OF_INSTR();
@@ -6805,19 +6805,19 @@
 
     START_OF_INSTR();
     if (M.x86.mode & SYSMODE_PREFIX_DATA) {
-        DECODE_PRINTF("XCHG\tEAX,EDX\n");
+	DECODE_PRINTF("XCHG\tEAX,EDX\n");
     } else {
-        DECODE_PRINTF("XCHG\tAX,DX\n");
+	DECODE_PRINTF("XCHG\tAX,DX\n");
     }
     TRACE_AND_STEP();
     if (M.x86.mode & SYSMODE_PREFIX_DATA) {
-        tmp = M.x86.R_EAX;
-        M.x86.R_EAX = M.x86.R_EDX;
-        M.x86.R_EDX = tmp;
+	tmp = M.x86.R_EAX;
+	M.x86.R_EAX = M.x86.R_EDX;
+	M.x86.R_EDX = tmp;
     } else {
-        tmp = M.x86.R_AX;
-        M.x86.R_AX = M.x86.R_DX;
-        M.x86.R_DX = (u16)tmp;
+	tmp = M.x86.R_AX;
+	M.x86.R_AX = M.x86.R_DX;
+	M.x86.R_DX = (u16)tmp;
     }
     DECODE_CLEAR_SEGOVR();
     END_OF_INSTR();
@@ -6833,19 +6833,19 @@
 
     START_OF_INSTR();
     if (M.x86.mode & SYSMODE_PREFIX_DATA) {
-        DECODE_PRINTF("XCHG\tEAX,EBX\n");
+	DECODE_PRINTF("XCHG\tEAX,EBX\n");
     } else {
-        DECODE_PRINTF("XCHG\tAX,BX\n");
+	DECODE_PRINTF("XCHG\tAX,BX\n");
     }
     TRACE_AND_STEP();
     if (M.x86.mode & SYSMODE_PREFIX_DATA) {
-        tmp = M.x86.R_EAX;
-        M.x86.R_EAX = M.x86.R_EBX;
-        M.x86.R_EBX = tmp;
+	tmp = M.x86.R_EAX;
+	M.x86.R_EAX = M.x86.R_EBX;
+	M.x86.R_EBX = tmp;
     } else {
-        tmp = M.x86.R_AX;
-        M.x86.R_AX = M.x86.R_BX;
-        M.x86.R_BX = (u16)tmp;
+	tmp = M.x86.R_AX;
+	M.x86.R_AX = M.x86.R_BX;
+	M.x86.R_BX = (u16)tmp;
     }
     DECODE_CLEAR_SEGOVR();
     END_OF_INSTR();
@@ -6861,19 +6861,19 @@
 
     START_OF_INSTR();
     if (M.x86.mode & SYSMODE_PREFIX_DATA) {
-        DECODE_PRINTF("XCHG\tEAX,ESP\n");
+	DECODE_PRINTF("XCHG\tEAX,ESP\n");
     } else {
-        DECODE_PRINTF("XCHG\tAX,SP\n");
+	DECODE_PRINTF("XCHG\tAX,SP\n");
     }
     TRACE_AND_STEP();
     if (M.x86.mode & SYSMODE_PREFIX_DATA) {
-        tmp = M.x86.R_EAX;
-        M.x86.R_EAX = M.x86.R_ESP;
-        M.x86.R_ESP = tmp;
+	tmp = M.x86.R_EAX;
+	M.x86.R_EAX = M.x86.R_ESP;
+	M.x86.R_ESP = tmp;
     } else {
-        tmp = M.x86.R_AX;
-        M.x86.R_AX = M.x86.R_SP;
-        M.x86.R_SP = (u16)tmp;
+	tmp = M.x86.R_AX;
+	M.x86.R_AX = M.x86.R_SP;
+	M.x86.R_SP = (u16)tmp;
     }
     DECODE_CLEAR_SEGOVR();
     END_OF_INSTR();
@@ -6889,19 +6889,19 @@
 
     START_OF_INSTR();
     if (M.x86.mode & SYSMODE_PREFIX_DATA) {
-        DECODE_PRINTF("XCHG\tEAX,EBP\n");
+	DECODE_PRINTF("XCHG\tEAX,EBP\n");
     } else {
-        DECODE_PRINTF("XCHG\tAX,BP\n");
+	DECODE_PRINTF("XCHG\tAX,BP\n");
     }
     TRACE_AND_STEP();
     if (M.x86.mode & SYSMODE_PREFIX_DATA) {
-        tmp = M.x86.R_EAX;
-        M.x86.R_EAX = M.x86.R_EBP;
-        M.x86.R_EBP = tmp;
+	tmp = M.x86.R_EAX;
+	M.x86.R_EAX = M.x86.R_EBP;
+	M.x86.R_EBP = tmp;
     } else {
-        tmp = M.x86.R_AX;
-        M.x86.R_AX = M.x86.R_BP;
-        M.x86.R_BP = (u16)tmp;
+	tmp = M.x86.R_AX;
+	M.x86.R_AX = M.x86.R_BP;
+	M.x86.R_BP = (u16)tmp;
     }
     DECODE_CLEAR_SEGOVR();
     END_OF_INSTR();
@@ -6917,19 +6917,19 @@
 
     START_OF_INSTR();
     if (M.x86.mode & SYSMODE_PREFIX_DATA) {
-        DECODE_PRINTF("XCHG\tEAX,ESI\n");
+	DECODE_PRINTF("XCHG\tEAX,ESI\n");
     } else {
-        DECODE_PRINTF("XCHG\tAX,SI\n");
+	DECODE_PRINTF("XCHG\tAX,SI\n");
     }
     TRACE_AND_STEP();
     if (M.x86.mode & SYSMODE_PREFIX_DATA) {
-        tmp = M.x86.R_EAX;
-        M.x86.R_EAX = M.x86.R_ESI;
-        M.x86.R_ESI = tmp;
+	tmp = M.x86.R_EAX;
+	M.x86.R_EAX = M.x86.R_ESI;
+	M.x86.R_ESI = tmp;
     } else {
-        tmp = M.x86.R_AX;
-        M.x86.R_AX = M.x86.R_SI;
-        M.x86.R_SI = (u16)tmp;
+	tmp = M.x86.R_AX;
+	M.x86.R_AX = M.x86.R_SI;
+	M.x86.R_SI = (u16)tmp;
     }
     DECODE_CLEAR_SEGOVR();
     END_OF_INSTR();
@@ -6945,19 +6945,19 @@
 
     START_OF_INSTR();
     if (M.x86.mode & SYSMODE_PREFIX_DATA) {
-        DECODE_PRINTF("XCHG\tEAX,EDI\n");
+	DECODE_PRINTF("XCHG\tEAX,EDI\n");
     } else {
-        DECODE_PRINTF("XCHG\tAX,DI\n");
+	DECODE_PRINTF("XCHG\tAX,DI\n");
     }
     TRACE_AND_STEP();
     if (M.x86.mode & SYSMODE_PREFIX_DATA) {
-        tmp = M.x86.R_EAX;
-        M.x86.R_EAX = M.x86.R_EDI;
-        M.x86.R_EDI = tmp;
+	tmp = M.x86.R_EAX;
+	M.x86.R_EAX = M.x86.R_EDI;
+	M.x86.R_EDI = tmp;
     } else {
-        tmp = M.x86.R_AX;
-        M.x86.R_AX = M.x86.R_DI;
-        M.x86.R_DI = (u16)tmp;
+	tmp = M.x86.R_AX;
+	M.x86.R_AX = M.x86.R_DI;
+	M.x86.R_DI = (u16)tmp;
     }
     DECODE_CLEAR_SEGOVR();
     END_OF_INSTR();
@@ -6971,23 +6971,23 @@
 {
     START_OF_INSTR();
     if (M.x86.mode & SYSMODE_PREFIX_DATA) {
-        DECODE_PRINTF("CWDE\n");
+	DECODE_PRINTF("CWDE\n");
     } else {
-        DECODE_PRINTF("CBW\n");
+	DECODE_PRINTF("CBW\n");
     }
     TRACE_AND_STEP();
     if (M.x86.mode & SYSMODE_PREFIX_DATA) {
-        if (M.x86.R_AX & 0x8000) {
-            M.x86.R_EAX |= 0xffff0000;
-        } else {
-            M.x86.R_EAX &= 0x0000ffff;
-        }
+	if (M.x86.R_AX & 0x8000) {
+	    M.x86.R_EAX |= 0xffff0000;
+	} else {
+	    M.x86.R_EAX &= 0x0000ffff;
+	}
     } else {
-        if (M.x86.R_AL & 0x80) {
-            M.x86.R_AH = 0xff;
-        } else {
-            M.x86.R_AH = 0x0;
-        }
+	if (M.x86.R_AL & 0x80) {
+	    M.x86.R_AH = 0xff;
+	} else {
+	    M.x86.R_AH = 0x0;
+	}
     }
     DECODE_CLEAR_SEGOVR();
     END_OF_INSTR();
@@ -7001,24 +7001,24 @@
 {
     START_OF_INSTR();
     if (M.x86.mode & SYSMODE_PREFIX_DATA) {
-        DECODE_PRINTF("CDQ\n");
+	DECODE_PRINTF("CDQ\n");
     } else {
-        DECODE_PRINTF("CWD\n");
+	DECODE_PRINTF("CWD\n");
     }
     DECODE_PRINTF("CWD\n");
     TRACE_AND_STEP();
     if (M.x86.mode & SYSMODE_PREFIX_DATA) {
-        if (M.x86.R_EAX & 0x80000000) {
-            M.x86.R_EDX = 0xffffffff;
-        } else {
-            M.x86.R_EDX = 0x0;
-        }
+	if (M.x86.R_EAX & 0x80000000) {
+	    M.x86.R_EDX = 0xffffffff;
+	} else {
+	    M.x86.R_EDX = 0x0;
+	}
     } else {
-        if (M.x86.R_AX & 0x8000) {
-            M.x86.R_DX = 0xffff;
-        } else {
-            M.x86.R_DX = 0x0;
-        }
+	if (M.x86.R_AX & 0x8000) {
+	    M.x86.R_DX = 0xffff;
+	} else {
+	    M.x86.R_DX = 0x0;
+	}
     }
     DECODE_CLEAR_SEGOVR();
     END_OF_INSTR();
@@ -7041,7 +7041,7 @@
 	CALL_TRACE(M.x86.saved_cs, M.x86.saved_ip, farseg, faroff, "FAR ");
 
     /* XXX
-     * 
+     *
      * Hooked interrupt vectors calling into our "BIOS" will cause
      * problems unless all intersegment stuff is checked for BIOS
      * access.  Check needed here.  For moment, let it alone.
@@ -7079,18 +7079,18 @@
 
     START_OF_INSTR();
     if (M.x86.mode & SYSMODE_PREFIX_DATA) {
-        DECODE_PRINTF("PUSHFD\n");
+	DECODE_PRINTF("PUSHFD\n");
     } else {
-        DECODE_PRINTF("PUSHF\n");
+	DECODE_PRINTF("PUSHF\n");
     }
     TRACE_AND_STEP();
 
     /* clear out *all* bits not representing flags, and turn on real bits */
     flags = (M.x86.R_EFLG & F_MSK) | F_ALWAYS_ON;
     if (M.x86.mode & SYSMODE_PREFIX_DATA) {
-        push_long(flags);
+	push_long(flags);
     } else {
-        push_word((u16)flags);
+	push_word((u16)flags);
     }
     DECODE_CLEAR_SEGOVR();
     END_OF_INSTR();
@@ -7104,15 +7104,15 @@
 {
     START_OF_INSTR();
     if (M.x86.mode & SYSMODE_PREFIX_DATA) {
-        DECODE_PRINTF("POPFD\n");
+	DECODE_PRINTF("POPFD\n");
     } else {
-        DECODE_PRINTF("POPF\n");
+	DECODE_PRINTF("POPF\n");
     }
     TRACE_AND_STEP();
     if (M.x86.mode & SYSMODE_PREFIX_DATA) {
-        M.x86.R_EFLG = pop_long();
+	M.x86.R_EFLG = pop_long();
     } else {
-        M.x86.R_FLG = pop_word();
+	M.x86.R_FLG = pop_word();
     }
     DECODE_CLEAR_SEGOVR();
     END_OF_INSTR();
@@ -7181,15 +7181,15 @@
     START_OF_INSTR();
     offset = fetch_word_imm();
     if (M.x86.mode & SYSMODE_PREFIX_DATA) {
-        DECODE_PRINTF2("MOV\tEAX,[%04x]\n", offset);
+	DECODE_PRINTF2("MOV\tEAX,[%04x]\n", offset);
     } else {
-        DECODE_PRINTF2("MOV\tAX,[%04x]\n", offset);
+	DECODE_PRINTF2("MOV\tAX,[%04x]\n", offset);
     }
     TRACE_AND_STEP();
     if (M.x86.mode & SYSMODE_PREFIX_DATA) {
-        M.x86.R_EAX = fetch_data_long(offset);
+	M.x86.R_EAX = fetch_data_long(offset);
     } else {
-        M.x86.R_AX = fetch_data_word(offset);
+	M.x86.R_AX = fetch_data_word(offset);
     }
     DECODE_CLEAR_SEGOVR();
     END_OF_INSTR();
@@ -7224,15 +7224,15 @@
     START_OF_INSTR();
     offset = fetch_word_imm();
     if (M.x86.mode & SYSMODE_PREFIX_DATA) {
-        DECODE_PRINTF2("MOV\t[%04x],EAX\n", offset);
+	DECODE_PRINTF2("MOV\t[%04x],EAX\n", offset);
     } else {
-        DECODE_PRINTF2("MOV\t[%04x],AX\n", offset);
+	DECODE_PRINTF2("MOV\t[%04x],AX\n", offset);
     }
     TRACE_AND_STEP();
     if (M.x86.mode & SYSMODE_PREFIX_DATA) {
-        store_data_long(offset, M.x86.R_EAX);
+	store_data_long(offset, M.x86.R_EAX);
     } else {
-        store_data_word(offset, M.x86.R_AX);
+	store_data_word(offset, M.x86.R_AX);
     }
     DECODE_CLEAR_SEGOVR();
     END_OF_INSTR();
@@ -7251,23 +7251,23 @@
     START_OF_INSTR();
     DECODE_PRINTF("MOVS\tBYTE\n");
     if (ACCESS_FLAG(F_DF))   /* down */
-        inc = -1;
+	inc = -1;
     else
-        inc = 1;
+	inc = 1;
     TRACE_AND_STEP();
     count = 1;
     if (M.x86.mode & (SYSMODE_PREFIX_REPE | SYSMODE_PREFIX_REPNE)) {
-        /* dont care whether REPE or REPNE */
-        /* move them until CX is ZERO. */
-        count = M.x86.R_CX;
-        M.x86.R_CX = 0;
-        M.x86.mode &= ~(SYSMODE_PREFIX_REPE | SYSMODE_PREFIX_REPNE);
+	/* dont care whether REPE or REPNE */
+	/* move them until CX is ZERO. */
+	count = M.x86.R_CX;
+	M.x86.R_CX = 0;
+	M.x86.mode &= ~(SYSMODE_PREFIX_REPE | SYSMODE_PREFIX_REPNE);
     }
     while (count--) {
-        val = fetch_data_byte(M.x86.R_SI);
-        store_data_byte_abs(M.x86.R_ES, M.x86.R_DI, val);
-        M.x86.R_SI += inc;
-        M.x86.R_DI += inc;
+	val = fetch_data_byte(M.x86.R_SI);
+	store_data_byte_abs(M.x86.R_ES, M.x86.R_DI, val);
+	M.x86.R_SI += inc;
+	M.x86.R_DI += inc;
     }
     DECODE_CLEAR_SEGOVR();
     END_OF_INSTR();
@@ -7285,37 +7285,37 @@
 
     START_OF_INSTR();
     if (M.x86.mode & SYSMODE_PREFIX_DATA) {
-        DECODE_PRINTF("MOVS\tDWORD\n");
-        if (ACCESS_FLAG(F_DF))      /* down */
-            inc = -4;
-        else
-            inc = 4;
+	DECODE_PRINTF("MOVS\tDWORD\n");
+	if (ACCESS_FLAG(F_DF))      /* down */
+	    inc = -4;
+	else
+	    inc = 4;
     } else {
-        DECODE_PRINTF("MOVS\tWORD\n");
-        if (ACCESS_FLAG(F_DF))      /* down */
-            inc = -2;
-        else
-            inc = 2;
+	DECODE_PRINTF("MOVS\tWORD\n");
+	if (ACCESS_FLAG(F_DF))      /* down */
+	    inc = -2;
+	else
+	    inc = 2;
     }
     TRACE_AND_STEP();
     count = 1;
     if (M.x86.mode & (SYSMODE_PREFIX_REPE | SYSMODE_PREFIX_REPNE)) {
-        /* dont care whether REPE or REPNE */
-        /* move them until CX is ZERO. */
-        count = M.x86.R_CX;
-        M.x86.R_CX = 0;
-        M.x86.mode &= ~(SYSMODE_PREFIX_REPE | SYSMODE_PREFIX_REPNE);
+	/* dont care whether REPE or REPNE */
+	/* move them until CX is ZERO. */
+	count = M.x86.R_CX;
+	M.x86.R_CX = 0;
+	M.x86.mode &= ~(SYSMODE_PREFIX_REPE | SYSMODE_PREFIX_REPNE);
     }
     while (count--) {
-        if (M.x86.mode & SYSMODE_PREFIX_DATA) {
-            val = fetch_data_long(M.x86.R_SI);
-            store_data_long_abs(M.x86.R_ES, M.x86.R_DI, val);
-        } else {
-            val = fetch_data_word(M.x86.R_SI);
-            store_data_word_abs(M.x86.R_ES, M.x86.R_DI, (u16)val);
-        }
-        M.x86.R_SI += inc;
-        M.x86.R_DI += inc;
+	if (M.x86.mode & SYSMODE_PREFIX_DATA) {
+	    val = fetch_data_long(M.x86.R_SI);
+	    store_data_long_abs(M.x86.R_ES, M.x86.R_DI, val);
+	} else {
+	    val = fetch_data_word(M.x86.R_SI);
+	    store_data_word_abs(M.x86.R_ES, M.x86.R_DI, (u16)val);
+	}
+	M.x86.R_SI += inc;
+	M.x86.R_DI += inc;
     }
     DECODE_CLEAR_SEGOVR();
     END_OF_INSTR();
@@ -7334,44 +7334,44 @@
     DECODE_PRINTF("CMPS\tBYTE\n");
     TRACE_AND_STEP();
     if (ACCESS_FLAG(F_DF))   /* down */
-        inc = -1;
+	inc = -1;
     else
-        inc = 1;
+	inc = 1;
 
     if (M.x86.mode & SYSMODE_PREFIX_REPE) {
-        /* REPE  */
-        /* move them until CX is ZERO. */
-        while (M.x86.R_CX != 0) {
-            val1 = fetch_data_byte(M.x86.R_SI);
-            val2 = fetch_data_byte_abs(M.x86.R_ES, M.x86.R_DI);
-                     cmp_byte(val1, val2);
-            M.x86.R_CX -= 1;
-            M.x86.R_SI += inc;
-            M.x86.R_DI += inc;
-            if (ACCESS_FLAG(F_ZF) == 0)
-                break;
-        }
-        M.x86.mode &= ~SYSMODE_PREFIX_REPE;
+	/* REPE  */
+	/* move them until CX is ZERO. */
+	while (M.x86.R_CX != 0) {
+	    val1 = fetch_data_byte(M.x86.R_SI);
+	    val2 = fetch_data_byte_abs(M.x86.R_ES, M.x86.R_DI);
+		     cmp_byte(val1, val2);
+	    M.x86.R_CX -= 1;
+	    M.x86.R_SI += inc;
+	    M.x86.R_DI += inc;
+	    if (ACCESS_FLAG(F_ZF) == 0)
+		break;
+	}
+	M.x86.mode &= ~SYSMODE_PREFIX_REPE;
     } else if (M.x86.mode & SYSMODE_PREFIX_REPNE) {
-        /* REPNE  */
-        /* move them until CX is ZERO. */
-        while (M.x86.R_CX != 0) {
-            val1 = fetch_data_byte(M.x86.R_SI);
-            val2 = fetch_data_byte_abs(M.x86.R_ES, M.x86.R_DI);
-            cmp_byte(val1, val2);
-            M.x86.R_CX -= 1;
-            M.x86.R_SI += inc;
-            M.x86.R_DI += inc;
-            if (ACCESS_FLAG(F_ZF))
-                break;          /* zero flag set means equal */
-        }
-        M.x86.mode &= ~SYSMODE_PREFIX_REPNE;
+	/* REPNE  */
+	/* move them until CX is ZERO. */
+	while (M.x86.R_CX != 0) {
+	    val1 = fetch_data_byte(M.x86.R_SI);
+	    val2 = fetch_data_byte_abs(M.x86.R_ES, M.x86.R_DI);
+	    cmp_byte(val1, val2);
+	    M.x86.R_CX -= 1;
+	    M.x86.R_SI += inc;
+	    M.x86.R_DI += inc;
+	    if (ACCESS_FLAG(F_ZF))
+		break;          /* zero flag set means equal */
+	}
+	M.x86.mode &= ~SYSMODE_PREFIX_REPNE;
     } else {
-        val1 = fetch_data_byte(M.x86.R_SI);
-        val2 = fetch_data_byte_abs(M.x86.R_ES, M.x86.R_DI);
-        cmp_byte(val1, val2);
-        M.x86.R_SI += inc;
-        M.x86.R_DI += inc;
+	val1 = fetch_data_byte(M.x86.R_SI);
+	val2 = fetch_data_byte_abs(M.x86.R_ES, M.x86.R_DI);
+	cmp_byte(val1, val2);
+	M.x86.R_SI += inc;
+	M.x86.R_DI += inc;
     }
     DECODE_CLEAR_SEGOVR();
     END_OF_INSTR();
@@ -7388,71 +7388,71 @@
 
     START_OF_INSTR();
     if (M.x86.mode & SYSMODE_PREFIX_DATA) {
-        DECODE_PRINTF("CMPS\tDWORD\n");
-        if (ACCESS_FLAG(F_DF))   /* down */
-            inc = -4;
-        else
-            inc = 4;
+	DECODE_PRINTF("CMPS\tDWORD\n");
+	if (ACCESS_FLAG(F_DF))   /* down */
+	    inc = -4;
+	else
+	    inc = 4;
     } else {
-        DECODE_PRINTF("CMPS\tWORD\n");
-        if (ACCESS_FLAG(F_DF))   /* down */
-            inc = -2;
-        else
-            inc = 2;
+	DECODE_PRINTF("CMPS\tWORD\n");
+	if (ACCESS_FLAG(F_DF))   /* down */
+	    inc = -2;
+	else
+	    inc = 2;
     }
     TRACE_AND_STEP();
     if (M.x86.mode & SYSMODE_PREFIX_REPE) {
-        /* REPE  */
-        /* move them until CX is ZERO. */
-        while (M.x86.R_CX != 0) {
-            if (M.x86.mode & SYSMODE_PREFIX_DATA) {
-                val1 = fetch_data_long(M.x86.R_SI);
-                val2 = fetch_data_long_abs(M.x86.R_ES, M.x86.R_DI);
-                cmp_long(val1, val2);
-            } else {
-                val1 = fetch_data_word(M.x86.R_SI);
-                val2 = fetch_data_word_abs(M.x86.R_ES, M.x86.R_DI);
-                cmp_word((u16)val1, (u16)val2);
-            }
-            M.x86.R_CX -= 1;
-            M.x86.R_SI += inc;
-            M.x86.R_DI += inc;
-            if (ACCESS_FLAG(F_ZF) == 0)
-                break;
-        }
-        M.x86.mode &= ~SYSMODE_PREFIX_REPE;
+	/* REPE  */
+	/* move them until CX is ZERO. */
+	while (M.x86.R_CX != 0) {
+	    if (M.x86.mode & SYSMODE_PREFIX_DATA) {
+		val1 = fetch_data_long(M.x86.R_SI);
+		val2 = fetch_data_long_abs(M.x86.R_ES, M.x86.R_DI);
+		cmp_long(val1, val2);
+	    } else {
+		val1 = fetch_data_word(M.x86.R_SI);
+		val2 = fetch_data_word_abs(M.x86.R_ES, M.x86.R_DI);
+		cmp_word((u16)val1, (u16)val2);
+	    }
+	    M.x86.R_CX -= 1;
+	    M.x86.R_SI += inc;
+	    M.x86.R_DI += inc;
+	    if (ACCESS_FLAG(F_ZF) == 0)
+		break;
+	}
+	M.x86.mode &= ~SYSMODE_PREFIX_REPE;
     } else if (M.x86.mode & SYSMODE_PREFIX_REPNE) {
-        /* REPNE  */
-        /* move them until CX is ZERO. */
-        while (M.x86.R_CX != 0) {
-            if (M.x86.mode & SYSMODE_PREFIX_DATA) {
-                val1 = fetch_data_long(M.x86.R_SI);
-                val2 = fetch_data_long_abs(M.x86.R_ES, M.x86.R_DI);
-                cmp_long(val1, val2);
-            } else {
-                val1 = fetch_data_word(M.x86.R_SI);
-                val2 = fetch_data_word_abs(M.x86.R_ES, M.x86.R_DI);
-                cmp_word((u16)val1, (u16)val2);
-            }
-            M.x86.R_CX -= 1;
-            M.x86.R_SI += inc;
-            M.x86.R_DI += inc;
-            if (ACCESS_FLAG(F_ZF))
-                break;          /* zero flag set means equal */
-        }
-        M.x86.mode &= ~SYSMODE_PREFIX_REPNE;
+	/* REPNE  */
+	/* move them until CX is ZERO. */
+	while (M.x86.R_CX != 0) {
+	    if (M.x86.mode & SYSMODE_PREFIX_DATA) {
+		val1 = fetch_data_long(M.x86.R_SI);
+		val2 = fetch_data_long_abs(M.x86.R_ES, M.x86.R_DI);
+		cmp_long(val1, val2);
+	    } else {
+		val1 = fetch_data_word(M.x86.R_SI);
+		val2 = fetch_data_word_abs(M.x86.R_ES, M.x86.R_DI);
+		cmp_word((u16)val1, (u16)val2);
+	    }
+	    M.x86.R_CX -= 1;
+	    M.x86.R_SI += inc;
+	    M.x86.R_DI += inc;
+	    if (ACCESS_FLAG(F_ZF))
+		break;          /* zero flag set means equal */
+	}
+	M.x86.mode &= ~SYSMODE_PREFIX_REPNE;
     } else {
-        if (M.x86.mode & SYSMODE_PREFIX_DATA) {
-            val1 = fetch_data_long(M.x86.R_SI);
-            val2 = fetch_data_long_abs(M.x86.R_ES, M.x86.R_DI);
-            cmp_long(val1, val2);
-        } else {
-            val1 = fetch_data_word(M.x86.R_SI);
-            val2 = fetch_data_word_abs(M.x86.R_ES, M.x86.R_DI);
-            cmp_word((u16)val1, (u16)val2);
-        }
-        M.x86.R_SI += inc;
-        M.x86.R_DI += inc;
+	if (M.x86.mode & SYSMODE_PREFIX_DATA) {
+	    val1 = fetch_data_long(M.x86.R_SI);
+	    val2 = fetch_data_long_abs(M.x86.R_ES, M.x86.R_DI);
+	    cmp_long(val1, val2);
+	} else {
+	    val1 = fetch_data_word(M.x86.R_SI);
+	    val2 = fetch_data_word_abs(M.x86.R_ES, M.x86.R_DI);
+	    cmp_word((u16)val1, (u16)val2);
+	}
+	M.x86.R_SI += inc;
+	M.x86.R_DI += inc;
     }
     DECODE_CLEAR_SEGOVR();
     END_OF_INSTR();
@@ -7486,18 +7486,18 @@
 
     START_OF_INSTR();
     if (M.x86.mode & SYSMODE_PREFIX_DATA) {
-        DECODE_PRINTF("TEST\tEAX,");
-        srcval = fetch_long_imm();
+	DECODE_PRINTF("TEST\tEAX,");
+	srcval = fetch_long_imm();
     } else {
-        DECODE_PRINTF("TEST\tAX,");
-        srcval = fetch_word_imm();
+	DECODE_PRINTF("TEST\tAX,");
+	srcval = fetch_word_imm();
     }
     DECODE_PRINTF2("%x\n", srcval);
     TRACE_AND_STEP();
     if (M.x86.mode & SYSMODE_PREFIX_DATA) {
-        test_long(M.x86.R_EAX, srcval);
+	test_long(M.x86.R_EAX, srcval);
     } else {
-        test_word(M.x86.R_AX, (u16)srcval);
+	test_word(M.x86.R_AX, (u16)srcval);
     }
     DECODE_CLEAR_SEGOVR();
     END_OF_INSTR();
@@ -7514,22 +7514,22 @@
     START_OF_INSTR();
     DECODE_PRINTF("STOS\tBYTE\n");
     if (ACCESS_FLAG(F_DF))   /* down */
-        inc = -1;
+	inc = -1;
     else
-        inc = 1;
+	inc = 1;
     TRACE_AND_STEP();
     if (M.x86.mode & (SYSMODE_PREFIX_REPE | SYSMODE_PREFIX_REPNE)) {
-        /* dont care whether REPE or REPNE */
-        /* move them until CX is ZERO. */
-        while (M.x86.R_CX != 0) {
-            store_data_byte_abs(M.x86.R_ES, M.x86.R_DI, M.x86.R_AL);
-            M.x86.R_CX -= 1;
-            M.x86.R_DI += inc;
-        }
-        M.x86.mode &= ~(SYSMODE_PREFIX_REPE | SYSMODE_PREFIX_REPNE);
+	/* dont care whether REPE or REPNE */
+	/* move them until CX is ZERO. */
+	while (M.x86.R_CX != 0) {
+	    store_data_byte_abs(M.x86.R_ES, M.x86.R_DI, M.x86.R_AL);
+	    M.x86.R_CX -= 1;
+	    M.x86.R_DI += inc;
+	}
+	M.x86.mode &= ~(SYSMODE_PREFIX_REPE | SYSMODE_PREFIX_REPNE);
     } else {
-        store_data_byte_abs(M.x86.R_ES, M.x86.R_DI, M.x86.R_AL);
-        M.x86.R_DI += inc;
+	store_data_byte_abs(M.x86.R_ES, M.x86.R_DI, M.x86.R_AL);
+	M.x86.R_DI += inc;
     }
     DECODE_CLEAR_SEGOVR();
     END_OF_INSTR();
@@ -7546,34 +7546,34 @@
 
     START_OF_INSTR();
     if (M.x86.mode & SYSMODE_PREFIX_DATA) {
-        DECODE_PRINTF("STOS\tDWORD\n");
-        if (ACCESS_FLAG(F_DF))   /* down */
-            inc = -4;
-        else
-            inc = 4;
+	DECODE_PRINTF("STOS\tDWORD\n");
+	if (ACCESS_FLAG(F_DF))   /* down */
+	    inc = -4;
+	else
+	    inc = 4;
     } else {
-        DECODE_PRINTF("STOS\tWORD\n");
-        if (ACCESS_FLAG(F_DF))   /* down */
-            inc = -2;
-        else
-            inc = 2;
+	DECODE_PRINTF("STOS\tWORD\n");
+	if (ACCESS_FLAG(F_DF))   /* down */
+	    inc = -2;
+	else
+	    inc = 2;
     }
     TRACE_AND_STEP();
     count = 1;
     if (M.x86.mode & (SYSMODE_PREFIX_REPE | SYSMODE_PREFIX_REPNE)) {
-        /* dont care whether REPE or REPNE */
-        /* move them until CX is ZERO. */
-        count = M.x86.R_CX;
-        M.x86.R_CX = 0;
-        M.x86.mode &= ~(SYSMODE_PREFIX_REPE | SYSMODE_PREFIX_REPNE);
+	/* dont care whether REPE or REPNE */
+	/* move them until CX is ZERO. */
+	count = M.x86.R_CX;
+	M.x86.R_CX = 0;
+	M.x86.mode &= ~(SYSMODE_PREFIX_REPE | SYSMODE_PREFIX_REPNE);
     }
     while (count--) {
-        if (M.x86.mode & SYSMODE_PREFIX_DATA) {
-            store_data_long_abs(M.x86.R_ES, M.x86.R_DI, M.x86.R_EAX);
-        } else {
-            store_data_word_abs(M.x86.R_ES, M.x86.R_DI, M.x86.R_AX);
-        }
-        M.x86.R_DI += inc;
+	if (M.x86.mode & SYSMODE_PREFIX_DATA) {
+	    store_data_long_abs(M.x86.R_ES, M.x86.R_DI, M.x86.R_EAX);
+	} else {
+	    store_data_word_abs(M.x86.R_ES, M.x86.R_DI, M.x86.R_AX);
+	}
+	M.x86.R_DI += inc;
     }
     DECODE_CLEAR_SEGOVR();
     END_OF_INSTR();
@@ -7591,21 +7591,21 @@
     DECODE_PRINTF("LODS\tBYTE\n");
     TRACE_AND_STEP();
     if (ACCESS_FLAG(F_DF))   /* down */
-        inc = -1;
+	inc = -1;
     else
-        inc = 1;
+	inc = 1;
     if (M.x86.mode & (SYSMODE_PREFIX_REPE | SYSMODE_PREFIX_REPNE)) {
-        /* dont care whether REPE or REPNE */
-        /* move them until CX is ZERO. */
-        while (M.x86.R_CX != 0) {
-            M.x86.R_AL = fetch_data_byte(M.x86.R_SI);
-            M.x86.R_CX -= 1;
-            M.x86.R_SI += inc;
-        }
-        M.x86.mode &= ~(SYSMODE_PREFIX_REPE | SYSMODE_PREFIX_REPNE);
+	/* dont care whether REPE or REPNE */
+	/* move them until CX is ZERO. */
+	while (M.x86.R_CX != 0) {
+	    M.x86.R_AL = fetch_data_byte(M.x86.R_SI);
+	    M.x86.R_CX -= 1;
+	    M.x86.R_SI += inc;
+	}
+	M.x86.mode &= ~(SYSMODE_PREFIX_REPE | SYSMODE_PREFIX_REPNE);
     } else {
-        M.x86.R_AL = fetch_data_byte(M.x86.R_SI);
-        M.x86.R_SI += inc;
+	M.x86.R_AL = fetch_data_byte(M.x86.R_SI);
+	M.x86.R_SI += inc;
     }
     DECODE_CLEAR_SEGOVR();
     END_OF_INSTR();
@@ -7622,34 +7622,34 @@
 
     START_OF_INSTR();
     if (M.x86.mode & SYSMODE_PREFIX_DATA) {
-        DECODE_PRINTF("LODS\tDWORD\n");
-        if (ACCESS_FLAG(F_DF))   /* down */
-            inc = -4;
-        else
-            inc = 4;
+	DECODE_PRINTF("LODS\tDWORD\n");
+	if (ACCESS_FLAG(F_DF))   /* down */
+	    inc = -4;
+	else
+	    inc = 4;
     } else {
-        DECODE_PRINTF("LODS\tWORD\n");
-        if (ACCESS_FLAG(F_DF))   /* down */
-            inc = -2;
-        else
-            inc = 2;
+	DECODE_PRINTF("LODS\tWORD\n");
+	if (ACCESS_FLAG(F_DF))   /* down */
+	    inc = -2;
+	else
+	    inc = 2;
     }
     TRACE_AND_STEP();
     count = 1;
     if (M.x86.mode & (SYSMODE_PREFIX_REPE | SYSMODE_PREFIX_REPNE)) {
-        /* dont care whether REPE or REPNE */
-        /* move them until CX is ZERO. */
-        count = M.x86.R_CX;
-        M.x86.R_CX = 0;
-        M.x86.mode &= ~(SYSMODE_PREFIX_REPE | SYSMODE_PREFIX_REPNE);
+	/* dont care whether REPE or REPNE */
+	/* move them until CX is ZERO. */
+	count = M.x86.R_CX;
+	M.x86.R_CX = 0;
+	M.x86.mode &= ~(SYSMODE_PREFIX_REPE | SYSMODE_PREFIX_REPNE);
     }
     while (count--) {
-        if (M.x86.mode & SYSMODE_PREFIX_DATA) {
-            M.x86.R_EAX = fetch_data_long(M.x86.R_SI);
-        } else {
-            M.x86.R_AX = fetch_data_word(M.x86.R_SI);
-        }
-        M.x86.R_SI += inc;
+	if (M.x86.mode & SYSMODE_PREFIX_DATA) {
+	    M.x86.R_EAX = fetch_data_long(M.x86.R_SI);
+	} else {
+	    M.x86.R_AX = fetch_data_word(M.x86.R_SI);
+	}
+	M.x86.R_SI += inc;
     }
     DECODE_CLEAR_SEGOVR();
     END_OF_INSTR();
@@ -7668,37 +7668,37 @@
     DECODE_PRINTF("SCAS\tBYTE\n");
     TRACE_AND_STEP();
     if (ACCESS_FLAG(F_DF))   /* down */
-        inc = -1;
+	inc = -1;
     else
-        inc = 1;
+	inc = 1;
     if (M.x86.mode & SYSMODE_PREFIX_REPE) {
-        /* REPE  */
-        /* move them until CX is ZERO. */
-        while (M.x86.R_CX != 0) {
-            val2 = fetch_data_byte_abs(M.x86.R_ES, M.x86.R_DI);
-            cmp_byte(M.x86.R_AL, val2);
-            M.x86.R_CX -= 1;
-            M.x86.R_DI += inc;
-            if (ACCESS_FLAG(F_ZF) == 0)
-                break;
-        }
-        M.x86.mode &= ~SYSMODE_PREFIX_REPE;
+	/* REPE  */
+	/* move them until CX is ZERO. */
+	while (M.x86.R_CX != 0) {
+	    val2 = fetch_data_byte_abs(M.x86.R_ES, M.x86.R_DI);
+	    cmp_byte(M.x86.R_AL, val2);
+	    M.x86.R_CX -= 1;
+	    M.x86.R_DI += inc;
+	    if (ACCESS_FLAG(F_ZF) == 0)
+		break;
+	}
+	M.x86.mode &= ~SYSMODE_PREFIX_REPE;
     } else if (M.x86.mode & SYSMODE_PREFIX_REPNE) {
-        /* REPNE  */
-        /* move them until CX is ZERO. */
-        while (M.x86.R_CX != 0) {
-            val2 = fetch_data_byte_abs(M.x86.R_ES, M.x86.R_DI);
-            cmp_byte(M.x86.R_AL, val2);
-            M.x86.R_CX -= 1;
-            M.x86.R_DI += inc;
-            if (ACCESS_FLAG(F_ZF))
-                break;          /* zero flag set means equal */
-        }
-        M.x86.mode &= ~SYSMODE_PREFIX_REPNE;
+	/* REPNE  */
+	/* move them until CX is ZERO. */
+	while (M.x86.R_CX != 0) {
+	    val2 = fetch_data_byte_abs(M.x86.R_ES, M.x86.R_DI);
+	    cmp_byte(M.x86.R_AL, val2);
+	    M.x86.R_CX -= 1;
+	    M.x86.R_DI += inc;
+	    if (ACCESS_FLAG(F_ZF))
+		break;          /* zero flag set means equal */
+	}
+	M.x86.mode &= ~SYSMODE_PREFIX_REPNE;
     } else {
-        val2 = fetch_data_byte_abs(M.x86.R_ES, M.x86.R_DI);
-        cmp_byte(M.x86.R_AL, val2);
-        M.x86.R_DI += inc;
+	val2 = fetch_data_byte_abs(M.x86.R_ES, M.x86.R_DI);
+	cmp_byte(M.x86.R_AL, val2);
+	M.x86.R_DI += inc;
     }
     DECODE_CLEAR_SEGOVR();
     END_OF_INSTR();
@@ -7715,62 +7715,62 @@
 
     START_OF_INSTR();
     if (M.x86.mode & SYSMODE_PREFIX_DATA) {
-        DECODE_PRINTF("SCAS\tDWORD\n");
-        if (ACCESS_FLAG(F_DF))   /* down */
-            inc = -4;
-        else
-            inc = 4;
+	DECODE_PRINTF("SCAS\tDWORD\n");
+	if (ACCESS_FLAG(F_DF))   /* down */
+	    inc = -4;
+	else
+	    inc = 4;
     } else {
-        DECODE_PRINTF("SCAS\tWORD\n");
-        if (ACCESS_FLAG(F_DF))   /* down */
-            inc = -2;
-        else
-            inc = 2;
+	DECODE_PRINTF("SCAS\tWORD\n");
+	if (ACCESS_FLAG(F_DF))   /* down */
+	    inc = -2;
+	else
+	    inc = 2;
     }
     TRACE_AND_STEP();
     if (M.x86.mode & SYSMODE_PREFIX_REPE) {
-        /* REPE  */
-        /* move them until CX is ZERO. */
-        while (M.x86.R_CX != 0) {
-            if (M.x86.mode & SYSMODE_PREFIX_DATA) {
-                val = fetch_data_long_abs(M.x86.R_ES, M.x86.R_DI);
-                cmp_long(M.x86.R_EAX, val);
-            } else {
-                val = fetch_data_word_abs(M.x86.R_ES, M.x86.R_DI);
-                cmp_word(M.x86.R_AX, (u16)val);
-            }
-            M.x86.R_CX -= 1;
-            M.x86.R_DI += inc;
-            if (ACCESS_FLAG(F_ZF) == 0)
-                break;
-        }
-        M.x86.mode &= ~SYSMODE_PREFIX_REPE;
+	/* REPE  */
+	/* move them until CX is ZERO. */
+	while (M.x86.R_CX != 0) {
+	    if (M.x86.mode & SYSMODE_PREFIX_DATA) {
+		val = fetch_data_long_abs(M.x86.R_ES, M.x86.R_DI);
+		cmp_long(M.x86.R_EAX, val);
+	    } else {
+		val = fetch_data_word_abs(M.x86.R_ES, M.x86.R_DI);
+		cmp_word(M.x86.R_AX, (u16)val);
+	    }
+	    M.x86.R_CX -= 1;
+	    M.x86.R_DI += inc;
+	    if (ACCESS_FLAG(F_ZF) == 0)
+		break;
+	}
+	M.x86.mode &= ~SYSMODE_PREFIX_REPE;
     } else if (M.x86.mode & SYSMODE_PREFIX_REPNE) {
-        /* REPNE  */
-        /* move them until CX is ZERO. */
-        while (M.x86.R_CX != 0) {
-            if (M.x86.mode & SYSMODE_PREFIX_DATA) {
-                val = fetch_data_long_abs(M.x86.R_ES, M.x86.R_DI);
-                cmp_long(M.x86.R_EAX, val);
-            } else {
-                val = fetch_data_word_abs(M.x86.R_ES, M.x86.R_DI);
-                cmp_word(M.x86.R_AX, (u16)val);
-            }
-            M.x86.R_CX -= 1;
-            M.x86.R_DI += inc;
-            if (ACCESS_FLAG(F_ZF))
-                break;          /* zero flag set means equal */
-        }
-        M.x86.mode &= ~SYSMODE_PREFIX_REPNE;
+	/* REPNE  */
+	/* move them until CX is ZERO. */
+	while (M.x86.R_CX != 0) {
+	    if (M.x86.mode & SYSMODE_PREFIX_DATA) {
+		val = fetch_data_long_abs(M.x86.R_ES, M.x86.R_DI);
+		cmp_long(M.x86.R_EAX, val);
+	    } else {
+		val = fetch_data_word_abs(M.x86.R_ES, M.x86.R_DI);
+		cmp_word(M.x86.R_AX, (u16)val);
+	    }
+	    M.x86.R_CX -= 1;
+	    M.x86.R_DI += inc;
+	    if (ACCESS_FLAG(F_ZF))
+		break;          /* zero flag set means equal */
+	}
+	M.x86.mode &= ~SYSMODE_PREFIX_REPNE;
     } else {
-        if (M.x86.mode & SYSMODE_PREFIX_DATA) {
-            val = fetch_data_long_abs(M.x86.R_ES, M.x86.R_DI);
-            cmp_long(M.x86.R_EAX, val);
-        } else {
-            val = fetch_data_word_abs(M.x86.R_ES, M.x86.R_DI);
-            cmp_word(M.x86.R_AX, (u16)val);
-        }
-        M.x86.R_DI += inc;
+	if (M.x86.mode & SYSMODE_PREFIX_DATA) {
+	    val = fetch_data_long_abs(M.x86.R_ES, M.x86.R_DI);
+	    cmp_long(M.x86.R_EAX, val);
+	} else {
+	    val = fetch_data_word_abs(M.x86.R_ES, M.x86.R_DI);
+	    cmp_word(M.x86.R_AX, (u16)val);
+	}
+	M.x86.R_DI += inc;
     }
     DECODE_CLEAR_SEGOVR();
     END_OF_INSTR();
@@ -7930,18 +7930,18 @@
 
     START_OF_INSTR();
     if (M.x86.mode & SYSMODE_PREFIX_DATA) {
-        DECODE_PRINTF("MOV\tEAX,");
-        srcval = fetch_long_imm();
+	DECODE_PRINTF("MOV\tEAX,");
+	srcval = fetch_long_imm();
     } else {
-        DECODE_PRINTF("MOV\tAX,");
-        srcval = fetch_word_imm();
+	DECODE_PRINTF("MOV\tAX,");
+	srcval = fetch_word_imm();
     }
     DECODE_PRINTF2("%x\n", srcval);
     TRACE_AND_STEP();
     if (M.x86.mode & SYSMODE_PREFIX_DATA) {
-        M.x86.R_EAX = srcval;
+	M.x86.R_EAX = srcval;
     } else {
-        M.x86.R_AX = (u16)srcval;
+	M.x86.R_AX = (u16)srcval;
     }
     DECODE_CLEAR_SEGOVR();
     END_OF_INSTR();
@@ -7957,18 +7957,18 @@
 
     START_OF_INSTR();
     if (M.x86.mode & SYSMODE_PREFIX_DATA) {
-        DECODE_PRINTF("MOV\tECX,");
-        srcval = fetch_long_imm();
+	DECODE_PRINTF("MOV\tECX,");
+	srcval = fetch_long_imm();
     } else {
-        DECODE_PRINTF("MOV\tCX,");
-        srcval = fetch_word_imm();
+	DECODE_PRINTF("MOV\tCX,");
+	srcval = fetch_word_imm();
     }
     DECODE_PRINTF2("%x\n", srcval);
     TRACE_AND_STEP();
     if (M.x86.mode & SYSMODE_PREFIX_DATA) {
-        M.x86.R_ECX = srcval;
+	M.x86.R_ECX = srcval;
     } else {
-        M.x86.R_CX = (u16)srcval;
+	M.x86.R_CX = (u16)srcval;
     }
     DECODE_CLEAR_SEGOVR();
     END_OF_INSTR();
@@ -7984,18 +7984,18 @@
 
     START_OF_INSTR();
     if (M.x86.mode & SYSMODE_PREFIX_DATA) {
-        DECODE_PRINTF("MOV\tEDX,");
-        srcval = fetch_long_imm();
+	DECODE_PRINTF("MOV\tEDX,");
+	srcval = fetch_long_imm();
     } else {
-        DECODE_PRINTF("MOV\tDX,");
-        srcval = fetch_word_imm();
+	DECODE_PRINTF("MOV\tDX,");
+	srcval = fetch_word_imm();
     }
     DECODE_PRINTF2("%x\n", srcval);
     TRACE_AND_STEP();
     if (M.x86.mode & SYSMODE_PREFIX_DATA) {
-        M.x86.R_EDX = srcval;
+	M.x86.R_EDX = srcval;
     } else {
-        M.x86.R_DX = (u16)srcval;
+	M.x86.R_DX = (u16)srcval;
     }
     DECODE_CLEAR_SEGOVR();
     END_OF_INSTR();
@@ -8011,18 +8011,18 @@
 
     START_OF_INSTR();
     if (M.x86.mode & SYSMODE_PREFIX_DATA) {
-        DECODE_PRINTF("MOV\tEBX,");
-        srcval = fetch_long_imm();
+	DECODE_PRINTF("MOV\tEBX,");
+	srcval = fetch_long_imm();
     } else {
-        DECODE_PRINTF("MOV\tBX,");
-        srcval = fetch_word_imm();
+	DECODE_PRINTF("MOV\tBX,");
+	srcval = fetch_word_imm();
     }
     DECODE_PRINTF2("%x\n", srcval);
     TRACE_AND_STEP();
     if (M.x86.mode & SYSMODE_PREFIX_DATA) {
-        M.x86.R_EBX = srcval;
+	M.x86.R_EBX = srcval;
     } else {
-        M.x86.R_BX = (u16)srcval;
+	M.x86.R_BX = (u16)srcval;
     }
     DECODE_CLEAR_SEGOVR();
     END_OF_INSTR();
@@ -8038,18 +8038,18 @@
 
     START_OF_INSTR();
     if (M.x86.mode & SYSMODE_PREFIX_DATA) {
-        DECODE_PRINTF("MOV\tESP,");
-        srcval = fetch_long_imm();
+	DECODE_PRINTF("MOV\tESP,");
+	srcval = fetch_long_imm();
     } else {
-        DECODE_PRINTF("MOV\tSP,");
-        srcval = fetch_word_imm();
+	DECODE_PRINTF("MOV\tSP,");
+	srcval = fetch_word_imm();
     }
     DECODE_PRINTF2("%x\n", srcval);
     TRACE_AND_STEP();
     if (M.x86.mode & SYSMODE_PREFIX_DATA) {
-        M.x86.R_ESP = srcval;
+	M.x86.R_ESP = srcval;
     } else {
-        M.x86.R_SP = (u16)srcval;
+	M.x86.R_SP = (u16)srcval;
     }
     DECODE_CLEAR_SEGOVR();
     END_OF_INSTR();
@@ -8065,18 +8065,18 @@
 
     START_OF_INSTR();
     if (M.x86.mode & SYSMODE_PREFIX_DATA) {
-        DECODE_PRINTF("MOV\tEBP,");
-        srcval = fetch_long_imm();
+	DECODE_PRINTF("MOV\tEBP,");
+	srcval = fetch_long_imm();
     } else {
-        DECODE_PRINTF("MOV\tBP,");
-        srcval = fetch_word_imm();
+	DECODE_PRINTF("MOV\tBP,");
+	srcval = fetch_word_imm();
     }
     DECODE_PRINTF2("%x\n", srcval);
     TRACE_AND_STEP();
     if (M.x86.mode & SYSMODE_PREFIX_DATA) {
-        M.x86.R_EBP = srcval;
+	M.x86.R_EBP = srcval;
     } else {
-        M.x86.R_BP = (u16)srcval;
+	M.x86.R_BP = (u16)srcval;
     }
     DECODE_CLEAR_SEGOVR();
     END_OF_INSTR();
@@ -8092,18 +8092,18 @@
 
     START_OF_INSTR();
     if (M.x86.mode & SYSMODE_PREFIX_DATA) {
-        DECODE_PRINTF("MOV\tESI,");
-        srcval = fetch_long_imm();
+	DECODE_PRINTF("MOV\tESI,");
+	srcval = fetch_long_imm();
     } else {
-        DECODE_PRINTF("MOV\tSI,");
-        srcval = fetch_word_imm();
+	DECODE_PRINTF("MOV\tSI,");
+	srcval = fetch_word_imm();
     }
     DECODE_PRINTF2("%x\n", srcval);
     TRACE_AND_STEP();
     if (M.x86.mode & SYSMODE_PREFIX_DATA) {
-        M.x86.R_ESI = srcval;
+	M.x86.R_ESI = srcval;
     } else {
-        M.x86.R_SI = (u16)srcval;
+	M.x86.R_SI = (u16)srcval;
     }
     DECODE_CLEAR_SEGOVR();
     END_OF_INSTR();
@@ -8119,18 +8119,18 @@
 
     START_OF_INSTR();
     if (M.x86.mode & SYSMODE_PREFIX_DATA) {
-        DECODE_PRINTF("MOV\tEDI,");
-        srcval = fetch_long_imm();
+	DECODE_PRINTF("MOV\tEDI,");
+	srcval = fetch_long_imm();
     } else {
-        DECODE_PRINTF("MOV\tDI,");
-        srcval = fetch_word_imm();
+	DECODE_PRINTF("MOV\tDI,");
+	srcval = fetch_word_imm();
     }
     DECODE_PRINTF2("%x\n", srcval);
     TRACE_AND_STEP();
     if (M.x86.mode & SYSMODE_PREFIX_DATA) {
-        M.x86.R_EDI = srcval;
+	M.x86.R_EDI = srcval;
     } else {
-        M.x86.R_DI = (u16)srcval;
+	M.x86.R_DI = (u16)srcval;
     }
     DECODE_CLEAR_SEGOVR();
     END_OF_INSTR();
@@ -8170,80 +8170,80 @@
     FETCH_DECODE_MODRM(mod, rh, rl);
 #ifdef DEBUG
     if (DEBUG_DECODE()) {
-        /* XXX DECODE_PRINTF may be changed to something more
-           general, so that it is important to leave the strings
-           in the same format, even though the result is that the 
-           above test is done twice. */
+	/* XXX DECODE_PRINTF may be changed to something more
+	   general, so that it is important to leave the strings
+	   in the same format, even though the result is that the
+	   above test is done twice. */
 
-        switch (rh) {
-        case 0:
-            DECODE_PRINTF("ROL\t");
-            break;
-        case 1:
-            DECODE_PRINTF("ROR\t");
-            break;
-        case 2:
-            DECODE_PRINTF("RCL\t");
-            break;
-        case 3:
-            DECODE_PRINTF("RCR\t");
-            break;
-        case 4:
-            DECODE_PRINTF("SHL\t");
-            break;
-        case 5:
-            DECODE_PRINTF("SHR\t");
-            break;
-        case 6:
-            DECODE_PRINTF("SAL\t");
-            break;
-        case 7:
-            DECODE_PRINTF("SAR\t");
-            break;
-        }
+	switch (rh) {
+	case 0:
+	    DECODE_PRINTF("ROL\t");
+	    break;
+	case 1:
+	    DECODE_PRINTF("ROR\t");
+	    break;
+	case 2:
+	    DECODE_PRINTF("RCL\t");
+	    break;
+	case 3:
+	    DECODE_PRINTF("RCR\t");
+	    break;
+	case 4:
+	    DECODE_PRINTF("SHL\t");
+	    break;
+	case 5:
+	    DECODE_PRINTF("SHR\t");
+	    break;
+	case 6:
+	    DECODE_PRINTF("SAL\t");
+	    break;
+	case 7:
+	    DECODE_PRINTF("SAR\t");
+	    break;
+	}
     }
 #endif
     /* know operation, decode the mod byte to find the addressing
        mode. */
     switch (mod) {
     case 0:
-        DECODE_PRINTF("BYTE PTR ");
-        destoffset = decode_rm00_address(rl);
-        amt = fetch_byte_imm();
-        DECODE_PRINTF2(",%x\n", amt);
-        destval = fetch_data_byte(destoffset);
-        TRACE_AND_STEP();
-        destval = (*opcD0_byte_operation[rh]) (destval, amt);
-        store_data_byte(destoffset, destval);
-        break;
+	DECODE_PRINTF("BYTE PTR ");
+	destoffset = decode_rm00_address(rl);
+	amt = fetch_byte_imm();
+	DECODE_PRINTF2(",%x\n", amt);
+	destval = fetch_data_byte(destoffset);
+	TRACE_AND_STEP();
+	destval = (*opcD0_byte_operation[rh]) (destval, amt);
+	store_data_byte(destoffset, destval);
+	break;
     case 1:
-        DECODE_PRINTF("BYTE PTR ");
-        destoffset = decode_rm01_address(rl);
-        amt = fetch_byte_imm();
-        DECODE_PRINTF2(",%x\n", amt);
-        destval = fetch_data_byte(destoffset);
-        TRACE_AND_STEP();
-        destval = (*opcD0_byte_operation[rh]) (destval, amt);
-        store_data_byte(destoffset, destval);
-        break;
+	DECODE_PRINTF("BYTE PTR ");
+	destoffset = decode_rm01_address(rl);
+	amt = fetch_byte_imm();
+	DECODE_PRINTF2(",%x\n", amt);
+	destval = fetch_data_byte(destoffset);
+	TRACE_AND_STEP();
+	destval = (*opcD0_byte_operation[rh]) (destval, amt);
+	store_data_byte(destoffset, destval);
+	break;
     case 2:
-        DECODE_PRINTF("BYTE PTR ");
-        destoffset = decode_rm10_address(rl);
-        amt = fetch_byte_imm();
-        DECODE_PRINTF2(",%x\n", amt);
-        destval = fetch_data_byte(destoffset);
-        TRACE_AND_STEP();
-        destval = (*opcD0_byte_operation[rh]) (destval, amt);
-        store_data_byte(destoffset, destval);
-        break;
+	DECODE_PRINTF("BYTE PTR ");
+	destoffset = decode_rm10_address(rl);
+	amt = fetch_byte_imm();
+	DECODE_PRINTF2(",%x\n", amt);
+	destval = fetch_data_byte(destoffset);
+	TRACE_AND_STEP();
+	destval = (*opcD0_byte_operation[rh]) (destval, amt);
+	store_data_byte(destoffset, destval);
+	break;
     case 3:                     /* register to register */
-        destreg = DECODE_RM_BYTE_REGISTER(rl);
-        amt = fetch_byte_imm();
-        DECODE_PRINTF2(",%x\n", amt);
-        TRACE_AND_STEP();
-        destval = (*opcD0_byte_operation[rh]) (*destreg, amt);
-        *destreg = destval;
-        break;
+	destreg = DECODE_RM_BYTE_REGISTER(rl);
+	amt = fetch_byte_imm();
+	DECODE_PRINTF2(",%x\n", amt);
+	TRACE_AND_STEP();
+	destval = (*opcD0_byte_operation[rh]) (*destreg, amt);
+	*destreg = destval;
+	break;
     }
     DECODE_CLEAR_SEGOVR();
     END_OF_INSTR();
@@ -8294,136 +8294,136 @@
     FETCH_DECODE_MODRM(mod, rh, rl);
 #ifdef DEBUG
     if (DEBUG_DECODE()) {
-        /* XXX DECODE_PRINTF may be changed to something more
-           general, so that it is important to leave the strings
-           in the same format, even though the result is that the 
-           above test is done twice. */
+	/* XXX DECODE_PRINTF may be changed to something more
+	   general, so that it is important to leave the strings
+	   in the same format, even though the result is that the
+	   above test is done twice. */
 
-        switch (rh) {
-        case 0:
-            DECODE_PRINTF("ROL\t");
-            break;
-        case 1:
-            DECODE_PRINTF("ROR\t");
-            break;
-        case 2:
-            DECODE_PRINTF("RCL\t");
-            break;
-        case 3:
-            DECODE_PRINTF("RCR\t");
-            break;
-        case 4:
-            DECODE_PRINTF("SHL\t");
-            break;
-        case 5:
-            DECODE_PRINTF("SHR\t");
-            break;
-        case 6:
-            DECODE_PRINTF("SAL\t");
-            break;
-        case 7:
-            DECODE_PRINTF("SAR\t");
-            break;
-        }
+	switch (rh) {
+	case 0:
+	    DECODE_PRINTF("ROL\t");
+	    break;
+	case 1:
+	    DECODE_PRINTF("ROR\t");
+	    break;
+	case 2:
+	    DECODE_PRINTF("RCL\t");
+	    break;
+	case 3:
+	    DECODE_PRINTF("RCR\t");
+	    break;
+	case 4:
+	    DECODE_PRINTF("SHL\t");
+	    break;
+	case 5:
+	    DECODE_PRINTF("SHR\t");
+	    break;
+	case 6:
+	    DECODE_PRINTF("SAL\t");
+	    break;
+	case 7:
+	    DECODE_PRINTF("SAR\t");
+	    break;
+	}
     }
 #endif
     /* know operation, decode the mod byte to find the addressing
        mode. */
     switch (mod) {
     case 0:
-        if (M.x86.mode & SYSMODE_PREFIX_DATA) {
-            u32 destval;
+	if (M.x86.mode & SYSMODE_PREFIX_DATA) {
+	    u32 destval;
 
-            DECODE_PRINTF("DWORD PTR ");
-            destoffset = decode_rm00_address(rl);
-            amt = fetch_byte_imm();
-            DECODE_PRINTF2(",%x\n", amt);
-            destval = fetch_data_long(destoffset);
-            TRACE_AND_STEP();
-            destval = (*opcD1_long_operation[rh]) (destval, amt);
-            store_data_long(destoffset, destval);
-        } else {
-            u16 destval;
+	    DECODE_PRINTF("DWORD PTR ");
+	    destoffset = decode_rm00_address(rl);
+	    amt = fetch_byte_imm();
+	    DECODE_PRINTF2(",%x\n", amt);
+	    destval = fetch_data_long(destoffset);
+	    TRACE_AND_STEP();
+	    destval = (*opcD1_long_operation[rh]) (destval, amt);
+	    store_data_long(destoffset, destval);
+	} else {
+	    u16 destval;
 
-            DECODE_PRINTF("WORD PTR ");
-            destoffset = decode_rm00_address(rl);
-            amt = fetch_byte_imm();
-            DECODE_PRINTF2(",%x\n", amt);
-            destval = fetch_data_word(destoffset);
-            TRACE_AND_STEP();
-            destval = (*opcD1_word_operation[rh]) (destval, amt);
-            store_data_word(destoffset, destval);
-        }
-        break;
+	    DECODE_PRINTF("WORD PTR ");
+	    destoffset = decode_rm00_address(rl);
+	    amt = fetch_byte_imm();
+	    DECODE_PRINTF2(",%x\n", amt);
+	    destval = fetch_data_word(destoffset);
+	    TRACE_AND_STEP();
+	    destval = (*opcD1_word_operation[rh]) (destval, amt);
+	    store_data_word(destoffset, destval);
+	}
+	break;
     case 1:
-        if (M.x86.mode & SYSMODE_PREFIX_DATA) {
-            u32 destval;
+	if (M.x86.mode & SYSMODE_PREFIX_DATA) {
+	    u32 destval;
 
-            DECODE_PRINTF("DWORD PTR ");
-            destoffset = decode_rm01_address(rl);
-            amt = fetch_byte_imm();
-            DECODE_PRINTF2(",%x\n", amt);
-            destval = fetch_data_long(destoffset);
-            TRACE_AND_STEP();
-            destval = (*opcD1_long_operation[rh]) (destval, amt);
-            store_data_long(destoffset, destval);
-        } else {
-            u16 destval;
+	    DECODE_PRINTF("DWORD PTR ");
+	    destoffset = decode_rm01_address(rl);
+	    amt = fetch_byte_imm();
+	    DECODE_PRINTF2(",%x\n", amt);
+	    destval = fetch_data_long(destoffset);
+	    TRACE_AND_STEP();
+	    destval = (*opcD1_long_operation[rh]) (destval, amt);
+	    store_data_long(destoffset, destval);
+	} else {
+	    u16 destval;
 
-            DECODE_PRINTF("WORD PTR ");
-            destoffset = decode_rm01_address(rl);
-            amt = fetch_byte_imm();
-            DECODE_PRINTF2(",%x\n", amt);
-            destval = fetch_data_word(destoffset);
-            TRACE_AND_STEP();
-            destval = (*opcD1_word_operation[rh]) (destval, amt);
-            store_data_word(destoffset, destval);
-        }
-        break;
+	    DECODE_PRINTF("WORD PTR ");
+	    destoffset = decode_rm01_address(rl);
+	    amt = fetch_byte_imm();
+	    DECODE_PRINTF2(",%x\n", amt);
+	    destval = fetch_data_word(destoffset);
+	    TRACE_AND_STEP();
+	    destval = (*opcD1_word_operation[rh]) (destval, amt);
+	    store_data_word(destoffset, destval);
+	}
+	break;
     case 2:
-        if (M.x86.mode & SYSMODE_PREFIX_DATA) {
-            u32 destval;
+	if (M.x86.mode & SYSMODE_PREFIX_DATA) {
+	    u32 destval;
 
-            DECODE_PRINTF("DWORD PTR ");
-            destoffset = decode_rm10_address(rl);
-            amt = fetch_byte_imm();
-            DECODE_PRINTF2(",%x\n", amt);
-            destval = fetch_data_long(destoffset);
-            TRACE_AND_STEP();
-            destval = (*opcD1_long_operation[rh]) (destval, amt);
-            store_data_long(destoffset, destval);
-        } else {
-            u16 destval;
+	    DECODE_PRINTF("DWORD PTR ");
+	    destoffset = decode_rm10_address(rl);
+	    amt = fetch_byte_imm();
+	    DECODE_PRINTF2(",%x\n", amt);
+	    destval = fetch_data_long(destoffset);
+	    TRACE_AND_STEP();
+	    destval = (*opcD1_long_operation[rh]) (destval, amt);
+	    store_data_long(destoffset, destval);
+	} else {
+	    u16 destval;
 
-            DECODE_PRINTF("WORD PTR ");
-            destoffset = decode_rm10_address(rl);
-            amt = fetch_byte_imm();
-            DECODE_PRINTF2(",%x\n", amt);
-            destval = fetch_data_word(destoffset);
-            TRACE_AND_STEP();
-            destval = (*opcD1_word_operation[rh]) (destval, amt);
-            store_data_word(destoffset, destval);
-        }
-        break;
+	    DECODE_PRINTF("WORD PTR ");
+	    destoffset = decode_rm10_address(rl);
+	    amt = fetch_byte_imm();
+	    DECODE_PRINTF2(",%x\n", amt);
+	    destval = fetch_data_word(destoffset);
+	    TRACE_AND_STEP();
+	    destval = (*opcD1_word_operation[rh]) (destval, amt);
+	    store_data_word(destoffset, destval);
+	}
+	break;
     case 3:                     /* register to register */
-        if (M.x86.mode & SYSMODE_PREFIX_DATA) {
-            u32 *destreg;
+	if (M.x86.mode & SYSMODE_PREFIX_DATA) {
+	    u32 *destreg;
 
-            destreg = DECODE_RM_LONG_REGISTER(rl);
-            amt = fetch_byte_imm();
-            DECODE_PRINTF2(",%x\n", amt);
-            TRACE_AND_STEP();
-            *destreg = (*opcD1_long_operation[rh]) (*destreg, amt);
-        } else {
-            u16 *destreg;
+	    destreg = DECODE_RM_LONG_REGISTER(rl);
+	    amt = fetch_byte_imm();
+	    DECODE_PRINTF2(",%x\n", amt);
+	    TRACE_AND_STEP();
+	    *destreg = (*opcD1_long_operation[rh]) (*destreg, amt);
+	} else {
+	    u16 *destreg;
 
-            destreg = DECODE_RM_WORD_REGISTER(rl);
-            amt = fetch_byte_imm();
-            DECODE_PRINTF2(",%x\n", amt);
-            TRACE_AND_STEP();
-            *destreg = (*opcD1_word_operation[rh]) (*destreg, amt);
-        }
-        break;
+	    destreg = DECODE_RM_WORD_REGISTER(rl);
+	    amt = fetch_byte_imm();
+	    DECODE_PRINTF2(",%x\n", amt);
+	    TRACE_AND_STEP();
+	    *destreg = (*opcD1_word_operation[rh]) (*destreg, amt);
+	}
+	break;
     }
     DECODE_CLEAR_SEGOVR();
     END_OF_INSTR();
@@ -8479,35 +8479,35 @@
     FETCH_DECODE_MODRM(mod, rh, rl);
     switch (mod) {
     case 0:
-        dstreg = DECODE_RM_WORD_REGISTER(rh);
-        DECODE_PRINTF(",");
-        srcoffset = decode_rm00_address(rl);
-        DECODE_PRINTF("\n");
-        TRACE_AND_STEP();
-        *dstreg = fetch_data_word(srcoffset);
-        M.x86.R_ES = fetch_data_word(srcoffset + 2);
-        break;
+	dstreg = DECODE_RM_WORD_REGISTER(rh);
+	DECODE_PRINTF(",");
+	srcoffset = decode_rm00_address(rl);
+	DECODE_PRINTF("\n");
+	TRACE_AND_STEP();
+	*dstreg = fetch_data_word(srcoffset);
+	M.x86.R_ES = fetch_data_word(srcoffset + 2);
+	break;
     case 1:
-        dstreg = DECODE_RM_WORD_REGISTER(rh);
-        DECODE_PRINTF(",");
-        srcoffset = decode_rm01_address(rl);
-        DECODE_PRINTF("\n");
-        TRACE_AND_STEP();
-        *dstreg = fetch_data_word(srcoffset);
-        M.x86.R_ES = fetch_data_word(srcoffset + 2);
-        break;
+	dstreg = DECODE_RM_WORD_REGISTER(rh);
+	DECODE_PRINTF(",");
+	srcoffset = decode_rm01_address(rl);
+	DECODE_PRINTF("\n");
+	TRACE_AND_STEP();
+	*dstreg = fetch_data_word(srcoffset);
+	M.x86.R_ES = fetch_data_word(srcoffset + 2);
+	break;
     case 2:
-        dstreg = DECODE_RM_WORD_REGISTER(rh);
-        DECODE_PRINTF(",");
-        srcoffset = decode_rm10_address(rl);
-        DECODE_PRINTF("\n");
-        TRACE_AND_STEP();
-        *dstreg = fetch_data_word(srcoffset);
-        M.x86.R_ES = fetch_data_word(srcoffset + 2);
-        break;
+	dstreg = DECODE_RM_WORD_REGISTER(rh);
+	DECODE_PRINTF(",");
+	srcoffset = decode_rm10_address(rl);
+	DECODE_PRINTF("\n");
+	TRACE_AND_STEP();
+	*dstreg = fetch_data_word(srcoffset);
+	M.x86.R_ES = fetch_data_word(srcoffset + 2);
+	break;
     case 3:                     /* register to register */
-        /* UNDEFINED! */
-        TRACE_AND_STEP();
+	/* UNDEFINED! */
+	TRACE_AND_STEP();
     }
     DECODE_CLEAR_SEGOVR();
     END_OF_INSTR();
@@ -8528,35 +8528,35 @@
     FETCH_DECODE_MODRM(mod, rh, rl);
     switch (mod) {
     case 0:
-        dstreg = DECODE_RM_WORD_REGISTER(rh);
-        DECODE_PRINTF(",");
-        srcoffset = decode_rm00_address(rl);
-        DECODE_PRINTF("\n");
-        TRACE_AND_STEP();
-        *dstreg = fetch_data_word(srcoffset);
-        M.x86.R_DS = fetch_data_word(srcoffset + 2);
-        break;
+	dstreg = DECODE_RM_WORD_REGISTER(rh);
+	DECODE_PRINTF(",");
+	srcoffset = decode_rm00_address(rl);
+	DECODE_PRINTF("\n");
+	TRACE_AND_STEP();
+	*dstreg = fetch_data_word(srcoffset);
+	M.x86.R_DS = fetch_data_word(srcoffset + 2);
+	break;
     case 1:
-        dstreg = DECODE_RM_WORD_REGISTER(rh);
-        DECODE_PRINTF(",");
-        srcoffset = decode_rm01_address(rl);
-        DECODE_PRINTF("\n");
-        TRACE_AND_STEP();
-        *dstreg = fetch_data_word(srcoffset);
-        M.x86.R_DS = fetch_data_word(srcoffset + 2);
-        break;
+	dstreg = DECODE_RM_WORD_REGISTER(rh);
+	DECODE_PRINTF(",");
+	srcoffset = decode_rm01_address(rl);
+	DECODE_PRINTF("\n");
+	TRACE_AND_STEP();
+	*dstreg = fetch_data_word(srcoffset);
+	M.x86.R_DS = fetch_data_word(srcoffset + 2);
+	break;
     case 2:
-        dstreg = DECODE_RM_WORD_REGISTER(rh);
-        DECODE_PRINTF(",");
-        srcoffset = decode_rm10_address(rl);
-        DECODE_PRINTF("\n");
-        TRACE_AND_STEP();
-        *dstreg = fetch_data_word(srcoffset);
-        M.x86.R_DS = fetch_data_word(srcoffset + 2);
-        break;
+	dstreg = DECODE_RM_WORD_REGISTER(rh);
+	DECODE_PRINTF(",");
+	srcoffset = decode_rm10_address(rl);
+	DECODE_PRINTF("\n");
+	TRACE_AND_STEP();
+	*dstreg = fetch_data_word(srcoffset);
+	M.x86.R_DS = fetch_data_word(srcoffset + 2);
+	break;
     case 3:                     /* register to register */
-        /* UNDEFINED! */
-        TRACE_AND_STEP();
+	/* UNDEFINED! */
+	TRACE_AND_STEP();
     }
     DECODE_CLEAR_SEGOVR();
     END_OF_INSTR();
@@ -8577,41 +8577,41 @@
     DECODE_PRINTF("MOV\t");
     FETCH_DECODE_MODRM(mod, rh, rl);
     if (rh != 0) {
-        DECODE_PRINTF("ILLEGAL DECODE OF OPCODE c6\n");
-        HALT_SYS();
+	DECODE_PRINTF("ILLEGAL DECODE OF OPCODE c6\n");
+	HALT_SYS();
     }
     switch (mod) {
     case 0:
-        DECODE_PRINTF("BYTE PTR ");
-        destoffset = decode_rm00_address(rl);
-        imm = fetch_byte_imm();
-        DECODE_PRINTF2(",%2x\n", imm);
-        TRACE_AND_STEP();
-        store_data_byte(destoffset, imm);
-        break;
+	DECODE_PRINTF("BYTE PTR ");
+	destoffset = decode_rm00_address(rl);
+	imm = fetch_byte_imm();
+	DECODE_PRINTF2(",%2x\n", imm);
+	TRACE_AND_STEP();
+	store_data_byte(destoffset, imm);
+	break;
     case 1:
-        DECODE_PRINTF("BYTE PTR ");
-        destoffset = decode_rm01_address(rl);
-        imm = fetch_byte_imm();
-        DECODE_PRINTF2(",%2x\n", imm);
-        TRACE_AND_STEP();
-        store_data_byte(destoffset, imm);
-        break;
+	DECODE_PRINTF("BYTE PTR ");
+	destoffset = decode_rm01_address(rl);
+	imm = fetch_byte_imm();
+	DECODE_PRINTF2(",%2x\n", imm);
+	TRACE_AND_STEP();
+	store_data_byte(destoffset, imm);
+	break;
     case 2:
-        DECODE_PRINTF("BYTE PTR ");
-        destoffset = decode_rm10_address(rl);
-        imm = fetch_byte_imm();
-        DECODE_PRINTF2(",%2x\n", imm);
-        TRACE_AND_STEP();
-        store_data_byte(destoffset, imm);
-        break;
+	DECODE_PRINTF("BYTE PTR ");
+	destoffset = decode_rm10_address(rl);
+	imm = fetch_byte_imm();
+	DECODE_PRINTF2(",%2x\n", imm);
+	TRACE_AND_STEP();
+	store_data_byte(destoffset, imm);
+	break;
     case 3:                     /* register to register */
-        destreg = DECODE_RM_BYTE_REGISTER(rl);
-        imm = fetch_byte_imm();
-        DECODE_PRINTF2(",%2x\n", imm);
-        TRACE_AND_STEP();
-        *destreg = imm;
-        break;
+	destreg = DECODE_RM_BYTE_REGISTER(rl);
+	imm = fetch_byte_imm();
+	DECODE_PRINTF2(",%2x\n", imm);
+	TRACE_AND_STEP();
+	*destreg = imm;
+	break;
     }
     DECODE_CLEAR_SEGOVR();
     END_OF_INSTR();
@@ -8630,94 +8630,94 @@
     DECODE_PRINTF("MOV\t");
     FETCH_DECODE_MODRM(mod, rh, rl);
     if (rh != 0) {
-        DECODE_PRINTF("ILLEGAL DECODE OF OPCODE 8F\n");
-        HALT_SYS();
+	DECODE_PRINTF("ILLEGAL DECODE OF OPCODE 8F\n");
+	HALT_SYS();
     }
     switch (mod) {
     case 0:
-        if (M.x86.mode & SYSMODE_PREFIX_DATA) {
-            u32 imm;
+	if (M.x86.mode & SYSMODE_PREFIX_DATA) {
+	    u32 imm;
 
-            DECODE_PRINTF("DWORD PTR ");
-            destoffset = decode_rm00_address(rl);
-            imm = fetch_long_imm();
-            DECODE_PRINTF2(",%x\n", imm);
-            TRACE_AND_STEP();
-            store_data_long(destoffset, imm);
-        } else {
-            u16 imm;
+	    DECODE_PRINTF("DWORD PTR ");
+	    destoffset = decode_rm00_address(rl);
+	    imm = fetch_long_imm();
+	    DECODE_PRINTF2(",%x\n", imm);
+	    TRACE_AND_STEP();
+	    store_data_long(destoffset, imm);
+	} else {
+	    u16 imm;
 
-            DECODE_PRINTF("WORD PTR ");
-            destoffset = decode_rm00_address(rl);
-            imm = fetch_word_imm();
-            DECODE_PRINTF2(",%x\n", imm);
-            TRACE_AND_STEP();
-            store_data_word(destoffset, imm);
-        }
-        break;
+	    DECODE_PRINTF("WORD PTR ");
+	    destoffset = decode_rm00_address(rl);
+	    imm = fetch_word_imm();
+	    DECODE_PRINTF2(",%x\n", imm);
+	    TRACE_AND_STEP();
+	    store_data_word(destoffset, imm);
+	}
+	break;
     case 1:
-        if (M.x86.mode & SYSMODE_PREFIX_DATA) {
-            u32 imm;
+	if (M.x86.mode & SYSMODE_PREFIX_DATA) {
+	    u32 imm;
 
-            DECODE_PRINTF("DWORD PTR ");
-            destoffset = decode_rm01_address(rl);
-            imm = fetch_long_imm();
-            DECODE_PRINTF2(",%x\n", imm);
-            TRACE_AND_STEP();
-            store_data_long(destoffset, imm);
-        } else {
-            u16 imm;
+	    DECODE_PRINTF("DWORD PTR ");
+	    destoffset = decode_rm01_address(rl);
+	    imm = fetch_long_imm();
+	    DECODE_PRINTF2(",%x\n", imm);
+	    TRACE_AND_STEP();
+	    store_data_long(destoffset, imm);
+	} else {
+	    u16 imm;
 
-            DECODE_PRINTF("WORD PTR ");
-            destoffset = decode_rm01_address(rl);
-            imm = fetch_word_imm();
-            DECODE_PRINTF2(",%x\n", imm);
-            TRACE_AND_STEP();
-            store_data_word(destoffset, imm);
-        }
-        break;
+	    DECODE_PRINTF("WORD PTR ");
+	    destoffset = decode_rm01_address(rl);
+	    imm = fetch_word_imm();
+	    DECODE_PRINTF2(",%x\n", imm);
+	    TRACE_AND_STEP();
+	    store_data_word(destoffset, imm);
+	}
+	break;
     case 2:
-        if (M.x86.mode & SYSMODE_PREFIX_DATA) {
-            u32 imm;
+	if (M.x86.mode & SYSMODE_PREFIX_DATA) {
+	    u32 imm;
 
-            DECODE_PRINTF("DWORD PTR ");
-            destoffset = decode_rm10_address(rl);
-            imm = fetch_long_imm();
-            DECODE_PRINTF2(",%x\n", imm);
-            TRACE_AND_STEP();
-            store_data_long(destoffset, imm);
-        } else {
-            u16 imm;
+	    DECODE_PRINTF("DWORD PTR ");
+	    destoffset = decode_rm10_address(rl);
+	    imm = fetch_long_imm();
+	    DECODE_PRINTF2(",%x\n", imm);
+	    TRACE_AND_STEP();
+	    store_data_long(destoffset, imm);
+	} else {
+	    u16 imm;
 
-            DECODE_PRINTF("WORD PTR ");
-            destoffset = decode_rm10_address(rl);
-            imm = fetch_word_imm();
-            DECODE_PRINTF2(",%x\n", imm);
-            TRACE_AND_STEP();
-            store_data_word(destoffset, imm);
-        }
-        break;
+	    DECODE_PRINTF("WORD PTR ");
+	    destoffset = decode_rm10_address(rl);
+	    imm = fetch_word_imm();
+	    DECODE_PRINTF2(",%x\n", imm);
+	    TRACE_AND_STEP();
+	    store_data_word(destoffset, imm);
+	}
+	break;
     case 3:                     /* register to register */
-        if (M.x86.mode & SYSMODE_PREFIX_DATA) {
+	if (M.x86.mode & SYSMODE_PREFIX_DATA) {
 			u32 *destreg;
 			u32 imm;
 
-            destreg = DECODE_RM_LONG_REGISTER(rl);
-            imm = fetch_long_imm();
-            DECODE_PRINTF2(",%x\n", imm);
-            TRACE_AND_STEP();
-            *destreg = imm;
-        } else {
+	    destreg = DECODE_RM_LONG_REGISTER(rl);
+	    imm = fetch_long_imm();
+	    DECODE_PRINTF2(",%x\n", imm);
+	    TRACE_AND_STEP();
+	    *destreg = imm;
+	} else {
 			u16 *destreg;
 			u16 imm;
 
-            destreg = DECODE_RM_WORD_REGISTER(rl);
-            imm = fetch_word_imm();
-            DECODE_PRINTF2(",%x\n", imm);
-            TRACE_AND_STEP();
-            *destreg = imm;
-        }
-        break;
+	    destreg = DECODE_RM_WORD_REGISTER(rl);
+	    imm = fetch_word_imm();
+	    DECODE_PRINTF2(",%x\n", imm);
+	    TRACE_AND_STEP();
+	    *destreg = imm;
+	}
+	break;
     }
     DECODE_CLEAR_SEGOVR();
     END_OF_INSTR();
@@ -8742,12 +8742,12 @@
     push_word(M.x86.R_BP);
     frame_pointer = M.x86.R_SP;
     if (nesting > 0) {
-        for (i = 1; i < nesting; i++) {
-            M.x86.R_BP -= 2;
-            push_word(fetch_data_word_abs(M.x86.R_SS, M.x86.R_BP));
-            }
-        push_word(frame_pointer);
-        }
+	for (i = 1; i < nesting; i++) {
+	    M.x86.R_BP -= 2;
+	    push_word(fetch_data_word_abs(M.x86.R_SS, M.x86.R_BP));
+	    }
+	push_word(frame_pointer);
+	}
     M.x86.R_BP = frame_pointer;
     M.x86.R_SP = (u16)(M.x86.R_SP - local);
     DECODE_CLEAR_SEGOVR();
@@ -8822,13 +8822,13 @@
 	if (_X86EMU_intrTab[3]) {
 		(*_X86EMU_intrTab[3])(3);
     } else {
-        push_word((u16)M.x86.R_FLG);
-        CLEAR_FLAG(F_IF);
-        CLEAR_FLAG(F_TF);
-        push_word(M.x86.R_CS);
-        M.x86.R_CS = mem_access_word(3 * 4 + 2);
-        push_word(M.x86.R_IP);
-        M.x86.R_IP = mem_access_word(3 * 4);
+	push_word((u16)M.x86.R_FLG);
+	CLEAR_FLAG(F_IF);
+	CLEAR_FLAG(F_TF);
+	push_word(M.x86.R_CS);
+	M.x86.R_CS = mem_access_word(3 * 4 + 2);
+	push_word(M.x86.R_IP);
+	M.x86.R_IP = mem_access_word(3 * 4);
     }
     DECODE_CLEAR_SEGOVR();
     END_OF_INSTR();
@@ -8852,13 +8852,13 @@
 	if (_X86EMU_intrTab[intnum]) {
 		(*_X86EMU_intrTab[intnum])(intnum);
     } else {
-        push_word((u16)M.x86.R_FLG);
-        CLEAR_FLAG(F_IF);
-        CLEAR_FLAG(F_TF);
-        push_word(M.x86.R_CS);
-        M.x86.R_CS = mem_access_word(intnum * 4 + 2);
-        push_word(M.x86.R_IP);
-        M.x86.R_IP = mem_access_word(intnum * 4);
+	push_word((u16)M.x86.R_FLG);
+	CLEAR_FLAG(F_IF);
+	CLEAR_FLAG(F_TF);
+	push_word(M.x86.R_CS);
+	M.x86.R_CS = mem_access_word(intnum * 4 + 2);
+	push_word(M.x86.R_IP);
+	M.x86.R_IP = mem_access_word(intnum * 4);
     }
     DECODE_CLEAR_SEGOVR();
     END_OF_INSTR();
@@ -8876,18 +8876,18 @@
     DECODE_PRINTF("INTO\n");
     TRACE_AND_STEP();
     if (ACCESS_FLAG(F_OF)) {
-        tmp = mem_access_word(4 * 4 + 2);
+	tmp = mem_access_word(4 * 4 + 2);
 		if (_X86EMU_intrTab[4]) {
 			(*_X86EMU_intrTab[4])(4);
-        } else {
-            push_word((u16)M.x86.R_FLG);
-            CLEAR_FLAG(F_IF);
-            CLEAR_FLAG(F_TF);
-            push_word(M.x86.R_CS);
-            M.x86.R_CS = mem_access_word(4 * 4 + 2);
-            push_word(M.x86.R_IP);
-            M.x86.R_IP = mem_access_word(4 * 4);
-        }
+	} else {
+	    push_word((u16)M.x86.R_FLG);
+	    CLEAR_FLAG(F_IF);
+	    CLEAR_FLAG(F_TF);
+	    push_word(M.x86.R_CS);
+	    M.x86.R_CS = mem_access_word(4 * 4 + 2);
+	    push_word(M.x86.R_IP);
+	    M.x86.R_IP = mem_access_word(4 * 4);
+	}
     }
     DECODE_CLEAR_SEGOVR();
     END_OF_INSTR();
@@ -8931,75 +8931,75 @@
     FETCH_DECODE_MODRM(mod, rh, rl);
 #ifdef DEBUG
     if (DEBUG_DECODE()) {
-        /* XXX DECODE_PRINTF may be changed to something more
-           general, so that it is important to leave the strings
-           in the same format, even though the result is that the
-           above test is done twice. */
-        switch (rh) {
-        case 0:
-            DECODE_PRINTF("ROL\t");
-            break;
-        case 1:
-            DECODE_PRINTF("ROR\t");
-            break;
-        case 2:
-            DECODE_PRINTF("RCL\t");
-            break;
-        case 3:
-            DECODE_PRINTF("RCR\t");
-            break;
-        case 4:
-            DECODE_PRINTF("SHL\t");
-            break;
-        case 5:
-            DECODE_PRINTF("SHR\t");
-            break;
-        case 6:
-            DECODE_PRINTF("SAL\t");
-            break;
-        case 7:
-            DECODE_PRINTF("SAR\t");
-            break;
-        }
+	/* XXX DECODE_PRINTF may be changed to something more
+	   general, so that it is important to leave the strings
+	   in the same format, even though the result is that the
+	   above test is done twice. */
+	switch (rh) {
+	case 0:
+	    DECODE_PRINTF("ROL\t");
+	    break;
+	case 1:
+	    DECODE_PRINTF("ROR\t");
+	    break;
+	case 2:
+	    DECODE_PRINTF("RCL\t");
+	    break;
+	case 3:
+	    DECODE_PRINTF("RCR\t");
+	    break;
+	case 4:
+	    DECODE_PRINTF("SHL\t");
+	    break;
+	case 5:
+	    DECODE_PRINTF("SHR\t");
+	    break;
+	case 6:
+	    DECODE_PRINTF("SAL\t");
+	    break;
+	case 7:
+	    DECODE_PRINTF("SAR\t");
+	    break;
+	}
     }
 #endif
     /* know operation, decode the mod byte to find the addressing
        mode. */
     switch (mod) {
     case 0:
-        DECODE_PRINTF("BYTE PTR ");
-        destoffset = decode_rm00_address(rl);
-        DECODE_PRINTF(",1\n");
-        destval = fetch_data_byte(destoffset);
-        TRACE_AND_STEP();
-        destval = (*opcD0_byte_operation[rh]) (destval, 1);
-        store_data_byte(destoffset, destval);
-        break;
+	DECODE_PRINTF("BYTE PTR ");
+	destoffset = decode_rm00_address(rl);
+	DECODE_PRINTF(",1\n");
+	destval = fetch_data_byte(destoffset);
+	TRACE_AND_STEP();
+	destval = (*opcD0_byte_operation[rh]) (destval, 1);
+	store_data_byte(destoffset, destval);
+	break;
     case 1:
-        DECODE_PRINTF("BYTE PTR ");
-        destoffset = decode_rm01_address(rl);
-        DECODE_PRINTF(",1\n");
-        destval = fetch_data_byte(destoffset);
-        TRACE_AND_STEP();
-        destval = (*opcD0_byte_operation[rh]) (destval, 1);
-        store_data_byte(destoffset, destval);
-        break;
+	DECODE_PRINTF("BYTE PTR ");
+	destoffset = decode_rm01_address(rl);
+	DECODE_PRINTF(",1\n");
+	destval = fetch_data_byte(destoffset);
+	TRACE_AND_STEP();
+	destval = (*opcD0_byte_operation[rh]) (destval, 1);
+	store_data_byte(destoffset, destval);
+	break;
     case 2:
-        DECODE_PRINTF("BYTE PTR ");
-        destoffset = decode_rm10_address(rl);
-        DECODE_PRINTF(",1\n");
-        destval = fetch_data_byte(destoffset);
-        TRACE_AND_STEP();
-        destval = (*opcD0_byte_operation[rh]) (destval, 1);
-        store_data_byte(destoffset, destval);
-        break;
+	DECODE_PRINTF("BYTE PTR ");
+	destoffset = decode_rm10_address(rl);
+	DECODE_PRINTF(",1\n");
+	destval = fetch_data_byte(destoffset);
+	TRACE_AND_STEP();
+	destval = (*opcD0_byte_operation[rh]) (destval, 1);
+	store_data_byte(destoffset, destval);
+	break;
     case 3:                     /* register to register */
-        destreg = DECODE_RM_BYTE_REGISTER(rl);
-        DECODE_PRINTF(",1\n");
-        TRACE_AND_STEP();
-        destval = (*opcD0_byte_operation[rh]) (*destreg, 1);
-        *destreg = destval;
-        break;
+	destreg = DECODE_RM_BYTE_REGISTER(rl);
+	DECODE_PRINTF(",1\n");
+	TRACE_AND_STEP();
+	destval = (*opcD0_byte_operation[rh]) (*destreg, 1);
+	*destreg = destval;
+	break;
     }
     DECODE_CLEAR_SEGOVR();
     END_OF_INSTR();
@@ -9023,131 +9023,131 @@
     FETCH_DECODE_MODRM(mod, rh, rl);
 #ifdef DEBUG
     if (DEBUG_DECODE()) {
-        /* XXX DECODE_PRINTF may be changed to something more
-           general, so that it is important to leave the strings
-           in the same format, even though the result is that the
-           above test is done twice. */
-        switch (rh) {
-        case 0:
-            DECODE_PRINTF("ROL\t");
-            break;
-        case 1:
-            DECODE_PRINTF("ROR\t");
-            break;
-        case 2:
-            DECODE_PRINTF("RCL\t");
-            break;
-        case 3:
-            DECODE_PRINTF("RCR\t");
-            break;
-        case 4:
-            DECODE_PRINTF("SHL\t");
-            break;
-        case 5:
-            DECODE_PRINTF("SHR\t");
-            break;
-        case 6:
-            DECODE_PRINTF("SAL\t");
-            break;
-        case 7:
-            DECODE_PRINTF("SAR\t");
-            break;
-        }
+	/* XXX DECODE_PRINTF may be changed to something more
+	   general, so that it is important to leave the strings
+	   in the same format, even though the result is that the
+	   above test is done twice. */
+	switch (rh) {
+	case 0:
+	    DECODE_PRINTF("ROL\t");
+	    break;
+	case 1:
+	    DECODE_PRINTF("ROR\t");
+	    break;
+	case 2:
+	    DECODE_PRINTF("RCL\t");
+	    break;
+	case 3:
+	    DECODE_PRINTF("RCR\t");
+	    break;
+	case 4:
+	    DECODE_PRINTF("SHL\t");
+	    break;
+	case 5:
+	    DECODE_PRINTF("SHR\t");
+	    break;
+	case 6:
+	    DECODE_PRINTF("SAL\t");
+	    break;
+	case 7:
+	    DECODE_PRINTF("SAR\t");
+	    break;
+	}
     }
 #endif
     /* know operation, decode the mod byte to find the addressing
        mode. */
     switch (mod) {
     case 0:
-        if (M.x86.mode & SYSMODE_PREFIX_DATA) {
-            u32 destval;
+	if (M.x86.mode & SYSMODE_PREFIX_DATA) {
+	    u32 destval;
 
-            DECODE_PRINTF("DWORD PTR ");
-            destoffset = decode_rm00_address(rl);
-            DECODE_PRINTF(",1\n");
-            destval = fetch_data_long(destoffset);
-            TRACE_AND_STEP();
-            destval = (*opcD1_long_operation[rh]) (destval, 1);
-            store_data_long(destoffset, destval);
-        } else {
-            u16 destval;
+	    DECODE_PRINTF("DWORD PTR ");
+	    destoffset = decode_rm00_address(rl);
+	    DECODE_PRINTF(",1\n");
+	    destval = fetch_data_long(destoffset);
+	    TRACE_AND_STEP();
+	    destval = (*opcD1_long_operation[rh]) (destval, 1);
+	    store_data_long(destoffset, destval);
+	} else {
+	    u16 destval;
 
-            DECODE_PRINTF("WORD PTR ");
-            destoffset = decode_rm00_address(rl);
-            DECODE_PRINTF(",1\n");
-            destval = fetch_data_word(destoffset);
-            TRACE_AND_STEP();
-            destval = (*opcD1_word_operation[rh]) (destval, 1);
-            store_data_word(destoffset, destval);
-        }
-        break;
+	    DECODE_PRINTF("WORD PTR ");
+	    destoffset = decode_rm00_address(rl);
+	    DECODE_PRINTF(",1\n");
+	    destval = fetch_data_word(destoffset);
+	    TRACE_AND_STEP();
+	    destval = (*opcD1_word_operation[rh]) (destval, 1);
+	    store_data_word(destoffset, destval);
+	}
+	break;
     case 1:
-        if (M.x86.mode & SYSMODE_PREFIX_DATA) {
-            u32 destval;
+	if (M.x86.mode & SYSMODE_PREFIX_DATA) {
+	    u32 destval;
 
-            DECODE_PRINTF("DWORD PTR ");
-            destoffset = decode_rm01_address(rl);
-            DECODE_PRINTF(",1\n");
-            destval = fetch_data_long(destoffset);
-            TRACE_AND_STEP();
-            destval = (*opcD1_long_operation[rh]) (destval, 1);
-            store_data_long(destoffset, destval);
-        } else {
-            u16 destval;
+	    DECODE_PRINTF("DWORD PTR ");
+	    destoffset = decode_rm01_address(rl);
+	    DECODE_PRINTF(",1\n");
+	    destval = fetch_data_long(destoffset);
+	    TRACE_AND_STEP();
+	    destval = (*opcD1_long_operation[rh]) (destval, 1);
+	    store_data_long(destoffset, destval);
+	} else {
+	    u16 destval;
 
-            DECODE_PRINTF("WORD PTR ");
-            destoffset = decode_rm01_address(rl);
-            DECODE_PRINTF(",1\n");
-            destval = fetch_data_word(destoffset);
-            TRACE_AND_STEP();
-            destval = (*opcD1_word_operation[rh]) (destval, 1);
-            store_data_word(destoffset, destval);
-        }
-        break;
+	    DECODE_PRINTF("WORD PTR ");
+	    destoffset = decode_rm01_address(rl);
+	    DECODE_PRINTF(",1\n");
+	    destval = fetch_data_word(destoffset);
+	    TRACE_AND_STEP();
+	    destval = (*opcD1_word_operation[rh]) (destval, 1);
+	    store_data_word(destoffset, destval);
+	}
+	break;
     case 2:
-        if (M.x86.mode & SYSMODE_PREFIX_DATA) {
-            u32 destval;
+	if (M.x86.mode & SYSMODE_PREFIX_DATA) {
+	    u32 destval;
 
-            DECODE_PRINTF("DWORD PTR ");
-            destoffset = decode_rm10_address(rl);
-            DECODE_PRINTF(",1\n");
-            destval = fetch_data_long(destoffset);
-            TRACE_AND_STEP();
-            destval = (*opcD1_long_operation[rh]) (destval, 1);
-            store_data_long(destoffset, destval);
-        } else {
-            u16 destval;
+	    DECODE_PRINTF("DWORD PTR ");
+	    destoffset = decode_rm10_address(rl);
+	    DECODE_PRINTF(",1\n");
+	    destval = fetch_data_long(destoffset);
+	    TRACE_AND_STEP();
+	    destval = (*opcD1_long_operation[rh]) (destval, 1);
+	    store_data_long(destoffset, destval);
+	} else {
+	    u16 destval;
 
-            DECODE_PRINTF("BYTE PTR ");
-            destoffset = decode_rm10_address(rl);
-            DECODE_PRINTF(",1\n");
-            destval = fetch_data_word(destoffset);
-            TRACE_AND_STEP();
-            destval = (*opcD1_word_operation[rh]) (destval, 1);
-            store_data_word(destoffset, destval);
-        }
-        break;
+	    DECODE_PRINTF("BYTE PTR ");
+	    destoffset = decode_rm10_address(rl);
+	    DECODE_PRINTF(",1\n");
+	    destval = fetch_data_word(destoffset);
+	    TRACE_AND_STEP();
+	    destval = (*opcD1_word_operation[rh]) (destval, 1);
+	    store_data_word(destoffset, destval);
+	}
+	break;
     case 3:                     /* register to register */
-        if (M.x86.mode & SYSMODE_PREFIX_DATA) {
+	if (M.x86.mode & SYSMODE_PREFIX_DATA) {
 			u32 destval;
 			u32 *destreg;
 
-            destreg = DECODE_RM_LONG_REGISTER(rl);
-            DECODE_PRINTF(",1\n");
-            TRACE_AND_STEP();
-            destval = (*opcD1_long_operation[rh]) (*destreg, 1);
-            *destreg = destval;
-        } else {
+	    destreg = DECODE_RM_LONG_REGISTER(rl);
+	    DECODE_PRINTF(",1\n");
+	    TRACE_AND_STEP();
+	    destval = (*opcD1_long_operation[rh]) (*destreg, 1);
+	    *destreg = destval;
+	} else {
 			u16 destval;
 			u16 *destreg;
 
-            destreg = DECODE_RM_WORD_REGISTER(rl);
-            DECODE_PRINTF(",1\n");
-            TRACE_AND_STEP();
-            destval = (*opcD1_word_operation[rh]) (*destreg, 1);
-            *destreg = destval;
-        }
-        break;
+	    destreg = DECODE_RM_WORD_REGISTER(rl);
+	    DECODE_PRINTF(",1\n");
+	    TRACE_AND_STEP();
+	    destval = (*opcD1_word_operation[rh]) (*destreg, 1);
+	    *destreg = destval;
+	}
+	break;
     }
     DECODE_CLEAR_SEGOVR();
     END_OF_INSTR();
@@ -9174,36 +9174,36 @@
     FETCH_DECODE_MODRM(mod, rh, rl);
 #ifdef DEBUG
     if (DEBUG_DECODE()) {
-        /* XXX DECODE_PRINTF may be changed to something more
-           general, so that it is important to leave the strings
-           in the same format, even though the result is that the 
-           above test is done twice. */
-        switch (rh) {
-        case 0:
-            DECODE_PRINTF("ROL\t");
-            break;
-        case 1:
-            DECODE_PRINTF("ROR\t");
-            break;
-        case 2:
-            DECODE_PRINTF("RCL\t");
-            break;
-        case 3:
-            DECODE_PRINTF("RCR\t");
-            break;
-        case 4:
-            DECODE_PRINTF("SHL\t");
-            break;
-        case 5:
-            DECODE_PRINTF("SHR\t");
-            break;
-        case 6:
-            DECODE_PRINTF("SAL\t");
-            break;
-        case 7:
-            DECODE_PRINTF("SAR\t");
-            break;
-        }
+	/* XXX DECODE_PRINTF may be changed to something more
+	   general, so that it is important to leave the strings
+	   in the same format, even though the result is that the
+	   above test is done twice. */
+	switch (rh) {
+	case 0:
+	    DECODE_PRINTF("ROL\t");
+	    break;
+	case 1:
+	    DECODE_PRINTF("ROR\t");
+	    break;
+	case 2:
+	    DECODE_PRINTF("RCL\t");
+	    break;
+	case 3:
+	    DECODE_PRINTF("RCR\t");
+	    break;
+	case 4:
+	    DECODE_PRINTF("SHL\t");
+	    break;
+	case 5:
+	    DECODE_PRINTF("SHR\t");
+	    break;
+	case 6:
+	    DECODE_PRINTF("SAL\t");
+	    break;
+	case 7:
+	    DECODE_PRINTF("SAR\t");
+	    break;
+	}
     }
 #endif
     /* know operation, decode the mod byte to find the addressing
@@ -9211,39 +9211,39 @@
     amt = M.x86.R_CL;
     switch (mod) {
     case 0:
-        DECODE_PRINTF("BYTE PTR ");
-        destoffset = decode_rm00_address(rl);
-        DECODE_PRINTF(",CL\n");
-        destval = fetch_data_byte(destoffset);
-        TRACE_AND_STEP();
-        destval = (*opcD0_byte_operation[rh]) (destval, amt);
-        store_data_byte(destoffset, destval);
-        break;
+	DECODE_PRINTF("BYTE PTR ");
+	destoffset = decode_rm00_address(rl);
+	DECODE_PRINTF(",CL\n");
+	destval = fetch_data_byte(destoffset);
+	TRACE_AND_STEP();
+	destval = (*opcD0_byte_operation[rh]) (destval, amt);
+	store_data_byte(destoffset, destval);
+	break;
     case 1:
-        DECODE_PRINTF("BYTE PTR ");
-        destoffset = decode_rm01_address(rl);
-        DECODE_PRINTF(",CL\n");
-        destval = fetch_data_byte(destoffset);
-        TRACE_AND_STEP();
-        destval = (*opcD0_byte_operation[rh]) (destval, amt);
-        store_data_byte(destoffset, destval);
-        break;
+	DECODE_PRINTF("BYTE PTR ");
+	destoffset = decode_rm01_address(rl);
+	DECODE_PRINTF(",CL\n");
+	destval = fetch_data_byte(destoffset);
+	TRACE_AND_STEP();
+	destval = (*opcD0_byte_operation[rh]) (destval, amt);
+	store_data_byte(destoffset, destval);
+	break;
     case 2:
-        DECODE_PRINTF("BYTE PTR ");
-        destoffset = decode_rm10_address(rl);
-        DECODE_PRINTF(",CL\n");
-        destval = fetch_data_byte(destoffset);
-        TRACE_AND_STEP();
-        destval = (*opcD0_byte_operation[rh]) (destval, amt);
-        store_data_byte(destoffset, destval);
-        break;
+	DECODE_PRINTF("BYTE PTR ");
+	destoffset = decode_rm10_address(rl);
+	DECODE_PRINTF(",CL\n");
+	destval = fetch_data_byte(destoffset);
+	TRACE_AND_STEP();
+	destval = (*opcD0_byte_operation[rh]) (destval, amt);
+	store_data_byte(destoffset, destval);
+	break;
     case 3:                     /* register to register */
-        destreg = DECODE_RM_BYTE_REGISTER(rl);
-        DECODE_PRINTF(",CL\n");
-        TRACE_AND_STEP();
-        destval = (*opcD0_byte_operation[rh]) (*destreg, amt);
-        *destreg = destval;
-        break;
+	destreg = DECODE_RM_BYTE_REGISTER(rl);
+	DECODE_PRINTF(",CL\n");
+	TRACE_AND_STEP();
+	destval = (*opcD0_byte_operation[rh]) (*destreg, amt);
+	*destreg = destval;
+	break;
     }
     DECODE_CLEAR_SEGOVR();
     END_OF_INSTR();
@@ -9268,36 +9268,36 @@
     FETCH_DECODE_MODRM(mod, rh, rl);
 #ifdef DEBUG
     if (DEBUG_DECODE()) {
-        /* XXX DECODE_PRINTF may be changed to something more
-           general, so that it is important to leave the strings
-           in the same format, even though the result is that the 
-           above test is done twice. */
-        switch (rh) {
-        case 0:
-            DECODE_PRINTF("ROL\t");
-            break;
-        case 1:
-            DECODE_PRINTF("ROR\t");
-            break;
-        case 2:
-            DECODE_PRINTF("RCL\t");
-            break;
-        case 3:
-            DECODE_PRINTF("RCR\t");
-            break;
-        case 4:
-            DECODE_PRINTF("SHL\t");
-            break;
-        case 5:
-            DECODE_PRINTF("SHR\t");
-            break;
-        case 6:
-            DECODE_PRINTF("SAL\t");
-            break;
-        case 7:
-            DECODE_PRINTF("SAR\t");
-            break;
-        }
+	/* XXX DECODE_PRINTF may be changed to something more
+	   general, so that it is important to leave the strings
+	   in the same format, even though the result is that the
+	   above test is done twice. */
+	switch (rh) {
+	case 0:
+	    DECODE_PRINTF("ROL\t");
+	    break;
+	case 1:
+	    DECODE_PRINTF("ROR\t");
+	    break;
+	case 2:
+	    DECODE_PRINTF("RCL\t");
+	    break;
+	case 3:
+	    DECODE_PRINTF("RCR\t");
+	    break;
+	case 4:
+	    DECODE_PRINTF("SHL\t");
+	    break;
+	case 5:
+	    DECODE_PRINTF("SHR\t");
+	    break;
+	case 6:
+	    DECODE_PRINTF("SAL\t");
+	    break;
+	case 7:
+	    DECODE_PRINTF("SAR\t");
+	    break;
+	}
     }
 #endif
     /* know operation, decode the mod byte to find the addressing
@@ -9305,91 +9305,91 @@
     amt = M.x86.R_CL;
     switch (mod) {
     case 0:
-        if (M.x86.mode & SYSMODE_PREFIX_DATA) {
-            u32 destval;
+	if (M.x86.mode & SYSMODE_PREFIX_DATA) {
+	    u32 destval;
 
-            DECODE_PRINTF("DWORD PTR ");
-            destoffset = decode_rm00_address(rl);
-            DECODE_PRINTF(",CL\n");
-            destval = fetch_data_long(destoffset);
-            TRACE_AND_STEP();
-            destval = (*opcD1_long_operation[rh]) (destval, amt);
-            store_data_long(destoffset, destval);
-        } else {
-            u16 destval;
+	    DECODE_PRINTF("DWORD PTR ");
+	    destoffset = decode_rm00_address(rl);
+	    DECODE_PRINTF(",CL\n");
+	    destval = fetch_data_long(destoffset);
+	    TRACE_AND_STEP();
+	    destval = (*opcD1_long_operation[rh]) (destval, amt);
+	    store_data_long(destoffset, destval);
+	} else {
+	    u16 destval;
 
-            DECODE_PRINTF("WORD PTR ");
-            destoffset = decode_rm00_address(rl);
-            DECODE_PRINTF(",CL\n");
-            destval = fetch_data_word(destoffset);
-            TRACE_AND_STEP();
-            destval = (*opcD1_word_operation[rh]) (destval, amt);
-            store_data_word(destoffset, destval);
-        }
-        break;
+	    DECODE_PRINTF("WORD PTR ");
+	    destoffset = decode_rm00_address(rl);
+	    DECODE_PRINTF(",CL\n");
+	    destval = fetch_data_word(destoffset);
+	    TRACE_AND_STEP();
+	    destval = (*opcD1_word_operation[rh]) (destval, amt);
+	    store_data_word(destoffset, destval);
+	}
+	break;
     case 1:
-        if (M.x86.mode & SYSMODE_PREFIX_DATA) {
-            u32 destval;
+	if (M.x86.mode & SYSMODE_PREFIX_DATA) {
+	    u32 destval;
 
-            DECODE_PRINTF("DWORD PTR ");
-            destoffset = decode_rm01_address(rl);
-            DECODE_PRINTF(",CL\n");
-            destval = fetch_data_long(destoffset);
-            TRACE_AND_STEP();
-            destval = (*opcD1_long_operation[rh]) (destval, amt);
-            store_data_long(destoffset, destval);
-        } else {
-            u16 destval;
+	    DECODE_PRINTF("DWORD PTR ");
+	    destoffset = decode_rm01_address(rl);
+	    DECODE_PRINTF(",CL\n");
+	    destval = fetch_data_long(destoffset);
+	    TRACE_AND_STEP();
+	    destval = (*opcD1_long_operation[rh]) (destval, amt);
+	    store_data_long(destoffset, destval);
+	} else {
+	    u16 destval;
 
-            DECODE_PRINTF("WORD PTR ");
-            destoffset = decode_rm01_address(rl);
-            DECODE_PRINTF(",CL\n");
-            destval = fetch_data_word(destoffset);
-            TRACE_AND_STEP();
-            destval = (*opcD1_word_operation[rh]) (destval, amt);
-            store_data_word(destoffset, destval);
-        }
-        break;
+	    DECODE_PRINTF("WORD PTR ");
+	    destoffset = decode_rm01_address(rl);
+	    DECODE_PRINTF(",CL\n");
+	    destval = fetch_data_word(destoffset);
+	    TRACE_AND_STEP();
+	    destval = (*opcD1_word_operation[rh]) (destval, amt);
+	    store_data_word(destoffset, destval);
+	}
+	break;
     case 2:
-        if (M.x86.mode & SYSMODE_PREFIX_DATA) {
-            u32 destval;
+	if (M.x86.mode & SYSMODE_PREFIX_DATA) {
+	    u32 destval;
 
-            DECODE_PRINTF("DWORD PTR ");
-            destoffset = decode_rm10_address(rl);
-            DECODE_PRINTF(",CL\n");
-            destval = fetch_data_long(destoffset);
-            TRACE_AND_STEP();
-            destval = (*opcD1_long_operation[rh]) (destval, amt);
-            store_data_long(destoffset, destval);
-        } else {
-            u16 destval;
+	    DECODE_PRINTF("DWORD PTR ");
+	    destoffset = decode_rm10_address(rl);
+	    DECODE_PRINTF(",CL\n");
+	    destval = fetch_data_long(destoffset);
+	    TRACE_AND_STEP();
+	    destval = (*opcD1_long_operation[rh]) (destval, amt);
+	    store_data_long(destoffset, destval);
+	} else {
+	    u16 destval;
 
-            DECODE_PRINTF("WORD PTR ");
-            destoffset = decode_rm10_address(rl);
-            DECODE_PRINTF(",CL\n");
-            destval = fetch_data_word(destoffset);
-            TRACE_AND_STEP();
-            destval = (*opcD1_word_operation[rh]) (destval, amt);
-            store_data_word(destoffset, destval);
-        }
-        break;
+	    DECODE_PRINTF("WORD PTR ");
+	    destoffset = decode_rm10_address(rl);
+	    DECODE_PRINTF(",CL\n");
+	    destval = fetch_data_word(destoffset);
+	    TRACE_AND_STEP();
+	    destval = (*opcD1_word_operation[rh]) (destval, amt);
+	    store_data_word(destoffset, destval);
+	}
+	break;
     case 3:                     /* register to register */
-        if (M.x86.mode & SYSMODE_PREFIX_DATA) {
-            u32 *destreg;
+	if (M.x86.mode & SYSMODE_PREFIX_DATA) {
+	    u32 *destreg;
 
-            destreg = DECODE_RM_LONG_REGISTER(rl);
-            DECODE_PRINTF(",CL\n");
-            TRACE_AND_STEP();
-            *destreg = (*opcD1_long_operation[rh]) (*destreg, amt);
-        } else {
-            u16 *destreg;
+	    destreg = DECODE_RM_LONG_REGISTER(rl);
+	    DECODE_PRINTF(",CL\n");
+	    TRACE_AND_STEP();
+	    *destreg = (*opcD1_long_operation[rh]) (*destreg, amt);
+	} else {
+	    u16 *destreg;
 
-            destreg = DECODE_RM_WORD_REGISTER(rl);
-            DECODE_PRINTF(",CL\n");
-            TRACE_AND_STEP();
-            *destreg = (*opcD1_word_operation[rh]) (*destreg, amt);
-        }
-        break;
+	    destreg = DECODE_RM_WORD_REGISTER(rl);
+	    DECODE_PRINTF(",CL\n");
+	    TRACE_AND_STEP();
+	    *destreg = (*opcD1_word_operation[rh]) (*destreg, amt);
+	}
+	break;
     }
     DECODE_CLEAR_SEGOVR();
     END_OF_INSTR();
@@ -9407,9 +9407,9 @@
     DECODE_PRINTF("AAM\n");
     a = fetch_byte_imm();      /* this is a stupid encoding. */
     if (a != 10) {
-        DECODE_PRINTF("ERROR DECODING AAM\n");
-        TRACE_REGS();
-        HALT_SYS();
+	DECODE_PRINTF("ERROR DECODING AAM\n");
+	TRACE_REGS();
+	HALT_SYS();
     }
     TRACE_AND_STEP();
     /* note the type change here --- returning AL and AH in AX. */
@@ -9472,7 +9472,7 @@
     TRACE_AND_STEP();
     M.x86.R_CX -= 1;
     if (M.x86.R_CX != 0 && !ACCESS_FLAG(F_ZF))      /* CX != 0 and !ZF */
-        M.x86.R_IP = ip;
+	M.x86.R_IP = ip;
     DECODE_CLEAR_SEGOVR();
     END_OF_INSTR();
 }
@@ -9493,7 +9493,7 @@
     TRACE_AND_STEP();
     M.x86.R_CX -= 1;
     if (M.x86.R_CX != 0 && ACCESS_FLAG(F_ZF))       /* CX != 0 and ZF */
-        M.x86.R_IP = ip;
+	M.x86.R_IP = ip;
     DECODE_CLEAR_SEGOVR();
     END_OF_INSTR();
 }
@@ -9514,7 +9514,7 @@
     TRACE_AND_STEP();
     M.x86.R_CX -= 1;
     if (M.x86.R_CX != 0)
-        M.x86.R_IP = ip;
+	M.x86.R_IP = ip;
     DECODE_CLEAR_SEGOVR();
     END_OF_INSTR();
 }
@@ -9536,7 +9536,7 @@
     DECODE_PRINTF2("%x\n", target);
     TRACE_AND_STEP();
     if (M.x86.R_CX == 0)
-        M.x86.R_IP = target;
+	M.x86.R_IP = target;
     DECODE_CLEAR_SEGOVR();
     END_OF_INSTR();
 }
@@ -9571,15 +9571,15 @@
     DECODE_PRINTF("IN\t");
 	port = (u8) fetch_byte_imm();
     if (M.x86.mode & SYSMODE_PREFIX_DATA) {
-        DECODE_PRINTF2("EAX,%x\n", port);
+	DECODE_PRINTF2("EAX,%x\n", port);
     } else {
-        DECODE_PRINTF2("AX,%x\n", port);
+	DECODE_PRINTF2("AX,%x\n", port);
     }
     TRACE_AND_STEP();
     if (M.x86.mode & SYSMODE_PREFIX_DATA) {
-        M.x86.R_EAX = (*sys_inl)(port);
+	M.x86.R_EAX = (*sys_inl)(port);
     } else {
-        M.x86.R_AX = (*sys_inw)(port);
+	M.x86.R_AX = (*sys_inw)(port);
     }
     DECODE_CLEAR_SEGOVR();
     END_OF_INSTR();
@@ -9615,15 +9615,15 @@
     DECODE_PRINTF("OUT\t");
 	port = (u8) fetch_byte_imm();
     if (M.x86.mode & SYSMODE_PREFIX_DATA) {
-        DECODE_PRINTF2("%x,EAX\n", port);
+	DECODE_PRINTF2("%x,EAX\n", port);
     } else {
-        DECODE_PRINTF2("%x,AX\n", port);
+	DECODE_PRINTF2("%x,AX\n", port);
     }
     TRACE_AND_STEP();
     if (M.x86.mode & SYSMODE_PREFIX_DATA) {
-        (*sys_outl)(port, M.x86.R_EAX);
+	(*sys_outl)(port, M.x86.R_EAX);
     } else {
-        (*sys_outw)(port, M.x86.R_AX);
+	(*sys_outw)(port, M.x86.R_AX);
     }
     DECODE_CLEAR_SEGOVR();
     END_OF_INSTR();
@@ -9732,15 +9732,15 @@
 {
     START_OF_INSTR();
     if (M.x86.mode & SYSMODE_PREFIX_DATA) {
-        DECODE_PRINTF("IN\tEAX,DX\n");
+	DECODE_PRINTF("IN\tEAX,DX\n");
     } else {
-        DECODE_PRINTF("IN\tAX,DX\n");
+	DECODE_PRINTF("IN\tAX,DX\n");
     }
     TRACE_AND_STEP();
     if (M.x86.mode & SYSMODE_PREFIX_DATA) {
-        M.x86.R_EAX = (*sys_inl)(M.x86.R_DX);
+	M.x86.R_EAX = (*sys_inl)(M.x86.R_DX);
     } else {
-        M.x86.R_AX = (*sys_inw)(M.x86.R_DX);
+	M.x86.R_AX = (*sys_inw)(M.x86.R_DX);
     }
     DECODE_CLEAR_SEGOVR();
     END_OF_INSTR();
@@ -9768,15 +9768,15 @@
 {
     START_OF_INSTR();
     if (M.x86.mode & SYSMODE_PREFIX_DATA) {
-        DECODE_PRINTF("OUT\tDX,EAX\n");
+	DECODE_PRINTF("OUT\tDX,EAX\n");
     } else {
-        DECODE_PRINTF("OUT\tDX,AX\n");
+	DECODE_PRINTF("OUT\tDX,AX\n");
     }
     TRACE_AND_STEP();
     if (M.x86.mode & SYSMODE_PREFIX_DATA) {
-        (*sys_outl)(M.x86.R_DX, M.x86.R_EAX);
+	(*sys_outl)(M.x86.R_DX, M.x86.R_EAX);
     } else {
-        (*sys_outw)(M.x86.R_DX, M.x86.R_AX);
+	(*sys_outw)(M.x86.R_DX, M.x86.R_AX);
     }
     DECODE_CLEAR_SEGOVR();
     END_OF_INSTR();
@@ -9871,268 +9871,268 @@
     FETCH_DECODE_MODRM(mod, rh, rl);
     switch (mod) {
     case 0:                     /* mod=00 */
-        switch (rh) {
-        case 0:         /* test byte imm */
-            DECODE_PRINTF("TEST\tBYTE PTR ");
-            destoffset = decode_rm00_address(rl);
-            DECODE_PRINTF(",");
-            srcval = fetch_byte_imm();
-            DECODE_PRINTF2("%02x\n", srcval);
-            destval = fetch_data_byte(destoffset);
-            TRACE_AND_STEP();
-            test_byte(destval, srcval);
-            break;
-        case 1:
-            DECODE_PRINTF("ILLEGAL OP MOD=00 RH=01 OP=F6\n");
-            HALT_SYS();
-            break;
-        case 2:
-            DECODE_PRINTF("NOT\tBYTE PTR ");
-            destoffset = decode_rm00_address(rl);
-            DECODE_PRINTF("\n");
-            destval = fetch_data_byte(destoffset);
-            TRACE_AND_STEP();
-            destval = not_byte(destval);
-            store_data_byte(destoffset, destval);
-            break;
-        case 3:
-            DECODE_PRINTF("NEG\tBYTE PTR ");
-            destoffset = decode_rm00_address(rl);
-            DECODE_PRINTF("\n");
-            destval = fetch_data_byte(destoffset);
-            TRACE_AND_STEP();
-            destval = neg_byte(destval);
-            store_data_byte(destoffset, destval);
-            break;
-        case 4:
-            DECODE_PRINTF("MUL\tBYTE PTR ");
-            destoffset = decode_rm00_address(rl);
-            DECODE_PRINTF("\n");
-            destval = fetch_data_byte(destoffset);
-            TRACE_AND_STEP();
-            mul_byte(destval);
-            break;
-        case 5:
-            DECODE_PRINTF("IMUL\tBYTE PTR ");
-            destoffset = decode_rm00_address(rl);
-            DECODE_PRINTF("\n");
-            destval = fetch_data_byte(destoffset);
-            TRACE_AND_STEP();
-            imul_byte(destval);
-            break;
-        case 6:
-            DECODE_PRINTF("DIV\tBYTE PTR ");
-            destoffset = decode_rm00_address(rl);
-            DECODE_PRINTF("\n");
-            destval = fetch_data_byte(destoffset);
-            TRACE_AND_STEP();
-            div_byte(destval);
-            break;
-        case 7:
-            DECODE_PRINTF("IDIV\tBYTE PTR ");
-            destoffset = decode_rm00_address(rl);
-            DECODE_PRINTF("\n");
-            destval = fetch_data_byte(destoffset);
-            TRACE_AND_STEP();
-            idiv_byte(destval);
-            break;
-        }
-        break;                  /* end mod==00 */
+	switch (rh) {
+	case 0:         /* test byte imm */
+	    DECODE_PRINTF("TEST\tBYTE PTR ");
+	    destoffset = decode_rm00_address(rl);
+	    DECODE_PRINTF(",");
+	    srcval = fetch_byte_imm();
+	    DECODE_PRINTF2("%02x\n", srcval);
+	    destval = fetch_data_byte(destoffset);
+	    TRACE_AND_STEP();
+	    test_byte(destval, srcval);
+	    break;
+	case 1:
+	    DECODE_PRINTF("ILLEGAL OP MOD=00 RH=01 OP=F6\n");
+	    HALT_SYS();
+	    break;
+	case 2:
+	    DECODE_PRINTF("NOT\tBYTE PTR ");
+	    destoffset = decode_rm00_address(rl);
+	    DECODE_PRINTF("\n");
+	    destval = fetch_data_byte(destoffset);
+	    TRACE_AND_STEP();
+	    destval = not_byte(destval);
+	    store_data_byte(destoffset, destval);
+	    break;
+	case 3:
+	    DECODE_PRINTF("NEG\tBYTE PTR ");
+	    destoffset = decode_rm00_address(rl);
+	    DECODE_PRINTF("\n");
+	    destval = fetch_data_byte(destoffset);
+	    TRACE_AND_STEP();
+	    destval = neg_byte(destval);
+	    store_data_byte(destoffset, destval);
+	    break;
+	case 4:
+	    DECODE_PRINTF("MUL\tBYTE PTR ");
+	    destoffset = decode_rm00_address(rl);
+	    DECODE_PRINTF("\n");
+	    destval = fetch_data_byte(destoffset);
+	    TRACE_AND_STEP();
+	    mul_byte(destval);
+	    break;
+	case 5:
+	    DECODE_PRINTF("IMUL\tBYTE PTR ");
+	    destoffset = decode_rm00_address(rl);
+	    DECODE_PRINTF("\n");
+	    destval = fetch_data_byte(destoffset);
+	    TRACE_AND_STEP();
+	    imul_byte(destval);
+	    break;
+	case 6:
+	    DECODE_PRINTF("DIV\tBYTE PTR ");
+	    destoffset = decode_rm00_address(rl);
+	    DECODE_PRINTF("\n");
+	    destval = fetch_data_byte(destoffset);
+	    TRACE_AND_STEP();
+	    div_byte(destval);
+	    break;
+	case 7:
+	    DECODE_PRINTF("IDIV\tBYTE PTR ");
+	    destoffset = decode_rm00_address(rl);
+	    DECODE_PRINTF("\n");
+	    destval = fetch_data_byte(destoffset);
+	    TRACE_AND_STEP();
+	    idiv_byte(destval);
+	    break;
+	}
+	break;                  /* end mod==00 */
     case 1:                     /* mod=01 */
-        switch (rh) {
-        case 0:         /* test byte imm */
-            DECODE_PRINTF("TEST\tBYTE PTR ");
-            destoffset = decode_rm01_address(rl);
-            DECODE_PRINTF(",");
-            srcval = fetch_byte_imm();
-            DECODE_PRINTF2("%02x\n", srcval);
-            destval = fetch_data_byte(destoffset);
-            TRACE_AND_STEP();
-            test_byte(destval, srcval);
-            break;
-        case 1:
-            DECODE_PRINTF("ILLEGAL OP MOD=01 RH=01 OP=F6\n");
-            HALT_SYS();
-            break;
-        case 2:
-            DECODE_PRINTF("NOT\tBYTE PTR ");
-            destoffset = decode_rm01_address(rl);
-            DECODE_PRINTF("\n");
-            destval = fetch_data_byte(destoffset);
-            TRACE_AND_STEP();
-            destval = not_byte(destval);
-            store_data_byte(destoffset, destval);
-            break;
-        case 3:
-            DECODE_PRINTF("NEG\tBYTE PTR ");
-            destoffset = decode_rm01_address(rl);
-            DECODE_PRINTF("\n");
-            destval = fetch_data_byte(destoffset);
-            TRACE_AND_STEP();
-            destval = neg_byte(destval);
-            store_data_byte(destoffset, destval);
-            break;
-        case 4:
-            DECODE_PRINTF("MUL\tBYTE PTR ");
-            destoffset = decode_rm01_address(rl);
-            DECODE_PRINTF("\n");
-            destval = fetch_data_byte(destoffset);
-            TRACE_AND_STEP();
-            mul_byte(destval);
-            break;
-        case 5:
-            DECODE_PRINTF("IMUL\tBYTE PTR ");
-            destoffset = decode_rm01_address(rl);
-            DECODE_PRINTF("\n");
-            destval = fetch_data_byte(destoffset);
-            TRACE_AND_STEP();
-            imul_byte(destval);
-            break;
-        case 6:
-            DECODE_PRINTF("DIV\tBYTE PTR ");
-            destoffset = decode_rm01_address(rl);
-            DECODE_PRINTF("\n");
-            destval = fetch_data_byte(destoffset);
-            TRACE_AND_STEP();
-            div_byte(destval);
-            break;
-        case 7:
-            DECODE_PRINTF("IDIV\tBYTE PTR ");
-            destoffset = decode_rm01_address(rl);
-            DECODE_PRINTF("\n");
-            destval = fetch_data_byte(destoffset);
-            TRACE_AND_STEP();
-            idiv_byte(destval);
-            break;
-        }
-        break;                  /* end mod==01 */
+	switch (rh) {
+	case 0:         /* test byte imm */
+	    DECODE_PRINTF("TEST\tBYTE PTR ");
+	    destoffset = decode_rm01_address(rl);
+	    DECODE_PRINTF(",");
+	    srcval = fetch_byte_imm();
+	    DECODE_PRINTF2("%02x\n", srcval);
+	    destval = fetch_data_byte(destoffset);
+	    TRACE_AND_STEP();
+	    test_byte(destval, srcval);
+	    break;
+	case 1:
+	    DECODE_PRINTF("ILLEGAL OP MOD=01 RH=01 OP=F6\n");
+	    HALT_SYS();
+	    break;
+	case 2:
+	    DECODE_PRINTF("NOT\tBYTE PTR ");
+	    destoffset = decode_rm01_address(rl);
+	    DECODE_PRINTF("\n");
+	    destval = fetch_data_byte(destoffset);
+	    TRACE_AND_STEP();
+	    destval = not_byte(destval);
+	    store_data_byte(destoffset, destval);
+	    break;
+	case 3:
+	    DECODE_PRINTF("NEG\tBYTE PTR ");
+	    destoffset = decode_rm01_address(rl);
+	    DECODE_PRINTF("\n");
+	    destval = fetch_data_byte(destoffset);
+	    TRACE_AND_STEP();
+	    destval = neg_byte(destval);
+	    store_data_byte(destoffset, destval);
+	    break;
+	case 4:
+	    DECODE_PRINTF("MUL\tBYTE PTR ");
+	    destoffset = decode_rm01_address(rl);
+	    DECODE_PRINTF("\n");
+	    destval = fetch_data_byte(destoffset);
+	    TRACE_AND_STEP();
+	    mul_byte(destval);
+	    break;
+	case 5:
+	    DECODE_PRINTF("IMUL\tBYTE PTR ");
+	    destoffset = decode_rm01_address(rl);
+	    DECODE_PRINTF("\n");
+	    destval = fetch_data_byte(destoffset);
+	    TRACE_AND_STEP();
+	    imul_byte(destval);
+	    break;
+	case 6:
+	    DECODE_PRINTF("DIV\tBYTE PTR ");
+	    destoffset = decode_rm01_address(rl);
+	    DECODE_PRINTF("\n");
+	    destval = fetch_data_byte(destoffset);
+	    TRACE_AND_STEP();
+	    div_byte(destval);
+	    break;
+	case 7:
+	    DECODE_PRINTF("IDIV\tBYTE PTR ");
+	    destoffset = decode_rm01_address(rl);
+	    DECODE_PRINTF("\n");
+	    destval = fetch_data_byte(destoffset);
+	    TRACE_AND_STEP();
+	    idiv_byte(destval);
+	    break;
+	}
+	break;                  /* end mod==01 */
     case 2:                     /* mod=10 */
-        switch (rh) {
-        case 0:         /* test byte imm */
-            DECODE_PRINTF("TEST\tBYTE PTR ");
-            destoffset = decode_rm10_address(rl);
-            DECODE_PRINTF(",");
-            srcval = fetch_byte_imm();
-            DECODE_PRINTF2("%02x\n", srcval);
-            destval = fetch_data_byte(destoffset);
-            TRACE_AND_STEP();
-            test_byte(destval, srcval);
-            break;
-        case 1:
-            DECODE_PRINTF("ILLEGAL OP MOD=10 RH=01 OP=F6\n");
-            HALT_SYS();
-            break;
-        case 2:
-            DECODE_PRINTF("NOT\tBYTE PTR ");
-            destoffset = decode_rm10_address(rl);
-            DECODE_PRINTF("\n");
-            destval = fetch_data_byte(destoffset);
-            TRACE_AND_STEP();
-            destval = not_byte(destval);
-            store_data_byte(destoffset, destval);
-            break;
-        case 3:
-            DECODE_PRINTF("NEG\tBYTE PTR ");
-            destoffset = decode_rm10_address(rl);
-            DECODE_PRINTF("\n");
-            destval = fetch_data_byte(destoffset);
-            TRACE_AND_STEP();
-            destval = neg_byte(destval);
-            store_data_byte(destoffset, destval);
-            break;
-        case 4:
-            DECODE_PRINTF("MUL\tBYTE PTR ");
-            destoffset = decode_rm10_address(rl);
-            DECODE_PRINTF("\n");
-            destval = fetch_data_byte(destoffset);
-            TRACE_AND_STEP();
-            mul_byte(destval);
-            break;
-        case 5:
-            DECODE_PRINTF("IMUL\tBYTE PTR ");
-            destoffset = decode_rm10_address(rl);
-            DECODE_PRINTF("\n");
-            destval = fetch_data_byte(destoffset);
-            TRACE_AND_STEP();
-            imul_byte(destval);
-            break;
-        case 6:
-            DECODE_PRINTF("DIV\tBYTE PTR ");
-            destoffset = decode_rm10_address(rl);
-            DECODE_PRINTF("\n");
-            destval = fetch_data_byte(destoffset);
-            TRACE_AND_STEP();
-            div_byte(destval);
-            break;
-        case 7:
-            DECODE_PRINTF("IDIV\tBYTE PTR ");
-            destoffset = decode_rm10_address(rl);
-            DECODE_PRINTF("\n");
-            destval = fetch_data_byte(destoffset);
-            TRACE_AND_STEP();
-            idiv_byte(destval);
-            break;
-        }
-        break;                  /* end mod==10 */
+	switch (rh) {
+	case 0:         /* test byte imm */
+	    DECODE_PRINTF("TEST\tBYTE PTR ");
+	    destoffset = decode_rm10_address(rl);
+	    DECODE_PRINTF(",");
+	    srcval = fetch_byte_imm();
+	    DECODE_PRINTF2("%02x\n", srcval);
+	    destval = fetch_data_byte(destoffset);
+	    TRACE_AND_STEP();
+	    test_byte(destval, srcval);
+	    break;
+	case 1:
+	    DECODE_PRINTF("ILLEGAL OP MOD=10 RH=01 OP=F6\n");
+	    HALT_SYS();
+	    break;
+	case 2:
+	    DECODE_PRINTF("NOT\tBYTE PTR ");
+	    destoffset = decode_rm10_address(rl);
+	    DECODE_PRINTF("\n");
+	    destval = fetch_data_byte(destoffset);
+	    TRACE_AND_STEP();
+	    destval = not_byte(destval);
+	    store_data_byte(destoffset, destval);
+	    break;
+	case 3:
+	    DECODE_PRINTF("NEG\tBYTE PTR ");
+	    destoffset = decode_rm10_address(rl);
+	    DECODE_PRINTF("\n");
+	    destval = fetch_data_byte(destoffset);
+	    TRACE_AND_STEP();
+	    destval = neg_byte(destval);
+	    store_data_byte(destoffset, destval);
+	    break;
+	case 4:
+	    DECODE_PRINTF("MUL\tBYTE PTR ");
+	    destoffset = decode_rm10_address(rl);
+	    DECODE_PRINTF("\n");
+	    destval = fetch_data_byte(destoffset);
+	    TRACE_AND_STEP();
+	    mul_byte(destval);
+	    break;
+	case 5:
+	    DECODE_PRINTF("IMUL\tBYTE PTR ");
+	    destoffset = decode_rm10_address(rl);
+	    DECODE_PRINTF("\n");
+	    destval = fetch_data_byte(destoffset);
+	    TRACE_AND_STEP();
+	    imul_byte(destval);
+	    break;
+	case 6:
+	    DECODE_PRINTF("DIV\tBYTE PTR ");
+	    destoffset = decode_rm10_address(rl);
+	    DECODE_PRINTF("\n");
+	    destval = fetch_data_byte(destoffset);
+	    TRACE_AND_STEP();
+	    div_byte(destval);
+	    break;
+	case 7:
+	    DECODE_PRINTF("IDIV\tBYTE PTR ");
+	    destoffset = decode_rm10_address(rl);
+	    DECODE_PRINTF("\n");
+	    destval = fetch_data_byte(destoffset);
+	    TRACE_AND_STEP();
+	    idiv_byte(destval);
+	    break;
+	}
+	break;                  /* end mod==10 */
     case 3:                     /* mod=11 */
-        switch (rh) {
-        case 0:         /* test byte imm */
-            DECODE_PRINTF("TEST\t");
-            destreg = DECODE_RM_BYTE_REGISTER(rl);
-            DECODE_PRINTF(",");
-            srcval = fetch_byte_imm();
-            DECODE_PRINTF2("%02x\n", srcval);
-            TRACE_AND_STEP();
-            test_byte(*destreg, srcval);
-            break;
-        case 1:
-            DECODE_PRINTF("ILLEGAL OP MOD=00 RH=01 OP=F6\n");
-            HALT_SYS();
-            break;
-        case 2:
-            DECODE_PRINTF("NOT\t");
-            destreg = DECODE_RM_BYTE_REGISTER(rl);
-            DECODE_PRINTF("\n");
-            TRACE_AND_STEP();
-            *destreg = not_byte(*destreg);
-            break;
-        case 3:
-            DECODE_PRINTF("NEG\t");
-            destreg = DECODE_RM_BYTE_REGISTER(rl);
-            DECODE_PRINTF("\n");
-            TRACE_AND_STEP();
-            *destreg = neg_byte(*destreg);
-            break;
-        case 4:
-            DECODE_PRINTF("MUL\t");
-            destreg = DECODE_RM_BYTE_REGISTER(rl);
-            DECODE_PRINTF("\n");
-            TRACE_AND_STEP();
-            mul_byte(*destreg);      /*!!!  */
-            break;
-        case 5:
-            DECODE_PRINTF("IMUL\t");
-            destreg = DECODE_RM_BYTE_REGISTER(rl);
-            DECODE_PRINTF("\n");
-            TRACE_AND_STEP();
-            imul_byte(*destreg);
-            break;
-        case 6:
-            DECODE_PRINTF("DIV\t");
-            destreg = DECODE_RM_BYTE_REGISTER(rl);
-            DECODE_PRINTF("\n");
-            TRACE_AND_STEP();
-            div_byte(*destreg);
-            break;
-        case 7:
-            DECODE_PRINTF("IDIV\t");
-            destreg = DECODE_RM_BYTE_REGISTER(rl);
-            DECODE_PRINTF("\n");
-            TRACE_AND_STEP();
-            idiv_byte(*destreg);
-            break;
-        }
-        break;                  /* end mod==11 */
+	switch (rh) {
+	case 0:         /* test byte imm */
+	    DECODE_PRINTF("TEST\t");
+	    destreg = DECODE_RM_BYTE_REGISTER(rl);
+	    DECODE_PRINTF(",");
+	    srcval = fetch_byte_imm();
+	    DECODE_PRINTF2("%02x\n", srcval);
+	    TRACE_AND_STEP();
+	    test_byte(*destreg, srcval);
+	    break;
+	case 1:
+	    DECODE_PRINTF("ILLEGAL OP MOD=00 RH=01 OP=F6\n");
+	    HALT_SYS();
+	    break;
+	case 2:
+	    DECODE_PRINTF("NOT\t");
+	    destreg = DECODE_RM_BYTE_REGISTER(rl);
+	    DECODE_PRINTF("\n");
+	    TRACE_AND_STEP();
+	    *destreg = not_byte(*destreg);
+	    break;
+	case 3:
+	    DECODE_PRINTF("NEG\t");
+	    destreg = DECODE_RM_BYTE_REGISTER(rl);
+	    DECODE_PRINTF("\n");
+	    TRACE_AND_STEP();
+	    *destreg = neg_byte(*destreg);
+	    break;
+	case 4:
+	    DECODE_PRINTF("MUL\t");
+	    destreg = DECODE_RM_BYTE_REGISTER(rl);
+	    DECODE_PRINTF("\n");
+	    TRACE_AND_STEP();
+	    mul_byte(*destreg);      /*!!!  */
+	    break;
+	case 5:
+	    DECODE_PRINTF("IMUL\t");
+	    destreg = DECODE_RM_BYTE_REGISTER(rl);
+	    DECODE_PRINTF("\n");
+	    TRACE_AND_STEP();
+	    imul_byte(*destreg);
+	    break;
+	case 6:
+	    DECODE_PRINTF("DIV\t");
+	    destreg = DECODE_RM_BYTE_REGISTER(rl);
+	    DECODE_PRINTF("\n");
+	    TRACE_AND_STEP();
+	    div_byte(*destreg);
+	    break;
+	case 7:
+	    DECODE_PRINTF("IDIV\t");
+	    destreg = DECODE_RM_BYTE_REGISTER(rl);
+	    DECODE_PRINTF("\n");
+	    TRACE_AND_STEP();
+	    idiv_byte(*destreg);
+	    break;
+	}
+	break;                  /* end mod==11 */
     }
     DECODE_CLEAR_SEGOVR();
     END_OF_INSTR();
@@ -10153,641 +10153,641 @@
     FETCH_DECODE_MODRM(mod, rh, rl);
     switch (mod) {
     case 0:                     /* mod=00 */
-        switch (rh) {
-        case 0:         /* test word imm */
-            if (M.x86.mode & SYSMODE_PREFIX_DATA) {
-                u32 destval,srcval;
+	switch (rh) {
+	case 0:         /* test word imm */
+	    if (M.x86.mode & SYSMODE_PREFIX_DATA) {
+		u32 destval,srcval;
 
-                DECODE_PRINTF("TEST\tDWORD PTR ");
-                destoffset = decode_rm00_address(rl);
-                DECODE_PRINTF(",");
-                srcval = fetch_long_imm();
-                DECODE_PRINTF2("%x\n", srcval);
-                destval = fetch_data_long(destoffset);
-                TRACE_AND_STEP();
-                test_long(destval, srcval);
-            } else {
-                u16 destval,srcval;
+		DECODE_PRINTF("TEST\tDWORD PTR ");
+		destoffset = decode_rm00_address(rl);
+		DECODE_PRINTF(",");
+		srcval = fetch_long_imm();
+		DECODE_PRINTF2("%x\n", srcval);
+		destval = fetch_data_long(destoffset);
+		TRACE_AND_STEP();
+		test_long(destval, srcval);
+	    } else {
+		u16 destval,srcval;
 
-                DECODE_PRINTF("TEST\tWORD PTR ");
-                destoffset = decode_rm00_address(rl);
-                DECODE_PRINTF(",");
-                srcval = fetch_word_imm();
-                DECODE_PRINTF2("%x\n", srcval);
-                destval = fetch_data_word(destoffset);
-                TRACE_AND_STEP();
-                test_word(destval, srcval);
-            }
-            break;
-        case 1:
-            DECODE_PRINTF("ILLEGAL OP MOD=00 RH=01 OP=F7\n");
-            HALT_SYS();
-            break;
-        case 2:
-            if (M.x86.mode & SYSMODE_PREFIX_DATA) {
-                u32 destval;
+		DECODE_PRINTF("TEST\tWORD PTR ");
+		destoffset = decode_rm00_address(rl);
+		DECODE_PRINTF(",");
+		srcval = fetch_word_imm();
+		DECODE_PRINTF2("%x\n", srcval);
+		destval = fetch_data_word(destoffset);
+		TRACE_AND_STEP();
+		test_word(destval, srcval);
+	    }
+	    break;
+	case 1:
+	    DECODE_PRINTF("ILLEGAL OP MOD=00 RH=01 OP=F7\n");
+	    HALT_SYS();
+	    break;
+	case 2:
+	    if (M.x86.mode & SYSMODE_PREFIX_DATA) {
+		u32 destval;
 
-                DECODE_PRINTF("NOT\tDWORD PTR ");
-                destoffset = decode_rm00_address(rl);
-                DECODE_PRINTF("\n");
-                destval = fetch_data_long(destoffset);
-                TRACE_AND_STEP();
-                destval = not_long(destval);
-                store_data_long(destoffset, destval);
-            } else {
-                u16 destval;
+		DECODE_PRINTF("NOT\tDWORD PTR ");
+		destoffset = decode_rm00_address(rl);
+		DECODE_PRINTF("\n");
+		destval = fetch_data_long(destoffset);
+		TRACE_AND_STEP();
+		destval = not_long(destval);
+		store_data_long(destoffset, destval);
+	    } else {
+		u16 destval;
 
-                DECODE_PRINTF("NOT\tWORD PTR ");
-                destoffset = decode_rm00_address(rl);
-                DECODE_PRINTF("\n");
-                destval = fetch_data_word(destoffset);
-                TRACE_AND_STEP();
-                destval = not_word(destval);
-                store_data_word(destoffset, destval);
-            }
-            break;
-        case 3:
-            if (M.x86.mode & SYSMODE_PREFIX_DATA) {
-                u32 destval;
+		DECODE_PRINTF("NOT\tWORD PTR ");
+		destoffset = decode_rm00_address(rl);
+		DECODE_PRINTF("\n");
+		destval = fetch_data_word(destoffset);
+		TRACE_AND_STEP();
+		destval = not_word(destval);
+		store_data_word(destoffset, destval);
+	    }
+	    break;
+	case 3:
+	    if (M.x86.mode & SYSMODE_PREFIX_DATA) {
+		u32 destval;
 
-                DECODE_PRINTF("NEG\tDWORD PTR ");
-                destoffset = decode_rm00_address(rl);
-                DECODE_PRINTF("\n");
-                destval = fetch_data_long(destoffset);
-                TRACE_AND_STEP();
-                destval = neg_long(destval);
-                store_data_long(destoffset, destval);
-            } else {
-                u16 destval;
+		DECODE_PRINTF("NEG\tDWORD PTR ");
+		destoffset = decode_rm00_address(rl);
+		DECODE_PRINTF("\n");
+		destval = fetch_data_long(destoffset);
+		TRACE_AND_STEP();
+		destval = neg_long(destval);
+		store_data_long(destoffset, destval);
+	    } else {
+		u16 destval;
 
-                DECODE_PRINTF("NEG\tWORD PTR ");
-                destoffset = decode_rm00_address(rl);
-                DECODE_PRINTF("\n");
-                destval = fetch_data_word(destoffset);
-                TRACE_AND_STEP();
-                destval = neg_word(destval);
-                store_data_word(destoffset, destval);
-            }
-            break;
-        case 4:
-            if (M.x86.mode & SYSMODE_PREFIX_DATA) {
-                u32 destval;
+		DECODE_PRINTF("NEG\tWORD PTR ");
+		destoffset = decode_rm00_address(rl);
+		DECODE_PRINTF("\n");
+		destval = fetch_data_word(destoffset);
+		TRACE_AND_STEP();
+		destval = neg_word(destval);
+		store_data_word(destoffset, destval);
+	    }
+	    break;
+	case 4:
+	    if (M.x86.mode & SYSMODE_PREFIX_DATA) {
+		u32 destval;
 
-                DECODE_PRINTF("MUL\tDWORD PTR ");
-                destoffset = decode_rm00_address(rl);
-                DECODE_PRINTF("\n");
-                destval = fetch_data_long(destoffset);
-                TRACE_AND_STEP();
-                mul_long(destval);
-            } else {
-                u16 destval;
+		DECODE_PRINTF("MUL\tDWORD PTR ");
+		destoffset = decode_rm00_address(rl);
+		DECODE_PRINTF("\n");
+		destval = fetch_data_long(destoffset);
+		TRACE_AND_STEP();
+		mul_long(destval);
+	    } else {
+		u16 destval;
 
-                DECODE_PRINTF("MUL\tWORD PTR ");
-                destoffset = decode_rm00_address(rl);
-                DECODE_PRINTF("\n");
-                destval = fetch_data_word(destoffset);
-                TRACE_AND_STEP();
-                mul_word(destval);
-            }
-            break;
-        case 5:
-            if (M.x86.mode & SYSMODE_PREFIX_DATA) {
-                u32 destval;
+		DECODE_PRINTF("MUL\tWORD PTR ");
+		destoffset = decode_rm00_address(rl);
+		DECODE_PRINTF("\n");
+		destval = fetch_data_word(destoffset);
+		TRACE_AND_STEP();
+		mul_word(destval);
+	    }
+	    break;
+	case 5:
+	    if (M.x86.mode & SYSMODE_PREFIX_DATA) {
+		u32 destval;
 
-                DECODE_PRINTF("IMUL\tDWORD PTR ");
-                destoffset = decode_rm00_address(rl);
-                DECODE_PRINTF("\n");
-                destval = fetch_data_long(destoffset);
-                TRACE_AND_STEP();
-                imul_long(destval);
-            } else {
-                u16 destval;
+		DECODE_PRINTF("IMUL\tDWORD PTR ");
+		destoffset = decode_rm00_address(rl);
+		DECODE_PRINTF("\n");
+		destval = fetch_data_long(destoffset);
+		TRACE_AND_STEP();
+		imul_long(destval);
+	    } else {
+		u16 destval;
 
-                DECODE_PRINTF("IMUL\tWORD PTR ");
-                destoffset = decode_rm00_address(rl);
-                DECODE_PRINTF("\n");
-                destval = fetch_data_word(destoffset);
-                TRACE_AND_STEP();
-                imul_word(destval);
-            }
-            break;
-        case 6:
-            if (M.x86.mode & SYSMODE_PREFIX_DATA) {
-                u32 destval;
+		DECODE_PRINTF("IMUL\tWORD PTR ");
+		destoffset = decode_rm00_address(rl);
+		DECODE_PRINTF("\n");
+		destval = fetch_data_word(destoffset);
+		TRACE_AND_STEP();
+		imul_word(destval);
+	    }
+	    break;
+	case 6:
+	    if (M.x86.mode & SYSMODE_PREFIX_DATA) {
+		u32 destval;
 
-                DECODE_PRINTF("DIV\tDWORD PTR ");
-                destoffset = decode_rm00_address(rl);
-                DECODE_PRINTF("\n");
-                destval = fetch_data_long(destoffset);
-                TRACE_AND_STEP();
-                div_long(destval);
-            } else {
-                u16 destval;
+		DECODE_PRINTF("DIV\tDWORD PTR ");
+		destoffset = decode_rm00_address(rl);
+		DECODE_PRINTF("\n");
+		destval = fetch_data_long(destoffset);
+		TRACE_AND_STEP();
+		div_long(destval);
+	    } else {
+		u16 destval;
 
-                DECODE_PRINTF("DIV\tWORD PTR ");
-                destoffset = decode_rm00_address(rl);
-                DECODE_PRINTF("\n");
-                destval = fetch_data_word(destoffset);
-                TRACE_AND_STEP();
-                div_word(destval);
-            }
-            break;
-        case 7:
-            if (M.x86.mode & SYSMODE_PREFIX_DATA) {
-                u32 destval;
+		DECODE_PRINTF("DIV\tWORD PTR ");
+		destoffset = decode_rm00_address(rl);
+		DECODE_PRINTF("\n");
+		destval = fetch_data_word(destoffset);
+		TRACE_AND_STEP();
+		div_word(destval);
+	    }
+	    break;
+	case 7:
+	    if (M.x86.mode & SYSMODE_PREFIX_DATA) {
+		u32 destval;
 
-                DECODE_PRINTF("IDIV\tDWORD PTR ");
-                destoffset = decode_rm00_address(rl);
-                DECODE_PRINTF("\n");
-                destval = fetch_data_long(destoffset);
-                TRACE_AND_STEP();
-                idiv_long(destval);
-            } else {
-                u16 destval;
+		DECODE_PRINTF("IDIV\tDWORD PTR ");
+		destoffset = decode_rm00_address(rl);
+		DECODE_PRINTF("\n");
+		destval = fetch_data_long(destoffset);
+		TRACE_AND_STEP();
+		idiv_long(destval);
+	    } else {
+		u16 destval;
 
-                DECODE_PRINTF("IDIV\tWORD PTR ");
-                destoffset = decode_rm00_address(rl);
-                DECODE_PRINTF("\n");
-                destval = fetch_data_word(destoffset);
-                TRACE_AND_STEP();
-                idiv_word(destval);
-            }
-            break;
-        }
-        break;                  /* end mod==00 */
+		DECODE_PRINTF("IDIV\tWORD PTR ");
+		destoffset = decode_rm00_address(rl);
+		DECODE_PRINTF("\n");
+		destval = fetch_data_word(destoffset);
+		TRACE_AND_STEP();
+		idiv_word(destval);
+	    }
+	    break;
+	}
+	break;                  /* end mod==00 */
     case 1:                     /* mod=01 */
-        switch (rh) {
-        case 0:         /* test word imm */
-            if (M.x86.mode & SYSMODE_PREFIX_DATA) {
-                u32 destval,srcval;
+	switch (rh) {
+	case 0:         /* test word imm */
+	    if (M.x86.mode & SYSMODE_PREFIX_DATA) {
+		u32 destval,srcval;
 
-                DECODE_PRINTF("TEST\tDWORD PTR ");
-                destoffset = decode_rm01_address(rl);
-                DECODE_PRINTF(",");
-                srcval = fetch_long_imm();
-                DECODE_PRINTF2("%x\n", srcval);
-                destval = fetch_data_long(destoffset);
-                TRACE_AND_STEP();
-                test_long(destval, srcval);
-            } else {
-                u16 destval,srcval;
+		DECODE_PRINTF("TEST\tDWORD PTR ");
+		destoffset = decode_rm01_address(rl);
+		DECODE_PRINTF(",");
+		srcval = fetch_long_imm();
+		DECODE_PRINTF2("%x\n", srcval);
+		destval = fetch_data_long(destoffset);
+		TRACE_AND_STEP();
+		test_long(destval, srcval);
+	    } else {
+		u16 destval,srcval;
 
-                DECODE_PRINTF("TEST\tWORD PTR ");
-                destoffset = decode_rm01_address(rl);
-                DECODE_PRINTF(",");
-                srcval = fetch_word_imm();
-                DECODE_PRINTF2("%x\n", srcval);
-                destval = fetch_data_word(destoffset);
-                TRACE_AND_STEP();
-                test_word(destval, srcval);
-            }
-            break;
-        case 1:
-            DECODE_PRINTF("ILLEGAL OP MOD=01 RH=01 OP=F6\n");
-            HALT_SYS();
-            break;
-        case 2:
-            if (M.x86.mode & SYSMODE_PREFIX_DATA) {
-                u32 destval;
+		DECODE_PRINTF("TEST\tWORD PTR ");
+		destoffset = decode_rm01_address(rl);
+		DECODE_PRINTF(",");
+		srcval = fetch_word_imm();
+		DECODE_PRINTF2("%x\n", srcval);
+		destval = fetch_data_word(destoffset);
+		TRACE_AND_STEP();
+		test_word(destval, srcval);
+	    }
+	    break;
+	case 1:
+	    DECODE_PRINTF("ILLEGAL OP MOD=01 RH=01 OP=F6\n");
+	    HALT_SYS();
+	    break;
+	case 2:
+	    if (M.x86.mode & SYSMODE_PREFIX_DATA) {
+		u32 destval;
 
-                DECODE_PRINTF("NOT\tDWORD PTR ");
-                destoffset = decode_rm01_address(rl);
-                DECODE_PRINTF("\n");
-                destval = fetch_data_long(destoffset);
-                TRACE_AND_STEP();
-                destval = not_long(destval);
-                store_data_long(destoffset, destval);
-            } else {
-                u16 destval;
+		DECODE_PRINTF("NOT\tDWORD PTR ");
+		destoffset = decode_rm01_address(rl);
+		DECODE_PRINTF("\n");
+		destval = fetch_data_long(destoffset);
+		TRACE_AND_STEP();
+		destval = not_long(destval);
+		store_data_long(destoffset, destval);
+	    } else {
+		u16 destval;
 
-                DECODE_PRINTF("NOT\tWORD PTR ");
-                destoffset = decode_rm01_address(rl);
-                DECODE_PRINTF("\n");
-                destval = fetch_data_word(destoffset);
-                TRACE_AND_STEP();
-                destval = not_word(destval);
-                store_data_word(destoffset, destval);
-            }
-            break;
-        case 3:
-            if (M.x86.mode & SYSMODE_PREFIX_DATA) {
-                u32 destval;
+		DECODE_PRINTF("NOT\tWORD PTR ");
+		destoffset = decode_rm01_address(rl);
+		DECODE_PRINTF("\n");
+		destval = fetch_data_word(destoffset);
+		TRACE_AND_STEP();
+		destval = not_word(destval);
+		store_data_word(destoffset, destval);
+	    }
+	    break;
+	case 3:
+	    if (M.x86.mode & SYSMODE_PREFIX_DATA) {
+		u32 destval;
 
-                DECODE_PRINTF("NEG\tDWORD PTR ");
-                destoffset = decode_rm01_address(rl);
-                DECODE_PRINTF("\n");
-                destval = fetch_data_long(destoffset);
-                TRACE_AND_STEP();
-                destval = neg_long(destval);
-                store_data_long(destoffset, destval);
-            } else {
-                u16 destval;
+		DECODE_PRINTF("NEG\tDWORD PTR ");
+		destoffset = decode_rm01_address(rl);
+		DECODE_PRINTF("\n");
+		destval = fetch_data_long(destoffset);
+		TRACE_AND_STEP();
+		destval = neg_long(destval);
+		store_data_long(destoffset, destval);
+	    } else {
+		u16 destval;
 
-                DECODE_PRINTF("NEG\tWORD PTR ");
-                destoffset = decode_rm01_address(rl);
-                DECODE_PRINTF("\n");
-                destval = fetch_data_word(destoffset);
-                TRACE_AND_STEP();
-                destval = neg_word(destval);
-                store_data_word(destoffset, destval);
-            }
-            break;
-        case 4:
-            if (M.x86.mode & SYSMODE_PREFIX_DATA) {
-                u32 destval;
+		DECODE_PRINTF("NEG\tWORD PTR ");
+		destoffset = decode_rm01_address(rl);
+		DECODE_PRINTF("\n");
+		destval = fetch_data_word(destoffset);
+		TRACE_AND_STEP();
+		destval = neg_word(destval);
+		store_data_word(destoffset, destval);
+	    }
+	    break;
+	case 4:
+	    if (M.x86.mode & SYSMODE_PREFIX_DATA) {
+		u32 destval;
 
-                DECODE_PRINTF("MUL\tDWORD PTR ");
-                destoffset = decode_rm01_address(rl);
-                DECODE_PRINTF("\n");
-                destval = fetch_data_long(destoffset);
-                TRACE_AND_STEP();
-                mul_long(destval);
-            } else {
-                u16 destval;
+		DECODE_PRINTF("MUL\tDWORD PTR ");
+		destoffset = decode_rm01_address(rl);
+		DECODE_PRINTF("\n");
+		destval = fetch_data_long(destoffset);
+		TRACE_AND_STEP();
+		mul_long(destval);
+	    } else {
+		u16 destval;
 
-                DECODE_PRINTF("MUL\tWORD PTR ");
-                destoffset = decode_rm01_address(rl);
-                DECODE_PRINTF("\n");
-                destval = fetch_data_word(destoffset);
-                TRACE_AND_STEP();
-                mul_word(destval);
-            }
-            break;
-        case 5:
-            if (M.x86.mode & SYSMODE_PREFIX_DATA) {
-                u32 destval;
+		DECODE_PRINTF("MUL\tWORD PTR ");
+		destoffset = decode_rm01_address(rl);
+		DECODE_PRINTF("\n");
+		destval = fetch_data_word(destoffset);
+		TRACE_AND_STEP();
+		mul_word(destval);
+	    }
+	    break;
+	case 5:
+	    if (M.x86.mode & SYSMODE_PREFIX_DATA) {
+		u32 destval;
 
-                DECODE_PRINTF("IMUL\tDWORD PTR ");
-                destoffset = decode_rm01_address(rl);
-                DECODE_PRINTF("\n");
-                destval = fetch_data_long(destoffset);
-                TRACE_AND_STEP();
-                imul_long(destval);
-            } else {
-                u16 destval;
+		DECODE_PRINTF("IMUL\tDWORD PTR ");
+		destoffset = decode_rm01_address(rl);
+		DECODE_PRINTF("\n");
+		destval = fetch_data_long(destoffset);
+		TRACE_AND_STEP();
+		imul_long(destval);
+	    } else {
+		u16 destval;
 
-                DECODE_PRINTF("IMUL\tWORD PTR ");
-                destoffset = decode_rm01_address(rl);
-                DECODE_PRINTF("\n");
-                destval = fetch_data_word(destoffset);
-                TRACE_AND_STEP();
-                imul_word(destval);
-            }
-            break;
-        case 6:
-            if (M.x86.mode & SYSMODE_PREFIX_DATA) {
-                u32 destval;
+		DECODE_PRINTF("IMUL\tWORD PTR ");
+		destoffset = decode_rm01_address(rl);
+		DECODE_PRINTF("\n");
+		destval = fetch_data_word(destoffset);
+		TRACE_AND_STEP();
+		imul_word(destval);
+	    }
+	    break;
+	case 6:
+	    if (M.x86.mode & SYSMODE_PREFIX_DATA) {
+		u32 destval;
 
-                DECODE_PRINTF("DIV\tDWORD PTR ");
-                destoffset = decode_rm01_address(rl);
-                DECODE_PRINTF("\n");
-                destval = fetch_data_long(destoffset);
-                TRACE_AND_STEP();
-                div_long(destval);
-            } else {
-                u16 destval;
+		DECODE_PRINTF("DIV\tDWORD PTR ");
+		destoffset = decode_rm01_address(rl);
+		DECODE_PRINTF("\n");
+		destval = fetch_data_long(destoffset);
+		TRACE_AND_STEP();
+		div_long(destval);
+	    } else {
+		u16 destval;
 
-                DECODE_PRINTF("DIV\tWORD PTR ");
-                destoffset = decode_rm01_address(rl);
-                DECODE_PRINTF("\n");
-                destval = fetch_data_word(destoffset);
-                TRACE_AND_STEP();
-                div_word(destval);
-            }
-            break;
-        case 7:
-            if (M.x86.mode & SYSMODE_PREFIX_DATA) {
-                u32 destval;
+		DECODE_PRINTF("DIV\tWORD PTR ");
+		destoffset = decode_rm01_address(rl);
+		DECODE_PRINTF("\n");
+		destval = fetch_data_word(destoffset);
+		TRACE_AND_STEP();
+		div_word(destval);
+	    }
+	    break;
+	case 7:
+	    if (M.x86.mode & SYSMODE_PREFIX_DATA) {
+		u32 destval;
 
-                DECODE_PRINTF("IDIV\tDWORD PTR ");
-                destoffset = decode_rm01_address(rl);
-                DECODE_PRINTF("\n");
-                destval = fetch_data_long(destoffset);
-                TRACE_AND_STEP();
-                idiv_long(destval);
-            } else {
-                u16 destval;
+		DECODE_PRINTF("IDIV\tDWORD PTR ");
+		destoffset = decode_rm01_address(rl);
+		DECODE_PRINTF("\n");
+		destval = fetch_data_long(destoffset);
+		TRACE_AND_STEP();
+		idiv_long(destval);
+	    } else {
+		u16 destval;
 
-                DECODE_PRINTF("IDIV\tWORD PTR ");
-                destoffset = decode_rm01_address(rl);
-                DECODE_PRINTF("\n");
-                destval = fetch_data_word(destoffset);
-                TRACE_AND_STEP();
-                idiv_word(destval);
-            }
-            break;
-        }
-        break;                  /* end mod==01 */
+		DECODE_PRINTF("IDIV\tWORD PTR ");
+		destoffset = decode_rm01_address(rl);
+		DECODE_PRINTF("\n");
+		destval = fetch_data_word(destoffset);
+		TRACE_AND_STEP();
+		idiv_word(destval);
+	    }
+	    break;
+	}
+	break;                  /* end mod==01 */
     case 2:                     /* mod=10 */
-        switch (rh) {
-        case 0:         /* test word imm */
-            if (M.x86.mode & SYSMODE_PREFIX_DATA) {
-                u32 destval,srcval;
+	switch (rh) {
+	case 0:         /* test word imm */
+	    if (M.x86.mode & SYSMODE_PREFIX_DATA) {
+		u32 destval,srcval;
 
-                DECODE_PRINTF("TEST\tDWORD PTR ");
-                destoffset = decode_rm10_address(rl);
-                DECODE_PRINTF(",");
-                srcval = fetch_long_imm();
-                DECODE_PRINTF2("%x\n", srcval);
-                destval = fetch_data_long(destoffset);
-                TRACE_AND_STEP();
-                test_long(destval, srcval);
-            } else {
-                u16 destval,srcval;
+		DECODE_PRINTF("TEST\tDWORD PTR ");
+		destoffset = decode_rm10_address(rl);
+		DECODE_PRINTF(",");
+		srcval = fetch_long_imm();
+		DECODE_PRINTF2("%x\n", srcval);
+		destval = fetch_data_long(destoffset);
+		TRACE_AND_STEP();
+		test_long(destval, srcval);
+	    } else {
+		u16 destval,srcval;
 
-                DECODE_PRINTF("TEST\tWORD PTR ");
-                destoffset = decode_rm10_address(rl);
-                DECODE_PRINTF(",");
-                srcval = fetch_word_imm();
-                DECODE_PRINTF2("%x\n", srcval);
-                destval = fetch_data_word(destoffset);
-                TRACE_AND_STEP();
-                test_word(destval, srcval);
-            }
-            break;
-        case 1:
-            DECODE_PRINTF("ILLEGAL OP MOD=10 RH=01 OP=F6\n");
-            HALT_SYS();
-            break;
-        case 2:
-            if (M.x86.mode & SYSMODE_PREFIX_DATA) {
-                u32 destval;
+		DECODE_PRINTF("TEST\tWORD PTR ");
+		destoffset = decode_rm10_address(rl);
+		DECODE_PRINTF(",");
+		srcval = fetch_word_imm();
+		DECODE_PRINTF2("%x\n", srcval);
+		destval = fetch_data_word(destoffset);
+		TRACE_AND_STEP();
+		test_word(destval, srcval);
+	    }
+	    break;
+	case 1:
+	    DECODE_PRINTF("ILLEGAL OP MOD=10 RH=01 OP=F6\n");
+	    HALT_SYS();
+	    break;
+	case 2:
+	    if (M.x86.mode & SYSMODE_PREFIX_DATA) {
+		u32 destval;
 
-                DECODE_PRINTF("NOT\tDWORD PTR ");
-                destoffset = decode_rm10_address(rl);
-                DECODE_PRINTF("\n");
-                destval = fetch_data_long(destoffset);
-                TRACE_AND_STEP();
-                destval = not_long(destval);
-                store_data_long(destoffset, destval);
-            } else {
-                u16 destval;
+		DECODE_PRINTF("NOT\tDWORD PTR ");
+		destoffset = decode_rm10_address(rl);
+		DECODE_PRINTF("\n");
+		destval = fetch_data_long(destoffset);
+		TRACE_AND_STEP();
+		destval = not_long(destval);
+		store_data_long(destoffset, destval);
+	    } else {
+		u16 destval;
 
-                DECODE_PRINTF("NOT\tWORD PTR ");
-                destoffset = decode_rm10_address(rl);
-                DECODE_PRINTF("\n");
-                destval = fetch_data_word(destoffset);
-                TRACE_AND_STEP();
-                destval = not_word(destval);
-                store_data_word(destoffset, destval);
-            }
-            break;
-        case 3:
-            if (M.x86.mode & SYSMODE_PREFIX_DATA) {
-                u32 destval;
+		DECODE_PRINTF("NOT\tWORD PTR ");
+		destoffset = decode_rm10_address(rl);
+		DECODE_PRINTF("\n");
+		destval = fetch_data_word(destoffset);
+		TRACE_AND_STEP();
+		destval = not_word(destval);
+		store_data_word(destoffset, destval);
+	    }
+	    break;
+	case 3:
+	    if (M.x86.mode & SYSMODE_PREFIX_DATA) {
+		u32 destval;
 
-                DECODE_PRINTF("NEG\tDWORD PTR ");
-                destoffset = decode_rm10_address(rl);
-                DECODE_PRINTF("\n");
-                destval = fetch_data_long(destoffset);
-                TRACE_AND_STEP();
-                destval = neg_long(destval);
-                store_data_long(destoffset, destval);
-            } else {
-                u16 destval;
+		DECODE_PRINTF("NEG\tDWORD PTR ");
+		destoffset = decode_rm10_address(rl);
+		DECODE_PRINTF("\n");
+		destval = fetch_data_long(destoffset);
+		TRACE_AND_STEP();
+		destval = neg_long(destval);
+		store_data_long(destoffset, destval);
+	    } else {
+		u16 destval;
 
-                DECODE_PRINTF("NEG\tWORD PTR ");
-                destoffset = decode_rm10_address(rl);
-                DECODE_PRINTF("\n");
-                destval = fetch_data_word(destoffset);
-                TRACE_AND_STEP();
-                destval = neg_word(destval);
-                store_data_word(destoffset, destval);
-            }
-            break;
-        case 4:
-            if (M.x86.mode & SYSMODE_PREFIX_DATA) {
-                u32 destval;
+		DECODE_PRINTF("NEG\tWORD PTR ");
+		destoffset = decode_rm10_address(rl);
+		DECODE_PRINTF("\n");
+		destval = fetch_data_word(destoffset);
+		TRACE_AND_STEP();
+		destval = neg_word(destval);
+		store_data_word(destoffset, destval);
+	    }
+	    break;
+	case 4:
+	    if (M.x86.mode & SYSMODE_PREFIX_DATA) {
+		u32 destval;
 
-                DECODE_PRINTF("MUL\tDWORD PTR ");
-                destoffset = decode_rm10_address(rl);
-                DECODE_PRINTF("\n");
-                destval = fetch_data_long(destoffset);
-                TRACE_AND_STEP();
-                mul_long(destval);
-            } else {
-                u16 destval;
+		DECODE_PRINTF("MUL\tDWORD PTR ");
+		destoffset = decode_rm10_address(rl);
+		DECODE_PRINTF("\n");
+		destval = fetch_data_long(destoffset);
+		TRACE_AND_STEP();
+		mul_long(destval);
+	    } else {
+		u16 destval;
 
-                DECODE_PRINTF("MUL\tWORD PTR ");
-                destoffset = decode_rm10_address(rl);
-                DECODE_PRINTF("\n");
-                destval = fetch_data_word(destoffset);
-                TRACE_AND_STEP();
-                mul_word(destval);
-            }
-            break;
-        case 5:
-            if (M.x86.mode & SYSMODE_PREFIX_DATA) {
-                u32 destval;
+		DECODE_PRINTF("MUL\tWORD PTR ");
+		destoffset = decode_rm10_address(rl);
+		DECODE_PRINTF("\n");
+		destval = fetch_data_word(destoffset);
+		TRACE_AND_STEP();
+		mul_word(destval);
+	    }
+	    break;
+	case 5:
+	    if (M.x86.mode & SYSMODE_PREFIX_DATA) {
+		u32 destval;
 
-                DECODE_PRINTF("IMUL\tDWORD PTR ");
-                destoffset = decode_rm10_address(rl);
-                DECODE_PRINTF("\n");
-                destval = fetch_data_long(destoffset);
-                TRACE_AND_STEP();
-                imul_long(destval);
-            } else {
-                u16 destval;
+		DECODE_PRINTF("IMUL\tDWORD PTR ");
+		destoffset = decode_rm10_address(rl);
+		DECODE_PRINTF("\n");
+		destval = fetch_data_long(destoffset);
+		TRACE_AND_STEP();
+		imul_long(destval);
+	    } else {
+		u16 destval;
 
-                DECODE_PRINTF("IMUL\tWORD PTR ");
-                destoffset = decode_rm10_address(rl);
-                DECODE_PRINTF("\n");
-                destval = fetch_data_word(destoffset);
-                TRACE_AND_STEP();
-                imul_word(destval);
-            }
-            break;
-        case 6:
-            if (M.x86.mode & SYSMODE_PREFIX_DATA) {
-                u32 destval;
+		DECODE_PRINTF("IMUL\tWORD PTR ");
+		destoffset = decode_rm10_address(rl);
+		DECODE_PRINTF("\n");
+		destval = fetch_data_word(destoffset);
+		TRACE_AND_STEP();
+		imul_word(destval);
+	    }
+	    break;
+	case 6:
+	    if (M.x86.mode & SYSMODE_PREFIX_DATA) {
+		u32 destval;
 
-                DECODE_PRINTF("DIV\tDWORD PTR ");
-                destoffset = decode_rm10_address(rl);
-                DECODE_PRINTF("\n");
-                destval = fetch_data_long(destoffset);
-                TRACE_AND_STEP();
-                div_long(destval);
-            } else {
-                u16 destval;
+		DECODE_PRINTF("DIV\tDWORD PTR ");
+		destoffset = decode_rm10_address(rl);
+		DECODE_PRINTF("\n");
+		destval = fetch_data_long(destoffset);
+		TRACE_AND_STEP();
+		div_long(destval);
+	    } else {
+		u16 destval;
 
-                DECODE_PRINTF("DIV\tWORD PTR ");
-                destoffset = decode_rm10_address(rl);
-                DECODE_PRINTF("\n");
-                destval = fetch_data_word(destoffset);
-                TRACE_AND_STEP();
-                div_word(destval);
-            }
-            break;
-        case 7:
-            if (M.x86.mode & SYSMODE_PREFIX_DATA) {
-                u32 destval;
+		DECODE_PRINTF("DIV\tWORD PTR ");
+		destoffset = decode_rm10_address(rl);
+		DECODE_PRINTF("\n");
+		destval = fetch_data_word(destoffset);
+		TRACE_AND_STEP();
+		div_word(destval);
+	    }
+	    break;
+	case 7:
+	    if (M.x86.mode & SYSMODE_PREFIX_DATA) {
+		u32 destval;
 
-                DECODE_PRINTF("IDIV\tDWORD PTR ");
-                destoffset = decode_rm10_address(rl);
-                DECODE_PRINTF("\n");
-                destval = fetch_data_long(destoffset);
-                TRACE_AND_STEP();
-                idiv_long(destval);
-            } else {
-                u16 destval;
+		DECODE_PRINTF("IDIV\tDWORD PTR ");
+		destoffset = decode_rm10_address(rl);
+		DECODE_PRINTF("\n");
+		destval = fetch_data_long(destoffset);
+		TRACE_AND_STEP();
+		idiv_long(destval);
+	    } else {
+		u16 destval;
 
-                DECODE_PRINTF("IDIV\tWORD PTR ");
-                destoffset = decode_rm10_address(rl);
-                DECODE_PRINTF("\n");
-                destval = fetch_data_word(destoffset);
-                TRACE_AND_STEP();
-                idiv_word(destval);
-            }
-            break;
-        }
-        break;                  /* end mod==10 */
+		DECODE_PRINTF("IDIV\tWORD PTR ");
+		destoffset = decode_rm10_address(rl);
+		DECODE_PRINTF("\n");
+		destval = fetch_data_word(destoffset);
+		TRACE_AND_STEP();
+		idiv_word(destval);
+	    }
+	    break;
+	}
+	break;                  /* end mod==10 */
     case 3:                     /* mod=11 */
-        switch (rh) {
-        case 0:         /* test word imm */
-            if (M.x86.mode & SYSMODE_PREFIX_DATA) {
-                u32 *destreg;
-                u32 srcval;
+	switch (rh) {
+	case 0:         /* test word imm */
+	    if (M.x86.mode & SYSMODE_PREFIX_DATA) {
+		u32 *destreg;
+		u32 srcval;
 
-                DECODE_PRINTF("TEST\t");
-                destreg = DECODE_RM_LONG_REGISTER(rl);
-                DECODE_PRINTF(",");
-                srcval = fetch_long_imm();
-                DECODE_PRINTF2("%x\n", srcval);
-                TRACE_AND_STEP();
-                test_long(*destreg, srcval);
-            } else {
-                u16 *destreg;
-                u16 srcval;
+		DECODE_PRINTF("TEST\t");
+		destreg = DECODE_RM_LONG_REGISTER(rl);
+		DECODE_PRINTF(",");
+		srcval = fetch_long_imm();
+		DECODE_PRINTF2("%x\n", srcval);
+		TRACE_AND_STEP();
+		test_long(*destreg, srcval);
+	    } else {
+		u16 *destreg;
+		u16 srcval;
 
-                DECODE_PRINTF("TEST\t");
-                destreg = DECODE_RM_WORD_REGISTER(rl);
-                DECODE_PRINTF(",");
-                srcval = fetch_word_imm();
-                DECODE_PRINTF2("%x\n", srcval);
-                TRACE_AND_STEP();
-                test_word(*destreg, srcval);
-            }
-            break;
-        case 1:
-            DECODE_PRINTF("ILLEGAL OP MOD=00 RH=01 OP=F6\n");
-            HALT_SYS();
-            break;
-        case 2:
-            if (M.x86.mode & SYSMODE_PREFIX_DATA) {
-                u32 *destreg;
+		DECODE_PRINTF("TEST\t");
+		destreg = DECODE_RM_WORD_REGISTER(rl);
+		DECODE_PRINTF(",");
+		srcval = fetch_word_imm();
+		DECODE_PRINTF2("%x\n", srcval);
+		TRACE_AND_STEP();
+		test_word(*destreg, srcval);
+	    }
+	    break;
+	case 1:
+	    DECODE_PRINTF("ILLEGAL OP MOD=00 RH=01 OP=F6\n");
+	    HALT_SYS();
+	    break;
+	case 2:
+	    if (M.x86.mode & SYSMODE_PREFIX_DATA) {
+		u32 *destreg;
 
-                DECODE_PRINTF("NOT\t");
-                destreg = DECODE_RM_LONG_REGISTER(rl);
-                DECODE_PRINTF("\n");
-                TRACE_AND_STEP();
-                *destreg = not_long(*destreg);
-            } else {
-                u16 *destreg;
+		DECODE_PRINTF("NOT\t");
+		destreg = DECODE_RM_LONG_REGISTER(rl);
+		DECODE_PRINTF("\n");
+		TRACE_AND_STEP();
+		*destreg = not_long(*destreg);
+	    } else {
+		u16 *destreg;
 
-                DECODE_PRINTF("NOT\t");
-                destreg = DECODE_RM_WORD_REGISTER(rl);
-                DECODE_PRINTF("\n");
-                TRACE_AND_STEP();
-                *destreg = not_word(*destreg);
-            }
-            break;
-        case 3:
-            if (M.x86.mode & SYSMODE_PREFIX_DATA) {
-                u32 *destreg;
+		DECODE_PRINTF("NOT\t");
+		destreg = DECODE_RM_WORD_REGISTER(rl);
+		DECODE_PRINTF("\n");
+		TRACE_AND_STEP();
+		*destreg = not_word(*destreg);
+	    }
+	    break;
+	case 3:
+	    if (M.x86.mode & SYSMODE_PREFIX_DATA) {
+		u32 *destreg;
 
-                DECODE_PRINTF("NEG\t");
-                destreg = DECODE_RM_LONG_REGISTER(rl);
-                DECODE_PRINTF("\n");
-                TRACE_AND_STEP();
-                *destreg = neg_long(*destreg);
-            } else {
-                u16 *destreg;
+		DECODE_PRINTF("NEG\t");
+		destreg = DECODE_RM_LONG_REGISTER(rl);
+		DECODE_PRINTF("\n");
+		TRACE_AND_STEP();
+		*destreg = neg_long(*destreg);
+	    } else {
+		u16 *destreg;
 
-                DECODE_PRINTF("NEG\t");
-                destreg = DECODE_RM_WORD_REGISTER(rl);
-                DECODE_PRINTF("\n");
-                TRACE_AND_STEP();
-                *destreg = neg_word(*destreg);
-            }
-            break;
-        case 4:
-            if (M.x86.mode & SYSMODE_PREFIX_DATA) {
-                u32 *destreg;
+		DECODE_PRINTF("NEG\t");
+		destreg = DECODE_RM_WORD_REGISTER(rl);
+		DECODE_PRINTF("\n");
+		TRACE_AND_STEP();
+		*destreg = neg_word(*destreg);
+	    }
+	    break;
+	case 4:
+	    if (M.x86.mode & SYSMODE_PREFIX_DATA) {
+		u32 *destreg;
 
-                DECODE_PRINTF("MUL\t");
-                destreg = DECODE_RM_LONG_REGISTER(rl);
-                DECODE_PRINTF("\n");
-                TRACE_AND_STEP();
-                mul_long(*destreg);      /*!!!  */
-            } else {
-                u16 *destreg;
+		DECODE_PRINTF("MUL\t");
+		destreg = DECODE_RM_LONG_REGISTER(rl);
+		DECODE_PRINTF("\n");
+		TRACE_AND_STEP();
+		mul_long(*destreg);      /*!!!  */
+	    } else {
+		u16 *destreg;
 
-                DECODE_PRINTF("MUL\t");
-                destreg = DECODE_RM_WORD_REGISTER(rl);
-                DECODE_PRINTF("\n");
-                TRACE_AND_STEP();
-                mul_word(*destreg);      /*!!!  */
-            }
-            break;
-        case 5:
-            if (M.x86.mode & SYSMODE_PREFIX_DATA) {
-                u32 *destreg;
+		DECODE_PRINTF("MUL\t");
+		destreg = DECODE_RM_WORD_REGISTER(rl);
+		DECODE_PRINTF("\n");
+		TRACE_AND_STEP();
+		mul_word(*destreg);      /*!!!  */
+	    }
+	    break;
+	case 5:
+	    if (M.x86.mode & SYSMODE_PREFIX_DATA) {
+		u32 *destreg;
 
-                DECODE_PRINTF("IMUL\t");
-                destreg = DECODE_RM_LONG_REGISTER(rl);
-                DECODE_PRINTF("\n");
-                TRACE_AND_STEP();
-                imul_long(*destreg);
-            } else {
-                u16 *destreg;
+		DECODE_PRINTF("IMUL\t");
+		destreg = DECODE_RM_LONG_REGISTER(rl);
+		DECODE_PRINTF("\n");
+		TRACE_AND_STEP();
+		imul_long(*destreg);
+	    } else {
+		u16 *destreg;
 
-                DECODE_PRINTF("IMUL\t");
-                destreg = DECODE_RM_WORD_REGISTER(rl);
-                DECODE_PRINTF("\n");
-                TRACE_AND_STEP();
-                imul_word(*destreg);
-            }
-            break;
-        case 6:
-            if (M.x86.mode & SYSMODE_PREFIX_DATA) {
-                u32 *destreg;
+		DECODE_PRINTF("IMUL\t");
+		destreg = DECODE_RM_WORD_REGISTER(rl);
+		DECODE_PRINTF("\n");
+		TRACE_AND_STEP();
+		imul_word(*destreg);
+	    }
+	    break;
+	case 6:
+	    if (M.x86.mode & SYSMODE_PREFIX_DATA) {
+		u32 *destreg;
 
-                DECODE_PRINTF("DIV\t");
-                destreg = DECODE_RM_LONG_REGISTER(rl);
-                DECODE_PRINTF("\n");
-                TRACE_AND_STEP();
-                div_long(*destreg);
-            } else {
-                u16 *destreg;
+		DECODE_PRINTF("DIV\t");
+		destreg = DECODE_RM_LONG_REGISTER(rl);
+		DECODE_PRINTF("\n");
+		TRACE_AND_STEP();
+		div_long(*destreg);
+	    } else {
+		u16 *destreg;
 
-                DECODE_PRINTF("DIV\t");
-                destreg = DECODE_RM_WORD_REGISTER(rl);
-                DECODE_PRINTF("\n");
-                TRACE_AND_STEP();
-                div_word(*destreg);
-            }
-            break;
-        case 7:
-            if (M.x86.mode & SYSMODE_PREFIX_DATA) {
-                u32 *destreg;
+		DECODE_PRINTF("DIV\t");
+		destreg = DECODE_RM_WORD_REGISTER(rl);
+		DECODE_PRINTF("\n");
+		TRACE_AND_STEP();
+		div_word(*destreg);
+	    }
+	    break;
+	case 7:
+	    if (M.x86.mode & SYSMODE_PREFIX_DATA) {
+		u32 *destreg;
 
-                DECODE_PRINTF("IDIV\t");
-                destreg = DECODE_RM_LONG_REGISTER(rl);
-                DECODE_PRINTF("\n");
-                TRACE_AND_STEP();
-                idiv_long(*destreg);
-            } else {
-                u16 *destreg;
+		DECODE_PRINTF("IDIV\t");
+		destreg = DECODE_RM_LONG_REGISTER(rl);
+		DECODE_PRINTF("\n");
+		TRACE_AND_STEP();
+		idiv_long(*destreg);
+	    } else {
+		u16 *destreg;
 
-                DECODE_PRINTF("IDIV\t");
-                destreg = DECODE_RM_WORD_REGISTER(rl);
-                DECODE_PRINTF("\n");
-                TRACE_AND_STEP();
-                idiv_word(*destreg);
-            }
-            break;
-        }
-        break;                  /* end mod==11 */
+		DECODE_PRINTF("IDIV\t");
+		destreg = DECODE_RM_WORD_REGISTER(rl);
+		DECODE_PRINTF("\n");
+		TRACE_AND_STEP();
+		idiv_word(*destreg);
+	    }
+	    break;
+	}
+	break;                  /* end mod==11 */
     }
     DECODE_CLEAR_SEGOVR();
     END_OF_INSTR();
@@ -10899,102 +10899,102 @@
     FETCH_DECODE_MODRM(mod, rh, rl);
 #ifdef DEBUG
     if (DEBUG_DECODE()) {
-        /* XXX DECODE_PRINTF may be changed to something more
-           general, so that it is important to leave the strings
-           in the same format, even though the result is that the 
-           above test is done twice. */
+	/* XXX DECODE_PRINTF may be changed to something more
+	   general, so that it is important to leave the strings
+	   in the same format, even though the result is that the
+	   above test is done twice. */
 
-        switch (rh) {
-        case 0:
-            DECODE_PRINTF("INC\t");
-            break;
-        case 1:
-            DECODE_PRINTF("DEC\t");
-            break;
-        case 2:
-        case 3:
-        case 4:
-        case 5:
-        case 6:
-        case 7:
-            DECODE_PRINTF2("ILLEGAL OP MAJOR OP 0xFE MINOR OP %x \n", mod);
-            HALT_SYS();
-            break;
-        }
+	switch (rh) {
+	case 0:
+	    DECODE_PRINTF("INC\t");
+	    break;
+	case 1:
+	    DECODE_PRINTF("DEC\t");
+	    break;
+	case 2:
+	case 3:
+	case 4:
+	case 5:
+	case 6:
+	case 7:
+	    DECODE_PRINTF2("ILLEGAL OP MAJOR OP 0xFE MINOR OP %x \n", mod);
+	    HALT_SYS();
+	    break;
+	}
     }
 #endif
     switch (mod) {
     case 0:
-        DECODE_PRINTF("BYTE PTR ");
-        destoffset = decode_rm00_address(rl);
-        DECODE_PRINTF("\n");
-        switch (rh) {
-        case 0:         /* inc word ptr ... */
-            destval = fetch_data_byte(destoffset);
-            TRACE_AND_STEP();
-            destval = inc_byte(destval);
-            store_data_byte(destoffset, destval);
-            break;
-        case 1:         /* dec word ptr ... */
-            destval = fetch_data_byte(destoffset);
-            TRACE_AND_STEP();
-            destval = dec_byte(destval);
-            store_data_byte(destoffset, destval);
-            break;
-        }
-        break;
+	DECODE_PRINTF("BYTE PTR ");
+	destoffset = decode_rm00_address(rl);
+	DECODE_PRINTF("\n");
+	switch (rh) {
+	case 0:         /* inc word ptr ... */
+	    destval = fetch_data_byte(destoffset);
+	    TRACE_AND_STEP();
+	    destval = inc_byte(destval);
+	    store_data_byte(destoffset, destval);
+	    break;
+	case 1:         /* dec word ptr ... */
+	    destval = fetch_data_byte(destoffset);
+	    TRACE_AND_STEP();
+	    destval = dec_byte(destval);
+	    store_data_byte(destoffset, destval);
+	    break;
+	}
+	break;
     case 1:
-        DECODE_PRINTF("BYTE PTR ");
-        destoffset = decode_rm01_address(rl);
-        DECODE_PRINTF("\n");
-        switch (rh) {
-        case 0:
-            destval = fetch_data_byte(destoffset);
-            TRACE_AND_STEP();
-            destval = inc_byte(destval);
-            store_data_byte(destoffset, destval);
-            break;
-        case 1:
-            destval = fetch_data_byte(destoffset);
-            TRACE_AND_STEP();
-            destval = dec_byte(destval);
-            store_data_byte(destoffset, destval);
-            break;
-        }
-        break;
+	DECODE_PRINTF("BYTE PTR ");
+	destoffset = decode_rm01_address(rl);
+	DECODE_PRINTF("\n");
+	switch (rh) {
+	case 0:
+	    destval = fetch_data_byte(destoffset);
+	    TRACE_AND_STEP();
+	    destval = inc_byte(destval);
+	    store_data_byte(destoffset, destval);
+	    break;
+	case 1:
+	    destval = fetch_data_byte(destoffset);
+	    TRACE_AND_STEP();
+	    destval = dec_byte(destval);
+	    store_data_byte(destoffset, destval);
+	    break;
+	}
+	break;
     case 2:
-        DECODE_PRINTF("BYTE PTR ");
-        destoffset = decode_rm10_address(rl);
-        DECODE_PRINTF("\n");
-        switch (rh) {
-        case 0:
-            destval = fetch_data_byte(destoffset);
-            TRACE_AND_STEP();
-            destval = inc_byte(destval);
-            store_data_byte(destoffset, destval);
-            break;
-        case 1:
-            destval = fetch_data_byte(destoffset);
-            TRACE_AND_STEP();
-            destval = dec_byte(destval);
-            store_data_byte(destoffset, destval);
-            break;
-        }
-        break;
+	DECODE_PRINTF("BYTE PTR ");
+	destoffset = decode_rm10_address(rl);
+	DECODE_PRINTF("\n");
+	switch (rh) {
+	case 0:
+	    destval = fetch_data_byte(destoffset);
+	    TRACE_AND_STEP();
+	    destval = inc_byte(destval);
+	    store_data_byte(destoffset, destval);
+	    break;
+	case 1:
+	    destval = fetch_data_byte(destoffset);
+	    TRACE_AND_STEP();
+	    destval = dec_byte(destval);
+	    store_data_byte(destoffset, destval);
+	    break;
+	}
+	break;
     case 3:
-        destreg = DECODE_RM_BYTE_REGISTER(rl);
-        DECODE_PRINTF("\n");
-        switch (rh) {
-        case 0:
-            TRACE_AND_STEP();
-            *destreg = inc_byte(*destreg);
-            break;
-        case 1:
-            TRACE_AND_STEP();
-            *destreg = dec_byte(*destreg);
-            break;
-        }
-        break;
+	destreg = DECODE_RM_BYTE_REGISTER(rl);
+	DECODE_PRINTF("\n");
+	switch (rh) {
+	case 0:
+	    TRACE_AND_STEP();
+	    *destreg = inc_byte(*destreg);
+	    break;
+	case 1:
+	    TRACE_AND_STEP();
+	    *destreg = dec_byte(*destreg);
+	    break;
+	}
+	break;
     }
     DECODE_CLEAR_SEGOVR();
     END_OF_INSTR();
@@ -11016,374 +11016,374 @@
     FETCH_DECODE_MODRM(mod, rh, rl);
 #ifdef DEBUG
     if (DEBUG_DECODE()) {
-        /* XXX DECODE_PRINTF may be changed to something more
-           general, so that it is important to leave the strings
-           in the same format, even though the result is that the
-           above test is done twice. */
+	/* XXX DECODE_PRINTF may be changed to something more
+	   general, so that it is important to leave the strings
+	   in the same format, even though the result is that the
+	   above test is done twice. */
 
-        switch (rh) {
-        case 0:
-            if (M.x86.mode & SYSMODE_PREFIX_DATA) {
-                DECODE_PRINTF("INC\tDWORD PTR ");
-            } else {
-                DECODE_PRINTF("INC\tWORD PTR ");
-            }
-            break;
-        case 1:
-            if (M.x86.mode & SYSMODE_PREFIX_DATA) {
-                DECODE_PRINTF("DEC\tDWORD PTR ");
-            } else {
-                DECODE_PRINTF("DEC\tWORD PTR ");
-            }
-            break;
-        case 2:
-            DECODE_PRINTF("CALL\t ");
-            break;
-        case 3:
-            DECODE_PRINTF("CALL\tFAR ");
-            break;
-        case 4:
-            DECODE_PRINTF("JMP\t");
-            break;
-        case 5:
-            DECODE_PRINTF("JMP\tFAR ");
-            break;
-        case 6:
-            DECODE_PRINTF("PUSH\t");
-            break;
-        case 7:
-            DECODE_PRINTF("ILLEGAL DECODING OF OPCODE FF\t");
-            HALT_SYS();
-            break;
-        }
+	switch (rh) {
+	case 0:
+	    if (M.x86.mode & SYSMODE_PREFIX_DATA) {
+		DECODE_PRINTF("INC\tDWORD PTR ");
+	    } else {
+		DECODE_PRINTF("INC\tWORD PTR ");
+	    }
+	    break;
+	case 1:
+	    if (M.x86.mode & SYSMODE_PREFIX_DATA) {
+		DECODE_PRINTF("DEC\tDWORD PTR ");
+	    } else {
+		DECODE_PRINTF("DEC\tWORD PTR ");
+	    }
+	    break;
+	case 2:
+	    DECODE_PRINTF("CALL\t ");
+	    break;
+	case 3:
+	    DECODE_PRINTF("CALL\tFAR ");
+	    break;
+	case 4:
+	    DECODE_PRINTF("JMP\t");
+	    break;
+	case 5:
+	    DECODE_PRINTF("JMP\tFAR ");
+	    break;
+	case 6:
+	    DECODE_PRINTF("PUSH\t");
+	    break;
+	case 7:
+	    DECODE_PRINTF("ILLEGAL DECODING OF OPCODE FF\t");
+	    HALT_SYS();
+	    break;
+	}
     }
 #endif
     switch (mod) {
     case 0:
-        destoffset = decode_rm00_address(rl);
-        DECODE_PRINTF("\n");
-        switch (rh) {
-        case 0:         /* inc word ptr ... */
-            if (M.x86.mode & SYSMODE_PREFIX_DATA) {
-                u32 destval;
+	destoffset = decode_rm00_address(rl);
+	DECODE_PRINTF("\n");
+	switch (rh) {
+	case 0:         /* inc word ptr ... */
+	    if (M.x86.mode & SYSMODE_PREFIX_DATA) {
+		u32 destval;
 
-                destval = fetch_data_long(destoffset);
-                TRACE_AND_STEP();
-                destval = inc_long(destval);
-                store_data_long(destoffset, destval);
-            } else {
-                u16 destval;
+		destval = fetch_data_long(destoffset);
+		TRACE_AND_STEP();
+		destval = inc_long(destval);
+		store_data_long(destoffset, destval);
+	    } else {
+		u16 destval;
 
-                destval = fetch_data_word(destoffset);
-                TRACE_AND_STEP();
-                destval = inc_word(destval);
-                store_data_word(destoffset, destval);
-            }
-            break;
-        case 1:         /* dec word ptr ... */
-            if (M.x86.mode & SYSMODE_PREFIX_DATA) {
-                u32 destval;
+		destval = fetch_data_word(destoffset);
+		TRACE_AND_STEP();
+		destval = inc_word(destval);
+		store_data_word(destoffset, destval);
+	    }
+	    break;
+	case 1:         /* dec word ptr ... */
+	    if (M.x86.mode & SYSMODE_PREFIX_DATA) {
+		u32 destval;
 
-                destval = fetch_data_long(destoffset);
-                TRACE_AND_STEP();
-                destval = dec_long(destval);
-                store_data_long(destoffset, destval);
-            } else {
-                u16 destval;
+		destval = fetch_data_long(destoffset);
+		TRACE_AND_STEP();
+		destval = dec_long(destval);
+		store_data_long(destoffset, destval);
+	    } else {
+		u16 destval;
 
-                destval = fetch_data_word(destoffset);
-                TRACE_AND_STEP();
-                destval = dec_word(destval);
-                store_data_word(destoffset, destval);
-            }
-            break;
-        case 2:         /* call word ptr ... */
-            destval = fetch_data_word(destoffset);
-            TRACE_AND_STEP();
-            push_word(M.x86.R_IP);
-            M.x86.R_IP = destval;
-            break;
-        case 3:         /* call far ptr ... */
-            destval = fetch_data_word(destoffset);
-            destval2 = fetch_data_word(destoffset + 2);
-            TRACE_AND_STEP();
-            push_word(M.x86.R_CS);
-            M.x86.R_CS = destval2;
-            push_word(M.x86.R_IP);
-            M.x86.R_IP = destval;
-            break;
-        case 4:         /* jmp word ptr ... */
-            destval = fetch_data_word(destoffset);
-            TRACE_AND_STEP();
-            M.x86.R_IP = destval;
-            break;
-        case 5:         /* jmp far ptr ... */
-            destval = fetch_data_word(destoffset);
-            destval2 = fetch_data_word(destoffset + 2);
-            TRACE_AND_STEP();
-            M.x86.R_IP = destval;
-            M.x86.R_CS = destval2;
-            break;
-        case 6:         /*  push word ptr ... */
-            if (M.x86.mode & SYSMODE_PREFIX_DATA) {
-                u32 destval;
+		destval = fetch_data_word(destoffset);
+		TRACE_AND_STEP();
+		destval = dec_word(destval);
+		store_data_word(destoffset, destval);
+	    }
+	    break;
+	case 2:         /* call word ptr ... */
+	    destval = fetch_data_word(destoffset);
+	    TRACE_AND_STEP();
+	    push_word(M.x86.R_IP);
+	    M.x86.R_IP = destval;
+	    break;
+	case 3:         /* call far ptr ... */
+	    destval = fetch_data_word(destoffset);
+	    destval2 = fetch_data_word(destoffset + 2);
+	    TRACE_AND_STEP();
+	    push_word(M.x86.R_CS);
+	    M.x86.R_CS = destval2;
+	    push_word(M.x86.R_IP);
+	    M.x86.R_IP = destval;
+	    break;
+	case 4:         /* jmp word ptr ... */
+	    destval = fetch_data_word(destoffset);
+	    TRACE_AND_STEP();
+	    M.x86.R_IP = destval;
+	    break;
+	case 5:         /* jmp far ptr ... */
+	    destval = fetch_data_word(destoffset);
+	    destval2 = fetch_data_word(destoffset + 2);
+	    TRACE_AND_STEP();
+	    M.x86.R_IP = destval;
+	    M.x86.R_CS = destval2;
+	    break;
+	case 6:         /*  push word ptr ... */
+	    if (M.x86.mode & SYSMODE_PREFIX_DATA) {
+		u32 destval;
 
-                destval = fetch_data_long(destoffset);
-                TRACE_AND_STEP();
-                push_long(destval);
-            } else {
-                u16 destval;
+		destval = fetch_data_long(destoffset);
+		TRACE_AND_STEP();
+		push_long(destval);
+	    } else {
+		u16 destval;
 
-                destval = fetch_data_word(destoffset);
-                TRACE_AND_STEP();
-                push_word(destval);
-            }
-            break;
-        }
-        break;
+		destval = fetch_data_word(destoffset);
+		TRACE_AND_STEP();
+		push_word(destval);
+	    }
+	    break;
+	}
+	break;
     case 1:
-        destoffset = decode_rm01_address(rl);
-        DECODE_PRINTF("\n");
-        switch (rh) {
-        case 0:
-            if (M.x86.mode & SYSMODE_PREFIX_DATA) {
-                u32 destval;
+	destoffset = decode_rm01_address(rl);
+	DECODE_PRINTF("\n");
+	switch (rh) {
+	case 0:
+	    if (M.x86.mode & SYSMODE_PREFIX_DATA) {
+		u32 destval;
 
-                destval = fetch_data_long(destoffset);
-                TRACE_AND_STEP();
-                destval = inc_long(destval);
-                store_data_long(destoffset, destval);
-            } else {
-                u16 destval;
+		destval = fetch_data_long(destoffset);
+		TRACE_AND_STEP();
+		destval = inc_long(destval);
+		store_data_long(destoffset, destval);
+	    } else {
+		u16 destval;
 
-                destval = fetch_data_word(destoffset);
-                TRACE_AND_STEP();
-                destval = inc_word(destval);
-                store_data_word(destoffset, destval);
-            }
-            break;
-        case 1:
-            if (M.x86.mode & SYSMODE_PREFIX_DATA) {
-                u32 destval;
+		destval = fetch_data_word(destoffset);
+		TRACE_AND_STEP();
+		destval = inc_word(destval);
+		store_data_word(destoffset, destval);
+	    }
+	    break;
+	case 1:
+	    if (M.x86.mode & SYSMODE_PREFIX_DATA) {
+		u32 destval;
 
-                destval = fetch_data_long(destoffset);
-                TRACE_AND_STEP();
-                destval = dec_long(destval);
-                store_data_long(destoffset, destval);
-            } else {
-                u16 destval;
+		destval = fetch_data_long(destoffset);
+		TRACE_AND_STEP();
+		destval = dec_long(destval);
+		store_data_long(destoffset, destval);
+	    } else {
+		u16 destval;
 
-                destval = fetch_data_word(destoffset);
-                TRACE_AND_STEP();
-                destval = dec_word(destval);
-                store_data_word(destoffset, destval);
-            }
-            break;
-        case 2:         /* call word ptr ... */
-            destval = fetch_data_word(destoffset);
-            TRACE_AND_STEP();
-            push_word(M.x86.R_IP);
-            M.x86.R_IP = destval;
-            break;
-        case 3:         /* call far ptr ... */
-            destval = fetch_data_word(destoffset);
-            destval2 = fetch_data_word(destoffset + 2);
-            TRACE_AND_STEP();
-            push_word(M.x86.R_CS);
-            M.x86.R_CS = destval2;
-            push_word(M.x86.R_IP);
-            M.x86.R_IP = destval;
-            break;
-        case 4:         /* jmp word ptr ... */
-            destval = fetch_data_word(destoffset);
-            TRACE_AND_STEP();
-            M.x86.R_IP = destval;
-            break;
-        case 5:         /* jmp far ptr ... */
-            destval = fetch_data_word(destoffset);
-            destval2 = fetch_data_word(destoffset + 2);
-            TRACE_AND_STEP();
-            M.x86.R_IP = destval;
-            M.x86.R_CS = destval2;
-            break;
-        case 6:         /*  push word ptr ... */
-            if (M.x86.mode & SYSMODE_PREFIX_DATA) {
-                u32 destval;
+		destval = fetch_data_word(destoffset);
+		TRACE_AND_STEP();
+		destval = dec_word(destval);
+		store_data_word(destoffset, destval);
+	    }
+	    break;
+	case 2:         /* call word ptr ... */
+	    destval = fetch_data_word(destoffset);
+	    TRACE_AND_STEP();
+	    push_word(M.x86.R_IP);
+	    M.x86.R_IP = destval;
+	    break;
+	case 3:         /* call far ptr ... */
+	    destval = fetch_data_word(destoffset);
+	    destval2 = fetch_data_word(destoffset + 2);
+	    TRACE_AND_STEP();
+	    push_word(M.x86.R_CS);
+	    M.x86.R_CS = destval2;
+	    push_word(M.x86.R_IP);
+	    M.x86.R_IP = destval;
+	    break;
+	case 4:         /* jmp word ptr ... */
+	    destval = fetch_data_word(destoffset);
+	    TRACE_AND_STEP();
+	    M.x86.R_IP = destval;
+	    break;
+	case 5:         /* jmp far ptr ... */
+	    destval = fetch_data_word(destoffset);
+	    destval2 = fetch_data_word(destoffset + 2);
+	    TRACE_AND_STEP();
+	    M.x86.R_IP = destval;
+	    M.x86.R_CS = destval2;
+	    break;
+	case 6:         /*  push word ptr ... */
+	    if (M.x86.mode & SYSMODE_PREFIX_DATA) {
+		u32 destval;
 
-                destval = fetch_data_long(destoffset);
-                TRACE_AND_STEP();
-                push_long(destval);
-            } else {
-                u16 destval;
+		destval = fetch_data_long(destoffset);
+		TRACE_AND_STEP();
+		push_long(destval);
+	    } else {
+		u16 destval;
 
-                destval = fetch_data_word(destoffset);
-                TRACE_AND_STEP();
-                push_word(destval);
-            }
-            break;
-        }
-        break;
+		destval = fetch_data_word(destoffset);
+		TRACE_AND_STEP();
+		push_word(destval);
+	    }
+	    break;
+	}
+	break;
     case 2:
-        destoffset = decode_rm10_address(rl);
-        DECODE_PRINTF("\n");
-        switch (rh) {
-        case 0:
-            if (M.x86.mode & SYSMODE_PREFIX_DATA) {
-                u32 destval;
+	destoffset = decode_rm10_address(rl);
+	DECODE_PRINTF("\n");
+	switch (rh) {
+	case 0:
+	    if (M.x86.mode & SYSMODE_PREFIX_DATA) {
+		u32 destval;
 
-                destval = fetch_data_long(destoffset);
-                TRACE_AND_STEP();
-                destval = inc_long(destval);
-                store_data_long(destoffset, destval);
-            } else {
-                u16 destval;
+		destval = fetch_data_long(destoffset);
+		TRACE_AND_STEP();
+		destval = inc_long(destval);
+		store_data_long(destoffset, destval);
+	    } else {
+		u16 destval;
 
-                destval = fetch_data_word(destoffset);
-                TRACE_AND_STEP();
-                destval = inc_word(destval);
-                store_data_word(destoffset, destval);
-            }
-            break;
-        case 1:
-            if (M.x86.mode & SYSMODE_PREFIX_DATA) {
-                u32 destval;
+		destval = fetch_data_word(destoffset);
+		TRACE_AND_STEP();
+		destval = inc_word(destval);
+		store_data_word(destoffset, destval);
+	    }
+	    break;
+	case 1:
+	    if (M.x86.mode & SYSMODE_PREFIX_DATA) {
+		u32 destval;
 
-                destval = fetch_data_long(destoffset);
-                TRACE_AND_STEP();
-                destval = dec_long(destval);
-                store_data_long(destoffset, destval);
-            } else {
-                u16 destval;
+		destval = fetch_data_long(destoffset);
+		TRACE_AND_STEP();
+		destval = dec_long(destval);
+		store_data_long(destoffset, destval);
+	    } else {
+		u16 destval;
 
-                destval = fetch_data_word(destoffset);
-                TRACE_AND_STEP();
-                destval = dec_word(destval);
-                store_data_word(destoffset, destval);
-            }
-            break;
-        case 2:         /* call word ptr ... */
-            destval = fetch_data_word(destoffset);
-            TRACE_AND_STEP();
-            push_word(M.x86.R_IP);
-            M.x86.R_IP = destval;
-            break;
-        case 3:         /* call far ptr ... */
-            destval = fetch_data_word(destoffset);
-            destval2 = fetch_data_word(destoffset + 2);
-            TRACE_AND_STEP();
-            push_word(M.x86.R_CS);
-            M.x86.R_CS = destval2;
-            push_word(M.x86.R_IP);
-            M.x86.R_IP = destval;
-            break;
-        case 4:         /* jmp word ptr ... */
-            destval = fetch_data_word(destoffset);
-            TRACE_AND_STEP();
-            M.x86.R_IP = destval;
-            break;
-        case 5:         /* jmp far ptr ... */
-            destval = fetch_data_word(destoffset);
-            destval2 = fetch_data_word(destoffset + 2);
-            TRACE_AND_STEP();
-            M.x86.R_IP = destval;
-            M.x86.R_CS = destval2;
-            break;
-        case 6:         /*  push word ptr ... */
-            if (M.x86.mode & SYSMODE_PREFIX_DATA) {
-                u32 destval;
+		destval = fetch_data_word(destoffset);
+		TRACE_AND_STEP();
+		destval = dec_word(destval);
+		store_data_word(destoffset, destval);
+	    }
+	    break;
+	case 2:         /* call word ptr ... */
+	    destval = fetch_data_word(destoffset);
+	    TRACE_AND_STEP();
+	    push_word(M.x86.R_IP);
+	    M.x86.R_IP = destval;
+	    break;
+	case 3:         /* call far ptr ... */
+	    destval = fetch_data_word(destoffset);
+	    destval2 = fetch_data_word(destoffset + 2);
+	    TRACE_AND_STEP();
+	    push_word(M.x86.R_CS);
+	    M.x86.R_CS = destval2;
+	    push_word(M.x86.R_IP);
+	    M.x86.R_IP = destval;
+	    break;
+	case 4:         /* jmp word ptr ... */
+	    destval = fetch_data_word(destoffset);
+	    TRACE_AND_STEP();
+	    M.x86.R_IP = destval;
+	    break;
+	case 5:         /* jmp far ptr ... */
+	    destval = fetch_data_word(destoffset);
+	    destval2 = fetch_data_word(destoffset + 2);
+	    TRACE_AND_STEP();
+	    M.x86.R_IP = destval;
+	    M.x86.R_CS = destval2;
+	    break;
+	case 6:         /*  push word ptr ... */
+	    if (M.x86.mode & SYSMODE_PREFIX_DATA) {
+		u32 destval;
 
-                destval = fetch_data_long(destoffset);
-                TRACE_AND_STEP();
-                push_long(destval);
-            } else {
-                u16 destval;
+		destval = fetch_data_long(destoffset);
+		TRACE_AND_STEP();
+		push_long(destval);
+	    } else {
+		u16 destval;
 
-                destval = fetch_data_word(destoffset);
-                TRACE_AND_STEP();
-                push_word(destval);
-            }
-            break;
-        }
-        break;
+		destval = fetch_data_word(destoffset);
+		TRACE_AND_STEP();
+		push_word(destval);
+	    }
+	    break;
+	}
+	break;
     case 3:
-        switch (rh) {
-        case 0:
-            if (M.x86.mode & SYSMODE_PREFIX_DATA) {
-                u32 *destreg;
+	switch (rh) {
+	case 0:
+	    if (M.x86.mode & SYSMODE_PREFIX_DATA) {
+		u32 *destreg;
 
-                destreg = DECODE_RM_LONG_REGISTER(rl);
-                DECODE_PRINTF("\n");
-                TRACE_AND_STEP();
-                *destreg = inc_long(*destreg);
-            } else {
-                u16 *destreg;
+		destreg = DECODE_RM_LONG_REGISTER(rl);
+		DECODE_PRINTF("\n");
+		TRACE_AND_STEP();
+		*destreg = inc_long(*destreg);
+	    } else {
+		u16 *destreg;
 
-                destreg = DECODE_RM_WORD_REGISTER(rl);
-                DECODE_PRINTF("\n");
-                TRACE_AND_STEP();
-                *destreg = inc_word(*destreg);
-            }
-            break;
-        case 1:
-            if (M.x86.mode & SYSMODE_PREFIX_DATA) {
-                u32 *destreg;
+		destreg = DECODE_RM_WORD_REGISTER(rl);
+		DECODE_PRINTF("\n");
+		TRACE_AND_STEP();
+		*destreg = inc_word(*destreg);
+	    }
+	    break;
+	case 1:
+	    if (M.x86.mode & SYSMODE_PREFIX_DATA) {
+		u32 *destreg;
 
-                destreg = DECODE_RM_LONG_REGISTER(rl);
-                DECODE_PRINTF("\n");
-                TRACE_AND_STEP();
-                *destreg = dec_long(*destreg);
-            } else {
-                u16 *destreg;
+		destreg = DECODE_RM_LONG_REGISTER(rl);
+		DECODE_PRINTF("\n");
+		TRACE_AND_STEP();
+		*destreg = dec_long(*destreg);
+	    } else {
+		u16 *destreg;
 
-                destreg = DECODE_RM_WORD_REGISTER(rl);
-                DECODE_PRINTF("\n");
-                TRACE_AND_STEP();
-                *destreg = dec_word(*destreg);
-            }
-            break;
-        case 2:         /* call word ptr ... */
-            destreg = DECODE_RM_WORD_REGISTER(rl);
-            DECODE_PRINTF("\n");
-            TRACE_AND_STEP();
-            push_word(M.x86.R_IP);
-            M.x86.R_IP = *destreg;
-            break;
-        case 3:         /* jmp far ptr ... */
-            DECODE_PRINTF("OPERATION UNDEFINED 0XFF \n");
-            TRACE_AND_STEP();
-            HALT_SYS();
-            break;
+		destreg = DECODE_RM_WORD_REGISTER(rl);
+		DECODE_PRINTF("\n");
+		TRACE_AND_STEP();
+		*destreg = dec_word(*destreg);
+	    }
+	    break;
+	case 2:         /* call word ptr ... */
+	    destreg = DECODE_RM_WORD_REGISTER(rl);
+	    DECODE_PRINTF("\n");
+	    TRACE_AND_STEP();
+	    push_word(M.x86.R_IP);
+	    M.x86.R_IP = *destreg;
+	    break;
+	case 3:         /* jmp far ptr ... */
+	    DECODE_PRINTF("OPERATION UNDEFINED 0XFF \n");
+	    TRACE_AND_STEP();
+	    HALT_SYS();
+	    break;
 
-        case 4:         /* jmp  ... */
-            destreg = DECODE_RM_WORD_REGISTER(rl);
-            DECODE_PRINTF("\n");
-            TRACE_AND_STEP();
-            M.x86.R_IP = (u16) (*destreg);
-            break;
-        case 5:         /* jmp far ptr ... */
-            DECODE_PRINTF("OPERATION UNDEFINED 0XFF \n");
-            TRACE_AND_STEP();
-            HALT_SYS();
-            break;
-        case 6:
-            if (M.x86.mode & SYSMODE_PREFIX_DATA) {
-                u32 *destreg;
+	case 4:         /* jmp  ... */
+	    destreg = DECODE_RM_WORD_REGISTER(rl);
+	    DECODE_PRINTF("\n");
+	    TRACE_AND_STEP();
+	    M.x86.R_IP = (u16) (*destreg);
+	    break;
+	case 5:         /* jmp far ptr ... */
+	    DECODE_PRINTF("OPERATION UNDEFINED 0XFF \n");
+	    TRACE_AND_STEP();
+	    HALT_SYS();
+	    break;
+	case 6:
+	    if (M.x86.mode & SYSMODE_PREFIX_DATA) {
+		u32 *destreg;
 
-                destreg = DECODE_RM_LONG_REGISTER(rl);
-                DECODE_PRINTF("\n");
-                TRACE_AND_STEP();
-                push_long(*destreg);
-            } else {
-                u16 *destreg;
+		destreg = DECODE_RM_LONG_REGISTER(rl);
+		DECODE_PRINTF("\n");
+		TRACE_AND_STEP();
+		push_long(*destreg);
+	    } else {
+		u16 *destreg;
 
-                destreg = DECODE_RM_WORD_REGISTER(rl);
-                DECODE_PRINTF("\n");
-                TRACE_AND_STEP();
-                push_word(*destreg);
-            }
-            break;
-        }
-        break;
+		destreg = DECODE_RM_WORD_REGISTER(rl);
+		DECODE_PRINTF("\n");
+		TRACE_AND_STEP();
+		push_word(*destreg);
+	    }
+	    break;
+	}
+	break;
     }
     DECODE_CLEAR_SEGOVR();
     END_OF_INSTR();

diff --git a/board/MAI/bios_emulator/scitech/src/x86emu/ops2.c b/board/MAI/bios_emulator/scitech/src/x86emu/ops2.c
index 2ada44e..d381307 100644
--- a/board/MAI/bios_emulator/scitech/src/x86emu/ops2.c
+++ b/board/MAI/bios_emulator/scitech/src/x86emu/ops2.c

@@ -77,71 +77,71 @@
     START_OF_INSTR();
     switch (op2) {
       case 0x80:
-        name = "JO\t";
-        cond =  ACCESS_FLAG(F_OF);
-        break;
+	name = "JO\t";
+	cond =  ACCESS_FLAG(F_OF);
+	break;
       case 0x81:
-        name = "JNO\t";
-        cond = !ACCESS_FLAG(F_OF);
-        break;
+	name = "JNO\t";
+	cond = !ACCESS_FLAG(F_OF);
+	break;
       case 0x82:
-        name = "JB\t";
-        cond = ACCESS_FLAG(F_CF);
-        break;
+	name = "JB\t";
+	cond = ACCESS_FLAG(F_CF);
+	break;
       case 0x83:
-        name = "JNB\t";
-        cond = !ACCESS_FLAG(F_CF);
-        break;
+	name = "JNB\t";
+	cond = !ACCESS_FLAG(F_CF);
+	break;
       case 0x84:
-        name = "JZ\t";
-        cond = ACCESS_FLAG(F_ZF);
-        break;
+	name = "JZ\t";
+	cond = ACCESS_FLAG(F_ZF);
+	break;
       case 0x85:
-        name = "JNZ\t";
-        cond = !ACCESS_FLAG(F_ZF);
-        break;
+	name = "JNZ\t";
+	cond = !ACCESS_FLAG(F_ZF);
+	break;
       case 0x86:
-        name = "JBE\t";
-        cond = ACCESS_FLAG(F_CF) || ACCESS_FLAG(F_ZF);
-        break;
+	name = "JBE\t";
+	cond = ACCESS_FLAG(F_CF) || ACCESS_FLAG(F_ZF);
+	break;
       case 0x87:
-        name = "JNBE\t";
-        cond = !(ACCESS_FLAG(F_CF) || ACCESS_FLAG(F_ZF));
-        break;
+	name = "JNBE\t";
+	cond = !(ACCESS_FLAG(F_CF) || ACCESS_FLAG(F_ZF));
+	break;
       case 0x88:
-        name = "JS\t";
-        cond = ACCESS_FLAG(F_SF);
-        break;
+	name = "JS\t";
+	cond = ACCESS_FLAG(F_SF);
+	break;
       case 0x89:
-        name = "JNS\t";
-        cond = !ACCESS_FLAG(F_SF);
-        break;
+	name = "JNS\t";
+	cond = !ACCESS_FLAG(F_SF);
+	break;
       case 0x8a:
-        name = "JP\t";
-        cond = ACCESS_FLAG(F_PF);
-        break;
+	name = "JP\t";
+	cond = ACCESS_FLAG(F_PF);
+	break;
       case 0x8b:
-        name = "JNP\t";
-        cond = !ACCESS_FLAG(F_PF);
-        break;
+	name = "JNP\t";
+	cond = !ACCESS_FLAG(F_PF);
+	break;
       case 0x8c:
-        name = "JL\t";
-        cond = xorl(ACCESS_FLAG(F_SF), ACCESS_FLAG(F_OF));
-        break;
+	name = "JL\t";
+	cond = xorl(ACCESS_FLAG(F_SF), ACCESS_FLAG(F_OF));
+	break;
       case 0x8d:
-        name = "JNL\t";
-        cond = xorl(ACCESS_FLAG(F_SF), ACCESS_FLAG(F_OF));
-        break;
+	name = "JNL\t";
+	cond = xorl(ACCESS_FLAG(F_SF), ACCESS_FLAG(F_OF));
+	break;
       case 0x8e:
-        name = "JLE\t";
-        cond = (xorl(ACCESS_FLAG(F_SF), ACCESS_FLAG(F_OF)) ||
-                ACCESS_FLAG(F_ZF));
-        break;
+	name = "JLE\t";
+	cond = (xorl(ACCESS_FLAG(F_SF), ACCESS_FLAG(F_OF)) ||
+		ACCESS_FLAG(F_ZF));
+	break;
       case 0x8f:
-        name = "JNLE\t";
-        cond = !(xorl(ACCESS_FLAG(F_SF), ACCESS_FLAG(F_OF)) ||
-                 ACCESS_FLAG(F_ZF));
-        break;
+	name = "JNLE\t";
+	cond = !(xorl(ACCESS_FLAG(F_SF), ACCESS_FLAG(F_OF)) ||
+		 ACCESS_FLAG(F_ZF));
+	break;
     }
     DECODE_PRINTF(name);
     target = (s16) fetch_word_imm();
@@ -149,7 +149,7 @@
     DECODE_PRINTF2("%04x\n", target);
     TRACE_AND_STEP();
     if (cond)
-        M.x86.R_IP = (u16)target;
+	M.x86.R_IP = (u16)target;
     DECODE_CLEAR_SEGOVR();
     END_OF_INSTR();
 }
@@ -169,95 +169,95 @@
     START_OF_INSTR();
     switch (op2) {
       case 0x90:
-        name = "SETO\t";
-        cond =  ACCESS_FLAG(F_OF);
-        break;
+	name = "SETO\t";
+	cond =  ACCESS_FLAG(F_OF);
+	break;
       case 0x91:
-        name = "SETNO\t";
-        cond = !ACCESS_FLAG(F_OF);
-        break;
+	name = "SETNO\t";
+	cond = !ACCESS_FLAG(F_OF);
+	break;
       case 0x92:
-        name = "SETB\t";
-        cond = ACCESS_FLAG(F_CF);
-        break;
+	name = "SETB\t";
+	cond = ACCESS_FLAG(F_CF);
+	break;
       case 0x93:
-        name = "SETNB\t";
-        cond = !ACCESS_FLAG(F_CF);
-        break;
+	name = "SETNB\t";
+	cond = !ACCESS_FLAG(F_CF);
+	break;
       case 0x94:
-        name = "SETZ\t";
-        cond = ACCESS_FLAG(F_ZF);
-        break;
+	name = "SETZ\t";
+	cond = ACCESS_FLAG(F_ZF);
+	break;
       case 0x95:
-        name = "SETNZ\t";
-        cond = !ACCESS_FLAG(F_ZF);
-        break;
+	name = "SETNZ\t";
+	cond = !ACCESS_FLAG(F_ZF);
+	break;
       case 0x96:
-        name = "SETBE\t";
-        cond = ACCESS_FLAG(F_CF) || ACCESS_FLAG(F_ZF);
-        break;
+	name = "SETBE\t";
+	cond = ACCESS_FLAG(F_CF) || ACCESS_FLAG(F_ZF);
+	break;
       case 0x97:
-        name = "SETNBE\t";
-        cond = !(ACCESS_FLAG(F_CF) || ACCESS_FLAG(F_ZF));
-        break;
+	name = "SETNBE\t";
+	cond = !(ACCESS_FLAG(F_CF) || ACCESS_FLAG(F_ZF));
+	break;
       case 0x98:
-        name = "SETS\t";
-        cond = ACCESS_FLAG(F_SF);
-        break;
+	name = "SETS\t";
+	cond = ACCESS_FLAG(F_SF);
+	break;
       case 0x99:
-        name = "SETNS\t";
-        cond = !ACCESS_FLAG(F_SF);
-        break;
+	name = "SETNS\t";
+	cond = !ACCESS_FLAG(F_SF);
+	break;
       case 0x9a:
-        name = "SETP\t";
-        cond = ACCESS_FLAG(F_PF);
-        break;
+	name = "SETP\t";
+	cond = ACCESS_FLAG(F_PF);
+	break;
       case 0x9b:
-        name = "SETNP\t";
-        cond = !ACCESS_FLAG(F_PF);
-        break;
+	name = "SETNP\t";
+	cond = !ACCESS_FLAG(F_PF);
+	break;
       case 0x9c:
-        name = "SETL\t";
-        cond = xorl(ACCESS_FLAG(F_SF), ACCESS_FLAG(F_OF));
-        break;
+	name = "SETL\t";
+	cond = xorl(ACCESS_FLAG(F_SF), ACCESS_FLAG(F_OF));
+	break;
       case 0x9d:
-        name = "SETNL\t";
-        cond = xorl(ACCESS_FLAG(F_SF), ACCESS_FLAG(F_OF));
-        break;
+	name = "SETNL\t";
+	cond = xorl(ACCESS_FLAG(F_SF), ACCESS_FLAG(F_OF));
+	break;
       case 0x9e:
-        name = "SETLE\t";
-        cond = (xorl(ACCESS_FLAG(F_SF), ACCESS_FLAG(F_OF)) ||
-                ACCESS_FLAG(F_ZF));
-        break;
+	name = "SETLE\t";
+	cond = (xorl(ACCESS_FLAG(F_SF), ACCESS_FLAG(F_OF)) ||
+		ACCESS_FLAG(F_ZF));
+	break;
       case 0x9f:
-        name = "SETNLE\t";
-        cond = !(xorl(ACCESS_FLAG(F_SF), ACCESS_FLAG(F_OF)) ||
-                 ACCESS_FLAG(F_ZF));
-        break;
+	name = "SETNLE\t";
+	cond = !(xorl(ACCESS_FLAG(F_SF), ACCESS_FLAG(F_OF)) ||
+		 ACCESS_FLAG(F_ZF));
+	break;
     }
     DECODE_PRINTF(name);
     FETCH_DECODE_MODRM(mod, rh, rl);
     switch (mod) {
     case 0:
-        destoffset = decode_rm00_address(rl);
-        TRACE_AND_STEP();
-        store_data_byte(destoffset, cond ? 0x01 : 0x00);
-        break;
+	destoffset = decode_rm00_address(rl);
+	TRACE_AND_STEP();
+	store_data_byte(destoffset, cond ? 0x01 : 0x00);
+	break;
     case 1:
-        destoffset = decode_rm01_address(rl);
-        TRACE_AND_STEP();
-        store_data_byte(destoffset, cond ? 0x01 : 0x00);
-        break;
+	destoffset = decode_rm01_address(rl);
+	TRACE_AND_STEP();
+	store_data_byte(destoffset, cond ? 0x01 : 0x00);
+	break;
     case 2:
-        destoffset = decode_rm10_address(rl);
-        TRACE_AND_STEP();
-        store_data_byte(destoffset, cond ? 0x01 : 0x00);
-        break;
+	destoffset = decode_rm10_address(rl);
+	TRACE_AND_STEP();
+	store_data_byte(destoffset, cond ? 0x01 : 0x00);
+	break;
     case 3:                     /* register to register */
-        destreg = DECODE_RM_BYTE_REGISTER(rl);
-        TRACE_AND_STEP();
-        *destreg = cond ? 0x01 : 0x00;
-        break;
+	destreg = DECODE_RM_BYTE_REGISTER(rl);
+	TRACE_AND_STEP();
+	*destreg = cond ? 0x01 : 0x00;
+	break;
     }
     DECODE_CLEAR_SEGOVR();
     END_OF_INSTR();
@@ -306,107 +306,107 @@
     FETCH_DECODE_MODRM(mod, rh, rl);
     switch (mod) {
     case 0:
-        if (M.x86.mode & SYSMODE_PREFIX_DATA) {
-            u32 srcval;
-            u32 *shiftreg;
+	if (M.x86.mode & SYSMODE_PREFIX_DATA) {
+	    u32 srcval;
+	    u32 *shiftreg;
 
-            srcoffset = decode_rm00_address(rl);
-            DECODE_PRINTF(",");
-            shiftreg = DECODE_RM_LONG_REGISTER(rh);
-            TRACE_AND_STEP();
-            bit = *shiftreg & 0x1F;
-            disp = (s16)*shiftreg >> 5;
-            srcval = fetch_data_long(srcoffset+disp);
-            CONDITIONAL_SET_FLAG(srcval & (0x1 << bit),F_CF);
-        } else {
-            u16 srcval;
-            u16 *shiftreg;
+	    srcoffset = decode_rm00_address(rl);
+	    DECODE_PRINTF(",");
+	    shiftreg = DECODE_RM_LONG_REGISTER(rh);
+	    TRACE_AND_STEP();
+	    bit = *shiftreg & 0x1F;
+	    disp = (s16)*shiftreg >> 5;
+	    srcval = fetch_data_long(srcoffset+disp);
+	    CONDITIONAL_SET_FLAG(srcval & (0x1 << bit),F_CF);
+	} else {
+	    u16 srcval;
+	    u16 *shiftreg;
 
-            srcoffset = decode_rm00_address(rl);
-            DECODE_PRINTF(",");
-            shiftreg = DECODE_RM_WORD_REGISTER(rh);
-            TRACE_AND_STEP();
-            bit = *shiftreg & 0xF;
-            disp = (s16)*shiftreg >> 4;
-            srcval = fetch_data_word(srcoffset+disp);
-            CONDITIONAL_SET_FLAG(srcval & (0x1 << bit),F_CF);
-        }
-        break;
+	    srcoffset = decode_rm00_address(rl);
+	    DECODE_PRINTF(",");
+	    shiftreg = DECODE_RM_WORD_REGISTER(rh);
+	    TRACE_AND_STEP();
+	    bit = *shiftreg & 0xF;
+	    disp = (s16)*shiftreg >> 4;
+	    srcval = fetch_data_word(srcoffset+disp);
+	    CONDITIONAL_SET_FLAG(srcval & (0x1 << bit),F_CF);
+	}
+	break;
     case 1:
-        if (M.x86.mode & SYSMODE_PREFIX_DATA) {
-            u32 srcval;
-            u32 *shiftreg;
+	if (M.x86.mode & SYSMODE_PREFIX_DATA) {
+	    u32 srcval;
+	    u32 *shiftreg;
 
-            srcoffset = decode_rm01_address(rl);
-            DECODE_PRINTF(",");
-            shiftreg = DECODE_RM_LONG_REGISTER(rh);
-            TRACE_AND_STEP();
-            bit = *shiftreg & 0x1F;
-            disp = (s16)*shiftreg >> 5;
-            srcval = fetch_data_long(srcoffset+disp);
-            CONDITIONAL_SET_FLAG(srcval & (0x1 << bit),F_CF);
-        } else {
-            u16 srcval;
-            u16 *shiftreg;
+	    srcoffset = decode_rm01_address(rl);
+	    DECODE_PRINTF(",");
+	    shiftreg = DECODE_RM_LONG_REGISTER(rh);
+	    TRACE_AND_STEP();
+	    bit = *shiftreg & 0x1F;
+	    disp = (s16)*shiftreg >> 5;
+	    srcval = fetch_data_long(srcoffset+disp);
+	    CONDITIONAL_SET_FLAG(srcval & (0x1 << bit),F_CF);
+	} else {
+	    u16 srcval;
+	    u16 *shiftreg;
 
-            srcoffset = decode_rm01_address(rl);
-            DECODE_PRINTF(",");
-            shiftreg = DECODE_RM_WORD_REGISTER(rh);
-            TRACE_AND_STEP();
-            bit = *shiftreg & 0xF;
-            disp = (s16)*shiftreg >> 4;
-            srcval = fetch_data_word(srcoffset+disp);
-            CONDITIONAL_SET_FLAG(srcval & (0x1 << bit),F_CF);
-        }
-        break;
+	    srcoffset = decode_rm01_address(rl);
+	    DECODE_PRINTF(",");
+	    shiftreg = DECODE_RM_WORD_REGISTER(rh);
+	    TRACE_AND_STEP();
+	    bit = *shiftreg & 0xF;
+	    disp = (s16)*shiftreg >> 4;
+	    srcval = fetch_data_word(srcoffset+disp);
+	    CONDITIONAL_SET_FLAG(srcval & (0x1 << bit),F_CF);
+	}
+	break;
     case 2:
-        if (M.x86.mode & SYSMODE_PREFIX_DATA) {
-            u32 srcval;
-            u32 *shiftreg;
+	if (M.x86.mode & SYSMODE_PREFIX_DATA) {
+	    u32 srcval;
+	    u32 *shiftreg;
 
-            srcoffset = decode_rm10_address(rl);
-            DECODE_PRINTF(",");
-            shiftreg = DECODE_RM_LONG_REGISTER(rh);
-            TRACE_AND_STEP();
-            bit = *shiftreg & 0x1F;
-            disp = (s16)*shiftreg >> 5;
-            srcval = fetch_data_long(srcoffset+disp);
-            CONDITIONAL_SET_FLAG(srcval & (0x1 << bit),F_CF);
-        } else {
-            u16 srcval;
-            u16 *shiftreg;
+	    srcoffset = decode_rm10_address(rl);
+	    DECODE_PRINTF(",");
+	    shiftreg = DECODE_RM_LONG_REGISTER(rh);
+	    TRACE_AND_STEP();
+	    bit = *shiftreg & 0x1F;
+	    disp = (s16)*shiftreg >> 5;
+	    srcval = fetch_data_long(srcoffset+disp);
+	    CONDITIONAL_SET_FLAG(srcval & (0x1 << bit),F_CF);
+	} else {
+	    u16 srcval;
+	    u16 *shiftreg;
 
-            srcoffset = decode_rm10_address(rl);
-            DECODE_PRINTF(",");
-            shiftreg = DECODE_RM_WORD_REGISTER(rh);
-            TRACE_AND_STEP();
-            bit = *shiftreg & 0xF;
-            disp = (s16)*shiftreg >> 4;
-            srcval = fetch_data_word(srcoffset+disp);
-            CONDITIONAL_SET_FLAG(srcval & (0x1 << bit),F_CF);
-        }
-        break;
+	    srcoffset = decode_rm10_address(rl);
+	    DECODE_PRINTF(",");
+	    shiftreg = DECODE_RM_WORD_REGISTER(rh);
+	    TRACE_AND_STEP();
+	    bit = *shiftreg & 0xF;
+	    disp = (s16)*shiftreg >> 4;
+	    srcval = fetch_data_word(srcoffset+disp);
+	    CONDITIONAL_SET_FLAG(srcval & (0x1 << bit),F_CF);
+	}
+	break;
     case 3:                     /* register to register */
-        if (M.x86.mode & SYSMODE_PREFIX_DATA) {
-            u32 *srcreg,*shiftreg;
+	if (M.x86.mode & SYSMODE_PREFIX_DATA) {
+	    u32 *srcreg,*shiftreg;
 
-            srcreg = DECODE_RM_LONG_REGISTER(rl);
-            DECODE_PRINTF(",");
-            shiftreg = DECODE_RM_LONG_REGISTER(rh);
-            TRACE_AND_STEP();
-            bit = *shiftreg & 0x1F;
-            CONDITIONAL_SET_FLAG(*srcreg & (0x1 << bit),F_CF);
-        } else {
-            u16 *srcreg,*shiftreg;
+	    srcreg = DECODE_RM_LONG_REGISTER(rl);
+	    DECODE_PRINTF(",");
+	    shiftreg = DECODE_RM_LONG_REGISTER(rh);
+	    TRACE_AND_STEP();
+	    bit = *shiftreg & 0x1F;
+	    CONDITIONAL_SET_FLAG(*srcreg & (0x1 << bit),F_CF);
+	} else {
+	    u16 *srcreg,*shiftreg;
 
-            srcreg = DECODE_RM_WORD_REGISTER(rl);
-            DECODE_PRINTF(",");
-            shiftreg = DECODE_RM_WORD_REGISTER(rh);
-            TRACE_AND_STEP();
-            bit = *shiftreg & 0xF;
-            CONDITIONAL_SET_FLAG(*srcreg & (0x1 << bit),F_CF);
-        }
-        break;
+	    srcreg = DECODE_RM_WORD_REGISTER(rl);
+	    DECODE_PRINTF(",");
+	    shiftreg = DECODE_RM_WORD_REGISTER(rh);
+	    TRACE_AND_STEP();
+	    bit = *shiftreg & 0xF;
+	    CONDITIONAL_SET_FLAG(*srcreg & (0x1 << bit),F_CF);
+	}
+	break;
     }
     DECODE_CLEAR_SEGOVR();
     END_OF_INSTR();
@@ -427,123 +427,123 @@
     FETCH_DECODE_MODRM(mod, rh, rl);
     switch (mod) {
     case 0:
-        if (M.x86.mode & SYSMODE_PREFIX_DATA) {
-            u32 destval;
-            u32 *shiftreg;
+	if (M.x86.mode & SYSMODE_PREFIX_DATA) {
+	    u32 destval;
+	    u32 *shiftreg;
 
-            destoffset = decode_rm00_address(rl);
-            DECODE_PRINTF(",");
-            shiftreg = DECODE_RM_LONG_REGISTER(rh);
-            DECODE_PRINTF(",");
-            shift = fetch_byte_imm();
-            DECODE_PRINTF2("%d\n", shift);
-            TRACE_AND_STEP();
-            destval = fetch_data_long(destoffset);
-            destval = shld_long(destval,*shiftreg,shift);
-            store_data_long(destoffset, destval);
-        } else {
-            u16 destval;
-            u16 *shiftreg;
+	    destoffset = decode_rm00_address(rl);
+	    DECODE_PRINTF(",");
+	    shiftreg = DECODE_RM_LONG_REGISTER(rh);
+	    DECODE_PRINTF(",");
+	    shift = fetch_byte_imm();
+	    DECODE_PRINTF2("%d\n", shift);
+	    TRACE_AND_STEP();
+	    destval = fetch_data_long(destoffset);
+	    destval = shld_long(destval,*shiftreg,shift);
+	    store_data_long(destoffset, destval);
+	} else {
+	    u16 destval;
+	    u16 *shiftreg;
 
-            destoffset = decode_rm00_address(rl);
-            DECODE_PRINTF(",");
-            shiftreg = DECODE_RM_WORD_REGISTER(rh);
-            DECODE_PRINTF(",");
-            shift = fetch_byte_imm();
-            DECODE_PRINTF2("%d\n", shift);
-            TRACE_AND_STEP();
-            destval = fetch_data_word(destoffset);
-            destval = shld_word(destval,*shiftreg,shift);
-            store_data_word(destoffset, destval);
-        }
-        break;
+	    destoffset = decode_rm00_address(rl);
+	    DECODE_PRINTF(",");
+	    shiftreg = DECODE_RM_WORD_REGISTER(rh);
+	    DECODE_PRINTF(",");
+	    shift = fetch_byte_imm();
+	    DECODE_PRINTF2("%d\n", shift);
+	    TRACE_AND_STEP();
+	    destval = fetch_data_word(destoffset);
+	    destval = shld_word(destval,*shiftreg,shift);
+	    store_data_word(destoffset, destval);
+	}
+	break;
     case 1:
-        if (M.x86.mode & SYSMODE_PREFIX_DATA) {
-            u32 destval;
-            u32 *shiftreg;
+	if (M.x86.mode & SYSMODE_PREFIX_DATA) {
+	    u32 destval;
+	    u32 *shiftreg;
 
-            destoffset = decode_rm01_address(rl);
-            DECODE_PRINTF(",");
-            shiftreg = DECODE_RM_LONG_REGISTER(rh);
-            DECODE_PRINTF(",");
-            shift = fetch_byte_imm();
-            DECODE_PRINTF2("%d\n", shift);
-            TRACE_AND_STEP();
-            destval = fetch_data_long(destoffset);
-            destval = shld_long(destval,*shiftreg,shift);
-            store_data_long(destoffset, destval);
-        } else {
-            u16 destval;
-            u16 *shiftreg;
+	    destoffset = decode_rm01_address(rl);
+	    DECODE_PRINTF(",");
+	    shiftreg = DECODE_RM_LONG_REGISTER(rh);
+	    DECODE_PRINTF(",");
+	    shift = fetch_byte_imm();
+	    DECODE_PRINTF2("%d\n", shift);
+	    TRACE_AND_STEP();
+	    destval = fetch_data_long(destoffset);
+	    destval = shld_long(destval,*shiftreg,shift);
+	    store_data_long(destoffset, destval);
+	} else {
+	    u16 destval;
+	    u16 *shiftreg;
 
-            destoffset = decode_rm01_address(rl);
-            DECODE_PRINTF(",");
-            shiftreg = DECODE_RM_WORD_REGISTER(rh);
-            DECODE_PRINTF(",");
-            shift = fetch_byte_imm();
-            DECODE_PRINTF2("%d\n", shift);
-            TRACE_AND_STEP();
-            destval = fetch_data_word(destoffset);
-            destval = shld_word(destval,*shiftreg,shift);
-            store_data_word(destoffset, destval);
-        }
-        break;
+	    destoffset = decode_rm01_address(rl);
+	    DECODE_PRINTF(",");
+	    shiftreg = DECODE_RM_WORD_REGISTER(rh);
+	    DECODE_PRINTF(",");
+	    shift = fetch_byte_imm();
+	    DECODE_PRINTF2("%d\n", shift);
+	    TRACE_AND_STEP();
+	    destval = fetch_data_word(destoffset);
+	    destval = shld_word(destval,*shiftreg,shift);
+	    store_data_word(destoffset, destval);
+	}
+	break;
     case 2:
-        if (M.x86.mode & SYSMODE_PREFIX_DATA) {
-            u32 destval;
-            u32 *shiftreg;
+	if (M.x86.mode & SYSMODE_PREFIX_DATA) {
+	    u32 destval;
+	    u32 *shiftreg;
 
-            destoffset = decode_rm10_address(rl);
-            DECODE_PRINTF(",");
-            shiftreg = DECODE_RM_LONG_REGISTER(rh);
-            DECODE_PRINTF(",");
-            shift = fetch_byte_imm();
-            DECODE_PRINTF2("%d\n", shift);
-            TRACE_AND_STEP();
-            destval = fetch_data_long(destoffset);
-            destval = shld_long(destval,*shiftreg,shift);
-            store_data_long(destoffset, destval);
-        } else {
-            u16 destval;
-            u16 *shiftreg;
+	    destoffset = decode_rm10_address(rl);
+	    DECODE_PRINTF(",");
+	    shiftreg = DECODE_RM_LONG_REGISTER(rh);
+	    DECODE_PRINTF(",");
+	    shift = fetch_byte_imm();
+	    DECODE_PRINTF2("%d\n", shift);
+	    TRACE_AND_STEP();
+	    destval = fetch_data_long(destoffset);
+	    destval = shld_long(destval,*shiftreg,shift);
+	    store_data_long(destoffset, destval);
+	} else {
+	    u16 destval;
+	    u16 *shiftreg;
 
-            destoffset = decode_rm10_address(rl);
-            DECODE_PRINTF(",");
-            shiftreg = DECODE_RM_WORD_REGISTER(rh);
-            DECODE_PRINTF(",");
-            shift = fetch_byte_imm();
-            DECODE_PRINTF2("%d\n", shift);
-            TRACE_AND_STEP();
-            destval = fetch_data_word(destoffset);
-            destval = shld_word(destval,*shiftreg,shift);
-            store_data_word(destoffset, destval);
-        }
-        break;
+	    destoffset = decode_rm10_address(rl);
+	    DECODE_PRINTF(",");
+	    shiftreg = DECODE_RM_WORD_REGISTER(rh);
+	    DECODE_PRINTF(",");
+	    shift = fetch_byte_imm();
+	    DECODE_PRINTF2("%d\n", shift);
+	    TRACE_AND_STEP();
+	    destval = fetch_data_word(destoffset);
+	    destval = shld_word(destval,*shiftreg,shift);
+	    store_data_word(destoffset, destval);
+	}
+	break;
     case 3:                     /* register to register */
-        if (M.x86.mode & SYSMODE_PREFIX_DATA) {
-            u32 *destreg,*shiftreg;
+	if (M.x86.mode & SYSMODE_PREFIX_DATA) {
+	    u32 *destreg,*shiftreg;
 
-            destreg = DECODE_RM_LONG_REGISTER(rl);
-            DECODE_PRINTF(",");
-            shiftreg = DECODE_RM_LONG_REGISTER(rh);
-            DECODE_PRINTF(",");
-            shift = fetch_byte_imm();
-            DECODE_PRINTF2("%d\n", shift);
-            TRACE_AND_STEP();
-            *destreg = shld_long(*destreg,*shiftreg,shift);
-        } else {
-            u16 *destreg,*shiftreg;
+	    destreg = DECODE_RM_LONG_REGISTER(rl);
+	    DECODE_PRINTF(",");
+	    shiftreg = DECODE_RM_LONG_REGISTER(rh);
+	    DECODE_PRINTF(",");
+	    shift = fetch_byte_imm();
+	    DECODE_PRINTF2("%d\n", shift);
+	    TRACE_AND_STEP();
+	    *destreg = shld_long(*destreg,*shiftreg,shift);
+	} else {
+	    u16 *destreg,*shiftreg;
 
-            destreg = DECODE_RM_WORD_REGISTER(rl);
-            DECODE_PRINTF(",");
-            shiftreg = DECODE_RM_WORD_REGISTER(rh);
-            DECODE_PRINTF(",");
-            shift = fetch_byte_imm();
-            DECODE_PRINTF2("%d\n", shift);
-            TRACE_AND_STEP();
-            *destreg = shld_word(*destreg,*shiftreg,shift);
-        }
-        break;
+	    destreg = DECODE_RM_WORD_REGISTER(rl);
+	    DECODE_PRINTF(",");
+	    shiftreg = DECODE_RM_WORD_REGISTER(rh);
+	    DECODE_PRINTF(",");
+	    shift = fetch_byte_imm();
+	    DECODE_PRINTF2("%d\n", shift);
+	    TRACE_AND_STEP();
+	    *destreg = shld_word(*destreg,*shiftreg,shift);
+	}
+	break;
     }
     DECODE_CLEAR_SEGOVR();
     END_OF_INSTR();
@@ -563,107 +563,107 @@
     FETCH_DECODE_MODRM(mod, rh, rl);
     switch (mod) {
     case 0:
-        if (M.x86.mode & SYSMODE_PREFIX_DATA) {
-            u32 destval;
-            u32 *shiftreg;
+	if (M.x86.mode & SYSMODE_PREFIX_DATA) {
+	    u32 destval;
+	    u32 *shiftreg;
 
-            destoffset = decode_rm00_address(rl);
-            DECODE_PRINTF(",");
-            shiftreg = DECODE_RM_LONG_REGISTER(rh);
-            DECODE_PRINTF(",CL\n");
-            TRACE_AND_STEP();
-            destval = fetch_data_long(destoffset);
-            destval = shld_long(destval,*shiftreg,M.x86.R_CL);
-            store_data_long(destoffset, destval);
-        } else {
-            u16 destval;
-            u16 *shiftreg;
+	    destoffset = decode_rm00_address(rl);
+	    DECODE_PRINTF(",");
+	    shiftreg = DECODE_RM_LONG_REGISTER(rh);
+	    DECODE_PRINTF(",CL\n");
+	    TRACE_AND_STEP();
+	    destval = fetch_data_long(destoffset);
+	    destval = shld_long(destval,*shiftreg,M.x86.R_CL);
+	    store_data_long(destoffset, destval);
+	} else {
+	    u16 destval;
+	    u16 *shiftreg;
 
-            destoffset = decode_rm00_address(rl);
-            DECODE_PRINTF(",");
-            shiftreg = DECODE_RM_WORD_REGISTER(rh);
-            DECODE_PRINTF(",CL\n");
-            TRACE_AND_STEP();
-            destval = fetch_data_word(destoffset);
-            destval = shld_word(destval,*shiftreg,M.x86.R_CL);
-            store_data_word(destoffset, destval);
-        }
-        break;
+	    destoffset = decode_rm00_address(rl);
+	    DECODE_PRINTF(",");
+	    shiftreg = DECODE_RM_WORD_REGISTER(rh);
+	    DECODE_PRINTF(",CL\n");
+	    TRACE_AND_STEP();
+	    destval = fetch_data_word(destoffset);
+	    destval = shld_word(destval,*shiftreg,M.x86.R_CL);
+	    store_data_word(destoffset, destval);
+	}
+	break;
     case 1:
-        if (M.x86.mode & SYSMODE_PREFIX_DATA) {
-            u32 destval;
-            u32 *shiftreg;
+	if (M.x86.mode & SYSMODE_PREFIX_DATA) {
+	    u32 destval;
+	    u32 *shiftreg;
 
-            destoffset = decode_rm01_address(rl);
-            DECODE_PRINTF(",");
-            shiftreg = DECODE_RM_LONG_REGISTER(rh);
-            DECODE_PRINTF(",CL\n");
-            TRACE_AND_STEP();
-            destval = fetch_data_long(destoffset);
-            destval = shld_long(destval,*shiftreg,M.x86.R_CL);
-            store_data_long(destoffset, destval);
-        } else {
-            u16 destval;
-            u16 *shiftreg;
+	    destoffset = decode_rm01_address(rl);
+	    DECODE_PRINTF(",");
+	    shiftreg = DECODE_RM_LONG_REGISTER(rh);
+	    DECODE_PRINTF(",CL\n");
+	    TRACE_AND_STEP();
+	    destval = fetch_data_long(destoffset);
+	    destval = shld_long(destval,*shiftreg,M.x86.R_CL);
+	    store_data_long(destoffset, destval);
+	} else {
+	    u16 destval;
+	    u16 *shiftreg;
 
-            destoffset = decode_rm01_address(rl);
-            DECODE_PRINTF(",");
-            shiftreg = DECODE_RM_WORD_REGISTER(rh);
-            DECODE_PRINTF(",CL\n");
-            TRACE_AND_STEP();
-            destval = fetch_data_word(destoffset);
-            destval = shld_word(destval,*shiftreg,M.x86.R_CL);
-            store_data_word(destoffset, destval);
-        }
-        break;
+	    destoffset = decode_rm01_address(rl);
+	    DECODE_PRINTF(",");
+	    shiftreg = DECODE_RM_WORD_REGISTER(rh);
+	    DECODE_PRINTF(",CL\n");
+	    TRACE_AND_STEP();
+	    destval = fetch_data_word(destoffset);
+	    destval = shld_word(destval,*shiftreg,M.x86.R_CL);
+	    store_data_word(destoffset, destval);
+	}
+	break;
     case 2:
-        if (M.x86.mode & SYSMODE_PREFIX_DATA) {
-            u32 destval;
-            u32 *shiftreg;
+	if (M.x86.mode & SYSMODE_PREFIX_DATA) {
+	    u32 destval;
+	    u32 *shiftreg;
 
-            destoffset = decode_rm10_address(rl);
-            DECODE_PRINTF(",");
-            shiftreg = DECODE_RM_LONG_REGISTER(rh);
-            DECODE_PRINTF(",CL\n");
-            TRACE_AND_STEP();
-            destval = fetch_data_long(destoffset);
-            destval = shld_long(destval,*shiftreg,M.x86.R_CL);
-            store_data_long(destoffset, destval);
-        } else {
-            u16 destval;
-            u16 *shiftreg;
+	    destoffset = decode_rm10_address(rl);
+	    DECODE_PRINTF(",");
+	    shiftreg = DECODE_RM_LONG_REGISTER(rh);
+	    DECODE_PRINTF(",CL\n");
+	    TRACE_AND_STEP();
+	    destval = fetch_data_long(destoffset);
+	    destval = shld_long(destval,*shiftreg,M.x86.R_CL);
+	    store_data_long(destoffset, destval);
+	} else {
+	    u16 destval;
+	    u16 *shiftreg;
 
-            destoffset = decode_rm10_address(rl);
-            DECODE_PRINTF(",");
-            shiftreg = DECODE_RM_WORD_REGISTER(rh);
-            DECODE_PRINTF(",CL\n");
-            TRACE_AND_STEP();
-            destval = fetch_data_word(destoffset);
-            destval = shld_word(destval,*shiftreg,M.x86.R_CL);
-            store_data_word(destoffset, destval);
-        }
-        break;
+	    destoffset = decode_rm10_address(rl);
+	    DECODE_PRINTF(",");
+	    shiftreg = DECODE_RM_WORD_REGISTER(rh);
+	    DECODE_PRINTF(",CL\n");
+	    TRACE_AND_STEP();
+	    destval = fetch_data_word(destoffset);
+	    destval = shld_word(destval,*shiftreg,M.x86.R_CL);
+	    store_data_word(destoffset, destval);
+	}
+	break;
     case 3:                     /* register to register */
-        if (M.x86.mode & SYSMODE_PREFIX_DATA) {
-            u32 *destreg,*shiftreg;
+	if (M.x86.mode & SYSMODE_PREFIX_DATA) {
+	    u32 *destreg,*shiftreg;
 
-            destreg = DECODE_RM_LONG_REGISTER(rl);
-            DECODE_PRINTF(",");
-            shiftreg = DECODE_RM_LONG_REGISTER(rh);
-            DECODE_PRINTF(",CL\n");
-            TRACE_AND_STEP();
-            *destreg = shld_long(*destreg,*shiftreg,M.x86.R_CL);
-        } else {
-            u16 *destreg,*shiftreg;
+	    destreg = DECODE_RM_LONG_REGISTER(rl);
+	    DECODE_PRINTF(",");
+	    shiftreg = DECODE_RM_LONG_REGISTER(rh);
+	    DECODE_PRINTF(",CL\n");
+	    TRACE_AND_STEP();
+	    *destreg = shld_long(*destreg,*shiftreg,M.x86.R_CL);
+	} else {
+	    u16 *destreg,*shiftreg;
 
-            destreg = DECODE_RM_WORD_REGISTER(rl);
-            DECODE_PRINTF(",");
-            shiftreg = DECODE_RM_WORD_REGISTER(rh);
-            DECODE_PRINTF(",CL\n");
-            TRACE_AND_STEP();
-            *destreg = shld_word(*destreg,*shiftreg,M.x86.R_CL);
-        }
-        break;
+	    destreg = DECODE_RM_WORD_REGISTER(rl);
+	    DECODE_PRINTF(",");
+	    shiftreg = DECODE_RM_WORD_REGISTER(rh);
+	    DECODE_PRINTF(",CL\n");
+	    TRACE_AND_STEP();
+	    *destreg = shld_word(*destreg,*shiftreg,M.x86.R_CL);
+	}
+	break;
     }
     DECODE_CLEAR_SEGOVR();
     END_OF_INSTR();
@@ -712,85 +712,85 @@
     FETCH_DECODE_MODRM(mod, rh, rl);
     switch (mod) {
     case 0:
-        if (M.x86.mode & SYSMODE_PREFIX_DATA) {
-            u32 srcval,mask;
-            u32 *shiftreg;
+	if (M.x86.mode & SYSMODE_PREFIX_DATA) {
+	    u32 srcval,mask;
+	    u32 *shiftreg;
 
-            srcoffset = decode_rm00_address(rl);
-            DECODE_PRINTF(",");
-            shiftreg = DECODE_RM_LONG_REGISTER(rh);
-            TRACE_AND_STEP();
-            bit = *shiftreg & 0x1F;
-            disp = (s16)*shiftreg >> 5;
-            srcval = fetch_data_long(srcoffset+disp);
-            mask = (0x1 << bit);
-            CONDITIONAL_SET_FLAG(srcval & mask,F_CF);
-            store_data_long(srcoffset+disp, srcval | mask);
-        } else {
-            u16 srcval,mask;
-            u16 *shiftreg;
+	    srcoffset = decode_rm00_address(rl);
+	    DECODE_PRINTF(",");
+	    shiftreg = DECODE_RM_LONG_REGISTER(rh);
+	    TRACE_AND_STEP();
+	    bit = *shiftreg & 0x1F;
+	    disp = (s16)*shiftreg >> 5;
+	    srcval = fetch_data_long(srcoffset+disp);
+	    mask = (0x1 << bit);
+	    CONDITIONAL_SET_FLAG(srcval & mask,F_CF);
+	    store_data_long(srcoffset+disp, srcval | mask);
+	} else {
+	    u16 srcval,mask;
+	    u16 *shiftreg;
 
-            srcoffset = decode_rm00_address(rl);
-            DECODE_PRINTF(",");
-            shiftreg = DECODE_RM_WORD_REGISTER(rh);
-            TRACE_AND_STEP();
-            bit = *shiftreg & 0xF;
-            disp = (s16)*shiftreg >> 4;
-            srcval = fetch_data_word(srcoffset+disp);
+	    srcoffset = decode_rm00_address(rl);
+	    DECODE_PRINTF(",");
+	    shiftreg = DECODE_RM_WORD_REGISTER(rh);
+	    TRACE_AND_STEP();
+	    bit = *shiftreg & 0xF;
+	    disp = (s16)*shiftreg >> 4;
+	    srcval = fetch_data_word(srcoffset+disp);
 			mask = (u16)(0x1 << bit);
-            CONDITIONAL_SET_FLAG(srcval & mask,F_CF);
-            store_data_word(srcoffset+disp, srcval | mask);
-        }
-        break;
+	    CONDITIONAL_SET_FLAG(srcval & mask,F_CF);
+	    store_data_word(srcoffset+disp, srcval | mask);
+	}
+	break;
     case 1:
-        if (M.x86.mode & SYSMODE_PREFIX_DATA) {
-            u32 srcval,mask;
-            u32 *shiftreg;
+	if (M.x86.mode & SYSMODE_PREFIX_DATA) {
+	    u32 srcval,mask;
+	    u32 *shiftreg;
 
-            srcoffset = decode_rm01_address(rl);
-            DECODE_PRINTF(",");
-            shiftreg = DECODE_RM_LONG_REGISTER(rh);
-            TRACE_AND_STEP();
-            bit = *shiftreg & 0x1F;
-            disp = (s16)*shiftreg >> 5;
-            srcval = fetch_data_long(srcoffset+disp);
-            mask = (0x1 << bit);
-            CONDITIONAL_SET_FLAG(srcval & mask,F_CF);
-            store_data_long(srcoffset+disp, srcval | mask);
-        } else {
-            u16 srcval,mask;
-            u16 *shiftreg;
+	    srcoffset = decode_rm01_address(rl);
+	    DECODE_PRINTF(",");
+	    shiftreg = DECODE_RM_LONG_REGISTER(rh);
+	    TRACE_AND_STEP();
+	    bit = *shiftreg & 0x1F;
+	    disp = (s16)*shiftreg >> 5;
+	    srcval = fetch_data_long(srcoffset+disp);
+	    mask = (0x1 << bit);
+	    CONDITIONAL_SET_FLAG(srcval & mask,F_CF);
+	    store_data_long(srcoffset+disp, srcval | mask);
+	} else {
+	    u16 srcval,mask;
+	    u16 *shiftreg;
 
-            srcoffset = decode_rm01_address(rl);
-            DECODE_PRINTF(",");
-            shiftreg = DECODE_RM_WORD_REGISTER(rh);
-            TRACE_AND_STEP();
-            bit = *shiftreg & 0xF;
-            disp = (s16)*shiftreg >> 4;
-            srcval = fetch_data_word(srcoffset+disp);
+	    srcoffset = decode_rm01_address(rl);
+	    DECODE_PRINTF(",");
+	    shiftreg = DECODE_RM_WORD_REGISTER(rh);
+	    TRACE_AND_STEP();
+	    bit = *shiftreg & 0xF;
+	    disp = (s16)*shiftreg >> 4;
+	    srcval = fetch_data_word(srcoffset+disp);
 			mask = (u16)(0x1 << bit);
-            CONDITIONAL_SET_FLAG(srcval & mask,F_CF);
-            store_data_word(srcoffset+disp, srcval | mask);
-        }
-        break;
+	    CONDITIONAL_SET_FLAG(srcval & mask,F_CF);
+	    store_data_word(srcoffset+disp, srcval | mask);
+	}
+	break;
     case 2:
-        if (M.x86.mode & SYSMODE_PREFIX_DATA) {
-            u32 srcval,mask;
-            u32 *shiftreg;
+	if (M.x86.mode & SYSMODE_PREFIX_DATA) {
+	    u32 srcval,mask;
+	    u32 *shiftreg;
 
-            srcoffset = decode_rm10_address(rl);
-            DECODE_PRINTF(",");
-            shiftreg = DECODE_RM_LONG_REGISTER(rh);
-            TRACE_AND_STEP();
-            bit = *shiftreg & 0x1F;
-            disp = (s16)*shiftreg >> 5;
-            srcval = fetch_data_long(srcoffset+disp);
-            mask = (0x1 << bit);
-            CONDITIONAL_SET_FLAG(srcval & mask,F_CF);
-            store_data_long(srcoffset+disp, srcval | mask);
-        } else {
-            u16 srcval,mask;
-            u16 *shiftreg;
+	    srcoffset = decode_rm10_address(rl);
+	    DECODE_PRINTF(",");
+	    shiftreg = DECODE_RM_LONG_REGISTER(rh);
+	    TRACE_AND_STEP();
+	    bit = *shiftreg & 0x1F;
+	    disp = (s16)*shiftreg >> 5;
+	    srcval = fetch_data_long(srcoffset+disp);
+	    mask = (0x1 << bit);
+	    CONDITIONAL_SET_FLAG(srcval & mask,F_CF);
+	    store_data_long(srcoffset+disp, srcval | mask);
+	} else {
+	    u16 srcval,mask;
+	    u16 *shiftreg;
 
 			srcoffset = decode_rm10_address(rl);
 			DECODE_PRINTF(",");
@@ -827,10 +827,10 @@
 			TRACE_AND_STEP();
 			bit = *shiftreg & 0xF;
 			mask = (u16)(0x1 << bit);
-            CONDITIONAL_SET_FLAG(*srcreg & mask,F_CF);
-            *srcreg |= mask;
-        }
-        break;
+	    CONDITIONAL_SET_FLAG(*srcreg & mask,F_CF);
+	    *srcreg |= mask;
+	}
+	break;
     }
     DECODE_CLEAR_SEGOVR();
     END_OF_INSTR();
@@ -851,123 +851,123 @@
     FETCH_DECODE_MODRM(mod, rh, rl);
     switch (mod) {
     case 0:
-        if (M.x86.mode & SYSMODE_PREFIX_DATA) {
-            u32 destval;
-            u32 *shiftreg;
+	if (M.x86.mode & SYSMODE_PREFIX_DATA) {
+	    u32 destval;
+	    u32 *shiftreg;
 
-            destoffset = decode_rm00_address(rl);
-            DECODE_PRINTF(",");
-            shiftreg = DECODE_RM_LONG_REGISTER(rh);
-            DECODE_PRINTF(",");
-            shift = fetch_byte_imm();
-            DECODE_PRINTF2("%d\n", shift);
-            TRACE_AND_STEP();
-            destval = fetch_data_long(destoffset);
-            destval = shrd_long(destval,*shiftreg,shift);
-            store_data_long(destoffset, destval);
-        } else {
-            u16 destval;
-            u16 *shiftreg;
+	    destoffset = decode_rm00_address(rl);
+	    DECODE_PRINTF(",");
+	    shiftreg = DECODE_RM_LONG_REGISTER(rh);
+	    DECODE_PRINTF(",");
+	    shift = fetch_byte_imm();
+	    DECODE_PRINTF2("%d\n", shift);
+	    TRACE_AND_STEP();
+	    destval = fetch_data_long(destoffset);
+	    destval = shrd_long(destval,*shiftreg,shift);
+	    store_data_long(destoffset, destval);
+	} else {
+	    u16 destval;
+	    u16 *shiftreg;
 
-            destoffset = decode_rm00_address(rl);
-            DECODE_PRINTF(",");
-            shiftreg = DECODE_RM_WORD_REGISTER(rh);
-            DECODE_PRINTF(",");
-            shift = fetch_byte_imm();
-            DECODE_PRINTF2("%d\n", shift);
-            TRACE_AND_STEP();
-            destval = fetch_data_word(destoffset);
-            destval = shrd_word(destval,*shiftreg,shift);
-            store_data_word(destoffset, destval);
-        }
-        break;
+	    destoffset = decode_rm00_address(rl);
+	    DECODE_PRINTF(",");
+	    shiftreg = DECODE_RM_WORD_REGISTER(rh);
+	    DECODE_PRINTF(",");
+	    shift = fetch_byte_imm();
+	    DECODE_PRINTF2("%d\n", shift);
+	    TRACE_AND_STEP();
+	    destval = fetch_data_word(destoffset);
+	    destval = shrd_word(destval,*shiftreg,shift);
+	    store_data_word(destoffset, destval);
+	}
+	break;
     case 1:
-        if (M.x86.mode & SYSMODE_PREFIX_DATA) {
-            u32 destval;
-            u32 *shiftreg;
+	if (M.x86.mode & SYSMODE_PREFIX_DATA) {
+	    u32 destval;
+	    u32 *shiftreg;
 
-            destoffset = decode_rm01_address(rl);
-            DECODE_PRINTF(",");
-            shiftreg = DECODE_RM_LONG_REGISTER(rh);
-            DECODE_PRINTF(",");
-            shift = fetch_byte_imm();
-            DECODE_PRINTF2("%d\n", shift);
-            TRACE_AND_STEP();
-            destval = fetch_data_long(destoffset);
-            destval = shrd_long(destval,*shiftreg,shift);
-            store_data_long(destoffset, destval);
-        } else {
-            u16 destval;
-            u16 *shiftreg;
+	    destoffset = decode_rm01_address(rl);
+	    DECODE_PRINTF(",");
+	    shiftreg = DECODE_RM_LONG_REGISTER(rh);
+	    DECODE_PRINTF(",");
+	    shift = fetch_byte_imm();
+	    DECODE_PRINTF2("%d\n", shift);
+	    TRACE_AND_STEP();
+	    destval = fetch_data_long(destoffset);
+	    destval = shrd_long(destval,*shiftreg,shift);
+	    store_data_long(destoffset, destval);
+	} else {
+	    u16 destval;
+	    u16 *shiftreg;
 
-            destoffset = decode_rm01_address(rl);
-            DECODE_PRINTF(",");
-            shiftreg = DECODE_RM_WORD_REGISTER(rh);
-            DECODE_PRINTF(",");
-            shift = fetch_byte_imm();
-            DECODE_PRINTF2("%d\n", shift);
-            TRACE_AND_STEP();
-            destval = fetch_data_word(destoffset);
-            destval = shrd_word(destval,*shiftreg,shift);
-            store_data_word(destoffset, destval);
-        }
-        break;
+	    destoffset = decode_rm01_address(rl);
+	    DECODE_PRINTF(",");
+	    shiftreg = DECODE_RM_WORD_REGISTER(rh);
+	    DECODE_PRINTF(",");
+	    shift = fetch_byte_imm();
+	    DECODE_PRINTF2("%d\n", shift);
+	    TRACE_AND_STEP();
+	    destval = fetch_data_word(destoffset);
+	    destval = shrd_word(destval,*shiftreg,shift);
+	    store_data_word(destoffset, destval);
+	}
+	break;
     case 2:
-        if (M.x86.mode & SYSMODE_PREFIX_DATA) {
-            u32 destval;
-            u32 *shiftreg;
+	if (M.x86.mode & SYSMODE_PREFIX_DATA) {
+	    u32 destval;
+	    u32 *shiftreg;
 
-            destoffset = decode_rm10_address(rl);
-            DECODE_PRINTF(",");
-            shiftreg = DECODE_RM_LONG_REGISTER(rh);
-            DECODE_PRINTF(",");
-            shift = fetch_byte_imm();
-            DECODE_PRINTF2("%d\n", shift);
-            TRACE_AND_STEP();
-            destval = fetch_data_long(destoffset);
-            destval = shrd_long(destval,*shiftreg,shift);
-            store_data_long(destoffset, destval);
-        } else {
-            u16 destval;
-            u16 *shiftreg;
+	    destoffset = decode_rm10_address(rl);
+	    DECODE_PRINTF(",");
+	    shiftreg = DECODE_RM_LONG_REGISTER(rh);
+	    DECODE_PRINTF(",");
+	    shift = fetch_byte_imm();
+	    DECODE_PRINTF2("%d\n", shift);
+	    TRACE_AND_STEP();
+	    destval = fetch_data_long(destoffset);
+	    destval = shrd_long(destval,*shiftreg,shift);
+	    store_data_long(destoffset, destval);
+	} else {
+	    u16 destval;
+	    u16 *shiftreg;
 
-            destoffset = decode_rm10_address(rl);
-            DECODE_PRINTF(",");
-            shiftreg = DECODE_RM_WORD_REGISTER(rh);
-            DECODE_PRINTF(",");
-            shift = fetch_byte_imm();
-            DECODE_PRINTF2("%d\n", shift);
-            TRACE_AND_STEP();
-            destval = fetch_data_word(destoffset);
-            destval = shrd_word(destval,*shiftreg,shift);
-            store_data_word(destoffset, destval);
-        }
-        break;
+	    destoffset = decode_rm10_address(rl);
+	    DECODE_PRINTF(",");
+	    shiftreg = DECODE_RM_WORD_REGISTER(rh);
+	    DECODE_PRINTF(",");
+	    shift = fetch_byte_imm();
+	    DECODE_PRINTF2("%d\n", shift);
+	    TRACE_AND_STEP();
+	    destval = fetch_data_word(destoffset);
+	    destval = shrd_word(destval,*shiftreg,shift);
+	    store_data_word(destoffset, destval);
+	}
+	break;
     case 3:                     /* register to register */
-        if (M.x86.mode & SYSMODE_PREFIX_DATA) {
-            u32 *destreg,*shiftreg;
+	if (M.x86.mode & SYSMODE_PREFIX_DATA) {
+	    u32 *destreg,*shiftreg;
 
-            destreg = DECODE_RM_LONG_REGISTER(rl);
-            DECODE_PRINTF(",");
-            shiftreg = DECODE_RM_LONG_REGISTER(rh);
-            DECODE_PRINTF(",");
-            shift = fetch_byte_imm();
-            DECODE_PRINTF2("%d\n", shift);
-            TRACE_AND_STEP();
-            *destreg = shrd_long(*destreg,*shiftreg,shift);
-        } else {
-            u16 *destreg,*shiftreg;
+	    destreg = DECODE_RM_LONG_REGISTER(rl);
+	    DECODE_PRINTF(",");
+	    shiftreg = DECODE_RM_LONG_REGISTER(rh);
+	    DECODE_PRINTF(",");
+	    shift = fetch_byte_imm();
+	    DECODE_PRINTF2("%d\n", shift);
+	    TRACE_AND_STEP();
+	    *destreg = shrd_long(*destreg,*shiftreg,shift);
+	} else {
+	    u16 *destreg,*shiftreg;
 
-            destreg = DECODE_RM_WORD_REGISTER(rl);
-            DECODE_PRINTF(",");
-            shiftreg = DECODE_RM_WORD_REGISTER(rh);
-            DECODE_PRINTF(",");
-            shift = fetch_byte_imm();
-            DECODE_PRINTF2("%d\n", shift);
-            TRACE_AND_STEP();
-            *destreg = shrd_word(*destreg,*shiftreg,shift);
-        }
-        break;
+	    destreg = DECODE_RM_WORD_REGISTER(rl);
+	    DECODE_PRINTF(",");
+	    shiftreg = DECODE_RM_WORD_REGISTER(rh);
+	    DECODE_PRINTF(",");
+	    shift = fetch_byte_imm();
+	    DECODE_PRINTF2("%d\n", shift);
+	    TRACE_AND_STEP();
+	    *destreg = shrd_word(*destreg,*shiftreg,shift);
+	}
+	break;
     }
     DECODE_CLEAR_SEGOVR();
     END_OF_INSTR();
@@ -987,107 +987,107 @@
     FETCH_DECODE_MODRM(mod, rh, rl);
     switch (mod) {
     case 0:
-        if (M.x86.mode & SYSMODE_PREFIX_DATA) {
-            u32 destval;
-            u32 *shiftreg;
+	if (M.x86.mode & SYSMODE_PREFIX_DATA) {
+	    u32 destval;
+	    u32 *shiftreg;
 
-            destoffset = decode_rm00_address(rl);
-            DECODE_PRINTF(",");
-            shiftreg = DECODE_RM_LONG_REGISTER(rh);
-            DECODE_PRINTF(",CL\n");
-            TRACE_AND_STEP();
-            destval = fetch_data_long(destoffset);
-            destval = shrd_long(destval,*shiftreg,M.x86.R_CL);
-            store_data_long(destoffset, destval);
-        } else {
-            u16 destval;
-            u16 *shiftreg;
+	    destoffset = decode_rm00_address(rl);
+	    DECODE_PRINTF(",");
+	    shiftreg = DECODE_RM_LONG_REGISTER(rh);
+	    DECODE_PRINTF(",CL\n");
+	    TRACE_AND_STEP();
+	    destval = fetch_data_long(destoffset);
+	    destval = shrd_long(destval,*shiftreg,M.x86.R_CL);
+	    store_data_long(destoffset, destval);
+	} else {
+	    u16 destval;
+	    u16 *shiftreg;
 
-            destoffset = decode_rm00_address(rl);
-            DECODE_PRINTF(",");
-            shiftreg = DECODE_RM_WORD_REGISTER(rh);
-            DECODE_PRINTF(",CL\n");
-            TRACE_AND_STEP();
-            destval = fetch_data_word(destoffset);
-            destval = shrd_word(destval,*shiftreg,M.x86.R_CL);
-            store_data_word(destoffset, destval);
-        }
-        break;
+	    destoffset = decode_rm00_address(rl);
+	    DECODE_PRINTF(",");
+	    shiftreg = DECODE_RM_WORD_REGISTER(rh);
+	    DECODE_PRINTF(",CL\n");
+	    TRACE_AND_STEP();
+	    destval = fetch_data_word(destoffset);
+	    destval = shrd_word(destval,*shiftreg,M.x86.R_CL);
+	    store_data_word(destoffset, destval);
+	}
+	break;
     case 1:
-        if (M.x86.mode & SYSMODE_PREFIX_DATA) {
-            u32 destval;
-            u32 *shiftreg;
+	if (M.x86.mode & SYSMODE_PREFIX_DATA) {
+	    u32 destval;
+	    u32 *shiftreg;
 
-            destoffset = decode_rm01_address(rl);
-            DECODE_PRINTF(",");
-            shiftreg = DECODE_RM_LONG_REGISTER(rh);
-            DECODE_PRINTF(",CL\n");
-            TRACE_AND_STEP();
-            destval = fetch_data_long(destoffset);
-            destval = shrd_long(destval,*shiftreg,M.x86.R_CL);
-            store_data_long(destoffset, destval);
-        } else {
-            u16 destval;
-            u16 *shiftreg;
+	    destoffset = decode_rm01_address(rl);
+	    DECODE_PRINTF(",");
+	    shiftreg = DECODE_RM_LONG_REGISTER(rh);
+	    DECODE_PRINTF(",CL\n");
+	    TRACE_AND_STEP();
+	    destval = fetch_data_long(destoffset);
+	    destval = shrd_long(destval,*shiftreg,M.x86.R_CL);
+	    store_data_long(destoffset, destval);
+	} else {
+	    u16 destval;
+	    u16 *shiftreg;
 
-            destoffset = decode_rm01_address(rl);
-            DECODE_PRINTF(",");
-            shiftreg = DECODE_RM_WORD_REGISTER(rh);
-            DECODE_PRINTF(",CL\n");
-            TRACE_AND_STEP();
-            destval = fetch_data_word(destoffset);
-            destval = shrd_word(destval,*shiftreg,M.x86.R_CL);
-            store_data_word(destoffset, destval);
-        }
-        break;
+	    destoffset = decode_rm01_address(rl);
+	    DECODE_PRINTF(",");
+	    shiftreg = DECODE_RM_WORD_REGISTER(rh);
+	    DECODE_PRINTF(",CL\n");
+	    TRACE_AND_STEP();
+	    destval = fetch_data_word(destoffset);
+	    destval = shrd_word(destval,*shiftreg,M.x86.R_CL);
+	    store_data_word(destoffset, destval);
+	}
+	break;
     case 2:
-        if (M.x86.mode & SYSMODE_PREFIX_DATA) {
-            u32 destval;
-            u32 *shiftreg;
+	if (M.x86.mode & SYSMODE_PREFIX_DATA) {
+	    u32 destval;
+	    u32 *shiftreg;
 
-            destoffset = decode_rm10_address(rl);
-            DECODE_PRINTF(",");
-            shiftreg = DECODE_RM_LONG_REGISTER(rh);
-            DECODE_PRINTF(",CL\n");
-            TRACE_AND_STEP();
-            destval = fetch_data_long(destoffset);
-            destval = shrd_long(destval,*shiftreg,M.x86.R_CL);
-            store_data_long(destoffset, destval);
-        } else {
-            u16 destval;
-            u16 *shiftreg;
+	    destoffset = decode_rm10_address(rl);
+	    DECODE_PRINTF(",");
+	    shiftreg = DECODE_RM_LONG_REGISTER(rh);
+	    DECODE_PRINTF(",CL\n");
+	    TRACE_AND_STEP();
+	    destval = fetch_data_long(destoffset);
+	    destval = shrd_long(destval,*shiftreg,M.x86.R_CL);
+	    store_data_long(destoffset, destval);
+	} else {
+	    u16 destval;
+	    u16 *shiftreg;
 
-            destoffset = decode_rm10_address(rl);
-            DECODE_PRINTF(",");
-            shiftreg = DECODE_RM_WORD_REGISTER(rh);
-            DECODE_PRINTF(",CL\n");
-            TRACE_AND_STEP();
-            destval = fetch_data_word(destoffset);
-            destval = shrd_word(destval,*shiftreg,M.x86.R_CL);
-            store_data_word(destoffset, destval);
-        }
-        break;
+	    destoffset = decode_rm10_address(rl);
+	    DECODE_PRINTF(",");
+	    shiftreg = DECODE_RM_WORD_REGISTER(rh);
+	    DECODE_PRINTF(",CL\n");
+	    TRACE_AND_STEP();
+	    destval = fetch_data_word(destoffset);
+	    destval = shrd_word(destval,*shiftreg,M.x86.R_CL);
+	    store_data_word(destoffset, destval);
+	}
+	break;
     case 3:                     /* register to register */
-        if (M.x86.mode & SYSMODE_PREFIX_DATA) {
-            u32 *destreg,*shiftreg;
+	if (M.x86.mode & SYSMODE_PREFIX_DATA) {
+	    u32 *destreg,*shiftreg;
 
-            destreg = DECODE_RM_LONG_REGISTER(rl);
-            DECODE_PRINTF(",");
-            shiftreg = DECODE_RM_LONG_REGISTER(rh);
-            DECODE_PRINTF(",CL\n");
-            TRACE_AND_STEP();
-            *destreg = shrd_long(*destreg,*shiftreg,M.x86.R_CL);
-        } else {
-            u16 *destreg,*shiftreg;
+	    destreg = DECODE_RM_LONG_REGISTER(rl);
+	    DECODE_PRINTF(",");
+	    shiftreg = DECODE_RM_LONG_REGISTER(rh);
+	    DECODE_PRINTF(",CL\n");
+	    TRACE_AND_STEP();
+	    *destreg = shrd_long(*destreg,*shiftreg,M.x86.R_CL);
+	} else {
+	    u16 *destreg,*shiftreg;
 
-            destreg = DECODE_RM_WORD_REGISTER(rl);
-            DECODE_PRINTF(",");
-            shiftreg = DECODE_RM_WORD_REGISTER(rh);
-            DECODE_PRINTF(",CL\n");
-            TRACE_AND_STEP();
-            *destreg = shrd_word(*destreg,*shiftreg,M.x86.R_CL);
-        }
-        break;
+	    destreg = DECODE_RM_WORD_REGISTER(rl);
+	    DECODE_PRINTF(",");
+	    shiftreg = DECODE_RM_WORD_REGISTER(rh);
+	    DECODE_PRINTF(",CL\n");
+	    TRACE_AND_STEP();
+	    *destreg = shrd_word(*destreg,*shiftreg,M.x86.R_CL);
+	}
+	break;
     }
     DECODE_CLEAR_SEGOVR();
     END_OF_INSTR();
@@ -1107,164 +1107,164 @@
     FETCH_DECODE_MODRM(mod, rh, rl);
     switch (mod) {
     case 0:
-        if (M.x86.mode & SYSMODE_PREFIX_DATA) {
-            u32 *destreg;
-            u32 srcval;
-            u32 res_lo,res_hi;
+	if (M.x86.mode & SYSMODE_PREFIX_DATA) {
+	    u32 *destreg;
+	    u32 srcval;
+	    u32 res_lo,res_hi;
 
-            destreg = DECODE_RM_LONG_REGISTER(rh);
-            DECODE_PRINTF(",");
-            srcoffset = decode_rm00_address(rl);
-            srcval = fetch_data_long(srcoffset);
-            TRACE_AND_STEP();
-            imul_long_direct(&res_lo,&res_hi,(s32)*destreg,(s32)srcval);
-            if (res_hi != 0) {
-                SET_FLAG(F_CF);
-                SET_FLAG(F_OF);
-            } else {
-                CLEAR_FLAG(F_CF);
-                CLEAR_FLAG(F_OF);
-            }
-            *destreg = (u32)res_lo;
-        } else {
-            u16 *destreg;
-            u16 srcval;
-            u32 res;
+	    destreg = DECODE_RM_LONG_REGISTER(rh);
+	    DECODE_PRINTF(",");
+	    srcoffset = decode_rm00_address(rl);
+	    srcval = fetch_data_long(srcoffset);
+	    TRACE_AND_STEP();
+	    imul_long_direct(&res_lo,&res_hi,(s32)*destreg,(s32)srcval);
+	    if (res_hi != 0) {
+		SET_FLAG(F_CF);
+		SET_FLAG(F_OF);
+	    } else {
+		CLEAR_FLAG(F_CF);
+		CLEAR_FLAG(F_OF);
+	    }
+	    *destreg = (u32)res_lo;
+	} else {
+	    u16 *destreg;
+	    u16 srcval;
+	    u32 res;
 
-            destreg = DECODE_RM_WORD_REGISTER(rh);
-            DECODE_PRINTF(",");
-            srcoffset = decode_rm00_address(rl);
-            srcval = fetch_data_word(srcoffset);
-            TRACE_AND_STEP();
-            res = (s16)*destreg * (s16)srcval;
-            if (res > 0xFFFF) {
-                SET_FLAG(F_CF);
-                SET_FLAG(F_OF);
-            } else {
-                CLEAR_FLAG(F_CF);
-                CLEAR_FLAG(F_OF);
-            }
-            *destreg = (u16)res;
-        }
-        break;
+	    destreg = DECODE_RM_WORD_REGISTER(rh);
+	    DECODE_PRINTF(",");
+	    srcoffset = decode_rm00_address(rl);
+	    srcval = fetch_data_word(srcoffset);
+	    TRACE_AND_STEP();
+	    res = (s16)*destreg * (s16)srcval;
+	    if (res > 0xFFFF) {
+		SET_FLAG(F_CF);
+		SET_FLAG(F_OF);
+	    } else {
+		CLEAR_FLAG(F_CF);
+		CLEAR_FLAG(F_OF);
+	    }
+	    *destreg = (u16)res;
+	}
+	break;
     case 1:
-        if (M.x86.mode & SYSMODE_PREFIX_DATA) {
-            u32 *destreg;
-            u32 srcval;
-            u32 res_lo,res_hi;
+	if (M.x86.mode & SYSMODE_PREFIX_DATA) {
+	    u32 *destreg;
+	    u32 srcval;
+	    u32 res_lo,res_hi;
 
-            destreg = DECODE_RM_LONG_REGISTER(rh);
-            DECODE_PRINTF(",");
-            srcoffset = decode_rm01_address(rl);
-            srcval = fetch_data_long(srcoffset);
-            TRACE_AND_STEP();
-            imul_long_direct(&res_lo,&res_hi,(s32)*destreg,(s32)srcval);
-            if (res_hi != 0) {
-                SET_FLAG(F_CF);
-                SET_FLAG(F_OF);
-            } else {
-                CLEAR_FLAG(F_CF);
-                CLEAR_FLAG(F_OF);
-            }
-            *destreg = (u32)res_lo;
-        } else {
-            u16 *destreg;
-            u16 srcval;
-            u32 res;
+	    destreg = DECODE_RM_LONG_REGISTER(rh);
+	    DECODE_PRINTF(",");
+	    srcoffset = decode_rm01_address(rl);
+	    srcval = fetch_data_long(srcoffset);
+	    TRACE_AND_STEP();
+	    imul_long_direct(&res_lo,&res_hi,(s32)*destreg,(s32)srcval);
+	    if (res_hi != 0) {
+		SET_FLAG(F_CF);
+		SET_FLAG(F_OF);
+	    } else {
+		CLEAR_FLAG(F_CF);
+		CLEAR_FLAG(F_OF);
+	    }
+	    *destreg = (u32)res_lo;
+	} else {
+	    u16 *destreg;
+	    u16 srcval;
+	    u32 res;
 
-            destreg = DECODE_RM_WORD_REGISTER(rh);
-            DECODE_PRINTF(",");
-            srcoffset = decode_rm01_address(rl);
-            srcval = fetch_data_word(srcoffset);
-            TRACE_AND_STEP();
-            res = (s16)*destreg * (s16)srcval;
-            if (res > 0xFFFF) {
-                SET_FLAG(F_CF);
-                SET_FLAG(F_OF);
-            } else {
-                CLEAR_FLAG(F_CF);
-                CLEAR_FLAG(F_OF);
-            }
-            *destreg = (u16)res;
-        }
-        break;
+	    destreg = DECODE_RM_WORD_REGISTER(rh);
+	    DECODE_PRINTF(",");
+	    srcoffset = decode_rm01_address(rl);
+	    srcval = fetch_data_word(srcoffset);
+	    TRACE_AND_STEP();
+	    res = (s16)*destreg * (s16)srcval;
+	    if (res > 0xFFFF) {
+		SET_FLAG(F_CF);
+		SET_FLAG(F_OF);
+	    } else {
+		CLEAR_FLAG(F_CF);
+		CLEAR_FLAG(F_OF);
+	    }
+	    *destreg = (u16)res;
+	}
+	break;
     case 2:
-        if (M.x86.mode & SYSMODE_PREFIX_DATA) {
-            u32 *destreg;
-            u32 srcval;
-            u32 res_lo,res_hi;
+	if (M.x86.mode & SYSMODE_PREFIX_DATA) {
+	    u32 *destreg;
+	    u32 srcval;
+	    u32 res_lo,res_hi;
 
-            destreg = DECODE_RM_LONG_REGISTER(rh);
-            DECODE_PRINTF(",");
-            srcoffset = decode_rm10_address(rl);
-            srcval = fetch_data_long(srcoffset);
-            TRACE_AND_STEP();
-            imul_long_direct(&res_lo,&res_hi,(s32)*destreg,(s32)srcval);
-            if (res_hi != 0) {
-                SET_FLAG(F_CF);
-                SET_FLAG(F_OF);
-            } else {
-                CLEAR_FLAG(F_CF);
-                CLEAR_FLAG(F_OF);
-            }
-            *destreg = (u32)res_lo;
-        } else {
-            u16 *destreg;
-            u16 srcval;
-            u32 res;
+	    destreg = DECODE_RM_LONG_REGISTER(rh);
+	    DECODE_PRINTF(",");
+	    srcoffset = decode_rm10_address(rl);
+	    srcval = fetch_data_long(srcoffset);
+	    TRACE_AND_STEP();
+	    imul_long_direct(&res_lo,&res_hi,(s32)*destreg,(s32)srcval);
+	    if (res_hi != 0) {
+		SET_FLAG(F_CF);
+		SET_FLAG(F_OF);
+	    } else {
+		CLEAR_FLAG(F_CF);
+		CLEAR_FLAG(F_OF);
+	    }
+	    *destreg = (u32)res_lo;
+	} else {
+	    u16 *destreg;
+	    u16 srcval;
+	    u32 res;
 
-            destreg = DECODE_RM_WORD_REGISTER(rh);
-            DECODE_PRINTF(",");
-            srcoffset = decode_rm10_address(rl);
-            srcval = fetch_data_word(srcoffset);
-            TRACE_AND_STEP();
-            res = (s16)*destreg * (s16)srcval;
-            if (res > 0xFFFF) {
-                SET_FLAG(F_CF);
-                SET_FLAG(F_OF);
-            } else {
-                CLEAR_FLAG(F_CF);
-                CLEAR_FLAG(F_OF);
-            }
-            *destreg = (u16)res;
-        }
-        break;
+	    destreg = DECODE_RM_WORD_REGISTER(rh);
+	    DECODE_PRINTF(",");
+	    srcoffset = decode_rm10_address(rl);
+	    srcval = fetch_data_word(srcoffset);
+	    TRACE_AND_STEP();
+	    res = (s16)*destreg * (s16)srcval;
+	    if (res > 0xFFFF) {
+		SET_FLAG(F_CF);
+		SET_FLAG(F_OF);
+	    } else {
+		CLEAR_FLAG(F_CF);
+		CLEAR_FLAG(F_OF);
+	    }
+	    *destreg = (u16)res;
+	}
+	break;
     case 3:                     /* register to register */
-        if (M.x86.mode & SYSMODE_PREFIX_DATA) {
-            u32 *destreg,*srcreg;
-            u32 res_lo,res_hi;
+	if (M.x86.mode & SYSMODE_PREFIX_DATA) {
+	    u32 *destreg,*srcreg;
+	    u32 res_lo,res_hi;
 
-            destreg = DECODE_RM_LONG_REGISTER(rh);
-            DECODE_PRINTF(",");
-            srcreg = DECODE_RM_LONG_REGISTER(rl);
-            TRACE_AND_STEP();
-            imul_long_direct(&res_lo,&res_hi,(s32)*destreg,(s32)*srcreg);
-            if (res_hi != 0) {
-                SET_FLAG(F_CF);
-                SET_FLAG(F_OF);
-            } else {
-                CLEAR_FLAG(F_CF);
-                CLEAR_FLAG(F_OF);
-            }
-            *destreg = (u32)res_lo;
-        } else {
-            u16 *destreg,*srcreg;
-            u32 res;
+	    destreg = DECODE_RM_LONG_REGISTER(rh);
+	    DECODE_PRINTF(",");
+	    srcreg = DECODE_RM_LONG_REGISTER(rl);
+	    TRACE_AND_STEP();
+	    imul_long_direct(&res_lo,&res_hi,(s32)*destreg,(s32)*srcreg);
+	    if (res_hi != 0) {
+		SET_FLAG(F_CF);
+		SET_FLAG(F_OF);
+	    } else {
+		CLEAR_FLAG(F_CF);
+		CLEAR_FLAG(F_OF);
+	    }
+	    *destreg = (u32)res_lo;
+	} else {
+	    u16 *destreg,*srcreg;
+	    u32 res;
 
-            destreg = DECODE_RM_WORD_REGISTER(rh);
-            DECODE_PRINTF(",");
-            srcreg = DECODE_RM_WORD_REGISTER(rl);
-            res = (s16)*destreg * (s16)*srcreg;
-            if (res > 0xFFFF) {
-                SET_FLAG(F_CF);
-                SET_FLAG(F_OF);
-            } else {
-                CLEAR_FLAG(F_CF);
-                CLEAR_FLAG(F_OF);
-            }
-            *destreg = (u16)res;
-        }
-        break;
+	    destreg = DECODE_RM_WORD_REGISTER(rh);
+	    DECODE_PRINTF(",");
+	    srcreg = DECODE_RM_WORD_REGISTER(rl);
+	    res = (s16)*destreg * (s16)*srcreg;
+	    if (res > 0xFFFF) {
+		SET_FLAG(F_CF);
+		SET_FLAG(F_OF);
+	    } else {
+		CLEAR_FLAG(F_CF);
+		CLEAR_FLAG(F_OF);
+	    }
+	    *destreg = (u16)res;
+	}
+	break;
     }
     DECODE_CLEAR_SEGOVR();
     END_OF_INSTR();
@@ -1285,35 +1285,35 @@
     FETCH_DECODE_MODRM(mod, rh, rl);
     switch (mod) {
     case 0:
-        dstreg = DECODE_RM_WORD_REGISTER(rh);
-        DECODE_PRINTF(",");
-        srcoffset = decode_rm00_address(rl);
-        DECODE_PRINTF("\n");
-        TRACE_AND_STEP();
-        *dstreg = fetch_data_word(srcoffset);
-        M.x86.R_SS = fetch_data_word(srcoffset + 2);
-        break;
+	dstreg = DECODE_RM_WORD_REGISTER(rh);
+	DECODE_PRINTF(",");
+	srcoffset = decode_rm00_address(rl);
+	DECODE_PRINTF("\n");
+	TRACE_AND_STEP();
+	*dstreg = fetch_data_word(srcoffset);
+	M.x86.R_SS = fetch_data_word(srcoffset + 2);
+	break;
     case 1:
-        dstreg = DECODE_RM_WORD_REGISTER(rh);
-        DECODE_PRINTF(",");
-        srcoffset = decode_rm01_address(rl);
-        DECODE_PRINTF("\n");
-        TRACE_AND_STEP();
-        *dstreg = fetch_data_word(srcoffset);
-        M.x86.R_SS = fetch_data_word(srcoffset + 2);
-        break;
+	dstreg = DECODE_RM_WORD_REGISTER(rh);
+	DECODE_PRINTF(",");
+	srcoffset = decode_rm01_address(rl);
+	DECODE_PRINTF("\n");
+	TRACE_AND_STEP();
+	*dstreg = fetch_data_word(srcoffset);
+	M.x86.R_SS = fetch_data_word(srcoffset + 2);
+	break;
     case 2:
-        dstreg = DECODE_RM_WORD_REGISTER(rh);
-        DECODE_PRINTF(",");
-        srcoffset = decode_rm10_address(rl);
-        DECODE_PRINTF("\n");
-        TRACE_AND_STEP();
-        *dstreg = fetch_data_word(srcoffset);
-        M.x86.R_SS = fetch_data_word(srcoffset + 2);
-        break;
+	dstreg = DECODE_RM_WORD_REGISTER(rh);
+	DECODE_PRINTF(",");
+	srcoffset = decode_rm10_address(rl);
+	DECODE_PRINTF("\n");
+	TRACE_AND_STEP();
+	*dstreg = fetch_data_word(srcoffset);
+	M.x86.R_SS = fetch_data_word(srcoffset + 2);
+	break;
     case 3:                     /* register to register */
-        /* UNDEFINED! */
-        TRACE_AND_STEP();
+	/* UNDEFINED! */
+	TRACE_AND_STEP();
     }
     DECODE_CLEAR_SEGOVR();
     END_OF_INSTR();
@@ -1473,35 +1473,35 @@
     FETCH_DECODE_MODRM(mod, rh, rl);
     switch (mod) {
     case 0:
-        dstreg = DECODE_RM_WORD_REGISTER(rh);
-        DECODE_PRINTF(",");
-        srcoffset = decode_rm00_address(rl);
-        DECODE_PRINTF("\n");
-        TRACE_AND_STEP();
-        *dstreg = fetch_data_word(srcoffset);
-        M.x86.R_FS = fetch_data_word(srcoffset + 2);
-        break;
+	dstreg = DECODE_RM_WORD_REGISTER(rh);
+	DECODE_PRINTF(",");
+	srcoffset = decode_rm00_address(rl);
+	DECODE_PRINTF("\n");
+	TRACE_AND_STEP();
+	*dstreg = fetch_data_word(srcoffset);
+	M.x86.R_FS = fetch_data_word(srcoffset + 2);
+	break;
     case 1:
-        dstreg = DECODE_RM_WORD_REGISTER(rh);
-        DECODE_PRINTF(",");
-        srcoffset = decode_rm01_address(rl);
-        DECODE_PRINTF("\n");
-        TRACE_AND_STEP();
-        *dstreg = fetch_data_word(srcoffset);
-        M.x86.R_FS = fetch_data_word(srcoffset + 2);
-        break;
+	dstreg = DECODE_RM_WORD_REGISTER(rh);
+	DECODE_PRINTF(",");
+	srcoffset = decode_rm01_address(rl);
+	DECODE_PRINTF("\n");
+	TRACE_AND_STEP();
+	*dstreg = fetch_data_word(srcoffset);
+	M.x86.R_FS = fetch_data_word(srcoffset + 2);
+	break;
     case 2:
-        dstreg = DECODE_RM_WORD_REGISTER(rh);
-        DECODE_PRINTF(",");
-        srcoffset = decode_rm10_address(rl);
-        DECODE_PRINTF("\n");
-        TRACE_AND_STEP();
-        *dstreg = fetch_data_word(srcoffset);
-        M.x86.R_FS = fetch_data_word(srcoffset + 2);
-        break;
+	dstreg = DECODE_RM_WORD_REGISTER(rh);
+	DECODE_PRINTF(",");
+	srcoffset = decode_rm10_address(rl);
+	DECODE_PRINTF("\n");
+	TRACE_AND_STEP();
+	*dstreg = fetch_data_word(srcoffset);
+	M.x86.R_FS = fetch_data_word(srcoffset + 2);
+	break;
     case 3:                     /* register to register */
-        /* UNDEFINED! */
-        TRACE_AND_STEP();
+	/* UNDEFINED! */
+	TRACE_AND_STEP();
     }
     DECODE_CLEAR_SEGOVR();
     END_OF_INSTR();
@@ -1522,35 +1522,35 @@
     FETCH_DECODE_MODRM(mod, rh, rl);
     switch (mod) {
     case 0:
-        dstreg = DECODE_RM_WORD_REGISTER(rh);
-        DECODE_PRINTF(",");
-        srcoffset = decode_rm00_address(rl);
-        DECODE_PRINTF("\n");
-        TRACE_AND_STEP();
-        *dstreg = fetch_data_word(srcoffset);
-        M.x86.R_GS = fetch_data_word(srcoffset + 2);
-        break;
+	dstreg = DECODE_RM_WORD_REGISTER(rh);
+	DECODE_PRINTF(",");
+	srcoffset = decode_rm00_address(rl);
+	DECODE_PRINTF("\n");
+	TRACE_AND_STEP();
+	*dstreg = fetch_data_word(srcoffset);
+	M.x86.R_GS = fetch_data_word(srcoffset + 2);
+	break;
     case 1:
-        dstreg = DECODE_RM_WORD_REGISTER(rh);
-        DECODE_PRINTF(",");
-        srcoffset = decode_rm01_address(rl);
-        DECODE_PRINTF("\n");
-        TRACE_AND_STEP();
-        *dstreg = fetch_data_word(srcoffset);
-        M.x86.R_GS = fetch_data_word(srcoffset + 2);
-        break;
+	dstreg = DECODE_RM_WORD_REGISTER(rh);
+	DECODE_PRINTF(",");
+	srcoffset = decode_rm01_address(rl);
+	DECODE_PRINTF("\n");
+	TRACE_AND_STEP();
+	*dstreg = fetch_data_word(srcoffset);
+	M.x86.R_GS = fetch_data_word(srcoffset + 2);
+	break;
     case 2:
-        dstreg = DECODE_RM_WORD_REGISTER(rh);
-        DECODE_PRINTF(",");
-        srcoffset = decode_rm10_address(rl);
-        DECODE_PRINTF("\n");
-        TRACE_AND_STEP();
-        *dstreg = fetch_data_word(srcoffset);
-        M.x86.R_GS = fetch_data_word(srcoffset + 2);
-        break;
+	dstreg = DECODE_RM_WORD_REGISTER(rh);
+	DECODE_PRINTF(",");
+	srcoffset = decode_rm10_address(rl);
+	DECODE_PRINTF("\n");
+	TRACE_AND_STEP();
+	*dstreg = fetch_data_word(srcoffset);
+	M.x86.R_GS = fetch_data_word(srcoffset + 2);
+	break;
     case 3:                     /* register to register */
-        /* UNDEFINED! */
-        TRACE_AND_STEP();
+	/* UNDEFINED! */
+	TRACE_AND_STEP();
     }
     DECODE_CLEAR_SEGOVR();
     END_OF_INSTR();
@@ -1570,103 +1570,103 @@
     FETCH_DECODE_MODRM(mod, rh, rl);
     switch (mod) {
     case 0:
-        if (M.x86.mode & SYSMODE_PREFIX_DATA) {
-            u32 *destreg;
-            u32 srcval;
+	if (M.x86.mode & SYSMODE_PREFIX_DATA) {
+	    u32 *destreg;
+	    u32 srcval;
 
-            destreg = DECODE_RM_LONG_REGISTER(rh);
-            DECODE_PRINTF(",");
-            srcoffset = decode_rm00_address(rl);
-            srcval = fetch_data_byte(srcoffset);
-            DECODE_PRINTF("\n");
-            TRACE_AND_STEP();
-            *destreg = srcval;
-        } else {
-            u16 *destreg;
-            u16 srcval;
+	    destreg = DECODE_RM_LONG_REGISTER(rh);
+	    DECODE_PRINTF(",");
+	    srcoffset = decode_rm00_address(rl);
+	    srcval = fetch_data_byte(srcoffset);
+	    DECODE_PRINTF("\n");
+	    TRACE_AND_STEP();
+	    *destreg = srcval;
+	} else {
+	    u16 *destreg;
+	    u16 srcval;
 
-            destreg = DECODE_RM_WORD_REGISTER(rh);
-            DECODE_PRINTF(",");
-            srcoffset = decode_rm00_address(rl);
-            srcval = fetch_data_byte(srcoffset);
-            DECODE_PRINTF("\n");
-            TRACE_AND_STEP();
-            *destreg = srcval;
-        }
-        break;
+	    destreg = DECODE_RM_WORD_REGISTER(rh);
+	    DECODE_PRINTF(",");
+	    srcoffset = decode_rm00_address(rl);
+	    srcval = fetch_data_byte(srcoffset);
+	    DECODE_PRINTF("\n");
+	    TRACE_AND_STEP();
+	    *destreg = srcval;
+	}
+	break;
     case 1:
-        if (M.x86.mode & SYSMODE_PREFIX_DATA) {
-            u32 *destreg;
-            u32 srcval;
+	if (M.x86.mode & SYSMODE_PREFIX_DATA) {
+	    u32 *destreg;
+	    u32 srcval;
 
-            destreg = DECODE_RM_LONG_REGISTER(rh);
-            DECODE_PRINTF(",");
-            srcoffset = decode_rm01_address(rl);
-            srcval = fetch_data_byte(srcoffset);
-            DECODE_PRINTF("\n");
-            TRACE_AND_STEP();
-            *destreg = srcval;
-        } else {
-            u16 *destreg;
-            u16 srcval;
+	    destreg = DECODE_RM_LONG_REGISTER(rh);
+	    DECODE_PRINTF(",");
+	    srcoffset = decode_rm01_address(rl);
+	    srcval = fetch_data_byte(srcoffset);
+	    DECODE_PRINTF("\n");
+	    TRACE_AND_STEP();
+	    *destreg = srcval;
+	} else {
+	    u16 *destreg;
+	    u16 srcval;
 
-            destreg = DECODE_RM_WORD_REGISTER(rh);
-            DECODE_PRINTF(",");
-            srcoffset = decode_rm01_address(rl);
-            srcval = fetch_data_byte(srcoffset);
-            DECODE_PRINTF("\n");
-            TRACE_AND_STEP();
-            *destreg = srcval;
-        }
-        break;
+	    destreg = DECODE_RM_WORD_REGISTER(rh);
+	    DECODE_PRINTF(",");
+	    srcoffset = decode_rm01_address(rl);
+	    srcval = fetch_data_byte(srcoffset);
+	    DECODE_PRINTF("\n");
+	    TRACE_AND_STEP();
+	    *destreg = srcval;
+	}
+	break;
     case 2:
-        if (M.x86.mode & SYSMODE_PREFIX_DATA) {
-            u32 *destreg;
-            u32 srcval;
+	if (M.x86.mode & SYSMODE_PREFIX_DATA) {
+	    u32 *destreg;
+	    u32 srcval;
 
-            destreg = DECODE_RM_LONG_REGISTER(rh);
-            DECODE_PRINTF(",");
-            srcoffset = decode_rm10_address(rl);
-            srcval = fetch_data_byte(srcoffset);
-            DECODE_PRINTF("\n");
-            TRACE_AND_STEP();
-            *destreg = srcval;
-        } else {
-            u16 *destreg;
-            u16 srcval;
+	    destreg = DECODE_RM_LONG_REGISTER(rh);
+	    DECODE_PRINTF(",");
+	    srcoffset = decode_rm10_address(rl);
+	    srcval = fetch_data_byte(srcoffset);
+	    DECODE_PRINTF("\n");
+	    TRACE_AND_STEP();
+	    *destreg = srcval;
+	} else {
+	    u16 *destreg;
+	    u16 srcval;
 
-            destreg = DECODE_RM_WORD_REGISTER(rh);
-            DECODE_PRINTF(",");
-            srcoffset = decode_rm10_address(rl);
-            srcval = fetch_data_byte(srcoffset);
-            DECODE_PRINTF("\n");
-            TRACE_AND_STEP();
-            *destreg = srcval;
-        }
-        break;
+	    destreg = DECODE_RM_WORD_REGISTER(rh);
+	    DECODE_PRINTF(",");
+	    srcoffset = decode_rm10_address(rl);
+	    srcval = fetch_data_byte(srcoffset);
+	    DECODE_PRINTF("\n");
+	    TRACE_AND_STEP();
+	    *destreg = srcval;
+	}
+	break;
     case 3:                     /* register to register */
-        if (M.x86.mode & SYSMODE_PREFIX_DATA) {
-            u32 *destreg;
-            u8  *srcreg;
+	if (M.x86.mode & SYSMODE_PREFIX_DATA) {
+	    u32 *destreg;
+	    u8  *srcreg;
 
-            destreg = DECODE_RM_LONG_REGISTER(rh);
-            DECODE_PRINTF(",");
-            srcreg = DECODE_RM_BYTE_REGISTER(rl);
-            DECODE_PRINTF("\n");
-            TRACE_AND_STEP();
-            *destreg = *srcreg;
-        } else {
-            u16 *destreg;
-            u8  *srcreg;
+	    destreg = DECODE_RM_LONG_REGISTER(rh);
+	    DECODE_PRINTF(",");
+	    srcreg = DECODE_RM_BYTE_REGISTER(rl);
+	    DECODE_PRINTF("\n");
+	    TRACE_AND_STEP();
+	    *destreg = *srcreg;
+	} else {
+	    u16 *destreg;
+	    u8  *srcreg;
 
-            destreg = DECODE_RM_WORD_REGISTER(rh);
-            DECODE_PRINTF(",");
-            srcreg = DECODE_RM_BYTE_REGISTER(rl);
-            DECODE_PRINTF("\n");
-            TRACE_AND_STEP();
-            *destreg = *srcreg;
-        }
-        break;
+	    destreg = DECODE_RM_WORD_REGISTER(rh);
+	    DECODE_PRINTF(",");
+	    srcreg = DECODE_RM_BYTE_REGISTER(rl);
+	    DECODE_PRINTF("\n");
+	    TRACE_AND_STEP();
+	    *destreg = *srcreg;
+	}
+	break;
     }
     DECODE_CLEAR_SEGOVR();
     END_OF_INSTR();
@@ -1689,40 +1689,40 @@
     FETCH_DECODE_MODRM(mod, rh, rl);
     switch (mod) {
     case 0:
-        destreg = DECODE_RM_LONG_REGISTER(rh);
-        DECODE_PRINTF(",");
-        srcoffset = decode_rm00_address(rl);
-        srcval = fetch_data_word(srcoffset);
-        DECODE_PRINTF("\n");
-        TRACE_AND_STEP();
-        *destreg = srcval;
-        break;
+	destreg = DECODE_RM_LONG_REGISTER(rh);
+	DECODE_PRINTF(",");
+	srcoffset = decode_rm00_address(rl);
+	srcval = fetch_data_word(srcoffset);
+	DECODE_PRINTF("\n");
+	TRACE_AND_STEP();
+	*destreg = srcval;
+	break;
     case 1:
-        destreg = DECODE_RM_LONG_REGISTER(rh);
-        DECODE_PRINTF(",");
-        srcoffset = decode_rm01_address(rl);
-        srcval = fetch_data_word(srcoffset);
-        DECODE_PRINTF("\n");
-        TRACE_AND_STEP();
-        *destreg = srcval;
-        break;
+	destreg = DECODE_RM_LONG_REGISTER(rh);
+	DECODE_PRINTF(",");
+	srcoffset = decode_rm01_address(rl);
+	srcval = fetch_data_word(srcoffset);
+	DECODE_PRINTF("\n");
+	TRACE_AND_STEP();
+	*destreg = srcval;
+	break;
     case 2:
-        destreg = DECODE_RM_LONG_REGISTER(rh);
-        DECODE_PRINTF(",");
-        srcoffset = decode_rm10_address(rl);
-        srcval = fetch_data_word(srcoffset);
-        DECODE_PRINTF("\n");
-        TRACE_AND_STEP();
-        *destreg = srcval;
-        break;
+	destreg = DECODE_RM_LONG_REGISTER(rh);
+	DECODE_PRINTF(",");
+	srcoffset = decode_rm10_address(rl);
+	srcval = fetch_data_word(srcoffset);
+	DECODE_PRINTF("\n");
+	TRACE_AND_STEP();
+	*destreg = srcval;
+	break;
     case 3:                     /* register to register */
-        destreg = DECODE_RM_LONG_REGISTER(rh);
-        DECODE_PRINTF(",");
-        srcreg = DECODE_RM_WORD_REGISTER(rl);
-        DECODE_PRINTF("\n");
-        TRACE_AND_STEP();
-        *destreg = *srcreg;
-        break;
+	destreg = DECODE_RM_LONG_REGISTER(rh);
+	DECODE_PRINTF(",");
+	srcreg = DECODE_RM_WORD_REGISTER(rl);
+	DECODE_PRINTF("\n");
+	TRACE_AND_STEP();
+	*destreg = *srcreg;
+	break;
     }
     DECODE_CLEAR_SEGOVR();
     END_OF_INSTR();
@@ -1742,237 +1742,237 @@
     FETCH_DECODE_MODRM(mod, rh, rl);
     switch (rh) {
     case 3:
-        DECODE_PRINTF("BT\t");
-        break;
+	DECODE_PRINTF("BT\t");
+	break;
     case 4:
-        DECODE_PRINTF("BTS\t");
-        break;
+	DECODE_PRINTF("BTS\t");
+	break;
     case 5:
-        DECODE_PRINTF("BTR\t");
-        break;
+	DECODE_PRINTF("BTR\t");
+	break;
     case 6:
-        DECODE_PRINTF("BTC\t");
-        break;
+	DECODE_PRINTF("BTC\t");
+	break;
     default:
-        DECODE_PRINTF("ILLEGAL EXTENDED X86 OPCODE\n");
-        TRACE_REGS();
-        printk("%04x:%04x: %02X%02X ILLEGAL EXTENDED X86 OPCODE EXTENSION!\n",
-                M.x86.R_CS, M.x86.R_IP-3,op2, (mod<<6)|(rh<<3)|rl);
-        HALT_SYS();
+	DECODE_PRINTF("ILLEGAL EXTENDED X86 OPCODE\n");
+	TRACE_REGS();
+	printk("%04x:%04x: %02X%02X ILLEGAL EXTENDED X86 OPCODE EXTENSION!\n",
+		M.x86.R_CS, M.x86.R_IP-3,op2, (mod<<6)|(rh<<3)|rl);
+	HALT_SYS();
     }
     switch (mod) {
     case 0:
-        if (M.x86.mode & SYSMODE_PREFIX_DATA) {
-            u32 srcval, mask;
-            u8 shift;
+	if (M.x86.mode & SYSMODE_PREFIX_DATA) {
+	    u32 srcval, mask;
+	    u8 shift;
 
-            srcoffset = decode_rm00_address(rl);
-            DECODE_PRINTF(",");
-            shift = fetch_byte_imm();
-            TRACE_AND_STEP();
-            bit = shift & 0x1F;
-            srcval = fetch_data_long(srcoffset);
-            mask = (0x1 << bit);
-            CONDITIONAL_SET_FLAG(srcval & mask,F_CF);
-            switch (rh) {
-            case 4:
-                store_data_long(srcoffset, srcval | mask);
-                break;
-            case 5:
-                store_data_long(srcoffset, srcval & ~mask);
-                break;
-            case 6:
-                store_data_long(srcoffset, srcval ^ mask);
-                break;
-            default:
-                break;
-            }
-        } else {
-            u16 srcval, mask;
-            u8 shift;
+	    srcoffset = decode_rm00_address(rl);
+	    DECODE_PRINTF(",");
+	    shift = fetch_byte_imm();
+	    TRACE_AND_STEP();
+	    bit = shift & 0x1F;
+	    srcval = fetch_data_long(srcoffset);
+	    mask = (0x1 << bit);
+	    CONDITIONAL_SET_FLAG(srcval & mask,F_CF);
+	    switch (rh) {
+	    case 4:
+		store_data_long(srcoffset, srcval | mask);
+		break;
+	    case 5:
+		store_data_long(srcoffset, srcval & ~mask);
+		break;
+	    case 6:
+		store_data_long(srcoffset, srcval ^ mask);
+		break;
+	    default:
+		break;
+	    }
+	} else {
+	    u16 srcval, mask;
+	    u8 shift;
 
-            srcoffset = decode_rm00_address(rl);
-            DECODE_PRINTF(",");
-            shift = fetch_byte_imm();
-            TRACE_AND_STEP();
-            bit = shift & 0xF;
-            srcval = fetch_data_word(srcoffset);
-            mask = (0x1 << bit);
-            CONDITIONAL_SET_FLAG(srcval & mask,F_CF);
-            switch (rh) {
-            case 4:
-                store_data_word(srcoffset, srcval | mask);
-                break;
-            case 5:
-                store_data_word(srcoffset, srcval & ~mask);
-                break;
-            case 6:
-                store_data_word(srcoffset, srcval ^ mask);
-                break;
-            default:
-                break;
-            }
-        }
-        break;
+	    srcoffset = decode_rm00_address(rl);
+	    DECODE_PRINTF(",");
+	    shift = fetch_byte_imm();
+	    TRACE_AND_STEP();
+	    bit = shift & 0xF;
+	    srcval = fetch_data_word(srcoffset);
+	    mask = (0x1 << bit);
+	    CONDITIONAL_SET_FLAG(srcval & mask,F_CF);
+	    switch (rh) {
+	    case 4:
+		store_data_word(srcoffset, srcval | mask);
+		break;
+	    case 5:
+		store_data_word(srcoffset, srcval & ~mask);
+		break;
+	    case 6:
+		store_data_word(srcoffset, srcval ^ mask);
+		break;
+	    default:
+		break;
+	    }
+	}
+	break;
     case 1:
-        if (M.x86.mode & SYSMODE_PREFIX_DATA) {
-            u32 srcval, mask;
-            u8 shift;
+	if (M.x86.mode & SYSMODE_PREFIX_DATA) {
+	    u32 srcval, mask;
+	    u8 shift;
 
-            srcoffset = decode_rm01_address(rl);
-            DECODE_PRINTF(",");
-            shift = fetch_byte_imm();
-            TRACE_AND_STEP();
-            bit = shift & 0x1F;
-            srcval = fetch_data_long(srcoffset);
-            mask = (0x1 << bit);
-            CONDITIONAL_SET_FLAG(srcval & mask,F_CF);
-            switch (rh) {
-            case 4:
-                store_data_long(srcoffset, srcval | mask);
-                break;
-            case 5:
-                store_data_long(srcoffset, srcval & ~mask);
-                break;
-            case 6:
-                store_data_long(srcoffset, srcval ^ mask);
-                break;
-            default:
-                break;
-            }
-        } else {
-            u16 srcval, mask;
-            u8 shift;
+	    srcoffset = decode_rm01_address(rl);
+	    DECODE_PRINTF(",");
+	    shift = fetch_byte_imm();
+	    TRACE_AND_STEP();
+	    bit = shift & 0x1F;
+	    srcval = fetch_data_long(srcoffset);
+	    mask = (0x1 << bit);
+	    CONDITIONAL_SET_FLAG(srcval & mask,F_CF);
+	    switch (rh) {
+	    case 4:
+		store_data_long(srcoffset, srcval | mask);
+		break;
+	    case 5:
+		store_data_long(srcoffset, srcval & ~mask);
+		break;
+	    case 6:
+		store_data_long(srcoffset, srcval ^ mask);
+		break;
+	    default:
+		break;
+	    }
+	} else {
+	    u16 srcval, mask;
+	    u8 shift;
 
-            srcoffset = decode_rm01_address(rl);
-            DECODE_PRINTF(",");
-            shift = fetch_byte_imm();
-            TRACE_AND_STEP();
-            bit = shift & 0xF;
-            srcval = fetch_data_word(srcoffset);
-            mask = (0x1 << bit);
-            CONDITIONAL_SET_FLAG(srcval & mask,F_CF);
-            switch (rh) {
-            case 4:
-                store_data_word(srcoffset, srcval | mask);
-                break;
-            case 5:
-                store_data_word(srcoffset, srcval & ~mask);
-                break;
-            case 6:
-                store_data_word(srcoffset, srcval ^ mask);
-                break;
-            default:
-                break;
-            }
-        }
-        break;
+	    srcoffset = decode_rm01_address(rl);
+	    DECODE_PRINTF(",");
+	    shift = fetch_byte_imm();
+	    TRACE_AND_STEP();
+	    bit = shift & 0xF;
+	    srcval = fetch_data_word(srcoffset);
+	    mask = (0x1 << bit);
+	    CONDITIONAL_SET_FLAG(srcval & mask,F_CF);
+	    switch (rh) {
+	    case 4:
+		store_data_word(srcoffset, srcval | mask);
+		break;
+	    case 5:
+		store_data_word(srcoffset, srcval & ~mask);
+		break;
+	    case 6:
+		store_data_word(srcoffset, srcval ^ mask);
+		break;
+	    default:
+		break;
+	    }
+	}
+	break;
     case 2:
-        if (M.x86.mode & SYSMODE_PREFIX_DATA) {
-            u32 srcval, mask;
-            u8 shift;
+	if (M.x86.mode & SYSMODE_PREFIX_DATA) {
+	    u32 srcval, mask;
+	    u8 shift;
 
-            srcoffset = decode_rm10_address(rl);
-            DECODE_PRINTF(",");
-            shift = fetch_byte_imm();
-            TRACE_AND_STEP();
-            bit = shift & 0x1F;
-            srcval = fetch_data_long(srcoffset);
-            mask = (0x1 << bit);
-            CONDITIONAL_SET_FLAG(srcval & mask,F_CF);
-            switch (rh) {
-            case 4:
-                store_data_long(srcoffset, srcval | mask);
-                break;
-            case 5:
-                store_data_long(srcoffset, srcval & ~mask);
-                break;
-            case 6:
-                store_data_long(srcoffset, srcval ^ mask);
-                break;
-            default:
-                break;
-            }
-        } else {
-            u16 srcval, mask;
-            u8 shift;
+	    srcoffset = decode_rm10_address(rl);
+	    DECODE_PRINTF(",");
+	    shift = fetch_byte_imm();
+	    TRACE_AND_STEP();
+	    bit = shift & 0x1F;
+	    srcval = fetch_data_long(srcoffset);
+	    mask = (0x1 << bit);
+	    CONDITIONAL_SET_FLAG(srcval & mask,F_CF);
+	    switch (rh) {
+	    case 4:
+		store_data_long(srcoffset, srcval | mask);
+		break;
+	    case 5:
+		store_data_long(srcoffset, srcval & ~mask);
+		break;
+	    case 6:
+		store_data_long(srcoffset, srcval ^ mask);
+		break;
+	    default:
+		break;
+	    }
+	} else {
+	    u16 srcval, mask;
+	    u8 shift;
 
-            srcoffset = decode_rm10_address(rl);
-            DECODE_PRINTF(",");
-            shift = fetch_byte_imm();
-            TRACE_AND_STEP();
-            bit = shift & 0xF;
-            srcval = fetch_data_word(srcoffset);
-            mask = (0x1 << bit);
-            CONDITIONAL_SET_FLAG(srcval & mask,F_CF);
-            switch (rh) {
-            case 4:
-                store_data_word(srcoffset, srcval | mask);
-                break;
-            case 5:
-                store_data_word(srcoffset, srcval & ~mask);
-                break;
-            case 6:
-                store_data_word(srcoffset, srcval ^ mask);
-                break;
-            default:
-                break;
-            }
-        }
-        break;
+	    srcoffset = decode_rm10_address(rl);
+	    DECODE_PRINTF(",");
+	    shift = fetch_byte_imm();
+	    TRACE_AND_STEP();
+	    bit = shift & 0xF;
+	    srcval = fetch_data_word(srcoffset);
+	    mask = (0x1 << bit);
+	    CONDITIONAL_SET_FLAG(srcval & mask,F_CF);
+	    switch (rh) {
+	    case 4:
+		store_data_word(srcoffset, srcval | mask);
+		break;
+	    case 5:
+		store_data_word(srcoffset, srcval & ~mask);
+		break;
+	    case 6:
+		store_data_word(srcoffset, srcval ^ mask);
+		break;
+	    default:
+		break;
+	    }
+	}
+	break;
     case 3:                     /* register to register */
-        if (M.x86.mode & SYSMODE_PREFIX_DATA) {
-            u32 *srcreg;
-            u32 mask;
-            u8 shift;
+	if (M.x86.mode & SYSMODE_PREFIX_DATA) {
+	    u32 *srcreg;
+	    u32 mask;
+	    u8 shift;
 
-            srcreg = DECODE_RM_LONG_REGISTER(rl);
-            DECODE_PRINTF(",");
-            shift = fetch_byte_imm();
-            TRACE_AND_STEP();
-            bit = shift & 0x1F;
-            mask = (0x1 << bit);
-            CONDITIONAL_SET_FLAG(*srcreg & mask,F_CF);
-            switch (rh) {
-            case 4:
-                *srcreg |= mask;
-                break;
-            case 5:
-                *srcreg &= ~mask;
-                break;
-            case 6:
-                *srcreg ^= mask;
-                break;
-            default:
-                break;
-            }
-        } else {
-            u16 *srcreg;
-            u16 mask;
-            u8 shift;
+	    srcreg = DECODE_RM_LONG_REGISTER(rl);
+	    DECODE_PRINTF(",");
+	    shift = fetch_byte_imm();
+	    TRACE_AND_STEP();
+	    bit = shift & 0x1F;
+	    mask = (0x1 << bit);
+	    CONDITIONAL_SET_FLAG(*srcreg & mask,F_CF);
+	    switch (rh) {
+	    case 4:
+		*srcreg |= mask;
+		break;
+	    case 5:
+		*srcreg &= ~mask;
+		break;
+	    case 6:
+		*srcreg ^= mask;
+		break;
+	    default:
+		break;
+	    }
+	} else {
+	    u16 *srcreg;
+	    u16 mask;
+	    u8 shift;
 
-            srcreg = DECODE_RM_WORD_REGISTER(rl);
-            DECODE_PRINTF(",");
-            shift = fetch_byte_imm();
-            TRACE_AND_STEP();
-            bit = shift & 0xF;
-            mask = (0x1 << bit);
-            CONDITIONAL_SET_FLAG(*srcreg & mask,F_CF);
-            switch (rh) {
-            case 4:
-                *srcreg |= mask;
-                break;
-            case 5:
-                *srcreg &= ~mask;
-                break;
-            case 6:
-                *srcreg ^= mask;
-                break;
-            default:
-                break;
-            }
-        }
-        break;
+	    srcreg = DECODE_RM_WORD_REGISTER(rl);
+	    DECODE_PRINTF(",");
+	    shift = fetch_byte_imm();
+	    TRACE_AND_STEP();
+	    bit = shift & 0xF;
+	    mask = (0x1 << bit);
+	    CONDITIONAL_SET_FLAG(*srcreg & mask,F_CF);
+	    switch (rh) {
+	    case 4:
+		*srcreg |= mask;
+		break;
+	    case 5:
+		*srcreg &= ~mask;
+		break;
+	    case 6:
+		*srcreg ^= mask;
+		break;
+	    default:
+		break;
+	    }
+	}
+	break;
     }
     DECODE_CLEAR_SEGOVR();
     END_OF_INSTR();
@@ -1993,109 +1993,109 @@
     FETCH_DECODE_MODRM(mod, rh, rl);
     switch (mod) {
     case 0:
-        if (M.x86.mode & SYSMODE_PREFIX_DATA) {
-            u32 srcval,mask;
-            u32 *shiftreg;
+	if (M.x86.mode & SYSMODE_PREFIX_DATA) {
+	    u32 srcval,mask;
+	    u32 *shiftreg;
 
-            srcoffset = decode_rm00_address(rl);
-            DECODE_PRINTF(",");
-            shiftreg = DECODE_RM_LONG_REGISTER(rh);
-            TRACE_AND_STEP();
-            bit = *shiftreg & 0x1F;
-            disp = (s16)*shiftreg >> 5;
-            srcval = fetch_data_long(srcoffset+disp);
-            mask = (0x1 << bit);
-            CONDITIONAL_SET_FLAG(srcval & mask,F_CF);
-            store_data_long(srcoffset+disp, srcval ^ mask);
-        } else {
-            u16 srcval,mask;
-            u16 *shiftreg;
+	    srcoffset = decode_rm00_address(rl);
+	    DECODE_PRINTF(",");
+	    shiftreg = DECODE_RM_LONG_REGISTER(rh);
+	    TRACE_AND_STEP();
+	    bit = *shiftreg & 0x1F;
+	    disp = (s16)*shiftreg >> 5;
+	    srcval = fetch_data_long(srcoffset+disp);
+	    mask = (0x1 << bit);
+	    CONDITIONAL_SET_FLAG(srcval & mask,F_CF);
+	    store_data_long(srcoffset+disp, srcval ^ mask);
+	} else {
+	    u16 srcval,mask;
+	    u16 *shiftreg;
 
-            srcoffset = decode_rm00_address(rl);
-            DECODE_PRINTF(",");
-            shiftreg = DECODE_RM_WORD_REGISTER(rh);
-            TRACE_AND_STEP();
-            bit = *shiftreg & 0xF;
-            disp = (s16)*shiftreg >> 4;
-            srcval = fetch_data_word(srcoffset+disp);
+	    srcoffset = decode_rm00_address(rl);
+	    DECODE_PRINTF(",");
+	    shiftreg = DECODE_RM_WORD_REGISTER(rh);
+	    TRACE_AND_STEP();
+	    bit = *shiftreg & 0xF;
+	    disp = (s16)*shiftreg >> 4;
+	    srcval = fetch_data_word(srcoffset+disp);
 			mask = (u16)(0x1 << bit);
-            CONDITIONAL_SET_FLAG(srcval & mask,F_CF);
+	    CONDITIONAL_SET_FLAG(srcval & mask,F_CF);
 			store_data_word(srcoffset+disp, (u16)(srcval ^ mask));
-        }
-        break;
+	}
+	break;
     case 1:
-        if (M.x86.mode & SYSMODE_PREFIX_DATA) {
-            u32 srcval,mask;
-            u32 *shiftreg;
+	if (M.x86.mode & SYSMODE_PREFIX_DATA) {
+	    u32 srcval,mask;
+	    u32 *shiftreg;
 
-            srcoffset = decode_rm01_address(rl);
-            DECODE_PRINTF(",");
-            shiftreg = DECODE_RM_LONG_REGISTER(rh);
-            TRACE_AND_STEP();
-            bit = *shiftreg & 0x1F;
-            disp = (s16)*shiftreg >> 5;
-            srcval = fetch_data_long(srcoffset+disp);
-            mask = (0x1 << bit);
-            CONDITIONAL_SET_FLAG(srcval & mask,F_CF);
-            store_data_long(srcoffset+disp, srcval ^ mask);
-        } else {
-            u16 srcval,mask;
-            u16 *shiftreg;
+	    srcoffset = decode_rm01_address(rl);
+	    DECODE_PRINTF(",");
+	    shiftreg = DECODE_RM_LONG_REGISTER(rh);
+	    TRACE_AND_STEP();
+	    bit = *shiftreg & 0x1F;
+	    disp = (s16)*shiftreg >> 5;
+	    srcval = fetch_data_long(srcoffset+disp);
+	    mask = (0x1 << bit);
+	    CONDITIONAL_SET_FLAG(srcval & mask,F_CF);
+	    store_data_long(srcoffset+disp, srcval ^ mask);
+	} else {
+	    u16 srcval,mask;
+	    u16 *shiftreg;
 
-            srcoffset = decode_rm01_address(rl);
-            DECODE_PRINTF(",");
-            shiftreg = DECODE_RM_WORD_REGISTER(rh);
-            TRACE_AND_STEP();
-            bit = *shiftreg & 0xF;
-            disp = (s16)*shiftreg >> 4;
-            srcval = fetch_data_word(srcoffset+disp);
+	    srcoffset = decode_rm01_address(rl);
+	    DECODE_PRINTF(",");
+	    shiftreg = DECODE_RM_WORD_REGISTER(rh);
+	    TRACE_AND_STEP();
+	    bit = *shiftreg & 0xF;
+	    disp = (s16)*shiftreg >> 4;
+	    srcval = fetch_data_word(srcoffset+disp);
 			mask = (u16)(0x1 << bit);
 			CONDITIONAL_SET_FLAG(srcval & mask,F_CF);
 			store_data_word(srcoffset+disp, (u16)(srcval ^ mask));
-        }
-        break;
+	}
+	break;
     case 2:
-        if (M.x86.mode & SYSMODE_PREFIX_DATA) {
-            u32 srcval,mask;
-            u32 *shiftreg;
+	if (M.x86.mode & SYSMODE_PREFIX_DATA) {
+	    u32 srcval,mask;
+	    u32 *shiftreg;
 
-            srcoffset = decode_rm10_address(rl);
-            DECODE_PRINTF(",");
-            shiftreg = DECODE_RM_LONG_REGISTER(rh);
-            TRACE_AND_STEP();
-            bit = *shiftreg & 0x1F;
-            disp = (s16)*shiftreg >> 5;
-            srcval = fetch_data_long(srcoffset+disp);
-            mask = (0x1 << bit);
-            CONDITIONAL_SET_FLAG(srcval & mask,F_CF);
-            store_data_long(srcoffset+disp, srcval ^ mask);
-        } else {
-            u16 srcval,mask;
-            u16 *shiftreg;
+	    srcoffset = decode_rm10_address(rl);
+	    DECODE_PRINTF(",");
+	    shiftreg = DECODE_RM_LONG_REGISTER(rh);
+	    TRACE_AND_STEP();
+	    bit = *shiftreg & 0x1F;
+	    disp = (s16)*shiftreg >> 5;
+	    srcval = fetch_data_long(srcoffset+disp);
+	    mask = (0x1 << bit);
+	    CONDITIONAL_SET_FLAG(srcval & mask,F_CF);
+	    store_data_long(srcoffset+disp, srcval ^ mask);
+	} else {
+	    u16 srcval,mask;
+	    u16 *shiftreg;
 
-            srcoffset = decode_rm10_address(rl);
-            DECODE_PRINTF(",");
-            shiftreg = DECODE_RM_WORD_REGISTER(rh);
-            TRACE_AND_STEP();
-            bit = *shiftreg & 0xF;
-            disp = (s16)*shiftreg >> 4;
-            srcval = fetch_data_word(srcoffset+disp);
+	    srcoffset = decode_rm10_address(rl);
+	    DECODE_PRINTF(",");
+	    shiftreg = DECODE_RM_WORD_REGISTER(rh);
+	    TRACE_AND_STEP();
+	    bit = *shiftreg & 0xF;
+	    disp = (s16)*shiftreg >> 4;
+	    srcval = fetch_data_word(srcoffset+disp);
 			mask = (u16)(0x1 << bit);
 			CONDITIONAL_SET_FLAG(srcval & mask,F_CF);
 			store_data_word(srcoffset+disp, (u16)(srcval ^ mask));
-        }
-        break;
+	}
+	break;
     case 3:                     /* register to register */
-        if (M.x86.mode & SYSMODE_PREFIX_DATA) {
+	if (M.x86.mode & SYSMODE_PREFIX_DATA) {
 			u32 *srcreg,*shiftreg;
-            u32 mask;
+	    u32 mask;
 
-            srcreg = DECODE_RM_LONG_REGISTER(rl);
-            DECODE_PRINTF(",");
-            shiftreg = DECODE_RM_LONG_REGISTER(rh);
-            TRACE_AND_STEP();
-            bit = *shiftreg & 0x1F;
-            mask = (0x1 << bit);
+	    srcreg = DECODE_RM_LONG_REGISTER(rl);
+	    DECODE_PRINTF(",");
+	    shiftreg = DECODE_RM_LONG_REGISTER(rh);
+	    TRACE_AND_STEP();
+	    bit = *shiftreg & 0x1F;
+	    mask = (0x1 << bit);
 			CONDITIONAL_SET_FLAG(*srcreg & mask,F_CF);
 			*srcreg ^= mask;
 		} else {
@@ -2108,10 +2108,10 @@
 			TRACE_AND_STEP();
 			bit = *shiftreg & 0xF;
 			mask = (u16)(0x1 << bit);
-            CONDITIONAL_SET_FLAG(*srcreg & mask,F_CF);
-            *srcreg ^= mask;
-        }
-        break;
+	    CONDITIONAL_SET_FLAG(*srcreg & mask,F_CF);
+	    *srcreg ^= mask;
+	}
+	break;
     }
     DECODE_CLEAR_SEGOVR();
     END_OF_INSTR();
@@ -2363,103 +2363,103 @@
     FETCH_DECODE_MODRM(mod, rh, rl);
     switch (mod) {
     case 0:
-        if (M.x86.mode & SYSMODE_PREFIX_DATA) {
-            u32 *destreg;
-            u32 srcval;
+	if (M.x86.mode & SYSMODE_PREFIX_DATA) {
+	    u32 *destreg;
+	    u32 srcval;
 
-            destreg = DECODE_RM_LONG_REGISTER(rh);
-            DECODE_PRINTF(",");
-            srcoffset = decode_rm00_address(rl);
-            srcval = (s32)((s8)fetch_data_byte(srcoffset));
-            DECODE_PRINTF("\n");
-            TRACE_AND_STEP();
-            *destreg = srcval;
-        } else {
-            u16 *destreg;
-            u16 srcval;
+	    destreg = DECODE_RM_LONG_REGISTER(rh);
+	    DECODE_PRINTF(",");
+	    srcoffset = decode_rm00_address(rl);
+	    srcval = (s32)((s8)fetch_data_byte(srcoffset));
+	    DECODE_PRINTF("\n");
+	    TRACE_AND_STEP();
+	    *destreg = srcval;
+	} else {
+	    u16 *destreg;
+	    u16 srcval;
 
-            destreg = DECODE_RM_WORD_REGISTER(rh);
-            DECODE_PRINTF(",");
-            srcoffset = decode_rm00_address(rl);
-            srcval = (s16)((s8)fetch_data_byte(srcoffset));
-            DECODE_PRINTF("\n");
-            TRACE_AND_STEP();
-            *destreg = srcval;
-        }
-        break;
+	    destreg = DECODE_RM_WORD_REGISTER(rh);
+	    DECODE_PRINTF(",");
+	    srcoffset = decode_rm00_address(rl);
+	    srcval = (s16)((s8)fetch_data_byte(srcoffset));
+	    DECODE_PRINTF("\n");
+	    TRACE_AND_STEP();
+	    *destreg = srcval;
+	}
+	break;
     case 1:
-        if (M.x86.mode & SYSMODE_PREFIX_DATA) {
-            u32 *destreg;
-            u32 srcval;
+	if (M.x86.mode & SYSMODE_PREFIX_DATA) {
+	    u32 *destreg;
+	    u32 srcval;
 
-            destreg = DECODE_RM_LONG_REGISTER(rh);
-            DECODE_PRINTF(",");
-            srcoffset = decode_rm01_address(rl);
-            srcval = (s32)((s8)fetch_data_byte(srcoffset));
-            DECODE_PRINTF("\n");
-            TRACE_AND_STEP();
-            *destreg = srcval;
-        } else {
-            u16 *destreg;
-            u16 srcval;
+	    destreg = DECODE_RM_LONG_REGISTER(rh);
+	    DECODE_PRINTF(",");
+	    srcoffset = decode_rm01_address(rl);
+	    srcval = (s32)((s8)fetch_data_byte(srcoffset));
+	    DECODE_PRINTF("\n");
+	    TRACE_AND_STEP();
+	    *destreg = srcval;
+	} else {
+	    u16 *destreg;
+	    u16 srcval;
 
-            destreg = DECODE_RM_WORD_REGISTER(rh);
-            DECODE_PRINTF(",");
-            srcoffset = decode_rm01_address(rl);
-            srcval = (s16)((s8)fetch_data_byte(srcoffset));
-            DECODE_PRINTF("\n");
-            TRACE_AND_STEP();
-            *destreg = srcval;
-        }
-        break;
+	    destreg = DECODE_RM_WORD_REGISTER(rh);
+	    DECODE_PRINTF(",");
+	    srcoffset = decode_rm01_address(rl);
+	    srcval = (s16)((s8)fetch_data_byte(srcoffset));
+	    DECODE_PRINTF("\n");
+	    TRACE_AND_STEP();
+	    *destreg = srcval;
+	}
+	break;
     case 2:
-        if (M.x86.mode & SYSMODE_PREFIX_DATA) {
-            u32 *destreg;
-            u32 srcval;
+	if (M.x86.mode & SYSMODE_PREFIX_DATA) {
+	    u32 *destreg;
+	    u32 srcval;
 
-            destreg = DECODE_RM_LONG_REGISTER(rh);
-            DECODE_PRINTF(",");
-            srcoffset = decode_rm10_address(rl);
-            srcval = (s32)((s8)fetch_data_byte(srcoffset));
-            DECODE_PRINTF("\n");
-            TRACE_AND_STEP();
-            *destreg = srcval;
-        } else {
-            u16 *destreg;
-            u16 srcval;
+	    destreg = DECODE_RM_LONG_REGISTER(rh);
+	    DECODE_PRINTF(",");
+	    srcoffset = decode_rm10_address(rl);
+	    srcval = (s32)((s8)fetch_data_byte(srcoffset));
+	    DECODE_PRINTF("\n");
+	    TRACE_AND_STEP();
+	    *destreg = srcval;
+	} else {
+	    u16 *destreg;
+	    u16 srcval;
 
-            destreg = DECODE_RM_WORD_REGISTER(rh);
-            DECODE_PRINTF(",");
-            srcoffset = decode_rm10_address(rl);
-            srcval = (s16)((s8)fetch_data_byte(srcoffset));
-            DECODE_PRINTF("\n");
-            TRACE_AND_STEP();
-            *destreg = srcval;
-        }
-        break;
+	    destreg = DECODE_RM_WORD_REGISTER(rh);
+	    DECODE_PRINTF(",");
+	    srcoffset = decode_rm10_address(rl);
+	    srcval = (s16)((s8)fetch_data_byte(srcoffset));
+	    DECODE_PRINTF("\n");
+	    TRACE_AND_STEP();
+	    *destreg = srcval;
+	}
+	break;
     case 3:                     /* register to register */
-        if (M.x86.mode & SYSMODE_PREFIX_DATA) {
-            u32 *destreg;
-            u8  *srcreg;
+	if (M.x86.mode & SYSMODE_PREFIX_DATA) {
+	    u32 *destreg;
+	    u8  *srcreg;
 
-            destreg = DECODE_RM_LONG_REGISTER(rh);
-            DECODE_PRINTF(",");
-            srcreg = DECODE_RM_BYTE_REGISTER(rl);
-            DECODE_PRINTF("\n");
-            TRACE_AND_STEP();
-            *destreg = (s32)((s8)*srcreg);
-        } else {
-            u16 *destreg;
-            u8  *srcreg;
+	    destreg = DECODE_RM_LONG_REGISTER(rh);
+	    DECODE_PRINTF(",");
+	    srcreg = DECODE_RM_BYTE_REGISTER(rl);
+	    DECODE_PRINTF("\n");
+	    TRACE_AND_STEP();
+	    *destreg = (s32)((s8)*srcreg);
+	} else {
+	    u16 *destreg;
+	    u8  *srcreg;
 
-            destreg = DECODE_RM_WORD_REGISTER(rh);
-            DECODE_PRINTF(",");
-            srcreg = DECODE_RM_BYTE_REGISTER(rl);
-            DECODE_PRINTF("\n");
-            TRACE_AND_STEP();
-            *destreg = (s16)((s8)*srcreg);
-        }
-        break;
+	    destreg = DECODE_RM_WORD_REGISTER(rh);
+	    DECODE_PRINTF(",");
+	    srcreg = DECODE_RM_BYTE_REGISTER(rl);
+	    DECODE_PRINTF("\n");
+	    TRACE_AND_STEP();
+	    *destreg = (s16)((s8)*srcreg);
+	}
+	break;
     }
     DECODE_CLEAR_SEGOVR();
     END_OF_INSTR();
@@ -2482,40 +2482,40 @@
     FETCH_DECODE_MODRM(mod, rh, rl);
     switch (mod) {
     case 0:
-        destreg = DECODE_RM_LONG_REGISTER(rh);
-        DECODE_PRINTF(",");
-        srcoffset = decode_rm00_address(rl);
-        srcval = (s32)((s16)fetch_data_word(srcoffset));
-        DECODE_PRINTF("\n");
-        TRACE_AND_STEP();
-        *destreg = srcval;
-        break;
+	destreg = DECODE_RM_LONG_REGISTER(rh);
+	DECODE_PRINTF(",");
+	srcoffset = decode_rm00_address(rl);
+	srcval = (s32)((s16)fetch_data_word(srcoffset));
+	DECODE_PRINTF("\n");
+	TRACE_AND_STEP();
+	*destreg = srcval;
+	break;
     case 1:
-        destreg = DECODE_RM_LONG_REGISTER(rh);
-        DECODE_PRINTF(",");
-        srcoffset = decode_rm01_address(rl);
-        srcval = (s32)((s16)fetch_data_word(srcoffset));
-        DECODE_PRINTF("\n");
-        TRACE_AND_STEP();
-        *destreg = srcval;
-        break;
+	destreg = DECODE_RM_LONG_REGISTER(rh);
+	DECODE_PRINTF(",");
+	srcoffset = decode_rm01_address(rl);
+	srcval = (s32)((s16)fetch_data_word(srcoffset));
+	DECODE_PRINTF("\n");
+	TRACE_AND_STEP();
+	*destreg = srcval;
+	break;
     case 2:
-        destreg = DECODE_RM_LONG_REGISTER(rh);
-        DECODE_PRINTF(",");
-        srcoffset = decode_rm10_address(rl);
-        srcval = (s32)((s16)fetch_data_word(srcoffset));
-        DECODE_PRINTF("\n");
-        TRACE_AND_STEP();
-        *destreg = srcval;
-        break;
+	destreg = DECODE_RM_LONG_REGISTER(rh);
+	DECODE_PRINTF(",");
+	srcoffset = decode_rm10_address(rl);
+	srcval = (s32)((s16)fetch_data_word(srcoffset));
+	DECODE_PRINTF("\n");
+	TRACE_AND_STEP();
+	*destreg = srcval;
+	break;
     case 3:                     /* register to register */
-        destreg = DECODE_RM_LONG_REGISTER(rh);
-        DECODE_PRINTF(",");
-        srcreg = DECODE_RM_WORD_REGISTER(rl);
-        DECODE_PRINTF("\n");
-        TRACE_AND_STEP();
-        *destreg = (s32)((s16)*srcreg);
-        break;
+	destreg = DECODE_RM_LONG_REGISTER(rh);
+	DECODE_PRINTF(",");
+	srcreg = DECODE_RM_WORD_REGISTER(rl);
+	DECODE_PRINTF("\n");
+	TRACE_AND_STEP();
+	*destreg = (s32)((s16)*srcreg);
+	break;
     }
     DECODE_CLEAR_SEGOVR();
     END_OF_INSTR();

diff --git a/board/MAI/bios_emulator/scitech/src/x86emu/prim_ops.c b/board/MAI/bios_emulator/scitech/src/x86emu/prim_ops.c
index ba4ffde..72b1bf2 100644
--- a/board/MAI/bios_emulator/scitech/src/x86emu/prim_ops.c
+++ b/board/MAI/bios_emulator/scitech/src/x86emu/prim_ops.c

@@ -843,9 +843,9 @@
     /* s is the rotate distance.  It varies from 0 - 8. */
 	/* have
 
-       CF  B_7 B_6 B_5 B_4 B_3 B_2 B_1 B_0 
+       CF  B_7 B_6 B_5 B_4 B_3 B_2 B_1 B_0
 
-       want to rotate through the carry by "s" bits.  We could 
+       want to rotate through the carry by "s" bits.  We could
        loop, but that's inefficient.  So the width is 9,
        and we split into three parts:
 
@@ -855,12 +855,12 @@
 
        The new rotate is done mod 9, and given this,
        for a rotation of n bits (mod 9) the new carry flag is
-       then located n bits from the MSB.  The low part is 
+       then located n bits from the MSB.  The low part is
        then shifted up cnt bits, and the high part is or'd
-       in.  Using CAPS for new values, and lowercase for the 
+       in.  Using CAPS for new values, and lowercase for the
        original values, this can be expressed as:
 
-       IF n > 0 
+       IF n > 0
        1) CF <-  b_(8-n)
        2) B_(7) .. B_(n)  <-  b_(8-(n+1)) .. b_0
        3) B_(n-1) <- cf
@@ -868,37 +868,37 @@
 	 */
 	res = d;
 	if ((cnt = s % 9) != 0) {
-        /* extract the new CARRY FLAG. */
-        /* CF <-  b_(8-n)             */
-        cf = (d >> (8 - cnt)) & 0x1;
+	/* extract the new CARRY FLAG. */
+	/* CF <-  b_(8-n)             */
+	cf = (d >> (8 - cnt)) & 0x1;
 
-        /* get the low stuff which rotated 
-           into the range B_7 .. B_cnt */
-        /* B_(7) .. B_(n)  <-  b_(8-(n+1)) .. b_0  */
-        /* note that the right hand side done by the mask */
+	/* get the low stuff which rotated
+	   into the range B_7 .. B_cnt */
+	/* B_(7) .. B_(n)  <-  b_(8-(n+1)) .. b_0  */
+	/* note that the right hand side done by the mask */
 		res = (d << cnt) & 0xff;
 
-        /* now the high stuff which rotated around 
-           into the positions B_cnt-2 .. B_0 */
-        /* B_(n-2) .. B_0 <-  b_7 .. b_(8-(n-1)) */
-        /* shift it downward, 7-(n-2) = 9-n positions. 
-           and mask off the result before or'ing in. 
-         */
-        mask = (1 << (cnt - 1)) - 1;
-        res |= (d >> (9 - cnt)) & mask;
+	/* now the high stuff which rotated around
+	   into the positions B_cnt-2 .. B_0 */
+	/* B_(n-2) .. B_0 <-  b_7 .. b_(8-(n-1)) */
+	/* shift it downward, 7-(n-2) = 9-n positions.
+	   and mask off the result before or'ing in.
+	 */
+	mask = (1 << (cnt - 1)) - 1;
+	res |= (d >> (9 - cnt)) & mask;
 
-        /* if the carry flag was set, or it in.  */
+	/* if the carry flag was set, or it in.  */
 		if (ACCESS_FLAG(F_CF)) {     /* carry flag is set */
-            /*  B_(n-1) <- cf */
-            res |= 1 << (cnt - 1);
-        }
-        /* set the new carry flag, based on the variable "cf" */
+	    /*  B_(n-1) <- cf */
+	    res |= 1 << (cnt - 1);
+	}
+	/* set the new carry flag, based on the variable "cf" */
 		CONDITIONAL_SET_FLAG(cf, F_CF);
-        /* OVERFLOW is set *IFF* cnt==1, then it is the 
-           xor of CF and the most significant bit.  Blecck. */
-        /* parenthesized this expression since it appears to
-           be causing OF to be misset */
-        CONDITIONAL_SET_FLAG(cnt == 1 && XOR2(cf + ((res >> 6) & 0x2)),
+	/* OVERFLOW is set *IFF* cnt==1, then it is the
+	   xor of CF and the most significant bit.  Blecck. */
+	/* parenthesized this expression since it appears to
+	   be causing OF to be misset */
+	CONDITIONAL_SET_FLAG(cnt == 1 && XOR2(cf + ((res >> 6) & 0x2)),
 							 F_OF);
 
     }
@@ -963,22 +963,22 @@
 	u32	mask, cf, ocf = 0;
 
 	/* rotate right through carry */
-    /* 
+    /*
        s is the rotate distance.  It varies from 0 - 8.
-       d is the byte object rotated.  
+       d is the byte object rotated.
 
-       have 
+       have
 
-       CF  B_7 B_6 B_5 B_4 B_3 B_2 B_1 B_0 
+       CF  B_7 B_6 B_5 B_4 B_3 B_2 B_1 B_0
 
        The new rotate is done mod 9, and given this,
        for a rotation of n bits (mod 9) the new carry flag is
-       then located n bits from the LSB.  The low part is 
+       then located n bits from the LSB.  The low part is
        then shifted up cnt bits, and the high part is or'd
-       in.  Using CAPS for new values, and lowercase for the 
+       in.  Using CAPS for new values, and lowercase for the
        original values, this can be expressed as:
 
-       IF n > 0 
+       IF n > 0
        1) CF <-  b_(n-1)
        2) B_(8-(n+1)) .. B_(0)  <-  b_(7) .. b_(n)
        3) B_(8-n) <- cf
@@ -986,49 +986,49 @@
 	 */
 	res = d;
 	if ((cnt = s % 9) != 0) {
-        /* extract the new CARRY FLAG. */
-        /* CF <-  b_(n-1)              */
-        if (cnt == 1) {
-            cf = d & 0x1;
-            /* note hackery here.  Access_flag(..) evaluates to either
-               0 if flag not set
-               non-zero if flag is set.
-               doing access_flag(..) != 0 casts that into either 
+	/* extract the new CARRY FLAG. */
+	/* CF <-  b_(n-1)              */
+	if (cnt == 1) {
+	    cf = d & 0x1;
+	    /* note hackery here.  Access_flag(..) evaluates to either
+	       0 if flag not set
+	       non-zero if flag is set.
+	       doing access_flag(..) != 0 casts that into either
 			   0..1 in any representation of the flags register
-               (i.e. packed bit array or unpacked.)
-             */
+	       (i.e. packed bit array or unpacked.)
+	     */
 			ocf = ACCESS_FLAG(F_CF) != 0;
-        } else
-            cf = (d >> (cnt - 1)) & 0x1;
+	} else
+	    cf = (d >> (cnt - 1)) & 0x1;
 
-        /* B_(8-(n+1)) .. B_(0)  <-  b_(7) .. b_n  */
-        /* note that the right hand side done by the mask
-           This is effectively done by shifting the 
-           object to the right.  The result must be masked,
-           in case the object came in and was treated 
-           as a negative number.  Needed??? */
+	/* B_(8-(n+1)) .. B_(0)  <-  b_(7) .. b_n  */
+	/* note that the right hand side done by the mask
+	   This is effectively done by shifting the
+	   object to the right.  The result must be masked,
+	   in case the object came in and was treated
+	   as a negative number.  Needed??? */
 
-        mask = (1 << (8 - cnt)) - 1;
-        res = (d >> cnt) & mask;
+	mask = (1 << (8 - cnt)) - 1;
+	res = (d >> cnt) & mask;
 
-        /* now the high stuff which rotated around 
-           into the positions B_cnt-2 .. B_0 */
-        /* B_(7) .. B_(8-(n-1)) <-  b_(n-2) .. b_(0) */
-        /* shift it downward, 7-(n-2) = 9-n positions. 
-           and mask off the result before or'ing in. 
-         */
-        res |= (d << (9 - cnt));
+	/* now the high stuff which rotated around
+	   into the positions B_cnt-2 .. B_0 */
+	/* B_(7) .. B_(8-(n-1)) <-  b_(n-2) .. b_(0) */
+	/* shift it downward, 7-(n-2) = 9-n positions.
+	   and mask off the result before or'ing in.
+	 */
+	res |= (d << (9 - cnt));
 
-        /* if the carry flag was set, or it in.  */
+	/* if the carry flag was set, or it in.  */
 		if (ACCESS_FLAG(F_CF)) {     /* carry flag is set */
-            /*  B_(8-n) <- cf */
-            res |= 1 << (8 - cnt);
-        }
-        /* set the new carry flag, based on the variable "cf" */
+	    /*  B_(8-n) <- cf */
+	    res |= 1 << (8 - cnt);
+	}
+	/* set the new carry flag, based on the variable "cf" */
 		CONDITIONAL_SET_FLAG(cf, F_CF);
-        /* OVERFLOW is set *IFF* cnt==1, then it is the 
-           xor of CF and the most significant bit.  Blecck. */
-        /* parenthesized... */
+	/* OVERFLOW is set *IFF* cnt==1, then it is the
+	   xor of CF and the most significant bit.  Blecck. */
+	/* parenthesized... */
 		if (cnt == 1) {
 			CONDITIONAL_SET_FLAG(XOR2(ocf + ((d >> 6) & 0x2)),
 								 F_OF);
@@ -1111,18 +1111,18 @@
     register unsigned int res, cnt, mask;
 
     /* rotate left */
-    /* 
+    /*
        s is the rotate distance.  It varies from 0 - 8.
-       d is the byte object rotated.  
+       d is the byte object rotated.
 
-       have 
+       have
 
-       CF  B_7 ... B_0 
+       CF  B_7 ... B_0
 
        The new rotate is done mod 8.
        Much simpler than the "rcl" or "rcr" operations.
 
-       IF n > 0 
+       IF n > 0
        1) B_(7) .. B_(n)  <-  b_(8-(n+1)) .. b_(0)
        2) B_(n-1) .. B_(0) <-  b_(7) .. b_(8-n)
 	 */
@@ -1210,34 +1210,34 @@
     register unsigned int res, cnt, mask;
 
     /* rotate right */
-    /* 
+    /*
        s is the rotate distance.  It varies from 0 - 8.
-       d is the byte object rotated.  
+       d is the byte object rotated.
 
-       have 
+       have
 
-       B_7 ... B_0 
+       B_7 ... B_0
 
        The rotate is done mod 8.
 
-       IF n > 0 
+       IF n > 0
        1) B_(8-(n+1)) .. B_(0)  <-  b_(7) .. b_(n)
        2) B_(7) .. B_(8-n) <-  b_(n-1) .. b_(0)
 	 */
 	res = d;
 	if ((cnt = s % 8) != 0) {           /* not a typo, do nada if cnt==0 */
-        /* B_(7) .. B_(8-n) <-  b_(n-1) .. b_(0) */
-        res = (d << (8 - cnt));
+	/* B_(7) .. B_(8-n) <-  b_(n-1) .. b_(0) */
+	res = (d << (8 - cnt));
 
-        /* B_(8-(n+1)) .. B_(0)  <-  b_(7) .. b_(n) */
-        mask = (1 << (8 - cnt)) - 1;
-        res |= (d >> (cnt)) & mask;
+	/* B_(8-(n+1)) .. B_(0)  <-  b_(7) .. b_(n) */
+	mask = (1 << (8 - cnt)) - 1;
+	res |= (d >> (cnt)) & mask;
 
-        /* set the new carry flag, Note that it is the low order 
-           bit of the result!!!                               */
+	/* set the new carry flag, Note that it is the low order
+	   bit of the result!!!                               */
 		CONDITIONAL_SET_FLAG(res & 0x80, F_CF);
 		/* OVERFLOW is set *IFF* s==1, then it is the
-           xor of the two most significant bits.  Blecck. */
+	   xor of the two most significant bits.  Blecck. */
 		CONDITIONAL_SET_FLAG(s == 1 && XOR2(res >> 6), F_OF);
 	} else if (s != 0) {
 		/* set the new carry flag, Note that it is the low order
@@ -1363,9 +1363,9 @@
 									(((res & 0x8000) == 0x8000) ^
 									 (ACCESS_FLAG(F_CF) != 0)),
 									F_OF);
-        } else {
+	} else {
 			CLEAR_FLAG(F_OF);
-        }
+	}
     } else {
 		res = 0;
 		CONDITIONAL_SET_FLAG((d << (s-1)) & 0x8000, F_CF);
@@ -1474,9 +1474,9 @@
 
 		if (cnt == 1) {
 			CONDITIONAL_SET_FLAG(XOR2(res >> 14), F_OF);
-        } else {
+	} else {
 			CLEAR_FLAG(F_OF);
-        }
+	}
 	} else {
 		res = 0;
 		CLEAR_FLAG(F_CF);
@@ -1505,16 +1505,16 @@
 			CONDITIONAL_SET_FLAG((res & 0xffffffff) == 0, F_ZF);
 			CONDITIONAL_SET_FLAG(res & 0x80000000, F_SF);
 			CONDITIONAL_SET_FLAG(PARITY(res & 0xff), F_PF);
-        } else {
-            res = d;
-        }
-        if (cnt == 1) {
+	} else {
+	    res = d;
+	}
+	if (cnt == 1) {
 			CONDITIONAL_SET_FLAG(XOR2(res >> 30), F_OF);
-        } else {
+	} else {
 			CLEAR_FLAG(F_OF);
-        }
+	}
     } else {
-        res = 0;
+	res = 0;
 		CLEAR_FLAG(F_CF);
 		CLEAR_FLAG(F_OF);
 		SET_FLAG(F_ZF);
@@ -1547,8 +1547,8 @@
 		CONDITIONAL_SET_FLAG(PARITY(res & 0xff), F_PF);
 		CONDITIONAL_SET_FLAG(res & 0x80, F_SF);
     } else if (cnt >= 8) {
-        if (sf) {
-            res = 0xff;
+	if (sf) {
+	    res = 0xff;
 			SET_FLAG(F_CF);
 			CLEAR_FLAG(F_ZF);
 			SET_FLAG(F_SF);
@@ -1576,30 +1576,30 @@
     cnt = s % 16;
 	res = d;
 	if (cnt > 0 && cnt < 16) {
-        mask = (1 << (16 - cnt)) - 1;
-        cf = d & (1 << (cnt - 1));
-        res = (d >> cnt) & mask;
+	mask = (1 << (16 - cnt)) - 1;
+	cf = d & (1 << (cnt - 1));
+	res = (d >> cnt) & mask;
 		CONDITIONAL_SET_FLAG(cf, F_CF);
-        if (sf) {
-            res |= ~mask;
-        }
+	if (sf) {
+	    res |= ~mask;
+	}
 		CONDITIONAL_SET_FLAG((res & 0xffff) == 0, F_ZF);
 		CONDITIONAL_SET_FLAG(res & 0x8000, F_SF);
 		CONDITIONAL_SET_FLAG(PARITY(res & 0xff), F_PF);
     } else if (cnt >= 16) {
-        if (sf) {
-            res = 0xffff;
+	if (sf) {
+	    res = 0xffff;
 			SET_FLAG(F_CF);
 			CLEAR_FLAG(F_ZF);
 			SET_FLAG(F_SF);
 			SET_FLAG(F_PF);
-        } else {
-            res = 0;
+	} else {
+	    res = 0;
 			CLEAR_FLAG(F_CF);
 			SET_FLAG(F_ZF);
 			CLEAR_FLAG(F_SF);
 			CLEAR_FLAG(F_PF);
-        }
+	}
     }
 	return (u16)res;
 }
@@ -1616,19 +1616,19 @@
     cnt = s % 32;
 	res = d;
 	if (cnt > 0 && cnt < 32) {
-        mask = (1 << (32 - cnt)) - 1;
+	mask = (1 << (32 - cnt)) - 1;
 		cf = d & (1 << (cnt - 1));
-        res = (d >> cnt) & mask;
+	res = (d >> cnt) & mask;
 		CONDITIONAL_SET_FLAG(cf, F_CF);
-        if (sf) {
-            res |= ~mask;
-        }
+	if (sf) {
+	    res |= ~mask;
+	}
 		CONDITIONAL_SET_FLAG((res & 0xffffffff) == 0, F_ZF);
 		CONDITIONAL_SET_FLAG(res & 0x80000000, F_SF);
 		CONDITIONAL_SET_FLAG(PARITY(res & 0xff), F_PF);
     } else if (cnt >= 32) {
-        if (sf) {
-            res = 0xffffffff;
+	if (sf) {
+	    res = 0xffffffff;
 			SET_FLAG(F_CF);
 			CLEAR_FLAG(F_ZF);
 			SET_FLAG(F_SF);
@@ -1741,9 +1741,9 @@
 
 		if (cnt == 1) {
 			CONDITIONAL_SET_FLAG(XOR2(res >> 14), F_OF);
-        } else {
+	} else {
 			CLEAR_FLAG(F_OF);
-        }
+	}
 	} else {
 		res = 0;
 		CLEAR_FLAG(F_CF);
@@ -1777,9 +1777,9 @@
 		}
 		if (cnt == 1) {
 			CONDITIONAL_SET_FLAG(XOR2(res >> 30), F_OF);
-        } else {
+	} else {
 			CLEAR_FLAG(F_OF);
-        }
+	}
 	} else {
 		res = 0;
 		CLEAR_FLAG(F_CF);
@@ -1826,9 +1826,9 @@
     register u32 bc;
 
 	if (ACCESS_FLAG(F_CF))
-        res = d - s - 1;
+	res = d - s - 1;
     else
-        res = d - s;
+	res = d - s;
 	CONDITIONAL_SET_FLAG(res & 0x8000, F_SF);
 	CONDITIONAL_SET_FLAG((res & 0xffff) == 0, F_ZF);
 	CONDITIONAL_SET_FLAG(PARITY(res & 0xff), F_PF);
@@ -1851,9 +1851,9 @@
 	register u32 bc;
 
 	if (ACCESS_FLAG(F_CF))
-        res = d - s - 1;
+	res = d - s - 1;
     else
-        res = d - s;
+	res = d - s;
 	CONDITIONAL_SET_FLAG(res & 0x80000000, F_SF);
 	CONDITIONAL_SET_FLAG((res & 0xffffffff) == 0, F_ZF);
 	CONDITIONAL_SET_FLAG(PARITY(res & 0xff), F_PF);
@@ -2219,7 +2219,7 @@
 	dvd = (s16)M.x86.R_AX;
 	if (s == 0) {
 		x86emu_intr_raise(0);
-        return;
+	return;
 	}
 	div = dvd / (s8)s;
 	mod = dvd % (s8)s;
@@ -2297,7 +2297,7 @@
 	do {
 		div <<= 1;
 		carry = (l_dvd >= l_s) ? 0 : 1;
-		
+
 		if (abs_h_dvd < (h_s + carry)) {
 			h_s >>= 1;
 			l_s = abs_s << (--counter);
@@ -2311,7 +2311,7 @@
 			div |= 1;
 			continue;
 		}
-		
+
 	} while (counter > -1);
 	/* overflow */
 	if (abs_h_dvd || (l_dvd > abs_s)) {
@@ -2344,13 +2344,13 @@
 	dvd = M.x86.R_AX;
     if (s == 0) {
 		x86emu_intr_raise(0);
-        return;
+	return;
     }
 	div = dvd / (u8)s;
 	mod = dvd % (u8)s;
 	if (abs(div) > 0xff) {
 		x86emu_intr_raise(0);
-        return;
+	return;
 	}
 	M.x86.R_AL = (u8)div;
 	M.x86.R_AH = (u8)mod;
@@ -2367,7 +2367,7 @@
 	dvd = (((u32)M.x86.R_DX) << 16) | M.x86.R_AX;
 	if (s == 0) {
 		x86emu_intr_raise(0);
-        return;
+	return;
     }
 	div = dvd / (u16)s;
 	mod = dvd % (u16)s;
@@ -2413,7 +2413,7 @@
 	u32 l_s = 0;
 	int counter = 32;
 	int carry;
-		
+
 	if (s == 0) {
 		x86emu_intr_raise(0);
 		return;
@@ -2421,7 +2421,7 @@
 	do {
 		div <<= 1;
 		carry = (l_dvd >= l_s) ? 0 : 1;
-		
+
 		if (h_dvd < (h_s + carry)) {
 			h_s >>= 1;
 			l_s = s << (--counter);
@@ -2435,7 +2435,7 @@
 			div |= 1;
 			continue;
 		}
-		
+
 	} while (counter > -1);
 	/* overflow */
 	if (h_dvd || (l_dvd > s)) {
@@ -2468,54 +2468,54 @@
 		inc = -size;
 	}
 	if (M.x86.mode & (SYSMODE_PREFIX_REPE | SYSMODE_PREFIX_REPNE)) {
-        /* dont care whether REPE or REPNE */
-        /* in until CX is ZERO. */
+	/* dont care whether REPE or REPNE */
+	/* in until CX is ZERO. */
 		u32 count = ((M.x86.mode & SYSMODE_PREFIX_DATA) ?
 					 M.x86.R_ECX : M.x86.R_CX);
-        switch (size) {
-          case 1:
-            while (count--) {
+	switch (size) {
+	  case 1:
+	    while (count--) {
 				store_data_byte_abs(M.x86.R_ES, M.x86.R_DI,
 									(*sys_inb)(M.x86.R_DX));
 				M.x86.R_DI += inc;
-            }
-            break;
+	    }
+	    break;
 
-          case 2:
-            while (count--) {
+	  case 2:
+	    while (count--) {
 				store_data_word_abs(M.x86.R_ES, M.x86.R_DI,
 									(*sys_inw)(M.x86.R_DX));
 				M.x86.R_DI += inc;
-            }
-            break;
-          case 4:
-            while (count--) {
+	    }
+	    break;
+	  case 4:
+	    while (count--) {
 				store_data_long_abs(M.x86.R_ES, M.x86.R_DI,
 									(*sys_inl)(M.x86.R_DX));
 				M.x86.R_DI += inc;
-                break;
-            }
-        }
+		break;
+	    }
+	}
 		M.x86.R_CX = 0;
 		if (M.x86.mode & SYSMODE_PREFIX_DATA) {
 			M.x86.R_ECX = 0;
-        }
+	}
 		M.x86.mode &= ~(SYSMODE_PREFIX_REPE | SYSMODE_PREFIX_REPNE);
     } else {
-        switch (size) {
-          case 1:
+	switch (size) {
+	  case 1:
 			store_data_byte_abs(M.x86.R_ES, M.x86.R_DI,
 								(*sys_inb)(M.x86.R_DX));
-            break;
-          case 2:
+	    break;
+	  case 2:
 			store_data_word_abs(M.x86.R_ES, M.x86.R_DI,
 								(*sys_inw)(M.x86.R_DX));
-            break;
-          case 4:
+	    break;
+	  case 4:
 			store_data_long_abs(M.x86.R_ES, M.x86.R_DI,
 								(*sys_inl)(M.x86.R_DX));
-            break;
-        }
+	    break;
+	}
 		M.x86.R_DI += inc;
     }
 }
@@ -2529,57 +2529,57 @@
     int inc = size;
 
 	if (ACCESS_FLAG(F_DF)) {
-        inc = -size;
+	inc = -size;
     }
 	if (M.x86.mode & (SYSMODE_PREFIX_REPE | SYSMODE_PREFIX_REPNE)) {
-        /* dont care whether REPE or REPNE */
-        /* out until CX is ZERO. */
+	/* dont care whether REPE or REPNE */
+	/* out until CX is ZERO. */
 		u32 count = ((M.x86.mode & SYSMODE_PREFIX_DATA) ?
 					 M.x86.R_ECX : M.x86.R_CX);
-        switch (size) {
-          case 1:
-            while (count--) {
+	switch (size) {
+	  case 1:
+	    while (count--) {
 				(*sys_outb)(M.x86.R_DX,
 						 fetch_data_byte_abs(M.x86.R_ES, M.x86.R_SI));
 				M.x86.R_SI += inc;
-            }
-            break;
+	    }
+	    break;
 
-          case 2:
-            while (count--) {
+	  case 2:
+	    while (count--) {
 				(*sys_outw)(M.x86.R_DX,
 						 fetch_data_word_abs(M.x86.R_ES, M.x86.R_SI));
 				M.x86.R_SI += inc;
-            }
-            break;
-          case 4:
-            while (count--) {
+	    }
+	    break;
+	  case 4:
+	    while (count--) {
 				(*sys_outl)(M.x86.R_DX,
 						 fetch_data_long_abs(M.x86.R_ES, M.x86.R_SI));
 				M.x86.R_SI += inc;
-                break;
-            }
-        }
+		break;
+	    }
+	}
 		M.x86.R_CX = 0;
 		if (M.x86.mode & SYSMODE_PREFIX_DATA) {
 			M.x86.R_ECX = 0;
-        }
+	}
 		M.x86.mode &= ~(SYSMODE_PREFIX_REPE | SYSMODE_PREFIX_REPNE);
     } else {
-        switch (size) {
-          case 1:
+	switch (size) {
+	  case 1:
 			(*sys_outb)(M.x86.R_DX,
 					 fetch_data_byte_abs(M.x86.R_ES, M.x86.R_SI));
-            break;
-          case 2:
+	    break;
+	  case 2:
 			(*sys_outw)(M.x86.R_DX,
 					 fetch_data_word_abs(M.x86.R_ES, M.x86.R_SI));
-            break;
-          case 4:
+	    break;
+	  case 4:
 			(*sys_outl)(M.x86.R_DX,
 					 fetch_data_long_abs(M.x86.R_ES, M.x86.R_SI));
-            break;
-        }
+	    break;
+	}
 		M.x86.R_SI += inc;
     }
 }

diff --git a/board/MAI/bios_emulator/scitech/src/x86emu/sys.c b/board/MAI/bios_emulator/scitech/src/x86emu/sys.c
index d54ca79..afe58f8 100644
--- a/board/MAI/bios_emulator/scitech/src/x86emu/sys.c
+++ b/board/MAI/bios_emulator/scitech/src/x86emu/sys.c

@@ -129,7 +129,7 @@
 }
 
 /*
- * Elemental unaligned stores 
+ * Elemental unaligned stores
  */
 
 static __inline__ void stq_u(unsigned long r5, unsigned long * r11)
@@ -268,7 +268,7 @@
 Byte value read from emulator memory.
 
 REMARKS:
-Reads a byte value from the emulator memory. 
+Reads a byte value from the emulator memory.
 ****************************************************************************/
 u8 X86API rdb(
     u32 addr)
@@ -330,7 +330,7 @@
 RETURNS:
 Long value read from emulator memory.
 REMARKS:
-Reads a long value from the emulator memory. 
+Reads a long value from the emulator memory.
 ****************************************************************************/
 u32 X86API rdl(
 	u32 addr)
@@ -423,7 +423,7 @@
 val		- Value to store
 
 REMARKS:
-Writes a long value to emulator memory. 
+Writes a long value to emulator memory.
 ****************************************************************************/
 void X86API wrl(
 	u32 addr,
@@ -623,7 +623,7 @@
 	X86EMU_intrFuncs funcs[])
 {
     int i;
-    
+
 	for (i=0; i < 256; i++)
 		_X86EMU_intrTab[i] = NULL;
 	if (funcs) {

diff --git a/board/MAI/bios_emulator/scitech/src/x86emu/validate.c b/board/MAI/bios_emulator/scitech/src/x86emu/validate.c
index 239f6c1..c951301 100644
--- a/board/MAI/bios_emulator/scitech/src/x86emu/validate.c
+++ b/board/MAI/bios_emulator/scitech/src/x86emu/validate.c

@@ -63,63 +63,63 @@
 	int         f,failed = false;                                   \
     char        buf1[80],buf2[80];                                  \
     for (d = 0; d < dmax; d += dincr) {                             \
-        for (s = 0; s < smax; s += sincr) {                         \
-            M.x86.R_EFLG = inflags = flags = def_flags;             \
-            for (f = 0; f < 2; f++) {
+	for (s = 0; s < smax; s += sincr) {                         \
+	    M.x86.R_EFLG = inflags = flags = def_flags;             \
+	    for (f = 0; f < 2; f++) {
 
 #define VAL_TEST_BINARY(name)                                           \
-                r_asm = name##_asm(&flags,d,s);                         \
-                r = name(d,s);                                  \
-                if (r != r_asm || M.x86.R_EFLG != flags)                \
-                    failed = true;                                      \
-                if (failed || trace) {
+		r_asm = name##_asm(&flags,d,s);                         \
+		r = name(d,s);                                  \
+		if (r != r_asm || M.x86.R_EFLG != flags)                \
+		    failed = true;                                      \
+		if (failed || trace) {
 
 #define VAL_TEST_BINARY_VOID(name)                                      \
-                name##_asm(&flags,d,s);                                 \
-                name(d,s);                                      \
-                r = r_asm = 0;                                          \
-                if (M.x86.R_EFLG != flags)                              \
-                    failed = true;                                      \
-                if (failed || trace) {
+		name##_asm(&flags,d,s);                                 \
+		name(d,s);                                      \
+		r = r_asm = 0;                                          \
+		if (M.x86.R_EFLG != flags)                              \
+		    failed = true;                                      \
+		if (failed || trace) {
 
 #define VAL_FAIL_BYTE_BYTE_BINARY(name)                                                                 \
-                    if (failed)                                                                         \
-                        printk("fail\n");                                                               \
-                    printk("0x%02X = %-15s(0x%02X,0x%02X), flags = %s -> %s\n",                         \
-                        r, #name, d, s, print_flags(buf1,inflags), print_flags(buf2,M.x86.R_EFLG));     \
-                    printk("0x%02X = %-15s(0x%02X,0x%02X), flags = %s -> %s\n",                         \
-                        r_asm, #name"_asm", d, s, print_flags(buf1,inflags), print_flags(buf2,flags));
+		    if (failed)                                                                         \
+			printk("fail\n");                                                               \
+		    printk("0x%02X = %-15s(0x%02X,0x%02X), flags = %s -> %s\n",                         \
+			r, #name, d, s, print_flags(buf1,inflags), print_flags(buf2,M.x86.R_EFLG));     \
+		    printk("0x%02X = %-15s(0x%02X,0x%02X), flags = %s -> %s\n",                         \
+			r_asm, #name"_asm", d, s, print_flags(buf1,inflags), print_flags(buf2,flags));
 
 #define VAL_FAIL_WORD_WORD_BINARY(name)                                                                 \
-                    if (failed)                                                                         \
-                        printk("fail\n");                                                               \
-                    printk("0x%04X = %-15s(0x%04X,0x%04X), flags = %s -> %s\n",                         \
-                        r, #name, d, s, print_flags(buf1,inflags), print_flags(buf2,M.x86.R_EFLG));   \
-                    printk("0x%04X = %-15s(0x%04X,0x%04X), flags = %s -> %s\n",                         \
-                        r_asm, #name"_asm", d, s, print_flags(buf1,inflags), print_flags(buf2,flags));
+		    if (failed)                                                                         \
+			printk("fail\n");                                                               \
+		    printk("0x%04X = %-15s(0x%04X,0x%04X), flags = %s -> %s\n",                         \
+			r, #name, d, s, print_flags(buf1,inflags), print_flags(buf2,M.x86.R_EFLG));   \
+		    printk("0x%04X = %-15s(0x%04X,0x%04X), flags = %s -> %s\n",                         \
+			r_asm, #name"_asm", d, s, print_flags(buf1,inflags), print_flags(buf2,flags));
 
 #define VAL_FAIL_LONG_LONG_BINARY(name)                                                                 \
-                    if (failed)                                                                         \
-                        printk("fail\n");                                                               \
-                    printk("0x%08X = %-15s(0x%08X,0x%08X), flags = %s -> %s\n",                         \
-                        r, #name, d, s, print_flags(buf1,inflags), print_flags(buf2,M.x86.R_EFLG)); \
-                    printk("0x%08X = %-15s(0x%08X,0x%08X), flags = %s -> %s\n",                         \
-                        r_asm, #name"_asm", d, s, print_flags(buf1,inflags), print_flags(buf2,flags));
+		    if (failed)                                                                         \
+			printk("fail\n");                                                               \
+		    printk("0x%08X = %-15s(0x%08X,0x%08X), flags = %s -> %s\n",                         \
+			r, #name, d, s, print_flags(buf1,inflags), print_flags(buf2,M.x86.R_EFLG)); \
+		    printk("0x%08X = %-15s(0x%08X,0x%08X), flags = %s -> %s\n",                         \
+			r_asm, #name"_asm", d, s, print_flags(buf1,inflags), print_flags(buf2,flags));
 
 #define VAL_END_BINARY()                                                    \
-                    }                                                       \
-                M.x86.R_EFLG = inflags = flags = def_flags | (ALL_FLAGS & ~F_OF);   \
-                if (failed)                                                 \
-                    break;                                                  \
-                }                                                           \
-            if (failed)                                                     \
-                break;                                                      \
-            }                                                               \
-        if (failed)                                                         \
-            break;                                                          \
-        }                                                                   \
+		    }                                                       \
+		M.x86.R_EFLG = inflags = flags = def_flags | (ALL_FLAGS & ~F_OF);   \
+		if (failed)                                                 \
+		    break;                                                  \
+		}                                                           \
+	    if (failed)                                                     \
+		break;                                                      \
+	    }                                                               \
+	if (failed)                                                         \
+	    break;                                                          \
+	}                                                                   \
     if (!failed)                                                            \
-        printk("passed\n");                                                 \
+	printk("passed\n");                                                 \
 }
 
 #define VAL_BYTE_BYTE_BINARY(name)          \
@@ -194,51 +194,51 @@
     int         f,failed = false;                                   \
     char        buf1[80],buf2[80];                                  \
     for (d = 0; d < dmax; d += dincr) {                             \
-        for (s = 0; s < smax; s += sincr) {                         \
-            for (shift = 0; shift < maxshift; shift += 1) {        \
-                M.x86.R_EFLG = inflags = flags = def_flags;         \
-                for (f = 0; f < 2; f++) {
+	for (s = 0; s < smax; s += sincr) {                         \
+	    for (shift = 0; shift < maxshift; shift += 1) {        \
+		M.x86.R_EFLG = inflags = flags = def_flags;         \
+		for (f = 0; f < 2; f++) {
 
 #define VAL_TEST_TERNARY(name)                                          \
-                    r_asm = name##_asm(&flags,d,s,shift);               \
-                    r = name(d,s,shift);                           \
-                    if (r != r_asm || M.x86.R_EFLG != flags)            \
-                        failed = true;                                  \
-                    if (failed || trace) {
+		    r_asm = name##_asm(&flags,d,s,shift);               \
+		    r = name(d,s,shift);                           \
+		    if (r != r_asm || M.x86.R_EFLG != flags)            \
+			failed = true;                                  \
+		    if (failed || trace) {
 
 #define VAL_FAIL_WORD_WORD_TERNARY(name)                                                                \
-                        if (failed)                                                                         \
-                            printk("fail\n");                                                               \
-                        printk("0x%04X = %-15s(0x%04X,0x%04X,%d), flags = %s -> %s\n",                      \
-                            r, #name, d, s, shift, print_flags(buf1,inflags), print_flags(buf2,M.x86.R_EFLG));   \
-                        printk("0x%04X = %-15s(0x%04X,0x%04X,%d), flags = %s -> %s\n",                      \
-                            r_asm, #name"_asm", d, s, shift, print_flags(buf1,inflags), print_flags(buf2,flags));
+			if (failed)                                                                         \
+			    printk("fail\n");                                                               \
+			printk("0x%04X = %-15s(0x%04X,0x%04X,%d), flags = %s -> %s\n",                      \
+			    r, #name, d, s, shift, print_flags(buf1,inflags), print_flags(buf2,M.x86.R_EFLG));   \
+			printk("0x%04X = %-15s(0x%04X,0x%04X,%d), flags = %s -> %s\n",                      \
+			    r_asm, #name"_asm", d, s, shift, print_flags(buf1,inflags), print_flags(buf2,flags));
 
 #define VAL_FAIL_LONG_LONG_TERNARY(name)                                                                \
-                        if (failed)                                                                         \
-                            printk("fail\n");                                                               \
-                        printk("0x%08X = %-15s(0x%08X,0x%08X,%d), flags = %s -> %s\n",                      \
-                            r, #name, d, s, shift, print_flags(buf1,inflags), print_flags(buf2,M.x86.R_EFLG));  \
-                        printk("0x%08X = %-15s(0x%08X,0x%08X,%d), flags = %s -> %s\n",                      \
-                            r_asm, #name"_asm", d, s, shift, print_flags(buf1,inflags), print_flags(buf2,flags));
+			if (failed)                                                                         \
+			    printk("fail\n");                                                               \
+			printk("0x%08X = %-15s(0x%08X,0x%08X,%d), flags = %s -> %s\n",                      \
+			    r, #name, d, s, shift, print_flags(buf1,inflags), print_flags(buf2,M.x86.R_EFLG));  \
+			printk("0x%08X = %-15s(0x%08X,0x%08X,%d), flags = %s -> %s\n",                      \
+			    r_asm, #name"_asm", d, s, shift, print_flags(buf1,inflags), print_flags(buf2,flags));
 
 #define VAL_END_TERNARY()                                                   \
-                        }                                                       \
-                    M.x86.R_EFLG = inflags = flags = def_flags | (ALL_FLAGS & ~F_OF);   \
-                    if (failed)                                                 \
-                        break;                                                  \
-                    }                                                           \
-                if (failed)                                                     \
-                    break;                                                      \
-                }                                                               \
-            if (failed)                                                     \
-                break;                                                      \
-            }                                                               \
-        if (failed)                                                         \
-            break;                                                          \
-        }                                                                   \
+			}                                                       \
+		    M.x86.R_EFLG = inflags = flags = def_flags | (ALL_FLAGS & ~F_OF);   \
+		    if (failed)                                                 \
+			break;                                                  \
+		    }                                                           \
+		if (failed)                                                     \
+		    break;                                                      \
+		}                                                               \
+	    if (failed)                                                     \
+		break;                                                      \
+	    }                                                               \
+	if (failed)                                                         \
+	    break;                                                          \
+	}                                                                   \
     if (!failed)                                                            \
-        printk("passed\n");                                                 \
+	printk("passed\n");                                                 \
 }
 
 #define VAL_WORD_ROTATE_DBL(name)                           \
@@ -262,47 +262,47 @@
     int         f,failed = false;                           \
     char        buf1[80],buf2[80];                          \
     for (d = 0; d < max; d += incr) {                       \
-        M.x86.R_EFLG = inflags = flags = def_flags;         \
-        for (f = 0; f < 2; f++) {
+	M.x86.R_EFLG = inflags = flags = def_flags;         \
+	for (f = 0; f < 2; f++) {
 
 #define VAL_TEST_UNARY(name)                                \
-            r_asm = name##_asm(&flags,d);                   \
-            r = name(d);                                \
-            if (r != r_asm || M.x86.R_EFLG != flags) {      \
-                failed = true;
+	    r_asm = name##_asm(&flags,d);                   \
+	    r = name(d);                                \
+	    if (r != r_asm || M.x86.R_EFLG != flags) {      \
+		failed = true;
 
 #define VAL_FAIL_BYTE_UNARY(name)                                                               \
-                printk("fail\n");                                                               \
-                printk("0x%02X = %-15s(0x%02X), flags = %s -> %s\n",                            \
-                    r, #name, d, print_flags(buf1,inflags), print_flags(buf2,M.x86.R_EFLG));    \
-                printk("0x%02X = %-15s(0x%02X), flags = %s -> %s\n",                            \
-                    r_asm, #name"_asm", d, print_flags(buf1,inflags), print_flags(buf2,flags));
+		printk("fail\n");                                                               \
+		printk("0x%02X = %-15s(0x%02X), flags = %s -> %s\n",                            \
+		    r, #name, d, print_flags(buf1,inflags), print_flags(buf2,M.x86.R_EFLG));    \
+		printk("0x%02X = %-15s(0x%02X), flags = %s -> %s\n",                            \
+		    r_asm, #name"_asm", d, print_flags(buf1,inflags), print_flags(buf2,flags));
 
 #define VAL_FAIL_WORD_UNARY(name)                                                               \
-                printk("fail\n");                                                               \
-                printk("0x%04X = %-15s(0x%04X), flags = %s -> %s\n",                            \
-                    r, #name, d, print_flags(buf1,inflags), print_flags(buf2,M.x86.R_EFLG));  \
-                printk("0x%04X = %-15s(0x%04X), flags = %s -> %s\n",                            \
-                    r_asm, #name"_asm", d, print_flags(buf1,inflags), print_flags(buf2,flags));
+		printk("fail\n");                                                               \
+		printk("0x%04X = %-15s(0x%04X), flags = %s -> %s\n",                            \
+		    r, #name, d, print_flags(buf1,inflags), print_flags(buf2,M.x86.R_EFLG));  \
+		printk("0x%04X = %-15s(0x%04X), flags = %s -> %s\n",                            \
+		    r_asm, #name"_asm", d, print_flags(buf1,inflags), print_flags(buf2,flags));
 
 #define VAL_FAIL_LONG_UNARY(name)                                                               \
-                printk("fail\n");                                                               \
-                printk("0x%08X = %-15s(0x%08X), flags = %s -> %s\n",                            \
-                    r, #name, d, print_flags(buf1,inflags), print_flags(buf2,M.x86.R_EFLG));    \
-                printk("0x%08X = %-15s(0x%08X), flags = %s -> %s\n",                            \
-                    r_asm, #name"_asm", d, print_flags(buf1,inflags), print_flags(buf2,flags));
+		printk("fail\n");                                                               \
+		printk("0x%08X = %-15s(0x%08X), flags = %s -> %s\n",                            \
+		    r, #name, d, print_flags(buf1,inflags), print_flags(buf2,M.x86.R_EFLG));    \
+		printk("0x%08X = %-15s(0x%08X), flags = %s -> %s\n",                            \
+		    r_asm, #name"_asm", d, print_flags(buf1,inflags), print_flags(buf2,flags));
 
 #define VAL_END_UNARY()                                                 \
-                }                                                       \
-            M.x86.R_EFLG = inflags = flags = def_flags | ALL_FLAGS;     \
-            if (failed)                                                 \
-                break;                                                  \
-            }                                                           \
-        if (failed)                                                     \
-            break;                                                      \
-        }                                                               \
+		}                                                       \
+	    M.x86.R_EFLG = inflags = flags = def_flags | ALL_FLAGS;     \
+	    if (failed)                                                 \
+		break;                                                  \
+	    }                                                           \
+	if (failed)                                                     \
+	    break;                                                      \
+	}                                                               \
     if (!failed)                                                        \
-        printk("passed\n");                                             \
+	printk("passed\n");                                             \
 }
 
 #define VAL_BYTE_UNARY(name)                \
@@ -342,35 +342,35 @@
     int         f,failed = false;                                       \
     char        buf1[80],buf2[80];                                      \
     for (d = 0; d < 0xFF; d += 1) {                                     \
-        for (s = 0; s < 0xFF; s += 1) {                                 \
-            M.x86.R_EFLG = inflags = flags = def_flags;                 \
-            for (f = 0; f < 2; f++) {                                   \
-                name##_asm(&flags,&r_asm,d,s);                          \
-                M.x86.R_AL = d;                                         \
-                name(s);                                            \
-                r = M.x86.R_AX;                                         \
-                if (r != r_asm || M.x86.R_EFLG != flags)                \
-                    failed = true;                                      \
-                if (failed || trace) {                                  \
-                    if (failed)                                         \
-                        printk("fail\n");                               \
-                    printk("0x%04X = %-15s(0x%02X,0x%02X), flags = %s -> %s\n",                         \
-                        r, #name, d, s, print_flags(buf1,inflags), print_flags(buf2,M.x86.R_EFLG));     \
-                    printk("0x%04X = %-15s(0x%02X,0x%02X), flags = %s -> %s\n",                         \
-                        r_asm, #name"_asm", d, s, print_flags(buf1,inflags), print_flags(buf2,flags));  \
-                    }                                                       \
-                M.x86.R_EFLG = inflags = flags = def_flags | (ALL_FLAGS & ~F_OF);   \
-                if (failed)                                                 \
-                    break;                                                  \
-                }                                                           \
-            if (failed)                                                     \
-                break;                                                      \
-            }                                                               \
-        if (failed)                                                         \
-            break;                                                          \
-        }                                                                   \
+	for (s = 0; s < 0xFF; s += 1) {                                 \
+	    M.x86.R_EFLG = inflags = flags = def_flags;                 \
+	    for (f = 0; f < 2; f++) {                                   \
+		name##_asm(&flags,&r_asm,d,s);                          \
+		M.x86.R_AL = d;                                         \
+		name(s);                                            \
+		r = M.x86.R_AX;                                         \
+		if (r != r_asm || M.x86.R_EFLG != flags)                \
+		    failed = true;                                      \
+		if (failed || trace) {                                  \
+		    if (failed)                                         \
+			printk("fail\n");                               \
+		    printk("0x%04X = %-15s(0x%02X,0x%02X), flags = %s -> %s\n",                         \
+			r, #name, d, s, print_flags(buf1,inflags), print_flags(buf2,M.x86.R_EFLG));     \
+		    printk("0x%04X = %-15s(0x%02X,0x%02X), flags = %s -> %s\n",                         \
+			r_asm, #name"_asm", d, s, print_flags(buf1,inflags), print_flags(buf2,flags));  \
+		    }                                                       \
+		M.x86.R_EFLG = inflags = flags = def_flags | (ALL_FLAGS & ~F_OF);   \
+		if (failed)                                                 \
+		    break;                                                  \
+		}                                                           \
+	    if (failed)                                                     \
+		break;                                                      \
+	    }                                                               \
+	if (failed)                                                         \
+	    break;                                                          \
+	}                                                                   \
     if (!failed)                                                            \
-        printk("passed\n");                                                 \
+	printk("passed\n");                                                 \
 }
 
 #define VAL_WORD_MUL(name)                                              \
@@ -383,36 +383,36 @@
     int         f,failed = false;                                       \
     char        buf1[80],buf2[80];                                      \
     for (d = 0; d < 0xFF00; d += 0x100) {                               \
-        for (s = 0; s < 0xFF00; s += 0x100) {                           \
-            M.x86.R_EFLG = inflags = flags = def_flags;                 \
-            for (f = 0; f < 2; f++) {                                   \
-                name##_asm(&flags,&r_asm_lo,&r_asm_hi,d,s);             \
-                M.x86.R_AX = d;                                         \
-                name(s);                                            \
-                r_lo = M.x86.R_AX;                                      \
-                r_hi = M.x86.R_DX;                                      \
-                if (r_lo != r_asm_lo || r_hi != r_asm_hi || M.x86.R_EFLG != flags)\
-                    failed = true;                                      \
-                if (failed || trace) {                                  \
-                    if (failed)                                         \
-                        printk("fail\n");                               \
-                    printk("0x%04X:0x%04X = %-15s(0x%04X,0x%04X), flags = %s -> %s\n",                              \
-                        r_hi,r_lo, #name, d, s, print_flags(buf1,inflags), print_flags(buf2,M.x86.R_EFLG));       \
-                    printk("0x%04X:0x%04X = %-15s(0x%04X,0x%04X), flags = %s -> %s\n",                              \
-                        r_asm_hi,r_asm_lo, #name"_asm", d, s, print_flags(buf1,inflags), print_flags(buf2,flags));  \
-                    }                                                                                               \
-                M.x86.R_EFLG = inflags = flags = def_flags | (ALL_FLAGS & ~F_OF);   \
-                if (failed)                                                 \
-                    break;                                                  \
-                }                                                           \
-            if (failed)                                                     \
-                break;                                                      \
-            }                                                               \
-        if (failed)                                                         \
-            break;                                                          \
-        }                                                                   \
+	for (s = 0; s < 0xFF00; s += 0x100) {                           \
+	    M.x86.R_EFLG = inflags = flags = def_flags;                 \
+	    for (f = 0; f < 2; f++) {                                   \
+		name##_asm(&flags,&r_asm_lo,&r_asm_hi,d,s);             \
+		M.x86.R_AX = d;                                         \
+		name(s);                                            \
+		r_lo = M.x86.R_AX;                                      \
+		r_hi = M.x86.R_DX;                                      \
+		if (r_lo != r_asm_lo || r_hi != r_asm_hi || M.x86.R_EFLG != flags)\
+		    failed = true;                                      \
+		if (failed || trace) {                                  \
+		    if (failed)                                         \
+			printk("fail\n");                               \
+		    printk("0x%04X:0x%04X = %-15s(0x%04X,0x%04X), flags = %s -> %s\n",                              \
+			r_hi,r_lo, #name, d, s, print_flags(buf1,inflags), print_flags(buf2,M.x86.R_EFLG));       \
+		    printk("0x%04X:0x%04X = %-15s(0x%04X,0x%04X), flags = %s -> %s\n",                              \
+			r_asm_hi,r_asm_lo, #name"_asm", d, s, print_flags(buf1,inflags), print_flags(buf2,flags));  \
+		    }                                                                                               \
+		M.x86.R_EFLG = inflags = flags = def_flags | (ALL_FLAGS & ~F_OF);   \
+		if (failed)                                                 \
+		    break;                                                  \
+		}                                                           \
+	    if (failed)                                                     \
+		break;                                                      \
+	    }                                                               \
+	if (failed)                                                         \
+	    break;                                                          \
+	}                                                                   \
     if (!failed)                                                            \
-        printk("passed\n");                                                 \
+	printk("passed\n");                                                 \
 }
 
 #define VAL_LONG_MUL(name)                                              \
@@ -425,36 +425,36 @@
     int         f,failed = false;                                       \
     char        buf1[80],buf2[80];                                      \
     for (d = 0; d < 0xFF000000; d += 0x1000000) {                       \
-        for (s = 0; s < 0xFF000000; s += 0x1000000) {                   \
-            M.x86.R_EFLG = inflags = flags = def_flags;                 \
-            for (f = 0; f < 2; f++) {                                   \
-                name##_asm(&flags,&r_asm_lo,&r_asm_hi,d,s);             \
-                M.x86.R_EAX = d;                                        \
-                name(s);                                            \
-                r_lo = M.x86.R_EAX;                                     \
-                r_hi = M.x86.R_EDX;                                     \
-                if (r_lo != r_asm_lo || r_hi != r_asm_hi || M.x86.R_EFLG != flags)\
-                    failed = true;                                      \
-                if (failed || trace) {                                  \
-                    if (failed)                                         \
-                        printk("fail\n");                               \
-                    printk("0x%08X:0x%08X = %-15s(0x%08X,0x%08X), flags = %s -> %s\n",                              \
-                        r_hi,r_lo, #name, d, s, print_flags(buf1,inflags), print_flags(buf2,M.x86.R_EFLG));       \
-                    printk("0x%08X:0x%08X = %-15s(0x%08X,0x%08X), flags = %s -> %s\n",                              \
-                        r_asm_hi,r_asm_lo, #name"_asm", d, s, print_flags(buf1,inflags), print_flags(buf2,flags));  \
-                    }                                                                                               \
-                M.x86.R_EFLG = inflags = flags = def_flags | (ALL_FLAGS & ~F_OF);   \
-                if (failed)                                                 \
-                    break;                                                  \
-                }                                                           \
-            if (failed)                                                     \
-                break;                                                      \
-            }                                                               \
-        if (failed)                                                         \
-            break;                                                          \
-        }                                                                   \
+	for (s = 0; s < 0xFF000000; s += 0x1000000) {                   \
+	    M.x86.R_EFLG = inflags = flags = def_flags;                 \
+	    for (f = 0; f < 2; f++) {                                   \
+		name##_asm(&flags,&r_asm_lo,&r_asm_hi,d,s);             \
+		M.x86.R_EAX = d;                                        \
+		name(s);                                            \
+		r_lo = M.x86.R_EAX;                                     \
+		r_hi = M.x86.R_EDX;                                     \
+		if (r_lo != r_asm_lo || r_hi != r_asm_hi || M.x86.R_EFLG != flags)\
+		    failed = true;                                      \
+		if (failed || trace) {                                  \
+		    if (failed)                                         \
+			printk("fail\n");                               \
+		    printk("0x%08X:0x%08X = %-15s(0x%08X,0x%08X), flags = %s -> %s\n",                              \
+			r_hi,r_lo, #name, d, s, print_flags(buf1,inflags), print_flags(buf2,M.x86.R_EFLG));       \
+		    printk("0x%08X:0x%08X = %-15s(0x%08X,0x%08X), flags = %s -> %s\n",                              \
+			r_asm_hi,r_asm_lo, #name"_asm", d, s, print_flags(buf1,inflags), print_flags(buf2,flags));  \
+		    }                                                                                               \
+		M.x86.R_EFLG = inflags = flags = def_flags | (ALL_FLAGS & ~F_OF);   \
+		if (failed)                                                 \
+		    break;                                                  \
+		}                                                           \
+	    if (failed)                                                     \
+		break;                                                      \
+	    }                                                               \
+	if (failed)                                                         \
+	    break;                                                          \
+	}                                                                   \
     if (!failed)                                                            \
-        printk("passed\n");                                                 \
+	printk("passed\n");                                                 \
 }
 
 #define VAL_BYTE_DIV(name)                                              \
@@ -466,39 +466,39 @@
     int         f,failed = false;                                       \
     char        buf1[80],buf2[80];                                      \
     for (d = 0; d < 0xFF00; d += 0x100) {                               \
-        for (s = 1; s < 0xFF; s += 1) {                                 \
-            M.x86.R_EFLG = inflags = flags = def_flags;                 \
-            for (f = 0; f < 2; f++) {                                   \
-                M.x86.intr = 0;                                         \
-                M.x86.R_AX = d;                                         \
-                name(s);                                            \
-                r_quot = M.x86.R_AL;                                    \
-                r_rem = M.x86.R_AH;                                     \
-                if (M.x86.intr & INTR_SYNCH)                            \
-                    continue;                                           \
-                name##_asm(&flags,&r_asm_quot,&r_asm_rem,d,s);          \
-                if (r_quot != r_asm_quot || r_rem != r_asm_rem || M.x86.R_EFLG != flags) \
-                    failed = true;                                      \
-                if (failed || trace) {                                  \
-                    if (failed)                                         \
-                        printk("fail\n");                               \
-                    printk("0x%02X:0x%02X = %-15s(0x%04X,0x%02X), flags = %s -> %s\n",                      \
-                        r_quot, r_rem, #name, d, s, print_flags(buf1,inflags), print_flags(buf2,M.x86.R_EFLG));     \
-                    printk("0x%02X:0x%02X = %-15s(0x%04X,0x%02X), flags = %s -> %s\n",                      \
-                        r_asm_quot, r_asm_rem, #name"_asm", d, s, print_flags(buf1,inflags), print_flags(buf2,flags));  \
-                    }                                                       \
-                M.x86.R_EFLG = inflags = flags = def_flags | (ALL_FLAGS & ~F_OF);   \
-                if (failed)                                                 \
-                    break;                                                  \
-                }                                                           \
-            if (failed)                                                     \
-                break;                                                      \
-            }                                                               \
-        if (failed)                                                         \
-            break;                                                          \
-        }                                                                   \
+	for (s = 1; s < 0xFF; s += 1) {                                 \
+	    M.x86.R_EFLG = inflags = flags = def_flags;                 \
+	    for (f = 0; f < 2; f++) {                                   \
+		M.x86.intr = 0;                                         \
+		M.x86.R_AX = d;                                         \
+		name(s);                                            \
+		r_quot = M.x86.R_AL;                                    \
+		r_rem = M.x86.R_AH;                                     \
+		if (M.x86.intr & INTR_SYNCH)                            \
+		    continue;                                           \
+		name##_asm(&flags,&r_asm_quot,&r_asm_rem,d,s);          \
+		if (r_quot != r_asm_quot || r_rem != r_asm_rem || M.x86.R_EFLG != flags) \
+		    failed = true;                                      \
+		if (failed || trace) {                                  \
+		    if (failed)                                         \
+			printk("fail\n");                               \
+		    printk("0x%02X:0x%02X = %-15s(0x%04X,0x%02X), flags = %s -> %s\n",                      \
+			r_quot, r_rem, #name, d, s, print_flags(buf1,inflags), print_flags(buf2,M.x86.R_EFLG));     \
+		    printk("0x%02X:0x%02X = %-15s(0x%04X,0x%02X), flags = %s -> %s\n",                      \
+			r_asm_quot, r_asm_rem, #name"_asm", d, s, print_flags(buf1,inflags), print_flags(buf2,flags));  \
+		    }                                                       \
+		M.x86.R_EFLG = inflags = flags = def_flags | (ALL_FLAGS & ~F_OF);   \
+		if (failed)                                                 \
+		    break;                                                  \
+		}                                                           \
+	    if (failed)                                                     \
+		break;                                                      \
+	    }                                                               \
+	if (failed)                                                         \
+	    break;                                                          \
+	}                                                                   \
     if (!failed)                                                            \
-        printk("passed\n");                                                 \
+	printk("passed\n");                                                 \
 }
 
 #define VAL_WORD_DIV(name)                                              \
@@ -510,40 +510,40 @@
     int         f,failed = false;                                       \
     char        buf1[80],buf2[80];                                      \
     for (d = 0; d < 0xFF000000; d += 0x1000000) {                       \
-        for (s = 0x100; s < 0xFF00; s += 0x100) {                       \
-            M.x86.R_EFLG = inflags = flags = def_flags;                 \
-            for (f = 0; f < 2; f++) {                                   \
-                M.x86.intr = 0;                                         \
-                M.x86.R_AX = d & 0xFFFF;                                \
-                M.x86.R_DX = d >> 16;                                   \
-                name(s);                                            \
-                r_quot = M.x86.R_AX;                                    \
-                r_rem = M.x86.R_DX;                                     \
-                if (M.x86.intr & INTR_SYNCH)                            \
-                    continue;                                           \
-                name##_asm(&flags,&r_asm_quot,&r_asm_rem,d & 0xFFFF,d >> 16,s);\
-                if (r_quot != r_asm_quot || r_rem != r_asm_rem || M.x86.R_EFLG != flags) \
-                    failed = true;                                      \
-                if (failed || trace) {                                  \
-                    if (failed)                                         \
-                        printk("fail\n");                               \
-                    printk("0x%04X:0x%04X = %-15s(0x%08X,0x%04X), flags = %s -> %s\n",                      \
-                        r_quot, r_rem, #name, d, s, print_flags(buf1,inflags), print_flags(buf2,M.x86.R_EFLG));     \
-                    printk("0x%04X:0x%04X = %-15s(0x%08X,0x%04X), flags = %s -> %s\n",                      \
-                        r_asm_quot, r_asm_rem, #name"_asm", d, s, print_flags(buf1,inflags), print_flags(buf2,flags));  \
-                    }                                                       \
-                M.x86.R_EFLG = inflags = flags = def_flags | (ALL_FLAGS & ~F_OF);   \
-                if (failed)                                                 \
-                    break;                                                  \
-                }                                                           \
-            if (failed)                                                     \
-                break;                                                      \
-            }                                                               \
-        if (failed)                                                         \
-            break;                                                          \
-        }                                                                   \
+	for (s = 0x100; s < 0xFF00; s += 0x100) {                       \
+	    M.x86.R_EFLG = inflags = flags = def_flags;                 \
+	    for (f = 0; f < 2; f++) {                                   \
+		M.x86.intr = 0;                                         \
+		M.x86.R_AX = d & 0xFFFF;                                \
+		M.x86.R_DX = d >> 16;                                   \
+		name(s);                                            \
+		r_quot = M.x86.R_AX;                                    \
+		r_rem = M.x86.R_DX;                                     \
+		if (M.x86.intr & INTR_SYNCH)                            \
+		    continue;                                           \
+		name##_asm(&flags,&r_asm_quot,&r_asm_rem,d & 0xFFFF,d >> 16,s);\
+		if (r_quot != r_asm_quot || r_rem != r_asm_rem || M.x86.R_EFLG != flags) \
+		    failed = true;                                      \
+		if (failed || trace) {                                  \
+		    if (failed)                                         \
+			printk("fail\n");                               \
+		    printk("0x%04X:0x%04X = %-15s(0x%08X,0x%04X), flags = %s -> %s\n",                      \
+			r_quot, r_rem, #name, d, s, print_flags(buf1,inflags), print_flags(buf2,M.x86.R_EFLG));     \
+		    printk("0x%04X:0x%04X = %-15s(0x%08X,0x%04X), flags = %s -> %s\n",                      \
+			r_asm_quot, r_asm_rem, #name"_asm", d, s, print_flags(buf1,inflags), print_flags(buf2,flags));  \
+		    }                                                       \
+		M.x86.R_EFLG = inflags = flags = def_flags | (ALL_FLAGS & ~F_OF);   \
+		if (failed)                                                 \
+		    break;                                                  \
+		}                                                           \
+	    if (failed)                                                     \
+		break;                                                      \
+	    }                                                               \
+	if (failed)                                                         \
+	    break;                                                          \
+	}                                                                   \
     if (!failed)                                                            \
-        printk("passed\n");                                                 \
+	printk("passed\n");                                                 \
 }
 
 #define VAL_LONG_DIV(name)                                              \
@@ -555,40 +555,40 @@
     int         f,failed = false;                                       \
     char        buf1[80],buf2[80];                                      \
     for (d = 0; d < 0xFF000000; d += 0x1000000) {                       \
-        for (s = 0x100; s < 0xFF00; s += 0x100) {                       \
-            M.x86.R_EFLG = inflags = flags = def_flags;                 \
-            for (f = 0; f < 2; f++) {                                   \
-                M.x86.intr = 0;                                         \
-                M.x86.R_EAX = d;                                        \
-                M.x86.R_EDX = 0;                                        \
-                name(s);                                            \
-                r_quot = M.x86.R_EAX;                                   \
-                r_rem = M.x86.R_EDX;                                    \
-                if (M.x86.intr & INTR_SYNCH)                            \
-                    continue;                                           \
-                name##_asm(&flags,&r_asm_quot,&r_asm_rem,d,0,s);        \
-                if (r_quot != r_asm_quot || r_rem != r_asm_rem || M.x86.R_EFLG != flags) \
-                    failed = true;                                      \
-                if (failed || trace) {                                  \
-                    if (failed)                                         \
-                        printk("fail\n");                               \
-                    printk("0x%08X:0x%08X = %-15s(0x%08X:0x%08X,0x%08X), flags = %s -> %s\n",                       \
-                        r_quot, r_rem, #name, 0, d, s, print_flags(buf1,inflags), print_flags(buf2,M.x86.R_EFLG));  \
-                    printk("0x%08X:0x%08X = %-15s(0x%08X:0x%08X,0x%08X), flags = %s -> %s\n",                       \
-                        r_asm_quot, r_asm_rem, #name"_asm", 0, d, s, print_flags(buf1,inflags), print_flags(buf2,flags));   \
-                    }                                                       \
-                M.x86.R_EFLG = inflags = flags = def_flags | (ALL_FLAGS & ~F_OF);   \
-                if (failed)                                                 \
-                    break;                                                  \
-                }                                                           \
-            if (failed)                                                     \
-                break;                                                      \
-            }                                                               \
-        if (failed)                                                         \
-            break;                                                          \
-        }                                                                   \
+	for (s = 0x100; s < 0xFF00; s += 0x100) {                       \
+	    M.x86.R_EFLG = inflags = flags = def_flags;                 \
+	    for (f = 0; f < 2; f++) {                                   \
+		M.x86.intr = 0;                                         \
+		M.x86.R_EAX = d;                                        \
+		M.x86.R_EDX = 0;                                        \
+		name(s);                                            \
+		r_quot = M.x86.R_EAX;                                   \
+		r_rem = M.x86.R_EDX;                                    \
+		if (M.x86.intr & INTR_SYNCH)                            \
+		    continue;                                           \
+		name##_asm(&flags,&r_asm_quot,&r_asm_rem,d,0,s);        \
+		if (r_quot != r_asm_quot || r_rem != r_asm_rem || M.x86.R_EFLG != flags) \
+		    failed = true;                                      \
+		if (failed || trace) {                                  \
+		    if (failed)                                         \
+			printk("fail\n");                               \
+		    printk("0x%08X:0x%08X = %-15s(0x%08X:0x%08X,0x%08X), flags = %s -> %s\n",                       \
+			r_quot, r_rem, #name, 0, d, s, print_flags(buf1,inflags), print_flags(buf2,M.x86.R_EFLG));  \
+		    printk("0x%08X:0x%08X = %-15s(0x%08X:0x%08X,0x%08X), flags = %s -> %s\n",                       \
+			r_asm_quot, r_asm_rem, #name"_asm", 0, d, s, print_flags(buf1,inflags), print_flags(buf2,flags));   \
+		    }                                                       \
+		M.x86.R_EFLG = inflags = flags = def_flags | (ALL_FLAGS & ~F_OF);   \
+		if (failed)                                                 \
+		    break;                                                  \
+		}                                                           \
+	    if (failed)                                                     \
+		break;                                                      \
+	    }                                                               \
+	if (failed)                                                         \
+	    break;                                                          \
+	}                                                                   \
     if (!failed)                                                            \
-        printk("passed\n");                                                 \
+	printk("passed\n");                                                 \
 }
 
 void printk(const char *fmt, ...)
@@ -606,37 +606,37 @@
 
     buf[0] = 0;
     if (flags & F_CF) {
-        strcat(buf,separator);
-        strcat(buf,"CF");
-        separator = ",";
-        }
+	strcat(buf,separator);
+	strcat(buf,"CF");
+	separator = ",";
+	}
     if (flags & F_PF) {
-        strcat(buf,separator);
-        strcat(buf,"PF");
-        separator = ",";
-        }
+	strcat(buf,separator);
+	strcat(buf,"PF");
+	separator = ",";
+	}
     if (flags & F_AF) {
-        strcat(buf,separator);
-        strcat(buf,"AF");
-        separator = ",";
-        }
+	strcat(buf,separator);
+	strcat(buf,"AF");
+	separator = ",";
+	}
     if (flags & F_ZF) {
-        strcat(buf,separator);
-        strcat(buf,"ZF");
-        separator = ",";
-        }
+	strcat(buf,separator);
+	strcat(buf,"ZF");
+	separator = ",";
+	}
     if (flags & F_SF) {
-        strcat(buf,separator);
-        strcat(buf,"SF");
-        separator = ",";
-        }
+	strcat(buf,separator);
+	strcat(buf,"SF");
+	separator = ",";
+	}
     if (flags & F_OF) {
-        strcat(buf,separator);
-        strcat(buf,"OF");
-        separator = ",";
-        }
+	strcat(buf,separator);
+	strcat(buf,"OF");
+	separator = ",";
+	}
     if (separator[0] == 0)
-        strcpy(buf,"None");
+	strcpy(buf,"None");
     return buf;
 }
 
@@ -646,7 +646,7 @@
     int trace = false;
 
     if (argc > 1)
-        trace = true;
+	trace = true;
     memset(&M, 0, sizeof(M));
     def_flags = get_flags_asm() & ~ALL_FLAGS;
 
@@ -673,7 +673,7 @@
     VAL_LONG_LONG_BINARY(cmp_long);
 
     VAL_BYTE_UNARY(daa_byte);
-    VAL_BYTE_UNARY(das_byte);   // Fails for 0x9A (out of range anyway)
+    VAL_BYTE_UNARY(das_byte);   /* Fails for 0x9A (out of range anyway) */
 
     VAL_BYTE_UNARY(dec_byte);
     VAL_WORD_UNARY(dec_word);

diff --git a/board/MAI/bios_emulator/scitech/src/x86emu/x86emu/debug.h b/board/MAI/bios_emulator/scitech/src/x86emu/x86emu/debug.h
index b4a3ed5..9a4a096 100644
--- a/board/MAI/bios_emulator/scitech/src/x86emu/x86emu/debug.h
+++ b/board/MAI/bios_emulator/scitech/src/x86emu/x86emu/debug.h

@@ -118,7 +118,7 @@
 
 #define SAVE_IP_CS(x,y)                               			\
 	if (DEBUG_DECODE() | DEBUG_TRACECALL() | DEBUG_BREAK() \
-              | DEBUG_IO_TRACE() | DEBUG_SAVE_IP_CS()) { \
+	      | DEBUG_IO_TRACE() | DEBUG_SAVE_IP_CS()) { \
 		M.x86.saved_cs = x;                          			\
 		M.x86.saved_ip = y;                          			\
 	}

diff --git a/board/MAI/bios_emulator/x86interface.c b/board/MAI/bios_emulator/x86interface.c
index e90ec5a..909cb3c 100644
--- a/board/MAI/bios_emulator/x86interface.c
+++ b/board/MAI/bios_emulator/x86interface.c

@@ -5,7 +5,7 @@
 /*
  * This isn't nice, but there are a lot of incompatibilities in the U-Boot and scitech include
  * files that this is the only really workable solution.
- * Might be cleaned out later. 
+ * Might be cleaned out later.
  */
 
 #ifdef DEBUG
@@ -45,7 +45,7 @@
 #define EMULATOR_BIOS_OFFSET    0xC0000
 #define EMULATOR_STRAP_OFFSET   0x30000
 #define EMULATOR_STACK_OFFSET   0x20000
-#define EMULATOR_LOGO_OFFSET    0x40000 // If you change this, change the strap code, too
+#define EMULATOR_LOGO_OFFSET    0x40000 /* If you change this, change the strap code, too */
 #define VIDEO_BASE (void *)0xFD0B8000
 
 extern char *getenv(char *);
@@ -72,7 +72,7 @@
     char c = 0;
 
     buffer[0] = 0;
-    if (getenv("x86_runthru")) return; //FIXME:
+    if (getenv("x86_runthru")) return; /*FIXME: */
     while (c != 0x0D && c != 0x0A)
     {
 	while (!tstc());
@@ -167,7 +167,7 @@
 
 int dolog(int port)
 {
-    if (log_init && log_do) 
+    if (log_init && log_do)
     {
 	if (log_low && port > 0x400) return 0;
 	return 1;
@@ -178,7 +178,7 @@
 	log_init = 1;
 	log_do = (getenv("x86_logio") != (char *)0);
 	log_low = (getenv("x86_loglow") != (char *)0);
-	if (log_do) 
+	if (log_do)
 	{
 	    if (log_low && port > 0x400) return 0;
 	    return 1;
@@ -187,12 +187,12 @@
     return 0;
 }
 
-// Converts an emulator address to a physical address.
-// Handles all special cases (bios date, model etc), and might need work
+/* Converts an emulator address to a physical address. */
+/* Handles all special cases (bios date, model etc), and might need work */
 u32 memaddr(u32 addr)
 {
-//    if (addr >= 0xF0000 && addr < 0xFFFFF) printf("WARNING: Segment F access (0x%x)\n", addr);
-//    printf("MemAddr=%p\n", addr);
+/*    if (addr >= 0xF0000 && addr < 0xFFFFF) printf("WARNING: Segment F access (0x%x)\n", addr); */
+/*    printf("MemAddr=%p\n", addr); */
     if (addr >= 0xA0000 && addr < 0xC0000)
 	return 0xFD000000 + addr;
     else if (addr >= 0xFFFF5 && addr < 0xFFFFE)
@@ -205,7 +205,7 @@
 	return (u32)&submodel;
     else if (addr >= 0x80000000)
     {
-	//printf("Warning: High memory access at 0x%x\n", addr);
+	/*printf("Warning: High memory access at 0x%x\n", addr); */
 	return addr;
     }
     else
@@ -251,7 +251,7 @@
     write_long_little((ULONG *)memaddr(addr), val);
 }
 
-X86EMU_memFuncs _A1_mem = 
+X86EMU_memFuncs _A1_mem =
 {
     A1_rdb,
     A1_rdw,
@@ -282,7 +282,7 @@
 u8 A1_inb(int port)
 {
     u8 a;
-    //if (port == 0x3BA) return 0;
+    /*if (port == 0x3BA) return 0; */
     a = in_byte(port);
     LOGIO(port, "inb: %Xh -> %d (%Xh)\n", port, a, a);
     return a;
@@ -324,7 +324,7 @@
     out_long(port, val);
 }
 
-X86EMU_pioFuncs _A1_pio = 
+X86EMU_pioFuncs _A1_pio =
 {
     A1_inb,
     A1_inw,
@@ -353,7 +353,7 @@
 	x86emu_optab[i] -= delta;
 	x86emu_optab2[i] -= delta;
     }
-    
+
     _A1_mem.rdb = A1_rdb;
     _A1_mem.rdw = A1_rdw;
     _A1_mem.rdl = A1_rdl;
@@ -367,7 +367,7 @@
     _A1_pio.outb = A1_outb;
     _A1_pio.outw = A1_outw;
     _A1_pio.outl = A1_outl;
-    
+
     tables_relocate(delta);
 
 }
@@ -379,9 +379,9 @@
 
 
 unsigned char more_strap[] = {
-        0xb4, 0x0, 0xb0, 0x2, 0xcd, 0x10,
+	0xb4, 0x0, 0xb0, 0x2, 0xcd, 0x10,
 };
-#define MORE_STRAP_BYTES 6 // Additional bytes of strap code
+#define MORE_STRAP_BYTES 6 /* Additional bytes of strap code */
 
 
 unsigned char *done_msg="VGA Initialized\0";
@@ -415,12 +415,12 @@
     PRINTF("Attempting to run emulator on %02x:%02x:%02x\n",
 	   PCI_BUS(gr_dev), PCI_DEV(gr_dev), PCI_FUNC(gr_dev));
 
-    // Enable compatibility hole for emulator access to frame buffer
+    /* Enable compatibility hole for emulator access to frame buffer */
     PRINTF("Enabling compatibility hole\n");
     enable_compatibility_hole();
 
-    // Allocate memory
-    // FIXME: We shouldn't use this much memory really.
+    /* Allocate memory */
+    /* FIXME: We shouldn't use this much memory really. */
     memset(&M, 0, sizeof(X86EMU_sysEnv));
     M.mem_base = malloc(EMULATOR_MEM_SIZE);
     M.mem_size = EMULATOR_MEM_SIZE;
@@ -470,10 +470,10 @@
     {
 	easteregg_active = 1;
     }
-    
+
     if (easteregg_active)
     {
-	// Yay!
+	/* Yay! */
 	setenv("x86_mode", "1");
 	setenv("vga_fg_color", "11");
 	setenv("vga_bg_color", "1");
@@ -493,9 +493,9 @@
 	}
     }
 
-    /* 
+    /*
      * Poke the strap routine. This might need a bit of extending
-     * if there is a mode switch involved, i.e. we want to int10 
+     * if there is a mode switch involved, i.e. we want to int10
      * afterwards to set a different graphics mode, or alternatively
      * there might be a different start address requirement if the
      * ROM doesn't have an x86 image in its first image.
@@ -503,19 +503,19 @@
 
     PRINTF("Poking strap...\n");
 
-    // FAR CALL c000:0003
+    /* FAR CALL c000:0003 */
     *strap++ = 0x9A; *strap++ = 0x03; *strap++ = 0x00;
-    *strap++ = 0x00; *strap++ = 0xC0; 
+    *strap++ = 0x00; *strap++ = 0xC0;
 
 #if 1
-    // insert additional strap code
+    /* insert additional strap code */
     for (i=0; i < MORE_STRAP_BYTES; i++)
     {
 	*strap++ = more_strap[i];
     }
 #endif
-    // HALT
-    *strap++ = 0xF4; 
+    /* HALT */
+    *strap++ = 0xF4;
 
     PRINTF("Setting up logo data\n");
     logo = (unsigned char *)M.mem_base + EMULATOR_LOGO_OFFSET;
@@ -530,28 +530,28 @@
      * must contain the devfn, encoded as (dev<<3)|fn
      */
 
-    // Execution starts here
-    M.x86.R_CS = SEG(EMULATOR_STRAP_OFFSET); 
-    M.x86.R_IP = OFF(EMULATOR_STRAP_OFFSET); 
+    /* Execution starts here */
+    M.x86.R_CS = SEG(EMULATOR_STRAP_OFFSET);
+    M.x86.R_IP = OFF(EMULATOR_STRAP_OFFSET);
 
-    // Stack at top of ram
+    /* Stack at top of ram */
     M.x86.R_SS = SEG(EMULATOR_STACK_OFFSET);
     M.x86.R_SP = OFF(EMULATOR_STACK_OFFSET);
 
-    // Input parameters
+    /* Input parameters */
     M.x86.R_AH = PCI_BUS(gr_dev);
     M.x86.R_AL = (PCI_DEV(gr_dev)<<3) | PCI_FUNC(gr_dev);
 
-    // Set the I/O and memory access functions
+    /* Set the I/O and memory access functions */
     X86EMU_setupMemFuncs(&_A1_mem);
     X86EMU_setupPioFuncs(&_A1_pio);
 
-    // Enable timer 2
-    cfg = in_byte(0x61); // Get Misc control
-    cfg |= 0x01;         // Enable timer 2
-    out_byte(0x61, cfg); // output again
+    /* Enable timer 2 */
+    cfg = in_byte(0x61); /* Get Misc control */
+    cfg |= 0x01;         /* Enable timer 2 */
+    out_byte(0x61, cfg); /* output again */
 
-    // Set up the timers
+    /* Set up the timers */
     out_byte(0x43, 0x54);
     out_byte(0x41, 0x18);
 
@@ -563,10 +563,10 @@
     out_byte(0x42, 0x31);
     out_byte(0x42, 0x13);
 
-    // Init the "BIOS".
+    /* Init the "BIOS". */
     bios_init();
 
-    // Video Card Reset
+    /* Video Card Reset */
     out_byte(0x3D8, 0);
     out_byte(0x3B8, 1);
     (void)in_byte(0x3BA);
@@ -583,7 +583,7 @@
     }
 #endif
 
-    // Ready set go...
+    /* Ready set go... */
     PRINTF("Running emulator\n");
     X86EMU_exec();
     PRINTF("Done running emulator\n");
@@ -593,8 +593,8 @@
     if (pal_reset && strcmp(pal_reset, "on") == 0)
     {
 	PRINTF("Palette reset\n");
-	//(void)in_byte(0x3da);
-	//out_byte(0x3c0, 0);
+	/*(void)in_byte(0x3da); */
+	/*out_byte(0x3c0, 0); */
 
 	out_byte(0x3C8, 0);
 	out_byte(0x3C9, 0);
@@ -645,15 +645,15 @@
     if (getenv("x86_do_inout")) do_inout();
 #endif
 
-//FIXME:    dcache_disable();
+/*FIXME:    dcache_disable(); */
     return 1;
 }
 
-// Clean up the x86 mess
+/* Clean up the x86 mess */
 void shutdown_bios(void)
 {
-//    disable_compatibility_hole();
-    // Free the memory associated
+/*    disable_compatibility_hole(); */
+    /* Free the memory associated */
     free(M.mem_base);
 
 }
@@ -663,7 +663,7 @@
     int base = 0;
     int res  = 0;
 
-    if (*buffer == '$') 
+    if (*buffer == '$')
     {
 	base = 16;
 	buffer++;
@@ -687,27 +687,27 @@
 	case 'b':
 	    res *= base;
 	    res += 11;
-	    break;	    
+	    break;
 	case 'C':
 	case 'c':
 	    res *= base;
 	    res += 12;
-	    break;	    
+	    break;
 	case 'D':
 	case 'd':
 	    res *= base;
 	    res += 13;
-	    break;	    
+	    break;
 	case 'E':
 	case 'e':
 	    res *= base;
 	    res += 14;
-	    break;	    
+	    break;
 	case 'F':
 	case 'f':
 	    res *= base;
 	    res += 15;
-	    break;	
+	    break;
 	default:
 	    return res;
 	}

diff --git a/board/MAI/menu/cmd_menu.c b/board/MAI/menu/cmd_menu.c
index 1788173..4c17c6a 100644
--- a/board/MAI/menu/cmd_menu.c
+++ b/board/MAI/menu/cmd_menu.c

@@ -1,9 +1,16 @@
 #include <common.h>
 #include <command.h>
-#include <cmd_menu.h>
 
 int do_menu( cmd_tbl_t *cmdtp, /*bd_t *bd,*/ int flag, int argc, char *argv[] )
 {
-//    printf("<NOT YET IMPLEMENTED>\n");
-    return 0;
+/*	printf("<NOT YET IMPLEMENTED>\n"); */
+	return 0;
 }
+
+#if defined(CONFIG_AMIGAONEG3SE) && (CONFIG_COMMANDS & CFG_CMD_BSP)
+cmd_tbl_t U_BOOT_CMD(MENU) = MK_CMD_ENTRY(
+	"menu",   1,      1,      do_menu,
+	"menu    - display BIOS setup menu\n",
+	""
+);
+#endif

diff --git a/board/MAI/menu/menu.c b/board/MAI/menu/menu.c
index 3130142..c0c63a8 100644
--- a/board/MAI/menu/menu.c
+++ b/board/MAI/menu/menu.c

@@ -41,9 +41,9 @@
 
     s = getenv("menu_disabled");
     if (s) disabled_attr = atoi(s);
-    
+
     for (i=0; i<MAX_MENU_OPTIONS; i++) odata[i].used = 0;
-    
+
     root_menu = root;
 }
 

diff --git a/board/MAI/menu/menu.h b/board/MAI/menu/menu.h
index e5886b8..8aebb7d 100644
--- a/board/MAI/menu/menu.h
+++ b/board/MAI/menu/menu.h

@@ -48,7 +48,7 @@
  * Text:
  *   A single line/limited number of characters text entry box. Text can be restricted
  *   to a certain charset (digits/hex digits/all/custom). Result is also available as an
- *   int if numeric. 
+ *   int if numeric.
  *
  * Selection:
  *   One-of-many type of selection entry. User may choose on of a set of strings, which
@@ -122,7 +122,7 @@
 
     int num_options;             /* Number of mappings */
     menu_select_option_t **options;
-                                 /* Option list array */
+				 /* Option list array */
 } menu_select_t;
 
 
@@ -133,10 +133,10 @@
 {
     OPTION_PREAMBLE
     menu_routine_callback callback;
-                                 /* routine to be called */ 
+				 /* routine to be called */
     void *user_data;             /* User data, don't care for system */
 } menu_routine_t;
-    
+
 
 #define MENU_CUSTOM_TYPE 5
 typedef void (*menu_custom_draw)(struct menu_custom_s *);

diff --git a/board/RPXClassic/Makefile b/board/RPXClassic/Makefile
index 857e9a8..93907ba 100644
--- a/board/RPXClassic/Makefile
+++ b/board/RPXClassic/Makefile

@@ -28,7 +28,7 @@
 OBJS	= $(BOARD).o flash.o eccx.o
 
 $(LIB):	.depend $(OBJS)
-	$(AR) crv $@ $^
+	$(AR) crv $@ $(OBJS)
 
 #########################################################################
 

diff --git a/board/RPXClassic/RPXClassic.c b/board/RPXClassic/RPXClassic.c
index aed9479..5689334 100644
--- a/board/RPXClassic/RPXClassic.c
+++ b/board/RPXClassic/RPXClassic.c

@@ -258,7 +258,7 @@
 	return (maxsize);
 }
 /*-----------------------------------------------------------------------------
- * aschex_to_byte -- 
+ * aschex_to_byte --
  *-----------------------------------------------------------------------------
  */
 static unsigned char aschex_to_byte (unsigned char *cp)

diff --git a/board/RPXClassic/eccx.c b/board/RPXClassic/eccx.c
index d5edc2b..cc76bbd 100644
--- a/board/RPXClassic/eccx.c
+++ b/board/RPXClassic/eccx.c

@@ -31,7 +31,6 @@
 #include <sed13806.h>
 
 
-
 /* Screen configurations: the initialization of the SD13806 depends on
    screen and on display mode. We handle only 8bpp and 16 bpp modes          */
 
@@ -41,232 +40,232 @@
 #define DISPLAY_HEIGHT  480
 
 #ifdef CONFIG_VIDEO_SED13806_8BPP
-static const S1D_REGS init_regs [] = 
+static const S1D_REGS init_regs [] =
 {
-    {0x0001,0x00},   // Miscellaneous Register
-    {0x01FC,0x00},   // Display Mode Register
-    {0x0004,0x1b},   // General IO Pins Configuration Register 0
-    {0x0005,0x00},   // General IO Pins Configuration Register 1
-    {0x0008,0xe5},   // General IO Pins Control Register 0
-    {0x0009,0x1f},   // General IO Pins Control Register 1
-    {0x0010,0x02},   // Memory Clock Configuration Register
-    {0x0014,0x10},   // LCD Pixel Clock Configuration Register
-    {0x0018,0x02},   // CRT/TV Pixel Clock Configuration Register
-    {0x001C,0x02},   // MediaPlug Clock Configuration Register
-    {0x001E,0x01},   // CPU To Memory Wait State Select Register
-    {0x0021,0x04},   // DRAM Refresh Rate Register
-    {0x002A,0x00},   // DRAM Timings Control Register 0
-    {0x002B,0x01},   // DRAM Timings Control Register 1
-    {0x0020,0x80},   // Memory Configuration Register
-    {0x0030,0x25},   // Panel Type Register
-    {0x0031,0x00},   // MOD Rate Register
-    {0x0032,0x4F},   // LCD Horizontal Display Width Register
-    {0x0034,0x13},   // LCD Horizontal Non-Display Period Register
-    {0x0035,0x01},   // TFT FPLINE Start Position Register
-    {0x0036,0x0B},   // TFT FPLINE Pulse Width Register
-    {0x0038,0xDF},   // LCD Vertical Display Height Register 0
-    {0x0039,0x01},   // LCD Vertical Display Height Register 1
-    {0x003A,0x2C},   // LCD Vertical Non-Display Period Register
-    {0x003B,0x00},   // TFT FPFRAME Start Position Register
-    {0x003C,0x01},   // TFT FPFRAME Pulse Width Register
-    {0x0040,0x03},   // LCD Display Mode Register
-    {0x0041,0x02},   // LCD Miscellaneous Register
-    {0x0042,0x00},   // LCD Display Start Address Register 0
-    {0x0043,0x00},   // LCD Display Start Address Register 1
-    {0x0044,0x00},   // LCD Display Start Address Register 2
-    {0x0046,0x40},   // LCD Memory Address Offset Register 0
-    {0x0047,0x01},   // LCD Memory Address Offset Register 1
-    {0x0048,0x00},   // LCD Pixel Panning Register
-    {0x004A,0x00},   // LCD Display FIFO High Threshold Control Register
-    {0x004B,0x00},   // LCD Display FIFO Low Threshold Control Register
-    {0x0050,0x4F},   // CRT/TV Horizontal Display Width Register
-    {0x0052,0x13},   // CRT/TV Horizontal Non-Display Period Register
-    {0x0053,0x01},   // CRT/TV HRTC Start Position Register
-    {0x0054,0x0B},   // CRT/TV HRTC Pulse Width Register
-    {0x0056,0xDF},   // CRT/TV Vertical Display Height Register 0
-    {0x0057,0x01},   // CRT/TV Vertical Display Height Register 1
-    {0x0058,0x2B},   // CRT/TV Vertical Non-Display Period Register
-    {0x0059,0x09},   // CRT/TV VRTC Start Position Register
-    {0x005A,0x01},   // CRT/TV VRTC Pulse Width Register
-    {0x005B,0x00},   // TV Output Control Register
-    {0x0060,0x03},   // CRT/TV Display Mode Register
-    {0x0062,0x00},   // CRT/TV Display Start Address Register 0
-    {0x0063,0x00},   // CRT/TV Display Start Address Register 1
-    {0x0064,0x00},   // CRT/TV Display Start Address Register 2
-    {0x0066,0x40},   // CRT/TV Memory Address Offset Register 0
-    {0x0067,0x01},   // CRT/TV Memory Address Offset Register 1
-    {0x0068,0x00},   // CRT/TV Pixel Panning Register
-    {0x006A,0x00},   // CRT/TV Display FIFO High Threshold Control Register
-    {0x006B,0x00},   // CRT/TV Display FIFO Low Threshold Control Register
-    {0x0070,0x00},   // LCD Ink/Cursor Control Register
-    {0x0071,0x00},   // LCD Ink/Cursor Start Address Register
-    {0x0072,0x00},   // LCD Cursor X Position Register 0
-    {0x0073,0x00},   // LCD Cursor X Position Register 1
-    {0x0074,0x00},   // LCD Cursor Y Position Register 0
-    {0x0075,0x00},   // LCD Cursor Y Position Register 1
-    {0x0076,0x00},   // LCD Ink/Cursor Blue Color 0 Register
-    {0x0077,0x00},   // LCD Ink/Cursor Green Color 0 Register
-    {0x0078,0x00},   // LCD Ink/Cursor Red Color 0 Register
-    {0x007A,0x1F},   // LCD Ink/Cursor Blue Color 1 Register
-    {0x007B,0x3F},   // LCD Ink/Cursor Green Color 1 Register
-    {0x007C,0x1F},   // LCD Ink/Cursor Red Color 1 Register
-    {0x007E,0x00},   // LCD Ink/Cursor FIFO Threshold Register
-    {0x0080,0x00},   // CRT/TV Ink/Cursor Control Register
-    {0x0081,0x00},   // CRT/TV Ink/Cursor Start Address Register
-    {0x0082,0x00},   // CRT/TV Cursor X Position Register 0
-    {0x0083,0x00},   // CRT/TV Cursor X Position Register 1
-    {0x0084,0x00},   // CRT/TV Cursor Y Position Register 0
-    {0x0085,0x00},   // CRT/TV Cursor Y Position Register 1
-    {0x0086,0x00},   // CRT/TV Ink/Cursor Blue Color 0 Register
-    {0x0087,0x00},   // CRT/TV Ink/Cursor Green Color 0 Register
-    {0x0088,0x00},   // CRT/TV Ink/Cursor Red Color 0 Register
-    {0x008A,0x1F},   // CRT/TV Ink/Cursor Blue Color 1 Register
-    {0x008B,0x3F},   // CRT/TV Ink/Cursor Green Color 1 Register
-    {0x008C,0x1F},   // CRT/TV Ink/Cursor Red Color 1 Register
-    {0x008E,0x00},   // CRT/TV Ink/Cursor FIFO Threshold Register
-    {0x0100,0x00},   // BitBlt Control Register 0
-    {0x0101,0x00},   // BitBlt Control Register 1
-    {0x0102,0x00},   // BitBlt ROP Code/Color Expansion Register
-    {0x0103,0x00},   // BitBlt Operation Register
-    {0x0104,0x00},   // BitBlt Source Start Address Register 0
-    {0x0105,0x00},   // BitBlt Source Start Address Register 1
-    {0x0106,0x00},   // BitBlt Source Start Address Register 2
-    {0x0108,0x00},   // BitBlt Destination Start Address Register 0
-    {0x0109,0x00},   // BitBlt Destination Start Address Register 1
-    {0x010A,0x00},   // BitBlt Destination Start Address Register 2
-    {0x010C,0x00},   // BitBlt Memory Address Offset Register 0
-    {0x010D,0x00},   // BitBlt Memory Address Offset Register 1
-    {0x0110,0x00},   // BitBlt Width Register 0
-    {0x0111,0x00},   // BitBlt Width Register 1
-    {0x0112,0x00},   // BitBlt Height Register 0
-    {0x0113,0x00},   // BitBlt Height Register 1
-    {0x0114,0x00},   // BitBlt Background Color Register 0
-    {0x0115,0x00},   // BitBlt Background Color Register 1
-    {0x0118,0x00},   // BitBlt Foreground Color Register 0
-    {0x0119,0x00},   // BitBlt Foreground Color Register 1
-    {0x01E0,0x00},   // Look-Up Table Mode Register
-    {0x01E2,0x00},   // Look-Up Table Address Register
-    {0x01E4,0x00},   // Look-Up Table Data Register
-    {0x01F0,0x10},   // Power Save Configuration Register
-    {0x01F1,0x00},   // Power Save Status Register
-    {0x01F4,0x00},   // CPU-to-Memory Access Watchdog Timer Register
-    {0x01FC,0x01},   // Display Mode Register
+    {0x0001,0x00},   /* Miscellaneous Register */
+    {0x01FC,0x00},   /* Display Mode Register */
+    {0x0004,0x1b},   /* General IO Pins Configuration Register 0 */
+    {0x0005,0x00},   /* General IO Pins Configuration Register 1 */
+    {0x0008,0xe5},   /* General IO Pins Control Register 0 */
+    {0x0009,0x1f},   /* General IO Pins Control Register 1 */
+    {0x0010,0x02},   /* Memory Clock Configuration Register */
+    {0x0014,0x10},   /* LCD Pixel Clock Configuration Register */
+    {0x0018,0x02},   /* CRT/TV Pixel Clock Configuration Register */
+    {0x001C,0x02},   /* MediaPlug Clock Configuration Register */
+    {0x001E,0x01},   /* CPU To Memory Wait State Select Register */
+    {0x0021,0x04},   /* DRAM Refresh Rate Register */
+    {0x002A,0x00},   /* DRAM Timings Control Register 0 */
+    {0x002B,0x01},   /* DRAM Timings Control Register 1 */
+    {0x0020,0x80},   /* Memory Configuration Register */
+    {0x0030,0x25},   /* Panel Type Register */
+    {0x0031,0x00},   /* MOD Rate Register */
+    {0x0032,0x4F},   /* LCD Horizontal Display Width Register */
+    {0x0034,0x13},   /* LCD Horizontal Non-Display Period Register */
+    {0x0035,0x01},   /* TFT FPLINE Start Position Register */
+    {0x0036,0x0B},   /* TFT FPLINE Pulse Width Register */
+    {0x0038,0xDF},   /* LCD Vertical Display Height Register 0 */
+    {0x0039,0x01},   /* LCD Vertical Display Height Register 1 */
+    {0x003A,0x2C},   /* LCD Vertical Non-Display Period Register */
+    {0x003B,0x00},   /* TFT FPFRAME Start Position Register */
+    {0x003C,0x01},   /* TFT FPFRAME Pulse Width Register */
+    {0x0040,0x03},   /* LCD Display Mode Register */
+    {0x0041,0x02},   /* LCD Miscellaneous Register */
+    {0x0042,0x00},   /* LCD Display Start Address Register 0 */
+    {0x0043,0x00},   /* LCD Display Start Address Register 1 */
+    {0x0044,0x00},   /* LCD Display Start Address Register 2 */
+    {0x0046,0x40},   /* LCD Memory Address Offset Register 0 */
+    {0x0047,0x01},   /* LCD Memory Address Offset Register 1 */
+    {0x0048,0x00},   /* LCD Pixel Panning Register */
+    {0x004A,0x00},   /* LCD Display FIFO High Threshold Control Register */
+    {0x004B,0x00},   /* LCD Display FIFO Low Threshold Control Register */
+    {0x0050,0x4F},   /* CRT/TV Horizontal Display Width Register */
+    {0x0052,0x13},   /* CRT/TV Horizontal Non-Display Period Register */
+    {0x0053,0x01},   /* CRT/TV HRTC Start Position Register */
+    {0x0054,0x0B},   /* CRT/TV HRTC Pulse Width Register */
+    {0x0056,0xDF},   /* CRT/TV Vertical Display Height Register 0 */
+    {0x0057,0x01},   /* CRT/TV Vertical Display Height Register 1 */
+    {0x0058,0x2B},   /* CRT/TV Vertical Non-Display Period Register */
+    {0x0059,0x09},   /* CRT/TV VRTC Start Position Register */
+    {0x005A,0x01},   /* CRT/TV VRTC Pulse Width Register */
+    {0x005B,0x00},   /* TV Output Control Register */
+    {0x0060,0x03},   /* CRT/TV Display Mode Register */
+    {0x0062,0x00},   /* CRT/TV Display Start Address Register 0 */
+    {0x0063,0x00},   /* CRT/TV Display Start Address Register 1 */
+    {0x0064,0x00},   /* CRT/TV Display Start Address Register 2 */
+    {0x0066,0x40},   /* CRT/TV Memory Address Offset Register 0 */
+    {0x0067,0x01},   /* CRT/TV Memory Address Offset Register 1 */
+    {0x0068,0x00},   /* CRT/TV Pixel Panning Register */
+    {0x006A,0x00},   /* CRT/TV Display FIFO High Threshold Control Register */
+    {0x006B,0x00},   /* CRT/TV Display FIFO Low Threshold Control Register */
+    {0x0070,0x00},   /* LCD Ink/Cursor Control Register */
+    {0x0071,0x00},   /* LCD Ink/Cursor Start Address Register */
+    {0x0072,0x00},   /* LCD Cursor X Position Register 0 */
+    {0x0073,0x00},   /* LCD Cursor X Position Register 1 */
+    {0x0074,0x00},   /* LCD Cursor Y Position Register 0 */
+    {0x0075,0x00},   /* LCD Cursor Y Position Register 1 */
+    {0x0076,0x00},   /* LCD Ink/Cursor Blue Color 0 Register */
+    {0x0077,0x00},   /* LCD Ink/Cursor Green Color 0 Register */
+    {0x0078,0x00},   /* LCD Ink/Cursor Red Color 0 Register */
+    {0x007A,0x1F},   /* LCD Ink/Cursor Blue Color 1 Register */
+    {0x007B,0x3F},   /* LCD Ink/Cursor Green Color 1 Register */
+    {0x007C,0x1F},   /* LCD Ink/Cursor Red Color 1 Register */
+    {0x007E,0x00},   /* LCD Ink/Cursor FIFO Threshold Register */
+    {0x0080,0x00},   /* CRT/TV Ink/Cursor Control Register */
+    {0x0081,0x00},   /* CRT/TV Ink/Cursor Start Address Register */
+    {0x0082,0x00},   /* CRT/TV Cursor X Position Register 0 */
+    {0x0083,0x00},   /* CRT/TV Cursor X Position Register 1 */
+    {0x0084,0x00},   /* CRT/TV Cursor Y Position Register 0 */
+    {0x0085,0x00},   /* CRT/TV Cursor Y Position Register 1 */
+    {0x0086,0x00},   /* CRT/TV Ink/Cursor Blue Color 0 Register */
+    {0x0087,0x00},   /* CRT/TV Ink/Cursor Green Color 0 Register */
+    {0x0088,0x00},   /* CRT/TV Ink/Cursor Red Color 0 Register */
+    {0x008A,0x1F},   /* CRT/TV Ink/Cursor Blue Color 1 Register */
+    {0x008B,0x3F},   /* CRT/TV Ink/Cursor Green Color 1 Register */
+    {0x008C,0x1F},   /* CRT/TV Ink/Cursor Red Color 1 Register */
+    {0x008E,0x00},   /* CRT/TV Ink/Cursor FIFO Threshold Register */
+    {0x0100,0x00},   /* BitBlt Control Register 0 */
+    {0x0101,0x00},   /* BitBlt Control Register 1 */
+    {0x0102,0x00},   /* BitBlt ROP Code/Color Expansion Register */
+    {0x0103,0x00},   /* BitBlt Operation Register */
+    {0x0104,0x00},   /* BitBlt Source Start Address Register 0 */
+    {0x0105,0x00},   /* BitBlt Source Start Address Register 1 */
+    {0x0106,0x00},   /* BitBlt Source Start Address Register 2 */
+    {0x0108,0x00},   /* BitBlt Destination Start Address Register 0 */
+    {0x0109,0x00},   /* BitBlt Destination Start Address Register 1 */
+    {0x010A,0x00},   /* BitBlt Destination Start Address Register 2 */
+    {0x010C,0x00},   /* BitBlt Memory Address Offset Register 0 */
+    {0x010D,0x00},   /* BitBlt Memory Address Offset Register 1 */
+    {0x0110,0x00},   /* BitBlt Width Register 0 */
+    {0x0111,0x00},   /* BitBlt Width Register 1 */
+    {0x0112,0x00},   /* BitBlt Height Register 0 */
+    {0x0113,0x00},   /* BitBlt Height Register 1 */
+    {0x0114,0x00},   /* BitBlt Background Color Register 0 */
+    {0x0115,0x00},   /* BitBlt Background Color Register 1 */
+    {0x0118,0x00},   /* BitBlt Foreground Color Register 0 */
+    {0x0119,0x00},   /* BitBlt Foreground Color Register 1 */
+    {0x01E0,0x00},   /* Look-Up Table Mode Register */
+    {0x01E2,0x00},   /* Look-Up Table Address Register */
+    {0x01E4,0x00},   /* Look-Up Table Data Register */
+    {0x01F0,0x10},   /* Power Save Configuration Register */
+    {0x01F1,0x00},   /* Power Save Status Register */
+    {0x01F4,0x00},   /* CPU-to-Memory Access Watchdog Timer Register */
+    {0x01FC,0x01},   /* Display Mode Register */
     {0, 0}
 };
 #endif /* CONFIG_VIDEO_SED13806_8BPP */
 
 #ifdef CONFIG_VIDEO_SED13806_16BPP
 
-static const S1D_REGS init_regs [] = 
+static const S1D_REGS init_regs [] =
 {
-    {0x0001,0x00},   // Miscellaneous Register
-    {0x01FC,0x00},   // Display Mode Register
-    {0x0004,0x1b},   // General IO Pins Configuration Register 0
-    {0x0005,0x00},   // General IO Pins Configuration Register 1
-    {0x0008,0xe5},   // General IO Pins Control Register 0
-    {0x0009,0x1f},   // General IO Pins Control Register 1
-    {0x0010,0x02},   // Memory Clock Configuration Register
-    {0x0014,0x10},   // LCD Pixel Clock Configuration Register
-    {0x0018,0x02},   // CRT/TV Pixel Clock Configuration Register
-    {0x001C,0x02},   // MediaPlug Clock Configuration Register
-    {0x001E,0x01},   // CPU To Memory Wait State Select Register
-    {0x0021,0x04},   // DRAM Refresh Rate Register
-    {0x002A,0x00},   // DRAM Timings Control Register 0
-    {0x002B,0x01},   // DRAM Timings Control Register 1
-    {0x0020,0x80},   // Memory Configuration Register
-    {0x0030,0x25},   // Panel Type Register
-    {0x0031,0x00},   // MOD Rate Register
-    {0x0032,0x4F},   // LCD Horizontal Display Width Register
-    {0x0034,0x13},   // LCD Horizontal Non-Display Period Register
-    {0x0035,0x01},   // TFT FPLINE Start Position Register
-    {0x0036,0x0B},   // TFT FPLINE Pulse Width Register
-    {0x0038,0xDF},   // LCD Vertical Display Height Register 0
-    {0x0039,0x01},   // LCD Vertical Display Height Register 1
-    {0x003A,0x2C},   // LCD Vertical Non-Display Period Register
-    {0x003B,0x00},   // TFT FPFRAME Start Position Register
-    {0x003C,0x01},   // TFT FPFRAME Pulse Width Register
-    {0x0040,0x05},   // LCD Display Mode Register
-    {0x0041,0x02},   // LCD Miscellaneous Register
-    {0x0042,0x00},   // LCD Display Start Address Register 0
-    {0x0043,0x00},   // LCD Display Start Address Register 1
-    {0x0044,0x00},   // LCD Display Start Address Register 2
-    {0x0046,0x80},   // LCD Memory Address Offset Register 0
-    {0x0047,0x02},   // LCD Memory Address Offset Register 1
-    {0x0048,0x00},   // LCD Pixel Panning Register
-    {0x004A,0x00},   // LCD Display FIFO High Threshold Control Register
-    {0x004B,0x00},   // LCD Display FIFO Low Threshold Control Register
-    {0x0050,0x4F},   // CRT/TV Horizontal Display Width Register
-    {0x0052,0x13},   // CRT/TV Horizontal Non-Display Period Register
-    {0x0053,0x01},   // CRT/TV HRTC Start Position Register
-    {0x0054,0x0B},   // CRT/TV HRTC Pulse Width Register
-    {0x0056,0xDF},   // CRT/TV Vertical Display Height Register 0
-    {0x0057,0x01},   // CRT/TV Vertical Display Height Register 1
-    {0x0058,0x2B},   // CRT/TV Vertical Non-Display Period Register
-    {0x0059,0x09},   // CRT/TV VRTC Start Position Register
-    {0x005A,0x01},   // CRT/TV VRTC Pulse Width Register
-    {0x005B,0x00},   // TV Output Control Register
-    {0x0060,0x05},   // CRT/TV Display Mode Register
-    {0x0062,0x00},   // CRT/TV Display Start Address Register 0
-    {0x0063,0x00},   // CRT/TV Display Start Address Register 1
-    {0x0064,0x00},   // CRT/TV Display Start Address Register 2
-    {0x0066,0x80},   // CRT/TV Memory Address Offset Register 0
-    {0x0067,0x02},   // CRT/TV Memory Address Offset Register 1
-    {0x0068,0x00},   // CRT/TV Pixel Panning Register
-    {0x006A,0x00},   // CRT/TV Display FIFO High Threshold Control Register
-    {0x006B,0x00},   // CRT/TV Display FIFO Low Threshold Control Register
-    {0x0070,0x00},   // LCD Ink/Cursor Control Register
-    {0x0071,0x00},   // LCD Ink/Cursor Start Address Register
-    {0x0072,0x00},   // LCD Cursor X Position Register 0
-    {0x0073,0x00},   // LCD Cursor X Position Register 1
-    {0x0074,0x00},   // LCD Cursor Y Position Register 0
-    {0x0075,0x00},   // LCD Cursor Y Position Register 1
-    {0x0076,0x00},   // LCD Ink/Cursor Blue Color 0 Register
-    {0x0077,0x00},   // LCD Ink/Cursor Green Color 0 Register
-    {0x0078,0x00},   // LCD Ink/Cursor Red Color 0 Register
-    {0x007A,0x1F},   // LCD Ink/Cursor Blue Color 1 Register
-    {0x007B,0x3F},   // LCD Ink/Cursor Green Color 1 Register
-    {0x007C,0x1F},   // LCD Ink/Cursor Red Color 1 Register
-    {0x007E,0x00},   // LCD Ink/Cursor FIFO Threshold Register
-    {0x0080,0x00},   // CRT/TV Ink/Cursor Control Register
-    {0x0081,0x00},   // CRT/TV Ink/Cursor Start Address Register
-    {0x0082,0x00},   // CRT/TV Cursor X Position Register 0
-    {0x0083,0x00},   // CRT/TV Cursor X Position Register 1
-    {0x0084,0x00},   // CRT/TV Cursor Y Position Register 0
-    {0x0085,0x00},   // CRT/TV Cursor Y Position Register 1
-    {0x0086,0x00},   // CRT/TV Ink/Cursor Blue Color 0 Register
-    {0x0087,0x00},   // CRT/TV Ink/Cursor Green Color 0 Register
-    {0x0088,0x00},   // CRT/TV Ink/Cursor Red Color 0 Register
-    {0x008A,0x1F},   // CRT/TV Ink/Cursor Blue Color 1 Register
-    {0x008B,0x3F},   // CRT/TV Ink/Cursor Green Color 1 Register
-    {0x008C,0x1F},   // CRT/TV Ink/Cursor Red Color 1 Register
-    {0x008E,0x00},   // CRT/TV Ink/Cursor FIFO Threshold Register
-    {0x0100,0x00},   // BitBlt Control Register 0
-    {0x0101,0x00},   // BitBlt Control Register 1
-    {0x0102,0x00},   // BitBlt ROP Code/Color Expansion Register
-    {0x0103,0x00},   // BitBlt Operation Register
-    {0x0104,0x00},   // BitBlt Source Start Address Register 0
-    {0x0105,0x00},   // BitBlt Source Start Address Register 1
-    {0x0106,0x00},   // BitBlt Source Start Address Register 2
-    {0x0108,0x00},   // BitBlt Destination Start Address Register 0
-    {0x0109,0x00},   // BitBlt Destination Start Address Register 1
-    {0x010A,0x00},   // BitBlt Destination Start Address Register 2
-    {0x010C,0x00},   // BitBlt Memory Address Offset Register 0
-    {0x010D,0x00},   // BitBlt Memory Address Offset Register 1
-    {0x0110,0x00},   // BitBlt Width Register 0
-    {0x0111,0x00},   // BitBlt Width Register 1
-    {0x0112,0x00},   // BitBlt Height Register 0
-    {0x0113,0x00},   // BitBlt Height Register 1
-    {0x0114,0x00},   // BitBlt Background Color Register 0
-    {0x0115,0x00},   // BitBlt Background Color Register 1
-    {0x0118,0x00},   // BitBlt Foreground Color Register 0
-    {0x0119,0x00},   // BitBlt Foreground Color Register 1
-    {0x01E0,0x01},   // Look-Up Table Mode Register
-    {0x01E2,0x00},   // Look-Up Table Address Register
-    {0x01E4,0x00},   // Look-Up Table Data Register
-    {0x01F0,0x10},   // Power Save Configuration Register
-    {0x01F1,0x00},   // Power Save Status Register
-    {0x01F4,0x00},   // CPU-to-Memory Access Watchdog Timer Register
-    {0x01FC,0x01},   // Display Mode Register
+    {0x0001,0x00},   /* Miscellaneous Register */
+    {0x01FC,0x00},   /* Display Mode Register */
+    {0x0004,0x1b},   /* General IO Pins Configuration Register 0 */
+    {0x0005,0x00},   /* General IO Pins Configuration Register 1 */
+    {0x0008,0xe5},   /* General IO Pins Control Register 0 */
+    {0x0009,0x1f},   /* General IO Pins Control Register 1 */
+    {0x0010,0x02},   /* Memory Clock Configuration Register */
+    {0x0014,0x10},   /* LCD Pixel Clock Configuration Register */
+    {0x0018,0x02},   /* CRT/TV Pixel Clock Configuration Register */
+    {0x001C,0x02},   /* MediaPlug Clock Configuration Register */
+    {0x001E,0x01},   /* CPU To Memory Wait State Select Register */
+    {0x0021,0x04},   /* DRAM Refresh Rate Register */
+    {0x002A,0x00},   /* DRAM Timings Control Register 0 */
+    {0x002B,0x01},   /* DRAM Timings Control Register 1 */
+    {0x0020,0x80},   /* Memory Configuration Register */
+    {0x0030,0x25},   /* Panel Type Register */
+    {0x0031,0x00},   /* MOD Rate Register */
+    {0x0032,0x4F},   /* LCD Horizontal Display Width Register */
+    {0x0034,0x13},   /* LCD Horizontal Non-Display Period Register */
+    {0x0035,0x01},   /* TFT FPLINE Start Position Register */
+    {0x0036,0x0B},   /* TFT FPLINE Pulse Width Register */
+    {0x0038,0xDF},   /* LCD Vertical Display Height Register 0 */
+    {0x0039,0x01},   /* LCD Vertical Display Height Register 1 */
+    {0x003A,0x2C},   /* LCD Vertical Non-Display Period Register */
+    {0x003B,0x00},   /* TFT FPFRAME Start Position Register */
+    {0x003C,0x01},   /* TFT FPFRAME Pulse Width Register */
+    {0x0040,0x05},   /* LCD Display Mode Register */
+    {0x0041,0x02},   /* LCD Miscellaneous Register */
+    {0x0042,0x00},   /* LCD Display Start Address Register 0 */
+    {0x0043,0x00},   /* LCD Display Start Address Register 1 */
+    {0x0044,0x00},   /* LCD Display Start Address Register 2 */
+    {0x0046,0x80},   /* LCD Memory Address Offset Register 0 */
+    {0x0047,0x02},   /* LCD Memory Address Offset Register 1 */
+    {0x0048,0x00},   /* LCD Pixel Panning Register */
+    {0x004A,0x00},   /* LCD Display FIFO High Threshold Control Register */
+    {0x004B,0x00},   /* LCD Display FIFO Low Threshold Control Register */
+    {0x0050,0x4F},   /* CRT/TV Horizontal Display Width Register */
+    {0x0052,0x13},   /* CRT/TV Horizontal Non-Display Period Register */
+    {0x0053,0x01},   /* CRT/TV HRTC Start Position Register */
+    {0x0054,0x0B},   /* CRT/TV HRTC Pulse Width Register */
+    {0x0056,0xDF},   /* CRT/TV Vertical Display Height Register 0 */
+    {0x0057,0x01},   /* CRT/TV Vertical Display Height Register 1 */
+    {0x0058,0x2B},   /* CRT/TV Vertical Non-Display Period Register */
+    {0x0059,0x09},   /* CRT/TV VRTC Start Position Register */
+    {0x005A,0x01},   /* CRT/TV VRTC Pulse Width Register */
+    {0x005B,0x00},   /* TV Output Control Register */
+    {0x0060,0x05},   /* CRT/TV Display Mode Register */
+    {0x0062,0x00},   /* CRT/TV Display Start Address Register 0 */
+    {0x0063,0x00},   /* CRT/TV Display Start Address Register 1 */
+    {0x0064,0x00},   /* CRT/TV Display Start Address Register 2 */
+    {0x0066,0x80},   /* CRT/TV Memory Address Offset Register 0 */
+    {0x0067,0x02},   /* CRT/TV Memory Address Offset Register 1 */
+    {0x0068,0x00},   /* CRT/TV Pixel Panning Register */
+    {0x006A,0x00},   /* CRT/TV Display FIFO High Threshold Control Register */
+    {0x006B,0x00},   /* CRT/TV Display FIFO Low Threshold Control Register */
+    {0x0070,0x00},   /* LCD Ink/Cursor Control Register */
+    {0x0071,0x00},   /* LCD Ink/Cursor Start Address Register */
+    {0x0072,0x00},   /* LCD Cursor X Position Register 0 */
+    {0x0073,0x00},   /* LCD Cursor X Position Register 1 */
+    {0x0074,0x00},   /* LCD Cursor Y Position Register 0 */
+    {0x0075,0x00},   /* LCD Cursor Y Position Register 1 */
+    {0x0076,0x00},   /* LCD Ink/Cursor Blue Color 0 Register */
+    {0x0077,0x00},   /* LCD Ink/Cursor Green Color 0 Register */
+    {0x0078,0x00},   /* LCD Ink/Cursor Red Color 0 Register */
+    {0x007A,0x1F},   /* LCD Ink/Cursor Blue Color 1 Register */
+    {0x007B,0x3F},   /* LCD Ink/Cursor Green Color 1 Register */
+    {0x007C,0x1F},   /* LCD Ink/Cursor Red Color 1 Register */
+    {0x007E,0x00},   /* LCD Ink/Cursor FIFO Threshold Register */
+    {0x0080,0x00},   /* CRT/TV Ink/Cursor Control Register */
+    {0x0081,0x00},   /* CRT/TV Ink/Cursor Start Address Register */
+    {0x0082,0x00},   /* CRT/TV Cursor X Position Register 0 */
+    {0x0083,0x00},   /* CRT/TV Cursor X Position Register 1 */
+    {0x0084,0x00},   /* CRT/TV Cursor Y Position Register 0 */
+    {0x0085,0x00},   /* CRT/TV Cursor Y Position Register 1 */
+    {0x0086,0x00},   /* CRT/TV Ink/Cursor Blue Color 0 Register */
+    {0x0087,0x00},   /* CRT/TV Ink/Cursor Green Color 0 Register */
+    {0x0088,0x00},   /* CRT/TV Ink/Cursor Red Color 0 Register */
+    {0x008A,0x1F},   /* CRT/TV Ink/Cursor Blue Color 1 Register */
+    {0x008B,0x3F},   /* CRT/TV Ink/Cursor Green Color 1 Register */
+    {0x008C,0x1F},   /* CRT/TV Ink/Cursor Red Color 1 Register */
+    {0x008E,0x00},   /* CRT/TV Ink/Cursor FIFO Threshold Register */
+    {0x0100,0x00},   /* BitBlt Control Register 0 */
+    {0x0101,0x00},   /* BitBlt Control Register 1 */
+    {0x0102,0x00},   /* BitBlt ROP Code/Color Expansion Register */
+    {0x0103,0x00},   /* BitBlt Operation Register */
+    {0x0104,0x00},   /* BitBlt Source Start Address Register 0 */
+    {0x0105,0x00},   /* BitBlt Source Start Address Register 1 */
+    {0x0106,0x00},   /* BitBlt Source Start Address Register 2 */
+    {0x0108,0x00},   /* BitBlt Destination Start Address Register 0 */
+    {0x0109,0x00},   /* BitBlt Destination Start Address Register 1 */
+    {0x010A,0x00},   /* BitBlt Destination Start Address Register 2 */
+    {0x010C,0x00},   /* BitBlt Memory Address Offset Register 0 */
+    {0x010D,0x00},   /* BitBlt Memory Address Offset Register 1 */
+    {0x0110,0x00},   /* BitBlt Width Register 0 */
+    {0x0111,0x00},   /* BitBlt Width Register 1 */
+    {0x0112,0x00},   /* BitBlt Height Register 0 */
+    {0x0113,0x00},   /* BitBlt Height Register 1 */
+    {0x0114,0x00},   /* BitBlt Background Color Register 0 */
+    {0x0115,0x00},   /* BitBlt Background Color Register 1 */
+    {0x0118,0x00},   /* BitBlt Foreground Color Register 0 */
+    {0x0119,0x00},   /* BitBlt Foreground Color Register 1 */
+    {0x01E0,0x01},   /* Look-Up Table Mode Register */
+    {0x01E2,0x00},   /* Look-Up Table Address Register */
+    {0x01E4,0x00},   /* Look-Up Table Data Register */
+    {0x01F0,0x10},   /* Power Save Configuration Register */
+    {0x01F1,0x00},   /* Power Save Status Register */
+    {0x01F4,0x00},   /* CPU-to-Memory Access Watchdog Timer Register */
+    {0x01FC,0x01},   /* Display Mode Register */
     {0, 0}
 };
 
@@ -274,7 +273,6 @@
 #endif /* CONFIG_NEC_NL6448BC20 */
 
 
-
 #ifdef CONFIG_CONSOLE_EXTRA_INFO
 
 /*-----------------------------------------------------------------------------
@@ -286,10 +284,10 @@
 void video_get_info_str (int line_number, char *info)
 {
     if (line_number == 1) {
-        strcpy (info, " RPXClassic board");
+	strcpy (info, " RPXClassic board");
     }
     else {
-        info [0] = '\0';
+	info [0] = '\0';
     }
 
 }
@@ -308,7 +306,7 @@
     *(ECCX_CSR12) |= ECCX_860;
     *(ECCX_CSR8) |= ECCX_BE | ECCX_CS2;
     *(ECCX_CSR8) |= ECCX_ENEPSON;
-    
+
     memctl->memc_or2 = SED13806_OR;
     memctl->memc_br2 = SED13806_REG_ADDR | SED13806_ACCES;
 
@@ -316,7 +314,7 @@
 }
 
 /*-----------------------------------------------------------------------------
- * board_validate_screen -- 
+ * board_validate_screen --
  *-----------------------------------------------------------------------------
  */
 void board_validate_screen (unsigned int base)
@@ -325,7 +323,7 @@
     *(volatile unsigned char *)(base + REG_GPIO_CTRL) = 0x80;
 }
 /*-----------------------------------------------------------------------------
- * board_get_regs -- 
+ * board_get_regs --
  *-----------------------------------------------------------------------------
  */
 const S1D_REGS *board_get_regs (void)
@@ -333,7 +331,7 @@
     return (init_regs);
 }
 /*-----------------------------------------------------------------------------
- * board_get_width -- 
+ * board_get_width --
  *-----------------------------------------------------------------------------
  */
 int board_get_width (void)
@@ -342,7 +340,7 @@
 }
 
 /*-----------------------------------------------------------------------------
- * board_get_height -- 
+ * board_get_height --
  *-----------------------------------------------------------------------------
  */
 int board_get_height (void)

diff --git a/board/RPXClassic/flash.c b/board/RPXClassic/flash.c
index fdf90cf..2e0b8f9 100644
--- a/board/RPXClassic/flash.c
+++ b/board/RPXClassic/flash.c

@@ -58,7 +58,7 @@
 	size_b0 = flash_get_size((vu_long *)CFG_FLASH_BASE, &flash_info[0]);
 
 
-        flash_get_offsets (CFG_FLASH_BASE, &flash_info[0]);
+	flash_get_offsets (CFG_FLASH_BASE, &flash_info[0]);
 
 #if CFG_MONITOR_BASE >= CFG_FLASH_BASE
 	/* monitor protection ON by default */
@@ -112,12 +112,12 @@
 	}
 
 	switch (info->flash_id & FLASH_TYPEMASK) {
-        case FLASH_AMDL323B:
-            printf ("AMDL323DB (16 Mbytes, bottom boot sect)\n");
-            break;
+	case FLASH_AMDL323B:
+	    printf ("AMDL323DB (16 Mbytes, bottom boot sect)\n");
+	    break;
 	default:
-            printf ("Unknown Chip Type\n");
-            break;
+	    printf ("Unknown Chip Type\n");
+	    break;
 	}
 
 	printf ("  Size: %ld MB in %d Sectors\n",
@@ -152,11 +152,11 @@
 	ulong value;
 	ulong base = (ulong)addr;
 
-        /* Reset flash componeny                                             */
-        addr [0] = 0xf0f0f0f0;
+	/* Reset flash componeny                                             */
+	addr [0] = 0xf0f0f0f0;
 
-        /* Write auto select command: read Manufacturer ID */
-        addr[0xAAA] = 0xAAAAAAAA ;
+	/* Write auto select command: read Manufacturer ID */
+	addr[0xAAA] = 0xAAAAAAAA ;
 	addr[0x555] = 0x55555555 ;
 	addr[0xAAA] = 0x90909090 ;
 
@@ -176,48 +176,48 @@
 	value = addr[2] ;		/* device ID		*/
 
 	switch (value & 0x00FF00FF) {
-        case (AMD_ID_DL323B & 0x00FF00FF):
-            info->flash_id += FLASH_AMDL323B;
-            info->sector_count = 71;
-            info->size = 0x01000000;            /* 16 Mb                     */
+	case (AMD_ID_DL323B & 0x00FF00FF):
+	    info->flash_id += FLASH_AMDL323B;
+	    info->sector_count = 71;
+	    info->size = 0x01000000;            /* 16 Mb                     */
 
-            break;
+	    break;
 	default:
 		info->flash_id = FLASH_UNKNOWN;
 		return (0);			/* => no or unknown flash */
 
 	}
 	/* set up sector start address table */
-        /* set sector offsets for bottom boot block type	*/
-        info->start[0] = base + 0x00000000;
-        info->start[1] = base + 0x00008000;
-        info->start[2] = base + 0x00010000;
-        info->start[3] = base + 0x00018000;
-        info->start[4] = base + 0x00020000;
-        info->start[5] = base + 0x00028000;
-        info->start[6] = base + 0x00030000;
-        info->start[7] = base + 0x00038000;
-        for (i = 8; i < info->sector_count; i++) {
-            info->start[i] = base + ((i-7) * 0x00040000) ;
-        }
+	/* set sector offsets for bottom boot block type	*/
+	info->start[0] = base + 0x00000000;
+	info->start[1] = base + 0x00008000;
+	info->start[2] = base + 0x00010000;
+	info->start[3] = base + 0x00018000;
+	info->start[4] = base + 0x00020000;
+	info->start[5] = base + 0x00028000;
+	info->start[6] = base + 0x00030000;
+	info->start[7] = base + 0x00038000;
+	for (i = 8; i < info->sector_count; i++) {
+	    info->start[i] = base + ((i-7) * 0x00040000) ;
+	}
 
 	/* check for protected sectors */
-        for (i = 0; i < 23; i++) {
-            /* read sector protection at sector address, (A7 .. A0) = 0x02 */
-            /* D0 = 1 if protected */
-            addr = (volatile unsigned long *)(info->start[i]);
-            info->protect[i] = addr[4] & 1 ;
+	for (i = 0; i < 23; i++) {
+	    /* read sector protection at sector address, (A7 .. A0) = 0x02 */
+	    /* D0 = 1 if protected */
+	    addr = (volatile unsigned long *)(info->start[i]);
+	    info->protect[i] = addr[4] & 1 ;
 	}
-        /* Check for protected sectors in the 2nd bank                       */
-        addr[0x100AAA] = 0xAAAAAAAA ;
-        addr[0x100555] = 0x55555555 ;
-        addr[0x100AAA] = 0x90909090 ;
+	/* Check for protected sectors in the 2nd bank                       */
+	addr[0x100AAA] = 0xAAAAAAAA ;
+	addr[0x100555] = 0x55555555 ;
+	addr[0x100AAA] = 0x90909090 ;
 
-        for (i = 23; i < info->sector_count; i++) {
-            /* read sector protection at sector address, (A7 .. A0) = 0x02 */
-            /* D0 = 1 if protected */
-            addr = (volatile unsigned long *)(info->start[i]);
-            info->protect[i] = addr[4] & 1 ;
+	for (i = 23; i < info->sector_count; i++) {
+	    /* read sector protection at sector address, (A7 .. A0) = 0x02 */
+	    /* D0 = 1 if protected */
+	    addr = (volatile unsigned long *)(info->start[i]);
+	    info->protect[i] = addr[4] & 1 ;
 	}
 
 	/*
@@ -330,7 +330,7 @@
 	addr[0] = 0xF0F0F0F0;	/* reset bank */
 
 	printf (" done\n");
-        return 0;
+	return 0;
 }
 
 /*-----------------------------------------------------------------------

diff --git a/board/RPXClassic/u-boot.lds b/board/RPXClassic/u-boot.lds
index a31c362..082d8b0 100644
--- a/board/RPXClassic/u-boot.lds
+++ b/board/RPXClassic/u-boot.lds

@@ -110,6 +110,11 @@
   _edata  =  .;
   PROVIDE (edata = .);
 
+  __u_boot_cmd_start = .;
+  .u_boot_cmd : { *(.u_boot_cmd) }
+  __u_boot_cmd_end = .;
+
+
   __start___ex_table = .;
   __ex_table : { *(__ex_table) }
   __stop___ex_table = .;
@@ -132,4 +137,3 @@
   _end = . ;
   PROVIDE (end = .);
 }
-

diff --git a/board/RPXClassic/u-boot.lds.debug b/board/RPXClassic/u-boot.lds.debug
index 22138f8..c0ee849 100644
--- a/board/RPXClassic/u-boot.lds.debug
+++ b/board/RPXClassic/u-boot.lds.debug

@@ -106,6 +106,11 @@
   _edata  =  .;
   PROVIDE (edata = .);
 
+  __u_boot_cmd_start = .;
+  .u_boot_cmd : { *(.u_boot_cmd) }
+  __u_boot_cmd_end = .;
+
+
   __start___ex_table = .;
   __ex_table : { *(__ex_table) }
   __stop___ex_table = .;
@@ -128,4 +133,3 @@
   _end = . ;
   PROVIDE (end = .);
 }
-

diff --git a/board/RPXlite/Makefile b/board/RPXlite/Makefile
index ef173d0..13ce9fc 100644
--- a/board/RPXlite/Makefile
+++ b/board/RPXlite/Makefile

@@ -28,7 +28,7 @@
 OBJS	= $(BOARD).o flash.o
 
 $(LIB):	.depend $(OBJS)
-	$(AR) crv $@ $^
+	$(AR) crv $@ $(OBJS)
 
 #########################################################################
 

diff --git a/board/RPXlite/u-boot.lds b/board/RPXlite/u-boot.lds
index a31c362..082d8b0 100644
--- a/board/RPXlite/u-boot.lds
+++ b/board/RPXlite/u-boot.lds

@@ -110,6 +110,11 @@
   _edata  =  .;
   PROVIDE (edata = .);
 
+  __u_boot_cmd_start = .;
+  .u_boot_cmd : { *(.u_boot_cmd) }
+  __u_boot_cmd_end = .;
+
+
   __start___ex_table = .;
   __ex_table : { *(__ex_table) }
   __stop___ex_table = .;
@@ -132,4 +137,3 @@
   _end = . ;
   PROVIDE (end = .);
 }
-

diff --git a/board/RPXlite/u-boot.lds.debug b/board/RPXlite/u-boot.lds.debug
index 22138f8..c0ee849 100644
--- a/board/RPXlite/u-boot.lds.debug
+++ b/board/RPXlite/u-boot.lds.debug

@@ -106,6 +106,11 @@
   _edata  =  .;
   PROVIDE (edata = .);
 
+  __u_boot_cmd_start = .;
+  .u_boot_cmd : { *(.u_boot_cmd) }
+  __u_boot_cmd_end = .;
+
+
   __start___ex_table = .;
   __ex_table : { *(__ex_table) }
   __stop___ex_table = .;
@@ -128,4 +133,3 @@
   _end = . ;
   PROVIDE (end = .);
 }
-

diff --git a/board/RRvision/Makefile b/board/RRvision/Makefile
index c748d35..fdc6fd5 100644
--- a/board/RRvision/Makefile
+++ b/board/RRvision/Makefile

@@ -28,7 +28,7 @@
 OBJS	= $(BOARD).o flash.o
 
 $(LIB):	.depend $(OBJS)
-	$(AR) crv $@ $^
+	$(AR) crv $@ $(OBJS)
 
 #########################################################################
 

diff --git a/board/RRvision/u-boot.lds b/board/RRvision/u-boot.lds
index b2d8090..f81a10e 100644
--- a/board/RRvision/u-boot.lds
+++ b/board/RRvision/u-boot.lds

@@ -112,6 +112,11 @@
   _edata  =  .;
   PROVIDE (edata = .);
 
+  __u_boot_cmd_start = .;
+  .u_boot_cmd : { *(.u_boot_cmd) }
+  __u_boot_cmd_end = .;
+
+
   __start___ex_table = .;
   __ex_table : { *(__ex_table) }
   __stop___ex_table = .;
@@ -134,4 +139,3 @@
   _end = . ;
   PROVIDE (end = .);
 }
-

diff --git a/board/a3000/Makefile b/board/a3000/Makefile
index 02e2b4b..5fde362 100644
--- a/board/a3000/Makefile
+++ b/board/a3000/Makefile

@@ -28,7 +28,7 @@
 OBJS 	= $(BOARD).o flash.o
 
 $(LIB):	.depend $(OBJS)
-	$(AR) crv $@ $^
+	$(AR) crv $@ $(OBJS)
 
 #########################################################################
 

diff --git a/board/a3000/README b/board/a3000/README
index 417969f..f0e92c5 100644
--- a/board/a3000/README
+++ b/board/a3000/README

@@ -15,4 +15,3 @@
 U-Boot, at the address of 0xFFFE0000.
 
 There is a National ns83815 10/100M ethernet controller on-board.
-

diff --git a/board/a3000/flash.c b/board/a3000/flash.c
index cbfd1d1..13a5ca5 100644
--- a/board/a3000/flash.c
+++ b/board/a3000/flash.c

@@ -71,7 +71,7 @@
 	int i;
 
 	/* Init: no FLASHes known */
-	for (i=0; i<CFG_MAX_FLASH_BANKS; ++i) 
+	for (i=0; i<CFG_MAX_FLASH_BANKS; ++i)
 	{
 		flash_info[i].flash_id = FLASH_UNKNOWN;
 
@@ -81,7 +81,7 @@
 */
 		size_b[i] = flash_get_size((vu_char *) 0xff800000 , &flash_info[i]);
 
-		if (flash_info[i].flash_id == FLASH_UNKNOWN) 
+		if (flash_info[i].flash_id == FLASH_UNKNOWN)
 		{
 			printf ("## Unknown FLASH on Bank %d: "
 				"ID 0x%lx, Size = 0x%08lx = %ld MB\n",
@@ -119,7 +119,7 @@
 
 	size = 0;
 	DEBUGF("## Final Flash bank sizes: ");
-	for (i=0; i<CFG_MAX_FLASH_BANKS; ++i) 
+	for (i=0; i<CFG_MAX_FLASH_BANKS; ++i)
 	{
 		DEBUGF("%08lx ", size_b[i]);
 		size += size_b[i];
@@ -174,16 +174,16 @@
 	}
 
 	switch (info->flash_id & FLASH_TYPEMASK) {
-	case FLASH_28F320J3A:	
+	case FLASH_28F320J3A:
 			printf ("28F320J3A (32Mbit = 128K x 32)\n");
 			break;
-	case FLASH_28F640J3A:	
+	case FLASH_28F640J3A:
 			printf ("28F640J3A (64Mbit = 128K x 64)\n");
 			break;
-	case FLASH_28F128J3A:	
+	case FLASH_28F128J3A:
 			printf ("28F128J3A (128Mbit = 128K x 128)\n");
 			break;
-	default:		
+	default:
 			printf ("Unknown Chip Type\n");
 			break;
 	}

diff --git a/board/a3000/u-boot.lds b/board/a3000/u-boot.lds
index 627a53b..6bd865e 100644
--- a/board/a3000/u-boot.lds
+++ b/board/a3000/u-boot.lds

@@ -102,6 +102,10 @@
   _edata  =  .;
   PROVIDE (edata = .);
 
+  __u_boot_cmd_start = .;
+  .u_boot_cmd : { *(.u_boot_cmd) }
+  __u_boot_cmd_end = .;
+
   __start___ex_table = .;
   __ex_table : { *(__ex_table) }
   __stop___ex_table = .;
@@ -125,4 +129,3 @@
   _end = . ;
   PROVIDE (end = .);
 }
-

diff --git a/board/at91rm9200dk/Makefile b/board/at91rm9200dk/Makefile
index d925d33..93ba699 100644
--- a/board/at91rm9200dk/Makefile
+++ b/board/at91rm9200dk/Makefile

@@ -29,7 +29,7 @@
 SOBJS	:=
 
 $(LIB):	$(OBJS) $(SOBJS)
-	$(AR) crv $@ $^
+	$(AR) crv $@ $(OBJS) $(SOBJS)
 
 clean:
 	rm -f $(SOBJS) $(OBJS)

diff --git a/board/at91rm9200dk/config.mk b/board/at91rm9200dk/config.mk
index 009b4d7..9ce161e 100644
--- a/board/at91rm9200dk/config.mk
+++ b/board/at91rm9200dk/config.mk

@@ -1,2 +1 @@
 TEXT_BASE = 0x21f00000
-

diff --git a/board/at91rm9200dk/flash.c b/board/at91rm9200dk/flash.c
index 4d4524f..ebbd6f4 100644
--- a/board/at91rm9200dk/flash.c
+++ b/board/at91rm9200dk/flash.c

@@ -43,14 +43,14 @@
 OrgDef OrgAT49BV16x4[] =
 {
 	{ 8, 8*1024 }, /* 8 * 8kBytes sectors */
-	{ 2, 32*1024 }, /* 2 * 32kBytes sectors */	
-	{ 30, 64*1024 } /* 30 * 64kBytes sectors */	
+	{ 2, 32*1024 }, /* 2 * 32kBytes sectors */
+	{ 30, 64*1024 } /* 30 * 64kBytes sectors */
 };
 
 OrgDef OrgAT49BV16x4A[] =
 {
-	{ 8, 8*1024 }, /* 8 * 8kBytes sectors */	
-	{ 31, 64*1024 } /* 31 * 64kBytes sectors */	
+	{ 8, 8*1024 }, /* 8 * 8kBytes sectors */
+	{ 31, 64*1024 } /* 31 * 64kBytes sectors */
 };
 
 

diff --git a/board/at91rm9200dk/u-boot.lds b/board/at91rm9200dk/u-boot.lds
index 2447bca..17a85b8 100644
--- a/board/at91rm9200dk/u-boot.lds
+++ b/board/at91rm9200dk/u-boot.lds

@@ -27,28 +27,32 @@
 ENTRY(_start)
 SECTIONS
 {
-        . = 0x00000000;
+	. = 0x00000000;
 
-        . = ALIGN(4);
+	. = ALIGN(4);
 	.text      :
 	{
 	  cpu/at91rm9200/start.o	(.text)
 	  *(.text)
 	}
 
-        . = ALIGN(4);
-        .rodata : { *(.rodata) }
+	. = ALIGN(4);
+	.rodata : { *(.rodata) }
 
-        . = ALIGN(4);
-        .data : { *(.data) }
+	. = ALIGN(4);
+	.data : { *(.data) }
 
-        . = ALIGN(4);
-        .got : { *(.got) }
+	. = ALIGN(4);
+	.got : { *(.got) }
+
+  __u_boot_cmd_start = .;
+  .u_boot_cmd : { *(.u_boot_cmd) }
+  __u_boot_cmd_end = .;
 
 	armboot_end_data = .;
 
-        . = ALIGN(4);
-        .bss : { *(.bss) }
+	. = ALIGN(4);
+	.bss : { *(.bss) }
 
 	armboot_end = .;
 }

diff --git a/board/atc/Makefile b/board/atc/Makefile
index 35b8428..7a2014d 100644
--- a/board/atc/Makefile
+++ b/board/atc/Makefile

@@ -28,7 +28,7 @@
 OBJS	= $(BOARD).o flash.o
 
 $(LIB):	.depend $(OBJS)
-	$(AR) crv $@ $^
+	$(AR) crv $@ $(OBJS)
 
 #########################################################################
 

diff --git a/board/atc/atc.c b/board/atc/atc.c
index ea7416a..42abcda 100644
--- a/board/atc/atc.c
+++ b/board/atc/atc.c

@@ -207,14 +207,14 @@
  * UPMB initialization table
  */
 #define	_NOT_USED_	0xFFFFFFFF
-  
+
 static const uint rtc_table[] =
 {
 	/*
 	 * Single Read. (Offset 0 in UPMA RAM)
 	 */
-	0xfffec00, 0xfffac00, 0xfff2d00, 0xfef2800, 
-	0xfaf2080, 0xfaf2080, 0xfff2400, 0x1fff6c05, /* last */	    
+	0xfffec00, 0xfffac00, 0xfff2d00, 0xfef2800,
+	0xfaf2080, 0xfaf2080, 0xfff2400, 0x1fff6c05, /* last */
 	/*
 	 * Burst Read. (Offset 8 in UPMA RAM)
 	 */
@@ -225,7 +225,7 @@
 	/*
 	 * Single Write. (Offset 18 in UPMA RAM)
 	 */
-	0xfffec00, 0xfffac00, 0xfff2d00, 0xfef2800, 
+	0xfffec00, 0xfffac00, 0xfff2d00, 0xfef2800,
 	0xfaf2080, 0xfaf2080, 0xfaf2400, 0x1fbf6c05, /* last */
 	/*
 	 * Burst Write. (Offset 20 in UPMA RAM)
@@ -244,8 +244,8 @@
 	 * Exception. (Offset 3c in UPMA RAM)
 	 */
 	_NOT_USED_, _NOT_USED_, _NOT_USED_, _NOT_USED_,
-};												
-																	
+};
+
 /* ------------------------------------------------------------------------- */
 
 /* Check Board Identity:
@@ -366,13 +366,13 @@
 {
 	volatile immap_t *immap = (immap_t *) CFG_IMMR;
 	volatile memctl8260_t *memctl = &immap->im_memctl;
-	
+
 	upmconfig(UPMA, (uint *)rtc_table, sizeof(rtc_table) / sizeof(uint));
-	memctl->memc_mamr = MxMR_RLFx_6X | MxMR_WLFx_6X | MxMR_OP_NORM;	
+	memctl->memc_mamr = MxMR_RLFx_6X | MxMR_WLFx_6X | MxMR_OP_NORM;
 
 	return (0);
 }
-			
+
 long int initdram (int board_type)
 {
 	volatile immap_t *immap = (immap_t *) CFG_IMMR;

diff --git a/board/atc/flash.c b/board/atc/flash.c
index 6d7b38b..26b7c80 100644
--- a/board/atc/flash.c
+++ b/board/atc/flash.c

@@ -76,14 +76,14 @@
 
 		memset(&flash_info[i], 0, sizeof(flash_info_t));
 
-		flash_info[i].size = 
+		flash_info[i].size =
 			flash_get_size((FPW *)flashbase, &flash_info[i]);
 
 		if (flash_info[i].flash_id == FLASH_UNKNOWN) {
 			printf ("## Unknown FLASH on Bank %d - Size = 0x%08lx\n",
 			i, flash_info[i].size);
 		}
-		
+
 		size += flash_info[i].size;
 	}
 
@@ -163,13 +163,13 @@
 {
 	int i;
 	flash_info_t * info;
-	
+
 	for (i = 0; i < CFG_MAX_FLASH_BANKS; i ++) {
 		info = & flash_info[i];
 		if (info->start[0] <= base && base < info->start[0] + info->size)
 			break;
 	}
-	
+
 	return i == CFG_MAX_FLASH_BANKS ? 0 : info;
 }
 
@@ -216,32 +216,32 @@
 	case FLASH_AM640U:
 		fmt = "29LV641D (64 Mbit, uniform sectors)\n";
 		break;
-        case FLASH_28F800C3B:
-        case FLASH_28F800C3T:
+	case FLASH_28F800C3B:
+	case FLASH_28F800C3T:
 		fmt = "28F800C3%s (8 Mbit, %s)\n";
 		break;
 	case FLASH_INTEL800B:
 	case FLASH_INTEL800T:
 		fmt = "28F800B3%s (8 Mbit, %s)\n";
 		break;
-        case FLASH_28F160C3B:
-        case FLASH_28F160C3T:
+	case FLASH_28F160C3B:
+	case FLASH_28F160C3T:
 		fmt = "28F160C3%s (16 Mbit, %s)\n";
 		break;
 	case FLASH_INTEL160B:
 	case FLASH_INTEL160T:
 		fmt = "28F160B3%s (16 Mbit, %s)\n";
 		break;
-        case FLASH_28F320C3B:
-        case FLASH_28F320C3T:
+	case FLASH_28F320C3B:
+	case FLASH_28F320C3T:
 		fmt = "28F320C3%s (32 Mbit, %s)\n";
 		break;
 	case FLASH_INTEL320B:
 	case FLASH_INTEL320T:
 		fmt = "28F320B3%s (32 Mbit, %s)\n";
 		break;
-        case FLASH_28F640C3B:
-        case FLASH_28F640C3T:
+	case FLASH_28F640C3B:
+	case FLASH_28F640C3T:
 		fmt = "28F640C3%s (64 Mbit, %s)\n";
 		break;
 	case FLASH_INTEL640B:

diff --git a/board/atc/u-boot.lds b/board/atc/u-boot.lds
index 9d56f13..7ac29a0 100644
--- a/board/atc/u-boot.lds
+++ b/board/atc/u-boot.lds

@@ -94,6 +94,10 @@
   _edata  =  .;
   PROVIDE (edata = .);
 
+  __u_boot_cmd_start = .;
+  .u_boot_cmd : { *(.u_boot_cmd) }
+  __u_boot_cmd_end = .;
+
   __start___ex_table = .;
   __ex_table : { *(__ex_table) }
   __stop___ex_table = .;
@@ -116,4 +120,3 @@
   _end = . ;
   PROVIDE (end = .);
 }
-

diff --git a/board/bmw/Makefile b/board/bmw/Makefile
index 46fe791..621640b 100644
--- a/board/bmw/Makefile
+++ b/board/bmw/Makefile

@@ -31,7 +31,7 @@
 SOBJS	= early_init.o
 
 $(LIB):	.depend $(OBJS) $(SOBJS)
-	$(AR) crv $@ $^
+	$(AR) crv $@ $(OBJS) $(SOBJS)
 
 #########################################################################
 

diff --git a/board/bmw/README b/board/bmw/README
index 55ef56e..70bc813 100644
--- a/board/bmw/README
+++ b/board/bmw/README

@@ -20,39 +20,39 @@
 onboard the processor module are listed briefly below:
 
 0x00000000 - 0x40000000 - 64MB SDRAM SIMM
-                          (Unregistered PC-100 SDRAM DIMM Module)
+			  (Unregistered PC-100 SDRAM DIMM Module)
 
 0xFF000000 - 0xFF001FFF - M-Systems DiskOnChip (TM) 2000
-                          TSOP 16MB (MD2211-D16-V3)
+			  TSOP 16MB (MD2211-D16-V3)
 
 0x70000000 - 0x70001FFF - M-Systems DiskOnChip (TM) 2000
-                          DIP32 (Socketed 16MB - 1GB ) *
-                          NOTE: this is not populated on all systems.
+			  DIP32 (Socketed 16MB - 1GB ) *
+			  NOTE: this is not populated on all systems.
 
 0x7c000000 - 0x7c000000 - Reset Register
-                          (Write 0 to reset)
+			  (Write 0 to reset)
 
 0x7c000001 - 0x7c000001 - System LED
-                          (Clear Bit 7 to turn on, set to shut off)
+			  (Clear Bit 7 to turn on, set to shut off)
 
 0x7c000002 - 0x7c000002 - M48T59 Watchdog IRQ3
-                          (Clear bit 7 to reset, set to assert IRQ3)
+			  (Clear bit 7 to reset, set to assert IRQ3)
 
 0x7c000003 - 0x7c000003 - M48T59 Write-Protect Register
-                          (Clear bit 7 to make R/W, set to make R/O)
+			  (Clear bit 7 to make R/W, set to make R/O)
 
 0x7c002000 - 0x7c002003 - Infineon OSRAM DLR2416 4 Character
-                          5x7 Dot Matrix Alphanumeric Display
-                          (Each byte sets the appropriate character)
+			  5x7 Dot Matrix Alphanumeric Display
+			  (Each byte sets the appropriate character)
 
 0x7c004000 - 0x7c005FF0 - SGS-THOMSON M48T59Y 8K NVRAM/RTC
-                          NVRAM Memory Region
+			  NVRAM Memory Region
 
 0x7c005FF0 - 0x7c005FFF - SGS-THOMSON M48T59Y 8K NVRAM/RTC
-                          Realtime Clock Registers
+			  Realtime Clock Registers
 
 0xFFF00000 - 0xFFF80000 - 512K PLCC32 BootRom
-                          (AMD AM29F040, ST 29W040B)
+			  (AMD AM29F040, ST 29W040B)
 
 0xFFF00100 -              System Reset Vector
 
@@ -131,7 +131,6 @@
 - DOC Support - (underway)
 
 
-
 U-Boot 1.2.0 (Aug  6 2002 - 17:44:48)
 
 CPU:   MPC8245 Revision 16.20 at 264 MHz: 16 kB I-Cache 16 kB D-Cache
@@ -167,15 +166,10 @@
 =>boot
 
 
-
-
-
-
-
 DevTools
 ========
 ELDK
-        DENX Embedded Linux Development Kit
+	DENX Embedded Linux Development Kit
 
 ROM Emulator
 	Grammar Engine PROMICE P1160-90-AI21E (2MBx8bit, 90ns access time)
@@ -187,7 +181,6 @@
 	WRS/EST VisionICE-II (PPC8240)
 
 
-
 =>reset
 
 
@@ -216,8 +209,8 @@
 Filename 'vmlinux.img'.
 Load address: 0x100000
 Loading: #################################################################
-         ####################################T #############################
-         ######################
+	 ####################################T #############################
+	 ######################
 done
 Bytes transferred = 777199 (bdbef hex)
 
@@ -317,7 +310,6 @@
 MPC8245/BMW
 
 
-
 switch-2 login: root
 Password:
 PAM_unix[49]: (login) session opened for user root by LOGIN(uid=0)
@@ -328,7 +320,6 @@
 MPC8245/BMW
 
 
-
 login[49]: ROOT LOGIN on `console'
 
 root@switch-2:~# cat /proc/cpuinfo

diff --git a/board/bmw/bmw.c b/board/bmw/bmw.c
index 2685662..f2d33fc 100644
--- a/board/bmw/bmw.c
+++ b/board/bmw/bmw.c

@@ -94,9 +94,6 @@
 }
 
 
-
-
-
 /*
  * Initialize PCI Devices, report devices found.
  */

diff --git a/board/bmw/bmw.h b/board/bmw/bmw.h
index 6b7571c..dd97569 100644
--- a/board/bmw/bmw.h
+++ b/board/bmw/bmw.h

@@ -46,13 +46,13 @@
 #define LED_REG_BASE		(XROM_BASE_ADDR | 0x2000)
 #define TOD_BASE		(XROM_BASE_ADDR | 0x4000)
 #define LED_REG(x)              (*(volatile unsigned char *) \
-                                  (LED_REG_BASE + (x)))
+				  (LED_REG_BASE + (x)))
 #define XROM_DEV_SIZE		0x00006000
 
 #define ENET_DEV_BASE		0x80000000
 
 #define PLD_REG(off)		(*(volatile unsigned char *)\
-                                  (PLD_REG_BASE + (off)))
+				  (PLD_REG_BASE + (off)))
 
 #define PLD_REVID_B1		0x7f	/* Fix me */
 #define PLD_REVID_B2		0x01	/* Fix me */

diff --git a/board/bmw/config.mk b/board/bmw/config.mk
index 7facadf..f991549 100644
--- a/board/bmw/config.mk
+++ b/board/bmw/config.mk

@@ -28,5 +28,5 @@
 TEXT_BASE = 0xFFF00000
 # NOTE: The flags below affect how the BCM570x driver is compiled
 PLATFORM_CPPFLAGS += -DEMBEDDED -DBIG_ENDIAN_HOST -DINCLUDE_5701_AX_FIX=1\
-                     -DDBG=0 -DT3_JUMBO_RCV_RCB_ENTRY_COUNT=256\
-                     -DTEXT_BASE=$(TEXT_BASE)
+		     -DDBG=0 -DT3_JUMBO_RCV_RCB_ENTRY_COUNT=256\
+		     -DTEXT_BASE=$(TEXT_BASE)

diff --git a/board/bmw/early_init.S b/board/bmw/early_init.S
index ec20a67..e6400c3 100644
--- a/board/bmw/early_init.S
+++ b/board/bmw/early_init.S

@@ -16,7 +16,7 @@
 	.global	iommu_setup
 	/* Initialize IO/MMU mappings via BAT method Ch. 7,
 	 * PPC Programming Reference
-         */
+	 */
 iommu_setup:
 
 /* initialize the BAT registers (SPRs 528 - 543 */
@@ -64,7 +64,7 @@
    BAT marked valid that is in an unknown or transient state
 */
 
-        addis   r5,0,0x0000
+	addis   r5,0,0x0000
 	mtibat0u(r5)
 	mtibat0l(r5)
 	mtibat1u(r5)
@@ -81,106 +81,106 @@
 	mtdbat2l(r5)
 	mtdbat3u(r5)
 	mtdbat3l(r5)
-        isync
+	isync
 
 /*
  *  Set up I/D BAT0
  */
-        lis     r4, CFG_DBAT0L@h
-        ori     r4, r4, CFG_DBAT0L@l
-        lis     r3, CFG_DBAT0U@h
-        ori     r3, r3, CFG_DBAT0U@l
+	lis     r4, CFG_DBAT0L@h
+	ori     r4, r4, CFG_DBAT0L@l
+	lis     r3, CFG_DBAT0U@h
+	ori     r3, r3, CFG_DBAT0U@l
 
-        mtdbat0l(r4)
-        isync
-        mtdbat0u(r3)
-        isync
-        sync
+	mtdbat0l(r4)
+	isync
+	mtdbat0u(r3)
+	isync
+	sync
 
-        lis     r4, CFG_IBAT0L@h
-        ori     r4, r4, CFG_IBAT0L@l
-        lis     r3, CFG_IBAT0U@h
-        ori     r3, r3, CFG_IBAT0U@l
+	lis     r4, CFG_IBAT0L@h
+	ori     r4, r4, CFG_IBAT0L@l
+	lis     r3, CFG_IBAT0U@h
+	ori     r3, r3, CFG_IBAT0U@l
 
-        isync
-        mtibat0l(r4)
-        isync
+	isync
+	mtibat0l(r4)
+	isync
 	mtibat0u(r3)
-        isync
+	isync
 
 /*
  *  Set up I/D BAT1
  */
-        lis     r4, CFG_IBAT1L@h
-        ori     r4, r4, CFG_IBAT1L@l
-        lis     r3, CFG_IBAT1U@h
-        ori     r3, r3, CFG_IBAT1U@l
+	lis     r4, CFG_IBAT1L@h
+	ori     r4, r4, CFG_IBAT1L@l
+	lis     r3, CFG_IBAT1U@h
+	ori     r3, r3, CFG_IBAT1U@l
 
-        isync
-        mtibat1l(r4)
-        isync
-        mtibat1u(r3)
-        isync
-        mtdbat1l(r4)
-        isync
-        mtdbat1u(r3)
-        isync
-        sync
+	isync
+	mtibat1l(r4)
+	isync
+	mtibat1u(r3)
+	isync
+	mtdbat1l(r4)
+	isync
+	mtdbat1u(r3)
+	isync
+	sync
 
 /*
  *  Set up I/D BAT2
  */
-        lis     r4, CFG_IBAT2L@h
-        ori     r4, r4, CFG_IBAT2L@l
-        lis     r3, CFG_IBAT2U@h
-        ori     r3, r3, CFG_IBAT2U@l
+	lis     r4, CFG_IBAT2L@h
+	ori     r4, r4, CFG_IBAT2L@l
+	lis     r3, CFG_IBAT2U@h
+	ori     r3, r3, CFG_IBAT2U@l
 
-        isync
-        mtibat2l(r4)
-        isync
-        mtibat2u(r3)
-        isync
-        mtdbat2l(r4)
-        isync
-        mtdbat2u(r3)
-        isync
-        sync
+	isync
+	mtibat2l(r4)
+	isync
+	mtibat2u(r3)
+	isync
+	mtdbat2l(r4)
+	isync
+	mtdbat2u(r3)
+	isync
+	sync
 
 /*
  *  Setup I/D BAT3
  */
-        lis     r4, CFG_IBAT3L@h
-        ori     r4, r4, CFG_IBAT3L@l
-        lis     r3, CFG_IBAT3U@h
-        ori     r3, r3, CFG_IBAT3U@l
+	lis     r4, CFG_IBAT3L@h
+	ori     r4, r4, CFG_IBAT3L@l
+	lis     r3, CFG_IBAT3U@h
+	ori     r3, r3, CFG_IBAT3U@l
 
-        isync
-        mtibat3l(r4)
-        isync
-        mtibat3u(r3)
-        isync
-        mtdbat3l(r4)
-        isync
-        mtdbat3u(r3)
-        isync
-        sync
+	isync
+	mtibat3l(r4)
+	isync
+	mtibat3u(r3)
+	isync
+	mtdbat3l(r4)
+	isync
+	mtdbat3u(r3)
+	isync
+	sync
 
 
 /*
  *  Invalidate all 64 TLB's
  */
-        lis     r3, 0
-        mtctr   r3
-        lis     r5, 4
+	lis     r3, 0
+	mtctr   r3
+	lis     r5, 4
 
 tlblp:
-        tlbie   r3
-        sync
-        addi    r3, r3, 0x1000
-        cmplw   r3, r5
-        blt     tlblp
+	tlbie   r3
+	sync
+	addi    r3, r3, 0x1000
+	cmplw   r3, r5
+	blt     tlblp
 
-        sync
+	sync
 
 /*
  *  Enable Data Translation
@@ -193,7 +193,7 @@
 	isync
 	sync
 
-        blr
+	blr
 
 
 #ifdef USE_V2_INIT
@@ -213,8 +213,8 @@
 /* MPC8245/BMW CPCI System Init
  * Jimmy Blair, Broadcom Corp, 2002.
  */
-        mflr    r11
- 	/* Zero-out registers */
+	mflr    r11
+	/* Zero-out registers */
 
 	addis	r0,r0,0
 	mtspr	SPRG0,r0
@@ -244,7 +244,7 @@
 	/* Set MPU/MSR to a known state. Turn off FP */
 
 #if 1	/* Turn off floating point (remove to keep FP on) */
-        andi.	r3, r3, 0
+	andi.	r3, r3, 0
 	sync
 	mtmsr 	r3
 	isync
@@ -368,10 +368,10 @@
 	rlwinm	r3, r4, 0, 21, 19	/* clear the ICFI bit */
 
 	/*
-         * The setting of the instruction cache enable (ICE) bit must be
-         * preceded by an isync instruction to prevent the cache from being
-         * enabled or disabled while an instruction access is in progress.
-         */
+	 * The setting of the instruction cache enable (ICE) bit must be
+	 * preceded by an isync instruction to prevent the cache from being
+	 * enabled or disabled while an instruction access is in progress.
+	 */
 	isync
 writeReg4:
 	mtspr	HID0, r4		/* Enable Instr Cache & Inval cache */
@@ -397,13 +397,13 @@
 	cmp	0,0,r3,r7
 	beq	cr0, X4_KAHLUA_START
 
-        /* It's not an 8240, is it an 8245? */
+	/* It's not an 8240, is it an 8245? */
 
 	LOADPTR (r7, KAHLUA2_ID)	/* Kahlua PCI controller ID */
 	cmp	0,0,r3,r7
 	beq	cr0, X4_KAHLUA_START
 
-        /* Save the PCI controller type in r7 */
+	/* Save the PCI controller type in r7 */
 	mr	r7, r3
 
 	LOADPTR (r5, PREP_REG_ADDR)
@@ -433,33 +433,33 @@
 
 	LOADPTR (r3, PROC_INT2_ADR)	/* Processor I/F Config 2 reg. */
 	stwbrx	r3,0,r5
-        lis	r4, 0x2000		/* Flush PCI config writes */
+	lis	r4, 0x2000		/* Flush PCI config writes */
 	stwbrx	r4,0,r6
 
 	LOADPTR (r9, KAHLUA2_ID)
-        cmpl	0, 0, r7, r9
-        bne     L1not8245
+	cmpl	0, 0, r7, r9
+	bne     L1not8245
 
-        /* MIOCR1 -- turn on bit for DLL delay */
+	/* MIOCR1 -- turn on bit for DLL delay */
 
 	LOADPTR (r3, MIOCR1_ADR_X)
 	stwbrx	r3,0,r5
-        li      r4, 0x04
+	li      r4, 0x04
 	stb	r4, MIOCR1_SHIFT(r6)
 
-        /* For the MPC8245, set register 77 to %00100000 (see Errata #15) */
-        /* SDRAM_CLK_DEL (0x77)*/
+	/* For the MPC8245, set register 77 to %00100000 (see Errata #15) */
+	/* SDRAM_CLK_DEL (0x77)*/
 
 	LOADPTR (r3, MIOCR2_ADR_X)
 	stwbrx	r3,0,r5
-        li      r4, 0x10
+	li      r4, 0x10
 	stb	r4, MIOCR2_SHIFT(r6)
 
-        /* PMCR2 -- set PCI hold delay to <10>b for 33 MHz */
+	/* PMCR2 -- set PCI hold delay to <10>b for 33 MHz */
 
 	LOADPTR (r3, PMCR2_ADR_X)
 	stwbrx	r3,0,r5
-        li      r4, 0x20
+	li      r4, 0x20
 	stb	r4, PMCR2_SHIFT(r6)
 
 	/* Initialize EUMBBAR early since 8245 has internal UART in EUMB */
@@ -471,21 +471,21 @@
 
 L1not8245:
 
-        /* Toggle the DLL reset bit in AMBOR */
+	/* Toggle the DLL reset bit in AMBOR */
 
 	LOADPTR (r3, AMBOR)
 	stwbrx	r3,0,r5
 	lbz	r4, 0(r6)
 
-        andi.   r4, r4, 0xdf
+	andi.   r4, r4, 0xdf
 	stb	r4, 0(r6)		/* Clear DLL_RESET */
-        sync
+	sync
 
-        ori     r4, r4, 0x20		/* Set DLL_RESET */
+	ori     r4, r4, 0x20		/* Set DLL_RESET */
 	stb	r4, 0(r6)
-        sync
+	sync
 
-        andi.   r4, r4, 0xdf
+	andi.   r4, r4, 0xdf
 	stb	r4, 0(r6)		/* Clear DLL_RESET */
 
 
@@ -533,10 +533,10 @@
 		MC1_MEMGO << 19 | MC1_SREN << 18 | \
 		MC1_RAM_TYPE << 17 | MC1_PCKEN << 16 )
 	li	r3, MC1_BANKBITS
-        cmpl	0, 0, r7, r9		/* Check for Kahlua2 */
-        bne     BankBitsAdd
-        cmpli   0, 0, r3, 0x5555
-        beq     K2BankBitsHack		/* On 8245, 5555 ==> 0 */
+	cmpl	0, 0, r7, r9		/* Check for Kahlua2 */
+	bne     BankBitsAdd
+	cmpli   0, 0, r3, 0x5555
+	beq     K2BankBitsHack		/* On 8245, 5555 ==> 0 */
 BankBitsAdd:
 	ori	r4, r3, 0
 K2BankBitsHack:
@@ -569,9 +569,9 @@
 		MC2_INLRD_PARECC_CHK_EN << 18 | \
 		MC2_ECC_EN << 17 | MC2_EDO << 16 | \
 		MC2_REFINT << 2 | MC2_RSV_PG << 1 | MC2_RMW_PAR)
-        cmpl	0, 0, r7, r9		/* Check for Kahlua2 */
-        bne     notK2
-        /* clear Kahlua2 reserved bits */
+	cmpl	0, 0, r7, r9		/* Check for Kahlua2 */
+	bne     notK2
+	/* clear Kahlua2 reserved bits */
 	LOADPTR (r3, 0xfffcffff)
 	and	r4, r4, r3
 notK2:
@@ -599,9 +599,9 @@
 		MC3_RDLAT << 20 | MC3_CPX << 19 | \
 		MC3_RAS6P << 15 | MC3_CAS5 << 12 | MC3_CP4 << 9 | \
 		MC3_CAS3 << 6 | MC3_RCD2 << 3 | MC3_RP1)
-        cmpl	0, 0, r7, r9              /* Check for Kahlua2 */
-        bne     notK2b
-        /* clear Kahlua2 reserved bits */
+	cmpl	0, 0, r7, r9              /* Check for Kahlua2 */
+	bne     notK2b
+	/* clear Kahlua2 reserved bits */
 	LOADPTR (r3, 0xff000000)
 	and	r4, r4, r3
 notK2b:
@@ -633,9 +633,9 @@
 		MC4_REGDIMM << 15 | MC4_SDMODE_CAS << 12 | \
 		MC4_SDMODE_WRAP << 11 | MC4_SDMODE_BURST << 8 | \
 		MC4_ACTORW << 4 | MC4_BSTOPRE_L)
-        cmpl	0, 0, r7, r9                /* Check for Kahlua 2 */
-        bne     notK2c
-        /* Turn on Kahlua2 extended ROM space */
+	cmpl	0, 0, r7, r9                /* Check for Kahlua 2 */
+	bne     notK2c
+	/* Turn on Kahlua2 extended ROM space */
 	LOADPTR (r3, 0x00200000)
 	or	r4, r4, r3
 notK2c:
@@ -745,13 +745,12 @@
 
 	sync
 	eieio
-        mtlr    r11
+	mtlr    r11
 	blr
 
 #else /* USE_V2_INIT */
 
 
-
 /* U-Boot works, but memory will not run reliably for all address ranges.
  * Early U-Boot Working init, but 2.4.19 kernel will crash since memory is not
  * initialized correctly. Could work if debugged.
@@ -898,106 +897,106 @@
 .globl  early_init_f
 
 early_init_f:
-        mflr    r11
-        lis     r10, 0x8000
+	mflr    r11
+	lis     r10, 0x8000
 
-        /* PCI Latency Timer */
-        li      r4, 0x0d
-        ori     r3, r10, PLTR@l
-        bl      __pci_config_write_8
+	/* PCI Latency Timer */
+	li      r4, 0x0d
+	ori     r3, r10, PLTR@l
+	bl      __pci_config_write_8
 
-        /* Cache Line Size */
-        li      r4, 0x08
-        ori     r3, r10, PCLSR@l
-        bl      __pci_config_write_8
+	/* Cache Line Size */
+	li      r4, 0x08
+	ori     r3, r10, PCLSR@l
+	bl      __pci_config_write_8
 
-        /* PCI Cmd */
-        li      r4, 6
-        ori     r3, r10, PCICR@l
-        bl      __pci_config_write_16
+	/* PCI Cmd */
+	li      r4, 6
+	ori     r3, r10, PCICR@l
+	bl      __pci_config_write_16
 
 #if 1
-        /* PCI Stat */
-        ori     r3, r10, PCISR@l
-        bl      __pci_config_read_16
-        ori     r4, r4, 0xffff
-        ori     r3, r10, PCISR@l
-        bl      __pci_config_write_16
+	/* PCI Stat */
+	ori     r3, r10, PCISR@l
+	bl      __pci_config_read_16
+	ori     r4, r4, 0xffff
+	ori     r3, r10, PCISR@l
+	bl      __pci_config_write_16
 #endif
 
-        /* PICR1 */
-        lis     r4, 0xff14
-        ori     r4, r4, 0x1b98
-        ori     r3, r10, PICR1@l
-        bl      __pci_config_write_32
+	/* PICR1 */
+	lis     r4, 0xff14
+	ori     r4, r4, 0x1b98
+	ori     r3, r10, PICR1@l
+	bl      __pci_config_write_32
 
 
-        /* PICR2 */
-        lis     r4, 0x0404
-        ori     r4, r4, 0x0004
-        ori     r3, r10, PICR2@l
-        bl      __pci_config_write_32
+	/* PICR2 */
+	lis     r4, 0x0404
+	ori     r4, r4, 0x0004
+	ori     r3, r10, PICR2@l
+	bl      __pci_config_write_32
 
 	/* MIOCR1 */
-        li      r4, 0x04
-        ori     r3, r10, MIOCR1@l
-        bl      __pci_config_write_8
+	li      r4, 0x04
+	ori     r3, r10, MIOCR1@l
+	bl      __pci_config_write_8
 
 	/* For the MPC8245, set register 77 to %00100000 (see Errata #15) */
 	/* SDRAM_CLK_DEL (0x77)*/
-        li      r4, 0x10
-        ori     r3, r10, MIOCR2@l
-        bl      __pci_config_write_8
+	li      r4, 0x10
+	ori     r3, r10, MIOCR2@l
+	bl      __pci_config_write_8
 
-        /* EUMBBAR */
-        lis     r4, 0xfc00
-        ori     r3, r10, EUMBBAR@l
-        bl      __pci_config_write_32
+	/* EUMBBAR */
+	lis     r4, 0xfc00
+	ori     r3, r10, EUMBBAR@l
+	bl      __pci_config_write_32
 
 	/* AMBOR */
 
        /* Even if Address Map B is not being used (though it should),
-        * the memory DLL needs to be cleared/set/cleared before using memory.
+	* the memory DLL needs to be cleared/set/cleared before using memory.
 	*/
 
-        ori     r3, r10, AMBOR@l
-        bl      __pci_config_read_8	/* get Current bits */
+	ori     r3, r10, AMBOR@l
+	bl      __pci_config_read_8	/* get Current bits */
 
-        andi.   r4, r4, 0xffdf
-        ori     r3, r10, AMBOR@l
-        bl      __pci_config_write_16	/* Clear DLL_RESET */
+	andi.   r4, r4, 0xffdf
+	ori     r3, r10, AMBOR@l
+	bl      __pci_config_write_16	/* Clear DLL_RESET */
 
-        ori    r4, r4, 0x0020
-        ori     r3, r10, AMBOR@l
-        bl      __pci_config_write_16	/* Set DLL_RESET */
+	ori    r4, r4, 0x0020
+	ori     r3, r10, AMBOR@l
+	bl      __pci_config_write_16	/* Set DLL_RESET */
 
-        andi.   r4, r4, 0xffdf
-        ori     r3, r10, AMBOR@l
-        bl      __pci_config_write_16	/* Clear DLL_RESET */
+	andi.   r4, r4, 0xffdf
+	ori     r3, r10, AMBOR@l
+	bl      __pci_config_write_16	/* Clear DLL_RESET */
 
-        /* ERCR1 */
-        lis     r4, 0x8040		/* Enable RCS2, use supplied timings */
-        ori     r4, r4, 0x8000
-        ori     r3, r10, ERCR1@l
-        bl      __pci_config_write_32
+	/* ERCR1 */
+	lis     r4, 0x8040		/* Enable RCS2, use supplied timings */
+	ori     r4, r4, 0x8000
+	ori     r3, r10, ERCR1@l
+	bl      __pci_config_write_32
 
-        /* ERCR2 */
-        lis     r4, 0x0000		/* Disable RCS3 parms */
-        ori     r4, r4, 0x0000
-        ori     r3, r10, ERCR2@l
-        bl      __pci_config_write_32
+	/* ERCR2 */
+	lis     r4, 0x0000		/* Disable RCS3 parms */
+	ori     r4, r4, 0x0000
+	ori     r3, r10, ERCR2@l
+	bl      __pci_config_write_32
 
-        /* ERCR3 */
-        lis     r4, 0x0000		/* RCS3 at 0x70000000, 64K bytes */
-        ori     r4, r4, 0x0004
-        ori     r3, r10, ERCR2@l
-        bl      __pci_config_write_32
+	/* ERCR3 */
+	lis     r4, 0x0000		/* RCS3 at 0x70000000, 64K bytes */
+	ori     r4, r4, 0x0004
+	ori     r3, r10, ERCR2@l
+	bl      __pci_config_write_32
 
 	/* Preserve memgo bit */
-        /* MCCR1 */
+	/* MCCR1 */
 
 /*	lis     r4, 0x75a8		/  Safe Local ROM = 11+3 clocks */
-  	lis     r4, 0x75a0              /* Safe Local ROM = 11+3 clocks */
+	lis     r4, 0x75a0              /* Safe Local ROM = 11+3 clocks */
 /*      lis     r4, 0x73a0              /  Fast Local ROM = 7+3 clocks */
 /*      oris    r4, r4, 0x0010          /  Burst ROM/Flash enable */
 /*      oris    r4, r4, 0x0004          /  Self-refresh enable */
@@ -1005,17 +1004,17 @@
 /*      ori     r4,r4,0xFFFF            /  16Mbit  2bank SDRAM */
 /*      ori     r4,r4,0xAAAA            /  256Mbit 4bank SDRAM (8245 only) */
 /*      ori     r4,r4,0x5555            /  64Mbit  2bank SDRAM */
-        ori     r4,r4,0x0000            /* 64Mbit  4bank SDRAM */
+	ori     r4,r4,0x0000            /* 64Mbit  4bank SDRAM */
 
-        ori     r3, r10, MCCR1@l
-        bl      __pci_config_write_32
+	ori     r3, r10, MCCR1@l
+	bl      __pci_config_write_32
 
-        /* MCCR2 */
+	/* MCCR2 */
 
-        lis     r4,0x0000
+	lis     r4,0x0000
 /*      oris    r4,r4,0x4000            /  TS_WAIT_TIMER = 3 clocks */
-        oris    r4,r4,0x1000            /* ASRISE = 8 clocks */
-        oris    r4,r4,0x0080            /* ASFALL = 8 clocks */
+	oris    r4,r4,0x1000            /* ASRISE = 8 clocks */
+	oris    r4,r4,0x0080            /* ASFALL = 8 clocks */
 /*      oris    r4,r4,0x0010            /  SDRAM Parity (else ECC) */
 /*      oris    r4,r4,0x0008            /  Write parity check */
 /*      oris    r4,r4,0x0004            /  SDRAM inline reads */
@@ -1030,143 +1029,142 @@
 /*      ori     r4,r4,0x150c            /  100 MHz mem bus        = 1347 */
 /*      ori     r4,r4,0x10fc            /   83 MHz mem bus        = 1087 */
 /*      ori     r4,r4,0x0cc4            /   66 MHz mem bus        =  817 */
-        ori     r4,r4,0x04cc            /*  33 MHz mem bus (SAFE) =  307 */
+	ori     r4,r4,0x04cc            /*  33 MHz mem bus (SAFE) =  307 */
 /*      ori     r4,r4,0x0002            /  Reserve a page */
 /*      ori     r4,r4,0x0001            /  RWM parity */
 
-        ori     r3, r10, MCCR2@l
-        bl      __pci_config_write_32
+	ori     r3, r10, MCCR2@l
+	bl      __pci_config_write_32
 
 
-        /* MCCR3 */
-        lis     r4,0x0000               /* BSTOPRE_M = 7 (see A/N) */
-        oris    r4,r4,0x0500            /* REFREC    = 8 clocks */
-        ori     r3, r10, MCCR3@l
-        bl      __pci_config_write_32
+	/* MCCR3 */
+	lis     r4,0x0000               /* BSTOPRE_M = 7 (see A/N) */
+	oris    r4,r4,0x0500            /* REFREC    = 8 clocks */
+	ori     r3, r10, MCCR3@l
+	bl      __pci_config_write_32
 
-        /* MCCR4 */                     /* Turn on registered buffer mode */
-        lis     r4, 0x2000              /* PRETOACT = 3 clocks */
-        oris    r4,r4,0x0400            /* ACTOPRE  = 5 clocks */
+	/* MCCR4 */                     /* Turn on registered buffer mode */
+	lis     r4, 0x2000              /* PRETOACT = 3 clocks */
+	oris    r4,r4,0x0400            /* ACTOPRE  = 5 clocks */
 /*      oris    r4,r4,0x0080            /  Enable 8-beat burst (32-bit bus) */
 /*      oris    r4,r4,0x0040            /  Enable Inline ECC/Parity */
-        oris    r4,r4,0x0020            /* EXTROM enabled */
-        oris    r4,r4,0x0010            /* Registered buffers */
+	oris    r4,r4,0x0020            /* EXTROM enabled */
+	oris    r4,r4,0x0010            /* Registered buffers */
 /*      oris    r4,r4,0x0000            /  BSTOPRE_U = 0 (see A/N) */
-        oris    r4,r4,0x0002            /* DBUS_SIZ[2] (8 bit on RCS1) */
+	oris    r4,r4,0x0002            /* DBUS_SIZ[2] (8 bit on RCS1) */
 
 /*      ori     r4,r4,0x8000            /  Registered DIMMs */
-        ori     r4,r4,0x2000            /*CAS Latency (CL=3) (see RDLAT) */
+	ori     r4,r4,0x2000            /*CAS Latency (CL=3) (see RDLAT) */
 /*      ori     r4,r4,0x2000            /  CAS Latency (CL=2) (see RDLAT) */
 /*      ori     r4,r4,0x0300            /  Sequential wrap/8-beat burst */
-        ori     r4,r4,0x0200            /* Sequential wrap/4-beat burst */
-        ori     r4,r4,0x0030            /* ACTORW  = 3 clocks */
-        ori     r4,r4,0x0009            /* BSTOPRE_L = 9 (see A/N) */
+	ori     r4,r4,0x0200            /* Sequential wrap/4-beat burst */
+	ori     r4,r4,0x0030            /* ACTORW  = 3 clocks */
+	ori     r4,r4,0x0009            /* BSTOPRE_L = 9 (see A/N) */
 
-        ori     r3, r10, MCCR4@l
-        bl      __pci_config_write_32
+	ori     r3, r10, MCCR4@l
+	bl      __pci_config_write_32
 
 	/* MSAR1 */
-        lis     r4, 0xc0804000@h
-        ori     r4, r4, 0xc0804000@l
-        ori     r3, r10, MSAR1@l
-        bl      __pci_config_write_32
+	lis     r4, 0xc0804000@h
+	ori     r4, r4, 0xc0804000@l
+	ori     r3, r10, MSAR1@l
+	bl      __pci_config_write_32
 
 	/* MSAR2 */
-        lis     r4, 0xc0804000@h
-        ori     r4, r4, 0xc0804000@l
-        ori     r3, r10, MSAR2@l
-        bl      __pci_config_write_32
+	lis     r4, 0xc0804000@h
+	ori     r4, r4, 0xc0804000@l
+	ori     r3, r10, MSAR2@l
+	bl      __pci_config_write_32
 
 	/* MESAR1 */
-        lis     r4, 0x00000000@h
-        ori     r4, r4, 0x00000000@l
-        ori     r3, r10, EMSAR1@l
-        bl      __pci_config_write_32
+	lis     r4, 0x00000000@h
+	ori     r4, r4, 0x00000000@l
+	ori     r3, r10, EMSAR1@l
+	bl      __pci_config_write_32
 
 	/* MESAR2 */
-        lis     r4, 0x01010101@h
-        ori     r4, r4, 0x01010101@l
-        ori     r3, r10, EMSAR2@l
-        bl      __pci_config_write_32
+	lis     r4, 0x01010101@h
+	ori     r4, r4, 0x01010101@l
+	ori     r3, r10, EMSAR2@l
+	bl      __pci_config_write_32
 
 	/* MEAR1 */
-        lis     r4, 0xffbf7f3f@h
-        ori     r4, r4, 0xffbf7f3f@l
-        ori     r3, r10, MEAR1@l
-        bl      __pci_config_write_32
+	lis     r4, 0xffbf7f3f@h
+	ori     r4, r4, 0xffbf7f3f@l
+	ori     r3, r10, MEAR1@l
+	bl      __pci_config_write_32
 
 	/* MEAR2 */
-        lis     r4, 0xffbf7f3f@h
-        ori     r4, r4, 0xffbf7f3f@l
-        ori     r3, r10, MEAR2@l
-        bl      __pci_config_write_32
+	lis     r4, 0xffbf7f3f@h
+	ori     r4, r4, 0xffbf7f3f@l
+	ori     r3, r10, MEAR2@l
+	bl      __pci_config_write_32
 
 	/* MEEAR1 */
-        lis     r4, 0x00000000@h
-        ori     r4, r4, 0x00000000@l
-        ori     r3, r10, EMEAR1@l
-        bl      __pci_config_write_32
+	lis     r4, 0x00000000@h
+	ori     r4, r4, 0x00000000@l
+	ori     r3, r10, EMEAR1@l
+	bl      __pci_config_write_32
 
 	/* MEEAR2 */
-        lis     r4, 0x01010101@h
-        ori     r4, r4, 0x01010101@l
-        ori     r3, r10, EMEAR2@l
-        bl      __pci_config_write_32
+	lis     r4, 0x01010101@h
+	ori     r4, r4, 0x01010101@l
+	ori     r3, r10, EMEAR2@l
+	bl      __pci_config_write_32
 
 	/* ODCR */
-        li      r4, 0x7f
-        ori     r3, r10, ODCR@l
-        bl      __pci_config_write_8
+	li      r4, 0x7f
+	ori     r3, r10, ODCR@l
+	bl      __pci_config_write_8
 
 	/* MBER */
-        li      r4, 0x01
-        ori     r3, r10, MBER@l
-        bl      __pci_config_write_8
+	li      r4, 0x01
+	ori     r3, r10, MBER@l
+	bl      __pci_config_write_8
 
-        /* Page CTR aka PGMAX */
-        li      r4, 0x32
-        ori     r3, r10, 0x70
-        bl      __pci_config_write_8
+	/* Page CTR aka PGMAX */
+	li      r4, 0x32
+	ori     r3, r10, 0x70
+	bl      __pci_config_write_8
 
 #if 0
 	/* CLK Drive */
-        ori     r4, r10, 0xfc01 /* Top bit will be ignored */
-        ori     r3, r10, 0x74
-        bl      __pci_config_write_16
+	ori     r4, r10, 0xfc01 /* Top bit will be ignored */
+	ori     r3, r10, 0x74
+	bl      __pci_config_write_16
 #endif
 
 	/* delay */
-        lis     r7, 1
-        mtctr   r7
+	lis     r7, 1
+	mtctr   r7
 label1: 	bdnz    label1
 
-        /* Set memgo bit */
-        /* MCCR1 */
-        ori     r3, r10, MCCR1@l
-        bl      __pci_config_read_32
-        lis	r7, 0x0008
-        or	r4, r3, r7
-        ori     r3, r10, MCCR1@l
-        bl      __pci_config_write_32
+	/* Set memgo bit */
+	/* MCCR1 */
+	ori     r3, r10, MCCR1@l
+	bl      __pci_config_read_32
+	lis	r7, 0x0008
+	or	r4, r3, r7
+	ori     r3, r10, MCCR1@l
+	bl      __pci_config_write_32
 
 	/* delay again */
-        lis     r7, 1
-        mtctr   r7
+	lis     r7, 1
+	mtctr   r7
 label2: 	bdnz    label2
 #if 0
 /* DEBUG: Infinite loop, write then read */
 loop:
-        lis     r7, 0xffff
-        mtctr   r7
-        li	r3, 0x5004
-        lis	r4, 0xa0a0
-        ori	r4, r4, 0x5050
+	lis     r7, 0xffff
+	mtctr   r7
+	li	r3, 0x5004
+	lis	r4, 0xa0a0
+	ori	r4, r4, 0x5050
 	bl write_32_ne
-        li	r3, 0x5004
+	li	r3, 0x5004
 	bl read_32_ne
-      	bdnz    loop
+	bdnz    loop
 #endif
-        mtlr    r11
-        blr
+	mtlr    r11
+	blr
 #endif
-

diff --git a/board/bmw/flash.c b/board/bmw/flash.c
index be62274..e04af97 100644
--- a/board/bmw/flash.c
+++ b/board/bmw/flash.c

@@ -91,7 +91,6 @@
 #endif /* 0 */
 
 
-
 static unsigned long
 flash_id(unsigned char mfct, unsigned char chip)
 {
@@ -135,7 +134,6 @@
 }
 
 
-
 unsigned long
 flash_init(void)
 {
@@ -181,9 +179,9 @@
     switch(pflinfo->flash_id & FLASH_TYPEMASK)
     {
       case FLASH_AM040:
-        pflinfo->size = 0x00080000;
+	pflinfo->size = 0x00080000;
 	pflinfo->sector_count = 8;
-        for(j = 0; j < 8; j++)
+	for(j = 0; j < 8; j++)
 	{
 	  pflinfo->start[j] = base_address + 0x00010000 * j;
 	  pflinfo->protect[j] = flash[(j << 16) | 0x2];
@@ -201,16 +199,16 @@
 	  pflinfo->start[j+3] = base_address + 0x00010000 * j;
 	}
 #if 0
-        /* check for protected sectors */
-        for (j = 0; j < pflinfo->sector_count; j++) {
-          /* read sector protection at sector address, (A7 .. A0) = 0x02 */
-          /* D0 = 1 if protected */
-          addr2 = (volatile FLASH_WORD_SIZE *)(pflinfo->start[j]);
-            if (pflinfo->flash_id & FLASH_MAN_SST)
-              pflinfo->protect[j] = 0;
-            else
-              pflinfo->protect[j] = addr2[2] & 1;
-        }
+	/* check for protected sectors */
+	for (j = 0; j < pflinfo->sector_count; j++) {
+	  /* read sector protection at sector address, (A7 .. A0) = 0x02 */
+	  /* D0 = 1 if protected */
+	  addr2 = (volatile FLASH_WORD_SIZE *)(pflinfo->start[j]);
+	    if (pflinfo->flash_id & FLASH_MAN_SST)
+	      pflinfo->protect[j] = 0;
+	    else
+	      pflinfo->protect[j] = addr2[2] & 1;
+	}
 #endif
 	break;
     }
@@ -245,30 +243,30 @@
     int i;
 
     /* set up sector start address table */
-        if (info->flash_id & FLASH_MAN_SST)
-          {
-            for (i = 0; i < info->sector_count; i++)
-              info->start[i] = base + (i * 0x00010000);
-          }
-        else
+	if (info->flash_id & FLASH_MAN_SST)
+	  {
+	    for (i = 0; i < info->sector_count; i++)
+	      info->start[i] = base + (i * 0x00010000);
+	  }
+	else
     if (info->flash_id & FLASH_BTYPE) {
-        /* set sector offsets for bottom boot block type    */
-        info->start[0] = base + 0x00000000;
-        info->start[1] = base + 0x00004000;
-        info->start[2] = base + 0x00006000;
-        info->start[3] = base + 0x00008000;
-        for (i = 4; i < info->sector_count; i++) {
-            info->start[i] = base + (i * 0x00010000) - 0x00030000;
-        }
+	/* set sector offsets for bottom boot block type    */
+	info->start[0] = base + 0x00000000;
+	info->start[1] = base + 0x00004000;
+	info->start[2] = base + 0x00006000;
+	info->start[3] = base + 0x00008000;
+	for (i = 4; i < info->sector_count; i++) {
+	    info->start[i] = base + (i * 0x00010000) - 0x00030000;
+	}
     } else {
-        /* set sector offsets for top boot block type       */
-        i = info->sector_count - 1;
-        info->start[i--] = base + info->size - 0x00004000;
-        info->start[i--] = base + info->size - 0x00006000;
-        info->start[i--] = base + info->size - 0x00008000;
-        for (; i >= 0; i--) {
-            info->start[i] = base + i * 0x00010000;
-        }
+	/* set sector offsets for top boot block type       */
+	i = info->sector_count - 1;
+	info->start[i--] = base + info->size - 0x00004000;
+	info->start[i--] = base + info->size - 0x00006000;
+	info->start[i--] = base + info->size - 0x00008000;
+	for (; i >= 0; i--) {
+	    info->start[i] = base + i * 0x00010000;
+	}
     }
 
 }
@@ -367,7 +365,7 @@
    short i;
     FLASH_WORD_SIZE value;
     ulong base = (ulong)addr;
-        volatile FLASH_WORD_SIZE *addr2 = (FLASH_WORD_SIZE *)addr;
+	volatile FLASH_WORD_SIZE *addr2 = (FLASH_WORD_SIZE *)addr;
 
     printf("flash_get_size: \n");
     /* Write auto select command: read Manufacturer ID */
@@ -379,123 +377,123 @@
 
     switch (value) {
     case (FLASH_WORD_SIZE)AMD_MANUFACT:
-        info->flash_id = FLASH_MAN_AMD;
-        break;
+	info->flash_id = FLASH_MAN_AMD;
+	break;
     case (FLASH_WORD_SIZE)FUJ_MANUFACT:
-        info->flash_id = FLASH_MAN_FUJ;
-        break;
+	info->flash_id = FLASH_MAN_FUJ;
+	break;
     case (FLASH_WORD_SIZE)SST_MANUFACT:
-        info->flash_id = FLASH_MAN_SST;
-        break;
+	info->flash_id = FLASH_MAN_SST;
+	break;
     default:
-        info->flash_id = FLASH_UNKNOWN;
-        info->sector_count = 0;
-        info->size = 0;
-        return (0);         /* no or unknown flash  */
+	info->flash_id = FLASH_UNKNOWN;
+	info->sector_count = 0;
+	info->size = 0;
+	return (0);         /* no or unknown flash  */
     }
     printf("recognised manufacturer");
 
     value = addr2[ADDR3];          /* device ID        */
-        debug ("\ndev_code=%x\n", value);
+	debug ("\ndev_code=%x\n", value);
 
     switch (value) {
     case (FLASH_WORD_SIZE)AMD_ID_LV400T:
-        info->flash_id += FLASH_AM400T;
-        info->sector_count = 11;
-        info->size = 0x00080000;
-        break;              /* => 0.5 MB        */
+	info->flash_id += FLASH_AM400T;
+	info->sector_count = 11;
+	info->size = 0x00080000;
+	break;              /* => 0.5 MB        */
 
     case (FLASH_WORD_SIZE)AMD_ID_LV400B:
-        info->flash_id += FLASH_AM400B;
-        info->sector_count = 11;
-        info->size = 0x00080000;
-        break;              /* => 0.5 MB        */
+	info->flash_id += FLASH_AM400B;
+	info->sector_count = 11;
+	info->size = 0x00080000;
+	break;              /* => 0.5 MB        */
 
     case (FLASH_WORD_SIZE)AMD_ID_LV800T:
-        info->flash_id += FLASH_AM800T;
-        info->sector_count = 19;
-        info->size = 0x00100000;
-        break;              /* => 1 MB      */
+	info->flash_id += FLASH_AM800T;
+	info->sector_count = 19;
+	info->size = 0x00100000;
+	break;              /* => 1 MB      */
 
     case (FLASH_WORD_SIZE)AMD_ID_LV800B:
-        info->flash_id += FLASH_AM800B;
-        info->sector_count = 19;
-        info->size = 0x00100000;
-        break;              /* => 1 MB      */
+	info->flash_id += FLASH_AM800B;
+	info->sector_count = 19;
+	info->size = 0x00100000;
+	break;              /* => 1 MB      */
 
     case (FLASH_WORD_SIZE)AMD_ID_LV160T:
-        info->flash_id += FLASH_AM160T;
-        info->sector_count = 35;
-        info->size = 0x00200000;
-        break;              /* => 2 MB      */
+	info->flash_id += FLASH_AM160T;
+	info->sector_count = 35;
+	info->size = 0x00200000;
+	break;              /* => 2 MB      */
 
     case (FLASH_WORD_SIZE)AMD_ID_LV160B:
-        info->flash_id += FLASH_AM160B;
-        info->sector_count = 35;
-        info->size = 0x00200000;
-        break;              /* => 2 MB      */
+	info->flash_id += FLASH_AM160B;
+	info->sector_count = 35;
+	info->size = 0x00200000;
+	break;              /* => 2 MB      */
 
     case (FLASH_WORD_SIZE)SST_ID_xF800A:
-        info->flash_id += FLASH_SST800A;
-        info->sector_count = 16;
-        info->size = 0x00100000;
-        break;              /* => 1 MB      */
+	info->flash_id += FLASH_SST800A;
+	info->sector_count = 16;
+	info->size = 0x00100000;
+	break;              /* => 1 MB      */
 
     case (FLASH_WORD_SIZE)SST_ID_xF160A:
-        info->flash_id += FLASH_SST160A;
-        info->sector_count = 32;
-        info->size = 0x00200000;
-        break;              /* => 2 MB      */
+	info->flash_id += FLASH_SST160A;
+	info->sector_count = 32;
+	info->size = 0x00200000;
+	break;              /* => 2 MB      */
 
     case (FLASH_WORD_SIZE)AMD_ID_F040B:
-        info->flash_id += FLASH_AM040;
-        info->sector_count = 8;
-        info->size = 0x00080000;
-        break;              /* => 0.5 MB      */
+	info->flash_id += FLASH_AM040;
+	info->sector_count = 8;
+	info->size = 0x00080000;
+	break;              /* => 0.5 MB      */
 
     default:
-        info->flash_id = FLASH_UNKNOWN;
-        return (0);         /* => no or unknown flash */
+	info->flash_id = FLASH_UNKNOWN;
+	return (0);         /* => no or unknown flash */
 
     }
 
     printf("flash id %lx; sector count %x, size %lx\n", info->flash_id,info->sector_count,info->size);
     /* set up sector start address table */
-        if (info->flash_id & FLASH_MAN_SST)
-          {
-            for (i = 0; i < info->sector_count; i++)
-              info->start[i] = base + (i * 0x00010000);
-          }
-        else
+	if (info->flash_id & FLASH_MAN_SST)
+	  {
+	    for (i = 0; i < info->sector_count; i++)
+	      info->start[i] = base + (i * 0x00010000);
+	  }
+	else
     if (info->flash_id & FLASH_BTYPE) {
-        /* set sector offsets for bottom boot block type    */
-        info->start[0] = base + 0x00000000;
-        info->start[1] = base + 0x00004000;
-        info->start[2] = base + 0x00006000;
-        info->start[3] = base + 0x00008000;
-        for (i = 4; i < info->sector_count; i++) {
-            info->start[i] = base + (i * 0x00010000) - 0x00030000;
-        }
+	/* set sector offsets for bottom boot block type    */
+	info->start[0] = base + 0x00000000;
+	info->start[1] = base + 0x00004000;
+	info->start[2] = base + 0x00006000;
+	info->start[3] = base + 0x00008000;
+	for (i = 4; i < info->sector_count; i++) {
+	    info->start[i] = base + (i * 0x00010000) - 0x00030000;
+	}
     } else {
-        /* set sector offsets for top boot block type       */
-        i = info->sector_count - 1;
-        info->start[i--] = base + info->size - 0x00004000;
-        info->start[i--] = base + info->size - 0x00006000;
-        info->start[i--] = base + info->size - 0x00008000;
-        for (; i >= 0; i--) {
-            info->start[i] = base + i * 0x00010000;
-        }
+	/* set sector offsets for top boot block type       */
+	i = info->sector_count - 1;
+	info->start[i--] = base + info->size - 0x00004000;
+	info->start[i--] = base + info->size - 0x00006000;
+	info->start[i--] = base + info->size - 0x00008000;
+	for (; i >= 0; i--) {
+	    info->start[i] = base + i * 0x00010000;
+	}
     }
 
     /* check for protected sectors */
     for (i = 0; i < info->sector_count; i++) {
-        /* read sector protection at sector address, (A7 .. A0) = 0x02 */
-        /* D0 = 1 if protected */
-        addr2 = (volatile FLASH_WORD_SIZE *)(info->start[i]);
-                if (info->flash_id & FLASH_MAN_SST)
-                  info->protect[i] = 0;
-                else
-                  info->protect[i] = addr2[2] & 1;
+	/* read sector protection at sector address, (A7 .. A0) = 0x02 */
+	/* D0 = 1 if protected */
+	addr2 = (volatile FLASH_WORD_SIZE *)(info->start[i]);
+		if (info->flash_id & FLASH_MAN_SST)
+		  info->protect[i] = 0;
+		else
+		  info->protect[i] = addr2[2] & 1;
     }
 
     /*
@@ -503,7 +501,7 @@
      */
     if (info->flash_id != FLASH_UNKNOWN) {
        addr2 = (FLASH_WORD_SIZE *)info->start[0];
-        *addr2 = (FLASH_WORD_SIZE)0x00F000F0;   /* reset bank */
+	*addr2 = (FLASH_WORD_SIZE)0x00F000F0;   /* reset bank */
     }
 
     return (info->size);
@@ -521,32 +519,32 @@
     unsigned char sh8b;
 
     if ((s_first < 0) || (s_first > s_last)) {
-        if (info->flash_id == FLASH_UNKNOWN) {
-            printf ("- missing\n");
-        } else {
-            printf ("- no sectors to erase\n");
-        }
-        return 1;
+	if (info->flash_id == FLASH_UNKNOWN) {
+	    printf ("- missing\n");
+	} else {
+	    printf ("- no sectors to erase\n");
+	}
+	return 1;
     }
 
     if ((info->flash_id == FLASH_UNKNOWN) ||
-        (info->flash_id > (FLASH_MAN_STM | FLASH_AMD_COMP))) {
-        printf ("Can't erase unknown flash type - aborted\n");
-        return 1;
+	(info->flash_id > (FLASH_MAN_STM | FLASH_AMD_COMP))) {
+	printf ("Can't erase unknown flash type - aborted\n");
+	return 1;
     }
 
     prot = 0;
     for (sect=s_first; sect<=s_last; ++sect) {
-        if (info->protect[sect]) {
-            prot++;
-        }
+	if (info->protect[sect]) {
+	    prot++;
+	}
     }
 
     if (prot) {
-        printf ("- Warning: %d protected sectors will not be erased!\n",
-            prot);
+	printf ("- Warning: %d protected sectors will not be erased!\n",
+	    prot);
     } else {
-        printf ("\n");
+	printf ("\n");
     }
 
     l_sect = -1;
@@ -568,28 +566,28 @@
 
     /* Start erase on unprotected sectors */
     for (sect = s_first; sect<=s_last; sect++) {
-        if (info->protect[sect] == 0) { /* not protected */
-            addr = (FLASH_WORD_SIZE *)(info->start[0] + (
+	if (info->protect[sect] == 0) { /* not protected */
+	    addr = (FLASH_WORD_SIZE *)(info->start[0] + (
 				(info->start[sect] - info->start[0]) << sh8b));
-                        if (info->flash_id & FLASH_MAN_SST)
-                          {
-                            addr[ADDR0 << sh8b] = (FLASH_WORD_SIZE)0x00AA00AA;
-                            addr[ADDR1 << sh8b] = (FLASH_WORD_SIZE)0x00550055;
-                            addr[ADDR0 << sh8b] = (FLASH_WORD_SIZE)0x00800080;
-                            addr[ADDR0 << sh8b] = (FLASH_WORD_SIZE)0x00AA00AA;
-                            addr[ADDR1 << sh8b] = (FLASH_WORD_SIZE)0x00550055;
-                            addr[0] = (FLASH_WORD_SIZE)0x00500050;  /* block erase */
-                            udelay(30000);  /* wait 30 ms */
-                          }
-                        else
-                          addr[0] = (FLASH_WORD_SIZE)0x00300030;  /* sector erase */
-            l_sect = sect;
-        }
+			if (info->flash_id & FLASH_MAN_SST)
+			  {
+			    addr[ADDR0 << sh8b] = (FLASH_WORD_SIZE)0x00AA00AA;
+			    addr[ADDR1 << sh8b] = (FLASH_WORD_SIZE)0x00550055;
+			    addr[ADDR0 << sh8b] = (FLASH_WORD_SIZE)0x00800080;
+			    addr[ADDR0 << sh8b] = (FLASH_WORD_SIZE)0x00AA00AA;
+			    addr[ADDR1 << sh8b] = (FLASH_WORD_SIZE)0x00550055;
+			    addr[0] = (FLASH_WORD_SIZE)0x00500050;  /* block erase */
+			    udelay(30000);  /* wait 30 ms */
+			  }
+			else
+			  addr[0] = (FLASH_WORD_SIZE)0x00300030;  /* sector erase */
+	    l_sect = sect;
+	}
     }
 
     /* re-enable interrupts if necessary */
     if (flag)
-        enable_interrupts();
+	enable_interrupts();
 
     /* wait at least 80us - let's wait 1 ms */
     udelay (1000);
@@ -598,22 +596,22 @@
      * We wait for the last triggered sector
      */
     if (l_sect < 0)
-        goto DONE;
+	goto DONE;
 
     start = get_timer (0);
     last  = start;
     addr = (FLASH_WORD_SIZE *)(info->start[0] + (
 			(info->start[l_sect] - info->start[0]) << sh8b));
     while ((addr[0] & (FLASH_WORD_SIZE)0x00800080) != (FLASH_WORD_SIZE)0x00800080) {
-        if ((now = get_timer(start)) > CFG_FLASH_ERASE_TOUT) {
-            printf ("Timeout\n");
-            return 1;
-        }
-        /* show that we're waiting */
-        if ((now - last) > 1000) {  /* every second */
-            serial_putc ('.');
-            last = now;
-        }
+	if ((now = get_timer(start)) > CFG_FLASH_ERASE_TOUT) {
+	    printf ("Timeout\n");
+	    return 1;
+	}
+	/* show that we're waiting */
+	if ((now - last) > 1000) {  /* every second */
+	    serial_putc ('.');
+	    last = now;
+	}
     }
 
 DONE:
@@ -643,42 +641,42 @@
      * handle unaligned start bytes
      */
     if ((l = addr - wp) != 0) {
-        data = 0;
-        for (i=0, cp=wp; i<l; ++i, ++cp) {
-            data = (data << 8) | (*(uchar *)cp);
-        }
-        for (; i<4 && cnt>0; ++i) {
-            data = (data << 8) | *src++;
-            --cnt;
-            ++cp;
-        }
-        for (; cnt==0 && i<4; ++i, ++cp) {
-            data = (data << 8) | (*(uchar *)cp);
-        }
+	data = 0;
+	for (i=0, cp=wp; i<l; ++i, ++cp) {
+	    data = (data << 8) | (*(uchar *)cp);
+	}
+	for (; i<4 && cnt>0; ++i) {
+	    data = (data << 8) | *src++;
+	    --cnt;
+	    ++cp;
+	}
+	for (; cnt==0 && i<4; ++i, ++cp) {
+	    data = (data << 8) | (*(uchar *)cp);
+	}
 
-        if ((rc = write_word(info, wp, data)) != 0) {
-            return (rc);
-        }
-        wp += 4;
+	if ((rc = write_word(info, wp, data)) != 0) {
+	    return (rc);
+	}
+	wp += 4;
     }
 
     /*
      * handle word aligned part
      */
     while (cnt >= 4) {
-        data = 0;
-        for (i=0; i<4; ++i) {
-            data = (data << 8) | *src++;
-        }
-        if ((rc = write_word(info, wp, data)) != 0) {
-            return (rc);
-        }
-        wp  += 4;
-        cnt -= 4;
+	data = 0;
+	for (i=0; i<4; ++i) {
+	    data = (data << 8) | *src++;
+	}
+	if ((rc = write_word(info, wp, data)) != 0) {
+	    return (rc);
+	}
+	wp  += 4;
+	cnt -= 4;
     }
 
     if (cnt == 0) {
-        return (0);
+	return (0);
     }
 
     /*
@@ -686,11 +684,11 @@
      */
     data = 0;
     for (i=0, cp=wp; i<4 && cnt>0; ++i, ++cp) {
-        data = (data << 8) | *src++;
-        --cnt;
+	data = (data << 8) | *src++;
+	--cnt;
     }
     for (; i<4; ++i, ++cp) {
-        data = (data << 8) | (*(uchar *)cp);
+	data = (data << 8) | (*(uchar *)cp);
     }
 
     return (write_word(info, wp, data));
@@ -704,12 +702,12 @@
  */
 static int write_word (flash_info_t *info, ulong dest, ulong data)
 {
-        volatile FLASH_WORD_SIZE *addr2 = (FLASH_WORD_SIZE *)info->start[0];
-        volatile FLASH_WORD_SIZE *dest2;
-        volatile FLASH_WORD_SIZE *data2 = (FLASH_WORD_SIZE *)&data;
+	volatile FLASH_WORD_SIZE *addr2 = (FLASH_WORD_SIZE *)info->start[0];
+	volatile FLASH_WORD_SIZE *dest2;
+	volatile FLASH_WORD_SIZE *data2 = (FLASH_WORD_SIZE *)&data;
     ulong start;
     int flag;
-        int i;
+	int i;
     unsigned char sh8b;
 
     /* Check the ROM CS */
@@ -723,32 +721,32 @@
 
     /* Check if Flash is (sufficiently) erased */
     if ((*dest2 & (FLASH_WORD_SIZE)data) != (FLASH_WORD_SIZE)data) {
-        return (2);
+	return (2);
     }
     /* Disable interrupts which might cause a timeout here */
     flag = disable_interrupts();
 
-        for (i=0; i<4/sizeof(FLASH_WORD_SIZE); i++)
-          {
-            addr2[ADDR0 << sh8b] = (FLASH_WORD_SIZE)0x00AA00AA;
-            addr2[ADDR1 << sh8b] = (FLASH_WORD_SIZE)0x00550055;
-            addr2[ADDR0 << sh8b] = (FLASH_WORD_SIZE)0x00A000A0;
+	for (i=0; i<4/sizeof(FLASH_WORD_SIZE); i++)
+	  {
+	    addr2[ADDR0 << sh8b] = (FLASH_WORD_SIZE)0x00AA00AA;
+	    addr2[ADDR1 << sh8b] = (FLASH_WORD_SIZE)0x00550055;
+	    addr2[ADDR0 << sh8b] = (FLASH_WORD_SIZE)0x00A000A0;
 
-            dest2[i << sh8b] = data2[i];
+	    dest2[i << sh8b] = data2[i];
 
-            /* re-enable interrupts if necessary */
-            if (flag)
-              enable_interrupts();
+	    /* re-enable interrupts if necessary */
+	    if (flag)
+	      enable_interrupts();
 
-            /* data polling for D7 */
-            start = get_timer (0);
-            while ((dest2[i << sh8b] & (FLASH_WORD_SIZE)0x00800080) !=
-                   (data2[i] & (FLASH_WORD_SIZE)0x00800080)) {
-              if (get_timer(start) > CFG_FLASH_WRITE_TOUT) {
-                return (1);
-              }
-            }
-          }
+	    /* data polling for D7 */
+	    start = get_timer (0);
+	    while ((dest2[i << sh8b] & (FLASH_WORD_SIZE)0x00800080) !=
+		   (data2[i] & (FLASH_WORD_SIZE)0x00800080)) {
+	      if (get_timer(start) > CFG_FLASH_WRITE_TOUT) {
+		return (1);
+	      }
+	    }
+	  }
 
     return (0);
 }

diff --git a/board/bmw/m48t59y.c b/board/bmw/m48t59y.c
index 469f1ad..d72c861 100644
--- a/board/bmw/m48t59y.c
+++ b/board/bmw/m48t59y.c

@@ -320,4 +320,3 @@
 {
   m48_tod_init();
 }
-

diff --git a/board/bmw/ns16550.c b/board/bmw/ns16550.c
index b6b6f4c..b1c28eb 100644
--- a/board/bmw/ns16550.c
+++ b/board/bmw/ns16550.c

@@ -55,6 +55,3 @@
 {
  return ((com_port->lsr & LSR_DR) != 0);
 }
-
-
-

diff --git a/board/bmw/ns16550.h b/board/bmw/ns16550.h
index b80ac02..0b7b389 100644
--- a/board/bmw/ns16550.h
+++ b/board/bmw/ns16550.h

@@ -78,4 +78,3 @@
 unsigned char NS16550_getc(volatile struct NS16550 *com_port);
 int NS16550_tstc(volatile struct NS16550 *com_port);
 void NS16550_reinit(volatile struct NS16550 *com_port, int baud_divisor);
-

diff --git a/board/bmw/u-boot.lds b/board/bmw/u-boot.lds
index 5ba99b1..98584dc 100644
--- a/board/bmw/u-boot.lds
+++ b/board/bmw/u-boot.lds

@@ -103,6 +103,11 @@
   _edata  =  .;
   PROVIDE (edata = .);
 
+  __u_boot_cmd_start = .;
+  .u_boot_cmd : { *(.u_boot_cmd) }
+  __u_boot_cmd_end = .;
+
+
   __start___ex_table = .;
   __ex_table : { *(__ex_table) }
   __stop___ex_table = .;
@@ -126,4 +131,3 @@
   _end = . ;
   PROVIDE (end = .);
 }
-

diff --git a/board/bubinga405ep/Makefile b/board/bubinga405ep/Makefile
index 12b2fa8..97d6a1e 100644
--- a/board/bubinga405ep/Makefile
+++ b/board/bubinga405ep/Makefile

@@ -29,7 +29,7 @@
 SOBJS	= init.o
 
 $(LIB):	$(OBJS) $(SOBJS)
-	$(AR) crv $@ $^
+	$(AR) crv $@ $(OBJS)
 
 clean:
 	rm -f $(SOBJS) $(OBJS)

diff --git a/board/bubinga405ep/flash.c b/board/bubinga405ep/flash.c
index f93dcd4..6a9907c 100644
--- a/board/bubinga405ep/flash.c
+++ b/board/bubinga405ep/flash.c

@@ -73,8 +73,8 @@
 {
 	unsigned long size_b0, size_b1;
 	int i;
-        uint pbcr;
-        unsigned long base_b0, base_b1;
+	uint pbcr;
+	unsigned long base_b0, base_b1;
 
 	/* Init: no FLASHes known */
 	for (i=0; i<CFG_MAX_FLASH_BANKS; ++i) {
@@ -172,7 +172,6 @@
 }
 
 
-
 /*-----------------------------------------------------------------------
  */
 static void flash_get_offsets (ulong base, flash_info_t *info)
@@ -180,11 +179,11 @@
 	int i;
 
 	/* set up sector start address table */
-        if (((info->flash_id & FLASH_VENDMASK) == FLASH_MAN_SST) ||
+	if (((info->flash_id & FLASH_VENDMASK) == FLASH_MAN_SST) ||
 	    (info->flash_id  == FLASH_AM040)){
 	    for (i = 0; i < info->sector_count; i++)
 		info->start[i] = base + (i * 0x00010000);
-        } else {
+	} else {
 	    if (info->flash_id & FLASH_BTYPE) {
 		/* set sector offsets for bottom boot block type	*/
 		info->start[0] = base + 0x00000000;
@@ -212,10 +211,10 @@
 void flash_print_info  (flash_info_t *info)
 {
 	int i;
-        int k;
-        int size;
-        int erased;
-        volatile unsigned long *flash;
+	int k;
+	int size;
+	int erased;
+	volatile unsigned long *flash;
 
 	if (info->flash_id == FLASH_UNKNOWN) {
 		printf ("missing or unknown FLASH type\n");
@@ -261,24 +260,24 @@
 
 	printf ("  Sector Start Addresses:");
 	for (i=0; i<info->sector_count; ++i) {
-                /*
-                 * Check if whole sector is erased
-                 */
-                if (i != (info->sector_count-1))
-                  size = info->start[i+1] - info->start[i];
-                else
-                  size = info->start[0] + info->size - info->start[i];
-                erased = 1;
-                flash = (volatile unsigned long *)info->start[i];
-                size = size >> 2;        /* divide by 4 for longword access */
-                for (k=0; k<size; k++)
-                  {
-                    if (*flash++ != 0xffffffff)
-                      {
-                        erased = 0;
-                        break;
-                      }
-                  }
+		/*
+		 * Check if whole sector is erased
+		 */
+		if (i != (info->sector_count-1))
+		  size = info->start[i+1] - info->start[i];
+		else
+		  size = info->start[0] + info->size - info->start[i];
+		erased = 1;
+		flash = (volatile unsigned long *)info->start[i];
+		size = size >> 2;        /* divide by 4 for longword access */
+		for (k=0; k<size; k++)
+		  {
+		    if (*flash++ != 0xffffffff)
+		      {
+			erased = 0;
+			break;
+		      }
+		  }
 
 		if ((i % 5) == 0)
 			printf ("\n   ");
@@ -313,7 +312,7 @@
 	short i;
 	FLASH_WORD_SIZE value;
 	ulong base = (ulong)addr;
-        volatile FLASH_WORD_SIZE *addr2 = (FLASH_WORD_SIZE *)addr;
+	volatile FLASH_WORD_SIZE *addr2 = (FLASH_WORD_SIZE *)addr;
 
 	/* Write auto select command: read Manufacturer ID */
 	addr2[ADDR0] = (FLASH_WORD_SIZE)0x00AA00AA;
@@ -345,14 +344,14 @@
 
 #ifdef CONFIG_ADCIOP
 	value = addr2[0];			/* device ID		*/
-        /*        printf("\ndev_code=%x\n", value); */
+	/*        printf("\ndev_code=%x\n", value); */
 #else
 	value = addr2[1];			/* device ID		*/
 #endif
 
 	switch (value) {
 	case (FLASH_WORD_SIZE)AMD_ID_F040B:
-	        info->flash_id += FLASH_AM040;
+		info->flash_id += FLASH_AM040;
 		info->sector_count = 8;
 		info->size = 0x0080000; /* => 512 ko */
 		break;
@@ -423,11 +422,11 @@
 	}
 
 	/* set up sector start address table */
-        if (((info->flash_id & FLASH_VENDMASK) == FLASH_MAN_SST) ||
+	if (((info->flash_id & FLASH_VENDMASK) == FLASH_MAN_SST) ||
 	    (info->flash_id  == FLASH_AM040)){
 	    for (i = 0; i < info->sector_count; i++)
 		info->start[i] = base + (i * 0x00010000);
-        } else {
+	} else {
 	    if (info->flash_id & FLASH_BTYPE) {
 		/* set sector offsets for bottom boot block type	*/
 		info->start[0] = base + 0x00000000;
@@ -458,10 +457,10 @@
 		info->protect[i] = addr2[4] & 1;
 #else
 		addr2 = (volatile FLASH_WORD_SIZE *)(info->start[i]);
-                if ((info->flash_id & FLASH_VENDMASK) == FLASH_MAN_SST)
-                  info->protect[i] = 0;
-                else
-                  info->protect[i] = addr2[2] & 1;
+		if ((info->flash_id & FLASH_VENDMASK) == FLASH_MAN_SST)
+		  info->protect[i] = 0;
+		else
+		  info->protect[i] = addr2[2] & 1;
 #endif
 	}
 
@@ -472,9 +471,9 @@
 #if 0 /* test-only */
 #ifdef CONFIG_ADCIOP
 		addr2 = (volatile unsigned char *)info->start[0];
-                addr2[ADDR0] = 0xAA;
-                addr2[ADDR1] = 0x55;
-                addr2[ADDR0] = 0xF0;  /* reset bank */
+		addr2[ADDR0] = 0xAA;
+		addr2[ADDR1] = 0x55;
+		addr2[ADDR0] = 0xF0;  /* reset bank */
 #else
 		addr2 = (FLASH_WORD_SIZE *)info->start[0];
 		*addr2 = (FLASH_WORD_SIZE)0x00F000F0;	/* reset bank */
@@ -496,15 +495,15 @@
 	start = get_timer (0);
     last  = start;
     while ((addr[0] & (FLASH_WORD_SIZE)0x00800080) != (FLASH_WORD_SIZE)0x00800080) {
-        if ((now = get_timer(start)) > CFG_FLASH_ERASE_TOUT) {
-            printf ("Timeout\n");
-            return -1;
-        }
-        /* show that we're waiting */
-        if ((now - last) > 1000) {  /* every second */
-            putc ('.');
-            last = now;
-        }
+	if ((now = get_timer(start)) > CFG_FLASH_ERASE_TOUT) {
+	    printf ("Timeout\n");
+	    return -1;
+	}
+	/* show that we're waiting */
+	if ((now - last) > 1000) {  /* every second */
+	    putc ('.');
+	    last = now;
+	}
     }
 	return 0;
 }

diff --git a/board/bubinga405ep/init.S b/board/bubinga405ep/init.S
index 12c51e8..e478525 100644
--- a/board/bubinga405ep/init.S
+++ b/board/bubinga405ep/init.S

@@ -50,6 +50,6 @@
 /* Function:     sdram_init */
 /* Description:  Dummy implementation here - done in C later */
 /*----------------------------------------------------------------------------- */
-        .globl  sdram_init
+	.globl  sdram_init
 sdram_init:
-        blr
+	blr

diff --git a/board/bubinga405ep/u-boot.lds b/board/bubinga405ep/u-boot.lds
index a1ddd84..3894614 100644
--- a/board/bubinga405ep/u-boot.lds
+++ b/board/bubinga405ep/u-boot.lds

@@ -121,6 +121,10 @@
   _edata  =  .;
   PROVIDE (edata = .);
 
+  __u_boot_cmd_start = .;
+  .u_boot_cmd : { *(.u_boot_cmd) }
+  __u_boot_cmd_end = .;
+
   __start___ex_table = .;
   __ex_table : { *(__ex_table) }
   __stop___ex_table = .;

diff --git a/board/bubinga405ep/u-boot.lds.debug b/board/bubinga405ep/u-boot.lds.debug
index 69b7872..df50b7d 100644
--- a/board/bubinga405ep/u-boot.lds.debug
+++ b/board/bubinga405ep/u-boot.lds.debug

@@ -144,4 +144,3 @@
   _end = . ;
   PROVIDE (end = .);
 }
-

diff --git a/board/c2mon/Makefile b/board/c2mon/Makefile
index 35b8428..7a2014d 100644
--- a/board/c2mon/Makefile
+++ b/board/c2mon/Makefile

@@ -28,7 +28,7 @@
 OBJS	= $(BOARD).o flash.o
 
 $(LIB):	.depend $(OBJS)
-	$(AR) crv $@ $^
+	$(AR) crv $@ $(OBJS)
 
 #########################################################################
 

diff --git a/board/c2mon/u-boot.lds b/board/c2mon/u-boot.lds
index 4b0129f..86e587f 100644
--- a/board/c2mon/u-boot.lds
+++ b/board/c2mon/u-boot.lds

@@ -109,6 +109,11 @@
   _edata  =  .;
   PROVIDE (edata = .);
 
+  __u_boot_cmd_start = .;
+  .u_boot_cmd : { *(.u_boot_cmd) }
+  __u_boot_cmd_end = .;
+
+
   __start___ex_table = .;
   __ex_table : { *(__ex_table) }
   __stop___ex_table = .;
@@ -131,4 +136,3 @@
   _end = . ;
   PROVIDE (end = .);
 }
-

diff --git a/board/c2mon/u-boot.lds.debug b/board/c2mon/u-boot.lds.debug
index 8dc6d40..f6f7cf4 100644
--- a/board/c2mon/u-boot.lds.debug
+++ b/board/c2mon/u-boot.lds.debug

@@ -106,6 +106,11 @@
   _edata  =  .;
   PROVIDE (edata = .);
 
+  __u_boot_cmd_start = .;
+  .u_boot_cmd : { *(.u_boot_cmd) }
+  __u_boot_cmd_end = .;
+
+
   __start___ex_table = .;
   __ex_table : { *(__ex_table) }
   __stop___ex_table = .;
@@ -128,4 +133,3 @@
   _end = . ;
   PROVIDE (end = .);
 }
-

diff --git a/board/cmi/Makefile b/board/cmi/Makefile
index 0a92da8..2324d87 100644
--- a/board/cmi/Makefile
+++ b/board/cmi/Makefile

@@ -29,7 +29,7 @@
 SOBJS	:=
 
 $(LIB):	$(OBJS)
-	$(AR) crv $@ $^
+	$(AR) crv $@ $(OBJS)
 
 clean:
 	rm -f $(SOBJS) $(OBJS)

diff --git a/board/cmi/flash.c b/board/cmi/flash.c
index 9c802b9..f7c25f4 100644
--- a/board/cmi/flash.c
+++ b/board/cmi/flash.c

@@ -458,7 +458,7 @@
 	if (!(info->flash_id & FLASH_VENDMASK)) {
 		return 4;
 	}
-        *addr = FLASH_CMD_ERASE_CONFIRM;
+	*addr = FLASH_CMD_ERASE_CONFIRM;
 	*addr = FLASH_CMD_WRITE;
 
 	*((vu_short *)dest) = data;
@@ -474,7 +474,7 @@
 	/* wait for error or finish */
 	while(!(addr[0] & FLASH_STATUS_DONE)){
 		if (get_timer(start) > CFG_FLASH_WRITE_TOUT) {
-		  	addr[0] = FLASH_CMD_RESET;
+			addr[0] = FLASH_CMD_RESET;
 			return (1);
 		}
 	}
@@ -505,7 +505,7 @@
 	start = get_timer (0);
 	while(!(addr[0] & FLASH_STATUS_DONE)){
 		if (get_timer(start) > CFG_FLASH_ERASE_TOUT) {
-		  	printf("Flash protect timeout at address %lx\n",  info->start[sector]);
+			printf("Flash protect timeout at address %lx\n",  info->start[sector]);
 			addr[0] = FLASH_CMD_RESET;
 			return (1);
 		}

diff --git a/board/cmi/u-boot.lds b/board/cmi/u-boot.lds
index 04cc87a..3188801 100644
--- a/board/cmi/u-boot.lds
+++ b/board/cmi/u-boot.lds

@@ -101,6 +101,11 @@
   _edata  =  .;
   PROVIDE (edata = .);
 
+  __u_boot_cmd_start = .;
+  .u_boot_cmd : { *(.u_boot_cmd) }
+  __u_boot_cmd_end = .;
+
+
   __start___ex_table = .;
   __ex_table : { *(__ex_table) }
   __stop___ex_table = .;
@@ -123,10 +128,10 @@
 
   _end = . ;
   PROVIDE (end = .);
-    . = env_start;
+/*   . = env_start;
 	.ppcenv	:
 	{
 		common/environment.o (.ppcenv)
 	}
-
+*/
 }

diff --git a/board/cogent/Makefile b/board/cogent/Makefile
index 0cf6411..4084c7e 100644
--- a/board/cogent/Makefile
+++ b/board/cogent/Makefile

@@ -29,7 +29,7 @@
 SOBJS	:=
 
 $(LIB):	$(OBJS)
-	$(AR) crv $@ $^
+	$(AR) crv $@ $(OBJS)
 
 clean:
 	rm -f $(SOBJS) $(OBJS)

diff --git a/board/cogent/lcd.c b/board/cogent/lcd.c
index 941ea65..c1b4d11 100644
--- a/board/cogent/lcd.c
+++ b/board/cogent/lcd.c

@@ -112,7 +112,7 @@
 
     lcd_write_command(clp, LCD_CMD_ADD + addr);
     for (pos = 0; *string != '\0' && pos < linelen; pos++)
-        lcd_write_data(clp, *string++);
+	lcd_write_data(clp, *string++);
 }
 
 void
@@ -131,7 +131,7 @@
     linepos = 0;
 
     for (i = 0; i < LCD_LINE_LENGTH; i++) {
-        lines[0][i] = init_line0[i];
+	lines[0][i] = init_line0[i];
 	lines[1][i] = init_line1[i];
     }
 
@@ -157,25 +157,25 @@
 	linelen--;
 
     if (c == '\n') {
-        lcd_dis(LCD_LINE0, &lines[curline^1][0]);
-        lcd_dis(LCD_LINE1, &lines[curline][0]);
+	lcd_dis(LCD_LINE0, &lines[curline^1][0]);
+	lcd_dis(LCD_LINE1, &lines[curline][0]);
 
-        /* Do a line feed */
-        curline ^= 1;
+	/* Do a line feed */
+	curline ^= 1;
 	linelen = LCD_LINE_LENGTH;
 	if (heartbeat_active && curline == 0)
 	    linelen--;
-        linepos = 0;
+	linepos = 0;
 
-        for (i = 0; i < linelen; i++)
-            lines[curline][i] = ' ';
+	for (i = 0; i < linelen; i++)
+	    lines[curline][i] = ' ';
 
-        return;
+	return;
     }
 
     /* Only allow to be output if there is room on the LCD line */
     if (linepos < linelen)
-        lines[curline][linepos++] = c;
+	lines[curline][linepos++] = c;
 }
 
 void

diff --git a/board/cogent/u-boot.lds b/board/cogent/u-boot.lds
index c3474b4..d9a1b68 100644
--- a/board/cogent/u-boot.lds
+++ b/board/cogent/u-boot.lds

@@ -96,6 +96,11 @@
   _edata  =  .;
   PROVIDE (edata = .);
 
+  __u_boot_cmd_start = .;
+  .u_boot_cmd : { *(.u_boot_cmd) }
+  __u_boot_cmd_end = .;
+
+
   __start___ex_table = .;
   __ex_table : { *(__ex_table) }
   __stop___ex_table = .;
@@ -118,4 +123,3 @@
   _end = . ;
   PROVIDE (end = .);
 }
-

diff --git a/board/cogent/u-boot.lds.debug b/board/cogent/u-boot.lds.debug
index 22138f8..c0ee849 100644
--- a/board/cogent/u-boot.lds.debug
+++ b/board/cogent/u-boot.lds.debug

@@ -106,6 +106,11 @@
   _edata  =  .;
   PROVIDE (edata = .);
 
+  __u_boot_cmd_start = .;
+  .u_boot_cmd : { *(.u_boot_cmd) }
+  __u_boot_cmd_end = .;
+
+
   __start___ex_table = .;
   __ex_table : { *(__ex_table) }
   __stop___ex_table = .;
@@ -128,4 +133,3 @@
   _end = . ;
   PROVIDE (end = .);
 }
-

diff --git a/board/cpc45/Makefile b/board/cpc45/Makefile
index cc66e32..db5a83b 100644
--- a/board/cpc45/Makefile
+++ b/board/cpc45/Makefile

@@ -28,7 +28,7 @@
 OBJS	= $(BOARD).o flash.o plx9030.o
 
 $(LIB):	.depend $(OBJS)
-	$(AR) crv $@ $^
+	$(AR) crv $@ $(OBJS)
 
 #########################################################################
 

diff --git a/board/cpc45/cpc45.c b/board/cpc45/cpc45.c
index 01067f5..08bff49 100644
--- a/board/cpc45/cpc45.c
+++ b/board/cpc45/cpc45.c

@@ -26,7 +26,7 @@
 #include <asm/processor.h>
 #include <pci.h>
 
-int sysControlDisplay(int digit, uchar ascii_code);			
+int sysControlDisplay(int digit, uchar ascii_code);
 extern void Plx9030Init(void);
 
 	/* We have to clear the initial data area here. Couldn't have done it
@@ -170,4 +170,3 @@
 
 	return (0);
 }
-

diff --git a/board/cpc45/flash.c b/board/cpc45/flash.c
index a289d08..9049235 100644
--- a/board/cpc45/flash.c
+++ b/board/cpc45/flash.c

@@ -80,7 +80,7 @@
 
 
     for (i = 0; i < CFG_MAX_FLASH_BANKS; i++) {
-    	vu_long *addr = (vu_long *)(CFG_FLASH_BASE + i * FLASH_BANK_SIZE);
+	vu_long *addr = (vu_long *)(CFG_FLASH_BASE + i * FLASH_BANK_SIZE);
 
 	addr[0] = 0x00900090;
 
@@ -97,7 +97,7 @@
 	{
 
 	    flash_info[i].flash_id = (FLASH_MAN_INTEL & FLASH_VENDMASK) |
-	    			     (INTEL_ID_28F160F3T & FLASH_TYPEMASK);
+				     (INTEL_ID_28F160F3T & FLASH_TYPEMASK);
 
 	} else {
 	    flash_info[i].flash_id = FLASH_UNKNOWN;
@@ -115,12 +115,12 @@
 	for (j = 0; j < flash_info[i].sector_count; j++) {
 		if (j > 30) {
 			flash_info[i].start[j] = CFG_FLASH_BASE +
-			                         i * FLASH_BANK_SIZE +
-			                         (MAIN_SECT_SIZE * 31) + (j - 31) * PARAM_SECT_SIZE;
+						 i * FLASH_BANK_SIZE +
+						 (MAIN_SECT_SIZE * 31) + (j - 31) * PARAM_SECT_SIZE;
 		} else {
 			flash_info[i].start[j] = CFG_FLASH_BASE +
-			                         i * FLASH_BANK_SIZE +
-			                         j * MAIN_SECT_SIZE;
+						 i * FLASH_BANK_SIZE +
+						 j * MAIN_SECT_SIZE;
 		}
 	}
 	size += flash_info[i].size;
@@ -131,28 +131,28 @@
 #if CFG_MONITOR_BASE >= CFG_FLASH_BASE
 #if CFG_MONITOR_BASE >= CFG_FLASH_BASE + FLASH_BANK_SIZE
     flash_protect(FLAG_PROTECT_SET,
-              CFG_MONITOR_BASE,
-              CFG_MONITOR_BASE + monitor_flash_len - 1,
-              &flash_info[1]);
+	      CFG_MONITOR_BASE,
+	      CFG_MONITOR_BASE + monitor_flash_len - 1,
+	      &flash_info[1]);
 #else
     flash_protect(FLAG_PROTECT_SET,
-              CFG_MONITOR_BASE,
-              CFG_MONITOR_BASE + monitor_flash_len - 1,
-              &flash_info[0]);
+	      CFG_MONITOR_BASE,
+	      CFG_MONITOR_BASE + monitor_flash_len - 1,
+	      &flash_info[0]);
 #endif
 #endif
 
 #if (CFG_ENV_IS_IN_FLASH == 1) && defined(CFG_ENV_ADDR)
 #if CFG_ENV_ADDR >= CFG_FLASH_BASE + FLASH_BANK_SIZE
     flash_protect(FLAG_PROTECT_SET,
-              CFG_ENV_ADDR,
-              CFG_ENV_ADDR + CFG_ENV_SIZE - 1,
-              &flash_info[1]);
+	      CFG_ENV_ADDR,
+	      CFG_ENV_ADDR + CFG_ENV_SIZE - 1,
+	      &flash_info[1]);
 #else
     flash_protect(FLAG_PROTECT_SET,
-              CFG_ENV_ADDR,
-              CFG_ENV_ADDR + CFG_ENV_SIZE - 1,
-              &flash_info[0]);
+	      CFG_ENV_ADDR,
+	      CFG_ENV_ADDR + CFG_ENV_SIZE - 1,
+	      &flash_info[0]);
 #endif
 #endif
 
@@ -275,7 +275,7 @@
 			while (((addr[0] & 0x00800080) != 0x00800080) ||
 			       ((addr[1] & 0x00800080) != 0x00800080) ) {
 				if ((now=get_timer(start)) >
-				           CFG_FLASH_ERASE_TOUT) {
+					   CFG_FLASH_ERASE_TOUT) {
 					printf ("Timeout\n");
 					addr[0] = 0x00B000B0; /* suspend erase */
 					addr[0] = 0x00FF00FF; /* to read mode  */
@@ -335,7 +335,7 @@
 		for (i = 0, cp = wp; i < l; i++, cp++) {
 			if (i >= 4) {
 				*datah = (*datah << 8) |
-				                ((*datal & 0xFF000000) >> 24);
+						((*datal & 0xFF000000) >> 24);
 			}
 
 			*datal = (*datal << 8) | (*(uchar *)cp);
@@ -349,7 +349,7 @@
 
 			if (i >= 4) {
 				*datah = (*datah << 8) |
-			                        ((*datal & 0xFF000000) >> 24);
+						((*datal & 0xFF000000) >> 24);
 			}
 
 			*datal = (*datal << 8) | tmp;
@@ -360,7 +360,7 @@
 		for (; cnt == 0 && i < FLASH_WIDTH; ++i, ++cp) {
 			if (i >= 4) {
 				*datah = (*datah << 8) |
-				                ((*datal & 0xFF000000) >> 24);
+						((*datal & 0xFF000000) >> 24);
 			}
 
 			*datal = (*datah << 8) | (*(uchar *)cp);
@@ -401,7 +401,7 @@
 	for (i = 0, cp = wp; i < FLASH_WIDTH && cnt > 0; ++i, ++cp) {
 		char tmp;
 
-      		tmp = *src;
+		tmp = *src;
 
 		src++;
 

diff --git a/board/cpc45/plx9030.c b/board/cpc45/plx9030.c
index e337bd2..99ec39a 100644
--- a/board/cpc45/plx9030.c
+++ b/board/cpc45/plx9030.c

@@ -137,7 +137,7 @@
 	sysOutLong((membaseCsr + P9030_LAS0BA),  0x00000001);		/* enable space base */
 	sysOutLong((membaseCsr + P9030_LAS0RR),  0x0FE00000);		/* 2 MByte */
 	sysOutLong((membaseCsr + P9030_LAS0BRD), 0x51928900);		/* 4 wait states */
-	sysOutLong((membaseCsr + P9030_CS0BASE), 0x00100001);		/* enable 2 MByte */	
+	sysOutLong((membaseCsr + P9030_CS0BASE), 0x00100001);		/* enable 2 MByte */
 	/* remap CS0 (SRAM) */
 	pci_write_config_dword(devno, PCI_BASE_ADDRESS_2, SRAM_BASE);
 
@@ -145,7 +145,7 @@
 	sysOutLong((membaseCsr + P9030_LAS1BA),  0x00400001);		/* enable space base */
 	sysOutLong((membaseCsr + P9030_LAS1RR),  0x0FFFFF00);		/* 256 byte */
 	sysOutLong((membaseCsr + P9030_LAS1BRD), 0x55122900);		/* 4 wait states */
-	sysOutLong((membaseCsr + P9030_CS1BASE), 0x00400081);		/* enable 256 Byte */	
+	sysOutLong((membaseCsr + P9030_CS1BASE), 0x00400081);		/* enable 256 Byte */
 	/* remap CS1 (ST16552 / CHAN A) */
 	/* remap CS1 (ST16552 / CHAN A) */
 	pci_write_config_dword(devno, PCI_BASE_ADDRESS_3, ST16552_A_BASE);
@@ -154,7 +154,7 @@
 	sysOutLong((membaseCsr + P9030_LAS2BA),  0x00800001);		/* enable space base */
 	sysOutLong((membaseCsr + P9030_LAS2RR),  0x0FFFFF00);		/* 256 byte */
 	sysOutLong((membaseCsr + P9030_LAS2BRD), 0x55122900);		/* 4 wait states */
-	sysOutLong((membaseCsr + P9030_CS2BASE), 0x00800081);		/* enable 256 Byte */	
+	sysOutLong((membaseCsr + P9030_CS2BASE), 0x00800081);		/* enable 256 Byte */
 	/* remap CS2 (ST16552 / CHAN B) */
 	pci_write_config_dword(devno, PCI_BASE_ADDRESS_4, ST16552_B_BASE);
 
@@ -162,7 +162,7 @@
 	sysOutLong((membaseCsr + P9030_LAS3BA),  0x00C00001);		/* enable space base */
 	sysOutLong((membaseCsr + P9030_LAS3RR),  0x0FFFFF00);		/* 256 byte */
 	sysOutLong((membaseCsr + P9030_LAS3BRD), 0x55357A80);		/* 9 wait states */
-	sysOutLong((membaseCsr + P9030_CS3BASE), 0x00C00081);		/* enable 256 Byte */	
+	sysOutLong((membaseCsr + P9030_CS3BASE), 0x00C00081);		/* enable 256 Byte */
 	/* remap CS3 (DISPLAY and BCSR) */
 	pci_write_config_dword(devno, PCI_BASE_ADDRESS_5, BCSR_BASE);
 }
@@ -171,4 +171,3 @@
 {
 	*(ulong*)address = cpu_to_le32(value);
 }
-

diff --git a/board/cpc45/u-boot.lds b/board/cpc45/u-boot.lds
index 59ddb42..b1807dd 100644
--- a/board/cpc45/u-boot.lds
+++ b/board/cpc45/u-boot.lds

@@ -103,6 +103,11 @@
   _edata  =  .;
   PROVIDE (edata = .);
 
+
+  __u_boot_cmd_start = .;
+  .u_boot_cmd : { *(.u_boot_cmd) }
+  __u_boot_cmd_end = .;
+
   __start___ex_table = .;
   __ex_table : { *(__ex_table) }
   __stop___ex_table = .;
@@ -126,4 +131,3 @@
   _end = . ;
   PROVIDE (end = .);
 }
-

diff --git a/board/cpu86/Makefile b/board/cpu86/Makefile
index 35b8428..7a2014d 100644
--- a/board/cpu86/Makefile
+++ b/board/cpu86/Makefile

@@ -28,7 +28,7 @@
 OBJS	= $(BOARD).o flash.o
 
 $(LIB):	.depend $(OBJS)
-	$(AR) crv $@ $^
+	$(AR) crv $@ $(OBJS)
 
 #########################################################################
 

diff --git a/board/cpu86/u-boot.lds b/board/cpu86/u-boot.lds
index 9d56f13..ce6c454 100644
--- a/board/cpu86/u-boot.lds
+++ b/board/cpu86/u-boot.lds

@@ -94,6 +94,11 @@
   _edata  =  .;
   PROVIDE (edata = .);
 
+  __u_boot_cmd_start = .;
+  .u_boot_cmd : { *(.u_boot_cmd) }
+  __u_boot_cmd_end = .;
+
+
   __start___ex_table = .;
   __ex_table : { *(__ex_table) }
   __stop___ex_table = .;
@@ -116,4 +121,3 @@
   _end = . ;
   PROVIDE (end = .);
 }
-

diff --git a/board/cradle/Makefile b/board/cradle/Makefile
index b694e10..5a321eb 100644
--- a/board/cradle/Makefile
+++ b/board/cradle/Makefile

@@ -29,7 +29,7 @@
 SOBJS	:= memsetup.o
 
 $(LIB):	$(OBJS) $(SOBJS)
-	$(AR) crv $@ $^
+	$(AR) crv $@ $(OBJS) $(SOBJS)
 
 clean:
 	rm -f $(SOBJS) $(OBJS)

diff --git a/board/cradle/config.mk b/board/cradle/config.mk
index 2977572..3ffcfe8 100644
--- a/board/cradle/config.mk
+++ b/board/cradle/config.mk

@@ -1,3 +1,2 @@
 TEXT_BASE = 0xa0f08000
 #TEXT_BASE = 0
-

diff --git a/board/cradle/flash.c b/board/cradle/flash.c
index 463026d..e2d174e 100644
--- a/board/cradle/flash.c
+++ b/board/cradle/flash.c

@@ -45,26 +45,26 @@
    {
       ulong flashbase = 0;
       flash_info[i].flash_id =
-          (INTEL_MANUFACT & FLASH_VENDMASK) |
-          (INTEL_ID_28F128J3 & FLASH_TYPEMASK);
+	  (INTEL_MANUFACT & FLASH_VENDMASK) |
+	  (INTEL_ID_28F128J3 & FLASH_TYPEMASK);
       flash_info[i].size = FLASH_BANK_SIZE;
       flash_info[i].sector_count = CFG_MAX_FLASH_SECT;
       memset(flash_info[i].protect, 0, CFG_MAX_FLASH_SECT);
       switch (i)
       {
-         case 0:
-                flashbase = PHYS_FLASH_1;
-                break;
-         case 1:
-                flashbase = PHYS_FLASH_2;
-                break;
-         default:
-                panic("configured to many flash banks!\n");
-                break;
+	 case 0:
+		flashbase = PHYS_FLASH_1;
+		break;
+	 case 1:
+		flashbase = PHYS_FLASH_2;
+		break;
+	 default:
+		panic("configured to many flash banks!\n");
+		break;
       }
       for (j = 0; j < flash_info[i].sector_count; j++)
       {
-         flash_info[i].start[j] = flashbase + j*MAIN_SECT_SIZE;
+	 flash_info[i].start[j] = flashbase + j*MAIN_SECT_SIZE;
       }
       size += flash_info[i].size;
    }
@@ -72,14 +72,14 @@
    /* Protect monitor and environment sectors
     */
    flash_protect(FLAG_PROTECT_SET,
-                  CFG_FLASH_BASE,
-                  CFG_FLASH_BASE + monitor_flash_len - 1,
-                  &flash_info[0]);
+		  CFG_FLASH_BASE,
+		  CFG_FLASH_BASE + monitor_flash_len - 1,
+		  &flash_info[0]);
 
    flash_protect(FLAG_PROTECT_SET,
-                  CFG_ENV_ADDR,
-                  CFG_ENV_ADDR + CFG_ENV_SIZE - 1,
-                  &flash_info[0]);
+		  CFG_ENV_ADDR,
+		  CFG_ENV_ADDR + CFG_ENV_SIZE - 1,
+		  &flash_info[0]);
 
    return size;
 }
@@ -94,40 +94,40 @@
    {
       switch (info->flash_id & FLASH_VENDMASK)
       {
-         case (INTEL_MANUFACT & FLASH_VENDMASK):
-                printf("Intel: ");
-                break;
-         default:
-                printf("Unknown Vendor ");
-                break;
+	 case (INTEL_MANUFACT & FLASH_VENDMASK):
+		printf("Intel: ");
+		break;
+	 default:
+		printf("Unknown Vendor ");
+		break;
       }
 
       switch (info->flash_id & FLASH_TYPEMASK)
       {
-         case (INTEL_ID_28F320J3A & FLASH_TYPEMASK):
-                printf("28F320J3A (32Mbit)\n");
-                break;
-         case (INTEL_ID_28F128J3 & FLASH_TYPEMASK):
-                printf("28F128J3 (128Mbit)\n");
-                break;
-         default:
-                printf("Unknown Chip Type\n");
-                goto Done;
-                break;
+	 case (INTEL_ID_28F320J3A & FLASH_TYPEMASK):
+		printf("28F320J3A (32Mbit)\n");
+		break;
+	 case (INTEL_ID_28F128J3 & FLASH_TYPEMASK):
+		printf("28F128J3 (128Mbit)\n");
+		break;
+	 default:
+		printf("Unknown Chip Type\n");
+		goto Done;
+		break;
       }
 
       printf("  Size: %ld MB in %d Sectors\n",
-                info->size >> 20, info->sector_count);
+		info->size >> 20, info->sector_count);
 
       printf("  Sector Start Addresses:");
       for (i = 0; i < info->sector_count; i++)
       {
-         if ((i % 5) == 0)
-         {
-            printf ("\n   ");
-         }
-         printf (" %08lX%s", info->start[i],
-                        info->protect[i] ? " (RO)" : "     ");
+	 if ((i % 5) == 0)
+	 {
+	    printf ("\n   ");
+	 }
+	 printf (" %08lX%s", info->start[i],
+			info->protect[i] ? " (RO)" : "     ");
       }
       printf ("\n");
       info++;
@@ -145,25 +145,25 @@
    int rc = ERR_OK;
 
    if (info->flash_id == FLASH_UNKNOWN)
-        return ERR_UNKNOWN_FLASH_TYPE;
+	return ERR_UNKNOWN_FLASH_TYPE;
 
    if ((s_first < 0) || (s_first > s_last)) {
-        return ERR_INVAL;
+	return ERR_INVAL;
    }
 
    if ((info->flash_id & FLASH_VENDMASK) !=
-        (INTEL_MANUFACT & FLASH_VENDMASK)) {
-        return ERR_UNKNOWN_FLASH_VENDOR;
+	(INTEL_MANUFACT & FLASH_VENDMASK)) {
+	return ERR_UNKNOWN_FLASH_VENDOR;
    }
 
    prot = 0;
    for (sect=s_first; sect<=s_last; ++sect) {
       if (info->protect[sect]) {
-            prot++;
+	    prot++;
       }
    }
    if (prot)
-        return ERR_PROTECTED;
+	return ERR_PROTECTED;
 
    /*
     * Disable interrupts which might cause a timeout
@@ -183,24 +183,24 @@
       reset_timer_masked();
 
       if (info->protect[sect] == 0) {        /* not protected */
-          vu_short *addr = (vu_short *)(info->start[sect]);
+	  vu_short *addr = (vu_short *)(info->start[sect]);
 
-          *addr = 0x20;        /* erase setup */
-          *addr = 0xD0;        /* erase confirm */
+	  *addr = 0x20;        /* erase setup */
+	  *addr = 0xD0;        /* erase confirm */
 
-          while ((*addr & 0x80) != 0x80) {
-             if (get_timer_masked() > CFG_FLASH_ERASE_TOUT) {
-                *addr = 0xB0; /* suspend erase */
-                *addr = 0xFF;        /* reset to read mode */
-                rc = ERR_TIMOUT;
-                goto outahere;
-             }
-          }
+	  while ((*addr & 0x80) != 0x80) {
+	     if (get_timer_masked() > CFG_FLASH_ERASE_TOUT) {
+		*addr = 0xB0; /* suspend erase */
+		*addr = 0xFF;        /* reset to read mode */
+		rc = ERR_TIMOUT;
+		goto outahere;
+	     }
+	  }
 
-          /* clear status register command */
-          *addr = 0x50;
-          /* reset to read mode */
-          *addr = 0xFF;
+	  /* clear status register command */
+	  *addr = 0x50;
+	  /* reset to read mode */
+	  *addr = 0xFF;
       }
       printf("ok.\n");
    }
@@ -258,30 +258,30 @@
    while(((val = *addr) & 0x80) != 0x80)
    {
       if (get_timer_masked() > CFG_FLASH_WRITE_TOUT) {
-          rc = ERR_TIMOUT;
-          /* suspend program command */
-          *addr = 0xB0;
-          goto outahere;
+	  rc = ERR_TIMOUT;
+	  /* suspend program command */
+	  *addr = 0xB0;
+	  goto outahere;
       }
    }
 
    if(val & 0x1A) {        /* check for error */
       printf("\nFlash write error %02x at address %08lx\n",
-               (int)val, (unsigned long)dest);
+	       (int)val, (unsigned long)dest);
       if(val & (1<<3)) {
-         printf("Voltage range error.\n");
-         rc = ERR_PROG_ERROR;
-         goto outahere;
+	 printf("Voltage range error.\n");
+	 rc = ERR_PROG_ERROR;
+	 goto outahere;
       }
       if(val & (1<<1)) {
-         printf("Device protect error.\n");
-         rc = ERR_PROTECTED;
-         goto outahere;
+	 printf("Device protect error.\n");
+	 rc = ERR_PROTECTED;
+	 goto outahere;
       }
       if(val & (1<<4)) {
-         printf("Programming error.\n");
-         rc = ERR_PROG_ERROR;
-         goto outahere;
+	 printf("Programming error.\n");
+	 rc = ERR_PROG_ERROR;
+	 goto outahere;
       }
       rc = ERR_PROG_ERROR;
       goto outahere;
@@ -317,19 +317,19 @@
    {
       data = 0;
       for (i=0, cp=wp; i<l; ++i, ++cp) {
-           data = (data >> 8) | (*(uchar *)cp << 8);
+	   data = (data >> 8) | (*(uchar *)cp << 8);
       }
       for (; i<2 && cnt>0; ++i) {
-         data = (data >> 8) | (*src++ << 8);
-         --cnt;
-         ++cp;
+	 data = (data >> 8) | (*src++ << 8);
+	 --cnt;
+	 ++cp;
       }
       for (; cnt==0 && i<2; ++i, ++cp) {
-         data = (data >> 8) | (*(uchar *)cp << 8);
+	 data = (data >> 8) | (*(uchar *)cp << 8);
       }
 
       if ((rc = write_word(info, wp, data)) != 0) {
-         return (rc);
+	 return (rc);
       }
       wp += 2;
    }
@@ -340,7 +340,7 @@
    while (cnt >= 2) {
       data = *((vu_short*)src);
       if ((rc = write_word(info, wp, data)) != 0) {
-          return (rc);
+	  return (rc);
       }
       src += 2;
       wp  += 2;

diff --git a/board/cradle/memsetup.S b/board/cradle/memsetup.S
index 2f1e042..8800cb0 100644
--- a/board/cradle/memsetup.S
+++ b/board/cradle/memsetup.S

@@ -170,8 +170,8 @@
    SET_LED 2
 
 mem_init:
-        @ get memory controller base address
-        ldr     r1,  =MEMC_BASE
+	@ get memory controller base address
+	ldr     r1,  =MEMC_BASE
 
 
 @****************************************************************************

diff --git a/board/cradle/u-boot.lds b/board/cradle/u-boot.lds
index 46beb15..d321b62 100644
--- a/board/cradle/u-boot.lds
+++ b/board/cradle/u-boot.lds

@@ -26,30 +26,35 @@
 ENTRY(_start)
 SECTIONS
 {
-        . = 0x00000000;
+	. = 0x00000000;
 
-        . = ALIGN(4);
+	. = ALIGN(4);
 	.text      :
 	{
 	  cpu/pxa/start.o	(.text)
 	  *(.text)
 	}
 
-        . = ALIGN(4);
-        .rodata : { *(.rodata) }
+	. = ALIGN(4);
+	.rodata : { *(.rodata) }
 
-        . = ALIGN(4);
-        .data : { *(.data) }
+	. = ALIGN(4);
+	.data : { *(.data) }
 
-        . = ALIGN(4);
-        .got : { *(.got) }
+	. = ALIGN(4);
+	.got : { *(.got) }
+
+   __u_boot_cmd_start = .;
+   .u_boot_cmd : { *(.u_boot_cmd) }
+   __u_boot_cmd_end = .;
 
 	armboot_end_data = .;
 
-        . = ALIGN(4);
+	. = ALIGN(4);
 	bss_start = .;
-        .bss : { *(.bss) }
+	.bss : { *(.bss) }
 	bss_end = .;
 
 	armboot_end = .;
+
 }

diff --git a/board/cray/L1/L1.c b/board/cray/L1/L1.c
index b1e2783..af0456d 100644
--- a/board/cray/L1/L1.c
+++ b/board/cray/L1/L1.c

@@ -25,9 +25,6 @@
 #include <asm/processor.h>
 #include <405gp_i2c.h>
 #include <command.h>
-#include <cmd_nvedit.h>
-#include <cmd_bootm.h>
-#include <cmd_boot.h>
 #include <rtc.h>
 #include <post.h>
 #include <net.h>
@@ -249,7 +246,7 @@
 			*p = 0xaaaaaaaa;
 		for (p = pstart; p < pend; p++) {
 			if (*p != 0xaaaaaaaa) {
-				printf ("SDRAM test fails at: %08x, was %08x expected %08x\n", 
+				printf ("SDRAM test fails at: %08x, was %08x expected %08x\n",
 						(uint) p, *p, 0xaaaaaaaa);
 				return 1;
 			}
@@ -259,7 +256,7 @@
 			*p = 0x55555555;
 		for (p = pstart; p < pend; p++) {
 			if (*p != 0x55555555) {
-				printf ("SDRAM test fails at: %08x, was %08x expected %08x\n", 
+				printf ("SDRAM test fails at: %08x, was %08x expected %08x\n",
 						(uint) p, *p, 0x55555555);
 				return 1;
 			}
@@ -269,7 +266,7 @@
 			*p = (unsigned)p;
 		for (p = pstart; p < pend; p++) {
 			if (*p != (unsigned)p) {
-				printf ("SDRAM test fails at: %08x, was %08x expected %08x\n", 
+				printf ("SDRAM test fails at: %08x, was %08x expected %08x\n",
 						(uint) p, *p, (uint)p);
 				return 1;
 			}

diff --git a/board/cray/L1/Makefile b/board/cray/L1/Makefile
index e7dc0a8..bfe0922 100644
--- a/board/cray/L1/Makefile
+++ b/board/cray/L1/Makefile

@@ -26,7 +26,7 @@
 LIB	= lib$(BOARD).a
 
 OBJS	= $(BOARD).o flash.o
-SOBJS	= init.o 
+SOBJS	= init.o
 
 # HACK: depend needs bootscript.c, which needs tools/mkimage, which is not
 # built in the depend stage.  So... put bootscript.o here, not in OBJS

diff --git a/board/cray/L1/flash.c b/board/cray/L1/flash.c
index 829dbae..f313274 100644
--- a/board/cray/L1/flash.c
+++ b/board/cray/L1/flash.c

@@ -99,7 +99,6 @@
 }
 
 
-
 /*-----------------------------------------------------------------------
  */
 static void flash_get_offsets (ulong base, flash_info_t *info)
@@ -116,10 +115,10 @@
 void flash_print_info  (flash_info_t *info)
 {
 	int i;
-        int k;
-        int size;
-        int erased;
-        volatile unsigned long *flash;
+	int k;
+	int size;
+	int erased;
+	volatile unsigned long *flash;
 
 	if (info->flash_id == FLASH_UNKNOWN) {
 		printf ("missing or unknown FLASH type\n");
@@ -143,24 +142,24 @@
 
 	printf ("  Sector Start Addresses:");
 	for (i=0; i<info->sector_count; ++i) {
-                /*
-                 * Check if whole sector is erased
-                 */
-                if (i != (info->sector_count-1))
-                  size = info->start[i+1] - info->start[i];
-                else
-                  size = info->start[0] + info->size - info->start[i];
-                erased = 1;
-                flash = (volatile unsigned long *)info->start[i];
-                size = size >> 2;        /* divide by 4 for longword access */
-                for (k=0; k<size; k++)
-                  {
-                    if (*flash++ != 0xffffffff)
-                      {
-                        erased = 0;
-                        break;
-                      }
-                  }
+		/*
+		 * Check if whole sector is erased
+		 */
+		if (i != (info->sector_count-1))
+		  size = info->start[i+1] - info->start[i];
+		else
+		  size = info->start[0] + info->size - info->start[i];
+		erased = 1;
+		flash = (volatile unsigned long *)info->start[i];
+		size = size >> 2;        /* divide by 4 for longword access */
+		for (k=0; k<size; k++)
+		  {
+		    if (*flash++ != 0xffffffff)
+		      {
+			erased = 0;
+			break;
+		      }
+		  }
 
 		if ((i % 5) == 0)
 			printf ("\n   ");
@@ -189,7 +188,7 @@
 	short i;
 	FLASH_WORD_SIZE value;
 	ulong base = (ulong)addr;
-        volatile FLASH_WORD_SIZE *addr2 = (FLASH_WORD_SIZE *)addr;
+	volatile FLASH_WORD_SIZE *addr2 = (FLASH_WORD_SIZE *)addr;
 
 	/* Write auto select command: read Manufacturer ID */
 	addr2[ADDR0] = (FLASH_WORD_SIZE)0x00AA00AA;
@@ -232,7 +231,7 @@
 		/* read sector protection at sector address, (A7 .. A0) = 0x02 */
 		/* D0 = 1 if protected */
 		addr2 = (volatile FLASH_WORD_SIZE *)(info->start[i]);
-        info->protect[i] = addr2[2] & 1;
+	info->protect[i] = addr2[2] & 1;
 	}
 
 	/*
@@ -254,15 +253,15 @@
 	start = get_timer (0);
     last  = start;
     while ((addr[0] & (FLASH_WORD_SIZE)0x00800080) != (FLASH_WORD_SIZE)0x00800080) {
-        if ((now = get_timer(start)) > CFG_FLASH_ERASE_TOUT) {
-            printf ("Timeout\n");
-            return -1;
-        }
-        /* show that we're waiting */
-        if ((now - last) > 1000) {  /* every second */
-            putc ('.');
-            last = now;
-        }
+	if ((now = get_timer(start)) > CFG_FLASH_ERASE_TOUT) {
+	    printf ("Timeout\n");
+	    return -1;
+	}
+	/* show that we're waiting */
+	if ((now - last) > 1000) {  /* every second */
+	    putc ('.');
+	    last = now;
+	}
     }
 	return 0;
 }
@@ -427,42 +426,42 @@
  */
 static int write_word (flash_info_t *info, ulong dest, ulong data)
 {
-        volatile FLASH_WORD_SIZE *addr2 = (FLASH_WORD_SIZE *)(info->start[0]);
-        volatile FLASH_WORD_SIZE *dest2 = (FLASH_WORD_SIZE *)dest;
-        volatile FLASH_WORD_SIZE *data2 = (FLASH_WORD_SIZE *)&data;
+	volatile FLASH_WORD_SIZE *addr2 = (FLASH_WORD_SIZE *)(info->start[0]);
+	volatile FLASH_WORD_SIZE *dest2 = (FLASH_WORD_SIZE *)dest;
+	volatile FLASH_WORD_SIZE *data2 = (FLASH_WORD_SIZE *)&data;
 	ulong start;
 	int flag;
-        int i;
+	int i;
 
 	/* Check if Flash is (sufficiently) erased */
 	if ((*((volatile FLASH_WORD_SIZE *)dest) &
-             (FLASH_WORD_SIZE)data) != (FLASH_WORD_SIZE)data) {
+	     (FLASH_WORD_SIZE)data) != (FLASH_WORD_SIZE)data) {
 		return (2);
 	}
 	/* Disable interrupts which might cause a timeout here */
 	flag = disable_interrupts();
 
-        for (i=0; i<4/sizeof(FLASH_WORD_SIZE); i++)
-          {
-            addr2[ADDR0] = (FLASH_WORD_SIZE)0x00AA00AA;
-            addr2[ADDR1] = (FLASH_WORD_SIZE)0x00550055;
-            addr2[ADDR0] = (FLASH_WORD_SIZE)0x00A000A0;
+	for (i=0; i<4/sizeof(FLASH_WORD_SIZE); i++)
+	  {
+	    addr2[ADDR0] = (FLASH_WORD_SIZE)0x00AA00AA;
+	    addr2[ADDR1] = (FLASH_WORD_SIZE)0x00550055;
+	    addr2[ADDR0] = (FLASH_WORD_SIZE)0x00A000A0;
 
-            dest2[i] = data2[i];
+	    dest2[i] = data2[i];
 
-            /* re-enable interrupts if necessary */
-            if (flag)
-              enable_interrupts();
+	    /* re-enable interrupts if necessary */
+	    if (flag)
+	      enable_interrupts();
 
-            /* data polling for D7 */
-            start = get_timer (0);
-            while ((dest2[i] & (FLASH_WORD_SIZE)0x00800080) !=
-                   (data2[i] & (FLASH_WORD_SIZE)0x00800080)) {
-              if (get_timer(start) > CFG_FLASH_WRITE_TOUT) {
-                return (1);
-              }
-            }
-          }
+	    /* data polling for D7 */
+	    start = get_timer (0);
+	    while ((dest2[i] & (FLASH_WORD_SIZE)0x00800080) !=
+		   (data2[i] & (FLASH_WORD_SIZE)0x00800080)) {
+	      if (get_timer(start) > CFG_FLASH_WRITE_TOUT) {
+		return (1);
+	      }
+	    }
+	  }
 
 	return (0);
 }

diff --git a/board/cray/L1/init.S b/board/cray/L1/init.S
index acc5205..72a10d3 100644
--- a/board/cray/L1/init.S
+++ b/board/cray/L1/init.S

@@ -52,53 +52,53 @@
 /*	control registers to set that up are determined by what we've */
 /*	empirically discovered work there. */
 
-     	.globl	ext_bus_cntlr_init
+	.globl	ext_bus_cntlr_init
 ext_bus_cntlr_init:
-        mflr    r4                      /* save link register */
-        bl      ..getAddr
+	mflr    r4                      /* save link register */
+	bl      ..getAddr
 ..getAddr:
-        mflr    r3                      /* get address of ..getAddr */
-        mtlr    r4                      /* restore link register */
-        addi    r4,0,14                 /* set ctr to 10; used to prefetch */
-        mtctr   r4                      /* 10 cache lines to fit this function */
-                                        /* in cache (gives us 8x10=80 instrctns) */
+	mflr    r3                      /* get address of ..getAddr */
+	mtlr    r4                      /* restore link register */
+	addi    r4,0,14                 /* set ctr to 10; used to prefetch */
+	mtctr   r4                      /* 10 cache lines to fit this function */
+					/* in cache (gives us 8x10=80 instrctns) */
 ..ebcloop:
-        icbt    r0,r3                   /* prefetch cache line for addr in r3 */
-        addi    r3,r3,32		/* move to next cache line */
-        bdnz    ..ebcloop               /* continue for 10 cache lines */
+	icbt    r0,r3                   /* prefetch cache line for addr in r3 */
+	addi    r3,r3,32		/* move to next cache line */
+	bdnz    ..ebcloop               /* continue for 10 cache lines */
 
-        /*------------------------------------------------------------------- */
-        /* Delay to ensure all accesses to ROM are complete before changing */
+	/*------------------------------------------------------------------- */
+	/* Delay to ensure all accesses to ROM are complete before changing */
 	    /* bank 0 timings. 200usec should be enough. */
-        /*   200,000,000 (cycles/sec) X .000200 (sec) = 0x9C40 cycles */
-        /*------------------------------------------------------------------- */
+	/*   200,000,000 (cycles/sec) X .000200 (sec) = 0x9C40 cycles */
+	/*------------------------------------------------------------------- */
 	addis	r3,0,0x0
-        ori     r3,r3,0xA000          /* ensure 200usec have passed since reset */
-        mtctr   r3
+	ori     r3,r3,0xA000          /* ensure 200usec have passed since reset */
+	mtctr   r3
 ..spinlp:
-        bdnz    ..spinlp                /* spin loop */
+	bdnz    ..spinlp                /* spin loop */
 
 
-        /*---------------------------------------------------------------------- */
-        /* Peripheral Bank 0 (Flash) initialization */
-        /*---------------------------------------------------------------------- */
+	/*---------------------------------------------------------------------- */
+	/* Peripheral Bank 0 (Flash) initialization */
+	/*---------------------------------------------------------------------- */
 		/* 0x7F8FFE80 slowest boot */
-        addi    r4,0,pb0ap
-        mtdcr   ebccfga,r4
-        addis   r4,0,0x9B01
-        ori     r4,r4,0x5480
-        mtdcr   ebccfgd,r4
+	addi    r4,0,pb0ap
+	mtdcr   ebccfga,r4
+	addis   r4,0,0x9B01
+	ori     r4,r4,0x5480
+	mtdcr   ebccfgd,r4
 
-        addi    r4,0,pb0cr
-        mtdcr   ebccfga,r4
-        addis   r4,0,0xFFC5           /* BAS=0xFFC,BS=0x4(4MB),BU=0x3(R/W), */
-        ori     r4,r4,0x8000          /* BW=0x0( 8 bits) */
-        mtdcr   ebccfgd,r4
+	addi    r4,0,pb0cr
+	mtdcr   ebccfga,r4
+	addis   r4,0,0xFFC5           /* BAS=0xFFC,BS=0x4(4MB),BU=0x3(R/W), */
+	ori     r4,r4,0x8000          /* BW=0x0( 8 bits) */
+	mtdcr   ebccfgd,r4
 
-        blr
+	blr
 
-        /*---------------------------------------------------------------------- */
-        /* Peripheral Bank 1 (NVRAM/RTC) initialization */
+	/*---------------------------------------------------------------------- */
+	/* Peripheral Bank 1 (NVRAM/RTC) initialization */
 		/* CRAY:the L1 has NOT this bank, it is tied to SV2/IOCA/etc/ instead */
 		/* and we do DMA on it.  The ConfigurationRegister part is threfore */
 		/* almost arbitrary, except that our linux driver needs to know the */
@@ -119,21 +119,21 @@
 		/* ByteEnableMode			BEM=0 */
 		/* ParityEnable				PEN=0 */
 		/* all reserved bits=0 */
-        /*---------------------------------------------------------------------- */
-        /*---------------------------------------------------------------------- */
-        addi    r4,0,pb1ap
-        mtdcr   ebccfga,r4
-        addis   r4,0,0x0185		/* hiword */
-        ori     r4,r4,0x4380	/* loword */
-        mtdcr   ebccfgd,r4
+	/*---------------------------------------------------------------------- */
+	/*---------------------------------------------------------------------- */
+	addi    r4,0,pb1ap
+	mtdcr   ebccfga,r4
+	addis   r4,0,0x0185		/* hiword */
+	ori     r4,r4,0x4380	/* loword */
+	mtdcr   ebccfgd,r4
 
-        addi    r4,0,pb1cr
-        mtdcr   ebccfga,r4
-        addis   r4,0,0xF001           /* BAS=0xF00,BS=0x0(1MB),BU=0x3(R/W), */
-        ori     r4,r4,0x8000          /* BW=0x0( 8 bits) */
-        mtdcr   ebccfgd,r4
+	addi    r4,0,pb1cr
+	mtdcr   ebccfga,r4
+	addis   r4,0,0xF001           /* BAS=0xF00,BS=0x0(1MB),BU=0x3(R/W), */
+	ori     r4,r4,0x8000          /* BW=0x0( 8 bits) */
+	mtdcr   ebccfgd,r4
 
-        blr
+	blr
 
 /*----------------------------------------------------------------------------- */
 /* Function:	sdram_init */
@@ -141,7 +141,7 @@
 /*				NOTE: for CrayL1 we have ECC memory, so enable it. */
 /*....now done in C in L1.c:init_sdram for readability. */
 /*----------------------------------------------------------------------------- */
-        .globl  sdram_init
+	.globl  sdram_init
 
 sdram_init:
  blr

diff --git a/board/cray/L1/u-boot.lds b/board/cray/L1/u-boot.lds
index a709158..88c880e 100644
--- a/board/cray/L1/u-boot.lds
+++ b/board/cray/L1/u-boot.lds

@@ -121,6 +121,11 @@
   _edata  =  .;
   PROVIDE (edata = .);
 
+  __u_boot_cmd_start = .;
+  .u_boot_cmd : { *(.u_boot_cmd) }
+  __u_boot_cmd_end = .;
+
+
   __start___ex_table = .;
   __ex_table : { *(__ex_table) }
   __stop___ex_table = .;

diff --git a/board/cray/L1/u-boot.lds.debug b/board/cray/L1/u-boot.lds.debug
index f4f9743..d483424 100644
--- a/board/cray/L1/u-boot.lds.debug
+++ b/board/cray/L1/u-boot.lds.debug

@@ -106,6 +106,11 @@
   _edata  =  .;
   PROVIDE (edata = .);
 
+  __u_boot_cmd_start = .;
+  .u_boot_cmd : { *(.u_boot_cmd) }
+  __u_boot_cmd_end = .;
+
+
   __start___ex_table = .;
   __ex_table : { *(__ex_table) }
   __stop___ex_table = .;
@@ -128,4 +133,3 @@
   _end = . ;
   PROVIDE (end = .);
 }
-

diff --git a/board/csb226/Makefile b/board/csb226/Makefile
index e6bf4ea..ac94642 100644
--- a/board/csb226/Makefile
+++ b/board/csb226/Makefile

@@ -29,7 +29,7 @@
 SOBJS	:= memsetup.o
 
 $(LIB):	$(OBJS) $(SOBJS)
-	$(AR) crv $@ $^
+	$(AR) crv $@ $(OBJS) $(SOBJS)
 
 clean:
 	rm -f $(SOBJS) $(OBJS)

diff --git a/board/csb226/config.mk b/board/csb226/config.mk
index 939ffff..2354392 100644
--- a/board/csb226/config.mk
+++ b/board/csb226/config.mk

@@ -13,4 +13,3 @@
 # for the addresses _after_ relocation to RAM!! Otherwhise the
 # .bss segment is assumed in flash...
 TEXT_BASE = 0xa1fe0000
-

diff --git a/board/csb226/csb226.c b/board/csb226/csb226.c
index a79d168..bf9b4f8 100644
--- a/board/csb226/csb226.c
+++ b/board/csb226/csb226.c

@@ -32,15 +32,15 @@
 # define SHOW_BOOT_PROGRESS(arg)
 #endif
 
-/** 
+/**
  * misc_init_r: - misc initialisation routines
  */
 
 int misc_init_r(void)
 {
-#if 0	
+#if 0
 	uchar *str;
-	
+
 	/* determine if the software update key is pressed during startup */
 	/* not ported yet... */
 	if (GPLR0 & 0x00000800) {
@@ -52,15 +52,15 @@
 	}
 
 	setenv("bootcmd",str);
-#endif	
+#endif
 	return 0;
-}	
+}
 
 
-/** 
+/**
  * board_init: - setup some data structures
  *
- * @return: 0 in case of success	
+ * @return: 0 in case of success
  */
 
 int board_init (void)
@@ -80,7 +80,7 @@
 }
 
 
-/** 
+/**
  * dram_init: - setup dynamic RAM
  *
  * @return: 0 in case of success
@@ -97,7 +97,7 @@
 }
 
 
-/** 
+/**
  * csb226_set_led: - switch LEDs on or off
  *
  * @param led:   LED to switch (0,1,2)
@@ -108,26 +108,26 @@
 {
 	switch(led) {
 
-		case 0: if (state==1) { 
-				GPCR0 |= CSB226_USER_LED0; 
+		case 0: if (state==1) {
+				GPCR0 |= CSB226_USER_LED0;
 			} else if (state==0) {
 				GPSR0 |= CSB226_USER_LED0;
 			}
 			break;
 
 		case 1: if (state==1) {
-                                GPCR0 |= CSB226_USER_LED1;
-                        } else if (state==0) {
-                                GPSR0 |= CSB226_USER_LED1;
-                        }
-                        break;
+				GPCR0 |= CSB226_USER_LED1;
+			} else if (state==0) {
+				GPSR0 |= CSB226_USER_LED1;
+			}
+			break;
 
 		case 2: if (state==1) {
-                                GPCR0 |= CSB226_USER_LED2;
-                        } else if (state==0) {
-                                GPSR0 |= CSB226_USER_LED2;
-                        }
-                        break;
+				GPCR0 |= CSB226_USER_LED2;
+			} else if (state==0) {
+				GPSR0 |= CSB226_USER_LED2;
+			}
+			break;
 	}
 
 	return;
@@ -137,10 +137,10 @@
 /**
  * show_boot_progress: - indicate state of the boot process
  *
- * @param status: Status number - see README for details. 
+ * @param status: Status number - see README for details.
  *
- * The CSB226 does only have 3 LEDs, so we switch them on at the most 
- * important states (1, 5, 15).  
+ * The CSB226 does only have 3 LEDs, so we switch them on at the most
+ * important states (1, 5, 15).
  */
 
 void show_boot_progress (int status)
@@ -153,4 +153,3 @@
 
 	return;
 }
-

diff --git a/board/csb226/flash.c b/board/csb226/flash.c
index 0ee78e6..9801773 100644
--- a/board/csb226/flash.c
+++ b/board/csb226/flash.c

@@ -7,7 +7,7 @@
  * Marius Groeger <mgroeger@sysgo.de>
  *
  * (C) Copyright 2002
- * Robert Schwebel, Pengutronix, <r.schwebel@pengutronix.de> 
+ * Robert Schwebel, Pengutronix, <r.schwebel@pengutronix.de>
  *
  * See file CREDITS for list of people who contributed to this
  * project.
@@ -89,7 +89,7 @@
 /**
  * flash_print_info: - print information about the flash situation
  *
- * @param info: 
+ * @param info:
  */
 
 void flash_print_info  (flash_info_t *info)
@@ -118,13 +118,13 @@
 				return;
 		}
 
-		printf("  Size: %ld MB in %d Sectors\n", 
+		printf("  Size: %ld MB in %d Sectors\n",
 			info->size >> 20, info->sector_count);
 
 		printf("  Sector Start Addresses:");
 		for (i = 0; i < info->sector_count; i++) {
 			if ((i % 5) == 0) printf ("\n   ");
-	        
+
 			printf (" %08lX%s", info->start[i],
 				info->protect[i] ? " (RO)" : "     ");
 		}
@@ -153,7 +153,7 @@
 
 	if ((info->flash_id & FLASH_VENDMASK) != (INTEL_MANUFACT & FLASH_VENDMASK))
 		return ERR_UNKNOWN_FLASH_VENDOR;
-	
+
 	prot = 0;
 	for (sect=s_first; sect<=s_last; ++sect) {
 		if (info->protect[sect]) prot++;
@@ -203,7 +203,7 @@
 			*addr = 0x00FF00FF; /* resest to read mode          */
 
 		}
-		
+
 		printf("ok.\n");
 	}
 
@@ -222,10 +222,10 @@
 
 /**
  * write_word: - copy memory to flash
- * 
+ *
  * @param info:
  * @param dest:
- * @param data: 
+ * @param data:
  * @return:
  */
 
@@ -301,8 +301,8 @@
 
 /**
  * write_buf: - Copy memory to flash.
- * 
- * @param info:	 
+ *
+ * @param info:
  * @param src:	source of copy transaction
  * @param addr:	where to copy to
  * @param cnt: 	number of bytes to copy
@@ -372,4 +372,3 @@
 
 	return write_word(info, wp, data);
 }
-

diff --git a/board/csb226/memsetup.S b/board/csb226/memsetup.S
index 60f9d50..68577ca 100644
--- a/board/csb226/memsetup.S
+++ b/board/csb226/memsetup.S

@@ -159,7 +159,7 @@
 
 mem_init:
 
-        ldr     r1,  =MEMC_BASE		/* get memory controller base addr. */
+	ldr     r1,  =MEMC_BASE		/* get memory controller base addr. */
 
 	/* ---------------------------------------------------------------- */
 	/* Step 2a: Initialize Asynchronous static memory controller        */
@@ -167,65 +167,65 @@
 
 	/* MSC registers: timing, bus width, mem type                       */
 
-        /* MSC0: nCS(0,1)                                                   */
-        ldr     r2,   =CFG_MSC0_VAL
-        str     r2,   [r1, #MSC0_OFFSET]
-        ldr     r2,   [r1, #MSC0_OFFSET]	/* read back to ensure      */
+	/* MSC0: nCS(0,1)                                                   */
+	ldr     r2,   =CFG_MSC0_VAL
+	str     r2,   [r1, #MSC0_OFFSET]
+	ldr     r2,   [r1, #MSC0_OFFSET]	/* read back to ensure      */
 						/* that data latches        */
-        /* MSC1: nCS(2,3)                                                   */
-        ldr     r2,  =CFG_MSC1_VAL
-        str     r2,  [r1, #MSC1_OFFSET]
-        ldr     r2,  [r1, #MSC1_OFFSET]
+	/* MSC1: nCS(2,3)                                                   */
+	ldr     r2,  =CFG_MSC1_VAL
+	str     r2,  [r1, #MSC1_OFFSET]
+	ldr     r2,  [r1, #MSC1_OFFSET]
 
 	/* MSC2: nCS(4,5)                                                   */
-        ldr     r2,  =CFG_MSC2_VAL
-        str     r2,  [r1, #MSC2_OFFSET]
-        ldr     r2,  [r1, #MSC2_OFFSET]
+	ldr     r2,  =CFG_MSC2_VAL
+	str     r2,  [r1, #MSC2_OFFSET]
+	ldr     r2,  [r1, #MSC2_OFFSET]
 
 	/* ---------------------------------------------------------------- */
 	/* Step 2b: Initialize Card Interface                               */
 	/* ---------------------------------------------------------------- */
 
 	/* MECR: Memory Expansion Card Register                             */
-        ldr     r2,  =CFG_MECR_VAL
-        str     r2,  [r1, #MECR_OFFSET]
+	ldr     r2,  =CFG_MECR_VAL
+	str     r2,  [r1, #MECR_OFFSET]
 	ldr	r2,	[r1, #MECR_OFFSET]
 
 	/* MCMEM0: Card Interface slot 0 timing                             */
-        ldr     r2,  =CFG_MCMEM0_VAL
-        str     r2,  [r1, #MCMEM0_OFFSET]
+	ldr     r2,  =CFG_MCMEM0_VAL
+	str     r2,  [r1, #MCMEM0_OFFSET]
 	ldr	r2,	[r1, #MCMEM0_OFFSET]
 
-        /* MCMEM1: Card Interface slot 1 timing                             */
-        ldr     r2,  =CFG_MCMEM1_VAL
-        str     r2,  [r1, #MCMEM1_OFFSET]
+	/* MCMEM1: Card Interface slot 1 timing                             */
+	ldr     r2,  =CFG_MCMEM1_VAL
+	str     r2,  [r1, #MCMEM1_OFFSET]
 	ldr	r2,	[r1, #MCMEM1_OFFSET]
 
 	/* MCATT0: Card Interface Attribute Space Timing, slot 0            */
-        ldr     r2,  =CFG_MCATT0_VAL
-        str     r2,  [r1, #MCATT0_OFFSET]
+	ldr     r2,  =CFG_MCATT0_VAL
+	str     r2,  [r1, #MCATT0_OFFSET]
 	ldr	r2,	[r1, #MCATT0_OFFSET]
 
 	/* MCATT1: Card Interface Attribute Space Timing, slot 1            */
-        ldr     r2,  =CFG_MCATT1_VAL
-        str     r2,  [r1, #MCATT1_OFFSET]
+	ldr     r2,  =CFG_MCATT1_VAL
+	str     r2,  [r1, #MCATT1_OFFSET]
 	ldr	r2,	[r1, #MCATT1_OFFSET]
 
 	/* MCIO0: Card Interface I/O Space Timing, slot 0                   */
-        ldr     r2,  =CFG_MCIO0_VAL
-        str     r2,  [r1, #MCIO0_OFFSET]
+	ldr     r2,  =CFG_MCIO0_VAL
+	str     r2,  [r1, #MCIO0_OFFSET]
 	ldr	r2,	[r1, #MCIO0_OFFSET]
 
 	/* MCIO1: Card Interface I/O Space Timing, slot 1                   */
-        ldr     r2,  =CFG_MCIO1_VAL
-        str     r2,  [r1, #MCIO1_OFFSET]
+	ldr     r2,  =CFG_MCIO1_VAL
+	str     r2,  [r1, #MCIO1_OFFSET]
 	ldr	r2,	[r1, #MCIO1_OFFSET]
 
 	/* ---------------------------------------------------------------- */
-        /* Step 2c: Write FLYCNFG  FIXME: what's that???                    */
-        /* ---------------------------------------------------------------- */
+	/* Step 2c: Write FLYCNFG  FIXME: what's that???                    */
+	/* ---------------------------------------------------------------- */
 
-        /* test if we run from flash or RAM - RAM/BDI: don't setup RAM      */
+	/* test if we run from flash or RAM - RAM/BDI: don't setup RAM      */
 	adr	r3, mem_init		/* r0 <- current position of code   */
 	ldr	r2, =mem_init
 	cmp	r3, r2			/* skip init if in place            */
@@ -233,8 +233,8 @@
 
 
 	/* ---------------------------------------------------------------- */
-        /* Step 2d: Initialize Timing for Sync Memory (SDCLK0)              */
-        /* ---------------------------------------------------------------- */
+	/* Step 2d: Initialize Timing for Sync Memory (SDCLK0)              */
+	/* ---------------------------------------------------------------- */
 
 	/* Before accessing MDREFR we need a valid DRI field, so we set     */
 	/* this to power on defaults + DRI field.                           */
@@ -246,7 +246,7 @@
 	orr	r4,	r4,  r3
 
 	str	r4,	[r1, #MDREFR_OFFSET]	/* write back MDREFR        */
-        ldr     r4,	[r1, #MDREFR_OFFSET]
+	ldr     r4,	[r1, #MDREFR_OFFSET]
 
 
 	/* ---------------------------------------------------------------- */
@@ -262,9 +262,9 @@
 	/* FIXME: we use async mode for now                                 */
 
 
-        /* ---------------------------------------------------------------- */
-        /* Step 4: Initialize SDRAM                                         */
-        /* ---------------------------------------------------------------- */
+	/* ---------------------------------------------------------------- */
+	/* Step 4: Initialize SDRAM                                         */
+	/* ---------------------------------------------------------------- */
 
 	/* Step 4a: assert MDREFR:K?RUN and configure                       */
 	/*          MDREFR:K1DB2 and MDREFR:K2DB2 as desired.               */
@@ -277,16 +277,16 @@
 
 	bic	r4,	r4, #(MDREFR_SLFRSH)
 
-        str     r4,     [r1, #MDREFR_OFFSET]    /* write back MDREFR        */
-        ldr     r4,     [r1, #MDREFR_OFFSET]
+	str     r4,     [r1, #MDREFR_OFFSET]    /* write back MDREFR        */
+	ldr     r4,     [r1, #MDREFR_OFFSET]
 
 
 	/* Step 4c: assert MDREFR:E1PIN and E0PIO                           */
 
 	orr	r4,	r4,	#(MDREFR_E1PIN|MDREFR_E0PIN)
 
-        str     r4,     [r1, #MDREFR_OFFSET]    /* write back MDREFR        */
-        ldr     r4,     [r1, #MDREFR_OFFSET]
+	str     r4,     [r1, #MDREFR_OFFSET]    /* write back MDREFR        */
+	ldr     r4,     [r1, #MDREFR_OFFSET]
 
 
 	/* Step 4d: write MDCNFG with MDCNFG:DEx deasserted (set to 0), to  */
@@ -295,8 +295,8 @@
 	ldr	r4,	=CFG_MDCNFG_VAL
 	bic	r4,	r4,	#(MDCNFG_DE0|MDCNFG_DE1)
 
-        str     r4,     [r1, #MDCNFG_OFFSET]	/* write back MDCNFG        */
-        ldr     r4,     [r1, #MDCNFG_OFFSET]
+	str     r4,     [r1, #MDCNFG_OFFSET]	/* write back MDCNFG        */
+	ldr     r4,     [r1, #MDCNFG_OFFSET]
 
 
 	/* Step 4e: Wait for the clock to the SDRAMs to stabilize,          */
@@ -345,8 +345,8 @@
 
 	/* Step 4h: Write MDMRS.                                            */
 
-        ldr     r2,  =CFG_MDMRS_VAL
-        str     r2,  [r1, #MDMRS_OFFSET]
+	ldr     r2,  =CFG_MDMRS_VAL
+	str     r2,  [r1, #MDMRS_OFFSET]
 
 
 	/* We are finished with Intel's memory controller initialisation    */
@@ -357,17 +357,17 @@
 
 initirqs:
 
-        mov     r1, #0		/* clear int. level register (IRQ, not FIQ) */
-        ldr     r2,  =ICLR
-        str     r1,  [r2]
+	mov     r1, #0		/* clear int. level register (IRQ, not FIQ) */
+	ldr     r2,  =ICLR
+	str     r1,  [r2]
 
-        ldr     r2,  =ICMR	/* mask all interrupts at the controller    */
-        str     r1,  [r2]
+	ldr     r2,  =ICMR	/* mask all interrupts at the controller    */
+	str     r1,  [r2]
 
 
-        /* ---------------------------------------------------------------- */
+	/* ---------------------------------------------------------------- */
 	/* Clock initialisation                                             */
-        /* ---------------------------------------------------------------- */
+	/* ---------------------------------------------------------------- */
 
 initclks:
 
@@ -376,34 +376,34 @@
 
 	/* Turn Off ALL on-chip peripheral clocks for re-configuration      */
 	/* Note: See label 'ENABLECLKS' for the re-enabling                 */
-        ldr     r1,  =CKEN
-        mov     r2,  #0
-        str     r2,  [r1]
+	ldr     r1,  =CKEN
+	mov     r2,  #0
+	str     r2,  [r1]
 
 
-        /* default value in case no valid rotary switch setting is found    */
-        ldr     r2, =(CCCR_L27|CCCR_M2|CCCR_N10)  /* DEFAULT: {200/200/100} */
+	/* default value in case no valid rotary switch setting is found    */
+	ldr     r2, =(CCCR_L27|CCCR_M2|CCCR_N10)  /* DEFAULT: {200/200/100} */
 
-        /* ... and write the core clock config register                     */
-        ldr     r1,  =CCCR
-        str     r2,  [r1]
+	/* ... and write the core clock config register                     */
+	ldr     r1,  =CCCR
+	str     r2,  [r1]
 
 	/* enable the 32Khz oscillator for RTC and PowerManager             */
 /*
-        ldr     r1,  =OSCC
-        mov     r2,  #OSCC_OON
-        str     r2,  [r1]
+	ldr     r1,  =OSCC
+	mov     r2,  #OSCC_OON
+	str     r2,  [r1]
 */
 	/* NOTE:  spin here until OSCC.OOK get set, meaning the PLL         */
 	/* has settled.                                                     */
 60:
-        ldr     r2, [r1]
-        ands    r2, r2, #1
-        beq     60b
+	ldr     r2, [r1]
+	ands    r2, r2, #1
+	beq     60b
 
 	/* ---------------------------------------------------------------- */
 	/*                                                                  */
-        /* ---------------------------------------------------------------- */
+	/* ---------------------------------------------------------------- */
 
 	/* Save SDRAM size                                                  */
 	ldr	r1, =DRAM_SIZE
@@ -428,11 +428,10 @@
 	mcr	p14,0,r0,c10,c0,0  /* dcsr */
 #endif
 
-        /* ---------------------------------------------------------------- */
+	/* ---------------------------------------------------------------- */
 	/* End memsetup                                                     */
-        /* ---------------------------------------------------------------- */
+	/* ---------------------------------------------------------------- */
 
 endmemsetup:
 
     mov     pc, lr
-

diff --git a/board/csb226/u-boot.lds b/board/csb226/u-boot.lds
index 46beb15..4c4cabf 100644
--- a/board/csb226/u-boot.lds
+++ b/board/csb226/u-boot.lds

@@ -26,29 +26,33 @@
 ENTRY(_start)
 SECTIONS
 {
-        . = 0x00000000;
+	. = 0x00000000;
 
-        . = ALIGN(4);
+	. = ALIGN(4);
 	.text      :
 	{
 	  cpu/pxa/start.o	(.text)
 	  *(.text)
 	}
 
-        . = ALIGN(4);
-        .rodata : { *(.rodata) }
+	. = ALIGN(4);
+	.rodata : { *(.rodata) }
 
-        . = ALIGN(4);
-        .data : { *(.data) }
+	. = ALIGN(4);
+	.data : { *(.data) }
 
-        . = ALIGN(4);
-        .got : { *(.got) }
+	. = ALIGN(4);
+	.got : { *(.got) }
+
+   __u_boot_cmd_start = .;
+   .u_boot_cmd : { *(.u_boot_cmd) }
+   __u_boot_cmd_end = .;
 
 	armboot_end_data = .;
 
-        . = ALIGN(4);
+	. = ALIGN(4);
 	bss_start = .;
-        .bss : { *(.bss) }
+	.bss : { *(.bss) }
 	bss_end = .;
 
 	armboot_end = .;

diff --git a/board/cu824/Makefile b/board/cu824/Makefile
index 35b8428..7a2014d 100644
--- a/board/cu824/Makefile
+++ b/board/cu824/Makefile

@@ -28,7 +28,7 @@
 OBJS	= $(BOARD).o flash.o
 
 $(LIB):	.depend $(OBJS)
-	$(AR) crv $@ $^
+	$(AR) crv $@ $(OBJS)
 
 #########################################################################
 

diff --git a/board/cu824/README b/board/cu824/README
index d38c48e..cc0d207 100644
--- a/board/cu824/README
+++ b/board/cu824/README

@@ -38,7 +38,7 @@
 bootm   - boot application image from memory
 bootp   - boot image via network using BootP/TFTP protocol
 tftpboot- boot image via network using TFTP protocol
-               and env variables ipaddr and serverip
+	       and env variables ipaddr and serverip
 rarpboot- boot image via network using RARP/TFTP protocol
 bootd   - boot default, i.e., run 'bootcmd'
 loads   - load S-Record file over serial line

diff --git a/board/cu824/flash.c b/board/cu824/flash.c
index 61b759e..7368176 100644
--- a/board/cu824/flash.c
+++ b/board/cu824/flash.c

@@ -76,7 +76,7 @@
     DEBUGF("Write protect is:  0x%02X\n", *bcr);
 
     for (i = 0; i < CFG_MAX_FLASH_BANKS; i++) {
-    	vu_long *addr = (vu_long *)(CFG_FLASH_BASE + i * FLASH_BANK_SIZE);
+	vu_long *addr = (vu_long *)(CFG_FLASH_BASE + i * FLASH_BANK_SIZE);
 
 	addr[0] = 0x00900090;
 
@@ -91,7 +91,7 @@
 	    (addr[2] == addr[3]) && (addr[2] == INTEL_ID_28F160F3B))
 	{
 	    flash_info[i].flash_id = (FLASH_MAN_INTEL & FLASH_VENDMASK) |
-	    			     (INTEL_ID_28F160F3B & FLASH_TYPEMASK);
+				     (INTEL_ID_28F160F3B & FLASH_TYPEMASK);
 	} else {
 	    flash_info[i].flash_id = FLASH_UNKNOWN;
 	    addr[0] = 0xFFFFFFFF;
@@ -108,12 +108,12 @@
 	for (j = 0; j < flash_info[i].sector_count; j++) {
 		if (j <= 7) {
 			flash_info[i].start[j] = CFG_FLASH_BASE +
-			                         i * FLASH_BANK_SIZE +
-			                         j * PARAM_SECT_SIZE;
+						 i * FLASH_BANK_SIZE +
+						 j * PARAM_SECT_SIZE;
 		} else {
 			flash_info[i].start[j] = CFG_FLASH_BASE +
-			                         i * FLASH_BANK_SIZE +
-			                         (j - 7)*MAIN_SECT_SIZE;
+						 i * FLASH_BANK_SIZE +
+						 (j - 7)*MAIN_SECT_SIZE;
 		}
 	}
 	size += flash_info[i].size;
@@ -124,28 +124,28 @@
 #if CFG_MONITOR_BASE >= CFG_FLASH_BASE
 #if CFG_MONITOR_BASE >= CFG_FLASH_BASE + FLASH_BANK_SIZE
     flash_protect(FLAG_PROTECT_SET,
-              CFG_MONITOR_BASE,
-              CFG_MONITOR_BASE + monitor_flash_len - 1,
-              &flash_info[1]);
+	      CFG_MONITOR_BASE,
+	      CFG_MONITOR_BASE + monitor_flash_len - 1,
+	      &flash_info[1]);
 #else
     flash_protect(FLAG_PROTECT_SET,
-              CFG_MONITOR_BASE,
-              CFG_MONITOR_BASE + monitor_flash_len - 1,
-              &flash_info[0]);
+	      CFG_MONITOR_BASE,
+	      CFG_MONITOR_BASE + monitor_flash_len - 1,
+	      &flash_info[0]);
 #endif
 #endif
 
 #if (CFG_ENV_IS_IN_FLASH == 1) && defined(CFG_ENV_ADDR)
 #if CFG_ENV_ADDR >= CFG_FLASH_BASE + FLASH_BANK_SIZE
     flash_protect(FLAG_PROTECT_SET,
-              CFG_ENV_ADDR,
-              CFG_ENV_ADDR + CFG_ENV_SIZE - 1,
-              &flash_info[1]);
+	      CFG_ENV_ADDR,
+	      CFG_ENV_ADDR + CFG_ENV_SIZE - 1,
+	      &flash_info[1]);
 #else
     flash_protect(FLAG_PROTECT_SET,
-              CFG_ENV_ADDR,
-              CFG_ENV_ADDR + CFG_ENV_SIZE - 1,
-              &flash_info[0]);
+	      CFG_ENV_ADDR,
+	      CFG_ENV_ADDR + CFG_ENV_SIZE - 1,
+	      &flash_info[0]);
 #endif
 #endif
 
@@ -268,7 +268,7 @@
 			while (((addr[0] & 0x00800080) != 0x00800080) ||
 			       ((addr[1] & 0x00800080) != 0x00800080) ) {
 				if ((now=get_timer(start)) >
-				           CFG_FLASH_ERASE_TOUT) {
+					   CFG_FLASH_ERASE_TOUT) {
 					printf ("Timeout\n");
 					addr[0] = 0x00B000B0; /* suspend erase */
 					addr[0] = 0x00FF00FF; /* to read mode  */
@@ -328,7 +328,7 @@
 		for (i = 0, cp = wp; i < l; i++, cp++) {
 			if (i >= 4) {
 				*datah = (*datah << 8) |
-				                ((*datal & 0xFF000000) >> 24);
+						((*datal & 0xFF000000) >> 24);
 			}
 
 			*datal = (*datal << 8) | (*(uchar *)cp);
@@ -342,7 +342,7 @@
 
 			if (i >= 4) {
 				*datah = (*datah << 8) |
-			                        ((*datal & 0xFF000000) >> 24);
+						((*datal & 0xFF000000) >> 24);
 			}
 
 			*datal = (*datal << 8) | tmp;
@@ -353,7 +353,7 @@
 		for (; cnt == 0 && i < FLASH_WIDTH; ++i, ++cp) {
 			if (i >= 4) {
 				*datah = (*datah << 8) |
-				                ((*datal & 0xFF000000) >> 24);
+						((*datal & 0xFF000000) >> 24);
 			}
 
 			*datal = (*datah << 8) | (*(uchar *)cp);
@@ -394,7 +394,7 @@
 	for (i = 0, cp = wp; i < FLASH_WIDTH && cnt > 0; ++i, ++cp) {
 		char tmp;
 
-      		tmp = *src;
+		tmp = *src;
 
 		src++;
 

diff --git a/board/cu824/u-boot.lds b/board/cu824/u-boot.lds
index 401a9aa..7e6053a 100644
--- a/board/cu824/u-boot.lds
+++ b/board/cu824/u-boot.lds

@@ -103,6 +103,11 @@
   _edata  =  .;
   PROVIDE (edata = .);
 
+  __u_boot_cmd_start = .;
+  .u_boot_cmd : { *(.u_boot_cmd) }
+  __u_boot_cmd_end = .;
+
+
   __start___ex_table = .;
   __ex_table : { *(__ex_table) }
   __stop___ex_table = .;
@@ -126,4 +131,3 @@
   _end = . ;
   PROVIDE (end = .);
 }
-

diff --git a/board/dnp1110/Makefile b/board/dnp1110/Makefile
index 2437b22..31ef695 100644
--- a/board/dnp1110/Makefile
+++ b/board/dnp1110/Makefile

@@ -29,7 +29,7 @@
 SOBJS	:= memsetup.o
 
 $(LIB):	$(OBJS) $(SOBJS)
-	$(AR) crv $@ $^
+	$(AR) crv $@ $(OBJS) $(SOBJS)
 
 clean:
 	rm -f $(SOBJS) $(OBJS)

diff --git a/board/dnp1110/flash.c b/board/dnp1110/flash.c
index f4a8b99..4416393 100644
--- a/board/dnp1110/flash.c
+++ b/board/dnp1110/flash.c

@@ -67,16 +67,16 @@
 
     for (i = 0; i < CFG_MAX_FLASH_BANKS; i++)
     {
-        switch (i)
-        {
-           case 0:
-            flash_get_size((FPW *)PHYS_FLASH_1, &flash_info[i]);
-	         flash_get_offsets(PHYS_FLASH_1, &flash_info[i]);
-                break;
-           default:
-	        panic("configured to many flash banks!\n");
-                break;
-        }
+	switch (i)
+	{
+	   case 0:
+	    flash_get_size((FPW *)PHYS_FLASH_1, &flash_info[i]);
+		 flash_get_offsets(PHYS_FLASH_1, &flash_info[i]);
+		break;
+	   default:
+		panic("configured to many flash banks!\n");
+		break;
+	}
 	size += flash_info[i].size;
     }
 
@@ -122,7 +122,7 @@
 	if (info->flash_id == FLASH_UNKNOWN) {
 		printf ("missing or unknown FLASH type\n");
 		return;
-        }
+	}
 
 	switch (info->flash_id & FLASH_VENDMASK) {
 		case FLASH_MAN_INTEL:	printf ("INTEL ");		break;
@@ -133,21 +133,21 @@
    case FLASH_28F128J3A:
 				printf ("28F128J3A\n"); break;
 	default:		printf ("Unknown Chip Type\n"); break;
-        }
+	}
 
 	printf ("  Size: %ld MB in %d Sectors\n",
-	        info->size >> 20, info->sector_count);
+		info->size >> 20, info->sector_count);
 
 	printf ("  Sector Start Addresses:");
 	for (i=0; i<info->sector_count; ++i) {
-	        if ((i % 5) == 0)
-	        printf ("\n   ");
+		if ((i % 5) == 0)
+		printf ("\n   ");
 		printf (" %08lX%s",
 			info->start[i],
 			info->protect[i] ? " (RO)" : "     "
 		);
-        }
-        printf ("\n");
+	}
+	printf ("\n");
 	return;
 }
 
@@ -164,7 +164,7 @@
 
    mb();
 	value = addr[0];
-	
+
    switch (value) {
 
    case (FPW)INTEL_MANUFACT:
@@ -280,8 +280,8 @@
 			*addr = (FPW)0x00FF00FF; /* resest to read mode          */
 
 			printf (" done\n");
-        }
-        }
+	}
+	}
 	return rcode;
 }
 
@@ -350,7 +350,7 @@
 		cnt -= port_width;
 		if (count++ > 0x800)
 		{
-         spin_wheel();
+	 spin_wheel();
 			count = 0;
 		}
     }
@@ -422,4 +422,3 @@
    printf("\010%c", w[p]);
    (++p == 3) ? (p = 0) : 0;
 }
-

diff --git a/board/dnp1110/memsetup.S b/board/dnp1110/memsetup.S
index 6539c20..1622aea 100644
--- a/board/dnp1110/memsetup.S
+++ b/board/dnp1110/memsetup.S

@@ -24,7 +24,6 @@
  */
 
 
-
 #include "config.h"
 #include "version.h"
 
@@ -39,7 +38,7 @@
 #define MDCAS01		0x08		/* CAS waveform rotate reg 1 bank  */
 #define MDCAS02		0x0C		/* CAS waveform rotate reg 2 bank  */
 #define MDREFR		0x1C		/* DRAM refresh control reg        */
-#define MDCAS20		0x20		/* CAS waveform rotate reg 0 bank  */ 
+#define MDCAS20		0x20		/* CAS waveform rotate reg 0 bank  */
 #define MDCAS21		0x24		/* CAS waveform rotate reg 1 bank  */
 #define MDCAS22		0x28		/* CAS waveform rotate reg 2 bank  */
 #define MECR		0x18		/* Expansion memory (PCMCIA) bus configuration  register */

diff --git a/board/dnp1110/u-boot.lds b/board/dnp1110/u-boot.lds
index f4b0ade..7ac165e 100644
--- a/board/dnp1110/u-boot.lds
+++ b/board/dnp1110/u-boot.lds

@@ -26,28 +26,34 @@
 ENTRY(_start)
 SECTIONS
 {
-        . = 0x00000000;
+	. = 0x00000000;
 
-        . = ALIGN(4);
+	. = ALIGN(4);
 	.text      :
 	{
 	  cpu/sa1100/start.o	(.text)
 	  *(.text)
 	}
 
-        . = ALIGN(4);
-        .rodata : { *(.rodata) }
+	. = ALIGN(4);
+	.rodata : { *(.rodata) }
 
-        . = ALIGN(4);
-        .data : { *(.data) }
+	. = ALIGN(4);
+	.data : { *(.data) }
 
-        . = ALIGN(4);
-        .got : { *(.got) }
+	. = ALIGN(4);
+	.got : { *(.got) }
+
+
+  __u_boot_cmd_start = .;
+  .u_boot_cmd : { *(.u_boot_cmd) }
+  __u_boot_cmd_end = .;
+
 
 	armboot_end_data = .;
 
-        . = ALIGN(4);
-        .bss : { *(.bss) }
+	. = ALIGN(4);
+	.bss : { *(.bss) }
 
 	armboot_end = .;
 }

diff --git a/board/ebony/Makefile b/board/ebony/Makefile
index 61aee68..4a3927b 100644
--- a/board/ebony/Makefile
+++ b/board/ebony/Makefile

@@ -29,7 +29,7 @@
 SOBJS	= init.o
 
 $(LIB):	$(OBJS) $(SOBJS)
-	$(AR) crv $@ $^
+	$(AR) crv $@ $(OBJS)
 
 clean:
 	rm -f $(SOBJS) $(OBJS)

diff --git a/board/ebony/ebony.c b/board/ebony/ebony.c
index b36d542..bb284ae 100644
--- a/board/ebony/ebony.c
+++ b/board/ebony/ebony.c

@@ -92,7 +92,6 @@
 }
 
 
-
 int checkboard (void)
 {
 	sys_info_t sysinfo;
@@ -225,8 +224,8 @@
 	 *--------------------------------------------------------------------------*/
     strap = mfdcr(cpc0_strp1);
     if( (strap & 0x00100000) == 0 ){
-        printf("PCI: CPC0_STRP1[PAE] not set.\n");
-        return 0;
+	printf("PCI: CPC0_STRP1[PAE] not set.\n");
+	return 0;
     }
 
     return 1;

diff --git a/board/ebony/flash.c b/board/ebony/flash.c
index 961c616..d8b4757 100644
--- a/board/ebony/flash.c
+++ b/board/ebony/flash.c

@@ -55,14 +55,14 @@
 flash_info_t	flash_info[CFG_MAX_FLASH_BANKS]; /* info for FLASH chips	*/
 
 static  unsigned    long    flash_addr_table[8][CFG_MAX_FLASH_BANKS] = {
-        {0xffc00000, 0xffe00000, 0xff880000},   /* 0:000: configuraton 3 */
-        {0xffc00000, 0xffe00000, 0xff800000},   /* 1:001: configuraton 4 */
-        {0xffc00000, 0xffe00000, 0x00000000},   /* 2:010: configuraton 7 */
-        {0xffc00000, 0xffe00000, 0x00000000},   /* 3:011: configuraton 8 */
-        {0xff800000, 0xffa00000, 0xfff80000},   /* 4:100: configuraton 1 */
-        {0xff800000, 0xffa00000, 0xfff00000},   /* 5:101: configuraton 2 */
-        {0xffc00000, 0xffe00000, 0x00000000},   /* 6:110: configuraton 5 */
-        {0xffc00000, 0xffe00000, 0x00000000}    /* 7:111: configuraton 6 */
+	{0xffc00000, 0xffe00000, 0xff880000},   /* 0:000: configuraton 3 */
+	{0xffc00000, 0xffe00000, 0xff800000},   /* 1:001: configuraton 4 */
+	{0xffc00000, 0xffe00000, 0x00000000},   /* 2:010: configuraton 7 */
+	{0xffc00000, 0xffe00000, 0x00000000},   /* 3:011: configuraton 8 */
+	{0xff800000, 0xffa00000, 0xfff80000},   /* 4:100: configuraton 1 */
+	{0xff800000, 0xffa00000, 0xfff00000},   /* 5:101: configuraton 2 */
+	{0xffc00000, 0xffe00000, 0x00000000},   /* 6:110: configuraton 5 */
+	{0xffc00000, 0xffe00000, 0x00000000}    /* 7:111: configuraton 6 */
 };
 
 /*-----------------------------------------------------------------------
@@ -156,7 +156,6 @@
 }
 
 
-
 /*-----------------------------------------------------------------------
  */
 #if 0
@@ -199,10 +198,10 @@
 void flash_print_info  (flash_info_t *info)
 {
 	int i;
-        int k;
-        int size;
-        int erased;
-        volatile unsigned long *flash;
+	int k;
+	int size;
+	int erased;
+	volatile unsigned long *flash;
 
 	if (info->flash_id == FLASH_UNKNOWN) {
 		printf ("missing or unknown FLASH type\n");
@@ -250,17 +249,17 @@
 
 	printf ("  Sector Start Addresses:");
 	for (i=0; i<info->sector_count; ++i) {
-                /*
-                 * Check if whole sector is erased
-                 */
-                if (i != (info->sector_count-1))
+		/*
+		 * Check if whole sector is erased
+		 */
+		if (i != (info->sector_count-1))
 			size = info->start[i+1] - info->start[i];
-                else
+		else
 			size = info->start[0] + info->size - info->start[i];
-                erased = 1;
-                flash = (volatile unsigned long *)info->start[i];
-                size = size >> 2;        /* divide by 4 for longword access */
-                for (k=0; k<size; k++)
+		erased = 1;
+		flash = (volatile unsigned long *)info->start[i];
+		size = size >> 2;        /* divide by 4 for longword access */
+		for (k=0; k<size; k++)
 		{
 			if (*flash++ != 0xffffffff)
 			{
@@ -298,16 +297,16 @@
 			ulong base = (ulong)addr;
 			volatile FLASH_WORD_SIZE *addr2 = (FLASH_WORD_SIZE *)addr;
 
-            DEBUGF("FLASH ADDR: %08x\n", (unsigned)addr );
+	    DEBUGF("FLASH ADDR: %08x\n", (unsigned)addr );
 
 			/* Write auto select command: read Manufacturer ID */
-            udelay(10000);
+	    udelay(10000);
 			addr2[ADDR0] = (FLASH_WORD_SIZE)0x00AA00AA;
-            udelay(1000);
+	    udelay(1000);
 			addr2[ADDR1] = (FLASH_WORD_SIZE)0x00550055;
-            udelay(1000);
+	    udelay(1000);
 			addr2[ADDR0] = (FLASH_WORD_SIZE)0x00900090;
-            udelay(1000);
+	    udelay(1000);
 
 #ifdef CONFIG_ADCIOP
 			value = addr2[2];
@@ -352,11 +351,11 @@
 				info->sector_count = 32;
 				info->size = 0x00200000;
 				break;				/* => 2 MB		*/
-                        case (FLASH_WORD_SIZE)STM_ID_F040B:
-                                info->flash_id += FLASH_AM040;
-                                info->sector_count = 8;
-                                info->size = 0x0080000; /* => 512 ko */
-                                break;				
+			case (FLASH_WORD_SIZE)STM_ID_F040B:
+				info->flash_id += FLASH_AM040;
+				info->sector_count = 8;
+				info->size = 0x0080000; /* => 512 ko */
+				break;
 			case (FLASH_WORD_SIZE)AMD_ID_F040B:
 				info->flash_id += FLASH_AM040;
 				info->sector_count = 8;

diff --git a/board/ebony/init.S b/board/ebony/init.S
index 3ae93d6..cc8f8b4 100644
--- a/board/ebony/init.S
+++ b/board/ebony/init.S

@@ -94,5 +94,3 @@
     tlbentry( CFG_PCI_BASE, SZ_256M, 0x00000000, 2, AC_R|AC_W|SA_G|SA_I )
     tlbentry( CFG_PCI_MEMBASE, SZ_256M, 0x00000000, 3, AC_R|AC_W|SA_G|SA_I )
     tlbtab_end
-
-

diff --git a/board/ebony/u-boot.lds b/board/ebony/u-boot.lds
index ab8af7d..7ea7caf 100644
--- a/board/ebony/u-boot.lds
+++ b/board/ebony/u-boot.lds

@@ -126,6 +126,11 @@
   _edata  =  .;
   PROVIDE (edata = .);
 
+  __u_boot_cmd_start = .;
+  .u_boot_cmd : { *(.u_boot_cmd) }
+  __u_boot_cmd_end = .;
+
+
   __start___ex_table = .;
   __ex_table : { *(__ex_table) }
   __stop___ex_table = .;

diff --git a/board/ebony/u-boot.lds.debug b/board/ebony/u-boot.lds.debug
index c290a43..af497b1 100644
--- a/board/ebony/u-boot.lds.debug
+++ b/board/ebony/u-boot.lds.debug

@@ -106,6 +106,11 @@
   _edata  =  .;
   PROVIDE (edata = .);
 
+  __u_boot_cmd_start = .;
+  .u_boot_cmd : { *(.u_boot_cmd) }
+  __u_boot_cmd_end = .;
+
+
   __start___ex_table = .;
   __ex_table : { *(__ex_table) }
   __stop___ex_table = .;
@@ -128,4 +133,3 @@
   _end = . ;
   PROVIDE (end = .);
 }
-

diff --git a/board/eltec/bab7xx/Makefile b/board/eltec/bab7xx/Makefile
index 6e412c2..7d8ed26 100644
--- a/board/eltec/bab7xx/Makefile
+++ b/board/eltec/bab7xx/Makefile

@@ -30,7 +30,7 @@
 SOBJS	= asm_init.o
 
 $(LIB):	.depend $(OBJS) $(SOBJS)
-	$(AR) crv $@ $^
+	$(AR) crv $@ $(OBJS) $(SOBJS)
 
 clean:
 	rm -f $(SOBJS) $(OBJS)
@@ -46,12 +46,3 @@
 sinclude .depend
 
 #########################################################################
-
-
-
-
-
-
-
-
-

diff --git a/board/eltec/bab7xx/asm_init.S b/board/eltec/bab7xx/asm_init.S
index 934fabe..3f88bc2 100644
--- a/board/eltec/bab7xx/asm_init.S
+++ b/board/eltec/bab7xx/asm_init.S

@@ -204,7 +204,7 @@
     beq     SD16MB2B
 
     li      r3, 0x0011          /* get number of internal banks */
-                                /* from spd for bank0/1 */
+				/* from spd for bank0/1 */
     bl      spdRead
 
     cmpli   0, 0, r3, 0x02
@@ -244,7 +244,7 @@
  * set the Memory Configuration Reg. 2
  */
     li      r3, 0x0111          /* get number of internal banks */
-                                /* from spd for bank2/3 */
+				/* from spd for bank2/3 */
     bl      spdRead
 
     cmpli   0, 0, r3, 0x02
@@ -269,13 +269,13 @@
  */
 S2D64MB4B:
     lis     r21, 0x8630         /* BSTOPRE = 0x80, REFREC = 6, */
-                                /* RDLAT = 3 */
+				/* RDLAT = 3 */
 
 /*
  * set the Memory Configuration Reg. 4
  */
     lis     r22, 0x2430         /* PRETOACT = 2, ACTOPRE = 4, */
-                                /* WCBUF = 1, RCBUF = 1 */
+				/* WCBUF = 1, RCBUF = 1 */
     ori     r22, r22, 0x2220    /* SDMODE = 0x022, ACTORW = 2 */
 
 /*
@@ -285,10 +285,10 @@
     bl      spdRead
 
     rlwinm  r16, r3, 2, 24, 29  /* calculate size in MByte */
-                                /* (128 MB max.) */
+				/* (128 MB max.) */
 
     li      r3, 0x0005          /* get number of banks from spd */
-                                /* for bank0/1 */
+				/* for bank0/1 */
     bl      spdRead
 
     cmpi    0, 0, r3, 2         /* 2 banks ? */
@@ -336,10 +336,10 @@
     bl      spdRead
 
     rlwinm  r18, r3, 2, 24, 29  /* calculate size in MByte */
-                                /* (128 MB max.) */
+				/* (128 MB max.) */
 
     li      r3, 0x0105          /* get number of banks from */
-                                /* spd bank0/1 */
+				/* spd bank0/1 */
     bl      spdRead
 
     cmpi    0, 0, r3, 2         /* 2 banks ? */
@@ -365,7 +365,7 @@
 
 getSpdRowBank01:
     li      r3, 0x0003          /* get number of row bits from */
-                                /* spd from bank0/1 */
+				/* spd from bank0/1 */
     bl      spdRead
     ori     r20, r20, (MCCR1_BK0_9BITS | MCCR1_BK1_9BITS)
     cmpli   0, 0, r3, 0x0009    /* bank0 -  9 row bits */
@@ -392,7 +392,7 @@
 
 getSpdRowBank23:
     li     r3, 0x0103           /* get number of row bits from */
-                                /* spd for bank2/3 */
+				/* spd for bank2/3 */
     bl      spdRead
 
     ori     r20, r20, (MCCR1_BK2_9BITS | MCCR1_BK3_9BITS)
@@ -415,13 +415,13 @@
 writeRowBits:
     lis     r21, 0x000a         /* CPX = 1, RAS6P = 4 */
     ori     r21, r21, 0x2293    /* CAS5 = 2, CP4 = 1, */
-                                /* CAS3 = 2, RCD2 = 2, RP = 3 */
+				/* CAS3 = 2, RCD2 = 2, RP = 3 */
 /*
  * set the Memory Configuration Reg. 4
  */
     lis     r22, 0x0010         /* all SDRAM parameter 0, */
-                                /* WCBUF flow through, */
-                                /* RCBUF registered */
+				/* WCBUF flow through, */
+				/* RCBUF registered */
 /*
  * get the size of bank 0-3
  */
@@ -429,7 +429,7 @@
     bl      spdRead
 
     li      r16, 0              /* bank size is: */
-                                /* (8*2^row*2^column)/0x100000 MB */
+				/* (8*2^row*2^column)/0x100000 MB */
     ori     r16, r16, 0x8000
     rlwnm   r16, r16, r3, 0, 31
 
@@ -439,7 +439,7 @@
     rlwnm   r16, r16, r3, 0, 31
 
     li      r3, 0x0005          /* get number of banks from */
-                                /* spd for bank0/1 */
+				/* spd for bank0/1 */
     bl      spdRead
 
     cmpi    0, 0, r3, 2         /* 2 banks ? */
@@ -487,7 +487,7 @@
     bl      spdRead
 
     li      r18, 0              /* bank size is: */
-                                /* (8*2^row*2^column)/0x100000 MB */
+				/* (8*2^row*2^column)/0x100000 MB */
     ori     r18, r18, 0x8000
     rlwnm   r18, r18, r3, 0, 31
 
@@ -497,7 +497,7 @@
     rlwnm   r18, r18, r3, 0, 31
 
     li      r3, 0x0105          /* get number of banks from */
-                                /* spd for bank2/3 */
+				/* spd for bank2/3 */
     bl      spdRead
 
     cmpi    0, 0, r3, 2         /* 2 banks ? */
@@ -701,28 +701,28 @@
 
 common3:
     li      r4, 0x1010          /* refesh cycle 1028 clocks */
-                                /*  left shifted 2 */
+				/*  left shifted 2 */
     cmpli   0, 0, r3, 0x0000    /* 15.6 us ? */
     beq     writeRefresh
 
     li      r4, 0x0808          /* refesh cycle 514 clocks */
-                                /* left shifted 2 */
+				/* left shifted 2 */
     cmpli   0, 0, r3, 0x0002    /* 7.8 us ? */
     beq     writeRefresh
 
     li      r4, 0x2020          /* refesh cycle 2056 clocks */
-                                /* left shifted 2 */
+				/* left shifted 2 */
     cmpli   0, 0, r3, 0x0003    /* 31.3 us ? */
     beq     writeRefresh
 
     li      r4, 0x4040          /* refesh cycle 4112 clocks */
-                                /* left shifted 2 */
+				/* left shifted 2 */
     cmpli   0, 0, r3, 0x0004    /* 62.5 us ? */
     beq     writeRefresh
 
     li      r4, 0
     ori     r4, r4, 0x8080      /* refesh cycle 8224 clocks */
-                                /* left shifted 2 */
+				/* left shifted 2 */
     cmpli   0, 0, r3, 0x0005    /* 125 us ? */
     beq     writeRefresh
 
@@ -916,7 +916,7 @@
     eieio
     li      r9, 0x03
     stb     r9, 3(r8)           /* 8 data bits, 1 stop bit, */
-                                /* no parity */
+				/* no parity */
     eieio
     li      r9, 0x0b
     stb     r9, 4(r8)           /* enable the receiver and transmitter */
@@ -928,7 +928,7 @@
     beq     waitEmpty
     li      r9, 0x47
     stb     r9, 3(r8)           /* send break, 8 data bits, */
-                                /* 2 stop bits, no parity */
+				/* 2 stop bits, no parity */
     eieio
 
     lis     r0, 0x0001
@@ -944,7 +944,7 @@
     beq     waitEmpty1
     li      r9, 0x07
     stb     r9, 3(r8)           /* 8 data bits, 2 stop bits, */
-                                /* no parity */
+				/* no parity */
     eieio
 
 /*
@@ -1473,15 +1473,3 @@
 Mmbyte:
     .ascii  " MB .......... \000"
     .align  4
-
-
-
-
-
-
-
-
-
-
-
-

diff --git a/board/eltec/bab7xx/bab7xx.c b/board/eltec/bab7xx/bab7xx.c
index 6f6f977..b74b055 100644
--- a/board/eltec/bab7xx/bab7xx.c
+++ b/board/eltec/bab7xx/bab7xx.c

@@ -45,7 +45,7 @@
     unsigned char data = gpio->dta1;
 
     if (data & 0x02)
-        return 66666666;
+	return 66666666;
 
     return 83333333;
 }
@@ -58,7 +58,7 @@
 ulong bab7xx_get_gclk_freq (void)
 {
     static const int pllratio_to_factor[] = {
-        00, 75, 70, 00, 20, 65, 100, 45, 30, 55, 40, 50, 80, 60, 35, 00,
+	00, 75, 70, 00, 20, 65, 100, 45, 30, 55, 40, 50, 80, 60, 35, 00,
     };
 
     return pllratio_to_factor[get_hid1 () >> 28] * (bab7xx_get_bus_freq() / 10);
@@ -72,7 +72,7 @@
 
     printf ("MPC7xx V%d.%d",(pvr >> 8) & 0xFF, pvr & 0xFF);
     printf (" at %ld / %ld MHz\n",  bab7xx_get_gclk_freq()/1000000,
-            bab7xx_get_bus_freq()/1000000);
+	    bab7xx_get_bus_freq()/1000000);
 
     return (0);
 }
@@ -131,8 +131,8 @@
 
     for (reg = CFG_MEMTEST_START; reg < CFG_MEMTEST_END; reg+=4)
     {
-        if (*reg != reg)
-            return -1;
+	if (*reg != reg)
+	    return -1;
     }
 #endif
 
@@ -147,11 +147,11 @@
 
     do
     {
-        if (i & 0x01)   /* is bank enabled ? */
-            memSize += (mear1 & 0xff) - (msar1 & 0xff) + 1;
-        msar1 >>= 8;
-        mear1 >>= 8;
-        i     >>= 1;
+	if (i & 0x01)   /* is bank enabled ? */
+	    memSize += (mear1 & 0xff) - (msar1 & 0xff) + 1;
+	msar1 >>= 8;
+	mear1 >>= 8;
+	i     >>= 1;
     } while (i);
 
     return (memSize * 0x100000);
@@ -222,20 +222,20 @@
     switch (line_number)
     {
     case 1:
-        sprintf (info," MPC7xx V%d.%d at %ld / %ld MHz",
-            (get_pvr() >> 8) & 0xFF,
-            get_pvr() & 0xFF,
-            bab7xx_get_gclk_freq()/1000000,
-            bab7xx_get_bus_freq()/1000000);
-        return;
+	sprintf (info," MPC7xx V%d.%d at %ld / %ld MHz",
+	    (get_pvr() >> 8) & 0xFF,
+	    get_pvr() & 0xFF,
+	    bab7xx_get_gclk_freq()/1000000,
+	    bab7xx_get_bus_freq()/1000000);
+	return;
     case 2:
-        sprintf (info, " ELTEC BAB7xx with %ld MB DRAM and %ld MB FLASH",
-            dram_size(0)/0x100000,
-            flash_init()/0x100000);
-        return;
+	sprintf (info, " ELTEC BAB7xx with %ld MB DRAM and %ld MB FLASH",
+	    dram_size(0)/0x100000,
+	    flash_init()/0x100000);
+	return;
     case 3:
-        sprintf (info, " %s", smi.modeIdent);
-        return;
+	sprintf (info, " %s", smi.modeIdent);
+	return;
     }
 
     /* no more info lines */

diff --git a/board/eltec/bab7xx/dc_srom.c b/board/eltec/bab7xx/dc_srom.c
index ef956e6..a44af6e 100644
--- a/board/eltec/bab7xx/dc_srom.c
+++ b/board/eltec/bab7xx/dc_srom.c

@@ -118,7 +118,7 @@
     a = (char)(offset << 2);
     for (i=0; i<6; i++, a <<= 1)
     {
-        srom_latch(command | ((a < 0) ? DT_IN : 0), addr);
+	srom_latch(command | ((a < 0) ? DT_IN : 0), addr);
     }
     udelay(1);
 
@@ -136,11 +136,11 @@
 
     for (i=0; i<16; i++)
     {
-        sendto_srom(command  | DT_CLK, addr);
-        tmp = getfrom_srom(addr);
-        sendto_srom(command, addr);
+	sendto_srom(command  | DT_CLK, addr);
+	tmp = getfrom_srom(addr);
+	sendto_srom(command, addr);
 
-        word = (word << 1) | ((tmp >> 3) & 0x01);
+	word = (word << 1) | ((tmp >> 3) & 0x01);
     }
 
     sendto_srom(command & 0x0000ff00, addr);
@@ -160,13 +160,13 @@
 
     for (i=0; i<16; i++)
     {
-        tmp = (longVal & 0x8000)>>13;
+	tmp = (longVal & 0x8000)>>13;
 
-        sendto_srom (tmp | command, addr);
-        sendto_srom (tmp | command  | DT_CLK, addr);
-        sendto_srom (tmp | command, addr);
+	sendto_srom (tmp | command, addr);
+	sendto_srom (tmp | command  | DT_CLK, addr);
+	sendto_srom (tmp | command, addr);
 
-        longVal = longVal<<1;
+	longVal = longVal<<1;
     }
 
     sendto_srom(command & 0x0000ff00, addr);
@@ -175,15 +175,15 @@
     tmp = 100;
     do
     {
-        if ((getfrom_srom(dc_srom_iobase) & 0x8) == 0x8)
-            break;
-        udelay(1000);
+	if ((getfrom_srom(dc_srom_iobase) & 0x8) == 0x8)
+	    break;
+	udelay(1000);
     } while (--tmp);
 
     if (tmp == 0)
     {
-        printf("Write DEC21143 SRom timed out !\n");
-        return (-1);
+	printf("Write DEC21143 SRom timed out !\n");
+	return (-1);
     }
 
     return 0;
@@ -218,7 +218,7 @@
 
     for (i=0; i<6; i++)
     {
-        srom_latch (SROM_WR | SROM_SR | DT_IN | DT_CS, addr);
+	srom_latch (SROM_WR | SROM_SR | DT_IN | DT_CS, addr);
     }
 }
 
@@ -256,8 +256,8 @@
     memset (dest, 0, 128);
     for (offset=0; offset<64; offset++)
     {
-        tmp = srom_rd (dc_srom_iobase, offset);
-        *dest++ = le16_to_cpu(tmp);
+	tmp = srom_rd (dc_srom_iobase, offset);
+	*dest++ = le16_to_cpu(tmp);
     }
 
     return (0);
@@ -280,9 +280,9 @@
 
     for (offset=0; offset<64; offset++)
     {
-        if (srom_wr (dc_srom_iobase, offset, *src) == -1)
-                return (-1);
-        src++;
+	if (srom_wr (dc_srom_iobase, offset, *src) == -1)
+		return (-1);
+	src++;
     }
 
     return (0);

diff --git a/board/eltec/bab7xx/el_srom.c b/board/eltec/bab7xx/el_srom.c
index 56abdc7..73f8066 100644
--- a/board/eltec/bab7xx/el_srom.c
+++ b/board/eltec/bab7xx/el_srom.c

@@ -83,14 +83,14 @@
 
     for (i = 0; i < 8; i++)
     {
-        out8(I2C_BUS_DAT, 0x00);    /* SCLK = low   SDIO = high */
-        udelay(10);
-        out8(I2C_BUS_DAT, 0x40);    /* SCLK = high  SDIO = high */
-        udelay(15);
-        buf <<= 1;
-        buf = (in8(I2C_BUS_DAT) & 0x20) ? (buf | 0x01) : (buf & 0xFE);
-        out8(I2C_BUS_DAT, 0x00);    /* SCLK = low   SDIO = high */
-        udelay(10);
+	out8(I2C_BUS_DAT, 0x00);    /* SCLK = low   SDIO = high */
+	udelay(10);
+	out8(I2C_BUS_DAT, 0x40);    /* SCLK = high  SDIO = high */
+	udelay(15);
+	buf <<= 1;
+	buf = (in8(I2C_BUS_DAT) & 0x20) ? (buf | 0x01) : (buf & 0xFE);
+	out8(I2C_BUS_DAT, 0x00);    /* SCLK = low   SDIO = high */
+	udelay(10);
     }
     return(buf);
 }
@@ -113,13 +113,13 @@
 
     for (i = 7; i >= 0; i--)
     {
-        (buf & 0x80) ? out8(I2C_BUS_DAT, 0x20) : out8(I2C_BUS_DAT, 0x00); /* SCLK=low  SDIO=data */
-        udelay(10);
-        (buf & 0x80) ? out8(I2C_BUS_DAT, 0x60) : out8(I2C_BUS_DAT, 0x40); /* SCLK=high SDIO=data */
-        udelay(15);
-        (buf & 0x80) ? out8(I2C_BUS_DAT, 0x20) : out8(I2C_BUS_DAT, 0x00); /* SCLK=low  SDIO=data */
-        udelay(10);
-        buf <<= 1;
+	(buf & 0x80) ? out8(I2C_BUS_DAT, 0x20) : out8(I2C_BUS_DAT, 0x00); /* SCLK=low  SDIO=data */
+	udelay(10);
+	(buf & 0x80) ? out8(I2C_BUS_DAT, 0x60) : out8(I2C_BUS_DAT, 0x40); /* SCLK=high SDIO=data */
+	udelay(15);
+	(buf & 0x80) ? out8(I2C_BUS_DAT, 0x20) : out8(I2C_BUS_DAT, 0x00); /* SCLK=low  SDIO=data */
+	udelay(10);
+	buf <<= 1;
     }
 }
 
@@ -184,39 +184,39 @@
 
     for (i=0;i<cnt;i++)
     {
-        eepStart();
-        eepWriteByte(0xA0 | device | block);
-        if (eepReadAck() == ERROR)
-        {
-           eepStop();
-            return(ERROR);
-        }
-        eepWriteByte(addr++);
-        if (eepReadAck() == ERROR)
-        {
-            eepStop();
-            return(ERROR);
-        }
-        eepStart();
+	eepStart();
+	eepWriteByte(0xA0 | device | block);
+	if (eepReadAck() == ERROR)
+	{
+	   eepStop();
+	    return(ERROR);
+	}
+	eepWriteByte(addr++);
+	if (eepReadAck() == ERROR)
+	{
+	    eepStop();
+	    return(ERROR);
+	}
+	eepStart();
 
-        eepWriteByte(0xA1 | device | block);
-        if (eepReadAck() == ERROR)
-        {
-            eepStop();
-            return(ERROR);
-        }
+	eepWriteByte(0xA1 | device | block);
+	if (eepReadAck() == ERROR)
+	{
+	    eepStop();
+	    return(ERROR);
+	}
 
-        *buf++ = eepReadByte();
-        eepWriteAck(1);
-        eepStop();
+	*buf++ = eepReadByte();
+	eepWriteAck(1);
+	eepStop();
 
-        if ((addr == 0) && (i != (cnt-1)))    /* is it the same block ? */
-        {
-            if (block == FIRST_BLOCK)
-                block = SECOND_BLOCK;
-            else
-                return(ERROR);
-        }
+	if ((addr == 0) && (i != (cnt-1)))    /* is it the same block ? */
+	{
+	    if (block == FIRST_BLOCK)
+		block = SECOND_BLOCK;
+	    else
+		return(ERROR);
+	}
     }
     return(cnt);
 }
@@ -235,31 +235,31 @@
 
     for (i=0;i<cnt;i++)
     {
-        retVal = ERROR;
-        do
-        {
-            eepStart();
-            eepWriteByte(0xA0 | device | block);
-            if ((retVal = eepReadAck()) == ERROR)
-                eepStop();
-        } while (retVal == ERROR);
+	retVal = ERROR;
+	do
+	{
+	    eepStart();
+	    eepWriteByte(0xA0 | device | block);
+	    if ((retVal = eepReadAck()) == ERROR)
+		eepStop();
+	} while (retVal == ERROR);
 
-        eepWriteByte(addr++);
-        if (eepReadAck() == ERROR)  return(ERROR);
+	eepWriteByte(addr++);
+	if (eepReadAck() == ERROR)  return(ERROR);
 
-        if ((addr == 0) && (i != (cnt-1)))    /* is it the same block ? */
-        {
-            if (block == FIRST_BLOCK)
-                block = SECOND_BLOCK;
-            else
-            return(ERROR);
-        }
+	if ((addr == 0) && (i != (cnt-1)))    /* is it the same block ? */
+	{
+	    if (block == FIRST_BLOCK)
+		block = SECOND_BLOCK;
+	    else
+	    return(ERROR);
+	}
 
-        eepWriteByte(*buf++);
-        if (eepReadAck() == ERROR)
-            return(ERROR);
+	eepWriteByte(*buf++);
+	if (eepReadAck() == ERROR)
+	    return(ERROR);
 
-        eepStop();
+	eepStop();
     }
     return(cnt);
 }
@@ -278,13 +278,13 @@
 
     for (; size; size--)
     {
-        byte = *ptr++;
-        for (i = 8; i; i--)
-        {
-            f =  ((byte & 1) ^ (accu & 1)) ? 0x84083001 : 0;
-            accu >>= 1; accu ^= f;
-            byte >>= 1;
-        }
+	byte = *ptr++;
+	for (i = 8; i; i--)
+	{
+	    f =  ((byte & 1) ^ (accu & 1)) ? 0x84083001 : 0;
+	    accu >>= 1; accu ^= f;
+	    byte >>= 1;
+	}
     }
     return(accu);
 }

diff --git a/board/eltec/bab7xx/flash.c b/board/eltec/bab7xx/flash.c
index 73496a1..442dd00 100644
--- a/board/eltec/bab7xx/flash.c
+++ b/board/eltec/bab7xx/flash.c

@@ -57,7 +57,7 @@
     /* Init: no FLASHes known */
     for (i=0; i<CFG_MAX_FLASH_BANKS; ++i)
     {
-        flash_info[i].flash_id = FLASH_UNKNOWN;
+	flash_info[i].flash_id = FLASH_UNKNOWN;
     }
 
     /* initialise 1st flash */
@@ -65,8 +65,8 @@
 
     if (flash_info[0].flash_id == FLASH_UNKNOWN)
     {
-        printf ("## Unknown FLASH on Bank 0 - Size = 0x%08lx = %ld MB\n",
-            size1, size1<<20);
+	printf ("## Unknown FLASH on Bank 0 - Size = 0x%08lx = %ld MB\n",
+	    size1, size1<<20);
     }
 
     /* initialise 2nd flash */
@@ -74,31 +74,31 @@
 
     if (flash_info[1].flash_id == FLASH_UNKNOWN)
     {
-        printf ("## Unknown FLASH on Bank 1 - Size = 0x%08lx = %ld MB\n",
-            size2, size2<<20);
+	printf ("## Unknown FLASH on Bank 1 - Size = 0x%08lx = %ld MB\n",
+	    size2, size2<<20);
     }
 
     /* monitor protection ON by default */
     if (size1 == 512*1024)
     {
-        (void)flash_protect(FLAG_PROTECT_SET,
-                FLASH_BASE0_PRELIM,
-                FLASH_BASE0_PRELIM+monitor_flash_len-1,
-                &flash_info[0]);
+	(void)flash_protect(FLAG_PROTECT_SET,
+		FLASH_BASE0_PRELIM,
+		FLASH_BASE0_PRELIM+monitor_flash_len-1,
+		&flash_info[0]);
     }
     if (size2 == 512*1024)
     {
-        (void)flash_protect(FLAG_PROTECT_SET,
-                FLASH_BASE1_PRELIM,
-                FLASH_BASE1_PRELIM+monitor_flash_len-1,
-                &flash_info[1]);
+	(void)flash_protect(FLAG_PROTECT_SET,
+		FLASH_BASE1_PRELIM,
+		FLASH_BASE1_PRELIM+monitor_flash_len-1,
+		&flash_info[1]);
     }
     if (size2 == 4*1024*1024)
     {
-        (void)flash_protect(FLAG_PROTECT_SET,
-                CFG_FLASH_BASE,
-                CFG_FLASH_BASE+monitor_flash_len-1,
-                &flash_info[1]);
+	(void)flash_protect(FLAG_PROTECT_SET,
+		CFG_FLASH_BASE,
+		CFG_FLASH_BASE+monitor_flash_len-1,
+		&flash_info[1]);
     }
 
     return (size1 + size2);
@@ -115,72 +115,72 @@
     volatile unsigned long *flash;
 
     if (info->flash_id == FLASH_UNKNOWN) {
-        printf ("missing or unknown FLASH type\n");
-        flash_init();
+	printf ("missing or unknown FLASH type\n");
+	flash_init();
     }
 
     if (info->flash_id == FLASH_UNKNOWN) {
-        printf ("missing or unknown FLASH type\n");
-        return;
+	printf ("missing or unknown FLASH type\n");
+	return;
     }
 
     switch (info->flash_id & FLASH_VENDMASK) {
     case FLASH_MAN_AMD:
-        printf ("AMD ");
-        break;
+	printf ("AMD ");
+	break;
     default:
-        printf ("Unknown Vendor ");
-        break;
+	printf ("Unknown Vendor ");
+	break;
     }
 
     switch (info->flash_id & FLASH_TYPEMASK) {
     case AMD_ID_F040B:
-        printf ("AM29F040B (4 Mbit)\n");
-        break;
+	printf ("AM29F040B (4 Mbit)\n");
+	break;
     case AMD_ID_F016D:
-        printf ("AM29F016D (16 Mbit)\n");
-        break;
+	printf ("AM29F016D (16 Mbit)\n");
+	break;
     case AMD_ID_F032B:
-        printf ("AM29F032B (32 Mbit)\n");
-        break;
+	printf ("AM29F032B (32 Mbit)\n");
+	break;
    default:
-        printf ("Unknown Chip Type\n");
-        break;
+	printf ("Unknown Chip Type\n");
+	break;
     }
 
     if (info->size >= (1 << 20)) {
-        printf ("  Size: %ld MB in %d Sectors\n", info->size >> 20, info->sector_count);
+	printf ("  Size: %ld MB in %d Sectors\n", info->size >> 20, info->sector_count);
     } else {
-        printf ("  Size: %ld kB in %d Sectors\n", info->size >> 10, info->sector_count);
+	printf ("  Size: %ld kB in %d Sectors\n", info->size >> 10, info->sector_count);
     }
 
     printf ("  Sector Start Addresses:");
     for (i=0; i<info->sector_count; ++i) {
-        /*
-        * Check if whole sector is erased
-        */
-        if (i != (info->sector_count-1))
-            size = info->start[i+1] - info->start[i];
-        else
-            size = info->start[0] + info->size - info->start[i];
+	/*
+	* Check if whole sector is erased
+	*/
+	if (i != (info->sector_count-1))
+	    size = info->start[i+1] - info->start[i];
+	else
+	    size = info->start[0] + info->size - info->start[i];
 
-        erased = 1;
-        flash = (volatile unsigned long *)info->start[i];
-        size = size >> 2;        /* divide by 4 for longword access */
-        for (k=0; k<size; k++) {
-            if (*flash++ != 0xffffffff) {
-                erased = 0;
-                break;
-            }
-        }
+	erased = 1;
+	flash = (volatile unsigned long *)info->start[i];
+	size = size >> 2;        /* divide by 4 for longword access */
+	for (k=0; k<size; k++) {
+	    if (*flash++ != 0xffffffff) {
+		erased = 0;
+		break;
+	    }
+	}
 
-        if ((i % 5) == 0)
-            printf ("\n   ");
+	if ((i % 5) == 0)
+	    printf ("\n   ");
 
-        printf (" %08lX%s%s",
-            info->start[i],
-            erased ? " E" : "  ",
-            info->protect[i] ? "RO " : "   ");
+	printf (" %08lX%s%s",
+	    info->start[i],
+	    erased ? " E" : "  ",
+	    info->protect[i] ? "RO " : "   ");
     }
     printf ("\n");
 }
@@ -226,37 +226,37 @@
     /* We accept only two AMD types */
     switch (vendor) {
     case (FLASH_WORD_SIZE)AMD_MANUFACT:
-        info->flash_id = FLASH_MAN_AMD;
-        break;
+	info->flash_id = FLASH_MAN_AMD;
+	break;
     default:
-        info->flash_id = FLASH_UNKNOWN;
-        info->sector_count = 0;
-        info->size = 0;
-        return (0);         /* no or unknown flash  */
+	info->flash_id = FLASH_UNKNOWN;
+	info->sector_count = 0;
+	info->size = 0;
+	return (0);         /* no or unknown flash  */
     }
 
     switch (devid) {
     case (FLASH_WORD_SIZE)AMD_ID_F040B:
-        info->flash_id |= AMD_ID_F040B;
-        info->sector_count = 8;
-        info->size = 0x00080000;
-        break;              /* => 0.5 MB      */
+	info->flash_id |= AMD_ID_F040B;
+	info->sector_count = 8;
+	info->size = 0x00080000;
+	break;              /* => 0.5 MB      */
 
     case (FLASH_WORD_SIZE)AMD_ID_F016D:
-        info->flash_id |= AMD_ID_F016D;
-        info->sector_count = 32;
-        info->size         = 0x00200000;
-        break;              /* => 2 MB      */
+	info->flash_id |= AMD_ID_F016D;
+	info->sector_count = 32;
+	info->size         = 0x00200000;
+	break;              /* => 2 MB      */
 
     case (FLASH_WORD_SIZE)AMD_ID_F032B:
-        info->flash_id |= AMD_ID_F032B;
-        info->sector_count = 64;
-        info->size         = 0x00400000;
-        break;              /* => 4 MB      */
+	info->flash_id |= AMD_ID_F032B;
+	info->sector_count = 64;
+	info->size         = 0x00400000;
+	break;              /* => 4 MB      */
 
     default:
-        info->flash_id = FLASH_UNKNOWN;
-        return (0);         /* => no or unknown flash */
+	info->flash_id = FLASH_UNKNOWN;
+	return (0);         /* => no or unknown flash */
 
     }
 
@@ -266,20 +266,20 @@
 
     /* check for protected sectors */
     for (i = 0; i < info->sector_count; i++) {
-        /* sector base address */
-        info->start[i] = base + i * (info->size / info->sector_count);
-        /* read sector protection at sector address, (A7 .. A0) = 0x02 */
-        /* D0 = 1 if protected */
-        caddr = (volatile unsigned char *)(info->start[i]);
-        info->protect[i] = caddr[2] & 1;
+	/* sector base address */
+	info->start[i] = base + i * (info->size / info->sector_count);
+	/* read sector protection at sector address, (A7 .. A0) = 0x02 */
+	/* D0 = 1 if protected */
+	caddr = (volatile unsigned char *)(info->start[i]);
+	info->protect[i] = caddr[2] & 1;
     }
 
     /*
      * Prevent writes to uninitialized FLASH.
      */
     if (info->flash_id != FLASH_UNKNOWN) {
-        caddr = (volatile unsigned char *)info->start[0];
-        caddr[0] = 0xF0;   /* reset bank */
+	caddr = (volatile unsigned char *)info->start[0];
+	caddr[0] = 0xF0;   /* reset bank */
     }
 
     return (info->size);
@@ -295,32 +295,32 @@
     int rc = 0;
 
     if ((s_first < 0) || (s_first > s_last)) {
-        if (info->flash_id == FLASH_UNKNOWN) {
-            printf ("- missing\n");
-        } else {
-            printf ("- no sectors to erase\n");
-        }
-        return 1;
+	if (info->flash_id == FLASH_UNKNOWN) {
+	    printf ("- missing\n");
+	} else {
+	    printf ("- no sectors to erase\n");
+	}
+	return 1;
     }
 
     if ((info->flash_id == FLASH_UNKNOWN) ||
-        (info->flash_id > FLASH_AMD_COMP)) {
-        printf ("Can't erase unknown flash type - aborted\n");
-        return 1;
+	(info->flash_id > FLASH_AMD_COMP)) {
+	printf ("Can't erase unknown flash type - aborted\n");
+	return 1;
     }
 
     prot = 0;
     for (sect=s_first; sect<=s_last; ++sect) {
-        if (info->protect[sect]) {
-            prot++;
-        }
+	if (info->protect[sect]) {
+	    prot++;
+	}
     }
 
     if (prot) {
-        printf ("- Warning: %d protected sectors will not be erased!\n",
-            prot);
+	printf ("- Warning: %d protected sectors will not be erased!\n",
+	    prot);
     } else {
-        printf ("\n");
+	printf ("\n");
     }
 
     l_sect = -1;
@@ -336,26 +336,26 @@
 
     /* Start erase on unprotected sectors */
     for (sect = s_first; sect<=s_last; sect++) {
-        if (info->protect[sect] == 0) { /* not protected */
-            addr = (FLASH_WORD_SIZE *)(info->start[sect]);
-            if (info->flash_id & FLASH_MAN_SST) {
-                addr[ADDR0] = (FLASH_WORD_SIZE)0x00AA00AA;
-                addr[ADDR1] = (FLASH_WORD_SIZE)0x00550055;
-                addr[ADDR0] = (FLASH_WORD_SIZE)0x00800080;
-                addr[ADDR0] = (FLASH_WORD_SIZE)0x00AA00AA;
-                addr[ADDR1] = (FLASH_WORD_SIZE)0x00550055;
-                addr[0] = (FLASH_WORD_SIZE)0x00500050;  /* block erase */
-                udelay(30000);  /* wait 30 ms */
-            }
-            else
-                addr[0] = (FLASH_WORD_SIZE)0x00300030;  /* sector erase */
-            l_sect = sect;
-        }
+	if (info->protect[sect] == 0) { /* not protected */
+	    addr = (FLASH_WORD_SIZE *)(info->start[sect]);
+	    if (info->flash_id & FLASH_MAN_SST) {
+		addr[ADDR0] = (FLASH_WORD_SIZE)0x00AA00AA;
+		addr[ADDR1] = (FLASH_WORD_SIZE)0x00550055;
+		addr[ADDR0] = (FLASH_WORD_SIZE)0x00800080;
+		addr[ADDR0] = (FLASH_WORD_SIZE)0x00AA00AA;
+		addr[ADDR1] = (FLASH_WORD_SIZE)0x00550055;
+		addr[0] = (FLASH_WORD_SIZE)0x00500050;  /* block erase */
+		udelay(30000);  /* wait 30 ms */
+	    }
+	    else
+		addr[0] = (FLASH_WORD_SIZE)0x00300030;  /* sector erase */
+	    l_sect = sect;
+	}
     }
 
     /* re-enable interrupts if necessary */
     if (flag)
-        enable_interrupts();
+	enable_interrupts();
 
     /* wait at least 80us - let's wait 1 ms */
     udelay (1000);
@@ -364,21 +364,21 @@
      * We wait for the last triggered sector
      */
     if (l_sect < 0)
-        goto DONE;
+	goto DONE;
 
     start = get_timer (0);
     last  = start;
     addr = (FLASH_WORD_SIZE *)(info->start[l_sect]);
     while ((addr[0] & (FLASH_WORD_SIZE)0x00800080) != (FLASH_WORD_SIZE)0x00800080) {
-        if ((now = get_timer(start)) > CFG_FLASH_ERASE_TOUT) {
-            printf ("Timeout\n");
-            return 1;
-        }
-        /* show that we're waiting */
-        if ((now - last) > 1000) {  /* every second */
-            serial_putc ('.');
-            last = now;
-        }
+	if ((now = get_timer(start)) > CFG_FLASH_ERASE_TOUT) {
+	    printf ("Timeout\n");
+	    return 1;
+	}
+	/* show that we're waiting */
+	if ((now - last) > 1000) {  /* every second */
+	    serial_putc ('.');
+	    last = now;
+	}
     }
 
 DONE:
@@ -408,42 +408,42 @@
      * handle unaligned start bytes
      */
     if ((l = addr - wp) != 0) {
-        data = 0;
-        for (i=0, cp=wp; i<l; ++i, ++cp) {
-            data = (data << 8) | (*(uchar *)cp);
-        }
-        for (; i<4 && cnt>0; ++i) {
-            data = (data << 8) | *src++;
-            --cnt;
-            ++cp;
-        }
-        for (; cnt==0 && i<4; ++i, ++cp) {
-            data = (data << 8) | (*(uchar *)cp);
-        }
+	data = 0;
+	for (i=0, cp=wp; i<l; ++i, ++cp) {
+	    data = (data << 8) | (*(uchar *)cp);
+	}
+	for (; i<4 && cnt>0; ++i) {
+	    data = (data << 8) | *src++;
+	    --cnt;
+	    ++cp;
+	}
+	for (; cnt==0 && i<4; ++i, ++cp) {
+	    data = (data << 8) | (*(uchar *)cp);
+	}
 
-        if ((rc = write_word(info, wp, data)) != 0) {
-            return (rc);
-        }
-        wp += 4;
+	if ((rc = write_word(info, wp, data)) != 0) {
+	    return (rc);
+	}
+	wp += 4;
     }
 
     /*
      * handle word aligned part
      */
     while (cnt >= 4) {
-        data = 0;
-        for (i=0; i<4; ++i) {
-            data = (data << 8) | *src++;
-        }
-        if ((rc = write_word(info, wp, data)) != 0) {
-            return (rc);
-        }
-        wp  += 4;
-        cnt -= 4;
+	data = 0;
+	for (i=0; i<4; ++i) {
+	    data = (data << 8) | *src++;
+	}
+	if ((rc = write_word(info, wp, data)) != 0) {
+	    return (rc);
+	}
+	wp  += 4;
+	cnt -= 4;
     }
 
     if (cnt == 0) {
-        return (0);
+	return (0);
     }
 
     /*
@@ -451,11 +451,11 @@
      */
     data = 0;
     for (i=0, cp=wp; i<4 && cnt>0; ++i, ++cp) {
-        data = (data << 8) | *src++;
-        --cnt;
+	data = (data << 8) | *src++;
+	--cnt;
     }
     for (; i<4; ++i, ++cp) {
-        data = (data << 8) | (*(uchar *)cp);
+	data = (data << 8) | (*(uchar *)cp);
     }
 
     return (write_word(info, wp, data));
@@ -469,45 +469,44 @@
  */
 static int write_word (flash_info_t *info, ulong dest, ulong data)
 {
-        volatile FLASH_WORD_SIZE *addr2 = (FLASH_WORD_SIZE *)(info->start[0]);
-        volatile FLASH_WORD_SIZE *dest2 = (FLASH_WORD_SIZE *)dest;
-        volatile FLASH_WORD_SIZE *data2 = (FLASH_WORD_SIZE *)&data;
+	volatile FLASH_WORD_SIZE *addr2 = (FLASH_WORD_SIZE *)(info->start[0]);
+	volatile FLASH_WORD_SIZE *dest2 = (FLASH_WORD_SIZE *)dest;
+	volatile FLASH_WORD_SIZE *data2 = (FLASH_WORD_SIZE *)&data;
     ulong start;
     int flag;
-        int i;
+	int i;
 
     /* Check if Flash is (sufficiently) erased */
     if ((*((volatile FLASH_WORD_SIZE *)dest) &
-             (FLASH_WORD_SIZE)data) != (FLASH_WORD_SIZE)data) {
-        return (2);
+	     (FLASH_WORD_SIZE)data) != (FLASH_WORD_SIZE)data) {
+	return (2);
     }
     /* Disable interrupts which might cause a timeout here */
     flag = disable_interrupts();
 
-        for (i=0; i<4/sizeof(FLASH_WORD_SIZE); i++)
-          {
-            addr2[ADDR0] = (FLASH_WORD_SIZE)0x00AA00AA;
-            addr2[ADDR1] = (FLASH_WORD_SIZE)0x00550055;
-            addr2[ADDR0] = (FLASH_WORD_SIZE)0x00A000A0;
+	for (i=0; i<4/sizeof(FLASH_WORD_SIZE); i++)
+	  {
+	    addr2[ADDR0] = (FLASH_WORD_SIZE)0x00AA00AA;
+	    addr2[ADDR1] = (FLASH_WORD_SIZE)0x00550055;
+	    addr2[ADDR0] = (FLASH_WORD_SIZE)0x00A000A0;
 
-            dest2[i] = data2[i];
+	    dest2[i] = data2[i];
 
-            /* re-enable interrupts if necessary */
-            if (flag)
-              enable_interrupts();
+	    /* re-enable interrupts if necessary */
+	    if (flag)
+	      enable_interrupts();
 
-            /* data polling for D7 */
-            start = get_timer (0);
-            while ((dest2[i] & (FLASH_WORD_SIZE)0x00800080) !=
-                   (data2[i] & (FLASH_WORD_SIZE)0x00800080)) {
-              if (get_timer(start) > CFG_FLASH_WRITE_TOUT) {
-                return (1);
-              }
-            }
-          }
+	    /* data polling for D7 */
+	    start = get_timer (0);
+	    while ((dest2[i] & (FLASH_WORD_SIZE)0x00800080) !=
+		   (data2[i] & (FLASH_WORD_SIZE)0x00800080)) {
+	      if (get_timer(start) > CFG_FLASH_WRITE_TOUT) {
+		return (1);
+	      }
+	    }
+	  }
 
     return (0);
 }
 
 /*----------------------------------------------------------------------------*/
-

diff --git a/board/eltec/bab7xx/l2cache.c b/board/eltec/bab7xx/l2cache.c
index 748d515..077f2c9 100644
--- a/board/eltec/bab7xx/l2cache.c
+++ b/board/eltec/bab7xx/l2cache.c

@@ -51,104 +51,104 @@
 {
     if (l2control)              /* BAB750 */
     {
-        mtspr(SPRN_L2CR, l2control);
-        mtspr(SPRN_L2CR, (l2control | L2CR_I));
-        while (mfspr(SPRN_L2CR) & L2CR_IP)
-            ;
-        mtspr(SPRN_L2CR, (l2control | L2CR_E));
-        return (0);
+	mtspr(SPRN_L2CR, l2control);
+	mtspr(SPRN_L2CR, (l2control | L2CR_I));
+	while (mfspr(SPRN_L2CR) & L2CR_IP)
+	    ;
+	mtspr(SPRN_L2CR, (l2control | L2CR_E));
+	return (0);
     }
     else /* BAB740 */
     {
-        int picr1, picr2, mask;
-        int picr2CacheSize, cacheSize;
-        int *d;
-        int devbusfn;
-        u32 reg32;
+	int picr1, picr2, mask;
+	int picr2CacheSize, cacheSize;
+	int *d;
+	int devbusfn;
+	u32 reg32;
 
-        devbusfn = pci_find_device(PCI_VENDOR_ID_MOTOROLA,
-                                   PCI_DEVICE_ID_MOTOROLA_MPC106, 0);
-        if (devbusfn == -1)
-            return (-1);
+	devbusfn = pci_find_device(PCI_VENDOR_ID_MOTOROLA,
+				   PCI_DEVICE_ID_MOTOROLA_MPC106, 0);
+	if (devbusfn == -1)
+	    return (-1);
 
-        pci_read_config_dword  (devbusfn, PCI_PICR2, &reg32);
-        reg32 &= ~PICR2_L2_EN;
-        pci_write_config_dword (devbusfn, PCI_PICR2, reg32);
+	pci_read_config_dword  (devbusfn, PCI_PICR2, &reg32);
+	reg32 &= ~PICR2_L2_EN;
+	pci_write_config_dword (devbusfn, PCI_PICR2, reg32);
 
-        /* cache size */
-        if (*(volatile unsigned char *) (CFG_ISA_IO + 0x220) & 0x04)
-        {
-            /* cache size is 512 KB */
-            picr2CacheSize = PICR2_L2_SIZE_512K;
-            cacheSize = 0x80000;
-        }
-        else
-        {
-            /* cache size is 256 KB */
-            picr2CacheSize = PICR2_L2_SIZE_256K;
-            cacheSize = 0x40000;
-        }
+	/* cache size */
+	if (*(volatile unsigned char *) (CFG_ISA_IO + 0x220) & 0x04)
+	{
+	    /* cache size is 512 KB */
+	    picr2CacheSize = PICR2_L2_SIZE_512K;
+	    cacheSize = 0x80000;
+	}
+	else
+	{
+	    /* cache size is 256 KB */
+	    picr2CacheSize = PICR2_L2_SIZE_256K;
+	    cacheSize = 0x40000;
+	}
 
-        /* setup PICR1 */
-        mask =
-        ~(PICR1_CF_BREAD_WS(1) |
-          PICR1_CF_BREAD_WS(2) |
-          PICR1_CF_CBA(0xff) |
-          PICR1_CF_CACHE_1G |
-          PICR1_CF_DPARK |
-          PICR1_CF_APARK |
-          PICR1_CF_L2_CACHE_MASK);
+	/* setup PICR1 */
+	mask =
+	~(PICR1_CF_BREAD_WS(1) |
+	  PICR1_CF_BREAD_WS(2) |
+	  PICR1_CF_CBA(0xff) |
+	  PICR1_CF_CACHE_1G |
+	  PICR1_CF_DPARK |
+	  PICR1_CF_APARK |
+	  PICR1_CF_L2_CACHE_MASK);
 
-        picr1 =
-        (PICR1_CF_CBA(0x3f) |
-         PICR1_CF_CACHE_1G |
-         PICR1_CF_APARK |
-         PICR1_CF_DPARK |
-         PICR1_CF_L2_COPY_BACK); /* PICR1_CF_L2_WRITE_THROUGH */
+	picr1 =
+	(PICR1_CF_CBA(0x3f) |
+	 PICR1_CF_CACHE_1G |
+	 PICR1_CF_APARK |
+	 PICR1_CF_DPARK |
+	 PICR1_CF_L2_COPY_BACK); /* PICR1_CF_L2_WRITE_THROUGH */
 
-        pci_read_config_dword  (devbusfn, PCI_PICR1, &reg32);
-        reg32 &= mask;
-        reg32 |= picr1;
-        pci_write_config_dword (devbusfn, PCI_PICR1, reg32);
+	pci_read_config_dword  (devbusfn, PCI_PICR1, &reg32);
+	reg32 &= mask;
+	reg32 |= picr1;
+	pci_write_config_dword (devbusfn, PCI_PICR1, reg32);
 
-        /*
-         * invalidate all L2 cache
-         */
-        picr2 =
-        (PICR2_CF_INV_MODE |
-         PICR2_CF_HIT_HIGH |
-         PICR2_CF_MOD_HIGH |
-         PICR2_CF_L2_HIT_DELAY(1) |
-         PICR2_CF_APHASE_WS(1) |
-         picr2CacheSize);
+	/*
+	 * invalidate all L2 cache
+	 */
+	picr2 =
+	(PICR2_CF_INV_MODE |
+	 PICR2_CF_HIT_HIGH |
+	 PICR2_CF_MOD_HIGH |
+	 PICR2_CF_L2_HIT_DELAY(1) |
+	 PICR2_CF_APHASE_WS(1) |
+	 picr2CacheSize);
 
-        pci_write_config_dword (devbusfn, PCI_PICR2, picr2);
+	pci_write_config_dword (devbusfn, PCI_PICR2, picr2);
 
-        /*
-         * dummy transactions
-         */
-        for (d=0; d<(int *)(2*cacheSize); d++)
-            dummy(*d);
+	/*
+	 * dummy transactions
+	 */
+	for (d=0; d<(int *)(2*cacheSize); d++)
+	    dummy(*d);
 
-        pci_write_config_dword (devbusfn, PCI_PICR2,
-                                (picr2 | PICR2_CF_FLUSH_L2));
+	pci_write_config_dword (devbusfn, PCI_PICR2,
+				(picr2 | PICR2_CF_FLUSH_L2));
 
-        /* setup PICR2 */
-        picr2 =
-        (PICR2_CF_FAST_CASTOUT |
-         PICR2_CF_WDATA |
-         PICR2_CF_ADDR_ONLY_DISABLE |
-         PICR2_CF_HIT_HIGH |
-         PICR2_CF_MOD_HIGH |
-         PICR2_L2_UPDATE_EN |
-         PICR2_L2_EN |
-         PICR2_CF_APHASE_WS(1) |
-         PICR2_CF_DATA_RAM_PBURST |
-         PICR2_CF_L2_HIT_DELAY(1) |
-         PICR2_CF_SNOOP_WS(2) |
-         picr2CacheSize);
+	/* setup PICR2 */
+	picr2 =
+	(PICR2_CF_FAST_CASTOUT |
+	 PICR2_CF_WDATA |
+	 PICR2_CF_ADDR_ONLY_DISABLE |
+	 PICR2_CF_HIT_HIGH |
+	 PICR2_CF_MOD_HIGH |
+	 PICR2_L2_UPDATE_EN |
+	 PICR2_L2_EN |
+	 PICR2_CF_APHASE_WS(1) |
+	 PICR2_CF_DATA_RAM_PBURST |
+	 PICR2_CF_L2_HIT_DELAY(1) |
+	 PICR2_CF_SNOOP_WS(2) |
+	 picr2CacheSize);
 
-        pci_write_config_dword (devbusfn, PCI_PICR2, picr2);
+	pci_write_config_dword (devbusfn, PCI_PICR2, picr2);
     }
     return (0);
 }
@@ -156,4 +156,3 @@
 /*----------------------------------------------------------------------------*/
 
 #endif /* (CFG_L2_BAB7xx) */
-

diff --git a/board/eltec/bab7xx/misc.c b/board/eltec/bab7xx/misc.c
index 1b4376d..b50d11b 100644
--- a/board/eltec/bab7xx/misc.c
+++ b/board/eltec/bab7xx/misc.c

@@ -62,7 +62,7 @@
     u_int  i, l, initSrom, copyNv;
     char buf[256];
     char hex[23] = { 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 0, 0, 0,
-             0, 0, 0, 0, 10, 11, 12, 13, 14, 15 };
+	     0, 0, 0, 0, 10, 11, 12, 13, 14, 15 };
     pci_dev_t bdf;
 
     char sromSYM[] = {
@@ -131,204 +131,204 @@
 
     /* read out current revision srom contens */
     el_srom_load (0x0000, (u_char*)&eerev, sizeof(revinfo),
-                SECOND_DEVICE, FIRST_BLOCK);
+		SECOND_DEVICE, FIRST_BLOCK);
 
     /* read out current nvram shadow image */
     nvram_read (buf, CFG_NV_SROM_COPY_ADDR, CFG_SROM_SIZE);
 
     if (strcmp (eerev.magic, "ELTEC") != 0)
     {
-        /* srom is not initialized -> create a default revision info */
-        for (i = 0, ptr = (u_char *)&eerev; i < sizeof(revinfo); i++)
-            *ptr++ = 0x00;
-        strcpy(eerev.magic, "ELTEC");
-        eerev.revrev[0] = 1;
-        eerev.revrev[1] = 0;
-        eerev.size = 0x00E0;
-        eerev.category[0] = 0x01;
+	/* srom is not initialized -> create a default revision info */
+	for (i = 0, ptr = (u_char *)&eerev; i < sizeof(revinfo); i++)
+	    *ptr++ = 0x00;
+	strcpy(eerev.magic, "ELTEC");
+	eerev.revrev[0] = 1;
+	eerev.revrev[1] = 0;
+	eerev.size = 0x00E0;
+	eerev.category[0] = 0x01;
 
-        /* node id from dead e128 as default */
-        eerev.etheraddr[0] = 0x00;
-        eerev.etheraddr[1] = 0x00;
-        eerev.etheraddr[2] = 0x5B;
-        eerev.etheraddr[3] = 0x00;
-        eerev.etheraddr[4] = 0x2E;
-        eerev.etheraddr[5] = 0x4D;
+	/* node id from dead e128 as default */
+	eerev.etheraddr[0] = 0x00;
+	eerev.etheraddr[1] = 0x00;
+	eerev.etheraddr[2] = 0x5B;
+	eerev.etheraddr[3] = 0x00;
+	eerev.etheraddr[4] = 0x2E;
+	eerev.etheraddr[5] = 0x4D;
 
-        /* cache config word for bab750 */
-        *(int*)&eerev.res[0] = CLK2P0TO1_1MB_PB_0P5DH;
+	/* cache config word for bab750 */
+	*(int*)&eerev.res[0] = CLK2P0TO1_1MB_PB_0P5DH;
 
-        initSrom = 1;  /* force dialog */
-        copyNv   = 1;  /* copy to nvram */
+	initSrom = 1;  /* force dialog */
+	copyNv   = 1;  /* copy to nvram */
     }
 
     if ((copyNv == 0) &&   (el_srom_checksum((u_char*)&eerev, CFG_SROM_SIZE) !=
-                el_srom_checksum((u_char*)buf, CFG_SROM_SIZE)))
+		el_srom_checksum((u_char*)buf, CFG_SROM_SIZE)))
     {
-        printf ("Invalid revision info copy in nvram !\n");
-        printf ("Press key:\n  <c> to copy current revision info to nvram.\n");
-        printf ("  <r> to reenter revision info.\n");
-        printf ("=> ");
-        if (0 != readline (NULL))
-        {
-            switch ((char)toupper(console_buffer[0]))
-            {
-            case 'C':
-                copyNv = 1;
-                break;
-            case 'R':
-                copyNv = 1;
-                initSrom = 1;
-                break;
-            }
-        }
+	printf ("Invalid revision info copy in nvram !\n");
+	printf ("Press key:\n  <c> to copy current revision info to nvram.\n");
+	printf ("  <r> to reenter revision info.\n");
+	printf ("=> ");
+	if (0 != readline (NULL))
+	{
+	    switch ((char)toupper(console_buffer[0]))
+	    {
+	    case 'C':
+		copyNv = 1;
+		break;
+	    case 'R':
+		copyNv = 1;
+		initSrom = 1;
+		break;
+	    }
+	}
     }
 
     if (initSrom)
     {
-        memcpy (buf, &eerev.revision[0][0], 14);     /* save all revision info */
-        printf ("Enter revision number (0-9): %c  ", eerev.revision[0][0]);
-        if (0 != readline (NULL))
-        {
-            eerev.revision[0][0] = (char)toupper(console_buffer[0]);
-            memcpy (&eerev.revision[1][0], buf, 12); /* shift rest of rev info */
-        }
+	memcpy (buf, &eerev.revision[0][0], 14);     /* save all revision info */
+	printf ("Enter revision number (0-9): %c  ", eerev.revision[0][0]);
+	if (0 != readline (NULL))
+	{
+	    eerev.revision[0][0] = (char)toupper(console_buffer[0]);
+	    memcpy (&eerev.revision[1][0], buf, 12); /* shift rest of rev info */
+	}
 
-        printf ("Enter revision character (A-Z): %c  ", eerev.revision[0][1]);
-        if (1 == readline (NULL))
-        {
-            eerev.revision[0][1] = (char)toupper(console_buffer[0]);
-        }
+	printf ("Enter revision character (A-Z): %c  ", eerev.revision[0][1]);
+	if (1 == readline (NULL))
+	{
+	    eerev.revision[0][1] = (char)toupper(console_buffer[0]);
+	}
 
-        printf ("Enter board name (V-XXXX-XXXX): %s  ", (char *)&eerev.board);
-        if (11 == readline (NULL))
-        {
-            for (i=0; i<11; i++)
-                eerev.board[i] =  (char)toupper(console_buffer[i]);
-            eerev.board[11] = '\0';
-        }
+	printf ("Enter board name (V-XXXX-XXXX): %s  ", (char *)&eerev.board);
+	if (11 == readline (NULL))
+	{
+	    for (i=0; i<11; i++)
+		eerev.board[i] =  (char)toupper(console_buffer[i]);
+	    eerev.board[11] = '\0';
+	}
 
-        printf ("Enter serial number: %s ", (char *)&eerev.serial );
-        if (6 == readline (NULL))
-        {
-            for (i=0; i<6; i++)
-                eerev.serial[i] = console_buffer[i];
-            eerev.serial[6] = '\0';
-        }
+	printf ("Enter serial number: %s ", (char *)&eerev.serial );
+	if (6 == readline (NULL))
+	{
+	    for (i=0; i<6; i++)
+		eerev.serial[i] = console_buffer[i];
+	    eerev.serial[6] = '\0';
+	}
 
-        printf ("Enter ether node ID with leading zero (HEX): %02x%02x%02x%02x%02x%02x  ",
-            eerev.etheraddr[0], eerev.etheraddr[1],
-            eerev.etheraddr[2], eerev.etheraddr[3],
-            eerev.etheraddr[4], eerev.etheraddr[5]);
-        if (12 == readline (NULL))
-        {
-            for (i=0; i<12; i+=2)
-            eerev.etheraddr[i>>1] = (char)(16*hex[toupper(console_buffer[i])-'0'] +
-                               hex[toupper(console_buffer[i+1])-'0']);
-        }
+	printf ("Enter ether node ID with leading zero (HEX): %02x%02x%02x%02x%02x%02x  ",
+	    eerev.etheraddr[0], eerev.etheraddr[1],
+	    eerev.etheraddr[2], eerev.etheraddr[3],
+	    eerev.etheraddr[4], eerev.etheraddr[5]);
+	if (12 == readline (NULL))
+	{
+	    for (i=0; i<12; i+=2)
+	    eerev.etheraddr[i>>1] = (char)(16*hex[toupper(console_buffer[i])-'0'] +
+			       hex[toupper(console_buffer[i+1])-'0']);
+	}
 
-        l = strlen ((char *)&eerev.text);
-        printf("Add to text section (max 64 chr): %s ", (char *)&eerev.text );
-        if (0 != readline (NULL))
-        {
-            for (i = l; i<63; i++)
-                eerev.text[i] = console_buffer[i-l];
-            eerev.text[63] = '\0';
-        }
+	l = strlen ((char *)&eerev.text);
+	printf("Add to text section (max 64 chr): %s ", (char *)&eerev.text );
+	if (0 != readline (NULL))
+	{
+	    for (i = l; i<63; i++)
+		eerev.text[i] = console_buffer[i-l];
+	    eerev.text[63] = '\0';
+	}
 
-        if (strstr ((char *)&eerev.board, "75") != NULL)
-            eltec_board = 750;
-        else
-            eltec_board = 740;
+	if (strstr ((char *)&eerev.board, "75") != NULL)
+	    eltec_board = 750;
+	else
+	    eltec_board = 740;
 
-        if (eltec_board == 750)
-        {
-            if (CPU_TYPE == CPU_TYPE_750)
-                *(int*)&eerev.res[0] = CLK2P0TO1_1MB_PB_0P5DH;
-                else
-                *(int*)&eerev.res[0] = CLK2P5TO1_1MB_PB_0P5DH;
+	if (eltec_board == 750)
+	{
+	    if (CPU_TYPE == CPU_TYPE_750)
+		*(int*)&eerev.res[0] = CLK2P0TO1_1MB_PB_0P5DH;
+		else
+		*(int*)&eerev.res[0] = CLK2P5TO1_1MB_PB_0P5DH;
 
-            printf("Enter L2Cache config word with leading zero (HEX): %08X  ",
-                    *(int*)&eerev.res[0] );
-            if (0 != readline (NULL))
-            {
-                for (i=0; i<7; i+=2)
-                {
-                    eerev.res[i>>1] =
-                    (char)(16*hex[toupper(console_buffer[i])-'0'] +
-                    hex[toupper(console_buffer[i+1])-'0']);
-                }
-            }
+	    printf("Enter L2Cache config word with leading zero (HEX): %08X  ",
+		    *(int*)&eerev.res[0] );
+	    if (0 != readline (NULL))
+	    {
+		for (i=0; i<7; i+=2)
+		{
+		    eerev.res[i>>1] =
+		    (char)(16*hex[toupper(console_buffer[i])-'0'] +
+		    hex[toupper(console_buffer[i+1])-'0']);
+		}
+	    }
 
-            /* prepare network eeprom */
-            sromMII[20] = eerev.etheraddr[0];
-            sromMII[21] = eerev.etheraddr[1];
-            sromMII[22] = eerev.etheraddr[2];
-            sromMII[23] = eerev.etheraddr[3];
-            sromMII[24] = eerev.etheraddr[4];
-            sromMII[25] = eerev.etheraddr[5];
-            printf("\nSRom:  Writing DEC21143 MII info .. ");
+	    /* prepare network eeprom */
+	    sromMII[20] = eerev.etheraddr[0];
+	    sromMII[21] = eerev.etheraddr[1];
+	    sromMII[22] = eerev.etheraddr[2];
+	    sromMII[23] = eerev.etheraddr[3];
+	    sromMII[24] = eerev.etheraddr[4];
+	    sromMII[25] = eerev.etheraddr[5];
+	    printf("\nSRom:  Writing DEC21143 MII info .. ");
 
-            if (dc_srom_store ((u_short *)sromMII) == -1)
-                printf("FAILED\n");
-            else
-                printf("OK\n");
-        }
+	    if (dc_srom_store ((u_short *)sromMII) == -1)
+		printf("FAILED\n");
+	    else
+		printf("OK\n");
+	}
 
-        if (eltec_board == 740)
-        {
-            *(int *)&eerev.res[0] = 0;
-            sromSYM[20] = eerev.etheraddr[0];
-            sromSYM[21] = eerev.etheraddr[1];
-            sromSYM[22] = eerev.etheraddr[2];
-            sromSYM[23] = eerev.etheraddr[3];
-            sromSYM[24] = eerev.etheraddr[4];
-            sromSYM[25] = eerev.etheraddr[5];
-            printf("\nSRom:  Writing DEC21143 SYM info .. ");
+	if (eltec_board == 740)
+	{
+	    *(int *)&eerev.res[0] = 0;
+	    sromSYM[20] = eerev.etheraddr[0];
+	    sromSYM[21] = eerev.etheraddr[1];
+	    sromSYM[22] = eerev.etheraddr[2];
+	    sromSYM[23] = eerev.etheraddr[3];
+	    sromSYM[24] = eerev.etheraddr[4];
+	    sromSYM[25] = eerev.etheraddr[5];
+	    printf("\nSRom:  Writing DEC21143 SYM info .. ");
 
-            if (dc_srom_store ((u_short *)sromSYM) == -1)
-                printf("FAILED\n");
-            else
-                printf("OK\n");
-        }
+	    if (dc_srom_store ((u_short *)sromSYM) == -1)
+		printf("FAILED\n");
+	    else
+		printf("OK\n");
+	}
 
-        /* update CRC */
-        eerev.crc = el_srom_checksum((u_char *)eerev.board, eerev.size);
+	/* update CRC */
+	eerev.crc = el_srom_checksum((u_char *)eerev.board, eerev.size);
 
-        /* write new values */
-        printf("\nSRom:  Writing revision info ...... ");
-        if (el_srom_store((BLOCK_SIZE-sizeof(revinfo)), (u_char *)&eerev,
-                            sizeof(revinfo), SECOND_DEVICE, FIRST_BLOCK) == -1)
-            printf("FAILED\n\n");
-        else
-            printf("OK\n\n");
+	/* write new values */
+	printf("\nSRom:  Writing revision info ...... ");
+	if (el_srom_store((BLOCK_SIZE-sizeof(revinfo)), (u_char *)&eerev,
+			    sizeof(revinfo), SECOND_DEVICE, FIRST_BLOCK) == -1)
+	    printf("FAILED\n\n");
+	else
+	    printf("OK\n\n");
 
-        /* write new values as shadow image to nvram */
-        nvram_write (CFG_NV_SROM_COPY_ADDR, (void *)&eerev, CFG_SROM_SIZE);
+	/* write new values as shadow image to nvram */
+	nvram_write (CFG_NV_SROM_COPY_ADDR, (void *)&eerev, CFG_SROM_SIZE);
 
     } /*if (initSrom) */
 
     /* copy current values as shadow image to nvram */
     if (initSrom == 0 && copyNv == 1)
-        nvram_write (CFG_NV_SROM_COPY_ADDR, (void *)&eerev, CFG_SROM_SIZE);
+	nvram_write (CFG_NV_SROM_COPY_ADDR, (void *)&eerev, CFG_SROM_SIZE);
 
     /* update environment */
     sprintf (buf, "%02x:%02x:%02x:%02x:%02x:%02x",
-            eerev.etheraddr[0], eerev.etheraddr[1],
-            eerev.etheraddr[2], eerev.etheraddr[3],
-            eerev.etheraddr[4], eerev.etheraddr[5]);
+	    eerev.etheraddr[0], eerev.etheraddr[1],
+	    eerev.etheraddr[2], eerev.etheraddr[3],
+	    eerev.etheraddr[4], eerev.etheraddr[5]);
     setenv ("ethaddr", buf);
 
     /* print actual board identification */
     printf("Ident: %s  Ser %s  Rev %c%c\n",
-            eerev.board, (char *)&eerev.serial,
-            eerev.revision[0][0], eerev.revision[0][1]);
+	    eerev.board, (char *)&eerev.serial,
+	    eerev.revision[0][0], eerev.revision[0][1]);
 
     /* global board ident */
     if (strstr ((char *)&eerev.board, "75") != NULL)
-        eltec_board = 750;
+	eltec_board = 750;
     else
-        eltec_board = 740;
+	eltec_board = 740;
 
    /*
     * L2 cache configuration
@@ -337,12 +337,12 @@
     ptr = getenv("l2cache");
     if (*ptr == '0')
     {
-        printf ("Cache: L2 NOT activated on BAB%d\n", eltec_board);
+	printf ("Cache: L2 NOT activated on BAB%d\n", eltec_board);
     }
     else
     {
-        printf ("Cache: L2 activated on BAB%d\n", eltec_board);
-        l2_cache_enable(*(int*)&eerev.res[0]);
+	printf ("Cache: L2 activated on BAB%d\n", eltec_board);
+	l2_cache_enable(*(int*)&eerev.res[0]);
     }
 #endif
 
@@ -351,12 +351,12 @@
     */
     if ((ptr = getenv ("ata_reset_time")) != NULL)
     {
-        ata_reset_time = (int)simple_strtoul (ptr, NULL, 10);
+	ata_reset_time = (int)simple_strtoul (ptr, NULL, 10);
     }
     else
     {
-        sprintf (buf, "%d", ata_reset_time);
-        setenv ("ata_reset_time", buf);
+	sprintf (buf, "%d", ata_reset_time);
+	setenv ("ata_reset_time", buf);
     }
 
    /*
@@ -364,55 +364,55 @@
     */
     if ((ptr = getenv ("scsi_reset_time")) != NULL)
     {
-        scsi_reset_time = (int)simple_strtoul (ptr, NULL, 10);
+	scsi_reset_time = (int)simple_strtoul (ptr, NULL, 10);
     }
     else
     {
-        sprintf (buf, "%d", scsi_reset_time);
-        setenv ("scsi_reset_time", buf);
+	sprintf (buf, "%d", scsi_reset_time);
+	setenv ("scsi_reset_time", buf);
     }
 
 
     if ((bdf = pci_find_device(PCI_VENDOR_ID_WINBOND, PCI_DEVICE_ID_WINBOND_83C553, 0)) > 0)
     {
-        if (pci_find_device(PCI_VENDOR_ID_NCR, PCI_DEVICE_ID_NCR_53C860, 0) > 0)
-        {
-            /* BAB740 with SCSI=IRQ 11; SCC=IRQ 9; no IDE; NCR860 at 80 Mhz */
-            scsi_dev_id = PCI_DEVICE_ID_NCR_53C860;
-            scsi_max_scsi_id = 7;
-            scsi_sym53c8xx_ccf = 0x15;
-            pci_write_config_byte (bdf, WINBOND_IDEIRCR, 0xb0);
-        }
+	if (pci_find_device(PCI_VENDOR_ID_NCR, PCI_DEVICE_ID_NCR_53C860, 0) > 0)
+	{
+	    /* BAB740 with SCSI=IRQ 11; SCC=IRQ 9; no IDE; NCR860 at 80 Mhz */
+	    scsi_dev_id = PCI_DEVICE_ID_NCR_53C860;
+	    scsi_max_scsi_id = 7;
+	    scsi_sym53c8xx_ccf = 0x15;
+	    pci_write_config_byte (bdf, WINBOND_IDEIRCR, 0xb0);
+	}
 
-        if ((ptr = getenv ("ide_dma_off")) != NULL)
-        {
-            u_long dma_off = simple_strtoul (ptr, NULL, 10);
-            /*
-            * setup user defined registers
-            * s.a. linux/drivers/ide/sl82c105.c
-            */
-            bdf |= PCI_BDF(0,0,1);            /* ide user reg at bdf function 1 */
-            if (dma_off & 1)
-            {
-                pci_write_config_byte (bdf, 0x46, 1);
-                printf("IDE:   DMA off flag set: Bus 0 : Dev 0\n");
-            }
-            if (dma_off & 2)
-            {
-                pci_write_config_byte (bdf, 0x4a, 1);
-                printf("IDE:   DMA off flag set: Bus 0 : Dev 1\n");
-            }
-            if (dma_off & 4)
-            {
-                pci_write_config_byte (bdf, 0x4e, 1);
-                printf("IDE:   DMA off flag set: Bus 1 : Dev 0\n");
-            }
-            if (dma_off & 8)
-            {
-                pci_write_config_byte (bdf, 0x52, 1);
-                printf("IDE:   DMA off flag set: Bus 1 : Dev 1\n");
-            }
-        }
+	if ((ptr = getenv ("ide_dma_off")) != NULL)
+	{
+	    u_long dma_off = simple_strtoul (ptr, NULL, 10);
+	    /*
+	    * setup user defined registers
+	    * s.a. linux/drivers/ide/sl82c105.c
+	    */
+	    bdf |= PCI_BDF(0,0,1);            /* ide user reg at bdf function 1 */
+	    if (dma_off & 1)
+	    {
+		pci_write_config_byte (bdf, 0x46, 1);
+		printf("IDE:   DMA off flag set: Bus 0 : Dev 0\n");
+	    }
+	    if (dma_off & 2)
+	    {
+		pci_write_config_byte (bdf, 0x4a, 1);
+		printf("IDE:   DMA off flag set: Bus 0 : Dev 1\n");
+	    }
+	    if (dma_off & 4)
+	    {
+		pci_write_config_byte (bdf, 0x4e, 1);
+		printf("IDE:   DMA off flag set: Bus 1 : Dev 0\n");
+	    }
+	    if (dma_off & 8)
+	    {
+		pci_write_config_byte (bdf, 0x52, 1);
+		printf("IDE:   DMA off flag set: Bus 1 : Dev 1\n");
+	    }
+	}
     }
     return (0);
 }
@@ -498,48 +498,48 @@
 
     if (eltec_board == 740)
     {
-        printf("SYM media select "); /* BAB740 */
-        /* start autoneg. with 10 mbit */
-        media_reg_init (dev, 0x3ffff, 0x08af0008, 0x00a10008, 0x00a50008, 0x02400080);
-        ext = status = 0;
-        for (i=0; i<2000+ext; i++)
-        {
-            status = INL(dev, DE4X5_SISR);
-            udelay(1000);
-            if (status & 0x2000) ext = 2000;
-            if ((status & 0x7000) == 0x5000) break;
-        }
+	printf("SYM media select "); /* BAB740 */
+	/* start autoneg. with 10 mbit */
+	media_reg_init (dev, 0x3ffff, 0x08af0008, 0x00a10008, 0x00a50008, 0x02400080);
+	ext = status = 0;
+	for (i=0; i<2000+ext; i++)
+	{
+	    status = INL(dev, DE4X5_SISR);
+	    udelay(1000);
+	    if (status & 0x2000) ext = 2000;
+	    if ((status & 0x7000) == 0x5000) break;
+	}
 
-        /* autoneg. ok -> 100MB FD */
-        if ((status & 0x0100f000) == 0x0100d000)
-        {
-            media_reg_init (dev, 0x37f7f, 0x08270008, 0x00210008, 0x00250008, 0x03c40280);
-            printf("100baseTx-FD\n");
-        }
-        /* autoneg. ok -> 100MB HD */
-        else if ((status & 0x0080f000) == 0x0080d000)
-        {
-            media_reg_init (dev, 0x17f7f, 0x08270008, 0x00210008, 0x00250008, 0x03c40080);
-            printf("100baseTx\n");
-        }
-        /* autoneg. ok -> 10MB FD */
-        else if ((status & 0x0040f000) == 0x0040d000)
-        {
-            media_reg_init (dev, 0x07f7f, 0x08af0008, 0x00a10008, 0x00a50008, 0x02400280);
-            printf("10baseT-FD\n");
-        }
-        /* autoneg. fail -> 10MB HD */
-        else
-        {
-            media_reg_init (dev, 0x7f7f, 0x08af0008, 0x00a10008, 0x00a50008,
-                        (OMR_SDP | OMR_TTM | OMR_PM));
-            printf("10baseT\n");
-        }
+	/* autoneg. ok -> 100MB FD */
+	if ((status & 0x0100f000) == 0x0100d000)
+	{
+	    media_reg_init (dev, 0x37f7f, 0x08270008, 0x00210008, 0x00250008, 0x03c40280);
+	    printf("100baseTx-FD\n");
+	}
+	/* autoneg. ok -> 100MB HD */
+	else if ((status & 0x0080f000) == 0x0080d000)
+	{
+	    media_reg_init (dev, 0x17f7f, 0x08270008, 0x00210008, 0x00250008, 0x03c40080);
+	    printf("100baseTx\n");
+	}
+	/* autoneg. ok -> 10MB FD */
+	else if ((status & 0x0040f000) == 0x0040d000)
+	{
+	    media_reg_init (dev, 0x07f7f, 0x08af0008, 0x00a10008, 0x00a50008, 0x02400280);
+	    printf("10baseT-FD\n");
+	}
+	/* autoneg. fail -> 10MB HD */
+	else
+	{
+	    media_reg_init (dev, 0x7f7f, 0x08af0008, 0x00a10008, 0x00a50008,
+			(OMR_SDP | OMR_TTM | OMR_PM));
+	    printf("10baseT\n");
+	}
     }
     else
     {
-        printf("MII media selected\n");                     /* BAB750 */
-        OUTL(dev, OMR_SDP | OMR_PS | OMR_PM, DE4X5_OMR);    /* CSR6 */
+	printf("MII media selected\n");                     /* BAB750 */
+	OUTL(dev, OMR_SDP | OMR_PS | OMR_PM, DE4X5_OMR);    /* CSR6 */
     }
 }
 #endif /* CONFIG_TULIP_SELECT_MEDIA */

diff --git a/board/eltec/bab7xx/pci.c b/board/eltec/bab7xx/pci.c
index a5fcfef..edbd3dd 100644
--- a/board/eltec/bab7xx/pci.c
+++ b/board/eltec/bab7xx/pci.c

@@ -43,48 +43,48 @@
     hose->last_busno = 0xff;
 
     pci_set_region(hose->regions + 0,
-        CFG_PCI_MEMORY_BUS,
-        CFG_PCI_MEMORY_PHYS,
+	CFG_PCI_MEMORY_BUS,
+	CFG_PCI_MEMORY_PHYS,
     /*
     * Attention: pci_hose_phys_to_bus() failes in address compare,
     * so we need (CFG_PCI_MEMORY_SIZE-1)
     */
-        CFG_PCI_MEMORY_SIZE-1,
-        PCI_REGION_MEM | PCI_REGION_MEMORY);
+	CFG_PCI_MEMORY_SIZE-1,
+	PCI_REGION_MEM | PCI_REGION_MEMORY);
 
     /* PCI memory space */
     pci_set_region(hose->regions + 1,
-        CFG_PCI_MEM_BUS,
-        CFG_PCI_MEM_PHYS,
-        CFG_PCI_MEM_SIZE,
-        PCI_REGION_MEM);
+	CFG_PCI_MEM_BUS,
+	CFG_PCI_MEM_PHYS,
+	CFG_PCI_MEM_SIZE,
+	PCI_REGION_MEM);
 
     /* ISA/PCI memory space */
     pci_set_region(hose->regions + 2,
-        CFG_ISA_MEM_BUS,
-        CFG_ISA_MEM_PHYS,
-        CFG_ISA_MEM_SIZE,
-        PCI_REGION_MEM);
+	CFG_ISA_MEM_BUS,
+	CFG_ISA_MEM_PHYS,
+	CFG_ISA_MEM_SIZE,
+	PCI_REGION_MEM);
 
     /* PCI I/O space */
     pci_set_region(hose->regions + 3,
-        CFG_PCI_IO_BUS,
-        CFG_PCI_IO_PHYS,
-        CFG_PCI_IO_SIZE,
-        PCI_REGION_IO);
+	CFG_PCI_IO_BUS,
+	CFG_PCI_IO_PHYS,
+	CFG_PCI_IO_SIZE,
+	PCI_REGION_IO);
 
     /* ISA/PCI I/O space */
     pci_set_region(hose->regions + 4,
-        CFG_ISA_IO_BUS,
-        CFG_ISA_IO_PHYS,
-        CFG_ISA_IO_SIZE,
-        PCI_REGION_IO);
+	CFG_ISA_IO_BUS,
+	CFG_ISA_IO_PHYS,
+	CFG_ISA_IO_SIZE,
+	PCI_REGION_IO);
 
     hose->region_count = 5;
 
     pci_setup_indirect(hose,
-        MPC106_REG_ADDR,
-        MPC106_REG_DATA);
+	MPC106_REG_ADDR,
+	MPC106_REG_DATA);
 
     pci_register_hose(hose);
 
@@ -93,9 +93,9 @@
     /* Initialises the MPC10x PCI Configuration regs. */
     pci_read_config_dword (PCI_BDF(0,0,0), PCI_PICR2, &reg32);
     reg32 |= PICR2_CF_SNOOP_WS(3) |
-             PICR2_CF_FLUSH_L2 |
-             PICR2_CF_L2_HIT_DELAY(3) |
-             PICR2_CF_APHASE_WS(3);
+	     PICR2_CF_FLUSH_L2 |
+	     PICR2_CF_L2_HIT_DELAY(3) |
+	     PICR2_CF_APHASE_WS(3);
     reg32 &= ~(PICR2_L2_EN | PICR2_L2_UPDATE_EN);
     pci_write_config_dword (PCI_BDF(0,0,0), PCI_PICR2, reg32);
 
@@ -108,12 +108,12 @@
 
     pci_read_config_dword (PCI_BDF(0,0,0), PCI_PICR1, &reg32);
     reg32 |= PICR1_CF_CBA(63) |
-             PICR1_CF_BREAD_WS(2) |
-             PICR1_MCP_EN |
-             PICR1_CF_DPARK |
-             PICR1_PROC_TYPE_604 |
-             PICR1_CF_LOOP_SNOOP |
-             PICR1_CF_APARK;
+	     PICR1_CF_BREAD_WS(2) |
+	     PICR1_MCP_EN |
+	     PICR1_CF_DPARK |
+	     PICR1_PROC_TYPE_604 |
+	     PICR1_CF_LOOP_SNOOP |
+	     PICR1_CF_APARK;
     pci_write_config_dword (PCI_BDF(0,0,0), PCI_PICR1, reg32);
 }
 

diff --git a/board/eltec/bab7xx/srom.h b/board/eltec/bab7xx/srom.h
index 7924bcd..c18ab91 100644
--- a/board/eltec/bab7xx/srom.h
+++ b/board/eltec/bab7xx/srom.h

@@ -81,18 +81,18 @@
 
 unsigned long el_srom_checksum (unsigned char *ptr, unsigned long size);
 int el_srom_load  (unsigned char addr, unsigned char *buf, int cnt,
-                   unsigned char device, unsigned char block);
+		   unsigned char device, unsigned char block);
 int el_srom_store (unsigned char addr, unsigned char *buf, int cnt,
-                   unsigned char device, unsigned char block);
+		   unsigned char device, unsigned char block);
 
 int mpc107_i2c_init (unsigned long eumb_addr, unsigned long divider);
 int mpc107_i2c_read_byte (unsigned char device, unsigned char block, unsigned char offset);
 int mpc107_i2c_write_byte (unsigned char device, unsigned char block,
-                           unsigned char offset, unsigned char val);
+			   unsigned char offset, unsigned char val);
 int mpc107_srom_load (unsigned char addr, unsigned char *pBuf, int cnt,
-                      unsigned char device, unsigned char block);
+		      unsigned char device, unsigned char block);
 int mpc107_srom_store (unsigned char addr, unsigned char *pBuf, int cnt,
-                       unsigned char device, unsigned char block);
+		       unsigned char device, unsigned char block);
 
 int dc_srom_load (unsigned short *dest);
 int dc_srom_store (unsigned short *src);

diff --git a/board/eltec/bab7xx/u-boot.lds b/board/eltec/bab7xx/u-boot.lds
index de50bf4..0dfa8c0 100644
--- a/board/eltec/bab7xx/u-boot.lds
+++ b/board/eltec/bab7xx/u-boot.lds

@@ -106,6 +106,11 @@
   _edata  =  .;
   PROVIDE (edata = .);
 
+  __u_boot_cmd_start = .;
+  .u_boot_cmd : { *(.u_boot_cmd) }
+  __u_boot_cmd_end = .;
+
+
   __start___ex_table = .;
   __ex_table : { *(__ex_table) }
   __stop___ex_table = .;

diff --git a/board/eltec/elppc/Makefile b/board/eltec/elppc/Makefile
index 1ed1a24..76b2cfe 100644
--- a/board/eltec/elppc/Makefile
+++ b/board/eltec/elppc/Makefile

@@ -30,7 +30,7 @@
 SOBJS	= asm_init.o
 
 $(LIB):	.depend $(OBJS) $(SOBJS)
-	$(AR) crv $@ $^
+	$(AR) crv $@  $(OBJS) $(SOBJS)
 
 clean:
 	rm -f $(SOBJS) $(OBJS)
@@ -46,12 +46,3 @@
 sinclude .depend
 
 #########################################################################
-
-
-
-
-
-
-
-
-

diff --git a/board/eltec/elppc/eepro100_srom.c b/board/eltec/elppc/eepro100_srom.c
index a5e47cf..9754c1d 100644
--- a/board/eltec/elppc/eepro100_srom.c
+++ b/board/eltec/elppc/eepro100_srom.c

@@ -32,7 +32,7 @@
 #include "srom.h"
 
 extern int eepro100_write_eeprom (struct eth_device* dev,
-                    int location, int addr_len, unsigned short data);
+		    int location, int addr_len, unsigned short data);
 
 /*----------------------------------------------------------------------------*/
 
@@ -43,7 +43,7 @@
 
     for (i = 0; i < (EE_SIZE-1); i++)
     {
-        sum += sromdata[i];
+	sum += sromdata[i];
     }
     return (EE_CHECKSUM - sum);
 }
@@ -57,7 +57,7 @@
 
     /* get onboard network iobase */
     pci_read_config_dword(PCI_BDF(0,0x10,0), PCI_BASE_ADDRESS_0,
-                 &onboard_dev.iobase);
+		 &onboard_dev.iobase);
     onboard_dev.iobase &= ~0xf;
 
     source[63] = eepro100_srom_checksum (source);
@@ -65,8 +65,8 @@
     for (count=0; count < EE_SIZE; count++)
     {
     if ( eepro100_write_eeprom ((struct eth_device*)&onboard_dev,
-             count, EE_ADDR_BITS, SROM_SHORT(source)) == -1 )
-        return -1;
+	     count, EE_ADDR_BITS, SROM_SHORT(source)) == -1 )
+	return -1;
     source++;
     }
     return 0;
@@ -89,22 +89,22 @@
 
     /* get onboard network iobase */
     pci_read_config_dword(PCI_BDF(0,0x10,0), PCI_BASE_ADDRESS_0,
-                 &onboard_dev.iobase);
+		 &onboard_dev.iobase);
     onboard_dev.iobase &= ~0xf;
 
     memset (destination, 0x65, 128);
 
     for (count=0; count < 0x40; count++)
     {
-        *destination++ = read_eeprom (struct eth_device*)&onboard_dev,
-                 count, EE_ADDR_BITS);
+	*destination++ = read_eeprom (struct eth_device*)&onboard_dev,
+		 count, EE_ADDR_BITS);
 #ifdef DEBUG
-        printf ("%04x ", *(destination - 1));
-        if (lr++ == 7)
-        {
-            printf("\n");
-            lr = 0;
-        }
+	printf ("%04x ", *(destination - 1));
+	if (lr++ == 7)
+	{
+	    printf("\n");
+	    lr = 0;
+	}
 #endif
     }
 }

diff --git a/board/eltec/elppc/elppc.c b/board/eltec/elppc/elppc.c
index 97b70a4..7b4d7d2 100644
--- a/board/eltec/elppc/elppc.c
+++ b/board/eltec/elppc/elppc.c

@@ -30,82 +30,81 @@
 
 int checkboard (void)
 {
-    puts ("Board: ELTEC PowerPC\n");
-    return (0);
+	puts ("Board: ELTEC PowerPC\n");
+	return (0);
 }
 
 /* ------------------------------------------------------------------------- */
 
 int checkflash (void)
 {
-    /* TODO */
-    printf ("Test not implemented !\n");
-    return (0);
+	/* TODO */
+	printf ("Test not implemented !\n");
+	return (0);
 }
 
 /* ------------------------------------------------------------------------- */
 
 static unsigned int mpc106_read_cfg_dword (unsigned int reg)
 {
-    unsigned int reg_addr = MPC106_REG | (reg & 0xFFFFFFFC);
+	unsigned int reg_addr = MPC106_REG | (reg & 0xFFFFFFFC);
 
-    out32r(MPC106_REG_ADDR, reg_addr);
+	out32r (MPC106_REG_ADDR, reg_addr);
 
-    return (in32r(MPC106_REG_DATA | (reg & 0x3)));
+	return (in32r (MPC106_REG_DATA | (reg & 0x3)));
 }
 
 /* ------------------------------------------------------------------------- */
 
 long int dram_size (int board_type)
 {
-    /*
-    * No actual initialisation to do - done when setting up
-    * PICRs MCCRs ME/SARs etc in asm_init.S.
-    */
+	/*
+	 * No actual initialisation to do - done when setting up
+	 * PICRs MCCRs ME/SARs etc in asm_init.S.
+	 */
 
-    register unsigned long i, msar1, mear1, memSize;
+	register unsigned long i, msar1, mear1, memSize;
 
 #if defined(CFG_MEMTEST)
-    register unsigned long reg;
+	register unsigned long reg;
 
-    printf("Testing DRAM\n");
+	printf ("Testing DRAM\n");
 
-    /* write each mem addr with it's address */
-    for (reg = CFG_MEMTEST_START; reg < CFG_MEMTEST_END; reg+=4)
-        *reg = reg;
+	/* write each mem addr with it's address */
+	for (reg = CFG_MEMTEST_START; reg < CFG_MEMTEST_END; reg += 4)
+		*reg = reg;
 
-    for (reg = CFG_MEMTEST_START; reg < CFG_MEMTEST_END; reg+=4)
-    {
-        if (*reg != reg)
-        return -1;
-    }
+	for (reg = CFG_MEMTEST_START; reg < CFG_MEMTEST_END; reg += 4) {
+		if (*reg != reg)
+			return -1;
+	}
 #endif
 
-    /*
-    * Since MPC107 memory controller chip has already been set to
-    * control all memory, just read and interpret its memory boundery register.
-    */
-    memSize = 0;
-    msar1 = mpc106_read_cfg_dword(MPC106_MSAR1);
-    mear1 = mpc106_read_cfg_dword(MPC106_MEAR1);
-    i     = mpc106_read_cfg_dword(MPC106_MBER) & 0xf;
+	/*
+	 * Since MPC107 memory controller chip has already been set to
+	 * control all memory, just read and interpret its memory boundery register.
+	 */
+	memSize = 0;
+	msar1 = mpc106_read_cfg_dword (MPC106_MSAR1);
+	mear1 = mpc106_read_cfg_dword (MPC106_MEAR1);
+	i = mpc106_read_cfg_dword (MPC106_MBER) & 0xf;
 
-    do
-    {
-        if (i & 0x01)   /* is bank enabled ? */
-            memSize += (mear1 & 0xff) - (msar1 & 0xff) + 1;
-        msar1 >>= 8;
-        mear1 >>= 8;
-        i     >>= 1;
-    } while (i);
+	do {
+		if (i & 0x01)			/* is bank enabled ? */
+			memSize += (mear1 & 0xff) - (msar1 & 0xff) + 1;
+		msar1 >>= 8;
+		mear1 >>= 8;
+		i >>= 1;
+	} while (i);
 
-    return (memSize * 0x100000);
+	return (memSize * 0x100000);
 }
+
 /* ------------------------------------------------------------------------- */
 
-long int initdram(int board_type)
+long int initdram (int board_type)
 {
-    return dram_size(board_type);
+	return dram_size (board_type);
 }
 
 /* ------------------------------------------------------------------------- */
@@ -115,9 +114,10 @@
  * Register PI in the MPC 107 (at offset 0x41090 of the Embedded Utilities
  * Memory Block).
  */
-void do_reset (cmd_tbl_t *cmdtp, bd_t *bd, int flag, int argc, char *argv[])
+int do_reset (cmd_tbl_t * cmdtp, int flag, int argc, char *argv[])
 {
-    out8(MPC107_EUMB_PI, 1);
+	out8 (MPC107_EUMB_PI, 1);
+	return (0);
 }
 
 /* ------------------------------------------------------------------------- */
@@ -128,21 +128,21 @@
  * Since the 7xx CPUs don't have an internal watchdog, this function is
  * board specific.
  */
-void watchdog_reset(void)
+void watchdog_reset (void)
 {
 }
-#endif    /* CONFIG_WATCHDOG */
+#endif							/* CONFIG_WATCHDOG */
 
 /* ------------------------------------------------------------------------- */
 
 void after_reloc (ulong dest_addr)
 {
-    DECLARE_GLOBAL_DATA_PTR;
+	DECLARE_GLOBAL_DATA_PTR;
 
-    /*
-     * Jump to the main U-Boot board init code
-     */
-    board_init_r(gd, dest_addr);
+	/*
+	 * Jump to the main U-Boot board init code
+	 */
+	board_init_r (gd, dest_addr);
 }
 
 /* ------------------------------------------------------------------------- */
@@ -152,38 +152,23 @@
 
 void video_get_info_str (int line_number, char *info)
 {
-    /* init video info strings for graphic console */
-    switch (line_number)
-    {
-    case 1:
-        sprintf (info," MPC7xx V%d.%d at %d / %d MHz",
-            (get_pvr() >> 8) & 0xFF,
-            get_pvr() & 0xFF,
-            400,
-            100);
-        return;
-    case 2:
-        sprintf (info, " ELTEC ELPPC with %ld MB DRAM and %ld MB FLASH",
-            dram_size(0)/0x100000,
-            flash_init()/0x100000);
-        return;
-    case 3:
-        sprintf (info, " %s", smi.modeIdent);
-        return;
-    }
+	/* init video info strings for graphic console */
+	switch (line_number) {
+	case 1:
+		sprintf (info, " MPC7xx V%d.%d at %d / %d MHz",
+				 (get_pvr () >> 8) & 0xFF, get_pvr () & 0xFF, 400, 100);
+		return;
+	case 2:
+		sprintf (info, " ELTEC ELPPC with %ld MB DRAM and %ld MB FLASH",
+				 dram_size (0) / 0x100000, flash_init () / 0x100000);
+		return;
+	case 3:
+		sprintf (info, " %s", smi.modeIdent);
+		return;
+	}
 
-    /* no more info lines */
-    *info = 0;
-    return;
+	/* no more info lines */
+	*info = 0;
+	return;
 }
 #endif
-
-
-
-
-
-
-
-
-
-

diff --git a/board/eltec/elppc/flash.c b/board/eltec/elppc/flash.c
index 73496a1..442dd00 100644
--- a/board/eltec/elppc/flash.c
+++ b/board/eltec/elppc/flash.c

@@ -57,7 +57,7 @@
     /* Init: no FLASHes known */
     for (i=0; i<CFG_MAX_FLASH_BANKS; ++i)
     {
-        flash_info[i].flash_id = FLASH_UNKNOWN;
+	flash_info[i].flash_id = FLASH_UNKNOWN;
     }
 
     /* initialise 1st flash */
@@ -65,8 +65,8 @@
 
     if (flash_info[0].flash_id == FLASH_UNKNOWN)
     {
-        printf ("## Unknown FLASH on Bank 0 - Size = 0x%08lx = %ld MB\n",
-            size1, size1<<20);
+	printf ("## Unknown FLASH on Bank 0 - Size = 0x%08lx = %ld MB\n",
+	    size1, size1<<20);
     }
 
     /* initialise 2nd flash */
@@ -74,31 +74,31 @@
 
     if (flash_info[1].flash_id == FLASH_UNKNOWN)
     {
-        printf ("## Unknown FLASH on Bank 1 - Size = 0x%08lx = %ld MB\n",
-            size2, size2<<20);
+	printf ("## Unknown FLASH on Bank 1 - Size = 0x%08lx = %ld MB\n",
+	    size2, size2<<20);
     }
 
     /* monitor protection ON by default */
     if (size1 == 512*1024)
     {
-        (void)flash_protect(FLAG_PROTECT_SET,
-                FLASH_BASE0_PRELIM,
-                FLASH_BASE0_PRELIM+monitor_flash_len-1,
-                &flash_info[0]);
+	(void)flash_protect(FLAG_PROTECT_SET,
+		FLASH_BASE0_PRELIM,
+		FLASH_BASE0_PRELIM+monitor_flash_len-1,
+		&flash_info[0]);
     }
     if (size2 == 512*1024)
     {
-        (void)flash_protect(FLAG_PROTECT_SET,
-                FLASH_BASE1_PRELIM,
-                FLASH_BASE1_PRELIM+monitor_flash_len-1,
-                &flash_info[1]);
+	(void)flash_protect(FLAG_PROTECT_SET,
+		FLASH_BASE1_PRELIM,
+		FLASH_BASE1_PRELIM+monitor_flash_len-1,
+		&flash_info[1]);
     }
     if (size2 == 4*1024*1024)
     {
-        (void)flash_protect(FLAG_PROTECT_SET,
-                CFG_FLASH_BASE,
-                CFG_FLASH_BASE+monitor_flash_len-1,
-                &flash_info[1]);
+	(void)flash_protect(FLAG_PROTECT_SET,
+		CFG_FLASH_BASE,
+		CFG_FLASH_BASE+monitor_flash_len-1,
+		&flash_info[1]);
     }
 
     return (size1 + size2);
@@ -115,72 +115,72 @@
     volatile unsigned long *flash;
 
     if (info->flash_id == FLASH_UNKNOWN) {
-        printf ("missing or unknown FLASH type\n");
-        flash_init();
+	printf ("missing or unknown FLASH type\n");
+	flash_init();
     }
 
     if (info->flash_id == FLASH_UNKNOWN) {
-        printf ("missing or unknown FLASH type\n");
-        return;
+	printf ("missing or unknown FLASH type\n");
+	return;
     }
 
     switch (info->flash_id & FLASH_VENDMASK) {
     case FLASH_MAN_AMD:
-        printf ("AMD ");
-        break;
+	printf ("AMD ");
+	break;
     default:
-        printf ("Unknown Vendor ");
-        break;
+	printf ("Unknown Vendor ");
+	break;
     }
 
     switch (info->flash_id & FLASH_TYPEMASK) {
     case AMD_ID_F040B:
-        printf ("AM29F040B (4 Mbit)\n");
-        break;
+	printf ("AM29F040B (4 Mbit)\n");
+	break;
     case AMD_ID_F016D:
-        printf ("AM29F016D (16 Mbit)\n");
-        break;
+	printf ("AM29F016D (16 Mbit)\n");
+	break;
     case AMD_ID_F032B:
-        printf ("AM29F032B (32 Mbit)\n");
-        break;
+	printf ("AM29F032B (32 Mbit)\n");
+	break;
    default:
-        printf ("Unknown Chip Type\n");
-        break;
+	printf ("Unknown Chip Type\n");
+	break;
     }
 
     if (info->size >= (1 << 20)) {
-        printf ("  Size: %ld MB in %d Sectors\n", info->size >> 20, info->sector_count);
+	printf ("  Size: %ld MB in %d Sectors\n", info->size >> 20, info->sector_count);
     } else {
-        printf ("  Size: %ld kB in %d Sectors\n", info->size >> 10, info->sector_count);
+	printf ("  Size: %ld kB in %d Sectors\n", info->size >> 10, info->sector_count);
     }
 
     printf ("  Sector Start Addresses:");
     for (i=0; i<info->sector_count; ++i) {
-        /*
-        * Check if whole sector is erased
-        */
-        if (i != (info->sector_count-1))
-            size = info->start[i+1] - info->start[i];
-        else
-            size = info->start[0] + info->size - info->start[i];
+	/*
+	* Check if whole sector is erased
+	*/
+	if (i != (info->sector_count-1))
+	    size = info->start[i+1] - info->start[i];
+	else
+	    size = info->start[0] + info->size - info->start[i];
 
-        erased = 1;
-        flash = (volatile unsigned long *)info->start[i];
-        size = size >> 2;        /* divide by 4 for longword access */
-        for (k=0; k<size; k++) {
-            if (*flash++ != 0xffffffff) {
-                erased = 0;
-                break;
-            }
-        }
+	erased = 1;
+	flash = (volatile unsigned long *)info->start[i];
+	size = size >> 2;        /* divide by 4 for longword access */
+	for (k=0; k<size; k++) {
+	    if (*flash++ != 0xffffffff) {
+		erased = 0;
+		break;
+	    }
+	}
 
-        if ((i % 5) == 0)
-            printf ("\n   ");
+	if ((i % 5) == 0)
+	    printf ("\n   ");
 
-        printf (" %08lX%s%s",
-            info->start[i],
-            erased ? " E" : "  ",
-            info->protect[i] ? "RO " : "   ");
+	printf (" %08lX%s%s",
+	    info->start[i],
+	    erased ? " E" : "  ",
+	    info->protect[i] ? "RO " : "   ");
     }
     printf ("\n");
 }
@@ -226,37 +226,37 @@
     /* We accept only two AMD types */
     switch (vendor) {
     case (FLASH_WORD_SIZE)AMD_MANUFACT:
-        info->flash_id = FLASH_MAN_AMD;
-        break;
+	info->flash_id = FLASH_MAN_AMD;
+	break;
     default:
-        info->flash_id = FLASH_UNKNOWN;
-        info->sector_count = 0;
-        info->size = 0;
-        return (0);         /* no or unknown flash  */
+	info->flash_id = FLASH_UNKNOWN;
+	info->sector_count = 0;
+	info->size = 0;
+	return (0);         /* no or unknown flash  */
     }
 
     switch (devid) {
     case (FLASH_WORD_SIZE)AMD_ID_F040B:
-        info->flash_id |= AMD_ID_F040B;
-        info->sector_count = 8;
-        info->size = 0x00080000;
-        break;              /* => 0.5 MB      */
+	info->flash_id |= AMD_ID_F040B;
+	info->sector_count = 8;
+	info->size = 0x00080000;
+	break;              /* => 0.5 MB      */
 
     case (FLASH_WORD_SIZE)AMD_ID_F016D:
-        info->flash_id |= AMD_ID_F016D;
-        info->sector_count = 32;
-        info->size         = 0x00200000;
-        break;              /* => 2 MB      */
+	info->flash_id |= AMD_ID_F016D;
+	info->sector_count = 32;
+	info->size         = 0x00200000;
+	break;              /* => 2 MB      */
 
     case (FLASH_WORD_SIZE)AMD_ID_F032B:
-        info->flash_id |= AMD_ID_F032B;
-        info->sector_count = 64;
-        info->size         = 0x00400000;
-        break;              /* => 4 MB      */
+	info->flash_id |= AMD_ID_F032B;
+	info->sector_count = 64;
+	info->size         = 0x00400000;
+	break;              /* => 4 MB      */
 
     default:
-        info->flash_id = FLASH_UNKNOWN;
-        return (0);         /* => no or unknown flash */
+	info->flash_id = FLASH_UNKNOWN;
+	return (0);         /* => no or unknown flash */
 
     }
 
@@ -266,20 +266,20 @@
 
     /* check for protected sectors */
     for (i = 0; i < info->sector_count; i++) {
-        /* sector base address */
-        info->start[i] = base + i * (info->size / info->sector_count);
-        /* read sector protection at sector address, (A7 .. A0) = 0x02 */
-        /* D0 = 1 if protected */
-        caddr = (volatile unsigned char *)(info->start[i]);
-        info->protect[i] = caddr[2] & 1;
+	/* sector base address */
+	info->start[i] = base + i * (info->size / info->sector_count);
+	/* read sector protection at sector address, (A7 .. A0) = 0x02 */
+	/* D0 = 1 if protected */
+	caddr = (volatile unsigned char *)(info->start[i]);
+	info->protect[i] = caddr[2] & 1;
     }
 
     /*
      * Prevent writes to uninitialized FLASH.
      */
     if (info->flash_id != FLASH_UNKNOWN) {
-        caddr = (volatile unsigned char *)info->start[0];
-        caddr[0] = 0xF0;   /* reset bank */
+	caddr = (volatile unsigned char *)info->start[0];
+	caddr[0] = 0xF0;   /* reset bank */
     }
 
     return (info->size);
@@ -295,32 +295,32 @@
     int rc = 0;
 
     if ((s_first < 0) || (s_first > s_last)) {
-        if (info->flash_id == FLASH_UNKNOWN) {
-            printf ("- missing\n");
-        } else {
-            printf ("- no sectors to erase\n");
-        }
-        return 1;
+	if (info->flash_id == FLASH_UNKNOWN) {
+	    printf ("- missing\n");
+	} else {
+	    printf ("- no sectors to erase\n");
+	}
+	return 1;
     }
 
     if ((info->flash_id == FLASH_UNKNOWN) ||
-        (info->flash_id > FLASH_AMD_COMP)) {
-        printf ("Can't erase unknown flash type - aborted\n");
-        return 1;
+	(info->flash_id > FLASH_AMD_COMP)) {
+	printf ("Can't erase unknown flash type - aborted\n");
+	return 1;
     }
 
     prot = 0;
     for (sect=s_first; sect<=s_last; ++sect) {
-        if (info->protect[sect]) {
-            prot++;
-        }
+	if (info->protect[sect]) {
+	    prot++;
+	}
     }
 
     if (prot) {
-        printf ("- Warning: %d protected sectors will not be erased!\n",
-            prot);
+	printf ("- Warning: %d protected sectors will not be erased!\n",
+	    prot);
     } else {
-        printf ("\n");
+	printf ("\n");
     }
 
     l_sect = -1;
@@ -336,26 +336,26 @@
 
     /* Start erase on unprotected sectors */
     for (sect = s_first; sect<=s_last; sect++) {
-        if (info->protect[sect] == 0) { /* not protected */
-            addr = (FLASH_WORD_SIZE *)(info->start[sect]);
-            if (info->flash_id & FLASH_MAN_SST) {
-                addr[ADDR0] = (FLASH_WORD_SIZE)0x00AA00AA;
-                addr[ADDR1] = (FLASH_WORD_SIZE)0x00550055;
-                addr[ADDR0] = (FLASH_WORD_SIZE)0x00800080;
-                addr[ADDR0] = (FLASH_WORD_SIZE)0x00AA00AA;
-                addr[ADDR1] = (FLASH_WORD_SIZE)0x00550055;
-                addr[0] = (FLASH_WORD_SIZE)0x00500050;  /* block erase */
-                udelay(30000);  /* wait 30 ms */
-            }
-            else
-                addr[0] = (FLASH_WORD_SIZE)0x00300030;  /* sector erase */
-            l_sect = sect;
-        }
+	if (info->protect[sect] == 0) { /* not protected */
+	    addr = (FLASH_WORD_SIZE *)(info->start[sect]);
+	    if (info->flash_id & FLASH_MAN_SST) {
+		addr[ADDR0] = (FLASH_WORD_SIZE)0x00AA00AA;
+		addr[ADDR1] = (FLASH_WORD_SIZE)0x00550055;
+		addr[ADDR0] = (FLASH_WORD_SIZE)0x00800080;
+		addr[ADDR0] = (FLASH_WORD_SIZE)0x00AA00AA;
+		addr[ADDR1] = (FLASH_WORD_SIZE)0x00550055;
+		addr[0] = (FLASH_WORD_SIZE)0x00500050;  /* block erase */
+		udelay(30000);  /* wait 30 ms */
+	    }
+	    else
+		addr[0] = (FLASH_WORD_SIZE)0x00300030;  /* sector erase */
+	    l_sect = sect;
+	}
     }
 
     /* re-enable interrupts if necessary */
     if (flag)
-        enable_interrupts();
+	enable_interrupts();
 
     /* wait at least 80us - let's wait 1 ms */
     udelay (1000);
@@ -364,21 +364,21 @@
      * We wait for the last triggered sector
      */
     if (l_sect < 0)
-        goto DONE;
+	goto DONE;
 
     start = get_timer (0);
     last  = start;
     addr = (FLASH_WORD_SIZE *)(info->start[l_sect]);
     while ((addr[0] & (FLASH_WORD_SIZE)0x00800080) != (FLASH_WORD_SIZE)0x00800080) {
-        if ((now = get_timer(start)) > CFG_FLASH_ERASE_TOUT) {
-            printf ("Timeout\n");
-            return 1;
-        }
-        /* show that we're waiting */
-        if ((now - last) > 1000) {  /* every second */
-            serial_putc ('.');
-            last = now;
-        }
+	if ((now = get_timer(start)) > CFG_FLASH_ERASE_TOUT) {
+	    printf ("Timeout\n");
+	    return 1;
+	}
+	/* show that we're waiting */
+	if ((now - last) > 1000) {  /* every second */
+	    serial_putc ('.');
+	    last = now;
+	}
     }
 
 DONE:
@@ -408,42 +408,42 @@
      * handle unaligned start bytes
      */
     if ((l = addr - wp) != 0) {
-        data = 0;
-        for (i=0, cp=wp; i<l; ++i, ++cp) {
-            data = (data << 8) | (*(uchar *)cp);
-        }
-        for (; i<4 && cnt>0; ++i) {
-            data = (data << 8) | *src++;
-            --cnt;
-            ++cp;
-        }
-        for (; cnt==0 && i<4; ++i, ++cp) {
-            data = (data << 8) | (*(uchar *)cp);
-        }
+	data = 0;
+	for (i=0, cp=wp; i<l; ++i, ++cp) {
+	    data = (data << 8) | (*(uchar *)cp);
+	}
+	for (; i<4 && cnt>0; ++i) {
+	    data = (data << 8) | *src++;
+	    --cnt;
+	    ++cp;
+	}
+	for (; cnt==0 && i<4; ++i, ++cp) {
+	    data = (data << 8) | (*(uchar *)cp);
+	}
 
-        if ((rc = write_word(info, wp, data)) != 0) {
-            return (rc);
-        }
-        wp += 4;
+	if ((rc = write_word(info, wp, data)) != 0) {
+	    return (rc);
+	}
+	wp += 4;
     }
 
     /*
      * handle word aligned part
      */
     while (cnt >= 4) {
-        data = 0;
-        for (i=0; i<4; ++i) {
-            data = (data << 8) | *src++;
-        }
-        if ((rc = write_word(info, wp, data)) != 0) {
-            return (rc);
-        }
-        wp  += 4;
-        cnt -= 4;
+	data = 0;
+	for (i=0; i<4; ++i) {
+	    data = (data << 8) | *src++;
+	}
+	if ((rc = write_word(info, wp, data)) != 0) {
+	    return (rc);
+	}
+	wp  += 4;
+	cnt -= 4;
     }
 
     if (cnt == 0) {
-        return (0);
+	return (0);
     }
 
     /*
@@ -451,11 +451,11 @@
      */
     data = 0;
     for (i=0, cp=wp; i<4 && cnt>0; ++i, ++cp) {
-        data = (data << 8) | *src++;
-        --cnt;
+	data = (data << 8) | *src++;
+	--cnt;
     }
     for (; i<4; ++i, ++cp) {
-        data = (data << 8) | (*(uchar *)cp);
+	data = (data << 8) | (*(uchar *)cp);
     }
 
     return (write_word(info, wp, data));
@@ -469,45 +469,44 @@
  */
 static int write_word (flash_info_t *info, ulong dest, ulong data)
 {
-        volatile FLASH_WORD_SIZE *addr2 = (FLASH_WORD_SIZE *)(info->start[0]);
-        volatile FLASH_WORD_SIZE *dest2 = (FLASH_WORD_SIZE *)dest;
-        volatile FLASH_WORD_SIZE *data2 = (FLASH_WORD_SIZE *)&data;
+	volatile FLASH_WORD_SIZE *addr2 = (FLASH_WORD_SIZE *)(info->start[0]);
+	volatile FLASH_WORD_SIZE *dest2 = (FLASH_WORD_SIZE *)dest;
+	volatile FLASH_WORD_SIZE *data2 = (FLASH_WORD_SIZE *)&data;
     ulong start;
     int flag;
-        int i;
+	int i;
 
     /* Check if Flash is (sufficiently) erased */
     if ((*((volatile FLASH_WORD_SIZE *)dest) &
-             (FLASH_WORD_SIZE)data) != (FLASH_WORD_SIZE)data) {
-        return (2);
+	     (FLASH_WORD_SIZE)data) != (FLASH_WORD_SIZE)data) {
+	return (2);
     }
     /* Disable interrupts which might cause a timeout here */
     flag = disable_interrupts();
 
-        for (i=0; i<4/sizeof(FLASH_WORD_SIZE); i++)
-          {
-            addr2[ADDR0] = (FLASH_WORD_SIZE)0x00AA00AA;
-            addr2[ADDR1] = (FLASH_WORD_SIZE)0x00550055;
-            addr2[ADDR0] = (FLASH_WORD_SIZE)0x00A000A0;
+	for (i=0; i<4/sizeof(FLASH_WORD_SIZE); i++)
+	  {
+	    addr2[ADDR0] = (FLASH_WORD_SIZE)0x00AA00AA;
+	    addr2[ADDR1] = (FLASH_WORD_SIZE)0x00550055;
+	    addr2[ADDR0] = (FLASH_WORD_SIZE)0x00A000A0;
 
-            dest2[i] = data2[i];
+	    dest2[i] = data2[i];
 
-            /* re-enable interrupts if necessary */
-            if (flag)
-              enable_interrupts();
+	    /* re-enable interrupts if necessary */
+	    if (flag)
+	      enable_interrupts();
 
-            /* data polling for D7 */
-            start = get_timer (0);
-            while ((dest2[i] & (FLASH_WORD_SIZE)0x00800080) !=
-                   (data2[i] & (FLASH_WORD_SIZE)0x00800080)) {
-              if (get_timer(start) > CFG_FLASH_WRITE_TOUT) {
-                return (1);
-              }
-            }
-          }
+	    /* data polling for D7 */
+	    start = get_timer (0);
+	    while ((dest2[i] & (FLASH_WORD_SIZE)0x00800080) !=
+		   (data2[i] & (FLASH_WORD_SIZE)0x00800080)) {
+	      if (get_timer(start) > CFG_FLASH_WRITE_TOUT) {
+		return (1);
+	      }
+	    }
+	  }
 
     return (0);
 }
 
 /*----------------------------------------------------------------------------*/
-

diff --git a/board/eltec/elppc/misc.c b/board/eltec/elppc/misc.c
index 7bfb3a4..f33aef7 100644
--- a/board/eltec/elppc/misc.c
+++ b/board/eltec/elppc/misc.c

@@ -32,7 +32,7 @@
 extern char console_buffer[CFG_CBSIZE];
 extern int l2_cache_enable (int l2control);
 extern int eepro100_write_eeprom (struct eth_device* dev, int location,
-                 int addr_len, unsigned short data);
+		 int addr_len, unsigned short data);
 extern int read_eeprom (struct eth_device* dev, int location, int addr_len);
 
 /*----------------------------------------------------------------------------*/
@@ -45,7 +45,7 @@
     uchar *s = (uchar *) (CFG_ENV_MAP_ADRS + src);
 
     while (count--)
-        *d++ = *s++;
+	*d++ = *s++;
 
     return dest;
 }
@@ -56,7 +56,7 @@
     uchar *s = (uchar *) src;
 
     while (count--)
-        *d++ = *s++;
+	*d++ = *s++;
 }
 
 /*----------------------------------------------------------------------------*/
@@ -72,7 +72,7 @@
     u_int  i, l, initSrom, copyNv;
     char buf[256];
     char hex[23] = { 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 0, 0, 0,
-                     0, 0, 0, 0, 10, 11, 12, 13, 14, 15 };
+		     0, 0, 0, 0, 10, 11, 12, 13, 14, 15 };
 
     /* Clock setting for MPC107 i2c */
     mpc107_i2c_init (MPC107_EUMB_ADDR, 0x2b);
@@ -91,166 +91,166 @@
 
     /* read out current revision srom contens */
     mpc107_srom_load (0x0000, (u_char*)&eerev, sizeof(revinfo),
-                SECOND_DEVICE, FIRST_BLOCK);
+		SECOND_DEVICE, FIRST_BLOCK);
 
     /* read out current nvram shadow image */
     nvram_read (buf, CFG_NV_SROM_COPY_ADDR, CFG_SROM_SIZE);
 
     if (strcmp (eerev.magic, "ELTEC") != 0)
     {
-        /* srom is not initialized -> create a default revision info */
-        for (i = 0, ptr = (u_char *)&eerev; i < sizeof(revinfo); i++)
-            *ptr++ = 0x00;
-        strcpy(eerev.magic, "ELTEC");
-        eerev.revrev[0] = 1;
-        eerev.revrev[1] = 0;
-        eerev.size = 0x00E0;
-        eerev.category[0] = 0x01;
+	/* srom is not initialized -> create a default revision info */
+	for (i = 0, ptr = (u_char *)&eerev; i < sizeof(revinfo); i++)
+	    *ptr++ = 0x00;
+	strcpy(eerev.magic, "ELTEC");
+	eerev.revrev[0] = 1;
+	eerev.revrev[1] = 0;
+	eerev.size = 0x00E0;
+	eerev.category[0] = 0x01;
 
-        /* node id from dead e128 as default */
-        eerev.etheraddr[0] = 0x00;
-        eerev.etheraddr[1] = 0x00;
-        eerev.etheraddr[2] = 0x5B;
-        eerev.etheraddr[3] = 0x00;
-        eerev.etheraddr[4] = 0x2E;
-        eerev.etheraddr[5] = 0x4D;
+	/* node id from dead e128 as default */
+	eerev.etheraddr[0] = 0x00;
+	eerev.etheraddr[1] = 0x00;
+	eerev.etheraddr[2] = 0x5B;
+	eerev.etheraddr[3] = 0x00;
+	eerev.etheraddr[4] = 0x2E;
+	eerev.etheraddr[5] = 0x4D;
 
-        /* cache config word for ELPPC */
-        *(int*)&eerev.res[0] = 0;
+	/* cache config word for ELPPC */
+	*(int*)&eerev.res[0] = 0;
 
-        initSrom = 1;  /* force dialog */
-        copyNv   = 1;  /* copy to nvram */
+	initSrom = 1;  /* force dialog */
+	copyNv   = 1;  /* copy to nvram */
     }
 
     if ((copyNv == 0) &&   (el_srom_checksum((u_char*)&eerev, CFG_SROM_SIZE) !=
-                el_srom_checksum((u_char*)buf, CFG_SROM_SIZE)))
+		el_srom_checksum((u_char*)buf, CFG_SROM_SIZE)))
     {
-        printf ("Invalid revision info copy in nvram !\n");
-        printf ("Press key:\n  <c> to copy current revision info to nvram.\n");
-        printf ("  <r> to reenter revision info.\n");
-        printf ("=> ");
-        if (0 != readline (NULL))
-        {
-            switch ((char)toupper(console_buffer[0]))
-            {
-            case 'C':
-                copyNv = 1;
-                break;
-            case 'R':
-                copyNv = 1;
-                initSrom = 1;
-                break;
-            }
-        }
+	printf ("Invalid revision info copy in nvram !\n");
+	printf ("Press key:\n  <c> to copy current revision info to nvram.\n");
+	printf ("  <r> to reenter revision info.\n");
+	printf ("=> ");
+	if (0 != readline (NULL))
+	{
+	    switch ((char)toupper(console_buffer[0]))
+	    {
+	    case 'C':
+		copyNv = 1;
+		break;
+	    case 'R':
+		copyNv = 1;
+		initSrom = 1;
+		break;
+	    }
+	}
     }
 
     if (initSrom)
     {
-        memcpy (buf, &eerev.revision[0][0], 14);     /* save all revision info */
-        printf ("Enter revision number (0-9): %c  ", eerev.revision[0][0]);
-        if (0 != readline (NULL))
-        {
-            eerev.revision[0][0] = (char)toupper(console_buffer[0]);
-            memcpy (&eerev.revision[1][0], buf, 12); /* shift rest of rev info */
-        }
+	memcpy (buf, &eerev.revision[0][0], 14);     /* save all revision info */
+	printf ("Enter revision number (0-9): %c  ", eerev.revision[0][0]);
+	if (0 != readline (NULL))
+	{
+	    eerev.revision[0][0] = (char)toupper(console_buffer[0]);
+	    memcpy (&eerev.revision[1][0], buf, 12); /* shift rest of rev info */
+	}
 
-        printf ("Enter revision character (A-Z): %c  ", eerev.revision[0][1]);
-        if (1 == readline (NULL))
-        {
-            eerev.revision[0][1] = (char)toupper(console_buffer[0]);
-        }
+	printf ("Enter revision character (A-Z): %c  ", eerev.revision[0][1]);
+	if (1 == readline (NULL))
+	{
+	    eerev.revision[0][1] = (char)toupper(console_buffer[0]);
+	}
 
-        printf ("Enter board name (V-XXXX-XXXX): %s  ", (char *)&eerev.board);
-        if (11 == readline (NULL))
-        {
-            for (i=0; i<11; i++)
-                eerev.board[i] =  (char)toupper(console_buffer[i]);
-            eerev.board[11] = '\0';
-        }
+	printf ("Enter board name (V-XXXX-XXXX): %s  ", (char *)&eerev.board);
+	if (11 == readline (NULL))
+	{
+	    for (i=0; i<11; i++)
+		eerev.board[i] =  (char)toupper(console_buffer[i]);
+	    eerev.board[11] = '\0';
+	}
 
-        printf ("Enter serial number: %s ", (char *)&eerev.serial );
-        if (6 == readline (NULL))
-        {
-            for (i=0; i<6; i++)
-                eerev.serial[i] = console_buffer[i];
-            eerev.serial[6] = '\0';
-        }
+	printf ("Enter serial number: %s ", (char *)&eerev.serial );
+	if (6 == readline (NULL))
+	{
+	    for (i=0; i<6; i++)
+		eerev.serial[i] = console_buffer[i];
+	    eerev.serial[6] = '\0';
+	}
 
-        printf ("Enter ether node ID with leading zero (HEX): %02x%02x%02x%02x%02x%02x  ",
-            eerev.etheraddr[0], eerev.etheraddr[1],
-            eerev.etheraddr[2], eerev.etheraddr[3],
-            eerev.etheraddr[4], eerev.etheraddr[5]);
-        if (12 == readline (NULL))
-        {
-            for (i=0; i<12; i+=2)
-            eerev.etheraddr[i>>1] = (char)(16*hex[toupper(console_buffer[i])-'0'] +
-                               hex[toupper(console_buffer[i+1])-'0']);
-        }
+	printf ("Enter ether node ID with leading zero (HEX): %02x%02x%02x%02x%02x%02x  ",
+	    eerev.etheraddr[0], eerev.etheraddr[1],
+	    eerev.etheraddr[2], eerev.etheraddr[3],
+	    eerev.etheraddr[4], eerev.etheraddr[5]);
+	if (12 == readline (NULL))
+	{
+	    for (i=0; i<12; i+=2)
+	    eerev.etheraddr[i>>1] = (char)(16*hex[toupper(console_buffer[i])-'0'] +
+			       hex[toupper(console_buffer[i+1])-'0']);
+	}
 
-        l = strlen ((char *)&eerev.text);
-        printf("Add to text section (max 64 chr): %s ", (char *)&eerev.text );
-        if (0 != readline (NULL))
-        {
-            for (i = l; i<63; i++)
-                eerev.text[i] = console_buffer[i-l];
-            eerev.text[63] = '\0';
-        }
+	l = strlen ((char *)&eerev.text);
+	printf("Add to text section (max 64 chr): %s ", (char *)&eerev.text );
+	if (0 != readline (NULL))
+	{
+	    for (i = l; i<63; i++)
+		eerev.text[i] = console_buffer[i-l];
+	    eerev.text[63] = '\0';
+	}
 
-        /* prepare network eeprom */
-        memset (buf, 0, 128);
+	/* prepare network eeprom */
+	memset (buf, 0, 128);
 
-        buf[0] = eerev.etheraddr[1];
-        buf[1] = eerev.etheraddr[0];
-        buf[2] = eerev.etheraddr[3];
-        buf[3] = eerev.etheraddr[2];
-        buf[4] = eerev.etheraddr[5];
-        buf[5] = eerev.etheraddr[4];
+	buf[0] = eerev.etheraddr[1];
+	buf[1] = eerev.etheraddr[0];
+	buf[2] = eerev.etheraddr[3];
+	buf[3] = eerev.etheraddr[2];
+	buf[4] = eerev.etheraddr[5];
+	buf[5] = eerev.etheraddr[4];
 
-        *(unsigned short *)&buf[20] = 0x48B2;
-        *(unsigned short *)&buf[22] = 0x0004;
-        *(unsigned short *)&buf[24] = 0x1433;
+	*(unsigned short *)&buf[20] = 0x48B2;
+	*(unsigned short *)&buf[22] = 0x0004;
+	*(unsigned short *)&buf[24] = 0x1433;
 
-        printf("\nSRom:  Writing i82559 info ........ ");
-        if (eepro100_srom_store ((unsigned short *)buf) == -1)
-            printf("FAILED\n");
-        else
-            printf("OK\n");
+	printf("\nSRom:  Writing i82559 info ........ ");
+	if (eepro100_srom_store ((unsigned short *)buf) == -1)
+	    printf("FAILED\n");
+	else
+	    printf("OK\n");
 
-        /* update CRC */
-        eerev.crc = el_srom_checksum((u_char *)eerev.board, eerev.size);
+	/* update CRC */
+	eerev.crc = el_srom_checksum((u_char *)eerev.board, eerev.size);
 
-        /* write new values */
-        printf("\nSRom:  Writing revision info ...... ");
-        if (mpc107_srom_store((BLOCK_SIZE-sizeof(revinfo)), (u_char *)&eerev,
-                            sizeof(revinfo), SECOND_DEVICE, FIRST_BLOCK) == -1)
-            printf("FAILED\n\n");
-        else
-            printf("OK\n\n");
+	/* write new values */
+	printf("\nSRom:  Writing revision info ...... ");
+	if (mpc107_srom_store((BLOCK_SIZE-sizeof(revinfo)), (u_char *)&eerev,
+			    sizeof(revinfo), SECOND_DEVICE, FIRST_BLOCK) == -1)
+	    printf("FAILED\n\n");
+	else
+	    printf("OK\n\n");
 
-        /* write new values as shadow image to nvram */
-        nvram_write (CFG_NV_SROM_COPY_ADDR, (void *)&eerev, CFG_SROM_SIZE);
+	/* write new values as shadow image to nvram */
+	nvram_write (CFG_NV_SROM_COPY_ADDR, (void *)&eerev, CFG_SROM_SIZE);
 
     } /*if (initSrom) */
 
     /* copy current values as shadow image to nvram */
     if (initSrom == 0 && copyNv == 1)
-        nvram_write (CFG_NV_SROM_COPY_ADDR, (void *)&eerev, CFG_SROM_SIZE);
+	nvram_write (CFG_NV_SROM_COPY_ADDR, (void *)&eerev, CFG_SROM_SIZE);
 
     /* update environment */
     sprintf (buf, "%02x:%02x:%02x:%02x:%02x:%02x",
-            eerev.etheraddr[0], eerev.etheraddr[1],
-            eerev.etheraddr[2], eerev.etheraddr[3],
-            eerev.etheraddr[4], eerev.etheraddr[5]);
+	    eerev.etheraddr[0], eerev.etheraddr[1],
+	    eerev.etheraddr[2], eerev.etheraddr[3],
+	    eerev.etheraddr[4], eerev.etheraddr[5]);
     setenv ("ethaddr", buf);
 
     /* set serial console as default */
     if ((ptr = getenv ("console")) == NULL)
-        setenv ("console", "serial");
+	setenv ("console", "serial");
 
     /* print actual board identification */
     printf("Ident: %s  Ser %s  Rev %c%c\n",
-            eerev.board, (char *)&eerev.serial,
-            eerev.revision[0][0], eerev.revision[0][1]);
+	    eerev.board, (char *)&eerev.serial,
+	    eerev.revision[0][0], eerev.revision[0][1]);
 
     return (0);
 }

diff --git a/board/eltec/elppc/mpc107_i2c.c b/board/eltec/elppc/mpc107_i2c.c
index a4bf599..ae6642e 100644
--- a/board/eltec/elppc/mpc107_i2c.c
+++ b/board/eltec/elppc/mpc107_i2c.c

@@ -43,13 +43,13 @@
 
     for (; size; size--)
     {
-        byte = *ptr++;
-        for (i = 8; i; i--)
-        {
-            f =  ((byte & 1) ^ (accu & 1)) ? 0x84083001 : 0;
-            accu >>= 1; accu ^= f;
-            byte >>= 1;
-        }
+	byte = *ptr++;
+	for (i = 8; i; i--)
+	{
+	    f =  ((byte & 1) ^ (accu & 1)) ? 0x84083001 : 0;
+	    accu >>= 1; accu ^= f;
+	    byte >>= 1;
+	}
     }
     return(accu);
 }
@@ -62,13 +62,13 @@
 
     while (((x = in32r(MPC107_I2CSR)) & 0x82) != 0x82)
     {
-        if (!timeout--)
-            return -1;
+	if (!timeout--)
+	    return -1;
     }
 
     if (x & 0x10)
     {
-        return -1;
+	return -1;
     }
     out32r(MPC107_I2CSR, 0);
 
@@ -81,8 +81,8 @@
 {
     while (in32r(MPC107_I2CSR) & 0x20)
     {
-        if (!timeout--)
-            return -1;
+	if (!timeout--)
+	    return -1;
     }
     return 0;
 }
@@ -99,7 +99,7 @@
     int data;
 
     if (!mpc107_eumb_addr)
-        return -6;
+	return -6;
 
     mpc107_i2c_wait_idle (timeout);
 
@@ -112,15 +112,15 @@
 
     if (mpc107_i2c_wait(timeout) < 0)
     {
-        printf("mpc107_i2c_read Error 1\n");
-        return -2;
+	printf("mpc107_i2c_read Error 1\n");
+	return -2;
     }
 
     if (in32r(MPC107_I2CSR)&0x1)
     {
-        /* Generate STOP condition; device busy or not existing */
-        out32r(MPC107_I2CCR, 0x80);
-        return -1;
+	/* Generate STOP condition; device busy or not existing */
+	out32r(MPC107_I2CCR, 0x80);
+	return -1;
     }
 
     /* Data address */
@@ -128,8 +128,8 @@
 
     if (mpc107_i2c_wait(timeout) < 0)
     {
-        printf("mpc107_i2c_read Error 2\n");
-        return -3;
+	printf("mpc107_i2c_read Error 2\n");
+	return -3;
     }
 
     /* Switch to read - restart */
@@ -138,8 +138,8 @@
 
     if (mpc107_i2c_wait(timeout) < 0)
     {
-        printf("mpc107_i2c_read Error 3\n");
-        return -4;
+	printf("mpc107_i2c_read Error 3\n");
+	return -4;
     }
 
     out32r(MPC107_I2CCR, 0xA8); /* no ACK */
@@ -147,8 +147,8 @@
 
     if (mpc107_i2c_wait(timeout) < 0)
     {
-        printf("mpc107_i2c_read Error 4\n");
-        return -5;
+	printf("mpc107_i2c_read Error 4\n");
+	return -5;
     }
     /* Generate STOP condition */
     out32r(MPC107_I2CCR, 0x88);
@@ -171,7 +171,7 @@
     unsigned long timeout = MPC107_I2C_TIMEOUT;
 
     if (!mpc107_eumb_addr)
-        return -6;
+	return -6;
 
     mpc107_i2c_wait_idle(timeout);
 
@@ -184,8 +184,8 @@
 
     if (mpc107_i2c_wait(timeout) < 0)
     {
-        printf("mpc107_i2c_write Error 1\n");
-        return -1;
+	printf("mpc107_i2c_write Error 1\n");
+	return -1;
     }
 
     /* Data address */
@@ -193,16 +193,16 @@
 
     if (mpc107_i2c_wait(timeout) < 0)
     {
-        printf("mpc107_i2c_write Error 2\n");
-        return -1;
+	printf("mpc107_i2c_write Error 2\n");
+	return -1;
     }
 
     /* Write */
     out32r(MPC107_I2CDR, val);
     if (mpc107_i2c_wait(timeout) < 0)
     {
-        printf("mpc107_i2c_write Error 3\n");
-        return -1;
+	printf("mpc107_i2c_write Error 3\n");
+	return -1;
     }
 
     /* Generate Stop Condition */
@@ -227,38 +227,38 @@
 
     for (i = 0; i < cnt; i++)
     {
-        timeout=100;
-        do
-        {
-            val = mpc107_i2c_read_byte (device, block, addr);
-            if (val < -1)
-            {
-            printf("i2c_read_error %d at dev %x block %x addr %x\n",
-                   val, device, block, addr);
-            return -1;
-            }
-            else if (timeout==0)
-            {
-                printf ("i2c_read_error: timeout at dev %x block %x addr %x\n",
-                        device, block, addr);
-                return -1;
-            }
-            timeout--;
-        } while (val == -1); /* if no ack: try again! */
+	timeout=100;
+	do
+	{
+	    val = mpc107_i2c_read_byte (device, block, addr);
+	    if (val < -1)
+	    {
+	    printf("i2c_read_error %d at dev %x block %x addr %x\n",
+		   val, device, block, addr);
+	    return -1;
+	    }
+	    else if (timeout==0)
+	    {
+		printf ("i2c_read_error: timeout at dev %x block %x addr %x\n",
+			device, block, addr);
+		return -1;
+	    }
+	    timeout--;
+	} while (val == -1); /* if no ack: try again! */
 
-        *pBuf++ = (unsigned char)val;
-        addr++;
+	*pBuf++ = (unsigned char)val;
+	addr++;
 
-        if ((addr == 0) && (i != cnt-1))    /* is it the same block ? */
-        {
-            if (block == FIRST_BLOCK)
-                block = SECOND_BLOCK;
-            else
-            {
-                printf ("ic2_read_error: read beyond 2. block !\n");
-                return -1;
-            }
-        }
+	if ((addr == 0) && (i != cnt-1))    /* is it the same block ? */
+	{
+	    if (block == FIRST_BLOCK)
+		block = SECOND_BLOCK;
+	    else
+	    {
+		printf ("ic2_read_error: read beyond 2. block !\n");
+		return -1;
+	    }
+	}
     }
     udelay(100000);
     return (cnt);
@@ -277,20 +277,20 @@
 
     for (i = 0; i < cnt; i++)
     {
-        while (mpc107_i2c_write_byte (device,block,addr,*pBuf) == 1);
-        addr++;
-        pBuf++;
+	while (mpc107_i2c_write_byte (device,block,addr,*pBuf) == 1);
+	addr++;
+	pBuf++;
 
-        if ((addr == 0) && (i != cnt-1))     /* is it the same block ? */
-        {
-            if (block == FIRST_BLOCK)
-                block = SECOND_BLOCK;
-            else
-            {
-                printf ("ic2_write_error: write beyond 2. block !\n");
-                return -1;
-            }
-        }
+	if ((addr == 0) && (i != cnt-1))     /* is it the same block ? */
+	{
+	    if (block == FIRST_BLOCK)
+		block = SECOND_BLOCK;
+	    else
+	    {
+		printf ("ic2_write_error: write beyond 2. block !\n");
+		return -1;
+	    }
+	}
     }
     udelay(100000);
     return(cnt);
@@ -303,9 +303,9 @@
     unsigned long x;
 
     if (eumb_addr)
-        mpc107_eumb_addr = eumb_addr;
+	mpc107_eumb_addr = eumb_addr;
     else
-        return -1;
+	return -1;
 
     /* Set I2C clock */
     x = in32r(MPC107_I2CFDR) & 0xffffff00;

diff --git a/board/eltec/elppc/pci.c b/board/eltec/elppc/pci.c
index 2bbb5f2..5b115ea 100644
--- a/board/eltec/elppc/pci.c
+++ b/board/eltec/elppc/pci.c

@@ -42,44 +42,44 @@
     hose->last_busno = 0xff;
 
     pci_set_region(hose->regions + 0,
-        CFG_PCI_MEMORY_BUS,
-        CFG_PCI_MEMORY_PHYS,
-        CFG_PCI_MEMORY_SIZE,
-        PCI_REGION_MEM | PCI_REGION_MEMORY);
+	CFG_PCI_MEMORY_BUS,
+	CFG_PCI_MEMORY_PHYS,
+	CFG_PCI_MEMORY_SIZE,
+	PCI_REGION_MEM | PCI_REGION_MEMORY);
 
     /* PCI memory space */
     pci_set_region(hose->regions + 1,
-        CFG_PCI_MEM_BUS,
-        CFG_PCI_MEM_PHYS,
-        CFG_PCI_MEM_SIZE,
-        PCI_REGION_MEM);
+	CFG_PCI_MEM_BUS,
+	CFG_PCI_MEM_PHYS,
+	CFG_PCI_MEM_SIZE,
+	PCI_REGION_MEM);
 
     /* ISA/PCI memory space */
     pci_set_region(hose->regions + 2,
-        CFG_ISA_MEM_BUS,
-        CFG_ISA_MEM_PHYS,
-        CFG_ISA_MEM_SIZE,
-        PCI_REGION_MEM);
+	CFG_ISA_MEM_BUS,
+	CFG_ISA_MEM_PHYS,
+	CFG_ISA_MEM_SIZE,
+	PCI_REGION_MEM);
 
     /* PCI I/O space */
     pci_set_region(hose->regions + 3,
-        CFG_PCI_IO_BUS,
-        CFG_PCI_IO_PHYS,
-        CFG_PCI_IO_SIZE,
-        PCI_REGION_IO);
+	CFG_PCI_IO_BUS,
+	CFG_PCI_IO_PHYS,
+	CFG_PCI_IO_SIZE,
+	PCI_REGION_IO);
 
     /* ISA/PCI I/O space */
     pci_set_region(hose->regions + 4,
-        CFG_ISA_IO_BUS,
-        CFG_ISA_IO_PHYS,
-        CFG_ISA_IO_SIZE,
-        PCI_REGION_IO);
+	CFG_ISA_IO_BUS,
+	CFG_ISA_IO_PHYS,
+	CFG_ISA_IO_SIZE,
+	PCI_REGION_IO);
 
     hose->region_count = 5;
 
     pci_setup_indirect(hose,
-        MPC106_REG_ADDR,
-        MPC106_REG_DATA);
+	MPC106_REG_ADDR,
+	MPC106_REG_DATA);
 
     pci_register_hose(hose);
 

diff --git a/board/eltec/elppc/srom.h b/board/eltec/elppc/srom.h
index 7924bcd..c18ab91 100644
--- a/board/eltec/elppc/srom.h
+++ b/board/eltec/elppc/srom.h

@@ -81,18 +81,18 @@
 
 unsigned long el_srom_checksum (unsigned char *ptr, unsigned long size);
 int el_srom_load  (unsigned char addr, unsigned char *buf, int cnt,
-                   unsigned char device, unsigned char block);
+		   unsigned char device, unsigned char block);
 int el_srom_store (unsigned char addr, unsigned char *buf, int cnt,
-                   unsigned char device, unsigned char block);
+		   unsigned char device, unsigned char block);
 
 int mpc107_i2c_init (unsigned long eumb_addr, unsigned long divider);
 int mpc107_i2c_read_byte (unsigned char device, unsigned char block, unsigned char offset);
 int mpc107_i2c_write_byte (unsigned char device, unsigned char block,
-                           unsigned char offset, unsigned char val);
+			   unsigned char offset, unsigned char val);
 int mpc107_srom_load (unsigned char addr, unsigned char *pBuf, int cnt,
-                      unsigned char device, unsigned char block);
+		      unsigned char device, unsigned char block);
 int mpc107_srom_store (unsigned char addr, unsigned char *pBuf, int cnt,
-                       unsigned char device, unsigned char block);
+		       unsigned char device, unsigned char block);
 
 int dc_srom_load (unsigned short *dest);
 int dc_srom_store (unsigned short *src);

diff --git a/board/eltec/elppc/u-boot.lds b/board/eltec/elppc/u-boot.lds
index de50bf4..0dfa8c0 100644
--- a/board/eltec/elppc/u-boot.lds
+++ b/board/eltec/elppc/u-boot.lds

@@ -106,6 +106,11 @@
   _edata  =  .;
   PROVIDE (edata = .);
 
+  __u_boot_cmd_start = .;
+  .u_boot_cmd : { *(.u_boot_cmd) }
+  __u_boot_cmd_end = .;
+
+
   __start___ex_table = .;
   __ex_table : { *(__ex_table) }
   __stop___ex_table = .;

diff --git a/board/eltec/mhpc/Makefile b/board/eltec/mhpc/Makefile
index ef173d0..13ce9fc 100644
--- a/board/eltec/mhpc/Makefile
+++ b/board/eltec/mhpc/Makefile

@@ -28,7 +28,7 @@
 OBJS	= $(BOARD).o flash.o
 
 $(LIB):	.depend $(OBJS)
-	$(AR) crv $@ $^
+	$(AR) crv $@ $(OBJS)
 
 #########################################################################
 

diff --git a/board/eltec/mhpc/config.mk b/board/eltec/mhpc/config.mk
index 607ebbc..03934de 100644
--- a/board/eltec/mhpc/config.mk
+++ b/board/eltec/mhpc/config.mk

@@ -31,19 +31,3 @@
 
 TEXT_BASE = 0xfe000000
 /*TEXT_BASE  = 0x00200000 */
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-

diff --git a/board/eltec/mhpc/flash.c b/board/eltec/mhpc/flash.c
index e9c8f98..4cc66a9 100644
--- a/board/eltec/mhpc/flash.c
+++ b/board/eltec/mhpc/flash.c

@@ -193,13 +193,13 @@
 
    switch (value) {
    case (FPW)INTEL_ID_28F640J5 :
-        info->flash_id += FLASH_28F640J5 ;
-        info->sector_count = 64;
-        info->size = 0x00800000;
-        break;            /* => 8 MB     */
+	info->flash_id += FLASH_28F640J5 ;
+	info->sector_count = 64;
+	info->size = 0x00800000;
+	break;            /* => 8 MB     */
 
-        default:
-                info->flash_id = FLASH_UNKNOWN;
+	default:
+		info->flash_id = FLASH_UNKNOWN;
 		break;
 	}
 
@@ -429,25 +429,3 @@
 
 	return (0);
 }
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-

diff --git a/board/eltec/mhpc/mhpc.c b/board/eltec/mhpc/mhpc.c
index 81f820a..83952d8 100644
--- a/board/eltec/mhpc/mhpc.c
+++ b/board/eltec/mhpc/mhpc.c

@@ -40,17 +40,17 @@
 
 extern void eeprom_init  (void);
 extern int  eeprom_read  (unsigned dev_addr, unsigned offset,
-                          unsigned char *buffer, unsigned cnt);
+			  unsigned char *buffer, unsigned cnt);
 extern int  eeprom_write (unsigned dev_addr, unsigned offset,
-                          unsigned char *buffer, unsigned cnt);
+			  unsigned char *buffer, unsigned cnt);
 
 /* globals */
 void *video_hw_init(void);
 void video_set_lut (unsigned int index,     /* color number */
-                    unsigned char r,        /* red */
-                    unsigned char g,        /* green */
-                    unsigned char b         /* blue */
-                    );
+		    unsigned char r,        /* red */
+		    unsigned char g,        /* green */
+		    unsigned char b         /* blue */
+		    );
 
 GraphicDevice gdev;
 
@@ -153,9 +153,9 @@
     revinfo  mhpcRevInfo;
     char     nid[32];
     char     *mhpcSensorTypes[] = { "OMNIVISON OV7610/7620 color",
-                                    "OMNIVISON OV7110 b&w", NULL };
+				    "OMNIVISON OV7110 b&w", NULL };
     char     hex[23] = { 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 0, 0, 0,
-                         0, 0, 0, 0, 10, 11, 12, 13, 14, 15 };
+			 0, 0, 0, 0, 10, 11, 12, 13, 14, 15 };
     int      i;
 
     /* check revision data */
@@ -166,62 +166,62 @@
     printf ("Enter revision number (0-9): %c  ", mhpcRevInfo.revision[0]);
     if (0 != readline (NULL))
     {
-        mhpcRevInfo.revision[0] = (char)toupper(console_buffer[0]);
+	mhpcRevInfo.revision[0] = (char)toupper(console_buffer[0]);
     }
 
     printf ("Enter revision character (A-Z): %c  ", mhpcRevInfo.revision[1]);
     if (1 == readline (NULL))
     {
-        mhpcRevInfo.revision[1] = (char)toupper(console_buffer[0]);
+	mhpcRevInfo.revision[1] = (char)toupper(console_buffer[0]);
     }
 
     printf("Enter board name (V-XXXX-XXXX): %s  ", (char *)&mhpcRevInfo.board);
     if (11 == readline (NULL))
     {
-        for (i=0; i<11; i++)
-        {
-            mhpcRevInfo.board[i] =  (char)toupper(console_buffer[i]);
-            mhpcRevInfo.board[11] = '\0';
-        }
+	for (i=0; i<11; i++)
+	{
+	    mhpcRevInfo.board[i] =  (char)toupper(console_buffer[i]);
+	    mhpcRevInfo.board[11] = '\0';
+	}
     }
 
     printf("Supported sensor types:\n");
     i=0;
     do
     {
-        printf("\n    \'%d\' : %s\n", i, mhpcSensorTypes[i]);
+	printf("\n    \'%d\' : %s\n", i, mhpcSensorTypes[i]);
     } while ( mhpcSensorTypes[++i] != NULL );
 
     do
     {
-        printf("\nEnter sensor number (0-255): %d  ", (int)mhpcRevInfo.sensor );
-        if (0 != readline (NULL))
-        {
-        mhpcRevInfo.sensor = (unsigned char)simple_strtoul(console_buffer, NULL, 10);
-        }
+	printf("\nEnter sensor number (0-255): %d  ", (int)mhpcRevInfo.sensor );
+	if (0 != readline (NULL))
+	{
+	mhpcRevInfo.sensor = (unsigned char)simple_strtoul(console_buffer, NULL, 10);
+	}
     } while ( mhpcRevInfo.sensor >= i );
 
     printf("Enter serial number: %s ", (char *)&mhpcRevInfo.serial );
     if (6 == readline (NULL))
     {
-        for (i=0; i<6; i++)
-        {
-        mhpcRevInfo.serial[i] = console_buffer[i];
-        }
-        mhpcRevInfo.serial[6] = '\0';
+	for (i=0; i<6; i++)
+	{
+	mhpcRevInfo.serial[i] = console_buffer[i];
+	}
+	mhpcRevInfo.serial[6] = '\0';
     }
 
     printf("Enter ether node ID with leading zero (HEX): %02x%02x%02x%02x%02x%02x  ",
-              mhpcRevInfo.etheraddr[0], mhpcRevInfo.etheraddr[1],
-              mhpcRevInfo.etheraddr[2], mhpcRevInfo.etheraddr[3],
-              mhpcRevInfo.etheraddr[4], mhpcRevInfo.etheraddr[5]  );
+	      mhpcRevInfo.etheraddr[0], mhpcRevInfo.etheraddr[1],
+	      mhpcRevInfo.etheraddr[2], mhpcRevInfo.etheraddr[3],
+	      mhpcRevInfo.etheraddr[4], mhpcRevInfo.etheraddr[5]  );
     if (12 == readline (NULL))
     {
-        for (i=0; i<12; i+=2)
-        {
-        mhpcRevInfo.etheraddr[i>>1] = (char)(16*hex[toupper(console_buffer[i])-'0'] +
-                             hex[toupper(console_buffer[i+1])-'0']);
-        }
+	for (i=0; i<12; i+=2)
+	{
+	mhpcRevInfo.etheraddr[i>>1] = (char)(16*hex[toupper(console_buffer[i])-'0'] +
+			     hex[toupper(console_buffer[i+1])-'0']);
+	}
     }
 
     /* setup new revision data */
@@ -230,16 +230,16 @@
 
     /* set environment */
     sprintf( nid, "%02x:%02x:%02x:%02x:%02x:%02x",
-                  mhpcRevInfo.etheraddr[0], mhpcRevInfo.etheraddr[1],
-                  mhpcRevInfo.etheraddr[2], mhpcRevInfo.etheraddr[3],
-                  mhpcRevInfo.etheraddr[4], mhpcRevInfo.etheraddr[5]);
+		  mhpcRevInfo.etheraddr[0], mhpcRevInfo.etheraddr[1],
+		  mhpcRevInfo.etheraddr[2], mhpcRevInfo.etheraddr[3],
+		  mhpcRevInfo.etheraddr[4], mhpcRevInfo.etheraddr[5]);
     setenv("ethaddr", nid);
 
     /* print actual board identification */
     printf("Ident: %s %s Ser %s Rev %c%c\n",
-            mhpcRevInfo.board, (mhpcRevInfo.sensor==0?"color":"b&w"),
-            (char *)&mhpcRevInfo.serial,
-            mhpcRevInfo.revision[0], mhpcRevInfo.revision[1]);
+	    mhpcRevInfo.board, (mhpcRevInfo.sensor==0?"color":"b&w"),
+	    (char *)&mhpcRevInfo.serial,
+	    mhpcRevInfo.revision[0], mhpcRevInfo.revision[1]);
 
     return (0);
 }
@@ -308,29 +308,29 @@
     *(center-x+y*pitch) = color;
     while(y>x)
     {
-        if (d<0)
-        {
-            d   += dE;
-            dE  += 2;
-            dSE += 2;
-            x++;
-        }
-        else
-        {
-            d   += dSE;
-            dE  += 2;
-            dSE += 4;
-            x++;
-            y--;
-        }
-        *(center+x+y*pitch) = color;
-        *(center+y+x*pitch) = color;
-        *(center+y-x*pitch) = color;
-        *(center+x-y*pitch) = color;
-        *(center-x-y*pitch) = color;
-        *(center-y-x*pitch) = color;
-        *(center-y+x*pitch) = color;
-        *(center-x+y*pitch) = color;
+	if (d<0)
+	{
+	    d   += dE;
+	    dE  += 2;
+	    dSE += 2;
+	    x++;
+	}
+	else
+	{
+	    d   += dSE;
+	    dE  += 2;
+	    dSE += 4;
+	    x++;
+	    y--;
+	}
+	*(center+x+y*pitch) = color;
+	*(center+y+x*pitch) = color;
+	*(center+y-x*pitch) = color;
+	*(center+x-y*pitch) = color;
+	*(center-x-y*pitch) = color;
+	*(center-y-x*pitch) = color;
+	*(center-y+x*pitch) = color;
+	*(center-x+y*pitch) = color;
     }
 }
 
@@ -344,31 +344,31 @@
     /* draw raster */
     for (i=0; i<LCD_VIDEO_ROWS; i+=32)
     {
-        memset((char*)(LCD_VIDEO_ADDR+i*LCD_VIDEO_COLS), LCD_VIDEO_FG, LCD_VIDEO_COLS);
-        for (n=i+1;n<i+32;n++)
-            memset((char*)(LCD_VIDEO_ADDR+n*LCD_VIDEO_COLS), LCD_VIDEO_BG, LCD_VIDEO_COLS);
+	memset((char*)(LCD_VIDEO_ADDR+i*LCD_VIDEO_COLS), LCD_VIDEO_FG, LCD_VIDEO_COLS);
+	for (n=i+1;n<i+32;n++)
+	    memset((char*)(LCD_VIDEO_ADDR+n*LCD_VIDEO_COLS), LCD_VIDEO_BG, LCD_VIDEO_COLS);
     }
 
     for (i=0; i<LCD_VIDEO_COLS; i+=32)
     {
-        for (n=0; n<LCD_VIDEO_ROWS; n++)
-            *(char*)(LCD_VIDEO_ADDR+n*LCD_VIDEO_COLS+i) = LCD_VIDEO_FG;
+	for (n=0; n<LCD_VIDEO_ROWS; n++)
+	    *(char*)(LCD_VIDEO_ADDR+n*LCD_VIDEO_COLS+i) = LCD_VIDEO_FG;
     }
 
     /* draw gray bar */
     di = (char *)(LCD_VIDEO_ADDR + (LCD_VIDEO_COLS-256)/64*32 + 97*LCD_VIDEO_COLS);
     for (n=0; n<63; n++)
     {
-        for (i=0; i<256; i++)
-        {
-            *di++ = (char)i;
-            *(di+LCD_VIDEO_COLS*64) = (i&1)*255;
-        }
-        di += LCD_VIDEO_COLS-256;
+	for (i=0; i<256; i++)
+	{
+	    *di++ = (char)i;
+	    *(di+LCD_VIDEO_COLS*64) = (i&1)*255;
+	}
+	di += LCD_VIDEO_COLS-256;
     }
 
     video_circle ((char*)LCD_VIDEO_ADDR+LCD_VIDEO_COLS/2+LCD_VIDEO_ROWS/2*LCD_VIDEO_COLS,
-                  LCD_VIDEO_ROWS/2,LCD_VIDEO_FG, LCD_VIDEO_COLS);
+		  LCD_VIDEO_ROWS/2,LCD_VIDEO_FG, LCD_VIDEO_COLS);
 }
 
 /* ------------------------------------------------------------------------- */
@@ -377,36 +377,36 @@
 {
     unsigned int i;
     unsigned char RGB[] =
-        {
-        0x00, 0x00, 0x00,   /* black */
-        0x80, 0x80, 0x80,   /* gray */
-        0xff, 0x00, 0x00,   /* red */
-        0x00, 0xff, 0x00,   /* green */
-        0x00, 0x00, 0xff,   /* blue */
-        0x00, 0xff, 0xff,   /* cyan */
-        0xff, 0x00, 0xff,   /* magenta */
-        0xff, 0xff, 0x00,   /* yellow */
-        0x80, 0x00, 0x00,   /* dark red */
-        0x00, 0x80, 0x00,   /* dark green */
-        0x00, 0x00, 0x80,   /* dark blue */
-        0x00, 0x80, 0x80,   /* dark cyan */
-        0x80, 0x00, 0x80,   /* dark magenta */
-        0x80, 0x80, 0x00,   /* dark yellow */
-        0xc0, 0xc0, 0xc0,   /* light gray */
-        0xff, 0xff, 0xff,   /* white */
-        };
+	{
+	0x00, 0x00, 0x00,   /* black */
+	0x80, 0x80, 0x80,   /* gray */
+	0xff, 0x00, 0x00,   /* red */
+	0x00, 0xff, 0x00,   /* green */
+	0x00, 0x00, 0xff,   /* blue */
+	0x00, 0xff, 0xff,   /* cyan */
+	0xff, 0x00, 0xff,   /* magenta */
+	0xff, 0xff, 0x00,   /* yellow */
+	0x80, 0x00, 0x00,   /* dark red */
+	0x00, 0x80, 0x00,   /* dark green */
+	0x00, 0x00, 0x80,   /* dark blue */
+	0x00, 0x80, 0x80,   /* dark cyan */
+	0x80, 0x00, 0x80,   /* dark magenta */
+	0x80, 0x80, 0x00,   /* dark yellow */
+	0xc0, 0xc0, 0xc0,   /* light gray */
+	0xff, 0xff, 0xff,   /* white */
+	};
 
     switch (clut_type)
     {
     case 1:
-        for (i=0; i<240; i++)
-            video_set_lut (i, i, i, i);
-        for (i=0; i<16; i++)
-            video_set_lut (i+240, RGB[i*3], RGB[i*3+1], RGB[i*3+2]);
-        break;
+	for (i=0; i<240; i++)
+	    video_set_lut (i, i, i, i);
+	for (i=0; i<16; i++)
+	    video_set_lut (i+240, RGB[i*3], RGB[i*3+1], RGB[i*3+2]);
+	break;
     default:
-        for (i=0; i<256; i++)
-            video_set_lut (i, i, i, i);
+	for (i=0; i<256; i++)
+	    video_set_lut (i, i, i, i);
     }
 }
 
@@ -420,9 +420,9 @@
 
     /* enable video only on CLUT value */
     if ((penv = getenv ("clut")) != NULL)
-        clut = (u_int)simple_strtoul (penv, NULL, 10);
+	clut = (u_int)simple_strtoul (penv, NULL, 10);
     else
-        return NULL;
+	return NULL;
 
     /* disable graphic before write LCD regs. */
     immr->im_lcd.lcd_lccr = 0x96000866;
@@ -433,7 +433,7 @@
     immr->im_lcd.lcd_lcvcr = 0x900f0024;
 
     printf ("Video: 640x480 8Bit Index Lut %s\n",
-            (clut==1?"240/16 (gray/vga)":"256(gray)"));
+	    (clut==1?"240/16 (gray/vga)":"256(gray)"));
 
     video_default_lut (clut);
 
@@ -451,11 +451,11 @@
     gdev.gdfIndex = GDF__8BIT_INDEX;
 
     if (clut > 1)
-        /* return Graphic Device for console */
-        return (void *)&gdev;
+	/* return Graphic Device for console */
+	return (void *)&gdev;
     else
-        /* just graphic enabled - draw something beautiful */
-        video_test_image();
+	/* just graphic enabled - draw something beautiful */
+	video_test_image();
 
     return NULL;            /* this disabels cfb - console */
 }
@@ -463,7 +463,7 @@
 /* ------------------------------------------------------------------------- */
 
 void video_set_lut (unsigned int index,
-                    unsigned char r, unsigned char g, unsigned char b)
+		    unsigned char r, unsigned char g, unsigned char b)
 {
     unsigned int lum;
     unsigned short *pLut = (unsigned short *)(CFG_IMMR + 0x0e00);

diff --git a/board/eltec/mhpc/u-boot.lds b/board/eltec/mhpc/u-boot.lds
index 7128155..526198c 100644
--- a/board/eltec/mhpc/u-boot.lds
+++ b/board/eltec/mhpc/u-boot.lds

@@ -99,6 +99,11 @@
   _edata  =  .;
   PROVIDE (edata = .);
 
+  __u_boot_cmd_start = .;
+  .u_boot_cmd : { *(.u_boot_cmd) }
+  __u_boot_cmd_end = .;
+
+
   __start___ex_table = .;
   __ex_table : { *(__ex_table) }
   __stop___ex_table = .;
@@ -121,4 +126,3 @@
   _end = . ;
   PROVIDE (end = .);
 }
-

diff --git a/board/eltec/mhpc/u-boot.lds.debug b/board/eltec/mhpc/u-boot.lds.debug
index 8dc6d40..f6f7cf4 100644
--- a/board/eltec/mhpc/u-boot.lds.debug
+++ b/board/eltec/mhpc/u-boot.lds.debug

@@ -106,6 +106,11 @@
   _edata  =  .;
   PROVIDE (edata = .);
 
+  __u_boot_cmd_start = .;
+  .u_boot_cmd : { *(.u_boot_cmd) }
+  __u_boot_cmd_end = .;
+
+
   __start___ex_table = .;
   __ex_table : { *(__ex_table) }
   __stop___ex_table = .;
@@ -128,4 +133,3 @@
   _end = . ;
   PROVIDE (end = .);
 }
-

diff --git a/board/emk/top860/Makefile b/board/emk/top860/Makefile
index ef173d0..13ce9fc 100644
--- a/board/emk/top860/Makefile
+++ b/board/emk/top860/Makefile

@@ -28,7 +28,7 @@
 OBJS	= $(BOARD).o flash.o
 
 $(LIB):	.depend $(OBJS)
-	$(AR) crv $@ $^
+	$(AR) crv $@ $(OBJS)
 
 #########################################################################
 

diff --git a/board/emk/top860/flash.c b/board/emk/top860/flash.c
index a9a9771..0f827df 100644
--- a/board/emk/top860/flash.c
+++ b/board/emk/top860/flash.c

@@ -2,11 +2,11 @@
  * (C) Copyright 2003
  * EMK Elektronik GmbH <www.emk-elektronik.de>
  * Reinhard Meyer <r.meyer@emk-elektronik.de>
- *

- * copied from the BMW Port - seems that its similiar enough

- * to be easily adaped ;) --- Well, it turned out to become a

- * merger between parts of the EMKstax Flash routines and the

- * BMW funtion frames...

+ *
+ * copied from the BMW Port - seems that its similiar enough
+ * to be easily adaped ;) --- Well, it turned out to become a
+ * merger between parts of the EMKstax Flash routines and the
+ * BMW funtion frames...
  *
  * (C) Copyright 2000
  * Wolfgang Denk, DENX Software Engineering, wd@denx.de.
@@ -34,457 +34,456 @@
 #include <mpc8xx.h>
 
 #define	FLASH_WORD_SIZE		unsigned short
-#define FLASH_WORD_WIDTH	(sizeof (FLASH_WORD_SIZE))

-

+#define FLASH_WORD_WIDTH	(sizeof (FLASH_WORD_SIZE))
+
 flash_info_t flash_info[CFG_MAX_FLASH_BANKS]; /* info for FLASH chips    */
-

+
 /*-----------------------------------------------------------------------
  * Functions
  */
 static int write_word (flash_info_t *info, ulong dest, ulong data);
 
 
-/*****************************************************************************

- * software product ID entry/exit

- *****************************************************************************/

-static void FlashProductIdMode (

-	volatile FLASH_WORD_SIZE *b,

-	int on_off)

-{

-	b[0x5555] = 0xaa;

-	b[0x2aaa] = 0x55;

-	b[0x5555] = on_off ? 0x90 : 0xf0;

-}

-

-/*****************************************************************************

- * sector erase start

- *****************************************************************************/

-static void FlashSectorErase (

-	volatile FLASH_WORD_SIZE *b,

-	volatile FLASH_WORD_SIZE *a)

-{

-	b[0x5555] = 0xaa;

-	b[0x2aaa] = 0x55;

-	b[0x5555] = 0x80;

-	b[0x5555] = 0xaa;

-	b[0x2aaa] = 0x55;

-	a[0] = 0x30;

-}

-

-/*****************************************************************************

- * program a word

- *****************************************************************************/

-static void FlashProgWord (

-	volatile FLASH_WORD_SIZE *b,

-	volatile FLASH_WORD_SIZE *a,

-	FLASH_WORD_SIZE v)

-{

-	b[0x5555] = 0xaa;

-	b[0x2aaa] = 0x55;

-	b[0x5555] = 0xa0;

-	a[0] = v;

-}

-

-/*****************************************************************************

- * reset bank, back to read mode

- *****************************************************************************/

-static void FlashReset (volatile FLASH_WORD_SIZE *b)

-{

-	b[0] = 0xf0;

-}

-

-/*****************************************************************************

- * identify FLASH chip

- * this code is a stripped version of the FlashGetType() function in EMKstax

- *****************************************************************************/

+/*****************************************************************************
+ * software product ID entry/exit
+ *****************************************************************************/
+static void FlashProductIdMode (
+	volatile FLASH_WORD_SIZE *b,
+	int on_off)
+{
+	b[0x5555] = 0xaa;
+	b[0x2aaa] = 0x55;
+	b[0x5555] = on_off ? 0x90 : 0xf0;
+}
+
+/*****************************************************************************
+ * sector erase start
+ *****************************************************************************/
+static void FlashSectorErase (
+	volatile FLASH_WORD_SIZE *b,
+	volatile FLASH_WORD_SIZE *a)
+{
+	b[0x5555] = 0xaa;
+	b[0x2aaa] = 0x55;
+	b[0x5555] = 0x80;
+	b[0x5555] = 0xaa;
+	b[0x2aaa] = 0x55;
+	a[0] = 0x30;
+}
+
+/*****************************************************************************
+ * program a word
+ *****************************************************************************/
+static void FlashProgWord (
+	volatile FLASH_WORD_SIZE *b,
+	volatile FLASH_WORD_SIZE *a,
+	FLASH_WORD_SIZE v)
+{
+	b[0x5555] = 0xaa;
+	b[0x2aaa] = 0x55;
+	b[0x5555] = 0xa0;
+	a[0] = v;
+}
+
+/*****************************************************************************
+ * reset bank, back to read mode
+ *****************************************************************************/
+static void FlashReset (volatile FLASH_WORD_SIZE *b)
+{
+	b[0] = 0xf0;
+}
+
+/*****************************************************************************
+ * identify FLASH chip
+ * this code is a stripped version of the FlashGetType() function in EMKstax
+ *****************************************************************************/
 unsigned long flash_init (void)
-{

-	volatile FLASH_WORD_SIZE * const flash = (volatile FLASH_WORD_SIZE *) CFG_FLASH_BASE;

-	FLASH_WORD_SIZE	manu, dev;

-	flash_info_t * const pflinfo = &flash_info[0];

-	int j;

-

-	/* get Id Bytes */

-	FlashProductIdMode (flash, 1);

-	manu = flash[0];

-	dev  = flash[1];

-	FlashProductIdMode (flash, 0);

-

-	pflinfo->size = 0;

-	pflinfo->sector_count = 0;

-	pflinfo->flash_id = 0xffffffff;

-	pflinfo->portwidth = FLASH_CFI_16BIT;

-	pflinfo->chipwidth = FLASH_CFI_BY16;

-

-	switch (manu&0xff)

-	{

-	case 0x01:	/* AMD */

-		pflinfo->flash_id = FLASH_MAN_AMD;

-		switch (dev&0xff)

-		{

-		case 0x49:

-			pflinfo->size = 0x00200000;

-			pflinfo->sector_count = 35;

-			pflinfo->flash_id |= FLASH_AM160B;

-			pflinfo->start[0] = CFG_FLASH_BASE;

-			pflinfo->start[1] = CFG_FLASH_BASE + 0x4000;

-			pflinfo->start[2] = CFG_FLASH_BASE + 0x6000;

-			pflinfo->start[3] = CFG_FLASH_BASE + 0x8000;

-			for (j = 4; j < 35; j++)

-			{

-				pflinfo->start[j] = CFG_FLASH_BASE + 0x00010000 * (j-3);

-			}

-			break;

-

-		case 0xf9:

-			pflinfo->size = 0x00400000;

-			pflinfo->sector_count = 71;

-			pflinfo->flash_id |= FLASH_AM320B;

-			pflinfo->start[0] = CFG_FLASH_BASE;

-			pflinfo->start[1] = CFG_FLASH_BASE + 0x4000;

-			pflinfo->start[2] = CFG_FLASH_BASE + 0x6000;

-			pflinfo->start[3] = CFG_FLASH_BASE + 0x8000;

-			for (j = 0; j < 8; j++)

-			{

-				pflinfo->start[j] = CFG_FLASH_BASE + 0x00002000 * (j);

-			}

-			for (j = 8; j < 71; j++)

-			{

-				pflinfo->start[j] = CFG_FLASH_BASE + 0x00010000 * (j-7);

-			}

-			break;

-

-		default:

-			printf ("unknown AMD dev=%x ", dev);

-			pflinfo->flash_id |= FLASH_UNKNOWN;

-		}

-		break;

-

-	default:

-		printf ("unknown manu=%x ", manu);

-	}

-	return pflinfo->size;

+{
+	volatile FLASH_WORD_SIZE * const flash = (volatile FLASH_WORD_SIZE *) CFG_FLASH_BASE;
+	FLASH_WORD_SIZE	manu, dev;
+	flash_info_t * const pflinfo = &flash_info[0];
+	int j;
+
+	/* get Id Bytes */
+	FlashProductIdMode (flash, 1);
+	manu = flash[0];
+	dev  = flash[1];
+	FlashProductIdMode (flash, 0);
+
+	pflinfo->size = 0;
+	pflinfo->sector_count = 0;
+	pflinfo->flash_id = 0xffffffff;
+	pflinfo->portwidth = FLASH_CFI_16BIT;
+	pflinfo->chipwidth = FLASH_CFI_BY16;
+
+	switch (manu&0xff)
+	{
+	case 0x01:	/* AMD */
+		pflinfo->flash_id = FLASH_MAN_AMD;
+		switch (dev&0xff)
+		{
+		case 0x49:
+			pflinfo->size = 0x00200000;
+			pflinfo->sector_count = 35;
+			pflinfo->flash_id |= FLASH_AM160B;
+			pflinfo->start[0] = CFG_FLASH_BASE;
+			pflinfo->start[1] = CFG_FLASH_BASE + 0x4000;
+			pflinfo->start[2] = CFG_FLASH_BASE + 0x6000;
+			pflinfo->start[3] = CFG_FLASH_BASE + 0x8000;
+			for (j = 4; j < 35; j++)
+			{
+				pflinfo->start[j] = CFG_FLASH_BASE + 0x00010000 * (j-3);
+			}
+			break;
+
+		case 0xf9:
+			pflinfo->size = 0x00400000;
+			pflinfo->sector_count = 71;
+			pflinfo->flash_id |= FLASH_AM320B;
+			pflinfo->start[0] = CFG_FLASH_BASE;
+			pflinfo->start[1] = CFG_FLASH_BASE + 0x4000;
+			pflinfo->start[2] = CFG_FLASH_BASE + 0x6000;
+			pflinfo->start[3] = CFG_FLASH_BASE + 0x8000;
+			for (j = 0; j < 8; j++)
+			{
+				pflinfo->start[j] = CFG_FLASH_BASE + 0x00002000 * (j);
+			}
+			for (j = 8; j < 71; j++)
+			{
+				pflinfo->start[j] = CFG_FLASH_BASE + 0x00010000 * (j-7);
+			}
+			break;
+
+		default:
+			printf ("unknown AMD dev=%x ", dev);
+			pflinfo->flash_id |= FLASH_UNKNOWN;
+		}
+		break;
+
+	default:
+		printf ("unknown manu=%x ", manu);
+	}
+	return pflinfo->size;
 }
 
-/*****************************************************************************

- * print info about a FLASH

- *****************************************************************************/

+/*****************************************************************************
+ * print info about a FLASH
+ *****************************************************************************/
 void flash_print_info (flash_info_t *info)
-{

-	static const char	unk[] = "Unknown";

-	unsigned int		i;

-	const char			*mfct=unk,

-						*type=unk;

-

-	if(info->flash_id != FLASH_UNKNOWN)

-	{

-		switch (info->flash_id & FLASH_VENDMASK)

-		{

-		case FLASH_MAN_AMD:

-			mfct = "AMD";

-			break;

-		}

-

-		switch (info->flash_id & FLASH_TYPEMASK)

-		{

-		case FLASH_AM160B:

-			type = "AM29LV160B (16 Mbit, bottom boot sect)";

-			break;

-		case FLASH_AM320B:

-			type = "AM29LV320B (32 Mbit, bottom boot sect)";

-			break;

-		}

-	}

-

-	printf (

-		"\n  Brand: %s Type: %s\n"

-		"  Size: %lu KB in %d Sectors\n",

-		mfct,

-		type,

-		info->size >> 10,

-		info->sector_count

-		);

-

-	printf ("  Sector Start Addresses:");

-

-	for (i = 0; i < info->sector_count; i++)

-	{

-		unsigned long	size;

-		unsigned int	erased;

-		unsigned long	*flash = (unsigned long *) info->start[i];

-

-		/*

-		 * Check if whole sector is erased

-		 */

-		size =

-			(i != (info->sector_count - 1)) ?

-			(info->start[i + 1] - info->start[i]) >> 2 :

-		(info->start[0] + info->size - info->start[i]) >> 2;

-

-		for (

-			flash = (unsigned long *) info->start[i], erased = 1;

-				(flash != (unsigned long *) info->start[i] + size) && erased;

-					flash++

-			)

-			erased = *flash == ~0x0UL;

-

-		printf (

-			"%s %08lX %s %s",

-			(i % 5) ? "" : "\n   ",

-			info->start[i],

-			erased ? "E" : " ",

-			info->protect[i] ? "RO" : "  "

-			);

-	}

-

-	puts ("\n");

-	return;

+{
+	static const char	unk[] = "Unknown";
+	unsigned int		i;
+	const char			*mfct=unk,
+						*type=unk;
+
+	if(info->flash_id != FLASH_UNKNOWN)
+	{
+		switch (info->flash_id & FLASH_VENDMASK)
+		{
+		case FLASH_MAN_AMD:
+			mfct = "AMD";
+			break;
+		}
+
+		switch (info->flash_id & FLASH_TYPEMASK)
+		{
+		case FLASH_AM160B:
+			type = "AM29LV160B (16 Mbit, bottom boot sect)";
+			break;
+		case FLASH_AM320B:
+			type = "AM29LV320B (32 Mbit, bottom boot sect)";
+			break;
+		}
+	}
+
+	printf (
+		"\n  Brand: %s Type: %s\n"
+		"  Size: %lu KB in %d Sectors\n",
+		mfct,
+		type,
+		info->size >> 10,
+		info->sector_count
+		);
+
+	printf ("  Sector Start Addresses:");
+
+	for (i = 0; i < info->sector_count; i++)
+	{
+		unsigned long	size;
+		unsigned int	erased;
+		unsigned long	*flash = (unsigned long *) info->start[i];
+
+		/*
+		 * Check if whole sector is erased
+		 */
+		size =
+			(i != (info->sector_count - 1)) ?
+			(info->start[i + 1] - info->start[i]) >> 2 :
+		(info->start[0] + info->size - info->start[i]) >> 2;
+
+		for (
+			flash = (unsigned long *) info->start[i], erased = 1;
+				(flash != (unsigned long *) info->start[i] + size) && erased;
+					flash++
+			)
+			erased = *flash == ~0x0UL;
+
+		printf (
+			"%s %08lX %s %s",
+			(i % 5) ? "" : "\n   ",
+			info->start[i],
+			erased ? "E" : " ",
+			info->protect[i] ? "RO" : "  "
+			);
+	}
+
+	puts ("\n");
+	return;
 }
 
-/*****************************************************************************

- * erase one or more sectors

- *****************************************************************************/

+/*****************************************************************************
+ * erase one or more sectors
+ *****************************************************************************/
 int	flash_erase (flash_info_t *info, int s_first, int s_last)
-{

-	volatile FLASH_WORD_SIZE	*addr = (FLASH_WORD_SIZE *)(info->start[0]);

-	int							flag,

-								prot,

-								sect,

-								l_sect;

-	ulong						start,

-								now,

-								last;

-

-	if ((s_first < 0) || (s_first > s_last))

-	{

-		if (info->flash_id == FLASH_UNKNOWN)

-		{

-			printf ("- missing\n");

-		}

-		else

-		{

-			printf ("- no sectors to erase\n");

-		}

-		return 1;

-	}

-

-	if ((info->flash_id == FLASH_UNKNOWN) ||

-		(info->flash_id > (FLASH_MAN_STM | FLASH_AMD_COMP)))

-	{

-		printf ("Can't erase unknown flash type - aborted\n");

-		return 1;

-	}

-

-	prot = 0;

-	for (sect=s_first; sect<=s_last; ++sect)

-	{

-		if (info->protect[sect])

-		{

-			prot++;

-		}

-	}

-

-	if (prot)

-	{

-		printf ("- Warning: %d protected sectors will not be erased!\n",

-			prot);

-	}

-	else

-	{

-		printf ("\n");

-	}

-

-	l_sect = -1;

-

-	/* Disable interrupts which might cause a timeout here */

-	flag = disable_interrupts();

-

-	/* Start erase on unprotected sectors */

-	for (sect = s_first; sect<=s_last; sect++)

-	{

-		if (info->protect[sect] == 0)

-		{ /* not protected */

-			FlashSectorErase ((FLASH_WORD_SIZE *)info->start[0], (FLASH_WORD_SIZE *)info->start[sect]);

-			l_sect = sect;

-		}

-	}

-

-	/* re-enable interrupts if necessary */

-	if (flag)

-		enable_interrupts();

-

-	/* wait at least 80us - let's wait 1 ms */

-	udelay (1000);

-

-	/*

-	* We wait for the last triggered sector

-	*/

-	if (l_sect < 0)

-		goto DONE;

-

-	start = get_timer (0);

-	last  = start;

-	addr = (FLASH_WORD_SIZE *)info->start[l_sect];

-	while ((addr[0] & 0x0080) != 0x0080)

-	{

-		if ((now = get_timer (start)) > CFG_FLASH_ERASE_TOUT)

-		{

-			printf ("Timeout\n");

-			return 1;

-		}

-		/* show that we're waiting */

-		if ((now - last) > 1000)

-		{  /* every second */

-			serial_putc ('.');

-			last = now;

-		}

-	}

-

-	DONE:

-	/* reset to read mode */

-	FlashReset ((FLASH_WORD_SIZE *)info->start[0]);

-

-	printf (" done\n");

-	return 0;

+{
+	volatile FLASH_WORD_SIZE	*addr = (FLASH_WORD_SIZE *)(info->start[0]);
+	int							flag,
+								prot,
+								sect,
+								l_sect;
+	ulong						start,
+								now,
+								last;
+
+	if ((s_first < 0) || (s_first > s_last))
+	{
+		if (info->flash_id == FLASH_UNKNOWN)
+		{
+			printf ("- missing\n");
+		}
+		else
+		{
+			printf ("- no sectors to erase\n");
+		}
+		return 1;
+	}
+
+	if ((info->flash_id == FLASH_UNKNOWN) ||
+		(info->flash_id > (FLASH_MAN_STM | FLASH_AMD_COMP)))
+	{
+		printf ("Can't erase unknown flash type - aborted\n");
+		return 1;
+	}
+
+	prot = 0;
+	for (sect=s_first; sect<=s_last; ++sect)
+	{
+		if (info->protect[sect])
+		{
+			prot++;
+		}
+	}
+
+	if (prot)
+	{
+		printf ("- Warning: %d protected sectors will not be erased!\n",
+			prot);
+	}
+	else
+	{
+		printf ("\n");
+	}
+
+	l_sect = -1;
+
+	/* Disable interrupts which might cause a timeout here */
+	flag = disable_interrupts();
+
+	/* Start erase on unprotected sectors */
+	for (sect = s_first; sect<=s_last; sect++)
+	{
+		if (info->protect[sect] == 0)
+		{ /* not protected */
+			FlashSectorErase ((FLASH_WORD_SIZE *)info->start[0], (FLASH_WORD_SIZE *)info->start[sect]);
+			l_sect = sect;
+		}
+	}
+
+	/* re-enable interrupts if necessary */
+	if (flag)
+		enable_interrupts();
+
+	/* wait at least 80us - let's wait 1 ms */
+	udelay (1000);
+
+	/*
+	* We wait for the last triggered sector
+	*/
+	if (l_sect < 0)
+		goto DONE;
+
+	start = get_timer (0);
+	last  = start;
+	addr = (FLASH_WORD_SIZE *)info->start[l_sect];
+	while ((addr[0] & 0x0080) != 0x0080)
+	{
+		if ((now = get_timer (start)) > CFG_FLASH_ERASE_TOUT)
+		{
+			printf ("Timeout\n");
+			return 1;
+		}
+		/* show that we're waiting */
+		if ((now - last) > 1000)
+		{  /* every second */
+			serial_putc ('.');
+			last = now;
+		}
+	}
+
+	DONE:
+	/* reset to read mode */
+	FlashReset ((FLASH_WORD_SIZE *)info->start[0]);
+
+	printf (" done\n");
+	return 0;
 }
 
-/*****************************************************************************

+/*****************************************************************************
  * Copy memory to flash, returns:
  * 0 - OK
  * 1 - write timeout
  * 2 - Flash not erased
- *****************************************************************************/

+ *****************************************************************************/
 int write_buff (flash_info_t *info, uchar *src, ulong addr, ulong cnt)
-{

-	ulong		cp,

-				wp,

-				data;

-	int			i,

-				l,

-				rc;

-

-	wp = (addr & ~(FLASH_WORD_WIDTH-1));   /* get lower word aligned address */

-

-	/*

-	 * handle unaligned start bytes, if there are...

-	 */

-	if ((l = addr - wp) != 0)

-	{

-		data = 0;

-		

-		/* get the current before the new data into our data word */

-		for (i=0, cp=wp; i<l; ++i, ++cp)

-		{

-			data = (data << 8) | (*(uchar *)cp);

-		}

-		

-		/* now merge the to be programmed values */

-		for (; i<4 && cnt>0; ++i, ++cp, --cnt)

-		{

-			data = (data << 8) | *src++;

-		}

-

-		/* get the current after the new data into our data word */

-		for (; cnt==0 && i<FLASH_WORD_WIDTH; ++i, ++cp)

-		{

-			data = (data << 8) | (*(uchar *)cp);

-		}

-

-		/* now write the combined word */

-		if ((rc = write_word (info, wp, data)) != 0)

-		{

-			return (rc);

-		}

-		wp += FLASH_WORD_WIDTH;

-	}

-

-	/*

-	 * handle word aligned part

-	 */

-	while (cnt >= FLASH_WORD_WIDTH)

-	{

-		data = 0;

-		for (i=0; i<FLASH_WORD_WIDTH; ++i)

-		{

-			data = (data << 8) | *src++;

-		}

-		if ((rc = write_word (info, wp, data)) != 0)

-		{

-			return (rc);

-		}

-		wp  += FLASH_WORD_WIDTH;

-		cnt -= FLASH_WORD_WIDTH;

-	}

-

-	if (cnt == 0)

-	{

-		return (0);

-	}

-

-	/*

-	 * handle unaligned tail bytes, if there are...

-	 */

-	data = 0;

-

-	/* now merge the to be programmed values */

-	for (i=0, cp=wp; i<FLASH_WORD_WIDTH && cnt>0; ++i, ++cp)

-	{

-		data = (data << 8) | *src++;

-		--cnt;

-	}

-

-	/* get the current after the new data into our data word */

-	for (; i<FLASH_WORD_WIDTH; ++i, ++cp)

-	{

-		data = (data << 8) | (*(uchar *)cp);

-	}

-

-	/* now write the combined word */

-	return (write_word (info, wp, data));

+{
+	ulong		cp,
+				wp,
+				data;
+	int			i,
+				l,
+				rc;
+
+	wp = (addr & ~(FLASH_WORD_WIDTH-1));   /* get lower word aligned address */
+
+	/*
+	 * handle unaligned start bytes, if there are...
+	 */
+	if ((l = addr - wp) != 0)
+	{
+		data = 0;
+
+		/* get the current before the new data into our data word */
+		for (i=0, cp=wp; i<l; ++i, ++cp)
+		{
+			data = (data << 8) | (*(uchar *)cp);
+		}
+
+		/* now merge the to be programmed values */
+		for (; i<4 && cnt>0; ++i, ++cp, --cnt)
+		{
+			data = (data << 8) | *src++;
+		}
+
+		/* get the current after the new data into our data word */
+		for (; cnt==0 && i<FLASH_WORD_WIDTH; ++i, ++cp)
+		{
+			data = (data << 8) | (*(uchar *)cp);
+		}
+
+		/* now write the combined word */
+		if ((rc = write_word (info, wp, data)) != 0)
+		{
+			return (rc);
+		}
+		wp += FLASH_WORD_WIDTH;
+	}
+
+	/*
+	 * handle word aligned part
+	 */
+	while (cnt >= FLASH_WORD_WIDTH)
+	{
+		data = 0;
+		for (i=0; i<FLASH_WORD_WIDTH; ++i)
+		{
+			data = (data << 8) | *src++;
+		}
+		if ((rc = write_word (info, wp, data)) != 0)
+		{
+			return (rc);
+		}
+		wp  += FLASH_WORD_WIDTH;
+		cnt -= FLASH_WORD_WIDTH;
+	}
+
+	if (cnt == 0)
+	{
+		return (0);
+	}
+
+	/*
+	 * handle unaligned tail bytes, if there are...
+	 */
+	data = 0;
+
+	/* now merge the to be programmed values */
+	for (i=0, cp=wp; i<FLASH_WORD_WIDTH && cnt>0; ++i, ++cp)
+	{
+		data = (data << 8) | *src++;
+		--cnt;
+	}
+
+	/* get the current after the new data into our data word */
+	for (; i<FLASH_WORD_WIDTH; ++i, ++cp)
+	{
+		data = (data << 8) | (*(uchar *)cp);
+	}
+
+	/* now write the combined word */
+	return (write_word (info, wp, data));
 }
 
-/*****************************************************************************

+/*****************************************************************************
  * Write a word to Flash, returns:
  * 0 - OK
  * 1 - write timeout
  * 2 - Flash not erased
- *****************************************************************************/

+ *****************************************************************************/
 static int write_word (flash_info_t *info, ulong dest, ulong data)
-{

-	volatile FLASH_WORD_SIZE	*addr2 = (FLASH_WORD_SIZE *)info->start[0];

-	volatile FLASH_WORD_SIZE	*dest2 = (FLASH_WORD_SIZE *)dest;

-	FLASH_WORD_SIZE				data2 = data;

-	ulong						start;

-	int							flag;

-

-	/* Check if Flash is (sufficiently) erased */

-	if ((*dest2 & data2) != data2)

-	{

-		return (2);

-	}

-	

-	/* Disable interrupts which might cause a timeout here */

-	flag = disable_interrupts ();

-

-	FlashProgWord (addr2, dest2, data2);

-

-	/* re-enable interrupts if necessary */

-	if (flag)

-		enable_interrupts ();

-

-	/* data polling for D7 */

-	start = get_timer (0);

-	while ((*dest2 & 0x0080) != (data2 & 0x0080))

-	{

-		if (get_timer (start) > CFG_FLASH_WRITE_TOUT)

-		{

-			return (1);

-		}

-	}

-

-	return (0);

+{
+	volatile FLASH_WORD_SIZE	*addr2 = (FLASH_WORD_SIZE *)info->start[0];
+	volatile FLASH_WORD_SIZE	*dest2 = (FLASH_WORD_SIZE *)dest;
+	FLASH_WORD_SIZE				data2 = data;
+	ulong						start;
+	int							flag;
+
+	/* Check if Flash is (sufficiently) erased */
+	if ((*dest2 & data2) != data2)
+	{
+		return (2);
+	}
+
+	/* Disable interrupts which might cause a timeout here */
+	flag = disable_interrupts ();
+
+	FlashProgWord (addr2, dest2, data2);
+
+	/* re-enable interrupts if necessary */
+	if (flag)
+		enable_interrupts ();
+
+	/* data polling for D7 */
+	start = get_timer (0);
+	while ((*dest2 & 0x0080) != (data2 & 0x0080))
+	{
+		if (get_timer (start) > CFG_FLASH_WRITE_TOUT)
+		{
+			return (1);
+		}
+	}
+
+	return (0);
 }
 
 /*-----------------------------------------------------------------------
  */
-


diff --git a/board/emk/top860/top860.c b/board/emk/top860/top860.c
index b99bf0e..d13be98 100644
--- a/board/emk/top860/top860.c
+++ b/board/emk/top860/top860.c

@@ -35,47 +35,47 @@
 #include <commproc.h>
 #include <mpc8xx.h>
 
-/*****************************************************************************

- * UPM table for 60ns EDO RAM at 25 MHz bus/external clock

- *****************************************************************************/

+/*****************************************************************************
+ * UPM table for 60ns EDO RAM at 25 MHz bus/external clock
+ *****************************************************************************/
 static const uint edo_60ns_25MHz_tbl[] = {
-

-/* single read   (offset 0x00 in upm ram) */

-    0x0ff3fc04,0x08f3fc04,0x00f3fc04,0x00f3fc00,

-    0x33f7fc07,0xfffffc05,0xfffffc05,0xfffffc05,

-/* burst read    (offset 0x08 in upm ram) */

-    0x0ff3fc04,0x08f3fc04,0x00f3fc0c,0x0ff3fc40,

-    0x0cf3fc04,0x03f3fc48,0x0cf3fc04,0x03f3fc48,

-    0x0cf3fc04,0x03f3fc00,0x3ff7fc07,0xfffffc05,

-    0xfffffc05,0xfffffc05,0xfffffc05,0xfffffc05,

-/* single write  (offset 0x18 in upm ram) */

-    0x0ffffc04,0x08fffc04,0x30fffc00,0xf1fffc07,

-    0xfffffc05,0xfffffc05,0xfffffc05,0xfffffc05,

-/* burst write   (offset 0x20 in upm ram) */

-    0x0ffffc04,0x08fffc00,0x00fffc04,0x03fffc4c,

-    0x00fffc00,0x07fffc4c,0x00fffc00,0x0ffffc4c,

-    0x00fffc00,0x3ffffc07,0xfffffc05,0xfffffc05,

-    0xfffffc05,0xfffffc05,0xfffffc05,0xfffffc05,

-/* refresh       (offset 0x30 in upm ram) */

-    0xc0fffc04,0x07fffc04,0x0ffffc04,0x0ffffc04,

-    0xfffffc05,0xfffffc05,0xfffffc05,0xfffffc05,

-    0xfffffc05,0xfffffc05,0xfffffc05,0xfffffc05,

-/* exception     (offset 0x3C in upm ram) */

-    0xfffffc07,0xfffffc03,0xfffffc05,0xfffffc05,

+
+/* single read   (offset 0x00 in upm ram) */
+    0x0ff3fc04,0x08f3fc04,0x00f3fc04,0x00f3fc00,
+    0x33f7fc07,0xfffffc05,0xfffffc05,0xfffffc05,
+/* burst read    (offset 0x08 in upm ram) */
+    0x0ff3fc04,0x08f3fc04,0x00f3fc0c,0x0ff3fc40,
+    0x0cf3fc04,0x03f3fc48,0x0cf3fc04,0x03f3fc48,
+    0x0cf3fc04,0x03f3fc00,0x3ff7fc07,0xfffffc05,
+    0xfffffc05,0xfffffc05,0xfffffc05,0xfffffc05,
+/* single write  (offset 0x18 in upm ram) */
+    0x0ffffc04,0x08fffc04,0x30fffc00,0xf1fffc07,
+    0xfffffc05,0xfffffc05,0xfffffc05,0xfffffc05,
+/* burst write   (offset 0x20 in upm ram) */
+    0x0ffffc04,0x08fffc00,0x00fffc04,0x03fffc4c,
+    0x00fffc00,0x07fffc4c,0x00fffc00,0x0ffffc4c,
+    0x00fffc00,0x3ffffc07,0xfffffc05,0xfffffc05,
+    0xfffffc05,0xfffffc05,0xfffffc05,0xfffffc05,
+/* refresh       (offset 0x30 in upm ram) */
+    0xc0fffc04,0x07fffc04,0x0ffffc04,0x0ffffc04,
+    0xfffffc05,0xfffffc05,0xfffffc05,0xfffffc05,
+    0xfffffc05,0xfffffc05,0xfffffc05,0xfffffc05,
+/* exception     (offset 0x3C in upm ram) */
+    0xfffffc07,0xfffffc03,0xfffffc05,0xfffffc05,
 };
 
-/*****************************************************************************

- * Print Board Identity

- *****************************************************************************/

+/*****************************************************************************
+ * Print Board Identity
+ *****************************************************************************/
 int checkboard (void)
 {
 	puts ("Board:"CONFIG_IDENT_STRING"\n");
 	return (0);
 }
 
-/*****************************************************************************

- * Initialize DRAM controller

- *****************************************************************************/

+/*****************************************************************************
+ * Initialize DRAM controller
+ *****************************************************************************/
 long int initdram (int board_type)
 {
 	volatile immap_t *immap = (immap_t *) CFG_IMMR;
@@ -85,103 +85,93 @@
 	 * Only initialize memory controller when running from FLASH.
 	 * When running from RAM, don't touch it.
 	 */
-	if ((ulong) initdram & 0xff000000)

-	{

-		volatile uint	*addr1, *addr2;

-		uint			i, j;

+	if ((ulong) initdram & 0xff000000) {
+		volatile uint *addr1, *addr2;
+		uint i, j;
 
-		upmconfig (UPMA, (uint *) edo_60ns_25MHz_tbl,

-			sizeof (edo_60ns_25MHz_tbl) / sizeof (uint));
+		upmconfig (UPMA, (uint *) edo_60ns_25MHz_tbl,
+			   sizeof (edo_60ns_25MHz_tbl) / sizeof (uint));
 		memctl->memc_mptpr = 0x0200;
 		memctl->memc_mamr = 0x0ca20330;
 		memctl->memc_or2 = -CFG_DRAM_MAX | OR_CSNT_SAM;
 		memctl->memc_br2 = CFG_DRAM_BASE | BR_MS_UPMA | BR_V;
-		/*

-		 * Do 8 read accesses to DRAM

-		 */

-		addr1 = (volatile uint*) 0;

-		addr2 = (volatile uint*) 0x00400000;

-		for (i=0, j=0; i<8; i++)

-			j = addr1[0];

-		

-		/*

-		 * Now check whether we got 4MB or 16MB populated

-		 */

-		addr1[0] = 0x12345678;

-		addr1[1] = 0x9abcdef0;

-		addr2[0] = 0xfeedc0de;

-		addr2[1] = 0x47110815;

-		if (addr1[0] == 0xfeedc0de && addr1[1] == 0x47110815)

-		{

-			/* only 4MB populated */

-			memctl->memc_or2 = -(CFG_DRAM_MAX/4) | OR_CSNT_SAM;

-		}

-	}

-

+		/*
+		 * Do 8 read accesses to DRAM
+		 */
+		addr1 = (volatile uint *) 0;
+		addr2 = (volatile uint *) 0x00400000;
+		for (i = 0, j = 0; i < 8; i++)
+			j = addr1[0];
+
+		/*
+		 * Now check whether we got 4MB or 16MB populated
+		 */
+		addr1[0] = 0x12345678;
+		addr1[1] = 0x9abcdef0;
+		addr2[0] = 0xfeedc0de;
+		addr2[1] = 0x47110815;
+		if (addr1[0] == 0xfeedc0de && addr1[1] == 0x47110815) {
+			/* only 4MB populated */
+			memctl->memc_or2 = -(CFG_DRAM_MAX / 4) | OR_CSNT_SAM;
+		}
+	}
+
 	return -(memctl->memc_or2 & 0xffff0000);
 }
-

-/*****************************************************************************

- * otherinits after RAM is there and we are relocated to RAM

- * note: though this is an int function, nobody cares for the result!

- *****************************************************************************/

+
+/*****************************************************************************
+ * otherinits after RAM is there and we are relocated to RAM
+ * note: though this is an int function, nobody cares for the result!
+ *****************************************************************************/
 int misc_init_r (void)
-{

-	/* read 'factory' part of EEPROM */

-	uchar				buf[81];

-	uchar				*p;

-	uint				length;

-	uint				addr;

-	uint				len;

-

-	/* get length first */

-	addr = CFG_FACT_OFFSET;

-	if (eeprom_read (CFG_I2C_FACT_ADDR, addr, buf, 2))

-	{

-bailout:

-		printf ("cannot read factory configuration\n");

-		printf ("be sure to set ethaddr	yourself!\n");

-		return 0;

+{
+	/* read 'factory' part of EEPROM */
+	uchar buf[81];
+	uchar *p;
+	uint length;
+	uint addr;
+	uint len;
+
+	/* get length first */
+	addr = CFG_FACT_OFFSET;
+	if (eeprom_read (CFG_I2C_FACT_ADDR, addr, buf, 2)) {
+	  bailout:
+		printf ("cannot read factory configuration\n");
+		printf ("be sure to set ethaddr	yourself!\n");
+		return 0;
 	}
-	length = buf[0] + (buf[1]<<8);

-	addr += 2;

-

-	/* sanity check */

-	if (length < 20 || length > CFG_FACT_SIZE-2)

-		goto bailout;

-

-	/* read lines */

-	while (length > 0)

-	{

-		/* read one line */

-		len = length > 80 ? 80 : length;

-		if (eeprom_read (CFG_I2C_FACT_ADDR, addr, buf, len))

-			goto bailout;

-		/* mark end of buffer */

-		buf[len] = 0;

-		/* search end of line */

-		for (p=buf; *p && *p != 0x0a; p++) ;

-		if (!*p)

-			goto bailout;

-		*p++ = 0;

-		/* advance to next line start */

-		length -= p-buf;

-		addr += p-buf;

-		/*printf ("%s\n", buf);*/

-		/* search for our specific entry */

-		if (!strncmp ((char *)buf, "[RLA/lan/Ethernet] ", 19))

-		{

-			setenv ("ethaddr", buf+19);
-		} 

-		else if (!strncmp ((char *)buf, "[BOARD/SERIAL] ", 15))

-		{

-			setenv ("serial#", buf+15);
-		} 

-		else if (!strncmp ((char *)buf, "[BOARD/TYPE] ", 13))

-		{

-			setenv ("board_id", buf+13);
-		} 

-	}

+	length = buf[0] + (buf[1] << 8);
+	addr += 2;
+
+	/* sanity check */
+	if (length < 20 || length > CFG_FACT_SIZE - 2)
+		goto bailout;
+
+	/* read lines */
+	while (length > 0) {
+		/* read one line */
+		len = length > 80 ? 80 : length;
+		if (eeprom_read (CFG_I2C_FACT_ADDR, addr, buf, len))
+			goto bailout;
+		/* mark end of buffer */
+		buf[len] = 0;
+		/* search end of line */
+		for (p = buf; *p && *p != 0x0a; p++);
+		if (!*p)
+			goto bailout;
+		*p++ = 0;
+		/* advance to next line start */
+		length -= p - buf;
+		addr += p - buf;
+		/*printf ("%s\n", buf); */
+		/* search for our specific entry */
+		if (!strncmp ((char *) buf, "[RLA/lan/Ethernet] ", 19)) {
+			setenv ("ethaddr", buf + 19);
+		} else if (!strncmp ((char *) buf, "[BOARD/SERIAL] ", 15)) {
+			setenv ("serial#", buf + 15);
+		} else if (!strncmp ((char *) buf, "[BOARD/TYPE] ", 13)) {
+			setenv ("board_id", buf + 13);
+		}
+	}
 	return (0);
 }
-

diff --git a/board/emk/top860/u-boot.lds b/board/emk/top860/u-boot.lds
index 6371110..f6f5485 100644
--- a/board/emk/top860/u-boot.lds
+++ b/board/emk/top860/u-boot.lds

@@ -98,6 +98,12 @@
   _edata  =  .;
   PROVIDE (edata = .);
 
+
+  __u_boot_cmd_start = .;
+  .u_boot_cmd : { *(.u_boot_cmd) }
+  __u_boot_cmd_end = .;
+
+
   __start___ex_table = .;
   __ex_table : { *(__ex_table) }
   __stop___ex_table = .;
@@ -120,4 +126,3 @@
   _end = . ;
   PROVIDE (end = .);
 }
-

diff --git a/board/emk/top860/u-boot.lds.debug b/board/emk/top860/u-boot.lds.debug
index bd13b7b..8d91be5 100644
--- a/board/emk/top860/u-boot.lds.debug
+++ b/board/emk/top860/u-boot.lds.debug

@@ -129,4 +129,3 @@
   _end = . ;
   PROVIDE (end = .);
 }
-

diff --git a/board/ep7312/Makefile b/board/ep7312/Makefile
index 60b3363..2b4c975 100644
--- a/board/ep7312/Makefile
+++ b/board/ep7312/Makefile

@@ -30,7 +30,7 @@
 SOBJS	:= memsetup.o
 
 $(LIB):	$(OBJS) $(SOBJS)
-	$(AR) crv $@ $^
+	$(AR) crv $@ $(OBJS) $(SOBJS)
 
 clean:
 	rm -f $(SOBJS) $(OBJS)

diff --git a/board/ep7312/memsetup.S b/board/ep7312/memsetup.S
index dca1ed4..6078937 100644
--- a/board/ep7312/memsetup.S
+++ b/board/ep7312/memsetup.S

@@ -21,7 +21,6 @@
  */
 
 
-
 #include <config.h>
 #include <version.h>
 
@@ -94,4 +93,3 @@
 
 	/* everything is fine now */
 	mov	pc, lr
-

diff --git a/board/ep7312/u-boot.lds b/board/ep7312/u-boot.lds
index 0849648..915e7c4 100644
--- a/board/ep7312/u-boot.lds
+++ b/board/ep7312/u-boot.lds

@@ -26,28 +26,32 @@
 ENTRY(_start)
 SECTIONS
 {
-        . = 0x00000000;
+	. = 0x00000000;
 
-        . = ALIGN(4);
+	. = ALIGN(4);
 	.text      :
 	{
 	  cpu/arm720t/start.o	(.text)
 	  *(.text)
 	}
 
-        . = ALIGN(4);
-        .rodata : { *(.rodata) }
+	. = ALIGN(4);
+	.rodata : { *(.rodata) }
 
-        . = ALIGN(4);
-        .data : { *(.data) }
+	. = ALIGN(4);
+	.data : { *(.data) }
 
-        . = ALIGN(4);
-        .got : { *(.got) }
+	. = ALIGN(4);
+	.got : { *(.got) }
+
+  __u_boot_cmd_start = .;
+  .u_boot_cmd : { *(.u_boot_cmd) }
+  __u_boot_cmd_end = .;
 
 	armboot_end_data = .;
 
-        . = ALIGN(4);
-        .bss : { *(.bss) }
+	. = ALIGN(4);
+	.bss : { *(.bss) }
 
 	armboot_end = .;
 }

diff --git a/board/ep8260/Makefile b/board/ep8260/Makefile
index 1c631dc..477e5ee 100644
--- a/board/ep8260/Makefile
+++ b/board/ep8260/Makefile

@@ -28,7 +28,7 @@
 OBJS	= $(BOARD).o flash.o mii_phy.o
 
 $(LIB):	.depend $(OBJS)
-	$(AR) crv $@ $^
+	$(AR) crv $@ $(OBJS)
 
 clean:
 	rm -f $(SOBJS) $(OBJS)

diff --git a/board/ep8260/ep8260.c b/board/ep8260/ep8260.c
index dc33edb..a49c53e 100644
--- a/board/ep8260/ep8260.c
+++ b/board/ep8260/ep8260.c

@@ -307,4 +307,3 @@
 #endif /* CFG_RAMBOOT */
 	return (size * 1024 * 1024);
 }
-

diff --git a/board/ep8260/flash.c b/board/ep8260/flash.c
index d9dbdbe..cdfdcf2 100644
--- a/board/ep8260/flash.c
+++ b/board/ep8260/flash.c

@@ -67,7 +67,7 @@
   flashtest_l = V_ULONG(baseaddr + 4);
 
   if ((int)flashtest_h == AMD_MANUFACT) {
-  	info->flash_id = FLASH_MAN_AMD;
+	info->flash_id = FLASH_MAN_AMD;
   } else {
 	info->flash_id = FLASH_UNKNOWN;
 	info->sector_count = 0;
@@ -102,10 +102,10 @@
   for (i = 0; i < info->sector_count; i++) {
     /* read sector protection at sector address, (A7 .. A0) = 0x02 */
     if ((V_ULONG( info->start[i] + 16 ) & 0x00010001) ||
-        (V_ULONG( info->start[i] + 20 ) & 0x00010001)) {
+	(V_ULONG( info->start[i] + 20 ) & 0x00010001)) {
 	info->protect[i] = 1;		/* D0 = 1 if protected */
     } else {
-    	info->protect[i] = 0;
+	info->protect[i] = 0;
     }
   }
 
@@ -387,7 +387,7 @@
     /* data polling for D7 */
     start = get_timer (0);
     while (((V_ULONG( dest ) & 0x00800080) != (ch & 0x00800080)) ||
-           ((V_ULONG( dest + 4 ) & 0x00800080) != (cl & 0x00800080))) {
+	   ((V_ULONG( dest + 4 ) & 0x00800080) != (cl & 0x00800080))) {
 	if (get_timer(start) > CFG_FLASH_WRITE_TOUT) {
 	    return (1);
 	}

diff --git a/board/ep8260/mii_phy.c b/board/ep8260/mii_phy.c
index e3b7878..813f020 100644
--- a/board/ep8260/mii_phy.c
+++ b/board/ep8260/mii_phy.c

@@ -38,7 +38,7 @@
 	if (phy_reg & 0x0400)
 	    printf("Phy operating at %d MBit/s in %s-duplex mode\n",
 		phy_reg & 0x4000 ? 100 : 10,
-	    	phy_reg & 0x0200 ? "full" : "half");
+		phy_reg & 0x0200 ? "full" : "half");
 	else
 	    printf("bad link!!\n");
 /*
@@ -59,7 +59,7 @@
     tmp = 0x6002 | (adr << 7) | (reg << 2);
     regs->bcsr4 = 0xC3;
     for (i = 0; i < 64; i++) {
-        regs->bcsr4 ^= MII_MDCK;
+	regs->bcsr4 ^= MII_MDCK;
     }
     for (i = 0; i < 16; i++) {
 	regs->bcsr4 &= ~MII_MDCK;
@@ -92,7 +92,7 @@
     }
     for (i = 0; i < 16; i++) {
 	regs->bcsr4 &= ~MII_MDCK;
-        if (tmp & 0x8000) regs->bcsr4 |= MII_MDIO;
+	if (tmp & 0x8000) regs->bcsr4 |= MII_MDIO;
 	else regs->bcsr4 &= ~MII_MDIO;
 	regs->bcsr4 |= MII_MDCK;
 	tmp <<= 1;
@@ -105,4 +105,3 @@
 	val <<= 1;
     }
 }
-

diff --git a/board/ep8260/u-boot.lds b/board/ep8260/u-boot.lds
index a6c2ef5..4ea3c86 100644
--- a/board/ep8260/u-boot.lds
+++ b/board/ep8260/u-boot.lds

@@ -95,6 +95,11 @@
   _edata  =  .;
   PROVIDE (edata = .);
 
+  __u_boot_cmd_start = .;
+  .u_boot_cmd : { *(.u_boot_cmd) }
+  __u_boot_cmd_end = .;
+
+
   __start___ex_table = .;
   __ex_table : { *(__ex_table) }
   __stop___ex_table = .;
@@ -117,4 +122,3 @@
   _end = . ;
   PROVIDE (end = .);
 }
-

diff --git a/board/eric/Makefile b/board/eric/Makefile
index 7a9d25a..f55e7e2 100644
--- a/board/eric/Makefile
+++ b/board/eric/Makefile

@@ -29,7 +29,7 @@
 SOBJS	= init.o
 
 $(LIB):	$(OBJS) $(SOBJS)
-	$(AR) crv $@ $^
+	$(AR) crv $@ $(OBJS)
 
 clean:
 	rm -f $(SOBJS) $(OBJS)

diff --git a/board/eric/flash.c b/board/eric/flash.c
index 5dfb620..c08a760 100644
--- a/board/eric/flash.c
+++ b/board/eric/flash.c

@@ -57,8 +57,8 @@
 {
 	unsigned long size_b0, size_b1;
 	int i;
-        uint pbcr;
-        unsigned long base_b0, base_b1;
+	uint pbcr;
+	unsigned long base_b0, base_b1;
 
 	/* Init: no FLASHes known */
 	for (i=0; i<CFG_MAX_FLASH_BANKS; ++i) {
@@ -88,9 +88,9 @@
 				&flash_info[0]);
 #else
 	    (void)flash_protect(FLAG_PROTECT_SET,
-		      		CFG_MONITOR_BASE,
-		      		CFG_MONITOR_BASE+monitor_flash_len-1,
-		      		&flash_info[0]);
+				CFG_MONITOR_BASE,
+				CFG_MONITOR_BASE+monitor_flash_len-1,
+				&flash_info[0]);
 #endif
 	    size_b1 = 0 ;
 	    flash_info[0].size = size_b0;
@@ -137,9 +137,9 @@
 				&flash_info[0]);
 #else
 	    (void)flash_protect(FLAG_PROTECT_SET,
-		      		CFG_MONITOR_BASE,
-		      		CFG_MONITOR_BASE+monitor_flash_len-1,
-		      		&flash_info[0]);
+				CFG_MONITOR_BASE,
+				CFG_MONITOR_BASE+monitor_flash_len-1,
+				&flash_info[0]);
 #endif
 
 	    if (size_b1) {
@@ -170,7 +170,6 @@
 }
 
 
-
 /*-----------------------------------------------------------------------
  */
 
@@ -186,7 +185,7 @@
 		info->start[i] = base + (i * info->size/info->sector_count);
 	    }
 	} else if (info->flash_id & FLASH_BTYPE) {
-             if ((info->flash_id & FLASH_VENDMASK) == FLASH_MAN_INTEL) {
+	     if ((info->flash_id & FLASH_VENDMASK) == FLASH_MAN_INTEL) {
 
 #ifndef CFG_FLASH_16BIT
 		/* set sector offsets for bottom boot block type	*/
@@ -200,9 +199,9 @@
 		info->start[7] = base + 0x0001C000;
 		for (i = 8; i < info->sector_count; i++) {
 			info->start[i] = base + (i * 0x00020000) - 0x000E0000;
-	        }
-               }
-             else {
+		}
+	       }
+	     else {
 		/* set sector offsets for bottom boot block type	*/
 		info->start[0] = base + 0x00000000;
 		info->start[1] = base + 0x00008000;
@@ -224,9 +223,9 @@
 		info->start[7] = base + 0x0000E000;
 		for (i = 8; i < info->sector_count; i++) {
 			info->start[i] = base + (i * 0x00010000) - 0x00070000;
-	        }
+		}
 	       }
-             else {
+	     else {
 		/* set sector offsets for bottom boot block type	*/
 		info->start[0] = base + 0x00000000;
 		info->start[1] = base + 0x00004000;
@@ -240,7 +239,7 @@
 	} else {
 		/* set sector offsets for top boot block type		*/
 		i = info->sector_count - 1;
-             if ((info->flash_id & FLASH_VENDMASK) == FLASH_MAN_INTEL) {
+	     if ((info->flash_id & FLASH_VENDMASK) == FLASH_MAN_INTEL) {
 
 #ifndef CFG_FLASH_16BIT
 		info->start[i--] = base + info->size - 0x00004000;
@@ -254,7 +253,7 @@
 			info->start[i] = base + i * 0x00020000;
 		}
 
-               } else {
+	       } else {
 
 		info->start[i--] = base + info->size - 0x00008000;
 		info->start[i--] = base + info->size - 0x0000C000;
@@ -275,7 +274,7 @@
 			info->start[i] = base + i * 0x00010000;
 		}
 
-               } else {
+	       } else {
 
 		info->start[i--] = base + info->size - 0x00004000;
 		info->start[i--] = base + info->size - 0x00006000;
@@ -408,8 +407,8 @@
 
 	/*
 	 * Note: if it is an AMD flash and the word at addr[0000]
-         * is 0x00890089 this routine will think it is an Intel
-         * flash device and may(most likely) cause trouble.
+	 * is 0x00890089 this routine will think it is an Intel
+	 * flash device and may(most likely) cause trouble.
 	 */
 
 	addr[0x0000] = 0x00900090;
@@ -421,8 +420,8 @@
 
 	/*
 	 * Note: if it is an AMD flash and the word at addr[0000]
-         * is 0x0089 this routine will think it is an Intel
-         * flash device and may(most likely) cause trouble.
+	 * is 0x0089 this routine will think it is an Intel
+	 * flash device and may(most likely) cause trouble.
 	 */
 
 	addr[0x0000] = 0x0090;
@@ -631,7 +630,7 @@
 
 	if ((info->flash_id == FLASH_UNKNOWN) ||
 	    ((info->flash_id > FLASH_AMD_COMP) &&
-             ( (info->flash_id & FLASH_VENDMASK) != FLASH_MAN_INTEL ) ) ){
+	     ( (info->flash_id & FLASH_VENDMASK) != FLASH_MAN_INTEL ) ) ){
 		printf ("Can't erase unknown flash type - aborted\n");
 		return 1;
 	}
@@ -1035,13 +1034,13 @@
 		if( barf ) {
 			barf >>=16;
 		} else {
-		        barf = addr[0] & 0x0000003A;
+			barf = addr[0] & 0x0000003A;
 		}
 		printf("\nFlash write error at address %lx\n",(unsigned long)dest);
 		if(barf & 0x0002) printf("Block locked, not erased.\n");
 		if(barf & 0x0010) printf("Programming error.\n");
 		if(barf & 0x0008) printf("Vpp Low error.\n");
-	  	return(2);
+		return(2);
 	}
 
 
@@ -1074,7 +1073,7 @@
 	addr[0x0555] = 0x00A0;
      } else {
 	/* intel stuff */
-        *addr = 0x00D0;
+	*addr = 0x00D0;
 	*addr = 0x0040;
      }
 	*((vu_short *)dest) = data;
@@ -1087,7 +1086,7 @@
 	start = get_timer (0);
 
      if(info->flash_id < FLASH_AMD_COMP) {
-          /* AMD stuff */
+	  /* AMD stuff */
 	while ((*((vu_short *)dest) & 0x0080) != (data & 0x0080)) {
 		if (get_timer(start) > CFG_FLASH_WRITE_TOUT) {
 			return (1);
@@ -1106,7 +1105,7 @@
 		if(barf & 0x0002) printf("Block locked, not erased.\n");
 		if(barf & 0x0010) printf("Programming error.\n");
 		if(barf & 0x0008) printf("Vpp Low error.\n");
-	  	return(2);
+		return(2);
 	}
 	*addr = 0x00B0;
 	*addr = 0x0070;
@@ -1127,4 +1126,3 @@
 
 /*-----------------------------------------------------------------------
  */
-

diff --git a/board/eric/init.S b/board/eric/init.S
index bdf90a5..9d4e7ff 100644
--- a/board/eric/init.S
+++ b/board/eric/init.S

@@ -42,169 +42,169 @@
 #include <asm/mmu.h>
 
 
-     	.globl	ext_bus_cntlr_init
+	.globl	ext_bus_cntlr_init
 ext_bus_cntlr_init:
-        mflr    r4                      /* save link register */
-        bl      ..getAddr
+	mflr    r4                      /* save link register */
+	bl      ..getAddr
 ..getAddr:
-        mflr    r3                      /* get address of ..getAddr */
-        mtlr    r4                      /* restore link register */
-        addi    r4,0,14                 /* set ctr to 10; used to prefetch */
-        mtctr   r4                      /* 10 cache lines to fit this function */
-                                        /* in cache (gives us 8x10=80 instrctns) */
+	mflr    r3                      /* get address of ..getAddr */
+	mtlr    r4                      /* restore link register */
+	addi    r4,0,14                 /* set ctr to 10; used to prefetch */
+	mtctr   r4                      /* 10 cache lines to fit this function */
+					/* in cache (gives us 8x10=80 instrctns) */
 ..ebcloop:
-        icbt    r0,r3                   /* prefetch cache line for addr in r3 */
-        addi    r3,r3,32		/* move to next cache line */
-        bdnz    ..ebcloop               /* continue for 10 cache lines */
+	icbt    r0,r3                   /* prefetch cache line for addr in r3 */
+	addi    r3,r3,32		/* move to next cache line */
+	bdnz    ..ebcloop               /* continue for 10 cache lines */
 
-        /*------------------------------------------------------------------- */
-        /* Delay to ensure all accesses to ROM are complete before changing */
+	/*------------------------------------------------------------------- */
+	/* Delay to ensure all accesses to ROM are complete before changing */
 	/* bank 0 timings. 200usec should be enough. */
-        /*   200,000,000 (cycles/sec) X .000200 (sec) = 0x9C40 cycles */
-        /*------------------------------------------------------------------- */
+	/*   200,000,000 (cycles/sec) X .000200 (sec) = 0x9C40 cycles */
+	/*------------------------------------------------------------------- */
 	addis	r3,0,0x0
-        ori     r3,r3,0xA000          /* ensure 200usec have passed since reset */
-        mtctr   r3
+	ori     r3,r3,0xA000          /* ensure 200usec have passed since reset */
+	mtctr   r3
 ..spinlp:
-        bdnz    ..spinlp                /* spin loop */
+	bdnz    ..spinlp                /* spin loop */
 
-        /*----------------------------------------------------------------------- */
-        /* Memory Bank 0 (Flash) initialization (from openbios) */
-        /*----------------------------------------------------------------------- */
+	/*----------------------------------------------------------------------- */
+	/* Memory Bank 0 (Flash) initialization (from openbios) */
+	/*----------------------------------------------------------------------- */
 
-        addi    r4,0,pb0ap
-        mtdcr   ebccfga,r4
-        addis   r4,0,CS0_AP@h
-        ori     r4,r4,CS0_AP@l
-        mtdcr   ebccfgd,r4
+	addi    r4,0,pb0ap
+	mtdcr   ebccfga,r4
+	addis   r4,0,CS0_AP@h
+	ori     r4,r4,CS0_AP@l
+	mtdcr   ebccfgd,r4
 
-        addi    r4,0,pb0cr
-        mtdcr   ebccfga,r4
-        addis   r4,0,CS0_CR@h
-        ori     r4,r4,CS0_CR@l
-        mtdcr   ebccfgd,r4
+	addi    r4,0,pb0cr
+	mtdcr   ebccfga,r4
+	addis   r4,0,CS0_CR@h
+	ori     r4,r4,CS0_CR@l
+	mtdcr   ebccfgd,r4
 
-        /*----------------------------------------------------------------------- */
-        /* Memory Bank 1 (NVRAM/RTC) initialization */
-        /*----------------------------------------------------------------------- */
+	/*----------------------------------------------------------------------- */
+	/* Memory Bank 1 (NVRAM/RTC) initialization */
+	/*----------------------------------------------------------------------- */
 
-        addi    r4,0,pb1ap
-        mtdcr   ebccfga,r4
-        addis   r4,0,CS1_AP@h
-        ori     r4,r4,CS1_AP@l
-        mtdcr   ebccfgd,r4
+	addi    r4,0,pb1ap
+	mtdcr   ebccfga,r4
+	addis   r4,0,CS1_AP@h
+	ori     r4,r4,CS1_AP@l
+	mtdcr   ebccfgd,r4
 
-        addi    r4,0,pb1cr
-        mtdcr   ebccfga,r4
-        addis   r4,0,CS1_CR@h
-        ori     r4,r4,CS1_CR@l
-        mtdcr   ebccfgd,r4
+	addi    r4,0,pb1cr
+	mtdcr   ebccfga,r4
+	addis   r4,0,CS1_CR@h
+	ori     r4,r4,CS1_CR@l
+	mtdcr   ebccfgd,r4
 
-        /*----------------------------------------------------------------------- */
-        /* Memory Bank 2 (A/D converter) initialization */
-        /*----------------------------------------------------------------------- */
+	/*----------------------------------------------------------------------- */
+	/* Memory Bank 2 (A/D converter) initialization */
+	/*----------------------------------------------------------------------- */
 
-        addi    r4,0,pb2ap
-        mtdcr   ebccfga,r4
-        addis   r4,0,CS2_AP@h
-        ori     r4,r4,CS2_AP@l
-        mtdcr   ebccfgd,r4
+	addi    r4,0,pb2ap
+	mtdcr   ebccfga,r4
+	addis   r4,0,CS2_AP@h
+	ori     r4,r4,CS2_AP@l
+	mtdcr   ebccfgd,r4
 
-        addi    r4,0,pb2cr
-        mtdcr   ebccfga,r4
-        addis   r4,0,CS2_CR@h
-        ori     r4,r4,CS2_CR@l
-        mtdcr   ebccfgd,r4
+	addi    r4,0,pb2cr
+	mtdcr   ebccfga,r4
+	addis   r4,0,CS2_CR@h
+	ori     r4,r4,CS2_CR@l
+	mtdcr   ebccfgd,r4
 
-        /*----------------------------------------------------------------------- */
-        /* Memory Bank 3 (Ethernet PHY Reset) initialization */
-        /*----------------------------------------------------------------------- */
+	/*----------------------------------------------------------------------- */
+	/* Memory Bank 3 (Ethernet PHY Reset) initialization */
+	/*----------------------------------------------------------------------- */
 
-        addi    r4,0,pb3ap
-        mtdcr   ebccfga,r4
-        addis   r4,0,CS3_AP@h
-        ori     r4,r4,CS3_AP@l
-        mtdcr   ebccfgd,r4
+	addi    r4,0,pb3ap
+	mtdcr   ebccfga,r4
+	addis   r4,0,CS3_AP@h
+	ori     r4,r4,CS3_AP@l
+	mtdcr   ebccfgd,r4
 
-        addi    r4,0,pb3cr
-        mtdcr   ebccfga,r4
-        addis   r4,0,CS3_CR@h
-        ori     r4,r4,CS3_CR@l
-        mtdcr   ebccfgd,r4
+	addi    r4,0,pb3cr
+	mtdcr   ebccfga,r4
+	addis   r4,0,CS3_CR@h
+	ori     r4,r4,CS3_CR@l
+	mtdcr   ebccfgd,r4
 
-        /*----------------------------------------------------------------------- */
-        /* Memory Bank 4 (PC-MIP PRSNT1#) initialization */
-        /*----------------------------------------------------------------------- */
+	/*----------------------------------------------------------------------- */
+	/* Memory Bank 4 (PC-MIP PRSNT1#) initialization */
+	/*----------------------------------------------------------------------- */
 
-        addi    r4,0,pb4ap
-        mtdcr   ebccfga,r4
-        addis   r4,0,CS4_AP@h
-        ori     r4,r4,CS4_AP@l
-        mtdcr   ebccfgd,r4
+	addi    r4,0,pb4ap
+	mtdcr   ebccfga,r4
+	addis   r4,0,CS4_AP@h
+	ori     r4,r4,CS4_AP@l
+	mtdcr   ebccfgd,r4
 
-        addi    r4,0,pb4cr
-        mtdcr   ebccfga,r4
-        addis   r4,0,CS4_CR@h
-        ori     r4,r4,CS4_CR@l
-        mtdcr   ebccfgd,r4
+	addi    r4,0,pb4cr
+	mtdcr   ebccfga,r4
+	addis   r4,0,CS4_CR@h
+	ori     r4,r4,CS4_CR@l
+	mtdcr   ebccfgd,r4
 
-        /*----------------------------------------------------------------------- */
-        /* Memory Bank 5 (PC-MIP PRSNT2#) initialization */
-        /*----------------------------------------------------------------------- */
+	/*----------------------------------------------------------------------- */
+	/* Memory Bank 5 (PC-MIP PRSNT2#) initialization */
+	/*----------------------------------------------------------------------- */
 
-        addi    r4,0,pb5ap
-        mtdcr   ebccfga,r4
-        addis   r4,0,CS5_AP@h
-        ori     r4,r4,CS5_AP@l
-        mtdcr   ebccfgd,r4
+	addi    r4,0,pb5ap
+	mtdcr   ebccfga,r4
+	addis   r4,0,CS5_AP@h
+	ori     r4,r4,CS5_AP@l
+	mtdcr   ebccfgd,r4
 
-        addi    r4,0,pb5cr
-        mtdcr   ebccfga,r4
-        addis   r4,0,CS5_CR@h
-        ori     r4,r4,CS5_CR@l
-        mtdcr   ebccfgd,r4
+	addi    r4,0,pb5cr
+	mtdcr   ebccfga,r4
+	addis   r4,0,CS5_CR@h
+	ori     r4,r4,CS5_CR@l
+	mtdcr   ebccfgd,r4
 
-        /*----------------------------------------------------------------------- */
-        /* Memory Bank 6 (CPU LED0) initialization */
-        /*----------------------------------------------------------------------- */
+	/*----------------------------------------------------------------------- */
+	/* Memory Bank 6 (CPU LED0) initialization */
+	/*----------------------------------------------------------------------- */
 
-        addi    r4,0,pb6ap
-        mtdcr   ebccfga,r4
-        addis   r4,0,CS6_AP@h
-        ori     r4,r4,CS6_AP@l
-        mtdcr   ebccfgd,r4
+	addi    r4,0,pb6ap
+	mtdcr   ebccfga,r4
+	addis   r4,0,CS6_AP@h
+	ori     r4,r4,CS6_AP@l
+	mtdcr   ebccfgd,r4
 
-        addi    r4,0,pb6cr
-        mtdcr   ebccfga,r4
-        addis   r4,0,CS6_CR@h
-        ori     r4,r4,CS5_CR@l
-        mtdcr   ebccfgd,r4
+	addi    r4,0,pb6cr
+	mtdcr   ebccfga,r4
+	addis   r4,0,CS6_CR@h
+	ori     r4,r4,CS5_CR@l
+	mtdcr   ebccfgd,r4
 
-        /*----------------------------------------------------------------------- */
-        /* Memory Bank 7 (CPU LED1) initialization */
-        /*----------------------------------------------------------------------- */
+	/*----------------------------------------------------------------------- */
+	/* Memory Bank 7 (CPU LED1) initialization */
+	/*----------------------------------------------------------------------- */
 
-        addi    r4,0,pb7ap
-        mtdcr   ebccfga,r4
-        addis   r4,0,CS7_AP@h
-        ori     r4,r4,CS7_AP@l
-        mtdcr   ebccfgd,r4
+	addi    r4,0,pb7ap
+	mtdcr   ebccfga,r4
+	addis   r4,0,CS7_AP@h
+	ori     r4,r4,CS7_AP@l
+	mtdcr   ebccfgd,r4
 
-        addi    r4,0,pb7cr
-        mtdcr   ebccfga,r4
-        addis   r4,0,CS7_CR@h
-        ori     r4,r4,CS7_CR@l
-        mtdcr   ebccfgd,r4
+	addi    r4,0,pb7cr
+	mtdcr   ebccfga,r4
+	addis   r4,0,CS7_CR@h
+	ori     r4,r4,CS7_CR@l
+	mtdcr   ebccfgd,r4
 
 /*	addis   r4,r0,FPGA_BRDC@h */
-/*        ori     r4,r4,FPGA_BRDC@l */
-/*        lbz     r3,0(r4)                //get FPGA board control reg */
-/*        eieio */
-/*        ori	r3,r3,0x01              //set UART1 control to select CTS/RTS */
+/*	ori     r4,r4,FPGA_BRDC@l */
+/*	lbz     r3,0(r4)                /###*get FPGA board control reg */
+/*	eieio */
+/*	ori	r3,r3,0x01              /###*set UART1 control to select CTS/RTS */
 /*	stb     r3,0(r4) */
 
 	nop				/* pass2 DCR errata #8 */
-        blr
+	blr
 
 /*----------------------------------------------------------------------------- */
 /* Function:     sdram_init */
@@ -213,56 +213,56 @@
 /*               If we have two SDRAM banks, simply undef SINGLE_BANK (ROLF :-) */
 /*		 It is assumed that a 32MB 12x8(2) SDRAM is used. */
 /*----------------------------------------------------------------------------- */
-        .globl  sdram_init
+	.globl  sdram_init
 
 sdram_init:
 
 	mflr	r31
 
 #ifdef CFG_SDRAM_MANUALLY
-        /*------------------------------------------------------------------- */
-        /* Set MB0CF for bank 0. (0-32MB) Address Mode 4 since 12x8(2) */
-        /*------------------------------------------------------------------- */
+	/*------------------------------------------------------------------- */
+	/* Set MB0CF for bank 0. (0-32MB) Address Mode 4 since 12x8(2) */
+	/*------------------------------------------------------------------- */
 
-        addi    r4,0,mem_mb0cf
-        mtdcr   memcfga,r4
-        addis   r4,0,MB0CF@h
-        ori     r4,r4,MB0CF@l
-        mtdcr   memcfgd,r4
+	addi    r4,0,mem_mb0cf
+	mtdcr   memcfga,r4
+	addis   r4,0,MB0CF@h
+	ori     r4,r4,MB0CF@l
+	mtdcr   memcfgd,r4
 
-        /*------------------------------------------------------------------- */
-        /* Set MB1CF for bank 1. (32MB-64MB) Address Mode 4 since 12x8(2) */
-        /*------------------------------------------------------------------- */
+	/*------------------------------------------------------------------- */
+	/* Set MB1CF for bank 1. (32MB-64MB) Address Mode 4 since 12x8(2) */
+	/*------------------------------------------------------------------- */
 
-        addi    r4,0,mem_mb1cf
-        mtdcr   memcfga,r4
-        addis   r4,0,MB1CF@h
-        ori     r4,r4,MB1CF@l
-        mtdcr   memcfgd,r4
+	addi    r4,0,mem_mb1cf
+	mtdcr   memcfga,r4
+	addis   r4,0,MB1CF@h
+	ori     r4,r4,MB1CF@l
+	mtdcr   memcfgd,r4
 
-        /*------------------------------------------------------------------- */
-        /* Set MB2CF for bank 2. off */
-        /*------------------------------------------------------------------- */
+	/*------------------------------------------------------------------- */
+	/* Set MB2CF for bank 2. off */
+	/*------------------------------------------------------------------- */
 
-        addi    r4,0,mem_mb2cf
-        mtdcr   memcfga,r4
-        addis   r4,0,MB2CF@h
-        ori     r4,r4,MB2CF@l
-        mtdcr   memcfgd,r4
+	addi    r4,0,mem_mb2cf
+	mtdcr   memcfga,r4
+	addis   r4,0,MB2CF@h
+	ori     r4,r4,MB2CF@l
+	mtdcr   memcfgd,r4
 
-        /*------------------------------------------------------------------- */
-        /* Set MB3CF for bank 3. off */
-        /*------------------------------------------------------------------- */
+	/*------------------------------------------------------------------- */
+	/* Set MB3CF for bank 3. off */
+	/*------------------------------------------------------------------- */
 
-        addi    r4,0,mem_mb3cf
-        mtdcr   memcfga,r4
-        addis   r4,0,MB3CF@h
-        ori     r4,r4,MB3CF@l
-        mtdcr   memcfgd,r4
+	addi    r4,0,mem_mb3cf
+	mtdcr   memcfga,r4
+	addis   r4,0,MB3CF@h
+	ori     r4,r4,MB3CF@l
+	mtdcr   memcfgd,r4
 
-        /*------------------------------------------------------------------- */
-        /* Set the SDRAM Timing reg, SDTR1 and the refresh timer reg, RTR. */
-        /* To set the appropriate timings, we need to know the SDRAM speed. */
+	/*------------------------------------------------------------------- */
+	/* Set the SDRAM Timing reg, SDTR1 and the refresh timer reg, RTR. */
+	/* To set the appropriate timings, we need to know the SDRAM speed. */
 	/* We can use the PLB speed since the SDRAM speed is the same as */
 	/* the PLB speed. The PLB speed is the FBK divider times the */
 	/* 405GP reference clock, which on the Walnut board is 33Mhz. */
@@ -270,86 +270,86 @@
 	/* 100Mhz; if FBK is 3, SDRAM is 133Mhz. */
 	/* NOTE: The Walnut board supports SDRAM speeds of 66Mhz, 100Mhz, and */
 	/* maybe 133Mhz. */
-        /*------------------------------------------------------------------- */
+	/*------------------------------------------------------------------- */
 
-        mfdcr   r5,strap                 /* determine FBK divider */
-                                          /* via STRAP reg to calc PLB speed. */
-                                          /* SDRAM speed is the same as the PLB */
-				          /* speed. */
-        rlwinm  r4,r5,4,0x3             /* get FBK divide bits */
+	mfdcr   r5,strap                 /* determine FBK divider */
+					  /* via STRAP reg to calc PLB speed. */
+					  /* SDRAM speed is the same as the PLB */
+					  /* speed. */
+	rlwinm  r4,r5,4,0x3             /* get FBK divide bits */
 
 ..chk_66:
-        cmpi    %cr0,0,r4,0x1
-        bne     ..chk_100
+	cmpi    %cr0,0,r4,0x1
+	bne     ..chk_100
 	addis	r6,0,SDTR_66@h		/* SDTR1 value for 66Mhz */
 	ori     r6,r6,SDTR_66@l
 	addis	r7,0,RTR_66		/* RTR value for 66Mhz */
-        b	..sdram_ok
+	b	..sdram_ok
 ..chk_100:
-        cmpi    %cr0,0,r4,0x2
-        bne     ..chk_133
-        addis   r6,0,SDTR_100@h        /* SDTR1 value for 100Mhz */
-        ori     r6,r6,SDTR_100@l
-        addis   r7,0,RTR_100           /* RTR value for 100Mhz */
-        b       ..sdram_ok
+	cmpi    %cr0,0,r4,0x2
+	bne     ..chk_133
+	addis   r6,0,SDTR_100@h        /* SDTR1 value for 100Mhz */
+	ori     r6,r6,SDTR_100@l
+	addis   r7,0,RTR_100           /* RTR value for 100Mhz */
+	b       ..sdram_ok
 ..chk_133:
-        addis   r6,0,0x0107            /* SDTR1 value for 133Mhz */
-        ori     r6,r6,0x4015
-        addis   r7,0,0x07F0            /* RTR value for 133Mhz */
+	addis   r6,0,0x0107            /* SDTR1 value for 133Mhz */
+	ori     r6,r6,0x4015
+	addis   r7,0,0x07F0            /* RTR value for 133Mhz */
 
 ..sdram_ok:
-        /*------------------------------------------------------------------- */
-        /* Set SDTR1 */
-        /*------------------------------------------------------------------- */
-        addi    r4,0,mem_sdtr1
-        mtdcr   memcfga,r4
-        mtdcr   memcfgd,r6
+	/*------------------------------------------------------------------- */
+	/* Set SDTR1 */
+	/*------------------------------------------------------------------- */
+	addi    r4,0,mem_sdtr1
+	mtdcr   memcfga,r4
+	mtdcr   memcfgd,r6
 
-        /*------------------------------------------------------------------- */
-        /* Set RTR */
-        /*------------------------------------------------------------------- */
-        addi    r4,0,mem_rtr
-        mtdcr   memcfga,r4
-        mtdcr   memcfgd,r7
+	/*------------------------------------------------------------------- */
+	/* Set RTR */
+	/*------------------------------------------------------------------- */
+	addi    r4,0,mem_rtr
+	mtdcr   memcfga,r4
+	mtdcr   memcfgd,r7
 
-        /*------------------------------------------------------------------- */
-        /* Delay to ensure 200usec have elapsed since reset. Assume worst */
-        /* case that the core is running 200Mhz: */
-        /*   200,000,000 (cycles/sec) X .000200 (sec) = 0x9C40 cycles */
-        /*------------------------------------------------------------------- */
-        addis   r3,0,0x0000
-        ori     r3,r3,0xA000          /* ensure 200usec have passed since reset */
-        mtctr   r3
+	/*------------------------------------------------------------------- */
+	/* Delay to ensure 200usec have elapsed since reset. Assume worst */
+	/* case that the core is running 200Mhz: */
+	/*   200,000,000 (cycles/sec) X .000200 (sec) = 0x9C40 cycles */
+	/*------------------------------------------------------------------- */
+	addis   r3,0,0x0000
+	ori     r3,r3,0xA000          /* ensure 200usec have passed since reset */
+	mtctr   r3
 ..spinlp2:
-        bdnz    ..spinlp2               /* spin loop */
+	bdnz    ..spinlp2               /* spin loop */
 
-        /*------------------------------------------------------------------- */
-        /* Set memory controller options reg, MCOPT1. */
+	/*------------------------------------------------------------------- */
+	/* Set memory controller options reg, MCOPT1. */
 	/* Set DC_EN to '1' and BRD_PRF to '01' for 16 byte PLB Burst */
 	/* read/prefetch. */
-        /*------------------------------------------------------------------- */
-        addi    r4,0,mem_mcopt1
-        mtdcr   memcfga,r4
-        addis   r4,0,0x8080             /* set DC_EN=1 */
-        ori     r4,r4,0x0000
-        mtdcr   memcfgd,r4
+	/*------------------------------------------------------------------- */
+	addi    r4,0,mem_mcopt1
+	mtdcr   memcfga,r4
+	addis   r4,0,0x8080             /* set DC_EN=1 */
+	ori     r4,r4,0x0000
+	mtdcr   memcfgd,r4
 
-        /*------------------------------------------------------------------- */
-        /* Delay to ensure 10msec have elapsed since reset. This is */
-        /* required for the MPC952 to stabalize. Assume worst */
-        /* case that the core is running 200Mhz: */
-        /*   200,000,000 (cycles/sec) X .010 (sec) = 0x1E8480 cycles */
-        /* This delay should occur before accessing SDRAM. */
-        /*------------------------------------------------------------------- */
-        addis   r3,0,0x001E
-        ori     r3,r3,0x8480          /* ensure 10msec have passed since reset */
-        mtctr   r3
+	/*------------------------------------------------------------------- */
+	/* Delay to ensure 10msec have elapsed since reset. This is */
+	/* required for the MPC952 to stabalize. Assume worst */
+	/* case that the core is running 200Mhz: */
+	/*   200,000,000 (cycles/sec) X .010 (sec) = 0x1E8480 cycles */
+	/* This delay should occur before accessing SDRAM. */
+	/*------------------------------------------------------------------- */
+	addis   r3,0,0x001E
+	ori     r3,r3,0x8480          /* ensure 10msec have passed since reset */
+	mtctr   r3
 ..spinlp3:
-        bdnz    ..spinlp3                /* spin loop */
+	bdnz    ..spinlp3                /* spin loop */
 
 #else
 /*fixme: do SDRAM Autoconfig from EEPROM here */
 
 #endif
-        mtlr    r31                     /* restore lr */
-        blr
+	mtlr    r31                     /* restore lr */
+	blr

diff --git a/board/eric/u-boot.lds b/board/eric/u-boot.lds
index e1373fd..10f57d8 100644
--- a/board/eric/u-boot.lds
+++ b/board/eric/u-boot.lds

@@ -121,6 +121,11 @@
   _edata  =  .;
   PROVIDE (edata = .);
 
+  __u_boot_cmd_start = .;
+  .u_boot_cmd : { *(.u_boot_cmd) }
+  __u_boot_cmd_end = .;
+
+
   __start___ex_table = .;
   __ex_table : { *(__ex_table) }
   __stop___ex_table = .;

diff --git a/board/esd/adciop/Makefile b/board/esd/adciop/Makefile
index d4a4e65..474c936 100644
--- a/board/esd/adciop/Makefile
+++ b/board/esd/adciop/Makefile

@@ -1,3 +1,4 @@
+
 #
 # (C) Copyright 2000
 # Wolfgang Denk, DENX Software Engineering, wd@denx.de.
@@ -28,7 +29,7 @@
 OBJS	= $(BOARD).o flash.o ../common/pci.o
 
 $(LIB):	$(OBJS)
-	$(AR) crv $@ $^
+	$(AR) crv $@ $(OBJS)
 
 clean:
 	rm -f $(SOBJS) $(OBJS)

diff --git a/board/esd/adciop/flash.c b/board/esd/adciop/flash.c
index 69618de..d9eccba 100644
--- a/board/esd/adciop/flash.c
+++ b/board/esd/adciop/flash.c

@@ -96,8 +96,8 @@
 			      FLASH_BASE0_PRELIM+size_b0+size_b1-monitor_flash_len,
 			      FLASH_BASE0_PRELIM+size_b0+size_b1-1,
 			      &flash_info[1]);
-                /* monitor protection OFF by default (one is enough) */
-                flash_protect(FLAG_PROTECT_CLEAR,
+		/* monitor protection OFF by default (one is enough) */
+		flash_protect(FLAG_PROTECT_CLEAR,
 			      FLASH_BASE0_PRELIM+size_b0-monitor_flash_len,
 			      FLASH_BASE0_PRELIM+size_b0-1,
 			      &flash_info[0]);

diff --git a/board/esd/adciop/u-boot.lds b/board/esd/adciop/u-boot.lds
index ddf1307..b07d117 100644
--- a/board/esd/adciop/u-boot.lds
+++ b/board/esd/adciop/u-boot.lds

@@ -107,6 +107,11 @@
   _edata  =  .;
   PROVIDE (edata = .);
 
+  __u_boot_cmd_start = .;
+  .u_boot_cmd : { *(.u_boot_cmd) }
+  __u_boot_cmd_end = .;
+
+
   __start___ex_table = .;
   __ex_table : { *(__ex_table) }
   __stop___ex_table = .;

diff --git a/board/esd/ar405/Makefile b/board/esd/ar405/Makefile
index 39d2fec..f5bda55 100644
--- a/board/esd/ar405/Makefile
+++ b/board/esd/ar405/Makefile

@@ -28,7 +28,7 @@
 OBJS	= $(BOARD).o flash.o
 
 $(LIB):	$(OBJS) $(SOBJS)
-	$(AR) crv $@ $^
+	$(AR) crv $@ $(OBJS)
 
 clean:
 	rm -f $(SOBJS) $(OBJS)

diff --git a/board/esd/ar405/ar405.c b/board/esd/ar405/ar405.c
index f23b822..d0b06e6 100644
--- a/board/esd/ar405/ar405.c
+++ b/board/esd/ar405/ar405.c

@@ -25,8 +25,9 @@
 #include "ar405.h"
 #include <asm/processor.h>
 #include <command.h>
-#include <cmd_boot.h>
 
+/*cmd_boot.c*/
+extern int do_reset (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[]);
 
 /* ------------------------------------------------------------------------- */
 

diff --git a/board/esd/ar405/flash.c b/board/esd/ar405/flash.c
index 3a644f9..a651b6f 100644
--- a/board/esd/ar405/flash.c
+++ b/board/esd/ar405/flash.c

@@ -43,8 +43,8 @@
 {
 	unsigned long size_b0, size_b1;
 	int i;
-        uint pbcr;
-        unsigned long base_b0, base_b1;
+	uint pbcr;
+	unsigned long base_b0, base_b1;
 
 	/* Init: no FLASHes known */
 	for (i=0; i<CFG_MAX_FLASH_BANKS; ++i) {
@@ -66,27 +66,27 @@
 
 	/* Re-do sizing to get full correct info */
 
-        if (size_b1)
-          {
-            mtdcr(ebccfga, pb0cr);
-            pbcr = mfdcr(ebccfgd);
-            mtdcr(ebccfga, pb0cr);
-            base_b1 = -size_b1;
-            pbcr = (pbcr & 0x0001ffff) | base_b1 | (((size_b1/1024/1024)-1)<<17);
-            mtdcr(ebccfgd, pbcr);
-            /*          printf("pb1cr = %x\n", pbcr); */
-          }
+	if (size_b1)
+	  {
+	    mtdcr(ebccfga, pb0cr);
+	    pbcr = mfdcr(ebccfgd);
+	    mtdcr(ebccfga, pb0cr);
+	    base_b1 = -size_b1;
+	    pbcr = (pbcr & 0x0001ffff) | base_b1 | (((size_b1/1024/1024)-1)<<17);
+	    mtdcr(ebccfgd, pbcr);
+	    /*          printf("pb1cr = %x\n", pbcr); */
+	  }
 
-        if (size_b0)
-          {
-            mtdcr(ebccfga, pb1cr);
-            pbcr = mfdcr(ebccfgd);
-            mtdcr(ebccfga, pb1cr);
-            base_b0 = base_b1 - size_b0;
-            pbcr = (pbcr & 0x0001ffff) | base_b0 | (((size_b0/1024/1024)-1)<<17);
-            mtdcr(ebccfgd, pbcr);
-            /*            printf("pb0cr = %x\n", pbcr); */
-          }
+	if (size_b0)
+	  {
+	    mtdcr(ebccfga, pb1cr);
+	    pbcr = mfdcr(ebccfgd);
+	    mtdcr(ebccfga, pb1cr);
+	    base_b0 = base_b1 - size_b0;
+	    pbcr = (pbcr & 0x0001ffff) | base_b0 | (((size_b0/1024/1024)-1)<<17);
+	    mtdcr(ebccfgd, pbcr);
+	    /*            printf("pb0cr = %x\n", pbcr); */
+	  }
 
 	size_b0 = flash_get_size((vu_long *)base_b0, &flash_info[0]);
 
@@ -109,11 +109,11 @@
 				    base_b1+size_b1-monitor_flash_len,
 				    base_b1+size_b1-1,
 				    &flash_info[1]);
-                /* monitor protection OFF by default (one is enough) */
-                (void)flash_protect(FLAG_PROTECT_CLEAR,
-                                    base_b0+size_b0-monitor_flash_len,
-                                    base_b0+size_b0-1,
-                                    &flash_info[0]);
+		/* monitor protection OFF by default (one is enough) */
+		(void)flash_protect(FLAG_PROTECT_CLEAR,
+				    base_b0+size_b0-monitor_flash_len,
+				    base_b0+size_b0-1,
+				    &flash_info[0]);
 	} else {
 		flash_info[1].flash_id = FLASH_UNKNOWN;
 		flash_info[1].sector_count = -1;

diff --git a/board/esd/ar405/u-boot.lds b/board/esd/ar405/u-boot.lds
index 7b86a3d..3bb4304 100644
--- a/board/esd/ar405/u-boot.lds
+++ b/board/esd/ar405/u-boot.lds

@@ -129,6 +129,11 @@
   _edata  =  .;
   PROVIDE (edata = .);
 
+  __u_boot_cmd_start = .;
+  .u_boot_cmd : { *(.u_boot_cmd) }
+  __u_boot_cmd_end = .;
+
+
   __start___ex_table = .;
   __ex_table : { *(__ex_table) }
   __stop___ex_table = .;

diff --git a/board/esd/ash405/Makefile b/board/esd/ash405/Makefile
index 39d2fec..f5bda55 100644
--- a/board/esd/ash405/Makefile
+++ b/board/esd/ash405/Makefile

@@ -28,7 +28,7 @@
 OBJS	= $(BOARD).o flash.o
 
 $(LIB):	$(OBJS) $(SOBJS)
-	$(AR) crv $@ $^
+	$(AR) crv $@ $(OBJS)
 
 clean:
 	rm -f $(SOBJS) $(OBJS)

diff --git a/board/esd/ash405/ash405.c b/board/esd/ash405/ash405.c
index 4cb5183..f45ecf1 100644
--- a/board/esd/ash405/ash405.c
+++ b/board/esd/ash405/ash405.c

@@ -24,7 +24,6 @@
 #include <common.h>
 #include <asm/processor.h>
 #include <command.h>
-#include <cmd_boot.h>
 #include <malloc.h>
 
 /* ------------------------------------------------------------------------- */
@@ -33,6 +32,8 @@
 #define FPGA_DEBUG
 #endif
 
+extern int do_reset (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[]);
+
 /* fpga configuration data - gzip compressed and generated by bin2c */
 const unsigned char fpgadata[] =
 {

diff --git a/board/esd/ash405/flash.c b/board/esd/ash405/flash.c
index f904aff..89af119 100644
--- a/board/esd/ash405/flash.c
+++ b/board/esd/ash405/flash.c

@@ -43,8 +43,8 @@
 {
 	unsigned long size_b0;
 	int i;
-        uint pbcr;
-        unsigned long base_b0;
+	uint pbcr;
+	unsigned long base_b0;
 	int size_val = 0;
 
 	/* Init: no FLASHes known */
@@ -61,14 +61,14 @@
 			size_b0, size_b0<<20);
 	}
 
-        /* Setup offsets */
-        flash_get_offsets (-size_b0, &flash_info[0]);
+	/* Setup offsets */
+	flash_get_offsets (-size_b0, &flash_info[0]);
 
-        /* Re-do sizing to get full correct info */
-        mtdcr(ebccfga, pb0cr);
-        pbcr = mfdcr(ebccfgd);
-        mtdcr(ebccfga, pb0cr);
-        base_b0 = -size_b0;
+	/* Re-do sizing to get full correct info */
+	mtdcr(ebccfga, pb0cr);
+	pbcr = mfdcr(ebccfgd);
+	mtdcr(ebccfga, pb0cr);
+	base_b0 = -size_b0;
 	switch (size_b0) {
 	case 1 << 20:
 		size_val = 0;
@@ -87,15 +87,15 @@
 		break;
 	}
 	pbcr = (pbcr & 0x0001ffff) | base_b0 | (size_val << 17);
-        mtdcr(ebccfgd, pbcr);
+	mtdcr(ebccfgd, pbcr);
 
-        /* Monitor protection ON by default */
-        (void)flash_protect(FLAG_PROTECT_SET,
-                            -CFG_MONITOR_LEN,
-                            0xffffffff,
-                            &flash_info[0]);
+	/* Monitor protection ON by default */
+	(void)flash_protect(FLAG_PROTECT_SET,
+			    -CFG_MONITOR_LEN,
+			    0xffffffff,
+			    &flash_info[0]);
 
-        flash_info[0].size = size_b0;
+	flash_info[0].size = size_b0;
 
 	return (size_b0);
 }

diff --git a/board/esd/ash405/u-boot.lds b/board/esd/ash405/u-boot.lds
index 97851f1..ba55550 100644
--- a/board/esd/ash405/u-boot.lds
+++ b/board/esd/ash405/u-boot.lds

@@ -119,6 +119,10 @@
   _edata  =  .;
   PROVIDE (edata = .);
 
+  __u_boot_cmd_start = .;
+  .u_boot_cmd : { *(.u_boot_cmd) }
+  __u_boot_cmd_end = .;
+
   __start___ex_table = .;
   __ex_table : { *(__ex_table) }
   __stop___ex_table = .;

diff --git a/board/esd/canbt/Makefile b/board/esd/canbt/Makefile
index 39d2fec..f5bda55 100644
--- a/board/esd/canbt/Makefile
+++ b/board/esd/canbt/Makefile

@@ -28,7 +28,7 @@
 OBJS	= $(BOARD).o flash.o
 
 $(LIB):	$(OBJS) $(SOBJS)
-	$(AR) crv $@ $^
+	$(AR) crv $@ $(OBJS)
 
 clean:
 	rm -f $(SOBJS) $(OBJS)

diff --git a/board/esd/canbt/canbt.c b/board/esd/canbt/canbt.c
index 708101e..ae0e880 100644
--- a/board/esd/canbt/canbt.c
+++ b/board/esd/canbt/canbt.c

@@ -25,7 +25,11 @@
 #include "canbt.h"
 #include <asm/processor.h>
 #include <command.h>
-#include <cmd_boot.h>
+
+
+/*cmd_boot.c*/
+extern int do_reset (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[]);
+
 
 /* ------------------------------------------------------------------------- */
 

diff --git a/board/esd/canbt/flash.c b/board/esd/canbt/flash.c
index 685850e..de847f9 100644
--- a/board/esd/canbt/flash.c
+++ b/board/esd/canbt/flash.c

@@ -43,8 +43,8 @@
 {
 	unsigned long size_b0;
 	int i;
-        uint pbcr;
-        unsigned long base_b0;
+	uint pbcr;
+	unsigned long base_b0;
 
 	/* Init: no FLASHes known */
 	for (i=0; i<CFG_MAX_FLASH_BANKS; ++i) {
@@ -60,25 +60,25 @@
 			size_b0, size_b0<<20);
 	}
 
-        /* Setup offsets */
-        flash_get_offsets (-size_b0, &flash_info[0]);
+	/* Setup offsets */
+	flash_get_offsets (-size_b0, &flash_info[0]);
 
-        /* Re-do sizing to get full correct info */
-        mtdcr(ebccfga, pb0cr);
-        pbcr = mfdcr(ebccfgd);
-        mtdcr(ebccfga, pb0cr);
-        base_b0 = -size_b0;
-        pbcr = (pbcr & 0x0001ffff) | base_b0 | (((size_b0/1024/1024)-1)<<17);
-        mtdcr(ebccfgd, pbcr);
-        /*          printf("pb1cr = %x\n", pbcr); */
+	/* Re-do sizing to get full correct info */
+	mtdcr(ebccfga, pb0cr);
+	pbcr = mfdcr(ebccfgd);
+	mtdcr(ebccfga, pb0cr);
+	base_b0 = -size_b0;
+	pbcr = (pbcr & 0x0001ffff) | base_b0 | (((size_b0/1024/1024)-1)<<17);
+	mtdcr(ebccfgd, pbcr);
+	/*          printf("pb1cr = %x\n", pbcr); */
 
-        /* Monitor protection ON by default */
-        (void)flash_protect(FLAG_PROTECT_SET,
-                            -monitor_flash_len,
-                            0xffffffff,
-                            &flash_info[0]);
+	/* Monitor protection ON by default */
+	(void)flash_protect(FLAG_PROTECT_SET,
+			    -monitor_flash_len,
+			    0xffffffff,
+			    &flash_info[0]);
 
-        flash_info[0].size = size_b0;
+	flash_info[0].size = size_b0;
 
 	return (size_b0);
 }

diff --git a/board/esd/canbt/u-boot.lds b/board/esd/canbt/u-boot.lds
index 47b0aae..d739cea 100644
--- a/board/esd/canbt/u-boot.lds
+++ b/board/esd/canbt/u-boot.lds

@@ -131,6 +131,11 @@
   _edata  =  .;
   PROVIDE (edata = .);
 
+  __u_boot_cmd_start = .;
+  .u_boot_cmd : { *(.u_boot_cmd) }
+  __u_boot_cmd_end = .;
+
+
   __start___ex_table = .;
   __ex_table : { *(__ex_table) }
   __stop___ex_table = .;

diff --git a/board/esd/common/flash.c b/board/esd/common/flash.c
index 78a1e0f..d032b00 100644
--- a/board/esd/common/flash.c
+++ b/board/esd/common/flash.c

@@ -40,11 +40,11 @@
 	short n;
 
 	/* set up sector start address table */
-        if (((info->flash_id & FLASH_VENDMASK) == FLASH_MAN_SST) ||
+	if (((info->flash_id & FLASH_VENDMASK) == FLASH_MAN_SST) ||
 	    ((info->flash_id & FLASH_TYPEMASK) == FLASH_AM640U)) {
 	    for (i = 0; i < info->sector_count; i++)
 		info->start[i] = base + (i * 0x00010000);
-        } else if (((info->flash_id & FLASH_TYPEMASK) == FLASH_AMDL322B) ||
+	} else if (((info->flash_id & FLASH_TYPEMASK) == FLASH_AMDL322B) ||
 		   ((info->flash_id & FLASH_TYPEMASK) == FLASH_AMDL323B) ||
 		   ((info->flash_id & FLASH_TYPEMASK) == FLASH_AM320B) ||
 		   ((info->flash_id & FLASH_TYPEMASK) == FLASH_AMDL324B)) {
@@ -58,7 +58,7 @@
 			base += 64 << 10;
 			++i;
 		}
-        } else if (((info->flash_id & FLASH_TYPEMASK) == FLASH_AMDL322T) ||
+	} else if (((info->flash_id & FLASH_TYPEMASK) == FLASH_AMDL322T) ||
 		   ((info->flash_id & FLASH_TYPEMASK) == FLASH_AMDL323T) ||
 		   ((info->flash_id & FLASH_TYPEMASK) == FLASH_AM320T) ||
 		   ((info->flash_id & FLASH_TYPEMASK) == FLASH_AMDL324T)) {
@@ -75,7 +75,7 @@
 			--i;
 			info->start[i] = base;
 		}
-        } else {
+	} else {
 	    if (info->flash_id & FLASH_BTYPE) {
 		/* set sector offsets for bottom boot block type	*/
 		info->start[0] = base + 0x00000000;
@@ -103,10 +103,10 @@
 void flash_print_info  (flash_info_t *info)
 {
 	int i;
-        int k;
-        int size;
-        int erased;
-        volatile unsigned long *flash;
+	int k;
+	int size;
+	int erased;
+	volatile unsigned long *flash;
 
 	if (info->flash_id == FLASH_UNKNOWN) {
 		printf ("missing or unknown FLASH type\n");
@@ -161,28 +161,28 @@
 	printf ("  Sector Start Addresses:");
 	for (i=0; i<info->sector_count; ++i) {
 #ifdef CFG_FLASH_EMPTY_INFO
-                /*
-                 * Check if whole sector is erased
-                 */
-                if (i != (info->sector_count-1))
-                  size = info->start[i+1] - info->start[i];
-                else
-                  size = info->start[0] + info->size - info->start[i];
-                erased = 1;
-                flash = (volatile unsigned long *)info->start[i];
-                size = size >> 2;        /* divide by 4 for longword access */
-                for (k=0; k<size; k++)
-                  {
-                    if (*flash++ != 0xffffffff)
-                      {
-                        erased = 0;
-                        break;
-                      }
-                  }
+		/*
+		 * Check if whole sector is erased
+		 */
+		if (i != (info->sector_count-1))
+		  size = info->start[i+1] - info->start[i];
+		else
+		  size = info->start[0] + info->size - info->start[i];
+		erased = 1;
+		flash = (volatile unsigned long *)info->start[i];
+		size = size >> 2;        /* divide by 4 for longword access */
+		for (k=0; k<size; k++)
+		  {
+		    if (*flash++ != 0xffffffff)
+		      {
+			erased = 0;
+			break;
+		      }
+		  }
 
 		if ((i % 5) == 0)
 			printf ("\n   ");
-                /* print empty and read-only info */
+		/* print empty and read-only info */
 		printf (" %08lX%s%s",
 			info->start[i],
 			erased ? " E" : "  ",
@@ -216,7 +216,7 @@
 	short n;
 	CFG_FLASH_WORD_SIZE value;
 	ulong base = (ulong)addr;
-        volatile CFG_FLASH_WORD_SIZE *addr2 = (CFG_FLASH_WORD_SIZE *)addr;
+	volatile CFG_FLASH_WORD_SIZE *addr2 = (CFG_FLASH_WORD_SIZE *)addr;
 
 	/* Write auto select command: read Manufacturer ID */
 	addr2[CFG_FLASH_ADDR0] = (CFG_FLASH_WORD_SIZE)0x00AA00AA;
@@ -282,37 +282,37 @@
 		break;				/* => 2 MB		*/
 
 	case (CFG_FLASH_WORD_SIZE)AMD_ID_LV320T:
-	        info->flash_id += FLASH_AM320T;
-	        info->sector_count = 71;
+		info->flash_id += FLASH_AM320T;
+		info->sector_count = 71;
 		info->size = 0x00400000;  break;	/* => 4 MB	*/
 
 	case (CFG_FLASH_WORD_SIZE)AMD_ID_LV320B:
-	        info->flash_id += FLASH_AM320B;
+		info->flash_id += FLASH_AM320B;
 		info->sector_count = 71;
 		info->size = 0x00400000;  break;	/* => 4 MB	*/
 
 	case (CFG_FLASH_WORD_SIZE)AMD_ID_DL322T:
-	        info->flash_id += FLASH_AMDL322T;
-	        info->sector_count = 71;
+		info->flash_id += FLASH_AMDL322T;
+		info->sector_count = 71;
 		info->size = 0x00400000;  break;	/* => 4 MB	*/
 
 	case (CFG_FLASH_WORD_SIZE)AMD_ID_DL322B:
-	        info->flash_id += FLASH_AMDL322B;
+		info->flash_id += FLASH_AMDL322B;
 		info->sector_count = 71;
 		info->size = 0x00400000;  break;	/* => 4 MB	*/
 
 	case (CFG_FLASH_WORD_SIZE)AMD_ID_DL323T:
-	        info->flash_id += FLASH_AMDL323T;
+		info->flash_id += FLASH_AMDL323T;
 		info->sector_count = 71;
 		info->size = 0x00400000;  break;	/* => 4 MB	*/
 
 	case (CFG_FLASH_WORD_SIZE)AMD_ID_DL323B:
-	        info->flash_id += FLASH_AMDL323B;
+		info->flash_id += FLASH_AMDL323B;
 		info->sector_count = 71;
 		info->size = 0x00400000;  break;	/* => 4 MB	*/
 
 	case (CFG_FLASH_WORD_SIZE)AMD_ID_LV640U:
-	        info->flash_id += FLASH_AM640U;
+		info->flash_id += FLASH_AM640U;
 		info->sector_count = 128;
 		info->size = 0x00800000;  break;	/* => 8 MB	*/
 
@@ -335,11 +335,11 @@
 	}
 
 	/* set up sector start address table */
-        if (((info->flash_id & FLASH_VENDMASK) == FLASH_MAN_SST) ||
+	if (((info->flash_id & FLASH_VENDMASK) == FLASH_MAN_SST) ||
 	    ((info->flash_id & FLASH_TYPEMASK) == FLASH_AM640U)) {
 	    for (i = 0; i < info->sector_count; i++)
 		info->start[i] = base + (i * 0x00010000);
-        } else if (((info->flash_id & FLASH_TYPEMASK) == FLASH_AMDL322B) ||
+	} else if (((info->flash_id & FLASH_TYPEMASK) == FLASH_AMDL322B) ||
 		   ((info->flash_id & FLASH_TYPEMASK) == FLASH_AMDL323B) ||
 		   ((info->flash_id & FLASH_TYPEMASK) == FLASH_AM320B) ||
 		   ((info->flash_id & FLASH_TYPEMASK) == FLASH_AMDL324B)) {
@@ -353,7 +353,7 @@
 			base += 64 << 10;
 			++i;
 		}
-        } else if (((info->flash_id & FLASH_TYPEMASK) == FLASH_AMDL322T) ||
+	} else if (((info->flash_id & FLASH_TYPEMASK) == FLASH_AMDL322T) ||
 		   ((info->flash_id & FLASH_TYPEMASK) == FLASH_AMDL323T) ||
 		   ((info->flash_id & FLASH_TYPEMASK) == FLASH_AM320T) ||
 		   ((info->flash_id & FLASH_TYPEMASK) == FLASH_AMDL324T)) {
@@ -370,7 +370,7 @@
 			--i;
 			info->start[i] = base;
 		}
-        } else {
+	} else {
 	    if (info->flash_id & FLASH_BTYPE) {
 		/* set sector offsets for bottom boot block type	*/
 		info->start[0] = base + 0x00000000;
@@ -397,10 +397,10 @@
 		/* read sector protection at sector address, (A7 .. A0) = 0x02 */
 		/* D0 = 1 if protected */
 		addr2 = (volatile CFG_FLASH_WORD_SIZE *)(info->start[i]);
-                if ((info->flash_id & FLASH_VENDMASK) == FLASH_MAN_SST)
-                  info->protect[i] = 0;
-                else
-                  info->protect[i] = addr2[CFG_FLASH_READ2] & 1;
+		if ((info->flash_id & FLASH_VENDMASK) == FLASH_MAN_SST)
+		  info->protect[i] = 0;
+		else
+		  info->protect[i] = addr2[CFG_FLASH_READ2] & 1;
 	}
 
 	/*
@@ -424,7 +424,7 @@
 	volatile CFG_FLASH_WORD_SIZE *addr2;
 	int flag, prot, sect, l_sect;
 	ulong start, now, last;
-        int i;
+	int i;
 
 	if ((s_first < 0) || (s_first > s_last)) {
 		if (info->flash_id == FLASH_UNKNOWN) {
@@ -463,25 +463,25 @@
 	for (sect = s_first; sect<=s_last; sect++) {
 		if (info->protect[sect] == 0) {	/* not protected */
 		    addr2 = (CFG_FLASH_WORD_SIZE *)(info->start[sect]);
-                    if ((info->flash_id & FLASH_VENDMASK) == FLASH_MAN_SST) {
-                        addr[CFG_FLASH_ADDR0] = (CFG_FLASH_WORD_SIZE)0x00AA00AA;
-                        addr[CFG_FLASH_ADDR1] = (CFG_FLASH_WORD_SIZE)0x00550055;
-                        addr[CFG_FLASH_ADDR0] = (CFG_FLASH_WORD_SIZE)0x00800080;
-                        addr[CFG_FLASH_ADDR0] = (CFG_FLASH_WORD_SIZE)0x00AA00AA;
-                        addr[CFG_FLASH_ADDR1] = (CFG_FLASH_WORD_SIZE)0x00550055;
-                        addr2[0] = (CFG_FLASH_WORD_SIZE)0x00500050;  /* block erase */
-                        for (i=0; i<50; i++)
-                          udelay(1000);  /* wait 1 ms */
-                    } else {
-                        if (sect == s_first) {
-                            addr[CFG_FLASH_ADDR0] = (CFG_FLASH_WORD_SIZE)0x00AA00AA;
-                            addr[CFG_FLASH_ADDR1] = (CFG_FLASH_WORD_SIZE)0x00550055;
-                            addr[CFG_FLASH_ADDR0] = (CFG_FLASH_WORD_SIZE)0x00800080;
-                            addr[CFG_FLASH_ADDR0] = (CFG_FLASH_WORD_SIZE)0x00AA00AA;
-                            addr[CFG_FLASH_ADDR1] = (CFG_FLASH_WORD_SIZE)0x00550055;
-                        }
-                        addr2[0] = (CFG_FLASH_WORD_SIZE)0x00300030;  /* sector erase */
-                    }
+		    if ((info->flash_id & FLASH_VENDMASK) == FLASH_MAN_SST) {
+			addr[CFG_FLASH_ADDR0] = (CFG_FLASH_WORD_SIZE)0x00AA00AA;
+			addr[CFG_FLASH_ADDR1] = (CFG_FLASH_WORD_SIZE)0x00550055;
+			addr[CFG_FLASH_ADDR0] = (CFG_FLASH_WORD_SIZE)0x00800080;
+			addr[CFG_FLASH_ADDR0] = (CFG_FLASH_WORD_SIZE)0x00AA00AA;
+			addr[CFG_FLASH_ADDR1] = (CFG_FLASH_WORD_SIZE)0x00550055;
+			addr2[0] = (CFG_FLASH_WORD_SIZE)0x00500050;  /* block erase */
+			for (i=0; i<50; i++)
+			  udelay(1000);  /* wait 1 ms */
+		    } else {
+			if (sect == s_first) {
+			    addr[CFG_FLASH_ADDR0] = (CFG_FLASH_WORD_SIZE)0x00AA00AA;
+			    addr[CFG_FLASH_ADDR1] = (CFG_FLASH_WORD_SIZE)0x00550055;
+			    addr[CFG_FLASH_ADDR0] = (CFG_FLASH_WORD_SIZE)0x00800080;
+			    addr[CFG_FLASH_ADDR0] = (CFG_FLASH_WORD_SIZE)0x00AA00AA;
+			    addr[CFG_FLASH_ADDR1] = (CFG_FLASH_WORD_SIZE)0x00550055;
+			}
+			addr2[0] = (CFG_FLASH_WORD_SIZE)0x00300030;  /* sector erase */
+		    }
 		    l_sect = sect;
 		}
 	}
@@ -602,42 +602,42 @@
  */
 static int write_word (flash_info_t *info, ulong dest, ulong data)
 {
-        volatile CFG_FLASH_WORD_SIZE *addr2 = (CFG_FLASH_WORD_SIZE *)(info->start[0]);
-        volatile CFG_FLASH_WORD_SIZE *dest2 = (CFG_FLASH_WORD_SIZE *)dest;
-        volatile CFG_FLASH_WORD_SIZE *data2 = (CFG_FLASH_WORD_SIZE *)&data;
+	volatile CFG_FLASH_WORD_SIZE *addr2 = (CFG_FLASH_WORD_SIZE *)(info->start[0]);
+	volatile CFG_FLASH_WORD_SIZE *dest2 = (CFG_FLASH_WORD_SIZE *)dest;
+	volatile CFG_FLASH_WORD_SIZE *data2 = (CFG_FLASH_WORD_SIZE *)&data;
 	ulong start;
 	int flag;
-        int i;
+	int i;
 
 	/* Check if Flash is (sufficiently) erased */
 	if ((*((volatile CFG_FLASH_WORD_SIZE *)dest) &
-             (CFG_FLASH_WORD_SIZE)data) != (CFG_FLASH_WORD_SIZE)data) {
+	     (CFG_FLASH_WORD_SIZE)data) != (CFG_FLASH_WORD_SIZE)data) {
 		return (2);
 	}
 	/* Disable interrupts which might cause a timeout here */
 	flag = disable_interrupts();
 
-        for (i=0; i<4/sizeof(CFG_FLASH_WORD_SIZE); i++)
-          {
-            addr2[CFG_FLASH_ADDR0] = (CFG_FLASH_WORD_SIZE)0x00AA00AA;
-            addr2[CFG_FLASH_ADDR1] = (CFG_FLASH_WORD_SIZE)0x00550055;
-            addr2[CFG_FLASH_ADDR0] = (CFG_FLASH_WORD_SIZE)0x00A000A0;
+	for (i=0; i<4/sizeof(CFG_FLASH_WORD_SIZE); i++)
+	  {
+	    addr2[CFG_FLASH_ADDR0] = (CFG_FLASH_WORD_SIZE)0x00AA00AA;
+	    addr2[CFG_FLASH_ADDR1] = (CFG_FLASH_WORD_SIZE)0x00550055;
+	    addr2[CFG_FLASH_ADDR0] = (CFG_FLASH_WORD_SIZE)0x00A000A0;
 
-            dest2[i] = data2[i];
+	    dest2[i] = data2[i];
 
-            /* re-enable interrupts if necessary */
-            if (flag)
-              enable_interrupts();
+	    /* re-enable interrupts if necessary */
+	    if (flag)
+	      enable_interrupts();
 
-            /* data polling for D7 */
-            start = get_timer (0);
-            while ((dest2[i] & (CFG_FLASH_WORD_SIZE)0x00800080) !=
-                   (data2[i] & (CFG_FLASH_WORD_SIZE)0x00800080)) {
-              if (get_timer(start) > CFG_FLASH_WRITE_TOUT) {
-                return (1);
-              }
-            }
-          }
+	    /* data polling for D7 */
+	    start = get_timer (0);
+	    while ((dest2[i] & (CFG_FLASH_WORD_SIZE)0x00800080) !=
+		   (data2[i] & (CFG_FLASH_WORD_SIZE)0x00800080)) {
+	      if (get_timer(start) > CFG_FLASH_WRITE_TOUT) {
+		return (1);
+	      }
+	    }
+	  }
 
 	return (0);
 }

diff --git a/board/esd/common/fpga.c b/board/esd/common/fpga.c
index 50bce2e..f27943f 100644
--- a/board/esd/common/fpga.c
+++ b/board/esd/common/fpga.c

@@ -57,16 +57,16 @@
 #define SET_FPGA(data)         out32(GPIO0_OR, data)
 
 #define FPGA_WRITE_1 {                                                    \
-        SET_FPGA(FPGA_PRG |            FPGA_DATA);  /* set clock to 0 */  \
-        SET_FPGA(FPGA_PRG |            FPGA_DATA);  /* set data to 1  */  \
-        SET_FPGA(FPGA_PRG | FPGA_CLK | FPGA_DATA);  /* set clock to 1 */  \
-        SET_FPGA(FPGA_PRG | FPGA_CLK | FPGA_DATA);} /* set data to 1  */
+	SET_FPGA(FPGA_PRG |            FPGA_DATA);  /* set clock to 0 */  \
+	SET_FPGA(FPGA_PRG |            FPGA_DATA);  /* set data to 1  */  \
+	SET_FPGA(FPGA_PRG | FPGA_CLK | FPGA_DATA);  /* set clock to 1 */  \
+	SET_FPGA(FPGA_PRG | FPGA_CLK | FPGA_DATA);} /* set data to 1  */
 
 #define FPGA_WRITE_0 {                                                    \
-        SET_FPGA(FPGA_PRG |            FPGA_DATA);  /* set clock to 0 */  \
-        SET_FPGA(FPGA_PRG);                         /* set data to 0  */  \
-        SET_FPGA(FPGA_PRG | FPGA_CLK);              /* set clock to 1 */  \
-        SET_FPGA(FPGA_PRG | FPGA_CLK | FPGA_DATA);} /* set data to 1  */
+	SET_FPGA(FPGA_PRG |            FPGA_DATA);  /* set clock to 0 */  \
+	SET_FPGA(FPGA_PRG);                         /* set data to 0  */  \
+	SET_FPGA(FPGA_PRG | FPGA_CLK);              /* set clock to 1 */  \
+	SET_FPGA(FPGA_PRG | FPGA_CLK | FPGA_DATA);} /* set data to 1  */
 
 
 static int fpga_boot(unsigned char *fpgadata, int size)
@@ -94,10 +94,10 @@
   while (1)
     {
       if ((fpgadata[index] == 0xff) && (fpgadata[index+1] == 0xff) &&
-          (fpgadata[index+2] == 0xff) && (fpgadata[index+3] == 0xff))
-        break; /* preamble found */
+	  (fpgadata[index+2] == 0xff) && (fpgadata[index+3] == 0xff))
+	break; /* preamble found */
       else
-        index++;
+	index++;
     }
 #else
   /* search for preamble 0xFF2X */
@@ -134,10 +134,10 @@
       udelay(1000); /* wait 1ms */
       /* Check for timeout - 100us max, so use 3ms */
       if (count++ > 3)
-        {
-          DBG("FPGA: Booting failed!\n");
-          return ERROR_FPGA_PRG_INIT_LOW;
-        }
+	{
+	  DBG("FPGA: Booting failed!\n");
+	  return ERROR_FPGA_PRG_INIT_LOW;
+	}
     }
 
   DBG("%s, ",((in32(GPIO0_IR) & FPGA_DONE) == 0) ? "NOT DONE" : "DONE" );
@@ -153,10 +153,10 @@
       udelay(1000); /* wait 1ms */
       /* Check for timeout */
       if (count++ > 3)
-        {
-          DBG("FPGA: Booting failed!\n");
-          return ERROR_FPGA_PRG_INIT_HIGH;
-        }
+	{
+	  DBG("FPGA: Booting failed!\n");
+	  return ERROR_FPGA_PRG_INIT_HIGH;
+	}
     }
 
   DBG("%s, ",((in32(GPIO0_IR) & FPGA_DONE) == 0) ? "NOT DONE" : "DONE" );
@@ -172,17 +172,17 @@
   for (i=index; i<size; i++)
     {
       for (j=0; j<8; j++)
-        {
-          if ((fpgadata[i] & 0x80) == 0x80)
+	{
+	  if ((fpgadata[i] & 0x80) == 0x80)
 	    {
-              FPGA_WRITE_1;
+	      FPGA_WRITE_1;
 	    }
-          else
+	  else
 	    {
-              FPGA_WRITE_0;
+	      FPGA_WRITE_0;
 	    }
-          fpgadata[i] <<= 1;
-        }
+	  fpgadata[i] <<= 1;
+	}
     }
 #else
   /* send 0xff 0x20 */
@@ -205,30 +205,30 @@
       if ((b >= 1) && (b <= MAX_ONES))
 	{
 	  for(bit=0; bit<b; bit++)
-            {
-              FPGA_WRITE_1;
-            }
+	    {
+	      FPGA_WRITE_1;
+	    }
 	  FPGA_WRITE_0;
 	}
       else if (b == (MAX_ONES+1))
 	{
 	  for(bit=1; bit<b; bit++)
-            {
-              FPGA_WRITE_1;
-            }
+	    {
+	      FPGA_WRITE_1;
+	    }
 	}
       else if ((b >= (MAX_ONES+2)) && (b <= 254))
 	{
 	  for(bit=0; bit<(b-(MAX_ONES+2)); bit++)
-            {
-              FPGA_WRITE_0;
-            }
-          FPGA_WRITE_1;
+	    {
+	      FPGA_WRITE_0;
+	    }
+	  FPGA_WRITE_1;
 	}
       else if (b == 255)
-        {
-          FPGA_WRITE_1;
-        }
+	{
+	  FPGA_WRITE_1;
+	}
     }
 #endif
 
@@ -246,10 +246,10 @@
       udelay(1000); /* wait 1ms */
       /* Check for timeout */
       if (count++ > 3)
-        {
-          DBG("FPGA: Booting failed!\n");
-          return ERROR_FPGA_PRG_DONE;
-        }
+	{
+	  DBG("FPGA: Booting failed!\n");
+	  return ERROR_FPGA_PRG_DONE;
+	}
     }
 
   DBG("FPGA: Booting successful!\n");

diff --git a/board/esd/cpci405/Makefile b/board/esd/cpci405/Makefile
index 39d2fec..f5bda55 100644
--- a/board/esd/cpci405/Makefile
+++ b/board/esd/cpci405/Makefile

@@ -28,7 +28,7 @@
 OBJS	= $(BOARD).o flash.o
 
 $(LIB):	$(OBJS) $(SOBJS)
-	$(AR) crv $@ $^
+	$(AR) crv $@ $(OBJS)
 
 clean:
 	rm -f $(SOBJS) $(OBJS)

diff --git a/board/esd/cpci405/cpci405.c b/board/esd/cpci405/cpci405.c
index 5a6a27c..3f0ef1e 100644
--- a/board/esd/cpci405/cpci405.c
+++ b/board/esd/cpci405/cpci405.c

@@ -24,11 +24,10 @@
 #include <common.h>
 #include <asm/processor.h>
 #include <command.h>
-#include <cmd_boot.h>
 #include <malloc.h>
 
 /* ------------------------------------------------------------------------- */
-
+extern int do_reset (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[]);       /*cmd_boot.c*/
 #if 0
 #define FPGA_DEBUG
 #endif

diff --git a/board/esd/cpci405/u-boot.lds b/board/esd/cpci405/u-boot.lds
index 97851f1..311a5fe 100644
--- a/board/esd/cpci405/u-boot.lds
+++ b/board/esd/cpci405/u-boot.lds

@@ -119,6 +119,11 @@
   _edata  =  .;
   PROVIDE (edata = .);
 
+  __u_boot_cmd_start = .;
+  .u_boot_cmd : { *(.u_boot_cmd) }
+  __u_boot_cmd_end = .;
+
+
   __start___ex_table = .;
   __ex_table : { *(__ex_table) }
   __stop___ex_table = .;

diff --git a/board/esd/cpci440/Makefile b/board/esd/cpci440/Makefile
index 4e1f701..f706ebc 100644
--- a/board/esd/cpci440/Makefile
+++ b/board/esd/cpci440/Makefile

@@ -29,7 +29,7 @@
 SOBJS	= init.o
 
 $(LIB):	$(OBJS) $(SOBJS)
-	$(AR) crv $@ $^
+	$(AR) crv $@ $(OBJS)
 
 clean:
 	rm -f $(SOBJS) $(OBJS)

diff --git a/board/esd/cpci440/cpci440.c b/board/esd/cpci440/cpci440.c
index 51a5edd..66cfe06 100644
--- a/board/esd/cpci440/cpci440.c
+++ b/board/esd/cpci440/cpci440.c

@@ -66,7 +66,6 @@
 }
 
 
-
 int checkboard (void)
 {
 	sys_info_t sysinfo;

diff --git a/board/esd/cpci440/init.S b/board/esd/cpci440/init.S
index 2dab9f9..82f37fd 100644
--- a/board/esd/cpci440/init.S
+++ b/board/esd/cpci440/init.S

@@ -92,5 +92,3 @@
     tlbentry( CFG_ISRAM_BASE + 0x1000, SZ_4K, 0x80001000, 0, AC_R|AC_W|AC_X )
     tlbentry( CFG_SDRAM_BASE, SZ_256M, 0x00000000, 0, AC_R|AC_W|AC_X )
     tlbtab_end
-
-

diff --git a/board/esd/cpci440/strataflash.c b/board/esd/cpci440/strataflash.c
index de57318..2f055c2 100644
--- a/board/esd/cpci440/strataflash.c
+++ b/board/esd/cpci440/strataflash.c

@@ -89,8 +89,6 @@
 #define FLASH_MAN_CFI			0x01000000
 
 
-
-
 typedef union {
 	unsigned char c;
 	unsigned short w;
@@ -113,7 +111,6 @@
  */
 
 
-
 static void flash_add_byte(flash_info_t *info, cfiword_t * cword, uchar c);
 static void flash_make_cmd(flash_info_t * info, uchar cmd, void * cmdbuf);
 static void flash_write_cmd(flash_info_t * info, int sect, uchar offset, uchar cmd);

diff --git a/board/esd/cpci440/u-boot.lds b/board/esd/cpci440/u-boot.lds
index 35d9931..46ccf31 100644
--- a/board/esd/cpci440/u-boot.lds
+++ b/board/esd/cpci440/u-boot.lds

@@ -126,6 +126,11 @@
   _edata  =  .;
   PROVIDE (edata = .);
 
+  __u_boot_cmd_start = .;
+  .u_boot_cmd : { *(.u_boot_cmd) }
+  __u_boot_cmd_end = .;
+
+
   __start___ex_table = .;
   __ex_table : { *(__ex_table) }
   __stop___ex_table = .;

diff --git a/board/esd/cpciiser4/Makefile b/board/esd/cpciiser4/Makefile
index 39d2fec..f5bda55 100644
--- a/board/esd/cpciiser4/Makefile
+++ b/board/esd/cpciiser4/Makefile

@@ -28,7 +28,7 @@
 OBJS	= $(BOARD).o flash.o
 
 $(LIB):	$(OBJS) $(SOBJS)
-	$(AR) crv $@ $^
+	$(AR) crv $@ $(OBJS)
 
 clean:
 	rm -f $(SOBJS) $(OBJS)

diff --git a/board/esd/cpciiser4/cpciiser4.c b/board/esd/cpciiser4/cpciiser4.c
index 2e10412..725abe9 100644
--- a/board/esd/cpciiser4/cpciiser4.c
+++ b/board/esd/cpciiser4/cpciiser4.c

@@ -25,7 +25,11 @@
 #include "cpciiser4.h"
 #include <asm/processor.h>
 #include <command.h>
-#include <cmd_boot.h>
+
+/*cmd_boot.c*/
+
+extern int do_reset (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[]);
+
 
 /* ------------------------------------------------------------------------- */
 

diff --git a/board/esd/cpciiser4/flash.c b/board/esd/cpciiser4/flash.c
index 685850e..de847f9 100644
--- a/board/esd/cpciiser4/flash.c
+++ b/board/esd/cpciiser4/flash.c

@@ -43,8 +43,8 @@
 {
 	unsigned long size_b0;
 	int i;
-        uint pbcr;
-        unsigned long base_b0;
+	uint pbcr;
+	unsigned long base_b0;
 
 	/* Init: no FLASHes known */
 	for (i=0; i<CFG_MAX_FLASH_BANKS; ++i) {
@@ -60,25 +60,25 @@
 			size_b0, size_b0<<20);
 	}
 
-        /* Setup offsets */
-        flash_get_offsets (-size_b0, &flash_info[0]);
+	/* Setup offsets */
+	flash_get_offsets (-size_b0, &flash_info[0]);
 
-        /* Re-do sizing to get full correct info */
-        mtdcr(ebccfga, pb0cr);
-        pbcr = mfdcr(ebccfgd);
-        mtdcr(ebccfga, pb0cr);
-        base_b0 = -size_b0;
-        pbcr = (pbcr & 0x0001ffff) | base_b0 | (((size_b0/1024/1024)-1)<<17);
-        mtdcr(ebccfgd, pbcr);
-        /*          printf("pb1cr = %x\n", pbcr); */
+	/* Re-do sizing to get full correct info */
+	mtdcr(ebccfga, pb0cr);
+	pbcr = mfdcr(ebccfgd);
+	mtdcr(ebccfga, pb0cr);
+	base_b0 = -size_b0;
+	pbcr = (pbcr & 0x0001ffff) | base_b0 | (((size_b0/1024/1024)-1)<<17);
+	mtdcr(ebccfgd, pbcr);
+	/*          printf("pb1cr = %x\n", pbcr); */
 
-        /* Monitor protection ON by default */
-        (void)flash_protect(FLAG_PROTECT_SET,
-                            -monitor_flash_len,
-                            0xffffffff,
-                            &flash_info[0]);
+	/* Monitor protection ON by default */
+	(void)flash_protect(FLAG_PROTECT_SET,
+			    -monitor_flash_len,
+			    0xffffffff,
+			    &flash_info[0]);
 
-        flash_info[0].size = size_b0;
+	flash_info[0].size = size_b0;
 
 	return (size_b0);
 }

diff --git a/board/esd/cpciiser4/u-boot.lds b/board/esd/cpciiser4/u-boot.lds
index 97851f1..311a5fe 100644
--- a/board/esd/cpciiser4/u-boot.lds
+++ b/board/esd/cpciiser4/u-boot.lds

@@ -119,6 +119,11 @@
   _edata  =  .;
   PROVIDE (edata = .);
 
+  __u_boot_cmd_start = .;
+  .u_boot_cmd : { *(.u_boot_cmd) }
+  __u_boot_cmd_end = .;
+
+
   __start___ex_table = .;
   __ex_table : { *(__ex_table) }
   __stop___ex_table = .;

diff --git a/board/esd/dasa_sim/Makefile b/board/esd/dasa_sim/Makefile
index 29aaf3b..e3b1c87 100644
--- a/board/esd/dasa_sim/Makefile
+++ b/board/esd/dasa_sim/Makefile

@@ -1,3 +1,4 @@
+
 #
 # (C) Copyright 2000
 # Wolfgang Denk, DENX Software Engineering, wd@denx.de.
@@ -28,7 +29,7 @@
 OBJS	= $(BOARD).o flash.o cmd_dasa_sim.o eeprom.o ../common/pci.o
 
 $(LIB):	$(OBJS)
-	$(AR) crv $@ $^
+	$(AR) crv $@ $(OBJS)
 
 clean:
 	rm -f $(SOBJS) $(OBJS)

diff --git a/board/esd/dasa_sim/cmd_dasa_sim.c b/board/esd/dasa_sim/cmd_dasa_sim.c
index 4608da7..0ebe09e 100644
--- a/board/esd/dasa_sim/cmd_dasa_sim.c
+++ b/board/esd/dasa_sim/cmd_dasa_sim.c

@@ -42,195 +42,194 @@
  *
  */
 
-static unsigned int PciEepromReadLongVPD(int offs)
+static unsigned int PciEepromReadLongVPD (int offs)
 {
-  unsigned int value;
-  unsigned int ret;
-  int count;
+	unsigned int value;
+	unsigned int ret;
+	int count;
 
-  pci_write_config_dword(CFG_PCI9054_DEV_FN, 0x4c, (offs<<16) | 0x0003);
-  count = 0;
+	pci_write_config_dword (CFG_PCI9054_DEV_FN, 0x4c,
+				(offs << 16) | 0x0003);
+	count = 0;
 
-  for (;;)
-    {
-      udelay(10 * 1000);
-      pci_read_config_dword(CFG_PCI9054_DEV_FN, 0x4c, &ret);
-      if ((ret & 0x80000000) != 0)
-        {
-          break;
-        }
-      else
-        {
-          count++;
-          if (count > 10)
-            {
-              printf("\nTimeout: ret=%08x - Please try again!\n", ret);
-              break;
-            }
-        }
-    }
+	for (;;) {
+		udelay (10 * 1000);
+		pci_read_config_dword (CFG_PCI9054_DEV_FN, 0x4c, &ret);
+		if ((ret & 0x80000000) != 0) {
+			break;
+		} else {
+			count++;
+			if (count > 10) {
+				printf ("\nTimeout: ret=%08x - Please try again!\n", ret);
+				break;
+			}
+		}
+	}
 
-  pci_read_config_dword(CFG_PCI9054_DEV_FN, 0x50, &value);
+	pci_read_config_dword (CFG_PCI9054_DEV_FN, 0x50, &value);
 
-  return value;
+	return value;
 }
 
 
-static int PciEepromWriteLongVPD(int offs, unsigned int value)
+static int PciEepromWriteLongVPD (int offs, unsigned int value)
 {
-  unsigned int ret;
-  int count;
+	unsigned int ret;
+	int count;
 
-  pci_write_config_dword(CFG_PCI9054_DEV_FN, 0x50, value);
-  pci_write_config_dword(CFG_PCI9054_DEV_FN, 0x4c, (offs<<16) | 0x80000003);
-  count = 0;
+	pci_write_config_dword (CFG_PCI9054_DEV_FN, 0x50, value);
+	pci_write_config_dword (CFG_PCI9054_DEV_FN, 0x4c,
+				(offs << 16) | 0x80000003);
+	count = 0;
 
-  for (;;)
-    {
-      udelay(10 * 1000);
-      pci_read_config_dword(CFG_PCI9054_DEV_FN, 0x4c, &ret);
-      if ((ret & 0x80000000) == 0)
-        {
-          break;
-        }
-      else
-        {
-          count++;
-          if (count > 10)
-            {
-              printf("\nTimeout: ret=%08x - Please try again!\n", ret);
-              break;
-            }
-        }
-    }
+	for (;;) {
+		udelay (10 * 1000);
+		pci_read_config_dword (CFG_PCI9054_DEV_FN, 0x4c, &ret);
+		if ((ret & 0x80000000) == 0) {
+			break;
+		} else {
+			count++;
+			if (count > 10) {
+				printf ("\nTimeout: ret=%08x - Please try again!\n", ret);
+				break;
+			}
+		}
+	}
 
-  return TRUE;
+	return TRUE;
 }
 
 
-static void showPci9054(void)
+static void showPci9054 (void)
 {
-  int val;
-  int l, i;
+	int val;
+	int l, i;
 
-  /* read 9054-values */
-  for (l=0; l<6; l++)
-    {
-      printf("%02x: ", l*0x10);
-      for (i=0; i<4; i++)
-        {
-	  pci_read_config_dword(CFG_PCI9054_DEV_FN, l*16+i*4, &val);
-          printf("%08x ", val);
-        }
-      printf("\n");
-    }
-  printf("\n");
+	/* read 9054-values */
+	for (l = 0; l < 6; l++) {
+		printf ("%02x: ", l * 0x10);
+		for (i = 0; i < 4; i++) {
+			pci_read_config_dword (CFG_PCI9054_DEV_FN,
+						l * 16 + i * 4,
+						&val);
+			printf ("%08x ", val);
+		}
+		printf ("\n");
+	}
+	printf ("\n");
 
-  for (l=0; l<7; l++)
-    {
-      printf("%02x: ", l*0x10);
-      for (i=0; i<4; i++)
-        printf("%08x ", PciEepromReadLongVPD((i+l*4)*4));
-      printf("\n");
-    }
-  printf("\n");
+	for (l = 0; l < 7; l++) {
+		printf ("%02x: ", l * 0x10);
+		for (i = 0; i < 4; i++)
+			printf ("%08x ",
+				PciEepromReadLongVPD ((i + l * 4) * 4));
+		printf ("\n");
+	}
+	printf ("\n");
 }
 
 
-static void updatePci9054(void)
+static void updatePci9054 (void)
 {
-  int val;
+	int val;
 
-  /*
-   * Set EEPROM write-protect register to 0
-   */
-  out32(pci9054_iobase+0x0c, in32(pci9054_iobase+0x0c) & 0xffff00ff);
+	/*
+	 * Set EEPROM write-protect register to 0
+	 */
+	out32 (pci9054_iobase + 0x0c,
+		   in32 (pci9054_iobase + 0x0c) & 0xffff00ff);
 
-  /* Long Serial EEPROM Load Registers... */
-  val = PciEepromWriteLongVPD(0x00, 0x905410b5);
-  val = PciEepromWriteLongVPD(0x04, 0x09800001); /* other input controller */
-  val = PciEepromWriteLongVPD(0x08, 0x28140100);
+	/* Long Serial EEPROM Load Registers... */
+	val = PciEepromWriteLongVPD (0x00, 0x905410b5);
+	val = PciEepromWriteLongVPD (0x04, 0x09800001);	/* other input controller */
+	val = PciEepromWriteLongVPD (0x08, 0x28140100);
 
-  val = PciEepromWriteLongVPD(0x0c, 0x00000000); /* MBOX0... */
-  val = PciEepromWriteLongVPD(0x10, 0x00000000);
+	val = PciEepromWriteLongVPD (0x0c, 0x00000000);	/* MBOX0... */
+	val = PciEepromWriteLongVPD (0x10, 0x00000000);
 
-  /* las0: fpga access (0x0000.0000 ... 0x0003.ffff) */
-  val = PciEepromWriteLongVPD(0x14, 0xfffc0000); /* LAS0RR... */
-  val = PciEepromWriteLongVPD(0x18, 0x00000001); /* LAS0BA */
+	/* las0: fpga access (0x0000.0000 ... 0x0003.ffff) */
+	val = PciEepromWriteLongVPD (0x14, 0xfffc0000);	/* LAS0RR... */
+	val = PciEepromWriteLongVPD (0x18, 0x00000001);	/* LAS0BA */
 
-  val = PciEepromWriteLongVPD(0x1c, 0x00200000); /* MARBR... */
-  val = PciEepromWriteLongVPD(0x20, 0x00300500); /* LMISC/BIGEND */
+	val = PciEepromWriteLongVPD (0x1c, 0x00200000);	/* MARBR... */
+	val = PciEepromWriteLongVPD (0x20, 0x00300500);	/* LMISC/BIGEND */
 
-  val = PciEepromWriteLongVPD(0x24, 0x00000000); /* EROMRR... */
-  val = PciEepromWriteLongVPD(0x28, 0x00000000); /* EROMBA */
+	val = PciEepromWriteLongVPD (0x24, 0x00000000);	/* EROMRR... */
+	val = PciEepromWriteLongVPD (0x28, 0x00000000);	/* EROMBA */
 
-  val = PciEepromWriteLongVPD(0x2c, 0x43030000); /* LBRD0... */
+	val = PciEepromWriteLongVPD (0x2c, 0x43030000);	/* LBRD0... */
 
-  val = PciEepromWriteLongVPD(0x30, 0x00000000); /* DMRR... */
-  val = PciEepromWriteLongVPD(0x34, 0x00000000);
-  val = PciEepromWriteLongVPD(0x38, 0x00000000);
+	val = PciEepromWriteLongVPD (0x30, 0x00000000);	/* DMRR... */
+	val = PciEepromWriteLongVPD (0x34, 0x00000000);
+	val = PciEepromWriteLongVPD (0x38, 0x00000000);
 
-  val = PciEepromWriteLongVPD(0x3c, 0x00000000); /* DMPBAM... */
-  val = PciEepromWriteLongVPD(0x40, 0x00000000);
+	val = PciEepromWriteLongVPD (0x3c, 0x00000000);	/* DMPBAM... */
+	val = PciEepromWriteLongVPD (0x40, 0x00000000);
 
-  /* Extra Long Serial EEPROM Load Registers... */
-  val = PciEepromWriteLongVPD(0x44, 0x010212fe); /* PCISID... */
+	/* Extra Long Serial EEPROM Load Registers... */
+	val = PciEepromWriteLongVPD (0x44, 0x010212fe);	/* PCISID... */
 
-  /* las1: 505-sram access (0x0004.0000 ... 0x001f.ffff) */
-  /* Offset to LAS1: Group 1: 0x00040000                 */
-  /*                 Group 2: 0x00080000                 */
-  /*                 Group 3: 0x000c0000                 */
-  val = PciEepromWriteLongVPD(0x48, 0xffe00000); /* LAS1RR */
-  val = PciEepromWriteLongVPD(0x4c, 0x00040001); /* LAS1BA */
-  val = PciEepromWriteLongVPD(0x50, 0x00000208); /* LBRD1 */ /* so wars bisher */
+	/* las1: 505-sram access (0x0004.0000 ... 0x001f.ffff) */
+	/* Offset to LAS1: Group 1: 0x00040000                 */
+	/*                 Group 2: 0x00080000                 */
+	/*                 Group 3: 0x000c0000                 */
+	val = PciEepromWriteLongVPD (0x48, 0xffe00000);	/* LAS1RR */
+	val = PciEepromWriteLongVPD (0x4c, 0x00040001);	/* LAS1BA */
+	val = PciEepromWriteLongVPD (0x50, 0x00000208);	/* LBRD1 */ /* so wars bisher */
 
-  val = PciEepromWriteLongVPD(0x54, 0x00004c06); /* HotSwap... */
+	val = PciEepromWriteLongVPD (0x54, 0x00004c06);	/* HotSwap... */
 
-  printf("Finished writing defaults into PLX PCI9054 EEPROM!\n");
+	printf ("Finished writing defaults into PLX PCI9054 EEPROM!\n");
 }
 
 
-static void clearPci9054(void)
+static void clearPci9054 (void)
 {
-  int val;
+	int val;
 
-  /*
-   * Set EEPROM write-protect register to 0
-   */
-  out32(pci9054_iobase+0x0c, in32(pci9054_iobase+0x0c) & 0xffff00ff);
+	/*
+	 * Set EEPROM write-protect register to 0
+	 */
+	out32 (pci9054_iobase + 0x0c,
+		in32 (pci9054_iobase + 0x0c) & 0xffff00ff);
 
-  /* Long Serial EEPROM Load Registers... */
-  val = PciEepromWriteLongVPD(0x00, 0xffffffff);
-  val = PciEepromWriteLongVPD(0x04, 0xffffffff); /* other input controller */
+	/* Long Serial EEPROM Load Registers... */
+	val = PciEepromWriteLongVPD (0x00, 0xffffffff);
+	val = PciEepromWriteLongVPD (0x04, 0xffffffff);	/* other input controller */
 
-  printf("Finished clearing PLX PCI9054 EEPROM!\n");
+	printf ("Finished clearing PLX PCI9054 EEPROM!\n");
 }
 
 
 /* ------------------------------------------------------------------------- */
-int do_pci9054(cmd_tbl_t *cmdtp, bd_t *bd, int flag, int argc, char *argv[])
+int do_pci9054 (cmd_tbl_t * cmdtp, int flag, int argc,
+				char *argv[])
 {
-  if (strcmp(argv[1], "info") == 0)
-    {
-      showPci9054();
-      return 0;
-    }
+	if (strcmp (argv[1], "info") == 0) {
+		showPci9054 ();
+		return 0;
+	}
 
-  if (strcmp(argv[1], "update") == 0)
-    {
-      updatePci9054();
-      return 0;
-    }
+	if (strcmp (argv[1], "update") == 0) {
+		updatePci9054 ();
+		return 0;
+	}
 
-  if (strcmp(argv[1], "clear") == 0)
-    {
-      clearPci9054();
-      return 0;
-    }
+	if (strcmp (argv[1], "clear") == 0) {
+		clearPci9054 ();
+		return 0;
+	}
 
-  printf("Usage:\n%s\n", cmdtp->usage);
-  return 1;
+	printf ("Usage:\n%s\n", cmdtp->usage);
+	return 1;
 
 }
 
+cmd_tbl_t U_BOOT_CMD (pci9054) = MK_CMD_ENTRY(
+	"pci9054", 3, 1, do_pci9054,
+	"pci9054 - PLX PCI9054 EEPROM access\n",
+	"pci9054 info - print EEPROM values\n"
+	"pci9054 update - updates EEPROM with default values\n"
+);
+
 /* ------------------------------------------------------------------------- */

diff --git a/board/esd/dasa_sim/eeprom.c b/board/esd/dasa_sim/eeprom.c
index 59ef1d6..1b4c7b3 100644
--- a/board/esd/dasa_sim/eeprom.c
+++ b/board/esd/dasa_sim/eeprom.c

@@ -46,7 +46,7 @@
       ret = *(unsigned short *)EEPROM_CAP;
 
       if ((ret & 0x8000) != 0)
-        break;
+	break;
     }
 
   value = *(unsigned long *)EEPROM_DATA;
@@ -83,7 +83,7 @@
       ret = *(unsigned short *)EEPROM_CAP;
 
       if ((ret & 0x8000) == 0)
-        break;
+	break;
     }
 }
 
@@ -107,7 +107,7 @@
   int i;
   int len2, ptr;
 
-  /*  printf("\naddr=%x alen=%x buffer=%x len=%x", addr[0], addr[1], *(short *)addr, alen, buffer, len); // test-only */
+  /*  printf("\naddr=%x alen=%x buffer=%x len=%x", addr[0], addr[1], *(short *)addr, alen, buffer, len); /###* test-only */
 
   ptr = *(short *)addr;
 
@@ -146,7 +146,7 @@
   int i;
   int len2, ptr;
 
-  /*  printf("\naddr=%x alen=%x buffer=%x len=%x", addr[0], addr[1], *(short *)addr, alen, buffer, len); // test-only */
+  /*  printf("\naddr=%x alen=%x buffer=%x len=%x", addr[0], addr[1], *(short *)addr, alen, buffer, len); /###* test-only */
 
   ptr = *(short *)addr;
 

diff --git a/board/esd/dasa_sim/flash.c b/board/esd/dasa_sim/flash.c
index 32cd64c..d2ac13f 100644
--- a/board/esd/dasa_sim/flash.c
+++ b/board/esd/dasa_sim/flash.c

@@ -43,8 +43,8 @@
 unsigned long flash_init (void)
 {
 	unsigned long size_b0;
-        int i;
-        unsigned long base_b0;
+	int i;
+	unsigned long base_b0;
 
 	/* Init: no FLASHes known */
 	for (i=0; i<CFG_MAX_FLASH_BANKS; ++i) {
@@ -60,18 +60,18 @@
 			size_b0, size_b0<<20);
 	}
 
-        /* Setup offsets */
-        flash_get_offsets (-size_b0, &flash_info[0]);
+	/* Setup offsets */
+	flash_get_offsets (-size_b0, &flash_info[0]);
 
-        base_b0 = -size_b0;
+	base_b0 = -size_b0;
 
-        /* Monitor protection ON by default */
-        (void)flash_protect(FLAG_PROTECT_SET,
-                            -monitor_flash_len,
-                            0xffffffff,
-                            &flash_info[0]);
+	/* Monitor protection ON by default */
+	(void)flash_protect(FLAG_PROTECT_SET,
+			    -monitor_flash_len,
+			    0xffffffff,
+			    &flash_info[0]);
 
-        flash_info[0].size = size_b0;
+	flash_info[0].size = size_b0;
 
 	return (size_b0);
 }

diff --git a/board/esd/dasa_sim/u-boot.lds b/board/esd/dasa_sim/u-boot.lds
index 03c0cef..5e7b225 100644
--- a/board/esd/dasa_sim/u-boot.lds
+++ b/board/esd/dasa_sim/u-boot.lds

@@ -133,6 +133,11 @@
   _edata  =  .;
   PROVIDE (edata = .);
 
+  __u_boot_cmd_start = .;
+  .u_boot_cmd : { *(.u_boot_cmd) }
+  __u_boot_cmd_end = .;
+
+
   __start___ex_table = .;
   __ex_table : { *(__ex_table) }
   __stop___ex_table = .;

diff --git a/board/esd/du405/Makefile b/board/esd/du405/Makefile
index 1123673..e6d7dd0 100644
--- a/board/esd/du405/Makefile
+++ b/board/esd/du405/Makefile

@@ -28,7 +28,7 @@
 OBJS	= $(BOARD).o flash.o
 
 $(LIB):	$(OBJS) $(SOBJS)
-	$(AR) crv $@ $^
+	$(AR) crv $@ $(OBJS)
 
 clean:
 	rm -f $(SOBJS) $(OBJS)

diff --git a/board/esd/du405/du405.c b/board/esd/du405/du405.c
index 184cda8..7b430ea 100644
--- a/board/esd/du405/du405.c
+++ b/board/esd/du405/du405.c

@@ -27,7 +27,10 @@
 #include <ppc4xx.h>
 #include <405gp_i2c.h>
 #include <command.h>
-#include <cmd_boot.h>
+
+/*cmd_boot.c*/
+
+extern int do_reset (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[]);
 
 /* ------------------------------------------------------------------------- */
 

diff --git a/board/esd/du405/u-boot.lds b/board/esd/du405/u-boot.lds
index 463e388..b1793a2 100644
--- a/board/esd/du405/u-boot.lds
+++ b/board/esd/du405/u-boot.lds

@@ -119,6 +119,11 @@
   _edata  =  .;
   PROVIDE (edata = .);
 
+  __u_boot_cmd_start = .;
+  .u_boot_cmd : { *(.u_boot_cmd) }
+  __u_boot_cmd_end = .;
+
+
   __start___ex_table = .;
   __ex_table : { *(__ex_table) }
   __stop___ex_table = .;

diff --git a/board/esd/ocrtc/Makefile b/board/esd/ocrtc/Makefile
index 45d3d8d..b059f73 100644
--- a/board/esd/ocrtc/Makefile
+++ b/board/esd/ocrtc/Makefile

@@ -28,7 +28,7 @@
 OBJS	= $(BOARD).o flash.o
 
 $(LIB):	$(OBJS) $(SOBJS)
-	$(AR) crv $@ $^
+	$(AR) crv $@ $(OBJS)
 
 clean:
 	rm -f $(SOBJS) $(OBJS)

diff --git a/board/esd/ocrtc/ocrtc.c b/board/esd/ocrtc/ocrtc.c
index 3c3d56e..0600273 100644
--- a/board/esd/ocrtc/ocrtc.c
+++ b/board/esd/ocrtc/ocrtc.c

@@ -26,7 +26,6 @@
 #include <asm/processor.h>
 #include <i2c.h>
 #include <command.h>
-#include <cmd_boot.h>
 
 /* ------------------------------------------------------------------------- */
 

diff --git a/board/esd/ocrtc/u-boot.lds b/board/esd/ocrtc/u-boot.lds
index 8e940a8..251a4cc 100644
--- a/board/esd/ocrtc/u-boot.lds
+++ b/board/esd/ocrtc/u-boot.lds

@@ -119,6 +119,11 @@
   _edata  =  .;
   PROVIDE (edata = .);
 
+  __u_boot_cmd_start = .;
+  .u_boot_cmd : { *(.u_boot_cmd) }
+  __u_boot_cmd_end = .;
+
+
   __start___ex_table = .;
   __ex_table : { *(__ex_table) }
   __stop___ex_table = .;

diff --git a/board/esd/pci405/Makefile b/board/esd/pci405/Makefile
index 62d7bf9..fd72b18 100644
--- a/board/esd/pci405/Makefile
+++ b/board/esd/pci405/Makefile

@@ -28,7 +28,7 @@
 OBJS	= $(BOARD).o flash.o cmd_pci405.o
 
 $(LIB):	$(OBJS) $(SOBJS)
-	$(AR) crv $@ $^
+	$(AR) crv $@ $(OBJS)
 
 clean:
 	rm -f $(SOBJS) $(OBJS)

diff --git a/board/esd/pci405/cmd_pci405.c b/board/esd/pci405/cmd_pci405.c
index 555dc0c..df91cd4 100644
--- a/board/esd/pci405/cmd_pci405.c
+++ b/board/esd/pci405/cmd_pci405.c

@@ -22,12 +22,12 @@
  */
 
 #include <common.h>
+#include <command.h>
 #include <malloc.h>
 #include <net.h>
 #include <asm/io.h>
 #include <pci.h>
 #include <405gp_pci.h>
-#include <cmd_bsp.h>
 
 #include "pci405.h"
 

diff --git a/board/esd/pci405/flash.c b/board/esd/pci405/flash.c
index 1707dcf..3b21781 100644
--- a/board/esd/pci405/flash.c
+++ b/board/esd/pci405/flash.c

@@ -43,8 +43,8 @@
 {
 	unsigned long size_b0;
 	int i;
-        uint pbcr;
-        unsigned long base_b0;
+	uint pbcr;
+	unsigned long base_b0;
 	int size_val = 0;
 
 	/* Init: no FLASHes known */
@@ -61,14 +61,14 @@
 			size_b0, size_b0<<20);
 	}
 
-        /* Setup offsets */
-        flash_get_offsets (-size_b0, &flash_info[0]);
+	/* Setup offsets */
+	flash_get_offsets (-size_b0, &flash_info[0]);
 
-        /* Re-do sizing to get full correct info */
-        mtdcr(ebccfga, pb0cr);
-        pbcr = mfdcr(ebccfgd);
-        mtdcr(ebccfga, pb0cr);
-        base_b0 = -size_b0;
+	/* Re-do sizing to get full correct info */
+	mtdcr(ebccfga, pb0cr);
+	pbcr = mfdcr(ebccfgd);
+	mtdcr(ebccfga, pb0cr);
+	base_b0 = -size_b0;
 	switch (size_b0) {
 	case 1 << 20:
 		size_val = 0;
@@ -87,15 +87,15 @@
 		break;
 	}
 	pbcr = (pbcr & 0x0001ffff) | base_b0 | (size_val << 17);
-        mtdcr(ebccfgd, pbcr);
+	mtdcr(ebccfgd, pbcr);
 
-        /* Monitor protection ON by default */
-        (void)flash_protect(FLAG_PROTECT_SET,
-                            -monitor_flash_len,
-                            0xffffffff,
-                            &flash_info[0]);
+	/* Monitor protection ON by default */
+	(void)flash_protect(FLAG_PROTECT_SET,
+			    -monitor_flash_len,
+			    0xffffffff,
+			    &flash_info[0]);
 
-        flash_info[0].size = size_b0;
+	flash_info[0].size = size_b0;
 
 	return (size_b0);
 }

diff --git a/board/esd/pci405/pci405.c b/board/esd/pci405/pci405.c
index 18d24a8..cc45fa9 100644
--- a/board/esd/pci405/pci405.c
+++ b/board/esd/pci405/pci405.c

@@ -24,7 +24,6 @@
 #include <common.h>
 #include <asm/processor.h>
 #include <command.h>
-#include <cmd_boot.h>
 #include <malloc.h>
 #include <pci.h>
 #include <405gp_pci.h>
@@ -33,7 +32,7 @@
 
 
 /* ------------------------------------------------------------------------- */
-
+extern int do_reset (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[]);/*cmd_boot.c*/
 #if 0
 #define FPGA_DEBUG
 #endif

diff --git a/board/esd/pci405/u-boot.lds b/board/esd/pci405/u-boot.lds
index 97851f1..311a5fe 100644
--- a/board/esd/pci405/u-boot.lds
+++ b/board/esd/pci405/u-boot.lds

@@ -119,6 +119,11 @@
   _edata  =  .;
   PROVIDE (edata = .);
 
+  __u_boot_cmd_start = .;
+  .u_boot_cmd : { *(.u_boot_cmd) }
+  __u_boot_cmd_end = .;
+
+
   __start___ex_table = .;
   __ex_table : { *(__ex_table) }
   __stop___ex_table = .;

diff --git a/board/esd/pmc405/Makefile b/board/esd/pmc405/Makefile
index 2fa097a..c4198c4 100644
--- a/board/esd/pmc405/Makefile
+++ b/board/esd/pmc405/Makefile

@@ -28,7 +28,7 @@
 OBJS	= $(BOARD).o strataflash.o
 
 $(LIB):	$(OBJS) $(SOBJS)
-	$(AR) crv $@ $^
+	$(AR) crv $@ $(OBJS)
 
 clean:
 	rm -f $(SOBJS) $(OBJS)

diff --git a/board/esd/pmc405/pmc405.c b/board/esd/pmc405/pmc405.c
index 78eed9f..5c2e98c 100644
--- a/board/esd/pmc405/pmc405.c
+++ b/board/esd/pmc405/pmc405.c

@@ -24,7 +24,6 @@
 #include <common.h>
 #include <asm/processor.h>
 #include <command.h>
-#include <cmd_boot.h>
 #include <malloc.h>
 
 /* ------------------------------------------------------------------------- */

diff --git a/board/esd/pmc405/strataflash.c b/board/esd/pmc405/strataflash.c
index 6578ed9..d21d885 100644
--- a/board/esd/pmc405/strataflash.c
+++ b/board/esd/pmc405/strataflash.c

@@ -24,7 +24,7 @@
 #include <common.h>
 #include <asm/processor.h>
 
-#undef  DEBUG_FLASH 
+#undef  DEBUG_FLASH
 /*
  * This file implements a Common Flash Interface (CFI) driver for ppcboot.
  * The width of the port and the width of the chips are determined at initialization.
@@ -89,8 +89,6 @@
 #define FLASH_MAN_CFI			0x01000000
 
 
-
-
 typedef union {
 	unsigned char c;
 	unsigned short w;
@@ -113,7 +111,6 @@
  */
 
 
-
 static void flash_add_byte(flash_info_t *info, cfiword_t * cword, uchar c);
 static void flash_make_cmd(flash_info_t * info, uchar cmd, void * cmdbuf);
 static void flash_write_cmd(flash_info_t * info, int sect, uchar offset, uchar cmd);
@@ -249,7 +246,7 @@
 			flash_write_cmd(info, sect, 0, FLASH_CMD_CLEAR_STATUS);
 			flash_write_cmd(info, sect, 0, FLASH_CMD_BLOCK_ERASE);
 			flash_write_cmd(info, sect, 0, FLASH_CMD_ERASE_CONFIRM);
-			
+
 			if(flash_full_status_check(info, sect, info->erase_blk_tout, "erase")) {
 				rcode = 1;
 			} else
@@ -277,7 +274,7 @@
 		info->size >> 20, info->sector_count);
 	printf(" Erase timeout %ld ms, write timeout %ld ms, buffer write timeout %ld ms, buffer size %d\n",
 	       info->erase_blk_tout, info->write_tout, info->buffer_write_tout, info->buffer_size);
-      
+
 	printf ("  Sector Start Addresses:");
 	for (i=0; i<info->sector_count; ++i) {
 #ifdef CFG_FLASH_EMPTY_INFO
@@ -286,28 +283,28 @@
 		int erased;
 		volatile unsigned long *flash;
 
-                /*
-                 * Check if whole sector is erased
-                 */
-                if (i != (info->sector_count-1))
-                  size = info->start[i+1] - info->start[i];
-                else
-                  size = info->start[0] + info->size - info->start[i];
-                erased = 1;
-                flash = (volatile unsigned long *)info->start[i];
-                size = size >> 2;        /* divide by 4 for longword access */
-                for (k=0; k<size; k++)
-                  {
-                    if (*flash++ != 0xffffffff)
-                      {
-                        erased = 0;
-                        break;
-                      }
-                  }
+		/*
+		 * Check if whole sector is erased
+		 */
+		if (i != (info->sector_count-1))
+		  size = info->start[i+1] - info->start[i];
+		else
+		  size = info->start[0] + info->size - info->start[i];
+		erased = 1;
+		flash = (volatile unsigned long *)info->start[i];
+		size = size >> 2;        /* divide by 4 for longword access */
+		for (k=0; k<size; k++)
+		  {
+		    if (*flash++ != 0xffffffff)
+		      {
+			erased = 0;
+			break;
+		      }
+		  }
 
 		if ((i % 5) == 0)
 			printf ("\n   ");
-                /* print empty and read-only info */
+		/* print empty and read-only info */
 		printf (" %08lX%s%s",
 			info->start[i],
 			erased ? " E" : "  ",
@@ -414,7 +411,7 @@
 	else
 		flash_write_cmd(info, sector, 0, FLASH_CMD_PROTECT_CLEAR);
 
-	if((retcode = flash_full_status_check(info, sector, info->erase_blk_tout, 
+	if((retcode = flash_full_status_check(info, sector, info->erase_blk_tout,
 					 prot?"protect":"unprotect")) == 0) {
 
 		info->protect[sector] = prot;
@@ -464,7 +461,7 @@
 			printf("Command Sequence Error.\n");
 		} else if(flash_isset(info, sector, 0, FLASH_STATUS_ECLBS)){
 			printf("Block Erase Error.\n");
-		        retcode = ERR_NOT_ERASED;
+			retcode = ERR_NOT_ERASED;
 		} else if (flash_isset(info, sector, 0, FLASH_STATUS_PSLBS)) {
 			printf("Locking Error\n");
 		}
@@ -733,7 +730,7 @@
 {
 	int sector;
 	for(sector = info->sector_count - 1; sector >= 0; sector--) {
-		if(addr >= info->start[sector]) 
+		if(addr >= info->start[sector])
 			break;
 	}
 	return sector;
@@ -741,7 +738,7 @@
 
 static int flash_write_cfibuffer(flash_info_t * info, ulong dest, uchar * cp, int len)
 {
-	
+
 	int sector;
 	int cnt;
 	int retcode;
@@ -789,8 +786,8 @@
 		flash_write_cmd(info, sector, 0, FLASH_CMD_WRITE_BUFFER_CONFIRM);
 		retcode = flash_full_status_check(info, sector, info->buffer_write_tout,
 					     "buffer write");
-	} 
+	}
 	flash_write_cmd(info, sector, 0, FLASH_CMD_CLEAR_STATUS);
 	return retcode;
-}	
+}
 #endif /* CFG_USE_FLASH_BUFFER_WRITE */

diff --git a/board/esd/pmc405/u-boot.lds b/board/esd/pmc405/u-boot.lds
index 463e388..bfd71db 100644
--- a/board/esd/pmc405/u-boot.lds
+++ b/board/esd/pmc405/u-boot.lds

@@ -119,6 +119,10 @@
   _edata  =  .;
   PROVIDE (edata = .);
 
+  __u_boot_cmd_start = .;
+  .u_boot_cmd : { *(.u_boot_cmd) }
+  __u_boot_cmd_end = .;
+
   __start___ex_table = .;
   __ex_table : { *(__ex_table) }
   __stop___ex_table = .;

diff --git a/board/esteem192e/Makefile b/board/esteem192e/Makefile
index ef173d0..13ce9fc 100644
--- a/board/esteem192e/Makefile
+++ b/board/esteem192e/Makefile

@@ -28,7 +28,7 @@
 OBJS	= $(BOARD).o flash.o
 
 $(LIB):	.depend $(OBJS)
-	$(AR) crv $@ $^
+	$(AR) crv $@ $(OBJS)
 
 #########################################################################
 

diff --git a/board/esteem192e/esteem192e.c b/board/esteem192e/esteem192e.c
index 792a61c..986964b 100644
--- a/board/esteem192e/esteem192e.c
+++ b/board/esteem192e/esteem192e.c

@@ -47,14 +47,14 @@
 	/*
 	 * SDRAM Initialization (offset 5 in UPMA RAM)
 	 *
-         * This is no UPM entry point. The following definition uses
-         * the remaining space to establish an initialization
-         * sequence, which is executed by a RUN command.
+	 * This is no UPM entry point. The following definition uses
+	 * the remaining space to establish an initialization
+	 * sequence, which is executed by a RUN command.
 	 * NOP, Program
 	 */
-        0x0F0A8C34, 0x1F354C37, /* last */
+	0x0F0A8C34, 0x1F354C37, /* last */
 
-        _NOT_USED_,  /* Not used */
+	_NOT_USED_,  /* Not used */
 
 	/*
 	 * Burst Read. (Offset 8 in UPMA RAM)
@@ -87,7 +87,7 @@
 	 * Exception. (Offset 3c in UPMA RAM)
 	 */
 	0x0FFB8C00, 0x1FF74C03, /* last */
-	                        _NOT_USED_, _NOT_USED_
+				_NOT_USED_, _NOT_USED_
 };
 
 /* ------------------------------------------------------------------------- */
@@ -186,38 +186,38 @@
     else {
 
        if(size_b0 < size_b1) {
-          memctl->memc_br2 &= 0x00007FFE;
-          memctl->memc_br3 &= 0x00007FFF;
+	  memctl->memc_br2 &= 0x00007FFE;
+	  memctl->memc_br3 &= 0x00007FFF;
 
-         /*
-          * Adjust OR3 for size of bank 1
-          */
-          memctl->memc_or3 |= 15 * size_b1;
+	 /*
+	  * Adjust OR3 for size of bank 1
+	  */
+	  memctl->memc_or3 |= 15 * size_b1;
 
-         /*
-          * Adjust OR2 for size of bank 0
-          */
-          memctl->memc_or2 |= 15 * size_b0;
+	 /*
+	  * Adjust OR2 for size of bank 0
+	  */
+	  memctl->memc_or2 |= 15 * size_b0;
 
-          memctl->memc_br2 += (size_b1 + 1);
+	  memctl->memc_br2 += (size_b1 + 1);
 
        }
        else {
 
-          memctl->memc_br3 &= 0x00007FFE;
+	  memctl->memc_br3 &= 0x00007FFE;
 
 
-         /*
-          * Adjust OR2 for size of bank 0
-          */
-          memctl->memc_or2 |= 15 * size_b0;
+	 /*
+	  * Adjust OR2 for size of bank 0
+	  */
+	  memctl->memc_or2 |= 15 * size_b0;
 
-         /*
-          * Adjust OR3 for size of bank 1
-          */
-          memctl->memc_or3 |= 15 * size_b1;
+	 /*
+	  * Adjust OR3 for size of bank 1
+	  */
+	  memctl->memc_or3 |= 15 * size_b1;
 
-          memctl->memc_br3 += (size_b0 + 1);
+	  memctl->memc_br3 += (size_b0 + 1);
 
 
        }
@@ -269,8 +269,6 @@
     immap->im_ioport.iop_pddat = 0x0055;      /* set alternating pattern on test port */
 
 
-
-
     return (size_b0 + size_b1);
 }
 

diff --git a/board/esteem192e/flash.c b/board/esteem192e/flash.c
index 5322430..5465dea 100644
--- a/board/esteem192e/flash.c
+++ b/board/esteem192e/flash.c

@@ -111,7 +111,7 @@
 	if (size_b1) {
 		memctl->memc_or1 = CFG_OR_TIMING_FLASH | (-size_b1 & 0xFFFF8000);
 		memctl->memc_br1 = (CFG_FLASH_BASE | 0x00000801) + (size_b0 & BR_BA_MSK);
-                              /*((CFG_FLASH_BASE + size_b0) & BR_BA_MSK) |
+			      /*((CFG_FLASH_BASE + size_b0) & BR_BA_MSK) |
 				    BR_MS_GPCM | BR_V;*/
 
 		/* Re-do sizing to get full correct info */
@@ -148,7 +148,7 @@
 
 	/* set up sector start adress table */
 	if (info->flash_id & FLASH_BTYPE) {
-             if ((info->flash_id & FLASH_VENDMASK) == FLASH_MAN_INTEL) {
+	     if ((info->flash_id & FLASH_VENDMASK) == FLASH_MAN_INTEL) {
 
 #ifndef CONFIG_FLASH_16BIT
 		/* set sector offsets for bottom boot block type	*/
@@ -162,9 +162,9 @@
 		info->start[7] = base + 0x0001C000;
 		for (i = 8; i < info->sector_count; i++) {
 			info->start[i] = base + (i * 0x00020000) - 0x000E0000;
-	        }
-               }
-             else {
+		}
+	       }
+	     else {
 		/* set sector offsets for bottom boot block type	*/
 		info->start[0] = base + 0x00000000;
 		info->start[1] = base + 0x00008000;
@@ -186,9 +186,9 @@
 		info->start[7] = base + 0x0000E000;
 		for (i = 8; i < info->sector_count; i++) {
 			info->start[i] = base + (i * 0x00010000) - 0x00070000;
-	        }
+		}
 	       }
-             else {
+	     else {
 		/* set sector offsets for bottom boot block type	*/
 		info->start[0] = base + 0x00000000;
 		info->start[1] = base + 0x00004000;
@@ -202,7 +202,7 @@
 	} else {
 		/* set sector offsets for top boot block type		*/
 		i = info->sector_count - 1;
-             if ((info->flash_id & FLASH_VENDMASK) == FLASH_MAN_INTEL) {
+	     if ((info->flash_id & FLASH_VENDMASK) == FLASH_MAN_INTEL) {
 
 #ifndef CONFIG_FLASH_16BIT
 		info->start[i--] = base + info->size - 0x00004000;
@@ -216,7 +216,7 @@
 			info->start[i] = base + i * 0x00020000;
 		}
 
-               } else {
+	       } else {
 
 		info->start[i--] = base + info->size - 0x00008000;
 		info->start[i--] = base + info->size - 0x0000C000;
@@ -237,7 +237,7 @@
 			info->start[i] = base + i * 0x00010000;
 		}
 
-               } else {
+	       } else {
 
 		info->start[i--] = base + info->size - 0x00004000;
 		info->start[i--] = base + info->size - 0x00006000;
@@ -362,8 +362,8 @@
 
 	/*
 	 * Note: if it is an AMD flash and the word at addr[0000]
-         * is 0x00890089 this routine will think it is an Intel
-         * flash device and may(most likely) cause trouble.
+	 * is 0x00890089 this routine will think it is an Intel
+	 * flash device and may(most likely) cause trouble.
 	 */
 
 	addr[0x0000] = 0x00900090;
@@ -375,8 +375,8 @@
 
 	/*
 	 * Note: if it is an AMD flash and the word at addr[0000]
-         * is 0x0089 this routine will think it is an Intel
-         * flash device and may(most likely) cause trouble.
+	 * is 0x0089 this routine will think it is an Intel
+	 * flash device and may(most likely) cause trouble.
 	 */
 
 	addr[0x0000] = 0x0090;
@@ -523,7 +523,7 @@
 
 	/* set up sector start adress table */
 	if (info->flash_id & FLASH_BTYPE) {
-             if ((info->flash_id & FLASH_VENDMASK) == FLASH_MAN_INTEL) {
+	     if ((info->flash_id & FLASH_VENDMASK) == FLASH_MAN_INTEL) {
 
 #ifndef CONFIG_FLASH_16BIT
 		/* set sector offsets for bottom boot block type	*/
@@ -537,9 +537,9 @@
 		info->start[7] = base + 0x0001C000;
 		for (i = 8; i < info->sector_count; i++) {
 			info->start[i] = base + (i * 0x00020000) - 0x000E0000;
-	        }
-               }
-             else {
+		}
+	       }
+	     else {
 		/* set sector offsets for bottom boot block type	*/
 		info->start[0] = base + 0x00000000;
 		info->start[1] = base + 0x00008000;
@@ -561,9 +561,9 @@
 		info->start[7] = base + 0x0000E000;
 		for (i = 8; i < info->sector_count; i++) {
 			info->start[i] = base + (i * 0x00010000) - 0x00070000;
-	        }
+		}
 	       }
-             else {
+	     else {
 		/* set sector offsets for bottom boot block type	*/
 		info->start[0] = base + 0x00000000;
 		info->start[1] = base + 0x00004000;
@@ -577,7 +577,7 @@
 	} else {
 		/* set sector offsets for top boot block type		*/
 		i = info->sector_count - 1;
-             if ((info->flash_id & FLASH_VENDMASK) == FLASH_MAN_INTEL) {
+	     if ((info->flash_id & FLASH_VENDMASK) == FLASH_MAN_INTEL) {
 
 #ifndef CONFIG_FLASH_16BIT
 		info->start[i--] = base + info->size - 0x00004000;
@@ -591,7 +591,7 @@
 			info->start[i] = base + i * 0x00020000;
 		}
 
-               } else {
+	       } else {
 
 		info->start[i--] = base + info->size - 0x00008000;
 		info->start[i--] = base + info->size - 0x0000C000;
@@ -612,7 +612,7 @@
 			info->start[i] = base + i * 0x00010000;
 		}
 
-               } else {
+	       } else {
 
 		info->start[i--] = base + info->size - 0x00004000;
 		info->start[i--] = base + info->size - 0x00006000;
@@ -670,7 +670,7 @@
 
 	if ((info->flash_id == FLASH_UNKNOWN) ||
 	    ((info->flash_id > FLASH_AMD_COMP) &&
-             ( (info->flash_id & FLASH_VENDMASK) != FLASH_MAN_INTEL ) ) ){
+	     ( (info->flash_id & FLASH_VENDMASK) != FLASH_MAN_INTEL ) ) ){
 		printf ("Can't erase unknown flash type - aborted\n");
 		return 1;
 	}
@@ -1001,13 +1001,13 @@
 		if( barf ) {
 			barf >>=16;
 		} else {
-		        barf = addr[0] & 0x0000003A;
+			barf = addr[0] & 0x0000003A;
 		}
 		printf("\nFlash write error at address %lx\n",(unsigned long)dest);
 		if(barf & 0x0002) printf("Block locked, not erased.\n");
 		if(barf & 0x0010) printf("Programming error.\n");
 		if(barf & 0x0008) printf("Vpp Low error.\n");
-	  	return(2);
+		return(2);
 	}
 
 
@@ -1040,7 +1040,7 @@
 	addr[0x0555] = 0x00A0;
      } else {
 	/* intel stuff */
-        *addr = 0x00D0;
+	*addr = 0x00D0;
 	*addr = 0x0040;
      }
 	*((vu_short *)dest) = data;
@@ -1053,7 +1053,7 @@
 	start = get_timer (0);
 
      if(info->flash_id < FLASH_AMD_COMP) {
-          /* AMD stuff */
+	  /* AMD stuff */
 	while ((*((vu_short *)dest) & 0x0080) != (data & 0x0080)) {
 		if (get_timer(start) > CFG_FLASH_WRITE_TOUT) {
 			return (1);
@@ -1072,7 +1072,7 @@
 		if(barf & 0x0002) printf("Block locked, not erased.\n");
 		if(barf & 0x0010) printf("Programming error.\n");
 		if(barf & 0x0008) printf("Vpp Low error.\n");
-	  	return(2);
+		return(2);
 	}
 	*addr = 0x00B0;
 	*addr = 0x0070;
@@ -1093,4 +1093,3 @@
 
 /*-----------------------------------------------------------------------
  */
-

diff --git a/board/esteem192e/u-boot.lds b/board/esteem192e/u-boot.lds
index ffe7495..717c895 100644
--- a/board/esteem192e/u-boot.lds
+++ b/board/esteem192e/u-boot.lds

@@ -109,6 +109,11 @@
   _edata  =  .;
   PROVIDE (edata = .);
 
+  __u_boot_cmd_start = .;
+  .u_boot_cmd : { *(.u_boot_cmd) }
+  __u_boot_cmd_end = .;
+
+
   __start___ex_table = .;
   __ex_table : { *(__ex_table) }
   __stop___ex_table = .;
@@ -131,4 +136,3 @@
   _end = . ;
   PROVIDE (end = .);
 }
-

diff --git a/board/etx094/Makefile b/board/etx094/Makefile
index ef173d0..13ce9fc 100644
--- a/board/etx094/Makefile
+++ b/board/etx094/Makefile

@@ -28,7 +28,7 @@
 OBJS	= $(BOARD).o flash.o
 
 $(LIB):	.depend $(OBJS)
-	$(AR) crv $@ $^
+	$(AR) crv $@ $(OBJS)
 
 #########################################################################
 

diff --git a/board/etx094/u-boot.lds b/board/etx094/u-boot.lds
index 2fd15c9..3d202e3 100644
--- a/board/etx094/u-boot.lds
+++ b/board/etx094/u-boot.lds

@@ -111,6 +111,11 @@
   _edata  =  .;
   PROVIDE (edata = .);
 
+  __u_boot_cmd_start = .;
+  .u_boot_cmd : { *(.u_boot_cmd) }
+  __u_boot_cmd_end = .;
+
+
   __start___ex_table = .;
   __ex_table : { *(__ex_table) }
   __stop___ex_table = .;
@@ -133,4 +138,3 @@
   _end = . ;
   PROVIDE (end = .);
 }
-

diff --git a/board/etx094/u-boot.lds.debug b/board/etx094/u-boot.lds.debug
index 17ec374..7cd6809 100644
--- a/board/etx094/u-boot.lds.debug
+++ b/board/etx094/u-boot.lds.debug

@@ -113,6 +113,11 @@
   _edata  =  .;
   PROVIDE (edata = .);
 
+  __u_boot_cmd_start = .;
+  .u_boot_cmd : { *(.u_boot_cmd) }
+  __u_boot_cmd_end = .;
+
+
   __start___ex_table = .;
   __ex_table : { *(__ex_table) }
   __stop___ex_table = .;
@@ -135,4 +140,3 @@
   _end = . ;
   PROVIDE (end = .);
 }
-

diff --git a/board/evb64260/Makefile b/board/evb64260/Makefile
index 31e24df..c493d6c 100644
--- a/board/evb64260/Makefile
+++ b/board/evb64260/Makefile

@@ -32,7 +32,7 @@
 
 
 $(LIB):	.depend $(OBJS) $(SOBJS)
-	$(AR) crv $@ $^
+	$(AR) crv $@ $(OBJS) $(SOBJS)
 
 #########################################################################
 

diff --git a/board/evb64260/eth.c b/board/evb64260/eth.c
index 76cf38a..8b3a359 100644
--- a/board/evb64260/eth.c
+++ b/board/evb64260/eth.c

@@ -117,12 +117,12 @@
     printf("SMI interrupt: ");
 
     if(icr&0x20000000) {
-    	printf("SMI done\n");
+	printf("SMI done\n");
     }
 #endif
 
     if(icr&0x10000000) {
-        unsigned int psr;
+	unsigned int psr;
 	psr=GTREGREAD(ETHERNET0_PORT_STATUS_REGISTER + p->reg_base);
 #ifdef DEBUG
 	printf("PHY state change:\n"
@@ -134,7 +134,7 @@
 
 #ifdef CONFIG_INTEL_LXT97X /* non-standard mii reg (intel lxt972a) */
 	{
-        unsigned short mii_11;
+	unsigned short mii_11;
 	mii_11=miiphy_read_ret(ether_port_phy_addr[p->dev],0x11);
 
 	printf(" mii:%s:%s:%s:%s %s:%s %s\n",
@@ -381,7 +381,7 @@
 gt6426x_dump_mii(bd_t *bis, unsigned short phy)
 {
 	printf("mii reg 0 - 3:   %04x %04x %04x %04x\n",
- 		miiphy_read_ret(phy, 0x0),
+		miiphy_read_ret(phy, 0x0),
 		miiphy_read_ret(phy, 0x1),
 		miiphy_read_ret(phy, 0x2),
 		miiphy_read_ret(phy, 0x3)

diff --git a/board/evb64260/eth_addrtbl.c b/board/evb64260/eth_addrtbl.c
index ea4925a..ef463c3 100644
--- a/board/evb64260/eth_addrtbl.c
+++ b/board/evb64260/eth_addrtbl.c

@@ -52,7 +52,7 @@
 	tableBase = (unsigned int)addressTableBase[port];
 	/* we get called for every probe, so only do this once */
 	if ( !tableBase ) {
-    	int bytes = hashLength[hashSizeSelector] * sizeof(addrTblEntry);
+	int bytes = hashLength[hashSizeSelector] * sizeof(addrTblEntry);
 
 		tableBase = (unsigned int)realAddrTableBase[port] = malloc(bytes+64);
 
@@ -62,12 +62,12 @@
 			return 0;
 		}
 
-    	/* align to octal byte */
+	/* align to octal byte */
 	    if(tableBase&63) tableBase=(tableBase+63) & ~63;
 
-    	addressTableHashMode[port] = hashMode;
+	addressTableHashMode[port] = hashMode;
 	    addressTableHashSize[port] = hashSizeSelector;
-    	addressTableBase[port] = (addrTblEntry *)tableBase;
+	addressTableBase[port] = (addrTblEntry *)tableBase;
 
 	    memset((void *)tableBase,0,bytes);
 	}
@@ -105,40 +105,40 @@
     addrL = NIBBLE_SWAPPING_32_BIT( macL );
 
     addrHSwapped =   FLIP_4_BITS(  addrH        & 0xf )
-                 + ((FLIP_4_BITS( (addrH >>  4) & 0xf)) <<  4)
-                 + ((FLIP_4_BITS( (addrH >>  8) & 0xf)) <<  8)
-                 + ((FLIP_4_BITS( (addrH >> 12) & 0xf)) << 12);
+		 + ((FLIP_4_BITS( (addrH >>  4) & 0xf)) <<  4)
+		 + ((FLIP_4_BITS( (addrH >>  8) & 0xf)) <<  8)
+		 + ((FLIP_4_BITS( (addrH >> 12) & 0xf)) << 12);
 
     addrLSwapped =   FLIP_4_BITS(  addrL        & 0xf )
-                 + ((FLIP_4_BITS( (addrL >>  4) & 0xf)) <<  4)
-                 + ((FLIP_4_BITS( (addrL >>  8) & 0xf)) <<  8)
-                 + ((FLIP_4_BITS( (addrL >> 12) & 0xf)) << 12)
-                 + ((FLIP_4_BITS( (addrL >> 16) & 0xf)) << 16)
-                 + ((FLIP_4_BITS( (addrL >> 20) & 0xf)) << 20)
-                 + ((FLIP_4_BITS( (addrL >> 24) & 0xf)) << 24)
-                 + ((FLIP_4_BITS( (addrL >> 28) & 0xf)) << 28);
+		 + ((FLIP_4_BITS( (addrL >>  4) & 0xf)) <<  4)
+		 + ((FLIP_4_BITS( (addrL >>  8) & 0xf)) <<  8)
+		 + ((FLIP_4_BITS( (addrL >> 12) & 0xf)) << 12)
+		 + ((FLIP_4_BITS( (addrL >> 16) & 0xf)) << 16)
+		 + ((FLIP_4_BITS( (addrL >> 20) & 0xf)) << 20)
+		 + ((FLIP_4_BITS( (addrL >> 24) & 0xf)) << 24)
+		 + ((FLIP_4_BITS( (addrL >> 28) & 0xf)) << 28);
 
     addrH = addrHSwapped;
     addrL = addrLSwapped;
 
     if( hash_mode == 0 )  {
-        addr0 =  (addrL >>  2) & 0x03f;
-        addr1 =  (addrL        & 0x003) | ((addrL >> 8) & 0x7f) << 2;
-        addr2 =  (addrL >> 15) & 0x1ff;
-        addr3 = ((addrL >> 24) & 0x0ff) | ((addrH &  1)         << 8);
+	addr0 =  (addrL >>  2) & 0x03f;
+	addr1 =  (addrL        & 0x003) | ((addrL >> 8) & 0x7f) << 2;
+	addr2 =  (addrL >> 15) & 0x1ff;
+	addr3 = ((addrL >> 24) & 0x0ff) | ((addrH &  1)         << 8);
     } else  {
-        addr0 = FLIP_6_BITS(    addrL        & 0x03f );
-        addr1 = FLIP_9_BITS(  ((addrL >>  6) & 0x1ff));
-        addr2 = FLIP_9_BITS(   (addrL >> 15) & 0x1ff);
-        addr3 = FLIP_9_BITS( (((addrL >> 24) & 0x0ff) | ((addrH & 0x1) << 8)));
+	addr0 = FLIP_6_BITS(    addrL        & 0x03f );
+	addr1 = FLIP_9_BITS(  ((addrL >>  6) & 0x1ff));
+	addr2 = FLIP_9_BITS(   (addrL >> 15) & 0x1ff);
+	addr3 = FLIP_9_BITS( (((addrL >> 24) & 0x0ff) | ((addrH & 0x1) << 8)));
     }
 
     hashResult = (addr0 << 9) | (addr1 ^ addr2 ^ addr3);
 
     if( HashSize == _8K_TABLE )  {
-        hashResult = hashResult & 0xffff;
+	hashResult = hashResult & 0xffff;
     } else  {
-        hashResult = hashResult & 0x07ff;
+	hashResult = hashResult & 0x07ff;
     }
 
     return( hashResult );
@@ -174,20 +174,20 @@
     u32           i;
 
     newLo = (((macH >>  4) & 0xf) << 15)
-          | (((macH >>  0) & 0xf) << 11)
-          | (((macH >> 12) & 0xf) <<  7)
-          | (((macH >>  8) & 0xf) <<  3)
-          | (((macL >> 20) & 0x1) << 31)
-          | (((macL >> 16) & 0xf) << 27)
-          | (((macL >> 28) & 0xf) << 23)
-          | (((macL >> 24) & 0xf) << 19)
-          |   (skip << SKIP_BIT)  |  (rd << 2) | VALID;
+	  | (((macH >>  0) & 0xf) << 11)
+	  | (((macH >> 12) & 0xf) <<  7)
+	  | (((macH >>  8) & 0xf) <<  3)
+	  | (((macL >> 20) & 0x1) << 31)
+	  | (((macL >> 16) & 0xf) << 27)
+	  | (((macL >> 28) & 0xf) << 23)
+	  | (((macL >> 24) & 0xf) << 19)
+	  |   (skip << SKIP_BIT)  |  (rd << 2) | VALID;
 
     newHi = (((macL >>  4) & 0xf) << 15)
-          | (((macL >>  0) & 0xf) << 11)
-          | (((macL >> 12) & 0xf) <<  7)
-          | (((macL >>  8) & 0xf) <<  3)
-          | (((macL >> 21) & 0x7) <<  0);
+	  | (((macL >>  0) & 0xf) << 11)
+	  | (((macL >> 12) & 0xf) <<  7)
+	  | (((macL >>  8) & 0xf) <<  3)
+	  | (((macL >> 21) & 0x7) <<  0);
 
     /*
      * Pick the appropriate table, start scanning for free/reusable
@@ -195,22 +195,22 @@
      */
     entry  = addressTableBase[port];
     entry += hashTableFunction( macH, macL, addressTableHashSize[port],
-                                            addressTableHashMode[port]  );
+					    addressTableHashMode[port]  );
     for( i = 0;  i < HOP_NUMBER;  i++, entry++ )  {
-        if( !(entry->lo & VALID)   /*|| (entry->lo & SKIP)*/   )  {
-            break;
-        } else  {                    /* if same address put in same position */
-            if(   ((entry->lo & 0xfffffff8) == (newLo & 0xfffffff8))
-                && (entry->hi               ==  newHi) )
-            {
-                    break;
-            }
-        }
+	if( !(entry->lo & VALID)   /*|| (entry->lo & SKIP)*/   )  {
+	    break;
+	} else  {                    /* if same address put in same position */
+	    if(   ((entry->lo & 0xfffffff8) == (newLo & 0xfffffff8))
+		&& (entry->hi               ==  newHi) )
+	    {
+		    break;
+	    }
+	}
     }
 
     if( i == HOP_NUMBER )  {
-        PRINTF( "addGT64260addressTableEntry: table section is full\n" );
-        return( FALSE );
+	PRINTF( "addGT64260addressTableEntry: table section is full\n" );
+	return( FALSE );
     }
 
     /*

diff --git a/board/evb64260/eth_addrtbl.h b/board/evb64260/eth_addrtbl.h
index 60380c6..5a62c67 100644
--- a/board/evb64260/eth_addrtbl.h
+++ b/board/evb64260/eth_addrtbl.h

@@ -25,22 +25,22 @@
  * XXX_MIKE - potential sign-extension bugs lurk here...
  */
 #define NIBBLE_SWAPPING_32_BIT(X) ( (((X) & 0xf0f0f0f0) >> 4) \
-                                  | (((X) & 0x0f0f0f0f) << 4) )
+				  | (((X) & 0x0f0f0f0f) << 4) )
 
 #define NIBBLE_SWAPPING_16_BIT(X) ( (((X) & 0x0000f0f0) >> 4) \
-                                  | (((X) & 0x00000f0f) << 4) )
+				  | (((X) & 0x00000f0f) << 4) )
 
 #define FLIP_4_BITS(X)  ( (((X) & 0x01) << 3) | (((X) & 0x002) << 1) \
-                        | (((X) & 0x04) >> 1) | (((X) & 0x008) >> 3) )
+			| (((X) & 0x04) >> 1) | (((X) & 0x008) >> 3) )
 
 #define FLIP_6_BITS(X)  ( (((X) & 0x01) << 5) | (((X) & 0x020) >> 5) \
-                        | (((X) & 0x02) << 3) | (((X) & 0x010) >> 3) \
-                        | (((X) & 0x04) << 1) | (((X) & 0x008) >> 1) )
+			| (((X) & 0x02) << 3) | (((X) & 0x010) >> 3) \
+			| (((X) & 0x04) << 1) | (((X) & 0x008) >> 1) )
 
 #define FLIP_9_BITS(X)  ( (((X) & 0x01) << 8) | (((X) & 0x100) >> 8) \
-                        | (((X) & 0x02) << 6) | (((X) & 0x080) >> 6) \
-                        | (((X) & 0x04) << 4) | (((X) & 0x040) >> 4) \
-         | ((X) & 0x10) | (((X) & 0x08) << 2) | (((X) & 0x020) >> 2) )
+			| (((X) & 0x02) << 6) | (((X) & 0x080) >> 6) \
+			| (((X) & 0x04) << 4) | (((X) & 0x040) >> 4) \
+	 | ((X) & 0x10) | (((X) & 0x08) << 2) | (((X) & 0x020) >> 2) )
 
 /*
  * V: value we're operating on
@@ -64,7 +64,6 @@
 #define DCACHE_FLUSH_N_SYNC( A, N )        flush_dcache_range( (A), ((A)+(N)) )
 
 
-
 typedef struct addressTableEntryStruct  {
     u32 hi;
     u32 lo;

diff --git a/board/evb64260/evb64260.c b/board/evb64260/evb64260.c
index 02431da..fd09690 100644
--- a/board/evb64260/evb64260.c
+++ b/board/evb64260/evb64260.c

@@ -218,18 +218,18 @@
 
 	/* ----- DEVICE BUS SETTINGS ------ */
 
-        /*
+	/*
 	 * EVB
-         * 0 - SRAM
-         * 1 - RTC
-         * 2 - UART
-         * 3 - Flash
-         * boot - BootCS
+	 * 0 - SRAM
+	 * 1 - RTC
+	 * 2 - UART
+	 * 3 - Flash
+	 * boot - BootCS
 	 *
 	 * Zuma
 	 * 0 - Flash
 	 * boot - BootCS
-         */
+	 */
 
 	/*
 	 * the dual 7450 module requires burst access to the boot
@@ -352,40 +352,40 @@
 debug_led(int led, int mode)
 {
 #ifndef CONFIG_ZUMA_V2
-        volatile int *addr = NULL;
-        int dummy;
+	volatile int *addr = NULL;
+	int dummy;
 
-        if (mode == 1) {
-                switch (led) {
-                case 0:
-                        addr = (int *)((unsigned int)CFG_DEV1_SPACE | 0x08000);
-                        break;
+	if (mode == 1) {
+		switch (led) {
+		case 0:
+			addr = (int *)((unsigned int)CFG_DEV1_SPACE | 0x08000);
+			break;
 
-                case 1:
-                        addr = (int *)((unsigned int)CFG_DEV1_SPACE | 0x0c000);
-                        break;
+		case 1:
+			addr = (int *)((unsigned int)CFG_DEV1_SPACE | 0x0c000);
+			break;
 
-                case 2:
-                        addr = (int *)((unsigned int)CFG_DEV1_SPACE | 0x10000);
-                        break;
-                }
-        } else if (mode == 0) {
-                switch (led) {
-                case 0:
-                        addr = (int *)((unsigned int)CFG_DEV1_SPACE | 0x14000);
-                        break;
+		case 2:
+			addr = (int *)((unsigned int)CFG_DEV1_SPACE | 0x10000);
+			break;
+		}
+	} else if (mode == 0) {
+		switch (led) {
+		case 0:
+			addr = (int *)((unsigned int)CFG_DEV1_SPACE | 0x14000);
+			break;
 
-                case 1:
-                        addr = (int *)((unsigned int)CFG_DEV1_SPACE | 0x18000);
-                        break;
+		case 1:
+			addr = (int *)((unsigned int)CFG_DEV1_SPACE | 0x18000);
+			break;
 
-                case 2:
-                        addr = (int *)((unsigned int)CFG_DEV1_SPACE | 0x1c000);
-                        break;
-                }
-        }
+		case 2:
+			addr = (int *)((unsigned int)CFG_DEV1_SPACE | 0x1c000);
+			break;
+		}
+	}
 	WRITE_CHAR(addr, 0);
-        dummy = *addr;
+	dummy = *addr;
 #endif /* CONFIG_ZUMA_V2 */
 }
 
@@ -436,4 +436,3 @@
     printf(" BOOT:  base - 0x%08x\tsize - %dM bytes\twidth - %d bits\n",
 	   base, size>>20, width);
 }
-

diff --git a/board/evb64260/flash.c b/board/evb64260/flash.c
index 2d2bf1c..c897393 100644
--- a/board/evb64260/flash.c
+++ b/board/evb64260/flash.c

@@ -240,8 +240,8 @@
 
 static inline void flash_cmd(int width, volatile unsigned char *addr, int offset, unsigned char cmd)
 {
-        /* supports 1x8, 1x16, and 2x16 */
-        /* 2x8 and 4x8 are not supported */
+	/* supports 1x8, 1x16, and 2x16 */
+	/* 2x8 and 4x8 are not supported */
 	if(width==4) {
 	    /* assuming chips are in 16 bit mode */
 	    /* 2x16 */

diff --git a/board/evb64260/memory.c b/board/evb64260/memory.c
index 9d301f8..e339854 100644
--- a/board/evb64260/memory.c
+++ b/board/evb64260/memory.c

@@ -103,9 +103,9 @@
     GT_REG_READ(highAddress,&highValue);
     highValue = (highValue + 1) << 20;
     if(base > highValue)
-        size=0;
+	size=0;
     else
-        size = highValue - base;
+	size = highValue - base;
     return size;
 }
 
@@ -127,16 +127,16 @@
     GT_REG_READ(highAddress,&highValue);
     if (highValue == 0xfff)
     {
-        size = (~base) + 1;	/* what the heck is this? */
-        return size;
+	size = (~base) + 1;	/* what the heck is this? */
+	return size;
     }
     else
-        highValue = (highValue + 1) << 20;
+	highValue = (highValue + 1) << 20;
 
     if(base > highValue)
-        size=0;
+	size=0;
     else
-        size = highValue - base;
+	size = highValue - base;
     return size;
 }
 
@@ -159,16 +159,16 @@
     width =  (regValue & 0x00300000) >> 20;
     switch (width)
     {
-        case 0:
-            return 1;
-        case 1:
-            return 2;
-        case 2:
-            return 4;
-        case 3:
-            return 8;
-        default:
-            return 0;
+	case 0:
+	    return 1;
+	case 1:
+	    return 2;
+	case 2:
+	    return 4;
+	case 3:
+	    return 8;
+	default:
+	    return 0;
     }
 }
 
@@ -265,23 +265,23 @@
 * Returns: false if one of the parameters is wrong and true else
 *********************************************************************/
 bool memorySetProtectRegion(MEMORY_PROTECT_REGION region,
-                            MEMORY_ACCESS memAccess,
-                            MEMORY_ACCESS_WRITE memWrite,
-                            MEMORY_CACHE_PROTECT cacheProtection,
-                            unsigned int baseAddress,
-                            unsigned int regionLength)
+			    MEMORY_ACCESS memAccess,
+			    MEMORY_ACCESS_WRITE memWrite,
+			    MEMORY_CACHE_PROTECT cacheProtection,
+			    unsigned int baseAddress,
+			    unsigned int regionLength)
 {
     unsigned int protectHigh = baseAddress + regionLength;
 
     if(regionLength == 0) /* closing the region */
     {
-        GT_REG_WRITE(CPU_LOW_PROTECT_ADDRESS_0 + 0x10*region,0x0000ffff);
-        GT_REG_WRITE(CPU_HIGH_PROTECT_ADDRESS_0 + 0x10*region,0);
-        return true;
+	GT_REG_WRITE(CPU_LOW_PROTECT_ADDRESS_0 + 0x10*region,0x0000ffff);
+	GT_REG_WRITE(CPU_HIGH_PROTECT_ADDRESS_0 + 0x10*region,0);
+	return true;
     }
     baseAddress =  (baseAddress & 0xfff00000) >> 20;
     baseAddress = baseAddress | memAccess << 16 |  memWrite << 17
-                     | cacheProtection << 18;
+		     | cacheProtection << 18;
     GT_REG_WRITE(CPU_LOW_PROTECT_ADDRESS_0 + 0x10*region,baseAddress);
     protectHigh = (protectHigh & 0xfff00000) >> 20;
     GT_REG_WRITE(CPU_HIGH_PROTECT_ADDRESS_0 + 0x10*region,protectHigh - 1);
@@ -304,9 +304,9 @@
 * Returns: false if one of the parameters is wrong and true else
 *********************************************************************/
 bool memorySetRegionSnoopMode(MEMORY_SNOOP_REGION region,
-                              MEMORY_SNOOP_TYPE snoopType,
-                              unsigned int baseAddress,
-                              unsigned int regionLength)
+			      MEMORY_SNOOP_TYPE snoopType,
+			      unsigned int baseAddress,
+			      unsigned int regionLength)
 {
     unsigned int snoopXbaseAddress;
     unsigned int snoopXtopAddress;
@@ -314,14 +314,14 @@
     unsigned int snoopHigh = baseAddress + regionLength;
 
     if( (region > MEM_SNOOP_REGION3) || (snoopType > MEM_SNOOP_WB) )
-        return false;
+	return false;
     snoopXbaseAddress = SNOOP_BASE_ADDRESS_0 + 0x10 * region;
     snoopXtopAddress = SNOOP_TOP_ADDRESS_0 + 0x10 * region;
     if(regionLength == 0) /* closing the region */
     {
-        GT_REG_WRITE(snoopXbaseAddress,0x0000ffff);
-        GT_REG_WRITE(snoopXtopAddress,0);
-        return true;
+	GT_REG_WRITE(snoopXbaseAddress,0x0000ffff);
+	GT_REG_WRITE(snoopXtopAddress,0);
+	return true;
     }
     baseAddress = baseAddress & 0xffff0000;
     data = (baseAddress >> 16) | snoopType << 16;
@@ -385,20 +385,20 @@
     switch (calcData)
     {
     case 0:
-        deviceParam -> deviceWidth = 1;         /* one Byte - 8-bit */
-        break;
+	deviceParam -> deviceWidth = 1;         /* one Byte - 8-bit */
+	break;
     case 1:
-        deviceParam -> deviceWidth = 2;         /* two Bytes - 16-bit */
-        break;
+	deviceParam -> deviceWidth = 2;         /* two Bytes - 16-bit */
+	break;
     case 2:
-        deviceParam -> deviceWidth = 4;         /* four Bytes - 32-bit */
-        break;
+	deviceParam -> deviceWidth = 4;         /* four Bytes - 32-bit */
+	break;
     case 3:
-        deviceParam -> deviceWidth = 8;         /* eight Bytes - 64-bit */
-        break;
+	deviceParam -> deviceWidth = 8;         /* eight Bytes - 64-bit */
+	break;
     default:
-        deviceParam -> deviceWidth = 1;
-        break;
+	deviceParam -> deviceWidth = 1;
+	break;
     }
     return true;
 }
@@ -419,38 +419,38 @@
 
     if((deviceParam -> turnOff >= 0xf) || (deviceParam -> acc2First >= 0x1f) ||
        (deviceParam -> acc2Next >= 0x1f) || (deviceParam -> ale2Wr >= 0xf) ||
-        (deviceParam -> wrLow >= 0xf) || (deviceParam -> wrHigh >= 0xf))
-        return false;
+	(deviceParam -> wrLow >= 0xf) || (deviceParam -> wrHigh >= 0xf))
+	return false;
     valueForReg = (((deviceParam -> turnOff) & 0x7) |
-                   (((deviceParam -> turnOff) & 0x8) << 19) |
-                   (((deviceParam -> acc2First) & 0xf) << 3) |
-                   (((deviceParam -> acc2First) & 0x10) << 19) |
-                   (((deviceParam -> acc2Next) & 0xf) << 7) |
-                   (((deviceParam -> acc2Next) & 0x10) << 20) |
-                   (((deviceParam -> ale2Wr) & 0x7) << 11) |
-                   (((deviceParam -> ale2Wr) & 0xf) << 22) |
-                   (((deviceParam -> wrLow) & 0x7) << 14) |
-                   (((deviceParam -> wrLow) & 0xf) << 23) |
-                   (((deviceParam -> wrHigh) & 0x7) << 17) |
-                   (((deviceParam -> wrHigh) & 0xf) << 24));
+		   (((deviceParam -> turnOff) & 0x8) << 19) |
+		   (((deviceParam -> acc2First) & 0xf) << 3) |
+		   (((deviceParam -> acc2First) & 0x10) << 19) |
+		   (((deviceParam -> acc2Next) & 0xf) << 7) |
+		   (((deviceParam -> acc2Next) & 0x10) << 20) |
+		   (((deviceParam -> ale2Wr) & 0x7) << 11) |
+		   (((deviceParam -> ale2Wr) & 0xf) << 22) |
+		   (((deviceParam -> wrLow) & 0x7) << 14) |
+		   (((deviceParam -> wrLow) & 0xf) << 23) |
+		   (((deviceParam -> wrHigh) & 0x7) << 17) |
+		   (((deviceParam -> wrHigh) & 0xf) << 24));
     /* insert the device width: */
     switch(deviceParam->deviceWidth)
     {
     case 1:
-        valueForReg = valueForReg | _8BIT;
-        break;
+	valueForReg = valueForReg | _8BIT;
+	break;
     case 2:
-        valueForReg = valueForReg | _16BIT;
-        break;
+	valueForReg = valueForReg | _16BIT;
+	break;
     case 4:
-        valueForReg = valueForReg | _32BIT;
-        break;
+	valueForReg = valueForReg | _32BIT;
+	break;
     case 8:
-        valueForReg = valueForReg | _64BIT;
-        break;
+	valueForReg = valueForReg | _64BIT;
+	break;
     default:
-        valueForReg = valueForReg | _8BIT;
-        break;
+	valueForReg = valueForReg | _8BIT;
+	break;
     }
     GT_REG_WRITE(DEVICE_BANK0PARAMETERS + 4 * deviceNum, valueForReg);
     return true;

diff --git a/board/evb64260/misc.S b/board/evb64260/misc.S
index 4bbf6ef..438dea6 100644
--- a/board/evb64260/misc.S
+++ b/board/evb64260/misc.S

@@ -154,29 +154,29 @@
 #endif
 
 /* For use of the debug LEDs */
-        .global led_on0
+	.global led_on0
 led_on0:
-        xor     r18, r18, r18
-        lis     r18, 0x1c80
-        ori     r18, r18, 0x8000
-        stw     r18, 0x0(r18)
-        sync
-        blr
+	xor     r18, r18, r18
+	lis     r18, 0x1c80
+	ori     r18, r18, 0x8000
+	stw     r18, 0x0(r18)
+	sync
+	blr
 
-        .global led_on1
+	.global led_on1
 led_on1:
-        xor     r18, r18, r18
-        lis     r18, 0x1c80
-        ori     r18, r18, 0xc000
-        stw     r18, 0x0(r18)
-        sync
-        blr
+	xor     r18, r18, r18
+	lis     r18, 0x1c80
+	ori     r18, r18, 0xc000
+	stw     r18, 0x0(r18)
+	sync
+	blr
 
-        .global led_on2
+	.global led_on2
 led_on2:
-        xor     r18, r18, r18
-        lis     r18, 0x1c81
-        ori     r18, r18, 0x0000
-        stw     r18, 0x0(r18)
-        sync
-        blr
+	xor     r18, r18, r18
+	lis     r18, 0x1c81
+	ori     r18, r18, 0x0000
+	stw     r18, 0x0(r18)
+	sync
+	blr

diff --git a/board/evb64260/mpsc.c b/board/evb64260/mpsc.c
index 31a6a0d..718fe05 100644
--- a/board/evb64260/mpsc.c
+++ b/board/evb64260/mpsc.c

@@ -131,7 +131,7 @@
 static int
 mpsc_putchar_sdma(char ch)
 {
-    	volatile unsigned int *p;
+	volatile unsigned int *p;
 	unsigned int temp;
 
 
@@ -237,7 +237,7 @@
 	}
 
 	if (done == len) {
-	    	/* nothing left in this descriptor.
+		/* nothing left in this descriptor.
 		 * go to next one
 		 */
 		p[1] = DESC_OWNER | DESC_FIRST | DESC_LAST;
@@ -488,7 +488,7 @@
 {
 	unsigned int temp;
 
-        temp = GTREGREAD(GALSDMA_0_CONF_REG+(channel*GALSDMA_REG_DIFF));
+	temp = GTREGREAD(GALSDMA_0_CONF_REG+(channel*GALSDMA_REG_DIFF));
 	temp |= 0x00000001;
 	GT_REG_WRITE(GALSDMA_0_CONF_REG+(channel*GALSDMA_REG_DIFF), temp);
 
@@ -500,7 +500,7 @@
 {
 	unsigned int temp;
 
-        temp = GTREGREAD(GALSDMA_0_CONF_REG+(channel*GALSDMA_REG_DIFF));
+	temp = GTREGREAD(GALSDMA_0_CONF_REG+(channel*GALSDMA_REG_DIFF));
 	temp |= 0x00000002;
 	GT_REG_WRITE(GALSDMA_0_CONF_REG+(channel*GALSDMA_REG_DIFF), temp);
 
@@ -512,7 +512,7 @@
 {
 	unsigned int temp;
 
-        temp = GTREGREAD(GALSDMA_0_CONF_REG+(channel*GALSDMA_REG_DIFF));
+	temp = GTREGREAD(GALSDMA_0_CONF_REG+(channel*GALSDMA_REG_DIFF));
 	temp |= 0x00000040;
 	GT_REG_WRITE(GALSDMA_0_CONF_REG+(channel*GALSDMA_REG_DIFF), temp);
 
@@ -524,7 +524,7 @@
 {
 	unsigned int temp;
 
-        temp = GTREGREAD(GALSDMA_0_CONF_REG+(channel*GALSDMA_REG_DIFF));
+	temp = GTREGREAD(GALSDMA_0_CONF_REG+(channel*GALSDMA_REG_DIFF));
 	temp |= 0x00000080;
 	GT_REG_WRITE(GALSDMA_0_CONF_REG+(channel*GALSDMA_REG_DIFF), temp);
 

diff --git a/board/evb64260/pci.c b/board/evb64260/pci.c
index 5f3b154..22da746 100644
--- a/board/evb64260/pci.c
+++ b/board/evb64260/pci.c

@@ -79,11 +79,11 @@
     unsigned int addr;
 
     if(pciDevNum > 32) /* illegal device Number */
-        return;
+	return;
     if(pciDevNum == SELF) /* configure our configuration space. */
     {
-        pciDevNum = (GTREGREAD(pci_p2p_configuration_reg[host]) >> 24) & 0x1f;
-        busNum = GTREGREAD(pci_p2p_configuration_reg[host]) & 0xff0000;
+	pciDevNum = (GTREGREAD(pci_p2p_configuration_reg[host]) >> 24) & 0x1f;
+	busNum = GTREGREAD(pci_p2p_configuration_reg[host]) & 0xff0000;
     }
     functionNum =  regOffset & 0x00000700;
     pciDevNum = pciDevNum << 11;
@@ -116,16 +116,16 @@
 unsigned int pciReadConfigReg (PCI_HOST host, unsigned int regOffset,unsigned int pciDevNum)
 {
     volatile unsigned int DataForAddrReg;
-   	unsigned int data;
+	unsigned int data;
     unsigned int functionNum;
     unsigned int busNum = PCI_BUS(pciDevNum);
 
     if(pciDevNum > 32) /* illegal device Number */
-        return 0xffffffff;
+	return 0xffffffff;
     if(pciDevNum == SELF) /* configure our configuration space. */
     {
-        pciDevNum = (GTREGREAD(pci_p2p_configuration_reg[host]) >> 24) & 0x1f;
-        busNum = GTREGREAD(pci_p2p_configuration_reg[host]) & 0xff0000;
+	pciDevNum = (GTREGREAD(pci_p2p_configuration_reg[host]) >> 24) & 0x1f;
+	busNum = GTREGREAD(pci_p2p_configuration_reg[host]) & 0xff0000;
     }
     functionNum = regOffset & 0x00000700;
     pciDevNum = pciDevNum << 11;
@@ -134,7 +134,7 @@
     GT_REG_WRITE(pci_configuration_address[host],DataForAddrReg);
     GT_REG_READ(pci_configuration_address[host], &data);
     if (data != DataForAddrReg)
-        return 0xffffffff;
+	return 0xffffffff;
     GT_REG_READ(pci_configuration_data[host], &data);
     return data;
 }
@@ -163,34 +163,34 @@
 *********************************************************************/
 void pciOverBridgeWriteConfigReg(PCI_HOST host,
 				 unsigned int regOffset,
-                                 unsigned int pciDevNum,
-                                 unsigned int busNum,unsigned int data)
+				 unsigned int pciDevNum,
+				 unsigned int busNum,unsigned int data)
 {
-   	unsigned int   DataForReg;
+	unsigned int   DataForReg;
     unsigned int   functionNum;
 
-   	functionNum =  regOffset & 0x00000700;
+	functionNum =  regOffset & 0x00000700;
     pciDevNum = pciDevNum << 11;
     regOffset = regOffset & 0xff;
     busNum = busNum << 16;
     if(pciDevNum == SELF) /* This board */
     {
-        DataForReg = ( regOffset | pciDevNum | functionNum) | BIT0;
+	DataForReg = ( regOffset | pciDevNum | functionNum) | BIT0;
     }
     else
     {
-        DataForReg = ( regOffset | pciDevNum | functionNum | busNum) |
-            BIT31 | BIT0;
+	DataForReg = ( regOffset | pciDevNum | functionNum | busNum) |
+	    BIT31 | BIT0;
     }
     GT_REG_WRITE(pci_configuration_address[host],DataForReg);
     if(pciDevNum == SELF) /* This board */
     {
-        GT_REG_WRITE(pci_configuration_data[host],data);
+	GT_REG_WRITE(pci_configuration_data[host],data);
     }
     else /* configuration Transaction over the pci. */
     {
-        /* The PCI is working in LE Mode So it swap the Data. */
-        GT_REG_WRITE(pci_configuration_data[host],WORD_SWAP(data));
+	/* The PCI is working in LE Mode So it swap the Data. */
+	GT_REG_WRITE(pci_configuration_data[host],WORD_SWAP(data));
     }
 }
 
@@ -218,8 +218,8 @@
 *********************************************************************/
 unsigned int pciOverBridgeReadConfigReg(PCI_HOST host,
 					unsigned int regOffset,
-                                        unsigned int pciDevNum,
-                                        unsigned int busNum)
+					unsigned int pciDevNum,
+					unsigned int busNum)
 {
     unsigned int DataForReg;
     unsigned int data;
@@ -231,23 +231,23 @@
     busNum = busNum << 16;
     if (pciDevNum == SELF) /* This board */
     {
-        DataForReg = (regOffset | pciDevNum | functionNum) | BIT31 ;
+	DataForReg = (regOffset | pciDevNum | functionNum) | BIT31 ;
     }
     else /* agent on another bus */
     {
-        DataForReg = (regOffset | pciDevNum | functionNum | busNum) |
-        BIT0 | BIT31 ;
+	DataForReg = (regOffset | pciDevNum | functionNum | busNum) |
+	BIT0 | BIT31 ;
     }
     GT_REG_WRITE(pci_configuration_address[host],DataForReg);
     if (pciDevNum == SELF) /* This board */
-   	{
-        GT_REG_READ(pci_configuration_data[host], &data);
-    	return data;
+	{
+	GT_REG_READ(pci_configuration_data[host], &data);
+	return data;
     }
     else /* The PCI is working in LE Mode So it swap the Data. */
     {
-        GT_REG_READ(pci_configuration_data[host], &data);
-    	return WORD_SWAP(data);
+	GT_REG_READ(pci_configuration_data[host], &data);
+	return WORD_SWAP(data);
     }
 }
 
@@ -356,12 +356,12 @@
 *********************************************************************/
 void pciMapMemoryBank(PCI_HOST host, MEMORY_BANK bank, unsigned int pciDramBase,unsigned int pciDramSize)
 {
-  	pciDramBase = pciDramBase & 0xfffff000;
+	pciDramBase = pciDramBase & 0xfffff000;
     pciDramBase = pciDramBase | (pciReadConfigReg(host,
-        PCI_SCS_0_BASE_ADDRESS + 4*bank,SELF) & 0x00000fff);
+	PCI_SCS_0_BASE_ADDRESS + 4*bank,SELF) & 0x00000fff);
     pciWriteConfigReg(host,PCI_SCS_0_BASE_ADDRESS + 4*bank,SELF,pciDramBase);
     if(pciDramSize == 0)
-        pciDramSize ++;
+	pciDramSize ++;
     GT_REG_WRITE(pci_scs_bank_size[host][bank], pciDramSize-1);
 }
 
@@ -378,7 +378,7 @@
 * Returns: false if one of the parameters is erroneous true otherwise.
 *********************************************************************/
 bool pciSetRegionFeatures(PCI_HOST host, PCI_ACCESS_REGIONS region,unsigned int features,
-                           unsigned int baseAddress,unsigned int regionLength)
+			   unsigned int baseAddress,unsigned int regionLength)
 {
     unsigned int accessLow;
     unsigned int accessHigh;
@@ -386,8 +386,8 @@
 
     if(regionLength == 0) /* close the region. */
     {
-        pciDisableAccessRegion(host, region);
-        return true;
+	pciDisableAccessRegion(host, region);
+	return true;
     }
     /* base Address is store is bits [11:0] */
     accessLow = (baseAddress & 0xfff00000) >> 20;
@@ -464,21 +464,21 @@
 * Returns:  true
 *********************************************************************/
 bool pciParkingDisable(PCI_HOST host, PCI_AGENT_PARK internalAgent,
-                        PCI_AGENT_PARK externalAgent0,
-                        PCI_AGENT_PARK externalAgent1,
-                        PCI_AGENT_PARK externalAgent2,
-                        PCI_AGENT_PARK externalAgent3,
-                        PCI_AGENT_PARK externalAgent4,
-                        PCI_AGENT_PARK externalAgent5)
+			PCI_AGENT_PARK externalAgent0,
+			PCI_AGENT_PARK externalAgent1,
+			PCI_AGENT_PARK externalAgent2,
+			PCI_AGENT_PARK externalAgent3,
+			PCI_AGENT_PARK externalAgent4,
+			PCI_AGENT_PARK externalAgent5)
 {
     unsigned int regData;
     unsigned int writeData;
 
     GT_REG_READ(pci_arbiter_control[host],&regData);
     writeData = (internalAgent << 14) + (externalAgent0 << 15) +     \
-                (externalAgent1 << 16) + (externalAgent2 << 17) +    \
-                (externalAgent3 << 18) + (externalAgent4 << 19) +    \
-                (externalAgent5 << 20);
+		(externalAgent1 << 16) + (externalAgent2 << 17) +    \
+		(externalAgent3 << 18) + (externalAgent4 << 19) +    \
+		(externalAgent5 << 20);
     regData = (regData & ~(0x7f<<14)) | writeData;
     GT_REG_WRITE(pci_arbiter_control[host],regData);
     return true;
@@ -498,8 +498,8 @@
 * Returns: false if one of the parameters is wrong otherwise return true.
 *********************************************************************/
 bool pciSetRegionSnoopMode(PCI_HOST host, PCI_SNOOP_REGION region,PCI_SNOOP_TYPE snoopType,
-                            unsigned int baseAddress,
-                            unsigned int regionLength)
+			    unsigned int baseAddress,
+			    unsigned int regionLength)
 {
     unsigned int snoopXbaseAddress;
     unsigned int snoopXtopAddress;
@@ -507,14 +507,14 @@
     unsigned int snoopHigh = baseAddress + regionLength;
 
     if( (region > PCI_SNOOP_REGION3) || (snoopType > PCI_SNOOP_WB) )
-        return false;
+	return false;
     snoopXbaseAddress = pci_snoop_control_base_0_low[host] + 0x10 * region;
     snoopXtopAddress = pci_snoop_control_top_0[host] + 0x10 * region;
     if(regionLength == 0) /* closing the region */
     {
-        GT_REG_WRITE(snoopXbaseAddress,0x0000ffff);
-        GT_REG_WRITE(snoopXtopAddress,0);
-        return true;
+	GT_REG_WRITE(snoopXbaseAddress,0x0000ffff);
+	GT_REG_WRITE(snoopXtopAddress,0);
+	return true;
     }
     baseAddress = baseAddress & 0xfff00000; /* Granularity of 1MByte */
     data = (baseAddress >> 20) | snoopType << 12;
@@ -533,12 +533,12 @@
 				int offset, u32* value)
 {
 	int bus = PCI_BUS(dev);
-	
+
 	if ((bus == local_buses[0]) || (bus == local_buses[1])){
-		*value = pciReadConfigReg((PCI_HOST) hose->cfg_addr, offset, 
+		*value = pciReadConfigReg((PCI_HOST) hose->cfg_addr, offset,
 					  PCI_DEV(dev));
 	} else {
-		*value = pciOverBridgeReadConfigReg((PCI_HOST) hose->cfg_addr, 
+		*value = pciOverBridgeReadConfigReg((PCI_HOST) hose->cfg_addr,
 						    offset, PCI_DEV(dev), bus);
 	}
 	return 0;
@@ -551,10 +551,10 @@
 	int bus = PCI_BUS(dev);
 
 	if ((bus == local_buses[0]) || (bus == local_buses[1])){
-		pciWriteConfigReg((PCI_HOST)hose->cfg_addr, offset, 
+		pciWriteConfigReg((PCI_HOST)hose->cfg_addr, offset,
 				  PCI_DEV(dev), value);
 	} else {
-		pciOverBridgeWriteConfigReg((PCI_HOST)hose->cfg_addr, offset, 
+		pciOverBridgeWriteConfigReg((PCI_HOST)hose->cfg_addr, offset,
 					    PCI_DEV(dev), value, bus);
 	}
 	return 0;

diff --git a/board/evb64260/sdram_init.c b/board/evb64260/sdram_init.c
index ff98e4d..3616565 100644
--- a/board/evb64260/sdram_init.c
+++ b/board/evb64260/sdram_init.c

@@ -155,7 +155,7 @@
 static int
 check_dimm(uchar slot, sdram_info_t *info)
 {
-        /* assume 2 dimms, 2 banks each 256M - we dont have an
+	/* assume 2 dimms, 2 banks each 256M - we dont have an
 	 * dimm i2c so rely on the detection routines later */
 
 	memset(info, 0, sizeof(*info));
@@ -192,7 +192,7 @@
 
 	get_clocks ();
 
- 	tmemclk = 1000000000 / (gd->bus_clk / 100);  /* in 10 ps units */
+	tmemclk = 1000000000 / (gd->bus_clk / 100);  /* in 10 ps units */
 
 #ifdef CONFIG_EVB64260_750CX
 	if (0 != slot) {
@@ -284,7 +284,7 @@
 #ifdef CFG_BROKEN_CL2
 	if (info->tpar == 2){
 		info->tpar = 3;
-	        DP(printf("tpar fixed-up to: %d\n", info->tpar));
+		DP(printf("tpar fixed-up to: %d\n", info->tpar));
 	}
 #endif
 	/* compute the module DRB size */
@@ -310,7 +310,7 @@
 static int
 setup_sdram_common(sdram_info_t info[2])
 {
-    	ulong tmp;
+	ulong tmp;
 	int tpar=2, tras_clocks=5, registered=1, ecc=2;
 
 	if(!info[0].banks && !info[1].banks) return 0;
@@ -500,7 +500,7 @@
 {
 	ulong checkbank[4] = { [0 ... 3] = 0 };
 	int bank_no;
-        ulong total;
+	ulong total;
 	int nhr;
 	sdram_info_t dimm_info[2];
 
@@ -608,7 +608,7 @@
 	 * chips)
 	 */
 	if (checkbank[2]==0 && checkbank[3]==0) {
-	    	dimm_info[0].ecc=2;
+		dimm_info[0].ecc=2;
 		GT_REG_WRITE(SDRAM_TIMING, GTREGREAD(SDRAM_TIMING) | (1 << 13));
 		/* TODO: do we have to run MRS cycles again? */
 	}
@@ -624,6 +624,6 @@
 	dump_dimm_info(&dimm_info[1]);
 #endif
 	/* TODO: return at MOST 256M? */
-        /* return total > GB/4 ? GB/4 : total; */
+	/* return total > GB/4 ? GB/4 : total; */
 	return total;
 }

diff --git a/board/evb64260/u-boot.lds b/board/evb64260/u-boot.lds
index de50bf4..0dfa8c0 100644
--- a/board/evb64260/u-boot.lds
+++ b/board/evb64260/u-boot.lds

@@ -106,6 +106,11 @@
   _edata  =  .;
   PROVIDE (edata = .);
 
+  __u_boot_cmd_start = .;
+  .u_boot_cmd : { *(.u_boot_cmd) }
+  __u_boot_cmd_end = .;
+
+
   __start___ex_table = .;
   __ex_table : { *(__ex_table) }
   __stop___ex_table = .;

diff --git a/board/evb64260/zuma_pbb.c b/board/evb64260/zuma_pbb.c
index 10c4845..531b16b 100644
--- a/board/evb64260/zuma_pbb.c
+++ b/board/evb64260/zuma_pbb.c

@@ -3,7 +3,6 @@
 
 #if (CONFIG_COMMANDS & CFG_CMD_BSP)
 #include <command.h>
-#include <cmd_bsp.h>
 #endif
 
 #include <pci.h>
@@ -16,9 +15,11 @@
 #define PAT_HI 0x04050607
 
 static PBB_DMA_REG_MAP *zuma_pbb_reg = NULL;
-
 static char test_buf1[2048];
 static char test_buf2[2048];
+void zuma_init_pbb(void);
+int zuma_mbox_init(void);
+int zuma_test_dma(int cmd, int size);
 
 int zuma_test_dma (int cmd, int size)
 {
@@ -197,4 +198,23 @@
 	return 0;
 }
 
+cmd_tbl_t U_BOOT_CMD(zuma_init_pbb) = MK_CMD_ENTRY(
+	"zinit",	 1,	 0,	 do_zuma_init_pbb,
+	"zinit   - init zuma pbb\n",
+	"\n"
+	"    - init zuma pbb\n"
+);
+cmd_tbl_t U_BOOT_CMD(zuma_test_dma) = MK_CMD_ENTRY(
+	"zdtest",	  3,	  1,	  do_zuma_test_dma,
+	"zdtest  - run dma test\n",
+	"[cmd [count]]\n"
+	"    - run dma cmd (w=0,v=1,cp=2,cmp=3,wi=4,vi=5), count bytes\n"
+);
+cmd_tbl_t U_BOOT_CMD(zuma_init_mbox) = MK_CMD_ENTRY(
+	"zminit",	  1,	  0,	  do_zuma_init_mbox,
+	"zminit  - init zuma mbox\n",
+	"\n"
+	"    - init zuma mbox\n"
+);
+
 #endif /* CFG_CMD_BSP */

diff --git a/board/evb64260/zuma_pbb.h b/board/evb64260/zuma_pbb.h
index 663e10c..300b2fe 100644
--- a/board/evb64260/zuma_pbb.h
+++ b/board/evb64260/zuma_pbb.h

@@ -178,7 +178,7 @@
 	    V32 res1:8;	/* bits 24-31 */
 	} _le_bits;
 	V8 byte[4];
-    	V32 word;
+	V32 word;
     } desc;
     V32 pad1;
 } DMA_DESC_LEVEL;
@@ -214,7 +214,7 @@
 
     /* 39/40 (0x138/0x140) */
     union {
-        /* NOTE!! 4 dwords */
+	/* NOTE!! 4 dwords */
 	struct {
 	    V32 channel_3:8;
 	    V32 channel_2:8;

diff --git a/board/fads/Makefile b/board/fads/Makefile
index 20a19b9..baa6c2e 100644
--- a/board/fads/Makefile
+++ b/board/fads/Makefile

@@ -28,7 +28,7 @@
 OBJS	= $(BOARD).o flash.o lamp.o
 
 $(LIB):	.depend $(OBJS)
-	$(AR) crv $@ $^
+	$(AR) crv $@ $(OBJS)
 
 #########################################################################
 

diff --git a/board/fads/fads.c b/board/fads/fads.c
index 8714689..0519771 100644
--- a/board/fads/fads.c
+++ b/board/fads/fads.c

@@ -272,7 +272,7 @@
 
   switch(k) {
   case 0x00 : puts ("ENG - this board sucks, check the errata, not supported\n");
-              return -1;
+	      return -1;
   case 0x01 : puts ("PILOT - warning, read errata \n"); break;
   case 0x02 : puts ("A - warning, read errata \n"); break;
   case 0x03 : puts ("B \n"); break;

diff --git a/board/fads/u-boot.lds b/board/fads/u-boot.lds
index a76b0ff..41776d1 100644
--- a/board/fads/u-boot.lds
+++ b/board/fads/u-boot.lds

@@ -112,6 +112,11 @@
   _edata  =  .;
   PROVIDE (edata = .);
 
+  __u_boot_cmd_start = .;
+  .u_boot_cmd : { *(.u_boot_cmd) }
+  __u_boot_cmd_end = .;
+
+
   __start___ex_table = .;
   __ex_table : { *(__ex_table) }
   __stop___ex_table = .;
@@ -139,4 +144,3 @@
   _end = . ;
   PROVIDE (end = .);
 }
-

diff --git a/board/fads/u-boot.lds.dan b/board/fads/u-boot.lds.dan
deleted file mode 100644
index e829aa9..0000000
--- a/board/fads/u-boot.lds.dan
+++ /dev/null

@@ -1,139 +0,0 @@
-/*
- * (C) Copyright 2000
- * Wolfgang Denk, DENX Software Engineering, wd@denx.de.
- *
- * See file CREDITS for list of people who contributed to this
- * project.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of
- * the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston,
- * MA 02111-1307 USA
- */
-
-OUTPUT_ARCH(powerpc)
-SEARCH_DIR(/lib); SEARCH_DIR(/usr/lib); SEARCH_DIR(/usr/local/lib); SEARCH_DIR(/usr/local/powerpc-any-elf/lib);
-/* Do we need any of these for elf?
-   __DYNAMIC = 0;    */
-SECTIONS
-{
-  /* Read-only sections, merged into text segment: */
-  . = + SIZEOF_HEADERS;
-  .interp : { *(.interp) }
-  .hash          : { *(.hash)		}
-  .dynsym        : { *(.dynsym)		}
-  .dynstr        : { *(.dynstr)		}
-  .rel.text      : { *(.rel.text)		}
-  .rela.text     : { *(.rela.text) 	}
-  .rel.data      : { *(.rel.data)		}
-  .rela.data     : { *(.rela.data) 	}
-  .rel.rodata    : { *(.rel.rodata) 	}
-  .rela.rodata   : { *(.rela.rodata) 	}
-  .rel.got       : { *(.rel.got)		}
-  .rela.got      : { *(.rela.got)		}
-  .rel.ctors     : { *(.rel.ctors)	}
-  .rela.ctors    : { *(.rela.ctors)	}
-  .rel.dtors     : { *(.rel.dtors)	}
-  .rela.dtors    : { *(.rela.dtors)	}
-  .rel.bss       : { *(.rel.bss)		}
-  .rela.bss      : { *(.rela.bss)		}
-  .rel.plt       : { *(.rel.plt)		}
-  .rela.plt      : { *(.rela.plt)		}
-  .init          : { *(.init)	}
-  .plt : { *(.plt) }
-  .text      :
-  {
-    /* WARNING - the following is hand-optimized to fit within	*/
-    /* the sector layout of our flash chips!	XXX FIXME XXX	*/
-
-    cpu/mpc8xx/start.o	(.text)
-    common/dlmalloc.o	(.text)
-    lib_ppc/ppcstring.o	(.text)
-    lib_generic/vsprintf.o	(.text)
-    lib_generic/crc32.o		(.text)
-    lib_generic/zlib.o		(.text)
-
-
-    *(.text)
-    *(.fixup)
-    *(.got1)
-  }
-  _etext = .;
-  PROVIDE (etext = .);
-  .rodata    :
-  {
-    *(.rodata)
-    *(.rodata1)
-  }
-  .fini      : { *(.fini)    } =0
-  .ctors     : { *(.ctors)   }
-  .dtors     : { *(.dtors)   }
-
-  /* Read-write section, merged into data segment: */
-  . = (. + 0x0FFF) & 0xFFFFF000;
-  _erotext = .;
-  PROVIDE (erotext = .);
-  .reloc   :
-  {
-    *(.got)
-    _GOT2_TABLE_ = .;
-    *(.got2)
-    _FIXUP_TABLE_ = .;
-    *(.fixup)
-  }
-  __got2_entries = (_FIXUP_TABLE_ - _GOT2_TABLE_) >>2;
-  __fixup_entries = (. - _FIXUP_TABLE_)>>2;
-
-  .data    :
-  {
-    *(.data)
-    *(.data1)
-    *(.sdata)
-    *(.sdata2)
-    *(.dynamic)
-    CONSTRUCTORS
-  }
-  _edata  =  .;
-  PROVIDE (edata = .);
-
-  __start___ex_table = .;
-  __ex_table : { *(__ex_table) }
-  __stop___ex_table = .;
-
-  . = ALIGN(4096);
-  __init_begin = .;
-  .text.init : { *(.text.init) }
-  .data.init : { *(.data.init) }
-  . = ALIGN(4096);
-  __init_end = .;
-
-  __bss_start = .;
-  .bss       :
-  {
-   *(.sbss) *(.scommon)
-   *(.dynbss)
-   *(.bss)
-   *(COMMON)
-  }
-  . = 0x2840000;
-  .ppcenv 	:
-  {
-/*
-    . = env_offset;
-*/
-    common/environment.o(.ppcenv)
-  }
-  _end = . ;
-  PROVIDE (end = .);
-}
-

diff --git a/board/fads/u-boot.lds.debug b/board/fads/u-boot.lds.debug
index bd13b7b..0245f78 100644
--- a/board/fads/u-boot.lds.debug
+++ b/board/fads/u-boot.lds.debug

@@ -107,6 +107,11 @@
   _edata  =  .;
   PROVIDE (edata = .);
 
+  __u_boot_cmd_start = .;
+  .u_boot_cmd : { *(.u_boot_cmd) }
+  __u_boot_cmd_end = .;
+
+
   __start___ex_table = .;
   __ex_table : { *(__ex_table) }
   __stop___ex_table = .;
@@ -129,4 +134,3 @@
   _end = . ;
   PROVIDE (end = .);
 }
-

diff --git a/board/flagadm/Makefile b/board/flagadm/Makefile
index 35b8428..7a2014d 100644
--- a/board/flagadm/Makefile
+++ b/board/flagadm/Makefile

@@ -28,7 +28,7 @@
 OBJS	= $(BOARD).o flash.o
 
 $(LIB):	.depend $(OBJS)
-	$(AR) crv $@ $^
+	$(AR) crv $@ $(OBJS)
 
 #########################################################################
 

diff --git a/board/flagadm/u-boot.lds b/board/flagadm/u-boot.lds
index 8348fe7..87e323b 100644
--- a/board/flagadm/u-boot.lds
+++ b/board/flagadm/u-boot.lds

@@ -98,6 +98,11 @@
   _edata  =  .;
   PROVIDE (edata = .);
 
+  __u_boot_cmd_start = .;
+  .u_boot_cmd : { *(.u_boot_cmd) }
+  __u_boot_cmd_end = .;
+
+
   __start___ex_table = .;
   __ex_table : { *(__ex_table) }
   __stop___ex_table = .;
@@ -120,4 +125,3 @@
   _end = . ;
   PROVIDE (end = .);
 }
-

diff --git a/board/flagadm/u-boot.lds.debug b/board/flagadm/u-boot.lds.debug
index 8dc6d40..f6f7cf4 100644
--- a/board/flagadm/u-boot.lds.debug
+++ b/board/flagadm/u-boot.lds.debug

@@ -106,6 +106,11 @@
   _edata  =  .;
   PROVIDE (edata = .);
 
+  __u_boot_cmd_start = .;
+  .u_boot_cmd : { *(.u_boot_cmd) }
+  __u_boot_cmd_end = .;
+
+
   __start___ex_table = .;
   __ex_table : { *(__ex_table) }
   __stop___ex_table = .;
@@ -128,4 +133,3 @@
   _end = . ;
   PROVIDE (end = .);
 }
-

diff --git a/board/gen860t/Makefile b/board/gen860t/Makefile
index 21bf040..dd7ecf1 100644
--- a/board/gen860t/Makefile
+++ b/board/gen860t/Makefile

@@ -28,7 +28,7 @@
 OBJS	= $(BOARD).o flash.o beeper.o fpga.o ioport.o
 
 $(LIB):	.depend $(OBJS)
-	$(AR) crv $@ $^
+	$(AR) crv $@ $(OBJS)
 
 #########################################################################
 

diff --git a/board/gen860t/README b/board/gen860t/README
index 7c03f93..7205afb 100644
--- a/board/gen860t/README
+++ b/board/gen860t/README

@@ -144,4 +144,3 @@
 <outwater@eskimo.com>
 
 vim: set ts=4 sw=4 tw=78:
-

diff --git a/board/gen860t/u-boot-flashenv.lds b/board/gen860t/u-boot-flashenv.lds
index e95a6a1..f46c314 100644
--- a/board/gen860t/u-boot-flashenv.lds
+++ b/board/gen860t/u-boot-flashenv.lds

@@ -121,7 +121,7 @@
    *(.bss)
    *(COMMON)
   }
-  
+
   _end = . ;
   PROVIDE (end = .);
 

diff --git a/board/gen860t/u-boot.lds b/board/gen860t/u-boot.lds
index b7b190e..d4c258f 100644
--- a/board/gen860t/u-boot.lds
+++ b/board/gen860t/u-boot.lds

@@ -101,6 +101,11 @@
   _edata  =  .;
   PROVIDE (edata = .);
 
+  __u_boot_cmd_start = .;
+  .u_boot_cmd : { *(.u_boot_cmd) }
+  __u_boot_cmd_end = .;
+
+
   __start___ex_table = .;
   __ex_table : { *(__ex_table) }
   __stop___ex_table = .;

diff --git a/board/genietv/Makefile b/board/genietv/Makefile
index ef173d0..13ce9fc 100644
--- a/board/genietv/Makefile
+++ b/board/genietv/Makefile

@@ -28,7 +28,7 @@
 OBJS	= $(BOARD).o flash.o
 
 $(LIB):	.depend $(OBJS)
-	$(AR) crv $@ $^
+	$(AR) crv $@ $(OBJS)
 
 #########################################################################
 

diff --git a/board/genietv/genietv.c b/board/genietv/genietv.c
index 8f32ad7..a5e64b3 100644
--- a/board/genietv/genietv.c
+++ b/board/genietv/genietv.c

@@ -49,9 +49,9 @@
 	/*
 	 * SDRAM Initialization (offset 5 in UPMB RAM)
 	 *
-         * This is no UPM entry point. The following definition uses
-         * the remaining space to establish an initialization
-         * sequence, which is executed by a RUN command.
+	 * This is no UPM entry point. The following definition uses
+	 * the remaining space to establish an initialization
+	 * sequence, which is executed by a RUN command.
 	 *
 	 */
 		    0x1FFDDC34, 0xEFEEAC34, 0x1FBD5C35, /* last */
@@ -198,21 +198,21 @@
 
     if (size_b1 > 0)
     {
-        /*
-         * Position Bank 1 immediately above Bank 0
-         */
-        memctl->memc_or2 = ((-size_b1) & 0xFFFF0000) | CFG_OR_TIMING_SDRAM;
-        memctl->memc_br2 = ((CFG_SDRAM_BASE & BR_BA_MSK) | BR_MS_UPMB | BR_V) +
-	                   (size_b0 & BR_BA_MSK);
+	/*
+	 * Position Bank 1 immediately above Bank 0
+	 */
+	memctl->memc_or2 = ((-size_b1) & 0xFFFF0000) | CFG_OR_TIMING_SDRAM;
+	memctl->memc_br2 = ((CFG_SDRAM_BASE & BR_BA_MSK) | BR_MS_UPMB | BR_V) +
+			   (size_b0 & BR_BA_MSK);
     }
 	else
     {
-        /*
-         * No bank 1
-         *
-         * invalidate bank
-         */
-        memctl->memc_br2 = 0;
+	/*
+	 * No bank 1
+	 *
+	 * invalidate bank
+	 */
+	memctl->memc_br2 = 0;
 	/* adjust refresh rate depending on SDRAM type, one bank */
 	memctl->memc_mptpr = CFG_MPTPR_1BK_4K;
     }

diff --git a/board/genietv/u-boot.lds b/board/genietv/u-boot.lds
index 451d853..276e2b4 100644
--- a/board/genietv/u-boot.lds
+++ b/board/genietv/u-boot.lds

@@ -108,6 +108,11 @@
   _edata  =  .;
   PROVIDE (edata = .);
 
+  __u_boot_cmd_start = .;
+  .u_boot_cmd : { *(.u_boot_cmd) }
+  __u_boot_cmd_end = .;
+
+
   __start___ex_table = .;
   __ex_table : { *(__ex_table) }
   __stop___ex_table = .;
@@ -135,4 +140,3 @@
   _end = . ;
   PROVIDE (end = .);
 }
-

diff --git a/board/genietv/u-boot.lds.debug b/board/genietv/u-boot.lds.debug
index aaf58f0..749817d 100644
--- a/board/genietv/u-boot.lds.debug
+++ b/board/genietv/u-boot.lds.debug

@@ -107,6 +107,11 @@
   _edata  =  .;
   PROVIDE (edata = .);
 
+  __u_boot_cmd_start = .;
+  .u_boot_cmd : { *(.u_boot_cmd) }
+  __u_boot_cmd_end = .;
+
+
   __start___ex_table = .;
   __ex_table : { *(__ex_table) }
   __stop___ex_table = .;
@@ -134,4 +139,3 @@
   _end = . ;
   PROVIDE (end = .);
 }
-

diff --git a/board/gth/Makefile b/board/gth/Makefile
index 4571a05..e14c12e 100644
--- a/board/gth/Makefile
+++ b/board/gth/Makefile

@@ -28,7 +28,7 @@
 OBJS	= $(BOARD).o flash.o ee_access.o
 
 $(LIB):	.depend $(OBJS)
-	$(AR) crv $@ $^
+	$(AR) crv $@ $(OBJS)
 
 #########################################################################
 

diff --git a/board/gth/README b/board/gth/README
index 44caf3a..241c70b 100644
--- a/board/gth/README
+++ b/board/gth/README

@@ -16,5 +16,3 @@
 from miniboot that boots the first U-Boot image found in
 flash.
 For miniboot code, description, see www.opensource.se
-
-

diff --git a/board/gth/config.mk b/board/gth/config.mk
index b74dff3..3c80156 100644
--- a/board/gth/config.mk
+++ b/board/gth/config.mk

@@ -38,4 +38,3 @@
 endif
 
 OBJCFLAGS =	--set-section-flags=.ppcenv=contents,alloc,load,data
-

diff --git a/board/gth/u-boot.lds b/board/gth/u-boot.lds
index a5d4bed..50f41b5 100644
--- a/board/gth/u-boot.lds
+++ b/board/gth/u-boot.lds

@@ -98,6 +98,11 @@
   _edata  =  .;
   PROVIDE (edata = .);
 
+  __u_boot_cmd_start = .;
+  .u_boot_cmd : { *(.u_boot_cmd) }
+  __u_boot_cmd_end = .;
+
+
   __start___ex_table = .;
   __ex_table : { *(__ex_table) }
   __stop___ex_table = .;
@@ -120,4 +125,3 @@
   _end = . ;
   PROVIDE (end = .);
 }
-

diff --git a/board/gw8260/Makefile b/board/gw8260/Makefile
index fb50b38..827a6ac 100644
--- a/board/gw8260/Makefile
+++ b/board/gw8260/Makefile

@@ -29,7 +29,7 @@
 SOBJS   :=
 
 $(LIB):	$(OBJS) $(SOBJS)
-	$(AR) crv $@ $^
+	$(AR) crv $@ $(OBJS)
 
 clean:
 	rm -f $(SOBJS) $(OBJS)

diff --git a/board/gw8260/u-boot.lds b/board/gw8260/u-boot.lds
index 6db9a67..32e8f39 100644
--- a/board/gw8260/u-boot.lds
+++ b/board/gw8260/u-boot.lds

@@ -93,6 +93,11 @@
   _edata  =  .;
   PROVIDE (edata = .);
 
+  __u_boot_cmd_start = .;
+  .u_boot_cmd : { *(.u_boot_cmd) }
+  __u_boot_cmd_end = .;
+
+
   __start___ex_table = .;
   __ex_table : { *(__ex_table) }
   __stop___ex_table = .;
@@ -115,4 +120,3 @@
   _end = . ;
   PROVIDE (end = .);
 }
-

diff --git a/board/hermes/Makefile b/board/hermes/Makefile
index ef173d0..13ce9fc 100644
--- a/board/hermes/Makefile
+++ b/board/hermes/Makefile

@@ -28,7 +28,7 @@
 OBJS	= $(BOARD).o flash.o
 
 $(LIB):	.depend $(OBJS)
-	$(AR) crv $@ $^
+	$(AR) crv $@ $(OBJS)
 
 #########################################################################
 

diff --git a/board/hermes/u-boot.lds b/board/hermes/u-boot.lds
index e713055..4dbf7a6 100644
--- a/board/hermes/u-boot.lds
+++ b/board/hermes/u-boot.lds

@@ -109,6 +109,11 @@
   _edata  =  .;
   PROVIDE (edata = .);
 
+  __u_boot_cmd_start = .;
+  .u_boot_cmd : { *(.u_boot_cmd) }
+  __u_boot_cmd_end = .;
+
+
   __start___ex_table = .;
   __ex_table : { *(__ex_table) }
   __stop___ex_table = .;

diff --git a/board/hermes/u-boot.lds.debug b/board/hermes/u-boot.lds.debug
index 1568a47..49e84c0 100644
--- a/board/hermes/u-boot.lds.debug
+++ b/board/hermes/u-boot.lds.debug

@@ -106,6 +106,11 @@
   _edata  =  .;
   PROVIDE (edata = .);
 
+  __u_boot_cmd_start = .;
+  .u_boot_cmd : { *(.u_boot_cmd) }
+  __u_boot_cmd_end = .;
+
+
   __start___ex_table = .;
   __ex_table : { *(__ex_table) }
   __stop___ex_table = .;
@@ -128,4 +133,3 @@
   _end = . ;
   PROVIDE (end = .);
 }
-

diff --git a/board/hymod/Makefile b/board/hymod/Makefile
index 4d3097c..b52af9a 100644
--- a/board/hymod/Makefile
+++ b/board/hymod/Makefile

@@ -28,7 +28,7 @@
 OBJS	= $(BOARD).o flash.o bsp.o eeprom.o fetch.o input.o env.o
 
 $(LIB):	.depend $(OBJS)
-	$(AR) crv $@ $^
+	$(AR) crv $@ $(OBJS)
 
 #########################################################################
 

diff --git a/board/hymod/bsp.c b/board/hymod/bsp.c
index 02b6421..f131e51 100644
--- a/board/hymod/bsp.c
+++ b/board/hymod/bsp.c

@@ -276,7 +276,30 @@
 	printf ("Usage:\n%s\n", cmdtp->usage);
 	return 1;
 }
-
+cmd_tbl_t U_BOOT_CMD(fpga) = MK_CMD_ENTRY(
+	"fpga",	6,	1,	do_fpga,
+	"fpga    - FPGA sub-system\n",
+	"load [type] addr size\n"
+	"  - write the configuration data at memory address `addr',\n"
+	"    size `size' bytes, into the FPGA of type `type' (either\n"
+	"    `main' or `mezz', default `main'). e.g.\n"
+	"        `fpga load 100000 7d8f'\n"
+	"    loads the main FPGA with config data at address 100000\n"
+	"    HEX, size 7d8f HEX (32143 DEC) bytes\n"
+	"fpga tftp file addr\n"
+	"  - transfers `file' from the tftp server into memory at\n"
+	"    address `addr', then writes the entire file contents\n"
+	"    into the main FPGA\n"
+	"fpga store addr\n"
+	"  - read configuration data from the main FPGA (the mezz\n"
+	"    FPGA is write-only), into address `addr'. There must be\n"
+	"    enough memory available at `addr' to hold all the config\n"
+	"    data - the size of which is determined by VC:???\n"
+	"fpga info\n"
+	"  - print information about the Hymod FPGA, namely the\n"
+	"    memory addresses at which the four FPGA local bus\n"
+	"    address spaces appear in the physical address space\n"
+);
 /* ------------------------------------------------------------------------- */
 int
 do_eecl (cmd_tbl_t * cmdtp, int flag, int argc, char *argv[])
@@ -312,15 +335,17 @@
 
 	return 0;
 }
+cmd_tbl_t U_BOOT_CMD(eec) = MK_CMD_ENTRY(
+	"eeclear",	1,	0,	do_eecl,
+	"eeclear - Clear the eeprom on a Hymod board \n",
+	"[type]\n"
+	"  - write zeroes into the EEPROM on the board of type `type'\n"
+	"    (`type' is either `main' or `mezz' - default `main')\n"
+	"    Note: the EEPROM write enable jumper must be installed\n"
+);
 
 /* ------------------------------------------------------------------------- */
 
-#if 0
-static uchar test_bitfile[] = {
-	/* one day ... */
-};
-#endif
-
 int
 do_htest (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
 {

diff --git a/board/hymod/u-boot.lds b/board/hymod/u-boot.lds
index d71859c..1e20425 100644
--- a/board/hymod/u-boot.lds
+++ b/board/hymod/u-boot.lds

@@ -111,6 +111,11 @@
   _edata  =  .;
   PROVIDE (edata = .);
 
+  __u_boot_cmd_start = .;
+  .u_boot_cmd : { *(.u_boot_cmd) }
+  __u_boot_cmd_end = .;
+
+
   __start___ex_table = .;
   __ex_table : { *(__ex_table) }
   __stop___ex_table = .;
@@ -138,4 +143,3 @@
   _end = . ;
   PROVIDE (end = .);
 }
-

diff --git a/board/hymod/u-boot.lds.debug b/board/hymod/u-boot.lds.debug
index 22138f8..c0ee849 100644
--- a/board/hymod/u-boot.lds.debug
+++ b/board/hymod/u-boot.lds.debug

@@ -106,6 +106,11 @@
   _edata  =  .;
   PROVIDE (edata = .);
 
+  __u_boot_cmd_start = .;
+  .u_boot_cmd : { *(.u_boot_cmd) }
+  __u_boot_cmd_end = .;
+
+
   __start___ex_table = .;
   __ex_table : { *(__ex_table) }
   __stop___ex_table = .;
@@ -128,4 +133,3 @@
   _end = . ;
   PROVIDE (end = .);
 }
-

diff --git a/board/icu862/Makefile b/board/icu862/Makefile
index 35b8428..7a2014d 100644
--- a/board/icu862/Makefile
+++ b/board/icu862/Makefile

@@ -28,7 +28,7 @@
 OBJS	= $(BOARD).o flash.o
 
 $(LIB):	.depend $(OBJS)
-	$(AR) crv $@ $^
+	$(AR) crv $@ $(OBJS)
 
 #########################################################################
 

diff --git a/board/icu862/u-boot.lds b/board/icu862/u-boot.lds
index e14520b..496c598 100644
--- a/board/icu862/u-boot.lds
+++ b/board/icu862/u-boot.lds

@@ -112,6 +112,11 @@
   _edata  =  .;
   PROVIDE (edata = .);
 
+  __u_boot_cmd_start = .;
+  .u_boot_cmd : { *(.u_boot_cmd) }
+  __u_boot_cmd_end = .;
+
+
   __start___ex_table = .;
   __ex_table : { *(__ex_table) }
   __stop___ex_table = .;
@@ -139,4 +144,3 @@
   _end = . ;
   PROVIDE (end = .);
 }
-

diff --git a/board/icu862/u-boot.lds.debug b/board/icu862/u-boot.lds.debug
index 2365116..7b84fd3 100644
--- a/board/icu862/u-boot.lds.debug
+++ b/board/icu862/u-boot.lds.debug

@@ -107,6 +107,11 @@
   _edata  =  .;
   PROVIDE (edata = .);
 
+  __u_boot_cmd_start = .;
+  .u_boot_cmd : { *(.u_boot_cmd) }
+  __u_boot_cmd_end = .;
+
+
   __start___ex_table = .;
   __ex_table : { *(__ex_table) }
   __stop___ex_table = .;
@@ -129,4 +134,3 @@
   _end = . ;
   PROVIDE (end = .);
 }
-

diff --git a/board/impa7/Makefile b/board/impa7/Makefile
index d936308..f8323e0 100644
--- a/board/impa7/Makefile
+++ b/board/impa7/Makefile

@@ -29,7 +29,7 @@
 SOBJS	:= memsetup.o
 
 $(LIB):	$(OBJS) $(SOBJS)
-	$(AR) crv $@ $^
+	$(AR) crv $@ $(OBJS) $(SOBJS)
 
 clean:
 	rm -f $(SOBJS) $(OBJS)

diff --git a/board/impa7/flash.c b/board/impa7/flash.c
index 7db0b32..da4d31e 100644
--- a/board/impa7/flash.c
+++ b/board/impa7/flash.c

@@ -221,7 +221,7 @@
     /* Check if Flash is (sufficiently) erased
      */
     if ((*addr & data) != data)
-        return ERR_NOT_ERASED;
+	return ERR_NOT_ERASED;
 
     /*
      * Disable interrupts which might cause a timeout

diff --git a/board/impa7/memsetup.S b/board/impa7/memsetup.S
index d1d1a57..5cb5fa8 100644
--- a/board/impa7/memsetup.S
+++ b/board/impa7/memsetup.S

@@ -21,7 +21,6 @@
  */
 
 
-
 #include <config.h>
 #include <version.h>
 
@@ -84,4 +83,3 @@
 
 	/* everything is fine now */
 	mov	pc, lr
-

diff --git a/board/impa7/u-boot.lds b/board/impa7/u-boot.lds
index 0849648..36521b8 100644
--- a/board/impa7/u-boot.lds
+++ b/board/impa7/u-boot.lds

@@ -26,28 +26,33 @@
 ENTRY(_start)
 SECTIONS
 {
-        . = 0x00000000;
+	. = 0x00000000;
 
-        . = ALIGN(4);
+	. = ALIGN(4);
 	.text      :
 	{
 	  cpu/arm720t/start.o	(.text)
 	  *(.text)
 	}
 
-        . = ALIGN(4);
-        .rodata : { *(.rodata) }
+	. = ALIGN(4);
+	.rodata : { *(.rodata) }
 
-        . = ALIGN(4);
-        .data : { *(.data) }
+	. = ALIGN(4);
+	.data : { *(.data) }
 
-        . = ALIGN(4);
-        .got : { *(.got) }
+	. = ALIGN(4);
+	.got : { *(.got) }
+
+  __u_boot_cmd_start = .;
+  .u_boot_cmd : { *(.u_boot_cmd) }
+  __u_boot_cmd_end = .;
 
 	armboot_end_data = .;
 
-        . = ALIGN(4);
-        .bss : { *(.bss) }
+	. = ALIGN(4);
+	.bss : { *(.bss) }
 
 	armboot_end = .;
+
 }

diff --git a/board/incaip/Makefile b/board/incaip/Makefile
index ad59bf0..d1cdc6b 100644
--- a/board/incaip/Makefile
+++ b/board/incaip/Makefile

@@ -29,7 +29,7 @@
 SOBJS	= memsetup.o
 
 $(LIB):	.depend $(OBJS) $(SOBJS)
-	$(AR) crv $@ $^
+	$(AR) crv $@ $(OBJS) $(SOBJS)
 
 #########################################################################
 

diff --git a/board/incaip/flash.c b/board/incaip/flash.c
index e7fd540..686f2e9 100644
--- a/board/incaip/flash.c
+++ b/board/incaip/flash.c

@@ -85,14 +85,14 @@
 		memset(&flash_info[i], 0, sizeof(flash_info_t));
 #endif
 
-		flash_info[i].size = 
+		flash_info[i].size =
 			flash_get_size((FPW *)flashbase, &flash_info[i]);
 
 		if (flash_info[i].flash_id == FLASH_UNKNOWN) {
 			printf ("## Unknown FLASH on Bank %d - Size = 0x%08lx\n",
 			i, flash_info[i].size);
 		}
-		
+
 		size += flash_info[i].size;
 	}
 
@@ -172,13 +172,13 @@
 {
 	int i;
 	flash_info_t * info;
-	
+
 	for (i = 0; i < CFG_MAX_FLASH_BANKS; i ++) {
 		info = & flash_info[i];
 		if (info->start[0] <= base && base < info->start[0] + info->size)
 			break;
 	}
-	
+
 	return i == CFG_MAX_FLASH_BANKS ? 0 : info;
 }
 
@@ -225,32 +225,32 @@
 	case FLASH_AM640U:
 		fmt = "29LV641D (64 Mbit, uniform sectors)\n";
 		break;
-        case FLASH_28F800C3B:
-        case FLASH_28F800C3T:
+	case FLASH_28F800C3B:
+	case FLASH_28F800C3T:
 		fmt = "28F800C3%s (8 Mbit, %s)\n";
 		break;
 	case FLASH_INTEL800B:
 	case FLASH_INTEL800T:
 		fmt = "28F800B3%s (8 Mbit, %s)\n";
 		break;
-        case FLASH_28F160C3B:
-        case FLASH_28F160C3T:
+	case FLASH_28F160C3B:
+	case FLASH_28F160C3T:
 		fmt = "28F160C3%s (16 Mbit, %s)\n";
 		break;
 	case FLASH_INTEL160B:
 	case FLASH_INTEL160T:
 		fmt = "28F160B3%s (16 Mbit, %s)\n";
 		break;
-        case FLASH_28F320C3B:
-        case FLASH_28F320C3T:
+	case FLASH_28F320C3B:
+	case FLASH_28F320C3T:
 		fmt = "28F320C3%s (32 Mbit, %s)\n";
 		break;
 	case FLASH_INTEL320B:
 	case FLASH_INTEL320T:
 		fmt = "28F320B3%s (32 Mbit, %s)\n";
 		break;
-        case FLASH_28F640C3B:
-        case FLASH_28F640C3T:
+	case FLASH_28F640C3B:
+	case FLASH_28F640C3T:
 		fmt = "28F640C3%s (64 Mbit, %s)\n";
 		break;
 	case FLASH_INTEL640B:
@@ -534,15 +534,15 @@
 	 left > 0 && res == 0;
 	 addr += sizeof(data), left -= sizeof(data) - bytes) {
 
-        bytes = addr & (sizeof(data) - 1);
-        addr &= ~(sizeof(data) - 1);
+	bytes = addr & (sizeof(data) - 1);
+	addr &= ~(sizeof(data) - 1);
 
 	/* combine source and destination data so can program
 	 * an entire word of 16 or 32 bits
 	 */
-        for (i = 0; i < sizeof(data); i++) {
-            data <<= 8;
-            if (i < bytes || i - bytes >= left )
+	for (i = 0; i < sizeof(data); i++) {
+	    data <<= 8;
+	    if (i < bytes || i - bytes >= left )
 		data += *((uchar *)addr + i);
 	    else
 		data += *src++;

diff --git a/board/incaip/memsetup.S b/board/incaip/memsetup.S
index f1afb5c..245ab72 100644
--- a/board/incaip/memsetup.S
+++ b/board/incaip/memsetup.S

@@ -133,7 +133,7 @@
 	sw	t1, MC_MRSCODE(t0)
 
 	/* Set word width to 16 bit */
-	li	t1, 0x2  
+	li	t1, 0x2
 	sw	t1, MC_CFGDW(t0)
 
 	/* Set CS0 to SDRAM parameters */
@@ -154,4 +154,3 @@
 
 	j	ra
 	nop
-

diff --git a/board/incaip/u-boot.lds b/board/incaip/u-boot.lds
index 3c9ca89..a2d19a8 100644
--- a/board/incaip/u-boot.lds
+++ b/board/incaip/u-boot.lds

@@ -29,19 +29,19 @@
 ENTRY(_start)
 SECTIONS
 {
-        . = 0x00000000;
+	. = 0x00000000;
 
-        . = ALIGN(4);
+	. = ALIGN(4);
 	.text       :
 	{
 	  *(.text)
 	}
 
-        . = ALIGN(4);
-        .rodata  : { *(.rodata) }
+	. = ALIGN(4);
+	.rodata  : { *(.rodata) }
 
-        . = ALIGN(4);
-        .data  : { *(.data) }
+	. = ALIGN(4);
+	.data  : { *(.data) }
 
 	. = ALIGN(4);
 	.sdata  : { *(.sdata) }
@@ -54,11 +54,15 @@
 
 	.sdata  : { *(.sdata) }
 
+	__u_boot_cmd_start = .;
+	.u_boot_cmd : { *(.u_boot_cmd) }
+	__u_boot_cmd_end = .;
+
 	uboot_end_data = .;
 	num_got_entries = (__got_end - __got_start) >> 2;
 
-        . = ALIGN(4);
+	. = ALIGN(4);
 	.sbss  : { *(.sbss) }
-        .bss  : { *(.bss) }
+	.bss  : { *(.bss) }
 	uboot_end = .;
 }

diff --git a/board/innokom/Makefile b/board/innokom/Makefile
index 7fbe76b..59eaee5 100644
--- a/board/innokom/Makefile
+++ b/board/innokom/Makefile

@@ -29,7 +29,7 @@
 SOBJS	:= memsetup.o
 
 $(LIB):	$(OBJS) $(SOBJS)
-	$(AR) crv $@ $^
+	$(AR) crv $@ $(OBJS) $(SOBJS)
 
 clean:
 	rm -f $(SOBJS) $(OBJS)

diff --git a/board/innokom/config.mk b/board/innokom/config.mk
index 939ffff..2354392 100644
--- a/board/innokom/config.mk
+++ b/board/innokom/config.mk

@@ -13,4 +13,3 @@
 # for the addresses _after_ relocation to RAM!! Otherwhise the
 # .bss segment is assumed in flash...
 TEXT_BASE = 0xa1fe0000
-

diff --git a/board/innokom/flash.c b/board/innokom/flash.c
index b7c2072..3caf43d 100644
--- a/board/innokom/flash.c
+++ b/board/innokom/flash.c

@@ -10,7 +10,7 @@
  * Robert Schwebel, Pengutronix, <r.schwebel@pengutronix.de>
  *
  * (C) Copyright 2002
- * Auerswald GmbH & Co KG, Germany 
+ * Auerswald GmbH & Co KG, Germany
  * Kai-Uwe Bloem <kai-uwe.bloem@auerswald.de>
  *
  * See file CREDITS for list of people who contributed to this
@@ -42,7 +42,6 @@
 /* Debugging macros ------------------------------------------------------  */
 
 #undef FLASH_DEBUG
-//#define FLASH_DEBUG 1
 
 /* Some debug macros */
 #if (FLASH_DEBUG > 2 )
@@ -107,10 +106,10 @@
 	/* u-boot partition                                                 */
 	if(part_num==0){
 		memset(&part, 0, sizeof(part));
-		
+
 		part.offset=(char*)0x00000000;
 		part.size=256*1024;
-		
+
 		/* Mark the struct as ready */
 		current_part = part_num;
 
@@ -121,24 +120,24 @@
 	/* primary OS+firmware partition                                    */
 	if(part_num==1){
 		memset(&part, 0, sizeof(part));
-		
+
 		part.offset=(char*)0x00040000;
 		part.size=768*1024;
-		
+
 		/* Mark the struct as ready */
 		current_part = part_num;
 
 		PRINTK("part.offset = 0x%08x\n",(unsigned int)part.offset);
 		PRINTK("part.size   = 0x%08x\n",(unsigned int)part.size);
 	}
-	
+
 	/* secondary OS+firmware partition                                  */
 	if(part_num==2){
 		memset(&part, 0, sizeof(part));
-		
+
 		part.offset=(char*)0x00100000;
 		part.size=8*1024*1024;
-		
+
 		/* Mark the struct as ready */
 		current_part = part_num;
 
@@ -149,17 +148,17 @@
 	/* data partition */
 	if(part_num==3){
 		memset(&part, 0, sizeof(part));
-		
+
 		part.offset=(char*)0x00900000;
 		part.size=7*1024*1024;
-		
+
 		/* Mark the struct as ready */
 		current_part = part_num;
 
 		PRINTK("part.offset = 0x%08x\n",(unsigned int)part.offset);
 		PRINTK("part.size   = 0x%08x\n",(unsigned int)part.size);
 	}
-	
+
 	if (current_part == part_num) {
 		part.usr_priv = &current_part;
 		part.jffs2_priv = jffs2_priv_saved;
@@ -186,10 +185,10 @@
 	/* u-boot partition                                                 */
 	if(part_num==0){
 		memset(&part, 0, sizeof(part));
-		
+
 		part.offset=(char*)0x00000000;
 		part.size=256*1024;
-		
+
 		/* Mark the struct as ready */
 		current_part = part_num;
 
@@ -200,24 +199,24 @@
 	/* primary OS+firmware partition                                    */
 	if(part_num==1){
 		memset(&part, 0, sizeof(part));
-		
+
 		part.offset=(char*)0x00040000;
 		part.size=16*1024*1024-128*1024;
-		
+
 		/* Mark the struct as ready */
 		current_part = part_num;
 
 		PRINTK("part.offset = 0x%08x\n",(unsigned int)part.offset);
 		PRINTK("part.size   = 0x%08x\n",(unsigned int)part.size);
 	}
-	
+
 	/* secondary OS+firmware partition                                  */
 	if(part_num==2){
 		memset(&part, 0, sizeof(part));
-		
+
 		part.offset=(char*)0x01020000;
 		part.size=16*1024*1024-128*1024;
-		
+
 		/* Mark the struct as ready */
 		current_part = part_num;
 
@@ -228,17 +227,17 @@
 	/* data partition */
 	if(part_num==3){
 		memset(&part, 0, sizeof(part));
-		
+
 		part.offset=(char*)0x02000000;
 		part.size=32*1024*1024;
-		
+
 		/* Mark the struct as ready */
 		current_part = part_num;
 
 		PRINTK("part.offset = 0x%08x\n",(unsigned int)part.offset);
 		PRINTK("part.size   = 0x%08x\n",(unsigned int)part.size);
 	}
-	
+
 	if (current_part == part_num) {
 		part.usr_priv = &current_part;
 		part.jffs2_priv = jffs2_priv_saved;
@@ -335,13 +334,13 @@
 				return;
 		}
 
-		printf("  Size: %ld MB in %d Sectors\n", 
+		printf("  Size: %ld MB in %d Sectors\n",
 			info->size >> 20, info->sector_count);
 
 		printf("  Sector Start Addresses:");
 		for (i = 0; i < info->sector_count; i++) {
 			if ((i % 5) == 0) printf ("\n   ");
-	        
+
 			printf (" %08lX%s", info->start[i],
 				info->protect[i] ? " (RO)" : "     ");
 		}
@@ -370,7 +369,7 @@
 
 	if ((info->flash_id & FLASH_VENDMASK) != (INTEL_MANUFACT & FLASH_VENDMASK))
 		return ERR_UNKNOWN_FLASH_VENDOR;
-	
+
 	prot = 0;
 	for (sect=s_first; sect<=s_last; ++sect) {
 		if (info->protect[sect]) prot++;
@@ -420,13 +419,13 @@
 					goto outahere;
 				}
 			}
-			
+
 			PRINTK("clearing status register\n");
-			*addr = 0x0050; 
+			*addr = 0x0050;
 			PRINTK("resetting to read mode");
-			*addr = 0x00FF; 
+			*addr = 0x00FF;
 		}
-		
+
 		printf("ok.\n");
 	}
 
@@ -595,4 +594,3 @@
 
 	return write_word(info, wp, data);
 }
-

diff --git a/board/innokom/innokom.c b/board/innokom/innokom.c
index da238da..ae5402e 100644
--- a/board/innokom/innokom.c
+++ b/board/innokom/innokom.c

@@ -46,10 +46,10 @@
 	/* disable I2C controller first, otherwhise it thinks we want to    */
 	/* talk to the slave port...                                        */
 	icr = ICR; ICR &= ~(ICR_SCLE | ICR_IUE);
-	
+
 	/* set gpio pin low _before_ we change direction to output          */
 	GPCR(70) = GPIO_bit(70);
-	
+
 	/* now toggle between output=low and high-impedance                 */
 	for (i = 0; i < 20; i++) {
 		GPDR(70) |= GPIO_bit(70);  /* output */
@@ -144,18 +144,18 @@
 			break;
 
 		case 1: if (state==1) {
-                                GPCR0 |= CSB226_USER_LED1;
-                        } else if (state==0) {
-                                GPSR0 |= CSB226_USER_LED1;
-                        }
-                        break;
+				GPCR0 |= CSB226_USER_LED1;
+			} else if (state==0) {
+				GPSR0 |= CSB226_USER_LED1;
+			}
+			break;
 
 		case 2: if (state==1) {
-                                GPCR0 |= CSB226_USER_LED2;
-                        } else if (state==0) {
-                                GPSR0 |= CSB226_USER_LED2;
-                        }
-                        break;
+				GPCR0 |= CSB226_USER_LED2;
+			} else if (state==0) {
+				GPSR0 |= CSB226_USER_LED2;
+			}
+			break;
 */
 	}
 
@@ -184,4 +184,3 @@
 
 	return;
 }
-

diff --git a/board/innokom/memsetup.S b/board/innokom/memsetup.S
index 60f9d50..68577ca 100644
--- a/board/innokom/memsetup.S
+++ b/board/innokom/memsetup.S

@@ -159,7 +159,7 @@
 
 mem_init:
 
-        ldr     r1,  =MEMC_BASE		/* get memory controller base addr. */
+	ldr     r1,  =MEMC_BASE		/* get memory controller base addr. */
 
 	/* ---------------------------------------------------------------- */
 	/* Step 2a: Initialize Asynchronous static memory controller        */
@@ -167,65 +167,65 @@
 
 	/* MSC registers: timing, bus width, mem type                       */
 
-        /* MSC0: nCS(0,1)                                                   */
-        ldr     r2,   =CFG_MSC0_VAL
-        str     r2,   [r1, #MSC0_OFFSET]
-        ldr     r2,   [r1, #MSC0_OFFSET]	/* read back to ensure      */
+	/* MSC0: nCS(0,1)                                                   */
+	ldr     r2,   =CFG_MSC0_VAL
+	str     r2,   [r1, #MSC0_OFFSET]
+	ldr     r2,   [r1, #MSC0_OFFSET]	/* read back to ensure      */
 						/* that data latches        */
-        /* MSC1: nCS(2,3)                                                   */
-        ldr     r2,  =CFG_MSC1_VAL
-        str     r2,  [r1, #MSC1_OFFSET]
-        ldr     r2,  [r1, #MSC1_OFFSET]
+	/* MSC1: nCS(2,3)                                                   */
+	ldr     r2,  =CFG_MSC1_VAL
+	str     r2,  [r1, #MSC1_OFFSET]
+	ldr     r2,  [r1, #MSC1_OFFSET]
 
 	/* MSC2: nCS(4,5)                                                   */
-        ldr     r2,  =CFG_MSC2_VAL
-        str     r2,  [r1, #MSC2_OFFSET]
-        ldr     r2,  [r1, #MSC2_OFFSET]
+	ldr     r2,  =CFG_MSC2_VAL
+	str     r2,  [r1, #MSC2_OFFSET]
+	ldr     r2,  [r1, #MSC2_OFFSET]
 
 	/* ---------------------------------------------------------------- */
 	/* Step 2b: Initialize Card Interface                               */
 	/* ---------------------------------------------------------------- */
 
 	/* MECR: Memory Expansion Card Register                             */
-        ldr     r2,  =CFG_MECR_VAL
-        str     r2,  [r1, #MECR_OFFSET]
+	ldr     r2,  =CFG_MECR_VAL
+	str     r2,  [r1, #MECR_OFFSET]
 	ldr	r2,	[r1, #MECR_OFFSET]
 
 	/* MCMEM0: Card Interface slot 0 timing                             */
-        ldr     r2,  =CFG_MCMEM0_VAL
-        str     r2,  [r1, #MCMEM0_OFFSET]
+	ldr     r2,  =CFG_MCMEM0_VAL
+	str     r2,  [r1, #MCMEM0_OFFSET]
 	ldr	r2,	[r1, #MCMEM0_OFFSET]
 
-        /* MCMEM1: Card Interface slot 1 timing                             */
-        ldr     r2,  =CFG_MCMEM1_VAL
-        str     r2,  [r1, #MCMEM1_OFFSET]
+	/* MCMEM1: Card Interface slot 1 timing                             */
+	ldr     r2,  =CFG_MCMEM1_VAL
+	str     r2,  [r1, #MCMEM1_OFFSET]
 	ldr	r2,	[r1, #MCMEM1_OFFSET]
 
 	/* MCATT0: Card Interface Attribute Space Timing, slot 0            */
-        ldr     r2,  =CFG_MCATT0_VAL
-        str     r2,  [r1, #MCATT0_OFFSET]
+	ldr     r2,  =CFG_MCATT0_VAL
+	str     r2,  [r1, #MCATT0_OFFSET]
 	ldr	r2,	[r1, #MCATT0_OFFSET]
 
 	/* MCATT1: Card Interface Attribute Space Timing, slot 1            */
-        ldr     r2,  =CFG_MCATT1_VAL
-        str     r2,  [r1, #MCATT1_OFFSET]
+	ldr     r2,  =CFG_MCATT1_VAL
+	str     r2,  [r1, #MCATT1_OFFSET]
 	ldr	r2,	[r1, #MCATT1_OFFSET]
 
 	/* MCIO0: Card Interface I/O Space Timing, slot 0                   */
-        ldr     r2,  =CFG_MCIO0_VAL
-        str     r2,  [r1, #MCIO0_OFFSET]
+	ldr     r2,  =CFG_MCIO0_VAL
+	str     r2,  [r1, #MCIO0_OFFSET]
 	ldr	r2,	[r1, #MCIO0_OFFSET]
 
 	/* MCIO1: Card Interface I/O Space Timing, slot 1                   */
-        ldr     r2,  =CFG_MCIO1_VAL
-        str     r2,  [r1, #MCIO1_OFFSET]
+	ldr     r2,  =CFG_MCIO1_VAL
+	str     r2,  [r1, #MCIO1_OFFSET]
 	ldr	r2,	[r1, #MCIO1_OFFSET]
 
 	/* ---------------------------------------------------------------- */
-        /* Step 2c: Write FLYCNFG  FIXME: what's that???                    */
-        /* ---------------------------------------------------------------- */
+	/* Step 2c: Write FLYCNFG  FIXME: what's that???                    */
+	/* ---------------------------------------------------------------- */
 
-        /* test if we run from flash or RAM - RAM/BDI: don't setup RAM      */
+	/* test if we run from flash or RAM - RAM/BDI: don't setup RAM      */
 	adr	r3, mem_init		/* r0 <- current position of code   */
 	ldr	r2, =mem_init
 	cmp	r3, r2			/* skip init if in place            */
@@ -233,8 +233,8 @@
 
 
 	/* ---------------------------------------------------------------- */
-        /* Step 2d: Initialize Timing for Sync Memory (SDCLK0)              */
-        /* ---------------------------------------------------------------- */
+	/* Step 2d: Initialize Timing for Sync Memory (SDCLK0)              */
+	/* ---------------------------------------------------------------- */
 
 	/* Before accessing MDREFR we need a valid DRI field, so we set     */
 	/* this to power on defaults + DRI field.                           */
@@ -246,7 +246,7 @@
 	orr	r4,	r4,  r3
 
 	str	r4,	[r1, #MDREFR_OFFSET]	/* write back MDREFR        */
-        ldr     r4,	[r1, #MDREFR_OFFSET]
+	ldr     r4,	[r1, #MDREFR_OFFSET]
 
 
 	/* ---------------------------------------------------------------- */
@@ -262,9 +262,9 @@
 	/* FIXME: we use async mode for now                                 */
 
 
-        /* ---------------------------------------------------------------- */
-        /* Step 4: Initialize SDRAM                                         */
-        /* ---------------------------------------------------------------- */
+	/* ---------------------------------------------------------------- */
+	/* Step 4: Initialize SDRAM                                         */
+	/* ---------------------------------------------------------------- */
 
 	/* Step 4a: assert MDREFR:K?RUN and configure                       */
 	/*          MDREFR:K1DB2 and MDREFR:K2DB2 as desired.               */
@@ -277,16 +277,16 @@
 
 	bic	r4,	r4, #(MDREFR_SLFRSH)
 
-        str     r4,     [r1, #MDREFR_OFFSET]    /* write back MDREFR        */
-        ldr     r4,     [r1, #MDREFR_OFFSET]
+	str     r4,     [r1, #MDREFR_OFFSET]    /* write back MDREFR        */
+	ldr     r4,     [r1, #MDREFR_OFFSET]
 
 
 	/* Step 4c: assert MDREFR:E1PIN and E0PIO                           */
 
 	orr	r4,	r4,	#(MDREFR_E1PIN|MDREFR_E0PIN)
 
-        str     r4,     [r1, #MDREFR_OFFSET]    /* write back MDREFR        */
-        ldr     r4,     [r1, #MDREFR_OFFSET]
+	str     r4,     [r1, #MDREFR_OFFSET]    /* write back MDREFR        */
+	ldr     r4,     [r1, #MDREFR_OFFSET]
 
 
 	/* Step 4d: write MDCNFG with MDCNFG:DEx deasserted (set to 0), to  */
@@ -295,8 +295,8 @@
 	ldr	r4,	=CFG_MDCNFG_VAL
 	bic	r4,	r4,	#(MDCNFG_DE0|MDCNFG_DE1)
 
-        str     r4,     [r1, #MDCNFG_OFFSET]	/* write back MDCNFG        */
-        ldr     r4,     [r1, #MDCNFG_OFFSET]
+	str     r4,     [r1, #MDCNFG_OFFSET]	/* write back MDCNFG        */
+	ldr     r4,     [r1, #MDCNFG_OFFSET]
 
 
 	/* Step 4e: Wait for the clock to the SDRAMs to stabilize,          */
@@ -345,8 +345,8 @@
 
 	/* Step 4h: Write MDMRS.                                            */
 
-        ldr     r2,  =CFG_MDMRS_VAL
-        str     r2,  [r1, #MDMRS_OFFSET]
+	ldr     r2,  =CFG_MDMRS_VAL
+	str     r2,  [r1, #MDMRS_OFFSET]
 
 
 	/* We are finished with Intel's memory controller initialisation    */
@@ -357,17 +357,17 @@
 
 initirqs:
 
-        mov     r1, #0		/* clear int. level register (IRQ, not FIQ) */
-        ldr     r2,  =ICLR
-        str     r1,  [r2]
+	mov     r1, #0		/* clear int. level register (IRQ, not FIQ) */
+	ldr     r2,  =ICLR
+	str     r1,  [r2]
 
-        ldr     r2,  =ICMR	/* mask all interrupts at the controller    */
-        str     r1,  [r2]
+	ldr     r2,  =ICMR	/* mask all interrupts at the controller    */
+	str     r1,  [r2]
 
 
-        /* ---------------------------------------------------------------- */
+	/* ---------------------------------------------------------------- */
 	/* Clock initialisation                                             */
-        /* ---------------------------------------------------------------- */
+	/* ---------------------------------------------------------------- */
 
 initclks:
 
@@ -376,34 +376,34 @@
 
 	/* Turn Off ALL on-chip peripheral clocks for re-configuration      */
 	/* Note: See label 'ENABLECLKS' for the re-enabling                 */
-        ldr     r1,  =CKEN
-        mov     r2,  #0
-        str     r2,  [r1]
+	ldr     r1,  =CKEN
+	mov     r2,  #0
+	str     r2,  [r1]
 
 
-        /* default value in case no valid rotary switch setting is found    */
-        ldr     r2, =(CCCR_L27|CCCR_M2|CCCR_N10)  /* DEFAULT: {200/200/100} */
+	/* default value in case no valid rotary switch setting is found    */
+	ldr     r2, =(CCCR_L27|CCCR_M2|CCCR_N10)  /* DEFAULT: {200/200/100} */
 
-        /* ... and write the core clock config register                     */
-        ldr     r1,  =CCCR
-        str     r2,  [r1]
+	/* ... and write the core clock config register                     */
+	ldr     r1,  =CCCR
+	str     r2,  [r1]
 
 	/* enable the 32Khz oscillator for RTC and PowerManager             */
 /*
-        ldr     r1,  =OSCC
-        mov     r2,  #OSCC_OON
-        str     r2,  [r1]
+	ldr     r1,  =OSCC
+	mov     r2,  #OSCC_OON
+	str     r2,  [r1]
 */
 	/* NOTE:  spin here until OSCC.OOK get set, meaning the PLL         */
 	/* has settled.                                                     */
 60:
-        ldr     r2, [r1]
-        ands    r2, r2, #1
-        beq     60b
+	ldr     r2, [r1]
+	ands    r2, r2, #1
+	beq     60b
 
 	/* ---------------------------------------------------------------- */
 	/*                                                                  */
-        /* ---------------------------------------------------------------- */
+	/* ---------------------------------------------------------------- */
 
 	/* Save SDRAM size                                                  */
 	ldr	r1, =DRAM_SIZE
@@ -428,11 +428,10 @@
 	mcr	p14,0,r0,c10,c0,0  /* dcsr */
 #endif
 
-        /* ---------------------------------------------------------------- */
+	/* ---------------------------------------------------------------- */
 	/* End memsetup                                                     */
-        /* ---------------------------------------------------------------- */
+	/* ---------------------------------------------------------------- */
 
 endmemsetup:
 
     mov     pc, lr
-

diff --git a/board/innokom/u-boot.lds b/board/innokom/u-boot.lds
index 46beb15..1130013 100644
--- a/board/innokom/u-boot.lds
+++ b/board/innokom/u-boot.lds

@@ -26,29 +26,33 @@
 ENTRY(_start)
 SECTIONS
 {
-        . = 0x00000000;
+	. = 0x00000000;
 
-        . = ALIGN(4);
+	. = ALIGN(4);
 	.text      :
 	{
 	  cpu/pxa/start.o	(.text)
 	  *(.text)
 	}
 
-        . = ALIGN(4);
-        .rodata : { *(.rodata) }
+	. = ALIGN(4);
+	.rodata : { *(.rodata) }
 
-        . = ALIGN(4);
-        .data : { *(.data) }
+	. = ALIGN(4);
+	.data : { *(.data) }
 
-        . = ALIGN(4);
-        .got : { *(.got) }
+	. = ALIGN(4);
+	.got : { *(.got) }
+
+  __u_boot_cmd_start = .;
+  .u_boot_cmd : { *(.u_boot_cmd) }
+  __u_boot_cmd_end = .;
 
 	armboot_end_data = .;
 
-        . = ALIGN(4);
+	. = ALIGN(4);
 	bss_start = .;
-        .bss : { *(.bss) }
+	.bss : { *(.bss) }
 	bss_end = .;
 
 	armboot_end = .;

diff --git a/board/ip860/Makefile b/board/ip860/Makefile
index ef173d0..13ce9fc 100644
--- a/board/ip860/Makefile
+++ b/board/ip860/Makefile

@@ -28,7 +28,7 @@
 OBJS	= $(BOARD).o flash.o
 
 $(LIB):	.depend $(OBJS)
-	$(AR) crv $@ $^
+	$(AR) crv $@ $(OBJS)
 
 #########################################################################
 

diff --git a/board/ip860/u-boot.lds b/board/ip860/u-boot.lds
index 7bc74f3..d196731 100644
--- a/board/ip860/u-boot.lds
+++ b/board/ip860/u-boot.lds

@@ -109,6 +109,11 @@
   _edata  =  .;
   PROVIDE (edata = .);
 
+  __u_boot_cmd_start = .;
+  .u_boot_cmd : { *(.u_boot_cmd) }
+  __u_boot_cmd_end = .;
+
+
   __start___ex_table = .;
   __ex_table : { *(__ex_table) }
   __stop___ex_table = .;

diff --git a/board/ip860/u-boot.lds.debug b/board/ip860/u-boot.lds.debug
index cb36ad3..b4d6579 100644
--- a/board/ip860/u-boot.lds.debug
+++ b/board/ip860/u-boot.lds.debug

@@ -107,6 +107,11 @@
   _edata  =  .;
   PROVIDE (edata = .);
 
+  __u_boot_cmd_start = .;
+  .u_boot_cmd : { *(.u_boot_cmd) }
+  __u_boot_cmd_end = .;
+
+
   __start___ex_table = .;
   __ex_table : { *(__ex_table) }
   __stop___ex_table = .;
@@ -129,4 +134,3 @@
   _end = . ;
   PROVIDE (end = .);
 }
-

diff --git a/board/iphase4539/Makefile b/board/iphase4539/Makefile
index 5fcce6f..19da5d0 100644
--- a/board/iphase4539/Makefile
+++ b/board/iphase4539/Makefile

@@ -27,7 +27,7 @@
 OBJS	:= $(BOARD).o flash.o
 
 $(LIB):	$(OBJS) $(SOBJS)
-	$(AR) crv $@ $^
+	$(AR) crv $@ $(OBJS)
 
 clean:
 	rm -f $(SOBJS) $(OBJS)

diff --git a/board/iphase4539/u-boot.lds b/board/iphase4539/u-boot.lds
index 5d78d4a..61fb15c6 100644
--- a/board/iphase4539/u-boot.lds
+++ b/board/iphase4539/u-boot.lds

@@ -93,6 +93,11 @@
   _edata  =  .;
   PROVIDE (edata = .);
 
+  __u_boot_cmd_start = .;
+  .u_boot_cmd : { *(.u_boot_cmd) }
+  __u_boot_cmd_end = .;
+
+
   __start___ex_table = .;
   __ex_table : { *(__ex_table) }
   __stop___ex_table = .;
@@ -115,4 +120,3 @@
   _end = . ;
   PROVIDE (end = .);
 }
-

diff --git a/board/ivm/Makefile b/board/ivm/Makefile
index ef173d0..13ce9fc 100644
--- a/board/ivm/Makefile
+++ b/board/ivm/Makefile

@@ -28,7 +28,7 @@
 OBJS	= $(BOARD).o flash.o
 
 $(LIB):	.depend $(OBJS)
-	$(AR) crv $@ $^
+	$(AR) crv $@ $(OBJS)
 
 #########################################################################
 

diff --git a/board/ivm/ivm.c b/board/ivm/ivm.c
index 117dbe6..73a3987 100644
--- a/board/ivm/ivm.c
+++ b/board/ivm/ivm.c

@@ -48,7 +48,7 @@
 	 */
 	0x0FF3FC04, 0x0FF3EC00, 0x7FFFEC04, 0xFFFFEC04,
 	0xFFFFEC05, /* last */
-	            _NOT_USED_, _NOT_USED_, _NOT_USED_,
+		    _NOT_USED_, _NOT_USED_, _NOT_USED_,
 	/*
 	 * Burst Read. (Offset 8 in UPM RAM)
 	 */
@@ -62,7 +62,7 @@
 	 */
 	0x0FAFFC04, 0x0FAFEC00, 0x7FFFEC04, 0xFFFFEC04,
 	0xFFFFEC05, /* last */
-	            _NOT_USED_, _NOT_USED_, _NOT_USED_,
+		    _NOT_USED_, _NOT_USED_, _NOT_USED_,
 	/*
 	 * Burst Write. (Offset 20 in UPM RAM)
 	 */
@@ -99,9 +99,9 @@
 	/*
 	 * SDRAM Initialization (offset 5 in UPM RAM)
 	 *
-         * This is no UPM entry point. The following definition uses
-         * the remaining space to establish an initialization
-         * sequence, which is executed by a RUN command.
+	 * This is no UPM entry point. The following definition uses
+	 * the remaining space to establish an initialization
+	 * sequence, which is executed by a RUN command.
 	 *
 	 */
 		    0x1FF77C35, 0xEFEABC34, 0x1FB57C35, /* last */
@@ -324,8 +324,8 @@
 	udelay(1000);
 
 	/*
-         * RESET is implemented by a positive pulse of at least 1 us
-         * at the reset pin.
+	 * RESET is implemented by a positive pulse of at least 1 us
+	 * at the reset pin.
 	 *
 	 * Configure RESET pins for NS DP83843 PHY, and RESET chip.
 	 *

diff --git a/board/ivm/u-boot.lds b/board/ivm/u-boot.lds
index d1e121e..ea4fc8f 100644
--- a/board/ivm/u-boot.lds
+++ b/board/ivm/u-boot.lds

@@ -98,6 +98,11 @@
   _edata  =  .;
   PROVIDE (edata = .);
 
+  __u_boot_cmd_start = .;
+  .u_boot_cmd : { *(.u_boot_cmd) }
+  __u_boot_cmd_end = .;
+
+
   __start___ex_table = .;
   __ex_table : { *(__ex_table) }
   __stop___ex_table = .;
@@ -120,4 +125,3 @@
   _end = . ;
   PROVIDE (end = .);
 }
-

diff --git a/board/ivm/u-boot.lds.debug b/board/ivm/u-boot.lds.debug
index e62152a..7b53217 100644
--- a/board/ivm/u-boot.lds.debug
+++ b/board/ivm/u-boot.lds.debug

@@ -107,6 +107,11 @@
   _edata  =  .;
   PROVIDE (edata = .);
 
+  __u_boot_cmd_start = .;
+  .u_boot_cmd : { *(.u_boot_cmd) }
+  __u_boot_cmd_end = .;
+
+
   __start___ex_table = .;
   __ex_table : { *(__ex_table) }
   __stop___ex_table = .;
@@ -129,4 +134,3 @@
   _end = . ;
   PROVIDE (end = .);
 }
-

diff --git a/board/kup4k/Makefile b/board/kup4k/Makefile
index c748d35..fdc6fd5 100644
--- a/board/kup4k/Makefile
+++ b/board/kup4k/Makefile

@@ -28,7 +28,7 @@
 OBJS	= $(BOARD).o flash.o
 
 $(LIB):	.depend $(OBJS)
-	$(AR) crv $@ $^
+	$(AR) crv $@ $(OBJS)
 
 #########################################################################
 

diff --git a/board/kup4k/kup4k.c b/board/kup4k/kup4k.c
index 7981df3..3c08214 100644
--- a/board/kup4k/kup4k.c
+++ b/board/kup4k/kup4k.c

@@ -329,9 +329,6 @@
 	memctl->memc_br5 = 0x80080801;	/* Start at 0x80080000 */
 
 
-
-
-
 	fb_info.VmemAddr = (unsigned char *) (S1D_PHYSICAL_VMEM_ADDR);
 	fb_info.RegAddr = (unsigned char *) (S1D_PHYSICAL_REG_ADDR);
 

diff --git a/board/kup4k/u-boot.lds b/board/kup4k/u-boot.lds
index b2d8090..f81a10e 100644
--- a/board/kup4k/u-boot.lds
+++ b/board/kup4k/u-boot.lds

@@ -112,6 +112,11 @@
   _edata  =  .;
   PROVIDE (edata = .);
 
+  __u_boot_cmd_start = .;
+  .u_boot_cmd : { *(.u_boot_cmd) }
+  __u_boot_cmd_end = .;
+
+
   __start___ex_table = .;
   __ex_table : { *(__ex_table) }
   __stop___ex_table = .;
@@ -134,4 +139,3 @@
   _end = . ;
   PROVIDE (end = .);
 }
-

diff --git a/board/kup4k/u-boot.lds.debug b/board/kup4k/u-boot.lds.debug
index fdd836e..87f704a 100644
--- a/board/kup4k/u-boot.lds.debug
+++ b/board/kup4k/u-boot.lds.debug

@@ -106,6 +106,11 @@
   _edata  =  .;
   PROVIDE (edata = .);
 
+  __u_boot_cmd_start = .;
+  .u_boot_cmd : { *(.u_boot_cmd) }
+  __u_boot_cmd_end = .;
+
+
   __start___ex_table = .;
   __ex_table : { *(__ex_table) }
   __stop___ex_table = .;
@@ -128,4 +133,3 @@
   _end = . ;
   PROVIDE (end = .);
 }
-

diff --git a/board/lantec/Makefile b/board/lantec/Makefile
index 35b8428..7a2014d 100644
--- a/board/lantec/Makefile
+++ b/board/lantec/Makefile

@@ -28,7 +28,7 @@
 OBJS	= $(BOARD).o flash.o
 
 $(LIB):	.depend $(OBJS)
-	$(AR) crv $@ $^
+	$(AR) crv $@ $(OBJS)
 
 #########################################################################
 

diff --git a/board/lantec/u-boot.lds b/board/lantec/u-boot.lds
index ab3beb7..1f8581c 100644
--- a/board/lantec/u-boot.lds
+++ b/board/lantec/u-boot.lds

@@ -109,6 +109,11 @@
   _edata  =  .;
   PROVIDE (edata = .);
 
+  __u_boot_cmd_start = .;
+  .u_boot_cmd : { *(.u_boot_cmd) }
+  __u_boot_cmd_end = .;
+
+
   __start___ex_table = .;
   __ex_table : { *(__ex_table) }
   __stop___ex_table = .;
@@ -131,4 +136,3 @@
   _end = . ;
   PROVIDE (end = .);
 }
-

diff --git a/board/lantec/u-boot.lds.debug b/board/lantec/u-boot.lds.debug
index fd3a1c6..c64087d 100644
--- a/board/lantec/u-boot.lds.debug
+++ b/board/lantec/u-boot.lds.debug

@@ -106,6 +106,11 @@
   _edata  =  .;
   PROVIDE (edata = .);
 
+  __u_boot_cmd_start = .;
+  .u_boot_cmd : { *(.u_boot_cmd) }
+  __u_boot_cmd_end = .;
+
+
   __start___ex_table = .;
   __ex_table : { *(__ex_table) }
   __stop___ex_table = .;
@@ -128,4 +133,3 @@
   _end = . ;
   PROVIDE (end = .);
 }
-

diff --git a/board/lart/Makefile b/board/lart/Makefile
index 12a0367..42ceb03 100644
--- a/board/lart/Makefile
+++ b/board/lart/Makefile

@@ -29,7 +29,7 @@
 SOBJS	:= flashasm.o memsetup.o
 
 $(LIB):	$(OBJS) $(SOBJS)
-	$(AR) crv $@ $^
+	$(AR) crv $@ $(OBJS) $(SOBJS)
 
 clean:
 	rm -f $(SOBJS) $(OBJS)

diff --git a/board/lart/flash.c b/board/lart/flash.c
index 89ab62c..ad6134b 100644
--- a/board/lart/flash.c
+++ b/board/lart/flash.c

@@ -317,7 +317,7 @@
 	    *addr = PUZZLE_TO_FLASH(CMD_READ_ARRAY);
 
 	    if ((rc = flash_error(result)) != ERR_OK)
-	    	goto outahere;
+		goto outahere;
 
 	    printf("ok.\n");
 	}
@@ -358,7 +358,7 @@
      */
     result = PUZZLE_FROM_FLASH(*addr);
     if ((result & data) != data)
-        return ERR_NOT_ERASED;
+	return ERR_NOT_ERASED;
 
     /*
      * Disable interrupts which might cause a timeout

diff --git a/board/lart/memsetup.S b/board/lart/memsetup.S
index bebd697..635f2a0 100644
--- a/board/lart/memsetup.S
+++ b/board/lart/memsetup.S

@@ -24,7 +24,6 @@
  */
 
 
-
 #include <config.h>
 #include <version.h>
 
@@ -93,4 +92,3 @@
 
 	/* everything is fine now */
 	mov	pc, lr
-

diff --git a/board/lart/u-boot.lds b/board/lart/u-boot.lds
index f4b0ade..b3f34ca 100644
--- a/board/lart/u-boot.lds
+++ b/board/lart/u-boot.lds

@@ -26,28 +26,32 @@
 ENTRY(_start)
 SECTIONS
 {
-        . = 0x00000000;
+	. = 0x00000000;
 
-        . = ALIGN(4);
+	. = ALIGN(4);
 	.text      :
 	{
 	  cpu/sa1100/start.o	(.text)
 	  *(.text)
 	}
 
-        . = ALIGN(4);
-        .rodata : { *(.rodata) }
+	. = ALIGN(4);
+	.rodata : { *(.rodata) }
 
-        . = ALIGN(4);
-        .data : { *(.data) }
+	. = ALIGN(4);
+	.data : { *(.data) }
 
-        . = ALIGN(4);
-        .got : { *(.got) }
+	. = ALIGN(4);
+	.got : { *(.got) }
+
+  __u_boot_cmd_start = .;
+  .u_boot_cmd : { *(.u_boot_cmd) }
+  __u_boot_cmd_end = .;
 
 	armboot_end_data = .;
 
-        . = ALIGN(4);
-        .bss : { *(.bss) }
+	. = ALIGN(4);
+	.bss : { *(.bss) }
 
 	armboot_end = .;
 }

diff --git a/board/logodl/config.mk b/board/logodl/config.mk
index 4166357..76c382d 100644
--- a/board/logodl/config.mk
+++ b/board/logodl/config.mk

@@ -11,5 +11,5 @@
 # FIXME: armboot does only work correctly when being compiled
 # # for the addresses _after_ relocation to RAM!! Otherwhise the
 # # .bss segment is assumed in flash...
-# 
+#
 TEXT_BASE = 0x083E0000

diff --git a/board/logodl/flash.c b/board/logodl/flash.c
index 3837401..cef0b4d 100644
--- a/board/logodl/flash.c
+++ b/board/logodl/flash.c

@@ -82,18 +82,18 @@
 	flash_info[i].size = FLASH_BANK_SIZE;
 	flash_info[i].sector_count = CFG_MAX_FLASH_SECT;
 	memset(flash_info[i].protect, 0, CFG_MAX_FLASH_SECT);
-        switch (i)
-        {
-           case 0:
-	        flashbase = PHYS_FLASH_1;
-                break;
-           case 1:
-	        flashbase = PHYS_FLASH_2;
-                break;
-           default:
-	        panic("configured to many flash banks!\n");
-                break;
-        }
+	switch (i)
+	{
+	   case 0:
+		flashbase = PHYS_FLASH_1;
+		break;
+	   case 1:
+		flashbase = PHYS_FLASH_2;
+		break;
+	   default:
+		panic("configured to many flash banks!\n");
+		break;
+	}
 	for (j = 0; j < flash_info[i].sector_count; j++)
 	{
 	    flash_info[i].start[j] = flashbase + j*MAIN_SECT_SIZE;
@@ -208,32 +208,32 @@
 	case FLASH_AM640U:
 		fmt = "29LV641D (64 Mbit, uniform sectors)\n";
 		break;
-        case FLASH_28F800C3B:
-        case FLASH_28F800C3T:
+	case FLASH_28F800C3B:
+	case FLASH_28F800C3T:
 		fmt = "28F800C3%s (8 Mbit, %s)\n";
 		break;
 	case FLASH_INTEL800B:
 	case FLASH_INTEL800T:
 		fmt = "28F800B3%s (8 Mbit, %s)\n";
 		break;
-        case FLASH_28F160C3B:
-        case FLASH_28F160C3T:
+	case FLASH_28F160C3B:
+	case FLASH_28F160C3T:
 		fmt = "28F160C3%s (16 Mbit, %s)\n";
 		break;
 	case FLASH_INTEL160B:
 	case FLASH_INTEL160T:
 		fmt = "28F160B3%s (16 Mbit, %s)\n";
 		break;
-        case FLASH_28F320C3B:
-        case FLASH_28F320C3T:
+	case FLASH_28F320C3B:
+	case FLASH_28F320C3T:
 		fmt = "28F320C3%s (32 Mbit, %s)\n";
 		break;
 	case FLASH_INTEL320B:
 	case FLASH_INTEL320T:
 		fmt = "28F320B3%s (32 Mbit, %s)\n";
 		break;
-        case FLASH_28F640C3B:
-        case FLASH_28F640C3T:
+	case FLASH_28F640C3B:
+	case FLASH_28F640C3T:
 		fmt = "28F640C3%s (64 Mbit, %s)\n";
 		break;
 	case FLASH_INTEL640B:
@@ -554,15 +554,15 @@
 	 left > 0 && res == 0;
 	 addr += sizeof(data), left -= sizeof(data) - bytes) {
 
-        bytes = addr & (sizeof(data) - 1);
-        addr &= ~(sizeof(data) - 1);
+	bytes = addr & (sizeof(data) - 1);
+	addr &= ~(sizeof(data) - 1);
 
 	/* combine source and destination data so can program
 	 * an entire word of 16 or 32 bits
 	 */
-        for (i = 0; i < sizeof(data); i++) {
-            data <<= 8;
-            if (i < bytes || i - bytes >= left )
+	for (i = 0; i < sizeof(data); i++) {
+	    data <<= 8;
+	    if (i < bytes || i - bytes >= left )
 		data += *((uchar *)addr + i);
 	    else
 		data += *src++;
@@ -662,7 +662,6 @@
 }
 
 
-
 /*-----------------------------------------------------------------------
  * Write a word to Flash for AMD FLASH
  * A word is 16 or 32 bits, whichever the bus width of the flash bank

diff --git a/board/logodl/logodl.c b/board/logodl/logodl.c
index f16c05b..95634ac 100644
--- a/board/logodl/logodl.c
+++ b/board/logodl/logodl.c

@@ -62,7 +62,7 @@
 	gd->bd->bi_dram[0].start = PHYS_SDRAM_1;
 	gd->bd->bi_dram[0].size = PHYS_SDRAM_1_SIZE;
 
-        return 0;
+	return 0;
 }
 
 

diff --git a/board/logodl/memsetup.S b/board/logodl/memsetup.S
index 60f9d50..68577ca 100644
--- a/board/logodl/memsetup.S
+++ b/board/logodl/memsetup.S

@@ -159,7 +159,7 @@
 
 mem_init:
 
-        ldr     r1,  =MEMC_BASE		/* get memory controller base addr. */
+	ldr     r1,  =MEMC_BASE		/* get memory controller base addr. */
 
 	/* ---------------------------------------------------------------- */
 	/* Step 2a: Initialize Asynchronous static memory controller        */
@@ -167,65 +167,65 @@
 
 	/* MSC registers: timing, bus width, mem type                       */
 
-        /* MSC0: nCS(0,1)                                                   */
-        ldr     r2,   =CFG_MSC0_VAL
-        str     r2,   [r1, #MSC0_OFFSET]
-        ldr     r2,   [r1, #MSC0_OFFSET]	/* read back to ensure      */
+	/* MSC0: nCS(0,1)                                                   */
+	ldr     r2,   =CFG_MSC0_VAL
+	str     r2,   [r1, #MSC0_OFFSET]
+	ldr     r2,   [r1, #MSC0_OFFSET]	/* read back to ensure      */
 						/* that data latches        */
-        /* MSC1: nCS(2,3)                                                   */
-        ldr     r2,  =CFG_MSC1_VAL
-        str     r2,  [r1, #MSC1_OFFSET]
-        ldr     r2,  [r1, #MSC1_OFFSET]
+	/* MSC1: nCS(2,3)                                                   */
+	ldr     r2,  =CFG_MSC1_VAL
+	str     r2,  [r1, #MSC1_OFFSET]
+	ldr     r2,  [r1, #MSC1_OFFSET]
 
 	/* MSC2: nCS(4,5)                                                   */
-        ldr     r2,  =CFG_MSC2_VAL
-        str     r2,  [r1, #MSC2_OFFSET]
-        ldr     r2,  [r1, #MSC2_OFFSET]
+	ldr     r2,  =CFG_MSC2_VAL
+	str     r2,  [r1, #MSC2_OFFSET]
+	ldr     r2,  [r1, #MSC2_OFFSET]
 
 	/* ---------------------------------------------------------------- */
 	/* Step 2b: Initialize Card Interface                               */
 	/* ---------------------------------------------------------------- */
 
 	/* MECR: Memory Expansion Card Register                             */
-        ldr     r2,  =CFG_MECR_VAL
-        str     r2,  [r1, #MECR_OFFSET]
+	ldr     r2,  =CFG_MECR_VAL
+	str     r2,  [r1, #MECR_OFFSET]
 	ldr	r2,	[r1, #MECR_OFFSET]
 
 	/* MCMEM0: Card Interface slot 0 timing                             */
-        ldr     r2,  =CFG_MCMEM0_VAL
-        str     r2,  [r1, #MCMEM0_OFFSET]
+	ldr     r2,  =CFG_MCMEM0_VAL
+	str     r2,  [r1, #MCMEM0_OFFSET]
 	ldr	r2,	[r1, #MCMEM0_OFFSET]
 
-        /* MCMEM1: Card Interface slot 1 timing                             */
-        ldr     r2,  =CFG_MCMEM1_VAL
-        str     r2,  [r1, #MCMEM1_OFFSET]
+	/* MCMEM1: Card Interface slot 1 timing                             */
+	ldr     r2,  =CFG_MCMEM1_VAL
+	str     r2,  [r1, #MCMEM1_OFFSET]
 	ldr	r2,	[r1, #MCMEM1_OFFSET]
 
 	/* MCATT0: Card Interface Attribute Space Timing, slot 0            */
-        ldr     r2,  =CFG_MCATT0_VAL
-        str     r2,  [r1, #MCATT0_OFFSET]
+	ldr     r2,  =CFG_MCATT0_VAL
+	str     r2,  [r1, #MCATT0_OFFSET]
 	ldr	r2,	[r1, #MCATT0_OFFSET]
 
 	/* MCATT1: Card Interface Attribute Space Timing, slot 1            */
-        ldr     r2,  =CFG_MCATT1_VAL
-        str     r2,  [r1, #MCATT1_OFFSET]
+	ldr     r2,  =CFG_MCATT1_VAL
+	str     r2,  [r1, #MCATT1_OFFSET]
 	ldr	r2,	[r1, #MCATT1_OFFSET]
 
 	/* MCIO0: Card Interface I/O Space Timing, slot 0                   */
-        ldr     r2,  =CFG_MCIO0_VAL
-        str     r2,  [r1, #MCIO0_OFFSET]
+	ldr     r2,  =CFG_MCIO0_VAL
+	str     r2,  [r1, #MCIO0_OFFSET]
 	ldr	r2,	[r1, #MCIO0_OFFSET]
 
 	/* MCIO1: Card Interface I/O Space Timing, slot 1                   */
-        ldr     r2,  =CFG_MCIO1_VAL
-        str     r2,  [r1, #MCIO1_OFFSET]
+	ldr     r2,  =CFG_MCIO1_VAL
+	str     r2,  [r1, #MCIO1_OFFSET]
 	ldr	r2,	[r1, #MCIO1_OFFSET]
 
 	/* ---------------------------------------------------------------- */
-        /* Step 2c: Write FLYCNFG  FIXME: what's that???                    */
-        /* ---------------------------------------------------------------- */
+	/* Step 2c: Write FLYCNFG  FIXME: what's that???                    */
+	/* ---------------------------------------------------------------- */
 
-        /* test if we run from flash or RAM - RAM/BDI: don't setup RAM      */
+	/* test if we run from flash or RAM - RAM/BDI: don't setup RAM      */
 	adr	r3, mem_init		/* r0 <- current position of code   */
 	ldr	r2, =mem_init
 	cmp	r3, r2			/* skip init if in place            */
@@ -233,8 +233,8 @@
 
 
 	/* ---------------------------------------------------------------- */
-        /* Step 2d: Initialize Timing for Sync Memory (SDCLK0)              */
-        /* ---------------------------------------------------------------- */
+	/* Step 2d: Initialize Timing for Sync Memory (SDCLK0)              */
+	/* ---------------------------------------------------------------- */
 
 	/* Before accessing MDREFR we need a valid DRI field, so we set     */
 	/* this to power on defaults + DRI field.                           */
@@ -246,7 +246,7 @@
 	orr	r4,	r4,  r3
 
 	str	r4,	[r1, #MDREFR_OFFSET]	/* write back MDREFR        */
-        ldr     r4,	[r1, #MDREFR_OFFSET]
+	ldr     r4,	[r1, #MDREFR_OFFSET]
 
 
 	/* ---------------------------------------------------------------- */
@@ -262,9 +262,9 @@
 	/* FIXME: we use async mode for now                                 */
 
 
-        /* ---------------------------------------------------------------- */
-        /* Step 4: Initialize SDRAM                                         */
-        /* ---------------------------------------------------------------- */
+	/* ---------------------------------------------------------------- */
+	/* Step 4: Initialize SDRAM                                         */
+	/* ---------------------------------------------------------------- */
 
 	/* Step 4a: assert MDREFR:K?RUN and configure                       */
 	/*          MDREFR:K1DB2 and MDREFR:K2DB2 as desired.               */
@@ -277,16 +277,16 @@
 
 	bic	r4,	r4, #(MDREFR_SLFRSH)
 
-        str     r4,     [r1, #MDREFR_OFFSET]    /* write back MDREFR        */
-        ldr     r4,     [r1, #MDREFR_OFFSET]
+	str     r4,     [r1, #MDREFR_OFFSET]    /* write back MDREFR        */
+	ldr     r4,     [r1, #MDREFR_OFFSET]
 
 
 	/* Step 4c: assert MDREFR:E1PIN and E0PIO                           */
 
 	orr	r4,	r4,	#(MDREFR_E1PIN|MDREFR_E0PIN)
 
-        str     r4,     [r1, #MDREFR_OFFSET]    /* write back MDREFR        */
-        ldr     r4,     [r1, #MDREFR_OFFSET]
+	str     r4,     [r1, #MDREFR_OFFSET]    /* write back MDREFR        */
+	ldr     r4,     [r1, #MDREFR_OFFSET]
 
 
 	/* Step 4d: write MDCNFG with MDCNFG:DEx deasserted (set to 0), to  */
@@ -295,8 +295,8 @@
 	ldr	r4,	=CFG_MDCNFG_VAL
 	bic	r4,	r4,	#(MDCNFG_DE0|MDCNFG_DE1)
 
-        str     r4,     [r1, #MDCNFG_OFFSET]	/* write back MDCNFG        */
-        ldr     r4,     [r1, #MDCNFG_OFFSET]
+	str     r4,     [r1, #MDCNFG_OFFSET]	/* write back MDCNFG        */
+	ldr     r4,     [r1, #MDCNFG_OFFSET]
 
 
 	/* Step 4e: Wait for the clock to the SDRAMs to stabilize,          */
@@ -345,8 +345,8 @@
 
 	/* Step 4h: Write MDMRS.                                            */
 
-        ldr     r2,  =CFG_MDMRS_VAL
-        str     r2,  [r1, #MDMRS_OFFSET]
+	ldr     r2,  =CFG_MDMRS_VAL
+	str     r2,  [r1, #MDMRS_OFFSET]
 
 
 	/* We are finished with Intel's memory controller initialisation    */
@@ -357,17 +357,17 @@
 
 initirqs:
 
-        mov     r1, #0		/* clear int. level register (IRQ, not FIQ) */
-        ldr     r2,  =ICLR
-        str     r1,  [r2]
+	mov     r1, #0		/* clear int. level register (IRQ, not FIQ) */
+	ldr     r2,  =ICLR
+	str     r1,  [r2]
 
-        ldr     r2,  =ICMR	/* mask all interrupts at the controller    */
-        str     r1,  [r2]
+	ldr     r2,  =ICMR	/* mask all interrupts at the controller    */
+	str     r1,  [r2]
 
 
-        /* ---------------------------------------------------------------- */
+	/* ---------------------------------------------------------------- */
 	/* Clock initialisation                                             */
-        /* ---------------------------------------------------------------- */
+	/* ---------------------------------------------------------------- */
 
 initclks:
 
@@ -376,34 +376,34 @@
 
 	/* Turn Off ALL on-chip peripheral clocks for re-configuration      */
 	/* Note: See label 'ENABLECLKS' for the re-enabling                 */
-        ldr     r1,  =CKEN
-        mov     r2,  #0
-        str     r2,  [r1]
+	ldr     r1,  =CKEN
+	mov     r2,  #0
+	str     r2,  [r1]
 
 
-        /* default value in case no valid rotary switch setting is found    */
-        ldr     r2, =(CCCR_L27|CCCR_M2|CCCR_N10)  /* DEFAULT: {200/200/100} */
+	/* default value in case no valid rotary switch setting is found    */
+	ldr     r2, =(CCCR_L27|CCCR_M2|CCCR_N10)  /* DEFAULT: {200/200/100} */
 
-        /* ... and write the core clock config register                     */
-        ldr     r1,  =CCCR
-        str     r2,  [r1]
+	/* ... and write the core clock config register                     */
+	ldr     r1,  =CCCR
+	str     r2,  [r1]
 
 	/* enable the 32Khz oscillator for RTC and PowerManager             */
 /*
-        ldr     r1,  =OSCC
-        mov     r2,  #OSCC_OON
-        str     r2,  [r1]
+	ldr     r1,  =OSCC
+	mov     r2,  #OSCC_OON
+	str     r2,  [r1]
 */
 	/* NOTE:  spin here until OSCC.OOK get set, meaning the PLL         */
 	/* has settled.                                                     */
 60:
-        ldr     r2, [r1]
-        ands    r2, r2, #1
-        beq     60b
+	ldr     r2, [r1]
+	ands    r2, r2, #1
+	beq     60b
 
 	/* ---------------------------------------------------------------- */
 	/*                                                                  */
-        /* ---------------------------------------------------------------- */
+	/* ---------------------------------------------------------------- */
 
 	/* Save SDRAM size                                                  */
 	ldr	r1, =DRAM_SIZE
@@ -428,11 +428,10 @@
 	mcr	p14,0,r0,c10,c0,0  /* dcsr */
 #endif
 
-        /* ---------------------------------------------------------------- */
+	/* ---------------------------------------------------------------- */
 	/* End memsetup                                                     */
-        /* ---------------------------------------------------------------- */
+	/* ---------------------------------------------------------------- */
 
 endmemsetup:
 
     mov     pc, lr
-

diff --git a/board/logodl/u-boot.lds b/board/logodl/u-boot.lds
index 46beb15..5aef127 100644
--- a/board/logodl/u-boot.lds
+++ b/board/logodl/u-boot.lds

@@ -26,29 +26,29 @@
 ENTRY(_start)
 SECTIONS
 {
-        . = 0x00000000;
+	. = 0x00000000;
 
-        . = ALIGN(4);
+	. = ALIGN(4);
 	.text      :
 	{
 	  cpu/pxa/start.o	(.text)
 	  *(.text)
 	}
 
-        . = ALIGN(4);
-        .rodata : { *(.rodata) }
+	. = ALIGN(4);
+	.rodata : { *(.rodata) }
 
-        . = ALIGN(4);
-        .data : { *(.data) }
+	. = ALIGN(4);
+	.data : { *(.data) }
 
-        . = ALIGN(4);
-        .got : { *(.got) }
+	. = ALIGN(4);
+	.got : { *(.got) }
 
 	armboot_end_data = .;
 
-        . = ALIGN(4);
+	. = ALIGN(4);
 	bss_start = .;
-        .bss : { *(.bss) }
+	.bss : { *(.bss) }
 	bss_end = .;
 
 	armboot_end = .;

diff --git a/board/lubbock/Makefile b/board/lubbock/Makefile
index 6ddd72e..0e29e7b 100644
--- a/board/lubbock/Makefile
+++ b/board/lubbock/Makefile

@@ -1,3 +1,4 @@
+
 #
 # (C) Copyright 2000
 # Wolfgang Denk, DENX Software Engineering, wd@denx.de.
@@ -29,7 +30,7 @@
 SOBJS	:= memsetup.o
 
 $(LIB):	$(OBJS) $(SOBJS)
-	$(AR) crv $@ $^
+	$(AR) crv $@ $(OBJS) $(SOBJS)
 
 clean:
 	rm -f $(SOBJS) $(OBJS)

diff --git a/board/lubbock/config.mk b/board/lubbock/config.mk
index 0ffe1ba..d2a2040 100644
--- a/board/lubbock/config.mk
+++ b/board/lubbock/config.mk

@@ -1,4 +1,3 @@
 #TEXT_BASE = 0xa1700000
 TEXT_BASE = 0xa3000000
 #TEXT_BASE = 0
-

diff --git a/board/lubbock/memsetup.S b/board/lubbock/memsetup.S
index 5bbd859..dc0b7be 100644
--- a/board/lubbock/memsetup.S
+++ b/board/lubbock/memsetup.S

@@ -140,7 +140,7 @@
 
 mem_init:
 
-        ldr     r1,  =MEMC_BASE		/* get memory controller base addr. */
+	ldr     r1,  =MEMC_BASE		/* get memory controller base addr. */
 
 	/* ---------------------------------------------------------------- */
 	/* Step 2a: Initialize Asynchronous static memory controller        */
@@ -148,81 +148,81 @@
 
 	/* MSC registers: timing, bus width, mem type                       */
 
-        /* MSC0: nCS(0,1)                                                   */
-        ldr     r2,   =CFG_MSC0_VAL
-        str     r2,   [r1, #MSC0_OFFSET]
-        ldr     r2,   [r1, #MSC0_OFFSET]	/* read back to ensure      */
+	/* MSC0: nCS(0,1)                                                   */
+	ldr     r2,   =CFG_MSC0_VAL
+	str     r2,   [r1, #MSC0_OFFSET]
+	ldr     r2,   [r1, #MSC0_OFFSET]	/* read back to ensure      */
 						/* that data latches        */
-        /* MSC1: nCS(2,3)                                                   */
-        ldr     r2,  =CFG_MSC1_VAL
-        str     r2,  [r1, #MSC1_OFFSET]
-        ldr     r2,  [r1, #MSC1_OFFSET]
+	/* MSC1: nCS(2,3)                                                   */
+	ldr     r2,  =CFG_MSC1_VAL
+	str     r2,  [r1, #MSC1_OFFSET]
+	ldr     r2,  [r1, #MSC1_OFFSET]
 
 	/* MSC2: nCS(4,5)                                                   */
-        ldr     r2,  =CFG_MSC2_VAL
-        str     r2,  [r1, #MSC2_OFFSET]
-        ldr     r2,  [r1, #MSC2_OFFSET]
+	ldr     r2,  =CFG_MSC2_VAL
+	str     r2,  [r1, #MSC2_OFFSET]
+	ldr     r2,  [r1, #MSC2_OFFSET]
 
 	/* ---------------------------------------------------------------- */
 	/* Step 2b: Initialize Card Interface                               */
 	/* ---------------------------------------------------------------- */
 
 	/* MECR: Memory Expansion Card Register                             */
-        ldr     r2,  =CFG_MECR_VAL
-        str     r2,  [r1, #MECR_OFFSET]
+	ldr     r2,  =CFG_MECR_VAL
+	str     r2,  [r1, #MECR_OFFSET]
 	ldr	r2,	[r1, #MECR_OFFSET]
 
 	/* MCMEM0: Card Interface slot 0 timing                             */
-        ldr     r2,  =CFG_MCMEM0_VAL
-        str     r2,  [r1, #MCMEM0_OFFSET]
+	ldr     r2,  =CFG_MCMEM0_VAL
+	str     r2,  [r1, #MCMEM0_OFFSET]
 	ldr	r2,	[r1, #MCMEM0_OFFSET]
 
-        /* MCMEM1: Card Interface slot 1 timing                             */
-        ldr     r2,  =CFG_MCMEM1_VAL
-        str     r2,  [r1, #MCMEM1_OFFSET]
+	/* MCMEM1: Card Interface slot 1 timing                             */
+	ldr     r2,  =CFG_MCMEM1_VAL
+	str     r2,  [r1, #MCMEM1_OFFSET]
 	ldr	r2,	[r1, #MCMEM1_OFFSET]
 
 	/* MCATT0: Card Interface Attribute Space Timing, slot 0            */
-        ldr     r2,  =CFG_MCATT0_VAL
-        str     r2,  [r1, #MCATT0_OFFSET]
+	ldr     r2,  =CFG_MCATT0_VAL
+	str     r2,  [r1, #MCATT0_OFFSET]
 	ldr	r2,	[r1, #MCATT0_OFFSET]
 
 	/* MCATT1: Card Interface Attribute Space Timing, slot 1            */
-        ldr     r2,  =CFG_MCATT1_VAL
-        str     r2,  [r1, #MCATT1_OFFSET]
+	ldr     r2,  =CFG_MCATT1_VAL
+	str     r2,  [r1, #MCATT1_OFFSET]
 	ldr	r2,	[r1, #MCATT1_OFFSET]
 
 	/* MCIO0: Card Interface I/O Space Timing, slot 0                   */
-        ldr     r2,  =CFG_MCIO0_VAL
-        str     r2,  [r1, #MCIO0_OFFSET]
+	ldr     r2,  =CFG_MCIO0_VAL
+	str     r2,  [r1, #MCIO0_OFFSET]
 	ldr	r2,	[r1, #MCIO0_OFFSET]
 
 	/* MCIO1: Card Interface I/O Space Timing, slot 1                   */
-        ldr     r2,  =CFG_MCIO1_VAL
-        str     r2,  [r1, #MCIO1_OFFSET]
+	ldr     r2,  =CFG_MCIO1_VAL
+	str     r2,  [r1, #MCIO1_OFFSET]
 	ldr	r2,	[r1, #MCIO1_OFFSET]
 
 	/* ---------------------------------------------------------------- */
-        /* Step 2c: Write FLYCNFG  FIXME: what's that???                    */
-        /* ---------------------------------------------------------------- */
+	/* Step 2c: Write FLYCNFG  FIXME: what's that???                    */
+	/* ---------------------------------------------------------------- */
 
 
 	/* ---------------------------------------------------------------- */
-        /* Step 2d: Initialize Timing for Sync Memory (SDCLK0)              */
-        /* ---------------------------------------------------------------- */
+	/* Step 2d: Initialize Timing for Sync Memory (SDCLK0)              */
+	/* ---------------------------------------------------------------- */
 
 	/* Before accessing MDREFR we need a valid DRI field, so we set     */
 	/* this to power on defaults + DRI field.                           */
 
-        ldr     r3,     =CFG_MDREFR_VAL
-        ldr     r2,     =0xFFF
-        and     r3,     r3,  r2
+	ldr     r3,     =CFG_MDREFR_VAL
+	ldr     r2,     =0xFFF
+	and     r3,     r3,  r2
 	ldr	r4,	=0x03ca4000
-        orr     r4,     r4,  r3
+	orr     r4,     r4,  r3
 	str	r4,	[r1, #MDREFR_OFFSET]	/* write back MDREFR        */
-        ldr     r4,  [r1, #MDREFR_OFFSET]
+	ldr     r4,  [r1, #MDREFR_OFFSET]
 
-        /* Note: preserve the mdrefr value in r4                            */
+	/* Note: preserve the mdrefr value in r4                            */
 
 
 	/* ---------------------------------------------------------------- */
@@ -238,30 +238,30 @@
 	/* FIXME: we use async mode for now                                 */
 
 
-        /* ---------------------------------------------------------------- */
-        /* Step 4: Initialize SDRAM                                         */
-        /* ---------------------------------------------------------------- */
+	/* ---------------------------------------------------------------- */
+	/* Step 4: Initialize SDRAM                                         */
+	/* ---------------------------------------------------------------- */
 
-        /* set MDREFR according to user define with exception of a few bits */
+	/* set MDREFR according to user define with exception of a few bits */
 
-        ldr     r4,     =CFG_MDREFR_VAL
+	ldr     r4,     =CFG_MDREFR_VAL
 	orr	r4,	r4,	#(MDREFR_SLFRSH)
 	bic	r4,	r4,	#(MDREFR_E1PIN|MDREFR_E0PIN)
 	str     r4,     [r1, #MDREFR_OFFSET]    /* write back MDREFR        */
-        ldr     r4,  [r1, #MDREFR_OFFSET]
+	ldr     r4,  [r1, #MDREFR_OFFSET]
 
 	/* Step 4b: de-assert MDREFR:SLFRSH.                                */
 
 	bic	r4,	r4,	#(MDREFR_SLFRSH)
-        str     r4,     [r1, #MDREFR_OFFSET]    /* write back MDREFR        */
-        ldr     r4,  [r1, #MDREFR_OFFSET]
+	str     r4,     [r1, #MDREFR_OFFSET]    /* write back MDREFR        */
+	ldr     r4,  [r1, #MDREFR_OFFSET]
 
 
 	/* Step 4c: assert MDREFR:E1PIN and E0PIO as desired                */
 
-        ldr     r4,     =CFG_MDREFR_VAL
-        str     r4,     [r1, #MDREFR_OFFSET]    /* write back MDREFR        */
-        ldr     r4,     [r1, #MDREFR_OFFSET]
+	ldr     r4,     =CFG_MDREFR_VAL
+	str     r4,     [r1, #MDREFR_OFFSET]    /* write back MDREFR        */
+	ldr     r4,     [r1, #MDREFR_OFFSET]
 
 
 	/* Step 4d: write MDCNFG with MDCNFG:DEx deasserted (set to 0), to  */
@@ -270,15 +270,15 @@
 	ldr	r4,	=CFG_MDCNFG_VAL
 	bic	r4,	r4,	#(MDCNFG_DE0|MDCNFG_DE1)
 
-        str     r4,     [r1, #MDCNFG_OFFSET]	/* write back MDCNFG        */
-        ldr     r4,     [r1, #MDCNFG_OFFSET]
+	str     r4,     [r1, #MDCNFG_OFFSET]	/* write back MDCNFG        */
+	ldr     r4,     [r1, #MDCNFG_OFFSET]
 
 
 	/* Step 4e: Wait for the clock to the SDRAMs to stabilize,          */
 	/*          100..200 µsec.                                          */
 
 	ldr r3, =OSCR			/* reset the OS Timer Count to zero */
-    	mov r2, #0
+	mov r2, #0
 	    str r2, [r3]
 	ldr r4, =0x300			/* really 0x2E1 is about 200usec,   */
 					/* so 0x300 should be plenty        */
@@ -308,14 +308,14 @@
 	/* Step 4g: Write MDCNFG with enable bits asserted                  */
 	/*          (MDCNFG:DEx set to 1).                                  */
 
-        ldr     r3,  [r1, #MDCNFG_OFFSET]
+	ldr     r3,  [r1, #MDCNFG_OFFSET]
 	orr	r3,	r3,	#(MDCNFG_DE0|MDCNFG_DE1)
-        str     r3,  [r1, #MDCNFG_OFFSET]
+	str     r3,  [r1, #MDCNFG_OFFSET]
 
 	/* Step 4h: Write MDMRS.                                            */
 
-        ldr     r2,  =CFG_MDMRS_VAL
-        str     r2,  [r1, #MDMRS_OFFSET]
+	ldr     r2,  =CFG_MDMRS_VAL
+	str     r2,  [r1, #MDMRS_OFFSET]
 
 
 	/* We are finished with Intel's memory controller initialisation    */
@@ -327,17 +327,17 @@
 
 initirqs:
 
-        mov     r1, #0		/* clear int. level register (IRQ, not FIQ) */
-        ldr     r2,  =ICLR
-        str     r1,  [r2]
+	mov     r1, #0		/* clear int. level register (IRQ, not FIQ) */
+	ldr     r2,  =ICLR
+	str     r1,  [r2]
 
-        ldr     r2,  =ICMR	/* mask all interrupts at the controller    */
-        str     r1,  [r2]
+	ldr     r2,  =ICMR	/* mask all interrupts at the controller    */
+	str     r1,  [r2]
 
 
-        /* ---------------------------------------------------------------- */
+	/* ---------------------------------------------------------------- */
 	/* Clock initialisation                                             */
-        /* ---------------------------------------------------------------- */
+	/* ---------------------------------------------------------------- */
 
 initclks:
 
@@ -346,36 +346,36 @@
 
 	/* Turn Off ALL on-chip peripheral clocks for re-configuration      */
 	/* Note: See label 'ENABLECLKS' for the re-enabling                 */
-        ldr     r1,  =CKEN
-        mov     r2,  #0
-        str     r2,  [r1]
+	ldr     r1,  =CKEN
+	mov     r2,  #0
+	str     r2,  [r1]
 
 
-        /* default value in case no valid rotary switch setting is found    */
-        ldr     r2, =(CCCR_L27|CCCR_M2|CCCR_N10)  /* DEFAULT: {200/200/100} */
+	/* default value in case no valid rotary switch setting is found    */
+	ldr     r2, =(CCCR_L27|CCCR_M2|CCCR_N10)  /* DEFAULT: {200/200/100} */
 
-        /* ... and write the core clock config register                     */
-        ldr     r1,  =CCCR
-        str     r2,  [r1]
+	/* ... and write the core clock config register                     */
+	ldr     r1,  =CCCR
+	str     r2,  [r1]
 
 #ifdef RTC
 	/* enable the 32Khz oscillator for RTC and PowerManager             */
 
-        ldr     r1,  =OSCC
-        mov     r2,  #OSCC_OON
-        str     r2,  [r1]
+	ldr     r1,  =OSCC
+	mov     r2,  #OSCC_OON
+	str     r2,  [r1]
 
 	/* NOTE:  spin here until OSCC.OOK get set, meaning the PLL         */
 	/* has settled.                                                     */
 60:
-        ldr     r2, [r1]
-        ands    r2, r2, #1
-        beq     60b
+	ldr     r2, [r1]
+	ands    r2, r2, #1
+	beq     60b
 #endif
 
 	/* ---------------------------------------------------------------- */
 	/*                                                                  */
-        /* ---------------------------------------------------------------- */
+	/* ---------------------------------------------------------------- */
 
 	/* Save SDRAM size */
     ldr     r1, =DRAM_SIZE
@@ -402,11 +402,10 @@
 
 #endif
 
-        /* ---------------------------------------------------------------- */
+	/* ---------------------------------------------------------------- */
 	/* End memsetup                                                     */
-        /* ---------------------------------------------------------------- */
+	/* ---------------------------------------------------------------- */
 
 endmemsetup:
 
     mov     pc, lr
-

diff --git a/board/lubbock/u-boot.lds b/board/lubbock/u-boot.lds
index 46beb15..4c4cabf 100644
--- a/board/lubbock/u-boot.lds
+++ b/board/lubbock/u-boot.lds

@@ -26,29 +26,33 @@
 ENTRY(_start)
 SECTIONS
 {
-        . = 0x00000000;
+	. = 0x00000000;
 
-        . = ALIGN(4);
+	. = ALIGN(4);
 	.text      :
 	{
 	  cpu/pxa/start.o	(.text)
 	  *(.text)
 	}
 
-        . = ALIGN(4);
-        .rodata : { *(.rodata) }
+	. = ALIGN(4);
+	.rodata : { *(.rodata) }
 
-        . = ALIGN(4);
-        .data : { *(.data) }
+	. = ALIGN(4);
+	.data : { *(.data) }
 
-        . = ALIGN(4);
-        .got : { *(.got) }
+	. = ALIGN(4);
+	.got : { *(.got) }
+
+   __u_boot_cmd_start = .;
+   .u_boot_cmd : { *(.u_boot_cmd) }
+   __u_boot_cmd_end = .;
 
 	armboot_end_data = .;
 
-        . = ALIGN(4);
+	. = ALIGN(4);
 	bss_start = .;
-        .bss : { *(.bss) }
+	.bss : { *(.bss) }
 	bss_end = .;
 
 	armboot_end = .;

diff --git a/board/lwmon/Makefile b/board/lwmon/Makefile
index 35b8428..7a2014d 100644
--- a/board/lwmon/Makefile
+++ b/board/lwmon/Makefile

@@ -28,7 +28,7 @@
 OBJS	= $(BOARD).o flash.o
 
 $(LIB):	.depend $(OBJS)
-	$(AR) crv $@ $^
+	$(AR) crv $@ $(OBJS)
 
 #########################################################################
 

diff --git a/board/lwmon/README.keybd b/board/lwmon/README.keybd
index bf759c6..788c864 100644
--- a/board/lwmon/README.keybd
+++ b/board/lwmon/README.keybd

@@ -15,7 +15,6 @@
 einer Applikation ausgewertet werden.
 
 
-
 Sonderfunktionen beim Booten:
 
 Es lassen sich eine oder mehrere (beliebig viele) Tasten oder Tasten-

diff --git a/board/lwmon/lwmon.c b/board/lwmon/lwmon.c
index d5a637f..b359ec7 100644
--- a/board/lwmon/lwmon.c
+++ b/board/lwmon/lwmon.c

@@ -38,7 +38,6 @@
 #include <commproc.h>
 #include <i2c.h>
 #include <command.h>
-#include <cmd_bsp.h>
 #include <malloc.h>
 #include <post.h>
 
@@ -73,9 +72,9 @@
 	/*
 	 * SDRAM Initialization (offset 5 in UPM RAM)
 	 *
-         * This is no UPM entry point. The following definition uses
-         * the remaining space to establish an initialization
-         * sequence, which is executed by a RUN command.
+	 * This is no UPM entry point. The following definition uses
+	 * the remaining space to establish an initialization
+	 * sequence, which is executed by a RUN command.
 	 *
 	 */
 		    0x1FF5FC34, 0xEFEABC34, 0x1FB57C35, /* last */
@@ -121,9 +120,9 @@
 	/*
 	 * SDRAM Initialization (offset 5 in UPM RAM)
 	 *
-         * This is no UPM entry point. The following definition uses
-         * the remaining space to establish an initialization
-         * sequence, which is executed by a RUN command.
+	 * This is no UPM entry point. The following definition uses
+	 * the remaining space to establish an initialization
+	 * sequence, which is executed by a RUN command.
 	 *
 	 */
 		    0x1FF5FC34, 0xEFEABC34, 0x1FB57C35, /* last */
@@ -132,7 +131,7 @@
 	 */
 	0x0E2DBC04, 0x10AF7C04, 0xF0AFFC00, 0xF0AFFC00,
 	0xF1AFFC00, 0xEFBAFC00, 0x1FF5FC47, /* last */
-				 	    _NOT_USED_,
+					    _NOT_USED_,
 	_NOT_USED_, _NOT_USED_, _NOT_USED_, _NOT_USED_,
 	_NOT_USED_, _NOT_USED_, _NOT_USED_, _NOT_USED_,
 	/*
@@ -146,7 +145,7 @@
 	 */
 	0x0E29BC04, 0x10A77C00, 0xF0AFFC00, 0xF0AFFC00,
 	0xE1BAFC04, 0x1FF5FC47, /* last */
-			        _NOT_USED_, _NOT_USED_,
+				_NOT_USED_, _NOT_USED_,
 	_NOT_USED_, _NOT_USED_, _NOT_USED_, _NOT_USED_,
 	_NOT_USED_, _NOT_USED_, _NOT_USED_, _NOT_USED_,
 	/*
@@ -511,7 +510,7 @@
 	int i;
 
 	i2c_init (CFG_I2C_SPEED, CFG_I2C_SLAVE);
-	
+
 	gd->kbd_status = 0;
 
 	/* Read initial keyboard error code */
@@ -543,13 +542,13 @@
 	/*
 	 * Read current keyboard state.
 	 *
-         * After the error reset it may take some time before the
-         * keyboard PIC picks up a valid keyboard scan - the total
-         * scan time is approx. 1.6 ms (information by Martin Rajek,
-         * 28 Sep 2002). We read a couple of times for the keyboard
-         * to stabilize, using a big enough delay.
-         * 10 times should be enough. If the data is still changing,
-         * we use what we get :-(
+	 * After the error reset it may take some time before the
+	 * keyboard PIC picks up a valid keyboard scan - the total
+	 * scan time is approx. 1.6 ms (information by Martin Rajek,
+	 * 28 Sep 2002). We read a couple of times for the keyboard
+	 * to stabilize, using a big enough delay.
+	 * 10 times should be enough. If the data is still changing,
+	 * we use what we get :-(
 	 */
 
 	memset (tmp_data, 0xFF, KEYBD_DATALEN);	/* impossible value */
@@ -849,6 +848,12 @@
 	printf ("Usage:\n%s\n", cmdtp->usage);
 	return 1;
 }
+cmd_tbl_t U_BOOT_CMD(pic) = MK_CMD_ENTRY(
+	"pic",	4,	1,	do_pic,
+	"pic     - read and write PIC registers\n",
+	"read  reg      - read PIC register `reg'\n"
+	"pic write reg val  - write value `val' to PIC register `reg'\n"
+);
 
 /***********************************************************************
 F* Function:     int do_kbd (cmd_tbl_t *cmdtp, int flag,
@@ -902,6 +907,12 @@
 	return 0;
 }
 
+cmd_tbl_t U_BOOT_CMD(kdb) = MK_CMD_ENTRY(
+	"kbd",	1,	1,	do_kbd,
+	"kbd     - read keyboard status\n",
+	NULL
+);
+
 /* Read and set LSB switch */
 #define CFG_PC_TXD1_ENA		0x0008		/* PC.12 */
 
@@ -968,6 +979,14 @@
 	return 1;
 }
 
+cmd_tbl_t U_BOOT_CMD(lsb) = MK_CMD_ENTRY(
+	"lsb",	2,	1,	do_lsb,
+	"lsb     - check and set LSB switch\n",
+	"on  - switch LSB on\n"
+	"lsb off - switch LSB off\n"
+	"lsb     - print current setting\n"
+);
+
 #endif /* CFG_CMD_BSP */
 
 /*----------------------------- Utilities -----------------------------*/

diff --git a/board/lwmon/u-boot.lds b/board/lwmon/u-boot.lds
index 3764878..fffa79e 100644
--- a/board/lwmon/u-boot.lds
+++ b/board/lwmon/u-boot.lds

@@ -98,6 +98,11 @@
   _edata  =  .;
   PROVIDE (edata = .);
 
+  __u_boot_cmd_start = .;
+  .u_boot_cmd : { *(.u_boot_cmd) }
+  __u_boot_cmd_end = .;
+
+
   __start___ex_table = .;
   __ex_table : { *(__ex_table) }
   __stop___ex_table = .;
@@ -120,4 +125,3 @@
   _end = . ;
   PROVIDE (end = .);
 }
-

diff --git a/board/lwmon/u-boot.lds.debug b/board/lwmon/u-boot.lds.debug
index 9183016..153286b 100644
--- a/board/lwmon/u-boot.lds.debug
+++ b/board/lwmon/u-boot.lds.debug

@@ -107,6 +107,11 @@
   _edata  =  .;
   PROVIDE (edata = .);
 
+  __u_boot_cmd_start = .;
+  .u_boot_cmd : { *(.u_boot_cmd) }
+  __u_boot_cmd_end = .;
+
+
   __start___ex_table = .;
   __ex_table : { *(__ex_table) }
   __stop___ex_table = .;
@@ -129,4 +134,3 @@
   _end = . ;
   PROVIDE (end = .);
 }
-

diff --git a/board/mbx8xx/Makefile b/board/mbx8xx/Makefile
index f8fb581..3e8376c 100644
--- a/board/mbx8xx/Makefile
+++ b/board/mbx8xx/Makefile

@@ -28,7 +28,7 @@
 OBJS	= $(BOARD).o flash.o vpd.o
 
 $(LIB):	.depend $(OBJS)
-	$(AR) crv $@ $^
+	$(AR) crv $@ $(OBJS)
 
 #########################################################################
 

diff --git a/board/mbx8xx/u-boot.lds b/board/mbx8xx/u-boot.lds
index 6371110..c1ee544 100644
--- a/board/mbx8xx/u-boot.lds
+++ b/board/mbx8xx/u-boot.lds

@@ -98,6 +98,11 @@
   _edata  =  .;
   PROVIDE (edata = .);
 
+  __u_boot_cmd_start = .;
+  .u_boot_cmd : { *(.u_boot_cmd) }
+  __u_boot_cmd_end = .;
+
+
   __start___ex_table = .;
   __ex_table : { *(__ex_table) }
   __stop___ex_table = .;
@@ -120,4 +125,3 @@
   _end = . ;
   PROVIDE (end = .);
 }
-

diff --git a/board/mbx8xx/u-boot.lds.debug b/board/mbx8xx/u-boot.lds.debug
index bd13b7b..0245f78 100644
--- a/board/mbx8xx/u-boot.lds.debug
+++ b/board/mbx8xx/u-boot.lds.debug

@@ -107,6 +107,11 @@
   _edata  =  .;
   PROVIDE (edata = .);
 
+  __u_boot_cmd_start = .;
+  .u_boot_cmd : { *(.u_boot_cmd) }
+  __u_boot_cmd_end = .;
+
+
   __start___ex_table = .;
   __ex_table : { *(__ex_table) }
   __stop___ex_table = .;
@@ -129,4 +134,3 @@
   _end = . ;
   PROVIDE (end = .);
 }
-

diff --git a/board/ml2/Makefile b/board/ml2/Makefile
index dd93ded..40c60b1 100644
--- a/board/ml2/Makefile
+++ b/board/ml2/Makefile

@@ -29,7 +29,7 @@
 SOBJS	= init.o
 
 $(LIB):	$(OBJS) $(SOBJS)
-	$(AR) crv $@ $^
+	$(AR) crv $@ $(OBJS)
 
 clean:
 	rm -f $(SOBJS) $(OBJS)

diff --git a/board/ml2/flash.c b/board/ml2/flash.c
index 77e0931..090725d 100644
--- a/board/ml2/flash.c
+++ b/board/ml2/flash.c

@@ -298,4 +298,3 @@
 	return write_word(info, wp, data);
 
 }
-

diff --git a/board/ml2/init.S b/board/ml2/init.S
index 2386c2a..80f98c5 100644
--- a/board/ml2/init.S
+++ b/board/ml2/init.S

@@ -25,10 +25,10 @@
 #include <asm/mmu.h>
 
 
-     	.globl	ext_bus_cntlr_init
+	.globl	ext_bus_cntlr_init
 ext_bus_cntlr_init:
-        blr
+	blr
 
-        .globl  sdram_init
+	.globl  sdram_init
 sdram_init:
-        blr
+	blr

diff --git a/board/ml2/ml2.c b/board/ml2/ml2.c
index a89a8f9..6cc1bec 100644
--- a/board/ml2/ml2.c
+++ b/board/ml2/ml2.c

@@ -22,7 +22,6 @@
 #include <asm/processor.h>
 
 
-
 int board_pre_init (void)
 {
 	return 0;

diff --git a/board/ml2/serial.c b/board/ml2/serial.c
index dc9a8ea..92baba9 100644
--- a/board/ml2/serial.c
+++ b/board/ml2/serial.c

@@ -35,7 +35,7 @@
 
 #if (defined CFG_INIT_CHAN1) || (defined CFG_INIT_CHAN2)
 const NS16550_t COM_PORTS[] = { (NS16550_t) CFG_NS16550_COM1,
-		                (NS16550_t) CFG_NS16550_COM2 };
+				(NS16550_t) CFG_NS16550_COM2 };
 #endif
 
 int
@@ -59,7 +59,7 @@
 serial_putc(const char c)
 {
     if (c == '\n')
-        NS16550_putc(COM_PORTS[CFG_DUART_CHAN], '\r');
+	NS16550_putc(COM_PORTS[CFG_DUART_CHAN], '\r');
 
     NS16550_putc(COM_PORTS[CFG_DUART_CHAN], c);
 }

diff --git a/board/ml2/u-boot.lds b/board/ml2/u-boot.lds
index 9685f89..07275d3 100644
--- a/board/ml2/u-boot.lds
+++ b/board/ml2/u-boot.lds

@@ -116,6 +116,11 @@
   _edata  =  .;
   PROVIDE (edata = .);
 
+  __u_boot_cmd_start = .;
+  .u_boot_cmd : { *(.u_boot_cmd) }
+  __u_boot_cmd_end = .;
+
+
   __start___ex_table = .;
   __ex_table : { *(__ex_table) }
   __stop___ex_table = .;

diff --git a/board/ml2/u-boot.lds.debug b/board/ml2/u-boot.lds.debug
index f4f9743..d483424 100644
--- a/board/ml2/u-boot.lds.debug
+++ b/board/ml2/u-boot.lds.debug

@@ -106,6 +106,11 @@
   _edata  =  .;
   PROVIDE (edata = .);
 
+  __u_boot_cmd_start = .;
+  .u_boot_cmd : { *(.u_boot_cmd) }
+  __u_boot_cmd_end = .;
+
+
   __start___ex_table = .;
   __ex_table : { *(__ex_table) }
   __stop___ex_table = .;
@@ -128,4 +133,3 @@
   _end = . ;
   PROVIDE (end = .);
 }
-

diff --git a/board/mousse/Makefile b/board/mousse/Makefile
index 6d9df89..ddc5546 100644
--- a/board/mousse/Makefile
+++ b/board/mousse/Makefile

@@ -1,3 +1,4 @@
+
 #
 # (C) Copyright 2001
 # Wolfgang Denk, DENX Software Engineering, wd@denx.de.
@@ -28,7 +29,7 @@
 OBJS	= $(BOARD).o m48t59y.o pci.o flash.o
 
 $(LIB):	.depend $(OBJS)
-	$(AR) crv $@ $^
+	$(AR) crv $@ $(OBJS)
 
 #########################################################################
 

diff --git a/board/mousse/README b/board/mousse/README
index ef072bd..61aacce 100644
--- a/board/mousse/README
+++ b/board/mousse/README

@@ -20,7 +20,6 @@
 U-Boot Loading...
 
 
-
 U-Boot 1.0.5 (Sep 10 2001 - 00:22:25)
 
 CPU:   MPC8240 Revision 1.1 at 198 MHz: 16 kB I-Cache 16 kB D-Cache
@@ -70,7 +69,6 @@
 type "saveenv" to write to NVRAM.
 
 
-
 II. To boot from a hard drive:
 
 setenv root /dev/hda1
@@ -174,7 +172,6 @@
 cp.b 100000 FFF80000 \$(filesize)\
 
 
-
 C. FLASH KERNEL REGION (960KB)
 
 FLASH support is provided for the 960KB onboard FLASH1 segment.
@@ -215,7 +212,6 @@
 =>
 
 
-
 When finished, use the command:
 
 bootm ffe10000

diff --git a/board/mousse/flash.c b/board/mousse/flash.c
index 3c4a802..2c32b8f 100644
--- a/board/mousse/flash.c
+++ b/board/mousse/flash.c

@@ -120,140 +120,141 @@
 #define FLASH0_READ(dev, addr) \
 	(*FLASH0_ADDR(dev, addr))
 
-PRIVATE int flashCheck(flash_dev_t *dev)
+PRIVATE int flashCheck (flash_dev_t * dev)
 {
-    if (! flashLibInited) {
-	printf("flashCheck: flashLib not initialized\n");
-	return ERROR;
-    }
-
-    if (dev < &flashDev[0] || dev >= &flashDev[flashDevCount]) {
-	printf("flashCheck: Bad dev parameter\n");
-	return ERROR;
-    }
-
-    if (! dev->found) {
-	printf("flashCheck: Device %d not available\n", DEV_NO(dev));
-	return ERROR;
-    }
-
-    return OK;
-}
-
-PRIVATE void flashReset(flash_dev_t *dev)
-{
-    PRINTF("flashReset: dev=%d\n", DEV_NO(dev));
-
-    if (dev->bank == FLASH0_BANK) {
-	FLASH0_WRITE(dev, 0x555, 0xaa);
-	FLASH0_WRITE(dev, 0xaaa, 0x55);
-	FLASH0_WRITE(dev, 0x555, 0xf0);
-    }
-
-    udelay(SLEEP_DELAY);
-
-    PRINTF("flashReset: done\n");
-}
-
-PRIVATE int flashProbe(flash_dev_t *dev)
-{
-    int			rv, deviceID, vendorID;
-
-    PRINTF("flashProbe: dev=%d\n", DEV_NO(dev));
-
-    if (dev->bank != FLASH0_BANK) {
-    	rv = ERROR;
-	goto DONE;
-    }
-
-    FLASH0_WRITE(dev, 0xaaa, 0xaa);
-    FLASH0_WRITE(dev, 0x555, 0x55);
-    FLASH0_WRITE(dev, 0xaaa, 0x90);
-
-    udelay(SLEEP_DELAY);
-
-    vendorID = FLASH0_READ(dev, 0);
-    deviceID = FLASH0_READ(dev, 2);
-
-    FLASH0_WRITE(dev, 0, 0xf0);
-
-    PRINTF("flashProbe: vendor=0x%x device=0x%x\n", vendorID, deviceID);
-
-    if (vendorID == dev->vendorID && deviceID == dev->deviceID)
-	rv = OK;
-    else
-	rv = ERROR;
-
-DONE:
-    PRINTF("flashProbe: rv=%d\n", rv);
-
-    return rv;
-}
-
-PRIVATE int flashWait(flash_dev_t *dev, int addr, int expect, int erase)
-{
-    int			rv = ERROR;
-    int			i, data;
-    int			polls;
-#if 0
-    PRINTF("flashWait: dev=%d addr=0x%x expect=0x%x erase=%d\n",
-	   DEV_NO(dev), addr, expect, erase);
-#endif
-
-    if (dev->bank != FLASH0_BANK) {
-	rv = ERROR;
-	goto done;
-    }
-
-    if (erase)
-	polls = FLASH_ERASE_SECTOR_TIMEOUT;	/* Ticks */
-    else
-	polls = FLASH_PROGRAM_POLLS;		/* Loops */
-
-    for (i = 0; i < polls; i++) {
-	if (erase)
-	    udelay(SLEEP_DELAY);
-
-	data = FLASH0_READ(dev, addr);
-
-	if (((data ^ expect) & 0x80) == 0) {
-	    rv = OK;
-	    goto done;
+	if (!flashLibInited) {
+		printf ("flashCheck: flashLib not initialized\n");
+		return ERROR;
 	}
 
-	if (data & 0x20) {
-	    /*
-	     * If the 0x20 bit has come on, it could actually be because
-	     * the operation succeeded, so check the done bit again.
-	     */
+	if (dev < &flashDev[0] || dev >= &flashDev[flashDevCount]) {
+		printf ("flashCheck: Bad dev parameter\n");
+		return ERROR;
+	}
 
-	    data = FLASH0_READ(dev, addr);
+	if (!dev->found) {
+		printf ("flashCheck: Device %d not available\n", DEV_NO (dev));
+		return ERROR;
+	}
 
-	    if (((data ^ expect) & 0x80) == 0) {
+	return OK;
+}
+
+PRIVATE void flashReset (flash_dev_t * dev)
+{
+	PRINTF ("flashReset: dev=%d\n", DEV_NO (dev));
+
+	if (dev->bank == FLASH0_BANK) {
+		FLASH0_WRITE (dev, 0x555, 0xaa);
+		FLASH0_WRITE (dev, 0xaaa, 0x55);
+		FLASH0_WRITE (dev, 0x555, 0xf0);
+	}
+
+	udelay (SLEEP_DELAY);
+
+	PRINTF ("flashReset: done\n");
+}
+
+PRIVATE int flashProbe (flash_dev_t * dev)
+{
+	int rv, deviceID, vendorID;
+
+	PRINTF ("flashProbe: dev=%d\n", DEV_NO (dev));
+
+	if (dev->bank != FLASH0_BANK) {
+		rv = ERROR;
+		goto DONE;
+	}
+
+	FLASH0_WRITE (dev, 0xaaa, 0xaa);
+	FLASH0_WRITE (dev, 0x555, 0x55);
+	FLASH0_WRITE (dev, 0xaaa, 0x90);
+
+	udelay (SLEEP_DELAY);
+
+	vendorID = FLASH0_READ (dev, 0);
+	deviceID = FLASH0_READ (dev, 2);
+
+	FLASH0_WRITE (dev, 0, 0xf0);
+
+	PRINTF ("flashProbe: vendor=0x%x device=0x%x\n", vendorID, deviceID);
+
+	if (vendorID == dev->vendorID && deviceID == dev->deviceID)
 		rv = OK;
-		goto done;
-	    }
+	else
+		rv = ERROR;
 
-	    printf("flashWait: Program error (dev: %d, addr: 0x%x)\n",
-		   DEV_NO(dev), addr);
+  DONE:
+	PRINTF ("flashProbe: rv=%d\n", rv);
 
-	    flashReset(dev);
-	    rv = ERROR;
-	    goto done;
-	}
-    }
+	return rv;
+}
 
-    printf("flashWait: Timeout %s (dev: %d, addr: 0x%x)\n",
-	   erase ? "erasing sector" : "programming byte",
-	   DEV_NO(dev), addr);
-
-done:
+PRIVATE int flashWait (flash_dev_t * dev, int addr, int expect, int erase)
+{
+	int rv = ERROR;
+	int i, data;
+	int polls;
 
 #if 0
-    PRINTF("flashWait: rv=%d\n", rv);
+	PRINTF ("flashWait: dev=%d addr=0x%x expect=0x%x erase=%d\n",
+		DEV_NO (dev), addr, expect, erase);
 #endif
 
-    return rv;
+	if (dev->bank != FLASH0_BANK) {
+		rv = ERROR;
+		goto done;
+	}
+
+	if (erase)
+		polls = FLASH_ERASE_SECTOR_TIMEOUT;	/* Ticks */
+	else
+		polls = FLASH_PROGRAM_POLLS;	/* Loops */
+
+	for (i = 0; i < polls; i++) {
+		if (erase)
+			udelay (SLEEP_DELAY);
+
+		data = FLASH0_READ (dev, addr);
+
+		if (((data ^ expect) & 0x80) == 0) {
+			rv = OK;
+			goto done;
+		}
+
+		if (data & 0x20) {
+			/*
+			 * If the 0x20 bit has come on, it could actually be because
+			 * the operation succeeded, so check the done bit again.
+			 */
+
+			data = FLASH0_READ (dev, addr);
+
+			if (((data ^ expect) & 0x80) == 0) {
+				rv = OK;
+				goto done;
+			}
+
+			printf ("flashWait: Program error (dev: %d, addr: 0x%x)\n",
+					DEV_NO (dev), addr);
+
+			flashReset (dev);
+			rv = ERROR;
+			goto done;
+		}
+	}
+
+	printf ("flashWait: Timeout %s (dev: %d, addr: 0x%x)\n",
+		erase ? "erasing sector" : "programming byte",
+		DEV_NO (dev), addr);
+
+  done:
+
+#if 0
+	PRINTF ("flashWait: rv=%d\n", rv);
+#endif
+
+	return rv;
 }
 
 /***********************************************************************
@@ -262,77 +263,78 @@
  *
  ***********************************************************************/
 
-STATUS flashLibInit(void)
+STATUS flashLibInit (void)
 {
-    int			i;
+	int i;
 
-    PRINTF("flashLibInit: devices=%d\n", flashDevCount);
+	PRINTF ("flashLibInit: devices=%d\n", flashDevCount);
 
-    for (i = 0; i < flashDevCount; i++) {
-	flash_dev_t	*dev = &flashDev[i];
-	/*
-	 * For bank 1, probe both without and with byte swappage,
-	 * so that this module works on both old and new Mousse boards.
-	 */
+	for (i = 0; i < flashDevCount; i++) {
+		flash_dev_t *dev = &flashDev[i];
 
-	flashReset(dev);
+		/*
+		 * For bank 1, probe both without and with byte swappage,
+		 * so that this module works on both old and new Mousse boards.
+		 */
 
-	if (flashProbe(dev) != ERROR)
-	    dev->found = 1;
+		flashReset (dev);
 
-	    flashReset(dev);
+		if (flashProbe (dev) != ERROR)
+			dev->found = 1;
 
-	    if (flashProbe(dev) != ERROR)
-		dev->found = 1;
+		flashReset (dev);
 
-	    dev->swap = 0;
+		if (flashProbe (dev) != ERROR)
+			dev->found = 1;
 
-	    if(dev->found){
-	      PRINTF("\n  FLASH %s[%d]: iobase=0x%x - %d sectors %d KB",
-		     flashDev[i].name,i,flashDev[i].base, flashDev[i].sectors,
-		     (flashDev[i].sectors * FLASH_SECTOR_SIZE)/1024);
+		dev->swap = 0;
 
-	    }
-    }
+		if (dev->found) {
+			PRINTF ("\n  FLASH %s[%d]: iobase=0x%x - %d sectors %d KB",
+				flashDev[i].name, i, flashDev[i].base,
+				flashDev[i].sectors,
+				(flashDev[i].sectors * FLASH_SECTOR_SIZE) / 1024);
 
-    flashLibInited = 1;
+		}
+	}
 
-    PRINTF("flashLibInit: done\n");
+	flashLibInited = 1;
 
-    return OK;
+	PRINTF ("flashLibInit: done\n");
+
+	return OK;
 }
 
-STATUS flashEraseSector(flash_dev_t *dev, int sector)
+STATUS flashEraseSector (flash_dev_t * dev, int sector)
 {
-    int			pos, addr;
+	int pos, addr;
 
-    PRINTF("flashErasesector: dev=%d sector=%d\n", DEV_NO(dev), sector);
+	PRINTF ("flashErasesector: dev=%d sector=%d\n", DEV_NO (dev), sector);
 
-    if (flashCheck(dev) == ERROR)
-	return ERROR;
+	if (flashCheck (dev) == ERROR)
+		return ERROR;
 
-    if (sector < 0 || sector >= dev->sectors) {
-	printf("flashEraseSector: Sector out of range (dev: %d, sector: %d)\n",
-	       DEV_NO(dev), sector);
-	return ERROR;
-    }
+	if (sector < 0 || sector >= dev->sectors) {
+		printf ("flashEraseSector: Sector out of range (dev: %d, sector: %d)\n", DEV_NO (dev), sector);
+		return ERROR;
+	}
 
-    pos = FLASH_SECTOR_POS(dev, sector);
+	pos = FLASH_SECTOR_POS (dev, sector);
 
-    if (dev->bank != FLASH0_BANK) {
-	return ERROR;
-    }
+	if (dev->bank != FLASH0_BANK) {
+		return ERROR;
+	}
 
-    addr = pos;
+	addr = pos;
 
-    FLASH0_WRITE(dev, 0xaaa, 0xaa);
-    FLASH0_WRITE(dev, 0x555, 0x55);
-    FLASH0_WRITE(dev, 0xaaa, 0x80);
-    FLASH0_WRITE(dev, 0xaaa, 0xaa);
-    FLASH0_WRITE(dev, 0x555, 0x55);
-    FLASH0_WRITE(dev, addr, 0x30);
+	FLASH0_WRITE (dev, 0xaaa, 0xaa);
+	FLASH0_WRITE (dev, 0x555, 0x55);
+	FLASH0_WRITE (dev, 0xaaa, 0x80);
+	FLASH0_WRITE (dev, 0xaaa, 0xaa);
+	FLASH0_WRITE (dev, 0x555, 0x55);
+	FLASH0_WRITE (dev, addr, 0x30);
 
-    return flashWait(dev, addr, 0xff, 1);
+	return flashWait (dev, addr, 0xff, 1);
 }
 
 /*
@@ -342,156 +344,156 @@
  * they were complete devices, we don't use Chip Erase.
  */
 
-STATUS flashErase(flash_dev_t *dev)
+STATUS flashErase (flash_dev_t * dev)
 {
-    int			sector;
+	int sector;
 
-    PRINTF("flashErase: dev=%d sectors=%d\n", DEV_NO(dev), dev->sectors);
+	PRINTF ("flashErase: dev=%d sectors=%d\n", DEV_NO (dev), dev->sectors);
 
-    if (flashCheck(dev) == ERROR)
-	return ERROR;
+	if (flashCheck (dev) == ERROR)
+		return ERROR;
 
-    for (sector = 0; sector < dev->sectors; sector++) {
-      if (flashEraseSector(dev, sector) == ERROR)
-	    return ERROR;
-    }
-    return OK;
+	for (sector = 0; sector < dev->sectors; sector++) {
+		if (flashEraseSector (dev, sector) == ERROR)
+			return ERROR;
+	}
+	return OK;
 }
 
 /*
  * Read and write bytes
  */
 
-STATUS flashRead(flash_dev_t *dev, int pos, char *buf, int len)
+STATUS flashRead (flash_dev_t * dev, int pos, char *buf, int len)
 {
-    int			addr, words;
+	int addr, words;
 
-    PRINTF("flashRead: dev=%d pos=0x%x buf=0x%x len=0x%x\n",
-	   DEV_NO(dev), pos, (int) buf, len);
+	PRINTF ("flashRead: dev=%d pos=0x%x buf=0x%x len=0x%x\n",
+		DEV_NO (dev), pos, (int) buf, len);
 
-    if (flashCheck(dev) == ERROR)
-	return ERROR;
+	if (flashCheck (dev) == ERROR)
+		return ERROR;
 
-    if (pos < 0 || len < 0 || pos + len > FLASH_MAX_POS(dev)) {
-	printf("flashRead: Position out of range "
-	       "(dev: %d, pos: 0x%x, len: 0x%x)\n",
-	       DEV_NO(dev), pos, len);
-	return ERROR;
-    }
+	if (pos < 0 || len < 0 || pos + len > FLASH_MAX_POS (dev)) {
+		printf ("flashRead: Position out of range "
+			"(dev: %d, pos: 0x%x, len: 0x%x)\n",
+			DEV_NO (dev), pos, len);
+		return ERROR;
+	}
 
-    if (len == 0)
+	if (len == 0)
+		return OK;
+
+	if (dev->bank == FLASH0_BANK) {
+		addr = pos;
+		words = len;
+
+		PRINTF ("flashRead: memcpy(0x%x, 0x%x, 0x%x)\n",
+			(int) buf, (int) FLASH0_ADDR (dev, pos), len);
+
+		memcpy (buf, FLASH0_ADDR (dev, addr), words);
+
+	}
+	PRINTF ("flashRead: rv=OK\n");
+
 	return OK;
-
-    if (dev->bank == FLASH0_BANK) {
-	addr = pos;
-	words = len;
-
-	PRINTF("flashRead: memcpy(0x%x, 0x%x, 0x%x)\n",
-	       (int) buf, (int) FLASH0_ADDR(dev, pos), len);
-
-	memcpy(buf, FLASH0_ADDR(dev, addr), words);
-
-    }
-    PRINTF("flashRead: rv=OK\n");
-
-    return OK;
 }
 
-STATUS flashWrite(flash_dev_t *dev, int pos, char *buf, int len)
+STATUS flashWrite (flash_dev_t * dev, int pos, char *buf, int len)
 {
-    int 		addr, words;
+	int addr, words;
 
-    PRINTF("flashWrite: dev=%d pos=0x%x buf=0x%x len=0x%x\n",
-	   DEV_NO(dev), pos, (int) buf, len);
+	PRINTF ("flashWrite: dev=%d pos=0x%x buf=0x%x len=0x%x\n",
+		DEV_NO (dev), pos, (int) buf, len);
 
-    if (flashCheck(dev) == ERROR)
-	return ERROR;
-
-    if (pos < 0 || len < 0 || pos + len > FLASH_MAX_POS(dev)) {
-	printf("flashWrite: Position out of range "
-	       "(dev: %d, pos: 0x%x, len: 0x%x)\n",
-	       DEV_NO(dev), pos, len);
-	return ERROR;
-    }
-
-    if (len == 0)
-	return OK;
-
-    if (dev->bank == FLASH0_BANK) {
-	unsigned char tmp;
-
-	addr = pos;
-	words = len;
-
-	while (words--) {
-	    tmp = *buf;
-	    if (~FLASH0_READ(dev, addr) & tmp) {
-		printf("flashWrite: Attempt to program 0 to 1 "
-		       "(dev: %d, addr: 0x%x, data: 0x%x)\n",
-		       DEV_NO(dev), addr, tmp);
+	if (flashCheck (dev) == ERROR)
 		return ERROR;
-	    }
-	    FLASH0_WRITE(dev, 0xaaa, 0xaa);
-	    FLASH0_WRITE(dev, 0x555, 0x55);
-	    FLASH0_WRITE(dev, 0xaaa, 0xa0);
-	    FLASH0_WRITE(dev, addr, tmp);
-	    if (flashWait(dev, addr, tmp, 0) < 0)
+
+	if (pos < 0 || len < 0 || pos + len > FLASH_MAX_POS (dev)) {
+		printf ("flashWrite: Position out of range "
+			"(dev: %d, pos: 0x%x, len: 0x%x)\n",
+			DEV_NO (dev), pos, len);
 		return ERROR;
-	    buf++;
-	    addr++;
 	}
-    }
 
-    PRINTF("flashWrite: rv=OK\n");
+	if (len == 0)
+		return OK;
 
-    return OK;
+	if (dev->bank == FLASH0_BANK) {
+		unsigned char tmp;
+
+		addr = pos;
+		words = len;
+
+		while (words--) {
+			tmp = *buf;
+			if (~FLASH0_READ (dev, addr) & tmp) {
+				printf ("flashWrite: Attempt to program 0 to 1 "
+					"(dev: %d, addr: 0x%x, data: 0x%x)\n",
+					DEV_NO (dev), addr, tmp);
+				return ERROR;
+			}
+			FLASH0_WRITE (dev, 0xaaa, 0xaa);
+			FLASH0_WRITE (dev, 0x555, 0x55);
+			FLASH0_WRITE (dev, 0xaaa, 0xa0);
+			FLASH0_WRITE (dev, addr, tmp);
+			if (flashWait (dev, addr, tmp, 0) < 0)
+				return ERROR;
+			buf++;
+			addr++;
+		}
+	}
+
+	PRINTF ("flashWrite: rv=OK\n");
+
+	return OK;
 }
 
 /*
  * flashWritable returns TRUE if a range contains all F's.
  */
 
-STATUS flashWritable(flash_dev_t *dev, int pos, int len)
+STATUS flashWritable (flash_dev_t * dev, int pos, int len)
 {
-    int 		addr, words;
-    int			rv = ERROR;
+	int addr, words;
+	int rv = ERROR;
 
-    PRINTF("flashWritable: dev=%d pos=0x%x len=0x%x\n",
-	   DEV_NO(dev), pos, len);
+	PRINTF ("flashWritable: dev=%d pos=0x%x len=0x%x\n",
+			DEV_NO (dev), pos, len);
 
-    if (flashCheck(dev) == ERROR)
-	goto done;
-
-    if (pos < 0 || len < 0 || pos + len > FLASH_MAX_POS(dev)) {
-	printf("flashWritable: Position out of range "
-	       "(dev: %d, pos: 0x%x, len: 0x%x)\n",
-	       DEV_NO(dev), pos, len);
-	goto done;
-    }
-
-    if (len == 0) {
-	rv = 1;
-	goto done;
-    }
-
-    if (dev->bank == FLASH0_BANK) {
-	addr = pos;
-	words = len;
-
-	while (words--) {
-	    if (FLASH0_READ(dev, addr) != 0xff) {
-		rv = 0;
+	if (flashCheck (dev) == ERROR)
 		goto done;
-	    }
-	    addr++;
+
+	if (pos < 0 || len < 0 || pos + len > FLASH_MAX_POS (dev)) {
+		printf ("flashWritable: Position out of range "
+			"(dev: %d, pos: 0x%x, len: 0x%x)\n",
+			DEV_NO (dev), pos, len);
+		goto done;
 	}
-    }
 
-    rv = 1;
+	if (len == 0) {
+		rv = 1;
+		goto done;
+	}
 
- done:
-    PRINTF("flashWrite: rv=%d\n", rv);
-    return rv;
+	if (dev->bank == FLASH0_BANK) {
+		addr = pos;
+		words = len;
+
+		while (words--) {
+			if (FLASH0_READ (dev, addr) != 0xff) {
+				rv = 0;
+				goto done;
+			}
+			addr++;
+		}
+	}
+
+	rv = 1;
+
+  done:
+	PRINTF ("flashWrite: rv=%d\n", rv);
+	return rv;
 }
 
 
@@ -504,128 +506,126 @@
  *
  ***********************************************************************/
 
-STATUS flashDiag(flash_dev_t *dev)
+STATUS flashDiag (flash_dev_t * dev)
 {
-    unsigned int	*buf = 0;
-    int			i, len, sector;
-    int			rv = ERROR;
+	unsigned int *buf = 0;
+	int i, len, sector;
+	int rv = ERROR;
 
-    if (flashCheck(dev) == ERROR)
-	return ERROR;
+	if (flashCheck (dev) == ERROR)
+		return ERROR;
 
-    printf("flashDiag: Testing device %d, "
-	   "base: 0x%x, %d sectors @ %d kB = %d kB\n",
-	   DEV_NO(dev), dev->base,
-	   dev->sectors,
-	   1 << (dev->lgSectorSize - 10),
-	   dev->sectors << (dev->lgSectorSize - 10));
+	printf ("flashDiag: Testing device %d, "
+		"base: 0x%x, %d sectors @ %d kB = %d kB\n",
+		DEV_NO (dev), dev->base,
+		dev->sectors,
+		1 << (dev->lgSectorSize - 10),
+		dev->sectors << (dev->lgSectorSize - 10));
 
-    len = 1 << dev->lgSectorSize;
+	len = 1 << dev->lgSectorSize;
 
-    printf("flashDiag: Erasing\n");
+	printf ("flashDiag: Erasing\n");
 
-    if (flashErase(dev) == ERROR) {
-	printf("flashDiag: Erase failed\n");
-	goto done;
-    }
-    printf("%d bytes requested ...\n", len);
-    buf = malloc(len);
-    printf("allocated %d bytes ...\n", len);
-    if (buf == 0) {
-	printf("flashDiag: Out of memory\n");
-	goto done;
-    }
-
-    /*
-     * Write unique counting pattern to each sector
-     */
-
-    for (sector = 0; sector < dev->sectors; sector++) {
-	printf("flashDiag: Write sector %d\n", sector);
-
-	for (i = 0; i < len / 4; i++)
-	    buf[i] = sector << 24 | i;
-
-	if (flashWrite(dev,
-		       sector << dev->lgSectorSize,
-		       (char *) buf,
-		       len) == ERROR) {
-	    printf("flashDiag: Write failed (dev: %d, sector: %d)\n",
-		   DEV_NO(dev), sector);
-	    goto done;
-	}
-    }
-
-    /*
-     * Verify
-     */
-
-    for (sector = 0; sector < dev->sectors; sector++) {
-	printf("flashDiag: Verify sector %d\n", sector);
-
-	if (flashRead(dev,
-		      sector << dev->lgSectorSize,
-		      (char *) buf,
-		      len) == ERROR) {
-	    printf("flashDiag: Read failed (dev: %d, sector: %d)\n",
-		   DEV_NO(dev), sector);
-	    goto done;
-	}
-
-	for (i = 0; i < len / 4; i++) {
-	    if (buf[i] != (sector << 24 | i)) {
-		printf("flashDiag: Verify error "
-		       "(dev: %d, sector: %d, offset: 0x%x)\n",
-		       DEV_NO(dev), sector, i);
-		printf("flashDiag: Expected 0x%08x, got 0x%08x\n",
-		       sector << 24 | i, buf[i]);
-
+	if (flashErase (dev) == ERROR) {
+		printf ("flashDiag: Erase failed\n");
 		goto done;
-	    }
 	}
-    }
+	printf ("%d bytes requested ...\n", len);
+	buf = malloc (len);
+	printf ("allocated %d bytes ...\n", len);
+	if (buf == 0) {
+		printf ("flashDiag: Out of memory\n");
+		goto done;
+	}
 
-    printf("flashDiag: Erasing\n");
+	/*
+	 * Write unique counting pattern to each sector
+	 */
 
-    if (flashErase(dev) == ERROR) {
-	printf("flashDiag: Final erase failed\n");
-	goto done;
-    }
+	for (sector = 0; sector < dev->sectors; sector++) {
+		printf ("flashDiag: Write sector %d\n", sector);
 
-    rv = OK;
+		for (i = 0; i < len / 4; i++)
+			buf[i] = sector << 24 | i;
 
- done:
-    if (buf)
-	free(buf);
+		if (flashWrite (dev,
+				sector << dev->lgSectorSize,
+				(char *) buf, len) == ERROR) {
+			printf ("flashDiag: Write failed (dev: %d, sector: %d)\n",
+				DEV_NO (dev), sector);
+			goto done;
+		}
+	}
 
-    if (rv == OK)
-	printf("flashDiag: Device %d passed\n", DEV_NO(dev));
-    else
-	printf("flashDiag: Device %d failed\n", DEV_NO(dev));
+	/*
+	 * Verify
+	 */
 
-    return rv;
+	for (sector = 0; sector < dev->sectors; sector++) {
+		printf ("flashDiag: Verify sector %d\n", sector);
+
+		if (flashRead (dev,
+				   sector << dev->lgSectorSize,
+				   (char *) buf, len) == ERROR) {
+			printf ("flashDiag: Read failed (dev: %d, sector: %d)\n",
+				DEV_NO (dev), sector);
+			goto done;
+		}
+
+		for (i = 0; i < len / 4; i++) {
+			if (buf[i] != (sector << 24 | i)) {
+				printf ("flashDiag: Verify error "
+					"(dev: %d, sector: %d, offset: 0x%x)\n",
+					DEV_NO (dev), sector, i);
+				printf ("flashDiag: Expected 0x%08x, got 0x%08x\n",
+					sector << 24 | i, buf[i]);
+
+				goto done;
+			}
+		}
+	}
+
+	printf ("flashDiag: Erasing\n");
+
+	if (flashErase (dev) == ERROR) {
+		printf ("flashDiag: Final erase failed\n");
+		goto done;
+	}
+
+	rv = OK;
+
+  done:
+	if (buf)
+		free (buf);
+
+	if (rv == OK)
+		printf ("flashDiag: Device %d passed\n", DEV_NO (dev));
+	else
+		printf ("flashDiag: Device %d failed\n", DEV_NO (dev));
+
+	return rv;
 }
 
-STATUS flashDiagAll(void)
+STATUS flashDiagAll (void)
 {
-    int			i;
-    int			rv = OK;
+	int i;
+	int rv = OK;
 
-    PRINTF("flashDiagAll: devices=%d\n", flashDevCount);
+	PRINTF ("flashDiagAll: devices=%d\n", flashDevCount);
 
-    for (i = 0; i < flashDevCount; i++) {
-	flash_dev_t	*dev = &flashDev[i];
+	for (i = 0; i < flashDevCount; i++) {
+		flash_dev_t *dev = &flashDev[i];
 
-	if (dev->found && flashDiag(dev) == ERROR)
-	    rv = ERROR;
-    }
+		if (dev->found && flashDiag (dev) == ERROR)
+			rv = ERROR;
+	}
 
-    if (rv == OK)
-	printf("flashDiagAll: Passed\n");
-    else
-	printf("flashDiagAll: Failed because of earlier errors\n");
+	if (rv == OK)
+		printf ("flashDiagAll: Passed\n");
+	else
+		printf ("flashDiagAll: Failed because of earlier errors\n");
 
-    return OK;
+	return OK;
 }
 
 
@@ -633,198 +633,197 @@
  */
 unsigned long flash_init (void)
 {
-    unsigned long size = 0;
-    flash_dev_t	*dev = NULL;
-    flashLibInit();
+	unsigned long size = 0;
+	flash_dev_t *dev = NULL;
 
-    /*
-     * Provide info for FLASH (up to 960K) of Kernel Image data.
-     */
-    dev = FLASH_DEV_BANK0_LOW;
-    flash_info[FLASH_BANK_KERNEL].flash_id =
-      (dev->vendorID << 16) | dev->deviceID;
-    flash_info[FLASH_BANK_KERNEL].sector_count = dev->sectors;
-    flash_info[FLASH_BANK_KERNEL].size =
-      flash_info[FLASH_BANK_KERNEL].sector_count * FLASH_SECTOR_SIZE;
-    flash_info[FLASH_BANK_KERNEL].start[FIRST_SECTOR] = dev->base;
-    size += flash_info[FLASH_BANK_KERNEL].size;
+	flashLibInit ();
 
-    /*
-     * Provide info for 512K PLCC FLASH ROM (U-Boot)
-     */
-    dev = FLASH_DEV_BANK0_BOOT;
-    flash_info[FLASH_BANK_BOOT].flash_id =
-      (dev->vendorID << 16) | dev->deviceID;
-    flash_info[FLASH_BANK_BOOT].sector_count = dev->sectors;
-    flash_info[FLASH_BANK_BOOT].size =
-      flash_info[FLASH_BANK_BOOT].sector_count * FLASH_SECTOR_SIZE;
-    flash_info[FLASH_BANK_BOOT].start[FIRST_SECTOR] = dev->base;
-    size += flash_info[FLASH_BANK_BOOT].size;
+	/*
+	 * Provide info for FLASH (up to 960K) of Kernel Image data.
+	 */
+	dev = FLASH_DEV_BANK0_LOW;
+	flash_info[FLASH_BANK_KERNEL].flash_id =
+			(dev->vendorID << 16) | dev->deviceID;
+	flash_info[FLASH_BANK_KERNEL].sector_count = dev->sectors;
+	flash_info[FLASH_BANK_KERNEL].size =
+			flash_info[FLASH_BANK_KERNEL].sector_count * FLASH_SECTOR_SIZE;
+	flash_info[FLASH_BANK_KERNEL].start[FIRST_SECTOR] = dev->base;
+	size += flash_info[FLASH_BANK_KERNEL].size;
+
+	/*
+	 * Provide info for 512K PLCC FLASH ROM (U-Boot)
+	 */
+	dev = FLASH_DEV_BANK0_BOOT;
+	flash_info[FLASH_BANK_BOOT].flash_id =
+			(dev->vendorID << 16) | dev->deviceID;
+	flash_info[FLASH_BANK_BOOT].sector_count = dev->sectors;
+	flash_info[FLASH_BANK_BOOT].size =
+			flash_info[FLASH_BANK_BOOT].sector_count * FLASH_SECTOR_SIZE;
+	flash_info[FLASH_BANK_BOOT].start[FIRST_SECTOR] = dev->base;
+	size += flash_info[FLASH_BANK_BOOT].size;
 
 
-    /*
-     * Provide info for 512K FLASH0 segment (U-Boot)
-     */
-    dev = FLASH_DEV_BANK0_HIGH;
-    flash_info[FLASH_BANK_AUX].flash_id =
-      (dev->vendorID << 16) | dev->deviceID;
-    flash_info[FLASH_BANK_AUX].sector_count = dev->sectors;
-    flash_info[FLASH_BANK_AUX].size =
-      flash_info[FLASH_BANK_AUX].sector_count * FLASH_SECTOR_SIZE;
-    flash_info[FLASH_BANK_AUX].start[FIRST_SECTOR] = dev->base;
-    size += flash_info[FLASH_BANK_AUX].size;
+	/*
+	 * Provide info for 512K FLASH0 segment (U-Boot)
+	 */
+	dev = FLASH_DEV_BANK0_HIGH;
+	flash_info[FLASH_BANK_AUX].flash_id =
+			(dev->vendorID << 16) | dev->deviceID;
+	flash_info[FLASH_BANK_AUX].sector_count = dev->sectors;
+	flash_info[FLASH_BANK_AUX].size =
+			flash_info[FLASH_BANK_AUX].sector_count * FLASH_SECTOR_SIZE;
+	flash_info[FLASH_BANK_AUX].start[FIRST_SECTOR] = dev->base;
+	size += flash_info[FLASH_BANK_AUX].size;
 
 
-    return  size;
+	return size;
 }
 
 /*
  * Get flash device from U-Boot flash info.
  */
-flash_dev_t*
-getFlashDevFromInfo(flash_info_t* info)
+flash_dev_t *getFlashDevFromInfo (flash_info_t * info)
 {
-  int i;
+	int i;
 
-  if(!info)
-    return NULL;
+	if (!info)
+		return NULL;
 
-  for (i = 0; i < flashDevCount; i++) {
-    flash_dev_t	*dev = &flashDev[i];
-    if(dev->found && (dev->base == info->start[0]))
-      return dev;
-  }
-  printf("ERROR: notice, no FLASH mapped at address 0x%x\n",
-	 (unsigned int)info->start[0]);
-  return NULL;
-}
+	for (i = 0; i < flashDevCount; i++) {
+		flash_dev_t *dev = &flashDev[i];
 
-ulong
-flash_get_size (vu_long *addr, flash_info_t *info)
-{
-    int i;
-    for(i = 0; i < flashDevCount; i++) {
-      flash_dev_t	*dev = &flashDev[i];
-      if(dev->found){
-	if(dev->base == (unsigned int)addr){
-	  info->flash_id = (dev->vendorID << 16) | dev->deviceID;
-	  info->sector_count = dev->sectors;
-	  info->size = info->sector_count * FLASH_SECTOR_SIZE;
-	  return dev->sectors * FLASH_SECTOR_SIZE;
+		if (dev->found && (dev->base == info->start[0]))
+			return dev;
 	}
-      }
-    }
-    return 0;
+	printf ("ERROR: notice, no FLASH mapped at address 0x%x\n",
+			(unsigned int) info->start[0]);
+	return NULL;
 }
 
-void
-flash_print_info  (flash_info_t *info)
+ulong flash_get_size (vu_long * addr, flash_info_t * info)
 {
-  int i;
-  unsigned int chip;
+	int i;
 
-    if (info->flash_id == FLASH_UNKNOWN) {
-	printf ("missing or unknown FLASH type\n");
-	return;
-    }
+	for (i = 0; i < flashDevCount; i++) {
+		flash_dev_t *dev = &flashDev[i];
 
-    switch ((info->flash_id >> 16) & 0xff) {
-    case 0x1:
-	printf ("AMD ");
-	break;
-    default:
-	printf ("Unknown Vendor ");
-	break;
-    }
-    chip = (unsigned int) info->flash_id & 0x000000ff;
+		if (dev->found) {
+			if (dev->base == (unsigned int) addr) {
+				info->flash_id = (dev->vendorID << 16) | dev->deviceID;
+				info->sector_count = dev->sectors;
+				info->size = info->sector_count * FLASH_SECTOR_SIZE;
+				return dev->sectors * FLASH_SECTOR_SIZE;
+			}
+		}
+	}
+	return 0;
+}
 
-    switch (chip) {
+void flash_print_info (flash_info_t * info)
+{
+	int i;
+	unsigned int chip;
 
-    case AMD_ID_F040B:
-	printf ("AM29F040B (4 Mbit)\n");
-	break;
+	if (info->flash_id == FLASH_UNKNOWN) {
+		printf ("missing or unknown FLASH type\n");
+		return;
+	}
 
-    case AMD_ID_LV160B:
-    case FLASH_AM160LV:
-    case 0x49:
-	printf ("AM29LV160B (16 Mbit / 2M x 8bit)\n");
-	break;
+	switch ((info->flash_id >> 16) & 0xff) {
+	case 0x1:
+		printf ("AMD ");
+		break;
+	default:
+		printf ("Unknown Vendor ");
+		break;
+	}
+	chip = (unsigned int) info->flash_id & 0x000000ff;
 
-    default:
-      printf ("Unknown Chip Type:0x%x\n", chip);
-	break;
-    }
+	switch (chip) {
 
-    printf ("  Size: %ld bytes in %d Sectors\n",
-	    info->size, info->sector_count);
+	case AMD_ID_F040B:
+		printf ("AM29F040B (4 Mbit)\n");
+		break;
 
-    printf ("  Sector Start Addresses:");
-    for (i=0; i<info->sector_count; ++i) {
-      if ((i % 5) == 0)
-	  printf ("\n   ");
-	printf (" %08lX%s",
-		info->start[FIRST_SECTOR] + i*FLASH_SECTOR_SIZE,
-		info->protect[i] ? " (RO)" : "     "
-		);
-    }
-    printf ("\n");
+	case AMD_ID_LV160B:
+	case FLASH_AM160LV:
+	case 0x49:
+		printf ("AM29LV160B (16 Mbit / 2M x 8bit)\n");
+		break;
+
+	default:
+		printf ("Unknown Chip Type:0x%x\n", chip);
+		break;
+	}
+
+	printf ("  Size: %ld bytes in %d Sectors\n",
+		info->size, info->sector_count);
+
+	printf ("  Sector Start Addresses:");
+	for (i = 0; i < info->sector_count; ++i) {
+		if ((i % 5) == 0)
+			printf ("\n   ");
+		printf (" %08lX%s",
+			info->start[FIRST_SECTOR] + i * FLASH_SECTOR_SIZE,
+			info->protect[i] ? " (RO)" : "     ");
+	}
+	printf ("\n");
 }
 
 
 /*
  * Erase a range of flash sectors.
  */
-int flash_erase (flash_info_t *info, int s_first, int s_last)
+int flash_erase (flash_info_t * info, int s_first, int s_last)
 {
-    vu_long *addr = (vu_long*)(info->start[0]);
-    int prot, sect, l_sect;
-    flash_dev_t* dev = NULL;
+	vu_long *addr = (vu_long *) (info->start[0]);
+	int prot, sect, l_sect;
+	flash_dev_t *dev = NULL;
 
-    if ((s_first < 0) || (s_first > s_last)) {
-	if (info->flash_id == FLASH_UNKNOWN) {
-	    printf ("- missing\n");
+	if ((s_first < 0) || (s_first > s_last)) {
+		if (info->flash_id == FLASH_UNKNOWN) {
+			printf ("- missing\n");
+		} else {
+			printf ("- no sectors to erase\n");
+		}
+		return 1;
+	}
+
+	prot = 0;
+	for (sect = s_first; sect <= s_last; sect++) {
+		if (info->protect[sect]) {
+			prot++;
+		}
+	}
+
+	if (prot) {
+		printf ("- Warning: %d protected sectors will not be erased!\n",
+			prot);
 	} else {
-	    printf ("- no sectors to erase\n");
+		printf ("\n");
 	}
-	return 1;
-    }
 
-    prot = 0;
-    for (sect = s_first; sect <= s_last; sect++) {
-	if (info->protect[sect]) {
-	    prot++;
+	l_sect = -1;
+
+	/* Start erase on unprotected sectors */
+	dev = getFlashDevFromInfo (info);
+	if (dev) {
+		printf ("Erase FLASH[%s] -%d sectors:", dev->name, dev->sectors);
+		for (sect = s_first; sect <= s_last; sect++) {
+			if (info->protect[sect] == 0) {	/* not protected */
+				addr = (vu_long *) (dev->base);
+				/*   printf("erase_sector: sector=%d, addr=0x%x\n",
+				   sect, addr); */
+				printf (".");
+				if (ERROR == flashEraseSector (dev, sect)) {
+					printf ("ERROR: could not erase sector %d on FLASH[%s]\n", sect, dev->name);
+					return 1;
+				}
+			}
+		}
 	}
-    }
-
-    if (prot) {
-	printf ("- Warning: %d protected sectors will not be erased!\n",
-		prot);
-    } else {
-	printf ("\n");
-    }
-
-    l_sect = -1;
-
-    /* Start erase on unprotected sectors */
-    dev = getFlashDevFromInfo(info);
-    if(dev){
-      printf("Erase FLASH[%s] -%d sectors:", dev->name, dev->sectors);
-      for (sect = s_first; sect<=s_last; sect++) {
-	if (info->protect[sect] == 0) {	/* not protected */
-	  addr = (vu_long*)(dev->base);
-	  /*   printf("erase_sector: sector=%d, addr=0x%x\n",
-	       sect, addr); */
-	  printf(".");
-	  if(ERROR == flashEraseSector(dev, sect)){
-	    printf("ERROR: could not erase sector %d on FLASH[%s]\n",
-		   sect, dev->name);
-	    return 1;
-	  }
-	}
-      }
-    }
-    printf (" done\n");
-    return 0;
+	printf (" done\n");
+	return 0;
 }
 
 /*-----------------------------------------------------------------------
@@ -833,35 +832,31 @@
  * 1 - write timeout
  * 2 - Flash not erased
  */
-static int
-write_word (flash_info_t *info, ulong dest, ulong data)
+static int write_word (flash_info_t * info, ulong dest, ulong data)
 {
 
-  flash_dev_t* dev = getFlashDevFromInfo(info);
-  int addr = dest - info->start[0];
+	flash_dev_t *dev = getFlashDevFromInfo (info);
+	int addr = dest - info->start[0];
 
-  if (! dev)
-    return 1;
+	if (!dev)
+		return 1;
 
-  if(OK != flashWrite(dev, addr, (char*)&data, sizeof(ulong))){
-    printf("ERROR: could not write to addr=0x%x, data=0x%x\n",
-	   (unsigned int)addr, (unsigned)data);
-    return 1;
-  }
+	if (OK != flashWrite (dev, addr, (char *) &data, sizeof (ulong))) {
+		printf ("ERROR: could not write to addr=0x%x, data=0x%x\n",
+			(unsigned int) addr, (unsigned) data);
+		return 1;
+	}
 
-  if((addr % FLASH_SECTOR_SIZE) == 0)
-    printf(".");
+	if ((addr % FLASH_SECTOR_SIZE) == 0)
+		printf (".");
 
 
-  PRINTF("write_word:0x%x, base=0x%x, addr=0x%x, data=0x%x\n",
-	 (unsigned)info->start[0],
-	 (unsigned)dest,
-	 (unsigned)(dest - info->start[0]),
-	 (unsigned)data);
+	PRINTF ("write_word:0x%x, base=0x%x, addr=0x%x, data=0x%x\n",
+		(unsigned) info->start[0],
+		(unsigned) dest,
+		(unsigned) (dest - info->start[0]), (unsigned) data);
 
-
-
-    return (0);
+	return (0);
 }
 
 
@@ -872,72 +867,72 @@
  * 2 - Flash not erased
  */
 
-int write_buff (flash_info_t *info, uchar *src, ulong addr, ulong cnt)
+int write_buff (flash_info_t * info, uchar * src, ulong addr, ulong cnt)
 {
-    ulong cp, wp, data;
-    int i, l, rc;
-    flash_dev_t* dev = getFlashDevFromInfo(info);
+	ulong cp, wp, data;
+	int i, l, rc;
+	flash_dev_t *dev = getFlashDevFromInfo (info);
 
-    if( dev ) {
-      printf("FLASH[%s]:", dev->name);
-      wp = (addr & ~3);	/* get lower word aligned address */
+	if (dev) {
+		printf ("FLASH[%s]:", dev->name);
+		wp = (addr & ~3);	/* get lower word aligned address */
 
-      /*
-       * handle unaligned start bytes
-       */
-      if ((l = addr - wp) != 0) {
-	data = 0;
-	for (i=0, cp=wp; i<l; ++i, ++cp) {
-	  data = (data << 8) | (*(uchar *)cp);
-	}
-	for (; i<4 && cnt>0; ++i) {
-	  data = (data << 8) | *src++;
-	  --cnt;
-	  ++cp;
-	}
-	for (; cnt==0 && i<4; ++i, ++cp) {
-	  data = (data << 8) | (*(uchar *)cp);
-	}
-	if ((rc = write_word(info, wp, data)) != 0) {
-	  return (rc);
-	}
-	wp += 4;
-      }
+		/*
+		 * handle unaligned start bytes
+		 */
+		if ((l = addr - wp) != 0) {
+			data = 0;
+			for (i = 0, cp = wp; i < l; ++i, ++cp) {
+				data = (data << 8) | (*(uchar *) cp);
+			}
+			for (; i < 4 && cnt > 0; ++i) {
+				data = (data << 8) | *src++;
+				--cnt;
+				++cp;
+			}
+			for (; cnt == 0 && i < 4; ++i, ++cp) {
+				data = (data << 8) | (*(uchar *) cp);
+			}
+			if ((rc = write_word (info, wp, data)) != 0) {
+				return (rc);
+			}
+			wp += 4;
+		}
 
-      /*
-       * handle word aligned part
-       */
-      while (cnt >= 4) {
-	data = 0;
-	for (i=0; i<4; ++i) {
-	  data = (data << 8) | *src++;
+		/*
+		 * handle word aligned part
+		 */
+		while (cnt >= 4) {
+			data = 0;
+			for (i = 0; i < 4; ++i) {
+				data = (data << 8) | *src++;
+			}
+			if ((rc = write_word (info, wp, data)) != 0) {
+				return (rc);
+			}
+			wp += 4;
+			cnt -= 4;
+		}
+
+		if (cnt == 0) {
+			return (0);
+		}
+
+		/*
+		 * handle unaligned tail bytes
+		 */
+		data = 0;
+		for (i = 0, cp = wp; i < 4 && cnt > 0; ++i, ++cp) {
+			data = (data << 8) | *src++;
+			--cnt;
+		}
+		for (; i < 4; ++i, ++cp) {
+			data = (data << 8) | (*(uchar *) cp);
+		}
+
+		return (write_word (info, wp, data));
 	}
-	if ((rc = write_word(info, wp, data)) != 0) {
-	  return (rc);
-	}
-	wp  += 4;
-	cnt -= 4;
-      }
-
-      if (cnt == 0) {
-	return (0);
-      }
-
-      /*
-       * handle unaligned tail bytes
-       */
-      data = 0;
-      for (i=0, cp=wp; i<4 && cnt>0; ++i, ++cp) {
-	data = (data << 8) | *src++;
-	--cnt;
-      }
-      for (; i<4; ++i, ++cp) {
-	data = (data << 8) | (*(uchar *)cp);
-      }
-
-      return (write_word(info, wp, data));
-    }
-    return 1;
+	return 1;
 }
 
 /*-----------------------------------------------------------------------

diff --git a/board/mousse/m48t59y.c b/board/mousse/m48t59y.c
index 7205a96..37a6244 100644
--- a/board/mousse/m48t59y.c
+++ b/board/mousse/m48t59y.c

@@ -320,4 +320,3 @@
 {
   m48_tod_init();
 }
-

diff --git a/board/mousse/u-boot.lds b/board/mousse/u-boot.lds
index 8eca414..82ef5fe 100644
--- a/board/mousse/u-boot.lds
+++ b/board/mousse/u-boot.lds

@@ -98,6 +98,11 @@
   _edata  =  .;
   PROVIDE (edata = .);
 
+  __u_boot_cmd_start = .;
+  .u_boot_cmd : { *(.u_boot_cmd) }
+  __u_boot_cmd_end = .;
+
+
   __start___ex_table = .;
   __ex_table : { *(__ex_table) }
   __stop___ex_table = .;
@@ -121,4 +126,3 @@
   _end = . ;
   PROVIDE (end = .);
 }
-

diff --git a/board/mousse/u-boot.lds.ram b/board/mousse/u-boot.lds.ram
index 9166c9c..eb47ae6 100644
--- a/board/mousse/u-boot.lds.ram
+++ b/board/mousse/u-boot.lds.ram

@@ -85,6 +85,11 @@
     *(.fixup)
   } > ram
   */
+
+  __u_boot_cmd_start = .;
+  .u_boot_cmd : { *(.u_boot_cmd) }
+  __u_boot_cmd_end = .;
+
    __start___ex_table = .;
     __ex_table : { *(__ex_table) } > ram
     __stop___ex_table = .;
@@ -98,4 +103,3 @@
   _end = . ;
   PROVIDE (end = .);
 }
-

diff --git a/board/mousse/u-boot.lds.rom b/board/mousse/u-boot.lds.rom
index a2059db..9b46554 100644
--- a/board/mousse/u-boot.lds.rom
+++ b/board/mousse/u-boot.lds.rom

@@ -102,6 +102,10 @@
   _edata  =  .;
   PROVIDE (edata = .);
 
+  __u_boot_cmd_start = .;
+  .u_boot_cmd : { *(.u_boot_cmd) }
+  __u_boot_cmd_end = .;
+
   __start___ex_table = .;
   __ex_table : { *(__ex_table) }
   __stop___ex_table = .;
@@ -125,4 +129,3 @@
   _end = . ;
   PROVIDE (end = .);
 }
-

diff --git a/board/mpc8260ads/Makefile b/board/mpc8260ads/Makefile
index 9280bf7..cc519d1 100644
--- a/board/mpc8260ads/Makefile
+++ b/board/mpc8260ads/Makefile

@@ -1,3 +1,4 @@
+
 #
 # (C) Copyright 2001
 # Wolfgang Denk, DENX Software Engineering, wd@denx.de.
@@ -28,7 +29,7 @@
 OBJS	:= $(BOARD).o flash.o
 
 $(LIB):	$(OBJS) $(SOBJS)
-	$(AR) crv $@ $^
+	$(AR) crv $@ $(OBJS)
 
 clean:
 	rm -f $(SOBJS) $(OBJS)

diff --git a/board/mpc8260ads/mpc8260ads.c b/board/mpc8260ads/mpc8260ads.c
index 0aa7550..6d1764a 100644
--- a/board/mpc8260ads/mpc8260ads.c
+++ b/board/mpc8260ads/mpc8260ads.c

@@ -50,7 +50,7 @@
 
     /* Port A configuration */
     {	/*	      conf ppar psor pdir podr pdat */
-        /* PA31 */ {   0,   1,   0,   1,   0,   0   }, /* FCC1 TxENB */
+	/* PA31 */ {   0,   1,   0,   1,   0,   0   }, /* FCC1 TxENB */
 	/* PA30 */ {   0,   1,   0,   0,   0,   0   }, /* FCC1 TxClav   */
 	/* PA29 */ {   0,   1,   0,   1,   0,   0   }, /* FCC1 TxSOC  */
 	/* PA28 */ {   0,   1,   0,   1,   0,   0   }, /* FCC1 RxENB */

diff --git a/board/mpc8260ads/u-boot.lds b/board/mpc8260ads/u-boot.lds
index 5d78d4a..61fb15c6 100644
--- a/board/mpc8260ads/u-boot.lds
+++ b/board/mpc8260ads/u-boot.lds

@@ -93,6 +93,11 @@
   _edata  =  .;
   PROVIDE (edata = .);
 
+  __u_boot_cmd_start = .;
+  .u_boot_cmd : { *(.u_boot_cmd) }
+  __u_boot_cmd_end = .;
+
+
   __start___ex_table = .;
   __ex_table : { *(__ex_table) }
   __stop___ex_table = .;
@@ -115,4 +120,3 @@
   _end = . ;
   PROVIDE (end = .);
 }
-

diff --git a/board/mpc8266ads/Makefile b/board/mpc8266ads/Makefile
index 9280bf7..cd0f40b 100644
--- a/board/mpc8266ads/Makefile
+++ b/board/mpc8266ads/Makefile

@@ -28,7 +28,7 @@
 OBJS	:= $(BOARD).o flash.o
 
 $(LIB):	$(OBJS) $(SOBJS)
-	$(AR) crv $@ $^
+	$(AR) crv $@ $(OBJS)
 
 clean:
 	rm -f $(SOBJS) $(OBJS)

diff --git a/board/mpc8266ads/mpc8266ads.c b/board/mpc8266ads/mpc8266ads.c
index c6c8d76..d97b5c1 100644
--- a/board/mpc8266ads/mpc8266ads.c
+++ b/board/mpc8266ads/mpc8266ads.c

@@ -63,7 +63,7 @@
 
     /* Port A configuration */
     {	/*	      conf ppar psor pdir podr pdat */
-        /* PA31 */ {   0,   1,   0,   1,   0,   0   }, /* FCC1 TxENB */
+	/* PA31 */ {   0,   1,   0,   1,   0,   0   }, /* FCC1 TxENB */
 	/* PA30 */ {   0,   1,   0,   0,   0,   0   }, /* FCC1 TxClav   */
 	/* PA29 */ {   0,   1,   0,   1,   0,   0   }, /* FCC1 TxSOC  */
 	/* PA28 */ {   0,   1,   0,   1,   0,   0   }, /* FCC1 RxENB */
@@ -241,7 +241,7 @@
 
     /* mask all PCI interrupts */
     pci_ic->pci_int_mask |= 0xfff00000;
-    
+
     return 0;
 }
 
@@ -291,7 +291,7 @@
     i2c_read(SDRAM_SPD_ADDR, 0, 1, &data, 1);
     spd_size = data;
     cksum    = data;
-    for(j = 1; j < 64; j++) 
+    for(j = 1; j < 64; j++)
 	{	/* read only the checksummed bytes */
 	/* note: the I2C address autoincrements when alen == 0 */
 		i2c_read(SDRAM_SPD_ADDR, 0, 0, &data, 1);
@@ -301,14 +301,14 @@
 		else if(j ==  7) data_width |= data << 8;
 		else if(j ==  3) rows        = data & 0x0F;
 		else if(j ==  4) cols        = data & 0x0F;
-		else if(j == 12) 
+		else if(j == 12)
 		{
 			/*
 				 * Refresh rate: this assumes the prescaler is set to
-			 * approximately 0.39uSec per tick and the target refresh period 
+			 * approximately 0.39uSec per tick and the target refresh period
 			 * is about 85% of maximum.
 			 */
-			switch(data & 0x7F) 
+			switch(data & 0x7F)
 			{
 					default:
 					case 0:  psrt = 0x21; /*  15.625uS */  break;
@@ -320,7 +320,7 @@
 			}
 		}
 		else if(j == 17) banks       = data;
-		else if(j == 18) 
+		else if(j == 18)
 		{
 			caslatency = 3; /* default CL */
 #		    if(PESSIMISTIC_SDRAM)
@@ -332,15 +332,15 @@
 				else if((data & 0x02) != 0) caslatency = 2;
 				else if((data & 0x04) != 0) caslatency = 3;
 #			endif
-			else 
+			else
 			{
 			printf ("WARNING: Unknown CAS latency 0x%02X, using 3\n",
 					data);
 			}
 		}
-		else if(j == 63) 
+		else if(j == 63)
 		{
-			if(data != cksum) 
+			if(data != cksum)
 			{
 				printf ("WARNING: Configuration data checksum failure:"
 					" is 0x%02x, calculated 0x%02x\n",
@@ -381,17 +381,17 @@
     sdram_size = 1 << (rows + cols + banks + width);
     /* hack for high density memory (512MB per CS) */
     /* !!!!! Will ONLY work with Page Based Interleave !!!!!
-             ( PSDMR[PBI] = 1 ) 
+	     ( PSDMR[PBI] = 1 )
     */
-    /* mamory actually has 11 column addresses, but the memory controller 
-       doesn't really care. 
-       the calculations that follow will however move the rows so that 
-       they are muxed one bit off if you use 11 bit columns. 
+    /* mamory actually has 11 column addresses, but the memory controller
+       doesn't really care.
+       the calculations that follow will however move the rows so that
+       they are muxed one bit off if you use 11 bit columns.
        The solution is to tell the memory controller the correct size of the memory
        but change the number of columns to 10 afterwards.
        The 11th column addre will still be mucxed correctly onto the bus.
 
-       Also be aware that the MPC8266ADS board Rev B has not connected 
+       Also be aware that the MPC8266ADS board Rev B has not connected
        Row addres 13 to anything.
 
        The fix is to connect ADD16 (from U37-47) to SADDR12 (U28-126)
@@ -439,7 +439,7 @@
 	     PSDMR_ACTTORW_8W        |\
 	     PSDMR_WRC_4C            |\
 	     PSDMR_EAMUX             |\
-             PSDMR_BUFCMD)           |\
+	     PSDMR_BUFCMD)           |\
 	     caslatency              |\
 	     ((caslatency - 1) << 6) |	/* LDOTOPRE is CL - 1 */ \
 	     (sdam << 24)            |\
@@ -453,7 +453,7 @@
 	     PSDMR_ACTTORW_2W        |	/* 1 for 7E parts (fast PC-133) */ \
 	     PSDMR_WRC_1C            |	/* 1 clock + 7nSec */
 	     EAMUX                   |\
-             BUFCMD)                 |\
+	     BUFCMD)                 |\
 	     caslatency              |\
 	     ((caslatency - 1) << 6) |	/* LDOTOPRE is CL - 1 */ \
 	     (sdam << 24)            |\
@@ -514,7 +514,7 @@
 
     memctl->memc_br2 = CFG_BR2_PRELIM;
     memctl->memc_or2 = or;
-    
+
     memctl->memc_psdmr = psdmr | PSDMR_OP_PREA;
     *ramaddr = c;
 
@@ -532,9 +532,9 @@
      * Do it a second time for the second set of chips if the DIMM has
      * two chip selects (double sided).
      */
-    if(chipselects > 1) 
+    if(chipselects > 1)
 	{
-        ramaddr += sdram_size;
+	ramaddr += sdram_size;
 
 		memctl->memc_br3 = CFG_BR3_PRELIM + sdram_size;
 		memctl->memc_or3 = or;

diff --git a/board/mpc8266ads/u-boot.lds b/board/mpc8266ads/u-boot.lds
index 5d78d4a..d0b1e04 100644
--- a/board/mpc8266ads/u-boot.lds
+++ b/board/mpc8266ads/u-boot.lds

@@ -93,6 +93,10 @@
   _edata  =  .;
   PROVIDE (edata = .);
 
+  __u_boot_cmd_start = .;
+  .u_boot_cmd : { *(.u_boot_cmd) }
+  __u_boot_cmd_end = .;
+
   __start___ex_table = .;
   __ex_table : { *(__ex_table) }
   __stop___ex_table = .;
@@ -115,4 +119,3 @@
   _end = . ;
   PROVIDE (end = .);
 }
-

diff --git a/board/mpl/common/common_util.c b/board/mpl/common/common_util.c
index 503654e..e2672f7 100644
--- a/board/mpl/common/common_util.c
+++ b/board/mpl/common/common_util.c

@@ -56,7 +56,6 @@
 static image_header_t header;
 
 
-
 int mpl_prg(unsigned long src,unsigned long size)
 {
 	unsigned long start;
@@ -348,7 +347,6 @@
 }
 
 
-
 extern device_t *stdio_devices[];
 extern char *stdio_names[];
 
@@ -454,10 +452,10 @@
 	unsigned long pbcr;
 	int res = 0;
 	pbcr = mfdcr (strap);
-	if ((pbcr & PSR_ROM_WIDTH_MASK) == 0) 
+	if ((pbcr & PSR_ROM_WIDTH_MASK) == 0)
 		/* boot via MPS or MPS mapping */
 		res = BOOT_MPS;
-	if(pbcr & PSR_ROM_LOC) 
+	if(pbcr & PSR_ROM_LOC)
 		/* boot via PCI.. */
 		res |= BOOT_PCI;
 	 return res;

diff --git a/board/mpl/common/common_util.h b/board/mpl/common/common_util.h
index caf7f9b..bcc7922 100644
--- a/board/mpl/common/common_util.h
+++ b/board/mpl/common/common_util.h

@@ -46,4 +46,3 @@
 #endif
 
 #endif /* _COMMON_UTIL_H_ */
-

diff --git a/board/mpl/common/flash.c b/board/mpl/common/flash.c
index 563039b..28f6f0a 100644
--- a/board/mpl/common/flash.c
+++ b/board/mpl/common/flash.c

@@ -251,7 +251,7 @@
 	/*	printf("Device value %x\n",value); */
 	switch (value) {
 	case (FLASH_WORD_SIZE)AMD_ID_F040B:
-	        info->flash_id += FLASH_AM040;
+		info->flash_id += FLASH_AM040;
 		info->sector_count = 8;
 		info->size = 0x0080000; /* => 512 ko */
 		break;
@@ -494,7 +494,7 @@
 				wait_for_DQ7(info, sect);
 			}
 			else {
-		  		if((info->flash_id & FLASH_VENDMASK) == FLASH_MAN_INTEL){
+				if((info->flash_id & FLASH_VENDMASK) == FLASH_MAN_INTEL){
 					addr2[0] = (FLASH_WORD_SIZE)0x00600060;  /* unlock sector */
 					addr2[0] = (FLASH_WORD_SIZE)0x00D000D0;  /* sector erase */
 					intel_wait_for_DQ7(info, sect);
@@ -659,7 +659,7 @@
 {
 	volatile FLASH_WORD_SIZE *addr2 = (FLASH_WORD_SIZE *)(info->start[0]);
 	volatile FLASH_WORD_SIZE *dest2 = (FLASH_WORD_SIZE *)dest;
- 	volatile FLASH_WORD_SIZE *data2 = (FLASH_WORD_SIZE *)&data;
+	volatile FLASH_WORD_SIZE *data2 = (FLASH_WORD_SIZE *)&data;
 	ulong start;
 	int flag;
 	int i;
@@ -708,7 +708,7 @@
 			while ((dest2[i] & (FLASH_WORD_SIZE)0x00800080) !=
 				(data2[i] & (FLASH_WORD_SIZE)0x00800080)) {
 				if (get_timer(start) > CFG_FLASH_WRITE_TOUT) {
-        				return (1);
+					return (1);
 				}
 			}
 		}

diff --git a/board/mpl/common/isa.c b/board/mpl/common/isa.c
index 40731fc..1788d51 100644
--- a/board/mpl/common/isa.c
+++ b/board/mpl/common/isa.c

@@ -50,7 +50,6 @@
 #endif
 
 
-
 /* fdc (logical device 0) */
 const SIO_LOGDEV_TABLE sio_fdc[] = {
 	{0x60, 3},			/* set IO to FDPort (3F0) */
@@ -186,7 +185,6 @@
 }
 
 
-
 /******************************************************************************
  * IRQ Controller
  * we use the Vector mode
@@ -396,12 +394,12 @@
 		/* we should handle cascaded interrupts here also */
 		/* printf("ISA Irq %d\n",irq); */
 		isa_irqs[irq].count++;
-  	if (isa_irqs[irq].handler != NULL)
-  		(*isa_irqs[irq].handler)(isa_irqs[irq].arg);      /* call isr */
-  	else
-  	{
-     	PRINTF ("bogus interrupt vector 0x%x\n", irq);
-  	}
+	if (isa_irqs[irq].handler != NULL)
+		(*isa_irqs[irq].handler)(isa_irqs[irq].arg);      /* call isr */
+	else
+	{
+	PRINTF ("bogus interrupt vector 0x%x\n", irq);
+	}
 	}
 	/* issue EOI instruction to clear the IRQ */
 	mask_and_ack_8259A(irq);
@@ -409,7 +407,6 @@
 }
 
 
-
 /******************************************************************
  * Install and free an ISA interrupt handler.
  */
@@ -418,12 +415,12 @@
 {
   if (isa_irqs[vec].handler != NULL) {
    printf ("ISA Interrupt vector %d: handler 0x%x replacing 0x%x\n",
-           vec, (uint)handler, (uint)isa_irqs[vec].handler);
+	   vec, (uint)handler, (uint)isa_irqs[vec].handler);
   }
   isa_irqs[vec].handler = handler;
   isa_irqs[vec].arg     = arg;
   enable_8259A_irq(vec);
- 	PRINTF ("Install ISA IRQ %d ==> %p, @ %p mask=%04x\n", vec, handler, &isa_irqs[vec].handler,cached_irq_mask);
+	PRINTF ("Install ISA IRQ %d ==> %p, @ %p mask=%04x\n", vec, handler, &isa_irqs[vec].handler,cached_irq_mask);
 
 }
 
@@ -432,7 +429,7 @@
 	disable_8259A_irq(vec);
   isa_irqs[vec].handler = NULL;
   isa_irqs[vec].arg     = NULL;
- 	printf ("Free ISA IRQ %d mask=%04x\n", vec, cached_irq_mask);
+	printf ("Free ISA IRQ %d mask=%04x\n", vec, cached_irq_mask);
 
 }
 
@@ -464,6 +461,3 @@
 	drv_isa_kbd_init();
 	return 0;
 }
-
-
-

diff --git a/board/mpl/common/isa.h b/board/mpl/common/isa.h
index 66dd2c9..578222d 100644
--- a/board/mpl/common/isa.h
+++ b/board/mpl/common/isa.h

@@ -27,7 +27,6 @@
 #define SIO_CFG_PORT	0x3F0	/* Config Port Address */
 
 
-
 /* table fore SIO initialization */
 typedef struct {
 	const uchar index;
@@ -40,8 +39,6 @@
 } SIO_TABLE;
 
 
-
-
 unsigned char open_cfg_super_IO(int address);
 unsigned char read_cfg_super_IO(int address, unsigned char function, unsigned char regaddr);
 void write_cfg_super_IO(int address, unsigned char function, unsigned char regaddr, unsigned char data);

diff --git a/board/mpl/common/kbd.c b/board/mpl/common/kbd.c
index 5b87cdb..9bd1ff9 100644
--- a/board/mpl/common/kbd.c
+++ b/board/mpl/common/kbd.c

@@ -137,8 +137,6 @@
 #define 	KBD_BUFFER_LEN 0x20  /* size of the keyboardbuffer */
 
 
-
-
 static volatile char kbd_buffer[KBD_BUFFER_LEN];
 static volatile int in_pointer = 0;
 static volatile int out_pointer = 0;
@@ -450,7 +448,6 @@
 }
 
 
-
 /******************************************************************************
  * Lowlevel Part of keyboard section
  */
@@ -648,8 +645,3 @@
 {
 	handle_kbd_event();
 }
-
-
-
-/* eof */
-

diff --git a/board/mpl/common/memtst.c b/board/mpl/common/memtst.c
index 122ba2e..c994a8b 100644
--- a/board/mpl/common/memtst.c
+++ b/board/mpl/common/memtst.c

@@ -65,9 +65,6 @@
 #define MEGABYTE (1024*1024)
 
 
-
-
-
 typedef struct {
 	volatile unsigned long pat1;
 	volatile unsigned long pat2;
@@ -444,7 +441,6 @@
 }
 
 
-
 typedef struct {
 	void (*test_write) (unsigned long startaddr, unsigned long size,
 						unsigned long *pat);

diff --git a/board/mpl/common/pci_parts.h b/board/mpl/common/pci_parts.h
index a8e3232..82426f3 100644
--- a/board/mpl/common/pci_parts.h
+++ b/board/mpl/common/pci_parts.h

@@ -59,7 +59,6 @@
 #define PCI_IRQ_VECTOR(x)	((PCI_DEV(x) + 10) % 4) + 28
 
 
-
 /* PCI Device List for PIP405 */
 
 /* Mapping:
@@ -191,8 +190,3 @@
 	{ }
 };
 #endif /* _PCI_PARTS_H_ */
-
-
-
-
-

diff --git a/board/mpl/common/piix4_pci.h b/board/mpl/common/piix4_pci.h
index 5a0fd5e..3c0523f 100644
--- a/board/mpl/common/piix4_pci.h
+++ b/board/mpl/common/piix4_pci.h

@@ -22,7 +22,6 @@
  */
 
 
-
 #ifndef _PIIX4_PCI_H
 #define _PIIX4_PCI_H
 
@@ -163,5 +162,4 @@
 #define	PCI_CFG_PIIX4_SMBBA	0x90
 
 
-
 #endif

diff --git a/board/mpl/common/usb_uhci.c b/board/mpl/common/usb_uhci.c
index 83624a9..4a10b79 100644
--- a/board/mpl/common/usb_uhci.c
+++ b/board/mpl/common/usb_uhci.c

@@ -1088,7 +1088,6 @@
 #endif
 
 
-
 #ifdef	USB_UHCI_DEBUG
 
 static int usb_display_td(uhci_td_t *td)

diff --git a/board/mpl/common/usb_uhci.h b/board/mpl/common/usb_uhci.h
index 8c8f161..af80837 100644
--- a/board/mpl/common/usb_uhci.h
+++ b/board/mpl/common/usb_uhci.h

@@ -186,5 +186,3 @@
 
 
 #endif /* _USB_UHCI_H_ */
-
-

diff --git a/board/mpl/mip405/Makefile b/board/mpl/mip405/Makefile
index 839cafe..9276f64 100644
--- a/board/mpl/mip405/Makefile
+++ b/board/mpl/mip405/Makefile

@@ -31,7 +31,7 @@
 SOBJS	= init.o
 
 $(LIB):	$(OBJS) $(SOBJS)
-	$(AR) crv $@ $^
+	$(AR) crv $@ $(OBJS)
 
 clean:
 	rm -f $(SOBJS) $(OBJS)

diff --git a/board/mpl/mip405/cmd_mip405.c b/board/mpl/mip405/cmd_mip405.c
index 6ec128f..2075fbd 100644
--- a/board/mpl/mip405/cmd_mip405.c
+++ b/board/mpl/mip405/cmd_mip405.c

@@ -53,5 +53,11 @@
    	}
 	return (do_mplcommon(cmdtp, flag, argc, argv));
 }
+cmd_tbl_t U_BOOT_CMD(mip405) = MK_CMD_ENTRY(
+	"mip405",	6,	1,	do_mip405,
+	"mip405  - MIP405 specific Cmds\n",
+	"flash mem [SrcAddr] - updates U-Boot with image in memory\n"
+	"mip405 flash mps - updates U-Boot with image from MPS\n"
+);
 
 /* ------------------------------------------------------------------------- */

diff --git a/board/mpl/mip405/init.S b/board/mpl/mip405/init.S
index ad3f78d..00bf739 100644
--- a/board/mpl/mip405/init.S
+++ b/board/mpl/mip405/init.S

@@ -63,7 +63,7 @@
   mtlr    r4                      /* restore link register */
   addi    r4,0,14                 /* set ctr to 14; used to prefetch */
   mtctr   r4                      /* 14 cache lines to fit this function */
-                                   /* in cache (gives us 8x14=112 instrctns) */
+				   /* in cache (gives us 8x14=112 instrctns) */
 ..ebcloop:
   icbt    r0,r3                   /* prefetch cache line for addr in r3 */
   addi    r3,r3,32								/* move to next cache line */
@@ -116,10 +116,10 @@
 
 0:
 
-  	/* 8Bit boot mode: */
+	/* 8Bit boot mode: */
 	/*-----------------------------------------------------------------------
-   	* Memory Bank 0 Multi Purpose Socket initialization
-   	*----------------------------------------------------------------------- */
+	* Memory Bank 0 Multi Purpose Socket initialization
+	*----------------------------------------------------------------------- */
 	/* 0x7F8FFE80 slowest boot */
 	addi    r4,0,pb0ap
 	mtdcr   ebccfga,r4
@@ -133,7 +133,7 @@
 	mtdcr   ebccfgd,r4
 
 	addi    r4,0,pb0cr
- 	mtdcr   ebccfga,r4
+	mtdcr   ebccfga,r4
 	/* BS=0x010(4MB),BU=0x3(R/W), */
 /*	addis   r4,0,((FLASH_BASE0_PRELIM & 0xFFF00000) | 0x00050000)@h */
 /*	ori     r4,r4,0x8000          / * BW=0x0( 8 bits) */
@@ -197,7 +197,7 @@
  * Description:  Configures the internal SRAM memory. and setup the
  *               Stackpointer in it.
  *----------------------------------------------------------------------------- */
-        .globl  sdram_init
+	.globl  sdram_init
 
 sdram_init:
 
@@ -245,4 +245,3 @@
   nop
   b	_start		/* normal start */
 #endif
-

diff --git a/board/mpl/mip405/mip405.c b/board/mpl/mip405/mip405.c
index 93d8679..07922bc 100644
--- a/board/mpl/mip405/mip405.c
+++ b/board/mpl/mip405/mip405.c

@@ -511,7 +511,6 @@
 }
 
 
-
 void user_led0 (unsigned char on)
 {
 	if (on)
@@ -762,5 +761,3 @@
 	printf ("  PIIX INIT: %s\n", (irq_reg & 0x8) ? "inactive" : "active");
 	printf ("  PIIX NMI:  %s\n", (irq_reg & 0x4) ? "inactive" : "active");
 }
-
-

diff --git a/board/mpl/mip405/mip405.h b/board/mpl/mip405/mip405.h
index 101b173..f1e37ff 100644
--- a/board/mpl/mip405/mip405.h
+++ b/board/mpl/mip405/mip405.h

@@ -32,7 +32,6 @@
 void user_led0(unsigned char on);
 
 
-
 #endif
 /* timings */
 /* PLD (CS7) */
@@ -114,7 +113,6 @@
 #define UART1_CR	((PER_UART1_ADDR & 0xfff00000) + (UART0_BS << 17) + (UART0_BU << 15) + (UART0_BW << 13))
 
 
-
 /* Flash CS0 or CS 1 */
 /* 0x7F8FFE80 slowest timing at all... */
 #define FLASH_BME_B	1 	/* Burst enable */
@@ -182,6 +180,3 @@
 #define MPS_CR_B	((FLASH_BASE0_PRELIM & 0xfff00000) + (MPS_BS << 17) + (MPS_BU << 15) + (MPS_BW << 13))
 /* CR register for non Boot */
 #define MPS_CR		((MULTI_PURPOSE_SOCKET_ADDR & 0xfff00000) + (MPS_BS << 17) + (MPS_BU << 15) + (MPS_BW << 13))
-
-
-

diff --git a/board/mpl/mip405/u-boot.lds b/board/mpl/mip405/u-boot.lds
index 710a139..bb0f122 100644
--- a/board/mpl/mip405/u-boot.lds
+++ b/board/mpl/mip405/u-boot.lds

@@ -125,6 +125,11 @@
   _edata  =  .;
   PROVIDE (edata = .);
 
+  __u_boot_cmd_start = .;
+  .u_boot_cmd : { *(.u_boot_cmd) }
+  __u_boot_cmd_end = .;
+
+
   __start___ex_table = .;
   __ex_table : { *(__ex_table) }
   __stop___ex_table = .;

diff --git a/board/mpl/pip405/Makefile b/board/mpl/pip405/Makefile
index b6cc531..a818d08 100644
--- a/board/mpl/pip405/Makefile
+++ b/board/mpl/pip405/Makefile

@@ -34,7 +34,7 @@
 SOBJS	= init.o
 
 $(LIB):	$(OBJS) $(SOBJS)
-	$(AR) crv $@ $^
+	$(AR) crv $@ $(OBJS)
 
 clean:
 	rm -f $(SOBJS) $(OBJS)

diff --git a/board/mpl/pip405/cmd_pip405.c b/board/mpl/pip405/cmd_pip405.c
index 0d1ce11..4cc3776 100644
--- a/board/mpl/pip405/cmd_pip405.c
+++ b/board/mpl/pip405/cmd_pip405.c

@@ -33,7 +33,6 @@
 extern int do_mplcommon(cmd_tbl_t *cmdtp, int flag, int argc, char *argv[]);
 
 
-
 /* ------------------------------------------------------------------------- */
 
 int do_pip405(cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
@@ -59,5 +58,12 @@
 
 	return (do_mplcommon(cmdtp, flag, argc, argv));
 }
+cmd_tbl_t U_BOOT_CMD(pip405) = MK_CMD_ENTRY(
+	"pip405",	6,	1,	do_pip405,
+	"pip405  - PIP405 specific Cmds\n",
+	"flash mem [SrcAddr] - updates U-Boot with image in memory\n"
+	"pip405 flash floppy [SrcAddr] - updates U-Boot with image from floppy\n"
+	"pip405 flash mps - updates U-Boot with image from MPS\n"
+);
 
 /* ------------------------------------------------------------------------- */

diff --git a/board/mpl/pip405/init.S b/board/mpl/pip405/init.S
index 4a70ec9..a0c76dd 100644
--- a/board/mpl/pip405/init.S
+++ b/board/mpl/pip405/init.S

@@ -49,7 +49,7 @@
 #include <asm/mmu.h>
 
 
- 	.globl	ext_bus_cntlr_init
+	.globl	ext_bus_cntlr_init
 ext_bus_cntlr_init:
   mflr    r4                      /* save link register */
   bl      ..getAddr
@@ -58,7 +58,7 @@
   mtlr    r4                      /* restore link register */
   addi    r4,0,14                 /* set ctr to 14; used to prefetch */
   mtctr   r4                      /* 14 cache lines to fit this function */
-                                   /* in cache (gives us 8x14=112 instrctns) */
+				   /* in cache (gives us 8x14=112 instrctns) */
 ..ebcloop:
   icbt    r0,r3                   /* prefetch cache line for addr in r3 */
   addi    r3,r3,32								/* move to next cache line */
@@ -211,10 +211,9 @@
  * Description:  Configures the internal SRAM memory. and setup the
  *               Stackpointer in it.
  *----------------------------------------------------------------------------- */
-        .globl  sdram_init
+	.globl  sdram_init
 
 sdram_init:
 
 
   blr
-

diff --git a/board/mpl/pip405/pip405.c b/board/mpl/pip405/pip405.c
index 87ca6ef..a77e2c9 100644
--- a/board/mpl/pip405/pip405.c
+++ b/board/mpl/pip405/pip405.c

@@ -530,7 +530,6 @@
 	mtdcr (memcfgd, tmp);
 
 
-
    /*-------------------------------------------------------------------------+
    | Interrupt controller setup for the PIP405 board.
    | Note: IRQ 0-15  405GP internally generated; active high; level sensitive
@@ -673,7 +672,6 @@
 }
 
 
-
 extern int isa_init (void);
 
 
@@ -943,5 +941,3 @@
 	}
 	out8 (PLD_SCSI_RST_REG, resreg);
 }
-
-

diff --git a/board/mpl/pip405/pip405.h b/board/mpl/pip405/pip405.h
index 10f6479..c2411a3 100644
--- a/board/mpl/pip405/pip405.h
+++ b/board/mpl/pip405/pip405.h

@@ -131,7 +131,6 @@
 #define UART1_CR	((PER_UART1_ADDR & 0xfff00000) + (UART0_BS << 17) + (UART0_BU << 15) + (UART0_BW << 13))
 
 
-
 /* Flash CS0 or CS 1 */
 /* 0x7F8FFE80 slowest timing at all... */
 #define FLASH_BME_B	1 	/* Burst enable */
@@ -199,14 +198,3 @@
 #define MPS_CR_B	((FLASH_BASE0_PRELIM & 0xfff00000) + (MPS_BS << 17) + (MPS_BU << 15) + (MPS_BW << 13))
 /* CR register for non Boot */
 #define MPS_CR		((MULTI_PURPOSE_SOCKET_ADDR & 0xfff00000) + (MPS_BS << 17) + (MPS_BU << 15) + (MPS_BW << 13))
-
-
-
-
-
-
-
-
-
-
-

diff --git a/board/mpl/pip405/u-boot.lds b/board/mpl/pip405/u-boot.lds
index f221343..9b83ded 100644
--- a/board/mpl/pip405/u-boot.lds
+++ b/board/mpl/pip405/u-boot.lds

@@ -121,6 +121,11 @@
   _edata  =  .;
   PROVIDE (edata = .);
 
+  __u_boot_cmd_start = .;
+  .u_boot_cmd : { *(.u_boot_cmd) }
+  __u_boot_cmd_end = .;
+
+
   __start___ex_table = .;
   __ex_table : { *(__ex_table) }
   __stop___ex_table = .;

diff --git a/board/mpl/pip405/u-boot.lds.debug b/board/mpl/pip405/u-boot.lds.debug
index f4f9743..d483424 100644
--- a/board/mpl/pip405/u-boot.lds.debug
+++ b/board/mpl/pip405/u-boot.lds.debug

@@ -106,6 +106,11 @@
   _edata  =  .;
   PROVIDE (edata = .);
 
+  __u_boot_cmd_start = .;
+  .u_boot_cmd : { *(.u_boot_cmd) }
+  __u_boot_cmd_end = .;
+
+
   __start___ex_table = .;
   __ex_table : { *(__ex_table) }
   __stop___ex_table = .;
@@ -128,4 +133,3 @@
   _end = . ;
   PROVIDE (end = .);
 }
-

diff --git a/board/mpl/vcma9/Makefile b/board/mpl/vcma9/Makefile
index 428eea2..f9b78f9 100644
--- a/board/mpl/vcma9/Makefile
+++ b/board/mpl/vcma9/Makefile

@@ -31,7 +31,7 @@
 SOBJS	:= memsetup.o
 
 $(LIB):	$(OBJS) $(SOBJS)
-	$(AR) crv $@ $^
+	$(AR) crv $@ $(OBJS) $(SOBJS)
 
 clean:
 	rm -f $(SOBJS) $(OBJS)

diff --git a/board/mpl/vcma9/cmd_vcma9.c b/board/mpl/vcma9/cmd_vcma9.c
index 80bb61b2b..32fa334 100644
--- a/board/mpl/vcma9/cmd_vcma9.c
+++ b/board/mpl/vcma9/cmd_vcma9.c

@@ -141,4 +141,3 @@
 
 	return (do_mplcommon(cmdtp, flag, argc, argv));
 }
-

diff --git a/board/mpl/vcma9/flash.c b/board/mpl/vcma9/flash.c
index b442c9d..91517c4 100644
--- a/board/mpl/vcma9/flash.c
+++ b/board/mpl/vcma9/flash.c

@@ -313,7 +313,7 @@
      */
     result = *addr;
     if ((result & data) != data)
-        return ERR_NOT_ERASED;
+	return ERR_NOT_ERASED;
 
 
     /*
@@ -365,7 +365,7 @@
     *addr = CMD_READ_ARRAY;
 
     if (chip == ERR || *addr != data)
-        rc = ERR_PROG_ERROR;
+	rc = ERR_PROG_ERROR;
 
     if (iflag)
       enable_interrupts();

diff --git a/board/mpl/vcma9/memsetup.S b/board/mpl/vcma9/memsetup.S
index 557e554..7b4193d 100644
--- a/board/mpl/vcma9/memsetup.S
+++ b/board/mpl/vcma9/memsetup.S

@@ -28,7 +28,6 @@
  */
 
 
-
 #include <config.h>
 #include <version.h>
 

diff --git a/board/mpl/vcma9/u-boot.lds b/board/mpl/vcma9/u-boot.lds
index 8c9c218..3a7c4d4 100644
--- a/board/mpl/vcma9/u-boot.lds
+++ b/board/mpl/vcma9/u-boot.lds

@@ -27,28 +27,32 @@
 ENTRY(_start)
 SECTIONS
 {
-        . = 0x00000000;
+	. = 0x00000000;
 
-        . = ALIGN(4);
+	. = ALIGN(4);
 	.text      :
 	{
 	  cpu/arm920t/start.o	(.text)
 	  *(.text)
 	}
 
-        . = ALIGN(4);
-        .rodata : { *(.rodata) }
+	. = ALIGN(4);
+	.rodata : { *(.rodata) }
 
-        . = ALIGN(4);
-        .data : { *(.data) }
+	. = ALIGN(4);
+	.data : { *(.data) }
 
-        . = ALIGN(4);
-        .got : { *(.got) }
+	. = ALIGN(4);
+	.got : { *(.got) }
+
+  __u_boot_cmd_start = .;
+  .u_boot_cmd : { *(.u_boot_cmd) }
+  __u_boot_cmd_end = .;
 
 	armboot_end_data = .;
 
-        . = ALIGN(4);
-        .bss : { *(.bss) }
+	. = ALIGN(4);
+	.bss : { *(.bss) }
 
 	armboot_end = .;
 }

diff --git a/board/mpl/vcma9/vcma9.c b/board/mpl/vcma9/vcma9.c
index b051bfe..1df5c38 100644
--- a/board/mpl/vcma9/vcma9.c
+++ b/board/mpl/vcma9/vcma9.c

@@ -166,9 +166,9 @@
 #define TWRPH0  3
 #define TWRPH1  0
     NF_Conf((1<<15)|(0<<14)|(0<<13)|(1<<12)|(1<<11)|(TACLS<<8)|(TWRPH0<<4)|(TWRPH1<<0));
-    //nand->NFCONF = (1<<15)|(1<<14)|(1<<13)|(1<<12)|(1<<11)|(TACLS<<8)|(TWRPH0<<4)|(TWRPH1<<0);
-    // 1  1    1     1,   1      xxx,  r xxx,   r xxx
-    // En 512B 4step ECCR nFCE=H tACLS   tWRPH0   tWRPH1
+    /*nand->NFCONF = (1<<15)|(1<<14)|(1<<13)|(1<<12)|(1<<11)|(TACLS<<8)|(TWRPH0<<4)|(TWRPH1<<0); */
+    /* 1  1    1     1,   1      xxx,  r xxx,   r xxx */
+    /* En 512B 4step ECCR nFCE=H tACLS   tWRPH0   tWRPH1 */
 
     NF_Reset();
 }
@@ -257,7 +257,6 @@
 }
 
 
-
 void print_vcma9_rev(void)
 {
 	printf("Board: VCMA9-%d PCB Rev: %c (PLD Ver: %d, Rev: %d)\n",

diff --git a/board/mpl/vcma9/vcma9.h b/board/mpl/vcma9/vcma9.h
index 4299d4e..068eb21 100644
--- a/board/mpl/vcma9/vcma9.h
+++ b/board/mpl/vcma9/vcma9.h

@@ -124,4 +124,3 @@
 #define PLD_MISC_REG			(PLD_BASE_ADDRESS + 3)
 #define PLD_GPCD_REG			(PLD_BASE_ADDRESS + 4)
 #define PLD_BOARD_REG			(PLD_BASE_ADDRESS + 5)
-

diff --git a/board/musenki/Makefile b/board/musenki/Makefile
index 2613292..24dc026 100644
--- a/board/musenki/Makefile
+++ b/board/musenki/Makefile

@@ -29,7 +29,7 @@
 SOBJS	=
 
 $(LIB):	.depend $(OBJS) $(SOBJS)
-	$(AR) crv $@ $^
+	$(AR) crv $@ $(OBJS)
 
 #########################################################################
 

diff --git a/board/musenki/README b/board/musenki/README
index 4a1955d..135a01a 100644
--- a/board/musenki/README
+++ b/board/musenki/README

@@ -68,12 +68,11 @@
 saveenv - save environment variables to persistent storage
 setenv  - set environment variables
 tftpboot- boot image via network using TFTP protocol
-               and env variables ipaddr and serverip
+	       and env variables ipaddr and serverip
 version - print monitor version
 ?       - alias for 'help'
 
 
-
 x.x.x CONFIG_CONS_INDEX 2
 
 **** NOT TESTED ****
@@ -167,7 +166,6 @@
 =>
 
 
-
 x.x.x Flash Programming
 
 
@@ -298,4 +296,3 @@
 x.x Image download and run over ethernet interface
 
 untested (not working yet, actually)
-

diff --git a/board/musenki/flash.c b/board/musenki/flash.c
index 1e8bfff..cd33d8e 100644
--- a/board/musenki/flash.c
+++ b/board/musenki/flash.c

@@ -56,7 +56,6 @@
 static void flash_get_offsets (ulong base, flash_info_t *info);
 
 
-
 /*
  * don't ask.  its stupid, but more than one soul has had to live with this mistake
  * "swaptab[i]" is the value of "i" with the bits reversed.

diff --git a/board/musenki/u-boot.lds b/board/musenki/u-boot.lds
index cf23407..9d949b5 100644
--- a/board/musenki/u-boot.lds
+++ b/board/musenki/u-boot.lds

@@ -103,6 +103,11 @@
   _edata  =  .;
   PROVIDE (edata = .);
 
+  __u_boot_cmd_start = .;
+  .u_boot_cmd : { *(.u_boot_cmd) }
+  __u_boot_cmd_end = .;
+
+
   __start___ex_table = .;
   __ex_table : { *(__ex_table) }
   __stop___ex_table = .;
@@ -126,4 +131,3 @@
   _end = . ;
   PROVIDE (end = .);
 }
-

diff --git a/board/mvs1/Makefile b/board/mvs1/Makefile
index ef173d0..13ce9fc 100644
--- a/board/mvs1/Makefile
+++ b/board/mvs1/Makefile

@@ -28,7 +28,7 @@
 OBJS	= $(BOARD).o flash.o
 
 $(LIB):	.depend $(OBJS)
-	$(AR) crv $@ $^
+	$(AR) crv $@ $(OBJS)
 
 #########################################################################
 

diff --git a/board/mvs1/README b/board/mvs1/README
index 6c66d67..69520bd 100644
--- a/board/mvs1/README
+++ b/board/mvs1/README

@@ -12,4 +12,3 @@
 D-71570
 Oppenweiler
 Germany
-

diff --git a/board/mvs1/mvs1.c b/board/mvs1/mvs1.c
index da98de5..cd5a01c 100644
--- a/board/mvs1/mvs1.c
+++ b/board/mvs1/mvs1.c

@@ -99,7 +99,6 @@
 }
 
 
-
 #ifdef DO_RAM_TEST
 /* ------------------------------------------------------------------------- */
 

diff --git a/board/mvs1/u-boot.lds b/board/mvs1/u-boot.lds
index 15a1963..7fe24df 100644
--- a/board/mvs1/u-boot.lds
+++ b/board/mvs1/u-boot.lds

@@ -115,6 +115,11 @@
   _edata  =  .;
   PROVIDE (edata = .);
 
+  __u_boot_cmd_start = .;
+  .u_boot_cmd : { *(.u_boot_cmd) }
+  __u_boot_cmd_end = .;
+
+
   __start___ex_table = .;
   __ex_table : { *(__ex_table) }
   __stop___ex_table = .;
@@ -137,4 +142,3 @@
   _end = . ;
   PROVIDE (end = .);
 }
-

diff --git a/board/mvs1/u-boot.lds.debug b/board/mvs1/u-boot.lds.debug
index 22138f8..c0ee849 100644
--- a/board/mvs1/u-boot.lds.debug
+++ b/board/mvs1/u-boot.lds.debug

@@ -106,6 +106,11 @@
   _edata  =  .;
   PROVIDE (edata = .);
 
+  __u_boot_cmd_start = .;
+  .u_boot_cmd : { *(.u_boot_cmd) }
+  __u_boot_cmd_end = .;
+
+
   __start___ex_table = .;
   __ex_table : { *(__ex_table) }
   __stop___ex_table = .;
@@ -128,4 +133,3 @@
   _end = . ;
   PROVIDE (end = .);
 }
-

diff --git a/board/netvia/Makefile b/board/netvia/Makefile
index ef173d0..13ce9fc 100644
--- a/board/netvia/Makefile
+++ b/board/netvia/Makefile

@@ -28,7 +28,7 @@
 OBJS	= $(BOARD).o flash.o
 
 $(LIB):	.depend $(OBJS)
-	$(AR) crv $@ $^
+	$(AR) crv $@ $(OBJS)
 
 #########################################################################
 

diff --git a/board/netvia/u-boot.lds b/board/netvia/u-boot.lds
index 5ac88da..14d4ba0 100644
--- a/board/netvia/u-boot.lds
+++ b/board/netvia/u-boot.lds

@@ -109,6 +109,11 @@
   _edata  =  .;
   PROVIDE (edata = .);
 
+  __u_boot_cmd_start = .;
+  .u_boot_cmd : { *(.u_boot_cmd) }
+  __u_boot_cmd_end = .;
+
+
   __start___ex_table = .;
   __ex_table : { *(__ex_table) }
   __stop___ex_table = .;

diff --git a/board/netvia/u-boot.lds.debug b/board/netvia/u-boot.lds.debug
index fa494fb..44eb2b6 100644
--- a/board/netvia/u-boot.lds.debug
+++ b/board/netvia/u-boot.lds.debug

@@ -106,6 +106,11 @@
   _edata  =  .;
   PROVIDE (edata = .);
 
+  __u_boot_cmd_start = .;
+  .u_boot_cmd : { *(.u_boot_cmd) }
+  __u_boot_cmd_end = .;
+
+
   __start___ex_table = .;
   __ex_table : { *(__ex_table) }
   __stop___ex_table = .;
@@ -128,4 +133,3 @@
   _end = . ;
   PROVIDE (end = .);
 }
-

diff --git a/board/nx823/Makefile b/board/nx823/Makefile
index 35b8428..7a2014d 100644
--- a/board/nx823/Makefile
+++ b/board/nx823/Makefile

@@ -28,7 +28,7 @@
 OBJS	= $(BOARD).o flash.o
 
 $(LIB):	.depend $(OBJS)
-	$(AR) crv $@ $^
+	$(AR) crv $@ $(OBJS)
 
 #########################################################################
 

diff --git a/board/nx823/flash.c b/board/nx823/flash.c
index 05ec687..581925e 100644
--- a/board/nx823/flash.c
+++ b/board/nx823/flash.c

@@ -462,4 +462,3 @@
 
 	return (0);
 }
-

diff --git a/board/nx823/nx823.c b/board/nx823/nx823.c
index 35cc9b0..07d173b 100644
--- a/board/nx823/nx823.c
+++ b/board/nx823/nx823.c

@@ -482,4 +482,3 @@
 	bd->bi_enetaddr[4] = bd->bi_sernum[5];
 	bd->bi_enetaddr[5] = bd->bi_sernum[6];
 }
-

diff --git a/board/nx823/u-boot.lds b/board/nx823/u-boot.lds
index 7128155..526198c 100644
--- a/board/nx823/u-boot.lds
+++ b/board/nx823/u-boot.lds

@@ -99,6 +99,11 @@
   _edata  =  .;
   PROVIDE (edata = .);
 
+  __u_boot_cmd_start = .;
+  .u_boot_cmd : { *(.u_boot_cmd) }
+  __u_boot_cmd_end = .;
+
+
   __start___ex_table = .;
   __ex_table : { *(__ex_table) }
   __stop___ex_table = .;
@@ -121,4 +126,3 @@
   _end = . ;
   PROVIDE (end = .);
 }
-

diff --git a/board/nx823/u-boot.lds.debug b/board/nx823/u-boot.lds.debug
index 8dc6d40..f6f7cf4 100644
--- a/board/nx823/u-boot.lds.debug
+++ b/board/nx823/u-boot.lds.debug

@@ -106,6 +106,11 @@
   _edata  =  .;
   PROVIDE (edata = .);
 
+  __u_boot_cmd_start = .;
+  .u_boot_cmd : { *(.u_boot_cmd) }
+  __u_boot_cmd_end = .;
+
+
   __start___ex_table = .;
   __ex_table : { *(__ex_table) }
   __stop___ex_table = .;
@@ -128,4 +133,3 @@
   _end = . ;
   PROVIDE (end = .);
 }
-

diff --git a/board/oxc/Makefile b/board/oxc/Makefile
index 8639e17..ae7a932 100644
--- a/board/oxc/Makefile
+++ b/board/oxc/Makefile

@@ -28,7 +28,7 @@
 OBJS	= $(BOARD).o flash.o
 
 $(LIB):	.depend $(OBJS)
-	$(AR) crv $@ $^
+	$(AR) crv $@ $(OBJS)
 
 #########################################################################
 

diff --git a/board/oxc/u-boot.lds b/board/oxc/u-boot.lds
index 0e0b0e6..db89a78 100644
--- a/board/oxc/u-boot.lds
+++ b/board/oxc/u-boot.lds

@@ -100,6 +100,11 @@
   _edata  =  .;
   PROVIDE (edata = .);
 
+  __u_boot_cmd_start = .;
+  .u_boot_cmd : { *(.u_boot_cmd) }
+  __u_boot_cmd_end = .;
+
+
   __start___ex_table = .;
   __ex_table : { *(__ex_table) }
   __stop___ex_table = .;
@@ -123,4 +128,3 @@
   _end = . ;
   PROVIDE (end = .);
 }
-

diff --git a/board/pcippc2/Makefile b/board/pcippc2/Makefile
index d771100..2998f23 100644
--- a/board/pcippc2/Makefile
+++ b/board/pcippc2/Makefile

@@ -33,7 +33,7 @@
 OBJS	= $(COBJS) $(AOBJS)
 
 $(LIB):	.depend $(OBJS)
-	$(AR) crv $@ $^
+	$(AR) crv $@ $(OBJS)
 
 #########################################################################
 

diff --git a/board/pcippc2/cpc710_pci.c b/board/pcippc2/cpc710_pci.c
index 9975cda..bed8aea 100644
--- a/board/pcippc2/cpc710_pci.c
+++ b/board/pcippc2/cpc710_pci.c

@@ -53,7 +53,7 @@
   u32			sdram_size = pcippc2_sdram_size();
 
   cpc710_mapped_ram = sdram_size < PCI_MEMORY_MAXSIZE ?
-                      sdram_size : PCI_MEMORY_MAXSIZE;
+		      sdram_size : PCI_MEMORY_MAXSIZE;
 
     /* Select the local PCI
      */

diff --git a/board/pcippc2/pcippc2.c b/board/pcippc2/pcippc2.c
index bab3c20..fd3d479 100644
--- a/board/pcippc2/pcippc2.c
+++ b/board/pcippc2/pcippc2.c

@@ -66,11 +66,13 @@
 	return cpc710_ram_init ();
 }
 
-void do_reset (cmd_tbl_t *cmdtp, bd_t *bd, int flag, int argc, char *argv[])
+int do_reset (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
 {
 	out32 (REG (CPC0, SPOR), 0);
 	iobarrier_rw ();
 	while (1);
+	/* notreached */
+	return (-1);
 }
 
 int board_pre_init (void)
@@ -201,7 +203,7 @@
 }
 
 #if (CONFIG_COMMANDS & CFG_CMD_BSP)
-int do_wd (cmd_tbl_t *cmdtp, bd_t *bd, int flag, int argc, char *argv[])
+int do_wd (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
 {
 	switch (argc) {
 	case 1:
@@ -231,5 +233,13 @@
 	return 1;
 }
 
+cmd_tbl_t U_BOOT_CMD(wd) = MK_CMD_ENTRY(
+	"wd",	2,	1,	do_wd,
+	"wd      - check and set watchdog\n",
+	"on   - switch watchDog on\n"
+	"wd off  - switch watchdog off\n"
+	"wd      - print current status\n"
+);
+
 #endif	/* CFG_CMD_BSP */
 #endif	/* CONFIG_WATCHDOG */

diff --git a/board/pcippc2/u-boot.lds b/board/pcippc2/u-boot.lds
index 8f48068..6ead7f2 100644
--- a/board/pcippc2/u-boot.lds
+++ b/board/pcippc2/u-boot.lds

@@ -109,6 +109,11 @@
   _edata  =  .;
   PROVIDE (edata = .);
 
+  __u_boot_cmd_start = .;
+  .u_boot_cmd : { *(.u_boot_cmd) }
+  __u_boot_cmd_end = .;
+
+
   __start___ex_table = .;
   __ex_table : { *(__ex_table) }
   __stop___ex_table = .;

diff --git a/board/pm826/Makefile b/board/pm826/Makefile
index 35b8428..7a2014d 100644
--- a/board/pm826/Makefile
+++ b/board/pm826/Makefile

@@ -28,7 +28,7 @@
 OBJS	= $(BOARD).o flash.o
 
 $(LIB):	.depend $(OBJS)
-	$(AR) crv $@ $^
+	$(AR) crv $@ $(OBJS)
 
 #########################################################################
 

diff --git a/board/pm826/u-boot.lds b/board/pm826/u-boot.lds
index 013a8d1..ce6c454 100644
--- a/board/pm826/u-boot.lds
+++ b/board/pm826/u-boot.lds

@@ -94,6 +94,11 @@
   _edata  =  .;
   PROVIDE (edata = .);
 
+  __u_boot_cmd_start = .;
+  .u_boot_cmd : { *(.u_boot_cmd) }
+  __u_boot_cmd_end = .;
+
+
   __start___ex_table = .;
   __ex_table : { *(__ex_table) }
   __stop___ex_table = .;

diff --git a/board/pn62/Makefile b/board/pn62/Makefile
index 77e216b..e85d4fd 100644
--- a/board/pn62/Makefile
+++ b/board/pn62/Makefile

@@ -28,7 +28,7 @@
 OBJS =  $(BOARD).o cmd_pn62.o misc.o
 
 $(LIB):	.depend $(OBJS)
-	$(AR) crv $@ $^
+	$(AR) crv $@ $(OBJS)
 
 #########################################################################
 

diff --git a/board/pn62/cmd_pn62.c b/board/pn62/cmd_pn62.c
index 928f6c0..421829a 100644
--- a/board/pn62/cmd_pn62.c
+++ b/board/pn62/cmd_pn62.c

@@ -26,9 +26,7 @@
 #include <net.h>
 #include <asm/io.h>
 #include <pci.h>
-#include <cmd_autoscript.h>
-#include <cmd_bsp.h>
-
+#include <command.h>
 #include "pn62.h"
 
 #if (CONFIG_COMMANDS & CFG_CMD_BSP)
@@ -53,6 +51,12 @@
     set_led (number, function);
     return 0;
 }
+cmd_tbl_t U_BOOT_CMD(led) = MK_CMD_ENTRY(
+	"led"    ,	3,	1,	do_led,
+	"led     - set LED 0..11 on the PN62 board\n",
+	"i fun\n"
+	"    - set 'i'th LED to function 'fun'\n"
+);
 
 /*
  * Command loadpci: loads a image over PCI.
@@ -161,4 +165,11 @@
     return rcode;
 }
 
+cmd_tbl_t U_BOOT_CMD(loadpci) = MK_CMD_ENTRY(
+	"loadpci",	2,	1,	do_loadpci,
+	"loadpci - load binary file over PCI\n",
+	"[addr]\n"
+	"    - load binary file over PCI to address 'addr'\n"
+);
+
 #endif

diff --git a/board/pn62/misc.c b/board/pn62/misc.c
index 4f71950..dcb2db5 100644
--- a/board/pn62/misc.c
+++ b/board/pn62/misc.c

@@ -154,8 +154,8 @@
 }
 
 static struct pci_device_id am79c95x_ids [] = {
-        { PCI_VENDOR_ID_AMD, PCI_DEVICE_ID_AMD_LANCE },
-        { }
+	{ PCI_VENDOR_ID_AMD, PCI_DEVICE_ID_AMD_LANCE },
+	{ }
 };
 
 

diff --git a/board/pn62/u-boot.lds b/board/pn62/u-boot.lds
index 5ba99b1..98584dc 100644
--- a/board/pn62/u-boot.lds
+++ b/board/pn62/u-boot.lds

@@ -103,6 +103,11 @@
   _edata  =  .;
   PROVIDE (edata = .);
 
+  __u_boot_cmd_start = .;
+  .u_boot_cmd : { *(.u_boot_cmd) }
+  __u_boot_cmd_end = .;
+
+
   __start___ex_table = .;
   __ex_table : { *(__ex_table) }
   __stop___ex_table = .;
@@ -126,4 +131,3 @@
   _end = . ;
   PROVIDE (end = .);
 }
-

diff --git a/board/ppmc8260/Makefile b/board/ppmc8260/Makefile
index 63083a4..420ee9c 100644
--- a/board/ppmc8260/Makefile
+++ b/board/ppmc8260/Makefile

@@ -28,7 +28,7 @@
 OBJS	:= ppmc8260.o strataflash.o
 
 $(LIB):	$(OBJS) $(SOBJS)
-	$(AR) crv $@ $^
+	$(AR) crv $@ $(OBJS)
 
 clean:
 	rm -f $(SOBJS) $(OBJS)

diff --git a/board/ppmc8260/ppmc8260.c b/board/ppmc8260/ppmc8260.c
index ab32622..e92ad8f 100644
--- a/board/ppmc8260/ppmc8260.c
+++ b/board/ppmc8260/ppmc8260.c

@@ -42,7 +42,7 @@
 
     /* Port A configuration */
     {	/*	      conf ppar psor pdir podr pdat */
-        /* PA31 */ {   0,   0,   0,   0,   0,   0   }, /* FCC1 *ATMTXEN */
+	/* PA31 */ {   0,   0,   0,   0,   0,   0   }, /* FCC1 *ATMTXEN */
 	/* PA30 */ {   0,   0,   0,   0,   0,   0   }, /* FCC1 ATMTCA   */
 	/* PA29 */ {   0,   0,   0,   0,   0,   0   }, /* FCC1 ATMTSOC  */
 	/* PA28 */ {   0,   0,   0,   0,   0,   0   }, /* FCC1 *ATMRXEN */

diff --git a/board/ppmc8260/strataflash.c b/board/ppmc8260/strataflash.c
index 6d5a853..f9abfac 100644
--- a/board/ppmc8260/strataflash.c
+++ b/board/ppmc8260/strataflash.c

@@ -90,8 +90,6 @@
 #define FLASH_MAN_CFI			0x01000000
 
 
-
-
 typedef union {
 	unsigned char c;
 	unsigned short w;
@@ -114,7 +112,6 @@
  */
 
 
-
 static void flash_add_byte(flash_info_t *info, cfiword_t * cword, uchar c);
 static void flash_make_cmd(flash_info_t * info, uchar cmd, void * cmdbuf);
 static void flash_write_cmd(flash_info_t * info, int sect, uchar offset, uchar cmd);

diff --git a/board/ppmc8260/u-boot.lds b/board/ppmc8260/u-boot.lds
index 2eac397..492033e 100644
--- a/board/ppmc8260/u-boot.lds
+++ b/board/ppmc8260/u-boot.lds

@@ -94,6 +94,11 @@
   _edata  =  .;
   PROVIDE (edata = .);
 
+  __u_boot_cmd_start = .;
+  .u_boot_cmd : { *(.u_boot_cmd) }
+  __u_boot_cmd_end = .;
+
+
   __start___ex_table = .;
   __ex_table : { *(__ex_table) }
   __stop___ex_table = .;
@@ -116,4 +121,3 @@
   _end = . ;
   PROVIDE (end = .);
 }
-

diff --git a/board/purple/Makefile b/board/purple/Makefile
index d1b0056..a9463b6 100644
--- a/board/purple/Makefile
+++ b/board/purple/Makefile

@@ -1,3 +1,4 @@
+
 #
 # (C) Copyright 2003
 # Wolfgang Denk, DENX Software Engineering, wd@denx.de.
@@ -29,7 +30,7 @@
 SOBJS	= memsetup.o
 
 $(LIB):	.depend $(OBJS) $(SOBJS)
-	$(AR) crv $@ $^
+	$(AR) crv $@ $(OBJS)
 
 #########################################################################
 

diff --git a/board/purple/flash.c b/board/purple/flash.c
index 34f1b91..7522580 100644
--- a/board/purple/flash.c
+++ b/board/purple/flash.c

@@ -42,7 +42,7 @@
 
 #define FLASH29_REG_FIRST_CYCLE		FLASH29_REG_ADRS (0x1555)
 #define FLASH29_REG_SECOND_CYCLE	FLASH29_REG_ADRS (0x2aaa)
-#define FLASH29_REG_THIRD_CYCLE		FLASH29_REG_ADRS (0x3555)	
+#define FLASH29_REG_THIRD_CYCLE		FLASH29_REG_ADRS (0x3555)
 #define	FLASH29_REG_FOURTH_CYCLE	FLASH29_REG_ADRS (0x4555)
 #define	FLASH29_REG_FIFTH_CYCLE		FLASH29_REG_ADRS (0x5aaa)
 #define	FLASH29_REG_SIXTH_CYCLE		FLASH29_REG_ADRS (0x6555)
@@ -60,7 +60,7 @@
 #define	FLASH29_CMD_CHIP_ERASE		0x80808080
 #define	FLASH29_CMD_READ_RESET		0xf0f0f0f0
 #define	FLASH29_CMD_AUTOSELECT		0x90909090
-#define FLASH29_CMD_READ		0x70707070	
+#define FLASH29_CMD_READ		0x70707070
 
 #define IN_RAM_CMD_READ		0x1
 #define IN_RAM_CMD_WRITE	0x2
@@ -88,43 +88,43 @@
 * can be relocated to scratch ram
 */
 static void flash_read_cmd(int cmd, FPWV * pFA, char * string, int strLen)
-{					
+{
 	int i,j;
-	FPW temp,temp1;	
+	FPW temp,temp1;
 	FPWV *str;
 
 	str = (FPWV *)string;
 
 	j=  strLen/4;
-	
+
 	if(cmd == FLASH29_CMD_AUTOSELECT)
 	   {
-            *(FLASH29_REG_FIRST_CYCLE)  = FLASH29_CMD_FIRST;
-            *(FLASH29_REG_SECOND_CYCLE) = FLASH29_CMD_SECOND;
-            *(FLASH29_REG_THIRD_CYCLE)  = FLASH29_CMD_AUTOSELECT;
-           }
+	    *(FLASH29_REG_FIRST_CYCLE)  = FLASH29_CMD_FIRST;
+	    *(FLASH29_REG_SECOND_CYCLE) = FLASH29_CMD_SECOND;
+	    *(FLASH29_REG_THIRD_CYCLE)  = FLASH29_CMD_AUTOSELECT;
+	   }
 
-        if(cmd == FLASH29_CMD_READ)
-           { 
-	    i = 0;		
-	    while(i<j)	
-            {
+	if(cmd == FLASH29_CMD_READ)
+	   {
+	    i = 0;
+	    while(i<j)
+	    {
 		temp = *pFA++;
 		temp1 = *(int *)0xa0000000;
-                *(int *)0xbf0081f8 = temp1 + temp;
+		*(int *)0xbf0081f8 = temp1 + temp;
 		*str++ = temp;
 		i++;
-	    }  		
-           }
+	    }
+	   }
 
-         if(cmd == FLASH29_CMD_READ_RESET) 
-         {
-            *(FLASH29_REG_FIRST_CYCLE)  = FLASH29_CMD_FIRST;
-            *(FLASH29_REG_SECOND_CYCLE) = FLASH29_CMD_SECOND;
-            *(FLASH29_REG_THIRD_CYCLE)  = FLASH29_CMD_READ_RESET;
-         } 			 	
-	    	
-	*(int *)0xbf0081f8 = *(int *)0xa0000000;	/* dummy read switch back to sdram interface */	
+	 if(cmd == FLASH29_CMD_READ_RESET)
+	 {
+	    *(FLASH29_REG_FIRST_CYCLE)  = FLASH29_CMD_FIRST;
+	    *(FLASH29_REG_SECOND_CYCLE) = FLASH29_CMD_SECOND;
+	    *(FLASH29_REG_THIRD_CYCLE)  = FLASH29_CMD_READ_RESET;
+	 }
+
+	*(int *)0xbf0081f8 = *(int *)0xa0000000;	/* dummy read switch back to sdram interface */
 }
 
 /******************************************************************************
@@ -134,38 +134,38 @@
 * can be relocated to scratch ram
 */
 static void flash_write_cmd(int cmd, FPWV * pFA, FPW value)
-{						
-        *(FLASH29_REG_FIRST_CYCLE)  = FLASH29_CMD_FIRST;
-        *(FLASH29_REG_SECOND_CYCLE) = FLASH29_CMD_SECOND;
+{
+	*(FLASH29_REG_FIRST_CYCLE)  = FLASH29_CMD_FIRST;
+	*(FLASH29_REG_SECOND_CYCLE) = FLASH29_CMD_SECOND;
 
 	if (cmd == FLASH29_CMD_SECTOR)
 	   {
-            *(FLASH29_REG_THIRD_CYCLE)  = FLASH29_CMD_CHIP_ERASE;
-            *(FLASH29_REG_FOURTH_CYCLE) = FLASH29_CMD_FOURTH;
-            *(FLASH29_REG_FIFTH_CYCLE)  = FLASH29_CMD_FIFTH;
-            *pFA		        = FLASH29_CMD_SECTOR;
-           }
-
-        if (cmd == FLASH29_CMD_SIXTH)
-           { 
-            *(FLASH29_REG_THIRD_CYCLE)  = FLASH29_CMD_CHIP_ERASE;
-            *(FLASH29_REG_FOURTH_CYCLE) = FLASH29_CMD_FOURTH;
-            *(FLASH29_REG_FIFTH_CYCLE)  = FLASH29_CMD_FIFTH;
-            *(FLASH29_REG_SIXTH_CYCLE)  = FLASH29_CMD_SIXTH;
+	    *(FLASH29_REG_THIRD_CYCLE)  = FLASH29_CMD_CHIP_ERASE;
+	    *(FLASH29_REG_FOURTH_CYCLE) = FLASH29_CMD_FOURTH;
+	    *(FLASH29_REG_FIFTH_CYCLE)  = FLASH29_CMD_FIFTH;
+	    *pFA		        = FLASH29_CMD_SECTOR;
 	   }
 
-        if (cmd == FLASH29_CMD_PROGRAM)
-           {
-            *(FLASH29_REG_THIRD_CYCLE)  = FLASH29_CMD_PROGRAM;
-	    *pFA = value;
-           }
+	if (cmd == FLASH29_CMD_SIXTH)
+	   {
+	    *(FLASH29_REG_THIRD_CYCLE)  = FLASH29_CMD_CHIP_ERASE;
+	    *(FLASH29_REG_FOURTH_CYCLE) = FLASH29_CMD_FOURTH;
+	    *(FLASH29_REG_FIFTH_CYCLE)  = FLASH29_CMD_FIFTH;
+	    *(FLASH29_REG_SIXTH_CYCLE)  = FLASH29_CMD_SIXTH;
+	   }
 
-        if (cmd == FLASH29_CMD_READ_RESET)    
-           {
-            *(FLASH29_REG_THIRD_CYCLE)  = FLASH29_CMD_READ_RESET;
-           } 			 	
-	    	
-	*(int *)0xbf0081f8 = *(int *)0xa0000000;	/* dummy read switch back to sdram interface */	
+	if (cmd == FLASH29_CMD_PROGRAM)
+	   {
+	    *(FLASH29_REG_THIRD_CYCLE)  = FLASH29_CMD_PROGRAM;
+	    *pFA = value;
+	   }
+
+	if (cmd == FLASH29_CMD_READ_RESET)
+	   {
+	    *(FLASH29_REG_THIRD_CYCLE)  = FLASH29_CMD_READ_RESET;
+	   }
+
+	*(int *)0xbf0081f8 = *(int *)0xa0000000;	/* dummy read switch back to sdram interface */
 }
 
 static void load_cmd(ulong cmd)
@@ -174,9 +174,9 @@
 	ulong *dst;
 	FUNCPTR_CP absEntry;
 	ulong func;
-	 
+
 	if (in_ram_cmd & cmd) return;
-	
+
 	if (cmd == IN_RAM_CMD_READ)
 	{
 		func = (ulong)flash_read_cmd;
@@ -186,12 +186,12 @@
 		func = (ulong)flash_write_cmd;
 	}
 
-    	src = (ulong *)(func & 0xfffffff8);
-    	dst = (ulong *)0xbf008000;
-    	absEntry = (FUNCPTR_CP)(0xbf0081d0);
-    	absEntry(src,dst,0x38);
+	src = (ulong *)(func & 0xfffffff8);
+	dst = (ulong *)0xbf008000;
+	absEntry = (FUNCPTR_CP)(0xbf0081d0);
+	absEntry(src,dst,0x38);
 
-        in_ram_cmd = cmd;
+	in_ram_cmd = cmd;
 }
 
 /*-----------------------------------------------------------------------
@@ -203,14 +203,14 @@
 {
 	unsigned long size = 0;
 	int i;
-	 
-        load_cmd(IN_RAM_CMD_READ);
+
+	load_cmd(IN_RAM_CMD_READ);
 
 	/* Init: no FLASHes known */
 	for (i=0; i < CFG_MAX_FLASH_BANKS; ++i) {
 		ulong flashbase = PHYS_FLASH_1;
 		ulong * buscon = (ulong *) INCA_IP_EBU_EBU_BUSCON0;
-		
+
 		/* Disable write protection */
 		*buscon &= ~INCA_IP_EBU_EBU_BUSCON1_WRDIS;
 
@@ -218,14 +218,14 @@
 		memset(&flash_info[i], 0, sizeof(flash_info_t));
 #endif
 
-		flash_info[i].size = 
+		flash_info[i].size =
 			flash_get_size((FPW *)flashbase, &flash_info[i]);
 
 		if (flash_info[i].flash_id == FLASH_UNKNOWN) {
 			printf ("## Unknown FLASH on Bank %d - Size = 0x%08lx\n",
 			i, flash_info[i].size);
 		}
-		
+
 		size += flash_info[i].size;
 	}
 
@@ -281,13 +281,13 @@
 {
 	int i;
 	flash_info_t * info;
-	
+
 	for (i = 0; i < CFG_MAX_FLASH_BANKS; i ++) {
 		info = & flash_info[i];
 		if (info->start[0] <= base && base < info->start[0] + info->size)
 			break;
 	}
-	
+
 	return i == CFG_MAX_FLASH_BANKS ? 0 : info;
 }
 
@@ -334,32 +334,32 @@
 	case FLASH_AM160B:
 		fmt = "29LV160B%s (16 Mbit, %s)\n";
 		break;
-        case FLASH_28F800C3B:
-        case FLASH_28F800C3T:
+	case FLASH_28F800C3B:
+	case FLASH_28F800C3T:
 		fmt = "28F800C3%s (8 Mbit, %s)\n";
 		break;
 	case FLASH_INTEL800B:
 	case FLASH_INTEL800T:
 		fmt = "28F800B3%s (8 Mbit, %s)\n";
 		break;
-        case FLASH_28F160C3B:
-        case FLASH_28F160C3T:
+	case FLASH_28F160C3B:
+	case FLASH_28F160C3T:
 		fmt = "28F160C3%s (16 Mbit, %s)\n";
 		break;
 	case FLASH_INTEL160B:
 	case FLASH_INTEL160T:
 		fmt = "28F160B3%s (16 Mbit, %s)\n";
 		break;
-        case FLASH_28F320C3B:
-        case FLASH_28F320C3T:
+	case FLASH_28F320C3B:
+	case FLASH_28F320C3T:
 		fmt = "28F320C3%s (32 Mbit, %s)\n";
 		break;
 	case FLASH_INTEL320B:
 	case FLASH_INTEL320T:
 		fmt = "28F320B3%s (32 Mbit, %s)\n";
 		break;
-        case FLASH_28F640C3B:
-        case FLASH_28F640C3T:
+	case FLASH_28F640C3B:
+	case FLASH_28F640C3T:
 		fmt = "28F640C3%s (64 Mbit, %s)\n";
 		break;
 	case FLASH_INTEL640B:
@@ -401,16 +401,16 @@
 ulong flash_get_size (FPWV *addr, flash_info_t *info)
 {
 	FUNCPTR_RD absEntry;
-	FPW retValue;	
+	FPW retValue;
 	int flag;
 
-        load_cmd(IN_RAM_CMD_READ);
+	load_cmd(IN_RAM_CMD_READ);
 	absEntry = (FUNCPTR_RD)FLASH_READ_CMD;
 
 	flag = disable_interrupts();
 	absEntry(FLASH29_CMD_AUTOSELECT,0,0,0);
 	if (flag) enable_interrupts();
-	
+
 	udelay(100);
 
 	flag = disable_interrupts();
@@ -451,7 +451,7 @@
 	int rcode = 0;
 	FUNCPTR_WR absEntry;
 
-        load_cmd(IN_RAM_CMD_WRITE);
+	load_cmd(IN_RAM_CMD_WRITE);
 	absEntry = (FUNCPTR_WR)FLASH_WRITE_CMD;
 
 	if ((s_first < 0) || (s_first > s_last)) {
@@ -543,15 +543,15 @@
 	 left > 0 && res == 0;
 	 addr += sizeof(data), left -= sizeof(data) - bytes) {
 
-        bytes = addr & (sizeof(data) - 1);
-        addr &= ~(sizeof(data) - 1);
+	bytes = addr & (sizeof(data) - 1);
+	addr &= ~(sizeof(data) - 1);
 
 	/* combine source and destination data so can program
 	 * an entire word of 16 or 32 bits
 	 */
-        for (i = 0; i < sizeof(data); i++) {
-            data <<= 8;
-            if (i < bytes || i - bytes >= left )
+	for (i = 0; i < sizeof(data); i++) {
+	    data <<= 8;
+	    if (i < bytes || i - bytes >= left )
 		data += *((uchar *)addr + i);
 	    else
 		data += *src++;

diff --git a/board/purple/memsetup.S b/board/purple/memsetup.S
index 9c983c9..d532ceb 100644
--- a/board/purple/memsetup.S
+++ b/board/purple/memsetup.S

@@ -35,4 +35,3 @@
 	sw	t1, 0(t0)
 	j	ra
 	nop
-

diff --git a/board/purple/purple.c b/board/purple/purple.c
index b1eb78f..4c3e5b4 100644
--- a/board/purple/purple.c
+++ b/board/purple/purple.c

@@ -35,7 +35,7 @@
 	__asm__ __volatile__("	         	\
 		.set noreorder;		        \
 		.set mips3;		        \
-                cache %1, (%0);	                \
+		cache %1, (%0);	                \
 		.set mips0;			\
 		.set reorder"			\
 		:				\
@@ -182,7 +182,7 @@
 		*(ulong *)0xbf0081f8 = temp1 + temp;
 		*destination++ = temp;
 
-	} 
+	}
 }
 
 /*******************************************************************************
@@ -214,8 +214,8 @@
 	src = (ulong *)(TEXT_BASE + 0x428);
 	dst = (ulong *)0xbf0081d0;
 
-	absEntry = (FUNCPTR)(TEXT_BASE + 0x400);   
-	absEntry(src,dst,0x6);     	
+	absEntry = (FUNCPTR)(TEXT_BASE + 0x400);
+	absEntry(src,dst,0x6);
 
 	src = (ulong *)((ulong)copydwords & 0xfffffff8);
 	dst = (ulong *)0xbf008000;

diff --git a/board/purple/u-boot.lds b/board/purple/u-boot.lds
index 7508865..270fbe8 100644
--- a/board/purple/u-boot.lds
+++ b/board/purple/u-boot.lds

@@ -29,9 +29,9 @@
 ENTRY(_start)
 SECTIONS
 {
-        . = 0x00000000;
+	. = 0x00000000;
 
-        . = ALIGN(4);
+	. = ALIGN(4);
 	.text       :
 	{
 	  cpu/mips/start.o		(.text)
@@ -47,11 +47,11 @@
 	  *(.text)
 	}
 
-        . = ALIGN(4);
-        .rodata  : { *(.rodata) }
+	. = ALIGN(4);
+	.rodata  : { *(.rodata) }
 
-        . = ALIGN(4);
-        .data  : { *(.data) }
+	. = ALIGN(4);
+	.data  : { *(.data) }
 
 	. = ALIGN(4);
 	.sdata  : { *(.sdata) }
@@ -64,11 +64,15 @@
 
 	.sdata  : { *(.sdata) }
 
+  __u_boot_cmd_start = .;
+  .u_boot_cmd : { *(.u_boot_cmd) }
+  __u_boot_cmd_end = .;
+
 	uboot_end_data = .;
 	num_got_entries = (__got_end - __got_start) >> 2;
 
-        . = ALIGN(4);
+	. = ALIGN(4);
 	.sbss  : { *(.sbss) }
-        .bss  : { *(.bss) }
+	.bss  : { *(.bss) }
 	uboot_end = .;
 }

diff --git a/board/r360mpi/Makefile b/board/r360mpi/Makefile
index ef173d0..13ce9fc 100644
--- a/board/r360mpi/Makefile
+++ b/board/r360mpi/Makefile

@@ -28,7 +28,7 @@
 OBJS	= $(BOARD).o flash.o
 
 $(LIB):	.depend $(OBJS)
-	$(AR) crv $@ $^
+	$(AR) crv $@ $(OBJS)
 
 #########################################################################
 

diff --git a/board/r360mpi/r360mpi.c b/board/r360mpi/r360mpi.c
index 91e3234..ca556be 100644
--- a/board/r360mpi/r360mpi.c
+++ b/board/r360mpi/r360mpi.c

@@ -28,7 +28,6 @@
 
 #include <commproc.h>
 #include <command.h>
-#include <cmd_bsp.h>
 #include <malloc.h>
 
 #include <linux/types.h>
@@ -54,37 +53,37 @@
 
 const uint sdram_table[]=
 {
-        /* single read. (offset 0 in upm RAM) */
-        0x1f07fc04, 0xeeaefc04, 0x11adfc04, 0xefbbbc00,
-        0x1ff77c47,
+	/* single read. (offset 0 in upm RAM) */
+	0x1f07fc04, 0xeeaefc04, 0x11adfc04, 0xefbbbc00,
+	0x1ff77c47,
 
-        /* MRS initialization (offset 5) */
+	/* MRS initialization (offset 5) */
 
-        0x1ff77c34, 0xefeabc34, 0x1fb57c35,
+	0x1ff77c34, 0xefeabc34, 0x1fb57c35,
 
-        /* burst read. (offset 8 in upm RAM) */
-        0x1f07fc04, 0xeeaefc04, 0x10adfc04, 0xf0affc00,
-        0xf0affc00, 0xf1affc00, 0xefbbbc00, 0x1ff77c47,
-        _not_used_, _not_used_, _not_used_, _not_used_,
-        _not_used_, _not_used_, _not_used_, _not_used_,
+	/* burst read. (offset 8 in upm RAM) */
+	0x1f07fc04, 0xeeaefc04, 0x10adfc04, 0xf0affc00,
+	0xf0affc00, 0xf1affc00, 0xefbbbc00, 0x1ff77c47,
+	_not_used_, _not_used_, _not_used_, _not_used_,
+	_not_used_, _not_used_, _not_used_, _not_used_,
 
-        /* single write. (offset 18 in upm RAM) */
-        0x1f27fc04, 0xeeaebc00, 0x01b93c04, 0x1ff77c47,
-        _not_used_, _not_used_, _not_used_, _not_used_,
+	/* single write. (offset 18 in upm RAM) */
+	0x1f27fc04, 0xeeaebc00, 0x01b93c04, 0x1ff77c47,
+	_not_used_, _not_used_, _not_used_, _not_used_,
 
-        /* burst write. (offset 20 in upm RAM) */
-        0x1f07fc04, 0xeeaebc00, 0x10ad7c00, 0xf0affc00,
-        0xf0affc00, 0xe1bbbc04, 0x1ff77c47, _not_used_,
-        _not_used_, _not_used_, _not_used_, _not_used_,
-        _not_used_, _not_used_, _not_used_, _not_used_,
+	/* burst write. (offset 20 in upm RAM) */
+	0x1f07fc04, 0xeeaebc00, 0x10ad7c00, 0xf0affc00,
+	0xf0affc00, 0xe1bbbc04, 0x1ff77c47, _not_used_,
+	_not_used_, _not_used_, _not_used_, _not_used_,
+	_not_used_, _not_used_, _not_used_, _not_used_,
 
-        /* refresh. (offset 30 in upm RAM) */
-        0x1ff5fc84, 0xfffffc04, 0xfffffc04, 0xfffffc04,
-        0xfffffc84, 0xfffffc07, _not_used_, _not_used_,
-        _not_used_, _not_used_, _not_used_, _not_used_,
+	/* refresh. (offset 30 in upm RAM) */
+	0x1ff5fc84, 0xfffffc04, 0xfffffc04, 0xfffffc04,
+	0xfffffc84, 0xfffffc07, _not_used_, _not_used_,
+	_not_used_, _not_used_, _not_used_, _not_used_,
 
-        /* exception. (offset 3c in upm RAM) */
-        0x7ffffc07, _not_used_, _not_used_, _not_used_ };
+	/* exception. (offset 3c in upm RAM) */
+	0x7ffffc07, _not_used_, _not_used_, _not_used_ };
 
 /* ------------------------------------------------------------------------- */
 
@@ -443,3 +442,9 @@
 	setenv ("keybd", keybd_env);
 	return 0;
 }
+
+cmd_tbl_t U_BOOT_CMD(kbd) = MK_CMD_ENTRY(
+	"kbd",	1,	1,	do_kbd,
+	"kbd     - read keyboard status\n",
+	NULL
+);

diff --git a/board/r360mpi/u-boot.lds b/board/r360mpi/u-boot.lds
index 5e4eedf..f64b32f 100644
--- a/board/r360mpi/u-boot.lds
+++ b/board/r360mpi/u-boot.lds

@@ -107,6 +107,11 @@
   _edata  =  .;
   PROVIDE (edata = .);
 
+  __u_boot_cmd_start = .;
+  .u_boot_cmd : { *(.u_boot_cmd) }
+  __u_boot_cmd_end = .;
+
+
   __start___ex_table = .;
   __ex_table : { *(__ex_table) }
   __stop___ex_table = .;
@@ -134,4 +139,3 @@
     common/environment.o (.ppcenv)
   }
 }
-

diff --git a/board/rbc823/Makefile b/board/rbc823/Makefile
index f912451..0121ddc 100644
--- a/board/rbc823/Makefile
+++ b/board/rbc823/Makefile

@@ -28,7 +28,7 @@
 OBJS	= $(BOARD).o flash.o kbd.o
 
 $(LIB):	.depend $(OBJS)
-	$(AR) crv $@ $^
+	$(AR) crv $@ $(OBJS)
 
 #########################################################################
 

diff --git a/board/rbc823/kbd.c b/board/rbc823/kbd.c
index f1424e4..c27929d 100644
--- a/board/rbc823/kbd.c
+++ b/board/rbc823/kbd.c

@@ -48,7 +48,7 @@
 {
 	DECLARE_GLOBAL_DATA_PTR;
 
-        volatile immap_t *im = (immap_t *)CFG_IMMR;
+	volatile immap_t *im = (immap_t *)CFG_IMMR;
 	volatile cpm8xx_t *cp = &(im->im_cpm);
 
 	/* Set up the baud rate generator.
@@ -65,7 +65,7 @@
 
 int smc1_init (void)
 {
-        volatile immap_t *im = (immap_t *)CFG_IMMR;
+	volatile immap_t *im = (immap_t *)CFG_IMMR;
 	volatile smc_t *sp;
 	volatile smc_uart_t *up;
 	volatile cbd_t *tbdf, *rbdf;
@@ -182,7 +182,7 @@
 	volatile cbd_t		*tbdf;
 	volatile char		*buf;
 	volatile smc_uart_t	*up;
-        volatile immap_t	*im = (immap_t *)CFG_IMMR;
+	volatile immap_t	*im = (immap_t *)CFG_IMMR;
 	volatile cpm8xx_t	*cpmp = &(im->im_cpm);
 
 	up = (smc_uart_t *)&cpmp->cp_dparam[PROFF_SMC];
@@ -210,7 +210,7 @@
 	volatile cbd_t		*rbdf;
 	volatile unsigned char	*buf;
 	volatile smc_uart_t	*up;
-        volatile immap_t	*im = (immap_t *)CFG_IMMR;
+	volatile immap_t	*im = (immap_t *)CFG_IMMR;
 	volatile cpm8xx_t	*cpmp = &(im->im_cpm);
 	unsigned char		c;
 
@@ -235,7 +235,7 @@
 {
 	volatile cbd_t		*rbdf;
 	volatile smc_uart_t	*up;
-        volatile immap_t	*im = (immap_t *)CFG_IMMR;
+	volatile immap_t	*im = (immap_t *)CFG_IMMR;
 	volatile cpm8xx_t	*cpmp = &(im->im_cpm);
 
 	up = (smc_uart_t *)&cpmp->cp_dparam[PROFF_SMC];

diff --git a/board/rbc823/rbc823.c b/board/rbc823/rbc823.c
index 24ed501..9bb1c1d 100644
--- a/board/rbc823/rbc823.c
+++ b/board/rbc823/rbc823.c

@@ -151,7 +151,7 @@
     upmconfig(UPMA, (uint *)sdram_table, sizeof(sdram_table)/sizeof(uint));
 
     /*
-     * 1 Bank of 64Mbit x 2 devices 
+     * 1 Bank of 64Mbit x 2 devices
      */
     memctl->memc_mptpr = CFG_MPTPR_1BK_4K;
     memctl->memc_mar  = 0x00000088;
@@ -164,8 +164,8 @@
     memctl->memc_mamr = CFG_MAMR_8COL & (~(MAMR_PTAE)); /* no refresh yet */
     udelay(200);
 
-    /* 
-     * Perform SDRAM initializsation sequence 
+    /*
+     * Perform SDRAM initializsation sequence
      */
     memctl->memc_mcr  = 0x80008105;	/* SDRAM bank 0 */
     udelay(1);
@@ -174,7 +174,7 @@
     memctl->memc_mcr  = 0x80008130;	/* SDRAM bank 0 - execute twice */
     udelay(1);
     memctl->memc_mamr = (CFG_MAMR_8COL & ~(MAMR_TLFA_MSK)) | MAMR_TLFA_4X;
-    udelay(200); 
+    udelay(200);
 
     memctl->memc_mamr |= MAMR_PTAE;	/* enable refresh */
     udelay (1000);
@@ -185,7 +185,7 @@
      * with two SDRAM banks or four cycles every 31.2 us with one
      * bank. It will be adjusted after memory sizing.
      */
-    memctl->memc_mptpr = CFG_MPTPR_2BK_4K; // 16: but should be: CFG_MPTPR_1BK_4K
+    memctl->memc_mptpr = CFG_MPTPR_2BK_4K; /* 16: but should be: CFG_MPTPR_1BK_4K */
 
     /*
      * Check Bank 0 Memory Size for re-configuration
@@ -289,4 +289,3 @@
 
     doc_probe(FLASH_BASE1_PRELIM);
 }
-

diff --git a/board/rbc823/u-boot.lds b/board/rbc823/u-boot.lds
index ffe7495..05f6555 100644
--- a/board/rbc823/u-boot.lds
+++ b/board/rbc823/u-boot.lds

@@ -109,6 +109,10 @@
   _edata  =  .;
   PROVIDE (edata = .);
 
+  __u_boot_cmd_start = .;
+  .u_boot_cmd : { *(.u_boot_cmd) }
+  __u_boot_cmd_end = .;
+
   __start___ex_table = .;
   __ex_table : { *(__ex_table) }
   __stop___ex_table = .;
@@ -131,4 +135,3 @@
   _end = . ;
   PROVIDE (end = .);
 }
-

diff --git a/board/rmu/Makefile b/board/rmu/Makefile
index ef173d0..13ce9fc 100644
--- a/board/rmu/Makefile
+++ b/board/rmu/Makefile

@@ -28,7 +28,7 @@
 OBJS	= $(BOARD).o flash.o
 
 $(LIB):	.depend $(OBJS)
-	$(AR) crv $@ $^
+	$(AR) crv $@ $(OBJS)
 
 #########################################################################
 

diff --git a/board/rmu/u-boot.lds b/board/rmu/u-boot.lds
index a31c362..082d8b0 100644
--- a/board/rmu/u-boot.lds
+++ b/board/rmu/u-boot.lds

@@ -110,6 +110,11 @@
   _edata  =  .;
   PROVIDE (edata = .);
 
+  __u_boot_cmd_start = .;
+  .u_boot_cmd : { *(.u_boot_cmd) }
+  __u_boot_cmd_end = .;
+
+
   __start___ex_table = .;
   __ex_table : { *(__ex_table) }
   __stop___ex_table = .;
@@ -132,4 +137,3 @@
   _end = . ;
   PROVIDE (end = .);
 }
-

diff --git a/board/rmu/u-boot.lds.debug b/board/rmu/u-boot.lds.debug
index 22138f8..f34c2a4 100644
--- a/board/rmu/u-boot.lds.debug
+++ b/board/rmu/u-boot.lds.debug

@@ -128,4 +128,3 @@
   _end = . ;
   PROVIDE (end = .);
 }
-

diff --git a/board/rpxsuper/Makefile b/board/rpxsuper/Makefile
index 85ea1fc..4535106 100644
--- a/board/rpxsuper/Makefile
+++ b/board/rpxsuper/Makefile

@@ -28,7 +28,7 @@
 OBJS	:= rpxsuper.o flash.o mii_phy.o
 
 $(LIB):	$(OBJS) $(SOBJS)
-	$(AR) crv $@ $^
+	$(AR) crv $@ $(OBJS)
 
 clean:
 	rm -f $(SOBJS) $(OBJS)

diff --git a/board/rpxsuper/flash.c b/board/rpxsuper/flash.c
index 73281bd..d80e778 100644
--- a/board/rpxsuper/flash.c
+++ b/board/rpxsuper/flash.c

@@ -172,7 +172,7 @@
 	* Bank 2 (48 Sectors): 23-70=64kbyte
 	*/
 	info->flash_id     = (AMD_MANUFACT & FLASH_VENDMASK) |
-                             (AMD_ID_DL323B & FLASH_TYPEMASK);
+			     (AMD_ID_DL323B & FLASH_TYPEMASK);
 	info->sector_count = 71;
 	info->size         = 4 * (8 * 8 + 63 * 64) * 1024;
     }
@@ -183,24 +183,24 @@
 
     /* set up sector start address table */
     for (i = 0; i < 8; i++) {
-        info->start[i] = base + (i * 0x8000);
+	info->start[i] = base + (i * 0x8000);
     }
     for (i = 8; i < info->sector_count; i++) {
-        info->start[i] = base + (i * 0x40000) + 8 * 0x8000 - 8 * 0x40000;
+	info->start[i] = base + (i * 0x40000) + 8 * 0x8000 - 8 * 0x40000;
     }
 
     /* check for protected sectors */
     for (i = 0; i < info->sector_count; i++) {
-        /* read sector protection at sector address */
+	/* read sector protection at sector address */
 	addr = (volatile unsigned long *)(info->start[i]);
-        addr[2 * 0x0555] = 0xAAAAAAAA;
+	addr[2 * 0x0555] = 0xAAAAAAAA;
 	addr[2 * 0x02AA] = 0x55555555;
 	addr[2 * 0x0555] = 0x90909090;
 	addr[2 * 0x0555 + 1] = 0xAAAAAAAA;
 	addr[2 * 0x02AA + 1] = 0x55555555;
 	addr[2 * 0x0555 + 1] = 0x90909090;
 	udelay (1000);
-    	base = RD_SWP32(&addr[4]);
+	base = RD_SWP32(&addr[4]);
 	base |= RD_SWP32(&addr[5]);
 	info->protect[i] = base & 0x00010001 ? 1 : 0;
     }
@@ -404,14 +404,14 @@
     flag = disable_interrupts();
 
     if ((dest & 0x00000004) == 0) {
-        addr[2 * 0x0555] = 0xAAAAAAAA;
+	addr[2 * 0x0555] = 0xAAAAAAAA;
 	addr[2 * 0x02AA] = 0x55555555;
-        addr[2 * 0x0555] = 0xA0A0A0A0;
+	addr[2 * 0x0555] = 0xA0A0A0A0;
     }
     else {
-        addr[2 * 0x0555 + 1] = 0xAAAAAAAA;
+	addr[2 * 0x0555 + 1] = 0xAAAAAAAA;
 	addr[2 * 0x02AA + 1] = 0x55555555;
-        addr[2 * 0x0555 + 1] = 0xA0A0A0A0;
+	addr[2 * 0x0555 + 1] = 0xA0A0A0A0;
     }
 
     *((vu_long *)dest) = data;

diff --git a/board/rpxsuper/mii_phy.c b/board/rpxsuper/mii_phy.c
index 319f959..ef99aff 100644
--- a/board/rpxsuper/mii_phy.c
+++ b/board/rpxsuper/mii_phy.c

@@ -38,7 +38,7 @@
 	if (phy_reg & 0x0400)
 	    printf("Phy operating at %d MBit/s in %s-duplex mode\n",
 		phy_reg & 0x4000 ? 100 : 10,
-	    	phy_reg & 0x0200 ? "full" : "half");
+		phy_reg & 0x0200 ? "full" : "half");
 	else
 	    printf("bad link!!\n");
 /*
@@ -59,7 +59,7 @@
     tmp = 0x6002 | (adr << 7) | (reg << 2);
     regs->bcsr4 = 0xC3;
     for (i = 0; i < 64; i++) {
-        regs->bcsr4 ^= MII_MDCK;
+	regs->bcsr4 ^= MII_MDCK;
     }
     for (i = 0; i < 16; i++) {
 	regs->bcsr4 &= ~MII_MDCK;
@@ -92,7 +92,7 @@
     }
     for (i = 0; i < 16; i++) {
 	regs->bcsr4 &= ~MII_MDCK;
-        if (tmp & 0x8000) regs->bcsr4 |= MII_MDIO;
+	if (tmp & 0x8000) regs->bcsr4 |= MII_MDIO;
 	else regs->bcsr4 &= ~MII_MDIO;
 	regs->bcsr4 |= MII_MDCK;
 	tmp <<= 1;
@@ -105,4 +105,3 @@
 	val <<= 1;
     }
 }
-

diff --git a/board/rpxsuper/rpxsuper.c b/board/rpxsuper/rpxsuper.c
index 2c0717e..50b3c5c 100644
--- a/board/rpxsuper/rpxsuper.c
+++ b/board/rpxsuper/rpxsuper.c

@@ -42,7 +42,7 @@
 
     /* Port A configuration */
     {	/*	      conf ppar psor pdir podr pdat */
-        /* PA31 */ {   1,   0,   0,   0,   0,   0   }, /* FCC1 *ATMTXEN */
+	/* PA31 */ {   1,   0,   0,   0,   0,   0   }, /* FCC1 *ATMTXEN */
 	/* PA30 */ {   1,   0,   0,   0,   0,   0   }, /* FCC1 ATMTCA   */
 	/* PA29 */ {   1,   0,   0,   0,   0,   0   }, /* FCC1 ATMTSOC  */
 	/* PA28 */ {   1,   0,   0,   0,   0,   0   }, /* FCC1 *ATMRXEN */
@@ -271,7 +271,7 @@
 
     memctl->memc_psdmr = psdmr | PSDMR_OP_CBRR;
     for (i = 0; i < 8; i++)
-        *ramaddr = c;
+	*ramaddr = c;
 
     memctl->memc_psdmr = psdmr | PSDMR_OP_MRW;
     *ramaddr = c;

diff --git a/board/rpxsuper/u-boot.lds b/board/rpxsuper/u-boot.lds
index b4e502b..44224cb 100644
--- a/board/rpxsuper/u-boot.lds
+++ b/board/rpxsuper/u-boot.lds

@@ -93,6 +93,11 @@
   _edata  =  .;
   PROVIDE (edata = .);
 
+  __u_boot_cmd_start = .;
+  .u_boot_cmd : { *(.u_boot_cmd) }
+  __u_boot_cmd_end = .;
+
+
   __start___ex_table = .;
   __ex_table : { *(__ex_table) }
   __stop___ex_table = .;
@@ -115,4 +120,3 @@
   _end = . ;
   PROVIDE (end = .);
 }
-

diff --git a/board/rsdproto/flash.c b/board/rsdproto/flash.c
index d90e7db..5ad3218 100644
--- a/board/rsdproto/flash.c
+++ b/board/rsdproto/flash.c

@@ -59,9 +59,9 @@
 
 /* from flash_asm.S */
 extern void ull_write(unsigned long long volatile *address,
-                      unsigned long long volatile *data);
+		      unsigned long long volatile *data);
 extern void ull_read(unsigned long long volatile *address,
-                     unsigned long long volatile *data);
+		     unsigned long long volatile *data);
 
 /*-----------------------------------------------------------------------
  */
@@ -268,7 +268,7 @@
 			ull_write(f_addr, &f_command);
 			printf (" timeout\n");
 			return 1;
-        }
+	}
 	} while(*f_addr != 0xFFFFFFFFFFFFFFFFULL);
 
     printf (" done\n");

diff --git a/board/rsdproto/u-boot.lds b/board/rsdproto/u-boot.lds
index 7d3886d..bdc75c1 100644
--- a/board/rsdproto/u-boot.lds
+++ b/board/rsdproto/u-boot.lds

@@ -98,6 +98,11 @@
   _edata  =  .;
   PROVIDE (edata = .);
 
+  __u_boot_cmd_start = .;
+  .u_boot_cmd : { *(.u_boot_cmd) }
+  __u_boot_cmd_end = .;
+
+
   __start___ex_table = .;
   __ex_table : { *(__ex_table) }
   __stop___ex_table = .;
@@ -120,4 +125,3 @@
   _end = . ;
   PROVIDE (end = .);
 }
-

diff --git a/board/sacsng/Makefile b/board/sacsng/Makefile
index e593f27..baefa4a 100644
--- a/board/sacsng/Makefile
+++ b/board/sacsng/Makefile

@@ -28,7 +28,7 @@
 OBJS	:= sacsng.o flash.o clkinit.o
 
 $(LIB):	$(OBJS) $(SOBJS)
-	$(AR) crv $@ $^
+	$(AR) crv $@ $(OBJS)
 
 clean:
 	rm -f $(SOBJS) $(OBJS)

diff --git a/board/sacsng/clkinit.c b/board/sacsng/clkinit.c
index 634c1e0..ea4c65d 100644
--- a/board/sacsng/clkinit.c
+++ b/board/sacsng/clkinit.c

@@ -41,8 +41,8 @@
      brg_ptr = (uint *)&immr->im_brgc1;
 
      if (brg >= 5) {
-         brg_ptr = (uint *)&immr->im_brgc5;
-         brg -= 4;
+	 brg_ptr = (uint *)&immr->im_brgc5;
+	 brg -= 4;
      }
      brg_ptr += brg;
      *brg_ptr |=  CPM_BRG_RST;
@@ -57,8 +57,8 @@
      brg_ptr = (uint *)&immr->im_brgc1;
 
      if (brg >= 5) {
-         brg_ptr = (uint *)&immr->im_brgc5;
-         brg -= 4;
+	 brg_ptr = (uint *)&immr->im_brgc5;
+	 brg -= 4;
      }
      brg_ptr += brg;
      *brg_ptr &= ~CPM_BRG_EN;
@@ -71,8 +71,8 @@
 
      brg_ptr = (uint *)&immr->im_brgc1;
      if (brg >= 5) {
-         brg_ptr = (uint *)&immr->im_brgc5;
-         brg -= 4;
+	 brg_ptr = (uint *)&immr->im_brgc5;
+	 brg -= 4;
      }
      brg_ptr += brg;
      *brg_ptr |= CPM_BRG_EN;
@@ -85,18 +85,18 @@
 
      brg_ptr = (uint *)&immr->im_brgc1;
      if (brg >= 5) {
-         brg_ptr = (uint *)&immr->im_brgc5;
-         brg -= 4;
+	 brg_ptr = (uint *)&immr->im_brgc5;
+	 brg -= 4;
      }
      brg_ptr += brg;
 
      if (*brg_ptr & CPM_BRG_DIV16) {
-         /* DIV16 active */
-         return (TRUE);
+	 /* DIV16 active */
+	 return (TRUE);
      }
      else {
-         /* DIV16 inactive */
-         return (FALSE);
+	 /* DIV16 inactive */
+	 return (FALSE);
      }
 }
 
@@ -107,18 +107,18 @@
 
      brg_ptr = (uint *)&immr->im_brgc1;
      if (brg >= 5) {
-         brg_ptr = (uint *)&immr->im_brgc5;
-         brg -= 4;
+	 brg_ptr = (uint *)&immr->im_brgc5;
+	 brg -= 4;
      }
      brg_ptr += brg;
 
      if (div16) {
-         /* DIV16 active */
-         *brg_ptr |=  CPM_BRG_DIV16;
+	 /* DIV16 active */
+	 *brg_ptr |=  CPM_BRG_DIV16;
      }
      else {
-         /* DIV16 inactive */
-         *brg_ptr &= ~CPM_BRG_DIV16;
+	 /* DIV16 inactive */
+	 *brg_ptr &= ~CPM_BRG_DIV16;
      }
 }
 
@@ -130,8 +130,8 @@
 
      brg_ptr = (uint *)&immr->im_brgc1;
      if (brg >= 5) {
-         brg_ptr = (uint *)&immr->im_brgc5;
-         brg -= 4;
+	 brg_ptr = (uint *)&immr->im_brgc5;
+	 brg -= 4;
      }
      brg_ptr += brg;
 
@@ -143,7 +143,7 @@
      brg_cnt = (*brg_ptr & CPM_BRG_CD_MASK) >> CPM_BRG_DIV16_SHIFT;
      brg_cnt++;
      if (*brg_ptr & CPM_BRG_DIV16) {
-         brg_cnt *= 16;
+	 brg_cnt *= 16;
      }
 
     return (brg_cnt);
@@ -156,8 +156,8 @@
 
      brg_ptr = (uint *)&immr->im_brgc1;
      if (brg >= 5) {
-         brg_ptr = (uint *)&immr->im_brgc5;
-         brg -= 4;
+	 brg_ptr = (uint *)&immr->im_brgc5;
+	 brg -= 4;
      }
      brg_ptr += brg;
 
@@ -166,14 +166,14 @@
       *	 therefore we need to subtract 1 from the count.
       */
      if (brg_cnt > 4096) {
-         /* Prescale = Divide by 16 */
-         *brg_ptr = (*brg_ptr & ~CPM_BRG_CD_MASK)   |
+	 /* Prescale = Divide by 16 */
+	 *brg_ptr = (*brg_ptr & ~CPM_BRG_CD_MASK)   |
 	     (((brg_cnt / 16) - 1) << CPM_BRG_DIV16_SHIFT);
 	 *brg_ptr |= CPM_BRG_DIV16;
      }
      else {
-         /* Prescale = Divide by 1 */
-         *brg_ptr = (*brg_ptr & ~CPM_BRG_CD_MASK) |
+	 /* Prescale = Divide by 1 */
+	 *brg_ptr = (*brg_ptr & ~CPM_BRG_CD_MASK) |
 	     ((brg_cnt - 1) << CPM_BRG_DIV16_SHIFT);
 	 *brg_ptr &= ~CPM_BRG_DIV16;
      }
@@ -186,8 +186,8 @@
 
      brg_ptr = (uint *)&immr->im_brgc1;
      if (brg >= 5) {
-         brg_ptr = (uint *)&immr->im_brgc5;
-         brg -= 4;
+	 brg_ptr = (uint *)&immr->im_brgc5;
+	 brg -= 4;
      }
      brg_ptr += brg;
 
@@ -201,40 +201,40 @@
      extc = Daq_BRG_Get_ExtClk(brg);
 
      switch (brg + 1) {
-         case 1:
-         case 2:
-         case 5:
-         case 6: {
-             switch (extc) {
-                 case 0: {
-                     return ("BRG_INT");
-                 }
-                 case 1: {
-                     return ("CLK3");
-                 }
-                 case 2: {
-                     return ("CLK5");
-                 }
-             }
-             return ("??1245??");
-         }
-         case 3:
-         case 4:
-         case 7:
-         case 8: {
-             switch (extc) {
-                 case 0: {
-                     return ("BRG_INT");
-                 }
-                 case 1: {
-                     return ("CLK9");
-                 }
-                 case 2: {
-                     return ("CLK15");
-                 }
-             }
-             return ("??3478??");
-         }
+	 case 1:
+	 case 2:
+	 case 5:
+	 case 6: {
+	     switch (extc) {
+		 case 0: {
+		     return ("BRG_INT");
+		 }
+		 case 1: {
+		     return ("CLK3");
+		 }
+		 case 2: {
+		     return ("CLK5");
+		 }
+	     }
+	     return ("??1245??");
+	 }
+	 case 3:
+	 case 4:
+	 case 7:
+	 case 8: {
+	     switch (extc) {
+		 case 0: {
+		     return ("BRG_INT");
+		 }
+		 case 1: {
+		     return ("CLK9");
+		 }
+		 case 2: {
+		     return ("CLK15");
+		 }
+	     }
+	     return ("??3478??");
+	 }
      }
      return ("??9876??");
 }
@@ -246,13 +246,13 @@
 
      brg_ptr = (uint *)&immr->im_brgc1;
      if (brg >= 5) {
-         brg_ptr = (uint *)&immr->im_brgc5;
-         brg -= 4;
+	 brg_ptr = (uint *)&immr->im_brgc5;
+	 brg -= 4;
      }
      brg_ptr += brg;
 
      *brg_ptr = (*brg_ptr & ~CPM_BRG_EXTC_MASK) |
-                ((extc << CPM_BRG_EXTC_SHIFT) & CPM_BRG_EXTC_MASK);
+		((extc << CPM_BRG_EXTC_SHIFT) & CPM_BRG_EXTC_MASK);
 }
 
 uint Daq_BRG_Rate(uint brg)
@@ -266,15 +266,15 @@
      brg_ptr = (uint *)&immr->im_brgc1;
      brg_ptr += brg;
      if (brg >= 5) {
-         brg_ptr = (uint *)&immr->im_brgc5;
-         brg_ptr += (brg - 4);
+	 brg_ptr = (uint *)&immr->im_brgc5;
+	 brg_ptr += (brg - 4);
      }
 
     brg_cnt = Daq_BRG_Get_Count(brg);
 
     switch (Daq_BRG_Get_ExtClk(brg)) {
-        case CPM_BRG_EXTC_CLK3:
-        case CPM_BRG_EXTC_CLK5: {
+	case CPM_BRG_EXTC_CLK3:
+	case CPM_BRG_EXTC_CLK5: {
 	    brg_freq = brg_cnt;
 	    break;
 	}
@@ -298,7 +298,7 @@
     DECLARE_GLOBAL_DATA_PTR;
     volatile ioport_t *iopa = ioport_addr((immap_t *)CFG_IMMR, 0 /* port A */);
     uint mclk_divisor; /* MCLK divisor */
-    int  flag;         /* Interrupt state */ 
+    int  flag;         /* Interrupt state */
 
     /* Save off the clocking data */
     Daq64xSampling = sample_64x;
@@ -307,10 +307,10 @@
      * Limit the sample rate to some sensible values.
      */
     if (sample_rate > MAX_64x_SAMPLE_RATE) {
-        sample_rate = MAX_64x_SAMPLE_RATE;	
+	sample_rate = MAX_64x_SAMPLE_RATE;
     }
     if (sample_rate < MIN_SAMPLE_RATE) {
-        sample_rate = MIN_SAMPLE_RATE;	
+	sample_rate = MIN_SAMPLE_RATE;
     }
 
     /*
@@ -322,16 +322,16 @@
 
     /* Setup SCLK */
 #   ifdef RUN_SCLK_ON_BRG_INT
-        Daq_BRG_Set_ExtClk(SCLK_BRG, CPM_BRG_EXTC_BRGCLK);
+	Daq_BRG_Set_ExtClk(SCLK_BRG, CPM_BRG_EXTC_BRGCLK);
 #   else
-        Daq_BRG_Set_ExtClk(SCLK_BRG, CPM_BRG_EXTC_CLK9);
+	Daq_BRG_Set_ExtClk(SCLK_BRG, CPM_BRG_EXTC_CLK9);
 #   endif
 
     /* Setup LRCLK */
 #   ifdef RUN_LRCLK_ON_BRG_INT
-        Daq_BRG_Set_ExtClk(LRCLK_BRG, CPM_BRG_EXTC_BRGCLK);
+	Daq_BRG_Set_ExtClk(LRCLK_BRG, CPM_BRG_EXTC_BRGCLK);
 #   else
-        Daq_BRG_Set_ExtClk(LRCLK_BRG, CPM_BRG_EXTC_CLK5);
+	Daq_BRG_Set_ExtClk(LRCLK_BRG, CPM_BRG_EXTC_CLK5);
 #   endif
 
     /*
@@ -357,7 +357,7 @@
 #   endif
 
 #   ifdef RUN_LRCLK_ON_BRG_INT
-	Daq_BRG_Set_Count(LRCLK_BRG, 
+	Daq_BRG_Set_Count(LRCLK_BRG,
 			  mclk_divisor * MCLK_DIVISOR * SCLK_DIVISOR);
 #   else
 	Daq_BRG_Set_Count(LRCLK_BRG, SCLK_DIVISOR);
@@ -367,7 +367,7 @@
      * Restore the Interrupt state
      */
      if (flag) {
-         enable_interrupts();
+	 enable_interrupts();
      }
 
     /* Enable the clock drivers */
@@ -386,276 +386,276 @@
 #endif
 
 #   ifdef TIGHTEN_UP_BRG_TIMING
-        /* 
-         * Obtain MCLK BRG reset/disabled value
-         */
+	/*
+	 * Obtain MCLK BRG reset/disabled value
+	 */
 #       if (MCLK_BRG == 0)
-            mclk_brg = (*IM_BRGC1 | CPM_BRG_RST) & ~CPM_BRG_EN;
+	    mclk_brg = (*IM_BRGC1 | CPM_BRG_RST) & ~CPM_BRG_EN;
 #       endif
 #       if (MCLK_BRG == 1)
-            mclk_brg = (*IM_BRGC2 | CPM_BRG_RST) & ~CPM_BRG_EN;
+	    mclk_brg = (*IM_BRGC2 | CPM_BRG_RST) & ~CPM_BRG_EN;
 #       endif
 #       if (MCLK_BRG == 2)
-            mclk_brg = (*IM_BRGC3 | CPM_BRG_RST) & ~CPM_BRG_EN;
+	    mclk_brg = (*IM_BRGC3 | CPM_BRG_RST) & ~CPM_BRG_EN;
 #       endif
 #       if (MCLK_BRG == 3)
-            mclk_brg = (*IM_BRGC4 | CPM_BRG_RST) & ~CPM_BRG_EN;
+	    mclk_brg = (*IM_BRGC4 | CPM_BRG_RST) & ~CPM_BRG_EN;
 #       endif
 #       if (MCLK_BRG == 4)
-            mclk_brg = (*IM_BRGC5 | CPM_BRG_RST) & ~CPM_BRG_EN;
+	    mclk_brg = (*IM_BRGC5 | CPM_BRG_RST) & ~CPM_BRG_EN;
 #       endif
 #       if (MCLK_BRG == 5)
-            mclk_brg = (*IM_BRGC6 | CPM_BRG_RST) & ~CPM_BRG_EN;
+	    mclk_brg = (*IM_BRGC6 | CPM_BRG_RST) & ~CPM_BRG_EN;
 #       endif
 #       if (MCLK_BRG == 6)
-            mclk_brg = (*IM_BRGC7 | CPM_BRG_RST) & ~CPM_BRG_EN;
+	    mclk_brg = (*IM_BRGC7 | CPM_BRG_RST) & ~CPM_BRG_EN;
 #       endif
 #       if (MCLK_BRG == 7)
-            mclk_brg = (*IM_BRGC8 | CPM_BRG_RST) & ~CPM_BRG_EN;
+	    mclk_brg = (*IM_BRGC8 | CPM_BRG_RST) & ~CPM_BRG_EN;
 #       endif
 
-        /* 
-         * Obtain SCLK BRG reset/disabled value
-         */
+	/*
+	 * Obtain SCLK BRG reset/disabled value
+	 */
 #       if (SCLK_BRG == 0)
-            sclk_brg = (*IM_BRGC1 | CPM_BRG_RST) & ~CPM_BRG_EN;
+	    sclk_brg = (*IM_BRGC1 | CPM_BRG_RST) & ~CPM_BRG_EN;
 #       endif
 #       if (SCLK_BRG == 1)
-            sclk_brg = (*IM_BRGC2 | CPM_BRG_RST) & ~CPM_BRG_EN;
+	    sclk_brg = (*IM_BRGC2 | CPM_BRG_RST) & ~CPM_BRG_EN;
 #       endif
 #       if (SCLK_BRG == 2)
-            sclk_brg = (*IM_BRGC3 | CPM_BRG_RST) & ~CPM_BRG_EN;
+	    sclk_brg = (*IM_BRGC3 | CPM_BRG_RST) & ~CPM_BRG_EN;
 #       endif
 #       if (SCLK_BRG == 3)
-            sclk_brg = (*IM_BRGC4 | CPM_BRG_RST) & ~CPM_BRG_EN;
+	    sclk_brg = (*IM_BRGC4 | CPM_BRG_RST) & ~CPM_BRG_EN;
 #       endif
 #       if (SCLK_BRG == 4)
-            sclk_brg = (*IM_BRGC5 | CPM_BRG_RST) & ~CPM_BRG_EN;
+	    sclk_brg = (*IM_BRGC5 | CPM_BRG_RST) & ~CPM_BRG_EN;
 #       endif
 #       if (SCLK_BRG == 5)
-            sclk_brg = (*IM_BRGC6 | CPM_BRG_RST) & ~CPM_BRG_EN;
+	    sclk_brg = (*IM_BRGC6 | CPM_BRG_RST) & ~CPM_BRG_EN;
 #       endif
 #       if (SCLK_BRG == 6)
-            sclk_brg = (*IM_BRGC7 | CPM_BRG_RST) & ~CPM_BRG_EN;
+	    sclk_brg = (*IM_BRGC7 | CPM_BRG_RST) & ~CPM_BRG_EN;
 #       endif
 #       if (SCLK_BRG == 7)
-            sclk_brg = (*IM_BRGC8 | CPM_BRG_RST) & ~CPM_BRG_EN;
+	    sclk_brg = (*IM_BRGC8 | CPM_BRG_RST) & ~CPM_BRG_EN;
 #       endif
 
-        /* 
-         * Obtain LRCLK BRG reset/disabled value
-         */
+	/*
+	 * Obtain LRCLK BRG reset/disabled value
+	 */
 #       if (LRCLK_BRG == 0)
-            lrclk_brg = (*IM_BRGC1 | CPM_BRG_RST) & ~CPM_BRG_EN;
+	    lrclk_brg = (*IM_BRGC1 | CPM_BRG_RST) & ~CPM_BRG_EN;
 #       endif
 #       if (LRCLK_BRG == 1)
-            lrclk_brg = (*IM_BRGC2 | CPM_BRG_RST) & ~CPM_BRG_EN;
+	    lrclk_brg = (*IM_BRGC2 | CPM_BRG_RST) & ~CPM_BRG_EN;
 #       endif
 #       if (LRCLK_BRG == 2)
-            lrclk_brg = (*IM_BRGC3 | CPM_BRG_RST) & ~CPM_BRG_EN;
+	    lrclk_brg = (*IM_BRGC3 | CPM_BRG_RST) & ~CPM_BRG_EN;
 #       endif
 #       if (LRCLK_BRG == 3)
-            lrclk_brg = (*IM_BRGC4 | CPM_BRG_RST) & ~CPM_BRG_EN;
+	    lrclk_brg = (*IM_BRGC4 | CPM_BRG_RST) & ~CPM_BRG_EN;
 #       endif
 #       if (LRCLK_BRG == 4)
-            lrclk_brg = (*IM_BRGC5 | CPM_BRG_RST) & ~CPM_BRG_EN;
+	    lrclk_brg = (*IM_BRGC5 | CPM_BRG_RST) & ~CPM_BRG_EN;
 #       endif
 #       if (LRCLK_BRG == 5)
-            lrclk_brg = (*IM_BRGC6 | CPM_BRG_RST) & ~CPM_BRG_EN;
+	    lrclk_brg = (*IM_BRGC6 | CPM_BRG_RST) & ~CPM_BRG_EN;
 #       endif
 #       if (LRCLK_BRG == 6)
-            lrclk_brg = (*IM_BRGC7 | CPM_BRG_RST) & ~CPM_BRG_EN;
+	    lrclk_brg = (*IM_BRGC7 | CPM_BRG_RST) & ~CPM_BRG_EN;
 #       endif
 #       if (LRCLK_BRG == 7)
-            lrclk_brg = (*IM_BRGC8 | CPM_BRG_RST) & ~CPM_BRG_EN;
+	    lrclk_brg = (*IM_BRGC8 | CPM_BRG_RST) & ~CPM_BRG_EN;
 #       endif
-	
+
 	/*
 	 * Disable interrupt and save the current state
 	 */
 	flag = disable_interrupts();
 
-        /* 
-         * Set reset on MCLK BRG
-         */
+	/*
+	 * Set reset on MCLK BRG
+	 */
 #       if (MCLK_BRG == 0)
-            *IM_BRGC1 = mclk_brg;
+	    *IM_BRGC1 = mclk_brg;
 #       endif
 #       if (MCLK_BRG == 1)
-            *IM_BRGC2 = mclk_brg;
+	    *IM_BRGC2 = mclk_brg;
 #       endif
 #       if (MCLK_BRG == 2)
-            *IM_BRGC3 = mclk_brg;
+	    *IM_BRGC3 = mclk_brg;
 #       endif
 #       if (MCLK_BRG == 3)
-            *IM_BRGC4 = mclk_brg;
+	    *IM_BRGC4 = mclk_brg;
 #       endif
 #       if (MCLK_BRG == 4)
-            *IM_BRGC5 = mclk_brg;
+	    *IM_BRGC5 = mclk_brg;
 #       endif
 #       if (MCLK_BRG == 5)
-            *IM_BRGC6 = mclk_brg;
+	    *IM_BRGC6 = mclk_brg;
 #       endif
 #       if (MCLK_BRG == 6)
-            *IM_BRGC7 = mclk_brg;
+	    *IM_BRGC7 = mclk_brg;
 #       endif
 #       if (MCLK_BRG == 7)
-            *IM_BRGC8 = mclk_brg;
+	    *IM_BRGC8 = mclk_brg;
 #       endif
 
-        /* 
-         * Set reset on SCLK BRG
-         */
+	/*
+	 * Set reset on SCLK BRG
+	 */
 #       if (SCLK_BRG == 0)
-            *IM_BRGC1 = sclk_brg;
+	    *IM_BRGC1 = sclk_brg;
 #       endif
 #       if (SCLK_BRG == 1)
-            *IM_BRGC2 = sclk_brg;
+	    *IM_BRGC2 = sclk_brg;
 #       endif
 #       if (SCLK_BRG == 2)
-            *IM_BRGC3 = sclk_brg;
+	    *IM_BRGC3 = sclk_brg;
 #       endif
 #       if (SCLK_BRG == 3)
-            *IM_BRGC4 = sclk_brg;
+	    *IM_BRGC4 = sclk_brg;
 #       endif
 #       if (SCLK_BRG == 4)
-            *IM_BRGC5 = sclk_brg;
+	    *IM_BRGC5 = sclk_brg;
 #       endif
 #       if (SCLK_BRG == 5)
-            *IM_BRGC6 = sclk_brg;
+	    *IM_BRGC6 = sclk_brg;
 #       endif
 #       if (SCLK_BRG == 6)
-            *IM_BRGC7 = sclk_brg;
+	    *IM_BRGC7 = sclk_brg;
 #       endif
 #       if (SCLK_BRG == 7)
-            *IM_BRGC8 = sclk_brg;
+	    *IM_BRGC8 = sclk_brg;
 #       endif
 
-        /* 
-         * Set reset on LRCLK BRG
-         */
+	/*
+	 * Set reset on LRCLK BRG
+	 */
 #       if (LRCLK_BRG == 0)
-            *IM_BRGC1 = lrclk_brg;
+	    *IM_BRGC1 = lrclk_brg;
 #       endif
 #       if (LRCLK_BRG == 1)
-            *IM_BRGC2 = lrclk_brg;
+	    *IM_BRGC2 = lrclk_brg;
 #       endif
 #       if (LRCLK_BRG == 2)
-            *IM_BRGC3 = lrclk_brg;
+	    *IM_BRGC3 = lrclk_brg;
 #       endif
 #       if (LRCLK_BRG == 3)
-            *IM_BRGC4 = lrclk_brg;
+	    *IM_BRGC4 = lrclk_brg;
 #       endif
 #       if (LRCLK_BRG == 4)
-            *IM_BRGC5 = lrclk_brg;
+	    *IM_BRGC5 = lrclk_brg;
 #       endif
 #       if (LRCLK_BRG == 5)
-            *IM_BRGC6 = lrclk_brg;
+	    *IM_BRGC6 = lrclk_brg;
 #       endif
 #       if (LRCLK_BRG == 6)
-            *IM_BRGC7 = lrclk_brg;
+	    *IM_BRGC7 = lrclk_brg;
 #       endif
 #       if (LRCLK_BRG == 7)
-            *IM_BRGC8 = lrclk_brg;
+	    *IM_BRGC8 = lrclk_brg;
 #       endif
-	
-        /* 
-         * Clear reset on MCLK BRG
-         */
+
+	/*
+	 * Clear reset on MCLK BRG
+	 */
 #       if (MCLK_BRG == 0)
-            *IM_BRGC1 = mclk_brg & ~CPM_BRG_RST;
+	    *IM_BRGC1 = mclk_brg & ~CPM_BRG_RST;
 #       endif
 #       if (MCLK_BRG == 1)
-            *IM_BRGC2 = mclk_brg & ~CPM_BRG_RST;
+	    *IM_BRGC2 = mclk_brg & ~CPM_BRG_RST;
 #       endif
 #       if (MCLK_BRG == 2)
-            *IM_BRGC3 = mclk_brg & ~CPM_BRG_RST;
+	    *IM_BRGC3 = mclk_brg & ~CPM_BRG_RST;
 #       endif
 #       if (MCLK_BRG == 3)
-            *IM_BRGC4 = mclk_brg & ~CPM_BRG_RST;
+	    *IM_BRGC4 = mclk_brg & ~CPM_BRG_RST;
 #       endif
 #       if (MCLK_BRG == 4)
-            *IM_BRGC5 = mclk_brg & ~CPM_BRG_RST;
+	    *IM_BRGC5 = mclk_brg & ~CPM_BRG_RST;
 #       endif
 #       if (MCLK_BRG == 5)
-            *IM_BRGC6 = mclk_brg & ~CPM_BRG_RST;
+	    *IM_BRGC6 = mclk_brg & ~CPM_BRG_RST;
 #       endif
 #       if (MCLK_BRG == 6)
-            *IM_BRGC7 = mclk_brg & ~CPM_BRG_RST;
+	    *IM_BRGC7 = mclk_brg & ~CPM_BRG_RST;
 #       endif
 #       if (MCLK_BRG == 7)
-            *IM_BRGC8 = mclk_brg & ~CPM_BRG_RST;
+	    *IM_BRGC8 = mclk_brg & ~CPM_BRG_RST;
 #       endif
 
-        /* 
-         * Clear reset on SCLK BRG
-         */
+	/*
+	 * Clear reset on SCLK BRG
+	 */
 #       if (SCLK_BRG == 0)
-            *IM_BRGC1 = sclk_brg & ~CPM_BRG_RST;
+	    *IM_BRGC1 = sclk_brg & ~CPM_BRG_RST;
 #       endif
 #       if (SCLK_BRG == 1)
-            *IM_BRGC2 = sclk_brg & ~CPM_BRG_RST;
+	    *IM_BRGC2 = sclk_brg & ~CPM_BRG_RST;
 #       endif
 #       if (SCLK_BRG == 2)
-            *IM_BRGC3 = sclk_brg & ~CPM_BRG_RST;
+	    *IM_BRGC3 = sclk_brg & ~CPM_BRG_RST;
 #       endif
 #       if (SCLK_BRG == 3)
-            *IM_BRGC4 = sclk_brg & ~CPM_BRG_RST;
+	    *IM_BRGC4 = sclk_brg & ~CPM_BRG_RST;
 #       endif
 #       if (SCLK_BRG == 4)
-            *IM_BRGC5 = sclk_brg & ~CPM_BRG_RST;
+	    *IM_BRGC5 = sclk_brg & ~CPM_BRG_RST;
 #       endif
 #       if (SCLK_BRG == 5)
-            *IM_BRGC6 = sclk_brg & ~CPM_BRG_RST;
+	    *IM_BRGC6 = sclk_brg & ~CPM_BRG_RST;
 #       endif
 #       if (SCLK_BRG == 6)
-            *IM_BRGC7 = sclk_brg & ~CPM_BRG_RST;
+	    *IM_BRGC7 = sclk_brg & ~CPM_BRG_RST;
 #       endif
 #       if (SCLK_BRG == 7)
-            *IM_BRGC8 = sclk_brg & ~CPM_BRG_RST;
+	    *IM_BRGC8 = sclk_brg & ~CPM_BRG_RST;
 #       endif
 
-        /* 
-         * Clear reset on LRCLK BRG
-         */
+	/*
+	 * Clear reset on LRCLK BRG
+	 */
 #       if (LRCLK_BRG == 0)
-            *IM_BRGC1 = lrclk_brg & ~CPM_BRG_RST;
+	    *IM_BRGC1 = lrclk_brg & ~CPM_BRG_RST;
 #       endif
 #       if (LRCLK_BRG == 1)
-            *IM_BRGC2 = lrclk_brg & ~CPM_BRG_RST;
+	    *IM_BRGC2 = lrclk_brg & ~CPM_BRG_RST;
 #       endif
 #       if (LRCLK_BRG == 2)
-            *IM_BRGC3 = lrclk_brg & ~CPM_BRG_RST;
+	    *IM_BRGC3 = lrclk_brg & ~CPM_BRG_RST;
 #       endif
 #       if (LRCLK_BRG == 3)
-            *IM_BRGC4 = lrclk_brg & ~CPM_BRG_RST;
+	    *IM_BRGC4 = lrclk_brg & ~CPM_BRG_RST;
 #       endif
 #       if (LRCLK_BRG == 4)
-            *IM_BRGC5 = lrclk_brg & ~CPM_BRG_RST;
+	    *IM_BRGC5 = lrclk_brg & ~CPM_BRG_RST;
 #       endif
 #       if (LRCLK_BRG == 5)
-            *IM_BRGC6 = lrclk_brg & ~CPM_BRG_RST;
+	    *IM_BRGC6 = lrclk_brg & ~CPM_BRG_RST;
 #       endif
 #       if (LRCLK_BRG == 6)
-            *IM_BRGC7 = lrclk_brg & ~CPM_BRG_RST;
+	    *IM_BRGC7 = lrclk_brg & ~CPM_BRG_RST;
 #       endif
 #       if (LRCLK_BRG == 7)
-            *IM_BRGC8 = lrclk_brg & ~CPM_BRG_RST;
+	    *IM_BRGC8 = lrclk_brg & ~CPM_BRG_RST;
 #       endif
-	
+
 	/*
 	 * Restore the Interrupt state
 	 */
 	if (flag) {
-            enable_interrupts();
+	    enable_interrupts();
 	}
 #   else
-        /*
-         * Reset the clocks
-         */
-        Daq_BRG_Reset(MCLK_BRG);
-        Daq_BRG_Reset(SCLK_BRG);
-        Daq_BRG_Reset(LRCLK_BRG);
+	/*
+	 * Reset the clocks
+	 */
+	Daq_BRG_Reset(MCLK_BRG);
+	Daq_BRG_Reset(SCLK_BRG);
+	Daq_BRG_Reset(LRCLK_BRG);
 #   endif
 }
 
@@ -676,88 +676,88 @@
 #endif
 
 #   ifdef TIGHTEN_UP_BRG_TIMING
-        /* 
-         * Obtain the enabled MCLK BRG value
-         */
+	/*
+	 * Obtain the enabled MCLK BRG value
+	 */
 #       if (MCLK_BRG == 0)
-            mclk_brg = (*IM_BRGC1 & ~CPM_BRG_RST) | CPM_BRG_EN;
+	    mclk_brg = (*IM_BRGC1 & ~CPM_BRG_RST) | CPM_BRG_EN;
 #       endif
 #       if (MCLK_BRG == 1)
-            mclk_brg = (*IM_BRGC2 & ~CPM_BRG_RST) | CPM_BRG_EN;
+	    mclk_brg = (*IM_BRGC2 & ~CPM_BRG_RST) | CPM_BRG_EN;
 #       endif
 #       if (MCLK_BRG == 2)
-            mclk_brg = (*IM_BRGC3 & ~CPM_BRG_RST) | CPM_BRG_EN;
+	    mclk_brg = (*IM_BRGC3 & ~CPM_BRG_RST) | CPM_BRG_EN;
 #       endif
 #       if (MCLK_BRG == 3)
-            mclk_brg = (*IM_BRGC4 & ~CPM_BRG_RST) | CPM_BRG_EN;
+	    mclk_brg = (*IM_BRGC4 & ~CPM_BRG_RST) | CPM_BRG_EN;
 #       endif
 #       if (MCLK_BRG == 4)
-            mclk_brg = (*IM_BRGC5 & ~CPM_BRG_RST) | CPM_BRG_EN;
+	    mclk_brg = (*IM_BRGC5 & ~CPM_BRG_RST) | CPM_BRG_EN;
 #       endif
 #       if (MCLK_BRG == 5)
-            mclk_brg = (*IM_BRGC6 & ~CPM_BRG_RST) | CPM_BRG_EN;
+	    mclk_brg = (*IM_BRGC6 & ~CPM_BRG_RST) | CPM_BRG_EN;
 #       endif
 #       if (MCLK_BRG == 6)
-            mclk_brg = (*IM_BRGC7 & ~CPM_BRG_RST) | CPM_BRG_EN;
+	    mclk_brg = (*IM_BRGC7 & ~CPM_BRG_RST) | CPM_BRG_EN;
 #       endif
 #       if (MCLK_BRG == 7)
-            mclk_brg = (*IM_BRGC8 & ~CPM_BRG_RST) | CPM_BRG_EN;
+	    mclk_brg = (*IM_BRGC8 & ~CPM_BRG_RST) | CPM_BRG_EN;
 #       endif
 
-        /* 
-         * Obtain the enabled SCLK BRG value
-         */
+	/*
+	 * Obtain the enabled SCLK BRG value
+	 */
 #       if (SCLK_BRG == 0)
-            sclk_brg = (*IM_BRGC1 & ~CPM_BRG_RST) | CPM_BRG_EN;
+	    sclk_brg = (*IM_BRGC1 & ~CPM_BRG_RST) | CPM_BRG_EN;
 #       endif
 #       if (SCLK_BRG == 1)
-            sclk_brg = (*IM_BRGC2 & ~CPM_BRG_RST) | CPM_BRG_EN;
+	    sclk_brg = (*IM_BRGC2 & ~CPM_BRG_RST) | CPM_BRG_EN;
 #       endif
 #       if (SCLK_BRG == 2)
-            sclk_brg = (*IM_BRGC3 & ~CPM_BRG_RST) | CPM_BRG_EN;
+	    sclk_brg = (*IM_BRGC3 & ~CPM_BRG_RST) | CPM_BRG_EN;
 #       endif
 #       if (SCLK_BRG == 3)
-            sclk_brg = (*IM_BRGC4 & ~CPM_BRG_RST) | CPM_BRG_EN;
+	    sclk_brg = (*IM_BRGC4 & ~CPM_BRG_RST) | CPM_BRG_EN;
 #       endif
 #       if (SCLK_BRG == 4)
-            sclk_brg = (*IM_BRGC5 & ~CPM_BRG_RST) | CPM_BRG_EN;
+	    sclk_brg = (*IM_BRGC5 & ~CPM_BRG_RST) | CPM_BRG_EN;
 #       endif
 #       if (SCLK_BRG == 5)
-            sclk_brg = (*IM_BRGC6 & ~CPM_BRG_RST) | CPM_BRG_EN;
+	    sclk_brg = (*IM_BRGC6 & ~CPM_BRG_RST) | CPM_BRG_EN;
 #       endif
 #       if (SCLK_BRG == 6)
-            sclk_brg = (*IM_BRGC7 & ~CPM_BRG_RST) | CPM_BRG_EN;
+	    sclk_brg = (*IM_BRGC7 & ~CPM_BRG_RST) | CPM_BRG_EN;
 #       endif
 #       if (SCLK_BRG == 7)
-            sclk_brg = (*IM_BRGC8 & ~CPM_BRG_RST) | CPM_BRG_EN;
+	    sclk_brg = (*IM_BRGC8 & ~CPM_BRG_RST) | CPM_BRG_EN;
 #       endif
 
-        /* 
-         * Obtain the enabled LRCLK BRG value
-         */
+	/*
+	 * Obtain the enabled LRCLK BRG value
+	 */
 #       if (LRCLK_BRG == 0)
-            lrclk_brg = (*IM_BRGC1 & ~CPM_BRG_RST) | CPM_BRG_EN;
+	    lrclk_brg = (*IM_BRGC1 & ~CPM_BRG_RST) | CPM_BRG_EN;
 #       endif
 #       if (LRCLK_BRG == 1)
-            lrclk_brg = (*IM_BRGC2 & ~CPM_BRG_RST) | CPM_BRG_EN;
+	    lrclk_brg = (*IM_BRGC2 & ~CPM_BRG_RST) | CPM_BRG_EN;
 #       endif
 #       if (LRCLK_BRG == 2)
-            lrclk_brg = (*IM_BRGC3 & ~CPM_BRG_RST) | CPM_BRG_EN;
+	    lrclk_brg = (*IM_BRGC3 & ~CPM_BRG_RST) | CPM_BRG_EN;
 #       endif
 #       if (LRCLK_BRG == 3)
-            lrclk_brg = (*IM_BRGC4 & ~CPM_BRG_RST) | CPM_BRG_EN;
+	    lrclk_brg = (*IM_BRGC4 & ~CPM_BRG_RST) | CPM_BRG_EN;
 #       endif
 #       if (LRCLK_BRG == 4)
-            lrclk_brg = (*IM_BRGC5 & ~CPM_BRG_RST) | CPM_BRG_EN;
+	    lrclk_brg = (*IM_BRGC5 & ~CPM_BRG_RST) | CPM_BRG_EN;
 #       endif
 #       if (LRCLK_BRG == 5)
-            lrclk_brg = (*IM_BRGC6 & ~CPM_BRG_RST) | CPM_BRG_EN;
+	    lrclk_brg = (*IM_BRGC6 & ~CPM_BRG_RST) | CPM_BRG_EN;
 #       endif
 #       if (LRCLK_BRG == 6)
-            lrclk_brg = (*IM_BRGC7 & ~CPM_BRG_RST) | CPM_BRG_EN;
+	    lrclk_brg = (*IM_BRGC7 & ~CPM_BRG_RST) | CPM_BRG_EN;
 #       endif
 #       if (LRCLK_BRG == 7)
-            lrclk_brg = (*IM_BRGC8 & ~CPM_BRG_RST) | CPM_BRG_EN;
+	    lrclk_brg = (*IM_BRGC8 & ~CPM_BRG_RST) | CPM_BRG_EN;
 #       endif
 
 	/* Save off the real LRCLK value */
@@ -767,15 +767,15 @@
 	sclk_cnt  = ((sclk_brg & 0x00001FFE) >> 1) + 1;
 
 	/* Compute the delay as a function of SCLK count */
-        delay_cnt = ((sclk_cnt / 4) - 2) * 10 + 6;
+	delay_cnt = ((sclk_cnt / 4) - 2) * 10 + 6;
 	if (DaqSampleRate == 43402) {
 	  delay_cnt++;
 	}
 
-        /* Clear out the count */
+	/* Clear out the count */
 	temp_lrclk_brg = sclk_brg & ~0x00001FFE;
 
-        /* Insert the count */
+	/* Insert the count */
 	temp_lrclk_brg |= ((delay_cnt + (sclk_cnt / 2) - 1) << 1) &  0x00001FFE;
 
 	/*
@@ -783,116 +783,116 @@
 	 */
 	flag = disable_interrupts();
 
-        /* 
-         * Enable MCLK BRG
-         */
+	/*
+	 * Enable MCLK BRG
+	 */
 #       if (MCLK_BRG == 0)
-            *IM_BRGC1 = mclk_brg;
+	    *IM_BRGC1 = mclk_brg;
 #       endif
 #       if (MCLK_BRG == 1)
-            *IM_BRGC2 = mclk_brg;
+	    *IM_BRGC2 = mclk_brg;
 #       endif
 #       if (MCLK_BRG == 2)
-            *IM_BRGC3 = mclk_brg;
+	    *IM_BRGC3 = mclk_brg;
 #       endif
 #       if (MCLK_BRG == 3)
-            *IM_BRGC4 = mclk_brg;
+	    *IM_BRGC4 = mclk_brg;
 #       endif
 #       if (MCLK_BRG == 4)
-            *IM_BRGC5 = mclk_brg;
+	    *IM_BRGC5 = mclk_brg;
 #       endif
 #       if (MCLK_BRG == 5)
-            *IM_BRGC6 = mclk_brg;
+	    *IM_BRGC6 = mclk_brg;
 #       endif
 #       if (MCLK_BRG == 6)
-            *IM_BRGC7 = mclk_brg;
+	    *IM_BRGC7 = mclk_brg;
 #       endif
 #       if (MCLK_BRG == 7)
-            *IM_BRGC8 = mclk_brg;
+	    *IM_BRGC8 = mclk_brg;
 #       endif
 
-        /* 
-         * Enable SCLK BRG
-         */
+	/*
+	 * Enable SCLK BRG
+	 */
 #       if (SCLK_BRG == 0)
-            *IM_BRGC1 = sclk_brg;
+	    *IM_BRGC1 = sclk_brg;
 #       endif
 #       if (SCLK_BRG == 1)
-            *IM_BRGC2 = sclk_brg;
+	    *IM_BRGC2 = sclk_brg;
 #       endif
 #       if (SCLK_BRG == 2)
-            *IM_BRGC3 = sclk_brg;
+	    *IM_BRGC3 = sclk_brg;
 #       endif
 #       if (SCLK_BRG == 3)
-            *IM_BRGC4 = sclk_brg;
+	    *IM_BRGC4 = sclk_brg;
 #       endif
 #       if (SCLK_BRG == 4)
-            *IM_BRGC5 = sclk_brg;
+	    *IM_BRGC5 = sclk_brg;
 #       endif
 #       if (SCLK_BRG == 5)
-            *IM_BRGC6 = sclk_brg;
+	    *IM_BRGC6 = sclk_brg;
 #       endif
 #       if (SCLK_BRG == 6)
-            *IM_BRGC7 = sclk_brg;
+	    *IM_BRGC7 = sclk_brg;
 #       endif
 #       if (SCLK_BRG == 7)
-            *IM_BRGC8 = sclk_brg;
+	    *IM_BRGC8 = sclk_brg;
 #       endif
 
-        /* 
-         * Enable LRCLK BRG (1st time - temporary)
-         */
+	/*
+	 * Enable LRCLK BRG (1st time - temporary)
+	 */
 #       if (LRCLK_BRG == 0)
-            *IM_BRGC1 = temp_lrclk_brg;
+	    *IM_BRGC1 = temp_lrclk_brg;
 #       endif
 #       if (LRCLK_BRG == 1)
-            *IM_BRGC2 = temp_lrclk_brg;
+	    *IM_BRGC2 = temp_lrclk_brg;
 #       endif
 #       if (LRCLK_BRG == 2)
-            *IM_BRGC3 = temp_lrclk_brg;
+	    *IM_BRGC3 = temp_lrclk_brg;
 #       endif
 #       if (LRCLK_BRG == 3)
-            *IM_BRGC4 = temp_lrclk_brg;
+	    *IM_BRGC4 = temp_lrclk_brg;
 #       endif
 #       if (LRCLK_BRG == 4)
-            *IM_BRGC5 = temp_lrclk_brg;
+	    *IM_BRGC5 = temp_lrclk_brg;
 #       endif
 #       if (LRCLK_BRG == 5)
-            *IM_BRGC6 = temp_lrclk_brg;
+	    *IM_BRGC6 = temp_lrclk_brg;
 #       endif
 #       if (LRCLK_BRG == 6)
-            *IM_BRGC7 = temp_lrclk_brg;
+	    *IM_BRGC7 = temp_lrclk_brg;
 #       endif
 #       if (LRCLK_BRG == 7)
-            *IM_BRGC8 = temp_lrclk_brg;
+	    *IM_BRGC8 = temp_lrclk_brg;
 #       endif
-	
-        /* 
-         * Enable LRCLK BRG (2nd time - permanent)
-         */
+
+	/*
+	 * Enable LRCLK BRG (2nd time - permanent)
+	 */
 #       if (LRCLK_BRG == 0)
-            *IM_BRGC1 = real_lrclk_brg;
+	    *IM_BRGC1 = real_lrclk_brg;
 #       endif
 #       if (LRCLK_BRG == 1)
-            *IM_BRGC2 = real_lrclk_brg;
+	    *IM_BRGC2 = real_lrclk_brg;
 #       endif
 #       if (LRCLK_BRG == 2)
-            *IM_BRGC3 = real_lrclk_brg;
+	    *IM_BRGC3 = real_lrclk_brg;
 #       endif
 #       if (LRCLK_BRG == 3)
-            *IM_BRGC4 = real_lrclk_brg;
+	    *IM_BRGC4 = real_lrclk_brg;
 #       endif
 #       if (LRCLK_BRG == 4)
-            *IM_BRGC5 = real_lrclk_brg;
+	    *IM_BRGC5 = real_lrclk_brg;
 #       endif
 #       if (LRCLK_BRG == 5)
-            *IM_BRGC6 = real_lrclk_brg;
+	    *IM_BRGC6 = real_lrclk_brg;
 #       endif
 #       if (LRCLK_BRG == 6)
-            *IM_BRGC7 = real_lrclk_brg;
+	    *IM_BRGC7 = real_lrclk_brg;
 #       endif
 #       if (LRCLK_BRG == 7)
-            *IM_BRGC8 = real_lrclk_brg;
+	    *IM_BRGC8 = real_lrclk_brg;
 #       endif
 
 	/*
@@ -900,14 +900,14 @@
 	 */
 	if (flag) {
 	    enable_interrupts();
-        }
+	}
 #   else
-        /*
-         * Enable the clocks
-         */
-        Daq_BRG_Enable(LRCLK_BRG);
-        Daq_BRG_Enable(SCLK_BRG);
-        Daq_BRG_Enable(MCLK_BRG);
+	/*
+	 * Enable the clocks
+	 */
+	Daq_BRG_Enable(LRCLK_BRG);
+	Daq_BRG_Enable(SCLK_BRG);
+	Daq_BRG_Enable(MCLK_BRG);
 #   endif
 }
 
@@ -920,7 +920,7 @@
 
     printf("\nBRG:\n");
     if (immr->im_brgc4 != 0) {
-        printf("\tbrgc4\t0x%08x @ 0x%08x, %5d count, %d extc, %8s,  MCLK\n",
+	printf("\tbrgc4\t0x%08x @ 0x%08x, %5d count, %d extc, %8s,  MCLK\n",
 	       immr->im_brgc4,
 	       (uint)&(immr->im_brgc4),
 	       Daq_BRG_Get_Count(3),
@@ -928,7 +928,7 @@
 	       Daq_BRG_Get_ExtClk_Description(3));
     }
     if (immr->im_brgc8 != 0) {
-        printf("\tbrgc8\t0x%08x @ 0x%08x, %5d count, %d extc, %8s,  SCLK\n",
+	printf("\tbrgc8\t0x%08x @ 0x%08x, %5d count, %d extc, %8s,  SCLK\n",
 	       immr->im_brgc8,
 	       (uint)&(immr->im_brgc8),
 	       Daq_BRG_Get_Count(7),
@@ -936,7 +936,7 @@
 	       Daq_BRG_Get_ExtClk_Description(7));
     }
     if (immr->im_brgc6 != 0) {
-        printf("\tbrgc6\t0x%08x @ 0x%08x, %5d count, %d extc, %8s,  LRCLK\n",
+	printf("\tbrgc6\t0x%08x @ 0x%08x, %5d count, %d extc, %8s,  LRCLK\n",
 	       immr->im_brgc6,
 	       (uint)&(immr->im_brgc6),
 	       Daq_BRG_Get_Count(5),
@@ -944,7 +944,7 @@
 	       Daq_BRG_Get_ExtClk_Description(5));
     }
     if (immr->im_brgc1 != 0) {
-        printf("\tbrgc1\t0x%08x @ 0x%08x, %5d count, %d extc, %8s,  SMC1\n",
+	printf("\tbrgc1\t0x%08x @ 0x%08x, %5d count, %d extc, %8s,  SMC1\n",
 	       immr->im_brgc1,
 	       (uint)&(immr->im_brgc1),
 	       Daq_BRG_Get_Count(0),
@@ -952,7 +952,7 @@
 	       Daq_BRG_Get_ExtClk_Description(0));
     }
     if (immr->im_brgc2 != 0) {
-        printf("\tbrgc2\t0x%08x @ 0x%08x, %5d count, %d extc, %8s,  SMC2\n",
+	printf("\tbrgc2\t0x%08x @ 0x%08x, %5d count, %d extc, %8s,  SMC2\n",
 	       immr->im_brgc2,
 	       (uint)&(immr->im_brgc2),
 	       Daq_BRG_Get_Count(1),
@@ -960,7 +960,7 @@
 	       Daq_BRG_Get_ExtClk_Description(1));
     }
     if (immr->im_brgc3 != 0) {
-        printf("\tbrgc3\t0x%08x @ 0x%08x, %5d count, %d extc, %8s,  SCC1\n",
+	printf("\tbrgc3\t0x%08x @ 0x%08x, %5d count, %d extc, %8s,  SCC1\n",
 	       immr->im_brgc3,
 	       (uint)&(immr->im_brgc3),
 	       Daq_BRG_Get_Count(2),
@@ -968,7 +968,7 @@
 	       Daq_BRG_Get_ExtClk_Description(2));
     }
     if (immr->im_brgc5 != 0) {
-        printf("\tbrgc5\t0x%08x @ 0x%08x, %5d count, %d extc, %8s\n",
+	printf("\tbrgc5\t0x%08x @ 0x%08x, %5d count, %d extc, %8s\n",
 	       immr->im_brgc5,
 	       (uint)&(immr->im_brgc5),
 	       Daq_BRG_Get_Count(4),
@@ -976,7 +976,7 @@
 	       Daq_BRG_Get_ExtClk_Description(4));
     }
     if (immr->im_brgc7 != 0) {
-        printf("\tbrgc7\t0x%08x @ 0x%08x, %5d count, %d extc, %8s\n",
+	printf("\tbrgc7\t0x%08x @ 0x%08x, %5d count, %d extc, %8s\n",
 	       immr->im_brgc7,
 	       (uint)&(immr->im_brgc7),
 	       Daq_BRG_Get_Count(6),
@@ -985,14 +985,14 @@
     }
 
 #   ifdef RUN_SCLK_ON_BRG_INT
-        mclk_divisor = Daq_BRG_Rate(MCLK_BRG) / Daq_BRG_Rate(SCLK_BRG);
+	mclk_divisor = Daq_BRG_Rate(MCLK_BRG) / Daq_BRG_Rate(SCLK_BRG);
 #   else
-        mclk_divisor = Daq_BRG_Get_Count(SCLK_BRG);
+	mclk_divisor = Daq_BRG_Get_Count(SCLK_BRG);
 #   endif
 #   ifdef RUN_LRCLK_ON_BRG_INT
-        sclk_divisor = Daq_BRG_Rate(SCLK_BRG) / Daq_BRG_Rate(LRCLK_BRG);
+	sclk_divisor = Daq_BRG_Rate(SCLK_BRG) / Daq_BRG_Rate(LRCLK_BRG);
 #   else
-        sclk_divisor = Daq_BRG_Get_Count(LRCLK_BRG);
+	sclk_divisor = Daq_BRG_Get_Count(LRCLK_BRG);
 #   endif
 
     printf("\nADC/DAC Clocking (%d/%d):\n", sclk_divisor, mclk_divisor);
@@ -1001,23 +1001,23 @@
 	   mclk_divisor,
 	   mclk_divisor * sclk_divisor);
 #   ifdef RUN_SCLK_ON_BRG_INT
-        printf("\tSCLK  %8d Hz, or %3dx LRCLK\n",
+	printf("\tSCLK  %8d Hz, or %3dx LRCLK\n",
 	       Daq_BRG_Rate(SCLK_BRG),
 	       sclk_divisor);
 #   else
-        printf("\tSCLK  %8d Hz, or %3dx LRCLK\n",
+	printf("\tSCLK  %8d Hz, or %3dx LRCLK\n",
 	       Daq_BRG_Rate(MCLK_BRG) / mclk_divisor,
 	       sclk_divisor);
 #   endif
 #   ifdef RUN_LRCLK_ON_BRG_INT
-        printf("\tLRCLK %8d Hz\n",
+	printf("\tLRCLK %8d Hz\n",
 	       Daq_BRG_Rate(LRCLK_BRG));
 #   else
 #       ifdef RUN_SCLK_ON_BRG_INT
-            printf("\tLRCLK %8d Hz\n",
+	    printf("\tLRCLK %8d Hz\n",
 		   Daq_BRG_Rate(SCLK_BRG) / sclk_divisor);
 #       else
-            printf("\tLRCLK %8d Hz\n",
+	    printf("\tLRCLK %8d Hz\n",
 		   Daq_BRG_Rate(MCLK_BRG) / (mclk_divisor * sclk_divisor));
 #       endif
 #   endif

diff --git a/board/sacsng/clkinit.h b/board/sacsng/clkinit.h
index 2731f2e..011638f 100644
--- a/board/sacsng/clkinit.h
+++ b/board/sacsng/clkinit.h

@@ -50,16 +50,16 @@
 
 #define MCLK_DIVISOR  4       /*  SCLK = MCLK / MCLK_DIVISOR */
 #define SCLK_DIVISOR (Daq64xSampling ? 64 : 128)
-		              /* LRCLK = SCLK / SCLK_DIVISOR */
+			      /* LRCLK = SCLK / SCLK_DIVISOR */
 
 #define TIGHTEN_UP_BRG_EN_TIMING /* Tighten up the BRG enable timing      */
 #define RUN_SCLK_ON_BRG_INT      /* Run SCLK on BRG_INT instead of MCLK   */
-                                 /* The 8260 (Mask B.3) seems to have     */
-                                 /* problems generating SCLK from MCLK    */
+				 /* The 8260 (Mask B.3) seems to have     */
+				 /* problems generating SCLK from MCLK    */
 				 /* via CLK9.                             */
 #define RUN_LRCLK_ON_BRG_INT     /* Run LRCLK on BRG_INT instead of SCLK  */
-                                 /* The 8260 (Mask B.3) seems to have     */
-                                 /* problems generating LRCLK from SCLK   */
+				 /* The 8260 (Mask B.3) seems to have     */
+				 /* problems generating LRCLK from SCLK   */
 
 #define NUM_LRCLKS_TO_STABILIZE 1  /* Number of LRCLK period (sample)     */
 				   /* to wait for the clock to stabilize  */
@@ -67,9 +67,9 @@
 #define CPM_CLK      (gd->bd->bi_cpmfreq)
 #define DFBRG        4
 #define BRG_INT_CLK  (CPM_CLK * 2 / DFBRG)
-                              /* BRG = CPM * 2 / DFBRG (Sect 9.8) */
-                              /* BRG = CPM * 2 / 4                */
-                              /* BRG = CPM / 2                    */
+			      /* BRG = CPM * 2 / DFBRG (Sect 9.8) */
+			      /* BRG = CPM * 2 / 4                */
+			      /* BRG = CPM / 2                    */
 
 #define CPM_BRG_EXTC_MASK	((uint)0x0000C000)
 #define CPM_BRG_EXTC_SHIFT      14

diff --git a/board/sacsng/ioconfig.h b/board/sacsng/ioconfig.h
index 6857f99..be1ce7c 100644
--- a/board/sacsng/ioconfig.h
+++ b/board/sacsng/ioconfig.h

@@ -45,7 +45,7 @@
 
 #define GPIO 0  /* PPARx 0: General Purpose I/O */
 #define SPEC 1  /* PPARx 1: dedicated to a peripheral function, */
-                /*          i.e. the port has a SPECial use. */
+		/*          i.e. the port has a SPECial use. */
 
 #define ACTV 0  /* PODRx 0: ACTiVely driven as an output */
 #define OPEN 1  /* PODRx 1: OPEN-drain driver */
@@ -67,12 +67,12 @@
 	/* PA21 */ { CONF, GPIO,   0,  DOUT, ACTV,   1   }, /* STLED1_EN*     */
 	/* PA20 */ { CONF, GPIO,   0,  DOUT, ACTV,   1   }, /* PLED3_EN*      */
 	/* PA19 */ { CONF, GPIO,   0,  DOUT, ACTV,   1   }, /* PLED2_EN*      */
-        /* PA18 */ { CONF, GPIO,   0,  DOUT, ACTV,   0   }, /* PLED1_EN*      */
+	/* PA18 */ { CONF, GPIO,   0,  DOUT, ACTV,   0   }, /* PLED1_EN*      */
 	/* PA17 */ { CONF, GPIO,   0,  DOUT, ACTV,   0   }, /* N/C            */
 	/* PA16 */ { CONF, GPIO,   0,  DOUT, ACTV,   0   }, /* DAC_RST*       */
 	/* PA15 */ { CONF, GPIO,   0,  DOUT, ACTV,   1   }, /* CH34SDATA_PU   */
-        /* PA14 */ { CONF, GPIO,   0,  DOUT, ACTV,   1   }, /* CH12SDATA_PU   */
-        /* PA13 */ { CONF, GPIO,   0,  DOUT, ACTV,   1   }, /* SLRCLK_EN*     */
+	/* PA14 */ { CONF, GPIO,   0,  DOUT, ACTV,   1   }, /* CH12SDATA_PU   */
+	/* PA13 */ { CONF, GPIO,   0,  DOUT, ACTV,   1   }, /* SLRCLK_EN*     */
 	/* PA12 */ { CONF, GPIO,   0,  DOUT, ACTV,   1   }, /* MTRX_4ACDC*    */
 	/* PA11 */ { CONF, GPIO,   0,  DOUT, ACTV,   1   }, /* MTRX_4TEDS*    */
 	/* PA10 */ { CONF, GPIO,   0,  DOUT, ACTV,   1   }, /* MTRX_4XTDS*    */
@@ -143,7 +143,7 @@
 	/* PC20 */ { CONF, GPIO,   0,  DOUT, ACTV,   0   }, /* N/C            */
 	/* PC19 */ { CONF, SPEC,   0,  DIN,  ACTV,   0   }, /* CLK13, MII_RXCLK  */
 	/* PC18 */ { CONF, SPEC,   0,  DIN,  ACTV,   0   }, /* CLK14, MII_TXCLK  */
-        /* PC17 */ { CONF, SPEC,   0,  DOUT, ACTV,   0   }, /* BRGO8 (SCLK)   */
+	/* PC17 */ { CONF, SPEC,   0,  DOUT, ACTV,   0   }, /* BRGO8 (SCLK)   */
 	/* PC16 */ { CONF, GPIO,   0,  DOUT, ACTV,   0   }, /* N/C            */
 	/* PC15 */ { CONF, SPEC,   0,  DOUT, ACTV,   0   }, /* SMC2_TX        */
 	/* PC14 */ { CONF, GPIO,   0,  DOUT, ACTV,   0   }, /* N/C            */
@@ -156,11 +156,11 @@
 	/* PC7  */ { CONF, GPIO,   0,  DIN,  ACTV,   0   }, /* BPDIS_IN1      */
 	/* PC6  */ { CONF, GPIO,   0,  DOUT, ACTV,   0   }, /* N/C            */
 	/* PC5  */ { CONF, GPIO,   0,  DIN,  ACTV,   0   }, /* BTST_IN2*      */
-        /* PC4  */ { CONF, GPIO,   0,  DIN,  ACTV,   0   }, /* BTST_IN1*      */
+	/* PC4  */ { CONF, GPIO,   0,  DIN,  ACTV,   0   }, /* BTST_IN1*      */
 	/* PC3  */ { CONF, GPIO,   0,  DIN,  ACTV,   0   }, /* MUSH_STAT      */
 	/* PC2  */ { CONF, GPIO,   0,  DIN,  ACTV,   0   }, /* OUTDRV_STAT    */
 	/* PC1  */ { CONF, GPIO,   0,  DOUT, OPEN,   1   }, /* PHY_MDIO       */
-        /* PC0  */ { CONF, GPIO,   0,  DOUT, ACTV,   1   }, /* PHY_MDC        */
+	/* PC0  */ { CONF, GPIO,   0,  DOUT, ACTV,   1   }, /* PHY_MDC        */
     },
 
     /* Port D */
@@ -215,4 +215,3 @@
 	/* PD0  */ { SKIP, GPIO,   0,  DIN,  ACTV,   0   }  /* pin doesn't exist */
     }
 };
-

diff --git a/board/sacsng/sacsng.c b/board/sacsng/sacsng.c
index 19dbb97..086e42a 100644
--- a/board/sacsng/sacsng.c
+++ b/board/sacsng/sacsng.c

@@ -75,7 +75,7 @@
 #define ADC_INITIAL_DELAY (10 * ADC_VREF_CAP) /* 10 usec per uF, in usec */
 #define ADC_SDATA_DELAY    100        /* ADC SDATA release delay in usec */
 #define ADC_CAL_DELAY (1000000 / INITIAL_SAMPLE_RATE * 4500)
-                                      /* Wait at least 4100 LRCLK's */
+				      /* Wait at least 4100 LRCLK's */
 
 #define ADC_REG1_FRAME_START    0x80  /* Frame start */
 #define ADC_REG1_GROUND_CAL     0x40  /* Ground calibration enable */
@@ -201,17 +201,17 @@
 	else if(j ==  4) cols        = data & 0x0F;
 	else if(j == 12) {
 	    /*
-             * Refresh rate: this assumes the prescaler is set to
+	     * Refresh rate: this assumes the prescaler is set to
 	     * approximately 1uSec per tick.
 	     */
 	    switch(data & 0x7F) {
-                default:
-                case 0:  psrt =  14 ; /*  15.625uS */  break;
-                case 1:  psrt =   2;  /*   3.9uS   */  break;
-                case 2:  psrt =   6;  /*   7.8uS   */  break;
-                case 3:  psrt =  29;  /*  31.3uS   */  break;
-                case 4:  psrt =  60;  /*  62.5uS   */  break;
-                case 5:  psrt = 120;  /* 125uS     */  break;
+		default:
+		case 0:  psrt =  14 ; /*  15.625uS */  break;
+		case 1:  psrt =   2;  /*   3.9uS   */  break;
+		case 2:  psrt =   6;  /*   7.8uS   */  break;
+		case 3:  psrt =  29;  /*  31.3uS   */  break;
+		case 4:  psrt =  60;  /*  62.5uS   */  break;
+		case 5:  psrt = 120;  /* 125uS     */  break;
 	    }
 	}
 	else if(j == 17) banks       = data;
@@ -228,13 +228,13 @@
 #endif
 	    else {
 		printf ("WARNING: Unknown CAS latency 0x%02X, using 3\n",
-		        data);
+			data);
 	    }
 	}
 	else if(j == 63) {
 	    if(data != cksum) {
 		printf ("WARNING: Configuration data checksum failure:"
-		        " is 0x%02x, calculated 0x%02x\n",
+			" is 0x%02x, calculated 0x%02x\n",
 			data, cksum);
 	    }
 	}
@@ -309,7 +309,7 @@
 	     PSDMR_ACTTORW_8W        |\
 	     PSDMR_WRC_4C            |\
 	     PSDMR_EAMUX             |\
-             PSDMR_BUFCMD)           |\
+	     PSDMR_BUFCMD)           |\
 	     caslatency              |\
 	     ((caslatency - 1) << 6) |	/* LDOTOPRE is CL - 1 */ \
 	     (sdam << 24)            |\
@@ -323,7 +323,7 @@
 	     PSDMR_ACTTORW_2W        |	/* 1 for 7E parts (fast PC-133) */ \
 	     PSDMR_WRC_1C            |	/* 1 clock + 7nSec */
 	     EAMUX                   |\
-             BUFCMD)                 |\
+	     BUFCMD)                 |\
 	     caslatency              |\
 	     ((caslatency - 1) << 6) |	/* LDOTOPRE is CL - 1 */ \
 	     (sdam << 24)            |\
@@ -400,7 +400,7 @@
      * two chip selects (double sided).
      */
     if(chipselects > 1) {
-        ramaddr += sdram_size;
+	ramaddr += sdram_size;
 
 	memctl->memc_br3 = CFG_BR3_PRELIM + sdram_size;
 	memctl->memc_or3 = or;
@@ -459,13 +459,13 @@
 
     sample_rate = INITIAL_SAMPLE_RATE;
     if ((ep = getenv("DaqSampleRate")) != NULL) {
-        sample_rate = simple_strtol(ep, NULL, 10);
+	sample_rate = simple_strtol(ep, NULL, 10);
     }
 
     sample_64x  = INITIAL_SAMPLE_64X;
     sample_128x = INITIAL_SAMPLE_128X;
     if ((ep = getenv("Daq64xSampling")) != NULL) {
-        sample_64x = simple_strtol(ep, NULL, 10);
+	sample_64x = simple_strtol(ep, NULL, 10);
 	if (sample_64x) {
 	    sample_128x = 0;
 	}
@@ -474,18 +474,18 @@
 	}
     }
     else {
-        if ((ep = getenv("Daq128xSampling")) != NULL) {
+	if ((ep = getenv("Daq128xSampling")) != NULL) {
 	    sample_128x = simple_strtol(ep, NULL, 10);
 	    if (sample_128x) {
-	        sample_64x = 0;
+		sample_64x = 0;
 	    }
 	    else {
-	        sample_64x = 1;
+		sample_64x = 1;
 	    }
 	}
     }
 
-    /* 
+    /*
      * Stop the clocks and wait for at least 1 LRCLK period
      * to make sure the clocking has really stopped.
      */
@@ -509,12 +509,12 @@
     setenv("DaqSampleRate", str_buf);
 
     if (sample_64x) {
-        setenv("Daq64xSampling",  "1");
-        setenv("Daq128xSampling", NULL);
+	setenv("Daq64xSampling",  "1");
+	setenv("Daq128xSampling", NULL);
     }
     else {
-        setenv("Daq64xSampling",  NULL);
-        setenv("Daq128xSampling", "1");
+	setenv("Daq64xSampling",  NULL);
+	setenv("Daq128xSampling", "1");
     }
 
     /* Display the ADC/DAC clocking information */
@@ -526,7 +526,7 @@
 
     right_just = INITIAL_RIGHT_JUST;
     if ((ep = getenv("DaqDACRightJustified")) != NULL) {
-        right_just = simple_strtol(ep, NULL, 10);
+	right_just = simple_strtol(ep, NULL, 10);
     }
 
     sprintf(str_buf, "%d", right_just);
@@ -538,7 +538,7 @@
 
     mclk_divide = INITIAL_MCLK_DIVIDE;
     if ((ep = getenv("DaqDACMClockDivide")) != NULL) {
-        mclk_divide = simple_strtol(ep, NULL, 10);
+	mclk_divide = simple_strtol(ep, NULL, 10);
     }
 
     sprintf(str_buf, "%d", mclk_divide);
@@ -666,7 +666,7 @@
      */
     i2c_reg_write(I2C_DAC_ADDR, 0x01,
 		  (right_just ? DAC_REG1_RIGHT_JUST_24BIT :
-                                DAC_REG1_LEFT_JUST_24_BIT) |
+				DAC_REG1_LEFT_JUST_24_BIT) |
 		  DAC_REG1_DEM_NO |
 		  (sample_rate >= 50000 ? DAC_REG1_DOUBLE : DAC_REG1_SINGLE));
 
@@ -724,7 +724,7 @@
      * Recursively do upper digits.
      */
     if(digits > 1) {
-        flash_code(number / modulo, modulo, digits - 1);
+	flash_code(number / modulo, modulo, digits - 1);
     }
 
     number = number % modulo;
@@ -733,20 +733,20 @@
      * Zero is indicated by one long flash (dash).
      */
     if(number == 0) {
-        status_led_set(STATUS_LED_BOOT, STATUS_LED_ON);
-        udelay(1000000);
-        status_led_set(STATUS_LED_BOOT, STATUS_LED_OFF);
-        udelay(200000);
+	status_led_set(STATUS_LED_BOOT, STATUS_LED_ON);
+	udelay(1000000);
+	status_led_set(STATUS_LED_BOOT, STATUS_LED_OFF);
+	udelay(200000);
     } else {
-        /*
-         * Non-zero is indicated by short flashes, one per count.
-         */
-        for(j = 0; j < number; j++) {
-            status_led_set(STATUS_LED_BOOT, STATUS_LED_ON);
-            udelay(100000);
-            status_led_set(STATUS_LED_BOOT, STATUS_LED_OFF);
-            udelay(200000);
-        }
+	/*
+	 * Non-zero is indicated by short flashes, one per count.
+	 */
+	for(j = 0; j < number; j++) {
+	    status_led_set(STATUS_LED_BOOT, STATUS_LED_ON);
+	    udelay(100000);
+	    status_led_set(STATUS_LED_BOOT, STATUS_LED_OFF);
+	    udelay(200000);
+	}
     }
     /*
      * Inter-digit pause: we've already waited 200 mSec, wait 1 sec total
@@ -759,16 +759,16 @@
 void show_boot_progress (int status)
 {
     if(status != -1) {
-        last_boot_progress = status;
+	last_boot_progress = status;
     } else {
-        /*
-         * Houston, we have a problem.  Blink the last OK status which
-         * indicates where things failed.
-         */
-        status_led_set(STATUS_LED_RED, STATUS_LED_ON);
-        flash_code(last_boot_progress, 5, 3);
-        udelay(1000000);
-        status_led_set(STATUS_LED_RED, STATUS_LED_BLINKING);
+	/*
+	 * Houston, we have a problem.  Blink the last OK status which
+	 * indicates where things failed.
+	 */
+	status_led_set(STATUS_LED_RED, STATUS_LED_ON);
+	flash_code(last_boot_progress, 5, 3);
+	udelay(1000000);
+	status_led_set(STATUS_LED_RED, STATUS_LED_BLINKING);
     }
 }
 #endif /* CONFIG_SHOW_BOOT_PROGRESS */

diff --git a/board/sacsng/u-boot.lds b/board/sacsng/u-boot.lds
index b4e502b..44224cb 100644
--- a/board/sacsng/u-boot.lds
+++ b/board/sacsng/u-boot.lds

@@ -93,6 +93,11 @@
   _edata  =  .;
   PROVIDE (edata = .);
 
+  __u_boot_cmd_start = .;
+  .u_boot_cmd : { *(.u_boot_cmd) }
+  __u_boot_cmd_end = .;
+
+
   __start___ex_table = .;
   __ex_table : { *(__ex_table) }
   __stop___ex_table = .;
@@ -115,4 +120,3 @@
   _end = . ;
   PROVIDE (end = .);
 }
-

diff --git a/board/sandpoint/Makefile b/board/sandpoint/Makefile
index 0a4bf0d..d6bbf2f 100644
--- a/board/sandpoint/Makefile
+++ b/board/sandpoint/Makefile

@@ -28,7 +28,7 @@
 OBJS =  $(BOARD).o flash.o
 
 $(LIB):	.depend $(OBJS)
-	$(AR) crv $@ $^
+	$(AR) crv $@ $(OBJS)
 
 #########################################################################
 

diff --git a/board/sandpoint/early_init.S b/board/sandpoint/early_init.S
index 127bd37..07dafb7 100644
--- a/board/sandpoint/early_init.S
+++ b/board/sandpoint/early_init.S

@@ -47,15 +47,15 @@
 		(CFG_REFREC << MCCR3_REFREC_SHIFT) | \
 		(CFG_RDLAT  << MCCR3_RDLAT_SHIFT)
 	.long	MCCR4
-        .long	(CFG_PRETOACT << MCCR4_PRETOACT_SHIFT) | (CFG_ACTTOPRE << MCCR4_ACTTOPRE_SHIFT) | \
+	.long	(CFG_PRETOACT << MCCR4_PRETOACT_SHIFT) | (CFG_ACTTOPRE << MCCR4_ACTTOPRE_SHIFT) | \
 		(CFG_REGISTERD_TYPE_BUFFER << 20) | \
-        	(((CFG_BSTOPRE & 0x00000300) >> 8) << MCCR4_BSTOPRE0TO1_SHIFT ) | \
-        	((CFG_SDMODE_CAS_LAT << 4) | (CFG_SDMODE_WRAP << 3) | \
+		(((CFG_BSTOPRE & 0x00000300) >> 8) << MCCR4_BSTOPRE0TO1_SHIFT ) | \
+		((CFG_SDMODE_CAS_LAT << 4) | (CFG_SDMODE_WRAP << 3) | \
 		(CFG_SDMODE_BURSTLEN) << MCCR4_SDMODE_SHIFT) | \
 		(CFG_ACTTORW << MCCR4_ACTTORW_SHIFT) | \
-        	((CFG_BSTOPRE & 0x0000000f) << MCCR4_BSTOPRE6TO9_SHIFT )
+		((CFG_BSTOPRE & 0x0000000f) << MCCR4_BSTOPRE6TO9_SHIFT )
 	.long	MSAR1
-        .long	(((CFG_BANK0_START & MICR_ADDR_MASK) >> MICR_ADDR_SHIFT) <<  0) | \
+	.long	(((CFG_BANK0_START & MICR_ADDR_MASK) >> MICR_ADDR_SHIFT) <<  0) | \
 		(((CFG_BANK1_START & MICR_ADDR_MASK) >> MICR_ADDR_SHIFT) <<  8) | \
 		(((CFG_BANK2_START & MICR_ADDR_MASK) >> MICR_ADDR_SHIFT) << 16) | \
 		(((CFG_BANK3_START & MICR_ADDR_MASK) >> MICR_ADDR_SHIFT) << 24)
@@ -65,7 +65,7 @@
 		(((CFG_BANK2_START & MICR_EADDR_MASK) >> MICR_EADDR_SHIFT) << 16) | \
 		(((CFG_BANK3_START & MICR_EADDR_MASK) >> MICR_EADDR_SHIFT) << 24)
 	.long	MSAR2
-        .long	(((CFG_BANK4_START & MICR_ADDR_MASK) >> MICR_ADDR_SHIFT) <<  0) | \
+	.long	(((CFG_BANK4_START & MICR_ADDR_MASK) >> MICR_ADDR_SHIFT) <<  0) | \
 		(((CFG_BANK5_START & MICR_ADDR_MASK) >> MICR_ADDR_SHIFT) <<  8) | \
 		(((CFG_BANK6_START & MICR_ADDR_MASK) >> MICR_ADDR_SHIFT) << 16) | \
 		(((CFG_BANK7_START & MICR_ADDR_MASK) >> MICR_ADDR_SHIFT) << 24)
@@ -75,7 +75,7 @@
 		(((CFG_BANK6_START & MICR_EADDR_MASK) >> MICR_EADDR_SHIFT) << 16) | \
 		(((CFG_BANK7_START & MICR_EADDR_MASK) >> MICR_EADDR_SHIFT) << 24)
 	.long	MEAR1
-        .long	(((CFG_BANK0_END & MICR_ADDR_MASK) >> MICR_ADDR_SHIFT) <<  0) | \
+	.long	(((CFG_BANK0_END & MICR_ADDR_MASK) >> MICR_ADDR_SHIFT) <<  0) | \
 		(((CFG_BANK1_END & MICR_ADDR_MASK) >> MICR_ADDR_SHIFT) <<  8) | \
 		(((CFG_BANK2_END & MICR_ADDR_MASK) >> MICR_ADDR_SHIFT) << 16) | \
 		(((CFG_BANK3_END & MICR_ADDR_MASK) >> MICR_ADDR_SHIFT) << 24)
@@ -85,7 +85,7 @@
 		(((CFG_BANK2_END & MICR_EADDR_MASK) >> MICR_EADDR_SHIFT) << 16) | \
 		(((CFG_BANK3_END & MICR_EADDR_MASK) >> MICR_EADDR_SHIFT) << 24)
 	.long	MEAR2
-        .long	(((CFG_BANK4_END & MICR_ADDR_MASK) >> MICR_ADDR_SHIFT) <<  0) | \
+	.long	(((CFG_BANK4_END & MICR_ADDR_MASK) >> MICR_ADDR_SHIFT) <<  0) | \
 		(((CFG_BANK5_END & MICR_ADDR_MASK) >> MICR_ADDR_SHIFT) <<  8) | \
 		(((CFG_BANK6_END & MICR_ADDR_MASK) >> MICR_ADDR_SHIFT) << 16) | \
 		(((CFG_BANK7_END & MICR_ADDR_MASK) >> MICR_ADDR_SHIFT) << 24)
@@ -97,7 +97,6 @@
 	.long	0
 
 
-
 	/*
 	 * Early CPU initialization. Set up memory controller, so we can access any RAM at all. This
 	 * must be done in assembly, since we have no stack at this point.
@@ -151,4 +150,3 @@
 
 	mtlr	r10
 	blr
-

diff --git a/board/sandpoint/flash.c b/board/sandpoint/flash.c
index 4b6f2d0..a9f73ff 100644
--- a/board/sandpoint/flash.c
+++ b/board/sandpoint/flash.c

@@ -92,7 +92,6 @@
 #endif /* 0 */
 
 
-
 static unsigned long
 flash_id(unsigned char mfct, unsigned char chip)
 {
@@ -136,7 +135,6 @@
 }
 
 
-
 unsigned long
 flash_init(void)
 {
@@ -190,9 +188,9 @@
     switch(pflinfo->flash_id & FLASH_TYPEMASK)
     {
       case FLASH_AM040:
-        pflinfo->size = 0x00080000;
+	pflinfo->size = 0x00080000;
 	pflinfo->sector_count = 8;
-        for(j = 0; j < 8; j++)
+	for(j = 0; j < 8; j++)
 	{
 	  pflinfo->start[j] = base_address + 0x00010000 * j;
 	  pflinfo->protect[j] = flash[(j << 16) | 0x2];
@@ -210,16 +208,16 @@
 	  pflinfo->start[j+3] = base_address + 0x00010000 * j;
 	}
 #if 0
-        /* check for protected sectors */
-        for (j = 0; j < pflinfo->sector_count; j++) {
-          /* read sector protection at sector address, (A7 .. A0) = 0x02 */
-          /* D0 = 1 if protected */
-          addr2 = (volatile FLASH_WORD_SIZE *)(pflinfo->start[j]);
-            if (pflinfo->flash_id & FLASH_MAN_SST)
-              pflinfo->protect[j] = 0;
-            else
-              pflinfo->protect[j] = addr2[2] & 1;
-        }
+	/* check for protected sectors */
+	for (j = 0; j < pflinfo->sector_count; j++) {
+	  /* read sector protection at sector address, (A7 .. A0) = 0x02 */
+	  /* D0 = 1 if protected */
+	  addr2 = (volatile FLASH_WORD_SIZE *)(pflinfo->start[j]);
+	    if (pflinfo->flash_id & FLASH_MAN_SST)
+	      pflinfo->protect[j] = 0;
+	    else
+	      pflinfo->protect[j] = addr2[2] & 1;
+	}
 #endif
 	break;
     }
@@ -254,30 +252,30 @@
     int i;
 
     /* set up sector start address table */
-        if (info->flash_id & FLASH_MAN_SST)
-          {
-            for (i = 0; i < info->sector_count; i++)
-              info->start[i] = base + (i * 0x00010000);
-          }
-        else
+	if (info->flash_id & FLASH_MAN_SST)
+	  {
+	    for (i = 0; i < info->sector_count; i++)
+	      info->start[i] = base + (i * 0x00010000);
+	  }
+	else
     if (info->flash_id & FLASH_BTYPE) {
-        /* set sector offsets for bottom boot block type    */
-        info->start[0] = base + 0x00000000;
-        info->start[1] = base + 0x00004000;
-        info->start[2] = base + 0x00006000;
-        info->start[3] = base + 0x00008000;
-        for (i = 4; i < info->sector_count; i++) {
-            info->start[i] = base + (i * 0x00010000) - 0x00030000;
-        }
+	/* set sector offsets for bottom boot block type    */
+	info->start[0] = base + 0x00000000;
+	info->start[1] = base + 0x00004000;
+	info->start[2] = base + 0x00006000;
+	info->start[3] = base + 0x00008000;
+	for (i = 4; i < info->sector_count; i++) {
+	    info->start[i] = base + (i * 0x00010000) - 0x00030000;
+	}
     } else {
-        /* set sector offsets for top boot block type       */
-        i = info->sector_count - 1;
-        info->start[i--] = base + info->size - 0x00004000;
-        info->start[i--] = base + info->size - 0x00006000;
-        info->start[i--] = base + info->size - 0x00008000;
-        for (; i >= 0; i--) {
-            info->start[i] = base + i * 0x00010000;
-        }
+	/* set sector offsets for top boot block type       */
+	i = info->sector_count - 1;
+	info->start[i--] = base + info->size - 0x00004000;
+	info->start[i--] = base + info->size - 0x00006000;
+	info->start[i--] = base + info->size - 0x00008000;
+	for (; i >= 0; i--) {
+	    info->start[i] = base + i * 0x00010000;
+	}
     }
 
 }
@@ -376,7 +374,7 @@
    short i;
     FLASH_WORD_SIZE value;
     ulong base = (ulong)addr;
-        volatile FLASH_WORD_SIZE *addr2 = (FLASH_WORD_SIZE *)addr;
+	volatile FLASH_WORD_SIZE *addr2 = (FLASH_WORD_SIZE *)addr;
 
     printf("flash_get_size: \n");
     /* Write auto select command: read Manufacturer ID */
@@ -388,123 +386,123 @@
 
     switch (value) {
     case (FLASH_WORD_SIZE)AMD_MANUFACT:
-        info->flash_id = FLASH_MAN_AMD;
-        break;
+	info->flash_id = FLASH_MAN_AMD;
+	break;
     case (FLASH_WORD_SIZE)FUJ_MANUFACT:
-        info->flash_id = FLASH_MAN_FUJ;
-        break;
+	info->flash_id = FLASH_MAN_FUJ;
+	break;
     case (FLASH_WORD_SIZE)SST_MANUFACT:
-        info->flash_id = FLASH_MAN_SST;
-        break;
+	info->flash_id = FLASH_MAN_SST;
+	break;
     default:
-        info->flash_id = FLASH_UNKNOWN;
-        info->sector_count = 0;
-        info->size = 0;
-        return (0);         /* no or unknown flash  */
+	info->flash_id = FLASH_UNKNOWN;
+	info->sector_count = 0;
+	info->size = 0;
+	return (0);         /* no or unknown flash  */
     }
     printf("recognised manufacturer");
 
     value = addr2[ADDR3];          /* device ID        */
-        debug ("\ndev_code=%x\n", value);
+	debug ("\ndev_code=%x\n", value);
 
     switch (value) {
     case (FLASH_WORD_SIZE)AMD_ID_LV400T:
-        info->flash_id += FLASH_AM400T;
-        info->sector_count = 11;
-        info->size = 0x00080000;
-        break;              /* => 0.5 MB        */
+	info->flash_id += FLASH_AM400T;
+	info->sector_count = 11;
+	info->size = 0x00080000;
+	break;              /* => 0.5 MB        */
 
     case (FLASH_WORD_SIZE)AMD_ID_LV400B:
-        info->flash_id += FLASH_AM400B;
-        info->sector_count = 11;
-        info->size = 0x00080000;
-        break;              /* => 0.5 MB        */
+	info->flash_id += FLASH_AM400B;
+	info->sector_count = 11;
+	info->size = 0x00080000;
+	break;              /* => 0.5 MB        */
 
     case (FLASH_WORD_SIZE)AMD_ID_LV800T:
-        info->flash_id += FLASH_AM800T;
-        info->sector_count = 19;
-        info->size = 0x00100000;
-        break;              /* => 1 MB      */
+	info->flash_id += FLASH_AM800T;
+	info->sector_count = 19;
+	info->size = 0x00100000;
+	break;              /* => 1 MB      */
 
     case (FLASH_WORD_SIZE)AMD_ID_LV800B:
-        info->flash_id += FLASH_AM800B;
-        info->sector_count = 19;
-        info->size = 0x00100000;
-        break;              /* => 1 MB      */
+	info->flash_id += FLASH_AM800B;
+	info->sector_count = 19;
+	info->size = 0x00100000;
+	break;              /* => 1 MB      */
 
     case (FLASH_WORD_SIZE)AMD_ID_LV160T:
-        info->flash_id += FLASH_AM160T;
-        info->sector_count = 35;
-        info->size = 0x00200000;
-        break;              /* => 2 MB      */
+	info->flash_id += FLASH_AM160T;
+	info->sector_count = 35;
+	info->size = 0x00200000;
+	break;              /* => 2 MB      */
 
     case (FLASH_WORD_SIZE)AMD_ID_LV160B:
-        info->flash_id += FLASH_AM160B;
-        info->sector_count = 35;
-        info->size = 0x00200000;
-        break;              /* => 2 MB      */
+	info->flash_id += FLASH_AM160B;
+	info->sector_count = 35;
+	info->size = 0x00200000;
+	break;              /* => 2 MB      */
 
     case (FLASH_WORD_SIZE)SST_ID_xF800A:
-        info->flash_id += FLASH_SST800A;
-        info->sector_count = 16;
-        info->size = 0x00100000;
-        break;              /* => 1 MB      */
+	info->flash_id += FLASH_SST800A;
+	info->sector_count = 16;
+	info->size = 0x00100000;
+	break;              /* => 1 MB      */
 
     case (FLASH_WORD_SIZE)SST_ID_xF160A:
-        info->flash_id += FLASH_SST160A;
-        info->sector_count = 32;
-        info->size = 0x00200000;
-        break;              /* => 2 MB      */
+	info->flash_id += FLASH_SST160A;
+	info->sector_count = 32;
+	info->size = 0x00200000;
+	break;              /* => 2 MB      */
 
     case (FLASH_WORD_SIZE)AMD_ID_F040B:
-        info->flash_id += FLASH_AM040;
-        info->sector_count = 8;
-        info->size = 0x00080000;
-        break;              /* => 0.5 MB      */
+	info->flash_id += FLASH_AM040;
+	info->sector_count = 8;
+	info->size = 0x00080000;
+	break;              /* => 0.5 MB      */
 
     default:
-        info->flash_id = FLASH_UNKNOWN;
-        return (0);         /* => no or unknown flash */
+	info->flash_id = FLASH_UNKNOWN;
+	return (0);         /* => no or unknown flash */
 
     }
 
     printf("flash id %lx; sector count %x, size %lx\n", info->flash_id,info->sector_count,info->size);
     /* set up sector start address table */
-        if (info->flash_id & FLASH_MAN_SST)
-          {
-            for (i = 0; i < info->sector_count; i++)
-              info->start[i] = base + (i * 0x00010000);
-          }
-        else
+	if (info->flash_id & FLASH_MAN_SST)
+	  {
+	    for (i = 0; i < info->sector_count; i++)
+	      info->start[i] = base + (i * 0x00010000);
+	  }
+	else
     if (info->flash_id & FLASH_BTYPE) {
-        /* set sector offsets for bottom boot block type    */
-        info->start[0] = base + 0x00000000;
-        info->start[1] = base + 0x00004000;
-        info->start[2] = base + 0x00006000;
-        info->start[3] = base + 0x00008000;
-        for (i = 4; i < info->sector_count; i++) {
-            info->start[i] = base + (i * 0x00010000) - 0x00030000;
-        }
+	/* set sector offsets for bottom boot block type    */
+	info->start[0] = base + 0x00000000;
+	info->start[1] = base + 0x00004000;
+	info->start[2] = base + 0x00006000;
+	info->start[3] = base + 0x00008000;
+	for (i = 4; i < info->sector_count; i++) {
+	    info->start[i] = base + (i * 0x00010000) - 0x00030000;
+	}
     } else {
-        /* set sector offsets for top boot block type       */
-        i = info->sector_count - 1;
-        info->start[i--] = base + info->size - 0x00004000;
-        info->start[i--] = base + info->size - 0x00006000;
-        info->start[i--] = base + info->size - 0x00008000;
-        for (; i >= 0; i--) {
-            info->start[i] = base + i * 0x00010000;
-        }
+	/* set sector offsets for top boot block type       */
+	i = info->sector_count - 1;
+	info->start[i--] = base + info->size - 0x00004000;
+	info->start[i--] = base + info->size - 0x00006000;
+	info->start[i--] = base + info->size - 0x00008000;
+	for (; i >= 0; i--) {
+	    info->start[i] = base + i * 0x00010000;
+	}
     }
 
     /* check for protected sectors */
     for (i = 0; i < info->sector_count; i++) {
-        /* read sector protection at sector address, (A7 .. A0) = 0x02 */
-        /* D0 = 1 if protected */
-        addr2 = (volatile FLASH_WORD_SIZE *)(info->start[i]);
-                if (info->flash_id & FLASH_MAN_SST)
-                  info->protect[i] = 0;
-                else
-                  info->protect[i] = addr2[2] & 1;
+	/* read sector protection at sector address, (A7 .. A0) = 0x02 */
+	/* D0 = 1 if protected */
+	addr2 = (volatile FLASH_WORD_SIZE *)(info->start[i]);
+		if (info->flash_id & FLASH_MAN_SST)
+		  info->protect[i] = 0;
+		else
+		  info->protect[i] = addr2[2] & 1;
     }
 
     /*
@@ -512,7 +510,7 @@
      */
     if (info->flash_id != FLASH_UNKNOWN) {
        addr2 = (FLASH_WORD_SIZE *)info->start[0];
-        *addr2 = (FLASH_WORD_SIZE)0x00F000F0;   /* reset bank */
+	*addr2 = (FLASH_WORD_SIZE)0x00F000F0;   /* reset bank */
     }
 
     return (info->size);
@@ -530,32 +528,32 @@
     unsigned char sh8b;
 
     if ((s_first < 0) || (s_first > s_last)) {
-        if (info->flash_id == FLASH_UNKNOWN) {
-            printf ("- missing\n");
-        } else {
-            printf ("- no sectors to erase\n");
-        }
-        return 1;
+	if (info->flash_id == FLASH_UNKNOWN) {
+	    printf ("- missing\n");
+	} else {
+	    printf ("- no sectors to erase\n");
+	}
+	return 1;
     }
 
     if ((info->flash_id == FLASH_UNKNOWN) ||
-        (info->flash_id > (FLASH_MAN_STM | FLASH_AMD_COMP))) {
-        printf ("Can't erase unknown flash type - aborted\n");
-        return 1;
+	(info->flash_id > (FLASH_MAN_STM | FLASH_AMD_COMP))) {
+	printf ("Can't erase unknown flash type - aborted\n");
+	return 1;
     }
 
     prot = 0;
     for (sect=s_first; sect<=s_last; ++sect) {
-        if (info->protect[sect]) {
-            prot++;
-        }
+	if (info->protect[sect]) {
+	    prot++;
+	}
     }
 
     if (prot) {
-        printf ("- Warning: %d protected sectors will not be erased!\n",
-            prot);
+	printf ("- Warning: %d protected sectors will not be erased!\n",
+	    prot);
     } else {
-        printf ("\n");
+	printf ("\n");
     }
 
     l_sect = -1;
@@ -577,28 +575,28 @@
 
     /* Start erase on unprotected sectors */
     for (sect = s_first; sect<=s_last; sect++) {
-        if (info->protect[sect] == 0) { /* not protected */
-            addr = (FLASH_WORD_SIZE *)(info->start[0] + (
+	if (info->protect[sect] == 0) { /* not protected */
+	    addr = (FLASH_WORD_SIZE *)(info->start[0] + (
 				(info->start[sect] - info->start[0]) << sh8b));
-                        if (info->flash_id & FLASH_MAN_SST)
-                          {
-                            addr[ADDR0 << sh8b] = (FLASH_WORD_SIZE)0x00AA00AA;
-                            addr[ADDR1 << sh8b] = (FLASH_WORD_SIZE)0x00550055;
-                            addr[ADDR0 << sh8b] = (FLASH_WORD_SIZE)0x00800080;
-                            addr[ADDR0 << sh8b] = (FLASH_WORD_SIZE)0x00AA00AA;
-                            addr[ADDR1 << sh8b] = (FLASH_WORD_SIZE)0x00550055;
-                            addr[0] = (FLASH_WORD_SIZE)0x00500050;  /* block erase */
-                            udelay(30000);  /* wait 30 ms */
-                          }
-                        else
-                          addr[0] = (FLASH_WORD_SIZE)0x00300030;  /* sector erase */
-            l_sect = sect;
-        }
+			if (info->flash_id & FLASH_MAN_SST)
+			  {
+			    addr[ADDR0 << sh8b] = (FLASH_WORD_SIZE)0x00AA00AA;
+			    addr[ADDR1 << sh8b] = (FLASH_WORD_SIZE)0x00550055;
+			    addr[ADDR0 << sh8b] = (FLASH_WORD_SIZE)0x00800080;
+			    addr[ADDR0 << sh8b] = (FLASH_WORD_SIZE)0x00AA00AA;
+			    addr[ADDR1 << sh8b] = (FLASH_WORD_SIZE)0x00550055;
+			    addr[0] = (FLASH_WORD_SIZE)0x00500050;  /* block erase */
+			    udelay(30000);  /* wait 30 ms */
+			  }
+			else
+			  addr[0] = (FLASH_WORD_SIZE)0x00300030;  /* sector erase */
+	    l_sect = sect;
+	}
     }
 
     /* re-enable interrupts if necessary */
     if (flag)
-        enable_interrupts();
+	enable_interrupts();
 
     /* wait at least 80us - let's wait 1 ms */
     udelay (1000);
@@ -607,22 +605,22 @@
      * We wait for the last triggered sector
      */
     if (l_sect < 0)
-        goto DONE;
+	goto DONE;
 
     start = get_timer (0);
     last  = start;
     addr = (FLASH_WORD_SIZE *)(info->start[0] + (
 			(info->start[l_sect] - info->start[0]) << sh8b));
     while ((addr[0] & (FLASH_WORD_SIZE)0x00800080) != (FLASH_WORD_SIZE)0x00800080) {
-        if ((now = get_timer(start)) > CFG_FLASH_ERASE_TOUT) {
-            printf ("Timeout\n");
-            return 1;
-        }
-        /* show that we're waiting */
-        if ((now - last) > 1000) {  /* every second */
-            serial_putc ('.');
-            last = now;
-        }
+	if ((now = get_timer(start)) > CFG_FLASH_ERASE_TOUT) {
+	    printf ("Timeout\n");
+	    return 1;
+	}
+	/* show that we're waiting */
+	if ((now - last) > 1000) {  /* every second */
+	    serial_putc ('.');
+	    last = now;
+	}
     }
 
 DONE:
@@ -652,42 +650,42 @@
      * handle unaligned start bytes
      */
     if ((l = addr - wp) != 0) {
-        data = 0;
-        for (i=0, cp=wp; i<l; ++i, ++cp) {
-            data = (data << 8) | (*(uchar *)cp);
-        }
-        for (; i<4 && cnt>0; ++i) {
-            data = (data << 8) | *src++;
-            --cnt;
-            ++cp;
-        }
-        for (; cnt==0 && i<4; ++i, ++cp) {
-            data = (data << 8) | (*(uchar *)cp);
-        }
+	data = 0;
+	for (i=0, cp=wp; i<l; ++i, ++cp) {
+	    data = (data << 8) | (*(uchar *)cp);
+	}
+	for (; i<4 && cnt>0; ++i) {
+	    data = (data << 8) | *src++;
+	    --cnt;
+	    ++cp;
+	}
+	for (; cnt==0 && i<4; ++i, ++cp) {
+	    data = (data << 8) | (*(uchar *)cp);
+	}
 
-        if ((rc = write_word(info, wp, data)) != 0) {
-            return (rc);
-        }
-        wp += 4;
+	if ((rc = write_word(info, wp, data)) != 0) {
+	    return (rc);
+	}
+	wp += 4;
     }
 
     /*
      * handle word aligned part
      */
     while (cnt >= 4) {
-        data = 0;
-        for (i=0; i<4; ++i) {
-            data = (data << 8) | *src++;
-        }
-        if ((rc = write_word(info, wp, data)) != 0) {
-            return (rc);
-        }
-        wp  += 4;
-        cnt -= 4;
+	data = 0;
+	for (i=0; i<4; ++i) {
+	    data = (data << 8) | *src++;
+	}
+	if ((rc = write_word(info, wp, data)) != 0) {
+	    return (rc);
+	}
+	wp  += 4;
+	cnt -= 4;
     }
 
     if (cnt == 0) {
-        return (0);
+	return (0);
     }
 
     /*
@@ -695,11 +693,11 @@
      */
     data = 0;
     for (i=0, cp=wp; i<4 && cnt>0; ++i, ++cp) {
-        data = (data << 8) | *src++;
-        --cnt;
+	data = (data << 8) | *src++;
+	--cnt;
     }
     for (; i<4; ++i, ++cp) {
-        data = (data << 8) | (*(uchar *)cp);
+	data = (data << 8) | (*(uchar *)cp);
     }
 
     return (write_word(info, wp, data));
@@ -713,12 +711,12 @@
  */
 static int write_word (flash_info_t *info, ulong dest, ulong data)
 {
-        volatile FLASH_WORD_SIZE *addr2 = (FLASH_WORD_SIZE *)info->start[0];
-        volatile FLASH_WORD_SIZE *dest2;
-        volatile FLASH_WORD_SIZE *data2 = (FLASH_WORD_SIZE *)&data;
+	volatile FLASH_WORD_SIZE *addr2 = (FLASH_WORD_SIZE *)info->start[0];
+	volatile FLASH_WORD_SIZE *dest2;
+	volatile FLASH_WORD_SIZE *data2 = (FLASH_WORD_SIZE *)&data;
     ulong start;
     int flag;
-        int i;
+	int i;
     unsigned char sh8b;
 
     /* Check the ROM CS */
@@ -732,32 +730,32 @@
 
     /* Check if Flash is (sufficiently) erased */
     if ((*dest2 & (FLASH_WORD_SIZE)data) != (FLASH_WORD_SIZE)data) {
-        return (2);
+	return (2);
     }
     /* Disable interrupts which might cause a timeout here */
     flag = disable_interrupts();
 
-        for (i=0; i<4/sizeof(FLASH_WORD_SIZE); i++)
-          {
-            addr2[ADDR0 << sh8b] = (FLASH_WORD_SIZE)0x00AA00AA;
-            addr2[ADDR1 << sh8b] = (FLASH_WORD_SIZE)0x00550055;
-            addr2[ADDR0 << sh8b] = (FLASH_WORD_SIZE)0x00A000A0;
+	for (i=0; i<4/sizeof(FLASH_WORD_SIZE); i++)
+	  {
+	    addr2[ADDR0 << sh8b] = (FLASH_WORD_SIZE)0x00AA00AA;
+	    addr2[ADDR1 << sh8b] = (FLASH_WORD_SIZE)0x00550055;
+	    addr2[ADDR0 << sh8b] = (FLASH_WORD_SIZE)0x00A000A0;
 
-            dest2[i << sh8b] = data2[i];
+	    dest2[i << sh8b] = data2[i];
 
-            /* re-enable interrupts if necessary */
-            if (flag)
-              enable_interrupts();
+	    /* re-enable interrupts if necessary */
+	    if (flag)
+	      enable_interrupts();
 
-            /* data polling for D7 */
-            start = get_timer (0);
-            while ((dest2[i << sh8b] & (FLASH_WORD_SIZE)0x00800080) !=
-                   (data2[i] & (FLASH_WORD_SIZE)0x00800080)) {
-              if (get_timer(start) > CFG_FLASH_WRITE_TOUT) {
-                return (1);
-              }
-            }
-          }
+	    /* data polling for D7 */
+	    start = get_timer (0);
+	    while ((dest2[i << sh8b] & (FLASH_WORD_SIZE)0x00800080) !=
+		   (data2[i] & (FLASH_WORD_SIZE)0x00800080)) {
+	      if (get_timer(start) > CFG_FLASH_WRITE_TOUT) {
+		return (1);
+	      }
+	    }
+	  }
 
     return (0);
 }

diff --git a/board/sandpoint/u-boot.lds b/board/sandpoint/u-boot.lds
index 0e0b0e6..db89a78 100644
--- a/board/sandpoint/u-boot.lds
+++ b/board/sandpoint/u-boot.lds

@@ -100,6 +100,11 @@
   _edata  =  .;
   PROVIDE (edata = .);
 
+  __u_boot_cmd_start = .;
+  .u_boot_cmd : { *(.u_boot_cmd) }
+  __u_boot_cmd_end = .;
+
+
   __start___ex_table = .;
   __ex_table : { *(__ex_table) }
   __stop___ex_table = .;
@@ -123,4 +128,3 @@
   _end = . ;
   PROVIDE (end = .);
 }
-

diff --git a/board/sandpoint/u-boot.lds.mw.debug b/board/sandpoint/u-boot.lds.mw.debug
deleted file mode 100644
index a0378cb..0000000
--- a/board/sandpoint/u-boot.lds.mw.debug
+++ /dev/null

@@ -1,101 +0,0 @@
-/*
- * (C) Copyright 2000
- * Rob Taylor, Flying Pig Systems Ltd. robt@flyingpig.com
- *
- * See file CREDITS for list of people who contributed to this
- * project.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of
- * the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston,
- * MA 02111-1307 USA
- */
-
-OUTPUT_ARCH(powerpc)
-SEARCH_DIR(/lib); SEARCH_DIR(/usr/lib); SEARCH_DIR(/usr/local/lib); SEARCH_DIR(/usr/local/powerpc-any-elf/lib);
-
-MEMORY {
- 	ram  (!rx) : org = 0x00000000 , LENGTH = 8M
- 	code (!rx) : org = 0x00002000 , LENGTH = (4M - 0x2000)
- 	rom   (rx) : org = 0xfe000000 , LENGTH = (0x100000000 - 0xfe000000)
-}
-
-SECTIONS
-{
-  _f_init = .;
-  PROVIDE(_f_init = .);
-  _f_init_rom = .;
-  PROVIDE(_f_init_rom = .);
-
-  .init : {
-      cpu/mpc824x/start.o	(.text)
-      *(.init)
-  } > ram
-  _init_size = SIZEOF(.init);
-  PROVIDE(_init_size = SIZEOF(.init));
-
-  ENTRY(_start)
-
-/*  _ftext = .;
-  _ftext_rom = .;
-  _text_size = SIZEOF(.text);
- */
-  .text : {
-      *(.text)
-      *(.got1)
-      } > ram
-  .rodata : { *(.rodata) } > ram
-  .dtors : { *(.dtors) } > ram
-  .data : { *(.data) } > ram
-  .sdata : { *(.sdata) } > ram
-  .sdata2 : { *(.sdata2)
-      *(.got)
-    _GOT2_TABLE_ = .;
-    *(.got2)
-    _FIXUP_TABLE_ = .;
-    *(.fixup)
-    } > ram
-  __got2_entries = (_FIXUP_TABLE_ - _GOT2_TABLE_) >>2;
-  __fixup_entries = (. - _FIXUP_TABLE_)>>2;
-
-  .sbss : { *(.sbss) } > ram
-  .sbss2 : { *(.sbss2) } > ram
-  .bss : { *(.bss) } > ram
-  .debug : { *(.debug) } > ram
-  .line : { *(.line) } > ram
-  .symtab : { *(.symtab) } > ram
-  .shrstrtab : { *(.shstrtab) } > ram
-  .strtab : { *(.strtab) } > ram
- /* .reloc   :
-  {
-    *(.got)
-    _GOT2_TABLE_ = .;
-    *(.got2)
-    _FIXUP_TABLE_ = .;
-    *(.fixup)
-  } > ram
-  */
-   __start___ex_table = .;
-    __ex_table : { *(__ex_table) } > ram
-    __stop___ex_table = .;
-
-
-  .ppcenv	:
-  {
-    common/environment.o (.ppcenv)
-  } > ram
-
-  _end = . ;
-  PROVIDE (end = .);
-}
-

diff --git a/board/sbc8260/Makefile b/board/sbc8260/Makefile
index 25c3bc1..14ed457 100644
--- a/board/sbc8260/Makefile
+++ b/board/sbc8260/Makefile

@@ -28,7 +28,7 @@
 OBJS	:= sbc8260.o flash.o
 
 $(LIB):	$(OBJS) $(SOBJS)
-	$(AR) crv $@ $^
+	$(AR) crv $@ $(OBJS)
 
 clean:
 	rm -f $(SOBJS) $(OBJS)

diff --git a/board/sbc8260/u-boot.lds b/board/sbc8260/u-boot.lds
index b4e502b..44224cb 100644
--- a/board/sbc8260/u-boot.lds
+++ b/board/sbc8260/u-boot.lds

@@ -93,6 +93,11 @@
   _edata  =  .;
   PROVIDE (edata = .);
 
+  __u_boot_cmd_start = .;
+  .u_boot_cmd : { *(.u_boot_cmd) }
+  __u_boot_cmd_end = .;
+
+
   __start___ex_table = .;
   __ex_table : { *(__ex_table) }
   __stop___ex_table = .;
@@ -115,4 +120,3 @@
   _end = . ;
   PROVIDE (end = .);
 }
-

diff --git a/board/sc520_cdp/Makefile b/board/sc520_cdp/Makefile
index 0f50393..f9a36f9 100644
--- a/board/sc520_cdp/Makefile
+++ b/board/sc520_cdp/Makefile

@@ -25,11 +25,11 @@
 
 LIB	= lib$(BOARD).a
 
-OBJS	:= sc520_cdp.o flash.o 
+OBJS	:= sc520_cdp.o flash.o
 SOBJS	:= sc520_cdp_asm.o sc520_cdp_asm16.o
 
 $(LIB):	$(OBJS) $(SOBJS)
-	$(AR) crv $@ $^
+	$(AR) crv $@ $(OBJS)
 
 clean:
 	rm -f $(SOBJS) $(OBJS)

diff --git a/board/sc520_cdp/flash.c b/board/sc520_cdp/flash.c
index 1ebb32e..a4d37e5 100644
--- a/board/sc520_cdp/flash.c
+++ b/board/sc520_cdp/flash.c

@@ -1,7 +1,7 @@
 /*
  * (C) Copyright 2002, 2003
  * Daniel Engström, Omicron Ceti AB, daniel@omicron.se
- * 
+ *
  * (C) Copyright 2002
  * Sysgo Real-Time Solutions, GmbH <www.elinos.com>
  * Alex Zuepke <azu@sysgo.de>
@@ -55,122 +55,121 @@
 static u32 _probe_flash(u32 addr, u32 bw, int il)
 {
 	u32 result=0;
-	
+
 	/* First do an unlock cycle for the benefit of
 	 * devices that need it */
-	
+
 	switch (bw) {
-		
+
 	case 1:
 		*(volatile u8*)(addr+0x5555) = 0xaa;
 		*(volatile u8*)(addr+0x2aaa) = 0x55;
 		*(volatile u8*)(addr+0x5555) = 0x90;
-		
+
 		/* Read vendor */
 		result = *(volatile u8*)addr;
 		result <<= 16;
-		
+
 		/* Read device */
 		result |= *(volatile u8*)(addr+2);
-		
+
 		/* Return device to data mode */
 		*(volatile u8*)addr = 0xff;
-		*(volatile u8*)(addr+0x5555), 0xf0;  
+		*(volatile u8*)(addr+0x5555), 0xf0;
 		break;
-		
+
 	case 2:
 		*(volatile u16*)(addr+0xaaaa) = 0xaaaa;
 		*(volatile u16*)(addr+0x5554) = 0x5555;
-		
+
 		/* Issue identification command */
 		if (il == 2) {
 			*(volatile u16*)(addr+0xaaaa) = 0x9090;
-			
+
 			/* Read vendor */
 			result = *(volatile u8*)addr;
 			result <<= 16;
-			
+
 			/* Read device */
 			result |= *(volatile u8*)(addr+2);
-			
+
 			/* Return device to data mode */
 			*(volatile u16*)addr =  0xffff;
-			*(volatile u16*)(addr+0xaaaa), 0xf0f0;  
-			
+			*(volatile u16*)(addr+0xaaaa), 0xf0f0;
+
 		} else {
 			*(volatile u8*)(addr+0xaaaa) = 0x90;
 			/* Read vendor */
 			result = *(volatile u16*)addr;
 			result <<= 16;
-			
+
 			/* Read device */
 			result |= *(volatile u16*)(addr+2);
-			
+
 			/* Return device to data mode */
 			*(volatile u8*)addr = 0xff;
-			*(volatile u8*)(addr+0xaaaa), 0xf0;  			
+			*(volatile u8*)(addr+0xaaaa), 0xf0;
 		}
-		
+
 		break;
-		
+
 	 case 4:
 		*(volatile u32*)(addr+0x5554) = 0xaaaaaaaa;
 		*(volatile u32*)(addr+0xaaa8) = 0x55555555;
-		
+
 		switch (il) {
 		case 1:
 			/* Issue identification command */
 			*(volatile u8*)(addr+0x5554) = 0x90;
-			
+
 			/* Read vendor */
 			result = *(volatile u16*)addr;
 			result <<= 16;
-		
+
 			/* Read device */
 			result |= *(volatile u16*)(addr+4);
-			
+
 			/* Return device to data mode */
 			*(volatile u8*)addr =  0xff;
-			*(volatile u8*)(addr+0x5554), 0xf0;  
+			*(volatile u8*)(addr+0x5554), 0xf0;
 			break;
-			
+
 		case 2:
 			/* Issue identification command */
 			*(volatile u32*)(addr + 0x5554) = 0x00900090;
-			
+
 			/* Read vendor */
 			result = *(volatile u16*)addr;
 			result <<= 16;
-			
+
 			/* Read device */
 			result |= *(volatile u16*)(addr+4);
-			
+
 			/* Return device to data mode */
 			*(volatile u32*)addr =  0x00ff00ff;
-			*(volatile u32*)(addr+0x5554), 0x00f000f0;  
+			*(volatile u32*)(addr+0x5554), 0x00f000f0;
 			break;
-			
+
 		case 4:
 			/* Issue identification command */
 			*(volatile u32*)(addr+0x5554) = 0x90909090;
-			
+
 			/* Read vendor */
 			result = *(volatile u8*)addr;
 			result <<= 16;
-			
+
 			/* Read device */
 			result |= *(volatile u8*)(addr+4);
-			
+
 			/* Return device to data mode */
 			*(volatile u32*)addr =  0xffffffff;
-			*(volatile u32*)(addr+0x5554), 0xf0f0f0f0; 
+			*(volatile u32*)(addr+0x5554), 0xf0f0f0f0;
 			break;
 		}
 		break;
 	}
-	
-	
-	
+
+
 	return result;
 }
 
@@ -180,36 +179,36 @@
 
 static int identify_flash(unsigned address, int width)
 {
-	int is;	
+	int is;
 	int device;
-	int vendor;	
+	int vendor;
 	int size;
 	unsigned res;
-	
+
 	u32 (*_probe_flash_ptr)(u32 a, u32 bw, int il);
-	
-	size = (unsigned)&_probe_flash_end - (unsigned)_probe_flash; 
-	
+
+	size = (unsigned)&_probe_flash_end - (unsigned)_probe_flash;
+
 	if (size > PROBE_BUFFER_SIZE) {
 		printf("_probe_flash() routine too large (%d) %p - %p\n",
 		       size, &_probe_flash_end, _probe_flash);
 		return 0;
 	}
-	
+
 	memcpy(buffer, _probe_flash, size);
 	_probe_flash_ptr = (void*)buffer;
-	
+
 	is = disable_interrupts();
 	res = _probe_flash_ptr(address, width, 1);
 	if (is) {
 		enable_interrupts();
 	}
-	
-	
-        vendor = res >> 16;
+
+
+	vendor = res >> 16;
 	device = res & 0xffff;
-	
-		
+
+
 	return res;
 }
 
@@ -217,12 +216,12 @@
 {
 	int i, j;
 	ulong size = 0;
-	
+
 	for (i = 0; i < SC520_MAX_FLASH_BANKS; i++) {
 		unsigned id;
 		ulong flashbase = 0;
-		int sectsize = 0; 
-		
+		int sectsize = 0;
+
 		memset(flash_info[i].protect, 0, CFG_MAX_FLASH_SECT);
 		switch (i) {
 		case 0:
@@ -237,7 +236,7 @@
 		default:
 			panic("configured to many flash banks!\n");
 		}
-		
+
 		id = identify_flash(flashbase, 4);
 		switch (id & 0x00ff00ff) {
 		case 0x000100c8:
@@ -245,31 +244,31 @@
 			flash_info[i].flash_id =
 				(AMD_MANUFACT & FLASH_VENDMASK) |
 				(AMD_ID_LV016B & FLASH_TYPEMASK);
-			
+
 			flash_info[i].size = AMD29LV016B_SIZE*4;
 			flash_info[i].sector_count = AMD29LV016B_SECTORS;
 			sectsize = (AMD29LV016B_SIZE*4)/AMD29LV016B_SECTORS;
 			printf("Bank %d: 4 x AMD 29LV017B\n", i);
 			break;
-			
-			
+
+
 		default:
 			printf("Bank %d have unknown flash %08x\n", i, id);
 			flash_info[i].flash_id = FLASH_UNKNOWN;
 			continue;
 		}
-		
+
 		for (j = 0; j < flash_info[i].sector_count; j++) {
 			flash_info[i].start[j] = flashbase + j * sectsize;
 		}
 		size += flash_info[i].size;
-		
+
 		flash_protect(FLAG_PROTECT_CLEAR,
 			      flash_info[i].start[0],
 			       flash_info[i].start[0] + flash_info[i].size - 1,
 			      &flash_info[i]);
 	}
-	
+
 	/*
 	 * Protect monitor and environment sectors
 	 */
@@ -282,7 +281,7 @@
 		      CFG_ENV_ADDR,
 		      CFG_ENV_ADDR + CFG_ENV_SIZE - 1,
 		      &flash_info[0]);
-#endif	
+#endif
 	return size;
 }
 
@@ -291,9 +290,9 @@
 void flash_print_info(flash_info_t *info)
 {
 	int i;
-	
+
 	switch (info->flash_id & FLASH_VENDMASK) {
-		
+
 	case (AMD_MANUFACT & FLASH_VENDMASK):
 		printf("AMD:   ");
 		switch (info->flash_id & FLASH_TYPEMASK) {
@@ -305,17 +304,17 @@
 			goto done;
 			break;
 		}
-		
+
 		break;
 	default:
 		printf("Unknown Vendor ");
 		break;
 	}
-	
-	
+
+
 	printf("  Size: %ld MB in %d Sectors\n",
 	       info->size >> 20, info->sector_count);
-	
+
 	printf("  Sector Start Addresses:");
 	for (i = 0; i < info->sector_count; i++) {
 		if ((i % 5) == 0) {
@@ -325,7 +324,7 @@
 			info->protect[i] ? " (RO)" : "     ");
 	}
 	printf ("\n");
-	
+
 	done:
 }
 
@@ -339,7 +338,7 @@
 	unsigned milli=0; \
 	\
 	micro = *(volatile u16*)(0xfffef000+SC520_SWTMRMILLI); \
-         \
+	 \
 	for (;;) { \
 		\
 		milli += *(volatile u16*)(0xfffef000+SC520_SWTMRMILLI); \
@@ -349,12 +348,12 @@
 			break; \
 		} \
 	} \
-} while (0) 
+} while (0)
 
 static u32 _amd_erase_flash(u32 addr, u32 sector)
 {
 	unsigned elapsed;
-	
+
 	/* Issue erase */
 	*(volatile u32*)(addr + 0x5554) = 0xAAAAAAAA;
 	*(volatile u32*)(addr + 0xaaa8) = 0x55555555;
@@ -364,21 +363,21 @@
 	*(volatile u32*)(addr + 0xaaa8) = 0x55555555;
 	/* Sector erase command comes last */
 	*(volatile u32*)(addr + sector) = 0x30303030;
-	
+
 	elapsed = *(volatile u16*)(0xfffef000+SC520_SWTMRMILLI); /* dummy read */
 	elapsed = 0;
 	__udelay(50);
 	while (((*(volatile u32*)(addr + sector)) & 0x80808080) != 0x80808080) {
-		
+
 		elapsed += *(volatile u16*)(0xfffef000+SC520_SWTMRMILLI);
 		if (elapsed > ((CFG_FLASH_ERASE_TOUT/CFG_HZ) * 1000)) {
 			*(volatile u32*)(addr) = 0xf0f0f0f0;
-			return 1;			
+			return 1;
 		}
 	}
-	
+
 	*(volatile u32*)(addr) = 0xf0f0f0f0;
-	
+
 	return 0;
 }
 
@@ -392,7 +391,7 @@
 	int prot;
 	int sect;
 	unsigned size;
-	
+
 	if ((s_first < 0) || (s_first > s_last)) {
 		if (info->flash_id == FLASH_UNKNOWN) {
 			printf("- missing\n");
@@ -401,66 +400,66 @@
 		}
 		return 1;
 	}
-	
+
 	if ((info->flash_id & FLASH_VENDMASK) == (AMD_MANUFACT & FLASH_VENDMASK)) {
-		size = (unsigned)&_amd_erase_flash_end - (unsigned)_amd_erase_flash; 
-		
+		size = (unsigned)&_amd_erase_flash_end - (unsigned)_amd_erase_flash;
+
 		if (size > PROBE_BUFFER_SIZE) {
 			printf("_amd_erase_flash() routine too large (%d) %p - %p\n",
 			       size, &_amd_erase_flash_end, _amd_erase_flash);
 			return 0;
 		}
-		
+
 		memcpy(buffer, _amd_erase_flash, size);
 		_erase_flash_ptr = (void*)buffer;
-	
+
 	}  else {
 		printf ("Can't erase unknown flash type - aborted\n");
 		return 1;
 	}
-	
+
 	prot = 0;
 	for (sect=s_first; sect<=s_last; ++sect) {
 		if (info->protect[sect]) {
 			prot++;
 		}
 	}
-	
+
 	if (prot) {
 		printf ("- Warning: %d protected sectors will not be erased!\n", prot);
 	} else {
 		printf ("\n");
 	}
-		
-	
+
+
 	/* Start erase on unprotected sectors */
 	for (sect = s_first; sect<=s_last; sect++) {
-		
+
 		if (info->protect[sect] == 0) { /* not protected */
 			int res;
 			int flag;
-			
+
 			/* Disable interrupts which might cause a timeout here */
 			flag = disable_interrupts();
-			
+
 			res = _erase_flash_ptr(info->start[0], info->start[sect]-info->start[0]);
-			
+
 			/* re-enable interrupts if necessary */
 			if (flag) {
 				enable_interrupts();
 			}
-			
-			
+
+
 			if (res) {
 				printf("Erase timed out, sector %d\n", sect);
 				return res;
 			}
-			
-			putc('.');			
-		}		
+
+			putc('.');
+		}
 	}
 
-	
+
 	return 0;
 }
 
@@ -476,33 +475,33 @@
 	volatile u32 *dest2 = (u32*)dest;
 	volatile u32 *data2 = (u32*)&data;
 	unsigned elapsed;
-	
+
 	/* Check if Flash is (sufficiently) erased */
 	if ((*((volatile u32*)dest) & (u32)data) != (u32)data) {
 		return 2;
 	}
-		
+
 	addr2[0x5554] = 0xAAAAAAAA;
 	addr2[0xaaa8] = 0x55555555;
 	addr2[0x5554] = 0xA0A0A0A0;
-	
+
 	dest2[0] = data;
-	
+
 	elapsed = *(volatile u16*)(0xfffef000+SC520_SWTMRMILLI); /* dummy read */
 	elapsed = 0;
-	
+
 	/* data polling for D7 */
 	while ((dest2[0] & 0x80808080) != (data2[0] & 0x80808080)) {
 		elapsed += *(volatile u16*)(0xfffef000+SC520_SWTMRMILLI);
 		if (elapsed > ((CFG_FLASH_WRITE_TOUT/CFG_HZ) * 1000)) {
 			addr2[0] = 0xf0f0f0f0;
-			return 1;			
+			return 1;
 		}
 	}
 
-	
+
 	addr2[0] = 0xf0f0f0f0;
-	
+
 	return 0;
 }
 
@@ -511,8 +510,6 @@
      ".long 0\n");
 
 
-
-
 /*-----------------------------------------------------------------------
  * Copy memory to flash, returns:
  * 0 - OK
@@ -528,19 +525,19 @@
 	int flag;
 	u32 (*_write_word_ptr)(unsigned start, unsigned dest, unsigned data);
 	unsigned size;
-	
+
 	if ((info->flash_id & FLASH_VENDMASK) == (AMD_MANUFACT & FLASH_VENDMASK)) {
-		size = (unsigned)&_amd_write_word_end - (unsigned)_amd_write_word; 
-		
+		size = (unsigned)&_amd_write_word_end - (unsigned)_amd_write_word;
+
 		if (size > PROBE_BUFFER_SIZE) {
 			printf("_amd_write_word() routine too large (%d) %p - %p\n",
 			       size, &_amd_write_word_end, _amd_write_word);
 			return 0;
 		}
-		
+
 		memcpy(buffer, _amd_write_word, size);
 		_write_word_ptr = (void*)buffer;
-	
+
 	} else {
 		printf ("Can't program unknown flash type - aborted\n");
 		return 3;
@@ -548,7 +545,7 @@
 
 
 	wp = (addr & ~3);	/* get lower word aligned address */
-	
+
 
 	/*
 	 * handle unaligned start bytes
@@ -566,12 +563,12 @@
 		for (; cnt==0 && i<4; ++i, ++cp) {
 			data |= (*(uchar *)cp)  << (8*i);
 		}
-		
+
 		/* Disable interrupts which might cause a timeout here */
 		flag = disable_interrupts();
-		
+
 		rc = _write_word_ptr(info->start[0], wp, data);
-		
+
 		/* re-enable interrupts if necessary */
 		if (flag) {
 			enable_interrupts();
@@ -581,22 +578,22 @@
 		}
 		wp += 4;
 	}
-	
+
 	/*
 	 * handle word aligned part
 	 */
 	while (cnt >= 4) {
 		data = 0;
-			       
+
 		for (i=0; i<4; ++i) {
 			data |= *src++ << (8*i);
 		}
-		
+
 		/* Disable interrupts which might cause a timeout here */
 		flag = disable_interrupts();
 
 		rc = _write_word_ptr(info->start[0], wp, data);
-		
+
 		/* re-enable interrupts if necessary */
 		if (flag) {
 			enable_interrupts();
@@ -607,11 +604,11 @@
 		wp  += 4;
 		cnt -= 4;
 	}
-	
+
 	if (cnt == 0) {
 		return 0;
 	}
-	
+
 	/*
 	 * handle unaligned tail bytes
 	 */
@@ -620,7 +617,7 @@
 		data |= *src++ << (8*i);
 		--cnt;
 	}
-	
+
 	for (; i<4; ++i, ++cp) {
 		data |= (*(uchar *)cp) << (8*i);
 	}
@@ -629,14 +626,12 @@
 	flag = disable_interrupts();
 
 	rc = _write_word_ptr(info->start[0], wp, data);
-	
+
 	/* re-enable interrupts if necessary */
 	if (flag) {
 		enable_interrupts();
 	}
-	
+
 	return rc;
-	
+
 }
-
-

diff --git a/board/sc520_cdp/flash_old.c b/board/sc520_cdp/flash_old.c
index d4204a8..416b01d 100644
--- a/board/sc520_cdp/flash_old.c
+++ b/board/sc520_cdp/flash_old.c

@@ -1,7 +1,7 @@
 /*
  * (C) Copyright 2002
  * Daniel Engström, Omicron Ceti AB, daniel@omicron.se
- * 
+ *
  * (C) Copyright 2002
  * Sysgo Real-Time Solutions, GmbH <www.elinos.com>
  * Alex Zuepke <azu@sysgo.de>
@@ -67,22 +67,22 @@
 {
 	int i, j;
 	ulong size = 0;
-	
+
 	for (i = 0; i < SC520_MAX_FLASH_BANKS; i++) {
 		ulong flashbase = 0;
-		int sectsize = 0; 
+		int sectsize = 0;
 		if (i==0 || i==2) {
-			/* FixMe: this assumes that bank 0 and 2 
+			/* FixMe: this assumes that bank 0 and 2
 			 * are mapped to the two 8Mb banks */
 			flash_info[i].flash_id =
 				(AMD_MANUFACT & FLASH_VENDMASK) |
 				(AMD_ID_LV016B & FLASH_TYPEMASK);
-			
+
 			flash_info[i].size = AMD29LV016_SIZE*4;
 			flash_info[i].sector_count = AMD29LV016_SECTORS;
 			sectsize = (AMD29LV016_SIZE*4)/AMD29LV016_SECTORS;
 		} else {
-			/* FixMe: this assumes that bank1 is unmapped 
+			/* FixMe: this assumes that bank1 is unmapped
 			 * (or mapped to the same flash bank as BOOTCS) */
 			flash_info[i].flash_id = 0;
 			flash_info[i].size = 0;
@@ -103,14 +103,14 @@
 		default:
 			panic("configured to many flash banks!\n");
 		}
-		
+
 		for (j = 0; j < flash_info[i].sector_count; j++) {
 			flash_info[i].start[j] = sectsize;
 			flash_info[i].start[j] = flashbase + j * sectsize;
 		}
 		size += flash_info[i].size;
 	}
-	
+
 	/*
 	 * Protect monitor and environment sectors
 	 */
@@ -118,7 +118,7 @@
 		      i386boot_start-SC520_FLASH_BANK0_BASE,
 		      i386boot_end-SC520_FLASH_BANK0_BASE,
 		      &flash_info[0]);
-	
+
 #ifdef CFG_ENV_ADDR
 	flash_protect(FLAG_PROTECT_SET,
 		      CFG_ENV_ADDR,
@@ -142,7 +142,7 @@
 		printf("Unknown Vendor ");
 		break;
 	}
-	
+
 	switch (info->flash_id & FLASH_TYPEMASK) {
 	case (AMD_ID_LV016B & FLASH_TYPEMASK):
 		printf("4x Amd29LV016B (16Mbit)\n");
@@ -152,10 +152,10 @@
 		goto done;
 		break;
 	}
-	
+
 	printf("  Size: %ld MB in %d Sectors\n",
 	       info->size >> 20, info->sector_count);
-	
+
 	printf("  Sector Start Addresses:");
 	for (i = 0; i < info->sector_count; i++) {
 		if ((i % 5) == 0) {
@@ -165,7 +165,7 @@
 			info->protect[i] ? " (RO)" : "     ");
 	}
 	printf ("\n");
-	
+
 	done:
 }
 
@@ -180,20 +180,20 @@
 	int chip1, chip2;
 
 	/* first look for protection bits */
-	
+
 	if (info->flash_id == FLASH_UNKNOWN) {
 		return ERR_UNKNOWN_FLASH_TYPE;
 	}
-	
+
 	if ((s_first < 0) || (s_first > s_last)) {
 		return ERR_INVAL;
 	}
-	
+
 	if ((info->flash_id & FLASH_VENDMASK) !=
 	    (AMD_MANUFACT & FLASH_VENDMASK)) {
 		return ERR_UNKNOWN_FLASH_VENDOR;
 	}
-	
+
 	prot = 0;
 	for (sect=s_first; sect<=s_last; ++sect) {
 		if (info->protect[sect]) {
@@ -203,7 +203,7 @@
 	if (prot) {
 		return ERR_PROTECTED;
 	}
-	
+
 	/*
 	 * Disable interrupts which might cause a timeout
 	 * here. Remember that our exception vectors are
@@ -212,77 +212,77 @@
 	 * chip is in programming mode.
 	 */
 	iflag = disable_interrupts();
-	
+
 	/* Start erase on unprotected sectors */
 	for (sect = s_first; sect<=s_last && !ctrlc(); sect++) {
 		printf("Erasing sector %2d ... ", sect);
-		
+
 		/* arm simple, non interrupt dependent timer */
 		reset_timer();
-		
-		if (info->protect[sect] == 0) {	
+
+		if (info->protect[sect] == 0) {
 			/* not protected */
 			ulong addr = info->start[sect];
-			
+
 			writel(CMD_UNLOCK1, addr + 1);
 			writel(CMD_UNLOCK2, addr + 2);
 			writel(CMD_ERASE_SETUP, addr + 1);
-			
+
 			writel(CMD_UNLOCK1, addr + 1);
 			writel(CMD_UNLOCK2, addr + 2);
 			writel(CMD_ERASE_CONFIRM, addr);
 
-			
+
 			/* wait until flash is ready */
 			chip1 = chip2 = 0;
-			
+
 			do {
 				result = readl(addr);
-				
+
 				/* check timeout */
 				if (get_timer(0) > CFG_FLASH_ERASE_TOUT) {
 					writel(CMD_READ_ARRAY, addr + 1);
 					chip1 = TMO;
 					break;
 				}
-				
+
 				if (!chip1 && (result & 0xFFFF) & BIT_ERASE_DONE) {
 					chip1 = READY;
 				}
-				
+
 				if (!chip1 && (result & 0xFFFF) & BIT_PROGRAM_ERROR) {
 					chip1 = ERR;
 				}
-				
+
 				if (!chip2 && (result >> 16) & BIT_ERASE_DONE) {
 					chip2 = READY;
 				}
-				
+
 				if (!chip2 && (result >> 16) & BIT_PROGRAM_ERROR) {
 					chip2 = ERR;
 				}
-				
+
 			}  while (!chip1 || !chip2);
-			
+
 			writel(CMD_READ_ARRAY, addr + 1);
-			
+
 			if (chip1 == ERR || chip2 == ERR) {
 				rc = ERR_PROG_ERROR;
 				goto outahere;
 			}
-			
+
 			if (chip1 == TMO) {
 				rc = ERR_TIMOUT;
 				goto outahere;
 			}
-			
+
 			printf("ok.\n");
 		} else { /* it was protected */
-			
+
 			printf("protected!\n");
 		}
 	}
-	
+
 	if (ctrlc()) {
 		printf("User Interrupt!\n");
 	}
@@ -290,11 +290,11 @@
 outahere:
 	/* allow flash to settle - wait 10 ms */
 	udelay(10000);
-	
+
 	if (iflag) {
 		enable_interrupts();
 	}
-	
+
 	return rc;
 }
 
@@ -309,7 +309,7 @@
 	int rc = ERR_OK;
 	int iflag;
 	int chip1, chip2;
-	
+
 	/*
 	 * Check if Flash is (sufficiently) erased
 	 */
@@ -317,7 +317,7 @@
 	if ((result & data) != data) {
 		return ERR_NOT_ERASED;
 	}
-	
+
 	/*
 	 * Disable interrupts which might cause a timeout
 	 * here. Remember that our exception vectors are
@@ -332,61 +332,61 @@
 	writel(CMD_UNLOCK_BYPASS, addr + 1);
 	writel(addr, CMD_PROGRAM);
 	writel(addr, data);
-	
+
 	/* arm simple, non interrupt dependent timer */
 	reset_timer();
-	
+
 	/* wait until flash is ready */
 	chip1 = chip2 = 0;
 	do {
 		result = readl(addr);
-		
+
 		/* check timeout */
 		if (get_timer(0) > CFG_FLASH_ERASE_TOUT) {
 			chip1 = ERR | TMO;
 			break;
 		}
-		
+
 		if (!chip1 && ((result & 0x80) == (data & 0x80))) {
 			chip1 = READY;
 		}
-		
+
 		if (!chip1 && ((result & 0xFFFF) & BIT_PROGRAM_ERROR)) {
 			result = readl(addr);
-			
+
 			if ((result & 0x80) == (data & 0x80)) {
 				chip1 = READY;
 			} else {
 				chip1 = ERR;
 			}
 		}
-		
+
 		if (!chip2 && ((result & (0x80 << 16)) == (data & (0x80 << 16)))) {
 			chip2 = READY;
 		}
-		
+
 		if (!chip2 && ((result >> 16) & BIT_PROGRAM_ERROR)) {
 			result = readl(addr);
-			
+
 			if ((result & (0x80 << 16)) == (data & (0x80 << 16))) {
 				chip2 = READY;
 			} else {
 				chip2 = ERR;
 			}
 		}
-		
+
 	}  while (!chip1 || !chip2);
-	
+
 	writel(CMD_READ_ARRAY, addr);
-	
+
 	if (chip1 == ERR || chip2 == ERR || readl(addr) != data) {
 		rc = ERR_PROG_ERROR;
 	}
-	
+
 	if (iflag) {
 		enable_interrupts();
 	}
-	
+
 	return rc;
 }
 
@@ -399,9 +399,9 @@
 	ulong cp, wp, data;
 	int l;
 	int i, rc;
-	
+
 	wp = (addr & ~3);	/* get lower word aligned address */
-	
+
 	/*
 	 * handle unaligned start bytes
 	 */
@@ -418,13 +418,13 @@
 		for (; cnt==0 && i<4; ++i, ++cp) {
 			data = (data >> 8) | (*(uchar *)cp << 24);
 		}
-		
+
 		if ((rc = write_word(info, wp, data)) != 0) {
 			return rc;
 		}
 		wp += 4;
 	}
-	
+
 	/*
 	 * handle word aligned part
 	 */
@@ -437,11 +437,11 @@
 		wp  += 4;
 		cnt -= 4;
 	}
-	
+
 	if (cnt == 0) {
 		return ERR_OK;
 	}
-	
+
 	/*
 	 * handle unaligned tail bytes
 	 */
@@ -453,6 +453,6 @@
 	for (; i<4; ++i, ++cp) {
 		data = (data >> 8) | (*(uchar *)cp << 24);
 	}
-	
+
 	return write_word(info, wp, data);
 }

diff --git a/board/sc520_cdp/sc520_cdp.c b/board/sc520_cdp/sc520_cdp.c
index 50a49e6..0fc836c 100644
--- a/board/sc520_cdp/sc520_cdp.c
+++ b/board/sc520_cdp/sc520_cdp.c

@@ -1,5 +1,5 @@
 /*
- * 
+ *
  * (C) Copyright 2002
  * Daniel Engström, Omicron Ceti AB <daniel@omicron.se>.
  *
@@ -40,11 +40,11 @@
 
 /* ------------------------------------------------------------------------- */
 
-	
-/* 
+
+/*
  * Theory:
  * We first set up all IRQs to be non-pci, edge triggered,
- * when we later enumerate the pci bus and pci_sc520_fixup_irq() gets 
+ * when we later enumerate the pci bus and pci_sc520_fixup_irq() gets
  * called we reallocate irqs to the pci bus with sc520_pci_set_irq()
  * as needed. Whe choose the irqs to gram from a configurable list
  * inside pci_sc520_fixup_irq() (If this list contains stupid irq's
@@ -54,48 +54,48 @@
 static void irq_init(void)
 {
 	/* disable global interrupt mode */
-	write_mmcr_byte(SC520_PICICR, 0x40); 
-	
+	write_mmcr_byte(SC520_PICICR, 0x40);
+
 	/* set all irqs to edge */
 	write_mmcr_byte(SC520_MPICMODE, 0x00);
 	write_mmcr_byte(SC520_SL1PICMODE, 0x00);
 	write_mmcr_byte(SC520_SL2PICMODE, 0x00);
-	
-	/* active low polarity on PIC interrupt pins, 
+
+	/* active low polarity on PIC interrupt pins,
 	 *  active high polarity on all other irq pins */
 	write_mmcr_word(SC520_INTPINPOL, 0x0000);
 
 	/* set irq number mapping */
-	write_mmcr_byte(SC520_GPTMR0MAP, SC520_IRQ_DISABLED);   /* disable GP timer 0 INT */       
+	write_mmcr_byte(SC520_GPTMR0MAP, SC520_IRQ_DISABLED);   /* disable GP timer 0 INT */
 	write_mmcr_byte(SC520_GPTMR1MAP, SC520_IRQ_DISABLED);   /* disable GP timer 1 INT */
 	write_mmcr_byte(SC520_GPTMR2MAP, SC520_IRQ_DISABLED);   /* disable GP timer 2 INT */
-	write_mmcr_byte(SC520_PIT0MAP, SC520_IRQ0);             /* Set PIT timer 0 INT to IRQ0 */ 
+	write_mmcr_byte(SC520_PIT0MAP, SC520_IRQ0);             /* Set PIT timer 0 INT to IRQ0 */
 	write_mmcr_byte(SC520_PIT1MAP, SC520_IRQ_DISABLED);     /* disable PIT timer 1 INT */
 	write_mmcr_byte(SC520_PIT2MAP, SC520_IRQ_DISABLED);     /* disable PIT timer 2 INT */
 	write_mmcr_byte(SC520_PCIINTAMAP, SC520_IRQ_DISABLED);  /* disable PCI INT A */
 	write_mmcr_byte(SC520_PCIINTBMAP, SC520_IRQ_DISABLED);  /* disable PCI INT B */
 	write_mmcr_byte(SC520_PCIINTCMAP, SC520_IRQ_DISABLED);  /* disable PCI INT C */
 	write_mmcr_byte(SC520_PCIINTDMAP, SC520_IRQ_DISABLED);  /* disable PCI INT D */
-	write_mmcr_byte(SC520_DMABCINTMAP, SC520_IRQ_DISABLED); /* disable DMA INT */ 
+	write_mmcr_byte(SC520_DMABCINTMAP, SC520_IRQ_DISABLED); /* disable DMA INT */
 	write_mmcr_byte(SC520_SSIMAP, SC520_IRQ_DISABLED);      /* disable Synchronius serial INT */
 	write_mmcr_byte(SC520_WDTMAP, SC520_IRQ_DISABLED);      /* disable Watchdog INT */
 	write_mmcr_byte(SC520_RTCMAP, SC520_IRQ8);              /* Set RTC int to 8 */
 	write_mmcr_byte(SC520_WPVMAP, SC520_IRQ_DISABLED);      /* disable write protect INT */
 	write_mmcr_byte(SC520_ICEMAP, SC520_IRQ1);              /* Set ICE Debug Serielport INT to IRQ1 */
 	write_mmcr_byte(SC520_FERRMAP,SC520_IRQ13);             /* Set FP error INT to IRQ13 */
-	
+
 	if (CFG_USE_SIO_UART) {
 		write_mmcr_byte(SC520_UART1MAP, SC520_IRQ_DISABLED); /* disable internal UART1 INT */
 		write_mmcr_byte(SC520_UART2MAP, SC520_IRQ_DISABLED); /* disable internal UART2 INT */
-		write_mmcr_byte(SC520_GP3IMAP, SC520_IRQ3);          /* Set GPIRQ3 (ISA IRQ3) to IRQ3 */ 
+		write_mmcr_byte(SC520_GP3IMAP, SC520_IRQ3);          /* Set GPIRQ3 (ISA IRQ3) to IRQ3 */
 		write_mmcr_byte(SC520_GP4IMAP, SC520_IRQ4);          /* Set GPIRQ4 (ISA IRQ4) to IRQ4 */
 	} else {
 		write_mmcr_byte(SC520_UART1MAP, SC520_IRQ4);         /* Set internal UART2 INT to IRQ4 */
 		write_mmcr_byte(SC520_UART2MAP, SC520_IRQ3);         /* Set internal UART2 INT to IRQ3 */
-		write_mmcr_byte(SC520_GP3IMAP, SC520_IRQ_DISABLED);  /* disable GPIRQ3 (ISA IRQ3) */ 
+		write_mmcr_byte(SC520_GP3IMAP, SC520_IRQ_DISABLED);  /* disable GPIRQ3 (ISA IRQ3) */
 		write_mmcr_byte(SC520_GP4IMAP, SC520_IRQ_DISABLED);  /* disable GPIRQ4 (ISA IRQ4) */
 	}
-	
+
 	write_mmcr_byte(SC520_GP1IMAP, SC520_IRQ1);             /* Set GPIRQ1 (SIO IRQ1) to IRQ1 */
 	write_mmcr_byte(SC520_GP5IMAP, SC520_IRQ5);             /* Set GPIRQ5 (ISA IRQ5) to IRQ5 */
 	write_mmcr_byte(SC520_GP6IMAP, SC520_IRQ6);             /* Set GPIRQ6 (ISA IRQ6) to IRQ6 */
@@ -104,14 +104,14 @@
 	write_mmcr_byte(SC520_GP9IMAP, SC520_IRQ9);             /* Set GPIRQ9 (ISA IRQ2) to IRQ9 */
 	write_mmcr_byte(SC520_GP0IMAP, SC520_IRQ11);            /* Set GPIRQ0 (ISA IRQ11) to IRQ10 */
 	write_mmcr_byte(SC520_GP2IMAP, SC520_IRQ12);            /* Set GPIRQ2 (ISA IRQ12) to IRQ12 */
-	write_mmcr_byte(SC520_GP10IMAP,SC520_IRQ14);            /* Set GPIRQ10 (ISA IRQ14) to IRQ14 */          
-	
+	write_mmcr_byte(SC520_GP10IMAP,SC520_IRQ14);            /* Set GPIRQ10 (ISA IRQ14) to IRQ14 */
+
 	write_mmcr_word(SC520_PCIHOSTMAP, 0x11f);                /* Map PCI hostbridge INT to NMI */
 	write_mmcr_word(SC520_ECCMAP, 0x100);                    /* Map SDRAM ECC failure INT to NMI */
- 
+
 }
 
-	
+
 /* PCI stuff */
 static void pci_sc520_cdp_fixup_irq(struct pci_controller *hose, pci_dev_t dev)
 {
@@ -125,64 +125,63 @@
 		CFG_FORTH_PCI_IRQ
 	};
 	static int next_irq_index=0;
-	
-	char tmp_pin;	
+
+	char tmp_pin;
 	int pin;
-	
+
 	pci_hose_read_config_byte(hose, dev, PCI_INTERRUPT_PIN, &tmp_pin);
 	pin = tmp_pin;
-	
+
 	pin-=1; /* pci config space use 1-based numbering */
 	if (-1 == pin) {
 		return; /* device use no irq */
 	}
-	
-	
-       
+
+
 	/* map device number +  pin to a pin on the sc520 */
 	switch (PCI_DEV(dev)) {
 	case 20:
 		pin+=SC520_PCI_INTA;
 		break;
-		
+
 	case 19:
 		pin+=SC520_PCI_INTB;
 		break;
-		
+
 	case 18:
 		pin+=SC520_PCI_INTC;
 		break;
-		
+
 	case 17:
 		pin+=SC520_PCI_INTD;
 		break;
-		
-	default: 
+
+	default:
 		return;
 	}
-	
+
 	pin&=3; /* wrap around */
-	
+
 	if (sc520_pci_ints[pin] == -1) {
-		/* re-route one interrupt for us */		
+		/* re-route one interrupt for us */
 		if (next_irq_index > 3) {
 			return;
 		}
-		if (pci_sc520_set_irq(pin, irq_list[next_irq_index])) { 
+		if (pci_sc520_set_irq(pin, irq_list[next_irq_index])) {
 			return;
 		}
 		next_irq_index++;
 	}
 
-	
+
 	if (-1 != sc520_pci_ints[pin]) {
-		pci_hose_write_config_byte(hose, dev, PCI_INTERRUPT_LINE, 
+		pci_hose_write_config_byte(hose, dev, PCI_INTERRUPT_LINE,
 					   sc520_pci_ints[pin]);
 	}
-	PRINTF("fixup_irq: device %d pin %c irq %d\n", 
+	PRINTF("fixup_irq: device %d pin %c irq %d\n",
 	       PCI_DEV(dev), 'A' + pin, sc520_pci_ints[pin]);
 }
- 
+
 static struct pci_controller sc520_cdp_hose = {
 	fixup_irq: pci_sc520_cdp_fixup_irq,
 };
@@ -201,7 +200,7 @@
 void setup_ali_sio(int uart_primary)
 {
 	ali512x_init();
-	
+
 	ali512x_set_fdc(ALI_ENABLED, 0x3f2, 6, 0);
 	ali512x_set_pp(ALI_ENABLED, 0x278, 7, 3);
 	ali512x_set_uart(ALI_ENABLED, ALI_UART1, uart_primary?0x3f8:0x3e8, 4);
@@ -209,21 +208,21 @@
 	ali512x_set_rtc(ALI_DISABLED, 0, 0);
 	ali512x_set_kbc(ALI_ENABLED, 1, 12);
 	ali512x_set_cio(ALI_ENABLED);
-	
+
 	/* IrDa pins */
 	ali512x_cio_function(12, 1, 0, 0);
 	ali512x_cio_function(13, 1, 0, 0);
-	
+
 	/* SSI chip select pins */
 	ali512x_cio_function(14, 0, 0, 0);  /* SSI_CS */
-	ali512x_cio_function(15, 0, 0, 0);  /* SSI_MV */ 
+	ali512x_cio_function(15, 0, 0, 0);  /* SSI_MV */
 	ali512x_cio_function(16, 0, 0, 0);  /* SSI_SPI# */
 
 	/* Board REV pins */
 	ali512x_cio_function(20, 0, 0, 1);
 	ali512x_cio_function(21, 0, 0, 1);
 	ali512x_cio_function(22, 0, 0, 1);
-	ali512x_cio_function(23, 0, 0, 1);      
+	ali512x_cio_function(23, 0, 0, 1);
 }
 
 
@@ -232,54 +231,53 @@
 {
 
 	/* set up the GP IO pins */
-	write_mmcr_word(SC520_PIOPFS31_16, 0xf7ff); 	/* set the GPIO pin function 31-16 reg */		   
+	write_mmcr_word(SC520_PIOPFS31_16, 0xf7ff); 	/* set the GPIO pin function 31-16 reg */
 	write_mmcr_word(SC520_PIOPFS15_0, 0xffff);  	/* set the GPIO pin function 15-0 reg */
-	write_mmcr_byte(SC520_CSPFS, 0xf8);  		/* set the CS pin function  reg */	
+	write_mmcr_byte(SC520_CSPFS, 0xf8);  		/* set the CS pin function  reg */
 	write_mmcr_byte(SC520_CLKSEL, 0x70);
 
-	
-	write_mmcr_byte(SC520_GPCSRT, 1);   /* set the GP CS offset */    	
+
+	write_mmcr_byte(SC520_GPCSRT, 1);   /* set the GP CS offset */
 	write_mmcr_byte(SC520_GPCSPW, 3);   /* set the GP CS pulse width */
 	write_mmcr_byte(SC520_GPCSOFF, 1);  /* set the GP CS offset */
 	write_mmcr_byte(SC520_GPRDW, 3);    /* set the RD pulse width */
 	write_mmcr_byte(SC520_GPRDOFF, 1);  /* set the GP RD offset */
-        write_mmcr_byte(SC520_GPWRW, 3);    /* set the GP WR pulse width */
+	write_mmcr_byte(SC520_GPWRW, 3);    /* set the GP WR pulse width */
 	write_mmcr_byte(SC520_GPWROFF, 1);  /* set the GP WR offset */
 
-	write_mmcr_word(SC520_BOOTCSCTL, 0x1823);		/* set up timing of BOOTCS */ 
+	write_mmcr_word(SC520_BOOTCSCTL, 0x1823);		/* set up timing of BOOTCS */
 	write_mmcr_word(SC520_ROMCS1CTL, 0x1823);		/* set up timing of ROMCS1 */
-	write_mmcr_word(SC520_ROMCS2CTL, 0x1823);		/* set up timing of ROMCS2 */ 
-	
+	write_mmcr_word(SC520_ROMCS2CTL, 0x1823);		/* set up timing of ROMCS2 */
+
 	/* adjust the memory map:
 	 * by default the first 256MB (0x00000000 - 0x0fffffff) is mapped to SDRAM
 	 * and 256MB to 1G-128k  (0x1000000 - 0x37ffffff) is mapped to PCI mmio
-	 * we need to map 1G-128k - 1G (0x38000000 - 0x3fffffff) to CS1 */ 
-	
-		
-	
+	 * we need to map 1G-128k - 1G (0x38000000 - 0x3fffffff) to CS1 */
+
+
 	/* SRAM = GPCS3 128k @ d0000-effff*/
-	write_mmcr_long(SC520_PAR2,  0x4e00400d);		
-	
+	write_mmcr_long(SC520_PAR2,  0x4e00400d);
+
 	/* IDE0 = GPCS6 1f0-1f7 */
-	write_mmcr_long(SC520_PAR3,  0x380801f0);		
+	write_mmcr_long(SC520_PAR3,  0x380801f0);
 
 	/* IDE1 = GPCS7 3f6 */
-	write_mmcr_long(SC520_PAR4,  0x3c0003f6);		
+	write_mmcr_long(SC520_PAR4,  0x3c0003f6);
 	/* bootcs */
-	write_mmcr_long(SC520_PAR12, 0x8bffe800);		
+	write_mmcr_long(SC520_PAR12, 0x8bffe800);
 	/* romcs2 */
-	write_mmcr_long(SC520_PAR13, 0xcbfff000);		
+	write_mmcr_long(SC520_PAR13, 0xcbfff000);
 	/* romcs1 */
-	write_mmcr_long(SC520_PAR14, 0xabfff800);		
+	write_mmcr_long(SC520_PAR14, 0xabfff800);
 	/* 680 LEDS */
-	write_mmcr_long(SC520_PAR15, 0x30000640);		
-	
+	write_mmcr_long(SC520_PAR15, 0x30000640);
+
 	write_mmcr_byte(SC520_ADDDECCTL, 0);
-	
-	asm ("wbinvd\n"); /* Flush cache, req. after setting the unchached attribute ona PAR */	
+
+	asm ("wbinvd\n"); /* Flush cache, req. after setting the unchached attribute ona PAR */
 
 	if (CFG_USE_SIO_UART) {
-		write_mmcr_byte(SC520_ADDDECCTL, read_mmcr_byte(SC520_ADDDECCTL) | UART2_DIS|UART1_DIS);	
+		write_mmcr_byte(SC520_ADDDECCTL, read_mmcr_byte(SC520_ADDDECCTL) | UART2_DIS|UART1_DIS);
 		setup_ali_sio(1);
 	} else {
 		write_mmcr_byte(SC520_ADDDECCTL, read_mmcr_byte(SC520_ADDDECCTL) & ~(UART2_DIS|UART1_DIS));
@@ -321,21 +319,21 @@
  * PAR15  Port 0x680 LED display
  */
 
-/* 
+/*
  * This function should map a chunk of size bytes
  * of the system address space to the ISA bus
- * 
+ *
  * The function will return the memory address
  * as seen by the host (which may very will be the
  * same as the bus address)
  */
-u32 isa_map_rom(u32 bus_addr, int size) 
+u32 isa_map_rom(u32 bus_addr, int size)
 {
 	u32 par;
-	
-	PRINTF("isa_map_rom asked to map %d bytes at %x\n", 
+
+	PRINTF("isa_map_rom asked to map %d bytes at %x\n",
 	       size, bus_addr);
-	
+
 	par = size;
 	if (par < 0x80000) {
 		par = 0x80000;
@@ -346,12 +344,12 @@
 	par <<= 18;
 	par |= (bus_addr>>12);
 	par |= 0x50000000;
-	
+
 	PRINTF ("setting PAR11 to %x\n", par);
-	
+
 	/* Map rom 0x10000 with PAR1 */
 	write_mmcr_long(SC520_PAR11,  par);
-	
+
 	return bus_addr;
 }
 
@@ -372,19 +370,19 @@
 
 #ifdef CONFIG_PCI
 #define PCI_ROM_TEMP_SPACE 0x10000
-/* 
+/*
  * This function should map a chunk of size bytes
  * of the system address space to the PCI bus,
  * suitable to map PCI ROMS (bus address < 16M)
  * the function will return the host memory address
  * which should be converted into a bus address
- * before used to configure the PCI rom address 
+ * before used to configure the PCI rom address
  * decoder
  */
-u32 pci_get_rom_window(struct pci_controller *hose, int size) 
+u32 pci_get_rom_window(struct pci_controller *hose, int size)
 {
 	u32 par;
-	
+
 	par = size;
 	if (par < 0x80000) {
 		par = 0x80000;
@@ -395,12 +393,12 @@
 	par <<= 14;
 	par |= (PCI_ROM_TEMP_SPACE>>16);
 	par |= 0x72000000;
-	
+
 	PRINTF ("setting PAR1 to %x\n", par);
-	
+
 	/* Map rom 0x10000 with PAR1 */
 	write_mmcr_long(SC520_PAR1,  par);
-	
+
 	return PCI_ROM_TEMP_SPACE;
 }
 
@@ -417,61 +415,61 @@
 		return;
 	}
 	PRINTF(" not ours\n");
-	
+
 }
 
 /*
  * This function is called in order to provide acces to the
- * legacy video I/O ports on the PCI bus. 
- * After this function accesses to I/O ports 0x3b0-0x3bb and 
+ * legacy video I/O ports on the PCI bus.
+ * After this function accesses to I/O ports 0x3b0-0x3bb and
  * 0x3c0-0x3df shuld result in transactions on the PCI bus.
- * 
+ *
  */
 int pci_enable_legacy_video_ports(struct pci_controller *hose)
 {
 	/* Map video memory to 0xa0000*/
 	write_mmcr_long(SC520_PAR0,  0x7200400a);
-	
+
 	/* forward all I/O accesses to PCI */
-	write_mmcr_byte(SC520_ADDDECCTL, 
-			read_mmcr_byte(SC520_ADDDECCTL) | IO_HOLE_DEST_PCI);	
-	
-	
+	write_mmcr_byte(SC520_ADDDECCTL,
+			read_mmcr_byte(SC520_ADDDECCTL) | IO_HOLE_DEST_PCI);
+
+
 	/* so we map away all io ports to pci (only way to access pci io
 	 * below 0x400. But then we have to map back the portions that we dont
 	 * use so that the generate cycles on the GPIO bus where the sio and
-	 * ISA slots are connected, this requre the use of several PAR registers 
+	 * ISA slots are connected, this requre the use of several PAR registers
 	 */
-	
+
 	/* bring 0x100 - 0x1ef back to ISA using PAR5 */
-	write_mmcr_long(SC520_PAR5, 0x30ef0100);		
-	
+	write_mmcr_long(SC520_PAR5, 0x30ef0100);
+
 	/* IDE use 1f0-1f7 */
-	
+
 	/* bring 0x1f8 - 0x2f7 back to ISA using PAR6 */
-	write_mmcr_long(SC520_PAR6, 0x30ff01f8);		
-	
+	write_mmcr_long(SC520_PAR6, 0x30ff01f8);
+
 	/* com2 use 2f8-2ff */
-	
+
 	/* bring 0x300 - 0x3af back to ISA using PAR7 */
-	write_mmcr_long(SC520_PAR7, 0x30af0300);		
-	
+	write_mmcr_long(SC520_PAR7, 0x30af0300);
+
 	/* vga use 3b0-3bb */
-	
+
 	/* bring 0x3bc - 0x3bf back to ISA using PAR8 */
-	write_mmcr_long(SC520_PAR8, 0x300303bc);		
-	
+	write_mmcr_long(SC520_PAR8, 0x300303bc);
+
 	/* vga use 3c0-3df */
-	
+
 	/* bring 0x3e0 - 0x3f5 back to ISA using PAR9 */
-	write_mmcr_long(SC520_PAR9, 0x301503e0);		
-	
+	write_mmcr_long(SC520_PAR9, 0x301503e0);
+
 	/* ide use 3f6 */
-	
+
 	/* bring 0x3f7  back to ISA using PAR10 */
-	write_mmcr_long(SC520_PAR10, 0x300003f7);		
-	
-	/* com1 use 3f8-3ff */		
+	write_mmcr_long(SC520_PAR10, 0x300003f7);
+
+	/* com1 use 3f8-3ff */
 
 	return 0;
 }
@@ -484,20 +482,20 @@
 int board_init(void)
 {
 	DECLARE_GLOBAL_DATA_PTR;
-	
-	init_sc520();	
+
+	init_sc520();
 	bus_init();
 	irq_init();
-		
+
 	/* max drive current on SDRAM */
 	write_mmcr_word(SC520_DSCTL, 0x0100);
-		
+
 	/* enter debug mode after next reset (only if jumper is also set) */
 	write_mmcr_byte(SC520_RESCFG, 0x08);
 	/* configure the software timer to 33.333MHz */
 	write_mmcr_byte(SC520_SWTMRCFG, 0);
 	gd->bus_clk = 33333000;
-	
+
 	return 0;
 }
 
@@ -518,98 +516,96 @@
 {
 	int minor;
 	int major;
-	
+
 	major = minor = 0;
 	major |= ali512x_cio_in(23)?2:0;
 	major |= ali512x_cio_in(22)?1:0;
 	minor |= ali512x_cio_in(21)?2:0;
 	minor |= ali512x_cio_in(20)?1:0;
-	
+
 	printf("AMD SC520 CDP revision %d.%d\n", major, minor);
-	
+
 	return 0;
 }
 
 
-
-void ssi_chip_select(int dev) 
+void ssi_chip_select(int dev)
 {
-	
+
 	/* Spunk board: SPI EEPROM is active-low, MW EEPROM and AUX are active high */
 	switch (dev) {
 	case 1: /* SPI EEPROM */
 		ali512x_cio_out(16, 0);
 		break;
-		
+
 	case 2: /* MW EEPROM */
 		ali512x_cio_out(15, 1);
 		break;
-		
-	case 3: /* AUX */				
+
+	case 3: /* AUX */
 		ali512x_cio_out(14, 1);
 		break;
-		
+
 	case 0:
 		ali512x_cio_out(16, 1);
 		ali512x_cio_out(15, 0);
 		ali512x_cio_out(14, 0);
 		break;
-		
+
 	default:
 		printf("Illegal SSI device requested: %d\n", dev);
 	}
 }
 
 
-void spi_init_f(void) 
+void spi_init_f(void)
 {
 #ifdef CONFIG_SC520_CDP_USE_SPI
-	spi_eeprom_probe(1); 
-#endif	
+	spi_eeprom_probe(1);
+#endif
 #ifdef CONFIG_SC520_CDP_USE_MW
 	mw_eeprom_probe(2);
-#endif		
+#endif
 }
 
-ssize_t spi_read(uchar *addr, int alen, uchar *buffer, int len) 
+ssize_t spi_read(uchar *addr, int alen, uchar *buffer, int len)
 {
 	int offset;
 	int i;
 	ssize_t res;
-	
+
 	offset = 0;
 	for (i=0;i<alen;i++) {
 		offset <<= 8;
 		offset |= addr[i];
 	}
- 
+
 #ifdef CONFIG_SC520_CDP_USE_SPI
-	res = spi_eeprom_read(1, offset, buffer, len); 
-#endif	
+	res = spi_eeprom_read(1, offset, buffer, len);
+#endif
 #ifdef CONFIG_SC520_CDP_USE_MW
 	res = mw_eeprom_read(2, offset, buffer, len);
-#endif	
+#endif
 	return res;
 }
 
-ssize_t spi_write(uchar *addr, int alen, uchar *buffer, int len) 
+ssize_t spi_write(uchar *addr, int alen, uchar *buffer, int len)
 {
 	int offset;
 	int i;
 	ssize_t res;
-	
+
 	offset = 0;
 	for (i=0;i<alen;i++) {
 		offset <<= 8;
 		offset |= addr[i];
 	}
-		
+
 #ifdef CONFIG_SC520_CDP_USE_SPI
 	res = spi_eeprom_write(1, offset, buffer, len);
-#endif	
+#endif
 #ifdef CONFIG_SC520_CDP_USE_MW
 	res = mw_eeprom_write(2, offset, buffer, len);
-#endif	
+#endif
 	return res;
 }
-

diff --git a/board/sc520_cdp/sc520_cdp_asm.S b/board/sc520_cdp/sc520_cdp_asm.S
index 1e255fa..be7b2bb 100644
--- a/board/sc520_cdp/sc520_cdp_asm.S
+++ b/board/sc520_cdp/sc520_cdp_asm.S

@@ -23,7 +23,7 @@
 
 /* now setup the General purpose bus to give us access to the LEDs.
  * We can then use the leds to display status information.
- */ 
+ */
 
 sc520_cdp_registers:
 /* size    offset        value */
@@ -45,12 +45,12 @@
 /* board early intialization */
 .globl early_board_init
 early_board_init:
-        movl    $sc520_cdp_registers,%esi
-init_loop:	
-        movl    $0xfffef000,%edi     /* MMCR base to edi */					
+	movl    $sc520_cdp_registers,%esi
+init_loop:
+	movl    $0xfffef000,%edi     /* MMCR base to edi */
 	movw	(%esi), %bx          /* load sizer to bx */
 	cmpw	$0, %bx              /* if sie is 0 we're done */
-	je	done 
+	je	done
 	xorl	%edx,%edx
 	movw	2(%esi), %dx        /* load MMCR offset to dx */
 	addl	%edx, %edi          /* add offset to base in edi */
@@ -61,7 +61,7 @@
 	je	word                 /* word op? */
 	movl	%eax, (%edi)         /* must be long, then */
 	jmp	next
-byte:   movb    %al,(%edi)        
+byte:   movb    %al,(%edi)
 	jmp	next
 word:	movw	%ax,(%edi)
 next:	addl	$8, %esi             /* advance esi */
@@ -83,4 +83,3 @@
 	movw	$0x680, %dx
 	out	%al, %dx
 	jmp	*%ebp
-	

diff --git a/board/sc520_cdp/sc520_cdp_asm16.S b/board/sc520_cdp/sc520_cdp_asm16.S
index 0e0b0c0..a3e700a 100644
--- a/board/sc520_cdp/sc520_cdp_asm16.S
+++ b/board/sc520_cdp/sc520_cdp_asm16.S

@@ -34,32 +34,32 @@
 board_init16:
 	/* Alias MMCR to 0xdf000 */
 	movw	$0xfffc, %dx
-	movl	$0x800df0cb, %eax	
-	outl	%eax, %dx		
-	
+	movl	$0x800df0cb, %eax
+	outl	%eax, %dx
+
 	/* Set ds to point to MMCR alias */
-	movw	$0xdf00, %ax		
-	movw	%ax, %ds		 
-		
-	/* Map the entire flash at 0x38000000  
+	movw	$0xdf00, %ax
+	movw	%ax, %ds
+
+	/* Map the entire flash at 0x38000000
 	 * (with BOOTCS and PAR14, use 0xabfff800 for ROMCS1) */
 	movl    $0xc0, %edi
-        movl	$0x8bfff800, %eax
-        movl	%eax, (%di)		
+	movl	$0x8bfff800, %eax
+	movl	%eax, (%di)
 
 	/* Disable SDRAM write buffer */
 	movw    $0x40,%di
-        xorw    %ax,%ax
-        movb    %al, (%di)              
+	xorw    %ax,%ax
+	movb    %al, (%di)
 
 	/* Disabe MMCR alias */
 	movw	$0xfffc, %dx
-	movl	$0x000000cb, %eax	
-	outl	%eax, %dx		
-	
+	movl	$0x000000cb, %eax
+	outl	%eax, %dx
+
 	/* the return address is tored in bp */
 	jmp	*%bp
-	
+
 
 .section .bios, "ax"
 .code16
@@ -67,18 +67,17 @@
 realmode_reset:
 	/* Alias MMCR to 0xdf000 */
 	movw	$0xfffc, %dx
-	movl	$0x800df0cb, %eax	
-	outl	%eax, %dx		
-	
+	movl	$0x800df0cb, %eax
+	outl	%eax, %dx
+
 	/* Set ds to point to MMCR alias */
-	movw	$0xdf00, %ax		
-	movw	%ax, %ds		 
-		
+	movw	$0xdf00, %ax
+	movw	%ax, %ds
+
 	/* issue software reset thorugh MMCR */
 	movl    $0xd72, %edi
-        movb	$0x01, %al
-        movb	%al, (%di)		
+	movb	$0x01, %al
+	movb	%al, (%di)
 
 1:	hlt
 	jmp	1
-	

diff --git a/board/sc520_cdp/u-boot.lds b/board/sc520_cdp/u-boot.lds
index fbab9b8..1944a74 100644
--- a/board/sc520_cdp/u-boot.lds
+++ b/board/sc520_cdp/u-boot.lds

@@ -26,60 +26,65 @@
 ENTRY(_start)
 
 SECTIONS
-{	
+{
 	. = 0x387c0000;                     /* Where bootcode in the flash is mapped */
 	.text  : { *(.text); }
-	
-        . = ALIGN(4);
-        .rodata : { *(.rodata) }
 
-        . = 0x400000; 	                    /* Ram data segment to use */
+	. = ALIGN(4);
+	.rodata : { *(.rodata) }
+
+	. = 0x400000; 	                    /* Ram data segment to use */
 	_i386boot_romdata_dest = ABSOLUTE(.);
-        .data : AT ( LOADADDR(.rodata) + SIZEOF(.rodata) ) { *(.data) }
-	_i386boot_romdata_start = LOADADDR(.data); 	
+	.data : AT ( LOADADDR(.rodata) + SIZEOF(.rodata) ) { *(.data) }
+	_i386boot_romdata_start = LOADADDR(.data);
 
-        . = ALIGN(4);
-        .got : AT ( LOADADDR(.data) + SIZEOF(.data) ) { *(.got) }
-	_i386boot_romdata_size = SIZEOF(.data) + SIZEOF(.got); 	
+	. = ALIGN(4);
+	.got : AT ( LOADADDR(.data) + SIZEOF(.data) ) { *(.got) }
+	_i386boot_romdata_size = SIZEOF(.data) + SIZEOF(.got);
 
 
-        . = ALIGN(4);
+	. = ALIGN(4);
 	_i386boot_bss_start = ABSOLUTE(.);
-        .bss : { *(.bss) }	
+	.bss : { *(.bss) }
 	_i386boot_bss_size = SIZEOF(.bss);
-	
-	
+
+
 	/* 16bit realmode trampoline code */
 	.realmode 0x7c0 : AT ( LOADADDR(.got) + SIZEOF(.got) ) { *(.realmode) }
-    
+
 	_i386boot_realmode = LOADADDR(.realmode);
 	_i386boot_realmode_size = SIZEOF(.realmode);
-	
+
 	/* 16bit BIOS emulation code (just enough to boot Linux) */
 	.bios 0 : AT ( LOADADDR(.realmode) + SIZEOF(.realmode) ) { *(.bios) }
-    
+
 	_i386boot_bios = LOADADDR(.bios);
 	_i386boot_bios_size = SIZEOF(.bios);
-	
+
+
+  __u_boot_cmd_start = .;
+  .u_boot_cmd : { *(.u_boot_cmd) }
+  __u_boot_cmd_end = .;
+
 
 	/* The load addresses below assumes that the flash
 	 * will be mapped so that 0x387f0000 == 0xffff0000
 	 * at reset time
 	 *
-	 * The fe00 and ff00 offsets of the start32 and start16 
+	 * The fe00 and ff00 offsets of the start32 and start16
 	 * segments are arbitrary, the just have to be mapped
 	 * at reset and the code have to fit.
 	 * The fff0 offset of reset is important, however.
 	 */
-	 
-	 
+
+
 	. = 0xfffffe00;
-	.start32 : AT (0x387ffe00) { *(.start32); } 
-	
+	.start32 : AT (0x387ffe00) { *(.start32); }
+
 	. = 0xff00;
-	.start16 : AT (0x387fff00) { *(.start16); }  
-	
+	.start16 : AT (0x387fff00) { *(.start16); }
+
 	. = 0xfff0;
-	.reset : AT (0x387ffff0) { *(.reset); }  
+	.reset : AT (0x387ffff0) { *(.reset); }
 	_i386boot_end = (LOADADDR(.reset) + SIZEOF(.reset) );
 }

diff --git a/board/sc520_spunk/Makefile b/board/sc520_spunk/Makefile
index 53217c3..242d53c 100644
--- a/board/sc520_spunk/Makefile
+++ b/board/sc520_spunk/Makefile

@@ -29,7 +29,7 @@
 SOBJS	:= sc520_spunk_asm.o sc520_spunk_asm16.o
 
 $(LIB):	$(OBJS) $(SOBJS)
-	$(AR) crv $@ $^
+	$(AR) crv $@ $(OBJS)
 
 clean:
 	rm -f $(SOBJS) $(OBJS)

diff --git a/board/sc520_spunk/flash.c b/board/sc520_spunk/flash.c
index 66ef720..d97dc21 100644
--- a/board/sc520_spunk/flash.c
+++ b/board/sc520_spunk/flash.c

@@ -1,7 +1,7 @@
 /*
  * (C) Copyright 2002, 2003
  * Daniel Engström, Omicron Ceti AB, daniel@omicron.se
- * 
+ *
  * (C) Copyright 2002
  * Sysgo Real-Time Solutions, GmbH <www.elinos.com>
  * Alex Zuepke <azu@sysgo.de>
@@ -66,122 +66,121 @@
 static u32 _probe_flash(u32 addr, u32 bw, int il)
 {
 	u32 result=0;
-	
+
 	/* First do an unlock cycle for the benefit of
 	 * devices that need it */
-	
+
 	switch (bw) {
-		
+
 	case 1:
 		*(volatile u8*)(addr+0x5555) = 0xaa;
 		*(volatile u8*)(addr+0x2aaa) = 0x55;
 		*(volatile u8*)(addr+0x5555) = 0x90;
-		
+
 		/* Read vendor */
 		result = *(volatile u8*)addr;
 		result <<= 16;
-		
+
 		/* Read device */
 		result |= *(volatile u8*)(addr+2);
-		
+
 		/* Return device to data mode */
 		*(volatile u8*)addr = 0xff;
-		*(volatile u8*)(addr+0x5555), 0xf0;  
+		*(volatile u8*)(addr+0x5555), 0xf0;
 		break;
-		
+
 	case 2:
 		*(volatile u16*)(addr+0xaaaa) = 0xaaaa;
 		*(volatile u16*)(addr+0x5554) = 0x5555;
-		
+
 		/* Issue identification command */
 		if (il == 2) {
 			*(volatile u16*)(addr+0xaaaa) = 0x9090;
-			
+
 			/* Read vendor */
 			result = *(volatile u8*)addr;
 			result <<= 16;
-			
+
 			/* Read device */
 			result |= *(volatile u8*)(addr+2);
-			
+
 			/* Return device to data mode */
 			*(volatile u16*)addr =  0xffff;
-			*(volatile u16*)(addr+0xaaaa), 0xf0f0;  
-			
+			*(volatile u16*)(addr+0xaaaa), 0xf0f0;
+
 		} else {
 			*(volatile u8*)(addr+0xaaaa) = 0x90;
 			/* Read vendor */
 			result = *(volatile u16*)addr;
 			result <<= 16;
-			
+
 			/* Read device */
 			result |= *(volatile u16*)(addr+2);
-			
+
 			/* Return device to data mode */
 			*(volatile u8*)addr = 0xff;
-			*(volatile u8*)(addr+0xaaaa), 0xf0;  			
+			*(volatile u8*)(addr+0xaaaa), 0xf0;
 		}
-		
+
 		break;
-		
+
 	 case 4:
 		*(volatile u32*)(addr+0x5554) = 0xaaaaaaaa;
 		*(volatile u32*)(addr+0xaaa8) = 0x55555555;
-		
+
 		switch (il) {
 		case 1:
 			/* Issue identification command */
 			*(volatile u8*)(addr+0x5554) = 0x90;
-			
+
 			/* Read vendor */
 			result = *(volatile u16*)addr;
 			result <<= 16;
-		
+
 			/* Read device */
 			result |= *(volatile u16*)(addr+4);
-			
+
 			/* Return device to data mode */
 			*(volatile u8*)addr =  0xff;
-			*(volatile u8*)(addr+0x5554), 0xf0;  
+			*(volatile u8*)(addr+0x5554), 0xf0;
 			break;
-			
+
 		case 2:
 			/* Issue identification command */
 			*(volatile u32*)(addr + 0x5554) = 0x00900090;
-			
+
 			/* Read vendor */
 			result = *(volatile u16*)addr;
 			result <<= 16;
-			
+
 			/* Read device */
 			result |= *(volatile u16*)(addr+4);
-			
+
 			/* Return device to data mode */
 			*(volatile u32*)addr =  0x00ff00ff;
-			*(volatile u32*)(addr+0x5554), 0x00f000f0;  
+			*(volatile u32*)(addr+0x5554), 0x00f000f0;
 			break;
-			
+
 		case 4:
 			/* Issue identification command */
 			*(volatile u32*)(addr+0x5554) = 0x90909090;
-			
+
 			/* Read vendor */
 			result = *(volatile u8*)addr;
 			result <<= 16;
-			
+
 			/* Read device */
 			result |= *(volatile u8*)(addr+4);
-			
+
 			/* Return device to data mode */
 			*(volatile u32*)addr =  0xffffffff;
-			*(volatile u32*)(addr+0x5554), 0xf0f0f0f0; 
+			*(volatile u32*)(addr+0x5554), 0xf0f0f0f0;
 			break;
 		}
 		break;
 	}
-	
-	
-	
+
+
 	return result;
 }
 
@@ -191,36 +190,36 @@
 
 static int identify_flash(unsigned address, int width)
 {
-	int is;	
+	int is;
 	int device;
-	int vendor;	
+	int vendor;
 	int size;
 	unsigned res;
-	
+
 	u32 (*_probe_flash_ptr)(u32 a, u32 bw, int il);
-	
-	size = (unsigned)&_probe_flash_end - (unsigned)_probe_flash; 
-	
+
+	size = (unsigned)&_probe_flash_end - (unsigned)_probe_flash;
+
 	if (size > PROBE_BUFFER_SIZE) {
 		printf("_probe_flash() routine too large (%d) %p - %p\n",
 		       size, &_probe_flash_end, _probe_flash);
 		return 0;
 	}
-	
+
 	memcpy(buffer, _probe_flash, size);
 	_probe_flash_ptr = (void*)buffer;
-	
+
 	is = disable_interrupts();
 	res = _probe_flash_ptr(address, width, 1);
 	if (is) {
 		enable_interrupts();
 	}
-	
-	
-        vendor = res >> 16;
+
+
+	vendor = res >> 16;
 	device = res & 0xffff;
-	
-		
+
+
 	return res;
 }
 
@@ -228,12 +227,12 @@
 {
 	int i, j;
 	ulong size = 0;
-	
+
 	for (i = 0; i < SC520_MAX_FLASH_BANKS; i++) {
 		unsigned id;
 		ulong flashbase = 0;
-		int sectsize = 0; 
-		
+		int sectsize = 0;
+
 		memset(flash_info[i].protect, 0, CFG_MAX_FLASH_SECT);
 		switch (i) {
 		case 0:
@@ -242,7 +241,7 @@
 		default:
 			panic("configured to many flash banks!\n");
 		}
-		
+
 		id = identify_flash(flashbase, 2);
 		switch (id) {
 		case 0x000122d7:
@@ -250,78 +249,78 @@
 			flash_info[i].flash_id =
 				(AMD_MANUFACT & FLASH_VENDMASK) |
 				(AMD_ID_LV640U & FLASH_TYPEMASK);
-			
+
 			flash_info[i].size = A29LV641DH_SIZE;
 			flash_info[i].sector_count = A29LV641DH_SECTORS;
 			sectsize = A29LV641DH_SIZE/A29LV641DH_SECTORS;
 			printf("Bank %d: AMD 29LV641DH\n", i);
 			break;
-			
+
 		case 0x0001227E:
 			/* 29LV641MH */
 			flash_info[i].flash_id =
 				(AMD_MANUFACT & FLASH_VENDMASK) |
 				(AMD_ID_DL640 & FLASH_TYPEMASK);
-			
+
 			flash_info[i].size = A29LV641MH_SIZE;
 			flash_info[i].sector_count = A29LV641MH_SECTORS;
 			sectsize = A29LV641MH_SIZE/A29LV641MH_SECTORS;
 			printf("Bank %d: AMD 29LV641MH\n", i);
 			break;
-			
+
 		case 0x00890016:
 			/* 28F320J3A */
 			flash_info[i].flash_id =
 				(INTEL_MANUFACT & FLASH_VENDMASK) |
 				(INTEL_ID_28F320J3A & FLASH_TYPEMASK);
-			
+
 			flash_info[i].size = I28F320J3A_SIZE;
 			flash_info[i].sector_count = I28F320J3A_SECTORS;
 			sectsize = I28F320J3A_SIZE/I28F320J3A_SECTORS;
 			printf("Bank %d: Intel 28F320J3A\n", i);
 			break;
-			
+
 		case 0x00890017:
 			/* 28F640J3A */
 			flash_info[i].flash_id =
 				(INTEL_MANUFACT & FLASH_VENDMASK) |
 				(INTEL_ID_28F640J3A & FLASH_TYPEMASK);
-			
+
 			flash_info[i].size = I28F640J3A_SIZE;
 			flash_info[i].sector_count = I28F640J3A_SECTORS;
 			sectsize = I28F640J3A_SIZE/I28F640J3A_SECTORS;
 			printf("Bank %d: Intel 28F640J3A\n", i);
 			break;
-			
+
 		case 0x00890018:
 			/* 28F128J3A */
 			flash_info[i].flash_id =
 				(INTEL_MANUFACT & FLASH_VENDMASK) |
 				(INTEL_ID_28F128J3A & FLASH_TYPEMASK);
-			
+
 			flash_info[i].size = I28F128J3A_SIZE;
 			flash_info[i].sector_count = I28F128J3A_SECTORS;
 			sectsize = I28F128J3A_SIZE/I28F128J3A_SECTORS;
 			printf("Bank %d: Intel 28F128J3A\n", i);
 			break;
-			
+
 		default:
 			printf("Bank %d have unknown flash %08x\n", i, id);
 			flash_info[i].flash_id = FLASH_UNKNOWN;
 			continue;
 		}
-		
+
 		for (j = 0; j < flash_info[i].sector_count; j++) {
 			flash_info[i].start[j] = flashbase + j * sectsize;
 		}
 		size += flash_info[i].size;
-		
+
 		flash_protect(FLAG_PROTECT_CLEAR,
 			      flash_info[i].start[0],
 			       flash_info[i].start[0] + flash_info[i].size - 1,
 			      &flash_info[i]);
 	}
-	
+
 	/*
 	 * Protect monitor and environment sectors
 	 */
@@ -334,7 +333,7 @@
 		      CFG_ENV_ADDR,
 		      CFG_ENV_ADDR + CFG_ENV_SIZE - 1,
 		      &flash_info[0]);
-#endif	
+#endif
 	return size;
 }
 
@@ -343,7 +342,7 @@
 void flash_print_info(flash_info_t *info)
 {
 	int i;
-	
+
 	switch (info->flash_id & FLASH_VENDMASK) {
 	case (INTEL_MANUFACT & FLASH_VENDMASK):
 		printf("INTEL: ");
@@ -362,9 +361,9 @@
 			goto done;
 			break;
 		}
-		
+
 		break;
-		
+
 	case (AMD_MANUFACT & FLASH_VENDMASK):
 		printf("AMD:   ");
 		switch (info->flash_id & FLASH_TYPEMASK) {
@@ -379,17 +378,17 @@
 			goto done;
 			break;
 		}
-		
+
 		break;
 	default:
 		printf("Unknown Vendor ");
 		break;
 	}
-	
-	
+
+
 	printf("  Size: %ld MB in %d Sectors\n",
 	       info->size >> 20, info->sector_count);
-	
+
 	printf("  Sector Start Addresses:");
 	for (i = 0; i < info->sector_count; i++) {
 		if ((i % 5) == 0) {
@@ -399,7 +398,7 @@
 			info->protect[i] ? " (RO)" : "     ");
 	}
 	printf ("\n");
-	
+
 	done:
 }
 
@@ -410,7 +409,7 @@
 static u32 _amd_erase_flash(u32 addr, u32 sector)
 {
 	unsigned elapsed;
-	
+
 	/* Issue erase */
 	*(volatile u16*)(addr + 0xaaaa) = 0x00AA;
 	*(volatile u16*)(addr + 0x5554) = 0x0055;
@@ -420,20 +419,20 @@
 	*(volatile u16*)(addr + 0x5554) = 0x0055;
 	/* Sector erase command comes last */
 	*(volatile u16*)(addr + sector) = 0x0030;
-	
+
 	elapsed = *(volatile u16*)(0xfffef000+SC520_SWTMRMILLI); /* dummy read */
 	elapsed = 0;
 	while (((*(volatile u16*)(addr + sector)) & 0x0080) != 0x0080) {
-		
+
 		elapsed += *(volatile u16*)(0xfffef000+SC520_SWTMRMILLI);
 		if (elapsed > ((CFG_FLASH_ERASE_TOUT/CFG_HZ) * 1000)) {
 			*(volatile u16*)(addr) = 0x00f0;
-			return 1;			
+			return 1;
 		}
 	}
-	
+
 	*(volatile u16*)(addr) = 0x00f0;
-	
+
 	return 0;
 }
 
@@ -448,7 +447,7 @@
 	unsigned milli=0; \
 	\
 	micro = *(volatile u16*)(0xfffef000+SC520_SWTMRMILLI); \
-         \
+	 \
 	for (;;) { \
 		\
 		milli += *(volatile u16*)(0xfffef000+SC520_SWTMRMILLI); \
@@ -458,32 +457,32 @@
 			break; \
 		} \
 	} \
-} while (0) 
+} while (0)
 
 static u32 _intel_erase_flash(u32 addr, u32 sector)
-{	
+{
 	unsigned elapsed;
-	
+
 	*(volatile u16*)(addr + sector) = 0x0050;   /* clear status register */
 	*(volatile u16*)(addr + sector) = 0x0020;   /* erase setup */
 	*(volatile u16*)(addr + sector) = 0x00D0;   /* erase confirm */
 
-	
+
 	/* Wait at least 80us - let's wait 1 ms */
 	__udelay(1000);
-	
+
 	elapsed = 0;
 	while (((*(volatile u16*)(addr + sector)) & 0x0080) != 0x0080) {
 		elapsed += *(volatile u16*)(0xfffef000+SC520_SWTMRMILLI);
 		if (elapsed > ((CFG_FLASH_ERASE_TOUT/CFG_HZ) * 1000)) {
 			*(volatile u16*)(addr + sector) = 0x00B0;  /* suspend erase      */
 			*(volatile u16*)(addr + sector) = 0x00FF;  /* reset to read mode */
-			return 1;			
+			return 1;
 		}
 	}
-	
+
 	*(volatile u16*)(addr + sector) = 0x00FF;  /* reset to read mode */
-	
+
 	return 0;
 }
 
@@ -498,7 +497,7 @@
 	int prot;
 	int sect;
 	unsigned size;
-	
+
 	if ((s_first < 0) || (s_first > s_last)) {
 		if (info->flash_id == FLASH_UNKNOWN) {
 			printf("- missing\n");
@@ -507,77 +506,77 @@
 		}
 		return 1;
 	}
-	
+
 	if ((info->flash_id & FLASH_VENDMASK) == (AMD_MANUFACT & FLASH_VENDMASK)) {
-		size = (unsigned)&_amd_erase_flash_end - (unsigned)_amd_erase_flash; 
-		
+		size = (unsigned)&_amd_erase_flash_end - (unsigned)_amd_erase_flash;
+
 		if (size > PROBE_BUFFER_SIZE) {
 			printf("_amd_erase_flash() routine too large (%d) %p - %p\n",
 			       size, &_amd_erase_flash_end, _amd_erase_flash);
 			return 0;
 		}
-		
+
 		memcpy(buffer, _amd_erase_flash, size);
 		_erase_flash_ptr = (void*)buffer;
-	
+
 	} else if ((info->flash_id & FLASH_VENDMASK) == (INTEL_MANUFACT & FLASH_VENDMASK)) {
-		size = (unsigned)&_intel_erase_flash_end - (unsigned)_intel_erase_flash; 
-		
+		size = (unsigned)&_intel_erase_flash_end - (unsigned)_intel_erase_flash;
+
 		if (size > PROBE_BUFFER_SIZE) {
 			printf("_intel_erase_flash() routine too large (%d) %p - %p\n",
 			       size, &_intel_erase_flash_end, _intel_erase_flash);
 			return 0;
 		}
-		
+
 		memcpy(buffer, _intel_erase_flash, size);
 		_erase_flash_ptr = (void*)buffer;
 	} else {
 		printf ("Can't erase unknown flash type - aborted\n");
 		return 1;
 	}
-	
+
 	prot = 0;
 	for (sect=s_first; sect<=s_last; ++sect) {
 		if (info->protect[sect]) {
 			prot++;
 		}
 	}
-	
+
 	if (prot) {
 		printf ("- Warning: %d protected sectors will not be erased!\n", prot);
 	} else {
 		printf ("\n");
 	}
-		
-	
+
+
 	/* Start erase on unprotected sectors */
 	for (sect = s_first; sect<=s_last; sect++) {
-		
+
 		if (info->protect[sect] == 0) { /* not protected */
 			int res;
 			int flag;
-			
+
 			/* Disable interrupts which might cause a timeout here */
 			flag = disable_interrupts();
-			
+
 			res = _erase_flash_ptr(info->start[0], info->start[sect]-info->start[0]);
-			
+
 			/* re-enable interrupts if necessary */
 			if (flag) {
 				enable_interrupts();
 			}
-			
-			
+
+
 			if (res) {
 				printf("Erase timed out, sector %d\n", sect);
 				return res;
 			}
-			
-			putc('.');			
-		}		
+
+			putc('.');
+		}
 	}
 
-	
+
 	return 0;
 }
 
@@ -594,36 +593,36 @@
 	volatile u16 *data2 = (u16*)&data;
 	int i;
 	unsigned elapsed;
-	
+
 	/* Check if Flash is (sufficiently) erased */
 	if ((*((volatile u16*)dest) & (u16)data) != (u16)data) {
 		return 2;
 	}
-	
+
 	for (i = 0; i < 2; i++) {
-		
-		
+
+
 		addr2[0x5555] = 0x00AA;
 		addr2[0x2aaa] = 0x0055;
 		addr2[0x5555] = 0x00A0;
-		
+
 		dest2[i] = (data >> (i*16)) & 0xffff;
-		
+
 		elapsed = *(volatile u16*)(0xfffef000+SC520_SWTMRMILLI); /* dummy read */
 		elapsed = 0;
-		
+
 		/* data polling for D7 */
 		while ((dest2[i] & 0x0080) != (data2[i] & 0x0080)) {
 			elapsed += *(volatile u16*)(0xfffef000+SC520_SWTMRMILLI);
 			if (elapsed > ((CFG_FLASH_WRITE_TOUT/CFG_HZ) * 1000)) {
 				addr2[i] = 0x00f0;
-				return 1;			
+				return 1;
 			}
 		}
 	}
-	
+
 	addr2[i] = 0x00f0;
-	
+
 	return 0;
 }
 
@@ -632,38 +631,37 @@
      ".long 0\n");
 
 
-
 static int _intel_write_word(unsigned start, unsigned dest, unsigned data)
 {
 	int i;
 	unsigned elapsed;
-	
+
 	/* Check if Flash is (sufficiently) erased */
 	if ((*((volatile u16*)dest) & (u16)data) != (u16)data) {
 		return 2;
 	}
-	
+
 	for (i = 0; i < 2; i++) {
-		
-		*(volatile u16*)(dest+2*i) = 0x0040; /* write setup */		
+
+		*(volatile u16*)(dest+2*i) = 0x0040; /* write setup */
 		*(volatile u16*)(dest+2*i) = (data >> (i*16)) & 0xffff;
-		
+
 		elapsed = *(volatile u16*)(0xfffef000+SC520_SWTMRMILLI); /* dummy read */
 		elapsed = 0;
-		
+
 		/* data polling for D7 */
 		while ((*(volatile u16*)dest & 0x0080) != 0x0080) {
 			elapsed += *(volatile u16*)(0xfffef000+SC520_SWTMRMILLI);
 			if (elapsed > ((CFG_FLASH_WRITE_TOUT/CFG_HZ) * 1000)) {
 				*(volatile u16*)dest = 0x00ff;
-				return 1;			
+				return 1;
 			}
 		}
 	}
-	
+
 	*(volatile u16*)dest = 0x00ff;
-	
-	
+
+
 	return 0;
 
 }
@@ -688,28 +686,28 @@
 	int flag;
 	u32 (*_write_word_ptr)(unsigned start, unsigned dest, unsigned data);
 	unsigned size;
-	
+
 	if ((info->flash_id & FLASH_VENDMASK) == (AMD_MANUFACT & FLASH_VENDMASK)) {
-		size = (unsigned)&_amd_write_word_end - (unsigned)_amd_write_word; 
-		
+		size = (unsigned)&_amd_write_word_end - (unsigned)_amd_write_word;
+
 		if (size > PROBE_BUFFER_SIZE) {
 			printf("_amd_write_word() routine too large (%d) %p - %p\n",
 			       size, &_amd_write_word_end, _amd_write_word);
 			return 0;
 		}
-		
+
 		memcpy(buffer, _amd_write_word, size);
 		_write_word_ptr = (void*)buffer;
-	
+
 	} else if ((info->flash_id & FLASH_VENDMASK) == (INTEL_MANUFACT & FLASH_VENDMASK)) {
-		size = (unsigned)&_intel_write_word_end - (unsigned)_intel_write_word; 
-		
+		size = (unsigned)&_intel_write_word_end - (unsigned)_intel_write_word;
+
 		if (size > PROBE_BUFFER_SIZE) {
 			printf("_intel_write_word() routine too large (%d) %p - %p\n",
 			       size, &_intel_write_word_end, _intel_write_word);
 			return 0;
 		}
-		
+
 		memcpy(buffer, _intel_write_word, size);
 		_write_word_ptr = (void*)buffer;
 	} else {
@@ -719,7 +717,7 @@
 
 
 	wp = (addr & ~3);	/* get lower word aligned address */
-	
+
 
 	/*
 	 * handle unaligned start bytes
@@ -737,12 +735,12 @@
 		for (; cnt==0 && i<4; ++i, ++cp) {
 			data |= (*(uchar *)cp)  << (8*i);
 		}
-		
+
 		/* Disable interrupts which might cause a timeout here */
 		flag = disable_interrupts();
-		
+
 		rc = _write_word_ptr(info->start[0], wp, data);
-		
+
 		/* re-enable interrupts if necessary */
 		if (flag) {
 			enable_interrupts();
@@ -752,22 +750,22 @@
 		}
 		wp += 4;
 	}
-	
+
 	/*
 	 * handle word aligned part
 	 */
 	while (cnt >= 4) {
 		data = 0;
-			       
+
 		for (i=0; i<4; ++i) {
 			data |= *src++ << (8*i);
 		}
-		
+
 		/* Disable interrupts which might cause a timeout here */
 		flag = disable_interrupts();
 
 		rc = _write_word_ptr(info->start[0], wp, data);
-		
+
 		/* re-enable interrupts if necessary */
 		if (flag) {
 			enable_interrupts();
@@ -778,11 +776,11 @@
 		wp  += 4;
 		cnt -= 4;
 	}
-	
+
 	if (cnt == 0) {
 		return 0;
 	}
-	
+
 	/*
 	 * handle unaligned tail bytes
 	 */
@@ -791,7 +789,7 @@
 		data |= *src++ << (8*i);
 		--cnt;
 	}
-	
+
 	for (; i<4; ++i, ++cp) {
 		data |= (*(uchar *)cp) << (8*i);
 	}
@@ -800,14 +798,12 @@
 	flag = disable_interrupts();
 
 	rc = _write_word_ptr(info->start[0], wp, data);
-	
+
 	/* re-enable interrupts if necessary */
 	if (flag) {
 		enable_interrupts();
 	}
-	
+
 	return rc;
-	
+
 }
-
-

diff --git a/board/sc520_spunk/sc520_spunk.c b/board/sc520_spunk/sc520_spunk.c
index 962e04e..e7a7d51 100644
--- a/board/sc520_spunk/sc520_spunk.c
+++ b/board/sc520_spunk/sc520_spunk.c

@@ -1,5 +1,5 @@
 /*
- * 
+ *
  * (C) Copyright 2002
  * Daniel Engström, Omicron Ceti AB <daniel@omicron.se>.
  *
@@ -32,11 +32,11 @@
 
 /* ------------------------------------------------------------------------- */
 
-	
-/* 
+
+/*
  * Theory:
  * We first set up all IRQs to be non-pci, edge triggered,
- * when we later enumerate the pci bus and pci_sc520_fixup_irq() gets 
+ * when we later enumerate the pci bus and pci_sc520_fixup_irq() gets
  * called we reallocate irqs to the pci bus with sc520_pci_set_irq()
  * as needed. Whe choose the irqs to gram from a configurable list
  * inside pci_sc520_fixup_irq() (If this list contains stupid irq's
@@ -46,42 +46,42 @@
 static void irq_init(void)
 {
 	/* disable global interrupt mode */
-	write_mmcr_byte(SC520_PICICR, 0x40); 
-	
+	write_mmcr_byte(SC520_PICICR, 0x40);
+
 	/* set all irqs to edge */
 	write_mmcr_byte(SC520_MPICMODE, 0x00);
 	write_mmcr_byte(SC520_SL1PICMODE, 0x00);
 	write_mmcr_byte(SC520_SL2PICMODE, 0x00);
-	
-	/* active low polarity on PIC interrupt pins, 
+
+	/* active low polarity on PIC interrupt pins,
 	 *  active high polarity on all other irq pins */
 	write_mmcr_word(SC520_INTPINPOL, 0x0000);
 
 	/* set irq number mapping */
-	write_mmcr_byte(SC520_GPTMR0MAP, SC520_IRQ_DISABLED);   /* disable GP timer 0 INT */       
+	write_mmcr_byte(SC520_GPTMR0MAP, SC520_IRQ_DISABLED);   /* disable GP timer 0 INT */
 	write_mmcr_byte(SC520_GPTMR1MAP, SC520_IRQ_DISABLED);   /* disable GP timer 1 INT */
 	write_mmcr_byte(SC520_GPTMR2MAP, SC520_IRQ_DISABLED);   /* disable GP timer 2 INT */
-	write_mmcr_byte(SC520_PIT0MAP, SC520_IRQ0);             /* Set PIT timer 0 INT to IRQ0 */ 
+	write_mmcr_byte(SC520_PIT0MAP, SC520_IRQ0);             /* Set PIT timer 0 INT to IRQ0 */
 	write_mmcr_byte(SC520_PIT1MAP, SC520_IRQ_DISABLED);     /* disable PIT timer 1 INT */
 	write_mmcr_byte(SC520_PIT2MAP, SC520_IRQ_DISABLED);     /* disable PIT timer 2 INT */
 	write_mmcr_byte(SC520_PCIINTAMAP, SC520_IRQ_DISABLED);  /* disable PCI INT A */
 	write_mmcr_byte(SC520_PCIINTBMAP, SC520_IRQ_DISABLED);  /* disable PCI INT B */
 	write_mmcr_byte(SC520_PCIINTCMAP, SC520_IRQ_DISABLED);  /* disable PCI INT C */
 	write_mmcr_byte(SC520_PCIINTDMAP, SC520_IRQ_DISABLED);  /* disable PCI INT D */
-	write_mmcr_byte(SC520_DMABCINTMAP, SC520_IRQ_DISABLED); /* disable DMA INT */ 
+	write_mmcr_byte(SC520_DMABCINTMAP, SC520_IRQ_DISABLED); /* disable DMA INT */
 	write_mmcr_byte(SC520_SSIMAP, SC520_IRQ6);              /* Set Synchronius serial INT to IRQ6*/
 	write_mmcr_byte(SC520_WDTMAP, SC520_IRQ_DISABLED);      /* disable Watchdog INT */
 	write_mmcr_byte(SC520_RTCMAP, SC520_IRQ8);              /* Set RTC int to 8 */
 	write_mmcr_byte(SC520_WPVMAP, SC520_IRQ_DISABLED);      /* disable write protect INT */
 	write_mmcr_byte(SC520_ICEMAP, SC520_IRQ1);              /* Set ICE Debug Serielport INT to IRQ1 */
 	write_mmcr_byte(SC520_FERRMAP,SC520_IRQ13);             /* Set FP error INT to IRQ13 */
-	
+
 	write_mmcr_byte(SC520_UART1MAP, SC520_IRQ4);            /* Set internal UART2 INT to IRQ4 */
 	write_mmcr_byte(SC520_UART2MAP, SC520_IRQ3);            /* Set internal UART2 INT to IRQ3 */
-	
+
 	write_mmcr_byte(SC520_GP0IMAP, SC520_IRQ7);             /* Set GPIRQ0 (PC-Card AUX IRQ) to IRQ7 */
 	write_mmcr_byte(SC520_GP1IMAP, SC520_IRQ14);            /* Set GPIRQ1 (CF IRQ) to IRQ14 */
-	write_mmcr_byte(SC520_GP3IMAP, SC520_IRQ5);             /* Set GPIRQ3 ( CAN IRQ ) ti IRQ5 */ 
+	write_mmcr_byte(SC520_GP3IMAP, SC520_IRQ5);             /* Set GPIRQ3 ( CAN IRQ ) ti IRQ5 */
 	write_mmcr_byte(SC520_GP4IMAP, SC520_IRQ_DISABLED);     /* disbale GIRQ4 ( IRR IRQ ) */
 	write_mmcr_byte(SC520_GP5IMAP, SC520_IRQ_DISABLED);     /* disable GPIRQ5 */
 	write_mmcr_byte(SC520_GP6IMAP, SC520_IRQ_DISABLED);     /* disable GPIRQ6 */
@@ -89,19 +89,19 @@
 	write_mmcr_byte(SC520_GP8IMAP, SC520_IRQ_DISABLED);     /* disable GPIRQ8 */
 	write_mmcr_byte(SC520_GP9IMAP, SC520_IRQ_DISABLED);     /* disable GPIRQ9 */
 	write_mmcr_byte(SC520_GP2IMAP, SC520_IRQ_DISABLED);     /* disable GPIRQ2 */
-	write_mmcr_byte(SC520_GP10IMAP,SC520_IRQ_DISABLED);     /* disable GPIRQ10 */          
-	
+	write_mmcr_byte(SC520_GP10IMAP,SC520_IRQ_DISABLED);     /* disable GPIRQ10 */
+
 	write_mmcr_word(SC520_PCIHOSTMAP, 0x11f);               /* Map PCI hostbridge INT to NMI */
 	write_mmcr_word(SC520_ECCMAP, 0x100);                   /* Map SDRAM ECC failure INT to NMI */
- 
+
 }
 
-	
+
 /* PCI stuff */
 static void pci_sc520_spunk_fixup_irq(struct pci_controller *hose, pci_dev_t dev)
 {
 	int version = read_mmcr_byte(SC520_SYSINFO);
-	
+
 	/* a configurable lists of irqs to steal
 	 * when we need one (a board with more pci interrupt pins
 	 * would use a larger table */
@@ -112,84 +112,83 @@
 		CFG_FORTH_PCI_IRQ
 	};
 	static int next_irq_index=0;
-	
-	char tmp_pin;	
+
+	char tmp_pin;
 	int pin;
-	
+
 	pci_hose_read_config_byte(hose, dev, PCI_INTERRUPT_PIN, &tmp_pin);
 	pin = tmp_pin;
-	
+
 	pin-=1; /* pci config space use 1-based numbering */
 	if (-1 == pin) {
 		return; /* device use no irq */
 	}
-	
-	
-       
+
+
 	/* map device number +  pin to a pin on the sc520 */
 	switch (PCI_DEV(dev)) {
-	case 6:  /* ETH0 */		  
+	case 6:  /* ETH0 */
 		pin+=SC520_PCI_INTA;
 		break;
-		
+
 	case 7:  /* ETH1 */
 		pin+=SC520_PCI_INTB;
 		break;
-		
+
 	case 8:  /* Crypto */
 		pin+=SC520_PCI_INTC;
 		break;
-		
+
 	case 9: /* PMC slot */
 		pin+=SC520_PCI_INTD;
 		break;
-		
+
 	case 10: /* PC-Card */
-		
-		if (version < 10) {			
+
+		if (version < 10) {
 			pin+=SC520_PCI_INTD;
 		} else {
 			pin+=SC520_PCI_INTC;
 		}
 		break;
-		
-	default: 
+
+	default:
 		return;
 	}
-	
+
 	pin&=3; /* wrap around */
-	
+
 	if (sc520_pci_ints[pin] == -1) {
-		/* re-route one interrupt for us */		
+		/* re-route one interrupt for us */
 		if (next_irq_index > 3) {
 			return;
 		}
-		if (pci_sc520_set_irq(pin, irq_list[next_irq_index])) { 
+		if (pci_sc520_set_irq(pin, irq_list[next_irq_index])) {
 			return;
 		}
 		next_irq_index++;
 	}
 
-	
+
 	if (-1 != sc520_pci_ints[pin]) {
-		pci_hose_write_config_byte(hose, dev, PCI_INTERRUPT_LINE, 
+		pci_hose_write_config_byte(hose, dev, PCI_INTERRUPT_LINE,
 					   sc520_pci_ints[pin]);
 	}
-#if 0	
-	printf("fixup_irq: device %d pin %c irq %d\n", 
+#if 0
+	printf("fixup_irq: device %d pin %c irq %d\n",
 	       PCI_DEV(dev), 'A' + pin, sc520_pci_ints[pin]);
 #endif
 }
 
 
-static void pci_sc520_spunk_configure_cardbus(struct pci_controller *hose, 
+static void pci_sc520_spunk_configure_cardbus(struct pci_controller *hose,
 					      pci_dev_t dev, struct pci_config_table *te)
 {
 	u32 io_base;
 	u32 temp;
-	
+
 	pciauto_config_device(hose, dev);
-	
+
 	pci_hose_write_config_word(hose, dev, PCI_COMMAND, 0x07);  /* enable device */
 	pci_hose_write_config_byte(hose, dev, 0x0c, 0x10);         /* cacheline size */
 	pci_hose_write_config_byte(hose, dev, 0x0d, 0x40);         /* latency timer */
@@ -197,15 +196,15 @@
 	pci_hose_write_config_word(hose, dev, PCI_BRIDGE_CONTROL, 0x0040);  /* reset cardbus */
 	pci_hose_write_config_word(hose, dev, PCI_BRIDGE_CONTROL, 0x0080);  /* route interrupts though ExCA */
 	pci_hose_write_config_word(hose, dev,  0x44, 0x3e0); /* map legacy I/O port to 0x3e0 */
-	
-	pci_hose_read_config_dword(hose, dev,  0x80, &temp); /* System control */ 
-	pci_hose_write_config_dword(hose, dev,  0x80, temp | 0x60); /* System control: disable clockrun */ 
-	/* route MF0 to ~INT and MF3 to IRQ7 
+
+	pci_hose_read_config_dword(hose, dev,  0x80, &temp); /* System control */
+	pci_hose_write_config_dword(hose, dev,  0x80, temp | 0x60); /* System control: disable clockrun */
+	/* route MF0 to ~INT and MF3 to IRQ7
 	 * reserve all others */
-	pci_hose_write_config_dword(hose, dev, 0x8c, 0x00007002); 
+	pci_hose_write_config_dword(hose, dev, 0x8c, 0x00007002);
 	pci_hose_write_config_byte(hose, dev, 0x91, 0x00);    /* card control */
 	pci_hose_write_config_byte(hose, dev, 0x92, 0x62);    /* device control */
-	
+
 	if (te->device != 0xac56) {
 		pci_hose_write_config_byte(hose, dev, 0x93, 0x21);    /* async interrupt enable */
 		pci_hose_write_config_word(hose, dev, 0xa8, 0x0000);  /* reset GPIO */
@@ -216,22 +215,21 @@
 		pci_hose_write_config_byte(hose, dev, 0x93, 0x20);    /*  */
 	}
 	pci_hose_write_config_word(hose, dev, 0xa4, 0x8000);  /* reset power management */
-	
-	
+
+
 	pci_hose_read_config_dword(hose, dev, PCI_BASE_ADDRESS_0, &io_base);
 	io_base &= ~0xfL;
-	
+
 	writeb(0x07, io_base+0x803); /* route CSC irq though ExCA and enable IRQ7 */
 	writel(0, io_base+0x10);     /* CLKRUN default */
 	writel(0, io_base+0x20);     /* CLKRUN default */
-	
+
 }
 
 
-
 static struct pci_config_table pci_sc520_spunk_config_table[] = {
-	{ 0x104c, 0xac50, PCI_ANY_ID, 0, 0x0a, 0, pci_sc520_spunk_configure_cardbus, { 0, 0, 0} }, 
-	{ 0x104c, 0xac56, PCI_ANY_ID, 0, 0x0a, 0, pci_sc520_spunk_configure_cardbus, { 0, 0, 0} }, 
+	{ 0x104c, 0xac50, PCI_ANY_ID, 0, 0x0a, 0, pci_sc520_spunk_configure_cardbus, { 0, 0, 0} },
+	{ 0x104c, 0xac56, PCI_ANY_ID, 0, 0x0a, 0, pci_sc520_spunk_configure_cardbus, { 0, 0, 0} },
 	{ 0, 0, 0, 0, 0, 0, NULL, {0,0,0}}
 };
 
@@ -251,22 +249,22 @@
 /* set up the ISA bus timing and system address mappings */
 static void bus_init(void)
 {
-	/* versions 
+	/* versions
 	 * 0   Hyglo versions 0.95 and 0.96 (large baords)
 	 * ??  Hyglo version 0.97 (small board)
 	 * 10  Spunk board
 	 */
 	int version = read_mmcr_byte(SC520_SYSINFO);
-	
+
 	if (version) {
 		/* set up the GP IO pins (for the Spunk board) */
 		write_mmcr_word(SC520_PIOPFS31_16, 0xfff0); 	/* set the GPIO pin function 31-16 reg */
 		write_mmcr_word(SC520_PIOPFS15_0,  0x000f);  	/* set the GPIO pin function 15-0 reg */
 		write_mmcr_word(SC520_PIODIR31_16, 0x000f); 	/* set the GPIO direction 31-16 reg */
 		write_mmcr_word(SC520_PIODIR15_0,  0x1ff0);  	/* set the GPIO direction 15-0 reg */
-		write_mmcr_byte(SC520_CSPFS, 0xc0);  		/* set the CS pin function reg */	
+		write_mmcr_byte(SC520_CSPFS, 0xc0);  		/* set the CS pin function reg */
 		write_mmcr_byte(SC520_CLKSEL, 0x70);
-		
+
 		write_mmcr_word(SC520_PIOCLR31_16, 0x0003);     /* reset SSI chip-selects */
 		write_mmcr_word(SC520_PIOSET31_16, 0x000c);
 
@@ -276,54 +274,52 @@
 		write_mmcr_word(SC520_PIOPFS15_0, 0x1e7f);  	/* set the GPIO pin function 15-0 reg */
 		write_mmcr_word(SC520_PIODIR31_16, 0x003f); 	/* set the GPIO direction 31-16 reg */
 		write_mmcr_word(SC520_PIODIR15_0, 0xe180);  	/* set the GPIO direction 15-0 reg */
-		write_mmcr_byte(SC520_CSPFS, 0x00);  		/* set the CS pin function reg */	
+		write_mmcr_byte(SC520_CSPFS, 0x00);  		/* set the CS pin function reg */
 		write_mmcr_byte(SC520_CLKSEL, 0x70);
-		
+
 		write_mmcr_word(SC520_PIOCLR15_0, 0x0180);      /* reset SSI chip-selects */
 	}
-	
-	write_mmcr_byte(SC520_GPCSRT, 1);   /* set the GP CS offset */    	
+
+	write_mmcr_byte(SC520_GPCSRT, 1);   /* set the GP CS offset */
 	write_mmcr_byte(SC520_GPCSPW, 3);   /* set the GP CS pulse width */
 	write_mmcr_byte(SC520_GPCSOFF, 1);  /* set the GP CS offset */
 	write_mmcr_byte(SC520_GPRDW, 3);    /* set the RD pulse width */
 	write_mmcr_byte(SC520_GPRDOFF, 1);  /* set the GP RD offset */
-        write_mmcr_byte(SC520_GPWRW, 3);    /* set the GP WR pulse width */
+	write_mmcr_byte(SC520_GPWRW, 3);    /* set the GP WR pulse width */
 	write_mmcr_byte(SC520_GPWROFF, 1);  /* set the GP WR offset */
 
-	write_mmcr_word(SC520_BOOTCSCTL, 0x0407);		/* set up timing of BOOTCS */ 
-	
+	write_mmcr_word(SC520_BOOTCSCTL, 0x0407);		/* set up timing of BOOTCS */
+
 	/* adjust the memory map:
 	 * by default the first 256MB (0x00000000 - 0x0fffffff) is mapped to SDRAM
 	 * and 256MB to 1G-128k  (0x1000000 - 0x37ffffff) is mapped to PCI mmio
-	 * we need to map 1G-128k - 1G (0x38000000 - 0x3fffffff) to CS1 */ 
-	
-		
-	
+	 * we need to map 1G-128k - 1G (0x38000000 - 0x3fffffff) to CS1 */
+
+
 	/* bootcs */
-	write_mmcr_long(SC520_PAR12, 0x8bffe800);		
-	
+	write_mmcr_long(SC520_PAR12, 0x8bffe800);
+
 	/* IDE0 = GPCS6 1f0-1f7 */
-	write_mmcr_long(SC520_PAR3,  0x380801f0);		
+	write_mmcr_long(SC520_PAR3,  0x380801f0);
 
 	/* IDE1 = GPCS7 3f6 */
-	write_mmcr_long(SC520_PAR4,  0x3c0003f6);		
+	write_mmcr_long(SC520_PAR4,  0x3c0003f6);
 
-	asm ("wbinvd\n"); /* Flush cache, req. after setting the unchached attribute ona PAR */	
+	asm ("wbinvd\n"); /* Flush cache, req. after setting the unchached attribute ona PAR */
 
-	write_mmcr_byte(SC520_ADDDECCTL, read_mmcr_byte(SC520_ADDDECCTL) & ~(UART2_DIS|UART1_DIS));	
+	write_mmcr_byte(SC520_ADDDECCTL, read_mmcr_byte(SC520_ADDDECCTL) & ~(UART2_DIS|UART1_DIS));
 
 }
 
 
-
 /* par usage:
  * PAR0   (legacy_video)
  * PAR1   (PCI ROM mapping)
- * PAR2 
- * PAR3   IDE 
+ * PAR2
+ * PAR3   IDE
  * PAR4   IDE
  * PAR5   (legacy_video)
- * PAR6 
+ * PAR6
  * PAR7   (legacy_video)
  * PAR8   (legacy_video)
  * PAR9   (legacy_video)
@@ -335,21 +331,21 @@
  * PAR15
  */
 
-/* 
+/*
  * This function should map a chunk of size bytes
  * of the system address space to the ISA bus
- * 
+ *
  * The function will return the memory address
  * as seen by the host (which may very will be the
  * same as the bus address)
  */
-u32 isa_map_rom(u32 bus_addr, int size) 
+u32 isa_map_rom(u32 bus_addr, int size)
 {
 	u32 par;
-	
-	printf("isa_map_rom asked to map %d bytes at %x\n", 
+
+	printf("isa_map_rom asked to map %d bytes at %x\n",
 	       size, bus_addr);
-	
+
 	par = size;
 	if (par < 0x80000) {
 		par = 0x80000;
@@ -360,12 +356,12 @@
 	par <<= 18;
 	par |= (bus_addr>>12);
 	par |= 0x50000000;
-	
+
 	printf ("setting PAR11 to %x\n", par);
-	
+
 	/* Map rom 0x10000 with PAR1 */
 	write_mmcr_long(SC520_PAR11,  par);
-	
+
 	return bus_addr;
 }
 
@@ -386,19 +382,19 @@
 
 #ifdef CONFIG_PCI
 #define PCI_ROM_TEMP_SPACE 0x10000
-/* 
+/*
  * This function should map a chunk of size bytes
  * of the system address space to the PCI bus,
  * suitable to map PCI ROMS (bus address < 16M)
  * the function will return the host memory address
  * which should be converted into a bus address
- * before used to configure the PCI rom address 
+ * before used to configure the PCI rom address
  * decoder
  */
-u32 pci_get_rom_window(struct pci_controller *hose, int size) 
+u32 pci_get_rom_window(struct pci_controller *hose, int size)
 {
 	u32 par;
-	
+
 	par = size;
 	if (par < 0x80000) {
 		par = 0x80000;
@@ -409,12 +405,12 @@
 	par <<= 14;
 	par |= (PCI_ROM_TEMP_SPACE>>16);
 	par |= 0x72000000;
-	
+
 	printf ("setting PAR1 to %x\n", par);
-	
+
 	/* Map rom 0x10000 with PAR1 */
 	write_mmcr_long(SC520_PAR1,  par);
-	
+
 	return PCI_ROM_TEMP_SPACE;
 }
 
@@ -431,51 +427,51 @@
 		return;
 	}
 	printf(" not ours\n");
-	
+
 }
 
 /*
  * This function is called in order to provide acces to the
- * legacy video I/O ports on the PCI bus. 
- * After this function accesses to I/O ports 0x3b0-0x3bb and 
+ * legacy video I/O ports on the PCI bus.
+ * After this function accesses to I/O ports 0x3b0-0x3bb and
  * 0x3c0-0x3df shuld result in transactions on the PCI bus.
- * 
+ *
  */
 int pci_enable_legacy_video_ports(struct pci_controller *hose)
 {
 	/* Map video memory to 0xa0000*/
 	write_mmcr_long(SC520_PAR0,  0x7200400a);
-	
+
 	/* forward all I/O accesses to PCI */
-	write_mmcr_byte(SC520_ADDDECCTL, 
-			read_mmcr_byte(SC520_ADDDECCTL) | IO_HOLE_DEST_PCI);	
-	
-	
+	write_mmcr_byte(SC520_ADDDECCTL,
+			read_mmcr_byte(SC520_ADDDECCTL) | IO_HOLE_DEST_PCI);
+
+
 	/* so we map away all io ports to pci (only way to access pci io
 	 * below 0x400. But then we have to map back the portions that we dont
 	 * use so that the generate cycles on the GPIO bus where the sio and
-	 * ISA slots are connected, this requre the use of several PAR registers 
+	 * ISA slots are connected, this requre the use of several PAR registers
 	 */
-	
+
 	/* bring 0x100 - 0x2f7 back to ISA using PAR5 */
-	write_mmcr_long(SC520_PAR5, 0x31f70100);		
-		
+	write_mmcr_long(SC520_PAR5, 0x31f70100);
+
 	/* com2 use 2f8-2ff */
-	
+
 	/* bring 0x300 - 0x3af back to ISA using PAR7 */
-	write_mmcr_long(SC520_PAR7, 0x30af0300);		
-	
+	write_mmcr_long(SC520_PAR7, 0x30af0300);
+
 	/* vga use 3b0-3bb */
-	
+
 	/* bring 0x3bc - 0x3bf back to ISA using PAR8 */
-	write_mmcr_long(SC520_PAR8, 0x300303bc);		
-	
+	write_mmcr_long(SC520_PAR8, 0x300303bc);
+
 	/* vga use 3c0-3df */
-	
+
 	/* bring 0x3e0 - 0x3f7 back to ISA using PAR9 */
-	write_mmcr_long(SC520_PAR9, 0x301703e0);		
-		
-	/* com1 use 3f8-3ff */		
+	write_mmcr_long(SC520_PAR9, 0x301703e0);
+
+	/* com1 use 3f8-3ff */
 
 	return 0;
 }
@@ -488,20 +484,20 @@
 int board_init(void)
 {
 	DECLARE_GLOBAL_DATA_PTR;
-	
-	init_sc520();	
+
+	init_sc520();
 	bus_init();
 	irq_init();
-		
+
 	/* max drive current on SDRAM */
 	write_mmcr_word(SC520_DSCTL, 0x0100);
-		
+
 	/* enter debug mode after next reset (only if jumper is also set) */
 	write_mmcr_byte(SC520_RESCFG, 0x08);
 	/* configure the software timer to 33.000MHz */
 	write_mmcr_byte(SC520_SWTMRCFG, 1);
 	gd->bus_clk = 33000000;
-	
+
 	return 0;
 }
 
@@ -513,25 +509,25 @@
 
 void show_boot_progress(int val)
 {
- 	int version = read_mmcr_byte(SC520_SYSINFO);
-	
+	int version = read_mmcr_byte(SC520_SYSINFO);
+
 	if (version == 0) {
 		/* PIO31-PIO16 Data */
-		write_mmcr_word(SC520_PIODATA31_16,                                           
+		write_mmcr_word(SC520_PIODATA31_16,
 				(read_mmcr_word(SC520_PIODATA31_16) & 0xffc0)| ((val&0x7e)>>1)); /* 0x1f8 >> 3 */
-		
+
 		/* PIO0-PIO15 Data */
-		write_mmcr_word(SC520_PIODATA15_0, 
+		write_mmcr_word(SC520_PIODATA15_0,
 				(read_mmcr_word(SC520_PIODATA15_0) & 0x1fff)| ((val&0x7)<<13));
 	} else {
 		/* newer boards use PIO4-PIO12 */
 		/* PIO0-PIO15 Data */
-#if 0		
-		val = (val & 0x007) | ((val & 0x038) << 3) | ((val & 0x1c0) >> 3); 
+#if 0
+		val = (val & 0x007) | ((val & 0x038) << 3) | ((val & 0x1c0) >> 3);
 #else
-		val = (val & 0x007) | ((val & 0x07e) << 2); 
+		val = (val & 0x007) | ((val & 0x07e) << 2);
 #endif
-		write_mmcr_word(SC520_PIODATA15_0, 
+		write_mmcr_word(SC520_PIODATA15_0,
 				(read_mmcr_word(SC520_PIODATA15_0) & 0xe00f) | ((val&0x01ff)<<4));
 	}
 }
@@ -539,17 +535,17 @@
 
 int last_stage_init(void)
 {
-	
+
 	int version = read_mmcr_byte(SC520_SYSINFO);
-	
+
 	printf("Omicron Ceti SC520 Spunk revision %x\n", version);
-	
+
 #if 0
 	if (version) {
 		int x, y;
-		
+
 		printf("eeprom probe %d\n", spi_eeprom_probe(1));
-		
+
 		spi_eeprom_read(1, 0, (u8*)&x, 2);
 		spi_eeprom_read(1, 1, (u8*)&y, 2);
 		printf("eeprom bytes %04x%04x\n", x, y);
@@ -557,130 +553,129 @@
 		y ^= 0xffff;
 		spi_eeprom_write(1, 0, (u8*)&x, 2);
 		spi_eeprom_write(1, 1, (u8*)&y, 2);
-		
+
 		spi_eeprom_read(1, 0, (u8*)&x, 2);
 		spi_eeprom_read(1, 1, (u8*)&y, 2);
 		printf("eeprom bytes %04x%04x\n", x, y);
-		
+
 	} else {
 		int x, y;
-		
+
 		printf("eeprom probe %d\n", mw_eeprom_probe(1));
-		
+
 		mw_eeprom_read(1, 0, (u8*)&x, 2);
 		mw_eeprom_read(1, 1, (u8*)&y, 2);
 		printf("eeprom bytes %04x%04x\n", x, y);
-		
+
 		x ^= 0xffff;
 		y ^= 0xffff;
 		mw_eeprom_write(1, 0, (u8*)&x, 2);
 		mw_eeprom_write(1, 1, (u8*)&y, 2);
-		
+
 		mw_eeprom_read(1, 0, (u8*)&x, 2);
 		mw_eeprom_read(1, 1, (u8*)&y, 2);
 		printf("eeprom bytes %04x%04x\n", x, y);
-		
-		
+
+
 	}
 #endif
 
 	ds1722_probe(2);
-	
+
 	return 0;
 }
 
-void ssi_chip_select(int dev) 
+void ssi_chip_select(int dev)
 {
 	int version = read_mmcr_byte(SC520_SYSINFO);
-	
+
 	if (version) {
 		/* Spunk board: EEPROM and CAN are actove-low, TEMP and AUX are active high */
 		switch (dev) {
 		case 1: /* EEPROM */
 			write_mmcr_word(SC520_PIOCLR31_16, 0x0004);
 			break;
-			
+
 		case 2: /* Temp Probe */
 			write_mmcr_word(SC520_PIOSET31_16, 0x0002);
 			break;
-			
+
 		case 3: /* CAN */
 			write_mmcr_word(SC520_PIOCLR31_16, 0x0008);
 			break;
-			
-		case 4: /* AUX */				
+
+		case 4: /* AUX */
 			write_mmcr_word(SC520_PIOSET31_16, 0x0001);
 			break;
-		
+
 		case 0:
 			write_mmcr_word(SC520_PIOCLR31_16, 0x0003);
 			write_mmcr_word(SC520_PIOSET31_16, 0x000c);
 			break;
-			
+
 		default:
 			printf("Illegal SSI device requested: %d\n", dev);
 		}
 	} else {
-		
+
 		/* Globox board: Both EEPROM and TEMP are active-high */
 
 		switch (dev) {
 		case 1: /* EEPROM */
 			write_mmcr_word(SC520_PIOSET15_0, 0x0100);
 			break;
-			
+
 		case 2: /* Temp Probe */
 			write_mmcr_word(SC520_PIOSET15_0, 0x0080);
 			break;
-		
+
 		case 0:
 			write_mmcr_word(SC520_PIOCLR15_0, 0x0180);
 			break;
-			
+
 		default:
 			printf("Illegal SSI device requested: %d\n", dev);
 		}
-	}	
+	}
 }
 
 
-void spi_init_f(void) 
+void spi_init_f(void)
 {
 	read_mmcr_byte(SC520_SYSINFO) ?
-		spi_eeprom_probe(1) : 
+		spi_eeprom_probe(1) :
 	mw_eeprom_probe(1);
-	
+
 }
 
-ssize_t spi_read(uchar *addr, int alen, uchar *buffer, int len) 
+ssize_t spi_read(uchar *addr, int alen, uchar *buffer, int len)
 {
 	int offset;
 	int i;
-	
+
 	offset = 0;
 	for (i=0;i<alen;i++) {
 		offset <<= 8;
 		offset |= addr[i];
 	}
-	
+
 	return 	read_mmcr_byte(SC520_SYSINFO) ?
-		spi_eeprom_read(1, offset, buffer, len) : 
+		spi_eeprom_read(1, offset, buffer, len) :
 	mw_eeprom_read(1, offset, buffer, len);
 }
 
-ssize_t spi_write(uchar *addr, int alen, uchar *buffer, int len) 
+ssize_t spi_write(uchar *addr, int alen, uchar *buffer, int len)
 {
 	int offset;
 	int i;
-	
+
 	offset = 0;
 	for (i=0;i<alen;i++) {
 		offset <<= 8;
 		offset |= addr[i];
 	}
-	
+
 	return 	read_mmcr_byte(SC520_SYSINFO) ?
-		spi_eeprom_write(1, offset, buffer, len) : 
+		spi_eeprom_write(1, offset, buffer, len) :
 	mw_eeprom_write(1, offset, buffer, len);
 }
-

diff --git a/board/sc520_spunk/sc520_spunk_asm.S b/board/sc520_spunk/sc520_spunk_asm.S
index e198125..8b34103 100644
--- a/board/sc520_spunk/sc520_spunk_asm.S
+++ b/board/sc520_spunk/sc520_spunk_asm.S

@@ -23,7 +23,7 @@
 
 /* now setup the General purpose bus to give us access to the LEDs.
  * We can then use the leds to display status information.
- */ 
+ */
 
 sc520_cdp_registers:
 /* size    offset        value */
@@ -44,12 +44,12 @@
 /* board early intialization */
 .globl early_board_init
 early_board_init:
-        movl    $sc520_cdp_registers,%esi
-init_loop:	
-        movl    $0xfffef000,%edi     /* MMCR base to edi */					
+	movl    $sc520_cdp_registers,%esi
+init_loop:
+	movl    $0xfffef000,%edi     /* MMCR base to edi */
 	movw	(%esi), %bx          /* load size to bx */
 	cmpw	$0, %bx              /* if size is 0 we're done */
-	je	done 
+	je	done
 	xorl	%edx,%edx
 	movw	2(%esi), %dx        /* load MMCR offset to dx */
 	addl	%edx, %edi          /* add offset to base in edi */
@@ -60,23 +60,22 @@
 	je	word                 /* word op? */
 	movl	%eax, (%edi)         /* must be long, then */
 	jmp	next
-byte:   movb    %al,(%edi)        
+byte:   movb    %al,(%edi)
 	jmp	next
 word:	movw	%ax,(%edi)
 next:	addl	$8, %esi             /* advance esi */
 	jmp	init_loop
 
 	/* light all leds */
-done:   movl    $0xfffefc32,%edx 
-	movw    $0000,(%edx)              
+done:   movl    $0xfffefc32,%edx
+	movw    $0000,(%edx)
 
 	jmp 	*%ebp		     /* return to caller */
 
 
 .globl __show_boot_progress
 __show_boot_progress:
-	movl    $0xfffefc32,%edx 
-	xorw    $0xffff, %ax 
-	movw    %ax,(%edx)              
+	movl    $0xfffefc32,%edx
+	xorw    $0xffff, %ax
+	movw    %ax,(%edx)
 	jmp	*%ebp
-

diff --git a/board/sc520_spunk/sc520_spunk_asm16.S b/board/sc520_spunk/sc520_spunk_asm16.S
index cdcbbbe..8bb1766 100644
--- a/board/sc520_spunk/sc520_spunk_asm16.S
+++ b/board/sc520_spunk/sc520_spunk_asm16.S

@@ -34,32 +34,32 @@
 board_init16:
 	/* Alias MMCR to 0xdf000 */
 	movw	$0xfffc, %dx
-	movl	$0x800df0cb, %eax	
-	outl	%eax, %dx		
-	
+	movl	$0x800df0cb, %eax
+	outl	%eax, %dx
+
 	/* Set ds to point to MMCR alias */
-	movw	$0xdf00, %ax		
-	movw	%ax, %ds		 
-		
-	/* Map the entire flash at 0x38000000  
+	movw	$0xdf00, %ax
+	movw	%ax, %ds
+
+	/* Map the entire flash at 0x38000000
 	 * (with BOOTCS and PAR14, use 0xabfff800 for ROMCS1) */
 	movl    $0xc0, %edi
-        movl	$0x8bfff800, %eax
-        movl	%eax, (%di)		
+	movl	$0x8bfff800, %eax
+	movl	%eax, (%di)
 
 	/* Disable SDRAM write buffer */
 	movw    $0x40,%di
-        xorw    %ax,%ax
-        movb    %al, (%di)              
+	xorw    %ax,%ax
+	movb    %al, (%di)
 
 	/* Disabe MMCR alias */
 	movw	$0xfffc, %dx
-	movl	$0x000000cb, %eax	
-	outl	%eax, %dx		
-	
+	movl	$0x000000cb, %eax
+	outl	%eax, %dx
+
 	/* the return address is stored in bp */
 	jmp	*%bp
-	
+
 
 .section .bios, "ax"
 .code16
@@ -67,18 +67,17 @@
 realmode_reset:
 	/* Alias MMCR to 0xdf000 */
 	movw	$0xfffc, %dx
-	movl	$0x800df0cb, %eax	
-	outl	%eax, %dx		
-	
+	movl	$0x800df0cb, %eax
+	outl	%eax, %dx
+
 	/* Set ds to point to MMCR alias */
-	movw	$0xdf00, %ax		
-	movw	%ax, %ds		 
-		
+	movw	$0xdf00, %ax
+	movw	%ax, %ds
+
 	/* issue software reset thorugh MMCR */
 	movl    $0xd72, %edi
-        movb	$0x01, %al
-        movb	%al, (%di)		
+	movb	$0x01, %al
+	movb	%al, (%di)
 
 1:	hlt
 	jmp	1
-	

diff --git a/board/sc520_spunk/u-boot.lds b/board/sc520_spunk/u-boot.lds
index fbab9b8..da7ea18 100644
--- a/board/sc520_spunk/u-boot.lds
+++ b/board/sc520_spunk/u-boot.lds

@@ -1,3 +1,4 @@
+
 /*
  * (C) Copyright 2002
  * Daniel Engström, Omicron Ceti AB, daniel@omicron.se.
@@ -26,60 +27,65 @@
 ENTRY(_start)
 
 SECTIONS
-{	
+{
 	. = 0x387c0000;                     /* Where bootcode in the flash is mapped */
 	.text  : { *(.text); }
-	
-        . = ALIGN(4);
-        .rodata : { *(.rodata) }
 
-        . = 0x400000; 	                    /* Ram data segment to use */
+	. = ALIGN(4);
+	.rodata : { *(.rodata) }
+
+	. = 0x400000; 	                    /* Ram data segment to use */
 	_i386boot_romdata_dest = ABSOLUTE(.);
-        .data : AT ( LOADADDR(.rodata) + SIZEOF(.rodata) ) { *(.data) }
-	_i386boot_romdata_start = LOADADDR(.data); 	
+	.data : AT ( LOADADDR(.rodata) + SIZEOF(.rodata) ) { *(.data) }
+	_i386boot_romdata_start = LOADADDR(.data);
 
-        . = ALIGN(4);
-        .got : AT ( LOADADDR(.data) + SIZEOF(.data) ) { *(.got) }
-	_i386boot_romdata_size = SIZEOF(.data) + SIZEOF(.got); 	
+	. = ALIGN(4);
+	.got : AT ( LOADADDR(.data) + SIZEOF(.data) ) { *(.got) }
+	_i386boot_romdata_size = SIZEOF(.data) + SIZEOF(.got);
 
 
-        . = ALIGN(4);
+	. = ALIGN(4);
 	_i386boot_bss_start = ABSOLUTE(.);
-        .bss : { *(.bss) }	
+	.bss : { *(.bss) }
 	_i386boot_bss_size = SIZEOF(.bss);
-	
-	
+
+
+  __u_boot_cmd_start = .;
+  .u_boot_cmd : { *(.u_boot_cmd) }
+  __u_boot_cmd_end = .;
+
+
 	/* 16bit realmode trampoline code */
 	.realmode 0x7c0 : AT ( LOADADDR(.got) + SIZEOF(.got) ) { *(.realmode) }
-    
+
 	_i386boot_realmode = LOADADDR(.realmode);
 	_i386boot_realmode_size = SIZEOF(.realmode);
-	
+
 	/* 16bit BIOS emulation code (just enough to boot Linux) */
 	.bios 0 : AT ( LOADADDR(.realmode) + SIZEOF(.realmode) ) { *(.bios) }
-    
+
 	_i386boot_bios = LOADADDR(.bios);
 	_i386boot_bios_size = SIZEOF(.bios);
-	
+
 
 	/* The load addresses below assumes that the flash
 	 * will be mapped so that 0x387f0000 == 0xffff0000
 	 * at reset time
 	 *
-	 * The fe00 and ff00 offsets of the start32 and start16 
+	 * The fe00 and ff00 offsets of the start32 and start16
 	 * segments are arbitrary, the just have to be mapped
 	 * at reset and the code have to fit.
 	 * The fff0 offset of reset is important, however.
 	 */
-	 
-	 
+
+
 	. = 0xfffffe00;
-	.start32 : AT (0x387ffe00) { *(.start32); } 
-	
+	.start32 : AT (0x387ffe00) { *(.start32); }
+
 	. = 0xff00;
-	.start16 : AT (0x387fff00) { *(.start16); }  
-	
+	.start16 : AT (0x387fff00) { *(.start16); }
+
 	. = 0xfff0;
-	.reset : AT (0x387ffff0) { *(.reset); }  
+	.reset : AT (0x387ffff0) { *(.reset); }
 	_i386boot_end = (LOADADDR(.reset) + SIZEOF(.reset) );
 }

diff --git a/board/shannon/Makefile b/board/shannon/Makefile
index ac5bf81..86098a3 100644
--- a/board/shannon/Makefile
+++ b/board/shannon/Makefile

@@ -29,7 +29,7 @@
 SOBJS	:= memsetup.o
 
 $(LIB):	$(OBJS) $(SOBJS)
-	$(AR) crv $@ $^
+	$(AR) crv $@ $(OBJS) $(SOBJS)
 
 clean:
 	rm -f $(SOBJS) $(OBJS)

diff --git a/board/shannon/flash.c b/board/shannon/flash.c
index c340fea..74f5f69 100644
--- a/board/shannon/flash.c
+++ b/board/shannon/flash.c

@@ -327,7 +327,7 @@
      */
     result = *addr;
     if ((result & data) != data)
-        return ERR_NOT_ERASED;
+	return ERR_NOT_ERASED;
 
 
     /*
@@ -393,7 +393,7 @@
     *addr = CMD_READ_ARRAY;
 
     if (chip1 == ERR || chip2 == ERR || *addr != data)
-        rc = ERR_PROG_ERROR;
+	rc = ERR_PROG_ERROR;
 
     if (iflag)
       enable_interrupts();

diff --git a/board/shannon/memsetup.S b/board/shannon/memsetup.S
index 4f0c464..a9a8777 100644
--- a/board/shannon/memsetup.S
+++ b/board/shannon/memsetup.S

@@ -24,7 +24,6 @@
  */
 
 
-
 #include <config.h>
 #include <version.h>
 
@@ -91,4 +90,3 @@
 
 	/* everything is fine now */
 	mov	pc, lr
-

diff --git a/board/shannon/shannon.c b/board/shannon/shannon.c
index a55626d..1876e3e 100644
--- a/board/shannon/shannon.c
+++ b/board/shannon/shannon.c

@@ -40,24 +40,24 @@
 
 #ifdef CONFIG_INFERNO
 	{
-        unsigned long temp;
-        __asm__ __volatile__(/* disable MMU, enable icache */
-                             "mrc p15, 0, %0, c1, c0\n"
-                             "bic %0, %0, #0x00002000\n"
-                             "bic %0, %0, #0x0000000f\n"
-                             "orr %0, %0, #0x00001000\n"
-                             "orr %0, %0, #0x00000002\n"
-                             "mcr p15, 0, %0, c1, c0\n"
-                             /* flush caches */
-                             "mov %0, #0\n"
-                             "mcr p15, 0, %0, c7, c7, 0\n"
-                             "mcr p15, 0, %0, c8, c7, 0\n"
-                             : "=r" (temp)
-                             :
-                             : "memory");
-        /* setup PCMCIA timing */
-        temp = 0xa0000018;
-        *(unsigned long *)temp = 0x00060006;
+	unsigned long temp;
+	__asm__ __volatile__(/* disable MMU, enable icache */
+			     "mrc p15, 0, %0, c1, c0\n"
+			     "bic %0, %0, #0x00002000\n"
+			     "bic %0, %0, #0x0000000f\n"
+			     "orr %0, %0, #0x00001000\n"
+			     "orr %0, %0, #0x00000002\n"
+			     "mcr p15, 0, %0, c1, c0\n"
+			     /* flush caches */
+			     "mov %0, #0\n"
+			     "mcr p15, 0, %0, c7, c7, 0\n"
+			     "mcr p15, 0, %0, c8, c7, 0\n"
+			     : "=r" (temp)
+			     :
+			     : "memory");
+	/* setup PCMCIA timing */
+	temp = 0xa0000018;
+	*(unsigned long *)temp = 0x00060006;
 
 	}
 #endif /* CONFIG_INIT_CRITICAL */

diff --git a/board/shannon/u-boot.lds b/board/shannon/u-boot.lds
index f4b0ade..d1fe8aa 100644
--- a/board/shannon/u-boot.lds
+++ b/board/shannon/u-boot.lds

@@ -26,28 +26,33 @@
 ENTRY(_start)
 SECTIONS
 {
-        . = 0x00000000;
+	. = 0x00000000;
 
-        . = ALIGN(4);
+	. = ALIGN(4);
 	.text      :
 	{
 	  cpu/sa1100/start.o	(.text)
 	  *(.text)
 	}
 
-        . = ALIGN(4);
-        .rodata : { *(.rodata) }
+	. = ALIGN(4);
+	.rodata : { *(.rodata) }
 
-        . = ALIGN(4);
-        .data : { *(.data) }
+	. = ALIGN(4);
+	.data : { *(.data) }
 
-        . = ALIGN(4);
-        .got : { *(.got) }
+	. = ALIGN(4);
+	.got : { *(.got) }
+
+  __u_boot_cmd_start = .;
+  .u_boot_cmd : { *(.u_boot_cmd) }
+  __u_boot_cmd_end = .;
 
 	armboot_end_data = .;
 
-        . = ALIGN(4);
-        .bss : { *(.bss) }
+	. = ALIGN(4);
+	.bss : { *(.bss) }
 
 	armboot_end = .;
+
 }

diff --git a/board/siemens/CCM/Makefile b/board/siemens/CCM/Makefile
index 548647a..ee2fc53 100644
--- a/board/siemens/CCM/Makefile
+++ b/board/siemens/CCM/Makefile

@@ -29,7 +29,7 @@
 	  ../../tqm8xx/load_sernum_ethaddr.o
 
 $(LIB):	.depend $(OBJS)
-	$(AR) crv $@ $^
+	$(AR) crv $@ $(OBJS)
 
 #########################################################################
 

diff --git a/board/siemens/CCM/fpga_ccm.c b/board/siemens/CCM/fpga_ccm.c
index 292387b..11b97bc 100644
--- a/board/siemens/CCM/fpga_ccm.c
+++ b/board/siemens/CCM/fpga_ccm.c

@@ -167,4 +167,3 @@
     }
     return 0;
 }
-

diff --git a/board/siemens/CCM/u-boot.lds b/board/siemens/CCM/u-boot.lds
index 4b0129f..86e587f 100644
--- a/board/siemens/CCM/u-boot.lds
+++ b/board/siemens/CCM/u-boot.lds

@@ -109,6 +109,11 @@
   _edata  =  .;
   PROVIDE (edata = .);
 
+  __u_boot_cmd_start = .;
+  .u_boot_cmd : { *(.u_boot_cmd) }
+  __u_boot_cmd_end = .;
+
+
   __start___ex_table = .;
   __ex_table : { *(__ex_table) }
   __stop___ex_table = .;
@@ -131,4 +136,3 @@
   _end = . ;
   PROVIDE (end = .);
 }
-

diff --git a/board/siemens/CCM/u-boot.lds.debug b/board/siemens/CCM/u-boot.lds.debug
index 84c4248..4e67721 100644
--- a/board/siemens/CCM/u-boot.lds.debug
+++ b/board/siemens/CCM/u-boot.lds.debug

@@ -106,6 +106,11 @@
   _edata  =  .;
   PROVIDE (edata = .);
 
+  __u_boot_cmd_start = .;
+  .u_boot_cmd : { *(.u_boot_cmd) }
+  __u_boot_cmd_end = .;
+
+
   __start___ex_table = .;
   __ex_table : { *(__ex_table) }
   __stop___ex_table = .;
@@ -128,4 +133,3 @@
   _end = . ;
   PROVIDE (end = .);
 }
-

diff --git a/board/siemens/IAD210/IAD210.c b/board/siemens/IAD210/IAD210.c
index 4897046..30adbfc 100644
--- a/board/siemens/IAD210/IAD210.c
+++ b/board/siemens/IAD210/IAD210.c

@@ -57,27 +57,27 @@
 	 *
 	 */
 		    0xFFFAF834, 0xFFE5B435, /* last */
-                                            _NOT_USED_,
+					    _NOT_USED_,
 	/*
 	 * Burst Read. (Offset 8 in UPMA RAM)
 	 */
 	0xFE2DB004, 0xF0AF7404, 0xF0AFFC00, 0xF0AFFC00,
 	0xF0AFFC00, 0xF0AAF800, 0xF1A5E447, /* last */
-                                            _NOT_USED_,
+					    _NOT_USED_,
 	_NOT_USED_, _NOT_USED_, _NOT_USED_, _NOT_USED_,
 	_NOT_USED_, _NOT_USED_, _NOT_USED_, _NOT_USED_,
 	/*
 	 * Single Write. (Offset 18 in UPMA RAM)
 	 */
 	0xFE29B300, 0xF1A27304, 0xFFA5F747,  /* last */
-                                            _NOT_USED_,
+					    _NOT_USED_,
 	_NOT_USED_, _NOT_USED_, _NOT_USED_, _NOT_USED_,
 	/*
 	 * Burst Write. (Offset 20 in UPMA RAM)
 	 */
 	0x1F0DFC04, 0xEEABBC00, 0x10A77C00, 0xF0AFFC00,
 	0xF1AAF804, 0xFFA5F447, /* last */
-			        _NOT_USED_, _NOT_USED_,
+				_NOT_USED_, _NOT_USED_,
 	_NOT_USED_, _NOT_USED_, _NOT_USED_, _NOT_USED_,
 	_NOT_USED_, _NOT_USED_, _NOT_USED_, _NOT_USED_,
 	/*
@@ -90,18 +90,17 @@
 	 * MRS sequence  (Offset 38 in UPMA RAM)
 	 */
 	0xFFAAB834, 0xFFA57434, 0xFFAFFC05, /* last */
-                                            _NOT_USED_,
+					    _NOT_USED_,
 	/*
 	 * Exception. (Offset 3c in UPMA RAM)
 	 */
 	0xFFAFFC04, 0xFFAFFC05, /* last */
-		                _NOT_USED_, _NOT_USED_,
+				_NOT_USED_, _NOT_USED_,
 };
 
 /* ------------------------------------------------------------------------- */
 
 
-
 long int initdram (int board_type)
 {
     volatile immap_t     *immap  = (immap_t *)CFG_IMMR;

diff --git a/board/siemens/IAD210/Makefile b/board/siemens/IAD210/Makefile
index 0982e7c..87a6893 100644
--- a/board/siemens/IAD210/Makefile
+++ b/board/siemens/IAD210/Makefile

@@ -28,7 +28,7 @@
 OBJS	= $(BOARD).o flash.o atm.o
 
 $(LIB):	.depend $(OBJS)
-	$(AR) crv $@ $^
+	$(AR) crv $@ $(OBJS)
 
 #########################################################################
 

diff --git a/board/siemens/IAD210/flash.c b/board/siemens/IAD210/flash.c
index 1ed5262..110858d 100644
--- a/board/siemens/IAD210/flash.c
+++ b/board/siemens/IAD210/flash.c

@@ -140,7 +140,7 @@
   }
 
   printf ("  Size: %ld MB in %d Sectors\n",
-          info->size >> 20, info->sector_count);
+	  info->size >> 20, info->sector_count);
 
   printf ("  Sector Start Addresses:");
   for (i=0; i<info->sector_count; ++i) {
@@ -149,7 +149,7 @@
     printf (" %08lX%s",
 			info->start[i],
 			info->protect[i] ? " (RO)" : "     "
-            );
+	    );
   }
   printf ("\n");
 }

diff --git a/board/siemens/IAD210/u-boot.lds b/board/siemens/IAD210/u-boot.lds
index 15366d5..d2f2848 100644
--- a/board/siemens/IAD210/u-boot.lds
+++ b/board/siemens/IAD210/u-boot.lds

@@ -107,6 +107,11 @@
   _edata  =  .;
   PROVIDE (edata = .);
 
+  __u_boot_cmd_start = .;
+  .u_boot_cmd : { *(.u_boot_cmd) }
+  __u_boot_cmd_end = .;
+
+
   __start___ex_table = .;
   __ex_table : { *(__ex_table) }
   __stop___ex_table = .;

diff --git a/board/siemens/SCM/Makefile b/board/siemens/SCM/Makefile
index b7e26ff..af646e4 100644
--- a/board/siemens/SCM/Makefile
+++ b/board/siemens/SCM/Makefile

@@ -30,7 +30,7 @@
 
 
 $(LIB):	.depend $(OBJS)
-	$(AR) crv $@ $^
+	$(AR) crv $@ $(OBJS)
 
 #########################################################################
 

diff --git a/board/siemens/SCM/scm.c b/board/siemens/SCM/scm.c
index aa6181d..9467b1f 100644
--- a/board/siemens/SCM/scm.c
+++ b/board/siemens/SCM/scm.c

@@ -97,20 +97,20 @@
 	/* PB20 */ {   1,   1,   1,   0,   0,   0   }, /* TDM_D2 L1RSYNC */
 	/* PB19 */ {   1,   0,   0,   0,   0,   0   }, /* UID */
 	/* PB18 */ {   0,   1,   0,   0,   0,   0   },
-        /* PB17 */ {   1,   1,   0,   0,   0,   0   }, /* FCC3 MII RX_DV */
-        /* PB16 */ {   1,   1,   0,   0,   0,   0   }, /* FCC3 MII RX_ER */
-        /* PB15 */ {   1,   1,   0,   1,   0,   0   }, /* FCC3 MII TX_ER */
-        /* PB14 */ {   1,   1,   0,   1,   0,   0   }, /* FCC3 MII TX_EN */
-        /* PB13 */ {   1,   1,   0,   0,   0,   0   }, /* FCC3 MII COL */
-        /* PB12 */ {   1,   1,   0,   0,   0,   0   }, /* FCC3 MII CRS */
-        /* PB11 */ {   1,   1,   0,   0,   0,   0   }, /* FCC3 MII RxD[3] */
-        /* PB10 */ {   1,   1,   0,   0,   0,   0   }, /* FCC3 MII RxD[2] */
-        /* PB9  */ {   1,   1,   0,   0,   0,   0   }, /* FCC3 MII RxD[1] */
-        /* PB8  */ {   1,   1,   0,   0,   0,   0   }, /* FCC3 MII RxD[0] */
-        /* PB7  */ {   1,   1,   0,   1,   0,   0   }, /* FCC3 MII TxD[3] */
-        /* PB6  */ {   1,   1,   0,   1,   0,   0   }, /* FCC3 MII TxD[2] */
-        /* PB5  */ {   1,   1,   0,   1,   0,   0   }, /* FCC3 MII TxD[1] */
-        /* PB4  */ {   1,   1,   0,   1,   0,   0   }, /* FCC3 MII TxD[0] */
+	/* PB17 */ {   1,   1,   0,   0,   0,   0   }, /* FCC3 MII RX_DV */
+	/* PB16 */ {   1,   1,   0,   0,   0,   0   }, /* FCC3 MII RX_ER */
+	/* PB15 */ {   1,   1,   0,   1,   0,   0   }, /* FCC3 MII TX_ER */
+	/* PB14 */ {   1,   1,   0,   1,   0,   0   }, /* FCC3 MII TX_EN */
+	/* PB13 */ {   1,   1,   0,   0,   0,   0   }, /* FCC3 MII COL */
+	/* PB12 */ {   1,   1,   0,   0,   0,   0   }, /* FCC3 MII CRS */
+	/* PB11 */ {   1,   1,   0,   0,   0,   0   }, /* FCC3 MII RxD[3] */
+	/* PB10 */ {   1,   1,   0,   0,   0,   0   }, /* FCC3 MII RxD[2] */
+	/* PB9  */ {   1,   1,   0,   0,   0,   0   }, /* FCC3 MII RxD[1] */
+	/* PB8  */ {   1,   1,   0,   0,   0,   0   }, /* FCC3 MII RxD[0] */
+	/* PB7  */ {   1,   1,   0,   1,   0,   0   }, /* FCC3 MII TxD[3] */
+	/* PB6  */ {   1,   1,   0,   1,   0,   0   }, /* FCC3 MII TxD[2] */
+	/* PB5  */ {   1,   1,   0,   1,   0,   0   }, /* FCC3 MII TxD[1] */
+	/* PB4  */ {   1,   1,   0,   1,   0,   0   }, /* FCC3 MII TxD[0] */
 	/* PB3  */ {   0,   0,   0,   0,   0,   0   }, /* pin doesn't exist */
 	/* PB2  */ {   0,   0,   0,   0,   0,   0   }, /* pin doesn't exist */
 	/* PB1  */ {   0,   0,   0,   0,   0,   0   }, /* pin doesn't exist */
@@ -133,8 +133,8 @@
 	/* PC20 */ {   1,   1,   0,   0,   0,   0   }, /* FCC1 MII RX_CLK */
 	/* PC19 */ {   0,   1,   0,   0,   0,   0   },
 	/* PC18 */ {   0,   1,   0,   0,   0,   0   },
-        /* PC17 */ {   1,   1,   0,   0,   0,   0   }, /* FCC3 MII RX_CLK */
-        /* PC16 */ {   1,   1,   0,   0,   0,   0   }, /* FCC3 MII TX_CLK */
+	/* PC17 */ {   1,   1,   0,   0,   0,   0   }, /* FCC3 MII RX_CLK */
+	/* PC16 */ {   1,   1,   0,   0,   0,   0   }, /* FCC3 MII TX_CLK */
 	/* PC15 */ {   0,   0,   0,   1,   0,   0   },
 	/* PC14 */ {   0,   1,   0,   0,   0,   0   },
 	/* PC13 */ {   0,   0,   0,   1,   0,   0   }, /* RES_PHY_L */
@@ -360,7 +360,7 @@
     ulong start =  memctl->memc_ ## brX & 0xFFFF8000;	\
     ulong sizem = ~memctl->memc_ ## orX | 0x00007FFF;	\
     printf ("\n"					\
-    	    #brX " 0x%08x  " #orX " 0x%08x "		\
+	    #brX " 0x%08x  " #orX " 0x%08x "		\
 	    "==> 0x%08lx ... 0x%08lx = %ld MB\n",	\
 	memctl->memc_ ## brX, memctl->memc_ ## orX,	\
 	start, start+sizem, (sizem+1)>>20);		\

diff --git a/board/siemens/SCM/u-boot.lds b/board/siemens/SCM/u-boot.lds
index 9d56f13..ce6c454 100644
--- a/board/siemens/SCM/u-boot.lds
+++ b/board/siemens/SCM/u-boot.lds

@@ -94,6 +94,11 @@
   _edata  =  .;
   PROVIDE (edata = .);
 
+  __u_boot_cmd_start = .;
+  .u_boot_cmd : { *(.u_boot_cmd) }
+  __u_boot_cmd_end = .;
+
+
   __start___ex_table = .;
   __ex_table : { *(__ex_table) }
   __stop___ex_table = .;
@@ -116,4 +121,3 @@
   _end = . ;
   PROVIDE (end = .);
 }
-

diff --git a/board/siemens/common/fpga.c b/board/siemens/common/fpga.c
index a17de5a..7edeb0a 100644
--- a/board/siemens/common/fpga.c
+++ b/board/siemens/common/fpga.c

@@ -26,8 +26,6 @@
 #include <command.h>
 #include <linux/ctype.h>
 #include <common.h>
-#include <cmd_boot.h>
-#include <cmd_bsp.h>
 
 #include "fpga.h"
 
@@ -146,7 +144,7 @@
 
     if (hdr.ih_magic != IH_MAGIC) {
 	strcpy (msg, "Bad Image Magic Number");
-        goto failure;
+	goto failure;
     }
 
     len  = sizeof(image_header_t);
@@ -293,6 +291,14 @@
     return 1;
 }
 
+cmd_tbl_t U_BOOT_CMD(fpga) = MK_CMD_ENTRY(
+	"fpga",	4,	1,	do_fpga,
+	"fpga    - access FPGA(s)\n",
+	"fpga status [name] - print FPGA status\n"
+	"fpga reset  [name] - reset FPGA\n"
+	"fpga load [name] addr - load FPGA configuration data\n"
+);
+
 #endif	/* CONFIG_COMMANDS & CFG_CMD_BSP */
 
 /* . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . */

diff --git a/board/siemens/pcu_e/Makefile b/board/siemens/pcu_e/Makefile
index 35b8428..7a2014d 100644
--- a/board/siemens/pcu_e/Makefile
+++ b/board/siemens/pcu_e/Makefile

@@ -28,7 +28,7 @@
 OBJS	= $(BOARD).o flash.o
 
 $(LIB):	.depend $(OBJS)
-	$(AR) crv $@ $^
+	$(AR) crv $@ $(OBJS)
 
 #########################################################################
 

diff --git a/board/siemens/pcu_e/pcu_e.c b/board/siemens/pcu_e/pcu_e.c
index 6c0b5eb..a8d73cc 100644
--- a/board/siemens/pcu_e/pcu_e.c
+++ b/board/siemens/pcu_e/pcu_e.c

@@ -53,9 +53,9 @@
 	/*
 	 * SDRAM Initialization (offset 5 in UPM RAM)
 	 *
-         * This is no UPM entry point. The following definition uses
-         * the remaining space to establish an initialization
-         * sequence, which is executed by a RUN command.
+	 * This is no UPM entry point. The following definition uses
+	 * the remaining space to establish an initialization
+	 * sequence, which is executed by a RUN command.
 	 *
 	 */
 		    0x1ffddc35, 0xefceac34, 0x1f3d5c35, /* last */
@@ -433,6 +433,12 @@
 	printf ("Usage:\n%s\n", cmdtp->usage);
 	return 1;
 }
+cmd_tbl_t U_BOOT_CMD(puma) = MK_CMD_ENTRY(
+	"puma",	4,	1,	do_puma,
+	"puma    - access PUMA FPGA\n",
+	"status - print PUMA status\n"
+	"puma load addr len - load PUMA configuration data\n"
+);
 
 #endif	/* CFG_CMD_BSP */
 

diff --git a/board/siemens/pcu_e/u-boot.lds b/board/siemens/pcu_e/u-boot.lds
index 3764878..fffa79e 100644
--- a/board/siemens/pcu_e/u-boot.lds
+++ b/board/siemens/pcu_e/u-boot.lds

@@ -98,6 +98,11 @@
   _edata  =  .;
   PROVIDE (edata = .);
 
+  __u_boot_cmd_start = .;
+  .u_boot_cmd : { *(.u_boot_cmd) }
+  __u_boot_cmd_end = .;
+
+
   __start___ex_table = .;
   __ex_table : { *(__ex_table) }
   __stop___ex_table = .;
@@ -120,4 +125,3 @@
   _end = . ;
   PROVIDE (end = .);
 }
-

diff --git a/board/siemens/pcu_e/u-boot.lds.debug b/board/siemens/pcu_e/u-boot.lds.debug
index 9183016..153286b 100644
--- a/board/siemens/pcu_e/u-boot.lds.debug
+++ b/board/siemens/pcu_e/u-boot.lds.debug

@@ -107,6 +107,11 @@
   _edata  =  .;
   PROVIDE (edata = .);
 
+  __u_boot_cmd_start = .;
+  .u_boot_cmd : { *(.u_boot_cmd) }
+  __u_boot_cmd_end = .;
+
+
   __start___ex_table = .;
   __ex_table : { *(__ex_table) }
   __stop___ex_table = .;
@@ -129,4 +134,3 @@
   _end = . ;
   PROVIDE (end = .);
 }
-

diff --git a/board/sixnet/Makefile b/board/sixnet/Makefile
index ef173d0..13ce9fc 100644
--- a/board/sixnet/Makefile
+++ b/board/sixnet/Makefile

@@ -28,7 +28,7 @@
 OBJS	= $(BOARD).o flash.o
 
 $(LIB):	.depend $(OBJS)
-	$(AR) crv $@ $^
+	$(AR) crv $@ $(OBJS)
 
 #########################################################################
 

diff --git a/board/sixnet/flash.c b/board/sixnet/flash.c
index 3bf2ff8..225513a 100644
--- a/board/sixnet/flash.c
+++ b/board/sixnet/flash.c

@@ -199,32 +199,32 @@
 	case FLASH_AM640U:
 		fmt = "29LV641D (64 Mbit, uniform sectors)\n";
 		break;
-        case FLASH_28F800C3B:
-        case FLASH_28F800C3T:
+	case FLASH_28F800C3B:
+	case FLASH_28F800C3T:
 		fmt = "28F800C3%s (8 Mbit, %s)\n";
 		break;
 	case FLASH_INTEL800B:
 	case FLASH_INTEL800T:
 		fmt = "28F800B3%s (8 Mbit, %s)\n";
 		break;
-        case FLASH_28F160C3B:
-        case FLASH_28F160C3T:
+	case FLASH_28F160C3B:
+	case FLASH_28F160C3T:
 		fmt = "28F160C3%s (16 Mbit, %s)\n";
 		break;
 	case FLASH_INTEL160B:
 	case FLASH_INTEL160T:
 		fmt = "28F160B3%s (16 Mbit, %s)\n";
 		break;
-        case FLASH_28F320C3B:
-        case FLASH_28F320C3T:
+	case FLASH_28F320C3B:
+	case FLASH_28F320C3T:
 		fmt = "28F320C3%s (32 Mbit, %s)\n";
 		break;
 	case FLASH_INTEL320B:
 	case FLASH_INTEL320T:
 		fmt = "28F320B3%s (32 Mbit, %s)\n";
 		break;
-        case FLASH_28F640C3B:
-        case FLASH_28F640C3T:
+	case FLASH_28F640C3B:
+	case FLASH_28F640C3T:
 		fmt = "28F640C3%s (64 Mbit, %s)\n";
 		break;
 	case FLASH_INTEL640B:
@@ -545,15 +545,15 @@
 	 left > 0 && res == 0;
 	 addr += sizeof(data), left -= sizeof(data) - bytes) {
 
-        bytes = addr & (sizeof(data) - 1);
-        addr &= ~(sizeof(data) - 1);
+	bytes = addr & (sizeof(data) - 1);
+	addr &= ~(sizeof(data) - 1);
 
 	/* combine source and destination data so can program
 	 * an entire word of 16 or 32 bits
 	 */
-        for (i = 0; i < sizeof(data); i++) {
-            data <<= 8;
-            if (i < bytes || i - bytes >= left )
+	for (i = 0; i < sizeof(data); i++) {
+	    data <<= 8;
+	    if (i < bytes || i - bytes >= left )
 		data += *((uchar *)addr + i);
 	    else
 		data += *src++;

diff --git a/board/sixnet/fpgadata.c b/board/sixnet/fpgadata.c
index b756a65..2d3a7b3 100644
--- a/board/sixnet/fpgadata.c
+++ b/board/sixnet/fpgadata.c

@@ -1,1719 +1,1719 @@
-        0xff, 0x87, 0xff, 0x88, 0x7f, 0xff, 0xf9, 0xff,
-        0xff, 0xf5, 0xff, 0x8f, 0xff, 0xf0, 0x8f, 0xf9,
-        0xff, 0xef, 0xff, 0xff, 0xff,
-        0xff, 0xff, 0x8f, 0xff, 0xf0, 0xff, 0xff, 0xf0,
-        0xff, 0xff, 0xff, 0xff, 0x8f, 0x7f, 0xf1, 0xcf,
-        0xff, 0xff, 0xff, 0xff, 0xff,
-        0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xef,
-        0x7f, 0x7b, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
-        0xff, 0xff, 0x77, 0xff, 0xff,
-        0xff, 0xff, 0xff, 0xff, 0x86, 0xf6, 0xf0, 0xff,
-        0xf0, 0xff, 0xff, 0xff, 0xff, 0x7f, 0x0f, 0x7f,
-        0xc1, 0xff, 0xff, 0xff, 0xff,
-        0xff, 0xf8, 0xff, 0xff, 0xf6, 0xf0, 0xff, 0xff,
-        0x7f, 0x8f, 0x7f, 0xf0, 0xff, 0x0f, 0x7f, 0xff,
-        0xff, 0xff, 0xff, 0x8f, 0x7f,
-        0xff, 0xf8, 0xf7, 0x8f, 0xcf, 0xf0, 0xf6, 0xff,
-        0xff, 0xef, 0xff, 0xfb, 0x7f, 0x2f, 0x1f, 0x71,
-        0xf5, 0xff, 0xff, 0xef, 0x7f,
-        0xff, 0x7f, 0xff, 0xf7, 0xf6, 0xfe, 0xff, 0xff,
-        0xff, 0xff, 0xff, 0xff, 0xff, 0x7f, 0xff, 0xff,
-        0xff, 0xff, 0xff, 0xff, 0xff,
-        0xff, 0xff, 0xf7, 0x7f, 0x77, 0xf7, 0xff, 0xfb,
-        0x0f, 0xff, 0xf0, 0xff, 0xff, 0x7f, 0xff, 0xff,
-        0xfe, 0xff, 0x8f, 0x7f, 0xf1,
-        0xff, 0xff, 0xfa, 0xce, 0xff, 0xfd, 0xff, 0xff,
-        0x9f, 0xff, 0x8e, 0xff, 0xf0, 0xbf, 0x7f, 0xf5,
-        0xff, 0xef, 0x9f, 0xfd, 0x81,
-        0xff, 0xf9, 0xff, 0xff, 0xff, 0xfe, 0xff, 0xff,
-        0xff, 0xef, 0x9f, 0xfb, 0xff, 0xff, 0xff, 0xff,
-        0xff, 0xff, 0xff, 0xff, 0x7f,
-        0xff, 0x77, 0xfa, 0xb6, 0xff, 0x78, 0xff, 0xff,
-        0xff, 0xff, 0xff, 0xbf, 0xfd, 0x0f, 0x7f, 0xf1,
-        0xff, 0xff, 0xff, 0xff, 0x8f,
-        0xff, 0xf6, 0xf7, 0xf6, 0x7f, 0xbf, 0xff, 0xff,
-        0xff, 0xff, 0xef, 0xbf, 0xf2, 0x7f, 0xef, 0xff,
-        0xfe, 0xfb, 0xff, 0xef, 0xff,
-        0xff, 0xf7, 0xfe, 0xff, 0xff, 0xff, 0xff, 0xbf,
-        0xff, 0xfe, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
-        0xff, 0xff, 0x7f, 0xff, 0xff,
-        0xff, 0xf7, 0xff, 0xf7, 0xcf, 0x8f, 0xff, 0xf0,
-        0xef, 0xf9, 0xfb, 0xff, 0xff, 0xff, 0x9f, 0x0f,
-        0x65, 0xe1, 0xfb, 0x7b, 0xf3,
-        0xff, 0xf7, 0xf6, 0xfe, 0xff, 0x8f, 0xf6, 0xe8,
-        0xf6, 0xf1, 0xff, 0xff, 0xff, 0xf9, 0xff, 0xff,
-        0x6f, 0x61, 0xf1, 0xfb, 0xff,
-        0xff, 0xde, 0x8f, 0x8f, 0xf0, 0xf0, 0xff, 0xff,
-        0xf7, 0xbf, 0xff, 0xd4, 0x8f, 0x0f, 0x71, 0xc1,
-        0x6f, 0xd1, 0xeb, 0x5f, 0xfd,
-        0xff, 0x9f, 0xff, 0xfb, 0xff, 0x8f, 0x9f, 0xf7,
-        0x9f, 0xff, 0xf4, 0xb7, 0xfd, 0xff, 0xfe, 0x8f,
-        0xbf, 0x71, 0x1f, 0xff, 0x7f,
-        0xff, 0xfd, 0x87, 0x87, 0xf0, 0x70, 0x1f, 0xf7,
-        0xbf, 0xff, 0xff, 0xff, 0x8f, 0x0f, 0x71, 0x81,
-        0xbf, 0x3e, 0x7f, 0x7f, 0xff,
-        0xff, 0xff, 0xff, 0xff, 0x8f, 0xff, 0x7f, 0xff,
-        0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
-        0xf1, 0xff, 0xff, 0xff, 0xff,
-        0xbf, 0xff, 0x07, 0xff, 0xf0, 0xff, 0xff, 0xff,
-        0xfe, 0xff, 0xff, 0xf7, 0x8d, 0x7f, 0xf1, 0xff,
-        0xff, 0x9f, 0x6f, 0xf1, 0xff,
-        0xbf, 0x71, 0x87, 0xfe, 0xf0, 0x8f, 0x8f, 0xf0,
-        0xfb, 0xcb, 0xff, 0xf0, 0x8f, 0x7f, 0xf1, 0x8f,
-        0x1e, 0xe1, 0x7e, 0x91, 0x7f,
-        0xbf, 0x1a, 0xff, 0x71, 0xff, 0x9f, 0x8f, 0xf6,
-        0xf8, 0xdf, 0xf7, 0xf4, 0xff, 0xff, 0xff, 0x8f,
-        0x1f, 0xf0, 0x7f, 0x97, 0xff,
-        0xbf, 0x97, 0xff, 0xfb, 0xbf, 0xdf, 0xff, 0xf7,
-        0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xaf, 0xdf,
-        0xf9, 0xff, 0xff, 0xff, 0xff,
-        0xff, 0x7f, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
-        0xff, 0xff, 0xff, 0xf7, 0xff, 0xff, 0xff, 0xff,
-        0xff, 0xdf, 0xff, 0xf1, 0xff,
-        0xff, 0x9f, 0xfc, 0xfb, 0xff, 0xf0, 0xfe, 0xff,
-        0xff, 0xff, 0x9d, 0xff, 0xf4, 0xcf, 0xff, 0x7f,
-        0xf7, 0xff, 0xff, 0xff, 0xcf,
-        0xff, 0x97, 0xff, 0xfa, 0xff, 0x8f, 0xf8, 0xf0,
-        0xff, 0xff, 0xff, 0xdf, 0xff, 0xfd, 0xff, 0x0f,
-        0x7f, 0xe1, 0xff, 0xf1, 0xff,
-        0xff, 0x83, 0x7f, 0xf8, 0xff, 0xff, 0xff, 0xff,
-        0x7f, 0x6f, 0x7f, 0x77, 0x7d, 0xff, 0xff, 0xff,
-        0xff, 0xff, 0x8f, 0x6f, 0xf1,
-        0xff, 0xd7, 0xff, 0xfe, 0xff, 0xff, 0x9f, 0xfd,
-        0x78, 0xef, 0xff, 0xbf, 0xff, 0xf5, 0xff, 0xff,
-        0xbf, 0x0f, 0x79, 0xd1, 0xff,
-        0xff, 0xd2, 0xff, 0x72, 0xff, 0xff, 0xff, 0xff,
-        0x8f, 0xfe, 0x70, 0x9d, 0xff, 0xf4, 0xff, 0xfe,
-        0xff, 0xff, 0xff, 0xbf, 0x7f,
-        0xff, 0x07, 0xff, 0x78, 0xff, 0x9f, 0xff, 0xfe,
-        0xff, 0x77, 0x7f, 0x8f, 0x7f, 0xf0, 0xff, 0x8f,
-        0x7f, 0xe1, 0x0f, 0x71, 0xf1,
-        0xff, 0xfe, 0xff, 0xfd, 0xff, 0xff, 0xff, 0xff,
-        0x7f, 0xfd, 0xff, 0xba, 0x7f, 0xff, 0xff, 0xff,
-        0xff, 0xef, 0x7f, 0xa1, 0x7f,
-        0xff, 0xbd, 0x7f, 0xf7, 0xf9, 0xfd, 0xfb, 0xff,
-        0xff, 0x8f, 0xbf, 0xb7, 0x8f, 0xaf, 0xdf, 0xff,
-        0xff, 0xff, 0xff, 0x5f, 0xeb,
-        0xbf, 0xfd, 0xf8, 0xff, 0xff, 0xfb, 0xff, 0xfb,
-        0xff, 0xf7, 0xcf, 0xfb, 0xf0, 0xff, 0xff, 0xdf,
-        0xff, 0xff, 0xef, 0x7f, 0xab,
-        0xff, 0xfd, 0xfa, 0xbf, 0x8f, 0xbf, 0xca, 0xfe,
-        0xff, 0xff, 0xdf, 0x6f, 0xd4, 0xf6, 0x0f, 0x3f,
-        0x11, 0xf9, 0xff, 0x7f, 0x8b,
-        0xbf, 0xff, 0x8f, 0xff, 0xc0, 0xfb, 0xf5, 0xef,
-        0xf7, 0x7f, 0xff, 0xff, 0xfb, 0x7f, 0xff, 0x7f,
-        0xff, 0x6f, 0xff, 0xff, 0xff,
-        0xbf, 0x87, 0xbb, 0xf8, 0xfb, 0xcf, 0xfe, 0xfe,
-        0xff, 0xef, 0xff, 0xfb, 0x7f, 0xff, 0xff, 0x8f,
-        0xff, 0xe1, 0x7f, 0x7b, 0xff,
-        0xbf, 0x80, 0x89, 0x88, 0xb0, 0xf5, 0xf0, 0xff,
-        0xf7, 0xdf, 0xfe, 0x7c, 0x8f, 0x0f, 0x71, 0xe1,
-        0xff, 0xf1, 0xe5, 0x0e, 0x2b,
-        0xff, 0xff, 0xff, 0xbf, 0xff, 0xcf, 0xf5, 0x9f,
-        0xff, 0xff, 0xfe, 0xff, 0x8f, 0x7f, 0x71, 0x8f,
-        0xff, 0x91, 0x7f, 0xfb, 0xff,
-        0xff, 0x7f, 0x7f, 0xcf, 0x8a, 0xff, 0xf0, 0xff,
-        0x57, 0xfe, 0xfb, 0x8f, 0xff, 0xf0, 0xff, 0x7e,
-        0xff, 0xff, 0x9a, 0xff, 0xf1,
-        0xff, 0xff, 0xcf, 0xb7, 0xce, 0xff, 0xf4, 0xff,
-        0xff, 0x7f, 0xf7, 0xfb, 0xff, 0xfe, 0xff, 0x7f,
-        0xff, 0xfd, 0xfe, 0x75, 0xfd,
-        0xff, 0xef, 0xcf, 0xff, 0xf5, 0xff, 0xf5, 0xff,
-        0xf7, 0xff, 0xff, 0xff, 0xff, 0x7f, 0x7f, 0xff,
-        0xcf, 0x7f, 0x31, 0x7f, 0xff,
-        0x3f, 0x78, 0xf8, 0xff, 0xff, 0xff, 0xff, 0xff,
-        0xff, 0x0f, 0x0f, 0xf1, 0xf1, 0xdf, 0xff, 0xff,
-        0xff, 0x9f, 0xff, 0x84, 0x0e,
-        0xff, 0xf8, 0x7f, 0xf7, 0x7f, 0xff, 0xff, 0x8f,
-        0x8f, 0x80, 0xf1, 0xf1, 0xff, 0xff, 0xff, 0xff,
-        0xfe, 0x9f, 0x8e, 0x05, 0x71,
-        0xbf, 0xf8, 0xf8, 0xff, 0x7f, 0xff, 0xff, 0xff,
-        0xff, 0x8f, 0x8f, 0xf1, 0xf1, 0xff, 0xff, 0xff,
-        0xfe, 0xff, 0xff, 0x8f, 0x0f,
-        0xff, 0xf8, 0x7f, 0xff, 0xff, 0xff, 0xff, 0xff,
-        0x8f, 0x8f, 0xf1, 0xf1, 0xff, 0xff, 0xff, 0xff,
-        0xff, 0xff, 0x8e, 0x0f, 0x71,
-        0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
-        0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
-        0xff, 0xff, 0xff, 0xff, 0xff,
-        0xff, 0xff, 0x7f, 0xf7, 0xff, 0xff, 0x8f, 0xff,
-        0xf0, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
-        0x8f, 0x7f, 0xf0, 0xff, 0xff,
-        0x7f, 0xf8, 0xff, 0xf7, 0xff, 0xff, 0xff, 0xff,
-        0xff, 0x8f, 0xff, 0xf0, 0xff, 0xff, 0xff, 0xff,
-        0xff, 0x9f, 0xff, 0x8f, 0x7e,
-        0xbf, 0xff, 0x78, 0xff, 0xff, 0xff, 0xff, 0xff,
-        0xff, 0xff, 0x8f, 0xff, 0xf0, 0xff, 0xff, 0xff,
-        0xff, 0xff, 0xfe, 0xff, 0x8f,
-        0xff, 0x87, 0x7f, 0xf8, 0xff, 0xff, 0xff, 0xff,
-        0x8f, 0xff, 0xf0, 0x8f, 0xff, 0xf0, 0xff, 0xff,
-        0xff, 0xff, 0x8e, 0x7f, 0xf1,
-        0xff, 0xf8, 0x7f, 0xff, 0xff, 0xff, 0xff, 0xff,
-        0xff, 0x8f, 0xff, 0xf0, 0xff, 0xff, 0xff, 0xff,
-        0xff, 0xff, 0xff, 0x8f, 0x7f,
-        0x3f, 0xff, 0xf8, 0xff, 0x8f, 0x7f, 0xf0, 0x8f,
-        0xff, 0xf0, 0x0f, 0xff, 0x70, 0xff, 0x8f, 0x7e,
-        0xf1, 0xdf, 0xff, 0xfb, 0x8e,
-        0xff, 0x80, 0x7f, 0xf0, 0xff, 0xff, 0xff, 0xff,
-        0xff, 0xaf, 0x7f, 0x84, 0xff, 0xf1, 0xff, 0xfe,
-        0xff, 0xff, 0xfe, 0x8f, 0x7f,
-        0xff, 0x80, 0xff, 0xf8, 0xff, 0x7f, 0xff, 0xff,
-        0x7f, 0x8f, 0xff, 0x81, 0x7f, 0xf0, 0xff, 0xff,
-        0xff, 0xff, 0xff, 0x8f, 0x7f,
-        0xff, 0x7f, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
-        0x8f, 0x7f, 0xf0, 0xdf, 0xdf, 0xff, 0xdf, 0xff,
-        0xff, 0xff, 0x8f, 0x7f, 0xf1,
-        0xff, 0xfd, 0xff, 0xff, 0xff, 0x0f, 0xff, 0x80,
-        0xff, 0xf0, 0xff, 0xff, 0xdf, 0xff, 0xdf, 0x8e,
-        0x0f, 0x01, 0x71, 0xf1, 0xff,
-        0xff, 0xff, 0xff, 0xff, 0xff, 0x7f, 0xff, 0xff,
-        0xff, 0xff, 0xff, 0xff, 0xdf, 0xff, 0xdf, 0xff,
-        0xff, 0xff, 0xff, 0xff, 0xfe,
-        0xbf, 0x87, 0xf8, 0xf8, 0xff, 0xff, 0xff, 0xff,
-        0x7f, 0xff, 0x8f, 0x8f, 0xd0, 0xf0, 0xdf, 0xfe,
-        0xff, 0xff, 0xff, 0xff, 0x8f,
-        0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xfd,
-        0xff, 0x7f, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
-        0xff, 0xff, 0x7f, 0xff, 0xff,
-        0xff, 0x7f, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
-        0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xfe,
-        0xff, 0xff, 0xff, 0xff, 0xff,
-        0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xfd,
-        0xff, 0xff, 0xff, 0xff, 0x7f, 0xff, 0xff, 0xfe,
-        0xff, 0xdf, 0xff, 0xfb, 0xff,
-        0xff, 0xff, 0x7f, 0xff, 0xff, 0xff, 0xff, 0xfd,
-        0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
-        0xaf, 0xfe, 0xf5, 0xff, 0xff,
-        0xff, 0xff, 0x0f, 0x8f, 0xf0, 0x80, 0xff, 0xf0,
-        0xff, 0xff, 0xff, 0xff, 0x1f, 0xaf, 0x71, 0xa7,
-        0x6f, 0xf5, 0xfe, 0xff, 0xff,
-        0xff, 0x77, 0x79, 0x8f, 0xff, 0xf0, 0x8f, 0xff,
-        0x00, 0xff, 0xd0, 0x4f, 0x3d, 0xf0, 0xf7, 0xfd,
-        0x8f, 0x7f, 0x81, 0x7f, 0xd1,
-        0xff, 0xcd, 0xff, 0xff, 0x8f, 0x0f, 0x70, 0xf0,
-        0xff, 0x7f, 0x7f, 0xff, 0xff, 0xdb, 0x8d, 0x4b,
-        0x73, 0xf9, 0xff, 0xdf, 0xff,
-        0x3f, 0xfc, 0xff, 0x8f, 0xff, 0xf2, 0x8f, 0x8f,
-        0x70, 0x7a, 0x3f, 0xbc, 0xf7, 0xdb, 0xff, 0xf9,
-        0xff, 0xff, 0xff, 0xff, 0xee,
-        0xff, 0xe8, 0xf7, 0x8f, 0xfd, 0x80, 0xff, 0xf0,
-        0x9f, 0xa5, 0x7a, 0xf4, 0x6f, 0x3f, 0xcf, 0x07,
-        0x6a, 0xe1, 0xff, 0x8f, 0x7f,
-        0xff, 0xff, 0x77, 0xf1, 0x8f, 0x8f, 0xf0, 0xf0,
-        0xbf, 0xff, 0xe7, 0x7f, 0x8f, 0x24, 0x03, 0x77,
-        0xf3, 0xff, 0xfe, 0xff, 0xff,
-        0xbf, 0x9f, 0x77, 0x8b, 0xff, 0xf0, 0xff, 0xef,
-        0x7d, 0x7f, 0xff, 0x9f, 0xeb, 0x3d, 0xff, 0xf7,
-        0xff, 0xfb, 0xfe, 0xff, 0xdf,
-        0xff, 0xff, 0x77, 0xff, 0x8f, 0x8f, 0xf0, 0xf0,
-        0x7f, 0xff, 0xff, 0xff, 0xff, 0xff, 0xbb, 0x5d,
-        0xf5, 0xbb, 0xef, 0xff, 0xff,
-        0xff, 0x7f, 0x8f, 0x8f, 0xf0, 0xf8, 0xff, 0xff,
-        0xf7, 0x7f, 0xff, 0xff, 0xaf, 0xbf, 0x75, 0xb7,
-        0xff, 0xf7, 0xff, 0xff, 0xff,
-        0xff, 0x7f, 0x87, 0x7f, 0xf8, 0xff, 0xf7, 0xf7,
-        0x8f, 0xff, 0xf0, 0x7f, 0xf7, 0xff, 0xad, 0xff,
-        0xf7, 0xee, 0x9f, 0xff, 0xf5,
-        0xff, 0xf8, 0x07, 0xff, 0x80, 0x8f, 0x80, 0x80,
-        0xf0, 0x8f, 0x7f, 0x70, 0x4f, 0x0f, 0x79, 0xf1,
-        0xfd, 0xff, 0xef, 0x8f, 0x7f,
-        0xbf, 0x7f, 0xf8, 0xff, 0xff, 0xff, 0xff, 0xff,
-        0xff, 0xff, 0x8f, 0xff, 0xd0, 0xbf, 0xdb, 0xe5,
-        0x3b, 0xfe, 0xf7, 0xff, 0x8f,
-        0xff, 0xff, 0x8f, 0x77, 0x80, 0xff, 0xf0, 0xff,
-        0xff, 0x7f, 0xff, 0xff, 0xbd, 0xef, 0x07, 0x7f,
-        0xf1, 0xfe, 0xff, 0xfe, 0xff,
-        0x7f, 0x7f, 0xff, 0xf7, 0xf7, 0xff, 0xf7, 0x8f,
-        0xbf, 0x70, 0xf5, 0x7f, 0xff, 0xef, 0x3f, 0x7d,
-        0xf7, 0xff, 0xff, 0xfe, 0xfe,
-        0xff, 0x97, 0xff, 0x7f, 0xff, 0xff, 0xff, 0xff,
-        0x7e, 0xff, 0xff, 0x9f, 0xdf, 0xf7, 0x3b, 0xff,
-        0xf7, 0xff, 0x7f, 0xfe, 0xff,
-        0x3f, 0x78, 0xf8, 0xff, 0xff, 0xff, 0xff, 0xff,
-        0xff, 0x1f, 0x1f, 0xf1, 0xf1, 0xff, 0xff, 0xff,
-        0xff, 0xff, 0xff, 0x80, 0x0e,
-        0xff, 0xf8, 0x7f, 0xff, 0x7f, 0xff, 0xff, 0x8f,
-        0x9f, 0x80, 0xe1, 0xf1, 0xff, 0xff, 0xef, 0xff,
-        0xfe, 0x9f, 0x0e, 0x01, 0x71,
-        0xbf, 0xf8, 0xf8, 0xff, 0x7f, 0xff, 0xff, 0xff,
-        0xff, 0x8f, 0x8f, 0xf1, 0xf1, 0xff, 0xff, 0xef,
-        0xfe, 0xef, 0xff, 0x8f, 0x0f,
-        0xff, 0xf8, 0x7f, 0xff, 0xff, 0xff, 0xff, 0xff,
-        0x9f, 0x8f, 0xf1, 0xf1, 0xff, 0xff, 0xff, 0xff,
-        0xff, 0xff, 0x8e, 0x0f, 0x71,
-        0xff, 0xf7, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
-        0xff, 0xff, 0xef, 0xff, 0xff, 0xef, 0xfe, 0xef,
-        0xef, 0xff, 0xff, 0xef, 0xff,
-        0xff, 0xf7, 0x7f, 0xff, 0xff, 0xff, 0x8f, 0xff,
-        0xf0, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
-        0x8f, 0x7f, 0xe0, 0xff, 0xff,
-        0x7f, 0xf0, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
-        0xff, 0x8f, 0xff, 0xf0, 0xff, 0xff, 0xff, 0xff,
-        0xff, 0xff, 0xff, 0x8f, 0x7e,
-        0xbf, 0xff, 0x78, 0xff, 0xff, 0xff, 0xff, 0xff,
-        0xff, 0xff, 0x8f, 0xff, 0xf0, 0xef, 0xff, 0xff,
-        0xff, 0xff, 0xee, 0xef, 0x9f,
-        0xff, 0x07, 0xff, 0xf8, 0xff, 0xff, 0xff, 0xff,
-        0x8f, 0xff, 0xf0, 0x8f, 0xff, 0xe0, 0xff, 0xff,
-        0xff, 0xef, 0x8e, 0x7f, 0xf1,
-        0xff, 0xf8, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
-        0xff, 0x8f, 0xff, 0xf0, 0xff, 0xff, 0xff, 0xff,
-        0xef, 0xff, 0xfe, 0x8f, 0x7f,
-        0x3f, 0xff, 0xf8, 0xff, 0x8f, 0x7f, 0xf0, 0xdf,
-        0xff, 0xf0, 0x0f, 0xff, 0x70, 0xff, 0x8f, 0x7e,
-        0xe1, 0xdf, 0xff, 0xf7, 0x8e,
-        0xff, 0x80, 0x7f, 0xf8, 0xff, 0x7f, 0xff, 0xff,
-        0xff, 0x8f, 0x7f, 0x80, 0xff, 0xf1, 0xff, 0xff,
-        0xff, 0xef, 0xfe, 0x8f, 0x7f,
-        0xff, 0x80, 0xff, 0xf8, 0xff, 0xff, 0xff, 0xff,
-        0x7f, 0x8f, 0xff, 0x81, 0x7f, 0xf0, 0xff, 0xfe,
-        0xff, 0xff, 0xff, 0x8f, 0x7f,
-        0xff, 0x7f, 0xff, 0xf7, 0xff, 0xff, 0xff, 0xff,
-        0x1f, 0x7f, 0xf0, 0xff, 0xff, 0xff, 0xff, 0xff,
-        0xff, 0xff, 0x8f, 0x7e, 0xf1,
-        0xff, 0xff, 0xff, 0xf7, 0xff, 0x0f, 0x8f, 0x80,
-        0xf7, 0xe0, 0xff, 0xff, 0xff, 0xff, 0xff, 0x9e,
-        0x6f, 0x91, 0x71, 0xf1, 0xff,
-        0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
-        0xff, 0xef, 0xff, 0xff, 0xff, 0xff, 0xff, 0xfe,
-        0xff, 0xff, 0xef, 0xff, 0xff,
-        0xbf, 0x87, 0xf8, 0xf8, 0xff, 0x7f, 0xff, 0xff,
-        0xff, 0xff, 0x8f, 0x8f, 0xf0, 0xf0, 0xff, 0xff,
-        0xff, 0xff, 0xff, 0xdf, 0x8f,
-        0xff, 0xef, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
-        0x7f, 0xff, 0xff, 0xff, 0xff, 0xff, 0xef, 0xff,
-        0xff, 0xff, 0xff, 0xff, 0xff,
-        0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
-        0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xef, 0xfe,
-        0xff, 0xff, 0xff, 0xff, 0xff,
-        0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
-        0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xef, 0xfe,
-        0xff, 0xef, 0xff, 0xd7, 0xff,
-        0xff, 0xff, 0xff, 0x7f, 0xff, 0xff, 0x8f, 0xff,
-        0xf7, 0xff, 0xff, 0xff, 0xff, 0xff, 0xef, 0xff,
-        0xff, 0xfe, 0xf9, 0xdf, 0xff,
-        0xff, 0xff, 0x8f, 0xbf, 0xf7, 0x9f, 0xf8, 0xf0,
-        0xff, 0xff, 0x77, 0xff, 0x0e, 0x1f, 0x61, 0x81,
-        0x7f, 0xf1, 0xfe, 0xff, 0xff,
-        0xff, 0x7f, 0xb9, 0xcf, 0xff, 0xff, 0x0f, 0xff,
-        0x00, 0xff, 0xd0, 0x7f, 0x75, 0x8b, 0x7f, 0xf1,
-        0x8f, 0x7f, 0x80, 0x7e, 0x91,
-        0xff, 0xbf, 0xdf, 0xff, 0xa7, 0x47, 0x70, 0xf7,
-        0xff, 0xff, 0x7f, 0xff, 0xff, 0xff, 0x8f, 0x0f,
-        0x61, 0xf1, 0xef, 0xff, 0xff,
-        0x7f, 0xfe, 0xef, 0x5f, 0xf7, 0xff, 0xff, 0xff,
-        0xff, 0xe7, 0xb7, 0xfc, 0xeb, 0x9f, 0x7f, 0xf1,
-        0x9f, 0x0f, 0x71, 0xf1, 0xee,
-        0xff, 0xf0, 0xf7, 0x3f, 0xef, 0x97, 0xf8, 0xe8,
-        0xff, 0x9f, 0x7f, 0xf0, 0x7f, 0x9f, 0x6f, 0x91,
-        0x7e, 0xf1, 0x9f, 0x8f, 0x57,
-        0xff, 0xff, 0x26, 0xb9, 0xb8, 0xff, 0xf0, 0xff,
-        0xff, 0xff, 0xf7, 0x7f, 0x6f, 0xf4, 0x9f, 0x1f,
-        0x71, 0xe1, 0xfe, 0x7f, 0xff,
-        0xbf, 0xff, 0x71, 0xbb, 0xe8, 0xff, 0xff, 0xf8,
-        0xbf, 0xff, 0xaf, 0xff, 0xf8, 0x9d, 0x6f, 0xf1,
-        0xbf, 0xff, 0xb7, 0xff, 0xbd,
-        0xbf, 0xff, 0xff, 0xdf, 0x97, 0xc7, 0xf7, 0xf0,
-        0xff, 0xff, 0x93, 0xff, 0xff, 0xef, 0xcf, 0x5f,
-        0xf1, 0xf7, 0xdf, 0xf5, 0x9f,
-        0xff, 0xff, 0x87, 0xbf, 0xe0, 0xbf, 0xf7, 0xff,
-        0xf7, 0x7f, 0xff, 0xff, 0x8f, 0x5f, 0x21, 0xb1,
-        0xff, 0x6d, 0xff, 0xef, 0xff,
-        0xff, 0xff, 0xd7, 0xff, 0xb8, 0xff, 0xff, 0xff,
-        0x3f, 0xef, 0xf0, 0x7f, 0xd7, 0x7f, 0xf1, 0xff,
-        0xef, 0xee, 0xbf, 0x7f, 0xf1,
-        0xff, 0xf8, 0x47, 0x0f, 0xc7, 0xf0, 0x7f, 0xf0,
-        0xf0, 0x90, 0x7f, 0x70, 0x8f, 0x2f, 0xc1, 0x0f,
-        0x11, 0x1f, 0xef, 0xaf, 0x7f,
-        0xbf, 0x7f, 0xf0, 0x9f, 0xe7, 0xf7, 0x38, 0xff,
-        0xff, 0xff, 0x8f, 0x7f, 0xf0, 0xaf, 0xff, 0xff,
-        0xbf, 0xfe, 0xfd, 0xdf, 0x8f,
-        0xff, 0xff, 0xbf, 0xf7, 0x8f, 0xff, 0xf7, 0xff,
-        0xeb, 0xff, 0xff, 0xff, 0x8d, 0x3f, 0x81, 0x7f,
-        0xd1, 0xfe, 0xdf, 0xfe, 0xff,
-        0x7f, 0xff, 0xff, 0xdf, 0xa8, 0xff, 0xf0, 0xff,
-        0xff, 0xf0, 0xf7, 0xff, 0xff, 0xff, 0xef, 0xef,
-        0xef, 0x9f, 0x7f, 0x7e, 0xfe,
-        0xff, 0xff, 0xef, 0xff, 0xa7, 0x77, 0xff, 0xff,
-        0xef, 0xff, 0xff, 0xdf, 0xff, 0xe7, 0xff, 0xff,
-        0xff, 0xff, 0xff, 0xfe, 0xff,
-        0x3f, 0x78, 0xf8, 0xff, 0xff, 0xff, 0xff, 0xbf,
-        0xff, 0x0f, 0x0f, 0xf1, 0xe1, 0xff, 0xff, 0xef,
-        0xef, 0xff, 0xff, 0x8e, 0x0e,
-        0xff, 0xf8, 0x7f, 0xff, 0x7f, 0xff, 0xff, 0x8f,
-        0x8f, 0x80, 0xf1, 0xf1, 0xef, 0xaf, 0xaf, 0xff,
-        0xee, 0xdf, 0x0e, 0x01, 0x71,
-        0xbf, 0xf8, 0xf8, 0xff, 0x7f, 0xff, 0xff, 0xff,
-        0xef, 0x8f, 0x9f, 0xf1, 0xe1, 0xff, 0xaf, 0xef,
-        0xfe, 0xff, 0xff, 0x8f, 0x0f,
-        0xff, 0xf8, 0x7f, 0xff, 0xff, 0xff, 0xff, 0xff,
-        0x9f, 0x9f, 0xf1, 0xf1, 0xef, 0xff, 0xaf, 0xff,
-        0xff, 0xff, 0x8e, 0x0f, 0x71,
-        0xff, 0xf7, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
-        0xff, 0xff, 0xff, 0xff, 0xef, 0xbf, 0xef, 0xff,
-        0xef, 0xbf, 0xff, 0xef, 0xff,
-        0xff, 0xf7, 0x7f, 0xff, 0xff, 0xff, 0x8f, 0xff,
-        0xf0, 0xff, 0xff, 0xff, 0xef, 0xff, 0xef, 0xfe,
-        0xcf, 0x3f, 0xf0, 0xff, 0xff,
-        0x7f, 0xf0, 0xff, 0xff, 0xff, 0xff, 0xff, 0xbf,
-        0xff, 0x88, 0xff, 0xf0, 0xff, 0xff, 0xef, 0xfe,
-        0xff, 0xff, 0xff, 0x8f, 0x6e,
-        0xbf, 0xff, 0x78, 0xff, 0xff, 0xff, 0xff, 0xff,
-        0xff, 0xff, 0x8f, 0xff, 0xe0, 0xff, 0xef, 0xff,
-        0xff, 0xff, 0xee, 0xef, 0x9f,
-        0xff, 0x8f, 0x7f, 0xf8, 0xff, 0xff, 0xff, 0xff,
-        0x8f, 0xff, 0xf0, 0x8f, 0xff, 0xa0, 0xff, 0xfe,
-        0xff, 0xbf, 0x8e, 0x6f, 0xf1,
-        0xff, 0xf8, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
-        0xff, 0x8f, 0xff, 0xf0, 0xff, 0xff, 0xff, 0xff,
-        0xff, 0xff, 0xff, 0x8f, 0x6f,
-        0x3f, 0xff, 0xf8, 0xff, 0x8f, 0x7f, 0xf0, 0xcf,
-        0xff, 0xb0, 0x0f, 0xaf, 0x70, 0xff, 0x8f, 0x7e,
-        0xf1, 0xff, 0xff, 0xf1, 0x9e,
-        0xff, 0x80, 0x7f, 0xf8, 0xff, 0x7f, 0xff, 0xff,
-        0xef, 0x8f, 0x7f, 0x90, 0xff, 0xf1, 0xff, 0xff,
-        0xff, 0xaf, 0xfe, 0x8f, 0x7f,
-        0xff, 0x80, 0xff, 0xf8, 0xff, 0xff, 0xff, 0xff,
-        0x3f, 0xdf, 0xff, 0x81, 0x7f, 0xf0, 0xff, 0xfe,
-        0xff, 0xff, 0xff, 0x8f, 0x7f,
-        0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
-        0x9f, 0x7f, 0xf0, 0xff, 0xff, 0xff, 0xff, 0xff,
-        0xff, 0xff, 0xbf, 0x7e, 0xf1,
-        0xff, 0xff, 0x7f, 0xff, 0xff, 0x0f, 0xaf, 0x80,
-        0xf0, 0xf0, 0xff, 0xff, 0xff, 0xff, 0xff, 0xde,
-        0x0f, 0x91, 0x7f, 0xf1, 0xff,
-        0x7f, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
-        0x7f, 0xff, 0xff, 0xff, 0xff, 0xf3, 0xff, 0xfe,
-        0xff, 0xff, 0xbf, 0xff, 0xfb,
-        0xbf, 0x87, 0xf8, 0xf8, 0xff, 0x7f, 0xff, 0xff,
-        0xff, 0xdf, 0x8f, 0x8f, 0xf0, 0xf0, 0xff, 0xff,
-        0xff, 0xff, 0xff, 0xff, 0x8f,
-        0xff, 0x7f, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
-        0x7f, 0xff, 0xff, 0xdf, 0xbf, 0xff, 0xef, 0xff,
-        0xff, 0xaf, 0xff, 0xff, 0xff,
-        0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
-        0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xbf, 0xfe,
-        0xff, 0xff, 0xff, 0xff, 0xff,
-        0x7f, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
-        0xff, 0xdf, 0xff, 0xff, 0xbf, 0xff, 0xff, 0xfe,
-        0xff, 0xff, 0xff, 0xff, 0xff,
-        0xff, 0xff, 0xff, 0xff, 0x7f, 0xff, 0xaf, 0xff,
-        0xf0, 0xdf, 0xff, 0xff, 0xff, 0xff, 0xbf, 0xff,
-        0xdf, 0xfe, 0xfe, 0xff, 0xff,
-        0xff, 0xff, 0x0f, 0x8f, 0xf0, 0x8f, 0xff, 0xf0,
-        0xf9, 0xff, 0xf7, 0xff, 0x0f, 0x5f, 0x29, 0x89,
-        0x77, 0xf1, 0xfa, 0xff, 0xde,
-        0xff, 0xc3, 0x3f, 0x4b, 0x7f, 0xe9, 0x0f, 0xff,
-        0x00, 0xff, 0x90, 0x0f, 0xd7, 0xff, 0x7f, 0xf9,
-        0x8f, 0x7f, 0x81, 0x7f, 0x81,
-        0xff, 0xff, 0xfb, 0x7d, 0x80, 0x46, 0x76, 0xf0,
-        0xff, 0xff, 0x6f, 0xff, 0xff, 0xad, 0xcf, 0x3f,
-        0x71, 0xf9, 0xff, 0xff, 0xff,
-        0x3f, 0xba, 0xff, 0xc7, 0xf7, 0xb9, 0xcf, 0xde,
-        0x77, 0xb7, 0x77, 0xfe, 0xff, 0xbf, 0x6f, 0xf9,
-        0xff, 0x7e, 0x79, 0xb9, 0xfe,
-        0xff, 0xe4, 0xf7, 0x8f, 0xfe, 0x07, 0xfe, 0xf8,
-        0xff, 0x89, 0x7f, 0xe8, 0x7f, 0xd7, 0x7f, 0x99,
-        0x76, 0xf1, 0xff, 0x0f, 0x7b,
-        0xbf, 0xff, 0xb6, 0xb9, 0x8f, 0xdf, 0xf6, 0xff,
-        0xff, 0xf7, 0xff, 0xff, 0x8f, 0xdd, 0x87, 0x7f,
-        0x71, 0xf1, 0xfe, 0xff, 0xff,
-        0xff, 0x7f, 0xf1, 0x8a, 0xff, 0xff, 0xff, 0xff,
-        0xbf, 0xff, 0xcf, 0xfb, 0xe8, 0x9d, 0x77, 0xa9,
-        0xff, 0x77, 0xda, 0x7f, 0xff,
-        0xbf, 0xff, 0xf7, 0xf7, 0x86, 0xe5, 0xf0, 0xe0,
-        0xff, 0xff, 0xbf, 0xff, 0xff, 0xef, 0x8f, 0x7f,
-        0xbd, 0xff, 0xff, 0xff, 0x8f,
-        0xff, 0xef, 0x86, 0x8f, 0xf0, 0xff, 0xf6, 0x9f,
-        0xff, 0x7f, 0xff, 0xff, 0xcf, 0x1f, 0x71, 0xdd,
-        0x7f, 0xe1, 0xff, 0xff, 0xff,
-        0xff, 0xff, 0xc7, 0xf7, 0xb9, 0xff, 0xff, 0xfa,
-        0x3f, 0xef, 0xf0, 0xff, 0xef, 0x7f, 0xd5, 0xff,
-        0xfb, 0xff, 0xf7, 0x6e, 0xf1,
-        0xff, 0xfc, 0xc7, 0xbf, 0xc8, 0xc0, 0x59, 0xff,
-        0xdf, 0xff, 0x7b, 0xf0, 0xa7, 0x1f, 0xa9, 0x77,
-        0x79, 0x71, 0x11, 0xff, 0x79,
-        0xbf, 0xfb, 0x70, 0xbf, 0xff, 0xf9, 0x37, 0xbe,
-        0xff, 0xff, 0x8f, 0x7f, 0xf4, 0x9f, 0xff, 0xff,
-        0xd7, 0x7f, 0xff, 0xff, 0xaf,
-        0xff, 0xff, 0x9e, 0xf7, 0x9f, 0xfe, 0xe4, 0xff,
-        0xcf, 0xcf, 0xff, 0xff, 0xdf, 0x7f, 0x8d, 0x7f,
-        0xf9, 0xfa, 0xdf, 0x9f, 0xef,
-        0x7f, 0xef, 0xff, 0xff, 0xbe, 0xfd, 0xd2, 0xdf,
-        0xff, 0x7e, 0xf7, 0xff, 0xff, 0xab, 0x97, 0xef,
-        0xf3, 0xfe, 0x7f, 0x71, 0xfe,
-        0xff, 0x9f, 0xff, 0xff, 0xb6, 0xfb, 0xf7, 0xff,
-        0xff, 0xf7, 0xff, 0xbf, 0xff, 0xb7, 0xdb, 0xff,
-        0xbb, 0xef, 0xff, 0xff, 0xff,
-        0x3f, 0x68, 0xfe, 0xfd, 0xfb, 0xff, 0xff, 0xef,
-        0xf1, 0x1e, 0x1b, 0xf1, 0xf5, 0xff, 0xff, 0xff,
-        0xff, 0x9f, 0xfb, 0x9a, 0x36,
-        0xff, 0xfc, 0x7d, 0xff, 0x73, 0xf7, 0xff, 0xaf,
-        0x9f, 0x94, 0xfd, 0xf5, 0xff, 0xf7, 0xff, 0xfb,
-        0xfe, 0xef, 0x3e, 0x07, 0x4d,
-        0xbf, 0xe8, 0xf8, 0xff, 0x7f, 0xff, 0xf7, 0xf7,
-        0xf1, 0x8f, 0xaf, 0xd1, 0xf7, 0xf9, 0xfd, 0xff,
-        0xf8, 0xdf, 0xfb, 0x8f, 0x2f,
-        0xff, 0xf8, 0x7f, 0xff, 0xf7, 0xf7, 0xff, 0xff,
-        0xa7, 0xaf, 0xf7, 0xf3, 0xdf, 0xff, 0xfd, 0xff,
-        0xfd, 0xff, 0xae, 0x0f, 0x71,
-        0xff, 0xff, 0xff, 0xf9, 0xff, 0xff, 0xf3, 0xf3,
-        0xff, 0xf3, 0xff, 0xf7, 0xfb, 0xf3, 0xff, 0xff,
-        0xff, 0xeb, 0xff, 0xf3, 0xdb,
-        0xff, 0xeb, 0x7b, 0xfb, 0xf7, 0xff, 0x8b, 0xf7,
-        0xfc, 0xf7, 0xfb, 0xff, 0xfb, 0xf3, 0xff, 0xff,
-        0x8b, 0x7f, 0xd4, 0xfb, 0xff,
-        0x7f, 0xec, 0xff, 0xff, 0xff, 0xff, 0xf7, 0xf7,
-        0xff, 0x8e, 0xff, 0xf8, 0xf7, 0xfb, 0xfd, 0xff,
-        0xfd, 0x9f, 0xf7, 0x9f, 0x7e,
-        0xbf, 0xfb, 0x7c, 0xff, 0xf7, 0xff, 0xff, 0xfb,
-        0xfb, 0xf1, 0x8f, 0xf3, 0xdc, 0xf7, 0xfd, 0xff,
-        0xe9, 0xeb, 0xef, 0xc3, 0xb7,
-        0xff, 0x07, 0xff, 0xfc, 0xff, 0xff, 0xff, 0xf7,
-        0x8f, 0xff, 0xf4, 0x8f, 0xfb, 0xfc, 0xff, 0xef,
-        0xff, 0xf7, 0x8f, 0x7f, 0xd1,
-        0xff, 0xfa, 0xff, 0xfb, 0xff, 0xff, 0xff, 0xff,
-        0xf3, 0x89, 0xef, 0xf8, 0xff, 0xf7, 0xff, 0xef,
-        0xef, 0xf7, 0xf3, 0xab, 0x7f,
-        0x3f, 0xf9, 0x7e, 0xf9, 0x8f, 0x7f, 0xf0, 0xef,
-        0xff, 0xfc, 0x1b, 0xff, 0x7c, 0xff, 0x8f, 0x6e,
-        0xf1, 0xf7, 0x73, 0xff, 0xa6,
-        0xff, 0x80, 0x7f, 0xf8, 0xff, 0x7f, 0xff, 0xff,
-        0xf9, 0x8f, 0x7f, 0x84, 0xff, 0xf1, 0xff, 0xff,
-        0xff, 0xff, 0xfa, 0x8f, 0x7f,
-        0xff, 0x96, 0xff, 0xfc, 0xff, 0xff, 0xff, 0xff,
-        0x57, 0xaf, 0xfb, 0x85, 0x7f, 0xf4, 0xff, 0xfe,
-        0xef, 0xff, 0xef, 0xbf, 0x53,
-        0xff, 0x7d, 0xff, 0xff, 0xe3, 0xff, 0xff, 0xff,
-        0x97, 0x71, 0xf8, 0xff, 0xff, 0xff, 0xdb, 0xef,
-        0xef, 0xe7, 0x97, 0x72, 0xfd,
-        0xff, 0xff, 0xff, 0xff, 0xf3, 0x0f, 0xe3, 0x86,
-        0xf0, 0xf4, 0xfb, 0xff, 0xdf, 0xff, 0xfb, 0x8e,
-        0x0b, 0xa5, 0x72, 0xf9, 0xff,
-        0xff, 0xfb, 0xff, 0xff, 0xf7, 0xff, 0xf3, 0xff,
-        0xf7, 0xff, 0xf3, 0xff, 0xff, 0xff, 0xfb, 0xee,
-        0xfb, 0xff, 0xef, 0xff, 0xff,
-        0xbf, 0x82, 0xf8, 0xf8, 0xf7, 0x7f, 0xf7, 0xff,
-        0xff, 0xef, 0x87, 0x87, 0xf0, 0xf0, 0xfb, 0xff,
-        0xfb, 0xf7, 0xef, 0xef, 0x87,
-        0xff, 0xf6, 0xff, 0xfa, 0xf1, 0xef, 0xf3, 0xf7,
-        0x7f, 0xff, 0xff, 0xef, 0xff, 0xf7, 0xff, 0xff,
-        0xfb, 0xf7, 0xff, 0xfe, 0xff,
-        0xff, 0xf7, 0xfb, 0xf2, 0xf3, 0xff, 0xf1, 0xf7,
-        0xff, 0xef, 0xf7, 0xef, 0xf7, 0xf7, 0xff, 0xfe,
-        0xff, 0xff, 0xef, 0xff, 0xe7,
-        0xff, 0xfb, 0xfb, 0xff, 0xf5, 0xef, 0xf7, 0xff,
-        0xff, 0xff, 0xff, 0xf7, 0x77, 0xff, 0xff, 0xfe,
-        0xff, 0xf7, 0xff, 0xef, 0xef,
-        0xff, 0xff, 0xff, 0xff, 0xf7, 0xef, 0xe5, 0xff,
-        0xfe, 0x61, 0xf7, 0xff, 0xff, 0xff, 0xff, 0xff,
-        0x9f, 0xef, 0xef, 0xf3, 0xf7,
-        0xff, 0xff, 0x0f, 0x9f, 0xfa, 0x87, 0xff, 0xf6,
-        0xeb, 0xff, 0xff, 0xef, 0x0f, 0x6f, 0xfd, 0x0d,
-        0x53, 0xf1, 0xf3, 0xff, 0xff,
-        0xbf, 0x1b, 0x7f, 0x96, 0xfe, 0xff, 0x8f, 0xfb,
-        0x00, 0xff, 0xb0, 0x17, 0x7c, 0x8f, 0xff, 0xfd,
-        0x8f, 0x7f, 0x81, 0x7e, 0xf1,
-        0xff, 0xfd, 0xed, 0xee, 0x9e, 0x0b, 0x79, 0xff,
-        0xfb, 0x77, 0x5b, 0xff, 0x9f, 0xff, 0x4f, 0x0f,
-        0x71, 0xf0, 0xdb, 0xff, 0xf7,
-        0x7f, 0xe7, 0xef, 0x18, 0xff, 0xff, 0x9d, 0x8e,
-        0x67, 0xbf, 0x4f, 0xff, 0xff, 0xae, 0xff, 0xf1,
-        0xeb, 0xef, 0xfd, 0xad, 0xf6,
-        0xff, 0xfc, 0xf7, 0x1f, 0xff, 0x9f, 0xfb, 0xfc,
-        0xff, 0x8f, 0x77, 0xec, 0x5f, 0x6f, 0xdf, 0x25,
-        0x7e, 0xd9, 0xe6, 0x97, 0x3f,
-        0xff, 0xf7, 0x67, 0xec, 0x92, 0xbe, 0xf1, 0xfb,
-        0xff, 0x7f, 0xdf, 0x7b, 0x5e, 0x7d, 0xe7, 0x5f,
-        0xf1, 0xf1, 0xfb, 0xff, 0xf7,
-        0xbf, 0xf7, 0x71, 0x9a, 0xfd, 0xff, 0xf7, 0xfb,
-        0x5f, 0x7f, 0xaf, 0xdf, 0xf9, 0xe7, 0x77, 0xdd,
-        0x6f, 0xf7, 0xbb, 0xff, 0x8b,
-        0xbf, 0xff, 0x77, 0xff, 0x93, 0xfe, 0xf8, 0xfe,
-        0xbf, 0xfe, 0xbf, 0xff, 0xff, 0xbf, 0xab, 0x7f,
-        0xfd, 0xff, 0xcf, 0x67, 0xff,
-        0xff, 0x7f, 0x07, 0x9f, 0xe4, 0xdb, 0xff, 0xf1,
-        0xf7, 0x7f, 0xff, 0xff, 0x8f, 0x6f, 0xd1, 0x6d,
-        0x73, 0xff, 0xff, 0xfb, 0xff,
-        0xff, 0x6f, 0x9f, 0x7b, 0xfd, 0xff, 0xf6, 0xfd,
-        0x27, 0xff, 0xfc, 0xff, 0xaf, 0xff, 0xfd, 0xfe,
-        0x7f, 0xdf, 0xff, 0x7f, 0xef,
-        0xff, 0xfe, 0x81, 0xe7, 0x93, 0x91, 0x83, 0x85,
-        0xef, 0x8f, 0x7f, 0x74, 0x8d, 0x1b, 0x2d, 0xe2,
-        0xcd, 0xe5, 0xb5, 0x9f, 0x77,
-        0xbf, 0x7f, 0xe4, 0xef, 0xff, 0xf7, 0xdb, 0xfd,
-        0x7f, 0xfe, 0xab, 0x7f, 0xfc, 0xbf, 0xff, 0xde,
-        0x77, 0xfb, 0xdf, 0xef, 0xbf,
-        0xff, 0xff, 0x1e, 0x7f, 0x8f, 0xff, 0x92, 0xf3,
-        0xdf, 0x7b, 0xff, 0x7b, 0xff, 0xdb, 0x3d, 0x5f,
-        0xf9, 0xf6, 0xff, 0xf2, 0xf7,
-        0x7f, 0x7f, 0xff, 0xff, 0xef, 0xd2, 0xf0, 0xb7,
-        0xfb, 0x7f, 0xfc, 0x77, 0xd7, 0x3f, 0xc7, 0x7f,
-        0xf3, 0xe7, 0xff, 0xfd, 0xfe,
-        0xff, 0xff, 0xef, 0x7b, 0xef, 0xf5, 0xda, 0xff,
-        0x7c, 0xff, 0xff, 0xff, 0xff, 0x7b, 0xeb, 0xfb,
-        0xef, 0xff, 0xef, 0xff, 0xff,
-        0x3f, 0x60, 0xfc, 0xfb, 0xf7, 0xff, 0xff, 0xff,
-        0xfb, 0x00, 0x0f, 0xf1, 0xf5, 0xfb, 0xff, 0xff,
-        0xff, 0xff, 0xf3, 0x86, 0x3e,
-        0xff, 0xf8, 0x7f, 0xfb, 0x73, 0xff, 0xff, 0x9f,
-        0xab, 0x8c, 0xf5, 0xd1, 0xff, 0xfb, 0xff, 0xff,
-        0xfe, 0xeb, 0x36, 0x0d, 0x49,
-        0xbf, 0xf0, 0xfc, 0xfb, 0x73, 0xff, 0xf3, 0xff,
-        0xff, 0xab, 0xa7, 0xf1, 0xf9, 0xff, 0xf7, 0xdf,
-        0xfa, 0xfb, 0xff, 0xa7, 0x3f,
-        0xff, 0xf8, 0x7f, 0xff, 0xfb, 0xfb, 0xfb, 0xff,
-        0xaf, 0x8f, 0xf9, 0xf9, 0xdf, 0xdf, 0xf7, 0xdb,
-        0xff, 0xff, 0xba, 0x2f, 0x69,
-        0xff, 0xe7, 0xfb, 0xfb, 0xff, 0xff, 0xff, 0xfb,
-        0xff, 0xfb, 0xd7, 0xff, 0xdf, 0xf7, 0xd7, 0xdf,
-        0xf3, 0xdb, 0xff, 0xdb, 0xff,
-        0xff, 0xe3, 0x7b, 0xf9, 0xfb, 0xff, 0x8f, 0xfb,
-        0xf8, 0xff, 0xff, 0xef, 0xdf, 0xf3, 0xd7, 0xdf,
-        0xa3, 0x5b, 0xc4, 0xfb, 0xef,
-        0x7f, 0xe0, 0xfd, 0xfb, 0xfb, 0xff, 0xfb, 0xeb,
-        0xff, 0x8c, 0xeb, 0xf0, 0xd3, 0xff, 0xd7, 0xff,
-        0xf7, 0xbb, 0x7f, 0x8f, 0x7e,
-        0xbf, 0xfb, 0x6c, 0xfb, 0xfb, 0xff, 0xfb, 0xff,
-        0xfb, 0xf3, 0x8b, 0xf3, 0xf4, 0xf7, 0xd7, 0xff,
-        0xf3, 0xff, 0xfe, 0xc2, 0xbf,
-        0xff, 0x87, 0x7f, 0xfa, 0xff, 0xff, 0xff, 0xff,
-        0x8f, 0xff, 0xf0, 0x8f, 0xff, 0xf4, 0xff, 0xdf,
-        0xff, 0xfb, 0x8f, 0x7f, 0xc5,
-        0xff, 0xf8, 0xff, 0xff, 0xff, 0xff, 0xff, 0xfb,
-        0xf3, 0x87, 0xef, 0xfc, 0xfd, 0xfb, 0xff, 0xff,
-        0xdf, 0xff, 0xfb, 0xab, 0x7f,
-        0x3f, 0xf3, 0xfa, 0xf9, 0x8f, 0x7f, 0xf0, 0xeb,
-        0xfb, 0xec, 0x1f, 0xcf, 0x7e, 0xff, 0x8f, 0x5e,
-        0xd1, 0xbf, 0xff, 0xfe, 0xaa,
-        0xff, 0x80, 0x7d, 0xf8, 0xff, 0x7f, 0xff, 0xff,
-        0xf7, 0x8f, 0x5f, 0x8c, 0xff, 0xf1, 0xff, 0xff,
-        0xff, 0xff, 0xfa, 0x9f, 0x6f,
-        0xff, 0x9a, 0xfd, 0xfc, 0xff, 0xff, 0xff, 0xff,
-        0x6f, 0xbf, 0xd7, 0x89, 0x7f, 0xf4, 0xff, 0xfe,
-        0xff, 0xff, 0xdf, 0xbf, 0x6f,
-        0xff, 0xfd, 0xff, 0xff, 0xef, 0xff, 0xfb, 0xff,
-        0x2b, 0x73, 0xf0, 0xf3, 0xff, 0xff, 0xc3, 0xff,
-        0xff, 0xff, 0x8b, 0x62, 0xfd,
-        0xff, 0xef, 0xff, 0xff, 0xfb, 0x0f, 0x8b, 0x8e,
-        0xf0, 0xdc, 0xf7, 0xff, 0xff, 0xff, 0xfb, 0xae,
-        0x43, 0xa9, 0x73, 0xf9, 0xfb,
-        0x7f, 0xf9, 0xff, 0xff, 0xfd, 0xff, 0xf9, 0xff,
-        0xfb, 0xff, 0xff, 0xff, 0xff, 0xfb, 0xf3, 0xfe,
-        0xf3, 0xff, 0xff, 0xff, 0xff,
-        0xbf, 0x87, 0xf8, 0xf8, 0xf9, 0x7f, 0xf9, 0xff,
-        0xff, 0x7f, 0x8f, 0x8f, 0xf0, 0xf0, 0xf3, 0xff,
-        0xf3, 0xfb, 0xff, 0xff, 0x8f,
-        0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xf9, 0xff,
-        0x7f, 0xff, 0xff, 0xff, 0xff, 0xff, 0xf3, 0xff,
-        0xfb, 0xef, 0xff, 0xff, 0xff,
-        0xff, 0x7f, 0xff, 0xf7, 0xf9, 0xff, 0xff, 0xff,
-        0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xfb, 0xfe,
-        0xf3, 0xff, 0xff, 0xff, 0xff,
-        0xff, 0xff, 0xff, 0xff, 0xf5, 0xff, 0xf1, 0xff,
-        0xff, 0x7f, 0xff, 0xff, 0xff, 0xff, 0xf3, 0xfe,
-        0xfb, 0xff, 0xff, 0xff, 0xff,
-        0xff, 0xff, 0x7f, 0xff, 0xf1, 0xff, 0x85, 0xff,
-        0xfe, 0xf1, 0xff, 0xff, 0xff, 0xff, 0xfb, 0xff,
-        0xf3, 0xde, 0xff, 0xf3, 0xff,
-        0xbf, 0xff, 0x0f, 0x9f, 0xfa, 0x9f, 0xeb, 0xf2,
-        0xe7, 0xff, 0x7b, 0xff, 0x4f, 0x73, 0x31, 0x81,
-        0x5f, 0xf1, 0xfe, 0xff, 0xbf,
-        0xff, 0xaf, 0x7f, 0x94, 0xfb, 0xfe, 0x8f, 0xff,
-        0x00, 0xff, 0xf0, 0xef, 0xef, 0x5f, 0xfb, 0xf5,
-        0x8f, 0x7f, 0x81, 0x5e, 0xf1,
-        0xff, 0xf9, 0xff, 0xef, 0x86, 0x0f, 0x71, 0xf6,
-        0xff, 0x7f, 0x7f, 0x97, 0xcf, 0xfd, 0xbf, 0x5f,
-        0xf9, 0xf1, 0xf3, 0xff, 0xff,
-        0x3f, 0xdb, 0xed, 0x1e, 0xff, 0xf6, 0x95, 0x9a,
-        0x6f, 0x3d, 0xff, 0xf8, 0xfb, 0xdf, 0xf7, 0xfd,
-        0xfb, 0xf7, 0xfd, 0xed, 0xde,
-        0x7f, 0xf0, 0xf7, 0x87, 0x7f, 0x9b, 0xff, 0xec,
-        0x9f, 0xbf, 0x7f, 0xcd, 0x7f, 0xf7, 0x3b, 0xad,
-        0x7e, 0xf8, 0xff, 0xbb, 0x79,
-        0xff, 0xff, 0xe3, 0x7c, 0x01, 0x8d, 0xf5, 0xfb,
-        0xe7, 0xf7, 0xff, 0xff, 0x9e, 0x7d, 0x0f, 0x7f,
-        0xf1, 0xcd, 0xfe, 0xf7, 0xff,
-        0x3f, 0xd7, 0xf4, 0x9a, 0xf7, 0xed, 0xff, 0xf3,
-        0xb7, 0xff, 0xef, 0xff, 0xbd, 0xe7, 0x5f, 0xbd,
-        0xff, 0xef, 0xfe, 0x7f, 0xf1,
-        0x3f, 0xff, 0xe7, 0xff, 0xcf, 0xfa, 0xf8, 0xff,
-        0xff, 0xdf, 0xbf, 0xfe, 0xdf, 0xff, 0xd3, 0x1f,
-        0xfd, 0xef, 0x7f, 0xff, 0xcf,
-        0x7f, 0xff, 0x93, 0xdf, 0xf0, 0xef, 0xf3, 0xd4,
-        0x77, 0x6f, 0xff, 0xff, 0xbf, 0x7f, 0x7d, 0xfd,
-        0x7f, 0x7d, 0xff, 0xff, 0xf7,
-        0xff, 0xf7, 0xdf, 0xfb, 0xbc, 0xef, 0xff, 0xfd,
-        0xff, 0xff, 0xfc, 0x7f, 0xb7, 0xff, 0xfd, 0x5f,
-        0xcf, 0xff, 0xef, 0x7f, 0xfd,
-        0xff, 0xee, 0x87, 0xef, 0x92, 0xf0, 0x7e, 0xe5,
-        0xbf, 0x8f, 0x7f, 0x60, 0xd9, 0xdb, 0x71, 0xb3,
-        0x2d, 0x49, 0x6c, 0x29, 0x7f,
-        0xbf, 0xff, 0xe4, 0x6f, 0xf3, 0xfa, 0x57, 0xfd,
-        0xff, 0xfe, 0xb7, 0x7f, 0xfc, 0xff, 0x73, 0xdf,
-        0xf3, 0x7f, 0xfd, 0xff, 0xbf,
-        0xff, 0xef, 0x8b, 0x7f, 0x8f, 0xff, 0xf2, 0xff,
-        0xff, 0xf7, 0xfb, 0xff, 0xff, 0xdf, 0xed, 0xef,
-        0xf1, 0xf7, 0xfd, 0xdf, 0xf7,
-        0xff, 0xff, 0xff, 0xf7, 0xe7, 0xe6, 0xf1, 0xff,
-        0xdf, 0xfb, 0xe9, 0xfe, 0xbf, 0xff, 0xbf, 0x5f,
-        0xff, 0xbf, 0x0e, 0x75, 0xfa,
-        0xff, 0xff, 0xff, 0x6f, 0xfb, 0xf9, 0xff, 0xff,
-        0xf3, 0xff, 0xfb, 0xbf, 0xef, 0xff, 0xf3, 0x7f,
-        0xff, 0xff, 0xff, 0xfb, 0xff,
-        0xff, 0x38, 0xf8, 0xf7, 0xff, 0xff, 0xdf, 0x9f,
-        0xf7, 0x0b, 0x0f, 0xf5, 0xf5, 0xff, 0xff, 0xff,
-        0xbf, 0xf7, 0xf3, 0x8e, 0x0e,
-        0xbf, 0xe8, 0x6f, 0xef, 0x7f, 0xff, 0xdf, 0xdf,
-        0xef, 0x88, 0xf5, 0x91, 0xfb, 0xff, 0xff, 0xbf,
-        0xfe, 0xbf, 0xa6, 0x81, 0x71,
-        0xff, 0xf0, 0xf8, 0xff, 0x67, 0xef, 0xff, 0xb7,
-        0xf7, 0x8f, 0x2f, 0xd1, 0x41, 0xff, 0xcf, 0x5f,
-        0xfe, 0xff, 0x7b, 0x8f, 0x9f,
-        0xff, 0xf8, 0x6f, 0xef, 0xf7, 0xe7, 0xff, 0xff,
-        0xbf, 0x8f, 0xd1, 0xf1, 0xcf, 0xdf, 0xcf, 0xdf,
-        0xff, 0xff, 0x9f, 0x8f, 0xe1,
-        0xff, 0xe7, 0xff, 0xf7, 0xe7, 0x6f, 0xf7, 0xe7,
-        0xe7, 0x77, 0xef, 0xef, 0x6f, 0xff, 0xff, 0xdf,
-        0xff, 0xdf, 0xdf, 0xff, 0xff,
-        0xff, 0xa7, 0x6f, 0xff, 0xf7, 0xef, 0x97, 0xe7,
-        0xf0, 0xef, 0x7f, 0xaf, 0x4f, 0xff, 0xff, 0xdf,
-        0xbf, 0x5f, 0xe0, 0x7f, 0xef,
-        0x7f, 0xa0, 0xef, 0xff, 0xe7, 0xff, 0xf7, 0xf7,
-        0xff, 0x8b, 0xbf, 0xf8, 0xdf, 0xff, 0xcf, 0x7e,
-        0xff, 0xdf, 0x7f, 0x8e, 0x5f,
-        0xff, 0xff, 0x38, 0xff, 0xf7, 0xff, 0xf7, 0xf7,
-        0xf7, 0xf7, 0x8f, 0xf7, 0xf8, 0xf7, 0xcf, 0xff,
-        0xff, 0xff, 0xfe, 0xcb, 0x3f,
-        0x3f, 0x9f, 0x7f, 0xf8, 0xff, 0xef, 0xff, 0xff,
-        0x8f, 0xff, 0xf0, 0xaf, 0xff, 0xf0, 0xff, 0xdf,
-        0xff, 0xff, 0xae, 0x7f, 0xc1,
-        0x7f, 0xf0, 0x7f, 0xff, 0xff, 0xff, 0xef, 0xff,
-        0xf7, 0xbf, 0xbf, 0xd0, 0xff, 0xff, 0xff, 0xff,
-        0x8f, 0xff, 0xff, 0x9b, 0xff,
-        0x7f, 0xcf, 0xf8, 0xff, 0x8f, 0x6f, 0xe0, 0xd7,
-        0xf7, 0xf7, 0xff, 0xfe, 0xf0, 0xfe, 0x8f, 0x5e,
-        0xd1, 0xff, 0xdf, 0xdf, 0xbe,
-        0xff, 0x84, 0x7f, 0xf8, 0xff, 0x7f, 0xdf, 0xff,
-        0xff, 0xaf, 0x7f, 0x81, 0x7f, 0xf5, 0xff, 0xff,
-        0xff, 0xff, 0xfa, 0x9f, 0x3f,
-        0xff, 0xd8, 0xff, 0xf8, 0xff, 0xff, 0xff, 0xff,
-        0x7f, 0x0f, 0xff, 0x85, 0x7f, 0xf0, 0xff, 0xfe,
-        0xbf, 0xff, 0xdf, 0x6f, 0xbf,
-        0xff, 0xff, 0xff, 0xff, 0xaf, 0xff, 0xf7, 0xdf,
-        0xf7, 0x47, 0xf4, 0xff, 0xef, 0xff, 0xdf, 0x7f,
-        0xff, 0xbf, 0xcf, 0x5a, 0xf1,
-        0xff, 0xbf, 0xbf, 0xff, 0xff, 0x3f, 0x8f, 0xc0,
-        0xf3, 0xd1, 0xff, 0xfb, 0xef, 0xff, 0xdf, 0xbe,
-        0x0f, 0x25, 0xe9, 0xd1, 0xff,
-        0xff, 0xff, 0xdf, 0xff, 0xff, 0xff, 0xf7, 0xf7,
-        0x2f, 0xaf, 0xf3, 0xfb, 0xef, 0xff, 0xff, 0xfe,
-        0xff, 0xff, 0xcf, 0xbf, 0xfb,
-        0xbf, 0x87, 0xf8, 0xf8, 0xdf, 0x7f, 0xff, 0xff,
-        0xff, 0xff, 0x8f, 0x8f, 0xe0, 0xf0, 0xff, 0xff,
-        0xff, 0xff, 0xff, 0xff, 0x8f,
-        0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
-        0x7f, 0xff, 0xff, 0xff, 0xff, 0xfb, 0xeb, 0xff,
-        0xff, 0xff, 0xff, 0xff, 0xff,
-        0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
-        0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xef, 0xfe,
-        0xfb, 0xff, 0xff, 0xff, 0xff,
-        0xff, 0xff, 0xdf, 0xf7, 0xff, 0xff, 0xcf, 0xff,
-        0xf7, 0xff, 0xff, 0xff, 0xff, 0xff, 0xeb, 0xfe,
-        0xcf, 0xff, 0x7b, 0xfd, 0xff,
-        0xff, 0xff, 0xff, 0xf7, 0xdf, 0xff, 0xbf, 0xff,
-        0xfb, 0xff, 0xff, 0xfb, 0xff, 0xff, 0xef, 0xff,
-        0xfb, 0xbe, 0xff, 0xff, 0xff,
-        0xff, 0xff, 0x8f, 0xff, 0xf0, 0xd4, 0xbf, 0xf0,
-        0xbf, 0xff, 0xff, 0xff, 0x93, 0x2f, 0xfd, 0xad,
-        0xf7, 0x75, 0xff, 0xff, 0xfe,
-        0xbf, 0x7f, 0xff, 0x9a, 0xff, 0xf4, 0x0f, 0xff,
-        0x00, 0xde, 0xf0, 0xf3, 0xf9, 0xbf, 0x7d, 0xff,
-        0x8f, 0x7f, 0x81, 0x0f, 0xd1,
-        0xff, 0xfb, 0xdf, 0xee, 0x8b, 0x0b, 0x78, 0xf0,
-        0xff, 0xfa, 0x7f, 0xbf, 0xff, 0xd5, 0x8f, 0x8f,
-        0xe1, 0xf7, 0xfb, 0xfb, 0xff,
-        0x7f, 0xb7, 0x99, 0xef, 0xdf, 0xf4, 0xff, 0xff,
-        0xe4, 0xf4, 0x5d, 0xf6, 0xef, 0x9f, 0xef, 0xf7,
-        0x3b, 0x3f, 0xdf, 0xbf, 0xec,
-        0xff, 0xec, 0xf7, 0xb9, 0x6b, 0xbc, 0xfb, 0xf7,
-        0xef, 0xff, 0x7e, 0xfd, 0x7e, 0xbb, 0xdf, 0x85,
-        0xfe, 0xf7, 0xff, 0x7b, 0x7f,
-        0xff, 0xff, 0xa7, 0xee, 0xe7, 0x5f, 0xe0, 0xf0,
-        0xff, 0xff, 0xff, 0x5f, 0xe6, 0x6f, 0x81, 0x8d,
-        0xd5, 0xf7, 0xbf, 0xef, 0xb6,
-        0xff, 0xd7, 0xf4, 0xee, 0xb7, 0x7c, 0xff, 0xd7,
-        0xaf, 0x7f, 0xed, 0x9f, 0xe5, 0xbf, 0xf7, 0x7d,
-        0xfb, 0xb7, 0xad, 0xd7, 0xfd,
-        0xbf, 0xff, 0xff, 0xc7, 0x8b, 0xff, 0xf0, 0xf6,
-        0xff, 0xfd, 0xfb, 0xff, 0xdf, 0xbe, 0x0f, 0x7f,
-        0xd5, 0xf7, 0xff, 0xf2, 0xfe,
-        0xff, 0xff, 0xc5, 0xff, 0xf0, 0x7c, 0xff, 0xad,
-        0x7f, 0x7f, 0xef, 0xff, 0xcf, 0x4f, 0xf1, 0xf5,
-        0x7b, 0xdd, 0xff, 0xdf, 0xff,
-        0xff, 0x77, 0xef, 0xff, 0xd8, 0xbf, 0xf7, 0xf3,
-        0x5f, 0xfb, 0xf9, 0x7f, 0xe7, 0xff, 0xd7, 0x7f,
-        0xad, 0xff, 0xfb, 0xfb, 0xf3,
-        0xff, 0xcc, 0x95, 0x8f, 0xd8, 0xf3, 0xfc, 0xbc,
-        0xdc, 0xdf, 0xbb, 0x44, 0x8b, 0xcb, 0x87, 0xb1,
-        0xb7, 0xa7, 0x97, 0xee, 0xf3,
-        0xff, 0x7f, 0xb4, 0xbf, 0xff, 0xc7, 0x7f, 0xcb,
-        0xfd, 0xbf, 0x7f, 0x7f, 0x74, 0xe7, 0xdf, 0xf5,
-        0xbb, 0xcf, 0xed, 0xfe, 0xfd,
-        0xff, 0x3f, 0xfb, 0x77, 0xcc, 0xbb, 0xf0, 0xfb,
-        0xff, 0xef, 0xbe, 0xff, 0xcf, 0xff, 0x85, 0x3f,
-        0xb5, 0xff, 0xf7, 0x37, 0x7f,
-        0x3f, 0xf7, 0xbf, 0xcf, 0x9f, 0xd7, 0xf7, 0xef,
-        0xff, 0x78, 0xe7, 0xff, 0xff, 0xff, 0x1f, 0x7f,
-        0x65, 0xbf, 0xbf, 0xff, 0xe7,
-        0xff, 0xff, 0xff, 0xff, 0xdb, 0xf7, 0xdf, 0xff,
-        0x77, 0x7f, 0xff, 0xff, 0xbf, 0xbf, 0xde, 0x77,
-        0xdd, 0xff, 0xff, 0xfe, 0xff,
-        0xbf, 0x68, 0xf8, 0xff, 0xf7, 0xff, 0xcf, 0xcf,
-        0xf3, 0x17, 0x3f, 0xd5, 0xdd, 0xf7, 0xff, 0xff,
-        0xcf, 0xdf, 0x73, 0x95, 0x3f,
-        0xff, 0xac, 0x6f, 0xef, 0x77, 0xdf, 0xff, 0xf7,
-        0xbb, 0x85, 0xdd, 0xe1, 0xf7, 0xfb, 0x7b, 0xdf,
-        0xfe, 0xff, 0xb7, 0x9f, 0x79,
-        0xff, 0xd8, 0xac, 0xfb, 0x47, 0xaf, 0xeb, 0xf7,
-        0xff, 0xaf, 0x2e, 0x70, 0xd9, 0xf7, 0xfb, 0xdf,
-        0xea, 0xfb, 0xfb, 0x1b, 0x5f,
-        0xff, 0xf8, 0x6f, 0xaf, 0xd7, 0xb7, 0xeb, 0xff,
-        0xe7, 0xaf, 0x7c, 0x70, 0xfb, 0xdf, 0xff, 0x7b,
-        0xfb, 0xff, 0xda, 0x9f, 0xf9,
-        0xff, 0x95, 0xbb, 0xfd, 0xc7, 0xcf, 0xfb, 0x83,
-        0xef, 0xf3, 0xbf, 0xcf, 0x47, 0xf7, 0xe7, 0x1f,
-        0xd7, 0x8b, 0x6f, 0x33, 0xbe,
-        0xff, 0xc7, 0x6f, 0xfd, 0x97, 0x2f, 0xeb, 0xb7,
-        0xdc, 0x77, 0xd7, 0x1f, 0x67, 0xf7, 0xe7, 0x9e,
-        0xe7, 0xdb, 0x34, 0xdb, 0xfb,
-        0x7f, 0xa8, 0xef, 0xff, 0xe7, 0xef, 0xff, 0xf7,
-        0xff, 0x8b, 0xbf, 0xd8, 0xef, 0xff, 0xe7, 0xdf,
-        0xf7, 0xfb, 0xf7, 0x9f, 0x66,
-        0xff, 0xfb, 0x6c, 0xff, 0xb7, 0x9f, 0xcf, 0xcb,
-        0xbb, 0x93, 0xaf, 0xff, 0xa8, 0xff, 0xc7, 0x3f,
-        0xa7, 0xcf, 0xfe, 0xe3, 0x3f,
-        0x3f, 0xdf, 0x7b, 0xfa, 0xff, 0xff, 0xff, 0xf7,
-        0x8f, 0x3f, 0xd0, 0xd3, 0x7f, 0xfc, 0xff, 0x8e,
-        0xff, 0xf3, 0x8f, 0x4e, 0xe4,
-        0x7f, 0xb8, 0xff, 0xff, 0xff, 0xef, 0x8f, 0xdf,
-        0xf3, 0xbb, 0x3f, 0xe0, 0xf3, 0xff, 0xff, 0xef,
-        0x8f, 0xd7, 0xf3, 0xab, 0xef,
-        0x7f, 0x8f, 0xf8, 0xfb, 0x8f, 0x6f, 0xa0, 0xff,
-        0xff, 0xdc, 0xff, 0x5f, 0xfc, 0xf3, 0x8f, 0x6e,
-        0xb1, 0xf7, 0xf7, 0xf7, 0x3e,
-        0xff, 0x90, 0x7b, 0xf8, 0xff, 0x7f, 0xdf, 0xff,
-        0xfb, 0x9f, 0x7f, 0xa0, 0xf3, 0xf1, 0xff, 0xff,
-        0xdf, 0xff, 0xdb, 0xbf, 0x3f,
-        0xff, 0xdc, 0xfb, 0xf8, 0xff, 0xff, 0xff, 0xff,
-        0x77, 0xaf, 0xff, 0xad, 0xf3, 0xf8, 0xff, 0xfe,
-        0xef, 0xff, 0xff, 0x6f, 0xbf,
-        0xff, 0xff, 0xcf, 0xff, 0xa3, 0xff, 0xaf, 0xcf,
-        0x93, 0xc3, 0x74, 0xef, 0xdf, 0xff, 0xab, 0x2f,
-        0xe7, 0xc7, 0xf3, 0x73, 0x79,
-        0xff, 0xff, 0xcf, 0xff, 0xc3, 0x7f, 0x83, 0xe4,
-        0xd3, 0xbc, 0x7b, 0xdb, 0xdf, 0x7f, 0x8b, 0x8e,
-        0x83, 0x01, 0x51, 0xd5, 0x7b,
-        0xff, 0xfb, 0xdf, 0xff, 0xc3, 0xef, 0xb3, 0xff,
-        0xb7, 0xff, 0xfe, 0xbf, 0xdf, 0xff, 0x8b, 0x6e,
-        0xf3, 0xfb, 0xb7, 0x1f, 0xfe,
-        0xbf, 0x82, 0xc8, 0xf8, 0xd3, 0x7f, 0xf3, 0xfb,
-        0xff, 0xef, 0x87, 0x87, 0xd0, 0x70, 0x8b, 0xff,
-        0xf3, 0xff, 0xef, 0xef, 0x87,
-        0xff, 0xff, 0xff, 0xff, 0x47, 0xff, 0xf3, 0xff,
-        0x7f, 0xff, 0xff, 0xff, 0xdf, 0x7f, 0xcb, 0xef,
-        0xf2, 0xf7, 0xff, 0xff, 0xff,
-        0xff, 0xf7, 0xef, 0xf2, 0xf7, 0xff, 0xf7, 0xff,
-        0xff, 0xff, 0xf7, 0xef, 0xdf, 0xf7, 0xca, 0x7f,
-        0xf3, 0xf7, 0xef, 0xff, 0xf6,
-        0xff, 0xfa, 0xfb, 0xff, 0xe7, 0xff, 0xf7, 0xff,
-        0xff, 0xef, 0xff, 0xf7, 0x57, 0x7f, 0xca, 0xef,
-        0xf3, 0xff, 0xff, 0xef, 0xef,
-        0xff, 0xf6, 0xeb, 0xfa, 0xf7, 0xff, 0xf7, 0x8f,
-        0xff, 0xe3, 0xf7, 0xef, 0xd7, 0xf7, 0xcb, 0x7f,
-        0xf3, 0x8f, 0x6c, 0xf2, 0xe7,
-        0xff, 0xff, 0x2f, 0xff, 0xf1, 0x9d, 0x9e, 0xf4,
-        0xff, 0xff, 0xff, 0xef, 0x0f, 0xff, 0xf1, 0x09,
-        0x3f, 0xf9, 0xbf, 0xf7, 0xfb,
-        0xff, 0xef, 0x7f, 0xf6, 0xfb, 0xf5, 0x0f, 0xdf,
-        0x00, 0xff, 0xd0, 0xbf, 0xc0, 0xbf, 0xf9, 0xff,
-        0x8f, 0x7f, 0x81, 0x6f, 0xe1,
-        0xff, 0xff, 0x9e, 0xaf, 0xf7, 0x0f, 0x18, 0xd9,
-        0xbf, 0x6f, 0x37, 0xef, 0x8f, 0xff, 0x9e, 0x06,
-        0x75, 0xf7, 0xf6, 0xff, 0xef,
-        0x7f, 0xf7, 0xcf, 0xbb, 0xfb, 0x6d, 0xfb, 0xef,
-        0x7d, 0xe9, 0xff, 0xff, 0xbf, 0xc2, 0xf7, 0x6f,
-        0xff, 0xdc, 0xff, 0xf3, 0xfa,
-        0x7f, 0x6f, 0xf7, 0xf9, 0xff, 0x6d, 0xfe, 0x9c,
-        0xbf, 0xbf, 0x7d, 0xe2, 0x7f, 0x77, 0x9f, 0xcd,
-        0xb7, 0xb5, 0xff, 0xff, 0x7f,
-        0x7f, 0xff, 0x87, 0xae, 0x86, 0xdf, 0xc0, 0xfd,
-        0xfb, 0xfa, 0xff, 0xff, 0x8e, 0x6d, 0xd5, 0x3d,
-        0xf1, 0xff, 0xfe, 0xef, 0xff,
-        0xff, 0x3f, 0xd2, 0xa4, 0xfe, 0xd9, 0xf7, 0xfe,
-        0xdf, 0xff, 0xcb, 0xff, 0xdd, 0x7e, 0xbb, 0xdd,
-        0x5f, 0xf7, 0xbf, 0xff, 0xed,
-        0xff, 0xfe, 0xf5, 0xff, 0xb7, 0xf6, 0xb4, 0xae,
-        0xfe, 0xef, 0xf7, 0xff, 0xff, 0x8f, 0x07, 0x7b,
-        0xfb, 0xff, 0x7f, 0xff, 0xf7,
-        0xff, 0x7b, 0xa3, 0xbf, 0xe3, 0xff, 0xff, 0xf7,
-        0xf7, 0xfd, 0xdf, 0xff, 0x8f, 0x7f, 0x9b, 0xdf,
-        0xfb, 0xef, 0xfe, 0xff, 0x3f,
-        0xff, 0x6f, 0xff, 0x7f, 0xb3, 0x7f, 0xdf, 0xbd,
-        0x78, 0xff, 0xff, 0xff, 0xff, 0x7f, 0xef, 0xff,
-        0xdf, 0xee, 0x9d, 0xfd, 0xef,
-        0xff, 0xf8, 0x05, 0x8e, 0xb0, 0x58, 0xf7, 0xfc,
-        0xa4, 0x85, 0xdd, 0xbc, 0x0b, 0x05, 0x61, 0xf8,
-        0xb7, 0xff, 0xeb, 0xef, 0x7f,
-        0xbf, 0xff, 0xc7, 0xbb, 0xd8, 0x6f, 0x79, 0xde,
-        0xff, 0xff, 0xcf, 0xff, 0xba, 0xaf, 0xd9, 0x7b,
-        0xfd, 0xff, 0xf5, 0xdf, 0xbf,
-        0xff, 0xff, 0xaf, 0x7f, 0x88, 0x7f, 0xf0, 0xea,
-        0xfe, 0x7f, 0xf2, 0xff, 0xdf, 0xd7, 0x4f, 0x7f,
-        0xe3, 0xde, 0xff, 0xff, 0xf7,
-        0xff, 0x7d, 0x6f, 0x5f, 0xab, 0xff, 0x7a, 0xb6,
-        0xbf, 0x78, 0xdd, 0x7f, 0xde, 0xef, 0x4b, 0x9b,
-        0xeb, 0x7f, 0x76, 0x9f, 0xac,
-        0xff, 0xcf, 0xff, 0xff, 0xb7, 0x7f, 0xae, 0xef,
-        0xdb, 0xef, 0xff, 0xf7, 0xff, 0xfb, 0xe7, 0xfe,
-        0xbf, 0x7e, 0xfb, 0xf7, 0xfb,
-        0xff, 0xff, 0xff, 0xff, 0xcf, 0xbf, 0xff, 0xff,
-        0xf3, 0xff, 0xff, 0xff, 0xff, 0xef, 0xd7, 0xff,
-        0xe9, 0xef, 0xf2, 0xfe, 0xff,
-        0xff, 0xff, 0xff, 0xef, 0xff, 0x8d, 0xaf, 0xf2,
-        0x71, 0xff, 0xfe, 0xff, 0xff, 0x7f, 0xff, 0xcf,
-        0x0f, 0x75, 0xf1, 0xff, 0xff,
-        0x3f, 0x78, 0xbc, 0xfb, 0xfe, 0xff, 0xff, 0xbf,
-        0xf3, 0x0f, 0x3f, 0xc9, 0xe9, 0x7f, 0xf7, 0xdf,
-        0xff, 0xff, 0x57, 0x82, 0x2e,
-        0xff, 0xf8, 0x7f, 0xfb, 0x7a, 0xfb, 0xff, 0xff,
-        0xeb, 0x87, 0x9b, 0xf1, 0xe5, 0x7f, 0x75, 0x7f,
-        0xfe, 0xff, 0xbe, 0x39, 0x79,
-        0xff, 0xcd, 0xbf, 0xfd, 0x7e, 0xff, 0xfb, 0xf4,
-        0xf7, 0xed, 0x6f, 0xf3, 0x6b, 0xf7, 0xd7, 0xbf,
-        0xfe, 0xfd, 0xf7, 0x8f, 0xef,
-        0xff, 0xf8, 0x7a, 0xff, 0xfa, 0xf0, 0xff, 0xff,
-        0xe6, 0x8f, 0x9b, 0xf1, 0xad, 0xbf, 0xf7, 0xfd,
-        0xbf, 0xfd, 0xef, 0x8f, 0x3f,
-        0xbf, 0xff, 0xad, 0xfb, 0xf4, 0xbf, 0xf3, 0x90,
-        0xdd, 0xf0, 0xfa, 0xcf, 0xe7, 0xf2, 0xf7, 0x7f,
-        0xff, 0xad, 0xff, 0xf5, 0xdf,
-        0xff, 0xcb, 0x7b, 0xfa, 0xd2, 0x7f, 0xc7, 0xf3,
-        0xa9, 0xf7, 0xe7, 0x8b, 0xe7, 0xf1, 0xf7, 0x3f,
-        0x8f, 0x7f, 0xb0, 0xdf, 0xfd,
-        0x7f, 0xf8, 0xff, 0xfb, 0xf2, 0xff, 0xd2, 0xe3,
-        0xdf, 0x87, 0xd3, 0xf0, 0xed, 0xff, 0xf7, 0x7f,
-        0xff, 0xef, 0x77, 0xaa, 0x7f,
-        0xbf, 0xea, 0xfc, 0xfb, 0xb3, 0xbf, 0xb3, 0xff,
-        0xd8, 0x93, 0xab, 0xf1, 0xac, 0xff, 0xf7, 0x3f,
-        0xaf, 0xef, 0xed, 0xc7, 0xad,
-        0xff, 0xd6, 0xff, 0xfd, 0xff, 0xdf, 0xff, 0xf4,
-        0x8f, 0xbf, 0xb1, 0xed, 0xf5, 0xfb, 0xff, 0xef,
-        0xff, 0xf5, 0x8f, 0xdf, 0xf1,
-        0xff, 0xf8, 0xfe, 0xfb, 0xff, 0xdf, 0x9f, 0xf8,
-        0xf0, 0xef, 0xff, 0xd0, 0xfd, 0xf7, 0xff, 0xef,
-        0xaf, 0xf5, 0xf7, 0xce, 0x7f,
-        0x7f, 0x83, 0x7d, 0xfa, 0x8f, 0x5f, 0xd0, 0xcb,
-        0xe9, 0xbb, 0x76, 0x9f, 0x7b, 0xf7, 0x8f, 0x6e,
-        0xb1, 0xd5, 0xf7, 0x5f, 0xc6,
-        0xff, 0xa3, 0x7f, 0xfc, 0xff, 0x7f, 0xff, 0xff,
-        0xdf, 0x9f, 0x7f, 0xa8, 0x77, 0xf5, 0xff, 0xfe,
-        0xff, 0xff, 0xfe, 0x7f, 0x2d,
-        0xff, 0x96, 0xff, 0xfc, 0xff, 0xff, 0xff, 0xff,
-        0x37, 0x6f, 0xfd, 0xaf, 0x77, 0xf8, 0xff, 0xff,
-        0xef, 0xff, 0xff, 0xff, 0x4b,
-        0xff, 0x72, 0xaf, 0xff, 0xe5, 0xdf, 0x99, 0xfc,
-        0x10, 0x63, 0xf0, 0xef, 0xef, 0x7f, 0x8b, 0xef,
-        0xaf, 0xe7, 0xf5, 0xf7, 0x7d,
-        0xff, 0xef, 0x8f, 0xff, 0xa1, 0x4f, 0x81, 0xe7,
-        0xb0, 0xfa, 0xfe, 0xd7, 0xcf, 0xff, 0xca, 0xcf,
-        0x0b, 0x85, 0x71, 0xfa, 0xff,
-        0xff, 0xdd, 0xef, 0xff, 0xa4, 0xdf, 0xb1, 0xdc,
-        0xd3, 0xff, 0xf8, 0xff, 0xcf, 0x7f, 0xcb, 0x7f,
-        0xff, 0xf5, 0xff, 0xbf, 0xfd,
-        0xbf, 0x82, 0xc8, 0xf8, 0xe1, 0x7f, 0xf0, 0xdf,
-        0xff, 0xef, 0x87, 0x87, 0xc0, 0xf0, 0xca, 0x2f,
-        0xfb, 0xff, 0xef, 0xee, 0x97,
-        0xff, 0xff, 0x8f, 0xfa, 0xa5, 0xdf, 0xd1, 0xf7,
-        0x7f, 0xff, 0xff, 0xff, 0xff, 0x77, 0xdb, 0xef,
-        0xff, 0xf5, 0xfd, 0xff, 0xff,
-        0xff, 0xf6, 0x8b, 0xf2, 0x94, 0xff, 0xf1, 0xf7,
-        0xff, 0xff, 0xf7, 0xef, 0xd7, 0xf7, 0xdf, 0xee,
-        0xfb, 0xff, 0xef, 0xff, 0xf7,
-        0xff, 0xf3, 0xcb, 0xff, 0xe6, 0xff, 0xf1, 0xef,
-        0xff, 0xef, 0xff, 0xe7, 0xd7, 0x7f, 0xdb, 0x7e,
-        0xfd, 0xf7, 0xff, 0xef, 0xef,
-        0xff, 0xfe, 0xcf, 0xff, 0xc4, 0xff, 0xf2, 0x9f,
-        0xff, 0xe0, 0xf7, 0xff, 0xdf, 0xff, 0xdf, 0x7f,
-        0xdb, 0xac, 0xef, 0xf1, 0xf7,
-        0x7f, 0xef, 0x0f, 0x5f, 0xb4, 0x8f, 0xff, 0xf6,
-        0xfd, 0xff, 0x6f, 0xff, 0x8f, 0xff, 0xe9, 0x8d,
-        0x7f, 0xf1, 0xd1, 0xf7, 0xfe,
-        0xff, 0xe7, 0x7f, 0x87, 0xfd, 0xe7, 0x8f, 0x9b,
-        0x00, 0xff, 0xb0, 0x7d, 0xfd, 0xcf, 0xfb, 0xfd,
-        0x8f, 0x7f, 0x81, 0x6d, 0xd1,
-        0xff, 0xbc, 0xed, 0xff, 0x86, 0x6e, 0x10, 0xf1,
-        0xf4, 0x5f, 0x7f, 0xfe, 0x9f, 0x37, 0xc3, 0x8f,
-        0xf7, 0xe5, 0xfb, 0xff, 0xff,
-        0x7f, 0xfe, 0xff, 0xfd, 0x97, 0xff, 0xfb, 0xff,
-        0x3f, 0xff, 0xf9, 0xc3, 0x1f, 0xf8, 0xff, 0xb5,
-        0x5f, 0xef, 0xdc, 0xff, 0xbe,
-        0xff, 0xcb, 0xe7, 0xfd, 0x69, 0xe7, 0xfc, 0xb6,
-        0xef, 0x9a, 0x77, 0xb6, 0x67, 0xdf, 0xef, 0xf7,
-        0xfe, 0xdf, 0xff, 0xf5, 0x7f,
-        0xff, 0xf7, 0x97, 0xbe, 0xf4, 0xff, 0xf1, 0xba,
-        0xfe, 0xff, 0x97, 0x7f, 0xbf, 0x77, 0x55, 0xdf,
-        0xd9, 0xf1, 0xff, 0xdf, 0xff,
-        0xbf, 0xbf, 0x72, 0xf2, 0xdd, 0xff, 0xe4, 0xff,
-        0x7f, 0xef, 0xff, 0xf7, 0xfe, 0xfb, 0xb9, 0xff,
-        0xff, 0xf5, 0xff, 0xfb, 0x96,
-        0xff, 0x7f, 0xf7, 0xef, 0x83, 0xf7, 0xf7, 0xff,
-        0xdf, 0xff, 0xf7, 0xfd, 0xd5, 0x9f, 0x0f, 0x7f,
-        0xf0, 0xfb, 0xae, 0xff, 0xec,
-        0xff, 0x7b, 0x85, 0xf7, 0xf3, 0xef, 0xff, 0xf7,
-        0xff, 0xed, 0xff, 0xe7, 0x8f, 0x7f, 0xc7, 0x97,
-        0x3f, 0xfc, 0xff, 0xf7, 0xde,
-        0xff, 0xfd, 0x8b, 0xff, 0xf7, 0x1f, 0xfb, 0xff,
-        0x2f, 0xfb, 0xf7, 0xff, 0xbf, 0xff, 0xff, 0x6f,
-        0xf7, 0xf9, 0xe7, 0xff, 0x33,
-        0xff, 0x9e, 0xe7, 0x8b, 0xf0, 0x50, 0xf1, 0xde,
-        0xff, 0x9f, 0x1b, 0x28, 0x1b, 0x8d, 0xb4, 0xe1,
-        0xf5, 0xf3, 0xfe, 0xef, 0xfa,
-        0xff, 0x7f, 0xf6, 0xff, 0xfe, 0x07, 0xec, 0xfb,
-        0x7f, 0xff, 0xfd, 0xff, 0xd6, 0x8f, 0xff, 0xf9,
-        0xff, 0x37, 0x7f, 0xfb, 0xdd,
-        0xff, 0xff, 0xff, 0x63, 0xef, 0xdf, 0xfa, 0xf1,
-        0xff, 0xfc, 0xfe, 0xdf, 0xfb, 0xff, 0x8f, 0x7f,
-        0xf9, 0xeb, 0xef, 0xfd, 0xff,
-        0x7f, 0x7f, 0xfb, 0xe7, 0x9f, 0x9b, 0xe5, 0xcf,
-        0xfd, 0xf7, 0xcf, 0xff, 0xf3, 0xbf, 0x5f, 0x5d,
-        0x67, 0x9f, 0xdf, 0x7f, 0xf9,
-        0xff, 0xff, 0xff, 0x1f, 0xfe, 0xff, 0xf5, 0xdf,
-        0x5f, 0xfb, 0xfb, 0xbf, 0xcf, 0xdf, 0xfb, 0x7f,
-        0xb7, 0xff, 0xfb, 0xff, 0xf7,
-        0x3f, 0x78, 0xfc, 0xf3, 0xff, 0xff, 0xdf, 0xbf,
-        0xf3, 0x05, 0x3f, 0xc1, 0xf1, 0xff, 0xf7, 0xef,
-        0xef, 0xff, 0xfb, 0x97, 0x1f,
-        0xff, 0xd8, 0x7f, 0xfb, 0x7b, 0xfb, 0xf7, 0xbf,
-        0xbb, 0x8e, 0xd3, 0xe1, 0xff, 0xfd, 0xf7, 0xed,
-        0xfe, 0x8b, 0x5e, 0x0f, 0x69,
-        0xbf, 0xf8, 0xfc, 0xfb, 0x7b, 0xff, 0xdf, 0xed,
-        0xf7, 0x8f, 0xbf, 0xce, 0xfe, 0xff, 0xf3, 0xff,
-        0xf6, 0xff, 0xfe, 0x8f, 0x0f,
-        0xff, 0xfc, 0x7d, 0xff, 0xff, 0xfd, 0xf3, 0xff,
-        0xbf, 0x8f, 0xe3, 0xf0, 0xfe, 0xff, 0xfb, 0xff,
-        0xff, 0xff, 0xae, 0x0f, 0x5d,
-        0xff, 0xff, 0xff, 0xf3, 0xff, 0xff, 0xff, 0xd1,
-        0xfd, 0xf1, 0xd3, 0xdd, 0xfd, 0xf1, 0xfb, 0xff,
-        0xfb, 0xfd, 0xff, 0xfd, 0xf6,
-        0xff, 0xff, 0x7f, 0xfe, 0xfd, 0xff, 0x87, 0xff,
-        0xcc, 0xf3, 0xdf, 0xcb, 0xff, 0xfb, 0xfb, 0xff,
-        0x8b, 0x7f, 0xfa, 0xff, 0xff,
-        0x7f, 0xf8, 0xfe, 0xff, 0xef, 0xff, 0xff, 0xff,
-        0xff, 0x8f, 0xff, 0xe8, 0xff, 0xff, 0xf9, 0xff,
-        0xfb, 0xaf, 0x7f, 0x8f, 0x7e,
-        0xbf, 0xfb, 0x78, 0xff, 0xff, 0xff, 0xd7, 0xd3,
-        0xfd, 0xc3, 0x95, 0xc5, 0xf8, 0xff, 0xfb, 0xff,
-        0xfb, 0xff, 0xfc, 0xf2, 0x8f,
-        0xff, 0x8b, 0x7b, 0xff, 0xff, 0xdf, 0xff, 0xfd,
-        0x8f, 0xef, 0xf4, 0xb7, 0xff, 0xfe, 0xff, 0xfe,
-        0xff, 0xff, 0x8f, 0x6f, 0xf4,
-        0xff, 0xfd, 0xff, 0xfe, 0xff, 0xdf, 0xdf, 0xfd,
-        0xf1, 0xb3, 0xff, 0xd8, 0xff, 0xfd, 0xff, 0xff,
-        0xff, 0xfd, 0xf5, 0x87, 0x7f,
-        0x3f, 0xef, 0xff, 0xff, 0x8f, 0x5f, 0xf0, 0xff,
-        0xf1, 0xef, 0x39, 0xc7, 0x7e, 0xf3, 0x8f, 0x7e,
-        0xf1, 0xbd, 0xed, 0xfa, 0x9a,
-        0xff, 0x98, 0x7f, 0xfa, 0xff, 0x7f, 0xff, 0xff,
-        0xf3, 0x8f, 0x5f, 0x8a, 0xfb, 0xf1, 0xff, 0xff,
-        0xff, 0xff, 0xf7, 0xaf, 0x5f,
-        0xff, 0x86, 0xff, 0xfc, 0xff, 0xff, 0xdf, 0xff,
-        0x7f, 0xbf, 0xcb, 0xbd, 0x77, 0xf2, 0xff, 0xfe,
-        0xff, 0xff, 0xff, 0xbf, 0x77,
-        0xff, 0xff, 0xef, 0xff, 0xed, 0xdf, 0xff, 0xdd,
-        0x11, 0x73, 0xfc, 0xfc, 0xef, 0xff, 0xfb, 0xff,
-        0xfd, 0xfd, 0x9d, 0xf3, 0xff,
-        0xff, 0xf9, 0xef, 0xff, 0xf3, 0x0f, 0x83, 0x9e,
-        0xf0, 0xf0, 0xff, 0xed, 0xef, 0xff, 0xe9, 0x8e,
-        0x7b, 0x9d, 0x70, 0xe9, 0xf7,
-        0xff, 0xff, 0xef, 0xff, 0xef, 0xff, 0xf3, 0xf9,
-        0xf7, 0xff, 0xfb, 0xf3, 0xef, 0xfd, 0xeb, 0xfe,
-        0xff, 0xff, 0xff, 0xff, 0xf8,
-        0x3f, 0x87, 0xec, 0xf8, 0xe5, 0x7f, 0xfb, 0xff,
-        0xff, 0xff, 0x8f, 0x87, 0xe8, 0xf0, 0xeb, 0xff,
-        0xff, 0xfd, 0xff, 0xff, 0x97,
-        0xff, 0xff, 0xef, 0xff, 0xed, 0xdf, 0xd3, 0xbf,
-        0x7f, 0xfe, 0xff, 0xff, 0xef, 0xff, 0xe3, 0xef,
-        0xff, 0xff, 0xff, 0xfe, 0xff,
-        0xff, 0x77, 0xef, 0xfa, 0xe7, 0xff, 0xfb, 0xff,
-        0xff, 0xff, 0xef, 0xef, 0xef, 0xf7, 0xea, 0xfe,
-        0xf3, 0xff, 0xff, 0xff, 0xfe,
-        0xff, 0xf7, 0xeb, 0xf3, 0xef, 0xff, 0xf3, 0xff,
-        0xf1, 0x7f, 0xff, 0xe7, 0xe7, 0xf7, 0xea, 0xee,
-        0xf7, 0xff, 0xf1, 0xff, 0xe7,
-        0xff, 0xfb, 0x6f, 0xf6, 0xe5, 0xff, 0xeb, 0xdf,
-        0xef, 0xff, 0xff, 0xf7, 0xef, 0xff, 0xe3, 0xef,
-        0xff, 0xfe, 0xff, 0xfe, 0xf7,
-        0x7f, 0xff, 0x4f, 0x5f, 0xe1, 0xc7, 0xef, 0xf1,
-        0xfe, 0x7f, 0x7b, 0xff, 0x6f, 0xff, 0x93, 0x0b,
-        0x7f, 0xf1, 0xfa, 0xdf, 0xff,
-        0xff, 0xfb, 0x7f, 0xdf, 0xf7, 0xef, 0x8f, 0xff,
-        0x00, 0xef, 0xf0, 0xdf, 0x7f, 0xef, 0xff, 0xfb,
-        0x8f, 0x7f, 0x81, 0x6f, 0xd1,
-        0xff, 0xde, 0xff, 0xef, 0xb9, 0x49, 0x74, 0xf3,
-        0xef, 0x7b, 0x7f, 0xff, 0xeb, 0xf7, 0x85, 0x67,
-        0xf1, 0xf0, 0xe1, 0xff, 0xf7,
-        0x3f, 0xab, 0xff, 0xc4, 0xbb, 0xff, 0x8c, 0x9d,
-        0x7e, 0x3a, 0xb5, 0xbb, 0xe3, 0xfb, 0xf3, 0xcd,
-        0xe3, 0xff, 0xff, 0xff, 0xfe,
-        0xff, 0xdc, 0xf7, 0xf8, 0x77, 0x8f, 0xf7, 0xfe,
-        0x9f, 0x97, 0x7a, 0xf2, 0x7f, 0xfb, 0x8f, 0x1f,
-        0x7d, 0xfd, 0xef, 0xb1, 0x7d,
-        0xff, 0xef, 0xa6, 0xef, 0x98, 0x9d, 0xf0, 0xf4,
-        0xf4, 0xff, 0xff, 0x7f, 0x8f, 0x7f, 0x89, 0x7f,
-        0xe7, 0xff, 0xff, 0xf7, 0xfb,
-        0xbf, 0xa7, 0xb7, 0xdf, 0xba, 0xfd, 0xfe, 0xeb,
-        0xff, 0xff, 0xc4, 0xef, 0x8f, 0x7c, 0xf7, 0x8f,
-        0x7f, 0xf9, 0xfb, 0xff, 0xfb,
-        0xff, 0xff, 0xff, 0xeb, 0x87, 0xfd, 0xf4, 0xf7,
-        0x6f, 0xff, 0xbf, 0xff, 0xff, 0xef, 0xef, 0xdf,
-        0xff, 0xff, 0xff, 0xf7, 0xff,
-        0xff, 0xf7, 0x85, 0xdb, 0xf2, 0xbf, 0xd7, 0xff,
-        0xff, 0xfd, 0xff, 0xff, 0x8f, 0x7f, 0xf1, 0xaf,
-        0x7d, 0xff, 0xf7, 0xeb, 0xff,
-        0xbf, 0xfd, 0x8f, 0xff, 0xfa, 0x3f, 0xff, 0xf6,
-        0xb7, 0xff, 0xfe, 0xfb, 0x8f, 0x7f, 0xff, 0xff,
-        0xf3, 0xee, 0xbf, 0x7f, 0xff,
-        0xff, 0x67, 0xc6, 0xaf, 0xc3, 0x74, 0xf7, 0xfe,
-        0xee, 0x8a, 0x37, 0x6e, 0xec, 0x87, 0x71, 0x91,
-        0x13, 0x7d, 0xec, 0x87, 0xff,
-        0xbf, 0x7b, 0xf0, 0xef, 0xfb, 0x3f, 0xb7, 0xfc,
-        0xff, 0xff, 0x97, 0x7d, 0xe8, 0xef, 0x9d, 0x77,
-        0xfd, 0xfb, 0xff, 0xfb, 0xbf,
-        0xff, 0xff, 0xde, 0x77, 0xcd, 0xff, 0xf1, 0xfb,
-        0xff, 0xff, 0xf9, 0xe3, 0xff, 0xff, 0xef, 0xff,
-        0xff, 0xfc, 0xcf, 0xff, 0xf3,
-        0x7f, 0xff, 0xfe, 0x77, 0xaf, 0xf7, 0xf8, 0xef,
-        0xff, 0x76, 0xfa, 0xff, 0x99, 0x6d, 0x9f, 0x6f,
-        0xf1, 0xbf, 0x7f, 0x7f, 0xfc,
-        0xff, 0xff, 0xef, 0xbf, 0xeb, 0xfa, 0xdd, 0xef,
-        0xbc, 0xfd, 0xfd, 0xdf, 0xff, 0xf7, 0xff, 0xff,
-        0xd1, 0xfe, 0xff, 0xfb, 0xff,
-        0x3f, 0x70, 0xf8, 0xff, 0xf5, 0xff, 0xff, 0x9f,
-        0xf3, 0x09, 0x1f, 0xe1, 0xf3, 0xfd, 0xfd, 0xff,
-        0xef, 0xff, 0xf7, 0x8e, 0x1e,
-        0xff, 0xf8, 0x7f, 0xff, 0x77, 0xff, 0xff, 0x9b,
-        0x8f, 0x8e, 0xfb, 0xf1, 0xef, 0xe5, 0xfd, 0xef,
-        0xfe, 0x9f, 0x16, 0x03, 0x61,
-        0xbf, 0xf8, 0xfa, 0xfd, 0x73, 0xff, 0xff, 0xf7,
-        0xf7, 0x8d, 0x9f, 0xe1, 0xf1, 0xff, 0xef, 0xff,
-        0xfc, 0xff, 0xff, 0x8f, 0x0f,
-        0xff, 0xf8, 0x7f, 0xff, 0xf7, 0xf7, 0xfd, 0xff,
-        0x9f, 0x8f, 0xe1, 0xf1, 0xef, 0xff, 0xff, 0xff,
-        0xfd, 0xff, 0x8e, 0x0f, 0x7d,
-        0xff, 0xf7, 0xf9, 0xfe, 0xf3, 0x7f, 0xff, 0xf7,
-        0xf7, 0xf3, 0xfd, 0xef, 0xff, 0xf9, 0xed, 0xff,
-        0xff, 0xef, 0xff, 0xf7, 0xff,
-        0xff, 0xf7, 0x7e, 0xfe, 0xf7, 0xff, 0x8b, 0xf7,
-        0xfc, 0xeb, 0xeb, 0xed, 0xeb, 0xf9, 0xfd, 0xff,
-        0x8f, 0x7f, 0xf2, 0xfe, 0xed,
-        0x7f, 0xf8, 0xff, 0xff, 0xf7, 0xff, 0xff, 0xf7,
-        0xf7, 0x8d, 0xff, 0xe8, 0xff, 0xfd, 0xef, 0xfe,
-        0xfd, 0xdf, 0xf6, 0x8f, 0x6f,
-        0xbf, 0xff, 0x78, 0xff, 0xf7, 0xff, 0xfb, 0xff,
-        0xff, 0xe3, 0x9f, 0xe5, 0xea, 0xf5, 0xfd, 0xff,
-        0xed, 0xef, 0xff, 0xf7, 0x8f,
-        0xff, 0x07, 0xff, 0xf9, 0xff, 0xff, 0xff, 0xf7,
-        0x8f, 0xff, 0xf3, 0x93, 0xff, 0xff, 0xff, 0xef,
-        0xff, 0xf7, 0x8f, 0x7f, 0xf3,
-        0xff, 0xf8, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
-        0xf7, 0x8b, 0xff, 0xe8, 0xfb, 0xff, 0xff, 0xef,
-        0xef, 0xf7, 0xf5, 0x8e, 0x7f,
-        0x3f, 0xec, 0xf9, 0xfc, 0x8f, 0x7f, 0xf0, 0xef,
-        0xef, 0xff, 0x1d, 0xed, 0x7e, 0xfd, 0x8f, 0x6e,
-        0xf1, 0xd7, 0xf7, 0xde, 0x8c,
-        0xff, 0x80, 0x7f, 0xf8, 0xff, 0x7f, 0xff, 0xff,
-        0xfb, 0x8f, 0x6f, 0x90, 0xff, 0xf3, 0xff, 0xff,
-        0xff, 0xff, 0xfe, 0x8f, 0x7f,
-        0xff, 0x87, 0xfb, 0xf8, 0xff, 0xff, 0xff, 0xff,
-        0x7f, 0x9f, 0xff, 0x93, 0x7f, 0xf2, 0xff, 0xfe,
-        0xef, 0xff, 0xff, 0x9f, 0x69,
-        0xff, 0xfb, 0xef, 0xff, 0xf6, 0xff, 0xff, 0xff,
-        0x1f, 0x73, 0xfe, 0xf6, 0xff, 0xff, 0xff, 0xef,
-        0xef, 0xe7, 0x97, 0x77, 0xf7,
-        0xff, 0xff, 0xff, 0xff, 0xe7, 0x1f, 0x86, 0x95,
-        0xf0, 0xf6, 0xf7, 0xff, 0xff, 0xff, 0xfe, 0x8f,
-        0x6d, 0x93, 0x71, 0xf8, 0xfd,
-        0xff, 0xfe, 0xef, 0xfd, 0xf2, 0xff, 0xf6, 0xff,
-        0x6f, 0xef, 0xf7, 0xfd, 0xff, 0xff, 0xfd, 0xff,
-        0xfd, 0xff, 0xef, 0xff, 0xf5,
-        0x3f, 0x82, 0xf8, 0xf8, 0xe6, 0x7f, 0xf2, 0xff,
-        0xff, 0xff, 0x87, 0x87, 0xf0, 0xf0, 0xfc, 0xef,
-        0xfd, 0xf7, 0xef, 0xee, 0x87,
-        0xff, 0xff, 0xef, 0xff, 0xe7, 0xff, 0xf6, 0xf7,
-        0x7f, 0xfd, 0xff, 0xff, 0xff, 0xff, 0xff, 0xef,
-        0xff, 0xf7, 0xff, 0xff, 0xff,
-        0xff, 0xf7, 0xff, 0xf2, 0xe6, 0xff, 0xf5, 0xf7,
-        0xff, 0xff, 0xff, 0xe7, 0xff, 0xf7, 0xff, 0xfe,
-        0xff, 0xf7, 0xef, 0xff, 0xf7,
-        0xff, 0xfa, 0xeb, 0xff, 0xe3, 0xff, 0xf5, 0xff,
-        0xff, 0xff, 0xf7, 0xef, 0xf7, 0xff, 0xfd, 0xee,
-        0xfd, 0xff, 0xff, 0xef, 0xef,
-        0xff, 0xf6, 0xfb, 0x7a, 0xe7, 0xff, 0x91, 0xef,
-        0xff, 0xe2, 0xff, 0xf7, 0xf7, 0xf7, 0xfd, 0xff,
-        0xfd, 0xef, 0xeb, 0xf5, 0xe7,
-        0xff, 0xff, 0x8f, 0xbe, 0xf1, 0x93, 0xfd, 0xf1,
-        0xff, 0xff, 0xff, 0xff, 0x2e, 0x2f, 0x59, 0x8f,
-        0x6f, 0xf9, 0xf7, 0xff, 0xfa,
-        0xff, 0x4f, 0xbf, 0xc4, 0xfb, 0xf5, 0x0f, 0xff,
-        0x00, 0xff, 0xd0, 0x7f, 0x70, 0xaf, 0x7f, 0xff,
-        0x8f, 0x7f, 0x81, 0x7f, 0xb1,
-        0xff, 0xff, 0xda, 0xff, 0x2f, 0x4f, 0x7e, 0xf9,
-        0xfb, 0xff, 0x5f, 0xef, 0xff, 0xff, 0x99, 0x29,
-        0x71, 0xf1, 0xed, 0xff, 0xff,
-        0x3f, 0xb7, 0xef, 0xdf, 0xff, 0xf9, 0xfe, 0xfd,
-        0xff, 0xff, 0xb7, 0x9f, 0xff, 0xab, 0x73, 0xfd,
-        0xad, 0x3c, 0x6b, 0xff, 0xfa,
-        0xff, 0xe8, 0xf7, 0xbf, 0x6f, 0x8f, 0xff, 0xfe,
-        0xff, 0x87, 0x7f, 0xe0, 0x7f, 0xbf, 0x5f, 0x93,
-        0x7e, 0xe4, 0xf6, 0x97, 0x7b,
-        0xff, 0xdf, 0x27, 0xaf, 0xa7, 0xff, 0xf4, 0xf6,
-        0xff, 0xff, 0xff, 0x5f, 0xdf, 0xfb, 0x87, 0x1f,
-        0x70, 0xf3, 0xfe, 0x7f, 0xfb,
-        0xbf, 0xb7, 0x61, 0xb5, 0xfc, 0xff, 0xf7, 0xff,
-        0xbf, 0xff, 0xa2, 0xff, 0xd8, 0xa1, 0x77, 0xdf,
-        0xe6, 0xff, 0xff, 0x7e, 0xc4,
-        0xff, 0xff, 0xf6, 0xd7, 0x97, 0xdb, 0xe8, 0xff,
-        0xff, 0xff, 0xfd, 0xff, 0xff, 0xff, 0xb9, 0x3b,
-        0xf8, 0xff, 0xef, 0xe7, 0xbe,
-        0xff, 0xff, 0x86, 0xbf, 0xe2, 0xad, 0xff, 0xff,
-        0xff, 0xff, 0x9f, 0xff, 0x8f, 0x3f, 0x63, 0xcf,
-        0x7b, 0xfe, 0xff, 0xfd, 0xfe,
-        0xff, 0xff, 0xdf, 0xff, 0xba, 0x7f, 0xf7, 0xee,
-        0x17, 0xf7, 0xee, 0xef, 0x97, 0x7f, 0xf7, 0xff,
-        0xff, 0xfd, 0x9e, 0x77, 0xf3,
-        0xff, 0xfb, 0xc3, 0x8f, 0xc1, 0x70, 0x71, 0xff,
-        0xf7, 0x9f, 0x77, 0x7e, 0xb6, 0x4f, 0xb9, 0x01,
-        0x1f, 0x1b, 0x7a, 0x9a, 0x7e,
-        0xbf, 0xff, 0xf0, 0x9f, 0xef, 0x79, 0x3f, 0xf6,
-        0xff, 0xfd, 0x9d, 0x7b, 0xf2, 0xff, 0xc9, 0xf3,
-        0xff, 0x7d, 0xfb, 0xfd, 0xbf,
-        0xff, 0xfd, 0xbf, 0x77, 0x8f, 0xff, 0xf1, 0xf7,
-        0xff, 0xff, 0xff, 0xfd, 0xbb, 0x7f, 0xbf, 0x6f,
-        0xf3, 0xfe, 0xff, 0xe7, 0xbf,
-        0x7f, 0xff, 0xff, 0x5f, 0xaf, 0xf1, 0xfc, 0xf7,
-        0xff, 0x77, 0xfe, 0xff, 0xdf, 0xff, 0xdf, 0xff,
-        0xe3, 0x9e, 0x7f, 0x7a, 0xe3,
-        0xff, 0xff, 0x6f, 0xff, 0xaf, 0xfc, 0xff, 0xff,
-        0xfe, 0xfe, 0xfe, 0xff, 0xff, 0xff, 0xf3, 0xfb,
-        0xf7, 0xff, 0xf9, 0xfe, 0xff,
-        0x3f, 0x70, 0xf8, 0xff, 0xf7, 0xff, 0xff, 0xff,
-        0xff, 0x0f, 0x0f, 0xf1, 0xf1, 0xff, 0xf7, 0xff,
-        0xef, 0xff, 0xf7, 0x8c, 0x1e,
-        0xff, 0xf8, 0x7f, 0xff, 0x7f, 0xf7, 0xff, 0x8f,
-        0x8f, 0x88, 0xf1, 0xf1, 0xef, 0xff, 0xf7, 0xff,
-        0xee, 0x97, 0x1e, 0x01, 0x61,
-        0xbf, 0xf0, 0xfa, 0xfd, 0x75, 0xff, 0xf5, 0xff,
-        0xff, 0x8f, 0x9f, 0xe1, 0xf1, 0xff, 0xf7, 0xef,
-        0xfe, 0xff, 0xff, 0x8f, 0x1f,
-        0xff, 0xfa, 0x7f, 0xff, 0xfd, 0xff, 0xfd, 0xff,
-        0x9f, 0x9f, 0xf9, 0xf9, 0xff, 0xef, 0xf7, 0xff,
-        0xff, 0xff, 0x9e, 0x0f, 0x75,
-        0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xf7,
-        0xff, 0xf7, 0xf7, 0xff, 0xef, 0xf7, 0xe7, 0xef,
-        0xef, 0xef, 0xff, 0xff, 0xef,
-        0xff, 0xff, 0x7f, 0xff, 0xff, 0xff, 0x8f, 0xff,
-        0xf8, 0xf7, 0xff, 0xf7, 0xff, 0xf7, 0xe7, 0xef,
-        0x9f, 0x6f, 0xf0, 0xff, 0xff,
-        0x7f, 0xf8, 0xff, 0xff, 0xfd, 0xff, 0xfd, 0x8f,
-        0xff, 0x8f, 0xff, 0xf0, 0xff, 0xff, 0xf7, 0xef,
-        0xf7, 0xff, 0xff, 0x9d, 0x7e,
-        0xbf, 0xff, 0x78, 0xff, 0xfd, 0xff, 0xfd, 0xf7,
-        0xff, 0xf7, 0x8f, 0xf7, 0xf0, 0xf7, 0xf7, 0xff,
-        0xf7, 0xef, 0xfe, 0xe7, 0x9f,
-        0xff, 0x8f, 0x7f, 0xf8, 0xff, 0xff, 0xff, 0xff,
-        0x8f, 0xff, 0xf8, 0x8f, 0xff, 0xf8, 0xff, 0xef,
-        0xff, 0xff, 0x8e, 0x6f, 0xe1,
-        0xff, 0xf8, 0x7f, 0xff, 0xff, 0xff, 0xff, 0xff,
-        0xf7, 0x87, 0xff, 0xf0, 0xff, 0xff, 0xff, 0xff,
-        0xef, 0xef, 0xff, 0x9f, 0x7f,
-        0x3f, 0xff, 0xf8, 0xff, 0x8f, 0x7f, 0xf0, 0x9f,
-        0xf7, 0xfb, 0x07, 0xe7, 0x78, 0xf7, 0x8f, 0x7e,
-        0xf1, 0x9f, 0x7f, 0xff, 0x9e,
-        0xff, 0x80, 0x7f, 0xf8, 0xff, 0x7f, 0xff, 0xff,
-        0xf7, 0x8f, 0x6f, 0x80, 0xff, 0xf1, 0xff, 0xff,
-        0xef, 0xff, 0xfe, 0x9f, 0x7f,
-        0xff, 0x88, 0xff, 0xf8, 0xff, 0xff, 0xff, 0xff,
-        0x7f, 0x9f, 0xef, 0x81, 0x7f, 0xf0, 0xff, 0xfe,
-        0xff, 0xff, 0xef, 0x9f, 0x7f,
-        0xff, 0x7f, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
-        0x97, 0x77, 0xf8, 0xff, 0xef, 0xff, 0xf7, 0xff,
-        0xef, 0xef, 0x8f, 0x76, 0xf1,
-        0xff, 0xff, 0xff, 0xff, 0xf7, 0x0f, 0xf7, 0x88,
-        0xf7, 0xf0, 0xff, 0xff, 0xef, 0xff, 0xef, 0x8e,
-        0x07, 0x99, 0x61, 0xe1, 0xff,
-        0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xf7, 0xf7,
-        0xff, 0xff, 0xf7, 0xf7, 0xef, 0xff, 0xe7, 0xee,
-        0xff, 0xff, 0xff, 0xff, 0xff,
-        0xbf, 0x87, 0xf8, 0xf8, 0xff, 0x7f, 0xf7, 0xff,
-        0xff, 0xff, 0x8f, 0x8f, 0xe0, 0xf0, 0xef, 0xff,
-        0xf7, 0xff, 0xff, 0xff, 0x8f,
-        0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xf7, 0xff,
-        0x7f, 0xff, 0xff, 0xff, 0xef, 0xff, 0xe7, 0xff,
-        0xf6, 0xff, 0xff, 0xff, 0xff,
-        0xff, 0xff, 0xff, 0xf7, 0xff, 0xff, 0xf7, 0xff,
-        0xff, 0xff, 0xff, 0xff, 0xef, 0xff, 0xef, 0xff,
-        0xf7, 0xff, 0xff, 0xff, 0xff,
-        0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xf7, 0xff,
-        0xff, 0xff, 0xff, 0xff, 0x6f, 0xff, 0xe7, 0xff,
-        0xf7, 0xff, 0xff, 0xff, 0xff,
-        0xff, 0xff, 0x7f, 0xff, 0xff, 0xff, 0xf7, 0xff,
-        0xff, 0xf7, 0xff, 0xff, 0xef, 0xff, 0xef, 0xff,
-        0x97, 0xee, 0xf9, 0xf7, 0xff,
-        0xff, 0xff, 0xff, 0xff, 0x80, 0x88, 0xff, 0xf8,
-        0xff, 0xff, 0xf7, 0xff, 0x0f, 0x1f, 0x79, 0x9b,
-        0x7f, 0xf0, 0xfe, 0xff, 0xff,
-        0xff, 0x4f, 0x7b, 0xf7, 0xf7, 0xf8, 0x0f, 0xff,
-        0x00, 0xff, 0xd0, 0x4f, 0x75, 0x8c, 0x79, 0xff,
-        0x8f, 0x7f, 0x81, 0x7e, 0xb1,
-        0xff, 0xf7, 0xff, 0xfe, 0x8f, 0x7f, 0x70, 0xf0,
-        0xff, 0xf7, 0x7f, 0xff, 0xf7, 0xff, 0x84, 0x0e,
-        0x73, 0xff, 0xf7, 0xff, 0xff,
-        0x3f, 0xbd, 0xfd, 0xfb, 0xf7, 0xe8, 0xff, 0xff,
-        0x78, 0xf0, 0x3f, 0xbf, 0xe3, 0x9b, 0x6f, 0xff,
-        0x97, 0x1f, 0x7f, 0xcf, 0xfe,
-        0xff, 0xf8, 0xf7, 0xff, 0x8f, 0x80, 0xff, 0xf8,
-        0xff, 0x8f, 0x78, 0xf0, 0x7f, 0x9f, 0x7f, 0x9b,
-        0x7f, 0xf1, 0xff, 0x97, 0x7f,
-        0xff, 0xff, 0x07, 0xff, 0x87, 0x7f, 0xf0, 0xf8,
-        0xff, 0x7f, 0xfb, 0x7f, 0xee, 0xfb, 0x99, 0x19,
-        0x73, 0xef, 0xf7, 0xef, 0xff,
-        0xbf, 0x87, 0x04, 0xfc, 0xff, 0x08, 0xf7, 0xff,
-        0x7b, 0x7f, 0x8e, 0x8f, 0xf9, 0x98, 0x6f, 0xf3,
-        0xff, 0xef, 0xff, 0xff, 0xdf,
-        0xff, 0xff, 0x73, 0xff, 0xf7, 0x9f, 0xf8, 0xfb,
-        0x7f, 0xff, 0xff, 0xff, 0xff, 0xff, 0x8f, 0x3d,
-        0x61, 0xff, 0xef, 0xff, 0xff,
-        0xff, 0x7f, 0x07, 0xff, 0xf8, 0x78, 0xff, 0xee,
-        0xfb, 0xff, 0xff, 0xff, 0x87, 0x1f, 0x71, 0xe3,
-        0xff, 0xfb, 0xff, 0xff, 0xff,
-        0xff, 0x77, 0x8b, 0x7f, 0xf8, 0x7f, 0xff, 0xff,
-        0x07, 0xe7, 0xfa, 0x77, 0x8f, 0x7f, 0xff, 0xef,
-        0xf1, 0xef, 0x9f, 0x77, 0xf9,
-        0xff, 0xf8, 0x73, 0x8f, 0xf8, 0x0f, 0x88, 0x88,
-        0xf8, 0x98, 0x77, 0x78, 0x8f, 0x6f, 0x87, 0x7b,
-        0xf7, 0xff, 0xef, 0x87, 0x6f,
-        0xbf, 0x7f, 0xf0, 0xff, 0x8f, 0x7f, 0xff, 0xff,
-        0x7e, 0xff, 0x9f, 0x7f, 0xf0, 0xff, 0xff, 0xeb,
-        0xef, 0xff, 0xfb, 0xff, 0x9f,
-        0xff, 0xff, 0xff, 0x77, 0xf8, 0x7f, 0xf8, 0xf7,
-        0xff, 0x7f, 0xf7, 0xff, 0x9f, 0x7f, 0x9b, 0x6f,
-        0xf1, 0xfe, 0xff, 0xfe, 0xff,
-        0x7f, 0x7f, 0x8f, 0xff, 0x8f, 0xff, 0x7f, 0x8f,
-        0xff, 0x70, 0xfb, 0x6f, 0xff, 0xff, 0xff, 0xf5,
-        0xf9, 0xff, 0xff, 0xff, 0xf4,
-        0xff, 0x87, 0xff, 0x74, 0xff, 0x7f, 0xff, 0xff,
-        0x7e, 0xff, 0xff, 0x8f, 0xff, 0xf1, 0xff, 0xff,
-        0xe9, 0xff, 0xf7, 0xff, 0xff,
-        0xbf, 0x78, 0xf8, 0x7f, 0xf7, 0xff, 0xff, 0xff,
-        0xf7, 0x07, 0x1f, 0xe1, 0xf1, 0xff, 0xf7, 0xff,
-        0xef, 0xef, 0xff, 0x8e, 0x0f,
-        0xff, 0xf8, 0x7f, 0xff, 0xff, 0xff, 0xff, 0x87,
-        0x9f, 0x88, 0xf1, 0xe1, 0xff, 0xef, 0xf7, 0xef,
-        0xfe, 0x9f, 0x0f, 0x09, 0x71,
-        0xbf, 0xf0, 0xf8, 0xff, 0x77, 0xff, 0xff, 0xff,
-        0xff, 0x8f, 0x8f, 0xf0, 0xf0, 0xff, 0xf7, 0xff,
-        0xfe, 0xf7, 0xff, 0x8e, 0x1f,
-        0x7f, 0xf8, 0x7f, 0xff, 0xff, 0xff, 0xff, 0xff,
-        0x8f, 0x8f, 0xf9, 0xf8, 0xfe, 0xff, 0xe7, 0xf7,
-        0xff, 0xff, 0x96, 0x0f, 0x61,
-        0x7f, 0xff, 0xff, 0xff, 0xf7, 0xff, 0xff, 0xff,
-        0xff, 0xff, 0xf7, 0xef, 0xff, 0xf7, 0xe7, 0xef,
-        0xff, 0xe7, 0xff, 0xf7, 0xfe,
-        0xff, 0xf7, 0x7f, 0xff, 0xff, 0xff, 0x8f, 0xff,
-        0xf8, 0xef, 0xef, 0xef, 0xff, 0xf7, 0xf7, 0xff,
-        0x9f, 0x67, 0xf0, 0xff, 0xff,
-        0x7f, 0xfc, 0xff, 0xff, 0xff, 0xff, 0xff, 0x8f,
-        0xff, 0x8f, 0xff, 0xe0, 0xf7, 0xff, 0xf7, 0xfe,
-        0xf7, 0xf7, 0xff, 0x8f, 0x6e,
-        0x3f, 0xfb, 0x7c, 0xff, 0xff, 0xff, 0xf7, 0xff,
-        0xff, 0xe7, 0x9f, 0xef, 0xf0, 0xff, 0xe7, 0xef,
-        0xf7, 0xef, 0xf6, 0xf6, 0x87,
-        0xff, 0x07, 0xff, 0xf8, 0xff, 0xff, 0xff, 0xff,
-        0x8f, 0xff, 0xf4, 0x9f, 0xff, 0xfc, 0xff, 0xff,
-        0xff, 0xff, 0x8f, 0x7f, 0xf0,
-        0x7f, 0xfc, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
-        0xf7, 0x87, 0xff, 0xe8, 0xff, 0xf7, 0xff, 0xff,
-        0xef, 0xe7, 0xf7, 0x8f, 0x6f,
-        0x3f, 0xff, 0xfc, 0xff, 0x8f, 0x7f, 0xf0, 0xcf,
-        0xef, 0xe8, 0x1b, 0xef, 0x7c, 0xff, 0x8f, 0x7e,
-        0xe1, 0x97, 0x77, 0xff, 0x9e,
-        0xff, 0x80, 0x7f, 0xfc, 0xff, 0x7f, 0xff, 0xff,
-        0xf7, 0x8f, 0x7f, 0x80, 0xff, 0xf1, 0xff, 0xfe,
-        0xef, 0xff, 0xff, 0x9f, 0x7f,
-        0xff, 0x84, 0xff, 0xf8, 0xff, 0xff, 0xff, 0xff,
-        0x6f, 0x9f, 0xff, 0x91, 0x7f, 0xf0, 0xff, 0xff,
-        0xff, 0xff, 0xff, 0x8f, 0x7f,
-        0xff, 0xfb, 0xff, 0xff, 0xfb, 0xff, 0xff, 0xff,
-        0x1f, 0x77, 0xf8, 0xf7, 0xef, 0xff, 0xf7, 0xff,
-        0xf7, 0xef, 0x87, 0x67, 0xf1,
-        0xff, 0xff, 0xff, 0xff, 0xff, 0x0f, 0x8b, 0x8c,
-        0xf0, 0xf8, 0xf7, 0xff, 0xef, 0xff, 0xe7, 0x9e,
-        0x67, 0x89, 0x77, 0xf1, 0xff,
-        0xff, 0xff, 0xff, 0xff, 0xf3, 0xff, 0xff, 0xff,
-        0xff, 0xef, 0xfb, 0xff, 0xef, 0xff, 0xe7, 0xff,
-        0xf7, 0xf7, 0xff, 0xff, 0xf7,
-        0xbf, 0x87, 0xf8, 0xf8, 0xf7, 0x7f, 0xfb, 0xff,
-        0xff, 0xff, 0x8f, 0x8f, 0xe0, 0xf0, 0xe7, 0xfe,
-        0xf7, 0xff, 0xff, 0xff, 0x8e,
-        0xff, 0xff, 0xff, 0xff, 0xfb, 0xff, 0xfb, 0xff,
-        0x7f, 0xff, 0xff, 0xff, 0xff, 0xff, 0xef, 0xff,
-        0xf7, 0xff, 0xff, 0xff, 0xff,
-        0xff, 0xff, 0xff, 0xf7, 0xfb, 0xff, 0xfb, 0xff,
-        0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xfe, 0xff,
-        0xf7, 0xff, 0xff, 0xff, 0xfe,
-        0xff, 0xff, 0xff, 0xff, 0xf3, 0xff, 0xff, 0xff,
-        0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xfe, 0xff,
-        0xff, 0xff, 0xff, 0xff, 0xff,
-        0xff, 0xff, 0xff, 0x7f, 0xf7, 0xff, 0x8b, 0xff,
-        0xfc, 0xf3, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
-        0xff, 0xee, 0xff, 0xf6, 0xff,
-        0xff, 0xf7, 0x8f, 0xbf, 0xf9, 0x8f, 0xff, 0xf0,
-        0xff, 0xff, 0x7f, 0xff, 0x1f, 0x1f, 0x71, 0x89,
-        0x7f, 0xf1, 0xff, 0xff, 0xff,
-        0xff, 0x4f, 0xb8, 0xc6, 0xfb, 0xfd, 0x0f, 0xff,
-        0x00, 0xff, 0xd0, 0x7f, 0x79, 0x90, 0x7f, 0xf9,
-        0x8f, 0x7f, 0x81, 0x7f, 0x81,
-        0xff, 0xff, 0xcf, 0xff, 0xb0, 0x4f, 0x77, 0xf4,
-        0xff, 0xff, 0x7f, 0xe7, 0xee, 0xff, 0x97, 0x07,
-        0x69, 0xf1, 0xf7, 0xff, 0xff,
-        0x3f, 0xba, 0xff, 0x4d, 0xfe, 0xe5, 0xff, 0xff,
-        0x7f, 0xef, 0xbf, 0x9f, 0xe7, 0x9f, 0x77, 0xe9,
-        0x9f, 0x1f, 0x79, 0xc1, 0xfe,
-        0xff, 0xf8, 0xf7, 0x3f, 0xff, 0x9f, 0xf7, 0xf8,
-        0xff, 0x87, 0x7f, 0xf0, 0x7f, 0x97, 0x7f, 0x89,
-        0x7e, 0xf1, 0xff, 0x9f, 0x7f,
-        0xff, 0xff, 0x37, 0xbf, 0xb3, 0x7f, 0xf2, 0xff,
-        0xff, 0xf7, 0xff, 0x7f, 0x7b, 0xfe, 0x87, 0x1f,
-        0x71, 0xf1, 0xff, 0x7f, 0xfb,
-        0xff, 0xff, 0x70, 0xb7, 0xfe, 0x7b, 0xff, 0xf3,
-        0xbf, 0xf7, 0xff, 0xff, 0xf9, 0x9f, 0x7f, 0xf1,
-        0xff, 0xf7, 0xff, 0xff, 0xfb,
-        0xbf, 0xff, 0xf4, 0xcf, 0x87, 0xd8, 0xf8, 0xf8,
-        0xff, 0xff, 0x8f, 0xff, 0xe9, 0xff, 0x8f, 0x1f,
-        0x71, 0xff, 0xef, 0xff, 0x8d,
-        0xff, 0xff, 0x87, 0xbf, 0xf9, 0x3f, 0xff, 0xf7,
-        0xff, 0xff, 0xff, 0xff, 0x9f, 0x1f, 0x71, 0xf9,
-        0xff, 0x7b, 0xff, 0xfe, 0xff,
-        0xff, 0xff, 0xcb, 0xff, 0xbd, 0x7f, 0xfb, 0xff,
-        0x8f, 0xff, 0xf8, 0x7f, 0x9f, 0x7f, 0xf1, 0xef,
-        0xff, 0xf7, 0x8f, 0x7f, 0xf9,
-        0xff, 0xf8, 0x43, 0x8f, 0xc4, 0x75, 0x7d, 0xff,
-        0xff, 0x97, 0x7f, 0x78, 0x8f, 0x6f, 0x99, 0x17,
-        0x19, 0x71, 0xf9, 0x8f, 0x6f,
-        0xbf, 0x7f, 0xf0, 0x8f, 0xf6, 0x7d, 0x37, 0xff,
-        0xff, 0xff, 0x9f, 0x7f, 0xe0, 0xff, 0xff, 0xef,
-        0xff, 0xf7, 0xfb, 0xff, 0x8f,
-        0xff, 0xff, 0xbf, 0x77, 0x8e, 0xff, 0xf0, 0xff,
-        0xff, 0xf7, 0xf7, 0x7f, 0x97, 0x7f, 0x99, 0x7f,
-        0xf9, 0xfe, 0xff, 0xfe, 0xff,
-        0x7f, 0xff, 0xff, 0xcf, 0xbf, 0xf9, 0xfa, 0xff,
-        0xff, 0xff, 0xf3, 0xff, 0xff, 0xff, 0xff, 0xff,
-        0xf7, 0x8f, 0x7f, 0x71, 0xf6,
-        0xff, 0xff, 0xff, 0x7f, 0xb7, 0xfe, 0xfb, 0xff,
-        0xf6, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xf7,
-        0xff, 0xff, 0xf7, 0xff, 0xff,
-        0x3f, 0x78, 0xf8, 0xff, 0xff, 0xff, 0xff, 0x8f,
-        0xff, 0x08, 0x0f, 0xf1, 0xf1, 0xff, 0xff, 0xff,
-        0xff, 0xff, 0xff, 0x8e, 0x0e,
-        0xff, 0xf8, 0x7f, 0xff, 0x7f, 0xff, 0xff, 0x8f,
-        0x8f, 0x80, 0xf1, 0xf1, 0xff, 0xff, 0xff, 0xff,
-        0xfe, 0x8f, 0x0e, 0x01, 0x71,
-        0xbf, 0xf8, 0xf8, 0xff, 0x7f, 0xff, 0xff, 0xff,
-        0xff, 0x8f, 0x8f, 0xf1, 0xf1, 0xff, 0xff, 0xff,
-        0xfe, 0xff, 0xff, 0x8f, 0x0f,
-        0xff, 0xf8, 0x7f, 0xff, 0xff, 0xff, 0xff, 0xff,
-        0x8f, 0x8f, 0xf1, 0xf1, 0xff, 0xff, 0xff, 0xff,
-        0xff, 0xff, 0x8e, 0x0f, 0x71,
-        0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
-        0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
-        0xff, 0xff, 0xff, 0xff, 0xff,
-        0xff, 0xff, 0x7f, 0xff, 0xff, 0xff, 0x8f, 0xff,
-        0xf0, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
-        0x8f, 0x7f, 0xf0, 0xff, 0xff,
-        0x7f, 0xf8, 0xff, 0xff, 0xff, 0xff, 0xff, 0x8f,
-        0xff, 0x88, 0xff, 0xf0, 0xff, 0xff, 0xff, 0xff,
-        0xff, 0xff, 0xff, 0x8f, 0x7e,
-        0xbf, 0xff, 0x78, 0xff, 0xff, 0xff, 0xff, 0xff,
-        0xff, 0xf7, 0x8f, 0xf7, 0xf0, 0xff, 0xff, 0xff,
-        0xff, 0xff, 0xfe, 0xff, 0x8f,
-        0xff, 0x87, 0x7f, 0xf8, 0xff, 0xff, 0xff, 0xff,
-        0x8f, 0xff, 0xf8, 0x8f, 0xf7, 0xf8, 0xff, 0xff,
-        0xff, 0xff, 0x8e, 0x7f, 0xf1,
-        0xff, 0xf8, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
-        0xff, 0x87, 0xff, 0xf0, 0xff, 0xff, 0xff, 0xff,
-        0xff, 0xff, 0xff, 0x8f, 0x7f,
-        0x3f, 0xff, 0xf8, 0xff, 0x8f, 0x7f, 0xf0, 0xdf,
-        0xff, 0xf6, 0x07, 0xff, 0x78, 0xff, 0x8f, 0x7e,
-        0xf1, 0x9f, 0x7f, 0xfd, 0x8e,
-        0xff, 0x80, 0x7f, 0xf8, 0xff, 0x7f, 0xff, 0xff,
-        0xf7, 0x8f, 0x7f, 0x80, 0xff, 0xf1, 0xff, 0xff,
-        0xff, 0xff, 0xfe, 0x8f, 0x7f,
-        0xff, 0x80, 0xff, 0xf8, 0xff, 0xff, 0xff, 0xff,
-        0x7f, 0x8f, 0xff, 0x81, 0x7f, 0xf0, 0xff, 0xfe,
-        0xff, 0xff, 0xff, 0x8f, 0x7f,
-        0xff, 0x7f, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
-        0x8f, 0x77, 0xf0, 0xff, 0xff, 0xff, 0xff, 0xff,
-        0xff, 0xff, 0x8f, 0x6e, 0xf1,
-        0xff, 0xff, 0xff, 0xff, 0xff, 0x0f, 0x8f, 0x88,
-        0xf0, 0xf0, 0xff, 0xff, 0xff, 0xff, 0xff, 0x8e,
-        0x7f, 0x81, 0x7f, 0xf1, 0xff,
-        0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
-        0x7f, 0xff, 0xf7, 0xff, 0xff, 0xff, 0xff, 0xfe,
-        0xff, 0xff, 0xff, 0xff, 0xff,
-        0xbf, 0x87, 0xf8, 0xf8, 0xff, 0x7f, 0xff, 0xff,
-        0xff, 0xff, 0x8f, 0x8f, 0xf0, 0xf0, 0xff, 0xff,
-        0xff, 0xff, 0xff, 0xff, 0x8f,
-        0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
-        0x7f, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
-        0xff, 0xff, 0xff, 0xff, 0xff,
-        0xff, 0xff, 0xff, 0xf7, 0xff, 0xff, 0xff, 0xff,
-        0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xfe,
-        0xff, 0xff, 0xff, 0xff, 0xff,
-        0xff, 0xff, 0xff, 0xff, 0xf7, 0xff, 0xf7, 0xff,
-        0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xfe,
-        0xff, 0xff, 0xff, 0xff, 0xff,
-        0xff, 0xff, 0xff, 0xff, 0xf7, 0xff, 0x87, 0xff,
-        0xf8, 0xf7, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
-        0xfe, 0xfe, 0xff, 0xff, 0xff,
-        0xff, 0xff, 0x3f, 0x8f, 0xf0, 0x85, 0xff, 0xf0,
-        0xff, 0xff, 0xff, 0x7f, 0x0d, 0x0f, 0x71, 0x81,
-        0x7e, 0xf1, 0xfe, 0xff, 0xff,
-        0xff, 0x5f, 0x3d, 0xf0, 0xf5, 0xfa, 0x0f, 0xff,
-        0x00, 0xff, 0x80, 0x0f, 0xf1, 0x88, 0x7f, 0xf1,
-        0x8f, 0x7e, 0x81, 0x7e, 0xc1,
-        0xff, 0xff, 0xff, 0xff, 0xba, 0x4f, 0x75, 0xfa,
-        0xff, 0xff, 0x7f, 0xff, 0xff, 0xff, 0x8f, 0x0f,
-        0x71, 0xf1, 0xff, 0xff, 0xff,
-        0x3f, 0xbf, 0xff, 0xcf, 0xff, 0xfa, 0xff, 0xfe,
-        0x7f, 0xdf, 0x7f, 0xf4, 0xff, 0x8f, 0x7f, 0xf1,
-        0x8f, 0x0f, 0x71, 0xf1, 0xbe,
-        0xff, 0xf8, 0xf7, 0xbb, 0x7f, 0x85, 0xff, 0xf0,
-        0xff, 0x8f, 0x7f, 0xf0, 0x7f, 0x87, 0x7f, 0x81,
-        0x7e, 0xf1, 0x8f, 0x0f, 0x71,
-        0xff, 0xff, 0x87, 0x8f, 0x8d, 0xfd, 0xf5, 0xff,
-        0xfb, 0xff, 0xff, 0xff, 0xf7, 0xfe, 0x8f, 0x0f,
-        0x71, 0xf1, 0xfe, 0x7f, 0xf7,
-        0xbf, 0x07, 0xc0, 0xbf, 0xf7, 0xfd, 0xff, 0xff,
-        0xbf, 0xff, 0x85, 0x8f, 0xf9, 0x8f, 0x7f, 0xf1,
-        0xff, 0x7f, 0xf6, 0xff, 0x83,
-        0xff, 0xff, 0xf4, 0xff, 0x8f, 0xda, 0xf0, 0xb6,
-        0xdf, 0xfd, 0xf6, 0xff, 0xf9, 0xff, 0x8f, 0x1f,
-        0x71, 0xfd, 0x8f, 0x7b, 0xfd,
-        0xff, 0xff, 0xb7, 0x8f, 0xf0, 0xbd, 0xff, 0xfd,
-        0xf7, 0xff, 0xff, 0xff, 0x8f, 0x0f, 0x71, 0xf1,
-        0xff, 0x7b, 0xff, 0xff, 0xff,
-        0xff, 0xff, 0xff, 0xff, 0xba, 0x7f, 0xf5, 0xf7,
-        0x0f, 0xf7, 0xf0, 0x7f, 0x87, 0x7f, 0xf1, 0xff,
-        0xff, 0xfe, 0x8f, 0x7f, 0xf1,
-        0xff, 0xf8, 0x47, 0x8f, 0xca, 0x70, 0x7a, 0xff,
-        0xff, 0x8f, 0x7f, 0x70, 0x8f, 0x7f, 0x81, 0x0e,
-        0x01, 0x01, 0x71, 0x81, 0x7f,
-        0xbf, 0x7f, 0xf0, 0x8f, 0xff, 0x70, 0x3f, 0xff,
-        0xfd, 0xfe, 0x8f, 0x7f, 0xf0, 0xff, 0xff, 0xff,
-        0xff, 0xfe, 0xfb, 0xff, 0x8f,
-        0xff, 0xff, 0xbf, 0x7f, 0x85, 0x7f, 0xf0, 0xff,
-        0xff, 0xff, 0xff, 0xff, 0x8f, 0x7f, 0x81, 0x7f,
-        0x81, 0xfe, 0xf1, 0xff, 0xff,
-        0x7f, 0xff, 0xff, 0xcf, 0x87, 0xfa, 0x75, 0xff,
-        0xff, 0x7f, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
-        0xff, 0x8f, 0x7f, 0x70, 0xfe,
-        0xff, 0x87, 0xff, 0x4b, 0xbf, 0x7f, 0xfd, 0xff,
-        0xff, 0xff, 0xff, 0x8f, 0xff, 0xff, 0xff, 0xfe,
-        0xff, 0xfe, 0xff, 0xfe, 0xff,
-        0x3f, 0x78, 0xf8, 0xf7, 0xff, 0xff, 0xff, 0xff,
-        0xff, 0x8f, 0x0f, 0x71, 0xf1, 0xff, 0x7f, 0xff,
-        0xff, 0xff, 0xff, 0x8e, 0x0e,
-        0xff, 0xf8, 0x7f, 0xff, 0x7f, 0xff, 0x7f, 0x8f,
-        0x8f, 0x00, 0x71, 0xf1, 0xff, 0xff, 0xff, 0xff,
-        0xfe, 0x8f, 0x0e, 0x01, 0x71,
-        0xbf, 0xf8, 0xf8, 0xff, 0x7f, 0xff, 0x7f, 0xff,
-        0xff, 0x8f, 0x0f, 0x71, 0xf1, 0xff, 0xff, 0xff,
-        0xfe, 0xff, 0xff, 0x8f, 0x0f,
-        0xff, 0xf8, 0x7f, 0xff, 0xff, 0xff, 0xff, 0xff,
-        0x8f, 0x0f, 0x71, 0xf1, 0xff, 0xff, 0xff, 0xff,
-        0xff, 0xff, 0x8e, 0x0f, 0x71,
-        0xff, 0xff, 0xff, 0xf7, 0xff, 0xff, 0x7f, 0xff,
-        0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xfe,
-        0xff, 0xff, 0xff, 0xff, 0xff,
-        0xff, 0xff, 0x7f, 0xff, 0xff, 0x7f, 0x8f, 0xff,
-        0xf0, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
-        0x8f, 0x7f, 0xf0, 0xff, 0xff,
-        0x7f, 0xf8, 0xff, 0xff, 0xff, 0x7f, 0x7f, 0xff,
-        0xff, 0x8f, 0xff, 0xf0, 0xff, 0xff, 0xff, 0xff,
-        0xff, 0xff, 0xff, 0x8f, 0x7e,
-        0xbf, 0xff, 0x78, 0xff, 0xff, 0xff, 0x7f, 0xff,
-        0xff, 0xff, 0x8f, 0xff, 0xf0, 0xff, 0xff, 0xff,
-        0xff, 0xff, 0xfe, 0xff, 0x8f,
-        0xff, 0x07, 0xff, 0xf8, 0xff, 0xff, 0xff, 0xff,
-        0x8f, 0xff, 0xf0, 0x8f, 0xff, 0xf0, 0xff, 0xff,
-        0xff, 0xff, 0x8e, 0x7f, 0xf1,
-        0xff, 0xf8, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
-        0xff, 0x8f, 0xff, 0xf0, 0xff, 0xff, 0xff, 0xff,
-        0xff, 0xff, 0xff, 0x8f, 0x7f,
-        0x3f, 0xff, 0xf8, 0xff, 0x8f, 0x7f, 0xf0, 0x8f,
-        0xff, 0xfc, 0x8f, 0xff, 0xf0, 0xff, 0x8f, 0x7e,
-        0xf1, 0x8f, 0x7f, 0xf3, 0x8e,
-        0xff, 0x80, 0x7f, 0xf8, 0xff, 0x7f, 0xff, 0xff,
-        0xff, 0x8f, 0x7f, 0x80, 0x7f, 0xf1, 0xff, 0xff,
-        0xff, 0xff, 0xfe, 0x8f, 0x7f,
-        0xff, 0x80, 0xff, 0xf8, 0xff, 0xff, 0xff, 0xff,
-        0x7f, 0x8f, 0x7f, 0x81, 0x7f, 0xf0, 0xff, 0xfe,
-        0xff, 0xff, 0xff, 0x8f, 0x7f,
-        0xff, 0x7f, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
-        0x8f, 0x7f, 0xf0, 0xff, 0xff, 0xff, 0xff, 0xff,
-        0xff, 0xff, 0x8f, 0x7f, 0xf1,
-        0xff, 0xff, 0xff, 0xff, 0xff, 0x0f, 0xff, 0x80,
-        0xff, 0xf0, 0xff, 0xff, 0xff, 0xff, 0xfe, 0x8e,
-        0x0f, 0x01, 0x71, 0xf0, 0xff,
-        0xff, 0xf7, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
-        0xef, 0xff, 0xfb, 0xff, 0xff, 0xff, 0xff, 0xfe,
-        0xff, 0xff, 0xff, 0xff, 0xf7,
-        0xbf, 0x87, 0xf8, 0xf8, 0xff, 0x7f, 0xff, 0xff,
-        0x7f, 0x7f, 0x8f, 0x8f, 0xf0, 0xf0, 0xfe, 0xff,
-        0xff, 0xff, 0xff, 0xfe, 0x8f,
-        0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
-        0xff, 0xff, 0xff, 0xff, 0xff, 0x7f, 0xff, 0x7f,
-        0xff, 0xff, 0xff, 0xff, 0xff,
-        0xff, 0x7f, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
-        0xff, 0xff, 0xff, 0xff, 0xff, 0x7f, 0xff, 0x7e,
-        0xff, 0xff, 0xff, 0xff, 0xff,
-        0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
-        0xff, 0x7f, 0xff, 0xff, 0xff, 0x7f, 0xff, 0x7e,
-        0xff, 0xff, 0x7f, 0xff, 0xff,
-        0xff, 0xff, 0x7f, 0xff, 0x7f, 0xff, 0xff, 0xff,
-        0x7f, 0x7f, 0xff, 0xff, 0xff, 0x7f, 0xff, 0x7f,
-        0x8f, 0xfe, 0xf0, 0xff, 0xff,
-        0xbf, 0xff, 0x0e, 0x8f, 0x70, 0x80, 0xff, 0xf0,
-        0xff, 0xff, 0xff, 0xff, 0x0f, 0x7f, 0xf1, 0x0f,
-        0x7f, 0xf1, 0xfe, 0xff, 0x9f,
-        0xbf, 0x1f, 0xfb, 0x0c, 0xff, 0xf0, 0x8f, 0xff,
-        0x00, 0xff, 0xb0, 0x3f, 0x71, 0x80, 0xff, 0xf1,
-        0x8f, 0x7f, 0x81, 0x7e, 0xc1,
-        0xff, 0xff, 0xff, 0x7f, 0x8f, 0x0f, 0x70, 0xf0,
-        0x8f, 0x7f, 0x70, 0xcf, 0x8f, 0xff, 0x71, 0x0f,
-        0x7e, 0xf1, 0x8f, 0x7f, 0xf1,
-        0x7f, 0xff, 0x7f, 0x0f, 0xff, 0x78, 0x8f, 0x8f,
-        0x70, 0x70, 0x7f, 0xfe, 0xff, 0x8f, 0xff, 0x70,
-        0xff, 0xfe, 0xff, 0xff, 0xbe,
-        0xff, 0xf8, 0xf7, 0x0b, 0xf7, 0x88, 0xf7, 0xf0,
-        0x8f, 0x8f, 0x70, 0xf0, 0x7e, 0x73, 0xff, 0x8f,
-        0x7e, 0xf0, 0xff, 0x8f, 0x7f,
-        0xff, 0x78, 0x77, 0xff, 0x8f, 0x8f, 0xf0, 0xf0,
-        0xff, 0x8f, 0x77, 0x70, 0x77, 0x7f, 0xff, 0x7f,
-        0xff, 0xff, 0xfe, 0x8f, 0x7f,
-        0xff, 0xff, 0x77, 0x8f, 0xff, 0xf0, 0xff, 0xff,
-        0x77, 0x7f, 0xfb, 0xff, 0xff, 0xff, 0xff, 0xff,
-        0xff, 0xef, 0x7f, 0xff, 0xbf,
-        0xbf, 0xff, 0x74, 0xff, 0xff, 0x8f, 0xff, 0xfc,
-        0x0f, 0xf3, 0x8c, 0xff, 0xfd, 0xff, 0xff, 0x8f,
-        0x7f, 0xf1, 0x8f, 0x7d, 0x83,
-        0xff, 0x7f, 0x77, 0xff, 0xff, 0xff, 0xff, 0xfb,
-        0xf7, 0x7f, 0xf7, 0xff, 0xff, 0xff, 0xff, 0xff,
-        0xff, 0xff, 0xff, 0xff, 0xff,
-        0xff, 0x78, 0xff, 0x7f, 0xff, 0xff, 0xff, 0xff,
-        0x0f, 0x8f, 0x70, 0x70, 0xf7, 0xff, 0xff, 0xff,
-        0xff, 0xff, 0x8e, 0x0f, 0x71,
-        0xff, 0xf8, 0xf7, 0x7f, 0xff, 0x8f, 0x8f, 0x80,
-        0x80, 0x81, 0x70, 0x70, 0x7f, 0xff, 0xff, 0xff,
-        0xff, 0x6f, 0x8f, 0x0f, 0x71,
-        0xbf, 0x7f, 0xf0, 0xff, 0xff, 0xff, 0xff, 0xff,
-        0x7b, 0xff, 0x9f, 0xff, 0x70, 0xff, 0xff, 0xff,
-        0xff, 0x7f, 0xff, 0xfe, 0x8f,
-        0xff, 0x87, 0x7f, 0x78, 0xfe, 0xff, 0x9e, 0xff,
-        0xf2, 0x7f, 0xff, 0x0f, 0xff, 0xf0, 0xff, 0xef,
-        0xff, 0x7f, 0xff, 0xff, 0xff,
-        0x7f, 0x7f, 0xff, 0x7f, 0xff, 0xff, 0xfe, 0x8f,
-        0xff, 0x70, 0xff, 0x7f, 0xff, 0xff, 0xdf, 0xff,
-        0xff, 0xff, 0xff, 0xff, 0xfe,
-        0xff, 0xff, 0x7f, 0xf7, 0xff, 0xfe, 0xff, 0xff,
-        0xff, 0x7f, 0xff, 0xff, 0xff, 0xff, 0xdf, 0xff,
-        0xff, 0xff, 0xff, 0xff, 0xff,
-        0xff, 0xff, 0x7f, 0x7f, 0x8f, 0x8f, 0xf0, 0xf0,
-        0xff, 0xff, 0xff, 0xff, 0xff, 0xfd, 0xaf, 0x0f,
-        0x70, 0xd1, 0xff, 0xf8, 0xfe,
-        0xff, 0xff, 0xff, 0xf7, 0xaf, 0x8f, 0xfa, 0xf0,
-        0xff, 0xff, 0xff, 0xff, 0xff, 0x9f, 0x8f, 0x0f,
-        0x79, 0xe1, 0xff, 0xfe, 0xff,
-        0xbf, 0xff, 0xff, 0x7a, 0x8f, 0xff, 0xf0, 0xef,
-        0xff, 0xfb, 0xff, 0xaf, 0xff, 0xfb, 0x8f, 0x7f,
-        0xf1, 0xdf, 0xff, 0xf9, 0xff,
-        0xbf, 0xff, 0xff, 0xf7, 0xff, 0xaf, 0xff, 0xba,
-        0xaf, 0xff, 0xfb, 0xff, 0xff, 0xff, 0xef, 0xdf,
-        0xff, 0xfd, 0xbe, 0xf7, 0xf5,
-        0xff, 0xf8, 0xff, 0xff, 0x8f, 0xff, 0xf0, 0xff,
-        0xff, 0x8f, 0xf7, 0xf0, 0xff, 0xff, 0x8f, 0x3f,
-        0x11, 0xeb, 0xdb, 0xcf, 0x7f,
-        0xbf, 0xf0, 0x8f, 0x87, 0xf0, 0xf0, 0xff, 0xbf,
-        0xff, 0x8f, 0xff, 0xf1, 0x8f, 0x0f, 0x31, 0xf1,
-        0x9f, 0xdf, 0xf9, 0x85, 0x7f,
-        0xbf, 0xff, 0x8f, 0x7f, 0xf0, 0xff, 0xff, 0xff,
-        0xee, 0xff, 0xfb, 0xf7, 0x8f, 0x7f, 0xb1, 0xff,
-        0xff, 0xff, 0xff, 0xdf, 0xfd,
-        0xff, 0xff, 0xff, 0x8f, 0x8f, 0xf0, 0x80, 0xff,
-        0xf0, 0xff, 0xff, 0xff, 0xff, 0x8f, 0x2f, 0x71,
-        0xc1, 0x7f, 0xf1, 0xff, 0xff,
-        0xff, 0xff, 0xff, 0x8f, 0xff, 0xf0, 0xff, 0xbf,
-        0xff, 0xff, 0xff, 0xff, 0xff, 0x8f, 0x7f, 0xd1,
-        0x9f, 0xff, 0x7b, 0xb7, 0xff,
-        0xbf, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
-        0xff, 0xff, 0xfe, 0x8f, 0xff, 0xf1, 0xff, 0xff,
-        0xff, 0xff, 0xbf, 0xb7, 0xff,
-        0xff, 0xa4, 0xf7, 0x88, 0xff, 0xf0, 0xaf, 0xbf,
-        0xfb, 0xef, 0xff, 0xf7, 0xff, 0x8f, 0x7f, 0xf1,
-        0xff, 0xdd, 0xf7, 0x97, 0x7f,
-        0xff, 0xff, 0xf7, 0xff, 0x8f, 0xff, 0xf0, 0xff,
-        0xfe, 0xff, 0xff, 0xff, 0xff, 0xff, 0x8f, 0x7f,
-        0xf1, 0xff, 0xff, 0xff, 0xff,
-        0xff, 0xff, 0xff, 0xf7, 0xaf, 0x0f, 0xa0, 0xf0,
-        0xfb, 0xff, 0xff, 0xff, 0xff, 0xff, 0x8f, 0x0f,
-        0x71, 0xb1, 0x37, 0xf7, 0xff,
-        0xff, 0xb8, 0xff, 0xff, 0xff, 0x7f, 0xff, 0xff,
-        0xff, 0x8f, 0xff, 0xf0, 0xfe, 0xff, 0xff, 0xff,
-        0xff, 0xff, 0xff, 0x8f, 0x7f,
-        0xbf, 0xff, 0xf8, 0xf7, 0xff, 0xa7, 0xff, 0xf0,
-        0xff, 0xff, 0x8f, 0xfe, 0xf0, 0xff, 0xff, 0x8f,
-        0x7f, 0xf1, 0xff, 0xff, 0xcf,
-        0xff, 0xff, 0xf7, 0x9f, 0xf7, 0xf3, 0xff, 0xff,
-        0xff, 0xff, 0x7f, 0xff, 0xff, 0xbf, 0x7f, 0xf9,
-        0xff, 0xfe, 0xff, 0xff, 0xdf,
-        0xff, 0xff, 0xff, 0xff, 0xff, 0x7f, 0xff, 0x7f,
-        0xff, 0xff, 0xff, 0x7f, 0xff, 0xff, 0xff, 0xff,
-        0xff, 0xff, 0xff, 0xbf, 0xbf,
-        0xff, 0xff, 0xff, 0xaf, 0xff, 0xf0, 0xff, 0xff,
-        0x9f, 0xfe, 0xf1, 0xff, 0xff, 0xcf, 0x7f, 0xf1,
-        0xff, 0xff, 0xdf, 0xff, 0xf1,
-        0xbf, 0xff, 0xf0, 0xff, 0xff, 0xff, 0xff, 0xff,
-        0xff, 0xff, 0x8f, 0xff, 0xf0, 0xbf, 0xff, 0xff,
-        0xff, 0xff, 0xff, 0xff, 0x6f,
-        0xff, 0xff, 0xf7, 0xff, 0xff, 0xff, 0xff, 0x7f,
-        0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
-        0xff, 0xff, 0xff, 0xff, 0xbf,
-        0xff, 0xf8, 0xff, 0xff, 0xdf, 0xff, 0xff, 0xff,
-        0xff, 0x8f, 0xff, 0xf1, 0xff, 0xff, 0xff, 0xff,
-        0xff, 0xff, 0xff, 0xcf, 0xff,
-        0xff, 0xd8, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
-        0xff, 0x8f, 0xef, 0xe0, 0xff, 0xff, 0xff, 0xff,
-        0xff, 0xff, 0xff, 0x8f, 0x3f,
-        0xff, 0xdf, 0xf7, 0xff, 0x0f, 0xfe, 0xf0, 0xff,
-        0xff, 0xff, 0xff, 0xef, 0xff, 0xdf, 0x8e, 0x7f,
-        0xf1, 0xff, 0xff, 0xff, 0xff,
-        0xff, 0xff, 0xf7, 0xff, 0xff, 0xff, 0xff, 0xff,
-        0xff, 0xfe, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
-        0xbf, 0xbf, 0xff, 0xff, 0xff,
-        0xff, 0xff, 0x8f, 0xff, 0xf1, 0xff, 0xff, 0xff,
-        0xff, 0xff, 0xef, 0xff, 0xbf, 0x7f, 0xe1, 0xff,
-        0xdf, 0xff, 0x7f, 0xff, 0xbf,
-        0xff, 0xa7, 0xff, 0x88, 0xff, 0xf1, 0xfe, 0xff,
-        0xff, 0xff, 0xff, 0x1f, 0xff, 0xf0, 0xcf, 0xb1,
-        0xff, 0xef, 0xff, 0x7f, 0xff,
+	0xff, 0x87, 0xff, 0x88, 0x7f, 0xff, 0xf9, 0xff,
+	0xff, 0xf5, 0xff, 0x8f, 0xff, 0xf0, 0x8f, 0xf9,
+	0xff, 0xef, 0xff, 0xff, 0xff,
+	0xff, 0xff, 0x8f, 0xff, 0xf0, 0xff, 0xff, 0xf0,
+	0xff, 0xff, 0xff, 0xff, 0x8f, 0x7f, 0xf1, 0xcf,
+	0xff, 0xff, 0xff, 0xff, 0xff,
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xef,
+	0x7f, 0x7b, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+	0xff, 0xff, 0x77, 0xff, 0xff,
+	0xff, 0xff, 0xff, 0xff, 0x86, 0xf6, 0xf0, 0xff,
+	0xf0, 0xff, 0xff, 0xff, 0xff, 0x7f, 0x0f, 0x7f,
+	0xc1, 0xff, 0xff, 0xff, 0xff,
+	0xff, 0xf8, 0xff, 0xff, 0xf6, 0xf0, 0xff, 0xff,
+	0x7f, 0x8f, 0x7f, 0xf0, 0xff, 0x0f, 0x7f, 0xff,
+	0xff, 0xff, 0xff, 0x8f, 0x7f,
+	0xff, 0xf8, 0xf7, 0x8f, 0xcf, 0xf0, 0xf6, 0xff,
+	0xff, 0xef, 0xff, 0xfb, 0x7f, 0x2f, 0x1f, 0x71,
+	0xf5, 0xff, 0xff, 0xef, 0x7f,
+	0xff, 0x7f, 0xff, 0xf7, 0xf6, 0xfe, 0xff, 0xff,
+	0xff, 0xff, 0xff, 0xff, 0xff, 0x7f, 0xff, 0xff,
+	0xff, 0xff, 0xff, 0xff, 0xff,
+	0xff, 0xff, 0xf7, 0x7f, 0x77, 0xf7, 0xff, 0xfb,
+	0x0f, 0xff, 0xf0, 0xff, 0xff, 0x7f, 0xff, 0xff,
+	0xfe, 0xff, 0x8f, 0x7f, 0xf1,
+	0xff, 0xff, 0xfa, 0xce, 0xff, 0xfd, 0xff, 0xff,
+	0x9f, 0xff, 0x8e, 0xff, 0xf0, 0xbf, 0x7f, 0xf5,
+	0xff, 0xef, 0x9f, 0xfd, 0x81,
+	0xff, 0xf9, 0xff, 0xff, 0xff, 0xfe, 0xff, 0xff,
+	0xff, 0xef, 0x9f, 0xfb, 0xff, 0xff, 0xff, 0xff,
+	0xff, 0xff, 0xff, 0xff, 0x7f,
+	0xff, 0x77, 0xfa, 0xb6, 0xff, 0x78, 0xff, 0xff,
+	0xff, 0xff, 0xff, 0xbf, 0xfd, 0x0f, 0x7f, 0xf1,
+	0xff, 0xff, 0xff, 0xff, 0x8f,
+	0xff, 0xf6, 0xf7, 0xf6, 0x7f, 0xbf, 0xff, 0xff,
+	0xff, 0xff, 0xef, 0xbf, 0xf2, 0x7f, 0xef, 0xff,
+	0xfe, 0xfb, 0xff, 0xef, 0xff,
+	0xff, 0xf7, 0xfe, 0xff, 0xff, 0xff, 0xff, 0xbf,
+	0xff, 0xfe, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+	0xff, 0xff, 0x7f, 0xff, 0xff,
+	0xff, 0xf7, 0xff, 0xf7, 0xcf, 0x8f, 0xff, 0xf0,
+	0xef, 0xf9, 0xfb, 0xff, 0xff, 0xff, 0x9f, 0x0f,
+	0x65, 0xe1, 0xfb, 0x7b, 0xf3,
+	0xff, 0xf7, 0xf6, 0xfe, 0xff, 0x8f, 0xf6, 0xe8,
+	0xf6, 0xf1, 0xff, 0xff, 0xff, 0xf9, 0xff, 0xff,
+	0x6f, 0x61, 0xf1, 0xfb, 0xff,
+	0xff, 0xde, 0x8f, 0x8f, 0xf0, 0xf0, 0xff, 0xff,
+	0xf7, 0xbf, 0xff, 0xd4, 0x8f, 0x0f, 0x71, 0xc1,
+	0x6f, 0xd1, 0xeb, 0x5f, 0xfd,
+	0xff, 0x9f, 0xff, 0xfb, 0xff, 0x8f, 0x9f, 0xf7,
+	0x9f, 0xff, 0xf4, 0xb7, 0xfd, 0xff, 0xfe, 0x8f,
+	0xbf, 0x71, 0x1f, 0xff, 0x7f,
+	0xff, 0xfd, 0x87, 0x87, 0xf0, 0x70, 0x1f, 0xf7,
+	0xbf, 0xff, 0xff, 0xff, 0x8f, 0x0f, 0x71, 0x81,
+	0xbf, 0x3e, 0x7f, 0x7f, 0xff,
+	0xff, 0xff, 0xff, 0xff, 0x8f, 0xff, 0x7f, 0xff,
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+	0xf1, 0xff, 0xff, 0xff, 0xff,
+	0xbf, 0xff, 0x07, 0xff, 0xf0, 0xff, 0xff, 0xff,
+	0xfe, 0xff, 0xff, 0xf7, 0x8d, 0x7f, 0xf1, 0xff,
+	0xff, 0x9f, 0x6f, 0xf1, 0xff,
+	0xbf, 0x71, 0x87, 0xfe, 0xf0, 0x8f, 0x8f, 0xf0,
+	0xfb, 0xcb, 0xff, 0xf0, 0x8f, 0x7f, 0xf1, 0x8f,
+	0x1e, 0xe1, 0x7e, 0x91, 0x7f,
+	0xbf, 0x1a, 0xff, 0x71, 0xff, 0x9f, 0x8f, 0xf6,
+	0xf8, 0xdf, 0xf7, 0xf4, 0xff, 0xff, 0xff, 0x8f,
+	0x1f, 0xf0, 0x7f, 0x97, 0xff,
+	0xbf, 0x97, 0xff, 0xfb, 0xbf, 0xdf, 0xff, 0xf7,
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xaf, 0xdf,
+	0xf9, 0xff, 0xff, 0xff, 0xff,
+	0xff, 0x7f, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+	0xff, 0xff, 0xff, 0xf7, 0xff, 0xff, 0xff, 0xff,
+	0xff, 0xdf, 0xff, 0xf1, 0xff,
+	0xff, 0x9f, 0xfc, 0xfb, 0xff, 0xf0, 0xfe, 0xff,
+	0xff, 0xff, 0x9d, 0xff, 0xf4, 0xcf, 0xff, 0x7f,
+	0xf7, 0xff, 0xff, 0xff, 0xcf,
+	0xff, 0x97, 0xff, 0xfa, 0xff, 0x8f, 0xf8, 0xf0,
+	0xff, 0xff, 0xff, 0xdf, 0xff, 0xfd, 0xff, 0x0f,
+	0x7f, 0xe1, 0xff, 0xf1, 0xff,
+	0xff, 0x83, 0x7f, 0xf8, 0xff, 0xff, 0xff, 0xff,
+	0x7f, 0x6f, 0x7f, 0x77, 0x7d, 0xff, 0xff, 0xff,
+	0xff, 0xff, 0x8f, 0x6f, 0xf1,
+	0xff, 0xd7, 0xff, 0xfe, 0xff, 0xff, 0x9f, 0xfd,
+	0x78, 0xef, 0xff, 0xbf, 0xff, 0xf5, 0xff, 0xff,
+	0xbf, 0x0f, 0x79, 0xd1, 0xff,
+	0xff, 0xd2, 0xff, 0x72, 0xff, 0xff, 0xff, 0xff,
+	0x8f, 0xfe, 0x70, 0x9d, 0xff, 0xf4, 0xff, 0xfe,
+	0xff, 0xff, 0xff, 0xbf, 0x7f,
+	0xff, 0x07, 0xff, 0x78, 0xff, 0x9f, 0xff, 0xfe,
+	0xff, 0x77, 0x7f, 0x8f, 0x7f, 0xf0, 0xff, 0x8f,
+	0x7f, 0xe1, 0x0f, 0x71, 0xf1,
+	0xff, 0xfe, 0xff, 0xfd, 0xff, 0xff, 0xff, 0xff,
+	0x7f, 0xfd, 0xff, 0xba, 0x7f, 0xff, 0xff, 0xff,
+	0xff, 0xef, 0x7f, 0xa1, 0x7f,
+	0xff, 0xbd, 0x7f, 0xf7, 0xf9, 0xfd, 0xfb, 0xff,
+	0xff, 0x8f, 0xbf, 0xb7, 0x8f, 0xaf, 0xdf, 0xff,
+	0xff, 0xff, 0xff, 0x5f, 0xeb,
+	0xbf, 0xfd, 0xf8, 0xff, 0xff, 0xfb, 0xff, 0xfb,
+	0xff, 0xf7, 0xcf, 0xfb, 0xf0, 0xff, 0xff, 0xdf,
+	0xff, 0xff, 0xef, 0x7f, 0xab,
+	0xff, 0xfd, 0xfa, 0xbf, 0x8f, 0xbf, 0xca, 0xfe,
+	0xff, 0xff, 0xdf, 0x6f, 0xd4, 0xf6, 0x0f, 0x3f,
+	0x11, 0xf9, 0xff, 0x7f, 0x8b,
+	0xbf, 0xff, 0x8f, 0xff, 0xc0, 0xfb, 0xf5, 0xef,
+	0xf7, 0x7f, 0xff, 0xff, 0xfb, 0x7f, 0xff, 0x7f,
+	0xff, 0x6f, 0xff, 0xff, 0xff,
+	0xbf, 0x87, 0xbb, 0xf8, 0xfb, 0xcf, 0xfe, 0xfe,
+	0xff, 0xef, 0xff, 0xfb, 0x7f, 0xff, 0xff, 0x8f,
+	0xff, 0xe1, 0x7f, 0x7b, 0xff,
+	0xbf, 0x80, 0x89, 0x88, 0xb0, 0xf5, 0xf0, 0xff,
+	0xf7, 0xdf, 0xfe, 0x7c, 0x8f, 0x0f, 0x71, 0xe1,
+	0xff, 0xf1, 0xe5, 0x0e, 0x2b,
+	0xff, 0xff, 0xff, 0xbf, 0xff, 0xcf, 0xf5, 0x9f,
+	0xff, 0xff, 0xfe, 0xff, 0x8f, 0x7f, 0x71, 0x8f,
+	0xff, 0x91, 0x7f, 0xfb, 0xff,
+	0xff, 0x7f, 0x7f, 0xcf, 0x8a, 0xff, 0xf0, 0xff,
+	0x57, 0xfe, 0xfb, 0x8f, 0xff, 0xf0, 0xff, 0x7e,
+	0xff, 0xff, 0x9a, 0xff, 0xf1,
+	0xff, 0xff, 0xcf, 0xb7, 0xce, 0xff, 0xf4, 0xff,
+	0xff, 0x7f, 0xf7, 0xfb, 0xff, 0xfe, 0xff, 0x7f,
+	0xff, 0xfd, 0xfe, 0x75, 0xfd,
+	0xff, 0xef, 0xcf, 0xff, 0xf5, 0xff, 0xf5, 0xff,
+	0xf7, 0xff, 0xff, 0xff, 0xff, 0x7f, 0x7f, 0xff,
+	0xcf, 0x7f, 0x31, 0x7f, 0xff,
+	0x3f, 0x78, 0xf8, 0xff, 0xff, 0xff, 0xff, 0xff,
+	0xff, 0x0f, 0x0f, 0xf1, 0xf1, 0xdf, 0xff, 0xff,
+	0xff, 0x9f, 0xff, 0x84, 0x0e,
+	0xff, 0xf8, 0x7f, 0xf7, 0x7f, 0xff, 0xff, 0x8f,
+	0x8f, 0x80, 0xf1, 0xf1, 0xff, 0xff, 0xff, 0xff,
+	0xfe, 0x9f, 0x8e, 0x05, 0x71,
+	0xbf, 0xf8, 0xf8, 0xff, 0x7f, 0xff, 0xff, 0xff,
+	0xff, 0x8f, 0x8f, 0xf1, 0xf1, 0xff, 0xff, 0xff,
+	0xfe, 0xff, 0xff, 0x8f, 0x0f,
+	0xff, 0xf8, 0x7f, 0xff, 0xff, 0xff, 0xff, 0xff,
+	0x8f, 0x8f, 0xf1, 0xf1, 0xff, 0xff, 0xff, 0xff,
+	0xff, 0xff, 0x8e, 0x0f, 0x71,
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+	0xff, 0xff, 0xff, 0xff, 0xff,
+	0xff, 0xff, 0x7f, 0xf7, 0xff, 0xff, 0x8f, 0xff,
+	0xf0, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+	0x8f, 0x7f, 0xf0, 0xff, 0xff,
+	0x7f, 0xf8, 0xff, 0xf7, 0xff, 0xff, 0xff, 0xff,
+	0xff, 0x8f, 0xff, 0xf0, 0xff, 0xff, 0xff, 0xff,
+	0xff, 0x9f, 0xff, 0x8f, 0x7e,
+	0xbf, 0xff, 0x78, 0xff, 0xff, 0xff, 0xff, 0xff,
+	0xff, 0xff, 0x8f, 0xff, 0xf0, 0xff, 0xff, 0xff,
+	0xff, 0xff, 0xfe, 0xff, 0x8f,
+	0xff, 0x87, 0x7f, 0xf8, 0xff, 0xff, 0xff, 0xff,
+	0x8f, 0xff, 0xf0, 0x8f, 0xff, 0xf0, 0xff, 0xff,
+	0xff, 0xff, 0x8e, 0x7f, 0xf1,
+	0xff, 0xf8, 0x7f, 0xff, 0xff, 0xff, 0xff, 0xff,
+	0xff, 0x8f, 0xff, 0xf0, 0xff, 0xff, 0xff, 0xff,
+	0xff, 0xff, 0xff, 0x8f, 0x7f,
+	0x3f, 0xff, 0xf8, 0xff, 0x8f, 0x7f, 0xf0, 0x8f,
+	0xff, 0xf0, 0x0f, 0xff, 0x70, 0xff, 0x8f, 0x7e,
+	0xf1, 0xdf, 0xff, 0xfb, 0x8e,
+	0xff, 0x80, 0x7f, 0xf0, 0xff, 0xff, 0xff, 0xff,
+	0xff, 0xaf, 0x7f, 0x84, 0xff, 0xf1, 0xff, 0xfe,
+	0xff, 0xff, 0xfe, 0x8f, 0x7f,
+	0xff, 0x80, 0xff, 0xf8, 0xff, 0x7f, 0xff, 0xff,
+	0x7f, 0x8f, 0xff, 0x81, 0x7f, 0xf0, 0xff, 0xff,
+	0xff, 0xff, 0xff, 0x8f, 0x7f,
+	0xff, 0x7f, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+	0x8f, 0x7f, 0xf0, 0xdf, 0xdf, 0xff, 0xdf, 0xff,
+	0xff, 0xff, 0x8f, 0x7f, 0xf1,
+	0xff, 0xfd, 0xff, 0xff, 0xff, 0x0f, 0xff, 0x80,
+	0xff, 0xf0, 0xff, 0xff, 0xdf, 0xff, 0xdf, 0x8e,
+	0x0f, 0x01, 0x71, 0xf1, 0xff,
+	0xff, 0xff, 0xff, 0xff, 0xff, 0x7f, 0xff, 0xff,
+	0xff, 0xff, 0xff, 0xff, 0xdf, 0xff, 0xdf, 0xff,
+	0xff, 0xff, 0xff, 0xff, 0xfe,
+	0xbf, 0x87, 0xf8, 0xf8, 0xff, 0xff, 0xff, 0xff,
+	0x7f, 0xff, 0x8f, 0x8f, 0xd0, 0xf0, 0xdf, 0xfe,
+	0xff, 0xff, 0xff, 0xff, 0x8f,
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xfd,
+	0xff, 0x7f, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+	0xff, 0xff, 0x7f, 0xff, 0xff,
+	0xff, 0x7f, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xfe,
+	0xff, 0xff, 0xff, 0xff, 0xff,
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xfd,
+	0xff, 0xff, 0xff, 0xff, 0x7f, 0xff, 0xff, 0xfe,
+	0xff, 0xdf, 0xff, 0xfb, 0xff,
+	0xff, 0xff, 0x7f, 0xff, 0xff, 0xff, 0xff, 0xfd,
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+	0xaf, 0xfe, 0xf5, 0xff, 0xff,
+	0xff, 0xff, 0x0f, 0x8f, 0xf0, 0x80, 0xff, 0xf0,
+	0xff, 0xff, 0xff, 0xff, 0x1f, 0xaf, 0x71, 0xa7,
+	0x6f, 0xf5, 0xfe, 0xff, 0xff,
+	0xff, 0x77, 0x79, 0x8f, 0xff, 0xf0, 0x8f, 0xff,
+	0x00, 0xff, 0xd0, 0x4f, 0x3d, 0xf0, 0xf7, 0xfd,
+	0x8f, 0x7f, 0x81, 0x7f, 0xd1,
+	0xff, 0xcd, 0xff, 0xff, 0x8f, 0x0f, 0x70, 0xf0,
+	0xff, 0x7f, 0x7f, 0xff, 0xff, 0xdb, 0x8d, 0x4b,
+	0x73, 0xf9, 0xff, 0xdf, 0xff,
+	0x3f, 0xfc, 0xff, 0x8f, 0xff, 0xf2, 0x8f, 0x8f,
+	0x70, 0x7a, 0x3f, 0xbc, 0xf7, 0xdb, 0xff, 0xf9,
+	0xff, 0xff, 0xff, 0xff, 0xee,
+	0xff, 0xe8, 0xf7, 0x8f, 0xfd, 0x80, 0xff, 0xf0,
+	0x9f, 0xa5, 0x7a, 0xf4, 0x6f, 0x3f, 0xcf, 0x07,
+	0x6a, 0xe1, 0xff, 0x8f, 0x7f,
+	0xff, 0xff, 0x77, 0xf1, 0x8f, 0x8f, 0xf0, 0xf0,
+	0xbf, 0xff, 0xe7, 0x7f, 0x8f, 0x24, 0x03, 0x77,
+	0xf3, 0xff, 0xfe, 0xff, 0xff,
+	0xbf, 0x9f, 0x77, 0x8b, 0xff, 0xf0, 0xff, 0xef,
+	0x7d, 0x7f, 0xff, 0x9f, 0xeb, 0x3d, 0xff, 0xf7,
+	0xff, 0xfb, 0xfe, 0xff, 0xdf,
+	0xff, 0xff, 0x77, 0xff, 0x8f, 0x8f, 0xf0, 0xf0,
+	0x7f, 0xff, 0xff, 0xff, 0xff, 0xff, 0xbb, 0x5d,
+	0xf5, 0xbb, 0xef, 0xff, 0xff,
+	0xff, 0x7f, 0x8f, 0x8f, 0xf0, 0xf8, 0xff, 0xff,
+	0xf7, 0x7f, 0xff, 0xff, 0xaf, 0xbf, 0x75, 0xb7,
+	0xff, 0xf7, 0xff, 0xff, 0xff,
+	0xff, 0x7f, 0x87, 0x7f, 0xf8, 0xff, 0xf7, 0xf7,
+	0x8f, 0xff, 0xf0, 0x7f, 0xf7, 0xff, 0xad, 0xff,
+	0xf7, 0xee, 0x9f, 0xff, 0xf5,
+	0xff, 0xf8, 0x07, 0xff, 0x80, 0x8f, 0x80, 0x80,
+	0xf0, 0x8f, 0x7f, 0x70, 0x4f, 0x0f, 0x79, 0xf1,
+	0xfd, 0xff, 0xef, 0x8f, 0x7f,
+	0xbf, 0x7f, 0xf8, 0xff, 0xff, 0xff, 0xff, 0xff,
+	0xff, 0xff, 0x8f, 0xff, 0xd0, 0xbf, 0xdb, 0xe5,
+	0x3b, 0xfe, 0xf7, 0xff, 0x8f,
+	0xff, 0xff, 0x8f, 0x77, 0x80, 0xff, 0xf0, 0xff,
+	0xff, 0x7f, 0xff, 0xff, 0xbd, 0xef, 0x07, 0x7f,
+	0xf1, 0xfe, 0xff, 0xfe, 0xff,
+	0x7f, 0x7f, 0xff, 0xf7, 0xf7, 0xff, 0xf7, 0x8f,
+	0xbf, 0x70, 0xf5, 0x7f, 0xff, 0xef, 0x3f, 0x7d,
+	0xf7, 0xff, 0xff, 0xfe, 0xfe,
+	0xff, 0x97, 0xff, 0x7f, 0xff, 0xff, 0xff, 0xff,
+	0x7e, 0xff, 0xff, 0x9f, 0xdf, 0xf7, 0x3b, 0xff,
+	0xf7, 0xff, 0x7f, 0xfe, 0xff,
+	0x3f, 0x78, 0xf8, 0xff, 0xff, 0xff, 0xff, 0xff,
+	0xff, 0x1f, 0x1f, 0xf1, 0xf1, 0xff, 0xff, 0xff,
+	0xff, 0xff, 0xff, 0x80, 0x0e,
+	0xff, 0xf8, 0x7f, 0xff, 0x7f, 0xff, 0xff, 0x8f,
+	0x9f, 0x80, 0xe1, 0xf1, 0xff, 0xff, 0xef, 0xff,
+	0xfe, 0x9f, 0x0e, 0x01, 0x71,
+	0xbf, 0xf8, 0xf8, 0xff, 0x7f, 0xff, 0xff, 0xff,
+	0xff, 0x8f, 0x8f, 0xf1, 0xf1, 0xff, 0xff, 0xef,
+	0xfe, 0xef, 0xff, 0x8f, 0x0f,
+	0xff, 0xf8, 0x7f, 0xff, 0xff, 0xff, 0xff, 0xff,
+	0x9f, 0x8f, 0xf1, 0xf1, 0xff, 0xff, 0xff, 0xff,
+	0xff, 0xff, 0x8e, 0x0f, 0x71,
+	0xff, 0xf7, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+	0xff, 0xff, 0xef, 0xff, 0xff, 0xef, 0xfe, 0xef,
+	0xef, 0xff, 0xff, 0xef, 0xff,
+	0xff, 0xf7, 0x7f, 0xff, 0xff, 0xff, 0x8f, 0xff,
+	0xf0, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+	0x8f, 0x7f, 0xe0, 0xff, 0xff,
+	0x7f, 0xf0, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+	0xff, 0x8f, 0xff, 0xf0, 0xff, 0xff, 0xff, 0xff,
+	0xff, 0xff, 0xff, 0x8f, 0x7e,
+	0xbf, 0xff, 0x78, 0xff, 0xff, 0xff, 0xff, 0xff,
+	0xff, 0xff, 0x8f, 0xff, 0xf0, 0xef, 0xff, 0xff,
+	0xff, 0xff, 0xee, 0xef, 0x9f,
+	0xff, 0x07, 0xff, 0xf8, 0xff, 0xff, 0xff, 0xff,
+	0x8f, 0xff, 0xf0, 0x8f, 0xff, 0xe0, 0xff, 0xff,
+	0xff, 0xef, 0x8e, 0x7f, 0xf1,
+	0xff, 0xf8, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+	0xff, 0x8f, 0xff, 0xf0, 0xff, 0xff, 0xff, 0xff,
+	0xef, 0xff, 0xfe, 0x8f, 0x7f,
+	0x3f, 0xff, 0xf8, 0xff, 0x8f, 0x7f, 0xf0, 0xdf,
+	0xff, 0xf0, 0x0f, 0xff, 0x70, 0xff, 0x8f, 0x7e,
+	0xe1, 0xdf, 0xff, 0xf7, 0x8e,
+	0xff, 0x80, 0x7f, 0xf8, 0xff, 0x7f, 0xff, 0xff,
+	0xff, 0x8f, 0x7f, 0x80, 0xff, 0xf1, 0xff, 0xff,
+	0xff, 0xef, 0xfe, 0x8f, 0x7f,
+	0xff, 0x80, 0xff, 0xf8, 0xff, 0xff, 0xff, 0xff,
+	0x7f, 0x8f, 0xff, 0x81, 0x7f, 0xf0, 0xff, 0xfe,
+	0xff, 0xff, 0xff, 0x8f, 0x7f,
+	0xff, 0x7f, 0xff, 0xf7, 0xff, 0xff, 0xff, 0xff,
+	0x1f, 0x7f, 0xf0, 0xff, 0xff, 0xff, 0xff, 0xff,
+	0xff, 0xff, 0x8f, 0x7e, 0xf1,
+	0xff, 0xff, 0xff, 0xf7, 0xff, 0x0f, 0x8f, 0x80,
+	0xf7, 0xe0, 0xff, 0xff, 0xff, 0xff, 0xff, 0x9e,
+	0x6f, 0x91, 0x71, 0xf1, 0xff,
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+	0xff, 0xef, 0xff, 0xff, 0xff, 0xff, 0xff, 0xfe,
+	0xff, 0xff, 0xef, 0xff, 0xff,
+	0xbf, 0x87, 0xf8, 0xf8, 0xff, 0x7f, 0xff, 0xff,
+	0xff, 0xff, 0x8f, 0x8f, 0xf0, 0xf0, 0xff, 0xff,
+	0xff, 0xff, 0xff, 0xdf, 0x8f,
+	0xff, 0xef, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+	0x7f, 0xff, 0xff, 0xff, 0xff, 0xff, 0xef, 0xff,
+	0xff, 0xff, 0xff, 0xff, 0xff,
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xef, 0xfe,
+	0xff, 0xff, 0xff, 0xff, 0xff,
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xef, 0xfe,
+	0xff, 0xef, 0xff, 0xd7, 0xff,
+	0xff, 0xff, 0xff, 0x7f, 0xff, 0xff, 0x8f, 0xff,
+	0xf7, 0xff, 0xff, 0xff, 0xff, 0xff, 0xef, 0xff,
+	0xff, 0xfe, 0xf9, 0xdf, 0xff,
+	0xff, 0xff, 0x8f, 0xbf, 0xf7, 0x9f, 0xf8, 0xf0,
+	0xff, 0xff, 0x77, 0xff, 0x0e, 0x1f, 0x61, 0x81,
+	0x7f, 0xf1, 0xfe, 0xff, 0xff,
+	0xff, 0x7f, 0xb9, 0xcf, 0xff, 0xff, 0x0f, 0xff,
+	0x00, 0xff, 0xd0, 0x7f, 0x75, 0x8b, 0x7f, 0xf1,
+	0x8f, 0x7f, 0x80, 0x7e, 0x91,
+	0xff, 0xbf, 0xdf, 0xff, 0xa7, 0x47, 0x70, 0xf7,
+	0xff, 0xff, 0x7f, 0xff, 0xff, 0xff, 0x8f, 0x0f,
+	0x61, 0xf1, 0xef, 0xff, 0xff,
+	0x7f, 0xfe, 0xef, 0x5f, 0xf7, 0xff, 0xff, 0xff,
+	0xff, 0xe7, 0xb7, 0xfc, 0xeb, 0x9f, 0x7f, 0xf1,
+	0x9f, 0x0f, 0x71, 0xf1, 0xee,
+	0xff, 0xf0, 0xf7, 0x3f, 0xef, 0x97, 0xf8, 0xe8,
+	0xff, 0x9f, 0x7f, 0xf0, 0x7f, 0x9f, 0x6f, 0x91,
+	0x7e, 0xf1, 0x9f, 0x8f, 0x57,
+	0xff, 0xff, 0x26, 0xb9, 0xb8, 0xff, 0xf0, 0xff,
+	0xff, 0xff, 0xf7, 0x7f, 0x6f, 0xf4, 0x9f, 0x1f,
+	0x71, 0xe1, 0xfe, 0x7f, 0xff,
+	0xbf, 0xff, 0x71, 0xbb, 0xe8, 0xff, 0xff, 0xf8,
+	0xbf, 0xff, 0xaf, 0xff, 0xf8, 0x9d, 0x6f, 0xf1,
+	0xbf, 0xff, 0xb7, 0xff, 0xbd,
+	0xbf, 0xff, 0xff, 0xdf, 0x97, 0xc7, 0xf7, 0xf0,
+	0xff, 0xff, 0x93, 0xff, 0xff, 0xef, 0xcf, 0x5f,
+	0xf1, 0xf7, 0xdf, 0xf5, 0x9f,
+	0xff, 0xff, 0x87, 0xbf, 0xe0, 0xbf, 0xf7, 0xff,
+	0xf7, 0x7f, 0xff, 0xff, 0x8f, 0x5f, 0x21, 0xb1,
+	0xff, 0x6d, 0xff, 0xef, 0xff,
+	0xff, 0xff, 0xd7, 0xff, 0xb8, 0xff, 0xff, 0xff,
+	0x3f, 0xef, 0xf0, 0x7f, 0xd7, 0x7f, 0xf1, 0xff,
+	0xef, 0xee, 0xbf, 0x7f, 0xf1,
+	0xff, 0xf8, 0x47, 0x0f, 0xc7, 0xf0, 0x7f, 0xf0,
+	0xf0, 0x90, 0x7f, 0x70, 0x8f, 0x2f, 0xc1, 0x0f,
+	0x11, 0x1f, 0xef, 0xaf, 0x7f,
+	0xbf, 0x7f, 0xf0, 0x9f, 0xe7, 0xf7, 0x38, 0xff,
+	0xff, 0xff, 0x8f, 0x7f, 0xf0, 0xaf, 0xff, 0xff,
+	0xbf, 0xfe, 0xfd, 0xdf, 0x8f,
+	0xff, 0xff, 0xbf, 0xf7, 0x8f, 0xff, 0xf7, 0xff,
+	0xeb, 0xff, 0xff, 0xff, 0x8d, 0x3f, 0x81, 0x7f,
+	0xd1, 0xfe, 0xdf, 0xfe, 0xff,
+	0x7f, 0xff, 0xff, 0xdf, 0xa8, 0xff, 0xf0, 0xff,
+	0xff, 0xf0, 0xf7, 0xff, 0xff, 0xff, 0xef, 0xef,
+	0xef, 0x9f, 0x7f, 0x7e, 0xfe,
+	0xff, 0xff, 0xef, 0xff, 0xa7, 0x77, 0xff, 0xff,
+	0xef, 0xff, 0xff, 0xdf, 0xff, 0xe7, 0xff, 0xff,
+	0xff, 0xff, 0xff, 0xfe, 0xff,
+	0x3f, 0x78, 0xf8, 0xff, 0xff, 0xff, 0xff, 0xbf,
+	0xff, 0x0f, 0x0f, 0xf1, 0xe1, 0xff, 0xff, 0xef,
+	0xef, 0xff, 0xff, 0x8e, 0x0e,
+	0xff, 0xf8, 0x7f, 0xff, 0x7f, 0xff, 0xff, 0x8f,
+	0x8f, 0x80, 0xf1, 0xf1, 0xef, 0xaf, 0xaf, 0xff,
+	0xee, 0xdf, 0x0e, 0x01, 0x71,
+	0xbf, 0xf8, 0xf8, 0xff, 0x7f, 0xff, 0xff, 0xff,
+	0xef, 0x8f, 0x9f, 0xf1, 0xe1, 0xff, 0xaf, 0xef,
+	0xfe, 0xff, 0xff, 0x8f, 0x0f,
+	0xff, 0xf8, 0x7f, 0xff, 0xff, 0xff, 0xff, 0xff,
+	0x9f, 0x9f, 0xf1, 0xf1, 0xef, 0xff, 0xaf, 0xff,
+	0xff, 0xff, 0x8e, 0x0f, 0x71,
+	0xff, 0xf7, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+	0xff, 0xff, 0xff, 0xff, 0xef, 0xbf, 0xef, 0xff,
+	0xef, 0xbf, 0xff, 0xef, 0xff,
+	0xff, 0xf7, 0x7f, 0xff, 0xff, 0xff, 0x8f, 0xff,
+	0xf0, 0xff, 0xff, 0xff, 0xef, 0xff, 0xef, 0xfe,
+	0xcf, 0x3f, 0xf0, 0xff, 0xff,
+	0x7f, 0xf0, 0xff, 0xff, 0xff, 0xff, 0xff, 0xbf,
+	0xff, 0x88, 0xff, 0xf0, 0xff, 0xff, 0xef, 0xfe,
+	0xff, 0xff, 0xff, 0x8f, 0x6e,
+	0xbf, 0xff, 0x78, 0xff, 0xff, 0xff, 0xff, 0xff,
+	0xff, 0xff, 0x8f, 0xff, 0xe0, 0xff, 0xef, 0xff,
+	0xff, 0xff, 0xee, 0xef, 0x9f,
+	0xff, 0x8f, 0x7f, 0xf8, 0xff, 0xff, 0xff, 0xff,
+	0x8f, 0xff, 0xf0, 0x8f, 0xff, 0xa0, 0xff, 0xfe,
+	0xff, 0xbf, 0x8e, 0x6f, 0xf1,
+	0xff, 0xf8, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+	0xff, 0x8f, 0xff, 0xf0, 0xff, 0xff, 0xff, 0xff,
+	0xff, 0xff, 0xff, 0x8f, 0x6f,
+	0x3f, 0xff, 0xf8, 0xff, 0x8f, 0x7f, 0xf0, 0xcf,
+	0xff, 0xb0, 0x0f, 0xaf, 0x70, 0xff, 0x8f, 0x7e,
+	0xf1, 0xff, 0xff, 0xf1, 0x9e,
+	0xff, 0x80, 0x7f, 0xf8, 0xff, 0x7f, 0xff, 0xff,
+	0xef, 0x8f, 0x7f, 0x90, 0xff, 0xf1, 0xff, 0xff,
+	0xff, 0xaf, 0xfe, 0x8f, 0x7f,
+	0xff, 0x80, 0xff, 0xf8, 0xff, 0xff, 0xff, 0xff,
+	0x3f, 0xdf, 0xff, 0x81, 0x7f, 0xf0, 0xff, 0xfe,
+	0xff, 0xff, 0xff, 0x8f, 0x7f,
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+	0x9f, 0x7f, 0xf0, 0xff, 0xff, 0xff, 0xff, 0xff,
+	0xff, 0xff, 0xbf, 0x7e, 0xf1,
+	0xff, 0xff, 0x7f, 0xff, 0xff, 0x0f, 0xaf, 0x80,
+	0xf0, 0xf0, 0xff, 0xff, 0xff, 0xff, 0xff, 0xde,
+	0x0f, 0x91, 0x7f, 0xf1, 0xff,
+	0x7f, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+	0x7f, 0xff, 0xff, 0xff, 0xff, 0xf3, 0xff, 0xfe,
+	0xff, 0xff, 0xbf, 0xff, 0xfb,
+	0xbf, 0x87, 0xf8, 0xf8, 0xff, 0x7f, 0xff, 0xff,
+	0xff, 0xdf, 0x8f, 0x8f, 0xf0, 0xf0, 0xff, 0xff,
+	0xff, 0xff, 0xff, 0xff, 0x8f,
+	0xff, 0x7f, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+	0x7f, 0xff, 0xff, 0xdf, 0xbf, 0xff, 0xef, 0xff,
+	0xff, 0xaf, 0xff, 0xff, 0xff,
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xbf, 0xfe,
+	0xff, 0xff, 0xff, 0xff, 0xff,
+	0x7f, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+	0xff, 0xdf, 0xff, 0xff, 0xbf, 0xff, 0xff, 0xfe,
+	0xff, 0xff, 0xff, 0xff, 0xff,
+	0xff, 0xff, 0xff, 0xff, 0x7f, 0xff, 0xaf, 0xff,
+	0xf0, 0xdf, 0xff, 0xff, 0xff, 0xff, 0xbf, 0xff,
+	0xdf, 0xfe, 0xfe, 0xff, 0xff,
+	0xff, 0xff, 0x0f, 0x8f, 0xf0, 0x8f, 0xff, 0xf0,
+	0xf9, 0xff, 0xf7, 0xff, 0x0f, 0x5f, 0x29, 0x89,
+	0x77, 0xf1, 0xfa, 0xff, 0xde,
+	0xff, 0xc3, 0x3f, 0x4b, 0x7f, 0xe9, 0x0f, 0xff,
+	0x00, 0xff, 0x90, 0x0f, 0xd7, 0xff, 0x7f, 0xf9,
+	0x8f, 0x7f, 0x81, 0x7f, 0x81,
+	0xff, 0xff, 0xfb, 0x7d, 0x80, 0x46, 0x76, 0xf0,
+	0xff, 0xff, 0x6f, 0xff, 0xff, 0xad, 0xcf, 0x3f,
+	0x71, 0xf9, 0xff, 0xff, 0xff,
+	0x3f, 0xba, 0xff, 0xc7, 0xf7, 0xb9, 0xcf, 0xde,
+	0x77, 0xb7, 0x77, 0xfe, 0xff, 0xbf, 0x6f, 0xf9,
+	0xff, 0x7e, 0x79, 0xb9, 0xfe,
+	0xff, 0xe4, 0xf7, 0x8f, 0xfe, 0x07, 0xfe, 0xf8,
+	0xff, 0x89, 0x7f, 0xe8, 0x7f, 0xd7, 0x7f, 0x99,
+	0x76, 0xf1, 0xff, 0x0f, 0x7b,
+	0xbf, 0xff, 0xb6, 0xb9, 0x8f, 0xdf, 0xf6, 0xff,
+	0xff, 0xf7, 0xff, 0xff, 0x8f, 0xdd, 0x87, 0x7f,
+	0x71, 0xf1, 0xfe, 0xff, 0xff,
+	0xff, 0x7f, 0xf1, 0x8a, 0xff, 0xff, 0xff, 0xff,
+	0xbf, 0xff, 0xcf, 0xfb, 0xe8, 0x9d, 0x77, 0xa9,
+	0xff, 0x77, 0xda, 0x7f, 0xff,
+	0xbf, 0xff, 0xf7, 0xf7, 0x86, 0xe5, 0xf0, 0xe0,
+	0xff, 0xff, 0xbf, 0xff, 0xff, 0xef, 0x8f, 0x7f,
+	0xbd, 0xff, 0xff, 0xff, 0x8f,
+	0xff, 0xef, 0x86, 0x8f, 0xf0, 0xff, 0xf6, 0x9f,
+	0xff, 0x7f, 0xff, 0xff, 0xcf, 0x1f, 0x71, 0xdd,
+	0x7f, 0xe1, 0xff, 0xff, 0xff,
+	0xff, 0xff, 0xc7, 0xf7, 0xb9, 0xff, 0xff, 0xfa,
+	0x3f, 0xef, 0xf0, 0xff, 0xef, 0x7f, 0xd5, 0xff,
+	0xfb, 0xff, 0xf7, 0x6e, 0xf1,
+	0xff, 0xfc, 0xc7, 0xbf, 0xc8, 0xc0, 0x59, 0xff,
+	0xdf, 0xff, 0x7b, 0xf0, 0xa7, 0x1f, 0xa9, 0x77,
+	0x79, 0x71, 0x11, 0xff, 0x79,
+	0xbf, 0xfb, 0x70, 0xbf, 0xff, 0xf9, 0x37, 0xbe,
+	0xff, 0xff, 0x8f, 0x7f, 0xf4, 0x9f, 0xff, 0xff,
+	0xd7, 0x7f, 0xff, 0xff, 0xaf,
+	0xff, 0xff, 0x9e, 0xf7, 0x9f, 0xfe, 0xe4, 0xff,
+	0xcf, 0xcf, 0xff, 0xff, 0xdf, 0x7f, 0x8d, 0x7f,
+	0xf9, 0xfa, 0xdf, 0x9f, 0xef,
+	0x7f, 0xef, 0xff, 0xff, 0xbe, 0xfd, 0xd2, 0xdf,
+	0xff, 0x7e, 0xf7, 0xff, 0xff, 0xab, 0x97, 0xef,
+	0xf3, 0xfe, 0x7f, 0x71, 0xfe,
+	0xff, 0x9f, 0xff, 0xff, 0xb6, 0xfb, 0xf7, 0xff,
+	0xff, 0xf7, 0xff, 0xbf, 0xff, 0xb7, 0xdb, 0xff,
+	0xbb, 0xef, 0xff, 0xff, 0xff,
+	0x3f, 0x68, 0xfe, 0xfd, 0xfb, 0xff, 0xff, 0xef,
+	0xf1, 0x1e, 0x1b, 0xf1, 0xf5, 0xff, 0xff, 0xff,
+	0xff, 0x9f, 0xfb, 0x9a, 0x36,
+	0xff, 0xfc, 0x7d, 0xff, 0x73, 0xf7, 0xff, 0xaf,
+	0x9f, 0x94, 0xfd, 0xf5, 0xff, 0xf7, 0xff, 0xfb,
+	0xfe, 0xef, 0x3e, 0x07, 0x4d,
+	0xbf, 0xe8, 0xf8, 0xff, 0x7f, 0xff, 0xf7, 0xf7,
+	0xf1, 0x8f, 0xaf, 0xd1, 0xf7, 0xf9, 0xfd, 0xff,
+	0xf8, 0xdf, 0xfb, 0x8f, 0x2f,
+	0xff, 0xf8, 0x7f, 0xff, 0xf7, 0xf7, 0xff, 0xff,
+	0xa7, 0xaf, 0xf7, 0xf3, 0xdf, 0xff, 0xfd, 0xff,
+	0xfd, 0xff, 0xae, 0x0f, 0x71,
+	0xff, 0xff, 0xff, 0xf9, 0xff, 0xff, 0xf3, 0xf3,
+	0xff, 0xf3, 0xff, 0xf7, 0xfb, 0xf3, 0xff, 0xff,
+	0xff, 0xeb, 0xff, 0xf3, 0xdb,
+	0xff, 0xeb, 0x7b, 0xfb, 0xf7, 0xff, 0x8b, 0xf7,
+	0xfc, 0xf7, 0xfb, 0xff, 0xfb, 0xf3, 0xff, 0xff,
+	0x8b, 0x7f, 0xd4, 0xfb, 0xff,
+	0x7f, 0xec, 0xff, 0xff, 0xff, 0xff, 0xf7, 0xf7,
+	0xff, 0x8e, 0xff, 0xf8, 0xf7, 0xfb, 0xfd, 0xff,
+	0xfd, 0x9f, 0xf7, 0x9f, 0x7e,
+	0xbf, 0xfb, 0x7c, 0xff, 0xf7, 0xff, 0xff, 0xfb,
+	0xfb, 0xf1, 0x8f, 0xf3, 0xdc, 0xf7, 0xfd, 0xff,
+	0xe9, 0xeb, 0xef, 0xc3, 0xb7,
+	0xff, 0x07, 0xff, 0xfc, 0xff, 0xff, 0xff, 0xf7,
+	0x8f, 0xff, 0xf4, 0x8f, 0xfb, 0xfc, 0xff, 0xef,
+	0xff, 0xf7, 0x8f, 0x7f, 0xd1,
+	0xff, 0xfa, 0xff, 0xfb, 0xff, 0xff, 0xff, 0xff,
+	0xf3, 0x89, 0xef, 0xf8, 0xff, 0xf7, 0xff, 0xef,
+	0xef, 0xf7, 0xf3, 0xab, 0x7f,
+	0x3f, 0xf9, 0x7e, 0xf9, 0x8f, 0x7f, 0xf0, 0xef,
+	0xff, 0xfc, 0x1b, 0xff, 0x7c, 0xff, 0x8f, 0x6e,
+	0xf1, 0xf7, 0x73, 0xff, 0xa6,
+	0xff, 0x80, 0x7f, 0xf8, 0xff, 0x7f, 0xff, 0xff,
+	0xf9, 0x8f, 0x7f, 0x84, 0xff, 0xf1, 0xff, 0xff,
+	0xff, 0xff, 0xfa, 0x8f, 0x7f,
+	0xff, 0x96, 0xff, 0xfc, 0xff, 0xff, 0xff, 0xff,
+	0x57, 0xaf, 0xfb, 0x85, 0x7f, 0xf4, 0xff, 0xfe,
+	0xef, 0xff, 0xef, 0xbf, 0x53,
+	0xff, 0x7d, 0xff, 0xff, 0xe3, 0xff, 0xff, 0xff,
+	0x97, 0x71, 0xf8, 0xff, 0xff, 0xff, 0xdb, 0xef,
+	0xef, 0xe7, 0x97, 0x72, 0xfd,
+	0xff, 0xff, 0xff, 0xff, 0xf3, 0x0f, 0xe3, 0x86,
+	0xf0, 0xf4, 0xfb, 0xff, 0xdf, 0xff, 0xfb, 0x8e,
+	0x0b, 0xa5, 0x72, 0xf9, 0xff,
+	0xff, 0xfb, 0xff, 0xff, 0xf7, 0xff, 0xf3, 0xff,
+	0xf7, 0xff, 0xf3, 0xff, 0xff, 0xff, 0xfb, 0xee,
+	0xfb, 0xff, 0xef, 0xff, 0xff,
+	0xbf, 0x82, 0xf8, 0xf8, 0xf7, 0x7f, 0xf7, 0xff,
+	0xff, 0xef, 0x87, 0x87, 0xf0, 0xf0, 0xfb, 0xff,
+	0xfb, 0xf7, 0xef, 0xef, 0x87,
+	0xff, 0xf6, 0xff, 0xfa, 0xf1, 0xef, 0xf3, 0xf7,
+	0x7f, 0xff, 0xff, 0xef, 0xff, 0xf7, 0xff, 0xff,
+	0xfb, 0xf7, 0xff, 0xfe, 0xff,
+	0xff, 0xf7, 0xfb, 0xf2, 0xf3, 0xff, 0xf1, 0xf7,
+	0xff, 0xef, 0xf7, 0xef, 0xf7, 0xf7, 0xff, 0xfe,
+	0xff, 0xff, 0xef, 0xff, 0xe7,
+	0xff, 0xfb, 0xfb, 0xff, 0xf5, 0xef, 0xf7, 0xff,
+	0xff, 0xff, 0xff, 0xf7, 0x77, 0xff, 0xff, 0xfe,
+	0xff, 0xf7, 0xff, 0xef, 0xef,
+	0xff, 0xff, 0xff, 0xff, 0xf7, 0xef, 0xe5, 0xff,
+	0xfe, 0x61, 0xf7, 0xff, 0xff, 0xff, 0xff, 0xff,
+	0x9f, 0xef, 0xef, 0xf3, 0xf7,
+	0xff, 0xff, 0x0f, 0x9f, 0xfa, 0x87, 0xff, 0xf6,
+	0xeb, 0xff, 0xff, 0xef, 0x0f, 0x6f, 0xfd, 0x0d,
+	0x53, 0xf1, 0xf3, 0xff, 0xff,
+	0xbf, 0x1b, 0x7f, 0x96, 0xfe, 0xff, 0x8f, 0xfb,
+	0x00, 0xff, 0xb0, 0x17, 0x7c, 0x8f, 0xff, 0xfd,
+	0x8f, 0x7f, 0x81, 0x7e, 0xf1,
+	0xff, 0xfd, 0xed, 0xee, 0x9e, 0x0b, 0x79, 0xff,
+	0xfb, 0x77, 0x5b, 0xff, 0x9f, 0xff, 0x4f, 0x0f,
+	0x71, 0xf0, 0xdb, 0xff, 0xf7,
+	0x7f, 0xe7, 0xef, 0x18, 0xff, 0xff, 0x9d, 0x8e,
+	0x67, 0xbf, 0x4f, 0xff, 0xff, 0xae, 0xff, 0xf1,
+	0xeb, 0xef, 0xfd, 0xad, 0xf6,
+	0xff, 0xfc, 0xf7, 0x1f, 0xff, 0x9f, 0xfb, 0xfc,
+	0xff, 0x8f, 0x77, 0xec, 0x5f, 0x6f, 0xdf, 0x25,
+	0x7e, 0xd9, 0xe6, 0x97, 0x3f,
+	0xff, 0xf7, 0x67, 0xec, 0x92, 0xbe, 0xf1, 0xfb,
+	0xff, 0x7f, 0xdf, 0x7b, 0x5e, 0x7d, 0xe7, 0x5f,
+	0xf1, 0xf1, 0xfb, 0xff, 0xf7,
+	0xbf, 0xf7, 0x71, 0x9a, 0xfd, 0xff, 0xf7, 0xfb,
+	0x5f, 0x7f, 0xaf, 0xdf, 0xf9, 0xe7, 0x77, 0xdd,
+	0x6f, 0xf7, 0xbb, 0xff, 0x8b,
+	0xbf, 0xff, 0x77, 0xff, 0x93, 0xfe, 0xf8, 0xfe,
+	0xbf, 0xfe, 0xbf, 0xff, 0xff, 0xbf, 0xab, 0x7f,
+	0xfd, 0xff, 0xcf, 0x67, 0xff,
+	0xff, 0x7f, 0x07, 0x9f, 0xe4, 0xdb, 0xff, 0xf1,
+	0xf7, 0x7f, 0xff, 0xff, 0x8f, 0x6f, 0xd1, 0x6d,
+	0x73, 0xff, 0xff, 0xfb, 0xff,
+	0xff, 0x6f, 0x9f, 0x7b, 0xfd, 0xff, 0xf6, 0xfd,
+	0x27, 0xff, 0xfc, 0xff, 0xaf, 0xff, 0xfd, 0xfe,
+	0x7f, 0xdf, 0xff, 0x7f, 0xef,
+	0xff, 0xfe, 0x81, 0xe7, 0x93, 0x91, 0x83, 0x85,
+	0xef, 0x8f, 0x7f, 0x74, 0x8d, 0x1b, 0x2d, 0xe2,
+	0xcd, 0xe5, 0xb5, 0x9f, 0x77,
+	0xbf, 0x7f, 0xe4, 0xef, 0xff, 0xf7, 0xdb, 0xfd,
+	0x7f, 0xfe, 0xab, 0x7f, 0xfc, 0xbf, 0xff, 0xde,
+	0x77, 0xfb, 0xdf, 0xef, 0xbf,
+	0xff, 0xff, 0x1e, 0x7f, 0x8f, 0xff, 0x92, 0xf3,
+	0xdf, 0x7b, 0xff, 0x7b, 0xff, 0xdb, 0x3d, 0x5f,
+	0xf9, 0xf6, 0xff, 0xf2, 0xf7,
+	0x7f, 0x7f, 0xff, 0xff, 0xef, 0xd2, 0xf0, 0xb7,
+	0xfb, 0x7f, 0xfc, 0x77, 0xd7, 0x3f, 0xc7, 0x7f,
+	0xf3, 0xe7, 0xff, 0xfd, 0xfe,
+	0xff, 0xff, 0xef, 0x7b, 0xef, 0xf5, 0xda, 0xff,
+	0x7c, 0xff, 0xff, 0xff, 0xff, 0x7b, 0xeb, 0xfb,
+	0xef, 0xff, 0xef, 0xff, 0xff,
+	0x3f, 0x60, 0xfc, 0xfb, 0xf7, 0xff, 0xff, 0xff,
+	0xfb, 0x00, 0x0f, 0xf1, 0xf5, 0xfb, 0xff, 0xff,
+	0xff, 0xff, 0xf3, 0x86, 0x3e,
+	0xff, 0xf8, 0x7f, 0xfb, 0x73, 0xff, 0xff, 0x9f,
+	0xab, 0x8c, 0xf5, 0xd1, 0xff, 0xfb, 0xff, 0xff,
+	0xfe, 0xeb, 0x36, 0x0d, 0x49,
+	0xbf, 0xf0, 0xfc, 0xfb, 0x73, 0xff, 0xf3, 0xff,
+	0xff, 0xab, 0xa7, 0xf1, 0xf9, 0xff, 0xf7, 0xdf,
+	0xfa, 0xfb, 0xff, 0xa7, 0x3f,
+	0xff, 0xf8, 0x7f, 0xff, 0xfb, 0xfb, 0xfb, 0xff,
+	0xaf, 0x8f, 0xf9, 0xf9, 0xdf, 0xdf, 0xf7, 0xdb,
+	0xff, 0xff, 0xba, 0x2f, 0x69,
+	0xff, 0xe7, 0xfb, 0xfb, 0xff, 0xff, 0xff, 0xfb,
+	0xff, 0xfb, 0xd7, 0xff, 0xdf, 0xf7, 0xd7, 0xdf,
+	0xf3, 0xdb, 0xff, 0xdb, 0xff,
+	0xff, 0xe3, 0x7b, 0xf9, 0xfb, 0xff, 0x8f, 0xfb,
+	0xf8, 0xff, 0xff, 0xef, 0xdf, 0xf3, 0xd7, 0xdf,
+	0xa3, 0x5b, 0xc4, 0xfb, 0xef,
+	0x7f, 0xe0, 0xfd, 0xfb, 0xfb, 0xff, 0xfb, 0xeb,
+	0xff, 0x8c, 0xeb, 0xf0, 0xd3, 0xff, 0xd7, 0xff,
+	0xf7, 0xbb, 0x7f, 0x8f, 0x7e,
+	0xbf, 0xfb, 0x6c, 0xfb, 0xfb, 0xff, 0xfb, 0xff,
+	0xfb, 0xf3, 0x8b, 0xf3, 0xf4, 0xf7, 0xd7, 0xff,
+	0xf3, 0xff, 0xfe, 0xc2, 0xbf,
+	0xff, 0x87, 0x7f, 0xfa, 0xff, 0xff, 0xff, 0xff,
+	0x8f, 0xff, 0xf0, 0x8f, 0xff, 0xf4, 0xff, 0xdf,
+	0xff, 0xfb, 0x8f, 0x7f, 0xc5,
+	0xff, 0xf8, 0xff, 0xff, 0xff, 0xff, 0xff, 0xfb,
+	0xf3, 0x87, 0xef, 0xfc, 0xfd, 0xfb, 0xff, 0xff,
+	0xdf, 0xff, 0xfb, 0xab, 0x7f,
+	0x3f, 0xf3, 0xfa, 0xf9, 0x8f, 0x7f, 0xf0, 0xeb,
+	0xfb, 0xec, 0x1f, 0xcf, 0x7e, 0xff, 0x8f, 0x5e,
+	0xd1, 0xbf, 0xff, 0xfe, 0xaa,
+	0xff, 0x80, 0x7d, 0xf8, 0xff, 0x7f, 0xff, 0xff,
+	0xf7, 0x8f, 0x5f, 0x8c, 0xff, 0xf1, 0xff, 0xff,
+	0xff, 0xff, 0xfa, 0x9f, 0x6f,
+	0xff, 0x9a, 0xfd, 0xfc, 0xff, 0xff, 0xff, 0xff,
+	0x6f, 0xbf, 0xd7, 0x89, 0x7f, 0xf4, 0xff, 0xfe,
+	0xff, 0xff, 0xdf, 0xbf, 0x6f,
+	0xff, 0xfd, 0xff, 0xff, 0xef, 0xff, 0xfb, 0xff,
+	0x2b, 0x73, 0xf0, 0xf3, 0xff, 0xff, 0xc3, 0xff,
+	0xff, 0xff, 0x8b, 0x62, 0xfd,
+	0xff, 0xef, 0xff, 0xff, 0xfb, 0x0f, 0x8b, 0x8e,
+	0xf0, 0xdc, 0xf7, 0xff, 0xff, 0xff, 0xfb, 0xae,
+	0x43, 0xa9, 0x73, 0xf9, 0xfb,
+	0x7f, 0xf9, 0xff, 0xff, 0xfd, 0xff, 0xf9, 0xff,
+	0xfb, 0xff, 0xff, 0xff, 0xff, 0xfb, 0xf3, 0xfe,
+	0xf3, 0xff, 0xff, 0xff, 0xff,
+	0xbf, 0x87, 0xf8, 0xf8, 0xf9, 0x7f, 0xf9, 0xff,
+	0xff, 0x7f, 0x8f, 0x8f, 0xf0, 0xf0, 0xf3, 0xff,
+	0xf3, 0xfb, 0xff, 0xff, 0x8f,
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xf9, 0xff,
+	0x7f, 0xff, 0xff, 0xff, 0xff, 0xff, 0xf3, 0xff,
+	0xfb, 0xef, 0xff, 0xff, 0xff,
+	0xff, 0x7f, 0xff, 0xf7, 0xf9, 0xff, 0xff, 0xff,
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xfb, 0xfe,
+	0xf3, 0xff, 0xff, 0xff, 0xff,
+	0xff, 0xff, 0xff, 0xff, 0xf5, 0xff, 0xf1, 0xff,
+	0xff, 0x7f, 0xff, 0xff, 0xff, 0xff, 0xf3, 0xfe,
+	0xfb, 0xff, 0xff, 0xff, 0xff,
+	0xff, 0xff, 0x7f, 0xff, 0xf1, 0xff, 0x85, 0xff,
+	0xfe, 0xf1, 0xff, 0xff, 0xff, 0xff, 0xfb, 0xff,
+	0xf3, 0xde, 0xff, 0xf3, 0xff,
+	0xbf, 0xff, 0x0f, 0x9f, 0xfa, 0x9f, 0xeb, 0xf2,
+	0xe7, 0xff, 0x7b, 0xff, 0x4f, 0x73, 0x31, 0x81,
+	0x5f, 0xf1, 0xfe, 0xff, 0xbf,
+	0xff, 0xaf, 0x7f, 0x94, 0xfb, 0xfe, 0x8f, 0xff,
+	0x00, 0xff, 0xf0, 0xef, 0xef, 0x5f, 0xfb, 0xf5,
+	0x8f, 0x7f, 0x81, 0x5e, 0xf1,
+	0xff, 0xf9, 0xff, 0xef, 0x86, 0x0f, 0x71, 0xf6,
+	0xff, 0x7f, 0x7f, 0x97, 0xcf, 0xfd, 0xbf, 0x5f,
+	0xf9, 0xf1, 0xf3, 0xff, 0xff,
+	0x3f, 0xdb, 0xed, 0x1e, 0xff, 0xf6, 0x95, 0x9a,
+	0x6f, 0x3d, 0xff, 0xf8, 0xfb, 0xdf, 0xf7, 0xfd,
+	0xfb, 0xf7, 0xfd, 0xed, 0xde,
+	0x7f, 0xf0, 0xf7, 0x87, 0x7f, 0x9b, 0xff, 0xec,
+	0x9f, 0xbf, 0x7f, 0xcd, 0x7f, 0xf7, 0x3b, 0xad,
+	0x7e, 0xf8, 0xff, 0xbb, 0x79,
+	0xff, 0xff, 0xe3, 0x7c, 0x01, 0x8d, 0xf5, 0xfb,
+	0xe7, 0xf7, 0xff, 0xff, 0x9e, 0x7d, 0x0f, 0x7f,
+	0xf1, 0xcd, 0xfe, 0xf7, 0xff,
+	0x3f, 0xd7, 0xf4, 0x9a, 0xf7, 0xed, 0xff, 0xf3,
+	0xb7, 0xff, 0xef, 0xff, 0xbd, 0xe7, 0x5f, 0xbd,
+	0xff, 0xef, 0xfe, 0x7f, 0xf1,
+	0x3f, 0xff, 0xe7, 0xff, 0xcf, 0xfa, 0xf8, 0xff,
+	0xff, 0xdf, 0xbf, 0xfe, 0xdf, 0xff, 0xd3, 0x1f,
+	0xfd, 0xef, 0x7f, 0xff, 0xcf,
+	0x7f, 0xff, 0x93, 0xdf, 0xf0, 0xef, 0xf3, 0xd4,
+	0x77, 0x6f, 0xff, 0xff, 0xbf, 0x7f, 0x7d, 0xfd,
+	0x7f, 0x7d, 0xff, 0xff, 0xf7,
+	0xff, 0xf7, 0xdf, 0xfb, 0xbc, 0xef, 0xff, 0xfd,
+	0xff, 0xff, 0xfc, 0x7f, 0xb7, 0xff, 0xfd, 0x5f,
+	0xcf, 0xff, 0xef, 0x7f, 0xfd,
+	0xff, 0xee, 0x87, 0xef, 0x92, 0xf0, 0x7e, 0xe5,
+	0xbf, 0x8f, 0x7f, 0x60, 0xd9, 0xdb, 0x71, 0xb3,
+	0x2d, 0x49, 0x6c, 0x29, 0x7f,
+	0xbf, 0xff, 0xe4, 0x6f, 0xf3, 0xfa, 0x57, 0xfd,
+	0xff, 0xfe, 0xb7, 0x7f, 0xfc, 0xff, 0x73, 0xdf,
+	0xf3, 0x7f, 0xfd, 0xff, 0xbf,
+	0xff, 0xef, 0x8b, 0x7f, 0x8f, 0xff, 0xf2, 0xff,
+	0xff, 0xf7, 0xfb, 0xff, 0xff, 0xdf, 0xed, 0xef,
+	0xf1, 0xf7, 0xfd, 0xdf, 0xf7,
+	0xff, 0xff, 0xff, 0xf7, 0xe7, 0xe6, 0xf1, 0xff,
+	0xdf, 0xfb, 0xe9, 0xfe, 0xbf, 0xff, 0xbf, 0x5f,
+	0xff, 0xbf, 0x0e, 0x75, 0xfa,
+	0xff, 0xff, 0xff, 0x6f, 0xfb, 0xf9, 0xff, 0xff,
+	0xf3, 0xff, 0xfb, 0xbf, 0xef, 0xff, 0xf3, 0x7f,
+	0xff, 0xff, 0xff, 0xfb, 0xff,
+	0xff, 0x38, 0xf8, 0xf7, 0xff, 0xff, 0xdf, 0x9f,
+	0xf7, 0x0b, 0x0f, 0xf5, 0xf5, 0xff, 0xff, 0xff,
+	0xbf, 0xf7, 0xf3, 0x8e, 0x0e,
+	0xbf, 0xe8, 0x6f, 0xef, 0x7f, 0xff, 0xdf, 0xdf,
+	0xef, 0x88, 0xf5, 0x91, 0xfb, 0xff, 0xff, 0xbf,
+	0xfe, 0xbf, 0xa6, 0x81, 0x71,
+	0xff, 0xf0, 0xf8, 0xff, 0x67, 0xef, 0xff, 0xb7,
+	0xf7, 0x8f, 0x2f, 0xd1, 0x41, 0xff, 0xcf, 0x5f,
+	0xfe, 0xff, 0x7b, 0x8f, 0x9f,
+	0xff, 0xf8, 0x6f, 0xef, 0xf7, 0xe7, 0xff, 0xff,
+	0xbf, 0x8f, 0xd1, 0xf1, 0xcf, 0xdf, 0xcf, 0xdf,
+	0xff, 0xff, 0x9f, 0x8f, 0xe1,
+	0xff, 0xe7, 0xff, 0xf7, 0xe7, 0x6f, 0xf7, 0xe7,
+	0xe7, 0x77, 0xef, 0xef, 0x6f, 0xff, 0xff, 0xdf,
+	0xff, 0xdf, 0xdf, 0xff, 0xff,
+	0xff, 0xa7, 0x6f, 0xff, 0xf7, 0xef, 0x97, 0xe7,
+	0xf0, 0xef, 0x7f, 0xaf, 0x4f, 0xff, 0xff, 0xdf,
+	0xbf, 0x5f, 0xe0, 0x7f, 0xef,
+	0x7f, 0xa0, 0xef, 0xff, 0xe7, 0xff, 0xf7, 0xf7,
+	0xff, 0x8b, 0xbf, 0xf8, 0xdf, 0xff, 0xcf, 0x7e,
+	0xff, 0xdf, 0x7f, 0x8e, 0x5f,
+	0xff, 0xff, 0x38, 0xff, 0xf7, 0xff, 0xf7, 0xf7,
+	0xf7, 0xf7, 0x8f, 0xf7, 0xf8, 0xf7, 0xcf, 0xff,
+	0xff, 0xff, 0xfe, 0xcb, 0x3f,
+	0x3f, 0x9f, 0x7f, 0xf8, 0xff, 0xef, 0xff, 0xff,
+	0x8f, 0xff, 0xf0, 0xaf, 0xff, 0xf0, 0xff, 0xdf,
+	0xff, 0xff, 0xae, 0x7f, 0xc1,
+	0x7f, 0xf0, 0x7f, 0xff, 0xff, 0xff, 0xef, 0xff,
+	0xf7, 0xbf, 0xbf, 0xd0, 0xff, 0xff, 0xff, 0xff,
+	0x8f, 0xff, 0xff, 0x9b, 0xff,
+	0x7f, 0xcf, 0xf8, 0xff, 0x8f, 0x6f, 0xe0, 0xd7,
+	0xf7, 0xf7, 0xff, 0xfe, 0xf0, 0xfe, 0x8f, 0x5e,
+	0xd1, 0xff, 0xdf, 0xdf, 0xbe,
+	0xff, 0x84, 0x7f, 0xf8, 0xff, 0x7f, 0xdf, 0xff,
+	0xff, 0xaf, 0x7f, 0x81, 0x7f, 0xf5, 0xff, 0xff,
+	0xff, 0xff, 0xfa, 0x9f, 0x3f,
+	0xff, 0xd8, 0xff, 0xf8, 0xff, 0xff, 0xff, 0xff,
+	0x7f, 0x0f, 0xff, 0x85, 0x7f, 0xf0, 0xff, 0xfe,
+	0xbf, 0xff, 0xdf, 0x6f, 0xbf,
+	0xff, 0xff, 0xff, 0xff, 0xaf, 0xff, 0xf7, 0xdf,
+	0xf7, 0x47, 0xf4, 0xff, 0xef, 0xff, 0xdf, 0x7f,
+	0xff, 0xbf, 0xcf, 0x5a, 0xf1,
+	0xff, 0xbf, 0xbf, 0xff, 0xff, 0x3f, 0x8f, 0xc0,
+	0xf3, 0xd1, 0xff, 0xfb, 0xef, 0xff, 0xdf, 0xbe,
+	0x0f, 0x25, 0xe9, 0xd1, 0xff,
+	0xff, 0xff, 0xdf, 0xff, 0xff, 0xff, 0xf7, 0xf7,
+	0x2f, 0xaf, 0xf3, 0xfb, 0xef, 0xff, 0xff, 0xfe,
+	0xff, 0xff, 0xcf, 0xbf, 0xfb,
+	0xbf, 0x87, 0xf8, 0xf8, 0xdf, 0x7f, 0xff, 0xff,
+	0xff, 0xff, 0x8f, 0x8f, 0xe0, 0xf0, 0xff, 0xff,
+	0xff, 0xff, 0xff, 0xff, 0x8f,
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+	0x7f, 0xff, 0xff, 0xff, 0xff, 0xfb, 0xeb, 0xff,
+	0xff, 0xff, 0xff, 0xff, 0xff,
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xef, 0xfe,
+	0xfb, 0xff, 0xff, 0xff, 0xff,
+	0xff, 0xff, 0xdf, 0xf7, 0xff, 0xff, 0xcf, 0xff,
+	0xf7, 0xff, 0xff, 0xff, 0xff, 0xff, 0xeb, 0xfe,
+	0xcf, 0xff, 0x7b, 0xfd, 0xff,
+	0xff, 0xff, 0xff, 0xf7, 0xdf, 0xff, 0xbf, 0xff,
+	0xfb, 0xff, 0xff, 0xfb, 0xff, 0xff, 0xef, 0xff,
+	0xfb, 0xbe, 0xff, 0xff, 0xff,
+	0xff, 0xff, 0x8f, 0xff, 0xf0, 0xd4, 0xbf, 0xf0,
+	0xbf, 0xff, 0xff, 0xff, 0x93, 0x2f, 0xfd, 0xad,
+	0xf7, 0x75, 0xff, 0xff, 0xfe,
+	0xbf, 0x7f, 0xff, 0x9a, 0xff, 0xf4, 0x0f, 0xff,
+	0x00, 0xde, 0xf0, 0xf3, 0xf9, 0xbf, 0x7d, 0xff,
+	0x8f, 0x7f, 0x81, 0x0f, 0xd1,
+	0xff, 0xfb, 0xdf, 0xee, 0x8b, 0x0b, 0x78, 0xf0,
+	0xff, 0xfa, 0x7f, 0xbf, 0xff, 0xd5, 0x8f, 0x8f,
+	0xe1, 0xf7, 0xfb, 0xfb, 0xff,
+	0x7f, 0xb7, 0x99, 0xef, 0xdf, 0xf4, 0xff, 0xff,
+	0xe4, 0xf4, 0x5d, 0xf6, 0xef, 0x9f, 0xef, 0xf7,
+	0x3b, 0x3f, 0xdf, 0xbf, 0xec,
+	0xff, 0xec, 0xf7, 0xb9, 0x6b, 0xbc, 0xfb, 0xf7,
+	0xef, 0xff, 0x7e, 0xfd, 0x7e, 0xbb, 0xdf, 0x85,
+	0xfe, 0xf7, 0xff, 0x7b, 0x7f,
+	0xff, 0xff, 0xa7, 0xee, 0xe7, 0x5f, 0xe0, 0xf0,
+	0xff, 0xff, 0xff, 0x5f, 0xe6, 0x6f, 0x81, 0x8d,
+	0xd5, 0xf7, 0xbf, 0xef, 0xb6,
+	0xff, 0xd7, 0xf4, 0xee, 0xb7, 0x7c, 0xff, 0xd7,
+	0xaf, 0x7f, 0xed, 0x9f, 0xe5, 0xbf, 0xf7, 0x7d,
+	0xfb, 0xb7, 0xad, 0xd7, 0xfd,
+	0xbf, 0xff, 0xff, 0xc7, 0x8b, 0xff, 0xf0, 0xf6,
+	0xff, 0xfd, 0xfb, 0xff, 0xdf, 0xbe, 0x0f, 0x7f,
+	0xd5, 0xf7, 0xff, 0xf2, 0xfe,
+	0xff, 0xff, 0xc5, 0xff, 0xf0, 0x7c, 0xff, 0xad,
+	0x7f, 0x7f, 0xef, 0xff, 0xcf, 0x4f, 0xf1, 0xf5,
+	0x7b, 0xdd, 0xff, 0xdf, 0xff,
+	0xff, 0x77, 0xef, 0xff, 0xd8, 0xbf, 0xf7, 0xf3,
+	0x5f, 0xfb, 0xf9, 0x7f, 0xe7, 0xff, 0xd7, 0x7f,
+	0xad, 0xff, 0xfb, 0xfb, 0xf3,
+	0xff, 0xcc, 0x95, 0x8f, 0xd8, 0xf3, 0xfc, 0xbc,
+	0xdc, 0xdf, 0xbb, 0x44, 0x8b, 0xcb, 0x87, 0xb1,
+	0xb7, 0xa7, 0x97, 0xee, 0xf3,
+	0xff, 0x7f, 0xb4, 0xbf, 0xff, 0xc7, 0x7f, 0xcb,
+	0xfd, 0xbf, 0x7f, 0x7f, 0x74, 0xe7, 0xdf, 0xf5,
+	0xbb, 0xcf, 0xed, 0xfe, 0xfd,
+	0xff, 0x3f, 0xfb, 0x77, 0xcc, 0xbb, 0xf0, 0xfb,
+	0xff, 0xef, 0xbe, 0xff, 0xcf, 0xff, 0x85, 0x3f,
+	0xb5, 0xff, 0xf7, 0x37, 0x7f,
+	0x3f, 0xf7, 0xbf, 0xcf, 0x9f, 0xd7, 0xf7, 0xef,
+	0xff, 0x78, 0xe7, 0xff, 0xff, 0xff, 0x1f, 0x7f,
+	0x65, 0xbf, 0xbf, 0xff, 0xe7,
+	0xff, 0xff, 0xff, 0xff, 0xdb, 0xf7, 0xdf, 0xff,
+	0x77, 0x7f, 0xff, 0xff, 0xbf, 0xbf, 0xde, 0x77,
+	0xdd, 0xff, 0xff, 0xfe, 0xff,
+	0xbf, 0x68, 0xf8, 0xff, 0xf7, 0xff, 0xcf, 0xcf,
+	0xf3, 0x17, 0x3f, 0xd5, 0xdd, 0xf7, 0xff, 0xff,
+	0xcf, 0xdf, 0x73, 0x95, 0x3f,
+	0xff, 0xac, 0x6f, 0xef, 0x77, 0xdf, 0xff, 0xf7,
+	0xbb, 0x85, 0xdd, 0xe1, 0xf7, 0xfb, 0x7b, 0xdf,
+	0xfe, 0xff, 0xb7, 0x9f, 0x79,
+	0xff, 0xd8, 0xac, 0xfb, 0x47, 0xaf, 0xeb, 0xf7,
+	0xff, 0xaf, 0x2e, 0x70, 0xd9, 0xf7, 0xfb, 0xdf,
+	0xea, 0xfb, 0xfb, 0x1b, 0x5f,
+	0xff, 0xf8, 0x6f, 0xaf, 0xd7, 0xb7, 0xeb, 0xff,
+	0xe7, 0xaf, 0x7c, 0x70, 0xfb, 0xdf, 0xff, 0x7b,
+	0xfb, 0xff, 0xda, 0x9f, 0xf9,
+	0xff, 0x95, 0xbb, 0xfd, 0xc7, 0xcf, 0xfb, 0x83,
+	0xef, 0xf3, 0xbf, 0xcf, 0x47, 0xf7, 0xe7, 0x1f,
+	0xd7, 0x8b, 0x6f, 0x33, 0xbe,
+	0xff, 0xc7, 0x6f, 0xfd, 0x97, 0x2f, 0xeb, 0xb7,
+	0xdc, 0x77, 0xd7, 0x1f, 0x67, 0xf7, 0xe7, 0x9e,
+	0xe7, 0xdb, 0x34, 0xdb, 0xfb,
+	0x7f, 0xa8, 0xef, 0xff, 0xe7, 0xef, 0xff, 0xf7,
+	0xff, 0x8b, 0xbf, 0xd8, 0xef, 0xff, 0xe7, 0xdf,
+	0xf7, 0xfb, 0xf7, 0x9f, 0x66,
+	0xff, 0xfb, 0x6c, 0xff, 0xb7, 0x9f, 0xcf, 0xcb,
+	0xbb, 0x93, 0xaf, 0xff, 0xa8, 0xff, 0xc7, 0x3f,
+	0xa7, 0xcf, 0xfe, 0xe3, 0x3f,
+	0x3f, 0xdf, 0x7b, 0xfa, 0xff, 0xff, 0xff, 0xf7,
+	0x8f, 0x3f, 0xd0, 0xd3, 0x7f, 0xfc, 0xff, 0x8e,
+	0xff, 0xf3, 0x8f, 0x4e, 0xe4,
+	0x7f, 0xb8, 0xff, 0xff, 0xff, 0xef, 0x8f, 0xdf,
+	0xf3, 0xbb, 0x3f, 0xe0, 0xf3, 0xff, 0xff, 0xef,
+	0x8f, 0xd7, 0xf3, 0xab, 0xef,
+	0x7f, 0x8f, 0xf8, 0xfb, 0x8f, 0x6f, 0xa0, 0xff,
+	0xff, 0xdc, 0xff, 0x5f, 0xfc, 0xf3, 0x8f, 0x6e,
+	0xb1, 0xf7, 0xf7, 0xf7, 0x3e,
+	0xff, 0x90, 0x7b, 0xf8, 0xff, 0x7f, 0xdf, 0xff,
+	0xfb, 0x9f, 0x7f, 0xa0, 0xf3, 0xf1, 0xff, 0xff,
+	0xdf, 0xff, 0xdb, 0xbf, 0x3f,
+	0xff, 0xdc, 0xfb, 0xf8, 0xff, 0xff, 0xff, 0xff,
+	0x77, 0xaf, 0xff, 0xad, 0xf3, 0xf8, 0xff, 0xfe,
+	0xef, 0xff, 0xff, 0x6f, 0xbf,
+	0xff, 0xff, 0xcf, 0xff, 0xa3, 0xff, 0xaf, 0xcf,
+	0x93, 0xc3, 0x74, 0xef, 0xdf, 0xff, 0xab, 0x2f,
+	0xe7, 0xc7, 0xf3, 0x73, 0x79,
+	0xff, 0xff, 0xcf, 0xff, 0xc3, 0x7f, 0x83, 0xe4,
+	0xd3, 0xbc, 0x7b, 0xdb, 0xdf, 0x7f, 0x8b, 0x8e,
+	0x83, 0x01, 0x51, 0xd5, 0x7b,
+	0xff, 0xfb, 0xdf, 0xff, 0xc3, 0xef, 0xb3, 0xff,
+	0xb7, 0xff, 0xfe, 0xbf, 0xdf, 0xff, 0x8b, 0x6e,
+	0xf3, 0xfb, 0xb7, 0x1f, 0xfe,
+	0xbf, 0x82, 0xc8, 0xf8, 0xd3, 0x7f, 0xf3, 0xfb,
+	0xff, 0xef, 0x87, 0x87, 0xd0, 0x70, 0x8b, 0xff,
+	0xf3, 0xff, 0xef, 0xef, 0x87,
+	0xff, 0xff, 0xff, 0xff, 0x47, 0xff, 0xf3, 0xff,
+	0x7f, 0xff, 0xff, 0xff, 0xdf, 0x7f, 0xcb, 0xef,
+	0xf2, 0xf7, 0xff, 0xff, 0xff,
+	0xff, 0xf7, 0xef, 0xf2, 0xf7, 0xff, 0xf7, 0xff,
+	0xff, 0xff, 0xf7, 0xef, 0xdf, 0xf7, 0xca, 0x7f,
+	0xf3, 0xf7, 0xef, 0xff, 0xf6,
+	0xff, 0xfa, 0xfb, 0xff, 0xe7, 0xff, 0xf7, 0xff,
+	0xff, 0xef, 0xff, 0xf7, 0x57, 0x7f, 0xca, 0xef,
+	0xf3, 0xff, 0xff, 0xef, 0xef,
+	0xff, 0xf6, 0xeb, 0xfa, 0xf7, 0xff, 0xf7, 0x8f,
+	0xff, 0xe3, 0xf7, 0xef, 0xd7, 0xf7, 0xcb, 0x7f,
+	0xf3, 0x8f, 0x6c, 0xf2, 0xe7,
+	0xff, 0xff, 0x2f, 0xff, 0xf1, 0x9d, 0x9e, 0xf4,
+	0xff, 0xff, 0xff, 0xef, 0x0f, 0xff, 0xf1, 0x09,
+	0x3f, 0xf9, 0xbf, 0xf7, 0xfb,
+	0xff, 0xef, 0x7f, 0xf6, 0xfb, 0xf5, 0x0f, 0xdf,
+	0x00, 0xff, 0xd0, 0xbf, 0xc0, 0xbf, 0xf9, 0xff,
+	0x8f, 0x7f, 0x81, 0x6f, 0xe1,
+	0xff, 0xff, 0x9e, 0xaf, 0xf7, 0x0f, 0x18, 0xd9,
+	0xbf, 0x6f, 0x37, 0xef, 0x8f, 0xff, 0x9e, 0x06,
+	0x75, 0xf7, 0xf6, 0xff, 0xef,
+	0x7f, 0xf7, 0xcf, 0xbb, 0xfb, 0x6d, 0xfb, 0xef,
+	0x7d, 0xe9, 0xff, 0xff, 0xbf, 0xc2, 0xf7, 0x6f,
+	0xff, 0xdc, 0xff, 0xf3, 0xfa,
+	0x7f, 0x6f, 0xf7, 0xf9, 0xff, 0x6d, 0xfe, 0x9c,
+	0xbf, 0xbf, 0x7d, 0xe2, 0x7f, 0x77, 0x9f, 0xcd,
+	0xb7, 0xb5, 0xff, 0xff, 0x7f,
+	0x7f, 0xff, 0x87, 0xae, 0x86, 0xdf, 0xc0, 0xfd,
+	0xfb, 0xfa, 0xff, 0xff, 0x8e, 0x6d, 0xd5, 0x3d,
+	0xf1, 0xff, 0xfe, 0xef, 0xff,
+	0xff, 0x3f, 0xd2, 0xa4, 0xfe, 0xd9, 0xf7, 0xfe,
+	0xdf, 0xff, 0xcb, 0xff, 0xdd, 0x7e, 0xbb, 0xdd,
+	0x5f, 0xf7, 0xbf, 0xff, 0xed,
+	0xff, 0xfe, 0xf5, 0xff, 0xb7, 0xf6, 0xb4, 0xae,
+	0xfe, 0xef, 0xf7, 0xff, 0xff, 0x8f, 0x07, 0x7b,
+	0xfb, 0xff, 0x7f, 0xff, 0xf7,
+	0xff, 0x7b, 0xa3, 0xbf, 0xe3, 0xff, 0xff, 0xf7,
+	0xf7, 0xfd, 0xdf, 0xff, 0x8f, 0x7f, 0x9b, 0xdf,
+	0xfb, 0xef, 0xfe, 0xff, 0x3f,
+	0xff, 0x6f, 0xff, 0x7f, 0xb3, 0x7f, 0xdf, 0xbd,
+	0x78, 0xff, 0xff, 0xff, 0xff, 0x7f, 0xef, 0xff,
+	0xdf, 0xee, 0x9d, 0xfd, 0xef,
+	0xff, 0xf8, 0x05, 0x8e, 0xb0, 0x58, 0xf7, 0xfc,
+	0xa4, 0x85, 0xdd, 0xbc, 0x0b, 0x05, 0x61, 0xf8,
+	0xb7, 0xff, 0xeb, 0xef, 0x7f,
+	0xbf, 0xff, 0xc7, 0xbb, 0xd8, 0x6f, 0x79, 0xde,
+	0xff, 0xff, 0xcf, 0xff, 0xba, 0xaf, 0xd9, 0x7b,
+	0xfd, 0xff, 0xf5, 0xdf, 0xbf,
+	0xff, 0xff, 0xaf, 0x7f, 0x88, 0x7f, 0xf0, 0xea,
+	0xfe, 0x7f, 0xf2, 0xff, 0xdf, 0xd7, 0x4f, 0x7f,
+	0xe3, 0xde, 0xff, 0xff, 0xf7,
+	0xff, 0x7d, 0x6f, 0x5f, 0xab, 0xff, 0x7a, 0xb6,
+	0xbf, 0x78, 0xdd, 0x7f, 0xde, 0xef, 0x4b, 0x9b,
+	0xeb, 0x7f, 0x76, 0x9f, 0xac,
+	0xff, 0xcf, 0xff, 0xff, 0xb7, 0x7f, 0xae, 0xef,
+	0xdb, 0xef, 0xff, 0xf7, 0xff, 0xfb, 0xe7, 0xfe,
+	0xbf, 0x7e, 0xfb, 0xf7, 0xfb,
+	0xff, 0xff, 0xff, 0xff, 0xcf, 0xbf, 0xff, 0xff,
+	0xf3, 0xff, 0xff, 0xff, 0xff, 0xef, 0xd7, 0xff,
+	0xe9, 0xef, 0xf2, 0xfe, 0xff,
+	0xff, 0xff, 0xff, 0xef, 0xff, 0x8d, 0xaf, 0xf2,
+	0x71, 0xff, 0xfe, 0xff, 0xff, 0x7f, 0xff, 0xcf,
+	0x0f, 0x75, 0xf1, 0xff, 0xff,
+	0x3f, 0x78, 0xbc, 0xfb, 0xfe, 0xff, 0xff, 0xbf,
+	0xf3, 0x0f, 0x3f, 0xc9, 0xe9, 0x7f, 0xf7, 0xdf,
+	0xff, 0xff, 0x57, 0x82, 0x2e,
+	0xff, 0xf8, 0x7f, 0xfb, 0x7a, 0xfb, 0xff, 0xff,
+	0xeb, 0x87, 0x9b, 0xf1, 0xe5, 0x7f, 0x75, 0x7f,
+	0xfe, 0xff, 0xbe, 0x39, 0x79,
+	0xff, 0xcd, 0xbf, 0xfd, 0x7e, 0xff, 0xfb, 0xf4,
+	0xf7, 0xed, 0x6f, 0xf3, 0x6b, 0xf7, 0xd7, 0xbf,
+	0xfe, 0xfd, 0xf7, 0x8f, 0xef,
+	0xff, 0xf8, 0x7a, 0xff, 0xfa, 0xf0, 0xff, 0xff,
+	0xe6, 0x8f, 0x9b, 0xf1, 0xad, 0xbf, 0xf7, 0xfd,
+	0xbf, 0xfd, 0xef, 0x8f, 0x3f,
+	0xbf, 0xff, 0xad, 0xfb, 0xf4, 0xbf, 0xf3, 0x90,
+	0xdd, 0xf0, 0xfa, 0xcf, 0xe7, 0xf2, 0xf7, 0x7f,
+	0xff, 0xad, 0xff, 0xf5, 0xdf,
+	0xff, 0xcb, 0x7b, 0xfa, 0xd2, 0x7f, 0xc7, 0xf3,
+	0xa9, 0xf7, 0xe7, 0x8b, 0xe7, 0xf1, 0xf7, 0x3f,
+	0x8f, 0x7f, 0xb0, 0xdf, 0xfd,
+	0x7f, 0xf8, 0xff, 0xfb, 0xf2, 0xff, 0xd2, 0xe3,
+	0xdf, 0x87, 0xd3, 0xf0, 0xed, 0xff, 0xf7, 0x7f,
+	0xff, 0xef, 0x77, 0xaa, 0x7f,
+	0xbf, 0xea, 0xfc, 0xfb, 0xb3, 0xbf, 0xb3, 0xff,
+	0xd8, 0x93, 0xab, 0xf1, 0xac, 0xff, 0xf7, 0x3f,
+	0xaf, 0xef, 0xed, 0xc7, 0xad,
+	0xff, 0xd6, 0xff, 0xfd, 0xff, 0xdf, 0xff, 0xf4,
+	0x8f, 0xbf, 0xb1, 0xed, 0xf5, 0xfb, 0xff, 0xef,
+	0xff, 0xf5, 0x8f, 0xdf, 0xf1,
+	0xff, 0xf8, 0xfe, 0xfb, 0xff, 0xdf, 0x9f, 0xf8,
+	0xf0, 0xef, 0xff, 0xd0, 0xfd, 0xf7, 0xff, 0xef,
+	0xaf, 0xf5, 0xf7, 0xce, 0x7f,
+	0x7f, 0x83, 0x7d, 0xfa, 0x8f, 0x5f, 0xd0, 0xcb,
+	0xe9, 0xbb, 0x76, 0x9f, 0x7b, 0xf7, 0x8f, 0x6e,
+	0xb1, 0xd5, 0xf7, 0x5f, 0xc6,
+	0xff, 0xa3, 0x7f, 0xfc, 0xff, 0x7f, 0xff, 0xff,
+	0xdf, 0x9f, 0x7f, 0xa8, 0x77, 0xf5, 0xff, 0xfe,
+	0xff, 0xff, 0xfe, 0x7f, 0x2d,
+	0xff, 0x96, 0xff, 0xfc, 0xff, 0xff, 0xff, 0xff,
+	0x37, 0x6f, 0xfd, 0xaf, 0x77, 0xf8, 0xff, 0xff,
+	0xef, 0xff, 0xff, 0xff, 0x4b,
+	0xff, 0x72, 0xaf, 0xff, 0xe5, 0xdf, 0x99, 0xfc,
+	0x10, 0x63, 0xf0, 0xef, 0xef, 0x7f, 0x8b, 0xef,
+	0xaf, 0xe7, 0xf5, 0xf7, 0x7d,
+	0xff, 0xef, 0x8f, 0xff, 0xa1, 0x4f, 0x81, 0xe7,
+	0xb0, 0xfa, 0xfe, 0xd7, 0xcf, 0xff, 0xca, 0xcf,
+	0x0b, 0x85, 0x71, 0xfa, 0xff,
+	0xff, 0xdd, 0xef, 0xff, 0xa4, 0xdf, 0xb1, 0xdc,
+	0xd3, 0xff, 0xf8, 0xff, 0xcf, 0x7f, 0xcb, 0x7f,
+	0xff, 0xf5, 0xff, 0xbf, 0xfd,
+	0xbf, 0x82, 0xc8, 0xf8, 0xe1, 0x7f, 0xf0, 0xdf,
+	0xff, 0xef, 0x87, 0x87, 0xc0, 0xf0, 0xca, 0x2f,
+	0xfb, 0xff, 0xef, 0xee, 0x97,
+	0xff, 0xff, 0x8f, 0xfa, 0xa5, 0xdf, 0xd1, 0xf7,
+	0x7f, 0xff, 0xff, 0xff, 0xff, 0x77, 0xdb, 0xef,
+	0xff, 0xf5, 0xfd, 0xff, 0xff,
+	0xff, 0xf6, 0x8b, 0xf2, 0x94, 0xff, 0xf1, 0xf7,
+	0xff, 0xff, 0xf7, 0xef, 0xd7, 0xf7, 0xdf, 0xee,
+	0xfb, 0xff, 0xef, 0xff, 0xf7,
+	0xff, 0xf3, 0xcb, 0xff, 0xe6, 0xff, 0xf1, 0xef,
+	0xff, 0xef, 0xff, 0xe7, 0xd7, 0x7f, 0xdb, 0x7e,
+	0xfd, 0xf7, 0xff, 0xef, 0xef,
+	0xff, 0xfe, 0xcf, 0xff, 0xc4, 0xff, 0xf2, 0x9f,
+	0xff, 0xe0, 0xf7, 0xff, 0xdf, 0xff, 0xdf, 0x7f,
+	0xdb, 0xac, 0xef, 0xf1, 0xf7,
+	0x7f, 0xef, 0x0f, 0x5f, 0xb4, 0x8f, 0xff, 0xf6,
+	0xfd, 0xff, 0x6f, 0xff, 0x8f, 0xff, 0xe9, 0x8d,
+	0x7f, 0xf1, 0xd1, 0xf7, 0xfe,
+	0xff, 0xe7, 0x7f, 0x87, 0xfd, 0xe7, 0x8f, 0x9b,
+	0x00, 0xff, 0xb0, 0x7d, 0xfd, 0xcf, 0xfb, 0xfd,
+	0x8f, 0x7f, 0x81, 0x6d, 0xd1,
+	0xff, 0xbc, 0xed, 0xff, 0x86, 0x6e, 0x10, 0xf1,
+	0xf4, 0x5f, 0x7f, 0xfe, 0x9f, 0x37, 0xc3, 0x8f,
+	0xf7, 0xe5, 0xfb, 0xff, 0xff,
+	0x7f, 0xfe, 0xff, 0xfd, 0x97, 0xff, 0xfb, 0xff,
+	0x3f, 0xff, 0xf9, 0xc3, 0x1f, 0xf8, 0xff, 0xb5,
+	0x5f, 0xef, 0xdc, 0xff, 0xbe,
+	0xff, 0xcb, 0xe7, 0xfd, 0x69, 0xe7, 0xfc, 0xb6,
+	0xef, 0x9a, 0x77, 0xb6, 0x67, 0xdf, 0xef, 0xf7,
+	0xfe, 0xdf, 0xff, 0xf5, 0x7f,
+	0xff, 0xf7, 0x97, 0xbe, 0xf4, 0xff, 0xf1, 0xba,
+	0xfe, 0xff, 0x97, 0x7f, 0xbf, 0x77, 0x55, 0xdf,
+	0xd9, 0xf1, 0xff, 0xdf, 0xff,
+	0xbf, 0xbf, 0x72, 0xf2, 0xdd, 0xff, 0xe4, 0xff,
+	0x7f, 0xef, 0xff, 0xf7, 0xfe, 0xfb, 0xb9, 0xff,
+	0xff, 0xf5, 0xff, 0xfb, 0x96,
+	0xff, 0x7f, 0xf7, 0xef, 0x83, 0xf7, 0xf7, 0xff,
+	0xdf, 0xff, 0xf7, 0xfd, 0xd5, 0x9f, 0x0f, 0x7f,
+	0xf0, 0xfb, 0xae, 0xff, 0xec,
+	0xff, 0x7b, 0x85, 0xf7, 0xf3, 0xef, 0xff, 0xf7,
+	0xff, 0xed, 0xff, 0xe7, 0x8f, 0x7f, 0xc7, 0x97,
+	0x3f, 0xfc, 0xff, 0xf7, 0xde,
+	0xff, 0xfd, 0x8b, 0xff, 0xf7, 0x1f, 0xfb, 0xff,
+	0x2f, 0xfb, 0xf7, 0xff, 0xbf, 0xff, 0xff, 0x6f,
+	0xf7, 0xf9, 0xe7, 0xff, 0x33,
+	0xff, 0x9e, 0xe7, 0x8b, 0xf0, 0x50, 0xf1, 0xde,
+	0xff, 0x9f, 0x1b, 0x28, 0x1b, 0x8d, 0xb4, 0xe1,
+	0xf5, 0xf3, 0xfe, 0xef, 0xfa,
+	0xff, 0x7f, 0xf6, 0xff, 0xfe, 0x07, 0xec, 0xfb,
+	0x7f, 0xff, 0xfd, 0xff, 0xd6, 0x8f, 0xff, 0xf9,
+	0xff, 0x37, 0x7f, 0xfb, 0xdd,
+	0xff, 0xff, 0xff, 0x63, 0xef, 0xdf, 0xfa, 0xf1,
+	0xff, 0xfc, 0xfe, 0xdf, 0xfb, 0xff, 0x8f, 0x7f,
+	0xf9, 0xeb, 0xef, 0xfd, 0xff,
+	0x7f, 0x7f, 0xfb, 0xe7, 0x9f, 0x9b, 0xe5, 0xcf,
+	0xfd, 0xf7, 0xcf, 0xff, 0xf3, 0xbf, 0x5f, 0x5d,
+	0x67, 0x9f, 0xdf, 0x7f, 0xf9,
+	0xff, 0xff, 0xff, 0x1f, 0xfe, 0xff, 0xf5, 0xdf,
+	0x5f, 0xfb, 0xfb, 0xbf, 0xcf, 0xdf, 0xfb, 0x7f,
+	0xb7, 0xff, 0xfb, 0xff, 0xf7,
+	0x3f, 0x78, 0xfc, 0xf3, 0xff, 0xff, 0xdf, 0xbf,
+	0xf3, 0x05, 0x3f, 0xc1, 0xf1, 0xff, 0xf7, 0xef,
+	0xef, 0xff, 0xfb, 0x97, 0x1f,
+	0xff, 0xd8, 0x7f, 0xfb, 0x7b, 0xfb, 0xf7, 0xbf,
+	0xbb, 0x8e, 0xd3, 0xe1, 0xff, 0xfd, 0xf7, 0xed,
+	0xfe, 0x8b, 0x5e, 0x0f, 0x69,
+	0xbf, 0xf8, 0xfc, 0xfb, 0x7b, 0xff, 0xdf, 0xed,
+	0xf7, 0x8f, 0xbf, 0xce, 0xfe, 0xff, 0xf3, 0xff,
+	0xf6, 0xff, 0xfe, 0x8f, 0x0f,
+	0xff, 0xfc, 0x7d, 0xff, 0xff, 0xfd, 0xf3, 0xff,
+	0xbf, 0x8f, 0xe3, 0xf0, 0xfe, 0xff, 0xfb, 0xff,
+	0xff, 0xff, 0xae, 0x0f, 0x5d,
+	0xff, 0xff, 0xff, 0xf3, 0xff, 0xff, 0xff, 0xd1,
+	0xfd, 0xf1, 0xd3, 0xdd, 0xfd, 0xf1, 0xfb, 0xff,
+	0xfb, 0xfd, 0xff, 0xfd, 0xf6,
+	0xff, 0xff, 0x7f, 0xfe, 0xfd, 0xff, 0x87, 0xff,
+	0xcc, 0xf3, 0xdf, 0xcb, 0xff, 0xfb, 0xfb, 0xff,
+	0x8b, 0x7f, 0xfa, 0xff, 0xff,
+	0x7f, 0xf8, 0xfe, 0xff, 0xef, 0xff, 0xff, 0xff,
+	0xff, 0x8f, 0xff, 0xe8, 0xff, 0xff, 0xf9, 0xff,
+	0xfb, 0xaf, 0x7f, 0x8f, 0x7e,
+	0xbf, 0xfb, 0x78, 0xff, 0xff, 0xff, 0xd7, 0xd3,
+	0xfd, 0xc3, 0x95, 0xc5, 0xf8, 0xff, 0xfb, 0xff,
+	0xfb, 0xff, 0xfc, 0xf2, 0x8f,
+	0xff, 0x8b, 0x7b, 0xff, 0xff, 0xdf, 0xff, 0xfd,
+	0x8f, 0xef, 0xf4, 0xb7, 0xff, 0xfe, 0xff, 0xfe,
+	0xff, 0xff, 0x8f, 0x6f, 0xf4,
+	0xff, 0xfd, 0xff, 0xfe, 0xff, 0xdf, 0xdf, 0xfd,
+	0xf1, 0xb3, 0xff, 0xd8, 0xff, 0xfd, 0xff, 0xff,
+	0xff, 0xfd, 0xf5, 0x87, 0x7f,
+	0x3f, 0xef, 0xff, 0xff, 0x8f, 0x5f, 0xf0, 0xff,
+	0xf1, 0xef, 0x39, 0xc7, 0x7e, 0xf3, 0x8f, 0x7e,
+	0xf1, 0xbd, 0xed, 0xfa, 0x9a,
+	0xff, 0x98, 0x7f, 0xfa, 0xff, 0x7f, 0xff, 0xff,
+	0xf3, 0x8f, 0x5f, 0x8a, 0xfb, 0xf1, 0xff, 0xff,
+	0xff, 0xff, 0xf7, 0xaf, 0x5f,
+	0xff, 0x86, 0xff, 0xfc, 0xff, 0xff, 0xdf, 0xff,
+	0x7f, 0xbf, 0xcb, 0xbd, 0x77, 0xf2, 0xff, 0xfe,
+	0xff, 0xff, 0xff, 0xbf, 0x77,
+	0xff, 0xff, 0xef, 0xff, 0xed, 0xdf, 0xff, 0xdd,
+	0x11, 0x73, 0xfc, 0xfc, 0xef, 0xff, 0xfb, 0xff,
+	0xfd, 0xfd, 0x9d, 0xf3, 0xff,
+	0xff, 0xf9, 0xef, 0xff, 0xf3, 0x0f, 0x83, 0x9e,
+	0xf0, 0xf0, 0xff, 0xed, 0xef, 0xff, 0xe9, 0x8e,
+	0x7b, 0x9d, 0x70, 0xe9, 0xf7,
+	0xff, 0xff, 0xef, 0xff, 0xef, 0xff, 0xf3, 0xf9,
+	0xf7, 0xff, 0xfb, 0xf3, 0xef, 0xfd, 0xeb, 0xfe,
+	0xff, 0xff, 0xff, 0xff, 0xf8,
+	0x3f, 0x87, 0xec, 0xf8, 0xe5, 0x7f, 0xfb, 0xff,
+	0xff, 0xff, 0x8f, 0x87, 0xe8, 0xf0, 0xeb, 0xff,
+	0xff, 0xfd, 0xff, 0xff, 0x97,
+	0xff, 0xff, 0xef, 0xff, 0xed, 0xdf, 0xd3, 0xbf,
+	0x7f, 0xfe, 0xff, 0xff, 0xef, 0xff, 0xe3, 0xef,
+	0xff, 0xff, 0xff, 0xfe, 0xff,
+	0xff, 0x77, 0xef, 0xfa, 0xe7, 0xff, 0xfb, 0xff,
+	0xff, 0xff, 0xef, 0xef, 0xef, 0xf7, 0xea, 0xfe,
+	0xf3, 0xff, 0xff, 0xff, 0xfe,
+	0xff, 0xf7, 0xeb, 0xf3, 0xef, 0xff, 0xf3, 0xff,
+	0xf1, 0x7f, 0xff, 0xe7, 0xe7, 0xf7, 0xea, 0xee,
+	0xf7, 0xff, 0xf1, 0xff, 0xe7,
+	0xff, 0xfb, 0x6f, 0xf6, 0xe5, 0xff, 0xeb, 0xdf,
+	0xef, 0xff, 0xff, 0xf7, 0xef, 0xff, 0xe3, 0xef,
+	0xff, 0xfe, 0xff, 0xfe, 0xf7,
+	0x7f, 0xff, 0x4f, 0x5f, 0xe1, 0xc7, 0xef, 0xf1,
+	0xfe, 0x7f, 0x7b, 0xff, 0x6f, 0xff, 0x93, 0x0b,
+	0x7f, 0xf1, 0xfa, 0xdf, 0xff,
+	0xff, 0xfb, 0x7f, 0xdf, 0xf7, 0xef, 0x8f, 0xff,
+	0x00, 0xef, 0xf0, 0xdf, 0x7f, 0xef, 0xff, 0xfb,
+	0x8f, 0x7f, 0x81, 0x6f, 0xd1,
+	0xff, 0xde, 0xff, 0xef, 0xb9, 0x49, 0x74, 0xf3,
+	0xef, 0x7b, 0x7f, 0xff, 0xeb, 0xf7, 0x85, 0x67,
+	0xf1, 0xf0, 0xe1, 0xff, 0xf7,
+	0x3f, 0xab, 0xff, 0xc4, 0xbb, 0xff, 0x8c, 0x9d,
+	0x7e, 0x3a, 0xb5, 0xbb, 0xe3, 0xfb, 0xf3, 0xcd,
+	0xe3, 0xff, 0xff, 0xff, 0xfe,
+	0xff, 0xdc, 0xf7, 0xf8, 0x77, 0x8f, 0xf7, 0xfe,
+	0x9f, 0x97, 0x7a, 0xf2, 0x7f, 0xfb, 0x8f, 0x1f,
+	0x7d, 0xfd, 0xef, 0xb1, 0x7d,
+	0xff, 0xef, 0xa6, 0xef, 0x98, 0x9d, 0xf0, 0xf4,
+	0xf4, 0xff, 0xff, 0x7f, 0x8f, 0x7f, 0x89, 0x7f,
+	0xe7, 0xff, 0xff, 0xf7, 0xfb,
+	0xbf, 0xa7, 0xb7, 0xdf, 0xba, 0xfd, 0xfe, 0xeb,
+	0xff, 0xff, 0xc4, 0xef, 0x8f, 0x7c, 0xf7, 0x8f,
+	0x7f, 0xf9, 0xfb, 0xff, 0xfb,
+	0xff, 0xff, 0xff, 0xeb, 0x87, 0xfd, 0xf4, 0xf7,
+	0x6f, 0xff, 0xbf, 0xff, 0xff, 0xef, 0xef, 0xdf,
+	0xff, 0xff, 0xff, 0xf7, 0xff,
+	0xff, 0xf7, 0x85, 0xdb, 0xf2, 0xbf, 0xd7, 0xff,
+	0xff, 0xfd, 0xff, 0xff, 0x8f, 0x7f, 0xf1, 0xaf,
+	0x7d, 0xff, 0xf7, 0xeb, 0xff,
+	0xbf, 0xfd, 0x8f, 0xff, 0xfa, 0x3f, 0xff, 0xf6,
+	0xb7, 0xff, 0xfe, 0xfb, 0x8f, 0x7f, 0xff, 0xff,
+	0xf3, 0xee, 0xbf, 0x7f, 0xff,
+	0xff, 0x67, 0xc6, 0xaf, 0xc3, 0x74, 0xf7, 0xfe,
+	0xee, 0x8a, 0x37, 0x6e, 0xec, 0x87, 0x71, 0x91,
+	0x13, 0x7d, 0xec, 0x87, 0xff,
+	0xbf, 0x7b, 0xf0, 0xef, 0xfb, 0x3f, 0xb7, 0xfc,
+	0xff, 0xff, 0x97, 0x7d, 0xe8, 0xef, 0x9d, 0x77,
+	0xfd, 0xfb, 0xff, 0xfb, 0xbf,
+	0xff, 0xff, 0xde, 0x77, 0xcd, 0xff, 0xf1, 0xfb,
+	0xff, 0xff, 0xf9, 0xe3, 0xff, 0xff, 0xef, 0xff,
+	0xff, 0xfc, 0xcf, 0xff, 0xf3,
+	0x7f, 0xff, 0xfe, 0x77, 0xaf, 0xf7, 0xf8, 0xef,
+	0xff, 0x76, 0xfa, 0xff, 0x99, 0x6d, 0x9f, 0x6f,
+	0xf1, 0xbf, 0x7f, 0x7f, 0xfc,
+	0xff, 0xff, 0xef, 0xbf, 0xeb, 0xfa, 0xdd, 0xef,
+	0xbc, 0xfd, 0xfd, 0xdf, 0xff, 0xf7, 0xff, 0xff,
+	0xd1, 0xfe, 0xff, 0xfb, 0xff,
+	0x3f, 0x70, 0xf8, 0xff, 0xf5, 0xff, 0xff, 0x9f,
+	0xf3, 0x09, 0x1f, 0xe1, 0xf3, 0xfd, 0xfd, 0xff,
+	0xef, 0xff, 0xf7, 0x8e, 0x1e,
+	0xff, 0xf8, 0x7f, 0xff, 0x77, 0xff, 0xff, 0x9b,
+	0x8f, 0x8e, 0xfb, 0xf1, 0xef, 0xe5, 0xfd, 0xef,
+	0xfe, 0x9f, 0x16, 0x03, 0x61,
+	0xbf, 0xf8, 0xfa, 0xfd, 0x73, 0xff, 0xff, 0xf7,
+	0xf7, 0x8d, 0x9f, 0xe1, 0xf1, 0xff, 0xef, 0xff,
+	0xfc, 0xff, 0xff, 0x8f, 0x0f,
+	0xff, 0xf8, 0x7f, 0xff, 0xf7, 0xf7, 0xfd, 0xff,
+	0x9f, 0x8f, 0xe1, 0xf1, 0xef, 0xff, 0xff, 0xff,
+	0xfd, 0xff, 0x8e, 0x0f, 0x7d,
+	0xff, 0xf7, 0xf9, 0xfe, 0xf3, 0x7f, 0xff, 0xf7,
+	0xf7, 0xf3, 0xfd, 0xef, 0xff, 0xf9, 0xed, 0xff,
+	0xff, 0xef, 0xff, 0xf7, 0xff,
+	0xff, 0xf7, 0x7e, 0xfe, 0xf7, 0xff, 0x8b, 0xf7,
+	0xfc, 0xeb, 0xeb, 0xed, 0xeb, 0xf9, 0xfd, 0xff,
+	0x8f, 0x7f, 0xf2, 0xfe, 0xed,
+	0x7f, 0xf8, 0xff, 0xff, 0xf7, 0xff, 0xff, 0xf7,
+	0xf7, 0x8d, 0xff, 0xe8, 0xff, 0xfd, 0xef, 0xfe,
+	0xfd, 0xdf, 0xf6, 0x8f, 0x6f,
+	0xbf, 0xff, 0x78, 0xff, 0xf7, 0xff, 0xfb, 0xff,
+	0xff, 0xe3, 0x9f, 0xe5, 0xea, 0xf5, 0xfd, 0xff,
+	0xed, 0xef, 0xff, 0xf7, 0x8f,
+	0xff, 0x07, 0xff, 0xf9, 0xff, 0xff, 0xff, 0xf7,
+	0x8f, 0xff, 0xf3, 0x93, 0xff, 0xff, 0xff, 0xef,
+	0xff, 0xf7, 0x8f, 0x7f, 0xf3,
+	0xff, 0xf8, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+	0xf7, 0x8b, 0xff, 0xe8, 0xfb, 0xff, 0xff, 0xef,
+	0xef, 0xf7, 0xf5, 0x8e, 0x7f,
+	0x3f, 0xec, 0xf9, 0xfc, 0x8f, 0x7f, 0xf0, 0xef,
+	0xef, 0xff, 0x1d, 0xed, 0x7e, 0xfd, 0x8f, 0x6e,
+	0xf1, 0xd7, 0xf7, 0xde, 0x8c,
+	0xff, 0x80, 0x7f, 0xf8, 0xff, 0x7f, 0xff, 0xff,
+	0xfb, 0x8f, 0x6f, 0x90, 0xff, 0xf3, 0xff, 0xff,
+	0xff, 0xff, 0xfe, 0x8f, 0x7f,
+	0xff, 0x87, 0xfb, 0xf8, 0xff, 0xff, 0xff, 0xff,
+	0x7f, 0x9f, 0xff, 0x93, 0x7f, 0xf2, 0xff, 0xfe,
+	0xef, 0xff, 0xff, 0x9f, 0x69,
+	0xff, 0xfb, 0xef, 0xff, 0xf6, 0xff, 0xff, 0xff,
+	0x1f, 0x73, 0xfe, 0xf6, 0xff, 0xff, 0xff, 0xef,
+	0xef, 0xe7, 0x97, 0x77, 0xf7,
+	0xff, 0xff, 0xff, 0xff, 0xe7, 0x1f, 0x86, 0x95,
+	0xf0, 0xf6, 0xf7, 0xff, 0xff, 0xff, 0xfe, 0x8f,
+	0x6d, 0x93, 0x71, 0xf8, 0xfd,
+	0xff, 0xfe, 0xef, 0xfd, 0xf2, 0xff, 0xf6, 0xff,
+	0x6f, 0xef, 0xf7, 0xfd, 0xff, 0xff, 0xfd, 0xff,
+	0xfd, 0xff, 0xef, 0xff, 0xf5,
+	0x3f, 0x82, 0xf8, 0xf8, 0xe6, 0x7f, 0xf2, 0xff,
+	0xff, 0xff, 0x87, 0x87, 0xf0, 0xf0, 0xfc, 0xef,
+	0xfd, 0xf7, 0xef, 0xee, 0x87,
+	0xff, 0xff, 0xef, 0xff, 0xe7, 0xff, 0xf6, 0xf7,
+	0x7f, 0xfd, 0xff, 0xff, 0xff, 0xff, 0xff, 0xef,
+	0xff, 0xf7, 0xff, 0xff, 0xff,
+	0xff, 0xf7, 0xff, 0xf2, 0xe6, 0xff, 0xf5, 0xf7,
+	0xff, 0xff, 0xff, 0xe7, 0xff, 0xf7, 0xff, 0xfe,
+	0xff, 0xf7, 0xef, 0xff, 0xf7,
+	0xff, 0xfa, 0xeb, 0xff, 0xe3, 0xff, 0xf5, 0xff,
+	0xff, 0xff, 0xf7, 0xef, 0xf7, 0xff, 0xfd, 0xee,
+	0xfd, 0xff, 0xff, 0xef, 0xef,
+	0xff, 0xf6, 0xfb, 0x7a, 0xe7, 0xff, 0x91, 0xef,
+	0xff, 0xe2, 0xff, 0xf7, 0xf7, 0xf7, 0xfd, 0xff,
+	0xfd, 0xef, 0xeb, 0xf5, 0xe7,
+	0xff, 0xff, 0x8f, 0xbe, 0xf1, 0x93, 0xfd, 0xf1,
+	0xff, 0xff, 0xff, 0xff, 0x2e, 0x2f, 0x59, 0x8f,
+	0x6f, 0xf9, 0xf7, 0xff, 0xfa,
+	0xff, 0x4f, 0xbf, 0xc4, 0xfb, 0xf5, 0x0f, 0xff,
+	0x00, 0xff, 0xd0, 0x7f, 0x70, 0xaf, 0x7f, 0xff,
+	0x8f, 0x7f, 0x81, 0x7f, 0xb1,
+	0xff, 0xff, 0xda, 0xff, 0x2f, 0x4f, 0x7e, 0xf9,
+	0xfb, 0xff, 0x5f, 0xef, 0xff, 0xff, 0x99, 0x29,
+	0x71, 0xf1, 0xed, 0xff, 0xff,
+	0x3f, 0xb7, 0xef, 0xdf, 0xff, 0xf9, 0xfe, 0xfd,
+	0xff, 0xff, 0xb7, 0x9f, 0xff, 0xab, 0x73, 0xfd,
+	0xad, 0x3c, 0x6b, 0xff, 0xfa,
+	0xff, 0xe8, 0xf7, 0xbf, 0x6f, 0x8f, 0xff, 0xfe,
+	0xff, 0x87, 0x7f, 0xe0, 0x7f, 0xbf, 0x5f, 0x93,
+	0x7e, 0xe4, 0xf6, 0x97, 0x7b,
+	0xff, 0xdf, 0x27, 0xaf, 0xa7, 0xff, 0xf4, 0xf6,
+	0xff, 0xff, 0xff, 0x5f, 0xdf, 0xfb, 0x87, 0x1f,
+	0x70, 0xf3, 0xfe, 0x7f, 0xfb,
+	0xbf, 0xb7, 0x61, 0xb5, 0xfc, 0xff, 0xf7, 0xff,
+	0xbf, 0xff, 0xa2, 0xff, 0xd8, 0xa1, 0x77, 0xdf,
+	0xe6, 0xff, 0xff, 0x7e, 0xc4,
+	0xff, 0xff, 0xf6, 0xd7, 0x97, 0xdb, 0xe8, 0xff,
+	0xff, 0xff, 0xfd, 0xff, 0xff, 0xff, 0xb9, 0x3b,
+	0xf8, 0xff, 0xef, 0xe7, 0xbe,
+	0xff, 0xff, 0x86, 0xbf, 0xe2, 0xad, 0xff, 0xff,
+	0xff, 0xff, 0x9f, 0xff, 0x8f, 0x3f, 0x63, 0xcf,
+	0x7b, 0xfe, 0xff, 0xfd, 0xfe,
+	0xff, 0xff, 0xdf, 0xff, 0xba, 0x7f, 0xf7, 0xee,
+	0x17, 0xf7, 0xee, 0xef, 0x97, 0x7f, 0xf7, 0xff,
+	0xff, 0xfd, 0x9e, 0x77, 0xf3,
+	0xff, 0xfb, 0xc3, 0x8f, 0xc1, 0x70, 0x71, 0xff,
+	0xf7, 0x9f, 0x77, 0x7e, 0xb6, 0x4f, 0xb9, 0x01,
+	0x1f, 0x1b, 0x7a, 0x9a, 0x7e,
+	0xbf, 0xff, 0xf0, 0x9f, 0xef, 0x79, 0x3f, 0xf6,
+	0xff, 0xfd, 0x9d, 0x7b, 0xf2, 0xff, 0xc9, 0xf3,
+	0xff, 0x7d, 0xfb, 0xfd, 0xbf,
+	0xff, 0xfd, 0xbf, 0x77, 0x8f, 0xff, 0xf1, 0xf7,
+	0xff, 0xff, 0xff, 0xfd, 0xbb, 0x7f, 0xbf, 0x6f,
+	0xf3, 0xfe, 0xff, 0xe7, 0xbf,
+	0x7f, 0xff, 0xff, 0x5f, 0xaf, 0xf1, 0xfc, 0xf7,
+	0xff, 0x77, 0xfe, 0xff, 0xdf, 0xff, 0xdf, 0xff,
+	0xe3, 0x9e, 0x7f, 0x7a, 0xe3,
+	0xff, 0xff, 0x6f, 0xff, 0xaf, 0xfc, 0xff, 0xff,
+	0xfe, 0xfe, 0xfe, 0xff, 0xff, 0xff, 0xf3, 0xfb,
+	0xf7, 0xff, 0xf9, 0xfe, 0xff,
+	0x3f, 0x70, 0xf8, 0xff, 0xf7, 0xff, 0xff, 0xff,
+	0xff, 0x0f, 0x0f, 0xf1, 0xf1, 0xff, 0xf7, 0xff,
+	0xef, 0xff, 0xf7, 0x8c, 0x1e,
+	0xff, 0xf8, 0x7f, 0xff, 0x7f, 0xf7, 0xff, 0x8f,
+	0x8f, 0x88, 0xf1, 0xf1, 0xef, 0xff, 0xf7, 0xff,
+	0xee, 0x97, 0x1e, 0x01, 0x61,
+	0xbf, 0xf0, 0xfa, 0xfd, 0x75, 0xff, 0xf5, 0xff,
+	0xff, 0x8f, 0x9f, 0xe1, 0xf1, 0xff, 0xf7, 0xef,
+	0xfe, 0xff, 0xff, 0x8f, 0x1f,
+	0xff, 0xfa, 0x7f, 0xff, 0xfd, 0xff, 0xfd, 0xff,
+	0x9f, 0x9f, 0xf9, 0xf9, 0xff, 0xef, 0xf7, 0xff,
+	0xff, 0xff, 0x9e, 0x0f, 0x75,
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xf7,
+	0xff, 0xf7, 0xf7, 0xff, 0xef, 0xf7, 0xe7, 0xef,
+	0xef, 0xef, 0xff, 0xff, 0xef,
+	0xff, 0xff, 0x7f, 0xff, 0xff, 0xff, 0x8f, 0xff,
+	0xf8, 0xf7, 0xff, 0xf7, 0xff, 0xf7, 0xe7, 0xef,
+	0x9f, 0x6f, 0xf0, 0xff, 0xff,
+	0x7f, 0xf8, 0xff, 0xff, 0xfd, 0xff, 0xfd, 0x8f,
+	0xff, 0x8f, 0xff, 0xf0, 0xff, 0xff, 0xf7, 0xef,
+	0xf7, 0xff, 0xff, 0x9d, 0x7e,
+	0xbf, 0xff, 0x78, 0xff, 0xfd, 0xff, 0xfd, 0xf7,
+	0xff, 0xf7, 0x8f, 0xf7, 0xf0, 0xf7, 0xf7, 0xff,
+	0xf7, 0xef, 0xfe, 0xe7, 0x9f,
+	0xff, 0x8f, 0x7f, 0xf8, 0xff, 0xff, 0xff, 0xff,
+	0x8f, 0xff, 0xf8, 0x8f, 0xff, 0xf8, 0xff, 0xef,
+	0xff, 0xff, 0x8e, 0x6f, 0xe1,
+	0xff, 0xf8, 0x7f, 0xff, 0xff, 0xff, 0xff, 0xff,
+	0xf7, 0x87, 0xff, 0xf0, 0xff, 0xff, 0xff, 0xff,
+	0xef, 0xef, 0xff, 0x9f, 0x7f,
+	0x3f, 0xff, 0xf8, 0xff, 0x8f, 0x7f, 0xf0, 0x9f,
+	0xf7, 0xfb, 0x07, 0xe7, 0x78, 0xf7, 0x8f, 0x7e,
+	0xf1, 0x9f, 0x7f, 0xff, 0x9e,
+	0xff, 0x80, 0x7f, 0xf8, 0xff, 0x7f, 0xff, 0xff,
+	0xf7, 0x8f, 0x6f, 0x80, 0xff, 0xf1, 0xff, 0xff,
+	0xef, 0xff, 0xfe, 0x9f, 0x7f,
+	0xff, 0x88, 0xff, 0xf8, 0xff, 0xff, 0xff, 0xff,
+	0x7f, 0x9f, 0xef, 0x81, 0x7f, 0xf0, 0xff, 0xfe,
+	0xff, 0xff, 0xef, 0x9f, 0x7f,
+	0xff, 0x7f, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+	0x97, 0x77, 0xf8, 0xff, 0xef, 0xff, 0xf7, 0xff,
+	0xef, 0xef, 0x8f, 0x76, 0xf1,
+	0xff, 0xff, 0xff, 0xff, 0xf7, 0x0f, 0xf7, 0x88,
+	0xf7, 0xf0, 0xff, 0xff, 0xef, 0xff, 0xef, 0x8e,
+	0x07, 0x99, 0x61, 0xe1, 0xff,
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xf7, 0xf7,
+	0xff, 0xff, 0xf7, 0xf7, 0xef, 0xff, 0xe7, 0xee,
+	0xff, 0xff, 0xff, 0xff, 0xff,
+	0xbf, 0x87, 0xf8, 0xf8, 0xff, 0x7f, 0xf7, 0xff,
+	0xff, 0xff, 0x8f, 0x8f, 0xe0, 0xf0, 0xef, 0xff,
+	0xf7, 0xff, 0xff, 0xff, 0x8f,
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xf7, 0xff,
+	0x7f, 0xff, 0xff, 0xff, 0xef, 0xff, 0xe7, 0xff,
+	0xf6, 0xff, 0xff, 0xff, 0xff,
+	0xff, 0xff, 0xff, 0xf7, 0xff, 0xff, 0xf7, 0xff,
+	0xff, 0xff, 0xff, 0xff, 0xef, 0xff, 0xef, 0xff,
+	0xf7, 0xff, 0xff, 0xff, 0xff,
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xf7, 0xff,
+	0xff, 0xff, 0xff, 0xff, 0x6f, 0xff, 0xe7, 0xff,
+	0xf7, 0xff, 0xff, 0xff, 0xff,
+	0xff, 0xff, 0x7f, 0xff, 0xff, 0xff, 0xf7, 0xff,
+	0xff, 0xf7, 0xff, 0xff, 0xef, 0xff, 0xef, 0xff,
+	0x97, 0xee, 0xf9, 0xf7, 0xff,
+	0xff, 0xff, 0xff, 0xff, 0x80, 0x88, 0xff, 0xf8,
+	0xff, 0xff, 0xf7, 0xff, 0x0f, 0x1f, 0x79, 0x9b,
+	0x7f, 0xf0, 0xfe, 0xff, 0xff,
+	0xff, 0x4f, 0x7b, 0xf7, 0xf7, 0xf8, 0x0f, 0xff,
+	0x00, 0xff, 0xd0, 0x4f, 0x75, 0x8c, 0x79, 0xff,
+	0x8f, 0x7f, 0x81, 0x7e, 0xb1,
+	0xff, 0xf7, 0xff, 0xfe, 0x8f, 0x7f, 0x70, 0xf0,
+	0xff, 0xf7, 0x7f, 0xff, 0xf7, 0xff, 0x84, 0x0e,
+	0x73, 0xff, 0xf7, 0xff, 0xff,
+	0x3f, 0xbd, 0xfd, 0xfb, 0xf7, 0xe8, 0xff, 0xff,
+	0x78, 0xf0, 0x3f, 0xbf, 0xe3, 0x9b, 0x6f, 0xff,
+	0x97, 0x1f, 0x7f, 0xcf, 0xfe,
+	0xff, 0xf8, 0xf7, 0xff, 0x8f, 0x80, 0xff, 0xf8,
+	0xff, 0x8f, 0x78, 0xf0, 0x7f, 0x9f, 0x7f, 0x9b,
+	0x7f, 0xf1, 0xff, 0x97, 0x7f,
+	0xff, 0xff, 0x07, 0xff, 0x87, 0x7f, 0xf0, 0xf8,
+	0xff, 0x7f, 0xfb, 0x7f, 0xee, 0xfb, 0x99, 0x19,
+	0x73, 0xef, 0xf7, 0xef, 0xff,
+	0xbf, 0x87, 0x04, 0xfc, 0xff, 0x08, 0xf7, 0xff,
+	0x7b, 0x7f, 0x8e, 0x8f, 0xf9, 0x98, 0x6f, 0xf3,
+	0xff, 0xef, 0xff, 0xff, 0xdf,
+	0xff, 0xff, 0x73, 0xff, 0xf7, 0x9f, 0xf8, 0xfb,
+	0x7f, 0xff, 0xff, 0xff, 0xff, 0xff, 0x8f, 0x3d,
+	0x61, 0xff, 0xef, 0xff, 0xff,
+	0xff, 0x7f, 0x07, 0xff, 0xf8, 0x78, 0xff, 0xee,
+	0xfb, 0xff, 0xff, 0xff, 0x87, 0x1f, 0x71, 0xe3,
+	0xff, 0xfb, 0xff, 0xff, 0xff,
+	0xff, 0x77, 0x8b, 0x7f, 0xf8, 0x7f, 0xff, 0xff,
+	0x07, 0xe7, 0xfa, 0x77, 0x8f, 0x7f, 0xff, 0xef,
+	0xf1, 0xef, 0x9f, 0x77, 0xf9,
+	0xff, 0xf8, 0x73, 0x8f, 0xf8, 0x0f, 0x88, 0x88,
+	0xf8, 0x98, 0x77, 0x78, 0x8f, 0x6f, 0x87, 0x7b,
+	0xf7, 0xff, 0xef, 0x87, 0x6f,
+	0xbf, 0x7f, 0xf0, 0xff, 0x8f, 0x7f, 0xff, 0xff,
+	0x7e, 0xff, 0x9f, 0x7f, 0xf0, 0xff, 0xff, 0xeb,
+	0xef, 0xff, 0xfb, 0xff, 0x9f,
+	0xff, 0xff, 0xff, 0x77, 0xf8, 0x7f, 0xf8, 0xf7,
+	0xff, 0x7f, 0xf7, 0xff, 0x9f, 0x7f, 0x9b, 0x6f,
+	0xf1, 0xfe, 0xff, 0xfe, 0xff,
+	0x7f, 0x7f, 0x8f, 0xff, 0x8f, 0xff, 0x7f, 0x8f,
+	0xff, 0x70, 0xfb, 0x6f, 0xff, 0xff, 0xff, 0xf5,
+	0xf9, 0xff, 0xff, 0xff, 0xf4,
+	0xff, 0x87, 0xff, 0x74, 0xff, 0x7f, 0xff, 0xff,
+	0x7e, 0xff, 0xff, 0x8f, 0xff, 0xf1, 0xff, 0xff,
+	0xe9, 0xff, 0xf7, 0xff, 0xff,
+	0xbf, 0x78, 0xf8, 0x7f, 0xf7, 0xff, 0xff, 0xff,
+	0xf7, 0x07, 0x1f, 0xe1, 0xf1, 0xff, 0xf7, 0xff,
+	0xef, 0xef, 0xff, 0x8e, 0x0f,
+	0xff, 0xf8, 0x7f, 0xff, 0xff, 0xff, 0xff, 0x87,
+	0x9f, 0x88, 0xf1, 0xe1, 0xff, 0xef, 0xf7, 0xef,
+	0xfe, 0x9f, 0x0f, 0x09, 0x71,
+	0xbf, 0xf0, 0xf8, 0xff, 0x77, 0xff, 0xff, 0xff,
+	0xff, 0x8f, 0x8f, 0xf0, 0xf0, 0xff, 0xf7, 0xff,
+	0xfe, 0xf7, 0xff, 0x8e, 0x1f,
+	0x7f, 0xf8, 0x7f, 0xff, 0xff, 0xff, 0xff, 0xff,
+	0x8f, 0x8f, 0xf9, 0xf8, 0xfe, 0xff, 0xe7, 0xf7,
+	0xff, 0xff, 0x96, 0x0f, 0x61,
+	0x7f, 0xff, 0xff, 0xff, 0xf7, 0xff, 0xff, 0xff,
+	0xff, 0xff, 0xf7, 0xef, 0xff, 0xf7, 0xe7, 0xef,
+	0xff, 0xe7, 0xff, 0xf7, 0xfe,
+	0xff, 0xf7, 0x7f, 0xff, 0xff, 0xff, 0x8f, 0xff,
+	0xf8, 0xef, 0xef, 0xef, 0xff, 0xf7, 0xf7, 0xff,
+	0x9f, 0x67, 0xf0, 0xff, 0xff,
+	0x7f, 0xfc, 0xff, 0xff, 0xff, 0xff, 0xff, 0x8f,
+	0xff, 0x8f, 0xff, 0xe0, 0xf7, 0xff, 0xf7, 0xfe,
+	0xf7, 0xf7, 0xff, 0x8f, 0x6e,
+	0x3f, 0xfb, 0x7c, 0xff, 0xff, 0xff, 0xf7, 0xff,
+	0xff, 0xe7, 0x9f, 0xef, 0xf0, 0xff, 0xe7, 0xef,
+	0xf7, 0xef, 0xf6, 0xf6, 0x87,
+	0xff, 0x07, 0xff, 0xf8, 0xff, 0xff, 0xff, 0xff,
+	0x8f, 0xff, 0xf4, 0x9f, 0xff, 0xfc, 0xff, 0xff,
+	0xff, 0xff, 0x8f, 0x7f, 0xf0,
+	0x7f, 0xfc, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+	0xf7, 0x87, 0xff, 0xe8, 0xff, 0xf7, 0xff, 0xff,
+	0xef, 0xe7, 0xf7, 0x8f, 0x6f,
+	0x3f, 0xff, 0xfc, 0xff, 0x8f, 0x7f, 0xf0, 0xcf,
+	0xef, 0xe8, 0x1b, 0xef, 0x7c, 0xff, 0x8f, 0x7e,
+	0xe1, 0x97, 0x77, 0xff, 0x9e,
+	0xff, 0x80, 0x7f, 0xfc, 0xff, 0x7f, 0xff, 0xff,
+	0xf7, 0x8f, 0x7f, 0x80, 0xff, 0xf1, 0xff, 0xfe,
+	0xef, 0xff, 0xff, 0x9f, 0x7f,
+	0xff, 0x84, 0xff, 0xf8, 0xff, 0xff, 0xff, 0xff,
+	0x6f, 0x9f, 0xff, 0x91, 0x7f, 0xf0, 0xff, 0xff,
+	0xff, 0xff, 0xff, 0x8f, 0x7f,
+	0xff, 0xfb, 0xff, 0xff, 0xfb, 0xff, 0xff, 0xff,
+	0x1f, 0x77, 0xf8, 0xf7, 0xef, 0xff, 0xf7, 0xff,
+	0xf7, 0xef, 0x87, 0x67, 0xf1,
+	0xff, 0xff, 0xff, 0xff, 0xff, 0x0f, 0x8b, 0x8c,
+	0xf0, 0xf8, 0xf7, 0xff, 0xef, 0xff, 0xe7, 0x9e,
+	0x67, 0x89, 0x77, 0xf1, 0xff,
+	0xff, 0xff, 0xff, 0xff, 0xf3, 0xff, 0xff, 0xff,
+	0xff, 0xef, 0xfb, 0xff, 0xef, 0xff, 0xe7, 0xff,
+	0xf7, 0xf7, 0xff, 0xff, 0xf7,
+	0xbf, 0x87, 0xf8, 0xf8, 0xf7, 0x7f, 0xfb, 0xff,
+	0xff, 0xff, 0x8f, 0x8f, 0xe0, 0xf0, 0xe7, 0xfe,
+	0xf7, 0xff, 0xff, 0xff, 0x8e,
+	0xff, 0xff, 0xff, 0xff, 0xfb, 0xff, 0xfb, 0xff,
+	0x7f, 0xff, 0xff, 0xff, 0xff, 0xff, 0xef, 0xff,
+	0xf7, 0xff, 0xff, 0xff, 0xff,
+	0xff, 0xff, 0xff, 0xf7, 0xfb, 0xff, 0xfb, 0xff,
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xfe, 0xff,
+	0xf7, 0xff, 0xff, 0xff, 0xfe,
+	0xff, 0xff, 0xff, 0xff, 0xf3, 0xff, 0xff, 0xff,
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xfe, 0xff,
+	0xff, 0xff, 0xff, 0xff, 0xff,
+	0xff, 0xff, 0xff, 0x7f, 0xf7, 0xff, 0x8b, 0xff,
+	0xfc, 0xf3, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+	0xff, 0xee, 0xff, 0xf6, 0xff,
+	0xff, 0xf7, 0x8f, 0xbf, 0xf9, 0x8f, 0xff, 0xf0,
+	0xff, 0xff, 0x7f, 0xff, 0x1f, 0x1f, 0x71, 0x89,
+	0x7f, 0xf1, 0xff, 0xff, 0xff,
+	0xff, 0x4f, 0xb8, 0xc6, 0xfb, 0xfd, 0x0f, 0xff,
+	0x00, 0xff, 0xd0, 0x7f, 0x79, 0x90, 0x7f, 0xf9,
+	0x8f, 0x7f, 0x81, 0x7f, 0x81,
+	0xff, 0xff, 0xcf, 0xff, 0xb0, 0x4f, 0x77, 0xf4,
+	0xff, 0xff, 0x7f, 0xe7, 0xee, 0xff, 0x97, 0x07,
+	0x69, 0xf1, 0xf7, 0xff, 0xff,
+	0x3f, 0xba, 0xff, 0x4d, 0xfe, 0xe5, 0xff, 0xff,
+	0x7f, 0xef, 0xbf, 0x9f, 0xe7, 0x9f, 0x77, 0xe9,
+	0x9f, 0x1f, 0x79, 0xc1, 0xfe,
+	0xff, 0xf8, 0xf7, 0x3f, 0xff, 0x9f, 0xf7, 0xf8,
+	0xff, 0x87, 0x7f, 0xf0, 0x7f, 0x97, 0x7f, 0x89,
+	0x7e, 0xf1, 0xff, 0x9f, 0x7f,
+	0xff, 0xff, 0x37, 0xbf, 0xb3, 0x7f, 0xf2, 0xff,
+	0xff, 0xf7, 0xff, 0x7f, 0x7b, 0xfe, 0x87, 0x1f,
+	0x71, 0xf1, 0xff, 0x7f, 0xfb,
+	0xff, 0xff, 0x70, 0xb7, 0xfe, 0x7b, 0xff, 0xf3,
+	0xbf, 0xf7, 0xff, 0xff, 0xf9, 0x9f, 0x7f, 0xf1,
+	0xff, 0xf7, 0xff, 0xff, 0xfb,
+	0xbf, 0xff, 0xf4, 0xcf, 0x87, 0xd8, 0xf8, 0xf8,
+	0xff, 0xff, 0x8f, 0xff, 0xe9, 0xff, 0x8f, 0x1f,
+	0x71, 0xff, 0xef, 0xff, 0x8d,
+	0xff, 0xff, 0x87, 0xbf, 0xf9, 0x3f, 0xff, 0xf7,
+	0xff, 0xff, 0xff, 0xff, 0x9f, 0x1f, 0x71, 0xf9,
+	0xff, 0x7b, 0xff, 0xfe, 0xff,
+	0xff, 0xff, 0xcb, 0xff, 0xbd, 0x7f, 0xfb, 0xff,
+	0x8f, 0xff, 0xf8, 0x7f, 0x9f, 0x7f, 0xf1, 0xef,
+	0xff, 0xf7, 0x8f, 0x7f, 0xf9,
+	0xff, 0xf8, 0x43, 0x8f, 0xc4, 0x75, 0x7d, 0xff,
+	0xff, 0x97, 0x7f, 0x78, 0x8f, 0x6f, 0x99, 0x17,
+	0x19, 0x71, 0xf9, 0x8f, 0x6f,
+	0xbf, 0x7f, 0xf0, 0x8f, 0xf6, 0x7d, 0x37, 0xff,
+	0xff, 0xff, 0x9f, 0x7f, 0xe0, 0xff, 0xff, 0xef,
+	0xff, 0xf7, 0xfb, 0xff, 0x8f,
+	0xff, 0xff, 0xbf, 0x77, 0x8e, 0xff, 0xf0, 0xff,
+	0xff, 0xf7, 0xf7, 0x7f, 0x97, 0x7f, 0x99, 0x7f,
+	0xf9, 0xfe, 0xff, 0xfe, 0xff,
+	0x7f, 0xff, 0xff, 0xcf, 0xbf, 0xf9, 0xfa, 0xff,
+	0xff, 0xff, 0xf3, 0xff, 0xff, 0xff, 0xff, 0xff,
+	0xf7, 0x8f, 0x7f, 0x71, 0xf6,
+	0xff, 0xff, 0xff, 0x7f, 0xb7, 0xfe, 0xfb, 0xff,
+	0xf6, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xf7,
+	0xff, 0xff, 0xf7, 0xff, 0xff,
+	0x3f, 0x78, 0xf8, 0xff, 0xff, 0xff, 0xff, 0x8f,
+	0xff, 0x08, 0x0f, 0xf1, 0xf1, 0xff, 0xff, 0xff,
+	0xff, 0xff, 0xff, 0x8e, 0x0e,
+	0xff, 0xf8, 0x7f, 0xff, 0x7f, 0xff, 0xff, 0x8f,
+	0x8f, 0x80, 0xf1, 0xf1, 0xff, 0xff, 0xff, 0xff,
+	0xfe, 0x8f, 0x0e, 0x01, 0x71,
+	0xbf, 0xf8, 0xf8, 0xff, 0x7f, 0xff, 0xff, 0xff,
+	0xff, 0x8f, 0x8f, 0xf1, 0xf1, 0xff, 0xff, 0xff,
+	0xfe, 0xff, 0xff, 0x8f, 0x0f,
+	0xff, 0xf8, 0x7f, 0xff, 0xff, 0xff, 0xff, 0xff,
+	0x8f, 0x8f, 0xf1, 0xf1, 0xff, 0xff, 0xff, 0xff,
+	0xff, 0xff, 0x8e, 0x0f, 0x71,
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+	0xff, 0xff, 0xff, 0xff, 0xff,
+	0xff, 0xff, 0x7f, 0xff, 0xff, 0xff, 0x8f, 0xff,
+	0xf0, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+	0x8f, 0x7f, 0xf0, 0xff, 0xff,
+	0x7f, 0xf8, 0xff, 0xff, 0xff, 0xff, 0xff, 0x8f,
+	0xff, 0x88, 0xff, 0xf0, 0xff, 0xff, 0xff, 0xff,
+	0xff, 0xff, 0xff, 0x8f, 0x7e,
+	0xbf, 0xff, 0x78, 0xff, 0xff, 0xff, 0xff, 0xff,
+	0xff, 0xf7, 0x8f, 0xf7, 0xf0, 0xff, 0xff, 0xff,
+	0xff, 0xff, 0xfe, 0xff, 0x8f,
+	0xff, 0x87, 0x7f, 0xf8, 0xff, 0xff, 0xff, 0xff,
+	0x8f, 0xff, 0xf8, 0x8f, 0xf7, 0xf8, 0xff, 0xff,
+	0xff, 0xff, 0x8e, 0x7f, 0xf1,
+	0xff, 0xf8, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+	0xff, 0x87, 0xff, 0xf0, 0xff, 0xff, 0xff, 0xff,
+	0xff, 0xff, 0xff, 0x8f, 0x7f,
+	0x3f, 0xff, 0xf8, 0xff, 0x8f, 0x7f, 0xf0, 0xdf,
+	0xff, 0xf6, 0x07, 0xff, 0x78, 0xff, 0x8f, 0x7e,
+	0xf1, 0x9f, 0x7f, 0xfd, 0x8e,
+	0xff, 0x80, 0x7f, 0xf8, 0xff, 0x7f, 0xff, 0xff,
+	0xf7, 0x8f, 0x7f, 0x80, 0xff, 0xf1, 0xff, 0xff,
+	0xff, 0xff, 0xfe, 0x8f, 0x7f,
+	0xff, 0x80, 0xff, 0xf8, 0xff, 0xff, 0xff, 0xff,
+	0x7f, 0x8f, 0xff, 0x81, 0x7f, 0xf0, 0xff, 0xfe,
+	0xff, 0xff, 0xff, 0x8f, 0x7f,
+	0xff, 0x7f, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+	0x8f, 0x77, 0xf0, 0xff, 0xff, 0xff, 0xff, 0xff,
+	0xff, 0xff, 0x8f, 0x6e, 0xf1,
+	0xff, 0xff, 0xff, 0xff, 0xff, 0x0f, 0x8f, 0x88,
+	0xf0, 0xf0, 0xff, 0xff, 0xff, 0xff, 0xff, 0x8e,
+	0x7f, 0x81, 0x7f, 0xf1, 0xff,
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+	0x7f, 0xff, 0xf7, 0xff, 0xff, 0xff, 0xff, 0xfe,
+	0xff, 0xff, 0xff, 0xff, 0xff,
+	0xbf, 0x87, 0xf8, 0xf8, 0xff, 0x7f, 0xff, 0xff,
+	0xff, 0xff, 0x8f, 0x8f, 0xf0, 0xf0, 0xff, 0xff,
+	0xff, 0xff, 0xff, 0xff, 0x8f,
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+	0x7f, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+	0xff, 0xff, 0xff, 0xff, 0xff,
+	0xff, 0xff, 0xff, 0xf7, 0xff, 0xff, 0xff, 0xff,
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xfe,
+	0xff, 0xff, 0xff, 0xff, 0xff,
+	0xff, 0xff, 0xff, 0xff, 0xf7, 0xff, 0xf7, 0xff,
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xfe,
+	0xff, 0xff, 0xff, 0xff, 0xff,
+	0xff, 0xff, 0xff, 0xff, 0xf7, 0xff, 0x87, 0xff,
+	0xf8, 0xf7, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+	0xfe, 0xfe, 0xff, 0xff, 0xff,
+	0xff, 0xff, 0x3f, 0x8f, 0xf0, 0x85, 0xff, 0xf0,
+	0xff, 0xff, 0xff, 0x7f, 0x0d, 0x0f, 0x71, 0x81,
+	0x7e, 0xf1, 0xfe, 0xff, 0xff,
+	0xff, 0x5f, 0x3d, 0xf0, 0xf5, 0xfa, 0x0f, 0xff,
+	0x00, 0xff, 0x80, 0x0f, 0xf1, 0x88, 0x7f, 0xf1,
+	0x8f, 0x7e, 0x81, 0x7e, 0xc1,
+	0xff, 0xff, 0xff, 0xff, 0xba, 0x4f, 0x75, 0xfa,
+	0xff, 0xff, 0x7f, 0xff, 0xff, 0xff, 0x8f, 0x0f,
+	0x71, 0xf1, 0xff, 0xff, 0xff,
+	0x3f, 0xbf, 0xff, 0xcf, 0xff, 0xfa, 0xff, 0xfe,
+	0x7f, 0xdf, 0x7f, 0xf4, 0xff, 0x8f, 0x7f, 0xf1,
+	0x8f, 0x0f, 0x71, 0xf1, 0xbe,
+	0xff, 0xf8, 0xf7, 0xbb, 0x7f, 0x85, 0xff, 0xf0,
+	0xff, 0x8f, 0x7f, 0xf0, 0x7f, 0x87, 0x7f, 0x81,
+	0x7e, 0xf1, 0x8f, 0x0f, 0x71,
+	0xff, 0xff, 0x87, 0x8f, 0x8d, 0xfd, 0xf5, 0xff,
+	0xfb, 0xff, 0xff, 0xff, 0xf7, 0xfe, 0x8f, 0x0f,
+	0x71, 0xf1, 0xfe, 0x7f, 0xf7,
+	0xbf, 0x07, 0xc0, 0xbf, 0xf7, 0xfd, 0xff, 0xff,
+	0xbf, 0xff, 0x85, 0x8f, 0xf9, 0x8f, 0x7f, 0xf1,
+	0xff, 0x7f, 0xf6, 0xff, 0x83,
+	0xff, 0xff, 0xf4, 0xff, 0x8f, 0xda, 0xf0, 0xb6,
+	0xdf, 0xfd, 0xf6, 0xff, 0xf9, 0xff, 0x8f, 0x1f,
+	0x71, 0xfd, 0x8f, 0x7b, 0xfd,
+	0xff, 0xff, 0xb7, 0x8f, 0xf0, 0xbd, 0xff, 0xfd,
+	0xf7, 0xff, 0xff, 0xff, 0x8f, 0x0f, 0x71, 0xf1,
+	0xff, 0x7b, 0xff, 0xff, 0xff,
+	0xff, 0xff, 0xff, 0xff, 0xba, 0x7f, 0xf5, 0xf7,
+	0x0f, 0xf7, 0xf0, 0x7f, 0x87, 0x7f, 0xf1, 0xff,
+	0xff, 0xfe, 0x8f, 0x7f, 0xf1,
+	0xff, 0xf8, 0x47, 0x8f, 0xca, 0x70, 0x7a, 0xff,
+	0xff, 0x8f, 0x7f, 0x70, 0x8f, 0x7f, 0x81, 0x0e,
+	0x01, 0x01, 0x71, 0x81, 0x7f,
+	0xbf, 0x7f, 0xf0, 0x8f, 0xff, 0x70, 0x3f, 0xff,
+	0xfd, 0xfe, 0x8f, 0x7f, 0xf0, 0xff, 0xff, 0xff,
+	0xff, 0xfe, 0xfb, 0xff, 0x8f,
+	0xff, 0xff, 0xbf, 0x7f, 0x85, 0x7f, 0xf0, 0xff,
+	0xff, 0xff, 0xff, 0xff, 0x8f, 0x7f, 0x81, 0x7f,
+	0x81, 0xfe, 0xf1, 0xff, 0xff,
+	0x7f, 0xff, 0xff, 0xcf, 0x87, 0xfa, 0x75, 0xff,
+	0xff, 0x7f, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+	0xff, 0x8f, 0x7f, 0x70, 0xfe,
+	0xff, 0x87, 0xff, 0x4b, 0xbf, 0x7f, 0xfd, 0xff,
+	0xff, 0xff, 0xff, 0x8f, 0xff, 0xff, 0xff, 0xfe,
+	0xff, 0xfe, 0xff, 0xfe, 0xff,
+	0x3f, 0x78, 0xf8, 0xf7, 0xff, 0xff, 0xff, 0xff,
+	0xff, 0x8f, 0x0f, 0x71, 0xf1, 0xff, 0x7f, 0xff,
+	0xff, 0xff, 0xff, 0x8e, 0x0e,
+	0xff, 0xf8, 0x7f, 0xff, 0x7f, 0xff, 0x7f, 0x8f,
+	0x8f, 0x00, 0x71, 0xf1, 0xff, 0xff, 0xff, 0xff,
+	0xfe, 0x8f, 0x0e, 0x01, 0x71,
+	0xbf, 0xf8, 0xf8, 0xff, 0x7f, 0xff, 0x7f, 0xff,
+	0xff, 0x8f, 0x0f, 0x71, 0xf1, 0xff, 0xff, 0xff,
+	0xfe, 0xff, 0xff, 0x8f, 0x0f,
+	0xff, 0xf8, 0x7f, 0xff, 0xff, 0xff, 0xff, 0xff,
+	0x8f, 0x0f, 0x71, 0xf1, 0xff, 0xff, 0xff, 0xff,
+	0xff, 0xff, 0x8e, 0x0f, 0x71,
+	0xff, 0xff, 0xff, 0xf7, 0xff, 0xff, 0x7f, 0xff,
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xfe,
+	0xff, 0xff, 0xff, 0xff, 0xff,
+	0xff, 0xff, 0x7f, 0xff, 0xff, 0x7f, 0x8f, 0xff,
+	0xf0, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+	0x8f, 0x7f, 0xf0, 0xff, 0xff,
+	0x7f, 0xf8, 0xff, 0xff, 0xff, 0x7f, 0x7f, 0xff,
+	0xff, 0x8f, 0xff, 0xf0, 0xff, 0xff, 0xff, 0xff,
+	0xff, 0xff, 0xff, 0x8f, 0x7e,
+	0xbf, 0xff, 0x78, 0xff, 0xff, 0xff, 0x7f, 0xff,
+	0xff, 0xff, 0x8f, 0xff, 0xf0, 0xff, 0xff, 0xff,
+	0xff, 0xff, 0xfe, 0xff, 0x8f,
+	0xff, 0x07, 0xff, 0xf8, 0xff, 0xff, 0xff, 0xff,
+	0x8f, 0xff, 0xf0, 0x8f, 0xff, 0xf0, 0xff, 0xff,
+	0xff, 0xff, 0x8e, 0x7f, 0xf1,
+	0xff, 0xf8, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+	0xff, 0x8f, 0xff, 0xf0, 0xff, 0xff, 0xff, 0xff,
+	0xff, 0xff, 0xff, 0x8f, 0x7f,
+	0x3f, 0xff, 0xf8, 0xff, 0x8f, 0x7f, 0xf0, 0x8f,
+	0xff, 0xfc, 0x8f, 0xff, 0xf0, 0xff, 0x8f, 0x7e,
+	0xf1, 0x8f, 0x7f, 0xf3, 0x8e,
+	0xff, 0x80, 0x7f, 0xf8, 0xff, 0x7f, 0xff, 0xff,
+	0xff, 0x8f, 0x7f, 0x80, 0x7f, 0xf1, 0xff, 0xff,
+	0xff, 0xff, 0xfe, 0x8f, 0x7f,
+	0xff, 0x80, 0xff, 0xf8, 0xff, 0xff, 0xff, 0xff,
+	0x7f, 0x8f, 0x7f, 0x81, 0x7f, 0xf0, 0xff, 0xfe,
+	0xff, 0xff, 0xff, 0x8f, 0x7f,
+	0xff, 0x7f, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+	0x8f, 0x7f, 0xf0, 0xff, 0xff, 0xff, 0xff, 0xff,
+	0xff, 0xff, 0x8f, 0x7f, 0xf1,
+	0xff, 0xff, 0xff, 0xff, 0xff, 0x0f, 0xff, 0x80,
+	0xff, 0xf0, 0xff, 0xff, 0xff, 0xff, 0xfe, 0x8e,
+	0x0f, 0x01, 0x71, 0xf0, 0xff,
+	0xff, 0xf7, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+	0xef, 0xff, 0xfb, 0xff, 0xff, 0xff, 0xff, 0xfe,
+	0xff, 0xff, 0xff, 0xff, 0xf7,
+	0xbf, 0x87, 0xf8, 0xf8, 0xff, 0x7f, 0xff, 0xff,
+	0x7f, 0x7f, 0x8f, 0x8f, 0xf0, 0xf0, 0xfe, 0xff,
+	0xff, 0xff, 0xff, 0xfe, 0x8f,
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+	0xff, 0xff, 0xff, 0xff, 0xff, 0x7f, 0xff, 0x7f,
+	0xff, 0xff, 0xff, 0xff, 0xff,
+	0xff, 0x7f, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+	0xff, 0xff, 0xff, 0xff, 0xff, 0x7f, 0xff, 0x7e,
+	0xff, 0xff, 0xff, 0xff, 0xff,
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+	0xff, 0x7f, 0xff, 0xff, 0xff, 0x7f, 0xff, 0x7e,
+	0xff, 0xff, 0x7f, 0xff, 0xff,
+	0xff, 0xff, 0x7f, 0xff, 0x7f, 0xff, 0xff, 0xff,
+	0x7f, 0x7f, 0xff, 0xff, 0xff, 0x7f, 0xff, 0x7f,
+	0x8f, 0xfe, 0xf0, 0xff, 0xff,
+	0xbf, 0xff, 0x0e, 0x8f, 0x70, 0x80, 0xff, 0xf0,
+	0xff, 0xff, 0xff, 0xff, 0x0f, 0x7f, 0xf1, 0x0f,
+	0x7f, 0xf1, 0xfe, 0xff, 0x9f,
+	0xbf, 0x1f, 0xfb, 0x0c, 0xff, 0xf0, 0x8f, 0xff,
+	0x00, 0xff, 0xb0, 0x3f, 0x71, 0x80, 0xff, 0xf1,
+	0x8f, 0x7f, 0x81, 0x7e, 0xc1,
+	0xff, 0xff, 0xff, 0x7f, 0x8f, 0x0f, 0x70, 0xf0,
+	0x8f, 0x7f, 0x70, 0xcf, 0x8f, 0xff, 0x71, 0x0f,
+	0x7e, 0xf1, 0x8f, 0x7f, 0xf1,
+	0x7f, 0xff, 0x7f, 0x0f, 0xff, 0x78, 0x8f, 0x8f,
+	0x70, 0x70, 0x7f, 0xfe, 0xff, 0x8f, 0xff, 0x70,
+	0xff, 0xfe, 0xff, 0xff, 0xbe,
+	0xff, 0xf8, 0xf7, 0x0b, 0xf7, 0x88, 0xf7, 0xf0,
+	0x8f, 0x8f, 0x70, 0xf0, 0x7e, 0x73, 0xff, 0x8f,
+	0x7e, 0xf0, 0xff, 0x8f, 0x7f,
+	0xff, 0x78, 0x77, 0xff, 0x8f, 0x8f, 0xf0, 0xf0,
+	0xff, 0x8f, 0x77, 0x70, 0x77, 0x7f, 0xff, 0x7f,
+	0xff, 0xff, 0xfe, 0x8f, 0x7f,
+	0xff, 0xff, 0x77, 0x8f, 0xff, 0xf0, 0xff, 0xff,
+	0x77, 0x7f, 0xfb, 0xff, 0xff, 0xff, 0xff, 0xff,
+	0xff, 0xef, 0x7f, 0xff, 0xbf,
+	0xbf, 0xff, 0x74, 0xff, 0xff, 0x8f, 0xff, 0xfc,
+	0x0f, 0xf3, 0x8c, 0xff, 0xfd, 0xff, 0xff, 0x8f,
+	0x7f, 0xf1, 0x8f, 0x7d, 0x83,
+	0xff, 0x7f, 0x77, 0xff, 0xff, 0xff, 0xff, 0xfb,
+	0xf7, 0x7f, 0xf7, 0xff, 0xff, 0xff, 0xff, 0xff,
+	0xff, 0xff, 0xff, 0xff, 0xff,
+	0xff, 0x78, 0xff, 0x7f, 0xff, 0xff, 0xff, 0xff,
+	0x0f, 0x8f, 0x70, 0x70, 0xf7, 0xff, 0xff, 0xff,
+	0xff, 0xff, 0x8e, 0x0f, 0x71,
+	0xff, 0xf8, 0xf7, 0x7f, 0xff, 0x8f, 0x8f, 0x80,
+	0x80, 0x81, 0x70, 0x70, 0x7f, 0xff, 0xff, 0xff,
+	0xff, 0x6f, 0x8f, 0x0f, 0x71,
+	0xbf, 0x7f, 0xf0, 0xff, 0xff, 0xff, 0xff, 0xff,
+	0x7b, 0xff, 0x9f, 0xff, 0x70, 0xff, 0xff, 0xff,
+	0xff, 0x7f, 0xff, 0xfe, 0x8f,
+	0xff, 0x87, 0x7f, 0x78, 0xfe, 0xff, 0x9e, 0xff,
+	0xf2, 0x7f, 0xff, 0x0f, 0xff, 0xf0, 0xff, 0xef,
+	0xff, 0x7f, 0xff, 0xff, 0xff,
+	0x7f, 0x7f, 0xff, 0x7f, 0xff, 0xff, 0xfe, 0x8f,
+	0xff, 0x70, 0xff, 0x7f, 0xff, 0xff, 0xdf, 0xff,
+	0xff, 0xff, 0xff, 0xff, 0xfe,
+	0xff, 0xff, 0x7f, 0xf7, 0xff, 0xfe, 0xff, 0xff,
+	0xff, 0x7f, 0xff, 0xff, 0xff, 0xff, 0xdf, 0xff,
+	0xff, 0xff, 0xff, 0xff, 0xff,
+	0xff, 0xff, 0x7f, 0x7f, 0x8f, 0x8f, 0xf0, 0xf0,
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xfd, 0xaf, 0x0f,
+	0x70, 0xd1, 0xff, 0xf8, 0xfe,
+	0xff, 0xff, 0xff, 0xf7, 0xaf, 0x8f, 0xfa, 0xf0,
+	0xff, 0xff, 0xff, 0xff, 0xff, 0x9f, 0x8f, 0x0f,
+	0x79, 0xe1, 0xff, 0xfe, 0xff,
+	0xbf, 0xff, 0xff, 0x7a, 0x8f, 0xff, 0xf0, 0xef,
+	0xff, 0xfb, 0xff, 0xaf, 0xff, 0xfb, 0x8f, 0x7f,
+	0xf1, 0xdf, 0xff, 0xf9, 0xff,
+	0xbf, 0xff, 0xff, 0xf7, 0xff, 0xaf, 0xff, 0xba,
+	0xaf, 0xff, 0xfb, 0xff, 0xff, 0xff, 0xef, 0xdf,
+	0xff, 0xfd, 0xbe, 0xf7, 0xf5,
+	0xff, 0xf8, 0xff, 0xff, 0x8f, 0xff, 0xf0, 0xff,
+	0xff, 0x8f, 0xf7, 0xf0, 0xff, 0xff, 0x8f, 0x3f,
+	0x11, 0xeb, 0xdb, 0xcf, 0x7f,
+	0xbf, 0xf0, 0x8f, 0x87, 0xf0, 0xf0, 0xff, 0xbf,
+	0xff, 0x8f, 0xff, 0xf1, 0x8f, 0x0f, 0x31, 0xf1,
+	0x9f, 0xdf, 0xf9, 0x85, 0x7f,
+	0xbf, 0xff, 0x8f, 0x7f, 0xf0, 0xff, 0xff, 0xff,
+	0xee, 0xff, 0xfb, 0xf7, 0x8f, 0x7f, 0xb1, 0xff,
+	0xff, 0xff, 0xff, 0xdf, 0xfd,
+	0xff, 0xff, 0xff, 0x8f, 0x8f, 0xf0, 0x80, 0xff,
+	0xf0, 0xff, 0xff, 0xff, 0xff, 0x8f, 0x2f, 0x71,
+	0xc1, 0x7f, 0xf1, 0xff, 0xff,
+	0xff, 0xff, 0xff, 0x8f, 0xff, 0xf0, 0xff, 0xbf,
+	0xff, 0xff, 0xff, 0xff, 0xff, 0x8f, 0x7f, 0xd1,
+	0x9f, 0xff, 0x7b, 0xb7, 0xff,
+	0xbf, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+	0xff, 0xff, 0xfe, 0x8f, 0xff, 0xf1, 0xff, 0xff,
+	0xff, 0xff, 0xbf, 0xb7, 0xff,
+	0xff, 0xa4, 0xf7, 0x88, 0xff, 0xf0, 0xaf, 0xbf,
+	0xfb, 0xef, 0xff, 0xf7, 0xff, 0x8f, 0x7f, 0xf1,
+	0xff, 0xdd, 0xf7, 0x97, 0x7f,
+	0xff, 0xff, 0xf7, 0xff, 0x8f, 0xff, 0xf0, 0xff,
+	0xfe, 0xff, 0xff, 0xff, 0xff, 0xff, 0x8f, 0x7f,
+	0xf1, 0xff, 0xff, 0xff, 0xff,
+	0xff, 0xff, 0xff, 0xf7, 0xaf, 0x0f, 0xa0, 0xf0,
+	0xfb, 0xff, 0xff, 0xff, 0xff, 0xff, 0x8f, 0x0f,
+	0x71, 0xb1, 0x37, 0xf7, 0xff,
+	0xff, 0xb8, 0xff, 0xff, 0xff, 0x7f, 0xff, 0xff,
+	0xff, 0x8f, 0xff, 0xf0, 0xfe, 0xff, 0xff, 0xff,
+	0xff, 0xff, 0xff, 0x8f, 0x7f,
+	0xbf, 0xff, 0xf8, 0xf7, 0xff, 0xa7, 0xff, 0xf0,
+	0xff, 0xff, 0x8f, 0xfe, 0xf0, 0xff, 0xff, 0x8f,
+	0x7f, 0xf1, 0xff, 0xff, 0xcf,
+	0xff, 0xff, 0xf7, 0x9f, 0xf7, 0xf3, 0xff, 0xff,
+	0xff, 0xff, 0x7f, 0xff, 0xff, 0xbf, 0x7f, 0xf9,
+	0xff, 0xfe, 0xff, 0xff, 0xdf,
+	0xff, 0xff, 0xff, 0xff, 0xff, 0x7f, 0xff, 0x7f,
+	0xff, 0xff, 0xff, 0x7f, 0xff, 0xff, 0xff, 0xff,
+	0xff, 0xff, 0xff, 0xbf, 0xbf,
+	0xff, 0xff, 0xff, 0xaf, 0xff, 0xf0, 0xff, 0xff,
+	0x9f, 0xfe, 0xf1, 0xff, 0xff, 0xcf, 0x7f, 0xf1,
+	0xff, 0xff, 0xdf, 0xff, 0xf1,
+	0xbf, 0xff, 0xf0, 0xff, 0xff, 0xff, 0xff, 0xff,
+	0xff, 0xff, 0x8f, 0xff, 0xf0, 0xbf, 0xff, 0xff,
+	0xff, 0xff, 0xff, 0xff, 0x6f,
+	0xff, 0xff, 0xf7, 0xff, 0xff, 0xff, 0xff, 0x7f,
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+	0xff, 0xff, 0xff, 0xff, 0xbf,
+	0xff, 0xf8, 0xff, 0xff, 0xdf, 0xff, 0xff, 0xff,
+	0xff, 0x8f, 0xff, 0xf1, 0xff, 0xff, 0xff, 0xff,
+	0xff, 0xff, 0xff, 0xcf, 0xff,
+	0xff, 0xd8, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+	0xff, 0x8f, 0xef, 0xe0, 0xff, 0xff, 0xff, 0xff,
+	0xff, 0xff, 0xff, 0x8f, 0x3f,
+	0xff, 0xdf, 0xf7, 0xff, 0x0f, 0xfe, 0xf0, 0xff,
+	0xff, 0xff, 0xff, 0xef, 0xff, 0xdf, 0x8e, 0x7f,
+	0xf1, 0xff, 0xff, 0xff, 0xff,
+	0xff, 0xff, 0xf7, 0xff, 0xff, 0xff, 0xff, 0xff,
+	0xff, 0xfe, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+	0xbf, 0xbf, 0xff, 0xff, 0xff,
+	0xff, 0xff, 0x8f, 0xff, 0xf1, 0xff, 0xff, 0xff,
+	0xff, 0xff, 0xef, 0xff, 0xbf, 0x7f, 0xe1, 0xff,
+	0xdf, 0xff, 0x7f, 0xff, 0xbf,
+	0xff, 0xa7, 0xff, 0x88, 0xff, 0xf1, 0xfe, 0xff,
+	0xff, 0xff, 0xff, 0x1f, 0xff, 0xf0, 0xcf, 0xb1,
+	0xff, 0xef, 0xff, 0x7f, 0xff,

diff --git a/board/sixnet/sixnet.c b/board/sixnet/sixnet.c
index ec1cb8b..e33925c 100644
--- a/board/sixnet/sixnet.c
+++ b/board/sixnet/sixnet.c

@@ -174,7 +174,7 @@
 
 	/* write program data to FPGA at the programming address
 	 * so extra /CS1 strobes at end of configuration don't actually
-         * write to any registers.
+	 * write to any registers.
 	 */
 	fpga = 0xff;		/* first write is ignored	*/
 	fpga = 0xff;		/* fill byte			*/
@@ -378,7 +378,7 @@
 	ramsize = 0;		/* no RAM present, or defective */
     else {
 	*base_addr = 0xaaaa5555;
-        *(base_addr + 1) = 0x5555aaaa;	/* use write to modify data bus */
+	*(base_addr + 1) = 0x5555aaaa;	/* use write to modify data bus */
 	if (*base_addr != 0xaaaa5555)
 	    ramsize = 0;	/* no RAM present, or defective */
     }
@@ -422,7 +422,7 @@
 	_not_used_, _not_used_, _not_used_, _not_used_,
 
 	/* single write. (offset 18 in upm RAM) */
-        /* FADS had 0x1f27fc04, ...
+	/* FADS had 0x1f27fc04, ...
 	 * but most other boards have 0x1f07fc04, which
 	 * sets GPL0 from A11MPC to 0 1/4 clock earlier,
 	 * like the single read.
@@ -518,7 +518,7 @@
 	 * This may be too fast, but works for any memory.
 	 * It is adjusted to 4096 cycles in 64 milliseconds if
 	 * possible once we know what memory we have.
-         *
+	 *
 	 * We have to be careful changing UPM registers after we
 	 * ask it to run these commands.
 	 *
@@ -532,7 +532,7 @@
 	 *    SCCR[DFBRG] 0
 	 *    PTP divide by 8
 	 *    1 chip select
-         */
+	 */
 	memctl->memc_mptpr = MPTPR_PTP_DIV8;	/* 0x0800 */
 	memctl->memc_mamr = SDRAM_MAMR_8COL & (~MAMR_PTAE); /* no refresh yet */
 
@@ -602,4 +602,3 @@
 
 	return (size_sdram);
 }
-

diff --git a/board/sixnet/u-boot.lds b/board/sixnet/u-boot.lds
index 64d5391..f35328a 100644
--- a/board/sixnet/u-boot.lds
+++ b/board/sixnet/u-boot.lds

@@ -98,6 +98,11 @@
   _edata  =  .;
   PROVIDE (edata = .);
 
+  __u_boot_cmd_start = .;
+  .u_boot_cmd : { *(.u_boot_cmd) }
+  __u_boot_cmd_end = .;
+
+
   __start___ex_table = .;
   __ex_table : { *(__ex_table) }
   __stop___ex_table = .;
@@ -120,4 +125,3 @@
   _end = . ;
   PROVIDE (end = .);
 }
-

diff --git a/board/smdk2400/Makefile b/board/smdk2400/Makefile
index 6dbd4e7..367eabd 100644
--- a/board/smdk2400/Makefile
+++ b/board/smdk2400/Makefile

@@ -29,7 +29,7 @@
 SOBJS	:= memsetup.o
 
 $(LIB):	$(OBJS) $(SOBJS)
-	$(AR) crv $@ $^
+	$(AR) crv $@ $(OBJS) $(SOBJS)
 
 clean:
 	rm -f $(SOBJS) $(OBJS)

diff --git a/board/smdk2400/memsetup.S b/board/smdk2400/memsetup.S
index b53e996..b507d81 100644
--- a/board/smdk2400/memsetup.S
+++ b/board/smdk2400/memsetup.S

@@ -28,7 +28,6 @@
  */
 
 
-
 #include <config.h>
 #include <version.h>
 
@@ -162,4 +161,3 @@
 	.word	0x10	/* BUSWIDTH=32, SCLK power saving mode, BANKSIZE 32M/32M */
 	.word	0x30	/* MRSR6, CL=3clk */
 	.word	0x30	/* MRSR7 */
-

diff --git a/board/smdk2400/u-boot.lds b/board/smdk2400/u-boot.lds
index 8c9c218..af3cd19 100644
--- a/board/smdk2400/u-boot.lds
+++ b/board/smdk2400/u-boot.lds

@@ -27,28 +27,33 @@
 ENTRY(_start)
 SECTIONS
 {
-        . = 0x00000000;
+	. = 0x00000000;
 
-        . = ALIGN(4);
+	. = ALIGN(4);
 	.text      :
 	{
 	  cpu/arm920t/start.o	(.text)
 	  *(.text)
 	}
 
-        . = ALIGN(4);
-        .rodata : { *(.rodata) }
+	. = ALIGN(4);
+	.rodata : { *(.rodata) }
 
-        . = ALIGN(4);
-        .data : { *(.data) }
+	. = ALIGN(4);
+	.data : { *(.data) }
 
-        . = ALIGN(4);
-        .got : { *(.got) }
+	. = ALIGN(4);
+	.got : { *(.got) }
+
+  __u_boot_cmd_start = .;
+  .u_boot_cmd : { *(.u_boot_cmd) }
+  __u_boot_cmd_end = .;
 
 	armboot_end_data = .;
 
-        . = ALIGN(4);
-        .bss : { *(.bss) }
+	. = ALIGN(4);
+	.bss : { *(.bss) }
 
 	armboot_end = .;
+
 }

diff --git a/board/smdk2410/Makefile b/board/smdk2410/Makefile
index 79ab33a..af1e6e6 100644
--- a/board/smdk2410/Makefile
+++ b/board/smdk2410/Makefile

@@ -29,7 +29,7 @@
 SOBJS	:= memsetup.o
 
 $(LIB):	$(OBJS) $(SOBJS)
-	$(AR) crv $@ $^
+	$(AR) crv $@ $(OBJS) $(SOBJS)
 
 clean:
 	rm -f $(SOBJS) $(OBJS)

diff --git a/board/smdk2410/flash.c b/board/smdk2410/flash.c
index 5d04ed4..d7479f0 100644
--- a/board/smdk2410/flash.c
+++ b/board/smdk2410/flash.c

@@ -313,7 +313,7 @@
      */
     result = *addr;
     if ((result & data) != data)
-        return ERR_NOT_ERASED;
+	return ERR_NOT_ERASED;
 
 
     /*
@@ -366,7 +366,7 @@
     *addr = CMD_READ_ARRAY;
 
     if (chip == ERR || *addr != data)
-        rc = ERR_PROG_ERROR;
+	rc = ERR_PROG_ERROR;
 
     if (iflag)
       enable_interrupts();

diff --git a/board/smdk2410/memsetup.S b/board/smdk2410/memsetup.S
index 3a84be5..c00e772 100644
--- a/board/smdk2410/memsetup.S
+++ b/board/smdk2410/memsetup.S

@@ -28,7 +28,6 @@
  */
 
 
-
 #include <config.h>
 #include <version.h>
 

diff --git a/board/smdk2410/u-boot.lds b/board/smdk2410/u-boot.lds
index 8c9c218..0cf076a 100644
--- a/board/smdk2410/u-boot.lds
+++ b/board/smdk2410/u-boot.lds

@@ -27,28 +27,34 @@
 ENTRY(_start)
 SECTIONS
 {
-        . = 0x00000000;
+	. = 0x00000000;
 
-        . = ALIGN(4);
+	. = ALIGN(4);
 	.text      :
 	{
 	  cpu/arm920t/start.o	(.text)
 	  *(.text)
 	}
 
-        . = ALIGN(4);
-        .rodata : { *(.rodata) }
+	. = ALIGN(4);
+	.rodata : { *(.rodata) }
 
-        . = ALIGN(4);
-        .data : { *(.data) }
+	. = ALIGN(4);
+	.data : { *(.data) }
 
-        . = ALIGN(4);
-        .got : { *(.got) }
+	. = ALIGN(4);
+	.got : { *(.got) }
+
+  __u_boot_cmd_start = .;
+  .u_boot_cmd : { *(.u_boot_cmd) }
+  __u_boot_cmd_end = .;
+
 
 	armboot_end_data = .;
 
-        . = ALIGN(4);
-        .bss : { *(.bss) }
+	. = ALIGN(4);
+	.bss : { *(.bss) }
 
 	armboot_end = .;
+
 }

diff --git a/board/spd8xx/Makefile b/board/spd8xx/Makefile
index ef173d0..13ce9fc 100644
--- a/board/spd8xx/Makefile
+++ b/board/spd8xx/Makefile

@@ -28,7 +28,7 @@
 OBJS	= $(BOARD).o flash.o
 
 $(LIB):	.depend $(OBJS)
-	$(AR) crv $@ $^
+	$(AR) crv $@ $(OBJS)
 
 #########################################################################
 

diff --git a/board/spd8xx/spd8xx.c b/board/spd8xx/spd8xx.c
index 6428896..61201d7 100644
--- a/board/spd8xx/spd8xx.c
+++ b/board/spd8xx/spd8xx.c

@@ -41,7 +41,7 @@
 	 */
 	0x0FF3FC04, 0x0FF3EC00, 0x7FFFEC04, 0xFFFFEC04,
 	0xFFFFEC05, /* last */
-	            _NOT_USED_, _NOT_USED_, _NOT_USED_,
+		    _NOT_USED_, _NOT_USED_, _NOT_USED_,
 	/*
 	 * Burst Read. (Offset 8 in UPM RAM)
 	 */
@@ -55,7 +55,7 @@
 	 */
 	0x0FAFFC04, 0x0FAFEC00, 0x7FFFEC04, 0xFFFFEC04,
 	0xFFFFEC05, /* last */
-	            _NOT_USED_, _NOT_USED_, _NOT_USED_,
+		    _NOT_USED_, _NOT_USED_, _NOT_USED_,
 	/*
 	 * Burst Write. (Offset 20 in UPM RAM)
 	 */
@@ -89,9 +89,9 @@
 	/*
 	 * SDRAM Initialization (offset 5 in UPM RAM)
 	 *
-         * This is no UPM entry point. The following definition uses
-         * the remaining space to establish an initialization
-         * sequence, which is executed by a RUN command.
+	 * This is no UPM entry point. The following definition uses
+	 * the remaining space to establish an initialization
+	 * sequence, which is executed by a RUN command.
 	 *
 	 */
 		    0x1FF77C35, 0xEFEABC34, 0x1FB57C35, /* last */
@@ -282,8 +282,8 @@
 	immr->im_ioport.iop_padat &= ~(PA_ENET_MDC);	/* set MDC = 0 */
 
 	/*
-         * RESET in implemented by a positive pulse of at least 1 us
-         * at the reset pin.
+	 * RESET in implemented by a positive pulse of at least 1 us
+	 * at the reset pin.
 	 *
 	 * Configure RESET pins for NS DP83843 PHY, and RESET chip.
 	 *

diff --git a/board/spd8xx/u-boot.lds b/board/spd8xx/u-boot.lds
index debcd49..f801d3b 100644
--- a/board/spd8xx/u-boot.lds
+++ b/board/spd8xx/u-boot.lds

@@ -98,6 +98,11 @@
   _edata  =  .;
   PROVIDE (edata = .);
 
+  __u_boot_cmd_start = .;
+  .u_boot_cmd : { *(.u_boot_cmd) }
+  __u_boot_cmd_end = .;
+
+
   __start___ex_table = .;
   __ex_table : { *(__ex_table) }
   __stop___ex_table = .;
@@ -120,4 +125,3 @@
   _end = . ;
   PROVIDE (end = .);
 }
-

diff --git a/board/spd8xx/u-boot.lds.debug b/board/spd8xx/u-boot.lds.debug
index bd13b7b..0245f78 100644
--- a/board/spd8xx/u-boot.lds.debug
+++ b/board/spd8xx/u-boot.lds.debug

@@ -107,6 +107,11 @@
   _edata  =  .;
   PROVIDE (edata = .);
 
+  __u_boot_cmd_start = .;
+  .u_boot_cmd : { *(.u_boot_cmd) }
+  __u_boot_cmd_end = .;
+
+
   __start___ex_table = .;
   __ex_table : { *(__ex_table) }
   __stop___ex_table = .;
@@ -129,4 +134,3 @@
   _end = . ;
   PROVIDE (end = .);
 }
-

diff --git a/board/svm_sc8xx/Makefile b/board/svm_sc8xx/Makefile
index ef173d0..13ce9fc 100644
--- a/board/svm_sc8xx/Makefile
+++ b/board/svm_sc8xx/Makefile

@@ -28,7 +28,7 @@
 OBJS	= $(BOARD).o flash.o
 
 $(LIB):	.depend $(OBJS)
-	$(AR) crv $@ $^
+	$(AR) crv $@ $(OBJS)
 
 #########################################################################
 

diff --git a/board/svm_sc8xx/flash.c b/board/svm_sc8xx/flash.c
index b50f77b..25e61dd 100644
--- a/board/svm_sc8xx/flash.c
+++ b/board/svm_sc8xx/flash.c

@@ -1,5 +1,4 @@
 /*
- * (C) Copyright 2000
  * Wolfgang Denk, DENX Software Engineering, wd@denx.de.
  *
  * See file CREDITS for list of people who contributed to this
@@ -68,44 +67,44 @@
 	}
 #ifdef CFG_DOC_BASE
 #ifndef CONFIG_FEL8xx_AT
-        memctl->memc_or5 = (0xffff8000 | CFG_OR_TIMING_DOC ); /* 32k bytes */
-        memctl->memc_br5 = CFG_DOC_BASE | 0x401;
+	memctl->memc_or5 = (0xffff8000 | CFG_OR_TIMING_DOC ); /* 32k bytes */
+	memctl->memc_br5 = CFG_DOC_BASE | 0x401;
 #else
-        memctl->memc_or3 = (0xffff8000 | CFG_OR_TIMING_DOC ); /* 32k bytes */
-        memctl->memc_br3 = CFG_DOC_BASE | 0x401;
+	memctl->memc_or3 = (0xffff8000 | CFG_OR_TIMING_DOC ); /* 32k bytes */
+	memctl->memc_br3 = CFG_DOC_BASE | 0x401;
 #endif
 #endif
 #if defined( CONFIG_BOOT_8B)
-//        memctl->memc_or0 = 0xfff80ff4; /* 4MB bytes */
-//        memctl->memc_br0 = 0x40000401;
-        size_b0 = 0x80000;  /* 512 K */
-        flash_info[0].flash_id = FLASH_MAN_AMD | FLASH_AM040;
-        flash_info[0].sector_count = 8;
-        flash_info[0].size = 0x00080000;
-        /* set up sector start address table */
-        for (i = 0; i < flash_info[0].sector_count; i++)
-        flash_info[0].start[i] = 0x40000000 + (i * 0x10000);
-        /* protect all sectors */
-        for (i = 0; i < flash_info[0].sector_count; i++)
-        flash_info[0].protect[i] = 0x1;
+/*        memctl->memc_or0 = 0xfff80ff4; /###* 4MB bytes */
+/*        memctl->memc_br0 = 0x40000401; */
+	size_b0 = 0x80000;  /* 512 K */
+	flash_info[0].flash_id = FLASH_MAN_AMD | FLASH_AM040;
+	flash_info[0].sector_count = 8;
+	flash_info[0].size = 0x00080000;
+	/* set up sector start address table */
+	for (i = 0; i < flash_info[0].sector_count; i++)
+	flash_info[0].start[i] = 0x40000000 + (i * 0x10000);
+	/* protect all sectors */
+	for (i = 0; i < flash_info[0].sector_count; i++)
+	flash_info[0].protect[i] = 0x1;
 #elif defined (CONFIG_BOOT_16B)
-//        memctl->memc_or0 = 0xfff80ff4; /* 4MB bytes */
-//        memctl->memc_br0 = 0x40000401;
-        size_b0 = 0x400000;  /* 4MB , assume AMD29LV320B */
-        flash_info[0].flash_id = FLASH_MAN_AMD | FLASH_AM320B;
-        flash_info[0].sector_count = 67;
-        flash_info[0].size = 0x00400000;
-        /* set up sector start address table */
-        flash_info[0].start[0] = 0x40000000  ;
-        flash_info[0].start[1] = 0x40000000 + 0x4000;
-        flash_info[0].start[2] = 0x40000000 + 0x6000;
-        flash_info[0].start[3] = 0x40000000 + 0x8000;
-        for (i = 4; i < flash_info[0].sector_count; i++)
-        flash_info[0].start[i] = 0x40000000 + 0x10000 + ((i-4) * 0x10000);
-        /* protect all sectors */
-        for (i = 0; i < flash_info[0].sector_count; i++)
-        flash_info[0].protect[i] = 0x1;
-#endif									
+/*        memctl->memc_or0 = 0xfff80ff4; /###* 4MB bytes */
+/*        memctl->memc_br0 = 0x40000401; */
+	size_b0 = 0x400000;  /* 4MB , assume AMD29LV320B */
+	flash_info[0].flash_id = FLASH_MAN_AMD | FLASH_AM320B;
+	flash_info[0].sector_count = 67;
+	flash_info[0].size = 0x00400000;
+	/* set up sector start address table */
+	flash_info[0].start[0] = 0x40000000  ;
+	flash_info[0].start[1] = 0x40000000 + 0x4000;
+	flash_info[0].start[2] = 0x40000000 + 0x6000;
+	flash_info[0].start[3] = 0x40000000 + 0x8000;
+	for (i = 4; i < flash_info[0].sector_count; i++)
+	flash_info[0].start[i] = 0x40000000 + 0x10000 + ((i-4) * 0x10000);
+	/* protect all sectors */
+	for (i = 0; i < flash_info[0].sector_count; i++)
+	flash_info[0].protect[i] = 0x1;
+#endif
 
 
 #ifdef CONFIG_BOOT_32B
@@ -482,7 +481,7 @@
 	for (sect = s_first; sect<=s_last; sect++) {
 		if (info->protect[sect] == 0) {	/* not protected */
 			addr = (vu_long*)(info->start[sect]);
-			//addr[0] = 0x00300030;
+			/*addr[0] = 0x00300030; */
 			my_out_8(     (unsigned char *) ((ulong)addr),0x30 );
 			l_sect = sect;
 		}
@@ -553,11 +552,11 @@
 	last  = start;
 	addr = (vu_long*)(info->start[l_sect]);
 #if defined (CONFIG_BOOT_8B)
-	while (  (my_in_8((unsigned char *)addr) & 0x80) != 0x80 ) 
+	while (  (my_in_8((unsigned char *)addr) & 0x80) != 0x80 )
 #elif defined(CONFIG_BOOT_16B )
-	while (  (my_in_be16((unsigned short *)addr) & 0x0080) != 0x0080 ) 
+	while (  (my_in_be16((unsigned short *)addr) & 0x0080) != 0x0080 )
 #elif defined(CONFIG_BOOT_32B)
-	while (  (my_in_be32((unsigned  *)addr) & 0x00800080) != 0x00800080 ) 
+	while (  (my_in_be32((unsigned  *)addr) & 0x00800080) != 0x00800080 )
 #else
 # error CONFIG_BOOT_(size)B missing.
 #endif
@@ -688,7 +687,7 @@
 	my_out_8( (unsigned char * )  (addr+0x555) , 0x90 );
 	in_mid=my_in_8( (unsigned char * ) addr );
 	in_did=my_in_8( (unsigned char * ) (addr+1) );
-  	printf(" man ID=0x%x, dev ID=0x%x.\n",in_mid,in_did );
+	printf(" man ID=0x%x, dev ID=0x%x.\n",in_mid,in_did );
 	my_out_8( (unsigned char *)addr, 0xf0);
 	udelay(1);
 	}
@@ -696,7 +695,7 @@
       {
 	int  data_ch[4];
 	data_ch[0]=(int ) ((data>>24) & 0xff);
-	data_ch[1]=(int ) ((data>>16) &0xff ); 
+	data_ch[1]=(int ) ((data>>16) &0xff );
 	data_ch[2]=(int ) ((data >>8) & 0xff);
 	data_ch[3]=(int ) (data & 0xff);
 	for (i=0;i<4;i++ ){
@@ -708,7 +707,7 @@
 	if (flag)
 		enable_interrupts();
 
-  	  start = get_timer (0);
+	  start = get_timer (0);
 	last  = start;
 	  while(  ( my_in_8((unsigned char *) (dest+i)) ) != ( data_ch[i]  ) ) {
 		  if (get_timer(start) > CFG_FLASH_WRITE_TOUT ) {
@@ -719,7 +718,7 @@
      }
 #elif defined( CONFIG_BOOT_16B)
 	data_short[0]=(int) (data>>16) & 0xffff;
-	data_short[1]=(int ) data & 0xffff ; 
+	data_short[1]=(int ) data & 0xffff ;
 	for (i=0;i<2;i++ ){
 	my_out_be16(     (unsigned short *) ((ulong)addr+ 0xaaa),0xaa );
 	my_out_be16(     (unsigned short *) ((ulong)addr+ 0x554),0x55 );
@@ -728,7 +727,7 @@
 	/* re-enable interrupts if necessary */
 	if (flag)
 		enable_interrupts();
-  	  start = get_timer (0);
+	  start = get_timer (0);
 	last  = start;
 	  while(  ( my_in_be16((unsigned short *) (dest+(i*2))) ) != ( data_short[i]  ) ) {
 		  if (get_timer(start) > CFG_FLASH_WRITE_TOUT ) {
@@ -755,8 +754,8 @@
 		}
 	}
 #endif
-	
-	
+
+
 	return (0);
 }
 #ifdef  CONFIG_BOOT_8B
@@ -776,8 +775,8 @@
 static int my_in_be16( unsigned short *addr)
 {
        int ret;
-        __asm__ __volatile__("lhz%U1%X1 %0,%1; eieio" : "=r" (ret) : "m" (*addr));
-			        return ret;
+	__asm__ __volatile__("lhz%U1%X1 %0,%1; eieio" : "=r" (ret) : "m" (*addr));
+				return ret;
 }
 static void my_out_be16( unsigned short *addr, int val)
 {
@@ -787,15 +786,12 @@
 #ifdef  CONFIG_BOOT_32B
 static  unsigned my_in_be32( unsigned *addr)
 {
-        unsigned ret;
-        __asm__ __volatile__("lwz%U1%X1 %0,%1; eieio" : "=r" (ret) : "m" (*addr));
-			        return ret;
+	unsigned ret;
+	__asm__ __volatile__("lwz%U1%X1 %0,%1; eieio" : "=r" (ret) : "m" (*addr));
+				return ret;
 }
 static  void my_out_be32( unsigned *addr, int val)
 {
        __asm__ __volatile__("stw%U0%X0 %1,%0; eieio" : "=m" (*addr) : "r" (val));
 }
 #endif
-
-
-

diff --git a/board/svm_sc8xx/svm_sc8xx.c b/board/svm_sc8xx/svm_sc8xx.c
index db3162a..1311ea9 100644
--- a/board/svm_sc8xx/svm_sc8xx.c
+++ b/board/svm_sc8xx/svm_sc8xx.c

@@ -101,7 +101,7 @@
 /* ------------------------------------------------------------------------- */
 
 long int initdram (int board_type)
-{    
+{
 	volatile immap_t     *immap  = (immap_t *)CFG_IMMR;
 	volatile memctl8xx_t *memctl = &immap->im_memctl;
 	long int size_b0 = 0;
@@ -145,7 +145,7 @@
 	udelay(1);
 	memctl->memc_or1 =  0xfc000a00;
 	size_b0 = 0x04000000;
-#else 
+#else
 #error SDRAM size configuration missing.
 #endif
 	memctl->memc_br1 =  0x00000081;
@@ -160,4 +160,3 @@
 	        doc_probe (CFG_DOC_BASE);
 }
 #endif
-

diff --git a/board/svm_sc8xx/u-boot.lds b/board/svm_sc8xx/u-boot.lds
index 0225f0b..36e4836 100644
--- a/board/svm_sc8xx/u-boot.lds
+++ b/board/svm_sc8xx/u-boot.lds

@@ -112,6 +112,12 @@
   _edata  =  .;
   PROVIDE (edata = .);
 
+
+  __u_boot_cmd_start = .;
+  .u_boot_cmd : { *(.u_boot_cmd) }
+  __u_boot_cmd_end = .;
+
+
   __start___ex_table = .;
   __ex_table : { *(__ex_table) }
   __stop___ex_table = .;
@@ -134,4 +140,3 @@
   _end = . ;
   PROVIDE (end = .);
 }
-

diff --git a/board/svm_sc8xx/u-boot.lds.debug b/board/svm_sc8xx/u-boot.lds.debug
index 22138f8..f34c2a4 100644
--- a/board/svm_sc8xx/u-boot.lds.debug
+++ b/board/svm_sc8xx/u-boot.lds.debug

@@ -128,4 +128,3 @@
   _end = . ;
   PROVIDE (end = .);
 }
-

diff --git a/board/tqm8260/Makefile b/board/tqm8260/Makefile
index 2a150a1..c10b9fe 100644
--- a/board/tqm8260/Makefile
+++ b/board/tqm8260/Makefile

@@ -28,7 +28,7 @@
 OBJS	= $(BOARD).o flash.o ../tqm8xx/load_sernum_ethaddr.o
 
 $(LIB):	.depend $(OBJS)
-	$(AR) crv $@ $^
+	$(AR) crv $@ $(OBJS)
 
 #########################################################################
 

diff --git a/board/tqm8260/u-boot.lds b/board/tqm8260/u-boot.lds
index 9d56f13..ce6c454 100644
--- a/board/tqm8260/u-boot.lds
+++ b/board/tqm8260/u-boot.lds

@@ -94,6 +94,11 @@
   _edata  =  .;
   PROVIDE (edata = .);
 
+  __u_boot_cmd_start = .;
+  .u_boot_cmd : { *(.u_boot_cmd) }
+  __u_boot_cmd_end = .;
+
+
   __start___ex_table = .;
   __ex_table : { *(__ex_table) }
   __stop___ex_table = .;
@@ -116,4 +121,3 @@
   _end = . ;
   PROVIDE (end = .);
 }
-

diff --git a/board/tqm8xx/Makefile b/board/tqm8xx/Makefile
index 99c0f85..a01fd86 100644
--- a/board/tqm8xx/Makefile
+++ b/board/tqm8xx/Makefile

@@ -28,7 +28,7 @@
 OBJS	= $(BOARD).o flash.o load_sernum_ethaddr.o
 
 $(LIB):	.depend $(OBJS)
-	$(AR) crv $@ $^
+	$(AR) crv $@ $(OBJS)
 
 #########################################################################
 

diff --git a/board/tqm8xx/u-boot.lds b/board/tqm8xx/u-boot.lds
index 71e8f7f..10dc7d2 100644
--- a/board/tqm8xx/u-boot.lds
+++ b/board/tqm8xx/u-boot.lds

@@ -112,6 +112,11 @@
   _edata  =  .;
   PROVIDE (edata = .);
 
+  __u_boot_cmd_start = .;
+  .u_boot_cmd : { *(.u_boot_cmd) }
+  __u_boot_cmd_end = .;
+
+
   __start___ex_table = .;
   __ex_table : { *(__ex_table) }
   __stop___ex_table = .;
@@ -134,4 +139,3 @@
   _end = . ;
   PROVIDE (end = .);
 }
-

diff --git a/board/tqm8xx/u-boot.lds.debug b/board/tqm8xx/u-boot.lds.debug
index 22138f8..c0ee849 100644
--- a/board/tqm8xx/u-boot.lds.debug
+++ b/board/tqm8xx/u-boot.lds.debug

@@ -106,6 +106,11 @@
   _edata  =  .;
   PROVIDE (edata = .);
 
+  __u_boot_cmd_start = .;
+  .u_boot_cmd : { *(.u_boot_cmd) }
+  __u_boot_cmd_end = .;
+
+
   __start___ex_table = .;
   __ex_table : { *(__ex_table) }
   __stop___ex_table = .;
@@ -128,4 +133,3 @@
   _end = . ;
   PROVIDE (end = .);
 }
-

diff --git a/board/trab/Makefile b/board/trab/Makefile
index bb6930d..d58ac91 100644
--- a/board/trab/Makefile
+++ b/board/trab/Makefile

@@ -29,7 +29,7 @@
 SOBJS	:= memsetup.o
 
 $(LIB):	$(OBJS) $(SOBJS)
-	$(AR) crv $@ $^
+	$(AR) crv $@ $(OBJS) $(SOBJS)
 
 clean:
 	rm -f $(SOBJS) $(OBJS)

diff --git a/board/trab/flash.c b/board/trab/flash.c
index a2a21c6..aba0631 100644
--- a/board/trab/flash.c
+++ b/board/trab/flash.c

@@ -439,7 +439,7 @@
 		else {
 			data = *((vu_long *) src);
 		}
-			
+
 		if ((rc = write_word (info, wp, data)) != 0) {
 			return (rc);
 		}

diff --git a/board/trab/memsetup.S b/board/trab/memsetup.S
index ea4bccc..7914513 100644
--- a/board/trab/memsetup.S
+++ b/board/trab/memsetup.S

@@ -28,7 +28,6 @@
  */
 
 
-
 #include <config.h>
 #include <version.h>
 
@@ -165,4 +164,3 @@
 	.word	0x17	/* BUSWIDTH=32, SCLK power saving mode, BANKSIZE 16M/16M */
 	.word	0x30	/* MRSR6, CL=3clk */
 	.word	0x30	/* MRSR7 */
-

diff --git a/board/trab/trab.c b/board/trab/trab.c
index dd4105d..1a4f5c5 100644
--- a/board/trab/trab.c
+++ b/board/trab/trab.c

@@ -24,9 +24,9 @@
 /* #define DEBUG */
 
 #include <common.h>
-#include <cmd_bsp.h>
 #include <malloc.h>
 #include <s3c2400.h>
+#include <command.h>
 
 /* ------------------------------------------------------------------------- */
 
@@ -298,6 +298,12 @@
 	return 0;
 }
 
+cmd_tbl_t U_BOOT_CMD(kbd) = MK_CMD_ENTRY(
+ 	"kbd",	1,	1,	do_kbd,
+ 	"kbd     - read keyboard status\n",
+ 	NULL
+);
+
 #ifdef CONFIG_MODEM_SUPPORT
 static int key_pressed(void)
 {

diff --git a/board/trab/u-boot.lds b/board/trab/u-boot.lds
index 5ea1829..ccffb19 100644
--- a/board/trab/u-boot.lds
+++ b/board/trab/u-boot.lds

@@ -27,9 +27,9 @@
 ENTRY(_start)
 SECTIONS
 {
-        . = 0x00000000;
+	. = 0x00000000;
 
-        . = ALIGN(4);
+	. = ALIGN(4);
 	.text      :
 	{
 	  cpu/arm920t/start.o	(.text)
@@ -44,19 +44,24 @@
 	  *(.text)
 	}
 
-        . = ALIGN(4);
-        .rodata : { *(.rodata) }
+	. = ALIGN(4);
+	.rodata : { *(.rodata) }
 
-        . = ALIGN(4);
-        .data : { *(.data) }
+	. = ALIGN(4);
+	.data : { *(.data) }
 
-        . = ALIGN(4);
-        .got : { *(.got) }
+	. = ALIGN(4);
+	.got : { *(.got) }
+
+  __u_boot_cmd_start = .;
+  .u_boot_cmd : { *(.u_boot_cmd) }
+  __u_boot_cmd_end = .;
 
 	armboot_end_data = .;
 
-        . = ALIGN(4);
-        .bss : { *(.bss) }
+	. = ALIGN(4);
+	.bss : { *(.bss) }
+
 
 	armboot_end = .;
 }

diff --git a/board/utx8245/Makefile b/board/utx8245/Makefile
index d040e00..e698afc 100644
--- a/board/utx8245/Makefile
+++ b/board/utx8245/Makefile

@@ -35,7 +35,7 @@
 SOBJS	=
 
 $(LIB):	.depend $(OBJS) $(SOBJS)
-	$(AR) crv $@ $^
+	$(AR) crv $@ $(OBJS)
 
 #########################################################################
 

diff --git a/board/utx8245/u-boot.lds b/board/utx8245/u-boot.lds
index b45f8fa..ae62484 100644
--- a/board/utx8245/u-boot.lds
+++ b/board/utx8245/u-boot.lds

@@ -108,6 +108,11 @@
   _edata  =  .;
   PROVIDE (edata = .);
 
+  __u_boot_cmd_start = .;
+  .u_boot_cmd : { *(.u_boot_cmd) }
+  __u_boot_cmd_end = .;
+
+
   __start___ex_table = .;
   __ex_table : { *(__ex_table) }
   __stop___ex_table = .;
@@ -131,4 +136,3 @@
   _end = . ;
   PROVIDE (end = .);
 }
-

diff --git a/board/utx8245/utx8245.c b/board/utx8245/utx8245.c
index a8c82e4..38c427a 100644
--- a/board/utx8245/utx8245.c
+++ b/board/utx8245/utx8245.c

@@ -162,4 +162,3 @@
 
 	icache_enable();
 }
-

diff --git a/board/v37/Makefile b/board/v37/Makefile
index baecac9..7a17067 100644
--- a/board/v37/Makefile
+++ b/board/v37/Makefile

@@ -28,7 +28,7 @@
 OBJS	= $(BOARD).o flash.o
 
 $(LIB):	.depend $(OBJS)
-	$(AR) crv $@ $^
+	$(AR) crv $@ $(OBJS)
 
 #########################################################################
 

diff --git a/board/v37/flash.c b/board/v37/flash.c
index b42f335..6a31972 100644
--- a/board/v37/flash.c
+++ b/board/v37/flash.c

@@ -57,8 +57,8 @@
 	volatile immap_t     *immap  = (immap_t *)CFG_IMMR;
 	volatile memctl8xx_t *memctl = &immap->im_memctl;
 	unsigned long size_b0, size_b1;
-        short manu, dev_id;
-        int i;
+	short manu, dev_id;
+	int i;
 
 	/* Init: no FLASHes known */
 	for (i=0; i<CFG_MAX_FLASH_BANKS; ++i) {
@@ -67,11 +67,11 @@
 
 	/* Do sizing to get full correct info */
 
-        flash_get_id_word((void*)CFG_FLASH_BASE0,&manu,&dev_id);
+	flash_get_id_word((void*)CFG_FLASH_BASE0,&manu,&dev_id);
 
-        size_b0 = flash_get_size(manu, dev_id, &flash_info[0]);
+	size_b0 = flash_get_size(manu, dev_id, &flash_info[0]);
 
-        flash_get_offsets (CFG_FLASH_BASE0, &flash_info[0],0);
+	flash_get_offsets (CFG_FLASH_BASE0, &flash_info[0],0);
 
 	memctl->memc_or0 = CFG_OR_TIMING_FLASH | (0 - size_b0);
 
@@ -83,32 +83,32 @@
 		      &flash_info[0]);
 #endif
 
-        flash_get_id_long((void*)CFG_FLASH_BASE1,&manu,&dev_id);
+	flash_get_id_long((void*)CFG_FLASH_BASE1,&manu,&dev_id);
 
-        size_b1 = 2 * flash_get_size(manu, dev_id, &flash_info[1]);
+	size_b1 = 2 * flash_get_size(manu, dev_id, &flash_info[1]);
 
-        flash_get_offsets(CFG_FLASH_BASE1, &flash_info[1],1);
+	flash_get_offsets(CFG_FLASH_BASE1, &flash_info[1],1);
 
 	memctl->memc_or1 = CFG_OR_TIMING_FLASH | (0 - size_b1);
 
 	flash_info[0].size = size_b0;
 	flash_info[1].size = size_b1;
 
-        return (size_b0+size_b1);
+	return (size_b0+size_b1);
 }
 
 /*-----------------------------------------------------------------------
  */
 static void flash_get_offsets (ulong base, flash_info_t *info, int two_chips)
 {
-        int i, addr_shift;
-        vu_short *addr = (vu_short*)base;
+	int i, addr_shift;
+	vu_short *addr = (vu_short*)base;
 
 	addr[0x555] = 0x00AA ;
 	addr[0xAAA] = 0x0055 ;
 	addr[0x555] = 0x0090 ;
 
-        addr_shift = (two_chips ? 2 : 1 );
+	addr_shift = (two_chips ? 2 : 1 );
 
 	/* set up sector start address table */
 	if (info->flash_id & FLASH_BTYPE) {
@@ -210,7 +210,7 @@
 
 static void flash_get_id_word( void *ptr,  short *ptr_manuf, short *ptr_dev_id)
 {
-        vu_short *addr = (vu_short*)ptr;
+	vu_short *addr = (vu_short*)ptr;
 
 	addr[0x555] = 0x00AA ;
 	addr[0xAAA] = 0x0055 ;
@@ -219,26 +219,26 @@
 	*ptr_manuf  = addr[0];
 	*ptr_dev_id = addr[1];
 
-        addr[0] = 0xf0f0;       /* return to normal */
+	addr[0] = 0xf0f0;       /* return to normal */
 }
 
 static void flash_get_id_long( void *ptr,  short *ptr_manuf, short *ptr_dev_id)
 {
-        vu_short *addr = (vu_short*)ptr;
-        vu_short *addr1, *addr2, *addr3;
+	vu_short *addr = (vu_short*)ptr;
+	vu_short *addr1, *addr2, *addr3;
 
-        addr1 = (vu_short*) ( ((int)ptr) + (0x5555<<2) );
-        addr2 = (vu_short*) ( ((int)ptr) + (0x2AAA<<2) );
-        addr3 = (vu_short*) ( ((int)ptr) + (0x5555<<2) );
+	addr1 = (vu_short*) ( ((int)ptr) + (0x5555<<2) );
+	addr2 = (vu_short*) ( ((int)ptr) + (0x2AAA<<2) );
+	addr3 = (vu_short*) ( ((int)ptr) + (0x5555<<2) );
 
-        *addr1 = 0xAAAA;
-        *addr2 = 0x5555;
-        *addr3 = 0x9090;
+	*addr1 = 0xAAAA;
+	*addr2 = 0x5555;
+	*addr3 = 0x9090;
 
 	*ptr_manuf  = addr[0];
 	*ptr_dev_id = addr[2];
 
-        addr[0] = 0xf0f0;       /* return to normal */
+	addr[0] = 0xf0f0;       /* return to normal */
 }
 
 static ulong flash_get_size ( short manu, short dev_id, flash_info_t *info)
@@ -295,7 +295,7 @@
 	case ((short)AMD_ID_LV800B):
 		info->flash_id += FLASH_AM800B;
 		info->sector_count = 19;
-		info->size = 0x00400000;	//%%% Size doubled by yooth
+		info->size = 0x00400000;	/*%%% Size doubled by yooth */
 		break;				/* => 4 MB		*/
 
 	case ((short)AMD_ID_LV160T):
@@ -315,7 +315,7 @@
 
 	}
 
-        return(info->size);
+	return(info->size);
 }
 
 

diff --git a/board/v37/u-boot.lds b/board/v37/u-boot.lds
index 303425a..ab1bbc9 100644
--- a/board/v37/u-boot.lds
+++ b/board/v37/u-boot.lds

@@ -114,6 +114,11 @@
   _edata  =  .;
   PROVIDE (edata = .);
 
+  __u_boot_cmd_start = .;
+  .u_boot_cmd : { *(.u_boot_cmd) }
+  __u_boot_cmd_end = .;
+
+
   __start___ex_table = .;
   __ex_table : { *(__ex_table) }
   __stop___ex_table = .;
@@ -136,8 +141,3 @@
   _end = . ;
   PROVIDE (end = .);
 }
-
-
-
-
-

diff --git a/board/v37/v37.c b/board/v37/v37.c
index f463af8..3b786ef 100644
--- a/board/v37/v37.c
+++ b/board/v37/v37.c

@@ -44,33 +44,33 @@
 
 const uint sdram_table[] =
 {
-        /*  single read. (offset 0 in upm RAM) */
-        0x1F07D004, 0xEEAEE004, 0x11ADD004, 0xEFBBA000,
-        0x1FF75447, 0x1FF77C34, 0xEFEABC34, 0x1FB57C35,
+	/*  single read. (offset 0 in upm RAM) */
+	0x1F07D004, 0xEEAEE004, 0x11ADD004, 0xEFBBA000,
+	0x1FF75447, 0x1FF77C34, 0xEFEABC34, 0x1FB57C35,
 
-        /* burst read. (Offset 8 in upm RAM)   */
-        0x1F07D004, 0xEEAEE004, 0x00ADC004, 0x00AFC000,
-        0x00AFC000, 0x01AFC000, 0x0FBB8000, 0x1FF75447,
-        0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF,
-        0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF,
+	/* burst read. (Offset 8 in upm RAM)   */
+	0x1F07D004, 0xEEAEE004, 0x00ADC004, 0x00AFC000,
+	0x00AFC000, 0x01AFC000, 0x0FBB8000, 0x1FF75447,
+	0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF,
+	0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF,
 
-        /* single write. (Offset 0x18 in upm RAM) */
-        0x1F27D004, 0xEEAEA000, 0x01B90004, 0x1FF75447,
-        0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF,
+	/* single write. (Offset 0x18 in upm RAM) */
+	0x1F27D004, 0xEEAEA000, 0x01B90004, 0x1FF75447,
+	0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF,
 
-        /*  burst write. (Offset 0x20 in upm RAM) */
-        0x1F07D004, 0xEEAEA000, 0x00AD4000, 0x00AFC000,
-        0x00AFC000, 0x01BB8004, 0x1FF75447, 0xFFFFFFFF,
-        0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF,
-        0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF,
+	/*  burst write. (Offset 0x20 in upm RAM) */
+	0x1F07D004, 0xEEAEA000, 0x00AD4000, 0x00AFC000,
+	0x00AFC000, 0x01BB8004, 0x1FF75447, 0xFFFFFFFF,
+	0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF,
+	0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF,
 
-        /* Refresh cycle, offset 0x30 */
-        0x1FF5DC84, 0xFFFFFC04, 0xFFFFFC04, 0xFFFFFC04,
-        0xFFFFFC84, 0xFFFFFC07, 0xFFFFFFFF, 0xFFFFFFFF,
-        0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF,
+	/* Refresh cycle, offset 0x30 */
+	0x1FF5DC84, 0xFFFFFC04, 0xFFFFFC04, 0xFFFFFC04,
+	0xFFFFFC84, 0xFFFFFC07, 0xFFFFFFFF, 0xFFFFFFFF,
+	0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF,
 
-        /* Exception, 0ffset 0x3C */
-        0x7FFFFC07, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF,
+	/* Exception, 0ffset 0x3C */
+	0x7FFFFC07, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF,
 };
 /* ------------------------------------------------------------------------- */
 
@@ -121,7 +121,7 @@
 
     delay_cnt = 0;
     while( delay_cnt++ < DRAM_DELAY )
-        ;
+	;
 
     /* Run MRS command in location 5-8 of UPMB */
 
@@ -132,7 +132,7 @@
 
     delay_cnt = 0;
     while( delay_cnt++ < DRAM_DELAY )
-        ;
+	;
 
 #ifdef	CONFIG_CAN_DRIVER
     /* Initialize OR3 / BR3 */
@@ -207,12 +207,12 @@
 
     switch( memory )
     {
-        case 1:
-            return( 32*MBYTE );
-        case 2:
-            return( 64*MBYTE );
-        default:
-            break;
+	case 1:
+	    return( 32*MBYTE );
+	case 2:
+	    return( 64*MBYTE );
+	default:
+	    break;
     }
     return( 16*MBYTE );
 }

diff --git a/board/w7o/cmd_vpd.c b/board/w7o/cmd_vpd.c
index 3025699..2763a53 100644
--- a/board/w7o/cmd_vpd.c
+++ b/board/w7o/cmd_vpd.c

@@ -57,4 +57,11 @@
 	return 1;
 }
 
+cmd_tbl_t U_BOOT_CMD(vpd) = MK_CMD_ENTRY(
+	  "vpd",	2,	1,	do_vpd,
+	  "vpd     - Read Vital Product Data\n",
+	  "[dev_addr]\n"
+	  "        - Read VPD Data from default address, or device address 'dev_addr'.\n"
+);
+
 #endif /* (CONFIG_COMMANDS & CFG_CMD_BSP) */

diff --git a/board/w7o/config.mk b/board/w7o/config.mk
index c73329e..bc341ca 100644
--- a/board/w7o/config.mk
+++ b/board/w7o/config.mk

@@ -29,4 +29,3 @@
 TEXT_BASE = 0xFFFC0000
 
 #PLATFORM_CPPFLAGS += -I$(TOPDIR)/board/$(BOARD)
-

diff --git a/board/w7o/errors.h b/board/w7o/errors.h
index d1e5caf..05b4eae 100644
--- a/board/w7o/errors.h
+++ b/board/w7o/errors.h

@@ -95,4 +95,3 @@
 (13) SDRAM address shorted or unconnected, check sdram caps
 */
 #endif /* _ERRORS_H_ */
-

diff --git a/board/w7o/flash.c b/board/w7o/flash.c
index 5651e1c..d6ea635 100644
--- a/board/w7o/flash.c
+++ b/board/w7o/flash.c

@@ -50,21 +50,21 @@
 
     /* Init: no FLASHes known */
     for (i = 0; i < CFG_MAX_FLASH_BANKS; ++i) {
-        flash_info[i].flash_id = FLASH_UNKNOWN;
+	flash_info[i].flash_id = FLASH_UNKNOWN;
     }
 
     /* Get Size of Boot and Main Flashes */
     size_b0 = flash_get_size((vu_long *)FLASH_BASE0_PRELIM, &flash_info[0]);
     if (flash_info[0].flash_id == FLASH_UNKNOWN) {
-        printf ("## Unknown FLASH on Bank 0 - Size = 0x%08lx = %ld MB\n",
-            size_b0, size_b0<<20);
-        return 0;
+	printf ("## Unknown FLASH on Bank 0 - Size = 0x%08lx = %ld MB\n",
+	    size_b0, size_b0<<20);
+	return 0;
     }
     size_b1 = flash_get_size((vu_long *)FLASH_BASE1_PRELIM, &flash_info[1]);
     if (flash_info[1].flash_id == FLASH_UNKNOWN) {
-        printf ("## Unknown FLASH on Bank 1 - Size = 0x%08lx = %ld MB\n",
-            size_b1, size_b1<<20);
-        return 0;
+	printf ("## Unknown FLASH on Bank 1 - Size = 0x%08lx = %ld MB\n",
+	    size_b1, size_b1<<20);
+	return 0;
     }
 
     /* Calculate base addresses */
@@ -83,21 +83,21 @@
 
     /* Monitor protection ON by default */
     (void)flash_protect(FLAG_PROTECT_SET,
-                        base_b0 + size_b0 - monitor_flash_len,
-                        base_b0 + size_b0 - 1,
-                        &flash_info[0]);
+			base_b0 + size_b0 - monitor_flash_len,
+			base_b0 + size_b0 - 1,
+			&flash_info[0]);
 
     /* Protect the FPGA image */
     (void)flash_protect(FLAG_PROTECT_SET,
-                        FLASH_BASE1_PRELIM,
-                        FLASH_BASE1_PRELIM + CFG_FPGA_IMAGE_LEN - 1,
-                        &flash_info[1]);
+			FLASH_BASE1_PRELIM,
+			FLASH_BASE1_PRELIM + CFG_FPGA_IMAGE_LEN - 1,
+			&flash_info[1]);
 
     /* Protect the default boot image */
     (void)flash_protect(FLAG_PROTECT_SET,
-                        FLASH_BASE1_PRELIM + CFG_FPGA_IMAGE_LEN,
-                        FLASH_BASE1_PRELIM + CFG_FPGA_IMAGE_LEN + 0x600000 - 1,
-                        &flash_info[1]);
+			FLASH_BASE1_PRELIM + CFG_FPGA_IMAGE_LEN,
+			FLASH_BASE1_PRELIM + CFG_FPGA_IMAGE_LEN + 0x600000 - 1,
+			&flash_info[1]);
 
     /* Setup offsets for Main Flash */
     flash_get_offsets (FLASH_BASE1_PRELIM, &flash_info[1]);
@@ -113,8 +113,8 @@
 
     /* set up sector start address table - FOR BOOT ROM ONLY!!! */
     if ((info->flash_id & FLASH_TYPEMASK)  == FLASH_AM040) {
-        for (i = 0; i < info->sector_count; i++)
-            info->start[i] = base + (i * 0x00010000);
+	for (i = 0; i < info->sector_count; i++)
+	    info->start[i] = base + (i * 0x00010000);
     }
 } /* end flash_get_offsets() */
 
@@ -129,75 +129,75 @@
     volatile unsigned long *flash;
 
     if (info->flash_id == FLASH_UNKNOWN) {
-        printf ("missing or unknown FLASH type\n");
-        return;
+	printf ("missing or unknown FLASH type\n");
+	return;
     }
 
     switch (info->flash_id & FLASH_VENDMASK) {
-        case FLASH_MAN_AMD:     printf ("1 x AMD ");    break;
+	case FLASH_MAN_AMD:     printf ("1 x AMD ");    break;
 	case FLASH_MAN_STM:	printf ("1 x STM ");	break;
-        case FLASH_MAN_INTEL:   printf ("2 x Intel ");  break;
-        default:                printf ("Unknown Vendor ");
+	case FLASH_MAN_INTEL:   printf ("2 x Intel ");  break;
+	default:                printf ("Unknown Vendor ");
     }
 
     switch (info->flash_id & FLASH_TYPEMASK) {
-        case FLASH_AM040:
+	case FLASH_AM040:
 	    if ((info->flash_id & FLASH_VENDMASK) == FLASH_MAN_AMD)
-            	printf ("AM29LV040 (4096 Kbit, uniform sector size)\n");
+		printf ("AM29LV040 (4096 Kbit, uniform sector size)\n");
 	    else if ((info->flash_id & FLASH_VENDMASK) == FLASH_MAN_STM)
-            	printf ("M29W040B (4096 Kbit, uniform block size)\n");
+		printf ("M29W040B (4096 Kbit, uniform block size)\n");
 	    else
-            	printf ("UNKNOWN 29x040x (4096 Kbit, uniform sector size)\n");
-            break;
-        case FLASH_28F320J3A:
-            printf ("28F320J3A (32 Mbit = 128K x 32)\n");
-            break;
-        case FLASH_28F640J3A:
-            printf ("28F640J3A (64 Mbit = 128K x 64)\n");
-            break;
-        case FLASH_28F128J3A:
-            printf ("28F128J3A (128 Mbit = 128K x 128)\n");
-            break;
-        default:
-            printf ("Unknown Chip Type\n");
+		printf ("UNKNOWN 29x040x (4096 Kbit, uniform sector size)\n");
+	    break;
+	case FLASH_28F320J3A:
+	    printf ("28F320J3A (32 Mbit = 128K x 32)\n");
+	    break;
+	case FLASH_28F640J3A:
+	    printf ("28F640J3A (64 Mbit = 128K x 64)\n");
+	    break;
+	case FLASH_28F128J3A:
+	    printf ("28F128J3A (128 Mbit = 128K x 128)\n");
+	    break;
+	default:
+	    printf ("Unknown Chip Type\n");
     }
 
     if ((info->flash_id & FLASH_VENDMASK) == FLASH_MAN_STM) {
-    	printf ("  Size: %ld KB in %d Blocks\n",
-        	info->size >> 10, info->sector_count);
+	printf ("  Size: %ld KB in %d Blocks\n",
+		info->size >> 10, info->sector_count);
     } else {
-    	printf ("  Size: %ld KB in %d Sectors\n",
-        	info->size >> 10, info->sector_count);
+	printf ("  Size: %ld KB in %d Sectors\n",
+		info->size >> 10, info->sector_count);
     }
 
     printf ("  Sector Start Addresses:");
     for (i=0; i<info->sector_count; ++i) {
-        /*
-         * Check if whole sector is erased
-         */
-        if (i != (info->sector_count-1))
-            size = info->start[i+1] - info->start[i];
-        else
-            size = info->start[0] + info->size - info->start[i];
-        erased = 1;
-        flash = (volatile unsigned long *)info->start[i];
-        size = size >> 2;        /* divide by 4 for longword access */
-        for (k=0; k<size; k++)
-        {
-            if (*flash++ != 0xffffffff)
-            {
-                erased = 0;
-                break;
-            }
-        }
+	/*
+	 * Check if whole sector is erased
+	 */
+	if (i != (info->sector_count-1))
+	    size = info->start[i+1] - info->start[i];
+	else
+	    size = info->start[0] + info->size - info->start[i];
+	erased = 1;
+	flash = (volatile unsigned long *)info->start[i];
+	size = size >> 2;        /* divide by 4 for longword access */
+	for (k=0; k<size; k++)
+	{
+	    if (*flash++ != 0xffffffff)
+	    {
+		erased = 0;
+		break;
+	    }
+	}
 
-        if ((i % 5) == 0)
-            printf ("\n   ");
-        printf (" %08lX%s%s",
-            info->start[i],
-            erased ? " E" : "  ",
-            info->protect[i] ? "RO " : "   "
-        );
+	if ((i % 5) == 0)
+	    printf ("\n   ");
+	printf (" %08lX%s%s",
+	    info->start[i],
+	    erased ? " E" : "  ",
+	    info->protect[i] ? "RO " : "   "
+	);
     }
     printf ("\n");
 } /* end flash_print_info() */
@@ -217,130 +217,130 @@
 
     /* Test for Boot Flash */
     if (base == FLASH_BASE0_PRELIM) {
-        unsigned char value;
-        volatile unsigned char * addr2 = (unsigned char *)addr;
+	unsigned char value;
+	volatile unsigned char * addr2 = (unsigned char *)addr;
 
-        /* Write auto select command: read Manufacturer ID */
-        *(addr2 + 0x555) = 0xaa;
-        *(addr2 + 0x2aa) = 0x55;
-        *(addr2 + 0x555) = 0x90;
+	/* Write auto select command: read Manufacturer ID */
+	*(addr2 + 0x555) = 0xaa;
+	*(addr2 + 0x2aa) = 0x55;
+	*(addr2 + 0x555) = 0x90;
 
-        /* Manufacture ID */
-        value = *addr2;
-        switch (value) {
-            case (unsigned char)AMD_MANUFACT:
-                info->flash_id = FLASH_MAN_AMD;
-                break;
+	/* Manufacture ID */
+	value = *addr2;
+	switch (value) {
+	    case (unsigned char)AMD_MANUFACT:
+		info->flash_id = FLASH_MAN_AMD;
+		break;
 	    case (unsigned char)STM_MANUFACT:
 		info->flash_id = FLASH_MAN_STM;
 		break;
-            default:
-                *addr2 = 0xf0;              /* no or unknown flash  */
-                return 0;
-        }
+	    default:
+		*addr2 = 0xf0;              /* no or unknown flash  */
+		return 0;
+	}
 
-        /* Device ID */
-        value = *(addr2 + 1);
-        switch (value) {
-            case (unsigned char)AMD_ID_LV040B:
+	/* Device ID */
+	value = *(addr2 + 1);
+	switch (value) {
+	    case (unsigned char)AMD_ID_LV040B:
 	    case (unsigned char)STM_ID_29W040B:
-                info->flash_id += FLASH_AM040;
-                info->sector_count = 8;
-                info->size = 0x00080000;
-                break;                       /* => 512Kb */
-            default:
-                *addr2 = 0xf0;               /* => no or unknown flash */
-                return 0;
-        }
+		info->flash_id += FLASH_AM040;
+		info->sector_count = 8;
+		info->size = 0x00080000;
+		break;                       /* => 512Kb */
+	    default:
+		*addr2 = 0xf0;               /* => no or unknown flash */
+		return 0;
+	}
     }
     else { /* MAIN Flash */
-        unsigned long value;
-        volatile unsigned long * addr2 = (unsigned long *)addr;
+	unsigned long value;
+	volatile unsigned long * addr2 = (unsigned long *)addr;
 
-        /* Write auto select command: read Manufacturer ID */
-        *addr2 = 0x90909090;
+	/* Write auto select command: read Manufacturer ID */
+	*addr2 = 0x90909090;
 
-        /* Manufacture ID */
-        value = *addr2;
-        switch (value) {
-            case (unsigned long)INTEL_MANUFACT:
-                info->flash_id = FLASH_MAN_INTEL;
-                break;
-            default:
-                *addr2 = 0xff;              /* no or unknown flash  */
-                return 0;
-        }
+	/* Manufacture ID */
+	value = *addr2;
+	switch (value) {
+	    case (unsigned long)INTEL_MANUFACT:
+		info->flash_id = FLASH_MAN_INTEL;
+		break;
+	    default:
+		*addr2 = 0xff;              /* no or unknown flash  */
+		return 0;
+	}
 
-        /* Device ID - This shit is interleaved... */
-        value = *(addr2 + 1);
-        switch (value) {
-            case (unsigned long)INTEL_ID_28F320J3A:
-                info->flash_id += FLASH_28F320J3A;
-                info->sector_count = 32;
-                info->size = 0x00400000 * 2;
-                break;                       /* => 2 X 4 MB */
-            case (unsigned long)INTEL_ID_28F640J3A:
-                info->flash_id += FLASH_28F640J3A;
-                info->sector_count = 64;
-                info->size = 0x00800000 * 2;
-                break;                       /* => 2 X 8 MB */
-            case (unsigned long)INTEL_ID_28F128J3A:
-                info->flash_id += FLASH_28F128J3A;
-                info->sector_count = 128;
-                info->size = 0x01000000 * 2;
-                break;                       /* => 2 X 16 MB */
-            default:
-                *addr2 = 0xff;               /* => no or unknown flash */
-        }
+	/* Device ID - This shit is interleaved... */
+	value = *(addr2 + 1);
+	switch (value) {
+	    case (unsigned long)INTEL_ID_28F320J3A:
+		info->flash_id += FLASH_28F320J3A;
+		info->sector_count = 32;
+		info->size = 0x00400000 * 2;
+		break;                       /* => 2 X 4 MB */
+	    case (unsigned long)INTEL_ID_28F640J3A:
+		info->flash_id += FLASH_28F640J3A;
+		info->sector_count = 64;
+		info->size = 0x00800000 * 2;
+		break;                       /* => 2 X 8 MB */
+	    case (unsigned long)INTEL_ID_28F128J3A:
+		info->flash_id += FLASH_28F128J3A;
+		info->sector_count = 128;
+		info->size = 0x01000000 * 2;
+		break;                       /* => 2 X 16 MB */
+	    default:
+		*addr2 = 0xff;               /* => no or unknown flash */
+	}
     }
 
     /* Make sure we don't exceed CFG_MAX_FLASH_SECT */
     if (info->sector_count > CFG_MAX_FLASH_SECT) {
-        printf ("** ERROR: sector count %d > max (%d) **\n",
-                info->sector_count, CFG_MAX_FLASH_SECT);
-        info->sector_count = CFG_MAX_FLASH_SECT;
+	printf ("** ERROR: sector count %d > max (%d) **\n",
+		info->sector_count, CFG_MAX_FLASH_SECT);
+	info->sector_count = CFG_MAX_FLASH_SECT;
     }
 
     /* set up sector start address table */
     switch (info->flash_id & FLASH_TYPEMASK) {
-        case FLASH_AM040:
-            for (i = 0; i < info->sector_count; i++)
-                info->start[i] = base + (i * 0x00010000);
-            break;
-        case FLASH_28F320J3A:
-        case FLASH_28F640J3A:
-        case FLASH_28F128J3A:
-            for (i = 0; i < info->sector_count; i++)
-                info->start[i] = base + (i * 0x00020000 * 2); /* 2 Banks */
-            break;
+	case FLASH_AM040:
+	    for (i = 0; i < info->sector_count; i++)
+		info->start[i] = base + (i * 0x00010000);
+	    break;
+	case FLASH_28F320J3A:
+	case FLASH_28F640J3A:
+	case FLASH_28F128J3A:
+	    for (i = 0; i < info->sector_count; i++)
+		info->start[i] = base + (i * 0x00020000 * 2); /* 2 Banks */
+	    break;
     }
 
     /* Test for Boot Flash */
     if (base == FLASH_BASE0_PRELIM) {
-        volatile unsigned char *addr2;
-        /* check for protected sectors */
-        for (i = 0; i < info->sector_count; i++) {
-            /* read sector protection at sector address, (AX .. A0) = 0x02 */
-            /* D0 = 1 if protected */
-            addr2 = (volatile unsigned char *)(info->start[i]);
-            info->protect[i] = *(addr2 + 2) & 1;
-        }
+	volatile unsigned char *addr2;
+	/* check for protected sectors */
+	for (i = 0; i < info->sector_count; i++) {
+	    /* read sector protection at sector address, (AX .. A0) = 0x02 */
+	    /* D0 = 1 if protected */
+	    addr2 = (volatile unsigned char *)(info->start[i]);
+	    info->protect[i] = *(addr2 + 2) & 1;
+	}
 
-        /* Restore read mode */
-        *(unsigned char *)base = 0xF0;       /* Reset NORMAL Flash */
+	/* Restore read mode */
+	*(unsigned char *)base = 0xF0;       /* Reset NORMAL Flash */
     }
     else { /* Main Flash */
-        volatile unsigned long *addr2;
-        /* check for protected sectors */
-        for (i = 0; i < info->sector_count; i++) {
-            /* read sector protection at sector address, (AX .. A0) = 0x02 */
-            /* D0 = 1 if protected */
-            addr2 = (volatile unsigned long *)(info->start[i]);
-            info->protect[i] = *(addr2 + 2) & 0x1;
-        }
+	volatile unsigned long *addr2;
+	/* check for protected sectors */
+	for (i = 0; i < info->sector_count; i++) {
+	    /* read sector protection at sector address, (AX .. A0) = 0x02 */
+	    /* D0 = 1 if protected */
+	    addr2 = (volatile unsigned long *)(info->start[i]);
+	    info->protect[i] = *(addr2 + 2) & 0x1;
+	}
 
-        /* Restore read mode */
-        *(unsigned long *)base = 0xFFFFFFFF; /* Reset  Flash */
+	/* Restore read mode */
+	*(unsigned long *)base = 0xFFFFFFFF; /* Reset  Flash */
     }
 
     return (info->size);
@@ -357,20 +357,20 @@
 
     /* Loop X times */
     for (i = 1; i <= (100 * tout); i++) {    /* Wait up to tout ms */
-        udelay(10);
-        /* Pause 10 us */
+	udelay(10);
+	/* Pause 10 us */
 
-        /* Check for completion */
-        if ((vaddr[0] & 0x80) == (cmp_val & 0x80)) {
-            return 0;
-        }
+	/* Check for completion */
+	if ((vaddr[0] & 0x80) == (cmp_val & 0x80)) {
+	    return 0;
+	}
 
-        /* KEEP THE LUSER HAPPY - Print a dot every 1.1 seconds */
-        if (!(i % 110000))
-            putc('.');
+	/* KEEP THE LUSER HAPPY - Print a dot every 1.1 seconds */
+	if (!(i % 110000))
+	    putc('.');
 
-        /* Kick the dog if needed */
-        WATCHDOG_RESET();
+	/* Kick the dog if needed */
+	WATCHDOG_RESET();
     }
 
     return 1;
@@ -388,70 +388,70 @@
 
     /* Validate arguments */
     if ((s_first < 0) || (s_first > s_last)) {
-        if (info->flash_id == FLASH_UNKNOWN)
-            printf ("- missing\n");
-        else
-            printf ("- no sectors to erase\n");
-        return 1;
+	if (info->flash_id == FLASH_UNKNOWN)
+	    printf ("- missing\n");
+	else
+	    printf ("- no sectors to erase\n");
+	return 1;
     }
 
     /* Check for KNOWN flash type */
     if (info->flash_id == FLASH_UNKNOWN) {
-        printf ("Can't erase unknown flash type - aborted\n");
-        return 1;
+	printf ("Can't erase unknown flash type - aborted\n");
+	return 1;
     }
 
     /* Check for protected sectors */
     prot = 0;
     for (sect = s_first; sect <= s_last; ++sect) {
-        if (info->protect[sect])
-            prot++;
+	if (info->protect[sect])
+	    prot++;
     }
     if (prot)
-        printf ("- Warning: %d protected sectors will not be erased!\n", prot);
+	printf ("- Warning: %d protected sectors will not be erased!\n", prot);
     else
-        printf ("\n");
+	printf ("\n");
 
     /* Start erase on unprotected sectors */
     for (sect = s_first; sect <= s_last; sect++) {
-        if (info->protect[sect] == 0) {      /* not protected */
-            sector_addr = (uchar *)(info->start[sect]);
+	if (info->protect[sect] == 0) {      /* not protected */
+	    sector_addr = (uchar *)(info->start[sect]);
 
-    		if ((info->flash_id & FLASH_VENDMASK) == FLASH_MAN_STM)
+		if ((info->flash_id & FLASH_VENDMASK) == FLASH_MAN_STM)
 		    printf("Erasing block %p\n", sector_addr);
 		else
 		    printf("Erasing sector %p\n", sector_addr);
 
-            /* Disable interrupts which might cause Flash to timeout */
-            flag = disable_interrupts();
+	    /* Disable interrupts which might cause Flash to timeout */
+	    flag = disable_interrupts();
 
-            *(addr + 0x555) = (uchar)0xAA;
-            *(addr + 0x2aa) = (uchar)0x55;
-            *(addr + 0x555) = (uchar)0x80;
-            *(addr + 0x555) = (uchar)0xAA;
-            *(addr + 0x2aa) = (uchar)0x55;
-            *sector_addr = (uchar)0x30;      /* sector erase */
+	    *(addr + 0x555) = (uchar)0xAA;
+	    *(addr + 0x2aa) = (uchar)0x55;
+	    *(addr + 0x555) = (uchar)0x80;
+	    *(addr + 0x555) = (uchar)0xAA;
+	    *(addr + 0x2aa) = (uchar)0x55;
+	    *sector_addr = (uchar)0x30;      /* sector erase */
 
-            /*
-             * Wait for each sector to complete, it's more
-             * reliable.  According to AMD Spec, you must
-             * issue all erase commands within a specified
-             * timeout.  This has been seen to fail, especially
-             * if printf()s are included (for debug)!!
-             * Takes up to 6 seconds.
-             */
-            tcode  = wait_for_DQ7((ulong)sector_addr, 0x80, 6000);
+	    /*
+	     * Wait for each sector to complete, it's more
+	     * reliable.  According to AMD Spec, you must
+	     * issue all erase commands within a specified
+	     * timeout.  This has been seen to fail, especially
+	     * if printf()s are included (for debug)!!
+	     * Takes up to 6 seconds.
+	     */
+	    tcode  = wait_for_DQ7((ulong)sector_addr, 0x80, 6000);
 
-            /* re-enable interrupts if necessary */
-            if (flag)
-                enable_interrupts();
+	    /* re-enable interrupts if necessary */
+	    if (flag)
+		enable_interrupts();
 
-            /* Make sure we didn't timeout */
-            if (tcode) {
-                printf ("Timeout\n");
-                rcode = 1;
-            }
-        }
+	    /* Make sure we didn't timeout */
+	    if (tcode) {
+		printf ("Timeout\n");
+		rcode = 1;
+	    }
+	}
     }
 
     /* wait at least 80us - let's wait 1 ms */
@@ -473,68 +473,68 @@
 
     /* Validate arguments */
     if ((s_first < 0) || (s_first > s_last)) {
-        if (info->flash_id == FLASH_UNKNOWN)
-            printf ("- missing\n");
-        else
-            printf ("- no sectors to erase\n");
-        return 1;
+	if (info->flash_id == FLASH_UNKNOWN)
+	    printf ("- missing\n");
+	else
+	    printf ("- no sectors to erase\n");
+	return 1;
     }
 
     /* Check for KNOWN flash type */
     if ((info->flash_id & FLASH_VENDMASK) != FLASH_MAN_INTEL) {
-        printf ("Can erase only Intel flash types - aborted\n");
-        return 1;
+	printf ("Can erase only Intel flash types - aborted\n");
+	return 1;
     }
 
     /* Check for protected sectors */
     for (sect = s_first; sect <= s_last; ++sect) {
-        if (info->protect[sect])
-            prot++;
+	if (info->protect[sect])
+	    prot++;
     }
     if (prot)
-        printf ("- Warning: %d protected sectors will not be erased!\n", prot);
+	printf ("- Warning: %d protected sectors will not be erased!\n", prot);
     else
-        printf ("\n");
+	printf ("\n");
 
     start = get_timer (0);
     last  = start;
     /* Start erase on unprotected sectors */
     for (sect = s_first; sect <= s_last; sect++) {
-        WATCHDOG_RESET();
-        if (info->protect[sect] == 0) {      /* not protected */
-            vu_long *addr = (vu_long *)(info->start[sect]);
-            unsigned long status;
+	WATCHDOG_RESET();
+	if (info->protect[sect] == 0) {      /* not protected */
+	    vu_long *addr = (vu_long *)(info->start[sect]);
+	    unsigned long status;
 
-            /* Disable interrupts which might cause a timeout here */
-            flag = disable_interrupts();
+	    /* Disable interrupts which might cause a timeout here */
+	    flag = disable_interrupts();
 
-            *addr = 0x00500050;              /* clear status register */
-            *addr = 0x00200020;              /* erase setup */
-            *addr = 0x00D000D0;              /* erase confirm */
+	    *addr = 0x00500050;              /* clear status register */
+	    *addr = 0x00200020;              /* erase setup */
+	    *addr = 0x00D000D0;              /* erase confirm */
 
-            /* re-enable interrupts if necessary */
-            if (flag)
-                enable_interrupts();
+	    /* re-enable interrupts if necessary */
+	    if (flag)
+		enable_interrupts();
 
-            /* Wait at least 80us - let's wait 1 ms */
-            udelay (1000);
+	    /* Wait at least 80us - let's wait 1 ms */
+	    udelay (1000);
 
-            while (((status = *addr) & 0x00800080) != 0x00800080) {
-                if ((now = get_timer(start)) > CFG_FLASH_ERASE_TOUT) {
-                    printf ("Timeout\n");
-                    *addr = 0x00B000B0;      /* suspend erase      */
-                    *addr = 0x00FF00FF;      /* reset to read mode */
-                    return 1;
-                }
+	    while (((status = *addr) & 0x00800080) != 0x00800080) {
+		if ((now = get_timer(start)) > CFG_FLASH_ERASE_TOUT) {
+		    printf ("Timeout\n");
+		    *addr = 0x00B000B0;      /* suspend erase      */
+		    *addr = 0x00FF00FF;      /* reset to read mode */
+		    return 1;
+		}
 
-                /* show that we're waiting */
-                if ((now - last) > 990) {   /* every second */
-                    putc ('.');
-                    last = now;
-                }
-            }
-            *addr = 0x00FF00FF;              /* reset to read mode */
-        }
+		/* show that we're waiting */
+		if ((now - last) > 990) {   /* every second */
+		    putc ('.');
+		    last = now;
+		}
+	    }
+	    *addr = 0x00FF00FF;              /* reset to read mode */
+	}
     }
     printf (" done\n");
     return 0;
@@ -543,9 +543,9 @@
 int flash_erase(flash_info_t *info, int s_first, int s_last)
 {
     if ((info->flash_id & FLASH_TYPEMASK) == FLASH_AM040)
-        return flash_erase8(info, s_first, s_last);
+	return flash_erase8(info, s_first, s_last);
     else
-        return flash_erase32(info, s_first, s_last);
+	return flash_erase32(info, s_first, s_last);
 } /* end flash_erase() */
 
 /*-----------------------------------------------------------------------
@@ -563,53 +563,53 @@
     start = get_timer (0);
 
     wp = (addr & ~3);                        /* get lower word
-                                                aligned address */
+						aligned address */
 
     /*
      * handle unaligned start bytes
      */
     if ((l = addr - wp) != 0) {
-        data = 0;
-        for (i=0, cp=wp; i<l; ++i, ++cp) {
-            data = (data << 8) | (*(uchar *)cp);
-        }
-        for (; i<4 && cnt>0; ++i) {
-            data = (data << 8) | *src++;
-            --cnt;
-            ++cp;
-        }
-        for (; cnt==0 && i<4; ++i, ++cp) {
-            data = (data << 8) | (*(uchar *)cp);
-        }
+	data = 0;
+	for (i=0, cp=wp; i<l; ++i, ++cp) {
+	    data = (data << 8) | (*(uchar *)cp);
+	}
+	for (; i<4 && cnt>0; ++i) {
+	    data = (data << 8) | *src++;
+	    --cnt;
+	    ++cp;
+	}
+	for (; cnt==0 && i<4; ++i, ++cp) {
+	    data = (data << 8) | (*(uchar *)cp);
+	}
 
-        if ((rc = write_word8(info, wp, data)) != 0) {
-            return (rc);
-        }
-        wp += 4;
+	if ((rc = write_word8(info, wp, data)) != 0) {
+	    return (rc);
+	}
+	wp += 4;
     }
 
     /*
      * handle word aligned part
      */
     while (cnt >= 4) {
-        data = 0;
-        for (i=0; i<4; ++i) {
-            data = (data << 8) | *src++;
-        }
-        if ((rc = write_word8(info, wp, data)) != 0) {
-            return (rc);
-        }
-        wp  += 4;
-        cnt -= 4;
-        if (get_timer(start) > 1000) {   /* every second */
-           WATCHDOG_RESET();
-           putc ('.');
-           start = get_timer(0);
-        }
+	data = 0;
+	for (i=0; i<4; ++i) {
+	    data = (data << 8) | *src++;
+	}
+	if ((rc = write_word8(info, wp, data)) != 0) {
+	    return (rc);
+	}
+	wp  += 4;
+	cnt -= 4;
+	if (get_timer(start) > 1000) {   /* every second */
+	   WATCHDOG_RESET();
+	   putc ('.');
+	   start = get_timer(0);
+	}
     }
 
     if (cnt == 0) {
-        return (0);
+	return (0);
     }
 
     /*
@@ -617,11 +617,11 @@
      */
     data = 0;
     for (i=0, cp=wp; i<4 && cnt>0; ++i, ++cp) {
-        data = (data << 8) | *src++;
-        --cnt;
+	data = (data << 8) | *src++;
+	--cnt;
     }
     for (; i<4; ++i, ++cp) {
-        data = (data << 8) | (*(uchar *)cp);
+	data = (data << 8) | (*(uchar *)cp);
     }
 
     return (write_word8(info, wp, data));
@@ -678,7 +678,7 @@
 		}
 		wp  += FLASH_WIDTH;
 		cnt -= FLASH_WIDTH;
-          if (get_timer(start) > 990) {   /* every second */
+	  if (get_timer(start) > 990) {   /* every second */
 			putc ('.');
 			start = get_timer(0);
 		}
@@ -708,9 +708,9 @@
     int retval;
 
     if ((info->flash_id & FLASH_TYPEMASK) == FLASH_AM040)
-        retval = write_buff8(info, src, addr, cnt);
+	retval = write_buff8(info, src, addr, cnt);
     else
-        retval = write_buff32(info, src, addr, cnt);
+	retval = write_buff32(info, src, addr, cnt);
 
     return retval;
 } /* end write_buff() */
@@ -732,31 +732,31 @@
 
     /* Check if Flash is (sufficently) erased */
     if ((*((volatile uchar *)dest) &
-        (uchar)data) != (uchar)data) {
-        return (2);
+	(uchar)data) != (uchar)data) {
+	return (2);
     }
 
     for (i=0; i < (4 / sizeof(uchar)); i++) {
-        /* Disable interrupts which might cause a timeout here */
-        flag = disable_interrupts();
+	/* Disable interrupts which might cause a timeout here */
+	flag = disable_interrupts();
 
-        *(addr2 + 0x555) = (uchar)0xAA;
-        *(addr2 + 0x2aa) = (uchar)0x55;
-        *(addr2 + 0x555) = (uchar)0xA0;
+	*(addr2 + 0x555) = (uchar)0xAA;
+	*(addr2 + 0x2aa) = (uchar)0x55;
+	*(addr2 + 0x555) = (uchar)0xA0;
 
-        dest2[i] = data2[i];
+	dest2[i] = data2[i];
 
-        /* Wait for write to complete, up to 1ms */
-        tcode = wait_for_DQ7((ulong)&dest2[i], data2[i], 1);
+	/* Wait for write to complete, up to 1ms */
+	tcode = wait_for_DQ7((ulong)&dest2[i], data2[i], 1);
 
-        /* re-enable interrupts if necessary */
-        if (flag)
-            enable_interrupts();
+	/* re-enable interrupts if necessary */
+	if (flag)
+	    enable_interrupts();
 
-        /* Make sure we didn't timeout */
-        if (tcode) {
-            rcode = 1;
-        }
+	/* Make sure we didn't timeout */
+	if (tcode) {
+	    rcode = 1;
+	}
     }
 
     return rcode;
@@ -771,7 +771,7 @@
 
     /* Check if Flash is (sufficiently) erased */
     if ((*addr & data) != data) {
-        return (2);
+	return (2);
     }
     /* Disable interrupts which might cause a timeout here */
     flag = disable_interrupts();
@@ -781,16 +781,16 @@
 
     /* re-enable interrupts if necessary */
     if (flag)
-        enable_interrupts();
+	enable_interrupts();
 
     start = get_timer (0);
 
     while (((status = *addr) & 0x00800080) != 0x00800080) {
-        WATCHDOG_RESET();
-        if (get_timer(start) > CFG_FLASH_WRITE_TOUT) {
-            *addr = 0x00FF00FF;              /* restore read mode */
-            return (1);
-        }
+	WATCHDOG_RESET();
+	if (get_timer(start) > CFG_FLASH_WRITE_TOUT) {
+	    *addr = 0x00FF00FF;              /* restore read mode */
+	    return (1);
+	}
     }
 
     *addr = 0x00FF00FF;                      /* restore read mode */
@@ -808,50 +808,50 @@
     volatile long *addr = (unsigned long *)sector;
 
     switch(info->flash_id & FLASH_TYPEMASK) {
-        case FLASH_28F320J3A:
-        case FLASH_28F640J3A:
-        case FLASH_28F128J3A:
-            /* Disable interrupts which might cause Flash to timeout */
-            flag = disable_interrupts();
+	case FLASH_28F320J3A:
+	case FLASH_28F640J3A:
+	case FLASH_28F128J3A:
+	    /* Disable interrupts which might cause Flash to timeout */
+	    flag = disable_interrupts();
 
-            /* Issue command */
-            *addr = 0x00500050L;             /* Clear the status register */
-            *addr = 0x00600060L;             /* Set lock bit setup */
-            *addr = 0x00010001L;             /* Set lock bit confirm */
+	    /* Issue command */
+	    *addr = 0x00500050L;             /* Clear the status register */
+	    *addr = 0x00600060L;             /* Set lock bit setup */
+	    *addr = 0x00010001L;             /* Set lock bit confirm */
 
-            /* Wait for command completion */
-            for (i = 0; i < 10; i++) {       /* 75us timeout, wait 100us */
-                udelay(10);
-                if ((*addr & 0x00800080L) == 0x00800080L)
-                    break;
-            }
+	    /* Wait for command completion */
+	    for (i = 0; i < 10; i++) {       /* 75us timeout, wait 100us */
+		udelay(10);
+		if ((*addr & 0x00800080L) == 0x00800080L)
+		    break;
+	    }
 
-            /* Not successful? */
-            status = *addr;
-            if (status != 0x00800080L) {
-                printf("Protect %x sector failed: %x\n",
-                       (uint)sector, (uint)status);
-                rcode = 1;
-            }
+	    /* Not successful? */
+	    status = *addr;
+	    if (status != 0x00800080L) {
+		printf("Protect %x sector failed: %x\n",
+		       (uint)sector, (uint)status);
+		rcode = 1;
+	    }
 
-            /* Restore read mode */
-            *addr = 0x00ff00ffL;
+	    /* Restore read mode */
+	    *addr = 0x00ff00ffL;
 
-            /* re-enable interrupts if necessary */
-            if (flag)
-                enable_interrupts();
+	    /* re-enable interrupts if necessary */
+	    if (flag)
+		enable_interrupts();
 
-            break;
-        case FLASH_AM040:                    /* No soft sector protection */
-            break;
+	    break;
+	case FLASH_AM040:                    /* No soft sector protection */
+	    break;
     }
 
     /* Turn protection on for this sector */
     for (i = 0; i < info->sector_count; i++) {
-        if (info->start[i] == sector) {
-            info->protect[i] = 1;
-            break;
-        }
+	if (info->start[i] == sector) {
+	    info->protect[i] = 1;
+	    break;
+	}
     }
 
     return rcode;
@@ -866,42 +866,42 @@
     volatile long *addr = (unsigned long *)sector;
 
     switch(info->flash_id & FLASH_TYPEMASK) {
-        case FLASH_28F320J3A:
-        case FLASH_28F640J3A:
-        case FLASH_28F128J3A:
-            /* Disable interrupts which might cause Flash to timeout */
-            flag = disable_interrupts();
+	case FLASH_28F320J3A:
+	case FLASH_28F640J3A:
+	case FLASH_28F128J3A:
+	    /* Disable interrupts which might cause Flash to timeout */
+	    flag = disable_interrupts();
 
-            *addr = 0x00500050L;             /* Clear the status register */
-            *addr = 0x00600060L;             /* Clear lock bit setup */
-            *addr = 0x00D000D0L;             /* Clear lock bit confirm */
+	    *addr = 0x00500050L;             /* Clear the status register */
+	    *addr = 0x00600060L;             /* Clear lock bit setup */
+	    *addr = 0x00D000D0L;             /* Clear lock bit confirm */
 
-            /* Wait for command completion */
-            for (i = 0; i < 80 ; i++) {      /* 700ms timeout, wait 800 */
-                udelay(10000);               /* Delay 10ms */
-                if ((*addr & 0x00800080L) == 0x00800080L)
-                    break;
-            }
+	    /* Wait for command completion */
+	    for (i = 0; i < 80 ; i++) {      /* 700ms timeout, wait 800 */
+		udelay(10000);               /* Delay 10ms */
+		if ((*addr & 0x00800080L) == 0x00800080L)
+		    break;
+	    }
 
-            /* Not successful? */
-            status = *addr;
-            if (status != 0x00800080L) {
-                printf("Un-protect %x sector failed: %x\n",
-                       (uint)sector, (uint)status);
-                *addr = 0x00ff00ffL;
-                rcode = 1;
-            }
+	    /* Not successful? */
+	    status = *addr;
+	    if (status != 0x00800080L) {
+		printf("Un-protect %x sector failed: %x\n",
+		       (uint)sector, (uint)status);
+		*addr = 0x00ff00ffL;
+		rcode = 1;
+	    }
 
-            /* restore read mode */
-            *addr = 0x00ff00ffL;
+	    /* restore read mode */
+	    *addr = 0x00ff00ffL;
 
-            /* re-enable interrupts if necessary */
-            if (flag)
-                enable_interrupts();
+	    /* re-enable interrupts if necessary */
+	    if (flag)
+		enable_interrupts();
 
-            break;
-        case FLASH_AM040:                    /* No soft sector protection */
-            break;
+	    break;
+	case FLASH_AM040:                    /* No soft sector protection */
+	    break;
     }
 
     /*
@@ -910,14 +910,14 @@
      * protection on a specific sector.
      */
     for (i = 0; i < info->sector_count; i++) {
-        if (info->start[i] != sector) {
-            if (info->protect[i]) {
-                if (_flash_protect(info, info->start[i]))
-                    rcode = 1;
+	if (info->start[i] != sector) {
+	    if (info->protect[i]) {
+		if (_flash_protect(info, info->start[i]))
+		    rcode = 1;
 	    }
-        }
-        else /* Turn protection off for this sector */
-            info->protect[i] = 0;
+	}
+	else /* Turn protection off for this sector */
+	    info->protect[i] = 0;
     }
 
     return rcode;
@@ -929,13 +929,12 @@
     int rcode;
 
     if (prot)
-        rcode = _flash_protect(info, info->start[sector]);
+	rcode = _flash_protect(info, info->start[sector]);
     else
-        rcode = _flash_unprotect(info, info->start[sector]);
+	rcode = _flash_unprotect(info, info->start[sector]);
 
     return rcode;
 } /* end flash_real_protect() */
 
 /*-----------------------------------------------------------------------
  */
-

diff --git a/board/w7o/fpga.c b/board/w7o/fpga.c
index e84123b..97af924 100644
--- a/board/w7o/fpga.c
+++ b/board/w7o/fpga.c

@@ -36,11 +36,11 @@
     volatile unsigned short *dest = daddr;	/* volatile-bypass optimizer */
 
     for (i = 0; i < len; i++, src++) {
-        val = *src;
-        *dest = (unsigned short)((val & 0xff000000L) >> 16);
-        *dest = (unsigned short)((val & 0x00ff0000L) >> 8);
-        *dest = (unsigned short)(val & 0x0000ff00L);
-        *dest = (unsigned short)((val & 0x000000ffL) << 8);
+	val = *src;
+	*dest = (unsigned short)((val & 0xff000000L) >> 16);
+	*dest = (unsigned short)((val & 0x00ff0000L) >> 8);
+	*dest = (unsigned short)(val & 0x0000ff00L);
+	*dest = (unsigned short)((val & 0x000000ffL) << 8);
     }
 
     /* Terminate programming with 4 C clocks */
@@ -88,14 +88,14 @@
 
     /* Wait for FPGA init line */
     while(in32(IBM405GP_GPIO0_IR) & GPIO_XCV_INIT) { /* Wait INIT line low */
-        /* Check for timeout - 100us max, so use 3ms */
-        if (get_timer(start) > 3) {
-            printf("     failed to start init.\n");
-            log_warn(ERR_XINIT0);		/* Don't halt */
+	/* Check for timeout - 100us max, so use 3ms */
+	if (get_timer(start) > 3) {
+	    printf("     failed to start init.\n");
+	    log_warn(ERR_XINIT0);		/* Don't halt */
 
-            /* Reset line stays low */
-            goto done;				/* I like gotos... */
-        }
+	    /* Reset line stays low */
+	    goto done;				/* I like gotos... */
+	}
     }
 
     /* Unreset FPGA */
@@ -105,75 +105,75 @@
     /* Wait for FPGA end of init period .  */
     while(!(in32(IBM405GP_GPIO0_IR) & GPIO_XCV_INIT)) { /* Wait for INIT hi */
 
-        /* Check for timeout */
-        if (get_timer(start) > 3) {
-            printf("     failed to exit init.\n");
-            log_warn(ERR_XINIT1);
+	/* Check for timeout */
+	if (get_timer(start) > 3) {
+	    printf("     failed to exit init.\n");
+	    log_warn(ERR_XINIT1);
 
-            /* Reset FPGA */
-            grego &= ~GPIO_XCV_PROG;		/* PROG line low */
-            out32(IBM405GP_GPIO0_OR, grego);
+	    /* Reset FPGA */
+	    grego &= ~GPIO_XCV_PROG;		/* PROG line low */
+	    out32(IBM405GP_GPIO0_OR, grego);
 
-            goto done;
-        }
+	    goto done;
+	}
     }
 
     /* Now program FPGA ... */
     ndest = dest;
     for (i = 0; i < CONFIG_NUM_FPGAS; i++) {
-        /* Toggle IRQ/GPIO */
-        greg = mfdcr(CPC0_CR0);			/* get chip ctrl register */
-        greg |= eirq;				/* toggle irq/gpio */
-        mtdcr(CPC0_CR0, greg);			/*  ... just do it */
+	/* Toggle IRQ/GPIO */
+	greg = mfdcr(CPC0_CR0);			/* get chip ctrl register */
+	greg |= eirq;				/* toggle irq/gpio */
+	mtdcr(CPC0_CR0, greg);			/*  ... just do it */
 
-        /* turn on open drain for CNFG */
-        greg = in32(IBM405GP_GPIO0_ODR);	/* get open drain register */
-        greg |= cnfg;				/* CNFG open drain */
-        out32(IBM405GP_GPIO0_ODR, greg);	/*  .. just do it */
+	/* turn on open drain for CNFG */
+	greg = in32(IBM405GP_GPIO0_ODR);	/* get open drain register */
+	greg |= cnfg;				/* CNFG open drain */
+	out32(IBM405GP_GPIO0_ODR, greg);	/*  .. just do it */
 
-        /* Turn output enable on for CNFG */
-        greg = in32(IBM405GP_GPIO0_TCR);	/* get tristate register */
-        greg |= cnfg;				/* CNFG tristate inactive */
-        out32(IBM405GP_GPIO0_TCR, greg);	/*  ... just do it */
+	/* Turn output enable on for CNFG */
+	greg = in32(IBM405GP_GPIO0_TCR);	/* get tristate register */
+	greg |= cnfg;				/* CNFG tristate inactive */
+	out32(IBM405GP_GPIO0_TCR, greg);	/*  ... just do it */
 
-        /* Setup FPGA for programming */
-        grego &= ~cnfg;				/* CONFIG line low */
-        out32(IBM405GP_GPIO0_OR, grego);
+	/* Setup FPGA for programming */
+	grego &= ~cnfg;				/* CONFIG line low */
+	out32(IBM405GP_GPIO0_OR, grego);
 
-        /*
-         * Program the FPGA
-         */
-        printf("\n       destination: 0x%lx ", (unsigned long)ndest);
+	/*
+	 * Program the FPGA
+	 */
+	printf("\n       destination: 0x%lx ", (unsigned long)ndest);
 
-        fpga_img_write(source,  length,  (unsigned short *)ndest);
+	fpga_img_write(source,  length,  (unsigned short *)ndest);
 
-        /* Done programming */
-        grego |= cnfg;				/* CONFIG line high */
-        out32(IBM405GP_GPIO0_OR, grego);
+	/* Done programming */
+	grego |= cnfg;				/* CONFIG line high */
+	out32(IBM405GP_GPIO0_OR, grego);
 
-        /* Turn output enable OFF for CNFG */
-        greg = in32(IBM405GP_GPIO0_TCR);	/* get tristate register */
-        greg &= ~cnfg;				/* CNFG tristate inactive */
-        out32(IBM405GP_GPIO0_TCR, greg);	/*  ... just do it */
+	/* Turn output enable OFF for CNFG */
+	greg = in32(IBM405GP_GPIO0_TCR);	/* get tristate register */
+	greg &= ~cnfg;				/* CNFG tristate inactive */
+	out32(IBM405GP_GPIO0_TCR, greg);	/*  ... just do it */
 
-        /* Toggle IRQ/GPIO */
-        greg = mfdcr(CPC0_CR0);			/* get chip ctrl register */
-        greg &= ~eirq;				/* toggle irq/gpio */
-        mtdcr(CPC0_CR0, greg);			/*  ... just do it */
+	/* Toggle IRQ/GPIO */
+	greg = mfdcr(CPC0_CR0);			/* get chip ctrl register */
+	greg &= ~eirq;				/* toggle irq/gpio */
+	mtdcr(CPC0_CR0, greg);			/*  ... just do it */
 
-        ndest = (unsigned short *)((char *)ndest + 0x00100000L); /* XXX - Next FPGA addr */
-        cnfg >>= 1;				/* XXX - Next  */
-        eirq >>= 1;
+	ndest = (unsigned short *)((char *)ndest + 0x00100000L); /* XXX - Next FPGA addr */
+	cnfg >>= 1;				/* XXX - Next  */
+	eirq >>= 1;
     }
 
     /* Terminate programming with 4 C clocks */
     ndest = dest;
     for (i = 0; i < CONFIG_NUM_FPGAS; i++) {
-        val = *ndest;
-        val = *ndest;
-        val = *ndest;
-        val = *ndest;
-        ndest = (unsigned short *)((char *)ndest + 0x00100000L);
+	val = *ndest;
+	val = *ndest;
+	val = *ndest;
+	val = *ndest;
+	ndest = (unsigned short *)((char *)ndest + 0x00100000L);
     }
 
     /* Setup timer */
@@ -182,17 +182,17 @@
     /* Wait for FPGA end of programming period .  */
     while(!(in32(IBM405GP_GPIO0_IR) & GPIO_XCV_DONE)) { /* Test DONE low */
 
-        /* Check for timeout */
-        if (get_timer(start) > 3) {
-            printf("     done failed to come high.\n");
-            log_warn(ERR_XDONE1);
+	/* Check for timeout */
+	if (get_timer(start) > 3) {
+	    printf("     done failed to come high.\n");
+	    log_warn(ERR_XDONE1);
 
-            /* Reset FPGA */
-            grego &= ~GPIO_XCV_PROG;		/* PROG line low */
-            out32(IBM405GP_GPIO0_OR, grego);
+	    /* Reset FPGA */
+	    grego &= ~GPIO_XCV_PROG;		/* PROG line low */
+	    out32(IBM405GP_GPIO0_OR, grego);
 
-            goto done;
-        }
+	    goto done;
+	}
     }
 
     printf("\n       FPGA load succeeded\n");
@@ -236,7 +236,7 @@
 
     /* Pedantic */
     if ((len < 0x133A4) || (len > 0x80000))
-        goto bad_image;
+	goto bad_image;
 
     /*
      * Get the file name pointer and length.
@@ -260,16 +260,16 @@
      */
     calc_crc = crc32(0, xcv_buf, xcv_len);
     if (crc != calc_crc) {
-        printf("\nfailed - bad CRC\n");
-        goto done;
+	printf("\nfailed - bad CRC\n");
+	goto done;
     }
 
     /* Output the file name */
     printf("file name  : ");
     for (i=0;i<fn_len;i++) {
-        bufchar = fn_buf[+i];
-        if (bufchar<' ' || bufchar>'~') bufchar = '.';
-        putc(bufchar);
+	bufchar = fn_buf[+i];
+	if (bufchar<' ' || bufchar>'~') bufchar = '.';
+	putc(bufchar);
     }
 
     /*
@@ -326,7 +326,7 @@
      * Program the FPGA.
      */
     retval = fpgaDownload((unsigned char*)xcv_buf, xcv_len,
-                          (unsigned short *)0xfd000000L);
+			  (unsigned short *)0xfd000000L);
     return retval;
 
 bad_image:
@@ -377,4 +377,3 @@
     printf("       FPGA ready\n");
     return;
 }
-

diff --git a/board/w7o/fsboot.c b/board/w7o/fsboot.c
index 800583d..0ef9a61 100644
--- a/board/w7o/fsboot.c
+++ b/board/w7o/fsboot.c

@@ -24,11 +24,12 @@
 #include <common.h>
 #include <config.h>
 #include <command.h>
-#include <cmd_elf.h>
 
 /*
  * FIXME: Add code to test image and it's header.
  */
+extern int valid_elf_image (unsigned long addr);
+
 static int
 image_check(ulong addr)
 {
@@ -87,4 +88,3 @@
 
     return;
 }
-

diff --git a/board/w7o/init.S b/board/w7o/init.S
index 511a1bb..35d7dbc 100644
--- a/board/w7o/init.S
+++ b/board/w7o/init.S

@@ -262,4 +262,3 @@
 	blr				/* Return to calling function */
 .Lfe1:	.size	sdram_init,.Lfe1-sdram_init
 /* end sdram_init() */
-

diff --git a/board/w7o/post1.S b/board/w7o/post1.S
index d510cca..21d206e 100644
--- a/board/w7o/post1.S
+++ b/board/w7o/post1.S

@@ -282,7 +282,7 @@
 	addi	r31, 0, 0x00ff		/* r31 = one byte of set bits */
 	stb     r31,0(r28)		/* save ff in referance address */
 
-        /* ghost (inner) loop, now check all posible ghosted addresses */
+	/* ghost (inner) loop, now check all posible ghosted addresses */
 	addi	r29, 0, 0		/* start ghosted loop counter at 0 */
 inside:
 	/*
@@ -323,11 +323,11 @@
 	addi	r3, 0, ERR_ADDF		/* get indexed error message */
 	bl	log_err			/* log error led error code */
 gb_done: /*  pack your bags, and go home */
-        lmw     r25, 8(r1)              /* restore r25 - r31 from stack */
-        lwz     r0, +40(r1)             /* Get saved link register */
-        addi    r1, r1, +36             /* Remove frame from stack */
-        mtlr    r0                      /* Restore link register */
-        blr                             /* Return to calling function */
+	lmw     r25, 8(r1)              /* restore r25 - r31 from stack */
+	lwz     r0, +40(r1)             /* Get saved link register */
+	addi    r1, r1, +36             /* Remove frame from stack */
+	mtlr    r0                      /* Restore link register */
+	blr                             /* Return to calling function */
 
 /****************************************************
  ********      SDRAM data fill tests       **********
@@ -373,7 +373,6 @@
 	blr				/* Return to calling function */
 
 
-
 /****************************************************
  ********             fill test              ********
  ***************************************************/
@@ -382,12 +381,12 @@
 /*	r4 = Value to write */
 /*	r3 = Error code */
 fill_test:
-        mflr    r0                      /* Get link register */
-        stwu    r1, -32(r1)             /* Save back chain and move SP */
-        stw     r0, +36(r1)             /* Save link register */
-        stmw    r27, 8(r1)              /* save r27 - r31 on stack */
-                                        /* r31 - scratch register */
-                                        /* r30 - memory address */
+	mflr    r0                      /* Get link register */
+	stwu    r1, -32(r1)             /* Save back chain and move SP */
+	stw     r0, +36(r1)             /* Save link register */
+	stmw    r27, 8(r1)              /* save r27 - r31 on stack */
+					/* r31 - scratch register */
+					/* r30 - memory address */
 	mr	r27, r3
 	mr	r28, r4
 	mr	r29, r5
@@ -412,8 +411,8 @@
 	mtctr	r31			/* setup counter */
 	addi	r30, 0, 0		/* Make r30 = addr 0 */
 ft_1:	lwz	r31, 0(r30)		/* get value from memory */
-        xor.	r31, r31, r28		/* Writen = Read ? */
-        bne	ft_err			/* If bad, than halt */
+	xor.	r31, r31, r28		/* Writen = Read ? */
+	bne	ft_err			/* If bad, than halt */
 	addi	r30, r30, 4		/* Increment to next word */
 	andi.	r31, r30, 0xffff	/* check for 2^16 loops*/
 	bne	ft_1a			/* if not there, then skip */
@@ -431,11 +430,11 @@
 	bl	log_err			/* output led err code, halt CPU */
 
 fill_done:
-        lmw     r27, 8(r1)              /* restore r27 - r31 from stack */
-        lwz     r0, +36(r1)             /* Get saved link register */
-        addi    r1, r1, +32             /* Remove frame from stack */
-        mtlr    r0                      /* Restore link register */
-        blr                             /* Return to calling function */
+	lmw     r27, 8(r1)              /* restore r27 - r31 from stack */
+	lwz     r0, +36(r1)             /* Get saved link register */
+	addi    r1, r1, +32             /* Remove frame from stack */
+	mtlr    r0                      /* Restore link register */
+	blr                             /* Return to calling function */
 
 
 /****************************************************
@@ -563,7 +562,7 @@
 	mtctr	r3
 log_2:
 	WATCHDOG_RESET			/* this keeps dog from barking, */
-				     	/*   and takes time */
+					/*   and takes time */
 	bdnz	log_2			/* loop till time expires */
 
 	/* restore stack and return */
@@ -585,27 +584,27 @@
 	stwu	r1, -8(r1)		/* Save back chain and move SP */
 	stw	r0, +12(r1)		/* Save link register */
 
-        addis   r3, 0, 0xef60
-        ori     r3, r3, 0x0303          /* r3 = UART0_LCR */
-        addi    r4, 0, 0x83             /* n81 format, divisor regs enabled */
-        stb     r4, 0(r3)
+	addis   r3, 0, 0xef60
+	ori     r3, r3, 0x0303          /* r3 = UART0_LCR */
+	addi    r4, 0, 0x83             /* n81 format, divisor regs enabled */
+	stb     r4, 0(r3)
 
 	/* set baud rate to use internal clock,
 	   baud = (200e6/16)/31/42 = 9600 */
 
-        addis   r3, 0, 0xef60		/* Address of baud divisor reg */
-        ori     r3, r3, 0x0300		/*   UART0_DLM */
-        addi    r4, 0, +42		/* uart baud divisor LSB = 93 */
-        stb     r4, 0(r3)               /* baud = (200 /16)/14/93 */
+	addis   r3, 0, 0xef60		/* Address of baud divisor reg */
+	ori     r3, r3, 0x0300		/*   UART0_DLM */
+	addi    r4, 0, +42		/* uart baud divisor LSB = 93 */
+	stb     r4, 0(r3)               /* baud = (200 /16)/14/93 */
 
-        addi    r3, r3, 0x0001		/* uart baud divisor addr */
-        addi    r4, 0, 0
-        stb     r4, 0(r3)               /* Divisor Latch MSB = 0 */
+	addi    r3, r3, 0x0001		/* uart baud divisor addr */
+	addi    r4, 0, 0
+	stb     r4, 0(r3)               /* Divisor Latch MSB = 0 */
 
-        addis   r3, 0, 0xef60
-        ori     r3, r3, 0x0303          /* r3 = UART0_LCR */
-        addi    r4, 0, 0x03             /* n81 format, tx/rx regs enabled */
-        stb     r4, 0(r3)
+	addis   r3, 0, 0xef60
+	ori     r3, r3, 0x0303          /* r3 = UART0_LCR */
+	addi    r4, 0, 0x03             /* n81 format, tx/rx regs enabled */
+	stb     r4, 0(r3)
 
 	/* output a few line feeds */
 	addi	r3, 0, '\n'		/* load line feed */
@@ -613,7 +612,7 @@
 	addi	r3, 0, '\n'		/* load line feed */
 	bl 	post_putc		/* output the char */
 
-        /* restore stack and return */
+	/* restore stack and return */
 	lwz	r0, +12(r1)		/* Get saved link register */
 	mtlr	r0			/* Restore link register */
 	addi	r1, r1, +8		/* Remove frame from stack */
@@ -633,7 +632,7 @@
 	stw	r0, +24(r1)		/* Save link register */
 	stmw	r29, 8(r1)		/* save	r29 - r31 on stack
 					   r31 - uart base address
-       					   r30 - delay counter
+					   r30 - delay counter
 					   r29 - scratch reg */
 
      addis   r31, 0, 0xef60		/* Point to uart base */
@@ -687,7 +686,7 @@
 	b	pputs_end		/* were outa here */
 pputs_term:
 	addi 	r3, 0, 1		/* set success code */
- 	/* restore stack and return */
+	/* restore stack and return */
 pputs_end:
 	lwz	r31, 8(r1)		/* restore r27 - r31 from stack */
 	lwz	r0, +16(r1)		/* Get saved link register */
@@ -696,7 +695,6 @@
 	blr				/* Return to calling function */
 
 
-
 /********************************************************************
  *****	disp_hex
  *****	Routine to display a hex value from a register.
@@ -736,10 +734,9 @@
 pputh_err:
 	addi 	r3, 0, -1 		/* set error code */
 pputh_done:
-        /* restore stack and return */
+	/* restore stack and return */
 	lmw	r30, 8(r1)		/*  restore r30 - r31 from stack */
 	lwz	r0, +20(r1)		/* Get saved link register */
 	addi	r1, r1, +16		/* Remove frame from stack */
 	mtlr	r0			/* Restore link register */
 	blr				/* Return to calling function */
-

diff --git a/board/w7o/post2.c b/board/w7o/post2.c
index 271c197..e590128 100644
--- a/board/w7o/post2.c
+++ b/board/w7o/post2.c

@@ -106,4 +106,3 @@
     if(dtt_test(4) != 0) log_warn(ERR_Ttest1);
 #endif /* CONFIG_DTT_LM75 */
 } /* post2() */
-

diff --git a/board/w7o/u-boot.lds b/board/w7o/u-boot.lds
index 4c753fc..5576ab9 100644
--- a/board/w7o/u-boot.lds
+++ b/board/w7o/u-boot.lds

@@ -103,6 +103,11 @@
   _edata  =  .;
   PROVIDE (edata = .);
 
+  __u_boot_cmd_start = .;
+  .u_boot_cmd : { *(.u_boot_cmd) }
+  __u_boot_cmd_end = .;
+
+
   __start___ex_table = .;
   __ex_table : { *(__ex_table) }
   __stop___ex_table = .;

diff --git a/board/w7o/u-boot.lds.debug b/board/w7o/u-boot.lds.debug
index 6f65aa5..f996db3 100644
--- a/board/w7o/u-boot.lds.debug
+++ b/board/w7o/u-boot.lds.debug

@@ -106,6 +106,11 @@
   _edata  =  .;
   PROVIDE (edata = .);
 
+  __u_boot_cmd_start = .;
+  .u_boot_cmd : { *(.u_boot_cmd) }
+  __u_boot_cmd_end = .;
+
+
   __start___ex_table = .;
   __ex_table : { *(__ex_table) }
   __stop___ex_table = .;
@@ -128,4 +133,3 @@
   _end = . ;
   PROVIDE (end = .);
 }
-

diff --git a/board/w7o/vpd.c b/board/w7o/vpd.c
index c24b127..fc2cd983 100644
--- a/board/w7o/vpd.c
+++ b/board/w7o/vpd.c

@@ -405,4 +405,3 @@
 	printf(dsfmt, sp, "WE Data Width",  vpdInfo->flashCfg.weDataWidth);
     }
 } /* vpd_print() */
-

diff --git a/board/w7o/vpd.h b/board/w7o/vpd.h
index 35bbe3e..1b71c8d 100644
--- a/board/w7o/vpd.h
+++ b/board/w7o/vpd.h

@@ -93,7 +93,7 @@
 
 
 #define VPD_DATA_SIZE (VPD_MAX_EEPROM_SIZE - SDRAM_SPD_DATA_SIZE - \
-                        sizeof(vpd_header_t))
+			sizeof(vpd_header_t))
 typedef struct vpd_s {
     vpd_header_t header;
     unsigned char packets[VPD_DATA_SIZE];
@@ -132,4 +132,3 @@
 extern void vpd_print(VPD *vpdInfo);
 
 #endif /* _VPD_H_ */
-

diff --git a/board/w7o/w7o.c b/board/w7o/w7o.c
index b404d61..bb52236 100644
--- a/board/w7o/w7o.c
+++ b/board/w7o/w7o.c

@@ -22,6 +22,7 @@
  */
 
 #include <common.h>
+#include <command.h>
 #include "w7o.h"
 #include <asm/processor.h>
 
@@ -268,4 +269,3 @@
 
 	return (0);
 }
-

diff --git a/board/w7o/w7o.h b/board/w7o/w7o.h
index f0af2d6..8458166 100644
--- a/board/w7o/w7o.h
+++ b/board/w7o/w7o.h

@@ -90,4 +90,3 @@
 extern void init_fsboot(void);
 
 #endif /* _W7O_H_ */
-

diff --git a/board/w7o/watchdog.c b/board/w7o/watchdog.c
index 3fca5d3..4bbd94f 100644
--- a/board/w7o/watchdog.c
+++ b/board/w7o/watchdog.c

@@ -45,4 +45,3 @@
 } /* hw_watchdog_reset() */
 
 #endif /* CONFIG_HW_WATCHDOG */
-

diff --git a/board/walnut405/Makefile b/board/walnut405/Makefile
index 12b2fa8..97d6a1e 100644
--- a/board/walnut405/Makefile
+++ b/board/walnut405/Makefile

@@ -29,7 +29,7 @@
 SOBJS	= init.o
 
 $(LIB):	$(OBJS) $(SOBJS)
-	$(AR) crv $@ $^
+	$(AR) crv $@ $(OBJS)
 
 clean:
 	rm -f $(SOBJS) $(OBJS)

diff --git a/board/walnut405/flash.c b/board/walnut405/flash.c
index c9c7cbf..462c09e 100644
--- a/board/walnut405/flash.c
+++ b/board/walnut405/flash.c

@@ -66,8 +66,8 @@
 {
 	unsigned long size_b0, size_b1;
 	int i;
-        uint pbcr;
-        unsigned long base_b0, base_b1;
+	uint pbcr;
+	unsigned long base_b0, base_b1;
 
 	/* Init: no FLASHes known */
 	for (i=0; i<CFG_MAX_FLASH_BANKS; ++i) {
@@ -165,7 +165,6 @@
 }
 
 
-
 /*-----------------------------------------------------------------------
  */
 static void flash_get_offsets (ulong base, flash_info_t *info)
@@ -173,11 +172,11 @@
 	int i;
 
 	/* set up sector start address table */
-        if (((info->flash_id & FLASH_VENDMASK) == FLASH_MAN_SST) ||
+	if (((info->flash_id & FLASH_VENDMASK) == FLASH_MAN_SST) ||
 	    (info->flash_id  == FLASH_AM040)){
 	    for (i = 0; i < info->sector_count; i++)
 		info->start[i] = base + (i * 0x00010000);
-        } else {
+	} else {
 	    if (info->flash_id & FLASH_BTYPE) {
 		/* set sector offsets for bottom boot block type	*/
 		info->start[0] = base + 0x00000000;
@@ -205,10 +204,10 @@
 void flash_print_info  (flash_info_t *info)
 {
 	int i;
-        int k;
-        int size;
-        int erased;
-        volatile unsigned long *flash;
+	int k;
+	int size;
+	int erased;
+	volatile unsigned long *flash;
 
 	if (info->flash_id == FLASH_UNKNOWN) {
 		printf ("missing or unknown FLASH type\n");
@@ -254,24 +253,24 @@
 
 	printf ("  Sector Start Addresses:");
 	for (i=0; i<info->sector_count; ++i) {
-                /*
-                 * Check if whole sector is erased
-                 */
-                if (i != (info->sector_count-1))
-                  size = info->start[i+1] - info->start[i];
-                else
-                  size = info->start[0] + info->size - info->start[i];
-                erased = 1;
-                flash = (volatile unsigned long *)info->start[i];
-                size = size >> 2;        /* divide by 4 for longword access */
-                for (k=0; k<size; k++)
-                  {
-                    if (*flash++ != 0xffffffff)
-                      {
-                        erased = 0;
-                        break;
-                      }
-                  }
+		/*
+		 * Check if whole sector is erased
+		 */
+		if (i != (info->sector_count-1))
+		  size = info->start[i+1] - info->start[i];
+		else
+		  size = info->start[0] + info->size - info->start[i];
+		erased = 1;
+		flash = (volatile unsigned long *)info->start[i];
+		size = size >> 2;        /* divide by 4 for longword access */
+		for (k=0; k<size; k++)
+		  {
+		    if (*flash++ != 0xffffffff)
+		      {
+			erased = 0;
+			break;
+		      }
+		  }
 
 		if ((i % 5) == 0)
 			printf ("\n   ");
@@ -306,7 +305,7 @@
 	short i;
 	FLASH_WORD_SIZE value;
 	ulong base = (ulong)addr;
-        volatile FLASH_WORD_SIZE *addr2 = (FLASH_WORD_SIZE *)addr;
+	volatile FLASH_WORD_SIZE *addr2 = (FLASH_WORD_SIZE *)addr;
 
 	/* Write auto select command: read Manufacturer ID */
 	addr2[ADDR0] = (FLASH_WORD_SIZE)0x00AA00AA;
@@ -338,14 +337,14 @@
 
 #ifdef CONFIG_ADCIOP
 	value = addr2[0];			/* device ID		*/
-        /*        printf("\ndev_code=%x\n", value); */
+	/*        printf("\ndev_code=%x\n", value); */
 #else
 	value = addr2[1];			/* device ID		*/
 #endif
 
 	switch (value) {
 	case (FLASH_WORD_SIZE)AMD_ID_F040B:
-	        info->flash_id += FLASH_AM040;
+		info->flash_id += FLASH_AM040;
 		info->sector_count = 8;
 		info->size = 0x0080000; /* => 512 ko */
 		break;
@@ -416,11 +415,11 @@
 	}
 
 	/* set up sector start address table */
-        if (((info->flash_id & FLASH_VENDMASK) == FLASH_MAN_SST) ||
+	if (((info->flash_id & FLASH_VENDMASK) == FLASH_MAN_SST) ||
 	    (info->flash_id  == FLASH_AM040)){
 	    for (i = 0; i < info->sector_count; i++)
 		info->start[i] = base + (i * 0x00010000);
-        } else {
+	} else {
 	    if (info->flash_id & FLASH_BTYPE) {
 		/* set sector offsets for bottom boot block type	*/
 		info->start[0] = base + 0x00000000;
@@ -451,10 +450,10 @@
 		info->protect[i] = addr2[4] & 1;
 #else
 		addr2 = (volatile FLASH_WORD_SIZE *)(info->start[i]);
-                if ((info->flash_id & FLASH_VENDMASK) == FLASH_MAN_SST)
-                  info->protect[i] = 0;
-                else
-                  info->protect[i] = addr2[2] & 1;
+		if ((info->flash_id & FLASH_VENDMASK) == FLASH_MAN_SST)
+		  info->protect[i] = 0;
+		else
+		  info->protect[i] = addr2[2] & 1;
 #endif
 	}
 
@@ -465,9 +464,9 @@
 #if 0 /* test-only */
 #ifdef CONFIG_ADCIOP
 		addr2 = (volatile unsigned char *)info->start[0];
-                addr2[ADDR0] = 0xAA;
-                addr2[ADDR1] = 0x55;
-                addr2[ADDR0] = 0xF0;  /* reset bank */
+		addr2[ADDR0] = 0xAA;
+		addr2[ADDR1] = 0x55;
+		addr2[ADDR0] = 0xF0;  /* reset bank */
 #else
 		addr2 = (FLASH_WORD_SIZE *)info->start[0];
 		*addr2 = (FLASH_WORD_SIZE)0x00F000F0;	/* reset bank */
@@ -489,15 +488,15 @@
 	start = get_timer (0);
     last  = start;
     while ((addr[0] & (FLASH_WORD_SIZE)0x00800080) != (FLASH_WORD_SIZE)0x00800080) {
-        if ((now = get_timer(start)) > CFG_FLASH_ERASE_TOUT) {
-            printf ("Timeout\n");
-            return -1;
-        }
-        /* show that we're waiting */
-        if ((now - last) > 1000) {  /* every second */
-            putc ('.');
-            last = now;
-        }
+	if ((now = get_timer(start)) > CFG_FLASH_ERASE_TOUT) {
+	    printf ("Timeout\n");
+	    return -1;
+	}
+	/* show that we're waiting */
+	if ((now - last) > 1000) {  /* every second */
+	    putc ('.');
+	    last = now;
+	}
     }
 	return 0;
 }

diff --git a/board/walnut405/init.S b/board/walnut405/init.S
index d141707..70d029a 100644
--- a/board/walnut405/init.S
+++ b/board/walnut405/init.S

@@ -46,54 +46,54 @@
 #include <asm/mmu.h>
 
 
-     	.globl	ext_bus_cntlr_init
+	.globl	ext_bus_cntlr_init
 ext_bus_cntlr_init:
-        mflr    r4                      /* save link register */
-        bl      ..getAddr
+	mflr    r4                      /* save link register */
+	bl      ..getAddr
 ..getAddr:
-        mflr    r3                      /* get address of ..getAddr */
-        mtlr    r4                      /* restore link register */
-        addi    r4,0,14                 /* set ctr to 10; used to prefetch */
-        mtctr   r4                      /* 10 cache lines to fit this function */
-                                        /* in cache (gives us 8x10=80 instrctns) */
+	mflr    r3                      /* get address of ..getAddr */
+	mtlr    r4                      /* restore link register */
+	addi    r4,0,14                 /* set ctr to 10; used to prefetch */
+	mtctr   r4                      /* 10 cache lines to fit this function */
+					/* in cache (gives us 8x10=80 instrctns) */
 ..ebcloop:
-        icbt    r0,r3                   /* prefetch cache line for addr in r3 */
-        addi    r3,r3,32		/* move to next cache line */
-        bdnz    ..ebcloop               /* continue for 10 cache lines */
+	icbt    r0,r3                   /* prefetch cache line for addr in r3 */
+	addi    r3,r3,32		/* move to next cache line */
+	bdnz    ..ebcloop               /* continue for 10 cache lines */
 
-        /*------------------------------------------------------------------- */
-        /* Delay to ensure all accesses to ROM are complete before changing */
+	/*------------------------------------------------------------------- */
+	/* Delay to ensure all accesses to ROM are complete before changing */
 	/* bank 0 timings. 200usec should be enough. */
-        /*   200,000,000 (cycles/sec) X .000200 (sec) = 0x9C40 cycles */
-        /*------------------------------------------------------------------- */
+	/*   200,000,000 (cycles/sec) X .000200 (sec) = 0x9C40 cycles */
+	/*------------------------------------------------------------------- */
 	addis	r3,0,0x0
-        ori     r3,r3,0xA000          /* ensure 200usec have passed since reset */
-        mtctr   r3
+	ori     r3,r3,0xA000          /* ensure 200usec have passed since reset */
+	mtctr   r3
 ..spinlp:
-        bdnz    ..spinlp                /* spin loop */
+	bdnz    ..spinlp                /* spin loop */
 
-        /*----------------------------------------------------------------------- */
-        /* Memory Bank 0 (Flash and SRAM) initialization */
-        /*----------------------------------------------------------------------- */
-        addi    r4,0,pb0ap
-        mtdcr   ebccfga,r4
-        addis   r4,0,0x9B01
-        ori     r4,r4,0x5480
-        mtdcr   ebccfgd,r4
+	/*----------------------------------------------------------------------- */
+	/* Memory Bank 0 (Flash and SRAM) initialization */
+	/*----------------------------------------------------------------------- */
+	addi    r4,0,pb0ap
+	mtdcr   ebccfga,r4
+	addis   r4,0,0x9B01
+	ori     r4,r4,0x5480
+	mtdcr   ebccfgd,r4
 
-        addi    r4,0,pb0cr
-        mtdcr   ebccfga,r4
-        addis   r4,0,0xFFF1           /* BAS=0xFFF,BS=0x0(1MB),BU=0x3(R/W), */
-        ori     r4,r4,0x8000          /* BW=0x0( 8 bits) */
-        mtdcr   ebccfgd,r4
+	addi    r4,0,pb0cr
+	mtdcr   ebccfga,r4
+	addis   r4,0,0xFFF1           /* BAS=0xFFF,BS=0x0(1MB),BU=0x3(R/W), */
+	ori     r4,r4,0x8000          /* BW=0x0( 8 bits) */
+	mtdcr   ebccfgd,r4
 
-        blr
+	blr
 
 
 /*----------------------------------------------------------------------------- */
 /* Function:     sdram_init */
 /* Description:  Dummy implementation here - done in C later */
 /*----------------------------------------------------------------------------- */
-        .globl  sdram_init
+	.globl  sdram_init
 sdram_init:
-        blr
+	blr

diff --git a/board/walnut405/u-boot.lds b/board/walnut405/u-boot.lds
index 72e99fc..7a75f6a 100644
--- a/board/walnut405/u-boot.lds
+++ b/board/walnut405/u-boot.lds

@@ -121,6 +121,11 @@
   _edata  =  .;
   PROVIDE (edata = .);
 
+  __u_boot_cmd_start = .;
+  .u_boot_cmd : { *(.u_boot_cmd) }
+  __u_boot_cmd_end = .;
+
+
   __start___ex_table = .;
   __ex_table : { *(__ex_table) }
   __stop___ex_table = .;

diff --git a/board/walnut405/u-boot.lds.debug b/board/walnut405/u-boot.lds.debug
index f4f9743..d483424 100644
--- a/board/walnut405/u-boot.lds.debug
+++ b/board/walnut405/u-boot.lds.debug

@@ -106,6 +106,11 @@
   _edata  =  .;
   PROVIDE (edata = .);
 
+  __u_boot_cmd_start = .;
+  .u_boot_cmd : { *(.u_boot_cmd) }
+  __u_boot_cmd_end = .;
+
+
   __start___ex_table = .;
   __ex_table : { *(__ex_table) }
   __stop___ex_table = .;
@@ -128,4 +133,3 @@
   _end = . ;
   PROVIDE (end = .);
 }
-

diff --git a/board/walnut405/walnut405.c b/board/walnut405/walnut405.c
index 598509f..1d02ad4 100644
--- a/board/walnut405/walnut405.c
+++ b/board/walnut405/walnut405.c

@@ -116,7 +116,7 @@
   the necessary info for SDRAM controller configuration
    ------------------------------------------------------------------------- */
 long int initdram (int board_type)
-{	
+{
 	return  spd_sdram (0);
 }
 

diff --git a/board/wepep250/Makefile b/board/wepep250/Makefile
index d4314d7..802ccb9 100644
--- a/board/wepep250/Makefile
+++ b/board/wepep250/Makefile

@@ -29,7 +29,7 @@
 SOBJS	:= memsetup.o
 
 $(LIB):	$(OBJS) $(SOBJS)
-	$(AR) crv $@ $^
+	$(AR) crv $@ $(OBJS) $(SOBJS)
 
 clean:
 	rm -f $(SOBJS) $(OBJS)

diff --git a/board/wepep250/flash.c b/board/wepep250/flash.c
index 5c9d346..2a32290 100644
--- a/board/wepep250/flash.c
+++ b/board/wepep250/flash.c

@@ -201,7 +201,7 @@
 		} else {
 			printf ("Erasing sector %2d ... ", sector);
 		}
-	
+
 		address = (FLASH_BUS *) (info->start[sector]);
 
 		*address = FLASH_CMD (CFI_INTEL_CMD_BLOCK_ERASE);

diff --git a/board/wepep250/intel.h b/board/wepep250/intel.h
index f622590..77498b6 100644
--- a/board/wepep250/intel.h
+++ b/board/wepep250/intel.h

@@ -97,4 +97,3 @@
 #define	CFI_CHIPN_INTEL_28F256K18		"28F256K18"
 
 #endif /* FLASH_INTEL_H */
-

diff --git a/board/wepep250/memsetup.S b/board/wepep250/memsetup.S
index 8a5d42f..26fc0ea 100644
--- a/board/wepep250/memsetup.S
+++ b/board/wepep250/memsetup.S

@@ -5,17 +5,17 @@
  * modify it under the terms of the GNU General Public License
  * as published by the Free Software Foundation; either version 2
  * of the License, or (at your option) any later version.
- * 
+ *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
- * 
+ *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
  * 02111-1307, USA.
- * 
+ *
  * Written by Marcel Telka <marcel@telka.sk>, 2001, 2002.
  * Changes for U-Boot Peter Figuli <peposh@etc.sk>, 2003.
  *
@@ -28,7 +28,7 @@
  *     Revision 1.0, February 2002
  * [3] Samsung Electronics, "16Mx16 SDRAM 54CSP K4S561633C-RL(N)",
  *     Revision 1.0, February 2002
- * 
+ *
 */
 
 #include <config.h>
@@ -51,7 +51,6 @@
 	ldr	r0, =0x48000000			/* MC_BASE */
 
 
-
 /* 	step 1.a - setup MSCx
  */
 	ldr	r1, =0x000012B3			/* MSC0_RRR0(1) | MSC0_RDN0(2) | MSC0_RDF0(11) | MSC0_RT0(3) */
@@ -144,4 +143,3 @@
 /*	Step 11 - optional (TODO) */
 
 	mov	pc,r10
-

diff --git a/board/wepep250/u-boot.lds b/board/wepep250/u-boot.lds
index 46beb15..38ec25f 100644
--- a/board/wepep250/u-boot.lds
+++ b/board/wepep250/u-boot.lds

@@ -26,29 +26,33 @@
 ENTRY(_start)
 SECTIONS
 {
-        . = 0x00000000;
+	. = 0x00000000;
 
-        . = ALIGN(4);
+	. = ALIGN(4);
 	.text      :
 	{
 	  cpu/pxa/start.o	(.text)
 	  *(.text)
 	}
 
-        . = ALIGN(4);
-        .rodata : { *(.rodata) }
+	. = ALIGN(4);
+	.rodata : { *(.rodata) }
 
-        . = ALIGN(4);
-        .data : { *(.data) }
+	. = ALIGN(4);
+	.data : { *(.data) }
 
-        . = ALIGN(4);
-        .got : { *(.got) }
+	. = ALIGN(4);
+	.got : { *(.got) }
+
+	__u_boot_cmd_start = .;
+	.u_boot_cmd : { *(.u_boot_cmd) }
+	__u_boot_cmd_end = .;
 
 	armboot_end_data = .;
 
-        . = ALIGN(4);
+	. = ALIGN(4);
 	bss_start = .;
-        .bss : { *(.bss) }
+	.bss : { *(.bss) }
 	bss_end = .;
 
 	armboot_end = .;

diff --git a/board/wepep250/wepep250.c b/board/wepep250/wepep250.c
index ebf75d7..08b1bfd 100644
--- a/board/wepep250/wepep250.c
+++ b/board/wepep250/wepep250.c

@@ -26,7 +26,7 @@
 int board_init( void ){
   DECLARE_GLOBAL_DATA_PTR;
 
-  gd->bd->bi_arch_number = 288;	
+  gd->bd->bi_arch_number = 288;
   gd->bd->bi_boot_params = 0xa0000000;
 /*
  * Setup GPIO stuff to get serial working
@@ -59,11 +59,11 @@
   gd->bd->bi_dram[0].start = WEP_SDRAM_1;
   gd->bd->bi_dram[0].size  = WEP_SDRAM_1_SIZE;
 #endif
-#if ( CONFIG_NR_DRAM_BANKS > 1 )  
+#if ( CONFIG_NR_DRAM_BANKS > 1 )
   gd->bd->bi_dram[1].start = WEP_SDRAM_2;
   gd->bd->bi_dram[1].size  = WEP_SDRAM_2_SIZE;
 #endif
-#if ( CONFIG_NR_DRAM_BANKS > 2 )  
+#if ( CONFIG_NR_DRAM_BANKS > 2 )
   gd->bd->bi_dram[2].start = WEP_SDRAM_3;
   gd->bd->bi_dram[2].size  = WEP_SDRAM_3_SIZE;
 #endif
@@ -71,7 +71,6 @@
   gd->bd->bi_dram[3].start = WEP_SDRAM_4;
   gd->bd->bi_dram[3].size  = WEP_SDRAM_4_SIZE;
 #endif
-	
+
   return 0;
 }
-

diff --git a/board/westel/amx860/Makefile b/board/westel/amx860/Makefile
index 35b8428..7a2014d 100644
--- a/board/westel/amx860/Makefile
+++ b/board/westel/amx860/Makefile

@@ -28,7 +28,7 @@
 OBJS	= $(BOARD).o flash.o
 
 $(LIB):	.depend $(OBJS)
-	$(AR) crv $@ $^
+	$(AR) crv $@ $(OBJS)
 
 #########################################################################
 

diff --git a/board/westel/amx860/u-boot.lds b/board/westel/amx860/u-boot.lds
index 4b0129f..86e587f 100644
--- a/board/westel/amx860/u-boot.lds
+++ b/board/westel/amx860/u-boot.lds

@@ -109,6 +109,11 @@
   _edata  =  .;
   PROVIDE (edata = .);
 
+  __u_boot_cmd_start = .;
+  .u_boot_cmd : { *(.u_boot_cmd) }
+  __u_boot_cmd_end = .;
+
+
   __start___ex_table = .;
   __ex_table : { *(__ex_table) }
   __stop___ex_table = .;
@@ -131,4 +136,3 @@
   _end = . ;
   PROVIDE (end = .);
 }
-

diff --git a/board/westel/amx860/u-boot.lds.debug b/board/westel/amx860/u-boot.lds.debug
index 2365116..7b84fd3 100644
--- a/board/westel/amx860/u-boot.lds.debug
+++ b/board/westel/amx860/u-boot.lds.debug

@@ -107,6 +107,11 @@
   _edata  =  .;
   PROVIDE (edata = .);
 
+  __u_boot_cmd_start = .;
+  .u_boot_cmd : { *(.u_boot_cmd) }
+  __u_boot_cmd_end = .;
+
+
   __start___ex_table = .;
   __ex_table : { *(__ex_table) }
   __stop___ex_table = .;
@@ -129,4 +134,3 @@
   _end = . ;
   PROVIDE (end = .);
 }
-
commit	8bde7f776c77b343aca29b8c7b58464d915ac245	[log] [tgz]
author	wdenk <wdenk>	Fri Jun 27 21:31:46 2003 +0000
committer	wdenk <wdenk>	Fri Jun 27 21:31:46 2003 +0000
tree	20f1fd99975215e7c658454a15cdb4ed4694e2d4
parent	993cad9364c6b87ae429d1ed1130d8153f6f027e [diff]