Commit 617b92cf authored by lfarizav's avatar lfarizav

some little mods in oaisim_functions

parent 4b63bc05
...@@ -74,13 +74,13 @@ int eth_socket_init_udp(openair0_device *device) { ...@@ -74,13 +74,13 @@ int eth_socket_init_udp(openair0_device *device) {
local_port = device->openair0_cfg->my_port; local_port = device->openair0_cfg->my_port;
remote_ip = "0.0.0.0"; remote_ip = "0.0.0.0";
remote_port = 0; remote_port = 0;
printf("[%s] local ip addr %s port %d\n", "RRH", local_ip, local_port); printf("[%s] local ip addr %s port %d\n", "RRH %d", local_ip, local_port,device->Mod_id);
} else { } else {
local_ip = device->openair0_cfg->my_addr; local_ip = device->openair0_cfg->my_addr;
local_port = device->openair0_cfg->my_port; local_port = device->openair0_cfg->my_port;
remote_ip = device->openair0_cfg->remote_addr; remote_ip = device->openair0_cfg->remote_addr;
remote_port = device->openair0_cfg->remote_port; remote_port = device->openair0_cfg->remote_port;
printf("[%s] local ip addr %s port %d\n","BBU", local_ip, local_port); printf("[%s] local ip addr %s port %d\n","BBU %d", local_ip, local_port,device->Mod_id);
} }
/* Open socket to send on */ /* Open socket to send on */
......
...@@ -393,7 +393,7 @@ int transport_init(openair0_device *device, openair0_config_t *openair0_cfg, eth ...@@ -393,7 +393,7 @@ int transport_init(openair0_device *device, openair0_config_t *openair0_cfg, eth
} }
printf("[ETHERNET]: Initializing openair0_device for %s%d ...\n", ((device->host_type == BBU_HOST) ? "BBU": "RRH"),num_devices_eth); printf("[ETHERNET]: Initializing openair0_device for %s%d ...\n", ((device->host_type == BBU_HOST) ? "BBU": "RRH"),num_devices_eth);
device->Mod_id = 0;//+num_devices_eth++; device->Mod_id = +num_devices_eth++;
device->transp_type = ETHERNET_TP; device->transp_type = ETHERNET_TP;
device->trx_start_func = trx_eth_start; device->trx_start_func = trx_eth_start;
device->trx_request_func = trx_eth_request; device->trx_request_func = trx_eth_request;
......
...@@ -1438,25 +1438,26 @@ void init_openair1(void) ...@@ -1438,25 +1438,26 @@ void init_openair1(void)
// change the nb_connected_eNB // change the nb_connected_eNB
for (CC_id=0; CC_id<MAX_NUM_CCs; CC_id++) { for (CC_id=0; CC_id<MAX_NUM_CCs; CC_id++) {
for (int i=0;i<enb_properties->number;i++) {
init_lte_vars (&frame_parms[CC_id], init_lte_vars (&frame_parms[CC_id],
oai_emulation.info.frame_type[CC_id], oai_emulation.info.frame_type[CC_id],
oai_emulation.info.tdd_config[CC_id], oai_emulation.info.tdd_config[CC_id],
oai_emulation.info.tdd_config_S[CC_id], oai_emulation.info.tdd_config_S[CC_id],
oai_emulation.info.extended_prefix_flag[CC_id], oai_emulation.info.extended_prefix_flag[CC_id],
oai_emulation.info.N_RB_DL[CC_id], oai_emulation.info.N_RB_DL[CC_id],
enb_properties->properties[0]->Nid_cell[CC_id], enb_properties->properties[i]->Nid_cell[CC_id],
cooperation_flag, cooperation_flag,
enb_properties->properties[0]->nb_antenna_ports[CC_id], enb_properties->properties[i]->nb_antenna_ports[CC_id],
abstraction_flag, abstraction_flag,
enb_properties->properties[0]->nb_antennas_rx[CC_id], enb_properties->properties[i]->nb_antennas_rx[CC_id],
enb_properties->properties[0]->nb_antennas_tx[CC_id], enb_properties->properties[i]->nb_antennas_tx[CC_id],
nb_antennas_rx_ue, nb_antennas_rx_ue,
oai_emulation.info.eMBMS_active_state); oai_emulation.info.eMBMS_active_state);
// This is for IF4p5 RRU, gets done by RRC configuration of eNB // This is for IF4p5 RRU, gets done by RRC configuration of eNB
PHY_vars_eNB_g[eNB_id][CC_id]->frame_parms.prach_config_common.prach_ConfigInfo.prach_ConfigIndex = enb_properties->properties[0]->prach_config_index[CC_id]; PHY_vars_eNB_g[eNB_id][CC_id]->frame_parms.prach_config_common.prach_ConfigInfo.prach_ConfigIndex = enb_properties->properties[i]->prach_config_index[CC_id];
PHY_vars_eNB_g[eNB_id][CC_id]->frame_parms.prach_config_common.prach_ConfigInfo.prach_FreqOffset = enb_properties->properties[0]->prach_freq_offset[CC_id]; PHY_vars_eNB_g[eNB_id][CC_id]->frame_parms.prach_config_common.prach_ConfigInfo.prach_FreqOffset = enb_properties->properties[i]->prach_freq_offset[CC_id];
}
} }
for (eNB_id=0; eNB_id<NB_eNB_INST; eNB_id++) { for (eNB_id=0; eNB_id<NB_eNB_INST; eNB_id++) {
......
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