Minor cleanup.

git-svn-id: http://gnuradio.org/svn/gnuradio/trunk@9873 221aa14e-8319-0410-a670-987f0aec2ac5

diff --git a/usrp2/firmware/apps/app_common_v2.c b/usrp2/firmware/apps/app_common_v2.c
index b048c3fcaa243e2ec9ad1ba6f62f00fa21da77a1..a8d7b92701b7c7980ffa10aa8dd2f14b8a15692e 100644 (file)
--- a/usrp2/firmware/apps/app_common_v2.c
+++ b/usrp2/firmware/apps/app_common_v2.c
@@ -123,8 +123,6 @@ op_id_cmd(const op_generic_t *p,
   // r->fpga_md5sum = ;        // FIXME
   // r->sw_md5sum = ;  // FIXME
 
-  // FIXME Add d'board info, including dbid, min/max gain, min/max freq
-
   return r->len;
 }
 

diff --git a/usrp2/firmware/lib/db_rfx.c b/usrp2/firmware/lib/db_rfx.c
index 974222508bf0141fff4b32dbb547f9054a0c15dd..40d2cb2dcfc7d7ada5efd577a38d3c5af2be61fb 100644 (file)
--- a/usrp2/firmware/lib/db_rfx.c
+++ b/usrp2/firmware/lib/db_rfx.c
@@ -447,6 +447,10 @@ rfx_init_tx(struct db_base *dbb)
 {
   //struct db_rfx_dummy *db = (struct db_rfx_dummy *) dbb;
   clocks_enable_tx_dboard(true, 0);
+
+  // Set the freq now to get the one time 10ms delay out of the way.
+  u2_fxpt_freq_t       dc;
+  dbb->set_freq(dbb, dbb->freq_min, &dc);
   return true;
 }
 
@@ -458,12 +462,19 @@ rfx_init_rx(struct db_base *dbb)
 
   // test gain
   dbb->set_gain(dbb,U2_DOUBLE_TO_FXPT_GAIN(45.0));
+
+  // Set the freq now to get the one time 10ms delay out of the way.
+  u2_fxpt_freq_t       dc;
+  dbb->set_freq(dbb, dbb->freq_min, &dc);
+
   return true;
 }
 
 bool
 rfx_set_freq(struct db_base *dbb, u2_fxpt_freq_t freq, u2_fxpt_freq_t *dc)
 {
+  static unsigned char first = true;
+
   *dc = 0;
   struct db_rfx_dummy *db = (struct db_rfx_dummy *) dbb;
   //u2_fxpt_freq_t desired_n = db->common.freq_mult*freq/phdet_freq;
@@ -483,7 +494,10 @@ rfx_set_freq(struct db_base *dbb, u2_fxpt_freq_t freq, u2_fxpt_freq_t *dc)
 
   spi_transact(SPI_TXONLY,db->common.spi_mask,R,24,SPIF_PUSH_FALL);
   spi_transact(SPI_TXONLY,db->common.spi_mask,C,24,SPIF_PUSH_FALL);
-  mdelay(10);
+  if (first){
+    first = false;
+    mdelay(10);
+  }
   spi_transact(SPI_TXONLY,db->common.spi_mask,N,24,SPIF_PUSH_FALL);
 
   //printf("A = %d, B = %d, N_DIV = %d\n",A, B, N_DIV);

diff --git a/usrp2/firmware/lib/db_tvrx.c b/usrp2/firmware/lib/db_tvrx.c
index 6b523d8fd4c3e434cb1433c462e6070bc0f74c32..9e600bf885e83b7e870af546d7c0b2ef21f3b066 100644 (file)
--- a/usrp2/firmware/lib/db_tvrx.c
+++ b/usrp2/firmware/lib/db_tvrx.c
@@ -23,7 +23,6 @@
 #include <hal_io.h>
 #include <ad9510.h>
 #include <stdio.h>
-#include <mdelay.h>
 
 bool tvrx_init(struct db_base *db);
 bool tvrx_set_freq(struct db_base *db, u2_fxpt_freq_t freq, u2_fxpt_freq_t *dc);