Skip to content

O
OpenXG-RAN
Commit a5cd9928 authored by Florian Kaltenberger's avatar Florian Kaltenberger
Browse files
Options

Merge branch 'feature-247-tm89' of... 

Merge branch 'feature-247-tm89' of https://gitlab.eurecom.fr/oai/openairinterface5g into feature-247-tm89

Conflicts:
	openair1/PHY/LTE_TRANSPORT/dlsch_modulation.c
parents b90e800c 708184cc
Hide whitespace changes
Inline Side-by-side
Showing with 142 additions and 59 deletions
openair1/PHY/LTE_REFSIG/lte_gold.c
View file @ a5cd9928
...@@ -83,52 +83,47 @@ void lte_gold(LTE_DL_FRAME_PARMS *frame_parms,uint32_t lte_gold_table[20][2][14] ...@@ -83,52 +83,47 @@ void lte_gold(LTE_DL_FRAME_PARMS *frame_parms,uint32_t lte_gold_table[20][2][14]
void lte_gold_ue_spec(uint32_t lte_gold_uespec_table[2][20][2][100],uint16_t Nid_cell, uint16_t *n_idDMRS) void lte_gold_ue_spec(uint32_t lte_gold_uespec_table[2][20][2][100],uint16_t Nid_cell, uint16_t *n_idDMRS)
{ {
unsigned char ns,l; unsigned char ns,l;
unsigned int n,x1,x2;//,x1tmp,x2tmp; unsigned int n,x1,x2;
int nscid; int nscid;
int nid; int nid;
for (nscid=0; nscid<2; nscid++) { for (nscid=0; nscid<2; nscid++) {
if (n_idDMRS) if (n_idDMRS){
nid = n_idDMRS[nscid]; nid = n_idDMRS[nscid];
else } else {
nid = Nid_cell; nid = Nid_cell;
}
for (ns=0; ns<20; ns++) { for (ns=0; ns<20; ns++) { //do only slot=14,15, subframe=7
for (l=0; l<2; l++) { for (l=0; l<2; l++) {
x2 = ((((ns>>1)+1)*((nid<<1)+1))<<16) + nscid; //cinit at the start of each subframe
x2 = ((((ns>>1)+1)*((nid<<1)+1))<<16) + nscid; //x2 = frame_parms->Ncp + (Nid_cell<<1) + (1+(Nid_cell<<1))*(1 + (3*l) + (7*(1+ns))); //cinit
//x2 = frame_parms->Ncp + (Nid_cell<<1) + (1+(Nid_cell<<1))*(1 + (3*l) + (7*(1+ns))); //cinit x1 = 1 + (1<<31);
//n = 0 x2 = x2 ^ ((x2 ^ (x2>>1) ^ (x2>>2) ^ (x2>>3))<<31);
// printf("cinit (ns %d, l %d) => %d\n",ns,l,x2);
x1 = 1+ (1<<31);
x2=x2 ^ ((x2 ^ (x2>>1) ^ (x2>>2) ^ (x2>>3))<<31);
// skip first 50 double words (1600 bits) // skip first 50 double words (1600 bits)
//printf("n=0 : x1 %x, x2 %x\n",x1,x2); for (n=1; n<50; n++) {
for (n=1; n<50; n++) {
x1 = (x1>>1) ^ (x1>>4); x1 = (x1>>1) ^ (x1>>4);
x1 = x1 ^ (x1<<31) ^ (x1<<28); x1 = x1 ^ (x1<<31) ^ (x1<<28);
x2 = (x2>>1) ^ (x2>>2) ^ (x2>>3) ^ (x2>>4); x2 = (x2>>1) ^ (x2>>2) ^ (x2>>3) ^ (x2>>4);
x2 = x2 ^ (x2<<31) ^ (x2<<30) ^ (x2<<29) ^ (x2<<28); x2 = x2 ^ (x2<<31) ^ (x2<<30) ^ (x2<<29) ^ (x2<<28);
// printf("x1 : %x, x2 : %x\n",x1,x2); }
}
for (n=0; n<100; n++) { for (n=0; n<100; n++) {
x1 = (x1>>1) ^ (x1>>4); x1 = (x1>>1) ^ (x1>>4);
x1 = x1 ^ (x1<<31) ^ (x1<<28); x1 = x1 ^ (x1<<31) ^ (x1<<28);
x2 = (x2>>1) ^ (x2>>2) ^ (x2>>3) ^ (x2>>4); x2 = (x2>>1) ^ (x2>>2) ^ (x2>>3) ^ (x2>>4);
x2 = x2 ^ (x2<<31) ^ (x2<<30) ^ (x2<<29) ^ (x2<<28); x2 = x2 ^ (x2<<31) ^ (x2<<30) ^ (x2<<29) ^ (x2<<28);
lte_gold_uespec_table[nscid][ns][l][n] = x1^x2; lte_gold_uespec_table[nscid][ns][l][n] = x1^x2;
// printf("n=%d : c %x\n",n,x1^x2);
} }
} }
} }
} }
} }
void lte_gold_ue_spec_port5(uint32_t lte_gold_uespec_port5_table[20][75],uint16_t Nid_cell, uint16_t n_rnti) void lte_gold_ue_spec_port5(uint32_t lte_gold_uespec_port5_table[20][75],uint16_t Nid_cell, uint16_t n_rnti)
...@@ -208,7 +203,7 @@ unsigned int lte_gold_generic(unsigned int *x1, unsigned int *x2, unsigned char ...@@ -208,7 +203,7 @@ unsigned int lte_gold_generic(unsigned int *x1, unsigned int *x2, unsigned char
main() main()
{ {
lte_gold(423,0); lte_gold(0,0);
} }
#endif #endif
......
openair1/PHY/LTE_TRANSPORT/dlsch_modulation.c
View file @ a5cd9928
...@@ -632,13 +632,16 @@ int allocate_REs_in_RB(PHY_VARS_eNB *phy_vars_eNB, ...@@ -632,13 +632,16 @@ int allocate_REs_in_RB(PHY_VARS_eNB *phy_vars_eNB,
int16_t gain_lin_QPSK;//,gain_lin_16QAM1,gain_lin_16QAM2; int16_t gain_lin_QPSK;//,gain_lin_16QAM1,gain_lin_16QAM2;
int16_t re_off=re_offset; int16_t re_off=re_offset;
uint8_t first_re,last_re; uint8_t first_re,last_re;
int32_t tmp_sample1,tmp_sample2; int32_t tmp_sample1,tmp_sample2;
int16_t tmp_amp=amp; int16_t tmp_amp=amp;
int s=1; int s=1;
int mprime2 = mprime,ind,ind_dword,ind_qpsk_symb,p,w; int mprime2 = mprime,ind,ind_dword,ind_qpsk_symb,p,w;
int Wbar_NCP[8][4] = {{1,1,1,1},{1,-1,1,-1},{1,1,1,1},{1,-1,1,-1},{1,1,-1,-1},{-1,-1,1,1},{1,-1,-1,1},{-1,1,1,-1}} ; /* The sequence w_bar for normal cyclic prefix */
int Wbar_NCP_0[8][4] = {{1,1,1,1},{1,-1,1,-1},{1,1,1,1},{1,-1,1,-1},{1,1,-1,-1},{-1,-1,1,1},{1,-1,-1,1},{-1,1,1,-1}} ;
/* The sequence w_bar for extended cyclic prefix */
int Wbar_NCP_1[2][2] = {{1,1},{-1,1}};
gain_lin_QPSK = (int16_t)((amp*ONE_OVER_SQRT2_Q15)>>15); gain_lin_QPSK = (int16_t)((amp*ONE_OVER_SQRT2_Q15)>>15);
int32_t qpsk[4],nqpsk[4],*qpsk_p; int32_t qpsk[4],nqpsk[4],*qpsk_p;
...@@ -716,7 +719,7 @@ int allocate_REs_in_RB(PHY_VARS_eNB *phy_vars_eNB, ...@@ -716,7 +719,7 @@ int allocate_REs_in_RB(PHY_VARS_eNB *phy_vars_eNB,
//check that RE is not from Cell-specific RS //check that RE is not from Cell-specific RS
if (is_not_pilot(pilots,re,frame_parms->nushift,use2ndpilots)==1) { if (is_not_pilot(pilots,re,frame_parms->nushift,use2ndpilots)==1) {
//printf("re %d (jj %d)\n",re,*jj); //printf("re %d (jj %d)\n",re,*jj);
...@@ -1729,48 +1732,133 @@ int allocate_REs_in_RB(PHY_VARS_eNB *phy_vars_eNB, ...@@ -1729,48 +1732,133 @@ int allocate_REs_in_RB(PHY_VARS_eNB *phy_vars_eNB,
} }
} }
else { else {/* The following process is called 4 times (lprime=0,1,2,3), N_RB_DL times per lprime, 3 times per rb (re=1,6,11), 2 times per re (p=7,8) */
for (p=7; p<9; p++) { for (p=7; p<9; p++) {
if (p==first_layer0 || p==first_layer1) { if (p==first_layer0 || p==first_layer1) {
if (frame_parms->Ncp==0) { //normal CP
ind = 3*lprime*frame_parms->N_RB_DL+3*rb+mprime2; /*if (p==7 && re<2 && lprime==0 && mprime2==0 && rb==0) {
ind_dword = ind>>4 ; int cnt=0;
ind_qpsk_symb = ind&0xf ; for (rb=0; rb<100; rb++) {
for (mprime2=0; mprime2<3; mprime2++) {
if (((mprime2+rb)%2)==0) { ind = 3*3*frame_parms->N_RB_DL+3*rb+mprime2;
w = Wbar_NCP[p-7][lprime] ; ind_dword = ind>>4;
} else { ind_qpsk_symb = ind&0xf;
w = Wbar_NCP[p-7][3-lprime] ; printf("cnt=%d, rb=%d, mprime2=%d, dword=%d, qpsk_symb=%d\n", cnt,rb,mprime2,ind_dword,ind_qpsk_symb);
//printf("cnt=%d, rb=%d, mprime2=%d, ind_dword=%d, ind_qpsk=%d, %d %d\n", cnt,rb,mprime2,ind_dword,ind_qpsk_symb,((int16_t *)&qpsk_p[(phy_vars_eNB->lte_gold_uespec_table[nscid][Ns][0][ind_dword]>>(2*ind_qpsk_symb))&3])[0],((int16_t *)&qpsk_p[(phy_vars_eNB->lte_gold_uespec_table[nscid][Ns][0][ind_dword]>>(2*ind_qpsk_symb))&3])[1]);
cnt++;
}
}
}*/
/*if (p==7 && re<2 && lprime==0 && mprime2==0 && rb==0) {
int cnt=0;
qpsk_p = qpsk;
for (ind_dword=0; ind_dword<100; ind_dword++){
for (ind_qpsk_symb=0; ind_qpsk_symb<16; ind_qpsk_symb++) {
printf("cnt=%d, ind_dword=%d, ind_qpsk=%d, %d %d\n", cnt,ind_dword,ind_qpsk_symb,((int16_t *)&qpsk_p[(phy_vars_eNB->lte_gold_uespec_table[nscid][Ns][0][ind_dword]>>(2*ind_qpsk_symb))&3])[0],((int16_t *)&qpsk_p[(phy_vars_eNB->lte_gold_uespec_table[nscid][Ns][0][ind_dword]>>(2*ind_qpsk_symb))&3])[1]);
cnt++;
}
}
}*/
/* Here rb has to be 0 to N_RB_DL otherwise w does not get the right values in the case of p8 */
if (p==8) {
if (lprime==1) {
if (frame_parms->N_RB_DL==25) {
rb = rb-85;
} else if (frame_parms->N_RB_DL==50) {
rb = rb-60;
} else {
rb = rb-10;
}
} else if (lprime==2) {
if (frame_parms->N_RB_DL==25) {
rb = rb-170;
} else if (frame_parms->N_RB_DL==50) {
rb = rb-120;
} else {
rb = rb-20;
}
} else if (lprime==3) {
if (frame_parms->N_RB_DL==25) {
rb = rb-255;
} else if (frame_parms->N_RB_DL==50) {
rb = rb-180;
} else {
rb = rb-30;
}
}
}
if (frame_parms->Ncp==0) { //normal CP
if (((mprime2+rb)%2)==0) {
w = Wbar_NCP_0[p-7][lprime];
} else {
w = Wbar_NCP_0[p-7][3-lprime];
}
} else { //extended CP
if ((mprime2%2)==0) {
w = Wbar_NCP_1[p-7][lprime%2] ;
} else {
w = Wbar_NCP_1[p-7][1-(lprime%2)] ;
}
}
/* Here we have to assign specific values to rb in order to produce the same ind values as the Matlab */
if ((re<=2 && p==7) ||(p==8 && lprime>0)) {
if (lprime==1) {
if (frame_parms->N_RB_DL==25) {
rb = rb+85;
} else if (frame_parms->N_RB_DL==50) {
rb = rb+60;
} else {
rb = rb+10;
}
} else if (lprime==2) {
if (frame_parms->N_RB_DL==25) {
rb = rb+170;
} else if (frame_parms->N_RB_DL==50) {
rb = rb+120;
} else {
rb = rb+20;
}
} else if (lprime==3) {
if (frame_parms->N_RB_DL==25) {
rb = rb+255;
} else if (frame_parms->N_RB_DL==50) {
rb = rb+180;
} else {
rb = rb+30;
}
}
}
if (frame_parms->Ncp==0) { //normal CP
ind = 3*lprime*frame_parms->N_RB_DL+3*rb+mprime2;
} else { //extended CP
ind = 4*lprime*frame_parms->N_RB_DL+4*rb+mprime2;
} }
} else { //extended CP
// this is very likely wrong as the Wbar table is different for extended CP
ind = 4*lprime*dlsch0_harq->nb_rb+4*rb+mprime2 ;
ind_dword = ind>>4 ; ind_dword = ind>>4 ;
ind_qpsk_symb = ind&0xf ; ind_qpsk_symb = ind&0xf ;
int l = lprime%2 ; qpsk_p = (w==1) ? qpsk : nqpsk;
txdataF[p][tti_offset] = qpsk_p[(phy_vars_eNB->lte_gold_uespec_table[nscid][Ns][0][ind_dword]>>(2*ind_qpsk_symb))&3];
if (lprime==2 && p==7) {
printf("re=%d, mprime2=%d, p=%d, w=%d, rb=%d, txdataF = {%d %d}\n\n", re,mprime2,p,w,rb,((int16_t *)&txdataF[p][tti_offset])[0],((int16_t *)&txdataF[p][tti_offset])[1]);
}
}//end if p=first_layer
}// end for p=7
mprime2++ ; // mprime2 is the counter of UE-spec REs within an OFDM symbol
if ((mprime2%2)==0) { }//end for else
w = Wbar_NCP[p-7][l] ;
} else {
w = Wbar_NCP[p-7][1-l] ;
}
}
qpsk_p = (w==1) ? qpsk : nqpsk;
/* pointer to the frequency domain Tx signal */
txdataF[p][tti_offset] = qpsk_p[(phy_vars_eNB->lte_gold_uespec_table[nscid][Ns][0][ind_dword]>>(2*ind_qpsk_symb))&3] ;
}
}
mprime2++ ;
}
} else if (mimo_mode>=TM9_10) { } else if (mimo_mode>=TM9_10) {
printf("allocate_REs_in_RB() [dlsch.c] : ERROR, unknown mimo_mode %d\n",mimo_mode); printf("allocate_REs_in_RB() [dlsch.c] : ERROR, unknown mimo_mode %d\n",mimo_mode);
return(-1); return(-1);
} }
} }// end for is_not_pilot()
} }// end for re=first_re
return(0); return(0);
} }// end for allocate_REs_in_RB
int allocate_REs_in_RB_MCH(int32_t **txdataF, int allocate_REs_in_RB_MCH(int32_t **txdataF,
...@@ -2367,9 +2455,9 @@ int dlsch_modulation(PHY_VARS_eNB* phy_vars_eNB, ...@@ -2367,9 +2455,9 @@ int dlsch_modulation(PHY_VARS_eNB* phy_vars_eNB,
else else
lprime=-1; lprime=-1;
} else { } else {
if (l==13) if (l==11)
lprime=3; lprime=3;
else if (l==12) else if (l==10)
lprime=2; lprime=2;
else if (l==5) else if (l==5)
lprime=1; lprime=1;
......
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