change type uint8_t for feedback time to uint16_t and int

openair1/PHY/INIT/nr_parms.c

@@ -198,7 +198,7 @@ uint32_t get_slot_from_timestamp(openair0_timestamp timestamp_rx, const NR_DL_FR
    return slot_idx; 
 }
 
-uint32_t get_samples_slot_timestamp(int slot, const NR_DL_FRAME_PARMS *fp, uint8_t sl_ahead)
+uint32_t get_samples_slot_timestamp(int slot, const NR_DL_FRAME_PARMS *fp, uint16_t sl_ahead)
 {
   uint32_t samp_count = 0;
 

openair1/PHY/defs_nr_common.h

@@ -134,7 +134,7 @@ typedef struct NR_DL_FRAME_PARMS NR_DL_FRAME_PARMS;
 typedef uint32_t (*get_samples_per_slot_t)(int slot, const NR_DL_FRAME_PARMS *fp);
 typedef uint32_t (*get_slot_from_timestamp_t)(openair0_timestamp timestamp_rx, const NR_DL_FRAME_PARMS *fp);
 
-typedef uint32_t (*get_samples_slot_timestamp_t)(int slot, const NR_DL_FRAME_PARMS *fp, uint8_t sl_ahead);
+typedef uint32_t (*get_samples_slot_timestamp_t)(int slot, const NR_DL_FRAME_PARMS *fp, uint16_t sl_ahead);
 
 struct NR_DL_FRAME_PARMS {
   /// frequency range

openair2/LAYER2/NR_MAC_UE/mac_proto.h

@@ -260,7 +260,7 @@ void set_harq_status(NR_UE_MAC_INST_t *mac,
                      uint8_t pucch_id,
                      uint8_t harq_id,
                      int8_t delta_pucch,
-                     uint8_t data_toul_fb,
+                     uint16_t data_toul_fb,
                      uint8_t dai,
                      int n_CCE,
                      int N_CCE,

openair2/LAYER2/NR_MAC_UE/nr_ue_procedures.c

@@ -1084,10 +1084,9 @@ int8_t nr_ue_process_dci(module_id_t module_id, int cc_id, uint8_t gNB_index, fr
 
     /* PDSCH_TO_HARQ_FEEDBACK_TIME_IND */
     // according to TS 38.213 Table 9.2.3-1
-    uint8_t feedback_ti = pucch_Config->dl_DataToUL_ACK->list.array[dci->pdsch_to_harq_feedback_timing_indicator.val][0] + NTN_UE_slot_Rx_to_Tx;
+    uint16_t feedback_ti = pucch_Config->dl_DataToUL_ACK->list.array[dci->pdsch_to_harq_feedback_timing_indicator.val][0] + NTN_UE_k2;
 
-    if(!get_softmodem_params()->no_harq)
-      AssertFatal(feedback_ti > DURATION_RX_TO_TX,
+    AssertFatal(feedback_ti > DURATION_RX_TO_TX,
                 "PDSCH to HARQ feedback time (%d) needs to be higher than DURATION_RX_TO_TX (%d). Min feedback time set in config file (min_rxtxtime).\n",
                 feedback_ti, DURATION_RX_TO_TX);
 
@@ -1195,7 +1194,7 @@ void set_harq_status(NR_UE_MAC_INST_t *mac,
                      uint8_t pucch_id,
                      uint8_t harq_id,
                      int8_t delta_pucch,
-                     uint8_t data_toul_fb,
+                     uint16_t data_toul_fb,
                      uint8_t dai,
                      int n_CCE,
                      int N_CCE,

openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_primitives.c

@@ -2541,7 +2541,7 @@ uint8_t nr_get_tpc(int target, uint8_t cqi, int incr) {
 
 int get_pdsch_to_harq_feedback(NR_PUCCH_Config_t *pucch_Config,
                                 nr_dci_format_t dci_format,
-                                uint8_t *pdsch_to_harq_feedback) {
+                                int *pdsch_to_harq_feedback) {
   /* already mutex protected: held in nr_acknack_scheduling() */
 
   if (dci_format == NR_DL_DCI_FORMAT_1_0) {

openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_uci.c

@@ -1340,7 +1340,7 @@ int nr_acknack_scheduling(gNB_MAC_INST *mac,
   if(is_common == 0)
    dci_format = UE->current_DL_BWP.dci_format;
 
-  uint8_t pdsch_to_harq_feedback[8];
+  int pdsch_to_harq_feedback[8];
   int fb_size = get_pdsch_to_harq_feedback(pucch_Config, dci_format, pdsch_to_harq_feedback);
 
   for (int f = 0; f < fb_size; f++) {

openair2/LAYER2/NR_MAC_gNB/mac_proto.h

@@ -190,7 +190,7 @@ int nr_acknack_scheduling(gNB_MAC_INST *mac,
 
 int get_pdsch_to_harq_feedback(NR_PUCCH_Config_t *pucch_Config,
                                nr_dci_format_t dci_format,
-                               uint8_t *pdsch_to_harq_feedback);
+                               int *pdsch_to_harq_feedback);
   
 int nr_get_pucch_resource(NR_ControlResourceSet_t *coreset,
                           NR_PUCCH_Config_t *pucch_Config,