Update STLink and Flashloader tools to fix #370

rogerclarkmelbourne · Feb 3, 2019 · c1aba24 · c1aba24
1 parent 0f868ec
commit c1aba24
Show file tree

Hide file tree

Showing 73 changed files with 25 additions and 77 deletions.
diff --git a/tools/win/stlink/Docs/ST-LINK Utility UM.pdf b/tools/win/stlink/Docs/ST-LINK Utility UM.pdf
diff --git a/tools/win/stlink/Docs/STLINK Utility.pdf b/tools/win/stlink/Docs/STLINK Utility.pdf
diff --git a/tools/win/stlink/Docs/Software license agreement.pdf b/tools/win/stlink/Docs/Software license agreement.pdf
diff --git a/tools/win/stlink/Docs/license.txt b/tools/win/stlink/Docs/license.txt
diff --git a/tools/win/stlink/FlashLoader/0x410.stldr b/tools/win/stlink/FlashLoader/0x410.stldr
diff --git a/tools/win/stlink/FlashLoader/0x411.stldr b/tools/win/stlink/FlashLoader/0x411.stldr
diff --git a/tools/win/stlink/FlashLoader/0x412.stldr b/tools/win/stlink/FlashLoader/0x412.stldr
diff --git a/tools/win/stlink/FlashLoader/0x413.stldr b/tools/win/stlink/FlashLoader/0x413.stldr
diff --git a/tools/win/stlink/FlashLoader/0x414.stldr b/tools/win/stlink/FlashLoader/0x414.stldr
diff --git a/tools/win/stlink/FlashLoader/0x415.stldr b/tools/win/stlink/FlashLoader/0x415.stldr
diff --git a/tools/win/stlink/FlashLoader/0x416.stldr b/tools/win/stlink/FlashLoader/0x416.stldr
diff --git a/tools/win/stlink/FlashLoader/0x417.stldr b/tools/win/stlink/FlashLoader/0x417.stldr
diff --git a/tools/win/stlink/FlashLoader/0x418.stldr b/tools/win/stlink/FlashLoader/0x418.stldr
diff --git a/tools/win/stlink/FlashLoader/0x419.stldr b/tools/win/stlink/FlashLoader/0x419.stldr
diff --git a/tools/win/stlink/FlashLoader/0x419_DB1M_On.stldr b/tools/win/stlink/FlashLoader/0x419_DB1M_On.stldr
diff --git a/tools/win/stlink/FlashLoader/0x420.stldr b/tools/win/stlink/FlashLoader/0x420.stldr
diff --git a/tools/win/stlink/FlashLoader/0x421.stldr b/tools/win/stlink/FlashLoader/0x421.stldr
diff --git a/tools/win/stlink/FlashLoader/0x422.stldr b/tools/win/stlink/FlashLoader/0x422.stldr
diff --git a/tools/win/stlink/FlashLoader/0x423.stldr b/tools/win/stlink/FlashLoader/0x423.stldr
diff --git a/tools/win/stlink/FlashLoader/0x425.stldr b/tools/win/stlink/FlashLoader/0x425.stldr
diff --git a/tools/win/stlink/FlashLoader/0x427.stldr b/tools/win/stlink/FlashLoader/0x427.stldr
diff --git a/tools/win/stlink/FlashLoader/0x428.stldr b/tools/win/stlink/FlashLoader/0x428.stldr
diff --git a/tools/win/stlink/FlashLoader/0x429.stldr b/tools/win/stlink/FlashLoader/0x429.stldr
diff --git a/tools/win/stlink/FlashLoader/0x430.stldr b/tools/win/stlink/FlashLoader/0x430.stldr
diff --git a/tools/win/stlink/FlashLoader/0x431.stldr b/tools/win/stlink/FlashLoader/0x431.stldr
diff --git a/tools/win/stlink/FlashLoader/0x432.stldr b/tools/win/stlink/FlashLoader/0x432.stldr
diff --git a/tools/win/stlink/FlashLoader/0x433.stldr b/tools/win/stlink/FlashLoader/0x433.stldr
diff --git a/tools/win/stlink/FlashLoader/0x434.stldr b/tools/win/stlink/FlashLoader/0x434.stldr
diff --git a/tools/win/stlink/FlashLoader/0x434_DB1M_On.stldr b/tools/win/stlink/FlashLoader/0x434_DB1M_On.stldr
diff --git a/tools/win/stlink/FlashLoader/0x435.stldr b/tools/win/stlink/FlashLoader/0x435.stldr
diff --git a/tools/win/stlink/FlashLoader/0x436.stldr b/tools/win/stlink/FlashLoader/0x436.stldr
diff --git a/tools/win/stlink/FlashLoader/0x437.stldr b/tools/win/stlink/FlashLoader/0x437.stldr
diff --git a/tools/win/stlink/FlashLoader/0x438.stldr b/tools/win/stlink/FlashLoader/0x438.stldr
diff --git a/tools/win/stlink/FlashLoader/0x439.stldr b/tools/win/stlink/FlashLoader/0x439.stldr
diff --git a/tools/win/stlink/FlashLoader/0x440.stldr b/tools/win/stlink/FlashLoader/0x440.stldr
diff --git a/tools/win/stlink/FlashLoader/0x441.stldr b/tools/win/stlink/FlashLoader/0x441.stldr
diff --git a/tools/win/stlink/FlashLoader/0x442.stldr b/tools/win/stlink/FlashLoader/0x442.stldr
diff --git a/tools/win/stlink/FlashLoader/0x444.stldr b/tools/win/stlink/FlashLoader/0x444.stldr
diff --git a/tools/win/stlink/FlashLoader/0x445.stldr b/tools/win/stlink/FlashLoader/0x445.stldr
diff --git a/tools/win/stlink/FlashLoader/0x446.stldr b/tools/win/stlink/FlashLoader/0x446.stldr
diff --git a/tools/win/stlink/FlashLoader/0x447.stldr b/tools/win/stlink/FlashLoader/0x447.stldr
diff --git a/tools/win/stlink/FlashLoader/0x448.stldr b/tools/win/stlink/FlashLoader/0x448.stldr
diff --git a/tools/win/stlink/FlashLoader/0x449.stldr b/tools/win/stlink/FlashLoader/0x449.stldr
diff --git a/tools/win/stlink/FlashLoader/0x450.stldr b/tools/win/stlink/FlashLoader/0x450.stldr
diff --git a/tools/win/stlink/FlashLoader/0x451.stldr b/tools/win/stlink/FlashLoader/0x451.stldr
diff --git a/tools/win/stlink/FlashLoader/0x451_DB_On.stldr b/tools/win/stlink/FlashLoader/0x451_DB_On.stldr
diff --git a/tools/win/stlink/FlashLoader/0x452.stldr b/tools/win/stlink/FlashLoader/0x452.stldr
diff --git a/tools/win/stlink/FlashLoader/0x457.stldr b/tools/win/stlink/FlashLoader/0x457.stldr
diff --git a/tools/win/stlink/FlashLoader/0x458.stldr b/tools/win/stlink/FlashLoader/0x458.stldr
diff --git a/tools/win/stlink/FlashLoader/0x460.stldr b/tools/win/stlink/FlashLoader/0x460.stldr
diff --git a/tools/win/stlink/FlashLoader/0x461.stldr b/tools/win/stlink/FlashLoader/0x461.stldr
diff --git a/tools/win/stlink/FlashLoader/0x462.stldr b/tools/win/stlink/FlashLoader/0x462.stldr
diff --git a/tools/win/stlink/FlashLoader/0x463.stldr b/tools/win/stlink/FlashLoader/0x463.stldr
diff --git a/tools/win/stlink/FlashLoader/0x470.stldr b/tools/win/stlink/FlashLoader/0x470.stldr
diff --git a/tools/win/stlink/FlashLoader/0x495.stldr b/tools/win/stlink/FlashLoader/0x495.stldr
diff --git a/tools/win/stlink/FlashLoader/0x9A8.stldr b/tools/win/stlink/FlashLoader/0x9A8.stldr
diff --git a/tools/win/stlink/FlashLoader/0x9B0.stldr b/tools/win/stlink/FlashLoader/0x9B0.stldr
diff --git a/tools/win/stlink/ST-LINK_CLI.exe b/tools/win/stlink/ST-LINK_CLI.exe
diff --git a/tools/win/stlink/ST-LINK_USB_V2_1_Driver/amd64/WdfCoInstaller01009.dll b/tools/win/stlink/ST-LINK_USB_V2_1_Driver/amd64/WdfCoInstaller01009.dll
diff --git a/tools/win/stlink/ST-LINK_USB_V2_1_Driver/amd64/winusbcoinstaller2.dll b/tools/win/stlink/ST-LINK_USB_V2_1_Driver/amd64/winusbcoinstaller2.dll
diff --git a/...nk/ST-LINK_USB_V2_Driver/dpinst_amd64.exe → .../ST-LINK_USB_V2_1_Driver/dpinst_amd64.exe b/...nk/ST-LINK_USB_V2_Driver/dpinst_amd64.exe → .../ST-LINK_USB_V2_1_Driver/dpinst_amd64.exe
diff --git a/...link/ST-LINK_USB_V2_Driver/dpinst_x86.exe → ...nk/ST-LINK_USB_V2_1_Driver/dpinst_x86.exe b/...link/ST-LINK_USB_V2_Driver/dpinst_x86.exe → ...nk/ST-LINK_USB_V2_1_Driver/dpinst_x86.exe
diff --git a/...link/ST-LINK_USB_V2_Driver/stlink_VCP.inf → ...nk/ST-LINK_USB_V2_1_Driver/stlink_VCP.inf b/...link/ST-LINK_USB_V2_Driver/stlink_VCP.inf → ...nk/ST-LINK_USB_V2_1_Driver/stlink_VCP.inf
diff --git a/...-LINK_USB_V2_Driver/stlink_dbg_winusb.inf → ...INK_USB_V2_1_Driver/stlink_dbg_winusb.inf b/...-LINK_USB_V2_Driver/stlink_dbg_winusb.inf → ...INK_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
-%11%/WdfCoInstaller01009.dll
+CopyFiles=CoInstallers_CopyFiles
 
 [USB_InstallRW.CoInstallers]
 AddReg=CoInstallers_AddReg
-%11%/WinUSBCoInstaller2.dll
-%11%/WdfCoInstaller01009.dll
+CopyFiles=CoInstallers_CopyFiles
+
+[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}"

diff --git a/...K_USB_V2_Driver/stlink_winusb_install.bat → ...USB_V2_1_Driver/stlink_winusb_install.bat b/...K_USB_V2_Driver/stlink_winusb_install.bat → ...USB_V2_1_Driver/stlink_winusb_install.bat
@@ -5,4 +5,4 @@ start "" dpinst_x86.exe
 goto END
 :X64
 start "" dpinst_amd64.exe
-:END
+:END
diff --git a/...INK_USB_V2_Driver/stlinkdbgwinusb_x64.cat → ...K_USB_V2_1_Driver/stlinkdbgwinusb_x64.cat b/...INK_USB_V2_Driver/stlinkdbgwinusb_x64.cat → ...K_USB_V2_1_Driver/stlinkdbgwinusb_x64.cat
diff --git a/...INK_USB_V2_Driver/stlinkdbgwinusb_x86.cat → ...K_USB_V2_1_Driver/stlinkdbgwinusb_x86.cat b/...INK_USB_V2_Driver/stlinkdbgwinusb_x86.cat → ...K_USB_V2_1_Driver/stlinkdbgwinusb_x86.cat
diff --git a/...k/ST-LINK_USB_V2_Driver/stlinkvcp_x64.cat → ...ST-LINK_USB_V2_1_Driver/stlinkvcp_x64.cat b/...k/ST-LINK_USB_V2_Driver/stlinkvcp_x64.cat → ...ST-LINK_USB_V2_1_Driver/stlinkvcp_x64.cat
diff --git a/...k/ST-LINK_USB_V2_Driver/stlinkvcp_x86.cat → ...ST-LINK_USB_V2_1_Driver/stlinkvcp_x86.cat b/...k/ST-LINK_USB_V2_Driver/stlinkvcp_x86.cat → ...ST-LINK_USB_V2_1_Driver/stlinkvcp_x86.cat
diff --git a/tools/win/stlink/ST-LINK_USB_V2_1_Driver/x86/WdfCoInstaller01009.dll b/tools/win/stlink/ST-LINK_USB_V2_1_Driver/x86/WdfCoInstaller01009.dll
diff --git a/tools/win/stlink/ST-LINK_USB_V2_1_Driver/x86/winusbcoinstaller2.dll b/tools/win/stlink/ST-LINK_USB_V2_1_Driver/x86/winusbcoinstaller2.dll
diff --git a/tools/win/stlink/ST-LINK_USB_V2_Driver/stlink_winusb_uninstall.bat b/tools/win/stlink/ST-LINK_USB_V2_Driver/stlink_winusb_uninstall.bat
diff --git a/tools/win/stlink/STLinkUSBDriver.dll b/tools/win/stlink/STLinkUSBDriver.dll
-Original file line number
+Diff line change
@@ Expand Up / @@ -5,4 +5,4 @@ start "" dpinst_x86.exe @@
     goto END
     :X64
     start "" dpinst_amd64.exe
-    :END
+    :END