Remove useless type f1ap_cu_setup_req_t

openair2/COMMON/f1ap_messages_def.h

@@ -19,9 +19,6 @@
  *      contact@openairinterface.org
  */
 
-/* F1AP -> SCTP */
-MESSAGE_DEF(F1AP_CU_SCTP_REQ        , MESSAGE_PRIORITY_MED, f1ap_cu_setup_req_t       , f1ap_cu_setup_req)
-
 /* eNB_DU application layer -> F1AP messages or CU F1AP -> RRC*/
 MESSAGE_DEF(F1AP_SETUP_REQ          , MESSAGE_PRIORITY_MED, f1ap_setup_req_t          , f1ap_setup_req)
 MESSAGE_DEF(F1AP_GNB_CU_CONFIGURATION_UPDATE_ACKNOWLEDGE         , MESSAGE_PRIORITY_MED, f1ap_gnb_cu_configuration_update_acknowledge_t          , f1ap_gnb_cu_configuration_update_acknowledge)

openair2/COMMON/f1ap_messages_types.h

@@ -75,12 +75,6 @@ typedef struct f1ap_net_ip_address_s {
   char ipv6_address[46];
 } f1ap_net_ip_address_t;
 
-typedef struct f1ap_cu_setup_req_s {
-  // This dummy element is to avoid CLANG warning: empty struct has size 0 in C, size 1 in C++
-  // To be removed if the structure is filled
-  uint32_t dummy;
-} f1ap_cu_setup_req_t;
-
 typedef struct cellIDs_s {
 
   // Served Cell Information
@@ -129,9 +123,6 @@ typedef struct f1ap_setup_req_s {
   // F1_Setup_Req payload
   uint64_t gNB_DU_id;
   char *gNB_DU_name;
-
-  /* The type of the cell */
-  enum cell_type_e cell_type;
   
   /// number of DU cells available
   uint16_t num_cells_available; //0< num_cells_available <= 512;

openair2/F1AP/f1ap_cu_interface_management.c

@@ -141,9 +141,6 @@ int CU_handle_F1_SETUP_REQUEST(instance_t instance,
     /* - nRPCI */
     req->cell[i].nr_pci = servedCellInformation->nRPCI;
     LOG_D(F1AP, "req->nr_pci[%d] %d \n", i, req->cell[i].nr_pci);
-    
-    // LTS: FIXME cell_type is not a attribute of a cell in the data structure !!!!!!!!!!
-    f1ap_req(true, instance)->cell_type = CELL_MACRO_GNB;
 
     // FDD Cells
     if (servedCellInformation->nR_Mode_Info.present==F1AP_NR_Mode_Info_PR_fDD) {
@@ -197,7 +194,6 @@ int CU_handle_F1_SETUP_REQUEST(instance_t instance,
     }
 	
     struct F1AP_GNB_DU_System_Information * DUsi=served_cells_item->gNB_DU_System_Information;
-    LOG_I(F1AP, "Received Cell in %d context\n", f1ap_req(true, instance)->cell_type==CELL_MACRO_GNB);
     // System Information
     /* mib */
     req->mib[i] = calloc(DUsi->mIB_message.size + 1, sizeof(char));

openair2/F1AP/f1ap_cu_rrc_message_transfer.c

@@ -89,7 +89,6 @@ int CU_handle_INITIAL_UL_RRC_MESSAGE_TRANSFER(instance_t             instance,
                              F1AP_ProtocolIE_ID_id_DUtoCURRCContainer, false);
 
   // create an ITTI message and copy SDU
-  AssertFatal(f1ap_req(true, instance)->cell_type == CELL_MACRO_GNB, "illegal cell type %d\n", f1ap_req(true, instance)->cell_type);
   message_p = itti_alloc_new_message(TASK_CU_F1, 0, F1AP_INITIAL_UL_RRC_MESSAGE);
   f1ap_initial_ul_rrc_message_t *ul_rrc = &F1AP_INITIAL_UL_RRC_MESSAGE(message_p);
   ul_rrc->gNB_DU_ue_id = du_ue_id;

openair2/GNB_APP/gnb_config.c

@@ -1898,7 +1898,6 @@ int RCconfig_NR_DU_F1(MessageDef *msg_p, uint32_t i) {
                 "gNB id %u is not defined in configuration file\n",i);
     f1ap_setup_req_t * f1Setup=&F1AP_SETUP_REQ(msg_p);
     f1Setup->num_cells_available = 0;
-    f1Setup->cell_type=CELL_MACRO_GNB;
 
     for (k=0; k <num_gnbs ; k++) {
       if (strcmp(GNBSParams[GNB_ACTIVE_GNBS_IDX].strlistptr[k], *(GNBParamList.paramarray[i][GNB_GNB_NAME_IDX].strptr)) == 0) {