[Commit-gnuradio] r7926 - in gnuradio/branches/features/inband-usb/usrp/host: apps-inband lib/inband

[gnychis]

Author: gnychis
Date: 2008-03-04 18:46:34 -0700 (Tue, 04 Mar 2008)
New Revision: 7926

Removed:
   gnuradio/branches/features/inband-usb/usrp/host/apps-inband/gmac.cc
   gnuradio/branches/features/inband-usb/usrp/host/apps-inband/gmac.h
   gnuradio/branches/features/inband-usb/usrp/host/apps-inband/gmac.mbh
   gnuradio/branches/features/inband-usb/usrp/host/apps-inband/gmac_symbols.h
   gnuradio/branches/features/inband-usb/usrp/host/apps-inband/test_gmac_tx.cc
Modified:
   gnuradio/branches/features/inband-usb/usrp/host/apps-inband/Makefile.am
   gnuradio/branches/features/inband-usb/usrp/host/lib/inband/usrp_rx.cc
Log:
Merging -r7924:7925 from developers/gnychis/inband

Removing default to disk write on RX

Removing GMAC from main branch, as its not a critical test application, more of
an example application.  Developing outside of GR SVN, once done it can possibly
be pushed in as a complete example MAC.


Modified: 
gnuradio/branches/features/inband-usb/usrp/host/apps-inband/Makefile.am
===================================================================
--- gnuradio/branches/features/inband-usb/usrp/host/apps-inband/Makefile.am     
2008-03-05 01:43:36 UTC (rev 7925)
+++ gnuradio/branches/features/inband-usb/usrp/host/apps-inband/Makefile.am     
2008-03-05 01:46:34 UTC (rev 7926)
@@ -38,29 +38,13 @@
        test_usrp_inband_timestamps     \
        test_usrp_inband_overrun        \
        test_usrp_inband_underrun       \
-       test_gmac_tx                    \
        read_packets
 
 noinst_HEADERS =                       \
        ui_nco.h                        \
-       ui_sincos.h                     \
-       gmac.h                          \
-       gmac_symbols.h                  
+       ui_sincos.h     
 
 
-EXTRA_DIST =                           \
-       gmac.mbh
-
-#------------------------------------------------------------------
-# Build gmac sources
-
-BUILT_SOURCES =                                \
-       gmac_mbh.cc
-
-gmac_mbh.cc : gmac.mbh
-       $(COMPILE_MBH) $(srcdir)/gmac.mbh gmac_mbh.cc
-
-
 test_usrp_inband_ping_SOURCES  = test_usrp_inband_ping.cc 
 test_usrp_inband_ping_LDADD    = $(USRP_LA) $(USRP_INBAND_LA)
 
@@ -88,8 +72,5 @@
 test_usrp_inband_2rx_SOURCES   = test_usrp_inband_2rx.cc ui_sincos.c
 test_usrp_inband_2rx_LDADD     = $(USRP_LA) $(USRP_INBAND_LA)
 
-test_gmac_tx_SOURCES   = test_gmac_tx.cc gmac.cc gmac_mbh.cc ui_sincos.c
-test_gmac_tx_LDADD     = $(USRP_LA) $(USRP_INBAND_LA)
-
 read_packets_SOURCES = read_packets.cc
 read_packets_LDADD = $(USRP_LA) $(USRP_INBAND_LA)

Deleted: gnuradio/branches/features/inband-usb/usrp/host/apps-inband/gmac.cc

Deleted: gnuradio/branches/features/inband-usb/usrp/host/apps-inband/gmac.h

Deleted: gnuradio/branches/features/inband-usb/usrp/host/apps-inband/gmac.mbh

Deleted: 
gnuradio/branches/features/inband-usb/usrp/host/apps-inband/gmac_symbols.h

Deleted: 
gnuradio/branches/features/inband-usb/usrp/host/apps-inband/test_gmac_tx.cc

Modified: gnuradio/branches/features/inband-usb/usrp/host/lib/inband/usrp_rx.cc
===================================================================
--- gnuradio/branches/features/inband-usb/usrp/host/lib/inband/usrp_rx.cc       
2008-03-05 01:43:36 UTC (rev 7925)
+++ gnuradio/branches/features/inband-usb/usrp/host/lib/inband/usrp_rx.cc       
2008-03-05 01:46:34 UTC (rev 7926)
@@ -44,7 +44,7 @@
 
 usrp_rx::usrp_rx(mb_runtime *rt, const std::string &instance_name, pmt_t 
user_arg)
   : mb_mblock(rt, instance_name, user_arg),
-    d_disk_write(true),
+    d_disk_write(false),
     d_disk_write_pkt(false)   // if true, writes full packet, else just the 
payload
 {
   d_cs = define_port("cs", "usrp-rx-cs", true, mb_port::EXTERNAL);