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@6346 818b1a75-f10b-46b9-bf7c-635c3b92a50f

Browse Source
This commit is contained in:
Raymond Knopp
2015-01-11 18:21:56 +00:00
parent 4f31da2f3c
commit d72406ae48
4 changed files with 25 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files
openair1/PHY/LTE_TRANSPORT/dci.c
+14 -12
View File
@@ -1934,12 +1934,13 @@ uint8_t generate_dci_top(uint8_t num_ue_spec_dci,
LOG_I(PHY,"Generating common DCI %d/%d (nCCE %d) of length %d, aggregation %d (%x)\n",i,num_common_dci,dci_alloc[i].nCCE,dci_alloc[i].dci_length,1<<dci_alloc[i].L,*(unsigned int*)dci_alloc[i].dci_pdu);
dump_dci(frame_parms,&dci_alloc[i]);
#endif
e_ptr = generate_dci0(dci_alloc[i].dci_pdu,
e+(72*dci_alloc[i].nCCE),
dci_alloc[i].dci_length,
dci_alloc[i].L,
dci_alloc[i].rnti);
if (dci_alloc[i].nCCE>=0) {
e_ptr = generate_dci0(dci_alloc[i].dci_pdu,
e+(72*dci_alloc[i].nCCE),
dci_alloc[i].dci_length,
dci_alloc[i].L,
dci_alloc[i].rnti);
}
}
}
for (;i<num_ue_spec_dci + num_common_dci;i++) {
@@ -1950,12 +1951,13 @@ uint8_t generate_dci_top(uint8_t num_ue_spec_dci,
LOG_I(PHY," Generating UE (rnti %x) specific DCI %d of length %d, aggregation %d, format %d (%x)\n",dci_alloc[i].rnti,i,dci_alloc[i].dci_length,1<<dci_alloc[i].L,dci_alloc[i].format,dci_alloc[i].dci_pdu);
dump_dci(frame_parms,&dci_alloc[i]);
#endif
e_ptr = generate_dci0(dci_alloc[i].dci_pdu,
e+(72*dci_alloc[i].nCCE),
dci_alloc[i].dci_length,
dci_alloc[i].L,
dci_alloc[i].rnti);
if (dci_alloc[i].nCCE >= 0) {
e_ptr = generate_dci0(dci_alloc[i].dci_pdu,
e+(72*dci_alloc[i].nCCE),
dci_alloc[i].dci_length,
dci_alloc[i].L,
dci_alloc[i].rnti);
}
}
}
}
openair1/PHY/LTE_TRANSPORT/defs.h
+1 -1
View File
@@ -700,7 +700,7 @@ typedef struct {
/// Aggregation level
uint8_t L;
/// Position of first CCE of the dci
unsigned int nCCE;
int nCCE;
/// flag to indicate that this is a RA response
boolean_t ra_flag;
/// rnti
openair1/PHY/LTE_TRANSPORT/dlsch_modulation.c
+8 -6
View File
@@ -157,10 +157,11 @@ int allocate_REs_in_RB(LTE_DL_FRAME_PARMS *frame_parms,
uint8_t mod_order0 = get_Qm(dlsch0_harq->mcs);
uint8_t *x1;
int Nlayers1;
int first_layer1;
uint8_t mod_order1;
uint8_t *x1=NULL;
uint8_t mod_order1=2;
// Fill these in later for TM8-10
// int Nlayers1;
// int first_layer1;
int use2ndpilots = (frame_parms->mode1_flag==1)?1:0;
@@ -196,8 +197,9 @@ int allocate_REs_in_RB(LTE_DL_FRAME_PARMS *frame_parms,
if (dlsch1_harq) {
x1 = dlsch1_harq->e;
Nlayers1 = dlsch1_harq->Nlayers;
first_layer1 = dlsch1_harq->first_layer;
// Fill these in later for TM8-10
// Nlayers1 = dlsch1_harq->Nlayers;
// first_layer1 = dlsch1_harq->first_layer;
mod_order1 = get_Qm(dlsch1_harq->mcs);
}
openair1/PHY/LTE_TRANSPORT/sss.c
+2 -10
View File
@@ -70,20 +70,12 @@ int generate_sss(mod_sym_t **txdataF,
for (i=0;i<62;i++) {
for (aa=0;aa<frame_parms->nb_antennas_tx;aa++) {
//aa=0;
((int16_t*)txdataF[aa])[2*(slot_offset*Nsymb/2*frame_parms->ofdm_symbol_size +
symbol*frame_parms->ofdm_symbol_size + k)] =
(amp * d[i]);
(a * d[i]);
((int16_t*)txdataF[aa])[2*(slot_offset*Nsymb/2*frame_parms->ofdm_symbol_size +
symbol*frame_parms->ofdm_symbol_size + k)+1] = 0;
/*
if (aa==0)
printf("sss (slot %d, symbol %d): txdataF[%d] => (%d,%d)\n",slot_offset,symbol,
slot_offset*Nsymb/2*frame_parms->ofdm_symbol_size +
symbol*frame_parms->ofdm_symbol_size + k,
(amp * d[i]),0);
*/
}
k+=1;
if (k >= frame_parms->ofdm_symbol_size) {