Merge branch 'maint'

12 files changed, 39 insertions, 26 deletions

diff --git a/host/cmake/msvc/amd64/WdfCoInstaller01009.dll b/host/cmake/msvc/amd64/WdfCoInstaller01009.dll
new file mode 100644
index 000000000..1731b962d
--- /dev/null
+++ b/host/cmake/msvc/amd64/WdfCoInstaller01009.dll
diff --git a/host/cmake/msvc/amd64/winusbcoinstaller2.dll b/host/cmake/msvc/amd64/winusbcoinstaller2.dll
new file mode 100644
index 000000000..30e55025b
--- /dev/null
+++ b/host/cmake/msvc/amd64/winusbcoinstaller2.dll
diff --git a/host/cmake/msvc/erllc_uhd.cat b/host/cmake/msvc/erllc_uhd.cat
new file mode 100644
index 000000000..cc6fbdc55
--- /dev/null
+++ b/host/cmake/msvc/erllc_uhd.cat
diff --git a/host/cmake/msvc/erllc_uhd_b100.inf b/host/cmake/msvc/erllc_uhd_b100.inf
index b28126932..c3a10535a 100644
--- a/host/cmake/msvc/erllc_uhd_b100.inf
+++ b/host/cmake/msvc/erllc_uhd_b100.inf
@@ -39,22 +39,21 @@
 ; =====================================================
 
 DeviceName = "Ettus Research LLC B100"
-; Make sure "VID_" and "PID_" are always part of the strings below
 VendorID = "VID_2500"
 ProductID = "PID_0002"
 DeviceGUID = "{43ec6c7f-2686-492f-add6-601ebbf5e89a}"
 DeviceClassGUID = "{78a1c341-4539-11d3-b88d-00c04fad5171}"
 ; Date MUST be in MM/DD/YYYY format
-Date = "10/10/2011"
+Date = "03/29/2016"
 
 ; =====================================================
 ; ========== END USER CONFIGURABLE SECTION ============
 ; =====================================================
 
-ProviderName = "libusb 1.0"
+ProviderName = "Ettus Research"
 WinUSB_SvcDesc = "WinUSB Driver Service"
 DiskName = "libusb (WinUSB) Device Install Disk"
-ClassName = "libusb (WinUSB) devices"
+ClassName = "USRPs"
 
 ; ====================== Version ======================
 
@@ -64,7 +63,7 @@ Signature = "$Windows NT$"
 Class = %ClassName%
 ClassGuid = %DeviceClassGUID%
 Provider = %ProviderName%
-CatalogFile = libusb_device.cat
+CatalogFile = erllc_uhd.cat
 
 ; =================== Class section ===================
 
@@ -100,7 +99,7 @@ Needs=WINUSB.NT
 ; The Include directive in the USB_Install.Services section includes the system-
 ; supplied INF for WinUSB. This INF is installed by the WinUSB co-installer if 
 ; it is not already on the target system. The AddService directive specifies 
-; WinUsb.sys as the device’s function driver. These directives should not be 
+; WinUsb.sys as the device's function driver. These directives should not be 
 ; modified.
 [USB_Install.Services]
 Include=winusb.inf
@@ -128,7 +127,7 @@ KmdfLibraryVersion=1.9
 ; USB_Install.HW is the key section in the INF. It specifies the device 
 ; interface globally unique identifier (GUID) for your device. The AddReg 
 ; directive puts the interface GUID in a standard registry value. When 
-; WinUsb.sys is loaded as the device’s function driver, it reads the registry
+; WinUsb.sys is loaded as the device's function driver, it reads the registry
 ; value and uses the specified GUID to represent the device interface. You 
 ; should replace the GUID in this example with one that you create specifically
 ; for your device. If the protocols for the device change, you should create a
diff --git a/host/cmake/msvc/erllc_uhd_b200.inf b/host/cmake/msvc/erllc_uhd_b200.inf
index 44647f726..26a3cc0d6 100644
--- a/host/cmake/msvc/erllc_uhd_b200.inf
+++ b/host/cmake/msvc/erllc_uhd_b200.inf
@@ -39,22 +39,21 @@
 ; =====================================================
 
 DeviceName = "Ettus Research LLC B200/B210"
-; Make sure "VID_" and "PID_" are always part of the strings below
 VendorID = "VID_2500"
 ProductID = "PID_0020"
 DeviceGUID = "{43ec6c7f-2686-492f-add6-601ebbf5e89a}"
 DeviceClassGUID = "{78a1c341-4539-11d3-b88d-00c04fad5171}"
 ; Date MUST be in MM/DD/YYYY format
-Date = "10/10/2011"
+Date = "03/29/2016"
 
 ; =====================================================
 ; ========== END USER CONFIGURABLE SECTION ============
 ; =====================================================
 
-ProviderName = "libusb 1.0"
+ProviderName = "Ettus Research"
 WinUSB_SvcDesc = "WinUSB Driver Service"
 DiskName = "libusb (WinUSB) Device Install Disk"
-ClassName = "libusb (WinUSB) devices"
+ClassName = "USRPs"
 
 ; ====================== Version ======================
 
@@ -64,7 +63,7 @@ Signature = "$Windows NT$"
 Class = %ClassName%
 ClassGuid = %DeviceClassGUID%
 Provider = %ProviderName%
-CatalogFile = libusb_device.cat
+CatalogFile = erllc_uhd.cat
 
 ; =================== Class section ===================
 
diff --git a/host/cmake/msvc/erllc_uhd_b200_reinit.inf b/host/cmake/msvc/erllc_uhd_b200_reinit.inf
index 13934ef53..bb65e9c3e 100644
--- a/host/cmake/msvc/erllc_uhd_b200_reinit.inf
+++ b/host/cmake/msvc/erllc_uhd_b200_reinit.inf
diff --git a/host/cmake/msvc/erllc_uhd_b200mini.inf b/host/cmake/msvc/erllc_uhd_b200mini.inf
index ce8f730e0..63aa2a0a7 100644
--- a/host/cmake/msvc/erllc_uhd_b200mini.inf
+++ b/host/cmake/msvc/erllc_uhd_b200mini.inf
@@ -45,16 +45,16 @@ ProductID = "PID_0021"
 DeviceGUID = "{6960fcb7-8440-4271-a4e3-fef0cb9d01f7}"
 DeviceClassGUID = "{78a1c341-4539-11d3-b88d-00c04fad5171}"
 ; Date MUST be in MM/DD/YYYY format
-Date = "08/13/2015"
+Date = "03/29/2016"
 
 ; =====================================================
 ; ========== END USER CONFIGURABLE SECTION ============
 ; =====================================================
 
-ProviderName = "libusb 1.0"
+ProviderName = "Ettus Research"
 WinUSB_SvcDesc = "WinUSB Driver Service"
 DiskName = "libusb (WinUSB) Device Install Disk"
-ClassName = "libusb (WinUSB) devices"
+ClassName = "USRPs"
 
 ; ====================== Version ======================
 
@@ -64,7 +64,7 @@ Signature = "$Windows NT$"
 Class = %ClassName%
 ClassGuid = %DeviceClassGUID%
 Provider = %ProviderName%
-CatalogFile = libusb_device.cat
+CatalogFile = erllc_uhd.cat
 
 ; =================== Class section ===================
 
diff --git a/host/cmake/msvc/erllc_uhd_b205mini.inf b/host/cmake/msvc/erllc_uhd_b205mini.inf
index 1e5852656..e72474181 100644
--- a/host/cmake/msvc/erllc_uhd_b205mini.inf
+++ b/host/cmake/msvc/erllc_uhd_b205mini.inf
@@ -39,22 +39,21 @@
 ; =====================================================
 
 DeviceName = "Ettus Research B205mini"
-; Make sure "VID_" and "PID_" are always part of the strings below
 VendorID = "VID_2500"
 ProductID = "PID_0022"
 DeviceGUID = "{211d89c8-92d7-11e5-be76-3c970eb8a18b}"
 DeviceClassGUID = "{78a1c341-4539-11d3-b88d-00c04fad5171}"
 ; Date MUST be in MM/DD/YYYY format
-Date = "11/24/2015"
+Date = "03/29/2016"
 
 ; =====================================================
 ; ========== END USER CONFIGURABLE SECTION ============
 ; =====================================================
 
-ProviderName = "libusb 1.0"
+ProviderName = "Ettus Research"
 WinUSB_SvcDesc = "WinUSB Driver Service"
 DiskName = "libusb (WinUSB) Device Install Disk"
-ClassName = "libusb (WinUSB) devices"
+ClassName = "USRPs"
 
 ; ====================== Version ======================
 
@@ -64,7 +63,7 @@ Signature = "$Windows NT$"
 Class = %ClassName%
 ClassGuid = %DeviceClassGUID%
 Provider = %ProviderName%
-CatalogFile = libusb_device.cat
+CatalogFile = erllc_uhd.cat
 
 ; =================== Class section ===================
 
diff --git a/host/cmake/msvc/erllc_uhd_makecat.cdf b/host/cmake/msvc/erllc_uhd_makecat.cdf
new file mode 100644
index 000000000..9e4ec7a92
--- /dev/null
+++ b/host/cmake/msvc/erllc_uhd_makecat.cdf
@@ -0,0 +1,17 @@
+[CatalogHeader]

+Name=erllc_uhd.cat

+PublicVersion=0x0000001

+EncodingType=0x00010001

+CATATTR1=0x10010001:OSAttr:2:5.1

+

+[CatalogFiles]

+<hash>erllc_uhd_usrp1.inf=erllc_uhd_usrp1.inf

+<hash>erllc_uhd_b100.inf=erllc_uhd_b100.inf

+<hash>erllc_uhd_b200.inf=erllc_uhd_b200.inf

+<hash>erllc_uhd_b200_reinit.inf=erllc_uhd_b200_reinit.inf

+<hash>erllc_uhd_b200mini.inf=erllc_uhd_b200mini.inf

+<hash>erllc_uhd_b205mini.inf=erllc_uhd_b205mini.inf

+<hash>WdfCoInstaller01009.dll=amd64\WdfCoInstaller01009.dll

+<hash>WdfCoInstaller01009.dll=x86\WdfCoInstaller01009.dll

+<hash>winusbcoinstaller2.dll=amd64\winusbcoinstaller2.dll

+<hash>winusbcoinstaller2.dll=x86\winusbcoinstaller2.dll 
\ No newline at end of file
diff --git a/host/cmake/msvc/erllc_uhd_usrp1.inf b/host/cmake/msvc/erllc_uhd_usrp1.inf
index 59c6c0074..c9e38b474 100644
--- a/host/cmake/msvc/erllc_uhd_usrp1.inf
+++ b/host/cmake/msvc/erllc_uhd_usrp1.inf
@@ -39,22 +39,21 @@
 ; =====================================================
 
 DeviceName = "Ettus Research LLC USRP1"
-; Make sure "VID_" and "PID_" are always part of the strings below
 VendorID = "VID_FFFE"
 ProductID = "PID_0002"
 DeviceGUID = "{E61C0BFC-4E86-4E82-B1F5-1C3EA28802FC}"
 DeviceClassGUID = "{78a1c341-4539-11d3-b88d-00c04fad5171}"
 ; Date MUST be in MM/DD/YYYY format
-Date = "09/06/2011"
+Date = "03/29/2016"
 
 ; =====================================================
 ; ========== END USER CONFIGURABLE SECTION ============
 ; =====================================================
 
-ProviderName = "libusb 1.0"
+ProviderName = "Ettus Research"
 WinUSB_SvcDesc = "WinUSB Driver Service"
 DiskName = "libusb (WinUSB) Device Install Disk"
-ClassName = "libusb (WinUSB) devices"
+ClassName = "USRPs"
 
 ; ====================== Version ======================
 
@@ -64,7 +63,7 @@ Signature = "$Windows NT$"
 Class = %ClassName%
 ClassGuid = %DeviceClassGUID%
 Provider = %ProviderName%
-CatalogFile = libusb_device.cat
+CatalogFile = erllc_uhd.cat
 
 ; =================== Class section ===================
 
diff --git a/host/cmake/msvc/x86/WdfCoInstaller01009.dll b/host/cmake/msvc/x86/WdfCoInstaller01009.dll
new file mode 100644
index 000000000..30e81af62
--- /dev/null
+++ b/host/cmake/msvc/x86/WdfCoInstaller01009.dll
diff --git a/host/cmake/msvc/x86/winusbcoinstaller2.dll b/host/cmake/msvc/x86/winusbcoinstaller2.dll
new file mode 100644
index 000000000..fc450d2b2
--- /dev/null
+++ b/host/cmake/msvc/x86/winusbcoinstaller2.dll