Changeset 4521 for platform/USRP/trunk/USRP/src/USRP.h

Timestamp:

08/01/07 10:24:16 (6 years ago)

Author:

jgaeddert

Message:

improving USRP autofoo, major clean-up of code

Location:

platform/USRP/trunk/USRP/src

Files:

• . (added)
• USRP.h (moved) (moved from platform/USRP/trunk/USRP/USRP.h) (4 diffs)

platform/USRP/trunk/USRP/src/USRP.h

@@ -26 +26 @@
 #include <omnithread.h>
 
-#ifdef HAVE_USRP
 #include "usrp_standard.h"
-#endif
+#include "usrp_dbid.h"
+#include "usrp_prims.h"
 
 #include "ossie/cf.h"
@@ -147 +147 @@
 
 {
-  friend class USRP_RX_Control_i;
-  friend class USRP_TX_Control_i;
-
-  friend void rx_data_process(void *);
-
- public:
-  USRP_i(char *id, char *label, char *profile);
-
-  static void do_rx_data_process(void *u) {((USRP_i *)u)->rx_data_process(); };
-  static void do_tx_data_process(void *u) {((USRP_i *)u)->tx_data_process(); };
-
-  // Methods from the SCA definition
+    friend class USRP_RX_Control_i;
+    friend class USRP_TX_Control_i;
+
+    friend void rx_data_process(void *);
+
+  public:
+    USRP_i(char *id, char *label, char *profile);
+
+    static void do_rx_data_process(void *u) {((USRP_i *)u)->rx_data_process(); };
+    static void do_tx_data_process(void *u) {((USRP_i *)u)->tx_data_process(); };
+
+    // Methods from the SCA definition
     void start() throw (CF::Resource::StartError, CORBA::SystemException);
     void stop() throw (CF::Resource::StopError, CORBA::SystemException);
@@ -182 +182 @@
     //    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);
+
     // Port objects
     USRP_RX_Control_i* rx_control_port;
@@ -214 +217 @@
 
     long set_rx_packet_count;
-    long rx_packet_count;  // Number of packets to collect from USRP, -1 is forever
-    unsigned int rx_packet_size; // Number of samples to send to clients
-    unsigned int rx_data_size; // Size of words coming from USRP
+    long rx_packet_count;           ///< Number of packets to collect from USRP, -1 is forever
+    unsigned int rx_packet_size;    ///< Number of samples to send to clients
+    unsigned int rx_data_size;      ///< Size of words coming from USRP
     unsigned int number_of_channels;
-    bool complex;  // True for complex data from USRP
+    bool complex;                   ///< True for complex data from USRP
     unsigned int rx_overruns;