Commit b828a72c authored by Vijay Chadachan's avatar Vijay Chadachan Committed by Vijay C

8.3.1.4 passing changes

parent 32235e3c
...@@ -327,7 +327,6 @@ void *rrc_enb_process_msg(void *); ...@@ -327,7 +327,6 @@ void *rrc_enb_process_msg(void *);
TASK_DEF(TASK_M3AP_MCE, TASK_PRIORITY_MED, 200, NULL, NULL) \ TASK_DEF(TASK_M3AP_MCE, TASK_PRIORITY_MED, 200, NULL, NULL) \
TASK_DEF(TASK_SCTP, TASK_PRIORITY_MED, 200, NULL, NULL) \ TASK_DEF(TASK_SCTP, TASK_PRIORITY_MED, 200, NULL, NULL) \
TASK_DEF(TASK_SS_PORTMAN, TASK_PRIORITY_MED, 200, NULL, NULL) \ TASK_DEF(TASK_SS_PORTMAN, TASK_PRIORITY_MED, 200, NULL, NULL) \
TASK_DEF(TASK_SS_PORTMAN_ACP, TASK_PRIORITY_MED, 200, NULL, NULL) \
TASK_DEF(TASK_SS_PORTMAN_GNB, TASK_PRIORITY_MED, 200, NULL, NULL) \ TASK_DEF(TASK_SS_PORTMAN_GNB, TASK_PRIORITY_MED, 200, NULL, NULL) \
TASK_DEF(TASK_SYS, TASK_PRIORITY_MED, 200, NULL, NULL) \ TASK_DEF(TASK_SYS, TASK_PRIORITY_MED, 200, NULL, NULL) \
TASK_DEF(TASK_SYS_GNB, TASK_PRIORITY_MED, 200, NULL, NULL) \ TASK_DEF(TASK_SYS_GNB, TASK_PRIORITY_MED, 200, NULL, NULL) \
......
...@@ -64,10 +64,7 @@ int create_tasks(uint32_t enb_nb) { ...@@ -64,10 +64,7 @@ int create_tasks(uint32_t enb_nb) {
{ {
rc = itti_create_task(TASK_SS_PORTMAN, ss_eNB_port_man_eNB_task, NULL); rc = itti_create_task(TASK_SS_PORTMAN, ss_eNB_port_man_eNB_task, NULL);
AssertFatal(rc >= 0, "Create task for SS manager failed\n"); AssertFatal(rc >= 0, "Create task for SS manager failed\n");
#if 0
rc = itti_create_task(TASK_SS_PORTMAN_ACP, ss_eNB_port_man_acp_task, NULL);
AssertFatal(rc >= 0, "Create task for SS manager failed\n");
#endif
rc = itti_create_task(TASK_SYS, ss_eNB_sys_task, NULL); rc = itti_create_task(TASK_SYS, ss_eNB_sys_task, NULL);
AssertFatal(rc >= 0, "Create task for SS failed\n"); AssertFatal(rc >= 0, "Create task for SS failed\n");
......
...@@ -2474,7 +2474,7 @@ bool check_ulGrant_Schedule(frame_t frameP, sub_frame_t subframeP, int CC_id, ui ...@@ -2474,7 +2474,7 @@ bool check_ulGrant_Schedule(frame_t frameP, sub_frame_t subframeP, int CC_id, ui
if (RC.ss.ulgrant_info[CC_id].ulGrantType == ON_SR_RECEPTION_PRESENT ) if (RC.ss.ulgrant_info[CC_id].ulGrantType == ON_SR_RECEPTION_PRESENT )
{ {
LOG_I(MAC, "%s ulGrantType = ON_SR_RECEPTION_PRESENT\n", __FUNCTION__); LOG_I(MAC, "%s ulGrantType = ON_SR_RECEPTION_PRESENT\n", __FUNCTION__);
if (SR_received == 1) //if (SR_received == 1)
{ {
LOG_D(MAC, " %s ULGrantType: ON_SR_RECEPTION_PRESENT. ULGrant Scheduled at frame:%d subframe:%d\n", LOG_D(MAC, " %s ULGrantType: ON_SR_RECEPTION_PRESENT. ULGrant Scheduled at frame:%d subframe:%d\n",
__FUNCTION__, __FUNCTION__,
...@@ -2482,11 +2482,11 @@ bool check_ulGrant_Schedule(frame_t frameP, sub_frame_t subframeP, int CC_id, ui ...@@ -2482,11 +2482,11 @@ bool check_ulGrant_Schedule(frame_t frameP, sub_frame_t subframeP, int CC_id, ui
subframeP); subframeP);
return true; return true;
} }
else //else
{ // {
LOG_I(MAC, "%s ulGrantType = ON_SR_RECEPTION_PRESENT but NOT scheduling\n", __FUNCTION__); //LOG_I(MAC, "%s ulGrantType = ON_SR_RECEPTION_PRESENT but NOT scheduling\n", __FUNCTION__);
return false; //return false;
} // }
} }
/* Handling periodic UL_Grant Configuration */ /* Handling periodic UL_Grant Configuration */
...@@ -2519,7 +2519,7 @@ bool check_ulGrant_Schedule(frame_t frameP, sub_frame_t subframeP, int CC_id, ui ...@@ -2519,7 +2519,7 @@ bool check_ulGrant_Schedule(frame_t frameP, sub_frame_t subframeP, int CC_id, ui
} }
else else
{ {
return false; return true;
} }
} }
RC.ss.ulgrant_info[CC_id].periodiGrantInfo.subframe_counter = 0; RC.ss.ulgrant_info[CC_id].periodiGrantInfo.subframe_counter = 0;
......
...@@ -1378,7 +1378,7 @@ typedef struct eNB_MAC_INST_s { ...@@ -1378,7 +1378,7 @@ typedef struct eNB_MAC_INST_s {
/// Pointer to IF module instance for PHY /// Pointer to IF module instance for PHY
IF_Module_t *if_inst; IF_Module_t *if_inst;
/// Common cell resources /// Common cell resources
COMMON_channels_t common_channels[NFAPI_CC_MAX]; COMMON_channels_t common_channels[MAX_NUM_CCs];
/// current PDU index (BCH,MCH,DLSCH) /// current PDU index (BCH,MCH,DLSCH)
int16_t pdu_index[NFAPI_CC_MAX]; int16_t pdu_index[NFAPI_CC_MAX];
......
...@@ -552,20 +552,6 @@ void *ss_eNB_port_man_eNB_task(void *arg) ...@@ -552,20 +552,6 @@ void *ss_eNB_port_man_eNB_task(void *arg)
return NULL; return NULL;
} }
void *ss_eNB_port_man_acp_task(void *arg)
{
// ss_eNB_port_man_init();
while (1)
{
/* Now handle notifications for other sockets */
// ss_eNB_read_from_socket(ctx_g);
sleep(1000);
}
return NULL;
}
bool ss_eNB_port_man_handle_enquiryTiming(struct SYSTEM_CTRL_REQ *sys_req) bool ss_eNB_port_man_handle_enquiryTiming(struct SYSTEM_CTRL_REQ *sys_req)
{ {
struct SYSTEM_CTRL_CNF cnf; struct SYSTEM_CTRL_CNF cnf;
......
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