Update Rmax according to dedicate configuration

openair1/PHY/LTE_TRANSPORT/dci_tools_NB_IoT.c

@@ -183,9 +183,9 @@ int generate_eNB_ulsch_params_from_dci_NB_IoT(PHY_VARS_eNB            *eNB,
   ndlcch->rnti[ncce_index] = rnti; //we store the RNTI (e.g. for RNTI will be used later)
   ndlcch->active[ncce_index] = 1; //will be activated by the corresponding NDSLCH pdu
 
-  ndlcch->dci_repetitions[ncce_index]          = DCIrep_to_real_rep(DCIRep,4);        ////??????? should be repalce by the value in spec table 16.6-3, check also Rmax
+  ndlcch->dci_repetitions[ncce_index]          = DCIrep_to_real_rep(DCIRep,16);        ////??????? should be repalce by the value in spec table 16.6-3, check also Rmax
 
-  //printf("dci_repetitions: %d, A = %d\n",ndlcch->dci_repetitions[ncce_index],ndlcch->A[ncce_index]);
+  printf("dci_repetitions: %d, A = %d\n",ndlcch->dci_repetitions[ncce_index],ndlcch->A[ncce_index]);
 
   DCI_flip = (uint8_t*)malloc(3*sizeof(uint8_t));
 
@@ -209,7 +209,7 @@ int generate_eNB_ulsch_params_from_dci_NB_IoT(PHY_VARS_eNB            *eNB,
      * ISF = ResAssign
      */
 
-    ndlcch->counter_repetition_number[ncce_index] = DCIrep_to_real_rep(DCIRep,4);          ////??????? should be repalce by the value in spec table 16.6-3, check also Rmax
+    ndlcch->counter_repetition_number[ncce_index] = DCIrep_to_real_rep(DCIRep,16);          ////??????? should be repalce by the value in spec table 16.6-3, check also Rmax
 
 
     LOG_I(PHY,"DCI packing for N0 done \n");

openair2/LAYER2/MAC/main_NB_IoT.c

@@ -152,8 +152,8 @@ void init_mac_NB_IoT(eNB_MAC_INST_NB_IoT *mac_inst)
     //(mac_inst->UE_list_spec+i)->NPDCCH_config_dedicated.R_max = mac_inst->rrc_config.npdcch_ConfigDedicated[i].R_max;
     //(mac_inst->UE_list_spec+i)->NPDCCH_config_dedicated.G = mac_inst->rrc_config.npdcch_ConfigDedicated[i].G;
     //(mac_inst->UE_list_spec+i)->NPDCCH_config_dedicated.a_offset = mac_inst->rrc_config.npdcch_ConfigDedicated[i].a_offset;
-    (mac_inst->UE_list_spec+i)->NPDCCH_config_dedicated.R_max = 4;
-    (mac_inst->UE_list_spec+i)->NPDCCH_config_dedicated.G = 1;
+    (mac_inst->UE_list_spec+i)->NPDCCH_config_dedicated.R_max = 16;
+    (mac_inst->UE_list_spec+i)->NPDCCH_config_dedicated.G = 4;
     (mac_inst->UE_list_spec+i)->NPDCCH_config_dedicated.a_offset = 0;
     (mac_inst->UE_list_spec+i)->NPDCCH_config_dedicated.T = (uint32_t)((double)(mac_inst->UE_list_spec+i)->NPDCCH_config_dedicated.R_max * (mac_inst->UE_list_spec+i)->NPDCCH_config_dedicated.G);
     (mac_inst->UE_list_spec+i)->NPDCCH_config_dedicated.ss_start_uss = (mac_inst->UE_list_spec+i)->NPDCCH_config_dedicated.T * (mac_inst->UE_list_spec+i)->NPDCCH_config_dedicated.a_offset;

openair2/LAYER2/MAC/schedule_tool_NB_IoT.c

@@ -746,8 +746,8 @@ void add_ue_NB_IoT(eNB_MAC_INST_NB_IoT *mac_inst, uint16_t rnti, ce_level_t ce,
             UE_list->UE_template_NB_IoT[i].CE_level = (uint32_t)ce;
             //assume random select direction
             UE_list->UE_template_NB_IoT[i].R_dci = dci_rep[(uint32_t)ce];
-            //UE_list->UE_template_NB_IoT[i].R_max = UE_list->NPDCCH_config_dedicated.R_max;
-            UE_list->UE_template_NB_IoT[i].R_max = 4;
+            UE_list->UE_template_NB_IoT[i].R_max = UE_list->NPDCCH_config_dedicated.R_max;
+            //UE_list->UE_template_NB_IoT[i].R_max = 16;
             UE_list->UE_template_NB_IoT[i].R_harq = harq_rep[(uint32_t)ce];
             UE_list->UE_template_NB_IoT[i].HARQ_round = 0;
             UE_list->UE_template_NB_IoT[i].oldNDI_UL = 0;