maki/openairinterface5g
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fixes after merge with develop

Browse Source
This commit is contained in:
Raymond Knopp
2018-10-20 15:30:48 +02:00
parent ea11edadb3
commit c8cef9e1fb
10 changed files with 38 additions and 63 deletions
Download Patch File Download Diff File Expand all files Collapse all files
openair2/LAYER2/MAC/eNB_scheduler_RA.c
+5 -4
View File
@@ -197,7 +197,7 @@ add_msg3(module_id_t module_idP, int CC_id, RA_t * ra, frame_t frameP,
ul_config_pdu->ulsch_pdu.ulsch_pdu_rel8.frequency_hopping_bits = 0;
ul_config_pdu->ulsch_pdu.ulsch_pdu_rel8.new_data_indication = 0;
ul_config_pdu->ulsch_pdu.ulsch_pdu_rel8.redundancy_version = rvseq[ra->msg3_round];
ul_config_pdu->ulsch_pdu.ulsch_pdu_rel8.harq_process_number = ((ra->Msg3_frame*10)+ra->Msg3_subframe)&7;//subframe2harqpid(cc, ra->Msg3_frame, ra->Msg3_subframe);
ul_config_pdu->ulsch_pdu.ulsch_pdu_rel8.harq_process_number = subframe2harqpid(cc, ra->Msg3_frame, ra->Msg3_subframe);
ul_config_pdu->ulsch_pdu.ulsch_pdu_rel8.ul_tx_mode = 0;
ul_config_pdu->ulsch_pdu.ulsch_pdu_rel8.current_tx_nb = 0;
ul_config_pdu->ulsch_pdu.ulsch_pdu_rel8.n_srs = 1;
@@ -475,7 +475,7 @@ generate_Msg2(module_id_t module_idP, int CC_idP, frame_t frameP,
// Program UL processing for Msg3, same as regular LTE
get_Msg3alloc(&cc[CC_idP], subframeP, frameP,
&ra->Msg3_frame, &ra->Msg3_subframe);
//add_msg3(module_idP, CC_idP, ra, frameP, subframeP);
add_msg3(module_idP, CC_idP, ra, frameP, subframeP);
fill_rar_br(mac, CC_idP, ra, frameP, subframeP,
cc[CC_idP].RAR_pdu.payload,
ra->rach_resource_type - 1);
@@ -580,7 +580,7 @@ generate_Msg2(module_id_t module_idP, int CC_idP, frame_t frameP,
ra->Msg3_subframe);
fill_rar(module_idP, CC_idP, ra, frameP, cc[CC_idP].RAR_pdu.payload, N_RB_DL, 7);
//add_msg3(module_idP, CC_idP, ra, frameP, subframeP);
add_msg3(module_idP, CC_idP, ra, frameP, subframeP);
ra->state = WAITMSG3;
LOG_D(MAC,"[eNB %d][RAPROC] Frame %d, Subframe %d: state:WAITMSG3\n", module_idP, frameP, subframeP);
@@ -1430,12 +1430,13 @@ schedule_RA(module_id_t module_idP, frame_t frameP, sub_frame_t subframeP)
check_Msg4_retransmission(module_idP, CC_id, frameP,
subframeP, ra);
/*
int absSF = (frameP*10)+subframeP;
int msg3_absSF = (ra->Msg3_frame*10) + ra->Msg3_subframe;
// This is done here to account for delay in TDD programming of Msg3
if (ra->state == WAITMSG3 && ((absSF+4)%10240) == msg3_absSF) add_msg3(module_idP, CC_id, ra, frameP, subframeP);
*/
} // for i=0 .. N_RA_PROC-1
} // CC_id
openair2/LAYER2/MAC/eNB_scheduler_primitives.c
+3 -31
View File
@@ -307,34 +307,6 @@ get_Msg3allocret(COMMON_channels_t * cc,
}
}
uint8_t pusch_sf_to_phich_sfoffset(COMMON_channels_t * cc, sub_frame_t subframe) {
if (cc->tdd_Config == NULL) return(4);
else
switch (cc->tdd_Config->subframeAssignment) {
case 0:
if (subframe==2 || subframe==7) return(4);
else if (subframe==3 || subframe==8) return(7);
else if (subframe==4 || subframe==9) return(6);
break;
case 1:
if (subframe==2 || subframe==7) return(4);
else return(6);
break;
case 2:
case 3:
case 4:
case 5:
return (6);
break;
case 6:
if (subframe==2 || subframe==7) return(4);
else if (subframe==3 || subframe==4) return(6);
else if (subframe==8) return(7);
break;
}
}
uint8_t
subframe2harqpid(COMMON_channels_t * cc, frame_t frame,
sub_frame_t subframe)
@@ -343,9 +315,9 @@ subframe2harqpid(COMMON_channels_t * cc, frame_t frame,
AssertFatal(cc != NULL, "cc is null\n");
// if (cc->tdd_Config == NULL) { // FDD
if (cc->tdd_Config == NULL) { // FDD
ret = (((frame << 1) + subframe) & 7);
/* } else {
} else {
switch (cc->tdd_Config->subframeAssignment) {
case 1:
if ((subframe == 2) ||
@@ -408,7 +380,7 @@ subframe2harqpid(COMMON_channels_t * cc, frame_t frame,
(int) cc->tdd_Config->subframeAssignment);
}
}
*/
return ret;
}
openair2/LAYER2/MAC/mac_proto.h
-1
View File
@@ -1109,7 +1109,6 @@ uint8_t getQm(uint8_t mcs);
uint8_t subframe2harqpid(COMMON_channels_t * cc, frame_t frame,
sub_frame_t subframe);
uint8_t pusch_sf_to_phich_sfoffset(COMMON_channels_t * cc, sub_frame_t subframe);
void get_srs_pos(COMMON_channels_t * cc, uint16_t isrs,
uint16_t * psrsPeriodicity, uint16_t * psrsOffset);