[Commit-gnuradio] r9022 - usrp2/branches/features/host-ng/host-ng/lib

[eb]

Author: eb
Date: 2008-07-25 17:12:23 -0600 (Fri, 25 Jul 2008)
New Revision: 9022

Modified:
   usrp2/branches/features/host-ng/host-ng/lib/usrp2_impl.cc
Log:
usrp2 work-in-progress

Modified: usrp2/branches/features/host-ng/host-ng/lib/usrp2_impl.cc
===================================================================
--- usrp2/branches/features/host-ng/host-ng/lib/usrp2_impl.cc   2008-07-25 
22:30:14 UTC (rev 9021)
+++ usrp2/branches/features/host-ng/host-ng/lib/usrp2_impl.cc   2008-07-25 
23:12:23 UTC (rev 9022)
@@ -457,12 +457,12 @@
       memcpy(rp->buffer(), p, std::min(oplen, buflen));
       rp->signal();
       d_pending_replies[rid] = 0;
-      return 0; // release packet
+      return data_handler::RELEASE;
     }
 
     // TODO: handle unsolicited, USRP2 initiated, or late replies
     DEBUG_LOG("l");
-    return 0; // release packet
+    return data_handler::RELEASE;
   }
   
   data_handler::result
@@ -490,23 +490,22 @@
     d_rx_seqno = pkt->hdrs.thdr.seqno;
 
     unsigned int chan = u2p_chan(&pkt->hdrs.fixed);
-    if (d_channel_rings[chan] == 0) {
+    if (!d_channel_rings[chan]) {
       DEBUG_LOG("!");
-      return 0; // discard packet, no channel handler
+      return data_handler::RELEASE;    // discard packet, no channel handler
     }
 
     size_t offset = offsetof(u2_eth_samples_t, samples);
     if (d_channel_rings[chan]->enqueue(&pkt->samples, len-offset)) {
       inc_enqueued();
       DEBUG_LOG("+");
-      return KEEP; // channel ring runner will mark frame done
+      return data_handler::KEEP;       // channel ring runner will mark frame 
done
     }
     else {
       DEBUG_LOG("!");
-      return 0; // discard, no room in channel ring
+      return data_handler::RELEASE;    // discard, no room in channel ring
     }          
-
-    return 0;
+    return data_handler::RELEASE;
   }
 
   bool