[Commit-gnuradio] r8505 - usrp2/trunk/host/lib

[eb]

Author: eb
Date: 2008-05-25 22:27:51 -0600 (Sun, 25 May 2008)
New Revision: 8505

Modified:
   usrp2/trunk/host/lib/sample_buffer.cc
   usrp2/trunk/host/lib/sample_buffer.h
   usrp2/trunk/host/lib/usrp2_basic.h
Log:
removed unneeded typedef

Modified: usrp2/trunk/host/lib/sample_buffer.cc
===================================================================
--- usrp2/trunk/host/lib/sample_buffer.cc       2008-05-26 04:23:44 UTC (rev 
8504)
+++ usrp2/trunk/host/lib/sample_buffer.cc       2008-05-26 04:27:51 UTC (rev 
8505)
@@ -49,7 +49,7 @@
   while (is_full_p())
     d_not_full.wait();
 
-  sample_desc_t desc;
+  sample_desc desc;
   desc.nsamples = nsamples;
   desc.flags = flags;
   d_descs.write(1, &desc);
@@ -77,7 +77,7 @@
     }
     else {
       // Grab a descriptor out of the queue
-      sample_desc_t desc;
+      sample_desc desc;
       d_descs.read(1, &desc);
       n = std::min(nmax-count, desc.nsamples);
       d_rx_remainder = desc.nsamples-n;

Modified: usrp2/trunk/host/lib/sample_buffer.h
===================================================================
--- usrp2/trunk/host/lib/sample_buffer.h        2008-05-26 04:23:44 UTC (rev 
8504)
+++ usrp2/trunk/host/lib/sample_buffer.h        2008-05-26 04:27:51 UTC (rev 
8505)
@@ -22,18 +22,18 @@
 #include "ring_buffer.h"
 #include <omnithread.h>
 
-typedef struct sample_desc
+struct sample_desc
 {
   size_t nsamples;
   uint32_t flags;
-}
-sample_desc_t;
+};
 
-typedef class sample_buffer
+
+class sample_buffer
 {
 private:
   ring_buffer<uint32_t> d_samples;
-  ring_buffer<sample_desc_t> d_descs;
+  ring_buffer<sample_desc> d_descs;
   size_t d_rx_remainder;
   
   omni_mutex d_mutex;
@@ -86,7 +86,7 @@
    * Returns items available for reading
    */
   size_t items_available() const { return d_samples.items_available(); }
-}
-sample_buffer_t;
+};
 
+
 #endif /* INCLUDED_SAMPLE_BUFFER_H */

Modified: usrp2/trunk/host/lib/usrp2_basic.h
===================================================================
--- usrp2/trunk/host/lib/usrp2_basic.h  2008-05-26 04:23:44 UTC (rev 8504)
+++ usrp2/trunk/host/lib/usrp2_basic.h  2008-05-26 04:27:51 UTC (rev 8505)
@@ -53,8 +53,8 @@
   bool           d_tx_started;
   
   usrp2_basic_thread *d_thread;
-  sample_buffer_t d_rx_samples;
-  sample_buffer_t d_tx_samples;
+  sample_buffer   d_rx_samples;
+  sample_buffer   d_tx_samples;
   
   void init_et_hdrs(u2_eth_packet_t *p, const u2_mac_addr_t &dst);