[Commit-gnuradio] r5646 - gnuradio/branches/developers/gnychis/inband/usrp/host/lib/inband

[gnychis]

Author: gnychis
Date: 2007-06-03 18:16:04 -0600 (Sun, 03 Jun 2007)
New Revision: 5646

Modified:
   
gnuradio/branches/developers/gnychis/inband/usrp/host/lib/inband/usrp_usb_interface.cc
   
gnuradio/branches/developers/gnychis/inband/usrp/host/lib/inband/usrp_usb_interface.h
Log:
Adding in some basic code to usrp_usb_interface for debugging the FPGA


Modified: 
gnuradio/branches/developers/gnychis/inband/usrp/host/lib/inband/usrp_usb_interface.cc
===================================================================
--- 
gnuradio/branches/developers/gnychis/inband/usrp/host/lib/inband/usrp_usb_interface.cc
      2007-06-03 22:50:33 UTC (rev 5645)
+++ 
gnuradio/branches/developers/gnychis/inband/usrp/host/lib/inband/usrp_usb_interface.cc
      2007-06-04 00:16:04 UTC (rev 5646)
@@ -28,6 +28,7 @@
 #include <mb_class_registry.h>
 #include <usrp_usb_interface.h>
 #include <usrp_inband_usb_packet.h>
+#include <fpga_regs_common.h>
 #include "usrp_standard.h"
 #include <stdio.h>
 
@@ -48,7 +49,8 @@
 
 // need to take number of TX and RX channels as parameter
 usrp_usb_interface::usrp_usb_interface(mb_runtime *rt, const std::string 
&instance_name, pmt_t user_arg)
-  : mb_mblock(rt, instance_name, user_arg)
+  : mb_mblock(rt, instance_name, user_arg),
+  d_fpga_debug(false)
 {
   d_cs = define_port("cs", "usrp-interface-cs", true, mb_port::EXTERNAL);      
   
@@ -58,6 +60,9 @@
 
   d_utx = NULL;
   d_urx = NULL;
+  
+  d_fpga_debug=true;   // WARNING: DO NOT ENABLE WITH D'BOARDS OTHER THAN 
BASIC TX/RX
+
 }
 
 usrp_usb_interface::~usrp_usb_interface() 
@@ -182,6 +187,14 @@
   }
 
   d_urx->start();
+
+  if(d_fpga_debug) {
+    d_utx->_write_fpga_reg(FR_DEBUG_EN,0);
+    d_utx->_write_oe(0, 0xffff, 0xffff);
+    d_urx->_write_oe(0, 0xffff, 0xffff);
+    d_utx->_write_oe(1, 0xffff, 0xffff);
+    d_urx->_write_oe(1, 0xffff, 0xffff);
+  }
   
   if (verbose)
     std::cout << "[USRP_USB_INTERFACE] Setup RX channel\n";

Modified: 
gnuradio/branches/developers/gnychis/inband/usrp/host/lib/inband/usrp_usb_interface.h
===================================================================
--- 
gnuradio/branches/developers/gnychis/inband/usrp/host/lib/inband/usrp_usb_interface.h
       2007-06-03 22:50:33 UTC (rev 5645)
+++ 
gnuradio/branches/developers/gnychis/inband/usrp/host/lib/inband/usrp_usb_interface.h
       2007-06-04 00:16:04 UTC (rev 5646)
@@ -40,6 +40,8 @@
   long d_ntx_chan;
   long d_nrx_chan;
 
+  long d_fpga_debug;
+
  public:
   usrp_usb_interface(mb_runtime *rt, const std::string &instance_name, pmt_t 
user_arg);
   ~usrp_usb_interface();