fix merge miss.

openair1/SCHED/phy_procedures_lte_eNb.c

@@ -297,6 +297,7 @@ bool dlsch_procedures(PHY_VARS_eNB *eNB,
     if (dlsch_harq->pdu==NULL) {
       LOG_E(PHY,"dlsch_harq->pdu == NULL SFN/SF:%04d%d dlsch[rnti:%x] dlsch_harq[pdu:%p pdsch_start:%d Qm:%d Nl:%d round:%d nb_rb:%d rb_alloc[0]:%d]\n", frame,subframe,dlsch->rnti, dlsch_harq->pdu,
             dlsch_harq->pdsch_start,dlsch_harq->Qm,dlsch_harq->Nl,dlsch_harq->round,dlsch_harq->nb_rb,dlsch_harq->rb_alloc[0]);
+      dlsch->active[subframe] = 0;
       return false;
     }
 
@@ -871,6 +872,7 @@ uci_procedures(PHY_VARS_eNB *eNB,
 #endif
 #endif
             if (SR_payload == 1) { // this implements Table 7.3.1 from 36.213
+            if(uci->pucch_fmt==pucch_format1b){
               if (pucch_b0b1[0][0] == 4) { // there isn't a likely transmission
                 harq_ack[0] = 4; // DTX
               } else if (pucch_b0b1[0][0] == 1 && pucch_b0b1[0][1] == 1) { // 1/4/7 ACKs
@@ -885,6 +887,13 @@ uci_procedures(PHY_VARS_eNB *eNB,
 
               uci->stat = metric[0];
               fill_uci_harq_indication(eNB,uci,frame,subframe,harq_ack,2,0xffff); // special_bundling mode
+              }else{
+                harq_ack[0] = pucch_b0b1[0][0];
+                harq_ack[1] = pucch_b0b1[0][1];
+                uci->stat = metric[0];
+                LOG_D(PHY,"bundling with sr: (%d,%d), metric %d\n",harq_ack[0],harq_ack[1],uci->stat);
+                fill_uci_harq_indication(eNB,uci,frame,subframe,harq_ack,0,0xffff); // special_bundling mode
+              }
             } else if ((uci->tdd_bundling == 0) && (uci->num_pucch_resources==2)) { // multiplexing + no SR, implement Table 10.1.3-5 (Rel14) for multiplexing with M=2
               if (pucch_b0b1[0][0] == 4 ||
                   pucch_b0b1[1][0] == 4) { // there isn't a likely transmission

openair2/LAYER2/MAC/eNB_scheduler_primitives.c

@@ -1291,7 +1291,6 @@ int getM_mac(COMMON_channels_t *cc,sub_frame_t subframeP){
             return 1;
         }
         break;
-      
       case 1:
         switch (subframeP) {
           case 2:
@@ -1302,7 +1301,6 @@ int getM_mac(COMMON_channels_t *cc,sub_frame_t subframeP){
             return 1;
         }
         break;
-      
       case 2:
         switch (subframeP) {
           case 2:
@@ -1310,7 +1308,6 @@ int getM_mac(COMMON_channels_t *cc,sub_frame_t subframeP){
             return 4;
         }
         break;
-      
       case 3:
         switch (subframeP) {
           case 2:
@@ -1320,7 +1317,6 @@ int getM_mac(COMMON_channels_t *cc,sub_frame_t subframeP){
             return 2;
         }
         break;
-      
       case 4:
         switch (subframeP) {
           case 2:
@@ -1328,14 +1324,12 @@ int getM_mac(COMMON_channels_t *cc,sub_frame_t subframeP){
             return 4;
         }
         break;
-      
       case 5:
         switch (subframeP) {
           case 2:
             return 9;
         }
         break;
-      
       case 6:
         switch (subframeP) {
           case 2:
@@ -2072,6 +2066,18 @@ fill_nfapi_dlsch_config(eNB_MAC_INST *eNB,
   dl_config_pdu->dlsch_pdu.dlsch_pdu_rel8.num_bf_prb_per_subband                 = num_bf_prb_per_subband;
   dl_config_pdu->dlsch_pdu.dlsch_pdu_rel8.num_bf_vector                          = num_bf_vector;
   dl_req->number_pdu++;
+ // Rel10 fields
+#if (LTE_RRC_VERSION >= MAKE_VERSION(10, 0, 0))
+  dl_config_pdu->dlsch_pdu.dlsch_pdu_rel10.tl.tag = NFAPI_DL_CONFIG_REQUEST_DLSCH_PDU_REL10_TAG;
+  dl_config_pdu->dlsch_pdu.dlsch_pdu_rel10.pdsch_start = 3;
+#endif
+ // Rel13 fields
+#if (LTE_RRC_VERSION >= MAKE_VERSION(13, 0, 0))
+  dl_config_pdu->dlsch_pdu.dlsch_pdu_rel13.tl.tag = NFAPI_DL_CONFIG_REQUEST_DLSCH_PDU_REL13_TAG;
+  dl_config_pdu->dlsch_pdu.dlsch_pdu_rel13.ue_type = 0; // regular UE
+  dl_config_pdu->dlsch_pdu.dlsch_pdu_rel13.pdsch_payload_type = 2; // not BR
+  dl_config_pdu->dlsch_pdu.dlsch_pdu_rel13.initial_transmission_sf_io = 0xFFFF; // absolute SF
+#endif
   return;
 }
 
@@ -4644,10 +4650,10 @@ extract_harq(module_id_t mod_idP,
   int spatial_bundling = 0;
   int tmode[5];
   int i, j, m;
-  uint8_t *pdu;
+  uint8_t *pdu = NULL;
   sub_frame_t subframe_tx;
   int frame_tx;
-  uint8_t harq_pid;
+  uint8_t harq_pid = 0;
   uint8_t select_tb;
   uint8_t oppose_tb;
   uint8_t swap_flg;

openair2/LAYER2/MAC/eNB_scheduler_ulsch.c

@@ -186,7 +186,7 @@ rx_sdu(const module_id_t enb_mod_idP,
       UE_scheduling_control->pusch_snr[CC_idP] = tmp_snr;
        
       if(tmp_snr > 0 && tmp_snr < 63) {
-        double snr_filter_tpc=0.7;
+        double snr_filter_tpc=0.9;
         int snr_thres_tpc=30;
         int diff = UE_scheduling_control->pusch_snr_avg[CC_idP] - UE_scheduling_control->pusch_snr[CC_idP];
         if(abs(diff) < snr_thres_tpc) {