[Spice-devel,02/12] miniport/qxl.inf: simplify by having FeatureScore for everyone

Submitted by Alon Levy on April 30, 2014, 2:40 p.m.

Details

Message ID 1398868836-15212-3-git-send-email-alevy@redhat.com
State New
Headers show

Not browsing as part of any series.

Commit Message

Alon Levy April 30, 2014, 2:40 p.m.
FeatureScore is the only difference between the _vista options and the
rest, so just setting it also for windows xp using drivers results in a
simplification of the inf file, and no downside.

According to [1] we use a feature score of FC to indicate a windows 2000
display driver

[1]
http://msdn.microsoft.com/en-us/library/windows/hardware/ff569676%28v=vs.85%29.aspx
---
 xddm/miniport/qxl.inf | 19 +++++--------------
 1 file changed, 5 insertions(+), 14 deletions(-)

Patch hide | download patch | download mbox

diff --git a/xddm/miniport/qxl.inf b/xddm/miniport/qxl.inf
index dbd11dd..7144b7d 100644
--- a/xddm/miniport/qxl.inf
+++ b/xddm/miniport/qxl.inf
@@ -3,7 +3,7 @@ 
 
 [Version]
 Signature = "$CHICAGO$"
-DriverVer = 07/17/2013,1.4.2.4
+DriverVer = 07/17/2013,1.4.2.4
 Provider = %RHAT%
 CatalogFile = qxl.cat
 Class = Display
@@ -17,30 +17,27 @@  qxl.Display = 11	; system32
 [Manufacturer]
 %RHAT% = q, NTx86, NTamd64, NTx86.6.0, NTamd64.6.0
 
-; WinXP x86 and up
+; x86
 [q.NTx86]
 %RHAT% %QXL% = qxl, PCI\VEN_1b36&DEV_0100&SUBSYS_11001af4
 
-; WinXP x64 and up
+; x64
 [q.NTamd64]
 %RHAT% %QXL% = qxl, PCI\VEN_1b36&DEV_0100&SUBSYS_11001af4
 
 ; Vista x86 and up
 [q.NTx86.6.0]
-%RHAT% %QXL% = qxl_vista, PCI\VEN_1b36&DEV_0100&SUBSYS_11001af4
+%RHAT% %QXL% = qxl, PCI\VEN_1b36&DEV_0100&SUBSYS_11001af4
 
 ; Vista x64 and up
 [q.NTamd64.6.0]
-%RHAT% %QXL% = qxl_vista, PCI\VEN_1b36&DEV_0100&SUBSYS_11001af4
+%RHAT% %QXL% = qxl, PCI\VEN_1b36&DEV_0100&SUBSYS_11001af4
 
 
 [ControlFlags]
 ExcludeFromSelect = *
 
 [qxl]
-CopyFiles = qxl.Miniport, qxl.Display
-
-[qxl_vista]
 FeatureScore = FC
 CopyFiles = qxl.Miniport, qxl.Display
 
@@ -60,9 +57,6 @@  qxldd.dll = 1
 [qxl.SoftwareSettings]
 AddReg = qxl_SoftwareDeviceSettings
 
-[qxl_vista.SoftwareSettings]
-AddReg = qxl_SoftwareDeviceSettings
-
 [qxl_SoftwareDeviceSettings]
 HKR,, InstalledDisplayDrivers,        %REG_MULTI_SZ%, qxldd
 HKR,, VgaCompatible,                  %REG_DWORD%,    0
@@ -74,9 +68,6 @@  HKR,, Acceleration.Level,             %REG_DWORD%,    0
 [qxl.Services]
 AddService = qxl, 0x00000002, qxl_Service_Inst ; Assign the named service as the PnP function driver
 
-[qxl_vista.Services]
-AddService = qxl, 0x00000002, qxl_Service_Inst ; Assign the named service as the PnP function driver
-
 [qxl_Service_Inst]
 ServiceType    = 1                  ; SERVICE_KERNEL_DRIVER
 StartType      = 3                  ; SERVICE_DEMAND_START

Comments

I forgot to mention in the cover letter: I fixed the comment here per
old review by Yonit.

Review appreciated!

On 04/30/2014 05:40 PM, Alon Levy wrote:
> FeatureScore is the only difference between the _vista options and the
> rest, so just setting it also for windows xp using drivers results in a
> simplification of the inf file, and no downside.
> 
> According to [1] we use a feature score of FC to indicate a windows 2000
> display driver
> 
> [1]
> http://msdn.microsoft.com/en-us/library/windows/hardware/ff569676%28v=vs.85%29.aspx
> ---
>  xddm/miniport/qxl.inf | 19 +++++--------------
>  1 file changed, 5 insertions(+), 14 deletions(-)
> 
> diff --git a/xddm/miniport/qxl.inf b/xddm/miniport/qxl.inf
> index dbd11dd..7144b7d 100644
> --- a/xddm/miniport/qxl.inf
> +++ b/xddm/miniport/qxl.inf
> @@ -3,7 +3,7 @@
>  
>  [Version]
>  Signature = "$CHICAGO$"
> -DriverVer = 07/17/2013,1.4.2.4
> +DriverVer = 07/17/2013,1.4.2.4
>  Provider = %RHAT%
>  CatalogFile = qxl.cat
>  Class = Display
> @@ -17,30 +17,27 @@ qxl.Display = 11	; system32
>  [Manufacturer]
>  %RHAT% = q, NTx86, NTamd64, NTx86.6.0, NTamd64.6.0
>  
> -; WinXP x86 and up
> +; x86
>  [q.NTx86]
>  %RHAT% %QXL% = qxl, PCI\VEN_1b36&DEV_0100&SUBSYS_11001af4
>  
> -; WinXP x64 and up
> +; x64
>  [q.NTamd64]
>  %RHAT% %QXL% = qxl, PCI\VEN_1b36&DEV_0100&SUBSYS_11001af4
>  
>  ; Vista x86 and up
>  [q.NTx86.6.0]
> -%RHAT% %QXL% = qxl_vista, PCI\VEN_1b36&DEV_0100&SUBSYS_11001af4
> +%RHAT% %QXL% = qxl, PCI\VEN_1b36&DEV_0100&SUBSYS_11001af4
>  
>  ; Vista x64 and up
>  [q.NTamd64.6.0]
> -%RHAT% %QXL% = qxl_vista, PCI\VEN_1b36&DEV_0100&SUBSYS_11001af4
> +%RHAT% %QXL% = qxl, PCI\VEN_1b36&DEV_0100&SUBSYS_11001af4
>  
>  
>  [ControlFlags]
>  ExcludeFromSelect = *
>  
>  [qxl]
> -CopyFiles = qxl.Miniport, qxl.Display
> -
> -[qxl_vista]
>  FeatureScore = FC
>  CopyFiles = qxl.Miniport, qxl.Display
>  
> @@ -60,9 +57,6 @@ qxldd.dll = 1
>  [qxl.SoftwareSettings]
>  AddReg = qxl_SoftwareDeviceSettings
>  
> -[qxl_vista.SoftwareSettings]
> -AddReg = qxl_SoftwareDeviceSettings
> -
>  [qxl_SoftwareDeviceSettings]
>  HKR,, InstalledDisplayDrivers,        %REG_MULTI_SZ%, qxldd
>  HKR,, VgaCompatible,                  %REG_DWORD%,    0
> @@ -74,9 +68,6 @@ HKR,, Acceleration.Level,             %REG_DWORD%,    0
>  [qxl.Services]
>  AddService = qxl, 0x00000002, qxl_Service_Inst ; Assign the named service as the PnP function driver
>  
> -[qxl_vista.Services]
> -AddService = qxl, 0x00000002, qxl_Service_Inst ; Assign the named service as the PnP function driver
> -
>  [qxl_Service_Inst]
>  ServiceType    = 1                  ; SERVICE_KERNEL_DRIVER
>  StartType      = 3                  ; SERVICE_DEMAND_START
>