added frequency set thread

targets/ARCH/IRIS/USERSPACE/LIB/iris_lib.cpp

@@ -248,22 +248,49 @@ static bool is_equal(double a, double b)
 	return std::fabs(a-b) < std::numeric_limits<double>::epsilon();
 }
 
+void *set_freq_thread(void *arg) {
 
+    openair0_device *device=(openair0_device *)arg;
+    iris_state_t *s = (iris_state_t*)device->priv;
+    int i;
+    printf("Setting Iris TX Freq %f, RX Freq %f\n",device->openair0_cfg[0].tx_freq[0],device->openair0_cfg[0].rx_freq[0]);
+    // add check for the number of channels in the cfg
+    for(i=0; i < s->iris->getNumChannels(SOAPY_SDR_RX); i++) {
+	    if (i < device->openair0_cfg[0].rx_num_channels)
+            s->iris->setFrequency(SOAPY_SDR_RX, i, "RF", device->openair0_cfg[0].rx_freq[i]);
+    }
+    for(i=0; i < s->iris->getNumChannels(SOAPY_SDR_TX); i++) {
+	    if (i < device->openair0_cfg[0].tx_num_channels)
+            s->iris->setFrequency(SOAPY_SDR_TX, i, "RF", device->openair0_cfg[0].tx_freq[i]);
+    }
+}
 /*! \brief Set frequencies (TX/RX)
  * \param device the hardware to use
  * \param openair0_cfg RF frontend parameters set by application
  * \param dummy dummy variable not used
  * \returns 0 in success
  */
-int trx_iris_set_freq(openair0_device* device, openair0_config_t *openair0_cfg, int dont_block) {
-
+int trx_iris_set_freq(openair0_device* device, openair0_config_t *openair0_cfg, int dont_block)
+{
     iris_state_t *s = (iris_state_t*)device->priv;
-
+    pthread_t f_thread;
+    if (dont_block)
+        pthread_create(&f_thread, NULL, set_freq_thread, (void*)device);
+    else
+    {
+        int i;
         printf("Setting Iris TX Freq %f, RX Freq %f\n",openair0_cfg[0].tx_freq[0],openair0_cfg[0].rx_freq[0]);
-	s->iris->setFrequency(SOAPY_SDR_RX, 0, "RF", openair0_cfg[0].rx_freq[0]);
-	s->iris->setFrequency(SOAPY_SDR_TX, 0, "RF", openair0_cfg[0].tx_freq[0]);
-	s->iris->setFrequency(SOAPY_SDR_RX, 1, "RF", openair0_cfg[0].rx_freq[1]);
-	s->iris->setFrequency(SOAPY_SDR_TX, 1, "RF", openair0_cfg[0].tx_freq[1]);
+    	for(i=0; i < s->iris->getNumChannels(SOAPY_SDR_RX); i++) {
+	    	if (i < openair0_cfg[0].rx_num_channels) {
+                s->iris->setFrequency(SOAPY_SDR_RX, i, "RF", openair0_cfg[0].rx_freq[i]);
+            }
+        }
+    	for(i=0; i < s->iris->getNumChannels(SOAPY_SDR_TX); i++) {
+	    	if (i < openair0_cfg[0].tx_num_channels) {
+                s->iris->setFrequency(SOAPY_SDR_TX, i, "RF", openair0_cfg[0].tx_freq[i]);
+            }
+        }
+	}
     return(0);
 }
 
@@ -393,7 +420,6 @@ extern "C" {
 	char* remote_addr = device->openair0_cfg->remote_addr;
 	std::string args = "driver=remote,serial="+std::string(remote_addr);
 
-
 	s->iris = SoapySDR::Device::make(args);
 	device->type=IRIS_DEV;