maki/openairinterface5g
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'develop-new-LMSSDR' into develop_integration_w02

Browse Source 
Conflicts:
	targets/RT/USER/lte-softmodem.c
This commit is contained in:
Cedric Roux
2017-01-13 17:01:30 +01:00
parent f3b84e7495 b018a3bbe9
commit adfaa6d9f3
70 changed files with 1357 additions and 23233 deletions
Download Patch File Download Diff File Expand all files Collapse all files
targets/RT/USER/lte-enb.c
+6 -6
View File
@@ -689,7 +689,7 @@ void fh_if4p5_asynch_UL(PHY_VARS_eNB *eNB,int *frame,int *subframe) {
if (proc->first_rx != 0) {
*frame = proc->frame_rx;
*subframe = proc->subframe_rx;
proc->first_rx = 0;
proc->first_rx--;
}
else {
if (proc->frame_rx != *frame) {
@@ -893,7 +893,7 @@ void rx_rf(PHY_VARS_eNB *eNB,int *frame,int *subframe) {
proc->frame_rx = (proc->timestamp_rx / (fp->samples_per_tti*10))&1023;
proc->subframe_rx = (proc->timestamp_rx / fp->samples_per_tti)%10;
proc->timestamp_tx = proc->timestamp_rx+(4*fp->samples_per_tti);
// printf("trx_read <- USRP TS %llu (sf %d, first_rx %d)\n", proc->timestamp_rx,proc->subframe_rx,proc->first_rx);
//printf("trx_read <- RX TS %llu (sf %d, first_rx %d)\n", proc->timestamp_rx,proc->subframe_rx,proc->first_rx);
if (proc->first_rx == 0) {
if (proc->subframe_rx != *subframe){
@@ -906,7 +906,7 @@ void rx_rf(PHY_VARS_eNB *eNB,int *frame,int *subframe) {
exit_fun("Exiting");
}
} else {
proc->first_rx = 0;
proc->first_rx--;
*frame = proc->frame_rx;
*subframe = proc->subframe_rx;
}
@@ -943,7 +943,7 @@ void rx_fh_if5(PHY_VARS_eNB *eNB,int *frame, int *subframe) {
exit_fun("Exiting");
}
} else {
proc->first_rx = 0;
proc->first_rx--;
*frame = proc->frame_rx;
*subframe = proc->subframe_rx;
}
@@ -995,7 +995,7 @@ void rx_fh_if4p5(PHY_VARS_eNB *eNB,int *frame,int *subframe) {
exit_fun("Exiting");
}
} else {
proc->first_rx = 0;
proc->first_rx--;
*frame = proc->frame_rx;
*subframe = proc->subframe_rx;
}
@@ -1339,7 +1339,7 @@ void init_eNB_proc(int inst) {
proc->instance_cnt_asynch_rxtx = -1;
proc->CC_id = CC_id;
proc->first_rx=1;
proc->first_rx=4;
proc->first_tx=1;
pthread_mutex_init( &proc_rxtx[0].mutex_rxtx, NULL);
targets/RT/USER/lte-softmodem.c
+1
View File
@@ -1365,6 +1365,7 @@ void init_openair0() {
openair0_cfg[card].rx_gain[i],
openair0_cfg[card].tx_freq[i],
openair0_cfg[card].rx_freq[i]);
openair0_cfg[card].configFilename = rf_config_file;
}
}
}