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

re-apply fixes lost with last rebase

Browse Source
This commit is contained in:
frtabu
2019-02-12 10:12:07 +01:00
parent efe116abe5
commit d0a3788ca8
32 changed files with 96 additions and 109 deletions
Download Patch File Download Diff File Expand all files Collapse all files
targets/ARCH/EXMIMO/USERSPACE/OCTAVE/oarf_send_frame.cc
+1 -1
View File
@@ -116,7 +116,7 @@ DEFUN_DLD (oarf_send_frame, args, nargout,"Send frame")
for (i=0;i<4;i++) {
resampling_factor[i] = (openair0_exmimo_pci[card].exmimo_config_ptr)->framing.resampling_factor[i];
printf("card %d, ant %d, resampling %d\n",card,i,resampling_factor[i]);
printf("card %d, ant %d, resampling %u\n",card,i,resampling_factor[i]);
}
for (i=0;i<numcols;i++){
targets/RT/USER/lte-ue.c
+6 -3
View File
@@ -971,6 +971,10 @@ static void *UE_phy_stub_single_thread_rxn_txnp4(void *arg) {
//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");
}
UE_rxtx_proc_t *proc = rtd->proc;
// settings for nfapi-L2-emulator mode
@@ -984,9 +988,8 @@ static void *UE_phy_stub_single_thread_rxn_txnp4(void *arg) {
proc = &PHY_vars_UE_g[0][0]->proc.proc_rxtx[0];
phy_stub_ticking->num_single_thread[ue_thread_id] = -1;
if (rtd != NULL) {
UE = rtd->UE;
}
UE = rtd->UE;
if(ue_thread_id == 0){
phy_stub_ticking->ticking_var = -1;