5g-team
/
srsRAN_4G
mirror of https://github.com/pvnis/srsRAN_4G.git
2
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fixed clang tidy warnings in mac::ue.cc

Browse Source
master
Francisco 4 years ago committed by Francisco Paisana
parent 4bcb7564c1
commit 9eb46cc134
2 changed files with 19 additions and 19 deletions
Show Stats Download Patch File Download Diff File

12
srsenb/hdr/stack/mac/ue.h
Unescape Escape View File

@ -63,12 +63,12 @@ public:
void tic(); void tic();
uint8_t* generate_pdu(uint32_t ue_cc_idx, uint8_t* generate_pdu(uint32_t ue_cc_idx,
uint32_t harq_pid, uint32_t harq_pid,
uint32_t tb_idx, uint32_t tb_idx,
sched_interface::dl_sched_pdu_t pdu[sched_interface::MAX_RLC_PDU_LIST], const sched_interface::dl_sched_pdu_t pdu[sched_interface::MAX_RLC_PDU_LIST],
uint32_t nof_pdu_elems, uint32_t nof_pdu_elems,
uint32_t grant_size); uint32_t grant_size);
uint8_t* uint8_t*
generate_mch_pdu(uint32_t harq_pid, sched_interface::dl_pdu_mch_t sched, uint32_t nof_pdu_elems, uint32_t grant_size); generate_mch_pdu(uint32_t harq_pid, sched_interface::dl_pdu_mch_t sched, uint32_t nof_pdu_elems, uint32_t grant_size);

26
srsenb/src/stack/mac/ue.cc
Unescape Escape View File

@ -496,12 +496,12 @@ void ue::allocate_ce(srslte::sch_pdu* pdu, uint32_t lcid)
} }
} }
uint8_t* ue::generate_pdu(uint32_t ue_cc_idx, uint8_t* ue::generate_pdu(uint32_t ue_cc_idx,
uint32_t harq_pid, uint32_t harq_pid,
uint32_t tb_idx, uint32_t tb_idx,
sched_interface::dl_sched_pdu_t pdu[sched_interface::MAX_RLC_PDU_LIST], const sched_interface::dl_sched_pdu_t pdu[sched_interface::MAX_RLC_PDU_LIST],
uint32_t nof_pdu_elems, uint32_t nof_pdu_elems,
uint32_t grant_size) uint32_t grant_size)
{ {
std::lock_guard<std::mutex> lock(mutex); std::lock_guard<std::mutex> lock(mutex);
uint8_t* ret = nullptr; uint8_t* ret = nullptr;
@ -529,7 +529,7 @@ uint8_t* ue::generate_pdu(uint32_t ue_cc_idx,
} }
uint8_t* ue::generate_mch_pdu(uint32_t harq_pid, uint8_t* ue::generate_mch_pdu(uint32_t harq_pid,
sched_interface::dl_pdu_mch_t sched, sched_interface::dl_pdu_mch_t sched_,
uint32_t nof_pdu_elems, uint32_t nof_pdu_elems,
uint32_t grant_size) uint32_t grant_size)
{ {
@ -539,15 +539,15 @@ uint8_t* ue::generate_mch_pdu(uint32_t harq_pid,
mch_mac_msg_dl.init_tx(tx_payload_buffer[0][harq_pid][0].get(), grant_size); mch_mac_msg_dl.init_tx(tx_payload_buffer[0][harq_pid][0].get(), grant_size);
for (uint32_t i = 0; i < nof_pdu_elems; i++) { for (uint32_t i = 0; i < nof_pdu_elems; i++) {
if (sched.pdu[i].lcid == (uint32_t)srslte::mch_lcid::MCH_SCHED_INFO) { if (sched_.pdu[i].lcid == (uint32_t)srslte::mch_lcid::MCH_SCHED_INFO) {
mch_mac_msg_dl.new_subh(); mch_mac_msg_dl.new_subh();
mch_mac_msg_dl.get()->set_next_mch_sched_info(sched.mtch_sched[i].lcid, sched.mtch_sched[i].stop); mch_mac_msg_dl.get()->set_next_mch_sched_info(sched_.mtch_sched[i].lcid, sched_.mtch_sched[i].stop);
} else if (sched.pdu[i].lcid == 0) { } else if (sched_.pdu[i].lcid == 0) {
mch_mac_msg_dl.new_subh(); mch_mac_msg_dl.new_subh();
mch_mac_msg_dl.get()->set_sdu(0, sched.pdu[i].nbytes, sched.mcch_payload); mch_mac_msg_dl.get()->set_sdu(0, sched_.pdu[i].nbytes, sched_.mcch_payload);
} else if (sched.pdu[i].lcid <= (uint32_t)srslte::mch_lcid::MTCH_MAX_LCID) { } else if (sched_.pdu[i].lcid <= (uint32_t)srslte::mch_lcid::MTCH_MAX_LCID) {
mch_mac_msg_dl.new_subh(); mch_mac_msg_dl.new_subh();
mch_mac_msg_dl.get()->set_sdu(sched.pdu[i].lcid, sched.pdu[i].nbytes, sched.mtch_sched[i].mtch_payload); mch_mac_msg_dl.get()->set_sdu(sched_.pdu[i].lcid, sched_.pdu[i].nbytes, sched_.mtch_sched[i].mtch_payload);
} }
} }

Write Preview
Loading…
Cancel
Save