improved l1 stats
replaced calls to exit with mac_xface->macphy_exit git-svn-id: http://svn.eurecom.fr/openair4G/trunk@5766 818b1a75-f10b-46b9-bf7c-635c3b92a50f
This commit is contained in:
Florian Kaltenberger
@@ -24,8 +24,6 @@ endif
|
||||
CFLAGS += -O2
|
||||
CFLAGS += -DDRIVER2013 -I$(OPENAIR_TARGETS)/ARCH/COMMON
|
||||
|
||||
CFLAGS += -DMAX_NUM_CCs=1
|
||||
|
||||
ifeq ($(USRP),0)
|
||||
CFLAGS += -I$(OPENAIR_TARGETS)/ARCH/EXMIMO/USERSPACE/LIB/ -I$(OPENAIR_TARGETS)/ARCH/EXMIMO/DEFS -DENABLE_VCD_FIFO
|
||||
endif
|
||||
@@ -39,13 +37,10 @@ ifdef LIBCONFIG_LONG
|
||||
CFLAGS += -DLIBCONFIG_LONG
|
||||
endif
|
||||
|
||||
|
||||
ifndef RTAI
|
||||
RTAI=1
|
||||
endif
|
||||
|
||||
|
||||
|
||||
ifeq ($(ENABLE_RAL), 1)
|
||||
CFLAGS += -DENABLE_RAL
|
||||
endif
|
||||
@@ -65,6 +60,9 @@ endif
|
||||
endif
|
||||
endif
|
||||
|
||||
ifdef JF
|
||||
CFLAGS += -DJUMBO_FRAME
|
||||
endif
|
||||
|
||||
ifeq ($(RTAI),1)
|
||||
CFLAGS += -DENABLE_RTAI_CLOCK
|
||||
@@ -138,7 +136,6 @@ endif
|
||||
RTAI_OBJ += $(UTILS_OBJS)
|
||||
|
||||
|
||||
|
||||
#ifdef ENABLE_ITTI
|
||||
CFLAGS += -DEXMIMO_IOT
|
||||
#endif
|
||||
|
||||
@@ -301,8 +301,7 @@ static int mbox_bounds[20] = {8,16,24,30,38,46,54,60,68,7
|
||||
static LTE_DL_FRAME_PARMS *frame_parms[MAX_NUM_CCs];
|
||||
|
||||
int multi_thread=1;
|
||||
// this allows
|
||||
uint32_t target_dl_mcs = 28;
|
||||
uint32_t target_dl_mcs = 28; //maximum allowed mcs
|
||||
uint32_t target_ul_mcs = 8;
|
||||
|
||||
|
||||
@@ -453,7 +452,8 @@ static void *scope_thread(void *arg) {
|
||||
|
||||
}
|
||||
//printf("doing forms\n");
|
||||
usleep(100000); // 100 ms
|
||||
//usleep(100000); // 100 ms
|
||||
sleep(1);
|
||||
}
|
||||
|
||||
# ifdef ENABLE_XFORMS_WRITE_STATS
|
||||
@@ -1776,16 +1776,17 @@ static void get_options (int argc, char **argv) {
|
||||
break;
|
||||
case 'C':
|
||||
for (CC_id=0;CC_id<MAX_NUM_CCs;CC_id++) {
|
||||
downlink_frequency[CC_id][0] = atof(optarg); // Use float to avoid issue with frequency over 2^31.
|
||||
downlink_frequency[CC_id][1] = downlink_frequency[CC_id][0];
|
||||
downlink_frequency[CC_id][2] = downlink_frequency[CC_id][0];
|
||||
downlink_frequency[CC_id][3] = downlink_frequency[CC_id][0];
|
||||
carrier_freq[CC_id][0] = downlink_frequency[CC_id][0];
|
||||
carrier_freq[CC_id][1] = downlink_frequency[CC_id][1];
|
||||
carrier_freq[CC_id][2] = downlink_frequency[CC_id][2];
|
||||
carrier_freq[CC_id][3] = downlink_frequency[CC_id][3];
|
||||
downlink_frequency[CC_id][0] = atof(optarg); // Use float to avoid issue with frequency over 2^31.
|
||||
downlink_frequency[CC_id][1] = downlink_frequency[CC_id][0];
|
||||
downlink_frequency[CC_id][2] = downlink_frequency[CC_id][0];
|
||||
downlink_frequency[CC_id][3] = downlink_frequency[CC_id][0];
|
||||
carrier_freq[CC_id][0] = downlink_frequency[CC_id][0];
|
||||
carrier_freq[CC_id][1] = downlink_frequency[CC_id][1];
|
||||
carrier_freq[CC_id][2] = downlink_frequency[CC_id][2];
|
||||
carrier_freq[CC_id][3] = downlink_frequency[CC_id][3];
|
||||
|
||||
printf("Downlink for CC_id %d frequency set to %u\n", CC_id, downlink_frequency[CC_id][0]);
|
||||
}
|
||||
printf("Downlink for CC_id %d frequency set to %u\n", CC_id, downlink_frequency[CC_id][0]);
|
||||
break;
|
||||
|
||||
case 'd':
|
||||
@@ -2338,6 +2339,7 @@ int main(int argc, char **argv) {
|
||||
|
||||
#if defined(ENABLE_ITTI)
|
||||
if (create_tasks(UE_flag ? 0 : 1, UE_flag ? 1 : 0) < 0) {
|
||||
printf("cannot create ITTI tasks\n");
|
||||
exit(-1); // need a softer mode
|
||||
}
|
||||
printf("ITTI tasks created\n");
|
||||
@@ -2366,10 +2368,10 @@ int main(int argc, char **argv) {
|
||||
openair_daq_vars.timing_advance = 0;
|
||||
|
||||
openair0_rf_map rf_map[MAX_NUM_CCs];
|
||||
rf_map[0].card=0;
|
||||
rf_map[0].chain=0;
|
||||
rf_map[1].card=0;
|
||||
rf_map[1].chain=1;
|
||||
for(CC_id=0;CC_id<MAX_NUM_CCs;CC_id++) {
|
||||
rf_map[CC_id].card=0;
|
||||
rf_map[CC_id].chain=CC_id+1;
|
||||
}
|
||||
|
||||
// connect the TX/RX buffers
|
||||
if (UE_flag==1) {
|
||||
|
||||
@@ -16,11 +16,11 @@ create_form_stats_form( void )
|
||||
fdui->vdata = fdui->cdata = NULL;
|
||||
fdui->ldata = 0;
|
||||
|
||||
fdui->stats_form = fl_bgn_form( FL_NO_BOX, 1115, 659 );
|
||||
fdui->stats_form = fl_bgn_form( FL_NO_BOX, 1115, 900 );
|
||||
|
||||
obj = fl_add_box( FL_UP_BOX, 0, 0, 1115, 659, "" );
|
||||
obj = fl_add_box( FL_UP_BOX, 0, 0, 1115, 900, "" );
|
||||
|
||||
fdui->stats_text = obj = fl_add_text( FL_NORMAL_TEXT, 60, 50, 1000, 580, "test" );
|
||||
fdui->stats_text = obj = fl_add_text( FL_NORMAL_TEXT, 60, 50, 1000, 810, "test" );
|
||||
fl_set_object_lsize( obj, FL_TINY_SIZE );
|
||||
|
||||
fl_end_form( );
|
||||
|
||||
@@ -9,13 +9,13 @@ Unit of measure: FL_COORD_PIXEL
|
||||
=============== FORM ===============
|
||||
Name: stats_form
|
||||
Width: 1115
|
||||
Height: 659
|
||||
Height: 900
|
||||
Number of Objects: 2
|
||||
|
||||
--------------------
|
||||
class: FL_BOX
|
||||
type: UP_BOX
|
||||
box: 0 0 1115 659
|
||||
box: 0 0 1115 900
|
||||
boxtype: FL_UP_BOX
|
||||
colors: FL_COL1 FL_COL1
|
||||
alignment: FL_ALIGN_CENTER
|
||||
@@ -33,7 +33,7 @@ argument:
|
||||
--------------------
|
||||
class: FL_TEXT
|
||||
type: NORMAL_TEXT
|
||||
box: 60 50 1000 580
|
||||
box: 60 50 1000 810
|
||||
boxtype: FL_FLAT_BOX
|
||||
colors: FL_COL1 FL_MCOL
|
||||
alignment: FL_ALIGN_LEFT|FL_ALIGN_INSIDE
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
/* Header file generated by fdesign on Thu Jun 14 17:53:15 2012 */
|
||||
/* Header file generated by fdesign on Thu Aug 28 12:13:51 2014 */
|
||||
|
||||
#ifndef FD_stats_form_h_
|
||||
#define FD_stats_form_h_
|
||||
|
||||
Reference in New Issue
Block a user