Some minor changes to iris_lib.cpp, added command line switch for setting UE...

Some minor changes to iris_lib.cpp, added command line switch for setting UE remote address (Iris serial)

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

@@ -87,6 +87,7 @@ static int trx_iris_start(openair0_device *device)
  */
 static void trx_iris_end(openair0_device *device)
 {
+	LOG_I(HW,"Closing Iris device.\n");
 	iris_state_t *s = (iris_state_t*)device->priv;
 	s->iris->closeStream(s->txStream);
 	s->iris->closeStream(s->rxStream);
@@ -173,6 +174,8 @@ static int trx_iris_read(openair0_device *device, openair0_timestamp *ptimestamp
 	int flags = 0;
 	int samples_received = 0;
 	uint32_t **samps = (uint32_t **)buff;
+	printf("Reading %d samples from Iris...\n", nsamps);
+	fflush(stdout);
 	while (samples_received < nsamps)
 	{
 		flags = 0;
@@ -391,43 +394,40 @@ extern "C" {
 	// Initialize Iris device
 	device->openair0_cfg = openair0_cfg;
 	char* remote_addr = device->openair0_cfg->remote_addr;
+	LOG_I(HW,"Attempting to open Iris device: %s\n", remote_addr);
 	std::string args = "driver=remote,serial="+std::string(remote_addr);
 	
 
 	s->iris = SoapySDR::Device::make(args);
 	device->type=IRIS_DEV;
 
+	s->iris->setMasterClockRate(8*openair0_cfg[0].sample_rate); // sample*8=clock_rate for Soapy
 	switch ((int)openair0_cfg[0].sample_rate) {
 	case 30720000:		
-		s->iris->setMasterClockRate(8*30.72e6);
 		//openair0_cfg[0].samples_per_packet    = 1024;
 		openair0_cfg[0].tx_sample_advance     = 115;
 		openair0_cfg[0].tx_bw                 = 30e6;
 		openair0_cfg[0].rx_bw                 = 30e6;
 		break;
 	case 23040000:
-		s->iris->setMasterClockRate(8*23.04e6);
 		//openair0_cfg[0].samples_per_packet    = 1024;
 		openair0_cfg[0].tx_sample_advance     = 113;
 		openair0_cfg[0].tx_bw                 = 30e6;
 		openair0_cfg[0].rx_bw                 = 30e6;
 		break;
 	case 15360000:
-		s->iris->setMasterClockRate(8*15.36e6);
 		//openair0_cfg[0].samples_per_packet    = 1024;
 		openair0_cfg[0].tx_sample_advance     = 103; 
 		openair0_cfg[0].tx_bw                 = 30e6;
 		openair0_cfg[0].rx_bw                 = 30e6;
 		break;
 	case 7680000:
-		s->iris->setMasterClockRate(8*7.68e6); // sample*8=clock_rate for Soapy
 		//openair0_cfg[0].samples_per_packet    = 1024;
 		openair0_cfg[0].tx_sample_advance     = 80;
 		openair0_cfg[0].tx_bw                 = 30e6;
 		openair0_cfg[0].rx_bw                 = 30e6;
 		break;
 	case 1920000:
-		s->iris->setMasterClockRate(8*1.92e6);
 		//openair0_cfg[0].samples_per_packet    = 1024;
 		openair0_cfg[0].tx_sample_advance     = 40;
 		openair0_cfg[0].tx_bw                 = 30e6;
@@ -542,6 +542,8 @@ extern "C" {
 		s->tx_forward_nsamps = 90;
 	if(is_equal(s->sample_rate, (double)7.68e6))
 		s->tx_forward_nsamps = 50;
+
+	LOG_I(HW,"Finished initializing Iris device. %d %f \n");
 	return 0;
   }
 }

targets/RT/USER/lte-softmodem.c

@@ -267,7 +267,7 @@ int16_t           osa_log_verbosity  = LOG_MED;
 
 
 
-char *rrh_UE_ip = "127.0.0.1";
+char rrh_UE_ip[50] = "127.0.0.1";
 int rrh_UE_port = 51000;
 
 
@@ -384,7 +384,7 @@ void help (void) {
   printf("  -C Set the downlink frequency for all component carriers\n");
   printf("  -d Enable soft scope and L1 and L2 stats (Xforms)\n");
   printf("  -F Calibrate the EXMIMO borad, available files: exmimo2_2arxg.lime exmimo2_2brxg.lime \n");
-  printf("  -g Set the global log level, valide options: (9:trace, 8/7:debug, 6:info, 4:warn, 3:error)\n");
+  printf("  -g Set the global log level, valid options: (9:trace, 8/7:debug, 6:info, 4:warn, 3:error)\n");
   printf("  -G Set the global log verbosity \n");
   printf("  -h provides this help message!\n");
   printf("  -K Generate ITTI analyzser logs (similar to wireshark logs but with more details)\n");
@@ -400,6 +400,7 @@ void help (void) {
   printf("  -V Enable VCD (generated file will be located atopenair_dump_eNB.vcd, read it with target/RT/USER/eNB.gtkw\n");
   printf("  -x Set the transmission mode, valid options: 1 \n");
   printf("  -E Apply three-quarter of sampling frequency, 23.04 Msps to reduce the data rate on USB/PCIe transfers (only valid for 20 MHz)\n");
+  printf("  --rrh-remote-address Remote radio head address (serial for Iris)\n");
 #if T_TRACER
   printf("  --T_port [port]    use given port\n");
   printf("  --T_nowait         don't wait for tracer, start immediately\n");
@@ -690,6 +691,7 @@ static void get_options (int argc, char **argv)
     LONG_OPTION_USIMTEST,
     LONG_OPTION_MMAPPED_DMA,
     LONG_OPTION_SINGLE_THREAD_DISABLE,
+    LONG_OPTION_RRH_REMOTE_ADDRESS,
 #if T_TRACER
     LONG_OPTION_T_PORT,
     LONG_OPTION_T_NOWAIT,
@@ -717,6 +719,7 @@ static void get_options (int argc, char **argv)
     {"usim-test", no_argument, NULL, LONG_OPTION_USIMTEST},
     {"mmapped-dma", no_argument, NULL, LONG_OPTION_MMAPPED_DMA},
     {"single-thread-disable", no_argument, NULL, LONG_OPTION_SINGLE_THREAD_DISABLE},
+    {"rrh-remote-address", required_argument, NULL, LONG_OPTION_RRH_REMOTE_ADDRESS},
 #if T_TRACER
     {"T_port",                 required_argument, 0, LONG_OPTION_T_PORT},
     {"T_nowait",               no_argument,       0, LONG_OPTION_T_NOWAIT},
@@ -727,6 +730,16 @@ static void get_options (int argc, char **argv)
 
   while ((c = getopt_long (argc, argv, "A:a:C:dEK:g:F:G:hqO:m:SUVRM:r:P:Ws:t:Tx:",long_options,NULL)) != -1) {
     switch (c) {
+    case LONG_OPTION_RRH_REMOTE_ADDRESS:
+      if ((strcmp("null", optarg) == 0) || (strcmp("NULL", optarg) == 0)) {
+	printf("no rrh-remote-address is provided\n");
+      }
+      else if (strlen(optarg)<=49){
+	strcpy(rrh_UE_ip,optarg);
+      }else {
+	printf("rrh-remote-address is too long\n");
+	exit(-1);   
+      }
     case LONG_OPTION_RF_CONFIG_FILE:
       if ((strcmp("null", optarg) == 0) || (strcmp("NULL", optarg) == 0)) {
 	printf("no configuration filename is provided\n");