Merge branch 'develop' into bugfix-48-L1L2signaling

cmake_targets/autotests/README.txt

@@ -137,7 +137,13 @@ Obj.#   Case#   Test#	Description
 
 01      59              lte-softmodem tests with USRP X310  RF as eNB and  OAI EPC (eNB and EPC are on same machines) w/ Bandrich COTS UE
 
-01      61              lte-softmodem tests with USRP X310 RF as eNB and OAI EPC (eNB and EPC are on different machines) w/ Bandrich COTS UE
+01      60              lte-softmodem tests with USRP X310 RF as eNB and OAI EPC (eNB and EPC are on different machines) w/ Bandrich COTS UE
+01      60      00      Band 7 FDD 5MHz UL Throughput for 300 sec for 1TX/1RX
+01      60      01      Band 7 FDD 10MHz UL Throughput for 300 sec for 1TX/1RX
+01      60      02      Band 7 FDD 20MHz UL Throughput for 300 sec for 1TX/1RX
+01      60      03      Band 7 FDD 5MHz DL Throughput for 300 sec for 1TX/1RX
+01      60      04      Band 7 FDD 10MHz DL Throughput for 300 sec for 1TX/1RX
+01      60      05      Band 7 FDD 20MHz DL Throughput for 300 sec for 1TX/1RX
 
 01      61              lte-softmodem tests with EXMIMO RF as eNB and ALU EPC w/ Bandrich COTS UE for `TX/1RX, 2TX/2RX
 01      61      00      Band 7 FDD 5MHz UL Throughput for 300 sec for 1TX/1RX
@@ -148,7 +154,14 @@ Obj.#   Case#   Test#	Description
 01      61      05      Band 7 FDD 20MHz DL Throughput for 300 sec for 1TX/1RX
 
 01      62              lte-softmodem tests with EXMIMO RF as eNB and OAI EPC (eNB and EPC are on same machines) w/ Bandrich COTS UE
+
 01      63              lte-softmodem tests with EXMIMO RF as eNB and  OAI EPC (eNB and EPC are on different machines) w/ Bandrich COTS UE
+01      63      00      Band 7 FDD 5MHz UL Throughput for 300 sec for 1TX/1RX
+01      63      01      Band 7 FDD 10MHz UL Throughput for 300 sec for 1TX/1RX
+01      63      02      Band 7 FDD 20MHz UL Throughput for 300 sec for 1TX/1RX
+01      63      03      Band 7 FDD 5MHz DL Throughput for 300 sec for 1TX/1RX
+01      63      04      Band 7 FDD 10MHz DL Throughput for 300 sec for 1TX/1RX
+01      63      05      Band 7 FDD 20MHz DL Throughput for 300 sec for 1TX/1RX
 
 01      64              lte-softmodem-noS1 tests
 

openair2/LAYER2/MAC/eNB_scheduler_primitives.c

@@ -1101,8 +1101,9 @@ boolean_t CCE_allocation_infeasible(int module_idP,
     DCI_pdu->Num_ue_spec_dci++;
     ret = allocate_CCEs(module_idP,CC_idP,subframe,1);
     if (ret==-1)
-      res = FALSE;
+      res = TRUE;
     DCI_pdu->Num_ue_spec_dci--;
   }
+  return(res);
 }
 

openair2/RRC/LITE/rrc_eNB_S1AP.c

@@ -1188,7 +1188,7 @@ int rrc_eNB_process_S1AP_UE_CONTEXT_RELEASE_COMMAND (MessageDef *msg_p, const ch
       GTPV1U_ENB_DELETE_TUNNEL_REQ(msg_delete_tunnels_p).rnti = ue_context_p->ue_context.rnti;
 
       for (e_rab = 0; e_rab < ue_context_p->ue_context.nb_of_e_rabs; e_rab++) {
-        GTPV1U_ENB_DELETE_TUNNEL_REQ(msg_delete_tunnels_p).eps_bearer_id[GTPV1U_ENB_DELETE_TUNNEL_REQ(msg_p).num_erab++] =
+        GTPV1U_ENB_DELETE_TUNNEL_REQ(msg_delete_tunnels_p).eps_bearer_id[GTPV1U_ENB_DELETE_TUNNEL_REQ(msg_delete_tunnels_p).num_erab++] =
           ue_context_p->ue_context.enb_gtp_ebi[e_rab];
         // erase data
         ue_context_p->ue_context.enb_gtp_teid[e_rab] = 0;

targets/ARCH/COMMON/common_lib.c

@@ -54,7 +54,6 @@ int openair0_device_init(openair0_device *device, openair0_config_t *openair0_cf
   return(openair0_dev_init_exmimo(device, openair0_cfg));
 #elif OAI_USRP
   device->type=USRP_B200_IF;
-  openair0_dev_init_usrp(device, openair0_cfg);
   printf("openair0_dev_init_usrp ...\n");
   return(openair0_dev_init_usrp(device, openair0_cfg));
 

targets/ARCH/USRP/USERSPACE/LIB/usrp_lib.cpp

@@ -482,6 +482,7 @@ int openair0_dev_init_usrp(openair0_device* device, openair0_config_t *openair0_
 
   } else {
     printf("Found USRP B200");
+    args += ",num_recv_frames=256" ; 
     s->usrp = uhd::usrp::multi_usrp::make(args);
 
     //  s->usrp->set_rx_subdev_spec(rx_subdev);