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

git-svn-id: http://svn.eurecom.fr/openair4G/trunk@5645 818b1a75-f10b-46b9-bf7c-635c3b92a50f

Browse Source
This commit is contained in:
Raymond Knopp
2014-08-04 16:18:26 +00:00
parent 90c9df89ea
commit 7b0d904dcb
17 changed files with 135 additions and 117 deletions
Download Patch File Download Diff File Expand all files Collapse all files
openair1/SIMULATION/LTE_PHY/pdcchsim.c
+4 -1
View File
@@ -807,6 +807,9 @@ int main(int argc, char **argv) {
PHY_vars_UE->ulsch_ue[0] = new_ue_ulsch(8,N_RB_DL,0);
PHY_vars_eNB->proc[subframe].frame_tx = 0;
PHY_vars_eNB->proc[subframe].subframe_tx = subframe;
if (input_fd==NULL) {
msg("No input file, so starting TX\n");
}
@@ -947,7 +950,7 @@ int main(int argc, char **argv) {
if (n_frames==1)
printf("generating PHICH\n");
harq_pid = phich_subframe_to_harq_pid(&PHY_vars_eNB->lte_frame_parms, PHY_vars_eNB->proc[(subframe+9)%10].frame_tx, subframe);
harq_pid = phich_subframe_to_harq_pid(&PHY_vars_eNB->lte_frame_parms, PHY_vars_eNB->proc[subframe].frame_tx, subframe);
phich_ACK = taus()&1;
PHY_vars_eNB->ulsch_eNB[0]->harq_processes[harq_pid]->phich_active = 1;
openair1/SIMULATION/LTE_PHY/prachsim.c
-1
View File
@@ -27,7 +27,6 @@ int current_dlsch_cqi; //FIXME!
PHY_VARS_eNB *PHY_vars_eNB;
PHY_VARS_UE *PHY_vars_UE;
DCI2_5MHz_2A_M10PRB_TDD_t DLSCH_alloc_pdu2;
#define DLSCH_RB_ALLOC 0x1fbf // igore DC component,RB13
openair1/SIMULATION/LTE_PHY/pucchsim.c
-1
View File
@@ -28,7 +28,6 @@ int current_dlsch_cqi; //FIXME!
PHY_VARS_eNB *PHY_vars_eNB;
PHY_VARS_UE *PHY_vars_UE;
DCI2_5MHz_2A_M10PRB_TDD_t DLSCH_alloc_pdu2;
#define DLSCH_RB_ALLOC 0x1fbf // igore DC component,RB13
openair1/SIMULATION/LTE_PHY/ulsim.c
+12 -10
View File
@@ -728,16 +728,22 @@ int main(int argc, char **argv) {
PHY_vars_eNB->lte_frame_parms.pusch_config_common.ul_ReferenceSignalsPUSCH.groupAssignmentPUSCH = 0;
PHY_vars_UE->frame=1;
for (sf=0;sf<10;sf++) PHY_vars_eNB->proc[sf].frame_tx=1;
for (sf=0;sf<10;sf++) PHY_vars_eNB->proc[sf].frame_rx=1;
PHY_vars_eNB->proc[0].frame_rx = 0;
PHY_vars_eNB->proc[9].frame_tx = 2;
for (sf=0;sf<10;sf++) {
PHY_vars_eNB->proc[sf].frame_tx=1;
PHY_vars_eNB->proc[sf].subframe_tx=sf;
PHY_vars_eNB->proc[sf].frame_rx=1;
PHY_vars_eNB->proc[sf].subframe_rx=sf;
}
msg("Init UL hopping UE\n");
init_ul_hopping(&PHY_vars_UE->lte_frame_parms);
msg("Init UL hopping eNB\n");
init_ul_hopping(&PHY_vars_eNB->lte_frame_parms);
PHY_vars_eNB->proc[subframe].frame_rx = PHY_vars_UE->frame;
if (ul_subframe2pdcch_alloc_subframe(&PHY_vars_eNB->lte_frame_parms,subframe) > subframe) // allocation was in previous frame
PHY_vars_eNB->proc[ul_subframe2pdcch_alloc_subframe(&PHY_vars_eNB->lte_frame_parms,subframe)].frame_tx = (PHY_vars_UE->frame-1)&1023;
generate_ue_ulsch_params_from_dci((void *)&UL_alloc_pdu,
14,
@@ -805,13 +811,9 @@ int main(int argc, char **argv) {
//randominit(0);
if (subframe==0)
PHY_vars_eNB->proc[9].frame_rx = PHY_vars_UE->frame;
else
PHY_vars_eNB->proc[subframe-1].frame_rx = PHY_vars_UE->frame;
harq_pid = subframe2harq_pid(&PHY_vars_UE->lte_frame_parms,PHY_vars_UE->frame,subframe);
printf("UL frame %d/subframe %d, harq_pid %d\n",PHY_vars_UE->frame,subframe,harq_pid);
harq_pid = subframe2harq_pid(&PHY_vars_UE->lte_frame_parms,PHY_vars_UE->frame,subframe);
// printf("UL frame %d/subframe %d, harq_pid %d\n",PHY_vars_UE->frame,subframe,harq_pid);
if (input_fdUL == NULL) {
input_buffer_length = PHY_vars_UE->ulsch_ue[0]->harq_processes[harq_pid]->TBS/8;
input_buffer = (unsigned char *)malloc(input_buffer_length+4);