add harq_pid to fapi_ul_ack_nack for debug purpose

openair1/SCHED/phy_procedures_lte_eNb.c

@@ -3521,7 +3521,7 @@ printf("PHY RX f/sf %d/%d sched_sf %d\n", frame, subframe, sched_subframe);
         phy_vars_eNB->ulsch_eNB[i]->harq_processes[harq_pid]->round++;
 
 #if FAPI
-        mac_xface->fapi_ul_ack_nack(frame, subframe, phy_vars_eNB->ulsch_eNB[i]->rnti, 0);
+        mac_xface->fapi_ul_ack_nack(frame, subframe, harq_pid, phy_vars_eNB->ulsch_eNB[i]->rnti, 0);
 #endif
 
         LOG_D(PHY,"[eNB][PUSCH %d] Increasing to round %d\n",harq_pid,phy_vars_eNB->ulsch_eNB[i]->harq_processes[harq_pid]->round);
@@ -3684,7 +3684,7 @@ printf("PHY RX f/sf %d/%d sched_sf %d\n", frame, subframe, sched_subframe);
         phy_vars_eNB->eNB_UE_stats[i].ulsch_consecutive_errors = 0;
 
 #if FAPI
-        mac_xface->fapi_ul_ack_nack(frame, subframe, phy_vars_eNB->ulsch_eNB[i]->rnti, 1);
+        mac_xface->fapi_ul_ack_nack(frame, subframe, harq_pid, phy_vars_eNB->ulsch_eNB[i]->rnti, 1);
 #endif
 
         if (phy_vars_eNB->ulsch_eNB[i]->Msg3_flag == 1) {
@@ -4293,7 +4293,7 @@ printf("PHY RX f/sf %d/%d sched_sf %d\n", frame, subframe, sched_subframe);
         phy_vars_eNB->ulsch_eNB[i]->harq_processes[harq_pid]->round++;
 
 #if FAPI
-        mac_xface->fapi_ul_ack_nack(frame, subframe, phy_vars_eNB->ulsch_eNB[i]->rnti, 0);
+        mac_xface->fapi_ul_ack_nack(frame, subframe, harq_pid, phy_vars_eNB->ulsch_eNB[i]->rnti, 0);
 #endif
       } // ulsch in error
       else {
@@ -4307,7 +4307,7 @@ printf("PHY RX f/sf %d/%d sched_sf %d\n", frame, subframe, sched_subframe);
         phy_vars_eNB->eNB_UE_stats[i].ulsch_consecutive_errors = 0;
 
 #if FAPI
-        mac_xface->fapi_ul_ack_nack(frame, subframe, phy_vars_eNB->ulsch_eNB[i]->rnti, 1);
+        mac_xface->fapi_ul_ack_nack(frame, subframe, harq_pid, phy_vars_eNB->ulsch_eNB[i]->rnti, 1);
 #endif
 
 #ifdef DEBUG_PHY_PROC

openair2/LAYER2/MAC/eNB_scheduler.c

@@ -222,9 +222,9 @@ printf("GOT DOWNLINK ack %d for rnti %x harq_pid %d transport_block %d\n", ack,
  * reception by the eNodeB of an uplink UE transmission
  */
 /* TODO: do it per CC */
-void fapi_ul_ack_nack(int frame, int subframe, int rnti, int ack)
+void fapi_ul_ack_nack(int frame, int subframe, int harq_pid, int rnti, int ack)
 {
-printf("GOT UPLINK ack %d for rnti %x (f/sf %d/%d)\n", ack, rnti, frame, subframe);
+printf("GOT UPLINK ack %d for rnti %x harq_pid %d (f/sf %d/%d)\n", ack, rnti, harq_pid, frame, subframe);
   int pos = fapi_ul_ack_nack_data[subframe].count;
   if (pos == MAX_UL_INFO_LIST) {
     LOG_E(MAC, "fapi_ul_ack_nack: full! (f/sf %d/%d)\n", frame, subframe);

openair2/LAYER2/MAC/ff-mac.h

@@ -43,7 +43,7 @@ void CschedCellConfigUpdateInd(fapi_interface_t *, struct CschedCellConfigUpdate
 /* those functions are called by the PHY layer to inform FAPI of events */
 
 /* signal uplink ACKs/NACKs */
-void fapi_ul_ack_nack(int frame, int subframe, int rnti, int ack);
+void fapi_ul_ack_nack(int frame, int subframe, int harq_pid, int rnti, int ack);
 
 /* signal uplink LC data length received */
 void fapi_ul_lc_length(int frame, int subframe, int lcid, int length, int rnti);

openair2/PHY_INTERFACE/defs.h

@@ -337,7 +337,7 @@ typedef struct {
   ///end ALU's algo
 
 #if FAPI
-  void (*fapi_ul_ack_nack)(int frame, int subframe, int rnti, int ack);
+  void (*fapi_ul_ack_nack)(int frame, int subframe, int harq_pid, int rnti, int ack);
   void (*fapi_dl_ack_nack)(int rnti, int harq_pid, int transport_block, int ack);
   void (*fapi_dl_cqi_report)(int module_id, int rnti, int frame, int subframe, int cqi_wideband, int *cqi_subband, int rank_indication);
 #endif