Commit 54cae243 authored by Swetank Srivastava's avatar Swetank Srivastava

changes

parent 070b1664
...@@ -139,17 +139,17 @@ static void send_sys_cnf(enum ConfirmationResult_Type_Sel resType, ...@@ -139,17 +139,17 @@ static void send_sys_cnf(enum ConfirmationResult_Type_Sel resType,
break; break;
} }
default: default:
LOG_A(GNB_APP, "[SYS-GNB] Error not handled CNF TYPE to [SS-PORTMAN-GNB]"); LOG_A(GNB_APP, "[SYS-GNB] Error not handled CNF TYPE to [SS-PORTMAN-GNB]\n");
} }
SS_NR_SYS_PORT_MSG_CNF(message_p).cnf = msgCnf; SS_NR_SYS_PORT_MSG_CNF(message_p).cnf = msgCnf;
int send_res = itti_send_msg_to_task(TASK_SS_PORTMAN_GNB, INSTANCE_DEFAULT, message_p); int send_res = itti_send_msg_to_task(TASK_SS_PORTMAN_GNB, INSTANCE_DEFAULT, message_p);
if (send_res < 0) if (send_res < 0)
{ {
LOG_A(GNB_APP, "[SYS-GNB] Error sending to [SS-PORTMAN-GNB]"); LOG_A(GNB_APP, "[SYS-GNB] Error sending to [SS-PORTMAN-GNB]\n");
} }
else else
{ {
LOG_A(GNB_APP, "[SYS-GNB] fxn:%s NR_SYSTEM_CTRL_CNF sent for cnfType:%d to Port Manager", __FUNCTION__, cnfType); LOG_A(GNB_APP, "[SYS-GNB] fxn:%s NR_SYSTEM_CTRL_CNF sent for cnfType:%d to Port Manager\n", __FUNCTION__, cnfType);
} }
} }
LOG_A(GNB_APP, "[SYS-GNB] Exit from fxn:%s\n", __FUNCTION__); LOG_A(GNB_APP, "[SYS-GNB] Exit from fxn:%s\n", __FUNCTION__);
...@@ -255,64 +255,62 @@ static void ss_task_sys_nr_handle_req(struct NR_SYSTEM_CTRL_REQ *req, ss_nrset_t ...@@ -255,64 +255,62 @@ static void ss_task_sys_nr_handle_req(struct NR_SYSTEM_CTRL_REQ *req, ss_nrset_t
switch (req->Request.d) switch (req->Request.d)
{ {
case NR_SystemRequest_Type_Cell: case NR_SystemRequest_Type_Cell:
{ {
LOG_A(GNB_APP, "[SYS-GNB] Dummy handling for Cell Config 5G NR_SystemRequest_Type_Cell \n"); LOG_A(GNB_APP, "[SYS-GNB] Dummy handling for Cell Config 5G NR_SystemRequest_Type_Cell \n");
send_sys_cnf(ConfirmationResult_Type_Success, TRUE, NR_SystemConfirm_Type_Cell, NULL); send_sys_cnf(ConfirmationResult_Type_Success, TRUE, NR_SystemConfirm_Type_Cell, NULL);
} }
break; break;
case NR_SystemRequest_Type_EnquireTiming: case NR_SystemRequest_Type_EnquireTiming:
{ {
sys_handle_nr_enquire_timing(tinfo); sys_handle_nr_enquire_timing(tinfo);
LOG_A(GNB_APP, "[SYS-GNB] NR_SystemRequest_Type_EnquireTiming received\n"); LOG_A(GNB_APP, "[SYS-GNB] NR_SystemRequest_Type_EnquireTiming received\n");
} }
break; break;
case NR_SystemRequest_Type_RadioBearerList: case NR_SystemRequest_Type_RadioBearerList:
{
LOG_A(GNB_APP, "[SYS-GNB] NR_SystemRequest_Type_RadioBearerList received\n");
if (false == ss_task_sys_nr_handle_cellConfigRadioBearer(&req) )
{ {
LOG_A(GNB_APP, "[SYS-GNB] Error handling Cell Config 5G for NR_SystemRequest_Type_Cell \n"); LOG_A(GNB_APP, "[SYS-GNB] NR_SystemRequest_Type_RadioBearerList received\n");
return; if (false == ss_task_sys_nr_handle_cellConfigRadioBearer(&req) )
{
LOG_A(GNB_APP, "[SYS-GNB] Error handling Cell Config 5G for NR_SystemRequest_Type_Cell \n");
return;
}
} }
} break;
break; case NR_SystemRequest_Type_CellAttenuationList:
case NR_SystemRequest_Type_CellAttenuationList:
{
LOG_A(GNB_APP, "[SYS-GNB] NR_SystemRequest_Type_CellAttenuationList received\n");
if (false == ss_task_sys_nr_handle_cellConfigAttenuation(&req) )
{ {
LOG_A(GNB_APP, "[SYS-GNB] Error handling Cell Config 5G for NR_SystemRequest_Type_Cell \n"); LOG_A(GNB_APP, "[SYS-GNB] NR_SystemRequest_Type_CellAttenuationList received\n");
return; if (false == ss_task_sys_nr_handle_cellConfigAttenuation(&req) )
{
LOG_A(GNB_APP, "[SYS-GNB] Error handling Cell Config 5G for NR_SystemRequest_Type_Cell \n");
return;
}
} }
} break;
break; case NR_SystemRequest_Type_PdcpCount:
case NR_SystemRequest_Type_PdcpCount: {
{ LOG_A(GNB_APP, "[SYS-GNB] NR_SystemRequest_Type_PdcpCount received\n");
LOG_A(GNB_APP, "[SYS-GNB] NR_SystemRequest_Type_PdcpCount received\n"); if (false == ss_task_sys_nr_handle_pdcpCount(&req))
if (false == ss_task_sys_nr_handle_pdcpCount(&req)) {
{ LOG_A(GNB_APP, "[SYS-GNB] Error handling Cell Config 5G for NR_SystemRequest_Type_PdcpCount \n");
LOG_A(GNB_APP, "[SYS-GNB] Error handling Cell Config 5G for NR_SystemRequest_Type_PdcpCount \n"); return;
return; }
} }
} break;
break; case NR_SystemRequest_Type_AS_Security:
case NR_SystemRequest_Type_AS_Security: {
{ LOG_A(GNB_APP, "[SYS-GNB] Dummy handling for Cell Config 5G NR_SystemRequest_Type_AS_Security \n");
LOG_A(GNB_APP, "[SYS-GNB] Dummy handling for Cell Config 5G NR_SystemRequest_Type_AS_Security \n"); send_sys_cnf(ConfirmationResult_Type_Success, TRUE, NR_SystemConfirm_Type_AS_Security, NULL);
send_sys_cnf(ConfirmationResult_Type_Success, TRUE, NR_SystemConfirm_Type_Cell, NULL); }
} break;
default: default:
{ {
LOG_E(GNB_APP, "[SYS-GNB] Error ! SS_STATE %d Invalid SystemRequest_Type %d received\n", LOG_E(GNB_APP, "[SYS-GNB] Error ! SS_STATE %d Invalid SystemRequest_Type %d received\n",
RC.ss.State, req->Request.d); RC.ss.State, req->Request.d);
} }
break;
} }
} }
break; break;
default:
LOG_E(GNB_APP, "[SYS-GNB] Error ! SS_STATE %d Invalid SystemRequest_Type %d received\n",
RC.ss.State, req->Request.d);
break;
} }
LOG_A(GNB_APP, "[SYS-GNB] SS_STATE %d New SS_STATE %d received SystemRequest_Type %d\n", LOG_A(GNB_APP, "[SYS-GNB] SS_STATE %d New SS_STATE %d received SystemRequest_Type %d\n",
enterState, RC.ss.State, req->Request.d); enterState, RC.ss.State, req->Request.d);
...@@ -352,29 +350,34 @@ bool valid_nr_sys_msg(struct NR_SYSTEM_CTRL_REQ *req) ...@@ -352,29 +350,34 @@ bool valid_nr_sys_msg(struct NR_SYSTEM_CTRL_REQ *req)
else else
{ {
cnfType = NR_SystemConfirm_Type_Cell; cnfType = NR_SystemConfirm_Type_Cell;
reqCnfFlag_g = req->Common.ControlInfo.CnfFlag;
} }
break; break;
case NR_SystemRequest_Type_EnquireTiming: case NR_SystemRequest_Type_EnquireTiming:
valid = TRUE; valid = TRUE;
sendDummyCnf = FALSE; sendDummyCnf = FALSE;
reqCnfFlag_g = req->Common.ControlInfo.CnfFlag;
break; break;
case NR_SystemRequest_Type_DeltaValues: case NR_SystemRequest_Type_DeltaValues:
valid = TRUE; valid = TRUE;
sendDummyCnf = FALSE; sendDummyCnf = FALSE;
reqCnfFlag_g = req->Common.ControlInfo.CnfFlag;
break; break;
case NR_SystemRequest_Type_RadioBearerList: case NR_SystemRequest_Type_RadioBearerList:
valid = TRUE; valid = TRUE;
sendDummyCnf = FALSE; sendDummyCnf = FALSE;
cnfType = NR_SystemConfirm_Type_RadioBearerList; cnfType = NR_SystemConfirm_Type_RadioBearerList;
reqCnfFlag_g = req->Common.ControlInfo.CnfFlag;
break; break;
case NR_SystemRequest_Type_CellAttenuationList: case NR_SystemRequest_Type_CellAttenuationList:
valid = TRUE; valid = TRUE;
sendDummyCnf = FALSE; sendDummyCnf = FALSE;
cnfType = NR_SystemConfirm_Type_CellAttenuationList; cnfType = NR_SystemConfirm_Type_CellAttenuationList;
reqCnfFlag_g = req->Common.ControlInfo.CnfFlag;
break; break;
case NR_SystemRequest_Type_AS_Security: case NR_SystemRequest_Type_AS_Security:
valid = TRUE; valid = TRUE;
sendDummyCnf = TRUE; sendDummyCnf = FALSE;
cnfType = NR_SystemConfirm_Type_AS_Security; cnfType = NR_SystemConfirm_Type_AS_Security;
reqCnfFlag_g = req->Common.ControlInfo.CnfFlag; reqCnfFlag_g = req->Common.ControlInfo.CnfFlag;
break; break;
...@@ -382,6 +385,7 @@ bool valid_nr_sys_msg(struct NR_SYSTEM_CTRL_REQ *req) ...@@ -382,6 +385,7 @@ bool valid_nr_sys_msg(struct NR_SYSTEM_CTRL_REQ *req)
valid = TRUE; valid = TRUE;
sendDummyCnf = FALSE; sendDummyCnf = FALSE;
cnfType = NR_SystemConfirm_Type_PdcpCount; cnfType = NR_SystemConfirm_Type_PdcpCount;
reqCnfFlag_g = req->Common.ControlInfo.CnfFlag;
break; break;
default: default:
valid = FALSE; valid = FALSE;
...@@ -913,7 +917,7 @@ bool ss_task_sys_nr_handle_pdcpCount(struct NR_SYSTEM_CTRL_REQ *req) ...@@ -913,7 +917,7 @@ bool ss_task_sys_nr_handle_pdcpCount(struct NR_SYSTEM_CTRL_REQ *req)
struct NR_PDCP_CountCnf_Type PdcpCount; struct NR_PDCP_CountCnf_Type PdcpCount;
PdcpCount.d = NR_PDCP_CountCnf_Type_Get; PdcpCount.d = NR_PDCP_CountCnf_Type_Get;
PdcpCount.v.Get.d = 2; PdcpCount.v.Get.d = 1;
const size_t size = sizeof(struct NR_PdcpCountInfo_Type) * PdcpCount.v.Get.d; const size_t size = sizeof(struct NR_PdcpCountInfo_Type) * PdcpCount.v.Get.d;
PdcpCount.v.Get.v =(struct NR_PdcpCountInfo_Type *)acpMalloc(size); PdcpCount.v.Get.v =(struct NR_PdcpCountInfo_Type *)acpMalloc(size);
for (int i = 0; i < PdcpCount.v.Get.d; i++) for (int i = 0; i < PdcpCount.v.Get.d; i++)
......
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