testing after integration of eMTC

openair2/LAYER2/MAC/config.c

@@ -727,8 +727,7 @@ config_dedicated_scell(int Mod_idP,
 }
 
 
-int
-rrc_mac_config_req_eNB(module_id_t Mod_idP,
+int rrc_mac_config_req_eNB(module_id_t Mod_idP,
 			   int CC_idP,
 			   int physCellId,
 			   int p_eNB,
@@ -897,36 +896,18 @@ rrc_mac_config_req_eNB(module_id_t Mod_idP,
   if (logicalChannelConfig != NULL) {	// check for eMTC specific things
     UE_id = find_UE_id(Mod_idP, rntiP);
 
-    if (UE_id == -1) {
-      LOG_E(MAC, "%s:%d:%s: ERROR, UE_id == -1\n", __FILE__,
-	    __LINE__, __FUNCTION__);
-    } else {
+    AssertFatal(UE_id>=0,"Configuration received for unknown UE (%x), shouldn't happen\n",rntiP);
     if (logicalChannelConfig) {
-        UE_list->
-          UE_template[CC_idP][UE_id].lcgidmap
-          [logicalChannelIdentity] =
-          *logicalChannelConfig->
-			ul_SpecificParameters->logicalChannelGroup;
-		UE_list->
-          UE_template[CC_idP][UE_id].lcgidpriority
-          [logicalChannelIdentity]=
-			logicalChannelConfig->ul_SpecificParameters->priority;
-
-		} else
-			UE_list->
-				UE_template[CC_idP][UE_id].lcgidmap
-				[logicalChannelIdentity] = 0;
+        UE_list->UE_template[CC_idP][UE_id].lcgidmap[logicalChannelIdentity]      = *logicalChannelConfig->ul_SpecificParameters->logicalChannelGroup;
+	UE_list->UE_template[CC_idP][UE_id].lcgidpriority[logicalChannelIdentity] =  logicalChannelConfig->ul_SpecificParameters->priority;
+    } else UE_list->UE_template[CC_idP][UE_id].lcgidmap[logicalChannelIdentity]   =  0;
   }
-  }
-
   
   if (physicalConfigDedicated != NULL) {
     UE_id = find_UE_id(Mod_idP, rntiP);
-
-    if (UE_id == -1)
-      LOG_E(MAC, "%s:%d:%s: ERROR, UE_id == -1\n", __FILE__, __LINE__, __FUNCTION__);
-    else
+    AssertFatal(UE_id>=0,"Configuration received for unknown UE (%x), shouldn't happen\n",rntiP);
     UE_list->UE_template[CC_idP][UE_id].physicalConfigDedicated = physicalConfigDedicated;
+    LOG_I(MAC,"Added physicalConfigDedicated %p for %d.%d\n",physicalConfigDedicated,CC_idP,UE_id);
   }
 
 
@@ -934,27 +915,19 @@ rrc_mac_config_req_eNB(module_id_t Mod_idP,
 
   if (sCellToAddMod_r10 != NULL) {
     UE_id = find_UE_id(Mod_idP, rntiP);
-    if (UE_id == -1)
-      LOG_E(MAC, "%s:%d:%s: ERROR, UE_id == -1\n", __FILE__,
-	    __LINE__, __FUNCTION__);
-    else
+    AssertFatal(UE_id>=0,"Configuration received for unknown UE (%x), shouldn't happen\n",rntiP);
     config_dedicated_scell(Mod_idP, rntiP, sCellToAddMod_r10);
   }
 #endif
 
-
-
-
   if (mbsfn_SubframeConfigList != NULL) {
     LOG_I(MAC,
 	  "[eNB %d][CONFIG] Received %d subframe allocation pattern for MBSFN\n",
 	  Mod_idP, mbsfn_SubframeConfigList->list.count);
-    RC.mac[Mod_idP]->common_channels[0].num_sf_allocation_pattern =
-      mbsfn_SubframeConfigList->list.count;
+    RC.mac[Mod_idP]->common_channels[0].num_sf_allocation_pattern = mbsfn_SubframeConfigList->list.count;
 
     for (i = 0; i < mbsfn_SubframeConfigList->list.count; i++) {
-      RC.mac[Mod_idP]->common_channels[0].mbsfn_SubframeConfig[i] =
-	mbsfn_SubframeConfigList->list.array[i];
+      RC.mac[Mod_idP]->common_channels[0].mbsfn_SubframeConfig[i] = mbsfn_SubframeConfigList->list.array[i];
       LOG_I(MAC,
 	    "[eNB %d][CONFIG] MBSFN_SubframeConfig[%d] pattern is  %x\n",
 	    Mod_idP, i,

openair2/LAYER2/MAC/eNB_scheduler_dlsch.c

@@ -1704,7 +1704,7 @@ schedule_ue_spec(module_id_t module_idP, int slice_idxP,
                                           format2A);
             break;
           default:
-            LOG_W(MAC, "Unsupported transmission mode %d\n", get_tmode(module_idP, CC_id, UE_id));
+            AssertFatal(1==0,"Unsupported transmission mode %d\n", get_tmode(module_idP, CC_id, UE_id));
             aggregation = 2;
         }
       }

openair2/LAYER2/MAC/eNB_scheduler_primitives.c

@@ -2272,7 +2272,7 @@ uint8_t get_tmode(module_id_t module_idP, int CC_idP, int UE_idP)
   eNB_MAC_INST *eNB = RC.mac[module_idP];
   COMMON_channels_t *cc = &eNB->common_channels[CC_idP];
 
-  struct LTE_PhysicalConfigDedicated *physicalConfigDedicated = &eNB->UE_list.physicalConfigDedicated[CC_idP][UE_idP];
+  struct LTE_PhysicalConfigDedicated *physicalConfigDedicated = eNB->UE_list.UE_template[CC_idP][UE_idP].physicalConfigDedicated;
 
   if (physicalConfigDedicated == NULL) {	// RRCConnectionSetup not received by UE yet
     AssertFatal(cc->p_eNB <= 2, "p_eNB is %d, should be <2\n",
@@ -2280,8 +2280,8 @@ uint8_t get_tmode(module_id_t module_idP, int CC_idP, int UE_idP)
     return (cc->p_eNB);
   } else {
     AssertFatal(physicalConfigDedicated->antennaInfo != NULL,
-		"antennaInfo is null for CCId %d, UEid %d\n", CC_idP,
-		UE_idP);
+		"antennaInfo (mod_id %d) is null for CCId %d, UEid %d, physicalConfigDedicated %p\n", module_idP,CC_idP,
+		UE_idP,physicalConfigDedicated);
 
     AssertFatal(physicalConfigDedicated->antennaInfo->present !=
 		LTE_PhysicalConfigDedicated__antennaInfo_PR_NOTHING,
@@ -2290,7 +2290,7 @@ uint8_t get_tmode(module_id_t module_idP, int CC_idP, int UE_idP)
 
     if (physicalConfigDedicated->antennaInfo->present ==
 	LTE_PhysicalConfigDedicated__antennaInfo_PR_explicitValue) {
-      return (physicalConfigDedicated->antennaInfo->
+      return (1+physicalConfigDedicated->antennaInfo->
 	      choice.explicitValue.transmissionMode);
     } else if (physicalConfigDedicated->antennaInfo->present ==
 	       LTE_PhysicalConfigDedicated__antennaInfo_PR_defaultValue) {

openair2/LAYER2/MAC/mac.h

@@ -1070,10 +1070,6 @@ typedef struct {
 } SBMAP_CONF;
 /*! \brief UE list used by eNB to order UEs/CC for scheduling*/
 typedef struct {
-    /// Dedicated information for UEs
-    struct PhysicalConfigDedicated
-	*physicalConfigDedicated[NFAPI_CC_MAX][MAX_MOBILES_PER_ENB];
-    /// DLSCH pdu
   DLSCH_PDU DLSCH_pdu[NFAPI_CC_MAX][2][MAX_MOBILES_PER_ENB];
   /// DCI template and MAC connection parameters for UEs
   UE_TEMPLATE UE_template[NFAPI_CC_MAX][MAX_MOBILES_PER_ENB];

openair2/RRC/LTE/MESSAGES/asn1_msg.c

@@ -2855,6 +2855,8 @@ do_RRCConnectionSetup(
   //assign_enum(&physicalConfigDedicated2->antennaInfo->choice.explicitValue.transmissionMode,
   //     AntennaInfoDedicated__transmissionMode_tm2);
 
+  LOG_D(RRC,"physicalConfigDedicated2 %p, physicalConfigDedicated2->antennaInfo %p => %d\n",physicalConfigDedicated2,physicalConfigDedicated2->antennaInfo,transmission_mode);
+
   switch (transmission_mode) {
   default:
     LOG_W(RRC,"At RRCConnectionSetup Transmission mode can only take values 1 or 2! Defaulting to 1!\n");