diff --git a/srsue/hdr/stack/mac/proc_ra.h b/srsue/hdr/stack/mac/proc_ra.h index 2292cae01..e985e9436 100644 --- a/srsue/hdr/stack/mac/proc_ra.h +++ b/srsue/hdr/stack/mac/proc_ra.h @@ -50,7 +50,6 @@ public: current_ta = 0; state = IDLE; last_msg3_group = RA_GROUP_A; - msg3_transmitted = false; phy_h = NULL; log_h = NULL; mux_unit = NULL; @@ -149,7 +148,6 @@ private: typedef enum { RA_GROUP_A, RA_GROUP_B } ra_group_t; ra_group_t last_msg3_group; - bool msg3_transmitted; uint32_t rar_window_st; diff --git a/srsue/src/stack/mac/proc_ra.cc b/srsue/src/stack/mac/proc_ra.cc index cd973c063..b27dc4f3b 100644 --- a/srsue/src/stack/mac/proc_ra.cc +++ b/srsue/src/stack/mac/proc_ra.cc @@ -80,7 +80,6 @@ ra_proc::~ra_proc() { void ra_proc::reset() { state = IDLE; - msg3_transmitted = false; started_by_pdcch = false; contention_resolution_timer->stop(); contention_resolution_timer->reset(); @@ -264,7 +263,7 @@ void ra_proc::resource_selection() sel_preamble = (uint32_t) preambleIndex; } else { // Preamble is chosen by MAC UE - if (!msg3_transmitted) { + if (!mux_unit->msg3_is_transmitted()) { if (nof_groupB_preambles && new_ra_msg_len > rach_cfg.messageSizeGroupA) { // Check also pathloss (Pcmax,deltaPreamble and powerOffset) sel_group = RA_GROUP_B; @@ -496,7 +495,6 @@ void ra_proc::complete() mux_unit->msg3_flush(); - msg3_transmitted = false; if (ra_is_ho) { rrc->ho_ra_completed(true); }