Commit Graph

39 Commits

Author SHA1 Message Date
Alexander Huemer ec6adccbbd Extract libusrp, adjust to be buildable standalone
* $ git \
    filter-branch \
    --prune-empty \
    --tree-filter \
    'find \! -path "./usrp/*" -a -type f -delete' \
    HEAD
* Craft custom configure.ac
* Update m4 macros
* Small fixes here and there

The code in doc/, firmware/ and host/swig does _not_ build at the
moment, due to m4 macros not being adhered and is disabled therefore.
2018-01-21 01:30:14 +01:00
Tom Rondeau a75112feb7 Merge branch 'master' of gnuradio.org:gnuradio 2011-03-20 12:31:10 -04:00
Tom Rondeau d694deb33b Fixing missing header file (in prep for future GCC's). ptrdiff_t is defined in stddef.h. 2011-02-27 17:35:05 -05:00
Eric Blossom 6f9d7add08 Regenerated Makefile.swig.gen's 2010-12-03 23:34:24 -08:00
Eric Blossom f0e7635c6a Update .gitignore's 2010-11-24 19:13:33 -08:00
Eric Blossom dc2588910e Major Makefile.am housecleaning. Passes distcheck.
Move all occurrences of swig_built_sources out of Makefile.am's.
Move all SWIG related use of BUILT_SOURCES out of Makefile.am's.
Clean up 'if PYTHON' conditionalization in gr-*

Still left to do: fix Makefile.swig CLEANFILES and no_dist_files
such that they remove exactly the generated files.
2010-11-24 17:29:11 -08:00
Rob Savoye 005c0c55a5 regenerated 2010-11-19 08:07:52 -07:00
Eric Blossom f741fdab2b regenerated 2010-11-16 21:33:50 -08:00
Eric Blossom a52aed2448 regenerated 2010-11-10 13:01:38 -08:00
Rob Savoye 3f60d7f0ee regenerated 2010-11-10 12:15:43 -08:00
Eric Blossom 1b40745d32 additional regenerated files 2010-11-10 12:15:42 -08:00
Eric Blossom 234fd45233 regenerate 2010-11-10 12:13:53 -08:00
Eric Blossom b1f86e8b1a Rengenerate Makefile.swig.gen's 2010-11-10 12:13:53 -08:00
Eric Blossom 347bb61cf1 gitignore swig generated files 2010-11-10 12:10:45 -08:00
Eric Blossom 3699771aa9 Update generated files 2010-11-10 12:10:45 -08:00
Rob Savoye 6f86a68513 regenerated after changes to the template 2010-11-10 12:10:44 -08:00
Michael Dickens c6f56e4d15 rearrange includes to always be: internal GR, external, with GR. 2010-10-09 21:10:10 -04:00
Johnathan Corgan 3e6f8073db Fix missing update from last commit 2009-10-03 12:59:34 -07:00
Johnathan Corgan 56a14554d3 Add required include directory for new header organization 2009-10-01 12:47:24 -07:00
ttsou d71af59344 Integrated more usrp_prims code 2009-09-16 17:08:51 -04:00
Thomas Tsou 6f0d406325 Fixed swig and usrp apps to work with libusb-0.12 and libusb-1.0 plus minor cleanup 2009-09-16 17:08:51 -04:00
ttsou b9a28b9e3e Modify apps and swig to reflect libusb_context use 2009-09-15 18:06:27 -04:00
Johnathan Corgan b9d1da74eb Applied libusb-1.0 patch set from Thomas Tsou <ttsou@vt.edu>:
This patch set updates the usrp to support libusb-1.0. Asynchronous I/O
through libusb is added with fusb_libusb1.*, which is heavily based on
fusb_linux.*. In short, URB's and ioctl calls are replaced with
libusb_transfer structs and native calls. Transfer reaping is handled by
libusb and associated callbacks. I get 32Mb/s on all of my machines using
test_usrp_standard_rx or tx. Due to the API rewrite in 1.0 from 0.12, there
are alot of changes, many are simply name changes.

Known Issues:

Transmit and receive both work, but not at same time
(e.g. usrp_benchmark_usb.py). libusb does not create any internal threads,
so for a single session fusb_libusb1 works in the same manner as
fusb_linux with the callback called at controlled times. With multiple
libusb sessions the callback may occur at any time and threading issues
come into play causing behavior to become undefined. The use of separate
libusb_contexts _might_ solve this issue; I have not had the time to look
into it.
2009-09-15 18:06:27 -04:00
git 2985cbe8aa Added git ignore files auto created from svn:ignore properties.
git-svn-id: http://gnuradio.org/svn/gnuradio/trunk@11592 221aa14e-8319-0410-a670-987f0aec2ac5
2009-08-14 18:10:11 +00:00
jcorgan 707f3cef77 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
2009-07-09 02:55:51 +00:00
jcorgan dca27489c5 Merged r10554:10595 from michaelld/am_swig_4 into trunk. Major overhaul of SWIG usage in build system, also fixes ticket:130. Trunk passes distcheck.
git-svn-id: http://gnuradio.org/svn/gnuradio/trunk@10596 221aa14e-8319-0410-a670-987f0aec2ac5
2009-03-14 02:28:41 +00:00
jcorgan 187055ba6f Merged r10288:10370 from michaelld/swigpythonargs into trunk. Passes distcheck.
git-svn-id: http://gnuradio.org/svn/gnuradio/trunk@10371 221aa14e-8319-0410-a670-987f0aec2ac5
2009-02-02 14:27:28 +00:00
jcorgan 0b7d2189c1 Fix compiler warnings across the tree. Adds --enable-warnings-as-errors configure option. Currently compiles with no warnings with GCC 4.2.3 on Ubuntu 8.04.
git-svn-id: http://gnuradio.org/svn/gnuradio/trunk@9396 221aa14e-8319-0410-a670-987f0aec2ac5
2008-08-24 17:41:07 +00:00
michaelld 2114353a06 Merged build_config branch into trunk:
1) Modified top-level run_tests.sh script:

 a) to execute code for setting or changing the library search path in
    Darwin (DYLD_LIBRARY_PATH) or Windows (PATH) on those host OSs
    only, not on other host OSs.

 b) Added local (to the component making check) library paths to those
    same search paths, since libtool doesn't do it (unlike in Linux).

2) In all AM Makefiles -except those dealing with USRP firmware-,
changes INCLUDES to AM_CPPFLAGS since the former is deprecated.

3) Changed AM_CPPFLAGS to FW_INCLUDES for commands .c.rel in USRP
firmware.



git-svn-id: http://gnuradio.org/svn/gnuradio/trunk@7769 221aa14e-8319-0410-a670-987f0aec2ac5
2008-02-21 19:16:45 +00:00
jcorgan 5c0e77db8e Merged r7478:7608 from michaelld/t186 into trunk. Adds ability to compile GNU Radio modules individually, using already installed dependent libraries and include files. New functionality is enabled using --with-* on configure command line; existing build options should remain unchanged. Nice work by Michael Dickens, still needs documentation update on wiki.
git-svn-id: http://gnuradio.org/svn/gnuradio/trunk@7617 221aa14e-8319-0410-a670-987f0aec2ac5
2008-02-08 23:32:10 +00:00
eb 117ea8a18b Updated license from GPL version 2 or later to GPL version 3 or later.
git-svn-id: http://gnuradio.org/svn/gnuradio/trunk@6044 221aa14e-8319-0410-a670-987f0aec2ac5
2007-07-21 03:44:38 +00:00
eb 87a72fff96 Merged features/inband -r4812:5218 into trunk. This group of changes
includes:

 * working stand-alone mblock code
 * work-in-progress on usrp inband signaling

usrp now depends on mblock, and guile is a dependency.



git-svn-id: http://gnuradio.org/svn/gnuradio/trunk@5221 221aa14e-8319-0410-a670-987f0aec2ac5
2007-05-02 04:08:47 +00:00
eb 0187af8e9e Merged eb/usrp-install r4723:4727 into trunk.
This moves usrp related .py files from the top-level of site-packages
into site-packages/usrpm.


git-svn-id: http://gnuradio.org/svn/gnuradio/trunk@4728 221aa14e-8319-0410-a670-987f0aec2ac5
2007-03-07 01:43:43 +00:00
eb 7a0001d24a Updated FSF address in all files. Fixes ticket:51
git-svn-id: http://gnuradio.org/svn/gnuradio/trunk@3534 221aa14e-8319-0410-a670-987f0aec2ac5
2006-09-13 21:30:04 +00:00
jcorgan 1f153f839e Fixes for ticket:35, allowing use of BSD make instead of GNU make.
git-svn-id: http://gnuradio.org/svn/gnuradio/trunk@3286 221aa14e-8319-0410-a670-987f0aec2ac5
2006-08-15 03:39:14 +00:00
jcorgan fd1313c4db Partial fix for ticket 10 merged into trunk from
branches/developers/jcorgan/ticket-10

As of this merge the trunk and the above branch are identical.


git-svn-id: http://gnuradio.org/svn/gnuradio/trunk@3182 221aa14e-8319-0410-a670-987f0aec2ac5
2006-08-06 04:31:17 +00:00
eb a6ebb4e561 better (read: real) fix for ticket:15
git-svn-id: http://gnuradio.org/svn/gnuradio/trunk@3179 221aa14e-8319-0410-a670-987f0aec2ac5
2006-08-06 02:12:07 +00:00
eb d0bfac4556 fixed ticket:15
git-svn-id: http://gnuradio.org/svn/gnuradio/trunk@3175 221aa14e-8319-0410-a670-987f0aec2ac5
2006-08-05 22:59:44 +00:00
jcorgan 99a9de4013 Houston, we have a trunk.
git-svn-id: http://gnuradio.org/svn/gnuradio/trunk@3122 221aa14e-8319-0410-a670-987f0aec2ac5
2006-08-03 04:51:51 +00:00