Commit a866f513 authored by Anurag Asokan's avatar Anurag Asokan Committed by jperaldi

Additional changes for Multi Cell support on VNF

parent 0794033d
...@@ -642,9 +642,9 @@ int phy_slot_indication(struct nfapi_vnf_p7_config *config, uint16_t phy_id, uin ...@@ -642,9 +642,9 @@ int phy_slot_indication(struct nfapi_vnf_p7_config *config, uint16_t phy_id, uin
int phy_subframe_indication(struct nfapi_vnf_p7_config *config, uint16_t phy_id, uint16_t sfn_sf) { int phy_subframe_indication(struct nfapi_vnf_p7_config *config, uint16_t phy_id, uint16_t sfn_sf) {
static uint8_t first_time = 1; static uint8_t first_time = 1;
int CC_id=0;
/* MultiCell: Function modify for Multiple CC */ /* MultiCell: Function modify for Multiple CC */
for (int CC_id=0; CC_id<MAX_NUM_CCs; CC_id++) { /*for (int CC_id=0; CC_id<MAX_NUM_CCs; CC_id++) */{
if (first_time) { if (first_time) {
NFAPI_TRACE(NFAPI_TRACE_INFO, "[VNF] subframe indication %d\n", NFAPI_SFNSF2DEC(sfn_sf)); NFAPI_TRACE(NFAPI_TRACE_INFO, "[VNF] subframe indication %d\n", NFAPI_SFNSF2DEC(sfn_sf));
first_time = 0; first_time = 0;
...@@ -653,7 +653,7 @@ int phy_subframe_indication(struct nfapi_vnf_p7_config *config, uint16_t phy_id, ...@@ -653,7 +653,7 @@ int phy_subframe_indication(struct nfapi_vnf_p7_config *config, uint16_t phy_id,
if (RC.eNB && RC.eNB[0][CC_id]->configured) { if (RC.eNB && RC.eNB[0][CC_id]->configured) {
uint16_t sfn = NFAPI_SFNSF2SFN(sfn_sf); uint16_t sfn = NFAPI_SFNSF2SFN(sfn_sf);
uint16_t sf = NFAPI_SFNSF2SF(sfn_sf); uint16_t sf = NFAPI_SFNSF2SF(sfn_sf);
//LOG_D(PHY,"[VNF] subframe indication sfn_sf:%d sfn:%d sf:%d\n", sfn_sf, sfn, sf); LOG_D(PHY,"[VNF] subframe indication sfn_sf:%d sfn:%d sf:%d CC_id %d\n", sfn_sf, sfn, sf,CC_id);
wake_eNB_rxtx(RC.eNB[0][CC_id], sfn, sf); wake_eNB_rxtx(RC.eNB[0][CC_id], sfn, sf);
} else { } else {
NFAPI_TRACE(NFAPI_TRACE_INFO, "[VNF] %s() RC.eNB:%p\n", __FUNCTION__, RC.eNB); NFAPI_TRACE(NFAPI_TRACE_INFO, "[VNF] %s() RC.eNB:%p\n", __FUNCTION__, RC.eNB);
......
...@@ -88,7 +88,7 @@ nfapi_vnf_p7_connection_info_t* vnf_p7_connection_info_list_find(vnf_p7_t* vnf_p ...@@ -88,7 +88,7 @@ nfapi_vnf_p7_connection_info_t* vnf_p7_connection_info_list_find(vnf_p7_t* vnf_p
nfapi_vnf_p7_connection_info_t* curr = vnf_p7->p7_connections; nfapi_vnf_p7_connection_info_t* curr = vnf_p7->p7_connections;
while(curr != 0) while(curr != 0)
{ {
if(curr->phy_id == phy_id) if(curr->phy_id == 1)//phy_id)
{ {
return curr; return curr;
} }
......
...@@ -258,7 +258,6 @@ static inline int rxtx(PHY_VARS_eNB *eNB, ...@@ -258,7 +258,6 @@ static inline int rxtx(PHY_VARS_eNB *eNB,
eNB->UL_INFO.subframe = proc->subframe_rx; eNB->UL_INFO.subframe = proc->subframe_rx;
eNB->UL_INFO.module_id = eNB->Mod_id; eNB->UL_INFO.module_id = eNB->Mod_id;
eNB->UL_INFO.CC_id = eNB->CC_id; eNB->UL_INFO.CC_id = eNB->CC_id;
eNB->if_inst->UL_indication(&eNB->UL_INFO, proc);
//#ifdef ENB_SS //#ifdef ENB_SS
if (RC.ss.mode >= SS_SOFTMODEM) if (RC.ss.mode >= SS_SOFTMODEM)
...@@ -308,6 +307,15 @@ static inline int rxtx(PHY_VARS_eNB *eNB, ...@@ -308,6 +307,15 @@ static inline int rxtx(PHY_VARS_eNB *eNB,
eNB->UL_INFO.subframe, eNB->UL_INFO.frame); /** TODO: Need separate logging for SS */ eNB->UL_INFO.subframe, eNB->UL_INFO.frame); /** TODO: Need separate logging for SS */
} }
} }
int tem_proc_ccid = proc->CC_id;
/* MultiCell: Function modify for Multiple CC */
for (int CC_id=0; CC_id<2; CC_id++) {
eNB->UL_INFO.CC_id = CC_id;
proc->CC_id = CC_id;//Temp solution need to be fixed later
eNB->if_inst->UL_indication(&eNB->UL_INFO, proc);
}
proc->CC_id = tem_proc_ccid;
//#endif /** ENB_SS */ //#endif /** ENB_SS */
......
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