Update to ST-LINK_USB_V2_1_Driver

Signed-off-by: Frederic Pillon <frederic.pillon@st.com>

win/stlink/ST-LINK_USB_V2_1_Driver/stlink_dbg_winusb.inf

@@ -9,7 +9,7 @@ ClassGUID = {88BAE032-5A81-49f0-BC3D-A4FF138216D6}
 Provider  = %ManufacturerName%
 CatalogFile.NTx86  = STLinkDbgWinUSB_x86.cat
 CatalogFile.NTAMD64 = STLinkDbgWinUSB_x64.cat
-DriverVer=12/10/2013,1.01
+DriverVer=01/21/2013,1.01
 
 ; ========== Manufacturer/Models sections ===========
 
@@ -73,9 +73,6 @@ KmdfService=WINUSB, WinUsb_Install
 [WinUsb_Install]
 KmdfLibraryVersion=1.9
 
-[WinUsb_InstallRW]
-KmdfLibraryVersion=1.9
-
 [USB_Install.HW]
 AddReg=Dev_AddReg
 
@@ -90,20 +87,37 @@ HKR,,DeviceInterfaceGUIDs,0x10000,%STLink_GUID_RW%
 
 [USB_Install.CoInstallers]
 AddReg=CoInstallers_AddReg
-%11%/WinUSBCoInstaller2.dll
+CopyFiles=CoInstallers_CopyFiles
-%11%/WdfCoInstaller01009.dll
 
 [USB_InstallRW.CoInstallers]
 AddReg=CoInstallers_AddReg
-%11%/WinUSBCoInstaller2.dll
+CopyFiles=CoInstallers_CopyFiles
-%11%/WdfCoInstaller01009.dll
+
+[CoInstallers_CopyFiles]
+WinUSBCoInstaller2.dll
+WdfCoInstaller01009.dll
 
 [CoInstallers_AddReg]
 HKR,,CoInstallers32,0x00010000,"WdfCoInstaller01009.dll,WdfCoInstaller","WinUSBCoInstaller2.dll"
 
-; [DestinationDirs]
+[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 ===================
 
@@ -114,6 +128,7 @@ 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}"

win/stlink/ST-LINK_USB_V2_Driver/stlink_winusb_uninstall.bat

@@ -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