Commit 22be6eb5 authored by wujing's avatar wujing

fix build error in dlsim

parent 8ba3b117
...@@ -855,15 +855,19 @@ void schedule_response(Sched_Rsp_t *Sched_INFO) { ...@@ -855,15 +855,19 @@ void schedule_response(Sched_Rsp_t *Sched_INFO) {
if (1) { //sdu != NULL) if (1) { //sdu != NULL)
if (NFAPI_MODE!=NFAPI_MODE_VNF) { if (NFAPI_MODE!=NFAPI_MODE_VNF) {
if (sdu != NULL) { if (sdu != NULL) {
LTE_TDD_Config_t *tdd_Config = NULL; LTE_eNB_PDCCH *pdcch_vars = &eNB->pdcch_vars[NFAPI_SFNSF2SF(DL_req->sfn_sf)&1];
uint8_t harq_pid_dl = 0;
if (fp->frame_type == TDD) { uint8_t k;
tdd_Config = CALLOC(1,sizeof(struct LTE_TDD_Config)); for(k=0; k < pdcch_vars->num_dci;k++){
tdd_Config->subframeAssignment = fp->tdd_config; if(pdcch_vars->dci_alloc[k].rnti == dlsch_pdu_rel8->rnti){
tdd_Config->specialSubframePatterns = fp->tdd_config_S; harq_pid_dl = pdcch_vars->dci_alloc[pdcch_vars->num_dci-1].harq_pid;
break;
}
} }
uint8_t harq_pid_dl = frame_subframe2_dl_harq_pid(tdd_Config, NFAPI_SFNSF2SFN(DL_req->sfn_sf), NFAPI_SFNSF2SF(DL_req->sfn_sf)); if(k==pdcch_vars->num_dci){
LOG_E(PHY, "schedule_response not find dl harq_pid rnti %x frame %d subframe %d\n", dlsch_pdu_rel8->rnti,NFAPI_SFNSF2SFN(DL_req->sfn_sf),NFAPI_SFNSF2SF(DL_req->sfn_sf));
}else{
if (harq_pid_dl >=0 && harq_pid_dl < 8) { if (harq_pid_dl >=0 && harq_pid_dl < 8) {
memset(dl_pdus[harq_pid_dl][i], 0, sizeof(uint8_t)*9422); memset(dl_pdus[harq_pid_dl][i], 0, sizeof(uint8_t)*9422);
memcpy(dl_pdus[harq_pid_dl][i], TX_req->tx_request_body.tx_pdu_list[pdu_index].segments[0].segment_data, TX_req->tx_request_body.tx_pdu_list[pdu_index].segments[0].segment_length); memcpy(dl_pdus[harq_pid_dl][i], TX_req->tx_request_body.tx_pdu_list[pdu_index].segments[0].segment_data, TX_req->tx_request_body.tx_pdu_list[pdu_index].segments[0].segment_length);
...@@ -871,7 +875,7 @@ void schedule_response(Sched_Rsp_t *Sched_INFO) { ...@@ -871,7 +875,7 @@ void schedule_response(Sched_Rsp_t *Sched_INFO) {
} else { } else {
LOG_E(PHY, "schedule_response illegal harq_pid %d\n", harq_pid_dl); LOG_E(PHY, "schedule_response illegal harq_pid %d\n", harq_pid_dl);
} }
}
} else { } else {
handle_nfapi_dlsch_pdu(eNB,NFAPI_SFNSF2SFN(DL_req->sfn_sf),NFAPI_SFNSF2SF(DL_req->sfn_sf),proc,dl_config_pdu, dlsch_pdu_rel8->transport_blocks-1, sdu); handle_nfapi_dlsch_pdu(eNB,NFAPI_SFNSF2SFN(DL_req->sfn_sf),NFAPI_SFNSF2SF(DL_req->sfn_sf),proc,dl_config_pdu, dlsch_pdu_rel8->transport_blocks-1, sdu);
} }
......
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