Changeset 4747

Timestamp:

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

Author:

jgaeddert

Message:

minor support for metadata in USRP branch

Location:

platform/USRP/branches/USRP-metadata/src

Files:

• USRP.cpp (modified) (3 diffs)
• USRP.h (modified) (7 diffs)
• port_impl.cpp (modified) (3 diffs)

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

@@ -79 +79 @@
     rx_data_2_port = new standardInterfaces_i::complexShort_u("RX_Data_2", "DomainName1");
 
+    // Initialize meta data pointers, objects
+    rx_metadata_1 = new standardInterfaces::MetaData;
+    rx_metadata_2 = new standardInterfaces::MetaData;
+    tx_metadata   = new standardInterfaces::MetaData;
+    standardInterfaces::InitializeMetaData( *rx_metadata_1 );
+    standardInterfaces::InitializeMetaData( *rx_metadata_2 );
+    standardInterfaces::InitializeMetaData( *tx_metadata );
+
+}
+
+// Destructor
+USRP_i::~USRP_i() {
+
+    // Delete port instances
+    delete rx_control_port;
+    delete tx_control_port;
+    delete tx_data_port;
+    delete rx_data_1_port;
+    delete rx_data_2_port;
+
+    // Delete metadata objects
+    delete rx_metadata_1;
+    delete rx_metadata_2;
+    delete tx_metadata;
+
 }
 
@@ -530 +555 @@
             Q[i/2] = (CORBA::Short) rx_buffer[i+1];
         }
-        rx_data_1_port->pushPacket(I, Q);
+        // set rx_metadata_1 properties before passing
+        float f; // temporary placeholder for frequency
+        rx_control_port->get_frequency(0, f);
+        rx_metadata_1->carrier_frequency = f;
+        rx_metadata_1->sampling_frequency = 64e6f / float(usrp_rx->decim_rate());
+
+        // push data to output port
+        rx_data_1_port->pushPacket(I, Q, *rx_metadata_1);
 
         if (rx_packet_count != -1)
@@ -598 +630 @@
     while (tx_active) {
 
-        tx_data_port->getData(I_in, Q_in);
+        tx_data_port->getData(I_in, Q_in, tx_metadata);
 
         unsigned int data_length(I_in->length());

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();
 

platform/USRP/branches/USRP-metadata/src/port_impl.cpp

@@ -303 +303 @@
 }
 
+void USRP_RX_Control_i::get_db_reference(unsigned long channel, db_base *& db)
+{
+    
+}
+
 void USRP_RX_Control_i::set_frequency(unsigned long channel, float f)
 {
@@ -322 +327 @@
     
     if (!db) {
-        DEBUG(1, USRP, "Attempt to set frequency for slot with no board.");
-        return;  // No daughter board present
+        // No daughterboard present
+        std::cerr << "ERROR: USRP_RX_Control_i::get_frequency(): " << std::endl
+                  << "  Attempt to set frequency for slot with no board (channel "
+                  << channel << ")" << std::endl;
+        ///\todo: throw better exception
+        throw 0;
     }
 
@@ -363 +372 @@
 void USRP_RX_Control_i::get_frequency(unsigned long channel, float &f)
 {
-     f = usrp->usrp_rx->rx_freq(channel);
+    float ddc_freq = usrp->usrp_rx->rx_freq(channel); // DDC frequency
+
+    // Get local oscillator frequency on daughterboard (if available)
+    float lo_freq(0.0f);
+    db_base * db(NULL);
+    get_db_reference(channel, db);
+    if (!db) {
+        // No daughterboard present
+        std::cerr << "ERROR: USRP_RX_Control_i::get_frequency(): " << std::endl
+                  << "  Attempt to get frequency for slot with no board (channel "
+                  << channel << ")" << std::endl;
+        ///\todo: throw better exception
+        throw 0;
+    }
+
+    if (db->db_has_lo()) {
+        // get lo_freq here
+        // db->get_db_freq(lo_freq)
+    }
+
+    f = ddc_freq + lo_freq;
 }