Skip to content

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

F1Setup procedure working for both LTE and NR

parent fb0b99af
Hide whitespace changes
Inline Side-by-side
Showing with 5 additions and 5 deletions
openair2/F1AP/f1ap_du_interface_management.c
View file @ 8456908e
...@@ -392,6 +392,7 @@ int DU_send_F1_SETUP_REQUEST(instance_t instance) { ...@@ -392,6 +392,7 @@ int DU_send_F1_SETUP_REQUEST(instance_t instance) {
(const char*)f1ap_du_data->mib[i],//f1ap_du_data->mib, (const char*)f1ap_du_data->mib[i],//f1ap_du_data->mib,
f1ap_du_data->mib_length[i]); f1ap_du_data->mib_length[i]);
LOG_I(F1AP,"Filling SIB1_message for cell %d, length %d\n",i,f1ap_du_data->sib1_length[i]);
OCTET_STRING_fromBuf(&gNB_DU_System_Information->sIB1_message, // sept. 2018 OCTET_STRING_fromBuf(&gNB_DU_System_Information->sIB1_message, // sept. 2018
(const char*)f1ap_du_data->sib1[i], (const char*)f1ap_du_data->sib1[i],
f1ap_du_data->sib1_length[i]); f1ap_du_data->sib1_length[i]);
...@@ -589,7 +590,6 @@ int DU_handle_F1_SETUP_RESPONSE(instance_t instance, ...@@ -589,7 +590,6 @@ int DU_handle_F1_SETUP_RESPONSE(instance_t instance,
} // switch ie } // switch ie
} // for IE } // for IE
AssertFatal(TransactionId!=-1,"TransactionId was not sent\n"); AssertFatal(TransactionId!=-1,"TransactionId was not sent\n");
AssertFatal(num_cells_to_activate>0,"No cells activated\n");
F1AP_SETUP_RESP (msg_p).num_cells_to_activate = num_cells_to_activate; F1AP_SETUP_RESP (msg_p).num_cells_to_activate = num_cells_to_activate;
for (int i=0;i<num_cells_to_activate;i++) for (int i=0;i<num_cells_to_activate;i++)
......
openair2/GNB_APP/gnb_config.c
View file @ 8456908e
...@@ -1951,8 +1951,8 @@ int gNB_app_handle_f1ap_setup_resp(f1ap_setup_resp_t *resp) { ...@@ -1951,8 +1951,8 @@ int gNB_app_handle_f1ap_setup_resp(f1ap_setup_resp_t *resp) {
du_extract_and_decode_SI(i, du_extract_and_decode_SI(i,
si_ind, si_ind,
resp->cells_to_activate[j].SI_container[si_ind], resp->cells_to_activate[j].SI_container[2+si_ind],
resp->cells_to_activate[j].SI_container_length[si_ind]); resp->cells_to_activate[j].SI_container_length[2+si_ind]);
} }
// perform MAC/L1 common configuration // perform MAC/L1 common configuration
...@@ -1986,8 +1986,8 @@ int gNB_app_handle_f1ap_gnb_cu_configuration_update(f1ap_gnb_cu_configuration_up ...@@ -1986,8 +1986,8 @@ int gNB_app_handle_f1ap_gnb_cu_configuration_update(f1ap_gnb_cu_configuration_up
du_extract_and_decode_SI(i, du_extract_and_decode_SI(i,
si_ind, si_ind,
gnb_cu_cfg_update->cells_to_activate[j].SI_container[si_ind], gnb_cu_cfg_update->cells_to_activate[j].SI_container[2+si_ind],
gnb_cu_cfg_update->cells_to_activate[j].SI_container_length[si_ind]); gnb_cu_cfg_update->cells_to_activate[j].SI_container_length[2+si_ind]);
} }
// perform MAC/L1 common configuration // perform MAC/L1 common configuration
......
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