[Spice-commits] 2 commits - miniport/qxl.c miniport/qxl.inf

[Alexander Larsson]

 miniport/qxl.c   |   10 +++++-----
 miniport/qxl.inf |    4 ++--
 2 files changed, 7 insertions(+), 7 deletions(-)

New commits:
commit c9b52dee58f4aea03681c8ec9c84612022accfcd
Author: Alexander Larsson <alexl at redhat.com>
Date:   Tue Jul 20 17:38:31 2010 +0200

    Update date in inf file

diff --git a/miniport/qxl.inf b/miniport/qxl.inf
index 3840284..8c5a958 100644
--- a/miniport/qxl.inf
+++ b/miniport/qxl.inf
@@ -3,7 +3,7 @@
 
 [Version]
 Signature = "$CHICAGO$"
-DriverVer = 04/26/2010,1.3.0.0 
+DriverVer = 07/20/2010,1.3.0.0 
 Provider = %RHAT%
 Class = Display
 ClassGUID = {4d36e968-e325-11ce-bfc1-08002be10318}
commit a65e9471848c4254e159481bbd09d09d58ee3d8e
Author: Alexander Larsson <alexl at redhat.com>
Date:   Tue Jul 20 17:33:10 2010 +0200

    Update PCI data to stable v0.6 id/rev
    
    Also adds the subsystem id to the inf file

diff --git a/miniport/qxl.c b/miniport/qxl.c
index 1718913..348758a 100644
--- a/miniport/qxl.c
+++ b/miniport/qxl.c
@@ -323,15 +323,15 @@ VP_STATUS Prob(QXLExtension *dev, VIDEO_PORT_CONFIG_INFO *conf_info,
         return ERROR_INVALID_PARAMETER;
     }
 
-    if (pci_conf.DeviceID != QXL_DEVICE_ID_DEVEL) {
+    if (pci_conf.DeviceID != QXL_DEVICE_ID_STABLE) {
         DEBUG_PRINT((0,  "%s: bad vendor id 0x%x expectes 0x%x\n",
-                     __FUNCTION__, pci_conf.DeviceID, QXL_DEVICE_ID));
+                     __FUNCTION__, pci_conf.DeviceID, QXL_DEVICE_ID_STABLE));
         return ERROR_INVALID_PARAMETER;
     }
 
-    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));
+    if (pci_conf.RevisionID < QXL_REVISION_STABLE_V06) {
+        DEBUG_PRINT((0,  "%s: bad revision 0x%x expectes at least 0x%x\n",
+                     __FUNCTION__, pci_conf.RevisionID, QXL_REVISION_STABLE_V06));
         return ERROR_INVALID_PARAMETER;
     }
 
diff --git a/miniport/qxl.inf b/miniport/qxl.inf
index 6c87704..3840284 100644
--- a/miniport/qxl.inf
+++ b/miniport/qxl.inf
@@ -17,7 +17,7 @@ qxl.Display = 11		; system32
 %RHAT% = q.Mfg
 
 [q.Mfg]
-%RHAT% %QXL% = qxl, PCI\VEN_1b36&DEV_01ff
+%RHAT% %QXL% = qxl, PCI\VEN_1b36&DEV_0100&SUBSYS_11001af4&REV_02
 
 [ControlFlags]
 ExcludeFromSelect = *