[Spice-commits] 2 commits - display/driver.c display/qxldd.h display/res.c miniport/qxl.c

[Alexander Larsson]

 display/driver.c |    4 ++--
 display/qxldd.h  |    4 ++--
 display/res.c    |   12 ++++++------
 miniport/qxl.c   |    4 ++--
 4 files changed, 12 insertions(+), 12 deletions(-)

New commits:
commit 9e2cc4ccf89ef57ebab4a2150853736bfeeb8e17
Author: Alexander Larsson <alexl at redhat.com>
Date:   Thu Jul 8 15:57:46 2010 +0200

    Use the new PCI id/rev macros

diff --git a/miniport/qxl.c b/miniport/qxl.c
index 9c7e1bc..1718913 100644
--- a/miniport/qxl.c
+++ b/miniport/qxl.c
@@ -323,13 +323,13 @@ VP_STATUS Prob(QXLExtension *dev, VIDEO_PORT_CONFIG_INFO *conf_info,
         return ERROR_INVALID_PARAMETER;
     }
 
-    if (pci_conf.DeviceID != QXL_DEVICE_ID) {
+    if (pci_conf.DeviceID != QXL_DEVICE_ID_DEVEL) {
         DEBUG_PRINT((0,  "%s: bad vendor id 0x%x expectes 0x%x\n",
                      __FUNCTION__, pci_conf.DeviceID, QXL_DEVICE_ID));
         return ERROR_INVALID_PARAMETER;
     }
 
-    if (pci_conf.RevisionID != QXL_REVISION) {
+    if (pci_conf.RevisionID != QXL_REVISION_DEVEL) {
         DEBUG_PRINT((0,  "%s: bad revision 0x%x expectes 0x%x\n",
                      __FUNCTION__, pci_conf.RevisionID, QXL_REVISION));
         return ERROR_INVALID_PARAMETER;
commit 59bf9a11a2fe64e1347e20b7d01e9b6bb22f0b0a
Author: Alexander Larsson <alexl at redhat.com>
Date:   Thu Jul 8 15:57:24 2010 +0200

    Update to the new QXL types (not SpiceXyz)

diff --git a/display/driver.c b/display/driver.c
index 7142374..39d0aa9 100644
--- a/display/driver.c
+++ b/display/driver.c
@@ -634,7 +634,7 @@ BOOL SetHardwareMode(PDev *pdev)
 
 static VOID UpdateMainSlot(PDev *pdev, MemSlot *slot)
 {
-    SPICE_ADDRESS high_bits;
+    QXLPHYSICAL high_bits;
 
 
     pdev->mem_slots[pdev->main_mem_slot].slot = *slot;
@@ -696,7 +696,7 @@ BOOL PrepareHardware(PDev *pdev)
     VIDEO_MEMORY_INFORMATION video_mem_Info;
     DWORD length;
     QXLDriverInfo dev_info;
-    SPICE_ADDRESS high_bits;
+    QXLPHYSICAL high_bits;
 
     DEBUG_PRINT((NULL, 1, "%s: 0x%lx\n", __FUNCTION__, pdev));
 
diff --git a/display/qxldd.h b/display/qxldd.h
index 3ac3139..86438fe 100644
--- a/display/qxldd.h
+++ b/display/qxldd.h
@@ -138,7 +138,7 @@ typedef struct UpdateTrace {
 
 typedef struct PMemSlot {
     MemSlot slot;
-    SPICE_ADDRESS high_bits;
+    QXLPHYSICAL high_bits;
 } PMemSlot;
 
 typedef struct DevResDynamic {
@@ -261,7 +261,7 @@ typedef struct PDev {
     UINT8 *slots_generation;
     UINT64 *ram_slot_start;
     UINT64 *ram_slot_end;
-    SPICE_ADDRESS va_slot_mask;
+    QXLPHYSICAL va_slot_mask;
 
     UINT32 num_io_pages;
     UINT8 *io_pages_virt;
diff --git a/display/res.c b/display/res.c
index f0a9a91..05bc9e6 100644
--- a/display/res.c
+++ b/display/res.c
@@ -1324,7 +1324,7 @@ typedef struct InternalPalette {
     UINT32 refs;
     struct InternalPalette *next;
     RingItem lru_link;
-    SpicePalette palette;
+    QXLPalette palette;
 } InternalPalette;
 
 #define PALETTE_HASH_VAL(unique) ((int)(unique) & PALETTE_HASH_NASKE)
@@ -1413,7 +1413,7 @@ static _inline void PaletteCacheAdd(PDev *pdev, InternalPalette *palette)
 }
 
 
-static _inline void GetPallette(PDev *pdev, SpiceBitmap *bitmap, XLATEOBJ *color_trans)
+static _inline void GetPallette(PDev *pdev, QXLBitmap *bitmap, XLATEOBJ *color_trans)
 {
     InternalPalette *internal;
 
@@ -1612,8 +1612,8 @@ static void FreeBitmapImage(PDev *pdev, Resource *res) // todo: defer
     }
 
     if (internal->image.bitmap.palette) {
-        SpicePalette *palette = (SpicePalette *)VA(pdev, internal->image.bitmap.palette,
-                                                   pdev->main_mem_slot);
+        QXLPalette *palette = (QXLPalette *)VA(pdev, internal->image.bitmap.palette,
+					       pdev->main_mem_slot);
         ReleasePalette(pdev, CONTAINEROF(palette, InternalPalette, palette));
     }
 
@@ -2411,7 +2411,7 @@ static _inline void add_rast_glyphs(PDev *pdev, QXLString *str, ULONG count, GLY
 
     DEBUG_PRINT((pdev, 12, "%s\n", __FUNCTION__));
     for (; glyps < glyps_end; glyps++) {
-        SpiceRasterGlyph *glyph;
+        QXLRasterGlyph *glyph;
         UINT8 *line;
         UINT8 *end_line;
         UINT32 stride;
@@ -2420,7 +2420,7 @@ static _inline void add_rast_glyphs(PDev *pdev, QXLString *str, ULONG count, GLY
             NEW_DATA_CHUNK(&pdev->Res.num_glyphs_pages, PAGE_SIZE);
         }
 
-        glyph = (SpiceRasterGlyph *)now;
+        glyph = (QXLRasterGlyph *)now;
         if (delta) {
             if (*str_pos) {
                 glyph->render_pos.x = (*str_pos)->x + delta->x;