[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Commit-gnuradio] r6237 - in gnuradio/branches/developers/gnychis/inband
From: |
gnychis |
Subject: |
[Commit-gnuradio] r6237 - in gnuradio/branches/developers/gnychis/inband/usrp/host: apps lib/inband |
Date: |
Thu, 30 Aug 2007 21:42:40 -0600 (MDT) |
Author: gnychis
Date: 2007-08-30 21:42:39 -0600 (Thu, 30 Aug 2007)
New Revision: 6237
Modified:
gnuradio/branches/developers/gnychis/inband/usrp/host/apps/read_packets.cc
gnuradio/branches/developers/gnychis/inband/usrp/host/apps/test_usrp_inband_tx.cc
gnuradio/branches/developers/gnychis/inband/usrp/host/lib/inband/qa_inband_usrp_server.cc
gnuradio/branches/developers/gnychis/inband/usrp/host/lib/inband/qa_inband_usrp_server.h
gnuradio/branches/developers/gnychis/inband/usrp/host/lib/inband/usrp_inband_usb_packet.h
gnuradio/branches/developers/gnychis/inband/usrp/host/lib/inband/usrp_rx.cc
gnuradio/branches/developers/gnychis/inband/usrp/host/lib/inband/usrp_rx_stub.cc
gnuradio/branches/developers/gnychis/inband/usrp/host/lib/inband/usrp_server.cc
gnuradio/branches/developers/gnychis/inband/usrp/host/lib/inband/usrp_tx.cc
gnuradio/branches/developers/gnychis/inband/usrp/host/lib/inband/usrp_tx_stub.cc
gnuradio/branches/developers/gnychis/inband/usrp/host/lib/inband/usrp_usb_interface.cc
Log:
Code cleanup (verbosity, make checks, etc) and removal of carrier sense hack
before a merge
Modified:
gnuradio/branches/developers/gnychis/inband/usrp/host/apps/read_packets.cc
===================================================================
--- gnuradio/branches/developers/gnychis/inband/usrp/host/apps/read_packets.cc
2007-08-31 01:59:32 UTC (rev 6236)
+++ gnuradio/branches/developers/gnychis/inband/usrp/host/apps/read_packets.cc
2007-08-31 03:42:39 UTC (rev 6237)
@@ -70,8 +70,8 @@
if(pkt->end_of_burst())
printf("\tend of burst\n");
- if(pkt->carrier_sense())
- printf("\tcarrier sense\n");
+// if(pkt->carrier_sense())
+// printf("\tcarrier sense\n");
printf("\tchannel: \t0x%x\n", pkt->chan());
printf("\ttimestamp: \t0x%x\n", pkt->timestamp());
Modified:
gnuradio/branches/developers/gnychis/inband/usrp/host/apps/test_usrp_inband_tx.cc
===================================================================
---
gnuradio/branches/developers/gnychis/inband/usrp/host/apps/test_usrp_inband_tx.cc
2007-08-31 01:59:32 UTC (rev 6236)
+++
gnuradio/branches/developers/gnychis/inband/usrp/host/apps/test_usrp_inband_tx.cc
2007-08-31 03:42:39 UTC (rev 6237)
@@ -298,13 +298,13 @@
d_nsamples_xmitted = 0;
// FIXME: carrier sense hack
- d_tx->send(s_cmd_to_control_channel, // C/S packet
- pmt_list2(PMT_NIL, // invoc handle
- pmt_list1(
- pmt_list2(s_op_write_reg,
- pmt_list2(
- pmt_from_long(1),
- pmt_from_long(0))))));
+// d_tx->send(s_cmd_to_control_channel, // C/S packet
+// pmt_list2(PMT_NIL, // invoc handle
+// pmt_list1(
+// pmt_list2(s_op_write_reg,
+// pmt_list2(
+// pmt_from_long(1),
+// pmt_from_long(0))))));
build_and_send_next_frame(); // fire off 4 to start pipeline
build_and_send_next_frame();
Modified:
gnuradio/branches/developers/gnychis/inband/usrp/host/lib/inband/qa_inband_usrp_server.cc
===================================================================
---
gnuradio/branches/developers/gnychis/inband/usrp/host/lib/inband/qa_inband_usrp_server.cc
2007-08-31 01:59:32 UTC (rev 6236)
+++
gnuradio/branches/developers/gnychis/inband/usrp/host/lib/inband/qa_inband_usrp_server.cc
2007-08-31 03:42:39 UTC (rev 6237)
@@ -44,7 +44,7 @@
typedef usrp_inband_usb_packet transport_pkt; // makes conversion to gigabit
easy
-static bool verbose = true;
+static bool verbose = false;
//
----------------------------------------------------------------------------------------------
Modified:
gnuradio/branches/developers/gnychis/inband/usrp/host/lib/inband/qa_inband_usrp_server.h
===================================================================
---
gnuradio/branches/developers/gnychis/inband/usrp/host/lib/inband/qa_inband_usrp_server.h
2007-08-31 01:59:32 UTC (rev 6236)
+++
gnuradio/branches/developers/gnychis/inband/usrp/host/lib/inband/qa_inband_usrp_server.h
2007-08-31 03:42:39 UTC (rev 6237)
@@ -28,11 +28,11 @@
class qa_inband_usrp_server : public CppUnit::TestCase {
CPPUNIT_TEST_SUITE(qa_inband_usrp_server);
-// CPPUNIT_TEST(test_open_close);
-// CPPUNIT_TEST(test_chan_allocation);
-// CPPUNIT_TEST(test_chan_deallocation);
-// CPPUNIT_TEST(test_tx);
-// CPPUNIT_TEST(test_rx);
+ CPPUNIT_TEST(test_open_close);
+ CPPUNIT_TEST(test_chan_allocation);
+ CPPUNIT_TEST(test_chan_deallocation);
+ CPPUNIT_TEST(test_tx);
+ CPPUNIT_TEST(test_rx);
CPPUNIT_TEST(test_cs);
CPPUNIT_TEST_SUITE_END();
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-31 01:59:32 UTC (rev 6236)
+++
gnuradio/branches/developers/gnychis/inband/usrp/host/lib/inband/usrp_inband_usb_packet.h
2007-08-31 03:42:39 UTC (rev 6237)
@@ -201,10 +201,6 @@
return (usrp_to_host_u32(d_word0) & FL_DROPPED) >> FL_DROPPED_SHIFT;
}
- int carrier_sense() const {
- return (usrp_to_host_u32(d_word0) >> 15) & 1;
- }
-
unsigned char *payload() {
return d_payload;
}
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-08-31 01:59:32 UTC (rev 6236)
+++ gnuradio/branches/developers/gnychis/inband/usrp/host/lib/inband/usrp_rx.cc
2007-08-31 03:42:39 UTC (rev 6237)
@@ -46,7 +46,7 @@
{
d_cs = define_port("cs", "usrp-rx-cs", true, mb_port::EXTERNAL);
- d_disk_write=true;
+ //d_disk_write=true;
if(d_disk_write) {
d_ofile.open("rx_data.dat",std::ios::binary|std::ios::out);
Modified:
gnuradio/branches/developers/gnychis/inband/usrp/host/lib/inband/usrp_rx_stub.cc
===================================================================
---
gnuradio/branches/developers/gnychis/inband/usrp/host/lib/inband/usrp_rx_stub.cc
2007-08-31 01:59:32 UTC (rev 6236)
+++
gnuradio/branches/developers/gnychis/inband/usrp/host/lib/inband/usrp_rx_stub.cc
2007-08-31 03:42:39 UTC (rev 6237)
@@ -40,7 +40,7 @@
typedef usrp_inband_usb_packet transport_pkt;
-static const bool verbose = true;
+static const bool verbose = false;
bool usrp_rx_stop;
Modified:
gnuradio/branches/developers/gnychis/inband/usrp/host/lib/inband/usrp_server.cc
===================================================================
---
gnuradio/branches/developers/gnychis/inband/usrp/host/lib/inband/usrp_server.cc
2007-08-31 01:59:32 UTC (rev 6236)
+++
gnuradio/branches/developers/gnychis/inband/usrp/host/lib/inband/usrp_server.cc
2007-08-31 03:42:39 UTC (rev 6237)
@@ -38,7 +38,7 @@
typedef usrp_inband_usb_packet transport_pkt; // makes conversion to gigabit
easy
-const static bool verbose = true;
+const static bool verbose = false;
static std::string
str(long x)
@@ -1132,7 +1132,6 @@
{
long payload_len = pkt->payload_len();
- unsigned char *payload = pkt->payload();
long curr_payload = 0;
long port;
Modified:
gnuradio/branches/developers/gnychis/inband/usrp/host/lib/inband/usrp_tx.cc
===================================================================
--- gnuradio/branches/developers/gnychis/inband/usrp/host/lib/inband/usrp_tx.cc
2007-08-31 01:59:32 UTC (rev 6236)
+++ gnuradio/branches/developers/gnychis/inband/usrp/host/lib/inband/usrp_tx.cc
2007-08-31 03:42:39 UTC (rev 6237)
@@ -44,7 +44,7 @@
{
d_cs = define_port("cs", "usrp-tx-cs", true, mb_port::EXTERNAL);
- d_disk_write=true;
+ //d_disk_write=true;
if(d_disk_write) {
d_ofile.open("tx_data.dat",std::ios::binary|std::ios::out);
Modified:
gnuradio/branches/developers/gnychis/inband/usrp/host/lib/inband/usrp_tx_stub.cc
===================================================================
---
gnuradio/branches/developers/gnychis/inband/usrp/host/lib/inband/usrp_tx_stub.cc
2007-08-31 01:59:32 UTC (rev 6236)
+++
gnuradio/branches/developers/gnychis/inband/usrp/host/lib/inband/usrp_tx_stub.cc
2007-08-31 03:42:39 UTC (rev 6237)
@@ -39,7 +39,7 @@
typedef usrp_inband_usb_packet transport_pkt;
-static const bool verbose = true;
+static const bool verbose = false;
usrp_tx_stub::usrp_tx_stub(mb_runtime *rt, const std::string &instance_name,
pmt_t user_arg)
: mb_mblock(rt, instance_name, user_arg),
@@ -47,7 +47,7 @@
{
d_cs = define_port("cs", "usrp-tx-cs", true, mb_port::EXTERNAL);
- d_disk_write=true;
+ //d_disk_write=true;
if(d_disk_write) {
d_ofile.open("tx_stub_data.dat",std::ios::binary|std::ios::out);
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-31 01:59:32 UTC (rev 6236)
+++
gnuradio/branches/developers/gnychis/inband/usrp/host/lib/inband/usrp_usb_interface.cc
2007-08-31 03:42:39 UTC (rev 6237)
@@ -43,7 +43,7 @@
#include <symbols_usrp_tx_cs.h>
#include <symbols_usrp_rx_cs.h>
-static const bool verbose = true;
+static const bool verbose = false;
// 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)
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Commit-gnuradio] r6237 - in gnuradio/branches/developers/gnychis/inband/usrp/host: apps lib/inband,
gnychis <=