[Commit-gnuradio] r7325 - in gnuradio/branches/developers/jcorgan/xcvr2450: gr-usrp/src usrp/host/lib/legacy

[jcorgan]

Author: jcorgan
Date: 2008-01-02 11:39:41 -0700 (Wed, 02 Jan 2008)
New Revision: 7325

Modified:
   gnuradio/branches/developers/jcorgan/xcvr2450/gr-usrp/src/db_xcvr2450.py
   
gnuradio/branches/developers/jcorgan/xcvr2450/usrp/host/lib/legacy/usrp_dbid.dat
Log:
Cleanup and assigning db ids

Modified: 
gnuradio/branches/developers/jcorgan/xcvr2450/gr-usrp/src/db_xcvr2450.py
===================================================================
--- gnuradio/branches/developers/jcorgan/xcvr2450/gr-usrp/src/db_xcvr2450.py    
2008-01-02 17:35:35 UTC (rev 7324)
+++ gnuradio/branches/developers/jcorgan/xcvr2450/gr-usrp/src/db_xcvr2450.py    
2008-01-02 18:39:41 UTC (rev 7325)
@@ -130,12 +130,14 @@
         if self.freq > 5.4e9:
             self.highband = 1
             self.five_gig = 1
-        else if self.freq > 3e9:
-            self.highband = 0
-            self.five_gig = 1
         else:
-            self.highband = 0
-            self.five_gig = 0
+           if self.freq > 3e9:
+               self.highband = 0
+               self.five_gig = 1
+           else:
+               self.highband = 0
+               self.five_gig = 0
+
         self.reg_bandselpll = 
(self.mimo<<17)|(1<<16)|(1<<15)|(1<<11)|(self.highband<<10)| \
                               
(self.cp_current<<9)|(self.cp_current<<5)|(self.five_gig<<4)|5
         self.send_reg(self.reg_bandselpll)
@@ -341,7 +343,7 @@
             raise ValueError, "TX Gain out of range."
         
 
-class xcvr2450_rx(wbx_base):
+class xcvr2450_rx(xcvr2450_base):
     def __init__(self, usrp, which):
         """
         @param usrp: instance of usrp.source_c
@@ -532,32 +534,7 @@
         return (self._u.pga_min(), self._u.pga_max() + 45, 0.05)
 
 #----------------------------------------------------------------------
-class _lo_common(_ADF410X_common):
 
-    def freq_range(self):           # FIXME
-        return (50e6, 1000e6, 16e6)
-
-    def set_freq(self, freq):
-        #freq += self._lo_offset
-
-        if(freq < 20e6 or freq > 1200e6):
-            raise ValueError, "Requested frequency out of range"
-        div = 1
-        lo_freq = freq * 2
-        while lo_freq < 1e9 and div < 8:
-            div = div * 2
-            lo_freq = lo_freq * 2
-        print "For RF freq of %f, we set DIV=%d and LO Freq=%f" % (freq, div, 
lo_freq)
-        self.set_divider('main', div)
-        self.set_divider('aux', 2)
-
-        R, N, control, actual_freq = self._compute_regs(lo_freq)
-        print "R %d N %d control %d actual freq %f" % (R,N,control,actual_freq)
-        if R==0:
-            return(False,0)
-        self._write_all(R, N, control)
-        return (self._lock_detect(), actual_freq/div/2)
-
         
 #------------------------------------------------------------    
 # hook these daughterboard classes into the auto-instantiation framework

Modified: 
gnuradio/branches/developers/jcorgan/xcvr2450/usrp/host/lib/legacy/usrp_dbid.dat
===================================================================
--- 
gnuradio/branches/developers/jcorgan/xcvr2450/usrp/host/lib/legacy/usrp_dbid.dat
    2008-01-02 17:35:35 UTC (rev 7324)
+++ 
gnuradio/branches/developers/jcorgan/xcvr2450/usrp/host/lib/legacy/usrp_dbid.dat
    2008-01-02 18:39:41 UTC (rev 7325)
@@ -73,5 +73,8 @@
 "WBX LO TX"            0x0050
 "WBX LO RX"            0x0051
 
+"XCVR2450 Tx"          0x0060
+"XCVR2450 Rx"          0x0061
+
 "Experimental Tx"      0xfffe
 "Experimental Rx"      0xffff