mirror of https://gerrit.osmocom.org/libusrp
Compare commits
19 Commits
Author | SHA1 | Date |
---|---|---|
Oliver Smith | c5e1f2c127 | |
Oliver Smith | 0f8f5deed4 | |
Pau Espin | 44c212e3dc | |
Pau Espin | 573075bfed | |
Pau Espin | d1d39c65a3 | |
Pau Espin | 8f6929276e | |
Oliver Smith | 312f964ed2 | |
Oliver Smith | f75863f235 | |
Oliver Smith | 64dd85f770 | |
Oliver Smith | fe31e2b363 | |
Pau Espin | 0c86c16936 | |
Oliver Smith | 7f277886ea | |
Oliver Smith | 789cad2325 | |
Pau Espin | 841a638a62 | |
Harald Welte | d40ef8f001 | |
Vadim Yanitskiy | cdc0ed783c | |
Vadim Yanitskiy | ae3d54ceeb | |
Vadim Yanitskiy | 559899621b | |
Oliver Smith | b293ceaf0f |
|
@ -0,0 +1 @@
|
|||
--exclude .*h
|
|
@ -38,3 +38,5 @@
|
|||
/m4/lt*.m4
|
||||
|
||||
contrib/libusrp.spec
|
||||
|
||||
/.version
|
||||
|
|
|
@ -29,7 +29,7 @@ EXTRA_DIST += \
|
|||
usrp.inf \
|
||||
.version \
|
||||
debian \
|
||||
contrib/libusrp.spec.in
|
||||
$(NULL)
|
||||
|
||||
SUBDIRS = host fpga doc firmware
|
||||
|
||||
|
|
|
@ -7,6 +7,8 @@ AM_SILENT_RULES([yes])
|
|||
|
||||
AC_CONFIG_MACRO_DIRS([m4])
|
||||
|
||||
CFLAGS="$CFLAGS -std=gnu11"
|
||||
|
||||
dnl include release helper
|
||||
RELMAKE='-include osmo-release.mk'
|
||||
AC_SUBST([RELMAKE])
|
||||
|
@ -81,7 +83,7 @@ AM_CONDITIONAL(HAVE_DOXYGEN, test $DOXYGEN != false && test "x$doxygen" = "xyes"
|
|||
AC_CHECK_PROG([XMLTO],[xmlto],[yes],[])
|
||||
AM_CONDITIONAL([HAS_XMLTO], [test x$XMLTO = xyes])
|
||||
|
||||
USRP_SDCC([3.2.0],[],[passed=no;AC_MSG_RESULT([Unable to find firmware compiler SDCC 3.x.])])
|
||||
USRP_SDCC([3.2.0],[],[passed=no;AC_MSG_ERROR([Unable to find firmware compiler SDCC 3.x.])])
|
||||
|
||||
AC_CONFIG_FILES([
|
||||
Makefile
|
||||
|
@ -110,4 +112,4 @@ AC_CONFIG_FILES([
|
|||
fpga/rbf/rev2/Makefile
|
||||
fpga/rbf/rev4/Makefile
|
||||
])
|
||||
AC_OUTPUT([contrib/libusrp.spec])
|
||||
AC_OUTPUT
|
||||
|
|
|
@ -4,6 +4,6 @@ set -ex
|
|||
|
||||
autoreconf --install --force
|
||||
./configure
|
||||
$MAKE # Parallel make fails ocsasionally, see OS#3970.
|
||||
$MAKE # Parallel make fails occasionally, see OS#3970.
|
||||
$MAKE distcheck
|
||||
$MAKE maintainer-clean
|
||||
|
|
|
@ -1,123 +0,0 @@
|
|||
#
|
||||
# spec file for package libusrp
|
||||
#
|
||||
# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany.
|
||||
# Copyright (c) 2018, Martin Hauke <mardnh@gmx.de>
|
||||
#
|
||||
# All modifications and additions to the file contributed by third parties
|
||||
# remain the property of their copyright owners, unless otherwise agreed
|
||||
# upon. The license for this file, and modifications and additions to the
|
||||
# file, is the same license as for the pristine package itself (unless the
|
||||
# license for the pristine package is not an Open Source License, in which
|
||||
# case the license is the MIT License). An "Open Source License" is a
|
||||
# license that conforms to the Open Source Definition (Version 1.9)
|
||||
# published by the Open Source Initiative.
|
||||
|
||||
%define libname libusrp1
|
||||
Name: libusrp
|
||||
Version: @VERSION@
|
||||
Release: 0
|
||||
Summary: Stand-alone libusrp for USRP1 from old gnuradio.git
|
||||
License: GPL-3.0-or-later
|
||||
Group: Development/Libraries/C and C++
|
||||
URL: https://git.osmocom.org/libusrp
|
||||
Source: %{name}-%{version}.tar.xz
|
||||
BuildRequires: autoconf
|
||||
BuildRequires: automake
|
||||
BuildRequires: fdupes
|
||||
BuildRequires: gcc-c++
|
||||
BuildRequires: libtool
|
||||
BuildRequires: pkgconfig
|
||||
BuildRequires: sdcc
|
||||
%if 0%{?suse_version} < 1320
|
||||
BuildRequires: python
|
||||
%else
|
||||
BuildRequires: python2
|
||||
%endif
|
||||
BuildRequires: pkgconfig(libusb-1.0)
|
||||
%if 0%{?suse_version} > 1325
|
||||
BuildRequires: libboost_date_time-devel
|
||||
BuildRequires: libboost_filesystem-devel
|
||||
BuildRequires: libboost_program_options-devel
|
||||
BuildRequires: libboost_system-devel
|
||||
BuildRequires: libboost_thread-devel
|
||||
%else
|
||||
BuildRequires: boost-devel
|
||||
%endif
|
||||
|
||||
%description
|
||||
Stand-alone libusrp for USRP1 from old gnuradio.git.
|
||||
|
||||
%package -n %{libname}
|
||||
Summary: Stand-alone libusrp for USRP1 from old gnuradio.git
|
||||
Group: System/Libraries
|
||||
|
||||
%description -n %{libname}
|
||||
Stand-alone libusrp for USRP1 from old gnuradio.git.
|
||||
|
||||
%package devel
|
||||
Summary: Development files for libusrp
|
||||
Group: Development/Libraries/C and C++
|
||||
Requires: %{libname} = %{version}
|
||||
|
||||
%description devel
|
||||
Stand-alone libusrp for USRP1 from old gnuradio.git.
|
||||
|
||||
This subpackage contains libraries and header files for developing
|
||||
applications that want to make use of libusrp.
|
||||
|
||||
%package -n usrp-tools
|
||||
Summary: Tools for the URSP1 SDR
|
||||
Group: Hardware/Other
|
||||
|
||||
%description -n usrp-tools
|
||||
Tools for the URSP1 SDR.
|
||||
|
||||
%package -n usrp-firmware
|
||||
Summary: Firmware files for the URSP1 SDR
|
||||
Group: Hardware/Other
|
||||
Requires: usrp-tools = %{version}
|
||||
BuildArch: noarch
|
||||
|
||||
%description -n usrp-firmware
|
||||
Firmware files for the USRP1 SDR.
|
||||
|
||||
%prep
|
||||
%setup -q
|
||||
|
||||
%build
|
||||
echo "%{version}" >.tarball-version
|
||||
autoreconf -fiv
|
||||
%configure
|
||||
# parallel build is br0ken
|
||||
# -> https://osmocom.org/issues/3970#change-15556
|
||||
make V=1 # %{?_smp_mflags}
|
||||
|
||||
%install
|
||||
%make_install
|
||||
rm -f %{buildroot}%{_libdir}/libusrp.la
|
||||
# FIXME: gnuradio swig stuff shouldn't be there
|
||||
rm -rf %{buildroot}%{_includedir}/gnuradio/
|
||||
%fdupes %{buildroot}%{_datadir}/usrp
|
||||
|
||||
%post -n %{libname} -p /sbin/ldconfig
|
||||
%postun -n %{libname} -p /sbin/ldconfig
|
||||
|
||||
%files -n usrp-tools
|
||||
%{_bindir}/usrp_cal_dc_offset
|
||||
%{_bindir}/usrper
|
||||
|
||||
%files -n %{libname}
|
||||
%{_libdir}/libusrp*.so.*
|
||||
|
||||
%files -n usrp-firmware
|
||||
%dir %{_datadir}/usrp
|
||||
%{_datadir}/usrp/rev2
|
||||
%{_datadir}/usrp/rev4
|
||||
|
||||
%files devel
|
||||
%{_includedir}/usrp
|
||||
%{_libdir}/libusrp.so
|
||||
%{_libdir}/pkgconfig/usrp.pc
|
||||
|
||||
%changelog
|
|
@ -1,3 +1,41 @@
|
|||
libusrp (3.4.8) unstable; urgency=medium
|
||||
|
||||
[ Oliver Smith ]
|
||||
* configure: abort if SDCC is not found
|
||||
* debian: set compat level to 10
|
||||
* Cosmetic: contrib/jenkins.sh: fix typo
|
||||
* debian/rules: don't build in parallel
|
||||
|
||||
[ Pau Espin Pedrol ]
|
||||
* linter: Don't check header files
|
||||
* cosmetic: fx2regs.h: Fix trailing whitespace
|
||||
* Fix compilation with newer sdcc
|
||||
|
||||
-- Pau Espin Pedrol <pespin@sysmocom.de> Tue, 12 Sep 2023 12:28:51 +0200
|
||||
|
||||
libusrp (3.4.7) unstable; urgency=medium
|
||||
|
||||
[ Oliver Smith ]
|
||||
* host/lib/Makefile.am: fix 'make uninstall'
|
||||
* gitignore: add /.version
|
||||
|
||||
-- Pau Espin Pedrol <pespin@sysmocom.de> Tue, 07 Feb 2023 14:00:21 +0100
|
||||
|
||||
libusrp (3.4.6) unstable; urgency=medium
|
||||
|
||||
[ Oliver Smith ]
|
||||
* configure.ac: set -std=gnu11
|
||||
|
||||
[ Vadim Yanitskiy ]
|
||||
* usrp_standard: fix out-of-bounds read in set_rx_freq()
|
||||
* usrp_prims_common: fix use-after-free in get_proto_filename()
|
||||
* libusb_get_device_list() may return a negative number
|
||||
|
||||
[ Harald Welte ]
|
||||
* migrate to python3
|
||||
|
||||
-- Pau Espin Pedrol <pespin@sysmocom.de> Tue, 16 Nov 2021 11:57:22 +0100
|
||||
|
||||
libusrp (3.4.5) unstable; urgency=medium
|
||||
|
||||
[ Pau Espin Pedrol ]
|
||||
|
|
|
@ -1 +1 @@
|
|||
9
|
||||
10
|
||||
|
|
|
@ -1,7 +1,7 @@
|
|||
Source: libusrp
|
||||
Priority: optional
|
||||
Maintainer: Pau Espin Pedrol <pespin@sysmocom.de>
|
||||
Build-Depends: debhelper (>=9),
|
||||
Maintainer: Osmocom team <openbsc@lists.osmocom.org>
|
||||
Build-Depends: debhelper (>= 10),
|
||||
dh-autoreconf,
|
||||
autotools-dev,
|
||||
autoconf,
|
||||
|
@ -9,7 +9,7 @@ Build-Depends: debhelper (>=9),
|
|||
doxygen,
|
||||
libtool,
|
||||
pkg-config,
|
||||
python,
|
||||
python3,
|
||||
sdcc,
|
||||
libusb-1.0-0-dev,
|
||||
libboost-all-dev
|
||||
|
|
|
@ -9,8 +9,9 @@ export DEB_BUILD_MAINT_OPTIONS = hardening=+all
|
|||
#export DH_VERBOSE=1
|
||||
|
||||
|
||||
# --no-parallel: OS#3970
|
||||
%:
|
||||
dh $@ --with autoreconf --fail-missing
|
||||
dh $@ --with autoreconf --fail-missing --no-parallel
|
||||
|
||||
override_dh_auto_configure:
|
||||
dh_auto_configure -- --enable-doxygen
|
||||
|
|
|
@ -321,7 +321,7 @@ __sfr __at 0x84 DPL1;
|
|||
__sfr __at 0x85 DPH1;
|
||||
__sfr __at 0x86 DPS;
|
||||
/* DPS */
|
||||
__sbit __at 0x86+0 SEL;
|
||||
__sbit __at (0x86+0) SEL;
|
||||
__sfr __at 0x87 PCON; /* PCON */
|
||||
//__sbit IDLE = 0x87+0;
|
||||
//__sbit STOP = 0x87+1;
|
||||
|
@ -330,14 +330,14 @@ __sfr __at 0x87 PCON; /* PCON */
|
|||
//__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;
|
||||
__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;
|
||||
|
@ -373,14 +373,14 @@ __sfr __at 0x91 EXIF; // EXIF Bit Values differ from Reg320
|
|||
__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;
|
||||
__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;
|
||||
|
@ -398,14 +398,14 @@ __sfr __at 0xA2 INT4CLR;
|
|||
|
||||
__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;
|
||||
__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 */
|
||||
|
@ -436,13 +436,13 @@ __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;
|
||||
__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;
|
||||
|
@ -453,61 +453,61 @@ __sfr __at 0xBF GPIFSGLDATLNOX;
|
|||
|
||||
__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;
|
||||
__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;
|
||||
__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;
|
||||
__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;
|
||||
__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;
|
||||
__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
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
#!/usr/bin/env python2
|
||||
#!/usr/bin/env python3
|
||||
|
||||
import os, os.path
|
||||
import re
|
||||
|
@ -8,7 +8,7 @@ import sys
|
|||
# set srcdir to the directory that contains Makefile.am
|
||||
try:
|
||||
srcdir = os.environ['srcdir']
|
||||
except KeyError, e:
|
||||
except KeyError as e:
|
||||
srcdir = "."
|
||||
srcdir = srcdir + '/'
|
||||
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
#!/usr/bin/env python2
|
||||
#!/usr/bin/env python3
|
||||
#
|
||||
# Copyright 2004,2006 Free Software Foundation, Inc.
|
||||
#
|
||||
|
@ -24,6 +24,7 @@ import re
|
|||
import sys
|
||||
import os, os.path
|
||||
from optparse import OptionParser
|
||||
from functools import reduce
|
||||
|
||||
# USB Vendor and Product ID's
|
||||
|
||||
|
@ -33,7 +34,7 @@ PID = 0x0002 # Universal Software Radio Peripheral
|
|||
|
||||
def hex_to_bytes (s):
|
||||
if len (s) & 0x1:
|
||||
raise ValueError, "Length must be even"
|
||||
raise ValueError("Length must be even")
|
||||
r = []
|
||||
for i in range (0, len(s), 2):
|
||||
r.append (int (s[i:i+2], 16))
|
||||
|
@ -59,17 +60,17 @@ class ihx_file (object):
|
|||
for line in file:
|
||||
line = line.strip().upper ()
|
||||
if not self.pat.match (line):
|
||||
raise ValueError, "Invalid hex record format"
|
||||
raise ValueError("Invalid hex record format")
|
||||
bytes = hex_to_bytes (line[1:])
|
||||
sum = reduce (lambda x, y: x + y, bytes, 0) % 256
|
||||
if sum != 0:
|
||||
raise ValueError, "Bad hex checksum"
|
||||
raise ValueError("Bad hex checksum")
|
||||
lenx = bytes[0]
|
||||
addr = (bytes[1] << 8) + bytes[2]
|
||||
type = bytes[3]
|
||||
data = bytes[4:-1]
|
||||
if lenx != len (data):
|
||||
raise ValueError, "Invalid hex record (bad length)"
|
||||
raise ValueError("Invalid hex record (bad length)")
|
||||
if type != 0:
|
||||
break;
|
||||
r.append (ihx_rec (addr, type, data))
|
||||
|
@ -83,7 +84,7 @@ def get_code (filename):
|
|||
f = open (filename, 'r')
|
||||
ifx = ihx_file ()
|
||||
r = ifx.read (f)
|
||||
r.sort (lambda a,b: a.addr - b.addr)
|
||||
r.sort (key=lambda a: a.addr)
|
||||
code_start = r[0].addr
|
||||
code_end = r[-1].addr + len (r[-1].data)
|
||||
code_len = code_end - code_start
|
||||
|
@ -153,7 +154,7 @@ def build_shell_script (out, ihx_filename, rev, prefix):
|
|||
i2c_addr = 0x50
|
||||
rom_addr = 0x00
|
||||
|
||||
hex_image = map (lambda x : "%02x" % (x,), image)
|
||||
hex_image = ["%02x" % (x,) for x in image]
|
||||
|
||||
while (len (hex_image) > 0):
|
||||
l = min (len (hex_image), 16)
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
#!/usr/bin/env python
|
||||
#!/usr/bin/env python3
|
||||
# -*- Python -*-
|
||||
#
|
||||
# Copyright 2003 Free Software Foundation, Inc.
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
#!/usr/bin/env python
|
||||
#!/usr/bin/env python3
|
||||
# -*- Python -*-
|
||||
#
|
||||
# Copyright 2003 Free Software Foundation, Inc.
|
||||
|
|
|
@ -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 \
|
||||
|
|
|
@ -157,6 +157,10 @@ noinst_PYTHON = \
|
|||
dump_data.py
|
||||
endif
|
||||
|
||||
# Workaround for generated rule that fails and should be a no-op
|
||||
uninstall-usrppythonPYTHON:
|
||||
$(info Skipping uninstall-usrpythonPYTHON (OS#5609))
|
||||
|
||||
# common way for generating sources from templates when using
|
||||
# BUILT_SOURCES, using parallel build protection.
|
||||
gen_sources = $(BUILT_SOURCES)
|
||||
|
|
|
@ -85,7 +85,7 @@ find_file (const char *filename, int hw_rev)
|
|||
}
|
||||
|
||||
static const char *
|
||||
get_proto_filename(const std::string user_filename, const char *env_var, const char *def)
|
||||
get_proto_filename(const std::string &user_filename, const char *env_var, const char *def)
|
||||
{
|
||||
if (user_filename.length() != 0)
|
||||
return user_filename.c_str();
|
||||
|
|
|
@ -183,8 +183,8 @@ usrp_find_device (int nth, bool fx2_ok_p, libusb_context *ctx)
|
|||
// skipped if you know what you're doing.
|
||||
assert (ctx != NULL);
|
||||
|
||||
size_t cnt = libusb_get_device_list(ctx, &list);
|
||||
size_t i = 0;
|
||||
ssize_t cnt = libusb_get_device_list(ctx, &list);
|
||||
ssize_t i = 0;
|
||||
|
||||
if (cnt < 0)
|
||||
fprintf(stderr, "usrp: libusb_get_device_list failed: %s\n",
|
||||
|
|
|
@ -649,7 +649,7 @@ usrp_standard_rx::determine_rx_mux_value(const usrp_subdev_spec &ss_a, const usr
|
|||
bool
|
||||
usrp_standard_rx::set_rx_freq (int channel, double freq)
|
||||
{
|
||||
if (channel < 0 || channel > MAX_CHAN)
|
||||
if (channel < 0 || channel >= MAX_CHAN)
|
||||
return false;
|
||||
|
||||
unsigned int v =
|
||||
|
|
|
@ -124,6 +124,7 @@ AC_DEFUN([_AX_BOOST_BASE_RUNDETECT],[
|
|||
AS_CASE([${host_cpu}],
|
||||
[i?86],[multiarch_libsubdir="lib/i386-${host_os}"],
|
||||
[armv7l],[multiarch_libsubdir="lib/arm-${host_os}"],
|
||||
[armv8l],[multiarch_libsubdir="lib/arm-${host_os}"],
|
||||
[multiarch_libsubdir="lib/${host_cpu}-${host_os}"]
|
||||
)
|
||||
|
||||
|
|
Loading…
Reference in New Issue