From ab210c5f3c2c243446633fb07d1a4ff5cc30adf0 Mon Sep 17 00:00:00 2001 From: Andre Puschmann Date: Wed, 11 Mar 2020 16:44:39 +0100 Subject: [PATCH] tiny cosmetic changes to the error messages printing 0x and clear cc_idx use --- lib/src/asn1/rrc_asn1_utils.cc | 1 - srsenb/hdr/stack/enb_stack_lte.h | 8 ++++---- srsenb/src/phy/phy_ue_db.cc | 12 ++++++------ srsenb/src/stack/mac/mac.cc | 5 +++-- 4 files changed, 13 insertions(+), 13 deletions(-) diff --git a/lib/src/asn1/rrc_asn1_utils.cc b/lib/src/asn1/rrc_asn1_utils.cc index c8d388c76..27a46c347 100644 --- a/lib/src/asn1/rrc_asn1_utils.cc +++ b/lib/src/asn1/rrc_asn1_utils.cc @@ -641,7 +641,6 @@ void set_phy_cfg_t_common_pwr_ctrl(phy_cfg_t* cfg, const asn1::rrc::ul_pwr_ctrl_ void set_phy_cfg_t_scell_config(phy_cfg_t* cfg, const asn1::rrc::scell_to_add_mod_r10_s& asn1_type) { - if (asn1_type.rr_cfg_common_scell_r10_present) { // Enable always CSI request extra bit diff --git a/srsenb/hdr/stack/enb_stack_lte.h b/srsenb/hdr/stack/enb_stack_lte.h index f80e159ad..1dbb0c537 100644 --- a/srsenb/hdr/stack/enb_stack_lte.h +++ b/srsenb/hdr/stack/enb_stack_lte.h @@ -84,13 +84,13 @@ public: return mac.snr_info(tti, rnti, cc_idx, snr_db); } int ta_info(uint32_t tti, uint16_t rnti, float ta_us) override { return mac.ta_info(tti, rnti, ta_us); } - int ack_info(uint32_t tti, uint16_t rnti, uint32_t cc_idx, uint32_t tb_idx, bool ack) final + int ack_info(uint32_t tti, uint16_t rnti, uint32_t enb_cc_idx, uint32_t tb_idx, bool ack) final { - return mac.ack_info(tti, rnti, cc_idx, tb_idx, ack); + return mac.ack_info(tti, rnti, enb_cc_idx, tb_idx, ack); } - int crc_info(uint32_t tti, uint16_t rnti, uint32_t cc_idx, uint32_t nof_bytes, bool crc_res) final + int crc_info(uint32_t tti, uint16_t rnti, uint32_t enb_cc_idx, uint32_t nof_bytes, bool crc_res) final { - return mac.crc_info(tti, rnti, cc_idx, nof_bytes, crc_res); + return mac.crc_info(tti, rnti, enb_cc_idx, nof_bytes, crc_res); } int get_dl_sched(uint32_t tti, dl_sched_list_t& dl_sched_res) final { return mac.get_dl_sched(tti, dl_sched_res); } int get_mch_sched(uint32_t tti, bool is_mcch, dl_sched_list_t& dl_sched_res) final diff --git a/srsenb/src/phy/phy_ue_db.cc b/srsenb/src/phy/phy_ue_db.cc index 3c2ebc13a..19c54c3f1 100644 --- a/srsenb/src/phy/phy_ue_db.cc +++ b/srsenb/src/phy/phy_ue_db.cc @@ -128,7 +128,7 @@ inline uint32_t phy_ue_db::_get_ue_cc_idx(uint16_t rnti, uint32_t enb_cc_idx) co inline int phy_ue_db::_assert_rnti(uint16_t rnti) const { if (not ue_db.count(rnti)) { - ERROR("Trying to access RNTI x%x, it does not exist.\n", rnti); + ERROR("Trying to access RNTI 0x%X, it does not exist.\n", rnti); return SRSLTE_ERROR; } @@ -144,7 +144,7 @@ inline int phy_ue_db::_assert_enb_cc(uint16_t rnti, uint32_t enb_cc_idx) const // Check Component Carrier is part of UE SCell map if (_get_ue_cc_idx(rnti, enb_cc_idx) == SRSLTE_MAX_CARRIERS) { - ERROR("Trying to access cell/carrier index %d in RNTI x%x. It does not exist.\n", enb_cc_idx, rnti); + ERROR("Trying to access cell/carrier index %d in RNTI 0x%X. It does not exist.\n", enb_cc_idx, rnti); return SRSLTE_ERROR; } @@ -174,7 +174,7 @@ inline int phy_ue_db::_assert_ue_cc(uint16_t rnti, uint32_t ue_cc_idx) // Check SCell is active, ignore PCell state if (ue_cc_idx == SRSLTE_MAX_CARRIERS) { - ERROR("Out-of-bounds UE cell/carrier %d for RNTI x%x.\n", ue_cc_idx, rnti); + ERROR("Out-of-bounds UE cell/carrier %d for RNTI 0x%X.\n", ue_cc_idx, rnti); return SRSLTE_ERROR; } @@ -190,7 +190,7 @@ inline int phy_ue_db::_assert_active_ue_cc(uint16_t rnti, uint32_t ue_cc_idx) // Return error if not PCell or not Active SCell auto& cell_info = ue_db.at(rnti).cell_info[ue_cc_idx]; if (cell_info.state != cell_state_primary and cell_info.state != cell_state_secondary_active) { - ERROR("Failed to assert active UE cell/carrier %d for RNTI x%x", ue_cc_idx, rnti); + ERROR("Failed to assert active UE cell/carrier %d for RNTI 0x%X", ue_cc_idx, rnti); return SRSLTE_ERROR; } @@ -206,7 +206,7 @@ inline int phy_ue_db::_assert_active_enb_cc(uint16_t rnti, uint32_t enb_cc_idx) // Check SCell is active, ignore PCell state auto& cell_info = ue_db.at(rnti).cell_info[_get_ue_cc_idx(rnti, enb_cc_idx)]; if (cell_info.state != cell_state_primary and cell_info.state != cell_state_secondary_active) { - ERROR("Failed to assert active eNb cell/carrier %d for RNTI x%x", enb_cc_idx, rnti); + ERROR("Failed to assert active eNb cell/carrier %d for RNTI 0x%X", enb_cc_idx, rnti); return SRSLTE_ERROR; } @@ -305,7 +305,7 @@ void phy_ue_db::activate_deactivate_scell(uint16_t rnti, uint32_t ue_cc_idx, boo // If scell is default only complain if (activate and cell_info.state == cell_state_none) { - ERROR("RNTI x%x SCell %d has received an activation MAC command but it was not configured\n", rnti, ue_cc_idx); + ERROR("RNTI 0x%X SCell %d has received an activation MAC command but it was not configured\n", rnti, ue_cc_idx); return; } diff --git a/srsenb/src/stack/mac/mac.cc b/srsenb/src/stack/mac/mac.cc index 084c80761..21876898a 100644 --- a/srsenb/src/stack/mac/mac.cc +++ b/srsenb/src/stack/mac/mac.cc @@ -332,14 +332,15 @@ int mac::crc_info(uint32_t tti, uint16_t rnti, uint32_t enb_cc_idx, uint32_t nof // push the pdu through the queue if received correctly if (crc) { - Info("Pushing PDU rnti=%d, tti=%d, nof_bytes=%d\n", rnti, tti, nof_bytes); + Info("Pushing PDU rnti=0x%x, tti=%d, nof_bytes=%d\n", rnti, tti, nof_bytes); ue_db[rnti]->push_pdu(ue_cc_idx, tti, nof_bytes); stack_task_queue.push([this]() { process_pdus(); }); } else { ue_db[rnti]->deallocate_pdu(ue_cc_idx, tti); } - ret = scheduler.ul_crc_info(tti, rnti, ue_cc_idx, crc); + // Scheduler uses eNB's CC mapping + ret = scheduler.ul_crc_info(tti, rnti, enb_cc_idx, crc); } else { Error("User rnti=0x%x not found\n", rnti); }