Changeset 7817

Timestamp:

02/24/08 12:07:53

Author:

jcorgan

Message:

Applied changesets r7718 and r7740 on trunk to release branch.

Files:

• gnuradio/branches/releases/3.1/config/Makefile.am (modified) (1 diff)
• gnuradio/branches/releases/3.1/config/grc_gr_gpio.m4 (copied) (copied from gnuradio/trunk/config/grc_gr_gpio.m4)
• gnuradio/branches/releases/3.1/configure.ac (modified) (1 diff)
• gnuradio/branches/releases/3.1/gr-gpio (copied) (copied from gnuradio/trunk/gr-gpio)
• gnuradio/branches/releases/3.1/gr-gpio/Makefile.am (copied) (copied from gnuradio/trunk/gr-gpio/Makefile.am)
• gnuradio/branches/releases/3.1/gr-gpio/src (copied) (copied from gnuradio/trunk/gr-gpio/src)
• gnuradio/branches/releases/3.1/gr-gpio/src/Makefile.am (copied) (copied from gnuradio/trunk/gr-gpio/src/Makefile.am)
• gnuradio/branches/releases/3.1/gr-gpio/src/fpga (copied) (copied from gnuradio/trunk/gr-gpio/src/fpga)
• gnuradio/branches/releases/3.1/gr-gpio/src/fpga/Makefile.am (copied) (copied from gnuradio/trunk/gr-gpio/src/fpga/Makefile.am)
• gnuradio/branches/releases/3.1/gr-gpio/src/fpga/include (copied) (copied from gnuradio/trunk/gr-gpio/src/fpga/include)
• gnuradio/branches/releases/3.1/gr-gpio/src/fpga/include/Makefile.am (copied) (copied from gnuradio/trunk/gr-gpio/src/fpga/include/Makefile.am)
• gnuradio/branches/releases/3.1/gr-gpio/src/fpga/include/common_config_2rxhb_2txdig.vh (copied) (copied from gnuradio/trunk/gr-gpio/src/fpga/include/common_config_2rxhb_2txdig.vh)
• gnuradio/branches/releases/3.1/gr-gpio/src/fpga/include/common_config_bottom.vh (copied) (copied from gnuradio/trunk/gr-gpio/src/fpga/include/common_config_bottom.vh)
• gnuradio/branches/releases/3.1/gr-gpio/src/fpga/lib (copied) (copied from gnuradio/trunk/gr-gpio/src/fpga/lib)
• gnuradio/branches/releases/3.1/gr-gpio/src/fpga/lib/Makefile.am (copied) (copied from gnuradio/trunk/gr-gpio/src/fpga/lib/Makefile.am)
• gnuradio/branches/releases/3.1/gr-gpio/src/fpga/lib/gpio_input.v (copied) (copied from gnuradio/trunk/gr-gpio/src/fpga/lib/gpio_input.v)
• gnuradio/branches/releases/3.1/gr-gpio/src/fpga/lib/io_pins.v (copied) (copied from gnuradio/trunk/gr-gpio/src/fpga/lib/io_pins.v)
• gnuradio/branches/releases/3.1/gr-gpio/src/fpga/lib/rx_chain_dig.v (copied) (copied from gnuradio/trunk/gr-gpio/src/fpga/lib/rx_chain_dig.v)
• gnuradio/branches/releases/3.1/gr-gpio/src/fpga/lib/tx_chain_dig.v (copied) (copied from gnuradio/trunk/gr-gpio/src/fpga/lib/tx_chain_dig.v)
• gnuradio/branches/releases/3.1/gr-gpio/src/fpga/top (copied) (copied from gnuradio/trunk/gr-gpio/src/fpga/top)
• gnuradio/branches/releases/3.1/gr-gpio/src/fpga/top/Makefile.am (copied) (copied from gnuradio/trunk/gr-gpio/src/fpga/top/Makefile.am) (2 diffs)
• gnuradio/branches/releases/3.1/gr-gpio/src/fpga/top/config.vh (copied) (copied from gnuradio/trunk/gr-gpio/src/fpga/top/config.vh)
• gnuradio/branches/releases/3.1/gr-gpio/src/fpga/top/usrp_gpio.csf (copied) (copied from gnuradio/trunk/gr-gpio/src/fpga/top/usrp_gpio.csf)
• gnuradio/branches/releases/3.1/gr-gpio/src/fpga/top/usrp_gpio.esf (copied) (copied from gnuradio/trunk/gr-gpio/src/fpga/top/usrp_gpio.esf)
• gnuradio/branches/releases/3.1/gr-gpio/src/fpga/top/usrp_gpio.psf (copied) (copied from gnuradio/trunk/gr-gpio/src/fpga/top/usrp_gpio.psf)
• gnuradio/branches/releases/3.1/gr-gpio/src/fpga/top/usrp_gpio.qpf (copied) (copied from gnuradio/trunk/gr-gpio/src/fpga/top/usrp_gpio.qpf)
• gnuradio/branches/releases/3.1/gr-gpio/src/fpga/top/usrp_gpio.qsf (copied) (copied from gnuradio/trunk/gr-gpio/src/fpga/top/usrp_gpio.qsf)
• gnuradio/branches/releases/3.1/gr-gpio/src/fpga/top/usrp_gpio.rbf (copied) (copied from gnuradio/trunk/gr-gpio/src/fpga/top/usrp_gpio.rbf)
• gnuradio/branches/releases/3.1/gr-gpio/src/fpga/top/usrp_gpio.v (copied) (copied from gnuradio/trunk/gr-gpio/src/fpga/top/usrp_gpio.v)
• gnuradio/branches/releases/3.1/gr-gpio/src/lib (copied) (copied from gnuradio/trunk/gr-gpio/src/lib)
• gnuradio/branches/releases/3.1/gr-gpio/src/lib/Makefile.am (copied) (copied from gnuradio/trunk/gr-gpio/src/lib/Makefile.am)
• gnuradio/branches/releases/3.1/gr-gpio/src/lib/gpio.i (copied) (copied from gnuradio/trunk/gr-gpio/src/lib/gpio.i)
• gnuradio/branches/releases/3.1/gr-gpio/src/lib/gpio_and_const_ss.cc (copied) (copied from gnuradio/trunk/gr-gpio/src/lib/gpio_and_const_ss.cc)
• gnuradio/branches/releases/3.1/gr-gpio/src/lib/gpio_and_const_ss.h (copied) (copied from gnuradio/trunk/gr-gpio/src/lib/gpio_and_const_ss.h)
• gnuradio/branches/releases/3.1/gr-gpio/src/python (copied) (copied from gnuradio/trunk/gr-gpio/src/python)
• gnuradio/branches/releases/3.1/gr-gpio/src/python/Makefile.am (copied) (copied from gnuradio/trunk/gr-gpio/src/python/Makefile.am)
• gnuradio/branches/releases/3.1/gr-gpio/src/python/__init__.py (copied) (copied from gnuradio/trunk/gr-gpio/src/python/__init__.py)
• gnuradio/branches/releases/3.1/gr-gpio/src/python/gpio.py (copied) (copied from gnuradio/trunk/gr-gpio/src/python/gpio.py)
• gnuradio/branches/releases/3.1/gr-gpio/src/python/gpio_rx_sfile.py (copied) (copied from gnuradio/trunk/gr-gpio/src/python/gpio_rx_sfile.py)
• gnuradio/branches/releases/3.1/gr-gpio/src/python/gpio_usrp_fft.py (copied) (copied from gnuradio/trunk/gr-gpio/src/python/gpio_usrp_fft.py)
• gnuradio/branches/releases/3.1/gr-gpio/src/python/gpio_usrp_siggen.py (copied) (copied from gnuradio/trunk/gr-gpio/src/python/gpio_usrp_siggen.py)
• gnuradio/branches/releases/3.1/gr-gpio/src/python/qa_gpio.py (copied) (copied from gnuradio/trunk/gr-gpio/src/python/qa_gpio.py)
• gnuradio/branches/releases/3.1/gr-gpio/src/python/run_tests.in (copied) (copied from gnuradio/trunk/gr-gpio/src/python/run_tests.in)

gnuradio/branches/releases/3.1/config/Makefile.am

@@ -42 +42 @@
-        grc_gr_audio_windows.m4 \
-        grc_gr_comedi.m4 \
+        grc_gr_gpio.m4 \
-        grc_gr_gsm_fr_vocoder.m4 \
-        grc_gr_radar_mono.m4 \

gnuradio/branches/releases/3.1/configure.ac

@@ -216 +216 @@
-GRC_GR_ATSC
-GRC_GR_COMEDI
+GRC_GR_GPIO
-GRC_GR_GSM_FR_VOCODER
-GRC_GR_PAGER

gnuradio/branches/releases/3.1/gr-gpio/src/fpga/top/Makefile.am

@@ -24 +24 @@
-datadir = $(prefix)/share/usrp
-
+datarev2dir = $(datadir)/rev2
+
+datarev4dir = $(datadir)/rev4
+
+datarev2_DATA = usrp_gpio.rbf
+
+datarev4_DATA = usrp_gpio.rbf
+
-RBFS = usrp_gpio.rbf
-
@@ -36 +44 @@
-        $(RBFS)
-
-install-data-local:
-        @for file in $(RBFS); do \
-                echo "$(INSTALL_DATA) -D $(srcdir)/$$file $(DESTDIR)$(datadir)/rev2/$$file"; \
-                $(INSTALL_DATA) -D $(srcdir)/$$file $(DESTDIR)$(datadir)/rev2/$$file; \
-                echo "$(INSTALL_DATA) -D $(srcdir)/$$file $(DESTDIR)$(datadir)/rev4/$$file"; \
-                $(INSTALL_DATA) -D $(srcdir)/$$file $(DESTDIR)$(datadir)/rev4/$$file; \
-        done
-
-uninstall-local:
-        @for file in $(RBFS); do \
-                echo "$(RM) $(DESTDIR)$(datadir)/rev2/$$file"; \
-                $(RM) $(DESTDIR)$(datadir)/rev2/$$file; \
-                echo "$(RM) $(DESTDIR)$(datadir)/rev4/$$file"; \
-                $(RM) $(DESTDIR)$(datadir)/rev4/$$file; \
-        done
-
-
-MOSTLYCLEANFILES =      \
-        db/*            \