merge develop, compile ok, no test

2020-08-21 14:26:06 +02:00
parent c05bc1a3e9 7f28f8d10d
commit 38f01abd77
41 changed files with 828 additions and 683 deletions
@@ -705,7 +705,8 @@ int rfsimulator_read(openair0_device *device, openair0_timestamp *ptimestamp, vo
        random_channel(ptr->channel_model,0);
      if (t->poll_telnetcmdq)
      	  t->poll_telnetcmdq(t->telnetcmd_qid,t);
-      for (int a=0; a<nbAnt; a++) {
+
+      for (int a=0; a<nbAnt; a++) {//loop over number of Rx antennas
        if ( ptr->channel_model != NULL ) // apply a channel model
          rxAddInput( ptr->circularBuf, (struct complex16 *) samplesVoid[a],
                      a,
@@ -716,15 +717,18 @@ int rfsimulator_read(openair0_device *device, openair0_timestamp *ptimestamp, vo
                    );
        else { // no channel modeling
          sample_t *out=(sample_t *)samplesVoid[a];
-          const int64_t base=t->nextTimestamp*nbAnt+a;

-          for ( int i=0; i < nsamps; i++ ) {
-            const int idx=(i*nbAnt+base)%CirSize;
-            out[i].r+=ptr->circularBuf[idx].r;
-            out[i].i+=ptr->circularBuf[idx].i;
-          }
+          int nbAnt_tx = ptr->th.nbAnt;//number of Tx antennas
+          //LOG_I(HW, "nbAnt_tx %d\n",nbAnt_tx);
+          for (int i=0; i < nsamps; i++) {//loop over nsamps
+        	  for (int a_tx=0; a_tx<nbAnt_tx; a_tx++){//sum up signals from nbAnt_tx antennas
+        		  out[i].r+=ptr->circularBuf[((t->nextTimestamp+i)*nbAnt_tx+a_tx)%CirSize].r;
+        		  out[i].i+=ptr->circularBuf[((t->nextTimestamp+i)*nbAnt_tx+a_tx)%CirSize].i;
+        	  } // end for a_tx
+          } // end for i (number of samps)
+
        } // end of no channel modeling
-      } // end for a...
+      } // end for a (number of rx antennas)
    }
  }

@@ -248,7 +248,9 @@ RUs = (
         max_pdschReferenceSignalPower = -27;
         max_rxgain                    = 114;
         eNB_instances  = [0];
-	 sdr_addrs = "addr=192.168.10.2,mgmt_addr=192.168.10.2,second_addr=192.168.20.2";
+         #beamforming 1x4 matrix:
+         bf_weights = [0x00007fff, 0x0000, 0x0000, 0x0000];
+         sdr_addrs = "addr=192.168.10.2,mgmt_addr=192.168.10.2,second_addr=192.168.20.2";
         clock_src = "external";
    }
 );  
@@ -438,9 +438,6 @@ int restart_L1L2(module_id_t enb_id) {
  }

  RC.ru_mask |= (1 << ru->idx);
-  /* copy the changed frame parameters to the RU */
-  /* TODO this should be done for all RUs associated to this eNB */
-  memcpy(&ru->frame_parms, &RC.eNB[enb_id][0]->frame_parms, sizeof(LTE_DL_FRAME_PARMS));
  set_function_spec_param(RC.ru[enb_id]);
  /* reset the list of connected UEs in the MAC, since in this process with
   * loose all UEs (have to reconnect) */