[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Commit-gnuradio] r6123 - in gnuradio/branches/developers/gnychis/inband
From: |
gnychis |
Subject: |
[Commit-gnuradio] r6123 - in gnuradio/branches/developers/gnychis/inband/usrp/host: apps lib/inband |
Date: |
Tue, 7 Aug 2007 13:17:53 -0600 (MDT) |
Author: gnychis
Date: 2007-08-07 13:17:53 -0600 (Tue, 07 Aug 2007)
New Revision: 6123
Modified:
gnuradio/branches/developers/gnychis/inband/usrp/host/apps/test_usrp_inband_timestamps.cc
gnuradio/branches/developers/gnychis/inband/usrp/host/lib/inband/usrp_inband_usb_packet.h
gnuradio/branches/developers/gnychis/inband/usrp/host/lib/inband/usrp_usb_interface.cc
Log:
Work in progress on fixing burst problem.
Partial fix included from host side, where start/end burst flags did not follow
spec and were reversed in the code.
Modified:
gnuradio/branches/developers/gnychis/inband/usrp/host/apps/test_usrp_inband_timestamps.cc
===================================================================
---
gnuradio/branches/developers/gnychis/inband/usrp/host/apps/test_usrp_inband_timestamps.cc
2007-08-06 22:50:06 UTC (rev 6122)
+++
gnuradio/branches/developers/gnychis/inband/usrp/host/apps/test_usrp_inband_timestamps.cc
2007-08-07 19:17:53 UTC (rev 6123)
@@ -49,6 +49,9 @@
#define NBPING 10
static bool verbose = true;
+bool bskip = true;
+long bstep = 10000;
+long bcurr = 0;
class test_usrp_inband_timestamps : public mb_mblock
{
@@ -144,7 +147,7 @@
// Specify the RBF to use
pmt_dict_set(usrp_dict,
pmt_intern("rbf"),
- pmt_intern("oranges.rbf"));
+ pmt_intern("tmac4.rbf"));
define_component("server", "usrp_server", usrp_dict);
@@ -385,7 +388,7 @@
// allocate the uniform vector for the samples
// FIXME perhaps hold on to this between calls
-#if 1
+#if 0
long nsamples_this_frame =
std::min(d_nsamples_to_send - d_nsamples_xmitted,
d_samples_per_frame);
@@ -424,8 +427,26 @@
}
}
- //pmt_t timestamp = pmt_from_long(0xffffffff); // NOW
- pmt_t timestamp = pmt_from_long(0x0); // NOW
+ pmt_t timestamp;
+
+ if(bskip) {
+ timestamp = pmt_from_long(0x0); // throw away
+ bcurr++;
+ if(bcurr == bstep) {
+ bskip = false;
+ bcurr = 0;
+ }
+ } else {
+ timestamp = pmt_from_long(0xffffffff); // NOW
+ bcurr++;
+ if(bcurr == bstep) {
+ bskip = true;
+ bcurr = 0;
+ }
+ }
+
+ std::cout << bskip << " -- " << bcurr << std::endl;
+
d_tx->send(s_cmd_xmit_raw_frame,
pmt_list4(pmt_from_long(d_nframes_xmitted), // invocation-handle
d_tx_chan, // channel
@@ -437,6 +458,8 @@
if(verbose && 0)
std::cout << "[TEST_USRP_INBAND_TIMESTAMPS] Transmitted frame\n";
+
+ //build_and_send_next_frame();
}
Modified:
gnuradio/branches/developers/gnychis/inband/usrp/host/lib/inband/usrp_inband_usb_packet.h
===================================================================
---
gnuradio/branches/developers/gnychis/inband/usrp/host/lib/inband/usrp_inband_usb_packet.h
2007-08-06 22:50:06 UTC (rev 6122)
+++
gnuradio/branches/developers/gnychis/inband/usrp/host/lib/inband/usrp_inband_usb_packet.h
2007-08-07 19:17:53 UTC (rev 6123)
@@ -62,8 +62,8 @@
FL_OVERRUN = 0x80000000,
FL_UNDERRUN = 0x40000000,
FL_DROPPED = 0x20000000,
- FL_END_OF_BURST = 0x10000000,
- FL_START_OF_BURST = 0x08000000,
+ FL_START_OF_BURST = 0x10000000,
+ FL_END_OF_BURST = 0x08000000,
FL_ALL_FLAGS = 0xf8000000
};
@@ -71,8 +71,8 @@
static const int FL_OVERRUN_SHIFT = 31;
static const int FL_UNDERRUN_SHIFT = 30;
static const int FL_DROPPED_SHIFT = 29;
- static const int FL_END_OF_BURST_SHIFT = 28;
- static const int FL_START_OF_BURST_SHIFT = 27;
+ static const int FL_END_OF_BURST_SHIFT = 27;
+ static const int FL_START_OF_BURST_SHIFT = 28;
static const int RSSI_MASK = 0x3f;
static const int RSSI_SHIFT = 21;
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-08-06 22:50:06 UTC (rev 6122)
+++
gnuradio/branches/developers/gnychis/inband/usrp/host/lib/inband/usrp_usb_interface.cc
2007-08-07 19:17:53 UTC (rev 6123)
@@ -143,7 +143,7 @@
d_utx = NULL;
d_urx = NULL;
- //d_fpga_debug=true; // WARNING: DO NOT ENABLE WITH D'BOARDS OTHER THAN
BASIC TX/RX
+ d_fpga_debug=true; // WARNING: DO NOT ENABLE WITH D'BOARDS OTHER THAN
BASIC TX/RX
}
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Commit-gnuradio] r6123 - in gnuradio/branches/developers/gnychis/inband/usrp/host: apps lib/inband,
gnychis <=