From 29f5c20c05bd58dab378b042c8797b461d97ae0a Mon Sep 17 00:00:00 2001 From: Derek Kozel Date: Wed, 2 Nov 2016 10:58:22 -0700 Subject: Windows: Updated and signed USB INF files --- host/cmake/msvc/amd64/WdfCoInstaller01009.dll | Bin 0 -> 1721576 bytes host/cmake/msvc/amd64/winusbcoinstaller2.dll | Bin 0 -> 1002728 bytes host/cmake/msvc/erllc_uhd.cat | Bin 0 -> 11129 bytes host/cmake/msvc/erllc_uhd_b100.inf | 13 ++++++------- host/cmake/msvc/erllc_uhd_b200.inf | 9 ++++----- host/cmake/msvc/erllc_uhd_b200_reinit.inf | Bin 4614 -> 2211 bytes host/cmake/msvc/erllc_uhd_b200mini.inf | 8 ++++---- host/cmake/msvc/erllc_uhd_b205mini.inf | 9 ++++----- host/cmake/msvc/erllc_uhd_makecat.cdf | 17 +++++++++++++++++ host/cmake/msvc/erllc_uhd_usrp1.inf | 9 ++++----- host/cmake/msvc/x86/WdfCoInstaller01009.dll | Bin 0 -> 1461992 bytes host/cmake/msvc/x86/winusbcoinstaller2.dll | Bin 0 -> 851176 bytes 12 files changed, 39 insertions(+), 26 deletions(-) create mode 100644 host/cmake/msvc/amd64/WdfCoInstaller01009.dll create mode 100644 host/cmake/msvc/amd64/winusbcoinstaller2.dll create mode 100644 host/cmake/msvc/erllc_uhd.cat create mode 100644 host/cmake/msvc/erllc_uhd_makecat.cdf create mode 100644 host/cmake/msvc/x86/WdfCoInstaller01009.dll create mode 100644 host/cmake/msvc/x86/winusbcoinstaller2.dll (limited to 'host/cmake') diff --git a/host/cmake/msvc/amd64/WdfCoInstaller01009.dll b/host/cmake/msvc/amd64/WdfCoInstaller01009.dll new file mode 100644 index 000000000..1731b962d Binary files /dev/null and b/host/cmake/msvc/amd64/WdfCoInstaller01009.dll differ diff --git a/host/cmake/msvc/amd64/winusbcoinstaller2.dll b/host/cmake/msvc/amd64/winusbcoinstaller2.dll new file mode 100644 index 000000000..30e55025b Binary files /dev/null and b/host/cmake/msvc/amd64/winusbcoinstaller2.dll differ diff --git a/host/cmake/msvc/erllc_uhd.cat b/host/cmake/msvc/erllc_uhd.cat new file mode 100644 index 000000000..cc6fbdc55 Binary files /dev/null and b/host/cmake/msvc/erllc_uhd.cat differ 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 Binary files a/host/cmake/msvc/erllc_uhd_b200_reinit.inf and b/host/cmake/msvc/erllc_uhd_b200_reinit.inf differ 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] +erllc_uhd_usrp1.inf=erllc_uhd_usrp1.inf +erllc_uhd_b100.inf=erllc_uhd_b100.inf +erllc_uhd_b200.inf=erllc_uhd_b200.inf +erllc_uhd_b200_reinit.inf=erllc_uhd_b200_reinit.inf +erllc_uhd_b200mini.inf=erllc_uhd_b200mini.inf +erllc_uhd_b205mini.inf=erllc_uhd_b205mini.inf +WdfCoInstaller01009.dll=amd64\WdfCoInstaller01009.dll +WdfCoInstaller01009.dll=x86\WdfCoInstaller01009.dll +winusbcoinstaller2.dll=amd64\winusbcoinstaller2.dll +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 Binary files /dev/null and b/host/cmake/msvc/x86/WdfCoInstaller01009.dll differ diff --git a/host/cmake/msvc/x86/winusbcoinstaller2.dll b/host/cmake/msvc/x86/winusbcoinstaller2.dll new file mode 100644 index 000000000..fc450d2b2 Binary files /dev/null and b/host/cmake/msvc/x86/winusbcoinstaller2.dll differ -- cgit v1.2.3 From 929e3b32c8eafe30f06ad473f318bd0371e07b04 Mon Sep 17 00:00:00 2001 From: Derek Kozel Date: Wed, 2 Nov 2016 13:39:20 -0700 Subject: Preparing branch for 3.10.1.0 release - Updated CHANGELOG - Updated images package --- host/CMakeLists.txt | 4 ++-- host/cmake/debian/changelog | 31 +++++++++++++++++++++++++++++++ 2 files changed, 33 insertions(+), 2 deletions(-) (limited to 'host/cmake') diff --git a/host/CMakeLists.txt b/host/CMakeLists.txt index 4947b3fa0..40819f176 100644 --- a/host/CMakeLists.txt +++ b/host/CMakeLists.txt @@ -338,8 +338,8 @@ UHD_INSTALL(FILES #{{{IMG_SECTION # This section is written automatically by /images/create_imgs_package.py # Any manual changes in here will be overwritten. -SET(UHD_IMAGES_MD5SUM "078b883192ef8d68465e4681537c1a8a") -SET(UHD_IMAGES_DOWNLOAD_SRC "uhd-images_003.010.001.000-rc2.zip") +SET(UHD_IMAGES_MD5SUM "21f58d903775485e2243a6ee77706679") +SET(UHD_IMAGES_DOWNLOAD_SRC "uhd-images_003.010.001.000-release.zip") #}}} ######################################################################## diff --git a/host/cmake/debian/changelog b/host/cmake/debian/changelog index f38aab406..8719edc5a 100644 --- a/host/cmake/debian/changelog +++ b/host/cmake/debian/changelog @@ -1,3 +1,34 @@ +uhd (3.10.1.0-0ubuntu1) trusty; urgency=low + + + -- Ettus Research Wed, 02 Nov 2016 01:20:07 -0800 + + - Fixed multiple compiler warnings + - Multiple documentation fixes + - X300: RX strobe lines are always in sync on device initialization. DB EEPROM + now properly written. ignore-cal-file no longer ignored. Fixed case where too + large recv_frame_size settings could break things. Reduced ZPU clock speed + (helps FPGA timing). Added area constraints for AXI interconnect. Improved + halfband scaling in rx_frontend. Improved PCIe streaming reliability + - B2xx: Clear sequence numbers in idle state. + - RFNoC: Nodes disconnect on destruction. Fixed setting of correct bits on + sr_error_policy. DDC does no longer clear timed commands on EOB. DUC fixed + timed CORDIC tuning. Enable Noc-Shell response FIFOs (fixes simultaneous + commands on multiple channels). + - UBX: Changed default performance parameters + - TwinRX: LEDs properly light up depending on channels. Fixed issue of multiple + (redundant) writes. Simplified API steps for phase synchronization + - XCVR: Query dboard clock instead of DAC clock. Helps in X3x0s. + - GPS: Fixed message for case when no GPS is present. Fixed multiple GPS-related + issues. + - Converters: Fixed floating point rounding error in tests. + - Utils: uhd_usrp_probe can now query vectors + - Fixed issue that prevented soft_regs working on 32-bit systems + - Tools: Merged dissectors into common directory. + - CMake: -Og is the default now for gcc-based Debug builds. + + -- Ettus Research Wed, 02 Nov 2016 01:20:07 -0800 + uhd (3.10.0.0-0ubuntu1) trusty; urgency=low - Changed version string to quadruplets (Major.API.ABI.Patch) -- cgit v1.2.3 From 4594f7d783563fb434a3974533347d234169c2f5 Mon Sep 17 00:00:00 2001 From: Derek Kozel Date: Wed, 2 Nov 2016 16:50:08 -0700 Subject: Debian: Fix changelog format --- host/cmake/debian/changelog | 3 --- 1 file changed, 3 deletions(-) (limited to 'host/cmake') diff --git a/host/cmake/debian/changelog b/host/cmake/debian/changelog index 8719edc5a..94ee3885a 100644 --- a/host/cmake/debian/changelog +++ b/host/cmake/debian/changelog @@ -1,8 +1,5 @@ uhd (3.10.1.0-0ubuntu1) trusty; urgency=low - - -- Ettus Research Wed, 02 Nov 2016 01:20:07 -0800 - - Fixed multiple compiler warnings - Multiple documentation fixes - X300: RX strobe lines are always in sync on device initialization. DB EEPROM -- cgit v1.2.3