Changeset 65847 in vbox for trunk/src/VBox/Devices

Timestamp:

Feb 23, 2017 8:49:49 AM (8 years ago)

Author:

vboxsync

Message:

Devices/Bus: use symbolic constant for _4K

Location:

trunk/src/VBox/Devices/Bus

Files:

• DevPCI.cpp (modified) (2 diffs)
• DevPciIch9.cpp (modified) (4 diffs)

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

@@ -615 +615 @@
                  * through the bridge but we want to be compliant to the spec.
                  */
-                if ((pGlobals->uPciBiosIo % 4*_1K) != 0)
-                    pGlobals->uPciBiosIo = RT_ALIGN_32(pGlobals->uPciBiosIo, 4*_1K);
+                if ((pGlobals->uPciBiosIo % _4K) != 0)
+                    pGlobals->uPciBiosIo = RT_ALIGN_32(pGlobals->uPciBiosIo, _4K);
                 Log(("%s: Aligned I/O start address. New address %#x\n", __FUNCTION__, pGlobals->uPciBiosIo));
                 pci_config_writeb(pGlobals, uBus, uDevFn, VBOX_PCI_IO_BASE, (pGlobals->uPciBiosIo >> 8) & 0xf0);
@@ -643 +643 @@
                  * interface. Again this doesn't really matter here but we want to be compliant to the spec.
                  */
-                if ((u32IoAddressBase != pGlobals->uPciBiosIo) && ((pGlobals->uPciBiosIo % 4*_1K) != 0))
+                if ((u32IoAddressBase != pGlobals->uPciBiosIo) && ((pGlobals->uPciBiosIo % _4K) != 0))
                 {
                     /* The upper boundary must be one byte less than a 4KB boundary. */
-                    pGlobals->uPciBiosIo = RT_ALIGN_32(pGlobals->uPciBiosIo, 4*_1K);
+                    pGlobals->uPciBiosIo = RT_ALIGN_32(pGlobals->uPciBiosIo, _4K);
                 }
                 pci_config_writeb(pGlobals, uBus, uDevFn, VBOX_PCI_IO_LIMIT, ((pGlobals->uPciBiosIo >> 8) & 0xf0) - 1);

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

@@ -1567 +1567 @@
      * through the bridge but we want to be compliant to the spec.
      */
-    if ((pPciRoot->uPciBiosIo % 4*_1K) != 0)
-    {
-        pPciRoot->uPciBiosIo = RT_ALIGN_32(pPciRoot->uPciBiosIo, 4*_1K);
+    if ((pPciRoot->uPciBiosIo % _4K) != 0)
+    {
+        pPciRoot->uPciBiosIo = RT_ALIGN_32(pPciRoot->uPciBiosIo, _4K);
         Log(("%s: Aligned I/O start address. New address %#x\n", __FUNCTION__, pPciRoot->uPciBiosIo));
     }
@@ -1597 +1597 @@
     {
         /* Need again alignment to a 4KB boundary. */
-        pPciRoot->uPciBiosIo = RT_ALIGN_32(pPciRoot->uPciBiosIo, 4*_1K);
+        pPciRoot->uPciBiosIo = RT_ALIGN_32(pPciRoot->uPciBiosIo, _4K);
         ich9pciBiosInitWriteConfig(pPciRoot, uBus, uDevFn, VBOX_PCI_IO_LIMIT, ((pPciRoot->uPciBiosIo - 1) >> 8) & 0xf0, 1);
     }
@@ -2287 +2287 @@
     else
     {
-        if (uAddress + cb < 4*_1K)
+        if (uAddress + cb < _4K)
             LogRel(("PCI: %8s/%u: Read from extended register %d fallen back to generic code\n",
                     pPciDev->pszNameR3, pPciDev->Int.s.CTX_SUFF(pDevIns)->iInstance, uAddress));
@@ -2703 +2703 @@
         }
     }
-    else if (uAddress + cb <= 4*_1K)
+    else if (uAddress + cb <= _4K)
         LogRel(("PCI: %8s/%u: Write to extended register %d fallen back to generic code\n",
                 pPciDev->pszNameR3, pPciDev->Int.s.CTX_SUFF(pDevIns)->iInstance, uAddress));