summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--Makefile.common11
-rw-r--r--README10
-rw-r--r--README-win32-mingw-short.txt2
-rw-r--r--README.hacking28
-rwxr-xr-xbootstrap1
-rw-r--r--config/Makefile.am9
-rw-r--r--config/grc_gr_utils.m43
-rw-r--r--configure.ac4
-rw-r--r--docs/doxygen/Doxyfile.in31
-rw-r--r--docs/doxygen/other/group_defs.dox3
-rw-r--r--gnuradio-core/src/python/gnuradio/Makefile.am1
-rw-r--r--gnuradio-core/src/python/gnuradio/blks2impl/Makefile.am1
-rw-r--r--gr-atsc/src/python/README6
-rwxr-xr-xgr-atsc/src/python/interp.py3
-rwxr-xr-xgr-atsc/src/python/interp_short.py3
-rw-r--r--gr-howto-write-a-block/config/Makefile.am6
-rw-r--r--grc/grc_gnuradio/README3
-rw-r--r--grc/python/extract_docs.py3
-rw-r--r--grc/todo.txt5
-rw-r--r--gruel/README5
20 files changed, 16 insertions, 122 deletions
diff --git a/Makefile.common b/Makefile.common
index 8faf64586..a4d5817ff 100644
--- a/Makefile.common
+++ b/Makefile.common
@@ -56,13 +56,6 @@ guiledir = $(prefix)/share/guile/site
grpythondir = $(pythondir)/gnuradio
grpyexecdir = $(pyexecdir)/gnuradio
-# Install the non-gnuradio usrp stuff in the appropriate subdirectory
-# This usually ends up at:
-# ${prefix}/lib/python${python_version}/site-packages/usrpm
-
-usrppythondir = $(pythondir)/usrpm
-usrppyexecdir = $(pyexecdir)/usrpm
-
# This used to be set in configure.ac but is now defined here for all
# Makefiles when this fragment is included.
STD_DEFINES_AND_INCLUDES = $(DEFINES) $(GNURADIO_INCLUDES) \
@@ -88,10 +81,6 @@ GRUEL_LA = @gruel_LA@
VOLK_INCLUDES = @volk_INCLUDES@
VOLK_LA = @volk_LA@
-# How to link in the USRP library from inside the tree
-USRP_INCLUDES = @usrp_INCLUDES@
-USRP_LA = @usrp_LA@
-
# GR-DIGITAL includes and libraries
GR_DIGITAL_INCLUDES = @gr_digital_INCLUDES@
GR_DIGITAL_LA = @gr_digital_LA@
diff --git a/README b/README
index 069d32024..ec19307dd 100644
--- a/README
+++ b/README
@@ -61,8 +61,8 @@ How to Build GNU Radio:
On systems using pkgsrc (e.g. NetBSD and Dragonfly), build
meta-packages/gnuradio, which will build a previous release and
force installation of the dependencies. Then pkg_delete the
- gnuradio and usrp packages, which will leave the dependencies.
- (This should also work on OSX.)
+ gnuradio package, which will leave the dependencies. (This
+ should also work on OSX.)
See the wiki at http://gnuradio.org/trac/wiki for details.
@@ -192,11 +192,7 @@ As of repository version 4045, gnuradio requires version 1.3.31 or newer.
(9) SDCC: Small Device C Compiler. http://sdcc.sourceforge.net/
-Use version 2.4.0 or later.
-
-This includes a C compiler and linker for the 8051. It's required to
-build the firmware for the USRP. If you don't have a USRP, don't
-worry about it.
+--> Not required as of v3.5
(10) Guile 1.6 or 1.8
diff --git a/README-win32-mingw-short.txt b/README-win32-mingw-short.txt
index 88338e3b7..9001e9f15 100644
--- a/README-win32-mingw-short.txt
+++ b/README-win32-mingw-short.txt
@@ -86,7 +86,7 @@ make
make install
Now you have a working gnuradio-core
-Now you can go on building and installing gr-audio-windows and windows usrp and wxgui
+Now you can go on building and installing gr-audio-windows and windows and wxgui
remember that all gnuradio and python dlls need to be on your path to use gnuradio
The gnuradio dlls are installed at
/c/Python24/Lib/site-packages:/c/Python24/Lib/site-packages/gnuradio:/c/Python24/Lib/site-packages/gnuradio/gr
diff --git a/README.hacking b/README.hacking
index ff01a0a53..de6358abf 100644
--- a/README.hacking
+++ b/README.hacking
@@ -92,8 +92,6 @@ These are the current package prefixes:
atsc_ Code related to the Advanced Television
Standards Committee HDTV implementation
- usrp_ Universal Software Radio Peripheral
-
qa_ Quality Assurance. Test code.
@@ -220,32 +218,6 @@ into the help string using the "... [default=%default]" syntax.
** Mandatory options by gr_block
-*** USRP source
-
-Any program using a USRP source (usrp.source_*) shall include:
-
- add_option("", "--which-usrp", type="intx", default=0,
- help="select which USRP to use [default=%default]")
-
- add_option("-R", "--rx-subdev-spec", type="subdev", default=(0, 0),
- help="select USRP Rx side A or B [default=A]")
-
-You are free to change the default if it makes sense in your application.
-
-
-*** USRP sink
-
-Any program using a USRP sink (usrp.sink_*) shall include:
-
- add_option("", "--which-usrp", type="intx", default=0,
- help="select which USRP to use [default=%default]")
-
- add_option("-T", "--tx-subdev-spec", type="subdev", default=(0, 0),
- help="select USRP Tx side A or B [default=A]")
-
-You are free to change the default if it makes sense in your application.
-
-
*** Audio source
Any program using an audio source shall include:
diff --git a/bootstrap b/bootstrap
index be511806f..b40afb20c 100755
--- a/bootstrap
+++ b/bootstrap
@@ -30,5 +30,4 @@ automake --add-missing -Wno-portability -Wno-override -Wnone
#automake --add-missing -Wno-portability
# Run bootstrap in any subprojects
-(cd usrp2/firmware ; ./bootstrap)
(cd volk ; ./bootstrap)
diff --git a/config/Makefile.am b/config/Makefile.am
index a6066157e..003a0f6ae 100644
--- a/config/Makefile.am
+++ b/config/Makefile.am
@@ -54,7 +54,6 @@ m4macros = \
grc_gr_comedi.m4 \
grc_gr_noaa.m4 \
grc_gr_trellis.m4 \
- grc_gr_usrp.m4 \
grc_gr_video_sdl.m4 \
grc_gr_vocoder.m4 \
grc_gr_wxgui.m4 \
@@ -62,9 +61,6 @@ m4macros = \
gr_check_createfilemapping.m4 \
gr_check_mc4020.m4 \
gr_check_shm_open.m4 \
- gr_check_usrp.m4 \
- grc_usrp.m4 \
- grc_usrp2.m4 \
gr_doxygen.m4 \
gr_fortran.m4 \
gr_git.m4 \
@@ -90,9 +86,6 @@ m4macros = \
mkstemp.m4 \
onceonly.m4 \
pkg.m4 \
- sdl.m4 \
- usrp_fusb_tech.m4 \
- usrp_libusb.m4 \
- usrp_sdcc.m4
+ sdl.m4
EXTRA_DIST += $(m4macros)
diff --git a/config/grc_gr_utils.m4 b/config/grc_gr_utils.m4
index 7fe07d854..cb71ad18b 100644
--- a/config/grc_gr_utils.m4
+++ b/config/grc_gr_utils.m4
@@ -20,9 +20,8 @@
AC_DEFUN([GRC_GR_UTILS],[
GRC_ENABLE(gr-utils)
- dnl Don't do gr-utils if gnuradio-core, usrp, or gr-wxgui skipped
+ dnl Don't do gr-utils if gnuradio-core or gr-wxgui skipped
GRC_CHECK_DEPENDENCY(gr-utils, gnuradio-core)
- GRC_CHECK_DEPENDENCY(gr-utils, usrp)
GRC_CHECK_DEPENDENCY(gr-utils, gr-wxgui)
AC_CONFIG_FILES([ \
diff --git a/configure.ac b/configure.ac
index bf5404e08..432c398d9 100644
--- a/configure.ac
+++ b/configure.ac
@@ -352,10 +352,6 @@ GRC_GRUEL dnl must come first
GRC_VOLK
GRC_GNURADIO_CORE
GRC_GR_DIGITAL
-GRC_USRP
-GRC_USRP2
-GRC_GR_USRP dnl this must come after GRC_USRP
-GRC_GR_USRP2
GRC_GR_AUDIO
GRC_GR_VOCODER
GRC_GR_ATSC
diff --git a/docs/doxygen/Doxyfile.in b/docs/doxygen/Doxyfile.in
index 0d2d96e20..efdacba32 100644
--- a/docs/doxygen/Doxyfile.in
+++ b/docs/doxygen/Doxyfile.in
@@ -625,47 +625,19 @@ EXCLUDE = @abs_top_builddir@/docs/doxygen/html \
@abs_top_builddir@/gr-audio-alsa/src/audio-alsa.py \
@abs_top_builddir@/gr-audio-oss/src/audio_oss.py \
@abs_top_builddir@/gr-audio-osx/src/test_audio_loop.py \
- @abs_top_builddir@/gr-cvsd-vocoder/src/lib/cvsd_vocoder.py \
- @abs_top_builddir@/gr-cvsd-vocoder/src/python/encdec.py \
@abs_top_builddir@/gr-gsm-fr-vocoder/src/lib/gsm \
@abs_top_builddir@/gr-gsm-fr-vocoder/src/lib/gsm_full_rate.py \
@abs_top_builddir@/gr-gsm-fr-vocoder/src/python/encdec.py \
@abs_top_builddir@/gr-howto-write-a-block \
- @abs_top_builddir@/gr-msdd6000/src/msdd.py \
@abs_top_builddir@/gr-pager/src/pager_swig.py \
@abs_top_builddir@/gr-qtgui \
- @abs_top_builddir@/gr-radar-mono/src/python/usrp_radar_mono.py \
- @abs_top_builddir@/gr-sounder/src/python/usrp_sounder.py \
@abs_top_builddir@/gr-trellis/doc \
@abs_top_builddir@/gr-trellis/src/lib/generate_all.py \
@abs_top_builddir@/gr-trellis/src/lib/generate_trellis.py \
@abs_top_builddir@/gr-trellis/src/lib/trellis.py \
- @abs_top_builddir@/gr-usrp/src/usrp1.py \
- @abs_top_builddir@/gr-usrp2/src/usrp2.py \
@abs_top_builddir@/gr-video-sdl/src/video_sdl.py \
@abs_top_builddir@/gr-wxgui/src/python \
- @abs_top_builddir@/grc \
- @abs_top_builddir@/usrp/doc \
- @abs_top_builddir@/usrp/firmware \
- @abs_top_builddir@/usrp/fpga \
- @abs_top_builddir@/usrp/host/apps \
- @abs_top_builddir@/usrp/host/apps-inband \
- @abs_top_builddir@/usrp/host/lib/inband \
- @abs_top_builddir@/usrp/host/lib/legacy/ad9862.h \
- @abs_top_builddir@/usrp/host/lib/legacy/check_data.py \
- @abs_top_builddir@/usrp/host/lib/legacy/circular_buffer.h \
- @abs_top_builddir@/usrp/host/lib/legacy/circular_linked_list.h \
- @abs_top_builddir@/usrp/host/lib/legacy/db_wbx.h \
- @abs_top_builddir@/usrp/host/lib/legacy/db_wbx.cc \
- @abs_top_builddir@/usrp/host/lib/legacy/dump_data.py \
- @abs_top_builddir@/usrp/host/lib/legacy/gen_usrp_dbid.py \
- @abs_top_builddir@/usrp/host/lib/legacy/usrp_dbid.py \
- @abs_top_builddir@/usrp/host/misc \
- @abs_top_builddir@/usrp/host/swig \
- @abs_top_builddir@/usrp2/firmware \
- @abs_top_srcdir@/usrp2/firmware \
- @abs_top_builddir@/usrp2/fpga \
- @abs_top_srcdir@/usrp2/fpga
+ @abs_top_builddir@/grc
# The EXCLUDE_SYMLINKS tag can be used select whether or not files or
# directories that are symbolic links (a Unix filesystem feature) are excluded
@@ -698,7 +670,6 @@ EXCLUDE_PATTERNS = */.deps/* \
EXCLUDE_SYMBOLS = ad9862 \
numpy \
- usrpm \
*swig* \
*Swig* \
*my_top_block* \
diff --git a/docs/doxygen/other/group_defs.dox b/docs/doxygen/other/group_defs.dox
index 6288d1f0a..b0b1994ff 100644
--- a/docs/doxygen/other/group_defs.dox
+++ b/docs/doxygen/other/group_defs.dox
@@ -68,7 +68,4 @@
/*! @} */
-/*! \defgroup usrp USRP */
-/*! \defgroup usrp2 USRP2 */
-
/*! \defgroup hardware Misc Hardware Control */
diff --git a/gnuradio-core/src/python/gnuradio/Makefile.am b/gnuradio-core/src/python/gnuradio/Makefile.am
index 066cc6d73..ffc171b2d 100644
--- a/gnuradio-core/src/python/gnuradio/Makefile.am
+++ b/gnuradio-core/src/python/gnuradio/Makefile.am
@@ -31,6 +31,5 @@ grpython_PYTHON = \
gr_unittest.py \
gr_xmlrunner.py \
optfir.py \
- usrp_options.py \
window.py
endif
diff --git a/gnuradio-core/src/python/gnuradio/blks2impl/Makefile.am b/gnuradio-core/src/python/gnuradio/blks2impl/Makefile.am
index 5c627b873..eb031cd20 100644
--- a/gnuradio-core/src/python/gnuradio/blks2impl/Makefile.am
+++ b/gnuradio-core/src/python/gnuradio/blks2impl/Makefile.am
@@ -33,7 +33,6 @@ grblkspython_PYTHON = \
filterbank.py \
fm_demod.py \
fm_emph.py \
- generic_usrp.py \
logpwrfft.py \
nbfm_rx.py \
nbfm_tx.py \
diff --git a/gr-atsc/src/python/README b/gr-atsc/src/python/README
index abe0937b5..6c23b46fd 100644
--- a/gr-atsc/src/python/README
+++ b/gr-atsc/src/python/README
@@ -1,13 +1,13 @@
Decoding ATSC using 19.2MSps rate over 5 processes
--------------------------------------------------
-1) Verify signal, adjust antenna and find best gain setting using usrp_fft.py,
-station frequency from the fcc video database, and decimation of 10.
+1) Verify signal, adjust antenna and find best gain setting using uhd_fft.py,
+station frequency from the fcc video database, and sample rate to 6.4e6.
2) Capture data - adjust gain (-g) frequency (-f) and which side
the tvrx is on to fit your local setup:
-usrp_rx_cfile.py -s -R B -d 10 -g 65 -f 503e6 atsc_data_6-4m_complex
+uhd_rx_cfile.py -s --samp-rate=6.4e6 -g 65 -f 503e6 atsc_data_6-4m_complex
You probably still need fast disks to take the data, like a raid-0 set of
striped sata drives. Make sure there are no or very few Ou overruns. Saving
diff --git a/gr-atsc/src/python/interp.py b/gr-atsc/src/python/interp.py
index ad69c6b34..b17b3a312 100755
--- a/gr-atsc/src/python/interp.py
+++ b/gr-atsc/src/python/interp.py
@@ -22,8 +22,7 @@
# This module starts the atsc processing chain taking the captured
# off-air signal created with:
#
-# usrp_rx_cfile.py -R <side with tuner, a or b>
-# -d 10 set decimation to get signal at 6.4e6 rate
+# uhd_rx_cfile.py --samp-rate=6.4e6
# -f <center of tv signal channel freq>
# -g <appropriate gain for best signal / noise>
#
diff --git a/gr-atsc/src/python/interp_short.py b/gr-atsc/src/python/interp_short.py
index 11b169b27..732ca831d 100755
--- a/gr-atsc/src/python/interp_short.py
+++ b/gr-atsc/src/python/interp_short.py
@@ -22,8 +22,7 @@
# This module starts the atsc processing chain taking the captured
# off-air signal created with:
#
-# usrp_rx_cfile.py -R <side with tuner, a or b>
-# -d 10 set decimation to get signal at 6.4e6 rate
+# uhd_rx_cfile.py --samp-rate=6.4e6
# -f <center of tv signal channel freq>
# -g <appropriate gain for best signal / noise>
# -s output shorts
diff --git a/gr-howto-write-a-block/config/Makefile.am b/gr-howto-write-a-block/config/Makefile.am
index aaaf0db7c..7b7e5812e 100644
--- a/gr-howto-write-a-block/config/Makefile.am
+++ b/gr-howto-write-a-block/config/Makefile.am
@@ -46,7 +46,6 @@ m4macros = \
gr_check_createfilemapping.m4 \
gr_check_mc4020.m4 \
gr_check_shm_open.m4 \
- gr_check_usrp.m4 \
gr_doxygen.m4 \
gr_fortran.m4 \
gr_git.m4 \
@@ -72,10 +71,7 @@ m4macros = \
lf_x11.m4 \
mkstemp.m4 \
onceonly.m4 \
- pkg.m4 \
- usrp_fusb_tech.m4 \
- usrp_libusb.m4 \
- usrp_sdcc.m4
+ pkg.m4
# Don't install m4 macros anymore
diff --git a/grc/grc_gnuradio/README b/grc/grc_gnuradio/README
index 5a89da54a..897eed65c 100644
--- a/grc/grc_gnuradio/README
+++ b/grc/grc_gnuradio/README
@@ -7,8 +7,5 @@ The blk2s module wraps many blocks in blks2 and gives them streaming outputs.
Will be phased-out by new message passing implementations.
Other blks2 blocks will hopefully make their way into blks2impl.
-The usrp module contains the simple and dual usrp wrappers.
-Will be phased-out by generic usrp and/or new usrp api.
-
The wxgui module contains a top_block + wxgui frame.
Will be phased-out by gui.py in wxgui and a new top block template.
diff --git a/grc/python/extract_docs.py b/grc/python/extract_docs.py
index be55fd239..fe157a221 100644
--- a/grc/python/extract_docs.py
+++ b/grc/python/extract_docs.py
@@ -26,7 +26,7 @@ DOXYGEN_NAME_XPATH = '/doxygen/compounddef/compoundname'
DOXYGEN_BRIEFDESC_GR_XPATH = '/doxygen/compounddef/briefdescription'
DOXYGEN_DETAILDESC_GR_XPATH = '/doxygen/compounddef/detaileddescription'
-GROUP_KEYS = "gr|usrp2|trellis|noaa|vocoder|digital"
+GROUP_KEYS = "gr|trellis|noaa|vocoder|digital"
def extract_txt(xml):
"""
@@ -65,7 +65,6 @@ def _extract(key):
#extract descriptions
comp_name = extract_txt(xml.xpath(DOXYGEN_NAME_XPATH)[0]).strip()
comp_name = ' --- ' + comp_name + ' --- '
-# if re.match('(gr|usrp2|trellis|noaa)_.*', key):
if re.match(('(%s)_.*' % GROUP_KEYS), key):
brief_desc = extract_txt(xml.xpath(DOXYGEN_BRIEFDESC_GR_XPATH)[0]).strip()
detailed_desc = extract_txt(xml.xpath(DOXYGEN_DETAILDESC_GR_XPATH)[0]).strip()
diff --git a/grc/todo.txt b/grc/todo.txt
index 9dad05730..ccfaad72a 100644
--- a/grc/todo.txt
+++ b/grc/todo.txt
@@ -9,19 +9,14 @@
##################################################
* probe: also non-float outputs
* log slider gui control
-* generic usrp (when its ready)
* packet mod: whitening offset
* wx min window size in options block
* gr_adaptive_fir_ccf
* ofdm
* gr_ofdm_bpsk_demapper
- * gr_ofdm_cyclic_prefixer
* gr_ofdm_demapper_vcb
- * gr_ofdm_frame_acquisition
* gr_ofdm_frame_sink
- * gr_ofdm_insert_preamble
* gr_ofdm_mapper_bcv
- * gr_ofdm_sampler
* size params for the graphical sinks
* callbacks for set average on fft, waterfall, number sinks
* add units to params: Sps, Hz, dB...
diff --git a/gruel/README b/gruel/README
index 585cf026a..647dc843b 100644
--- a/gruel/README
+++ b/gruel/README
@@ -22,9 +22,8 @@
The GNU Radio Utility Etcetera Library, a collection of low-level routines
to avoid dependencies on the full GNU Radio core or other libraries.
-Over time, some code from libgnuradio-core, libpmt, libmblock, libusrp,
-and libusrp2 will migrate here, to avoid duplication of code and simplify
-dependencies.
+Over time, some code from libgnuradio-core and libpmt will migrate
+here, to avoid duplication of code and simplify dependencies.
By design, this library will not have dependencies on any other part
of GNU Radio, but may have external dependencies such as Boost.
generated by cgit (git 2.34.1) at 2025-05-14 03:03:57 +0000