copied over vrt context and type headers, updated bits.h as well

[debian/gnuradio] / vrt / include / vrt / quadradio.h

diff --git a/vrt/include/vrt/quadradio.h b/vrt/include/vrt/quadradio.h
index 747ca8ef4745e3d4f6dd948ee6b6a64a91a768df..525a177a82c8b4a7cf2a42a9e487d6c08bd924ff 100644 (file)
--- a/vrt/include/vrt/quadradio.h
+++ b/vrt/include/vrt/quadradio.h
@@ -38,6 +38,14 @@ typedef enum{
       
     } vrt_test_sig_t;
 
+typedef enum{
+    VRT_BAND_SEL_A='A',
+    VRT_BAND_SEL_B='B',
+    VRT_BAND_SEL_C='C',
+    VRT_BAND_SEL_D='D',  
+      
+    } vrt_band_sel_t;
+
 namespace vrt {
 
   /*
@@ -53,7 +61,7 @@ namespace vrt {
     int                   d_data_port;        // our data port number
     vrt::rx::sptr  d_rx;              // has-a rx
     
-    int                   d_band_select;              // band select setting
+    vrt_band_sel_t                d_band_select;              // band select setting
     int                   d_rx_antenna;               // antenna type rf/cal
     int                   d_attenuation0;             // attenuation setting
     int                   d_attenuation1;             // attenuation setting
@@ -64,12 +72,14 @@ namespace vrt {
                 int *ctrl_fd_ptr, struct in_addr *ctrl_port_inaddr,
                 int *data_fd_ptr, int *data_port_ptr);
 
+    // dsprxno selects the Rx DSP pipe (0 or 1) to configure
     static bool
-    send_rx_command(int ctrl_fd, bool start,
-                   struct in_addr addr, int data_port, int samples_per_pkt, int siggen_param);
+    send_rx_command(int ctrl_fd, int rxdspno, bool start,
+                   struct in_addr addr, int data_port, int samples_per_pkt);
 
+    // dsprxno selects the Rx DSP pipe (0 or 1) to stop
     static bool
-    send_stop_rx_command(int ctrl_fd);
+    send_stop_rx_command(int ctrl_fd, int rxdspno);
     
     static int control_port() { return 790; }
     int data_socket_fd() const { return d_data_fd; }
@@ -86,13 +96,14 @@ namespace vrt {
 
     vrt::rx::sptr vrt_rx() const { return d_rx; }
 
-    bool start_streaming(int samples_per_pkt = 0);
-    bool stop_streaming();
+    bool start_streaming(int rxdspno, int samples_per_pkt = 0);
 
+    bool stop_streaming(int rxdspno);
 
     /* convenience methods that ultimately write the dboard pins */
     bool set_center_freq(double target_freq);
-    bool set_band_select(const std::string &band);
+    bool set_band_select(vrt_band_sel_t band);
+    vrt_band_sel_t get_band_select(void){return d_band_select;}
     //void set_10dB_atten(bool on);
     bool set_attenuation0(int attenuation);
     bool select_rx_antenna(const std::string &ant);
@@ -110,6 +121,7 @@ namespace vrt {
     bool set_lo_freq(double freq);
     bool set_cal_freq(double freq);
     bool set_beamforming(int32_t gains[8]);
+    bool set_cal_enb(bool enb);
     /*
      * The first parameter for these is a bitmask which indicates which
      * daughterboard or daughterboards to apply the operation to.