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

Improve UE mode

Browse Source
This commit is contained in:
rmagueta
2021-03-12 13:47:59 +00:00
parent acb9a6e0dc
commit e2627f8025
3 changed files with 13 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
openair1/PHY/defs_common.h
+3 -2
View File
@@ -867,8 +867,9 @@ typedef enum {
NOT_SYNCHED=0, NOT_SYNCHED=0,
PRACH=1, PRACH=1,
RA_RESPONSE=2, RA_RESPONSE=2,
PUSCH=3, RA_WAIT_CR=3,
RESYNCH=4 PUSCH=4,
RESYNCH=5
} UE_MODE_t; } UE_MODE_t;
#define FOREACH_PARALLEL(GEN) \ #define FOREACH_PARALLEL(GEN) \
openair1/SCHED_NR_UE/phy_procedures_nr_ue.c
+6 -9
View File
@@ -2209,17 +2209,14 @@ void nr_ue_prach_procedures(PHY_VARS_NR_UE *ue, UE_nr_rxtx_proc_t *proc, uint8_t
nr_Msg1_transmitted(mod_id, ue->CC_id, frame_tx, gNB_id); nr_Msg1_transmitted(mod_id, ue->CC_id, frame_tx, gNB_id);
} else if (nr_prach == 2) { } else if (nr_prach == 2) {
LOG_W(PHY, "In %s: [UE %d] RA waiting contention resolution\n", __FUNCTION__, mod_id);
LOG_D(PHY, "In %s: [UE %d] RA completed, setting UE mode to PUSCH\n", __FUNCTION__, mod_id); ue->UE_mode[gNB_id] = RA_WAIT_CR;
} else if (nr_prach == 3) {
LOG_W(PHY, "In %s: [UE %d] RA completed, setting UE mode to PUSCH\n", __FUNCTION__, mod_id);
ue->UE_mode[gNB_id] = PUSCH; ue->UE_mode[gNB_id] = PUSCH;
} else if(nr_prach == 4){
} else if(nr_prach == 3){ LOG_W(PHY, "In %s: [UE %d] RA failed, setting UE mode to PRACH\n", __FUNCTION__, mod_id);
LOG_D(PHY, "In %s: [UE %d] RA failed, setting UE mode to PRACH\n", __FUNCTION__, mod_id);
ue->UE_mode[gNB_id] = PRACH; ue->UE_mode[gNB_id] = PRACH;
} }
VCD_SIGNAL_DUMPER_DUMP_FUNCTION_BY_NAME(VCD_SIGNAL_DUMPER_FUNCTIONS_PHY_PROCEDURES_UE_TX_PRACH, VCD_FUNCTION_OUT); VCD_SIGNAL_DUMPER_DUMP_FUNCTION_BY_NAME(VCD_SIGNAL_DUMPER_FUNCTIONS_PHY_PROCEDURES_UE_TX_PRACH, VCD_FUNCTION_OUT);
openair2/LAYER2/NR_MAC_UE/nr_ra_procedures.c
+4 -2
View File
@@ -664,6 +664,8 @@ uint8_t nr_ue_get_rach(NR_PRACH_RESOURCES_t *prach_resources,
} }
} }
} else {
return 3;
} }
if (ra->RA_contention_resolution_timer_active){ if (ra->RA_contention_resolution_timer_active){
@@ -779,7 +781,7 @@ void nr_ra_succeeded(module_id_t mod_id, frame_t frame, int slot){
LOG_D(MAC, "In %s: [UE %d] clearing RA_active flag...\n", __FUNCTION__, mod_id); LOG_D(MAC, "In %s: [UE %d] clearing RA_active flag...\n", __FUNCTION__, mod_id);
ra->RA_active = 0; ra->RA_active = 0;
ra->generate_nr_prach = 2; ra->generate_nr_prach = 3;
ra->ra_state = RA_SUCCEEDED; ra->ra_state = RA_SUCCEEDED;
} }
@@ -795,7 +797,7 @@ void nr_ra_failed(uint8_t mod_id, uint8_t CC_id, NR_PRACH_RESOURCES_t *prach_res
RA_config_t *ra = &mac->ra; RA_config_t *ra = &mac->ra;
ra->first_Msg3 = 0; ra->first_Msg3 = 0;
ra->generate_nr_prach = 3; ra->generate_nr_prach = 4;
ra->ra_state = RA_UE_IDLE; ra->ra_state = RA_UE_IDLE;
prach_resources->RA_PREAMBLE_TRANSMISSION_COUNTER++; prach_resources->RA_PREAMBLE_TRANSMISSION_COUNTER++;