Commit bec6c77b authored by knopp's avatar knopp

removed some debugging from dci_tools.c

git-svn-id: http://svn.eurecom.fr/openair4G/trunk@7772 818b1a75-f10b-46b9-bf7c-635c3b92a50f
parent 9dcdbdfb
...@@ -612,12 +612,12 @@ void generate_RIV_tables() ...@@ -612,12 +612,12 @@ void generate_RIV_tables()
allocdist0_0_odd = 0; allocdist0_0_odd = 0;
for (Lcrbs=1; Lcrbs<=(25-RBstart); Lcrbs++) { for (Lcrbs=1; Lcrbs<=(25-RBstart); Lcrbs++) {
nVRB = Lcrbs-1+RBstart; nVRB = Lcrbs-1+RBstart;
printf("RBstart %d, len %d --> ",RBstart,Lcrbs); //printf("RBstart %d, len %d --> ",RBstart,Lcrbs);
alloc0 |= (1<<nVRB); alloc0 |= (1<<nVRB);
allocdist0_0_even |= (1<<get_prb(25,0,nVRB,0)); allocdist0_0_even |= (1<<get_prb(25,0,nVRB,0));
allocdist0_0_odd |= (1<<get_prb(25,1,nVRB,0)); allocdist0_0_odd |= (1<<get_prb(25,1,nVRB,0));
printf("alloc 0 %x, allocdist0_even %x, allocdist0_odd %x\n",alloc0,allocdist0_0_even,allocdist0_0_odd); //printf("alloc 0 %x, allocdist0_even %x, allocdist0_odd %x\n",alloc0,allocdist0_0_even,allocdist0_0_odd);
RIV=computeRIV(25,RBstart,Lcrbs); RIV=computeRIV(25,RBstart,Lcrbs);
if (RIV>RIV_max25) if (RIV>RIV_max25)
...@@ -743,8 +743,8 @@ void generate_RIV_tables() ...@@ -743,8 +743,8 @@ void generate_RIV_tables()
// Distributed Gap1, even slot // Distributed Gap1, even slot
nVRB_even_dist = get_prb(100,0,nVRB,0); nVRB_even_dist = get_prb(100,0,nVRB,0);
if ((RBstart==0) && (Lcrbs<=8)) // if ((RBstart==0) && (Lcrbs<=8))
printf("nVRB %d => nVRB_even_dist %d\n",nVRB,nVRB_even_dist); // printf("nVRB %d => nVRB_even_dist %d\n",nVRB,nVRB_even_dist);
if (nVRB_even_dist<32) if (nVRB_even_dist<32)
...@@ -755,14 +755,14 @@ void generate_RIV_tables() ...@@ -755,14 +755,14 @@ void generate_RIV_tables()
allocdist2_0_even |= (1<<(nVRB_even_dist-64)); allocdist2_0_even |= (1<<(nVRB_even_dist-64));
else else
allocdist3_0_even |= (1<<(nVRB_even_dist-96)); allocdist3_0_even |= (1<<(nVRB_even_dist-96));
if ((RBstart==0) && (Lcrbs<=8)) /* if ((RBstart==0) && (Lcrbs<=8))
printf("rballoc =>(%08x.%08x.%08x.%08x)\n", printf("rballoc =>(%08x.%08x.%08x.%08x)\n",
allocdist0_0_even, allocdist0_0_even,
allocdist1_0_even, allocdist1_0_even,
allocdist2_0_even, allocdist2_0_even,
allocdist3_0_even allocdist3_0_even
); );
*/
// Distributed Gap1, odd slot // Distributed Gap1, odd slot
nVRB_odd_dist = get_prb(100,1,nVRB,0); nVRB_odd_dist = get_prb(100,1,nVRB,0);
if (nVRB_odd_dist<32) if (nVRB_odd_dist<32)
...@@ -3937,7 +3937,7 @@ int generate_ue_dlsch_params_from_dci(int frame, ...@@ -3937,7 +3937,7 @@ int generate_ue_dlsch_params_from_dci(int frame,
ndi = ((DCI1A_10MHz_FDD_t *)dci_pdu)->ndi; ndi = ((DCI1A_10MHz_FDD_t *)dci_pdu)->ndi;
TPC = ((DCI1A_10MHz_FDD_t *)dci_pdu)->TPC; TPC = ((DCI1A_10MHz_FDD_t *)dci_pdu)->TPC;
harq_pid = ((DCI1A_10MHz_FDD_t *)dci_pdu)->harq_pid; harq_pid = ((DCI1A_10MHz_FDD_t *)dci_pdu)->harq_pid;
//printf("FDD 1A: mcs %d, rballoc %x,ndi %d, rv %d, TPC %d\n",mcs,rballoc,ndi,rv,TPC); //printf("FDD 1A: mcs %d, vrb_type %d, rballoc %x,ndi %d, rv %d, TPC %d\n",mcs,vrb_type,rballoc,ndi,rv,TPC);
} }
if ((rnti==si_rnti) || (rnti==p_rnti) || (rnti==ra_rnti)) { // if ((rnti==si_rnti) || (rnti==p_rnti) || (rnti==ra_rnti)) { //
...@@ -3963,6 +3963,7 @@ int generate_ue_dlsch_params_from_dci(int frame, ...@@ -3963,6 +3963,7 @@ int generate_ue_dlsch_params_from_dci(int frame,
dlsch0_harq->rb_alloc_even[1] = localRIV2alloc_LUT50_1[rballoc]; dlsch0_harq->rb_alloc_even[1] = localRIV2alloc_LUT50_1[rballoc];
dlsch0_harq->rb_alloc_odd[0] = localRIV2alloc_LUT50_0[rballoc]; dlsch0_harq->rb_alloc_odd[0] = localRIV2alloc_LUT50_0[rballoc];
dlsch0_harq->rb_alloc_odd[1] = localRIV2alloc_LUT50_1[rballoc]; dlsch0_harq->rb_alloc_odd[1] = localRIV2alloc_LUT50_1[rballoc];
printf("rballoc: %08x.%08x\n",dlsch0_harq->rb_alloc_even[0],dlsch0_harq->rb_alloc_even[1]);
} else { // DISTRIBUTED } else { // DISTRIBUTED
if ((rballoc&(1<<10)) == 0) { if ((rballoc&(1<<10)) == 0) {
rballoc = rballoc&(~(1<<10)); rballoc = rballoc&(~(1<<10));
......
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