From 9aee7bf74593eb31917829e58fcf481cfa71e26b Mon Sep 17 00:00:00 2001 From: Robert Schmidt Date: Mon, 2 Oct 2023 18:00:30 +0200 Subject: [PATCH] srb0 rnti --- openair2/LAYER2/NR_MAC_UE/main_ue_nr.c | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/openair2/LAYER2/NR_MAC_UE/main_ue_nr.c b/openair2/LAYER2/NR_MAC_UE/main_ue_nr.c index a03f8d3e69..c34fae3cf3 100644 --- a/openair2/LAYER2/NR_MAC_UE/main_ue_nr.c +++ b/openair2/LAYER2/NR_MAC_UE/main_ue_nr.c @@ -45,10 +45,7 @@ static NR_UE_MAC_INST_t *nr_ue_mac_inst; -// TODO: refactor -struct gNB_MAC_INST_s; -typedef struct gNB_MAC_INST_s gNB_MAC_INST; -static void send_srb0_rrc(gNB_MAC_INST *mac, int rnti, const uint8_t *sdu, sdu_size_t sdu_len, void *rawUE) +static void send_srb0_rrc(int rnti, const uint8_t *sdu, sdu_size_t sdu_len, void *data) { AssertFatal(sdu_len > 0 && sdu_len < CCCH_SDU_SIZE, "invalid CCCH SDU size %d\n", sdu_len); @@ -68,7 +65,7 @@ static void send_srb0_rrc(gNB_MAC_INST *mac, int rnti, const uint8_t *sdu, sdu_s void send_msg3_rrc_request(module_id_t mod_id, int rnti) { - nr_rlc_activate_srb0(rnti, NULL, NULL, send_srb0_rrc); + nr_rlc_activate_srb0(rnti, NULL, send_srb0_rrc); nr_mac_rrc_msg3_ind(mod_id, rnti); } @@ -98,7 +95,7 @@ NR_UE_MAC_INST_t * nr_l2_init_ue(NR_UE_RRC_INST_t* rrc_inst) { int rc = rlc_module_init(0); AssertFatal(rc == 0, "%s: Could not initialize RLC layer\n", __FUNCTION__); /* convention: RNTI for SRB0 is 0, as it changes all the time */ - nr_rlc_activate_srb0(0, NULL, NULL, send_srb0_rrc); + nr_rlc_activate_srb0(nr_ue_mac_inst->crnti, NULL, send_srb0_rrc); if (IS_SOFTMODEM_NOS1){ // get default noS1 configuration NR_RadioBearerConfig_t *rbconfig = NULL;