merge develop

2021-02-08 11:56:42 +01:00
parent 7eda2b7409 403db5f66e
commit fa63d9a4e6
123 changed files with 11822 additions and 6602 deletions
@@ -48,12 +48,14 @@ typedef enum {
  MSC_MAC_ENB,
  MSC_RLC_ENB,
  MSC_PDCP_ENB,
+  MSC_PDCP_GNB,
  MSC_RRC_ENB,
  MSC_RRC_GNB,
  MSC_IP_ENB,
  MSC_S1AP_ENB,
  MSC_NGAP_GNB,
  MSC_GTPU_ENB,
+  MSC_GTPU_GNB,
  MSC_GTPU_SGW,
  MSC_S1AP_MME,
  MSC_NGAP_AMF,
@@ -260,7 +260,6 @@ typedef struct IttiMsgText_s {
 #include <openair3/GTPV1-U/gtpv1u_gNB_task.h>
 void *rrc_enb_process_itti_msg(void *);
 #include <openair3/SCTP/sctp_eNB_task.h>
-#include <openair3/S1AP/s1ap_eNB.h>
 #include <openair3/NGAP/ngap_gNB.h>

 #ifdef ITTI_SIM