Merge remote-tracking branch 'origin/disable_harq' into integration_2024_w29

2024-07-23 12:17:49 +02:00
parent 409fa5d0af fae529b384
commit 4a1c505782
22 changed files with 274 additions and 105 deletions
@@ -194,6 +194,9 @@ void handle_nr_ulsch(NR_UL_IND_t *UL_info)
      AssertFatal(crc->rnti == rx->rnti, "mis-match between CRC RNTI %04x and RX RNTI %04x\n",
                  crc->rnti, rx->rnti);

+      AssertFatal(crc->harq_id == rx->harq_id, "mis-match between CRC HARQ ID %04x and RX HARQ ID %04x\n",
+                  crc->harq_id, rx->harq_id);
+
      LOG_D(NR_MAC,
            "%4d.%2d Calling rx_sdu (CRC %s/tb_crc_status %d)\n",
            UL_info->frame,
@@ -209,6 +212,7 @@ void handle_nr_ulsch(NR_UL_IND_t *UL_info)
                crc->rnti,
                crc->tb_crc_status ? NULL : rx->pdu,
                rx->pdu_length,
+                crc->harq_id,
                crc->timing_advance,
                crc->ul_cqi,
                crc->rssi);