Update to ST-LINK_USB_V2_1_Driver

Signed-off-by: Frederic Pillon <frederic.pillon@st.com>
This commit is contained in:
Frederic Pillon 2018-09-20 21:47:10 +02:00 committed by Frederic.Pillon
parent c949572f52
commit 7a4f2c8d1d
14 changed files with 217 additions and 211 deletions

View file

@ -1,74 +1,74 @@
;
; Installs the Virtual COM port interface of ST-Link based composite devices.
;
[Version]
Signature = "$Windows NT$"
Class = Ports
ClassGUID = {4D36E978-E325-11CE-BFC1-08002BE10318}
Provider = %ManufacturerName%
CatalogFile.NTx86 = STLinkVCP_x86.cat
CatalogFile.NTAMD64 = STLinkVCP_x64.cat
DriverVer=12/10/2013,1.0
; ========== Manufacturer/Models sections ===========
[Manufacturer]
%ManufacturerName% = Standard,NTx86,NTamd64
; List of devices supporting the Virtual COM port (with the corresponding interface ID)
[Standard.NTx86]
%DeviceNameVCP% =USB_InstallVCP, USB\VID_0483&PID_374A&MI_02
%DeviceNameVCP% =USB_InstallVCP, USB\VID_0483&PID_374B&MI_02
%DeviceNameVCP% =USB_InstallVCP, USB\VID_0483&PID_374C&MI_01
[Standard.NTamd64]
%DeviceNameVCP% =USB_InstallVCP, USB\VID_0483&PID_374A&MI_02
%DeviceNameVCP% =USB_InstallVCP, USB\VID_0483&PID_374B&MI_02
%DeviceNameVCP% =USB_InstallVCP, USB\VID_0483&PID_374C&MI_01
; ========== Class definition ===========
[ClassInstall32]
AddReg = ClassInstall_AddReg
[ClassInstall_AddReg]
HKR,,,,%ClassName%
HKR,,NoInstallClass,,1
HKR,,IconPath,%REG_MULTI_SZ%,"%systemroot%\system32\setupapi.dll,-20"
HKR,,LowerLogoVersion,,5.2
; =================== Installation ===================
[USB_InstallVCP]
Include = mdmcpq.inf
CopyFiles = FakeModemCopyFileSection
AddReg = USB_InstallVCP.AddReg
[USB_InstallVCP.AddReg]
HKR,,DevLoader,,*ntkern
HKR,,NTMPDriver,,usbser.sys
HKR,,EnumPropPages32,,"MsPorts.dll,SerialPortPropPageProvider"
[USB_InstallVCP.Services]
AddService=usbser, 0x00000002, DriverService
[DriverService]
DisplayName=%DeviceNameVCP%
ServiceType=1
StartType=3
ErrorControl=1
ServiceBinary=%12%\usbser.sys
; [DestinationDirs]
; If your INF needs to copy files, you must not use the DefaultDestDir directive here.
; You must explicitly reference all file-list-section names in this section.
; =================== Strings ===================
[Strings]
ManufacturerName="STMicroelectronics"
ClassName="Universal Serial Bus devices"
DeviceNameVCP="STMicroelectronics STLink Virtual COM Port"
REG_MULTI_SZ = 0x00010000
;
; Installs the Virtual COM port interface of ST-Link based composite devices.
;
[Version]
Signature = "$Windows NT$"
Class = Ports
ClassGUID = {4D36E978-E325-11CE-BFC1-08002BE10318}
Provider = %ManufacturerName%
CatalogFile.NTx86 = STLinkVCP_x86.cat
CatalogFile.NTAMD64 = STLinkVCP_x64.cat
DriverVer=12/10/2013,1.0
; ========== Manufacturer/Models sections ===========
[Manufacturer]
%ManufacturerName% = Standard,NTx86,NTamd64
; List of devices supporting the Virtual COM port (with the corresponding interface ID)
[Standard.NTx86]
%DeviceNameVCP% =USB_InstallVCP, USB\VID_0483&PID_374A&MI_02
%DeviceNameVCP% =USB_InstallVCP, USB\VID_0483&PID_374B&MI_02
%DeviceNameVCP% =USB_InstallVCP, USB\VID_0483&PID_374C&MI_01
[Standard.NTamd64]
%DeviceNameVCP% =USB_InstallVCP, USB\VID_0483&PID_374A&MI_02
%DeviceNameVCP% =USB_InstallVCP, USB\VID_0483&PID_374B&MI_02
%DeviceNameVCP% =USB_InstallVCP, USB\VID_0483&PID_374C&MI_01
; ========== Class definition ===========
[ClassInstall32]
AddReg = ClassInstall_AddReg
[ClassInstall_AddReg]
HKR,,,,%ClassName%
HKR,,NoInstallClass,,1
HKR,,IconPath,%REG_MULTI_SZ%,"%systemroot%\system32\setupapi.dll,-20"
HKR,,LowerLogoVersion,,5.2
; =================== Installation ===================
[USB_InstallVCP]
Include = mdmcpq.inf
CopyFiles = FakeModemCopyFileSection
AddReg = USB_InstallVCP.AddReg
[USB_InstallVCP.AddReg]
HKR,,DevLoader,,*ntkern
HKR,,NTMPDriver,,usbser.sys
HKR,,EnumPropPages32,,"MsPorts.dll,SerialPortPropPageProvider"
[USB_InstallVCP.Services]
AddService=usbser, 0x00000002, DriverService
[DriverService]
DisplayName=%DeviceNameVCP%
ServiceType=1
StartType=3
ErrorControl=1
ServiceBinary=%12%\usbser.sys
; [DestinationDirs]
; If your INF needs to copy files, you must not use the DefaultDestDir directive here.
; You must explicitly reference all file-list-section names in this section.
; =================== Strings ===================
[Strings]
ManufacturerName="STMicroelectronics"
ClassName="Universal Serial Bus devices"
DeviceNameVCP="STMicroelectronics STLink Virtual COM Port"
REG_MULTI_SZ = 0x00010000

View file

@ -1,120 +1,135 @@
;
; Installation INF for the STMicroelectronics STLINK for Windows XP SP2 or later.
;
[Version]
Signature = "$Windows NT$"
Class = STLinkWinUSB
ClassGUID = {88BAE032-5A81-49f0-BC3D-A4FF138216D6}
Provider = %ManufacturerName%
CatalogFile.NTx86 = STLinkDbgWinUSB_x86.cat
CatalogFile.NTAMD64 = STLinkDbgWinUSB_x64.cat
DriverVer=12/10/2013,1.01
; ========== Manufacturer/Models sections ===========
[Manufacturer]
%ManufacturerName% = Standard,NTx86,NTamd64
[Standard.NTx86]
%DeviceName% =USB_Install, USB\VID_0483&PID_3748
%DeviceName% =USB_Install, USB\VID_0483&PID_374A&MI_00
%DeviceName% =USB_Install, USB\VID_0483&PID_374B&MI_00
%DeviceNameRW% =USB_InstallRW, USB\VID_0483&PID_374A&MI_01
[Standard.NTamd64]
%DeviceName% =USB_Install, USB\VID_0483&PID_3748
%DeviceName% =USB_Install, USB\VID_0483&PID_374A&MI_00
%DeviceName% =USB_Install, USB\VID_0483&PID_374B&MI_00
%DeviceNameRW% =USB_InstallRW, USB\VID_0483&PID_374A&MI_01
; ========== Class definition ===========
[ClassInstall32]
AddReg = ClassInstall_AddReg
[ClassInstall_AddReg]
HKR,,,,%ClassName%
HKR,,NoInstallClass,,1
HKR,,IconPath,%REG_MULTI_SZ%,"%systemroot%\system32\setupapi.dll,-20"
HKR,,LowerLogoVersion,,5.2
; =================== Installation ===================
[USB_Install]
Include = winusb.inf
Needs = WINUSB.NT
[USB_InstallRW]
Include = winusb.inf
Needs = WINUSB.NT
[USB_Install.Services]
Include =winusb.inf
Addservice = WinUSB, 0x00000002, WinUSB_ServiceInstall
[USB_InstallRW.Services]
Include =winusb.inf
Addservice = WinUSB, 0x00000002, WinUSB_ServiceInstall
[WinUSB_ServiceInstall]
DisplayName = %WinUSB_SvcDesc%
ServiceType = 1 ; SERVICE_KERNEL_DRIVER
StartType = 3 ; SERVICE_DEMAND_START
ErrorControl = 1 ; SERVICE_ERROR_NORMAL
ServiceBinary = %12%\WinUSB.sys
[USB_Install.Wdf]
KmdfService=WINUSB, WinUsb_Install
[USB_InstallRW.Wdf]
KmdfService=WINUSB, WinUsb_Install
[WinUsb_Install]
KmdfLibraryVersion=1.9
[WinUsb_InstallRW]
KmdfLibraryVersion=1.9
[USB_Install.HW]
AddReg=Dev_AddReg
[USB_InstallRW.HW]
AddReg=Dev_AddRegRW
[Dev_AddReg]
HKR,,DeviceInterfaceGUIDs,0x10000,%STLink_GUID%
[Dev_AddRegRW]
HKR,,DeviceInterfaceGUIDs,0x10000,%STLink_GUID_RW%
[USB_Install.CoInstallers]
AddReg=CoInstallers_AddReg
%11%/WinUSBCoInstaller2.dll
%11%/WdfCoInstaller01009.dll
[USB_InstallRW.CoInstallers]
AddReg=CoInstallers_AddReg
%11%/WinUSBCoInstaller2.dll
%11%/WdfCoInstaller01009.dll
[CoInstallers_AddReg]
HKR,,CoInstallers32,0x00010000,"WdfCoInstaller01009.dll,WdfCoInstaller","WinUSBCoInstaller2.dll"
; [DestinationDirs]
; If your INF needs to copy files, you must not use the DefaultDestDir directive here.
; You must explicitly reference all file-list-section names in this section.
; =================== Strings ===================
[Strings]
ManufacturerName="STMicroelectronics"
ClassName="Universal Serial Bus devices"
DeviceName="STMicroelectronics STLink dongle"
DeviceNameRW="STMicroelectronics STLink dongle RW"
WinUSB_SvcDesc="WinUSB Driver for STLink"
REG_MULTI_SZ = 0x00010000
;------------Replace GUID below with custom GUID-------------;
STLink_GUID="{DBCE1CD9-A320-4b51-A365-A0C3F3C5FB29}"
STLink_GUID_RW="{8326506F-7260-4854-9C03-26E416F04494}"
;
; Installation INF for the STMicroelectronics STLINK for Windows XP SP2 or later.
;
[Version]
Signature = "$Windows NT$"
Class = STLinkWinUSB
ClassGUID = {88BAE032-5A81-49f0-BC3D-A4FF138216D6}
Provider = %ManufacturerName%
CatalogFile.NTx86 = STLinkDbgWinUSB_x86.cat
CatalogFile.NTAMD64 = STLinkDbgWinUSB_x64.cat
DriverVer=01/21/2013,1.01
; ========== Manufacturer/Models sections ===========
[Manufacturer]
%ManufacturerName% = Standard,NTx86,NTamd64
[Standard.NTx86]
%DeviceName% =USB_Install, USB\VID_0483&PID_3748
%DeviceName% =USB_Install, USB\VID_0483&PID_374A&MI_00
%DeviceName% =USB_Install, USB\VID_0483&PID_374B&MI_00
%DeviceNameRW% =USB_InstallRW, USB\VID_0483&PID_374A&MI_01
[Standard.NTamd64]
%DeviceName% =USB_Install, USB\VID_0483&PID_3748
%DeviceName% =USB_Install, USB\VID_0483&PID_374A&MI_00
%DeviceName% =USB_Install, USB\VID_0483&PID_374B&MI_00
%DeviceNameRW% =USB_InstallRW, USB\VID_0483&PID_374A&MI_01
; ========== Class definition ===========
[ClassInstall32]
AddReg = ClassInstall_AddReg
[ClassInstall_AddReg]
HKR,,,,%ClassName%
HKR,,NoInstallClass,,1
HKR,,IconPath,%REG_MULTI_SZ%,"%systemroot%\system32\setupapi.dll,-20"
HKR,,LowerLogoVersion,,5.2
; =================== Installation ===================
[USB_Install]
Include = winusb.inf
Needs = WINUSB.NT
[USB_InstallRW]
Include = winusb.inf
Needs = WINUSB.NT
[USB_Install.Services]
Include =winusb.inf
Addservice = WinUSB, 0x00000002, WinUSB_ServiceInstall
[USB_InstallRW.Services]
Include =winusb.inf
Addservice = WinUSB, 0x00000002, WinUSB_ServiceInstall
[WinUSB_ServiceInstall]
DisplayName = %WinUSB_SvcDesc%
ServiceType = 1 ; SERVICE_KERNEL_DRIVER
StartType = 3 ; SERVICE_DEMAND_START
ErrorControl = 1 ; SERVICE_ERROR_NORMAL
ServiceBinary = %12%\WinUSB.sys
[USB_Install.Wdf]
KmdfService=WINUSB, WinUsb_Install
[USB_InstallRW.Wdf]
KmdfService=WINUSB, WinUsb_Install
[WinUsb_Install]
KmdfLibraryVersion=1.9
[USB_Install.HW]
AddReg=Dev_AddReg
[USB_InstallRW.HW]
AddReg=Dev_AddRegRW
[Dev_AddReg]
HKR,,DeviceInterfaceGUIDs,0x10000,%STLink_GUID%
[Dev_AddRegRW]
HKR,,DeviceInterfaceGUIDs,0x10000,%STLink_GUID_RW%
[USB_Install.CoInstallers]
AddReg=CoInstallers_AddReg
CopyFiles=CoInstallers_CopyFiles
[USB_InstallRW.CoInstallers]
AddReg=CoInstallers_AddReg
CopyFiles=CoInstallers_CopyFiles
[CoInstallers_CopyFiles]
WinUSBCoInstaller2.dll
WdfCoInstaller01009.dll
[CoInstallers_AddReg]
HKR,,CoInstallers32,0x00010000,"WdfCoInstaller01009.dll,WdfCoInstaller","WinUSBCoInstaller2.dll"
[DestinationDirs]
; If your INF needs to copy files, you must not use the DefaultDestDir directive here.
; You must explicitly reference all file-list-section names in this section.
CoInstallers_CopyFiles=11
; ================= Source Media Section =====================
[SourceDisksNames]
1 = %DISK_NAME%,,,\x86
2 = %DISK_NAME%,,,\amd64
[SourceDisksFiles.x86]
WinUSBCoInstaller2.dll=1
WdfCoInstaller01009.dll=1
[SourceDisksFiles.amd64]
WinUSBCoInstaller2.dll=2
WdfCoInstaller01009.dll=2
; =================== Strings ===================
[Strings]
ManufacturerName="STMicroelectronics"
ClassName="Universal Serial Bus devices"
DeviceName="STMicroelectronics STLink dongle"
DeviceNameRW="STMicroelectronics STLink dongle RW"
WinUSB_SvcDesc="WinUSB Driver for STLink"
REG_MULTI_SZ = 0x00010000
DISK_NAME="WinUSB coinstallers sources on disk"
;------------Replace GUID below with custom GUID-------------;
STLink_GUID="{DBCE1CD9-A320-4b51-A365-A0C3F3C5FB29}"
STLink_GUID_RW="{8326506F-7260-4854-9C03-26E416F04494}"

View file

@ -1,8 +1,8 @@
@echo off
if "%PROCESSOR_ARCHITEW6432%" == "AMD64" goto X64
if "%PROCESSOR_ARCHITECTURE%" == "AMD64" goto X64
start "" dpinst_x86.exe
goto END
:X64
start "" dpinst_amd64.exe
:END
@echo off
if "%PROCESSOR_ARCHITEW6432%" == "AMD64" goto X64
if "%PROCESSOR_ARCHITECTURE%" == "AMD64" goto X64
start "" dpinst_x86.exe
goto END
:X64
start "" dpinst_amd64.exe
:END

View file

@ -1,9 +0,0 @@
@echo off
if "%PROCESSOR_ARCHITECTURE%"=="x86" goto X86
dpinst_amd64.exe /u stlink_dbg_winusb.inf
dpinst_amd64.exe /u stlink_VCP.inf
goto END
:X86
dpinst_x86.exe /u stlink_dbg_winusb.inf
dpinst_x86.exe /u stlink_VCP.inf
:END