[Commit-gnuradio] r9878 - gnuradio/trunk/usrp2/firmware/apps

[eb]

Author: eb
Date: 2008-10-27 10:36:52 -0600 (Mon, 27 Oct 2008)
New Revision: 9878

Removed:
   gnuradio/trunk/usrp2/firmware/apps/rx_only_v2.c
   gnuradio/trunk/usrp2/firmware/apps/tx_only_v2.c
Modified:
   gnuradio/trunk/usrp2/firmware/apps/Makefile.am
   gnuradio/trunk/usrp2/firmware/apps/app_common_v2.c
   gnuradio/trunk/usrp2/firmware/apps/app_common_v2.h
   gnuradio/trunk/usrp2/firmware/apps/factory_test.c
   gnuradio/trunk/usrp2/firmware/apps/serdes_txrx.c
   gnuradio/trunk/usrp2/firmware/apps/txrx.c
Log:
Fix (actually a bit of a kludge) for the frequency setting while
streaming problem.  You can now set the frequency in usrp2_fft.py
while streaming without dying :-)



Modified: gnuradio/trunk/usrp2/firmware/apps/Makefile.am
===================================================================
--- gnuradio/trunk/usrp2/firmware/apps/Makefile.am      2008-10-27 16:33:14 UTC 
(rev 9877)
+++ gnuradio/trunk/usrp2/firmware/apps/Makefile.am      2008-10-27 16:36:52 UTC 
(rev 9878)
@@ -31,7 +31,6 @@
        ibs_rx_test \
        ibs_tx_test \
        rcv_eth_packets \
-       rx_only_v2 \
        read_dbids \
        set_hw_rev \
        test1 \
@@ -44,7 +43,6 @@
        test_lsdac \
        test_serdes \
        timer_test \
-       tx_only_v2 \
        tx_standalone \
        txrx \
        factory_test \
@@ -56,8 +54,6 @@
 # tx_drop_SOURCES = tx_drop.c app_common.c
 # tx_drop_rate_limited_SOURCES = tx_drop_rate_limited.c app_common.c
 # tx_drop2_SOURCES = tx_drop2.c app_common.c
-rx_only_v2_SOURCES = rx_only_v2.c app_common_v2.c
-tx_only_v2_SOURCES = tx_only_v2.c app_common_v2.c
 txrx_SOURCES = txrx.c app_common_v2.c
 factory_test_SOURCES = factory_test.c app_common_v2.c
 eth_serdes_SOURCES = eth_serdes.c app_passthru_v2.c

Modified: gnuradio/trunk/usrp2/firmware/apps/app_common_v2.c
===================================================================
--- gnuradio/trunk/usrp2/firmware/apps/app_common_v2.c  2008-10-27 16:33:14 UTC 
(rev 9877)
+++ gnuradio/trunk/usrp2/firmware/apps/app_common_v2.c  2008-10-27 16:36:52 UTC 
(rev 9878)
@@ -40,7 +40,6 @@
 
 static unsigned char exp_seqno __attribute__((unused)) = 0;
 
-
 static bool
 burn_mac_addr(const op_burn_mac_addr_t *p)
 {
@@ -145,10 +144,17 @@
   }
 
   if (p->valid & CFGV_FREQ){
+    bool was_streaming = is_streaming();
+    if (was_streaming)
+      stop_rx_cmd();
+    
     u2_fxpt_freq_t f = u2_fxpt_freq_from_hilo(p->freq_hi, p->freq_lo);
     bool tune_ok = db_tune(tx_dboard, f, &tune_result);
     ok &= tune_ok;
     print_tune_result("Tx", tune_ok, f, &tune_result);
+
+    if (was_streaming)
+      restart_streaming();
   }
 
   if (p->valid & CFGV_INTERP_DECIM){
@@ -212,10 +218,17 @@
   }
 
   if (p->valid & CFGV_FREQ){
+    bool was_streaming = is_streaming();
+    if (was_streaming)
+      stop_rx_cmd();
+    
     u2_fxpt_freq_t f = u2_fxpt_freq_from_hilo(p->freq_hi, p->freq_lo);
     bool tune_ok = db_tune(rx_dboard, f, &tune_result);
     ok &= tune_ok;
     print_tune_result("Rx", tune_ok, f, &tune_result);
+
+    if (was_streaming)
+      restart_streaming();
   }
 
   if (p->valid & CFGV_INTERP_DECIM){

Modified: gnuradio/trunk/usrp2/firmware/apps/app_common_v2.h
===================================================================
--- gnuradio/trunk/usrp2/firmware/apps/app_common_v2.h  2008-10-27 16:33:14 UTC 
(rev 9877)
+++ gnuradio/trunk/usrp2/firmware/apps/app_common_v2.h  2008-10-27 16:36:52 UTC 
(rev 9878)
@@ -56,6 +56,8 @@
 
 void start_rx_streaming_cmd(const u2_mac_addr_t *host, op_start_rx_streaming_t 
*p);
 void stop_rx_cmd(void);
+void restart_streaming(void);
+bool is_streaming(void);
 
 void handle_control_chan_frame(u2_eth_packet_t *pkt, size_t len);
 

Modified: gnuradio/trunk/usrp2/firmware/apps/factory_test.c
===================================================================
--- gnuradio/trunk/usrp2/firmware/apps/factory_test.c   2008-10-27 16:33:14 UTC 
(rev 9877)
+++ gnuradio/trunk/usrp2/firmware/apps/factory_test.c   2008-10-27 16:36:52 UTC 
(rev 9878)
@@ -127,11 +127,12 @@
 static int          streaming_frame_count = 0;
 #define FRAMES_PER_CMD 1000
 
+bool is_streaming(void){ return streaming_p; }
 
 // ----------------------------------------------------------------
 
 
-static void
+void
 restart_streaming(void)
 {
   // setup RX DSP regs

Deleted: gnuradio/trunk/usrp2/firmware/apps/rx_only_v2.c

Modified: gnuradio/trunk/usrp2/firmware/apps/serdes_txrx.c
===================================================================
--- gnuradio/trunk/usrp2/firmware/apps/serdes_txrx.c    2008-10-27 16:33:14 UTC 
(rev 9877)
+++ gnuradio/trunk/usrp2/firmware/apps/serdes_txrx.c    2008-10-27 16:36:52 UTC 
(rev 9878)
@@ -124,11 +124,12 @@
 static int          streaming_frame_count = 0;
 #define FRAMES_PER_CMD 1000
 
+bool is_streaming(void){ return streaming_p; }
 
 // ----------------------------------------------------------------
 
 
-static void
+void
 restart_streaming(void)
 {
   // setup RX DSP regs

Deleted: gnuradio/trunk/usrp2/firmware/apps/tx_only_v2.c

Modified: gnuradio/trunk/usrp2/firmware/apps/txrx.c
===================================================================
--- gnuradio/trunk/usrp2/firmware/apps/txrx.c   2008-10-27 16:33:14 UTC (rev 
9877)
+++ gnuradio/trunk/usrp2/firmware/apps/txrx.c   2008-10-27 16:36:52 UTC (rev 
9878)
@@ -123,11 +123,13 @@
 static int          streaming_frame_count = 0;
 #define FRAMES_PER_CMD 1000
 
+bool is_streaming(void){ return streaming_p; }
 
+
 // ----------------------------------------------------------------
 
 
-static void
+void
 restart_streaming(void)
 {
   // setup RX DSP regs