[Commit-gnuradio] r8605 - usrp2/branches/developers/eb/r8407-host/lib

[eb]

Author: eb
Date: 2008-06-17 17:22:16 -0600 (Tue, 17 Jun 2008)
New Revision: 8605

Modified:
   usrp2/branches/developers/eb/r8407-host/lib/usrp2_basic.cc
Log:
old code now ignores control frames

Modified: usrp2/branches/developers/eb/r8407-host/lib/usrp2_basic.cc
===================================================================
--- usrp2/branches/developers/eb/r8407-host/lib/usrp2_basic.cc  2008-06-17 
23:10:18 UTC (rev 8604)
+++ usrp2/branches/developers/eb/r8407-host/lib/usrp2_basic.cc  2008-06-17 
23:22:16 UTC (rev 8605)
@@ -558,13 +558,15 @@
   if (len <= 0)
     return len;
 
-  // FIXME check channel
-
-
   // shouldn't happen
   if ((size_t) len < sizeof(u2_eth_packet_t))
     return 0;
 
+  // if control channel, ignore and try again
+  if (u2p_chan(&pkt->hdrs.fixed) == CONTROL_CHAN){
+    return read_raw_samples(which, pkt);
+  }
+
   // convert to samples
   int r = (len - sizeof(u2_eth_packet_t)) / sizeof(uint32_t);
   // printf("read_raw_samples = %d\n", r);