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

git-svn-id: http://svn.eurecom.fr/openair4G/trunk@5507 818b1a75-f10b-46b9-bf7c-635c3b92a50f

Browse Source
This commit is contained in:
Raymond Knopp
2014-07-15 18:40:06 +00:00
parent b06aa6621b
commit 73188f4956
1 changed files with 20 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files
targets/RT/USER/lte-softmodem.c
+20 -16
View File
@@ -231,8 +231,8 @@ static int tx_max_power = 0;
#else #else
double sample_rate=30.72e6; double sample_rate=30.72e6;
static unsigned int rxg_max[4] = {133,133,133,133}; static unsigned int rxg_max[4] = {133,133,133,133};
static unsigned int rxg_med[4] = {127,127,127,127}; //static unsigned int rxg_med[4] = {127,127,127,127};
static unsigned int rxg_byp[4] = {120,120,120,120}; //static unsigned int rxg_byp[4] = {120,120,120,120};
static int tx_max_power = 0; static int tx_max_power = 0;
double bw = 14e6; double bw = 14e6;
char ref[128] = "internal"; char ref[128] = "internal";
@@ -276,9 +276,10 @@ static char do_forms=0;
int otg_enabled; int otg_enabled;
#endif #endif
//int number_of_cards = 1; //int number_of_cards = 1;
#ifndef USRP
static int mbox_bounds[20] = {8,16,24,30,38,46,54,60,68,76,84,90,98,106,114,120,128,136,144, 0}; ///boundaries of slots in terms ob mbox counter rounded up to even numbers static int mbox_bounds[20] = {8,16,24,30,38,46,54,60,68,76,84,90,98,106,114,120,128,136,144, 0}; ///boundaries of slots in terms ob mbox counter rounded up to even numbers
//static int mbox_bounds[20] = {6,14,22,28,36,44,52,58,66,74,82,88,96,104,112,118,126,134,142, 148}; ///boundaries of slots in terms ob mbox counter rounded up to even numbers //static int mbox_bounds[20] = {6,14,22,28,36,44,52,58,66,74,82,88,96,104,112,118,126,134,142, 148}; ///boundaries of slots in terms ob mbox counter rounded up to even numbers
#endif
static LTE_DL_FRAME_PARMS *frame_parms; static LTE_DL_FRAME_PARMS *frame_parms;
@@ -1034,20 +1035,22 @@ static void *eNB_thread(void *arg)
RT_TASK *task; RT_TASK *task;
#endif #endif
unsigned char slot=0;//,last_slot, next_slot; unsigned char slot=0;//,last_slot, next_slot;
int hw_slot,frame=0; int frame=0;
int diff; int diff;
int delay_cnt;
RTIME time_in, time_diff; RTIME time_in, time_diff;
int mbox_target=0,mbox_current=0;
int i;//
int ret;
// int tx_offset;
int sf; int sf;
#ifndef USRP #ifndef USRP
volatile unsigned int *DAQ_MBOX = openair0_daq_cnt(); volatile unsigned int *DAQ_MBOX = openair0_daq_cnt();
int mbox_target=0,mbox_current=0;
int hw_slot,delay_cnt;
#else #else
int rx_cnt = 0; int rx_cnt = 0;
int tx_cnt = tx_delay; int tx_cnt = tx_delay;
int i;//
int ret;
// int tx_offset;
hw_subframe = 0; hw_subframe = 0;
#endif #endif
#if defined(ENABLE_ITTI) #if defined(ENABLE_ITTI)
@@ -1510,8 +1513,8 @@ static void *UE_thread(void *arg) {
static void get_options (int argc, char **argv) { static void get_options (int argc, char **argv) {
int c; int c;
char line[1000]; // char line[1000];
int l; // int l;
const Enb_properties_array_t *enb_properties; const Enb_properties_array_t *enb_properties;
enum long_option_e { enum long_option_e {
@@ -1666,7 +1669,7 @@ int main(int argc, char **argv) {
// RT_TASK *task; // RT_TASK *task;
#else #else
int *eNB_thread_status_p; int *eNB_thread_status_p;
int *eNB_thread_status_rx[10],*eNB_thread_status_tx[10]; // int *eNB_thread_status_rx[10],*eNB_thread_status_tx[10];
#endif #endif
int i,j,aa; int i,j,aa;
#if defined (XFORMS) || defined (EMOS) || (! defined (RTAI)) #if defined (XFORMS) || defined (EMOS) || (! defined (RTAI))
@@ -1684,11 +1687,11 @@ int main(int argc, char **argv) {
unsigned int tcxo = 114; unsigned int tcxo = 114;
#endif #endif
int amp; // int amp;
// uint8_t prach_fmt; // uint8_t prach_fmt;
// int N_ZC; // int N_ZC;
int ret, ant; // int ret, ant;
int ant_offset=0; int ant_offset=0;
#if defined (EMOS) || (! defined (RTAI)) #if defined (EMOS) || (! defined (RTAI))
@@ -2367,10 +2370,11 @@ void setup_ue_buffers(PHY_VARS_UE *phy_vars_ue, LTE_DL_FRAME_PARMS *frame_parms,
void setup_eNB_buffers(PHY_VARS_eNB *phy_vars_eNB, LTE_DL_FRAME_PARMS *frame_parms, int carrier) { void setup_eNB_buffers(PHY_VARS_eNB *phy_vars_eNB, LTE_DL_FRAME_PARMS *frame_parms, int carrier) {
int i,j; int i;
#ifdef USRP #ifdef USRP
uint16_t N_TA_offset = 0; uint16_t N_TA_offset = 0;
#else
int j;
#endif #endif
if (phy_vars_eNB) { if (phy_vars_eNB) {