diff --git a/executables/nr-softmodem.h b/executables/nr-softmodem.h index 22b213a8d93f3c82b55c985154a4322ec691fb10..69e441acb830af1c9f27de503e0b2f743ed36d12 100644 --- a/executables/nr-softmodem.h +++ b/executables/nr-softmodem.h @@ -34,8 +34,6 @@ {"s" , CONFIG_HLP_SNR, 0, dblptr:&snr_dB, defdblval:25, TYPE_DOUBLE, 0}, \ } -#include "threads_t.h" -extern threads_t threads; extern uint32_t target_dl_mcs; extern uint32_t target_dl_Nl; extern uint32_t target_ul_Nl; diff --git a/executables/threads_t.h b/executables/threads_t.h deleted file mode 100644 index c4b233ccc9d14112a4c4c03ce38932135ec596c9..0000000000000000000000000000000000000000 --- a/executables/threads_t.h +++ /dev/null @@ -1,21 +0,0 @@ -#ifndef _EXECUTABLES_THREADS_T_H_ -#define _EXECUTABLES_THREADS_T_H_ - -typedef struct threads_s { - int main; - int sync; - int one; - int two; - int three; - int slot1_proc_one; - int slot1_proc_two; - int slot1_proc_three; - //int dlsch_td_one; - //int dlsch_td_two; - //int dlsch_td_three; - //int dlsch_td1_one; - //int dlsch_td1_two; - //int dlsch_td1_three; -} threads_t; - -#endif /* _EXECUTABLES_THREADS_T_H_ */ diff --git a/targets/COMMON/threads_t.h b/targets/COMMON/threads_t.h deleted file mode 100644 index 5fb1645444bce8fa6e998e9ee6bb777679ad65cc..0000000000000000000000000000000000000000 --- a/targets/COMMON/threads_t.h +++ /dev/null @@ -1,21 +0,0 @@ -#ifndef _TARGETS_COMMON_THREADS_T_H_ -#define _TARGETS_COMMON_THREADS_T_H_ - -typedef struct threads_s { - int main; - int sync; - int one; - int two; - int three; - int slot1_proc_one; - int slot1_proc_two; - int slot1_proc_three; - //int dlsch_td_one; - //int dlsch_td_two; - //int dlsch_td_three; - //int dlsch_td1_one; - //int dlsch_td1_two; - //int dlsch_td1_three; -} threads_t; - -#endif /* _TARGETS_COMMON_THREADS_T_H_ */ diff --git a/targets/RT/USER/lte-softmodem.h b/targets/RT/USER/lte-softmodem.h index 61f64cf7748f4a105bbf95dfa602de609e863c57..ac7f3234ba85f3645835f770768322aec2594d37 100644 --- a/targets/RT/USER/lte-softmodem.h +++ b/targets/RT/USER/lte-softmodem.h @@ -19,7 +19,6 @@ #include <sys/sysinfo.h> #include <sys/types.h> #include <unistd.h> -#include "threads_t.h" #include "sdr/COMMON/common_lib.h" //#undef MALLOC #include "assertions.h" @@ -117,15 +116,6 @@ /*-----------------------------------------------------------------------------------------------------------------------------*/ /* command line parameters specific to UE threads */ /* optname helpstr paramflags XXXptr defXXXval type numelt */ -/*-----------------------------------------------------------------------------------------------------------------------------*/ -#define CMDLINE_UETHREADSPARAMS_DESC { \ - {"threadOneSubframe", NULL, 0, iptr:&(threads.one), defintval:1, TYPE_INT, 0}, \ - {"threadTwoSubframe", NULL, 0, iptr:&(threads.two), defintval:1, TYPE_INT, 0}, \ - {"threadThreeSubframe", NULL, 0, iptr:&(threads.three), defintval:1, TYPE_INT, 0}, \ - {"threadSlot1ProcOne", NULL, 0, iptr:&(threads.slot1_proc_one), defintval:1, TYPE_INT, 0}, \ - {"threadSlot1ProcTwo", NULL, 0, iptr:&(threads.slot1_proc_two), defintval:1, TYPE_INT, 0}, \ - } -// {"threadIQ", NULL, 0, iptr:&(threads.iq), defintval:1, TYPE_INT, 0}, #define DEFAULT_DLF 2680000000 diff --git a/targets/RT/USER/lte-ue.c b/targets/RT/USER/lte-ue.c index 26d37bff5eb46194a9e7632e3cc39f3c81876daf..270e5b1d4e0c773e2eac2575ce143a9c8fe853dd 100644 --- a/targets/RT/USER/lte-ue.c +++ b/targets/RT/USER/lte-ue.c @@ -151,19 +151,10 @@ static const eutra_band_t eutra_bands[] = { }; -threads_t threads= {-1,-1,-1,-1,-1,-1,-1,-1}; - pthread_t main_ue_thread; pthread_attr_t attr_UE_thread; 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, @@ -452,9 +443,6 @@ static void *UE_thread_synch(void *arg) { cpu_set_t cpuset; CPU_ZERO(&cpuset); - if ( threads.sync != -1 ) - CPU_SET(threads.sync, &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); @@ -757,15 +745,6 @@ static void *UE_thread_rxn_txnp4(void *arg) { cpu_set_t cpuset; CPU_ZERO(&cpuset); - if ( (proc->sub_frame_start+1)%RX_NB_TH == 0 && threads.one != -1 ) - CPU_SET(threads.one, &cpuset); - - if ( RX_NB_TH > 1 && (proc->sub_frame_start+1)%RX_NB_TH == 1 && threads.two != -1 ) - CPU_SET(threads.two, &cpuset); - - if ( RX_NB_TH > 2 && (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); @@ -1915,9 +1894,6 @@ void *UE_thread(void *arg) { cpu_set_t cpuset; CPU_ZERO(&cpuset); - if ( threads.main != -1 ) - CPU_SET(threads.main, &cpuset); - init_thread(100000, 500000, FIFO_PRIORITY, &cpuset, "UHD Threads"); /* while (sync_var<0) diff --git a/targets/RT/USER/lte-uesoftmodem.c b/targets/RT/USER/lte-uesoftmodem.c index acb762682fe3a9d5e9f306bc813bef97f4eaccd5..ee59741179dcf45c71bb2ac0e715c4b3af5fb60c 100644 --- a/targets/RT/USER/lte-uesoftmodem.c +++ b/targets/RT/USER/lte-uesoftmodem.c @@ -155,7 +155,6 @@ uint64_t num_missed_slots=0; // counter for the number of missed slots // prototypes from function implemented in lte-ue.c, probably should be elsewhere in a include file. extern void init_UE_stub_single_thread(int nb_inst,int eMBMS_active, int uecap_xer_in, char *emul_iface); extern PHY_VARS_UE *init_ue_vars(LTE_DL_FRAME_PARMS *frame_parms, uint8_t UE_id, uint8_t abstraction_flag); -extern void get_uethreads_params(void); int transmission_mode=1; @@ -284,7 +283,6 @@ static void get_options(void) { /* unknown parameters on command line will be checked in main after all init have been performed */ get_common_options(SOFTMODEM_4GUE_BIT ); - get_uethreads_params(); paramdef_t cmdline_uemodeparams[] =CMDLINE_UEMODEPARAMS_DESC; paramdef_t cmdline_ueparams[] =CMDLINE_UEPARAMS_DESC; config_process_cmdline( cmdline_uemodeparams,sizeof(cmdline_uemodeparams)/sizeof(paramdef_t),NULL);