Changeset 48947 in vbox for trunk/src/VBox/Devices/PC

Timestamp:

Oct 7, 2013 9:41:00 PM (11 years ago)

Author:

vboxsync

Message:

Devices: Whitespace and svn:keyword cleanups by scm.

Location:

trunk/src/VBox/Devices/PC

Files:

• BIOS/bios.c (modified) (2 diffs)
• BIOS/eltorito.c (modified) (19 diffs)
• BIOS/floppy.c (modified) (68 diffs)
• BIOS/pcibios.c (modified) (4 diffs)
• BIOS/vds.h (modified) (1 diff)
• DevACPI.cpp (modified) (1 prop)
• DevAPIC.cpp (modified) (1 prop)
• DevDMA.cpp (modified) (3 diffs, 1 prop)
• DevFwCommon.cpp (modified) (1 diff)
• DevHPET.cpp (modified) (1 diff)
• DevIoApic.cpp (modified) (1 prop)
• DevPIC.cpp (modified) (1 prop)
• DevPcArch.cpp (modified) (1 prop)
• DevPcBios.cpp (modified) (1 prop)
• DevPit-i8254.cpp (modified) (1 prop)
• DevRTC.cpp (modified) (1 prop)
• DrvACPI.cpp (modified) (1 prop)

trunk/src/VBox/Devices/PC/BIOS/bios.c

@@ -100 +100 @@
     // interrupt level.
     uint8_t     isrA, isrB, imr, last_int = 0xFF;
-    
+
     outb(PIC_MASTER, PIC_CMD_RD_ISR);           // Read master ISR
     isrA = inb(PIC_MASTER);
@@ -175 +175 @@
 
     /* Avoid using preprocessing directives within macro arguments. */
-    bios_conf = 
+    bios_conf =
 #ifdef __WATCOMC__
     "watcom "

trunk/src/VBox/Devices/PC/BIOS/eltorito.c

@@ -135 +135 @@
 // ---------------------------------------------------------------------------
 
-// !! TODO !! convert EBDA accesses to far pointers 
+// !! TODO !! convert EBDA accesses to far pointers
 
 extern  int     diskette_param_table;
@@ -144 +144 @@
     // @TODO: a macro or a function for getting the EBDA segment
     uint16_t    ebda_seg = read_word(0x0040,0x000E);
-    
+
     // the only important data is this one for now
     write_byte(ebda_seg,(uint16_t)&EbdaData->cdemu.active, 0x00);
@@ -153 +153 @@
     // @TODO: a macro or a function for getting the EBDA segment
     uint16_t    ebda_seg = read_word(0x0040,0x000E);
-    
+
     return read_byte(ebda_seg,(uint16_t)&EbdaData->cdemu.active);
 }
@@ -161 +161 @@
     // @TODO: a macro or a function for getting the EBDA segment
     uint16_t    ebda_seg = read_word(0x0040,0x000E);
-    
+
     return read_byte(ebda_seg,(uint16_t)&EbdaData->cdemu.emulated_drive);
 }
@@ -177 +177 @@
     cdemu = ebda_seg :> &EbdaData->cdemu;
 
-    
+
     BX_DEBUG_INT13_ET("%s: AX=%04x BX=%04x CX=%04x DX=%04x ES=%04x\n", __func__, AX, BX, CX, DX, ES);
     // BX_DEBUG_INT13_ET("%s: SS=%04x DS=%04x ES=%04x DI=%04x SI=%04x\n", __func__, get_SS(), DS, ES, DI, SI);
-    
+
     switch (GET_AH()) {
 
@@ -206 +206 @@
         write_byte(DS,SI+0x11,cdemu->vdevice.spt);
         write_byte(DS,SI+0x12,cdemu->vdevice.heads);
-        
+
         // If we have to terminate emulation
         if(GET_AL() == 0x00) {
@@ -244 +244 @@
 {
     bio_dsk_t __far *bios_dsk;
-    
+
     bios_dsk = read_word(0x0040, 0x000E) :> &EbdaData->bdisk;
-    
+
     if (device >= BX_MAX_STORAGE_DEVICES)
         return 0;
-    
+
 //    if (bios_dsk->devices[device].type != DSK_TYPE_ATAPI)
 //        return 0;
-    
+
     if (bios_dsk->devices[device].device != DSK_DEVICE_CDROM)
         return 0;
-    
+
     return 1;
 }
@@ -390 +390 @@
     cdemu->ilba = lba;
 
-    BX_DEBUG_ELTORITO("Emulate drive %02x, type %02x, LBA %lu\n", 
+    BX_DEBUG_ELTORITO("Emulate drive %02x, type %02x, LBA %lu\n",
                       cdemu->emulated_drive, cdemu->media, cdemu->ilba);
 
@@ -410 +410 @@
         return 13;
 
-    BX_DEBUG_ELTORITO("Emulate drive %02x, type %02x, LBA %lu\n", 
+    BX_DEBUG_ELTORITO("Emulate drive %02x, type %02x, LBA %lu\n",
                       cdemu->emulated_drive, cdemu->media, cdemu->ilba);
     /* Set up emulated drive geometry based on the media type. */
@@ -481 +481 @@
 
     /* at this point, we are emulating a floppy/harddisk */
-    
+
     // Recompute the device number
     device  = cdemu->controller_index * 2;
     device += cdemu->device_spec;
-    
+
     SET_DISK_RET_STATUS(0x00);
-    
+
     /* basic checks : emulation should be active, dl should equal the emulated drive */
     if (!cdemu->active || (cdemu->emulated_drive != GET_DL())) {
@@ -493 +493 @@
         goto int13_fail;
     }
-    
+
     switch (GET_AH()) {
 
@@ -525 +525 @@
         SET_AH(status);
         SET_DISK_RET_STATUS(0);
-        
+
         /* set CF if error status read */
         if (status)
@@ -539 +539 @@
         vheads     = cdemu->vdevice.heads;
         ilba       = cdemu->ilba;
-        
+
         sector    = GET_CL() & 0x003f;
         cylinder  = (GET_CL() & 0x00c0) << 2 | GET_CH();
@@ -553 +553 @@
         if(nbsectors==0)
             goto int13_success;
-        
+
         // sanity checks sco openserver needs this!
         if ((sector   >  vspt)
@@ -560 +560 @@
             goto int13_fail;
         }
-        
+
         // After validating the input, verify does nothing
         if (GET_AH() == 0x04)
             goto int13_success;
-        
+
         segment = ES+(BX / 16);
         offset  = BX % 16;
-        
+
         // calculate the virtual lba inside the image
         vlba=((((uint32_t)cylinder*(uint32_t)vheads)+(uint32_t)head)*(uint32_t)vspt)+((uint32_t)(sector-1));
-        
+
         // In advance so we don't lose the count
         SET_AL(nbsectors);
-        
+
         // start lba on cd
         slba   = (uint32_t)vlba / 4;
         before = (uint32_t)vlba % 4;
-        
+
         // end lba on cd
         elba = (uint32_t)(vlba + nbsectors - 1) / 4;
@@ -603 +603 @@
             goto int13_fail_noah;
         }
-        
+
         goto int13_success;
         break;
@@ -611 +611 @@
         vcylinders = cdemu->vdevice.cylinders - 1;
         vheads     = cdemu->vdevice.heads - 1;
-        
+
         SET_AL( 0x00 );
         SET_BL( 0x00 );
@@ -694 +694 @@
 
     bios_dsk = ebda_seg :> &EbdaData->bdisk;
-    
+
     BX_DEBUG_INT13_CD("%s: AX=%04x BX=%04x CX=%04x DX=%04x ES=%04x\n", __func__, AX, BX, CX, DX, ES);
-    
+
     SET_DISK_RET_STATUS(0x00);
-    
+
     /* basic check : device should be 0xE0+ */
     if( (GET_ELDL() < 0xE0) || (GET_ELDL() >= 0xE0 + BX_MAX_STORAGE_DEVICES) ) {
@@ -704 +704 @@
         goto int13_fail;
     }
-    
+
     // Get the ata channel
     device = bios_dsk->cdidmap[GET_ELDL()-0xE0];
-    
+
     /* basic check : device has to be valid  */
     if (device >= BX_MAX_STORAGE_DEVICES) {

trunk/src/VBox/Devices/PC/BIOS/floppy.c

@@ -125 +125 @@
 {
     uint8_t     val8;
-    
+
     // Reset controller
     val8 = inb(0x03f2);
     outb(0x03f2, val8 & ~0x04);
     outb(0x03f2, val8 | 0x04);
-    
+
     // Wait for controller to come out of reset
     do {
@@ -140 +140 @@
 {
     uint8_t     val8, dor, prev_reset;
-    
+
     // set 40:3e bit 7 to 0
     val8 = read_byte(0x0040, 0x003e);
     val8 &= 0x7f;
     write_byte(0x0040, 0x003e, val8);
-    
+
     // turn on motor of selected drive, DMA & int enabled, normal operation
     prev_reset = inb(0x03f2) & 0x04;
@@ -155 +155 @@
         dor |= drive;
         outb(0x03f2, dor);
-    
+
     // reset the disk motor timeout value of INT 08
     write_byte(0x0040,0x0040, BX_FLOPPY_ON_CNT);
-    
+
     // program data rate
     val8 = read_byte(0x0040, 0x008b);
     val8 >>= 6;
     outb(0x03f7, val8);
-    
+
     // wait for drive readiness
     do {
         val8 = inb(0x3f4);
     } while ( (val8 & 0xc0) != 0x80 );
-    
+
     if (prev_reset == 0) {
 #ifdef VBOX_WITH_FLOPPY_IRQ_POLLING
@@ -190 +190 @@
     uint8_t     val8;
     uint16_t    media_state_offset;
-    
+
     val8 = read_byte(0x0040, 0x003e); // diskette recal status
     if (drive)
@@ -197 +197 @@
     if (val8 == 0)
         return 0;
-    
+
     media_state_offset = 0x0090;
     if (drive)
         media_state_offset += 1;
-    
+
     val8 = read_byte(0x0040, media_state_offset);
     val8 = (val8 >> 4) & 0x01;
     if (val8 == 0)
         return 0;
-    
+
     // checks passed, return KNOWN
     return 1;
@@ -218 +218 @@
     uint8_t     return_status[7];
     int         i;
-    
+
     floppy_prepare_controller(drive);
-    
+
     // send Read ID command (2 bytes) to controller
     outb(0x03f5, 0x4a);  // 4a: Read ID (MFM)
     outb(0x03f5, drive); // 0=drive0, 1=drive1, head always 0
-    
+
 #ifdef VBOX_WITH_FLOPPY_IRQ_POLLING
     // turn on interrupts
     int_enable();
-    
+
     // wait on 40:3e bit 7 to become 1
     do {
         val8 = (read_byte(0x0040, 0x003e) & 0x80);
     } while ( val8 == 0 );
-    
+
     val8 = 0; // separate asm from while() loop
     // turn off interrupts
@@ -240 +240 @@
     floppy_wait_for_interrupt();
 #endif
-    
+
     // read 7 return status bytes from controller
     for (i = 0; i < 7; ++i) {
         return_status[i] = inb(0x3f5);
     }
-    
+
     if ( (return_status[0] & 0xc0) != 0 )
         return 0;
@@ -256 +256 @@
     uint8_t     val8;
     uint16_t    curr_cyl_offset;
-    
+
     floppy_prepare_controller(drive);
-    
+
     // send Recalibrate command (2 bytes) to controller
     outb(0x03f5, 0x07);  // 07: Recalibrate
     outb(0x03f5, drive); // 0=drive0, 1=drive1
-    
+
 #ifdef VBOX_WITH_FLOPPY_IRQ_POLLING
     // turn on interrupts
     int_enable();
-    
+
     // wait on 40:3e bit 7 to become 1
     do {
         val8 = (read_byte(0x0040, 0x003e) & 0x80);
     } while ( val8 == 0 );
-    
+
     val8 = 0; // separate asm from while() loop
     // turn off interrupts
@@ -293 +293 @@
     write_byte(0x0040, 0x003e, val8);
     write_byte(0x0040, curr_cyl_offset, 0); // current cylinder is 0
-    
+
     return 1;
 }
@@ -303 +303 @@
     uint16_t    media_state_offset;
     uint8_t     drive_type, config_data, media_state;
-    
+
     if (floppy_drive_recal(drive) == 0)
         return 0;
-    
+
     // Try the diskette data rates in the following order:
     // 1 Mbps -> 500 Kbps -> 300 Kbps -> 250 Kbps
     // The 1 Mbps rate is only tried for 2.88M drives.
-    
+
     // ** config_data **
     // Bitfields for diskette media control:
@@ -320 +320 @@
     //  3-2  {data rate at start of operation}
     //  1-0  reserved
-    
+
     // ** media_state **
     // Bitfields for diskette drive media state:
@@ -388 +388 @@
         retval = 0;
     }
-    
+
     write_byte(0x0040, 0x008B, config_data);
     while (!floppy_read_id(drive)) {
@@ -408 +408 @@
         write_byte(0x0040, 0x008B, config_data);
     }
-    
+
     if (drive == 0)
         media_state_offset = 0x0090;
@@ -415 +415 @@
     write_byte(0x0040, 0x008B, config_data);
     write_byte(0x0040, media_state_offset, media_state);
-    
+
     return retval;
 }
@@ -423 +423 @@
 {
     uint8_t     drive_type;
-    
+
     // check CMOS to see if drive exists
     // @todo: break out drive type determination
@@ -456 +456 @@
     uint16_t    last_addr;
     int         i;
-    
+
     BX_DEBUG_INT13_FL("%s: AX=%04x BX=%04x CX=%04x DX=%04x ES=%04x\n", __func__, AX, BX, CX, DX, ES);
-    
+
     ah = GET_AH();
-    
+
     switch ( ah ) {
     case 0x00: // diskette controller reset
@@ -483 +483 @@
             return;
         }
-        
+
         // force re-calibration etc.
         write_byte(0x0040, 0x003e, 0);
-        
+
         SET_AH(0);
         set_diskette_ret_status(0);
@@ -492 +492 @@
         set_diskette_current_cyl(drive, 0); // current cylinder
         return;
-    
+
     case 0x01: // Read Diskette Status
         CLEAR_CF();
@@ -501 +501 @@
         }
         return;
-    
+
     case 0x02: // Read Diskette Sectors
     case 0x03: // Write Diskette Sectors
@@ -510 +510 @@
         head        = GET_DH();
         drive       = GET_ELDL();
-        
+
         if ( (drive > 1) || (head > 1) ||
          (num_sectors == 0) || (num_sectors > 72) ) {
@@ -520 +520 @@
             return;
         }
-        
+
         // see if drive exists
         if (floppy_drive_exists(drive) == 0) {
@@ -529 +529 @@
             return;
         }
-        
+
         // see if media in drive, and type is known
         if (floppy_media_known(drive) == 0) {
@@ -540 +540 @@
             }
         }
-        
+
         if (ah == 0x02) {
             // Read Diskette Sectors
-            
+
             //-----------------------------------
             // set up DMA controller for transfer
             //-----------------------------------
-            
+
             // es:bx = pointer to where to place information from diskette
             // port 04: DMA-1 base and current address, channel 2
@@ -561 +561 @@
             }
             base_count = (num_sectors * 512) - 1;
-            
+
             // check for 64K boundary overrun
             last_addr = base_address + base_count;
@@ -571 +571 @@
                 return;
             }
-            
+
             BX_DEBUG_INT13_FL("masking DMA-1 c2\n");
             outb(0x000a, 0x06);
-            
+
             BX_DEBUG_INT13_FL("clear flip-flop\n");
             outb(0x000c, 0x00); // clear flip-flop
@@ -584 +584 @@
             outb(0x0005, base_count>>8);
             BX_DEBUG_INT13_FL("xfer buf at %x:%x\n", page, base_address);
-            
+
             // port 0b: DMA-1 Mode Register
             mode_register = 0x46; // single mode, increment, autoinit disable,
@@ -590 +590 @@
             BX_DEBUG_INT13_FL("setting mode register\n");
             outb(0x000b, mode_register);
-            
+
             BX_DEBUG_INT13_FL("setting page register\n");
             // port 81: DMA-1 Page Register, channel 2
             outb(0x0081, page);
-            
+
             BX_DEBUG_INT13_FL("unmask chan 2\n");
             outb(0x000a, 0x02); // unmask channel 2
-            
+
             BX_DEBUG_INT13_FL("unmasking DMA-1 c2\n");
             outb(0x000a, 0x02);
-            
+
             //--------------------------------------
             // set up floppy controller for transfer
             //--------------------------------------
             floppy_prepare_controller(drive);
-            
+
             // send read-normal-data command (9 bytes) to controller
             outb(0x03f5, 0xe6); // e6: read normal data
@@ -616 +616 @@
             outb(0x03f5, 0); // Gap length
             outb(0x03f5, 0xff); // Gap length
-            
+
 #ifdef VBOX_WITH_FLOPPY_IRQ_POLLING
             // turn on interrupts
             int_enable();
-            
+
             // wait on 40:3e bit 7 to become 1 or timeout (latter isn't armed so it won't happen)
             do {
@@ -634 +634 @@
                 val8 = (read_byte(0x0040, 0x003e) & 0x80);
             } while ( val8 == 0 );
-            
+
             val8 = 0; // separate asm from while() loop
             // turn off interrupts
@@ -655 +655 @@
             }
 #endif
-            
+
             // check port 3f4 for accessibility to status bytes
             val8 = inb(0x3f4);
@@ -666 +666 @@
                 write_byte(0x0040, 0x0042 + i, return_status[i]);
             }
-            
+
             if ( (return_status[0] & 0xc0) != 0 ) {
                 SET_AH(0x20);
@@ -686 +686 @@
         } else if (ah == 0x03) {
             // Write Diskette Sectors
-            
+
             //-----------------------------------
             // set up DMA controller for transfer
             //-----------------------------------
-            
+
             // es:bx = pointer to where to place information from diskette
             // port 04: DMA-1 base and current address, channel 2
@@ -704 +704 @@
             }
             base_count = (num_sectors * 512) - 1;
-            
+
             // check for 64K boundary overrun
             last_addr = base_address + base_count;
@@ -714 +714 @@
                 return;
             }
-            
+
             BX_DEBUG_INT13_FL("masking DMA-1 c2\n");
             outb(0x000a, 0x06);
-            
+
             outb(0x000c, 0x00); // clear flip-flop
             outb(0x0004, base_address);
@@ -725 +725 @@
             outb(0x0005, base_count>>8);
             BX_DEBUG_INT13_FL("xfer buf at %x:%x\n", page, base_address);
-            
+
             // port 0b: DMA-1 Mode Register
             mode_register = 0x4a; // single mode, increment, autoinit disable,
               // transfer type=read, channel 2
             outb(0x000b, mode_register);
-            
+
             // port 81: DMA-1 Page Register, channel 2
             outb(0x0081, page);
-            
+
             BX_DEBUG_INT13_FL("unmasking DMA-1 c2\n");
             outb(0x000a, 0x02);
-            
+
             //--------------------------------------
             // set up floppy controller for transfer
             //--------------------------------------
             floppy_prepare_controller(drive);
-            
+
             // send write-normal-data command (9 bytes) to controller
             outb(0x03f5, 0xc5); // c5: write normal data
@@ -752 +752 @@
             outb(0x03f5, 0); // Gap length
             outb(0x03f5, 0xff); // Gap length
-            
+
 #ifdef VBOX_WITH_FLOPPY_IRQ_POLLING
             // turn on interrupts
             int_enable();
-            
+
             // wait on 40:3e bit 7 to become 1
             do {
@@ -770 +770 @@
                 val8 = (read_byte(0x0040, 0x003e) & 0x80);
             } while ( val8 == 0 );
-            
+
             val8 = 0; // separate asm from while() loop @todo: why??
             // turn off interrupts
@@ -790 +790 @@
             }
 #endif
-            
+
             // check port 3f4 for accessibility to status bytes
             val8 = inb(0x3f4);
             if ( (val8 & 0xc0) != 0xc0 )
                 BX_PANIC("%s: ctrl not ready\n", __func__);
-            
+
             // read 7 return status bytes from controller and store in BDA
             for (i = 0; i < 7; ++i) {
@@ -801 +801 @@
                 write_byte(0x0040, 0x0042 + i, return_status[i]);
             }
-            
+
             if ( (return_status[0] & 0xc0) != 0 ) {
                 if ( (return_status[1] & 0x02) != 0 ) {
@@ -815 +815 @@
                 return;
             }
-            
+
             // ??? should track be new val from return_status[3] ?
             set_diskette_current_cyl(drive, track);
@@ -824 +824 @@
         } else {  // if (ah == 0x04)
             // Verify Diskette Sectors
-            
+
             // ??? should track be new val from return_status[3] ?
             set_diskette_current_cyl(drive, track);
@@ -833 +833 @@
         }
         break;
-    
+
     case 0x05: // format diskette track
         BX_DEBUG_INT13_FL("floppy f05\n");
-        
+
         num_sectors = GET_AL();
         track       = GET_CH();
         head        = GET_DH();
         drive       = GET_ELDL();
-        
+
         if ((drive > 1) || (head > 1) || (track > 79) ||
          (num_sectors == 0) || (num_sectors > 18)) {
@@ -848 +848 @@
             SET_CF(); // error occurred
         }
-        
+
         // see if drive exists
         if (floppy_drive_exists(drive) == 0) {
@@ -856 +856 @@
             return;
         }
-        
+
         // see if media in drive, and type is known
         if (floppy_media_known(drive) == 0) {
@@ -867 +867 @@
             }
         }
-        
+
         // set up DMA controller for transfer
         // @todo: merge/factor out pointer normalization
@@ -879 +879 @@
         }
         base_count = (num_sectors * 4) - 1;
-        
+
         // check for 64K boundary overrun
         last_addr = base_address + base_count;
@@ -889 +889 @@
             return;
         }
-        
+
         outb(0x000a, 0x06);
         outb(0x000c, 0x00); // clear flip-flop
@@ -903 +903 @@
         outb(0x0081, page);
         outb(0x000a, 0x02);
-        
+
         // set up floppy controller for transfer
         floppy_prepare_controller(drive);
-        
+
         // send format-track command (6 bytes) to controller
         outb(0x03f5, 0x4d); // 4d: format track
@@ -918 +918 @@
         // turn on interrupts
         int_enable();
-        
+
         // wait on 40:3e bit 7 to become 1
         do {
@@ -931 +931 @@
             val8 = (read_byte(0x0040, 0x003e) & 0x80);
         } while ( val8 == 0 );
-        
+
         val8 = 0; // separate asm from while() loop
         // turn off interrupts
@@ -955 +955 @@
         if ( (val8 & 0xc0) != 0xc0 )
             BX_PANIC("%s: ctrl not ready\n", __func__);
-        
+
         // read 7 return status bytes from controller and store in BDA
         for (i = 0; i < 7; ++i) {
@@ -961 +961 @@
             write_byte(0x0040, 0x0042 + i, return_status[i]);
         }
-        
+
         if ( (return_status[0] & 0xc0) != 0 ) {
             if ( (return_status[1] & 0x02) != 0 ) {
@@ -974 +974 @@
             }
         }
-        
+
         SET_AH(0);
         set_diskette_ret_status(0);
@@ -980 +980 @@
         CLEAR_CF(); // successful
         return;
-    
-    
+
+
     case 0x08: // read diskette drive parameters
         BX_DEBUG_INT13_FL("floppy f08\n");
         drive = GET_ELDL();
-        
+
         if (drive > 1) {
             AX = 0;
@@ -997 +997 @@
             return;
         }
-        
+
         // @todo: break out drive type determination
         drive_type = inb_cmos(0x10);
@@ -1005 +1005 @@
         if (drive_type & 0x0f)
             num_floppies++;
-        
+
         if (drive == 0)
             drive_type >>= 4;
         else
             drive_type &= 0x0f;
-        
+
         SET_BH(0);
         SET_BL(drive_type);
@@ -1017 +1017 @@
         SET_DL(num_floppies);
         SET_DH(1);      // max head #
-        
+
         switch (drive_type) {
         case 0: // none
@@ -1023 +1023 @@
             SET_DH(0);      // max head #
             break;
-        
+
         case 1: // 360KB, 5.25"
             CX = 0x2709;    // 40 tracks, 9 sectors
             break;
-        
+
         case 2: // 1.2MB, 5.25"
             CX = 0x4f0f;    // 80 tracks, 15 sectors
             break;
-        
+
         case 3: // 720KB, 3.5"
             CX = 0x4f09;    // 80 tracks, 9 sectors
             break;
-        
+
         case 4: // 1.44MB, 3.5"
             CX = 0x4f12;    // 80 tracks, 18 sectors
             break;
-        
+
         case 5: // 2.88MB, 3.5"
             CX = 0x4f24;    // 80 tracks, 36 sectors
             break;
-        
+
         case 14: // 15.6 MB 3.5" (fake)
             CX = 0xfe3f;    // 255 tracks, 63 sectors
@@ -1056 +1056 @@
             BX_PANIC("%s: bad floppy type\n", __func__);
         }
-        
+
         /* set es & di to point to 11 byte diskette param table in ROM */
         ES = 0xF000;    // @todo: any way to make this relocatable?
@@ -1063 +1063 @@
         /* disk status not changed upon success */
         return;
-        
+
     case 0x15: // read diskette drive type
         BX_DEBUG_INT13_FL("floppy f15\n");
@@ -1087 +1087 @@
             SET_AH(1); // drive present, does not support change line
         }
-        
+
         return;
-    
+
     case 0x16: // get diskette change line status
         BX_DEBUG_INT13_FL("floppy f16\n");
@@ -1099 +1099 @@
         return;
         }
-        
+
         SET_AH(0x06); // change line not supported
         set_diskette_ret_status(0x06);
         SET_CF();
         return;
-        
+
     case 0x17: // set diskette type for format(old)
         BX_DEBUG_INT13_FL("floppy f17\n");
@@ -1112 +1112 @@
         SET_CF();
         return;
-    
+
     case 0x18: // set diskette type for format(new)
         BX_DEBUG_INT13_FL("floppy f18\n");
@@ -1119 +1119 @@
         SET_CF();
         return;
-    
+
     default:
         BX_INFO("%s: unsupported AH=%02x\n", __func__, GET_AH());
-    
+
         // if ( (ah==0x20) || ((ah>=0x41) && (ah<=0x49)) || (ah==0x4e) ) {
         SET_AH(0x01); // ???
@@ -1137 +1137 @@
 {
     uint8_t  val8;
-    
+
     switch ( GET_AH() ) {
-    
+
     case 0x01: // Read Diskette Status
         CLEAR_CF();
@@ -1148 +1148 @@
         }
         return;
-    
+
     default:
         SET_CF();
@@ -1162 +1162 @@
 {
     uint8_t     val8, DOR, ctrl_info;
-    
+
     ctrl_info = read_byte(0x0040, 0x008F);
     if (drive==1)
@@ -1188 +1188 @@
     if (val8 != 0x80)
     BX_PANIC("d_f_m: MRQ bit not set\n");
-    
+
     // change line
-    
+
     // existing BDA values
-    
+
     // turn on drive motor
     outb(0x03f2, DOR); // Digital Output Register

trunk/src/VBox/Devices/PC/BIOS/pcibios.c

@@ -80 +80 @@
  * enabled during execution, and that the routines are re-entrant.
  *
- * Implementation notes: 
+ * Implementation notes:
  * - The PCI BIOS interface already uses certain 32-bit registers even in
  * 16-bit mode. To simplify matters, all 32-bit GPRs are saved/restored and
@@ -232 +232 @@
         BX_DEBUG_PCI("PCI: Find class %08lX index %u\n",
                      search_item, index);
-    } else 
-        BX_DEBUG_PCI("PCI: Find device %04X:%04X index %u\n", 
+    } else
+        BX_DEBUG_PCI("PCI: Find device %04X:%04X index %u\n",
                      (uint16_t)search_item, (uint16_t)(search_item >> 16), index);
 
@@ -261 +261 @@
 
         /* If the header type indicates a bus, we're interested. The secondary
-         * and subordinate bus numbers will indicate which buses are present; 
-         * thus we can determine the highest bus number. In the common case, 
+         * and subordinate bus numbers will indicate which buses are present;
+         * thus we can determine the highest bus number. In the common case,
          * there will be only the primary bus (i.e. bus 0) and we can avoid
          * looking at the remaining 255 theoretically present buses. This check
@@ -317 +317 @@
 
     SET_AH(SUCCESSFUL);     /* Assume success. */
-    CLEAR_CF();             
+    CLEAR_CF();
 
     switch (GET_AL()) {

trunk/src/VBox/Devices/PC/BIOS/vds.h

@@ -38 +38 @@
     } u;
 } vds_edds;
-    
+
 
 /* VDS services */

trunk/src/VBox/Devices/PC/DevDMA.cpp

@@ -454 +454 @@
               *pu32, port, DMAPG2CX(reg)));
         return VINF_SUCCESS;
-    } 
+    }
 
     if (cb == 2)
@@ -482 +482 @@
               u32, port, DMAPG2CX(reg)));
     }
-    else if (cb == 2) 
+    else if (cb == 2)
     {
         Assert(!(u32 & ~0xffff)); /* Check for garbage in high bits. */
@@ -567 +567 @@
     /* Set the TC (Terminal Count) bit if transfer was completed. */
     if (ch->u16CurCount == ch->u16BaseCount + 1)
-        switch (opmode) 
+        switch (opmode)
         {
         case DMODE_DEMAND:

trunk/src/VBox/Devices/PC/DevFwCommon.cpp

@@ -811 +811 @@
         pProcessorInf->u8CoreEnabled       = cCpus;
         pProcessorInf->u8ThreadCount       = 1;
-        pProcessorInf->u16ProcessorCharacteristics 
+        pProcessorInf->u16ProcessorCharacteristics
                                            = RT_BIT(2); /* 64-bit capable */
         pProcessorInf->u16ProcessorFamily2 = 0;

trunk/src/VBox/Devices/PC/DevHPET.cpp

@@ -1059 +1059 @@
         if (u64Period) {
             hpetAdjustComparator(pHpetTimer, u64CurTick);
-    
+
             u64Diff = hpetComputeDiff(pHpetTimer, u64CurTick);
-    
+
             Log4(("HPET: periodic: next in %llu\n", hpetTicksToNs(pThis, u64Diff)));
             TMTimerSetNano(pTimer, hpetTicksToNs(pThis, u64Diff));