Merge remote-tracking branch 'origin/remove_some_mac_extern' into integration_2025_w10

openair1/SIMULATION/NR_PHY/psbchsim.c

@@ -37,7 +37,6 @@
 #include "openair2/LAYER2/NR_MAC_COMMON/nr_mac_common.h"
 #include "openair1/SIMULATION/TOOLS/sim.h"
 #include "common/utils/nr/nr_common.h"
-#include "openair2/RRC/NR/nr_rrc_extern.h"
 #include "openair2/RRC/LTE/rrc_vars.h"
 #include "PHY/NR_UE_TRANSPORT/nr_transport_proto_ue.h"
 #include "PHY/INIT/nr_phy_init.h"

openair1/SIMULATION/NR_PHY/ulsim.c

@@ -1021,7 +1021,7 @@ int main(int argc, char *argv[])
       while (round < max_rounds && crc_status) {
 
         round_trials[round]++;
-        rv_index = nr_rv_round_map[round % 4];
+        rv_index = nr_get_rv(round % 4);
 
         /// gNB UL PDUs