maki/openairinterface5g
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

cleanup only

Browse Source
This commit is contained in:
laurent
2023-04-28 16:25:24 +02:00
committed by Laurent THOMAS
parent 6022fe5acd
commit b339460666
93 changed files with 38876 additions and 5864 deletions
Download Patch File Download Diff File Expand all files Collapse all files
openair2/RRC/LTE/MESSAGES/asn1_msg.c
+9 -11
View File
@@ -119,15 +119,14 @@ typedef struct xer_sprint_string_s {
extern RAN_CONTEXT_t RC;
uint16_t two_tier_hexagonal_cellIds[7] = {0,1,2,4,5,7,8};
uint16_t two_tier_hexagonal_adjacent_cellIds[7][6] = {{1,2,4,5,7,8}, // CellId 0
{11,18,2,0,8,15}, // CellId 1
{18,13,3,4,0,1}, // CellId 2
{2,3,14,6,5,0}, // CellId 4
{0,4,6,16,9,7}, // CellId 5
{8,0,5,9,17,12}, // CellId 7
{15,1,0,7,12,10}
};// CellId 8
static const uint16_t two_tier_hexagonal_cellIds[7] = {0, 1, 2, 4, 5, 7, 8};
static const uint16_t two_tier_hexagonal_adjacent_cellIds[7][6] = {{1, 2, 4, 5, 7, 8}, // CellId 0
{11, 18, 2, 0, 8, 15}, // CellId 1
{18, 13, 3, 4, 0, 1}, // CellId 2
{2, 3, 14, 6, 5, 0}, // CellId 4
{0, 4, 6, 16, 9, 7}, // CellId 5
{8, 0, 5, 9, 17, 12}, // CellId 7
{15, 1, 0, 7, 12, 10}}; // CellId 8
/*
* This is a helper function for xer_sprint, which directs all incoming data
@@ -4048,8 +4047,7 @@ uint8_t do_RRCConnectionRelease(uint8_t Mod_id,
return((enc_rval.encoded+7)/8);
}
uint8_t TMGI[5] = {4,3,2,1,0};//TMGI is a string of octet, ref. TS 24.008 fig. 10.5.4a
static const uint8_t TMGI[5] = {4, 3, 2, 1, 0}; // TMGI is a string of octet, ref. TS 24.008 fig. 10.5.4a
uint8_t do_MBSFNAreaConfig(uint8_t Mod_id,
uint8_t sync_area,
openair2/RRC/LTE/rrc_eNB.c
+10 -11
View File
@@ -1225,24 +1225,23 @@ rrc_eNB_generate_RRCConnectionReestablishment(
if (SRB1_config->logicalChannelConfig) {
if (SRB1_config->logicalChannelConfig->present == LTE_SRB_ToAddMod__logicalChannelConfig_PR_explicitValue) {
SRB1_logicalChannelConfig = &(SRB1_config->logicalChannelConfig->choice.explicitValue);
SRB1_logicalChannelConfig = &SRB1_config->logicalChannelConfig->choice.explicitValue;
} else {
SRB1_logicalChannelConfig = &(SRB1_logicalChannelConfig_defaultValue);
SRB1_logicalChannelConfig = &SRB1_logicalChannelConfig_defaultValue;
}
} else {
SRB1_logicalChannelConfig = &(SRB1_logicalChannelConfig_defaultValue);
SRB1_logicalChannelConfig = &SRB1_logicalChannelConfig_defaultValue;
}
LOG_D(RRC, PROTOCOL_RRC_CTXT_UE_FMT" RRC_eNB --- MAC_CONFIG_REQ (SRB1) ---> MAC_eNB\n",
PROTOCOL_RRC_CTXT_UE_ARGS(ctxt_pP));
rrc_mac_config_req_eNB_t tmp = {0};
tmp.CC_id = ue_context->primaryCC_id;
tmp.physicalConfigDedicated = ue_context->physicalConfigDedicated;
tmp.mac_MainConfig = ue_context->mac_MainConfig;
tmp.logicalChannelIdentity = 1;
tmp.logicalChannelConfig = SRB1_logicalChannelConfig;
tmp.measGapConfig = ue_context->measGapConfig;
const rrc_mac_config_req_eNB_t tmp = {.CC_id = ue_context->primaryCC_id,
.physicalConfigDedicated = ue_context->physicalConfigDedicated,
.mac_MainConfig = ue_context->mac_MainConfig,
.logicalChannelIdentity = 1,
.logicalChannelConfig = SRB1_logicalChannelConfig,
.measGapConfig = ue_context->measGapConfig};
rrc_mac_config_req_eNB(module_id, &tmp);
break;
} // if ((*SRB_configList)->list.array[cnt]->srb_Identity == 1)
@@ -1928,7 +1927,7 @@ rrc_eNB_generate_RRCConnectionRelease(
PDCP_TRANSMISSION_MODE_CONTROL);
}
uint8_t qci_to_priority[9]= {2,4,3,5,1,6,7,8,9};
static const uint8_t qci_to_priority[9] = {2, 4, 3, 5, 1, 6, 7, 8, 9};
// TBD: this directive can be remived if we create a similar e_rab_param_t structure in RRC context
//-----------------------------------------------------------------------------
openair2/RRC/NR/nr_rrc_extern.h
-4
View File
@@ -39,10 +39,6 @@ extern UE_RRC_INST *UE_rrc_inst;
extern uint8_t DRB2LCHAN[8];
extern NR_LogicalChannelConfig_t NR_SRB1_logicalChannelConfig_defaultValue;
extern NR_LogicalChannelConfig_t NR_SRB2_logicalChannelConfig_defaultValue;
extern NR_LogicalChannelConfig_t NR_SRB3_logicalChannelConfig_defaultValue;
extern int NB_UE_INST;
extern void* bigphys_malloc(int);