[Commit-gnuradio] r7155 - in gnuradio/branches/developers/gnychis/inband/usrp/host: apps-inband lib/inband

[gnychis]

Author: gnychis
Date: 2007-12-13 14:08:10 -0700 (Thu, 13 Dec 2007)
New Revision: 7155

Modified:
   gnuradio/branches/developers/gnychis/inband/usrp/host/apps-inband/
   
gnuradio/branches/developers/gnychis/inband/usrp/host/apps-inband/test_usrp_inband_rx.cc
   gnuradio/branches/developers/gnychis/inband/usrp/host/lib/inband/usrp_rx.cc
   gnuradio/branches/developers/gnychis/inband/usrp/host/lib/inband/usrp_rx.h
   
gnuradio/branches/developers/gnychis/inband/usrp/host/lib/inband/usrp_usb_interface.cc
Log:
Removing the default of using fake USRP for test_usrp_inband_rx

Adding functionality to dump full packet or only payload to usrp_rx

Turning debugging off in usrp_usb_interface by default



Property changes on: 
gnuradio/branches/developers/gnychis/inband/usrp/host/apps-inband
___________________________________________________________________
Name: svn:ignore
   - Makefile
Makefile.in
.la
.lo
.deps
.libs
*.la
*.lo
*.dat
.*.swp
usrper
usrper2
test_input
test_fusb
test_usrp
test_usrp0
test_usrp_standard_rx
test_usrp_standard_tx
test_usrp_inband_timestamps
test_usrp_inband_registers
test_usrp_inband_rx
test_usrp_inband_tx
test_usrp_basic_rx
check_order_quickly
usrp_cal_dc_offset
test_usrp_inband_cs
read_packets
test_usrp_inband_ping
test_usrp_inband_underrun
test_usrp_inband_overrun
gmac_mbh.cc
test_gmac_tx

   + Makefile
Makefile.in
.la
.lo
.deps
.libs
*.la
*.lo
*.dat
.*.swp
usrper
usrper2
test_input
test_fusb
test_usrp
test_usrp0
test_usrp_standard_rx
test_usrp_standard_tx
test_usrp_standard_2tx
test_usrp_inband_timestamps
test_usrp_inband_registers
test_usrp_inband_rx
test_usrp_inband_tx
test_usrp_basic_rx
check_order_quickly
usrp_cal_dc_offset
test_usrp_inband_cs
read_packets
test_usrp_inband_ping
test_usrp_inband_underrun
test_usrp_inband_overrun
gmac_mbh.cc
test_gmac_tx


Modified: 
gnuradio/branches/developers/gnychis/inband/usrp/host/apps-inband/test_usrp_inband_rx.cc
===================================================================
--- 
gnuradio/branches/developers/gnychis/inband/usrp/host/apps-inband/test_usrp_inband_rx.cc
    2007-12-13 20:47:25 UTC (rev 7154)
+++ 
gnuradio/branches/developers/gnychis/inband/usrp/host/apps-inband/test_usrp_inband_rx.cc
    2007-12-13 21:08:10 UTC (rev 7155)
@@ -98,7 +98,7 @@
   pmt_t usrp_dict = pmt_make_dict();
   
   // To test the application without a USRP
-  bool fake_usrp_p = true;
+  bool fake_usrp_p = false;
   if(fake_usrp_p) {
     pmt_dict_set(usrp_dict, 
                  pmt_intern("fake-usrp"),

Modified: 
gnuradio/branches/developers/gnychis/inband/usrp/host/lib/inband/usrp_rx.cc
===================================================================
--- gnuradio/branches/developers/gnychis/inband/usrp/host/lib/inband/usrp_rx.cc 
2007-12-13 20:47:25 UTC (rev 7154)
+++ gnuradio/branches/developers/gnychis/inband/usrp/host/lib/inband/usrp_rx.cc 
2007-12-13 21:08:10 UTC (rev 7155)
@@ -44,12 +44,11 @@
 
 usrp_rx::usrp_rx(mb_runtime *rt, const std::string &instance_name, pmt_t 
user_arg)
   : mb_mblock(rt, instance_name, user_arg),
-    d_disk_write(false)
+    d_disk_write(false),
+    d_disk_write_pkt(true)   // if true, writes full packet, else just the 
payload
 {
   d_cs = define_port("cs", "usrp-rx-cs", true, mb_port::EXTERNAL);
   
-  //d_disk_write=true;
-  
   if(d_disk_write) {
     d_ofile.open("rx_data.dat",std::ios::binary|std::ios::out);
     d_cs_ofile.open("rx_cs.dat",std::ios::binary|std::ios::out);
@@ -151,8 +150,12 @@
     if(d_disk_write) {
       if(pkt->chan() == CONTROL_CHAN)
         d_cs_ofile.write((const char *)pkt, transport_pkt::max_pkt_size());
-      else
-        d_ofile.write((const char *)pkt, transport_pkt::max_pkt_size());
+      else {
+        if(d_disk_write_pkt)
+          d_ofile.write((const char *)pkt, transport_pkt::max_pkt_size());
+        else
+          d_ofile.write((const char *)pkt->payload(), 
transport_pkt::max_payload());
+      }
 
       d_cs_ofile.flush();
       d_ofile.flush();

Modified: 
gnuradio/branches/developers/gnychis/inband/usrp/host/lib/inband/usrp_rx.h
===================================================================
--- gnuradio/branches/developers/gnychis/inband/usrp/host/lib/inband/usrp_rx.h  
2007-12-13 20:47:25 UTC (rev 7154)
+++ gnuradio/branches/developers/gnychis/inband/usrp/host/lib/inband/usrp_rx.h  
2007-12-13 21:08:10 UTC (rev 7155)
@@ -37,6 +37,7 @@
   usrp_standard_rx     *d_urx;
   
   bool d_disk_write;
+  bool d_disk_write_pkt;
   std::ofstream d_ofile;
   std::ofstream d_cs_ofile;
   

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-12-13 20:47:25 UTC (rev 7154)
+++ 
gnuradio/branches/developers/gnychis/inband/usrp/host/lib/inband/usrp_usb_interface.cc
      2007-12-13 21:08:10 UTC (rev 7155)
@@ -342,7 +342,7 @@
     return;
   }
 
-  if(!d_urx->set_rx_freq (0, d_rf_freq)) {
+  if(!d_urx->set_rx_freq (0, -d_rf_freq)) {
     if (verbose)
       std::cout << "[usrp_server] Failed to set center frequency on RX\n";
     reply_data = pmt_list2(invocation_handle, PMT_F);
@@ -353,11 +353,11 @@
   if (verbose)
     std::cout << "[USRP_USB_INTERFACE] Setup RX channel\n";
     
-  d_utx->_write_fpga_reg(FR_DEBUG_EN,0xf);
-  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);
+//  d_utx->_write_fpga_reg(FR_DEBUG_EN,0xf);
+//  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);
 
   d_cs->send(s_response_usrp_open, pmt_list2(invocation_handle, PMT_T));
 }