From 753c2f446d84f4ba2a51af27703a65c72c5e84af Mon Sep 17 00:00:00 2001
From: frtabu <francois.taburet@nokia-bell-labs.com>
Date: Sun, 10 Mar 2019 00:04:12 +0100
Subject: [PATCH] apply astyle, fix compilation warnings in raw aeth transport
and kernel modules
---
openair1/PHY/INIT/lte_param_init.c | 66 +-
openair1/PHY/LTE_TRANSPORT/dci.c | 236 +-
openair1/PHY/LTE_TRANSPORT/pss.c | 47 +-
.../SIMULATION/ETH_TRANSPORT/netlink_init.c | 1 -
openair1/SIMULATION/LTE_PHY/dlsim.c | 16 +-
openair1/SIMULATION/LTE_PHY/ulsim.c | 2 -
openair2/LAYER2/PDCP_v10.1.0/pdcp.c | 271 +--
openair2/LAYER2/PDCP_v10.1.0/pdcp_fifo.c | 21 +-
openair2/LAYER2/RLC/rlc.c | 2 -
openair2/NETWORK_DRIVER/MESH/constant.h | 3 +-
openair2/NETWORK_DRIVER/MESH/ioctl.h | 3 +-
openair2/RRC/LTE/rrc_UE.c | 56 +-
openair2/RRC/LTE/rrc_eNB.c | 2 +
openair2/RRC/NAS/nas_config.c | 153 +-
openair2/RRC/NAS/nas_config.h | 19 +-
targets/ARCH/COMMON/common_lib.c | 148 +-
targets/ARCH/COMMON/common_lib.h | 106 +-
targets/ARCH/ETHERNET/USERSPACE/LIB/eth_raw.c | 38 +-
targets/RT/USER/lte-ru.c | 11 +-
targets/RT/USER/lte-softmodem-common.c | 4 +-
targets/RT/USER/lte-softmodem.c | 4 +-
targets/RT/USER/lte-ue.c | 2137 ++++++++---------
targets/RT/USER/lte-uesoftmodem.c | 4 +-
23 files changed, 1612 insertions(+), 1738 deletions(-)
diff --git a/openair1/PHY/INIT/lte_param_init.c b/openair1/PHY/INIT/lte_param_init.c
index dc8ac26d0d6..1be5f6d520d 100644
--- a/openair1/PHY/INIT/lte_param_init.c
+++ b/openair1/PHY/INIT/lte_param_init.c
@@ -37,27 +37,25 @@
extern PHY_VARS_eNB *eNB;
extern PHY_VARS_UE *UE;
extern RU_t *ru;
-extern void phy_init_RU(RU_t*);
+extern void phy_init_RU(RU_t *);
void lte_param_init(PHY_VARS_eNB **eNBp,
- PHY_VARS_UE **UEp,
- RU_t **rup,
- unsigned char N_tx_port_eNB,
+ PHY_VARS_UE **UEp,
+ RU_t **rup,
+ unsigned char N_tx_port_eNB,
unsigned char N_tx_phy,
- unsigned char N_rx_ru,
+ unsigned char N_rx_ru,
unsigned char N_rx_ue,
- unsigned char transmission_mode,
- uint8_t extended_prefix_flag,
- frame_t frame_type,
- uint16_t Nid_cell,
- uint8_t tdd_config,
- uint8_t N_RB_DL,
- uint8_t pa,
- uint8_t threequarter_fs,
+ unsigned char transmission_mode,
+ uint8_t extended_prefix_flag,
+ frame_t frame_type,
+ uint16_t Nid_cell,
+ uint8_t tdd_config,
+ uint8_t N_RB_DL,
+ uint8_t pa,
+ uint8_t threequarter_fs,
uint8_t osf,
- uint32_t perfect_ce)
-{
-
+ uint32_t perfect_ce) {
LTE_DL_FRAME_PARMS *frame_parms;
int i;
PHY_VARS_eNB *eNB;
@@ -71,23 +69,16 @@ void lte_param_init(PHY_VARS_eNB **eNBp,
UE = *UEp;
ru = *rup;
printf("eNB %p, UE %p, ru %p\n",eNB,UE,ru);
-
-
-
- memset((void*)eNB,0,sizeof(PHY_VARS_eNB));
- memset((void*)UE,0,sizeof(PHY_VARS_UE));
- memset((void*)ru,0,sizeof(RU_t));
-
+ memset((void *)eNB,0,sizeof(PHY_VARS_eNB));
+ memset((void *)UE,0,sizeof(PHY_VARS_UE));
+ memset((void *)ru,0,sizeof(RU_t));
ru->eNB_list[0] = eNB;
eNB->RU_list[0] = ru;
ru->num_eNB=1;
-
srand(0);
randominit(0);
set_taus_seed(0);
-
frame_parms = &(eNB->frame_parms);
-
frame_parms->N_RB_DL = N_RB_DL; //50 for 10MHz and 25 for 5 MHz
frame_parms->N_RB_UL = N_RB_DL;
frame_parms->threequarter_fs = threequarter_fs;
@@ -106,13 +97,9 @@ void lte_param_init(PHY_VARS_eNB **eNBp,
// frame_parms->Bsrs = 0;
// frame_parms->kTC = 0;44
// frame_parms->n_RRC = 0;
-
init_frame_parms(frame_parms,osf);
-
//copy_lte_parms_to_phy_framing(frame_parms, &(PHY_config->PHY_framing));
-
// phy_init_top(frame_parms); //allocation
-
UE->is_secondary_ue = 0;
UE->frame_parms = *frame_parms;
UE->frame_parms.nb_antennas_rx=N_rx_ue;
@@ -121,14 +108,10 @@ void lte_param_init(PHY_VARS_eNB **eNBp,
ru->nb_tx = N_tx_phy;
ru->nb_rx = N_rx_ru;
ru->if_south = LOCAL_RF;
-
eNB->configured=1;
-
eNB->transmission_mode[0] = transmission_mode;
UE->transmission_mode[0] = transmission_mode;
-
dump_frame_parms(frame_parms);
-
UE->measurements.n_adj_cells=0;
UE->measurements.adj_cell_id[0] = Nid_cell+1;
UE->measurements.adj_cell_id[1] = Nid_cell+2;
@@ -144,7 +127,6 @@ void lte_param_init(PHY_VARS_eNB **eNBp,
phy_init_RU(ru);
generate_pcfich_reg_mapping(&UE->frame_parms);
generate_phich_reg_mapping(&UE->frame_parms);
-
// DL power control init
//if (transmission_mode == 1) {
UE->pdsch_config_dedicated->p_a = pa;
@@ -166,17 +148,13 @@ void lte_param_init(PHY_VARS_eNB **eNBp,
if (eNB->frame_parms.N_RB_DL == 100) ru->N_TA_offset = 624;
else if (eNB->frame_parms.N_RB_DL == 50) ru->N_TA_offset = 624/2;
else if (eNB->frame_parms.N_RB_DL == 25) ru->N_TA_offset = 624/4;
- }
- else ru->N_TA_offset=0;
+ } else ru->N_TA_offset=0;
- if (IS_SOFTMODEM_BASICSIM)
- /* this is required for the basic simulator in TDD mode
- * TODO: find a proper cleaner solution
- */
+ if (IS_SOFTMODEM_BASICSIM)
+ /* this is required for the basic simulator in TDD mode
+ * TODO: find a proper cleaner solution
+ */
UE->N_TA_offset = 0;
-
printf("Done lte_param_init\n");
-
-
}
diff --git a/openair1/PHY/LTE_TRANSPORT/dci.c b/openair1/PHY/LTE_TRANSPORT/dci.c
index d4e870fb0c8..edd063a0909 100644
--- a/openair1/PHY/LTE_TRANSPORT/dci.c
+++ b/openair1/PHY/LTE_TRANSPORT/dci.c
@@ -64,35 +64,26 @@ void dci_encoding(uint8_t *a,
uint8_t A,
uint16_t E,
uint8_t *e,
- uint16_t rnti)
-{
-
-
+ uint16_t rnti) {
uint8_t D = (A + 16);
uint32_t RCC;
uint8_t d[3*(MAX_DCI_SIZE_BITS + 16) + 96];
uint8_t w[3*3*(MAX_DCI_SIZE_BITS+16)];
-
#ifdef DEBUG_DCI_ENCODING
int32_t i;
#endif
// encode dci
-
#ifdef DEBUG_DCI_ENCODING
printf("Doing DCI encoding for %d bits, e %p, rnti %x, E %d\n",A,e,rnti,E);
#endif
-
memset((void *)d,LTE_NULL,96);
-
ccodelte_encode(A,2,a,d+96,rnti);
-
#ifdef DEBUG_DCI_ENCODING
for (i=0; i<16+A; i++)
printf("%d : (%d,%d,%d)\n",i,*(d+96+(3*i)),*(d+97+(3*i)),*(d+98+(3*i)));
#endif
-
#ifdef DEBUG_DCI_ENCODING
printf("Doing DCI interleaving for %d coded bits, e %p\n",D*3,e);
#endif
@@ -100,27 +91,24 @@ void dci_encoding(uint8_t *a,
//#ifdef DEBUG_DCI_ENCODING
if (E>1000) printf("Doing DCI rate matching for %d channel bits, RCC %d, e %p\n",E,RCC,e);
+
//#endif
lte_rate_matching_cc(RCC,E,w,e);
-
-
-
}
uint8_t *generate_dci0(uint8_t *dci,
uint8_t *e,
uint8_t DCI_LENGTH,
- uint16_t coded_bits,
- uint16_t rnti)
-{
-
+ uint16_t coded_bits,
+ uint16_t rnti) {
uint8_t dci_flip[8];
+#ifdef DEBUG_DCI_ENCODING
- #ifdef DEBUG_DCI_ENCODING
- for (int i=0;i<1+((DCI_LENGTH+16)/8);i++)
+ for (int i=0; i<1+((DCI_LENGTH+16)/8); i++)
printf("i %d : %x\n",i,dci[i]);
- #endif
+
+#endif
if (DCI_LENGTH<=32) {
dci_flip[0] = dci[3];
@@ -129,8 +117,7 @@ uint8_t *generate_dci0(uint8_t *dci,
dci_flip[3] = dci[0];
#ifdef DEBUG_DCI_ENCODING
printf("DCI => %x,%x,%x,%x\n",
- dci_flip[0],dci_flip[1],dci_flip[2],dci_flip[3]);
-
+ dci_flip[0],dci_flip[1],dci_flip[2],dci_flip[3]);
#endif
} else {
dci_flip[0] = dci[7];
@@ -143,13 +130,12 @@ uint8_t *generate_dci0(uint8_t *dci,
dci_flip[7] = dci[0];
#ifdef DEBUG_DCI_ENCODING
printf("DCI => %x,%x,%x,%x,%x,%x,%x,%x\n",
- dci_flip[0],dci_flip[1],dci_flip[2],dci_flip[3],
- dci_flip[4],dci_flip[5],dci_flip[6],dci_flip[7]);
+ dci_flip[0],dci_flip[1],dci_flip[2],dci_flip[3],
+ dci_flip[4],dci_flip[5],dci_flip[6],dci_flip[7]);
#endif
}
dci_encoding(dci_flip,DCI_LENGTH,coded_bits,e,rnti);
-
return(e+coded_bits);
}
@@ -160,9 +146,7 @@ uint8_t *generate_dci0(uint8_t *dci,
-void pdcch_interleaving(LTE_DL_FRAME_PARMS *frame_parms,int32_t **z, int32_t **wbar,uint8_t n_symbols_pdcch,uint8_t mi)
-{
-
+void pdcch_interleaving(LTE_DL_FRAME_PARMS *frame_parms,int32_t **z, int32_t **wbar,uint8_t n_symbols_pdcch,uint8_t mi) {
int32_t *wptr,*wptr2,*zptr;
uint32_t Mquad = get_nquad(n_symbols_pdcch,frame_parms,mi);
uint32_t RCC = (Mquad>>5), ND;
@@ -180,7 +164,6 @@ void pdcch_interleaving(LTE_DL_FRAME_PARMS *frame_parms,int32_t **z, int32_t **w
Kpi = (RCC<<5);
ND = Kpi - Mquad;
-
k=0;
for (col=0; col<32; col++) {
@@ -191,12 +174,9 @@ void pdcch_interleaving(LTE_DL_FRAME_PARMS *frame_parms,int32_t **z, int32_t **w
if (index>=ND) {
for (a=0; a<frame_parms->nb_antenna_ports_eNB; a++) {
//printf("a %d k %d\n",a,k);
-
wptr = &wtemp[a][k<<2];
zptr = &z[a][(index-ND)<<2];
-
//printf("wptr=%p, zptr=%p\n",wptr,zptr);
-
wptr[0] = zptr[0];
wptr[1] = zptr[1];
wptr[2] = zptr[2];
@@ -212,9 +192,7 @@ void pdcch_interleaving(LTE_DL_FRAME_PARMS *frame_parms,int32_t **z, int32_t **w
// permutation
for (i=0; i<Mquad; i++) {
-
for (a=0; a<frame_parms->nb_antenna_ports_eNB; a++) {
-
//wptr = &wtemp[a][i<<2];
//wptr2 = &wbar[a][((i+frame_parms->Nid_cell)%Mquad)<<2];
wptr = &wtemp[a][((i+frame_parms->Nid_cell)%Mquad)<<2];
@@ -230,17 +208,13 @@ void pdcch_interleaving(LTE_DL_FRAME_PARMS *frame_parms,int32_t **z, int32_t **w
void pdcch_scrambling(LTE_DL_FRAME_PARMS *frame_parms,
uint8_t subframe,
uint8_t *e,
- uint32_t length)
-{
+ uint32_t length) {
int i;
uint8_t reset;
uint32_t x1, x2, s=0;
-
//LOG_D(PHY, "%s(fp, subframe:%d, e, length:%d)\n", __FUNCTION__, subframe, length);
-
reset = 1;
// x1 is set in lte_gold_generic
-
x2 = (subframe<<9) + frame_parms->Nid_cell; //this is c_init in 36.211 Sec 6.8.2
for (i=0; i<length; i++) {
@@ -257,16 +231,13 @@ void pdcch_scrambling(LTE_DL_FRAME_PARMS *frame_parms,
}
uint8_t generate_dci_top(uint8_t num_pdcch_symbols,
- uint8_t num_dci,
+ uint8_t num_dci,
DCI_ALLOC_t *dci_alloc,
uint32_t n_rnti,
int16_t amp,
LTE_DL_FRAME_PARMS *frame_parms,
int32_t **txdataF,
- uint32_t subframe)
-{
-
-
+ uint32_t subframe) {
uint8_t *e_ptr;
int8_t L;
uint32_t i, lprime;
@@ -276,46 +247,42 @@ uint8_t generate_dci_top(uint8_t num_pdcch_symbols,
uint8_t e[DCI_BITS_MAX];
uint32_t Msymb=(DCI_BITS_MAX/2);
int32_t yseq0[Msymb],yseq1[Msymb],wbar0[Msymb],wbar1[Msymb];
-
int32_t *y[2];
int32_t *wbar[2];
-
int nushiftmod3 = frame_parms->nushift%3;
-
int Msymb2;
int split_flag=0;
switch (frame_parms->N_RB_DL) {
- case 100:
- Msymb2 = Msymb;
- break;
+ case 100:
+ Msymb2 = Msymb;
+ break;
- case 75:
- Msymb2 = 3*Msymb/4;
- break;
+ case 75:
+ Msymb2 = 3*Msymb/4;
+ break;
- case 50:
- Msymb2 = Msymb>>1;
- break;
+ case 50:
+ Msymb2 = Msymb>>1;
+ break;
- case 25:
- Msymb2 = Msymb>>2;
- break;
+ case 25:
+ Msymb2 = Msymb>>2;
+ break;
- case 15:
- Msymb2 = Msymb*15/100;
- break;
+ case 15:
+ Msymb2 = Msymb*15/100;
+ break;
- case 6:
- Msymb2 = Msymb*6/100;
- break;
+ case 6:
+ Msymb2 = Msymb*6/100;
+ break;
- default:
- Msymb2 = Msymb>>2;
- break;
+ default:
+ Msymb2 = Msymb>>2;
+ break;
}
-
VCD_SIGNAL_DUMPER_DUMP_FUNCTION_BY_NAME(VCD_SIGNAL_DUMPER_FUNCTIONS_GENERATE_PCFICH,1);
generate_pcfich(num_pdcch_symbols,
amp,
@@ -328,41 +295,37 @@ uint8_t generate_dci_top(uint8_t num_pdcch_symbols,
y[0] = &yseq0[0];
y[1] = &yseq1[0];
- if (IS_SOFTMODEM_BASICSIM){
- /* this should be the normal case
- * but it has to be validated for all the various cases
- * so let's just do it for the basic simulator
- */
-// memset(e, 2, DCI_BITS_MAX);
+ if (IS_SOFTMODEM_BASICSIM) {
+ /* this should be the normal case
+ * but it has to be validated for all the various cases
+ * so let's just do it for the basic simulator
+ */
+ // memset(e, 2, DCI_BITS_MAX);
} else {
- // reset all bits to <NIL>, here we set <NIL> elements as 2
- // memset(e, 2, DCI_BITS_MAX);
- // here we interpret NIL as a random QPSK sequence. That makes power estimation easier.
+ // reset all bits to <NIL>, here we set <NIL> elements as 2
+ // memset(e, 2, DCI_BITS_MAX);
+ // here we interpret NIL as a random QPSK sequence. That makes power estimation easier.
for (i=0; i<DCI_BITS_MAX; i++)
e[i]=taus()&1;
-
- /* clear all bits, the above code may generate too much false detections
- * (not sure about this, to be checked somehow)
- */
- //memset(e, 0, DCI_BITS_MAX);
+ /* clear all bits, the above code may generate too much false detections
+ * (not sure about this, to be checked somehow)
+ */
+ //memset(e, 0, DCI_BITS_MAX);
}/* BASIC_SIMULATOR */
e_ptr = e;
-
VCD_SIGNAL_DUMPER_DUMP_FUNCTION_BY_NAME(VCD_SIGNAL_DUMPER_FUNCTIONS_GENERATE_DCI0,1);
// generate DCIs in order of decreasing aggregation level, then common/ue spec
// MAC is assumed to have ordered the UE spec DCI according to the RNTI-based randomization
for (L=8; L>=1; L>>=1) {
for (i=0; i<num_dci; i++) {
-
if (dci_alloc[i].L == (uint8_t)L) {
-
LOG_D(PHY,"Generating DCI %d/%d (nCCE %d) of length %d, aggregation %d (%x), rnti %x\n",
i,num_dci,dci_alloc[i].firstCCE,dci_alloc[i].dci_length,dci_alloc[i].L,
- *(unsigned int*)dci_alloc[i].dci_pdu,
- dci_alloc[i].rnti);
+ *(unsigned int *)dci_alloc[i].dci_pdu,
+ dci_alloc[i].rnti);
if (dci_alloc[i].firstCCE>=0) {
e_ptr = generate_dci0(dci_alloc[i].dci_pdu,
@@ -374,14 +337,13 @@ uint8_t generate_dci_top(uint8_t num_pdcch_symbols,
}
}
}
- VCD_SIGNAL_DUMPER_DUMP_FUNCTION_BY_NAME(VCD_SIGNAL_DUMPER_FUNCTIONS_GENERATE_DCI0,0);
+ VCD_SIGNAL_DUMPER_DUMP_FUNCTION_BY_NAME(VCD_SIGNAL_DUMPER_FUNCTIONS_GENERATE_DCI0,0);
// Scrambling
#ifdef DEBUG_DCI_ENCODING
printf("pdcch scrambling\n");
#endif
//LOG_D(PHY, "num_pdcch_symbols:%d mi:%d nquad:%d\n", num_pdcch_symbols, mi, get_nquad(num_pdcch_symbols, frame_parms, mi));
-
VCD_SIGNAL_DUMPER_DUMP_FUNCTION_BY_NAME(VCD_SIGNAL_DUMPER_FUNCTIONS_PDCCH_SCRAMBLING,1);
pdcch_scrambling(frame_parms,
subframe,
@@ -389,11 +351,8 @@ uint8_t generate_dci_top(uint8_t num_pdcch_symbols,
8*get_nquad(num_pdcch_symbols, frame_parms, mi));
VCD_SIGNAL_DUMPER_DUMP_FUNCTION_BY_NAME(VCD_SIGNAL_DUMPER_FUNCTIONS_PDCCH_SCRAMBLING,0);
//72*get_nCCE(num_pdcch_symbols,frame_parms,mi));
-
-
-
-
VCD_SIGNAL_DUMPER_DUMP_FUNCTION_BY_NAME(VCD_SIGNAL_DUMPER_FUNCTIONS_PDCCH_MODULATION,1);
+
// Now do modulation
if (frame_parms->nb_antenna_ports_eNB==1)
gain_lin_QPSK = (int16_t)((amp*ONE_OVER_SQRT2_Q15)>>15);
@@ -401,7 +360,6 @@ uint8_t generate_dci_top(uint8_t num_pdcch_symbols,
gain_lin_QPSK = amp/2;
e_ptr = e;
-
#ifdef DEBUG_DCI_ENCODING
printf(" PDCCH Modulation, Msymb %d, Msymb2 %d,gain_lin_QPSK %d\n",Msymb,Msymb2,gain_lin_QPSK);
#endif
@@ -409,91 +367,73 @@ uint8_t generate_dci_top(uint8_t num_pdcch_symbols,
//LOG_D(PHY,"%s() Msymb2:%d\n", __FUNCTION__, Msymb2);
if (frame_parms->nb_antenna_ports_eNB==1) { //SISO
-
-
for (i=0; i<Msymb2; i++) {
-
//((int16_t*)(&(y[0][i])))[0] = (*e_ptr == 1) ? -gain_lin_QPSK : gain_lin_QPSK;
//((int16_t*)(&(y[1][i])))[0] = (*e_ptr == 1) ? -gain_lin_QPSK : gain_lin_QPSK;
- ((int16_t*)(&(y[0][i])))[0] = (*e_ptr == 2) ? 0 : (*e_ptr == 1) ? -gain_lin_QPSK : gain_lin_QPSK;
- ((int16_t*)(&(y[1][i])))[0] = (*e_ptr == 2) ? 0 : (*e_ptr == 1) ? -gain_lin_QPSK : gain_lin_QPSK;
+ ((int16_t *)(&(y[0][i])))[0] = (*e_ptr == 2) ? 0 : (*e_ptr == 1) ? -gain_lin_QPSK : gain_lin_QPSK;
+ ((int16_t *)(&(y[1][i])))[0] = (*e_ptr == 2) ? 0 : (*e_ptr == 1) ? -gain_lin_QPSK : gain_lin_QPSK;
e_ptr++;
//((int16_t*)(&(y[0][i])))[1] = (*e_ptr == 1) ? -gain_lin_QPSK : gain_lin_QPSK;
//((int16_t*)(&(y[1][i])))[1] = (*e_ptr == 1) ? -gain_lin_QPSK : gain_lin_QPSK;
- ((int16_t*)(&(y[0][i])))[1] = (*e_ptr == 2) ? 0 : (*e_ptr == 1) ? -gain_lin_QPSK : gain_lin_QPSK;
- ((int16_t*)(&(y[1][i])))[1] = (*e_ptr == 2) ? 0 : (*e_ptr == 1) ? -gain_lin_QPSK : gain_lin_QPSK;
-
+ ((int16_t *)(&(y[0][i])))[1] = (*e_ptr == 2) ? 0 : (*e_ptr == 1) ? -gain_lin_QPSK : gain_lin_QPSK;
+ ((int16_t *)(&(y[1][i])))[1] = (*e_ptr == 2) ? 0 : (*e_ptr == 1) ? -gain_lin_QPSK : gain_lin_QPSK;
e_ptr++;
}
} else { //ALAMOUTI
-
-
for (i=0; i<Msymb2; i+=2) {
-
#ifdef DEBUG_DCI_ENCODING
printf(" PDCCH Modulation (TX diversity): REG %d\n",i>>2);
#endif
// first antenna position n -> x0
- ((int16_t*)&y[0][i])[0] = (*e_ptr==2) ? 0 : (*e_ptr == 1) ? -gain_lin_QPSK : gain_lin_QPSK;
+ ((int16_t *)&y[0][i])[0] = (*e_ptr==2) ? 0 : (*e_ptr == 1) ? -gain_lin_QPSK : gain_lin_QPSK;
e_ptr++;
- ((int16_t*)&y[0][i])[1] = (*e_ptr==2) ? 0 : (*e_ptr == 1) ? -gain_lin_QPSK : gain_lin_QPSK;
+ ((int16_t *)&y[0][i])[1] = (*e_ptr==2) ? 0 : (*e_ptr == 1) ? -gain_lin_QPSK : gain_lin_QPSK;
e_ptr++;
-
// second antenna position n -> -x1*
- ((int16_t*)&y[1][i])[0] = (*e_ptr==2) ? 0 : (*e_ptr == 1) ? gain_lin_QPSK : -gain_lin_QPSK;
+ ((int16_t *)&y[1][i])[0] = (*e_ptr==2) ? 0 : (*e_ptr == 1) ? gain_lin_QPSK : -gain_lin_QPSK;
e_ptr++;
- ((int16_t*)&y[1][i])[1] = (*e_ptr==2) ? 0 : (*e_ptr == 1) ? -gain_lin_QPSK : gain_lin_QPSK;
+ ((int16_t *)&y[1][i])[1] = (*e_ptr==2) ? 0 : (*e_ptr == 1) ? -gain_lin_QPSK : gain_lin_QPSK;
e_ptr++;
-
// fill in the rest of the ALAMOUTI precoding
- ((int16_t*)&y[0][i+1])[0] = -((int16_t*)&y[1][i])[0];
- ((int16_t*)&y[0][i+1])[1] = ((int16_t*)&y[1][i])[1];
- ((int16_t*)&y[1][i+1])[0] = ((int16_t*)&y[0][i])[0];
- ((int16_t*)&y[1][i+1])[1] = -((int16_t*)&y[0][i])[1];
-
+ ((int16_t *)&y[0][i+1])[0] = -((int16_t *)&y[1][i])[0];
+ ((int16_t *)&y[0][i+1])[1] = ((int16_t *)&y[1][i])[1];
+ ((int16_t *)&y[1][i+1])[0] = ((int16_t *)&y[0][i])[0];
+ ((int16_t *)&y[1][i+1])[1] = -((int16_t *)&y[0][i])[1];
}
}
- VCD_SIGNAL_DUMPER_DUMP_FUNCTION_BY_NAME(VCD_SIGNAL_DUMPER_FUNCTIONS_PDCCH_MODULATION,0);
-
+ VCD_SIGNAL_DUMPER_DUMP_FUNCTION_BY_NAME(VCD_SIGNAL_DUMPER_FUNCTIONS_PDCCH_MODULATION,0);
#ifdef DEBUG_DCI_ENCODING
printf(" PDCCH Interleaving\n");
#endif
-
VCD_SIGNAL_DUMPER_DUMP_FUNCTION_BY_NAME(VCD_SIGNAL_DUMPER_FUNCTIONS_PDCCH_INTERLEAVING,1);
// printf("y %p (%p,%p), wbar %p (%p,%p)\n",y,y[0],y[1],wbar,wbar[0],wbar[1]);
// This is the interleaving procedure defined in 36-211, first part of Section 6.8.5
pdcch_interleaving(frame_parms,&y[0],&wbar[0],num_pdcch_symbols,mi);
VCD_SIGNAL_DUMPER_DUMP_FUNCTION_BY_NAME(VCD_SIGNAL_DUMPER_FUNCTIONS_PDCCH_INTERLEAVING,0);
-
VCD_SIGNAL_DUMPER_DUMP_FUNCTION_BY_NAME(VCD_SIGNAL_DUMPER_FUNCTIONS_PDCCH_TX,1);
mprime=0;
nsymb = (frame_parms->Ncp==0) ? 14:12;
re_offset = frame_parms->first_carrier_offset;
-
// This is the REG allocation algorithm from 36-211, second part of Section 6.8.5
// printf("DCI (SF %d) : txdataF %p (0 %p)\n",subframe,&txdataF[0][512*14*subframe],&txdataF[0][0]);
#ifdef DEBUG_DCI_ENCODING
printf("kprime loop - N_RB_DL:%d lprime:num_pdcch_symbols:%d Ncp:%d pcfich:%02x,%02x,%02x,%02x ofdm_symbol_size:%d first_carrier_offset:%d nb_antenna_ports_eNB:%d\n",
- frame_parms->N_RB_DL, num_pdcch_symbols,frame_parms->Ncp,
- frame_parms->pcfich_reg[0],
- frame_parms->pcfich_reg[1],
- frame_parms->pcfich_reg[2],
- frame_parms->pcfich_reg[3],
- frame_parms->ofdm_symbol_size,
- frame_parms->first_carrier_offset,
- frame_parms->nb_antenna_ports_eNB
- );
+ frame_parms->N_RB_DL, num_pdcch_symbols,frame_parms->Ncp,
+ frame_parms->pcfich_reg[0],
+ frame_parms->pcfich_reg[1],
+ frame_parms->pcfich_reg[2],
+ frame_parms->pcfich_reg[3],
+ frame_parms->ofdm_symbol_size,
+ frame_parms->first_carrier_offset,
+ frame_parms->nb_antenna_ports_eNB
+ );
#endif
+
for (kprime=0; kprime<frame_parms->N_RB_DL*12; kprime++) {
for (lprime=0; lprime<num_pdcch_symbols; lprime++) {
-
symbol_offset = (uint32_t)frame_parms->ofdm_symbol_size*(lprime+(subframe*nsymb));
-
-
-
tti_offset = symbol_offset + re_offset;
-
(re_offset==(frame_parms->ofdm_symbol_size-2)) ? (split_flag=1) : (split_flag=0);
// printf("kprime %d, lprime %d => REG %d (symbol %d)\n",kprime,lprime,(lprime==0)?(kprime/6) : (kprime>>2),symbol_offset);
@@ -504,16 +444,13 @@ uint8_t generate_dci_top(uint8_t num_pdcch_symbols,
#endif
} else {
// Copy REG to TX buffer
-
if ((lprime == 0)||
((lprime==1)&&(frame_parms->nb_antenna_ports_eNB == 4))) {
// first symbol, or second symbol+4 TX antennas skip pilots
-
kprime_mod12 = kprime%12;
if ((kprime_mod12 == 0) || (kprime_mod12 == 6)) {
// kprime represents REG
-
for (i=0; i<6; i++) {
if ((i!=(nushiftmod3))&&(i!=(nushiftmod3+3))) {
txdataF[0][tti_offset+i] = wbar[0][mprime];
@@ -522,9 +459,8 @@ uint8_t generate_dci_top(uint8_t num_pdcch_symbols,
txdataF[1][tti_offset+i] = wbar[1][mprime];
#ifdef DEBUG_DCI_ENCODING
- printf(" PDCCH mapping mprime %d => %d (symbol %d re %d) -> (%d,%d)\n",mprime,tti_offset,symbol_offset,re_offset+i,*(short*)&wbar[0][mprime],*(1+(short*)&wbar[0][mprime]));
+ printf(" PDCCH mapping mprime %d => %d (symbol %d re %d) -> (%d,%d)\n",mprime,tti_offset,symbol_offset,re_offset+i,*(short *)&wbar[0][mprime],*(1+(short *)&wbar[0][mprime]));
#endif
-
mprime++;
}
}
@@ -542,7 +478,7 @@ uint8_t generate_dci_top(uint8_t num_pdcch_symbols,
txdataF[1][tti_offset+i] = wbar[1][mprime];
#ifdef DEBUG_DCI_ENCODING
- LOG_I(PHY," PDCCH mapping mprime %d => %d (symbol %d re %d) -> (%d,%d)\n",mprime,tti_offset,symbol_offset,re_offset+i,*(short*)&wbar[0][mprime],*(1+(short*)&wbar[0][mprime]));
+ LOG_I(PHY," PDCCH mapping mprime %d => %d (symbol %d re %d) -> (%d,%d)\n",mprime,tti_offset,symbol_offset,re_offset+i,*(short *)&wbar[0][mprime],*(1+(short *)&wbar[0][mprime]));
#endif
mprime++;
}
@@ -553,7 +489,7 @@ uint8_t generate_dci_top(uint8_t num_pdcch_symbols,
txdataF[1][tti_offset+0] = wbar[1][mprime];
#ifdef DEBUG_DCI_ENCODING
- printf(" PDCCH mapping mprime %d => %d (symbol %d re %d) -> (%d,%d)\n",mprime,tti_offset,symbol_offset,re_offset,*(short*)&wbar[0][mprime],*(1+(short*)&wbar[0][mprime]));
+ printf(" PDCCH mapping mprime %d => %d (symbol %d re %d) -> (%d,%d)\n",mprime,tti_offset,symbol_offset,re_offset,*(short *)&wbar[0][mprime],*(1+(short *)&wbar[0][mprime]));
#endif
mprime++;
txdataF[0][tti_offset+1] = wbar[0][mprime];
@@ -562,7 +498,7 @@ uint8_t generate_dci_top(uint8_t num_pdcch_symbols,
txdataF[1][tti_offset+1] = wbar[1][mprime];
#ifdef DEBUG_DCI_ENCODING
- printf("PDCCH mapping mprime %d => %d (symbol %d re %d) -> (%d,%d)\n",mprime,tti_offset,symbol_offset,re_offset+1,*(short*)&wbar[0][mprime],*(1+(short*)&wbar[0][mprime]));
+ printf("PDCCH mapping mprime %d => %d (symbol %d re %d) -> (%d,%d)\n",mprime,tti_offset,symbol_offset,re_offset+1,*(short *)&wbar[0][mprime],*(1+(short *)&wbar[0][mprime]));
#endif
mprime++;
txdataF[0][tti_offset-frame_parms->ofdm_symbol_size+3] = wbar[0][mprime];
@@ -571,8 +507,8 @@ uint8_t generate_dci_top(uint8_t num_pdcch_symbols,
txdataF[1][tti_offset-frame_parms->ofdm_symbol_size+3] = wbar[1][mprime];
#ifdef DEBUG_DCI_ENCODING
- printf(" PDCCH mapping mprime %d => %d (symbol %d re %d) -> (%d,%d)\n",mprime,tti_offset,symbol_offset,re_offset-frame_parms->ofdm_symbol_size+3,*(short*)&wbar[0][mprime],
- *(1+(short*)&wbar[0][mprime]));
+ printf(" PDCCH mapping mprime %d => %d (symbol %d re %d) -> (%d,%d)\n",mprime,tti_offset,symbol_offset,re_offset-frame_parms->ofdm_symbol_size+3,*(short *)&wbar[0][mprime],
+ *(1+(short *)&wbar[0][mprime]));
#endif
mprime++;
txdataF[0][tti_offset-frame_parms->ofdm_symbol_size+4] = wbar[0][mprime];
@@ -581,11 +517,10 @@ uint8_t generate_dci_top(uint8_t num_pdcch_symbols,
txdataF[1][tti_offset-frame_parms->ofdm_symbol_size+4] = wbar[1][mprime];
#ifdef DEBUG_DCI_ENCODING
- printf(" PDCCH mapping mprime %d => %d (symbol %d re %d) -> (%d,%d)\n",mprime,tti_offset,symbol_offset,re_offset-frame_parms->ofdm_symbol_size+4,*(short*)&wbar[0][mprime],
- *(1+(short*)&wbar[0][mprime]));
+ printf(" PDCCH mapping mprime %d => %d (symbol %d re %d) -> (%d,%d)\n",mprime,tti_offset,symbol_offset,re_offset-frame_parms->ofdm_symbol_size+4,*(short *)&wbar[0][mprime],
+ *(1+(short *)&wbar[0][mprime]));
#endif
mprime++;
-
}
}
}
@@ -593,7 +528,6 @@ uint8_t generate_dci_top(uint8_t num_pdcch_symbols,
if (mprime>=Msymb2)
return(num_pdcch_symbols);
} // check_phich_reg
-
} //lprime loop
re_offset++;
@@ -601,8 +535,8 @@ uint8_t generate_dci_top(uint8_t num_pdcch_symbols,
if (re_offset == (frame_parms->ofdm_symbol_size))
re_offset = 1;
} // kprime loop
- VCD_SIGNAL_DUMPER_DUMP_FUNCTION_BY_NAME(VCD_SIGNAL_DUMPER_FUNCTIONS_PDCCH_TX,0);
+ VCD_SIGNAL_DUMPER_DUMP_FUNCTION_BY_NAME(VCD_SIGNAL_DUMPER_FUNCTIONS_PDCCH_TX,0);
return(num_pdcch_symbols);
}
diff --git a/openair1/PHY/LTE_TRANSPORT/pss.c b/openair1/PHY/LTE_TRANSPORT/pss.c
index e83e2c4d9dc..9ebd8414309 100644
--- a/openair1/PHY/LTE_TRANSPORT/pss.c
+++ b/openair1/PHY/LTE_TRANSPORT/pss.c
@@ -44,66 +44,59 @@ int generate_pss(int32_t **txdataF,
short amp,
LTE_DL_FRAME_PARMS *frame_parms,
unsigned short symbol,
- unsigned short slot_offset)
-{
-
+ unsigned short slot_offset) {
unsigned int Nsymb;
unsigned short k,m,aa,a;
uint8_t Nid2;
short *primary_sync;
-
-
Nid2 = frame_parms->Nid_cell % 3;
switch (Nid2) {
- case 0:
- primary_sync = primary_synch0;
- break;
+ case 0:
+ primary_sync = primary_synch0;
+ break;
- case 1:
- primary_sync = primary_synch1;
- break;
+ case 1:
+ primary_sync = primary_synch1;
+ break;
- case 2:
- primary_sync = primary_synch2;
- break;
+ case 2:
+ primary_sync = primary_synch2;
+ break;
- default:
- LOG_E(PHY,"[PSS] eNb_id has to be 0,1,2\n");
- return(-1);
+ default:
+ LOG_E(PHY,"[PSS] eNb_id has to be 0,1,2\n");
+ return(-1);
}
a = (frame_parms->nb_antenna_ports_eNB == 1) ? amp: (amp*ONE_OVER_SQRT2_Q15)>>15;
//printf("[PSS] amp=%d, a=%d\n",amp,a);
if (IS_SOFTMODEM_BASICSIM)
- /* a hack to remove at some point (the UE doesn't synch with 100 RBs) */
+ /* a hack to remove at some point (the UE doesn't synch with 100 RBs) */
a = (frame_parms->nb_antenna_ports_eNB == 1) ? 4*amp: (amp*ONE_OVER_SQRT2_Q15)>>15;
Nsymb = (frame_parms->Ncp==NORMAL)?14:12;
for (aa=0; aa<frame_parms->nb_antenna_ports_eNB; aa++) {
// aa = 0;
-
// The PSS occupies the inner 6 RBs, which start at
k = frame_parms->ofdm_symbol_size-3*12+5;
//printf("[PSS] k = %d\n",k);
for (m=5; m<67; m++) {
- ((short*)txdataF[aa])[2*(slot_offset*Nsymb/2*frame_parms->ofdm_symbol_size +
- symbol*frame_parms->ofdm_symbol_size + k)] =
- (a * primary_sync[2*m]) >> 15;
- ((short*)txdataF[aa])[2*(slot_offset*Nsymb/2*frame_parms->ofdm_symbol_size +
- symbol*frame_parms->ofdm_symbol_size + k) + 1] =
- (a * primary_sync[2*m+1]) >> 15;
-
+ ((short *)txdataF[aa])[2*(slot_offset*Nsymb/2*frame_parms->ofdm_symbol_size +
+ symbol*frame_parms->ofdm_symbol_size + k)] =
+ (a * primary_sync[2*m]) >> 15;
+ ((short *)txdataF[aa])[2*(slot_offset*Nsymb/2*frame_parms->ofdm_symbol_size +
+ symbol*frame_parms->ofdm_symbol_size + k) + 1] =
+ (a * primary_sync[2*m+1]) >> 15;
k+=1;
if (k >= frame_parms->ofdm_symbol_size) {
k++; //skip DC
k-=frame_parms->ofdm_symbol_size;
}
-
}
}
diff --git a/openair1/SIMULATION/ETH_TRANSPORT/netlink_init.c b/openair1/SIMULATION/ETH_TRANSPORT/netlink_init.c
index cdda4dfe786..5a5f9852b10 100644
--- a/openair1/SIMULATION/ETH_TRANSPORT/netlink_init.c
+++ b/openair1/SIMULATION/ETH_TRANSPORT/netlink_init.c
@@ -63,7 +63,6 @@ struct msghdr nas_msg_rx;
#define GRAAL_NETLINK_ID 31
-
static int tun_alloc(char *dev) {
struct ifreq ifr;
int fd, err;
diff --git a/openair1/SIMULATION/LTE_PHY/dlsim.c b/openair1/SIMULATION/LTE_PHY/dlsim.c
index 4af273b8b00..c7916b8dfc2 100644
--- a/openair1/SIMULATION/LTE_PHY/dlsim.c
+++ b/openair1/SIMULATION/LTE_PHY/dlsim.c
@@ -782,13 +782,15 @@ int main(int argc, char **argv) {
break;
case 'u':
- dual_stream_UE=1;
- if (UE != NULL)
- UE->use_ia_receiver = 1;
+ dual_stream_UE=1;
+
+ if (UE != NULL)
+ UE->use_ia_receiver = 1;
else {
printf("UE is NULL\n");
- exit(-1);
- }
+ exit(-1);
+ }
+
if ((n_tx_port!=2) || (transmission_mode!=5)) {
printf("IA receiver only supported for TM5!");
exit(-1);
@@ -951,8 +953,8 @@ int main(int argc, char **argv) {
fl_set_object_label(form_ue->button_0, "IA Receiver ON");
fl_set_object_color(form_ue->button_0, FL_GREEN, FL_GREEN);
} else {
- printf("UE is NULL\n");
- exit(-1);
+ printf("UE is NULL\n");
+ exit(-1);
}
}
}
diff --git a/openair1/SIMULATION/LTE_PHY/ulsim.c b/openair1/SIMULATION/LTE_PHY/ulsim.c
index 221cc708f3a..3e9623dc2fa 100644
--- a/openair1/SIMULATION/LTE_PHY/ulsim.c
+++ b/openair1/SIMULATION/LTE_PHY/ulsim.c
@@ -1211,9 +1211,7 @@ int main(int argc, char **argv) {
}
dump_ulsch(eNB,eNB->proc.frame_rx,subframe,0,round);
-
round=5;
-
}
if (n_frames==1) printf("round %d errors %u/%u\n",round,errs[round],trials);
diff --git a/openair2/LAYER2/PDCP_v10.1.0/pdcp.c b/openair2/LAYER2/PDCP_v10.1.0/pdcp.c
index 3801df9a392..99736939c49 100644
--- a/openair2/LAYER2/PDCP_v10.1.0/pdcp.c
+++ b/openair2/LAYER2/PDCP_v10.1.0/pdcp.c
@@ -440,7 +440,6 @@ pdcp_data_ind(
uint32_t rx_hfn_for_count;
int pdcp_sn_for_count;
int security_ok;
-
VCD_SIGNAL_DUMPER_DUMP_FUNCTION_BY_NAME(VCD_SIGNAL_DUMPER_FUNCTIONS_PDCP_DATA_IND,VCD_FUNCTION_IN);
LOG_DUMPMSG(PDCP,DEBUG_PDCP,(char *)sdu_buffer_pP->data,sdu_buffer_sizeP,
"[MSG] PDCP UL %s PDU on rb_id %d\n", (srb_flagP)? "CONTROL" : "DATA", rb_idP);
@@ -567,6 +566,7 @@ pdcp_data_ind(
}
#if 0
+
/* Removed by Cedric */
if (pdcp_is_rx_seq_number_valid(sequence_number, pdcp_p, srb_flagP) == TRUE) {
LOG_T(PDCP, "Incoming PDU has a sequence number (%d) in accordance with RX window\n", sequence_number);
@@ -588,6 +588,7 @@ pdcp_data_ind(
free_mem_block(sdu_buffer_pP, __func__);
return FALSE;
}
+
#endif
// SRB1/2: control-plane data
@@ -678,158 +679,156 @@ pdcp_data_ind(
payload_offset=pdcp_header_len;// PDCP_USER_PLANE_DATA_PDU_LONG_SN_HEADER_SIZE;
switch (pdcp_p->rlc_mode) {
- case RLC_MODE_AM: {
- /* process as described in 36.323 5.1.2.1.2 */
- int reordering_window;
-
- if (pdcp_p->seq_num_size == 7)
- reordering_window = REORDERING_WINDOW_SN_7BIT;
- else
- reordering_window = REORDERING_WINDOW_SN_12BIT;
-
- if (sequence_number - pdcp_p->last_submitted_pdcp_rx_sn > reordering_window ||
- (pdcp_p->last_submitted_pdcp_rx_sn - sequence_number >= 0 &&
- pdcp_p->last_submitted_pdcp_rx_sn - sequence_number < reordering_window)) {
- /* TODO: specs say to decipher and do header decompression */
- LOG_W(PDCP,
- PROTOCOL_PDCP_CTXT_FMT"discard PDU, out of\n",
- PROTOCOL_PDCP_CTXT_ARGS(ctxt_pP, pdcp_p));
- LOG_W(PDCP, "Ignoring PDU...\n");
- free_mem_block(sdu_buffer_pP, __func__);
- /* TODO: indicate integrity verification failure to upper layer */
- return FALSE;
-
- } else if (pdcp_p->next_pdcp_rx_sn - sequence_number > reordering_window) {
- pdcp_p->rx_hfn++;
- rx_hfn_for_count = pdcp_p->rx_hfn;
- pdcp_sn_for_count = sequence_number;
- pdcp_p->next_pdcp_rx_sn = sequence_number + 1;
+ case RLC_MODE_AM: {
+ /* process as described in 36.323 5.1.2.1.2 */
+ int reordering_window;
- } else if (sequence_number - pdcp_p->next_pdcp_rx_sn >= reordering_window) {
- rx_hfn_for_count = pdcp_p->rx_hfn - 1;
- pdcp_sn_for_count = sequence_number;
-
- } else if (sequence_number >= pdcp_p->next_pdcp_rx_sn) {
- rx_hfn_for_count = pdcp_p->rx_hfn;
- pdcp_sn_for_count = sequence_number;
- pdcp_p->next_pdcp_rx_sn = sequence_number + 1;
- if (pdcp_p->next_pdcp_rx_sn > pdcp_p->maximum_pdcp_rx_sn) {
- pdcp_p->next_pdcp_rx_sn = 0;
+ if (pdcp_p->seq_num_size == 7)
+ reordering_window = REORDERING_WINDOW_SN_7BIT;
+ else
+ reordering_window = REORDERING_WINDOW_SN_12BIT;
+
+ if (sequence_number - pdcp_p->last_submitted_pdcp_rx_sn > reordering_window ||
+ (pdcp_p->last_submitted_pdcp_rx_sn - sequence_number >= 0 &&
+ pdcp_p->last_submitted_pdcp_rx_sn - sequence_number < reordering_window)) {
+ /* TODO: specs say to decipher and do header decompression */
+ LOG_W(PDCP,
+ PROTOCOL_PDCP_CTXT_FMT"discard PDU, out of\n",
+ PROTOCOL_PDCP_CTXT_ARGS(ctxt_pP, pdcp_p));
+ LOG_W(PDCP, "Ignoring PDU...\n");
+ free_mem_block(sdu_buffer_pP, __func__);
+ /* TODO: indicate integrity verification failure to upper layer */
+ return FALSE;
+ } else if (pdcp_p->next_pdcp_rx_sn - sequence_number > reordering_window) {
pdcp_p->rx_hfn++;
+ rx_hfn_for_count = pdcp_p->rx_hfn;
+ pdcp_sn_for_count = sequence_number;
+ pdcp_p->next_pdcp_rx_sn = sequence_number + 1;
+ } else if (sequence_number - pdcp_p->next_pdcp_rx_sn >= reordering_window) {
+ rx_hfn_for_count = pdcp_p->rx_hfn - 1;
+ pdcp_sn_for_count = sequence_number;
+ } else if (sequence_number >= pdcp_p->next_pdcp_rx_sn) {
+ rx_hfn_for_count = pdcp_p->rx_hfn;
+ pdcp_sn_for_count = sequence_number;
+ pdcp_p->next_pdcp_rx_sn = sequence_number + 1;
+
+ if (pdcp_p->next_pdcp_rx_sn > pdcp_p->maximum_pdcp_rx_sn) {
+ pdcp_p->next_pdcp_rx_sn = 0;
+ pdcp_p->rx_hfn++;
+ }
+ } else { /* sequence_number < pdcp_p->next_pdcp_rx_sn */
+ rx_hfn_for_count = pdcp_p->rx_hfn;
+ pdcp_sn_for_count = sequence_number;
}
- } else { /* sequence_number < pdcp_p->next_pdcp_rx_sn */
- rx_hfn_for_count = pdcp_p->rx_hfn;
- pdcp_sn_for_count = sequence_number;
- }
-
- if (pdcp_p->security_activated == 1) {
- if (ctxt_pP->enb_flag == ENB_FLAG_NO) {
- start_meas(&eNB_pdcp_stats[ctxt_pP->module_id].validate_security);
- } else {
- start_meas(&UE_pdcp_stats[ctxt_pP->module_id].validate_security);
- }
+ if (pdcp_p->security_activated == 1) {
+ if (ctxt_pP->enb_flag == ENB_FLAG_NO) {
+ start_meas(&eNB_pdcp_stats[ctxt_pP->module_id].validate_security);
+ } else {
+ start_meas(&UE_pdcp_stats[ctxt_pP->module_id].validate_security);
+ }
- security_ok = pdcp_validate_security(ctxt_pP,
- pdcp_p,
- srb_flagP,
- rb_idP,
- pdcp_header_len,
- rx_hfn_for_count,
- pdcp_sn_for_count,
- sdu_buffer_pP->data,
- sdu_buffer_sizeP - pdcp_tailer_len) == 0;
+ security_ok = pdcp_validate_security(ctxt_pP,
+ pdcp_p,
+ srb_flagP,
+ rb_idP,
+ pdcp_header_len,
+ rx_hfn_for_count,
+ pdcp_sn_for_count,
+ sdu_buffer_pP->data,
+ sdu_buffer_sizeP - pdcp_tailer_len) == 0;
- if (ctxt_pP->enb_flag == ENB_FLAG_NO) {
- stop_meas(&eNB_pdcp_stats[ctxt_pP->module_id].validate_security);
+ if (ctxt_pP->enb_flag == ENB_FLAG_NO) {
+ stop_meas(&eNB_pdcp_stats[ctxt_pP->module_id].validate_security);
+ } else {
+ stop_meas(&UE_pdcp_stats[ctxt_pP->module_id].validate_security);
+ }
} else {
- stop_meas(&UE_pdcp_stats[ctxt_pP->module_id].validate_security);
+ security_ok = 1;
}
- } else {
- security_ok = 1;
- }
- if (security_ok == 0) {
- LOG_W(PDCP,
- PROTOCOL_PDCP_CTXT_FMT"security not validated for incoming PDPC DRB RLC/AM PDU\n",
- PROTOCOL_PDCP_CTXT_ARGS(ctxt_pP, pdcp_p));
- LOG_W(PDCP, "Ignoring PDU...\n");
- free_mem_block(sdu_buffer_pP, __func__);
- /* TODO: indicate integrity verification failure to upper layer */
- return FALSE;
- }
+ if (security_ok == 0) {
+ LOG_W(PDCP,
+ PROTOCOL_PDCP_CTXT_FMT"security not validated for incoming PDPC DRB RLC/AM PDU\n",
+ PROTOCOL_PDCP_CTXT_ARGS(ctxt_pP, pdcp_p));
+ LOG_W(PDCP, "Ignoring PDU...\n");
+ free_mem_block(sdu_buffer_pP, __func__);
+ /* TODO: indicate integrity verification failure to upper layer */
+ return FALSE;
+ }
- /* TODO: specs say we have to store this PDU in a list and then deliver
- * stored packets to upper layers according to a well defined
- * procedure. The code below that deals with delivery is today
- * too complex to do this properly, so we only send the current
- * received packet. This is not correct and has to be fixed
- * some day.
- * In the meantime, let's pretend the last submitted PDCP SDU
- * is the current one.
- * TODO: we also have to deal with re-establishment PDU (control PDUs)
- * that contain no SDU.
- */
+ /* TODO: specs say we have to store this PDU in a list and then deliver
+ * stored packets to upper layers according to a well defined
+ * procedure. The code below that deals with delivery is today
+ * too complex to do this properly, so we only send the current
+ * received packet. This is not correct and has to be fixed
+ * some day.
+ * In the meantime, let's pretend the last submitted PDCP SDU
+ * is the current one.
+ * TODO: we also have to deal with re-establishment PDU (control PDUs)
+ * that contain no SDU.
+ */
+ pdcp_p->last_submitted_pdcp_rx_sn = sequence_number;
+ break;
+ } /* case RLC_MODE_AM */
- pdcp_p->last_submitted_pdcp_rx_sn = sequence_number;
+ case RLC_MODE_UM:
- break;
- } /* case RLC_MODE_AM */
+ /* process as described in 36.323 5.1.2.1.3 */
+ if (sequence_number < pdcp_p->next_pdcp_rx_sn) {
+ pdcp_p->rx_hfn++;
+ }
- case RLC_MODE_UM:
- /* process as described in 36.323 5.1.2.1.3 */
- if (sequence_number < pdcp_p->next_pdcp_rx_sn) {
- pdcp_p->rx_hfn++;
- }
- rx_hfn_for_count = pdcp_p->rx_hfn;
- pdcp_sn_for_count = sequence_number;
- pdcp_p->next_pdcp_rx_sn = sequence_number + 1;
- if (pdcp_p->next_pdcp_rx_sn > pdcp_p->maximum_pdcp_rx_sn) {
- pdcp_p->next_pdcp_rx_sn = 0;
- pdcp_p->rx_hfn++;
- }
+ rx_hfn_for_count = pdcp_p->rx_hfn;
+ pdcp_sn_for_count = sequence_number;
+ pdcp_p->next_pdcp_rx_sn = sequence_number + 1;
- if (pdcp_p->security_activated == 1) {
- if (ctxt_pP->enb_flag == ENB_FLAG_NO) {
- start_meas(&eNB_pdcp_stats[ctxt_pP->module_id].validate_security);
- } else {
- start_meas(&UE_pdcp_stats[ctxt_pP->module_id].validate_security);
+ if (pdcp_p->next_pdcp_rx_sn > pdcp_p->maximum_pdcp_rx_sn) {
+ pdcp_p->next_pdcp_rx_sn = 0;
+ pdcp_p->rx_hfn++;
}
- security_ok = pdcp_validate_security(ctxt_pP,
- pdcp_p,
- srb_flagP,
- rb_idP,
- pdcp_header_len,
- rx_hfn_for_count,
- pdcp_sn_for_count,
- sdu_buffer_pP->data,
- sdu_buffer_sizeP - pdcp_tailer_len) == 0;
+ if (pdcp_p->security_activated == 1) {
+ if (ctxt_pP->enb_flag == ENB_FLAG_NO) {
+ start_meas(&eNB_pdcp_stats[ctxt_pP->module_id].validate_security);
+ } else {
+ start_meas(&UE_pdcp_stats[ctxt_pP->module_id].validate_security);
+ }
- if (ctxt_pP->enb_flag == ENB_FLAG_NO) {
- stop_meas(&eNB_pdcp_stats[ctxt_pP->module_id].validate_security);
+ security_ok = pdcp_validate_security(ctxt_pP,
+ pdcp_p,
+ srb_flagP,
+ rb_idP,
+ pdcp_header_len,
+ rx_hfn_for_count,
+ pdcp_sn_for_count,
+ sdu_buffer_pP->data,
+ sdu_buffer_sizeP - pdcp_tailer_len) == 0;
+
+ if (ctxt_pP->enb_flag == ENB_FLAG_NO) {
+ stop_meas(&eNB_pdcp_stats[ctxt_pP->module_id].validate_security);
+ } else {
+ stop_meas(&UE_pdcp_stats[ctxt_pP->module_id].validate_security);
+ }
} else {
- stop_meas(&UE_pdcp_stats[ctxt_pP->module_id].validate_security);
+ security_ok = 1;
}
- } else {
- security_ok = 1;
- }
- if (security_ok == 0) {
- LOG_W(PDCP,
- PROTOCOL_PDCP_CTXT_FMT"security not validated for incoming PDPC DRB RLC/UM PDU\n",
- PROTOCOL_PDCP_CTXT_ARGS(ctxt_pP, pdcp_p));
- LOG_W(PDCP, "Ignoring PDU...\n");
- free_mem_block(sdu_buffer_pP, __func__);
- /* TODO: indicate integrity verification failure to upper layer */
- return FALSE;
- }
+ if (security_ok == 0) {
+ LOG_W(PDCP,
+ PROTOCOL_PDCP_CTXT_FMT"security not validated for incoming PDPC DRB RLC/UM PDU\n",
+ PROTOCOL_PDCP_CTXT_ARGS(ctxt_pP, pdcp_p));
+ LOG_W(PDCP, "Ignoring PDU...\n");
+ free_mem_block(sdu_buffer_pP, __func__);
+ /* TODO: indicate integrity verification failure to upper layer */
+ return FALSE;
+ }
- break;
+ break;
- default:
- LOG_E(PDCP, "bad RLC mode, cannot happen.\n");
- exit(1);
+ default:
+ LOG_E(PDCP, "bad RLC mode, cannot happen.\n");
+ exit(1);
} /* switch (pdcp_p->rlc_mode) */
} else { /* MBMS_flagP == 0 */
payload_offset=0;
@@ -1145,10 +1144,10 @@ pdcp_run (
} while(msg_p != NULL);
// IP/NAS -> PDCP traffic : TX, read the pkt from the upper layer buffer
-// if (LINK_ENB_PDCP_TO_GTPV1U && ctxt_pP->enb_flag == ENB_FLAG_NO) {
- if (!EPC_MODE_ENABLED || ctxt_pP->enb_flag == ENB_FLAG_NO ) {
- pdcp_fifo_read_input_sdus(ctxt_pP);
- }
+ // if (LINK_ENB_PDCP_TO_GTPV1U && ctxt_pP->enb_flag == ENB_FLAG_NO) {
+ if (!EPC_MODE_ENABLED || ctxt_pP->enb_flag == ENB_FLAG_NO ) {
+ pdcp_fifo_read_input_sdus(ctxt_pP);
+ }
// PDCP -> NAS/IP traffic: RX
if (ctxt_pP->enb_flag) {
@@ -2042,6 +2041,8 @@ uint64_t pdcp_module_init( uint64_t pdcp_optmask ) {
((PDCP_USE_NETLINK)?"usenetlink":""));
if (PDCP_USE_NETLINK) {
+ nas_getparams();
+
if(UE_NAS_USE_TUN) {
netlink_init_tun("ue");
LOG_I(PDCP, "UE pdcp will use tun interface\n");
diff --git a/openair2/LAYER2/PDCP_v10.1.0/pdcp_fifo.c b/openair2/LAYER2/PDCP_v10.1.0/pdcp_fifo.c
index 8a44d7b1a86..4ac866cd665 100644
--- a/openair2/LAYER2/PDCP_v10.1.0/pdcp_fifo.c
+++ b/openair2/LAYER2/PDCP_v10.1.0/pdcp_fifo.c
@@ -145,7 +145,6 @@ int pdcp_fifo_flush_sdus(const protocol_ctxt_t *const ctxt_pP) {
//-----------------------------------------------------------------------------
int pdcp_fifo_read_input_sdus (const protocol_ctxt_t *const ctxt_pP) {
pdcp_data_req_header_t pdcp_read_header_g;
-
if (UE_NAS_USE_TUN || ENB_NAS_USE_TUN) {
protocol_ctxt_t ctxt = *ctxt_pP;
@@ -163,21 +162,19 @@ int pdcp_fifo_read_input_sdus (const protocol_ctxt_t *const ctxt_pP) {
if (len<=0) continue;
-
if (UE_NAS_USE_TUN) {
- key = PDCP_COLL_KEY_DEFAULT_DRB_VALUE(ctxt.module_id, ctxt.rnti, ctxt.enb_flag);
- h_rc = hashtable_get(pdcp_coll_p, key, (void **)&pdcp_p);
+ key = PDCP_COLL_KEY_DEFAULT_DRB_VALUE(ctxt.module_id, ctxt.rnti, ctxt.enb_flag);
+ h_rc = hashtable_get(pdcp_coll_p, key, (void **)&pdcp_p);
} else {
- ctxt.rnti=pdcp_eNB_UE_instance_to_rnti[0];
- ctxt.enb_flag=ENB_FLAG_YES;
- ctxt.module_id=0;
- key = PDCP_COLL_KEY_VALUE(ctxt.module_id, ctxt.rnti, ctxt.enb_flag, rab_id, SRB_FLAG_YES);
- h_rc = hashtable_get(pdcp_coll_p, key, (void **)&pdcp_p);
+ ctxt.rnti=pdcp_eNB_UE_instance_to_rnti[0];
+ ctxt.enb_flag=ENB_FLAG_YES;
+ ctxt.module_id=0;
+ key = PDCP_COLL_KEY_VALUE(ctxt.module_id, ctxt.rnti, ctxt.enb_flag, rab_id, SRB_FLAG_YES);
+ h_rc = hashtable_get(pdcp_coll_p, key, (void **)&pdcp_p);
}
- LOG_D(PDCP, "PDCP_COLL_KEY_DEFAULT_DRB_VALUE(module_id=%d, rnti=%x, enb_flag=%d)\n",
- ctxt.module_id, ctxt.rnti, ctxt.enb_flag);
-
+ LOG_D(PDCP, "PDCP_COLL_KEY_DEFAULT_DRB_VALUE(module_id=%d, rnti=%x, enb_flag=%d)\n",
+ ctxt.module_id, ctxt.rnti, ctxt.enb_flag);
if (h_rc == HASH_TABLE_OK) {
LOG_D(PDCP, "[FRAME %5u][UE][NETLINK][IP->PDCP] INST %d: Received socket with length %d on Rab %d \n",
diff --git a/openair2/LAYER2/RLC/rlc.c b/openair2/LAYER2/RLC/rlc.c
index b07f5b99fde..38d78f18fd8 100644
--- a/openair2/LAYER2/RLC/rlc.c
+++ b/openair2/LAYER2/RLC/rlc.c
@@ -584,14 +584,12 @@ void rlc_data_ind (
const sdu_size_t sdu_sizeP,
mem_block_t *sdu_pP) {
//-----------------------------------------------------------------------------
-
LOG_D(RLC, PROTOCOL_CTXT_FMT"[%s %u] Display of rlc_data_ind: size %u\n",
PROTOCOL_CTXT_ARGS(ctxt_pP),
(srb_flagP) ? "SRB" : "DRB",
rb_idP,
sdu_sizeP);
rlc_util_print_hex_octets(RLC, (unsigned char *)sdu_pP->data, sdu_sizeP);
-
#if T_TRACER
if (ctxt_pP->enb_flag)
diff --git a/openair2/NETWORK_DRIVER/MESH/constant.h b/openair2/NETWORK_DRIVER/MESH/constant.h
index 1c756765c6c..5347c5a7849 100644
--- a/openair2/NETWORK_DRIVER/MESH/constant.h
+++ b/openair2/NETWORK_DRIVER/MESH/constant.h
@@ -47,7 +47,8 @@
#define NAS_INET6_ADDRSTRLEN 46
#define NAS_INET_ADDRSTRLEN 16
-#define NAS_CX_MAX 128 // 32 //Identical to RRC constant
+#define NAS_CX_MAX 32 //128 //Identical to RRC constant: no you cannot
+/* increase to 128 without risking stack problems: KEEP ATTENTION TO COMPILATION WARNINGS */
//#define NAS_CX_MULTICAST_ALLNODE 2
#define NAS_RETRY_LIMIT_DEFAULT 5
diff --git a/openair2/NETWORK_DRIVER/MESH/ioctl.h b/openair2/NETWORK_DRIVER/MESH/ioctl.h
index ffa9b4e79b7..904105b1d1c 100644
--- a/openair2/NETWORK_DRIVER/MESH/ioctl.h
+++ b/openair2/NETWORK_DRIVER/MESH/ioctl.h
@@ -64,7 +64,8 @@
// Max number of entry of a message list
#define NAS_LIST_CX_MAX 32
#define NAS_LIST_RB_MAX 32
-#define NAS_LIST_CLASS_MAX 32
+#define NAS_LIST_CLASS_MAX 16 // 32 is too high!!:
+/* risk of stack problems: KEEP ATTENTION TO COMPILATION WARNINGS */
typedef unsigned short nasMsgType_t;
diff --git a/openair2/RRC/LTE/rrc_UE.c b/openair2/RRC/LTE/rrc_UE.c
index f8711da6391..a00bc537592 100644
--- a/openair2/RRC/LTE/rrc_UE.c
+++ b/openair2/RRC/LTE/rrc_UE.c
@@ -801,7 +801,6 @@ rrc_ue_establish_drb(
(void)ip_addr_offset4;
LOG_I(RRC,"[UE %d] Frame %d: processing RRCConnectionReconfiguration: reconfiguring DRB %ld/LCID %d\n",
ue_mod_idP, frameP, DRB_config->drb_Identity, (int)*DRB_config->logicalChannelIdentity);
-
/*
rrc_pdcp_config_req (ue_mod_idP+NB_eNB_INST, frameP, 0, CONFIG_ACTION_ADD,
(eNB_index * NB_RB_MAX) + *DRB_config->logicalChannelIdentity, UNDEF_SECURITY_MODE);
@@ -810,35 +809,34 @@ rrc_ue_establish_drb(
(eNB_index * NB_RB_MAX) + *DRB_config->logicalChannelIdentity,
RADIO_ACCESS_BEARER,Rlc_info_um);
*/
-// if(!EPC_MODE_ENABLED) {
-//# if !defined(OAI_NW_DRIVER_TYPE_ETHERNET) && !defined(EXMIMO) && !defined(OAI_USRP) && !defined(OAI_BLADERF) && !defined(ETHERNET) && !defined(LINK_ENB_PDCP_TO_GTPV1U)
- ip_addr_offset3 = 0;
- ip_addr_offset4 = 1;
- LOG_I(OIP,"[UE %d] trying to bring up the OAI interface oip%d, IP 10.0.%d.%d\n", ue_mod_idP, ip_addr_offset3+ue_mod_idP,
- ip_addr_offset3+ue_mod_idP+1,ip_addr_offset4+ue_mod_idP+1);
- oip_ifup=nas_config(ip_addr_offset3+ue_mod_idP+1, // interface_id
- ip_addr_offset3+ue_mod_idP+1, // third_octet
- ip_addr_offset4+ue_mod_idP+1, // fourth_octet
- "oip"); // interface suffix
-
- if (oip_ifup == 0 && (!UE_NAS_USE_TUN)) { // interface is up --> send a config the DRB
- LOG_I(OIP,"[UE %d] Config the ue net interface %d to send/receive pkt on DRB %ld to/from the protocol stack\n",
- ue_mod_idP,
- ip_addr_offset3+ue_mod_idP,
- (long int)((eNB_index * LTE_maxDRB) + DRB_config->drb_Identity));
- rb_conf_ipv4(0,//add
- ue_mod_idP,//cx align with the UE index
- ip_addr_offset3+ue_mod_idP,//inst num_enb+ue_index
- (eNB_index * LTE_maxDRB) + DRB_config->drb_Identity,//rb
- 0,//dscp
- ipv4_address(ip_addr_offset3+ue_mod_idP+1,ip_addr_offset4+ue_mod_idP+1),//saddr
- ipv4_address(ip_addr_offset3+ue_mod_idP+1,eNB_index+1));//daddr
- LOG_D(RRC,"[UE %d] State = Attached (eNB %d)\n",ue_mod_idP,eNB_index);
- }
-
-//# endif
-// }
+ // if(!EPC_MODE_ENABLED) {
+ //# if !defined(OAI_NW_DRIVER_TYPE_ETHERNET) && !defined(EXMIMO) && !defined(OAI_USRP) && !defined(OAI_BLADERF) && !defined(ETHERNET) && !defined(LINK_ENB_PDCP_TO_GTPV1U)
+ ip_addr_offset3 = 0;
+ ip_addr_offset4 = 1;
+ LOG_I(OIP,"[UE %d] trying to bring up the OAI interface oip%d, IP 10.0.%d.%d\n", ue_mod_idP, ip_addr_offset3+ue_mod_idP,
+ ip_addr_offset3+ue_mod_idP+1,ip_addr_offset4+ue_mod_idP+1);
+ oip_ifup=nas_config(ip_addr_offset3+ue_mod_idP+1, // interface_id
+ ip_addr_offset3+ue_mod_idP+1, // third_octet
+ ip_addr_offset4+ue_mod_idP+1, // fourth_octet
+ "oip"); // interface suffix
+
+ if (oip_ifup == 0 && (!UE_NAS_USE_TUN)) { // interface is up --> send a config the DRB
+ LOG_I(OIP,"[UE %d] Config the ue net interface %d to send/receive pkt on DRB %ld to/from the protocol stack\n",
+ ue_mod_idP,
+ ip_addr_offset3+ue_mod_idP,
+ (long int)((eNB_index * LTE_maxDRB) + DRB_config->drb_Identity));
+ rb_conf_ipv4(0,//add
+ ue_mod_idP,//cx align with the UE index
+ ip_addr_offset3+ue_mod_idP,//inst num_enb+ue_index
+ (eNB_index * LTE_maxDRB) + DRB_config->drb_Identity,//rb
+ 0,//dscp
+ ipv4_address(ip_addr_offset3+ue_mod_idP+1,ip_addr_offset4+ue_mod_idP+1),//saddr
+ ipv4_address(ip_addr_offset3+ue_mod_idP+1,eNB_index+1));//daddr
+ LOG_D(RRC,"[UE %d] State = Attached (eNB %d)\n",ue_mod_idP,eNB_index);
+ }
+ //# endif
+ // }
return(0);
}
diff --git a/openair2/RRC/LTE/rrc_eNB.c b/openair2/RRC/LTE/rrc_eNB.c
index 77519b2015b..6129a88ab21 100644
--- a/openair2/RRC/LTE/rrc_eNB.c
+++ b/openair2/RRC/LTE/rrc_eNB.c
@@ -6269,6 +6269,7 @@ rrc_eNB_process_RRCConnectionReconfigurationComplete(
LOG_D(RRC,
"[eNB %d] Frame %d: Establish RLC UM Bidirectional, DRB %d Active\n",
ctxt_pP->module_id, ctxt_pP->frame, (int)DRB_configList->list.array[i]->drb_Identity);
+
if (!EPC_MODE_ENABLED && !ENB_NAS_USE_TUN) {
LOG_I(OIP, "[eNB %d] trying to bring up the OAI interface oai%d\n",
ctxt_pP->module_id,
@@ -6278,6 +6279,7 @@ rrc_eNB_process_RRCConnectionReconfigurationComplete(
ctxt_pP->module_id + 1, // thrid octet
ctxt_pP->module_id + 1, // fourth octet
"oai");
+
if (oip_ifup == 0) { // interface is up --> send a config the DRB
module_id_t ue_module_id;
dest_ip_offset = 8;
diff --git a/openair2/RRC/NAS/nas_config.c b/openair2/RRC/NAS/nas_config.c
index 2c432cf9224..61909df5ec4 100644
--- a/openair2/RRC/NAS/nas_config.c
+++ b/openair2/RRC/NAS/nas_config.c
@@ -45,47 +45,55 @@
#include "nas_config.h"
#include "common/utils/LOG/log.h"
#include "targets/RT/USER/lte-softmodem.h"
+#include "common/config/config_userapi.h"
//default values according to the examples,
-char *baseNetAddress = "10.0" ;
-char *netMask = "255.255.255.0" ;
-char *broadcastAddr = "10.0.255.255" ;
-
+char *baseNetAddress ;
+char *netMask ;
+char *broadcastAddr ;
+#define NASHLP_NETPREFIX "<NAS network prefix, two first bytes of network addresses>\n"
+#define NASHLP_NETMASK "<NAS network mask>\n"
+#define NASHLP_BROADCASTADDR "<NAS network broadcast address>\n"
+void nas_getparams(void) {
+ paramdef_t nasoptions[] = {
+ /*--------------------------------------------------------------------------------------------------------------------------------------------------------------------*/
+ /* configuration parameters for netlink, includes network parameters when running in noS1 mode */
+ /* optname helpstr paramflags XXXptr defXXXval type numelt */
+ /*--------------------------------------------------------------------------------------------------------------------------------------------------------------------*/
+ {"NetworkPrefix", NASHLP_NETPREFIX, 0, strptr:&baseNetAddress, defstrval:"10.0", TYPE_STRING, 0 },
+ {"NetworkMask", NASHLP_NETMASK, 0, strptr:&netMask, defstrval:"255.255.255.0", TYPE_STRING, 0 },
+ {"BroadcastAddr", NASHLP_BROADCASTADDR, 0, strptr:&broadcastAddr, defstrval:"10.0.255.255", TYPE_STRING, 0 },
+ };
+ config_get( nasoptions,sizeof(nasoptions)/sizeof(paramdef_t),"nas.noS1");
+}
-void setBaseNetAddress (char* baseAddr)
-{
+void setBaseNetAddress (char *baseAddr) {
strcpy(baseNetAddress,baseAddr);
}
-char* getBaseNetAddress (void)
-{
+char *getBaseNetAddress (void) {
return baseNetAddress;
}
-void setNetMask (char* baseAddr)
-{
+void setNetMask (char *baseAddr) {
strcpy(netMask,baseAddr);
}
-char* getNetMask (void)
-{
+char *getNetMask (void) {
return netMask;
}
-void setBroadcastAddress (char* baseAddr)
-{
+void setBroadcastAddress (char *baseAddr) {
strcpy(broadcastAddr, baseAddr);
}
-char* getBroadcastAddress (void)
-{
+char *getBroadcastAddress (void) {
return broadcastAddr;
}
//Add Gateway to the interface
-int set_gateway(char *interfaceName, char *gateway)
-{
+int set_gateway(char *interfaceName, char *gateway) {
int sock_fd;
struct rtentry rt;
struct sockaddr_in addr;
@@ -96,20 +104,16 @@ int set_gateway(char *interfaceName, char *gateway)
}
memset (&rt, 0, sizeof (rt));
-
addr.sin_family = AF_INET;
/*set Destination addr*/
inet_aton("0.0.0.0",&addr.sin_addr);
memcpy(&rt.rt_dst, &addr, sizeof(struct sockaddr_in));
-
/*set gateway addr*/
inet_aton(gateway,&addr.sin_addr);
memcpy(&rt.rt_gateway, &addr, sizeof(struct sockaddr_in));
-
/*set genmask addr*/
inet_aton("0.0.0.0",&addr.sin_addr);
memcpy(&rt.rt_genmask, &addr, sizeof(struct sockaddr_in));
-
rt.rt_dev = interfaceName;
//rt.rt_flags = RTF_UP|RTF_GATEWAY|RTF_DEFAULT;
/* SR: rt_flags on 16 bits but RTF_DEFAULT = 0x00010000
@@ -129,19 +133,16 @@ int set_gateway(char *interfaceName, char *gateway)
LOG_I(OIP,"set_gateway OK!\n");
return 0;
}
-
}
close(sock_fd);
-
LOG_D(OIP,"Set Gateway OK!\n");
return 0;
}
// sets a genneric interface parameter
// (SIOCSIFADDR, SIOCSIFNETMASK, SIOCSIFBRDADDR, SIOCSIFFLAGS)
-int setInterfaceParameter(char *interfaceName, char *settingAddress, int operation)
-{
+int setInterfaceParameter(char *interfaceName, char *settingAddress, int operation) {
int sock_fd;
struct ifreq ifr;
struct sockaddr_in addr;
@@ -154,10 +155,8 @@ int setInterfaceParameter(char *interfaceName, char *settingAddress, int operati
memset(&ifr, 0, sizeof(ifr));
strncpy(ifr.ifr_name, interfaceName, sizeof(ifr.ifr_name)-1);
-
memset(&addr, 0, sizeof(struct sockaddr_in));
addr.sin_family = AF_INET;
-
inet_aton(settingAddress,&addr.sin_addr);
memcpy(&ifr.ifr_ifru.ifru_addr,&addr,sizeof(struct sockaddr_in));
@@ -169,15 +168,13 @@ int setInterfaceParameter(char *interfaceName, char *settingAddress, int operati
}
close(sock_fd);
-
// printf("Set OK!\n");
return 0;
}
// sets a genneric interface parameter
// (SIOCSIFADDR, SIOCSIFNETMASK, SIOCSIFBRDADDR, SIOCSIFFLAGS)
-int bringInterfaceUp(char *interfaceName, int up)
-{
+int bringInterfaceUp(char *interfaceName, int up) {
int sock_fd;
struct ifreq ifr;
@@ -213,8 +210,7 @@ int bringInterfaceUp(char *interfaceName, int up)
return 0;
}
// non blocking full configuration of the interface (address, net mask, and broadcast mask)
-int NAS_config(char *interfaceName, char *ipAddress, char *networkMask, char *broadcastAddress)
-{
+int NAS_config(char *interfaceName, char *ipAddress, char *networkMask, char *broadcastAddress) {
bringInterfaceUp(interfaceName, 0);
// sets the machine address
int returnValue= setInterfaceParameter(interfaceName, ipAddress,SIOCSIFADDR);
@@ -229,28 +225,21 @@ int NAS_config(char *interfaceName, char *ipAddress, char *networkMask, char *br
// if(!returnValue)
// returnValue=set_gateway(interfaceName, broadcastAddress);
-
bringInterfaceUp(interfaceName, 1);
-
return returnValue;
}
// non blocking full configuration of the interface (address, and the two lest octets of the address)
-int nas_config(int interface_id, int thirdOctet, int fourthOctet, char *ifname)
-{
+int nas_config(int interface_id, int thirdOctet, int fourthOctet, char *ifname) {
//char buf[5];
char ipAddress[20];
char broadcastAddress[20];
char interfaceName[20];
int returnValue;
sprintf(ipAddress, "10.0.%d.%d", thirdOctet,fourthOctet);
-
sprintf(broadcastAddress, "10.0.%d.255", thirdOctet);
-
-
sprintf(interfaceName, "%s%s%d", (UE_NAS_USE_TUN || ENB_NAS_USE_TUN)?"oaitun_":ifname,
UE_NAS_USE_TUN?"ue": (ENB_NAS_USE_TUN?"enb":""),interface_id);
-
bringInterfaceUp(interfaceName, 0);
// sets the machine address
returnValue= setInterfaceParameter(interfaceName, ipAddress,SIOCSIFADDR);
@@ -264,18 +253,13 @@ int nas_config(int interface_id, int thirdOctet, int fourthOctet, char *ifname)
returnValue= setInterfaceParameter(interfaceName, broadcastAddress,SIOCSIFBRDADDR);
bringInterfaceUp(interfaceName, 1);
-
return returnValue;
-
}
// Blocking full configuration of the interface (address, net mask, and broadcast mask)
-int blocking_NAS_config(char *interfaceName, char *ipAddress, char *networkMask, char *broadcastAddress)
-{
-
+int blocking_NAS_config(char *interfaceName, char *ipAddress, char *networkMask, char *broadcastAddress) {
char command[200];
command[0]='\0';
-
strcat(command, "ifconfig ");
strncat(command, interfaceName, sizeof(command) - strlen(command) - 1);
strncat(command, " ", sizeof(command) - strlen(command) - 1);
@@ -284,16 +268,13 @@ int blocking_NAS_config(char *interfaceName, char *ipAddress, char *networkMask,
strncat(command, networkMask, sizeof(command) - strlen(command) - 1);
strncat(command, " broadcast ", sizeof(command) - strlen(command) - 1);
strncat(command, broadcastAddress, sizeof(command) - strlen(command) - 1);
-
// ifconfig nasmesh0 10.0.1.1 networkMask 255.255.255.0 broadcast 10.0.1.255
int i = system (command);
-
return i;
}
// program help
-void helpOptions(char **argv)
-{
+void helpOptions(char **argv) {
printf("Help for %s\n", argv[0]);
printf(" -i <interfaceName>\n");
printf(" -a <IP address>\n");
@@ -305,13 +286,11 @@ void helpOptions(char **argv)
printf(" IP Address: 10.0.1.1\n");
printf(" Net mask: 255.255.255.0\n");
printf(" Broadcast address: [Beginning of the IP address].255\n");
-
exit(1);
}
// creates the broadcast address if it wasn't set before
-void createBroadcast(char *broadcastAddress)
-{
+void createBroadcast(char *broadcastAddress) {
int pos=strlen(broadcastAddress)-1;
while(broadcastAddress[pos]!='.')
@@ -333,7 +312,6 @@ int main(int argc,char **argv)
char ipAddress[100];
char networkMask[100];
char broadcastAddress[100];
-
strcpy(interfaceName, "oai0");
strcpy(ipAddress, "10.0.1.1");
strcpy(networkMask, "255.255.255.0");
@@ -341,38 +319,38 @@ int main(int argc,char **argv)
while ((c = getopt (argc, argv, "i:a:n:b:h")) != -1)
switch (c) {
- case 'h':
- helpOptions(argv);
- break;
-
- case 'i':
- strcpy(interfaceName,optarg);
- break;
-
- case 'a':
- strcpy(ipAddress,optarg);
- break;
-
- case 'n':
- strcpy(networkMask,optarg);
- break;
-
- case 'b':
- strcpy(broadcastAddress,optarg);
- break;
-
- case '?':
- if (isprint (optopt))
- fprintf (stderr, "Unknown option `-%c'.\n", optopt);
- else
- fprintf (stderr,
- "Unknown option character `\\x%x'.\n",
- optopt);
-
- return 1;
-
- default:
- abort ();
+ case 'h':
+ helpOptions(argv);
+ break;
+
+ case 'i':
+ strcpy(interfaceName,optarg);
+ break;
+
+ case 'a':
+ strcpy(ipAddress,optarg);
+ break;
+
+ case 'n':
+ strcpy(networkMask,optarg);
+ break;
+
+ case 'b':
+ strcpy(broadcastAddress,optarg);
+ break;
+
+ case '?':
+ if (isprint (optopt))
+ fprintf (stderr, "Unknown option `-%c'.\n", optopt);
+ else
+ fprintf (stderr,
+ "Unknown option character `\\x%x'.\n",
+ optopt);
+
+ return 1;
+
+ default:
+ abort ();
}
if(strlen(broadcastAddress)==0) {
@@ -385,7 +363,6 @@ int main(int argc,char **argv)
//test
// setBaseNetAddress("11.11");
// nas_config(interfaceName, 33, 44);
-
}
#endif
diff --git a/openair2/RRC/NAS/nas_config.h b/openair2/RRC/NAS/nas_config.h
index c6c60baf0ba..fdc3c98f1b0 100644
--- a/openair2/RRC/NAS/nas_config.h
+++ b/openair2/RRC/NAS/nas_config.h
@@ -31,6 +31,13 @@
#include <netinet/in.h>
+/*! \fn void void nas_getparams(void)(void)
+ * \brief This function get parameters used to configure network interface when running in noS1 mode
+ * \note
+ * @ingroup ?????
+ */
+void nas_getparams(void);
+
/*! \fn int NAS_config(char*, char*, char*, char*)
* \brief This function initializes the nasmesh interface
* \param[in] interfaceName, the name of the interface, e.g. nasmesh0 or nasmesh1
@@ -98,7 +105,7 @@ int set_gateway(char *interfaceName, char *gateway);
* \note
* @ingroup ?????
*/
-void setBaseNetAddress(char* baseAddr);
+void setBaseNetAddress(char *baseAddr);
/*! \fn char* getBaseNetAddress()
* \brief This function returns the basic network address used
@@ -106,7 +113,7 @@ void setBaseNetAddress(char* baseAddr);
* \note
* @ingroup ?????
*/
-char* getBaseNetAddress(void);
+char *getBaseNetAddress(void);
/*! \fn void setNetMask(char*)
* \brief This function sets the new default network mask used
@@ -114,7 +121,7 @@ char* getBaseNetAddress(void);
* \note
* @ingroup ?????
*/
-void setNetMask(char* baseAddr);
+void setNetMask(char *baseAddr);
/*! \fn char* getNetMask()
* \brief This function returns the network mask address in use
@@ -122,7 +129,7 @@ void setNetMask(char* baseAddr);
* \note
* @ingroup ?????
*/
-char* getNetMask(void);
+char *getNetMask(void);
/*! \fn coid setBroadcastAddress(char*)
* \brief This function sets the new broadcast address used
@@ -130,7 +137,7 @@ char* getNetMask(void);
* \note
* @ingroup ?????
*/
-void setBroadcastAddress(char* baseAddr);
+void setBroadcastAddress(char *baseAddr);
/*! \fn char* getBroadcastAddress()
* \brief This function returns the broadcast address in use
@@ -138,7 +145,7 @@ void setBroadcastAddress(char* baseAddr);
* \note
* @ingroup ?????
*/
-char* getBroadcastAddress(void);
+char *getBroadcastAddress(void);
int bringInterfaceUp(char *interfaceName, int up);
diff --git a/targets/ARCH/COMMON/common_lib.c b/targets/ARCH/COMMON/common_lib.c
index 06b08dfc40d..3f81816aa10 100644
--- a/targets/ARCH/COMMON/common_lib.c
+++ b/targets/ARCH/COMMON/common_lib.c
@@ -19,8 +19,8 @@
* contact@openairinterface.org
*/
-/*! \file common_lib.c
- * \brief common APIs for different RF frontend device
+/*! \file common_lib.c
+ * \brief common APIs for different RF frontend device
* \author HongliangXU, Navid Nikaein
* \date 2015
* \version 0.2
@@ -40,113 +40,121 @@
#include "targets/RT/USER/lte-softmodem.h"
int set_device(openair0_device *device) {
-
switch (device->type) {
-
- case EXMIMO_DEV:
- printf("[%s] has loaded EXPRESS MIMO device.\n",((device->host_type == RAU_HOST) ? "RAU": "RRU"));
- break;
- case USRP_B200_DEV:
- printf("[%s] has loaded USRP B200 device.\n",((device->host_type == RAU_HOST) ? "RAU": "RRU"));
- break;
- case USRP_X300_DEV:
- printf("[%s] has loaded USRP X300 device.\n",((device->host_type == RAU_HOST) ? "RAU": "RRU"));
- break;
- case BLADERF_DEV:
- printf("[%s] has loaded BLADERF device.\n",((device->host_type == RAU_HOST) ? "RAU": "RRU"));
- break;
- case LMSSDR_DEV:
- printf("[%s] has loaded LMSSDR device.\n",((device->host_type == RAU_HOST) ? "RAU": "RRU"));
- break;
- case IRIS_DEV:
- printf("[%s] has loaded Iris device.\n",((device->host_type == RAU_HOST) ? "RAU": "RRU"));
- break;
- case NONE_DEV:
- printf("[%s] has not loaded a HW device.\n",((device->host_type == RAU_HOST) ? "RAU": "RRU"));
- break;
- default:
- printf("[%s] invalid HW device.\n",((device->host_type == RAU_HOST) ? "RAU": "RRU"));
- return -1;
+ case EXMIMO_DEV:
+ printf("[%s] has loaded EXPRESS MIMO device.\n",((device->host_type == RAU_HOST) ? "RAU": "RRU"));
+ break;
+
+ case USRP_B200_DEV:
+ printf("[%s] has loaded USRP B200 device.\n",((device->host_type == RAU_HOST) ? "RAU": "RRU"));
+ break;
+
+ case USRP_X300_DEV:
+ printf("[%s] has loaded USRP X300 device.\n",((device->host_type == RAU_HOST) ? "RAU": "RRU"));
+ break;
+
+ case BLADERF_DEV:
+ printf("[%s] has loaded BLADERF device.\n",((device->host_type == RAU_HOST) ? "RAU": "RRU"));
+ break;
+
+ case LMSSDR_DEV:
+ printf("[%s] has loaded LMSSDR device.\n",((device->host_type == RAU_HOST) ? "RAU": "RRU"));
+ break;
+
+ case IRIS_DEV:
+ printf("[%s] has loaded Iris device.\n",((device->host_type == RAU_HOST) ? "RAU": "RRU"));
+ break;
+
+ case NONE_DEV:
+ printf("[%s] has not loaded a HW device.\n",((device->host_type == RAU_HOST) ? "RAU": "RRU"));
+ break;
+
+ default:
+ printf("[%s] invalid HW device.\n",((device->host_type == RAU_HOST) ? "RAU": "RRU"));
+ return -1;
}
+
return 0;
}
int set_transport(openair0_device *device) {
-
switch (device->transp_type) {
-
- case ETHERNET_TP:
- printf("[%s] has loaded ETHERNET trasport protocol.\n",((device->host_type == RAU_HOST) ? "RAU": "RRU"));
- return 0;
- break;
- case NONE_TP:
- printf("[%s] has not loaded a transport protocol.\n",((device->host_type == RAU_HOST) ? "RAU": "RRU"));
- return 0;
- break;
- default:
- printf("[%s] invalid transport protocol.\n",((device->host_type == RAU_HOST) ? "RAU": "RRU"));
- return -1;
- break;
+ case ETHERNET_TP:
+ printf("[%s] has loaded ETHERNET trasport protocol.\n",((device->host_type == RAU_HOST) ? "RAU": "RRU"));
+ return 0;
+ break;
+
+ case NONE_TP:
+ printf("[%s] has not loaded a transport protocol.\n",((device->host_type == RAU_HOST) ? "RAU": "RRU"));
+ return 0;
+ break;
+
+ default:
+ printf("[%s] invalid transport protocol.\n",((device->host_type == RAU_HOST) ? "RAU": "RRU"));
+ return -1;
+ break;
}
-
}
typedef int(*devfunc_t)(openair0_device *, openair0_config_t *, eth_params_t *);
/* look for the interface library and load it */
-int load_lib(openair0_device *device, openair0_config_t *openair0_cfg, eth_params_t * cfg, uint8_t flag) {
-
+int load_lib(openair0_device *device, openair0_config_t *openair0_cfg, eth_params_t *cfg, uint8_t flag) {
loader_shlibfunc_t shlib_fdesc[1];
int ret=0;
char *libname;
+
if ( IS_SOFTMODEM_BASICSIM ) {
- libname=OAI_BASICSIM_LIBNAME;
- shlib_fdesc[0].fname="device_init";
- } else
- if ( IS_SOFTMODEM_RFSIM ) {
- libname=OAI_RFSIM_LIBNAME;
- shlib_fdesc[0].fname="device_init";
+ libname=OAI_BASICSIM_LIBNAME;
+ shlib_fdesc[0].fname="device_init";
+ } else if ( IS_SOFTMODEM_RFSIM ) {
+ libname=OAI_RFSIM_LIBNAME;
+ shlib_fdesc[0].fname="device_init";
} else if (flag == RAU_LOCAL_RADIO_HEAD) {
- libname=OAI_RF_LIBNAME;
- shlib_fdesc[0].fname="device_init";
+ libname=OAI_RF_LIBNAME;
+ shlib_fdesc[0].fname="device_init";
} else {
- libname=OAI_TP_LIBNAME;
- shlib_fdesc[0].fname="transport_init";
- }
+ libname=OAI_TP_LIBNAME;
+ shlib_fdesc[0].fname="transport_init";
+ }
+
ret=load_module_shlib(libname,shlib_fdesc,1,NULL);
+
if (ret < 0) {
- fprintf(stderr,"Library %s couldn't be loaded\n",libname);
+ fprintf(stderr,"Library %s couldn't be loaded\n",libname);
} else {
- ret=((devfunc_t)shlib_fdesc[0].fptr)(device,openair0_cfg,cfg);
- }
- return ret;
+ ret=((devfunc_t)shlib_fdesc[0].fptr)(device,openair0_cfg,cfg);
+ }
+
+ return ret;
}
int openair0_device_load(openair0_device *device, openair0_config_t *openair0_cfg) {
-
int rc=0;
rc=load_lib(device, openair0_cfg, NULL,RAU_LOCAL_RADIO_HEAD );
- if ( rc >= 0) {
- if ( set_device(device) < 0) {
+ if ( rc >= 0) {
+ if ( set_device(device) < 0) {
fprintf(stderr, "%s %d:Unsupported radio head\n",__FILE__, __LINE__);
- return -1;
- }
+ return -1;
+ }
}
+
return rc;
}
-int openair0_transport_load(openair0_device *device, openair0_config_t *openair0_cfg, eth_params_t * eth_params) {
+int openair0_transport_load(openair0_device *device, openair0_config_t *openair0_cfg, eth_params_t *eth_params) {
int rc;
rc=load_lib(device, openair0_cfg, eth_params, RAU_REMOTE_RADIO_HEAD);
- if ( rc >= 0) {
+
+ if ( rc >= 0) {
if ( set_transport(device) < 0) {
fprintf(stderr, "%s %d:Unsupported transport protocol\n",__FILE__, __LINE__);
- return -1;
- }
+ return -1;
+ }
}
- return rc;
+ return rc;
}
diff --git a/targets/ARCH/COMMON/common_lib.h b/targets/ARCH/COMMON/common_lib.h
index de9acc3ab59..0af6fa9c5ed 100644
--- a/targets/ARCH/COMMON/common_lib.h
+++ b/targets/ARCH/COMMON/common_lib.h
@@ -19,8 +19,8 @@
* contact@openairinterface.org
*/
-/*! \file common_lib.h
- * \brief common APIs for different RF frontend device
+/*! \file common_lib.h
+ * \brief common APIs for different RF frontend device
* \author HongliangXU, Navid Nikaein
* \date 2015
* \version 0.2
@@ -48,13 +48,13 @@
#define RAU_REMOTE_RADIO_HEAD 1
#ifndef MAX_CARDS
-#define MAX_CARDS 8
+ #define MAX_CARDS 8
#endif
typedef int64_t openair0_timestamp;
typedef volatile int64_t openair0_vtimestamp;
-
+
/*!\brief structrue holds the parameters to configure USRP devices*/
typedef struct openair0_device_t openair0_device;
@@ -123,16 +123,16 @@ typedef enum {
/*!\brief openair0 device host type */
typedef enum {
MIN_HOST_TYPE = 0,
- /*!\brief device functions within a RAU */
+ /*!\brief device functions within a RAU */
RAU_HOST,
- /*!\brief device functions within a RRU */
+ /*!\brief device functions within a RRU */
RRU_HOST,
MAX_HOST_TYPE
-}host_type_t;
+} host_type_t;
-/*! \brief RF Gain clibration */
+/*! \brief RF Gain clibration */
typedef struct {
//! Frequency for which RX chain was calibrated
double freq;
@@ -160,7 +160,7 @@ typedef struct {
duplex_mode_t duplex_mode;
//! number of downlink resource blocks
int num_rb_dl;
- //! number of samples per frame
+ //! number of samples per frame
unsigned int samples_per_frame;
//! the sample rate for both transmit and receive.
double sample_rate;
@@ -175,9 +175,9 @@ typedef struct {
//! number of TX channels (=TX antennas)
int tx_num_channels;
//! \brief RX base addresses for mmapped_dma
- int32_t* rxbase[4];
+ int32_t *rxbase[4];
//! \brief TX base addresses for mmapped_dma
- int32_t* txbase[4];
+ int32_t *txbase[4];
//! \brief Center frequency in Hz for RX.
//! index: [0..rx_num_channels[
double rx_freq[4];
@@ -188,7 +188,7 @@ typedef struct {
//! \brief Pointer to Calibration table for RX gains
rx_gain_calib_table_t *rx_gain_calib_table;
- //! mode for rxgain (ExpressMIMO2)
+ //! mode for rxgain (ExpressMIMO2)
rx_gain_t rxg_mode[4];
//! \brief Gain for RX in dB.
//! index: [0..rx_num_channels]
@@ -202,14 +202,14 @@ typedef struct {
double rx_bw;
//! TX bandwidth in Hz
double tx_bw;
- //! clock source
+ //! clock source
clock_source_t clock_source;
//! Manual SDR IP address
char *sdr_addrs;
//! Auto calibration flag
int autocal[4];
//! rf devices work with x bits iqs when oai have its own iq format
- //! the two following parameters are used to convert iqs
+ //! the two following parameters are used to convert iqs
int iq_txshift;
int iq_rxrescale;
//! Configuration file for LMS7002M
@@ -222,10 +222,10 @@ typedef struct {
unsigned int sf_read_delay; // read delay in replay mode
unsigned int sf_write_delay; // write delay in replay mode
unsigned int eth_mtu; // ethernet MTU
-#endif
+#endif
} openair0_config_t;
-/*! \brief RF mapping */
+/*! \brief RF mapping */
typedef struct {
//! card id
int card;
@@ -272,14 +272,14 @@ struct openair0_device_t {
/*!brief Component Carrier ID of this device */
int CC_id;
-
+
/*!brief Type of this device */
dev_type_t type;
/*!brief Transport protocol type that the device suppports (in case I/Q samples need to be transported) */
transport_type_t transp_type;
- /*!brief Type of the device's host (RAU/RRU) */
+ /*!brief Type of the device's host (RAU/RRU) */
host_type_t host_type;
/* !brief RF frontend parameters set by application */
@@ -301,25 +301,25 @@ struct openair0_device_t {
/*! \brief Called to send a request message between RAU-RRU on control port
@param device pointer to the device structure specific to the RF hardware target
@param msg pointer to the message structure passed between RAU-RRU
- @param msg_len length of the message
- */
+ @param msg_len length of the message
+ */
int (*trx_ctlsend_func)(openair0_device *device, void *msg, ssize_t msg_len);
/*! \brief Called to receive a reply message between RAU-RRU on control port
@param device pointer to the device structure specific to the RF hardware target
@param msg pointer to the message structure passed between RAU-RRU
- @param msg_len length of the message
- */
+ @param msg_len length of the message
+ */
int (*trx_ctlrecv_func)(openair0_device *device, void *msg, ssize_t msg_len);
/*! \brief Called to send samples to the RF target
@param device pointer to the device structure specific to the RF hardware target
- @param timestamp The timestamp at whicch the first sample MUST be sent
+ @param timestamp The timestamp at whicch the first sample MUST be sent
@param buff Buffer which holds the samples
@param nsamps number of samples to be sent
@param antenna_id index of the antenna if the device has multiple anteannas
@param flags flags must be set to TRUE if timestamp parameter needs to be applied
- */
+ */
int (*trx_write_func)(openair0_device *device, openair0_timestamp timestamp, void **buff, int nsamps,int antenna_id, int flags);
/*! \brief Receive samples from hardware.
@@ -335,55 +335,55 @@ struct openair0_device_t {
*/
int (*trx_read_func)(openair0_device *device, openair0_timestamp *ptimestamp, void **buff, int nsamps,int antenna_id);
- /*! \brief print the device statistics
+ /*! \brief print the device statistics
* \param device the hardware to use
* \returns 0 on success
*/
int (*trx_get_stats_func)(openair0_device *device);
- /*! \brief Reset device statistics
+ /*! \brief Reset device statistics
* \param device the hardware to use
- * \returns 0 in success
+ * \returns 0 in success
*/
int (*trx_reset_stats_func)(openair0_device *device);
- /*! \brief Terminate operation of the transceiver -- free all associated resources
+ /*! \brief Terminate operation of the transceiver -- free all associated resources
* \param device the hardware to use
*/
void (*trx_end_func)(openair0_device *device);
- /*! \brief Stop operation of the transceiver
+ /*! \brief Stop operation of the transceiver
*/
int (*trx_stop_func)(openair0_device *device);
/* Functions API related to UE*/
- /*! \brief Set RX feaquencies
+ /*! \brief Set RX feaquencies
* \param device the hardware to use
* \param openair0_cfg RF frontend parameters set by application
- * \param exmimo_dump_config dump EXMIMO configuration
- * \returns 0 in success
+ * \param exmimo_dump_config dump EXMIMO configuration
+ * \returns 0 in success
*/
- int (*trx_set_freq_func)(openair0_device* device, openair0_config_t *openair0_cfg,int exmimo_dump_config);
-
+ int (*trx_set_freq_func)(openair0_device *device, openair0_config_t *openair0_cfg,int exmimo_dump_config);
+
/*! \brief Set gains
* \param device the hardware to use
* \param openair0_cfg RF frontend parameters set by application
- * \returns 0 in success
+ * \returns 0 in success
*/
- int (*trx_set_gains_func)(openair0_device* device, openair0_config_t *openair0_cfg);
+ int (*trx_set_gains_func)(openair0_device *device, openair0_config_t *openair0_cfg);
/*! \brief RRU Configuration callback
* \param idx RU index
* \param arg pointer to capabilities or configuration
*/
- void (*configure_rru)(int idx, void* arg);
+ void (*configure_rru)(int idx, void *arg);
};
/* type of device init function, implemented in shared lib */
typedef int(*oai_device_initfunc_t)(openair0_device *device, openair0_config_t *openair0_cfg);
/* type of transport init function, implemented in shared lib */
-typedef int(*oai_transport_initfunc_t)(openair0_device *device, openair0_config_t *openair0_cfg, eth_params_t * eth_params);
+typedef int(*oai_transport_initfunc_t)(openair0_device *device, openair0_config_t *openair0_cfg, eth_params_t *eth_params);
#ifdef __cplusplus
extern "C"
@@ -391,23 +391,23 @@ extern "C"
#endif
- /*! \brief Initialize openair RF target. It returns 0 if OK */
- int openair0_device_load(openair0_device *device, openair0_config_t *openair0_cfg);
- /*! \brief Initialize transport protocol . It returns 0 if OK */
- int openair0_transport_load(openair0_device *device, openair0_config_t *openair0_cfg, eth_params_t * eth_params);
+/*! \brief Initialize openair RF target. It returns 0 if OK */
+int openair0_device_load(openair0_device *device, openair0_config_t *openair0_cfg);
+/*! \brief Initialize transport protocol . It returns 0 if OK */
+int openair0_transport_load(openair0_device *device, openair0_config_t *openair0_cfg, eth_params_t *eth_params);
-
- /*! \brief Get current timestamp of USRP
- * \param device the hardware to use
- */
- openair0_timestamp get_usrp_time(openair0_device *device);
- /*! \brief Set RX frequencies
- * \param device the hardware to use
- * \param openair0_cfg RF frontend parameters set by application
- * \returns 0 in success
- */
- int openair0_set_rx_frequencies(openair0_device* device, openair0_config_t *openair0_cfg);
+/*! \brief Get current timestamp of USRP
+ * \param device the hardware to use
+ */
+openair0_timestamp get_usrp_time(openair0_device *device);
+
+/*! \brief Set RX frequencies
+ * \param device the hardware to use
+ * \param openair0_cfg RF frontend parameters set by application
+ * \returns 0 in success
+ */
+int openair0_set_rx_frequencies(openair0_device *device, openair0_config_t *openair0_cfg);
/*@}*/
diff --git a/targets/ARCH/ETHERNET/USERSPACE/LIB/eth_raw.c b/targets/ARCH/ETHERNET/USERSPACE/LIB/eth_raw.c
index acb4c2ec9bf..2c8e55d14f0 100644
--- a/targets/ARCH/ETHERNET/USERSPACE/LIB/eth_raw.c
+++ b/targets/ARCH/ETHERNET/USERSPACE/LIB/eth_raw.c
@@ -138,7 +138,7 @@ int eth_socket_init_raw(openair0_device *device) {
return 0;
}
-
+/* 09/03/2019: fix obvious inconsistencies, but this code hasn't be tested for sure */
int trx_eth_write_raw(openair0_device *device, openair0_timestamp timestamp, void **buff, int nsamps,int cc, int flags) {
int bytes_sent=0;
@@ -148,7 +148,12 @@ int trx_eth_write_raw(openair0_device *device, openair0_timestamp timestamp, voi
//sendto_flag|=flags;
eth->tx_nsamps=nsamps;
-
+ int pktsize;
+ if (eth->compression == ALAW_COMPRESS) {
+ pktsize = RAW_PACKET_SIZE_BYTES_ALAW(nsamps);
+ } else {
+ pktsize = RAW_PACKET_SIZE_BYTES(nsamps);
+ }
for (i=0;i<cc;i++) {
/* buff[i] points to the position in tx buffer where the payload to be sent is
buff2 points to the position in tx buffer where the packet header will be placed */
@@ -162,44 +167,27 @@ int trx_eth_write_raw(openair0_device *device, openair0_timestamp timestamp, voi
bytes_sent = 0;
memcpy(buff2,(void*)ð->ehd,MAC_HEADER_SIZE_BYTES);
*(int16_t *)(buff2 + MAC_HEADER_SIZE_BYTES + sizeof(int16_t))=1+(i<<1);
- *(openair0_timestamp *)(buff2 + MAC_HEADER_SIZE_BYTES + sizeof(int32_t)) = timestamp;
-
- int sent_byte;
-
+ *(openair0_timestamp *)(buff2 + MAC_HEADER_SIZE_BYTES + sizeof(int32_t)) = timestamp;
/*printf("[RRU]write mod_%d %d , len %d, buff %p \n",
Mod_id,eth->sockfd[Mod_id],RAW_PACKET_SIZE_BYTES(nsamps), buff2);*/
- while(bytes_sent < sent_byte) {
-#if DEBUG
- printf("------- TX ------: buff2 current position=%d remaining_bytes=%d bytes_sent=%d \n",
- (void *)(buff2+bytes_sent),
- sent_byte - bytes_sent,
- bytes_sent);
-#endif
+ while(bytes_sent < pktsize) {
+
/* Send packet */
bytes_sent += send(eth->sockfdd,
buff2,
- sent_byte,
+ pktsize,
sendto_flag);
if ( bytes_sent == -1) {
eth->num_tx_errors++;
perror("ETHERNET WRITE: ");
exit(-1);
} else {
-#if DEBUG
- printf("------- TX ------: nu=%x an_id=%d ts%d bytes_sent=%d\n",
- *(uint8_t *)(buff2+ETH_ALEN),
- *(int16_t *)(buff2 + MAC_HEADER_SIZE_BYTES + sizeof(int16_t)),
- *(openair0_timestamp *)(buff2 + MAC_HEADER_SIZE_BYTES + sizeof(int32_t)),
- bytes_sent);
-
- dump_packet((device->host_type == RAU_HOST)? "RAU":"RRU", buff2, sent_byte, TX_FLAG);
-#endif
- eth->tx_actual_nsamps=bytes_sent>>2;
- eth->tx_count++;
+ eth->tx_actual_nsamps=bytes_sent>>2;
+ eth->tx_count++;
}
}
diff --git a/targets/RT/USER/lte-ru.c b/targets/RT/USER/lte-ru.c
index fd84c66c759..787e630d176 100644
--- a/targets/RT/USER/lte-ru.c
+++ b/targets/RT/USER/lte-ru.c
@@ -1381,12 +1381,11 @@ int setup_RU_buffers(RU_t *ru) {
else if (frame_parms->N_RB_DL == 50) ru->N_TA_offset = 624/2;
else if (frame_parms->N_RB_DL == 25) ru->N_TA_offset = 624/4;
- if(IS_SOFTMODEM_BASICSIM)
- /* this is required for the basic simulator in TDD mode
- * TODO: find a proper cleaner solution
- */
- ru->N_TA_offset = 0;
-
+ if(IS_SOFTMODEM_BASICSIM)
+ /* this is required for the basic simulator in TDD mode
+ * TODO: find a proper cleaner solution
+ */
+ ru->N_TA_offset = 0;
}
if (ru->openair0_cfg.mmapped_dma == 1) {
diff --git a/targets/RT/USER/lte-softmodem-common.c b/targets/RT/USER/lte-softmodem-common.c
index e121e31a398..242d0b76d70 100644
--- a/targets/RT/USER/lte-softmodem-common.c
+++ b/targets/RT/USER/lte-softmodem-common.c
@@ -99,9 +99,11 @@ void get_common_options(void) {
if (basicsim) {
set_softmodem_optmask(SOFTMODEM_BASICSIM_BIT);
}
+
#if BASIC_SIMULATOR
- set_softmodem_optmask(SOFTMODEM_BASICSIM_BIT);
+ set_softmodem_optmask(SOFTMODEM_BASICSIM_BIT);
#endif
+
if(parallel_config != NULL) set_parallel_conf(parallel_config);
if(worker_config != NULL) set_worker_conf(worker_config);
diff --git a/targets/RT/USER/lte-softmodem.c b/targets/RT/USER/lte-softmodem.c
index 0ee3d6dcf97..15553c0af37 100644
--- a/targets/RT/USER/lte-softmodem.c
+++ b/targets/RT/USER/lte-softmodem.c
@@ -655,10 +655,12 @@ int main( int argc, char **argv ) {
fill_modeled_runtime_table(runtime_phy_rx,runtime_phy_tx);
uint32_t pdcp_initmask = ( IS_SOFTMODEM_NOS1 )? ( PDCP_USE_NETLINK_BIT | LINK_ENB_PDCP_TO_IP_DRIVER_BIT) : LINK_ENB_PDCP_TO_GTPV1U_BIT;
#
+
if ( IS_SOFTMODEM_NOS1)
pdcp_initmask = pdcp_initmask | ENB_NAS_USE_TUN_BIT | SOFTMODEM_NOKRNMOD_BIT ;
+
pdcp_module_init(pdcp_initmask);
-
+
if (RC.nb_inst > 0) {
// don't create if node doesn't connect to RRC/S1/GTP
if (create_tasks(1) < 0) {
diff --git a/targets/RT/USER/lte-ue.c b/targets/RT/USER/lte-ue.c
index 853c98df3f5..bb2319774c5 100644
--- a/targets/RT/USER/lte-ue.c
+++ b/targets/RT/USER/lte-ue.c
@@ -80,12 +80,12 @@ void init_UE_threads_stub(int);
void init_UE_single_thread_stub(int);
void *UE_thread(void *arg);
void init_UE(int nb_inst,int eMBMS_active, int uecap_xer_in, int timing_correction, int phy_test, int UE_scan, int UE_scan_carrier, runmode_t mode,int rxgain,int txpowermax,LTE_DL_FRAME_PARMS *fp);
-void init_UE_stub(int nb_inst,int,int,char*);
-void init_UE_stub_single_thread(int nb_inst,int,int,char*);
+void init_UE_stub(int nb_inst,int,int,char *);
+void init_UE_stub_single_thread(int nb_inst,int,int,char *);
int init_timer_thread(void);
extern void oai_subframe_ind(uint16_t sfn, uint16_t sf);
extern void multicast_link_start(void (*rx_handlerP) (unsigned int, char *),
- unsigned char _multicast_group, char *multicast_ifname);
+ unsigned char _multicast_group, char *multicast_ifname);
extern int oai_nfapi_crc_indication(nfapi_crc_indication_t *crc_ind);
extern int oai_nfapi_crc_indication(nfapi_crc_indication_t *crc_ind);
extern int oai_nfapi_harq_indication(nfapi_harq_indication_t *harq_ind);
@@ -169,21 +169,18 @@ struct sched_param sched_param_UE_thread;
void get_uethreads_params(void) {
paramdef_t cmdline_threadsparams[] =CMDLINE_UETHREADSPARAMS_DESC;
-
-
config_process_cmdline( cmdline_threadsparams,sizeof(cmdline_threadsparams)/sizeof(paramdef_t),NULL);
}
void phy_init_lte_ue_transport(PHY_VARS_UE *ue,int absraction_flag);
-PHY_VARS_UE* init_ue_vars(LTE_DL_FRAME_PARMS *frame_parms,
- uint8_t UE_id,
- uint8_t abstraction_flag)
+PHY_VARS_UE *init_ue_vars(LTE_DL_FRAME_PARMS *frame_parms,
+ uint8_t UE_id,
+ uint8_t abstraction_flag)
{
-
- PHY_VARS_UE* ue = (PHY_VARS_UE *)malloc(sizeof(PHY_VARS_UE));
+ PHY_VARS_UE *ue = (PHY_VARS_UE *)malloc(sizeof(PHY_VARS_UE));
memset(ue,0,sizeof(PHY_VARS_UE));
if (frame_parms!=(LTE_DL_FRAME_PARMS *)NULL) { // if we want to give initial frame parms, allocate the PHY_VARS_UE structure and put them in
@@ -195,13 +192,12 @@ PHY_VARS_UE* init_ue_vars(LTE_DL_FRAME_PARMS *frame_parms,
ue->mac_enabled = 1;
// In phy_stub_UE (MAC-to-MAC) mode these init functions don't need to get called. Is this correct?
- if (nfapi_mode!=3)
- {
- // initialize all signal buffers
- init_lte_ue_signal(ue,1,abstraction_flag);
- // intialize transport
- init_lte_ue_transport(ue,abstraction_flag);
- }
+ if (nfapi_mode!=3) {
+ // initialize all signal buffers
+ init_lte_ue_signal(ue,1,abstraction_flag);
+ // intialize transport
+ init_lte_ue_transport(ue,abstraction_flag);
+ }
return(ue);
}
@@ -211,9 +207,9 @@ char uecap_xer[1024];
-void init_thread(int sched_runtime, int sched_deadline, int sched_fifo, cpu_set_t *cpuset, char * name) {
-
+void init_thread(int sched_runtime, int sched_deadline, int sched_fifo, cpu_set_t *cpuset, char *name) {
#ifdef DEADLINE_SCHEDULER
+
if (sched_runtime!=0) {
struct sched_attr attr= {0};
attr.size = sizeof(attr);
@@ -222,60 +218,64 @@ void init_thread(int sched_runtime, int sched_deadline, int sched_fifo, cpu_set_
attr.sched_deadline = sched_deadline;
attr.sched_period = 0;
AssertFatal(sched_setattr(0, &attr, 0) == 0,
- "[SCHED] %s thread: sched_setattr failed %s \n", name, strerror(errno));
+ "[SCHED] %s thread: sched_setattr failed %s \n", name, strerror(errno));
LOG_I(HW,"[SCHED][eNB] %s deadline thread %lu started on CPU %d\n",
- name, (unsigned long)gettid(), sched_getcpu());
+ name, (unsigned long)gettid(), sched_getcpu());
}
+
#else
+
if (CPU_COUNT(cpuset) > 0)
AssertFatal( 0 == pthread_setaffinity_np(pthread_self(), sizeof(cpu_set_t), cpuset), "");
+
struct sched_param sp;
sp.sched_priority = sched_fifo;
AssertFatal(pthread_setschedparam(pthread_self(),SCHED_FIFO,&sp)==0,
- "Can't set thread priority, Are you root?\n");
+ "Can't set thread priority, Are you root?\n");
/* Check the actual affinity mask assigned to the thread */
cpu_set_t *cset=CPU_ALLOC(CPU_SETSIZE);
+
if (0 == pthread_getaffinity_np(pthread_self(), CPU_ALLOC_SIZE(CPU_SETSIZE), cset)) {
- char txt[512]={0};
+ char txt[512]= {0};
+
for (int j = 0; j < CPU_SETSIZE; j++)
if (CPU_ISSET(j, cset))
- sprintf(txt+strlen(txt), " %d ", j);
+ sprintf(txt+strlen(txt), " %d ", j);
+
printf("CPU Affinity of thread %s is %s\n", name, txt);
}
+
CPU_FREE(cset);
#endif
-
}
void init_UE(int nb_inst,int eMBMS_active, int uecap_xer_in, int timing_correction, int phy_test, int UE_scan, int UE_scan_carrier, runmode_t mode,int rxgain,int txpowermax,LTE_DL_FRAME_PARMS *fp0) {
-
PHY_VARS_UE *UE;
int inst;
int ret;
LTE_DL_FRAME_PARMS *fp;
-
LOG_I(PHY,"UE : Calling Layer 2 for initialization\n");
-
l2_init_ue(eMBMS_active,(uecap_xer_in==1)?uecap_xer:NULL,
- 0,// cba_group_active
- 0); // HO flag
+ 0,// cba_group_active
+ 0); // HO flag
+
+ if (PHY_vars_UE_g==NULL) PHY_vars_UE_g = (PHY_VARS_UE ***)calloc(1+nb_inst,sizeof(PHY_VARS_UE **));
+
+ for (inst=0; inst<nb_inst; inst++) {
+ if (PHY_vars_UE_g[inst]==NULL) PHY_vars_UE_g[inst] = (PHY_VARS_UE **)calloc(1+MAX_NUM_CCs,sizeof(PHY_VARS_UE *));
- if (PHY_vars_UE_g==NULL) PHY_vars_UE_g = (PHY_VARS_UE***)calloc(1+nb_inst,sizeof(PHY_VARS_UE**));
-
- for (inst=0;inst<nb_inst;inst++) {
- if (PHY_vars_UE_g[inst]==NULL) PHY_vars_UE_g[inst] = (PHY_VARS_UE**)calloc(1+MAX_NUM_CCs,sizeof(PHY_VARS_UE*));
LOG_I(PHY,"Allocating UE context %d\n",inst);
if (simL1flag == 0) PHY_vars_UE_g[inst][0] = init_ue_vars(fp0,inst,0);
else {
// needed for memcopy below. these are not used in the RU, but needed for UE
- RC.ru[0]->frame_parms.nb_antennas_rx = fp0->nb_antennas_rx;
- RC.ru[0]->frame_parms.nb_antennas_tx = fp0->nb_antennas_tx;
- PHY_vars_UE_g[inst][0] = init_ue_vars(&RC.ru[0]->frame_parms,inst,0);
+ RC.ru[0]->frame_parms.nb_antennas_rx = fp0->nb_antennas_rx;
+ RC.ru[0]->frame_parms.nb_antennas_tx = fp0->nb_antennas_tx;
+ PHY_vars_UE_g[inst][0] = init_ue_vars(&RC.ru[0]->frame_parms,inst,0);
}
+
// turn off timing control loop in UE
PHY_vars_UE_g[inst][0]->no_timing_correction = timing_correction;
-
UE = PHY_vars_UE_g[inst][0];
fp = &UE->frame_parms;
printf("PHY_vars_UE_g[0][0] = %p\n",UE);
@@ -290,7 +290,6 @@ void init_UE(int nb_inst,int eMBMS_active, int uecap_xer_in, int timing_correcti
UE->pusch_config_dedicated[i].betaOffset_ACK_Index = 0;
UE->pusch_config_dedicated[i].betaOffset_RI_Index = 0;
UE->pusch_config_dedicated[i].betaOffset_CQI_Index = 2;
-
UE->scheduling_request_config[i].sr_PUCCH_ResourceIndex = 0;
UE->scheduling_request_config[i].sr_ConfigIndex = 7+(0%3);
UE->scheduling_request_config[i].dsr_TransMax = sr_n4;
@@ -305,69 +304,75 @@ void init_UE(int nb_inst,int eMBMS_active, int uecap_xer_in, int timing_correcti
if (UE->mac_enabled == 1) {
UE->pdcch_vars[0][0]->crnti = 0x1234;
UE->pdcch_vars[1][0]->crnti = 0x1234;
- }else {
+ } else {
UE->pdcch_vars[0][0]->crnti = 0x1235;
UE->pdcch_vars[1][0]->crnti = 0x1235;
}
+
UE->rx_total_gain_dB = rxgain;
UE->tx_power_max_dBm = txpowermax;
-
UE->frame_parms.nb_antennas_tx = fp0->nb_antennas_tx;
- UE->frame_parms.nb_antennas_rx = fp0->nb_antennas_rx;
+ UE->frame_parms.nb_antennas_rx = fp0->nb_antennas_rx;
if (fp->frame_type == TDD) {
switch (fp->N_RB_DL) {
+ case 100:
+ if (fp->threequarter_fs) UE->N_TA_offset = (624*3)/4;
+ else UE->N_TA_offset = 624;
- case 100:
- if (fp->threequarter_fs) UE->N_TA_offset = (624*3)/4;
- else UE->N_TA_offset = 624;
- break;
- case 75:
- UE->N_TA_offset = (624*3)/4;
- break;
- case 50:
- UE->N_TA_offset = 624/2;
- break;
- case 25:
- UE->N_TA_offset = 624/4;
- break;
- case 15:
- UE->N_TA_offset = 624/8;
- break;
- case 6:
- UE->N_TA_offset = 624/16;
- break;
- default:
- AssertFatal(1==0,"illegal N_RB_DL %d\n",fp->N_RB_DL);
- break;
+ break;
+
+ case 75:
+ UE->N_TA_offset = (624*3)/4;
+ break;
+
+ case 50:
+ UE->N_TA_offset = 624/2;
+ break;
+
+ case 25:
+ UE->N_TA_offset = 624/4;
+ break;
+
+ case 15:
+ UE->N_TA_offset = 624/8;
+ break;
+
+ case 6:
+ UE->N_TA_offset = 624/16;
+ break;
+
+ default:
+ AssertFatal(1==0,"illegal N_RB_DL %d\n",fp->N_RB_DL);
+ break;
}
- }
- else UE->N_TA_offset = 0;
+ } else UE->N_TA_offset = 0;
if( IS_SOFTMODEM_BASICSIM)
- /* this is required for the basic simulator in TDD mode
- * TODO: find a proper cleaner solution
- */
+ /* this is required for the basic simulator in TDD mode
+ * TODO: find a proper cleaner solution
+ */
UE->N_TA_offset = 0;
-
if (simL1flag == 1) init_ue_devices(UE);
+
LOG_I(PHY,"Intializing UE Threads for instance %d (%p,%p)...\n",inst,PHY_vars_UE_g[inst],PHY_vars_UE_g[inst][0]);
init_UE_threads(inst);
if (simL1flag == 0) {
ret = openair0_device_load(&(UE->rfdevice), &openair0_cfg[0]);
- if (ret !=0){
- exit_fun("Error loading device library");
+
+ if (ret !=0) {
+ exit_fun("Error loading device library");
}
}
+
UE->rfdevice.host_type = RAU_HOST;
// UE->rfdevice.type = NONE_DEV;
-
AssertFatal(0 == pthread_create(&UE->proc.pthread_ue,
&UE->proc.attr_ue,
UE_thread,
- (void*)UE), "");
+ (void *)UE), "");
}
printf("UE threads created by %ld\n", gettid());
@@ -376,31 +381,24 @@ void init_UE(int nb_inst,int eMBMS_active, int uecap_xer_in, int timing_correcti
// Initiating all UEs within a single set of threads for PHY_STUB. Future extensions -> multiple
// set of threads for multiple UEs.
void init_UE_stub_single_thread(int nb_inst,int eMBMS_active, int uecap_xer_in, char *emul_iface) {
-
int inst;
-
LOG_I(PHY,"UE : Calling Layer 2 for initialization, nb_inst: %d \n", nb_inst);
-
l2_init_ue(eMBMS_active,(uecap_xer_in==1)?uecap_xer:NULL,
- 0,// cba_group_active
- 0); // HO flag
-
- for (inst=0;inst<nb_inst;inst++) {
+ 0,// cba_group_active
+ 0); // HO flag
+ for (inst=0; inst<nb_inst; inst++) {
LOG_I(PHY,"Initializing memory for UE instance %d (%p)\n",inst,PHY_vars_UE_g[inst]);
// PHY_vars_UE_g[inst][0] = init_ue_vars(NULL,inst,0);
}
+
init_timer_thread();
init_UE_single_thread_stub(nb_inst);
-
-
printf("UE threads created \n");
-
LOG_I(PHY,"Starting multicast link on %s\n",emul_iface);
- if(nfapi_mode!=3)
- multicast_link_start(ue_stub_rx_handler,0,emul_iface);
-
+ if(nfapi_mode!=3)
+ multicast_link_start(ue_stub_rx_handler,0,emul_iface);
}
@@ -408,36 +406,29 @@ void init_UE_stub_single_thread(int nb_inst,int eMBMS_active, int uecap_xer_in,
void init_UE_stub(int nb_inst,int eMBMS_active, int uecap_xer_in, char *emul_iface) {
-
int inst;
-
LOG_I(PHY,"UE : Calling Layer 2 for initialization\n");
-
l2_init_ue(eMBMS_active,(uecap_xer_in==1)?uecap_xer:NULL,
- 0,// cba_group_active
- 0); // HO flag
-
- for (inst=0;inst<nb_inst;inst++) {
+ 0,// cba_group_active
+ 0); // HO flag
+ for (inst=0; inst<nb_inst; inst++) {
LOG_I(PHY,"Initializing memory for UE instance %d (%p)\n",inst,PHY_vars_UE_g[inst]);
PHY_vars_UE_g[inst][0] = init_ue_vars(NULL,inst,0);
}
- init_timer_thread();
- for (inst=0;inst<nb_inst;inst++) {
+ init_timer_thread();
+ for (inst=0; inst<nb_inst; inst++) {
LOG_I(PHY,"Intializing UE Threads for instance %d (%p,%p)...\n",inst,PHY_vars_UE_g[inst],PHY_vars_UE_g[inst][0]);
init_UE_threads_stub(inst);
}
printf("UE threads created \n");
-
LOG_I(PHY,"Starting multicast link on %s\n",emul_iface);
- if(nfapi_mode !=3)
- multicast_link_start(ue_stub_rx_handler,0,emul_iface);
-
-
+ if(nfapi_mode !=3)
+ multicast_link_start(ue_stub_rx_handler,0,emul_iface);
}
@@ -450,11 +441,10 @@ void init_UE_stub(int nb_inst,int eMBMS_active, int uecap_xer_in, char *emul_ifa
* \returns a pointer to an int. The storage is not on the heap and must not be freed.
*/
-static void *UE_thread_synch(void *arg)
-{
+static void *UE_thread_synch(void *arg) {
static int UE_thread_synch_retval;
int i ;
- PHY_VARS_UE *UE = (PHY_VARS_UE*) arg;
+ PHY_VARS_UE *UE = (PHY_VARS_UE *) arg;
int current_band = 0;
int current_offset = 0;
sync_mode_t sync_mode = pbch;
@@ -463,30 +453,28 @@ static void *UE_thread_synch(void *arg)
int found;
int freq_offset=0;
char threadname[128];
-
printf("UE_thread_sync in with PHY_vars_UE %p\n",arg);
-
cpu_set_t cpuset;
CPU_ZERO(&cpuset);
+
if ( threads.iq != -1 )
CPU_SET(threads.iq, &cpuset);
+
// this thread priority must be lower that the main acquisition thread
sprintf(threadname, "sync UE %d\n", UE->Mod_id);
init_thread(100000, 500000, FIFO_PRIORITY-1, &cpuset, threadname);
-
printf("starting UE synch thread (IC %d)\n",UE->proc.instance_cnt_synch);
ind = 0;
found = 0;
-
if (UE->UE_scan == 0) {
do {
current_band = eutra_bands[ind].band;
printf( "Scanning band %d, dl_min %"PRIu32", ul_min %"PRIu32"\n", current_band, eutra_bands[ind].dl_min,eutra_bands[ind].ul_min);
if ((eutra_bands[ind].dl_min <= UE->frame_parms.dl_CarrierFreq) && (eutra_bands[ind].dl_max >= UE->frame_parms.dl_CarrierFreq)) {
- for (i=0; i<4; i++)
- uplink_frequency_offset[CC_id][i] = eutra_bands[ind].ul_min - eutra_bands[ind].dl_min;
+ for (i=0; i<4; i++)
+ uplink_frequency_offset[CC_id][i] = eutra_bands[ind].ul_min - eutra_bands[ind].dl_min;
found = 1;
break;
@@ -501,229 +489,240 @@ static void *UE_thread_synch(void *arg)
return &UE_thread_synch_retval;
}
+ LOG_I( PHY, "[SCHED][UE] Check absolute frequency DL %"PRIu32", UL %"PRIu32" (oai_exit %d, rx_num_channels %d)\n", UE->frame_parms.dl_CarrierFreq, UE->frame_parms.ul_CarrierFreq,oai_exit,
+ openair0_cfg[0].rx_num_channels);
- LOG_I( PHY, "[SCHED][UE] Check absolute frequency DL %"PRIu32", UL %"PRIu32" (oai_exit %d, rx_num_channels %d)\n", UE->frame_parms.dl_CarrierFreq, UE->frame_parms.ul_CarrierFreq,oai_exit, openair0_cfg[0].rx_num_channels);
-
- for (i=0;i<openair0_cfg[UE->rf_map.card].rx_num_channels;i++) {
+ for (i=0; i<openair0_cfg[UE->rf_map.card].rx_num_channels; i++) {
openair0_cfg[UE->rf_map.card].rx_freq[UE->rf_map.chain+i] = UE->frame_parms.dl_CarrierFreq;
openair0_cfg[UE->rf_map.card].tx_freq[UE->rf_map.chain+i] = UE->frame_parms.ul_CarrierFreq;
openair0_cfg[UE->rf_map.card].autocal[UE->rf_map.chain+i] = 1;
+
if (uplink_frequency_offset[CC_id][i] != 0) //
- openair0_cfg[UE->rf_map.card].duplex_mode = duplex_mode_FDD;
+ openair0_cfg[UE->rf_map.card].duplex_mode = duplex_mode_FDD;
else //FDD
- openair0_cfg[UE->rf_map.card].duplex_mode = duplex_mode_TDD;
+ openair0_cfg[UE->rf_map.card].duplex_mode = duplex_mode_TDD;
}
sync_mode = pbch;
-
} else if (UE->UE_scan == 1) {
current_band=0;
for (i=0; i<openair0_cfg[UE->rf_map.card].rx_num_channels; i++) {
downlink_frequency[UE->rf_map.card][UE->rf_map.chain+i] = bands_to_scan.band_info[CC_id].dl_min;
uplink_frequency_offset[UE->rf_map.card][UE->rf_map.chain+i] =
- bands_to_scan.band_info[CC_id].ul_min-bands_to_scan.band_info[CC_id].dl_min;
+ bands_to_scan.band_info[CC_id].ul_min-bands_to_scan.band_info[CC_id].dl_min;
openair0_cfg[UE->rf_map.card].rx_freq[UE->rf_map.chain+i] = downlink_frequency[CC_id][i];
openair0_cfg[UE->rf_map.card].tx_freq[UE->rf_map.chain+i] =
- downlink_frequency[CC_id][i]+uplink_frequency_offset[CC_id][i];
+ downlink_frequency[CC_id][i]+uplink_frequency_offset[CC_id][i];
openair0_cfg[UE->rf_map.card].rx_gain[UE->rf_map.chain+i] = UE->rx_total_gain_dB;
}
}
-/*
- while (sync_var<0)
- pthread_cond_wait(&sync_cond, &sync_mutex);
- pthread_mutex_unlock(&sync_mutex);
-*/
+ /*
+ while (sync_var<0)
+ pthread_cond_wait(&sync_cond, &sync_mutex);
+ pthread_mutex_unlock(&sync_mutex);
+ */
wait_sync("UE_thread_sync");
-
printf("Started device, unlocked sync_mutex (UE_sync_thread)\n");
while (oai_exit==0) {
AssertFatal ( 0== pthread_mutex_lock(&UE->proc.mutex_synch), "");
+
while (UE->proc.instance_cnt_synch < 0)
// the thread waits here most of the time
pthread_cond_wait( &UE->proc.cond_synch, &UE->proc.mutex_synch );
+
AssertFatal ( 0== pthread_mutex_unlock(&UE->proc.mutex_synch), "");
switch (sync_mode) {
- case pss:
- LOG_I(PHY,"[SCHED][UE] Scanning band %d (%d), freq %u\n",bands_to_scan.band_info[current_band].band, current_band,bands_to_scan.band_info[current_band].dl_min+current_offset);
- lte_sync_timefreq(UE,current_band,bands_to_scan.band_info[current_band].dl_min+current_offset);
- current_offset += 20000000; // increase by 20 MHz
-
- if (current_offset > bands_to_scan.band_info[current_band].dl_max-bands_to_scan.band_info[current_band].dl_min) {
- current_band++;
- current_offset=0;
- }
+ case pss:
+ LOG_I(PHY,"[SCHED][UE] Scanning band %d (%d), freq %u\n",bands_to_scan.band_info[current_band].band, current_band,bands_to_scan.band_info[current_band].dl_min+current_offset);
+ lte_sync_timefreq(UE,current_band,bands_to_scan.band_info[current_band].dl_min+current_offset);
+ current_offset += 20000000; // increase by 20 MHz
+
+ if (current_offset > bands_to_scan.band_info[current_band].dl_max-bands_to_scan.band_info[current_band].dl_min) {
+ current_band++;
+ current_offset=0;
+ }
- if (current_band==bands_to_scan.nbands) {
- current_band=0;
- oai_exit=1;
- }
+ if (current_band==bands_to_scan.nbands) {
+ current_band=0;
+ oai_exit=1;
+ }
- for (i=0; i<openair0_cfg[UE->rf_map.card].rx_num_channels; i++) {
- downlink_frequency[UE->rf_map.card][UE->rf_map.chain+i] = bands_to_scan.band_info[current_band].dl_min+current_offset;
- uplink_frequency_offset[UE->rf_map.card][UE->rf_map.chain+i] = bands_to_scan.band_info[current_band].ul_min-bands_to_scan.band_info[0].dl_min + current_offset;
+ for (i=0; i<openair0_cfg[UE->rf_map.card].rx_num_channels; i++) {
+ downlink_frequency[UE->rf_map.card][UE->rf_map.chain+i] = bands_to_scan.band_info[current_band].dl_min+current_offset;
+ uplink_frequency_offset[UE->rf_map.card][UE->rf_map.chain+i] = bands_to_scan.band_info[current_band].ul_min-bands_to_scan.band_info[0].dl_min + current_offset;
+ openair0_cfg[UE->rf_map.card].rx_freq[UE->rf_map.chain+i] = downlink_frequency[CC_id][i];
+ openair0_cfg[UE->rf_map.card].tx_freq[UE->rf_map.chain+i] = downlink_frequency[CC_id][i]+uplink_frequency_offset[CC_id][i];
+ openair0_cfg[UE->rf_map.card].rx_gain[UE->rf_map.chain+i] = UE->rx_total_gain_dB;
- openair0_cfg[UE->rf_map.card].rx_freq[UE->rf_map.chain+i] = downlink_frequency[CC_id][i];
- openair0_cfg[UE->rf_map.card].tx_freq[UE->rf_map.chain+i] = downlink_frequency[CC_id][i]+uplink_frequency_offset[CC_id][i];
- openair0_cfg[UE->rf_map.card].rx_gain[UE->rf_map.chain+i] = UE->rx_total_gain_dB;
- if (UE->UE_scan_carrier) {
- openair0_cfg[UE->rf_map.card].autocal[UE->rf_map.chain+i] = 1;
- }
- }
+ if (UE->UE_scan_carrier) {
+ openair0_cfg[UE->rf_map.card].autocal[UE->rf_map.chain+i] = 1;
+ }
+ }
- break;
+ break;
- case pbch:
-
- LOG_I(PHY, "[UE thread Synch] Running Initial Synch (mode %d)\n",UE->mode);
- if (initial_sync( UE, UE->mode ) == 0) {
-
- LOG_I( HW, "Got synch: hw_slot_offset %d, carrier off %d Hz, rxgain %d (DL %u, UL %u), UE_scan_carrier %d\n",
- (UE->rx_offset<<1) / UE->frame_parms.samples_per_tti,
- freq_offset,
- UE->rx_total_gain_dB,
- downlink_frequency[0][0]+freq_offset,
- downlink_frequency[0][0]+uplink_frequency_offset[0][0]+freq_offset,
- UE->UE_scan_carrier );
-
-
- // rerun with new cell parameters and frequency-offset
- for (i=0; i<openair0_cfg[UE->rf_map.card].rx_num_channels; i++) {
- openair0_cfg[UE->rf_map.card].rx_gain[UE->rf_map.chain+i] = UE->rx_total_gain_dB;//-USRP_GAIN_OFFSET;
- if (UE->UE_scan_carrier == 1) {
- if (freq_offset >= 0)
- openair0_cfg[UE->rf_map.card].rx_freq[UE->rf_map.chain+i] += abs(UE->common_vars.freq_offset);
- else
- openair0_cfg[UE->rf_map.card].rx_freq[UE->rf_map.chain+i] -= abs(UE->common_vars.freq_offset);
- openair0_cfg[UE->rf_map.card].tx_freq[UE->rf_map.chain+i] =
- openair0_cfg[UE->rf_map.card].rx_freq[UE->rf_map.chain+i]+uplink_frequency_offset[CC_id][i];
- downlink_frequency[CC_id][i] = openair0_cfg[CC_id].rx_freq[i];
- freq_offset=0;
- }
- }
-
- // reconfigure for potentially different bandwidth
- switch(UE->frame_parms.N_RB_DL) {
- case 6:
- openair0_cfg[UE->rf_map.card].sample_rate =1.92e6;
- openair0_cfg[UE->rf_map.card].rx_bw =.96e6;
- openair0_cfg[UE->rf_map.card].tx_bw =.96e6;
- // openair0_cfg[0].rx_gain[0] -= 12;
- break;
- case 25:
- openair0_cfg[UE->rf_map.card].sample_rate =7.68e6;
- openair0_cfg[UE->rf_map.card].rx_bw =2.5e6;
- openair0_cfg[UE->rf_map.card].tx_bw =2.5e6;
- // openair0_cfg[0].rx_gain[0] -= 6;
- break;
- case 50:
- openair0_cfg[UE->rf_map.card].sample_rate =15.36e6;
- openair0_cfg[UE->rf_map.card].rx_bw =5.0e6;
- openair0_cfg[UE->rf_map.card].tx_bw =5.0e6;
- // openair0_cfg[0].rx_gain[0] -= 3;
- break;
- case 100:
- openair0_cfg[UE->rf_map.card].sample_rate=30.72e6;
- openair0_cfg[UE->rf_map.card].rx_bw=10.0e6;
- openair0_cfg[UE->rf_map.card].tx_bw=10.0e6;
- // openair0_cfg[0].rx_gain[0] -= 0;
- break;
- }
-
- UE->rfdevice.trx_set_freq_func(&UE->rfdevice,&openair0_cfg[0],0);
- //UE->rfdevice.trx_set_gains_func(&openair0,&openair0_cfg[0]);
- //UE->rfdevice.trx_stop_func(&UE->rfdevice);
- sleep(1);
- init_frame_parms(&UE->frame_parms,1);
- /*if (UE->rfdevice.trx_start_func(&UE->rfdevice) != 0 ) {
- LOG_E(HW,"Could not start the device\n");
- oai_exit=1;
- }*/
-
- if (UE->UE_scan_carrier == 1) {
-
- UE->UE_scan_carrier = 0;
- } else {
- AssertFatal ( 0== pthread_mutex_lock(&UE->proc.mutex_synch), "");
- UE->is_synchronized = 1;
- AssertFatal ( 0== pthread_mutex_unlock(&UE->proc.mutex_synch), "");
-
- if( UE->mode == rx_dump_frame ) {
- FILE *fd;
- if ((UE->proc.proc_rxtx[0].frame_rx&1) == 0) { // this guarantees SIB1 is present
- if ((fd = fopen("rxsig_frame0.dat","w")) != NULL) {
- fwrite((void*)&UE->common_vars.rxdata[0][0],
- sizeof(int32_t),
- 10*UE->frame_parms.samples_per_tti,
- fd);
- LOG_I(PHY,"Dummping Frame ... bye bye \n");
- fclose(fd);
- exit(0);
- } else {
- LOG_E(PHY,"Cannot open file for writing\n");
- exit(0);
- }
- } else {
- AssertFatal ( 0== pthread_mutex_lock(&UE->proc.mutex_synch), "");
- UE->is_synchronized = 0;
- AssertFatal ( 0== pthread_mutex_unlock(&UE->proc.mutex_synch), "");
-
- }
- }
- }
- } else {
- // initial sync failed
- // calculate new offset and try again
- if (UE->UE_scan_carrier == 1) {
- if (freq_offset >= 0)
- freq_offset += 100;
- freq_offset *= -1;
-
- if (abs(freq_offset) > 7500) {
- LOG_I( PHY, "[initial_sync] No cell synchronization found, abandoning\n" );
- FILE *fd;
- if ((fd = fopen("rxsig_frame0.dat","w"))!=NULL) {
- fwrite((void*)&UE->common_vars.rxdata[0][0],
- sizeof(int32_t),
- 10*UE->frame_parms.samples_per_tti,
- fd);
- LOG_I(PHY,"Dummping Frame ... bye bye \n");
- fclose(fd);
- exit(0);
- }
- AssertFatal(1==0,"No cell synchronization found, abandoning");
- return &UE_thread_synch_retval; // not reached
- }
- }
- LOG_I(PHY, "[initial_sync] trying carrier off %d Hz, rxgain %d (DL %u, UL %u)\n",
- freq_offset,
- UE->rx_total_gain_dB,
- downlink_frequency[0][0]+freq_offset,
- downlink_frequency[0][0]+uplink_frequency_offset[0][0]+freq_offset );
-
- for (i=0; i<openair0_cfg[UE->rf_map.card].rx_num_channels; i++) {
- openair0_cfg[UE->rf_map.card].rx_freq[UE->rf_map.chain+i] = downlink_frequency[CC_id][i]+freq_offset;
- openair0_cfg[UE->rf_map.card].tx_freq[UE->rf_map.chain+i] = downlink_frequency[CC_id][i]+uplink_frequency_offset[CC_id][i]+freq_offset;
- openair0_cfg[UE->rf_map.card].rx_gain[UE->rf_map.chain+i] = UE->rx_total_gain_dB;//-USRP_GAIN_OFFSET;
- if (UE->UE_scan_carrier==1)
- openair0_cfg[UE->rf_map.card].autocal[UE->rf_map.chain+i] = 1;
- }
- UE->rfdevice.trx_set_freq_func(&UE->rfdevice,&openair0_cfg[0],0);
- }// initial_sync=0
- break;
- case si:
- default:
- break;
+ case pbch:
+ LOG_I(PHY, "[UE thread Synch] Running Initial Synch (mode %d)\n",UE->mode);
+
+ if (initial_sync( UE, UE->mode ) == 0) {
+ LOG_I( HW, "Got synch: hw_slot_offset %d, carrier off %d Hz, rxgain %d (DL %u, UL %u), UE_scan_carrier %d\n",
+ (UE->rx_offset<<1) / UE->frame_parms.samples_per_tti,
+ freq_offset,
+ UE->rx_total_gain_dB,
+ downlink_frequency[0][0]+freq_offset,
+ downlink_frequency[0][0]+uplink_frequency_offset[0][0]+freq_offset,
+ UE->UE_scan_carrier );
+
+ // rerun with new cell parameters and frequency-offset
+ for (i=0; i<openair0_cfg[UE->rf_map.card].rx_num_channels; i++) {
+ openair0_cfg[UE->rf_map.card].rx_gain[UE->rf_map.chain+i] = UE->rx_total_gain_dB;//-USRP_GAIN_OFFSET;
+
+ if (UE->UE_scan_carrier == 1) {
+ if (freq_offset >= 0)
+ openair0_cfg[UE->rf_map.card].rx_freq[UE->rf_map.chain+i] += abs(UE->common_vars.freq_offset);
+ else
+ openair0_cfg[UE->rf_map.card].rx_freq[UE->rf_map.chain+i] -= abs(UE->common_vars.freq_offset);
+
+ openair0_cfg[UE->rf_map.card].tx_freq[UE->rf_map.chain+i] =
+ openair0_cfg[UE->rf_map.card].rx_freq[UE->rf_map.chain+i]+uplink_frequency_offset[CC_id][i];
+ downlink_frequency[CC_id][i] = openair0_cfg[CC_id].rx_freq[i];
+ freq_offset=0;
+ }
+ }
+
+ // reconfigure for potentially different bandwidth
+ switch(UE->frame_parms.N_RB_DL) {
+ case 6:
+ openair0_cfg[UE->rf_map.card].sample_rate =1.92e6;
+ openair0_cfg[UE->rf_map.card].rx_bw =.96e6;
+ openair0_cfg[UE->rf_map.card].tx_bw =.96e6;
+ // openair0_cfg[0].rx_gain[0] -= 12;
+ break;
+
+ case 25:
+ openair0_cfg[UE->rf_map.card].sample_rate =7.68e6;
+ openair0_cfg[UE->rf_map.card].rx_bw =2.5e6;
+ openair0_cfg[UE->rf_map.card].tx_bw =2.5e6;
+ // openair0_cfg[0].rx_gain[0] -= 6;
+ break;
+
+ case 50:
+ openair0_cfg[UE->rf_map.card].sample_rate =15.36e6;
+ openair0_cfg[UE->rf_map.card].rx_bw =5.0e6;
+ openair0_cfg[UE->rf_map.card].tx_bw =5.0e6;
+ // openair0_cfg[0].rx_gain[0] -= 3;
+ break;
+
+ case 100:
+ openair0_cfg[UE->rf_map.card].sample_rate=30.72e6;
+ openair0_cfg[UE->rf_map.card].rx_bw=10.0e6;
+ openair0_cfg[UE->rf_map.card].tx_bw=10.0e6;
+ // openair0_cfg[0].rx_gain[0] -= 0;
+ break;
+ }
+
+ UE->rfdevice.trx_set_freq_func(&UE->rfdevice,&openair0_cfg[0],0);
+ //UE->rfdevice.trx_set_gains_func(&openair0,&openair0_cfg[0]);
+ //UE->rfdevice.trx_stop_func(&UE->rfdevice);
+ sleep(1);
+ init_frame_parms(&UE->frame_parms,1);
+
+ /*if (UE->rfdevice.trx_start_func(&UE->rfdevice) != 0 ) {
+ LOG_E(HW,"Could not start the device\n");
+ oai_exit=1;
+ }*/
+
+ if (UE->UE_scan_carrier == 1) {
+ UE->UE_scan_carrier = 0;
+ } else {
+ AssertFatal ( 0== pthread_mutex_lock(&UE->proc.mutex_synch), "");
+ UE->is_synchronized = 1;
+ AssertFatal ( 0== pthread_mutex_unlock(&UE->proc.mutex_synch), "");
+
+ if( UE->mode == rx_dump_frame ) {
+ FILE *fd;
+
+ if ((UE->proc.proc_rxtx[0].frame_rx&1) == 0) { // this guarantees SIB1 is present
+ if ((fd = fopen("rxsig_frame0.dat","w")) != NULL) {
+ fwrite((void *)&UE->common_vars.rxdata[0][0],
+ sizeof(int32_t),
+ 10*UE->frame_parms.samples_per_tti,
+ fd);
+ LOG_I(PHY,"Dummping Frame ... bye bye \n");
+ fclose(fd);
+ exit(0);
+ } else {
+ LOG_E(PHY,"Cannot open file for writing\n");
+ exit(0);
+ }
+ } else {
+ AssertFatal ( 0== pthread_mutex_lock(&UE->proc.mutex_synch), "");
+ UE->is_synchronized = 0;
+ AssertFatal ( 0== pthread_mutex_unlock(&UE->proc.mutex_synch), "");
+ }
+ }
+ }
+ } else {
+ // initial sync failed
+ // calculate new offset and try again
+ if (UE->UE_scan_carrier == 1) {
+ if (freq_offset >= 0)
+ freq_offset += 100;
+
+ freq_offset *= -1;
+
+ if (abs(freq_offset) > 7500) {
+ LOG_I( PHY, "[initial_sync] No cell synchronization found, abandoning\n" );
+ FILE *fd;
+
+ if ((fd = fopen("rxsig_frame0.dat","w"))!=NULL) {
+ fwrite((void *)&UE->common_vars.rxdata[0][0],
+ sizeof(int32_t),
+ 10*UE->frame_parms.samples_per_tti,
+ fd);
+ LOG_I(PHY,"Dummping Frame ... bye bye \n");
+ fclose(fd);
+ exit(0);
+ }
+
+ AssertFatal(1==0,"No cell synchronization found, abandoning");
+ return &UE_thread_synch_retval; // not reached
+ }
+ }
+
+ LOG_I(PHY, "[initial_sync] trying carrier off %d Hz, rxgain %d (DL %u, UL %u)\n",
+ freq_offset,
+ UE->rx_total_gain_dB,
+ downlink_frequency[0][0]+freq_offset,
+ downlink_frequency[0][0]+uplink_frequency_offset[0][0]+freq_offset );
+
+ for (i=0; i<openair0_cfg[UE->rf_map.card].rx_num_channels; i++) {
+ openair0_cfg[UE->rf_map.card].rx_freq[UE->rf_map.chain+i] = downlink_frequency[CC_id][i]+freq_offset;
+ openair0_cfg[UE->rf_map.card].tx_freq[UE->rf_map.chain+i] = downlink_frequency[CC_id][i]+uplink_frequency_offset[CC_id][i]+freq_offset;
+ openair0_cfg[UE->rf_map.card].rx_gain[UE->rf_map.chain+i] = UE->rx_total_gain_dB;//-USRP_GAIN_OFFSET;
+
+ if (UE->UE_scan_carrier==1)
+ openair0_cfg[UE->rf_map.card].autocal[UE->rf_map.chain+i] = 1;
+ }
+
+ UE->rfdevice.trx_set_freq_func(&UE->rfdevice,&openair0_cfg[0],0);
+ }// initial_sync=0
+
+ break;
+
+ case si:
+ default:
+ break;
}
AssertFatal ( 0== pthread_mutex_lock(&UE->proc.mutex_synch), "");
// indicate readiness
UE->proc.instance_cnt_synch--;
AssertFatal ( 0== pthread_mutex_unlock(&UE->proc.mutex_synch), "");
-
VCD_SIGNAL_DUMPER_DUMP_FUNCTION_BY_NAME( VCD_SIGNAL_DUMPER_FUNCTIONS_UE_THREAD_SYNCH, 0 );
} // while !oai_exit
@@ -737,15 +736,18 @@ static void *UE_thread_synch(void *arg)
* \param arg is a pointer to a \ref PHY_VARS_UE structure.
* \returns a pointer to an int. The storage is not on the heap and must not be freed.
*/
-const char * get_connectionloss_errstr(int errcode) {
- switch (errcode) {
- case CONNECTION_LOST:
- return "RRC Connection lost, returning to PRACH";
- case PHY_RESYNCH:
- return "RRC Connection lost, trying to resynch";
- case RESYNCH:
- return "return to PRACH and perform a contention-free access";
- };
+const char *get_connectionloss_errstr(int errcode) {
+ switch (errcode) {
+ case CONNECTION_LOST:
+ return "RRC Connection lost, returning to PRACH";
+
+ case PHY_RESYNCH:
+ return "RRC Connection lost, trying to resynch";
+
+ case RESYNCH:
+ return "return to PRACH and perform a contention-free access";
+ };
+
return "UNKNOWN RETURN CODE";
}
@@ -754,9 +756,7 @@ static void *UE_thread_rxn_txnp4(void *arg) {
struct rx_tx_thread_data *rtd = arg;
UE_rxtx_proc_t *proc = rtd->proc;
PHY_VARS_UE *UE = rtd->UE;
-
proc->subframe_rx=proc->sub_frame_start;
-
char threadname[256];
sprintf(threadname,"UE_%d_proc_%d", UE->Mod_id, proc->sub_frame_start);
cpu_set_t cpuset;
@@ -764,51 +764,56 @@ static void *UE_thread_rxn_txnp4(void *arg) {
if ( (proc->sub_frame_start+1)%RX_NB_TH == 0 && threads.one != -1 )
CPU_SET(threads.one, &cpuset);
+
if ( (proc->sub_frame_start+1)%RX_NB_TH == 1 && threads.two != -1 )
CPU_SET(threads.two, &cpuset);
+
if ( (proc->sub_frame_start+1)%RX_NB_TH == 2 && threads.three != -1 )
CPU_SET(threads.three, &cpuset);
+
//CPU_SET(threads.three, &cpuset);
- init_thread(900000,1000000 , FIFO_PRIORITY-1, &cpuset,
- threadname);
+ init_thread(900000,1000000, FIFO_PRIORITY-1, &cpuset,
+ threadname);
while (!oai_exit) {
if (pthread_mutex_lock(&proc->mutex_rxtx) != 0) {
LOG_E( PHY, "[SCHED][UE] error locking mutex for UE RXTX\n" );
exit_fun("nothing to add");
}
+
while (proc->instance_cnt_rxtx < 0) {
// most of the time, the thread is waiting here
pthread_cond_wait( &proc->cond_rxtx, &proc->mutex_rxtx );
}
+
//printf("Processing sub frqme %d in %s\n", proc->subframe_rx, threadname);
initRefTimes(t2);
initRefTimes(t3);
pickTime(current);
updateTimes(proc->gotIQs, &t2, 10000, "Delay to wake up UE_Thread_Rx (case 2)");
-
// Process Rx data for one sub-frame
lte_subframe_t sf_type = subframe_select( &UE->frame_parms, proc->subframe_rx);
- if ((sf_type == SF_DL) ||
- (UE->frame_parms.frame_type == FDD) ||
- (sf_type == SF_S)) {
+ if ((sf_type == SF_DL) ||
+ (UE->frame_parms.frame_type == FDD) ||
+ (sf_type == SF_S)) {
if (UE->frame_parms.frame_type == TDD) {
- LOG_D(PHY, "%s,TDD%d,%s: calling UE_RX\n",
- threadname,
- UE->frame_parms.tdd_config,
- (sf_type==SF_DL? "SF_DL" :
- (sf_type==SF_UL? "SF_UL" :
- (sf_type==SF_S ? "SF_S" : "UNKNOWN_SF_TYPE"))));
+ LOG_D(PHY, "%s,TDD%d,%s: calling UE_RX\n",
+ threadname,
+ UE->frame_parms.tdd_config,
+ (sf_type==SF_DL? "SF_DL" :
+ (sf_type==SF_UL? "SF_UL" :
+ (sf_type==SF_S ? "SF_S" : "UNKNOWN_SF_TYPE"))));
} else {
- LOG_D(PHY, "%s,%s,%s: calling UE_RX\n",
- threadname,
- (UE->frame_parms.frame_type==FDD? "FDD":
- (UE->frame_parms.frame_type==TDD? "TDD":"UNKNOWN_DUPLEX_MODE")),
- (sf_type==SF_DL? "SF_DL" :
- (sf_type==SF_UL? "SF_UL" :
- (sf_type==SF_S ? "SF_S" : "UNKNOWN_SF_TYPE"))));
+ LOG_D(PHY, "%s,%s,%s: calling UE_RX\n",
+ threadname,
+ (UE->frame_parms.frame_type==FDD? "FDD":
+ (UE->frame_parms.frame_type==TDD? "TDD":"UNKNOWN_DUPLEX_MODE")),
+ (sf_type==SF_DL? "SF_DL" :
+ (sf_type==SF_UL? "SF_UL" :
+ (sf_type==SF_S ? "SF_S" : "UNKNOWN_SF_TYPE"))));
}
+
#ifdef UE_SLOT_PARALLELISATION
phy_procedures_slot_parallelization_UE_RX( UE, proc, 0, 0, 1, UE->mode, no_relay, NULL );
#else
@@ -819,45 +824,46 @@ static void *UE_thread_rxn_txnp4(void *arg) {
#if UE_TIMING_TRACE
start_meas(&UE->generic_stat);
#endif
- if (UE->mac_enabled==1) {
+ if (UE->mac_enabled==1) {
int ret = ue_scheduler(UE->Mod_id,
- proc->frame_rx,
- proc->subframe_rx,
- proc->frame_tx,
- proc->subframe_tx,
- subframe_select(&UE->frame_parms,proc->subframe_tx),
- 0,
- 0/*FIXME CC_id*/);
+ proc->frame_rx,
+ proc->subframe_rx,
+ proc->frame_tx,
+ proc->subframe_tx,
+ subframe_select(&UE->frame_parms,proc->subframe_tx),
+ 0,
+ 0/*FIXME CC_id*/);
+
if ( ret != CONNECTION_OK) {
- LOG_E( PHY, "[UE %"PRIu8"] Frame %"PRIu32", subframe %u %s\n",
- UE->Mod_id, proc->frame_rx, proc->subframe_tx,get_connectionloss_errstr(ret) );
+ LOG_E( PHY, "[UE %"PRIu8"] Frame %"PRIu32", subframe %u %s\n",
+ UE->Mod_id, proc->frame_rx, proc->subframe_tx,get_connectionloss_errstr(ret) );
}
}
+
#if UE_TIMING_TRACE
stop_meas(&UE->generic_stat);
#endif
-
// Prepare the future Tx data
if ((subframe_select( &UE->frame_parms, proc->subframe_tx) == SF_UL) ||
- (UE->frame_parms.frame_type == FDD) )
+ (UE->frame_parms.frame_type == FDD) )
if (UE->mode != loop_through_memory)
- phy_procedures_UE_TX(UE,proc,0,0,UE->mode);
-
-
+ phy_procedures_UE_TX(UE,proc,0,0,UE->mode);
if ((subframe_select( &UE->frame_parms, proc->subframe_tx) == SF_S) &&
- (UE->frame_parms.frame_type == TDD))
+ (UE->frame_parms.frame_type == TDD))
if (UE->mode != loop_through_memory)
- phy_procedures_UE_S_TX(UE,0,0);
- updateTimes(current, &t3, 10000, "Delay to process sub-frame (case 3)");
+ phy_procedures_UE_S_TX(UE,0,0);
+ updateTimes(current, &t3, 10000, "Delay to process sub-frame (case 3)");
proc->instance_cnt_rxtx--;
+
if ( IS_SOFTMODEM_BASICSIM || IS_SOFTMODEM_RFSIM ) {
- if (pthread_cond_signal(&proc->cond_rxtx) != 0) abort();
+ if (pthread_cond_signal(&proc->cond_rxtx) != 0) abort();
}
+
if (pthread_mutex_unlock(&proc->mutex_rxtx) != 0) {
LOG_E( PHY, "[SCHED][UE] error unlocking mutex for UE RXTX\n" );
exit_fun("noting to add");
@@ -874,61 +880,57 @@ static void *UE_thread_rxn_txnp4(void *arg) {
unsigned int emulator_absSF;
void ue_stub_rx_handler(unsigned int num_bytes, char *rx_buffer) {
-
PHY_VARS_UE *UE;
UE = PHY_vars_UE_g[0][0];
+ UE_tport_t *pdu = (UE_tport_t *)rx_buffer;
+ SLSCH_t *slsch = (SLSCH_t *)&pdu->slsch;
+ SLDCH_t *sldch = (SLDCH_t *)&pdu->sldch;
+
+ switch (((UE_tport_header_t *)rx_buffer)->packet_type) {
+ case TTI_SYNC:
+ emulator_absSF = ((UE_tport_header_t *)rx_buffer)->absSF;
+ wakeup_thread(&UE->timer_mutex,&UE->timer_cond,&UE->instance_cnt_timer,"timer_thread");
+ break;
- UE_tport_t *pdu = (UE_tport_t*)rx_buffer;
- SLSCH_t *slsch = (SLSCH_t*)&pdu->slsch;
- SLDCH_t *sldch = (SLDCH_t*)&pdu->sldch;
-
- switch (((UE_tport_header_t*)rx_buffer)->packet_type) {
- case TTI_SYNC:
- emulator_absSF = ((UE_tport_header_t*)rx_buffer)->absSF;
- wakeup_thread(&UE->timer_mutex,&UE->timer_cond,&UE->instance_cnt_timer,"timer_thread");
- break;
- case SLSCH:
-
-
- LOG_I(PHY,"Emulator SFN.SF %d.%d, Got SLSCH packet\n",emulator_absSF/10,emulator_absSF%10);
- LOG_I(PHY,"Received %d bytes on UE-UE link for SFN.SF %d.%d, sending SLSCH payload (%d bytes) to MAC\n",num_bytes,
- pdu->header.absSF/10,pdu->header.absSF%10,
- slsch->payload_length);
- printf("SLSCH:");
- for (int i=0;i<sizeof(SLSCH_t);i++) printf("%x ",((uint8_t*)slsch)[i]);
- printf("\n");
-
- ue_send_sl_sdu(0,
- 0,
- pdu->header.absSF/10,
- pdu->header.absSF%10,
- pdu->payload,
- slsch->payload_length,
- 0,
- SL_DISCOVERY_FLAG_NO);
- break;
-
- case SLDCH:
-
-
- LOG_I(PHY,"Emulator SFN.SF %d.%d, Got SLDCH packet\n",emulator_absSF/10,emulator_absSF%10);
- LOG_I(PHY,"Received %d bytes on UE-UE link for SFN.SF %d.%d, sending SLDCH payload (%d bytes) to MAC\n",num_bytes,
- pdu->header.absSF/10,pdu->header.absSF%10,
- sldch->payload_length);
- printf("SLDCH:");
- for (int i=0;i<sizeof(SLDCH_t);i++) printf("%x ",((uint8_t*)sldch)[i]);
- printf("\n");
-
- ue_send_sl_sdu(0,
- 0,
- pdu->header.absSF/10,
- pdu->header.absSF%10,
- sldch->payload,
- sldch->payload_length,
- 0,
- SL_DISCOVERY_FLAG_YES);
- break;
+ case SLSCH:
+ LOG_I(PHY,"Emulator SFN.SF %d.%d, Got SLSCH packet\n",emulator_absSF/10,emulator_absSF%10);
+ LOG_I(PHY,"Received %d bytes on UE-UE link for SFN.SF %d.%d, sending SLSCH payload (%d bytes) to MAC\n",num_bytes,
+ pdu->header.absSF/10,pdu->header.absSF%10,
+ slsch->payload_length);
+ printf("SLSCH:");
+
+ for (int i=0; i<sizeof(SLSCH_t); i++) printf("%x ",((uint8_t *)slsch)[i]);
+
+ printf("\n");
+ ue_send_sl_sdu(0,
+ 0,
+ pdu->header.absSF/10,
+ pdu->header.absSF%10,
+ pdu->payload,
+ slsch->payload_length,
+ 0,
+ SL_DISCOVERY_FLAG_NO);
+ break;
+ case SLDCH:
+ LOG_I(PHY,"Emulator SFN.SF %d.%d, Got SLDCH packet\n",emulator_absSF/10,emulator_absSF%10);
+ LOG_I(PHY,"Received %d bytes on UE-UE link for SFN.SF %d.%d, sending SLDCH payload (%d bytes) to MAC\n",num_bytes,
+ pdu->header.absSF/10,pdu->header.absSF%10,
+ sldch->payload_length);
+ printf("SLDCH:");
+
+ for (int i=0; i<sizeof(SLDCH_t); i++) printf("%x ",((uint8_t *)sldch)[i]);
+
+ printf("\n");
+ ue_send_sl_sdu(0,
+ 0,
+ pdu->header.absSF/10,
+ pdu->header.absSF%10,
+ sldch->payload,
+ sldch->payload_length,
+ 0,
+ SL_DISCOVERY_FLAG_YES);
+ break;
}
}
@@ -942,21 +944,19 @@ void ue_stub_rx_handler(unsigned int num_bytes, char *rx_buffer) {
*/
static void *UE_phy_stub_single_thread_rxn_txnp4(void *arg) {
-
- thread_top_init("UE_phy_stub_thread_rxn_txnp4",1,870000L,1000000L,1000000L);
-
- // for multipule UE's L2-emulator
- //module_id_t Mod_id = 0;
-
- //int init_ra_UE = -1; // This counter is used to initiate the RA of each UE in different SFrames
+ thread_top_init("UE_phy_stub_thread_rxn_txnp4",1,870000L,1000000L,1000000L);
+ // for multipule UE's L2-emulator
+ //module_id_t Mod_id = 0;
+ //int init_ra_UE = -1; // This counter is used to initiate the RA of each UE in different SFrames
static __thread int UE_thread_rxtx_retval;
struct rx_tx_thread_data *rtd = arg;
+
if (rtd == NULL) {
- LOG_E( MAC, "[SCHED][UE] rx_tx_thread_data *rtd: NULL pointer\n" );
- exit_fun("nothing to add");
+ LOG_E( MAC, "[SCHED][UE] rx_tx_thread_data *rtd: NULL pointer\n" );
+ exit_fun("nothing to add");
}
- UE_rxtx_proc_t *proc = rtd->proc;
+ UE_rxtx_proc_t *proc = rtd->proc;
// settings for nfapi-L2-emulator mode
module_id_t ue_thread_id = rtd->ue_thread_id;
uint16_t ue_index = 0;
@@ -967,11 +967,9 @@ static void *UE_phy_stub_single_thread_rxn_txnp4(void *arg) {
uint8_t end_flag;
proc = &PHY_vars_UE_g[0][0]->proc.proc_rxtx[0];
phy_stub_ticking->num_single_thread[ue_thread_id] = -1;
-
UE = rtd->UE;
-
- if(ue_thread_id == 0){
+ if(ue_thread_id == 0) {
phy_stub_ticking->ticking_var = -1;
proc->subframe_rx=proc->sub_frame_start;
// Initializations for nfapi-L2-emulator mode
@@ -981,296 +979,287 @@ static void *UE_phy_stub_single_thread_rxn_txnp4(void *arg) {
tx_request_pdu_list = NULL;
// waiting for all UE's threads set phy_stub_ticking->num_single_thread[ue_thread_id] = -1.
- do{
+ do {
end_flag = 1;
- for(uint16_t i = 0;i< NB_THREAD_INST;i++){
- if(phy_stub_ticking->num_single_thread[i] == 0){
+
+ for(uint16_t i = 0; i< NB_THREAD_INST; i++) {
+ if(phy_stub_ticking->num_single_thread[i] == 0) {
end_flag = 0;
}
}
- }while(end_flag == 0);
+ } while(end_flag == 0);
sync_var=0;
}
-
//PANOS: CAREFUL HERE!
wait_sync("UE_phy_stub_single_thread_rxn_txnp4");
while (!oai_exit) {
- if(ue_thread_id == 0){
- if (pthread_mutex_lock(&phy_stub_ticking->mutex_ticking) != 0) {
- LOG_E( MAC, "[SCHED][UE] error locking mutex for UE RXTX\n" );
- exit_fun("nothing to add");
- }
- while (phy_stub_ticking->ticking_var < 0) {
- // most of the time, the thread is waiting here
- //pthread_cond_wait( &proc->cond_rxtx, &proc->mutex_rxtx )
- LOG_D(MAC,"Waiting for ticking_var\n");
- pthread_cond_wait( &phy_stub_ticking->cond_ticking, &phy_stub_ticking->mutex_ticking);
- }
- phy_stub_ticking->ticking_var--;
- if (pthread_mutex_unlock(&phy_stub_ticking->mutex_ticking) != 0) {
- LOG_E( MAC, "[SCHED][UE] error unlocking mutex for UE RXn_TXnp4\n" );
- exit_fun("nothing to add");
- }
-
- proc->subframe_rx=timer_subframe;
- proc->frame_rx = timer_frame;
-
- // FDD and TDD tx timing settings.
- // XXX:It is the result of timing adjustment in debug.
- // It is necessary to investigate why this will work in the future.
- proc->subframe_tx=(timer_subframe+sf_ahead)%10;
- proc->frame_tx = proc->frame_rx + (proc->subframe_rx>(9-sf_ahead)?1:0);
- //oai_subframe_ind(proc->frame_rx, proc->subframe_rx);
-
- if (UE != NULL) {
- if (UE->frame_parms.frame_type == FDD) {
- oai_subframe_ind(proc->frame_rx, proc->subframe_rx);
- } else {
- oai_subframe_ind(proc->frame_tx, proc->subframe_tx);
+ if(ue_thread_id == 0) {
+ if (pthread_mutex_lock(&phy_stub_ticking->mutex_ticking) != 0) {
+ LOG_E( MAC, "[SCHED][UE] error locking mutex for UE RXTX\n" );
+ exit_fun("nothing to add");
}
- } else {
- // Default will be FDD
- oai_subframe_ind(proc->frame_rx, proc->subframe_rx);
- }
-
- //Guessing that the next 4 lines are not needed for the phy_stub mode.
- /*initRefTimes(t2);
- initRefTimes(t3);
- pickTime(current);
- updateTimes(proc->gotIQs, &t2, 10000, "Delay to wake up UE_Thread_Rx (case 2)");*/
+ while (phy_stub_ticking->ticking_var < 0) {
+ // most of the time, the thread is waiting here
+ //pthread_cond_wait( &proc->cond_rxtx, &proc->mutex_rxtx )
+ LOG_D(MAC,"Waiting for ticking_var\n");
+ pthread_cond_wait( &phy_stub_ticking->cond_ticking, &phy_stub_ticking->mutex_ticking);
+ }
- // Not sure whether we should put the memory allocation here and not sure how much memory
- //we should allocate for each subframe cycle.
- UL_INFO = (UL_IND_t*)malloc(sizeof(UL_IND_t));
-
- UL_INFO->rx_ind.rx_indication_body.rx_pdu_list = (nfapi_rx_indication_pdu_t*)malloc(NB_UE_INST*sizeof(nfapi_rx_indication_pdu_t));
- UL_INFO->rx_ind.rx_indication_body.number_of_pdus = 0;
+ phy_stub_ticking->ticking_var--;
+ if (pthread_mutex_unlock(&phy_stub_ticking->mutex_ticking) != 0) {
+ LOG_E( MAC, "[SCHED][UE] error unlocking mutex for UE RXn_TXnp4\n" );
+ exit_fun("nothing to add");
+ }
- UL_INFO->crc_ind.crc_indication_body.crc_pdu_list = (nfapi_crc_indication_pdu_t*)malloc(NB_UE_INST*sizeof(nfapi_crc_indication_pdu_t));
- UL_INFO->crc_ind.crc_indication_body.number_of_crcs = 0;
+ proc->subframe_rx=timer_subframe;
+ proc->frame_rx = timer_frame;
+ // FDD and TDD tx timing settings.
+ // XXX:It is the result of timing adjustment in debug.
+ // It is necessary to investigate why this will work in the future.
+ proc->subframe_tx=(timer_subframe+sf_ahead)%10;
+ proc->frame_tx = proc->frame_rx + (proc->subframe_rx>(9-sf_ahead)?1:0);
+ //oai_subframe_ind(proc->frame_rx, proc->subframe_rx);
+
+ if (UE != NULL) {
+ if (UE->frame_parms.frame_type == FDD) {
+ oai_subframe_ind(proc->frame_rx, proc->subframe_rx);
+ } else {
+ oai_subframe_ind(proc->frame_tx, proc->subframe_tx);
+ }
+ } else {
+ // Default will be FDD
+ oai_subframe_ind(proc->frame_rx, proc->subframe_rx);
+ }
- UL_INFO->harq_ind.harq_indication_body.harq_pdu_list = (nfapi_harq_indication_pdu_t*)malloc(NB_UE_INST*sizeof(nfapi_harq_indication_pdu_t));
- UL_INFO->harq_ind.harq_indication_body.number_of_harqs = 0;
+ //Guessing that the next 4 lines are not needed for the phy_stub mode.
+ /*initRefTimes(t2);
+ initRefTimes(t3);
+ pickTime(current);
+ updateTimes(proc->gotIQs, &t2, 10000, "Delay to wake up UE_Thread_Rx (case 2)");*/
+ // Not sure whether we should put the memory allocation here and not sure how much memory
+ //we should allocate for each subframe cycle.
+ UL_INFO = (UL_IND_t *)malloc(sizeof(UL_IND_t));
+ UL_INFO->rx_ind.rx_indication_body.rx_pdu_list = (nfapi_rx_indication_pdu_t *)malloc(NB_UE_INST*sizeof(nfapi_rx_indication_pdu_t));
+ UL_INFO->rx_ind.rx_indication_body.number_of_pdus = 0;
+ UL_INFO->crc_ind.crc_indication_body.crc_pdu_list = (nfapi_crc_indication_pdu_t *)malloc(NB_UE_INST*sizeof(nfapi_crc_indication_pdu_t));
+ UL_INFO->crc_ind.crc_indication_body.number_of_crcs = 0;
+ UL_INFO->harq_ind.harq_indication_body.harq_pdu_list = (nfapi_harq_indication_pdu_t *)malloc(NB_UE_INST*sizeof(nfapi_harq_indication_pdu_t));
+ UL_INFO->harq_ind.harq_indication_body.number_of_harqs = 0;
+ UL_INFO->sr_ind.sr_indication_body.sr_pdu_list = (nfapi_sr_indication_pdu_t *)malloc(NB_UE_INST*sizeof(nfapi_sr_indication_pdu_t));
+ UL_INFO->sr_ind.sr_indication_body.number_of_srs = 0;
+ UL_INFO->cqi_ind.cqi_pdu_list = (nfapi_cqi_indication_pdu_t *)malloc(NB_UE_INST*sizeof(nfapi_cqi_indication_pdu_t));
+ UL_INFO->cqi_ind.cqi_raw_pdu_list = (nfapi_cqi_indication_raw_pdu_t *)malloc(NB_UE_INST*sizeof(nfapi_cqi_indication_raw_pdu_t));
+ UL_INFO->cqi_ind.number_of_cqis = 0;
+
+ if (pthread_mutex_lock(&phy_stub_ticking->mutex_single_thread) != 0) {
+ LOG_E( MAC, "[SCHED][UE] error locking mutex for ue_thread_id %d (mutex_single_thread)\n",ue_thread_id);
+ exit_fun("nothing to add");
+ }
- UL_INFO->sr_ind.sr_indication_body.sr_pdu_list = (nfapi_sr_indication_pdu_t*)malloc(NB_UE_INST*sizeof(nfapi_sr_indication_pdu_t));
- UL_INFO->sr_ind.sr_indication_body.number_of_srs = 0;
+ memset(&phy_stub_ticking->num_single_thread[0],0,sizeof(int)*NB_THREAD_INST);
+ pthread_cond_broadcast(&phy_stub_ticking->cond_single_thread);
- UL_INFO->cqi_ind.cqi_pdu_list = (nfapi_cqi_indication_pdu_t*)malloc(NB_UE_INST*sizeof(nfapi_cqi_indication_pdu_t));
- UL_INFO->cqi_ind.cqi_raw_pdu_list = (nfapi_cqi_indication_raw_pdu_t*)malloc(NB_UE_INST*sizeof(nfapi_cqi_indication_raw_pdu_t));
- UL_INFO->cqi_ind.number_of_cqis = 0;
+ if (pthread_mutex_unlock(&phy_stub_ticking->mutex_single_thread) != 0) {
+ LOG_E( MAC, "[SCHED][UE] error unlocking mutex for ue_thread_id %d (mutex_single_thread)\n",ue_thread_id);
+ exit_fun("nothing to add");
+ }
+ } else {
+ if (pthread_mutex_lock(&phy_stub_ticking->mutex_single_thread) != 0) {
+ LOG_E( MAC, "[SCHED][UE] error locking mutex for ue_thread_id %d (mutex_single_thread)\n",ue_thread_id);
+ exit_fun("nothing to add");
+ }
- if (pthread_mutex_lock(&phy_stub_ticking->mutex_single_thread) != 0) {
- LOG_E( MAC, "[SCHED][UE] error locking mutex for ue_thread_id %d (mutex_single_thread)\n",ue_thread_id);
- exit_fun("nothing to add");
- }
- memset(&phy_stub_ticking->num_single_thread[0],0,sizeof(int)*NB_THREAD_INST);
- pthread_cond_broadcast(&phy_stub_ticking->cond_single_thread);
+ while (phy_stub_ticking->num_single_thread[ue_thread_id] < 0) {
+ // most of the time, the thread is waiting here
+ LOG_D(MAC,"Waiting for single_thread (ue_thread_id %d)\n",ue_thread_id);
+ pthread_cond_wait( &phy_stub_ticking->cond_single_thread, &phy_stub_ticking->mutex_single_thread);
+ }
- if (pthread_mutex_unlock(&phy_stub_ticking->mutex_single_thread) != 0) {
- LOG_E( MAC, "[SCHED][UE] error unlocking mutex for ue_thread_id %d (mutex_single_thread)\n",ue_thread_id);
- exit_fun("nothing to add");
- }
- }else{
- if (pthread_mutex_lock(&phy_stub_ticking->mutex_single_thread) != 0) {
- LOG_E( MAC, "[SCHED][UE] error locking mutex for ue_thread_id %d (mutex_single_thread)\n",ue_thread_id);
- exit_fun("nothing to add");
- }
- while (phy_stub_ticking->num_single_thread[ue_thread_id] < 0) {
- // most of the time, the thread is waiting here
- LOG_D(MAC,"Waiting for single_thread (ue_thread_id %d)\n",ue_thread_id);
- pthread_cond_wait( &phy_stub_ticking->cond_single_thread, &phy_stub_ticking->mutex_single_thread);
- }
- if (pthread_mutex_unlock(&phy_stub_ticking->mutex_single_thread) != 0) {
- LOG_E( MAC, "[SCHED][UE] error unlocking mutex for ue_thread_id %d (mutex_single_thread)\n",ue_thread_id);
- exit_fun("nothing to add");
- }
+ if (pthread_mutex_unlock(&phy_stub_ticking->mutex_single_thread) != 0) {
+ LOG_E( MAC, "[SCHED][UE] error unlocking mutex for ue_thread_id %d (mutex_single_thread)\n",ue_thread_id);
+ exit_fun("nothing to add");
+ }
}
//for (Mod_id=0; Mod_id<NB_UE_INST; Mod_id++) {
for (ue_index=0; ue_index < ue_num; ue_index++) {
- ue_Mod_id = ue_thread_id + NB_THREAD_INST*ue_index;
- UE = PHY_vars_UE_g[ue_Mod_id][0];
- //LOG_D(MAC, "UE_phy_stub_single_thread_rxn_txnp4, NB_UE_INST:%d, Mod_id:%d \n", NB_UE_INST, Mod_id);
- //UE = PHY_vars_UE_g[Mod_id][0];
- lte_subframe_t sf_type = subframe_select( &UE->frame_parms, proc->subframe_rx);
- if ((sf_type == SF_DL) ||
- (UE->frame_parms.frame_type == FDD) ||
- (sf_type == SF_S)) {
-
- if (UE->frame_parms.frame_type == TDD) {
- LOG_D(PHY, "TDD%d,%s: calling UE_RX\n",
- UE->frame_parms.tdd_config,
- (sf_type==SF_DL? "SF_DL" :
- (sf_type==SF_UL? "SF_UL" :
- (sf_type==SF_S ? "SF_S" : "UNKNOWN_SF_TYPE"))));
- } else {
- LOG_D(PHY, "%s,%s: calling UE_RX\n",
- (UE->frame_parms.frame_type==FDD? "FDD":
- (UE->frame_parms.frame_type==TDD? "TDD":"UNKNOWN_DUPLEX_MODE")),
- (sf_type==SF_DL? "SF_DL" :
- (sf_type==SF_UL? "SF_UL" :
- (sf_type==SF_S ? "SF_S" : "UNKNOWN_SF_TYPE"))));
- }
-
+ ue_Mod_id = ue_thread_id + NB_THREAD_INST*ue_index;
+ UE = PHY_vars_UE_g[ue_Mod_id][0];
+ //LOG_D(MAC, "UE_phy_stub_single_thread_rxn_txnp4, NB_UE_INST:%d, Mod_id:%d \n", NB_UE_INST, Mod_id);
+ //UE = PHY_vars_UE_g[Mod_id][0];
+ lte_subframe_t sf_type = subframe_select( &UE->frame_parms, proc->subframe_rx);
+
+ if ((sf_type == SF_DL) ||
+ (UE->frame_parms.frame_type == FDD) ||
+ (sf_type == SF_S)) {
+ if (UE->frame_parms.frame_type == TDD) {
+ LOG_D(PHY, "TDD%d,%s: calling UE_RX\n",
+ UE->frame_parms.tdd_config,
+ (sf_type==SF_DL? "SF_DL" :
+ (sf_type==SF_UL? "SF_UL" :
+ (sf_type==SF_S ? "SF_S" : "UNKNOWN_SF_TYPE"))));
+ } else {
+ LOG_D(PHY, "%s,%s: calling UE_RX\n",
+ (UE->frame_parms.frame_type==FDD? "FDD":
+ (UE->frame_parms.frame_type==TDD? "TDD":"UNKNOWN_DUPLEX_MODE")),
+ (sf_type==SF_DL? "SF_DL" :
+ (sf_type==SF_UL? "SF_UL" :
+ (sf_type==SF_S ? "SF_S" : "UNKNOWN_SF_TYPE"))));
+ }
- phy_procedures_UE_SL_RX(UE,proc);
+ phy_procedures_UE_SL_RX(UE,proc);
- if (dl_config_req!=NULL && tx_request_pdu_list!=NULL){
- //if(dl_config_req!= NULL) {
- dl_config_req_UE_MAC(dl_config_req, ue_Mod_id);
+ if (dl_config_req!=NULL && tx_request_pdu_list!=NULL) {
+ //if(dl_config_req!= NULL) {
+ dl_config_req_UE_MAC(dl_config_req, ue_Mod_id);
+ }
- }
+ if (hi_dci0_req!=NULL && hi_dci0_req->hi_dci0_request_body.hi_dci0_pdu_list!=NULL) {
+ hi_dci0_req_UE_MAC(hi_dci0_req, ue_Mod_id);
+ }
- if (hi_dci0_req!=NULL && hi_dci0_req->hi_dci0_request_body.hi_dci0_pdu_list!=NULL){
- hi_dci0_req_UE_MAC(hi_dci0_req, ue_Mod_id);
+ if(nfapi_mode!=3)
+ phy_procedures_UE_SL_TX(UE,proc);
}
- if(nfapi_mode!=3)
- phy_procedures_UE_SL_TX(UE,proc);
-
- }
-
#if UE_TIMING_TRACE
- start_meas(&UE->generic_stat);
+ start_meas(&UE->generic_stat);
#endif
- if (UE->mac_enabled==1) {
-
- ret = ue_scheduler(ue_Mod_id,
- proc->frame_rx,
- proc->subframe_rx,
- proc->frame_tx,
- proc->subframe_tx,
- subframe_select(&UE->frame_parms,proc->subframe_tx),
- 0,
- 0/*FIXME CC_id*/);
- if ( ret != CONNECTION_OK) {
- LOG_E( PHY, "[UE %"PRIu8"] Frame %"PRIu32", subframe %u %s\n",
- UE->Mod_id, proc->frame_rx, proc->subframe_tx,get_connectionloss_errstr(ret) );
+ if (UE->mac_enabled==1) {
+ ret = ue_scheduler(ue_Mod_id,
+ proc->frame_rx,
+ proc->subframe_rx,
+ proc->frame_tx,
+ proc->subframe_tx,
+ subframe_select(&UE->frame_parms,proc->subframe_tx),
+ 0,
+ 0/*FIXME CC_id*/);
+
+ if ( ret != CONNECTION_OK) {
+ LOG_E( PHY, "[UE %"PRIu8"] Frame %"PRIu32", subframe %u %s\n",
+ UE->Mod_id, proc->frame_rx, proc->subframe_tx,get_connectionloss_errstr(ret) );
+ }
}
- }
+
#if UE_TIMING_TRACE
- stop_meas(&UE->generic_stat);
+ stop_meas(&UE->generic_stat);
#endif
+ // Prepare the future Tx data
+
+ if ((subframe_select( &UE->frame_parms, proc->subframe_tx) == SF_UL) ||
+ (UE->frame_parms.frame_type == FDD) )
+ if (UE->mode != loop_through_memory) {
+ // We make the start of RA between consecutive UEs differ by 20 frames
+ //if ((UE_mac_inst[Mod_id].UE_mode[0] == PRACH && Mod_id == 0) || (UE_mac_inst[Mod_id].UE_mode[0] == PRACH && Mod_id>0 && proc->frame_rx >= UE_mac_inst[Mod_id-1].ra_frame + 20) ) {
+ if (UE_mac_inst[ue_Mod_id].UE_mode[0] == PRACH && ue_Mod_id == next_Mod_id) {
+ next_ra_frame++;
+
+ if(next_ra_frame > 200) {
+ // check if we have PRACH opportunity
+ if (is_prach_subframe(&UE->frame_parms,proc->frame_tx, proc->subframe_tx) && UE_mac_inst[ue_Mod_id].SI_Decoded == 1) {
+ // The one working strangely...
+ //if (is_prach_subframe(&UE->frame_parms,proc->frame_tx, proc->subframe_tx && Mod_id == (module_id_t) init_ra_UE) ) {
+ PRACH_RESOURCES_t *prach_resources = ue_get_rach(ue_Mod_id, 0, proc->frame_tx, 0, proc->subframe_tx);
+
+ if(prach_resources!=NULL ) {
+ UE_mac_inst[ue_Mod_id].ra_frame = proc->frame_rx;
+ LOG_D(MAC, "UE_phy_stub_thread_rxn_txnp4 before RACH, Mod_id: %d frame %d subframe %d\n", ue_Mod_id,proc->frame_tx, proc->subframe_tx);
+ fill_rach_indication_UE_MAC(ue_Mod_id, proc->frame_tx,proc->subframe_tx, UL_INFO, prach_resources->ra_PreambleIndex, prach_resources->ra_RNTI);
+ Msg1_transmitted(ue_Mod_id, 0, proc->frame_tx, 0);
+ UE_mac_inst[ue_Mod_id].UE_mode[0] = RA_RESPONSE;
+ next_Mod_id = ue_Mod_id + 1;
+ //next_ra_frame = (proc->frame_rx + 20)%1000;
+ next_ra_frame = 0;
+ }
- // Prepare the future Tx data
+ //ue_prach_procedures(ue,proc,eNB_id,abstraction_flag,mode);
+ }
+ }
+ } // mode is PRACH
- if ((subframe_select( &UE->frame_parms, proc->subframe_tx) == SF_UL) ||
- (UE->frame_parms.frame_type == FDD) )
- if (UE->mode != loop_through_memory){
-
- // We make the start of RA between consecutive UEs differ by 20 frames
- //if ((UE_mac_inst[Mod_id].UE_mode[0] == PRACH && Mod_id == 0) || (UE_mac_inst[Mod_id].UE_mode[0] == PRACH && Mod_id>0 && proc->frame_rx >= UE_mac_inst[Mod_id-1].ra_frame + 20) ) {
- if (UE_mac_inst[ue_Mod_id].UE_mode[0] == PRACH && ue_Mod_id == next_Mod_id) {
- next_ra_frame++;
- if(next_ra_frame > 200){
- // check if we have PRACH opportunity
-
- if (is_prach_subframe(&UE->frame_parms,proc->frame_tx, proc->subframe_tx) && UE_mac_inst[ue_Mod_id].SI_Decoded == 1) {
-
- // The one working strangely...
- //if (is_prach_subframe(&UE->frame_parms,proc->frame_tx, proc->subframe_tx && Mod_id == (module_id_t) init_ra_UE) ) {
-
- PRACH_RESOURCES_t *prach_resources = ue_get_rach(ue_Mod_id, 0, proc->frame_tx, 0, proc->subframe_tx);
- if(prach_resources!=NULL ) {
- UE_mac_inst[ue_Mod_id].ra_frame = proc->frame_rx;
- LOG_D(MAC, "UE_phy_stub_thread_rxn_txnp4 before RACH, Mod_id: %d frame %d subframe %d\n", ue_Mod_id ,proc->frame_tx, proc->subframe_tx);
- fill_rach_indication_UE_MAC(ue_Mod_id, proc->frame_tx ,proc->subframe_tx, UL_INFO, prach_resources->ra_PreambleIndex, prach_resources->ra_RNTI);
- Msg1_transmitted(ue_Mod_id, 0, proc->frame_tx, 0);
- UE_mac_inst[ue_Mod_id].UE_mode[0] = RA_RESPONSE;
- next_Mod_id = ue_Mod_id + 1;
- //next_ra_frame = (proc->frame_rx + 20)%1000;
- next_ra_frame = 0;
- }
-
- //ue_prach_procedures(ue,proc,eNB_id,abstraction_flag,mode);
- }
+ // Substitute call to phy_procedures Tx with call to phy_stub functions in order to trigger
+ // UE Tx procedures directly at the MAC layer, based on the received ul_config requests from the vnf (eNB).
+ // Generate UL_indications which correspond to UL traffic.
+ if(ul_config_req!=NULL) { //&& UE_mac_inst[Mod_id].ul_config_req->ul_config_request_body.ul_config_pdu_list != NULL){
+ ul_config_req_UE_MAC(ul_config_req, timer_frame, timer_subframe, ue_Mod_id);
}
- } // mode is PRACH
- // Substitute call to phy_procedures Tx with call to phy_stub functions in order to trigger
- // UE Tx procedures directly at the MAC layer, based on the received ul_config requests from the vnf (eNB).
- // Generate UL_indications which correspond to UL traffic.
- if(ul_config_req!=NULL){ //&& UE_mac_inst[Mod_id].ul_config_req->ul_config_request_body.ul_config_pdu_list != NULL){
- ul_config_req_UE_MAC(ul_config_req, timer_frame, timer_subframe, ue_Mod_id);
- }
- }
-
- phy_procedures_UE_SL_RX(UE,proc);
-
+ }
+ phy_procedures_UE_SL_RX(UE,proc);
} //for (Mod_id=0; Mod_id<NB_UE_INST; Mod_id++)
phy_stub_ticking->num_single_thread[ue_thread_id] = -1;
// waiting for all UE's threads set phy_stub_ticking->num_single_thread[ue_thread_id] = -1.
- if(ue_thread_id == 0){
- do{
+ if(ue_thread_id == 0) {
+ do {
end_flag = 1;
- for(uint16_t i = 0;i< NB_THREAD_INST;i++){
- if(phy_stub_ticking->num_single_thread[i] == 0){
- end_flag = 0;
+
+ for(uint16_t i = 0; i< NB_THREAD_INST; i++) {
+ if(phy_stub_ticking->num_single_thread[i] == 0) {
+ end_flag = 0;
}
}
- }while(end_flag == 0);
+ } while(end_flag == 0);
+
+ if (UL_INFO->crc_ind.crc_indication_body.number_of_crcs>0) {
+ //LOG_D(PHY,"UL_info->crc_ind.crc_indication_body.number_of_crcs:%d CRC_IND:SFN/SF:%d\n", UL_info->crc_ind.crc_indication_body.number_of_crcs, NFAPI_SFNSF2DEC(UL_info->crc_ind.sfn_sf));
+ //LOG_I(MAC, "ul_config_req_UE_MAC 2.2, SFN/SF of PNF counter:%d.%d, number_of_crcs: %d \n", timer_frame, timer_subframe, UL_INFO->crc_ind.crc_indication_body.number_of_crcs);
+ oai_nfapi_crc_indication(&UL_INFO->crc_ind);
+ //LOG_I(MAC, "ul_config_req_UE_MAC 2.21 \n");
+ UL_INFO->crc_ind.crc_indication_body.number_of_crcs = 0;
+ }
+ if (UL_INFO->rx_ind.rx_indication_body.number_of_pdus>0) {
+ //LOG_D(PHY,"UL_info->rx_ind.number_of_pdus:%d RX_IND:SFN/SF:%d\n", UL_info->rx_ind.rx_indication_body.number_of_pdus, NFAPI_SFNSF2DEC(UL_info->rx_ind.sfn_sf));
+ //LOG_I(MAC, "ul_config_req_UE_MAC 2.3, SFN/SF of PNF counter:%d.%d, number_of_pdus: %d \n", timer_frame, timer_subframe, UL_INFO->rx_ind.rx_indication_body.number_of_pdus);
+ oai_nfapi_rx_ind(&UL_INFO->rx_ind);
- if (UL_INFO->crc_ind.crc_indication_body.number_of_crcs>0)
- {
- //LOG_D(PHY,"UL_info->crc_ind.crc_indication_body.number_of_crcs:%d CRC_IND:SFN/SF:%d\n", UL_info->crc_ind.crc_indication_body.number_of_crcs, NFAPI_SFNSF2DEC(UL_info->crc_ind.sfn_sf));
- //LOG_I(MAC, "ul_config_req_UE_MAC 2.2, SFN/SF of PNF counter:%d.%d, number_of_crcs: %d \n", timer_frame, timer_subframe, UL_INFO->crc_ind.crc_indication_body.number_of_crcs);
- oai_nfapi_crc_indication(&UL_INFO->crc_ind);
- //LOG_I(MAC, "ul_config_req_UE_MAC 2.21 \n");
- UL_INFO->crc_ind.crc_indication_body.number_of_crcs = 0;
- }
- if (UL_INFO->rx_ind.rx_indication_body.number_of_pdus>0)
- {
- //LOG_D(PHY,"UL_info->rx_ind.number_of_pdus:%d RX_IND:SFN/SF:%d\n", UL_info->rx_ind.rx_indication_body.number_of_pdus, NFAPI_SFNSF2DEC(UL_info->rx_ind.sfn_sf));
- //LOG_I(MAC, "ul_config_req_UE_MAC 2.3, SFN/SF of PNF counter:%d.%d, number_of_pdus: %d \n", timer_frame, timer_subframe, UL_INFO->rx_ind.rx_indication_body.number_of_pdus);
- oai_nfapi_rx_ind(&UL_INFO->rx_ind);
- for(uint8_t num_pdu = 0;num_pdu < UL_INFO->rx_ind.rx_indication_body.number_of_pdus;num_pdu++){
- free(UL_INFO->rx_ind.rx_indication_body.rx_pdu_list[num_pdu].data);
- }
- //LOG_I(MAC, "ul_config_req_UE_MAC 2.31 \n");
- UL_INFO->rx_ind.rx_indication_body.number_of_pdus = 0;
+ for(uint8_t num_pdu = 0; num_pdu < UL_INFO->rx_ind.rx_indication_body.number_of_pdus; num_pdu++) {
+ free(UL_INFO->rx_ind.rx_indication_body.rx_pdu_list[num_pdu].data);
+ }
+
+ //LOG_I(MAC, "ul_config_req_UE_MAC 2.31 \n");
+ UL_INFO->rx_ind.rx_indication_body.number_of_pdus = 0;
}
- if(UL_INFO->harq_ind.harq_indication_body.number_of_harqs>0)
- {
- //LOG_D(MAC, "ul_config_req_UE_MAC 2.4, SFN/SF of PNF counter:%d.%d, number_of_harqs: %d \n", timer_frame, timer_subframe, UL_INFO->harq_ind.harq_indication_body.number_of_harqs);
- oai_nfapi_harq_indication(&UL_INFO->harq_ind);
- //LOG_I(MAC, "ul_config_req_UE_MAC 2.41 \n");
- UL_INFO->harq_ind.harq_indication_body.number_of_harqs =0;
+ if(UL_INFO->harq_ind.harq_indication_body.number_of_harqs>0) {
+ //LOG_D(MAC, "ul_config_req_UE_MAC 2.4, SFN/SF of PNF counter:%d.%d, number_of_harqs: %d \n", timer_frame, timer_subframe, UL_INFO->harq_ind.harq_indication_body.number_of_harqs);
+ oai_nfapi_harq_indication(&UL_INFO->harq_ind);
+ //LOG_I(MAC, "ul_config_req_UE_MAC 2.41 \n");
+ UL_INFO->harq_ind.harq_indication_body.number_of_harqs =0;
}
- if(UL_INFO->sr_ind.sr_indication_body.number_of_srs>0)
- {
- //LOG_I(MAC, "ul_config_req_UE_MAC 2.5, SFN/SF of PNF counter:%d.%d, number_of_srs: %d \n", timer_frame, timer_subframe, UL_INFO->sr_ind.sr_indication_body.number_of_srs);
- oai_nfapi_sr_indication(&UL_INFO->sr_ind);
- //LOG_I(MAC, "ul_config_req_UE_MAC 2.51 \n");
- UL_INFO->sr_ind.sr_indication_body.number_of_srs = 0;
+
+ if(UL_INFO->sr_ind.sr_indication_body.number_of_srs>0) {
+ //LOG_I(MAC, "ul_config_req_UE_MAC 2.5, SFN/SF of PNF counter:%d.%d, number_of_srs: %d \n", timer_frame, timer_subframe, UL_INFO->sr_ind.sr_indication_body.number_of_srs);
+ oai_nfapi_sr_indication(&UL_INFO->sr_ind);
+ //LOG_I(MAC, "ul_config_req_UE_MAC 2.51 \n");
+ UL_INFO->sr_ind.sr_indication_body.number_of_srs = 0;
}
// Free UL_INFO messages
//if(UL_INFO->crc_ind.crc_indication_body.crc_pdu_list != NULL){
- free(UL_INFO->crc_ind.crc_indication_body.crc_pdu_list);
- UL_INFO->crc_ind.crc_indication_body.crc_pdu_list = NULL;
+ free(UL_INFO->crc_ind.crc_indication_body.crc_pdu_list);
+ UL_INFO->crc_ind.crc_indication_body.crc_pdu_list = NULL;
//}
//if(UL_INFO->rx_ind.rx_indication_body.rx_pdu_list != NULL){
- free(UL_INFO->rx_ind.rx_indication_body.rx_pdu_list);
- UL_INFO->rx_ind.rx_indication_body.rx_pdu_list = NULL;
+ free(UL_INFO->rx_ind.rx_indication_body.rx_pdu_list);
+ UL_INFO->rx_ind.rx_indication_body.rx_pdu_list = NULL;
//}
//if(UL_INFO->harq_ind.harq_indication_body.harq_pdu_list !=NULL){
- free(UL_INFO->harq_ind.harq_indication_body.harq_pdu_list);
- UL_INFO->harq_ind.harq_indication_body.harq_pdu_list = NULL;
+ free(UL_INFO->harq_ind.harq_indication_body.harq_pdu_list);
+ UL_INFO->harq_ind.harq_indication_body.harq_pdu_list = NULL;
//}
//if(UL_INFO->sr_ind.sr_indication_body.sr_pdu_list!=NULL){
- free(UL_INFO->sr_ind.sr_indication_body.sr_pdu_list);
- UL_INFO->sr_ind.sr_indication_body.sr_pdu_list = NULL;
+ free(UL_INFO->sr_ind.sr_indication_body.sr_pdu_list);
+ UL_INFO->sr_ind.sr_indication_body.sr_pdu_list = NULL;
//}
free(UL_INFO->cqi_ind.cqi_pdu_list);
UL_INFO->cqi_ind.cqi_pdu_list = NULL;
@@ -1280,43 +1269,48 @@ static void *UE_phy_stub_single_thread_rxn_txnp4(void *arg) {
UL_INFO = NULL;
// De-allocate memory of nfapi requests copies before next subframe round
- if(dl_config_req!=NULL){
- if(dl_config_req->vendor_extension!=NULL){
- free(dl_config_req->vendor_extension);
- dl_config_req->vendor_extension = NULL;
- }
- if(dl_config_req->dl_config_request_body.dl_config_pdu_list!=NULL){
- free(dl_config_req->dl_config_request_body.dl_config_pdu_list);
- dl_config_req->dl_config_request_body.dl_config_pdu_list = NULL;
- }
- free(dl_config_req);
- dl_config_req = NULL;
- }
- if(tx_request_pdu_list!=NULL){
- free(tx_request_pdu_list);
- tx_request_pdu_list = NULL;
+ if(dl_config_req!=NULL) {
+ if(dl_config_req->vendor_extension!=NULL) {
+ free(dl_config_req->vendor_extension);
+ dl_config_req->vendor_extension = NULL;
+ }
+
+ if(dl_config_req->dl_config_request_body.dl_config_pdu_list!=NULL) {
+ free(dl_config_req->dl_config_request_body.dl_config_pdu_list);
+ dl_config_req->dl_config_request_body.dl_config_pdu_list = NULL;
+ }
+
+ free(dl_config_req);
+ dl_config_req = NULL;
}
- if(ul_config_req!=NULL){
- if(ul_config_req->ul_config_request_body.ul_config_pdu_list != NULL){
- free(ul_config_req->ul_config_request_body.ul_config_pdu_list);
- ul_config_req->ul_config_request_body.ul_config_pdu_list = NULL;
- }
- free(ul_config_req);
- ul_config_req = NULL;
+
+ if(tx_request_pdu_list!=NULL) {
+ free(tx_request_pdu_list);
+ tx_request_pdu_list = NULL;
}
- if(hi_dci0_req!=NULL){
- if(hi_dci0_req->hi_dci0_request_body.hi_dci0_pdu_list!=NULL){
- free(hi_dci0_req->hi_dci0_request_body.hi_dci0_pdu_list);
- hi_dci0_req->hi_dci0_request_body.hi_dci0_pdu_list = NULL;
- }
- free(hi_dci0_req);
- hi_dci0_req = NULL;
+ if(ul_config_req!=NULL) {
+ if(ul_config_req->ul_config_request_body.ul_config_pdu_list != NULL) {
+ free(ul_config_req->ul_config_request_body.ul_config_pdu_list);
+ ul_config_req->ul_config_request_body.ul_config_pdu_list = NULL;
+ }
+
+ free(ul_config_req);
+ ul_config_req = NULL;
}
- }
+ if(hi_dci0_req!=NULL) {
+ if(hi_dci0_req->hi_dci0_request_body.hi_dci0_pdu_list!=NULL) {
+ free(hi_dci0_req->hi_dci0_request_body.hi_dci0_pdu_list);
+ hi_dci0_req->hi_dci0_request_body.hi_dci0_pdu_list = NULL;
+ }
+ free(hi_dci0_req);
+ hi_dci0_req = NULL;
+ }
+ }
}
+
// thread finished
free(arg);
return &UE_thread_rxtx_retval;
@@ -1334,34 +1328,32 @@ static void *UE_phy_stub_single_thread_rxn_txnp4(void *arg) {
*/
static void *UE_phy_stub_thread_rxn_txnp4(void *arg) {
-
- thread_top_init("UE_phy_stub_thread_rxn_txnp4",1,870000L,1000000L,1000000L);
-
- module_id_t Mod_id = 0;
+ thread_top_init("UE_phy_stub_thread_rxn_txnp4",1,870000L,1000000L,1000000L);
+ module_id_t Mod_id = 0;
static __thread int UE_thread_rxtx_retval;
struct rx_tx_thread_data *rtd = arg;
UE_rxtx_proc_t *proc = rtd->proc;
PHY_VARS_UE *UE = rtd->UE;
-
phy_stub_ticking->ticking_var = -1;
proc->subframe_rx=proc->sub_frame_start;
-
// CAREFUL HERE!
wait_sync("UE_phy_stub_thread_rxn_txnp4");
while (!oai_exit) {
-
if (pthread_mutex_lock(&phy_stub_ticking->mutex_ticking) != 0) {
LOG_E( MAC, "[SCHED][UE] error locking mutex for UE RXTX\n" );
exit_fun("nothing to add");
}
+
while (phy_stub_ticking->ticking_var < 0) {
// most of the time, the thread is waiting here
//pthread_cond_wait( &proc->cond_rxtx, &proc->mutex_rxtx )
LOG_D(MAC,"Waiting for ticking_var\n");
pthread_cond_wait( &phy_stub_ticking->cond_ticking, &phy_stub_ticking->mutex_ticking);
}
+
phy_stub_ticking->ticking_var--;
+
if (pthread_mutex_unlock(&phy_stub_ticking->mutex_ticking) != 0) {
LOG_E( MAC, "[SCHED][UE] error unlocking mutex for UE RXn_TXnp4\n" );
exit_fun("nothing to add");
@@ -1371,125 +1363,118 @@ static void *UE_phy_stub_thread_rxn_txnp4(void *arg) {
proc->frame_rx = timer_frame;
proc->subframe_tx=(timer_subframe+4)%10;
proc->frame_tx = proc->frame_rx + (proc->subframe_rx>5?1:0);
-
-
// Process Rx data for one sub-frame
lte_subframe_t sf_type = subframe_select( &UE->frame_parms, proc->subframe_rx);
- if ((sf_type == SF_DL) ||
- (UE->frame_parms.frame_type == FDD) ||
- (sf_type == SF_S)) {
+ if ((sf_type == SF_DL) ||
+ (UE->frame_parms.frame_type == FDD) ||
+ (sf_type == SF_S)) {
if (UE->frame_parms.frame_type == TDD) {
- LOG_D(PHY, "TDD%d,%s: calling UE_RX\n",
- UE->frame_parms.tdd_config,
- (sf_type==SF_DL? "SF_DL" :
- (sf_type==SF_UL? "SF_UL" :
- (sf_type==SF_S ? "SF_S" : "UNKNOWN_SF_TYPE"))));
+ LOG_D(PHY, "TDD%d,%s: calling UE_RX\n",
+ UE->frame_parms.tdd_config,
+ (sf_type==SF_DL? "SF_DL" :
+ (sf_type==SF_UL? "SF_UL" :
+ (sf_type==SF_S ? "SF_S" : "UNKNOWN_SF_TYPE"))));
} else {
- LOG_D(PHY, "%s,%s: calling UE_RX\n",
- (UE->frame_parms.frame_type==FDD? "FDD":
- (UE->frame_parms.frame_type==TDD? "TDD":"UNKNOWN_DUPLEX_MODE")),
- (sf_type==SF_DL? "SF_DL" :
- (sf_type==SF_UL? "SF_UL" :
- (sf_type==SF_S ? "SF_S" : "UNKNOWN_SF_TYPE"))));
+ LOG_D(PHY, "%s,%s: calling UE_RX\n",
+ (UE->frame_parms.frame_type==FDD? "FDD":
+ (UE->frame_parms.frame_type==TDD? "TDD":"UNKNOWN_DUPLEX_MODE")),
+ (sf_type==SF_DL? "SF_DL" :
+ (sf_type==SF_UL? "SF_UL" :
+ (sf_type==SF_S ? "SF_S" : "UNKNOWN_SF_TYPE"))));
}
-
phy_procedures_UE_SL_RX(UE,proc);
-
- oai_subframe_ind(timer_frame, timer_subframe);
+ oai_subframe_ind(timer_frame, timer_subframe);
if(dl_config_req!= NULL) {
-
- dl_config_req_UE_MAC(dl_config_req, Mod_id);
-
+ dl_config_req_UE_MAC(dl_config_req, Mod_id);
}
+
//if(UE_mac_inst[Mod_id].hi_dci0_req!= NULL){
- if (hi_dci0_req!=NULL && hi_dci0_req->hi_dci0_request_body.hi_dci0_pdu_list!=NULL){
- hi_dci0_req_UE_MAC(hi_dci0_req, Mod_id);
- //if(UE_mac_inst[Mod_id].hi_dci0_req->hi_dci0_request_body.hi_dci0_pdu_list!=NULL){
- free(hi_dci0_req->hi_dci0_request_body.hi_dci0_pdu_list);
- hi_dci0_req->hi_dci0_request_body.hi_dci0_pdu_list = NULL;
- //}
- free(hi_dci0_req);
- hi_dci0_req = NULL;
+ if (hi_dci0_req!=NULL && hi_dci0_req->hi_dci0_request_body.hi_dci0_pdu_list!=NULL) {
+ hi_dci0_req_UE_MAC(hi_dci0_req, Mod_id);
+ //if(UE_mac_inst[Mod_id].hi_dci0_req->hi_dci0_request_body.hi_dci0_pdu_list!=NULL){
+ free(hi_dci0_req->hi_dci0_request_body.hi_dci0_pdu_list);
+ hi_dci0_req->hi_dci0_request_body.hi_dci0_pdu_list = NULL;
+ //}
+ free(hi_dci0_req);
+ hi_dci0_req = NULL;
+ } else if(hi_dci0_req!=NULL) {
+ free(hi_dci0_req);
+ hi_dci0_req = NULL;
}
- else if(hi_dci0_req!=NULL){
- free(hi_dci0_req);
- hi_dci0_req = NULL;
- }
-
if (nfapi_mode != 3)
phy_procedures_UE_SL_TX(UE,proc);
-
}
#if UE_TIMING_TRACE
start_meas(&UE->generic_stat);
#endif
- if (UE->mac_enabled==1) {
+ if (UE->mac_enabled==1) {
int ret = ue_scheduler(UE->Mod_id,
- proc->frame_rx,
- proc->subframe_rx,
- proc->frame_tx,
- proc->subframe_tx,
- subframe_select(&UE->frame_parms,proc->subframe_tx),
- 0,
- 0);
+ proc->frame_rx,
+ proc->subframe_rx,
+ proc->frame_tx,
+ proc->subframe_tx,
+ subframe_select(&UE->frame_parms,proc->subframe_tx),
+ 0,
+ 0);
+
if (ret != CONNECTION_OK)
- LOG_E( PHY, "[UE %"PRIu8"] Frame %"PRIu32", subframe %u %s\n",
- UE->Mod_id, proc->frame_rx, proc->subframe_tx,get_connectionloss_errstr(ret) );
+ LOG_E( PHY, "[UE %"PRIu8"] Frame %"PRIu32", subframe %u %s\n",
+ UE->Mod_id, proc->frame_rx, proc->subframe_tx,get_connectionloss_errstr(ret) );
}
+
#if UE_TIMING_TRACE
stop_meas(&UE->generic_stat);
#endif
-
// Prepare the future Tx data
if ((subframe_select( &UE->frame_parms, proc->subframe_tx) == SF_UL) ||
- (UE->frame_parms.frame_type == FDD) )
- if (UE->mode != loop_through_memory){
-
- if ((UE_mac_inst[Mod_id].UE_mode[0] == PRACH) ) {
-
- // check if we have PRACH opportunity
-
- if (is_prach_subframe(&UE->frame_parms,proc->frame_tx, proc->subframe_tx)) {
- PRACH_RESOURCES_t *prach_resources = ue_get_rach(Mod_id, 0, proc->frame_tx, 0, proc->subframe_tx);
- if(prach_resources!=NULL) {
- fill_rach_indication_UE_MAC(Mod_id, proc->frame_tx ,proc->subframe_tx, UL_INFO, prach_resources->ra_PreambleIndex, prach_resources->ra_RNTI);
- Msg1_transmitted(Mod_id, 0, proc->frame_tx, 0);
- UE_mac_inst[Mod_id].UE_mode[0] = RA_RESPONSE;
- }
-
- //ue_prach_procedures(ue,proc,eNB_id,abstraction_flag,mode);
- }
- } // mode is PRACH
- // Substitute call to phy_procedures Tx with call to phy_stub functions in order to trigger
- // UE Tx procedures directly at the MAC layer, based on the received ul_config requests from the vnf (eNB).
- // Generate UL_indications which correspond to UL traffic.
- if(ul_config_req!= NULL && ul_config_req->ul_config_request_body.ul_config_pdu_list != NULL){
- //LOG_I(MAC, "UE_phy_stub_thread_rxn_txnp4 ul_config_req is not NULL \n");
- ul_config_req_UE_MAC(ul_config_req, timer_frame, timer_subframe, Mod_id);
- if(ul_config_req->ul_config_request_body.ul_config_pdu_list != NULL){
- free(ul_config_req->ul_config_request_body.ul_config_pdu_list);
- ul_config_req->ul_config_request_body.ul_config_pdu_list = NULL;
- }
- free(ul_config_req);
- ul_config_req = NULL;
- }
- else if(ul_config_req!=NULL){
- free(ul_config_req);
- ul_config_req = NULL;
- }
+ (UE->frame_parms.frame_type == FDD) )
+ if (UE->mode != loop_through_memory) {
+ if ((UE_mac_inst[Mod_id].UE_mode[0] == PRACH) ) {
+ // check if we have PRACH opportunity
+ if (is_prach_subframe(&UE->frame_parms,proc->frame_tx, proc->subframe_tx)) {
+ PRACH_RESOURCES_t *prach_resources = ue_get_rach(Mod_id, 0, proc->frame_tx, 0, proc->subframe_tx);
+
+ if(prach_resources!=NULL) {
+ fill_rach_indication_UE_MAC(Mod_id, proc->frame_tx,proc->subframe_tx, UL_INFO, prach_resources->ra_PreambleIndex, prach_resources->ra_RNTI);
+ Msg1_transmitted(Mod_id, 0, proc->frame_tx, 0);
+ UE_mac_inst[Mod_id].UE_mode[0] = RA_RESPONSE;
+ }
+
+ //ue_prach_procedures(ue,proc,eNB_id,abstraction_flag,mode);
+ }
+ } // mode is PRACH
+
+ // Substitute call to phy_procedures Tx with call to phy_stub functions in order to trigger
+ // UE Tx procedures directly at the MAC layer, based on the received ul_config requests from the vnf (eNB).
+ // Generate UL_indications which correspond to UL traffic.
+ if(ul_config_req!= NULL && ul_config_req->ul_config_request_body.ul_config_pdu_list != NULL) {
+ //LOG_I(MAC, "UE_phy_stub_thread_rxn_txnp4 ul_config_req is not NULL \n");
+ ul_config_req_UE_MAC(ul_config_req, timer_frame, timer_subframe, Mod_id);
+
+ if(ul_config_req->ul_config_request_body.ul_config_pdu_list != NULL) {
+ free(ul_config_req->ul_config_request_body.ul_config_pdu_list);
+ ul_config_req->ul_config_request_body.ul_config_pdu_list = NULL;
+ }
+
+ free(ul_config_req);
+ ul_config_req = NULL;
+ } else if(ul_config_req!=NULL) {
+ free(ul_config_req);
+ ul_config_req = NULL;
+ }
}
phy_procedures_UE_SL_RX(UE,proc);
-
}
+
// thread finished
free(arg);
return &UE_thread_rxtx_retval;
@@ -1508,39 +1493,34 @@ static void *UE_phy_stub_thread_rxn_txnp4(void *arg) {
*/
void *UE_thread(void *arg) {
-
-
PHY_VARS_UE *UE = (PHY_VARS_UE *) arg;
// int tx_enabled = 0;
int dummy_rx[UE->frame_parms.nb_antennas_rx][UE->frame_parms.samples_per_tti] __attribute__((aligned(32)));
openair0_timestamp timestamp,timestamp1;
- void* rxp[NB_ANTENNAS_RX], *txp[NB_ANTENNAS_TX];
+ void *rxp[NB_ANTENNAS_RX], *txp[NB_ANTENNAS_TX];
int start_rx_stream = 0;
int i;
int th_id;
-
static uint8_t thread_idx = 0;
-
cpu_set_t cpuset;
CPU_ZERO(&cpuset);
+
if ( threads.iq != -1 )
CPU_SET(threads.iq, &cpuset);
- init_thread(100000, 500000, FIFO_PRIORITY, &cpuset,
- "UHD Threads");
+ init_thread(100000, 500000, FIFO_PRIORITY, &cpuset,
+ "UHD Threads");
/*
while (sync_var<0)
pthread_cond_wait(&sync_cond, &sync_mutex);
pthread_mutex_unlock(&sync_mutex);
*/
-
wait_sync("UE thread");
#ifdef NAS_UE
MessageDef *message_p;
message_p = itti_alloc_new_message(TASK_NAS_UE, INITIALIZE_MESSAGE);
itti_send_msg_to_task (TASK_NAS_UE, UE->Mod_id + NB_eNB_INST, message_p);
#endif
-
int sub_frame=-1;
//int cumulated_shift=0;
@@ -1550,13 +1530,12 @@ void *UE_thread(void *arg) {
}
while (!oai_exit) {
- if (IS_SOFTMODEM_BASICSIM)
+ if (IS_SOFTMODEM_BASICSIM)
while (!(UE->proc.instance_cnt_synch < 0)) {
printf("ue sync not ready\n");
usleep(500*1000);
}
-
AssertFatal ( 0== pthread_mutex_lock(&UE->proc.mutex_synch), "");
int instance_cnt_synch = UE->proc.instance_cnt_synch;
int is_synchronized = UE->is_synchronized;
@@ -1564,223 +1543,241 @@ void *UE_thread(void *arg) {
if (is_synchronized == 0) {
if (instance_cnt_synch < 0) { // we can invoke the synch
- // grab 10 ms of signal and wakeup synch thread
- for (int i=0; i<UE->frame_parms.nb_antennas_rx; i++)
- rxp[i] = (void*)&UE->common_vars.rxdata[i][0];
-
- if (UE->mode != loop_through_memory)
- AssertFatal( UE->frame_parms.samples_per_tti*10 ==
- UE->rfdevice.trx_read_func(&UE->rfdevice,
- ×tamp,
- rxp,
- UE->frame_parms.samples_per_tti*10,
- UE->frame_parms.nb_antennas_rx), "");
- AssertFatal ( 0== pthread_mutex_lock(&UE->proc.mutex_synch), "");
- instance_cnt_synch = ++UE->proc.instance_cnt_synch;
- if (instance_cnt_synch == 0) {
- AssertFatal( 0 == pthread_cond_signal(&UE->proc.cond_synch), "");
- } else {
- LOG_E( PHY, "[SCHED][UE] UE sync thread busy!!\n" );
- exit_fun("nothing to add");
- }
- AssertFatal ( 0== pthread_mutex_unlock(&UE->proc.mutex_synch), "");
+ // grab 10 ms of signal and wakeup synch thread
+ for (int i=0; i<UE->frame_parms.nb_antennas_rx; i++)
+ rxp[i] = (void *)&UE->common_vars.rxdata[i][0];
+
+ if (UE->mode != loop_through_memory)
+ AssertFatal( UE->frame_parms.samples_per_tti*10 ==
+ UE->rfdevice.trx_read_func(&UE->rfdevice,
+ ×tamp,
+ rxp,
+ UE->frame_parms.samples_per_tti*10,
+ UE->frame_parms.nb_antennas_rx), "");
+
+ AssertFatal ( 0== pthread_mutex_lock(&UE->proc.mutex_synch), "");
+ instance_cnt_synch = ++UE->proc.instance_cnt_synch;
+
+ if (instance_cnt_synch == 0) {
+ AssertFatal( 0 == pthread_cond_signal(&UE->proc.cond_synch), "");
+ } else {
+ LOG_E( PHY, "[SCHED][UE] UE sync thread busy!!\n" );
+ exit_fun("nothing to add");
+ }
+
+ AssertFatal ( 0== pthread_mutex_unlock(&UE->proc.mutex_synch), "");
} else {
#if OAISIM
- (void)dummy_rx; /* avoid gcc warnings */
- usleep(500);
+ (void)dummy_rx; /* avoid gcc warnings */
+ usleep(500);
#else
- // grab 10 ms of signal into dummy buffer
- if (UE->mode != loop_through_memory) {
- for (int i=0; i<UE->frame_parms.nb_antennas_rx; i++)
- rxp[i] = (void*)&dummy_rx[i][0];
- for (int sf=0; sf<10; sf++)
- // printf("Reading dummy sf %d\n",sf);
- UE->rfdevice.trx_read_func(&UE->rfdevice,
- ×tamp,
- rxp,
- UE->frame_parms.samples_per_tti,
- UE->frame_parms.nb_antennas_rx);
- }
+
+ // grab 10 ms of signal into dummy buffer
+ if (UE->mode != loop_through_memory) {
+ for (int i=0; i<UE->frame_parms.nb_antennas_rx; i++)
+ rxp[i] = (void *)&dummy_rx[i][0];
+
+ for (int sf=0; sf<10; sf++)
+ // printf("Reading dummy sf %d\n",sf);
+ UE->rfdevice.trx_read_func(&UE->rfdevice,
+ ×tamp,
+ rxp,
+ UE->frame_parms.samples_per_tti,
+ UE->frame_parms.nb_antennas_rx);
+ }
+
#endif
- }
-
- } // UE->is_synchronized==0
- else {
- if (start_rx_stream==0) {
- start_rx_stream=1;
- if (UE->mode != loop_through_memory) {
- if (UE->no_timing_correction==0) {
- LOG_I(PHY,"Resynchronizing RX by %d samples (mode = %d)\n",UE->rx_offset,UE->mode);
- AssertFatal(UE->rx_offset ==
- UE->rfdevice.trx_read_func(&UE->rfdevice,
- ×tamp,
- (void**)UE->common_vars.rxdata,
- UE->rx_offset,
- UE->frame_parms.nb_antennas_rx),"");
- }
- UE->rx_offset=0;
- UE->time_sync_cell=0;
- //UE->proc.proc_rxtx[0].frame_rx++;
- //UE->proc.proc_rxtx[1].frame_rx++;
- for (th_id=0; th_id < RX_NB_TH; th_id++) {
- UE->proc.proc_rxtx[th_id].frame_rx++;
- }
-
- // read in first symbol
- AssertFatal (UE->frame_parms.ofdm_symbol_size+UE->frame_parms.nb_prefix_samples0 ==
- UE->rfdevice.trx_read_func(&UE->rfdevice,
- ×tamp,
- (void**)UE->common_vars.rxdata,
- UE->frame_parms.ofdm_symbol_size+UE->frame_parms.nb_prefix_samples0,
- UE->frame_parms.nb_antennas_rx),"");
- slot_fep(UE,0, 0, 0, 0, 0);
- } //UE->mode != loop_through_memory
- else
- rt_sleep_ns(1000*1000);
+ }
+ } // UE->is_synchronized==0
+ else {
+ if (start_rx_stream==0) {
+ start_rx_stream=1;
+
+ if (UE->mode != loop_through_memory) {
+ if (UE->no_timing_correction==0) {
+ LOG_I(PHY,"Resynchronizing RX by %d samples (mode = %d)\n",UE->rx_offset,UE->mode);
+ AssertFatal(UE->rx_offset ==
+ UE->rfdevice.trx_read_func(&UE->rfdevice,
+ ×tamp,
+ (void **)UE->common_vars.rxdata,
+ UE->rx_offset,
+ UE->frame_parms.nb_antennas_rx),"");
+ }
+ UE->rx_offset=0;
+ UE->time_sync_cell=0;
+
+ //UE->proc.proc_rxtx[0].frame_rx++;
+ //UE->proc.proc_rxtx[1].frame_rx++;
+ for (th_id=0; th_id < RX_NB_TH; th_id++) {
+ UE->proc.proc_rxtx[th_id].frame_rx++;
+ }
+
+ // read in first symbol
+ AssertFatal (UE->frame_parms.ofdm_symbol_size+UE->frame_parms.nb_prefix_samples0 ==
+ UE->rfdevice.trx_read_func(&UE->rfdevice,
+ ×tamp,
+ (void **)UE->common_vars.rxdata,
+ UE->frame_parms.ofdm_symbol_size+UE->frame_parms.nb_prefix_samples0,
+ UE->frame_parms.nb_antennas_rx),"");
+ slot_fep(UE,0, 0, 0, 0, 0);
+ } //UE->mode != loop_through_memory
+ else
+ rt_sleep_ns(1000*1000);
+ } else {
+ sub_frame++;
+ sub_frame%=10;
+ UE_rxtx_proc_t *proc = &UE->proc.proc_rxtx[thread_idx];
+ // update thread index for received subframe
+ UE->current_thread_id[sub_frame] = thread_idx;
+
+ if (IS_SOFTMODEM_BASICSIM || IS_SOFTMODEM_RFSIM ) {
+ int t;
+
+ for (t = 0; t < 2; t++) {
+ UE_rxtx_proc_t *proc = &UE->proc.proc_rxtx[t];
+ pthread_mutex_lock(&proc->mutex_rxtx);
+
+ while (proc->instance_cnt_rxtx >= 0) pthread_cond_wait( &proc->cond_rxtx, &proc->mutex_rxtx );
+
+ pthread_mutex_unlock(&proc->mutex_rxtx);
+ }
+ }
+
+ LOG_D(PHY,"Process Subframe %d thread Idx %d \n", sub_frame, UE->current_thread_id[sub_frame]);
+ thread_idx++;
+
+ if(thread_idx>=RX_NB_TH)
+ thread_idx = 0;
+
+ if (UE->mode != loop_through_memory) {
+ for (i=0; i<UE->frame_parms.nb_antennas_rx; i++)
+ rxp[i] = (void *)&UE->common_vars.rxdata[i][UE->frame_parms.ofdm_symbol_size+
+ UE->frame_parms.nb_prefix_samples0+
+ sub_frame*UE->frame_parms.samples_per_tti];
+
+ for (i=0; i<UE->frame_parms.nb_antennas_tx; i++)
+ txp[i] = (void *)&UE->common_vars.txdata[i][((sub_frame+2)%10)*UE->frame_parms.samples_per_tti];
+
+ int readBlockSize, writeBlockSize;
+
+ if (sub_frame<9) {
+ readBlockSize=UE->frame_parms.samples_per_tti;
+ writeBlockSize=UE->frame_parms.samples_per_tti;
+ } else {
+ // set TO compensation to zero
+ UE->rx_offset_diff = 0;
+
+ // compute TO compensation that should be applied for this frame
+
+ if (UE->no_timing_correction == 0) {
+ if ( UE->rx_offset < 5*UE->frame_parms.samples_per_tti &&
+ UE->rx_offset > 0 )
+ UE->rx_offset_diff = -1 ;
+
+ if ( UE->rx_offset > 5*UE->frame_parms.samples_per_tti &&
+ UE->rx_offset < 10*UE->frame_parms.samples_per_tti )
+ UE->rx_offset_diff = 1;
+ }
+
+ LOG_D(PHY,"AbsSubframe %d.%d SET rx_off_diff to %d rx_offset %d \n",proc->frame_rx,sub_frame,UE->rx_offset_diff,UE->rx_offset);
+ readBlockSize=UE->frame_parms.samples_per_tti -
+ UE->frame_parms.ofdm_symbol_size -
+ UE->frame_parms.nb_prefix_samples0 -
+ UE->rx_offset_diff;
+ writeBlockSize=UE->frame_parms.samples_per_tti -
+ UE->rx_offset_diff;
+ }
+
+ AssertFatal(readBlockSize ==
+ UE->rfdevice.trx_read_func(&UE->rfdevice,
+ ×tamp,
+ rxp,
+ readBlockSize,
+ UE->frame_parms.nb_antennas_rx),"");
+ AssertFatal( writeBlockSize ==
+ UE->rfdevice.trx_write_func(&UE->rfdevice,
+ timestamp+
+ (2*UE->frame_parms.samples_per_tti) -
+ UE->frame_parms.ofdm_symbol_size-UE->frame_parms.nb_prefix_samples0 -
+ openair0_cfg[0].tx_sample_advance,
+ txp,
+ writeBlockSize,
+ UE->frame_parms.nb_antennas_tx,
+ 1),"");
+
+ if( sub_frame==9) {
+ // read in first symbol of next frame and adjust for timing drift
+ int first_symbols=writeBlockSize-readBlockSize;
+
+ if ( first_symbols > 0 )
+ AssertFatal(first_symbols ==
+ UE->rfdevice.trx_read_func(&UE->rfdevice,
+ ×tamp1,
+ (void **)UE->common_vars.rxdata,
+ first_symbols,
+ UE->frame_parms.nb_antennas_rx),"");
+
+ if ( first_symbols <0 )
+ LOG_E(PHY,"can't compensate: diff =%d\n", first_symbols);
+ }
+
+ pickTime(gotIQs);
+ struct timespec tv= {0};
+ tv.tv_nsec=10*1000;
+
+ if( IS_SOFTMODEM_BASICSIM || IS_SOFTMODEM_RFSIM)
+ tv.tv_sec=INT_MAX;
+
+ // operate on thread sf mod 2
+ if (pthread_mutex_timedlock(&proc->mutex_rxtx, &tv) !=0) {
+ if ( errno == ETIMEDOUT) {
+ LOG_E(PHY,"Missed real time\n");
+ continue;
} else {
- sub_frame++;
- sub_frame%=10;
- UE_rxtx_proc_t *proc = &UE->proc.proc_rxtx[thread_idx];
- // update thread index for received subframe
- UE->current_thread_id[sub_frame] = thread_idx;
-
- if (IS_SOFTMODEM_BASICSIM || IS_SOFTMODEM_RFSIM ) {
- int t;
- for (t = 0; t < 2; t++) {
- UE_rxtx_proc_t *proc = &UE->proc.proc_rxtx[t];
- pthread_mutex_lock(&proc->mutex_rxtx);
- while (proc->instance_cnt_rxtx >= 0) pthread_cond_wait( &proc->cond_rxtx, &proc->mutex_rxtx );
- pthread_mutex_unlock(&proc->mutex_rxtx);
- }
- }
- LOG_D(PHY,"Process Subframe %d thread Idx %d \n", sub_frame, UE->current_thread_id[sub_frame]);
-
- thread_idx++;
- if(thread_idx>=RX_NB_TH)
- thread_idx = 0;
-
-
- if (UE->mode != loop_through_memory) {
- for (i=0; i<UE->frame_parms.nb_antennas_rx; i++)
- rxp[i] = (void*)&UE->common_vars.rxdata[i][UE->frame_parms.ofdm_symbol_size+
- UE->frame_parms.nb_prefix_samples0+
- sub_frame*UE->frame_parms.samples_per_tti];
- for (i=0; i<UE->frame_parms.nb_antennas_tx; i++)
- txp[i] = (void*)&UE->common_vars.txdata[i][((sub_frame+2)%10)*UE->frame_parms.samples_per_tti];
-
- int readBlockSize, writeBlockSize;
- if (sub_frame<9) {
- readBlockSize=UE->frame_parms.samples_per_tti;
- writeBlockSize=UE->frame_parms.samples_per_tti;
- } else {
- // set TO compensation to zero
-
- UE->rx_offset_diff = 0;
-
- // compute TO compensation that should be applied for this frame
-
- if (UE->no_timing_correction == 0) {
- if ( UE->rx_offset < 5*UE->frame_parms.samples_per_tti &&
- UE->rx_offset > 0 )
- UE->rx_offset_diff = -1 ;
- if ( UE->rx_offset > 5*UE->frame_parms.samples_per_tti &&
- UE->rx_offset < 10*UE->frame_parms.samples_per_tti )
- UE->rx_offset_diff = 1;
- }
-
- LOG_D(PHY,"AbsSubframe %d.%d SET rx_off_diff to %d rx_offset %d \n",proc->frame_rx,sub_frame,UE->rx_offset_diff,UE->rx_offset);
- readBlockSize=UE->frame_parms.samples_per_tti -
- UE->frame_parms.ofdm_symbol_size -
- UE->frame_parms.nb_prefix_samples0 -
- UE->rx_offset_diff;
- writeBlockSize=UE->frame_parms.samples_per_tti -
- UE->rx_offset_diff;
- }
-
- AssertFatal(readBlockSize ==
- UE->rfdevice.trx_read_func(&UE->rfdevice,
- ×tamp,
- rxp,
- readBlockSize,
- UE->frame_parms.nb_antennas_rx),"");
- AssertFatal( writeBlockSize ==
- UE->rfdevice.trx_write_func(&UE->rfdevice,
- timestamp+
- (2*UE->frame_parms.samples_per_tti) -
- UE->frame_parms.ofdm_symbol_size-UE->frame_parms.nb_prefix_samples0 -
- openair0_cfg[0].tx_sample_advance,
- txp,
- writeBlockSize,
- UE->frame_parms.nb_antennas_tx,
- 1),"");
- if( sub_frame==9) {
- // read in first symbol of next frame and adjust for timing drift
- int first_symbols=writeBlockSize-readBlockSize;
- if ( first_symbols > 0 )
- AssertFatal(first_symbols ==
- UE->rfdevice.trx_read_func(&UE->rfdevice,
- ×tamp1,
- (void**)UE->common_vars.rxdata,
- first_symbols,
- UE->frame_parms.nb_antennas_rx),"");
- if ( first_symbols <0 )
- LOG_E(PHY,"can't compensate: diff =%d\n", first_symbols);
- }
- pickTime(gotIQs);
- struct timespec tv={0};
- tv.tv_nsec=10*1000;
- if( IS_SOFTMODEM_BASICSIM || IS_SOFTMODEM_RFSIM)
- tv.tv_sec=INT_MAX;
- // operate on thread sf mod 2
- if (pthread_mutex_timedlock(&proc->mutex_rxtx, &tv) !=0) {
- if ( errno == ETIMEDOUT) {
- LOG_E(PHY,"Missed real time\n");
- continue;
- } else {
- LOG_E(PHY,"System error\n");
- abort();
- }
- }
- //usleep(3000);
- if(sub_frame == 0) {
- //UE->proc.proc_rxtx[0].frame_rx++;
- //UE->proc.proc_rxtx[1].frame_rx++;
- for (th_id=0; th_id < RX_NB_TH; th_id++) {
- UE->proc.proc_rxtx[th_id].frame_rx++;
- }
- }
- //UE->proc.proc_rxtx[0].gotIQs=readTime(gotIQs);
- //UE->proc.proc_rxtx[1].gotIQs=readTime(gotIQs);
- for (th_id=0; th_id < RX_NB_TH; th_id++) {
- UE->proc.proc_rxtx[th_id].gotIQs=readTime(gotIQs);
- }
- proc->subframe_rx=sub_frame;
- proc->subframe_tx=(sub_frame+4)%10;
- proc->frame_tx = proc->frame_rx + (proc->subframe_rx>5?1:0);
- proc->timestamp_tx = timestamp+
- (4*UE->frame_parms.samples_per_tti)-
- UE->frame_parms.ofdm_symbol_size-UE->frame_parms.nb_prefix_samples0;
-
- proc->instance_cnt_rxtx++;
- LOG_D( PHY, "[SCHED][UE %d] UE RX instance_cnt_rxtx %d subframe %d !!\n", UE->Mod_id, proc->instance_cnt_rxtx,proc->subframe_rx);
-
- AssertFatal (pthread_cond_signal(&proc->cond_rxtx) ==0 ,"");
- AssertFatal(pthread_mutex_unlock(&proc->mutex_rxtx) ==0,"");
- initRefTimes(t1);
- initStaticTime(lastTime);
- updateTimes(lastTime, &t1, 20000, "Delay between two IQ acquisitions (case 1)");
- pickStaticTime(lastTime);
+ LOG_E(PHY,"System error\n");
+ abort();
+ }
+ }
- } else {
- printf("Processing subframe %d",proc->subframe_rx);
- getchar();
- }
- } // start_rx_stream==1
- } // UE->is_synchronized==1
+ //usleep(3000);
+ if(sub_frame == 0) {
+ //UE->proc.proc_rxtx[0].frame_rx++;
+ //UE->proc.proc_rxtx[1].frame_rx++;
+ for (th_id=0; th_id < RX_NB_TH; th_id++) {
+ UE->proc.proc_rxtx[th_id].frame_rx++;
+ }
+ }
+
+ //UE->proc.proc_rxtx[0].gotIQs=readTime(gotIQs);
+ //UE->proc.proc_rxtx[1].gotIQs=readTime(gotIQs);
+ for (th_id=0; th_id < RX_NB_TH; th_id++) {
+ UE->proc.proc_rxtx[th_id].gotIQs=readTime(gotIQs);
+ }
+
+ proc->subframe_rx=sub_frame;
+ proc->subframe_tx=(sub_frame+4)%10;
+ proc->frame_tx = proc->frame_rx + (proc->subframe_rx>5?1:0);
+ proc->timestamp_tx = timestamp+
+ (4*UE->frame_parms.samples_per_tti)-
+ UE->frame_parms.ofdm_symbol_size-UE->frame_parms.nb_prefix_samples0;
+ proc->instance_cnt_rxtx++;
+ LOG_D( PHY, "[SCHED][UE %d] UE RX instance_cnt_rxtx %d subframe %d !!\n", UE->Mod_id, proc->instance_cnt_rxtx,proc->subframe_rx);
+ AssertFatal (pthread_cond_signal(&proc->cond_rxtx) ==0,"");
+ AssertFatal(pthread_mutex_unlock(&proc->mutex_rxtx) ==0,"");
+ initRefTimes(t1);
+ initStaticTime(lastTime);
+ updateTimes(lastTime, &t1, 20000, "Delay between two IQ acquisitions (case 1)");
+ pickStaticTime(lastTime);
+ } else {
+ printf("Processing subframe %d",proc->subframe_rx);
+ getchar();
+ }
+ } // start_rx_stream==1
+ } // UE->is_synchronized==1
+ } // while !oai_exit
- } // while !oai_exit
- return NULL;
+ return NULL;
}
@@ -1799,28 +1796,26 @@ void *UE_thread(void *arg) {
void init_UE_threads(int inst) {
struct rx_tx_thread_data *rtd;
PHY_VARS_UE *UE;
-
AssertFatal(PHY_vars_UE_g!=NULL,"PHY_vars_UE_g is NULL\n");
AssertFatal(PHY_vars_UE_g[inst]!=NULL,"PHY_vars_UE_g[inst] is NULL\n");
AssertFatal(PHY_vars_UE_g[inst][0]!=NULL,"PHY_vars_UE_g[inst][0] is NULL\n");
UE = PHY_vars_UE_g[inst][0];
-
pthread_attr_init (&UE->proc.attr_ue);
pthread_attr_setstacksize(&UE->proc.attr_ue,8192);//5*PTHREAD_STACK_MIN);
-
pthread_mutex_init(&UE->proc.mutex_synch,NULL);
pthread_cond_init(&UE->proc.cond_synch,NULL);
UE->proc.instance_cnt_synch = -1;
UE->is_synchronized = 0;
-
// the threads are not yet active, therefore access is allowed without locking
int nb_threads=RX_NB_TH;
+
for (int i=0; i<nb_threads; i++) {
rtd = calloc(1, sizeof(struct rx_tx_thread_data));
+
if (rtd == NULL) abort();
+
rtd->UE = UE;
rtd->proc = &UE->proc.proc_rxtx[i];
-
pthread_mutex_init(&UE->proc.proc_rxtx[i].mutex_rxtx,NULL);
pthread_cond_init(&UE->proc.proc_rxtx[i].cond_rxtx,NULL);
UE->proc.proc_rxtx[i].instance_cnt_rxtx = -1;
@@ -1828,19 +1823,17 @@ void init_UE_threads(int inst) {
UE->proc.proc_rxtx[i].sub_frame_step=nb_threads;
printf("Init_UE_threads rtd %d proc %d nb_threads %d i %d\n",rtd->proc->sub_frame_start, UE->proc.proc_rxtx[i].sub_frame_start,nb_threads, i);
pthread_create(&UE->proc.proc_rxtx[i].pthread_rxtx, NULL, UE_thread_rxn_txnp4, rtd);
-
#ifdef UE_SLOT_PARALLELISATION
//pthread_mutex_init(&UE->proc.proc_rxtx[i].mutex_slot0_dl_processing,NULL);
//pthread_cond_init(&UE->proc.proc_rxtx[i].cond_slot0_dl_processing,NULL);
//pthread_create(&UE->proc.proc_rxtx[i].pthread_slot0_dl_processing,NULL,UE_thread_slot0_dl_processing, rtd);
-
pthread_mutex_init(&UE->proc.proc_rxtx[i].mutex_slot1_dl_processing,NULL);
pthread_cond_init(&UE->proc.proc_rxtx[i].cond_slot1_dl_processing,NULL);
pthread_create(&UE->proc.proc_rxtx[i].pthread_slot1_dl_processing,NULL,UE_thread_slot1_dl_processing, rtd);
#endif
-
}
- pthread_create(&UE->proc.pthread_synch,NULL,UE_thread_synch,(void*)UE);
+
+ pthread_create(&UE->proc.pthread_synch,NULL,UE_thread_synch,(void *)UE);
}
@@ -1860,40 +1853,42 @@ void init_UE_single_thread_stub(int nb_inst) {
struct rx_tx_thread_data *rtd;
PHY_VARS_UE *UE;
- for (int i=0; i<nb_inst; i++){
- AssertFatal(PHY_vars_UE_g!=NULL,"PHY_vars_UE_g is NULL\n");
- AssertFatal(PHY_vars_UE_g[i]!=NULL,"PHY_vars_UE_g[inst] is NULL\n");
- AssertFatal(PHY_vars_UE_g[i][0]!=NULL,"PHY_vars_UE_g[inst][0] is NULL\n");
- if(nfapi_mode == 3){
+ for (int i=0; i<nb_inst; i++) {
+ AssertFatal(PHY_vars_UE_g!=NULL,"PHY_vars_UE_g is NULL\n");
+ AssertFatal(PHY_vars_UE_g[i]!=NULL,"PHY_vars_UE_g[inst] is NULL\n");
+ AssertFatal(PHY_vars_UE_g[i][0]!=NULL,"PHY_vars_UE_g[inst][0] is NULL\n");
+
+ if(nfapi_mode == 3) {
#ifdef NAS_UE
- MessageDef *message_p;
- message_p = itti_alloc_new_message(TASK_NAS_UE, INITIALIZE_MESSAGE);
- itti_send_msg_to_task (TASK_NAS_UE, i + NB_eNB_INST, message_p);
+ MessageDef *message_p;
+ message_p = itti_alloc_new_message(TASK_NAS_UE, INITIALIZE_MESSAGE);
+ itti_send_msg_to_task (TASK_NAS_UE, i + NB_eNB_INST, message_p);
#endif
- }
+ }
}
- UE = PHY_vars_UE_g[0][0];
+ UE = PHY_vars_UE_g[0][0];
pthread_attr_init (&UE->proc.attr_ue);
pthread_attr_setstacksize(&UE->proc.attr_ue,8192);//5*PTHREAD_STACK_MIN);
-
// Don't need synch for phy_stub mode
//pthread_mutex_init(&UE->proc.mutex_synch,NULL);
//pthread_cond_init(&UE->proc.cond_synch,NULL);
-
// the threads are not yet active, therefore access is allowed without locking
// In phy_stub_UE mode due to less heavy processing operations we don't need two threads
//int nb_threads=RX_NB_TH;
int nb_threads=1;
- for(uint16_t ue_thread_id = 0;ue_thread_id < NB_THREAD_INST;ue_thread_id++){
+
+ for(uint16_t ue_thread_id = 0; ue_thread_id < NB_THREAD_INST; ue_thread_id++) {
UE = PHY_vars_UE_g[ue_thread_id][0];
+
for (int i=0; i<nb_threads; i++) {
rtd = calloc(1, sizeof(struct rx_tx_thread_data));
+
if (rtd == NULL) abort();
+
rtd->UE = UE;
rtd->proc = &UE->proc.proc_rxtx[i];
rtd->ue_thread_id = ue_thread_id;
-
pthread_mutex_init(&UE->proc.proc_rxtx[i].mutex_rxtx,NULL);
pthread_cond_init(&UE->proc.proc_rxtx[i].cond_rxtx,NULL);
UE->proc.proc_rxtx[i].sub_frame_start=i;
@@ -1902,6 +1897,7 @@ void init_UE_single_thread_stub(int nb_inst) {
pthread_create(&UE->proc.proc_rxtx[i].pthread_rxtx, NULL, UE_phy_stub_single_thread_rxn_txnp4, rtd);
}
}
+
// Remove thread for UE_sync in phy_stub_UE mode.
//pthread_create(&UE->proc.pthread_synch,NULL,UE_thread_synch,(void*)UE);
}
@@ -1923,38 +1919,35 @@ void init_UE_single_thread_stub(int nb_inst) {
void init_UE_threads_stub(int inst) {
struct rx_tx_thread_data *rtd;
PHY_VARS_UE *UE;
-
AssertFatal(PHY_vars_UE_g!=NULL,"PHY_vars_UE_g is NULL\n");
AssertFatal(PHY_vars_UE_g[inst]!=NULL,"PHY_vars_UE_g[inst] is NULL\n");
AssertFatal(PHY_vars_UE_g[inst][0]!=NULL,"PHY_vars_UE_g[inst][0] is NULL\n");
UE = PHY_vars_UE_g[inst][0];
-
pthread_attr_init (&UE->proc.attr_ue);
pthread_attr_setstacksize(&UE->proc.attr_ue,8192);//5*PTHREAD_STACK_MIN);
-
// Don't need synch for phy_stub mode
//pthread_mutex_init(&UE->proc.mutex_synch,NULL);
//pthread_cond_init(&UE->proc.cond_synch,NULL);
-
// the threads are not yet active, therefore access is allowed without locking
// In phy_stub_UE mode due to less heavy processing operations we don't need two threads
//int nb_threads=RX_NB_TH;
int nb_threads=1;
+
for (int i=0; i<nb_threads; i++) {
rtd = calloc(1, sizeof(struct rx_tx_thread_data));
+
if (rtd == NULL) abort();
+
rtd->UE = UE;
rtd->proc = &UE->proc.proc_rxtx[i];
-
pthread_mutex_init(&UE->proc.proc_rxtx[i].mutex_rxtx,NULL);
pthread_cond_init(&UE->proc.proc_rxtx[i].cond_rxtx,NULL);
UE->proc.proc_rxtx[i].sub_frame_start=i;
UE->proc.proc_rxtx[i].sub_frame_step=nb_threads;
printf("Init_UE_threads rtd %d proc %d nb_threads %d i %d\n",rtd->proc->sub_frame_start, UE->proc.proc_rxtx[i].sub_frame_start,nb_threads, i);
pthread_create(&UE->proc.proc_rxtx[i].pthread_rxtx, NULL, UE_phy_stub_thread_rxn_txnp4, rtd);
-
-
}
+
// Remove thread for UE_sync in phy_stub_UE mode.
//pthread_create(&UE->proc.pthread_synch,NULL,UE_thread_synch,(void*)UE);
}
@@ -1964,61 +1957,54 @@ void init_UE_threads_stub(int inst) {
#ifdef OPENAIR2
void fill_ue_band_info(void) {
-
LTE_UE_EUTRA_Capability_t *UE_EUTRA_Capability = UE_rrc_inst[0].UECap->UE_EUTRA_Capability;
int i,j;
-
bands_to_scan.nbands = UE_EUTRA_Capability->rf_Parameters.supportedBandListEUTRA.list.count;
for (i=0; i<bands_to_scan.nbands; i++) {
-
for (j=0; j<sizeof (eutra_bands) / sizeof (eutra_bands[0]); j++)
if (eutra_bands[j].band == UE_EUTRA_Capability->rf_Parameters.supportedBandListEUTRA.list.array[i]->bandEUTRA) {
- memcpy(&bands_to_scan.band_info[i],
- &eutra_bands[j],
- sizeof(eutra_band_t));
-
- printf("Band %d (%lu) : DL %u..%u Hz, UL %u..%u Hz, Duplex %s \n",
- bands_to_scan.band_info[i].band,
- UE_EUTRA_Capability->rf_Parameters.supportedBandListEUTRA.list.array[i]->bandEUTRA,
- bands_to_scan.band_info[i].dl_min,
- bands_to_scan.band_info[i].dl_max,
- bands_to_scan.band_info[i].ul_min,
- bands_to_scan.band_info[i].ul_max,
- (bands_to_scan.band_info[i].frame_type==FDD) ? "FDD" : "TDD");
- break;
+ memcpy(&bands_to_scan.band_info[i],
+ &eutra_bands[j],
+ sizeof(eutra_band_t));
+ printf("Band %d (%lu) : DL %u..%u Hz, UL %u..%u Hz, Duplex %s \n",
+ bands_to_scan.band_info[i].band,
+ UE_EUTRA_Capability->rf_Parameters.supportedBandListEUTRA.list.array[i]->bandEUTRA,
+ bands_to_scan.band_info[i].dl_min,
+ bands_to_scan.band_info[i].dl_max,
+ bands_to_scan.band_info[i].ul_min,
+ bands_to_scan.band_info[i].ul_max,
+ (bands_to_scan.band_info[i].frame_type==FDD) ? "FDD" : "TDD");
+ break;
}
}
}
#endif
int setup_ue_buffers(PHY_VARS_UE **phy_vars_ue, openair0_config_t *openair0_cfg) {
-
int i, CC_id;
LTE_DL_FRAME_PARMS *frame_parms;
for (CC_id=0; CC_id<MAX_NUM_CCs; CC_id++) {
-
AssertFatal( phy_vars_ue[CC_id] !=0, "");
frame_parms = &(phy_vars_ue[CC_id]->frame_parms);
-
// replace RX signal buffers with mmaped HW versions
- rxdata = (int32_t**)malloc16( frame_parms->nb_antennas_rx*sizeof(int32_t*) );
- txdata = (int32_t**)malloc16( frame_parms->nb_antennas_tx*sizeof(int32_t*) );
+ rxdata = (int32_t **)malloc16( frame_parms->nb_antennas_rx*sizeof(int32_t *) );
+ txdata = (int32_t **)malloc16( frame_parms->nb_antennas_tx*sizeof(int32_t *) );
for (i=0; i<frame_parms->nb_antennas_rx; i++) {
LOG_I(PHY, "Mapping UE CC_id %d, rx_ant %d, freq %u on card %d, chain %d\n",
- CC_id, i, downlink_frequency[CC_id][i], phy_vars_ue[CC_id]->rf_map.card, (phy_vars_ue[CC_id]->rf_map.chain)+i );
+ CC_id, i, downlink_frequency[CC_id][i], phy_vars_ue[CC_id]->rf_map.card, (phy_vars_ue[CC_id]->rf_map.chain)+i );
free( phy_vars_ue[CC_id]->common_vars.rxdata[i] );
- rxdata[i] = (int32_t*)malloc16_clear( 307200*sizeof(int32_t) );
+ rxdata[i] = (int32_t *)malloc16_clear( 307200*sizeof(int32_t) );
phy_vars_ue[CC_id]->common_vars.rxdata[i] = rxdata[i]; // what about the "-N_TA_offset" ? // N_TA offset for TDD
}
for (i=0; i<frame_parms->nb_antennas_tx; i++) {
LOG_I(PHY, "Mapping UE CC_id %d, tx_ant %d, freq %u on card %d, chain %d\n",
- CC_id, i, downlink_frequency[CC_id][i], phy_vars_ue[CC_id]->rf_map.card, (phy_vars_ue[CC_id]->rf_map.chain)+i );
+ CC_id, i, downlink_frequency[CC_id][i], phy_vars_ue[CC_id]->rf_map.card, (phy_vars_ue[CC_id]->rf_map.chain)+i );
free( phy_vars_ue[CC_id]->common_vars.txdata[i] );
- txdata[i] = (int32_t*)malloc16_clear( 307200*sizeof(int32_t) );
+ txdata[i] = (int32_t *)malloc16_clear( 307200*sizeof(int32_t) );
phy_vars_ue[CC_id]->common_vars.txdata[i] = txdata[i];
}
@@ -2027,6 +2013,7 @@ int setup_ue_buffers(PHY_VARS_UE **phy_vars_ue, openair0_config_t *openair0_cfg)
// be careful when releasing memory!
// because no "release_ue_buffers"-function is available, at least rxdata and txdata memory will leak (only some bytes)
}
+
return 0;
}
@@ -2039,7 +2026,7 @@ int setup_ue_buffers(PHY_VARS_UE **phy_vars_ue, openair0_config_t *openair0_cfg)
// playing the role of nfapi-pnf.
//02/02/2018
-static void* timer_thread( void* param ) {
+static void *timer_thread( void *param ) {
thread_top_init("timer_thread",1,870000L,1000000L,1000000L);
timer_subframe =9;
timer_frame =1023;
@@ -2049,43 +2036,48 @@ static void* timer_thread( void* param ) {
UE = PHY_vars_UE_g[0][0];
//double t_diff;
int external_timer = 0;
-
-
wait_sync("timer_thread");
-
opp_enabled = 1;
// first check if we are receiving timing indications
if(nfapi_mode==4) {
- usleep(10000);
- if (UE->instance_cnt_timer > 0) {
- external_timer = 1;
- int absSFm1 = ((emulator_absSF+10239)%10240);
- timer_frame = absSFm1/10;
- timer_subframe = absSFm1%10;
- pthread_mutex_lock(&UE->timer_mutex);
- UE->instance_cnt_timer = -1;
- pthread_mutex_unlock(&UE->timer_mutex);
- LOG_I(PHY,"Running with external timer\n");
- }
- else LOG_I(PHY,"Running with internal timer\n");
+ usleep(10000);
+
+ if (UE->instance_cnt_timer > 0) {
+ external_timer = 1;
+ int absSFm1 = ((emulator_absSF+10239)%10240);
+ timer_frame = absSFm1/10;
+ timer_subframe = absSFm1%10;
+ pthread_mutex_lock(&UE->timer_mutex);
+ UE->instance_cnt_timer = -1;
+ pthread_mutex_unlock(&UE->timer_mutex);
+ LOG_I(PHY,"Running with external timer\n");
+ } else LOG_I(PHY,"Running with internal timer\n");
}
struct timespec t_start;
+
struct timespec t_now;
+
struct timespec t_sleep;
+
uint64_t T_0;
+
uint64_t T_now;
+
uint64_t T_next_SF;
+
uint64_t T_sleep;
+
uint64_t sf_cnt = 0; //Total Subframe counter
clock_gettime(CLOCK_MONOTONIC, &t_start);
+
T_0 = (uint64_t) t_start.tv_sec*1000000000 + t_start.tv_nsec;
+
LOG_D(MAC, "timer_thread(), T_0 value: %" PRId64 "\n", T_0);
while (!oai_exit) {
-
// these are local subframe/frame counters to check that we are in synch with the fronthaul timing.
// They are set on the first rx/tx in the underly FH routines.
if (timer_subframe==9) {
@@ -2099,74 +2091,72 @@ static void* timer_thread( void* param ) {
//AssertFatal( 0 == pthread_cond_signal(&phy_stub_ticking->cond_ticking), "");
AssertFatal(pthread_mutex_lock(&phy_stub_ticking->mutex_ticking) ==0,"");
phy_stub_ticking->ticking_var++;
+
// This should probably be a call to pthread_cond_broadcast when we introduce support for multiple UEs (threads)
- if(phy_stub_ticking->ticking_var == 0){
+ if(phy_stub_ticking->ticking_var == 0) {
//AssertFatal(phy_stub_ticking->ticking_var == 0,"phy_stub_ticking->ticking_var = %d",
- //phy_stub_ticking->ticking_var);
+ //phy_stub_ticking->ticking_var);
if (pthread_cond_signal(&phy_stub_ticking->cond_ticking) != 0) {
- //LOG_E( PHY, "[SCHED][UE %d] ERROR pthread_cond_signal for UE RX thread\n", UE->Mod_id);
- LOG_E( PHY, "timer_thread ERROR pthread_cond_signal for UE_thread\n");
- exit_fun("nothing to add");
+ //LOG_E( PHY, "[SCHED][UE %d] ERROR pthread_cond_signal for UE RX thread\n", UE->Mod_id);
+ LOG_E( PHY, "timer_thread ERROR pthread_cond_signal for UE_thread\n");
+ exit_fun("nothing to add");
}
- }
- else
- LOG_D(MAC, "timer_thread() Timing problem! ticking_var value:%d \n \n \n", phy_stub_ticking->ticking_var);
+ } else
+ LOG_D(MAC, "timer_thread() Timing problem! ticking_var value:%d \n \n \n", phy_stub_ticking->ticking_var);
AssertFatal(pthread_mutex_unlock(&phy_stub_ticking->mutex_ticking) ==0,"");
start_meas(&UE->timer_stats);
-
//clock_gettime(CLOCK_PROCESS_CPUTIME_ID, &start); // get initial time-stamp
if (external_timer == 0) {
- clock_gettime(CLOCK_MONOTONIC, &t_now);
- sf_cnt++;
- T_next_SF = T_0 + sf_cnt*1000000;
- T_now =(uint64_t) t_now.tv_sec*1000000000 + t_now.tv_nsec;
- if(T_now > T_next_SF){
- t_sleep.tv_sec =0;
- t_sleep.tv_nsec =0;
- }
- else{
- T_sleep = T_next_SF - T_now;
- t_sleep.tv_sec =0;
- t_sleep.tv_nsec = (__syscall_slong_t) T_sleep;
- }
+ clock_gettime(CLOCK_MONOTONIC, &t_now);
+ sf_cnt++;
+ T_next_SF = T_0 + sf_cnt*1000000;
+ T_now =(uint64_t) t_now.tv_sec*1000000000 + t_now.tv_nsec;
+
+ if(T_now > T_next_SF) {
+ t_sleep.tv_sec =0;
+ t_sleep.tv_nsec =0;
+ } else {
+ T_sleep = T_next_SF - T_now;
+ t_sleep.tv_sec =0;
+ t_sleep.tv_nsec = (__syscall_slong_t) T_sleep;
+ }
+
nanosleep(&t_sleep, (struct timespec *)NULL);
UE_tport_t pdu;
pdu.header.packet_type = TTI_SYNC;
pdu.header.absSF = (timer_frame*10)+timer_subframe;
- if (nfapi_mode!=3){
- multicast_link_write_sock(0,
- (char *)&pdu,
- sizeof(UE_tport_header_t));
- }
- }
- else {
+ if (nfapi_mode!=3) {
+ multicast_link_write_sock(0,
+ (char *)&pdu,
+ sizeof(UE_tport_header_t));
+ }
+ } else {
wait_on_condition(&UE->timer_mutex,&UE->timer_cond,&UE->instance_cnt_timer,"timer_thread");
release_thread(&UE->timer_mutex,&UE->instance_cnt_timer,"timer_thread");
}
-
/*stop_meas(&UE->timer_stats);
t_diff = get_time_meas_us(&UE->timer_stats);
stop_meas(&UE->timer_stats);
t_diff = get_time_meas_us(&UE->timer_stats);*/
}
+
free(phy_stub_ticking);
pthread_cond_destroy(&phy_stub_ticking->cond_ticking);
pthread_mutex_destroy(&phy_stub_ticking->mutex_ticking);
return 0;
-
}
int init_timer_thread(void) {
//PHY_VARS_UE *UE=PHY_vars_UE_g[0];
- PHY_VARS_UE *UE=PHY_vars_UE_g[0][0];
- phy_stub_ticking = (SF_ticking*)malloc(sizeof(SF_ticking));
+ PHY_VARS_UE *UE=PHY_vars_UE_g[0][0];
+ phy_stub_ticking = (SF_ticking *)malloc(sizeof(SF_ticking));
pthread_mutex_init(&UE->timer_mutex,NULL);
pthread_cond_init(&UE->timer_cond,NULL);
UE->instance_cnt_timer = -1;
@@ -2183,8 +2173,7 @@ int init_timer_thread(void) {
/* HACK: this function is needed to compile the UE
* fix it somehow
*/
-int8_t find_dlsch(uint16_t rnti, PHY_VARS_eNB *eNB,find_type_t type)
-{
+int8_t find_dlsch(uint16_t rnti, PHY_VARS_eNB *eNB,find_type_t type) {
printf("you cannot read this\n");
abort();
}
diff --git a/targets/RT/USER/lte-uesoftmodem.c b/targets/RT/USER/lte-uesoftmodem.c
index 2eeb4cd426f..f327b83cf9b 100644
--- a/targets/RT/USER/lte-uesoftmodem.c
+++ b/targets/RT/USER/lte-uesoftmodem.c
@@ -760,22 +760,22 @@ int main( int argc, char **argv ) {
}
MSC_INIT(MSC_E_UTRAN, THREAD_MAX+TASK_MAX);
-
init_opt();
uint32_t pdcp_initmask = (!IS_SOFTMODEM_NOS1 )? LINK_ENB_PDCP_TO_GTPV1U_BIT : (LINK_ENB_PDCP_TO_GTPV1U_BIT | PDCP_USE_NETLINK_BIT | LINK_ENB_PDCP_TO_IP_DRIVER_BIT);
if ( IS_SOFTMODEM_BASICSIM || IS_SOFTMODEM_RFSIM || (nfapi_mode == 3) ) {
pdcp_initmask = pdcp_initmask | UE_NAS_USE_TUN_BIT;
}
+
if ( IS_SOFTMODEM_NOKRNMOD)
pdcp_initmask = pdcp_initmask | UE_NAS_USE_TUN_BIT;
+
pdcp_module_init( pdcp_initmask );
//TTN for D2D
printf ("RRC control socket\n");
rrc_control_socket_init();
printf ("PDCP PC5S socket\n");
pdcp_pc5_socket_init();
-
// to make a graceful exit when ctrl-c is pressed
signal(SIGSEGV, signal_handler);
signal(SIGINT, signal_handler);
--
GitLab