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

avoid unnecessary call to nr_write_ce_msg3_pdu

Browse Source 
this is for do-ra mostly and it was just called to compute MSG3 size which is fixed and known
This commit is contained in:
francescomani
2025-03-12 09:49:54 +01:00
parent c17881e8d5
commit 60920ed161
4 changed files with 2 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files
openair2/LAYER2/NR_MAC_UE/mac_proto.h
-2
View File
@@ -180,8 +180,6 @@ typedef struct {
enum { b_none, b_long, b_short, b_short_trunc, b_long_trunc } type_bsr; enum { b_none, b_long, b_short, b_short_trunc, b_long_trunc } type_bsr;
} type_bsr_t; } type_bsr_t;
int nr_write_ce_msg3_pdu(uint8_t *mac_ce, NR_UE_MAC_INST_t *mac, rnti_t crnti, uint8_t *mac_ce_end);
int nr_write_ce_ulsch_pdu(uint8_t *mac_ce, int nr_write_ce_ulsch_pdu(uint8_t *mac_ce,
NR_UE_MAC_INST_t *mac, NR_UE_MAC_INST_t *mac,
NR_SINGLE_ENTRY_PHR_MAC_CE *power_headroom, NR_SINGLE_ENTRY_PHR_MAC_CE *power_headroom,
openair2/LAYER2/NR_MAC_UE/nr_ra_procedures.c
+2 -5
View File
@@ -142,11 +142,8 @@ bool init_RA(NR_UE_MAC_INST_t *mac, int frame)
ra->Msg3_size = size_sdu + sizeof(NR_MAC_SUBHEADER_SHORT) + sizeof(NR_MAC_SUBHEADER_SHORT); ra->Msg3_size = size_sdu + sizeof(NR_MAC_SUBHEADER_SHORT) + sizeof(NR_MAC_SUBHEADER_SHORT);
} }
} else if (!IS_SA_MODE(get_softmodem_params())) { } else if (!IS_SA_MODE(get_softmodem_params()))
uint8_t temp_pdu[16] = {0}; ra->Msg3_size = sizeof(uint16_t) + sizeof(NR_MAC_SUBHEADER_FIXED);
size_sdu = nr_write_ce_msg3_pdu(temp_pdu, mac, mac->crnti, temp_pdu + sizeof(temp_pdu));
ra->Msg3_size = size_sdu;
}
// Random acces procedure initialization // Random acces procedure initialization
mac->state = UE_PERFORMING_RA; mac->state = UE_PERFORMING_RA;
openair2/LAYER2/NR_MAC_UE/nr_ue_procedures.c
-15
View File
@@ -3739,21 +3739,6 @@ void nr_ue_process_mac_pdu(NR_UE_MAC_INST_t *mac, nr_downlink_indication_t *dl_i
} }
} }
int nr_write_ce_msg3_pdu(uint8_t *mac_ce, NR_UE_MAC_INST_t *mac, rnti_t crnti, uint8_t *mac_ce_end)
{
uint8_t *pdu = mac_ce;
if (IS_SA_MODE(get_softmodem_params()) && mac->ra.ra_state != nrRA_SUCCEEDED) {
LOG_D(NR_MAC, "Generating C-RNTI MAC CE with C-RNTI %x\n", crnti);
*(NR_MAC_SUBHEADER_FIXED *)mac_ce = (NR_MAC_SUBHEADER_FIXED){.R = 0, .LCID = UL_SCH_LCID_C_RNTI};
mac_ce += sizeof(NR_MAC_SUBHEADER_FIXED);
// C-RNTI MAC CE (2 octets)
memcpy(mac_ce, &crnti, sizeof(crnti));
// update pointer and length
mac_ce += sizeof(crnti);
}
return mac_ce - pdu;
}
/** /**
* Function: generating MAC CEs (MAC CE and subheader) for the ULSCH PDU * Function: generating MAC CEs (MAC CE and subheader) for the ULSCH PDU
* Parameters: * Parameters:
openair2/LAYER2/NR_MAC_UE/tests/test_nr_ue_ra_procedures.cpp
-4
View File
@@ -32,10 +32,6 @@ softmodem_params_t *get_softmodem_params(void)
void nr_mac_rrc_ra_ind(const module_id_t mod_id, int frame, bool success) void nr_mac_rrc_ra_ind(const module_id_t mod_id, int frame, bool success)
{ {
} }
int nr_write_ce_msg3_pdu(uint8_t *mac_ce, NR_UE_MAC_INST_t *mac, rnti_t crnti, uint8_t *mac_ce_end)
{
return 0;
}
tbs_size_t mac_rlc_data_req(const module_id_t module_idP, tbs_size_t mac_rlc_data_req(const module_id_t module_idP,
const rnti_t rntiP, const rnti_t rntiP,
const eNB_index_t eNB_index, const eNB_index_t eNB_index,