Changeset 8334

Timestamp:

05/08/08 19:54:33

Author:

matt

Message:

returns actual frequency now

Files:

• usrp2/trunk/firmware/lib/db_rfx.c (modified) (8 diffs)

usrp2/trunk/firmware/lib/db_rfx.c

@@ -92 +92 @@
-struct db_rfx_400_rx rfx_400_rx = {
-  .base.dbid = 0x0004,
-
+
+
-  //.base.freq_min = U2_DOUBLE_TO_FXPT_FREQ(xxx),
-  //.base.freq_max = U2_DOUBLE_TO_FXPT_FREQ(xxx),
@@ -103 +104 @@
-  .base.spectrum_inverted = false,
-  //.base.lo_offset = U2_DOUBLE_TO_FXPT_FREQ(4e6),
+  .base.init = rfx_init_rx,
-  .base.set_freq = rfx_set_freq,
-  .base.set_gain = rfx_set_gain,
@@ -121 +123 @@
-struct db_rfx_400_tx rfx_400_tx = {
-  .base.dbid = 0x0008,
-
+
+
-  //.base.freq_min = U2_DOUBLE_TO_FXPT_FREQ(xxx),
-  //.base.freq_max = U2_DOUBLE_TO_FXPT_FREQ(xxx),
@@ -132 +135 @@
-  .base.spectrum_inverted = false,
-  //.base.lo_offset = U2_DOUBLE_TO_FXPT_FREQ(4e6),
-
+_tx
-  .base.set_freq = rfx_set_freq,
-  .base.set_gain = rfx_set_gain,
@@ -149 +152 @@
-
-bool
-
+_tx
-{
-  struct db_rfx_dummy *db = (struct db_rfx_dummy *) dbb;
-
+
+
+
+
+
+
+
+
-}
-
@@ -158 +168 @@
-rfx_set_freq(struct db_base *dbb, u2_fxpt_freq_t freq, u2_fxpt_freq_t *dc)
-{
-     // FIXME
+
-  struct db_rfx_dummy *db = (struct db_rfx_dummy *) dbb;
-  u2_fxpt_freq_t desired_n = db->common.freq_mult*freq/phdet_freq;
@@ -170 +180 @@
-  int R = (R_RSV<<22)|(R_BSC<<20)|(R_TMB<<19)|(R_LDP<<18)|(R_ABP<<16)|(R_DIV<<2)|1;
-  int N = (DIVSEL<<23)|(db->common.DIV2<<22)|(CPGAIN<<21)|(B<<8)|(N_RSV<<7)|(A<<2)|2;
-(MTLD<<11)|(CPGAIN<<10)|(CP3S<<9)|(PDP<<8)|
-
+
+TLD<<11)|(CPGAIN<<10)|(CP3S<<9)|(PDP<<8)|(M
-
-  spi_transact(SPI_TXONLY,db->common.spi_mask,C,24,SPIF_PUSH_FALL);
@@ -177 +187 @@
-  spi_transact(SPI_TXONLY,db->common.spi_mask,R,24,SPIF_PUSH_FALL);
-
-
+
+
-}
-