RAR TBS bug fixed

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

openair1/PHY/LTE_TRANSPORT/pbch.c

@@ -58,7 +58,7 @@ extern __m128i zero;
   
 //#define DEBUG_PBCH 1
 //#define DEBUG_PBCH_ENCODING
-#define INTERFERENCE_MITIGATION 1
+//#define INTERFERENCE_MITIGATION 1
 
 #ifdef OPENAIR2
 #include "PHY_INTERFACE/defs.h"

openair1/PHY/LTE_TRANSPORT/rar_tools.c

@@ -138,7 +138,7 @@ int generate_eNB_ulsch_params_from_rar(unsigned char *rar_pdu,
     ulsch->harq_processes[harq_pid]->rvidx = 0;
     ulsch->harq_processes[harq_pid]->mcs         = ((rar[2]&1)<<3)|(rar[3]>>5);
     //ulsch->harq_processes[harq_pid]->TBS         = dlsch_tbs25[ulsch->harq_processes[harq_pid]->mcs][ulsch->harq_processes[harq_pid]->nb_rb-1];
-    ulsch->harq_processes[harq_pid]->TBS         = TBStable[get_I_TBS(ulsch->harq_processes[harq_pid]->mcs)][ulsch->harq_processes[harq_pid]->nb_rb-1];
+    ulsch->harq_processes[harq_pid]->TBS         = TBStable[get_I_TBS_UL(ulsch->harq_processes[harq_pid]->mcs)][ulsch->harq_processes[harq_pid]->nb_rb-1];
     ulsch->harq_processes[harq_pid]->Msc_initial   = 12*ulsch->harq_processes[harq_pid]->nb_rb;
     ulsch->harq_processes[harq_pid]->Nsymb_initial = 9;
     ulsch->harq_processes[harq_pid]->round = 0;
@@ -281,7 +281,7 @@ int generate_ue_ulsch_params_from_rar(PHY_VARS_UE *phy_vars_ue,
     ulsch->harq_processes[harq_pid]->mcs         = ((rar[2]&1)<<3)|(rar[3]>>5);
     ulsch->harq_processes[harq_pid]->TPC         = (rar[3]>>2)&7;
     //ulsch->harq_processes[harq_pid]->TBS         = dlsch_tbs25[ulsch->harq_processes[harq_pid]->mcs][ulsch->harq_processes[harq_pid]->nb_rb-1];
-    ulsch->harq_processes[harq_pid]->TBS         = TBStable[get_I_TBS(ulsch->harq_processes[harq_pid]->mcs)][ulsch->harq_processes[harq_pid]->nb_rb-1];
+    ulsch->harq_processes[harq_pid]->TBS         = TBStable[get_I_TBS_UL(ulsch->harq_processes[harq_pid]->mcs)][ulsch->harq_processes[harq_pid]->nb_rb-1];
     ulsch->harq_processes[harq_pid]->Msc_initial   = 12*ulsch->harq_processes[harq_pid]->nb_rb;
     ulsch->harq_processes[harq_pid]->Nsymb_initial = 9;
     ulsch->harq_processes[harq_pid]->round = 0;