mirror of https://gerrit.osmocom.org/libusrp
Merged r11377:11390 from jcorgan/usrp-headers in to trunk.
* Public USRP(1) header files are now in their own source directory and install into $(includedir)/usrp. This was done to avoid name clashes in the top-level include directory. Only users who are developing directly to libusrp in C++ are affected; the GNU Radio C++ and Python APIs are unchanged. The simple change required by this update is to change: #include <usrp_*.h> to #include <usrp/usrp_*.h> ...in your source code. * Removed usrp-inband code from tree (put into limbo directory.) This code has become unmaintained and has started to suffer from bitrot. A checkpoint tag has been made for anyone still needing to use it: http://gnuradio.org/svn/gnuradio/tags/checkpoints/trunk-20090708-pre-usrp-reorg The plan during the 3.2->3.3 development cycle is to replace the functions done by the in-band code with extensions to the existing gr-usrp blocks using the new message passing architecture. The USRP hardware FPGA code that provided the inband interface has not been removed; however, it too has become unmaintained and will likely be rewritten/replaced during the 3.3 timeframe. The trunk passes distcheck. git-svn-id: http://gnuradio.org/svn/gnuradio/trunk@11394 221aa14e-8319-0410-a670-987f0aec2ac5
This commit is contained in:
parent
3aafe2583c
commit
707f3cef77
|
@ -21,7 +21,6 @@
|
||||||
|
|
||||||
EXTRA_DIST = \
|
EXTRA_DIST = \
|
||||||
usrp.pc.in \
|
usrp.pc.in \
|
||||||
usrp-inband.pc.in \
|
|
||||||
usrp.iss.in \
|
usrp.iss.in \
|
||||||
usrp.inf
|
usrp.inf
|
||||||
|
|
||||||
|
@ -29,6 +28,4 @@ SUBDIRS = host firmware fpga doc
|
||||||
|
|
||||||
pkgconfigdir = $(libdir)/pkgconfig
|
pkgconfigdir = $(libdir)/pkgconfig
|
||||||
pkgconfig_DATA = \
|
pkgconfig_DATA = \
|
||||||
usrp.pc \
|
usrp.pc
|
||||||
usrp-inband.pc
|
|
||||||
|
|
||||||
|
|
|
@ -19,7 +19,9 @@
|
||||||
# Boston, MA 02110-1301, USA.
|
# Boston, MA 02110-1301, USA.
|
||||||
#
|
#
|
||||||
|
|
||||||
include_HEADERS = \
|
usrpincludedir = $(includedir)/usrp
|
||||||
|
|
||||||
|
usrpinclude_HEADERS = \
|
||||||
usrp_i2c_addr.h \
|
usrp_i2c_addr.h \
|
||||||
usrp_spi_defs.h \
|
usrp_spi_defs.h \
|
||||||
fpga_regs_common.h \
|
fpga_regs_common.h \
|
||||||
|
|
|
@ -19,7 +19,7 @@
|
||||||
# Boston, MA 02110-1301, USA.
|
# Boston, MA 02110-1301, USA.
|
||||||
#
|
#
|
||||||
|
|
||||||
SUBDIRS = misc lib apps apps-inband
|
SUBDIRS = misc lib include apps
|
||||||
|
|
||||||
if PYTHON
|
if PYTHON
|
||||||
SUBDIRS += swig
|
SUBDIRS += swig
|
||||||
|
|
|
@ -1,6 +1,6 @@
|
||||||
/* -*- c++ -*- */
|
/* -*- c++ -*- */
|
||||||
/*
|
/*
|
||||||
* Copyright 2003,2006,2008 Free Software Foundation, Inc.
|
* Copyright 2003,2006,2008,2009 Free Software Foundation, Inc.
|
||||||
*
|
*
|
||||||
* This file is part of GNU Radio
|
* This file is part of GNU Radio
|
||||||
*
|
*
|
||||||
|
@ -33,8 +33,8 @@
|
||||||
#include <assert.h>
|
#include <assert.h>
|
||||||
#include <math.h>
|
#include <math.h>
|
||||||
#include "time_stuff.h"
|
#include "time_stuff.h"
|
||||||
#include "usrp_standard.h"
|
#include <usrp/usrp_standard.h>
|
||||||
#include "usrp_bytesex.h"
|
#include <usrp/usrp_bytesex.h>
|
||||||
#include "fpga_regs_common.h"
|
#include "fpga_regs_common.h"
|
||||||
#include "fpga_regs_standard.h"
|
#include "fpga_regs_standard.h"
|
||||||
|
|
||||||
|
|
|
@ -34,8 +34,8 @@
|
||||||
#include <assert.h>
|
#include <assert.h>
|
||||||
#include <math.h>
|
#include <math.h>
|
||||||
#include "time_stuff.h"
|
#include "time_stuff.h"
|
||||||
#include "usrp_standard.h"
|
#include <usrp/usrp_standard.h>
|
||||||
#include "usrp_bytesex.h"
|
#include <usrp/usrp_bytesex.h>
|
||||||
#include <boost/program_options.hpp>
|
#include <boost/program_options.hpp>
|
||||||
|
|
||||||
enum {
|
enum {
|
||||||
|
|
|
@ -1,6 +1,6 @@
|
||||||
/* -*- c++ -*- */
|
/* -*- c++ -*- */
|
||||||
/*
|
/*
|
||||||
* Copyright 2005,2008 Free Software Foundation, Inc.
|
* Copyright 2005,2008,2009 Free Software Foundation, Inc.
|
||||||
*
|
*
|
||||||
* This file is part of GNU Radio
|
* This file is part of GNU Radio
|
||||||
*
|
*
|
||||||
|
@ -33,9 +33,9 @@
|
||||||
#include <assert.h>
|
#include <assert.h>
|
||||||
#include <math.h>
|
#include <math.h>
|
||||||
#include <boost/scoped_ptr.hpp>
|
#include <boost/scoped_ptr.hpp>
|
||||||
#include "usrp_local_sighandler.h"
|
#include <usrp/usrp_local_sighandler.h>
|
||||||
#include "usrp_standard.h"
|
#include <usrp/usrp_standard.h>
|
||||||
#include "usrp_bytesex.h"
|
#include <usrp/usrp_bytesex.h>
|
||||||
|
|
||||||
char *prog_name;
|
char *prog_name;
|
||||||
|
|
||||||
|
|
|
@ -2,7 +2,7 @@
|
||||||
/*
|
/*
|
||||||
* USRP - Universal Software Radio Peripheral
|
* USRP - Universal Software Radio Peripheral
|
||||||
*
|
*
|
||||||
* Copyright (C) 2003,2004 Free Software Foundation, Inc.
|
* Copyright (C) 2003,2004,2009 Free Software Foundation, Inc.
|
||||||
*
|
*
|
||||||
* This program is free software; you can redistribute it and/or modify
|
* 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
|
* it under the terms of the GNU General Public License as published by
|
||||||
|
@ -28,7 +28,7 @@
|
||||||
#include <assert.h>
|
#include <assert.h>
|
||||||
#include <errno.h>
|
#include <errno.h>
|
||||||
|
|
||||||
#include "usrp_prims.h"
|
#include "usrp/usrp_prims.h"
|
||||||
#include "usrp_spi_defs.h"
|
#include "usrp_spi_defs.h"
|
||||||
#include <string.h>
|
#include <string.h>
|
||||||
|
|
||||||
|
|
|
@ -0,0 +1,23 @@
|
||||||
|
#
|
||||||
|
# Copyright 2009 Free Software Foundation, Inc.
|
||||||
|
#
|
||||||
|
# This file is part of GNU Radio
|
||||||
|
#
|
||||||
|
# GNU Radio is free software; you can redistribute it and/or modify
|
||||||
|
# it under the terms of the GNU General Public License as published by
|
||||||
|
# the Free Software Foundation; either version 3, or (at your option)
|
||||||
|
# any later version.
|
||||||
|
#
|
||||||
|
# GNU Radio is distributed in the hope that it will be useful,
|
||||||
|
# but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||||
|
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||||
|
# GNU General Public License for more details.
|
||||||
|
#
|
||||||
|
# You should have received a copy of the GNU General Public License
|
||||||
|
# along with GNU Radio; see the file COPYING. If not, write to
|
||||||
|
# the Free Software Foundation, Inc., 51 Franklin Street,
|
||||||
|
# Boston, MA 02110-1301, USA.
|
||||||
|
#
|
||||||
|
|
||||||
|
SUBDIRS = usrp
|
||||||
|
|
|
@ -0,0 +1,49 @@
|
||||||
|
#
|
||||||
|
# Copyright 2009 Free Software Foundation, Inc.
|
||||||
|
#
|
||||||
|
# This file is part of GNU Radio
|
||||||
|
#
|
||||||
|
# GNU Radio is free software; you can redistribute it and/or modify
|
||||||
|
# it under the terms of the GNU General Public License as published by
|
||||||
|
# the Free Software Foundation; either version 3, or (at your option)
|
||||||
|
# any later version.
|
||||||
|
#
|
||||||
|
# GNU Radio is distributed in the hope that it will be useful,
|
||||||
|
# but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||||
|
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||||
|
# GNU General Public License for more details.
|
||||||
|
#
|
||||||
|
# You should have received a copy of the GNU General Public License
|
||||||
|
# along with GNU Radio; see the file COPYING. If not, write to
|
||||||
|
# the Free Software Foundation, Inc., 51 Franklin Street,
|
||||||
|
# Boston, MA 02110-1301, USA.
|
||||||
|
#
|
||||||
|
|
||||||
|
include $(top_srcdir)/Makefile.common
|
||||||
|
|
||||||
|
usrpincludedir = $(includedir)/usrp
|
||||||
|
|
||||||
|
usrpinclude_HEADERS = \
|
||||||
|
db_base.h \
|
||||||
|
db_basic.h \
|
||||||
|
db_dbs_rx.h \
|
||||||
|
db_dtt754.h \
|
||||||
|
db_dtt768.h \
|
||||||
|
db_flexrf.h \
|
||||||
|
db_flexrf_mimo.h \
|
||||||
|
db_tv_rx.h \
|
||||||
|
db_xcvr2450.h \
|
||||||
|
usrp_basic.h \
|
||||||
|
usrp_bytesex.h \
|
||||||
|
usrp_dbid.h \
|
||||||
|
usrp_local_sighandler.h \
|
||||||
|
usrp_prims.h \
|
||||||
|
usrp_slots.h \
|
||||||
|
usrp_standard.h \
|
||||||
|
usrp_subdev_spec.h \
|
||||||
|
usrp_tune_result.h
|
||||||
|
|
||||||
|
if PYTHON
|
||||||
|
swiginclude_HEADERS = \
|
||||||
|
db_base.i
|
||||||
|
endif
|
|
@ -22,7 +22,7 @@
|
||||||
|
|
||||||
|
|
||||||
%{
|
%{
|
||||||
#include "db_base.h"
|
#include <usrp/db_base.h>
|
||||||
%}
|
%}
|
||||||
|
|
||||||
%include <gr_shared_ptr.i>
|
%include <gr_shared_ptr.i>
|
|
@ -1,6 +1,6 @@
|
||||||
/* -*- c++ -*- */
|
/* -*- c++ -*- */
|
||||||
//
|
//
|
||||||
// Copyright 2008 Free Software Foundation, Inc.
|
// Copyright 2008,2009 Free Software Foundation, Inc.
|
||||||
//
|
//
|
||||||
// This file is part of GNU Radio
|
// This file is part of GNU Radio
|
||||||
//
|
//
|
||||||
|
@ -22,7 +22,7 @@
|
||||||
#ifndef DB_BASIC_H
|
#ifndef DB_BASIC_H
|
||||||
#define DB_BASIC_H
|
#define DB_BASIC_H
|
||||||
|
|
||||||
#include <db_base.h>
|
#include <usrp/db_base.h>
|
||||||
|
|
||||||
|
|
||||||
/******************************************************************************/
|
/******************************************************************************/
|
|
@ -1,6 +1,6 @@
|
||||||
/* -*- c++ -*- */
|
/* -*- c++ -*- */
|
||||||
//
|
//
|
||||||
// Copyright 2008 Free Software Foundation, Inc.
|
// Copyright 2008,2009 Free Software Foundation, Inc.
|
||||||
//
|
//
|
||||||
// This file is part of GNU Radio
|
// This file is part of GNU Radio
|
||||||
//
|
//
|
||||||
|
@ -22,7 +22,7 @@
|
||||||
#ifndef DB_DBS_RX_H
|
#ifndef DB_DBS_RX_H
|
||||||
#define DB_DBS_RX_H
|
#define DB_DBS_RX_H
|
||||||
|
|
||||||
#include <db_base.h>
|
#include <usrp/db_base.h>
|
||||||
#include <vector>
|
#include <vector>
|
||||||
|
|
||||||
#if 0
|
#if 0
|
|
@ -1,6 +1,6 @@
|
||||||
/* -*- c++ -*- */
|
/* -*- c++ -*- */
|
||||||
//
|
//
|
||||||
// Copyright 2008 Free Software Foundation, Inc.
|
// Copyright 2008,2009 Free Software Foundation, Inc.
|
||||||
//
|
//
|
||||||
// This file is part of GNU Radio
|
// This file is part of GNU Radio
|
||||||
//
|
//
|
||||||
|
@ -22,7 +22,7 @@
|
||||||
#ifndef DB_DTT754_H
|
#ifndef DB_DTT754_H
|
||||||
#define DB_DTT754_H
|
#define DB_DTT754_H
|
||||||
|
|
||||||
#include <db_base.h>
|
#include <usrp/db_base.h>
|
||||||
#include <boost/shared_ptr.hpp>
|
#include <boost/shared_ptr.hpp>
|
||||||
|
|
||||||
class db_dtt754 : public db_base
|
class db_dtt754 : public db_base
|
|
@ -1,6 +1,6 @@
|
||||||
/* -*- c++ -*- */
|
/* -*- c++ -*- */
|
||||||
//
|
//
|
||||||
// Copyright 2008 Free Software Foundation, Inc.
|
// Copyright 2008,2009 Free Software Foundation, Inc.
|
||||||
//
|
//
|
||||||
// This file is part of GNU Radio
|
// This file is part of GNU Radio
|
||||||
//
|
//
|
||||||
|
@ -22,7 +22,7 @@
|
||||||
#ifndef DB_DTT768_H
|
#ifndef DB_DTT768_H
|
||||||
#define DB_DTT768_H
|
#define DB_DTT768_H
|
||||||
|
|
||||||
#include <db_base.h>
|
#include <usrp/db_base.h>
|
||||||
#include <boost/shared_ptr.hpp>
|
#include <boost/shared_ptr.hpp>
|
||||||
|
|
||||||
class db_dtt768 : public db_base
|
class db_dtt768 : public db_base
|
|
@ -1,6 +1,6 @@
|
||||||
/* -*- c++ -*- */
|
/* -*- c++ -*- */
|
||||||
//
|
//
|
||||||
// Copyright 2008 Free Software Foundation, Inc.
|
// Copyright 2008,2009 Free Software Foundation, Inc.
|
||||||
//
|
//
|
||||||
// This file is part of GNU Radio
|
// This file is part of GNU Radio
|
||||||
//
|
//
|
||||||
|
@ -22,7 +22,7 @@
|
||||||
#ifndef DB_FLEXRF_H
|
#ifndef DB_FLEXRF_H
|
||||||
#define DB_FLEXRF_H
|
#define DB_FLEXRF_H
|
||||||
|
|
||||||
#include <db_base.h>
|
#include <usrp/db_base.h>
|
||||||
#include <cmath>
|
#include <cmath>
|
||||||
|
|
||||||
//debug_using_gui = true // Must be set to True or False
|
//debug_using_gui = true // Must be set to True or False
|
|
@ -1,5 +1,5 @@
|
||||||
/*
|
/*
|
||||||
* Copyright 2008 Free Software Foundation, Inc.
|
* Copyright 2008,2009 Free Software Foundation, Inc.
|
||||||
*
|
*
|
||||||
* This file is part of GNU Radio
|
* This file is part of GNU Radio
|
||||||
*
|
*
|
||||||
|
@ -19,7 +19,7 @@
|
||||||
* Boston, MA 02110-1301, USA.
|
* Boston, MA 02110-1301, USA.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#include <db_flexrf.h>
|
#include <usrp/db_flexrf.h>
|
||||||
|
|
||||||
class db_flexrf_2400_tx_mimo_a : public db_flexrf_2400_tx
|
class db_flexrf_2400_tx_mimo_a : public db_flexrf_2400_tx
|
||||||
{
|
{
|
|
@ -1,6 +1,6 @@
|
||||||
/* -*- c++ -*- */
|
/* -*- c++ -*- */
|
||||||
//
|
//
|
||||||
// Copyright 2008 Free Software Foundation, Inc.
|
// Copyright 2008,2009 Free Software Foundation, Inc.
|
||||||
//
|
//
|
||||||
// This file is part of GNU Radio
|
// This file is part of GNU Radio
|
||||||
//
|
//
|
||||||
|
@ -22,7 +22,7 @@
|
||||||
#ifndef DB_TV_RX_H
|
#ifndef DB_TV_RX_H
|
||||||
#define DB_TV_RX_H
|
#define DB_TV_RX_H
|
||||||
|
|
||||||
#include <db_base.h>
|
#include <usrp/db_base.h>
|
||||||
|
|
||||||
class db_tv_rx : public db_base
|
class db_tv_rx : public db_base
|
||||||
{
|
{
|
|
@ -22,7 +22,7 @@
|
||||||
#ifndef DB_XCVR2450_H
|
#ifndef DB_XCVR2450_H
|
||||||
#define DB_XCVR2450_H
|
#define DB_XCVR2450_H
|
||||||
|
|
||||||
#include <db_base.h>
|
#include <usrp/db_base.h>
|
||||||
#include <boost/shared_ptr.hpp>
|
#include <boost/shared_ptr.hpp>
|
||||||
|
|
||||||
class xcvr2450;
|
class xcvr2450;
|
|
@ -1,6 +1,6 @@
|
||||||
/* -*- c++ -*- */
|
/* -*- c++ -*- */
|
||||||
/*
|
/*
|
||||||
* Copyright 2003,2004,2008 Free Software Foundation, Inc.
|
* Copyright 2003,2004,2008,2009 Free Software Foundation, Inc.
|
||||||
*
|
*
|
||||||
* This file is part of GNU Radio
|
* This file is part of GNU Radio
|
||||||
*
|
*
|
||||||
|
@ -39,12 +39,12 @@
|
||||||
#ifndef INCLUDED_USRP_BASIC_H
|
#ifndef INCLUDED_USRP_BASIC_H
|
||||||
#define INCLUDED_USRP_BASIC_H
|
#define INCLUDED_USRP_BASIC_H
|
||||||
|
|
||||||
#include <db_base.h>
|
#include <usrp/db_base.h>
|
||||||
#include <usrp_slots.h>
|
#include <usrp/usrp_slots.h>
|
||||||
#include <string>
|
#include <string>
|
||||||
#include <vector>
|
#include <vector>
|
||||||
#include <boost/utility.hpp>
|
#include <boost/utility.hpp>
|
||||||
#include <usrp_subdev_spec.h>
|
#include <usrp/usrp_subdev_spec.h>
|
||||||
|
|
||||||
struct usb_dev_handle;
|
struct usb_dev_handle;
|
||||||
class fusb_devhandle;
|
class fusb_devhandle;
|
|
@ -1,6 +1,6 @@
|
||||||
/* -*- c++ -*- */
|
/* -*- c++ -*- */
|
||||||
/*
|
/*
|
||||||
* Copyright 2003,2004,2006 Free Software Foundation, Inc.
|
* Copyright 2003,2004,2006,2009 Free Software Foundation, Inc.
|
||||||
*
|
*
|
||||||
* This file is part of GNU Radio
|
* This file is part of GNU Radio
|
||||||
*
|
*
|
||||||
|
@ -34,7 +34,7 @@
|
||||||
#ifndef _USRP_PRIMS_H_
|
#ifndef _USRP_PRIMS_H_
|
||||||
#define _USRP_PRIMS_H_
|
#define _USRP_PRIMS_H_
|
||||||
|
|
||||||
#include <usrp_slots.h>
|
#include <usrp/usrp_slots.h>
|
||||||
#include <string>
|
#include <string>
|
||||||
|
|
||||||
static const int USRP_HASH_SIZE = 16;
|
static const int USRP_HASH_SIZE = 16;
|
|
@ -1,6 +1,6 @@
|
||||||
/* -*- c++ -*- */
|
/* -*- c++ -*- */
|
||||||
/*
|
/*
|
||||||
* Copyright 2004,2008 Free Software Foundation, Inc.
|
* Copyright 2004,2008,2009 Free Software Foundation, Inc.
|
||||||
*
|
*
|
||||||
* This file is part of GNU Radio
|
* This file is part of GNU Radio
|
||||||
*
|
*
|
||||||
|
@ -23,9 +23,9 @@
|
||||||
#ifndef INCLUDED_USRP_STANDARD_H
|
#ifndef INCLUDED_USRP_STANDARD_H
|
||||||
#define INCLUDED_USRP_STANDARD_H
|
#define INCLUDED_USRP_STANDARD_H
|
||||||
|
|
||||||
#include <usrp_basic.h>
|
#include <usrp/usrp_basic.h>
|
||||||
#include <boost/shared_ptr.hpp>
|
#include <boost/shared_ptr.hpp>
|
||||||
#include <usrp_tune_result.h>
|
#include <usrp/usrp_tune_result.h>
|
||||||
|
|
||||||
class usrp_standard_tx;
|
class usrp_standard_tx;
|
||||||
class usrp_standard_rx;
|
class usrp_standard_rx;
|
|
@ -1,7 +1,7 @@
|
||||||
#
|
#
|
||||||
# USRP - Universal Software Radio Peripheral
|
# USRP - Universal Software Radio Peripheral
|
||||||
#
|
#
|
||||||
# Copyright (C) 2003,2004,2006,2007 Free Software Foundation, Inc.
|
# Copyright (C) 2003,2004,2006,2007,2008,2009 Free Software Foundation, Inc.
|
||||||
#
|
#
|
||||||
# This program is free software; you can redistribute it and/or modify
|
# 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
|
# it under the terms of the GNU General Public License as published by
|
||||||
|
@ -20,5 +20,154 @@
|
||||||
|
|
||||||
include $(top_srcdir)/Makefile.common
|
include $(top_srcdir)/Makefile.common
|
||||||
|
|
||||||
SUBDIRS = legacy inband
|
common_INCLUDES = $(USRP_INCLUDES)
|
||||||
|
|
||||||
|
lib_LTLIBRARIES = libusrp.la
|
||||||
|
|
||||||
|
libusrp_la_common_LDFLAGS = $(NO_UNDEFINED) -version-info 0:0:0 $(BOOST_LDFLAGS)
|
||||||
|
|
||||||
|
libusrp_la_common_LIBADD = \
|
||||||
|
$(USB_LIBS) \
|
||||||
|
$(BOOST_THREAD_LIB) \
|
||||||
|
../misc/libmisc.la
|
||||||
|
|
||||||
|
# darwin fusb requires omnithreads
|
||||||
|
if FUSB_TECH_darwin
|
||||||
|
AM_CPPFLAGS = $(common_INCLUDES) $(OMNITHREAD_INCLUDES) $(BOOST_CPPFLAGS) $(WITH_INCLUDES)
|
||||||
|
libusrp_la_LIBADD = $(libusrp_la_common_LIBADD) $(OMNITHREAD_LA)
|
||||||
|
libusrp_la_LDFLAGS = $(libusrp_la_common_LDFLAGS) -framework CoreFoundation
|
||||||
|
else
|
||||||
|
AM_CPPFLAGS = $(common_INCLUDES) $(BOOST_CPPFLAGS) $(WITH_INCLUDES)
|
||||||
|
libusrp_la_LIBADD = $(libusrp_la_common_LIBADD)
|
||||||
|
libusrp_la_LDFLAGS = $(libusrp_la_common_LDFLAGS)
|
||||||
|
endif
|
||||||
|
|
||||||
|
EXTRA_DIST = \
|
||||||
|
std_paths.h.in \
|
||||||
|
usrp_dbid.dat
|
||||||
|
|
||||||
|
BUILT_SOURCES = \
|
||||||
|
$(abs_top_builddir)/usrp/host/include/usrp/usrp_dbid.h
|
||||||
|
|
||||||
|
BUILT_SOURCES += usrp_dbid.cc \
|
||||||
|
usrp_dbid.py
|
||||||
|
|
||||||
|
# ----------------------------------------------------------------
|
||||||
|
# FUSB_TECH is set at configure time by way of
|
||||||
|
# usrp/config/usrp_fusb_tech.m4.
|
||||||
|
# It indicates which fast usb strategy we should be building.
|
||||||
|
# We currently implement "generic", "darwin", "win32" and "linux"
|
||||||
|
|
||||||
|
|
||||||
|
generic_CODE = \
|
||||||
|
fusb_generic.cc \
|
||||||
|
fusb_sysconfig_generic.cc
|
||||||
|
|
||||||
|
darwin_CODE = \
|
||||||
|
fusb_darwin.cc \
|
||||||
|
fusb_sysconfig_darwin.cc \
|
||||||
|
README_OSX \
|
||||||
|
circular_buffer.h \
|
||||||
|
circular_linked_list.h \
|
||||||
|
darwin_libusb.h \
|
||||||
|
mld_threads.h
|
||||||
|
|
||||||
|
win32_CODE = \
|
||||||
|
fusb_win32.cc \
|
||||||
|
fusb_sysconfig_win32.cc
|
||||||
|
|
||||||
|
linux_CODE = \
|
||||||
|
fusb_linux.cc \
|
||||||
|
fusb_sysconfig_linux.cc
|
||||||
|
|
||||||
|
ra_wb_CODE = \
|
||||||
|
fusb_ra_wb.cc \
|
||||||
|
fusb_sysconfig_ra_wb.cc
|
||||||
|
|
||||||
|
|
||||||
|
#
|
||||||
|
# include each <foo>_CODE entry here...
|
||||||
|
#
|
||||||
|
EXTRA_libusrp_la_SOURCES = \
|
||||||
|
$(generic_CODE) \
|
||||||
|
$(darwin_CODE) \
|
||||||
|
$(win32_CODE) \
|
||||||
|
$(linux_CODE) \
|
||||||
|
$(ra_wb_CODE)
|
||||||
|
|
||||||
|
|
||||||
|
# work around automake deficiency
|
||||||
|
libusrp_la_common_SOURCES = \
|
||||||
|
fusb.cc \
|
||||||
|
md5.c \
|
||||||
|
usrp_basic.cc \
|
||||||
|
usrp_config.cc \
|
||||||
|
usrp_dbid.cc \
|
||||||
|
usrp_local_sighandler.cc \
|
||||||
|
usrp_prims.cc \
|
||||||
|
usrp_standard.cc \
|
||||||
|
db_boards.cc \
|
||||||
|
db_base.cc \
|
||||||
|
db_basic.cc \
|
||||||
|
db_tv_rx.cc \
|
||||||
|
db_flexrf.cc \
|
||||||
|
db_flexrf_mimo.cc \
|
||||||
|
db_dbs_rx.cc \
|
||||||
|
db_xcvr2450.cc \
|
||||||
|
db_dtt754.cc \
|
||||||
|
db_dtt768.cc \
|
||||||
|
db_util.cc
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
if FUSB_TECH_generic
|
||||||
|
libusrp_la_SOURCES = $(libusrp_la_common_SOURCES) $(generic_CODE)
|
||||||
|
endif
|
||||||
|
|
||||||
|
if FUSB_TECH_darwin
|
||||||
|
libusrp_la_SOURCES = $(libusrp_la_common_SOURCES) $(darwin_CODE)
|
||||||
|
endif
|
||||||
|
|
||||||
|
if FUSB_TECH_win32
|
||||||
|
libusrp_la_SOURCES = $(libusrp_la_common_SOURCES) $(win32_CODE)
|
||||||
|
endif
|
||||||
|
|
||||||
|
if FUSB_TECH_linux
|
||||||
|
libusrp_la_SOURCES = $(libusrp_la_common_SOURCES) $(linux_CODE)
|
||||||
|
endif
|
||||||
|
|
||||||
|
if FUSB_TECH_ra_wb
|
||||||
|
libusrp_la_SOURCES = $(libusrp_la_common_SOURCES) $(ra_wb_CODE)
|
||||||
|
endif
|
||||||
|
|
||||||
|
noinst_HEADERS = \
|
||||||
|
ad9862.h \
|
||||||
|
db_base_impl.h \
|
||||||
|
db_boards.h \
|
||||||
|
db_util.h \
|
||||||
|
fusb.h \
|
||||||
|
fusb_darwin.h \
|
||||||
|
fusb_generic.h \
|
||||||
|
fusb_linux.h \
|
||||||
|
fusb_ra_wb.h \
|
||||||
|
fusb_win32.h \
|
||||||
|
md5.h \
|
||||||
|
rate_to_regval.h \
|
||||||
|
usrp_config.h
|
||||||
|
|
||||||
|
if PYTHON
|
||||||
|
usrppython_PYTHON = \
|
||||||
|
usrp_dbid.py
|
||||||
|
|
||||||
|
noinst_PYTHON = \
|
||||||
|
gen_usrp_dbid.py \
|
||||||
|
check_data.py \
|
||||||
|
dump_data.py
|
||||||
|
endif
|
||||||
|
|
||||||
|
# common way for generating sources from templates when using
|
||||||
|
# BUILT_SOURCES, using parallel build protection.
|
||||||
|
gen_sources = $(BUILT_SOURCES)
|
||||||
|
gen_sources_deps = gen_usrp_dbid.py usrp_dbid.dat
|
||||||
|
par_gen_command = PYTHONPATH=$(top_srcdir)/usrp/src srcdir=$(srcdir) $(PYTHON) $(srcdir)/gen_usrp_dbid.py $(srcdir)/usrp_dbid.dat
|
||||||
|
include $(top_srcdir)/Makefile.par.gen
|
||||||
|
|
|
@ -1,5 +1,5 @@
|
||||||
//
|
//
|
||||||
// Copyright 2008 Free Software Foundation, Inc.
|
// Copyright 2008,2009 Free Software Foundation, Inc.
|
||||||
//
|
//
|
||||||
// This file is part of GNU Radio
|
// This file is part of GNU Radio
|
||||||
//
|
//
|
||||||
|
@ -19,7 +19,7 @@
|
||||||
// Boston, MA 02110-1301, USA.
|
// Boston, MA 02110-1301, USA.
|
||||||
//
|
//
|
||||||
|
|
||||||
#include <db_base.h>
|
#include <usrp/db_base.h>
|
||||||
#include <db_base_impl.h>
|
#include <db_base_impl.h>
|
||||||
|
|
||||||
#if 0
|
#if 0
|
|
@ -1,6 +1,6 @@
|
||||||
/* -*- c++ -*- */
|
/* -*- c++ -*- */
|
||||||
/*
|
/*
|
||||||
* Copyright 2008 Free Software Foundation, Inc.
|
* Copyright 2008,2009 Free Software Foundation, Inc.
|
||||||
*
|
*
|
||||||
* This file is part of GNU Radio
|
* This file is part of GNU Radio
|
||||||
*
|
*
|
||||||
|
@ -21,12 +21,12 @@
|
||||||
#ifndef INCLUDED_DB_BASE_IMPL_H
|
#ifndef INCLUDED_DB_BASE_IMPL_H
|
||||||
#define INCLUDED_DB_BASE_IMPL_H
|
#define INCLUDED_DB_BASE_IMPL_H
|
||||||
|
|
||||||
#include <db_base.h>
|
#include <usrp/db_base.h>
|
||||||
#include <db_util.h>
|
#include <db_util.h>
|
||||||
#include <usrp_basic.h>
|
#include <usrp/usrp_basic.h>
|
||||||
#include <fpga_regs_standard.h>
|
#include <fpga_regs_standard.h>
|
||||||
#include <fpga_regs_common.h>
|
#include <fpga_regs_common.h>
|
||||||
#include <usrp_prims.h>
|
#include <usrp/usrp_prims.h>
|
||||||
#include <usrp_spi_defs.h>
|
#include <usrp_spi_defs.h>
|
||||||
#include <stdexcept>
|
#include <stdexcept>
|
||||||
|
|
|
@ -1,5 +1,5 @@
|
||||||
//
|
//
|
||||||
// Copyright 2008 Free Software Foundation, Inc.
|
// Copyright 2008,2009 Free Software Foundation, Inc.
|
||||||
//
|
//
|
||||||
// This file is part of GNU Radio
|
// This file is part of GNU Radio
|
||||||
//
|
//
|
||||||
|
@ -18,10 +18,9 @@
|
||||||
// the Free Software Foundation, Inc., 51 Franklin Street,
|
// the Free Software Foundation, Inc., 51 Franklin Street,
|
||||||
// Boston, MA 02110-1301, USA.
|
// Boston, MA 02110-1301, USA.
|
||||||
|
|
||||||
#include <db_basic.h>
|
#include <usrp/db_basic.h>
|
||||||
#include <db_base_impl.h>
|
#include <db_base_impl.h>
|
||||||
|
|
||||||
|
|
||||||
db_basic_tx::db_basic_tx(boost::shared_ptr<usrp_basic> usrp, int which)
|
db_basic_tx::db_basic_tx(boost::shared_ptr<usrp_basic> usrp, int which)
|
||||||
: db_base(usrp, which)
|
: db_base(usrp, which)
|
||||||
{
|
{
|
|
@ -1,6 +1,6 @@
|
||||||
/* -*- c++ -*- */
|
/* -*- c++ -*- */
|
||||||
//
|
//
|
||||||
// Copyright 2008 Free Software Foundation, Inc.
|
// Copyright 2008,2009 Free Software Foundation, Inc.
|
||||||
//
|
//
|
||||||
// This file is part of GNU Radio
|
// This file is part of GNU Radio
|
||||||
//
|
//
|
||||||
|
@ -21,16 +21,15 @@
|
||||||
//
|
//
|
||||||
|
|
||||||
#include <db_boards.h>
|
#include <db_boards.h>
|
||||||
#include <usrp_dbid.h>
|
#include <usrp/usrp_dbid.h>
|
||||||
#include <db_basic.h>
|
#include <usrp/db_basic.h>
|
||||||
#include <db_tv_rx.h>
|
#include <usrp/db_tv_rx.h>
|
||||||
#include <db_dbs_rx.h>
|
#include <usrp/db_dbs_rx.h>
|
||||||
#include <db_flexrf.h>
|
#include <usrp/db_flexrf.h>
|
||||||
#include <db_flexrf_mimo.h>
|
#include <usrp/db_flexrf_mimo.h>
|
||||||
#include <db_xcvr2450.h>
|
#include <usrp/db_xcvr2450.h>
|
||||||
#include <db_wbx.h>
|
#include <usrp/db_dtt754.h>
|
||||||
#include <db_dtt754.h>
|
#include <usrp/db_dtt768.h>
|
||||||
#include <db_dtt768.h>
|
|
||||||
#include <cstdio>
|
#include <cstdio>
|
||||||
|
|
||||||
std::vector<db_base_sptr>
|
std::vector<db_base_sptr>
|
|
@ -23,8 +23,8 @@
|
||||||
#ifndef DB_BOARDS_H
|
#ifndef DB_BOARDS_H
|
||||||
#define DB_BOARDS_H
|
#define DB_BOARDS_H
|
||||||
|
|
||||||
#include <db_base.h>
|
#include <usrp/db_base.h>
|
||||||
#include <usrp_basic.h>
|
#include <usrp/usrp_basic.h>
|
||||||
|
|
||||||
std::vector<db_base_sptr> instantiate_dbs(int dbid, usrp_basic_sptr usrp, int which_side);
|
std::vector<db_base_sptr> instantiate_dbs(int dbid, usrp_basic_sptr usrp, int which_side);
|
||||||
|
|
|
@ -18,7 +18,7 @@
|
||||||
// the Free Software Foundation, Inc., 51 Franklin Street,
|
// the Free Software Foundation, Inc., 51 Franklin Street,
|
||||||
// Boston, MA 02110-1301, USA.
|
// Boston, MA 02110-1301, USA.
|
||||||
|
|
||||||
#include <db_dbs_rx.h>
|
#include <usrp/db_dbs_rx.h>
|
||||||
#include <db_base_impl.h>
|
#include <db_base_impl.h>
|
||||||
#include <cmath>
|
#include <cmath>
|
||||||
#include <cstdio>
|
#include <cstdio>
|
|
@ -19,7 +19,7 @@
|
||||||
// the Free Software Foundation, Inc., 51 Franklin Street,
|
// the Free Software Foundation, Inc., 51 Franklin Street,
|
||||||
// Boston, MA 02110-1301, USA.
|
// Boston, MA 02110-1301, USA.
|
||||||
|
|
||||||
#include <db_dtt754.h>
|
#include <usrp/db_dtt754.h>
|
||||||
#include <db_base_impl.h>
|
#include <db_base_impl.h>
|
||||||
|
|
||||||
int
|
int
|
|
@ -19,7 +19,7 @@
|
||||||
// the Free Software Foundation, Inc., 51 Franklin Street,
|
// the Free Software Foundation, Inc., 51 Franklin Street,
|
||||||
// Boston, MA 02110-1301, USA.
|
// Boston, MA 02110-1301, USA.
|
||||||
|
|
||||||
#include <db_dtt768.h>
|
#include <usrp/db_dtt768.h>
|
||||||
#include <db_base_impl.h>
|
#include <db_base_impl.h>
|
||||||
|
|
||||||
int
|
int
|
|
@ -18,7 +18,7 @@
|
||||||
// the Free Software Foundation, Inc., 51 Franklin Street,
|
// the Free Software Foundation, Inc., 51 Franklin Street,
|
||||||
// Boston, MA 02110-1301, USA.
|
// Boston, MA 02110-1301, USA.
|
||||||
|
|
||||||
#include <db_flexrf.h>
|
#include <usrp/db_flexrf.h>
|
||||||
#include <db_base_impl.h>
|
#include <db_base_impl.h>
|
||||||
|
|
||||||
// d'board i/o pin defs
|
// d'board i/o pin defs
|
|
@ -1,5 +1,5 @@
|
||||||
/*
|
/*
|
||||||
* Copyright 2008 Free Software Foundation, Inc.
|
* Copyright 2008,2009 Free Software Foundation, Inc.
|
||||||
*
|
*
|
||||||
* This file is part of GNU Radio
|
* This file is part of GNU Radio
|
||||||
*
|
*
|
||||||
|
@ -19,10 +19,10 @@
|
||||||
* Boston, MA 02110-1301, USA.
|
* Boston, MA 02110-1301, USA.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#include <db_flexrf_mimo.h>
|
#include <usrp/db_flexrf_mimo.h>
|
||||||
#include <fpga_regs_standard.h>
|
#include <fpga_regs_standard.h>
|
||||||
#include <fpga_regs_common.h>
|
#include <fpga_regs_common.h>
|
||||||
#include <usrp_prims.h>
|
#include <usrp/usrp_prims.h>
|
||||||
#include <usrp_spi_defs.h>
|
#include <usrp_spi_defs.h>
|
||||||
|
|
||||||
|
|
|
@ -18,7 +18,7 @@
|
||||||
// the Free Software Foundation, Inc., 51 Franklin Street,
|
// the Free Software Foundation, Inc., 51 Franklin Street,
|
||||||
// Boston, MA 02110-1301, USA.
|
// Boston, MA 02110-1301, USA.
|
||||||
|
|
||||||
#include <db_tv_rx.h>
|
#include <usrp/db_tv_rx.h>
|
||||||
#include <db_base_impl.h>
|
#include <db_base_impl.h>
|
||||||
|
|
||||||
/*****************************************************************************/
|
/*****************************************************************************/
|
|
@ -18,7 +18,7 @@
|
||||||
// the Free Software Foundation, Inc., 51 Franklin Street,
|
// the Free Software Foundation, Inc., 51 Franklin Street,
|
||||||
// Boston, MA 02110-1301, USA.
|
// Boston, MA 02110-1301, USA.
|
||||||
|
|
||||||
#include <db_xcvr2450.h>
|
#include <usrp/db_xcvr2450.h>
|
||||||
#include <db_base_impl.h>
|
#include <db_base_impl.h>
|
||||||
#include <cmath>
|
#include <cmath>
|
||||||
#include <boost/thread.hpp>
|
#include <boost/thread.hpp>
|
|
@ -25,7 +25,7 @@ def gen_dbid_py(r):
|
||||||
f.write('%-16s = %s\n' % (x[1], x[2]))
|
f.write('%-16s = %s\n' % (x[1], x[2]))
|
||||||
|
|
||||||
def gen_dbid_h(r):
|
def gen_dbid_h(r):
|
||||||
f = open('usrp_dbid.h', 'w')
|
f = open('../include/usrp/usrp_dbid.h', 'w')
|
||||||
comment_char = '//'
|
comment_char = '//'
|
||||||
write_header(f, comment_char)
|
write_header(f, comment_char)
|
||||||
f.write(comment_char); f.write('\n')
|
f.write(comment_char); f.write('\n')
|
||||||
|
@ -64,8 +64,8 @@ def gen_dbid_cc(r):
|
||||||
* Boston, MA 02110-1301, USA.
|
* Boston, MA 02110-1301, USA.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#include <usrp_prims.h>
|
#include <usrp/usrp_prims.h>
|
||||||
#include <usrp_dbid.h>
|
#include <usrp/usrp_dbid.h>
|
||||||
#include <stdio.h>
|
#include <stdio.h>
|
||||||
|
|
||||||
#define NELEM(x) sizeof(x)/sizeof(x[0])
|
#define NELEM(x) sizeof(x)/sizeof(x[0])
|
|
@ -1,196 +0,0 @@
|
||||||
#
|
|
||||||
# USRP - Universal Software Radio Peripheral
|
|
||||||
#
|
|
||||||
# Copyright (C) 2003,2004,2006,2007,2008,2009 Free Software Foundation, Inc.
|
|
||||||
#
|
|
||||||
# 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
|
|
||||||
# the Free Software Foundation; either version 3 of the License, or
|
|
||||||
# (at your option) any later version.
|
|
||||||
#
|
|
||||||
# This program is distributed in the hope that it will be useful,
|
|
||||||
# but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
||||||
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
||||||
# GNU General Public License for more details.
|
|
||||||
#
|
|
||||||
# You should have received a copy of the GNU General Public License
|
|
||||||
# along with this program; if not, write to the Free Software
|
|
||||||
# Foundation, Inc., 51 Franklin Street, Boston, MA 02110-1301 USA
|
|
||||||
#
|
|
||||||
|
|
||||||
include $(top_srcdir)/Makefile.common
|
|
||||||
|
|
||||||
common_INCLUDES = $(USRP_INCLUDES)
|
|
||||||
|
|
||||||
lib_LTLIBRARIES = libusrp.la
|
|
||||||
|
|
||||||
libusrp_la_common_LDFLAGS = $(NO_UNDEFINED) -version-info 0:0:0 $(BOOST_LDFLAGS)
|
|
||||||
|
|
||||||
libusrp_la_common_LIBADD = \
|
|
||||||
$(USB_LIBS) \
|
|
||||||
$(BOOST_THREAD_LIB) \
|
|
||||||
../../misc/libmisc.la
|
|
||||||
|
|
||||||
# darwin fusb requires omnithreads
|
|
||||||
if FUSB_TECH_darwin
|
|
||||||
AM_CPPFLAGS = $(common_INCLUDES) $(OMNITHREAD_INCLUDES) $(BOOST_CPPFLAGS) $(WITH_INCLUDES)
|
|
||||||
libusrp_la_LIBADD = $(libusrp_la_common_LIBADD) $(OMNITHREAD_LA)
|
|
||||||
libusrp_la_LDFLAGS = $(libusrp_la_common_LDFLAGS) -framework CoreFoundation
|
|
||||||
else
|
|
||||||
AM_CPPFLAGS = $(common_INCLUDES) $(BOOST_CPPFLAGS) $(WITH_INCLUDES)
|
|
||||||
libusrp_la_LIBADD = $(libusrp_la_common_LIBADD)
|
|
||||||
libusrp_la_LDFLAGS = $(libusrp_la_common_LDFLAGS)
|
|
||||||
endif
|
|
||||||
|
|
||||||
EXTRA_DIST = \
|
|
||||||
std_paths.h.in \
|
|
||||||
usrp_dbid.dat
|
|
||||||
|
|
||||||
BUILT_SOURCES = \
|
|
||||||
usrp_dbid.h
|
|
||||||
|
|
||||||
BUILT_SOURCES += usrp_dbid.cc \
|
|
||||||
usrp_dbid.py
|
|
||||||
|
|
||||||
# ----------------------------------------------------------------
|
|
||||||
# FUSB_TECH is set at configure time by way of
|
|
||||||
# usrp/config/usrp_fusb_tech.m4.
|
|
||||||
# It indicates which fast usb strategy we should be building.
|
|
||||||
# We currently implement "generic", "darwin", "win32" and "linux"
|
|
||||||
|
|
||||||
|
|
||||||
generic_CODE = \
|
|
||||||
fusb_generic.cc \
|
|
||||||
fusb_sysconfig_generic.cc
|
|
||||||
|
|
||||||
darwin_CODE = \
|
|
||||||
fusb_darwin.cc \
|
|
||||||
fusb_sysconfig_darwin.cc \
|
|
||||||
README_OSX \
|
|
||||||
circular_buffer.h \
|
|
||||||
circular_linked_list.h \
|
|
||||||
darwin_libusb.h \
|
|
||||||
mld_threads.h
|
|
||||||
|
|
||||||
win32_CODE = \
|
|
||||||
fusb_win32.cc \
|
|
||||||
fusb_sysconfig_win32.cc
|
|
||||||
|
|
||||||
linux_CODE = \
|
|
||||||
fusb_linux.cc \
|
|
||||||
fusb_sysconfig_linux.cc
|
|
||||||
|
|
||||||
ra_wb_CODE = \
|
|
||||||
fusb_ra_wb.cc \
|
|
||||||
fusb_sysconfig_ra_wb.cc
|
|
||||||
|
|
||||||
|
|
||||||
#
|
|
||||||
# include each <foo>_CODE entry here...
|
|
||||||
#
|
|
||||||
EXTRA_libusrp_la_SOURCES = \
|
|
||||||
$(generic_CODE) \
|
|
||||||
$(darwin_CODE) \
|
|
||||||
$(win32_CODE) \
|
|
||||||
$(linux_CODE) \
|
|
||||||
$(ra_wb_CODE)
|
|
||||||
|
|
||||||
|
|
||||||
# work around automake deficiency
|
|
||||||
libusrp_la_common_SOURCES = \
|
|
||||||
fusb.cc \
|
|
||||||
md5.c \
|
|
||||||
usrp_basic.cc \
|
|
||||||
usrp_config.cc \
|
|
||||||
usrp_dbid.cc \
|
|
||||||
usrp_local_sighandler.cc \
|
|
||||||
usrp_prims.cc \
|
|
||||||
usrp_standard.cc \
|
|
||||||
db_boards.cc \
|
|
||||||
db_base.cc \
|
|
||||||
db_basic.cc \
|
|
||||||
db_tv_rx.cc \
|
|
||||||
db_flexrf.cc \
|
|
||||||
db_flexrf_mimo.cc \
|
|
||||||
db_dbs_rx.cc \
|
|
||||||
db_xcvr2450.cc \
|
|
||||||
db_dtt754.cc \
|
|
||||||
db_dtt768.cc \
|
|
||||||
db_util.cc
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
if FUSB_TECH_generic
|
|
||||||
libusrp_la_SOURCES = $(libusrp_la_common_SOURCES) $(generic_CODE)
|
|
||||||
endif
|
|
||||||
|
|
||||||
if FUSB_TECH_darwin
|
|
||||||
libusrp_la_SOURCES = $(libusrp_la_common_SOURCES) $(darwin_CODE)
|
|
||||||
endif
|
|
||||||
|
|
||||||
if FUSB_TECH_win32
|
|
||||||
libusrp_la_SOURCES = $(libusrp_la_common_SOURCES) $(win32_CODE)
|
|
||||||
endif
|
|
||||||
|
|
||||||
if FUSB_TECH_linux
|
|
||||||
libusrp_la_SOURCES = $(libusrp_la_common_SOURCES) $(linux_CODE)
|
|
||||||
endif
|
|
||||||
|
|
||||||
if FUSB_TECH_ra_wb
|
|
||||||
libusrp_la_SOURCES = $(libusrp_la_common_SOURCES) $(ra_wb_CODE)
|
|
||||||
endif
|
|
||||||
|
|
||||||
include_HEADERS = \
|
|
||||||
db_base.h \
|
|
||||||
db_basic.h \
|
|
||||||
db_dbs_rx.h \
|
|
||||||
db_dtt754.h \
|
|
||||||
db_dtt768.h \
|
|
||||||
db_flexrf.h \
|
|
||||||
db_flexrf_mimo.h \
|
|
||||||
db_tv_rx.h \
|
|
||||||
db_util.h \
|
|
||||||
db_xcvr2450.h \
|
|
||||||
usrp_basic.h \
|
|
||||||
usrp_bytesex.h \
|
|
||||||
usrp_config.h \
|
|
||||||
usrp_dbid.h \
|
|
||||||
usrp_prims.h \
|
|
||||||
usrp_slots.h \
|
|
||||||
usrp_standard.h \
|
|
||||||
usrp_subdev_spec.h \
|
|
||||||
usrp_tune_result.h
|
|
||||||
|
|
||||||
noinst_HEADERS = \
|
|
||||||
ad9862.h \
|
|
||||||
db_base_impl.h \
|
|
||||||
db_boards.h \
|
|
||||||
db_wbx.h \
|
|
||||||
fusb.h \
|
|
||||||
fusb_darwin.h \
|
|
||||||
fusb_generic.h \
|
|
||||||
fusb_linux.h \
|
|
||||||
fusb_ra_wb.h \
|
|
||||||
fusb_win32.h \
|
|
||||||
md5.h \
|
|
||||||
rate_to_regval.h \
|
|
||||||
usrp_local_sighandler.h
|
|
||||||
|
|
||||||
if PYTHON
|
|
||||||
usrppython_PYTHON = \
|
|
||||||
usrp_dbid.py
|
|
||||||
|
|
||||||
noinst_PYTHON = \
|
|
||||||
gen_usrp_dbid.py \
|
|
||||||
check_data.py \
|
|
||||||
dump_data.py
|
|
||||||
|
|
||||||
swiginclude_HEADERS = db_base.i
|
|
||||||
endif
|
|
||||||
|
|
||||||
# common way for generating sources from templates when using
|
|
||||||
# BUILT_SOURCES, using parallel build protection.
|
|
||||||
gen_sources = $(BUILT_SOURCES)
|
|
||||||
gen_sources_deps = gen_usrp_dbid.py usrp_dbid.dat
|
|
||||||
par_gen_command = PYTHONPATH=$(top_srcdir)/usrp/src srcdir=$(srcdir) $(PYTHON) $(srcdir)/gen_usrp_dbid.py $(srcdir)/usrp_dbid.dat
|
|
||||||
include $(top_srcdir)/Makefile.par.gen
|
|
|
@ -1,6 +1,6 @@
|
||||||
/* -*- c++ -*- */
|
/* -*- c++ -*- */
|
||||||
/*
|
/*
|
||||||
* Copyright 2003,2004,2008 Free Software Foundation, Inc.
|
* Copyright 2003,2004,2008,2009 Free Software Foundation, Inc.
|
||||||
*
|
*
|
||||||
* This file is part of GNU Radio
|
* This file is part of GNU Radio
|
||||||
*
|
*
|
||||||
|
@ -24,8 +24,8 @@
|
||||||
#include "config.h"
|
#include "config.h"
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#include "usrp_basic.h"
|
#include <usrp/usrp_basic.h>
|
||||||
#include "usrp_prims.h"
|
#include "usrp/usrp_prims.h"
|
||||||
#include "usrp_interfaces.h"
|
#include "usrp_interfaces.h"
|
||||||
#include "fpga_regs_common.h"
|
#include "fpga_regs_common.h"
|
||||||
#include "fpga_regs_standard.h"
|
#include "fpga_regs_standard.h"
|
|
@ -1,6 +1,6 @@
|
||||||
/* -*- c++ -*- */
|
/* -*- c++ -*- */
|
||||||
/*
|
/*
|
||||||
* Copyright 2004 Free Software Foundation, Inc.
|
* Copyright 2004,2009 Free Software Foundation, Inc.
|
||||||
*
|
*
|
||||||
* This file is part of GNU Radio
|
* This file is part of GNU Radio
|
||||||
*
|
*
|
||||||
|
@ -29,7 +29,7 @@
|
||||||
#include "config.h"
|
#include "config.h"
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#include <usrp_local_sighandler.h>
|
#include <usrp/usrp_local_sighandler.h>
|
||||||
#include <stdexcept>
|
#include <stdexcept>
|
||||||
#include <stdio.h>
|
#include <stdio.h>
|
||||||
#include <string.h>
|
#include <string.h>
|
|
@ -1,6 +1,6 @@
|
||||||
/* -*- c++ -*- */
|
/* -*- c++ -*- */
|
||||||
/*
|
/*
|
||||||
* Copyright 2003,2004,2006 Free Software Foundation, Inc.
|
* Copyright 2003,2004,2006,2009 Free Software Foundation, Inc.
|
||||||
*
|
*
|
||||||
* This file is part of GNU Radio
|
* This file is part of GNU Radio
|
||||||
*
|
*
|
||||||
|
@ -24,7 +24,7 @@
|
||||||
#include "config.h"
|
#include "config.h"
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#include "usrp_prims.h"
|
#include "usrp/usrp_prims.h"
|
||||||
#include "usrp_commands.h"
|
#include "usrp_commands.h"
|
||||||
#include "usrp_ids.h"
|
#include "usrp_ids.h"
|
||||||
#include "usrp_i2c_addr.h"
|
#include "usrp_i2c_addr.h"
|
|
@ -1,6 +1,6 @@
|
||||||
/* -*- c++ -*- */
|
/* -*- c++ -*- */
|
||||||
/*
|
/*
|
||||||
* Copyright 2004,2008 Free Software Foundation, Inc.
|
* Copyright 2004,2008,2009 Free Software Foundation, Inc.
|
||||||
*
|
*
|
||||||
* This file is part of GNU Radio
|
* This file is part of GNU Radio
|
||||||
*
|
*
|
||||||
|
@ -20,9 +20,9 @@
|
||||||
* Boston, MA 02110-1301, USA.
|
* Boston, MA 02110-1301, USA.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#include <usrp_standard.h>
|
#include <usrp/usrp_standard.h>
|
||||||
|
|
||||||
#include "usrp_prims.h"
|
#include "usrp/usrp_prims.h"
|
||||||
#include "fpga_regs_common.h"
|
#include "fpga_regs_common.h"
|
||||||
#include "fpga_regs_standard.h"
|
#include "fpga_regs_standard.h"
|
||||||
#include <stdexcept>
|
#include <stdexcept>
|
|
@ -1,6 +1,6 @@
|
||||||
/* -*- c++ -*- */
|
/* -*- c++ -*- */
|
||||||
/*
|
/*
|
||||||
* Copyright 2003,2004 Free Software Foundation, Inc.
|
* Copyright 2003,2004,2009 Free Software Foundation, Inc.
|
||||||
*
|
*
|
||||||
* This file is part of GNU Radio
|
* This file is part of GNU Radio
|
||||||
*
|
*
|
||||||
|
@ -36,7 +36,7 @@
|
||||||
|
|
||||||
|
|
||||||
%{
|
%{
|
||||||
#include <usrp_prims.h>
|
#include <usrp/usrp_prims.h>
|
||||||
%}
|
%}
|
||||||
|
|
||||||
|
|
||||||
|
|
Some files were not shown because too many files have changed in this diff Show More
Loading…
Reference in New Issue