bug fixes from Fujitsu (bug 22)
Note: not sure that the code is correct,
to be checked (Cédric Roux).
----------------------------------------------------------
bug 22
Ttile:
(subframe!=2)||(subframe!=7) is always TRUE. This coding
is really intended? Operator || should be && instead?
Bug Location:
((frame_parms->frame_type==TDD)&&(frame_parms->tdd_config==1)&&((subframe!=2)||(subframe!=7)))) {
Note:
Detected by CppCheck
----------------------------------------------------------
This commit is contained in:
@@ -2272,7 +2272,7 @@ void pucch_procedures(PHY_VARS_eNB *eNB,eNB_rxtx_proc_t *proc,int UE_id,int harq
|
|||||||
|
|
||||||
if ((fp->frame_type==FDD) ||
|
if ((fp->frame_type==FDD) ||
|
||||||
(bundling_flag==bundling) ||
|
(bundling_flag==bundling) ||
|
||||||
((fp->frame_type==TDD)&&(fp->tdd_config==1)&&((subframe!=2)||(subframe!=7)))) {
|
((fp->frame_type==TDD)&&(fp->tdd_config==1)&&((subframe!=2)&&(subframe!=7)))) {
|
||||||
format = pucch_format1a;
|
format = pucch_format1a;
|
||||||
} else {
|
} else {
|
||||||
format = pucch_format1b;
|
format = pucch_format1b;
|
||||||
|
|||||||
Reference in New Issue
Block a user