NR RRC - Remove of unnecessary MACRO

parent c197b81f
...@@ -1550,8 +1550,6 @@ void fill_mastercellGroupConfig(NR_CellGroupConfig_t *cellGroupConfig, NR_CellGr ...@@ -1550,8 +1550,6 @@ void fill_mastercellGroupConfig(NR_CellGroupConfig_t *cellGroupConfig, NR_CellGr
// DRB Configuration // DRB Configuration
for (int i = bearer_id_start; i < bearer_id_start + nb_bearers_to_setup; i++ ){ for (int i = bearer_id_start; i < bearer_id_start + nb_bearers_to_setup; i++ ){
if(i > MAX_DRBS_PER_PDUSESSION)
break;
const NR_RLC_Config_PR rlc_conf = use_rlc_um_for_drb ? NR_RLC_Config_PR_um_Bi_Directional : NR_RLC_Config_PR_am; const NR_RLC_Config_PR rlc_conf = use_rlc_um_for_drb ? NR_RLC_Config_PR_um_Bi_Directional : NR_RLC_Config_PR_am;
NR_RLC_BearerConfig_t *rlc_BearerConfig = get_DRB_RLC_BearerConfig(3 + i, i, rlc_conf, priority[i-bearer_id_start]); NR_RLC_BearerConfig_t *rlc_BearerConfig = get_DRB_RLC_BearerConfig(3 + i, i, rlc_conf, priority[i-bearer_id_start]);
ASN_SEQUENCE_ADD(&cellGroupConfig->rlc_BearerToAddModList->list, rlc_BearerConfig); ASN_SEQUENCE_ADD(&cellGroupConfig->rlc_BearerToAddModList->list, rlc_BearerConfig);
......
...@@ -93,9 +93,7 @@ ...@@ -93,9 +93,7 @@
#define NR_UE_MODULE_INVALID ((module_id_t) ~0) // FIXME attention! depends on type uint8_t!!! #define NR_UE_MODULE_INVALID ((module_id_t) ~0) // FIXME attention! depends on type uint8_t!!!
#define NR_UE_INDEX_INVALID ((module_id_t) ~0) // FIXME attention! depends on type uint8_t!!! used to be -1 #define NR_UE_INDEX_INVALID ((module_id_t) ~0) // FIXME attention! depends on type uint8_t!!! used to be -1
#define MAX_DRBS_PER_PDUSESSION (4) /* Maximum number of DRBs per PDU Session,
this value is not standardized, so we can
find another way to assign it more dynamically. */
typedef enum { typedef enum {
NR_RRC_OK=0, NR_RRC_OK=0,
NR_RRC_ConnSetup_failed, NR_RRC_ConnSetup_failed,
......
...@@ -824,8 +824,6 @@ rrc_gNB_generate_dedicatedRRCReconfiguration( ...@@ -824,8 +824,6 @@ rrc_gNB_generate_dedicatedRRCReconfiguration(
} }
for(long drb_id_add = 1; drb_id_add <= nb_drb_to_setup; drb_id_add++){ for(long drb_id_add = 1; drb_id_add <= nb_drb_to_setup; drb_id_add++){
if(drb_id_add > MAX_DRBS_PER_PDUSESSION)
break;
uint8_t drb_id; uint8_t drb_id;
// Reference TS23501 Table 5.7.4-1: Standardized 5QI to QoS characteristics mapping // Reference TS23501 Table 5.7.4-1: Standardized 5QI to QoS characteristics mapping
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment