Changeset 37423 in vbox for trunk/src/VBox/Devices/PC/DevDMA.cpp

Timestamp:

Jun 12, 2011 6:37:56 PM (13 years ago)

Author:

vboxsync

Message:

Ran the source code massager (scm).

File:

• trunk/src/VBox/Devices/PC/DevDMA.cpp (modified) (11 diffs)

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

@@ -71 +71 @@
  * left by one, including the control registers addresses. The DMA register
  * offsets (except for the page registers) are therefore "double spaced".
- * 
+ *
  * Due to the address shifting, the DMA controller decodes more addresses
  * than are usually documented, with aliasing. See the ICH8 datasheet.
@@ -418 +418 @@
         return VINF_SUCCESS;
     }
-    else 
+    else
         return VERR_IOM_IOPORT_UNUSED;
 }
 
-/* DMA page registers. There are 16 R/W page registers for compatibility with 
+/* DMA page registers. There are 16 R/W page registers for compatibility with
  * the IBM PC/AT; only some of those registers are used for DMA. The page register
  * accessible via port 80h may be read to insert small delays or used as a scratch
@@ -430 +430 @@
                                      uint32_t *pu32, unsigned cb)
 {
-    if (cb == 1) 
+    if (cb == 1)
     {
         DMAControl  *dc = (DMAControl *)pvUser;
@@ -437 +437 @@
         reg   = port & 7;
         *pu32 = dc->au8Page[reg];
-        Log2(("Read %#x to from page register %#x (channel %d)\n", 
+        Log2(("Read %#x to from page register %#x (channel %d)\n",
               *pu32, port, DMAPG2CX(reg)));
         return VINF_SUCCESS;
@@ -475 +475 @@
                                        uint32_t *pu32, unsigned cb)
 {
-    if (cb == 1) 
+    if (cb == 1)
     {
         DMAControl  *dc = (DMAControl *)pvUser;
@@ -482 +482 @@
         reg   = port & 7;
         *pu32 = dc->au8PageHi[reg];
-        Log2(("Read %#x to from high page register %#x (channel %d)\n", 
+        Log2(("Read %#x to from high page register %#x (channel %d)\n",
               *pu32, port, DMAPG2CX(reg)));
         return VINF_SUCCESS;
@@ -501 +501 @@
         reg = port & 7;
         dc->au8PageHi[reg] = u32;
-        Log2(("Wrote %#x to high page register %#x (channel %d)\n", 
+        Log2(("Wrote %#x to high page register %#x (channel %d)\n",
               u32, port, DMAPG2CX(reg)));
     }
@@ -563 +563 @@
                         PFNDMATRANSFERHANDLER handler, void *pvUser)
 {
-    DMAState    *s = PDMINS_2_DATA(pDevIns, DMAState *);    
+    DMAState    *s = PDMINS_2_DATA(pDevIns, DMAState *);
     DMAChannel  *ch = &s->DMAC[DMACH2C(channel)].ChState[channel & 3];
 
@@ -682 +682 @@
 
     chidx  = channel & 3;
-    if (level) 
+    if (level)
         dc->u8Status |= 1 << (chidx + 4);
     else
@@ -764 +764 @@
 
     /* ...and all four of its channels. */
-    for (chidx = 0; chidx < 4; ++chidx) 
+    for (chidx = 0; chidx < 4; ++chidx)
     {
         DMAChannel  *ch = &dc->ChState[chidx];
@@ -796 +796 @@
     }
 
-    for (chidx = 0; chidx < 4; ++chidx) 
+    for (chidx = 0; chidx < 4; ++chidx)
     {
         DMAChannel  *ch = &dc->ChState[chidx];