diff --git a/openair2/LAYER2/NR_MAC_COMMON/nr_mac_common.c b/openair2/LAYER2/NR_MAC_COMMON/nr_mac_common.c index e86f24c04c..c5f3daf88f 100644 --- a/openair2/LAYER2/NR_MAC_COMMON/nr_mac_common.c +++ b/openair2/LAYER2/NR_MAC_COMMON/nr_mac_common.c @@ -3605,8 +3605,7 @@ int16_t fill_dmrs_mask(const NR_PDSCH_Config_t *pdsch_Config, AssertFatal(startSymbol <= l0, "Wrong config, Start symbol %d cannot be later than dmrs_TypeA_Position %d \n", startSymbol, l0); // Section 7.4.1.1.2 in Spec 38.211 - AssertFatal(l0 == 2 || (l0 == 3 && (ld != 3 || ld != 4)), "ld 3 or 4 symbols only possible with dmrs_TypeA_Position POS2 \n"); - + AssertFatal(l0 == 2 || (l0 == 3 && (ld != 3 && ld != 4)), "ld 3 or 4 symbols only possible with dmrs_TypeA_Position POS2 \n"); } // number of front loaded symbols diff --git a/openair2/LAYER2/NR_MAC_UE/nr_ue_procedures_sl.c b/openair2/LAYER2/NR_MAC_UE/nr_ue_procedures_sl.c index d514558b3e..c485461e56 100644 --- a/openair2/LAYER2/NR_MAC_UE/nr_ue_procedures_sl.c +++ b/openair2/LAYER2/NR_MAC_UE/nr_ue_procedures_sl.c @@ -510,13 +510,15 @@ uint8_t sl_determine_sci_1a_len(uint16_t *num_subchannels, ? *pscch_config->sl_NumReservedBits_r16 : 0; } - AssertFatal((num_reservedbits>=2) || (num_reservedbits<=4) , - "Num Reserved bits can only be 2or3or4. Resource Pool Configuration Error.\n"); + AssertFatal((num_reservedbits >= 2) && (num_reservedbits <= 4), + "Num Reserved bits can only be 2 or 3 or 4. Resource Pool Configuration Error.\n"); sci_1a_len += num_reservedbits; sci_1a->reserved_bits.nbits = num_reservedbits; - LOG_D(NR_MAC,"sci 1A - reserved_bits:%d, sci 1a len:%d, sci_1a->reserved_bits.nbits:%d\n", - num_reservedbits, sci_1a_len, sci_1a->reserved_bits.nbits); - + LOG_D(NR_MAC, + "sci 1A - reserved_bits:%d, sci 1a len:%d, sci_1a->reserved_bits.nbits:%d\n", + num_reservedbits, + sci_1a_len, + sci_1a->reserved_bits.nbits); LOG_D(NR_MAC,"sci 1A Length in bits: %d \n",sci_1a_len);