From c75fd52e3a789090055a71f0f1f361a44c64c994 Mon Sep 17 00:00:00 2001
From: Robert Schmidt <robert.schmidt@eurecom.fr>
Date: Fri, 22 Feb 2019 15:21:49 +0100
Subject: [PATCH] Remove many warnings
---
common/utils/backtrace.h | 2 +-
openair2/ENB_APP/enb_app.c | 6 +++---
openair2/ENB_APP/enb_config.h | 3 +++
openair2/F1AP/f1ap_du_interface_management.c | 8 ++++----
openair2/F1AP/f1ap_du_rrc_message_transfer.c | 18 ++++++++++++------
openair2/F1AP/f1ap_du_task.c | 1 +
openair2/LAYER2/RLC/rlc.c | 4 +++-
openair2/RRC/LTE/L2_interface.c | 5 +++--
openair2/RRC/LTE/rrc_eNB.c | 2 +-
openair2/RRC/LTE/rrc_proto.h | 2 +-
10 files changed, 32 insertions(+), 19 deletions(-)
diff --git a/common/utils/backtrace.h b/common/utils/backtrace.h
index b4620b6bed..9a77767cf4 100644
--- a/common/utils/backtrace.h
+++ b/common/utils/backtrace.h
@@ -24,7 +24,7 @@
#ifndef BACKTRACE_H_
#define BACKTRACE_H_
-void display_backtrace();
+void display_backtrace(void);
void backtrace_handle_signal(siginfo_t *info);
diff --git a/openair2/ENB_APP/enb_app.c b/openair2/ENB_APP/enb_app.c
index 3ef96d63b1..5daaba9621 100644
--- a/openair2/ENB_APP/enb_app.c
+++ b/openair2/ENB_APP/enb_app.c
@@ -34,6 +34,7 @@
#include "enb_config.h"
#include "assertions.h"
#include "common/ran_context.h"
+#include "targets/RT/USER/lte-softmodem.h"
#include "common/utils/LOG/log.h"
@@ -145,8 +146,8 @@ void *eNB_app_task(void *args_p)
uint32_t registered_enb;
long enb_register_retry_timer_id;
# endif
- uint32_t x2_register_enb_pending;
- uint32_t x2_registered_enb;
+ uint32_t x2_register_enb_pending = 0;
+ uint32_t x2_registered_enb = 0;
long x2_enb_register_retry_timer_id;
MessageDef *msg_p = NULL;
instance_t instance;
@@ -168,7 +169,6 @@ void *eNB_app_task(void *args_p)
#endif
/* Try to register each eNB with each other */
- // x2_registered_enb = 0;
if (RC.rrc[0]->node_type == ngran_eNB) { // CU or DU do not need
x2_register_enb_pending = eNB_app_register_x2 (enb_id_start, enb_id_end);
}
diff --git a/openair2/ENB_APP/enb_config.h b/openair2/ENB_APP/enb_config.h
index d1aece8b4c..a204a47652 100644
--- a/openair2/ENB_APP/enb_config.h
+++ b/openair2/ENB_APP/enb_config.h
@@ -121,5 +121,8 @@ int RCconfig_X2(MessageDef *msg_p, uint32_t i);
void fill_SL_configuration(MessageDef *msg_p, ccparams_sidelink_t *SLconfig,int cell_idx,int cc_idx,char *config_fname);
void fill_eMTC_configuration(MessageDef *msg_p, ccparams_eMTC_t *eMTCconfig, int cell_idx,int cc_idx,char *config_fname,char *brparamspath);
+int RCconfig_DU_F1(MessageDef *msg_p, uint32_t i);
+void handle_f1ap_setup_resp(f1ap_setup_resp_t *resp);
+
#endif /* ENB_CONFIG_H_ */
/** @} */
diff --git a/openair2/F1AP/f1ap_du_interface_management.c b/openair2/F1AP/f1ap_du_interface_management.c
index 8f738cf066..5b3fc4addd 100644
--- a/openair2/F1AP/f1ap_du_interface_management.c
+++ b/openair2/F1AP/f1ap_du_interface_management.c
@@ -479,7 +479,7 @@ int DU_handle_F1_SETUP_RESPONSE(instance_t instance,
LOG_D(F1AP, "F1AP: Activating %d cells\n",num_cells_to_activate);
for (int i=0;i<num_cells_to_activate;i++) {
- F1AP_Cells_to_be_Activated_List_ItemIEs_t *cells_to_be_activated_list_item_ies = ie->value.choice.Cells_to_be_Activated_List.list.array[i];
+ F1AP_Cells_to_be_Activated_List_ItemIEs_t *cells_to_be_activated_list_item_ies = (F1AP_Cells_to_be_Activated_List_ItemIEs_t *) ie->value.choice.Cells_to_be_Activated_List.list.array[i];
AssertFatal(cells_to_be_activated_list_item_ies->id == F1AP_ProtocolIE_ID_id_Cells_to_be_Activated_List_Item,
"cells_to_be_activated_list_item_ies->id != F1AP_ProtocolIE_ID_id_Cells_to_be_Activated_List_Item");
@@ -502,7 +502,7 @@ int DU_handle_F1_SETUP_RESPONSE(instance_t instance,
F1AP_SETUP_RESP (msg_p).nr_cellid[i]);
F1AP_SETUP_RESP (msg_p).nrpci[i] = *cell->nRPCI;
- F1AP_ProtocolExtensionContainer_160P9_t *ext = cell->iE_Extensions;
+ F1AP_ProtocolExtensionContainer_160P9_t *ext = (F1AP_ProtocolExtensionContainer_160P9_t *)cell->iE_Extensions;
AssertFatal(ext!=NULL,"Extension for SI is null\n");
F1AP_SETUP_RESP (msg_p).num_SI[i] = ext->list.count;
AssertFatal(ext->list.count==1,"At least one SI message should be there, and only 1 for now!\n");
@@ -634,7 +634,7 @@ int DU_send_gNB_DU_CONFIGURATION_UPDATE(instance_t instance,
/* - fiveGS_TAC */
OCTET_STRING_fromBuf(&served_cell_information.fiveGS_TAC,
- &f1ap_du_data->tac[i],
+ (const char *) &f1ap_du_data->tac[i],
3);
/* - Configured_EPS_TAC */
@@ -800,7 +800,7 @@ int DU_send_gNB_DU_CONFIGURATION_UPDATE(instance_t instance,
/* - fiveGS_TAC */
OCTET_STRING_fromBuf(&served_cell_information.fiveGS_TAC,
- &f1ap_du_data->tac[i],
+ (const char *) &f1ap_du_data->tac[i],
3);
/* - Configured_EPS_TAC */
diff --git a/openair2/F1AP/f1ap_du_rrc_message_transfer.c b/openair2/F1AP/f1ap_du_rrc_message_transfer.c
index 27add35f5f..4a71a291cc 100644
--- a/openair2/F1AP/f1ap_du_rrc_message_transfer.c
+++ b/openair2/F1AP/f1ap_du_rrc_message_transfer.c
@@ -228,7 +228,7 @@ int DU_handle_DL_RRC_MESSAGE_TRANSFER(instance_t instance,
// get SRB logical channel information
LTE_SRB_ToAddModList_t *SRB_configList;
LTE_SRB_ToAddMod_t *SRB1_config;
- LTE_LogicalChannelConfig_t *SRB1_logicalChannelConfig; //,*SRB2_logicalChannelConfig;
+ LTE_LogicalChannelConfig_t *SRB1_logicalChannelConfig = NULL;
SRB_configList = radioResourceConfigDedicated->srb_ToAddModList;
AssertFatal(SRB_configList!=NULL,"SRB_configList is null\n");
@@ -273,6 +273,10 @@ int DU_handle_DL_RRC_MESSAGE_TRANSFER(instance_t instance,
ue_p->Srb0.Tx_buffer.payload_size = rrc_dl_sdu_len;
+ LTE_MAC_MainConfig_t *mac_MainConfig = NULL;
+ if (radioResourceConfigDedicated->mac_MainConfig)
+ mac_MainConfig = &radioResourceConfigDedicated->mac_MainConfig->choice.explicitValue;
+
rrc_mac_config_req_eNB(
ctxt.module_id,
0, //primaryCC_id,
@@ -292,7 +296,7 @@ int DU_handle_DL_RRC_MESSAGE_TRANSFER(instance_t instance,
//(struct PhysicalConfigDedicatedSCell_r10 *)NULL,
#endif
(LTE_MeasObjectToAddMod_t **) NULL,
- radioResourceConfigDedicated->mac_MainConfig,
+ mac_MainConfig,
1,
SRB1_logicalChannelConfig,
NULL, // measGapConfig,
@@ -383,9 +387,11 @@ int DU_handle_DL_RRC_MESSAGE_TRANSFER(instance_t instance,
LTE_DRB_ToAddModList_t *DRB_configList = rrcConnectionReconfiguration_r8->radioResourceConfigDedicated->drb_ToAddModList;
LTE_SRB_ToAddModList_t *SRB_configList = rrcConnectionReconfiguration_r8->radioResourceConfigDedicated->srb_ToAddModList;
LTE_DRB_ToReleaseList_t *DRB_ReleaseList = rrcConnectionReconfiguration_r8->radioResourceConfigDedicated->drb_ToReleaseList;
- LTE_MAC_MainConfig_t *mac_MainConfig = rrcConnectionReconfiguration_r8->radioResourceConfigDedicated->mac_MainConfig;
+ LTE_MAC_MainConfig_t *mac_MainConfig = NULL;
+ if (rrcConnectionReconfiguration_r8->radioResourceConfigDedicated->mac_MainConfig)
+ mac_MainConfig = &rrcConnectionReconfiguration_r8->radioResourceConfigDedicated->mac_MainConfig->choice.explicitValue;
LTE_MeasGapConfig_t *measGapConfig = NULL;
- struct LTE_PhysicalConfigDedicated** physicalConfigDedicated = rrcConnectionReconfiguration_r8->radioResourceConfigDedicated->physicalConfigDedicated;
+ struct LTE_PhysicalConfigDedicated* physicalConfigDedicated = rrcConnectionReconfiguration_r8->radioResourceConfigDedicated->physicalConfigDedicated;
rrc_rlc_config_asn1_req(
&ctxt,
SRB_configList, // NULL, //LG-RK 14/05/2014 SRB_configList,
@@ -643,7 +649,7 @@ int DU_send_UL_RRC_MESSAGE_TRANSFER(const protocol_ctxt_t* const ctxt_pP,
ie->id = F1AP_ProtocolIE_ID_id_RRCContainer;
ie->criticality = F1AP_Criticality_reject;
ie->value.present = F1AP_ULRRCMessageTransferIEs__value_PR_RRCContainer;
- OCTET_STRING_fromBuf(&ie->value.choice.RRCContainer, sdu_pP, sdu_sizeP);
+ OCTET_STRING_fromBuf(&ie->value.choice.RRCContainer, (const char *)sdu_pP, sdu_sizeP);
ASN_SEQUENCE_ADD(&out->protocolIEs.list, ie);
if (rb_idP == 1 || rb_idP == 2) {
@@ -819,7 +825,7 @@ int DU_send_INITIAL_UL_RRC_MESSAGE_TRANSFER(module_id_t module_idP,
ie->id = F1AP_ProtocolIE_ID_id_RRCContainer;
ie->criticality = F1AP_Criticality_reject;
ie->value.present = F1AP_InitialULRRCMessageTransferIEs__value_PR_RRCContainer;
- OCTET_STRING_fromBuf(&ie->value.choice.RRCContainer, sduP, sdu_lenP);
+ OCTET_STRING_fromBuf(&ie->value.choice.RRCContainer, (const char *)sduP, sdu_lenP);
ASN_SEQUENCE_ADD(&out->protocolIEs.list, ie);
/* optional */
diff --git a/openair2/F1AP/f1ap_du_task.c b/openair2/F1AP/f1ap_du_task.c
index 5cd784abf2..35c4ea35bb 100644
--- a/openair2/F1AP/f1ap_du_task.c
+++ b/openair2/F1AP/f1ap_du_task.c
@@ -33,6 +33,7 @@
#include "f1ap_common.h"
#include "f1ap_handlers.h"
#include "f1ap_du_interface_management.h"
+#include "f1ap_du_ue_context_management.h"
#include "f1ap_du_task.h"
#include "proto_agent.h"
diff --git a/openair2/LAYER2/RLC/rlc.c b/openair2/LAYER2/RLC/rlc.c
index 16e344555c..7aa1846675 100644
--- a/openair2/LAYER2/RLC/rlc.c
+++ b/openair2/LAYER2/RLC/rlc.c
@@ -618,11 +618,13 @@ void rlc_data_ind (
break;
case ngran_eNB_DU:
case ngran_gNB_DU:
- if (srb_flagP == 1)
+ if (srb_flagP == 1) {
+ /* TODO do ITTI message */
DU_send_UL_RRC_MESSAGE_TRANSFER(ctxt_pP,
rb_idP,
sdu_sizeP,
sdu_pP->data);
+ }
else
proto_agent_send_pdcp_data_ind (
ctxt_pP,
diff --git a/openair2/RRC/LTE/L2_interface.c b/openair2/RRC/LTE/L2_interface.c
index 947a38c637..88b6eb5198 100644
--- a/openair2/RRC/LTE/L2_interface.c
+++ b/openair2/RRC/LTE/L2_interface.c
@@ -247,6 +247,7 @@ mac_rrc_data_ind(
LOG_W(RRC,"[DU %d][RAPROC] Received SDU for CCCH on SRB %d length %d for UE id %d RNTI %x \n",
module_idP, srb_idP, sdu_lenP, UE_id, rntiP);
+ /* do ITTI message */
DU_send_INITIAL_UL_RRC_MESSAGE_TRANSFER(
module_idP,
CC_id,
@@ -258,7 +259,7 @@ mac_rrc_data_ind(
return(0);
}
- SRB_INFO *Srb_info;
+ //SRB_INFO *Srb_info;
protocol_ctxt_t ctxt;
sdu_size_t sdu_size = 0;
/* for no gcc warnings */
@@ -269,7 +270,7 @@ mac_rrc_data_ind(
PROTOCOL_CTXT_SET_BY_MODULE_ID(&ctxt, module_idP, ENB_FLAG_YES, rntiP, frameP, sub_frameP,0);
if((srb_idP & RAB_OFFSET) == CCCH) {
- LOG_D(RRC,"[eNB %d] Received SDU for CCCH on SRB %d\n",module_idP,Srb_info->Srb_id);
+ LOG_D(RRC, "[eNB %d] Received SDU for CCCH on SRB %d\n", module_idP, srb_idP);
/*Srb_info = &RC.rrc[module_idP]->carrier[CC_id].Srb0;
#if (LTE_RRC_VERSION >= MAKE_VERSION(14, 0, 0))
ctxt.brOption = brOption;
diff --git a/openair2/RRC/LTE/rrc_eNB.c b/openair2/RRC/LTE/rrc_eNB.c
index 51f196eaf6..bdc588adff 100644
--- a/openair2/RRC/LTE/rrc_eNB.c
+++ b/openair2/RRC/LTE/rrc_eNB.c
@@ -7042,7 +7042,7 @@ char openair_rrc_eNB_init(
int
rrc_eNB_decode_ccch(
protocol_ctxt_t* const ctxt_pP,
- uint8_t *buffer,
+ const uint8_t *buffer,
int buffer_length,
const int CC_id
)
diff --git a/openair2/RRC/LTE/rrc_proto.h b/openair2/RRC/LTE/rrc_proto.h
index b9277b59a3..88da94bc23 100644
--- a/openair2/RRC/LTE/rrc_proto.h
+++ b/openair2/RRC/LTE/rrc_proto.h
@@ -224,7 +224,7 @@ uint8_t rrc_eNB_get_next_transaction_identifier(module_id_t module_idP);
\param CC_id component carrier index*/
int rrc_eNB_decode_ccch(protocol_ctxt_t* const ctxt_pP,
- uint8_t *buffer,
+ const uint8_t *buffer,
int buffer_length,
const int CC_id
);
--
GitLab