From 8ff7950cd2ad8df076f95db7ceff398f6f26bbab Mon Sep 17 00:00:00 2001
From: Piotr Szkotak <piotr.szkotak@nordicsemi.no>
Date: Thu, 18 Apr 2019 17:46:28 +0200
Subject: [PATCH] [nrf52840] update Nordic example CDC ACM driver (#3772)

---
 .../libraries/usb/nordic_cdc_acm.cat          | Bin 7070 -> 7565 bytes
 .../libraries/usb/nordic_cdc_acm_example.inf  |  89 +++++++++++-------
 2 files changed, 57 insertions(+), 32 deletions(-)

diff --git a/third_party/NordicSemiconductor/libraries/usb/nordic_cdc_acm.cat b/third_party/NordicSemiconductor/libraries/usb/nordic_cdc_acm.cat
index 3c72af1b585505a7e7e84e0f10a7a323565b9392..3d578ff9faa1df1a10eb87c71079860b2287ca5f 100644
GIT binary patch
delta 1882
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
HzZLpB2GGyg

delta 1788
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

diff --git a/third_party/NordicSemiconductor/libraries/usb/nordic_cdc_acm_example.inf b/third_party/NordicSemiconductor/libraries/usb/nordic_cdc_acm_example.inf
index 5a213488f..f9e70d7f6 100644
--- a/third_party/NordicSemiconductor/libraries/usb/nordic_cdc_acm_example.inf
+++ b/third_party/NordicSemiconductor/libraries/usb/nordic_cdc_acm_example.inf
@@ -1,63 +1,81 @@
-; Copyright (c) 2017 Nordic Semiconductor
-; Windows 2000, XP, Vista, 7 and 8 (x32 and x64) driver for Nordic CDC ACM example
+; Copyright (c) 2019 Nordic Semiconductor
+; Windows 2000, XP, Vista, 7 and 8 (x32 and x64) driver for Nordic CDC ACM
 
 [Version] 
-Signature   = "$Windows NT$" 
-Class       = Ports 
+Signature   = "$Windows NT$"
+Class       = Ports
 ClassGuid   = {4D36E978-E325-11CE-BFC1-08002BE10318}
-Provider    = %Manufacturer% 
-DriverVer   = 01/08/2013,6.0.0.0 
+Provider    = %Manufacturer%
+DriverVer   = 03/11/2019,1.1.0.0
 CatalogFile = nordic_cdc_acm.cat
 
 ;----------------------------------------------------------
 ; Targets
 ;----------------------------------------------------------
-[Manufacturer] 
+
+[Manufacturer]
 %Manufacturer%=DeviceList, NTAMD64, NTIA64, NTx86
 
-[DeviceList.NTx86] 
-%NORDIC_CDC_ACM_EXAMPLE%=DriverInstall, USB\VID_1915&PID_CAFE&MI_00 
+[DeviceList.NTx86]
+%NORDIC_CDC_ACM_EXAMPLE%       =DriverInstall, USB\VID_1915&PID_520F&MI_00
+%NORDIC_BLE_UART_EXAMPLE%      =DriverInstall, USB\VID_1915&PID_521A&MI_00
+%NORDIC_USB_CDC_CONNECTIVITY%  =DriverInstall, USB\VID_1915&PID_521B&MI_00
+%NORDIC_SDFU_USB_EXAMPLE%      =DriverInstall, USB\VID_1915&PID_521F&MI_00
+%NORDIC_OPENTHREAD_DEVICE%     =DriverInstall, USB\VID_1915&PID_CAFE&MI_01
+%NORDIC_ZIGBEE_CLI_DEVICE%     =DriverInstall, USB\VID_1915&PID_1337&MI_00
+%NORDIC_SNIFFER_802154_DEVICE% =DriverInstall, USB\VID_1915&PID_154A&MI_00
 
 
 [DeviceList.NTAMD64]
-%NORDIC_CDC_ACM_EXAMPLE%=DriverInstall.NTamd64, USB\VID_1915&PID_CAFE&MI_00
+%NORDIC_CDC_ACM_EXAMPLE%       =DriverInstall.NTamd64, USB\VID_1915&PID_520F&MI_00
+%NORDIC_BLE_UART_EXAMPLE%      =DriverInstall.NTamd64, USB\VID_1915&PID_521A&MI_00
+%NORDIC_USB_CDC_CONNECTIVITY%  =DriverInstall.NTamd64, USB\VID_1915&PID_521B&MI_00
+%NORDIC_SDFU_USB_EXAMPLE%      =DriverInstall.NTamd64, USB\VID_1915&PID_521F&MI_00
+%NORDIC_OPENTHREAD_DEVICE%     =DriverInstall.NTamd64, USB\VID_1915&PID_CAFE&MI_01
+%NORDIC_ZIGBEE_CLI_DEVICE%     =DriverInstall.NTamd64, USB\VID_1915&PID_1337&MI_00
+%NORDIC_SNIFFER_802154_DEVICE% =DriverInstall.NTamd64, USB\VID_1915&PID_154A&MI_00
 
 
 [DeviceList.NTIA64]
-%NORDIC_CDC_ACM_EXAMPLE%=DriverInstall.NTamd64, USB\VID_1915&PID_CAFE&MI_00
-
+%NORDIC_CDC_ACM_EXAMPLE%       =DriverInstall.NTamd64, USB\VID_1915&PID_520F&MI_00
+%NORDIC_BLE_UART_EXAMPLE%      =DriverInstall.NTamd64, USB\VID_1915&PID_521A&MI_00
+%NORDIC_USB_CDC_CONNECTIVITY%  =DriverInstall.NTamd64, USB\VID_1915&PID_521B&MI_00
+%NORDIC_SDFU_USB_EXAMPLE%      =DriverInstall.NTamd64, USB\VID_1915&PID_521F&MI_00
+%NORDIC_OPENTHREAD_DEVICE%     =DriverInstall.NTamd64, USB\VID_1915&PID_CAFE&MI_01
+%NORDIC_ZIGBEE_CLI_DEVICE%     =DriverInstall.NTamd64, USB\VID_1915&PID_1337&MI_00
+%NORDIC_SNIFFER_802154_DEVICE% =DriverInstall.NTamd64, USB\VID_1915&PID_154A&MI_00
 
 ;----------------------------------------------------------
 ; Windows 2000, XP, Vista, Windows 7, Windows 8 - 32bit
 ;----------------------------------------------------------
 
-[DestinationDirs] 
-DefaultDestDir=12 
-DriverInstall.NT.Copy=12 
+[DestinationDirs]
+DefaultDestDir=12
+DriverInstall.NT.Copy=12
 
-[DriverInstall.NT] 
+[DriverInstall.NT]
 include=mdmcpq.inf
-CopyFiles=DriverInstall.NT.Copy 
-AddReg=DriverInstall.NT.AddReg 
+CopyFiles=DriverInstall.NT.Copy
+AddReg=DriverInstall.NT.AddReg
 
-[DriverInstall.NT.Copy] 
+[DriverInstall.NT.Copy]
 
 [DriverInstall.NT.AddReg]
-HKR,,DevLoader,,*ntkern 
-HKR,,NTMPDriver,,usbser.sys 
-HKR,,EnumPropPages32,,"MsPorts.dll,SerialPortPropPageProvider" 
+HKR,,DevLoader,,*ntkern
+HKR,,NTMPDriver,,usbser.sys
+HKR,,EnumPropPages32,,"MsPorts.dll,SerialPortPropPageProvider"
 
-[DriverInstall.NT.Services] 
-include=mdmcpq.inf 
-AddService = usbser, 0x00000002, DriverService.NT 
+[DriverInstall.NT.Services]
+include=mdmcpq.inf
+AddService = usbser, 0x00000002, DriverService.NT
 
 [DriverService.NT] 
-DisplayName = %Serial.SvcDesc% 
-ServiceType = 1 ; SERVICE_KERNEL_DRIVER 
-StartType = 3 ; SERVICE_DEMAND_START 
-ErrorControl = 1 ; SERVICE_ERROR_NORMAL 
-ServiceBinary = %12%\usbser.sys 
-LoadOrderGroup = Base 
+DisplayName = %Serial.SvcDesc%
+ServiceType = 1 ; SERVICE_KERNEL_DRIVER
+StartType = 3 ; SERVICE_DEMAND_START
+ErrorControl = 1 ; SERVICE_ERROR_NORMAL
+ServiceBinary = %12%\usbser.sys
+LoadOrderGroup = Base
 
 ;----------------------------------------------------------
 ; Windows XP, Vista, Windows 7, Windows 8 - 64bit
@@ -84,7 +102,14 @@ AddService=usbser, 0x00000002, DriverService.NT
 
 [Strings] 
 Manufacturer = "Nordic Semiconductor" 
-NORDIC_CDC_ACM_EXAMPLE = "nRF52840 OpenThread Device"
+NORDIC_CDC_ACM_EXAMPLE       = "nRF52 USB CDC Demo"
+NORDIC_BLE_UART_EXAMPLE      = "nRF52 USB CDC BLE Demo"
+NORDIC_USB_CDC_CONNECTIVITY  = "nRF52 USB CDC Connectivity"
+NORDIC_SDFU_USB_EXAMPLE      = "nRF52 SDFU USB"
+NORDIC_OPENTHREAD_DEVICE     = "nRF52840 OpenThread Device"
+NORDIC_ZIGBEE_CLI_DEVICE     = "nRF52840 Zigbee CLI Device"
+NORDIC_SNIFFER_802154_DEVICE = "nRF52 802.15.4 Sniffer"
+
 
 Serial.SvcDesc = "USB Serial emulation driver"