Merge remote-tracking branch 'origin/add-mac-doc' into integration_2024_w38

doc/README.md

@@ -69,6 +69,7 @@ Legacy unmaintained files:
 - [Information on how NR nFAPI works](./NR_NFAPI_archi.md)
 - [Flow graph of the L1 in gNB](SW-archi-graph.md)
 - [L1 threads in NR-UE](./nr-ue-design.md)
+- [Information on gNB MAC](./MAC/mac-usage.md)
 
 Legacy unmaintained files:
 - [`5Gnas.md`](./5Gnas.md)

doc/code-style-contrib.md

@@ -110,7 +110,8 @@ people, in order to simplify the history, and allow the usage of tools such as
 `git bisect` to search for bugs.
 
 After some time, we make a stable release. For this, we simply merge develop
-into master, and give a semantic versioning number, e.g., `v1.1`.
+into master, and give a semantic versioning number, e.g., `v1.1`. We target to
+make releases bi-yearly.
 
 ## How to manage your own branch
 

openair2/LAYER2/NR_MAC_gNB/main.c

@@ -156,21 +156,16 @@ size_t dump_mac_stats(gNB_MAC_INST *gNB, char *output, size_t strlen, bool reset
     for (int i = 1; i < gNB->ul_bler.harq_round_max; i++)
       output += snprintf(output, end - output, "/%"PRIu64, stats->ul.rounds[i]);
 
-    char deltaMCS_str[100]="\0";
-
-    if (UE->current_UL_BWP.pusch_Config && UE->current_UL_BWP.pusch_Config->pusch_PowerControl->deltaMCS) {
-        sprintf(deltaMCS_str,"deltaMCS %d\n",UE->mac_stats.deltaMCS);
-    }
     output += snprintf(output,
                        end - output,
-                       ", ulsch_errors %"PRIu64", ulsch_DTX %d, BLER %.5f MCS (%d) %d (Qm %d %s dB) NPRB %d  SNR %d.%d dB\n",
+                       ", ulsch_errors %"PRIu64", ulsch_DTX %d, BLER %.5f MCS (%d) %d (Qm %d deltaMCS %d dB) NPRB %d  SNR %d.%d dB\n",
                        stats->ul.errors,
                        stats->ulsch_DTX,
                        sched_ctrl->ul_bler_stats.bler,
                        UE->current_UL_BWP.mcs_table,
                        sched_ctrl->ul_bler_stats.mcs,
                        nr_get_Qm_ul(sched_ctrl->ul_bler_stats.mcs,UE->current_UL_BWP.mcs_table),
-                       deltaMCS_str,
+                       UE->mac_stats.deltaMCS,
                        UE->mac_stats.NPRB,
                        sched_ctrl->pusch_snrx10 / 10,
                        sched_ctrl->pusch_snrx10 % 10);