Commit 19c59279 authored by Vijay Chadachan's avatar Vijay Chadachan Committed by Vijay C

Fixed the TTCN connection issue and MAC changes for crash

parent 506df7c3
...@@ -61,7 +61,7 @@ void handle_rach(UL_IND_t *UL_info) { ...@@ -61,7 +61,7 @@ void handle_rach(UL_IND_t *UL_info) {
COMMON_channels_t *cc = eNB->common_channels; COMMON_channels_t *cc = eNB->common_channels;
rnti_t rnti = 0; rnti_t rnti = 0;
bool retVal = false; bool retVal = false;
for ( int UE_id = 0; UE_id < NUMBER_OF_UE_MAX; UE_id++ ) for ( int UE_id = 0; UE_id < NUMBER_OF_UE_MAX; UE_id++ )
{ {
if (eNB->UE_info.active[UL_info->CC_id][UE_id] == false) if (eNB->UE_info.active[UL_info->CC_id][UE_id] == false)
continue; continue;
...@@ -762,7 +762,7 @@ void UL_indication(UL_IND_t *UL_info, void *proc) { ...@@ -762,7 +762,7 @@ void UL_indication(UL_IND_t *UL_info, void *proc) {
if (NFAPI_MODE != NFAPI_MODE_PNF) { if (NFAPI_MODE != NFAPI_MODE_PNF) {
/* MultiCell: Condition modified for Multiple CC */ /* MultiCell: Condition modified for Multiple CC */
if (ifi->CC_mask < ((1<<RC.nb_CC[module_id])-1)) { if (ifi->CC_mask < ((1<<RC.nb_mac_CC[module_id])-1)) {
ifi->current_frame = UL_info->frame; ifi->current_frame = UL_info->frame;
ifi->current_subframe = UL_info->subframe; ifi->current_subframe = UL_info->subframe;
} else { } else {
...@@ -792,11 +792,11 @@ void UL_indication(UL_IND_t *UL_info, void *proc) { ...@@ -792,11 +792,11 @@ void UL_indication(UL_IND_t *UL_info, void *proc) {
if (NFAPI_MODE != NFAPI_MODE_PNF) { if (NFAPI_MODE != NFAPI_MODE_PNF) {
/* MultiCell: Condition modified for Multiple CC */ /* MultiCell: Condition modified for Multiple CC */
if (ifi->CC_mask == ((1<<RC.nb_CC[module_id])-1)) { if (ifi->CC_mask == ((1<<RC.nb_mac_CC[module_id])-1)) {
eNB_dlsch_ulsch_scheduler(module_id, eNB_dlsch_ulsch_scheduler(module_id,
(UL_info->frame+((UL_info->subframe>(9-sf_ahead))?1:0)) % 1024, (UL_info->frame+((UL_info->subframe>(9-sf_ahead))?1:0)) % 1024,
(UL_info->subframe+sf_ahead)%10); (UL_info->subframe+sf_ahead)%10);
for (int CC_Id=0; CC_Id<RC.nb_CC[module_id]; CC_Id++) { for (int CC_Id=0; CC_Id<RC.nb_mac_CC[module_id]; CC_Id++) {
ifi->CC_mask = 0; ifi->CC_mask = 0;
sched_info->module_id = module_id; sched_info->module_id = module_id;
sched_info->CC_id = CC_Id; sched_info->CC_id = CC_Id;
...@@ -900,7 +900,7 @@ bool generate_mac_pdcch_order(UL_IND_t *UL_info, uint8_t dl_cqi, COMMON_channels ...@@ -900,7 +900,7 @@ bool generate_mac_pdcch_order(UL_IND_t *UL_info, uint8_t dl_cqi, COMMON_channels
if (!CCE_allocation_infeasible(UL_info->module_id, UL_info->CC_id, 0, UL_info->subframe, if (!CCE_allocation_infeasible(UL_info->module_id, UL_info->CC_id, 0, UL_info->subframe,
dl_config_pdu->dci_dl_pdu.dci_dl_pdu_rel8.aggregation_level, rnti)) dl_config_pdu->dci_dl_pdu.dci_dl_pdu_rel8.aggregation_level, rnti))
{ {
printf("PDCCHOrder scheduled at Frame %d: Subframe %d : Adding common DCI for RNTI %d\n", UL_info->frame, UL_info->subframe, rnti); printf("PDCCHOrder scheduled at Frame %d: Subframe %d : Adding common DCI for RNTI %d\n", UL_info->frame, UL_info->subframe, rnti);
LOG_D(MAC, "PDCCHOrder scheduled at Frame %d: Subframe %d : Adding common DCI for RNTI %d\n", UL_info->frame, UL_info->subframe, rnti); LOG_D(MAC, "PDCCHOrder scheduled at Frame %d: Subframe %d : Adding common DCI for RNTI %d\n", UL_info->frame, UL_info->subframe, rnti);
dl_req_body->number_dci++; dl_req_body->number_dci++;
...@@ -912,7 +912,7 @@ bool generate_mac_pdcch_order(UL_IND_t *UL_info, uint8_t dl_cqi, COMMON_channels ...@@ -912,7 +912,7 @@ bool generate_mac_pdcch_order(UL_IND_t *UL_info, uint8_t dl_cqi, COMMON_channels
printf("PDCCHOrder: CCE Allocation not feasible Frame %d: Subframe %d \n", UL_info->frame, UL_info->subframe); printf("PDCCHOrder: CCE Allocation not feasible Frame %d: Subframe %d \n", UL_info->frame, UL_info->subframe);
LOG_D(MAC, "PDCCHOrder: CCE Allocation not feasible Frame %d: Subframe %d \n", UL_info->frame, UL_info->subframe); LOG_D(MAC, "PDCCHOrder: CCE Allocation not feasible Frame %d: Subframe %d \n", UL_info->frame, UL_info->subframe);
} }
#if 0 #if 0
dl_config_request.sfn_sf = UL_info->frame<<4 | UL_info->subframe; dl_config_request.sfn_sf = UL_info->frame<<4 | UL_info->subframe;
dl_config_request.dl_config_request_body.number_pdcch_ofdm_symbols = 1; dl_config_request.dl_config_request_body.number_pdcch_ofdm_symbols = 1;
dl_config_request.dl_config_request_body.number_dci = 1; dl_config_request.dl_config_request_body.number_dci = 1;
...@@ -920,7 +920,7 @@ bool generate_mac_pdcch_order(UL_IND_t *UL_info, uint8_t dl_cqi, COMMON_channels ...@@ -920,7 +920,7 @@ bool generate_mac_pdcch_order(UL_IND_t *UL_info, uint8_t dl_cqi, COMMON_channels
dl_config_request.dl_config_request_body.number_pdsch_rnti = 0; dl_config_request.dl_config_request_body.number_pdsch_rnti = 0;
dl_config_request.dl_config_request_body.transmission_power_pcfich = 6000; dl_config_request.dl_config_request_body.transmission_power_pcfich = 6000;
dl_config_request.dl_config_request_body.dl_config_pdu_list = &dl_config_pdu; dl_config_request.dl_config_request_body.dl_config_pdu_list = &dl_config_pdu;
LOG_I(PHY,"Entry In function:%s\ module_id:%d CC_id:%d dl_cqi:%d dl_bw:%d rnti:%d\n", LOG_I(PHY,"Entry In function:%s\ module_id:%d CC_id:%d dl_cqi:%d dl_bw:%d rnti:%d\n",
__FUNCTION__, __FUNCTION__,
UL_info->module_id, UL_info->module_id,
UL_info->CC_id, UL_info->CC_id,
...@@ -928,7 +928,7 @@ bool generate_mac_pdcch_order(UL_IND_t *UL_info, uint8_t dl_cqi, COMMON_channels ...@@ -928,7 +928,7 @@ bool generate_mac_pdcch_order(UL_IND_t *UL_info, uint8_t dl_cqi, COMMON_channels
cc[UL_info->CC_id].mib->message.dl_Bandwidth, cc[UL_info->CC_id].mib->message.dl_Bandwidth,
rnti); rnti);
#endif #endif
#if 0 #if 0
if (oai_nfapi_dl_config_req(&dl_config_request) != 0) if (oai_nfapi_dl_config_req(&dl_config_request) != 0)
......
...@@ -569,13 +569,14 @@ void *ss_eNB_port_man_acp_task(void *arg) ...@@ -569,13 +569,14 @@ void *ss_eNB_port_man_acp_task(void *arg)
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;
const size_t msgSize = 16 * 1024; const size_t size = 16 * 1024;
unsigned char *buffer = (unsigned char *)acpMalloc(msgSize); unsigned char *buffer = (unsigned char *)acpMalloc(size);
int status = 0; int status = 0;
if (!buffer) if (!buffer)
return false; return false;
size_t msgSize = size;
memset(&cnf, 0, sizeof(cnf)); memset(&cnf, 0, sizeof(cnf));
cnf.Common.CellId = sys_req->Common.CellId; cnf.Common.CellId = sys_req->Common.CellId;
...@@ -585,10 +586,13 @@ bool ss_eNB_port_man_handle_enquiryTiming(struct SYSTEM_CTRL_REQ *sys_req) ...@@ -585,10 +586,13 @@ bool ss_eNB_port_man_handle_enquiryTiming(struct SYSTEM_CTRL_REQ *sys_req)
cnf.Common.TimingInfo.d = TimingInfo_Type_SubFrame; cnf.Common.TimingInfo.d = TimingInfo_Type_SubFrame;
cnf.Common.TimingInfo.v.SubFrame.SFN.d = SystemFrameNumberInfo_Type_Number; cnf.Common.TimingInfo.v.SubFrame.SFN.d = SystemFrameNumberInfo_Type_Number;
cnf.Common.TimingInfo.v.SubFrame.SFN.v.Number = SS_context.sfn; cnf.Common.TimingInfo.v.SubFrame.SFN.v.Number = SS_context.sfn;
cnf.Common.TimingInfo.v.SubFrame.Subframe.d = SubFrameInfo_Type_Number; cnf.Common.TimingInfo.v.SubFrame.Subframe.d = SubFrameInfo_Type_Number;
cnf.Common.TimingInfo.v.SubFrame.Subframe.v.Number = SS_context.sf; cnf.Common.TimingInfo.v.SubFrame.Subframe.v.Number = SS_context.sf;
cnf.Common.TimingInfo.v.SubFrame.HSFN.d = SystemFrameNumberInfo_Type_Number; cnf.Common.TimingInfo.v.SubFrame.HSFN.d = SystemFrameNumberInfo_Type_Number;
cnf.Common.TimingInfo.v.SubFrame.HSFN.v.Number = SS_context.hsfn; cnf.Common.TimingInfo.v.SubFrame.HSFN.v.Number = SS_context.hsfn;
cnf.Common.TimingInfo.v.SubFrame.Slot.d = SlotTimingInfo_Type_FirstSlot; cnf.Common.TimingInfo.v.SubFrame.Slot.d = SlotTimingInfo_Type_FirstSlot;
cnf.Common.TimingInfo.v.SubFrame.Slot.v.FirstSlot = true; cnf.Common.TimingInfo.v.SubFrame.Slot.v.FirstSlot = true;
......
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