Changeset 26033 in vbox

Timestamp:

Jan 25, 2010 7:47:02 PM (15 years ago)

Author:

vboxsync

Message:

warnings

File:

• trunk/src/VBox/Additions/x11/vboxvideo/vboxutils_68.c (modified) (5 diffs)

trunk/src/VBox/Additions/x11/vboxvideo/vboxutils_68.c

@@ -333 +333 @@
 vboxInitVbva(int scrnIndex, ScreenPtr pScreen, VBOXPtr pVBox)
 {
-    PCITAG pciTag;
-    ADDRESS pciAddress;
+    PCITAG pciTagDev;
+    ADDRESS pciAddrDev;
     int rc;
 
     /* Locate the device.  It should already have been enabled by
        the kernel driver. */
-    pciTag = pciFindFirst((unsigned) VMMDEV_DEVICEID << 16 | VMMDEV_VENDORID,
-                          (CARD32) ~0);
-    if (pciTag == PCI_NOT_FOUND)
+    pciTagDev = pciFindFirst((unsigned) VMMDEV_DEVICEID << 16 | VMMDEV_VENDORID,
+                             (CARD32) ~0);
+    if (pciTagDev == PCI_NOT_FOUND)
     {
         xf86DrvMsg(scrnIndex, X_ERROR,
@@ -348 +348 @@
     }
     /* Read the address and size of the second I/O region. */
-    pciAddress = pciReadLong(pciTag, PCI_MAP_REG_START + 4);
-    if (pciAddress == 0 || pciAddress == (CARD32) ~0)
+    pciAddrDev = pciReadLong(pciTagDev, PCI_MAP_REG_START + 4);
+    if (pciAddrDev == 0 || pciAddrDev == (CARD32) ~0)
         RETERROR(scrnIndex, FALSE,
                  "The VirtualBox base device contains an invalid memory address.\n");
-    if (PCI_MAP_IS64BITMEM(pciAddress))
+    if (PCI_MAP_IS64BITMEM(pciAddrDev))
         RETERROR(scrnIndex, FALSE,
                  "The VirtualBox base device has a 64bit mapping address.  "
@@ -358 +358 @@
     /* Map it.  We hardcode the size as X does not export the
        function needed to determine it. */
-    pVBox->pVMMDevMemory = xf86MapPciMem(scrnIndex, 0, pciTag, pciAddress,
+    pVBox->pVMMDevMemory = xf86MapPciMem(scrnIndex, 0, pciTagDev, pciAddrDev,
                                          sizeof(VMMDevMemory));
     if (pVBox->pVMMDevMemory == NULL)
@@ -960 +960 @@
  */
 Bool
-vboxGetDisplayChangeRequest(ScrnInfoPtr pScrn, uint32_t *px, uint32_t *py,
-                            uint32_t *pbpp, uint32_t *display)
+vboxGetDisplayChangeRequest(ScrnInfoPtr pScrn, uint32_t *pX, uint32_t *pY,
+                            uint32_t *pBpp, uint32_t *pDisplay)
 {
     int rc, scrnIndex = pScrn->scrnIndex;
@@ -971 +971 @@
     if (RT_SUCCESS(rc))
     {
-        *px = Req.xres;
-        *py = Req.yres;
-        *pbpp = Req.bpp;
-        *display = Req.display;
+        *pX = Req.xres;
+        *pY = Req.yres;
+        *pBpp = Req.bpp;
+        *pDisplay = Req.display;
         return TRUE;
     }