X-Git-Url: https://git.piment-noir.org/?a=blobdiff_plain;f=driver%2Fp8usb-cec.inf;h=f196ddf8c7f7c94bf7d5347de6a57318d4b9480a;hb=4f5046734389cc554448da5cee93970f3091348b;hp=1731e8dc26f40242834e06550fc9f86ef7abe5e6;hpb=d749efb2d01817c0a8ad8b32a1b9861c5a78c83d;p=deb_libcec.git

diff --git a/driver/p8usb-cec.inf b/driver/p8usb-cec.inf
index 1731e8d..f196ddf 100644
--- a/driver/p8usb-cec.inf
+++ b/driver/p8usb-cec.inf
@@ -1,4 +1,4 @@
-; Copyright (c) 2011 Pulse-Eight Limited
+; Copyright (c) 2012 Pulse-Eight Limited
 
 [Version]
 Signature="$Windows NT$"
@@ -7,12 +7,13 @@ ClassGuid={4D36E978-E325-11CE-BFC1-08002BE10318}
 Provider=%MFGNAME%
 LayoutFile=layout.inf
 CatalogFile=%MFGFILENAME%.cat
-DriverVer=07/04/2011,1.0.0.0
+DriverVer=08/29/2012,1.1.0.0
 
 [Manufacturer]
 %MFGNAME%=DeviceList, NTamd64
 
 [DestinationDirs]
+FakeModemCopyFileSection=12
 DefaultDestDir=12
 
 
@@ -21,67 +22,68 @@ DefaultDestDir=12
 ;------------------------------------------------------------------------------
 
 [DriverInstall.nt]
-include=mdmcpq.inf
-CopyFiles=DriverCopyFiles.nt
-AddReg=DriverInstall.nt.AddReg
-
-[DriverCopyFiles.nt]
-usbser.sys,,,0x20
+include   = mdmcpq.inf
+CopyFiles = FakeModemCopyFileSection
+AddReg    = DriverInstall.nt.AddReg
 
 [DriverInstall.nt.AddReg]
 HKR,,DevLoader,,*ntkern
 HKR,,NTMPDriver,,%DRIVERFILENAME%.sys
 HKR,,EnumPropPages32,,"MsPorts.dll,SerialPortPropPageProvider"
+HKR,,PortSubClass,1,01
 
 [DriverInstall.nt.Services]
-AddService=usbser, 0x00000002, DriverService.nt
+AddService = usbser, 0x00000002, DriverService.nt
 
 [DriverService.nt]
-DisplayName=%SERVICE%
-ServiceType=1
-StartType=3
-ErrorControl=1
-ServiceBinary=%12%\%DRIVERFILENAME%.sys
+DisplayName   = %SERVICE%
+ServiceType   = 1 ; SERVICE_KERNEL_DRIVER
+StartType     = 3 ; SERVICE_DEMAND_START
+ErrorControl  = 1 ; SERVICE_ERROR_NORMAL
+ServiceBinary = %12%\%DRIVERFILENAME%.sys
+LoadOrderGroup = Base
 
 ;------------------------------------------------------------------------------
 ;  Vista-64bit Sections
 ;------------------------------------------------------------------------------
 
 [DriverInstall.NTamd64]
-include=mdmcpq.inf
-CopyFiles=DriverCopyFiles.NTamd64
-AddReg=DriverInstall.NTamd64.AddReg
-
-[DriverCopyFiles.NTamd64]
-%DRIVERFILENAME%.sys,,,0x20
+include   = mdmcpq.inf
+CopyFiles = FakeModemCopyFileSection
+AddReg    = DriverInstall.NTamd64.AddReg
 
 [DriverInstall.NTamd64.AddReg]
 HKR,,DevLoader,,*ntkern
 HKR,,NTMPDriver,,%DRIVERFILENAME%.sys
 HKR,,EnumPropPages32,,"MsPorts.dll,SerialPortPropPageProvider"
+HKR,,PortSubClass,1,01
 
 [DriverInstall.NTamd64.Services]
-AddService=usbser, 0x00000002, DriverService.NTamd64
+AddService = usbser, 0x00000002, DriverService.NTamd64
 
 [DriverService.NTamd64]
-DisplayName=%SERVICE%
-ServiceType=1
-StartType=3
-ErrorControl=1
-ServiceBinary=%12%\%DRIVERFILENAME%.sys
+DisplayName    = %SERVICE%
+ServiceType    = 1 ; SERVICE_KERNEL_DRIVER
+StartType      = 3 ; SERVICE_DEMAND_START
+ErrorControl   = 1 ; SERVICE_ERROR_NORMAL
+ServiceBinary  = %12%\%DRIVERFILENAME%.sys
+LoadOrderGroup = Base
 
 [SourceDisksFiles]
 [SourceDisksNames]
 [DeviceList]
-%DESCRIPTION%=DriverInstall, USB\VID_2548&PID_1001
+%DESCRIPTION2% = DriverInstall, USB\VID_2548&PID_1002&MI_00
+%DESCRIPTION%  = DriverInstall, USB\VID_2548&PID_1001
 
 [DeviceList.NTamd64]
-%DESCRIPTION%=DriverInstall, USB\VID_2548&PID_1001
+%DESCRIPTION2% = DriverInstall, USB\VID_2548&PID_1002&MI_00
+%DESCRIPTION%  = DriverInstall, USB\VID_2548&PID_1001
 
 [Strings]
-MFGFILENAME="p8usb-cec"
-DRIVERFILENAME ="usbser"
-MFGNAME="Pulse-Eight Limited"
-INSTDISK="Pulse-Eight USB-CEC Installation Disc"
-DESCRIPTION="Pulse-Eight USB to HDMI CEC Adapter"
-SERVICE="USB to HDMI-CEC"
+MFGFILENAME    = "p8usb-cec"
+DRIVERFILENAME = "usbser"
+MFGNAME        = "Pulse-Eight Limited"
+INSTDISK       = "Pulse-Eight USB-CEC Installation Disc"
+DESCRIPTION    = "Pulse-Eight USB to HDMI CEC Adapter"
+DESCRIPTION2   = "Pulse-Eight USB to HDMI CEC Adapter (rev.2)"
+SERVICE        = "USB to HDMI-CEC"