Changeset 4747 for platform/USRP/branches/USRP-metadata/src/USRP.h

Timestamp:

08/17/07 12:13:44 (6 years ago)

Author:

jgaeddert

Message:

minor support for metadata in USRP branch

Files:

• platform/USRP/branches/USRP-metadata/src/USRP.h (modified) (7 diffs)

platform/USRP/branches/USRP-metadata/src/USRP.h

@@ -76 +76 @@
     USRP_RX_Control_i();  // No default constructor
     USRP_RX_Control_i(const USRP_RX_Control_i &); // No copying
+
+    /// return pointer to daughterboard
+    void get_db_reference(unsigned long channel, db_base *& db);
  
     USRP_i *usrp;
@@ -127 +130 @@
     ~TX_data_i();
 
-    void pushPacket(const PortTypes::ShortSequence &I, const PortTypes::ShortSequence &Q);
+    void pushPacket(
+            const PortTypes::ShortSequence &I,
+            const PortTypes::ShortSequence &Q,
+            const standardInterfaces::MetaData &packet_data);
 
  private:
@@ -142 +148 @@
 
 // Main USRP device definition
-void rx_data_process(void *data);
 
 class USRP_i : public virtual Device_impl
@@ -150 +155 @@
     friend class USRP_TX_Control_i;
 
-    friend void rx_data_process(void *);
-
   public:
     USRP_i(char *id, char *label, char *profile);
+
+    /// Destructor
+    ~USRP_i();
 
     static void do_rx_data_process(void *u) {((USRP_i *)u)->rx_data_process(); };
@@ -179 +185 @@
     USRP_i(const USRP_i&);  // No copying
 
-    // RX data processing thread
-    //    static void rx_data_process(void * data); ///\todo verify statis is the online way
-
     /// Prints warning about unsupported USRP daughter boards
     void PrintDaughterboardWarning(const char * db_name);
@@ -191 +194 @@
     standardInterfaces_i::complexShort_u* rx_data_1_port;
     standardInterfaces_i::complexShort_u* rx_data_2_port;
+    standardInterfaces::MetaData* rx_metadata_1;
+    standardInterfaces::MetaData* rx_metadata_2;
 
     standardInterfaces_i::complexShort_p* tx_data_port;
+    standardInterfaces::MetaData* tx_metadata;
 
     // usrp variables
@@ -213 +219 @@
     omni_thread *tx_thread;
 
+    /// Main RX processing thread
     void rx_data_process();
+
+    /// Main TX processing thread
     void tx_data_process();