maki/openairinterface5g
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Refactor: store Msg.1 parameters in RA process

Browse Source 
- the preamble is needed to detect when we are outside of the RA window,
  so store it
- store the rest of Msg1 variables together in struct
This commit is contained in:
Robert Schmidt
2024-04-04 18:54:04 +02:00
parent 7364d9bde7
commit 8d37fde91f
2 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_RA.c
+1
View File
@@ -699,6 +699,7 @@ void nr_initiate_ra_proc(module_id_t module_idP,
} }
ra->ra_state = nrRA_Msg2; ra->ra_state = nrRA_Msg2;
ra->preamble_frame = frameP;
ra->preamble_slot = slotP; ra->preamble_slot = slotP;
ra->preamble_index = preamble_index; ra->preamble_index = preamble_index;
ra->timing_offset = timing_offset; ra->timing_offset = timing_offset;
openair2/LAYER2/NR_MAC_gNB/nr_mac_gNB.h
+6 -4
View File
@@ -164,8 +164,14 @@ typedef struct {
RA_gNB_state_t ra_state; RA_gNB_state_t ra_state;
/// CORESET0 configured flag /// CORESET0 configured flag
int coreset0_configured; int coreset0_configured;
/// Frame where preamble was received
int preamble_frame;
/// Slot where preamble was received /// Slot where preamble was received
uint8_t preamble_slot; uint8_t preamble_slot;
/// Received preamble_index
uint8_t preamble_index;
/// Timing offset indicated by PHY
int16_t timing_offset;
/// Subframe where Msg2 is to be sent /// Subframe where Msg2 is to be sent
uint8_t Msg2_slot; uint8_t Msg2_slot;
/// Frame where Msg2 is to be sent /// Frame where Msg2 is to be sent
@@ -182,12 +188,8 @@ typedef struct {
rnti_t rnti; rnti_t rnti;
/// RA RNTI allocated from received PRACH /// RA RNTI allocated from received PRACH
uint16_t RA_rnti; uint16_t RA_rnti;
/// Received preamble_index
uint8_t preamble_index;
/// Received UE Contention Resolution Identifier /// Received UE Contention Resolution Identifier
uint8_t cont_res_id[6]; uint8_t cont_res_id[6];
/// Timing offset indicated by PHY
int16_t timing_offset;
/// Msg3 first RB /// Msg3 first RB
int msg3_first_rb; int msg3_first_rb;
/// Msg3 number of RB /// Msg3 number of RB