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@5740 818b1a75-f10b-46b9-bf7c-635c3b92a50f

Browse Source
This commit is contained in:
Raymond Knopp
2014-08-21 11:51:05 +00:00
parent d2bf4ddcd4
commit cd18c09fc8
15 changed files with 1363 additions and 451 deletions
Download Patch File Download Diff File Expand all files Collapse all files
openair2/UTIL/OCG/OCG.h
+7 -7
View File
@@ -732,13 +732,13 @@ The following diagram is based on graphviz (http://www.graphviz.org/), you need
// phy related params
unsigned int n_frames;
unsigned int n_frames_flag; // if set, then let the emulation goes to infinity
unsigned char frame_type;
char * frame_type_name;
unsigned char tdd_config;
unsigned char tdd_config_S;
unsigned char extended_prefix_flag;
unsigned char N_RB_DL;
unsigned char transmission_mode;
unsigned char frame_type[MAX_NUM_CCs];
char * frame_type_name[MAX_NUM_CCs];
unsigned char tdd_config[MAX_NUM_CCs];
unsigned char tdd_config_S[MAX_NUM_CCs];
unsigned char extended_prefix_flag[MAX_NUM_CCs];
unsigned char N_RB_DL[MAX_NUM_CCs];
unsigned char transmission_mode[MAX_NUM_CCs];
int max_predefined_traffic_config_index;
int max_customized_traffic_config_index;
openair2/UTIL/OCG/OCG_parse_XML.c
+7 -7
View File
@@ -947,19 +947,19 @@ void characters(void *user_data, const xmlChar *xmlch, int xmllen) { // called o
} else if (system_frequency_GHz_) {
oai_emulation.environment_system_config.system_frequency_GHz = atof(ch);
} else if (number_of_rbs_dl_) {
oai_emulation.info.N_RB_DL = atoi(ch);
oai_emulation.info.N_RB_DL[0] = atoi(ch);
} else if (transmission_mode_) {
oai_emulation.info.transmission_mode = atoi(ch);
oai_emulation.info.transmission_mode[0] = atoi(ch);
} else if (frame_config_) {
if (frame_type_) {
oai_emulation.info.frame_type = atoi(ch);
if (oai_emulation.info.frame_type) {
oai_emulation.info.frame_type_name = "TDD";
oai_emulation.info.frame_type[0] = atoi(ch);
if (oai_emulation.info.frame_type[0]) {
oai_emulation.info.frame_type_name[0] = "TDD";
} else {
oai_emulation.info.frame_type_name = "FDD";
oai_emulation.info.frame_type_name[0] = "FDD";
}
} else if (tdd_config_) {
oai_emulation.info.tdd_config = atoi(ch);
oai_emulation.info.tdd_config[0] = atoi(ch);
}
} else if (antenna_) {
if (eNB_antenna_) {