[Commit-gnuradio] r9464 - in usrp2/trunk/host: apps include/usrp2

[jcorgan]

Author: jcorgan
Date: 2008-08-30 16:15:38 -0600 (Sat, 30 Aug 2008)
New Revision: 9464

Modified:
   usrp2/trunk/host/apps/test.sh
   usrp2/trunk/host/include/usrp2/rx_nop_handler.h
Log:
Add max_quantum to rx_nop_handler

Modified: usrp2/trunk/host/apps/test.sh
===================================================================
--- usrp2/trunk/host/apps/test.sh       2008-08-30 21:50:21 UTC (rev 9463)
+++ usrp2/trunk/host/apps/test.sh       2008-08-30 22:15:38 UTC (rev 9464)
@@ -1,3 +1,4 @@
 #!/bin/sh
 
-sudo ./rx_streaming_samples -d 4 -v
+sudo ./rx_streaming_samples -d 4 -v -N 100M
+

Modified: usrp2/trunk/host/include/usrp2/rx_nop_handler.h
===================================================================
--- usrp2/trunk/host/include/usrp2/rx_nop_handler.h     2008-08-30 21:50:21 UTC 
(rev 9463)
+++ usrp2/trunk/host/include/usrp2/rx_nop_handler.h     2008-08-30 22:15:38 UTC 
(rev 9464)
@@ -38,6 +38,7 @@
   class rx_nop_handler : public rx_sample_handler
   {
     uint64_t   d_max_samples;
+    uint64_t    d_max_quantum;
     uint64_t   d_nsamples;
     uint64_t   d_nframes;
     
@@ -51,10 +52,14 @@
 
     /*!
      * Constructor
-     * \p max_samples  Maximum number of samples to copy. Use 0 for no maximum.
+     *
+     * \param max_samples  Maximum number of samples to copy. Use zero for no 
maximum.
+     * \param max_quantum  Maximum number of samples required to accept in one 
call.
+     *                     Use 0 to indicate no maximum.
      */
-    rx_nop_handler(uint64_t max_samples)
-      : d_max_samples(max_samples), d_nsamples(0), d_nframes(0), d_err(false) 
{}
+    rx_nop_handler(uint64_t max_samples, uint64_t max_quantum=0)
+      : d_max_samples(max_samples), d_max_quantum(max_quantum), 
+        d_nsamples(0), d_nframes(0), d_err(false) {}
       
     /*!
      * Destructor.  Derived classes must implement their own, non-inline 
destructor.
@@ -86,7 +91,7 @@
      * \brief Returns true if this instance has reached the maximum number of 
samples
      */
     bool has_finished_p() const 
-    { return d_max_samples == 0 ? false : d_nsamples >= d_max_samples; }
+    { return d_max_samples == 0 ? false : d_nsamples >= 
d_max_samples-d_max_quantum; }
       
 
     /*!