From bdc445f766638bd30a349c6e790ef4009f4458fc Mon Sep 17 00:00:00 2001 From: francescomani Date: Tue, 20 Jun 2023 18:50:50 +0200 Subject: [PATCH 1/2] bugfix in RAR time allocation at UE --- openair2/LAYER2/NR_MAC_UE/nr_ue_procedures.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/openair2/LAYER2/NR_MAC_UE/nr_ue_procedures.c b/openair2/LAYER2/NR_MAC_UE/nr_ue_procedures.c index 71bb875af4..da7207f7ed 100644 --- a/openair2/LAYER2/NR_MAC_UE/nr_ue_procedures.c +++ b/openair2/LAYER2/NR_MAC_UE/nr_ue_procedures.c @@ -4083,7 +4083,7 @@ int nr_ue_process_rar(nr_downlink_indication_t *dl_info, int pdu_id) // MCS rar_grant.mcs = (unsigned char) (rar->UL_GRANT_4 >> 4); // time alloc - rar_grant.Msg3_t_alloc = (unsigned char) (rar->UL_GRANT_3 & 0x07); + rar_grant.Msg3_t_alloc = (unsigned char) (rar->UL_GRANT_3 & 0x0f); // frequency alloc rar_grant.Msg3_f_alloc = (uint16_t) ((rar->UL_GRANT_3 >> 4) | (rar->UL_GRANT_2 << 4) | ((rar->UL_GRANT_1 & 0x03) << 12)); // frequency hopping From 2922ea5176d1ceb161f34cacd457473c6de02e68 Mon Sep 17 00:00:00 2001 From: francescomani Date: Wed, 21 Jun 2023 11:11:12 +0200 Subject: [PATCH 2/2] fix also on gnb side --- openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_RA.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_RA.c b/openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_RA.c index d2b9f2331e..e0c5879e9c 100644 --- a/openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_RA.c +++ b/openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_RA.c @@ -2224,7 +2224,7 @@ static void nr_fill_rar(uint8_t Mod_idP, NR_RA_t *ra, uint8_t *dlsch_buffer, nfa int mcs = (unsigned char) (rar->UL_GRANT_4 >> 4); // time alloc - int Msg3_t_alloc = (unsigned char) (rar->UL_GRANT_3 & 0x07); + int Msg3_t_alloc = (unsigned char) (rar->UL_GRANT_3 & 0x0f); // frequency alloc int Msg3_f_alloc = (uint16_t) ((rar->UL_GRANT_3 >> 4) | (rar->UL_GRANT_2 << 4) | ((rar->UL_GRANT_1 & 0x03) << 12)); // frequency hopping