Changeset 11094 for ossiedev/branches/june/trunk/platform/USRP_UHD/src/USRP_UHD.h

Timestamp:

04/05/12 13:02:33 (14 months ago)

Author:

june

Message:

Completing test on USRP1, USRP2

Files:

• ossiedev/branches/june/trunk/platform/USRP_UHD/src/USRP_UHD.h (modified) (4 diffs)

ossiedev/branches/june/trunk/platform/USRP_UHD/src/USRP_UHD.h

@@ -30 +30 @@
 
 #include <uhd/usrp/multi_usrp.hpp>
+#include <uhd/property_tree.hpp>
+#include <uhd/usrp/dboard_id.hpp>
+#include <uhd/usrp/mboard_eeprom.hpp>
+#include <uhd/usrp/subdev_spec.hpp>
+#include <uhd/usrp/dboard_eeprom.hpp>
+#include <uhd/usrp/dboard_manager.hpp>
 
 #include "ossie/cf.h"
@@ -43 +49 @@
 #define ADC_RATE 100e6
 #define USRP_UHD_MAX_TX_SAMPLES 4192
+#define MAX_TX_CHANNEL  2
+#define MAX_RX_CHANNEL  2
 
 // Definitions for provides ports
@@ -173 +181 @@
     USRP_UHD_TX_Control_i* tx_control_port;
 
-    standardInterfaces_i::complexShort_u* rx_data_1_port;
-    standardInterfaces_i::complexShort_u* rx_data_2_port;
-
-    standardInterfaces_i::complexShort_p* tx_data_port;
+    standardInterfaces_i::complexShort_u* rx_data_ports[MAX_RX_CHANNEL];
+    standardInterfaces_i::complexShort_p* tx_data_ports[MAX_TX_CHANNEL];
 
 // usrp_uhd variables
     uhd::usrp::multi_usrp::sptr sdev;
     uhd::device::sptr dev;
-    std::vector<std::complex<short> > rx_buff;
+
+
     omni_thread *rx_thread;
     omni_thread *tx_thread;
 
+    void rx_error_helper(uhd::rx_metadata_t::error_code_t error);
     void rx_data_process();
     void tx_data_process();
+    void probe_usrp();
 
     long set_rx_packet_count;
@@ -203 +212 @@
     bool full_duplex;   
     bool did_rx;           
-};
+
+    size_t mb_count;
+    size_t db_count;
+    size_t tx_channels;
+    size_t rx_channels;
+
+
+};