Skip to content

O
OpenXG-RAN
Commit acd2c13b authored by Raymond Knopp's avatar Raymond Knopp
Browse files
Options

new config file for band4+band13 

update to stats form
parent d7c122ee
Expand all Show whitespace changes
Inline Side-by-side
Showing with 350 additions and 94 deletions
openair1/PHY/LTE_TRANSPORT/print_stats.c
View file @ acd2c13b
This diff is collapsed.
targets/PROJECTS/GENERIC-LTE-EPC/CONF/enb.dual.band13_band4.exmimo2.conf
View file @ acd2c13b
...@@ -34,6 +34,7 @@ eNBs = ...@@ -34,6 +34,7 @@ eNBs =
Nid_cell = 0; Nid_cell = 0;
N_RB_DL = 25; N_RB_DL = 25;
Nid_cell_mbsfn = 0; Nid_cell_mbsfn = 0;
nb_antenna_ports = 1;
nb_antennas_tx = 1; nb_antennas_tx = 1;
nb_antennas_rx = 1; nb_antennas_rx = 1;
tx_gain = 2; tx_gain = 2;
...@@ -47,7 +48,7 @@ eNBs = ...@@ -47,7 +48,7 @@ eNBs =
pucch_nRB_CQI = 1; pucch_nRB_CQI = 1;
pucch_nCS_AN = 0; pucch_nCS_AN = 0;
pucch_n1_AN = 32; pucch_n1_AN = 32;
pdsch_referenceSignalPower = -24; pdsch_referenceSignalPower = -26;
pdsch_p_b = 0; pdsch_p_b = 0;
pusch_n_SB = 1; pusch_n_SB = 1;
pusch_enable64QAM = "DISABLE"; pusch_enable64QAM = "DISABLE";
...@@ -99,6 +100,7 @@ eNBs = ...@@ -99,6 +100,7 @@ eNBs =
ue_TimersAndConstants_n310 = 20; ue_TimersAndConstants_n310 = 20;
ue_TimersAndConstants_n311 = 1; ue_TimersAndConstants_n311 = 1;
ue_TransmissionMode = 1;
}, },
{ {
frame_type = "FDD"; frame_type = "FDD";
...@@ -112,6 +114,7 @@ eNBs = ...@@ -112,6 +114,7 @@ eNBs =
Nid_cell = 0; Nid_cell = 0;
N_RB_DL = 25; N_RB_DL = 25;
Nid_cell_mbsfn = 0; Nid_cell_mbsfn = 0;
nb_antenna_ports = 1;
nb_antennas_tx = 1; nb_antennas_tx = 1;
nb_antennas_rx = 1; nb_antennas_rx = 1;
tx_gain = 2; tx_gain = 2;
...@@ -177,6 +180,7 @@ eNBs = ...@@ -177,6 +180,7 @@ eNBs =
ue_TimersAndConstants_n310 = 20; ue_TimersAndConstants_n310 = 20;
ue_TimersAndConstants_n311 = 1; ue_TimersAndConstants_n311 = 1;
ue_TransmissionMode = 1;
} }
); );
...@@ -211,7 +215,7 @@ eNBs = ...@@ -211,7 +215,7 @@ eNBs =
}; };
////////// MME parameters: ////////// MME parameters:
mme_ip_address = ( { ipv4 = "192.168.13.11"; mme_ip_address = ( { ipv4 = "192.168.13.70";
ipv6 = "192:168:30::17"; ipv6 = "192:168:30::17";
active = "yes"; active = "yes";
preference = "ipv4"; preference = "ipv4";
...@@ -221,10 +225,10 @@ eNBs = ...@@ -221,10 +225,10 @@ eNBs =
NETWORK_INTERFACES : NETWORK_INTERFACES :
{ {
ENB_INTERFACE_NAME_FOR_S1_MME = "eth0"; ENB_INTERFACE_NAME_FOR_S1_MME = "eth0";
ENB_IPV4_ADDRESS_FOR_S1_MME = "192.168.13.82/24"; ENB_IPV4_ADDRESS_FOR_S1_MME = "192.168.12.212/24";
ENB_INTERFACE_NAME_FOR_S1U = "eth0"; ENB_INTERFACE_NAME_FOR_S1U = "eth0";
ENB_IPV4_ADDRESS_FOR_S1U = "192.168.13.82/24"; ENB_IPV4_ADDRESS_FOR_S1U = "192.168.12.212/24";
ENB_PORT_FOR_S1U = 2152; # Spec 2152 ENB_PORT_FOR_S1U = 2152; # Spec 2152
}; };
......
targets/RT/USER/lte-softmodem.c
View file @ acd2c13b
...@@ -556,7 +556,7 @@ static void *scope_thread(void *arg) ...@@ -556,7 +556,7 @@ static void *scope_thread(void *arg)
int len = 0; int len = 0;
struct sched_param sched_param; struct sched_param sched_param;
int UE_id, CC_id; int UE_id, CC_id;
int ue_cnt=0; //int ue_cnt=0;
sched_param.sched_priority = sched_get_priority_min(SCHED_FIFO)+1; sched_param.sched_priority = sched_get_priority_min(SCHED_FIFO)+1;
sched_setscheduler(0, SCHED_FIFO,&sched_param); sched_setscheduler(0, SCHED_FIFO,&sched_param);
...@@ -593,21 +593,21 @@ static void *scope_thread(void *arg) ...@@ -593,21 +593,21 @@ static void *scope_thread(void *arg)
} }
len = dump_eNB_stats (PHY_vars_eNB_g[0][0], stats_buffer, 0); len = dump_eNB_stats (PHY_vars_eNB_g[0][0], stats_buffer, 0);
if (MAX_NUM_CCs>1) /*if (MAX_NUM_CCs>1)
len += dump_eNB_stats (PHY_vars_eNB_g[0][1], &stats_buffer[len], 0); len += dump_eNB_stats (PHY_vars_eNB_g[0][1], &stats_buffer[len], 0);*/
//fl_set_object_label(form_stats->stats_text, stats_buffer); //fl_set_object_label(form_stats->stats_text, stats_buffer);
fl_clear_browser(form_stats->stats_text); fl_clear_browser(form_stats->stats_text);
fl_add_browser_line(form_stats->stats_text, stats_buffer); fl_add_browser_line(form_stats->stats_text, stats_buffer);
ue_cnt=0; //ue_cnt=0;
for(UE_id=0; UE_id<NUMBER_OF_UE_MAX; UE_id++) { for(UE_id=0; UE_id<scope_enb_num_ue/*NUMBER_OF_UE_MAX*/; UE_id++) {
for(CC_id=0; CC_id<MAX_NUM_CCs; CC_id++) { for(CC_id=0; CC_id<1/*MAX_NUM_CCs*/; CC_id++) {
if ((PHY_vars_eNB_g[0][CC_id]->dlsch_eNB[UE_id][0]->rnti>0) && (ue_cnt<scope_enb_num_ue)) { if (PHY_vars_eNB_g[0][CC_id]->dlsch_eNB[UE_id][0]->rnti>0) {
phy_scope_eNB(form_enb[CC_id][ue_cnt], phy_scope_eNB(form_enb[CC_id][UE_id],
PHY_vars_eNB_g[0][CC_id], PHY_vars_eNB_g[0][CC_id],
UE_id); UE_id);
ue_cnt++; //ue_cnt++;
} }
} }
} }
...@@ -2338,19 +2338,31 @@ if (pthread_setaffinity_np(pthread_self(), sizeof(cpu_set_t), &cpuset)) abort(); ...@@ -2338,19 +2338,31 @@ if (pthread_setaffinity_np(pthread_self(), sizeof(cpu_set_t), &cpuset)) abort();
/* do RX */ /* do RX */
for (CC_id=0; CC_id < MAX_NUM_CCs; CC_id++) { for (CC_id=0; CC_id < MAX_NUM_CCs; CC_id++) {
if (CC_id != 0) continue; eNB_proc_t *proc = &PHY_vars_eNB_g[0][0]->proc[sf];
eNB_proc_t *proc = &PHY_vars_eNB_g[0][CC_id]->proc[sf]; if (CC_id != 0) {
// printf("call phy_procedures_eNB_RX CC_id %d sf %d %lu\n", proc->CC_id, sf, daclock()); // only update some measurements
if ((proc->frame_rx % 100 == 0) && (proc->subframe_rx==4)) {
int i;
for (i=0; i<NUMBER_OF_UE_MAX; i++) {
PHY_vars_eNB_g[0][CC_id]->eNB_UE_stats[i].dlsch_bitrate = (PHY_vars_eNB_g[0][CC_id]->eNB_UE_stats[i].total_TBS -
PHY_vars_eNB_g[0][CC_id]->eNB_UE_stats[i].total_TBS_last);
PHY_vars_eNB_g[0][CC_id]->eNB_UE_stats[i].total_TBS_last = PHY_vars_eNB_g[0][CC_id]->eNB_UE_stats[i].total_TBS;
}
}
}
else {
// printf("call phy_procedures_eNB_RX CC_id %d sf %d %lu\n", proc->CC_id, sf, daclock());
phy_procedures_eNB_RX( proc->subframe, PHY_vars_eNB_g[0][proc->CC_id], 0, no_relay ); phy_procedures_eNB_RX( proc->subframe, PHY_vars_eNB_g[0][proc->CC_id], 0, no_relay );
if ((subframe_select(&PHY_vars_eNB_g[0][proc->CC_id]->lte_frame_parms,proc->subframe_rx) == SF_S)) { if ((subframe_select(&PHY_vars_eNB_g[0][proc->CC_id]->lte_frame_parms,proc->subframe_rx) == SF_S)) {
phy_procedures_eNB_S_RX( proc->subframe, PHY_vars_eNB_g[0][proc->CC_id], 0, no_relay ); phy_procedures_eNB_S_RX( proc->subframe, PHY_vars_eNB_g[0][proc->CC_id], 0, no_relay );
} }
// printf("done phy_procedures_eNB_RX CC_id %d sf %d %lu\n", proc->CC_id, sf, daclock()); // printf("done phy_procedures_eNB_RX CC_id %d sf %d %lu\n", proc->CC_id, sf, daclock());
proc->frame_rx++; proc->frame_rx++;
if (proc->frame_rx==1024) if (proc->frame_rx==1024)
proc->frame_rx=0; proc->frame_rx=0;
} }
}
} }
#ifdef EXMIMO #ifdef EXMIMO
...@@ -3734,7 +3746,7 @@ openair0_cfg[0].rx_freq[1] = 0; ...@@ -3734,7 +3746,7 @@ openair0_cfg[0].rx_freq[1] = 0;
fl_show_form (form_stats->stats_form, FL_PLACE_HOTSPOT, FL_FULLBORDER, "stats"); fl_show_form (form_stats->stats_form, FL_PLACE_HOTSPOT, FL_FULLBORDER, "stats");
for(UE_id=0; UE_id<scope_enb_num_ue; UE_id++) { for(UE_id=0; UE_id<scope_enb_num_ue; UE_id++) {
for(CC_id=0; CC_id<MAX_NUM_CCs; CC_id++) { for(CC_id=0; CC_id<1/*MAX_NUM_CCs*/; CC_id++) {
form_enb[CC_id][UE_id] = create_lte_phy_scope_enb(); form_enb[CC_id][UE_id] = create_lte_phy_scope_enb();
sprintf (title, "LTE UL SCOPE eNB for CC_id %d, UE %d",CC_id,UE_id); sprintf (title, "LTE UL SCOPE eNB for CC_id %d, UE %d",CC_id,UE_id);
fl_show_form (form_enb[CC_id][UE_id]->lte_phy_scope_enb, FL_PLACE_HOTSPOT, FL_FULLBORDER, title); fl_show_form (form_enb[CC_id][UE_id]->lte_phy_scope_enb, FL_PLACE_HOTSPOT, FL_FULLBORDER, title);
...@@ -3919,7 +3931,7 @@ openair0_cfg[0].rx_freq[1] = 0; ...@@ -3919,7 +3931,7 @@ openair0_cfg[0].rx_freq[1] = 0;
fl_free_form(form_stats_l2->stats_form); fl_free_form(form_stats_l2->stats_form);
for(UE_id=0; UE_id<scope_enb_num_ue; UE_id++) { for(UE_id=0; UE_id<scope_enb_num_ue; UE_id++) {
for(CC_id=0; CC_id<MAX_NUM_CCs; CC_id++) { for(CC_id=0; CC_id<1/*MAX_NUM_CCs*/; CC_id++) {
fl_hide_form(form_enb[CC_id][UE_id]->lte_phy_scope_enb); fl_hide_form(form_enb[CC_id][UE_id]->lte_phy_scope_enb);
fl_free_form(form_enb[CC_id][UE_id]->lte_phy_scope_enb); fl_free_form(form_enb[CC_id][UE_id]->lte_phy_scope_enb);
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment