Merge remote-tracking branch 'origin/develop-CSI' into develop-CSI-Measurements

# Conflicts: # openair2/GNB_APP/gnb_paramdef.h # openair2/LAYER2/nr_pdcp/nr_pdcp_oai_api.c
2022-04-08 19:49:40 +01:00
parent 8ffecf4bdf 8c056ceefc
commit 3969079fcd
140 changed files with 8301 additions and 2657 deletions
@@ -1782,7 +1782,8 @@ set(NR_PDCP_SRC
  )

 set(NR_SDAP_SRC
-  ${OPENAIR2_DIR}/SDAP/nr_sdap/nr_sdap_gnb.c
+  ${OPENAIR2_DIR}/SDAP/nr_sdap/nr_sdap.c
+  ${OPENAIR2_DIR}/SDAP/nr_sdap/nr_sdap_entity.c
  )
  
 set(L2_SRC