From a50596af80f7dfdf7b858edfbd6cda64c9376192 Mon Sep 17 00:00:00 2001 From: frtabu Date: Sun, 3 Feb 2019 23:00:06 +0100 Subject: [PATCH] test for UE pucch and supression list update --- ci-scripts/oai-ci-vm-tool | 2 +- openair1/SCHED_UE/phy_procedures_lte_ue.c | 10 ---------- 2 files changed, 1 insertion(+), 11 deletions(-) diff --git a/ci-scripts/oai-ci-vm-tool b/ci-scripts/oai-ci-vm-tool index 6e0a83e07d..66cc36e5bc 100755 --- a/ci-scripts/oai-ci-vm-tool +++ b/ci-scripts/oai-ci-vm-tool @@ -264,7 +264,7 @@ case $key in ARCHIVES_LOC=cppcheck LOG_PATTERN=cppcheck.xml NB_PATTERN_FILES=1 - BUILD_OPTIONS="--enable=warning --force --xml --xml-version=2" + BUILD_OPTIONS="--enable=warning --force --xml --xml-version=2 --suppressions-list=ci-scripts/cppcheck_suppressions.list" NBARGS=$[$NBARGS+256] shift ;; diff --git a/openair1/SCHED_UE/phy_procedures_lte_ue.c b/openair1/SCHED_UE/phy_procedures_lte_ue.c index 2902e6f57b..807c79e6e0 100644 --- a/openair1/SCHED_UE/phy_procedures_lte_ue.c +++ b/openair1/SCHED_UE/phy_procedures_lte_ue.c @@ -1900,16 +1900,6 @@ void ue_pucch_procedures(PHY_VARS_UE *ue,UE_rxtx_proc_t *proc,uint8_t eNB_id,uin uint8_t isShortenPucch = (pSoundingrs_ul_config_dedicated->srsCellSubframe && frame_parms->soundingrs_ul_config_common.ackNackSRS_SimultaneousTransmission); bundling_flag = ue->pucch_config_dedicated[eNB_id].tdd_AckNackFeedbackMode; - if ((frame_parms->frame_type==FDD) || - (bundling_flag==bundling) || - ((frame_parms->frame_type==TDD)&&(frame_parms->tdd_config==1)&&((subframe_tx==2)||(subframe_tx==7)))) { - format = pucch_format1a; - // LOG_D(PHY,"[UE] PUCCH 1a\n"); - } else { - format = pucch_format1b; - // LOG_D(PHY,"[UE] PUCCH 1b\n"); - } - // Part - I // Collect feedback that should be transmitted at this subframe // - SR