bladerf: Moved no longer "common" items out of bladerf_common

The gr_complex FIFO is no longer used on the TX side, so it doesn't
really make sense to have it in bladerf_common. The associated items
have been moved into bladerf_source, and some renaming has been done in
bladerf_sink to tidy up.

Pending further performance tests of the bladerf_source, the _fifo
member (boost::circular_buffer) may need to be replaced.

1 files changed, 6 insertions, 6 deletions

diff --git a/lib/bladerf/bladerf_sink_c.h b/lib/bladerf/bladerf_sink_c.h
index a0e028b..d969264 100644
--- a/lib/bladerf/bladerf_sink_c.h
+++ b/lib/bladerf/bladerf_sink_c.h
@@ -126,16 +126,16 @@ private: /* members */
   bool *_filled;
 
   /* Acquire while updating _filled, and signalling/waiting on
-   * _buffer_emptied and _samples_avail */
+   * _buffer_emptied and _buffer_filled */
   boost::mutex _buf_status_lock;
 
-  /* wait() may block waiting for the TX callbacks to make a buffer availble.
-   * The callback uses this to signal when it has emptied out a buffer. */
+  /* work() may block waiting for the stream callback to empty (consume) a
+   * buffer. The callback uses this to signal when it has emptied a buffer. */
   boost::condition_variable _buffer_emptied;
 
-  /* The parent's _samples_avail is used to denote that work() has
-   * filled a buffer, unblocking a TX callback that's waiting for samples */
-
+  /* The stream callback may block waiting for work() to fill (produce) a
+   * buffer. work() uses this to signal that it has filled a buffer. */
+  boost::condition_variable _buffer_filled;
 
   /* These values are only to be updated and accessed from within work() */
   int16_t *_next_value; /* I/Q value insertion point in current buffer */