F1AP improvement

cmake_targets/CMakeLists.txt

@@ -463,7 +463,6 @@ add_custom_target (
   DEPENDS ${RRC_GRAMMAR}
   )
 
-set_source_files_properties(${rrc_source} PROPERTIES COMPILE_FLAGS -w) # suppress warnings from generated code
 add_library(RRC_LIB ${rrc_source}
     ${OPENAIR2_DIR}/RRC/LTE/MESSAGES/asn1_msg.c
     ${OPENAIR2_DIR}/RRC/LTE/MESSAGES/asn1_msg_NB_IoT.c)

nfapi/open-nFAPI/nfapi/public_inc/nfapi_interface.h

@@ -2727,7 +2727,7 @@ typedef struct {
 } nfapi_cqi_indication_rel8_t;
 #define NFAPI_CQI_INDICATION_REL8_TAG 0x202f
 
-#define NFAPI_CC_MAX 4
+#define NFAPI_CC_MAX MAX_NUM_CCs
 typedef struct {
 	nfapi_tl_t tl;
 	uint16_t length;

openair2/F1AP/f1ap_encoder.c

@@ -35,42 +35,6 @@
 
 int asn1_encoder_xer_print = 1;
 
-/*
-static inline int f1ap_encode_initiating(f1ap_message *message,
-    uint8_t **buffer,
-    uint32_t *len);
-
-static inline int f1ap_encode_successfull_outcome(f1ap_message *message,
-    uint8_t **buffer, uint32_t *len);
-
-static inline int f1ap_encode_unsuccessfull_outcome(f1ap_message *message,
-    uint8_t **buffer, uint32_t *len);
-
-static inline int f1ap_encode_f1_setup_request(
-  F1ap_F1SetupRequestIEs_t *f1SetupRequestIEs, uint8_t **buffer, uint32_t *length);
-
-static inline int f1ap_encode_trace_failure(F1ap_TraceFailureIndicationIEs_t
-    *trace_failure_ies_p, uint8_t **buffer,
-    uint32_t *length);
-
-static inline int f1ap_encode_initial_context_setup_response(
-  F1ap_InitialContextSetupResponseIEs_t *initialContextSetupResponseIEs,
-  uint8_t **buffer,
-  uint32_t *length);
-
-static inline
-int f1ap_encode_ue_context_release_complete(
-  F1ap_UEContextReleaseCompleteIEs_t *f1ap_UEContextReleaseCompleteIEs,
-  uint8_t                           **buffer,
-  uint32_t                           *length);
-
-static inline
-int f1ap_encode_ue_context_release_request(
-  F1ap_UEContextReleaseRequestIEs_t *f1ap_UEContextReleaseRequestIEs,
-  uint8_t                              **buffer,
-  uint32_t                              *length);
-  */
-
 int f1ap_encode_pdu(F1AP_F1AP_PDU_t *pdu, uint8_t **buffer, uint32_t *length) {
   ssize_t    encoded;
   DevAssert(pdu != NULL);

openair2/LAYER2/MAC/eNB_scheduler_fairRR.h

@@ -85,21 +85,6 @@ void dlsch_scheduler_pre_ue_select_fairRR(
     uint16_t        nb_rbs_required[MAX_NUM_CCs][MAX_MOBILES_PER_ENB],
     DLSCH_UE_SELECT dlsch_ue_select[MAX_NUM_CCs]);
 
-void dlsch_scheduler_pre_processor_reset_fairRR(
-    module_id_t module_idP,
-    frame_t frameP,
-    sub_frame_t subframeP,
-    int min_rb_unit[NFAPI_CC_MAX],
-    uint16_t nb_rbs_required[NFAPI_CC_MAX][MAX_MOBILES_PER_ENB],
-    uint8_t rballoc_sub[NFAPI_CC_MAX][N_RBG_MAX],
-    uint8_t MIMO_mode_indicator[NFAPI_CC_MAX][N_RBG_MAX]);
-
-void assign_rbs_required_fairRR(
-    module_id_t Mod_id,
-    frame_t frameP,
-    sub_frame_t subframe,
-    uint16_t nb_rbs_required[NFAPI_CC_MAX][MAX_MOBILES_PER_ENB]);
-
 void dlsch_scheduler_pre_processor_allocate_fairRR(
     module_id_t Mod_id,
     int UE_id,

openair2/RRC/NR/MESSAGES/asn1_msg.c

@@ -655,6 +655,7 @@ uint8_t do_SIB1_NR(rrc_gNB_carrier_data_t *carrier,
   if (enc_rval.encoded==-1) {
     return(-1);
   }
+  sib1->servingCellConfigCommon->downlinkConfigCommon.initialDownlinkBWP.pdcch_ConfigCommon->choice.setup->commonControlResourceSet=coreset0;
 
   return((enc_rval.encoded+7)/8);
 }