added missing files. updates for testing in eMTC configuration after merge.

openair1/SCHED/fapi_l1.c

@@ -98,9 +98,9 @@ void handle_nfapi_hi_dci0_mpdcch_dci_pdu(PHY_VARS_eNB *eNB,eNB_rxtx_proc_t *proc
 					 nfapi_hi_dci0_request_pdu_t *hi_dci0_config_pdu)
 {
   int idx                         = proc->subframe_tx&1;
-  LTE_eNB_PDCCH *pdcch_vars       = &eNB->mpdcch_vars[idx];
+  LTE_eNB_MPDCCH *pdcch_vars      = &eNB->mpdcch_vars[idx];
   // copy dci configuration in to eNB structure
-  fill_mpdcch_dci0(eNB,proc,&pdcch_vars->dci_alloc[pdcch_vars->num_dci], &hi_dci0_config_pdu->dci_pdu);
+  fill_mpdcch_dci0(eNB,proc,&pdcch_vars->mdci_alloc[pdcch_vars->num_dci], &hi_dci0_config_pdu->dci_pdu);
 }
 
 void handle_nfapi_hi_dci0_hi_pdu(PHY_VARS_eNB *eNB,int frame,int subframe,eNB_rxtx_proc_t *proc,

openair2/LAYER2/MAC/eNB_scheduler_dlsch.c

@@ -2743,7 +2743,6 @@ schedule_ue_spec_br(
   struct LTE_PUCCH_ConfigCommon_v1310 *ext4_pucch;
   LTE_PRACH_ParametersListCE_r13_t *prach_ParametersListCE_r13;
   struct LTE_N1PUCCH_AN_InfoList_r13 *pucch_N1PUCCH_AN_InfoList_r13;
-  LTE_PRACH_ParametersCE_r13_t *p[4] = { NULL, NULL, NULL, NULL };
   int             pucchreps[4] = { 1, 1, 1, 1 };
   int             n1pucchan[4] = { 0, 0, 0, 0 }; 
   uint32_t        ackNAK_absSF;
@@ -2769,23 +2768,19 @@ schedule_ue_spec_br(
 
     switch (prach_ParametersListCE_r13->list.count) {
     case 4:
-      p[3] = prach_ParametersListCE_r13->list.array[3];
       n1pucchan[3] = *pucch_N1PUCCH_AN_InfoList_r13->list.array[3];
       AssertFatal (ext4_pucch->pucch_NumRepetitionCE_Msg4_Level3_r13 != NULL, "pucch_NumRepetitionCE_Msg4_Level3 shouldn't be NULL\n");
       pucchreps[3] = (int) (4 << *ext4_pucch->pucch_NumRepetitionCE_Msg4_Level3_r13);
 
     case 3:
-      p[2] = prach_ParametersListCE_r13->list.array[2];
       n1pucchan[2] = *pucch_N1PUCCH_AN_InfoList_r13->list.array[2];
       AssertFatal (ext4_pucch->pucch_NumRepetitionCE_Msg4_Level2_r13 != NULL, "pucch_NumRepetitionCE_Msg4_Level2 shouldn't be NULL\n");
       pucchreps[2] = (int) (4 << *ext4_pucch->pucch_NumRepetitionCE_Msg4_Level2_r13);
     case 2:
-      p[1] = prach_ParametersListCE_r13->list.array[1];
       n1pucchan[1] = *pucch_N1PUCCH_AN_InfoList_r13->list.array[1];
       AssertFatal (ext4_pucch->pucch_NumRepetitionCE_Msg4_Level1_r13 != NULL, "pucch_NumRepetitionCE_Msg4_Level1 shouldn't be NULL\n");
       pucchreps[1] = (int) (1 << *ext4_pucch->pucch_NumRepetitionCE_Msg4_Level1_r13);
     case 1:
-      p[0] = prach_ParametersListCE_r13->list.array[0];
       n1pucchan[0] = *pucch_N1PUCCH_AN_InfoList_r13->list.array[0];
       AssertFatal (ext4_pucch->pucch_NumRepetitionCE_Msg4_Level0_r13 != NULL, "pucch_NumRepetitionCE_Msg4_Level0 shouldn't be NULL\n");
       pucchreps[0] = (int) (1 << *ext4_pucch->pucch_NumRepetitionCE_Msg4_Level0_r13);

openair2/LAYER2/MAC/eNB_scheduler_primitives.c

@@ -2272,8 +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.physicalConfigDedicated[CC_idP][UE_idP];
 
   if (physicalConfigDedicated == NULL) {	// RRCConnectionSetup not received by UE yet
     AssertFatal(cc->p_eNB <= 2, "p_eNB is %d, should be <2\n",