Commit 868a4b97 authored by Raymond Knopp's avatar Raymond Knopp

Merge branch 'l1-sidelink' of https://gitlab.eurecom.fr/matzakos/LTE-D2D into l1-sidelink

parents ae8cc5dc c7b09f10
...@@ -167,9 +167,11 @@ int generate_drs_pusch(PHY_VARS_UE *ue, ...@@ -167,9 +167,11 @@ int generate_drs_pusch(PHY_VARS_UE *ue,
l += linc,u=u1,v=v1,cyclic_shift=cyclic_shift1) { l += linc,u=u1,v=v1,cyclic_shift=cyclic_shift1) {
drs_offset = 0; drs_offset = 0;
#ifdef DEBUG_DRS
//#ifdef DEBUG_DRS
LOG_I(PHY,"drs_modulation: l %d Msc_RS = %d, Msc_RS_idx = %d, u=%d,v=%d, cyclic shift %d,ljmo10 %d\n",l,Msc_RS, Msc_RS_idx,u,v,cyclic_shift,ljmod10); LOG_I(PHY,"drs_modulation: l %d Msc_RS = %d, Msc_RS_idx = %d, u=%d,v=%d, cyclic shift %d,ljmo10 %d\n",l,Msc_RS, Msc_RS_idx,u,v,cyclic_shift,ljmod10);
#endif //#endif
re_offset = frame_parms->first_carrier_offset; re_offset = frame_parms->first_carrier_offset;
......
...@@ -583,7 +583,8 @@ void slsch_codingmodulation(PHY_VARS_UE *ue,UE_rxtx_proc_t *proc,int frame_tx,in ...@@ -583,7 +583,8 @@ void slsch_codingmodulation(PHY_VARS_UE *ue,UE_rxtx_proc_t *proc,int frame_tx,in
// scrambling // scrambling
uint32_t cinit=510+(((uint32_t)slsch->group_destination_id)<<14)+(ljmod10<<9); uint32_t cinit=510+(((uint32_t)slsch->group_destination_id)<<14)+(ljmod10<<9);
LOG_I(PHY,"SLSCH cinit %x (%d,%d)\n",cinit,slsch->group_destination_id,ljmod10);
ulsch->harq_processes[0]->nb_rb = slsch->L_CRBs; ulsch->harq_processes[0]->nb_rb = slsch->L_CRBs;
ulsch->harq_processes[0]->first_rb = slsch->RB_start + slsch->prb_Start_data; ulsch->harq_processes[0]->first_rb = slsch->RB_start + slsch->prb_Start_data;
ulsch->harq_processes[0]->mcs = slsch->mcs; ulsch->harq_processes[0]->mcs = slsch->mcs;
...@@ -1465,8 +1466,10 @@ void slsch_decoding(PHY_VARS_UE *ue,UE_rxtx_proc_t *proc,int frame_rx,int subfra ...@@ -1465,8 +1466,10 @@ void slsch_decoding(PHY_VARS_UE *ue,UE_rxtx_proc_t *proc,int frame_rx,int subfra
} }
else if (ue->dlsch_rx_slsch->harq_processes[0]->rvidx == 1 && else if (ue->dlsch_rx_slsch->harq_processes[0]->rvidx == 1 &&
ret==ue->dlsch_rx_slsch->max_turbo_iterations) { ret==ue->dlsch_rx_slsch->max_turbo_iterations) {
LOG_I(PHY,"sLSCH received in error for group_id %d (L_CRBs %d, mcs %d)\n", LOG_I(PHY,"sLSCH received in error for group_id %d (L_CRBs %d, mcs %d) power (%d,%d)\n",
slsch->group_destination_id,slsch->L_CRBs,slsch->mcs); slsch->group_destination_id,slsch->L_CRBs,slsch->mcs,
dB_fixed(ue->pusch_slsch->ulsch_power[0]),
dB_fixed(ue->pusch_slsch->ulsch_power[1]));
ue->slsch_errors++; ue->slsch_errors++;
} }
else LOG_I(PHY,"sLSCH received in error for rvidx %d round %d (L_CRBs %d, mcs %d)\n", else LOG_I(PHY,"sLSCH received in error for rvidx %d round %d (L_CRBs %d, mcs %d)\n",
......
...@@ -3504,7 +3504,7 @@ SLSCH_t *ue_get_slsch(module_id_t module_idP,int CC_id,frame_t frameP,sub_frame_ ...@@ -3504,7 +3504,7 @@ SLSCH_t *ue_get_slsch(module_id_t module_idP,int CC_id,frame_t frameP,sub_frame_
} }
if (ue->sltx_active == 0) return((SLSCH_t*)NULL); if (ue->sltx_active == 0) return((SLSCH_t*)NULL);
slsch->ljmod10 = 0; slsch->ljmod10 = 10; // note this will cause ljmod10 to be reset for first transmission of SLSCH
slsch->rvidx = 1; slsch->rvidx = 1;
slsch->RB_start = RB_start; slsch->RB_start = RB_start;
slsch->L_CRBs = L_CRBs; slsch->L_CRBs = L_CRBs;
......
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