diff --git a/linux/stlink/lib/libstlink-shared.so b/linux/stlink/lib/libstlink-shared.so deleted file mode 120000 index 8e07ea867..000000000 --- a/linux/stlink/lib/libstlink-shared.so +++ /dev/null @@ -1 +0,0 @@ -libstlink-shared.so.1 \ No newline at end of file diff --git a/linux/stlink/lib/libstlink-shared.so.1 b/linux/stlink/lib/libstlink-shared.so.1 deleted file mode 120000 index 1485c1076..000000000 --- a/linux/stlink/lib/libstlink-shared.so.1 +++ /dev/null @@ -1 +0,0 @@ -libstlink-shared.so.1.3.0 \ No newline at end of file diff --git a/linux/stlink/lib/libstlink-shared.so.1.3.0 b/linux/stlink/lib/libstlink-shared.so.1.3.0 deleted file mode 100644 index 6337e7abd..000000000 Binary files a/linux/stlink/lib/libstlink-shared.so.1.3.0 and /dev/null differ diff --git a/linux/stlink/lib/libstlink.a b/linux/stlink/lib/libstlink.a index f89f075b5..4b065dc19 100644 Binary files a/linux/stlink/lib/libstlink.a and b/linux/stlink/lib/libstlink.a differ diff --git a/linux/stlink/lib/libstlink.so b/linux/stlink/lib/libstlink.so new file mode 120000 index 000000000..cd2d3010e --- /dev/null +++ b/linux/stlink/lib/libstlink.so @@ -0,0 +1 @@ +libstlink.so.1 \ No newline at end of file diff --git a/linux/stlink/lib/libstlink.so.1 b/linux/stlink/lib/libstlink.so.1 new file mode 120000 index 000000000..51934773a --- /dev/null +++ b/linux/stlink/lib/libstlink.so.1 @@ -0,0 +1 @@ +libstlink.so.1.5.1 \ No newline at end of file diff --git a/linux/stlink/lib/libstlink.so.1.5.1 b/linux/stlink/lib/libstlink.so.1.5.1 new file mode 100644 index 000000000..e81060c4b Binary files /dev/null and b/linux/stlink/lib/libstlink.so.1.5.1 differ diff --git a/linux/stlink/st-flash b/linux/stlink/st-flash index 6c1e57ae1..ea0bae602 100755 Binary files a/linux/stlink/st-flash and b/linux/stlink/st-flash differ diff --git a/linux/stlink/st-info b/linux/stlink/st-info index 6f7bf3876..55e33f761 100755 Binary files a/linux/stlink/st-info and b/linux/stlink/st-info differ diff --git a/linux/stlink/st-util b/linux/stlink/st-util index cd3e5f73c..151a68ff6 100755 Binary files a/linux/stlink/st-util and b/linux/stlink/st-util differ diff --git a/linux64/stlink/lib/libstlink-shared.so b/linux64/stlink/lib/libstlink-shared.so deleted file mode 120000 index 8e07ea867..000000000 --- a/linux64/stlink/lib/libstlink-shared.so +++ /dev/null @@ -1 +0,0 @@ -libstlink-shared.so.1 \ No newline at end of file diff --git a/linux64/stlink/lib/libstlink-shared.so.1 b/linux64/stlink/lib/libstlink-shared.so.1 deleted file mode 120000 index 1485c1076..000000000 --- a/linux64/stlink/lib/libstlink-shared.so.1 +++ /dev/null @@ -1 +0,0 @@ -libstlink-shared.so.1.3.0 \ No newline at end of file diff --git a/linux64/stlink/lib/libstlink-shared.so.1.3.0 b/linux64/stlink/lib/libstlink-shared.so.1.3.0 deleted file mode 100644 index ce99960af..000000000 Binary files a/linux64/stlink/lib/libstlink-shared.so.1.3.0 and /dev/null differ diff --git a/linux64/stlink/lib/libstlink.a b/linux64/stlink/lib/libstlink.a index 5dec5413c..9d53bd54a 100644 Binary files a/linux64/stlink/lib/libstlink.a and b/linux64/stlink/lib/libstlink.a differ diff --git a/linux64/stlink/lib/libstlink.so b/linux64/stlink/lib/libstlink.so new file mode 120000 index 000000000..cd2d3010e --- /dev/null +++ b/linux64/stlink/lib/libstlink.so @@ -0,0 +1 @@ +libstlink.so.1 \ No newline at end of file diff --git a/linux64/stlink/lib/libstlink.so.1 b/linux64/stlink/lib/libstlink.so.1 new file mode 120000 index 000000000..51934773a --- /dev/null +++ b/linux64/stlink/lib/libstlink.so.1 @@ -0,0 +1 @@ +libstlink.so.1.5.1 \ No newline at end of file diff --git a/linux64/stlink/lib/libstlink.so.1.5.1 b/linux64/stlink/lib/libstlink.so.1.5.1 new file mode 100755 index 000000000..f7c55a25b Binary files /dev/null and b/linux64/stlink/lib/libstlink.so.1.5.1 differ diff --git a/linux64/stlink/st-flash b/linux64/stlink/st-flash index a95f4b415..f0454d595 100755 Binary files a/linux64/stlink/st-flash and b/linux64/stlink/st-flash differ diff --git a/linux64/stlink/st-info b/linux64/stlink/st-info index 215797574..ab3d1fb8e 100755 Binary files a/linux64/stlink/st-info and b/linux64/stlink/st-info differ diff --git a/linux64/stlink/st-util b/linux64/stlink/st-util index 9c032e6bd..e29aa16b2 100755 Binary files a/linux64/stlink/st-util and b/linux64/stlink/st-util differ diff --git a/macosx/stlink/lib/libstlink-shared.1.3.0.dylib b/macosx/stlink/lib/libstlink-shared.1.3.0.dylib deleted file mode 100755 index 1c666561e..000000000 Binary files a/macosx/stlink/lib/libstlink-shared.1.3.0.dylib and /dev/null differ diff --git a/macosx/stlink/lib/libstlink-shared.1.dylib b/macosx/stlink/lib/libstlink-shared.1.dylib deleted file mode 120000 index f94f5cde8..000000000 --- a/macosx/stlink/lib/libstlink-shared.1.dylib +++ /dev/null @@ -1 +0,0 @@ -libstlink-shared.1.3.0.dylib \ No newline at end of file diff --git a/macosx/stlink/lib/libstlink-shared.dylib b/macosx/stlink/lib/libstlink-shared.dylib deleted file mode 120000 index bdf7cc30e..000000000 --- a/macosx/stlink/lib/libstlink-shared.dylib +++ /dev/null @@ -1 +0,0 @@ -libstlink-shared.1.dylib \ No newline at end of file diff --git a/macosx/stlink/lib/libstlink.1.5.1.dylib b/macosx/stlink/lib/libstlink.1.5.1.dylib new file mode 100755 index 000000000..45a8a928f Binary files /dev/null and b/macosx/stlink/lib/libstlink.1.5.1.dylib differ diff --git a/macosx/stlink/lib/libstlink.1.dylib b/macosx/stlink/lib/libstlink.1.dylib new file mode 120000 index 000000000..17bda6767 --- /dev/null +++ b/macosx/stlink/lib/libstlink.1.dylib @@ -0,0 +1 @@ +libstlink.1.5.1.dylib \ No newline at end of file diff --git a/macosx/stlink/lib/libstlink.a b/macosx/stlink/lib/libstlink.a index e7f9e0e6c..ebf35cd1b 100644 Binary files a/macosx/stlink/lib/libstlink.a and b/macosx/stlink/lib/libstlink.a differ diff --git a/macosx/stlink/lib/libstlink.dylib b/macosx/stlink/lib/libstlink.dylib new file mode 120000 index 000000000..9891f18f1 --- /dev/null +++ b/macosx/stlink/lib/libstlink.dylib @@ -0,0 +1 @@ +libstlink.1.dylib \ No newline at end of file diff --git a/macosx/stlink/st-flash b/macosx/stlink/st-flash index 4dca84db6..08224f53f 100755 Binary files a/macosx/stlink/st-flash and b/macosx/stlink/st-flash differ diff --git a/macosx/stlink/st-info b/macosx/stlink/st-info index 14d1a8ba8..d8f8e4239 100755 Binary files a/macosx/stlink/st-info and b/macosx/stlink/st-info differ diff --git a/macosx/stlink/st-util b/macosx/stlink/st-util index 2925855a0..fdd9040b7 100755 Binary files a/macosx/stlink/st-util and b/macosx/stlink/st-util differ diff --git a/win/stlink/Docs/ST-LINK Utility UM.pdf b/win/stlink/Docs/ST-LINK Utility UM.pdf new file mode 100644 index 000000000..55b7fcba3 Binary files /dev/null and b/win/stlink/Docs/ST-LINK Utility UM.pdf differ diff --git a/win/stlink/Docs/STLINK Utility.pdf b/win/stlink/Docs/STLINK Utility.pdf deleted file mode 100644 index c9cf4c3d9..000000000 Binary files a/win/stlink/Docs/STLINK Utility.pdf and /dev/null differ diff --git a/win/stlink/Docs/Software license agreement.pdf b/win/stlink/Docs/Software license agreement.pdf new file mode 100644 index 000000000..6f26ebf69 Binary files /dev/null and b/win/stlink/Docs/Software license agreement.pdf differ diff --git a/win/stlink/Docs/license.txt b/win/stlink/Docs/license.txt deleted file mode 100644 index e18b63ff5..000000000 --- a/win/stlink/Docs/license.txt +++ /dev/null @@ -1,58 +0,0 @@ -SOFTWARE LICENSE AGREEMENT - - -By using this Licensed Software, You are agreeing to be bound by the terms and conditions of this License Agreement. Do not use the Licensed Software until You have read and agreed to the following terms and conditions. The use of the Licensed Software implies automatically the acceptance of the following terms and conditions. Please indicate your acceptance or NON-acceptance by selecting 'I ACCEPT' or 'I DO NOT ACCEPT' as indicated below in the media. - -DEFINITIONS. - -Licensed Software: means the enclosed SOFTWARE LIBRARY, EXAMPLES, PROJECT TEMPLATE and all the related documentation and design tools licensed in the form of object and/or source code as the case maybe. - -Product: means a product or a system that includes or incorporates solely and exclusively an executable version of the Licensed Software and provided further that such Licensed Software executes solely and exclusively on STM32 microcontrollers devices manufactured by or for ST. - -LICENSE. -STMicroelectronics (ST) grants You a non-exclusive, worldwide, non-transferable (whether by assignment or otherwise) non sub-licensable, revocable, royalty-free limited license of the Licensed Software to: -(i) make copies, prepare derivatives works, of the source code version of the Licensed Software for the sole and exclusive purpose of developing executable versions (in object and source code) of such Licensed Software only for use with the Product; -(ii) make copies, prepare derivatives works of the object code versions of the Licensed Software for the sole purpose of designing, developing and manufacturing the Products; -(iii) make, use, sell, offer to sell, lease, hire out, import and export or otherwise distribute Products. - - -OWNERSHIP AND COPYRIGHT. Title to the Licensed Software, related documentation and all copies thereof remain with ST and/or its licensors. You may not remove the copyrights notices from the Licensed Software and to any copies of the Licensed Software. You agree to prevent any unauthorized copying of the Licensed Software and related documentation. - - -RESTRICTIONS. Unless otherwise explicitly stated in this Agreement, You may not sell, assign, sublicense, lease, rent or otherwise distribute the Licensed Software for commercial purposes, in whole or in part. - -You acknowledge and agree that any use, adaptation translation or transcription of the Licensed Software or any portion or derivative thereof, for use with processors manufactured by or for an entity other than ST is a material breach of this Agreement and requires a separate license from ST. - -No source code and/or object code relating to and/or based upon Licensed Software is to be made available by You unless expressly permitted under the section 'License'. - -You acknowledge and agree that the protection of the source code of the Licensed Software warrants the imposition of reasonable security precautions -In the event ST demonstrates to You a reasonable belief that the source code of the Licensed Software has been used or distributed in violation of this Agreement, ST may by written notification request certification as to whether such unauthorized use or distribution has occurred. You shall cooperate and assist ST in its determination of whether there has been unauthorized use or distribution of the source code of the Licensed Software and will take appropriate steps to remedy any unauthorized use or distribution. - -NO WARRANTY. The Licensed Software is provided 'as is' and 'with all faults' without warranty of any kind expressed or implied. ST and its licensors expressly disclaim all warranties, expressed, implied or otherwise, including without limitation, warranties of merchantability, fitness for a particular purpose and non-infringement of intellectual property rights. ST does not warrant that the use in whole or in part of the Licensed Software will be interrupted or error free, will meet your requirements, or will operate with the combination of hardware and software selected by You. - -You are responsible for determining whether the Licensed Software will be suitable for your intended use or application or will achieve your intended results. - -ST has not authorized anyone to make any representation or warranty for the Licensed Software, and any technical, applications or design information or advice, quality characterization, reliability data or other services provided by ST shall not constitute any representation or warranty by ST or alter this disclaimer or warranty, and in no additional obligations or liabilities shall arise from ST�s providing such information or services. ST does not assume or authorize any other person to assume for it any other liability in connection with its Licensed Software. - -Nothing contained in this Agreement will be construed as -(i) a warranty or representation by ST to maintain production of any ST device or other hardware or software with which the Licensed Software may be used or to otherwise maintain or support the Licensed Software in any manner; and -(ii) a commitment from ST and/or its licensors to bring or prosecute actions or suits against third parties for infringement of any of the rights licensed hereby, or conferring any rights to bring or prosecute actions or suits against third parties for infringement. However, ST has the right to terminate this Agreement immediately upon receiving notice of any claim, suit or proceeding that alleges that the Licensed Software or your use or distribution of the Licensed Software infringes any third party intellectual property rights. - -All other warranties, conditions or other terms implied by law are excluded to the fullest extent permitted by law. - -LIMITATION OF LIABILITIES. In no event ST or its licensors shall be liable to You or any third party for any indirect, special, consequential, incidental, punitive damages or other damages (including but not limited to, the cost of labour, re-qualification, delay, loss of profits, loss of revenues, loss of data, costs of procurement of substitute goods or services or the like) whether based on contract, tort, or any other legal theory, relating to or in connection with the Licensed Software, the documentation or this Agreement, even if ST has been advised of the possibility of such damages. - -In no event shall ST�s liability to You or any third party under this Agreement, including any claim with respect of any third party intellectual property rights, for any cause of action exceed 100 US$. This section does not apply to the extent prohibited by law. For the purposes of this section, any liability of ST shall be treated in the aggregate. - -TERMINATION. ST may terminate this License Agreement license at any time if You are in material breach of any of its terms and conditions. Upon termination, You will immediately destroy or return all copies of the Licensed Software and documentation to ST. - - -APPLICABLE LAW AND JURISDICTION. In case of dispute and in the absence of an amicable settlement, the only competent jurisdiction shall be the Courts of Geneva, Switzerland. The applicable law shall be the law of Switzerland. - - -SEVERABILITY. If any provision of this agreement is or becomes, at any time or for any reason, unenforceable or invalid, no other provision of this agreement shall be affected thereby, and the remaining provisions of this agreement shall continue with the same force and effect as if such unenforceable or invalid provisions had not been inserted in this Agreement. - - -WAIVER. The waiver by either party of any breach of any provisions of this Agreement shall not operate or be construed as a waiver of any other or a subsequent breach of the same or a different provision. - -RELATIONSHIP OF THE PARTIES. Nothing in this Agreement shall create, or be deemed to create, a partnership or the relationship of principal and agent or employer and employee between the Parties. Neither Party has the authority or power to bind, to contract in the name of or to create a liability for the other in any way or for any purpose. diff --git a/win/stlink/FlashLoader/0x415.stldr b/win/stlink/FlashLoader/0x415.stldr index a1a1cc19d..17429f030 100644 Binary files a/win/stlink/FlashLoader/0x415.stldr and b/win/stlink/FlashLoader/0x415.stldr differ diff --git a/win/stlink/FlashLoader/0x419_DB1M_On.stldr b/win/stlink/FlashLoader/0x419_DB1M_On.stldr index c8cd5c147..2c276bb5a 100644 Binary files a/win/stlink/FlashLoader/0x419_DB1M_On.stldr and b/win/stlink/FlashLoader/0x419_DB1M_On.stldr differ diff --git a/win/stlink/FlashLoader/0x435.stldr b/win/stlink/FlashLoader/0x435.stldr index 823c6cc73..c865f57a8 100644 Binary files a/win/stlink/FlashLoader/0x435.stldr and b/win/stlink/FlashLoader/0x435.stldr differ diff --git a/win/stlink/FlashLoader/0x436.stldr b/win/stlink/FlashLoader/0x436.stldr index a40818f18..e9c88deaa 100644 Binary files a/win/stlink/FlashLoader/0x436.stldr and b/win/stlink/FlashLoader/0x436.stldr differ diff --git a/win/stlink/FlashLoader/0x450.stldr b/win/stlink/FlashLoader/0x450.stldr index 6f0b5abfe..147da0ac8 100644 Binary files a/win/stlink/FlashLoader/0x450.stldr and b/win/stlink/FlashLoader/0x450.stldr differ diff --git a/win/stlink/FlashLoader/0x452.stldr b/win/stlink/FlashLoader/0x452.stldr index 8ec91a976..5d46da249 100644 Binary files a/win/stlink/FlashLoader/0x452.stldr and b/win/stlink/FlashLoader/0x452.stldr differ diff --git a/win/stlink/FlashLoader/0x457.stldr b/win/stlink/FlashLoader/0x457.stldr index 963639044..879ab385d 100644 Binary files a/win/stlink/FlashLoader/0x457.stldr and b/win/stlink/FlashLoader/0x457.stldr differ diff --git a/win/stlink/FlashLoader/0x460.stldr b/win/stlink/FlashLoader/0x460.stldr new file mode 100644 index 000000000..6610e2264 Binary files /dev/null and b/win/stlink/FlashLoader/0x460.stldr differ diff --git a/win/stlink/FlashLoader/0x461.stldr b/win/stlink/FlashLoader/0x461.stldr index f1d1433b6..50baccd92 100644 Binary files a/win/stlink/FlashLoader/0x461.stldr and b/win/stlink/FlashLoader/0x461.stldr differ diff --git a/win/stlink/FlashLoader/0x462.stldr b/win/stlink/FlashLoader/0x462.stldr index aaa5541b2..eaf222753 100644 Binary files a/win/stlink/FlashLoader/0x462.stldr and b/win/stlink/FlashLoader/0x462.stldr differ diff --git a/win/stlink/FlashLoader/0x463.stldr b/win/stlink/FlashLoader/0x463.stldr index 9653ce26c..2f57b6353 100644 Binary files a/win/stlink/FlashLoader/0x463.stldr and b/win/stlink/FlashLoader/0x463.stldr differ diff --git a/win/stlink/FlashLoader/0x470.stldr b/win/stlink/FlashLoader/0x470.stldr new file mode 100644 index 000000000..c909b1142 Binary files /dev/null and b/win/stlink/FlashLoader/0x470.stldr differ diff --git a/win/stlink/FlashLoader/0x495.stldr b/win/stlink/FlashLoader/0x495.stldr new file mode 100644 index 000000000..96f4fd0e4 Binary files /dev/null and b/win/stlink/FlashLoader/0x495.stldr differ diff --git a/win/stlink/ST-LINK_CLI.exe b/win/stlink/ST-LINK_CLI.exe index ca98e331e..c9121c794 100644 Binary files a/win/stlink/ST-LINK_CLI.exe and b/win/stlink/ST-LINK_CLI.exe differ diff --git a/win/stlink/ST-LINK_USB_V2_1_Driver/amd64/WdfCoInstaller01009.dll b/win/stlink/ST-LINK_USB_V2_1_Driver/amd64/WdfCoInstaller01009.dll new file mode 100644 index 000000000..1731b962d Binary files /dev/null and b/win/stlink/ST-LINK_USB_V2_1_Driver/amd64/WdfCoInstaller01009.dll differ diff --git a/win/stlink/ST-LINK_USB_V2_1_Driver/amd64/winusbcoinstaller2.dll b/win/stlink/ST-LINK_USB_V2_1_Driver/amd64/winusbcoinstaller2.dll new file mode 100644 index 000000000..30e55025b Binary files /dev/null and b/win/stlink/ST-LINK_USB_V2_1_Driver/amd64/winusbcoinstaller2.dll differ diff --git a/win/stlink/ST-LINK_USB_V2_Driver/dpinst_amd64.exe b/win/stlink/ST-LINK_USB_V2_1_Driver/dpinst_amd64.exe similarity index 100% rename from win/stlink/ST-LINK_USB_V2_Driver/dpinst_amd64.exe rename to win/stlink/ST-LINK_USB_V2_1_Driver/dpinst_amd64.exe diff --git a/win/stlink/ST-LINK_USB_V2_Driver/dpinst_x86.exe b/win/stlink/ST-LINK_USB_V2_1_Driver/dpinst_x86.exe similarity index 100% rename from win/stlink/ST-LINK_USB_V2_Driver/dpinst_x86.exe rename to win/stlink/ST-LINK_USB_V2_1_Driver/dpinst_x86.exe diff --git a/win/stlink/ST-LINK_USB_V2_Driver/stlink_VCP.inf b/win/stlink/ST-LINK_USB_V2_1_Driver/stlink_VCP.inf similarity index 96% rename from win/stlink/ST-LINK_USB_V2_Driver/stlink_VCP.inf rename to win/stlink/ST-LINK_USB_V2_1_Driver/stlink_VCP.inf index 209c3c2da..8805bd73e 100644 --- a/win/stlink/ST-LINK_USB_V2_Driver/stlink_VCP.inf +++ b/win/stlink/ST-LINK_USB_V2_1_Driver/stlink_VCP.inf @@ -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 diff --git a/win/stlink/ST-LINK_USB_V2_Driver/stlink_dbg_winusb.inf b/win/stlink/ST-LINK_USB_V2_1_Driver/stlink_dbg_winusb.inf similarity index 81% rename from win/stlink/ST-LINK_USB_V2_Driver/stlink_dbg_winusb.inf rename to win/stlink/ST-LINK_USB_V2_1_Driver/stlink_dbg_winusb.inf index 18b3dfd3a..deb8434f0 100644 --- a/win/stlink/ST-LINK_USB_V2_Driver/stlink_dbg_winusb.inf +++ b/win/stlink/ST-LINK_USB_V2_1_Driver/stlink_dbg_winusb.inf @@ -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}" diff --git a/win/stlink/ST-LINK_USB_V2_Driver/stlink_winusb_install.bat b/win/stlink/ST-LINK_USB_V2_1_Driver/stlink_winusb_install.bat similarity index 94% rename from win/stlink/ST-LINK_USB_V2_Driver/stlink_winusb_install.bat rename to win/stlink/ST-LINK_USB_V2_1_Driver/stlink_winusb_install.bat index 59a3090cc..dccbe947e 100644 --- a/win/stlink/ST-LINK_USB_V2_Driver/stlink_winusb_install.bat +++ b/win/stlink/ST-LINK_USB_V2_1_Driver/stlink_winusb_install.bat @@ -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 \ No newline at end of file diff --git a/win/stlink/ST-LINK_USB_V2_Driver/stlinkdbgwinusb_x64.cat b/win/stlink/ST-LINK_USB_V2_1_Driver/stlinkdbgwinusb_x64.cat similarity index 69% rename from win/stlink/ST-LINK_USB_V2_Driver/stlinkdbgwinusb_x64.cat rename to win/stlink/ST-LINK_USB_V2_1_Driver/stlinkdbgwinusb_x64.cat index 2c04b7bfa..b4e906491 100644 Binary files a/win/stlink/ST-LINK_USB_V2_Driver/stlinkdbgwinusb_x64.cat and b/win/stlink/ST-LINK_USB_V2_1_Driver/stlinkdbgwinusb_x64.cat differ diff --git a/win/stlink/ST-LINK_USB_V2_Driver/stlinkdbgwinusb_x86.cat b/win/stlink/ST-LINK_USB_V2_1_Driver/stlinkdbgwinusb_x86.cat similarity index 69% rename from win/stlink/ST-LINK_USB_V2_Driver/stlinkdbgwinusb_x86.cat rename to win/stlink/ST-LINK_USB_V2_1_Driver/stlinkdbgwinusb_x86.cat index 2f3e80e2e..3d7e801eb 100644 Binary files a/win/stlink/ST-LINK_USB_V2_Driver/stlinkdbgwinusb_x86.cat and b/win/stlink/ST-LINK_USB_V2_1_Driver/stlinkdbgwinusb_x86.cat differ diff --git a/win/stlink/ST-LINK_USB_V2_Driver/stlinkvcp_x64.cat b/win/stlink/ST-LINK_USB_V2_1_Driver/stlinkvcp_x64.cat similarity index 100% rename from win/stlink/ST-LINK_USB_V2_Driver/stlinkvcp_x64.cat rename to win/stlink/ST-LINK_USB_V2_1_Driver/stlinkvcp_x64.cat diff --git a/win/stlink/ST-LINK_USB_V2_Driver/stlinkvcp_x86.cat b/win/stlink/ST-LINK_USB_V2_1_Driver/stlinkvcp_x86.cat similarity index 100% rename from win/stlink/ST-LINK_USB_V2_Driver/stlinkvcp_x86.cat rename to win/stlink/ST-LINK_USB_V2_1_Driver/stlinkvcp_x86.cat diff --git a/win/stlink/ST-LINK_USB_V2_1_Driver/x86/WdfCoInstaller01009.dll b/win/stlink/ST-LINK_USB_V2_1_Driver/x86/WdfCoInstaller01009.dll new file mode 100644 index 000000000..30e81af62 Binary files /dev/null and b/win/stlink/ST-LINK_USB_V2_1_Driver/x86/WdfCoInstaller01009.dll differ diff --git a/win/stlink/ST-LINK_USB_V2_1_Driver/x86/winusbcoinstaller2.dll b/win/stlink/ST-LINK_USB_V2_1_Driver/x86/winusbcoinstaller2.dll new file mode 100644 index 000000000..fc450d2b2 Binary files /dev/null and b/win/stlink/ST-LINK_USB_V2_1_Driver/x86/winusbcoinstaller2.dll differ diff --git a/win/stlink/ST-LINK_USB_V2_Driver/stlink_winusb_uninstall.bat b/win/stlink/ST-LINK_USB_V2_Driver/stlink_winusb_uninstall.bat deleted file mode 100644 index 5f91323fc..000000000 --- a/win/stlink/ST-LINK_USB_V2_Driver/stlink_winusb_uninstall.bat +++ /dev/null @@ -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 diff --git a/win/stlink/STLinkUSBDriver.dll b/win/stlink/STLinkUSBDriver.dll index ea88bba60..e25fc7e8b 100644 Binary files a/win/stlink/STLinkUSBDriver.dll and b/win/stlink/STLinkUSBDriver.dll differ