Fix UCI multiplexing for NR PUSCH

lib/src/common/phy_cfg_nr_default.cc

@@ -273,9 +273,13 @@ void phy_cfg_nr_default_t::make_pusch_default(srsran_sch_hl_cfg_nr_t& pusch)
   pusch.typeA_pos = srsran_dmrs_sch_typeA_pos_2;
 
   pusch.scaling                  = 1.0f;
-  pusch.beta_offsets.fix_ack  = 12.625f;
+  pusch.beta_offsets.ack_index1  = 9;
-  pusch.beta_offsets.fix_csi1 = 2.25f;
+  pusch.beta_offsets.ack_index2  = 9;
-  pusch.beta_offsets.fix_csi2 = 2.25f;
+  pusch.beta_offsets.ack_index3  = 9;
+  pusch.beta_offsets.csi1_index1 = 6;
+  pusch.beta_offsets.csi1_index2 = 6;
+  pusch.beta_offsets.csi2_index1 = 6;
+  pusch.beta_offsets.csi2_index2 = 6;
 }
 
 void phy_cfg_nr_default_t::make_pucch_custom_one(srsran_pucch_nr_hl_cfg_t& pucch)

lib/src/phy/phch/pusch_nr.c

@@ -378,13 +378,11 @@ static int pusch_nr_gen_mux_uci(srsran_pusch_nr_t* q, const srsran_uci_cfg_nr_t*
     // the number of reserved resource elements for potential HARQ-ACK transmission is calculated according to Clause
     // 6.3.2.4.2.1, by setting O_ACK = 2 ;
     G_ack_rvd = srsran_uci_nr_pusch_ack_nof_bits(&cfg->pusch, 2);
-
-    // Disable non reserved HARQ-ACK bits
-    G_ack = 0;
   }
 
   // Counters
   uint32_t m_ack_count   = 0;
+  uint32_t m_rvd_count   = 0;
   uint32_t m_csi1_count  = 0;
   uint32_t m_csi2_count  = 0;
   uint32_t m_ulsch_count = 0;
@@ -411,15 +409,26 @@ static int pusch_nr_gen_mux_uci(srsran_pusch_nr_t* q, const srsran_uci_cfg_nr_t*
     // Compute HARQ-ACK bits multiplexing
     uint32_t ack_d          = 0;
     uint32_t ack_m_re_count = 0;
+    uint32_t rvd_d          = 0;
+    uint32_t rvd_m_re_count = 0;
     if (l >= l1) {
-      if (cfg->ack.count <= 2 && m_ack_count < G_ack_rvd) {
+      if (cfg->ack.count <= 2 && m_rvd_count < G_ack_rvd) {
+        rvd_d          = 1;
+        rvd_m_re_count = M_ulsch_sc;
+        if (G_ack_rvd - m_rvd_count < M_uci_sc * Nl * Qm) {
+          rvd_d          = (M_uci_sc * Nl * Qm) / (G_ack_rvd - m_rvd_count);
+          rvd_m_re_count = SRSRAN_CEIL(G_ack_rvd - m_rvd_count, Nl * Qm);
+        }
+        M_uci_rvd = rvd_m_re_count;
+
+        if (m_ack_count < G_ack) {
           ack_d          = 1;
-        ack_m_re_count = M_ulsch_sc;
+          ack_m_re_count = M_uci_rvd;
-        if (G_ack_rvd - m_ack_count < M_uci_sc * Nl * Qm) {
+          if (G_ack - m_ack_count < M_uci_rvd * Nl * Qm) {
-          ack_d          = (M_uci_sc * Nl * Qm) / (G_ack_rvd - m_ack_count);
+            ack_d          = (M_uci_rvd * Nl * Qm) / (G_ack - m_ack_count);
-          ack_m_re_count = SRSRAN_CEIL(G_ack_rvd - m_ack_count, Nl * Qm);
+            ack_m_re_count = SRSRAN_CEIL(G_ack - m_ack_count, Nl * Qm);
+          }
         }
-        M_uci_rvd = ack_m_re_count;
       } else if (m_ack_count < G_ack) {
         ack_d          = 1;
         ack_m_re_count = M_ulsch_sc;
@@ -460,14 +469,14 @@ static int pusch_nr_gen_mux_uci(srsran_pusch_nr_t* q, const srsran_uci_cfg_nr_t*
     // Leave the rest for UL-SCH
     uint32_t ulsch_m_re_count = M_uci_sc;
 
-    for (uint32_t i = 0, csi1_i = 0, csi2_i = 0; i < cfg->pusch.M_pusch_sc[l]; i++) {
+    for (uint32_t i = 0, csi1_i = 0, csi2_i = 0, rvd_i = 0; i < cfg->pusch.M_pusch_sc[l]; i++) {
-      // Check if RE is reserved for ACK
+      // Check if RE is reserved
       bool reserved = false;
-      if (ack_m_re_count != 0 && i % ack_d == 0 && m_ack_count < G_ack_rvd) {
+      if (rvd_m_re_count != 0 && i % rvd_d == 0 && m_rvd_count < G_ack_rvd) {
         reserved = true;
       }
 
-      if (ack_m_re_count != 0 && i % ack_d == 0 && m_ack_count < G_ack) {
+      if (G_ack_rvd == 0 && ack_m_re_count != 0 && i % ack_d == 0 && m_ack_count < G_ack) {
         for (uint32_t j = 0; j < Nl * Qm; j++) {
           pos_ack[m_ack_count++] = m_all_count + j;
         }
@@ -498,15 +507,16 @@ static int pusch_nr_gen_mux_uci(srsran_pusch_nr_t* q, const srsran_uci_cfg_nr_t*
 
       // Set reserved bits only if there are ACK bits
       if (reserved) {
-        if (cfg->ack.count > 0) {
+        if (ack_m_re_count != 0 && rvd_i % ack_d == 0 && m_ack_count < G_ack) {
           for (uint32_t j = 0; j < Nl * Qm; j++) {
             pos_ack[m_ack_count++] = m_all_count + j;
           }
-        } else {
-          m_ack_count += Nl * Qm;
-        }
           ack_m_re_count--;
         }
+        m_rvd_count += Nl * Qm;
+        rvd_m_re_count--;
+        rvd_i++;
+      }
 
       // Increment all bit counter
       m_all_count += Nl * Qm;
@@ -531,8 +541,8 @@ static int pusch_nr_gen_mux_uci(srsran_pusch_nr_t* q, const srsran_uci_cfg_nr_t*
   q->G_ulsch = m_ulsch_count;
 
   // Assert Number of bits
-  if (G_ack_rvd != 0 && G_ack_rvd != m_ack_count && cfg->ack.count > 0) {
+  if (G_ack_rvd != 0 && G_ack_rvd != m_rvd_count && cfg->ack.count <= 2) {
-    ERROR("Not matched %d!=%d", G_ack_rvd, m_ack_count);
+    ERROR("Not matched %d!=%d", G_ack_rvd, m_rvd_count);
   }
   if (G_ack != 0 && G_ack != m_ack_count) {
     ERROR("Not matched %d!=%d", G_ack, m_ack_count);