Commit 18e02018 authored by WEI-TAI CHEN's avatar WEI-TAI CHEN

- Fix the warning for declare warning type in GNB_APP

parent d83251d4
This diff is collapsed.
This diff is collapsed.
...@@ -302,8 +302,8 @@ void do_SERVINGCELLCONFIGCOMMON(uint8_t Mod_id, ...@@ -302,8 +302,8 @@ void do_SERVINGCELLCONFIGCOMMON(uint8_t Mod_id,
struct NR_ServingCellConfigCommon__rateMatchPatternToReleaseList **ratematchpatterntoreleaselist = &RC.nrrrc[Mod_id]->carrier[CC_id].servingcellconfigcommon->rateMatchPatternToReleaseList; struct NR_ServingCellConfigCommon__rateMatchPatternToReleaseList **ratematchpatterntoreleaselist = &RC.nrrrc[Mod_id]->carrier[CC_id].servingcellconfigcommon->rateMatchPatternToReleaseList;
NR_RateMatchPatternId_t *ratematchpatternid; NR_RateMatchPatternId_t *ratematchpatternid;
struct NR_TDD_UL_DL_ConfigCommon **tdd_ul_dl_configurationcommon; struct NR_TDD_UL_DL_ConfigCommon **tdd_ul_dl_configurationcommon = &RC.nrrrc[Mod_id]->carrier[CC_id].servingcellconfigcommon->tdd_UL_DL_ConfigurationCommon;
struct NR_TDD_UL_DL_ConfigCommon **tdd_ul_dl_configurationcommon2; struct NR_TDD_UL_DL_ConfigCommon **tdd_ul_dl_configurationcommon2 = &RC.nrrrc[Mod_id]->carrier[CC_id].servingcellconfigcommon->tdd_UL_DL_ConfigurationCommon2;
// FrequencyInfoDL // // FrequencyInfoDL //
NR_FreqBandIndicatorNR_t *dl_frequencyBandList; NR_FreqBandIndicatorNR_t *dl_frequencyBandList;
......
...@@ -84,4 +84,21 @@ nr_rrc_init_global_param( ...@@ -84,4 +84,21 @@ nr_rrc_init_global_param(
Rlc_info_am_config.rlc.rlc_am_info.t_status_prohibit = 10; Rlc_info_am_config.rlc.rlc_am_info.t_status_prohibit = 10;
return 0; return 0;
} }
\ No newline at end of file
//-----------------------------------------------------------------------------
void
rrc_config_nr_buffer(
SRB_INFO* Srb_info,
uint8_t Lchan_type,
uint8_t Role
)
//-----------------------------------------------------------------------------
{
Srb_info->Rx_buffer.payload_size = 0;
Srb_info->Tx_buffer.payload_size = 0;
}
//-----------------------------------------------------------------------------
\ No newline at end of file
...@@ -37,6 +37,10 @@ ...@@ -37,6 +37,10 @@
int nr_rrc_init_global_param(void); int nr_rrc_init_global_param(void);
void rrc_config_nr_buffer(SRB_INFO* Srb_info,
uint8_t Lchan_type,
uint8_t Role);
#if defined(ENABLE_ITTI) #if defined(ENABLE_ITTI)
/**\brief RRC eNB task. /**\brief RRC eNB task.
\param void *args_p Pointer on arguments to start the task. */ \param void *args_p Pointer on arguments to start the task. */
......
...@@ -115,7 +115,7 @@ mui_t rrc_gNB_mui = 0; ...@@ -115,7 +115,7 @@ mui_t rrc_gNB_mui = 0;
///---------------------------------------------------------------------------------------------------------------/// ///---------------------------------------------------------------------------------------------------------------///
void void
openair_nrrrc_on( openair_nr_rrc_on(
const protocol_ctxt_t* const ctxt_pP const protocol_ctxt_t* const ctxt_pP
) )
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
...@@ -123,11 +123,11 @@ openair_nrrrc_on( ...@@ -123,11 +123,11 @@ openair_nrrrc_on(
int CC_id; int CC_id;
LOG_I(NR_RRC, PROTOCOL_NR_RRC_CTXT_FMT" gNB:OPENAIR NR RRC IN....\n", LOG_I(NR_RRC, PROTOCOL_NR_RRC_CTXT_FMT" gNB:OPENAIR NR RRC IN....\n",
PROTOCOL_RRC_CTXT_ARGS(ctxt_pP)); PROTOCOL_NR_RRC_CTXT_ARGS(ctxt_pP));
for (CC_id = 0; CC_id < MAX_NUM_CCs; CC_id++) { for (CC_id = 0; CC_id < MAX_NUM_CCs; CC_id++) {
rrc_config_buffer (&RC.nrrrc[ctxt_pP->module_id]->carrier[CC_id].SI, BCCH, 1); rrc_config_nr_buffer (&RC.nrrrc[ctxt_pP->module_id]->carrier[CC_id].SI, BCCH, 1);
RC.nrrrc[ctxt_pP->module_id]->carrier[CC_id].SI.Active = 1; RC.nrrrc[ctxt_pP->module_id]->carrier[CC_id].SI.Active = 1;
rrc_config_buffer (&RC.nrrrc[ctxt_pP->module_id]->carrier[CC_id].Srb0, CCCH, 1); rrc_config_nr_buffer (&RC.nrrrc[ctxt_pP->module_id]->carrier[CC_id].Srb0, CCCH, 1);
RC.nrrrc[ctxt_pP->module_id]->carrier[CC_id].Srb0.Active = 1; RC.nrrrc[ctxt_pP->module_id]->carrier[CC_id].Srb0.Active = 1;
} }
} }
...@@ -146,7 +146,7 @@ init_NR_SI( ...@@ -146,7 +146,7 @@ init_NR_SI(
) )
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
{ {
int i; //int i;
LOG_D(RRC,"%s()\n\n\n\n",__FUNCTION__); LOG_D(RRC,"%s()\n\n\n\n",__FUNCTION__);
...@@ -282,7 +282,7 @@ char openair_rrc_gNB_configuration(const module_id_t gnb_mod_idP, gNB_RrcConfigu ...@@ -282,7 +282,7 @@ char openair_rrc_gNB_configuration(const module_id_t gnb_mod_idP, gNB_RrcConfigu
nr_rrc_init_global_param(); nr_rrc_init_global_param();
openair_nrrrc_on(&ctxt); openair_nr_rrc_on(&ctxt);
return 0; return 0;
...@@ -328,10 +328,10 @@ void* rrc_gnb_task(void* args_p){ ...@@ -328,10 +328,10 @@ void* rrc_gnb_task(void* args_p){
/* Messages from PDCP */ /* Messages from PDCP */
/*
#if defined(ENABLE_USE_MME) #if defined(ENABLE_USE_MME)
/* Messages from S1AP */ // Messages from S1AP
case S1AP_DOWNLINK_NAS: case S1AP_DOWNLINK_NAS:
rrc_eNB_process_S1AP_DOWNLINK_NAS(msg_p, msg_name_p, instance, &rrc_gNB_mui); rrc_eNB_process_S1AP_DOWNLINK_NAS(msg_p, msg_name_p, instance, &rrc_gNB_mui);
break; break;
...@@ -371,7 +371,7 @@ void* rrc_gnb_task(void* args_p){ ...@@ -371,7 +371,7 @@ void* rrc_gnb_task(void* args_p){
break; break;
case GTPV1U_ENB_DELETE_TUNNEL_RESP: case GTPV1U_ENB_DELETE_TUNNEL_RESP:
/* Nothing to do. Apparently everything is done in S1AP processing */ ///Nothing to do. Apparently everything is done in S1AP processing
//LOG_I(RRC, "[eNB %d] Received message %s, not processed because procedure not synched\n", //LOG_I(RRC, "[eNB %d] Received message %s, not processed because procedure not synched\n",
//instance, msg_name_p); //instance, msg_name_p);
if (rrc_eNB_get_ue_context(RC.nrrrc[instance], GTPV1U_ENB_DELETE_TUNNEL_RESP(msg_p).rnti) if (rrc_eNB_get_ue_context(RC.nrrrc[instance], GTPV1U_ENB_DELETE_TUNNEL_RESP(msg_p).rnti)
...@@ -382,7 +382,7 @@ void* rrc_gnb_task(void* args_p){ ...@@ -382,7 +382,7 @@ void* rrc_gnb_task(void* args_p){
break; break;
#endif #endif
*/
/* Messages from gNB app */ /* Messages from gNB app */
case NRRRC_CONFIGURATION_REQ: case NRRRC_CONFIGURATION_REQ:
LOG_I(NR_RRC, "[gNB %d] Received %s : %p\n", instance, msg_name_p,&NRRRC_CONFIGURATION_REQ(msg_p)); LOG_I(NR_RRC, "[gNB %d] Received %s : %p\n", instance, msg_name_p,&NRRRC_CONFIGURATION_REQ(msg_p));
......
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