Changeset 32495 in vbox

Timestamp:

Sep 14, 2010 10:14:42 PM (14 years ago)

Author:

vboxsync

Message:

Additions/x11/vboxvideo: removed some unneeded structure members

Location:

trunk/src/VBox/Additions/x11/vboxvideo

Files:

• vboxvideo.h (modified) (3 diffs)
• vboxvideo_13.c (modified) (4 diffs)
• vboxvideo_70.c (modified) (6 diffs)
• vboxvideo_dri.c (modified) (1 diff)

trunk/src/VBox/Additions/x11/vboxvideo/vboxvideo.h

@@ -185 +185 @@
 typedef struct _VBOXRec
 {
-    vbeInfoPtr pVbe;
+    vbeInfoPtr pVbe;  /** @todo do the VBE bits ourselves? */
     EntityInfoPtr pEnt;
-    VbeInfoBlock *vbeInfo;
 #ifdef PCIACCESS
     struct pci_device *pciInfo;
@@ -195 +194 @@
     PCITAG pciTag;
 #endif
-    CARD16 maxBytesPerScanline;
-    unsigned long mapPhys, mapOff, mapSize;     /* video memory */
-    void *base, *VGAbase;
+    unsigned long mapSize;      /* video memory */
+    void *base;
     CARD8 *state, *pstate;      /* SVGA state */
     int statePage, stateSize, stateMode;
@@ -209 +207 @@
     Bool accessEnabled;
     OptionInfoPtr Options;
-    IOADDRESS ioBase;
-    /** The width of the last resolution set, used to avoid resetting modes */
-    int cLastWidth;
-    /** The height of the last resolution set */
-    int cLastHeight;
-    VMMDevReqMousePointer *reqp;
-    xf86CursorInfoPtr pCurs;
+    VMMDevReqMousePointer *reqp;  /** @todo get rid of this */
     size_t pointerHeaderSize;
     size_t pointerSize;
+    xf86CursorInfoPtr pCurs;
     Bool useDevice;
     Bool forceSWCursor;

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

@@ -866 +866 @@
     unsigned flags;
 
-    if (pVBox->mapPhys == 0) {
+    if (pScrn->memPhysBase == 0) {
 #ifdef PCIACCESS
-        pVBox->mapPhys = pVBox->pciInfo->regions[0].base_addr;
+        pScrn->memPhysBase = pVBox->pciInfo->regions[0].base_addr;
 #else
-        pVBox->mapPhys = pVBox->pciInfo->memBase[0];
+        pScrn->memPhysBase = pVBox->pciInfo->memBase[0];
 #endif
 /*        pVBox->mapSize = 1 << pVBox->pciInfo->size[0]; */
@@ -876 +876 @@
            non-powers-of-two sized video RAM configurations */
         pVBox->mapSize = inl(VBE_DISPI_IOPORT_DATA);
-        pVBox->mapOff = 0;
+        pScrn->fbOffset = 0;
     }
 
@@ -1253 +1253 @@
     if (!pVBox->base)
     {
-        pScrn->memPhysBase = pVBox->mapPhys;
-        pScrn->fbOffset = pVBox->mapOff;
-
 #ifdef PCIACCESS
         (void) pci_device_map_range(pVBox->pciInfo,
@@ -1265 +1262 @@
         pVBox->base = xf86MapPciMem(pScrn->scrnIndex,
                                     VIDMEM_FRAMEBUFFER,
-                                    pVBox->pciTag, pVBox->mapPhys,
+                                    pVBox->pciTag, pScrn->memPhysBase,
                                     (unsigned) pVBox->mapSize);
 #endif

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

@@ -333 +333 @@
 {
     VBOXPtr pVBox = VBOXGetRec(pScrn);
-#if 0
-    xfree(pVBox->vbeInfo);
-#endif
     xfree(pVBox->savedPal);
     xfree(pVBox->fonts);
@@ -672 +669 @@
         return (FALSE);
 
-    if (pVBox->mapPhys == 0) {
+    if (pScrn->memPhysBase == 0) {
 #ifdef PCIACCESS
-        pVBox->mapPhys = pVBox->pciInfo->regions[0].base_addr;
+        pScrn->memPhysBase = pVBox->pciInfo->regions[0].base_addr;
 #else
-        pVBox->mapPhys = pVBox->pciInfo->memBase[0];
+        pScrn->memPhysBase = pVBox->pciInfo->memBase[0];
 #endif
 /*        pVBox->mapSize = 1 << pVBox->pciInfo->size[0]; */
@@ -682 +679 @@
            non-powers-of-two sized video RAM configurations */
         pVBox->mapSize = inl(VBE_DISPI_IOPORT_DATA);
-        pVBox->mapOff = 0;
+        pScrn->fbOffset = 0;
     }
 
@@ -952 +949 @@
     outw(VBE_DISPI_IOPORT_INDEX, VBE_DISPI_INDEX_VIRT_WIDTH);
     outw(VBE_DISPI_IOPORT_DATA, pMode->HDisplay);
-    pVBox->cLastWidth = pMode->HDisplay;
-    pVBox->cLastHeight = pMode->VDisplay;
     vboxEnableGraphicsCap(pVBox);
     TRACE_EXIT();
@@ -1016 +1011 @@
         return (TRUE);
 
-    pScrn->memPhysBase = pVBox->mapPhys;
-    pScrn->fbOffset = pVBox->mapOff;
-
 #ifdef PCIACCESS
     (void) pci_device_map_range(pVBox->pciInfo,
@@ -1028 +1020 @@
     pVBox->base = xf86MapPciMem(pScrn->scrnIndex,
                                 VIDMEM_FRAMEBUFFER,
-                                pVBox->pciTag, pVBox->mapPhys,
+                                pVBox->pciTag, pScrn->memPhysBase,
                                 (unsigned) pVBox->mapSize);
 #endif

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

@@ -255 +255 @@
         pDRIInfo->ddxDrawableTableEntry = VBOX_MAX_DRAWABLES;
         pDRIInfo->maxDrawableTableEntry = VBOX_MAX_DRAWABLES;
-        pDRIInfo->frameBufferPhysicalAddress = (pointer)pVBox->mapPhys;
+        pDRIInfo->frameBufferPhysicalAddress = (pointer)pScrn->memPhysBase;
         pDRIInfo->frameBufferSize = pVBox->mapSize;
         pDRIInfo->frameBufferStride =   pScrn->displayWidth