Author: gnychis
Date: 2007-10-26 11:42:27 -0600 (Fri, 26 Oct 2007)
New Revision: 6704
Modified:
gnuradio/branches/features/inband-usb/usrp/host/lib/inband/usrp_inband_usb_packet.h
gnuradio/branches/features/inband-usb/usrp/host/lib/inband/usrp_usb_interface.cc
Log:
Merging -r6701:6703 from developers/gnychis/inband
Modified:
gnuradio/branches/features/inband-usb/usrp/host/lib/inband/usrp_inband_usb_packet.h
===================================================================
---
gnuradio/branches/features/inband-usb/usrp/host/lib/inband/usrp_inband_usb_packet.h
2007-10-26 17:37:17 UTC (rev 6703)
+++
gnuradio/branches/features/inband-usb/usrp/host/lib/inband/usrp_inband_usb_packet.h
2007-10-26 17:42:27 UTC (rev 6704)
@@ -31,7 +31,7 @@
static const int USB_PKT_SIZE = 512; // bytes
static const int MAX_PAYLOAD = USB_PKT_SIZE-2*sizeof(uint32_t);
-static const int CONTROL_CHAN = CONTROL_CHAN;
+static const int CONTROL_CHAN = 0x1f;
class usrp_inband_usb_packet {
//
Modified:
gnuradio/branches/features/inband-usb/usrp/host/lib/inband/usrp_usb_interface.cc
===================================================================
---
gnuradio/branches/features/inband-usb/usrp/host/lib/inband/usrp_usb_interface.cc
2007-10-26 17:37:17 UTC (rev 6703)
+++
gnuradio/branches/features/inband-usb/usrp/host/lib/inband/usrp_usb_interface.cc
2007-10-26 17:42:27 UTC (rev 6704)
@@ -329,6 +329,12 @@
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_cs->send(s_response_usrp_open, pmt_list2(invocation_handle, PMT_T));
}
_______________________________________________
Commit-gnuradio mailing list
[email protected]
http://lists.gnu.org/mailman/listinfo/commit-gnuradio
