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

RAN API flexran_get_num_ues() belongs to MAC, change name

Browse Source
This commit is contained in:
Robert Schmidt
2018-11-07 10:48:36 +01:00
parent 3035781485
commit e0742be747
6 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
openair2/ENB_APP/CONTROL_MODULES/MAC/flexran_agent_mac.c
+2 -2
View File
@@ -891,7 +891,7 @@ int flexran_agent_mac_sf_trigger(mid_t mod_id, const void *params, Protocol__Fle
/*TODO: Fill in the number of dl HARQ related info, based on the number of currently /*TODO: Fill in the number of dl HARQ related info, based on the number of currently
*transmitting UEs *transmitting UEs
*/ */
// sf_trigger_msg->n_dl_info = flexran_get_num_ues(mod_id); // sf_trigger_msg->n_dl_info = flexran_get_mac_num_ues(mod_id);
Protocol__FlexDlInfo **dl_info = NULL; Protocol__FlexDlInfo **dl_info = NULL;
@@ -945,7 +945,7 @@ int flexran_agent_mac_sf_trigger(mid_t mod_id, const void *params, Protocol__Fle
/* Fill in the number of UL reception status related info, based on the number of currently /* Fill in the number of UL reception status related info, based on the number of currently
* transmitting UEs * transmitting UEs
*/ */
sf_trigger_msg->n_ul_info = flexran_get_num_ues(mod_id); sf_trigger_msg->n_ul_info = flexran_get_mac_num_ues(mod_id);
Protocol__FlexUlInfo **ul_info = NULL; Protocol__FlexUlInfo **ul_info = NULL;
openair2/ENB_APP/CONTROL_MODULES/RRC/flexran_agent_rrc.c
+1 -1
View File
@@ -269,7 +269,7 @@ void flexran_trigger_rrc_measurements (mid_t mod_id, MeasResults_t* measResults
triggered_rrc = true; triggered_rrc = true;
int num; int num;
num = flexran_get_num_ues (mod_id); num = flexran_get_mac_num_ues (mod_id);
meas_stats = malloc(sizeof(rrc_meas_stats) * num); meas_stats = malloc(sizeof(rrc_meas_stats) * num);
openair2/ENB_APP/flexran_agent_common.c
+2 -2
View File
@@ -460,7 +460,7 @@ int flexran_agent_lc_config_reply(mid_t mod_id, const void *params, Protocol__Fl
* present and the message gets properly filled if it is or remains empty if * present and the message gets properly filled if it is or remains empty if
* not */ * not */
lc_config_reply_msg->n_lc_ue_config = lc_config_reply_msg->n_lc_ue_config =
flexran_agent_get_mac_xface(mod_id) ? flexran_get_num_ues(mod_id) : 0; flexran_agent_get_mac_xface(mod_id) ? flexran_get_mac_num_ues(mod_id) : 0;
Protocol__FlexLcUeConfig **lc_ue_config = NULL; Protocol__FlexLcUeConfig **lc_ue_config = NULL;
if (lc_config_reply_msg->n_lc_ue_config > 0) { if (lc_config_reply_msg->n_lc_ue_config > 0) {
@@ -527,7 +527,7 @@ int flexran_agent_ue_config_reply(mid_t mod_id, const void *params, Protocol__Fl
ue_config_reply_msg->header = header; ue_config_reply_msg->header = header;
ue_config_reply_msg->n_ue_config = flexran_get_num_ues(mod_id); ue_config_reply_msg->n_ue_config = flexran_get_mac_num_ues(mod_id);
Protocol__FlexUeConfig **ue_config; Protocol__FlexUeConfig **ue_config;
if (ue_config_reply_msg->n_ue_config > 0) { if (ue_config_reply_msg->n_ue_config > 0) {
openair2/ENB_APP/flexran_agent_handler.c
+1 -1
View File
@@ -241,7 +241,7 @@ int flexran_agent_handle_stats(mid_t mod_id, const void *params, Protocol__Flexr
//Create a list of all eNB RNTIs and cells //Create a list of all eNB RNTIs and cells
//Set the number of UEs and create list with their RNTIs stats configs //Set the number of UEs and create list with their RNTIs stats configs
report_config.nr_ue = flexran_get_num_ues(mod_id); //eNB_UE_list->num_UEs report_config.nr_ue = flexran_get_mac_num_ues(mod_id);
report_config.ue_report_type = (ue_report_type_t *) malloc(sizeof(ue_report_type_t) * report_config.nr_ue); report_config.ue_report_type = (ue_report_type_t *) malloc(sizeof(ue_report_type_t) * report_config.nr_ue);
if (report_config.ue_report_type == NULL) { if (report_config.ue_report_type == NULL) {
// TODO: Add appropriate error code // TODO: Add appropriate error code
openair2/ENB_APP/flexran_agent_ran_api.c
+1 -1
View File
@@ -108,7 +108,7 @@ uint16_t flexran_get_future_sfn_sf(mid_t mod_id, int ahead_of_time)
return sfn_sf; return sfn_sf;
} }
int flexran_get_num_ues(mid_t mod_id) int flexran_get_mac_num_ues(mid_t mod_id)
{ {
if (!mac_is_present(mod_id)) return 0; if (!mac_is_present(mod_id)) return 0;
return RC.mac[mod_id]->UE_list.num_UEs; return RC.mac[mod_id]->UE_list.num_UEs;
openair2/ENB_APP/flexran_agent_ran_api.h
+2 -2
View File
@@ -70,8 +70,8 @@ uint16_t flexran_get_sfn_sf(mid_t mod_id);
rest for frame */ rest for frame */
uint16_t flexran_get_future_sfn_sf(mid_t mod_id, int ahead_of_time); uint16_t flexran_get_future_sfn_sf(mid_t mod_id, int ahead_of_time);
/* Return the number of attached UEs */ /* Return the number of attached UEs for the MAC */
int flexran_get_num_ues(mid_t mod_id); int flexran_get_mac_num_ues(mid_t mod_id);
/* Get the number of logical channels per UE. This function does not consider /* Get the number of logical channels per UE. This function does not consider
* dedicated bearers yet */ * dedicated bearers yet */