Changeset 7045 in vbox

Timestamp:

Feb 20, 2008 3:30:19 PM (17 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

28279

Message:

Realigning after RTGCPHYS change.

Location:

trunk/src/VBox/Devices

Files:

• Bus/DevPCI.cpp (modified) (7 diffs)
• Graphics/DevVGA.h (modified) (1 diff)

trunk/src/VBox/Devices/Bus/DevPCI.cpp

@@ -114 +114 @@
     /** The next MMIO address which the PCI BIOS will use. */
     uint32_t            pci_bios_mem_addr;
+    uint32_t            u32Padding; /**< Alignment padding. */
+
     /** I/O APIC usage flag */
     bool                fUseIoApic;
@@ -286 +288 @@
 #else /* less strict check */
                         AssertMsg(VBOX_SUCCESS(rc) || rc == VERR_IOM_MMIO_RANGE_NOT_FOUND, ("rc=%Vrc d=%s\n", rc, d->name)); NOREF(rc);
-#endif 
+#endif
                     }
                 }
@@ -772 +774 @@
     {
     case 0x0101:
-        if (vendor_id == 0x8086 && 
+        if (vendor_id == 0x8086 &&
             (device_id == 0x7010 || device_id == 0x7111)) {
             /* PIIX3 or PIIX4 IDE */
@@ -1083 +1085 @@
             if (pData->devices[i])
             {
-                LogRel(("New device in slot %#x, %s (vendor=%#06x device=%#06x)\n", i, pData->devices[i]->name, 
+                LogRel(("New device in slot %#x, %s (vendor=%#06x device=%#06x)\n", i, pData->devices[i]->name,
                         PCIDevGetVendorId(pData->devices[i]), PCIDevGetDeviceId(pData->devices[i])));
                 if (SSMR3HandleGetAfter(pSSMHandle) != SSMAFTER_DEBUG_IT)
@@ -1100 +1102 @@
         if (!pDev)
         {
-            LogRel(("Device in slot %#x has been removed! vendor=%#06x device=%#06x\n", i, 
+            LogRel(("Device in slot %#x has been removed! vendor=%#06x device=%#06x\n", i,
                     PCIDevGetVendorId(&DevTmp), PCIDevGetDeviceId(&DevTmp)));
             if (SSMR3HandleGetAfter(pSSMHandle) != SSMAFTER_DEBUG_IT)
@@ -1118 +1120 @@
         /* commit the loaded device config. */
         memcpy(pDev->config, DevTmp.config, sizeof(pDev->config));
-        if (DevTmp.Int.s.iIrq >= PCI_DEVICES_MAX) 
+        if (DevTmp.Int.s.iIrq >= PCI_DEVICES_MAX)
         {
             LogRel(("Device %s: Too many devices %d (max=%d)\n", pDev->name, DevTmp.Int.s.iIrq, PCI_DEVICES_MAX));
@@ -1326 +1328 @@
 
 
-/** 
+/**
  * @copydoc PDMPCIBUSREG::pfnSetConfigCallbacksHC
  */
-static DECLCALLBACK(void) pciSetConfigCallbacks(PPDMDEVINS pDevIns, PPCIDEVICE pPciDev, PFNPCICONFIGREAD pfnRead, PPFNPCICONFIGREAD ppfnReadOld, 
+static DECLCALLBACK(void) pciSetConfigCallbacks(PPDMDEVINS pDevIns, PPCIDEVICE pPciDev, PFNPCICONFIGREAD pfnRead, PPFNPCICONFIGREAD ppfnReadOld,
                                                 PFNPCICONFIGWRITE pfnWrite, PPFNPCICONFIGWRITE ppfnWriteOld)
 {

trunk/src/VBox/Devices/Graphics/DevVGA.h

@@ -244 +244 @@
     /** end-of-common-state-marker */
     uint32_t                    u32Marker;
+    /** Pointer to GC vram mapping. */
+    GCPTRTYPE(uint8_t *)        vram_ptrGC;
     /** The physical address the VRAM was assigned. */
     RTGCPHYS                    GCPhysVRAM;
-    /** Pointer to GC vram mapping. */
-    GCPTRTYPE(uint8_t *)        vram_ptrGC;
-/** @todo r=bird: bool not RTUINT (my fault I guess). */
     /** LFB was updated flag. */
-    RTUINT                      fLFBUpdated;
+    bool                        fLFBUpdated;
     /** Indicates if the GC extensions are enabled or not. */
-    RTUINT                      fGCEnabled;
+    bool                        fGCEnabled;
     /** Indicates if the R0 extensions are enabled or not. */
-    RTUINT                      fR0Enabled;
+    bool                        fR0Enabled;
+    /** Flag indicating that there are dirty bits. This is used to optimize the handler resetting. */
+    bool                        fHaveDirtyBits;
     /** Pointer to vgaGCLFBAccessHandler(). */
     RTGCPTR                     GCPtrLFBHandler;
-    /** Flag indicating that there are dirty bits. This is used to optimize the handler resetting. */
-    bool                        fHaveDirtyBits;
     /** Bitmap tracking dirty pages. */
     uint32_t                    au32DirtyBitmap[VGA_VRAM_MAX / PAGE_SIZE / 32];