Index: /trunk/src/VBox/Devices/PC/BIOS/ahci.c
===================================================================
--- /trunk/src/VBox/Devices/PC/BIOS/ahci.c	(revision 48122)
+++ /trunk/src/VBox/Devices/PC/BIOS/ahci.c	(revision 48123)
@@ -345,5 +345,5 @@
     /* Lock memory needed for DMA. */
     ahci->edds.num_avail = NUM_EDDS_SG;
-    DBG_AHCI("AHCI: S/G list for %lu bytes (skip %u)\n", 
+    DBG_AHCI("AHCI: S/G list for %lu bytes (skip %u)\n",
              (uint32_t)n_sect * sectsz, bios_dsk->drqp.skip_a);
     vds_build_sg_list(&ahci->edds, bios_dsk->drqp.buffer, (uint32_t)n_sect * sectsz);
@@ -484,5 +484,5 @@
  *
  * @returns status code.
- * @param   bios_dsk    Pointer to disk request packet (in the 
+ * @param   bios_dsk    Pointer to disk request packet (in the
  *                      EBDA).
  */
@@ -515,5 +515,5 @@
  *
  * @returns status code.
- * @param   bios_dsk    Pointer to disk request packet (in the 
+ * @param   bios_dsk    Pointer to disk request packet (in the
  *                      EBDA).
  */
@@ -544,5 +544,5 @@
 #define ATA_DATA_OUT     0x02
 
-uint16_t ahci_cmd_packet(uint16_t device_id, uint8_t cmdlen, char __far *cmdbuf, 
+uint16_t ahci_cmd_packet(uint16_t device_id, uint8_t cmdlen, char __far *cmdbuf,
                          uint16_t skip_b, uint32_t length, uint8_t inout, char __far *buffer)
 {
@@ -566,5 +566,5 @@
 
     DBG_AHCI("%s: reading %lu bytes, skip %u/%u, device %d, port %d\n", __func__,
-             length, bios_dsk->drqp.skip_b, bios_dsk->drqp.skip_a, 
+             length, bios_dsk->drqp.skip_b, bios_dsk->drqp.skip_a,
              device_id, bios_dsk->ahcidev[device_id].port);
     DBG_AHCI("%s: reading %u %u-byte sectors\n", __func__,
@@ -732,5 +732,5 @@
                 hdcount = read_byte(0x40, 0x75);
                 hdcount++;
-                write_byte(0x40, 0x75, hdcount);                
+                write_byte(0x40, 0x75, hdcount);
             }
             else if (val == 0xeb140101)
@@ -807,5 +807,5 @@
     bio_dsk_t __far     *bios_dsk;
     ahci_t __far        *ahci;
-    
+
 
     ebda_seg = read_word(0x0040, 0x000E);
@@ -824,5 +824,5 @@
         return 0;
     }
-    DBG_AHCI("AHCI: ahci_seg=%04x, size=%04x, pointer at EBDA:%04x (EBDA size=%04x)\n", 
+    DBG_AHCI("AHCI: ahci_seg=%04x, size=%04x, pointer at EBDA:%04x (EBDA size=%04x)\n",
              ahci_seg, sizeof(ahci_t), (uint16_t)&EbdaData->bdisk.ahci_seg, sizeof(ebda_data_t));
 
Index: /trunk/src/VBox/Devices/PC/BIOS/apm.c
===================================================================
--- /trunk/src/VBox/Devices/PC/BIOS/apm.c	(revision 48122)
+++ /trunk/src/VBox/Devices/PC/BIOS/apm.c	(revision 48123)
@@ -219,5 +219,5 @@
         // @todo: error should be different if interface not connected + engaged
         SET_AH(APM_ERR_NO_EVENTS);  /* PM events don't happen. */
-        SET_CF();       
+        SET_CF();
         break;
     default:
Index: /trunk/src/VBox/Devices/PC/BIOS/ata.c
===================================================================
--- /trunk/src/VBox/Devices/PC/BIOS/ata.c	(revision 48122)
+++ /trunk/src/VBox/Devices/PC/BIOS/ata.c	(revision 48123)
@@ -83,7 +83,7 @@
     uint8_t         channel, device;
     bio_dsk_t __far *bios_dsk;
-    
+
     bios_dsk = read_word(0x0040, 0x000E) :> &EbdaData->bdisk;
-    
+
     // Channels info init.
     for (channel=0; channel<BX_MAX_ATA_INTERFACES; channel++) {
@@ -93,5 +93,5 @@
         bios_dsk->channels[channel].irq     = 0;
     }
-    
+
     // Devices info init.
     for (device=0; device<BX_MAX_ATA_DEVICES; device++) {
@@ -111,5 +111,5 @@
         bios_dsk->devices[device].sectors     = 0;
     }
-    
+
     // hdidmap  and cdidmap init.
     for (device=0; device<BX_MAX_STORAGE_DEVICES; device++) {
@@ -117,5 +117,5 @@
         bios_dsk->cdidmap[device] = BX_MAX_STORAGE_DEVICES;
     }
-    
+
     bios_dsk->hdcount = 0;
     bios_dsk->cdcount = 0;
@@ -135,9 +135,9 @@
     uint16_t        pdelay;
     bio_dsk_t __far *bios_dsk;
-    
+
     bios_dsk = read_word(0x0040, 0x000E) :> &EbdaData->bdisk;
     channel = device / 2;
     slave = device % 2;
-    
+
     iobase1 = bios_dsk->channels[channel].iobase1;
     iobase2 = bios_dsk->channels[channel].iobase2;
@@ -185,8 +185,8 @@
     while(--max>0) {
         uint8_t status = inb(iobase1+ATA_CB_STAT);
-        if ((status & ATA_CB_STAT_RDY) != 0) 
+        if ((status & ATA_CB_STAT_RDY) != 0)
             break;
     }
-    
+
     // Enable interrupts
     outb(iobase2+ATA_CB_DC, ATA_CB_DC_HD15);
@@ -236,5 +236,5 @@
             blksize >>= 1;
     }
-    
+
     status = inb(iobase1 + ATA_CB_STAT);
     if (status & ATA_CB_STAT_BSY)
@@ -272,5 +272,5 @@
         head = ((uint16_t) (lba & 0x0000000fL)) | 0x40;
     }
-    
+
     outb(iobase2 + ATA_CB_DC, ATA_CB_DC_HD15 | ATA_CB_DC_NIEN);
     outb(iobase1 + ATA_CB_FR, 0x00);
@@ -281,5 +281,5 @@
     outb(iobase1 + ATA_CB_DH, (slave ? ATA_CB_DH_DEV1 : ATA_CB_DH_DEV0) | (uint8_t) head );
     outb(iobase1 + ATA_CB_CMD, command);
-    
+
     if (command == ATA_CMD_READ_MULTIPLE || command == ATA_CMD_READ_MULTIPLE_EXT) {
         mult_blk_cnt = count;
@@ -288,5 +288,5 @@
         mult_blk_cnt = 1;
     }
-    
+
     while (1) {
         status = inb(iobase1 + ATA_CB_STAT);
@@ -294,5 +294,5 @@
             break;
     }
-    
+
     if (status & ATA_CB_STAT_ERR) {
         BX_DEBUG_ATA("%s: read error\n", __func__);
@@ -306,15 +306,15 @@
         return 3;
     }
-    
+
     // FIXME : move seg/off translation here
-    
+
     int_enable(); // enable higher priority interrupts
-    
+
     while (1) {
-    
+
         // adjust if there will be an overrun. 2K max sector size
         if (FP_OFF(buffer) >= 0xF800)
             buffer = MK_FP(FP_SEG(buffer) + 0x80, FP_OFF(buffer) - 0x800);
-        
+
         if (mode == ATA_MODE_PIO32) {
             buffer = rep_insd(buffer, blksize, iobase1);
@@ -365,5 +365,5 @@
     uint8_t         buffer[0x0200];
     bio_dsk_t __far *bios_dsk;
-    
+
     bios_dsk = ebda_seg :> &EbdaData->bdisk;
 
@@ -405,14 +405,14 @@
         uint8_t     channel, slave;
         uint8_t     sc, sn, cl, ch, st;
-        
+
         channel = device / 2;
         slave = device % 2;
-        
+
         iobase1 = bios_dsk->channels[channel].iobase1;
         iobase2 = bios_dsk->channels[channel].iobase2;
-        
+
         // Disable interrupts
         outb(iobase2+ATA_CB_DC, ATA_CB_DC_HD15 | ATA_CB_DC_NIEN);
-        
+
         // Look for device
         outb(iobase1+ATA_CB_DH, slave ? ATA_CB_DH_DEV1 : ATA_CB_DH_DEV0);
@@ -423,5 +423,5 @@
         outb(iobase1+ATA_CB_SC, 0x55);
         outb(iobase1+ATA_CB_SN, 0xaa);
-        
+
         // If we found something
         sc = inb(iobase1+ATA_CB_SC);
@@ -616,5 +616,5 @@
                     if (*(model+i) == 0x20)
                         *(model+i) = 0x00;
-                    else 
+                    else
                         break;
                 }
@@ -692,9 +692,9 @@
     uint8_t         channel, slave;
     uint8_t         status, mode;
-    
+
     device  = bios_dsk->drqp.dev_id;
     channel = device / 2;
     slave   = device % 2;
-    
+
     iobase1 = bios_dsk->channels[channel].iobase1;
     iobase2 = bios_dsk->channels[channel].iobase2;
@@ -705,5 +705,5 @@
     else
         blksize >>= 1;
-    
+
     status = inb(iobase1 + ATA_CB_STAT);
     if (status & ATA_CB_STAT_BSY)
@@ -740,5 +740,5 @@
         head = ((uint16_t) (lba & 0x0000000fL)) | 0x40;
     }
-    
+
     outb(iobase2 + ATA_CB_DC, ATA_CB_DC_HD15 | ATA_CB_DC_NIEN);
     outb(iobase1 + ATA_CB_FR, 0x00);
@@ -749,5 +749,5 @@
     outb(iobase1 + ATA_CB_DH, (slave ? ATA_CB_DH_DEV1 : ATA_CB_DH_DEV0) | (uint8_t) head );
     outb(iobase1 + ATA_CB_CMD, command);
-    
+
     while (1) {
         status = inb(iobase1 + ATA_CB_STAT);
@@ -755,5 +755,5 @@
             break;
     }
-    
+
     if (status & ATA_CB_STAT_ERR) {
         BX_DEBUG_ATA("%s: write error\n", __func__);
@@ -767,15 +767,15 @@
         return 3;
     }
-    
+
     // FIXME : move seg/off translation here
-    
+
     int_enable(); // enable higher priority interrupts
-    
+
     while (1) {
-    
+
         // adjust if there will be an overrun. 2K max sector size
         if (FP_OFF(buffer) >= 0xF800)
             buffer = MK_FP(FP_SEG(buffer) + 0x80, FP_OFF(buffer) - 0x800);
-        
+
         if (mode == ATA_MODE_PIO32) {
             buffer = rep_outsd(buffer, blksize, iobase1);
@@ -783,5 +783,5 @@
             buffer = rep_outsw(buffer, blksize, iobase1);
         }
-        
+
         bios_dsk->drqp.trsfsectors++;
         count--;
@@ -822,5 +822,5 @@
  *
  * @returns status code.
- * @param   bios_dsk    Pointer to disk request packet (in the 
+ * @param   bios_dsk    Pointer to disk request packet (in the
  *                      EBDA).
  */
@@ -856,5 +856,5 @@
  *
  * @returns status code.
- * @param   bios_dsk    Pointer to disk request packet (in the 
+ * @param   bios_dsk    Pointer to disk request packet (in the
  *                      EBDA).
  */
@@ -887,5 +887,5 @@
       // 3 : error
       // 4 : not ready
-uint16_t ata_cmd_packet(uint16_t device, uint8_t cmdlen, char __far *cmdbuf, 
+uint16_t ata_cmd_packet(uint16_t device, uint8_t cmdlen, char __far *cmdbuf,
                         uint16_t header, uint32_t length, uint8_t inout, char __far *buffer)
 {
@@ -907,5 +907,5 @@
         return 1;
     }
-    
+
     // The header length must be even
     if (header & 1) {
@@ -913,10 +913,10 @@
         return 1;
     }
-    
+
     iobase1  = bios_dsk->channels[channel].iobase1;
     iobase2  = bios_dsk->channels[channel].iobase2;
     mode     = bios_dsk->devices[device].mode;
     transfer = 0L;
-    
+
     if (cmdlen < 12)
         cmdlen = 12;
@@ -924,14 +924,14 @@
         cmdlen = 16;
     cmdlen >>= 1;
-    
+
     // Reset count of transferred data
     // @todo: clear in calling code?
     bios_dsk->drqp.trsfsectors = 0;
     bios_dsk->drqp.trsfbytes   = 0;
-    
+
     status = inb(iobase1 + ATA_CB_STAT);
     if (status & ATA_CB_STAT_BSY)
         return 2;
-    
+
     outb(iobase2 + ATA_CB_DC, ATA_CB_DC_HD15 | ATA_CB_DC_NIEN);
     // outb(iobase1 + ATA_CB_FR, 0x00);
@@ -942,5 +942,5 @@
     outb(iobase1 + ATA_CB_DH, slave ? ATA_CB_DH_DEV1 : ATA_CB_DH_DEV0);
     outb(iobase1 + ATA_CB_CMD, ATA_CMD_PACKET);
-    
+
     // Device should ok to receive command
     while (1) {
@@ -948,5 +948,5 @@
         if ( !(status & ATA_CB_STAT_BSY) ) break;
     }
-    
+
     if (status & ATA_CB_STAT_CHK) {
         BX_DEBUG_ATA("%s: error, status is %02x\n", __func__, status);
@@ -960,7 +960,7 @@
         return 4;
     }
-    
+
     int_enable(); // enable higher priority interrupts
-    
+
     // Normalize address
     BX_DEBUG_ATA("acp1 buffer ptr: %04x:%04x wlen %04x\n", FP_SEG(cmdbuf), FP_OFF(cmdbuf), cmdlen);
@@ -968,8 +968,8 @@
     //  cmdseg += (cmdoff / 16);
     //  cmdoff %= 16;
-    
+
     // Send command to device
     rep_outsw(cmdbuf, cmdlen, iobase1);
-    
+
     if (inout == ATA_DATA_NO) {
         status = inb(iobase1 + ATA_CB_STAT);
@@ -977,15 +977,15 @@
     else {
         while (1) {
-        
+
             while (1) {
                 status = inb(iobase1 + ATA_CB_STAT);
-                if ( !(status & ATA_CB_STAT_BSY) ) 
+                if ( !(status & ATA_CB_STAT_BSY) )
                     break;
             }
-            
+
             // Check if command completed
             if ( (status & (ATA_CB_STAT_BSY | ATA_CB_STAT_DRQ) ) ==0 )
                 break;
-            
+
             if (status & ATA_CB_STAT_CHK) {
                 BX_DEBUG_ATA("%s: error (status %02x)\n", __func__, status);
@@ -994,5 +994,5 @@
                 return 3;
             }
-            
+
             // Device must be ready to send data
             if ( (status & (ATA_CB_STAT_BSY | ATA_CB_STAT_RDY | ATA_CB_STAT_DRQ | ATA_CB_STAT_CHK) )
@@ -1003,5 +1003,5 @@
                 return 4;
             }
-            
+
             // Normalize address
             BX_DEBUG_ATA("acp2 buffer ptr: %04x:%04x\n", FP_SEG(buffer), FP_OFF(buffer));
@@ -1009,8 +1009,8 @@
             //      bufseg += (bufoff / 16);
             //      bufoff %= 16;
-            
+
             // Get the byte count
             lcount =  ((uint16_t)(inb(iobase1 + ATA_CB_CH))<<8)+inb(iobase1 + ATA_CB_CL);
-            
+
             // adjust to read what we want
             if (header>lcount) {
@@ -1024,5 +1024,5 @@
                 lcount -= lbefore;
             }
-            
+
             if (lcount>length) {
                 lafter = lcount - length;
@@ -1034,11 +1034,11 @@
                 length -= lcount;
             }
-            
+
             // Save byte count
             count = lcount;
-            
+
             BX_DEBUG_ATA("Trying to read %04x bytes (%04x %04x %04x) ",lbefore+lcount+lafter,lbefore,lcount,lafter);
             BX_DEBUG_ATA("to 0x%04x:0x%04x\n",FP_SEG(buffer),FP_OFF(buffer));
-            
+
             // If counts not dividable by 4, use 16bits mode
             lmode = mode;
@@ -1049,5 +1049,5 @@
             if (lafter  & 0x03)
                 lmode = ATA_MODE_PIO16;
-            
+
             // adds an extra byte if count are odd. before is always even
             if (lcount & 0x01) {
@@ -1057,5 +1057,5 @@
                 }
             }
-            
+
             if (lmode == ATA_MODE_PIO32) {
                 lcount  >>= 2;
@@ -1068,5 +1068,5 @@
                 lafter  >>= 1;
             }
-            
+
             if (lmode == ATA_MODE_PIO32) {
                 if (lbefore)
@@ -1082,9 +1082,9 @@
                     insw_discard(lafter, iobase1);
             }
-            
-            
+
+
             // Compute new buffer address
             buffer += count;
-            
+
             // Save transferred bytes count
             transfer += count;
@@ -1092,5 +1092,5 @@
         }
     }
-    
+
     // Final check, device must be ready
     if ( (status & (ATA_CB_STAT_BSY | ATA_CB_STAT_RDY | ATA_CB_STAT_DF | ATA_CB_STAT_DRQ | ATA_CB_STAT_CHK) )
@@ -1101,5 +1101,5 @@
         return 4;
     }
-    
+
     // Enable interrupts
     outb(iobase2+ATA_CB_DC, ATA_CB_DC_HD15);
@@ -1132,5 +1132,5 @@
     outb(iobase1 + ATA_CB_DH, slave ? ATA_CB_DH_DEV1 : ATA_CB_DH_DEV0);
     outb(iobase1 + ATA_CB_CMD, ATA_CMD_DEVICE_RESET);
-    
+
     /* Wait for the device to clear BSY. */
     while (1) {
@@ -1138,5 +1138,5 @@
         if ( !(status & ATA_CB_STAT_BSY) ) break;
     }
-    
+
     /* Final check, device must be ready */
     if ( (status & (ATA_CB_STAT_BSY | ATA_CB_STAT_RDY | ATA_CB_STAT_DF | ATA_CB_STAT_DRQ | ATA_CB_STAT_CHK) )
@@ -1147,5 +1147,5 @@
         return 1;
     }
-    
+
     /* Enable interrupts */
     outb(iobase2+ATA_CB_DC, ATA_CB_DC_HD15);
Index: /trunk/src/VBox/Devices/PC/BIOS/biosint.h
===================================================================
--- /trunk/src/VBox/Devices/PC/BIOS/biosint.h	(revision 48122)
+++ /trunk/src/VBox/Devices/PC/BIOS/biosint.h	(revision 48123)
@@ -238,5 +238,5 @@
 #define BX_PANIC(...)   bios_printf(BIOS_PRINTF_DEBHALT, __VA_ARGS__)
 
-/* Because we don't tell the recompiler when guest physical memory 
+/* Because we don't tell the recompiler when guest physical memory
  * is written, it can incorrectly cache guest code overwritten by
  * DMA (bus master or not). We just re-write the memory block to flush
Index: /trunk/src/VBox/Devices/PC/BIOS/boot.c
===================================================================
--- /trunk/src/VBox/Devices/PC/BIOS/boot.c	(revision 48122)
+++ /trunk/src/VBox/Devices/PC/BIOS/boot.c	(revision 48123)
@@ -92,9 +92,9 @@
 {
     int     i;
-    
+
     // cdboot contains 0 if lan/floppy/harddisk, 1 otherwise
     // lanboot contains 0 if floppy/harddisk, 1 otherwise
     // drive contains real/emulated boot drive
-    
+
     if(cdboot)i=2;                    // CD-Rom
     else if(lanboot)i=3;              // LAN
@@ -102,5 +102,5 @@
     else if((drive&0x0080)==0x80)i=1; // Hard drive
     else return;
-    
+
     BX_INFO("Booting from %s...\n",drivetypes[i]);
 }
@@ -111,9 +111,9 @@
 //--------------------------------------------------------------------------
 //@todo: pass inputs as bit flags rather than bytes?
-void print_boot_failure(uint8_t cdboot, uint8_t lanboot, uint8_t drive, 
+void print_boot_failure(uint8_t cdboot, uint8_t lanboot, uint8_t drive,
                         uint8_t reason, uint8_t lastdrive)
 {
     uint16_t    drivenum = drive&0x7f;
-    
+
     // cdboot: 1 if boot from cd, 0 otherwise
     // lanboot: 1 if boot from lan, 0 otherwise
@@ -121,5 +121,5 @@
     // reason: 0 signature check failed, 1 read error
     // lastdrive: 1 boot drive is the last one in boot sequence
-    
+
     if (cdboot)
         BX_INFO("Boot from %s failed\n",drivetypes[2]);
@@ -130,5 +130,5 @@
     else
         BX_INFO("Boot from %s %d failed\n", drivetypes[0],drivenum);
-    
+
     if (lastdrive==1) {
         if (reason==0)
@@ -162,5 +162,5 @@
     uint16_t    status;
     uint8_t     lastdrive=0;
-    
+
     // if BX_ELTORITO_BOOT is not defined, old behavior
     //   check bit 5 in CMOS reg 0x2d.  load either 0x00 or 0x80 into DL
@@ -181,5 +181,5 @@
     //     0x04 : local area network
     //     else : boot failure
-    
+
     // Get the boot sequence
 #if BX_ELTORITO_BOOT
@@ -192,5 +192,5 @@
     if (bseqnr == 1)
         delay_boot((inb_cmos(0x3c) & 0xf0) >> 4); /* Implemented in logo.c */
-    
+
     if (bseqnr==2) bootseq >>= 4;
     if (bseqnr==3) bootseq >>= 8;
@@ -199,6 +199,6 @@
     bootdrv=0x00; bootcd=0;
     bootlan=0;
-    BX_INFO("Boot : bseqnr=%d, bootseq=%x\r\n",bseqnr, bootseq);    
-    
+    BX_INFO("Boot : bseqnr=%d, bootseq=%x\r\n",bseqnr, bootseq);
+
     switch(bootseq & 0x0f) {
     case 0x01:
@@ -210,5 +210,5 @@
         // Get the Boot drive.
         uint8_t boot_drive = read_byte(ebda_seg, (uint16_t)&EbdaData->uForceBootDrive);
-        
+
         bootdrv = boot_drive + 0x80;
         bootcd=0;
@@ -224,5 +224,5 @@
 #else
     bootseq=inb_cmos(0x2d);
-    
+
     if (bseqnr==2) {
         bootseq ^= 0x20;
@@ -232,10 +232,10 @@
     if((bootseq&0x20)==0) bootdrv=0x80;
 #endif // BX_ELTORITO_BOOT
-    
+
 #if BX_ELTORITO_BOOT
     // We have to boot from cd
     if (bootcd != 0) {
         status = cdrom_boot();
-    
+
         // If failure
         if ( (status & 0x00ff) !=0 ) {
@@ -244,11 +244,11 @@
             return 0x00000000;
         }
-        
+
         bootseg = read_word(ebda_seg,(uint16_t)&EbdaData->cdemu.load_segment);
         bootdrv = (uint8_t)(status>>8);
     }
-    
+
 #endif // BX_ELTORITO_BOOT
-    
+
     // Check for boot from LAN first
     if (bootlan == 1) {
@@ -271,5 +271,5 @@
                     netboot_entry = (void __far *)(fplan + 6);
                     netboot_entry();
-                } 
+                }
                 else
                 {
@@ -282,5 +282,5 @@
             }
         }
-        
+
         // boot from LAN will not return if successful.
         print_boot_failure(bootcd, bootlan, bootdrv, 1, lastdrive);
@@ -291,5 +291,5 @@
     if (bootcd == 0 && bootlan == 0) {
         bootseg=0x07c0;
-                
+
         status = read_boot_sec(bootdrv,bootseg);
         if (status != 0) {
@@ -298,5 +298,5 @@
         }
     }
-    
+
     // There is *no* requirement whatsoever for a valid floppy boot sector
     // to have a 55AAh signature. UNIX boot floppies typically have no such
@@ -310,5 +310,5 @@
     if (bootdrv != 0) bootchk = 0;
     else bootchk = 1; /* disable 0x55AA signature check on drive A: */
-    
+
 #if BX_ELTORITO_BOOT
     // if boot from cd, no signature check
@@ -316,5 +316,5 @@
         bootchk = 1;
 #endif // BX_ELTORITO_BOOT
-    
+
     if (read_word(bootseg,0) == read_word(bootseg,2)
       || (bootchk == 0 && read_word(bootseg,0x1fe) != 0xaa55))
@@ -323,5 +323,5 @@
         return 0x00000000;
     }
-    
+
 #if BX_ELTORITO_BOOT
     // Print out the boot string
@@ -330,5 +330,5 @@
     print_boot_device(0, bootlan, bootdrv);
 #endif // BX_ELTORITO_BOOT
-    
+
     // return the boot segment
     return (((uint32_t)bootdrv) << 16) + bootseg;
Index: /trunk/src/VBox/Devices/PC/BIOS/ebda.h
===================================================================
--- /trunk/src/VBox/Devices/PC/BIOS/ebda.h	(revision 48122)
+++ /trunk/src/VBox/Devices/PC/BIOS/ebda.h	(revision 48123)
@@ -217,7 +217,7 @@
 extern uint16_t ahci_cmd_packet(uint16_t device_id, uint8_t cmdlen, char __far *cmdbuf,
                                 uint16_t header, uint32_t length, uint8_t inout, char __far *buffer);
-extern uint16_t scsi_cmd_packet(uint16_t device, uint8_t cmdlen, char __far *cmdbuf, 
+extern uint16_t scsi_cmd_packet(uint16_t device, uint8_t cmdlen, char __far *cmdbuf,
                                 uint16_t header, uint32_t length, uint8_t inout, char __far *buffer);
-extern uint16_t ata_cmd_packet(uint16_t device, uint8_t cmdlen, char __far *cmdbuf, 
+extern uint16_t ata_cmd_packet(uint16_t device, uint8_t cmdlen, char __far *cmdbuf,
                                uint16_t header, uint32_t length, uint8_t inout, char __far *buffer);
 
Index: /trunk/src/VBox/Devices/PC/BIOS/keyboard.c
===================================================================
--- /trunk/src/VBox/Devices/PC/BIOS/keyboard.c	(revision 48122)
+++ /trunk/src/VBox/Devices/PC/BIOS/keyboard.c	(revision 48123)
@@ -167,5 +167,5 @@
     // If you're getting a 993 keyboard panic here,
     // please see the comment in keyboard_init
-    
+
     BX_PANIC("Keyboard error:%u\n",status);
 }
@@ -313,5 +313,5 @@
 {
     uint16_t    buffer_start, buffer_end, buffer_head, buffer_tail, temp_tail;
-    
+
 #if BX_CPU < 2
     buffer_start = 0x001E;
@@ -321,16 +321,16 @@
     buffer_end   = read_word(0x0040, 0x0082);
 #endif
-    
+
     buffer_head = read_word(0x0040, 0x001A);
     buffer_tail = read_word(0x0040, 0x001C);
-    
+
     temp_tail = buffer_tail;
     buffer_tail += 2;
     if (buffer_tail >= buffer_end)
         buffer_tail = buffer_start;
-    
+
     if (buffer_tail == buffer_head)
         return(0);
-    
+
     write_byte(0x0040, temp_tail, ascii_code);
     write_byte(0x0040, temp_tail+1, scan_code);
@@ -347,23 +347,23 @@
     uint8_t scancode, asciicode, shift_flags;
     uint8_t mf2_flags, mf2_state, flag;
-    
+
     //
     // DS has been set to F000 before call
     //
-    
-    
+
+
     scancode = GET_AL();
-    
+
     if (scancode == 0) {
         BX_INFO("KBD: int09 handler: AL=0\n");
         return;
     }
-    
-    
+
+
     shift_flags = read_byte(0x0040, 0x17);
     mf2_flags = read_byte(0x0040, 0x18);
     mf2_state = read_byte(0x0040, 0x96);
     asciicode = 0;
-    
+
     switch (scancode) {
     case 0x3a: /* Caps Lock press */
@@ -419,5 +419,5 @@
         }
         break;
-    
+
     case 0x38: /* Alt press */
         shift_flags |= 0x08;
@@ -442,5 +442,5 @@
         }
         break;
-    
+
     case 0x45: /* Num Lock press */
         if ((mf2_state & 0x03) == 0) {
@@ -457,5 +457,5 @@
         }
         break;
-    
+
     case 0x46: /* Scroll Lock press */
         mf2_flags |= 0x10;
@@ -464,15 +464,15 @@
         write_byte(0x0040, 0x17, shift_flags);
         break;
-    
+
     case 0xc6: /* Scroll Lock release */
         mf2_flags &= ~0x10;
         write_byte(0x0040, 0x18, mf2_flags);
         break;
-    
+
     case 0x53: /* Del press */
         if ((shift_flags & 0x0c) == 0x0c)
             jmp_post();
         /* fall through */
-    
+
     default:
         if (scancode & 0x80) {
@@ -496,5 +496,5 @@
             /* check if lock state should be ignored
              * because a SHIFT key are pressed */
-        
+
             if (shift_flags & scan_to_scanascii[scancode].lock_flags) {
                 asciicode = scan_to_scanascii[scancode].normal;
@@ -531,5 +531,5 @@
     uint16_t    buffer_start, buffer_end, buffer_head, buffer_tail;
     uint8_t     acode, scode;
-    
+
 #if BX_CPU < 2
     buffer_start = 0x001E;
@@ -539,8 +539,8 @@
     buffer_end   = read_word(0x0040, 0x0082);
 #endif
-    
+
     buffer_head = read_word(0x0040, 0x001a);
     buffer_tail = read_word(0x0040, 0x001c);
-    
+
     if (buffer_head != buffer_tail) {
         acode = read_byte(0x0040, buffer_head);
@@ -581,7 +581,7 @@
     uint8_t     scan_code, ascii_code, shift_flags, led_flags, count;
     uint16_t    kbd_code, max;
-    
+
     BX_DEBUG_INT16("int16: AX=%04x BX=%04x CX=%04x DX=%04x \n", AX, BX, CX, DX);
-    
+
     shift_flags = read_byte(0x0040, 0x17);
     led_flags   = read_byte(0x0040, 0x97);
@@ -601,5 +601,5 @@
         int_enable();
     }
-    
+
     switch (GET_AH()) {
     case 0x00: /* read keyboard input */
@@ -613,5 +613,5 @@
         AX = (scan_code << 8) | ascii_code;
         break;
-    
+
     case 0x01: /* check keyboard status */
         SET_IF();   /* Enable interrupts. Some callers depend on that! */
@@ -627,10 +627,10 @@
         CLEAR_ZF();
         break;
-    
+
     case 0x02: /* get shift flag status */
         shift_flags = read_byte(0x0040, 0x17);
         SET_AL(shift_flags);
         break;
-    
+
     case 0x05: /* store key-stroke into buffer */
         if ( !enqueue_key(GET_CH(), GET_CL()) ) {
@@ -641,5 +641,5 @@
         }
         break;
-    
+
     case 0x09: /* GET KEYBOARD FUNCTIONALITY */
         // bit Bochs Description
@@ -655,5 +655,5 @@
         SET_AL(0x30);
         break;
-        
+
     case 0x0A: /* GET KEYBOARD ID */
         count = 2;
@@ -681,5 +681,5 @@
         BX=kbd_code;
         break;
-    
+
     case 0x10: /* read MF-II keyboard input */
         if ( !dequeue_key(&scan_code, &ascii_code, 1) ) {
@@ -690,5 +690,5 @@
         AX = (scan_code << 8) | ascii_code;
         break;
-    
+
     case 0x11: /* check MF-II keyboard status */
         SET_IF();
@@ -702,5 +702,5 @@
         CLEAR_ZF();
         break;
-    
+
     case 0x12: /* get extended keyboard status */
         shift_flags = read_byte(0x0040, 0x17);
@@ -711,13 +711,13 @@
         BX_DEBUG_INT16("int16: func 12 sending %04x\n",AX);
         break;
-    
+
     case 0x92: /* keyboard capability check called by DOS 5.0+ keyb */
         SET_AH(0x80); // function int16 ah=0x10-0x12 supported
         break;
-    
+
     case 0xA2: /* 122 keys capability check called by DOS 5.0+ keyb */
         // don't change AH : function int16 ah=0x20-0x22 NOT supported
         break;
-    
+
     //@todo: what's the point of handling this??
 #if 0
@@ -726,5 +726,5 @@
         SET_AH(0x02); // unsupported, aka normal keyboard
 #endif
-    
+
     default:
         BX_INFO("KBD: unsupported int 16h function %02x\n", GET_AH());
Index: /trunk/src/VBox/Devices/PC/BIOS/parallel.c
===================================================================
--- /trunk/src/VBox/Devices/PC/BIOS/parallel.c	(revision 48122)
+++ /trunk/src/VBox/Devices/PC/BIOS/parallel.c	(revision 48123)
@@ -50,5 +50,5 @@
 
     int_enable();
-    
+
     addr = read_word(0x0040, (regs.u.r16.dx << 1) + 8);
     if ((regs.u.r8.ah < 3) && (regs.u.r16.dx < 3) && (addr > 0)) {
Index: /trunk/src/VBox/Devices/PC/BIOS/pciutil.c
===================================================================
--- /trunk/src/VBox/Devices/PC/BIOS/pciutil.c	(revision 48122)
+++ /trunk/src/VBox/Devices/PC/BIOS/pciutil.c	(revision 48123)
@@ -102,5 +102,5 @@
     "xchg   cx, dx"         \
     "shl    ecx, 16"        \
-    "mov    cx, dx"         \   
+    "mov    cx, dx"         \
     "int    0x1a"           \
     parm [ax] [bx] [di] [dx cx];
Index: /trunk/src/VBox/Devices/PC/BIOS/print.c
===================================================================
--- /trunk/src/VBox/Devices/PC/BIOS/print.c	(revision 48122)
+++ /trunk/src/VBox/Devices/PC/BIOS/print.c	(revision 48123)
@@ -153,11 +153,11 @@
     int         i;
     uint16_t    arg, nibble, hibyte, format_width, hexadd;
-    va_list     args; 
-    
+    va_list     args;
+
     va_start( args, s );
-    
+
     in_format = 0;
     format_width = 0;
-    
+
     if ((action & BIOS_PRINTF_DEBHALT) == BIOS_PRINTF_DEBHALT) {
         bios_printf (BIOS_PRINTF_SCREEN, "FATAL: ");
Index: /trunk/src/VBox/Devices/PC/BIOS/ps2mouse.c
===================================================================
--- /trunk/src/VBox/Devices/PC/BIOS/ps2mouse.c	(revision 48122)
+++ /trunk/src/VBox/Devices/PC/BIOS/ps2mouse.c	(revision 48123)
@@ -80,5 +80,5 @@
     while ((inb(0x64) & 0x21) != 0x21 && retries)
         --retries;
-    
+
     if (!retries)
         return(1);
@@ -93,5 +93,5 @@
     if (inb(0x64) & 0x02)
         BX_PANIC(panic_msg_keyb_buffer_full,"setkbdcomm");
-    
+
     outb(0x64, 0x60); // write command byte
     outb(0x60, command_byte);
@@ -105,8 +105,8 @@
     uint8_t     in_byte, index, package_count;
     uint8_t     mouse_flags_1, mouse_flags_2;
-    
+
     BX_DEBUG_INT74("entering int74_function\n");
     make_farcall = 0;
-    
+
     in_byte = inb(0x64);
     if ( (in_byte & 0x21) != 0x21 ) {
@@ -115,16 +115,16 @@
     in_byte = inb(0x60);
     BX_DEBUG_INT74("int74: read byte %02x\n", in_byte);
-    
+
     mouse_flags_1 = read_byte(ebda_seg, 0x0026);
     mouse_flags_2 = read_byte(ebda_seg, 0x0027);
-    
+
     if ( (mouse_flags_2 & 0x80) != 0x80 ) {
         return;
     }
-    
+
     package_count = mouse_flags_2 & 0x07;
     index = mouse_flags_1 & 0x07;
     write_byte(ebda_seg, 0x28 + index, in_byte);
-    
+
     if ( index >= package_count ) {
         BX_DEBUG_INT74("int74_function: make_farcall=1\n");
@@ -165,5 +165,5 @@
     // 05: cannot enable mouse, since no far call has been installed
     // 80/86: mouse service not implemented
-    
+
     if (regs.u.r8.al > 7) {
         BX_DEBUG_INT15_MS("unsupported subfn\n");
@@ -173,10 +173,10 @@
         return;
     }
-    
+
     // Valid subfn; disable AUX input and IRQ12, assume no error
     set_kbd_command_byte(0x65);
     CLEAR_CF();
     regs.u.r8.ah = 0;
-    
+
     switch (regs.u.r8.al) {
     case 0: // Disable/Enable Mouse
@@ -203,5 +203,5 @@
             mouse_cmd = 0xF4;   // enable mouse command
         }
-        
+
         ret = send_to_mouse_ctrl(mouse_cmd);  // disable mouse command
         if (ret == 0) {
@@ -212,10 +212,10 @@
             }
         }
-        
+
         // interface error
         SET_CF();
         regs.u.r8.ah = 3;
         break;
-    
+
     case 5: // Initialize Mouse
         // Valid package sizes are 1 to 8
@@ -229,5 +229,5 @@
         write_byte(ebda_seg, 0x0027, mouse_flags_2);
         // fall through!
-    
+
     case 1: // Reset Mouse
         BX_DEBUG_INT15_MS("case 1 or 5:\n");
@@ -260,10 +260,10 @@
             }
         }
-        
+
         // interface error
         SET_CF();
         regs.u.r8.ah = 3;
         break;
-    
+
     case 2: // Set Sample Rate
         BX_DEBUG_INT15_MS("case 2:\n");
@@ -296,5 +296,5 @@
         }
         break;
-    
+
     case 3: // Set Resolution
         BX_DEBUG_INT15_MS("case 3:\n");
@@ -326,5 +326,5 @@
         }
         break;
-    
+
     case 4: // Get Device ID
         BX_DEBUG_INT15_MS("case 4:\n");
@@ -341,5 +341,5 @@
         }
         break;
-    
+
     case 6: // Return Status & Set Scaling Factor...
         BX_DEBUG_INT15_MS("case 6:\n");
@@ -368,10 +368,10 @@
                 }
             }
-            
+
             // interface error
             SET_CF();
             regs.u.r8.ah = 3;
             break;
-        
+
         case 1: // Set Scaling Factor to 1:1
         case 2: // Set Scaling Factor to 2:1
@@ -391,5 +391,5 @@
             }
             break;
-        
+
         default:
             BX_PANIC("INT 15h C2 AL=6, BH=%02x\n", (unsigned) regs.u.r8.bh);
@@ -399,5 +399,5 @@
         }
         break;
-    
+
     case 7: // Set Mouse Handler Address
         BX_DEBUG_INT15_MS("case 7:\n");
@@ -419,5 +419,5 @@
         write_byte(ebda_seg, 0x0027, mouse_flags_2);
         break;
-    
+
     default:
         BX_PANIC("INT 15h C2 default case entered\n");
Index: /trunk/src/VBox/Devices/PC/BIOS/scsi.c
===================================================================
--- /trunk/src/VBox/Devices/PC/BIOS/scsi.c	(revision 48122)
+++ /trunk/src/VBox/Devices/PC/BIOS/scsi.c	(revision 48123)
@@ -94,5 +94,5 @@
     while (status & VBSCSI_BUSY);
 
-    
+
     sizes = ((length >> 12) & 0xF0) | cbCDB;
     outb(io_base + VBSCSI_REGISTER_COMMAND, target_id);                 /* Write the target ID. */
@@ -100,5 +100,5 @@
     outb(io_base + VBSCSI_REGISTER_COMMAND, sizes);                     /* Write CDB size and top bufsize bits. */
     outb(io_base + VBSCSI_REGISTER_COMMAND, length);                    /* Write the buffer size. */
-    outb(io_base + VBSCSI_REGISTER_COMMAND, (length >> 8));    
+    outb(io_base + VBSCSI_REGISTER_COMMAND, (length >> 8));
     for (i = 0; i < cbCDB; i++)                                         /* Write the CDB. */
         outb(io_base + VBSCSI_REGISTER_COMMAND, aCDB[i]);
@@ -136,5 +136,5 @@
     while (status & VBSCSI_BUSY);
 
-    
+
     sizes = ((length >> 12) & 0xF0) | cbCDB;
     outb(io_base + VBSCSI_REGISTER_COMMAND, target_id);                 /* Write the target ID. */
@@ -171,5 +171,5 @@
  *
  * @returns status code.
- * @param   bios_dsk    Pointer to disk request packet (in the 
+ * @param   bios_dsk    Pointer to disk request packet (in the
  *                      EBDA).
  */
@@ -203,5 +203,5 @@
              count, device_id, bios_dsk->scsidev[device_id].target_id);
 
-    rc = scsi_cmd_data_in(io_base, target_id, (void __far *)&cdb, 10, 
+    rc = scsi_cmd_data_in(io_base, target_id, (void __far *)&cdb, 10,
                           bios_dsk->drqp.buffer, (count * 512L));
 
@@ -220,5 +220,5 @@
  *
  * @returns status code.
- * @param   bios_dsk    Pointer to disk request packet (in the 
+ * @param   bios_dsk    Pointer to disk request packet (in the
  *                      EBDA).
  */
@@ -274,8 +274,8 @@
  *
  * @returns status code.
- * @param   bios_dsk    Pointer to disk request packet (in the 
+ * @param   bios_dsk    Pointer to disk request packet (in the
  *                      EBDA).
  */
-uint16_t scsi_cmd_packet(uint16_t device_id, uint8_t cmdlen, char __far *cmdbuf, 
+uint16_t scsi_cmd_packet(uint16_t device_id, uint8_t cmdlen, char __far *cmdbuf,
                          uint16_t before, uint32_t length, uint8_t inout, char __far *buffer)
 {
@@ -440,6 +440,6 @@
                 }
 
-                /* We need to calculate the geometry for the disk. From 
-                 * the BusLogic driver in the Linux kernel. 
+                /* We need to calculate the geometry for the disk. From
+                 * the BusLogic driver in the Linux kernel.
                  */
                 if (sectors >= (uint32_t)4 * 1024 * 1024)
Index: /trunk/src/VBox/Devices/PC/BIOS/serial.c
===================================================================
--- /trunk/src/VBox/Devices/PC/BIOS/serial.c	(revision 48122)
+++ /trunk/src/VBox/Devices/PC/BIOS/serial.c	(revision 48123)
@@ -50,5 +50,5 @@
 
     int_enable();
-    
+
     addr = read_word(0x0040, (regs.u.r16.dx << 1));
     timeout = read_byte(0x0040, 0x007C + regs.u.r16.dx);
Index: /trunk/src/VBox/Devices/PC/BIOS/timepci.c
===================================================================
--- /trunk/src/VBox/Devices/PC/BIOS/timepci.c	(revision 48122)
+++ /trunk/src/VBox/Devices/PC/BIOS/timepci.c	(revision 48123)
@@ -81,7 +81,7 @@
     // The count I use below guarantees coverage or more than
     // this time, with any reasonable IPS setting.
-    
+
     uint16_t    iter;
-    
+
     iter = 25000;
     while (--iter != 0) {
@@ -103,9 +103,9 @@
     // INT 70h: IRQ 8 - CMOS RTC interrupt from periodic or alarm modes
     uint8_t   registerB = 0, registerC = 0;
-    
+
     // Check which modes are enabled and have occurred.
     registerB = inb_cmos( 0xB );
     registerC = inb_cmos( 0xC );
-    
+
     if( ( registerB & 0x60 ) != 0 ) {
         if( ( registerC & 0x20 ) != 0 ) {
@@ -117,14 +117,14 @@
         if( ( registerC & 0x40 ) != 0 ) {
             // Handle Periodic Interrupt.
-            
+
             if( read_byte( 0x40, 0xA0 ) != 0 ) {
                 // Wait Interval (Int 15, AH=83) active.
                 uint32_t    time;
-                
+
                 time = read_dword( 0x40, 0x9C );  // Time left in microseconds.
                 if( time < 0x3D1 ) {
                     // Done waiting.
                     uint16_t    segment, offset;
-                    
+
                     segment = read_word( 0x40, 0x98 );
                     offset  = read_word( 0x40, 0x9A );
@@ -150,8 +150,8 @@
     uint8_t     val8;
 
-    BX_DEBUG_INT1A("int1a: AX=%04x BX=%04x CX=%04x DX=%04x DS=%04x\n", 
+    BX_DEBUG_INT1A("int1a: AX=%04x BX=%04x CX=%04x DX=%04x DS=%04x\n",
                    regs.u.r16.ax, regs.u.r16.bx, regs.u.r16.cx, regs.u.r16.dx, ds);
-    int_enable();    
-    
+    int_enable();
+
     switch (regs.u.r8.ah) {
     case 0: // get current clock count
@@ -165,5 +165,5 @@
         ClearCF(iret_addr.flags); // OK
         break;
-    
+
     case 1: // Set Current Clock Count
         int_disable();
@@ -175,5 +175,5 @@
         ClearCF(iret_addr.flags); // OK
         break;
-        
+
     case 2: // Read CMOS Time
         if (rtc_updating()) {
@@ -181,5 +181,5 @@
             break;
         }
-        
+
         regs.u.r8.dh = inb_cmos(0x00); // Seconds
         regs.u.r8.cl = inb_cmos(0x02); // Minutes
@@ -190,5 +190,5 @@
         ClearCF(iret_addr.flags); // OK
         break;
-    
+
     case 3: // Set CMOS Time
         // Using a debugger, I notice the following masking/setting
@@ -217,5 +217,5 @@
         ClearCF(iret_addr.flags); // OK
         break;
-    
+
     case 4: // Read CMOS Date
         regs.u.r8.ah = 0;
@@ -231,5 +231,5 @@
         ClearCF(iret_addr.flags); // OK
         break;
-    
+
     case 5: // Set CMOS Date
         // Using a debugger, I notice the following masking/setting
@@ -258,5 +258,5 @@
         ClearCF(iret_addr.flags); // OK
         break;
-    
+
     case 6: // Set Alarm Time in CMOS
         // Using a debugger, I notice the following masking/setting
@@ -289,5 +289,5 @@
         ClearCF(iret_addr.flags); // OK
         break;
-    
+
     case 7: // Turn off Alarm
         // Using a debugger, I notice the following masking/setting
@@ -308,5 +308,5 @@
         ClearCF(iret_addr.flags); // OK
         break;
-    
+
     default:
         BX_DEBUG_INT1A("int1a: AX=%04x unsupported\n", regs.u.r16.ax);
Index: /trunk/src/VBox/Devices/PC/BIOS/vds.c
===================================================================
--- /trunk/src/VBox/Devices/PC/BIOS/vds.c	(revision 48122)
+++ /trunk/src/VBox/Devices/PC/BIOS/vds.c	(revision 48123)
@@ -61,6 +61,6 @@
 
 /*
- * Convert a real mode 16:16 segmented address to a simple 32-bit 
- * linear address. 
+ * Convert a real mode 16:16 segmented address to a simple 32-bit
+ * linear address.
  */
 uint32_t vds_real_to_lin( void __far *ptr )
