[Commit-gnuradio] r7973 - in usrp2/trunk/host: apps lib

[eb]

Author: eb
Date: 2008-03-08 13:35:05 -0700 (Sat, 08 Mar 2008)
New Revision: 7973

Modified:
   usrp2/trunk/host/apps/tx_samples_at_t.cc
   usrp2/trunk/host/lib/usrp2_basic.cc
Log:
testing

Modified: usrp2/trunk/host/apps/tx_samples_at_t.cc
===================================================================
--- usrp2/trunk/host/apps/tx_samples_at_t.cc    2008-03-08 20:32:00 UTC (rev 
7972)
+++ usrp2/trunk/host/apps/tx_samples_at_t.cc    2008-03-08 20:35:05 UTC (rev 
7973)
@@ -199,7 +199,7 @@
 
 
   if (!u2->config_tx(which, freq, interp, scale, scale)){
-    std::cerr << "tx_samples: config_tx failed\n";
+    std::cerr << "tx_samples_at_t: config_tx failed\n";
     return 1;
   }
 
@@ -217,7 +217,7 @@
   uint32_t t_now;
 
   if (!u2->read_time(which, &t_now)){
-    std::cerr << "tx_samples: read_time failed\n";
+    std::cerr << "tx_samples_at_t: read_time failed\n";
     return 1;
   }
 

Modified: usrp2/trunk/host/lib/usrp2_basic.cc
===================================================================
--- usrp2/trunk/host/lib/usrp2_basic.cc 2008-03-08 20:32:00 UTC (rev 7972)
+++ usrp2/trunk/host/lib/usrp2_basic.cc 2008-03-08 20:35:05 UTC (rev 7973)
@@ -483,22 +483,27 @@
   // state chart to handle this, defer other packets, etc.
 
   len = d_ethernet->read_packet(pktbuf, sizeof(*pktbuf));
-  // printf("read_packet = %d\n", len);
+  printf("read_packet = %d\n", len);
     
   if (len <= 0)
     return false;
 
   // shouldn't happen
-  if ((size_t) len < sizeof(u2_eth_packet_t))
+  if ((size_t) len < sizeof(u2_eth_packet_t)){
+    printf("short packet\n");
     return false;
+  }
 
-  if (u2p_chan(&((u2_eth_packet_t *)pktbuf)->fixed) != CONTROL_CHAN)
+  if (u2p_chan(&((u2_eth_packet_t *)pktbuf)->fixed) != CONTROL_CHAN){
+    printf("not control chan\n");
     return false;
+  }
 
   // point to beginning of payload (subpackets)
   unsigned char *p = pktbuf + sizeof(u2_eth_packet_t);
   int opcode = p[0];
 
+  printf("opcode = %d\n", opcode);
   if (opcode == OP_READ_TIME_REPLY){
     *time = ((op_read_time_reply_t *) p)->time;
     return true;