From 574a83c3cedbbb5c70e6183e440c60628c4d8edb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jaroslav=20=C5=A0karvada?= Date: Thu, 1 Dec 2011 17:15:55 +0100 Subject: [PATCH 001/152] Initial import (#750591) --- .gitignore | 1 + sources | 1 + uhd.spec | 104 +++++++++++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 106 insertions(+) create mode 100644 uhd.spec diff --git a/.gitignore b/.gitignore index e69de29..2d144e6 100644 --- a/.gitignore +++ b/.gitignore @@ -0,0 +1 @@ +/uhd-3.3.0.tar.gz diff --git a/sources b/sources index e69de29..c09c600 100644 --- a/sources +++ b/sources @@ -0,0 +1 @@ +438e6fbf20352b76eda21840d6714d6f uhd-3.3.0.tar.gz diff --git a/uhd.spec b/uhd.spec new file mode 100644 index 0000000..ded7c4a --- /dev/null +++ b/uhd.spec @@ -0,0 +1,104 @@ +# Pull from git +%global git_tag release_003_003_000 + +# git clone git://code.ettus.com/ettus/uhd.git +# cd uhd +# git archive --format=tar --prefix=%%{name}-%%{version}/ %%{git_tag} | \ +# gzip > ../%%{name}-%%{version}.tar.gz + +Name: uhd +URL: http://code.ettus.com/redmine/ettus/projects/uhd/wiki +Version: 3.3.0 +Release: 2%{?dist} +License: GPLv3+ +BuildRequires: cmake +BuildRequires: boost-devel libusb1-devel python-cheetah +BuildRequires: docutils doxygen pkgconfig +Group: Applications/Engineering +Summary: Universal Hardware Driver +Source0: %{name}-%{version}.tar.gz + +%description +The UHD is the universal hardware driver for Ettus Research products. +The goal of the UHD is to provide a host driver and API for current and +future Ettus Research products. It can be used standalone without GNU Radio. + +%prep +%setup -q + +%build +mkdir host/build +cd host/build +%cmake ../ +make %{?_smp_mflags} + +%check +cd host/build +make test + +%install +pushd host/build +make install DESTDIR=%{buildroot} + +# Allow access only to users in usrp group +sed -i 's/MODE:="0666"/MODE:="0660"/' %{buildroot}%{_datadir}/uhd/utils/uhd-usrp.rules +mkdir -p %{buildroot}%{_sysconfdir}/udev/rules.d +mv %{buildroot}%{_datadir}/uhd/utils/uhd-usrp.rules %{buildroot}%{_sysconfdir}/udev/rules.d/10-usrp-uhd.rules + +# Remove binaries for tests, examples +rm -rf %{buildroot}%{_datadir}/uhd/{tests,examples} + +# Move the utils stuff to libexec dir +mkdir -p %{buildroot}%{_libexecdir}/uhd +mv %{buildroot}%{_datadir}/uhd/utils/* %{buildroot}%{_libexecdir}/uhd + +popd +# Package base docs to base package +mkdir _tmpdoc +mv %{buildroot}%{_docdir}/%{name}/{AUTHORS.txt,LICENSE.txt,README.txt} _tmpdoc + +%post -p /sbin/ldconfig + +%postun -p /sbin/ldconfig + +%package devel +Summary: Development files for UHD +Group: Applications/Engineering +Requires: %{name} = %{version}-%{release} + +%description devel +Development files for the Universal Hardware Driver (UHD). + +%package doc +Summary: Documentation files for UHD +Group: Applications/Engineering +BuildArch: noarch + +%description doc +Documentation for the Universal Hardware Driver (UHD). + +%pre -n uhd +getent group usrp >/dev/null || groupadd -r usrp + +%files +%doc _tmpdoc/* +%{_bindir}/uhd_find_devices +%{_bindir}/uhd_usrp_probe +%config(noreplace) %{_sysconfdir}/udev/rules.d/10-usrp-uhd.rules +%{_libdir}/lib*.so.* +%{_libexecdir}/uhd + +%files devel +%{_includedir}/* +%{_libdir}/lib*.so +%{_libdir}/pkgconfig/*.pc + +%files doc +%doc %{_docdir}/%{name}/* + +%changelog +* Wed Nov 30 2011 Jaroslav Škarvada - 3.3.0-2 +- Fixed according to reviewer comments + +* Tue Nov 01 2011 Jaroslav Škarvada - 3.3.0-1 +- Initial version From 40c5808b9c8e2920825172b821c50e4b0b41d4d5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jaroslav=20=C5=A0karvada?= Date: Thu, 1 Dec 2011 17:28:30 +0100 Subject: [PATCH 002/152] Updated summary to be more descriptive --- uhd.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/uhd.spec b/uhd.spec index ded7c4a..672c613 100644 --- a/uhd.spec +++ b/uhd.spec @@ -9,13 +9,13 @@ Name: uhd URL: http://code.ettus.com/redmine/ettus/projects/uhd/wiki Version: 3.3.0 -Release: 2%{?dist} +Release: 3%{?dist} License: GPLv3+ BuildRequires: cmake BuildRequires: boost-devel libusb1-devel python-cheetah BuildRequires: docutils doxygen pkgconfig Group: Applications/Engineering -Summary: Universal Hardware Driver +Summary: Universal Hardware Driver for Ettus Research products Source0: %{name}-%{version}.tar.gz %description @@ -97,6 +97,9 @@ getent group usrp >/dev/null || groupadd -r usrp %doc %{_docdir}/%{name}/* %changelog +* Thu Dec 1 2011 Jaroslav Škarvada - 3.3.0-3 +- Updated summary to be more descriptive + * Wed Nov 30 2011 Jaroslav Škarvada - 3.3.0-2 - Fixed according to reviewer comments From f68f07b9a128d10700a1b2be2a343990e4f2bdbb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jaroslav=20=C5=A0karvada?= Date: Fri, 2 Dec 2011 17:19:18 +0100 Subject: [PATCH 003/152] New version --- .gitignore | 2 +- sources | 2 +- uhd.spec | 9 ++++++--- 3 files changed, 8 insertions(+), 5 deletions(-) diff --git a/.gitignore b/.gitignore index 2d144e6..9b76401 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -/uhd-3.3.0.tar.gz +uhd-*.tar.gz diff --git a/sources b/sources index c09c600..5a78763 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -438e6fbf20352b76eda21840d6714d6f uhd-3.3.0.tar.gz +774a5e7982fd4118531d2daac0b30bf4 uhd-3.3.1.tar.gz diff --git a/uhd.spec b/uhd.spec index 672c613..53d1809 100644 --- a/uhd.spec +++ b/uhd.spec @@ -1,5 +1,5 @@ # Pull from git -%global git_tag release_003_003_000 +%global git_tag release_003_003_001 # git clone git://code.ettus.com/ettus/uhd.git # cd uhd @@ -8,8 +8,8 @@ Name: uhd URL: http://code.ettus.com/redmine/ettus/projects/uhd/wiki -Version: 3.3.0 -Release: 3%{?dist} +Version: 3.3.1 +Release: 1%{?dist} License: GPLv3+ BuildRequires: cmake BuildRequires: boost-devel libusb1-devel python-cheetah @@ -97,6 +97,9 @@ getent group usrp >/dev/null || groupadd -r usrp %doc %{_docdir}/%{name}/* %changelog +* Fri Dec 2 2011 Jaroslav Škarvada - 3.3.1-1 +- New version + * Thu Dec 1 2011 Jaroslav Škarvada - 3.3.0-3 - Updated summary to be more descriptive From 08f4c58631da4b4b369e84ae8e1d1237f8cee8ea Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jaroslav=20=C5=A0karvada?= Date: Wed, 11 Jan 2012 23:59:26 +0100 Subject: [PATCH 004/152] Minor tweaks to %pre scriptlet Fixed udev rules Added tkinter requires Resolves: rhbz#769678 --- uhd.spec | 18 +++++++++++++----- 1 file changed, 13 insertions(+), 5 deletions(-) diff --git a/uhd.spec b/uhd.spec index 53d1809..12c9229 100644 --- a/uhd.spec +++ b/uhd.spec @@ -9,11 +9,13 @@ Name: uhd URL: http://code.ettus.com/redmine/ettus/projects/uhd/wiki Version: 3.3.1 -Release: 1%{?dist} +Release: 2%{?dist} License: GPLv3+ BuildRequires: cmake BuildRequires: boost-devel libusb1-devel python-cheetah BuildRequires: docutils doxygen pkgconfig +Requires(pre): shadow-utils +Requires: tkinter Group: Applications/Engineering Summary: Universal Hardware Driver for Ettus Research products Source0: %{name}-%{version}.tar.gz @@ -40,8 +42,8 @@ make test pushd host/build make install DESTDIR=%{buildroot} -# Allow access only to users in usrp group -sed -i 's/MODE:="0666"/MODE:="0660"/' %{buildroot}%{_datadir}/uhd/utils/uhd-usrp.rules +# Fix udev rules and allow access only to users in usrp group +sed -i 's/BUS==/SUBSYSTEM==/;s/SYSFS{/ATTRS{/;s/MODE:="0666"/GROUP:="usrp", MODE:="0660"/' %{buildroot}%{_datadir}/uhd/utils/uhd-usrp.rules mkdir -p %{buildroot}%{_sysconfdir}/udev/rules.d mv %{buildroot}%{_datadir}/uhd/utils/uhd-usrp.rules %{buildroot}%{_sysconfdir}/udev/rules.d/10-usrp-uhd.rules @@ -77,8 +79,8 @@ BuildArch: noarch %description doc Documentation for the Universal Hardware Driver (UHD). -%pre -n uhd -getent group usrp >/dev/null || groupadd -r usrp +%pre +getent group usrp >/dev/null || groupadd -r usrp >/dev/null %files %doc _tmpdoc/* @@ -97,6 +99,12 @@ getent group usrp >/dev/null || groupadd -r usrp %doc %{_docdir}/%{name}/* %changelog +* Wed Jan 11 2012 Jaroslav Škarvada - 3.3.1-2 +- Minor tweaks to %%pre scriptlet +- Fixed udev rules +- Added tkinter requires + Resolves: rhbz#769678 + * Fri Dec 2 2011 Jaroslav Škarvada - 3.3.1-1 - New version From 907efa0cb6af6ccca9bbd69c61929f5fb2433bd3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jaroslav=20=C5=A0karvada?= Date: Fri, 10 Feb 2012 11:14:18 +0100 Subject: [PATCH 005/152] Allowed UHD to boost the thread's scheduling priority Resolves: rhbz#781540 --- uhd-limits.conf | 5 +++++ uhd.spec | 10 +++++++++- 2 files changed, 14 insertions(+), 1 deletion(-) create mode 100644 uhd-limits.conf diff --git a/uhd-limits.conf b/uhd-limits.conf new file mode 100644 index 0000000..2a4f63a --- /dev/null +++ b/uhd-limits.conf @@ -0,0 +1,5 @@ +# Required for better USRP performance, see: +# http://files.ettus.com/uhd_docs/manual/html/general.html#threading-notes +# http://bugzilla.redhat.com/show_bug.cgi?id=781540 + +@usrp - rtprio 99 diff --git a/uhd.spec b/uhd.spec index 12c9229..1d8f228 100644 --- a/uhd.spec +++ b/uhd.spec @@ -9,7 +9,7 @@ Name: uhd URL: http://code.ettus.com/redmine/ettus/projects/uhd/wiki Version: 3.3.1 -Release: 2%{?dist} +Release: 3%{?dist} License: GPLv3+ BuildRequires: cmake BuildRequires: boost-devel libusb1-devel python-cheetah @@ -19,6 +19,7 @@ Requires: tkinter Group: Applications/Engineering Summary: Universal Hardware Driver for Ettus Research products Source0: %{name}-%{version}.tar.gz +Source1: %{name}-limits.conf %description The UHD is the universal hardware driver for Ettus Research products. @@ -59,6 +60,8 @@ popd mkdir _tmpdoc mv %{buildroot}%{_docdir}/%{name}/{AUTHORS.txt,LICENSE.txt,README.txt} _tmpdoc +install -m 644 -D %{SOURCE1} %{buildroot}%{_sysconfdir}/security/limits.d/99-usrp.conf + %post -p /sbin/ldconfig %postun -p /sbin/ldconfig @@ -87,6 +90,7 @@ getent group usrp >/dev/null || groupadd -r usrp >/dev/null %{_bindir}/uhd_find_devices %{_bindir}/uhd_usrp_probe %config(noreplace) %{_sysconfdir}/udev/rules.d/10-usrp-uhd.rules +%config(noreplace) %{_sysconfdir}/security/limits.d/*.conf %{_libdir}/lib*.so.* %{_libexecdir}/uhd @@ -99,6 +103,10 @@ getent group usrp >/dev/null || groupadd -r usrp >/dev/null %doc %{_docdir}/%{name}/* %changelog +* Fri Feb 10 2012 Jaroslav Škarvada - 3.3.1-3 +- Allowed UHD to boost the thread's scheduling priority + Resolves: rhbz#781540 + * Wed Jan 11 2012 Jaroslav Škarvada - 3.3.1-2 - Minor tweaks to %%pre scriptlet - Fixed udev rules From 50fcd9735241b4a784264f4325992bcc5221d66d Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Tue, 28 Feb 2012 14:28:14 -0600 Subject: [PATCH 006/152] - Rebuilt for c++ ABI breakage --- uhd.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/uhd.spec b/uhd.spec index 1d8f228..bad7885 100644 --- a/uhd.spec +++ b/uhd.spec @@ -9,7 +9,7 @@ Name: uhd URL: http://code.ettus.com/redmine/ettus/projects/uhd/wiki Version: 3.3.1 -Release: 3%{?dist} +Release: 4%{?dist} License: GPLv3+ BuildRequires: cmake BuildRequires: boost-devel libusb1-devel python-cheetah @@ -103,6 +103,9 @@ getent group usrp >/dev/null || groupadd -r usrp >/dev/null %doc %{_docdir}/%{name}/* %changelog +* Tue Feb 28 2012 Fedora Release Engineering - 3.3.1-4 +- Rebuilt for c++ ABI breakage + * Fri Feb 10 2012 Jaroslav Škarvada - 3.3.1-3 - Allowed UHD to boost the thread's scheduling priority Resolves: rhbz#781540 From 92d0f44ce0530c522c5d87bbffbb86b4c83d5a01 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jaroslav=20=C5=A0karvada?= Date: Mon, 19 Mar 2012 10:45:30 +0100 Subject: [PATCH 007/152] New version --- sources | 2 +- uhd.spec | 9 ++++++--- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/sources b/sources index 5a78763..39db599 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -774a5e7982fd4118531d2daac0b30bf4 uhd-3.3.1.tar.gz +b4ac7e2f438fde8d2840efc5beb2cc30 uhd-3.3.2.tar.gz diff --git a/uhd.spec b/uhd.spec index bad7885..934af57 100644 --- a/uhd.spec +++ b/uhd.spec @@ -1,5 +1,5 @@ # Pull from git -%global git_tag release_003_003_001 +%global git_tag release_003_003_002 # git clone git://code.ettus.com/ettus/uhd.git # cd uhd @@ -8,8 +8,8 @@ Name: uhd URL: http://code.ettus.com/redmine/ettus/projects/uhd/wiki -Version: 3.3.1 -Release: 4%{?dist} +Version: 3.3.2 +Release: 1%{?dist} License: GPLv3+ BuildRequires: cmake BuildRequires: boost-devel libusb1-devel python-cheetah @@ -103,6 +103,9 @@ getent group usrp >/dev/null || groupadd -r usrp >/dev/null %doc %{_docdir}/%{name}/* %changelog +* Mon Mar 19 2012 Jaroslav Škarvada - 3.3.2-1 +- New version + * Tue Feb 28 2012 Fedora Release Engineering - 3.3.1-4 - Rebuilt for c++ ABI breakage From 8593b77069da55db0c9aaf4482bce55e2d0ee107 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jaroslav=20=C5=A0karvada?= Date: Tue, 27 Mar 2012 13:49:46 +0200 Subject: [PATCH 008/152] New version - Fixed lockup on USRP1 r4.5 + DBSRX + another i2c board combo (usrp1-r45-dbsrx-i2c-fix patch) Resolves: rhbz#804440 --- sources | 2 +- uhd-3.4.0-usrp1-r45-dbsrx-i2c-fix.patch | 41 +++++++++++++++++++++++++ uhd.spec | 16 +++++++--- 3 files changed, 54 insertions(+), 5 deletions(-) create mode 100644 uhd-3.4.0-usrp1-r45-dbsrx-i2c-fix.patch diff --git a/sources b/sources index 39db599..ec43d92 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -b4ac7e2f438fde8d2840efc5beb2cc30 uhd-3.3.2.tar.gz +304728ac2f3dacfeab3dac611357aeec uhd-3.4.0.tar.gz diff --git a/uhd-3.4.0-usrp1-r45-dbsrx-i2c-fix.patch b/uhd-3.4.0-usrp1-r45-dbsrx-i2c-fix.patch new file mode 100644 index 0000000..ad91af1 --- /dev/null +++ b/uhd-3.4.0-usrp1-r45-dbsrx-i2c-fix.patch @@ -0,0 +1,41 @@ +commit 097f20df1653c33035b6dcfefbbef22572426c65 +Author: Josh Blum +Date: Mon Mar 26 14:25:56 2012 -0700 + + dbsrx: limit the USRP1 + DBSRX GPIO clock rate to 4MHz + + This fixes the lockup/clocking condition when the following hw combo is used: + USRP1 r4.5 + DBSRX + another i2c board + +diff --git a/host/lib/usrp/dboard/db_dbsrx.cpp b/host/lib/usrp/dboard/db_dbsrx.cpp +index 846597f..95c5c5d 100644 +--- a/host/lib/usrp/dboard/db_dbsrx.cpp ++++ b/host/lib/usrp/dboard/db_dbsrx.cpp +@@ -1,5 +1,5 @@ + // +-// Copyright 2010-2011 Ettus Research LLC ++// Copyright 2010-2012 Ettus Research LLC + // + // This program is free software: you can redistribute it and/or modify + // it under the terms of the GNU General Public License as published by +@@ -58,6 +58,8 @@ static const uhd::dict dbsrx_gain_ranges = map_list_o + ("GC2", gain_range_t(0, 24, 1)) + ; + ++static const double usrp1_gpio_clock_rate_limit = 4e6; ++ + /*********************************************************************** + * The DBSRX dboard class + **********************************************************************/ +@@ -265,6 +267,11 @@ double dbsrx::set_lo_freq(double target_freq){ + std::vector clock_rates = this->get_iface()->get_clock_rates(dboard_iface::UNIT_RX); + const double max_clock_rate = uhd::sorted(clock_rates).back(); + BOOST_FOREACH(ref_clock, uhd::reversed(uhd::sorted(clock_rates))){ ++ //USRP1 feeds the DBSRX clock from a FPGA GPIO line. ++ //make sure that this clock does not exceed rate limit. ++ if (this->get_iface()->get_special_props().soft_clock_divider){ ++ if (ref_clock > usrp1_gpio_clock_rate_limit) continue; ++ } + if (ref_clock > 27.0e6) continue; + if (size_t(max_clock_rate/ref_clock)%2 == 1) continue; //reject asymmetric clocks (odd divisors) + diff --git a/uhd.spec b/uhd.spec index 934af57..0d96d24 100644 --- a/uhd.spec +++ b/uhd.spec @@ -1,5 +1,5 @@ # Pull from git -%global git_tag release_003_003_002 +%global git_tag release_003_004_000 # git clone git://code.ettus.com/ettus/uhd.git # cd uhd @@ -8,7 +8,7 @@ Name: uhd URL: http://code.ettus.com/redmine/ettus/projects/uhd/wiki -Version: 3.3.2 +Version: 3.4.0 Release: 1%{?dist} License: GPLv3+ BuildRequires: cmake @@ -20,6 +20,8 @@ Group: Applications/Engineering Summary: Universal Hardware Driver for Ettus Research products Source0: %{name}-%{version}.tar.gz Source1: %{name}-limits.conf +# Upstream commit 097f20df1653c33035b6dcfefbbef22572426c65 +Patch0: uhd-3.4.0-usrp1-r45-dbsrx-i2c-fix.patch %description The UHD is the universal hardware driver for Ettus Research products. @@ -28,6 +30,7 @@ future Ettus Research products. It can be used standalone without GNU Radio. %prep %setup -q +%patch0 -p1 -b .usrp1-r45-dbsrx-i2c-fix %build mkdir host/build @@ -87,8 +90,7 @@ getent group usrp >/dev/null || groupadd -r usrp >/dev/null %files %doc _tmpdoc/* -%{_bindir}/uhd_find_devices -%{_bindir}/uhd_usrp_probe +%{_bindir}/* %config(noreplace) %{_sysconfdir}/udev/rules.d/10-usrp-uhd.rules %config(noreplace) %{_sysconfdir}/security/limits.d/*.conf %{_libdir}/lib*.so.* @@ -103,6 +105,12 @@ getent group usrp >/dev/null || groupadd -r usrp >/dev/null %doc %{_docdir}/%{name}/* %changelog +* Tue Mar 27 2012 Jaroslav Škarvada - 3.4.0-1 +- New version +- Fixed lockup on USRP1 r4.5 + DBSRX + another i2c board combo + (usrp1-r45-dbsrx-i2c-fix patch) + Resolves: rhbz#804440 + * Mon Mar 19 2012 Jaroslav Škarvada - 3.3.2-1 - New version From ea6520057d3c91cdd1d6f4d8518e362234bbb5a3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jaroslav=20=C5=A0karvada?= Date: Thu, 24 May 2012 15:53:37 +0200 Subject: [PATCH 009/152] New version - Removed usrp1-r45-dbsrx-i2c-fix patch (upstreamed) - Fixed convert_test failure on ARM by no-neon patch Resolves: rhbz#813393 --- sources | 2 +- uhd-3.4.0-usrp1-r45-dbsrx-i2c-fix.patch | 41 ------------------------- uhd-3.4.2-no-neon.patch | 28 +++++++++++++++++ uhd.spec | 16 +++++++--- 4 files changed, 40 insertions(+), 47 deletions(-) delete mode 100644 uhd-3.4.0-usrp1-r45-dbsrx-i2c-fix.patch create mode 100644 uhd-3.4.2-no-neon.patch diff --git a/sources b/sources index ec43d92..ccf5106 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -304728ac2f3dacfeab3dac611357aeec uhd-3.4.0.tar.gz +f80d4e5434ad5f43128501de00906612 uhd-3.4.2.tar.gz diff --git a/uhd-3.4.0-usrp1-r45-dbsrx-i2c-fix.patch b/uhd-3.4.0-usrp1-r45-dbsrx-i2c-fix.patch deleted file mode 100644 index ad91af1..0000000 --- a/uhd-3.4.0-usrp1-r45-dbsrx-i2c-fix.patch +++ /dev/null @@ -1,41 +0,0 @@ -commit 097f20df1653c33035b6dcfefbbef22572426c65 -Author: Josh Blum -Date: Mon Mar 26 14:25:56 2012 -0700 - - dbsrx: limit the USRP1 + DBSRX GPIO clock rate to 4MHz - - This fixes the lockup/clocking condition when the following hw combo is used: - USRP1 r4.5 + DBSRX + another i2c board - -diff --git a/host/lib/usrp/dboard/db_dbsrx.cpp b/host/lib/usrp/dboard/db_dbsrx.cpp -index 846597f..95c5c5d 100644 ---- a/host/lib/usrp/dboard/db_dbsrx.cpp -+++ b/host/lib/usrp/dboard/db_dbsrx.cpp -@@ -1,5 +1,5 @@ - // --// Copyright 2010-2011 Ettus Research LLC -+// Copyright 2010-2012 Ettus Research LLC - // - // This program is free software: you can redistribute it and/or modify - // it under the terms of the GNU General Public License as published by -@@ -58,6 +58,8 @@ static const uhd::dict dbsrx_gain_ranges = map_list_o - ("GC2", gain_range_t(0, 24, 1)) - ; - -+static const double usrp1_gpio_clock_rate_limit = 4e6; -+ - /*********************************************************************** - * The DBSRX dboard class - **********************************************************************/ -@@ -265,6 +267,11 @@ double dbsrx::set_lo_freq(double target_freq){ - std::vector clock_rates = this->get_iface()->get_clock_rates(dboard_iface::UNIT_RX); - const double max_clock_rate = uhd::sorted(clock_rates).back(); - BOOST_FOREACH(ref_clock, uhd::reversed(uhd::sorted(clock_rates))){ -+ //USRP1 feeds the DBSRX clock from a FPGA GPIO line. -+ //make sure that this clock does not exceed rate limit. -+ if (this->get_iface()->get_special_props().soft_clock_divider){ -+ if (ref_clock > usrp1_gpio_clock_rate_limit) continue; -+ } - if (ref_clock > 27.0e6) continue; - if (size_t(max_clock_rate/ref_clock)%2 == 1) continue; //reject asymmetric clocks (odd divisors) - diff --git a/uhd-3.4.2-no-neon.patch b/uhd-3.4.2-no-neon.patch new file mode 100644 index 0000000..0bde709 --- /dev/null +++ b/uhd-3.4.2-no-neon.patch @@ -0,0 +1,28 @@ +diff -up uhd-3.4.2/host/lib/convert/CMakeLists.txt.orig uhd-3.4.2/host/lib/convert/CMakeLists.txt +--- uhd-3.4.2/host/lib/convert/CMakeLists.txt.orig 2012-05-23 00:16:15.000000000 +0200 ++++ uhd-3.4.2/host/lib/convert/CMakeLists.txt 2012-05-24 12:27:08.225172012 +0200 +@@ -93,15 +93,15 @@ IF(CMAKE_COMPILER_IS_GNUCXX) + UNSET(CMAKE_REQUIRED_FLAGS) + ENDIF(CMAKE_COMPILER_IS_GNUCXX) + +-IF(HAVE_ARM_NEON_H) +- SET_SOURCE_FILES_PROPERTIES( +- ${CMAKE_CURRENT_SOURCE_DIR}/convert_with_neon.cpp +- PROPERTIES COMPILE_FLAGS "${NEON_FLAGS}" +- ) +- LIBUHD_APPEND_SOURCES( +- ${CMAKE_CURRENT_SOURCE_DIR}/convert_with_neon.cpp +- ) +-ENDIF() ++#IF(HAVE_ARM_NEON_H) ++# SET_SOURCE_FILES_PROPERTIES( ++# ${CMAKE_CURRENT_SOURCE_DIR}/convert_with_neon.cpp ++# PROPERTIES COMPILE_FLAGS "${NEON_FLAGS}" ++# ) ++# LIBUHD_APPEND_SOURCES( ++# ${CMAKE_CURRENT_SOURCE_DIR}/convert_with_neon.cpp ++# ) ++#ENDIF() + + ######################################################################## + # Convert types generation diff --git a/uhd.spec b/uhd.spec index 0d96d24..77e9edc 100644 --- a/uhd.spec +++ b/uhd.spec @@ -1,5 +1,5 @@ # Pull from git -%global git_tag release_003_004_000 +%global git_tag release_003_004_002 # git clone git://code.ettus.com/ettus/uhd.git # cd uhd @@ -8,7 +8,7 @@ Name: uhd URL: http://code.ettus.com/redmine/ettus/projects/uhd/wiki -Version: 3.4.0 +Version: 3.4.2 Release: 1%{?dist} License: GPLv3+ BuildRequires: cmake @@ -20,8 +20,8 @@ Group: Applications/Engineering Summary: Universal Hardware Driver for Ettus Research products Source0: %{name}-%{version}.tar.gz Source1: %{name}-limits.conf -# Upstream commit 097f20df1653c33035b6dcfefbbef22572426c65 -Patch0: uhd-3.4.0-usrp1-r45-dbsrx-i2c-fix.patch +# ARM convert_test fix (rhbz#813393) +Patch0: uhd-3.4.2-no-neon.patch %description The UHD is the universal hardware driver for Ettus Research products. @@ -30,7 +30,7 @@ future Ettus Research products. It can be used standalone without GNU Radio. %prep %setup -q -%patch0 -p1 -b .usrp1-r45-dbsrx-i2c-fix +%patch0 -p1 -b .no-neon %build mkdir host/build @@ -105,6 +105,12 @@ getent group usrp >/dev/null || groupadd -r usrp >/dev/null %doc %{_docdir}/%{name}/* %changelog +* Wed May 23 2012 Jaroslav Škarvada - 3.4.2-1 +- New version +- Removed usrp1-r45-dbsrx-i2c-fix patch (upstreamed) +- Fixed convert_test failure on ARM by no-neon patch + Resolves: rhbz#813393 + * Tue Mar 27 2012 Jaroslav Škarvada - 3.4.0-1 - New version - Fixed lockup on USRP1 r4.5 + DBSRX + another i2c board combo From d4ce823c5ba0b9919bd107b4f004634fde9dc720 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jaroslav=20=C5=A0karvada?= Date: Thu, 7 Jun 2012 00:07:49 +0200 Subject: [PATCH 010/152] Added firmware subpackage Resolves: rhbz#769684 --- sources | 1 + uhd-3.4.2-sdcc-3-fix.patch | 1721 ++++++++++++++++++++++++++++++++++++ uhd.spec | 69 +- 3 files changed, 1786 insertions(+), 5 deletions(-) create mode 100644 uhd-3.4.2-sdcc-3-fix.patch diff --git a/sources b/sources index ccf5106..7db397f 100644 --- a/sources +++ b/sources @@ -1 +1,2 @@ f80d4e5434ad5f43128501de00906612 uhd-3.4.2.tar.gz +3a029f244df6dd9812e196ec905a1fc8 uhd-images_003.004.002-release.tar.gz diff --git a/uhd-3.4.2-sdcc-3-fix.patch b/uhd-3.4.2-sdcc-3-fix.patch new file mode 100644 index 0000000..07c38d9 --- /dev/null +++ b/uhd-3.4.2-sdcc-3-fix.patch @@ -0,0 +1,1721 @@ +diff --git a/firmware/fx2/b100/board_specific.c b/firmware/fx2/b100/board_specific.c +index 993d925..c85268c 100644 +--- a/firmware/fx2/b100/board_specific.c ++++ b/firmware/fx2/b100/board_specific.c +@@ -58,7 +58,7 @@ set_sleep_bits (unsigned char bits, unsigned char mask) + // NOP on usrp1 + } + +-static xdata unsigned char xbuf[1]; ++static __xdata unsigned char xbuf[1]; + + void + init_board (void) +diff --git a/firmware/fx2/b100/eeprom_io.c b/firmware/fx2/b100/eeprom_io.c +index 9eeb536..666f3f6 100644 +--- a/firmware/fx2/b100/eeprom_io.c ++++ b/firmware/fx2/b100/eeprom_io.c +@@ -27,12 +27,12 @@ + // returns non-zero if successful, else 0 + unsigned char + eeprom_read (unsigned char i2c_addr, unsigned char eeprom_offset, +- xdata unsigned char *buf, unsigned char len) ++ __xdata unsigned char *buf, unsigned char len) + { + // We setup a random read by first doing a "zero byte write". + // Writes carry an address. Reads use an implicit address. + +- static xdata unsigned char cmd[1]; ++ static __xdata unsigned char cmd[1]; + cmd[0] = eeprom_offset; + if (!i2c_write(i2c_addr, cmd, 1)) + return 0; +@@ -46,9 +46,9 @@ eeprom_read (unsigned char i2c_addr, unsigned char eeprom_offset, + // returns non-zero if successful, else 0 + unsigned char + eeprom_write (unsigned char i2c_addr, unsigned char eeprom_offset, +- const xdata unsigned char *buf, unsigned char len) ++ const __xdata unsigned char *buf, unsigned char len) + { +- static xdata unsigned char cmd[2]; ++ static __xdata unsigned char cmd[2]; + unsigned char ok; + + while (len-- > 0){ +diff --git a/firmware/fx2/b100/eeprom_io.h b/firmware/fx2/b100/eeprom_io.h +index 558017b..d1c4ee6 100644 +--- a/firmware/fx2/b100/eeprom_io.h ++++ b/firmware/fx2/b100/eeprom_io.h +@@ -27,12 +27,12 @@ + // returns non-zero if successful, else 0 + unsigned char + eeprom_read (unsigned char i2c_addr, unsigned char eeprom_offset, +- xdata unsigned char *buf, unsigned char len); ++ __xdata unsigned char *buf, unsigned char len); + + // returns non-zero if successful, else 0 + unsigned char + eeprom_write (unsigned char i2c_addr, unsigned char eeprom_offset, +- const xdata unsigned char *buf, unsigned char len); ++ const __xdata unsigned char *buf, unsigned char len); + + + #endif /* INCLUDED_EEPROM_IO_H */ +diff --git a/firmware/fx2/b100/fpga_load.c b/firmware/fx2/b100/fpga_load.c +index 394c9f5..6604de2 100644 +--- a/firmware/fx2/b100/fpga_load.c ++++ b/firmware/fx2/b100/fpga_load.c +@@ -82,9 +82,9 @@ clock_out_config_byte (unsigned char bits) + #else + + static void +-clock_out_config_byte (unsigned char bits) _naked ++clock_out_config_byte (unsigned char bits) __naked + { +- _asm ++ __asm + mov a, dpl + + rlc a +@@ -129,14 +129,14 @@ clock_out_config_byte (unsigned char bits) _naked + + ret + +- _endasm; ++ __endasm; + } + + #endif + + static void + clock_out_bytes (unsigned char bytecount, +- unsigned char xdata *p) ++ unsigned char __xdata *p) + { + while (bytecount-- > 0) + clock_out_config_byte (*p++); +@@ -156,7 +156,7 @@ clock_out_bytes (unsigned char bytecount, + * ALTERA_NSTATUS = 1 (input) + */ + unsigned char +-fpga_load_xfer (xdata unsigned char *p, unsigned char bytecount) ++fpga_load_xfer (__xdata unsigned char *p, unsigned char bytecount) + { + clock_out_bytes (bytecount, p); + return 1; +diff --git a/firmware/fx2/b100/fpga_rev2.c b/firmware/fx2/b100/fpga_rev2.c +index 326a017..6ceccab 100644 +--- a/firmware/fx2/b100/fpga_rev2.c ++++ b/firmware/fx2/b100/fpga_rev2.c +@@ -29,13 +29,13 @@ unsigned char g_tx_reset = 0; + unsigned char g_rx_reset = 0; + + void +-fpga_write_reg (unsigned char regno, const xdata unsigned char *regval) ++fpga_write_reg (unsigned char regno, const __xdata unsigned char *regval) + { + //nop + } + + +-static xdata unsigned char regval[4] = {0, 0, 0, 0}; ++static __xdata unsigned char regval[4] = {0, 0, 0, 0}; + + // Resets both AD9862's and the FPGA serial bus interface. + +diff --git a/firmware/fx2/b100/gpif.c b/firmware/fx2/b100/gpif.c +index b499e4f..0cba319 100644 +--- a/firmware/fx2/b100/gpif.c ++++ b/firmware/fx2/b100/gpif.c +@@ -156,7 +156,7 @@ + // END DO NOT EDIT + + // DO NOT EDIT ... +-const char xdata WaveData[128] = ++const char __xdata WaveData[128] = + { + // Wave 0 + /* LenBr */ 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x07, +@@ -182,7 +182,7 @@ const char xdata WaveData[128] = + // END DO NOT EDIT + + // DO NOT EDIT ... +-const char xdata FlowStates[36] = ++const char __xdata FlowStates[36] = + { + /* Wave 0 FlowStates */ 0x81,0x2D,0x0E,0x00,0x00,0x04,0x03,0x02,0x00, + /* Wave 1 FlowStates */ 0x81,0x2D,0x09,0x00,0x00,0x04,0x03,0x02,0x00, +@@ -192,7 +192,7 @@ const char xdata FlowStates[36] = + // END DO NOT EDIT + + // DO NOT EDIT ... +-const char xdata InitData[7] = ++const char __xdata InitData[7] = + { + /* Regs */ 0xA0,0x00,0x00,0x00,0xEE,0x4E,0x00 + }; +diff --git a/firmware/fx2/b100/usrp_main.c b/firmware/fx2/b100/usrp_main.c +index 74427b7..a45287e 100644 +--- a/firmware/fx2/b100/usrp_main.c ++++ b/firmware/fx2/b100/usrp_main.c +@@ -54,14 +54,14 @@ unsigned char g_tx_enable = 0; + unsigned char g_rx_enable = 0; + unsigned char g_rx_overrun = 0; + unsigned char g_tx_underrun = 0; +-bit enable_gpif = 0; ++__bit enable_gpif = 0; + + /* + * the host side fpga loader code pushes an MD5 hash of the bitstream + * into hash1. + */ + #define USRP_HASH_SIZE 16 +-xdata at USRP_HASH_SLOT_1_ADDR unsigned char hash1[USRP_HASH_SIZE]; ++__xdata __at USRP_HASH_SLOT_1_ADDR unsigned char hash1[USRP_HASH_SIZE]; + + //void clear_fpga_data_fifo(void); + +@@ -220,7 +220,7 @@ main_loop (void) + * Toggle led 0 + */ + void +-isr_tick (void) interrupt ++isr_tick (void) __interrupt + { + static unsigned char count = 1; + +@@ -239,8 +239,8 @@ isr_tick (void) interrupt + void + patch_usb_descriptors(void) + { +- static xdata unsigned char hw_rev; +- static xdata unsigned char serial_no[SERIAL_NO_LEN]; ++ static __xdata unsigned char hw_rev; ++ static __xdata unsigned char serial_no[SERIAL_NO_LEN]; + unsigned char i; + + eeprom_read(I2C_ADDR_BOOT, HW_REV_OFFSET, &hw_rev, 1); // LSB of device id +diff --git a/firmware/fx2/b100/usrp_regs.h b/firmware/fx2/b100/usrp_regs.h +index 3d65337..5646015 100644 +--- a/firmware/fx2/b100/usrp_regs.h ++++ b/firmware/fx2/b100/usrp_regs.h +@@ -59,11 +59,11 @@ + #define PORT_A_ADDR 0x80 + #define PORT_C_ADDR 0xA0 + +-sbit at PORT_A_ADDR+0 bitALTERA_DCLK; // 0x80 is the bit address of PORT A +-sbit at PORT_A_ADDR+1 bitALTERA_NCONFIG; +-sbit at PORT_A_ADDR+3 bitALTERA_DATA0; ++__sbit __at PORT_A_ADDR+0 bitALTERA_DCLK; // 0x80 is the bit address of PORT A ++__sbit __at PORT_A_ADDR+1 bitALTERA_NCONFIG; ++__sbit __at PORT_A_ADDR+3 bitALTERA_DATA0; + +-sbit at PORT_C_ADDR+7 bitALTERA_CONF_DONE; ++__sbit __at PORT_C_ADDR+7 bitALTERA_CONF_DONE; + + + /* Port B: GPIF FD[7:0] */ +diff --git a/firmware/fx2/common/delay.c b/firmware/fx2/common/delay.c +index 13cf0ee..f2e8307 100644 +--- a/firmware/fx2/common/delay.c ++++ b/firmware/fx2/common/delay.c +@@ -24,11 +24,11 @@ + * Delay approximately 1 microsecond (including overhead in udelay). + */ + static void +-udelay1 (void) _naked ++udelay1 (void) __naked + { +- _asm ; lcall that got us here took 4 bus cycles ++ __asm ; lcall that got us here took 4 bus cycles + ret ; 4 bus cycles +- _endasm; ++ __endasm; + } + + /* +@@ -51,9 +51,9 @@ udelay (unsigned char usecs) + * but explains the factor of 4 problem below). + */ + static void +-mdelay1 (void) _naked ++mdelay1 (void) __naked + { +- _asm ++ __asm + mov dptr,#(-1200 & 0xffff) + 002$: + inc dptr ; 3 bus cycles +@@ -62,7 +62,7 @@ mdelay1 (void) _naked + jnz 002$ ; 3 bus cycles + + ret +- _endasm; ++ __endasm; + } + + void +diff --git a/firmware/fx2/common/eeprom_init.c b/firmware/fx2/common/eeprom_init.c +index 07902dc..e30ba14 100644 +--- a/firmware/fx2/common/eeprom_init.c ++++ b/firmware/fx2/common/eeprom_init.c +@@ -28,7 +28,7 @@ + * into hash1. + */ + #define USRP_HASH_SIZE 16 +-xdata at USRP_HASH_SLOT_0_ADDR unsigned char hash0[USRP_HASH_SIZE]; ++__xdata __at USRP_HASH_SLOT_0_ADDR unsigned char hash0[USRP_HASH_SIZE]; + + + #define REG_RX_PWR_DN 1 +diff --git a/firmware/fx2/common/fpga_load.h b/firmware/fx2/common/fpga_load.h +index 7c36a04..40ebf92 100644 +--- a/firmware/fx2/common/fpga_load.h ++++ b/firmware/fx2/common/fpga_load.h +@@ -22,7 +22,7 @@ + #define INCLUDED_FPGA_LOAD_H + + unsigned char fpga_load_begin (void); +-unsigned char fpga_load_xfer (xdata unsigned char *p, unsigned char len); ++unsigned char fpga_load_xfer (__xdata unsigned char *p, unsigned char len); + unsigned char fpga_load_end (void); + + #endif /* INCLUDED_FPGA_LOAD_H */ +diff --git a/firmware/fx2/common/fx2regs.h b/firmware/fx2/common/fx2regs.h +index acbc0b8..67ad436 100644 +--- a/firmware/fx2/common/fx2regs.h ++++ b/firmware/fx2/common/fx2regs.h +@@ -48,14 +48,14 @@ + // The Ez-USB FX2 registers are defined here. We use FX2regs.h for register + // address allocation by using "#define ALLOCATE_EXTERN". + // When using "#define ALLOCATE_EXTERN", you get (for instance): +-// xdata volatile BYTE OUT7BUF[64] _at_ 0x7B40; ++// __xdata volatile BYTE OUT7BUF[64] _at_ 0x7B40; + // Such lines are created from FX2.h by using the preprocessor. + // Incidently, these lines will not generate any space in the resulting hex + // file; they just bind the symbols to the addresses for compilation. + // You just need to put "#define ALLOCATE_EXTERN" in your main program file; + // i.e. fw.c or a stand-alone C source file. + // Without "#define ALLOCATE_EXTERN", you just get the external reference: +-// extern xdata volatile BYTE OUT7BUF[64] ;// 0x7B40; ++// extern __xdata volatile BYTE OUT7BUF[64] ;// 0x7B40; + // This uses the concatenation operator "##" to insert a comment "//" + // to cut off the end of the line, "_at_ 0x7B40;", which is not wanted. + */ +@@ -63,7 +63,7 @@ + + #ifdef ALLOCATE_EXTERN + #define EXTERN +-#define _AT_(a) at a ++#define _AT_(a) __at a + #else + #define EXTERN extern + #define _AT_ ;/ ## / +@@ -72,162 +72,162 @@ + typedef unsigned char BYTE; + typedef unsigned short WORD; + +-EXTERN xdata _AT_(0xE400) volatile BYTE GPIF_WAVE_DATA[128]; +-EXTERN xdata _AT_(0xE480) volatile BYTE RES_WAVEDATA_END ; ++EXTERN __xdata _AT_(0xE400) volatile BYTE GPIF_WAVE_DATA[128]; ++EXTERN __xdata _AT_(0xE480) volatile BYTE RES_WAVEDATA_END ; + + // General Configuration + +-EXTERN xdata _AT_(0xE600) volatile BYTE CPUCS ; // Control & Status +-EXTERN xdata _AT_(0xE601) volatile BYTE IFCONFIG ; // Interface Configuration +-EXTERN xdata _AT_(0xE602) volatile BYTE PINFLAGSAB ; // FIFO FLAGA and FLAGB Assignments +-EXTERN xdata _AT_(0xE603) volatile BYTE PINFLAGSCD ; // FIFO FLAGC and FLAGD Assignments +-EXTERN xdata _AT_(0xE604) volatile BYTE FIFORESET ; // Restore FIFOS to default state +-EXTERN xdata _AT_(0xE605) volatile BYTE BREAKPT ; // Breakpoint +-EXTERN xdata _AT_(0xE606) volatile BYTE BPADDRH ; // Breakpoint Address H +-EXTERN xdata _AT_(0xE607) volatile BYTE BPADDRL ; // Breakpoint Address L +-EXTERN xdata _AT_(0xE608) volatile BYTE UART230 ; // 230 Kbaud clock for T0,T1,T2 +-EXTERN xdata _AT_(0xE609) volatile BYTE FIFOPINPOLAR ; // FIFO polarities +-EXTERN xdata _AT_(0xE60A) volatile BYTE REVID ; // Chip Revision +-EXTERN xdata _AT_(0xE60B) volatile BYTE REVCTL ; // Chip Revision Control ++EXTERN __xdata _AT_(0xE600) volatile BYTE CPUCS ; // Control & Status ++EXTERN __xdata _AT_(0xE601) volatile BYTE IFCONFIG ; // Interface Configuration ++EXTERN __xdata _AT_(0xE602) volatile BYTE PINFLAGSAB ; // FIFO FLAGA and FLAGB Assignments ++EXTERN __xdata _AT_(0xE603) volatile BYTE PINFLAGSCD ; // FIFO FLAGC and FLAGD Assignments ++EXTERN __xdata _AT_(0xE604) volatile BYTE FIFORESET ; // Restore FIFOS to default state ++EXTERN __xdata _AT_(0xE605) volatile BYTE BREAKPT ; // Breakpoint ++EXTERN __xdata _AT_(0xE606) volatile BYTE BPADDRH ; // Breakpoint Address H ++EXTERN __xdata _AT_(0xE607) volatile BYTE BPADDRL ; // Breakpoint Address L ++EXTERN __xdata _AT_(0xE608) volatile BYTE UART230 ; // 230 Kbaud clock for T0,T1,T2 ++EXTERN __xdata _AT_(0xE609) volatile BYTE FIFOPINPOLAR ; // FIFO polarities ++EXTERN __xdata _AT_(0xE60A) volatile BYTE REVID ; // Chip Revision ++EXTERN __xdata _AT_(0xE60B) volatile BYTE REVCTL ; // Chip Revision Control + + // Endpoint Configuration +-EXTERN xdata _AT_(0xE610) volatile BYTE EP1OUTCFG ; // Endpoint 1-OUT Configuration +-EXTERN xdata _AT_(0xE611) volatile BYTE EP1INCFG ; // Endpoint 1-IN Configuration +-EXTERN xdata _AT_(0xE612) volatile BYTE EP2CFG ; // Endpoint 2 Configuration +-EXTERN xdata _AT_(0xE613) volatile BYTE EP4CFG ; // Endpoint 4 Configuration +-EXTERN xdata _AT_(0xE614) volatile BYTE EP6CFG ; // Endpoint 6 Configuration +-EXTERN xdata _AT_(0xE615) volatile BYTE EP8CFG ; // Endpoint 8 Configuration +-EXTERN xdata _AT_(0xE618) volatile BYTE EP2FIFOCFG ; // Endpoint 2 FIFO configuration +-EXTERN xdata _AT_(0xE619) volatile BYTE EP4FIFOCFG ; // Endpoint 4 FIFO configuration +-EXTERN xdata _AT_(0xE61A) volatile BYTE EP6FIFOCFG ; // Endpoint 6 FIFO configuration +-EXTERN xdata _AT_(0xE61B) volatile BYTE EP8FIFOCFG ; // Endpoint 8 FIFO configuration +-EXTERN xdata _AT_(0xE620) volatile BYTE EP2AUTOINLENH ; // Endpoint 2 Packet Length H (IN only) +-EXTERN xdata _AT_(0xE621) volatile BYTE EP2AUTOINLENL ; // Endpoint 2 Packet Length L (IN only) +-EXTERN xdata _AT_(0xE622) volatile BYTE EP4AUTOINLENH ; // Endpoint 4 Packet Length H (IN only) +-EXTERN xdata _AT_(0xE623) volatile BYTE EP4AUTOINLENL ; // Endpoint 4 Packet Length L (IN only) +-EXTERN xdata _AT_(0xE624) volatile BYTE EP6AUTOINLENH ; // Endpoint 6 Packet Length H (IN only) +-EXTERN xdata _AT_(0xE625) volatile BYTE EP6AUTOINLENL ; // Endpoint 6 Packet Length L (IN only) +-EXTERN xdata _AT_(0xE626) volatile BYTE EP8AUTOINLENH ; // Endpoint 8 Packet Length H (IN only) +-EXTERN xdata _AT_(0xE627) volatile BYTE EP8AUTOINLENL ; // Endpoint 8 Packet Length L (IN only) +-EXTERN xdata _AT_(0xE630) volatile BYTE EP2FIFOPFH ; // EP2 Programmable Flag trigger H +-EXTERN xdata _AT_(0xE631) volatile BYTE EP2FIFOPFL ; // EP2 Programmable Flag trigger L +-EXTERN xdata _AT_(0xE632) volatile BYTE EP4FIFOPFH ; // EP4 Programmable Flag trigger H +-EXTERN xdata _AT_(0xE633) volatile BYTE EP4FIFOPFL ; // EP4 Programmable Flag trigger L +-EXTERN xdata _AT_(0xE634) volatile BYTE EP6FIFOPFH ; // EP6 Programmable Flag trigger H +-EXTERN xdata _AT_(0xE635) volatile BYTE EP6FIFOPFL ; // EP6 Programmable Flag trigger L +-EXTERN xdata _AT_(0xE636) volatile BYTE EP8FIFOPFH ; // EP8 Programmable Flag trigger H +-EXTERN xdata _AT_(0xE637) volatile BYTE EP8FIFOPFL ; // EP8 Programmable Flag trigger L +-EXTERN xdata _AT_(0xE640) volatile BYTE EP2ISOINPKTS ; // EP2 (if ISO) IN Packets per frame (1-3) +-EXTERN xdata _AT_(0xE641) volatile BYTE EP4ISOINPKTS ; // EP4 (if ISO) IN Packets per frame (1-3) +-EXTERN xdata _AT_(0xE642) volatile BYTE EP6ISOINPKTS ; // EP6 (if ISO) IN Packets per frame (1-3) +-EXTERN xdata _AT_(0xE643) volatile BYTE EP8ISOINPKTS ; // EP8 (if ISO) IN Packets per frame (1-3) +-EXTERN xdata _AT_(0xE648) volatile BYTE INPKTEND ; // Force IN Packet End +-EXTERN xdata _AT_(0xE649) volatile BYTE OUTPKTEND ; // Force OUT Packet End ++EXTERN __xdata _AT_(0xE610) volatile BYTE EP1OUTCFG ; // Endpoint 1-OUT Configuration ++EXTERN __xdata _AT_(0xE611) volatile BYTE EP1INCFG ; // Endpoint 1-IN Configuration ++EXTERN __xdata _AT_(0xE612) volatile BYTE EP2CFG ; // Endpoint 2 Configuration ++EXTERN __xdata _AT_(0xE613) volatile BYTE EP4CFG ; // Endpoint 4 Configuration ++EXTERN __xdata _AT_(0xE614) volatile BYTE EP6CFG ; // Endpoint 6 Configuration ++EXTERN __xdata _AT_(0xE615) volatile BYTE EP8CFG ; // Endpoint 8 Configuration ++EXTERN __xdata _AT_(0xE618) volatile BYTE EP2FIFOCFG ; // Endpoint 2 FIFO configuration ++EXTERN __xdata _AT_(0xE619) volatile BYTE EP4FIFOCFG ; // Endpoint 4 FIFO configuration ++EXTERN __xdata _AT_(0xE61A) volatile BYTE EP6FIFOCFG ; // Endpoint 6 FIFO configuration ++EXTERN __xdata _AT_(0xE61B) volatile BYTE EP8FIFOCFG ; // Endpoint 8 FIFO configuration ++EXTERN __xdata _AT_(0xE620) volatile BYTE EP2AUTOINLENH ; // Endpoint 2 Packet Length H (IN only) ++EXTERN __xdata _AT_(0xE621) volatile BYTE EP2AUTOINLENL ; // Endpoint 2 Packet Length L (IN only) ++EXTERN __xdata _AT_(0xE622) volatile BYTE EP4AUTOINLENH ; // Endpoint 4 Packet Length H (IN only) ++EXTERN __xdata _AT_(0xE623) volatile BYTE EP4AUTOINLENL ; // Endpoint 4 Packet Length L (IN only) ++EXTERN __xdata _AT_(0xE624) volatile BYTE EP6AUTOINLENH ; // Endpoint 6 Packet Length H (IN only) ++EXTERN __xdata _AT_(0xE625) volatile BYTE EP6AUTOINLENL ; // Endpoint 6 Packet Length L (IN only) ++EXTERN __xdata _AT_(0xE626) volatile BYTE EP8AUTOINLENH ; // Endpoint 8 Packet Length H (IN only) ++EXTERN __xdata _AT_(0xE627) volatile BYTE EP8AUTOINLENL ; // Endpoint 8 Packet Length L (IN only) ++EXTERN __xdata _AT_(0xE630) volatile BYTE EP2FIFOPFH ; // EP2 Programmable Flag trigger H ++EXTERN __xdata _AT_(0xE631) volatile BYTE EP2FIFOPFL ; // EP2 Programmable Flag trigger L ++EXTERN __xdata _AT_(0xE632) volatile BYTE EP4FIFOPFH ; // EP4 Programmable Flag trigger H ++EXTERN __xdata _AT_(0xE633) volatile BYTE EP4FIFOPFL ; // EP4 Programmable Flag trigger L ++EXTERN __xdata _AT_(0xE634) volatile BYTE EP6FIFOPFH ; // EP6 Programmable Flag trigger H ++EXTERN __xdata _AT_(0xE635) volatile BYTE EP6FIFOPFL ; // EP6 Programmable Flag trigger L ++EXTERN __xdata _AT_(0xE636) volatile BYTE EP8FIFOPFH ; // EP8 Programmable Flag trigger H ++EXTERN __xdata _AT_(0xE637) volatile BYTE EP8FIFOPFL ; // EP8 Programmable Flag trigger L ++EXTERN __xdata _AT_(0xE640) volatile BYTE EP2ISOINPKTS ; // EP2 (if ISO) IN Packets per frame (1-3) ++EXTERN __xdata _AT_(0xE641) volatile BYTE EP4ISOINPKTS ; // EP4 (if ISO) IN Packets per frame (1-3) ++EXTERN __xdata _AT_(0xE642) volatile BYTE EP6ISOINPKTS ; // EP6 (if ISO) IN Packets per frame (1-3) ++EXTERN __xdata _AT_(0xE643) volatile BYTE EP8ISOINPKTS ; // EP8 (if ISO) IN Packets per frame (1-3) ++EXTERN __xdata _AT_(0xE648) volatile BYTE INPKTEND ; // Force IN Packet End ++EXTERN __xdata _AT_(0xE649) volatile BYTE OUTPKTEND ; // Force OUT Packet End + + // Interrupts + +-EXTERN xdata _AT_(0xE650) volatile BYTE EP2FIFOIE ; // Endpoint 2 Flag Interrupt Enable +-EXTERN xdata _AT_(0xE651) volatile BYTE EP2FIFOIRQ ; // Endpoint 2 Flag Interrupt Request +-EXTERN xdata _AT_(0xE652) volatile BYTE EP4FIFOIE ; // Endpoint 4 Flag Interrupt Enable +-EXTERN xdata _AT_(0xE653) volatile BYTE EP4FIFOIRQ ; // Endpoint 4 Flag Interrupt Request +-EXTERN xdata _AT_(0xE654) volatile BYTE EP6FIFOIE ; // Endpoint 6 Flag Interrupt Enable +-EXTERN xdata _AT_(0xE655) volatile BYTE EP6FIFOIRQ ; // Endpoint 6 Flag Interrupt Request +-EXTERN xdata _AT_(0xE656) volatile BYTE EP8FIFOIE ; // Endpoint 8 Flag Interrupt Enable +-EXTERN xdata _AT_(0xE657) volatile BYTE EP8FIFOIRQ ; // Endpoint 8 Flag Interrupt Request +-EXTERN xdata _AT_(0xE658) volatile BYTE IBNIE ; // IN-BULK-NAK Interrupt Enable +-EXTERN xdata _AT_(0xE659) volatile BYTE IBNIRQ ; // IN-BULK-NAK interrupt Request +-EXTERN xdata _AT_(0xE65A) volatile BYTE NAKIE ; // Endpoint Ping NAK interrupt Enable +-EXTERN xdata _AT_(0xE65B) volatile BYTE NAKIRQ ; // Endpoint Ping NAK interrupt Request +-EXTERN xdata _AT_(0xE65C) volatile BYTE USBIE ; // USB Int Enables +-EXTERN xdata _AT_(0xE65D) volatile BYTE USBIRQ ; // USB Interrupt Requests +-EXTERN xdata _AT_(0xE65E) volatile BYTE EPIE ; // Endpoint Interrupt Enables +-EXTERN xdata _AT_(0xE65F) volatile BYTE EPIRQ ; // Endpoint Interrupt Requests +-EXTERN xdata _AT_(0xE660) volatile BYTE GPIFIE ; // GPIF Interrupt Enable +-EXTERN xdata _AT_(0xE661) volatile BYTE GPIFIRQ ; // GPIF Interrupt Request +-EXTERN xdata _AT_(0xE662) volatile BYTE USBERRIE ; // USB Error Interrupt Enables +-EXTERN xdata _AT_(0xE663) volatile BYTE USBERRIRQ ; // USB Error Interrupt Requests +-EXTERN xdata _AT_(0xE664) volatile BYTE ERRCNTLIM ; // USB Error counter and limit +-EXTERN xdata _AT_(0xE665) volatile BYTE CLRERRCNT ; // Clear Error Counter EC[3..0] +-EXTERN xdata _AT_(0xE666) volatile BYTE INT2IVEC ; // Interupt 2 (USB) Autovector +-EXTERN xdata _AT_(0xE667) volatile BYTE INT4IVEC ; // Interupt 4 (FIFOS & GPIF) Autovector +-EXTERN xdata _AT_(0xE668) volatile BYTE INTSETUP ; // Interrupt 2&4 Setup ++EXTERN __xdata _AT_(0xE650) volatile BYTE EP2FIFOIE ; // Endpoint 2 Flag Interrupt Enable ++EXTERN __xdata _AT_(0xE651) volatile BYTE EP2FIFOIRQ ; // Endpoint 2 Flag Interrupt Request ++EXTERN __xdata _AT_(0xE652) volatile BYTE EP4FIFOIE ; // Endpoint 4 Flag Interrupt Enable ++EXTERN __xdata _AT_(0xE653) volatile BYTE EP4FIFOIRQ ; // Endpoint 4 Flag Interrupt Request ++EXTERN __xdata _AT_(0xE654) volatile BYTE EP6FIFOIE ; // Endpoint 6 Flag Interrupt Enable ++EXTERN __xdata _AT_(0xE655) volatile BYTE EP6FIFOIRQ ; // Endpoint 6 Flag Interrupt Request ++EXTERN __xdata _AT_(0xE656) volatile BYTE EP8FIFOIE ; // Endpoint 8 Flag Interrupt Enable ++EXTERN __xdata _AT_(0xE657) volatile BYTE EP8FIFOIRQ ; // Endpoint 8 Flag Interrupt Request ++EXTERN __xdata _AT_(0xE658) volatile BYTE IBNIE ; // IN-BULK-NAK Interrupt Enable ++EXTERN __xdata _AT_(0xE659) volatile BYTE IBNIRQ ; // IN-BULK-NAK interrupt Request ++EXTERN __xdata _AT_(0xE65A) volatile BYTE NAKIE ; // Endpoint Ping NAK interrupt Enable ++EXTERN __xdata _AT_(0xE65B) volatile BYTE NAKIRQ ; // Endpoint Ping NAK interrupt Request ++EXTERN __xdata _AT_(0xE65C) volatile BYTE USBIE ; // USB Int Enables ++EXTERN __xdata _AT_(0xE65D) volatile BYTE USBIRQ ; // USB Interrupt Requests ++EXTERN __xdata _AT_(0xE65E) volatile BYTE EPIE ; // Endpoint Interrupt Enables ++EXTERN __xdata _AT_(0xE65F) volatile BYTE EPIRQ ; // Endpoint Interrupt Requests ++EXTERN __xdata _AT_(0xE660) volatile BYTE GPIFIE ; // GPIF Interrupt Enable ++EXTERN __xdata _AT_(0xE661) volatile BYTE GPIFIRQ ; // GPIF Interrupt Request ++EXTERN __xdata _AT_(0xE662) volatile BYTE USBERRIE ; // USB Error Interrupt Enables ++EXTERN __xdata _AT_(0xE663) volatile BYTE USBERRIRQ ; // USB Error Interrupt Requests ++EXTERN __xdata _AT_(0xE664) volatile BYTE ERRCNTLIM ; // USB Error counter and limit ++EXTERN __xdata _AT_(0xE665) volatile BYTE CLRERRCNT ; // Clear Error Counter EC[3..0] ++EXTERN __xdata _AT_(0xE666) volatile BYTE INT2IVEC ; // Interupt 2 (USB) Autovector ++EXTERN __xdata _AT_(0xE667) volatile BYTE INT4IVEC ; // Interupt 4 (FIFOS & GPIF) Autovector ++EXTERN __xdata _AT_(0xE668) volatile BYTE INTSETUP ; // Interrupt 2&4 Setup + + // Input/Output + +-EXTERN xdata _AT_(0xE670) volatile BYTE PORTACFG ; // I/O PORTA Alternate Configuration +-EXTERN xdata _AT_(0xE671) volatile BYTE PORTCCFG ; // I/O PORTC Alternate Configuration +-EXTERN xdata _AT_(0xE672) volatile BYTE PORTECFG ; // I/O PORTE Alternate Configuration +-EXTERN xdata _AT_(0xE678) volatile BYTE I2CS ; // Control & Status +-EXTERN xdata _AT_(0xE679) volatile BYTE I2DAT ; // Data +-EXTERN xdata _AT_(0xE67A) volatile BYTE I2CTL ; // I2C Control +-EXTERN xdata _AT_(0xE67B) volatile BYTE XAUTODAT1 ; // Autoptr1 MOVX access +-EXTERN xdata _AT_(0xE67C) volatile BYTE XAUTODAT2 ; // Autoptr2 MOVX access ++EXTERN __xdata _AT_(0xE670) volatile BYTE PORTACFG ; // I/O PORTA Alternate Configuration ++EXTERN __xdata _AT_(0xE671) volatile BYTE PORTCCFG ; // I/O PORTC Alternate Configuration ++EXTERN __xdata _AT_(0xE672) volatile BYTE PORTECFG ; // I/O PORTE Alternate Configuration ++EXTERN __xdata _AT_(0xE678) volatile BYTE I2CS ; // Control & Status ++EXTERN __xdata _AT_(0xE679) volatile BYTE I2DAT ; // Data ++EXTERN __xdata _AT_(0xE67A) volatile BYTE I2CTL ; // I2C Control ++EXTERN __xdata _AT_(0xE67B) volatile BYTE XAUTODAT1 ; // Autoptr1 MOVX access ++EXTERN __xdata _AT_(0xE67C) volatile BYTE XAUTODAT2 ; // Autoptr2 MOVX access + + #define EXTAUTODAT1 XAUTODAT1 + #define EXTAUTODAT2 XAUTODAT2 + + // USB Control + +-EXTERN xdata _AT_(0xE680) volatile BYTE USBCS ; // USB Control & Status +-EXTERN xdata _AT_(0xE681) volatile BYTE SUSPEND ; // Put chip into suspend +-EXTERN xdata _AT_(0xE682) volatile BYTE WAKEUPCS ; // Wakeup source and polarity +-EXTERN xdata _AT_(0xE683) volatile BYTE TOGCTL ; // Toggle Control +-EXTERN xdata _AT_(0xE684) volatile BYTE USBFRAMEH ; // USB Frame count H +-EXTERN xdata _AT_(0xE685) volatile BYTE USBFRAMEL ; // USB Frame count L +-EXTERN xdata _AT_(0xE686) volatile BYTE MICROFRAME ; // Microframe count, 0-7 +-EXTERN xdata _AT_(0xE687) volatile BYTE FNADDR ; // USB Function address ++EXTERN __xdata _AT_(0xE680) volatile BYTE USBCS ; // USB Control & Status ++EXTERN __xdata _AT_(0xE681) volatile BYTE SUSPEND ; // Put chip into suspend ++EXTERN __xdata _AT_(0xE682) volatile BYTE WAKEUPCS ; // Wakeup source and polarity ++EXTERN __xdata _AT_(0xE683) volatile BYTE TOGCTL ; // Toggle Control ++EXTERN __xdata _AT_(0xE684) volatile BYTE USBFRAMEH ; // USB Frame count H ++EXTERN __xdata _AT_(0xE685) volatile BYTE USBFRAMEL ; // USB Frame count L ++EXTERN __xdata _AT_(0xE686) volatile BYTE MICROFRAME ; // Microframe count, 0-7 ++EXTERN __xdata _AT_(0xE687) volatile BYTE FNADDR ; // USB Function address + + // Endpoints + +-EXTERN xdata _AT_(0xE68A) volatile BYTE EP0BCH ; // Endpoint 0 Byte Count H +-EXTERN xdata _AT_(0xE68B) volatile BYTE EP0BCL ; // Endpoint 0 Byte Count L +-EXTERN xdata _AT_(0xE68D) volatile BYTE EP1OUTBC ; // Endpoint 1 OUT Byte Count +-EXTERN xdata _AT_(0xE68F) volatile BYTE EP1INBC ; // Endpoint 1 IN Byte Count +-EXTERN xdata _AT_(0xE690) volatile BYTE EP2BCH ; // Endpoint 2 Byte Count H +-EXTERN xdata _AT_(0xE691) volatile BYTE EP2BCL ; // Endpoint 2 Byte Count L +-EXTERN xdata _AT_(0xE694) volatile BYTE EP4BCH ; // Endpoint 4 Byte Count H +-EXTERN xdata _AT_(0xE695) volatile BYTE EP4BCL ; // Endpoint 4 Byte Count L +-EXTERN xdata _AT_(0xE698) volatile BYTE EP6BCH ; // Endpoint 6 Byte Count H +-EXTERN xdata _AT_(0xE699) volatile BYTE EP6BCL ; // Endpoint 6 Byte Count L +-EXTERN xdata _AT_(0xE69C) volatile BYTE EP8BCH ; // Endpoint 8 Byte Count H +-EXTERN xdata _AT_(0xE69D) volatile BYTE EP8BCL ; // Endpoint 8 Byte Count L +-EXTERN xdata _AT_(0xE6A0) volatile BYTE EP0CS ; // Endpoint Control and Status +-EXTERN xdata _AT_(0xE6A1) volatile BYTE EP1OUTCS ; // Endpoint 1 OUT Control and Status +-EXTERN xdata _AT_(0xE6A2) volatile BYTE EP1INCS ; // Endpoint 1 IN Control and Status +-EXTERN xdata _AT_(0xE6A3) volatile BYTE EP2CS ; // Endpoint 2 Control and Status +-EXTERN xdata _AT_(0xE6A4) volatile BYTE EP4CS ; // Endpoint 4 Control and Status +-EXTERN xdata _AT_(0xE6A5) volatile BYTE EP6CS ; // Endpoint 6 Control and Status +-EXTERN xdata _AT_(0xE6A6) volatile BYTE EP8CS ; // Endpoint 8 Control and Status +-EXTERN xdata _AT_(0xE6A7) volatile BYTE EP2FIFOFLGS ; // Endpoint 2 Flags +-EXTERN xdata _AT_(0xE6A8) volatile BYTE EP4FIFOFLGS ; // Endpoint 4 Flags +-EXTERN xdata _AT_(0xE6A9) volatile BYTE EP6FIFOFLGS ; // Endpoint 6 Flags +-EXTERN xdata _AT_(0xE6AA) volatile BYTE EP8FIFOFLGS ; // Endpoint 8 Flags +-EXTERN xdata _AT_(0xE6AB) volatile BYTE EP2FIFOBCH ; // EP2 FIFO total byte count H +-EXTERN xdata _AT_(0xE6AC) volatile BYTE EP2FIFOBCL ; // EP2 FIFO total byte count L +-EXTERN xdata _AT_(0xE6AD) volatile BYTE EP4FIFOBCH ; // EP4 FIFO total byte count H +-EXTERN xdata _AT_(0xE6AE) volatile BYTE EP4FIFOBCL ; // EP4 FIFO total byte count L +-EXTERN xdata _AT_(0xE6AF) volatile BYTE EP6FIFOBCH ; // EP6 FIFO total byte count H +-EXTERN xdata _AT_(0xE6B0) volatile BYTE EP6FIFOBCL ; // EP6 FIFO total byte count L +-EXTERN xdata _AT_(0xE6B1) volatile BYTE EP8FIFOBCH ; // EP8 FIFO total byte count H +-EXTERN xdata _AT_(0xE6B2) volatile BYTE EP8FIFOBCL ; // EP8 FIFO total byte count L +-EXTERN xdata _AT_(0xE6B3) volatile BYTE SUDPTRH ; // Setup Data Pointer high address byte +-EXTERN xdata _AT_(0xE6B4) volatile BYTE SUDPTRL ; // Setup Data Pointer low address byte +-EXTERN xdata _AT_(0xE6B5) volatile BYTE SUDPTRCTL ; // Setup Data Pointer Auto Mode +-EXTERN xdata _AT_(0xE6B8) volatile BYTE SETUPDAT[8] ; // 8 bytes of SETUP data ++EXTERN __xdata _AT_(0xE68A) volatile BYTE EP0BCH ; // Endpoint 0 Byte Count H ++EXTERN __xdata _AT_(0xE68B) volatile BYTE EP0BCL ; // Endpoint 0 Byte Count L ++EXTERN __xdata _AT_(0xE68D) volatile BYTE EP1OUTBC ; // Endpoint 1 OUT Byte Count ++EXTERN __xdata _AT_(0xE68F) volatile BYTE EP1INBC ; // Endpoint 1 IN Byte Count ++EXTERN __xdata _AT_(0xE690) volatile BYTE EP2BCH ; // Endpoint 2 Byte Count H ++EXTERN __xdata _AT_(0xE691) volatile BYTE EP2BCL ; // Endpoint 2 Byte Count L ++EXTERN __xdata _AT_(0xE694) volatile BYTE EP4BCH ; // Endpoint 4 Byte Count H ++EXTERN __xdata _AT_(0xE695) volatile BYTE EP4BCL ; // Endpoint 4 Byte Count L ++EXTERN __xdata _AT_(0xE698) volatile BYTE EP6BCH ; // Endpoint 6 Byte Count H ++EXTERN __xdata _AT_(0xE699) volatile BYTE EP6BCL ; // Endpoint 6 Byte Count L ++EXTERN __xdata _AT_(0xE69C) volatile BYTE EP8BCH ; // Endpoint 8 Byte Count H ++EXTERN __xdata _AT_(0xE69D) volatile BYTE EP8BCL ; // Endpoint 8 Byte Count L ++EXTERN __xdata _AT_(0xE6A0) volatile BYTE EP0CS ; // Endpoint Control and Status ++EXTERN __xdata _AT_(0xE6A1) volatile BYTE EP1OUTCS ; // Endpoint 1 OUT Control and Status ++EXTERN __xdata _AT_(0xE6A2) volatile BYTE EP1INCS ; // Endpoint 1 IN Control and Status ++EXTERN __xdata _AT_(0xE6A3) volatile BYTE EP2CS ; // Endpoint 2 Control and Status ++EXTERN __xdata _AT_(0xE6A4) volatile BYTE EP4CS ; // Endpoint 4 Control and Status ++EXTERN __xdata _AT_(0xE6A5) volatile BYTE EP6CS ; // Endpoint 6 Control and Status ++EXTERN __xdata _AT_(0xE6A6) volatile BYTE EP8CS ; // Endpoint 8 Control and Status ++EXTERN __xdata _AT_(0xE6A7) volatile BYTE EP2FIFOFLGS ; // Endpoint 2 Flags ++EXTERN __xdata _AT_(0xE6A8) volatile BYTE EP4FIFOFLGS ; // Endpoint 4 Flags ++EXTERN __xdata _AT_(0xE6A9) volatile BYTE EP6FIFOFLGS ; // Endpoint 6 Flags ++EXTERN __xdata _AT_(0xE6AA) volatile BYTE EP8FIFOFLGS ; // Endpoint 8 Flags ++EXTERN __xdata _AT_(0xE6AB) volatile BYTE EP2FIFOBCH ; // EP2 FIFO total byte count H ++EXTERN __xdata _AT_(0xE6AC) volatile BYTE EP2FIFOBCL ; // EP2 FIFO total byte count L ++EXTERN __xdata _AT_(0xE6AD) volatile BYTE EP4FIFOBCH ; // EP4 FIFO total byte count H ++EXTERN __xdata _AT_(0xE6AE) volatile BYTE EP4FIFOBCL ; // EP4 FIFO total byte count L ++EXTERN __xdata _AT_(0xE6AF) volatile BYTE EP6FIFOBCH ; // EP6 FIFO total byte count H ++EXTERN __xdata _AT_(0xE6B0) volatile BYTE EP6FIFOBCL ; // EP6 FIFO total byte count L ++EXTERN __xdata _AT_(0xE6B1) volatile BYTE EP8FIFOBCH ; // EP8 FIFO total byte count H ++EXTERN __xdata _AT_(0xE6B2) volatile BYTE EP8FIFOBCL ; // EP8 FIFO total byte count L ++EXTERN __xdata _AT_(0xE6B3) volatile BYTE SUDPTRH ; // Setup Data Pointer high address byte ++EXTERN __xdata _AT_(0xE6B4) volatile BYTE SUDPTRL ; // Setup Data Pointer low address byte ++EXTERN __xdata _AT_(0xE6B5) volatile BYTE SUDPTRCTL ; // Setup Data Pointer Auto Mode ++EXTERN __xdata _AT_(0xE6B8) volatile BYTE SETUPDAT[8] ; // 8 bytes of SETUP data + + // GPIF + +-EXTERN xdata _AT_(0xE6C0) volatile BYTE GPIFWFSELECT ; // Waveform Selector +-EXTERN xdata _AT_(0xE6C1) volatile BYTE GPIFIDLECS ; // GPIF Done, GPIF IDLE drive mode +-EXTERN xdata _AT_(0xE6C2) volatile BYTE GPIFIDLECTL ; // Inactive Bus, CTL states +-EXTERN xdata _AT_(0xE6C3) volatile BYTE GPIFCTLCFG ; // CTL OUT pin drive +-EXTERN xdata _AT_(0xE6C4) volatile BYTE GPIFADRH ; // GPIF Address H +-EXTERN xdata _AT_(0xE6C5) volatile BYTE GPIFADRL ; // GPIF Address L ++EXTERN __xdata _AT_(0xE6C0) volatile BYTE GPIFWFSELECT ; // Waveform Selector ++EXTERN __xdata _AT_(0xE6C1) volatile BYTE GPIFIDLECS ; // GPIF Done, GPIF IDLE drive mode ++EXTERN __xdata _AT_(0xE6C2) volatile BYTE GPIFIDLECTL ; // Inactive Bus, CTL states ++EXTERN __xdata _AT_(0xE6C3) volatile BYTE GPIFCTLCFG ; // CTL OUT pin drive ++EXTERN __xdata _AT_(0xE6C4) volatile BYTE GPIFADRH ; // GPIF Address H ++EXTERN __xdata _AT_(0xE6C5) volatile BYTE GPIFADRL ; // GPIF Address L + +-EXTERN xdata _AT_(0xE6CE) volatile BYTE GPIFTCB3 ; // GPIF Transaction Count Byte 3 +-EXTERN xdata _AT_(0xE6CF) volatile BYTE GPIFTCB2 ; // GPIF Transaction Count Byte 2 +-EXTERN xdata _AT_(0xE6D0) volatile BYTE GPIFTCB1 ; // GPIF Transaction Count Byte 1 +-EXTERN xdata _AT_(0xE6D1) volatile BYTE GPIFTCB0 ; // GPIF Transaction Count Byte 0 ++EXTERN __xdata _AT_(0xE6CE) volatile BYTE GPIFTCB3 ; // GPIF Transaction Count Byte 3 ++EXTERN __xdata _AT_(0xE6CF) volatile BYTE GPIFTCB2 ; // GPIF Transaction Count Byte 2 ++EXTERN __xdata _AT_(0xE6D0) volatile BYTE GPIFTCB1 ; // GPIF Transaction Count Byte 1 ++EXTERN __xdata _AT_(0xE6D1) volatile BYTE GPIFTCB0 ; // GPIF Transaction Count Byte 0 + + #define EP2GPIFTCH GPIFTCB1 // these are here for backwards compatibility + #define EP2GPIFTCL GPIFTCB0 // before REVE silicon (ie. REVB and REVD) +@@ -238,68 +238,68 @@ EXTERN xdata _AT_(0xE6D1) volatile BYTE GPIFTCB0 ; // GPIF Transaction + #define EP8GPIFTCH GPIFTCB1 // these are here for backwards compatibility + #define EP8GPIFTCL GPIFTCB0 // before REVE silicon (ie. REVB and REVD) + +-// EXTERN xdata volatile BYTE EP2GPIFTCH _AT_ 0xE6D0; // EP2 GPIF Transaction Count High +-// EXTERN xdata volatile BYTE EP2GPIFTCL _AT_ 0xE6D1; // EP2 GPIF Transaction Count Low +-EXTERN xdata _AT_(0xE6D2) volatile BYTE EP2GPIFFLGSEL ; // EP2 GPIF Flag select +-EXTERN xdata _AT_(0xE6D3) volatile BYTE EP2GPIFPFSTOP ; // Stop GPIF EP2 transaction on prog. flag +-EXTERN xdata _AT_(0xE6D4) volatile BYTE EP2GPIFTRIG ; // EP2 FIFO Trigger +-// EXTERN xdata volatile BYTE EP4GPIFTCH _AT_ 0xE6D8; // EP4 GPIF Transaction Count High +-// EXTERN xdata volatile BYTE EP4GPIFTCL _AT_ 0xE6D9; // EP4 GPIF Transactionr Count Low +-EXTERN xdata _AT_(0xE6DA) volatile BYTE EP4GPIFFLGSEL ; // EP4 GPIF Flag select +-EXTERN xdata _AT_(0xE6DB) volatile BYTE EP4GPIFPFSTOP ; // Stop GPIF EP4 transaction on prog. flag +-EXTERN xdata _AT_(0xE6DC) volatile BYTE EP4GPIFTRIG ; // EP4 FIFO Trigger +-// EXTERN xdata volatile BYTE EP6GPIFTCH _AT_ 0xE6E0; // EP6 GPIF Transaction Count High +-// EXTERN xdata volatile BYTE EP6GPIFTCL _AT_ 0xE6E1; // EP6 GPIF Transaction Count Low +-EXTERN xdata _AT_(0xE6E2) volatile BYTE EP6GPIFFLGSEL ; // EP6 GPIF Flag select +-EXTERN xdata _AT_(0xE6E3) volatile BYTE EP6GPIFPFSTOP ; // Stop GPIF EP6 transaction on prog. flag +-EXTERN xdata _AT_(0xE6E4) volatile BYTE EP6GPIFTRIG ; // EP6 FIFO Trigger +-// EXTERN xdata volatile BYTE EP8GPIFTCH _AT_ 0xE6E8; // EP8 GPIF Transaction Count High +-// EXTERN xdata volatile BYTE EP8GPIFTCL _AT_ 0xE6E9; // EP8GPIF Transaction Count Low +-EXTERN xdata _AT_(0xE6EA) volatile BYTE EP8GPIFFLGSEL ; // EP8 GPIF Flag select +-EXTERN xdata _AT_(0xE6EB) volatile BYTE EP8GPIFPFSTOP ; // Stop GPIF EP8 transaction on prog. flag +-EXTERN xdata _AT_(0xE6EC) volatile BYTE EP8GPIFTRIG ; // EP8 FIFO Trigger +-EXTERN xdata _AT_(0xE6F0) volatile BYTE XGPIFSGLDATH ; // GPIF Data H (16-bit mode only) +-EXTERN xdata _AT_(0xE6F1) volatile BYTE XGPIFSGLDATLX ; // Read/Write GPIF Data L & trigger transac +-EXTERN xdata _AT_(0xE6F2) volatile BYTE XGPIFSGLDATLNOX ; // Read GPIF Data L, no transac trigger +-EXTERN xdata _AT_(0xE6F3) volatile BYTE GPIFREADYCFG ; // Internal RDY,Sync/Async, RDY5CFG +-EXTERN xdata _AT_(0xE6F4) volatile BYTE GPIFREADYSTAT ; // RDY pin states +-EXTERN xdata _AT_(0xE6F5) volatile BYTE GPIFABORT ; // Abort GPIF cycles ++// EXTERN __xdata volatile BYTE EP2GPIFTCH _AT_ 0xE6D0; // EP2 GPIF Transaction Count High ++// EXTERN __xdata volatile BYTE EP2GPIFTCL _AT_ 0xE6D1; // EP2 GPIF Transaction Count Low ++EXTERN __xdata _AT_(0xE6D2) volatile BYTE EP2GPIFFLGSEL ; // EP2 GPIF Flag select ++EXTERN __xdata _AT_(0xE6D3) volatile BYTE EP2GPIFPFSTOP ; // Stop GPIF EP2 transaction on prog. flag ++EXTERN __xdata _AT_(0xE6D4) volatile BYTE EP2GPIFTRIG ; // EP2 FIFO Trigger ++// EXTERN __xdata volatile BYTE EP4GPIFTCH _AT_ 0xE6D8; // EP4 GPIF Transaction Count High ++// EXTERN __xdata volatile BYTE EP4GPIFTCL _AT_ 0xE6D9; // EP4 GPIF Transactionr Count Low ++EXTERN __xdata _AT_(0xE6DA) volatile BYTE EP4GPIFFLGSEL ; // EP4 GPIF Flag select ++EXTERN __xdata _AT_(0xE6DB) volatile BYTE EP4GPIFPFSTOP ; // Stop GPIF EP4 transaction on prog. flag ++EXTERN __xdata _AT_(0xE6DC) volatile BYTE EP4GPIFTRIG ; // EP4 FIFO Trigger ++// EXTERN __xdata volatile BYTE EP6GPIFTCH _AT_ 0xE6E0; // EP6 GPIF Transaction Count High ++// EXTERN __xdata volatile BYTE EP6GPIFTCL _AT_ 0xE6E1; // EP6 GPIF Transaction Count Low ++EXTERN __xdata _AT_(0xE6E2) volatile BYTE EP6GPIFFLGSEL ; // EP6 GPIF Flag select ++EXTERN __xdata _AT_(0xE6E3) volatile BYTE EP6GPIFPFSTOP ; // Stop GPIF EP6 transaction on prog. flag ++EXTERN __xdata _AT_(0xE6E4) volatile BYTE EP6GPIFTRIG ; // EP6 FIFO Trigger ++// EXTERN __xdata volatile BYTE EP8GPIFTCH _AT_ 0xE6E8; // EP8 GPIF Transaction Count High ++// EXTERN __xdata volatile BYTE EP8GPIFTCL _AT_ 0xE6E9; // EP8GPIF Transaction Count Low ++EXTERN __xdata _AT_(0xE6EA) volatile BYTE EP8GPIFFLGSEL ; // EP8 GPIF Flag select ++EXTERN __xdata _AT_(0xE6EB) volatile BYTE EP8GPIFPFSTOP ; // Stop GPIF EP8 transaction on prog. flag ++EXTERN __xdata _AT_(0xE6EC) volatile BYTE EP8GPIFTRIG ; // EP8 FIFO Trigger ++EXTERN __xdata _AT_(0xE6F0) volatile BYTE XGPIFSGLDATH ; // GPIF Data H (16-bit mode only) ++EXTERN __xdata _AT_(0xE6F1) volatile BYTE XGPIFSGLDATLX ; // Read/Write GPIF Data L & trigger transac ++EXTERN __xdata _AT_(0xE6F2) volatile BYTE XGPIFSGLDATLNOX ; // Read GPIF Data L, no transac trigger ++EXTERN __xdata _AT_(0xE6F3) volatile BYTE GPIFREADYCFG ; // Internal RDY,Sync/Async, RDY5CFG ++EXTERN __xdata _AT_(0xE6F4) volatile BYTE GPIFREADYSTAT ; // RDY pin states ++EXTERN __xdata _AT_(0xE6F5) volatile BYTE GPIFABORT ; // Abort GPIF cycles + + // UDMA + +-EXTERN xdata _AT_(0xE6C6) volatile BYTE FLOWSTATE ; //Defines GPIF flow state +-EXTERN xdata _AT_(0xE6C7) volatile BYTE FLOWLOGIC ; //Defines flow/hold decision criteria +-EXTERN xdata _AT_(0xE6C8) volatile BYTE FLOWEQ0CTL ; //CTL states during active flow state +-EXTERN xdata _AT_(0xE6C9) volatile BYTE FLOWEQ1CTL ; //CTL states during hold flow state +-EXTERN xdata _AT_(0xE6CA) volatile BYTE FLOWHOLDOFF ; +-EXTERN xdata _AT_(0xE6CB) volatile BYTE FLOWSTB ; //CTL/RDY Signal to use as master data strobe +-EXTERN xdata _AT_(0xE6CC) volatile BYTE FLOWSTBEDGE ; //Defines active master strobe edge +-EXTERN xdata _AT_(0xE6CD) volatile BYTE FLOWSTBHPERIOD ; //Half Period of output master strobe +-EXTERN xdata _AT_(0xE60C) volatile BYTE GPIFHOLDAMOUNT ; //Data delay shift +-EXTERN xdata _AT_(0xE67D) volatile BYTE UDMACRCH ; //CRC Upper byte +-EXTERN xdata _AT_(0xE67E) volatile BYTE UDMACRCL ; //CRC Lower byte +-EXTERN xdata _AT_(0xE67F) volatile BYTE UDMACRCQUAL ; //UDMA In only, host terminated use only ++EXTERN __xdata _AT_(0xE6C6) volatile BYTE FLOWSTATE ; //Defines GPIF flow state ++EXTERN __xdata _AT_(0xE6C7) volatile BYTE FLOWLOGIC ; //Defines flow/hold decision criteria ++EXTERN __xdata _AT_(0xE6C8) volatile BYTE FLOWEQ0CTL ; //CTL states during active flow state ++EXTERN __xdata _AT_(0xE6C9) volatile BYTE FLOWEQ1CTL ; //CTL states during hold flow state ++EXTERN __xdata _AT_(0xE6CA) volatile BYTE FLOWHOLDOFF ; ++EXTERN __xdata _AT_(0xE6CB) volatile BYTE FLOWSTB ; //CTL/RDY Signal to use as master data strobe ++EXTERN __xdata _AT_(0xE6CC) volatile BYTE FLOWSTBEDGE ; //Defines active master strobe edge ++EXTERN __xdata _AT_(0xE6CD) volatile BYTE FLOWSTBHPERIOD ; //Half Period of output master strobe ++EXTERN __xdata _AT_(0xE60C) volatile BYTE GPIFHOLDAMOUNT ; //Data delay shift ++EXTERN __xdata _AT_(0xE67D) volatile BYTE UDMACRCH ; //CRC Upper byte ++EXTERN __xdata _AT_(0xE67E) volatile BYTE UDMACRCL ; //CRC Lower byte ++EXTERN __xdata _AT_(0xE67F) volatile BYTE UDMACRCQUAL ; //UDMA In only, host terminated use only + + + // Debug/Test + +-EXTERN xdata _AT_(0xE6F8) volatile BYTE DBUG ; // Debug +-EXTERN xdata _AT_(0xE6F9) volatile BYTE TESTCFG ; // Test configuration +-EXTERN xdata _AT_(0xE6FA) volatile BYTE USBTEST ; // USB Test Modes +-EXTERN xdata _AT_(0xE6FB) volatile BYTE CT1 ; // Chirp Test--Override +-EXTERN xdata _AT_(0xE6FC) volatile BYTE CT2 ; // Chirp Test--FSM +-EXTERN xdata _AT_(0xE6FD) volatile BYTE CT3 ; // Chirp Test--Control Signals +-EXTERN xdata _AT_(0xE6FE) volatile BYTE CT4 ; // Chirp Test--Inputs ++EXTERN __xdata _AT_(0xE6F8) volatile BYTE DBUG ; // Debug ++EXTERN __xdata _AT_(0xE6F9) volatile BYTE TESTCFG ; // Test configuration ++EXTERN __xdata _AT_(0xE6FA) volatile BYTE USBTEST ; // USB Test Modes ++EXTERN __xdata _AT_(0xE6FB) volatile BYTE CT1 ; // Chirp Test--Override ++EXTERN __xdata _AT_(0xE6FC) volatile BYTE CT2 ; // Chirp Test--FSM ++EXTERN __xdata _AT_(0xE6FD) volatile BYTE CT3 ; // Chirp Test--Control Signals ++EXTERN __xdata _AT_(0xE6FE) volatile BYTE CT4 ; // Chirp Test--Inputs + + // Endpoint Buffers + +-EXTERN xdata _AT_(0xE740) volatile BYTE EP0BUF[64] ; // EP0 IN-OUT buffer +-EXTERN xdata _AT_(0xE780) volatile BYTE EP1OUTBUF[64] ; // EP1-OUT buffer +-EXTERN xdata _AT_(0xE7C0) volatile BYTE EP1INBUF[64] ; // EP1-IN buffer +-EXTERN xdata _AT_(0xF000) volatile BYTE EP2FIFOBUF[1024] ; // 512/1024-byte EP2 buffer (IN or OUT) +-EXTERN xdata _AT_(0xF400) volatile BYTE EP4FIFOBUF[1024] ; // 512 byte EP4 buffer (IN or OUT) +-EXTERN xdata _AT_(0xF800) volatile BYTE EP6FIFOBUF[1024] ; // 512/1024-byte EP6 buffer (IN or OUT) +-EXTERN xdata _AT_(0xFC00) volatile BYTE EP8FIFOBUF[1024] ; // 512 byte EP8 buffer (IN or OUT) ++EXTERN __xdata _AT_(0xE740) volatile BYTE EP0BUF[64] ; // EP0 IN-OUT buffer ++EXTERN __xdata _AT_(0xE780) volatile BYTE EP1OUTBUF[64] ; // EP1-OUT buffer ++EXTERN __xdata _AT_(0xE7C0) volatile BYTE EP1INBUF[64] ; // EP1-IN buffer ++EXTERN __xdata _AT_(0xF000) volatile BYTE EP2FIFOBUF[1024] ; // 512/1024-byte EP2 buffer (IN or OUT) ++EXTERN __xdata _AT_(0xF400) volatile BYTE EP4FIFOBUF[1024] ; // 512 byte EP4 buffer (IN or OUT) ++EXTERN __xdata _AT_(0xF800) volatile BYTE EP6FIFOBUF[1024] ; // 512/1024-byte EP6 buffer (IN or OUT) ++EXTERN __xdata _AT_(0xFC00) volatile BYTE EP8FIFOBUF[1024] ; // 512 byte EP8 buffer (IN or OUT) + + #undef EXTERN + #undef _AT_ +@@ -312,201 +312,201 @@ EXTERN xdata _AT_(0xFC00) volatile BYTE EP8FIFOBUF[1024] ; // 512 byte EP8 buf + "ezregs.inc" which includes the same basic information for assembly inclusion. + -----------------------------------------------------------------------------*/ + +-sfr at 0x80 IOA; +-sfr at 0x81 SP; +-sfr at 0x82 DPL; +-sfr at 0x83 DPH; +-sfr at 0x84 DPL1; +-sfr at 0x85 DPH1; +-sfr at 0x86 DPS; ++__sfr __at 0x80 IOA; ++__sfr __at 0x81 SP; ++__sfr __at 0x82 DPL; ++__sfr __at 0x83 DPH; ++__sfr __at 0x84 DPL1; ++__sfr __at 0x85 DPH1; ++__sfr __at 0x86 DPS; + /* DPS */ +- sbit at 0x86+0 SEL; +-sfr at 0x87 PCON; /* PCON */ +- //sbit IDLE = 0x87+0; +- //sbit STOP = 0x87+1; +- //sbit GF0 = 0x87+2; +- //sbit GF1 = 0x87+3; +- //sbit SMOD0 = 0x87+7; +-sfr at 0x88 TCON; ++ __sbit __at 0x86+0 SEL; ++__sfr __at 0x87 PCON; /* PCON */ ++ //__sbit IDLE = 0x87+0; ++ //__sbit STOP = 0x87+1; ++ //__sbit GF0 = 0x87+2; ++ //__sbit GF1 = 0x87+3; ++ //__sbit SMOD0 = 0x87+7; ++__sfr __at 0x88 TCON; + /* TCON */ +- sbit at 0x88+0 IT0; +- sbit at 0x88+1 IE0; +- sbit at 0x88+2 IT1; +- sbit at 0x88+3 IE1; +- sbit at 0x88+4 TR0; +- sbit at 0x88+5 TF0; +- sbit at 0x88+6 TR1; +- sbit at 0x88+7 TF1; +-sfr at 0x89 TMOD; ++ __sbit __at 0x88+0 IT0; ++ __sbit __at 0x88+1 IE0; ++ __sbit __at 0x88+2 IT1; ++ __sbit __at 0x88+3 IE1; ++ __sbit __at 0x88+4 TR0; ++ __sbit __at 0x88+5 TF0; ++ __sbit __at 0x88+6 TR1; ++ __sbit __at 0x88+7 TF1; ++__sfr __at 0x89 TMOD; + /* TMOD */ +- //sbit M00 = 0x89+0; +- //sbit M10 = 0x89+1; +- //sbit CT0 = 0x89+2; +- //sbit GATE0 = 0x89+3; +- //sbit M01 = 0x89+4; +- //sbit M11 = 0x89+5; +- //sbit CT1 = 0x89+6; +- //sbit GATE1 = 0x89+7; +-sfr at 0x8A TL0; +-sfr at 0x8B TL1; +-sfr at 0x8C TH0; +-sfr at 0x8D TH1; +-sfr at 0x8E CKCON; ++ //__sbit M00 = 0x89+0; ++ //__sbit M10 = 0x89+1; ++ //__sbit CT0 = 0x89+2; ++ //__sbit GATE0 = 0x89+3; ++ //__sbit M01 = 0x89+4; ++ //__sbit M11 = 0x89+5; ++ //__sbit CT1 = 0x89+6; ++ //__sbit GATE1 = 0x89+7; ++__sfr __at 0x8A TL0; ++__sfr __at 0x8B TL1; ++__sfr __at 0x8C TH0; ++__sfr __at 0x8D TH1; ++__sfr __at 0x8E CKCON; + /* CKCON */ +- //sbit MD0 = 0x89+0; +- //sbit MD1 = 0x89+1; +- //sbit MD2 = 0x89+2; +- //sbit T0M = 0x89+3; +- //sbit T1M = 0x89+4; +- //sbit T2M = 0x89+5; +-// sfr at 0x8F SPC_FNC; // Was WRS in Reg320 ++ //__sbit MD0 = 0x89+0; ++ //__sbit MD1 = 0x89+1; ++ //__sbit MD2 = 0x89+2; ++ //__sbit T0M = 0x89+3; ++ //__sbit T1M = 0x89+4; ++ //__sbit T2M = 0x89+5; ++// __sfr __at 0x8F SPC_FNC; // Was WRS in Reg320 + /* CKCON */ +- //sbit WRS = 0x8F+0; +-sfr at 0x90 IOB; +-sfr at 0x91 EXIF; // EXIF Bit Values differ from Reg320 ++ //__sbit WRS = 0x8F+0; ++__sfr __at 0x90 IOB; ++__sfr __at 0x91 EXIF; // EXIF Bit Values differ from Reg320 + /* EXIF */ +- //sbit USBINT = 0x91+4; +- //sbit I2CINT = 0x91+5; +- //sbit IE4 = 0x91+6; +- //sbit IE5 = 0x91+7; +-sfr at 0x92 MPAGE; +-sfr at 0x98 SCON0; ++ //__sbit USBINT = 0x91+4; ++ //__sbit I2CINT = 0x91+5; ++ //__sbit IE4 = 0x91+6; ++ //__sbit IE5 = 0x91+7; ++__sfr __at 0x92 MPAGE; ++__sfr __at 0x98 SCON0; + /* SCON0 */ +- sbit at 0x98+0 RI; +- sbit at 0x98+1 TI; +- sbit at 0x98+2 RB8; +- sbit at 0x98+3 TB8; +- sbit at 0x98+4 REN; +- sbit at 0x98+5 SM2; +- sbit at 0x98+6 SM1; +- sbit at 0x98+7 SM0; +-sfr at 0x99 SBUF0; +- +-sfr at 0x9A APTR1H; +-sfr at 0x9B APTR1L; +-sfr at 0x9C AUTODAT1; +-sfr at 0x9D AUTOPTRH2; +-sfr at 0x9E AUTOPTRL2; +-sfr at 0x9F AUTODAT2; +-sfr at 0xA0 IOC; +-sfr at 0xA1 INT2CLR; +-sfr at 0xA2 INT4CLR; ++ __sbit __at 0x98+0 RI; ++ __sbit __at 0x98+1 TI; ++ __sbit __at 0x98+2 RB8; ++ __sbit __at 0x98+3 TB8; ++ __sbit __at 0x98+4 REN; ++ __sbit __at 0x98+5 SM2; ++ __sbit __at 0x98+6 SM1; ++ __sbit __at 0x98+7 SM0; ++__sfr __at 0x99 SBUF0; ++ ++__sfr __at 0x9A APTR1H; ++__sfr __at 0x9B APTR1L; ++__sfr __at 0x9C AUTODAT1; ++__sfr __at 0x9D AUTOPTRH2; ++__sfr __at 0x9E AUTOPTRL2; ++__sfr __at 0x9F AUTODAT2; ++__sfr __at 0xA0 IOC; ++__sfr __at 0xA1 INT2CLR; ++__sfr __at 0xA2 INT4CLR; + + #define AUTOPTRH1 APTR1H + #define AUTOPTRL1 APTR1L + +-sfr at 0xA8 IE; ++__sfr __at 0xA8 IE; + /* IE */ +- sbit at 0xA8+0 EX0; +- sbit at 0xA8+1 ET0; +- sbit at 0xA8+2 EX1; +- sbit at 0xA8+3 ET1; +- sbit at 0xA8+4 ES0; +- sbit at 0xA8+5 ET2; +- sbit at 0xA8+6 ES1; +- sbit at 0xA8+7 EA; +- +-sfr at 0xAA EP2468STAT; ++ __sbit __at 0xA8+0 EX0; ++ __sbit __at 0xA8+1 ET0; ++ __sbit __at 0xA8+2 EX1; ++ __sbit __at 0xA8+3 ET1; ++ __sbit __at 0xA8+4 ES0; ++ __sbit __at 0xA8+5 ET2; ++ __sbit __at 0xA8+6 ES1; ++ __sbit __at 0xA8+7 EA; ++ ++__sfr __at 0xAA EP2468STAT; + /* EP2468STAT */ +- //sbit EP2E = 0xAA+0; +- //sbit EP2F = 0xAA+1; +- //sbit EP4E = 0xAA+2; +- //sbit EP4F = 0xAA+3; +- //sbit EP6E = 0xAA+4; +- //sbit EP6F = 0xAA+5; +- //sbit EP8E = 0xAA+6; +- //sbit EP8F = 0xAA+7; +- +-sfr at 0xAB EP24FIFOFLGS; +-sfr at 0xAC EP68FIFOFLGS; +-sfr at 0xAF AUTOPTRSETUP; ++ //__sbit EP2E = 0xAA+0; ++ //__sbit EP2F = 0xAA+1; ++ //__sbit EP4E = 0xAA+2; ++ //__sbit EP4F = 0xAA+3; ++ //__sbit EP6E = 0xAA+4; ++ //__sbit EP6F = 0xAA+5; ++ //__sbit EP8E = 0xAA+6; ++ //__sbit EP8F = 0xAA+7; ++ ++__sfr __at 0xAB EP24FIFOFLGS; ++__sfr __at 0xAC EP68FIFOFLGS; ++__sfr __at 0xAF AUTOPTRSETUP; + /* AUTOPTRSETUP */ +- // sbit EXTACC = 0xAF+0; +- // sbit APTR1FZ = 0xAF+1; +- // sbit APTR2FZ = 0xAF+2; +- +-sfr at 0xB0 IOD; +-sfr at 0xB1 IOE; +-sfr at 0xB2 OEA; +-sfr at 0xB3 OEB; +-sfr at 0xB4 OEC; +-sfr at 0xB5 OED; +-sfr at 0xB6 OEE; +- +-sfr at 0xB8 IP; ++ // __sbit EXTACC = 0xAF+0; ++ // __sbit APTR1FZ = 0xAF+1; ++ // __sbit APTR2FZ = 0xAF+2; ++ ++__sfr __at 0xB0 IOD; ++__sfr __at 0xB1 IOE; ++__sfr __at 0xB2 OEA; ++__sfr __at 0xB3 OEB; ++__sfr __at 0xB4 OEC; ++__sfr __at 0xB5 OED; ++__sfr __at 0xB6 OEE; ++ ++__sfr __at 0xB8 IP; + /* IP */ +- sbit at 0xB8+0 PX0; +- sbit at 0xB8+1 PT0; +- sbit at 0xB8+2 PX1; +- sbit at 0xB8+3 PT1; +- sbit at 0xB8+4 PS0; +- sbit at 0xB8+5 PT2; +- sbit at 0xB8+6 PS1; +- +-sfr at 0xBA EP01STAT; +-sfr at 0xBB GPIFTRIG; ++ __sbit __at 0xB8+0 PX0; ++ __sbit __at 0xB8+1 PT0; ++ __sbit __at 0xB8+2 PX1; ++ __sbit __at 0xB8+3 PT1; ++ __sbit __at 0xB8+4 PS0; ++ __sbit __at 0xB8+5 PT2; ++ __sbit __at 0xB8+6 PS1; ++ ++__sfr __at 0xBA EP01STAT; ++__sfr __at 0xBB GPIFTRIG; + +-sfr at 0xBD GPIFSGLDATH; +-sfr at 0xBE GPIFSGLDATLX; +-sfr at 0xBF GPIFSGLDATLNOX; ++__sfr __at 0xBD GPIFSGLDATH; ++__sfr __at 0xBE GPIFSGLDATLX; ++__sfr __at 0xBF GPIFSGLDATLNOX; + +-sfr at 0xC0 SCON1; ++__sfr __at 0xC0 SCON1; + /* SCON1 */ +- sbit at 0xC0+0 RI1; +- sbit at 0xC0+1 TI1; +- sbit at 0xC0+2 RB81; +- sbit at 0xC0+3 TB81; +- sbit at 0xC0+4 REN1; +- sbit at 0xC0+5 SM21; +- sbit at 0xC0+6 SM11; +- sbit at 0xC0+7 SM01; +-sfr at 0xC1 SBUF1; +-sfr at 0xC8 T2CON; ++ __sbit __at 0xC0+0 RI1; ++ __sbit __at 0xC0+1 TI1; ++ __sbit __at 0xC0+2 RB81; ++ __sbit __at 0xC0+3 TB81; ++ __sbit __at 0xC0+4 REN1; ++ __sbit __at 0xC0+5 SM21; ++ __sbit __at 0xC0+6 SM11; ++ __sbit __at 0xC0+7 SM01; ++__sfr __at 0xC1 SBUF1; ++__sfr __at 0xC8 T2CON; + /* T2CON */ +- sbit at 0xC8+0 CP_RL2; +- sbit at 0xC8+1 C_T2; +- sbit at 0xC8+2 TR2; +- sbit at 0xC8+3 EXEN2; +- sbit at 0xC8+4 TCLK; +- sbit at 0xC8+5 RCLK; +- sbit at 0xC8+6 EXF2; +- sbit at 0xC8+7 TF2; +-sfr at 0xCA RCAP2L; +-sfr at 0xCB RCAP2H; +-sfr at 0xCC TL2; +-sfr at 0xCD TH2; +-sfr at 0xD0 PSW; ++ __sbit __at 0xC8+0 CP_RL2; ++ __sbit __at 0xC8+1 C_T2; ++ __sbit __at 0xC8+2 TR2; ++ __sbit __at 0xC8+3 EXEN2; ++ __sbit __at 0xC8+4 TCLK; ++ __sbit __at 0xC8+5 RCLK; ++ __sbit __at 0xC8+6 EXF2; ++ __sbit __at 0xC8+7 TF2; ++__sfr __at 0xCA RCAP2L; ++__sfr __at 0xCB RCAP2H; ++__sfr __at 0xCC TL2; ++__sfr __at 0xCD TH2; ++__sfr __at 0xD0 PSW; + /* PSW */ +- sbit at 0xD0+0 P; +- sbit at 0xD0+1 FL; +- sbit at 0xD0+2 OV; +- sbit at 0xD0+3 RS0; +- sbit at 0xD0+4 RS1; +- sbit at 0xD0+5 F0; +- sbit at 0xD0+6 AC; +- sbit at 0xD0+7 CY; +-sfr at 0xD8 EICON; // Was WDCON in DS80C320 EICON; Bit Values differ from Reg320 ++ __sbit __at 0xD0+0 P; ++ __sbit __at 0xD0+1 FL; ++ __sbit __at 0xD0+2 OV; ++ __sbit __at 0xD0+3 RS0; ++ __sbit __at 0xD0+4 RS1; ++ __sbit __at 0xD0+5 F0; ++ __sbit __at 0xD0+6 AC; ++ __sbit __at 0xD0+7 CY; ++__sfr __at 0xD8 EICON; // Was WDCON in DS80C320 EICON; Bit Values differ from Reg320 + /* EICON */ +- sbit at 0xD8+3 INT6; +- sbit at 0xD8+4 RESI; +- sbit at 0xD8+5 ERESI; +- sbit at 0xD8+7 SMOD1; +-sfr at 0xE0 ACC; +-sfr at 0xE8 EIE; // EIE Bit Values differ from Reg320 ++ __sbit __at 0xD8+3 INT6; ++ __sbit __at 0xD8+4 RESI; ++ __sbit __at 0xD8+5 ERESI; ++ __sbit __at 0xD8+7 SMOD1; ++__sfr __at 0xE0 ACC; ++__sfr __at 0xE8 EIE; // EIE Bit Values differ from Reg320 + /* EIE */ +- sbit at 0xE8+0 EIUSB; +- sbit at 0xE8+1 EI2C; +- sbit at 0xE8+2 EIEX4; +- sbit at 0xE8+3 EIEX5; +- sbit at 0xE8+4 EIEX6; +-sfr at 0xF0 B; +-sfr at 0xF8 EIP; // EIP Bit Values differ from Reg320 ++ __sbit __at 0xE8+0 EIUSB; ++ __sbit __at 0xE8+1 EI2C; ++ __sbit __at 0xE8+2 EIEX4; ++ __sbit __at 0xE8+3 EIEX5; ++ __sbit __at 0xE8+4 EIEX6; ++__sfr __at 0xF0 B; ++__sfr __at 0xF8 EIP; // EIP Bit Values differ from Reg320 + /* EIP */ +- sbit at 0xF8+0 PUSB; +- sbit at 0xF8+1 PI2C; +- sbit at 0xF8+2 EIPX4; +- sbit at 0xF8+3 EIPX5; +- sbit at 0xF8+4 EIPX6; ++ __sbit __at 0xF8+0 PUSB; ++ __sbit __at 0xF8+1 PI2C; ++ __sbit __at 0xF8+2 EIPX4; ++ __sbit __at 0xF8+3 EIPX5; ++ __sbit __at 0xF8+4 EIPX6; + + /*----------------------------------------------------------------------------- + Bit Masks +diff --git a/firmware/fx2/common/i2c.c b/firmware/fx2/common/i2c.c +index 0f238b5..dd31a5f 100644 +--- a/firmware/fx2/common/i2c.c ++++ b/firmware/fx2/common/i2c.c +@@ -30,7 +30,7 @@ + + // returns non-zero if successful, else 0 + unsigned char +-i2c_read (unsigned char addr, xdata unsigned char *buf, unsigned char len) ++i2c_read (unsigned char addr, __xdata unsigned char *buf, unsigned char len) + { + volatile unsigned char junk; + +@@ -89,7 +89,7 @@ i2c_read (unsigned char addr, xdata unsigned char *buf, unsigned char len) + + // returns non-zero if successful, else 0 + unsigned char +-i2c_write (unsigned char addr, xdata const unsigned char *buf, unsigned char len) ++i2c_write (unsigned char addr, __xdata const unsigned char *buf, unsigned char len) + { + while (I2CS & bmSTOP) // wait for stop to clear + ; +diff --git a/firmware/fx2/common/i2c.h b/firmware/fx2/common/i2c.h +index 273526d..25f5364 100644 +--- a/firmware/fx2/common/i2c.h ++++ b/firmware/fx2/common/i2c.h +@@ -24,9 +24,9 @@ + #define _I2C_H_ + + // returns non-zero if successful, else 0 +-unsigned char i2c_read (unsigned char addr, xdata unsigned char *buf, unsigned char len); ++unsigned char i2c_read (unsigned char addr, __xdata unsigned char *buf, unsigned char len); + + // returns non-zero if successful, else 0 +-unsigned char i2c_write (unsigned char addr, xdata const unsigned char *buf, unsigned char len); ++unsigned char i2c_write (unsigned char addr, __xdata const unsigned char *buf, unsigned char len); + + #endif /* _I2C_H_ */ +diff --git a/firmware/fx2/common/init_gpif.c b/firmware/fx2/common/init_gpif.c +index edde919..f0866ed 100644 +--- a/firmware/fx2/common/init_gpif.c ++++ b/firmware/fx2/common/init_gpif.c +@@ -29,7 +29,7 @@ extern const char InitData[7]; + // The tool is kind of screwed up, in that it doesn't configure some + // of the ports correctly. We just use their tables and handle the + // initialization ourselves. They also declare that their static +-// initialized data is in xdata, which screws us too. ++// initialized data is in __xdata, which screws us too. + + void + init_gpif (void) +diff --git a/firmware/fx2/common/isr.c b/firmware/fx2/common/isr.c +index 05412da..61f2dc3 100644 +--- a/firmware/fx2/common/isr.c ++++ b/firmware/fx2/common/isr.c +@@ -24,9 +24,9 @@ + #include "fx2regs.h" + #include "syncdelay.h" + +-extern xdata unsigned char _standard_interrupt_vector[]; +-extern xdata unsigned char _usb_autovector[]; +-extern xdata unsigned char _fifo_gpif_autovector[]; ++extern __xdata unsigned char _standard_interrupt_vector[]; ++extern __xdata unsigned char _usb_autovector[]; ++extern __xdata unsigned char _fifo_gpif_autovector[]; + + #define LJMP_OPCODE 0x02 + +@@ -39,7 +39,7 @@ extern xdata unsigned char _fifo_gpif_autovector[]; + void + hook_sv (unsigned char vector_number, unsigned short addr) + { +- bit t; ++ __bit t; + + // sanity checks + +@@ -66,7 +66,7 @@ hook_sv (unsigned char vector_number, unsigned short addr) + void + hook_uv (unsigned char vector_number, unsigned short addr) + { +- bit t; ++ __bit t; + + // sanity checks + +@@ -93,7 +93,7 @@ hook_uv (unsigned char vector_number, unsigned short addr) + void + hook_fgv (unsigned char vector_number, unsigned short addr) + { +- bit t; ++ __bit t; + + // sanity checks + +diff --git a/firmware/fx2/common/spi.c b/firmware/fx2/common/spi.c +index 04a1d84..6f62c91 100644 +--- a/firmware/fx2/common/spi.c ++++ b/firmware/fx2/common/spi.c +@@ -98,17 +98,17 @@ static void + write_byte_msb (unsigned char v); + + static void +-write_bytes_msb (const xdata unsigned char *buf, unsigned char len); ++write_bytes_msb (const __xdata unsigned char *buf, unsigned char len); + + static void +-read_bytes_msb (xdata unsigned char *buf, unsigned char len); ++read_bytes_msb (__xdata unsigned char *buf, unsigned char len); + + + // returns non-zero if successful, else 0 + unsigned char + spi_read (unsigned char header_hi, unsigned char header_lo, + unsigned char enables, unsigned char format, +- xdata unsigned char *buf, unsigned char len) ++ __xdata unsigned char *buf, unsigned char len) + { + if (count_bits8 (enables) > 1) + return 0; // error, too many enables set +@@ -165,7 +165,7 @@ spi_read (unsigned char header_hi, unsigned char header_lo, + unsigned char + spi_write (unsigned char header_hi, unsigned char header_lo, + unsigned char enables, unsigned char format, +- const xdata unsigned char *buf, unsigned char len) ++ const __xdata unsigned char *buf, unsigned char len) + { + setup_enables (enables); + +@@ -261,7 +261,7 @@ write_byte_msb (unsigned char v) + } + + static void +-write_bytes_msb (const xdata unsigned char *buf, unsigned char len) ++write_bytes_msb (const __xdata unsigned char *buf, unsigned char len) + { + while (len-- != 0){ + write_byte_msb (*buf++); +@@ -320,9 +320,9 @@ read_byte_msb (void) + } + #else + static unsigned char +-read_byte_msb (void) _naked ++read_byte_msb (void) __naked + { +- _asm ++ __asm + clr a + + setb _bitS_CLK +@@ -367,12 +367,12 @@ read_byte_msb (void) _naked + + mov dpl,a + ret +- _endasm; ++ __endasm; + } + #endif + + static void +-read_bytes_msb (xdata unsigned char *buf, unsigned char len) ++read_bytes_msb (__xdata unsigned char *buf, unsigned char len) + { + while (len-- != 0){ + *buf++ = read_byte_msb (); +diff --git a/firmware/fx2/common/spi.h b/firmware/fx2/common/spi.h +index 12bc5e5..0ee6882 100644 +--- a/firmware/fx2/common/spi.h ++++ b/firmware/fx2/common/spi.h +@@ -31,13 +31,13 @@ void init_spi (void); // one time call to init + unsigned char + spi_read (unsigned char header_hi, unsigned char header_lo, + unsigned char enables, unsigned char format, +- xdata unsigned char *buf, unsigned char len); ++ __xdata unsigned char *buf, unsigned char len); + + // returns non-zero if successful, else 0 + unsigned char + spi_write (unsigned char header_hi, unsigned char header_lo, + unsigned char enables, unsigned char format, +- const xdata unsigned char *buf, unsigned char len); ++ const __xdata unsigned char *buf, unsigned char len); + + + #endif /* INCLUDED_SPI_H */ +diff --git a/firmware/fx2/common/syncdelay.h b/firmware/fx2/common/syncdelay.h +index 0af7d09..cca96ad 100644 +--- a/firmware/fx2/common/syncdelay.h ++++ b/firmware/fx2/common/syncdelay.h +@@ -23,7 +23,7 @@ + #define _SYNCDELAY_H_ + + /* +- * Magic delay required between access to certain xdata registers (TRM page 15-106). ++ * Magic delay required between access to certain __xdata registers (TRM page 15-106). + * For our configuration, 48 MHz FX2 / 48 MHz IFCLK, we need three cycles. Each + * NOP is a single cycle.... + * +@@ -58,8 +58,8 @@ + /* + * FIXME ensure that the peep hole optimizer isn't screwing us + */ +-#define SYNCDELAY _asm nop; nop; nop; _endasm +-#define NOP _asm nop; _endasm ++#define SYNCDELAY __asm nop; nop; nop; __endasm ++#define NOP __asm nop; __endasm + + + #endif /* _SYNCDELAY_H_ */ +diff --git a/firmware/fx2/common/usb_common.c b/firmware/fx2/common/usb_common.c +index 3b0547b..6a7a103 100644 +--- a/firmware/fx2/common/usb_common.c ++++ b/firmware/fx2/common/usb_common.c +@@ -28,12 +28,12 @@ + #include "usb_descriptors.h" + #include "usb_requests.h" + +-extern xdata char str0[]; +-extern xdata char str1[]; +-extern xdata char str2[]; +-extern xdata char str3[]; +-extern xdata char str4[]; +-extern xdata char str5[]; ++extern __xdata char str0[]; ++extern __xdata char str1[]; ++extern __xdata char str2[]; ++extern __xdata char str3[]; ++extern __xdata char str4[]; ++extern __xdata char str5[]; + + + #define bRequestType SETUPDAT[0] +@@ -48,15 +48,15 @@ extern xdata char str5[]; + #define MSB(x) (((unsigned short) x) >> 8) + #define LSB(x) (((unsigned short) x) & 0xff) + +-volatile bit _usb_got_SUDAV; ++volatile __bit _usb_got_SUDAV; + + unsigned char _usb_config = 0; + unsigned char _usb_alt_setting = 0; // FIXME really 1/interface + +-xdata unsigned char *current_device_descr; +-xdata unsigned char *current_devqual_descr; +-xdata unsigned char *current_config_descr; +-xdata unsigned char *other_config_descr; ++__xdata unsigned char *current_device_descr; ++__xdata unsigned char *current_devqual_descr; ++__xdata unsigned char *current_config_descr; ++__xdata unsigned char *other_config_descr; + + static void + setup_descriptors (void) +@@ -81,21 +81,21 @@ setup_descriptors (void) + } + + static void +-isr_SUDAV (void) interrupt ++isr_SUDAV (void) __interrupt + { + clear_usb_irq (); + _usb_got_SUDAV = 1; + } + + static void +-isr_USBRESET (void) interrupt ++isr_USBRESET (void) __interrupt + { + clear_usb_irq (); + setup_descriptors (); + } + + static void +-isr_HIGHSPEED (void) interrupt ++isr_HIGHSPEED (void) __interrupt + { + clear_usb_irq (); + setup_descriptors (); +@@ -133,7 +133,7 @@ plausible_endpoint (unsigned char ep) + // return pointer to control and status register for endpoint. + // only called with plausible_endpoints + +-xdata volatile unsigned char * ++__xdata volatile unsigned char * + epcs (unsigned char ep) + { + if (ep == 0x01) // ep1 has different in and out CS regs +@@ -234,7 +234,7 @@ usb_handle_setup_packet (void) + if (wValueL >= nstring_descriptors) + fx2_stall_ep0 (); + else { +- xdata char *p = string_descriptors[wValueL]; ++ __xdata char *p = string_descriptors[wValueL]; + SUDPTRH = MSB (p); + SUDPTRL = LSB (p); + } +diff --git a/firmware/fx2/common/usb_common.h b/firmware/fx2/common/usb_common.h +index ae07b23..2fbab6d 100644 +--- a/firmware/fx2/common/usb_common.h ++++ b/firmware/fx2/common/usb_common.h +@@ -23,7 +23,7 @@ + #ifndef _USB_COMMON_H_ + #define _USB_COMMON_H_ + +-extern volatile bit _usb_got_SUDAV; ++extern volatile __bit _usb_got_SUDAV; + + // Provided by user application to handle VENDOR commands. + // returns non-zero if it handled the command. +diff --git a/firmware/fx2/common/usb_descriptors.h b/firmware/fx2/common/usb_descriptors.h +index 0b8c621..ea91169 100644 +--- a/firmware/fx2/common/usb_descriptors.h ++++ b/firmware/fx2/common/usb_descriptors.h +@@ -20,21 +20,21 @@ + * Boston, MA 02110-1301, USA. + */ + +-extern xdata const char high_speed_device_descr[]; +-extern xdata const char high_speed_devqual_descr[]; +-extern xdata const char high_speed_config_descr[]; ++extern __xdata const char high_speed_device_descr[]; ++extern __xdata const char high_speed_devqual_descr[]; ++extern __xdata const char high_speed_config_descr[]; + +-extern xdata const char full_speed_device_descr[]; +-extern xdata const char full_speed_devqual_descr[]; +-extern xdata const char full_speed_config_descr[]; ++extern __xdata const char full_speed_device_descr[]; ++extern __xdata const char full_speed_devqual_descr[]; ++extern __xdata const char full_speed_config_descr[]; + +-extern xdata unsigned char nstring_descriptors; +-extern xdata char * xdata string_descriptors[]; ++extern __xdata unsigned char nstring_descriptors; ++extern __xdata char * __xdata string_descriptors[]; + + /* + * We patch these locations with info read from the usrp config eeprom + */ +-extern xdata char usb_desc_hw_rev_binary_patch_location_0[]; +-extern xdata char usb_desc_hw_rev_binary_patch_location_1[]; +-extern xdata char usb_desc_hw_rev_ascii_patch_location_0[]; +-extern xdata char usb_desc_serial_number_ascii[]; ++extern __xdata char usb_desc_hw_rev_binary_patch_location_0[]; ++extern __xdata char usb_desc_hw_rev_binary_patch_location_1[]; ++extern __xdata char usb_desc_hw_rev_ascii_patch_location_0[]; ++extern __xdata char usb_desc_serial_number_ascii[]; +diff --git a/firmware/fx2/config/CMakeASM_SDCCInformation.cmake b/firmware/fx2/config/CMakeASM_SDCCInformation.cmake +index d9f28b8..0d26b89 100644 +--- a/firmware/fx2/config/CMakeASM_SDCCInformation.cmake ++++ b/firmware/fx2/config/CMakeASM_SDCCInformation.cmake +@@ -15,7 +15,7 @@ + # along with this program. If not, see . + # + +-# support for the SDCC assembler, asx8051 ++# support for the SDCC assembler, sdas8051 + SET( ASM_DIALECT "_SDCC" ) + SET( CMAKE_ASM${ASM_DIALECT}_SOURCE_FILE_EXTENSIONS a51 ) + +diff --git a/firmware/fx2/config/CMakeDetermineASM_SDCCCompiler.cmake b/firmware/fx2/config/CMakeDetermineASM_SDCCCompiler.cmake +index ab301b9..3748107 100644 +--- a/firmware/fx2/config/CMakeDetermineASM_SDCCCompiler.cmake ++++ b/firmware/fx2/config/CMakeDetermineASM_SDCCCompiler.cmake +@@ -16,7 +16,7 @@ + + SET(ASM_DIALECT "_SDCC") + +-SET(CMAKE_ASM${ASM_DIALECT}_COMPILER_INIT asx8051) ++SET(CMAKE_ASM${ASM_DIALECT}_COMPILER_INIT sdas8051) + + INCLUDE(CMakeDetermineASMCompiler) + SET(ASM_DIALECT) +diff --git a/firmware/fx2/usrp1/board_specific.c b/firmware/fx2/usrp1/board_specific.c +index ef0081d..92fc28f 100644 +--- a/firmware/fx2/usrp1/board_specific.c ++++ b/firmware/fx2/usrp1/board_specific.c +@@ -64,7 +64,7 @@ set_sleep_bits (unsigned char bits, unsigned char mask) + // NOP on usrp1 + } + +-static xdata unsigned char xbuf[1]; ++static __xdata unsigned char xbuf[1]; + + void + write_9862 (unsigned char which, unsigned char regno, unsigned char value) +diff --git a/firmware/fx2/usrp1/eeprom_io.c b/firmware/fx2/usrp1/eeprom_io.c +index 9eeb536..666f3f6 100644 +--- a/firmware/fx2/usrp1/eeprom_io.c ++++ b/firmware/fx2/usrp1/eeprom_io.c +@@ -27,12 +27,12 @@ + // returns non-zero if successful, else 0 + unsigned char + eeprom_read (unsigned char i2c_addr, unsigned char eeprom_offset, +- xdata unsigned char *buf, unsigned char len) ++ __xdata unsigned char *buf, unsigned char len) + { + // We setup a random read by first doing a "zero byte write". + // Writes carry an address. Reads use an implicit address. + +- static xdata unsigned char cmd[1]; ++ static __xdata unsigned char cmd[1]; + cmd[0] = eeprom_offset; + if (!i2c_write(i2c_addr, cmd, 1)) + return 0; +@@ -46,9 +46,9 @@ eeprom_read (unsigned char i2c_addr, unsigned char eeprom_offset, + // returns non-zero if successful, else 0 + unsigned char + eeprom_write (unsigned char i2c_addr, unsigned char eeprom_offset, +- const xdata unsigned char *buf, unsigned char len) ++ const __xdata unsigned char *buf, unsigned char len) + { +- static xdata unsigned char cmd[2]; ++ static __xdata unsigned char cmd[2]; + unsigned char ok; + + while (len-- > 0){ +diff --git a/firmware/fx2/usrp1/eeprom_io.h b/firmware/fx2/usrp1/eeprom_io.h +index 558017b..d1c4ee6 100644 +--- a/firmware/fx2/usrp1/eeprom_io.h ++++ b/firmware/fx2/usrp1/eeprom_io.h +@@ -27,12 +27,12 @@ + // returns non-zero if successful, else 0 + unsigned char + eeprom_read (unsigned char i2c_addr, unsigned char eeprom_offset, +- xdata unsigned char *buf, unsigned char len); ++ __xdata unsigned char *buf, unsigned char len); + + // returns non-zero if successful, else 0 + unsigned char + eeprom_write (unsigned char i2c_addr, unsigned char eeprom_offset, +- const xdata unsigned char *buf, unsigned char len); ++ const __xdata unsigned char *buf, unsigned char len); + + + #endif /* INCLUDED_EEPROM_IO_H */ +diff --git a/firmware/fx2/usrp1/fpga_load.c b/firmware/fx2/usrp1/fpga_load.c +index c3ae9e7..4c0a85e 100644 +--- a/firmware/fx2/usrp1/fpga_load.c ++++ b/firmware/fx2/usrp1/fpga_load.c +@@ -89,9 +89,9 @@ clock_out_config_byte (unsigned char bits) + #else + + static void +-clock_out_config_byte (unsigned char bits) _naked ++clock_out_config_byte (unsigned char bits) __naked + { +- _asm ++ __asm + mov a, dpl + + rrc a +@@ -136,14 +136,14 @@ clock_out_config_byte (unsigned char bits) _naked + + ret + +- _endasm; ++ __endasm; + } + + #endif + + static void + clock_out_bytes (unsigned char bytecount, +- unsigned char xdata *p) ++ unsigned char __xdata *p) + { + while (bytecount-- > 0) + clock_out_config_byte (*p++); +@@ -163,7 +163,7 @@ clock_out_bytes (unsigned char bytecount, + * ALTERA_NSTATUS = 1 (input) + */ + unsigned char +-fpga_load_xfer (xdata unsigned char *p, unsigned char bytecount) ++fpga_load_xfer (__xdata unsigned char *p, unsigned char bytecount) + { + clock_out_bytes (bytecount, p); + return 1; +diff --git a/firmware/fx2/usrp1/fpga_rev2.c b/firmware/fx2/usrp1/fpga_rev2.c +index cca961d..a1081f5 100644 +--- a/firmware/fx2/usrp1/fpga_rev2.c ++++ b/firmware/fx2/usrp1/fpga_rev2.c +@@ -30,7 +30,7 @@ unsigned char g_tx_reset = 0; + unsigned char g_rx_reset = 0; + + void +-fpga_write_reg (unsigned char regno, const xdata unsigned char *regval) ++fpga_write_reg (unsigned char regno, const __xdata unsigned char *regval) + { + spi_write (0, 0x00 | (regno & 0x7f), + SPI_ENABLE_FPGA, +@@ -39,7 +39,7 @@ fpga_write_reg (unsigned char regno, const xdata unsigned char *regval) + } + + +-static xdata unsigned char regval[4] = {0, 0, 0, 0}; ++static __xdata unsigned char regval[4] = {0, 0, 0, 0}; + + static void + write_fpga_master_ctrl (void) +diff --git a/firmware/fx2/usrp1/gpif.c b/firmware/fx2/usrp1/gpif.c +index f6745a4..2ba8a8a 100644 +--- a/firmware/fx2/usrp1/gpif.c ++++ b/firmware/fx2/usrp1/gpif.c +@@ -156,7 +156,7 @@ + // END DO NOT EDIT + + // DO NOT EDIT ... +-const char xdata WaveData[128] = ++const char __xdata WaveData[128] = + { + // Wave 0 + /* LenBr */ 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x07, +@@ -182,7 +182,7 @@ const char xdata WaveData[128] = + // END DO NOT EDIT + + // DO NOT EDIT ... +-const char xdata FlowStates[36] = ++const char __xdata FlowStates[36] = + { + /* Wave 0 FlowStates */ 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, + /* Wave 1 FlowStates */ 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, +@@ -192,7 +192,7 @@ const char xdata FlowStates[36] = + // END DO NOT EDIT + + // DO NOT EDIT ... +-const char xdata InitData[7] = ++const char __xdata InitData[7] = + { + /* Regs */ 0xA0,0x00,0x00,0x00,0xEE,0x4E,0x00 + }; +diff --git a/firmware/fx2/usrp1/usrp_main.c b/firmware/fx2/usrp1/usrp_main.c +index 802516c..841451f 100644 +--- a/firmware/fx2/usrp1/usrp_main.c ++++ b/firmware/fx2/usrp1/usrp_main.c +@@ -63,7 +63,7 @@ unsigned char g_tx_underrun = 0; + * into hash1. + */ + #define USRP_HASH_SIZE 16 +-xdata at USRP_HASH_SLOT_1_ADDR unsigned char hash1[USRP_HASH_SIZE]; ++__xdata __at USRP_HASH_SLOT_1_ADDR unsigned char hash1[USRP_HASH_SIZE]; + + static void + get_ep0_data (void) +@@ -305,7 +305,7 @@ main_loop (void) + * Toggle led 0 + */ + void +-isr_tick (void) interrupt ++isr_tick (void) __interrupt + { + static unsigned char count = 1; + +@@ -324,8 +324,8 @@ isr_tick (void) interrupt + void + patch_usb_descriptors(void) + { +- static xdata unsigned char hw_rev; +- static xdata unsigned char serial_no[8]; ++ static __xdata unsigned char hw_rev; ++ static __xdata unsigned char serial_no[8]; + unsigned char i; + + eeprom_read(I2C_ADDR_BOOT, HW_REV_OFFSET, &hw_rev, 1); // LSB of device id +diff --git a/firmware/fx2/usrp1/usrp_regs.h b/firmware/fx2/usrp1/usrp_regs.h +index a4f1d98..4390f13 100644 +--- a/firmware/fx2/usrp1/usrp_regs.h ++++ b/firmware/fx2/usrp1/usrp_regs.h +@@ -47,9 +47,9 @@ + #define bmPA_TX_UNDERRUN bmBIT7 // misc pin to FPGA (underflow) + + +-sbit at 0x80+0 bitS_CLK; // 0x80 is the bit address of PORT A +-sbit at 0x80+1 bitS_OUT; // out from FX2 point of view +-sbit at 0x80+2 bitS_IN; // in from FX2 point of view ++__sbit __at 0x80+0 bitS_CLK; // 0x80 is the bit address of PORT A ++__sbit __at 0x80+1 bitS_OUT; // out from FX2 point of view ++__sbit __at 0x80+2 bitS_IN; // in from FX2 point of view + + + /* all outputs except S_DATA_FROM_PERIPH, FX2_2, FX2_3 */ +@@ -85,8 +85,8 @@ sbit at 0x80+2 bitS_IN; // in from FX2 point of view + #define bmPC_LED0 bmBIT6 // active low + #define bmPC_LED1 bmBIT7 // active low + +-sbit at 0xA0+1 bitALTERA_DATA0; // 0xA0 is the bit address of PORT C +-sbit at 0xA0+3 bitALTERA_DCLK; ++__sbit __at 0xA0+1 bitALTERA_DATA0; // 0xA0 is the bit address of PORT C ++__sbit __at 0xA0+3 bitALTERA_DCLK; + + + #define bmALTERA_BITS (bmALTERA_DATA0 \ +diff --git a/firmware/fx2/utils/edit-gpif-b100.py b/firmware/fx2/utils/edit-gpif-b100.py +index fd949cd..d90993e 100755 +--- a/firmware/fx2/utils/edit-gpif-b100.py ++++ b/firmware/fx2/utils/edit-gpif-b100.py +@@ -105,7 +105,7 @@ def edit_gpif (input_name, output_name, inline_name): + check_flow_state (line, flow_state_dict) + + line = re.sub (r'#include', r'// #include', line) +- line = re.sub (r'xdata ', r'', line) ++ line = re.sub (r'__xdata ', r'', line) + if re.search (r'GpifInit', line): + break + +diff --git a/firmware/fx2/utils/edit-gpif.py b/firmware/fx2/utils/edit-gpif.py +index 5367b75..93f1878 100755 +--- a/firmware/fx2/utils/edit-gpif.py ++++ b/firmware/fx2/utils/edit-gpif.py +@@ -99,7 +99,7 @@ def edit_gpif (input_name, output_name, inline_name): + check_flow_state (line, flow_state_dict) + + line = re.sub (r'#include', r'// #include', line) +- line = re.sub (r'xdata ', r'', line) ++ line = re.sub (r'__xdata ', r'', line) + if re.search (r'GpifInit', line): + break + diff --git a/uhd.spec b/uhd.spec index 77e9edc..823fc97 100644 --- a/uhd.spec +++ b/uhd.spec @@ -1,5 +1,17 @@ +# By default include binary_firmware, otherwise try to rebuild +# the firmware from sources. If you want to rebuild all firmware +# images you need to install appropriate tools (e.g. Xilinx ISE). +%bcond_without binary_firmware + +%global ver_major 3 +%global ver_minor 4 +%global ver_patch 2 + +%global ver %(printf "%03d.%03d.%03d" %{ver_major} %{ver_minor} %{ver_patch}) +%global ver_ %(printf "%03d_%03d_%03d" %{ver_major} %{ver_minor} %{ver_patch}) + # Pull from git -%global git_tag release_003_004_002 +%global git_tag release_%{ver_} # git clone git://code.ettus.com/ettus/uhd.git # cd uhd @@ -8,20 +20,26 @@ Name: uhd URL: http://code.ettus.com/redmine/ettus/projects/uhd/wiki -Version: 3.4.2 -Release: 1%{?dist} +Version: %{ver_major}.%{ver_minor}.%{ver_patch} +Release: 2%{?dist} License: GPLv3+ BuildRequires: cmake BuildRequires: boost-devel libusb1-devel python-cheetah BuildRequires: docutils doxygen pkgconfig +%if ! %{with binary_firmware} +BuildRequires: sdcc sed +%endif Requires(pre): shadow-utils Requires: tkinter Group: Applications/Engineering Summary: Universal Hardware Driver for Ettus Research products Source0: %{name}-%{version}.tar.gz Source1: %{name}-limits.conf +Source2: http://files.ettus.com/binaries/uhd_stable/latest_release/uhd-images_%{ver}-release.tar.gz # ARM convert_test fix (rhbz#813393) Patch0: uhd-3.4.2-no-neon.patch +# Fix firmware build with sdcc-3 +Patch1: uhd-3.4.2-sdcc-3-fix.patch %description The UHD is the universal hardware driver for Ettus Research products. @@ -31,12 +49,32 @@ future Ettus Research products. It can be used standalone without GNU Radio. %prep %setup -q %patch0 -p1 -b .no-neon +%patch1 -p1 -b .sdcc-3-fix + +# firmware +%if %{with binary_firmware} +# extract binary firmware +mkdir -p images/images +tar -xzf %{SOURCE2} -C images/images --strip-components=4 +rm -f images/images/{LICENSE.txt,*.tag} +%endif %build -mkdir host/build -cd host/build +# firmware +%if ! %{with binary_firmware} +# rebuilt from sources +export PATH=$PATH:%{_libexecdir}/sdcc +pushd images +sed -i '/-name "\*\.twr" | xargs grep constraint | grep met/ s/^/#/' Makefile +make %{?_smp_mflags} images +popd +%endif + +mkdir -p host/build +pushd host/build %cmake ../ make %{?_smp_mflags} +popd %check cd host/build @@ -65,10 +103,23 @@ mv %{buildroot}%{_docdir}/%{name}/{AUTHORS.txt,LICENSE.txt,README.txt} _tmpdoc install -m 644 -D %{SOURCE1} %{buildroot}%{_sysconfdir}/security/limits.d/99-usrp.conf +# firmware +mkdir -p %{buildroot}%{_datadir}/uhd/images +cp -r images/images/* %{buildroot}%{_datadir}/uhd/images + %post -p /sbin/ldconfig %postun -p /sbin/ldconfig +%package firmware +Summary: Firmware files for UHD +Group: Applications/Engineering +Requires: %{name} = %{version}-%{release} +BuildArch: noarch + +%description firmware +Firmware files for the Universal Hardware driver (UHD). + %package devel Summary: Development files for UHD Group: Applications/Engineering @@ -96,6 +147,10 @@ getent group usrp >/dev/null || groupadd -r usrp >/dev/null %{_libdir}/lib*.so.* %{_libexecdir}/uhd +%files firmware +%dir %{_datadir}/uhd/images +%{_datadir}/uhd/images/* + %files devel %{_includedir}/* %{_libdir}/lib*.so @@ -105,6 +160,10 @@ getent group usrp >/dev/null || groupadd -r usrp >/dev/null %doc %{_docdir}/%{name}/* %changelog +* Wed Jun 6 2012 Jaroslav Škarvada - 3.4.2-2 +- Added firmware subpackage + Resolves: rhbz#769684 + * Wed May 23 2012 Jaroslav Škarvada - 3.4.2-1 - New version - Removed usrp1-r45-dbsrx-i2c-fix patch (upstreamed) From c02bbf0af557d5dea451019dd3ccc2f29389cebd Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Sat, 21 Jul 2012 20:28:56 -0500 Subject: [PATCH 011/152] - Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild --- uhd.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/uhd.spec b/uhd.spec index 823fc97..301a797 100644 --- a/uhd.spec +++ b/uhd.spec @@ -21,7 +21,7 @@ Name: uhd URL: http://code.ettus.com/redmine/ettus/projects/uhd/wiki Version: %{ver_major}.%{ver_minor}.%{ver_patch} -Release: 2%{?dist} +Release: 3%{?dist} License: GPLv3+ BuildRequires: cmake BuildRequires: boost-devel libusb1-devel python-cheetah @@ -160,6 +160,9 @@ getent group usrp >/dev/null || groupadd -r usrp >/dev/null %doc %{_docdir}/%{name}/* %changelog +* Sun Jul 22 2012 Fedora Release Engineering - 3.4.2-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild + * Wed Jun 6 2012 Jaroslav Škarvada - 3.4.2-2 - Added firmware subpackage Resolves: rhbz#769684 From 6b54aa7fb059b1fee878bd19c92523ac77e5023e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jaroslav=20=C5=A0karvada?= Date: Fri, 10 Aug 2012 09:10:23 +0200 Subject: [PATCH 012/152] Rebuilt for new boost --- uhd.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/uhd.spec b/uhd.spec index 301a797..ea32352 100644 --- a/uhd.spec +++ b/uhd.spec @@ -21,7 +21,7 @@ Name: uhd URL: http://code.ettus.com/redmine/ettus/projects/uhd/wiki Version: %{ver_major}.%{ver_minor}.%{ver_patch} -Release: 3%{?dist} +Release: 4%{?dist} License: GPLv3+ BuildRequires: cmake BuildRequires: boost-devel libusb1-devel python-cheetah @@ -160,6 +160,9 @@ getent group usrp >/dev/null || groupadd -r usrp >/dev/null %doc %{_docdir}/%{name}/* %changelog +* Fri Aug 10 2012 Jaroslav Škarvada - 3.4.2-4 +- Rebuilt for new boost + * Sun Jul 22 2012 Fedora Release Engineering - 3.4.2-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild From b92e556bca970d7535071645e2f38b8d20932e7f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jaroslav=20=C5=A0karvada?= Date: Wed, 22 Aug 2012 10:55:44 +0200 Subject: [PATCH 013/152] New version --- sources | 4 ++-- uhd.spec | 7 +++++-- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/sources b/sources index 7db397f..1a5efa1 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -f80d4e5434ad5f43128501de00906612 uhd-3.4.2.tar.gz -3a029f244df6dd9812e196ec905a1fc8 uhd-images_003.004.002-release.tar.gz +42677f3fadfd11191cda398f0f736132 uhd-3.4.3.tar.gz +f9ba13a169d399bccd3143786657d42f uhd-images_003.004.003-release.tar.gz diff --git a/uhd.spec b/uhd.spec index ea32352..863366f 100644 --- a/uhd.spec +++ b/uhd.spec @@ -5,7 +5,7 @@ %global ver_major 3 %global ver_minor 4 -%global ver_patch 2 +%global ver_patch 3 %global ver %(printf "%03d.%03d.%03d" %{ver_major} %{ver_minor} %{ver_patch}) %global ver_ %(printf "%03d_%03d_%03d" %{ver_major} %{ver_minor} %{ver_patch}) @@ -21,7 +21,7 @@ Name: uhd URL: http://code.ettus.com/redmine/ettus/projects/uhd/wiki Version: %{ver_major}.%{ver_minor}.%{ver_patch} -Release: 4%{?dist} +Release: 1%{?dist} License: GPLv3+ BuildRequires: cmake BuildRequires: boost-devel libusb1-devel python-cheetah @@ -160,6 +160,9 @@ getent group usrp >/dev/null || groupadd -r usrp >/dev/null %doc %{_docdir}/%{name}/* %changelog +* Wed Aug 22 2012 Jaroslav Škarvada - 3.4.3-1 +- New version + * Fri Aug 10 2012 Jaroslav Škarvada - 3.4.2-4 - Rebuilt for new boost From 4bc615859d1b1ea617800b69df3cd85eec5c1bcc Mon Sep 17 00:00:00 2001 From: Denis Arnaud Date: Sat, 9 Feb 2013 23:22:11 +0100 Subject: [PATCH 014/152] Rebuild for Boost-1.53.0 --- uhd.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/uhd.spec b/uhd.spec index 863366f..3c2ab4d 100644 --- a/uhd.spec +++ b/uhd.spec @@ -21,7 +21,7 @@ Name: uhd URL: http://code.ettus.com/redmine/ettus/projects/uhd/wiki Version: %{ver_major}.%{ver_minor}.%{ver_patch} -Release: 1%{?dist} +Release: 2%{?dist} License: GPLv3+ BuildRequires: cmake BuildRequires: boost-devel libusb1-devel python-cheetah @@ -160,6 +160,9 @@ getent group usrp >/dev/null || groupadd -r usrp >/dev/null %doc %{_docdir}/%{name}/* %changelog +* Sat Feb 09 2013 Denis Arnaud - 3.4.3-2 +- Rebuild for Boost-1.53.0 + * Wed Aug 22 2012 Jaroslav Škarvada - 3.4.3-1 - New version From eea276f299ba8471d8fed8518185f44c74ed9d8f Mon Sep 17 00:00:00 2001 From: Denis Arnaud Date: Sun, 10 Feb 2013 02:38:00 +0100 Subject: [PATCH 015/152] Rebuild for Boost-1.53.0 --- uhd.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/uhd.spec b/uhd.spec index 3c2ab4d..4ad11f0 100644 --- a/uhd.spec +++ b/uhd.spec @@ -21,7 +21,7 @@ Name: uhd URL: http://code.ettus.com/redmine/ettus/projects/uhd/wiki Version: %{ver_major}.%{ver_minor}.%{ver_patch} -Release: 2%{?dist} +Release: 3%{?dist} License: GPLv3+ BuildRequires: cmake BuildRequires: boost-devel libusb1-devel python-cheetah @@ -160,6 +160,9 @@ getent group usrp >/dev/null || groupadd -r usrp >/dev/null %doc %{_docdir}/%{name}/* %changelog +* Sun Feb 10 2013 Denis Arnaud - 3.4.3-3 +- Rebuild for Boost-1.53.0 + * Sat Feb 09 2013 Denis Arnaud - 3.4.3-2 - Rebuild for Boost-1.53.0 From 674621b3ecc063fc8044ddd8e138709779b43bb5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jaroslav=20=C5=A0karvada?= Date: Wed, 5 Jun 2013 21:01:38 +0200 Subject: [PATCH 016/152] New version - Defuzzified no-neon patch --- sources | 4 +-- ...2-no-neon.patch => uhd-3.5.3-no-neon.patch | 9 +++--- uhd.spec | 29 ++++++++++--------- 3 files changed, 23 insertions(+), 19 deletions(-) rename uhd-3.4.2-no-neon.patch => uhd-3.5.3-no-neon.patch (69%) diff --git a/sources b/sources index 1a5efa1..2c5ae29 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -42677f3fadfd11191cda398f0f736132 uhd-3.4.3.tar.gz -f9ba13a169d399bccd3143786657d42f uhd-images_003.004.003-release.tar.gz +65cf76fd363d576ceff9c1527ade297b uhd-images_003.005.003-release.tar.gz +99984db89c8fcf1db3aa1e5284fac1e7 uhd-release_003_005_003.tar.gz diff --git a/uhd-3.4.2-no-neon.patch b/uhd-3.5.3-no-neon.patch similarity index 69% rename from uhd-3.4.2-no-neon.patch rename to uhd-3.5.3-no-neon.patch index 0bde709..7fa78fb 100644 --- a/uhd-3.4.2-no-neon.patch +++ b/uhd-3.5.3-no-neon.patch @@ -1,7 +1,8 @@ -diff -up uhd-3.4.2/host/lib/convert/CMakeLists.txt.orig uhd-3.4.2/host/lib/convert/CMakeLists.txt ---- uhd-3.4.2/host/lib/convert/CMakeLists.txt.orig 2012-05-23 00:16:15.000000000 +0200 -+++ uhd-3.4.2/host/lib/convert/CMakeLists.txt 2012-05-24 12:27:08.225172012 +0200 -@@ -93,15 +93,15 @@ IF(CMAKE_COMPILER_IS_GNUCXX) +diff --git a/host/lib/convert/CMakeLists.txt b/host/lib/convert/CMakeLists.txt +index 0d9d098..d50b5a1 100644 +--- a/host/lib/convert/CMakeLists.txt ++++ b/host/lib/convert/CMakeLists.txt +@@ -97,15 +97,15 @@ IF(CMAKE_COMPILER_IS_GNUCXX) UNSET(CMAKE_REQUIRED_FLAGS) ENDIF(CMAKE_COMPILER_IS_GNUCXX) diff --git a/uhd.spec b/uhd.spec index 4ad11f0..33ea541 100644 --- a/uhd.spec +++ b/uhd.spec @@ -4,24 +4,16 @@ %bcond_without binary_firmware %global ver_major 3 -%global ver_minor 4 +%global ver_minor 5 %global ver_patch 3 %global ver %(printf "%03d.%03d.%03d" %{ver_major} %{ver_minor} %{ver_patch}) %global ver_ %(printf "%03d_%03d_%03d" %{ver_major} %{ver_minor} %{ver_patch}) -# Pull from git -%global git_tag release_%{ver_} - -# git clone git://code.ettus.com/ettus/uhd.git -# cd uhd -# git archive --format=tar --prefix=%%{name}-%%{version}/ %%{git_tag} | \ -# gzip > ../%%{name}-%%{version}.tar.gz - Name: uhd URL: http://code.ettus.com/redmine/ettus/projects/uhd/wiki Version: %{ver_major}.%{ver_minor}.%{ver_patch} -Release: 3%{?dist} +Release: 1%{?dist} License: GPLv3+ BuildRequires: cmake BuildRequires: boost-devel libusb1-devel python-cheetah @@ -33,11 +25,11 @@ Requires(pre): shadow-utils Requires: tkinter Group: Applications/Engineering Summary: Universal Hardware Driver for Ettus Research products -Source0: %{name}-%{version}.tar.gz +Source0: http://github.com/EttusResearch/uhd/archive/release_%{ver_}.tar.gz#/uhd-release_%{ver_}.tar.gz Source1: %{name}-limits.conf Source2: http://files.ettus.com/binaries/uhd_stable/latest_release/uhd-images_%{ver}-release.tar.gz # ARM convert_test fix (rhbz#813393) -Patch0: uhd-3.4.2-no-neon.patch +Patch0: uhd-3.5.3-no-neon.patch # Fix firmware build with sdcc-3 Patch1: uhd-3.4.2-sdcc-3-fix.patch @@ -47,7 +39,7 @@ The goal of the UHD is to provide a host driver and API for current and future Ettus Research products. It can be used standalone without GNU Radio. %prep -%setup -q +%setup -q -n uhd-release_%{ver_} %patch0 -p1 -b .no-neon %patch1 -p1 -b .sdcc-3-fix @@ -107,6 +99,12 @@ install -m 644 -D %{SOURCE1} %{buildroot}%{_sysconfdir}/security/limits.d/99-usr mkdir -p %{buildroot}%{_datadir}/uhd/images cp -r images/images/* %{buildroot}%{_datadir}/uhd/images +# convert hardlinks to symlinks (to not package the file twice) +pushd %{buildroot}%{_bindir} +unlink ./usrp_n2xx_simple_net_burner +ln -s ../..%{_libexecdir}/uhd/usrp_n2xx_simple_net_burner +popd + %post -p /sbin/ldconfig %postun -p /sbin/ldconfig @@ -146,6 +144,7 @@ getent group usrp >/dev/null || groupadd -r usrp >/dev/null %config(noreplace) %{_sysconfdir}/security/limits.d/*.conf %{_libdir}/lib*.so.* %{_libexecdir}/uhd +%{_mandir}/man1/*.1* %files firmware %dir %{_datadir}/uhd/images @@ -160,6 +159,10 @@ getent group usrp >/dev/null || groupadd -r usrp >/dev/null %doc %{_docdir}/%{name}/* %changelog +* Wed Jun 05 2013 Jaroslav Škarvada - 3.5.3-1 +- New version +- Defuzzified no-neon patch + * Sun Feb 10 2013 Denis Arnaud - 3.4.3-3 - Rebuild for Boost-1.53.0 From 5dd38097e1b90fbc9b91864cc406e0d9356332e8 Mon Sep 17 00:00:00 2001 From: Petr Machata Date: Sat, 27 Jul 2013 14:07:48 +0200 Subject: [PATCH 017/152] Rebuild for boost 1.54.0 --- uhd.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/uhd.spec b/uhd.spec index 33ea541..1ac506d 100644 --- a/uhd.spec +++ b/uhd.spec @@ -13,7 +13,7 @@ Name: uhd URL: http://code.ettus.com/redmine/ettus/projects/uhd/wiki Version: %{ver_major}.%{ver_minor}.%{ver_patch} -Release: 1%{?dist} +Release: 2%{?dist} License: GPLv3+ BuildRequires: cmake BuildRequires: boost-devel libusb1-devel python-cheetah @@ -159,6 +159,9 @@ getent group usrp >/dev/null || groupadd -r usrp >/dev/null %doc %{_docdir}/%{name}/* %changelog +* Sat Jul 27 2013 pmachata@redhat.com - 3.5.3-2 +- Rebuild for boost 1.54.0 + * Wed Jun 05 2013 Jaroslav Škarvada - 3.5.3-1 - New version - Defuzzified no-neon patch From 11bdde1cf871fabf72eb6731049d6e7f6c03328c Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Sun, 4 Aug 2013 00:26:59 -0500 Subject: [PATCH 018/152] - Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild --- uhd.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/uhd.spec b/uhd.spec index 1ac506d..fb18ca9 100644 --- a/uhd.spec +++ b/uhd.spec @@ -13,7 +13,7 @@ Name: uhd URL: http://code.ettus.com/redmine/ettus/projects/uhd/wiki Version: %{ver_major}.%{ver_minor}.%{ver_patch} -Release: 2%{?dist} +Release: 3%{?dist} License: GPLv3+ BuildRequires: cmake BuildRequires: boost-devel libusb1-devel python-cheetah @@ -159,6 +159,9 @@ getent group usrp >/dev/null || groupadd -r usrp >/dev/null %doc %{_docdir}/%{name}/* %changelog +* Sun Aug 04 2013 Fedora Release Engineering - 3.5.3-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild + * Sat Jul 27 2013 pmachata@redhat.com - 3.5.3-2 - Rebuild for boost 1.54.0 From 495fa3c88337c6b3dd06b2159bcde3a7fa75629a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jaroslav=20=C5=A0karvada?= Date: Tue, 11 Feb 2014 14:24:28 +0100 Subject: [PATCH 019/152] New version Resolves: rhbz#1063587 --- sources | 4 +-- uhd.spec | 82 ++++++++++++++++++++++++++++++++------------------------ 2 files changed, 49 insertions(+), 37 deletions(-) diff --git a/sources b/sources index 2c5ae29..6233b1f 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -65cf76fd363d576ceff9c1527ade297b uhd-images_003.005.003-release.tar.gz -99984db89c8fcf1db3aa1e5284fac1e7 uhd-release_003_005_003.tar.gz +81be16f9195c553f55fc1f5fc0daaddb uhd-images_003.006.002-release.tar.gz +50a25b95dc08dd3946988c5da98814a9 uhd-release_003_006_002.tar.gz diff --git a/uhd.spec b/uhd.spec index fb18ca9..0804031 100644 --- a/uhd.spec +++ b/uhd.spec @@ -4,8 +4,8 @@ %bcond_without binary_firmware %global ver_major 3 -%global ver_minor 5 -%global ver_patch 3 +%global ver_minor 6 +%global ver_patch 2 %global ver %(printf "%03d.%03d.%03d" %{ver_major} %{ver_minor} %{ver_patch}) %global ver_ %(printf "%03d_%03d_%03d" %{ver_major} %{ver_minor} %{ver_patch}) @@ -13,7 +13,7 @@ Name: uhd URL: http://code.ettus.com/redmine/ettus/projects/uhd/wiki Version: %{ver_major}.%{ver_minor}.%{ver_patch} -Release: 3%{?dist} +Release: 1%{?dist} License: GPLv3+ BuildRequires: cmake BuildRequires: boost-devel libusb1-devel python-cheetah @@ -38,6 +38,31 @@ The UHD is the universal hardware driver for Ettus Research products. The goal of the UHD is to provide a host driver and API for current and future Ettus Research products. It can be used standalone without GNU Radio. +%package firmware +Summary: Firmware files for UHD +Group: Applications/Engineering +Requires: %{name} = %{version}-%{release} +BuildArch: noarch + +%description firmware +Firmware files for the Universal Hardware driver (UHD). + +%package devel +Summary: Development files for UHD +Group: Applications/Engineering +Requires: %{name} = %{version}-%{release} + +%description devel +Development files for the Universal Hardware Driver (UHD). + +%package doc +Summary: Documentation files for UHD +Group: Applications/Engineering +BuildArch: noarch + +%description doc +Documentation for the Universal Hardware Driver (UHD). + %prep %setup -q -n uhd-release_%{ver_} %patch0 -p1 -b .no-neon @@ -77,21 +102,21 @@ pushd host/build make install DESTDIR=%{buildroot} # Fix udev rules and allow access only to users in usrp group -sed -i 's/BUS==/SUBSYSTEM==/;s/SYSFS{/ATTRS{/;s/MODE:="0666"/GROUP:="usrp", MODE:="0660"/' %{buildroot}%{_datadir}/uhd/utils/uhd-usrp.rules +sed -i 's/BUS==/SUBSYSTEM==/;s/SYSFS{/ATTRS{/;s/MODE:="0666"/GROUP:="usrp", MODE:="0660"/' %{buildroot}%{_libdir}/uhd/utils/uhd-usrp.rules mkdir -p %{buildroot}%{_sysconfdir}/udev/rules.d -mv %{buildroot}%{_datadir}/uhd/utils/uhd-usrp.rules %{buildroot}%{_sysconfdir}/udev/rules.d/10-usrp-uhd.rules +mv %{buildroot}%{_libdir}/uhd/utils/uhd-usrp.rules %{buildroot}%{_sysconfdir}/udev/rules.d/10-usrp-uhd.rules -# Remove binaries for tests, examples -rm -rf %{buildroot}%{_datadir}/uhd/{tests,examples} +# Remove tests, examples binaries +rm -rf %{buildroot}%{_libdir}/uhd/{tests,examples} # Move the utils stuff to libexec dir mkdir -p %{buildroot}%{_libexecdir}/uhd -mv %{buildroot}%{_datadir}/uhd/utils/* %{buildroot}%{_libexecdir}/uhd +mv %{buildroot}%{_libdir}/uhd/utils/* %{buildroot}%{_libexecdir}/uhd popd # Package base docs to base package mkdir _tmpdoc -mv %{buildroot}%{_docdir}/%{name}/{AUTHORS.txt,LICENSE.txt,README.txt} _tmpdoc +mv %{buildroot}%{_docdir}/%{name}/{LICENSE,README.md} _tmpdoc install -m 644 -D %{SOURCE1} %{buildroot}%{_sysconfdir}/security/limits.d/99-usrp.conf @@ -99,6 +124,9 @@ install -m 644 -D %{SOURCE1} %{buildroot}%{_sysconfdir}/security/limits.d/99-usr mkdir -p %{buildroot}%{_datadir}/uhd/images cp -r images/images/* %{buildroot}%{_datadir}/uhd/images +# remove win stuff +rm -rf %{buildroot}%{_datadir}/uhd/images/winusb_driver + # convert hardlinks to symlinks (to not package the file twice) pushd %{buildroot}%{_bindir} unlink ./usrp_n2xx_simple_net_burner @@ -109,35 +137,13 @@ popd %postun -p /sbin/ldconfig -%package firmware -Summary: Firmware files for UHD -Group: Applications/Engineering -Requires: %{name} = %{version}-%{release} -BuildArch: noarch - -%description firmware -Firmware files for the Universal Hardware driver (UHD). - -%package devel -Summary: Development files for UHD -Group: Applications/Engineering -Requires: %{name} = %{version}-%{release} - -%description devel -Development files for the Universal Hardware Driver (UHD). - -%package doc -Summary: Documentation files for UHD -Group: Applications/Engineering -BuildArch: noarch - -%description doc -Documentation for the Universal Hardware Driver (UHD). - %pre getent group usrp >/dev/null || groupadd -r usrp >/dev/null %files +%exclude %{_docdir}/%{name}/manual +%exclude %{_docdir}/%{name}/doxygen +%exclude %{_datadir}/uhd/images %doc _tmpdoc/* %{_bindir}/* %config(noreplace) %{_sysconfdir}/udev/rules.d/10-usrp-uhd.rules @@ -145,6 +151,7 @@ getent group usrp >/dev/null || groupadd -r usrp >/dev/null %{_libdir}/lib*.so.* %{_libexecdir}/uhd %{_mandir}/man1/*.1* +%{_datadir}/uhd %files firmware %dir %{_datadir}/uhd/images @@ -156,9 +163,14 @@ getent group usrp >/dev/null || groupadd -r usrp >/dev/null %{_libdir}/pkgconfig/*.pc %files doc -%doc %{_docdir}/%{name}/* +%doc %{_docdir}/%{name}/manual +%doc %{_docdir}/%{name}/doxygen %changelog +* Tue Feb 11 2014 Jaroslav Škarvada - 3.6.2-1 +- New version + Resolves: rhbz#1063587 + * Sun Aug 04 2013 Fedora Release Engineering - 3.5.3-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild From e20ffc4ee668429d596552fb6e1d78e51a4515c8 Mon Sep 17 00:00:00 2001 From: Petr Machata Date: Thu, 22 May 2014 21:52:39 +0200 Subject: [PATCH 020/152] Rebuild for boost 1.55.0 --- uhd.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/uhd.spec b/uhd.spec index 0804031..d4c35a5 100644 --- a/uhd.spec +++ b/uhd.spec @@ -13,7 +13,7 @@ Name: uhd URL: http://code.ettus.com/redmine/ettus/projects/uhd/wiki Version: %{ver_major}.%{ver_minor}.%{ver_patch} -Release: 1%{?dist} +Release: 2%{?dist} License: GPLv3+ BuildRequires: cmake BuildRequires: boost-devel libusb1-devel python-cheetah @@ -167,6 +167,9 @@ getent group usrp >/dev/null || groupadd -r usrp >/dev/null %doc %{_docdir}/%{name}/doxygen %changelog +* Thu May 22 2014 Petr Machata - 3.6.2-2 +- Rebuild for boost 1.55.0 + * Tue Feb 11 2014 Jaroslav Škarvada - 3.6.2-1 - New version Resolves: rhbz#1063587 From 501267a2b067504aecc52acade483bde61a4a232 Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Sat, 7 Jun 2014 21:37:03 -0500 Subject: [PATCH 021/152] - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild --- uhd.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/uhd.spec b/uhd.spec index d4c35a5..c8555db 100644 --- a/uhd.spec +++ b/uhd.spec @@ -13,7 +13,7 @@ Name: uhd URL: http://code.ettus.com/redmine/ettus/projects/uhd/wiki Version: %{ver_major}.%{ver_minor}.%{ver_patch} -Release: 2%{?dist} +Release: 3%{?dist} License: GPLv3+ BuildRequires: cmake BuildRequires: boost-devel libusb1-devel python-cheetah @@ -167,6 +167,9 @@ getent group usrp >/dev/null || groupadd -r usrp >/dev/null %doc %{_docdir}/%{name}/doxygen %changelog +* Sun Jun 08 2014 Fedora Release Engineering - 3.6.2-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild + * Thu May 22 2014 Petr Machata - 3.6.2-2 - Rebuild for boost 1.55.0 From e4c625847e1cc5a32afddfc0e02f16e37417829b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jaroslav=20=C5=A0karvada?= Date: Fri, 8 Aug 2014 15:13:56 +0200 Subject: [PATCH 022/152] Added workaround for build failure on RHEL-7 --- uhd.spec | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/uhd.spec b/uhd.spec index c8555db..4980589 100644 --- a/uhd.spec +++ b/uhd.spec @@ -13,7 +13,7 @@ Name: uhd URL: http://code.ettus.com/redmine/ettus/projects/uhd/wiki Version: %{ver_major}.%{ver_minor}.%{ver_patch} -Release: 3%{?dist} +Release: 4%{?dist} License: GPLv3+ BuildRequires: cmake BuildRequires: boost-devel libusb1-devel python-cheetah @@ -25,6 +25,10 @@ Requires(pre): shadow-utils Requires: tkinter Group: Applications/Engineering Summary: Universal Hardware Driver for Ettus Research products +# Workaround for rhbz#1128127 +%if 0%{?rhel:1} +ExcludeArch: ppc64 +%endif Source0: http://github.com/EttusResearch/uhd/archive/release_%{ver_}.tar.gz#/uhd-release_%{ver_}.tar.gz Source1: %{name}-limits.conf Source2: http://files.ettus.com/binaries/uhd_stable/latest_release/uhd-images_%{ver}-release.tar.gz @@ -167,6 +171,9 @@ getent group usrp >/dev/null || groupadd -r usrp >/dev/null %doc %{_docdir}/%{name}/doxygen %changelog +* Fri Aug 8 2014 Jaroslav Škarvada - 3.6.2-4 +- Added workaround for build failure on RHEL-7 + * Sun Jun 08 2014 Fedora Release Engineering - 3.6.2-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild From d8aacc9c39408a1eed764d406ae8e93f6e3d923d Mon Sep 17 00:00:00 2001 From: Peter Robinson Date: Mon, 18 Aug 2014 06:48:40 +0000 Subject: [PATCH 023/152] - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild --- uhd.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/uhd.spec b/uhd.spec index 4980589..d9c452f 100644 --- a/uhd.spec +++ b/uhd.spec @@ -13,7 +13,7 @@ Name: uhd URL: http://code.ettus.com/redmine/ettus/projects/uhd/wiki Version: %{ver_major}.%{ver_minor}.%{ver_patch} -Release: 4%{?dist} +Release: 5%{?dist} License: GPLv3+ BuildRequires: cmake BuildRequires: boost-devel libusb1-devel python-cheetah @@ -171,6 +171,9 @@ getent group usrp >/dev/null || groupadd -r usrp >/dev/null %doc %{_docdir}/%{name}/doxygen %changelog +* Mon Aug 18 2014 Fedora Release Engineering - 3.6.2-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild + * Fri Aug 8 2014 Jaroslav Škarvada - 3.6.2-4 - Added workaround for build failure on RHEL-7 From b6f7066e3e23083d00ae3459b29f049043f14b99 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jaroslav=20=C5=A0karvada?= Date: Fri, 29 Aug 2014 15:24:07 +0200 Subject: [PATCH 024/152] Migrated udev rule to dynamic ACL management - Fixed udev rule location - Group usrp is no more used / created --- uhd.spec | 20 +++++++++++--------- 1 file changed, 11 insertions(+), 9 deletions(-) diff --git a/uhd.spec b/uhd.spec index d9c452f..b939167 100644 --- a/uhd.spec +++ b/uhd.spec @@ -13,7 +13,7 @@ Name: uhd URL: http://code.ettus.com/redmine/ettus/projects/uhd/wiki Version: %{ver_major}.%{ver_minor}.%{ver_patch} -Release: 5%{?dist} +Release: 6%{?dist} License: GPLv3+ BuildRequires: cmake BuildRequires: boost-devel libusb1-devel python-cheetah @@ -105,10 +105,10 @@ make test pushd host/build make install DESTDIR=%{buildroot} -# Fix udev rules and allow access only to users in usrp group -sed -i 's/BUS==/SUBSYSTEM==/;s/SYSFS{/ATTRS{/;s/MODE:="0666"/GROUP:="usrp", MODE:="0660"/' %{buildroot}%{_libdir}/uhd/utils/uhd-usrp.rules -mkdir -p %{buildroot}%{_sysconfdir}/udev/rules.d -mv %{buildroot}%{_libdir}/uhd/utils/uhd-usrp.rules %{buildroot}%{_sysconfdir}/udev/rules.d/10-usrp-uhd.rules +# Fix udev rules and use dynamic ACL management for device +sed -i 's/BUS==/SUBSYSTEM==/;s/SYSFS{/ATTRS{/;s/MODE:="0666"/MODE:="0660", ENV{ID_SOFTWARE_RADIO}="1"/' %{buildroot}%{_libdir}/uhd/utils/uhd-usrp.rules +mkdir -p %{buildroot}%{_prefix}/lib/udev/rules.d +mv %{buildroot}%{_libdir}/uhd/utils/uhd-usrp.rules %{buildroot}%{_prefix}/lib/udev/rules.d/10-usrp-uhd.rules # Remove tests, examples binaries rm -rf %{buildroot}%{_libdir}/uhd/{tests,examples} @@ -141,16 +141,13 @@ popd %postun -p /sbin/ldconfig -%pre -getent group usrp >/dev/null || groupadd -r usrp >/dev/null - %files %exclude %{_docdir}/%{name}/manual %exclude %{_docdir}/%{name}/doxygen %exclude %{_datadir}/uhd/images %doc _tmpdoc/* %{_bindir}/* -%config(noreplace) %{_sysconfdir}/udev/rules.d/10-usrp-uhd.rules +%{_prefix}/lib/udev/rules.d/10-usrp-uhd.rules %config(noreplace) %{_sysconfdir}/security/limits.d/*.conf %{_libdir}/lib*.so.* %{_libexecdir}/uhd @@ -171,6 +168,11 @@ getent group usrp >/dev/null || groupadd -r usrp >/dev/null %doc %{_docdir}/%{name}/doxygen %changelog +* Fri Aug 29 2014 Jaroslav Škarvada - 3.6.2-6 +- Migrated udev rule to dynamic ACL management +- Fixed udev rule location +- Group usrp is no more used / created + * Mon Aug 18 2014 Fedora Release Engineering - 3.6.2-5 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild From 02fea4c7c77275a885f3a7de2ad28d99e08e12b4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jaroslav=20=C5=A0karvada?= Date: Mon, 1 Sep 2014 17:00:29 +0200 Subject: [PATCH 025/152] New version - Added tools subpackage (wireshark plugin disabled due to rhbz#1129419) - Minor packaging fixes --- sources | 4 +- uhd-3.5.3-no-neon.patch | 29 ---------- uhd-3.7.2-uhd-dump-libs.patch | 22 ++++++++ uhd-3.7.2-wireshark-1.12-fix.patch | 12 +++++ uhd.spec | 86 +++++++++++++++++++++++++----- 5 files changed, 108 insertions(+), 45 deletions(-) delete mode 100644 uhd-3.5.3-no-neon.patch create mode 100644 uhd-3.7.2-uhd-dump-libs.patch create mode 100644 uhd-3.7.2-wireshark-1.12-fix.patch diff --git a/sources b/sources index 6233b1f..6eeb00d 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -81be16f9195c553f55fc1f5fc0daaddb uhd-images_003.006.002-release.tar.gz -50a25b95dc08dd3946988c5da98814a9 uhd-release_003_006_002.tar.gz +515387ad594a1ca1e4447e97d4f78aa7 uhd-release_003_007_002.tar.gz +a13f07bf7b908a49ca45bfd036d9f0a9 uhd-images_003.007.002-release.tar.gz diff --git a/uhd-3.5.3-no-neon.patch b/uhd-3.5.3-no-neon.patch deleted file mode 100644 index 7fa78fb..0000000 --- a/uhd-3.5.3-no-neon.patch +++ /dev/null @@ -1,29 +0,0 @@ -diff --git a/host/lib/convert/CMakeLists.txt b/host/lib/convert/CMakeLists.txt -index 0d9d098..d50b5a1 100644 ---- a/host/lib/convert/CMakeLists.txt -+++ b/host/lib/convert/CMakeLists.txt -@@ -97,15 +97,15 @@ IF(CMAKE_COMPILER_IS_GNUCXX) - UNSET(CMAKE_REQUIRED_FLAGS) - ENDIF(CMAKE_COMPILER_IS_GNUCXX) - --IF(HAVE_ARM_NEON_H) -- SET_SOURCE_FILES_PROPERTIES( -- ${CMAKE_CURRENT_SOURCE_DIR}/convert_with_neon.cpp -- PROPERTIES COMPILE_FLAGS "${NEON_FLAGS}" -- ) -- LIBUHD_APPEND_SOURCES( -- ${CMAKE_CURRENT_SOURCE_DIR}/convert_with_neon.cpp -- ) --ENDIF() -+#IF(HAVE_ARM_NEON_H) -+# SET_SOURCE_FILES_PROPERTIES( -+# ${CMAKE_CURRENT_SOURCE_DIR}/convert_with_neon.cpp -+# PROPERTIES COMPILE_FLAGS "${NEON_FLAGS}" -+# ) -+# LIBUHD_APPEND_SOURCES( -+# ${CMAKE_CURRENT_SOURCE_DIR}/convert_with_neon.cpp -+# ) -+#ENDIF() - - ######################################################################## - # Convert types generation diff --git a/uhd-3.7.2-uhd-dump-libs.patch b/uhd-3.7.2-uhd-dump-libs.patch new file mode 100644 index 0000000..2deb634 --- /dev/null +++ b/uhd-3.7.2-uhd-dump-libs.patch @@ -0,0 +1,22 @@ +diff --git a/tools/uhd_dump/Makefile b/tools/uhd_dump/Makefile +index b793776..0494767 100644 +--- a/tools/uhd_dump/Makefile ++++ b/tools/uhd_dump/Makefile +@@ -20,7 +20,7 @@ OBJECTS = uhd_dump.o + + CFLAGS = -g -O0 -Wall + +-LDFLAGS = -lpcap -lm ++LIBS = -lpcap -lm + + CC = cc + +@@ -28,7 +28,7 @@ CC = cc + all: $(BINARIES) + + chdr_log: uhd_dump.o chdr_log.o $(INCLUDES) +- $(CC) $(CFLAGS) -o $@ uhd_dump.o chdr_log.o $(LDFLAGS) ++ $(CC) $(CFLAGS) -o $@ uhd_dump.o chdr_log.o $(LIBS) $(LDFLAGS) + + + diff --git a/uhd-3.7.2-wireshark-1.12-fix.patch b/uhd-3.7.2-wireshark-1.12-fix.patch new file mode 100644 index 0000000..e41728e --- /dev/null +++ b/uhd-3.7.2-wireshark-1.12-fix.patch @@ -0,0 +1,12 @@ +diff -up uhd-release_003_007_002/tools/chdr-dissector/cmake/Modules/FindWireshark.cmake.orig uhd-release_003_007_002/tools/chdr-dissector/cmake/Modules/FindWireshark.cmake +--- uhd-release_003_007_002/tools/chdr-dissector/cmake/Modules/FindWireshark.cmake.orig 2014-09-01 16:12:51.884300407 +0200 ++++ uhd-release_003_007_002/tools/chdr-dissector/cmake/Modules/FindWireshark.cmake 2014-09-01 16:10:28.495563673 +0200 +@@ -16,7 +16,7 @@ + # wireshark does not install its library with pkg-config information, + # so we need to manually find the libraries and headers + +-FIND_PATH( WIRESHARK_INCLUDE_DIRS epan/column_info.h PATH_SUFFIXES wireshark ) ++FIND_PATH( WIRESHARK_INCLUDE_DIRS epan/column.h PATH_SUFFIXES wireshark ) + FIND_LIBRARY( WIRESHARK_LIBRARIES wireshark ) + + # Report results diff --git a/uhd.spec b/uhd.spec index b939167..d662958 100644 --- a/uhd.spec +++ b/uhd.spec @@ -3,13 +3,25 @@ # images you need to install appropriate tools (e.g. Xilinx ISE). %bcond_without binary_firmware +# NEON support is by default disabled on ARMs +# building with --with=neon will enable auto detection +%bcond_with neon + %global ver_major 3 -%global ver_minor 6 +%global ver_minor 7 %global ver_patch 2 %global ver %(printf "%03d.%03d.%03d" %{ver_major} %{ver_minor} %{ver_patch}) %global ver_ %(printf "%03d_%03d_%03d" %{ver_major} %{ver_minor} %{ver_patch}) +%global wireshark_ver %((%{__awk} '/^#define VERSION[ \t]+/ { print $NF }' /usr/include/wireshark/config.h 2>/dev/null||echo none)|/usr/bin/tr -d '"') + +%ifarch %{arm} +%if %{without neon} +%global have_neon -DHAVE_ARM_NEON_H=0 +%endif +%endif + Name: uhd URL: http://code.ettus.com/redmine/ettus/projects/uhd/wiki Version: %{ver_major}.%{ver_minor}.%{ver_patch} @@ -17,7 +29,7 @@ Release: 6%{?dist} License: GPLv3+ BuildRequires: cmake BuildRequires: boost-devel libusb1-devel python-cheetah -BuildRequires: docutils doxygen pkgconfig +BuildRequires: docutils doxygen pkgconfig libpcap-devel wireshark-devel %if ! %{with binary_firmware} BuildRequires: sdcc sed %endif @@ -32,10 +44,12 @@ ExcludeArch: ppc64 Source0: http://github.com/EttusResearch/uhd/archive/release_%{ver_}.tar.gz#/uhd-release_%{ver_}.tar.gz Source1: %{name}-limits.conf Source2: http://files.ettus.com/binaries/uhd_stable/latest_release/uhd-images_%{ver}-release.tar.gz -# ARM convert_test fix (rhbz#813393) -Patch0: uhd-3.5.3-no-neon.patch # Fix firmware build with sdcc-3 -Patch1: uhd-3.4.2-sdcc-3-fix.patch +Patch0: uhd-3.4.2-sdcc-3-fix.patch +# Fix not to override distribution LDFLAGS +Patch1: uhd-3.7.2-uhd-dump-libs.patch +# Fix building with wireshark 1.12 +Patch2: uhd-3.7.2-wireshark-1.12-fix.patch %description The UHD is the universal hardware driver for Ettus Research products. @@ -44,7 +58,6 @@ future Ettus Research products. It can be used standalone without GNU Radio. %package firmware Summary: Firmware files for UHD -Group: Applications/Engineering Requires: %{name} = %{version}-%{release} BuildArch: noarch @@ -53,7 +66,6 @@ Firmware files for the Universal Hardware driver (UHD). %package devel Summary: Development files for UHD -Group: Applications/Engineering Requires: %{name} = %{version}-%{release} %description devel @@ -61,16 +73,25 @@ Development files for the Universal Hardware Driver (UHD). %package doc Summary: Documentation files for UHD -Group: Applications/Engineering BuildArch: noarch %description doc Documentation for the Universal Hardware Driver (UHD). +%package tools +Summary: Tools for working with / debugging USRP device +Requires: %{name} = %{version}-%{release} +#Requires: wireshark = %{wireshark_ver} + +%description tools +Tools that are useful for working with and/or debugging USRP device, including +Wireshark plugin to view Compressed HeaDeR (CHDR) formatted-packets. + %prep %setup -q -n uhd-release_%{ver_} -%patch0 -p1 -b .no-neon -%patch1 -p1 -b .sdcc-3-fix +%patch0 -p1 -b .sdcc-3-fix +%patch1 -p1 -b .uhd-dump-libs +%patch2 -p1 -b .wireshark-1.12-fix # firmware %if %{with binary_firmware} @@ -93,10 +114,24 @@ popd mkdir -p host/build pushd host/build -%cmake ../ +%cmake %{?have_neon} ../ make %{?_smp_mflags} popd +# tools +pushd tools/uhd_dump +make %{?_smp_mflags} CFLAGS="%{optflags}" LDFLAGS="%{?__global_ldflags}" +popd + +# tools wireshark plugin +# currenty disabled due to rhbz#1129419 +#pushd tools/chdr-dissector +#mkdir build +#cd build +#%cmake ../ +#make %{?_smp_mflags} +#popd + %check cd host/build make test @@ -133,10 +168,18 @@ rm -rf %{buildroot}%{_datadir}/uhd/images/winusb_driver # convert hardlinks to symlinks (to not package the file twice) pushd %{buildroot}%{_bindir} -unlink ./usrp_n2xx_simple_net_burner -ln -s ../..%{_libexecdir}/uhd/usrp_n2xx_simple_net_burner +for f in usrp_n2xx_simple_net_burner usrp_x3xx_fpga_burner; +do + unlink $f + ln -s ../..%{_libexecdir}/uhd/$f +done popd +# tools +install -Dpm 0755 tools/usrp_x3xx_fpga_jtag_programmer.sh %{buildroot}%{_bindir}/usrp_x3xx_fpga_jtag_programmer.sh +install -Dpm 0755 tools/uhd_dump/chdr_log %{buildroot}%{_bindir}/chdr_log +#install -Dpm 0755 tools/chdr-dissector/build/chdr-plugin.so %{buildroot}%{_libdir}/wireshark/plugins/%{wireshark_ver}/chdr-plugin.so + %post -p /sbin/ldconfig %postun -p /sbin/ldconfig @@ -146,7 +189,11 @@ popd %exclude %{_docdir}/%{name}/doxygen %exclude %{_datadir}/uhd/images %doc _tmpdoc/* -%{_bindir}/* +%{_bindir}/uhd_* +%{_bindir}/usrp2* +%{_bindir}/usrp_n2xx_simple_net_burner +%{_bindir}/usrp_x3xx_fpga_burner +%{_bindir}/nirio_programmer %{_prefix}/lib/udev/rules.d/10-usrp-uhd.rules %config(noreplace) %{_sysconfdir}/security/limits.d/*.conf %{_libdir}/lib*.so.* @@ -167,7 +214,18 @@ popd %doc %{_docdir}/%{name}/manual %doc %{_docdir}/%{name}/doxygen +%files tools +%doc tools/README.md +%{_bindir}/usrp_x3xx_fpga_jtag_programmer.sh +%{_bindir}/chdr_log +#%{_libdir}/wireshark/plugins/%{wireshark_ver}/chdr-plugin.so + %changelog +* Mon Sep 1 2014 Jaroslav Škarvada - 3.7.2-1 +- New version +- Added tools subpackage (wireshark plugin disabled due to rhbz#1129419) +- Minor packaging fixes + * Fri Aug 29 2014 Jaroslav Škarvada - 3.6.2-6 - Migrated udev rule to dynamic ACL management - Fixed udev rule location From b8e2bc83dcd77c91aacff2855602244683839ec4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jaroslav=20=C5=A0karvada?= Date: Mon, 1 Sep 2014 17:17:17 +0200 Subject: [PATCH 026/152] Fixed release number --- uhd.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/uhd.spec b/uhd.spec index d662958..2ad4c15 100644 --- a/uhd.spec +++ b/uhd.spec @@ -14,7 +14,7 @@ %global ver %(printf "%03d.%03d.%03d" %{ver_major} %{ver_minor} %{ver_patch}) %global ver_ %(printf "%03d_%03d_%03d" %{ver_major} %{ver_minor} %{ver_patch}) -%global wireshark_ver %((%{__awk} '/^#define VERSION[ \t]+/ { print $NF }' /usr/include/wireshark/config.h 2>/dev/null||echo none)|/usr/bin/tr -d '"') +%global wireshark_ver %(rpm -q --qf '%{VERSION}' 2>/dev/null || echo none) %ifarch %{arm} %if %{without neon} @@ -25,7 +25,7 @@ Name: uhd URL: http://code.ettus.com/redmine/ettus/projects/uhd/wiki Version: %{ver_major}.%{ver_minor}.%{ver_patch} -Release: 6%{?dist} +Release: 1%{?dist} License: GPLv3+ BuildRequires: cmake BuildRequires: boost-devel libusb1-devel python-cheetah From 49de3b5f3f599cc3c4203647da72a9778fa94d71 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jaroslav=20=C5=A0karvada?= Date: Mon, 1 Sep 2014 17:22:25 +0200 Subject: [PATCH 027/152] Reverted Wireshark version detection not to use RPM --- uhd.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/uhd.spec b/uhd.spec index 2ad4c15..bc66363 100644 --- a/uhd.spec +++ b/uhd.spec @@ -14,7 +14,7 @@ %global ver %(printf "%03d.%03d.%03d" %{ver_major} %{ver_minor} %{ver_patch}) %global ver_ %(printf "%03d_%03d_%03d" %{ver_major} %{ver_minor} %{ver_patch}) -%global wireshark_ver %(rpm -q --qf '%{VERSION}' 2>/dev/null || echo none) +%global wireshark_ver %((%{__awk} '/^#define VERSION[ \t]+/ { print $NF }' /usr/include/wireshark/config.h 2>/dev/null||echo none)|/usr/bin/tr -d '"') %ifarch %{arm} %if %{without neon} From 91c508a4424be106cfd95fdaa940604bac46fd44 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jaroslav=20=C5=A0karvada?= Date: Mon, 1 Sep 2014 17:50:24 +0200 Subject: [PATCH 028/152] Correctly disabled cmake macro in Wireshark plugin --- uhd.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/uhd.spec b/uhd.spec index bc66363..9479c98 100644 --- a/uhd.spec +++ b/uhd.spec @@ -128,7 +128,7 @@ popd #pushd tools/chdr-dissector #mkdir build #cd build -#%cmake ../ +#%%cmake ../ #make %{?_smp_mflags} #popd From 0edbe67c8e8f87c234a1f65d3bc7b885d1423f39 Mon Sep 17 00:00:00 2001 From: Petr Machata Date: Tue, 27 Jan 2015 01:00:30 +0100 Subject: [PATCH 029/152] Rebuild for boost 1.57.0 --- uhd.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/uhd.spec b/uhd.spec index 9479c98..3711859 100644 --- a/uhd.spec +++ b/uhd.spec @@ -25,7 +25,7 @@ Name: uhd URL: http://code.ettus.com/redmine/ettus/projects/uhd/wiki Version: %{ver_major}.%{ver_minor}.%{ver_patch} -Release: 1%{?dist} +Release: 2%{?dist} License: GPLv3+ BuildRequires: cmake BuildRequires: boost-devel libusb1-devel python-cheetah @@ -221,6 +221,9 @@ install -Dpm 0755 tools/uhd_dump/chdr_log %{buildroot}%{_bindir}/chdr_log #%{_libdir}/wireshark/plugins/%{wireshark_ver}/chdr-plugin.so %changelog +* Tue Jan 27 2015 Petr Machata - 3.7.2-2 +- Rebuild for boost 1.57.0 + * Mon Sep 1 2014 Jaroslav Škarvada - 3.7.2-1 - New version - Added tools subpackage (wireshark plugin disabled due to rhbz#1129419) From 05b035f4b6d84f3729781d2424d14aa61d1340c2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jaroslav=20=C5=A0karvada?= Date: Fri, 6 Mar 2015 14:44:38 +0100 Subject: [PATCH 030/152] New version - Dropped uhd-dump-libs and wireshark-1.12-fix patches (both upstreamed) --- uhd-3.7.2-uhd-dump-libs.patch | 22 ---------------------- uhd-3.7.2-wireshark-1.12-fix.patch | 12 ------------ uhd.spec | 29 ++++++++++++----------------- 3 files changed, 12 insertions(+), 51 deletions(-) delete mode 100644 uhd-3.7.2-uhd-dump-libs.patch delete mode 100644 uhd-3.7.2-wireshark-1.12-fix.patch diff --git a/uhd-3.7.2-uhd-dump-libs.patch b/uhd-3.7.2-uhd-dump-libs.patch deleted file mode 100644 index 2deb634..0000000 --- a/uhd-3.7.2-uhd-dump-libs.patch +++ /dev/null @@ -1,22 +0,0 @@ -diff --git a/tools/uhd_dump/Makefile b/tools/uhd_dump/Makefile -index b793776..0494767 100644 ---- a/tools/uhd_dump/Makefile -+++ b/tools/uhd_dump/Makefile -@@ -20,7 +20,7 @@ OBJECTS = uhd_dump.o - - CFLAGS = -g -O0 -Wall - --LDFLAGS = -lpcap -lm -+LIBS = -lpcap -lm - - CC = cc - -@@ -28,7 +28,7 @@ CC = cc - all: $(BINARIES) - - chdr_log: uhd_dump.o chdr_log.o $(INCLUDES) -- $(CC) $(CFLAGS) -o $@ uhd_dump.o chdr_log.o $(LDFLAGS) -+ $(CC) $(CFLAGS) -o $@ uhd_dump.o chdr_log.o $(LIBS) $(LDFLAGS) - - - diff --git a/uhd-3.7.2-wireshark-1.12-fix.patch b/uhd-3.7.2-wireshark-1.12-fix.patch deleted file mode 100644 index e41728e..0000000 --- a/uhd-3.7.2-wireshark-1.12-fix.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -up uhd-release_003_007_002/tools/chdr-dissector/cmake/Modules/FindWireshark.cmake.orig uhd-release_003_007_002/tools/chdr-dissector/cmake/Modules/FindWireshark.cmake ---- uhd-release_003_007_002/tools/chdr-dissector/cmake/Modules/FindWireshark.cmake.orig 2014-09-01 16:12:51.884300407 +0200 -+++ uhd-release_003_007_002/tools/chdr-dissector/cmake/Modules/FindWireshark.cmake 2014-09-01 16:10:28.495563673 +0200 -@@ -16,7 +16,7 @@ - # wireshark does not install its library with pkg-config information, - # so we need to manually find the libraries and headers - --FIND_PATH( WIRESHARK_INCLUDE_DIRS epan/column_info.h PATH_SUFFIXES wireshark ) -+FIND_PATH( WIRESHARK_INCLUDE_DIRS epan/column.h PATH_SUFFIXES wireshark ) - FIND_LIBRARY( WIRESHARK_LIBRARIES wireshark ) - - # Report results diff --git a/uhd.spec b/uhd.spec index 3711859..f7cd309 100644 --- a/uhd.spec +++ b/uhd.spec @@ -8,7 +8,7 @@ %bcond_with neon %global ver_major 3 -%global ver_minor 7 +%global ver_minor 8 %global ver_patch 2 %global ver %(printf "%03d.%03d.%03d" %{ver_major} %{ver_minor} %{ver_patch}) @@ -25,11 +25,11 @@ Name: uhd URL: http://code.ettus.com/redmine/ettus/projects/uhd/wiki Version: %{ver_major}.%{ver_minor}.%{ver_patch} -Release: 2%{?dist} +Release: 1%{?dist} License: GPLv3+ BuildRequires: cmake -BuildRequires: boost-devel libusb1-devel python-cheetah -BuildRequires: docutils doxygen pkgconfig libpcap-devel wireshark-devel +BuildRequires: boost-devel, libusb1-devel, python-cheetah, ncurses-devel +BuildRequires: docutils, doxygen, pkgconfig, libpcap-devel, wireshark-devel %if ! %{with binary_firmware} BuildRequires: sdcc sed %endif @@ -43,13 +43,9 @@ ExcludeArch: ppc64 %endif Source0: http://github.com/EttusResearch/uhd/archive/release_%{ver_}.tar.gz#/uhd-release_%{ver_}.tar.gz Source1: %{name}-limits.conf -Source2: http://files.ettus.com/binaries/uhd_stable/latest_release/uhd-images_%{ver}-release.tar.gz +Source2: http://files.ettus.com/binaries/images/uhd-images_%{ver}-release.tar.gz # Fix firmware build with sdcc-3 Patch0: uhd-3.4.2-sdcc-3-fix.patch -# Fix not to override distribution LDFLAGS -Patch1: uhd-3.7.2-uhd-dump-libs.patch -# Fix building with wireshark 1.12 -Patch2: uhd-3.7.2-wireshark-1.12-fix.patch %description The UHD is the universal hardware driver for Ettus Research products. @@ -84,14 +80,11 @@ Requires: %{name} = %{version}-%{release} #Requires: wireshark = %{wireshark_ver} %description tools -Tools that are useful for working with and/or debugging USRP device, including -Wireshark plugin to view Compressed HeaDeR (CHDR) formatted-packets. +Tools that are useful for working with and/or debugging USRP device. %prep %setup -q -n uhd-release_%{ver_} %patch0 -p1 -b .sdcc-3-fix -%patch1 -p1 -b .uhd-dump-libs -%patch2 -p1 -b .wireshark-1.12-fix # firmware %if %{with binary_firmware} @@ -178,14 +171,12 @@ popd # tools install -Dpm 0755 tools/usrp_x3xx_fpga_jtag_programmer.sh %{buildroot}%{_bindir}/usrp_x3xx_fpga_jtag_programmer.sh install -Dpm 0755 tools/uhd_dump/chdr_log %{buildroot}%{_bindir}/chdr_log -#install -Dpm 0755 tools/chdr-dissector/build/chdr-plugin.so %{buildroot}%{_libdir}/wireshark/plugins/%{wireshark_ver}/chdr-plugin.so %post -p /sbin/ldconfig %postun -p /sbin/ldconfig %files -%exclude %{_docdir}/%{name}/manual %exclude %{_docdir}/%{name}/doxygen %exclude %{_datadir}/uhd/images %doc _tmpdoc/* @@ -194,6 +185,7 @@ install -Dpm 0755 tools/uhd_dump/chdr_log %{buildroot}%{_bindir}/chdr_log %{_bindir}/usrp_n2xx_simple_net_burner %{_bindir}/usrp_x3xx_fpga_burner %{_bindir}/nirio_programmer +%{_bindir}/octoclock_firmware_burner %{_prefix}/lib/udev/rules.d/10-usrp-uhd.rules %config(noreplace) %{_sysconfdir}/security/limits.d/*.conf %{_libdir}/lib*.so.* @@ -208,19 +200,22 @@ install -Dpm 0755 tools/uhd_dump/chdr_log %{buildroot}%{_bindir}/chdr_log %files devel %{_includedir}/* %{_libdir}/lib*.so +%{_libdir}/cmake/uhd/*.cmake %{_libdir}/pkgconfig/*.pc %files doc -%doc %{_docdir}/%{name}/manual %doc %{_docdir}/%{name}/doxygen %files tools %doc tools/README.md %{_bindir}/usrp_x3xx_fpga_jtag_programmer.sh %{_bindir}/chdr_log -#%{_libdir}/wireshark/plugins/%{wireshark_ver}/chdr-plugin.so %changelog +* Fri Mar 6 2015 Jaroslav Škarvada - 3.8.2-1 +- New version +- Dropped uhd-dump-libs and wireshark-1.12-fix patches (both upstreamed) + * Tue Jan 27 2015 Petr Machata - 3.7.2-2 - Rebuild for boost 1.57.0 From 159b3631a5a26d6355542e53aa9d8da4ec828d1c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jaroslav=20=C5=A0karvada?= Date: Fri, 6 Mar 2015 14:54:52 +0100 Subject: [PATCH 031/152] Added sources MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Jaroslav Škarvada --- sources | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sources b/sources index 6eeb00d..b17a3bb 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -515387ad594a1ca1e4447e97d4f78aa7 uhd-release_003_007_002.tar.gz -a13f07bf7b908a49ca45bfd036d9f0a9 uhd-images_003.007.002-release.tar.gz +6fa9529904bd134c7eac7e64e9882f34 uhd-images_003.008.002-release.tar.gz +9640db62aad5610a49165a688cfe2225 uhd-release_003_008_002.tar.gz From cf75dd29cd09728a63589252146d1381129e0998 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jaroslav=20=C5=A0karvada?= Date: Wed, 11 Mar 2015 16:47:42 +0100 Subject: [PATCH 032/152] Fixed building without NEON, especially on aarch64 Resolves: rhbz#1200836 --- uhd.spec | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/uhd.spec b/uhd.spec index f7cd309..ff42ec6 100644 --- a/uhd.spec +++ b/uhd.spec @@ -16,8 +16,8 @@ %global wireshark_ver %((%{__awk} '/^#define VERSION[ \t]+/ { print $NF }' /usr/include/wireshark/config.h 2>/dev/null||echo none)|/usr/bin/tr -d '"') -%ifarch %{arm} -%if %{without neon} +%ifarch %{arm} aarch64 +%if ! %{with neon} %global have_neon -DHAVE_ARM_NEON_H=0 %endif %endif @@ -25,7 +25,7 @@ Name: uhd URL: http://code.ettus.com/redmine/ettus/projects/uhd/wiki Version: %{ver_major}.%{ver_minor}.%{ver_patch} -Release: 1%{?dist} +Release: 2%{?dist} License: GPLv3+ BuildRequires: cmake BuildRequires: boost-devel, libusb1-devel, python-cheetah, ncurses-devel @@ -212,6 +212,10 @@ install -Dpm 0755 tools/uhd_dump/chdr_log %{buildroot}%{_bindir}/chdr_log %{_bindir}/chdr_log %changelog +* Wed Mar 11 2015 Jaroslav Škarvada - 3.8.2-2 +- Fixed building without NEON, especially on aarch64 + Resolves: rhbz#1200836 + * Fri Mar 6 2015 Jaroslav Škarvada - 3.8.2-1 - New version - Dropped uhd-dump-libs and wireshark-1.12-fix patches (both upstreamed) From 6d23dab1fb845da2aa19501b981b93e809965eb5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jaroslav=20=C5=A0karvada?= Date: Thu, 12 Mar 2015 14:11:13 +0100 Subject: [PATCH 033/152] Enabled build on ppc64 on RHEL --- uhd.spec | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/uhd.spec b/uhd.spec index ff42ec6..5676ceb 100644 --- a/uhd.spec +++ b/uhd.spec @@ -25,7 +25,7 @@ Name: uhd URL: http://code.ettus.com/redmine/ettus/projects/uhd/wiki Version: %{ver_major}.%{ver_minor}.%{ver_patch} -Release: 2%{?dist} +Release: 3%{?dist} License: GPLv3+ BuildRequires: cmake BuildRequires: boost-devel, libusb1-devel, python-cheetah, ncurses-devel @@ -37,10 +37,6 @@ Requires(pre): shadow-utils Requires: tkinter Group: Applications/Engineering Summary: Universal Hardware Driver for Ettus Research products -# Workaround for rhbz#1128127 -%if 0%{?rhel:1} -ExcludeArch: ppc64 -%endif Source0: http://github.com/EttusResearch/uhd/archive/release_%{ver_}.tar.gz#/uhd-release_%{ver_}.tar.gz Source1: %{name}-limits.conf Source2: http://files.ettus.com/binaries/images/uhd-images_%{ver}-release.tar.gz @@ -212,6 +208,9 @@ install -Dpm 0755 tools/uhd_dump/chdr_log %{buildroot}%{_bindir}/chdr_log %{_bindir}/chdr_log %changelog +* Thu Mar 12 2015 Jaroslav Škarvada - 3.8.2-3 +- Enabled build on ppc64 on RHEL + * Wed Mar 11 2015 Jaroslav Škarvada - 3.8.2-2 - Fixed building without NEON, especially on aarch64 Resolves: rhbz#1200836 From 43f9a2c39cdb9272c020d0108d2c4e51d40dafee Mon Sep 17 00:00:00 2001 From: Kalev Lember Date: Sat, 2 May 2015 18:19:41 +0200 Subject: [PATCH 034/152] Rebuilt for GCC 5 C++11 ABI change --- uhd.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/uhd.spec b/uhd.spec index 5676ceb..ef57633 100644 --- a/uhd.spec +++ b/uhd.spec @@ -25,7 +25,7 @@ Name: uhd URL: http://code.ettus.com/redmine/ettus/projects/uhd/wiki Version: %{ver_major}.%{ver_minor}.%{ver_patch} -Release: 3%{?dist} +Release: 4%{?dist} License: GPLv3+ BuildRequires: cmake BuildRequires: boost-devel, libusb1-devel, python-cheetah, ncurses-devel @@ -208,6 +208,9 @@ install -Dpm 0755 tools/uhd_dump/chdr_log %{buildroot}%{_bindir}/chdr_log %{_bindir}/chdr_log %changelog +* Sat May 02 2015 Kalev Lember - 3.8.2-4 +- Rebuilt for GCC 5 C++11 ABI change + * Thu Mar 12 2015 Jaroslav Škarvada - 3.8.2-3 - Enabled build on ppc64 on RHEL From 61ebe7e8c4ccff72bd4c9ec50521a6719857e5a5 Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Fri, 19 Jun 2015 01:28:33 +0000 Subject: [PATCH 035/152] - Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild --- uhd.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/uhd.spec b/uhd.spec index ef57633..7f6fd37 100644 --- a/uhd.spec +++ b/uhd.spec @@ -25,7 +25,7 @@ Name: uhd URL: http://code.ettus.com/redmine/ettus/projects/uhd/wiki Version: %{ver_major}.%{ver_minor}.%{ver_patch} -Release: 4%{?dist} +Release: 5%{?dist} License: GPLv3+ BuildRequires: cmake BuildRequires: boost-devel, libusb1-devel, python-cheetah, ncurses-devel @@ -208,6 +208,9 @@ install -Dpm 0755 tools/uhd_dump/chdr_log %{buildroot}%{_bindir}/chdr_log %{_bindir}/chdr_log %changelog +* Fri Jun 19 2015 Fedora Release Engineering - 3.8.2-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild + * Sat May 02 2015 Kalev Lember - 3.8.2-4 - Rebuilt for GCC 5 C++11 ABI change From a556bf327b75659d3fdc248ae44a6cce7fd37189 Mon Sep 17 00:00:00 2001 From: David Tardon Date: Wed, 22 Jul 2015 19:41:51 +0200 Subject: [PATCH 036/152] rebuild for Boost 1.58 --- uhd.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/uhd.spec b/uhd.spec index 7f6fd37..d215a4d 100644 --- a/uhd.spec +++ b/uhd.spec @@ -25,7 +25,7 @@ Name: uhd URL: http://code.ettus.com/redmine/ettus/projects/uhd/wiki Version: %{ver_major}.%{ver_minor}.%{ver_patch} -Release: 5%{?dist} +Release: 6%{?dist} License: GPLv3+ BuildRequires: cmake BuildRequires: boost-devel, libusb1-devel, python-cheetah, ncurses-devel @@ -208,6 +208,9 @@ install -Dpm 0755 tools/uhd_dump/chdr_log %{buildroot}%{_bindir}/chdr_log %{_bindir}/chdr_log %changelog +* Wed Jul 22 2015 David Tardon - 3.8.2-6 +- rebuild for Boost 1.58 + * Fri Jun 19 2015 Fedora Release Engineering - 3.8.2-5 - Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild From 0680f69462dfc96dadbade2cef2eefb47ac7ddff Mon Sep 17 00:00:00 2001 From: David Tardon Date: Thu, 23 Jul 2015 14:08:50 +0200 Subject: [PATCH 037/152] fix build --- 0001-fix-build.patch | 34 ++++++++++++++++++++++++++++++++++ uhd.spec | 2 ++ 2 files changed, 36 insertions(+) create mode 100644 0001-fix-build.patch diff --git a/0001-fix-build.patch b/0001-fix-build.patch new file mode 100644 index 0000000..8078c54 --- /dev/null +++ b/0001-fix-build.patch @@ -0,0 +1,34 @@ +From 4827d155bcad9ee39bf850466d4970c18fd1a94a Mon Sep 17 00:00:00 2001 +From: David Tardon +Date: Thu, 23 Jul 2015 13:44:14 +0200 +Subject: [PATCH] fix build + +--- + host/lib/usrp/b200/b200_io_impl.cpp | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/host/lib/usrp/b200/b200_io_impl.cpp b/host/lib/usrp/b200/b200_io_impl.cpp +index 262c95f..c228637 100644 +--- a/host/lib/usrp/b200/b200_io_impl.cpp ++++ b/host/lib/usrp/b200/b200_io_impl.cpp +@@ -184,7 +184,7 @@ boost::optional b200_impl::handle_async_task( + { + managed_recv_buffer::sptr buff = xport->get_recv_buff(); + if (not buff or buff->size() < 8) +- return NULL; ++ return boost::none; + + const boost::uint32_t sid = uhd::wtohx(buff->cast()[1]); + switch (sid) { +@@ -248,7 +248,7 @@ boost::optional b200_impl::handle_async_task( + default: + UHD_MSG(error) << "Got a ctrl packet with unknown SID " << sid << std::endl; + } +- return NULL; ++ return boost::none; + } + + /*********************************************************************** +-- +2.1.0 + diff --git a/uhd.spec b/uhd.spec index d215a4d..10dd3cc 100644 --- a/uhd.spec +++ b/uhd.spec @@ -42,6 +42,7 @@ Source1: %{name}-limits.conf Source2: http://files.ettus.com/binaries/images/uhd-images_%{ver}-release.tar.gz # Fix firmware build with sdcc-3 Patch0: uhd-3.4.2-sdcc-3-fix.patch +Patch1: 0001-fix-build.patch %description The UHD is the universal hardware driver for Ettus Research products. @@ -81,6 +82,7 @@ Tools that are useful for working with and/or debugging USRP device. %prep %setup -q -n uhd-release_%{ver_} %patch0 -p1 -b .sdcc-3-fix +%patch1 -p1 -b .fix-build # firmware %if %{with binary_firmware} From c77a42851fc101140ab42c7154d482fae3c93ac5 Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Wed, 29 Jul 2015 13:29:08 -0500 Subject: [PATCH 038/152] - Rebuilt for https://fedoraproject.org/wiki/Changes/F23Boost159 --- uhd.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/uhd.spec b/uhd.spec index 10dd3cc..1bb2861 100644 --- a/uhd.spec +++ b/uhd.spec @@ -25,7 +25,7 @@ Name: uhd URL: http://code.ettus.com/redmine/ettus/projects/uhd/wiki Version: %{ver_major}.%{ver_minor}.%{ver_patch} -Release: 6%{?dist} +Release: 7%{?dist} License: GPLv3+ BuildRequires: cmake BuildRequires: boost-devel, libusb1-devel, python-cheetah, ncurses-devel @@ -210,6 +210,9 @@ install -Dpm 0755 tools/uhd_dump/chdr_log %{buildroot}%{_bindir}/chdr_log %{_bindir}/chdr_log %changelog +* Wed Jul 29 2015 Fedora Release Engineering - 3.8.2-7 +- Rebuilt for https://fedoraproject.org/wiki/Changes/F23Boost159 + * Wed Jul 22 2015 David Tardon - 3.8.2-6 - rebuild for Boost 1.58 From d04b7fc509f843ca394348a50298d36c44beb33a Mon Sep 17 00:00:00 2001 From: Jonathan Wakely Date: Thu, 6 Aug 2015 01:16:29 +0100 Subject: [PATCH 039/152] Bump %release to match f23 branch --- uhd.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/uhd.spec b/uhd.spec index 1bb2861..3e9c63b 100644 --- a/uhd.spec +++ b/uhd.spec @@ -25,7 +25,7 @@ Name: uhd URL: http://code.ettus.com/redmine/ettus/projects/uhd/wiki Version: %{ver_major}.%{ver_minor}.%{ver_patch} -Release: 7%{?dist} +Release: 8%{?dist} License: GPLv3+ BuildRequires: cmake BuildRequires: boost-devel, libusb1-devel, python-cheetah, ncurses-devel @@ -210,6 +210,9 @@ install -Dpm 0755 tools/uhd_dump/chdr_log %{buildroot}%{_bindir}/chdr_log %{_bindir}/chdr_log %changelog +* Thu Aug 06 2015 Jonathan Wakely 3.8.2-8 +- Bump %release to match f23 branch + * Wed Jul 29 2015 Fedora Release Engineering - 3.8.2-7 - Rebuilt for https://fedoraproject.org/wiki/Changes/F23Boost159 From cd7736674dfd093828938eecc4b9a1502e5279b6 Mon Sep 17 00:00:00 2001 From: Jonathan Wakely Date: Thu, 27 Aug 2015 20:07:25 +0100 Subject: [PATCH 040/152] Rebuilt for Boost 1.59 --- uhd.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/uhd.spec b/uhd.spec index 3e9c63b..15ed4a3 100644 --- a/uhd.spec +++ b/uhd.spec @@ -25,7 +25,7 @@ Name: uhd URL: http://code.ettus.com/redmine/ettus/projects/uhd/wiki Version: %{ver_major}.%{ver_minor}.%{ver_patch} -Release: 8%{?dist} +Release: 9%{?dist} License: GPLv3+ BuildRequires: cmake BuildRequires: boost-devel, libusb1-devel, python-cheetah, ncurses-devel @@ -210,6 +210,9 @@ install -Dpm 0755 tools/uhd_dump/chdr_log %{buildroot}%{_bindir}/chdr_log %{_bindir}/chdr_log %changelog +* Thu Aug 27 2015 Jonathan Wakely - 3.8.2-9 +- Rebuilt for Boost 1.59 + * Thu Aug 06 2015 Jonathan Wakely 3.8.2-8 - Bump %release to match f23 branch From 704103beaf0f47d4c0baebd753ec7284efd718ac Mon Sep 17 00:00:00 2001 From: Jonathan Wakely Date: Sat, 16 Jan 2016 00:49:45 +0000 Subject: [PATCH 041/152] Rebuilt for Boost 1.60 --- uhd.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/uhd.spec b/uhd.spec index 15ed4a3..b37bd4b 100644 --- a/uhd.spec +++ b/uhd.spec @@ -25,7 +25,7 @@ Name: uhd URL: http://code.ettus.com/redmine/ettus/projects/uhd/wiki Version: %{ver_major}.%{ver_minor}.%{ver_patch} -Release: 9%{?dist} +Release: 10%{?dist} License: GPLv3+ BuildRequires: cmake BuildRequires: boost-devel, libusb1-devel, python-cheetah, ncurses-devel @@ -210,6 +210,9 @@ install -Dpm 0755 tools/uhd_dump/chdr_log %{buildroot}%{_bindir}/chdr_log %{_bindir}/chdr_log %changelog +* Sat Jan 16 2016 Jonathan Wakely - 3.8.2-10 +- Rebuilt for Boost 1.60 + * Thu Aug 27 2015 Jonathan Wakely - 3.8.2-9 - Rebuilt for Boost 1.59 From f9ea77f19697954131c435a36c7855aa4a64a714 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 5 Feb 2016 02:16:51 +0000 Subject: [PATCH 042/152] - Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild --- uhd.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/uhd.spec b/uhd.spec index b37bd4b..8998948 100644 --- a/uhd.spec +++ b/uhd.spec @@ -25,7 +25,7 @@ Name: uhd URL: http://code.ettus.com/redmine/ettus/projects/uhd/wiki Version: %{ver_major}.%{ver_minor}.%{ver_patch} -Release: 10%{?dist} +Release: 11%{?dist} License: GPLv3+ BuildRequires: cmake BuildRequires: boost-devel, libusb1-devel, python-cheetah, ncurses-devel @@ -210,6 +210,9 @@ install -Dpm 0755 tools/uhd_dump/chdr_log %{buildroot}%{_bindir}/chdr_log %{_bindir}/chdr_log %changelog +* Fri Feb 05 2016 Fedora Release Engineering - 3.8.2-11 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild + * Sat Jan 16 2016 Jonathan Wakely - 3.8.2-10 - Rebuilt for Boost 1.60 From a236defae9e520c40f3c06591261e2b2b40dca6c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jaroslav=20=C5=A0karvada?= Date: Mon, 9 May 2016 13:20:04 +0200 Subject: [PATCH 043/152] Rebuilt to fix Boost ABI problem --- uhd.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/uhd.spec b/uhd.spec index 8998948..19167ed 100644 --- a/uhd.spec +++ b/uhd.spec @@ -25,7 +25,7 @@ Name: uhd URL: http://code.ettus.com/redmine/ettus/projects/uhd/wiki Version: %{ver_major}.%{ver_minor}.%{ver_patch} -Release: 11%{?dist} +Release: 12%{?dist} License: GPLv3+ BuildRequires: cmake BuildRequires: boost-devel, libusb1-devel, python-cheetah, ncurses-devel @@ -210,6 +210,9 @@ install -Dpm 0755 tools/uhd_dump/chdr_log %{buildroot}%{_bindir}/chdr_log %{_bindir}/chdr_log %changelog +* Mon May 9 2016 Jaroslav Škarvada - 3.8.2-12 +- Rebuilt to fix Boost ABI problem + * Fri Feb 05 2016 Fedora Release Engineering - 3.8.2-11 - Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild From 7e3dc52e063e291a296a5f07ff7e811db19af79f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jaroslav=20=C5=A0karvada?= Date: Tue, 10 May 2016 10:36:45 +0200 Subject: [PATCH 044/152] New version - Dropped 0001-fix-build patch (upstreamed) --- 0001-fix-build.patch | 34 ---------------------------------- sources | 4 ++-- uhd.spec | 14 ++++++++------ 3 files changed, 10 insertions(+), 42 deletions(-) delete mode 100644 0001-fix-build.patch diff --git a/0001-fix-build.patch b/0001-fix-build.patch deleted file mode 100644 index 8078c54..0000000 --- a/0001-fix-build.patch +++ /dev/null @@ -1,34 +0,0 @@ -From 4827d155bcad9ee39bf850466d4970c18fd1a94a Mon Sep 17 00:00:00 2001 -From: David Tardon -Date: Thu, 23 Jul 2015 13:44:14 +0200 -Subject: [PATCH] fix build - ---- - host/lib/usrp/b200/b200_io_impl.cpp | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/host/lib/usrp/b200/b200_io_impl.cpp b/host/lib/usrp/b200/b200_io_impl.cpp -index 262c95f..c228637 100644 ---- a/host/lib/usrp/b200/b200_io_impl.cpp -+++ b/host/lib/usrp/b200/b200_io_impl.cpp -@@ -184,7 +184,7 @@ boost::optional b200_impl::handle_async_task( - { - managed_recv_buffer::sptr buff = xport->get_recv_buff(); - if (not buff or buff->size() < 8) -- return NULL; -+ return boost::none; - - const boost::uint32_t sid = uhd::wtohx(buff->cast()[1]); - switch (sid) { -@@ -248,7 +248,7 @@ boost::optional b200_impl::handle_async_task( - default: - UHD_MSG(error) << "Got a ctrl packet with unknown SID " << sid << std::endl; - } -- return NULL; -+ return boost::none; - } - - /*********************************************************************** --- -2.1.0 - diff --git a/sources b/sources index b17a3bb..d19f9e6 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -6fa9529904bd134c7eac7e64e9882f34 uhd-images_003.008.002-release.tar.gz -9640db62aad5610a49165a688cfe2225 uhd-release_003_008_002.tar.gz +e6d2b6b8f4dfc4aca108450f66b0fd4c uhd-images_003.009.004-release.tar.gz +0d6451b50afc000d1d13a1f6fb33ba6c uhd-release_003_009_004.tar.gz diff --git a/uhd.spec b/uhd.spec index 19167ed..fe2d187 100644 --- a/uhd.spec +++ b/uhd.spec @@ -8,8 +8,8 @@ %bcond_with neon %global ver_major 3 -%global ver_minor 8 -%global ver_patch 2 +%global ver_minor 9 +%global ver_patch 4 %global ver %(printf "%03d.%03d.%03d" %{ver_major} %{ver_minor} %{ver_patch}) %global ver_ %(printf "%03d_%03d_%03d" %{ver_major} %{ver_minor} %{ver_patch}) @@ -25,11 +25,12 @@ Name: uhd URL: http://code.ettus.com/redmine/ettus/projects/uhd/wiki Version: %{ver_major}.%{ver_minor}.%{ver_patch} -Release: 12%{?dist} +Release: 1%{?dist} License: GPLv3+ BuildRequires: cmake BuildRequires: boost-devel, libusb1-devel, python-cheetah, ncurses-devel BuildRequires: docutils, doxygen, pkgconfig, libpcap-devel, wireshark-devel +BuildRequires: python-mako %if ! %{with binary_firmware} BuildRequires: sdcc sed %endif @@ -42,7 +43,6 @@ Source1: %{name}-limits.conf Source2: http://files.ettus.com/binaries/images/uhd-images_%{ver}-release.tar.gz # Fix firmware build with sdcc-3 Patch0: uhd-3.4.2-sdcc-3-fix.patch -Patch1: 0001-fix-build.patch %description The UHD is the universal hardware driver for Ettus Research products. @@ -82,7 +82,6 @@ Tools that are useful for working with and/or debugging USRP device. %prep %setup -q -n uhd-release_%{ver_} %patch0 -p1 -b .sdcc-3-fix -%patch1 -p1 -b .fix-build # firmware %if %{with binary_firmware} @@ -182,7 +181,6 @@ install -Dpm 0755 tools/uhd_dump/chdr_log %{buildroot}%{_bindir}/chdr_log %{_bindir}/usrp2* %{_bindir}/usrp_n2xx_simple_net_burner %{_bindir}/usrp_x3xx_fpga_burner -%{_bindir}/nirio_programmer %{_bindir}/octoclock_firmware_burner %{_prefix}/lib/udev/rules.d/10-usrp-uhd.rules %config(noreplace) %{_sysconfdir}/security/limits.d/*.conf @@ -210,6 +208,10 @@ install -Dpm 0755 tools/uhd_dump/chdr_log %{buildroot}%{_bindir}/chdr_log %{_bindir}/chdr_log %changelog +* Tue May 10 2016 Jaroslav Škarvada - 3.9.4-1 +- New version +- Dropped 0001-fix-build patch (upstreamed) + * Mon May 9 2016 Jaroslav Škarvada - 3.8.2-12 - Rebuilt to fix Boost ABI problem From 4e7d88c2cd23e638c8ee2228679a0358415d1449 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jaroslav=20=C5=A0karvada?= Date: Wed, 25 May 2016 14:56:22 +0200 Subject: [PATCH 045/152] Fixed off by one in base64_decode by base64-decode-fix-off-by-one patch Related: rhbz#1308204 --- uhd-3.9.4-base64-decode-fix-off-by-one.patch | 23 ++++++++++++++++++++ uhd.spec | 9 +++++++- 2 files changed, 31 insertions(+), 1 deletion(-) create mode 100644 uhd-3.9.4-base64-decode-fix-off-by-one.patch diff --git a/uhd-3.9.4-base64-decode-fix-off-by-one.patch b/uhd-3.9.4-base64-decode-fix-off-by-one.patch new file mode 100644 index 0000000..e2da76f --- /dev/null +++ b/uhd-3.9.4-base64-decode-fix-off-by-one.patch @@ -0,0 +1,23 @@ +From 99524f1dbf784e1c49d9e274f0efe56cb3a9e26a Mon Sep 17 00:00:00 2001 +From: Jonathan Wakely +Date: Wed, 25 May 2016 12:49:36 +0100 +Subject: [PATCH] Fix off-by-one error + +There's an off-by-one error in base64_decode_value that results in undefined behaviour when it's passed `'\x7b'` +--- + host/lib/usrp/x300/cdecode.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/host/lib/usrp/x300/cdecode.c b/host/lib/usrp/x300/cdecode.c +index 1d09cbe..424de6c 100644 +--- a/host/lib/usrp/x300/cdecode.c ++++ b/host/lib/usrp/x300/cdecode.c +@@ -11,7 +11,7 @@ int base64_decode_value(char value_in){ + static const char decoding[] = {62,-1,-1,-1,63,52,53,54,55,56,57,58,59,60,61,-1,-1,-1,-2,-1,-1,-1,0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,-1,-1,-1,-1,-1,-1,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51}; + static const char decoding_size = sizeof(decoding); + value_in -= 43; +- if ((signed char)value_in < 0 || value_in > decoding_size) return -1; ++ if ((signed char)value_in < 0 || value_in >= decoding_size) return -1; + return decoding[(int)value_in]; + } + diff --git a/uhd.spec b/uhd.spec index fe2d187..f7d4589 100644 --- a/uhd.spec +++ b/uhd.spec @@ -25,7 +25,7 @@ Name: uhd URL: http://code.ettus.com/redmine/ettus/projects/uhd/wiki Version: %{ver_major}.%{ver_minor}.%{ver_patch} -Release: 1%{?dist} +Release: 2%{?dist} License: GPLv3+ BuildRequires: cmake BuildRequires: boost-devel, libusb1-devel, python-cheetah, ncurses-devel @@ -43,6 +43,8 @@ Source1: %{name}-limits.conf Source2: http://files.ettus.com/binaries/images/uhd-images_%{ver}-release.tar.gz # Fix firmware build with sdcc-3 Patch0: uhd-3.4.2-sdcc-3-fix.patch +# https://github.com/EttusResearch/uhd/pull/60 +Patch1: uhd-3.9.4-base64-decode-fix-off-by-one.patch %description The UHD is the universal hardware driver for Ettus Research products. @@ -82,6 +84,7 @@ Tools that are useful for working with and/or debugging USRP device. %prep %setup -q -n uhd-release_%{ver_} %patch0 -p1 -b .sdcc-3-fix +%patch1 -p1 -b .3.9.4-base64-decode-fix-off-by-one # firmware %if %{with binary_firmware} @@ -208,6 +211,10 @@ install -Dpm 0755 tools/uhd_dump/chdr_log %{buildroot}%{_bindir}/chdr_log %{_bindir}/chdr_log %changelog +* Wed May 25 2016 Jaroslav Škarvada - 3.9.4-2 +- Fixed off by one in base64_decode by base64-decode-fix-off-by-one patch + Related: rhbz#1308204 + * Tue May 10 2016 Jaroslav Škarvada - 3.9.4-1 - New version - Dropped 0001-fix-build patch (upstreamed) From cd4fafec7ecd612723bdd04d2cd416c02ef3a877 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jaroslav=20=C5=A0karvada?= Date: Tue, 22 Nov 2016 15:50:47 +0100 Subject: [PATCH 046/152] New version - Dropped base64-decode-fix-off-by-one patch (upstreamed) - Switched to new version numbering - Switched image archive to xz --- .gitignore | 1 + sources | 4 +-- uhd-3.9.4-base64-decode-fix-off-by-one.patch | 23 ---------------- uhd.spec | 28 +++++++++++--------- 4 files changed, 19 insertions(+), 37 deletions(-) delete mode 100644 uhd-3.9.4-base64-decode-fix-off-by-one.patch diff --git a/.gitignore b/.gitignore index 9b76401..0b2d77e 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ uhd-*.tar.gz +/uhd-images_003.010.001.000-release.tar.xz diff --git a/sources b/sources index d19f9e6..fa0521a 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -e6d2b6b8f4dfc4aca108450f66b0fd4c uhd-images_003.009.004-release.tar.gz -0d6451b50afc000d1d13a1f6fb33ba6c uhd-release_003_009_004.tar.gz +c68503082afa4d1408af8d17559120e2 uhd-release_003_010_001_000.tar.gz +fb5e160c8ed57b45b91757f54c9fd14a uhd-images_003.010.001.000-release.tar.xz diff --git a/uhd-3.9.4-base64-decode-fix-off-by-one.patch b/uhd-3.9.4-base64-decode-fix-off-by-one.patch deleted file mode 100644 index e2da76f..0000000 --- a/uhd-3.9.4-base64-decode-fix-off-by-one.patch +++ /dev/null @@ -1,23 +0,0 @@ -From 99524f1dbf784e1c49d9e274f0efe56cb3a9e26a Mon Sep 17 00:00:00 2001 -From: Jonathan Wakely -Date: Wed, 25 May 2016 12:49:36 +0100 -Subject: [PATCH] Fix off-by-one error - -There's an off-by-one error in base64_decode_value that results in undefined behaviour when it's passed `'\x7b'` ---- - host/lib/usrp/x300/cdecode.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/host/lib/usrp/x300/cdecode.c b/host/lib/usrp/x300/cdecode.c -index 1d09cbe..424de6c 100644 ---- a/host/lib/usrp/x300/cdecode.c -+++ b/host/lib/usrp/x300/cdecode.c -@@ -11,7 +11,7 @@ int base64_decode_value(char value_in){ - static const char decoding[] = {62,-1,-1,-1,63,52,53,54,55,56,57,58,59,60,61,-1,-1,-1,-2,-1,-1,-1,0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,-1,-1,-1,-1,-1,-1,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51}; - static const char decoding_size = sizeof(decoding); - value_in -= 43; -- if ((signed char)value_in < 0 || value_in > decoding_size) return -1; -+ if ((signed char)value_in < 0 || value_in >= decoding_size) return -1; - return decoding[(int)value_in]; - } - diff --git a/uhd.spec b/uhd.spec index f7d4589..f0e84b0 100644 --- a/uhd.spec +++ b/uhd.spec @@ -7,12 +7,13 @@ # building with --with=neon will enable auto detection %bcond_with neon -%global ver_major 3 -%global ver_minor 9 -%global ver_patch 4 +%global ver_1 3 +%global ver_2 10 +%global ver_3 1 +%global ver_4 0 -%global ver %(printf "%03d.%03d.%03d" %{ver_major} %{ver_minor} %{ver_patch}) -%global ver_ %(printf "%03d_%03d_%03d" %{ver_major} %{ver_minor} %{ver_patch}) +%global ver %(printf "%03d.%03d.%03d.%03d" %{ver_1} %{ver_2} %{ver_3} %{ver_4}) +%global ver_ %(printf "%03d_%03d_%03d_%03d" %{ver_1} %{ver_2} %{ver_3} %{ver_4}) %global wireshark_ver %((%{__awk} '/^#define VERSION[ \t]+/ { print $NF }' /usr/include/wireshark/config.h 2>/dev/null||echo none)|/usr/bin/tr -d '"') @@ -24,8 +25,8 @@ Name: uhd URL: http://code.ettus.com/redmine/ettus/projects/uhd/wiki -Version: %{ver_major}.%{ver_minor}.%{ver_patch} -Release: 2%{?dist} +Version: %{ver_1}.%{ver_2}.%{ver_3}.%{ver_4} +Release: 1%{?dist} License: GPLv3+ BuildRequires: cmake BuildRequires: boost-devel, libusb1-devel, python-cheetah, ncurses-devel @@ -40,11 +41,9 @@ Group: Applications/Engineering Summary: Universal Hardware Driver for Ettus Research products Source0: http://github.com/EttusResearch/uhd/archive/release_%{ver_}.tar.gz#/uhd-release_%{ver_}.tar.gz Source1: %{name}-limits.conf -Source2: http://files.ettus.com/binaries/images/uhd-images_%{ver}-release.tar.gz +Source2: http://files.ettus.com/binaries/images/uhd-images_%{ver}-release.tar.xz # Fix firmware build with sdcc-3 Patch0: uhd-3.4.2-sdcc-3-fix.patch -# https://github.com/EttusResearch/uhd/pull/60 -Patch1: uhd-3.9.4-base64-decode-fix-off-by-one.patch %description The UHD is the universal hardware driver for Ettus Research products. @@ -84,13 +83,12 @@ Tools that are useful for working with and/or debugging USRP device. %prep %setup -q -n uhd-release_%{ver_} %patch0 -p1 -b .sdcc-3-fix -%patch1 -p1 -b .3.9.4-base64-decode-fix-off-by-one # firmware %if %{with binary_firmware} # extract binary firmware mkdir -p images/images -tar -xzf %{SOURCE2} -C images/images --strip-components=4 +tar -xJf %{SOURCE2} -C images/images --strip-components=4 rm -f images/images/{LICENSE.txt,*.tag} %endif @@ -211,6 +209,12 @@ install -Dpm 0755 tools/uhd_dump/chdr_log %{buildroot}%{_bindir}/chdr_log %{_bindir}/chdr_log %changelog +* Tue Nov 22 2016 Jaroslav Škarvada - 3.10.1.0-1 +- New version +- Dropped base64-decode-fix-off-by-one patch (upstreamed) +- Switched to new version numbering +- Switched image archive to xz + * Wed May 25 2016 Jaroslav Škarvada - 3.9.4-2 - Fixed off by one in base64_decode by base64-decode-fix-off-by-one patch Related: rhbz#1308204 From 873054571a244db1bd75c968bcce88ec2df34160 Mon Sep 17 00:00:00 2001 From: Jonathan Wakely Date: Mon, 30 Jan 2017 22:00:16 +0000 Subject: [PATCH 047/152] Rebuilt for Boost 1.63 --- uhd.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/uhd.spec b/uhd.spec index f0e84b0..81aa372 100644 --- a/uhd.spec +++ b/uhd.spec @@ -26,7 +26,7 @@ Name: uhd URL: http://code.ettus.com/redmine/ettus/projects/uhd/wiki Version: %{ver_1}.%{ver_2}.%{ver_3}.%{ver_4} -Release: 1%{?dist} +Release: 2%{?dist} License: GPLv3+ BuildRequires: cmake BuildRequires: boost-devel, libusb1-devel, python-cheetah, ncurses-devel @@ -209,6 +209,9 @@ install -Dpm 0755 tools/uhd_dump/chdr_log %{buildroot}%{_bindir}/chdr_log %{_bindir}/chdr_log %changelog +* Mon Jan 30 2017 Jonathan Wakely - 3.10.1.0-2 +- Rebuilt for Boost 1.63 + * Tue Nov 22 2016 Jaroslav Škarvada - 3.10.1.0-1 - New version - Dropped base64-decode-fix-off-by-one patch (upstreamed) From 23068bffa561a2246fd251ffca2ed1b1c97e0bab Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 11 Feb 2017 16:39:17 +0000 Subject: [PATCH 048/152] - Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild --- uhd.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/uhd.spec b/uhd.spec index 81aa372..484d5f7 100644 --- a/uhd.spec +++ b/uhd.spec @@ -26,7 +26,7 @@ Name: uhd URL: http://code.ettus.com/redmine/ettus/projects/uhd/wiki Version: %{ver_1}.%{ver_2}.%{ver_3}.%{ver_4} -Release: 2%{?dist} +Release: 3%{?dist} License: GPLv3+ BuildRequires: cmake BuildRequires: boost-devel, libusb1-devel, python-cheetah, ncurses-devel @@ -209,6 +209,9 @@ install -Dpm 0755 tools/uhd_dump/chdr_log %{buildroot}%{_bindir}/chdr_log %{_bindir}/chdr_log %changelog +* Sat Feb 11 2017 Fedora Release Engineering - 3.10.1.0-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild + * Mon Jan 30 2017 Jonathan Wakely - 3.10.1.0-2 - Rebuilt for Boost 1.63 From fb915060c34617b21fe480353db575f636322595 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Mon, 15 May 2017 20:16:18 +0000 Subject: [PATCH 049/152] - Rebuilt for https://fedoraproject.org/wiki/Fedora_26_27_Mass_Rebuild --- uhd.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/uhd.spec b/uhd.spec index 484d5f7..ee859ca 100644 --- a/uhd.spec +++ b/uhd.spec @@ -26,7 +26,7 @@ Name: uhd URL: http://code.ettus.com/redmine/ettus/projects/uhd/wiki Version: %{ver_1}.%{ver_2}.%{ver_3}.%{ver_4} -Release: 3%{?dist} +Release: 4%{?dist} License: GPLv3+ BuildRequires: cmake BuildRequires: boost-devel, libusb1-devel, python-cheetah, ncurses-devel @@ -209,6 +209,9 @@ install -Dpm 0755 tools/uhd_dump/chdr_log %{buildroot}%{_bindir}/chdr_log %{_bindir}/chdr_log %changelog +* Mon May 15 2017 Fedora Release Engineering - 3.10.1.0-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_27_Mass_Rebuild + * Sat Feb 11 2017 Fedora Release Engineering - 3.10.1.0-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild From d97735ae5fadc64fedb11e078877b8b758e1a605 Mon Sep 17 00:00:00 2001 From: Jonathan Wakely Date: Tue, 4 Jul 2017 10:19:38 +0100 Subject: [PATCH 050/152] Rebuilt for Boost 1.64 --- uhd.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/uhd.spec b/uhd.spec index ee859ca..28e069f 100644 --- a/uhd.spec +++ b/uhd.spec @@ -26,7 +26,7 @@ Name: uhd URL: http://code.ettus.com/redmine/ettus/projects/uhd/wiki Version: %{ver_1}.%{ver_2}.%{ver_3}.%{ver_4} -Release: 4%{?dist} +Release: 5%{?dist} License: GPLv3+ BuildRequires: cmake BuildRequires: boost-devel, libusb1-devel, python-cheetah, ncurses-devel @@ -209,6 +209,9 @@ install -Dpm 0755 tools/uhd_dump/chdr_log %{buildroot}%{_bindir}/chdr_log %{_bindir}/chdr_log %changelog +* Tue Jul 04 2017 Jonathan Wakely - 3.10.1.0-5 +- Rebuilt for Boost 1.64 + * Mon May 15 2017 Fedora Release Engineering - 3.10.1.0-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_26_27_Mass_Rebuild From 756a02048e27d4bb98067af30171550eff0508da Mon Sep 17 00:00:00 2001 From: Jonathan Wakely Date: Wed, 19 Jul 2017 19:00:00 +0100 Subject: [PATCH 051/152] Rebuilt for s390x binutils bug --- uhd.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/uhd.spec b/uhd.spec index 28e069f..921ad54 100644 --- a/uhd.spec +++ b/uhd.spec @@ -26,7 +26,7 @@ Name: uhd URL: http://code.ettus.com/redmine/ettus/projects/uhd/wiki Version: %{ver_1}.%{ver_2}.%{ver_3}.%{ver_4} -Release: 5%{?dist} +Release: 6%{?dist} License: GPLv3+ BuildRequires: cmake BuildRequires: boost-devel, libusb1-devel, python-cheetah, ncurses-devel @@ -209,6 +209,9 @@ install -Dpm 0755 tools/uhd_dump/chdr_log %{buildroot}%{_bindir}/chdr_log %{_bindir}/chdr_log %changelog +* Wed Jul 19 2017 Jonathan Wakely - 3.10.1.0-6 +- Rebuilt for s390x binutils bug + * Tue Jul 04 2017 Jonathan Wakely - 3.10.1.0-5 - Rebuilt for Boost 1.64 From 807ac753bc5fd9d4b348db78eed6545811202a91 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 27 Jul 2017 20:55:22 +0000 Subject: [PATCH 052/152] - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild --- uhd.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/uhd.spec b/uhd.spec index 921ad54..93c4252 100644 --- a/uhd.spec +++ b/uhd.spec @@ -26,7 +26,7 @@ Name: uhd URL: http://code.ettus.com/redmine/ettus/projects/uhd/wiki Version: %{ver_1}.%{ver_2}.%{ver_3}.%{ver_4} -Release: 6%{?dist} +Release: 7%{?dist} License: GPLv3+ BuildRequires: cmake BuildRequires: boost-devel, libusb1-devel, python-cheetah, ncurses-devel @@ -209,6 +209,9 @@ install -Dpm 0755 tools/uhd_dump/chdr_log %{buildroot}%{_bindir}/chdr_log %{_bindir}/chdr_log %changelog +* Thu Jul 27 2017 Fedora Release Engineering - 3.10.1.0-7 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild + * Wed Jul 19 2017 Jonathan Wakely - 3.10.1.0-6 - Rebuilt for s390x binutils bug From 46767e66dbafd1087dff4ebd529252d84350d47e Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 3 Aug 2017 09:44:33 +0000 Subject: [PATCH 053/152] - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild --- uhd.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/uhd.spec b/uhd.spec index 93c4252..658faab 100644 --- a/uhd.spec +++ b/uhd.spec @@ -26,7 +26,7 @@ Name: uhd URL: http://code.ettus.com/redmine/ettus/projects/uhd/wiki Version: %{ver_1}.%{ver_2}.%{ver_3}.%{ver_4} -Release: 7%{?dist} +Release: 8%{?dist} License: GPLv3+ BuildRequires: cmake BuildRequires: boost-devel, libusb1-devel, python-cheetah, ncurses-devel @@ -209,6 +209,9 @@ install -Dpm 0755 tools/uhd_dump/chdr_log %{buildroot}%{_bindir}/chdr_log %{_bindir}/chdr_log %changelog +* Thu Aug 03 2017 Fedora Release Engineering - 3.10.1.0-8 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild + * Thu Jul 27 2017 Fedora Release Engineering - 3.10.1.0-7 - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild From cecde36c6c19a638f84d438bfeb44451f178332e Mon Sep 17 00:00:00 2001 From: Jonathan Wakely Date: Tue, 23 Jan 2018 10:58:10 +0000 Subject: [PATCH 054/152] Rebuilt for Boost 1.66 --- uhd.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/uhd.spec b/uhd.spec index 658faab..a02994c 100644 --- a/uhd.spec +++ b/uhd.spec @@ -26,7 +26,7 @@ Name: uhd URL: http://code.ettus.com/redmine/ettus/projects/uhd/wiki Version: %{ver_1}.%{ver_2}.%{ver_3}.%{ver_4} -Release: 8%{?dist} +Release: 9%{?dist} License: GPLv3+ BuildRequires: cmake BuildRequires: boost-devel, libusb1-devel, python-cheetah, ncurses-devel @@ -209,6 +209,9 @@ install -Dpm 0755 tools/uhd_dump/chdr_log %{buildroot}%{_bindir}/chdr_log %{_bindir}/chdr_log %changelog +* Tue Jan 23 2018 Jonathan Wakely - 3.10.1.0-9 +- Rebuilt for Boost 1.66 + * Thu Aug 03 2017 Fedora Release Engineering - 3.10.1.0-8 - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild From 2615fe712f01137ed92de7d27eb1273205eeef58 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jaroslav=20=C5=A0karvada?= Date: Fri, 2 Feb 2018 17:33:26 +0100 Subject: [PATCH 055/152] Rebuilt for new boost --- uhd.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/uhd.spec b/uhd.spec index a02994c..e3d727e 100644 --- a/uhd.spec +++ b/uhd.spec @@ -26,7 +26,7 @@ Name: uhd URL: http://code.ettus.com/redmine/ettus/projects/uhd/wiki Version: %{ver_1}.%{ver_2}.%{ver_3}.%{ver_4} -Release: 9%{?dist} +Release: 10%{?dist} License: GPLv3+ BuildRequires: cmake BuildRequires: boost-devel, libusb1-devel, python-cheetah, ncurses-devel @@ -209,6 +209,9 @@ install -Dpm 0755 tools/uhd_dump/chdr_log %{buildroot}%{_bindir}/chdr_log %{_bindir}/chdr_log %changelog +* Fri Feb 2 2018 Jaroslav Škarvada - 3.10.1.0-10 +- Rebuilt for new boost + * Tue Jan 23 2018 Jonathan Wakely - 3.10.1.0-9 - Rebuilt for Boost 1.66 From 9272f23d690e7a193900b7d3b7b32102773cb55e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jaroslav=20=C5=A0karvada?= Date: Mon, 5 Feb 2018 21:39:54 +0100 Subject: [PATCH 056/152] New version --- .gitignore | 2 +- sources | 4 ++-- uhd.spec | 8 +++++++- 3 files changed, 10 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index 0b2d77e..fdad76e 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,2 @@ uhd-*.tar.gz -/uhd-images_003.010.001.000-release.tar.xz +uhd-images_*-release.tar.xz diff --git a/sources b/sources index fa0521a..dfe6ff0 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -c68503082afa4d1408af8d17559120e2 uhd-release_003_010_001_000.tar.gz -fb5e160c8ed57b45b91757f54c9fd14a uhd-images_003.010.001.000-release.tar.xz +SHA512 (uhd-images_003.010.003.000-release.tar.xz) = 49ee14093d356494af228b0ad55b7e61d176091341988f4de986e00dd3b23d8ab941365731f0af816c96099cc858229b2919b1d2f818bd59ce6ceaaf1970a876 +SHA512 (uhd-release_003_010_003_000.tar.gz) = 398fdaa29daf4a0d49172afce46ec57a8a96861a8d3262fdd19f78a29dc7d17ae7cb3731639950784420eca50c0a2f0dc8bf83da7be0b63af208b7bf0b382f6b diff --git a/uhd.spec b/uhd.spec index e3d727e..0810a37 100644 --- a/uhd.spec +++ b/uhd.spec @@ -9,7 +9,7 @@ %global ver_1 3 %global ver_2 10 -%global ver_3 1 +%global ver_3 3 %global ver_4 0 %global ver %(printf "%03d.%03d.%03d.%03d" %{ver_1} %{ver_2} %{ver_3} %{ver_4}) @@ -44,6 +44,8 @@ Source1: %{name}-limits.conf Source2: http://files.ettus.com/binaries/images/uhd-images_%{ver}-release.tar.xz # Fix firmware build with sdcc-3 Patch0: uhd-3.4.2-sdcc-3-fix.patch +# Workaround for building with gcc-8 (rhbz#1542187) +Patch1: uhd-3.1.3.0-boost-gcc8-compile-fix.patch %description The UHD is the universal hardware driver for Ettus Research products. @@ -83,6 +85,7 @@ Tools that are useful for working with and/or debugging USRP device. %prep %setup -q -n uhd-release_%{ver_} %patch0 -p1 -b .sdcc-3-fix +%patch1 -p1 -b .boost-gcc8-compile-fix # firmware %if %{with binary_firmware} @@ -209,6 +212,9 @@ install -Dpm 0755 tools/uhd_dump/chdr_log %{buildroot}%{_bindir}/chdr_log %{_bindir}/chdr_log %changelog +* Fri Feb 2 2018 Jaroslav Škarvada - 3.10.3.0-1 +- New version + * Fri Feb 2 2018 Jaroslav Škarvada - 3.10.1.0-10 - Rebuilt for new boost From 2b387c76f163263d2962bdb1cf30e6d0b75c5b4f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jaroslav=20=C5=A0karvada?= Date: Mon, 5 Feb 2018 21:43:24 +0100 Subject: [PATCH 057/152] Fixed release number MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Jaroslav Škarvada --- uhd.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/uhd.spec b/uhd.spec index 0810a37..5241ef2 100644 --- a/uhd.spec +++ b/uhd.spec @@ -26,7 +26,7 @@ Name: uhd URL: http://code.ettus.com/redmine/ettus/projects/uhd/wiki Version: %{ver_1}.%{ver_2}.%{ver_3}.%{ver_4} -Release: 10%{?dist} +Release: 1%{?dist} License: GPLv3+ BuildRequires: cmake BuildRequires: boost-devel, libusb1-devel, python-cheetah, ncurses-devel From 5ef1c7235cc075e5f8278424d2590b472c45128e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jaroslav=20=C5=A0karvada?= Date: Mon, 5 Feb 2018 21:44:08 +0100 Subject: [PATCH 058/152] Added patch MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Jaroslav Škarvada --- uhd-3.1.3.0-boost-gcc8-compile-fix.patch | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) create mode 100644 uhd-3.1.3.0-boost-gcc8-compile-fix.patch diff --git a/uhd-3.1.3.0-boost-gcc8-compile-fix.patch b/uhd-3.1.3.0-boost-gcc8-compile-fix.patch new file mode 100644 index 0000000..20f24c2 --- /dev/null +++ b/uhd-3.1.3.0-boost-gcc8-compile-fix.patch @@ -0,0 +1,23 @@ +diff --git a/host/lib/usrp/common/max287x.hpp b/host/lib/usrp/common/max287x.hpp +index 839ed77..1fca880 100644 +--- a/host/lib/usrp/common/max287x.hpp ++++ b/host/lib/usrp/common/max287x.hpp +@@ -30,6 +30,7 @@ + #include + #include + #include ++#include + #include "max2870_regs.hpp" + #include "max2871_regs.hpp" + +@@ -642,8 +643,8 @@ double max287x::set_frequency( + << boost::format("MAX287x: Intermediates: ref=%0.2f, outdiv=%f, fbdiv=%f" + ) % ref_freq % double(RFdiv*2) % double(N + double(FRAC)/double(MOD)) << std::endl + << boost::format("MAX287x: tune: R=%d, BS=%d, N=%d, FRAC=%d, MOD=%d, T=%d, D=%d, RFdiv=%d, type=%s" +- ) % R % BS % N % FRAC % MOD % T % D % RFdiv % ((is_int_n) ? "Integer-N" : "Fractional") << std::endl +- << boost::format("MAX287x: Frequencies (MHz): REQ=%0.2f, ACT=%0.2f, VCO=%0.2f, PFD=%0.2f, BAND=%0.2f" ++ ) % R % BS % N % FRAC % MOD % T % D % RFdiv % ((is_int_n) ? std::string("Integer-N") : std::string("Fractional")) ++ << std::endl << boost::format("MAX287x: Frequencies (MHz): REQ=%0.2f, ACT=%0.2f, VCO=%0.2f, PFD=%0.2f, BAND=%0.2f" + ) % (target_freq/1e6) % (actual_freq/1e6) % (vco_freq/1e6) % (pfd_freq/1e6) % (pfd_freq/BS/1e6) << std::endl; + + //load the register values From 404f1d73825fc4d280f74bcf32b78f65b174008f Mon Sep 17 00:00:00 2001 From: Igor Gnatenko Date: Fri, 9 Feb 2018 09:06:27 +0100 Subject: [PATCH 059/152] Escape macros in %changelog Reference: https://lists.fedoraproject.org/archives/list/devel@lists.fedoraproject.org/thread/Y2ZUKK2B7T2IKXPMODNF6HB2O5T5TS6H/ Signed-off-by: Igor Gnatenko --- uhd.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/uhd.spec b/uhd.spec index 5241ef2..7fe8a1d 100644 --- a/uhd.spec +++ b/uhd.spec @@ -26,7 +26,7 @@ Name: uhd URL: http://code.ettus.com/redmine/ettus/projects/uhd/wiki Version: %{ver_1}.%{ver_2}.%{ver_3}.%{ver_4} -Release: 1%{?dist} +Release: 2%{?dist} License: GPLv3+ BuildRequires: cmake BuildRequires: boost-devel, libusb1-devel, python-cheetah, ncurses-devel @@ -212,6 +212,9 @@ install -Dpm 0755 tools/uhd_dump/chdr_log %{buildroot}%{_bindir}/chdr_log %{_bindir}/chdr_log %changelog +* Fri Feb 09 2018 Igor Gnatenko - 3.10.3.0-2 +- Escape macros in %%changelog + * Fri Feb 2 2018 Jaroslav Škarvada - 3.10.3.0-1 - New version @@ -269,7 +272,7 @@ install -Dpm 0755 tools/uhd_dump/chdr_log %{buildroot}%{_bindir}/chdr_log - Rebuilt for Boost 1.59 * Thu Aug 06 2015 Jonathan Wakely 3.8.2-8 -- Bump %release to match f23 branch +- Bump %%release to match f23 branch * Wed Jul 29 2015 Fedora Release Engineering - 3.8.2-7 - Rebuilt for https://fedoraproject.org/wiki/Changes/F23Boost159 From a0832cf2cdabcc00c3242329243032b453e26202 Mon Sep 17 00:00:00 2001 From: Iryna Shcherbina Date: Wed, 28 Feb 2018 07:37:59 +0100 Subject: [PATCH 060/152] Update Python 2 dependency declarations to new packaging standards --- uhd.spec | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/uhd.spec b/uhd.spec index 7fe8a1d..9a88d63 100644 --- a/uhd.spec +++ b/uhd.spec @@ -26,17 +26,17 @@ Name: uhd URL: http://code.ettus.com/redmine/ettus/projects/uhd/wiki Version: %{ver_1}.%{ver_2}.%{ver_3}.%{ver_4} -Release: 2%{?dist} +Release: 3%{?dist} License: GPLv3+ BuildRequires: cmake -BuildRequires: boost-devel, libusb1-devel, python-cheetah, ncurses-devel -BuildRequires: docutils, doxygen, pkgconfig, libpcap-devel, wireshark-devel -BuildRequires: python-mako +BuildRequires: boost-devel, libusb1-devel, python2-cheetah, ncurses-devel +BuildRequires: python2-docutils, doxygen, pkgconfig, libpcap-devel, wireshark-devel +BuildRequires: python2-mako %if ! %{with binary_firmware} BuildRequires: sdcc sed %endif Requires(pre): shadow-utils -Requires: tkinter +Requires: python2-tkinter Group: Applications/Engineering Summary: Universal Hardware Driver for Ettus Research products Source0: http://github.com/EttusResearch/uhd/archive/release_%{ver_}.tar.gz#/uhd-release_%{ver_}.tar.gz @@ -212,6 +212,10 @@ install -Dpm 0755 tools/uhd_dump/chdr_log %{buildroot}%{_bindir}/chdr_log %{_bindir}/chdr_log %changelog +* Wed Feb 28 2018 Iryna Shcherbina - 3.10.3.0-3 +- Update Python 2 dependency declarations to new packaging standards + (See https://fedoraproject.org/wiki/FinalizingFedoraSwitchtoPython3) + * Fri Feb 09 2018 Igor Gnatenko - 3.10.3.0-2 - Escape macros in %%changelog From e802d15cef8a455b2e9dbcceb95362592efe121b Mon Sep 17 00:00:00 2001 From: Igor Gnatenko Date: Mon, 9 Jul 2018 19:06:52 +0200 Subject: [PATCH 061/152] add BuildRequires: gcc-c++ Reference: https://fedoraproject.org/wiki/Changes/Remove_GCC_from_BuildRoot --- uhd.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/uhd.spec b/uhd.spec index 9a88d63..ccc2d48 100644 --- a/uhd.spec +++ b/uhd.spec @@ -28,6 +28,7 @@ URL: http://code.ettus.com/redmine/ettus/projects/uhd/wiki Version: %{ver_1}.%{ver_2}.%{ver_3}.%{ver_4} Release: 3%{?dist} License: GPLv3+ +BuildRequires: gcc-c++ BuildRequires: cmake BuildRequires: boost-devel, libusb1-devel, python2-cheetah, ncurses-devel BuildRequires: python2-docutils, doxygen, pkgconfig, libpcap-devel, wireshark-devel From 2b7eeda2e11e9f280c2e6e2af3b3f0ca205f15a6 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 14 Jul 2018 08:10:39 +0000 Subject: [PATCH 062/152] - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- uhd.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/uhd.spec b/uhd.spec index ccc2d48..82aeacd 100644 --- a/uhd.spec +++ b/uhd.spec @@ -26,7 +26,7 @@ Name: uhd URL: http://code.ettus.com/redmine/ettus/projects/uhd/wiki Version: %{ver_1}.%{ver_2}.%{ver_3}.%{ver_4} -Release: 3%{?dist} +Release: 4%{?dist} License: GPLv3+ BuildRequires: gcc-c++ BuildRequires: cmake @@ -213,6 +213,9 @@ install -Dpm 0755 tools/uhd_dump/chdr_log %{buildroot}%{_bindir}/chdr_log %{_bindir}/chdr_log %changelog +* Sat Jul 14 2018 Fedora Release Engineering - 3.10.3.0-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild + * Wed Feb 28 2018 Iryna Shcherbina - 3.10.3.0-3 - Update Python 2 dependency declarations to new packaging standards (See https://fedoraproject.org/wiki/FinalizingFedoraSwitchtoPython3) From 1c1fbfd088ed2a19286810c106b928feddeef4de Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jaroslav=20=C5=A0karvada?= Date: Sun, 22 Jul 2018 01:44:41 +0200 Subject: [PATCH 063/152] New version Resolves: rhbz#1606606 Dropped sdcc-3-fix patch (upstreamed) Dropped boost-gcc8-compile-fix patch (not needed) Packaged wireshark dissectors --- .gitignore | 2 +- sources | 4 +- uhd-3.1.3.0-boost-gcc8-compile-fix.patch | 23 - uhd-3.4.2-sdcc-3-fix.patch | 1721 ---------------------- uhd.spec | 98 +- 5 files changed, 63 insertions(+), 1785 deletions(-) delete mode 100644 uhd-3.1.3.0-boost-gcc8-compile-fix.patch delete mode 100644 uhd-3.4.2-sdcc-3-fix.patch diff --git a/.gitignore b/.gitignore index fdad76e..cbdcc91 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,2 @@ uhd-*.tar.gz -uhd-images_*-release.tar.xz +uhd-images_*.tar.xz diff --git a/sources b/sources index dfe6ff0..cc54942 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (uhd-images_003.010.003.000-release.tar.xz) = 49ee14093d356494af228b0ad55b7e61d176091341988f4de986e00dd3b23d8ab941365731f0af816c96099cc858229b2919b1d2f818bd59ce6ceaaf1970a876 -SHA512 (uhd-release_003_010_003_000.tar.gz) = 398fdaa29daf4a0d49172afce46ec57a8a96861a8d3262fdd19f78a29dc7d17ae7cb3731639950784420eca50c0a2f0dc8bf83da7be0b63af208b7bf0b382f6b +SHA512 (uhd-3.12.0.0.tar.gz) = 33efcb913a40fcceaf21460eeb7b8fe7fdd9066cefc1f6ae7d4f436532965b3fe55557d551a8e95c3823418ffec4c0e2804e200c9222b5bf5735622cc2cb1389 +SHA512 (uhd-images_3.12.0.0.tar.xz) = 7bba0d87580413e2843c7e71938c5d5bfeaf7aa3bc58d058c1c80d5e1397443bcec637e378b2e9582752b97b11e57110299231c4ad3ae81cdd629251f49e84d8 diff --git a/uhd-3.1.3.0-boost-gcc8-compile-fix.patch b/uhd-3.1.3.0-boost-gcc8-compile-fix.patch deleted file mode 100644 index 20f24c2..0000000 --- a/uhd-3.1.3.0-boost-gcc8-compile-fix.patch +++ /dev/null @@ -1,23 +0,0 @@ -diff --git a/host/lib/usrp/common/max287x.hpp b/host/lib/usrp/common/max287x.hpp -index 839ed77..1fca880 100644 ---- a/host/lib/usrp/common/max287x.hpp -+++ b/host/lib/usrp/common/max287x.hpp -@@ -30,6 +30,7 @@ - #include - #include - #include -+#include - #include "max2870_regs.hpp" - #include "max2871_regs.hpp" - -@@ -642,8 +643,8 @@ double max287x::set_frequency( - << boost::format("MAX287x: Intermediates: ref=%0.2f, outdiv=%f, fbdiv=%f" - ) % ref_freq % double(RFdiv*2) % double(N + double(FRAC)/double(MOD)) << std::endl - << boost::format("MAX287x: tune: R=%d, BS=%d, N=%d, FRAC=%d, MOD=%d, T=%d, D=%d, RFdiv=%d, type=%s" -- ) % R % BS % N % FRAC % MOD % T % D % RFdiv % ((is_int_n) ? "Integer-N" : "Fractional") << std::endl -- << boost::format("MAX287x: Frequencies (MHz): REQ=%0.2f, ACT=%0.2f, VCO=%0.2f, PFD=%0.2f, BAND=%0.2f" -+ ) % R % BS % N % FRAC % MOD % T % D % RFdiv % ((is_int_n) ? std::string("Integer-N") : std::string("Fractional")) -+ << std::endl << boost::format("MAX287x: Frequencies (MHz): REQ=%0.2f, ACT=%0.2f, VCO=%0.2f, PFD=%0.2f, BAND=%0.2f" - ) % (target_freq/1e6) % (actual_freq/1e6) % (vco_freq/1e6) % (pfd_freq/1e6) % (pfd_freq/BS/1e6) << std::endl; - - //load the register values diff --git a/uhd-3.4.2-sdcc-3-fix.patch b/uhd-3.4.2-sdcc-3-fix.patch deleted file mode 100644 index 07c38d9..0000000 --- a/uhd-3.4.2-sdcc-3-fix.patch +++ /dev/null @@ -1,1721 +0,0 @@ -diff --git a/firmware/fx2/b100/board_specific.c b/firmware/fx2/b100/board_specific.c -index 993d925..c85268c 100644 ---- a/firmware/fx2/b100/board_specific.c -+++ b/firmware/fx2/b100/board_specific.c -@@ -58,7 +58,7 @@ set_sleep_bits (unsigned char bits, unsigned char mask) - // NOP on usrp1 - } - --static xdata unsigned char xbuf[1]; -+static __xdata unsigned char xbuf[1]; - - void - init_board (void) -diff --git a/firmware/fx2/b100/eeprom_io.c b/firmware/fx2/b100/eeprom_io.c -index 9eeb536..666f3f6 100644 ---- a/firmware/fx2/b100/eeprom_io.c -+++ b/firmware/fx2/b100/eeprom_io.c -@@ -27,12 +27,12 @@ - // returns non-zero if successful, else 0 - unsigned char - eeprom_read (unsigned char i2c_addr, unsigned char eeprom_offset, -- xdata unsigned char *buf, unsigned char len) -+ __xdata unsigned char *buf, unsigned char len) - { - // We setup a random read by first doing a "zero byte write". - // Writes carry an address. Reads use an implicit address. - -- static xdata unsigned char cmd[1]; -+ static __xdata unsigned char cmd[1]; - cmd[0] = eeprom_offset; - if (!i2c_write(i2c_addr, cmd, 1)) - return 0; -@@ -46,9 +46,9 @@ eeprom_read (unsigned char i2c_addr, unsigned char eeprom_offset, - // returns non-zero if successful, else 0 - unsigned char - eeprom_write (unsigned char i2c_addr, unsigned char eeprom_offset, -- const xdata unsigned char *buf, unsigned char len) -+ const __xdata unsigned char *buf, unsigned char len) - { -- static xdata unsigned char cmd[2]; -+ static __xdata unsigned char cmd[2]; - unsigned char ok; - - while (len-- > 0){ -diff --git a/firmware/fx2/b100/eeprom_io.h b/firmware/fx2/b100/eeprom_io.h -index 558017b..d1c4ee6 100644 ---- a/firmware/fx2/b100/eeprom_io.h -+++ b/firmware/fx2/b100/eeprom_io.h -@@ -27,12 +27,12 @@ - // returns non-zero if successful, else 0 - unsigned char - eeprom_read (unsigned char i2c_addr, unsigned char eeprom_offset, -- xdata unsigned char *buf, unsigned char len); -+ __xdata unsigned char *buf, unsigned char len); - - // returns non-zero if successful, else 0 - unsigned char - eeprom_write (unsigned char i2c_addr, unsigned char eeprom_offset, -- const xdata unsigned char *buf, unsigned char len); -+ const __xdata unsigned char *buf, unsigned char len); - - - #endif /* INCLUDED_EEPROM_IO_H */ -diff --git a/firmware/fx2/b100/fpga_load.c b/firmware/fx2/b100/fpga_load.c -index 394c9f5..6604de2 100644 ---- a/firmware/fx2/b100/fpga_load.c -+++ b/firmware/fx2/b100/fpga_load.c -@@ -82,9 +82,9 @@ clock_out_config_byte (unsigned char bits) - #else - - static void --clock_out_config_byte (unsigned char bits) _naked -+clock_out_config_byte (unsigned char bits) __naked - { -- _asm -+ __asm - mov a, dpl - - rlc a -@@ -129,14 +129,14 @@ clock_out_config_byte (unsigned char bits) _naked - - ret - -- _endasm; -+ __endasm; - } - - #endif - - static void - clock_out_bytes (unsigned char bytecount, -- unsigned char xdata *p) -+ unsigned char __xdata *p) - { - while (bytecount-- > 0) - clock_out_config_byte (*p++); -@@ -156,7 +156,7 @@ clock_out_bytes (unsigned char bytecount, - * ALTERA_NSTATUS = 1 (input) - */ - unsigned char --fpga_load_xfer (xdata unsigned char *p, unsigned char bytecount) -+fpga_load_xfer (__xdata unsigned char *p, unsigned char bytecount) - { - clock_out_bytes (bytecount, p); - return 1; -diff --git a/firmware/fx2/b100/fpga_rev2.c b/firmware/fx2/b100/fpga_rev2.c -index 326a017..6ceccab 100644 ---- a/firmware/fx2/b100/fpga_rev2.c -+++ b/firmware/fx2/b100/fpga_rev2.c -@@ -29,13 +29,13 @@ unsigned char g_tx_reset = 0; - unsigned char g_rx_reset = 0; - - void --fpga_write_reg (unsigned char regno, const xdata unsigned char *regval) -+fpga_write_reg (unsigned char regno, const __xdata unsigned char *regval) - { - //nop - } - - --static xdata unsigned char regval[4] = {0, 0, 0, 0}; -+static __xdata unsigned char regval[4] = {0, 0, 0, 0}; - - // Resets both AD9862's and the FPGA serial bus interface. - -diff --git a/firmware/fx2/b100/gpif.c b/firmware/fx2/b100/gpif.c -index b499e4f..0cba319 100644 ---- a/firmware/fx2/b100/gpif.c -+++ b/firmware/fx2/b100/gpif.c -@@ -156,7 +156,7 @@ - // END DO NOT EDIT - - // DO NOT EDIT ... --const char xdata WaveData[128] = -+const char __xdata WaveData[128] = - { - // Wave 0 - /* LenBr */ 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x07, -@@ -182,7 +182,7 @@ const char xdata WaveData[128] = - // END DO NOT EDIT - - // DO NOT EDIT ... --const char xdata FlowStates[36] = -+const char __xdata FlowStates[36] = - { - /* Wave 0 FlowStates */ 0x81,0x2D,0x0E,0x00,0x00,0x04,0x03,0x02,0x00, - /* Wave 1 FlowStates */ 0x81,0x2D,0x09,0x00,0x00,0x04,0x03,0x02,0x00, -@@ -192,7 +192,7 @@ const char xdata FlowStates[36] = - // END DO NOT EDIT - - // DO NOT EDIT ... --const char xdata InitData[7] = -+const char __xdata InitData[7] = - { - /* Regs */ 0xA0,0x00,0x00,0x00,0xEE,0x4E,0x00 - }; -diff --git a/firmware/fx2/b100/usrp_main.c b/firmware/fx2/b100/usrp_main.c -index 74427b7..a45287e 100644 ---- a/firmware/fx2/b100/usrp_main.c -+++ b/firmware/fx2/b100/usrp_main.c -@@ -54,14 +54,14 @@ unsigned char g_tx_enable = 0; - unsigned char g_rx_enable = 0; - unsigned char g_rx_overrun = 0; - unsigned char g_tx_underrun = 0; --bit enable_gpif = 0; -+__bit enable_gpif = 0; - - /* - * the host side fpga loader code pushes an MD5 hash of the bitstream - * into hash1. - */ - #define USRP_HASH_SIZE 16 --xdata at USRP_HASH_SLOT_1_ADDR unsigned char hash1[USRP_HASH_SIZE]; -+__xdata __at USRP_HASH_SLOT_1_ADDR unsigned char hash1[USRP_HASH_SIZE]; - - //void clear_fpga_data_fifo(void); - -@@ -220,7 +220,7 @@ main_loop (void) - * Toggle led 0 - */ - void --isr_tick (void) interrupt -+isr_tick (void) __interrupt - { - static unsigned char count = 1; - -@@ -239,8 +239,8 @@ isr_tick (void) interrupt - void - patch_usb_descriptors(void) - { -- static xdata unsigned char hw_rev; -- static xdata unsigned char serial_no[SERIAL_NO_LEN]; -+ static __xdata unsigned char hw_rev; -+ static __xdata unsigned char serial_no[SERIAL_NO_LEN]; - unsigned char i; - - eeprom_read(I2C_ADDR_BOOT, HW_REV_OFFSET, &hw_rev, 1); // LSB of device id -diff --git a/firmware/fx2/b100/usrp_regs.h b/firmware/fx2/b100/usrp_regs.h -index 3d65337..5646015 100644 ---- a/firmware/fx2/b100/usrp_regs.h -+++ b/firmware/fx2/b100/usrp_regs.h -@@ -59,11 +59,11 @@ - #define PORT_A_ADDR 0x80 - #define PORT_C_ADDR 0xA0 - --sbit at PORT_A_ADDR+0 bitALTERA_DCLK; // 0x80 is the bit address of PORT A --sbit at PORT_A_ADDR+1 bitALTERA_NCONFIG; --sbit at PORT_A_ADDR+3 bitALTERA_DATA0; -+__sbit __at PORT_A_ADDR+0 bitALTERA_DCLK; // 0x80 is the bit address of PORT A -+__sbit __at PORT_A_ADDR+1 bitALTERA_NCONFIG; -+__sbit __at PORT_A_ADDR+3 bitALTERA_DATA0; - --sbit at PORT_C_ADDR+7 bitALTERA_CONF_DONE; -+__sbit __at PORT_C_ADDR+7 bitALTERA_CONF_DONE; - - - /* Port B: GPIF FD[7:0] */ -diff --git a/firmware/fx2/common/delay.c b/firmware/fx2/common/delay.c -index 13cf0ee..f2e8307 100644 ---- a/firmware/fx2/common/delay.c -+++ b/firmware/fx2/common/delay.c -@@ -24,11 +24,11 @@ - * Delay approximately 1 microsecond (including overhead in udelay). - */ - static void --udelay1 (void) _naked -+udelay1 (void) __naked - { -- _asm ; lcall that got us here took 4 bus cycles -+ __asm ; lcall that got us here took 4 bus cycles - ret ; 4 bus cycles -- _endasm; -+ __endasm; - } - - /* -@@ -51,9 +51,9 @@ udelay (unsigned char usecs) - * but explains the factor of 4 problem below). - */ - static void --mdelay1 (void) _naked -+mdelay1 (void) __naked - { -- _asm -+ __asm - mov dptr,#(-1200 & 0xffff) - 002$: - inc dptr ; 3 bus cycles -@@ -62,7 +62,7 @@ mdelay1 (void) _naked - jnz 002$ ; 3 bus cycles - - ret -- _endasm; -+ __endasm; - } - - void -diff --git a/firmware/fx2/common/eeprom_init.c b/firmware/fx2/common/eeprom_init.c -index 07902dc..e30ba14 100644 ---- a/firmware/fx2/common/eeprom_init.c -+++ b/firmware/fx2/common/eeprom_init.c -@@ -28,7 +28,7 @@ - * into hash1. - */ - #define USRP_HASH_SIZE 16 --xdata at USRP_HASH_SLOT_0_ADDR unsigned char hash0[USRP_HASH_SIZE]; -+__xdata __at USRP_HASH_SLOT_0_ADDR unsigned char hash0[USRP_HASH_SIZE]; - - - #define REG_RX_PWR_DN 1 -diff --git a/firmware/fx2/common/fpga_load.h b/firmware/fx2/common/fpga_load.h -index 7c36a04..40ebf92 100644 ---- a/firmware/fx2/common/fpga_load.h -+++ b/firmware/fx2/common/fpga_load.h -@@ -22,7 +22,7 @@ - #define INCLUDED_FPGA_LOAD_H - - unsigned char fpga_load_begin (void); --unsigned char fpga_load_xfer (xdata unsigned char *p, unsigned char len); -+unsigned char fpga_load_xfer (__xdata unsigned char *p, unsigned char len); - unsigned char fpga_load_end (void); - - #endif /* INCLUDED_FPGA_LOAD_H */ -diff --git a/firmware/fx2/common/fx2regs.h b/firmware/fx2/common/fx2regs.h -index acbc0b8..67ad436 100644 ---- a/firmware/fx2/common/fx2regs.h -+++ b/firmware/fx2/common/fx2regs.h -@@ -48,14 +48,14 @@ - // The Ez-USB FX2 registers are defined here. We use FX2regs.h for register - // address allocation by using "#define ALLOCATE_EXTERN". - // When using "#define ALLOCATE_EXTERN", you get (for instance): --// xdata volatile BYTE OUT7BUF[64] _at_ 0x7B40; -+// __xdata volatile BYTE OUT7BUF[64] _at_ 0x7B40; - // Such lines are created from FX2.h by using the preprocessor. - // Incidently, these lines will not generate any space in the resulting hex - // file; they just bind the symbols to the addresses for compilation. - // You just need to put "#define ALLOCATE_EXTERN" in your main program file; - // i.e. fw.c or a stand-alone C source file. - // Without "#define ALLOCATE_EXTERN", you just get the external reference: --// extern xdata volatile BYTE OUT7BUF[64] ;// 0x7B40; -+// extern __xdata volatile BYTE OUT7BUF[64] ;// 0x7B40; - // This uses the concatenation operator "##" to insert a comment "//" - // to cut off the end of the line, "_at_ 0x7B40;", which is not wanted. - */ -@@ -63,7 +63,7 @@ - - #ifdef ALLOCATE_EXTERN - #define EXTERN --#define _AT_(a) at a -+#define _AT_(a) __at a - #else - #define EXTERN extern - #define _AT_ ;/ ## / -@@ -72,162 +72,162 @@ - typedef unsigned char BYTE; - typedef unsigned short WORD; - --EXTERN xdata _AT_(0xE400) volatile BYTE GPIF_WAVE_DATA[128]; --EXTERN xdata _AT_(0xE480) volatile BYTE RES_WAVEDATA_END ; -+EXTERN __xdata _AT_(0xE400) volatile BYTE GPIF_WAVE_DATA[128]; -+EXTERN __xdata _AT_(0xE480) volatile BYTE RES_WAVEDATA_END ; - - // General Configuration - --EXTERN xdata _AT_(0xE600) volatile BYTE CPUCS ; // Control & Status --EXTERN xdata _AT_(0xE601) volatile BYTE IFCONFIG ; // Interface Configuration --EXTERN xdata _AT_(0xE602) volatile BYTE PINFLAGSAB ; // FIFO FLAGA and FLAGB Assignments --EXTERN xdata _AT_(0xE603) volatile BYTE PINFLAGSCD ; // FIFO FLAGC and FLAGD Assignments --EXTERN xdata _AT_(0xE604) volatile BYTE FIFORESET ; // Restore FIFOS to default state --EXTERN xdata _AT_(0xE605) volatile BYTE BREAKPT ; // Breakpoint --EXTERN xdata _AT_(0xE606) volatile BYTE BPADDRH ; // Breakpoint Address H --EXTERN xdata _AT_(0xE607) volatile BYTE BPADDRL ; // Breakpoint Address L --EXTERN xdata _AT_(0xE608) volatile BYTE UART230 ; // 230 Kbaud clock for T0,T1,T2 --EXTERN xdata _AT_(0xE609) volatile BYTE FIFOPINPOLAR ; // FIFO polarities --EXTERN xdata _AT_(0xE60A) volatile BYTE REVID ; // Chip Revision --EXTERN xdata _AT_(0xE60B) volatile BYTE REVCTL ; // Chip Revision Control -+EXTERN __xdata _AT_(0xE600) volatile BYTE CPUCS ; // Control & Status -+EXTERN __xdata _AT_(0xE601) volatile BYTE IFCONFIG ; // Interface Configuration -+EXTERN __xdata _AT_(0xE602) volatile BYTE PINFLAGSAB ; // FIFO FLAGA and FLAGB Assignments -+EXTERN __xdata _AT_(0xE603) volatile BYTE PINFLAGSCD ; // FIFO FLAGC and FLAGD Assignments -+EXTERN __xdata _AT_(0xE604) volatile BYTE FIFORESET ; // Restore FIFOS to default state -+EXTERN __xdata _AT_(0xE605) volatile BYTE BREAKPT ; // Breakpoint -+EXTERN __xdata _AT_(0xE606) volatile BYTE BPADDRH ; // Breakpoint Address H -+EXTERN __xdata _AT_(0xE607) volatile BYTE BPADDRL ; // Breakpoint Address L -+EXTERN __xdata _AT_(0xE608) volatile BYTE UART230 ; // 230 Kbaud clock for T0,T1,T2 -+EXTERN __xdata _AT_(0xE609) volatile BYTE FIFOPINPOLAR ; // FIFO polarities -+EXTERN __xdata _AT_(0xE60A) volatile BYTE REVID ; // Chip Revision -+EXTERN __xdata _AT_(0xE60B) volatile BYTE REVCTL ; // Chip Revision Control - - // Endpoint Configuration --EXTERN xdata _AT_(0xE610) volatile BYTE EP1OUTCFG ; // Endpoint 1-OUT Configuration --EXTERN xdata _AT_(0xE611) volatile BYTE EP1INCFG ; // Endpoint 1-IN Configuration --EXTERN xdata _AT_(0xE612) volatile BYTE EP2CFG ; // Endpoint 2 Configuration --EXTERN xdata _AT_(0xE613) volatile BYTE EP4CFG ; // Endpoint 4 Configuration --EXTERN xdata _AT_(0xE614) volatile BYTE EP6CFG ; // Endpoint 6 Configuration --EXTERN xdata _AT_(0xE615) volatile BYTE EP8CFG ; // Endpoint 8 Configuration --EXTERN xdata _AT_(0xE618) volatile BYTE EP2FIFOCFG ; // Endpoint 2 FIFO configuration --EXTERN xdata _AT_(0xE619) volatile BYTE EP4FIFOCFG ; // Endpoint 4 FIFO configuration --EXTERN xdata _AT_(0xE61A) volatile BYTE EP6FIFOCFG ; // Endpoint 6 FIFO configuration --EXTERN xdata _AT_(0xE61B) volatile BYTE EP8FIFOCFG ; // Endpoint 8 FIFO configuration --EXTERN xdata _AT_(0xE620) volatile BYTE EP2AUTOINLENH ; // Endpoint 2 Packet Length H (IN only) --EXTERN xdata _AT_(0xE621) volatile BYTE EP2AUTOINLENL ; // Endpoint 2 Packet Length L (IN only) --EXTERN xdata _AT_(0xE622) volatile BYTE EP4AUTOINLENH ; // Endpoint 4 Packet Length H (IN only) --EXTERN xdata _AT_(0xE623) volatile BYTE EP4AUTOINLENL ; // Endpoint 4 Packet Length L (IN only) --EXTERN xdata _AT_(0xE624) volatile BYTE EP6AUTOINLENH ; // Endpoint 6 Packet Length H (IN only) --EXTERN xdata _AT_(0xE625) volatile BYTE EP6AUTOINLENL ; // Endpoint 6 Packet Length L (IN only) --EXTERN xdata _AT_(0xE626) volatile BYTE EP8AUTOINLENH ; // Endpoint 8 Packet Length H (IN only) --EXTERN xdata _AT_(0xE627) volatile BYTE EP8AUTOINLENL ; // Endpoint 8 Packet Length L (IN only) --EXTERN xdata _AT_(0xE630) volatile BYTE EP2FIFOPFH ; // EP2 Programmable Flag trigger H --EXTERN xdata _AT_(0xE631) volatile BYTE EP2FIFOPFL ; // EP2 Programmable Flag trigger L --EXTERN xdata _AT_(0xE632) volatile BYTE EP4FIFOPFH ; // EP4 Programmable Flag trigger H --EXTERN xdata _AT_(0xE633) volatile BYTE EP4FIFOPFL ; // EP4 Programmable Flag trigger L --EXTERN xdata _AT_(0xE634) volatile BYTE EP6FIFOPFH ; // EP6 Programmable Flag trigger H --EXTERN xdata _AT_(0xE635) volatile BYTE EP6FIFOPFL ; // EP6 Programmable Flag trigger L --EXTERN xdata _AT_(0xE636) volatile BYTE EP8FIFOPFH ; // EP8 Programmable Flag trigger H --EXTERN xdata _AT_(0xE637) volatile BYTE EP8FIFOPFL ; // EP8 Programmable Flag trigger L --EXTERN xdata _AT_(0xE640) volatile BYTE EP2ISOINPKTS ; // EP2 (if ISO) IN Packets per frame (1-3) --EXTERN xdata _AT_(0xE641) volatile BYTE EP4ISOINPKTS ; // EP4 (if ISO) IN Packets per frame (1-3) --EXTERN xdata _AT_(0xE642) volatile BYTE EP6ISOINPKTS ; // EP6 (if ISO) IN Packets per frame (1-3) --EXTERN xdata _AT_(0xE643) volatile BYTE EP8ISOINPKTS ; // EP8 (if ISO) IN Packets per frame (1-3) --EXTERN xdata _AT_(0xE648) volatile BYTE INPKTEND ; // Force IN Packet End --EXTERN xdata _AT_(0xE649) volatile BYTE OUTPKTEND ; // Force OUT Packet End -+EXTERN __xdata _AT_(0xE610) volatile BYTE EP1OUTCFG ; // Endpoint 1-OUT Configuration -+EXTERN __xdata _AT_(0xE611) volatile BYTE EP1INCFG ; // Endpoint 1-IN Configuration -+EXTERN __xdata _AT_(0xE612) volatile BYTE EP2CFG ; // Endpoint 2 Configuration -+EXTERN __xdata _AT_(0xE613) volatile BYTE EP4CFG ; // Endpoint 4 Configuration -+EXTERN __xdata _AT_(0xE614) volatile BYTE EP6CFG ; // Endpoint 6 Configuration -+EXTERN __xdata _AT_(0xE615) volatile BYTE EP8CFG ; // Endpoint 8 Configuration -+EXTERN __xdata _AT_(0xE618) volatile BYTE EP2FIFOCFG ; // Endpoint 2 FIFO configuration -+EXTERN __xdata _AT_(0xE619) volatile BYTE EP4FIFOCFG ; // Endpoint 4 FIFO configuration -+EXTERN __xdata _AT_(0xE61A) volatile BYTE EP6FIFOCFG ; // Endpoint 6 FIFO configuration -+EXTERN __xdata _AT_(0xE61B) volatile BYTE EP8FIFOCFG ; // Endpoint 8 FIFO configuration -+EXTERN __xdata _AT_(0xE620) volatile BYTE EP2AUTOINLENH ; // Endpoint 2 Packet Length H (IN only) -+EXTERN __xdata _AT_(0xE621) volatile BYTE EP2AUTOINLENL ; // Endpoint 2 Packet Length L (IN only) -+EXTERN __xdata _AT_(0xE622) volatile BYTE EP4AUTOINLENH ; // Endpoint 4 Packet Length H (IN only) -+EXTERN __xdata _AT_(0xE623) volatile BYTE EP4AUTOINLENL ; // Endpoint 4 Packet Length L (IN only) -+EXTERN __xdata _AT_(0xE624) volatile BYTE EP6AUTOINLENH ; // Endpoint 6 Packet Length H (IN only) -+EXTERN __xdata _AT_(0xE625) volatile BYTE EP6AUTOINLENL ; // Endpoint 6 Packet Length L (IN only) -+EXTERN __xdata _AT_(0xE626) volatile BYTE EP8AUTOINLENH ; // Endpoint 8 Packet Length H (IN only) -+EXTERN __xdata _AT_(0xE627) volatile BYTE EP8AUTOINLENL ; // Endpoint 8 Packet Length L (IN only) -+EXTERN __xdata _AT_(0xE630) volatile BYTE EP2FIFOPFH ; // EP2 Programmable Flag trigger H -+EXTERN __xdata _AT_(0xE631) volatile BYTE EP2FIFOPFL ; // EP2 Programmable Flag trigger L -+EXTERN __xdata _AT_(0xE632) volatile BYTE EP4FIFOPFH ; // EP4 Programmable Flag trigger H -+EXTERN __xdata _AT_(0xE633) volatile BYTE EP4FIFOPFL ; // EP4 Programmable Flag trigger L -+EXTERN __xdata _AT_(0xE634) volatile BYTE EP6FIFOPFH ; // EP6 Programmable Flag trigger H -+EXTERN __xdata _AT_(0xE635) volatile BYTE EP6FIFOPFL ; // EP6 Programmable Flag trigger L -+EXTERN __xdata _AT_(0xE636) volatile BYTE EP8FIFOPFH ; // EP8 Programmable Flag trigger H -+EXTERN __xdata _AT_(0xE637) volatile BYTE EP8FIFOPFL ; // EP8 Programmable Flag trigger L -+EXTERN __xdata _AT_(0xE640) volatile BYTE EP2ISOINPKTS ; // EP2 (if ISO) IN Packets per frame (1-3) -+EXTERN __xdata _AT_(0xE641) volatile BYTE EP4ISOINPKTS ; // EP4 (if ISO) IN Packets per frame (1-3) -+EXTERN __xdata _AT_(0xE642) volatile BYTE EP6ISOINPKTS ; // EP6 (if ISO) IN Packets per frame (1-3) -+EXTERN __xdata _AT_(0xE643) volatile BYTE EP8ISOINPKTS ; // EP8 (if ISO) IN Packets per frame (1-3) -+EXTERN __xdata _AT_(0xE648) volatile BYTE INPKTEND ; // Force IN Packet End -+EXTERN __xdata _AT_(0xE649) volatile BYTE OUTPKTEND ; // Force OUT Packet End - - // Interrupts - --EXTERN xdata _AT_(0xE650) volatile BYTE EP2FIFOIE ; // Endpoint 2 Flag Interrupt Enable --EXTERN xdata _AT_(0xE651) volatile BYTE EP2FIFOIRQ ; // Endpoint 2 Flag Interrupt Request --EXTERN xdata _AT_(0xE652) volatile BYTE EP4FIFOIE ; // Endpoint 4 Flag Interrupt Enable --EXTERN xdata _AT_(0xE653) volatile BYTE EP4FIFOIRQ ; // Endpoint 4 Flag Interrupt Request --EXTERN xdata _AT_(0xE654) volatile BYTE EP6FIFOIE ; // Endpoint 6 Flag Interrupt Enable --EXTERN xdata _AT_(0xE655) volatile BYTE EP6FIFOIRQ ; // Endpoint 6 Flag Interrupt Request --EXTERN xdata _AT_(0xE656) volatile BYTE EP8FIFOIE ; // Endpoint 8 Flag Interrupt Enable --EXTERN xdata _AT_(0xE657) volatile BYTE EP8FIFOIRQ ; // Endpoint 8 Flag Interrupt Request --EXTERN xdata _AT_(0xE658) volatile BYTE IBNIE ; // IN-BULK-NAK Interrupt Enable --EXTERN xdata _AT_(0xE659) volatile BYTE IBNIRQ ; // IN-BULK-NAK interrupt Request --EXTERN xdata _AT_(0xE65A) volatile BYTE NAKIE ; // Endpoint Ping NAK interrupt Enable --EXTERN xdata _AT_(0xE65B) volatile BYTE NAKIRQ ; // Endpoint Ping NAK interrupt Request --EXTERN xdata _AT_(0xE65C) volatile BYTE USBIE ; // USB Int Enables --EXTERN xdata _AT_(0xE65D) volatile BYTE USBIRQ ; // USB Interrupt Requests --EXTERN xdata _AT_(0xE65E) volatile BYTE EPIE ; // Endpoint Interrupt Enables --EXTERN xdata _AT_(0xE65F) volatile BYTE EPIRQ ; // Endpoint Interrupt Requests --EXTERN xdata _AT_(0xE660) volatile BYTE GPIFIE ; // GPIF Interrupt Enable --EXTERN xdata _AT_(0xE661) volatile BYTE GPIFIRQ ; // GPIF Interrupt Request --EXTERN xdata _AT_(0xE662) volatile BYTE USBERRIE ; // USB Error Interrupt Enables --EXTERN xdata _AT_(0xE663) volatile BYTE USBERRIRQ ; // USB Error Interrupt Requests --EXTERN xdata _AT_(0xE664) volatile BYTE ERRCNTLIM ; // USB Error counter and limit --EXTERN xdata _AT_(0xE665) volatile BYTE CLRERRCNT ; // Clear Error Counter EC[3..0] --EXTERN xdata _AT_(0xE666) volatile BYTE INT2IVEC ; // Interupt 2 (USB) Autovector --EXTERN xdata _AT_(0xE667) volatile BYTE INT4IVEC ; // Interupt 4 (FIFOS & GPIF) Autovector --EXTERN xdata _AT_(0xE668) volatile BYTE INTSETUP ; // Interrupt 2&4 Setup -+EXTERN __xdata _AT_(0xE650) volatile BYTE EP2FIFOIE ; // Endpoint 2 Flag Interrupt Enable -+EXTERN __xdata _AT_(0xE651) volatile BYTE EP2FIFOIRQ ; // Endpoint 2 Flag Interrupt Request -+EXTERN __xdata _AT_(0xE652) volatile BYTE EP4FIFOIE ; // Endpoint 4 Flag Interrupt Enable -+EXTERN __xdata _AT_(0xE653) volatile BYTE EP4FIFOIRQ ; // Endpoint 4 Flag Interrupt Request -+EXTERN __xdata _AT_(0xE654) volatile BYTE EP6FIFOIE ; // Endpoint 6 Flag Interrupt Enable -+EXTERN __xdata _AT_(0xE655) volatile BYTE EP6FIFOIRQ ; // Endpoint 6 Flag Interrupt Request -+EXTERN __xdata _AT_(0xE656) volatile BYTE EP8FIFOIE ; // Endpoint 8 Flag Interrupt Enable -+EXTERN __xdata _AT_(0xE657) volatile BYTE EP8FIFOIRQ ; // Endpoint 8 Flag Interrupt Request -+EXTERN __xdata _AT_(0xE658) volatile BYTE IBNIE ; // IN-BULK-NAK Interrupt Enable -+EXTERN __xdata _AT_(0xE659) volatile BYTE IBNIRQ ; // IN-BULK-NAK interrupt Request -+EXTERN __xdata _AT_(0xE65A) volatile BYTE NAKIE ; // Endpoint Ping NAK interrupt Enable -+EXTERN __xdata _AT_(0xE65B) volatile BYTE NAKIRQ ; // Endpoint Ping NAK interrupt Request -+EXTERN __xdata _AT_(0xE65C) volatile BYTE USBIE ; // USB Int Enables -+EXTERN __xdata _AT_(0xE65D) volatile BYTE USBIRQ ; // USB Interrupt Requests -+EXTERN __xdata _AT_(0xE65E) volatile BYTE EPIE ; // Endpoint Interrupt Enables -+EXTERN __xdata _AT_(0xE65F) volatile BYTE EPIRQ ; // Endpoint Interrupt Requests -+EXTERN __xdata _AT_(0xE660) volatile BYTE GPIFIE ; // GPIF Interrupt Enable -+EXTERN __xdata _AT_(0xE661) volatile BYTE GPIFIRQ ; // GPIF Interrupt Request -+EXTERN __xdata _AT_(0xE662) volatile BYTE USBERRIE ; // USB Error Interrupt Enables -+EXTERN __xdata _AT_(0xE663) volatile BYTE USBERRIRQ ; // USB Error Interrupt Requests -+EXTERN __xdata _AT_(0xE664) volatile BYTE ERRCNTLIM ; // USB Error counter and limit -+EXTERN __xdata _AT_(0xE665) volatile BYTE CLRERRCNT ; // Clear Error Counter EC[3..0] -+EXTERN __xdata _AT_(0xE666) volatile BYTE INT2IVEC ; // Interupt 2 (USB) Autovector -+EXTERN __xdata _AT_(0xE667) volatile BYTE INT4IVEC ; // Interupt 4 (FIFOS & GPIF) Autovector -+EXTERN __xdata _AT_(0xE668) volatile BYTE INTSETUP ; // Interrupt 2&4 Setup - - // Input/Output - --EXTERN xdata _AT_(0xE670) volatile BYTE PORTACFG ; // I/O PORTA Alternate Configuration --EXTERN xdata _AT_(0xE671) volatile BYTE PORTCCFG ; // I/O PORTC Alternate Configuration --EXTERN xdata _AT_(0xE672) volatile BYTE PORTECFG ; // I/O PORTE Alternate Configuration --EXTERN xdata _AT_(0xE678) volatile BYTE I2CS ; // Control & Status --EXTERN xdata _AT_(0xE679) volatile BYTE I2DAT ; // Data --EXTERN xdata _AT_(0xE67A) volatile BYTE I2CTL ; // I2C Control --EXTERN xdata _AT_(0xE67B) volatile BYTE XAUTODAT1 ; // Autoptr1 MOVX access --EXTERN xdata _AT_(0xE67C) volatile BYTE XAUTODAT2 ; // Autoptr2 MOVX access -+EXTERN __xdata _AT_(0xE670) volatile BYTE PORTACFG ; // I/O PORTA Alternate Configuration -+EXTERN __xdata _AT_(0xE671) volatile BYTE PORTCCFG ; // I/O PORTC Alternate Configuration -+EXTERN __xdata _AT_(0xE672) volatile BYTE PORTECFG ; // I/O PORTE Alternate Configuration -+EXTERN __xdata _AT_(0xE678) volatile BYTE I2CS ; // Control & Status -+EXTERN __xdata _AT_(0xE679) volatile BYTE I2DAT ; // Data -+EXTERN __xdata _AT_(0xE67A) volatile BYTE I2CTL ; // I2C Control -+EXTERN __xdata _AT_(0xE67B) volatile BYTE XAUTODAT1 ; // Autoptr1 MOVX access -+EXTERN __xdata _AT_(0xE67C) volatile BYTE XAUTODAT2 ; // Autoptr2 MOVX access - - #define EXTAUTODAT1 XAUTODAT1 - #define EXTAUTODAT2 XAUTODAT2 - - // USB Control - --EXTERN xdata _AT_(0xE680) volatile BYTE USBCS ; // USB Control & Status --EXTERN xdata _AT_(0xE681) volatile BYTE SUSPEND ; // Put chip into suspend --EXTERN xdata _AT_(0xE682) volatile BYTE WAKEUPCS ; // Wakeup source and polarity --EXTERN xdata _AT_(0xE683) volatile BYTE TOGCTL ; // Toggle Control --EXTERN xdata _AT_(0xE684) volatile BYTE USBFRAMEH ; // USB Frame count H --EXTERN xdata _AT_(0xE685) volatile BYTE USBFRAMEL ; // USB Frame count L --EXTERN xdata _AT_(0xE686) volatile BYTE MICROFRAME ; // Microframe count, 0-7 --EXTERN xdata _AT_(0xE687) volatile BYTE FNADDR ; // USB Function address -+EXTERN __xdata _AT_(0xE680) volatile BYTE USBCS ; // USB Control & Status -+EXTERN __xdata _AT_(0xE681) volatile BYTE SUSPEND ; // Put chip into suspend -+EXTERN __xdata _AT_(0xE682) volatile BYTE WAKEUPCS ; // Wakeup source and polarity -+EXTERN __xdata _AT_(0xE683) volatile BYTE TOGCTL ; // Toggle Control -+EXTERN __xdata _AT_(0xE684) volatile BYTE USBFRAMEH ; // USB Frame count H -+EXTERN __xdata _AT_(0xE685) volatile BYTE USBFRAMEL ; // USB Frame count L -+EXTERN __xdata _AT_(0xE686) volatile BYTE MICROFRAME ; // Microframe count, 0-7 -+EXTERN __xdata _AT_(0xE687) volatile BYTE FNADDR ; // USB Function address - - // Endpoints - --EXTERN xdata _AT_(0xE68A) volatile BYTE EP0BCH ; // Endpoint 0 Byte Count H --EXTERN xdata _AT_(0xE68B) volatile BYTE EP0BCL ; // Endpoint 0 Byte Count L --EXTERN xdata _AT_(0xE68D) volatile BYTE EP1OUTBC ; // Endpoint 1 OUT Byte Count --EXTERN xdata _AT_(0xE68F) volatile BYTE EP1INBC ; // Endpoint 1 IN Byte Count --EXTERN xdata _AT_(0xE690) volatile BYTE EP2BCH ; // Endpoint 2 Byte Count H --EXTERN xdata _AT_(0xE691) volatile BYTE EP2BCL ; // Endpoint 2 Byte Count L --EXTERN xdata _AT_(0xE694) volatile BYTE EP4BCH ; // Endpoint 4 Byte Count H --EXTERN xdata _AT_(0xE695) volatile BYTE EP4BCL ; // Endpoint 4 Byte Count L --EXTERN xdata _AT_(0xE698) volatile BYTE EP6BCH ; // Endpoint 6 Byte Count H --EXTERN xdata _AT_(0xE699) volatile BYTE EP6BCL ; // Endpoint 6 Byte Count L --EXTERN xdata _AT_(0xE69C) volatile BYTE EP8BCH ; // Endpoint 8 Byte Count H --EXTERN xdata _AT_(0xE69D) volatile BYTE EP8BCL ; // Endpoint 8 Byte Count L --EXTERN xdata _AT_(0xE6A0) volatile BYTE EP0CS ; // Endpoint Control and Status --EXTERN xdata _AT_(0xE6A1) volatile BYTE EP1OUTCS ; // Endpoint 1 OUT Control and Status --EXTERN xdata _AT_(0xE6A2) volatile BYTE EP1INCS ; // Endpoint 1 IN Control and Status --EXTERN xdata _AT_(0xE6A3) volatile BYTE EP2CS ; // Endpoint 2 Control and Status --EXTERN xdata _AT_(0xE6A4) volatile BYTE EP4CS ; // Endpoint 4 Control and Status --EXTERN xdata _AT_(0xE6A5) volatile BYTE EP6CS ; // Endpoint 6 Control and Status --EXTERN xdata _AT_(0xE6A6) volatile BYTE EP8CS ; // Endpoint 8 Control and Status --EXTERN xdata _AT_(0xE6A7) volatile BYTE EP2FIFOFLGS ; // Endpoint 2 Flags --EXTERN xdata _AT_(0xE6A8) volatile BYTE EP4FIFOFLGS ; // Endpoint 4 Flags --EXTERN xdata _AT_(0xE6A9) volatile BYTE EP6FIFOFLGS ; // Endpoint 6 Flags --EXTERN xdata _AT_(0xE6AA) volatile BYTE EP8FIFOFLGS ; // Endpoint 8 Flags --EXTERN xdata _AT_(0xE6AB) volatile BYTE EP2FIFOBCH ; // EP2 FIFO total byte count H --EXTERN xdata _AT_(0xE6AC) volatile BYTE EP2FIFOBCL ; // EP2 FIFO total byte count L --EXTERN xdata _AT_(0xE6AD) volatile BYTE EP4FIFOBCH ; // EP4 FIFO total byte count H --EXTERN xdata _AT_(0xE6AE) volatile BYTE EP4FIFOBCL ; // EP4 FIFO total byte count L --EXTERN xdata _AT_(0xE6AF) volatile BYTE EP6FIFOBCH ; // EP6 FIFO total byte count H --EXTERN xdata _AT_(0xE6B0) volatile BYTE EP6FIFOBCL ; // EP6 FIFO total byte count L --EXTERN xdata _AT_(0xE6B1) volatile BYTE EP8FIFOBCH ; // EP8 FIFO total byte count H --EXTERN xdata _AT_(0xE6B2) volatile BYTE EP8FIFOBCL ; // EP8 FIFO total byte count L --EXTERN xdata _AT_(0xE6B3) volatile BYTE SUDPTRH ; // Setup Data Pointer high address byte --EXTERN xdata _AT_(0xE6B4) volatile BYTE SUDPTRL ; // Setup Data Pointer low address byte --EXTERN xdata _AT_(0xE6B5) volatile BYTE SUDPTRCTL ; // Setup Data Pointer Auto Mode --EXTERN xdata _AT_(0xE6B8) volatile BYTE SETUPDAT[8] ; // 8 bytes of SETUP data -+EXTERN __xdata _AT_(0xE68A) volatile BYTE EP0BCH ; // Endpoint 0 Byte Count H -+EXTERN __xdata _AT_(0xE68B) volatile BYTE EP0BCL ; // Endpoint 0 Byte Count L -+EXTERN __xdata _AT_(0xE68D) volatile BYTE EP1OUTBC ; // Endpoint 1 OUT Byte Count -+EXTERN __xdata _AT_(0xE68F) volatile BYTE EP1INBC ; // Endpoint 1 IN Byte Count -+EXTERN __xdata _AT_(0xE690) volatile BYTE EP2BCH ; // Endpoint 2 Byte Count H -+EXTERN __xdata _AT_(0xE691) volatile BYTE EP2BCL ; // Endpoint 2 Byte Count L -+EXTERN __xdata _AT_(0xE694) volatile BYTE EP4BCH ; // Endpoint 4 Byte Count H -+EXTERN __xdata _AT_(0xE695) volatile BYTE EP4BCL ; // Endpoint 4 Byte Count L -+EXTERN __xdata _AT_(0xE698) volatile BYTE EP6BCH ; // Endpoint 6 Byte Count H -+EXTERN __xdata _AT_(0xE699) volatile BYTE EP6BCL ; // Endpoint 6 Byte Count L -+EXTERN __xdata _AT_(0xE69C) volatile BYTE EP8BCH ; // Endpoint 8 Byte Count H -+EXTERN __xdata _AT_(0xE69D) volatile BYTE EP8BCL ; // Endpoint 8 Byte Count L -+EXTERN __xdata _AT_(0xE6A0) volatile BYTE EP0CS ; // Endpoint Control and Status -+EXTERN __xdata _AT_(0xE6A1) volatile BYTE EP1OUTCS ; // Endpoint 1 OUT Control and Status -+EXTERN __xdata _AT_(0xE6A2) volatile BYTE EP1INCS ; // Endpoint 1 IN Control and Status -+EXTERN __xdata _AT_(0xE6A3) volatile BYTE EP2CS ; // Endpoint 2 Control and Status -+EXTERN __xdata _AT_(0xE6A4) volatile BYTE EP4CS ; // Endpoint 4 Control and Status -+EXTERN __xdata _AT_(0xE6A5) volatile BYTE EP6CS ; // Endpoint 6 Control and Status -+EXTERN __xdata _AT_(0xE6A6) volatile BYTE EP8CS ; // Endpoint 8 Control and Status -+EXTERN __xdata _AT_(0xE6A7) volatile BYTE EP2FIFOFLGS ; // Endpoint 2 Flags -+EXTERN __xdata _AT_(0xE6A8) volatile BYTE EP4FIFOFLGS ; // Endpoint 4 Flags -+EXTERN __xdata _AT_(0xE6A9) volatile BYTE EP6FIFOFLGS ; // Endpoint 6 Flags -+EXTERN __xdata _AT_(0xE6AA) volatile BYTE EP8FIFOFLGS ; // Endpoint 8 Flags -+EXTERN __xdata _AT_(0xE6AB) volatile BYTE EP2FIFOBCH ; // EP2 FIFO total byte count H -+EXTERN __xdata _AT_(0xE6AC) volatile BYTE EP2FIFOBCL ; // EP2 FIFO total byte count L -+EXTERN __xdata _AT_(0xE6AD) volatile BYTE EP4FIFOBCH ; // EP4 FIFO total byte count H -+EXTERN __xdata _AT_(0xE6AE) volatile BYTE EP4FIFOBCL ; // EP4 FIFO total byte count L -+EXTERN __xdata _AT_(0xE6AF) volatile BYTE EP6FIFOBCH ; // EP6 FIFO total byte count H -+EXTERN __xdata _AT_(0xE6B0) volatile BYTE EP6FIFOBCL ; // EP6 FIFO total byte count L -+EXTERN __xdata _AT_(0xE6B1) volatile BYTE EP8FIFOBCH ; // EP8 FIFO total byte count H -+EXTERN __xdata _AT_(0xE6B2) volatile BYTE EP8FIFOBCL ; // EP8 FIFO total byte count L -+EXTERN __xdata _AT_(0xE6B3) volatile BYTE SUDPTRH ; // Setup Data Pointer high address byte -+EXTERN __xdata _AT_(0xE6B4) volatile BYTE SUDPTRL ; // Setup Data Pointer low address byte -+EXTERN __xdata _AT_(0xE6B5) volatile BYTE SUDPTRCTL ; // Setup Data Pointer Auto Mode -+EXTERN __xdata _AT_(0xE6B8) volatile BYTE SETUPDAT[8] ; // 8 bytes of SETUP data - - // GPIF - --EXTERN xdata _AT_(0xE6C0) volatile BYTE GPIFWFSELECT ; // Waveform Selector --EXTERN xdata _AT_(0xE6C1) volatile BYTE GPIFIDLECS ; // GPIF Done, GPIF IDLE drive mode --EXTERN xdata _AT_(0xE6C2) volatile BYTE GPIFIDLECTL ; // Inactive Bus, CTL states --EXTERN xdata _AT_(0xE6C3) volatile BYTE GPIFCTLCFG ; // CTL OUT pin drive --EXTERN xdata _AT_(0xE6C4) volatile BYTE GPIFADRH ; // GPIF Address H --EXTERN xdata _AT_(0xE6C5) volatile BYTE GPIFADRL ; // GPIF Address L -+EXTERN __xdata _AT_(0xE6C0) volatile BYTE GPIFWFSELECT ; // Waveform Selector -+EXTERN __xdata _AT_(0xE6C1) volatile BYTE GPIFIDLECS ; // GPIF Done, GPIF IDLE drive mode -+EXTERN __xdata _AT_(0xE6C2) volatile BYTE GPIFIDLECTL ; // Inactive Bus, CTL states -+EXTERN __xdata _AT_(0xE6C3) volatile BYTE GPIFCTLCFG ; // CTL OUT pin drive -+EXTERN __xdata _AT_(0xE6C4) volatile BYTE GPIFADRH ; // GPIF Address H -+EXTERN __xdata _AT_(0xE6C5) volatile BYTE GPIFADRL ; // GPIF Address L - --EXTERN xdata _AT_(0xE6CE) volatile BYTE GPIFTCB3 ; // GPIF Transaction Count Byte 3 --EXTERN xdata _AT_(0xE6CF) volatile BYTE GPIFTCB2 ; // GPIF Transaction Count Byte 2 --EXTERN xdata _AT_(0xE6D0) volatile BYTE GPIFTCB1 ; // GPIF Transaction Count Byte 1 --EXTERN xdata _AT_(0xE6D1) volatile BYTE GPIFTCB0 ; // GPIF Transaction Count Byte 0 -+EXTERN __xdata _AT_(0xE6CE) volatile BYTE GPIFTCB3 ; // GPIF Transaction Count Byte 3 -+EXTERN __xdata _AT_(0xE6CF) volatile BYTE GPIFTCB2 ; // GPIF Transaction Count Byte 2 -+EXTERN __xdata _AT_(0xE6D0) volatile BYTE GPIFTCB1 ; // GPIF Transaction Count Byte 1 -+EXTERN __xdata _AT_(0xE6D1) volatile BYTE GPIFTCB0 ; // GPIF Transaction Count Byte 0 - - #define EP2GPIFTCH GPIFTCB1 // these are here for backwards compatibility - #define EP2GPIFTCL GPIFTCB0 // before REVE silicon (ie. REVB and REVD) -@@ -238,68 +238,68 @@ EXTERN xdata _AT_(0xE6D1) volatile BYTE GPIFTCB0 ; // GPIF Transaction - #define EP8GPIFTCH GPIFTCB1 // these are here for backwards compatibility - #define EP8GPIFTCL GPIFTCB0 // before REVE silicon (ie. REVB and REVD) - --// EXTERN xdata volatile BYTE EP2GPIFTCH _AT_ 0xE6D0; // EP2 GPIF Transaction Count High --// EXTERN xdata volatile BYTE EP2GPIFTCL _AT_ 0xE6D1; // EP2 GPIF Transaction Count Low --EXTERN xdata _AT_(0xE6D2) volatile BYTE EP2GPIFFLGSEL ; // EP2 GPIF Flag select --EXTERN xdata _AT_(0xE6D3) volatile BYTE EP2GPIFPFSTOP ; // Stop GPIF EP2 transaction on prog. flag --EXTERN xdata _AT_(0xE6D4) volatile BYTE EP2GPIFTRIG ; // EP2 FIFO Trigger --// EXTERN xdata volatile BYTE EP4GPIFTCH _AT_ 0xE6D8; // EP4 GPIF Transaction Count High --// EXTERN xdata volatile BYTE EP4GPIFTCL _AT_ 0xE6D9; // EP4 GPIF Transactionr Count Low --EXTERN xdata _AT_(0xE6DA) volatile BYTE EP4GPIFFLGSEL ; // EP4 GPIF Flag select --EXTERN xdata _AT_(0xE6DB) volatile BYTE EP4GPIFPFSTOP ; // Stop GPIF EP4 transaction on prog. flag --EXTERN xdata _AT_(0xE6DC) volatile BYTE EP4GPIFTRIG ; // EP4 FIFO Trigger --// EXTERN xdata volatile BYTE EP6GPIFTCH _AT_ 0xE6E0; // EP6 GPIF Transaction Count High --// EXTERN xdata volatile BYTE EP6GPIFTCL _AT_ 0xE6E1; // EP6 GPIF Transaction Count Low --EXTERN xdata _AT_(0xE6E2) volatile BYTE EP6GPIFFLGSEL ; // EP6 GPIF Flag select --EXTERN xdata _AT_(0xE6E3) volatile BYTE EP6GPIFPFSTOP ; // Stop GPIF EP6 transaction on prog. flag --EXTERN xdata _AT_(0xE6E4) volatile BYTE EP6GPIFTRIG ; // EP6 FIFO Trigger --// EXTERN xdata volatile BYTE EP8GPIFTCH _AT_ 0xE6E8; // EP8 GPIF Transaction Count High --// EXTERN xdata volatile BYTE EP8GPIFTCL _AT_ 0xE6E9; // EP8GPIF Transaction Count Low --EXTERN xdata _AT_(0xE6EA) volatile BYTE EP8GPIFFLGSEL ; // EP8 GPIF Flag select --EXTERN xdata _AT_(0xE6EB) volatile BYTE EP8GPIFPFSTOP ; // Stop GPIF EP8 transaction on prog. flag --EXTERN xdata _AT_(0xE6EC) volatile BYTE EP8GPIFTRIG ; // EP8 FIFO Trigger --EXTERN xdata _AT_(0xE6F0) volatile BYTE XGPIFSGLDATH ; // GPIF Data H (16-bit mode only) --EXTERN xdata _AT_(0xE6F1) volatile BYTE XGPIFSGLDATLX ; // Read/Write GPIF Data L & trigger transac --EXTERN xdata _AT_(0xE6F2) volatile BYTE XGPIFSGLDATLNOX ; // Read GPIF Data L, no transac trigger --EXTERN xdata _AT_(0xE6F3) volatile BYTE GPIFREADYCFG ; // Internal RDY,Sync/Async, RDY5CFG --EXTERN xdata _AT_(0xE6F4) volatile BYTE GPIFREADYSTAT ; // RDY pin states --EXTERN xdata _AT_(0xE6F5) volatile BYTE GPIFABORT ; // Abort GPIF cycles -+// EXTERN __xdata volatile BYTE EP2GPIFTCH _AT_ 0xE6D0; // EP2 GPIF Transaction Count High -+// EXTERN __xdata volatile BYTE EP2GPIFTCL _AT_ 0xE6D1; // EP2 GPIF Transaction Count Low -+EXTERN __xdata _AT_(0xE6D2) volatile BYTE EP2GPIFFLGSEL ; // EP2 GPIF Flag select -+EXTERN __xdata _AT_(0xE6D3) volatile BYTE EP2GPIFPFSTOP ; // Stop GPIF EP2 transaction on prog. flag -+EXTERN __xdata _AT_(0xE6D4) volatile BYTE EP2GPIFTRIG ; // EP2 FIFO Trigger -+// EXTERN __xdata volatile BYTE EP4GPIFTCH _AT_ 0xE6D8; // EP4 GPIF Transaction Count High -+// EXTERN __xdata volatile BYTE EP4GPIFTCL _AT_ 0xE6D9; // EP4 GPIF Transactionr Count Low -+EXTERN __xdata _AT_(0xE6DA) volatile BYTE EP4GPIFFLGSEL ; // EP4 GPIF Flag select -+EXTERN __xdata _AT_(0xE6DB) volatile BYTE EP4GPIFPFSTOP ; // Stop GPIF EP4 transaction on prog. flag -+EXTERN __xdata _AT_(0xE6DC) volatile BYTE EP4GPIFTRIG ; // EP4 FIFO Trigger -+// EXTERN __xdata volatile BYTE EP6GPIFTCH _AT_ 0xE6E0; // EP6 GPIF Transaction Count High -+// EXTERN __xdata volatile BYTE EP6GPIFTCL _AT_ 0xE6E1; // EP6 GPIF Transaction Count Low -+EXTERN __xdata _AT_(0xE6E2) volatile BYTE EP6GPIFFLGSEL ; // EP6 GPIF Flag select -+EXTERN __xdata _AT_(0xE6E3) volatile BYTE EP6GPIFPFSTOP ; // Stop GPIF EP6 transaction on prog. flag -+EXTERN __xdata _AT_(0xE6E4) volatile BYTE EP6GPIFTRIG ; // EP6 FIFO Trigger -+// EXTERN __xdata volatile BYTE EP8GPIFTCH _AT_ 0xE6E8; // EP8 GPIF Transaction Count High -+// EXTERN __xdata volatile BYTE EP8GPIFTCL _AT_ 0xE6E9; // EP8GPIF Transaction Count Low -+EXTERN __xdata _AT_(0xE6EA) volatile BYTE EP8GPIFFLGSEL ; // EP8 GPIF Flag select -+EXTERN __xdata _AT_(0xE6EB) volatile BYTE EP8GPIFPFSTOP ; // Stop GPIF EP8 transaction on prog. flag -+EXTERN __xdata _AT_(0xE6EC) volatile BYTE EP8GPIFTRIG ; // EP8 FIFO Trigger -+EXTERN __xdata _AT_(0xE6F0) volatile BYTE XGPIFSGLDATH ; // GPIF Data H (16-bit mode only) -+EXTERN __xdata _AT_(0xE6F1) volatile BYTE XGPIFSGLDATLX ; // Read/Write GPIF Data L & trigger transac -+EXTERN __xdata _AT_(0xE6F2) volatile BYTE XGPIFSGLDATLNOX ; // Read GPIF Data L, no transac trigger -+EXTERN __xdata _AT_(0xE6F3) volatile BYTE GPIFREADYCFG ; // Internal RDY,Sync/Async, RDY5CFG -+EXTERN __xdata _AT_(0xE6F4) volatile BYTE GPIFREADYSTAT ; // RDY pin states -+EXTERN __xdata _AT_(0xE6F5) volatile BYTE GPIFABORT ; // Abort GPIF cycles - - // UDMA - --EXTERN xdata _AT_(0xE6C6) volatile BYTE FLOWSTATE ; //Defines GPIF flow state --EXTERN xdata _AT_(0xE6C7) volatile BYTE FLOWLOGIC ; //Defines flow/hold decision criteria --EXTERN xdata _AT_(0xE6C8) volatile BYTE FLOWEQ0CTL ; //CTL states during active flow state --EXTERN xdata _AT_(0xE6C9) volatile BYTE FLOWEQ1CTL ; //CTL states during hold flow state --EXTERN xdata _AT_(0xE6CA) volatile BYTE FLOWHOLDOFF ; --EXTERN xdata _AT_(0xE6CB) volatile BYTE FLOWSTB ; //CTL/RDY Signal to use as master data strobe --EXTERN xdata _AT_(0xE6CC) volatile BYTE FLOWSTBEDGE ; //Defines active master strobe edge --EXTERN xdata _AT_(0xE6CD) volatile BYTE FLOWSTBHPERIOD ; //Half Period of output master strobe --EXTERN xdata _AT_(0xE60C) volatile BYTE GPIFHOLDAMOUNT ; //Data delay shift --EXTERN xdata _AT_(0xE67D) volatile BYTE UDMACRCH ; //CRC Upper byte --EXTERN xdata _AT_(0xE67E) volatile BYTE UDMACRCL ; //CRC Lower byte --EXTERN xdata _AT_(0xE67F) volatile BYTE UDMACRCQUAL ; //UDMA In only, host terminated use only -+EXTERN __xdata _AT_(0xE6C6) volatile BYTE FLOWSTATE ; //Defines GPIF flow state -+EXTERN __xdata _AT_(0xE6C7) volatile BYTE FLOWLOGIC ; //Defines flow/hold decision criteria -+EXTERN __xdata _AT_(0xE6C8) volatile BYTE FLOWEQ0CTL ; //CTL states during active flow state -+EXTERN __xdata _AT_(0xE6C9) volatile BYTE FLOWEQ1CTL ; //CTL states during hold flow state -+EXTERN __xdata _AT_(0xE6CA) volatile BYTE FLOWHOLDOFF ; -+EXTERN __xdata _AT_(0xE6CB) volatile BYTE FLOWSTB ; //CTL/RDY Signal to use as master data strobe -+EXTERN __xdata _AT_(0xE6CC) volatile BYTE FLOWSTBEDGE ; //Defines active master strobe edge -+EXTERN __xdata _AT_(0xE6CD) volatile BYTE FLOWSTBHPERIOD ; //Half Period of output master strobe -+EXTERN __xdata _AT_(0xE60C) volatile BYTE GPIFHOLDAMOUNT ; //Data delay shift -+EXTERN __xdata _AT_(0xE67D) volatile BYTE UDMACRCH ; //CRC Upper byte -+EXTERN __xdata _AT_(0xE67E) volatile BYTE UDMACRCL ; //CRC Lower byte -+EXTERN __xdata _AT_(0xE67F) volatile BYTE UDMACRCQUAL ; //UDMA In only, host terminated use only - - - // Debug/Test - --EXTERN xdata _AT_(0xE6F8) volatile BYTE DBUG ; // Debug --EXTERN xdata _AT_(0xE6F9) volatile BYTE TESTCFG ; // Test configuration --EXTERN xdata _AT_(0xE6FA) volatile BYTE USBTEST ; // USB Test Modes --EXTERN xdata _AT_(0xE6FB) volatile BYTE CT1 ; // Chirp Test--Override --EXTERN xdata _AT_(0xE6FC) volatile BYTE CT2 ; // Chirp Test--FSM --EXTERN xdata _AT_(0xE6FD) volatile BYTE CT3 ; // Chirp Test--Control Signals --EXTERN xdata _AT_(0xE6FE) volatile BYTE CT4 ; // Chirp Test--Inputs -+EXTERN __xdata _AT_(0xE6F8) volatile BYTE DBUG ; // Debug -+EXTERN __xdata _AT_(0xE6F9) volatile BYTE TESTCFG ; // Test configuration -+EXTERN __xdata _AT_(0xE6FA) volatile BYTE USBTEST ; // USB Test Modes -+EXTERN __xdata _AT_(0xE6FB) volatile BYTE CT1 ; // Chirp Test--Override -+EXTERN __xdata _AT_(0xE6FC) volatile BYTE CT2 ; // Chirp Test--FSM -+EXTERN __xdata _AT_(0xE6FD) volatile BYTE CT3 ; // Chirp Test--Control Signals -+EXTERN __xdata _AT_(0xE6FE) volatile BYTE CT4 ; // Chirp Test--Inputs - - // Endpoint Buffers - --EXTERN xdata _AT_(0xE740) volatile BYTE EP0BUF[64] ; // EP0 IN-OUT buffer --EXTERN xdata _AT_(0xE780) volatile BYTE EP1OUTBUF[64] ; // EP1-OUT buffer --EXTERN xdata _AT_(0xE7C0) volatile BYTE EP1INBUF[64] ; // EP1-IN buffer --EXTERN xdata _AT_(0xF000) volatile BYTE EP2FIFOBUF[1024] ; // 512/1024-byte EP2 buffer (IN or OUT) --EXTERN xdata _AT_(0xF400) volatile BYTE EP4FIFOBUF[1024] ; // 512 byte EP4 buffer (IN or OUT) --EXTERN xdata _AT_(0xF800) volatile BYTE EP6FIFOBUF[1024] ; // 512/1024-byte EP6 buffer (IN or OUT) --EXTERN xdata _AT_(0xFC00) volatile BYTE EP8FIFOBUF[1024] ; // 512 byte EP8 buffer (IN or OUT) -+EXTERN __xdata _AT_(0xE740) volatile BYTE EP0BUF[64] ; // EP0 IN-OUT buffer -+EXTERN __xdata _AT_(0xE780) volatile BYTE EP1OUTBUF[64] ; // EP1-OUT buffer -+EXTERN __xdata _AT_(0xE7C0) volatile BYTE EP1INBUF[64] ; // EP1-IN buffer -+EXTERN __xdata _AT_(0xF000) volatile BYTE EP2FIFOBUF[1024] ; // 512/1024-byte EP2 buffer (IN or OUT) -+EXTERN __xdata _AT_(0xF400) volatile BYTE EP4FIFOBUF[1024] ; // 512 byte EP4 buffer (IN or OUT) -+EXTERN __xdata _AT_(0xF800) volatile BYTE EP6FIFOBUF[1024] ; // 512/1024-byte EP6 buffer (IN or OUT) -+EXTERN __xdata _AT_(0xFC00) volatile BYTE EP8FIFOBUF[1024] ; // 512 byte EP8 buffer (IN or OUT) - - #undef EXTERN - #undef _AT_ -@@ -312,201 +312,201 @@ EXTERN xdata _AT_(0xFC00) volatile BYTE EP8FIFOBUF[1024] ; // 512 byte EP8 buf - "ezregs.inc" which includes the same basic information for assembly inclusion. - -----------------------------------------------------------------------------*/ - --sfr at 0x80 IOA; --sfr at 0x81 SP; --sfr at 0x82 DPL; --sfr at 0x83 DPH; --sfr at 0x84 DPL1; --sfr at 0x85 DPH1; --sfr at 0x86 DPS; -+__sfr __at 0x80 IOA; -+__sfr __at 0x81 SP; -+__sfr __at 0x82 DPL; -+__sfr __at 0x83 DPH; -+__sfr __at 0x84 DPL1; -+__sfr __at 0x85 DPH1; -+__sfr __at 0x86 DPS; - /* DPS */ -- sbit at 0x86+0 SEL; --sfr at 0x87 PCON; /* PCON */ -- //sbit IDLE = 0x87+0; -- //sbit STOP = 0x87+1; -- //sbit GF0 = 0x87+2; -- //sbit GF1 = 0x87+3; -- //sbit SMOD0 = 0x87+7; --sfr at 0x88 TCON; -+ __sbit __at 0x86+0 SEL; -+__sfr __at 0x87 PCON; /* PCON */ -+ //__sbit IDLE = 0x87+0; -+ //__sbit STOP = 0x87+1; -+ //__sbit GF0 = 0x87+2; -+ //__sbit GF1 = 0x87+3; -+ //__sbit SMOD0 = 0x87+7; -+__sfr __at 0x88 TCON; - /* TCON */ -- sbit at 0x88+0 IT0; -- sbit at 0x88+1 IE0; -- sbit at 0x88+2 IT1; -- sbit at 0x88+3 IE1; -- sbit at 0x88+4 TR0; -- sbit at 0x88+5 TF0; -- sbit at 0x88+6 TR1; -- sbit at 0x88+7 TF1; --sfr at 0x89 TMOD; -+ __sbit __at 0x88+0 IT0; -+ __sbit __at 0x88+1 IE0; -+ __sbit __at 0x88+2 IT1; -+ __sbit __at 0x88+3 IE1; -+ __sbit __at 0x88+4 TR0; -+ __sbit __at 0x88+5 TF0; -+ __sbit __at 0x88+6 TR1; -+ __sbit __at 0x88+7 TF1; -+__sfr __at 0x89 TMOD; - /* TMOD */ -- //sbit M00 = 0x89+0; -- //sbit M10 = 0x89+1; -- //sbit CT0 = 0x89+2; -- //sbit GATE0 = 0x89+3; -- //sbit M01 = 0x89+4; -- //sbit M11 = 0x89+5; -- //sbit CT1 = 0x89+6; -- //sbit GATE1 = 0x89+7; --sfr at 0x8A TL0; --sfr at 0x8B TL1; --sfr at 0x8C TH0; --sfr at 0x8D TH1; --sfr at 0x8E CKCON; -+ //__sbit M00 = 0x89+0; -+ //__sbit M10 = 0x89+1; -+ //__sbit CT0 = 0x89+2; -+ //__sbit GATE0 = 0x89+3; -+ //__sbit M01 = 0x89+4; -+ //__sbit M11 = 0x89+5; -+ //__sbit CT1 = 0x89+6; -+ //__sbit GATE1 = 0x89+7; -+__sfr __at 0x8A TL0; -+__sfr __at 0x8B TL1; -+__sfr __at 0x8C TH0; -+__sfr __at 0x8D TH1; -+__sfr __at 0x8E CKCON; - /* CKCON */ -- //sbit MD0 = 0x89+0; -- //sbit MD1 = 0x89+1; -- //sbit MD2 = 0x89+2; -- //sbit T0M = 0x89+3; -- //sbit T1M = 0x89+4; -- //sbit T2M = 0x89+5; --// sfr at 0x8F SPC_FNC; // Was WRS in Reg320 -+ //__sbit MD0 = 0x89+0; -+ //__sbit MD1 = 0x89+1; -+ //__sbit MD2 = 0x89+2; -+ //__sbit T0M = 0x89+3; -+ //__sbit T1M = 0x89+4; -+ //__sbit T2M = 0x89+5; -+// __sfr __at 0x8F SPC_FNC; // Was WRS in Reg320 - /* CKCON */ -- //sbit WRS = 0x8F+0; --sfr at 0x90 IOB; --sfr at 0x91 EXIF; // EXIF Bit Values differ from Reg320 -+ //__sbit WRS = 0x8F+0; -+__sfr __at 0x90 IOB; -+__sfr __at 0x91 EXIF; // EXIF Bit Values differ from Reg320 - /* EXIF */ -- //sbit USBINT = 0x91+4; -- //sbit I2CINT = 0x91+5; -- //sbit IE4 = 0x91+6; -- //sbit IE5 = 0x91+7; --sfr at 0x92 MPAGE; --sfr at 0x98 SCON0; -+ //__sbit USBINT = 0x91+4; -+ //__sbit I2CINT = 0x91+5; -+ //__sbit IE4 = 0x91+6; -+ //__sbit IE5 = 0x91+7; -+__sfr __at 0x92 MPAGE; -+__sfr __at 0x98 SCON0; - /* SCON0 */ -- sbit at 0x98+0 RI; -- sbit at 0x98+1 TI; -- sbit at 0x98+2 RB8; -- sbit at 0x98+3 TB8; -- sbit at 0x98+4 REN; -- sbit at 0x98+5 SM2; -- sbit at 0x98+6 SM1; -- sbit at 0x98+7 SM0; --sfr at 0x99 SBUF0; -- --sfr at 0x9A APTR1H; --sfr at 0x9B APTR1L; --sfr at 0x9C AUTODAT1; --sfr at 0x9D AUTOPTRH2; --sfr at 0x9E AUTOPTRL2; --sfr at 0x9F AUTODAT2; --sfr at 0xA0 IOC; --sfr at 0xA1 INT2CLR; --sfr at 0xA2 INT4CLR; -+ __sbit __at 0x98+0 RI; -+ __sbit __at 0x98+1 TI; -+ __sbit __at 0x98+2 RB8; -+ __sbit __at 0x98+3 TB8; -+ __sbit __at 0x98+4 REN; -+ __sbit __at 0x98+5 SM2; -+ __sbit __at 0x98+6 SM1; -+ __sbit __at 0x98+7 SM0; -+__sfr __at 0x99 SBUF0; -+ -+__sfr __at 0x9A APTR1H; -+__sfr __at 0x9B APTR1L; -+__sfr __at 0x9C AUTODAT1; -+__sfr __at 0x9D AUTOPTRH2; -+__sfr __at 0x9E AUTOPTRL2; -+__sfr __at 0x9F AUTODAT2; -+__sfr __at 0xA0 IOC; -+__sfr __at 0xA1 INT2CLR; -+__sfr __at 0xA2 INT4CLR; - - #define AUTOPTRH1 APTR1H - #define AUTOPTRL1 APTR1L - --sfr at 0xA8 IE; -+__sfr __at 0xA8 IE; - /* IE */ -- sbit at 0xA8+0 EX0; -- sbit at 0xA8+1 ET0; -- sbit at 0xA8+2 EX1; -- sbit at 0xA8+3 ET1; -- sbit at 0xA8+4 ES0; -- sbit at 0xA8+5 ET2; -- sbit at 0xA8+6 ES1; -- sbit at 0xA8+7 EA; -- --sfr at 0xAA EP2468STAT; -+ __sbit __at 0xA8+0 EX0; -+ __sbit __at 0xA8+1 ET0; -+ __sbit __at 0xA8+2 EX1; -+ __sbit __at 0xA8+3 ET1; -+ __sbit __at 0xA8+4 ES0; -+ __sbit __at 0xA8+5 ET2; -+ __sbit __at 0xA8+6 ES1; -+ __sbit __at 0xA8+7 EA; -+ -+__sfr __at 0xAA EP2468STAT; - /* EP2468STAT */ -- //sbit EP2E = 0xAA+0; -- //sbit EP2F = 0xAA+1; -- //sbit EP4E = 0xAA+2; -- //sbit EP4F = 0xAA+3; -- //sbit EP6E = 0xAA+4; -- //sbit EP6F = 0xAA+5; -- //sbit EP8E = 0xAA+6; -- //sbit EP8F = 0xAA+7; -- --sfr at 0xAB EP24FIFOFLGS; --sfr at 0xAC EP68FIFOFLGS; --sfr at 0xAF AUTOPTRSETUP; -+ //__sbit EP2E = 0xAA+0; -+ //__sbit EP2F = 0xAA+1; -+ //__sbit EP4E = 0xAA+2; -+ //__sbit EP4F = 0xAA+3; -+ //__sbit EP6E = 0xAA+4; -+ //__sbit EP6F = 0xAA+5; -+ //__sbit EP8E = 0xAA+6; -+ //__sbit EP8F = 0xAA+7; -+ -+__sfr __at 0xAB EP24FIFOFLGS; -+__sfr __at 0xAC EP68FIFOFLGS; -+__sfr __at 0xAF AUTOPTRSETUP; - /* AUTOPTRSETUP */ -- // sbit EXTACC = 0xAF+0; -- // sbit APTR1FZ = 0xAF+1; -- // sbit APTR2FZ = 0xAF+2; -- --sfr at 0xB0 IOD; --sfr at 0xB1 IOE; --sfr at 0xB2 OEA; --sfr at 0xB3 OEB; --sfr at 0xB4 OEC; --sfr at 0xB5 OED; --sfr at 0xB6 OEE; -- --sfr at 0xB8 IP; -+ // __sbit EXTACC = 0xAF+0; -+ // __sbit APTR1FZ = 0xAF+1; -+ // __sbit APTR2FZ = 0xAF+2; -+ -+__sfr __at 0xB0 IOD; -+__sfr __at 0xB1 IOE; -+__sfr __at 0xB2 OEA; -+__sfr __at 0xB3 OEB; -+__sfr __at 0xB4 OEC; -+__sfr __at 0xB5 OED; -+__sfr __at 0xB6 OEE; -+ -+__sfr __at 0xB8 IP; - /* IP */ -- sbit at 0xB8+0 PX0; -- sbit at 0xB8+1 PT0; -- sbit at 0xB8+2 PX1; -- sbit at 0xB8+3 PT1; -- sbit at 0xB8+4 PS0; -- sbit at 0xB8+5 PT2; -- sbit at 0xB8+6 PS1; -- --sfr at 0xBA EP01STAT; --sfr at 0xBB GPIFTRIG; -+ __sbit __at 0xB8+0 PX0; -+ __sbit __at 0xB8+1 PT0; -+ __sbit __at 0xB8+2 PX1; -+ __sbit __at 0xB8+3 PT1; -+ __sbit __at 0xB8+4 PS0; -+ __sbit __at 0xB8+5 PT2; -+ __sbit __at 0xB8+6 PS1; -+ -+__sfr __at 0xBA EP01STAT; -+__sfr __at 0xBB GPIFTRIG; - --sfr at 0xBD GPIFSGLDATH; --sfr at 0xBE GPIFSGLDATLX; --sfr at 0xBF GPIFSGLDATLNOX; -+__sfr __at 0xBD GPIFSGLDATH; -+__sfr __at 0xBE GPIFSGLDATLX; -+__sfr __at 0xBF GPIFSGLDATLNOX; - --sfr at 0xC0 SCON1; -+__sfr __at 0xC0 SCON1; - /* SCON1 */ -- sbit at 0xC0+0 RI1; -- sbit at 0xC0+1 TI1; -- sbit at 0xC0+2 RB81; -- sbit at 0xC0+3 TB81; -- sbit at 0xC0+4 REN1; -- sbit at 0xC0+5 SM21; -- sbit at 0xC0+6 SM11; -- sbit at 0xC0+7 SM01; --sfr at 0xC1 SBUF1; --sfr at 0xC8 T2CON; -+ __sbit __at 0xC0+0 RI1; -+ __sbit __at 0xC0+1 TI1; -+ __sbit __at 0xC0+2 RB81; -+ __sbit __at 0xC0+3 TB81; -+ __sbit __at 0xC0+4 REN1; -+ __sbit __at 0xC0+5 SM21; -+ __sbit __at 0xC0+6 SM11; -+ __sbit __at 0xC0+7 SM01; -+__sfr __at 0xC1 SBUF1; -+__sfr __at 0xC8 T2CON; - /* T2CON */ -- sbit at 0xC8+0 CP_RL2; -- sbit at 0xC8+1 C_T2; -- sbit at 0xC8+2 TR2; -- sbit at 0xC8+3 EXEN2; -- sbit at 0xC8+4 TCLK; -- sbit at 0xC8+5 RCLK; -- sbit at 0xC8+6 EXF2; -- sbit at 0xC8+7 TF2; --sfr at 0xCA RCAP2L; --sfr at 0xCB RCAP2H; --sfr at 0xCC TL2; --sfr at 0xCD TH2; --sfr at 0xD0 PSW; -+ __sbit __at 0xC8+0 CP_RL2; -+ __sbit __at 0xC8+1 C_T2; -+ __sbit __at 0xC8+2 TR2; -+ __sbit __at 0xC8+3 EXEN2; -+ __sbit __at 0xC8+4 TCLK; -+ __sbit __at 0xC8+5 RCLK; -+ __sbit __at 0xC8+6 EXF2; -+ __sbit __at 0xC8+7 TF2; -+__sfr __at 0xCA RCAP2L; -+__sfr __at 0xCB RCAP2H; -+__sfr __at 0xCC TL2; -+__sfr __at 0xCD TH2; -+__sfr __at 0xD0 PSW; - /* PSW */ -- sbit at 0xD0+0 P; -- sbit at 0xD0+1 FL; -- sbit at 0xD0+2 OV; -- sbit at 0xD0+3 RS0; -- sbit at 0xD0+4 RS1; -- sbit at 0xD0+5 F0; -- sbit at 0xD0+6 AC; -- sbit at 0xD0+7 CY; --sfr at 0xD8 EICON; // Was WDCON in DS80C320 EICON; Bit Values differ from Reg320 -+ __sbit __at 0xD0+0 P; -+ __sbit __at 0xD0+1 FL; -+ __sbit __at 0xD0+2 OV; -+ __sbit __at 0xD0+3 RS0; -+ __sbit __at 0xD0+4 RS1; -+ __sbit __at 0xD0+5 F0; -+ __sbit __at 0xD0+6 AC; -+ __sbit __at 0xD0+7 CY; -+__sfr __at 0xD8 EICON; // Was WDCON in DS80C320 EICON; Bit Values differ from Reg320 - /* EICON */ -- sbit at 0xD8+3 INT6; -- sbit at 0xD8+4 RESI; -- sbit at 0xD8+5 ERESI; -- sbit at 0xD8+7 SMOD1; --sfr at 0xE0 ACC; --sfr at 0xE8 EIE; // EIE Bit Values differ from Reg320 -+ __sbit __at 0xD8+3 INT6; -+ __sbit __at 0xD8+4 RESI; -+ __sbit __at 0xD8+5 ERESI; -+ __sbit __at 0xD8+7 SMOD1; -+__sfr __at 0xE0 ACC; -+__sfr __at 0xE8 EIE; // EIE Bit Values differ from Reg320 - /* EIE */ -- sbit at 0xE8+0 EIUSB; -- sbit at 0xE8+1 EI2C; -- sbit at 0xE8+2 EIEX4; -- sbit at 0xE8+3 EIEX5; -- sbit at 0xE8+4 EIEX6; --sfr at 0xF0 B; --sfr at 0xF8 EIP; // EIP Bit Values differ from Reg320 -+ __sbit __at 0xE8+0 EIUSB; -+ __sbit __at 0xE8+1 EI2C; -+ __sbit __at 0xE8+2 EIEX4; -+ __sbit __at 0xE8+3 EIEX5; -+ __sbit __at 0xE8+4 EIEX6; -+__sfr __at 0xF0 B; -+__sfr __at 0xF8 EIP; // EIP Bit Values differ from Reg320 - /* EIP */ -- sbit at 0xF8+0 PUSB; -- sbit at 0xF8+1 PI2C; -- sbit at 0xF8+2 EIPX4; -- sbit at 0xF8+3 EIPX5; -- sbit at 0xF8+4 EIPX6; -+ __sbit __at 0xF8+0 PUSB; -+ __sbit __at 0xF8+1 PI2C; -+ __sbit __at 0xF8+2 EIPX4; -+ __sbit __at 0xF8+3 EIPX5; -+ __sbit __at 0xF8+4 EIPX6; - - /*----------------------------------------------------------------------------- - Bit Masks -diff --git a/firmware/fx2/common/i2c.c b/firmware/fx2/common/i2c.c -index 0f238b5..dd31a5f 100644 ---- a/firmware/fx2/common/i2c.c -+++ b/firmware/fx2/common/i2c.c -@@ -30,7 +30,7 @@ - - // returns non-zero if successful, else 0 - unsigned char --i2c_read (unsigned char addr, xdata unsigned char *buf, unsigned char len) -+i2c_read (unsigned char addr, __xdata unsigned char *buf, unsigned char len) - { - volatile unsigned char junk; - -@@ -89,7 +89,7 @@ i2c_read (unsigned char addr, xdata unsigned char *buf, unsigned char len) - - // returns non-zero if successful, else 0 - unsigned char --i2c_write (unsigned char addr, xdata const unsigned char *buf, unsigned char len) -+i2c_write (unsigned char addr, __xdata const unsigned char *buf, unsigned char len) - { - while (I2CS & bmSTOP) // wait for stop to clear - ; -diff --git a/firmware/fx2/common/i2c.h b/firmware/fx2/common/i2c.h -index 273526d..25f5364 100644 ---- a/firmware/fx2/common/i2c.h -+++ b/firmware/fx2/common/i2c.h -@@ -24,9 +24,9 @@ - #define _I2C_H_ - - // returns non-zero if successful, else 0 --unsigned char i2c_read (unsigned char addr, xdata unsigned char *buf, unsigned char len); -+unsigned char i2c_read (unsigned char addr, __xdata unsigned char *buf, unsigned char len); - - // returns non-zero if successful, else 0 --unsigned char i2c_write (unsigned char addr, xdata const unsigned char *buf, unsigned char len); -+unsigned char i2c_write (unsigned char addr, __xdata const unsigned char *buf, unsigned char len); - - #endif /* _I2C_H_ */ -diff --git a/firmware/fx2/common/init_gpif.c b/firmware/fx2/common/init_gpif.c -index edde919..f0866ed 100644 ---- a/firmware/fx2/common/init_gpif.c -+++ b/firmware/fx2/common/init_gpif.c -@@ -29,7 +29,7 @@ extern const char InitData[7]; - // The tool is kind of screwed up, in that it doesn't configure some - // of the ports correctly. We just use their tables and handle the - // initialization ourselves. They also declare that their static --// initialized data is in xdata, which screws us too. -+// initialized data is in __xdata, which screws us too. - - void - init_gpif (void) -diff --git a/firmware/fx2/common/isr.c b/firmware/fx2/common/isr.c -index 05412da..61f2dc3 100644 ---- a/firmware/fx2/common/isr.c -+++ b/firmware/fx2/common/isr.c -@@ -24,9 +24,9 @@ - #include "fx2regs.h" - #include "syncdelay.h" - --extern xdata unsigned char _standard_interrupt_vector[]; --extern xdata unsigned char _usb_autovector[]; --extern xdata unsigned char _fifo_gpif_autovector[]; -+extern __xdata unsigned char _standard_interrupt_vector[]; -+extern __xdata unsigned char _usb_autovector[]; -+extern __xdata unsigned char _fifo_gpif_autovector[]; - - #define LJMP_OPCODE 0x02 - -@@ -39,7 +39,7 @@ extern xdata unsigned char _fifo_gpif_autovector[]; - void - hook_sv (unsigned char vector_number, unsigned short addr) - { -- bit t; -+ __bit t; - - // sanity checks - -@@ -66,7 +66,7 @@ hook_sv (unsigned char vector_number, unsigned short addr) - void - hook_uv (unsigned char vector_number, unsigned short addr) - { -- bit t; -+ __bit t; - - // sanity checks - -@@ -93,7 +93,7 @@ hook_uv (unsigned char vector_number, unsigned short addr) - void - hook_fgv (unsigned char vector_number, unsigned short addr) - { -- bit t; -+ __bit t; - - // sanity checks - -diff --git a/firmware/fx2/common/spi.c b/firmware/fx2/common/spi.c -index 04a1d84..6f62c91 100644 ---- a/firmware/fx2/common/spi.c -+++ b/firmware/fx2/common/spi.c -@@ -98,17 +98,17 @@ static void - write_byte_msb (unsigned char v); - - static void --write_bytes_msb (const xdata unsigned char *buf, unsigned char len); -+write_bytes_msb (const __xdata unsigned char *buf, unsigned char len); - - static void --read_bytes_msb (xdata unsigned char *buf, unsigned char len); -+read_bytes_msb (__xdata unsigned char *buf, unsigned char len); - - - // returns non-zero if successful, else 0 - unsigned char - spi_read (unsigned char header_hi, unsigned char header_lo, - unsigned char enables, unsigned char format, -- xdata unsigned char *buf, unsigned char len) -+ __xdata unsigned char *buf, unsigned char len) - { - if (count_bits8 (enables) > 1) - return 0; // error, too many enables set -@@ -165,7 +165,7 @@ spi_read (unsigned char header_hi, unsigned char header_lo, - unsigned char - spi_write (unsigned char header_hi, unsigned char header_lo, - unsigned char enables, unsigned char format, -- const xdata unsigned char *buf, unsigned char len) -+ const __xdata unsigned char *buf, unsigned char len) - { - setup_enables (enables); - -@@ -261,7 +261,7 @@ write_byte_msb (unsigned char v) - } - - static void --write_bytes_msb (const xdata unsigned char *buf, unsigned char len) -+write_bytes_msb (const __xdata unsigned char *buf, unsigned char len) - { - while (len-- != 0){ - write_byte_msb (*buf++); -@@ -320,9 +320,9 @@ read_byte_msb (void) - } - #else - static unsigned char --read_byte_msb (void) _naked -+read_byte_msb (void) __naked - { -- _asm -+ __asm - clr a - - setb _bitS_CLK -@@ -367,12 +367,12 @@ read_byte_msb (void) _naked - - mov dpl,a - ret -- _endasm; -+ __endasm; - } - #endif - - static void --read_bytes_msb (xdata unsigned char *buf, unsigned char len) -+read_bytes_msb (__xdata unsigned char *buf, unsigned char len) - { - while (len-- != 0){ - *buf++ = read_byte_msb (); -diff --git a/firmware/fx2/common/spi.h b/firmware/fx2/common/spi.h -index 12bc5e5..0ee6882 100644 ---- a/firmware/fx2/common/spi.h -+++ b/firmware/fx2/common/spi.h -@@ -31,13 +31,13 @@ void init_spi (void); // one time call to init - unsigned char - spi_read (unsigned char header_hi, unsigned char header_lo, - unsigned char enables, unsigned char format, -- xdata unsigned char *buf, unsigned char len); -+ __xdata unsigned char *buf, unsigned char len); - - // returns non-zero if successful, else 0 - unsigned char - spi_write (unsigned char header_hi, unsigned char header_lo, - unsigned char enables, unsigned char format, -- const xdata unsigned char *buf, unsigned char len); -+ const __xdata unsigned char *buf, unsigned char len); - - - #endif /* INCLUDED_SPI_H */ -diff --git a/firmware/fx2/common/syncdelay.h b/firmware/fx2/common/syncdelay.h -index 0af7d09..cca96ad 100644 ---- a/firmware/fx2/common/syncdelay.h -+++ b/firmware/fx2/common/syncdelay.h -@@ -23,7 +23,7 @@ - #define _SYNCDELAY_H_ - - /* -- * Magic delay required between access to certain xdata registers (TRM page 15-106). -+ * Magic delay required between access to certain __xdata registers (TRM page 15-106). - * For our configuration, 48 MHz FX2 / 48 MHz IFCLK, we need three cycles. Each - * NOP is a single cycle.... - * -@@ -58,8 +58,8 @@ - /* - * FIXME ensure that the peep hole optimizer isn't screwing us - */ --#define SYNCDELAY _asm nop; nop; nop; _endasm --#define NOP _asm nop; _endasm -+#define SYNCDELAY __asm nop; nop; nop; __endasm -+#define NOP __asm nop; __endasm - - - #endif /* _SYNCDELAY_H_ */ -diff --git a/firmware/fx2/common/usb_common.c b/firmware/fx2/common/usb_common.c -index 3b0547b..6a7a103 100644 ---- a/firmware/fx2/common/usb_common.c -+++ b/firmware/fx2/common/usb_common.c -@@ -28,12 +28,12 @@ - #include "usb_descriptors.h" - #include "usb_requests.h" - --extern xdata char str0[]; --extern xdata char str1[]; --extern xdata char str2[]; --extern xdata char str3[]; --extern xdata char str4[]; --extern xdata char str5[]; -+extern __xdata char str0[]; -+extern __xdata char str1[]; -+extern __xdata char str2[]; -+extern __xdata char str3[]; -+extern __xdata char str4[]; -+extern __xdata char str5[]; - - - #define bRequestType SETUPDAT[0] -@@ -48,15 +48,15 @@ extern xdata char str5[]; - #define MSB(x) (((unsigned short) x) >> 8) - #define LSB(x) (((unsigned short) x) & 0xff) - --volatile bit _usb_got_SUDAV; -+volatile __bit _usb_got_SUDAV; - - unsigned char _usb_config = 0; - unsigned char _usb_alt_setting = 0; // FIXME really 1/interface - --xdata unsigned char *current_device_descr; --xdata unsigned char *current_devqual_descr; --xdata unsigned char *current_config_descr; --xdata unsigned char *other_config_descr; -+__xdata unsigned char *current_device_descr; -+__xdata unsigned char *current_devqual_descr; -+__xdata unsigned char *current_config_descr; -+__xdata unsigned char *other_config_descr; - - static void - setup_descriptors (void) -@@ -81,21 +81,21 @@ setup_descriptors (void) - } - - static void --isr_SUDAV (void) interrupt -+isr_SUDAV (void) __interrupt - { - clear_usb_irq (); - _usb_got_SUDAV = 1; - } - - static void --isr_USBRESET (void) interrupt -+isr_USBRESET (void) __interrupt - { - clear_usb_irq (); - setup_descriptors (); - } - - static void --isr_HIGHSPEED (void) interrupt -+isr_HIGHSPEED (void) __interrupt - { - clear_usb_irq (); - setup_descriptors (); -@@ -133,7 +133,7 @@ plausible_endpoint (unsigned char ep) - // return pointer to control and status register for endpoint. - // only called with plausible_endpoints - --xdata volatile unsigned char * -+__xdata volatile unsigned char * - epcs (unsigned char ep) - { - if (ep == 0x01) // ep1 has different in and out CS regs -@@ -234,7 +234,7 @@ usb_handle_setup_packet (void) - if (wValueL >= nstring_descriptors) - fx2_stall_ep0 (); - else { -- xdata char *p = string_descriptors[wValueL]; -+ __xdata char *p = string_descriptors[wValueL]; - SUDPTRH = MSB (p); - SUDPTRL = LSB (p); - } -diff --git a/firmware/fx2/common/usb_common.h b/firmware/fx2/common/usb_common.h -index ae07b23..2fbab6d 100644 ---- a/firmware/fx2/common/usb_common.h -+++ b/firmware/fx2/common/usb_common.h -@@ -23,7 +23,7 @@ - #ifndef _USB_COMMON_H_ - #define _USB_COMMON_H_ - --extern volatile bit _usb_got_SUDAV; -+extern volatile __bit _usb_got_SUDAV; - - // Provided by user application to handle VENDOR commands. - // returns non-zero if it handled the command. -diff --git a/firmware/fx2/common/usb_descriptors.h b/firmware/fx2/common/usb_descriptors.h -index 0b8c621..ea91169 100644 ---- a/firmware/fx2/common/usb_descriptors.h -+++ b/firmware/fx2/common/usb_descriptors.h -@@ -20,21 +20,21 @@ - * Boston, MA 02110-1301, USA. - */ - --extern xdata const char high_speed_device_descr[]; --extern xdata const char high_speed_devqual_descr[]; --extern xdata const char high_speed_config_descr[]; -+extern __xdata const char high_speed_device_descr[]; -+extern __xdata const char high_speed_devqual_descr[]; -+extern __xdata const char high_speed_config_descr[]; - --extern xdata const char full_speed_device_descr[]; --extern xdata const char full_speed_devqual_descr[]; --extern xdata const char full_speed_config_descr[]; -+extern __xdata const char full_speed_device_descr[]; -+extern __xdata const char full_speed_devqual_descr[]; -+extern __xdata const char full_speed_config_descr[]; - --extern xdata unsigned char nstring_descriptors; --extern xdata char * xdata string_descriptors[]; -+extern __xdata unsigned char nstring_descriptors; -+extern __xdata char * __xdata string_descriptors[]; - - /* - * We patch these locations with info read from the usrp config eeprom - */ --extern xdata char usb_desc_hw_rev_binary_patch_location_0[]; --extern xdata char usb_desc_hw_rev_binary_patch_location_1[]; --extern xdata char usb_desc_hw_rev_ascii_patch_location_0[]; --extern xdata char usb_desc_serial_number_ascii[]; -+extern __xdata char usb_desc_hw_rev_binary_patch_location_0[]; -+extern __xdata char usb_desc_hw_rev_binary_patch_location_1[]; -+extern __xdata char usb_desc_hw_rev_ascii_patch_location_0[]; -+extern __xdata char usb_desc_serial_number_ascii[]; -diff --git a/firmware/fx2/config/CMakeASM_SDCCInformation.cmake b/firmware/fx2/config/CMakeASM_SDCCInformation.cmake -index d9f28b8..0d26b89 100644 ---- a/firmware/fx2/config/CMakeASM_SDCCInformation.cmake -+++ b/firmware/fx2/config/CMakeASM_SDCCInformation.cmake -@@ -15,7 +15,7 @@ - # along with this program. If not, see . - # - --# support for the SDCC assembler, asx8051 -+# support for the SDCC assembler, sdas8051 - SET( ASM_DIALECT "_SDCC" ) - SET( CMAKE_ASM${ASM_DIALECT}_SOURCE_FILE_EXTENSIONS a51 ) - -diff --git a/firmware/fx2/config/CMakeDetermineASM_SDCCCompiler.cmake b/firmware/fx2/config/CMakeDetermineASM_SDCCCompiler.cmake -index ab301b9..3748107 100644 ---- a/firmware/fx2/config/CMakeDetermineASM_SDCCCompiler.cmake -+++ b/firmware/fx2/config/CMakeDetermineASM_SDCCCompiler.cmake -@@ -16,7 +16,7 @@ - - SET(ASM_DIALECT "_SDCC") - --SET(CMAKE_ASM${ASM_DIALECT}_COMPILER_INIT asx8051) -+SET(CMAKE_ASM${ASM_DIALECT}_COMPILER_INIT sdas8051) - - INCLUDE(CMakeDetermineASMCompiler) - SET(ASM_DIALECT) -diff --git a/firmware/fx2/usrp1/board_specific.c b/firmware/fx2/usrp1/board_specific.c -index ef0081d..92fc28f 100644 ---- a/firmware/fx2/usrp1/board_specific.c -+++ b/firmware/fx2/usrp1/board_specific.c -@@ -64,7 +64,7 @@ set_sleep_bits (unsigned char bits, unsigned char mask) - // NOP on usrp1 - } - --static xdata unsigned char xbuf[1]; -+static __xdata unsigned char xbuf[1]; - - void - write_9862 (unsigned char which, unsigned char regno, unsigned char value) -diff --git a/firmware/fx2/usrp1/eeprom_io.c b/firmware/fx2/usrp1/eeprom_io.c -index 9eeb536..666f3f6 100644 ---- a/firmware/fx2/usrp1/eeprom_io.c -+++ b/firmware/fx2/usrp1/eeprom_io.c -@@ -27,12 +27,12 @@ - // returns non-zero if successful, else 0 - unsigned char - eeprom_read (unsigned char i2c_addr, unsigned char eeprom_offset, -- xdata unsigned char *buf, unsigned char len) -+ __xdata unsigned char *buf, unsigned char len) - { - // We setup a random read by first doing a "zero byte write". - // Writes carry an address. Reads use an implicit address. - -- static xdata unsigned char cmd[1]; -+ static __xdata unsigned char cmd[1]; - cmd[0] = eeprom_offset; - if (!i2c_write(i2c_addr, cmd, 1)) - return 0; -@@ -46,9 +46,9 @@ eeprom_read (unsigned char i2c_addr, unsigned char eeprom_offset, - // returns non-zero if successful, else 0 - unsigned char - eeprom_write (unsigned char i2c_addr, unsigned char eeprom_offset, -- const xdata unsigned char *buf, unsigned char len) -+ const __xdata unsigned char *buf, unsigned char len) - { -- static xdata unsigned char cmd[2]; -+ static __xdata unsigned char cmd[2]; - unsigned char ok; - - while (len-- > 0){ -diff --git a/firmware/fx2/usrp1/eeprom_io.h b/firmware/fx2/usrp1/eeprom_io.h -index 558017b..d1c4ee6 100644 ---- a/firmware/fx2/usrp1/eeprom_io.h -+++ b/firmware/fx2/usrp1/eeprom_io.h -@@ -27,12 +27,12 @@ - // returns non-zero if successful, else 0 - unsigned char - eeprom_read (unsigned char i2c_addr, unsigned char eeprom_offset, -- xdata unsigned char *buf, unsigned char len); -+ __xdata unsigned char *buf, unsigned char len); - - // returns non-zero if successful, else 0 - unsigned char - eeprom_write (unsigned char i2c_addr, unsigned char eeprom_offset, -- const xdata unsigned char *buf, unsigned char len); -+ const __xdata unsigned char *buf, unsigned char len); - - - #endif /* INCLUDED_EEPROM_IO_H */ -diff --git a/firmware/fx2/usrp1/fpga_load.c b/firmware/fx2/usrp1/fpga_load.c -index c3ae9e7..4c0a85e 100644 ---- a/firmware/fx2/usrp1/fpga_load.c -+++ b/firmware/fx2/usrp1/fpga_load.c -@@ -89,9 +89,9 @@ clock_out_config_byte (unsigned char bits) - #else - - static void --clock_out_config_byte (unsigned char bits) _naked -+clock_out_config_byte (unsigned char bits) __naked - { -- _asm -+ __asm - mov a, dpl - - rrc a -@@ -136,14 +136,14 @@ clock_out_config_byte (unsigned char bits) _naked - - ret - -- _endasm; -+ __endasm; - } - - #endif - - static void - clock_out_bytes (unsigned char bytecount, -- unsigned char xdata *p) -+ unsigned char __xdata *p) - { - while (bytecount-- > 0) - clock_out_config_byte (*p++); -@@ -163,7 +163,7 @@ clock_out_bytes (unsigned char bytecount, - * ALTERA_NSTATUS = 1 (input) - */ - unsigned char --fpga_load_xfer (xdata unsigned char *p, unsigned char bytecount) -+fpga_load_xfer (__xdata unsigned char *p, unsigned char bytecount) - { - clock_out_bytes (bytecount, p); - return 1; -diff --git a/firmware/fx2/usrp1/fpga_rev2.c b/firmware/fx2/usrp1/fpga_rev2.c -index cca961d..a1081f5 100644 ---- a/firmware/fx2/usrp1/fpga_rev2.c -+++ b/firmware/fx2/usrp1/fpga_rev2.c -@@ -30,7 +30,7 @@ unsigned char g_tx_reset = 0; - unsigned char g_rx_reset = 0; - - void --fpga_write_reg (unsigned char regno, const xdata unsigned char *regval) -+fpga_write_reg (unsigned char regno, const __xdata unsigned char *regval) - { - spi_write (0, 0x00 | (regno & 0x7f), - SPI_ENABLE_FPGA, -@@ -39,7 +39,7 @@ fpga_write_reg (unsigned char regno, const xdata unsigned char *regval) - } - - --static xdata unsigned char regval[4] = {0, 0, 0, 0}; -+static __xdata unsigned char regval[4] = {0, 0, 0, 0}; - - static void - write_fpga_master_ctrl (void) -diff --git a/firmware/fx2/usrp1/gpif.c b/firmware/fx2/usrp1/gpif.c -index f6745a4..2ba8a8a 100644 ---- a/firmware/fx2/usrp1/gpif.c -+++ b/firmware/fx2/usrp1/gpif.c -@@ -156,7 +156,7 @@ - // END DO NOT EDIT - - // DO NOT EDIT ... --const char xdata WaveData[128] = -+const char __xdata WaveData[128] = - { - // Wave 0 - /* LenBr */ 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x07, -@@ -182,7 +182,7 @@ const char xdata WaveData[128] = - // END DO NOT EDIT - - // DO NOT EDIT ... --const char xdata FlowStates[36] = -+const char __xdata FlowStates[36] = - { - /* Wave 0 FlowStates */ 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, - /* Wave 1 FlowStates */ 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, -@@ -192,7 +192,7 @@ const char xdata FlowStates[36] = - // END DO NOT EDIT - - // DO NOT EDIT ... --const char xdata InitData[7] = -+const char __xdata InitData[7] = - { - /* Regs */ 0xA0,0x00,0x00,0x00,0xEE,0x4E,0x00 - }; -diff --git a/firmware/fx2/usrp1/usrp_main.c b/firmware/fx2/usrp1/usrp_main.c -index 802516c..841451f 100644 ---- a/firmware/fx2/usrp1/usrp_main.c -+++ b/firmware/fx2/usrp1/usrp_main.c -@@ -63,7 +63,7 @@ unsigned char g_tx_underrun = 0; - * into hash1. - */ - #define USRP_HASH_SIZE 16 --xdata at USRP_HASH_SLOT_1_ADDR unsigned char hash1[USRP_HASH_SIZE]; -+__xdata __at USRP_HASH_SLOT_1_ADDR unsigned char hash1[USRP_HASH_SIZE]; - - static void - get_ep0_data (void) -@@ -305,7 +305,7 @@ main_loop (void) - * Toggle led 0 - */ - void --isr_tick (void) interrupt -+isr_tick (void) __interrupt - { - static unsigned char count = 1; - -@@ -324,8 +324,8 @@ isr_tick (void) interrupt - void - patch_usb_descriptors(void) - { -- static xdata unsigned char hw_rev; -- static xdata unsigned char serial_no[8]; -+ static __xdata unsigned char hw_rev; -+ static __xdata unsigned char serial_no[8]; - unsigned char i; - - eeprom_read(I2C_ADDR_BOOT, HW_REV_OFFSET, &hw_rev, 1); // LSB of device id -diff --git a/firmware/fx2/usrp1/usrp_regs.h b/firmware/fx2/usrp1/usrp_regs.h -index a4f1d98..4390f13 100644 ---- a/firmware/fx2/usrp1/usrp_regs.h -+++ b/firmware/fx2/usrp1/usrp_regs.h -@@ -47,9 +47,9 @@ - #define bmPA_TX_UNDERRUN bmBIT7 // misc pin to FPGA (underflow) - - --sbit at 0x80+0 bitS_CLK; // 0x80 is the bit address of PORT A --sbit at 0x80+1 bitS_OUT; // out from FX2 point of view --sbit at 0x80+2 bitS_IN; // in from FX2 point of view -+__sbit __at 0x80+0 bitS_CLK; // 0x80 is the bit address of PORT A -+__sbit __at 0x80+1 bitS_OUT; // out from FX2 point of view -+__sbit __at 0x80+2 bitS_IN; // in from FX2 point of view - - - /* all outputs except S_DATA_FROM_PERIPH, FX2_2, FX2_3 */ -@@ -85,8 +85,8 @@ sbit at 0x80+2 bitS_IN; // in from FX2 point of view - #define bmPC_LED0 bmBIT6 // active low - #define bmPC_LED1 bmBIT7 // active low - --sbit at 0xA0+1 bitALTERA_DATA0; // 0xA0 is the bit address of PORT C --sbit at 0xA0+3 bitALTERA_DCLK; -+__sbit __at 0xA0+1 bitALTERA_DATA0; // 0xA0 is the bit address of PORT C -+__sbit __at 0xA0+3 bitALTERA_DCLK; - - - #define bmALTERA_BITS (bmALTERA_DATA0 \ -diff --git a/firmware/fx2/utils/edit-gpif-b100.py b/firmware/fx2/utils/edit-gpif-b100.py -index fd949cd..d90993e 100755 ---- a/firmware/fx2/utils/edit-gpif-b100.py -+++ b/firmware/fx2/utils/edit-gpif-b100.py -@@ -105,7 +105,7 @@ def edit_gpif (input_name, output_name, inline_name): - check_flow_state (line, flow_state_dict) - - line = re.sub (r'#include', r'// #include', line) -- line = re.sub (r'xdata ', r'', line) -+ line = re.sub (r'__xdata ', r'', line) - if re.search (r'GpifInit', line): - break - -diff --git a/firmware/fx2/utils/edit-gpif.py b/firmware/fx2/utils/edit-gpif.py -index 5367b75..93f1878 100755 ---- a/firmware/fx2/utils/edit-gpif.py -+++ b/firmware/fx2/utils/edit-gpif.py -@@ -99,7 +99,7 @@ def edit_gpif (input_name, output_name, inline_name): - check_flow_state (line, flow_state_dict) - - line = re.sub (r'#include', r'// #include', line) -- line = re.sub (r'xdata ', r'', line) -+ line = re.sub (r'__xdata ', r'', line) - if re.search (r'GpifInit', line): - break - diff --git a/uhd.spec b/uhd.spec index 82aeacd..7152a25 100644 --- a/uhd.spec +++ b/uhd.spec @@ -7,14 +7,7 @@ # building with --with=neon will enable auto detection %bcond_with neon -%global ver_1 3 -%global ver_2 10 -%global ver_3 3 -%global ver_4 0 - -%global ver %(printf "%03d.%03d.%03d.%03d" %{ver_1} %{ver_2} %{ver_3} %{ver_4}) -%global ver_ %(printf "%03d_%03d_%03d_%03d" %{ver_1} %{ver_2} %{ver_3} %{ver_4}) - +%global wireshark_dissectors chdr zpu octoclock %global wireshark_ver %((%{__awk} '/^#define VERSION[ \t]+/ { print $NF }' /usr/include/wireshark/config.h 2>/dev/null||echo none)|/usr/bin/tr -d '"') %ifarch %{arm} aarch64 @@ -24,15 +17,15 @@ %endif Name: uhd -URL: http://code.ettus.com/redmine/ettus/projects/uhd/wiki -Version: %{ver_1}.%{ver_2}.%{ver_3}.%{ver_4} -Release: 4%{?dist} +URL: http://github.com/EttusResearch/uhd +Version: 3.12.0.0 +Release: 1%{?dist} License: GPLv3+ BuildRequires: gcc-c++ BuildRequires: cmake BuildRequires: boost-devel, libusb1-devel, python2-cheetah, ncurses-devel BuildRequires: python2-docutils, doxygen, pkgconfig, libpcap-devel, wireshark-devel -BuildRequires: python2-mako +BuildRequires: python2-mako, python2-requests, python2-devel, tar %if ! %{with binary_firmware} BuildRequires: sdcc sed %endif @@ -40,13 +33,9 @@ Requires(pre): shadow-utils Requires: python2-tkinter Group: Applications/Engineering Summary: Universal Hardware Driver for Ettus Research products -Source0: http://github.com/EttusResearch/uhd/archive/release_%{ver_}.tar.gz#/uhd-release_%{ver_}.tar.gz +Source0: %{url}/archive/v%{version}/uhd-%{version}.tar.gz Source1: %{name}-limits.conf -Source2: http://files.ettus.com/binaries/images/uhd-images_%{ver}-release.tar.xz -# Fix firmware build with sdcc-3 -Patch0: uhd-3.4.2-sdcc-3-fix.patch -# Workaround for building with gcc-8 (rhbz#1542187) -Patch1: uhd-3.1.3.0-boost-gcc8-compile-fix.patch +Source2: %{url}/releases/download/v%{version}/uhd-images_%{version}.tar.xz %description The UHD is the universal hardware driver for Ettus Research products. @@ -78,22 +67,33 @@ Documentation for the Universal Hardware Driver (UHD). %package tools Summary: Tools for working with / debugging USRP device Requires: %{name} = %{version}-%{release} -#Requires: wireshark = %{wireshark_ver} %description tools Tools that are useful for working with and/or debugging USRP device. +%package wireshark +Summary: Wireshark dissector plugins +Requires: %{name} = %{version}-%{release} +Requires: wireshark = %{wireshark_ver} + +%description wireshark +Wireshark dissector plugins. + %prep -%setup -q -n uhd-release_%{ver_} -%patch0 -p1 -b .sdcc-3-fix -%patch1 -p1 -b .boost-gcc8-compile-fix +%setup -q # firmware %if %{with binary_firmware} # extract binary firmware mkdir -p images/images -tar -xJf %{SOURCE2} -C images/images --strip-components=4 +tar -xJf %{SOURCE2} -C images/images --strip-components=1 rm -f images/images/{LICENSE.txt,*.tag} +# remove Windows drivers +rm -rf images/winusb_driver + +# fix python shebangs +find . -type f -name "*.py" -exec sed -i '/^#!/ s|.*|#!%{__python2}|' {} \; + %endif %build @@ -109,7 +109,8 @@ popd mkdir -p host/build pushd host/build -%cmake %{?have_neon} ../ +%cmake %{?have_neon} -DPYTHON_EXECUTABLE="%{__python2}" \ + -DUHD_VERSION="%{version}" ../ make %{?_smp_mflags} popd @@ -118,14 +119,17 @@ pushd tools/uhd_dump make %{?_smp_mflags} CFLAGS="%{optflags}" LDFLAGS="%{?__global_ldflags}" popd -# tools wireshark plugin -# currenty disabled due to rhbz#1129419 -#pushd tools/chdr-dissector -#mkdir build -#cd build -#%%cmake ../ -#make %{?_smp_mflags} -#popd +# wireshark dissectors +pushd tools/dissectors +for d in %{wireshark_dissectors} +do + mkdir "build_$d" + pushd "build_$d" + %cmake -DETTUS_DISSECTOR_NAME="$d" ../ + make %{?_smp_mflags} + popd +done +popd %check cd host/build @@ -163,10 +167,10 @@ rm -rf %{buildroot}%{_datadir}/uhd/images/winusb_driver # convert hardlinks to symlinks (to not package the file twice) pushd %{buildroot}%{_bindir} -for f in usrp_n2xx_simple_net_burner usrp_x3xx_fpga_burner; +for f in uhd_images_downloader usrp2_card_burner do unlink $f - ln -s ../..%{_libexecdir}/uhd/$f + ln -s ../..%{_libexecdir}/uhd/${f}.py $f done popd @@ -174,6 +178,17 @@ popd install -Dpm 0755 tools/usrp_x3xx_fpga_jtag_programmer.sh %{buildroot}%{_bindir}/usrp_x3xx_fpga_jtag_programmer.sh install -Dpm 0755 tools/uhd_dump/chdr_log %{buildroot}%{_bindir}/chdr_log +# wireshark dissectors +pushd tools/dissectors +for d in %{wireshark_dissectors} +do + pushd "build_$d" + %make_install + popd +done +popd +mv %{buildroot}${HOME}/.wireshark %{buildroot}%{_libdir}/wireshark + %post -p /sbin/ldconfig %postun -p /sbin/ldconfig @@ -183,10 +198,7 @@ install -Dpm 0755 tools/uhd_dump/chdr_log %{buildroot}%{_bindir}/chdr_log %exclude %{_datadir}/uhd/images %doc _tmpdoc/* %{_bindir}/uhd_* -%{_bindir}/usrp2* -%{_bindir}/usrp_n2xx_simple_net_burner -%{_bindir}/usrp_x3xx_fpga_burner -%{_bindir}/octoclock_firmware_burner +%{_bindir}/usrp2_* %{_prefix}/lib/udev/rules.d/10-usrp-uhd.rules %config(noreplace) %{_sysconfdir}/security/limits.d/*.conf %{_libdir}/lib*.so.* @@ -212,7 +224,17 @@ install -Dpm 0755 tools/uhd_dump/chdr_log %{buildroot}%{_bindir}/chdr_log %{_bindir}/usrp_x3xx_fpga_jtag_programmer.sh %{_bindir}/chdr_log +%files wireshark +%{_libdir}/wireshark/plugins/* + %changelog +* Fri Jul 20 2018 Jaroslav Škarvada - 3.12.0.0-1 +- New version + Resolves: rhbz#1606606 +- Dropped sdcc-3-fix patch (upstreamed) +- Dropped boost-gcc8-compile-fix patch (not needed) +- Packaged wireshark dissectors + * Sat Jul 14 2018 Fedora Release Engineering - 3.10.3.0-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild From c6524f2070278a74c4af475e2c36b1e98ae0d3f6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jaroslav=20=C5=A0karvada?= Date: Mon, 10 Dec 2018 14:44:09 +0100 Subject: [PATCH 064/152] Rebuilt for new gnuradio Resolves: rhbz#1625012 --- uhd.spec | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/uhd.spec b/uhd.spec index 7152a25..f1140df 100644 --- a/uhd.spec +++ b/uhd.spec @@ -19,7 +19,7 @@ Name: uhd URL: http://github.com/EttusResearch/uhd Version: 3.12.0.0 -Release: 1%{?dist} +Release: 2%{?dist} License: GPLv3+ BuildRequires: gcc-c++ BuildRequires: cmake @@ -228,6 +228,10 @@ mv %{buildroot}${HOME}/.wireshark %{buildroot}%{_libdir}/wireshark %{_libdir}/wireshark/plugins/* %changelog +* Mon Dec 10 2018 Jaroslav Škarvada - 3.12.0.0-2 +- Rebuilt for new gnuradio + Resolves: rhbz#1625012 + * Fri Jul 20 2018 Jaroslav Škarvada - 3.12.0.0-1 - New version Resolves: rhbz#1606606 From 9ae7392f8a88e3bb392b0d514437ebaa4d50c014 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jaroslav=20=C5=A0karvada?= Date: Mon, 10 Dec 2018 15:00:51 +0100 Subject: [PATCH 065/152] Fixed python shebangs MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Jaroslav Škarvada --- uhd.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/uhd.spec b/uhd.spec index f1140df..b4dfa7e 100644 --- a/uhd.spec +++ b/uhd.spec @@ -90,12 +90,11 @@ tar -xJf %{SOURCE2} -C images/images --strip-components=1 rm -f images/images/{LICENSE.txt,*.tag} # remove Windows drivers rm -rf images/winusb_driver +%endif # fix python shebangs find . -type f -name "*.py" -exec sed -i '/^#!/ s|.*|#!%{__python2}|' {} \; -%endif - %build # firmware %if ! %{with binary_firmware} @@ -231,6 +230,7 @@ mv %{buildroot}${HOME}/.wireshark %{buildroot}%{_libdir}/wireshark * Mon Dec 10 2018 Jaroslav Škarvada - 3.12.0.0-2 - Rebuilt for new gnuradio Resolves: rhbz#1625012 +- Fixed python shebangs * Fri Jul 20 2018 Jaroslav Škarvada - 3.12.0.0-1 - New version From 2ce414616ee6458442c1be4642dc4185c4ea22ea Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jaroslav=20=C5=A0karvada?= Date: Mon, 10 Dec 2018 18:07:13 +0100 Subject: [PATCH 066/152] Fixed generated python scripts shebangs MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Jaroslav Škarvada --- uhd.spec | 3 +++ 1 file changed, 3 insertions(+) diff --git a/uhd.spec b/uhd.spec index b4dfa7e..a0e4f73 100644 --- a/uhd.spec +++ b/uhd.spec @@ -135,6 +135,9 @@ cd host/build make test %install +# fix python shebangs (run again for generated scripts) +find . -type f -name "*.py" -exec sed -i '/^#!/ s|.*|#!%{__python2}|' {} \; + pushd host/build make install DESTDIR=%{buildroot} From 9a27b4cb85e3e0a66cbf2ec670702c837c313f0e Mon Sep 17 00:00:00 2001 From: Igor Gnatenko Date: Tue, 22 Jan 2019 18:41:14 +0100 Subject: [PATCH 067/152] Remove obsolete ldconfig scriptlets References: https://fedoraproject.org/wiki/Changes/RemoveObsoleteScriptlets Signed-off-by: Igor Gnatenko --- uhd.spec | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/uhd.spec b/uhd.spec index a0e4f73..e0fc54f 100644 --- a/uhd.spec +++ b/uhd.spec @@ -191,9 +191,7 @@ done popd mv %{buildroot}${HOME}/.wireshark %{buildroot}%{_libdir}/wireshark -%post -p /sbin/ldconfig - -%postun -p /sbin/ldconfig +%ldconfig_scriptlets %files %exclude %{_docdir}/%{name}/doxygen From 3d4360b0980e52e55d008fdda1b28883b948a6d6 Mon Sep 17 00:00:00 2001 From: Jonathan Wakely Date: Fri, 25 Jan 2019 03:52:23 +0000 Subject: [PATCH 068/152] Rebuilt for Boost 1.69 --- uhd.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/uhd.spec b/uhd.spec index e0fc54f..ccadfdf 100644 --- a/uhd.spec +++ b/uhd.spec @@ -19,7 +19,7 @@ Name: uhd URL: http://github.com/EttusResearch/uhd Version: 3.12.0.0 -Release: 2%{?dist} +Release: 3%{?dist} License: GPLv3+ BuildRequires: gcc-c++ BuildRequires: cmake @@ -228,6 +228,9 @@ mv %{buildroot}${HOME}/.wireshark %{buildroot}%{_libdir}/wireshark %{_libdir}/wireshark/plugins/* %changelog +* Fri Jan 25 2019 Jonathan Wakely - 3.12.0.0-3 +- Rebuilt for Boost 1.69 + * Mon Dec 10 2018 Jaroslav Škarvada - 3.12.0.0-2 - Rebuilt for new gnuradio Resolves: rhbz#1625012 From 8a02e6901a16bea58fefe27735f26c2b1a23c952 Mon Sep 17 00:00:00 2001 From: Igor Gnatenko Date: Mon, 28 Jan 2019 20:18:29 +0100 Subject: [PATCH 069/152] Remove obsolete Group tag References: https://fedoraproject.org/wiki/Changes/Remove_Group_Tag --- uhd.spec | 1 - 1 file changed, 1 deletion(-) diff --git a/uhd.spec b/uhd.spec index ccadfdf..eee8bd2 100644 --- a/uhd.spec +++ b/uhd.spec @@ -31,7 +31,6 @@ BuildRequires: sdcc sed %endif Requires(pre): shadow-utils Requires: python2-tkinter -Group: Applications/Engineering Summary: Universal Hardware Driver for Ettus Research products Source0: %{url}/archive/v%{version}/uhd-%{version}.tar.gz Source1: %{name}-limits.conf From a2c39162a53f243cd0cd7b07938d5a980984924c Mon Sep 17 00:00:00 2001 From: Jonathan Wakely Date: Tue, 29 Jan 2019 16:28:25 +0000 Subject: [PATCH 070/152] Add upstream patches for Boost 1.69.0 header changes --- uhd-boost169.patch | 75 ++++++++++++++++++++++++++++++++++++++++++++++ uhd.spec | 6 ++++ 2 files changed, 81 insertions(+) create mode 100644 uhd-boost169.patch diff --git a/uhd-boost169.patch b/uhd-boost169.patch new file mode 100644 index 0000000..c2a36b0 --- /dev/null +++ b/uhd-boost169.patch @@ -0,0 +1,75 @@ +From 5c012cad7858cadcaa85ec295080f3c8b21fdee0 Mon Sep 17 00:00:00 2001 +From: Martin Braun +Date: Wed, 9 Jan 2019 09:17:07 -0800 +Subject: [PATCH] lib: experts: Add potentially missing but sometimes inferred + include + +This adds an include for boost/core/noncopyable.hpp. Without it, builds +would potentially fail on Boost 1.69++. +--- + host/lib/include/uhdlib/experts/expert_nodes.hpp | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/host/lib/include/uhdlib/experts/expert_nodes.hpp b/host/lib/include/uhdlib/experts/expert_nodes.hpp +index 697ca19c3..8fa183835 100644 +--- a/host/lib/include/uhdlib/experts/expert_nodes.hpp ++++ b/host/lib/include/uhdlib/experts/expert_nodes.hpp +@@ -12,6 +12,7 @@ + #include + #include + #include ++#include + #include + #include + #include + +From f1d6d1e480ca873259c816c0bd2dac5eb7aecd5a Mon Sep 17 00:00:00 2001 +From: Martin Braun +Date: Wed, 9 Jan 2019 16:24:01 -0800 +Subject: [PATCH] lib: experts: fixup for including Boost header + +Header wasn't included until Boost 1.56. + +Fixes 5c012cad7858 ("lib: experts: Add potentially missing but...") +--- + host/lib/include/uhdlib/experts/expert_nodes.hpp | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/host/lib/include/uhdlib/experts/expert_nodes.hpp b/host/lib/include/uhdlib/experts/expert_nodes.hpp +index 8fa183835..a540fc49d 100644 +--- a/host/lib/include/uhdlib/experts/expert_nodes.hpp ++++ b/host/lib/include/uhdlib/experts/expert_nodes.hpp +@@ -12,7 +12,9 @@ + #include + #include + #include ++#if BOOST_VERSION >= 105600 + #include ++#endif + #include + #include + #include + +From 66df76097953ecd3ea7e0154049da949f2306743 Mon Sep 17 00:00:00 2001 +From: Martin Braun +Date: Mon, 14 Jan 2019 13:34:13 -0800 +Subject: [PATCH] includes: Make sure BOOST_VERSION is always available + +Boost changed the includes, and boost/version.hpp was being implicitly +imported. This makes the include explicit. +--- + host/include/uhd/config.hpp | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/host/include/uhd/config.hpp b/host/include/uhd/config.hpp +index 0f619c94a..e7b48e5d8 100644 +--- a/host/include/uhd/config.hpp ++++ b/host/include/uhd/config.hpp +@@ -9,6 +9,7 @@ + #define INCLUDED_UHD_CONFIG_HPP + + #include ++#include + + #ifdef BOOST_MSVC + // suppress warnings diff --git a/uhd.spec b/uhd.spec index eee8bd2..6c2f202 100644 --- a/uhd.spec +++ b/uhd.spec @@ -35,6 +35,8 @@ Summary: Universal Hardware Driver for Ettus Research products Source0: %{url}/archive/v%{version}/uhd-%{version}.tar.gz Source1: %{name}-limits.conf Source2: %{url}/releases/download/v%{version}/uhd-images_%{version}.tar.xz +# Patches for Boost 1.69 support https://github.com/EttusResearch/uhd/pull/248 +Patch0: %{name}-boost169.patch %description The UHD is the universal hardware driver for Ettus Research products. @@ -80,6 +82,7 @@ Wireshark dissector plugins. %prep %setup -q +%patch0 -p1 # firmware %if %{with binary_firmware} @@ -227,6 +230,9 @@ mv %{buildroot}${HOME}/.wireshark %{buildroot}%{_libdir}/wireshark %{_libdir}/wireshark/plugins/* %changelog +* Tue Jan 29 2019 Jonathan Wakely - 3.12.0.0-3 +- Add upstream patches for Boost 1.69.0 header changes + * Fri Jan 25 2019 Jonathan Wakely - 3.12.0.0-3 - Rebuilt for Boost 1.69 From 542078bc8c75ebba6130fd80ba4bece2418ffabb Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sun, 3 Feb 2019 10:43:10 +0000 Subject: [PATCH 071/152] - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- uhd.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/uhd.spec b/uhd.spec index 6c2f202..de61ed6 100644 --- a/uhd.spec +++ b/uhd.spec @@ -19,7 +19,7 @@ Name: uhd URL: http://github.com/EttusResearch/uhd Version: 3.12.0.0 -Release: 3%{?dist} +Release: 4%{?dist} License: GPLv3+ BuildRequires: gcc-c++ BuildRequires: cmake @@ -230,6 +230,9 @@ mv %{buildroot}${HOME}/.wireshark %{buildroot}%{_libdir}/wireshark %{_libdir}/wireshark/plugins/* %changelog +* Sun Feb 03 2019 Fedora Release Engineering - 3.12.0.0-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild + * Tue Jan 29 2019 Jonathan Wakely - 3.12.0.0-3 - Add upstream patches for Boost 1.69.0 header changes From 111f9ee51b88379e78b53f1f8db59e61a7dcd021 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jaroslav=20=C5=A0karvada?= Date: Mon, 1 Apr 2019 17:11:18 +0200 Subject: [PATCH 072/152] Re-introduced usrp group Resolves: rhbz#1694665 --- uhd.spec | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/uhd.spec b/uhd.spec index de61ed6..c6e5771 100644 --- a/uhd.spec +++ b/uhd.spec @@ -19,7 +19,7 @@ Name: uhd URL: http://github.com/EttusResearch/uhd Version: 3.12.0.0 -Release: 4%{?dist} +Release: 5%{?dist} License: GPLv3+ BuildRequires: gcc-c++ BuildRequires: cmake @@ -29,7 +29,7 @@ BuildRequires: python2-mako, python2-requests, python2-devel, tar %if ! %{with binary_firmware} BuildRequires: sdcc sed %endif -Requires(pre): shadow-utils +Requires(pre): shadow-utils, glibc-common Requires: python2-tkinter Summary: Universal Hardware Driver for Ettus Research products Source0: %{url}/archive/v%{version}/uhd-%{version}.tar.gz @@ -144,7 +144,7 @@ pushd host/build make install DESTDIR=%{buildroot} # Fix udev rules and use dynamic ACL management for device -sed -i 's/BUS==/SUBSYSTEM==/;s/SYSFS{/ATTRS{/;s/MODE:="0666"/MODE:="0660", ENV{ID_SOFTWARE_RADIO}="1"/' %{buildroot}%{_libdir}/uhd/utils/uhd-usrp.rules +sed -i 's/BUS==/SUBSYSTEM==/;s/SYSFS{/ATTRS{/;s/MODE:="0666"/GROUP:="usrp" MODE:="0660", ENV{ID_SOFTWARE_RADIO}="1"/' %{buildroot}%{_libdir}/uhd/utils/uhd-usrp.rules mkdir -p %{buildroot}%{_prefix}/lib/udev/rules.d mv %{buildroot}%{_libdir}/uhd/utils/uhd-usrp.rules %{buildroot}%{_prefix}/lib/udev/rules.d/10-usrp-uhd.rules @@ -195,6 +195,11 @@ mv %{buildroot}${HOME}/.wireshark %{buildroot}%{_libdir}/wireshark %ldconfig_scriptlets +%pre +getent group usrp >/dev/null || \ + %{_sbindir}/groupadd -r usrp >/dev/null 2>&1 +exit 0 + %files %exclude %{_docdir}/%{name}/doxygen %exclude %{_datadir}/uhd/images @@ -230,6 +235,10 @@ mv %{buildroot}${HOME}/.wireshark %{buildroot}%{_libdir}/wireshark %{_libdir}/wireshark/plugins/* %changelog +* Mon Apr 1 2019 Jaroslav Škarvada - 3.12.0.0-5 +- Re-introduced usrp group + Resolves: rhbz#1694665 + * Sun Feb 03 2019 Fedora Release Engineering - 3.12.0.0-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild From 2a6210da457f7c796623aaf824535cec3ad679ef Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jaroslav=20=C5=A0karvada?= Date: Mon, 15 Apr 2019 23:15:36 +0200 Subject: [PATCH 073/152] New version, switched to git snapshot Conditionalized wireshark support Disabled wireshark support, it's currently broken (upstream ticket #268) Disabled tests, it's currently broken (upstream ticket #267) Dropped boost169 patch (not needed) --- sources | 4 +-- uhd-boost169.patch | 75 ---------------------------------------------- uhd.spec | 50 +++++++++++++++++++++++-------- 3 files changed, 40 insertions(+), 89 deletions(-) delete mode 100644 uhd-boost169.patch diff --git a/sources b/sources index cc54942..0e75a93 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (uhd-3.12.0.0.tar.gz) = 33efcb913a40fcceaf21460eeb7b8fe7fdd9066cefc1f6ae7d4f436532965b3fe55557d551a8e95c3823418ffec4c0e2804e200c9222b5bf5735622cc2cb1389 -SHA512 (uhd-images_3.12.0.0.tar.xz) = 7bba0d87580413e2843c7e71938c5d5bfeaf7aa3bc58d058c1c80d5e1397443bcec637e378b2e9582752b97b11e57110299231c4ad3ae81cdd629251f49e84d8 +SHA512 (uhd-images_3.14.0.0.tar.xz) = a173d8c384dbe4936b5cfb580c572ca94b877c07ce578960cb9dab30e8d3ee9bfc1833c13981828bb31a748bb0db3e7e1ab475620596ad62d1570703ac0a163b +SHA512 (uhd-3.14.0.0-ac96d055.tar.gz) = 2a913ad0f78563fc0d47a74022e87d15004f14f4290313ec221ac96e729438e772b4b6d359e6d94f286ff935324863a2423c0eed409d36825c620f69d2c0e840 diff --git a/uhd-boost169.patch b/uhd-boost169.patch deleted file mode 100644 index c2a36b0..0000000 --- a/uhd-boost169.patch +++ /dev/null @@ -1,75 +0,0 @@ -From 5c012cad7858cadcaa85ec295080f3c8b21fdee0 Mon Sep 17 00:00:00 2001 -From: Martin Braun -Date: Wed, 9 Jan 2019 09:17:07 -0800 -Subject: [PATCH] lib: experts: Add potentially missing but sometimes inferred - include - -This adds an include for boost/core/noncopyable.hpp. Without it, builds -would potentially fail on Boost 1.69++. ---- - host/lib/include/uhdlib/experts/expert_nodes.hpp | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/host/lib/include/uhdlib/experts/expert_nodes.hpp b/host/lib/include/uhdlib/experts/expert_nodes.hpp -index 697ca19c3..8fa183835 100644 ---- a/host/lib/include/uhdlib/experts/expert_nodes.hpp -+++ b/host/lib/include/uhdlib/experts/expert_nodes.hpp -@@ -12,6 +12,7 @@ - #include - #include - #include -+#include - #include - #include - #include - -From f1d6d1e480ca873259c816c0bd2dac5eb7aecd5a Mon Sep 17 00:00:00 2001 -From: Martin Braun -Date: Wed, 9 Jan 2019 16:24:01 -0800 -Subject: [PATCH] lib: experts: fixup for including Boost header - -Header wasn't included until Boost 1.56. - -Fixes 5c012cad7858 ("lib: experts: Add potentially missing but...") ---- - host/lib/include/uhdlib/experts/expert_nodes.hpp | 2 ++ - 1 file changed, 2 insertions(+) - -diff --git a/host/lib/include/uhdlib/experts/expert_nodes.hpp b/host/lib/include/uhdlib/experts/expert_nodes.hpp -index 8fa183835..a540fc49d 100644 ---- a/host/lib/include/uhdlib/experts/expert_nodes.hpp -+++ b/host/lib/include/uhdlib/experts/expert_nodes.hpp -@@ -12,7 +12,9 @@ - #include - #include - #include -+#if BOOST_VERSION >= 105600 - #include -+#endif - #include - #include - #include - -From 66df76097953ecd3ea7e0154049da949f2306743 Mon Sep 17 00:00:00 2001 -From: Martin Braun -Date: Mon, 14 Jan 2019 13:34:13 -0800 -Subject: [PATCH] includes: Make sure BOOST_VERSION is always available - -Boost changed the includes, and boost/version.hpp was being implicitly -imported. This makes the include explicit. ---- - host/include/uhd/config.hpp | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/host/include/uhd/config.hpp b/host/include/uhd/config.hpp -index 0f619c94a..e7b48e5d8 100644 ---- a/host/include/uhd/config.hpp -+++ b/host/include/uhd/config.hpp -@@ -9,6 +9,7 @@ - #define INCLUDED_UHD_CONFIG_HPP - - #include -+#include - - #ifdef BOOST_MSVC - // suppress warnings diff --git a/uhd.spec b/uhd.spec index c6e5771..d68e2c6 100644 --- a/uhd.spec +++ b/uhd.spec @@ -1,8 +1,18 @@ +%global git_commit ac96d055091c29e2c6b08762b3b3d9da8db5b855 +%global git_date 20190401 + +%global git_short_commit %(echo %{git_commit} | cut -c -8) +%global git_suffix %{git_date}git%{git_short_commit} + # By default include binary_firmware, otherwise try to rebuild # the firmware from sources. If you want to rebuild all firmware # images you need to install appropriate tools (e.g. Xilinx ISE). %bcond_without binary_firmware +# By default do not build with wireshark support, it's currently +# broken (upstream ticket #268) +%bcond_with wireshark + # NEON support is by default disabled on ARMs # building with --with=neon will enable auto detection %bcond_with neon @@ -18,13 +28,16 @@ Name: uhd URL: http://github.com/EttusResearch/uhd -Version: 3.12.0.0 -Release: 5%{?dist} +Version: 3.14.0.0 +Release: 1.%{git_suffix}%{?dist} License: GPLv3+ BuildRequires: gcc-c++ BuildRequires: cmake BuildRequires: boost-devel, libusb1-devel, python2-cheetah, ncurses-devel -BuildRequires: python2-docutils, doxygen, pkgconfig, libpcap-devel, wireshark-devel +BuildRequires: python2-docutils, doxygen, pkgconfig, libpcap-devel +%if %{with wireshark} +BuildRequires: wireshark-devel +%endif BuildRequires: python2-mako, python2-requests, python2-devel, tar %if ! %{with binary_firmware} BuildRequires: sdcc sed @@ -32,11 +45,10 @@ BuildRequires: sdcc sed Requires(pre): shadow-utils, glibc-common Requires: python2-tkinter Summary: Universal Hardware Driver for Ettus Research products -Source0: %{url}/archive/v%{version}/uhd-%{version}.tar.gz +#Source0: %%{url}/archive/v%%{version}/uhd-%%{version}.tar.gz +Source0: %{url}/archive/%{git_commit}/uhd-%{version}-%{git_short_commit}.tar.gz Source1: %{name}-limits.conf Source2: %{url}/releases/download/v%{version}/uhd-images_%{version}.tar.xz -# Patches for Boost 1.69 support https://github.com/EttusResearch/uhd/pull/248 -Patch0: %{name}-boost169.patch %description The UHD is the universal hardware driver for Ettus Research products. @@ -72,6 +84,7 @@ Requires: %{name} = %{version}-%{release} %description tools Tools that are useful for working with and/or debugging USRP device. +%if %{with wireshark} %package wireshark Summary: Wireshark dissector plugins Requires: %{name} = %{version}-%{release} @@ -79,10 +92,10 @@ Requires: wireshark = %{wireshark_ver} %description wireshark Wireshark dissector plugins. +%endif %prep -%setup -q -%patch0 -p1 +%setup -q -n %{name}-%{git_commit} # firmware %if %{with binary_firmware} @@ -111,7 +124,7 @@ popd mkdir -p host/build pushd host/build %cmake %{?have_neon} -DPYTHON_EXECUTABLE="%{__python2}" \ - -DUHD_VERSION="%{version}" ../ + -DUHD_VERSION="%{version}" -DENABLE_TESTS=off ../ make %{?_smp_mflags} popd @@ -120,6 +133,7 @@ pushd tools/uhd_dump make %{?_smp_mflags} CFLAGS="%{optflags}" LDFLAGS="%{?__global_ldflags}" popd +%if %{with wireshark} # wireshark dissectors pushd tools/dissectors for d in %{wireshark_dissectors} @@ -131,10 +145,11 @@ do popd done popd +%endif -%check -cd host/build -make test +#%%check +#cd host/build +#make test %install # fix python shebangs (run again for generated scripts) @@ -182,6 +197,7 @@ popd install -Dpm 0755 tools/usrp_x3xx_fpga_jtag_programmer.sh %{buildroot}%{_bindir}/usrp_x3xx_fpga_jtag_programmer.sh install -Dpm 0755 tools/uhd_dump/chdr_log %{buildroot}%{_bindir}/chdr_log +%if %{with wireshark} # wireshark dissectors pushd tools/dissectors for d in %{wireshark_dissectors} @@ -192,6 +208,7 @@ do done popd mv %{buildroot}${HOME}/.wireshark %{buildroot}%{_libdir}/wireshark +%endif %ldconfig_scriptlets @@ -231,10 +248,19 @@ exit 0 %{_bindir}/usrp_x3xx_fpga_jtag_programmer.sh %{_bindir}/chdr_log +%if %{with wireshark} %files wireshark %{_libdir}/wireshark/plugins/* +%endif %changelog +* Mon Apr 15 2019 Jaroslav Škarvada - 3.14.0.0-1.20190401gitac96d055 +- New version, switched to git snapshot +- Conditionalized wireshark support +- Disabled wireshark support, it's currently broken (upstream ticket #268) +- Disabled tests, it's currently broken (upstream ticket #267) +- Dropped boost169 patch (not needed) + * Mon Apr 1 2019 Jaroslav Škarvada - 3.12.0.0-5 - Re-introduced usrp group Resolves: rhbz#1694665 From 35e76b3bd91b98767de103147e8175bef8f754cc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jaroslav=20=C5=A0karvada?= Date: Tue, 23 Apr 2019 18:21:38 +0200 Subject: [PATCH 074/152] New git snapshot Added python2-numpy build requirement Re-enabled tests for upstream to easily reproduce the problem --- sources | 2 +- uhd.spec | 15 +++++++++++---- 2 files changed, 12 insertions(+), 5 deletions(-) diff --git a/sources b/sources index 0e75a93..a74785e 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ +SHA512 (uhd-3.14.0.0-c52f3f41.tar.gz) = 48070a454ea88414a5f323e6e52d199a46f61d43b3b68ca8e26cdd204666beba5b65978736719d14cffd845c00b1fa5bd014cd229cc30729119c511fb9e3ed54 SHA512 (uhd-images_3.14.0.0.tar.xz) = a173d8c384dbe4936b5cfb580c572ca94b877c07ce578960cb9dab30e8d3ee9bfc1833c13981828bb31a748bb0db3e7e1ab475620596ad62d1570703ac0a163b -SHA512 (uhd-3.14.0.0-ac96d055.tar.gz) = 2a913ad0f78563fc0d47a74022e87d15004f14f4290313ec221ac96e729438e772b4b6d359e6d94f286ff935324863a2423c0eed409d36825c620f69d2c0e840 diff --git a/uhd.spec b/uhd.spec index d68e2c6..7718c98 100644 --- a/uhd.spec +++ b/uhd.spec @@ -1,5 +1,5 @@ -%global git_commit ac96d055091c29e2c6b08762b3b3d9da8db5b855 -%global git_date 20190401 +%global git_commit c52f3f41806622c95573de21be042f966f675543 +%global git_date 201904023 %global git_short_commit %(echo %{git_commit} | cut -c -8) %global git_suffix %{git_date}git%{git_short_commit} @@ -29,12 +29,13 @@ Name: uhd URL: http://github.com/EttusResearch/uhd Version: 3.14.0.0 -Release: 1.%{git_suffix}%{?dist} +Release: 2.%{git_suffix}%{?dist} License: GPLv3+ BuildRequires: gcc-c++ BuildRequires: cmake BuildRequires: boost-devel, libusb1-devel, python2-cheetah, ncurses-devel BuildRequires: python2-docutils, doxygen, pkgconfig, libpcap-devel +BuildRequires: python2-numpy %if %{with wireshark} BuildRequires: wireshark-devel %endif @@ -124,7 +125,8 @@ popd mkdir -p host/build pushd host/build %cmake %{?have_neon} -DPYTHON_EXECUTABLE="%{__python2}" \ - -DUHD_VERSION="%{version}" -DENABLE_TESTS=off ../ + -DUHD_VERSION="%{version}" ../ +# -DENABLE_TESTS=off ../ make %{?_smp_mflags} popd @@ -254,6 +256,11 @@ exit 0 %endif %changelog +* Tue Apr 23 2019 Jaroslav Škarvada - 3.14.0.0-2.201904023gitc52f3f41 +- New git snapshot +- Added python2-numpy build requirement +- Re-enabled tests for upstream to easily reproduce the problem + * Mon Apr 15 2019 Jaroslav Škarvada - 3.14.0.0-1.20190401gitac96d055 - New version, switched to git snapshot - Conditionalized wireshark support From 556c7d8985d8c9214165bea55276ac5248932261 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 27 Jul 2019 02:23:27 +0000 Subject: [PATCH 075/152] - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- uhd.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/uhd.spec b/uhd.spec index 7718c98..5fe10d8 100644 --- a/uhd.spec +++ b/uhd.spec @@ -29,7 +29,7 @@ Name: uhd URL: http://github.com/EttusResearch/uhd Version: 3.14.0.0 -Release: 2.%{git_suffix}%{?dist} +Release: 3.%{git_suffix}%{?dist} License: GPLv3+ BuildRequires: gcc-c++ BuildRequires: cmake @@ -256,6 +256,9 @@ exit 0 %endif %changelog +* Sat Jul 27 2019 Fedora Release Engineering - 3.14.0.0-3.201904023gitc52f3f41 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild + * Tue Apr 23 2019 Jaroslav Škarvada - 3.14.0.0-2.201904023gitc52f3f41 - New git snapshot - Added python2-numpy build requirement From ef6944b8f3798127ce665ee7e6d0f09bb04287be Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jaroslav=20=C5=A0karvada?= Date: Sat, 3 Aug 2019 13:31:33 +0200 Subject: [PATCH 076/152] New version Disabled tests Resolves: rhbz#1736932 --- sources | 4 ++-- uhd.spec | 26 ++++++++++++++++---------- 2 files changed, 18 insertions(+), 12 deletions(-) diff --git a/sources b/sources index a74785e..a2b4e98 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (uhd-3.14.0.0-c52f3f41.tar.gz) = 48070a454ea88414a5f323e6e52d199a46f61d43b3b68ca8e26cdd204666beba5b65978736719d14cffd845c00b1fa5bd014cd229cc30729119c511fb9e3ed54 -SHA512 (uhd-images_3.14.0.0.tar.xz) = a173d8c384dbe4936b5cfb580c572ca94b877c07ce578960cb9dab30e8d3ee9bfc1833c13981828bb31a748bb0db3e7e1ab475620596ad62d1570703ac0a163b +SHA512 (uhd-images_3.14.1.0.tar.xz) = 42bd97fbabfbd2195d9bbe3f339666eb3aadc075bf650817071f8c1c97fd116cace1960fd523cfb3f409dbd5afb7b062a876ff7b03ecb9684645e5d5b98ade54 +SHA512 (uhd-3.14.1.0.tar.gz) = afb58b2f75b9855a4252c21c40e0f8816626910a134719321fa98ec78ce13aa32577a959da11d13d1e40dc61f143442ab7c2993edec111267de4664730c6eb82 diff --git a/uhd.spec b/uhd.spec index 5fe10d8..c711b46 100644 --- a/uhd.spec +++ b/uhd.spec @@ -1,8 +1,8 @@ -%global git_commit c52f3f41806622c95573de21be042f966f675543 -%global git_date 201904023 +#%%global git_commit c52f3f41806622c95573de21be042f966f675543 +#%%global git_date 201904023 -%global git_short_commit %(echo %{git_commit} | cut -c -8) -%global git_suffix %{git_date}git%{git_short_commit} +#%%global git_short_commit %%(echo %{git_commit} | cut -c -8) +#%%global git_suffix %%{git_date}git%{git_short_commit} # By default include binary_firmware, otherwise try to rebuild # the firmware from sources. If you want to rebuild all firmware @@ -28,8 +28,8 @@ Name: uhd URL: http://github.com/EttusResearch/uhd -Version: 3.14.0.0 -Release: 3.%{git_suffix}%{?dist} +Version: 3.14.1.0 +Release: 1%{?dist} License: GPLv3+ BuildRequires: gcc-c++ BuildRequires: cmake @@ -47,7 +47,7 @@ Requires(pre): shadow-utils, glibc-common Requires: python2-tkinter Summary: Universal Hardware Driver for Ettus Research products #Source0: %%{url}/archive/v%%{version}/uhd-%%{version}.tar.gz -Source0: %{url}/archive/%{git_commit}/uhd-%{version}-%{git_short_commit}.tar.gz +Source0: %{url}/archive/v%{version}/uhd-%{version}.tar.gz Source1: %{name}-limits.conf Source2: %{url}/releases/download/v%{version}/uhd-images_%{version}.tar.xz @@ -96,7 +96,7 @@ Wireshark dissector plugins. %endif %prep -%setup -q -n %{name}-%{git_commit} +%setup -q # firmware %if %{with binary_firmware} @@ -125,9 +125,10 @@ popd mkdir -p host/build pushd host/build %cmake %{?have_neon} -DPYTHON_EXECUTABLE="%{__python2}" \ - -DUHD_VERSION="%{version}" ../ -# -DENABLE_TESTS=off ../ + -DUHD_VERSION="%{version}" \ + -DENABLE_TESTS=off ../ make %{?_smp_mflags} +#make -j1 popd # tools @@ -256,6 +257,11 @@ exit 0 %endif %changelog +* Fri Aug 2 2019 Jaroslav Škarvada - 3.14.1.0-1 +- New version +- Disabled tests + Resolves: rhbz#1736932 + * Sat Jul 27 2019 Fedora Release Engineering - 3.14.0.0-3.201904023gitc52f3f41 - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild From 5c46cca850855bde6cefdaba06ba4b089465ff4a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jaroslav=20=C5=A0karvada?= Date: Fri, 8 Nov 2019 23:49:25 +0100 Subject: [PATCH 077/152] New version Switched to Python 3 Resolves: rhbz#1738157 --- uhd.spec | 35 ++++++++++++++++++++++------------- 1 file changed, 22 insertions(+), 13 deletions(-) diff --git a/uhd.spec b/uhd.spec index c711b46..32c36bd 100644 --- a/uhd.spec +++ b/uhd.spec @@ -26,30 +26,33 @@ %endif %endif +%global ver 3.15.0.0 +%global verd 3.14.1.1 + Name: uhd URL: http://github.com/EttusResearch/uhd -Version: 3.14.1.0 -Release: 1%{?dist} +Version: %{ver} +Release: 0.1.rc2%{?dist} License: GPLv3+ BuildRequires: gcc-c++ BuildRequires: cmake -BuildRequires: boost-devel, libusb1-devel, python2-cheetah, ncurses-devel -BuildRequires: python2-docutils, doxygen, pkgconfig, libpcap-devel -BuildRequires: python2-numpy +BuildRequires: boost-devel, libusb1-devel, python3-cheetah, ncurses-devel +BuildRequires: python3-docutils, doxygen, pkgconfig, libpcap-devel +BuildRequires: python3-numpy, vim-common %if %{with wireshark} BuildRequires: wireshark-devel %endif -BuildRequires: python2-mako, python2-requests, python2-devel, tar +BuildRequires: python3-mako, python3-requests, python3-devel, tar %if ! %{with binary_firmware} BuildRequires: sdcc sed %endif Requires(pre): shadow-utils, glibc-common -Requires: python2-tkinter +Requires: python3-tkinter Summary: Universal Hardware Driver for Ettus Research products #Source0: %%{url}/archive/v%%{version}/uhd-%%{version}.tar.gz -Source0: %{url}/archive/v%{version}/uhd-%{version}.tar.gz +Source0: %{url}/archive/v%{ver}-rc2/uhd-%{ver}-rc2.tar.gz Source1: %{name}-limits.conf -Source2: %{url}/releases/download/v%{version}/uhd-images_%{version}.tar.xz +Source2: %{url}/releases/download/v%{verd}/uhd-images_%{verd}.tar.xz %description The UHD is the universal hardware driver for Ettus Research products. @@ -96,7 +99,7 @@ Wireshark dissector plugins. %endif %prep -%setup -q +%setup -q -n %{name}-%{ver}-rc2 # firmware %if %{with binary_firmware} @@ -109,7 +112,7 @@ rm -rf images/winusb_driver %endif # fix python shebangs -find . -type f -name "*.py" -exec sed -i '/^#!/ s|.*|#!%{__python2}|' {} \; +find . -type f -name "*.py" -exec sed -i '/^#!/ s|.*|#!%{__python3}|' {} \; %build # firmware @@ -124,7 +127,7 @@ popd mkdir -p host/build pushd host/build -%cmake %{?have_neon} -DPYTHON_EXECUTABLE="%{__python2}" \ +%cmake %{?have_neon} -DPYTHON_EXECUTABLE="%{__python3}" \ -DUHD_VERSION="%{version}" \ -DENABLE_TESTS=off ../ make %{?_smp_mflags} @@ -156,7 +159,7 @@ popd %install # fix python shebangs (run again for generated scripts) -find . -type f -name "*.py" -exec sed -i '/^#!/ s|.*|#!%{__python2}|' {} \; +find . -type f -name "*.py" -exec sed -i '/^#!/ s|.*|#!%{__python3}|' {} \; pushd host/build make install DESTDIR=%{buildroot} @@ -232,6 +235,7 @@ exit 0 %{_libexecdir}/uhd %{_mandir}/man1/*.1* %{_datadir}/uhd +%{python3_sitearch}/uhd %files firmware %dir %{_datadir}/uhd/images @@ -257,6 +261,11 @@ exit 0 %endif %changelog +* Fri Nov 8 2019 Jaroslav Škarvada - 3.15.0.0-0.1.rc2 +- New version +- Switched to Python 3 + Resolves: rhbz#1738157 + * Fri Aug 2 2019 Jaroslav Škarvada - 3.14.1.0-1 - New version - Disabled tests From 294a499e1c585530cde864324647414b7b4a5447 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jaroslav=20=C5=A0karvada?= Date: Fri, 8 Nov 2019 23:53:31 +0100 Subject: [PATCH 078/152] Added sources MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Jaroslav Škarvada --- sources | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sources b/sources index a2b4e98..6bf1f5e 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (uhd-images_3.14.1.0.tar.xz) = 42bd97fbabfbd2195d9bbe3f339666eb3aadc075bf650817071f8c1c97fd116cace1960fd523cfb3f409dbd5afb7b062a876ff7b03ecb9684645e5d5b98ade54 -SHA512 (uhd-3.14.1.0.tar.gz) = afb58b2f75b9855a4252c21c40e0f8816626910a134719321fa98ec78ce13aa32577a959da11d13d1e40dc61f143442ab7c2993edec111267de4664730c6eb82 +SHA512 (uhd-images_3.14.1.1.tar.xz) = d2afde2f6a243fe3763f09ffe50bf4372af7f2b840df013f3eb111f0e713c9d57317414c389c8db87151ec8c2a868b2d4c67e571a8f6d3b17a250fb63f25aedd +SHA512 (uhd-3.15.0.0-rc2.tar.gz) = e4054ac9e481e1ee97f9046f0c2b3053c4d346bbe8df01e6ae515a1d592ac5a41e847537f4e20ba105f52a5d6aa3a5b5a356faa8cb220873521cbdb3a8cd56fd From 79545f358593c4fe7a515cdeee1f301247bd9407 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 31 Jan 2020 02:30:22 +0000 Subject: [PATCH 079/152] - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- uhd.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/uhd.spec b/uhd.spec index 32c36bd..9070bfa 100644 --- a/uhd.spec +++ b/uhd.spec @@ -32,7 +32,7 @@ Name: uhd URL: http://github.com/EttusResearch/uhd Version: %{ver} -Release: 0.1.rc2%{?dist} +Release: 0.2.rc2%{?dist} License: GPLv3+ BuildRequires: gcc-c++ BuildRequires: cmake @@ -261,6 +261,9 @@ exit 0 %endif %changelog +* Fri Jan 31 2020 Fedora Release Engineering - 3.15.0.0-0.2.rc2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild + * Fri Nov 8 2019 Jaroslav Škarvada - 3.15.0.0-0.1.rc2 - New version - Switched to Python 3 From dc44499c2a30c85fe43b02fafbfe28a70ca8269d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jaroslav=20=C5=A0karvada?= Date: Fri, 17 Apr 2020 00:43:05 +0200 Subject: [PATCH 080/152] Provided uhd modules directory --- uhd.spec | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/uhd.spec b/uhd.spec index 9070bfa..2358b39 100644 --- a/uhd.spec +++ b/uhd.spec @@ -32,7 +32,7 @@ Name: uhd URL: http://github.com/EttusResearch/uhd Version: %{ver} -Release: 0.2.rc2%{?dist} +Release: 0.3.rc2%{?dist} License: GPLv3+ BuildRequires: gcc-c++ BuildRequires: cmake @@ -216,6 +216,9 @@ popd mv %{buildroot}${HOME}/.wireshark %{buildroot}%{_libdir}/wireshark %endif +# add directory for modules +mkdir -p %{buildroot}%{_libdir}/uhd/modules + %ldconfig_scriptlets %pre @@ -227,11 +230,13 @@ exit 0 %exclude %{_docdir}/%{name}/doxygen %exclude %{_datadir}/uhd/images %doc _tmpdoc/* +%dir %{_libdir}/uhd %{_bindir}/uhd_* %{_bindir}/usrp2_* %{_prefix}/lib/udev/rules.d/10-usrp-uhd.rules %config(noreplace) %{_sysconfdir}/security/limits.d/*.conf %{_libdir}/lib*.so.* +%{_libdir}/uhd/modules %{_libexecdir}/uhd %{_mandir}/man1/*.1* %{_datadir}/uhd @@ -261,6 +266,9 @@ exit 0 %endif %changelog +* Thu Apr 16 2020 Jaroslav Škarvada - 3.15.0.0-0.3.rc2 +- Provided uhd modules directory + * Fri Jan 31 2020 Fedora Release Engineering - 3.15.0.0-0.2.rc2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild From 562e4f234e3972d5df1dd212694868824162f80c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miro=20Hron=C4=8Dok?= Date: Tue, 26 May 2020 03:53:57 +0200 Subject: [PATCH 081/152] Rebuilt for Python 3.9 --- uhd.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/uhd.spec b/uhd.spec index 2358b39..97240d5 100644 --- a/uhd.spec +++ b/uhd.spec @@ -32,7 +32,7 @@ Name: uhd URL: http://github.com/EttusResearch/uhd Version: %{ver} -Release: 0.3.rc2%{?dist} +Release: 0.4.rc2%{?dist} License: GPLv3+ BuildRequires: gcc-c++ BuildRequires: cmake @@ -266,6 +266,9 @@ exit 0 %endif %changelog +* Tue May 26 2020 Miro Hrončok - 3.15.0.0-0.4.rc2 +- Rebuilt for Python 3.9 + * Thu Apr 16 2020 Jaroslav Škarvada - 3.15.0.0-0.3.rc2 - Provided uhd modules directory From 745534ebabc68ae009475424e8bcee0fc5f0317a Mon Sep 17 00:00:00 2001 From: Jonathan Wakely Date: Wed, 3 Jun 2020 13:02:16 +0100 Subject: [PATCH 082/152] Rebuilt and patched for Boost 1.73 --- uhd-bind-placeholders.patch | 182 ++++++++++++++++++++++++++++++++++++ uhd.spec | 7 +- 2 files changed, 188 insertions(+), 1 deletion(-) create mode 100644 uhd-bind-placeholders.patch diff --git a/uhd-bind-placeholders.patch b/uhd-bind-placeholders.patch new file mode 100644 index 0000000..980f03e --- /dev/null +++ b/uhd-bind-placeholders.patch @@ -0,0 +1,182 @@ +--- uhd-3.15.0.0-rc2/host/cmake/Modules/UHDBoost.cmake~ 2020-06-03 14:17:53.758142936 +0100 ++++ uhd-3.15.0.0-rc2/host/cmake/Modules/UHDBoost.cmake 2020-06-03 14:17:55.821143050 +0100 +@@ -260,6 +260,9 @@ + # works for Boost 1.67.0 and newer & doesn't hurt older + add_definitions(-DBOOST_ASIO_DISABLE_STD_EXPERIMENTAL_STRING_VIEW) + ++ # Needed for Boost 1.73.0 to prevent warnings ++ add_definitions(-DBOOST_BIND_GLOBAL_PLACEHOLDERS) ++ + # Boost 1.70.0's find cmake scripts don't always set the expected + # return variables. Replicate the commit that fixes that issue here: + # https://github.com/boostorg/boost_install/commit/cfa8d55250dfc2635e907e42da423e4eb540dee5 +--- uhd-3.15.0.0-rc2/host/lib/rfnoc/dma_fifo_block_ctrl_impl.cpp~ 2020-06-03 14:27:43.441170397 +0100 ++++ uhd-3.15.0.0-rc2/host/lib/rfnoc/dma_fifo_block_ctrl_impl.cpp 2020-06-03 14:27:48.015170596 +0100 +@@ -17,6 +17,7 @@ + + using namespace uhd; + using namespace uhd::rfnoc; ++using namespace boost::placeholders; + + class dma_fifo_block_ctrl_impl : public dma_fifo_block_ctrl + { +--- uhd-3.15.0.0-rc2/host/lib/usrp/multi_usrp.cpp~ 2020-06-03 14:28:32.297172502 +0100 ++++ uhd-3.15.0.0-rc2/host/lib/usrp/multi_usrp.cpp 2020-06-03 14:28:40.874172872 +0100 +@@ -31,6 +31,7 @@ + + using namespace uhd; + using namespace uhd::usrp; ++using namespace boost::placeholders; + + const size_t multi_usrp::ALL_MBOARDS = size_t(~0); + const size_t multi_usrp::ALL_CHANS = size_t(~0); +--- uhd-3.15.0.0-rc2/host/lib/usrp/cores/rx_dsp_core_3000.cpp~ 2020-06-03 14:31:35.175180398 +0100 ++++ uhd-3.15.0.0-rc2/host/lib/usrp/cores/rx_dsp_core_3000.cpp 2020-06-03 14:31:42.021180693 +0100 +@@ -37,6 +37,7 @@ + } + + using namespace uhd; ++using namespace boost::placeholders; + + const double rx_dsp_core_3000::DEFAULT_CORDIC_FREQ = 0.0; + const double rx_dsp_core_3000::DEFAULT_RATE = 1e6; +--- uhd-3.15.0.0-rc2/host/lib/usrp/cores/tx_dsp_core_3000.cpp~ 2020-06-03 14:32:19.984182329 +0100 ++++ uhd-3.15.0.0-rc2/host/lib/usrp/cores/tx_dsp_core_3000.cpp 2020-06-03 14:32:25.278182557 +0100 +@@ -28,6 +28,7 @@ + } + + using namespace uhd; ++using namespace boost::placeholders; + + const double tx_dsp_core_3000::DEFAULT_CORDIC_FREQ = 0.0; + const double tx_dsp_core_3000::DEFAULT_RATE = 1e6; +--- uhd-3.15.0.0-rc2/host/lib/usrp/dboard/db_cbx.cpp~ 2020-06-03 14:33:42.513185887 +0100 ++++ uhd-3.15.0.0-rc2/host/lib/usrp/dboard/db_cbx.cpp 2020-06-03 14:33:44.167185959 +0100 +@@ -12,6 +12,7 @@ + using namespace uhd; + using namespace uhd::usrp; + using namespace boost::assign; ++using namespace boost::placeholders; + + /*********************************************************************** + * Structors +--- uhd-3.15.0.0-rc2/host/lib/usrp/dboard/db_tvrx2.cpp~ 2020-06-03 14:34:31.865188014 +0100 ++++ uhd-3.15.0.0-rc2/host/lib/usrp/dboard/db_tvrx2.cpp 2020-06-03 14:34:38.007188279 +0100 +@@ -65,6 +65,7 @@ + using namespace uhd; + using namespace uhd::usrp; + using namespace boost::assign; ++using namespace boost::placeholders; + + /*********************************************************************** + * The TVRX2 types +--- uhd-3.15.0.0-rc2/host/lib/usrp/x300/x300_radio_ctrl_impl.cpp~ 2020-06-03 14:35:57.858191722 +0100 ++++ uhd-3.15.0.0-rc2/host/lib/usrp/x300/x300_radio_ctrl_impl.cpp 2020-06-03 14:36:02.680191929 +0100 +@@ -27,6 +27,7 @@ + using namespace uhd::usrp; + using namespace uhd::rfnoc; + using namespace uhd::usrp::x300; ++using namespace boost::placeholders; + + static const size_t IO_MASTER_RADIO = 0; + +--- uhd-3.15.0.0-rc2/host/lib/usrp/b100/b100_impl.cpp~ 2020-06-03 14:36:19.706192663 +0100 ++++ uhd-3.15.0.0-rc2/host/lib/usrp/b100/b100_impl.cpp 2020-06-03 14:36:25.680192921 +0100 +@@ -23,6 +23,7 @@ + using namespace uhd; + using namespace uhd::usrp; + using namespace uhd::transport; ++using namespace boost::placeholders; + + namespace { + constexpr uint16_t B100_VENDOR_ID = 0x2500; +--- uhd-3.15.0.0-rc2/host/lib/usrp_clock/octoclock/octoclock_impl.cpp~ 2020-06-03 14:36:54.427194160 +0100 ++++ uhd-3.15.0.0-rc2/host/lib/usrp_clock/octoclock/octoclock_impl.cpp 2020-06-03 14:37:11.471194895 +0100 +@@ -34,6 +34,7 @@ + using namespace uhd; + using namespace uhd::usrp_clock; + using namespace uhd::transport; ++using namespace boost::placeholders; + namespace asio = boost::asio; + namespace fs = boost::filesystem; + +--- uhd-3.15.0.0-rc2/host/lib/usrp/dboard/db_sbx_version4.cpp~ 2020-06-03 14:40:42.223206781 +0100 ++++ uhd-3.15.0.0-rc2/host/lib/usrp/dboard/db_sbx_version4.cpp 2020-06-03 14:40:49.140207195 +0100 +@@ -13,6 +13,7 @@ + using namespace uhd; + using namespace uhd::usrp; + using namespace boost::assign; ++using namespace boost::placeholders; + + /*********************************************************************** + * Structors +--- uhd-3.15.0.0-rc2/host/lib/usrp/dboard/db_dbsrx2.cpp~ 2020-06-03 14:41:03.583208062 +0100 ++++ uhd-3.15.0.0-rc2/host/lib/usrp/dboard/db_dbsrx2.cpp 2020-06-03 14:41:12.806208613 +0100 +@@ -26,6 +26,7 @@ + using namespace uhd; + using namespace uhd::usrp; + using namespace boost::assign; ++using namespace boost::placeholders; + + /*********************************************************************** + * The DBSRX2 constants +--- uhd-3.15.0.0-rc2/host/lib/usrp/dboard/db_tvrx.cpp~ 2020-06-03 14:41:26.807209454 +0100 ++++ uhd-3.15.0.0-rc2/host/lib/usrp/dboard/db_tvrx.cpp 2020-06-03 14:41:38.846210175 +0100 +@@ -41,6 +41,7 @@ + using namespace uhd; + using namespace uhd::usrp; + using namespace boost::assign; ++using namespace boost::placeholders; + + /*********************************************************************** + * The tvrx constants +--- uhd-3.15.0.0-rc2/host/lib/usrp/dboard/db_dbsrx.cpp~ 2020-06-03 14:41:50.031210845 +0100 ++++ uhd-3.15.0.0-rc2/host/lib/usrp/dboard/db_dbsrx.cpp 2020-06-03 14:41:55.988211201 +0100 +@@ -31,6 +31,7 @@ + using namespace uhd; + using namespace uhd::usrp; + using namespace boost::assign; ++using namespace boost::placeholders; + + /*********************************************************************** + * The DBSRX constants +--- uhd-3.15.0.0-rc2/host/lib/usrp/dboard/db_sbx_common.cpp~ 2020-06-03 15:03:03.828285516 +0100 ++++ uhd-3.15.0.0-rc2/host/lib/usrp/dboard/db_sbx_common.cpp 2020-06-03 15:03:06.925285692 +0100 +@@ -10,6 +10,7 @@ + using namespace uhd; + using namespace uhd::usrp; + using namespace boost::assign; ++using namespace boost::placeholders; + + + /*********************************************************************** +--- uhd-3.15.0.0-rc2/host/lib/usrp/dboard/db_xcvr2450.cpp~ 2020-06-03 15:03:37.135287400 +0100 ++++ uhd-3.15.0.0-rc2/host/lib/usrp/dboard/db_xcvr2450.cpp 2020-06-03 15:03:46.203287915 +0100 +@@ -58,6 +58,7 @@ + using namespace uhd; + using namespace uhd::usrp; + using namespace boost::assign; ++using namespace boost::placeholders; + + /*********************************************************************** + * The XCVR 2450 constants +--- uhd-3.15.0.0-rc2/host/lib/usrp/dboard/db_sbx_version3.cpp~ 2020-06-03 15:04:13.982289481 +0100 ++++ uhd-3.15.0.0-rc2/host/lib/usrp/dboard/db_sbx_version3.cpp 2020-06-03 15:04:21.595289912 +0100 +@@ -13,6 +13,7 @@ + using namespace uhd; + using namespace uhd::usrp; + using namespace boost::assign; ++using namespace boost::placeholders; + + /*********************************************************************** + * Structors +--- uhd-3.15.0.0-rc2/host/lib/usrp/dboard/db_ubx.cpp~ 2020-06-03 15:20:39.628345132 +0100 ++++ uhd-3.15.0.0-rc2/host/lib/usrp/dboard/db_ubx.cpp 2020-06-03 15:20:48.073345609 +0100 +@@ -30,6 +30,7 @@ + + using namespace uhd; + using namespace uhd::usrp; ++using namespace boost::placeholders; + + /*********************************************************************** + * UBX Data Structures diff --git a/uhd.spec b/uhd.spec index 97240d5..b7adac6 100644 --- a/uhd.spec +++ b/uhd.spec @@ -32,7 +32,7 @@ Name: uhd URL: http://github.com/EttusResearch/uhd Version: %{ver} -Release: 0.4.rc2%{?dist} +Release: 0.5.rc2%{?dist} License: GPLv3+ BuildRequires: gcc-c++ BuildRequires: cmake @@ -53,6 +53,7 @@ Summary: Universal Hardware Driver for Ettus Research products Source0: %{url}/archive/v%{ver}-rc2/uhd-%{ver}-rc2.tar.gz Source1: %{name}-limits.conf Source2: %{url}/releases/download/v%{verd}/uhd-images_%{verd}.tar.xz +Patch0: %{name}-bind-placeholders.patch %description The UHD is the universal hardware driver for Ettus Research products. @@ -100,6 +101,7 @@ Wireshark dissector plugins. %prep %setup -q -n %{name}-%{ver}-rc2 +%patch0 -p1 # firmware %if %{with binary_firmware} @@ -266,6 +268,9 @@ exit 0 %endif %changelog +* Wed Jun 03 2020 Jonathan Wakely - 3.15.0.0-0.5.rc2 +- Rebuilt and patched for Boost 1.73 + * Tue May 26 2020 Miro Hrončok - 3.15.0.0-0.4.rc2 - Rebuilt for Python 3.9 From d6be796032f389e75ba17ddc662c0ab02252cfd0 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 29 Jul 2020 13:13:12 +0000 Subject: [PATCH 083/152] - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- uhd.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/uhd.spec b/uhd.spec index b7adac6..fdbecce 100644 --- a/uhd.spec +++ b/uhd.spec @@ -32,7 +32,7 @@ Name: uhd URL: http://github.com/EttusResearch/uhd Version: %{ver} -Release: 0.5.rc2%{?dist} +Release: 0.6.rc2%{?dist} License: GPLv3+ BuildRequires: gcc-c++ BuildRequires: cmake @@ -268,6 +268,9 @@ exit 0 %endif %changelog +* Wed Jul 29 2020 Fedora Release Engineering - 3.15.0.0-0.6.rc2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + * Wed Jun 03 2020 Jonathan Wakely - 3.15.0.0-0.5.rc2 - Rebuilt and patched for Boost 1.73 From a7d22bb7bcffa6bd96c8fa5b299501d90091ee1d Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 1 Aug 2020 09:32:20 +0000 Subject: [PATCH 084/152] - Second attempt - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- uhd.spec | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/uhd.spec b/uhd.spec index fdbecce..09ea453 100644 --- a/uhd.spec +++ b/uhd.spec @@ -32,7 +32,7 @@ Name: uhd URL: http://github.com/EttusResearch/uhd Version: %{ver} -Release: 0.6.rc2%{?dist} +Release: 0.7.rc2%{?dist} License: GPLv3+ BuildRequires: gcc-c++ BuildRequires: cmake @@ -268,6 +268,10 @@ exit 0 %endif %changelog +* Sat Aug 01 2020 Fedora Release Engineering - 3.15.0.0-0.7.rc2 +- Second attempt - Rebuilt for + https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + * Wed Jul 29 2020 Fedora Release Engineering - 3.15.0.0-0.6.rc2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild From ea7ad13ad3491688c096765d9040859be716c4a4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jaroslav=20=C5=A0karvada?= Date: Wed, 5 Aug 2020 13:16:04 +0200 Subject: [PATCH 085/152] Fixed FTBFS Resolves: rhbz#1865590 --- uhd.spec | 24 +++++++++++++----------- 1 file changed, 13 insertions(+), 11 deletions(-) diff --git a/uhd.spec b/uhd.spec index 09ea453..e304d3d 100644 --- a/uhd.spec +++ b/uhd.spec @@ -32,7 +32,7 @@ Name: uhd URL: http://github.com/EttusResearch/uhd Version: %{ver} -Release: 0.7.rc2%{?dist} +Release: 0.8.rc2%{?dist} License: GPLv3+ BuildRequires: gcc-c++ BuildRequires: cmake @@ -127,13 +127,11 @@ make %{?_smp_mflags} images popd %endif -mkdir -p host/build -pushd host/build +pushd host %cmake %{?have_neon} -DPYTHON_EXECUTABLE="%{__python3}" \ -DUHD_VERSION="%{version}" \ -DENABLE_TESTS=off ../ -make %{?_smp_mflags} -#make -j1 +%cmake_build popd # tools @@ -148,8 +146,8 @@ for d in %{wireshark_dissectors} do mkdir "build_$d" pushd "build_$d" - %cmake -DETTUS_DISSECTOR_NAME="$d" ../ - make %{?_smp_mflags} + %cmake -DETTUS_DISSECTOR_NAME="$d" -S ".." + %cmake_build popd done popd @@ -163,8 +161,8 @@ popd # fix python shebangs (run again for generated scripts) find . -type f -name "*.py" -exec sed -i '/^#!/ s|.*|#!%{__python3}|' {} \; -pushd host/build -make install DESTDIR=%{buildroot} +pushd host +%cmake_install # Fix udev rules and use dynamic ACL management for device sed -i 's/BUS==/SUBSYSTEM==/;s/SYSFS{/ATTRS{/;s/MODE:="0666"/GROUP:="usrp" MODE:="0660", ENV{ID_SOFTWARE_RADIO}="1"/' %{buildroot}%{_libdir}/uhd/utils/uhd-usrp.rules @@ -208,9 +206,9 @@ install -Dpm 0755 tools/uhd_dump/chdr_log %{buildroot}%{_bindir}/chdr_log %if %{with wireshark} # wireshark dissectors pushd tools/dissectors -for d in %{wireshark_dissectors} +for d in build_*/* do - pushd "build_$d" + pushd "$d" %make_install popd done @@ -268,6 +266,10 @@ exit 0 %endif %changelog +* Wed Aug 5 2020 Jaroslav Škarvada - 3.15.0.0-0.8.rc2 +- Fixed FTBFS + Resolves: rhbz#1865590 + * Sat Aug 01 2020 Fedora Release Engineering - 3.15.0.0-0.7.rc2 - Second attempt - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild From 11aa984027c7e23fa7b78254b98c8b35231db027 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jaroslav=20=C5=A0karvada?= Date: Wed, 5 Aug 2020 14:27:54 +0200 Subject: [PATCH 086/152] Made doc arch due to bug in doxygen MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Jaroslav Škarvada --- uhd.spec | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/uhd.spec b/uhd.spec index e304d3d..917cda4 100644 --- a/uhd.spec +++ b/uhd.spec @@ -75,9 +75,9 @@ Requires: %{name} = %{version}-%{release} %description devel Development files for the Universal Hardware Driver (UHD). +# arch due to bug in doxygen %package doc Summary: Documentation files for UHD -BuildArch: noarch %description doc Documentation for the Universal Hardware Driver (UHD). @@ -269,6 +269,7 @@ exit 0 * Wed Aug 5 2020 Jaroslav Škarvada - 3.15.0.0-0.8.rc2 - Fixed FTBFS Resolves: rhbz#1865590 +- Made doc arch due to bug in doxygen * Sat Aug 01 2020 Fedora Release Engineering - 3.15.0.0-0.7.rc2 - Second attempt - Rebuilt for From c31974efbc066c5d82afc517facb2ca8a539c42b Mon Sep 17 00:00:00 2001 From: Jeff Law Date: Fri, 4 Dec 2020 21:03:00 -0700 Subject: [PATCH 087/152] Fix missing #includes for gcc-11 --- uhd-gcc11.patch | 228 ++++++++++++++++++++++++++++++++++++++++++++++++ uhd.spec | 7 +- 2 files changed, 234 insertions(+), 1 deletion(-) create mode 100644 uhd-gcc11.patch diff --git a/uhd-gcc11.patch b/uhd-gcc11.patch new file mode 100644 index 0000000..e880eb4 --- /dev/null +++ b/uhd-gcc11.patch @@ -0,0 +1,228 @@ +diff --git a/host/lib/usrp/dboard/e3xx/e31x_radio_ctrl_impl.cpp b/host/lib/usrp/dboard/e3xx/e31x_radio_ctrl_impl.cpp +index 3356510..55a8981 100644 +--- a/host/lib/usrp/dboard/e3xx/e31x_radio_ctrl_impl.cpp ++++ b/host/lib/usrp/dboard/e3xx/e31x_radio_ctrl_impl.cpp +@@ -4,6 +4,7 @@ + // SPDX-License-Identifier: GPL-3.0-or-later + // + ++#include + #include "e31x_radio_ctrl_impl.hpp" + #include "e31x_regs.hpp" + +diff --git a/host/lib/usrp/dboard/e3xx/e320_radio_ctrl_impl.cpp b/host/lib/usrp/dboard/e3xx/e320_radio_ctrl_impl.cpp +index c48cabc..0771aa0 100644 +--- a/host/lib/usrp/dboard/e3xx/e320_radio_ctrl_impl.cpp ++++ b/host/lib/usrp/dboard/e3xx/e320_radio_ctrl_impl.cpp +@@ -4,6 +4,8 @@ + // SPDX-License-Identifier: GPL-3.0-or-later + // + ++#include ++ + #include "e320_radio_ctrl_impl.hpp" + #include "e320_regs.hpp" + +diff --git a/host/lib/usrp/dboard/e3xx/e3xx_ad9361_iface.cpp b/host/lib/usrp/dboard/e3xx/e3xx_ad9361_iface.cpp +index d9cadc8..155a075 100644 +--- a/host/lib/usrp/dboard/e3xx/e3xx_ad9361_iface.cpp ++++ b/host/lib/usrp/dboard/e3xx/e3xx_ad9361_iface.cpp +@@ -4,6 +4,7 @@ + // SPDX-License-Identifier: GPL-3.0-or-later + // + ++#include + #include "e3xx_ad9361_iface.hpp" + #include + #include +diff --git a/host/lib/usrp/dboard/e3xx/e3xx_bands.cpp b/host/lib/usrp/dboard/e3xx/e3xx_bands.cpp +index 001cf5d..c13b7e8 100644 +--- a/host/lib/usrp/dboard/e3xx/e3xx_bands.cpp ++++ b/host/lib/usrp/dboard/e3xx/e3xx_bands.cpp +@@ -4,6 +4,7 @@ + // SPDX-License-Identifier: GPL-3.0-or-later + // + ++#include + #include "e3xx_constants.hpp" + #include "e3xx_radio_ctrl_impl.hpp" + #include +diff --git a/host/lib/usrp/dboard/e3xx/e3xx_radio_ctrl_impl.cpp b/host/lib/usrp/dboard/e3xx/e3xx_radio_ctrl_impl.cpp +index 989b73b..587ef6d 100644 +--- a/host/lib/usrp/dboard/e3xx/e3xx_radio_ctrl_impl.cpp ++++ b/host/lib/usrp/dboard/e3xx/e3xx_radio_ctrl_impl.cpp +@@ -4,6 +4,7 @@ + // SPDX-License-Identifier: GPL-3.0-or-later + // + ++#include + #include "e3xx_radio_ctrl_impl.hpp" + #include "e3xx_constants.hpp" + #include +diff --git a/host/lib/usrp/dboard/e3xx/e3xx_radio_ctrl_init.cpp b/host/lib/usrp/dboard/e3xx/e3xx_radio_ctrl_init.cpp +index 5b33b33..bd5aac1 100644 +--- a/host/lib/usrp/dboard/e3xx/e3xx_radio_ctrl_init.cpp ++++ b/host/lib/usrp/dboard/e3xx/e3xx_radio_ctrl_init.cpp +@@ -4,6 +4,9 @@ + // SPDX-License-Identifier: GPL-3.0-or-later + // + ++#include ++#include ++ + #include "e3xx_constants.hpp" + #include "e3xx_radio_ctrl_impl.hpp" + #include +diff --git a/host/lib/usrp/dboard/magnesium/magnesium_ad9371_iface.cpp b/host/lib/usrp/dboard/magnesium/magnesium_ad9371_iface.cpp +index d7d1b43..d1308d1 100644 +--- a/host/lib/usrp/dboard/magnesium/magnesium_ad9371_iface.cpp ++++ b/host/lib/usrp/dboard/magnesium/magnesium_ad9371_iface.cpp +@@ -4,6 +4,7 @@ + // SPDX-License-Identifier: GPL-3.0-or-later + // + ++#include + #include "magnesium_ad9371_iface.hpp" + #include "magnesium_constants.hpp" + #include +diff --git a/host/lib/usrp/dboard/magnesium/magnesium_bands.cpp b/host/lib/usrp/dboard/magnesium/magnesium_bands.cpp +index 13cc52d..1bd71ae 100644 +--- a/host/lib/usrp/dboard/magnesium/magnesium_bands.cpp ++++ b/host/lib/usrp/dboard/magnesium/magnesium_bands.cpp +@@ -6,6 +6,7 @@ + + // The band plan + ++#include + #include "magnesium_constants.hpp" + #include "magnesium_radio_ctrl_impl.hpp" + #include +diff --git a/host/lib/usrp/dboard/magnesium/magnesium_gain_table.cpp b/host/lib/usrp/dboard/magnesium/magnesium_gain_table.cpp +index 67b20f5..7963153 100644 +--- a/host/lib/usrp/dboard/magnesium/magnesium_gain_table.cpp ++++ b/host/lib/usrp/dboard/magnesium/magnesium_gain_table.cpp +@@ -4,6 +4,8 @@ + // SPDX-License-Identifier: GPL-3.0-or-later + // + ++#include ++ + #include "magnesium_gain_table.hpp" + #include "magnesium_constants.hpp" + #include +diff --git a/host/lib/usrp/dboard/magnesium/magnesium_radio_ctrl_cpld.cpp b/host/lib/usrp/dboard/magnesium/magnesium_radio_ctrl_cpld.cpp +index 679816a..26bf5fd 100644 +--- a/host/lib/usrp/dboard/magnesium/magnesium_radio_ctrl_cpld.cpp ++++ b/host/lib/usrp/dboard/magnesium/magnesium_radio_ctrl_cpld.cpp +@@ -4,6 +4,7 @@ + // SPDX-License-Identifier: GPL-3.0-or-later + // + ++#include + #include "magnesium_constants.hpp" + #include "magnesium_cpld_ctrl.hpp" + #include "magnesium_radio_ctrl_impl.hpp" +diff --git a/host/lib/usrp/dboard/magnesium/magnesium_radio_ctrl_gain.cpp b/host/lib/usrp/dboard/magnesium/magnesium_radio_ctrl_gain.cpp +index b66bd2e..041d651 100644 +--- a/host/lib/usrp/dboard/magnesium/magnesium_radio_ctrl_gain.cpp ++++ b/host/lib/usrp/dboard/magnesium/magnesium_radio_ctrl_gain.cpp +@@ -4,6 +4,8 @@ + // SPDX-License-Identifier: GPL-3.0-or-later + // + ++#include ++ + #include "magnesium_constants.hpp" + #include "magnesium_gain_table.hpp" + #include "magnesium_radio_ctrl_impl.hpp" +diff --git a/host/lib/usrp/dboard/magnesium/magnesium_radio_ctrl_impl.cpp b/host/lib/usrp/dboard/magnesium/magnesium_radio_ctrl_impl.cpp +index 405d595..5d3964b 100644 +--- a/host/lib/usrp/dboard/magnesium/magnesium_radio_ctrl_impl.cpp ++++ b/host/lib/usrp/dboard/magnesium/magnesium_radio_ctrl_impl.cpp +@@ -4,6 +4,8 @@ + // SPDX-License-Identifier: GPL-3.0-or-later + // + ++#include ++ + #include "magnesium_radio_ctrl_impl.hpp" + #include "magnesium_constants.hpp" + #include "magnesium_gain_table.hpp" +diff --git a/host/lib/usrp/dboard/magnesium/magnesium_radio_ctrl_init.cpp b/host/lib/usrp/dboard/magnesium/magnesium_radio_ctrl_init.cpp +index 89db614..893741c 100644 +--- a/host/lib/usrp/dboard/magnesium/magnesium_radio_ctrl_init.cpp ++++ b/host/lib/usrp/dboard/magnesium/magnesium_radio_ctrl_init.cpp +@@ -4,6 +4,7 @@ + // SPDX-License-Identifier: GPL-3.0-or-later + // + ++#include + #include "magnesium_constants.hpp" + #include "magnesium_radio_ctrl_impl.hpp" + #include +diff --git a/host/lib/usrp/dboard/rhodium/rhodium_bands.cpp b/host/lib/usrp/dboard/rhodium/rhodium_bands.cpp +index ffa2061..eb3c1cf 100644 +--- a/host/lib/usrp/dboard/rhodium/rhodium_bands.cpp ++++ b/host/lib/usrp/dboard/rhodium/rhodium_bands.cpp +@@ -4,6 +4,8 @@ + // SPDX-License-Identifier: GPL-3.0-or-later + // + ++#include ++ + #include "rhodium_radio_ctrl_impl.hpp" + #include "rhodium_constants.hpp" + #include +diff --git a/host/lib/usrp/dboard/rhodium/rhodium_radio_ctrl_cpld.cpp b/host/lib/usrp/dboard/rhodium/rhodium_radio_ctrl_cpld.cpp +index 846a4ea..450c16c 100644 +--- a/host/lib/usrp/dboard/rhodium/rhodium_radio_ctrl_cpld.cpp ++++ b/host/lib/usrp/dboard/rhodium/rhodium_radio_ctrl_cpld.cpp +@@ -4,6 +4,8 @@ + // SPDX-License-Identifier: GPL-3.0-or-later + // + ++#include ++ + #include "rhodium_radio_ctrl_impl.hpp" + #include "rhodium_cpld_ctrl.hpp" + #include "rhodium_constants.hpp" +diff --git a/host/lib/usrp/dboard/rhodium/rhodium_radio_ctrl_impl.cpp b/host/lib/usrp/dboard/rhodium/rhodium_radio_ctrl_impl.cpp +index d6dbbc5..40e4c9c 100644 +--- a/host/lib/usrp/dboard/rhodium/rhodium_radio_ctrl_impl.cpp ++++ b/host/lib/usrp/dboard/rhodium/rhodium_radio_ctrl_impl.cpp +@@ -4,6 +4,9 @@ + // SPDX-License-Identifier: GPL-3.0-or-later + // + ++#include ++#include ++ + #include "rhodium_radio_ctrl_impl.hpp" + #include "rhodium_constants.hpp" + #include +diff --git a/host/lib/usrp/dboard/rhodium/rhodium_radio_ctrl_init.cpp b/host/lib/usrp/dboard/rhodium/rhodium_radio_ctrl_init.cpp +index 356932b..8420756 100644 +--- a/host/lib/usrp/dboard/rhodium/rhodium_radio_ctrl_init.cpp ++++ b/host/lib/usrp/dboard/rhodium/rhodium_radio_ctrl_init.cpp +@@ -4,6 +4,8 @@ + // SPDX-License-Identifier: GPL-3.0-or-later + // + ++#include ++ + #include "rhodium_radio_ctrl_impl.hpp" + #include "rhodium_constants.hpp" + #include +diff --git a/host/lib/usrp/dboard/rhodium/rhodium_radio_ctrl_lo.cpp b/host/lib/usrp/dboard/rhodium/rhodium_radio_ctrl_lo.cpp +index 4058624..f81a855 100644 +--- a/host/lib/usrp/dboard/rhodium/rhodium_radio_ctrl_lo.cpp ++++ b/host/lib/usrp/dboard/rhodium/rhodium_radio_ctrl_lo.cpp +@@ -4,6 +4,8 @@ + // SPDX-License-Identifier: GPL-3.0-or-later + // + ++#include ++ + #include "rhodium_radio_ctrl_impl.hpp" + #include "rhodium_constants.hpp" + #include diff --git a/uhd.spec b/uhd.spec index 917cda4..675b870 100644 --- a/uhd.spec +++ b/uhd.spec @@ -32,7 +32,7 @@ Name: uhd URL: http://github.com/EttusResearch/uhd Version: %{ver} -Release: 0.8.rc2%{?dist} +Release: 0.9.rc2%{?dist} License: GPLv3+ BuildRequires: gcc-c++ BuildRequires: cmake @@ -54,6 +54,7 @@ Source0: %{url}/archive/v%{ver}-rc2/uhd-%{ver}-rc2.tar.gz Source1: %{name}-limits.conf Source2: %{url}/releases/download/v%{verd}/uhd-images_%{verd}.tar.xz Patch0: %{name}-bind-placeholders.patch +Patch1: %{name}-gcc11.patch %description The UHD is the universal hardware driver for Ettus Research products. @@ -102,6 +103,7 @@ Wireshark dissector plugins. %prep %setup -q -n %{name}-%{ver}-rc2 %patch0 -p1 +%patch1 -p1 # firmware %if %{with binary_firmware} @@ -266,6 +268,9 @@ exit 0 %endif %changelog +* Fri Dec 4 2020 Jeff Law - 3.15.0.0-0.9.rc2 +- Fix missing #includes for gcc-11 + * Wed Aug 5 2020 Jaroslav Škarvada - 3.15.0.0-0.8.rc2 - Fixed FTBFS Resolves: rhbz#1865590 From 96f2e1b8e197674724fa5680dbe5dac4f1d92fc8 Mon Sep 17 00:00:00 2001 From: Tom Stellard Date: Sat, 9 Jan 2021 00:21:18 +0000 Subject: [PATCH 088/152] Add BuildRequires: make https://fedoraproject.org/wiki/Changes/Remove_make_from_BuildRoot --- uhd.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/uhd.spec b/uhd.spec index 675b870..2ed1fe7 100644 --- a/uhd.spec +++ b/uhd.spec @@ -34,6 +34,7 @@ URL: http://github.com/EttusResearch/uhd Version: %{ver} Release: 0.9.rc2%{?dist} License: GPLv3+ +BuildRequires: make BuildRequires: gcc-c++ BuildRequires: cmake BuildRequires: boost-devel, libusb1-devel, python3-cheetah, ncurses-devel From 653a3d51a1f6b557e57411519f2e2f9a153aa3a5 Mon Sep 17 00:00:00 2001 From: Jonathan Wakely Date: Fri, 22 Jan 2021 20:53:53 +0000 Subject: [PATCH 089/152] Rebuilt for Boost 1.75 --- uhd.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/uhd.spec b/uhd.spec index 2ed1fe7..2995c61 100644 --- a/uhd.spec +++ b/uhd.spec @@ -32,7 +32,7 @@ Name: uhd URL: http://github.com/EttusResearch/uhd Version: %{ver} -Release: 0.9.rc2%{?dist} +Release: 0.10.rc2%{?dist} License: GPLv3+ BuildRequires: make BuildRequires: gcc-c++ @@ -269,6 +269,9 @@ exit 0 %endif %changelog +* Fri Jan 22 2021 Jonathan Wakely - 3.15.0.0-0.10.rc2 +- Rebuilt for Boost 1.75 + * Fri Dec 4 2020 Jeff Law - 3.15.0.0-0.9.rc2 - Fix missing #includes for gcc-11 From 9833c761acf27666490bf966555c690c7ed43b10 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jaroslav=20=C5=A0karvada?= Date: Tue, 26 Jan 2021 00:54:58 +0100 Subject: [PATCH 090/152] New version Resolves: rhbz#1918161 --- sources | 4 +- uhd-bind-placeholders.patch | 182 ---------------------------- uhd-gcc11.patch | 228 ------------------------------------ uhd.spec | 35 +++--- 4 files changed, 17 insertions(+), 432 deletions(-) delete mode 100644 uhd-bind-placeholders.patch delete mode 100644 uhd-gcc11.patch diff --git a/sources b/sources index 6bf1f5e..388b62a 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (uhd-images_3.14.1.1.tar.xz) = d2afde2f6a243fe3763f09ffe50bf4372af7f2b840df013f3eb111f0e713c9d57317414c389c8db87151ec8c2a868b2d4c67e571a8f6d3b17a250fb63f25aedd -SHA512 (uhd-3.15.0.0-rc2.tar.gz) = e4054ac9e481e1ee97f9046f0c2b3053c4d346bbe8df01e6ae515a1d592ac5a41e847537f4e20ba105f52a5d6aa3a5b5a356faa8cb220873521cbdb3a8cd56fd +SHA512 (uhd-images_4.0.0.0.tar.xz) = 32bc47ad48b2c9228df452c90d9cd4625fafd0c5d202f5fdfc49d2d9b14154ef7101035f403de56c369956df4f5901f6c653a3ae92c64797dd5e005f954a2a1f +SHA512 (uhd-4.0.0.0.tar.gz) = 1f897397467111e634428e807c2c6748e9fc33e5b09083372139cd6e4445fbd71c48f43e18d0c3faef483d448879e40bc9a5a63df4e908b1bec65454ed67a6dd diff --git a/uhd-bind-placeholders.patch b/uhd-bind-placeholders.patch deleted file mode 100644 index 980f03e..0000000 --- a/uhd-bind-placeholders.patch +++ /dev/null @@ -1,182 +0,0 @@ ---- uhd-3.15.0.0-rc2/host/cmake/Modules/UHDBoost.cmake~ 2020-06-03 14:17:53.758142936 +0100 -+++ uhd-3.15.0.0-rc2/host/cmake/Modules/UHDBoost.cmake 2020-06-03 14:17:55.821143050 +0100 -@@ -260,6 +260,9 @@ - # works for Boost 1.67.0 and newer & doesn't hurt older - add_definitions(-DBOOST_ASIO_DISABLE_STD_EXPERIMENTAL_STRING_VIEW) - -+ # Needed for Boost 1.73.0 to prevent warnings -+ add_definitions(-DBOOST_BIND_GLOBAL_PLACEHOLDERS) -+ - # Boost 1.70.0's find cmake scripts don't always set the expected - # return variables. Replicate the commit that fixes that issue here: - # https://github.com/boostorg/boost_install/commit/cfa8d55250dfc2635e907e42da423e4eb540dee5 ---- uhd-3.15.0.0-rc2/host/lib/rfnoc/dma_fifo_block_ctrl_impl.cpp~ 2020-06-03 14:27:43.441170397 +0100 -+++ uhd-3.15.0.0-rc2/host/lib/rfnoc/dma_fifo_block_ctrl_impl.cpp 2020-06-03 14:27:48.015170596 +0100 -@@ -17,6 +17,7 @@ - - using namespace uhd; - using namespace uhd::rfnoc; -+using namespace boost::placeholders; - - class dma_fifo_block_ctrl_impl : public dma_fifo_block_ctrl - { ---- uhd-3.15.0.0-rc2/host/lib/usrp/multi_usrp.cpp~ 2020-06-03 14:28:32.297172502 +0100 -+++ uhd-3.15.0.0-rc2/host/lib/usrp/multi_usrp.cpp 2020-06-03 14:28:40.874172872 +0100 -@@ -31,6 +31,7 @@ - - using namespace uhd; - using namespace uhd::usrp; -+using namespace boost::placeholders; - - const size_t multi_usrp::ALL_MBOARDS = size_t(~0); - const size_t multi_usrp::ALL_CHANS = size_t(~0); ---- uhd-3.15.0.0-rc2/host/lib/usrp/cores/rx_dsp_core_3000.cpp~ 2020-06-03 14:31:35.175180398 +0100 -+++ uhd-3.15.0.0-rc2/host/lib/usrp/cores/rx_dsp_core_3000.cpp 2020-06-03 14:31:42.021180693 +0100 -@@ -37,6 +37,7 @@ - } - - using namespace uhd; -+using namespace boost::placeholders; - - const double rx_dsp_core_3000::DEFAULT_CORDIC_FREQ = 0.0; - const double rx_dsp_core_3000::DEFAULT_RATE = 1e6; ---- uhd-3.15.0.0-rc2/host/lib/usrp/cores/tx_dsp_core_3000.cpp~ 2020-06-03 14:32:19.984182329 +0100 -+++ uhd-3.15.0.0-rc2/host/lib/usrp/cores/tx_dsp_core_3000.cpp 2020-06-03 14:32:25.278182557 +0100 -@@ -28,6 +28,7 @@ - } - - using namespace uhd; -+using namespace boost::placeholders; - - const double tx_dsp_core_3000::DEFAULT_CORDIC_FREQ = 0.0; - const double tx_dsp_core_3000::DEFAULT_RATE = 1e6; ---- uhd-3.15.0.0-rc2/host/lib/usrp/dboard/db_cbx.cpp~ 2020-06-03 14:33:42.513185887 +0100 -+++ uhd-3.15.0.0-rc2/host/lib/usrp/dboard/db_cbx.cpp 2020-06-03 14:33:44.167185959 +0100 -@@ -12,6 +12,7 @@ - using namespace uhd; - using namespace uhd::usrp; - using namespace boost::assign; -+using namespace boost::placeholders; - - /*********************************************************************** - * Structors ---- uhd-3.15.0.0-rc2/host/lib/usrp/dboard/db_tvrx2.cpp~ 2020-06-03 14:34:31.865188014 +0100 -+++ uhd-3.15.0.0-rc2/host/lib/usrp/dboard/db_tvrx2.cpp 2020-06-03 14:34:38.007188279 +0100 -@@ -65,6 +65,7 @@ - using namespace uhd; - using namespace uhd::usrp; - using namespace boost::assign; -+using namespace boost::placeholders; - - /*********************************************************************** - * The TVRX2 types ---- uhd-3.15.0.0-rc2/host/lib/usrp/x300/x300_radio_ctrl_impl.cpp~ 2020-06-03 14:35:57.858191722 +0100 -+++ uhd-3.15.0.0-rc2/host/lib/usrp/x300/x300_radio_ctrl_impl.cpp 2020-06-03 14:36:02.680191929 +0100 -@@ -27,6 +27,7 @@ - using namespace uhd::usrp; - using namespace uhd::rfnoc; - using namespace uhd::usrp::x300; -+using namespace boost::placeholders; - - static const size_t IO_MASTER_RADIO = 0; - ---- uhd-3.15.0.0-rc2/host/lib/usrp/b100/b100_impl.cpp~ 2020-06-03 14:36:19.706192663 +0100 -+++ uhd-3.15.0.0-rc2/host/lib/usrp/b100/b100_impl.cpp 2020-06-03 14:36:25.680192921 +0100 -@@ -23,6 +23,7 @@ - using namespace uhd; - using namespace uhd::usrp; - using namespace uhd::transport; -+using namespace boost::placeholders; - - namespace { - constexpr uint16_t B100_VENDOR_ID = 0x2500; ---- uhd-3.15.0.0-rc2/host/lib/usrp_clock/octoclock/octoclock_impl.cpp~ 2020-06-03 14:36:54.427194160 +0100 -+++ uhd-3.15.0.0-rc2/host/lib/usrp_clock/octoclock/octoclock_impl.cpp 2020-06-03 14:37:11.471194895 +0100 -@@ -34,6 +34,7 @@ - using namespace uhd; - using namespace uhd::usrp_clock; - using namespace uhd::transport; -+using namespace boost::placeholders; - namespace asio = boost::asio; - namespace fs = boost::filesystem; - ---- uhd-3.15.0.0-rc2/host/lib/usrp/dboard/db_sbx_version4.cpp~ 2020-06-03 14:40:42.223206781 +0100 -+++ uhd-3.15.0.0-rc2/host/lib/usrp/dboard/db_sbx_version4.cpp 2020-06-03 14:40:49.140207195 +0100 -@@ -13,6 +13,7 @@ - using namespace uhd; - using namespace uhd::usrp; - using namespace boost::assign; -+using namespace boost::placeholders; - - /*********************************************************************** - * Structors ---- uhd-3.15.0.0-rc2/host/lib/usrp/dboard/db_dbsrx2.cpp~ 2020-06-03 14:41:03.583208062 +0100 -+++ uhd-3.15.0.0-rc2/host/lib/usrp/dboard/db_dbsrx2.cpp 2020-06-03 14:41:12.806208613 +0100 -@@ -26,6 +26,7 @@ - using namespace uhd; - using namespace uhd::usrp; - using namespace boost::assign; -+using namespace boost::placeholders; - - /*********************************************************************** - * The DBSRX2 constants ---- uhd-3.15.0.0-rc2/host/lib/usrp/dboard/db_tvrx.cpp~ 2020-06-03 14:41:26.807209454 +0100 -+++ uhd-3.15.0.0-rc2/host/lib/usrp/dboard/db_tvrx.cpp 2020-06-03 14:41:38.846210175 +0100 -@@ -41,6 +41,7 @@ - using namespace uhd; - using namespace uhd::usrp; - using namespace boost::assign; -+using namespace boost::placeholders; - - /*********************************************************************** - * The tvrx constants ---- uhd-3.15.0.0-rc2/host/lib/usrp/dboard/db_dbsrx.cpp~ 2020-06-03 14:41:50.031210845 +0100 -+++ uhd-3.15.0.0-rc2/host/lib/usrp/dboard/db_dbsrx.cpp 2020-06-03 14:41:55.988211201 +0100 -@@ -31,6 +31,7 @@ - using namespace uhd; - using namespace uhd::usrp; - using namespace boost::assign; -+using namespace boost::placeholders; - - /*********************************************************************** - * The DBSRX constants ---- uhd-3.15.0.0-rc2/host/lib/usrp/dboard/db_sbx_common.cpp~ 2020-06-03 15:03:03.828285516 +0100 -+++ uhd-3.15.0.0-rc2/host/lib/usrp/dboard/db_sbx_common.cpp 2020-06-03 15:03:06.925285692 +0100 -@@ -10,6 +10,7 @@ - using namespace uhd; - using namespace uhd::usrp; - using namespace boost::assign; -+using namespace boost::placeholders; - - - /*********************************************************************** ---- uhd-3.15.0.0-rc2/host/lib/usrp/dboard/db_xcvr2450.cpp~ 2020-06-03 15:03:37.135287400 +0100 -+++ uhd-3.15.0.0-rc2/host/lib/usrp/dboard/db_xcvr2450.cpp 2020-06-03 15:03:46.203287915 +0100 -@@ -58,6 +58,7 @@ - using namespace uhd; - using namespace uhd::usrp; - using namespace boost::assign; -+using namespace boost::placeholders; - - /*********************************************************************** - * The XCVR 2450 constants ---- uhd-3.15.0.0-rc2/host/lib/usrp/dboard/db_sbx_version3.cpp~ 2020-06-03 15:04:13.982289481 +0100 -+++ uhd-3.15.0.0-rc2/host/lib/usrp/dboard/db_sbx_version3.cpp 2020-06-03 15:04:21.595289912 +0100 -@@ -13,6 +13,7 @@ - using namespace uhd; - using namespace uhd::usrp; - using namespace boost::assign; -+using namespace boost::placeholders; - - /*********************************************************************** - * Structors ---- uhd-3.15.0.0-rc2/host/lib/usrp/dboard/db_ubx.cpp~ 2020-06-03 15:20:39.628345132 +0100 -+++ uhd-3.15.0.0-rc2/host/lib/usrp/dboard/db_ubx.cpp 2020-06-03 15:20:48.073345609 +0100 -@@ -30,6 +30,7 @@ - - using namespace uhd; - using namespace uhd::usrp; -+using namespace boost::placeholders; - - /*********************************************************************** - * UBX Data Structures diff --git a/uhd-gcc11.patch b/uhd-gcc11.patch deleted file mode 100644 index e880eb4..0000000 --- a/uhd-gcc11.patch +++ /dev/null @@ -1,228 +0,0 @@ -diff --git a/host/lib/usrp/dboard/e3xx/e31x_radio_ctrl_impl.cpp b/host/lib/usrp/dboard/e3xx/e31x_radio_ctrl_impl.cpp -index 3356510..55a8981 100644 ---- a/host/lib/usrp/dboard/e3xx/e31x_radio_ctrl_impl.cpp -+++ b/host/lib/usrp/dboard/e3xx/e31x_radio_ctrl_impl.cpp -@@ -4,6 +4,7 @@ - // SPDX-License-Identifier: GPL-3.0-or-later - // - -+#include - #include "e31x_radio_ctrl_impl.hpp" - #include "e31x_regs.hpp" - -diff --git a/host/lib/usrp/dboard/e3xx/e320_radio_ctrl_impl.cpp b/host/lib/usrp/dboard/e3xx/e320_radio_ctrl_impl.cpp -index c48cabc..0771aa0 100644 ---- a/host/lib/usrp/dboard/e3xx/e320_radio_ctrl_impl.cpp -+++ b/host/lib/usrp/dboard/e3xx/e320_radio_ctrl_impl.cpp -@@ -4,6 +4,8 @@ - // SPDX-License-Identifier: GPL-3.0-or-later - // - -+#include -+ - #include "e320_radio_ctrl_impl.hpp" - #include "e320_regs.hpp" - -diff --git a/host/lib/usrp/dboard/e3xx/e3xx_ad9361_iface.cpp b/host/lib/usrp/dboard/e3xx/e3xx_ad9361_iface.cpp -index d9cadc8..155a075 100644 ---- a/host/lib/usrp/dboard/e3xx/e3xx_ad9361_iface.cpp -+++ b/host/lib/usrp/dboard/e3xx/e3xx_ad9361_iface.cpp -@@ -4,6 +4,7 @@ - // SPDX-License-Identifier: GPL-3.0-or-later - // - -+#include - #include "e3xx_ad9361_iface.hpp" - #include - #include -diff --git a/host/lib/usrp/dboard/e3xx/e3xx_bands.cpp b/host/lib/usrp/dboard/e3xx/e3xx_bands.cpp -index 001cf5d..c13b7e8 100644 ---- a/host/lib/usrp/dboard/e3xx/e3xx_bands.cpp -+++ b/host/lib/usrp/dboard/e3xx/e3xx_bands.cpp -@@ -4,6 +4,7 @@ - // SPDX-License-Identifier: GPL-3.0-or-later - // - -+#include - #include "e3xx_constants.hpp" - #include "e3xx_radio_ctrl_impl.hpp" - #include -diff --git a/host/lib/usrp/dboard/e3xx/e3xx_radio_ctrl_impl.cpp b/host/lib/usrp/dboard/e3xx/e3xx_radio_ctrl_impl.cpp -index 989b73b..587ef6d 100644 ---- a/host/lib/usrp/dboard/e3xx/e3xx_radio_ctrl_impl.cpp -+++ b/host/lib/usrp/dboard/e3xx/e3xx_radio_ctrl_impl.cpp -@@ -4,6 +4,7 @@ - // SPDX-License-Identifier: GPL-3.0-or-later - // - -+#include - #include "e3xx_radio_ctrl_impl.hpp" - #include "e3xx_constants.hpp" - #include -diff --git a/host/lib/usrp/dboard/e3xx/e3xx_radio_ctrl_init.cpp b/host/lib/usrp/dboard/e3xx/e3xx_radio_ctrl_init.cpp -index 5b33b33..bd5aac1 100644 ---- a/host/lib/usrp/dboard/e3xx/e3xx_radio_ctrl_init.cpp -+++ b/host/lib/usrp/dboard/e3xx/e3xx_radio_ctrl_init.cpp -@@ -4,6 +4,9 @@ - // SPDX-License-Identifier: GPL-3.0-or-later - // - -+#include -+#include -+ - #include "e3xx_constants.hpp" - #include "e3xx_radio_ctrl_impl.hpp" - #include -diff --git a/host/lib/usrp/dboard/magnesium/magnesium_ad9371_iface.cpp b/host/lib/usrp/dboard/magnesium/magnesium_ad9371_iface.cpp -index d7d1b43..d1308d1 100644 ---- a/host/lib/usrp/dboard/magnesium/magnesium_ad9371_iface.cpp -+++ b/host/lib/usrp/dboard/magnesium/magnesium_ad9371_iface.cpp -@@ -4,6 +4,7 @@ - // SPDX-License-Identifier: GPL-3.0-or-later - // - -+#include - #include "magnesium_ad9371_iface.hpp" - #include "magnesium_constants.hpp" - #include -diff --git a/host/lib/usrp/dboard/magnesium/magnesium_bands.cpp b/host/lib/usrp/dboard/magnesium/magnesium_bands.cpp -index 13cc52d..1bd71ae 100644 ---- a/host/lib/usrp/dboard/magnesium/magnesium_bands.cpp -+++ b/host/lib/usrp/dboard/magnesium/magnesium_bands.cpp -@@ -6,6 +6,7 @@ - - // The band plan - -+#include - #include "magnesium_constants.hpp" - #include "magnesium_radio_ctrl_impl.hpp" - #include -diff --git a/host/lib/usrp/dboard/magnesium/magnesium_gain_table.cpp b/host/lib/usrp/dboard/magnesium/magnesium_gain_table.cpp -index 67b20f5..7963153 100644 ---- a/host/lib/usrp/dboard/magnesium/magnesium_gain_table.cpp -+++ b/host/lib/usrp/dboard/magnesium/magnesium_gain_table.cpp -@@ -4,6 +4,8 @@ - // SPDX-License-Identifier: GPL-3.0-or-later - // - -+#include -+ - #include "magnesium_gain_table.hpp" - #include "magnesium_constants.hpp" - #include -diff --git a/host/lib/usrp/dboard/magnesium/magnesium_radio_ctrl_cpld.cpp b/host/lib/usrp/dboard/magnesium/magnesium_radio_ctrl_cpld.cpp -index 679816a..26bf5fd 100644 ---- a/host/lib/usrp/dboard/magnesium/magnesium_radio_ctrl_cpld.cpp -+++ b/host/lib/usrp/dboard/magnesium/magnesium_radio_ctrl_cpld.cpp -@@ -4,6 +4,7 @@ - // SPDX-License-Identifier: GPL-3.0-or-later - // - -+#include - #include "magnesium_constants.hpp" - #include "magnesium_cpld_ctrl.hpp" - #include "magnesium_radio_ctrl_impl.hpp" -diff --git a/host/lib/usrp/dboard/magnesium/magnesium_radio_ctrl_gain.cpp b/host/lib/usrp/dboard/magnesium/magnesium_radio_ctrl_gain.cpp -index b66bd2e..041d651 100644 ---- a/host/lib/usrp/dboard/magnesium/magnesium_radio_ctrl_gain.cpp -+++ b/host/lib/usrp/dboard/magnesium/magnesium_radio_ctrl_gain.cpp -@@ -4,6 +4,8 @@ - // SPDX-License-Identifier: GPL-3.0-or-later - // - -+#include -+ - #include "magnesium_constants.hpp" - #include "magnesium_gain_table.hpp" - #include "magnesium_radio_ctrl_impl.hpp" -diff --git a/host/lib/usrp/dboard/magnesium/magnesium_radio_ctrl_impl.cpp b/host/lib/usrp/dboard/magnesium/magnesium_radio_ctrl_impl.cpp -index 405d595..5d3964b 100644 ---- a/host/lib/usrp/dboard/magnesium/magnesium_radio_ctrl_impl.cpp -+++ b/host/lib/usrp/dboard/magnesium/magnesium_radio_ctrl_impl.cpp -@@ -4,6 +4,8 @@ - // SPDX-License-Identifier: GPL-3.0-or-later - // - -+#include -+ - #include "magnesium_radio_ctrl_impl.hpp" - #include "magnesium_constants.hpp" - #include "magnesium_gain_table.hpp" -diff --git a/host/lib/usrp/dboard/magnesium/magnesium_radio_ctrl_init.cpp b/host/lib/usrp/dboard/magnesium/magnesium_radio_ctrl_init.cpp -index 89db614..893741c 100644 ---- a/host/lib/usrp/dboard/magnesium/magnesium_radio_ctrl_init.cpp -+++ b/host/lib/usrp/dboard/magnesium/magnesium_radio_ctrl_init.cpp -@@ -4,6 +4,7 @@ - // SPDX-License-Identifier: GPL-3.0-or-later - // - -+#include - #include "magnesium_constants.hpp" - #include "magnesium_radio_ctrl_impl.hpp" - #include -diff --git a/host/lib/usrp/dboard/rhodium/rhodium_bands.cpp b/host/lib/usrp/dboard/rhodium/rhodium_bands.cpp -index ffa2061..eb3c1cf 100644 ---- a/host/lib/usrp/dboard/rhodium/rhodium_bands.cpp -+++ b/host/lib/usrp/dboard/rhodium/rhodium_bands.cpp -@@ -4,6 +4,8 @@ - // SPDX-License-Identifier: GPL-3.0-or-later - // - -+#include -+ - #include "rhodium_radio_ctrl_impl.hpp" - #include "rhodium_constants.hpp" - #include -diff --git a/host/lib/usrp/dboard/rhodium/rhodium_radio_ctrl_cpld.cpp b/host/lib/usrp/dboard/rhodium/rhodium_radio_ctrl_cpld.cpp -index 846a4ea..450c16c 100644 ---- a/host/lib/usrp/dboard/rhodium/rhodium_radio_ctrl_cpld.cpp -+++ b/host/lib/usrp/dboard/rhodium/rhodium_radio_ctrl_cpld.cpp -@@ -4,6 +4,8 @@ - // SPDX-License-Identifier: GPL-3.0-or-later - // - -+#include -+ - #include "rhodium_radio_ctrl_impl.hpp" - #include "rhodium_cpld_ctrl.hpp" - #include "rhodium_constants.hpp" -diff --git a/host/lib/usrp/dboard/rhodium/rhodium_radio_ctrl_impl.cpp b/host/lib/usrp/dboard/rhodium/rhodium_radio_ctrl_impl.cpp -index d6dbbc5..40e4c9c 100644 ---- a/host/lib/usrp/dboard/rhodium/rhodium_radio_ctrl_impl.cpp -+++ b/host/lib/usrp/dboard/rhodium/rhodium_radio_ctrl_impl.cpp -@@ -4,6 +4,9 @@ - // SPDX-License-Identifier: GPL-3.0-or-later - // - -+#include -+#include -+ - #include "rhodium_radio_ctrl_impl.hpp" - #include "rhodium_constants.hpp" - #include -diff --git a/host/lib/usrp/dboard/rhodium/rhodium_radio_ctrl_init.cpp b/host/lib/usrp/dboard/rhodium/rhodium_radio_ctrl_init.cpp -index 356932b..8420756 100644 ---- a/host/lib/usrp/dboard/rhodium/rhodium_radio_ctrl_init.cpp -+++ b/host/lib/usrp/dboard/rhodium/rhodium_radio_ctrl_init.cpp -@@ -4,6 +4,8 @@ - // SPDX-License-Identifier: GPL-3.0-or-later - // - -+#include -+ - #include "rhodium_radio_ctrl_impl.hpp" - #include "rhodium_constants.hpp" - #include -diff --git a/host/lib/usrp/dboard/rhodium/rhodium_radio_ctrl_lo.cpp b/host/lib/usrp/dboard/rhodium/rhodium_radio_ctrl_lo.cpp -index 4058624..f81a855 100644 ---- a/host/lib/usrp/dboard/rhodium/rhodium_radio_ctrl_lo.cpp -+++ b/host/lib/usrp/dboard/rhodium/rhodium_radio_ctrl_lo.cpp -@@ -4,6 +4,8 @@ - // SPDX-License-Identifier: GPL-3.0-or-later - // - -+#include -+ - #include "rhodium_radio_ctrl_impl.hpp" - #include "rhodium_constants.hpp" - #include diff --git a/uhd.spec b/uhd.spec index 2995c61..391e127 100644 --- a/uhd.spec +++ b/uhd.spec @@ -9,9 +9,7 @@ # images you need to install appropriate tools (e.g. Xilinx ISE). %bcond_without binary_firmware -# By default do not build with wireshark support, it's currently -# broken (upstream ticket #268) -%bcond_with wireshark +%bcond_without wireshark # NEON support is by default disabled on ARMs # building with --with=neon will enable auto detection @@ -26,15 +24,12 @@ %endif %endif -%global ver 3.15.0.0 -%global verd 3.14.1.1 - Name: uhd URL: http://github.com/EttusResearch/uhd -Version: %{ver} -Release: 0.10.rc2%{?dist} +Version: 4.0.0.0 +Release: 1%{?dist} License: GPLv3+ -BuildRequires: make +BuildRequires: make BuildRequires: gcc-c++ BuildRequires: cmake BuildRequires: boost-devel, libusb1-devel, python3-cheetah, ncurses-devel @@ -50,12 +45,9 @@ BuildRequires: sdcc sed Requires(pre): shadow-utils, glibc-common Requires: python3-tkinter Summary: Universal Hardware Driver for Ettus Research products -#Source0: %%{url}/archive/v%%{version}/uhd-%%{version}.tar.gz -Source0: %{url}/archive/v%{ver}-rc2/uhd-%{ver}-rc2.tar.gz +Source0: %{url}/archive/v%{version}/uhd-%{version}.tar.gz Source1: %{name}-limits.conf -Source2: %{url}/releases/download/v%{verd}/uhd-images_%{verd}.tar.xz -Patch0: %{name}-bind-placeholders.patch -Patch1: %{name}-gcc11.patch +Source2: %{url}/releases/download/v%{version}/uhd-images_%{version}.tar.xz %description The UHD is the universal hardware driver for Ettus Research products. @@ -102,9 +94,7 @@ Wireshark dissector plugins. %endif %prep -%setup -q -n %{name}-%{ver}-rc2 -%patch0 -p1 -%patch1 -p1 +%setup -q # firmware %if %{with binary_firmware} @@ -156,9 +146,9 @@ done popd %endif -#%%check -#cd host/build -#make test +%check +cd host/build +make test %install # fix python shebangs (run again for generated scripts) @@ -236,6 +226,7 @@ exit 0 %dir %{_libdir}/uhd %{_bindir}/uhd_* %{_bindir}/usrp2_* +%{_bindir}/rfnoc_image_builder %{_prefix}/lib/udev/rules.d/10-usrp-uhd.rules %config(noreplace) %{_sysconfdir}/security/limits.d/*.conf %{_libdir}/lib*.so.* @@ -269,6 +260,10 @@ exit 0 %endif %changelog +* Mon Jan 25 2021 Jaroslav Škarvada - 4.0.0.0-1 +- New version + Resolves: rhbz#1918161 + * Fri Jan 22 2021 Jonathan Wakely - 3.15.0.0-0.10.rc2 - Rebuilt for Boost 1.75 From 7e9476da6cfdf2e4cc8f3d9eae600360c578ce4a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jaroslav=20=C5=A0karvada?= Date: Tue, 26 Jan 2021 01:19:00 +0100 Subject: [PATCH 091/152] Added fix for gcc-11 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Jaroslav Škarvada --- uhd-4.0.0.0-gcc-11-fix.patch | 12 ++++++++++++ uhd.spec | 2 ++ 2 files changed, 14 insertions(+) create mode 100644 uhd-4.0.0.0-gcc-11-fix.patch diff --git a/uhd-4.0.0.0-gcc-11-fix.patch b/uhd-4.0.0.0-gcc-11-fix.patch new file mode 100644 index 0000000..74129dc --- /dev/null +++ b/uhd-4.0.0.0-gcc-11-fix.patch @@ -0,0 +1,12 @@ +diff --git a/host/lib/include/uhdlib/utils/rpc.hpp b/host/lib/include/uhdlib/utils/rpc.hpp +index e87a2ee..57744fe 100644 +--- a/host/lib/include/uhdlib/utils/rpc.hpp ++++ b/host/lib/include/uhdlib/utils/rpc.hpp +@@ -13,6 +13,7 @@ + #include + #include + #include ++#include + + namespace { + diff --git a/uhd.spec b/uhd.spec index 391e127..b2cd6b7 100644 --- a/uhd.spec +++ b/uhd.spec @@ -48,6 +48,7 @@ Summary: Universal Hardware Driver for Ettus Research products Source0: %{url}/archive/v%{version}/uhd-%{version}.tar.gz Source1: %{name}-limits.conf Source2: %{url}/releases/download/v%{version}/uhd-images_%{version}.tar.xz +Patch0: uhd-4.0.0.0-gcc-11-fix.patch %description The UHD is the universal hardware driver for Ettus Research products. @@ -95,6 +96,7 @@ Wireshark dissector plugins. %prep %setup -q +%patch0 -p1 -b .gcc-11-fix # firmware %if %{with binary_firmware} From b8f61d0e94b14aed2a92157515bf3d5a240a987e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jaroslav=20=C5=A0karvada?= Date: Mon, 1 Feb 2021 21:01:45 +0100 Subject: [PATCH 092/152] FTBFS fixes MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Jaroslav Škarvada --- uhd-4.0.0.0-gcc-11-fix.patch | 17 ++++++++++++---- uhd.spec | 39 +++++++++++++++--------------------- 2 files changed, 29 insertions(+), 27 deletions(-) diff --git a/uhd-4.0.0.0-gcc-11-fix.patch b/uhd-4.0.0.0-gcc-11-fix.patch index 74129dc..629815c 100644 --- a/uhd-4.0.0.0-gcc-11-fix.patch +++ b/uhd-4.0.0.0-gcc-11-fix.patch @@ -1,12 +1,21 @@ +commit ae3d7551ded10ac51a3c2eda1e9e8ac64c4cd83b (HEAD -> fix-missing-includes-rpc, origin/fix-missing-includes-rpc) +Author: Martin Braun +Date: Fri Jan 29 12:23:50 2021 +0100 + +lib: Fix missing includes in rpc.hpp + diff --git a/host/lib/include/uhdlib/utils/rpc.hpp b/host/lib/include/uhdlib/utils/rpc.hpp -index e87a2ee..57744fe 100644 +index e87a2ee32..ca89c1054 100644 --- a/host/lib/include/uhdlib/utils/rpc.hpp +++ b/host/lib/include/uhdlib/utils/rpc.hpp -@@ -13,6 +13,7 @@ +@@ -12,7 +12,11 @@ + #include #include #include - #include +#include + #include ++#include ++#include ++#include namespace { - diff --git a/uhd.spec b/uhd.spec index b2cd6b7..248b924 100644 --- a/uhd.spec +++ b/uhd.spec @@ -15,8 +15,10 @@ # building with --with=neon will enable auto detection %bcond_with neon -%global wireshark_dissectors chdr zpu octoclock -%global wireshark_ver %((%{__awk} '/^#define VERSION[ \t]+/ { print $NF }' /usr/include/wireshark/config.h 2>/dev/null||echo none)|/usr/bin/tr -d '"') +# X.Y.Z +%global wireshark_ver_full %((%{__awk} '/^#define VERSION[ \t]+/ { print $NF }' /usr/include/wireshark/config.h 2>/dev/null||echo none)|/usr/bin/tr -d '"') +# X.Y +%global wireshark_ver %(VF="%{wireshark_ver_full}"; echo ${VF%.*}) %ifarch %{arm} aarch64 %if ! %{with neon} @@ -36,7 +38,7 @@ BuildRequires: boost-devel, libusb1-devel, python3-cheetah, ncurses-devel BuildRequires: python3-docutils, doxygen, pkgconfig, libpcap-devel BuildRequires: python3-numpy, vim-common %if %{with wireshark} -BuildRequires: wireshark-devel +BuildRequires: wireshark-devel, libgcrypt-devel, gnutls-devel %endif BuildRequires: python3-mako, python3-requests, python3-devel, tar %if ! %{with binary_firmware} @@ -88,7 +90,7 @@ Tools that are useful for working with and/or debugging USRP device. %package wireshark Summary: Wireshark dissector plugins Requires: %{name} = %{version}-%{release} -Requires: wireshark = %{wireshark_ver} +Requires: wireshark-cli%{?_isa} = %{wireshark_ver} %description wireshark Wireshark dissector plugins. @@ -137,20 +139,14 @@ popd %if %{with wireshark} # wireshark dissectors pushd tools/dissectors -for d in %{wireshark_dissectors} -do - mkdir "build_$d" - pushd "build_$d" - %cmake -DETTUS_DISSECTOR_NAME="$d" -S ".." - %cmake_build - popd -done +%cmake -DENABLE_RFNOC=ON -DENABLE_OCTOCLOCK=ON -DENABLE_ZPU=ON +%cmake_build popd %endif -%check -cd host/build -make test +#%%check +#cd host/%%{_vpath_builddir} +#make test %install # fix python shebangs (run again for generated scripts) @@ -201,14 +197,11 @@ install -Dpm 0755 tools/uhd_dump/chdr_log %{buildroot}%{_bindir}/chdr_log %if %{with wireshark} # wireshark dissectors pushd tools/dissectors -for d in build_*/* -do - pushd "$d" - %make_install - popd -done +%cmake_install popd -mv %{buildroot}${HOME}/.wireshark %{buildroot}%{_libdir}/wireshark +# fix wireshark dissectors location +mkdir -p %{buildroot}%{_libdir}/wireshark/plugins/%{wireshark_ver} +mv %{buildroot}%{_prefix}/epan %{buildroot}%{_libdir}/wireshark/plugins/%{wireshark_ver} %endif # add directory for modules @@ -258,7 +251,7 @@ exit 0 %if %{with wireshark} %files wireshark -%{_libdir}/wireshark/plugins/* +%{_libdir}/wireshark/plugins/%{wireshark_ver}/epan/* %endif %changelog From addbe90df666c59c91e82a48a4909344d06fbad0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jaroslav=20=C5=A0karvada?= Date: Tue, 2 Feb 2021 22:15:28 +0100 Subject: [PATCH 093/152] Added workaround for s390x FTBFS MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Jaroslav Škarvada --- uhd-4.0.0.0-s390x-build-fix.patch | 10 ++++++++++ uhd.spec | 6 +++++- 2 files changed, 15 insertions(+), 1 deletion(-) create mode 100644 uhd-4.0.0.0-s390x-build-fix.patch diff --git a/uhd-4.0.0.0-s390x-build-fix.patch b/uhd-4.0.0.0-s390x-build-fix.patch new file mode 100644 index 0000000..da7974d --- /dev/null +++ b/uhd-4.0.0.0-s390x-build-fix.patch @@ -0,0 +1,10 @@ +diff --git a/host/lib/utils/CMakeLists.txt b/host/lib/utils/CMakeLists.txt +index 7e95d8c..2ad6e40 100644 +--- a/host/lib/utils/CMakeLists.txt ++++ b/host/lib/utils/CMakeLists.txt +@@ -229,3 +229,5 @@ if(ENABLE_C_API) + ${CMAKE_CURRENT_SOURCE_DIR}/thread_priority_c.cpp + ) + endif(ENABLE_C_API) ++ ++LIBUHD_APPEND_LIBS(atomic) diff --git a/uhd.spec b/uhd.spec index 248b924..5b02776 100644 --- a/uhd.spec +++ b/uhd.spec @@ -36,7 +36,7 @@ BuildRequires: gcc-c++ BuildRequires: cmake BuildRequires: boost-devel, libusb1-devel, python3-cheetah, ncurses-devel BuildRequires: python3-docutils, doxygen, pkgconfig, libpcap-devel -BuildRequires: python3-numpy, vim-common +BuildRequires: python3-numpy, vim-common, libatomic %if %{with wireshark} BuildRequires: wireshark-devel, libgcrypt-devel, gnutls-devel %endif @@ -50,7 +50,10 @@ Summary: Universal Hardware Driver for Ettus Research products Source0: %{url}/archive/v%{version}/uhd-%{version}.tar.gz Source1: %{name}-limits.conf Source2: %{url}/releases/download/v%{version}/uhd-images_%{version}.tar.xz +# Patch provided by upstream Patch0: uhd-4.0.0.0-gcc-11-fix.patch +# https://github.com/EttusResearch/uhd/issues/410 +Patch1: uhd-4.0.0.0-s390x-build-fix.patch %description The UHD is the universal hardware driver for Ettus Research products. @@ -99,6 +102,7 @@ Wireshark dissector plugins. %prep %setup -q %patch0 -p1 -b .gcc-11-fix +%patch1 -p1 -b .s390x-build-fix # firmware %if %{with binary_firmware} From d5dbfb93a199c79c33934ab171b7e0031663920e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jaroslav=20=C5=A0karvada?= Date: Mon, 8 Feb 2021 12:27:53 +0100 Subject: [PATCH 094/152] Fixed requires for wireshark plugin Resolves: rhbz#1925577 --- uhd.spec | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/uhd.spec b/uhd.spec index 5b02776..837cee6 100644 --- a/uhd.spec +++ b/uhd.spec @@ -29,7 +29,7 @@ Name: uhd URL: http://github.com/EttusResearch/uhd Version: 4.0.0.0 -Release: 1%{?dist} +Release: 2%{?dist} License: GPLv3+ BuildRequires: make BuildRequires: gcc-c++ @@ -93,7 +93,7 @@ Tools that are useful for working with and/or debugging USRP device. %package wireshark Summary: Wireshark dissector plugins Requires: %{name} = %{version}-%{release} -Requires: wireshark-cli%{?_isa} = %{wireshark_ver} +Requires: %{_libdir}/wireshark/plugins/%{wireshark_ver} %description wireshark Wireshark dissector plugins. @@ -259,6 +259,10 @@ exit 0 %endif %changelog +* Mon Feb 8 2021 Jaroslav Škarvada - 4.0.0.0-2 +- Fixed requires for wireshark plugin + Resolves: rhbz#1925577 + * Mon Jan 25 2021 Jaroslav Škarvada - 4.0.0.0-1 - New version Resolves: rhbz#1918161 From 9accf032da61d217a35f11e61fc8f7a779693985 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jaroslav=20=C5=A0karvada?= Date: Mon, 8 Feb 2021 14:48:58 +0100 Subject: [PATCH 095/152] Fixed requires for wireshark plugin Resolves: rhbz#1925577 --- uhd.spec | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/uhd.spec b/uhd.spec index 837cee6..4c22025 100644 --- a/uhd.spec +++ b/uhd.spec @@ -9,7 +9,8 @@ # images you need to install appropriate tools (e.g. Xilinx ISE). %bcond_without binary_firmware -%bcond_without wireshark +# Currently broken: https://github.com/EttusResearch/uhd/issues/413 +%bcond_with wireshark # NEON support is by default disabled on ARMs # building with --with=neon will enable auto detection From 53309a5cf125ed60357680097223e982517af689 Mon Sep 17 00:00:00 2001 From: Jonathan Wakely Date: Tue, 30 Mar 2021 19:36:21 +0100 Subject: [PATCH 096/152] Rebuilt for removed libstdc++ symbol (#1937698) --- uhd.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/uhd.spec b/uhd.spec index 4c22025..aa35891 100644 --- a/uhd.spec +++ b/uhd.spec @@ -30,7 +30,7 @@ Name: uhd URL: http://github.com/EttusResearch/uhd Version: 4.0.0.0 -Release: 2%{?dist} +Release: 3%{?dist} License: GPLv3+ BuildRequires: make BuildRequires: gcc-c++ @@ -260,6 +260,9 @@ exit 0 %endif %changelog +* Tue Mar 30 2021 Jonathan Wakely - 4.0.0.0-3 +- Rebuilt for removed libstdc++ symbol (#1937698) + * Mon Feb 8 2021 Jaroslav Škarvada - 4.0.0.0-2 - Fixed requires for wireshark plugin Resolves: rhbz#1925577 From dff1e9b21922a15ea9d18cae969e6a27d162ab10 Mon Sep 17 00:00:00 2001 From: Tomas Hrnciar Date: Mon, 19 Apr 2021 13:18:32 +0200 Subject: [PATCH 097/152] BuildRequire setuptools explicitly See https://fedoraproject.org/wiki/Changes/Reduce_dependencies_on_python3-setuptools --- uhd.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/uhd.spec b/uhd.spec index aa35891..4b2ebfb 100644 --- a/uhd.spec +++ b/uhd.spec @@ -41,7 +41,7 @@ BuildRequires: python3-numpy, vim-common, libatomic %if %{with wireshark} BuildRequires: wireshark-devel, libgcrypt-devel, gnutls-devel %endif -BuildRequires: python3-mako, python3-requests, python3-devel, tar +BuildRequires: python3-mako, python3-requests, python3-devel, python3-setuptools, tar %if ! %{with binary_firmware} BuildRequires: sdcc sed %endif From 58d4de4fcba38fad6e555136166d277b029b052b Mon Sep 17 00:00:00 2001 From: Python Maint Date: Fri, 4 Jun 2021 21:18:44 +0200 Subject: [PATCH 098/152] Rebuilt for Python 3.10 --- uhd.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/uhd.spec b/uhd.spec index 4b2ebfb..649b6db 100644 --- a/uhd.spec +++ b/uhd.spec @@ -30,7 +30,7 @@ Name: uhd URL: http://github.com/EttusResearch/uhd Version: 4.0.0.0 -Release: 3%{?dist} +Release: 4%{?dist} License: GPLv3+ BuildRequires: make BuildRequires: gcc-c++ @@ -260,6 +260,9 @@ exit 0 %endif %changelog +* Fri Jun 04 2021 Python Maint - 4.0.0.0-4 +- Rebuilt for Python 3.10 + * Tue Mar 30 2021 Jonathan Wakely - 4.0.0.0-3 - Rebuilt for removed libstdc++ symbol (#1937698) From 06e22709bb1f1628571eb0b086f7c6ad9e417251 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jaroslav=20=C5=A0karvada?= Date: Fri, 2 Jul 2021 19:26:00 +0200 Subject: [PATCH 099/152] New version Resolves: rhbz#1976430 --- sources | 4 ++-- uhd-4.0.0.0-gcc-11-fix.patch | 21 ------------------ uhd.spec | 43 +++++++++++++++++++++++++++--------- 3 files changed, 34 insertions(+), 34 deletions(-) delete mode 100644 uhd-4.0.0.0-gcc-11-fix.patch diff --git a/sources b/sources index 388b62a..9c0fbcf 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (uhd-images_4.0.0.0.tar.xz) = 32bc47ad48b2c9228df452c90d9cd4625fafd0c5d202f5fdfc49d2d9b14154ef7101035f403de56c369956df4f5901f6c653a3ae92c64797dd5e005f954a2a1f -SHA512 (uhd-4.0.0.0.tar.gz) = 1f897397467111e634428e807c2c6748e9fc33e5b09083372139cd6e4445fbd71c48f43e18d0c3faef483d448879e40bc9a5a63df4e908b1bec65454ed67a6dd +SHA512 (uhd-4.1.0.0.tar.gz) = b4d1510836d53ece449277749edb615ac8ba3be52853583e2e398994f7412151cbda513c4978e45e5bbf3642009d62bebdca9a615443ef9c8ff522ad4791b1ab +SHA512 (uhd-images_4.1.0.0.tar.xz) = 3ca54ae391fcfba6f662ba0173c0faa6d3a5adc1de332a372c93460e79a058eeb255b1d2d698baa89eb3016bbad72d32a1b2decdd19cce98cb2073b53b8e9036 diff --git a/uhd-4.0.0.0-gcc-11-fix.patch b/uhd-4.0.0.0-gcc-11-fix.patch deleted file mode 100644 index 629815c..0000000 --- a/uhd-4.0.0.0-gcc-11-fix.patch +++ /dev/null @@ -1,21 +0,0 @@ -commit ae3d7551ded10ac51a3c2eda1e9e8ac64c4cd83b (HEAD -> fix-missing-includes-rpc, origin/fix-missing-includes-rpc) -Author: Martin Braun -Date: Fri Jan 29 12:23:50 2021 +0100 - -lib: Fix missing includes in rpc.hpp - -diff --git a/host/lib/include/uhdlib/utils/rpc.hpp b/host/lib/include/uhdlib/utils/rpc.hpp -index e87a2ee32..ca89c1054 100644 ---- a/host/lib/include/uhdlib/utils/rpc.hpp -+++ b/host/lib/include/uhdlib/utils/rpc.hpp -@@ -12,7 +12,11 @@ - #include - #include - #include -+#include - #include -+#include -+#include -+#include - - namespace { diff --git a/uhd.spec b/uhd.spec index 649b6db..4d9206b 100644 --- a/uhd.spec +++ b/uhd.spec @@ -29,21 +29,36 @@ Name: uhd URL: http://github.com/EttusResearch/uhd -Version: 4.0.0.0 -Release: 4%{?dist} +Version: 4.1.0.0 +Release: 1%{?dist} License: GPLv3+ BuildRequires: make BuildRequires: gcc-c++ BuildRequires: cmake -BuildRequires: boost-devel, libusb1-devel, python3-cheetah, ncurses-devel -BuildRequires: python3-docutils, doxygen, pkgconfig, libpcap-devel -BuildRequires: python3-numpy, vim-common, libatomic +BuildRequires: boost-devel +BuildRequires: libusb1-devel +BuildRequires: python3-cheetah +BuildRequires: ncurses-devel +BuildRequires: python3-docutils +BuildRequires: doxygen +BuildRequires: pkgconfig +BuildRequires: libpcap-devel +BuildRequires: python3-numpy +BuildRequires: vim-common +BuildRequires: libatomic %if %{with wireshark} -BuildRequires: wireshark-devel, libgcrypt-devel, gnutls-devel +BuildRequires: wireshark-devel +BuildRequires: libgcrypt-devel +BuildRequires: gnutls-devel %endif -BuildRequires: python3-mako, python3-requests, python3-devel, python3-setuptools, tar +BuildRequires: python3-mako +BuildRequires: python3-requests +BuildRequires: python3-devel +BuildRequires: python3-setuptools +BuildRequires: tar %if ! %{with binary_firmware} -BuildRequires: sdcc sed +BuildRequires: sdcc +BuildRequires: sed %endif Requires(pre): shadow-utils, glibc-common Requires: python3-tkinter @@ -51,8 +66,6 @@ Summary: Universal Hardware Driver for Ettus Research products Source0: %{url}/archive/v%{version}/uhd-%{version}.tar.gz Source1: %{name}-limits.conf Source2: %{url}/releases/download/v%{version}/uhd-images_%{version}.tar.xz -# Patch provided by upstream -Patch0: uhd-4.0.0.0-gcc-11-fix.patch # https://github.com/EttusResearch/uhd/issues/410 Patch1: uhd-4.0.0.0-s390x-build-fix.patch @@ -102,7 +115,6 @@ Wireshark dissector plugins. %prep %setup -q -%patch0 -p1 -b .gcc-11-fix %patch1 -p1 -b .s390x-build-fix # firmware @@ -227,6 +239,7 @@ exit 0 %{_bindir}/uhd_* %{_bindir}/usrp2_* %{_bindir}/rfnoc_image_builder +%{_bindir}/usrp_hwd.py %{_prefix}/lib/udev/rules.d/10-usrp-uhd.rules %config(noreplace) %{_sysconfdir}/security/limits.d/*.conf %{_libdir}/lib*.so.* @@ -235,6 +248,7 @@ exit 0 %{_mandir}/man1/*.1* %{_datadir}/uhd %{python3_sitearch}/uhd +%{python3_sitearch}/usrp_mpm %files firmware %dir %{_datadir}/uhd/images @@ -253,6 +267,9 @@ exit 0 %doc tools/README.md %{_bindir}/usrp_x3xx_fpga_jtag_programmer.sh %{_bindir}/chdr_log +%{_bindir}/aurora_bist_test.py +%{_bindir}/usrp_update_fs +%{_bindir}/e320_bist %if %{with wireshark} %files wireshark @@ -260,6 +277,10 @@ exit 0 %endif %changelog +* Thu Jul 1 2021 Jaroslav Škarvada - 4.1.0.0-1 +- New version + Resolves: rhbz#1976430 + * Fri Jun 04 2021 Python Maint - 4.0.0.0-4 - Rebuilt for Python 3.10 From f35eda7fade87a6d812fd11595ab8fad390e14bd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jaroslav=20=C5=A0karvada?= Date: Wed, 14 Jul 2021 20:44:48 +0200 Subject: [PATCH 100/152] New version Resolves: rhbz#1982075 --- .gitignore | 4 ++-- sources | 2 +- uhd.spec | 10 ++++++++-- 3 files changed, 11 insertions(+), 5 deletions(-) diff --git a/.gitignore b/.gitignore index cbdcc91..44d7193 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,2 @@ -uhd-*.tar.gz -uhd-images_*.tar.xz +/uhd-*.tar.gz +/uhd-images_*.tar.xz diff --git a/sources b/sources index 9c0fbcf..b8d5312 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (uhd-4.1.0.0.tar.gz) = b4d1510836d53ece449277749edb615ac8ba3be52853583e2e398994f7412151cbda513c4978e45e5bbf3642009d62bebdca9a615443ef9c8ff522ad4791b1ab SHA512 (uhd-images_4.1.0.0.tar.xz) = 3ca54ae391fcfba6f662ba0173c0faa6d3a5adc1de332a372c93460e79a058eeb255b1d2d698baa89eb3016bbad72d32a1b2decdd19cce98cb2073b53b8e9036 +SHA512 (uhd-4.1.0.1.tar.gz) = c31438cb6ef63e5913738474be5963e1732de3ffa6e864f6d6caf2218726912770f38f6d67872f882435da7d6841147c904c72545b88ae9e46c734c376697c4d diff --git a/uhd.spec b/uhd.spec index 4d9206b..e8ada57 100644 --- a/uhd.spec +++ b/uhd.spec @@ -29,7 +29,9 @@ Name: uhd URL: http://github.com/EttusResearch/uhd -Version: 4.1.0.0 +Version: 4.1.0.1 +#%%global images_ver %%{version} +%global images_ver 4.1.0.0 Release: 1%{?dist} License: GPLv3+ BuildRequires: make @@ -65,7 +67,7 @@ Requires: python3-tkinter Summary: Universal Hardware Driver for Ettus Research products Source0: %{url}/archive/v%{version}/uhd-%{version}.tar.gz Source1: %{name}-limits.conf -Source2: %{url}/releases/download/v%{version}/uhd-images_%{version}.tar.xz +Source2: %{url}/releases/download/v%{version}/uhd-images_%{images_ver}.tar.xz # https://github.com/EttusResearch/uhd/issues/410 Patch1: uhd-4.0.0.0-s390x-build-fix.patch @@ -277,6 +279,10 @@ exit 0 %endif %changelog +* Wed Jul 14 2021 Jaroslav Škarvada - 4.1.0.1-1 +- New version + Resolves: rhbz#1982075 + * Thu Jul 1 2021 Jaroslav Škarvada - 4.1.0.0-1 - New version Resolves: rhbz#1976430 From f4c63bf9863e888ad945fd19af9e3404262ef7c7 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 23 Jul 2021 19:58:22 +0000 Subject: [PATCH 101/152] - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- uhd.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/uhd.spec b/uhd.spec index e8ada57..8218f67 100644 --- a/uhd.spec +++ b/uhd.spec @@ -32,7 +32,7 @@ URL: http://github.com/EttusResearch/uhd Version: 4.1.0.1 #%%global images_ver %%{version} %global images_ver 4.1.0.0 -Release: 1%{?dist} +Release: 2%{?dist} License: GPLv3+ BuildRequires: make BuildRequires: gcc-c++ @@ -279,6 +279,9 @@ exit 0 %endif %changelog +* Fri Jul 23 2021 Fedora Release Engineering - 4.1.0.1-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild + * Wed Jul 14 2021 Jaroslav Škarvada - 4.1.0.1-1 - New version Resolves: rhbz#1982075 From c279d53123a025797fd243d1ba54e9fad48f7cc0 Mon Sep 17 00:00:00 2001 From: Jonathan Wakely Date: Fri, 6 Aug 2021 23:55:47 +0100 Subject: [PATCH 102/152] Rebuilt for Boost 1.76 --- uhd.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/uhd.spec b/uhd.spec index 8218f67..f7a8e1d 100644 --- a/uhd.spec +++ b/uhd.spec @@ -32,7 +32,7 @@ URL: http://github.com/EttusResearch/uhd Version: 4.1.0.1 #%%global images_ver %%{version} %global images_ver 4.1.0.0 -Release: 2%{?dist} +Release: 3%{?dist} License: GPLv3+ BuildRequires: make BuildRequires: gcc-c++ @@ -279,6 +279,9 @@ exit 0 %endif %changelog +* Fri Aug 06 2021 Jonathan Wakely - 4.1.0.1-3 +- Rebuilt for Boost 1.76 + * Fri Jul 23 2021 Fedora Release Engineering - 4.1.0.1-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild From d7f5921e6e72f9d710d1da61f73b27ee9f9c3593 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jaroslav=20=C5=A0karvada?= Date: Mon, 13 Sep 2021 19:04:39 +0200 Subject: [PATCH 103/152] New version Resolves: rhbz#1989976 --- sources | 2 +- uhd.spec | 8 ++++++-- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/sources b/sources index b8d5312..f3be55b 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ SHA512 (uhd-images_4.1.0.0.tar.xz) = 3ca54ae391fcfba6f662ba0173c0faa6d3a5adc1de332a372c93460e79a058eeb255b1d2d698baa89eb3016bbad72d32a1b2decdd19cce98cb2073b53b8e9036 -SHA512 (uhd-4.1.0.1.tar.gz) = c31438cb6ef63e5913738474be5963e1732de3ffa6e864f6d6caf2218726912770f38f6d67872f882435da7d6841147c904c72545b88ae9e46c734c376697c4d +SHA512 (uhd-4.1.0.2.tar.gz) = 7e10351511b1bb12ed7049ad5455948fb83f40e6c10a6beca8cb4fd75257a48328c1de1cc316219bef69c0cbd15aed861e8614987b2bf2b7ea25f17415251454 diff --git a/uhd.spec b/uhd.spec index f7a8e1d..dc742c2 100644 --- a/uhd.spec +++ b/uhd.spec @@ -29,10 +29,10 @@ Name: uhd URL: http://github.com/EttusResearch/uhd -Version: 4.1.0.1 +Version: 4.1.0.2 #%%global images_ver %%{version} %global images_ver 4.1.0.0 -Release: 3%{?dist} +Release: 1%{?dist} License: GPLv3+ BuildRequires: make BuildRequires: gcc-c++ @@ -279,6 +279,10 @@ exit 0 %endif %changelog +* Mon Sep 13 2021 Jaroslav Škarvada - 4.1.0.2-1 +- New version + Resolves: rhbz#1989976 + * Fri Aug 06 2021 Jonathan Wakely - 4.1.0.1-3 - Rebuilt for Boost 1.76 From 70d4bfb9a0068c26e1a8304ded29cc18710fca3f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jaroslav=20=C5=A0karvada?= Date: Mon, 4 Oct 2021 19:38:52 +0200 Subject: [PATCH 104/152] New version Resolves: rhbz#2006293 --- sources | 2 +- uhd.spec | 8 ++++++-- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/sources b/sources index f3be55b..c053703 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ SHA512 (uhd-images_4.1.0.0.tar.xz) = 3ca54ae391fcfba6f662ba0173c0faa6d3a5adc1de332a372c93460e79a058eeb255b1d2d698baa89eb3016bbad72d32a1b2decdd19cce98cb2073b53b8e9036 -SHA512 (uhd-4.1.0.2.tar.gz) = 7e10351511b1bb12ed7049ad5455948fb83f40e6c10a6beca8cb4fd75257a48328c1de1cc316219bef69c0cbd15aed861e8614987b2bf2b7ea25f17415251454 +SHA512 (uhd-4.1.0.4.tar.gz) = f3ada2f2b114b1e8d0eca71da7ed5494191364c864adb1498314255ba280c7c747f2f5d118c98ae1f7ae96f3ef0e4aafd86955fb7e6271c800b359f95703fcd6 diff --git a/uhd.spec b/uhd.spec index dc742c2..a4cb66c 100644 --- a/uhd.spec +++ b/uhd.spec @@ -29,7 +29,7 @@ Name: uhd URL: http://github.com/EttusResearch/uhd -Version: 4.1.0.2 +Version: 4.1.0.4 #%%global images_ver %%{version} %global images_ver 4.1.0.0 Release: 1%{?dist} @@ -67,7 +67,7 @@ Requires: python3-tkinter Summary: Universal Hardware Driver for Ettus Research products Source0: %{url}/archive/v%{version}/uhd-%{version}.tar.gz Source1: %{name}-limits.conf -Source2: %{url}/releases/download/v%{version}/uhd-images_%{images_ver}.tar.xz +Source2: %{url}/releases/download/v%{images_ver}/uhd-images_%{images_ver}.tar.xz # https://github.com/EttusResearch/uhd/issues/410 Patch1: uhd-4.0.0.0-s390x-build-fix.patch @@ -279,6 +279,10 @@ exit 0 %endif %changelog +* Mon Oct 4 2021 Jaroslav Škarvada - 4.1.0.4-1 +- New version + Resolves: rhbz#2006293 + * Mon Sep 13 2021 Jaroslav Škarvada - 4.1.0.2-1 - New version Resolves: rhbz#1989976 From c14745893abde42a966b07dd49ab3d301f6e86fe Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jaroslav=20=C5=A0karvada?= Date: Wed, 15 Dec 2021 22:29:50 +0100 Subject: [PATCH 105/152] New version Resolves: rhbz#2029036 --- sources | 4 ++-- uhd.spec | 8 ++++++-- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/sources b/sources index c053703..881fa60 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (uhd-images_4.1.0.0.tar.xz) = 3ca54ae391fcfba6f662ba0173c0faa6d3a5adc1de332a372c93460e79a058eeb255b1d2d698baa89eb3016bbad72d32a1b2decdd19cce98cb2073b53b8e9036 -SHA512 (uhd-4.1.0.4.tar.gz) = f3ada2f2b114b1e8d0eca71da7ed5494191364c864adb1498314255ba280c7c747f2f5d118c98ae1f7ae96f3ef0e4aafd86955fb7e6271c800b359f95703fcd6 +SHA512 (uhd-images_4.1.0.4.tar.xz) = 6dfd612d794281e01739e6d2623c89d1a516e6a770cc39ce7536d6b760a51a4e2e09453d80791c417d635d3f76326a397875e04dd08418ed724b4d0679f2961b +SHA512 (uhd-4.1.0.5.tar.gz) = 4929ebc8a12bcc0acfe4a64ceafe17387420e2f056e7bb7284a8d7b60d14aba05484b3c033ce63b00c6d9115f570b056df4e2b36e11a2b25079a8c34b1d084af diff --git a/uhd.spec b/uhd.spec index a4cb66c..69a5dc0 100644 --- a/uhd.spec +++ b/uhd.spec @@ -29,9 +29,9 @@ Name: uhd URL: http://github.com/EttusResearch/uhd -Version: 4.1.0.4 +Version: 4.1.0.5 #%%global images_ver %%{version} -%global images_ver 4.1.0.0 +%global images_ver 4.1.0.4 Release: 1%{?dist} License: GPLv3+ BuildRequires: make @@ -279,6 +279,10 @@ exit 0 %endif %changelog +* Wed Dec 15 2021 Jaroslav Škarvada - 4.1.0.5-1 +- New version + Resolves: rhbz#2029036 + * Mon Oct 4 2021 Jaroslav Škarvada - 4.1.0.4-1 - New version Resolves: rhbz#2006293 From 78789617741f08d0a1b7ffc3918c405601e23278 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 22 Jan 2022 03:27:22 +0000 Subject: [PATCH 106/152] - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- uhd.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/uhd.spec b/uhd.spec index 69a5dc0..6a3dd01 100644 --- a/uhd.spec +++ b/uhd.spec @@ -32,7 +32,7 @@ URL: http://github.com/EttusResearch/uhd Version: 4.1.0.5 #%%global images_ver %%{version} %global images_ver 4.1.0.4 -Release: 1%{?dist} +Release: 2%{?dist} License: GPLv3+ BuildRequires: make BuildRequires: gcc-c++ @@ -279,6 +279,9 @@ exit 0 %endif %changelog +* Sat Jan 22 2022 Fedora Release Engineering - 4.1.0.5-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild + * Wed Dec 15 2021 Jaroslav Škarvada - 4.1.0.5-1 - New version Resolves: rhbz#2029036 From 87d004a0af89fc8d52e0e9faa6261d1c14d1b449 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jaroslav=20=C5=A0karvada?= Date: Fri, 28 Jan 2022 16:41:50 +0100 Subject: [PATCH 107/152] Defuzzified s390x patch --- ...0x-build-fix.patch => uhd-4.1.0.5-s390x-build-fix.patch | 4 ++-- uhd.spec | 7 +++++-- 2 files changed, 7 insertions(+), 4 deletions(-) rename uhd-4.0.0.0-s390x-build-fix.patch => uhd-4.1.0.5-s390x-build-fix.patch (79%) diff --git a/uhd-4.0.0.0-s390x-build-fix.patch b/uhd-4.1.0.5-s390x-build-fix.patch similarity index 79% rename from uhd-4.0.0.0-s390x-build-fix.patch rename to uhd-4.1.0.5-s390x-build-fix.patch index da7974d..d4b1e45 100644 --- a/uhd-4.0.0.0-s390x-build-fix.patch +++ b/uhd-4.1.0.5-s390x-build-fix.patch @@ -1,8 +1,8 @@ diff --git a/host/lib/utils/CMakeLists.txt b/host/lib/utils/CMakeLists.txt -index 7e95d8c..2ad6e40 100644 +index 639b3e9..abd4e0f 100644 --- a/host/lib/utils/CMakeLists.txt +++ b/host/lib/utils/CMakeLists.txt -@@ -229,3 +229,5 @@ if(ENABLE_C_API) +@@ -243,3 +243,5 @@ if(ENABLE_C_API) ${CMAKE_CURRENT_SOURCE_DIR}/thread_priority_c.cpp ) endif(ENABLE_C_API) diff --git a/uhd.spec b/uhd.spec index 6a3dd01..f083d57 100644 --- a/uhd.spec +++ b/uhd.spec @@ -32,7 +32,7 @@ URL: http://github.com/EttusResearch/uhd Version: 4.1.0.5 #%%global images_ver %%{version} %global images_ver 4.1.0.4 -Release: 2%{?dist} +Release: 3%{?dist} License: GPLv3+ BuildRequires: make BuildRequires: gcc-c++ @@ -69,7 +69,7 @@ Source0: %{url}/archive/v%{version}/uhd-%{version}.tar.gz Source1: %{name}-limits.conf Source2: %{url}/releases/download/v%{images_ver}/uhd-images_%{images_ver}.tar.xz # https://github.com/EttusResearch/uhd/issues/410 -Patch1: uhd-4.0.0.0-s390x-build-fix.patch +Patch1: uhd-4.1.0.5-s390x-build-fix.patch %description The UHD is the universal hardware driver for Ettus Research products. @@ -279,6 +279,9 @@ exit 0 %endif %changelog +* Fri Jan 28 2022 Jaroslav Škarvada - 4.1.0.5-3 +- Defuzzified s390x patch + * Sat Jan 22 2022 Fedora Release Engineering - 4.1.0.5-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild From 49229bd6ae6013a318497fb3c389652fa46c040f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jaroslav=20=C5=A0karvada?= Date: Sat, 29 Jan 2022 00:40:07 +0100 Subject: [PATCH 108/152] Fixed images path --- uhd-4.1.0.5-imagepath-fix.patch | 13 +++++++++++++ uhd.spec | 9 ++++++++- 2 files changed, 21 insertions(+), 1 deletion(-) create mode 100644 uhd-4.1.0.5-imagepath-fix.patch diff --git a/uhd-4.1.0.5-imagepath-fix.patch b/uhd-4.1.0.5-imagepath-fix.patch new file mode 100644 index 0000000..847ff04 --- /dev/null +++ b/uhd-4.1.0.5-imagepath-fix.patch @@ -0,0 +1,13 @@ +diff --git a/host/lib/utils/paths.cpp b/host/lib/utils/paths.cpp +index 802dd5e..e3bd722 100644 +--- a/host/lib/utils/paths.cpp ++++ b/host/lib/utils/paths.cpp +@@ -289,7 +289,7 @@ std::string uhd::get_pkg_path(void) + + std::string uhd::get_lib_path(void) + { +- fs::path runtime_libfile_path = boost::dll::this_line_location(); ++ fs::path runtime_libfile_path = "/usr" / boost::dll::this_line_location(); + //Normalize before decomposing path so result is reliable + fs::path lib_path = runtime_libfile_path.lexically_normal().parent_path(); + return lib_path.string(); diff --git a/uhd.spec b/uhd.spec index f083d57..97f307f 100644 --- a/uhd.spec +++ b/uhd.spec @@ -32,7 +32,7 @@ URL: http://github.com/EttusResearch/uhd Version: 4.1.0.5 #%%global images_ver %%{version} %global images_ver 4.1.0.4 -Release: 3%{?dist} +Release: 4%{?dist} License: GPLv3+ BuildRequires: make BuildRequires: gcc-c++ @@ -70,6 +70,9 @@ Source1: %{name}-limits.conf Source2: %{url}/releases/download/v%{images_ver}/uhd-images_%{images_ver}.tar.xz # https://github.com/EttusResearch/uhd/issues/410 Patch1: uhd-4.1.0.5-s390x-build-fix.patch +# dirty workaround for the https://github.com/EttusResearch/uhd/issues/551 +# until the better fix is available +Patch2: uhd-4.1.0.5-imagepath-fix.patch %description The UHD is the universal hardware driver for Ettus Research products. @@ -118,6 +121,7 @@ Wireshark dissector plugins. %prep %setup -q %patch1 -p1 -b .s390x-build-fix +%patch2 -p1 -b .imagepath-fix # firmware %if %{with binary_firmware} @@ -279,6 +283,9 @@ exit 0 %endif %changelog +* Fri Jan 28 2022 Jaroslav Škarvada - 4.1.0.5-4 +- Fixed images path + * Fri Jan 28 2022 Jaroslav Škarvada - 4.1.0.5-3 - Defuzzified s390x patch From 613bc2470d5d7d8474b48f8cb60200ae9e7e7bb1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jaroslav=20=C5=A0karvada?= Date: Tue, 1 Feb 2022 01:06:00 +0100 Subject: [PATCH 109/152] Switched to the upstream patch to fix compilation on the s390x --- uhd-4.1.0.5-s390x-build-fix.patch | 54 +++++++++++++++++++++++++------ uhd.spec | 5 ++- 2 files changed, 49 insertions(+), 10 deletions(-) diff --git a/uhd-4.1.0.5-s390x-build-fix.patch b/uhd-4.1.0.5-s390x-build-fix.patch index d4b1e45..b843d80 100644 --- a/uhd-4.1.0.5-s390x-build-fix.patch +++ b/uhd-4.1.0.5-s390x-build-fix.patch @@ -1,10 +1,46 @@ -diff --git a/host/lib/utils/CMakeLists.txt b/host/lib/utils/CMakeLists.txt -index 639b3e9..abd4e0f 100644 ---- a/host/lib/utils/CMakeLists.txt -+++ b/host/lib/utils/CMakeLists.txt -@@ -243,3 +243,5 @@ if(ENABLE_C_API) - ${CMAKE_CURRENT_SOURCE_DIR}/thread_priority_c.cpp - ) - endif(ENABLE_C_API) +diff --git a/host/cmake/Modules/UHDAtomics.cmake b/host/cmake/Modules/UHDAtomics.cmake +index 4d53a2d..e206f39 100644 +--- a/host/cmake/Modules/UHDAtomics.cmake ++++ b/host/cmake/Modules/UHDAtomics.cmake +@@ -33,6 +33,16 @@ function(CHECK_WORKING_CXX_ATOMICS64 varname) + " ${varname}) + endfunction(CHECK_WORKING_CXX_ATOMICS64) + ++function(CHECK_WORKING_CXX_BOOST_ATOMICS varname) ++ CHECK_CXX_SOURCE_COMPILES(" ++ #include ++ boost::lockfree::queue queue(1); ++ int main() { ++ return queue.is_lock_free(); ++ } ++ " ${varname}) ++endfunction(CHECK_WORKING_CXX_BOOST_ATOMICS) + -+LIBUHD_APPEND_LIBS(atomic) + macro(CHECK_ATOMICS_LIB_REQUIRED required_var) + set(${required_var} FALSE) + if(MSVC) +@@ -76,5 +86,24 @@ macro(CHECK_ATOMICS_LIB_REQUIRED required_var) + "Host compiler appears to require libatomic for 64-bit operations, but cannot find it.") + endif() + endif() ++ # Check whether boost requires atomic. ++ CHECK_WORKING_CXX_BOOST_ATOMICS(HAVE_CXX_BOOST_ATOMICS_WITHOUT_LIB) ++ # If not, check if the library exists, and atomics work with it. ++ if(NOT HAVE_CXX_BOOST_ATOMICS_WITHOUT_LIB) ++ check_library_exists(atomic __atomic_fetch_add_4 "" HAVE_LIBATOMIC) ++ if(HAVE_LIBATOMIC) ++ set(${required_var} TRUE) ++ set(CMAKE_REQUIRED_LIBRARIES "atomic") ++ CHECK_WORKING_CXX_BOOST_ATOMICS(HAVE_CXX_BOOST_ATOMICS_WITH_LIB) ++ unset(CMAKE_REQUIRED_LIBRARIES) ++ if (NOT HAVE_CXX_BOOST_ATOMICS_WITH_LIB) ++ message(FATAL_ERROR "Host compiler must support std::atomic!") ++ endif() ++ else() ++ message( ++ FATAL_ERROR ++ "Host compiler appears to require libatomic, but cannot find it.") ++ endif() ++ endif() + endif() + endmacro(CHECK_ATOMICS_LIB_REQUIRED) diff --git a/uhd.spec b/uhd.spec index 97f307f..b68836c 100644 --- a/uhd.spec +++ b/uhd.spec @@ -32,7 +32,7 @@ URL: http://github.com/EttusResearch/uhd Version: 4.1.0.5 #%%global images_ver %%{version} %global images_ver 4.1.0.4 -Release: 4%{?dist} +Release: 5%{?dist} License: GPLv3+ BuildRequires: make BuildRequires: gcc-c++ @@ -283,6 +283,9 @@ exit 0 %endif %changelog +* Tue Feb 1 2022 Jaroslav Škarvada - 4.1.0.5-5 +- Switched to the upstream patch to fix compilation on the s390x + * Fri Jan 28 2022 Jaroslav Škarvada - 4.1.0.5-4 - Fixed images path From fd13a9538d5b301562b2f37e3386d3bc75d21d49 Mon Sep 17 00:00:00 2001 From: Troy Dawson Date: Mon, 31 Jan 2022 17:47:13 -0800 Subject: [PATCH 110/152] epel8-playground decommissioned : https://pagure.io/epel/issue/136 --- .gitignore | 0 dead.package | 1 + sources | 0 3 files changed, 1 insertion(+) delete mode 100644 .gitignore create mode 100644 dead.package delete mode 100644 sources diff --git a/.gitignore b/.gitignore deleted file mode 100644 index e69de29..0000000 diff --git a/dead.package b/dead.package new file mode 100644 index 0000000..a72aec0 --- /dev/null +++ b/dead.package @@ -0,0 +1 @@ +epel8-playground decommissioned : https://pagure.io/epel/issue/136 diff --git a/sources b/sources deleted file mode 100644 index e69de29..0000000 From 875ad9bdff2967d07b899385c4cf448a91438c6b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jaroslav=20=C5=A0karvada?= Date: Thu, 21 Apr 2022 15:04:27 +0200 Subject: [PATCH 111/152] New version Resolves: rhbz#2073640 --- sources | 4 +- uhd-4.1.0.5-s390x-build-fix.patch | 46 ------------------- ...x.patch => uhd-4.2.0.0-imagepath-fix.patch | 6 +-- uhd.spec | 17 +++---- 4 files changed, 14 insertions(+), 59 deletions(-) delete mode 100644 uhd-4.1.0.5-s390x-build-fix.patch rename uhd-4.1.0.5-imagepath-fix.patch => uhd-4.2.0.0-imagepath-fix.patch (74%) diff --git a/sources b/sources index 881fa60..20ccc4b 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (uhd-images_4.1.0.4.tar.xz) = 6dfd612d794281e01739e6d2623c89d1a516e6a770cc39ce7536d6b760a51a4e2e09453d80791c417d635d3f76326a397875e04dd08418ed724b4d0679f2961b -SHA512 (uhd-4.1.0.5.tar.gz) = 4929ebc8a12bcc0acfe4a64ceafe17387420e2f056e7bb7284a8d7b60d14aba05484b3c033ce63b00c6d9115f570b056df4e2b36e11a2b25079a8c34b1d084af +SHA512 (uhd-4.2.0.0.tar.gz) = a5f105a8765a06e53bed17dee760dfa985d40a97c61ca243127c8a912378d6f5ae81170a48e8e5f92a238bcfd66742798043b3fb0119e574dbac74291f15ec9c +SHA512 (uhd-images_4.1.0.5.tar.xz) = fa9ca49bc917e55a1505acce090dc6b06cac6c59fbe7a78c2c47f79783fab52baf9563903715da205762962485c8b4a83292a171a33e7c247b0eeb35819aff5c diff --git a/uhd-4.1.0.5-s390x-build-fix.patch b/uhd-4.1.0.5-s390x-build-fix.patch deleted file mode 100644 index b843d80..0000000 --- a/uhd-4.1.0.5-s390x-build-fix.patch +++ /dev/null @@ -1,46 +0,0 @@ -diff --git a/host/cmake/Modules/UHDAtomics.cmake b/host/cmake/Modules/UHDAtomics.cmake -index 4d53a2d..e206f39 100644 ---- a/host/cmake/Modules/UHDAtomics.cmake -+++ b/host/cmake/Modules/UHDAtomics.cmake -@@ -33,6 +33,16 @@ function(CHECK_WORKING_CXX_ATOMICS64 varname) - " ${varname}) - endfunction(CHECK_WORKING_CXX_ATOMICS64) - -+function(CHECK_WORKING_CXX_BOOST_ATOMICS varname) -+ CHECK_CXX_SOURCE_COMPILES(" -+ #include -+ boost::lockfree::queue queue(1); -+ int main() { -+ return queue.is_lock_free(); -+ } -+ " ${varname}) -+endfunction(CHECK_WORKING_CXX_BOOST_ATOMICS) -+ - macro(CHECK_ATOMICS_LIB_REQUIRED required_var) - set(${required_var} FALSE) - if(MSVC) -@@ -76,5 +86,24 @@ macro(CHECK_ATOMICS_LIB_REQUIRED required_var) - "Host compiler appears to require libatomic for 64-bit operations, but cannot find it.") - endif() - endif() -+ # Check whether boost requires atomic. -+ CHECK_WORKING_CXX_BOOST_ATOMICS(HAVE_CXX_BOOST_ATOMICS_WITHOUT_LIB) -+ # If not, check if the library exists, and atomics work with it. -+ if(NOT HAVE_CXX_BOOST_ATOMICS_WITHOUT_LIB) -+ check_library_exists(atomic __atomic_fetch_add_4 "" HAVE_LIBATOMIC) -+ if(HAVE_LIBATOMIC) -+ set(${required_var} TRUE) -+ set(CMAKE_REQUIRED_LIBRARIES "atomic") -+ CHECK_WORKING_CXX_BOOST_ATOMICS(HAVE_CXX_BOOST_ATOMICS_WITH_LIB) -+ unset(CMAKE_REQUIRED_LIBRARIES) -+ if (NOT HAVE_CXX_BOOST_ATOMICS_WITH_LIB) -+ message(FATAL_ERROR "Host compiler must support std::atomic!") -+ endif() -+ else() -+ message( -+ FATAL_ERROR -+ "Host compiler appears to require libatomic, but cannot find it.") -+ endif() -+ endif() - endif() - endmacro(CHECK_ATOMICS_LIB_REQUIRED) diff --git a/uhd-4.1.0.5-imagepath-fix.patch b/uhd-4.2.0.0-imagepath-fix.patch similarity index 74% rename from uhd-4.1.0.5-imagepath-fix.patch rename to uhd-4.2.0.0-imagepath-fix.patch index 847ff04..7230a92 100644 --- a/uhd-4.1.0.5-imagepath-fix.patch +++ b/uhd-4.2.0.0-imagepath-fix.patch @@ -1,13 +1,13 @@ diff --git a/host/lib/utils/paths.cpp b/host/lib/utils/paths.cpp -index 802dd5e..e3bd722 100644 +index 73b4cc2..a122c9d 100644 --- a/host/lib/utils/paths.cpp +++ b/host/lib/utils/paths.cpp -@@ -289,7 +289,7 @@ std::string uhd::get_pkg_path(void) +@@ -290,7 +290,7 @@ std::string uhd::get_pkg_path(void) std::string uhd::get_lib_path(void) { - fs::path runtime_libfile_path = boost::dll::this_line_location(); + fs::path runtime_libfile_path = "/usr" / boost::dll::this_line_location(); - //Normalize before decomposing path so result is reliable + // Normalize before decomposing path so result is reliable fs::path lib_path = runtime_libfile_path.lexically_normal().parent_path(); return lib_path.string(); diff --git a/uhd.spec b/uhd.spec index b68836c..0a0938a 100644 --- a/uhd.spec +++ b/uhd.spec @@ -29,10 +29,10 @@ Name: uhd URL: http://github.com/EttusResearch/uhd -Version: 4.1.0.5 +Version: 4.2.0.0 #%%global images_ver %%{version} -%global images_ver 4.1.0.4 -Release: 5%{?dist} +%global images_ver 4.1.0.5 +Release: 1%{?dist} License: GPLv3+ BuildRequires: make BuildRequires: gcc-c++ @@ -68,11 +68,9 @@ Summary: Universal Hardware Driver for Ettus Research products Source0: %{url}/archive/v%{version}/uhd-%{version}.tar.gz Source1: %{name}-limits.conf Source2: %{url}/releases/download/v%{images_ver}/uhd-images_%{images_ver}.tar.xz -# https://github.com/EttusResearch/uhd/issues/410 -Patch1: uhd-4.1.0.5-s390x-build-fix.patch # dirty workaround for the https://github.com/EttusResearch/uhd/issues/551 # until the better fix is available -Patch2: uhd-4.1.0.5-imagepath-fix.patch +Patch0: uhd-4.2.0.0-imagepath-fix.patch %description The UHD is the universal hardware driver for Ettus Research products. @@ -120,8 +118,7 @@ Wireshark dissector plugins. %prep %setup -q -%patch1 -p1 -b .s390x-build-fix -%patch2 -p1 -b .imagepath-fix +%patch0 -p1 -b .imagepath-fix # firmware %if %{with binary_firmware} @@ -283,6 +280,10 @@ exit 0 %endif %changelog +* Thu Apr 21 2022 Jaroslav Škarvada - 4.2.0.0-1 +- New version + Resolves: rhbz#2073640 + * Tue Feb 1 2022 Jaroslav Škarvada - 4.1.0.5-5 - Switched to the upstream patch to fix compilation on the s390x From 1bc8bc1e0f221e87829e27385ce4cae0d3e76c97 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jaroslav=20=C5=A0karvada?= Date: Thu, 21 Apr 2022 21:32:44 +0200 Subject: [PATCH 112/152] Fixed FTBFS MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Jaroslav Škarvada --- uhd.spec | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/uhd.spec b/uhd.spec index 0a0938a..c1e8faa 100644 --- a/uhd.spec +++ b/uhd.spec @@ -239,6 +239,7 @@ exit 0 %exclude %{_datadir}/uhd/images %doc _tmpdoc/* %dir %{_libdir}/uhd +%{_bindir}/usrpctl %{_bindir}/uhd_* %{_bindir}/usrp2_* %{_bindir}/rfnoc_image_builder @@ -270,9 +271,6 @@ exit 0 %doc tools/README.md %{_bindir}/usrp_x3xx_fpga_jtag_programmer.sh %{_bindir}/chdr_log -%{_bindir}/aurora_bist_test.py -%{_bindir}/usrp_update_fs -%{_bindir}/e320_bist %if %{with wireshark} %files wireshark From 4047fb8169b8e2521f55dfbd5135fdb7ea09a337 Mon Sep 17 00:00:00 2001 From: Thomas Rodgers Date: Wed, 4 May 2022 11:42:27 +0200 Subject: [PATCH 113/152] Rebuilt for Boost 1.78 --- uhd.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/uhd.spec b/uhd.spec index c1e8faa..6f0115d 100644 --- a/uhd.spec +++ b/uhd.spec @@ -32,7 +32,7 @@ URL: http://github.com/EttusResearch/uhd Version: 4.2.0.0 #%%global images_ver %%{version} %global images_ver 4.1.0.5 -Release: 1%{?dist} +Release: 2%{?dist} License: GPLv3+ BuildRequires: make BuildRequires: gcc-c++ @@ -278,6 +278,9 @@ exit 0 %endif %changelog +* Wed May 04 2022 Thomas Rodgers - 4.2.0.0-2 +- Rebuilt for Boost 1.78 + * Thu Apr 21 2022 Jaroslav Škarvada - 4.2.0.0-1 - New version Resolves: rhbz#2073640 From e5fb6d407069a870b581c2b89cd35685fcf74edd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jaroslav=20=C5=A0karvada?= Date: Mon, 20 Jun 2022 12:27:34 +0200 Subject: [PATCH 114/152] Rebuilt for new python Resolves: rhbz#2099182 --- uhd.spec | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/uhd.spec b/uhd.spec index 6f0115d..2961a01 100644 --- a/uhd.spec +++ b/uhd.spec @@ -32,7 +32,7 @@ URL: http://github.com/EttusResearch/uhd Version: 4.2.0.0 #%%global images_ver %%{version} %global images_ver 4.1.0.5 -Release: 2%{?dist} +Release: 3%{?dist} License: GPLv3+ BuildRequires: make BuildRequires: gcc-c++ @@ -278,6 +278,10 @@ exit 0 %endif %changelog +* Mon Jun 20 2022 Jaroslav Škarvada - 4.2.0.0-3 +- Rebuilt for new python + Resolves: rhbz#2099182 + * Wed May 04 2022 Thomas Rodgers - 4.2.0.0-2 - Rebuilt for Boost 1.78 From f11fa01adb3bd845c6666acf1b95d829b47ae624 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miro=20Hron=C4=8Dok?= Date: Tue, 21 Jun 2022 14:24:16 +0200 Subject: [PATCH 115/152] Unbundle pybind11 to fix FTBFS with Python 3.11 Fedora's pybind11 is already fixed. Fixes https://bugzilla.redhat.com/show_bug.cgi?id=2099182 --- uhd.spec | 2 ++ 1 file changed, 2 insertions(+) diff --git a/uhd.spec b/uhd.spec index 2961a01..37f9458 100644 --- a/uhd.spec +++ b/uhd.spec @@ -53,6 +53,7 @@ BuildRequires: wireshark-devel BuildRequires: libgcrypt-devel BuildRequires: gnutls-devel %endif +BuildRequires: pybind11-devel BuildRequires: python3-mako BuildRequires: python3-requests BuildRequires: python3-devel @@ -146,6 +147,7 @@ popd pushd host %cmake %{?have_neon} -DPYTHON_EXECUTABLE="%{__python3}" \ + -DPYBIND11_INCLUDE_DIR="/usr/include/pybind11/" \ -DUHD_VERSION="%{version}" \ -DENABLE_TESTS=off ../ %cmake_build From 8c8cb59a3387a732e7eff1faec8f5e79512a19b1 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 23 Jul 2022 11:19:11 +0000 Subject: [PATCH 116/152] Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- uhd.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/uhd.spec b/uhd.spec index 37f9458..34bf925 100644 --- a/uhd.spec +++ b/uhd.spec @@ -32,7 +32,7 @@ URL: http://github.com/EttusResearch/uhd Version: 4.2.0.0 #%%global images_ver %%{version} %global images_ver 4.1.0.5 -Release: 3%{?dist} +Release: 4%{?dist} License: GPLv3+ BuildRequires: make BuildRequires: gcc-c++ @@ -280,6 +280,9 @@ exit 0 %endif %changelog +* Sat Jul 23 2022 Fedora Release Engineering - 4.2.0.0-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild + * Mon Jun 20 2022 Jaroslav Škarvada - 4.2.0.0-3 - Rebuilt for new python Resolves: rhbz#2099182 From b9d08a4ba6f5dc7b9e4e390c55529f6fcbe67ea4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jaroslav=20=C5=A0karvada?= Date: Fri, 29 Jul 2022 23:30:17 +0200 Subject: [PATCH 117/152] New version Resolves: rhbz#2110023 --- sources | 4 ++-- uhd.spec | 10 +++++++--- 2 files changed, 9 insertions(+), 5 deletions(-) diff --git a/sources b/sources index 20ccc4b..7e2ebbe 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (uhd-4.2.0.0.tar.gz) = a5f105a8765a06e53bed17dee760dfa985d40a97c61ca243127c8a912378d6f5ae81170a48e8e5f92a238bcfd66742798043b3fb0119e574dbac74291f15ec9c -SHA512 (uhd-images_4.1.0.5.tar.xz) = fa9ca49bc917e55a1505acce090dc6b06cac6c59fbe7a78c2c47f79783fab52baf9563903715da205762962485c8b4a83292a171a33e7c247b0eeb35819aff5c +SHA512 (uhd-4.2.0.1.tar.gz) = 9b5e1c706f937e433c3eebe32492bf7bc8d38e8f4bca231e0cd2b1b9996910203c6cc3ffea8c54467062e24f912ece3a476943c7d73500d7dc1a958cc67c4807 +SHA512 (uhd-images_4.2.0.1.tar.xz) = cb2c5465c1b4ad9e1192392b48740e0d2be07a9a7ce65adbe7d7850062b48a96a06fef9bb1350f6586054c5cf3354abb9dce66259e95391ec4494f3e1046b905 diff --git a/uhd.spec b/uhd.spec index 34bf925..2f71bee 100644 --- a/uhd.spec +++ b/uhd.spec @@ -29,10 +29,10 @@ Name: uhd URL: http://github.com/EttusResearch/uhd -Version: 4.2.0.0 +Version: 4.2.0.1 #%%global images_ver %%{version} -%global images_ver 4.1.0.5 -Release: 4%{?dist} +%global images_ver 4.2.0.1 +Release: 1%{?dist} License: GPLv3+ BuildRequires: make BuildRequires: gcc-c++ @@ -280,6 +280,10 @@ exit 0 %endif %changelog +* Fri Jul 29 2022 Jaroslav Škarvada - 4.2.0.1-1 +- New version + Resolves: rhbz#2110023 + * Sat Jul 23 2022 Fedora Release Engineering - 4.2.0.0-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild From 435955a71853042b000600736c4b3c8cd6441325 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jaroslav=20=C5=A0karvada?= Date: Sat, 24 Sep 2022 18:17:23 +0200 Subject: [PATCH 118/152] New version Resolves: rhbz#2124734 --- sources | 4 ++-- uhd.spec | 9 ++++++--- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/sources b/sources index 7e2ebbe..cce63fb 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (uhd-4.2.0.1.tar.gz) = 9b5e1c706f937e433c3eebe32492bf7bc8d38e8f4bca231e0cd2b1b9996910203c6cc3ffea8c54467062e24f912ece3a476943c7d73500d7dc1a958cc67c4807 -SHA512 (uhd-images_4.2.0.1.tar.xz) = cb2c5465c1b4ad9e1192392b48740e0d2be07a9a7ce65adbe7d7850062b48a96a06fef9bb1350f6586054c5cf3354abb9dce66259e95391ec4494f3e1046b905 +SHA512 (uhd-4.3.0.0.tar.gz) = 8907e134747b853dd3fa457ac097287783b362a56ac9fdf6fb44157baa1ddabfe3934e110bfac81180b42ea7ec2defefc444736955091a072b1166b5d27253fc +SHA512 (uhd-images_4.3.0.0.tar.xz) = 3b34d7b2d3d957284cd8a94043158ba5d7b9999d3da4ed6f97f6d38b427c3af54129e7b5a9840d7ec8ff1e8c5c61ef31f62994d81d7ea8a36cbd098274a999d7 diff --git a/uhd.spec b/uhd.spec index 2f71bee..457cf26 100644 --- a/uhd.spec +++ b/uhd.spec @@ -29,9 +29,8 @@ Name: uhd URL: http://github.com/EttusResearch/uhd -Version: 4.2.0.1 -#%%global images_ver %%{version} -%global images_ver 4.2.0.1 +Version: 4.3.0.0 +%global images_ver %{version} Release: 1%{?dist} License: GPLv3+ BuildRequires: make @@ -280,6 +279,10 @@ exit 0 %endif %changelog +* Sat Sep 24 2022 Jaroslav Škarvada - 4.3.0.0-1 +- New version + Resolves: rhbz#2124734 + * Fri Jul 29 2022 Jaroslav Škarvada - 4.2.0.1-1 - New version Resolves: rhbz#2110023 From def8e2df85df84f2dc10cdc639b6b4685c4575c9 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 21 Jan 2023 05:44:28 +0000 Subject: [PATCH 119/152] Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- uhd.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/uhd.spec b/uhd.spec index 457cf26..eed4bc9 100644 --- a/uhd.spec +++ b/uhd.spec @@ -31,7 +31,7 @@ Name: uhd URL: http://github.com/EttusResearch/uhd Version: 4.3.0.0 %global images_ver %{version} -Release: 1%{?dist} +Release: 2%{?dist} License: GPLv3+ BuildRequires: make BuildRequires: gcc-c++ @@ -279,6 +279,9 @@ exit 0 %endif %changelog +* Sat Jan 21 2023 Fedora Release Engineering - 4.3.0.0-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild + * Sat Sep 24 2022 Jaroslav Škarvada - 4.3.0.0-1 - New version Resolves: rhbz#2124734 From 1320ace55817e287804892f2a06f6b586de33df1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jaroslav=20=C5=A0karvada?= Date: Wed, 1 Feb 2023 17:39:19 +0100 Subject: [PATCH 120/152] New version Resolves: rhbz#2164284 --- sources | 4 ++-- uhd.spec | 8 ++++++-- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/sources b/sources index cce63fb..d994e2a 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (uhd-4.3.0.0.tar.gz) = 8907e134747b853dd3fa457ac097287783b362a56ac9fdf6fb44157baa1ddabfe3934e110bfac81180b42ea7ec2defefc444736955091a072b1166b5d27253fc -SHA512 (uhd-images_4.3.0.0.tar.xz) = 3b34d7b2d3d957284cd8a94043158ba5d7b9999d3da4ed6f97f6d38b427c3af54129e7b5a9840d7ec8ff1e8c5c61ef31f62994d81d7ea8a36cbd098274a999d7 +SHA512 (uhd-images_4.4.0.0.tar.xz) = 17b364128155bf850ff5ae72eeb8fa52446881d0234254943d27524610f0efc4d5bf5da7be248982fc603101d4f76f5a8019fbecb044d2637a1022cdccde0463 +SHA512 (uhd-4.4.0.0.tar.gz) = 3c9b57dc776e0fadc991ffeede84c2367f7403bfae6fd30a045baf1c9cfb21889310b9a8340a35ea13eea00208bf678cccd7b82e190dfb6b9d61e42bdef3b21a diff --git a/uhd.spec b/uhd.spec index eed4bc9..0a7e15c 100644 --- a/uhd.spec +++ b/uhd.spec @@ -29,9 +29,9 @@ Name: uhd URL: http://github.com/EttusResearch/uhd -Version: 4.3.0.0 +Version: 4.4.0.0 %global images_ver %{version} -Release: 2%{?dist} +Release: 1%{?dist} License: GPLv3+ BuildRequires: make BuildRequires: gcc-c++ @@ -279,6 +279,10 @@ exit 0 %endif %changelog +* Wed Feb 1 2023 Jaroslav Škarvada - 4.4.0.0-1 +- New version + Resolves: rhbz#2164284 + * Sat Jan 21 2023 Fedora Release Engineering - 4.3.0.0-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild From e6450ed1a05dd36d9a9033e07ab459aa64cd5831 Mon Sep 17 00:00:00 2001 From: Jonathan Wakely Date: Mon, 20 Feb 2023 21:57:26 +0000 Subject: [PATCH 121/152] Rebuilt for Boost 1.81 --- uhd.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/uhd.spec b/uhd.spec index 0a7e15c..de3310f 100644 --- a/uhd.spec +++ b/uhd.spec @@ -31,7 +31,7 @@ Name: uhd URL: http://github.com/EttusResearch/uhd Version: 4.4.0.0 %global images_ver %{version} -Release: 1%{?dist} +Release: 2%{?dist} License: GPLv3+ BuildRequires: make BuildRequires: gcc-c++ @@ -279,6 +279,9 @@ exit 0 %endif %changelog +* Mon Feb 20 2023 Jonathan Wakely - 4.4.0.0-2 +- Rebuilt for Boost 1.81 + * Wed Feb 1 2023 Jaroslav Škarvada - 4.4.0.0-1 - New version Resolves: rhbz#2164284 From bdf88f038a8fa8cf91d54da1487d079e42ee5312 Mon Sep 17 00:00:00 2001 From: "Dmitry V. Levin" Date: Fri, 19 May 2023 08:00:00 +0000 Subject: [PATCH 122/152] 11-dm-mpath.rules: fix warnings reported by udevadm verify Fix the following warnings reported by udevadm verify: 10-usrp-uhd.rules:9 A comma between tokens is expected. 10-usrp-uhd.rules:12 A comma between tokens is expected. 10-usrp-uhd.rules:15 A comma between tokens is expected. 10-usrp-uhd.rules:16 A comma between tokens is expected. 10-usrp-uhd.rules:17 A comma between tokens is expected. 10-usrp-uhd.rules:18 A comma between tokens is expected. 10-usrp-uhd.rules:19 A comma between tokens is expected. 10-usrp-uhd.rules: udev rules check failed --- uhd.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/uhd.spec b/uhd.spec index de3310f..b24324d 100644 --- a/uhd.spec +++ b/uhd.spec @@ -177,7 +177,7 @@ pushd host %cmake_install # Fix udev rules and use dynamic ACL management for device -sed -i 's/BUS==/SUBSYSTEM==/;s/SYSFS{/ATTRS{/;s/MODE:="0666"/GROUP:="usrp" MODE:="0660", ENV{ID_SOFTWARE_RADIO}="1"/' %{buildroot}%{_libdir}/uhd/utils/uhd-usrp.rules +sed -i 's/BUS==/SUBSYSTEM==/;s/SYSFS{/ATTRS{/;s/MODE:="0666"/GROUP:="usrp", MODE:="0660", ENV{ID_SOFTWARE_RADIO}="1"/' %{buildroot}%{_libdir}/uhd/utils/uhd-usrp.rules mkdir -p %{buildroot}%{_prefix}/lib/udev/rules.d mv %{buildroot}%{_libdir}/uhd/utils/uhd-usrp.rules %{buildroot}%{_prefix}/lib/udev/rules.d/10-usrp-uhd.rules From 7ba9c549ea35c311c6ce9037143f1774ac0b471d Mon Sep 17 00:00:00 2001 From: Python Maint Date: Wed, 14 Jun 2023 20:24:03 +0200 Subject: [PATCH 123/152] Rebuilt for Python 3.12 --- uhd.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/uhd.spec b/uhd.spec index b24324d..f736999 100644 --- a/uhd.spec +++ b/uhd.spec @@ -31,7 +31,7 @@ Name: uhd URL: http://github.com/EttusResearch/uhd Version: 4.4.0.0 %global images_ver %{version} -Release: 2%{?dist} +Release: 3%{?dist} License: GPLv3+ BuildRequires: make BuildRequires: gcc-c++ @@ -279,6 +279,9 @@ exit 0 %endif %changelog +* Wed Jun 14 2023 Python Maint - 4.4.0.0-3 +- Rebuilt for Python 3.12 + * Mon Feb 20 2023 Jonathan Wakely - 4.4.0.0-2 - Rebuilt for Boost 1.81 From f928391d8d225bfca65bdd8836a95637947dfba6 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 22 Jul 2023 17:02:35 +0000 Subject: [PATCH 124/152] Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- uhd.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/uhd.spec b/uhd.spec index f736999..021cfaa 100644 --- a/uhd.spec +++ b/uhd.spec @@ -31,7 +31,7 @@ Name: uhd URL: http://github.com/EttusResearch/uhd Version: 4.4.0.0 %global images_ver %{version} -Release: 3%{?dist} +Release: 4%{?dist} License: GPLv3+ BuildRequires: make BuildRequires: gcc-c++ @@ -279,6 +279,9 @@ exit 0 %endif %changelog +* Sat Jul 22 2023 Fedora Release Engineering - 4.4.0.0-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild + * Wed Jun 14 2023 Python Maint - 4.4.0.0-3 - Rebuilt for Python 3.12 From b3de8665ea6b7d7d5fe6140309ebd98d4920f428 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jaroslav=20=C5=A0karvada?= Date: Mon, 25 Sep 2023 13:58:33 +0200 Subject: [PATCH 125/152] New version Resolves: rhbz#2237074 --- sources | 4 ++-- uhd.spec | 8 ++++++-- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/sources b/sources index d994e2a..d146703 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (uhd-images_4.4.0.0.tar.xz) = 17b364128155bf850ff5ae72eeb8fa52446881d0234254943d27524610f0efc4d5bf5da7be248982fc603101d4f76f5a8019fbecb044d2637a1022cdccde0463 -SHA512 (uhd-4.4.0.0.tar.gz) = 3c9b57dc776e0fadc991ffeede84c2367f7403bfae6fd30a045baf1c9cfb21889310b9a8340a35ea13eea00208bf678cccd7b82e190dfb6b9d61e42bdef3b21a +SHA512 (uhd-4.5.0.0.tar.gz) = 20ef6e2ee973476312a1b63e1121f98b9b2f7f471090a26e2492eb4e6ca476421e318294359144306e6663bdc2f4a86040e796707d8757cc83c62ec2a7207d77 +SHA512 (uhd-images_4.5.0.0.tar.xz) = b0b5fe02f59df574be97cb4a867da70a823bf0a3b80f9bcd88bf52248da4dccd48694e50a2d01e588de76c4857bb4cee725a7008776e2685a4d86429f50e7a41 diff --git a/uhd.spec b/uhd.spec index 021cfaa..5f891a8 100644 --- a/uhd.spec +++ b/uhd.spec @@ -29,9 +29,9 @@ Name: uhd URL: http://github.com/EttusResearch/uhd -Version: 4.4.0.0 +Version: 4.5.0.0 %global images_ver %{version} -Release: 4%{?dist} +Release: 1%{?dist} License: GPLv3+ BuildRequires: make BuildRequires: gcc-c++ @@ -279,6 +279,10 @@ exit 0 %endif %changelog +* Mon Sep 25 2023 Jaroslav Škarvada - 4.5.0.0-1 +- New version + Resolves: rhbz#2237074 + * Sat Jul 22 2023 Fedora Release Engineering - 4.4.0.0-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild From a51621a3f95b68adfd3ffd2bc9184cea91878b7a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jaroslav=20=C5=A0karvada?= Date: Tue, 21 Nov 2023 14:30:29 +0100 Subject: [PATCH 126/152] New version Resolves: rhbz#2247579 --- sources | 4 ++-- uhd.spec | 6 +++++- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/sources b/sources index d146703..b1b2a09 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (uhd-4.5.0.0.tar.gz) = 20ef6e2ee973476312a1b63e1121f98b9b2f7f471090a26e2492eb4e6ca476421e318294359144306e6663bdc2f4a86040e796707d8757cc83c62ec2a7207d77 -SHA512 (uhd-images_4.5.0.0.tar.xz) = b0b5fe02f59df574be97cb4a867da70a823bf0a3b80f9bcd88bf52248da4dccd48694e50a2d01e588de76c4857bb4cee725a7008776e2685a4d86429f50e7a41 +SHA512 (uhd-4.6.0.0.tar.gz) = de9bb10e5109bd860a9b2f61841e3ade55fbbc7d8000f385fcdf1c831585c9d25999d159a7da95e3e3f0b74330c1512265994e9aacf00b1b0891f9ba6db58e30 +SHA512 (uhd-images_4.6.0.0.tar.xz) = 944a26bea2f11d0df630e14a2a586d07e185e2c9bf40e10ff17cc103a33a8cf32c37b676e15cf55a1c1efd17c82384c7323526aed4b0624fda0b58d39ed487d3 diff --git a/uhd.spec b/uhd.spec index 5f891a8..d6295b8 100644 --- a/uhd.spec +++ b/uhd.spec @@ -29,7 +29,7 @@ Name: uhd URL: http://github.com/EttusResearch/uhd -Version: 4.5.0.0 +Version: 4.6.0.0 %global images_ver %{version} Release: 1%{?dist} License: GPLv3+ @@ -279,6 +279,10 @@ exit 0 %endif %changelog +* Tue Nov 21 2023 Jaroslav Škarvada - 4.6.0.0-1 +- New version + Resolves: rhbz#2247579 + * Mon Sep 25 2023 Jaroslav Škarvada - 4.5.0.0-1 - New version Resolves: rhbz#2237074 From 85558aa0e55af45a93bd31b8ec8483479b0bbd91 Mon Sep 17 00:00:00 2001 From: Jonathan Wakely Date: Thu, 18 Jan 2024 00:50:07 +0000 Subject: [PATCH 127/152] Rebuilt for Boost 1.83 --- uhd.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/uhd.spec b/uhd.spec index d6295b8..61eaffb 100644 --- a/uhd.spec +++ b/uhd.spec @@ -31,7 +31,7 @@ Name: uhd URL: http://github.com/EttusResearch/uhd Version: 4.6.0.0 %global images_ver %{version} -Release: 1%{?dist} +Release: 2%{?dist} License: GPLv3+ BuildRequires: make BuildRequires: gcc-c++ @@ -279,6 +279,9 @@ exit 0 %endif %changelog +* Thu Jan 18 2024 Jonathan Wakely - 4.6.0.0-2 +- Rebuilt for Boost 1.83 + * Tue Nov 21 2023 Jaroslav Škarvada - 4.6.0.0-1 - New version Resolves: rhbz#2247579 From 87fb805ffa2e1412552208abeb5fe5c35043bde0 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 27 Jan 2024 07:02:27 +0000 Subject: [PATCH 128/152] Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild --- uhd.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/uhd.spec b/uhd.spec index 61eaffb..6adaea6 100644 --- a/uhd.spec +++ b/uhd.spec @@ -31,7 +31,7 @@ Name: uhd URL: http://github.com/EttusResearch/uhd Version: 4.6.0.0 %global images_ver %{version} -Release: 2%{?dist} +Release: 3%{?dist} License: GPLv3+ BuildRequires: make BuildRequires: gcc-c++ @@ -279,6 +279,9 @@ exit 0 %endif %changelog +* Sat Jan 27 2024 Fedora Release Engineering - 4.6.0.0-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + * Thu Jan 18 2024 Jonathan Wakely - 4.6.0.0-2 - Rebuilt for Boost 1.83 From f07315bd68e67f57e7935004464a0c1bbd19d7bb Mon Sep 17 00:00:00 2001 From: Software Management Team Date: Thu, 30 May 2024 12:46:49 +0200 Subject: [PATCH 129/152] Eliminate use of obsolete %patchN syntax (#2283636) --- uhd.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/uhd.spec b/uhd.spec index 6adaea6..2d91d5a 100644 --- a/uhd.spec +++ b/uhd.spec @@ -118,7 +118,7 @@ Wireshark dissector plugins. %prep %setup -q -%patch0 -p1 -b .imagepath-fix +%patch -P0 -p1 -b .imagepath-fix # firmware %if %{with binary_firmware} From 1b6120a7b3c061a433ab1848ce11fc8bdfe5659f Mon Sep 17 00:00:00 2001 From: Python Maint Date: Sat, 8 Jun 2024 22:34:34 +0200 Subject: [PATCH 130/152] Rebuilt for Python 3.13 --- uhd.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/uhd.spec b/uhd.spec index 2d91d5a..f09dd3d 100644 --- a/uhd.spec +++ b/uhd.spec @@ -31,7 +31,7 @@ Name: uhd URL: http://github.com/EttusResearch/uhd Version: 4.6.0.0 %global images_ver %{version} -Release: 3%{?dist} +Release: 4%{?dist} License: GPLv3+ BuildRequires: make BuildRequires: gcc-c++ @@ -279,6 +279,9 @@ exit 0 %endif %changelog +* Sat Jun 08 2024 Python Maint - 4.6.0.0-4 +- Rebuilt for Python 3.13 + * Sat Jan 27 2024 Fedora Release Engineering - 4.6.0.0-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild From 32d9ecc6597ae446accd76318ed80639b9333446 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jaroslav=20=C5=A0karvada?= Date: Mon, 15 Jul 2024 16:36:07 +0200 Subject: [PATCH 131/152] New version Resolves: rhbz#2293732 --- sources | 4 ++-- uhd.spec | 8 ++++++-- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/sources b/sources index b1b2a09..aec33dc 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (uhd-4.6.0.0.tar.gz) = de9bb10e5109bd860a9b2f61841e3ade55fbbc7d8000f385fcdf1c831585c9d25999d159a7da95e3e3f0b74330c1512265994e9aacf00b1b0891f9ba6db58e30 -SHA512 (uhd-images_4.6.0.0.tar.xz) = 944a26bea2f11d0df630e14a2a586d07e185e2c9bf40e10ff17cc103a33a8cf32c37b676e15cf55a1c1efd17c82384c7323526aed4b0624fda0b58d39ed487d3 +SHA512 (uhd-4.7.0.0.tar.gz) = 6f2c48890058620499dc4f9661da1fe26fb711225d8f1f4a84cb9a57b049cccdf87d40480618f37bc2aff23b2538b5323f526985ec25a6a1f58122d39387b0cb +SHA512 (uhd-images_4.7.0.0.tar.xz) = a7dd7b5db34b5b204c2248040fc30c542d002b572a7fc47a19b1c9fed4ef213161883eed14e20f1dccd18b8dc3a23f2afafff8350bcb60db520882a5bd775cb4 diff --git a/uhd.spec b/uhd.spec index f09dd3d..578aef9 100644 --- a/uhd.spec +++ b/uhd.spec @@ -29,9 +29,9 @@ Name: uhd URL: http://github.com/EttusResearch/uhd -Version: 4.6.0.0 +Version: 4.7.0.0 %global images_ver %{version} -Release: 4%{?dist} +Release: 1%{?dist} License: GPLv3+ BuildRequires: make BuildRequires: gcc-c++ @@ -279,6 +279,10 @@ exit 0 %endif %changelog +* Mon Jul 15 2024 Jaroslav Škarvada - 4.7.0.0-1 +- New version + Resolves: rhbz#2293732 + * Sat Jun 08 2024 Python Maint - 4.6.0.0-4 - Rebuilt for Python 3.13 From 249f71537f51d31bc6d215925f6a0d3988bc29d0 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 20 Jul 2024 08:11:17 +0000 Subject: [PATCH 132/152] Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild --- uhd.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/uhd.spec b/uhd.spec index 578aef9..7b40a2b 100644 --- a/uhd.spec +++ b/uhd.spec @@ -31,7 +31,7 @@ Name: uhd URL: http://github.com/EttusResearch/uhd Version: 4.7.0.0 %global images_ver %{version} -Release: 1%{?dist} +Release: 2%{?dist} License: GPLv3+ BuildRequires: make BuildRequires: gcc-c++ @@ -279,6 +279,9 @@ exit 0 %endif %changelog +* Sat Jul 20 2024 Fedora Release Engineering - 4.7.0.0-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild + * Mon Jul 15 2024 Jaroslav Škarvada - 4.7.0.0-1 - New version Resolves: rhbz#2293732 From 212b456b65a4e9d362f7d18dbe2cdf362b737205 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20Such=C3=BD?= Date: Thu, 25 Jul 2024 13:29:06 +0200 Subject: [PATCH 133/152] convert GPLv3+ license to SPDX This is part of https://fedoraproject.org/wiki/Changes/SPDX_Licenses_Phase_4 --- uhd.spec | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/uhd.spec b/uhd.spec index 7b40a2b..ec1bf6d 100644 --- a/uhd.spec +++ b/uhd.spec @@ -31,8 +31,9 @@ Name: uhd URL: http://github.com/EttusResearch/uhd Version: 4.7.0.0 %global images_ver %{version} -Release: 2%{?dist} -License: GPLv3+ +Release: 3%{?dist} +# Automatically converted from old format: GPLv3+ - review is highly recommended. +License: GPL-3.0-or-later BuildRequires: make BuildRequires: gcc-c++ BuildRequires: cmake @@ -279,6 +280,9 @@ exit 0 %endif %changelog +* Thu Jul 25 2024 Miroslav Suchý - 4.7.0.0-3 +- convert license to SPDX + * Sat Jul 20 2024 Fedora Release Engineering - 4.7.0.0-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild From b09e6d0822d1b44413ab0a5b7613ec77cebb277c Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sun, 19 Jan 2025 13:40:27 +0000 Subject: [PATCH 134/152] Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild --- uhd.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/uhd.spec b/uhd.spec index ec1bf6d..f3e49ce 100644 --- a/uhd.spec +++ b/uhd.spec @@ -31,7 +31,7 @@ Name: uhd URL: http://github.com/EttusResearch/uhd Version: 4.7.0.0 %global images_ver %{version} -Release: 3%{?dist} +Release: 4%{?dist} # Automatically converted from old format: GPLv3+ - review is highly recommended. License: GPL-3.0-or-later BuildRequires: make @@ -280,6 +280,9 @@ exit 0 %endif %changelog +* Sun Jan 19 2025 Fedora Release Engineering - 4.7.0.0-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild + * Thu Jul 25 2024 Miroslav Suchý - 4.7.0.0-3 - convert license to SPDX From 1538edcbf9b516dca08c6d738bd37d3be12bede5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= Date: Tue, 11 Feb 2025 17:03:11 +0100 Subject: [PATCH 135/152] Add sysusers.d config file to allow rpm to create users/groups automatically See https://fedoraproject.org/wiki/Changes/RPMSuportForSystemdSysusers. --- uhd.spec | 19 +++++++++++++------ 1 file changed, 13 insertions(+), 6 deletions(-) diff --git a/uhd.spec b/uhd.spec index f3e49ce..597d03a 100644 --- a/uhd.spec +++ b/uhd.spec @@ -31,7 +31,7 @@ Name: uhd URL: http://github.com/EttusResearch/uhd Version: 4.7.0.0 %global images_ver %{version} -Release: 4%{?dist} +Release: 5%{?dist} # Automatically converted from old format: GPLv3+ - review is highly recommended. License: GPL-3.0-or-later BuildRequires: make @@ -63,7 +63,7 @@ BuildRequires: tar BuildRequires: sdcc BuildRequires: sed %endif -Requires(pre): shadow-utils, glibc-common +Requires(pre): glibc-common Requires: python3-tkinter Summary: Universal Hardware Driver for Ettus Research products Source0: %{url}/archive/v%{version}/uhd-%{version}.tar.gz @@ -134,6 +134,11 @@ rm -rf images/winusb_driver # fix python shebangs find . -type f -name "*.py" -exec sed -i '/^#!/ s|.*|#!%{__python3}|' {} \; +# Create a sysusers.d config file +cat >uhd.sysusers.conf </dev/null || \ - %{_sbindir}/groupadd -r usrp >/dev/null 2>&1 -exit 0 %files %exclude %{_docdir}/%{name}/doxygen @@ -255,6 +258,7 @@ exit 0 %{_datadir}/uhd %{python3_sitearch}/uhd %{python3_sitearch}/usrp_mpm +%{_sysusersdir}/uhd.conf %files firmware %dir %{_datadir}/uhd/images @@ -280,6 +284,9 @@ exit 0 %endif %changelog +* Tue Feb 11 2025 Zbigniew Jędrzejewski-Szmek - 4.7.0.0-5 +- Add sysusers.d config file to allow rpm to create users/groups automatically + * Sun Jan 19 2025 Fedora Release Engineering - 4.7.0.0-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild From ae45f0b982fba47df421421cfa17071ccb6d5ea8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jaroslav=20=C5=A0karvada?= Date: Mon, 17 Mar 2025 10:24:18 +0100 Subject: [PATCH 136/152] New version MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Resolves: rhbz#2337610 Resolves: rhbz#2341478 Signed-off-by: Jaroslav Škarvada --- sources | 4 +-- uhd-4.8.0.0-gcc-15-fix.patch | 36 +++++++++++++++++++ ...x.patch => uhd-4.8.0.0-imagepath-fix.patch | 4 +-- uhd.spec | 28 ++++++++++----- 4 files changed, 59 insertions(+), 13 deletions(-) create mode 100644 uhd-4.8.0.0-gcc-15-fix.patch rename uhd-4.2.0.0-imagepath-fix.patch => uhd-4.8.0.0-imagepath-fix.patch (85%) diff --git a/sources b/sources index aec33dc..6a64760 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (uhd-4.7.0.0.tar.gz) = 6f2c48890058620499dc4f9661da1fe26fb711225d8f1f4a84cb9a57b049cccdf87d40480618f37bc2aff23b2538b5323f526985ec25a6a1f58122d39387b0cb -SHA512 (uhd-images_4.7.0.0.tar.xz) = a7dd7b5db34b5b204c2248040fc30c542d002b572a7fc47a19b1c9fed4ef213161883eed14e20f1dccd18b8dc3a23f2afafff8350bcb60db520882a5bd775cb4 +SHA512 (uhd-4.8.0.0.tar.gz) = 61e92209e69994b1c5d3a2a88f749ddca612a3fa3c1580c00a9577e25fab5055d7c80571f2843cca3951fc941d1a81566bafc21070fb93cb3e566228c46331e7 +SHA512 (uhd-images_4.8.0.0.tar.xz) = 4203e5b7f642d7850e9563ba495a60efe965a64223d9208c780e1400ea755b322125fff53c3f8a3fb010617b57a4da638dc3cf80bf7d95604e20788cc469edb9 diff --git a/uhd-4.8.0.0-gcc-15-fix.patch b/uhd-4.8.0.0-gcc-15-fix.patch new file mode 100644 index 0000000..ad860ad --- /dev/null +++ b/uhd-4.8.0.0-gcc-15-fix.patch @@ -0,0 +1,36 @@ +diff --git a/host/include/uhd/features/ref_clk_calibration_iface.hpp b/host/include/uhd/features/ref_clk_calibration_iface.hpp +index 86a2005..7aa8062 100644 +--- a/host/include/uhd/features/ref_clk_calibration_iface.hpp ++++ b/host/include/uhd/features/ref_clk_calibration_iface.hpp +@@ -8,6 +8,7 @@ + + #include + #include ++#include + #include + + namespace uhd { namespace features { +diff --git a/host/lib/include/uhdlib/usrp/dboard/fbx/fbx_constants.hpp b/host/lib/include/uhdlib/usrp/dboard/fbx/fbx_constants.hpp +index fd23fb8..8f1fc4e 100644 +--- a/host/lib/include/uhdlib/usrp/dboard/fbx/fbx_constants.hpp ++++ b/host/lib/include/uhdlib/usrp/dboard/fbx/fbx_constants.hpp +@@ -10,6 +10,7 @@ + #include + #include + #include ++#include + #include + #include + #include +diff --git a/tools/uhd_dump/uhd_dump.h b/tools/uhd_dump/uhd_dump.h +index 3a6ac4e..12d39e3 100644 +--- a/tools/uhd_dump/uhd_dump.h ++++ b/tools/uhd_dump/uhd_dump.h +@@ -50,7 +50,6 @@ + // UDP used as source for all CHDR comms. + #define CHDR_PORT 49153 + +-typedef unsigned char bool; + typedef unsigned char u8; + typedef unsigned short u16; + typedef unsigned int u32; diff --git a/uhd-4.2.0.0-imagepath-fix.patch b/uhd-4.8.0.0-imagepath-fix.patch similarity index 85% rename from uhd-4.2.0.0-imagepath-fix.patch rename to uhd-4.8.0.0-imagepath-fix.patch index 7230a92..6e825f8 100644 --- a/uhd-4.2.0.0-imagepath-fix.patch +++ b/uhd-4.8.0.0-imagepath-fix.patch @@ -1,8 +1,8 @@ diff --git a/host/lib/utils/paths.cpp b/host/lib/utils/paths.cpp -index 73b4cc2..a122c9d 100644 +index 2eac87e..2a3a3f1 100644 --- a/host/lib/utils/paths.cpp +++ b/host/lib/utils/paths.cpp -@@ -290,7 +290,7 @@ std::string uhd::get_pkg_path(void) +@@ -283,7 +283,7 @@ std::string uhd::get_pkg_data_path() std::string uhd::get_lib_path(void) { diff --git a/uhd.spec b/uhd.spec index 597d03a..3ac6719 100644 --- a/uhd.spec +++ b/uhd.spec @@ -29,9 +29,9 @@ Name: uhd URL: http://github.com/EttusResearch/uhd -Version: 4.7.0.0 +Version: 4.8.0.0 %global images_ver %{version} -Release: 5%{?dist} +Release: 1%{?dist} # Automatically converted from old format: GPLv3+ - review is highly recommended. License: GPL-3.0-or-later BuildRequires: make @@ -71,7 +71,9 @@ Source1: %{name}-limits.conf Source2: %{url}/releases/download/v%{images_ver}/uhd-images_%{images_ver}.tar.xz # dirty workaround for the https://github.com/EttusResearch/uhd/issues/551 # until the better fix is available -Patch0: uhd-4.2.0.0-imagepath-fix.patch +Patch: uhd-4.8.0.0-imagepath-fix.patch +# https://github.com/EttusResearch/uhd/issues/844 +Patch: uhd-4.8.0.0-gcc-15-fix.patch %description The UHD is the universal hardware driver for Ettus Research products. @@ -118,8 +120,7 @@ Wireshark dissector plugins. %endif %prep -%setup -q -%patch -P0 -p1 -b .imagepath-fix +%autosetup -p1 # firmware %if %{with binary_firmware} @@ -151,22 +152,27 @@ popd %endif pushd host +# DLIB_SUFFIX workaround for cmake 4.0 +# https://github.com/EttusResearch/uhd/issues/844 %cmake %{?have_neon} -DPYTHON_EXECUTABLE="%{__python3}" \ -DPYBIND11_INCLUDE_DIR="/usr/include/pybind11/" \ -DUHD_VERSION="%{version}" \ - -DENABLE_TESTS=off ../ + -DENABLE_TESTS=off ../ \ +%if "%{?_lib}"=="lib64" + -DLIB_SUFFIX=64 +%endif %cmake_build popd # tools pushd tools/uhd_dump -make %{?_smp_mflags} CFLAGS="%{optflags}" LDFLAGS="%{?__global_ldflags}" +make %{?_smp_mflags} CFLAGS="%{build_cflags}" LDFLAGS="%{build_ldflags}" popd %if %{with wireshark} # wireshark dissectors pushd tools/dissectors -%cmake -DENABLE_RFNOC=ON -DENABLE_OCTOCLOCK=ON -DENABLE_ZPU=ON +%cmake -DENABLE_OCTOCLOCK=ON -DENABLE_ZPU=ON %cmake_build popd %endif @@ -247,7 +253,6 @@ install -m0644 -D uhd.sysusers.conf %{buildroot}%{_sysusersdir}/uhd.conf %{_bindir}/usrpctl %{_bindir}/uhd_* %{_bindir}/usrp2_* -%{_bindir}/rfnoc_image_builder %{_bindir}/usrp_hwd.py %{_prefix}/lib/udev/rules.d/10-usrp-uhd.rules %config(noreplace) %{_sysconfdir}/security/limits.d/*.conf @@ -284,6 +289,11 @@ install -m0644 -D uhd.sysusers.conf %{buildroot}%{_sysusersdir}/uhd.conf %endif %changelog +* Wed Mar 12 2025 Jaroslav Škarvada - 4.8.0.0-1 +- New version + Resolves: rhbz#2337610 + Resolves: rhbz#2341478 + * Tue Feb 11 2025 Zbigniew Jędrzejewski-Szmek - 4.7.0.0-5 - Add sysusers.d config file to allow rpm to create users/groups automatically From c79fdf3ba9559946ad2642e02f8517e2b97ba12a Mon Sep 17 00:00:00 2001 From: Python Maint Date: Tue, 3 Jun 2025 14:31:02 +0200 Subject: [PATCH 137/152] Rebuilt for Python 3.14 --- uhd.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/uhd.spec b/uhd.spec index 3ac6719..6ed9a76 100644 --- a/uhd.spec +++ b/uhd.spec @@ -31,7 +31,7 @@ Name: uhd URL: http://github.com/EttusResearch/uhd Version: 4.8.0.0 %global images_ver %{version} -Release: 1%{?dist} +Release: 2%{?dist} # Automatically converted from old format: GPLv3+ - review is highly recommended. License: GPL-3.0-or-later BuildRequires: make @@ -289,6 +289,9 @@ install -m0644 -D uhd.sysusers.conf %{buildroot}%{_sysusersdir}/uhd.conf %endif %changelog +* Tue Jun 03 2025 Python Maint - 4.8.0.0-2 +- Rebuilt for Python 3.14 + * Wed Mar 12 2025 Jaroslav Škarvada - 4.8.0.0-1 - New version Resolves: rhbz#2337610 From e93033b410eb607a281d627893abf6e18f1829a8 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 25 Jul 2025 19:44:33 +0000 Subject: [PATCH 138/152] Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild --- uhd.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/uhd.spec b/uhd.spec index 6ed9a76..7a37f06 100644 --- a/uhd.spec +++ b/uhd.spec @@ -31,7 +31,7 @@ Name: uhd URL: http://github.com/EttusResearch/uhd Version: 4.8.0.0 %global images_ver %{version} -Release: 2%{?dist} +Release: 3%{?dist} # Automatically converted from old format: GPLv3+ - review is highly recommended. License: GPL-3.0-or-later BuildRequires: make @@ -289,6 +289,9 @@ install -m0644 -D uhd.sysusers.conf %{buildroot}%{_sysusersdir}/uhd.conf %endif %changelog +* Fri Jul 25 2025 Fedora Release Engineering - 4.8.0.0-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild + * Tue Jun 03 2025 Python Maint - 4.8.0.0-2 - Rebuilt for Python 3.14 From e22a339e17746075a3b01c8a365560c1dc106fa7 Mon Sep 17 00:00:00 2001 From: Python Maint Date: Fri, 15 Aug 2025 15:21:21 +0200 Subject: [PATCH 139/152] Rebuilt for Python 3.14.0rc2 bytecode --- uhd.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/uhd.spec b/uhd.spec index 7a37f06..aff47ae 100644 --- a/uhd.spec +++ b/uhd.spec @@ -31,7 +31,7 @@ Name: uhd URL: http://github.com/EttusResearch/uhd Version: 4.8.0.0 %global images_ver %{version} -Release: 3%{?dist} +Release: 4%{?dist} # Automatically converted from old format: GPLv3+ - review is highly recommended. License: GPL-3.0-or-later BuildRequires: make @@ -289,6 +289,9 @@ install -m0644 -D uhd.sysusers.conf %{buildroot}%{_sysusersdir}/uhd.conf %endif %changelog +* Fri Aug 15 2025 Python Maint - 4.8.0.0-4 +- Rebuilt for Python 3.14.0rc2 bytecode + * Fri Jul 25 2025 Fedora Release Engineering - 4.8.0.0-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild From fd8faa4c648296f13ac68da25326a0648bfaf349 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jaroslav=20=C5=A0karvada?= Date: Thu, 11 Sep 2025 17:50:59 +0200 Subject: [PATCH 140/152] New version Resolves: rhbz#2387862 --- sources | 4 ++-- uhd.spec | 8 ++++++-- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/sources b/sources index 6a64760..2d55172 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (uhd-4.8.0.0.tar.gz) = 61e92209e69994b1c5d3a2a88f749ddca612a3fa3c1580c00a9577e25fab5055d7c80571f2843cca3951fc941d1a81566bafc21070fb93cb3e566228c46331e7 -SHA512 (uhd-images_4.8.0.0.tar.xz) = 4203e5b7f642d7850e9563ba495a60efe965a64223d9208c780e1400ea755b322125fff53c3f8a3fb010617b57a4da638dc3cf80bf7d95604e20788cc469edb9 +SHA512 (uhd-4.9.0.0.tar.gz) = df8dc56035c5fb18b958fdb6ffd28ed1bbf4a4dd051800865fe4e9a2df953e13e1930ed285507dc6d2736443a285283741b1d0dc3dae862b0bb3e477d8532641 +SHA512 (uhd-images_4.9.0.0.tar.xz) = df173afdc9a3b69989a392ec2d51a1494dfe14ba2b85a775011d09564a3928c3ccd8f68aa0b02b244ef4a5bb7c21998318bd488770b1c9f7fe354bd97ff3a0e3 diff --git a/uhd.spec b/uhd.spec index aff47ae..0555fad 100644 --- a/uhd.spec +++ b/uhd.spec @@ -29,9 +29,9 @@ Name: uhd URL: http://github.com/EttusResearch/uhd -Version: 4.8.0.0 +Version: 4.9.0.0 %global images_ver %{version} -Release: 4%{?dist} +Release: 1%{?dist} # Automatically converted from old format: GPLv3+ - review is highly recommended. License: GPL-3.0-or-later BuildRequires: make @@ -289,6 +289,10 @@ install -m0644 -D uhd.sysusers.conf %{buildroot}%{_sysusersdir}/uhd.conf %endif %changelog +* Thu Sep 11 2025 Jaroslav Škarvada - 4.9.0.0-1 +- New version + Resolves: rhbz#2387862 + * Fri Aug 15 2025 Python Maint - 4.8.0.0-4 - Rebuilt for Python 3.14.0rc2 bytecode From 9f6339d121caa0e9a035571ac38f0a3309e3520b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jaroslav=20=C5=A0karvada?= Date: Thu, 11 Sep 2025 18:02:10 +0200 Subject: [PATCH 141/152] Dropped unneeded patch MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Jaroslav Škarvada --- uhd-4.8.0.0-gcc-15-fix.patch | 36 ------------------------------------ uhd.spec | 2 -- 2 files changed, 38 deletions(-) delete mode 100644 uhd-4.8.0.0-gcc-15-fix.patch diff --git a/uhd-4.8.0.0-gcc-15-fix.patch b/uhd-4.8.0.0-gcc-15-fix.patch deleted file mode 100644 index ad860ad..0000000 --- a/uhd-4.8.0.0-gcc-15-fix.patch +++ /dev/null @@ -1,36 +0,0 @@ -diff --git a/host/include/uhd/features/ref_clk_calibration_iface.hpp b/host/include/uhd/features/ref_clk_calibration_iface.hpp -index 86a2005..7aa8062 100644 ---- a/host/include/uhd/features/ref_clk_calibration_iface.hpp -+++ b/host/include/uhd/features/ref_clk_calibration_iface.hpp -@@ -8,6 +8,7 @@ - - #include - #include -+#include - #include - - namespace uhd { namespace features { -diff --git a/host/lib/include/uhdlib/usrp/dboard/fbx/fbx_constants.hpp b/host/lib/include/uhdlib/usrp/dboard/fbx/fbx_constants.hpp -index fd23fb8..8f1fc4e 100644 ---- a/host/lib/include/uhdlib/usrp/dboard/fbx/fbx_constants.hpp -+++ b/host/lib/include/uhdlib/usrp/dboard/fbx/fbx_constants.hpp -@@ -10,6 +10,7 @@ - #include - #include - #include -+#include - #include - #include - #include -diff --git a/tools/uhd_dump/uhd_dump.h b/tools/uhd_dump/uhd_dump.h -index 3a6ac4e..12d39e3 100644 ---- a/tools/uhd_dump/uhd_dump.h -+++ b/tools/uhd_dump/uhd_dump.h -@@ -50,7 +50,6 @@ - // UDP used as source for all CHDR comms. - #define CHDR_PORT 49153 - --typedef unsigned char bool; - typedef unsigned char u8; - typedef unsigned short u16; - typedef unsigned int u32; diff --git a/uhd.spec b/uhd.spec index 0555fad..c9457f1 100644 --- a/uhd.spec +++ b/uhd.spec @@ -72,8 +72,6 @@ Source2: %{url}/releases/download/v%{images_ver}/uhd-images_%{images_ver} # dirty workaround for the https://github.com/EttusResearch/uhd/issues/551 # until the better fix is available Patch: uhd-4.8.0.0-imagepath-fix.patch -# https://github.com/EttusResearch/uhd/issues/844 -Patch: uhd-4.8.0.0-gcc-15-fix.patch %description The UHD is the universal hardware driver for Ettus Research products. From e1213c9be03630663817bbf395a696a8096aacee Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jaroslav=20=C5=A0karvada?= Date: Thu, 11 Sep 2025 18:17:57 +0200 Subject: [PATCH 142/152] Followed upstream and dropped uhd_dump MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Jaroslav Škarvada --- uhd.spec | 6 ------ 1 file changed, 6 deletions(-) diff --git a/uhd.spec b/uhd.spec index c9457f1..a4e4062 100644 --- a/uhd.spec +++ b/uhd.spec @@ -162,11 +162,6 @@ pushd host %cmake_build popd -# tools -pushd tools/uhd_dump -make %{?_smp_mflags} CFLAGS="%{build_cflags}" LDFLAGS="%{build_ldflags}" -popd - %if %{with wireshark} # wireshark dissectors pushd tools/dissectors @@ -223,7 +218,6 @@ popd # tools install -Dpm 0755 tools/usrp_x3xx_fpga_jtag_programmer.sh %{buildroot}%{_bindir}/usrp_x3xx_fpga_jtag_programmer.sh -install -Dpm 0755 tools/uhd_dump/chdr_log %{buildroot}%{_bindir}/chdr_log %if %{with wireshark} # wireshark dissectors From df04e96c52285e1302c9641362c8c218402eacde Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jaroslav=20=C5=A0karvada?= Date: Fri, 12 Sep 2025 00:35:43 +0200 Subject: [PATCH 143/152] Dropped chdr_log as upstream MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Jaroslav Škarvada --- uhd.spec | 1 - 1 file changed, 1 deletion(-) diff --git a/uhd.spec b/uhd.spec index a4e4062..028638f 100644 --- a/uhd.spec +++ b/uhd.spec @@ -273,7 +273,6 @@ install -m0644 -D uhd.sysusers.conf %{buildroot}%{_sysusersdir}/uhd.conf %files tools %doc tools/README.md %{_bindir}/usrp_x3xx_fpga_jtag_programmer.sh -%{_bindir}/chdr_log %if %{with wireshark} %files wireshark From 0808e1d684b95c307c562e660598bb32699ad951 Mon Sep 17 00:00:00 2001 From: Python Maint Date: Fri, 19 Sep 2025 15:01:00 +0200 Subject: [PATCH 144/152] Rebuilt for Python 3.14.0rc3 bytecode --- uhd.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/uhd.spec b/uhd.spec index 028638f..d886d98 100644 --- a/uhd.spec +++ b/uhd.spec @@ -31,7 +31,7 @@ Name: uhd URL: http://github.com/EttusResearch/uhd Version: 4.9.0.0 %global images_ver %{version} -Release: 1%{?dist} +Release: 2%{?dist} # Automatically converted from old format: GPLv3+ - review is highly recommended. License: GPL-3.0-or-later BuildRequires: make @@ -280,6 +280,9 @@ install -m0644 -D uhd.sysusers.conf %{buildroot}%{_sysusersdir}/uhd.conf %endif %changelog +* Fri Sep 19 2025 Python Maint - 4.9.0.0-2 +- Rebuilt for Python 3.14.0rc3 bytecode + * Thu Sep 11 2025 Jaroslav Škarvada - 4.9.0.0-1 - New version Resolves: rhbz#2387862 From ff6fd8bff685cd3aeec2b1554fe9d03a17ed7ad2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jaroslav=20=C5=A0karvada?= Date: Mon, 13 Oct 2025 17:25:34 +0200 Subject: [PATCH 145/152] New version Resolves: rhbz#2403533 --- sources | 2 +- uhd.spec | 11 ++++++++--- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/sources b/sources index 2d55172..05dffa9 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (uhd-4.9.0.0.tar.gz) = df8dc56035c5fb18b958fdb6ffd28ed1bbf4a4dd051800865fe4e9a2df953e13e1930ed285507dc6d2736443a285283741b1d0dc3dae862b0bb3e477d8532641 +SHA512 (uhd-4.9.0.1.tar.gz) = efb4ef440e102c7705100980a8ea0a9e55de6e631d70c1e9a39a8b6cd8991129f2fd39ba93094300bdc4878c73023a956a4f79488f6aaf5104371410de6f0497 SHA512 (uhd-images_4.9.0.0.tar.xz) = df173afdc9a3b69989a392ec2d51a1494dfe14ba2b85a775011d09564a3928c3ccd8f68aa0b02b244ef4a5bb7c21998318bd488770b1c9f7fe354bd97ff3a0e3 diff --git a/uhd.spec b/uhd.spec index d886d98..b6d82e7 100644 --- a/uhd.spec +++ b/uhd.spec @@ -29,9 +29,10 @@ Name: uhd URL: http://github.com/EttusResearch/uhd -Version: 4.9.0.0 -%global images_ver %{version} -Release: 2%{?dist} +Version: 4.9.0.1 +#%%global images_ver %%{version} +%global images_ver 4.9.0.0 +Release: 1%{?dist} # Automatically converted from old format: GPLv3+ - review is highly recommended. License: GPL-3.0-or-later BuildRequires: make @@ -280,6 +281,10 @@ install -m0644 -D uhd.sysusers.conf %{buildroot}%{_sysusersdir}/uhd.conf %endif %changelog +* Mon Oct 13 2025 Jaroslav Škarvada - 4.9.0.1-2 +- New version + Resolves: rhbz#2403533 + * Fri Sep 19 2025 Python Maint - 4.9.0.0-2 - Rebuilt for Python 3.14.0rc3 bytecode From 5c4d17f8f523fa3a205dadcb3662cecd7c05ef74 Mon Sep 17 00:00:00 2001 From: Jonathan Wakely Date: Mon, 12 Jan 2026 18:30:39 +0000 Subject: [PATCH 146/152] Rebuilt for Boost 1.90 --- uhd.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/uhd.spec b/uhd.spec index b6d82e7..20a398c 100644 --- a/uhd.spec +++ b/uhd.spec @@ -32,7 +32,7 @@ URL: http://github.com/EttusResearch/uhd Version: 4.9.0.1 #%%global images_ver %%{version} %global images_ver 4.9.0.0 -Release: 1%{?dist} +Release: 2%{?dist} # Automatically converted from old format: GPLv3+ - review is highly recommended. License: GPL-3.0-or-later BuildRequires: make @@ -281,6 +281,9 @@ install -m0644 -D uhd.sysusers.conf %{buildroot}%{_sysusersdir}/uhd.conf %endif %changelog +* Mon Jan 12 2026 Jonathan Wakely - 4.9.0.1-2 +- Rebuilt for Boost 1.90 + * Mon Oct 13 2025 Jaroslav Škarvada - 4.9.0.1-2 - New version Resolves: rhbz#2403533 From 1baf9fd961dfa3abdb99e54138ceda121469f8c0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jaroslav=20=C5=A0karvada?= Date: Tue, 13 Jan 2026 16:35:41 +0100 Subject: [PATCH 147/152] Fixed build with cmake-4 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Jaroslav Škarvada --- uhd-4.9.0.1-cmake-4-fix.patch | 65 +++++++++++++++++++++++++++++++++++ uhd.spec | 4 ++- 2 files changed, 68 insertions(+), 1 deletion(-) create mode 100644 uhd-4.9.0.1-cmake-4-fix.patch diff --git a/uhd-4.9.0.1-cmake-4-fix.patch b/uhd-4.9.0.1-cmake-4-fix.patch new file mode 100644 index 0000000..df096a3 --- /dev/null +++ b/uhd-4.9.0.1-cmake-4-fix.patch @@ -0,0 +1,65 @@ +diff --git a/firmware/fx2/CMakeLists.txt b/firmware/fx2/CMakeLists.txt +index 7a41333..10a363d 100644 +--- a/firmware/fx2/CMakeLists.txt ++++ b/firmware/fx2/CMakeLists.txt +@@ -15,7 +15,7 @@ + # along with this program. If not, see . + # + +-cmake_minimum_required(VERSION 2.6) ++cmake_minimum_required(VERSION 3.5) + set(CMAKE_TOOLCHAIN_FILE ${CMAKE_SOURCE_DIR}/config/Toolchain-sdcc.cmake) + project(USRP1 C) + set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_SOURCE_DIR}/config/") +diff --git a/firmware/octoclock/CMakeLists.txt b/firmware/octoclock/CMakeLists.txt +index 4d99add..483a191 100644 +--- a/firmware/octoclock/CMakeLists.txt ++++ b/firmware/octoclock/CMakeLists.txt +@@ -15,7 +15,7 @@ + # along with this program. If not, see . + # + +-cmake_minimum_required(VERSION 2.6) ++cmake_minimum_required(VERSION 3.5) + set(CMAKE_SYSTEM_NAME Generic) + + find_program(AVR_CC avr-gcc REQUIRED) +diff --git a/firmware/usrp2/CMakeLists.txt b/firmware/usrp2/CMakeLists.txt +index 693fbf9..9ec61f8 100644 +--- a/firmware/usrp2/CMakeLists.txt ++++ b/firmware/usrp2/CMakeLists.txt +@@ -18,7 +18,7 @@ + ######################################################################## + # setup project and compiler + ######################################################################## +-cmake_minimum_required(VERSION 2.6) ++cmake_minimum_required(VERSION 3.5) + #force the compiler because the check wont use the special flag below + include(CMakeForceCompiler) + set(CMAKE_SYSTEM_NAME Generic) +diff --git a/firmware/usrp3/CMakeLists.txt b/firmware/usrp3/CMakeLists.txt +index 9cfbe99..bfbcb83 100644 +--- a/firmware/usrp3/CMakeLists.txt ++++ b/firmware/usrp3/CMakeLists.txt +@@ -18,7 +18,7 @@ + ######################################################################## + # setup project and compiler + ######################################################################## +-cmake_minimum_required(VERSION 2.6) ++cmake_minimum_required(VERSION 3.5) + #force the compiler because the check wont use the special flag below + include(CMakeForceCompiler) + set(CMAKE_SYSTEM_NAME Generic) +diff --git a/tools/dissectors/CMakeLists.txt b/tools/dissectors/CMakeLists.txt +index 8fa8542..af67ee0 100644 +--- a/tools/dissectors/CMakeLists.txt ++++ b/tools/dissectors/CMakeLists.txt +@@ -4,7 +4,7 @@ + # SPDX-License-Identifier: GPL-3.0-or-later + # + +-cmake_minimum_required(VERSION 3.1) ++cmake_minimum_required(VERSION 3.5) + cmake_policy(SET CMP0048 NEW) + project(EttusDissectors VERSION 4.0.0 DESCRIPTION "Dissector Plugins" LANGUAGES C CXX) + diff --git a/uhd.spec b/uhd.spec index 20a398c..e5f50c1 100644 --- a/uhd.spec +++ b/uhd.spec @@ -73,6 +73,8 @@ Source2: %{url}/releases/download/v%{images_ver}/uhd-images_%{images_ver} # dirty workaround for the https://github.com/EttusResearch/uhd/issues/551 # until the better fix is available Patch: uhd-4.8.0.0-imagepath-fix.patch +# already in upstream +Patch: uhd-4.9.0.1-cmake-4-fix.patch %description The UHD is the universal hardware driver for Ettus Research products. @@ -173,7 +175,7 @@ popd #%%check #cd host/%%{_vpath_builddir} -#make test +#%%ctest %install # fix python shebangs (run again for generated scripts) From 23b5fbbc6736c96b31107f90637f96b288ebea6f Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Tue, 20 Jan 2026 03:31:08 +0000 Subject: [PATCH 148/152] Rebuilt for https://fedoraproject.org/wiki/Fedora_44_Mass_Rebuild --- uhd.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/uhd.spec b/uhd.spec index e5f50c1..142ba1f 100644 --- a/uhd.spec +++ b/uhd.spec @@ -32,7 +32,7 @@ URL: http://github.com/EttusResearch/uhd Version: 4.9.0.1 #%%global images_ver %%{version} %global images_ver 4.9.0.0 -Release: 2%{?dist} +Release: 3%{?dist} # Automatically converted from old format: GPLv3+ - review is highly recommended. License: GPL-3.0-or-later BuildRequires: make @@ -283,6 +283,9 @@ install -m0644 -D uhd.sysusers.conf %{buildroot}%{_sysusersdir}/uhd.conf %endif %changelog +* Tue Jan 20 2026 Fedora Release Engineering - 4.9.0.1-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_44_Mass_Rebuild + * Mon Jan 12 2026 Jonathan Wakely - 4.9.0.1-2 - Rebuilt for Boost 1.90 From 1c486dd191d9ebced50cb2a9ab7e47ebb18c49f2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jaroslav=20=C5=A0karvada?= Date: Tue, 28 Apr 2026 13:38:36 +0200 Subject: [PATCH 149/152] New version Resolves: rhbz#2451594 --- sources | 4 +- uhd-4.8.0.0-imagepath-fix.patch | 13 ------- uhd-4.9.0.1-cmake-4-fix.patch | 65 --------------------------------- uhd.spec | 15 ++++---- 4 files changed, 9 insertions(+), 88 deletions(-) delete mode 100644 uhd-4.8.0.0-imagepath-fix.patch delete mode 100644 uhd-4.9.0.1-cmake-4-fix.patch diff --git a/sources b/sources index 05dffa9..15eff2b 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (uhd-4.9.0.1.tar.gz) = efb4ef440e102c7705100980a8ea0a9e55de6e631d70c1e9a39a8b6cd8991129f2fd39ba93094300bdc4878c73023a956a4f79488f6aaf5104371410de6f0497 -SHA512 (uhd-images_4.9.0.0.tar.xz) = df173afdc9a3b69989a392ec2d51a1494dfe14ba2b85a775011d09564a3928c3ccd8f68aa0b02b244ef4a5bb7c21998318bd488770b1c9f7fe354bd97ff3a0e3 +SHA512 (uhd-4.10.0.0.tar.gz) = 600b6c8b1d5e37643e086d00e3c594b6b83a467b097576625dd4a949b3aab81cbbc221f2649a639fef67dfc0dce3bb919abee3cfb6ca266ad547262a16cdbd0e +SHA512 (uhd-images_4.10.0.0.tar.xz) = c5e54f47361a71baa3b5450fd4a3970a03349ecd69837a5de03a63f42b977f1e7e7246c0645d7178feac31f0c071e1914b3d8fcd60f8031aef4cfa45539d5054 diff --git a/uhd-4.8.0.0-imagepath-fix.patch b/uhd-4.8.0.0-imagepath-fix.patch deleted file mode 100644 index 6e825f8..0000000 --- a/uhd-4.8.0.0-imagepath-fix.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/host/lib/utils/paths.cpp b/host/lib/utils/paths.cpp -index 2eac87e..2a3a3f1 100644 ---- a/host/lib/utils/paths.cpp -+++ b/host/lib/utils/paths.cpp -@@ -283,7 +283,7 @@ std::string uhd::get_pkg_data_path() - - std::string uhd::get_lib_path(void) - { -- fs::path runtime_libfile_path = boost::dll::this_line_location(); -+ fs::path runtime_libfile_path = "/usr" / boost::dll::this_line_location(); - // Normalize before decomposing path so result is reliable - fs::path lib_path = runtime_libfile_path.lexically_normal().parent_path(); - return lib_path.string(); diff --git a/uhd-4.9.0.1-cmake-4-fix.patch b/uhd-4.9.0.1-cmake-4-fix.patch deleted file mode 100644 index df096a3..0000000 --- a/uhd-4.9.0.1-cmake-4-fix.patch +++ /dev/null @@ -1,65 +0,0 @@ -diff --git a/firmware/fx2/CMakeLists.txt b/firmware/fx2/CMakeLists.txt -index 7a41333..10a363d 100644 ---- a/firmware/fx2/CMakeLists.txt -+++ b/firmware/fx2/CMakeLists.txt -@@ -15,7 +15,7 @@ - # along with this program. If not, see . - # - --cmake_minimum_required(VERSION 2.6) -+cmake_minimum_required(VERSION 3.5) - set(CMAKE_TOOLCHAIN_FILE ${CMAKE_SOURCE_DIR}/config/Toolchain-sdcc.cmake) - project(USRP1 C) - set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_SOURCE_DIR}/config/") -diff --git a/firmware/octoclock/CMakeLists.txt b/firmware/octoclock/CMakeLists.txt -index 4d99add..483a191 100644 ---- a/firmware/octoclock/CMakeLists.txt -+++ b/firmware/octoclock/CMakeLists.txt -@@ -15,7 +15,7 @@ - # along with this program. If not, see . - # - --cmake_minimum_required(VERSION 2.6) -+cmake_minimum_required(VERSION 3.5) - set(CMAKE_SYSTEM_NAME Generic) - - find_program(AVR_CC avr-gcc REQUIRED) -diff --git a/firmware/usrp2/CMakeLists.txt b/firmware/usrp2/CMakeLists.txt -index 693fbf9..9ec61f8 100644 ---- a/firmware/usrp2/CMakeLists.txt -+++ b/firmware/usrp2/CMakeLists.txt -@@ -18,7 +18,7 @@ - ######################################################################## - # setup project and compiler - ######################################################################## --cmake_minimum_required(VERSION 2.6) -+cmake_minimum_required(VERSION 3.5) - #force the compiler because the check wont use the special flag below - include(CMakeForceCompiler) - set(CMAKE_SYSTEM_NAME Generic) -diff --git a/firmware/usrp3/CMakeLists.txt b/firmware/usrp3/CMakeLists.txt -index 9cfbe99..bfbcb83 100644 ---- a/firmware/usrp3/CMakeLists.txt -+++ b/firmware/usrp3/CMakeLists.txt -@@ -18,7 +18,7 @@ - ######################################################################## - # setup project and compiler - ######################################################################## --cmake_minimum_required(VERSION 2.6) -+cmake_minimum_required(VERSION 3.5) - #force the compiler because the check wont use the special flag below - include(CMakeForceCompiler) - set(CMAKE_SYSTEM_NAME Generic) -diff --git a/tools/dissectors/CMakeLists.txt b/tools/dissectors/CMakeLists.txt -index 8fa8542..af67ee0 100644 ---- a/tools/dissectors/CMakeLists.txt -+++ b/tools/dissectors/CMakeLists.txt -@@ -4,7 +4,7 @@ - # SPDX-License-Identifier: GPL-3.0-or-later - # - --cmake_minimum_required(VERSION 3.1) -+cmake_minimum_required(VERSION 3.5) - cmake_policy(SET CMP0048 NEW) - project(EttusDissectors VERSION 4.0.0 DESCRIPTION "Dissector Plugins" LANGUAGES C CXX) - diff --git a/uhd.spec b/uhd.spec index 142ba1f..1f5d9a4 100644 --- a/uhd.spec +++ b/uhd.spec @@ -29,10 +29,10 @@ Name: uhd URL: http://github.com/EttusResearch/uhd -Version: 4.9.0.1 +Version: 4.10.0.0 #%%global images_ver %%{version} -%global images_ver 4.9.0.0 -Release: 3%{?dist} +%global images_ver 4.10.0.0 +Release: 1%{?dist} # Automatically converted from old format: GPLv3+ - review is highly recommended. License: GPL-3.0-or-later BuildRequires: make @@ -70,11 +70,6 @@ Summary: Universal Hardware Driver for Ettus Research products Source0: %{url}/archive/v%{version}/uhd-%{version}.tar.gz Source1: %{name}-limits.conf Source2: %{url}/releases/download/v%{images_ver}/uhd-images_%{images_ver}.tar.xz -# dirty workaround for the https://github.com/EttusResearch/uhd/issues/551 -# until the better fix is available -Patch: uhd-4.8.0.0-imagepath-fix.patch -# already in upstream -Patch: uhd-4.9.0.1-cmake-4-fix.patch %description The UHD is the universal hardware driver for Ettus Research products. @@ -283,6 +278,10 @@ install -m0644 -D uhd.sysusers.conf %{buildroot}%{_sysusersdir}/uhd.conf %endif %changelog +* Tue Apr 28 2026 Jaroslav Škarvada - 4.10.0.0-1 +- New version + Resolves: rhbz#2451594 + * Tue Jan 20 2026 Fedora Release Engineering - 4.9.0.1-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_44_Mass_Rebuild From 77495c7172a7fc42c43f6d74de51d37b4e3bad03 Mon Sep 17 00:00:00 2001 From: Python Maint Date: Thu, 4 Jun 2026 09:33:17 +0200 Subject: [PATCH 150/152] Rebuilt for Python 3.15 --- uhd.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/uhd.spec b/uhd.spec index 1f5d9a4..018fed5 100644 --- a/uhd.spec +++ b/uhd.spec @@ -32,7 +32,7 @@ URL: http://github.com/EttusResearch/uhd Version: 4.10.0.0 #%%global images_ver %%{version} %global images_ver 4.10.0.0 -Release: 1%{?dist} +Release: 2%{?dist} # Automatically converted from old format: GPLv3+ - review is highly recommended. License: GPL-3.0-or-later BuildRequires: make @@ -278,6 +278,9 @@ install -m0644 -D uhd.sysusers.conf %{buildroot}%{_sysusersdir}/uhd.conf %endif %changelog +* Thu Jun 04 2026 Python Maint - 4.10.0.0-2 +- Rebuilt for Python 3.15 + * Tue Apr 28 2026 Jaroslav Škarvada - 4.10.0.0-1 - New version Resolves: rhbz#2451594 From 69834dded8aceb7170094f5e52c447880eefcbcb Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 17 Jul 2026 08:08:18 +0000 Subject: [PATCH 151/152] Rebuilt for https://fedoraproject.org/wiki/Fedora_45_Mass_Rebuild --- uhd.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/uhd.spec b/uhd.spec index 018fed5..2c1c096 100644 --- a/uhd.spec +++ b/uhd.spec @@ -32,7 +32,7 @@ URL: http://github.com/EttusResearch/uhd Version: 4.10.0.0 #%%global images_ver %%{version} %global images_ver 4.10.0.0 -Release: 2%{?dist} +Release: 3%{?dist} # Automatically converted from old format: GPLv3+ - review is highly recommended. License: GPL-3.0-or-later BuildRequires: make @@ -278,6 +278,9 @@ install -m0644 -D uhd.sysusers.conf %{buildroot}%{_sysusersdir}/uhd.conf %endif %changelog +* Fri Jul 17 2026 Fedora Release Engineering - 4.10.0.0-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_45_Mass_Rebuild + * Thu Jun 04 2026 Python Maint - 4.10.0.0-2 - Rebuilt for Python 3.15 From acfe813c92501f3f69407edb0ba32c547f44eb1a Mon Sep 17 00:00:00 2001 From: Python Maint Date: Wed, 22 Jul 2026 10:11:19 +0200 Subject: [PATCH 152/152] Rebuilt for Python 3.15.0b4 ABI change --- uhd.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/uhd.spec b/uhd.spec index 2c1c096..4adc306 100644 --- a/uhd.spec +++ b/uhd.spec @@ -32,7 +32,7 @@ URL: http://github.com/EttusResearch/uhd Version: 4.10.0.0 #%%global images_ver %%{version} %global images_ver 4.10.0.0 -Release: 3%{?dist} +Release: 4%{?dist} # Automatically converted from old format: GPLv3+ - review is highly recommended. License: GPL-3.0-or-later BuildRequires: make @@ -278,6 +278,9 @@ install -m0644 -D uhd.sysusers.conf %{buildroot}%{_sysusersdir}/uhd.conf %endif %changelog +* Wed Jul 22 2026 Python Maint - 4.10.0.0-4 +- Rebuilt for Python 3.15.0b4 ABI change + * Fri Jul 17 2026 Fedora Release Engineering - 4.10.0.0-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_45_Mass_Rebuild