[Commit-gnuradio] r8491 - usrp2/trunk/firmware/lib

commit-gnuradio
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Commit-gnuradio] r8491 - usrp2/trunk/firmware/lib

From:	eb
Subject:	[Commit-gnuradio] r8491 - usrp2/trunk/firmware/lib
Date:	Sun, 25 May 2008 18:20:06 -0600 (MDT)
Author: eb
Date: 2008-05-25 18:20:02 -0600 (Sun, 25 May 2008)
New Revision: 8491

Modified:
   usrp2/trunk/firmware/lib/db_base.h
   usrp2/trunk/firmware/lib/db_basic.c
   usrp2/trunk/firmware/lib/db_init.c
   usrp2/trunk/firmware/lib/db_rfx.c
   usrp2/trunk/firmware/lib/db_tvrx.c
Log:
Removed unused fields from db_base and refactored to make it smaller.


Modified: usrp2/trunk/firmware/lib/db_base.h
===================================================================
--- usrp2/trunk/firmware/lib/db_base.h  2008-05-26 00:14:49 UTC (rev 8490)
+++ usrp2/trunk/firmware/lib/db_base.h  2008-05-26 00:20:02 UTC (rev 8491)
@@ -27,22 +27,23 @@
  */
 struct db_base {
   uint16_t             dbid;           //< daughterboard ID
-  uint16_t              is_tx;          //< is this a transmit db?
+
+  uint16_t              is_tx            : 1;  //< is this a transmit db?
+  uint16_t             is_quadrature     : 1;
+  uint16_t             i_and_q_swapped   : 1;
+  uint16_t             spectrum_inverted : 1;
+
   uint16_t             output_enables; //< bitmask of which pins should be 
outputs from FPGA
   uint16_t             used_pins;      //< bitmask of pins used by the 
daughterboard
 
   u2_fxpt_freq_t       freq_min;       //< min freq that can be set (Hz)
   u2_fxpt_freq_t       freq_max;       //< max freq that can be set (Hz)
-  u2_fxpt_freq_t       freq_step_size; //< (Hz)
 
   u2_fxpt_gain_t       gain_min;       //< min gain that can be set (dB)
   u2_fxpt_gain_t       gain_max;       //< max gain that can be set (dB)
   u2_fxpt_gain_t       gain_step_size; //< (dB)
 
-  bool                 is_quadrature;
-  bool                 i_and_q_swapped;
-  bool                 spectrum_inverted;
-  u2_fxpt_freq_t       lo_offset;
+  // u2_fxpt_freq_t    lo_offset;
 
   /*
    * Auto T/R control values

Modified: usrp2/trunk/firmware/lib/db_basic.c
===================================================================
--- usrp2/trunk/firmware/lib/db_basic.c 2008-05-26 00:14:49 UTC (rev 8490)
+++ usrp2/trunk/firmware/lib/db_basic.c 2008-05-26 00:20:02 UTC (rev 8491)
@@ -36,14 +36,13 @@
   .base.used_pins = 0x0000,
   .base.freq_min = U2_DOUBLE_TO_FXPT_FREQ(-90e9),
   .base.freq_max = U2_DOUBLE_TO_FXPT_FREQ(90e9),
-  .base.freq_step_size = U2_DOUBLE_TO_FXPT_FREQ(1e-6),
   .base.gain_min = U2_DOUBLE_TO_FXPT_GAIN(0),
   .base.gain_max = U2_DOUBLE_TO_FXPT_GAIN(0),
   .base.gain_step_size = U2_DOUBLE_TO_FXPT_GAIN(0),
   .base.is_quadrature = true,
   .base.i_and_q_swapped = false,
   .base.spectrum_inverted = false,
-  .base.lo_offset = U2_DOUBLE_TO_FXPT_FREQ(0),
+  //.base.lo_offset = U2_DOUBLE_TO_FXPT_FREQ(0),
   .base.atr_mask =     0,
   .base.atr_txval =    0,
   .base.atr_rxval =    0,
@@ -63,14 +62,13 @@
   .base.used_pins = 0x0000,
   .base.freq_min = U2_DOUBLE_TO_FXPT_FREQ(-90e9),
   .base.freq_max = U2_DOUBLE_TO_FXPT_FREQ(90e9),
-  .base.freq_step_size = U2_DOUBLE_TO_FXPT_FREQ(1e-6),
   .base.gain_min = U2_DOUBLE_TO_FXPT_GAIN(0),
   .base.gain_max = U2_DOUBLE_TO_FXPT_GAIN(0),
   .base.gain_step_size = U2_DOUBLE_TO_FXPT_GAIN(0),
   .base.is_quadrature = false,
   .base.i_and_q_swapped = false,
   .base.spectrum_inverted = false,
-  .base.lo_offset = U2_DOUBLE_TO_FXPT_FREQ(0),
+  //.base.lo_offset = U2_DOUBLE_TO_FXPT_FREQ(0),
   .base.atr_mask =     0,
   .base.atr_txval =    0,
   .base.atr_rxval =    0,
@@ -90,14 +88,13 @@
   .base.used_pins = 0x0000,
   .base.freq_min = U2_DOUBLE_TO_FXPT_FREQ(-32e6),
   .base.freq_max = U2_DOUBLE_TO_FXPT_FREQ(32e6),
-  .base.freq_step_size = U2_DOUBLE_TO_FXPT_FREQ(1e-6),
   .base.gain_min = U2_DOUBLE_TO_FXPT_GAIN(0),
   .base.gain_max = U2_DOUBLE_TO_FXPT_GAIN(0),
   .base.gain_step_size = U2_DOUBLE_TO_FXPT_GAIN(0),
   .base.is_quadrature = true,
   .base.i_and_q_swapped = false,
   .base.spectrum_inverted = false,
-  .base.lo_offset = U2_DOUBLE_TO_FXPT_FREQ(0),
+  //.base.lo_offset = U2_DOUBLE_TO_FXPT_FREQ(0),
   .base.atr_mask =     0,
   .base.atr_txval =    0,
   .base.atr_rxval =    0,
@@ -117,14 +114,13 @@
   .base.used_pins = 0x0000,
   .base.freq_min = U2_DOUBLE_TO_FXPT_FREQ(0),
   .base.freq_max = U2_DOUBLE_TO_FXPT_FREQ(32e6),
-  .base.freq_step_size = U2_DOUBLE_TO_FXPT_FREQ(1e-6),
   .base.gain_min = U2_DOUBLE_TO_FXPT_GAIN(0),
   .base.gain_max = U2_DOUBLE_TO_FXPT_GAIN(0),
   .base.gain_step_size = U2_DOUBLE_TO_FXPT_GAIN(0),
   .base.is_quadrature = false,
   .base.i_and_q_swapped = false,
   .base.spectrum_inverted = false,
-  .base.lo_offset = U2_DOUBLE_TO_FXPT_FREQ(0),
+  //.base.lo_offset = U2_DOUBLE_TO_FXPT_FREQ(0),
   .base.atr_mask =     0,
   .base.atr_txval =    0,
   .base.atr_rxval =    0,

Modified: usrp2/trunk/firmware/lib/db_init.c
===================================================================
--- usrp2/trunk/firmware/lib/db_init.c  2008-05-26 00:14:49 UTC (rev 8490)
+++ usrp2/trunk/firmware/lib/db_init.c  2008-05-26 00:20:02 UTC (rev 8491)
@@ -37,6 +37,9 @@
 extern struct db_base db_lf_rx;
 extern struct db_base db_rfx_400_tx;
 extern struct db_base db_rfx_400_rx;
+extern struct db_base db_tvrx1;
+extern struct db_base db_tvrx2;
+extern struct db_base db_tvrx3;
 
 struct db_base *all_dboards[] = {
   &db_basic_tx,
@@ -45,6 +48,9 @@
   &db_lf_rx,
   &db_rfx_400_tx,
   &db_rfx_400_rx,
+  &db_tvrx1,
+  &db_tvrx2,
+  &db_tvrx3,
   0
 };
 

Modified: usrp2/trunk/firmware/lib/db_rfx.c
===================================================================
--- usrp2/trunk/firmware/lib/db_rfx.c   2008-05-26 00:14:49 UTC (rev 8490)
+++ usrp2/trunk/firmware/lib/db_rfx.c   2008-05-26 00:20:02 UTC (rev 8491)
@@ -140,7 +140,6 @@
   .base.used_pins = 0x00FF,
   //.base.freq_min = U2_DOUBLE_TO_FXPT_FREQ(xxx),
   //.base.freq_max = U2_DOUBLE_TO_FXPT_FREQ(xxx),
-  //.base.freq_step_size = U2_DOUBLE_TO_FXPT_FREQ(xxx),
   //.base.gain_min = U2_DOUBLE_TO_FXPT_GAIN(xxx),
   //.base.gain_max = U2_DOUBLE_TO_FXPT_GAIN(xxx),
   //.base.gain_step_size = U2_DOUBLE_TO_FXPT_GAIN(xxx),
@@ -172,7 +171,6 @@
   .base.used_pins = 0x00FF,
   //.base.freq_min = U2_DOUBLE_TO_FXPT_FREQ(xxx),
   //.base.freq_max = U2_DOUBLE_TO_FXPT_FREQ(xxx),
-  //.base.freq_step_size = U2_DOUBLE_TO_FXPT_FREQ(xxx),
   //.base.gain_min = U2_DOUBLE_TO_FXPT_GAIN(xxx),
   //.base.gain_max = U2_DOUBLE_TO_FXPT_GAIN(xxx),
   //.base.gain_step_size = U2_DOUBLE_TO_FXPT_GAIN(xxx),
@@ -203,7 +201,6 @@
   .base.used_pins = 0x00FF,
   //.base.freq_min = U2_DOUBLE_TO_FXPT_FREQ(xxx),
   //.base.freq_max = U2_DOUBLE_TO_FXPT_FREQ(xxx),
-  //.base.freq_step_size = U2_DOUBLE_TO_FXPT_FREQ(xxx),
   //.base.gain_min = U2_DOUBLE_TO_FXPT_GAIN(xxx),
   //.base.gain_max = U2_DOUBLE_TO_FXPT_GAIN(xxx),
   //.base.gain_step_size = U2_DOUBLE_TO_FXPT_GAIN(xxx),
@@ -235,7 +232,6 @@
   .base.used_pins = 0x00FF,
   //.base.freq_min = U2_DOUBLE_TO_FXPT_FREQ(xxx),
   //.base.freq_max = U2_DOUBLE_TO_FXPT_FREQ(xxx),
-  //.base.freq_step_size = U2_DOUBLE_TO_FXPT_FREQ(xxx),
   //.base.gain_min = U2_DOUBLE_TO_FXPT_GAIN(xxx),
   //.base.gain_max = U2_DOUBLE_TO_FXPT_GAIN(xxx),
   //.base.gain_step_size = U2_DOUBLE_TO_FXPT_GAIN(xxx),
@@ -266,7 +262,6 @@
   .base.used_pins = 0x00FF,
   //.base.freq_min = U2_DOUBLE_TO_FXPT_FREQ(xxx),
   //.base.freq_max = U2_DOUBLE_TO_FXPT_FREQ(xxx),
-  //.base.freq_step_size = U2_DOUBLE_TO_FXPT_FREQ(xxx),
   //.base.gain_min = U2_DOUBLE_TO_FXPT_GAIN(xxx),
   //.base.gain_max = U2_DOUBLE_TO_FXPT_GAIN(xxx),
   //.base.gain_step_size = U2_DOUBLE_TO_FXPT_GAIN(xxx),
@@ -298,7 +293,6 @@
   .base.used_pins = 0x00FF,
   //.base.freq_min = U2_DOUBLE_TO_FXPT_FREQ(xxx),
   //.base.freq_max = U2_DOUBLE_TO_FXPT_FREQ(xxx),
-  //.base.freq_step_size = U2_DOUBLE_TO_FXPT_FREQ(xxx),
   //.base.gain_min = U2_DOUBLE_TO_FXPT_GAIN(xxx),
   //.base.gain_max = U2_DOUBLE_TO_FXPT_GAIN(xxx),
   //.base.gain_step_size = U2_DOUBLE_TO_FXPT_GAIN(xxx),
@@ -329,7 +323,6 @@
   .base.used_pins = 0x00FF,
   //.base.freq_min = U2_DOUBLE_TO_FXPT_FREQ(xxx),
   //.base.freq_max = U2_DOUBLE_TO_FXPT_FREQ(xxx),
-  //.base.freq_step_size = U2_DOUBLE_TO_FXPT_FREQ(xxx),
   //.base.gain_min = U2_DOUBLE_TO_FXPT_GAIN(xxx),
   //.base.gain_max = U2_DOUBLE_TO_FXPT_GAIN(xxx),
   //.base.gain_step_size = U2_DOUBLE_TO_FXPT_GAIN(xxx),
@@ -361,7 +354,6 @@
   .base.used_pins = 0x00FF,
   //.base.freq_min = U2_DOUBLE_TO_FXPT_FREQ(xxx),
   //.base.freq_max = U2_DOUBLE_TO_FXPT_FREQ(xxx),
-  //.base.freq_step_size = U2_DOUBLE_TO_FXPT_FREQ(xxx),
   //.base.gain_min = U2_DOUBLE_TO_FXPT_GAIN(xxx),
   //.base.gain_max = U2_DOUBLE_TO_FXPT_GAIN(xxx),
   //.base.gain_step_size = U2_DOUBLE_TO_FXPT_GAIN(xxx),
@@ -393,7 +385,6 @@
   .base.used_pins = 0x00FF,
   //.base.freq_min = U2_DOUBLE_TO_FXPT_FREQ(xxx),
   //.base.freq_max = U2_DOUBLE_TO_FXPT_FREQ(xxx),
-  //.base.freq_step_size = U2_DOUBLE_TO_FXPT_FREQ(xxx),
   //.base.gain_min = U2_DOUBLE_TO_FXPT_GAIN(xxx),
   //.base.gain_max = U2_DOUBLE_TO_FXPT_GAIN(xxx),
   //.base.gain_step_size = U2_DOUBLE_TO_FXPT_GAIN(xxx),
@@ -425,7 +416,6 @@
   .base.used_pins = 0x00FF,
   //.base.freq_min = U2_DOUBLE_TO_FXPT_FREQ(xxx),
   //.base.freq_max = U2_DOUBLE_TO_FXPT_FREQ(xxx),
-  //.base.freq_step_size = U2_DOUBLE_TO_FXPT_FREQ(xxx),
   //.base.gain_min = U2_DOUBLE_TO_FXPT_GAIN(xxx),
   //.base.gain_max = U2_DOUBLE_TO_FXPT_GAIN(xxx),
   //.base.gain_step_size = U2_DOUBLE_TO_FXPT_GAIN(xxx),

Modified: usrp2/trunk/firmware/lib/db_tvrx.c
===================================================================
--- usrp2/trunk/firmware/lib/db_tvrx.c  2008-05-26 00:14:49 UTC (rev 8490)
+++ usrp2/trunk/firmware/lib/db_tvrx.c  2008-05-26 00:20:02 UTC (rev 8491)
@@ -83,7 +83,6 @@
   .base.used_pins = 0x0000,
   //.base.freq_min = U2_DOUBLE_TO_FXPT_FREQ(xxx),
   //.base.freq_max = U2_DOUBLE_TO_FXPT_FREQ(xxx),
-  //.base.freq_step_size = U2_DOUBLE_TO_FXPT_FREQ(xxx),
   //.base.gain_min = U2_DOUBLE_TO_FXPT_GAIN(xxx),
   //.base.gain_max = U2_DOUBLE_TO_FXPT_GAIN(xxx),
   //.base.gain_step_size = U2_DOUBLE_TO_FXPT_GAIN(xxx),
@@ -111,7 +110,6 @@
   .base.used_pins = 0x0000,
   //.base.freq_min = U2_DOUBLE_TO_FXPT_FREQ(xxx),
   //.base.freq_max = U2_DOUBLE_TO_FXPT_FREQ(xxx),
-  //.base.freq_step_size = U2_DOUBLE_TO_FXPT_FREQ(xxx),
   //.base.gain_min = U2_DOUBLE_TO_FXPT_GAIN(xxx),
   //.base.gain_max = U2_DOUBLE_TO_FXPT_GAIN(xxx),
   //.base.gain_step_size = U2_DOUBLE_TO_FXPT_GAIN(xxx),
@@ -139,7 +137,6 @@
   .base.used_pins = 0x0000,
   //.base.freq_min = U2_DOUBLE_TO_FXPT_FREQ(xxx),
   //.base.freq_max = U2_DOUBLE_TO_FXPT_FREQ(xxx),
-  //.base.freq_step_size = U2_DOUBLE_TO_FXPT_FREQ(xxx),
   //.base.gain_min = U2_DOUBLE_TO_FXPT_GAIN(xxx),
   //.base.gain_max = U2_DOUBLE_TO_FXPT_GAIN(xxx),
   //.base.gain_step_size = U2_DOUBLE_TO_FXPT_GAIN(xxx),
[Prev in Thread]
Current Thread
[Next in Thread]
[Commit-gnuradio] r8491 - usrp2/trunk/firmware/lib, eb <=
Prev by Date: [Commit-gnuradio] r8490 - usrp2/trunk/firmware/lib
Next by Date: [Commit-gnuradio] r8492 - usrp2/trunk/firmware/apps
Previous by thread: [Commit-gnuradio] r8490 - usrp2/trunk/firmware/lib
Next by thread: [Commit-gnuradio] r8492 - usrp2/trunk/firmware/apps
Index(es):
- Date
- Thread