diff --git a/cmake_targets/build_oai b/cmake_targets/build_oai
index 786de456293cea3be354b834226a10bbce833ad8..8de83f473d5eb6598ddaca16f966eaca94b9fd94 100755
--- a/cmake_targets/build_oai
+++ b/cmake_targets/build_oai
@@ -496,7 +496,6 @@ function main() {
     ###################
     if [ "$BUILD_DOXYGEN" = "1" ] ; then
 	echo_info "Built Doxygen based documentation. The documentation file is located here: $OPENAIR_DIR/$BUILD_DIR/build/html/index.html"
-    echo_info "if you can't open this as file:///... in your browser, see apparmor over complex configuration, or move the doc tree in a place that suits this 'security' apparmor"
     fi
 
     if [ "$UE" = 1 ] ; then
diff --git a/common/config/config_cmdline.c b/common/config/config_cmdline.c
index bd5f835a51ab941ec7c3e71d6fd0d63f7a616571..2e9b44cce8a9646dd989f8f9d1223591a91a99f1 100644
--- a/common/config/config_cmdline.c
+++ b/common/config/config_cmdline.c
@@ -19,7 +19,7 @@
  *      contact@openairinterface.org
  */
 
-/*! \file common/config/cmdline/config_libconfig.c
+/*! \file config_cmdline.c
  * \brief configuration module, command line parsing implementation
  * \author Francois TABURET
  * \date 2017
diff --git a/common/utils/LOG/log.h b/common/utils/LOG/log.h
index 37b89398cbc55f39d258b9d372d708d724b124f3..0004525d3c4d3137f316309a57571c7cb7e40520 100644
--- a/common/utils/LOG/log.h
+++ b/common/utils/LOG/log.h
@@ -64,23 +64,13 @@
 extern "C" {
 #endif
 
-/** @defgroup _LOG LOG Generator
- * @{*/
-/* @}*/
-
-/** @defgroup _macro Macro Definition
- *  @ingroup _LOG
- *  @brief these macros are used in the code of LOG
- * @{*/
-/* @}*/
-
 /** @defgroup _max_length Maximum Length of LOG
  *  @ingroup _macro
  *  @brief the macros that describe the maximum length of LOG
  * @{*/
 
 #define MAX_LOG_TOTAL 16384 /*!< \brief the maximum length of a log */
-/* @}*/
+/** @}*/
 
 /** @defgroup _log_level Message levels defined by LOG
  *  @ingroup _macro
@@ -95,8 +85,7 @@ extern "C" {
 # define  OAILOG_TRACE    5 /*!< \brief second level debug-level messages, for developers, likely impact real-time behavior*/
 
 #define NUM_LOG_LEVEL 6 /*!< \brief the number of message levels users have with LOG (OAILOG_DISABLE is not available to user as a level, so it is not included)*/
-/* @}*/
-
+/** @}*/
 
 /** @defgroup _log_format Defined log format
  *  @ingroup _macro
@@ -112,15 +101,6 @@ extern "C" {
 #define LOG_BLUE "\033[34m" /*!< \brief VT100 sequence for blue foreground */
 #define LOG_CYBL "\033[40;36m"  /*!< \brief VT100 sequence for cyan foreground on black background */
 #define LOG_RESET "\033[0m" /*!< \brief VT100 sequence for reset (black) foreground */
-/* @}*/
-
-
-/** @defgroup _syslog_conf Macros for write in syslog.conf
- *  @ingroup _macro
- *  @brief Macros used to write lines (local/remote) in syslog.conf
- * @{*/
-
-
 #define FLAG_NOCOLOR     0x0001  /*!< \brief use colors in log messages, depending on level */
 #define FLAG_THREAD      0x0008  /*!< \brief display thread name in log messages */
 #define FLAG_LEVEL       0x0010  /*!< \brief display log level in log messages */
@@ -130,6 +110,7 @@ extern "C" {
 #define FLAG_THREAD_ID   0x0200
 #define FLAG_REAL_TIME   0x0400
 #define FLAG_INITIALIZED 0x8000
+/** @}*/
 
 #define SET_LOG_OPTION(O)   g_log->flag = (g_log->flag | O)
 #define CLEAR_LOG_OPTION(O) g_log->flag = (g_log->flag & (~O))
@@ -333,7 +314,7 @@ typedef struct {
   int enable_flag;
 } log_mem_cnt_t;
 
-/* @}*/
+/** @}*/
 
 /*!\fn int32_t write_file_matlab(const char *fname, const char *vname, void *data, int length, int dec, char format);
 \brief Write output file from signal data
@@ -460,8 +441,7 @@ int32_t write_file_matlab(const char *fname, const char *vname, void *data, int
 #define LOG_UI(c, x...) do {logRecord_mt(__FILE__, __FUNCTION__, __LINE__,c, OAILOG_INFO, x) ; } while(0)
 #define LOG_UDUMPMSG(c, b, s, f, x...) do { log_dump(c, b, s, f, x)  ;}   while (0)  /* */
 #    define LOG_MM(file, vector, data, len, dec, format) do { write_file_matlab(file, vector, data, len, dec, format, 1);} while(0)
-/* @}*/
-
+/** @}*/
 
 /** @defgroup _useful_functions useful functions in LOG
  *  @ingroup _macro
@@ -472,8 +452,7 @@ int32_t write_file_matlab(const char *fname, const char *vname, void *data, int
 #define LOG_EXIT(c)  do { LOG_END(c); return;}while(0)  /*!< \brief Macro to log a message with severity TRACE when exiting a function */
 #define LOG_RETURN(c,r) do {LOG_T(c,"Leaving %s (rc = %08lx)\n", __FUNCTION__ , (unsigned long)(r) );return(r);}while(0)  /*!< \brief Macro to log a function exit, including integer value, then to return a value to the calling function */
 
-
-/* @}*/
+/** @}*/
 
 #ifdef __cplusplus
 }
diff --git a/common/utils/lte/prach_utils.h b/common/utils/lte/prach_utils.h
index 995805fbd2f0547956966e9580f517f6e1fea168..c3c8003727f0cc372c502865466e70cdd581e12a 100644
--- a/common/utils/lte/prach_utils.h
+++ b/common/utils/lte/prach_utils.h
@@ -19,16 +19,16 @@
  *      contact@openairinterface.org
  */
 
-/*! \file common/utils/prach_utils.h
-* \brief computation of some PRACH variables used in both MAC and PHY 
-* \author R. Knopp
-* \date 2020
-* \version 0.1
-* \company Eurecom
-* \email: raymond.knopp@eurecom.fr, florian.kaltenberger@eurecom.fr, oscar.tonelli@yahoo.it
-* \note
-* \warning
-*/
+/*! \file prach_utils.h
+ * \brief computation of some PRACH variables used in both MAC and PHY
+ * \author R. Knopp
+ * \date 2020
+ * \version 0.1
+ * \company Eurecom
+ * \email: raymond.knopp@eurecom.fr, florian.kaltenberger@eurecom.fr, oscar.tonelli@yahoo.it
+ * \note
+ * \warning
+ */
 uint8_t get_prach_fmt(int prach_ConfigIndex,int frame_type);
 
 uint8_t get_prach_prb_offset(int frame_type,
diff --git a/common/utils/telnetsrv/telnetsrv_5Gue_measurements.c b/common/utils/telnetsrv/telnetsrv_5Gue_measurements.c
index ae04666c95a487ed9fc982a06947df9177cbab26..bdf508e6ef169d110f655381e2102d473bd19aaa 100644
--- a/common/utils/telnetsrv/telnetsrv_5Gue_measurements.c
+++ b/common/utils/telnetsrv/telnetsrv_5Gue_measurements.c
@@ -19,7 +19,7 @@
  *      contact@openairinterface.org
  */
 
-/*! \file common/utils/telnetsrv/telnetsrv_nrue_measurements.c
+/*! \file telnetsrv_5Gue_measurements.c
  * \brief: implementation of telnet commands related to nrUE measurments
  * \author Francois TABURET
  * \date 2021
diff --git a/common/utils/telnetsrv/telnetsrv_enb_phycmd.c b/common/utils/telnetsrv/telnetsrv_enb_phycmd.c
index f3b40980f1363ce4442f3006510d85a028ce9b29..3c8b16b680059ff55dccfd7aa145ad25a932d335 100644
--- a/common/utils/telnetsrv/telnetsrv_enb_phycmd.c
+++ b/common/utils/telnetsrv/telnetsrv_enb_phycmd.c
@@ -19,7 +19,7 @@
  *      contact@openairinterface.org
  */
 
-/*! \file common/utils/telnetsrv/telnetsrv_phycmd.c
+/*! \file telnetsrv_enb_phycmd.c
  * \brief: implementation of telnet commands related to softmodem linux process
  * \author Francois TABURET
  * \date 2017
diff --git a/common/utils/telnetsrv/telnetsrv_loader.h b/common/utils/telnetsrv/telnetsrv_loader.h
index 315e57c34ebd73b278864a97185fd03de5241c84..db9df13b8b62fafd102ea01aafe394c766dc9cef 100644
--- a/common/utils/telnetsrv/telnetsrv_loader.h
+++ b/common/utils/telnetsrv/telnetsrv_loader.h
@@ -19,7 +19,7 @@
  *      contact@openairinterface.org
  */
 
-/*! \file common/utils/telnetsrv_proccmd.h
+/*! \file telnetsrv_loader.h
  * \brief: Include file defining telnet commands related to softmodem linux process
  * \author Francois TABURET
  * \date 2018
diff --git a/common/utils/telnetsrv/telnetsrv_phycmd.h b/common/utils/telnetsrv/telnetsrv_phycmd.h
index d4818340dddda03b4b6eda91705ede1507302b5d..b9994363953a22cb642e4d9ecb18c0afc124c108 100644
--- a/common/utils/telnetsrv/telnetsrv_phycmd.h
+++ b/common/utils/telnetsrv/telnetsrv_phycmd.h
@@ -19,7 +19,7 @@
  *      contact@openairinterface.org
  */
 
-/*! \file common/utils/telnetsrv_proccmd.h
+/*! \file telnetsrv_phycmd.h
  * \brief: Include file defining telnet commands related to softmodem linux process
  * \author Francois TABURET
  * \date 2017
diff --git a/doc/Doxyfile b/doc/Doxyfile
index f60031541a31cc59eb3706020074f4aa51b63144..00485ee5b96ce51403a5c82246456aa2e8b248bc 100644
--- a/doc/Doxyfile
+++ b/doc/Doxyfile
@@ -855,1699 +855,1525 @@ WARN_LOGFILE           = cmake_targets/log/doxy.log
 # Note: If this tag is empty the current directory is searched.
 EXCLUDE_PATTERNS = if4_tools.c
 INPUT                  = \
-@CMAKE_CURRENT_SOURCE_DIR@/../targets/RT/USER/lte-softmodem.h \
-@CMAKE_CURRENT_SOURCE_DIR@/../targets/RT/USER/stats.h \
-@CMAKE_CURRENT_SOURCE_DIR@/../targets/RT/USER/lte-ue.c \
-@CMAKE_CURRENT_SOURCE_DIR@/../targets/RT/USER/lte-softmodem.c \
-@CMAKE_CURRENT_SOURCE_DIR@/../targets/RT/USER/stats.c \
-@CMAKE_CURRENT_SOURCE_DIR@/../targets/RT/USER/lte-uesoftmodem.c \
-@CMAKE_CURRENT_SOURCE_DIR@/../targets/RT/USER/lte-enb.c \
-@CMAKE_CURRENT_SOURCE_DIR@/../targets/RT/USER/lte-ru.c \
-@CMAKE_CURRENT_SOURCE_DIR@/../targets/RT/USER/ru_control.c \
-@CMAKE_CURRENT_SOURCE_DIR@/../targets/COMMON/MESSAGES/V2/flexsplit.proto \
-@CMAKE_CURRENT_SOURCE_DIR@/../radio/USRP/USERSPACE/LIB/usrp_lib.cpp \
-@CMAKE_CURRENT_SOURCE_DIR@/../radio/iqplayer/iqplayer_lib.c \
-@CMAKE_CURRENT_SOURCE_DIR@/../radio/COMMON/record_player.h \
-@CMAKE_CURRENT_SOURCE_DIR@/../radio/COMMON/common_lib.c \
-@CMAKE_CURRENT_SOURCE_DIR@/../radio/COMMON/common_lib.h \
-@CMAKE_CURRENT_SOURCE_DIR@/../radio/COMMON/record_player.c \
-@CMAKE_CURRENT_SOURCE_DIR@/../radio/rfsimulator/rfsimulator.h \
-@CMAKE_CURRENT_SOURCE_DIR@/../radio/rfsimulator/simulator.c \
-@CMAKE_CURRENT_SOURCE_DIR@/../radio/rfsimulator/apply_channelmod.c \
-@CMAKE_CURRENT_SOURCE_DIR@/../radio/ETHERNET/if_defs.h \
-@CMAKE_CURRENT_SOURCE_DIR@/../radio/ETHERNET/ethernet_lib.c \
-@CMAKE_CURRENT_SOURCE_DIR@/../radio/ETHERNET/eth_udp.c \
-@CMAKE_CURRENT_SOURCE_DIR@/../radio/ETHERNET/ethernet_lib.h \
-@CMAKE_CURRENT_SOURCE_DIR@/../radio/ETHERNET/eth_raw.c \
-@CMAKE_CURRENT_SOURCE_DIR@/../common/config/config_cmdline.c \
-@CMAKE_CURRENT_SOURCE_DIR@/../common/config/config_paramdesc.h \
-@CMAKE_CURRENT_SOURCE_DIR@/../common/config/config_userapi.h \
-@CMAKE_CURRENT_SOURCE_DIR@/../common/config/config_load_configmodule.h \
 @CMAKE_CURRENT_SOURCE_DIR@/../common/config/config_load_configmodule.c \
-@CMAKE_CURRENT_SOURCE_DIR@/../common/config/libconfig/config_libconfig.h \
+@CMAKE_CURRENT_SOURCE_DIR@/../common/config/config_load_configmodule.h \
 @CMAKE_CURRENT_SOURCE_DIR@/../common/config/libconfig/config_libconfig.c \
+@CMAKE_CURRENT_SOURCE_DIR@/../common/config/libconfig/config_libconfig.h \
 @CMAKE_CURRENT_SOURCE_DIR@/../common/config/libconfig/config_libconfig_private.h \
+@CMAKE_CURRENT_SOURCE_DIR@/../common/config/config_paramdesc.h \
 @CMAKE_CURRENT_SOURCE_DIR@/../common/config/config_userapi.c \
-@CMAKE_CURRENT_SOURCE_DIR@/../common/oai_asn1.h \
-@CMAKE_CURRENT_SOURCE_DIR@/../common/utils/time_meas.h \
-@CMAKE_CURRENT_SOURCE_DIR@/../common/utils/time_stat.h \
-@CMAKE_CURRENT_SOURCE_DIR@/../common/utils/load_module_shlib.h \
+@CMAKE_CURRENT_SOURCE_DIR@/../common/config/config_userapi.h \
+@CMAKE_CURRENT_SOURCE_DIR@/../common/config/config_cmdline.c \
 @CMAKE_CURRENT_SOURCE_DIR@/../common/utils/time_meas.c \
-@CMAKE_CURRENT_SOURCE_DIR@/../common/utils/hashtable/obj_hashtable.c \
-@CMAKE_CURRENT_SOURCE_DIR@/../common/utils/hashtable/hashtable.h \
-@CMAKE_CURRENT_SOURCE_DIR@/../common/utils/hashtable/obj_hashtable.h \
-@CMAKE_CURRENT_SOURCE_DIR@/../common/utils/hashtable/hashtable.c \
-@CMAKE_CURRENT_SOURCE_DIR@/../common/utils/utils.h \
-@CMAKE_CURRENT_SOURCE_DIR@/../common/utils/nr/nr_common.c \
-@CMAKE_CURRENT_SOURCE_DIR@/../common/utils/nr/nr_common.h \
-@CMAKE_CURRENT_SOURCE_DIR@/../common/utils/ocp_itti/intertask_interface.cpp \
-@CMAKE_CURRENT_SOURCE_DIR@/../common/utils/ocp_itti/all_msg.h \
-@CMAKE_CURRENT_SOURCE_DIR@/../common/utils/ocp_itti/intertask_interface.h \
-@CMAKE_CURRENT_SOURCE_DIR@/../common/utils/lte/ue_power.c \
-@CMAKE_CURRENT_SOURCE_DIR@/../common/utils/lte/prach_utils.c \
-@CMAKE_CURRENT_SOURCE_DIR@/../common/utils/lte/prach_utils.h \
+@CMAKE_CURRENT_SOURCE_DIR@/../common/utils/time_meas.h \
 @CMAKE_CURRENT_SOURCE_DIR@/../common/utils/utils.c \
+@CMAKE_CURRENT_SOURCE_DIR@/../common/utils/oai_asn1.h \
 @CMAKE_CURRENT_SOURCE_DIR@/../common/utils/system.h \
-@CMAKE_CURRENT_SOURCE_DIR@/../common/utils/collection/linear_alloc.h \
-@CMAKE_CURRENT_SOURCE_DIR@/../common/utils/collection/tree.h \
-@CMAKE_CURRENT_SOURCE_DIR@/../common/utils/collection/queue.h \
+@CMAKE_CURRENT_SOURCE_DIR@/../common/utils/nr/nr_common.h \
+@CMAKE_CURRENT_SOURCE_DIR@/../common/utils/nr/nr_common.c \
+@CMAKE_CURRENT_SOURCE_DIR@/../common/utils/hashtable/obj_hashtable.h \
+@CMAKE_CURRENT_SOURCE_DIR@/../common/utils/hashtable/hashtable.h \
+@CMAKE_CURRENT_SOURCE_DIR@/../common/utils/hashtable/hashtable.c \
+@CMAKE_CURRENT_SOURCE_DIR@/../common/utils/hashtable/obj_hashtable.c \
+@CMAKE_CURRENT_SOURCE_DIR@/../common/utils/time_stat.c \
 @CMAKE_CURRENT_SOURCE_DIR@/../common/utils/system.c \
-@CMAKE_CURRENT_SOURCE_DIR@/../common/utils/telnetsrv/telnetsrv_enb_measurements.c \
+@CMAKE_CURRENT_SOURCE_DIR@/../common/utils/load_module_shlib.c \
+@CMAKE_CURRENT_SOURCE_DIR@/../common/utils/telnetsrv/telnetsrv_proccmd.c \
+@CMAKE_CURRENT_SOURCE_DIR@/../common/utils/telnetsrv/telnetsrv_cpumeasur_def.h \
+@CMAKE_CURRENT_SOURCE_DIR@/../common/utils/telnetsrv/telnetsrv_loader.c \
 @CMAKE_CURRENT_SOURCE_DIR@/../common/utils/telnetsrv/telnetsrv_phycmd.h \
-@CMAKE_CURRENT_SOURCE_DIR@/../common/utils/telnetsrv/telnetsrv_measurements.h \
-@CMAKE_CURRENT_SOURCE_DIR@/../common/utils/telnetsrv/telnetsrv_ltemeasur_def.h \
 @CMAKE_CURRENT_SOURCE_DIR@/../common/utils/telnetsrv/telnetsrv_loader.h \
-@CMAKE_CURRENT_SOURCE_DIR@/../common/utils/telnetsrv/telnetsrv_cpumeasur_def.h \
-@CMAKE_CURRENT_SOURCE_DIR@/../common/utils/telnetsrv/telnetsrv_enb_phycmd.c \
-@CMAKE_CURRENT_SOURCE_DIR@/../common/utils/telnetsrv/telnetsrv.h \
-@CMAKE_CURRENT_SOURCE_DIR@/../common/utils/telnetsrv/telnetsrv.c \
 @CMAKE_CURRENT_SOURCE_DIR@/../common/utils/telnetsrv/telnetsrv_measurements.c \
-@CMAKE_CURRENT_SOURCE_DIR@/../common/utils/telnetsrv/telnetsrv_loader.c \
-@CMAKE_CURRENT_SOURCE_DIR@/../common/utils/telnetsrv/telnetsrv_proccmd.c \
-@CMAKE_CURRENT_SOURCE_DIR@/../common/utils/telnetsrv/telnetsrv_CMakeLists.txt \
+@CMAKE_CURRENT_SOURCE_DIR@/../common/utils/telnetsrv/telnetsrv.h \
+@CMAKE_CURRENT_SOURCE_DIR@/../common/utils/telnetsrv/telnetsrv_ltemeasur_def.h \
+@CMAKE_CURRENT_SOURCE_DIR@/../common/utils/telnetsrv/telnetsrv_measurements.h \
 @CMAKE_CURRENT_SOURCE_DIR@/../common/utils/telnetsrv/telnetsrv_proccmd.h \
+@CMAKE_CURRENT_SOURCE_DIR@/../common/utils/telnetsrv/telnetsrv_bearer.c \
+@CMAKE_CURRENT_SOURCE_DIR@/../common/utils/telnetsrv/telnetsrv_enb_measurements.c \
+@CMAKE_CURRENT_SOURCE_DIR@/../common/utils/telnetsrv/telnetsrv_enb_phycmd.c \
+@CMAKE_CURRENT_SOURCE_DIR@/../common/utils/telnetsrv/telnetsrv_ci.c \
+@CMAKE_CURRENT_SOURCE_DIR@/../common/utils/telnetsrv/telnetsrv.c \
 @CMAKE_CURRENT_SOURCE_DIR@/../common/utils/telnetsrv/telnetsrv_5Gue_measurements.c \
-@CMAKE_CURRENT_SOURCE_DIR@/../common/utils/load_module_shlib.c \
-@CMAKE_CURRENT_SOURCE_DIR@/../common/utils/backtrace.h \
-@CMAKE_CURRENT_SOURCE_DIR@/../common/utils/assertions.h \
-@CMAKE_CURRENT_SOURCE_DIR@/../common/utils/oai_asn1.h \
-@CMAKE_CURRENT_SOURCE_DIR@/../common/utils/threadPool/thread-pool.h \
-@CMAKE_CURRENT_SOURCE_DIR@/../common/utils/threadPool/thread-pool.c \
-@CMAKE_CURRENT_SOURCE_DIR@/../common/utils/T/T.c \
-@CMAKE_CURRENT_SOURCE_DIR@/../common/utils/T/tracer/utils.h \
-@CMAKE_CURRENT_SOURCE_DIR@/../common/utils/T/tracer/database.c \
+@CMAKE_CURRENT_SOURCE_DIR@/../common/utils/lte/prach_utils.c \
+@CMAKE_CURRENT_SOURCE_DIR@/../common/utils/lte/prach_utils.h \
+@CMAKE_CURRENT_SOURCE_DIR@/../common/utils/lte/ue_power.c \
+@CMAKE_CURRENT_SOURCE_DIR@/../common/utils/LOG/log_if.h \
+@CMAKE_CURRENT_SOURCE_DIR@/../common/utils/LOG/vcd_signal_dumper.c \
+@CMAKE_CURRENT_SOURCE_DIR@/../common/utils/LOG/vcd_signal_dumper.h \
+@CMAKE_CURRENT_SOURCE_DIR@/../common/utils/LOG/log.c \
+@CMAKE_CURRENT_SOURCE_DIR@/../common/utils/LOG/log.h \
+@CMAKE_CURRENT_SOURCE_DIR@/../common/utils/LOG/log_extern.h \
+@CMAKE_CURRENT_SOURCE_DIR@/../common/utils/time_stat.h \
+@CMAKE_CURRENT_SOURCE_DIR@/../common/utils/ocp_itti/all_msg.h \
+@CMAKE_CURRENT_SOURCE_DIR@/../common/utils/ocp_itti/intertask_interface.h \
+@CMAKE_CURRENT_SOURCE_DIR@/../common/utils/utils.h \
+@CMAKE_CURRENT_SOURCE_DIR@/../common/utils/T/T_defs.h \
+@CMAKE_CURRENT_SOURCE_DIR@/../common/utils/T/check_vcd.c \
+@CMAKE_CURRENT_SOURCE_DIR@/../common/utils/T/tracer/extract_output_subframe.c \
 @CMAKE_CURRENT_SOURCE_DIR@/../common/utils/T/tracer/utils.c \
+@CMAKE_CURRENT_SOURCE_DIR@/../common/utils/T/tracer/database.c \
+@CMAKE_CURRENT_SOURCE_DIR@/../common/utils/T/tracer/event.h \
 @CMAKE_CURRENT_SOURCE_DIR@/../common/utils/T/tracer/database.h \
-@CMAKE_CURRENT_SOURCE_DIR@/../common/utils/T/T.h \
+@CMAKE_CURRENT_SOURCE_DIR@/../common/utils/T/tracer/extract_config.c \
+@CMAKE_CURRENT_SOURCE_DIR@/../common/utils/T/tracer/configuration.c \
+@CMAKE_CURRENT_SOURCE_DIR@/../common/utils/T/tracer/configuration.h \
+@CMAKE_CURRENT_SOURCE_DIR@/../common/utils/T/tracer/extract_input_subframe.c \
+@CMAKE_CURRENT_SOURCE_DIR@/../common/utils/T/tracer/utils.h \
+@CMAKE_CURRENT_SOURCE_DIR@/../common/utils/T/tracer/replay.c \
+@CMAKE_CURRENT_SOURCE_DIR@/../common/utils/T/tracer/extract.c \
+@CMAKE_CURRENT_SOURCE_DIR@/../common/utils/T/tracer/handler.h \
+@CMAKE_CURRENT_SOURCE_DIR@/../common/utils/T/tracer/event.c \
+@CMAKE_CURRENT_SOURCE_DIR@/../common/utils/T/tracer/record.c \
+@CMAKE_CURRENT_SOURCE_DIR@/../common/utils/T/tracer/multi.c \
+@CMAKE_CURRENT_SOURCE_DIR@/../common/utils/T/tracer/handler.c \
+@CMAKE_CURRENT_SOURCE_DIR@/../common/utils/T/tracer/macpdu2wireshark.c \
+@CMAKE_CURRENT_SOURCE_DIR@/../common/utils/T/tracer/packet-mac-lte.h \
+@CMAKE_CURRENT_SOURCE_DIR@/../common/utils/T/genids.c \
 @CMAKE_CURRENT_SOURCE_DIR@/../common/utils/T/local_tracer.c \
+@CMAKE_CURRENT_SOURCE_DIR@/../common/utils/T/T.c \
 @CMAKE_CURRENT_SOURCE_DIR@/../common/utils/T/T_IDs.h \
-@CMAKE_CURRENT_SOURCE_DIR@/../common/utils/T/Makefile \
-@CMAKE_CURRENT_SOURCE_DIR@/../common/utils/T/T_messages.txt \
-@CMAKE_CURRENT_SOURCE_DIR@/../common/utils/T/T_defs.h \
-@CMAKE_CURRENT_SOURCE_DIR@/../common/utils/T/check_vcd.c \
-@CMAKE_CURRENT_SOURCE_DIR@/../common/utils/time_stat.c \
-@CMAKE_CURRENT_SOURCE_DIR@/../common/utils/LOG/vcd_signal_dumper.c \
-@CMAKE_CURRENT_SOURCE_DIR@/../common/utils/LOG/log_extern.h \
-@CMAKE_CURRENT_SOURCE_DIR@/../common/utils/LOG/log.c \
-@CMAKE_CURRENT_SOURCE_DIR@/../common/utils/LOG/log.h \
-@CMAKE_CURRENT_SOURCE_DIR@/../common/utils/LOG/log_if.h \
-@CMAKE_CURRENT_SOURCE_DIR@/../common/utils/LOG/vcd_signal_dumper.h \
+@CMAKE_CURRENT_SOURCE_DIR@/../common/utils/T/T.h \
+@CMAKE_CURRENT_SOURCE_DIR@/../common/utils/T/defs.h \
+@CMAKE_CURRENT_SOURCE_DIR@/../common/utils/collection/tree.h \
+@CMAKE_CURRENT_SOURCE_DIR@/../common/utils/collection/queue.h \
+@CMAKE_CURRENT_SOURCE_DIR@/../common/utils/collection/linear_alloc.h \
+@CMAKE_CURRENT_SOURCE_DIR@/../common/utils/assertions.h \
+@CMAKE_CURRENT_SOURCE_DIR@/../common/utils/config.h \
+@CMAKE_CURRENT_SOURCE_DIR@/../common/utils/load_module_shlib.h \
 @CMAKE_CURRENT_SOURCE_DIR@/../common/utils/simple_executable.h \
+@CMAKE_CURRENT_SOURCE_DIR@/../common/utils/threadPool/thread-pool.c \
+@CMAKE_CURRENT_SOURCE_DIR@/../common/utils/threadPool/thread-pool.h \
+@CMAKE_CURRENT_SOURCE_DIR@/../common/utils/ds/byte_array.c \
+@CMAKE_CURRENT_SOURCE_DIR@/../common/utils/ds/byte_array.h \
 @CMAKE_CURRENT_SOURCE_DIR@/../common/openairinterface5g_limits.h \
+@CMAKE_CURRENT_SOURCE_DIR@/../common/platform_constants.h \
 @CMAKE_CURRENT_SOURCE_DIR@/../common/ngran_types.h \
 @CMAKE_CURRENT_SOURCE_DIR@/../common/ran_context.h \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair2/UTIL/OTG/otg_models.h \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair2/UTIL/OTG/otg.h \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair2/UTIL/OTG/otg_config.h \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair2/UTIL/OTG/otg_defs.h \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair2/UTIL/OTG/otg_tx.h \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair2/UTIL/OTG/otg_rx.h \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair2/UTIL/OTG/otg_externs.h \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair2/UTIL/OSA/osa_rijndael.c \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair2/UTIL/OSA/osa_key_deriver.c \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair2/UTIL/OSA/osa_snow3g.c \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair2/UTIL/OSA/osa_stream_eea.c \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair2/UTIL/OSA/osa_snow3g.h \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair2/UTIL/OSA/osa_stream_eia.c \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair2/UTIL/OSA/osa_internal.h \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair2/UTIL/OSA/osa_defs.h \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair2/UTIL/OSA/osa_rijndael.h \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair2/UTIL/OPT/mac_pcap.h \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair2/UTIL/OPT/probe.c \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair2/UTIL/OPT/opt.h \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair2/UTIL/OPT/wireshark_headers.h \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair2/UTIL/OMG/defs.h \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair2/UTIL/OMG/omg_constants.h \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair2/UTIL/ASYNC_IF/message_queue.c \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair2/UTIL/ASYNC_IF/socket_link.h \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair2/UTIL/ASYNC_IF/socket_link.c \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair2/UTIL/ASYNC_IF/link_manager.h \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair2/UTIL/ASYNC_IF/ringbuffer_queue.h \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair2/UTIL/ASYNC_IF/ringbuffer_queue.c \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair2/UTIL/ASYNC_IF/message_queue.h \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair2/UTIL/ASYNC_IF/link_manager.c \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair2/UTIL/LISTS/list.h \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair2/UTIL/LISTS/list.c \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair2/UTIL/LISTS/list2.c \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair2/UTIL/MEM/mem_block.h \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair2/UTIL/MATH/oml.c \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair2/UTIL/MATH/oml.h \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair2/MCE_APP/mce_app.h \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair2/MCE_APP/mce_config.c \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair2/MCE_APP/mce_config.h \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair2/MCE_APP/mce_app.c \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair2/F1AP/f1ap_du_task.h \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair2/F1AP/f1ap_du_interface_management.h \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair2/F1AP/f1ap_du_ue_context_management.h \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair2/F1AP/f1ap_cu_rrc_message_transfer.h \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair2/F1AP/f1ap_cu_warning_message_transmission.c \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair2/F1AP/f1ap_cu_task.h \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair2/F1AP/f1ap_common.h \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair2/F1AP/f1ap_cu_task.c \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair2/F1AP/f1ap_cu_ue_context_management.h \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair2/F1AP/f1ap_common.c \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair2/F1AP/f1ap_du_paging.c \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair2/F1AP/f1ap_du_rrc_message_transfer.c \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair2/F1AP/f1ap_default_values.h \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair2/F1AP/f1ap_du_rrc_message_transfer.h \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair2/F1AP/f1ap_encoder.c \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair2/F1AP/f1ap_itti_messaging.h \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair2/F1AP/f1ap_itti_messaging.c \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair2/F1AP/f1ap_cu_ue_context_management.c \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair2/F1AP/f1ap_cu_paging.c \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair2/F1AP/f1ap_du_warning_message_transmission.c \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair2/F1AP/f1ap_encoder.h \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair2/F1AP/f1ap_du_task.c \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair2/F1AP/f1ap_du_system_information.c \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair2/F1AP/f1ap_cu_rrc_message_transfer.c \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair2/F1AP/f1ap_cu_interface_management.c \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair2/F1AP/f1ap_handlers.c \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair2/F1AP/f1ap_du_ue_context_management.c \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair2/F1AP/f1ap_cu_interface_management.h \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair2/F1AP/f1ap_du_interface_management.c \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair2/ENB_APP/flexran_agent_async.c \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair2/ENB_APP/enb_paramdef_emtc.h \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair2/ENB_APP/enb_app.h \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair2/ENB_APP/NB_IoT_interface.h \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair2/ENB_APP/enb_paramdef_mme.h \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair2/ENB_APP/flexran_agent_app.c \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair2/ENB_APP/flexran_agent_common.h \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair2/ENB_APP/RRC_config_tools.h \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair2/ENB_APP/flexran_agent_timer.c \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair2/ENB_APP/flexran_agent_timer.h \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair2/ENB_APP/flexran_agent_common.c \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair2/ENB_APP/flexran_agent_ran_api_to_fix.c \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair2/ENB_APP/flexran_agent_net_comm.c \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair2/ENB_APP/enb_config_eMTC.c \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair2/ENB_APP/RRC_config_tools.c \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair2/ENB_APP/flexran_agent.c \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair2/ENB_APP/flexran_agent_defs.h \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair2/ENB_APP/flexran_agent_ran_api.c \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair2/ENB_APP/flexran_agent_net_comm.h \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair2/ENB_APP/MESSAGES/V2/time_common.proto \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair2/ENB_APP/MESSAGES/V2/control_delegation.proto \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair2/ENB_APP/MESSAGES/V2/flexran.proto \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair2/ENB_APP/MESSAGES/V2/header.proto \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair2/ENB_APP/MESSAGES/V2/config_common.proto \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair2/ENB_APP/MESSAGES/V2/config_messages.proto \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair2/ENB_APP/MESSAGES/V2/controller_commands.proto \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair2/ENB_APP/MESSAGES/V2/stats_messages.proto \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair2/ENB_APP/MESSAGES/V2/stats_common.proto \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair2/ENB_APP/MESSAGES/V2/mac_primitives.proto \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair2/ENB_APP/enb_paramdef_sidelink.h \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair2/ENB_APP/MACRLC_paramdef.h \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair2/ENB_APP/flexran_agent_ran_api.h \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair2/ENB_APP/flexran_agent_common_internal.h \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair2/ENB_APP/enb_paramdef_mce.h \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair2/ENB_APP/L1_paramdef.h \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair2/ENB_APP/flexran_agent_common_internal.c \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair2/ENB_APP/flexran_agent_app.h \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair2/ENB_APP/flexran_agent_task_manager.h \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair2/ENB_APP/NB_IoT_interface.c \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair2/ENB_APP/enb_config_SL.c \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair2/ENB_APP/flexran_agent.h \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair2/ENB_APP/enb_app.c \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair2/ENB_APP/flexran_agent_async.h \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair2/ENB_APP/enb_config.h \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair2/ENB_APP/flexran_agent_extern.h \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair2/ENB_APP/RRC_paramsvalues.h \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair2/ENB_APP/flexran_agent_handler.c \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair2/ENB_APP/enb_config.c \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair2/ENB_APP/flexran_agent_task_manager.c \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair2/ENB_APP/CONTROL_MODULES/PDCP/flexran_agent_pdcp.h \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair2/ENB_APP/CONTROL_MODULES/PDCP/flexran_agent_pdcp_defs.h \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair2/ENB_APP/CONTROL_MODULES/PDCP/flexran_agent_pdcp.c \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair2/ENB_APP/CONTROL_MODULES/MAC/flexran_agent_mac_slice_verification.h \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair2/ENB_APP/CONTROL_MODULES/MAC/flexran_agent_mac_internal.c \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair2/ENB_APP/CONTROL_MODULES/MAC/flexran_agent_mac_defs.h \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair2/ENB_APP/CONTROL_MODULES/MAC/flexran_agent_mac.h \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair2/ENB_APP/CONTROL_MODULES/MAC/flexran_agent_mac_internal.h \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair2/ENB_APP/CONTROL_MODULES/MAC/flexran_agent_mac.c \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair2/ENB_APP/CONTROL_MODULES/MAC/flexran_agent_mac_slice_verification.c \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair2/ENB_APP/CONTROL_MODULES/PHY/flexran_agent_phy.c \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair2/ENB_APP/CONTROL_MODULES/PHY/flexran_agent_phy.h \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair2/ENB_APP/CONTROL_MODULES/PHY/flexran_agent_phy_defs.h \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair2/ENB_APP/CONTROL_MODULES/S1AP/flexran_agent_s1ap_defs.h \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair2/ENB_APP/CONTROL_MODULES/S1AP/flexran_agent_s1ap.h \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair2/ENB_APP/CONTROL_MODULES/S1AP/flexran_agent_s1ap.c \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair2/ENB_APP/CONTROL_MODULES/RRC/flexran_agent_rrc_internal.h \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair2/ENB_APP/CONTROL_MODULES/RRC/flexran_agent_rrc.c \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair2/ENB_APP/CONTROL_MODULES/RRC/flexran_agent_rrc_defs.h \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair2/ENB_APP/CONTROL_MODULES/RRC/flexran_agent_rrc.h \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair2/ENB_APP/CONTROL_MODULES/RRC/flexran_agent_rrc_internal.c \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair2/ENB_APP/enb_paramdef.h \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair2/X2AP/x2ap_timers.c \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair2/X2AP/x2ap_ids.h \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair2/X2AP/x2ap_eNB_decoder.c \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair2/X2AP/x2ap_common.h \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair2/X2AP/x2ap_eNB_handler.h \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair2/X2AP/x2ap_eNB_generate_messages.c \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair2/X2AP/x2ap_eNB_encoder.h \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair2/X2AP/x2ap_eNB_management_procedures.h \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair2/X2AP/x2ap_eNB_encoder.c \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair2/X2AP/x2ap_eNB_itti_messaging.c \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair2/X2AP/x2ap_eNB_defs.h \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair2/X2AP/x2ap_eNB.h \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair2/X2AP/x2ap_eNB_management_procedures.c \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair2/X2AP/x2ap_eNB.c \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair2/X2AP/x2ap_eNB_itti_messaging.h \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair2/X2AP/x2ap_common.c \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair2/X2AP/x2ap_eNB_handler.c \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair2/X2AP/x2ap_ids.c \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair2/X2AP/x2ap_eNB_generate_messages.h \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair2/X2AP/x2ap_eNB_decoder.h \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair2/X2AP/x2ap_timers.h \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair2/GNB_APP/gnb_paramdef.h \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair2/GNB_APP/gnb_app.h \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair2/GNB_APP/gnb_config.c \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair2/GNB_APP/gnb_app.c \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair2/GNB_APP/MACRLC_nr_paramdef.h \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair2/GNB_APP/L1_nr_paramdef.h \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair2/GNB_APP/gnb_config.h \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair2/GNB_APP/RRC_nr_paramsvalues.h \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair2/NR_UE_PHY_INTERFACE/NR_IF_Module.c \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair2/NR_UE_PHY_INTERFACE/NR_IF_Module.h \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair2/NR_UE_PHY_INTERFACE/NR_Packet_Drop.c \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair2/NR_UE_PHY_INTERFACE/NR_Packet_Drop.h \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair2/E1AP/MESSAGES/ASN.1/38463-g80.R16.78.0.cmake \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair2/E1AP/MESSAGES/CMakeLists.txt \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair2/E1AP/CMakeLists.txt \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair2/M2AP/m2ap_eNB.c \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair2/M2AP/m2ap_common.h \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair2/M2AP/m2ap_MCE_handler.c \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair2/M2AP/m2ap_encoder.c \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair2/M2AP/m2ap_eNB_handler.h \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair2/M2AP/m2ap_MCE_generate_messages.c \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair2/M2AP/m2ap_timers.h \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair2/M2AP/m2ap_encoder.h \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair2/M2AP/m2ap_MCE_handler.h \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair2/M2AP/m2ap_MCE_management_procedures.h \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair2/M2AP/m2ap_ids.c \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair2/M2AP/m2ap_MCE_management_procedures.c \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair2/M2AP/m2ap_decoder.c \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair2/M2AP/m2ap_itti_messaging.h \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair2/M2AP/m2ap_eNB_handler.c \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair2/M2AP/m2ap_eNB_interface_management.c \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair2/M2AP/m2ap_common.c \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair2/M2AP/m2ap_MCE.c \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair2/M2AP/m2ap_eNB.h \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair2/M2AP/m2ap_itti_messaging.c \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair2/M2AP/m2ap_MCE_generate_messages.h \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair2/M2AP/m2ap_eNB_interface_management.h \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair2/M2AP/m2ap_eNB_management_procedures.c \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair2/M2AP/m2ap_eNB_defs.h \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair2/M2AP/m2ap_eNB_generate_messages.c \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair2/M2AP/m2ap_default_values.h \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair2/M2AP/m2ap_MCE.h \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair2/M2AP/m2ap_decoder.h \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair2/M2AP/m2ap_eNB_generate_messages.h \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair2/M2AP/m2ap_MCE_interface_management.h \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair2/M2AP/m2ap_MCE_interface_management.c \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair2/M2AP/m2ap_timers.c \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair2/M2AP/m2ap_eNB_management_procedures.h \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair2/M2AP/m2ap_ids.h \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair2/M2AP/m2ap_MCE_defs.h \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair2/PHY_INTERFACE/phy_interface.h \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair2/PHY_INTERFACE/phy_stub_UE.c \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair2/PHY_INTERFACE/IF_Module.c \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair2/PHY_INTERFACE/phy_stub_UE.h \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair2/PHY_INTERFACE/IF_Module_NB_IoT.h \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair2/PHY_INTERFACE/queue_t.h \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair2/PHY_INTERFACE/phy_interface_vars.h \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair2/PHY_INTERFACE/phy_interface_extern.h \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair2/PHY_INTERFACE/queue_t.c \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair2/PHY_INTERFACE/IF_Module.h \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair2/COMMON/rlc_messages_types.h \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair2/COMMON/platform_constants.h \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair2/COMMON/nas_messages_def.h \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair2/COMMON/gtpv1_u_messages_types.h \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair2/COMMON/m2ap_messages_def.h \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair2/COMMON/pdcp_messages_types.h \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair2/COMMON/f1ap_messages_def.h \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair2/COMMON/f1ap_messages_types.h \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair2/COMMON/x2ap_messages_types.h \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair2/COMMON/mac_rrc_primitives.h \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair2/COMMON/sctp_messages_def.h \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair2/COMMON/prs_nr_paramdef.h \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair2/COMMON/nas_messages_types.h \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair2/COMMON/rrc_messages_def.h \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair2/COMMON/mac_messages_types.h \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair2/COMMON/commonDef.h \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair2/COMMON/phy_messages_def.h \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair2/COMMON/sctp_messages_types.h \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair2/COMMON/as_message.h \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair2/COMMON/mac_rlc_primitives.h \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair2/COMMON/flexran_messages_def.h \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair2/COMMON/m3ap_messages_def.h \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair2/COMMON/mac_messages_def.h \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair2/COMMON/udp_messages_def.h \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair2/COMMON/x2ap_messages_def.h \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair2/COMMON/pdcp_messages_def.h \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair2/COMMON/phy_messages_types.h \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair2/COMMON/m2ap_messages_types.h \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair2/COMMON/networkDef.h \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair2/COMMON/s1ap_messages_def.h \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair2/COMMON/platform_types.h \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair2/COMMON/ngap_messages_types.h \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair2/COMMON/m3ap_messages_types.h \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair2/COMMON/s1ap_messages_types.h \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair2/COMMON/rrm_constants.h \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair2/COMMON/openair_defs.h \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair2/COMMON/rrc_messages_types.h \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair2/COMMON/mac_primitives.h \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair2/COMMON/rlc_messages_def.h \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair2/COMMON/ngap_messages_def.h \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair2/COMMON/gtpv1_u_messages_def.h \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair2/COMMON/udp_messages_types.h \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair2/NR_PHY_INTERFACE/NR_IF_Module.c \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair2/NR_PHY_INTERFACE/NR_IF_Module.h \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair2/NETWORK_DRIVER/UE_IP/local.h \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair2/NETWORK_DRIVER/UE_IP/sap.h \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair2/NETWORK_DRIVER/UE_IP/proto_extern.h \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair2/NETWORK_DRIVER/UE_IP/common.c \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair2/NETWORK_DRIVER/UE_IP/device.c \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair2/NETWORK_DRIVER/UE_IP/netlink.c \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair2/NETWORK_DRIVER/UE_IP/constant.h \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair2/NETWORK_DRIVER/LITE/constant.h \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair2/NETWORK_DRIVER/MESH/rrc_nas_primitives.h \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair2/NETWORK_DRIVER/MESH/ioctl.h \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair2/NETWORK_DRIVER/MESH/constant.h \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair2/LAYER2/rlc_v2/rlc_ue_manager.c \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair2/LAYER2/rlc_v2/rlc_entity.h \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair2/LAYER2/rlc_v2/rlc_entity_um.c \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair2/LAYER2/rlc_v2/rlc_pdu.h \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair2/LAYER2/rlc_v2/rlc_entity_am.c \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair2/LAYER2/rlc_v2/rlc_entity_um.h \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair2/LAYER2/rlc_v2/rlc_entity_am.h \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair2/LAYER2/rlc_v2/rlc_sdu.c \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair2/LAYER2/rlc_v2/rlc_entity.c \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair2/LAYER2/rlc_v2/rlc_asn1_utils.h \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair2/LAYER2/rlc_v2/rlc_ue_manager.h \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair2/LAYER2/rlc_v2/rlc_oai_api.c \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair2/LAYER2/rlc_v2/rlc_sdu.h \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair2/LAYER2/rlc_v2/asn1_utils.c \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair2/LAYER2/rlc_v2/rlc_pdu.c \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair2/LAYER2/PDCP_v10.1.0/pdcp_primitives.h \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair2/LAYER2/PDCP_v10.1.0/pdcp.h \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair2/LAYER2/PDCP_v10.1.0/pdcp_util.h \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair2/LAYER2/PDCP_v10.1.0/pdcp_security.c \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair2/LAYER2/PDCP_v10.1.0/pdcp_sequence_manager.h \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair2/LAYER2/PDCP_v10.1.0/pdcp_sequence_manager.c \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair2/LAYER2/PDCP_v10.1.0/pdcp_fifo.c \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair2/LAYER2/PDCP_v10.1.0/pdcp_util.c \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair2/LAYER2/PDCP_v10.1.0/pdcp.c \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair2/LAYER2/PDCP_v10.1.0/pdcp_primitives.c \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair2/LAYER2/NR_MAC_COMMON/nr_mac_common.h \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair2/LAYER2/NR_MAC_COMMON/nr_mac.h \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair2/LAYER2/NR_MAC_COMMON/nr_mac_common.c \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair2/LAYER2/NR_MAC_COMMON/nr_compute_tbs_common.c \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair2/LAYER2/NR_MAC_COMMON/nr_mac_extern.h \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair2/LAYER2/MAC/l1_helpers.c \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair2/LAYER2/MAC/ue_procedures.c \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair2/LAYER2/MAC/eNB_scheduler.c \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair2/LAYER2/MAC/mac.h \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair2/LAYER2/MAC/slicing/slicing_internal.h \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair2/LAYER2/MAC/slicing/slicing.h \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair2/LAYER2/MAC/slicing/slicing.c \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair2/LAYER2/MAC/mac_vars.h \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair2/LAYER2/MAC/config.c \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair2/LAYER2/MAC/eNB_scheduler_ulsch.c \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair2/LAYER2/MAC/rar_tools.c \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair2/LAYER2/MAC/main.c \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair2/LAYER2/MAC/defs_NB_IoT.h \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair2/LAYER2/MAC/config_ue.c \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair2/LAYER2/MAC/eNB_scheduler_dlsch.c \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair2/LAYER2/MAC/eNB_scheduler_RA.c \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair2/LAYER2/MAC/eNB_scheduler_bch.c \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair2/LAYER2/MAC/eNB_scheduler_phytest.c \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair2/LAYER2/MAC/rar_tools_ue.c \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair2/LAYER2/MAC/main_ue.c \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair2/LAYER2/MAC/ra_procedures.c \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair2/LAYER2/MAC/eNB_scheduler_fairRR.h \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair2/LAYER2/MAC/eNB_scheduler_fairRR.c \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair2/LAYER2/MAC/eNB_scheduler_mch.c \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair2/LAYER2/MAC/mac_proto.h \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair2/LAYER2/MAC/config_NB_IoT.h \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair2/LAYER2/MAC/pre_processor.c \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair2/LAYER2/MAC/mac_extern.h \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair2/LAYER2/MAC/eNB_scheduler_primitives.c \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair2/LAYER2/RLC/UM_v9.3.0/rlc_um_entity.h \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair2/LAYER2/RLC/UM_v9.3.0/rlc_um_dar.h \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair2/LAYER2/RLC/UM_v9.3.0/rlc_um_test.h \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair2/LAYER2/RLC/UM_v9.3.0/rlc_um_segment.h \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair2/LAYER2/RLC/UM_v9.3.0/rlc_um_reassembly.h \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair2/LAYER2/RLC/UM_v9.3.0/rlc_um_constants.h \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair2/LAYER2/RLC/UM_v9.3.0/rlc_um.h \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair2/LAYER2/RLC/UM_v9.3.0/rlc_um_structs.h \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair2/LAYER2/RLC/UM_v9.3.0/rlc_um_control_primitives.h \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair2/LAYER2/RLC/UM_v9.3.0/rlc_um_fsm.h \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair2/LAYER2/RLC/UM_v9.3.0/rlc_um_receiver.h \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair2/LAYER2/RLC/rlc_primitives.h \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair2/LAYER2/RLC/TM_v9.3.0/rlc_tm_init.h \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair2/LAYER2/RLC/TM_v9.3.0/rlc_tm.h \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair2/LAYER2/RLC/TM_v9.3.0/rlc_tm_structs.h \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair2/LAYER2/RLC/TM_v9.3.0/rlc_tm_entity.h \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair2/LAYER2/RLC/AM_v9.3.0/rlc_am_constants.h \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair2/LAYER2/RLC/AM_v9.3.0/rlc_am_reassembly.h \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair2/LAYER2/RLC/AM_v9.3.0/rlc_am_status_report.h \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair2/LAYER2/RLC/AM_v9.3.0/rlc_am_segments_holes.h \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair2/LAYER2/RLC/AM_v9.3.0/rlc_am_timer_status_prohibit.h \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair2/LAYER2/RLC/AM_v9.3.0/rlc_am_entity.h \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair2/LAYER2/RLC/AM_v9.3.0/rlc_am_structs.h \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair2/LAYER2/RLC/AM_v9.3.0/rlc_am_in_sdu.h \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair2/LAYER2/RLC/AM_v9.3.0/rlc_am_timer_poll_retransmit.h \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair2/LAYER2/RLC/AM_v9.3.0/rlc_am_retransmit.h \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair2/LAYER2/RLC/AM_v9.3.0/rlc_am_rx_list.h \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair2/LAYER2/RLC/AM_v9.3.0/rlc_am.h \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair2/LAYER2/RLC/AM_v9.3.0/rlc_am_timer_reordering.h \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair2/LAYER2/RLC/AM_v9.3.0/rlc_am_init.h \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair2/LAYER2/RLC/AM_v9.3.0/rlc_am_windows.h \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair2/LAYER2/RLC/AM_v9.3.0/rlc_am_receiver.h \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair2/LAYER2/RLC/AM_v9.3.0/rlc_am_segment.h \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair2/LAYER2/RLC/rlc_def.h \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair2/LAYER2/RLC/rlc_def_lte.h \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair2/LAYER2/RLC/rlc.h \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair2/LAYER2/NR_MAC_UE/main_ue_nr.c \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair2/LAYER2/NR_MAC_UE/nr_ra_procedures.c \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair2/LAYER2/NR_MAC_UE/config_ue.c \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair2/LAYER2/NR_MAC_UE/nr_ue_scheduler.c \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair2/LAYER2/NR_MAC_UE/nr_ue_procedures.c \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair2/LAYER2/NR_MAC_UE/mac_defs.h \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair2/LAYER2/NR_MAC_UE/mac_vars.c \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair2/LAYER2/NR_MAC_UE/mac_proto.h \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair2/LAYER2/NR_MAC_UE/nr_ue_dci_configuration.c \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair2/LAYER2/NR_MAC_UE/mac_extern.h \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair2/LAYER2/nr_pdcp/nr_pdcp_oai_api.c \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair2/LAYER2/nr_pdcp/nr_pdcp_oai_api.h \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair2/LAYER2/nr_pdcp/nr_pdcp_entity.h \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair2/LAYER2/nr_pdcp/nr_pdcp_timer_thread.h \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair2/LAYER2/nr_pdcp/nr_pdcp_integrity_nia2.h \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair2/LAYER2/nr_pdcp/nr_pdcp_sdu.c \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair2/LAYER2/nr_pdcp/nr_pdcp_sdu.h \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair2/LAYER2/nr_pdcp/nr_pdcp_security_nea2.c \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair2/LAYER2/nr_pdcp/nr_pdcp_ue_manager.c \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair2/LAYER2/nr_pdcp/nr_pdcp_entity.c \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair2/LAYER2/nr_pdcp/nr_pdcp_security_nea2.h \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair2/LAYER2/nr_pdcp/nr_pdcp_ue_manager.h \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair2/LAYER2/nr_pdcp/nr_pdcp_integrity_nia1.h \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair2/LAYER2/nr_pdcp/nr_pdcp_asn1_utils.h \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair2/LAYER2/nr_pdcp/nr_pdcp_integrity_nia1.c \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair2/LAYER2/nr_pdcp/nr_pdcp.h \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair2/LAYER2/nr_pdcp/asn1_utils.c \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair2/LAYER2/nr_pdcp/nr_pdcp_timer_thread.c \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair2/LAYER2/nr_pdcp/nr_pdcp_integrity_nia2.c \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_bch.c \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_dlsch.c \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair2/LAYER2/NR_MAC_gNB/mac_rrc_dl_handler.c \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_primitives.c \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair2/LAYER2/NR_MAC_gNB/config.c \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair2/LAYER2/NR_MAC_gNB/main.c \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair2/LAYER2/NR_MAC_gNB/nr_mac_gNB.h \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_ulsch.c \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_phytest.c \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_RA.c \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair2/LAYER2/NR_MAC_gNB/gNB_scheduler.c \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair2/LAYER2/NR_MAC_gNB/mac_proto.h \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_srs.c \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair2/LAYER2/NR_MAC_gNB/mac_rrc_dl_handler.h \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair2/LAYER2/NR_MAC_gNB/mac_rrc_ul.h \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_uci.c \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair2/LAYER2/NR_MAC_gNB/mac_rrc_ul_f1ap.c \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair2/LAYER2/NR_MAC_gNB/mac_rrc_ul_direct.c \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair2/LAYER2/nr_rlc/nr_rlc_entity_tm.c \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair2/LAYER2/nr_rlc/nr_rlc_entity_tm.h \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair2/LAYER2/nr_rlc/nr_rlc_oai_api.h \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair2/LAYER2/nr_rlc/nr_rlc_entity.h \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair2/LAYER2/nr_rlc/nr_rlc_sdu.c \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair2/LAYER2/nr_rlc/nr_rlc_entity_um.h \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair2/LAYER2/nr_rlc/nr_rlc_ue_manager.c \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair2/LAYER2/nr_rlc/nr_rlc_entity.c \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair2/LAYER2/nr_rlc/nr_rlc_pdu.h \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair2/LAYER2/nr_rlc/nr_rlc_sdu.h \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair2/LAYER2/nr_rlc/nr_rlc_asn1_utils.h \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair2/LAYER2/nr_rlc/nr_rlc_pdu.c \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair2/LAYER2/nr_rlc/nr_rlc_entity_am.h \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair2/LAYER2/nr_rlc/asn1_utils.c \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair2/LAYER2/nr_rlc/nr_rlc_oai_api.c \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair2/LAYER2/nr_rlc/nr_rlc_entity_am.c \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair2/LAYER2/nr_rlc/nr_rlc_entity_um.c \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair2/LAYER2/nr_rlc/nr_rlc_ue_manager.h \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair2/LAYER2/openair2_proc.c \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair2/SDAP/nr_sdap/nr_sdap.h \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair2/SDAP/nr_sdap/nr_sdap_entity.c \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair2/SDAP/nr_sdap/nr_sdap.c \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair2/SDAP/nr_sdap/nr_sdap_entity.h \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair2/RRC/NR/nr_rrc_config.h \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair2/RRC/NR/rrc_gNB_GTPV1U.h \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair2/RRC/NR/rrc_gNB_radio_bearers.h \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair2/RRC/NR/rrc_gNB.c \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair2/RRC/NR/rrc_gNB_UE_context.h \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair2/RRC/NR/nr_rrc_config.c \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair2/RRC/NR/mac_rrc_dl_direct.c \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair2/RRC/NR/nr_rrc_common.c \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair2/RRC/NR/L2_nr_interface.c \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair2/RRC/NR/MESSAGES/asn1_msg.h \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair2/RRC/NR/MESSAGES/asn1_msg.c \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair2/RRC/NR/rrc_gNB_GTPV1U.c \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair2/RRC/NR/rrc_gNB_radio_bearers.c \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair2/RRC/NR/nr_rrc_defs.h \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair2/RRC/NR/nr_rrc_types.h \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair2/RRC/NR/mac_rrc_dl_f1ap.c \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair2/RRC/NR/rrc_gNB_NGAP.h \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair2/RRC/NR/nr_rrc_proto.h \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair2/RRC/NR/rrc_gNB_internode.c \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair2/RRC/NR/rrc_gNB_NGAP.c \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair2/RRC/NR/rrc_gNB_UE_context.c \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair2/RRC/NR/rrc_gNB_reconfig.c \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair2/RRC/NR/nr_rrc_extern.h \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair2/RRC/NR/rrc_gNB_nsa.c \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair2/RRC/NR/mac_rrc_dl.h \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair2/RRC/L2_INTERFACE/openair_rrc_L2_interface.h \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair2/RRC/NR_UE/L2_interface_ue.c \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair2/RRC/NR_UE/rrc_list.h \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair2/RRC/NR_UE/main_ue.c \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair2/RRC/NR_UE/rrc_defs.h \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair2/RRC/NR_UE/rrc_vars.h \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair2/RRC/NR_UE/rrc_UE.c \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair2/RRC/NR_UE/rrc_nsa.c \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair2/RRC/NR_UE/rrc_proto.h \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair2/RRC/NAS/nas_config.c \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair2/RRC/NAS/rb_config.c \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair2/RRC/NAS/rb_config.h \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair2/RRC/NAS/nas_config.h \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair2/RRC/LTE/L2_interface_ue.c \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair2/RRC/LTE/plmn_data.h \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair2/RRC/LTE/rrc_eNB_M2AP.c \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair2/RRC/LTE/rrc_types_NB_IoT.h \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair2/RRC/LTE/rrc_eNB_GTPV1U.c \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair2/RRC/LTE/rrc_eNB_GTPV1U.h \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair2/RRC/LTE/rrc_eNB_UE_context.h \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair2/RRC/LTE/L2_interface_common.c \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair2/RRC/LTE/defs_NB_IoT.h \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair2/RRC/LTE/MESSAGES/asn1_msg.h \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair2/RRC/LTE/MESSAGES/asn1_msg_NB_IoT.c \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair2/RRC/LTE/MESSAGES/asn1_msg.c \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair2/RRC/LTE/rrc_eNB_S1AP.c \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair2/RRC/LTE/rrc_eNB_endc.c \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair2/RRC/LTE/L2_interface.c \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair2/RRC/LTE/rrc_common.c \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair2/RRC/LTE/rrc_defs.h \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair2/RRC/LTE/rrc_vars.h \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair2/RRC/LTE/extern_NB_IoT.h \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair2/RRC/LTE/rrc_UE.c \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair2/RRC/LTE/rrc_types.h \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair2/RRC/LTE/rrc_eNB.c \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair2/RRC/LTE/rrc_eNB_UE_context.c \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair2/RRC/LTE/rrc_proto.h \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair2/RRC/LTE/rrc_eNB_M2AP.h \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair2/RRC/LTE/rrc_eNB_S1AP.h \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair2/RRC/LTE/rrc_extern.h \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair2/RRC/LTE/proto_NB_IoT.h \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair3/M3AP/m3ap_itti_messaging.c \
+@CMAKE_CURRENT_SOURCE_DIR@/../nfapi/oai_integration/gnb_ind_vars.c \
+@CMAKE_CURRENT_SOURCE_DIR@/../nfapi/oai_integration/nfapi_vnf.h \
+@CMAKE_CURRENT_SOURCE_DIR@/../nfapi/oai_integration/gnb_ind_vars.h \
+@CMAKE_CURRENT_SOURCE_DIR@/../nfapi/oai_integration/vendor_ext.h \
+@CMAKE_CURRENT_SOURCE_DIR@/../nfapi/oai_integration/nfapi_vnf.c \
+@CMAKE_CURRENT_SOURCE_DIR@/../nfapi/oai_integration/nfapi_pnf.c \
+@CMAKE_CURRENT_SOURCE_DIR@/../nfapi/oai_integration/nfapi.c \
+@CMAKE_CURRENT_SOURCE_DIR@/../nfapi/oai_integration/nfapi_pnf.h \
+@CMAKE_CURRENT_SOURCE_DIR@/../nfapi/open-nFAPI/common/public_inc/debug.h \
+@CMAKE_CURRENT_SOURCE_DIR@/../nfapi/open-nFAPI/common/src/debug.c \
+@CMAKE_CURRENT_SOURCE_DIR@/../nfapi/open-nFAPI/nfapi/public_inc/fapi_nr_ue_interface.h \
+@CMAKE_CURRENT_SOURCE_DIR@/../nfapi/open-nFAPI/nfapi/public_inc/nfapi_interface.h \
+@CMAKE_CURRENT_SOURCE_DIR@/../nfapi/open-nFAPI/nfapi/public_inc/nfapi_nr_interface_scf.h \
+@CMAKE_CURRENT_SOURCE_DIR@/../nfapi/open-nFAPI/nfapi/public_inc/sidelink_nr_ue_interface.h \
+@CMAKE_CURRENT_SOURCE_DIR@/../nfapi/open-nFAPI/nfapi/public_inc/fapi_nr_ue_constants.h \
+@CMAKE_CURRENT_SOURCE_DIR@/../nfapi/open-nFAPI/nfapi/public_inc/nfapi_nr_interface.h \
+@CMAKE_CURRENT_SOURCE_DIR@/../nfapi/open-nFAPI/nfapi/src/nfapi_p4.c \
+@CMAKE_CURRENT_SOURCE_DIR@/../nfapi/open-nFAPI/nfapi/src/nfapi_p7.c \
+@CMAKE_CURRENT_SOURCE_DIR@/../nfapi/open-nFAPI/nfapi/src/nfapi.c \
+@CMAKE_CURRENT_SOURCE_DIR@/../nfapi/open-nFAPI/nfapi/src/nfapi_p5.c \
+@CMAKE_CURRENT_SOURCE_DIR@/../nfapi/open-nFAPI/nfapi/inc/nfapi.h \
+@CMAKE_CURRENT_SOURCE_DIR@/../nfapi/open-nFAPI/vnf/public_inc/nfapi_vnf_interface.h \
+@CMAKE_CURRENT_SOURCE_DIR@/../nfapi/open-nFAPI/vnf/src/vnf_p7.c \
+@CMAKE_CURRENT_SOURCE_DIR@/../nfapi/open-nFAPI/vnf/src/vnf_interface.c \
+@CMAKE_CURRENT_SOURCE_DIR@/../nfapi/open-nFAPI/vnf/src/vnf.c \
+@CMAKE_CURRENT_SOURCE_DIR@/../nfapi/open-nFAPI/vnf/src/vnf_p7_interface.c \
+@CMAKE_CURRENT_SOURCE_DIR@/../nfapi/open-nFAPI/vnf/inc/vnf.h \
+@CMAKE_CURRENT_SOURCE_DIR@/../nfapi/open-nFAPI/vnf/inc/vnf_p7.h \
+@CMAKE_CURRENT_SOURCE_DIR@/../nfapi/open-nFAPI/pnf/public_inc/nfapi_pnf_interface.h \
+@CMAKE_CURRENT_SOURCE_DIR@/../nfapi/open-nFAPI/pnf/src/pnf_interface.c \
+@CMAKE_CURRENT_SOURCE_DIR@/../nfapi/open-nFAPI/pnf/src/pnf.c \
+@CMAKE_CURRENT_SOURCE_DIR@/../nfapi/open-nFAPI/pnf/src/pnf_p7_interface.c \
+@CMAKE_CURRENT_SOURCE_DIR@/../nfapi/open-nFAPI/pnf/src/pnf_p7.c \
+@CMAKE_CURRENT_SOURCE_DIR@/../nfapi/open-nFAPI/pnf/inc/pnf_p7.h \
+@CMAKE_CURRENT_SOURCE_DIR@/../nfapi/open-nFAPI/pnf/inc/pnf.h \
+@CMAKE_CURRENT_SOURCE_DIR@/../nfapi/open-nFAPI/sim_common/inc/vendor_ext.h \
+@CMAKE_CURRENT_SOURCE_DIR@/../nfapi/open-nFAPI/pnf_sim/inc/fapi_stub.h \
+@CMAKE_CURRENT_SOURCE_DIR@/../nfapi/open-nFAPI/pnf_sim/inc/fapi_interface.h \
+@CMAKE_CURRENT_SOURCE_DIR@/../executables/nr-ue.c \
+@CMAKE_CURRENT_SOURCE_DIR@/../executables/softmodem-common.c \
+@CMAKE_CURRENT_SOURCE_DIR@/../executables/nr-softmodem.h \
+@CMAKE_CURRENT_SOURCE_DIR@/../executables/nr-cuup.c \
+@CMAKE_CURRENT_SOURCE_DIR@/../executables/stats.h \
+@CMAKE_CURRENT_SOURCE_DIR@/../executables/nr-softmodem-common.h \
+@CMAKE_CURRENT_SOURCE_DIR@/../executables/softmodem-common.h \
+@CMAKE_CURRENT_SOURCE_DIR@/../executables/nr-softmodem.c \
+@CMAKE_CURRENT_SOURCE_DIR@/../executables/nr-gnb.c \
+@CMAKE_CURRENT_SOURCE_DIR@/../executables/rt_profiling.h \
+@CMAKE_CURRENT_SOURCE_DIR@/../executables/nr-uesoftmodem.h \
+@CMAKE_CURRENT_SOURCE_DIR@/../executables/nr-uesoftmodem.c \
+@CMAKE_CURRENT_SOURCE_DIR@/../executables/lte-softmodem.h \
+@CMAKE_CURRENT_SOURCE_DIR@/../executables/stats.c \
+@CMAKE_CURRENT_SOURCE_DIR@/../executables/thread-common.h \
+@CMAKE_CURRENT_SOURCE_DIR@/../executables/nr-ru.c \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair3/SCTP/sctp_default_values.h \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair3/SCTP/sctp_eNB_itti_messaging.c \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair3/SCTP/sctp_eNB_defs.h \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair3/SCTP/sctp_common.h \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair3/SCTP/sctp_common.c \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair3/SCTP/sctp_eNB_task.h \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair3/SCTP/sctp_eNB_task.c \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair3/SCTP/sctp_eNB_itti_messaging.h \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair3/S1AP/s1ap_eNB_overload.c \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair3/S1AP/s1ap_eNB_decoder.c \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair3/S1AP/s1ap_eNB_ue_context.c \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair3/S1AP/s1ap_eNB_itti_messaging.h \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair3/S1AP/s1ap_eNB_context_management_procedures.h \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair3/S1AP/s1ap_eNB_trace.c \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair3/S1AP/s1ap_eNB_handlers.c \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair3/S1AP/s1ap_eNB_ue_context.h \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair3/S1AP/s1ap_eNB_management_procedures.h \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair3/S1AP/s1ap_eNB_context_management_procedures.c \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair3/S1AP/s1ap_common.c \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair3/S1AP/s1ap_eNB_decoder.h \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair3/S1AP/s1ap_eNB_management_procedures.c \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair3/S1AP/s1ap_eNB_handlers.h \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair3/S1AP/s1ap_eNB_encoder.h \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair3/S1AP/s1ap_eNB_nas_procedures.c \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair3/S1AP/s1ap_eNB_itti_messaging.c \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair3/S1AP/s1ap_eNB_defs.h \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair3/S1AP/s1ap_eNB.c \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair3/S1AP/s1ap_eNB_encoder.c \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair3/S1AP/s1ap_common.h \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair3/S1AP/s1ap_eNB_nas_procedures.h \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair3/S1AP/s1ap_eNB_nnsf.c \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair3/S1AP/s1ap_eNB_overload.h \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair3/S1AP/s1ap_eNB_nnsf.h \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair3/S1AP/s1ap_eNB_trace.h \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair3/S1AP/s1ap_eNB_default_values.h \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair3/S1AP/s1ap_eNB.h \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair3/NGAP/ngap_gNB_nnsf.c \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair3/NGAP/ngap_gNB_management_procedures.c \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair3/NGAP/ngap_gNB_nnsf.h \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair3/NGAP/ngap_gNB_management_procedures.h \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair3/NGAP/ngap_gNB_context_management_procedures.h \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair3/NGAP/ngap_gNB_nas_procedures.h \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair3/NGAP/ngap_gNB_overload.h \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair3/NGAP/ngap_gNB_ue_context.h \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair3/NGAP/ngap_gNB_handlers.c \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair3/NGAP/ngap_gNB.c \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair3/NGAP/ngap_gNB_encoder.c \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair3/NGAP/ngap_common.h \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair3/NGAP/ngap_gNB.h \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair3/NGAP/ngap_gNB_trace.h \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair3/NGAP/ngap_gNB_encoder.h \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair3/NGAP/ngap_gNB_defs.h \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair3/NGAP/ngap_gNB_trace.c \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair3/NGAP/ngap_gNB_handlers.h \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair3/NGAP/ngap_gNB_context_management_procedures.c \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair3/NGAP/ngap_gNB_decoder.c \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair3/NGAP/ngap_gNB_itti_messaging.c \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair3/NGAP/ngap_gNB_itti_messaging.h \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair3/NGAP/ngap_gNB_nas_procedures.c \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair3/NGAP/ngap_gNB_decoder.h \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair3/NGAP/ngap_gNB_ue_context.c \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair3/NGAP/ngap_gNB_overload.c \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair3/NGAP/ngap_gNB_default_values.h \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair3/SECU/secu_defs.c \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair3/SECU/sha_256_hmac.h \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair3/SECU/nas_stream_eea0.h \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair3/SECU/aes_128_ecb.h \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair3/SECU/aes_128.h \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair3/SECU/rijndael.h \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair3/SECU/nas_stream_eea2.c \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair3/SECU/nas_stream_eea1.c \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair3/SECU/aes_128_cbc_cmac.c \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair3/SECU/nas_stream_eia1.h \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair3/SECU/snow3g.h \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair3/SECU/aes_128_ctr.h \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair3/SECU/kdf.h \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair3/SECU/secu_defs.h \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair3/SECU/rijndael.c \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair3/SECU/kdf.c \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair3/SECU/nas_stream_eea1.h \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair3/SECU/nas_stream_eea0.c \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair3/SECU/key_nas_deriver.c \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair3/SECU/aes_128_ecb.c \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair3/SECU/aes_128_ctr.c \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair3/SECU/nas_stream_eia2.h \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair3/SECU/snow3g.c \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair3/SECU/sha_256_hmac.c \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair3/SECU/aes_128_cbc_cmac.h \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair3/SECU/nas_stream_eia1.c \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair3/SECU/nas_stream_eia2.c \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair3/SECU/nas_stream_eea2.h \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair3/SECU/key_nas_deriver.h \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair3/MME_APP/mme_app.h \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair3/M3AP/m3ap_MME_interface_management.h \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair3/M3AP/m3ap_MCE_generate_messages.h \
 @CMAKE_CURRENT_SOURCE_DIR@/../openair3/M3AP/m3ap_MCE_interface_management.c \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair3/M3AP/m3ap_MME_management_procedures.h \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair3/M3AP/m3ap_MCE_defs.h \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair3/M3AP/m3ap_MCE_management_procedures.h \
 @CMAKE_CURRENT_SOURCE_DIR@/../openair3/M3AP/m3ap_MCE_management_procedures.c \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair3/M3AP/m3ap_ids.h \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair3/M3AP/m3ap_decoder.c \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair3/M3AP/m3ap_MCE_interface_management.h \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair3/M3AP/m3ap_MCE.h \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair3/M3AP/m3ap_MCE_handler.c \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair3/M3AP/m3ap_handler.h \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair3/M3AP/m3ap_MCE_defs.h \
 @CMAKE_CURRENT_SOURCE_DIR@/../openair3/M3AP/m3ap_encoder.h \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair3/M3AP/m3ap_MCE.c \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair3/M3AP/m3ap_timers.c \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair3/M3AP/m3ap_encoder.c \
 @CMAKE_CURRENT_SOURCE_DIR@/../openair3/M3AP/m3ap_common.h \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair3/M3AP/m3ap_common.c \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair3/M3AP/m3ap_ids.h \
 @CMAKE_CURRENT_SOURCE_DIR@/../openair3/M3AP/m3ap_MME.h \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair3/M3AP/m3ap_encoder.c \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair3/M3AP/m3ap_MME_interface_management.c \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair3/M3AP/m3ap_MME.c \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair3/M3AP/m3ap_MCE_management_procedures.h \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair3/M3AP/m3ap_MCE.c \
 @CMAKE_CURRENT_SOURCE_DIR@/../openair3/M3AP/m3ap_MME_management_procedures.c \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair3/M3AP/m3ap_MCE_handler.h \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair3/M3AP/m3ap_timers.h \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair3/M3AP/m3ap_common.c \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair3/M3AP/m3ap_MCE_handler.c \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair3/M3AP/m3ap_MME_interface_management.h \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair3/M3AP/m3ap_MME_handler.c \
 @CMAKE_CURRENT_SOURCE_DIR@/../openair3/M3AP/m3ap_MME_handler.h \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair3/M3AP/m3ap_default_values.h \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair3/M3AP/m3ap_ids.c \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair3/M3AP/m3ap_timers.c \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair3/M3AP/m3ap_MME_handler.c \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair3/M3AP/m3ap_timers.h \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair3/M3AP/m3ap_MCE.h \
 @CMAKE_CURRENT_SOURCE_DIR@/../openair3/M3AP/m3ap_itti_messaging.h \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair3/M3AP/m3ap_MCE_generate_messages.h \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair3/M3AP/m3ap_MME_defs.h \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair3/M3AP/m3ap_handler.h \
 @CMAKE_CURRENT_SOURCE_DIR@/../openair3/M3AP/m3ap_decoder.h \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair3/COMMON/security_types.h \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair3/NGAP/ngap_common.h \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair3/NGAP/ngap_gNB_overload.h \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair3/NGAP/ngap_gNB_encoder.c \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair3/NGAP/ngap_gNB_nas_procedures.h \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair3/NGAP/ngap_gNB_itti_messaging.c \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair3/NGAP/ngap_gNB_trace.h \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair3/NGAP/ngap_gNB_trace.c \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair3/NGAP/ngap_gNB_handlers.c \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair3/NGAP/ngap_gNB_decoder.c \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair3/NGAP/ngap_gNB_defs.h \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair3/NGAP/ngap_gNB_ue_context.c \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair3/NGAP/ngap_gNB_nnsf.c \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair3/NGAP/ngap_gNB.c \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair3/NGAP/ngap_gNB_overload.c \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair3/NGAP/ngap_gNB_management_procedures.c \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair3/NGAP/ngap_gNB_context_management_procedures.c \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair3/NGAP/ngap_gNB_nnsf.h \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair3/NGAP/ngap_gNB_decoder.h \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair3/NGAP/ngap_gNB_itti_messaging.h \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair3/NGAP/ngap_gNB_encoder.h \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair3/NGAP/ngap_gNB_default_values.h \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair3/NGAP/ngap_gNB_management_procedures.h \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair3/NGAP/ngap_gNB_context_management_procedures.h \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair3/NGAP/ngap_gNB.h \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair3/NGAP/ngap_gNB_nas_procedures.c \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair3/NGAP/ngap_gNB_handlers.h \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair3/NGAP/ngap_gNB_ue_context.h \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair3/NAS/TOOLS/fs.h \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair3/NAS/TOOLS/fs.c \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair3/NAS/TOOLS/conf_user_data.h \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair3/NAS/TOOLS/conf_user_plmn.h \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair3/NAS/TOOLS/conf_parser.h \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair3/NAS/TOOLS/ue_eurecom_test_sfr.conf \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair3/NAS/TOOLS/conf_network.c \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair3/NAS/TOOLS/conf_parser.c \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair3/NAS/TOOLS/conf_user_plmn.c \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair3/NAS/TOOLS/usim.c \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair3/NAS/TOOLS/conf_network.h \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair3/NAS/TOOLS/conf2uedata.c \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair3/NAS/TOOLS/conf_usim.h \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair3/NAS/TOOLS/nvram.c \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair3/NAS/TOOLS/conf_emm.c \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair3/NAS/TOOLS/conf_user_data.c \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair3/NAS/TOOLS/display.c \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair3/NAS/TOOLS/conf2uedata.h \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair3/NAS/TOOLS/conf_usim.c \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair3/NAS/TOOLS/display.h \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair3/NAS/TOOLS/conf_emm.h \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair3/NAS/NR_UE/nr_nas_msg_sim.c \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair3/M3AP/m3ap_MME.c \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair3/M3AP/m3ap_MCE_interface_management.h \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair3/M3AP/m3ap_MME_management_procedures.h \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair3/M3AP/m3ap_decoder.c \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair3/M3AP/m3ap_MME_interface_management.c \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair3/M3AP/m3ap_MME_defs.h \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair3/M3AP/m3ap_ids.c \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair3/M3AP/m3ap_itti_messaging.c \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair3/M3AP/m3ap_default_values.h \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair3/M3AP/m3ap_MCE_handler.h \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair3/UICC/usim_interface.h \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair3/UICC/usim_interface.c \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair3/ocp-gtpu/gtp_itf.h \
 @CMAKE_CURRENT_SOURCE_DIR@/../openair3/NAS/NR_UE/nr_nas_msg_sim.h \
 @CMAKE_CURRENT_SOURCE_DIR@/../openair3/NAS/NR_UE/ue_process_nas.c \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair3/NAS/NR_UE/nr_nas_msg_sim.c \
 @CMAKE_CURRENT_SOURCE_DIR@/../openair3/NAS/UE/nas_itti_messaging.c \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair3/NAS/UE/nas_parser.h \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair3/NAS/UE/nas_user.h \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair3/NAS/UE/nas_user.c \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair3/NAS/UE/API/USER/at_command.h \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair3/NAS/UE/API/USER/user_indication.h \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair3/NAS/UE/API/USER/user_indication.c \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair3/NAS/UE/API/USER/at_response.c \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair3/NAS/UE/API/USER/at_error.h \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair3/NAS/UE/API/USER/user_api_defs.h \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair3/NAS/UE/API/USER/user_api.c \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair3/NAS/UE/API/USER/user_api.h \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair3/NAS/UE/API/USER/at_response.h \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair3/NAS/UE/API/USER/at_error.c \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair3/NAS/UE/API/USER/at_command.c \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair3/NAS/UE/API/USIM/aka_functions.h \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair3/NAS/UE/API/USIM/usim_api.h \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair3/NAS/UE/API/USIM/usim_api.c \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair3/NAS/UE/API/USIM/aka_functions.c \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair3/NAS/UE/nas_proc.c \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair3/NAS/UE/nas_ue_task.h \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair3/NAS/UE/nas_proc_defs.h \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair3/NAS/UE/ESM/esm_pt.h \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair3/NAS/UE/ESM/esmData.h \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair3/NAS/UE/ESM/EsmStatusHdl.c \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair3/NAS/UE/ESM/DedicatedEpsBearerContextActivation.c \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair3/NAS/UE/ESM/esm_ip.c \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair3/NAS/UE/ESM/esm_pt.c \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair3/NAS/UE/ESM/esm_proc.h \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair3/NAS/UE/ESM/esm_ebr.c \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair3/NAS/UE/ESM/PdnDisconnect.c \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair3/NAS/UE/ESM/PdnConnectivity.c \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair3/NAS/UE/ESM/esm_main.h \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair3/NAS/UE/ESM/esm_pt_defs.h \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair3/NAS/UE/ESM/SAP/esm_send.h \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair3/NAS/UE/ESM/SAP/esm_recv.c \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair3/NAS/UE/ESM/SAP/esm_send.c \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair3/NAS/UE/ESM/SAP/esm_sap.h \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair3/NAS/UE/ESM/SAP/esm_sap.c \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair3/NAS/UE/ESM/SAP/esm_recv.h \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair3/NAS/UE/ESM/SAP/esm_sapDef.h \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair3/NAS/UE/ESM/esm_ebr_context.h \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair3/NAS/UE/ESM/esm_ebr_context.c \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair3/NAS/UE/ESM/DefaultEpsBearerContextActivation.c \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair3/NAS/UE/ESM/esm_main.c \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair3/NAS/UE/ESM/EpsBearerContextDeactivation.c \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair3/NAS/UE/ESM/esm_ebr.h \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair3/NAS/UE/nas_network.c \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair3/NAS/UE/nas_proc.h \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair3/NAS/UE/nas_network.h \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair3/NAS/UE/nas_parser.c \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair3/NAS/UE/EMM/emm_main.h \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair3/NAS/UE/user_defs.h \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair3/NAS/UE/EMM/emm_proc.h \
 @CMAKE_CURRENT_SOURCE_DIR@/../openair3/NAS/UE/EMM/emm_main.c \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair3/NAS/UE/EMM/Identification.c \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair3/NAS/UE/EMM/IdleMode.c \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair3/NAS/UE/EMM/emm_timers.h \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair3/NAS/UE/EMM/emmData.h \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair3/NAS/UE/EMM/Authentication.h \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair3/NAS/UE/EMM/SecurityModeControl.h \
 @CMAKE_CURRENT_SOURCE_DIR@/../openair3/NAS/UE/EMM/TrackingAreaUpdate.c \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair3/NAS/UE/EMM/LowerLayer.h \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair3/NAS/UE/EMM/emm_timers.h \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair3/NAS/UE/EMM/Detach.c \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair3/NAS/UE/EMM/Attach.c \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair3/NAS/UE/EMM/SecurityModeControl.c \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair3/NAS/UE/EMM/IdleMode.c \
 @CMAKE_CURRENT_SOURCE_DIR@/../openair3/NAS/UE/EMM/emm_proc_defs.h \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair3/NAS/UE/EMM/IdleMode_defs.h \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair3/NAS/UE/EMM/LowerLayer.h \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair3/NAS/UE/EMM/Authentication.c \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair3/NAS/UE/EMM/IdleMode.h \
 @CMAKE_CURRENT_SOURCE_DIR@/../openair3/NAS/UE/EMM/LowerLayer.c \
 @CMAKE_CURRENT_SOURCE_DIR@/../openair3/NAS/UE/EMM/EmmStatusHdl.c \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair3/NAS/UE/EMM/Attach.c \
 @CMAKE_CURRENT_SOURCE_DIR@/../openair3/NAS/UE/EMM/emm_fsm_defs.h \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair3/NAS/UE/EMM/emm_proc.h \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair3/NAS/UE/EMM/Authentication.c \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair3/NAS/UE/EMM/SecurityModeControl.h \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair3/NAS/UE/EMM/Detach.c \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair3/NAS/UE/EMM/IdleMode.h \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair3/NAS/UE/EMM/ServiceRequestHdl.c \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair3/NAS/UE/EMM/emm_main.h \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair3/NAS/UE/EMM/SAP/emm_reg.h \
 @CMAKE_CURRENT_SOURCE_DIR@/../openair3/NAS/UE/EMM/SAP/EmmRegistered.c \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair3/NAS/UE/EMM/SAP/emm_reg.c \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair3/NAS/UE/EMM/SAP/emm_send.c \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair3/NAS/UE/EMM/SAP/emm_as.h \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair3/NAS/UE/EMM/SAP/EmmDeregisteredPlmnSearch.c \
 @CMAKE_CURRENT_SOURCE_DIR@/../openair3/NAS/UE/EMM/SAP/EmmNull.c \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair3/NAS/UE/EMM/SAP/EmmRegisteredPlmnSearch.c \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair3/NAS/UE/EMM/SAP/emm_reg.h \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair3/NAS/UE/EMM/SAP/emm_fsm.c \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair3/NAS/UE/EMM/SAP/emm_recv.c \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair3/NAS/UE/EMM/SAP/EmmTrackingAreaUpdatingInitiated.c \
 @CMAKE_CURRENT_SOURCE_DIR@/../openair3/NAS/UE/EMM/SAP/EmmDeregisteredNormalService.c \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair3/NAS/UE/EMM/SAP/EmmDeregisteredAttachNeeded.c \
 @CMAKE_CURRENT_SOURCE_DIR@/../openair3/NAS/UE/EMM/SAP/emm_as.c \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair3/NAS/UE/EMM/SAP/emm_asDef.h \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair3/NAS/UE/EMM/SAP/EmmDeregisteredInitiated.c \
 @CMAKE_CURRENT_SOURCE_DIR@/../openair3/NAS/UE/EMM/SAP/emm_sap.h \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair3/NAS/UE/EMM/SAP/emm_esm.c \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair3/NAS/UE/EMM/SAP/EmmRegisteredNormalService.c \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair3/NAS/UE/EMM/SAP/EmmRegisteredInitiated.c \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair3/NAS/UE/EMM/SAP/EmmRegisteredUpdateNeeded.c \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair3/NAS/UE/EMM/SAP/emm_send.h \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair3/NAS/UE/EMM/SAP/emm_regDef.h \
 @CMAKE_CURRENT_SOURCE_DIR@/../openair3/NAS/UE/EMM/SAP/emm_fsm.h \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair3/NAS/UE/EMM/SAP/EmmDeregisteredNoCellAvailable.c \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair3/NAS/UE/EMM/SAP/EmmDeregistered.c \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair3/NAS/UE/EMM/SAP/emm_send.c \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair3/NAS/UE/EMM/SAP/emm_as.h \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair3/NAS/UE/EMM/SAP/EmmRegisteredUpdateNeeded.c \
 @CMAKE_CURRENT_SOURCE_DIR@/../openair3/NAS/UE/EMM/SAP/EmmDeregisteredLimitedService.c \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair3/NAS/UE/EMM/SAP/EmmRegisteredNoCellAvailable.c \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair3/NAS/UE/EMM/SAP/EmmDeregisteredAttemptingToAttach.c \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair3/NAS/UE/EMM/SAP/emm_esmDef.h \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair3/NAS/UE/EMM/SAP/EmmServiceRequestInitiated.c \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair3/NAS/UE/EMM/SAP/EmmRegisteredAttemptingToUpdate.c \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair3/NAS/UE/EMM/SAP/emm_esm.h \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair3/NAS/UE/EMM/SAP/EmmDeregisteredInitiated.c \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair3/NAS/UE/EMM/SAP/emm_fsm.c \
 @CMAKE_CURRENT_SOURCE_DIR@/../openair3/NAS/UE/EMM/SAP/EmmDeregisteredNoImsi.c \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair3/NAS/UE/EMM/SAP/EmmDeregistered.c \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair3/NAS/UE/EMM/SAP/EmmRegisteredImsiDetachInitiated.c \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair3/NAS/UE/EMM/SAP/emm_asDef.h \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair3/NAS/UE/EMM/SAP/emm_sap.c \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair3/NAS/UE/EMM/SAP/emm_recv.c \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair3/NAS/UE/EMM/SAP/EmmTrackingAreaUpdatingInitiated.c \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair3/NAS/UE/EMM/SAP/EmmServiceRequestInitiated.c \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair3/NAS/UE/EMM/SAP/EmmRegisteredNoCellAvailable.c \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair3/NAS/UE/EMM/SAP/EmmDeregisteredPlmnSearch.c \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair3/NAS/UE/EMM/SAP/emm_esm.c \
 @CMAKE_CURRENT_SOURCE_DIR@/../openair3/NAS/UE/EMM/SAP/emm_recv.h \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair3/NAS/UE/EMM/SAP/emm_reg.c \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair3/NAS/UE/EMM/SAP/EmmRegisteredAttemptingToUpdate.c \
 @CMAKE_CURRENT_SOURCE_DIR@/../openair3/NAS/UE/EMM/SAP/EmmRegisteredLimitedService.c \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair3/NAS/UE/EMM/SAP/emm_regDef.h \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair3/NAS/UE/EMM/SAP/EmmDeregisteredAttemptingToAttach.c \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair3/NAS/UE/EMM/SAP/EmmRegisteredInitiated.c \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair3/NAS/UE/EMM/SAP/emm_esmDef.h \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair3/NAS/UE/EMM/SAP/EmmRegisteredNormalService.c \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair3/NAS/UE/EMM/SAP/emm_sap.c \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair3/NAS/UE/EMM/SAP/EmmDeregisteredAttachNeeded.c \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair3/NAS/UE/EMM/SAP/emm_send.h \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair3/NAS/UE/EMM/SAP/emm_esm.h \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair3/NAS/UE/EMM/SAP/EmmDeregisteredNoCellAvailable.c \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair3/NAS/UE/EMM/SAP/EmmRegisteredPlmnSearch.c \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair3/NAS/UE/EMM/SAP/EmmRegisteredImsiDetachInitiated.c \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair3/NAS/UE/EMM/Identification.c \
 @CMAKE_CURRENT_SOURCE_DIR@/../openair3/NAS/UE/EMM/LowerLayer_defs.h \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair3/NAS/UE/EMM/Authentication.h \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair3/NAS/UE/EMM/SecurityModeControl.c \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair3/NAS/UE/EMM/IdleMode_defs.h \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair3/NAS/UE/EMM/emmData.h \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair3/NAS/UE/EMM/ServiceRequestHdl.c \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair3/NAS/UE/nas_parser.h \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair3/NAS/UE/nas_ue_task.h \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair3/NAS/UE/nas_proc.h \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair3/NAS/UE/nas_user.c \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair3/NAS/UE/nas_proc_defs.h \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair3/NAS/UE/nas_network.h \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair3/NAS/UE/API/USIM/aka_functions.h \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair3/NAS/UE/API/USIM/usim_api.h \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair3/NAS/UE/API/USIM/usim_api.c \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair3/NAS/UE/API/USIM/aka_functions.c \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair3/NAS/UE/API/USER/user_indication.h \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair3/NAS/UE/API/USER/user_api.c \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair3/NAS/UE/API/USER/user_api.h \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair3/NAS/UE/API/USER/at_command.h \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair3/NAS/UE/API/USER/at_command.c \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair3/NAS/UE/API/USER/at_error.c \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair3/NAS/UE/API/USER/user_api_defs.h \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair3/NAS/UE/API/USER/at_response.h \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair3/NAS/UE/API/USER/user_indication.c \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair3/NAS/UE/API/USER/at_response.c \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair3/NAS/UE/API/USER/at_error.h \
 @CMAKE_CURRENT_SOURCE_DIR@/../openair3/NAS/UE/nas_itti_messaging.h \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair3/NAS/UE/nas_parser.c \
 @CMAKE_CURRENT_SOURCE_DIR@/../openair3/NAS/UE/nas_ue_task.c \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair3/NAS/UE/user_defs.h \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair3/NAS/gNB/network_process_nas.c \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair3/NAS/UE/ESM/DefaultEpsBearerContextActivation.c \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair3/NAS/UE/ESM/esm_ebr_context.h \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair3/NAS/UE/ESM/esm_pt_defs.h \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair3/NAS/UE/ESM/PdnConnectivity.c \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair3/NAS/UE/ESM/esm_ip.c \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair3/NAS/UE/ESM/esm_main.c \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair3/NAS/UE/ESM/PdnDisconnect.c \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair3/NAS/UE/ESM/esm_ebr_context.c \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair3/NAS/UE/ESM/DedicatedEpsBearerContextActivation.c \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair3/NAS/UE/ESM/esm_proc.h \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair3/NAS/UE/ESM/esm_pt.h \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair3/NAS/UE/ESM/esm_ebr.c \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair3/NAS/UE/ESM/EsmStatusHdl.c \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair3/NAS/UE/ESM/esm_ebr.h \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair3/NAS/UE/ESM/esm_main.h \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair3/NAS/UE/ESM/esm_pt.c \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair3/NAS/UE/ESM/esmData.h \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair3/NAS/UE/ESM/SAP/esm_recv.h \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair3/NAS/UE/ESM/SAP/esm_send.c \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair3/NAS/UE/ESM/SAP/esm_sap.h \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair3/NAS/UE/ESM/SAP/esm_send.h \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair3/NAS/UE/ESM/SAP/esm_sap.c \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair3/NAS/UE/ESM/SAP/esm_recv.c \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair3/NAS/UE/ESM/SAP/esm_sapDef.h \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair3/NAS/UE/ESM/EpsBearerContextDeactivation.c \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair3/NAS/UE/nas_user.h \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair3/NAS/UE/nas_network.c \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair3/NAS/UE/nas_proc.c \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair3/NAS/COMMON/securityDef.h \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair3/NAS/COMMON/EMM/MSG/CsServiceNotification.c \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair3/NAS/COMMON/EMM/MSG/AuthenticationRequest.h \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair3/NAS/COMMON/EMM/MSG/TrackingAreaUpdateComplete.c \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair3/NAS/COMMON/EMM/MSG/NASSecurityModeComplete.h \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair3/NAS/COMMON/EMM/MSG/SecurityModeReject.c \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair3/NAS/COMMON/EMM/MSG/TrackingAreaUpdateAccept.c \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair3/NAS/COMMON/EMM/MSG/EmmInformation.c \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair3/NAS/COMMON/EMM/MSG/CsServiceNotification.h \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair3/NAS/COMMON/EMM/MSG/SecurityModeComplete.c \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair3/NAS/COMMON/EMM/MSG/DetachRequest.h \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair3/NAS/COMMON/EMM/MSG/SecurityModeCommand.c \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair3/NAS/COMMON/EMM/MSG/TrackingAreaUpdateComplete.h \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair3/NAS/COMMON/EMM/MSG/TrackingAreaUpdateRequest.c \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair3/NAS/COMMON/EMM/MSG/DetachAccept.c \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair3/NAS/COMMON/EMM/MSG/DetachRequest.c \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair3/NAS/COMMON/EMM/MSG/DownlinkNasTransport.c \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair3/NAS/COMMON/EMM/MSG/FGSUplinkNasTransport.c \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair3/NAS/COMMON/EMM/MSG/UplinkNasTransport.c \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair3/NAS/COMMON/EMM/MSG/ServiceReject.c \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair3/NAS/COMMON/EMM/MSG/RegistrationAccept.c \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair3/NAS/COMMON/EMM/MSG/TrackingAreaUpdateReject.c \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair3/NAS/COMMON/EMM/MSG/emm_msg.h \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair3/NAS/COMMON/EMM/MSG/AttachReject.h \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair3/NAS/COMMON/EMM/MSG/SecurityModeReject.h \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair3/NAS/COMMON/EMM/MSG/FGSDeregistrationRequestUEOriginating.h \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair3/NAS/COMMON/EMM/MSG/UplinkNasTransport.h \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair3/NAS/COMMON/EMM/MSG/AuthenticationFailure.c \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair3/NAS/COMMON/EMM/MSG/AuthenticationResponse.c \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair3/NAS/COMMON/EMM/MSG/AttachComplete.h \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair3/NAS/COMMON/EMM/MSG/FGSNASSecurityModeComplete.h \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair3/NAS/COMMON/EMM/MSG/ExtendedServiceRequest.h \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair3/NAS/COMMON/EMM/MSG/GutiReallocationComplete.c \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair3/NAS/COMMON/EMM/MSG/DownlinkNasTransport.h \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair3/NAS/COMMON/EMM/MSG/emm_msgDef.h \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair3/NAS/COMMON/EMM/MSG/FGSAuthenticationResponse.c \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair3/NAS/COMMON/EMM/MSG/TrackingAreaUpdateReject.h \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair3/NAS/COMMON/EMM/MSG/AttachReject.c \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair3/NAS/COMMON/EMM/MSG/AttachAccept.c \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair3/NAS/COMMON/EMM/MSG/ServiceReject.h \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair3/NAS/COMMON/EMM/MSG/FGSIdentityResponse.c \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair3/NAS/COMMON/EMM/MSG/AttachComplete.c \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair3/NAS/COMMON/EMM/MSG/AttachRequest.h \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair3/NAS/COMMON/EMM/MSG/AuthenticationRequest.c \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair3/NAS/COMMON/EMM/MSG/NASSecurityModeCommand.h \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair3/NAS/COMMON/EMM/MSG/EmmStatus.c \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair3/NAS/COMMON/EMM/MSG/AuthenticationResponse.h \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair3/NAS/COMMON/EMM/MSG/GutiReallocationCommand.c \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair3/NAS/COMMON/EMM/MSG/ServiceRequest.h \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair3/NAS/COMMON/EMM/MSG/AttachAccept.h \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair3/NAS/COMMON/EMM/MSG/IdentityResponse.c \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair3/NAS/COMMON/EMM/MSG/GutiReallocationComplete.h \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair3/NAS/COMMON/EMM/MSG/RegistrationComplete.h \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair3/NAS/COMMON/EMM/MSG/ServiceRequest.c \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair3/NAS/COMMON/EMM/MSG/RegistrationAccept.h \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair3/NAS/COMMON/EMM/MSG/IdentityRequest.c \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair3/NAS/COMMON/EMM/MSG/RegistrationRequest.c \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair3/NAS/COMMON/EMM/MSG/DetachAccept.h \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair3/NAS/COMMON/EMM/MSG/AttachRequest.c \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair3/NAS/COMMON/EMM/MSG/FGSIdentityResponse.h \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair3/NAS/COMMON/EMM/MSG/EmmStatus.h \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair3/NAS/COMMON/EMM/MSG/AuthenticationFailure.h \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair3/NAS/COMMON/EMM/MSG/FGSAuthenticationResponse.h \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair3/NAS/COMMON/EMM/MSG/AuthenticationReject.c \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair3/NAS/COMMON/EMM/MSG/TrackingAreaUpdateAccept.h \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair3/NAS/COMMON/EMM/MSG/TrackingAreaUpdateRequest.h \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair3/NAS/COMMON/EMM/MSG/emm_msg.c \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair3/NAS/COMMON/EMM/MSG/AuthenticationReject.h \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair3/NAS/COMMON/EMM/MSG/ExtendedServiceRequest.c \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair3/NAS/COMMON/EMM/MSG/FGSNASSecurityModeComplete.c \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair3/NAS/COMMON/EMM/MSG/IdentityResponse.h \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair3/NAS/COMMON/EMM/MSG/RegistrationComplete.c \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair3/NAS/COMMON/EMM/MSG/FGSDeregistrationRequestUEOriginating.c \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair3/NAS/COMMON/EMM/MSG/emm_cause.h \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair3/NAS/COMMON/EMM/MSG/EmmInformation.h \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair3/NAS/COMMON/EMM/MSG/IdentityRequest.h \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair3/NAS/COMMON/EMM/MSG/FGSUplinkNasTransport.h \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair3/NAS/COMMON/EMM/MSG/GutiReallocationCommand.h \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair3/NAS/COMMON/EMM/MSG/RegistrationRequest.h \
 @CMAKE_CURRENT_SOURCE_DIR@/../openair3/NAS/COMMON/UTIL/parser.h \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair3/NAS/COMMON/UTIL/stty.c \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair3/NAS/COMMON/UTIL/TLVEncoder.h \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair3/NAS/COMMON/UTIL/device.h \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair3/NAS/COMMON/UTIL/device.c \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair3/NAS/COMMON/UTIL/TLVEncoder.c \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair3/NAS/COMMON/UTIL/OctetString.h \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair3/NAS/COMMON/UTIL/nas_timer.c \
 @CMAKE_CURRENT_SOURCE_DIR@/../openair3/NAS/COMMON/UTIL/TLVDecoder.c \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair3/NAS/COMMON/UTIL/OctetString.c \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair3/NAS/COMMON/UTIL/socket.h \
 @CMAKE_CURRENT_SOURCE_DIR@/../openair3/NAS/COMMON/UTIL/nas_timer.h \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair3/NAS/COMMON/UTIL/memory.c \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair3/NAS/COMMON/UTIL/OctetString.c \
 @CMAKE_CURRENT_SOURCE_DIR@/../openair3/NAS/COMMON/UTIL/memory.h \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair3/NAS/COMMON/UTIL/nas_timer.c \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair3/NAS/COMMON/UTIL/device.c \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair3/NAS/COMMON/UTIL/OctetString.h \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair3/NAS/COMMON/UTIL/TLVEncoder.c \
 @CMAKE_CURRENT_SOURCE_DIR@/../openair3/NAS/COMMON/UTIL/TLVDecoder.h \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair3/NAS/COMMON/UTIL/memory.c \
 @CMAKE_CURRENT_SOURCE_DIR@/../openair3/NAS/COMMON/UTIL/nas_log.h \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair3/NAS/COMMON/UTIL/device.h \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair3/NAS/COMMON/UTIL/TLVEncoder.h \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair3/NAS/COMMON/UTIL/socket.h \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair3/NAS/COMMON/UTIL/stty.c \
 @CMAKE_CURRENT_SOURCE_DIR@/../openair3/NAS/COMMON/UTIL/socket.c \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair3/NAS/COMMON/securityDef.h \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair3/NAS/COMMON/nr_common.c \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair3/NAS/COMMON/NR_NAS_defs.h \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair3/NAS/COMMON/API/NETWORK/nas_message.h \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair3/NAS/COMMON/API/NETWORK/as_message.c \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair3/NAS/COMMON/API/NETWORK/nas_message.c \
 @CMAKE_CURRENT_SOURCE_DIR@/../openair3/NAS/COMMON/API/NETWORK/network_api.h \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair3/NAS/COMMON/API/NETWORK/nas_message.c \
 @CMAKE_CURRENT_SOURCE_DIR@/../openair3/NAS/COMMON/API/NETWORK/network_api.c \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair3/NAS/COMMON/IES/EpsUpdateResult.c \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair3/NAS/COMMON/IES/FGMMCapability.c \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair3/NAS/COMMON/IES/EmergencyNumberList.h \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair3/NAS/COMMON/IES/RadioPriority.h \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair3/NAS/COMMON/IES/TimeZoneAndTime.h \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair3/NAS/COMMON/API/NETWORK/nas_message.h \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair3/NAS/COMMON/API/NETWORK/as_message.c \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair3/NAS/COMMON/IES/ServiceType.h \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair3/NAS/COMMON/IES/AuthenticationParameterRand.h \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair3/NAS/COMMON/IES/UeRadioCapabilityInformationUpdateNeeded.c \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair3/NAS/COMMON/IES/ProtocolDiscriminator.h \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair3/NAS/COMMON/IES/ExtendedProtocolDiscriminator.c \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair3/NAS/COMMON/IES/CsfbResponse.c \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair3/NAS/COMMON/IES/EsmCause.c \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair3/NAS/COMMON/IES/ProcedureTransactionIdentity.h \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair3/NAS/COMMON/IES/CipheringKeySequenceNumber.h \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair3/NAS/COMMON/IES/AuthenticationResponseParameter.c \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair3/NAS/COMMON/IES/DaylightSavingTime.c \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair3/NAS/COMMON/IES/DaylightSavingTime.h \
 @CMAKE_CURRENT_SOURCE_DIR@/../openair3/NAS/COMMON/IES/PdnType.c \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair3/NAS/COMMON/IES/QualityOfService.h \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair3/NAS/COMMON/IES/EmmCause.c \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair3/NAS/COMMON/IES/MobileStationClassmark2.c \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair3/NAS/COMMON/IES/LlcServiceAccessPointIdentifier.c \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair3/NAS/COMMON/IES/ProtocolConfigurationOptions.c \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair3/NAS/COMMON/IES/TransactionIdentifier.h \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair3/NAS/COMMON/IES/ExtendedProtocolDiscriminator.h \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair3/NAS/COMMON/IES/GutiType.c \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair3/NAS/COMMON/IES/SupportedCodecList.h \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair3/NAS/COMMON/IES/MobileStationClassmark3.c \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair3/NAS/COMMON/IES/AccessPointName.c \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair3/NAS/COMMON/IES/PlmnList.c \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair3/NAS/COMMON/IES/TrafficFlowAggregateDescription.h \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair3/NAS/COMMON/IES/PlmnList.h \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair3/NAS/COMMON/IES/Nonce.h \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair3/NAS/COMMON/IES/TimeZone.c \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair3/NAS/COMMON/IES/Cli.c \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair3/NAS/COMMON/IES/NasSecurityAlgorithms.h \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair3/NAS/COMMON/IES/IdentityType2.c \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair3/NAS/COMMON/IES/VoiceDomainPreferenceAndUeUsageSetting.c \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair3/NAS/COMMON/IES/EpsAttachResult.h \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair3/NAS/COMMON/IES/EmergencyNumberList.c \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair3/NAS/COMMON/IES/EpsNetworkFeatureSupport.c \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair3/NAS/COMMON/IES/CsfbResponse.h \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair3/NAS/COMMON/IES/TrafficFlowAggregateDescription.c \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair3/NAS/COMMON/IES/PacketFlowIdentifier.c \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair3/NAS/COMMON/IES/TrackingAreaIdentityList.c \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair3/NAS/COMMON/IES/UeSecurityCapability.c \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair3/NAS/COMMON/IES/ApnAggregateMaximumBitRate.c \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair3/NAS/COMMON/IES/ImeisvRequest.c \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair3/NAS/COMMON/IES/SpareHalfOctet.h \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair3/NAS/COMMON/IES/PdnType.h \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair3/NAS/COMMON/IES/ShortMac.h \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair3/NAS/COMMON/IES/MobileStationClassmark3.h \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair3/NAS/COMMON/IES/TrafficFlowTemplate.h \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair3/NAS/COMMON/IES/SORTransparentContainer.c \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair3/NAS/COMMON/IES/NasPagingIdentity.h \
 @CMAKE_CURRENT_SOURCE_DIR@/../openair3/NAS/COMMON/IES/NasMessageContainer.h \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair3/NAS/COMMON/IES/LcsIndicator.c \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair3/NAS/COMMON/IES/EpsMobileIdentity.h \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair3/NAS/COMMON/IES/EpsAttachType.c \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair3/NAS/COMMON/IES/Cli.h \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair3/NAS/COMMON/IES/NasRequestType.h \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair3/NAS/COMMON/IES/PagingIdentity.c \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair3/NAS/COMMON/IES/ApnAggregateMaximumBitRate.h \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair3/NAS/COMMON/IES/DetachType.c \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair3/NAS/COMMON/IES/EmergencyNumberList.h \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair3/NAS/COMMON/IES/EsmMessageContainer.c \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair3/NAS/COMMON/IES/FGSRegistrationResult.h \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair3/NAS/COMMON/IES/GprsTimer.h \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair3/NAS/COMMON/IES/TmsiStatus.c \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair3/NAS/COMMON/IES/VoiceDomainPreferenceAndUeUsageSetting.h \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair3/NAS/COMMON/IES/IdentityType2.h \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair3/NAS/COMMON/IES/EpsQualityOfService.c \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair3/NAS/COMMON/IES/LocationAreaIdentification.h \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair3/NAS/COMMON/IES/FGCNasMessageContainer.c \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair3/NAS/COMMON/IES/TrackingAreaIdentityList.h \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair3/NAS/COMMON/IES/MsNetworkCapability.h \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair3/NAS/COMMON/IES/ShortMac.c \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair3/NAS/COMMON/IES/FGSRegistrationResult.c \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair3/NAS/COMMON/IES/AuthenticationFailureParameter.h \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair3/NAS/COMMON/IES/TrackingAreaIdentity.h \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair3/NAS/COMMON/IES/EmmCause.h \
 @CMAKE_CURRENT_SOURCE_DIR@/../openair3/NAS/COMMON/IES/KsiAndSequenceNumber.c \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair3/NAS/COMMON/IES/GutiType.c \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair3/NAS/COMMON/IES/NrUESecurityCapability.h \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair3/NAS/COMMON/IES/SupportedCodecList.h \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair3/NAS/COMMON/IES/TransactionIdentifier.c \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair3/NAS/COMMON/IES/CipheringKeySequenceNumber.c \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair3/NAS/COMMON/IES/LlcServiceAccessPointIdentifier.h \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair3/NAS/COMMON/IES/EpsAttachType.h \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair3/NAS/COMMON/IES/RadioPriority.c \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair3/NAS/COMMON/IES/AuthenticationFailureParameter.c \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair3/NAS/COMMON/IES/MsNetworkFeatureSupport.h \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair3/NAS/COMMON/IES/Nonce.c \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair3/NAS/COMMON/IES/AuthenticationParameterAutn.h \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair3/NAS/COMMON/IES/PdnAddress.h \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair3/NAS/COMMON/IES/EsmInformationTransferFlag.c \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair3/NAS/COMMON/IES/SpareHalfOctet.c \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair3/NAS/COMMON/IES/KsiAndSequenceNumber.h \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair3/NAS/COMMON/IES/LocationAreaIdentification.c \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair3/NAS/COMMON/IES/QualityOfService.h \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair3/NAS/COMMON/IES/ProcedureTransactionIdentity.c \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair3/NAS/COMMON/IES/NrUESecurityCapability.c \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair3/NAS/COMMON/IES/ProtocolConfigurationOptions.h \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair3/NAS/COMMON/IES/SsCode.c \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair3/NAS/COMMON/IES/EpsQualityOfService.h \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair3/NAS/COMMON/IES/TrafficFlowTemplate.c \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair3/NAS/COMMON/IES/RadioPriority.h \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair3/NAS/COMMON/IES/ProtocolDiscriminator.c \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair3/NAS/COMMON/IES/EpsMobileIdentity.c \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair3/NAS/COMMON/IES/MobileIdentity.c \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair3/NAS/COMMON/IES/SsCode.h \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair3/NAS/COMMON/IES/FGSRegistrationType.h \
 @CMAKE_CURRENT_SOURCE_DIR@/../openair3/NAS/COMMON/IES/TrackingAreaIdentity.c \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair3/NAS/COMMON/IES/DetachType.h \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair3/NAS/COMMON/IES/TrafficFlowTemplate.h \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair3/NAS/COMMON/IES/SpareHalfOctet.h \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair3/NAS/COMMON/IES/EpsBearerIdentity.c \
 @CMAKE_CURRENT_SOURCE_DIR@/../openair3/NAS/COMMON/IES/NasMessageContainer.c \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair3/NAS/COMMON/IES/DetachType.h \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair3/NAS/COMMON/IES/FGMMCapability.h \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair3/NAS/COMMON/IES/TmsiStatus.h \
 @CMAKE_CURRENT_SOURCE_DIR@/../openair3/NAS/COMMON/IES/MobileStationClassmark2.h \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair3/NAS/COMMON/IES/TrackingAreaIdentityList.c \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair3/NAS/COMMON/IES/MessageType.c \
 @CMAKE_CURRENT_SOURCE_DIR@/../openair3/NAS/COMMON/IES/DrxParameter.h \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair3/NAS/COMMON/IES/UeNetworkCapability.h \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair3/NAS/COMMON/IES/QualityOfService.c \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair3/NAS/COMMON/IES/AuthenticationParameterAutn.c \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair3/NAS/COMMON/IES/EmmCause.h \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair3/NAS/COMMON/IES/TransactionIdentifier.c \
 @CMAKE_CURRENT_SOURCE_DIR@/../openair3/NAS/COMMON/IES/EpsUpdateResult.h \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair3/NAS/COMMON/IES/QualityOfService.c \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair3/NAS/COMMON/IES/NasKeySetIdentifier.h \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair3/NAS/COMMON/IES/MobileIdentity.h \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair3/NAS/COMMON/IES/GprsTimer.c \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair3/NAS/COMMON/IES/AdditionalUpdateType.h \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair3/NAS/COMMON/IES/NasRequestType.c \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair3/NAS/COMMON/IES/EpsBearerContextStatus.h \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair3/NAS/COMMON/IES/FGSMobileIdentity.h \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair3/NAS/COMMON/IES/LcsClientIdentity.h \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair3/NAS/COMMON/IES/FGSMobileIdentity.c \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair3/NAS/COMMON/IES/ServiceType.c \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair3/NAS/COMMON/IES/PagingIdentity.h \
 @CMAKE_CURRENT_SOURCE_DIR@/../openair3/NAS/COMMON/IES/UeNetworkCapability.c \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair3/NAS/COMMON/IES/TrafficFlowAggregateDescription.h \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair3/NAS/COMMON/IES/TrackingAreaIdentityList.h \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair3/NAS/COMMON/IES/AdditionalUpdateType.c \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair3/NAS/COMMON/IES/TmsiStatus.h \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair3/NAS/COMMON/IES/NrUESecurityCapability.h \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair3/NAS/COMMON/IES/AuthenticationParameterAutn.c \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair3/NAS/COMMON/IES/PdnAddress.c \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair3/NAS/COMMON/IES/EpsUpdateType.h \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair3/NAS/COMMON/IES/UeSecurityCapability.h \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair3/NAS/COMMON/IES/PTmsiSignature.h \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair3/NAS/COMMON/IES/PacketFlowIdentifier.h \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair3/NAS/COMMON/IES/UeRadioCapabilityInformationUpdateNeeded.h \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair3/NAS/COMMON/IES/FGCNasMessageContainer.h \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair3/NAS/COMMON/IES/PTmsiSignature.c \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair3/NAS/COMMON/IES/EpsMobileIdentity.h \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair3/NAS/COMMON/IES/GutiType.h \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair3/NAS/COMMON/IES/EpsBearerContextStatus.c \
 @CMAKE_CURRENT_SOURCE_DIR@/../openair3/NAS/COMMON/IES/EpsNetworkFeatureSupport.h \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair3/NAS/COMMON/IES/EsmInformationTransferFlag.h \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair3/NAS/COMMON/IES/NrUESecurityCapability.c \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair3/NAS/COMMON/IES/LcsIndicator.c \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair3/NAS/COMMON/IES/LcsIndicator.h \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair3/NAS/COMMON/IES/AdditionalUpdateResult.c \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair3/NAS/COMMON/IES/DrxParameter.c \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair3/NAS/COMMON/IES/NetworkName.c \
 @CMAKE_CURRENT_SOURCE_DIR@/../openair3/NAS/COMMON/IES/MsNetworkCapability.c \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair3/NAS/COMMON/IES/TimeZone.h \
 @CMAKE_CURRENT_SOURCE_DIR@/../openair3/NAS/COMMON/IES/NasKeySetIdentifier.c \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair3/NAS/COMMON/IES/MobileStationClassmark2.c \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair3/NAS/COMMON/IES/VoiceDomainPreferenceAndUeUsageSetting.h \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair3/NAS/COMMON/IES/AdditionalUpdateType.h \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair3/NAS/COMMON/IES/LcsIndicator.h \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair3/NAS/COMMON/IES/SsCode.c \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair3/NAS/COMMON/IES/GprsTimer.c \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair3/NAS/COMMON/IES/EmergencyNumberList.c \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair3/NAS/COMMON/IES/EpsAttachResult.c \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair3/NAS/COMMON/IES/AccessPointName.h \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair3/NAS/COMMON/IES/FGMMCapability.c \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair3/NAS/COMMON/IES/AdditionalUpdateResult.h \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair3/NAS/COMMON/IES/EpsAttachType.c \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair3/NAS/COMMON/IES/UeNetworkCapability.h \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair3/NAS/COMMON/IES/FGSDeregistrationType.h \
 @CMAKE_CURRENT_SOURCE_DIR@/../openair3/NAS/COMMON/IES/EsmMessageContainer.h \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair3/NAS/COMMON/IES/EmmCause.c \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair3/NAS/COMMON/IES/EpsBearerIdentity.c \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair3/NAS/COMMON/IES/NasSecurityAlgorithms.h \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair3/NAS/COMMON/IES/EsmMessageContainer.c \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair3/NAS/COMMON/IES/ShortMac.h \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair3/NAS/COMMON/IES/AuthenticationParameterAutn.h \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair3/NAS/COMMON/IES/ServiceType.h \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair3/NAS/COMMON/IES/NasKeySetIdentifier.h \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair3/NAS/COMMON/IES/TransactionIdentifier.h \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair3/NAS/COMMON/IES/EpsQualityOfService.h \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair3/NAS/COMMON/IES/PagingIdentity.c \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair3/NAS/COMMON/IES/GutiType.h \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair3/NAS/COMMON/IES/EpsAttachType.h \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair3/NAS/COMMON/IES/MsNetworkFeatureSupport.h \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair3/NAS/COMMON/IES/DaylightSavingTime.c \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair3/NAS/COMMON/IES/FGCNasMessageContainer.h \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair3/NAS/COMMON/IES/MsNetworkCapability.h \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair3/NAS/COMMON/IES/ProcedureTransactionIdentity.h \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair3/NAS/COMMON/IES/TimeZoneAndTime.c \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair3/NAS/COMMON/IES/Cli.c \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair3/NAS/COMMON/IES/AuthenticationResponseParameter.c \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair3/NAS/COMMON/IES/SecurityHeaderType.h \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair3/NAS/COMMON/IES/EsmCause.h \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair3/NAS/COMMON/IES/NasSecurityAlgorithms.c \
 @CMAKE_CURRENT_SOURCE_DIR@/../openair3/NAS/COMMON/IES/SORTransparentContainer.h \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair3/NAS/COMMON/IES/FGSRegistrationType.h \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair3/NAS/COMMON/IES/NasRequestType.h \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair3/NAS/COMMON/IES/LinkedEpsBearerIdentity.h \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair3/NAS/COMMON/IES/AdditionalUpdateType.c \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair3/NAS/COMMON/IES/MsNetworkFeatureSupport.c \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair3/NAS/COMMON/IES/TimeZoneAndTime.h \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair3/NAS/COMMON/IES/ImeisvRequest.h \
 @CMAKE_CURRENT_SOURCE_DIR@/../openair3/NAS/COMMON/IES/MessageType.h \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair3/NAS/COMMON/IES/DrxParameter.c \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair3/NAS/COMMON/IES/FGSRegistrationResult.h \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair3/NAS/COMMON/IES/TimeZone.h \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair3/NAS/COMMON/IES/RadioPriority.c \
 @CMAKE_CURRENT_SOURCE_DIR@/../openair3/NAS/COMMON/IES/SecurityHeaderType.c \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair3/NAS/COMMON/IES/NasRequestType.c \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair3/NAS/COMMON/IES/SsCode.h \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair3/NAS/COMMON/IES/SpareHalfOctet.c \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair3/NAS/COMMON/IES/NasSecurityAlgorithms.c \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair3/NAS/COMMON/IES/MobileIdentity.h \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair3/NAS/COMMON/IES/GprsTimer.h \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair3/NAS/COMMON/IES/TrafficFlowTemplate.c \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair3/NAS/COMMON/IES/KsiAndSequenceNumber.h \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair3/NAS/COMMON/IES/DetachType.c \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair3/NAS/COMMON/IES/EpsUpdateType.h \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair3/NAS/COMMON/IES/LcsClientIdentity.c \
 @CMAKE_CURRENT_SOURCE_DIR@/../openair3/NAS/COMMON/IES/AuthenticationParameterRand.c \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair3/NAS/COMMON/IES/AccessPointName.c \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair3/NAS/COMMON/IES/MobileStationClassmark3.c \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair3/NAS/COMMON/IES/CipheringKeySequenceNumber.c \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair3/NAS/COMMON/IES/MessageType.c \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair3/NAS/COMMON/IES/LocationAreaIdentification.h \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair3/NAS/COMMON/IES/AccessPointName.h \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair3/NAS/COMMON/IES/AdditionalUpdateResult.c \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair3/NAS/COMMON/IES/Nonce.h \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair3/NAS/COMMON/IES/LocationAreaIdentification.c \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair3/NAS/COMMON/IES/MobileIdentity.c \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair3/NAS/COMMON/IES/LcsClientIdentity.h \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair3/NAS/COMMON/IES/LlcServiceAccessPointIdentifier.c \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair3/NAS/COMMON/IES/LinkedEpsBearerIdentity.h \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair3/NAS/COMMON/IES/LlcServiceAccessPointIdentifier.h \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair3/NAS/COMMON/IES/LinkedEpsBearerIdentity.c \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair3/NAS/COMMON/IES/ImeisvRequest.c \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair3/NAS/COMMON/IES/FGSMobileIdentity.c \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair3/NAS/COMMON/IES/FGMMCapability.h \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair3/NAS/COMMON/IES/EpsAttachResult.h \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair3/NAS/COMMON/IES/FGSRegistrationResult.c \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair3/NAS/COMMON/IES/IdentityType2.h \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair3/NAS/COMMON/IES/PagingIdentity.h \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair3/NAS/COMMON/IES/AuthenticationFailureParameter.c \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair3/NAS/COMMON/IES/FGSMobileIdentity.h \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair3/NAS/COMMON/IES/ProtocolConfigurationOptions.h \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair3/NAS/COMMON/IES/FGSRegistrationType.c \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair3/NAS/COMMON/IES/TmsiStatus.c \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair3/NAS/COMMON/IES/DaylightSavingTime.h \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair3/NAS/COMMON/IES/NetworkName.c \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair3/NAS/COMMON/IES/TimeZone.c \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair3/NAS/COMMON/IES/CsfbResponse.h \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair3/NAS/COMMON/IES/PacketFlowIdentifier.c \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair3/NAS/COMMON/IES/ServiceType.c \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair3/NAS/COMMON/IES/UeSecurityCapability.h \
 @CMAKE_CURRENT_SOURCE_DIR@/../openair3/NAS/COMMON/IES/EpsBearerIdentity.h \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair3/NAS/COMMON/IES/CipheringKeySequenceNumber.h \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair3/NAS/COMMON/IES/PlmnList.h \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair3/NAS/COMMON/IES/ApnAggregateMaximumBitRate.c \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair3/NAS/COMMON/IES/EsmInformationTransferFlag.h \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair3/NAS/COMMON/IES/TimeZoneAndTime.c \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair3/NAS/COMMON/IES/FGSRegistrationType.c \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair3/NAS/COMMON/IES/EpsUpdateResult.c \
 @CMAKE_CURRENT_SOURCE_DIR@/../openair3/NAS/COMMON/IES/EpsUpdateType.c \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair3/NAS/COMMON/IES/AuthenticationParameterRand.h \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair3/NAS/COMMON/IES/EsmCause.c \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair3/NAS/COMMON/IES/PdnAddress.h \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair3/NAS/COMMON/IES/AuthenticationFailureParameter.h \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair3/NAS/COMMON/IES/EsmCause.h \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair3/NAS/COMMON/IES/NasPagingIdentity.h \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair3/NAS/COMMON/IES/MsNetworkFeatureSupport.c \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair3/NAS/COMMON/IES/SORTransparentContainer.c \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair3/NAS/COMMON/IES/PlmnList.c \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair3/NAS/COMMON/IES/NetworkName.h \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair3/NAS/COMMON/IES/FGCNasMessageContainer.c \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair3/NAS/COMMON/IES/EsmInformationTransferFlag.c \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair3/NAS/COMMON/IES/VoiceDomainPreferenceAndUeUsageSetting.c \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair3/NAS/COMMON/IES/CsfbResponse.c \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair3/NAS/COMMON/IES/ShortMac.c \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair3/NAS/COMMON/IES/ExtendedProtocolDiscriminator.h \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair3/NAS/COMMON/IES/EpsAttachResult.c \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair3/NAS/COMMON/IES/ApnAggregateMaximumBitRate.h \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair3/NAS/COMMON/IES/PTmsiSignature.h \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair3/NAS/COMMON/IES/UeRadioCapabilityInformationUpdateNeeded.c \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair3/NAS/COMMON/IES/PacketFlowIdentifier.h \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair3/NAS/COMMON/IES/MobileStationClassmark3.h \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair3/NAS/COMMON/IES/IdentityType2.c \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair3/NAS/COMMON/IES/PdnAddress.c \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair3/NAS/COMMON/IES/EpsNetworkFeatureSupport.c \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair3/NAS/COMMON/IES/Cli.h \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair3/NAS/COMMON/IES/Nonce.c \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair3/NAS/COMMON/IES/SecurityHeaderType.h \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair3/NAS/COMMON/IES/EpsBearerContextStatus.h \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair3/NAS/COMMON/IES/EpsBearerContextStatus.c \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair3/NAS/COMMON/IES/ExtendedProtocolDiscriminator.c \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair3/NAS/COMMON/IES/ProtocolDiscriminator.c \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair3/NAS/COMMON/IES/TrafficFlowAggregateDescription.c \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair3/NAS/COMMON/IES/TrackingAreaIdentity.h \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair3/NAS/COMMON/IES/UeSecurityCapability.c \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair3/NAS/COMMON/IES/ImeisvRequest.h \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair3/NAS/COMMON/IES/ProcedureTransactionIdentity.c \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair3/NAS/COMMON/IES/ProtocolConfigurationOptions.c \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair3/NAS/COMMON/IES/EpsQualityOfService.c \
 @CMAKE_CURRENT_SOURCE_DIR@/../openair3/NAS/COMMON/IES/AuthenticationResponseParameter.h \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair3/NAS/COMMON/IES/PdnType.h \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair3/NAS/COMMON/IES/EpsMobileIdentity.c \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair3/NAS/COMMON/IES/SupportedCodecList.c \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair3/NAS/COMMON/IES/AdditionalUpdateResult.h \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair3/NAS/COMMON/IES/PTmsiSignature.c \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair3/NAS/COMMON/IES/ProtocolDiscriminator.h \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair3/NAS/COMMON/IES/LcsClientIdentity.c \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair3/NAS/COMMON/IES/UeRadioCapabilityInformationUpdateNeeded.h \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair3/NAS/COMMON/ESM/MSG/BearerResourceModificationReject.h \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair3/NAS/COMMON/ESM/MSG/EsmInformationResponse.c \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair3/NAS/COMMON/ESM/MSG/DeactivateEpsBearerContextRequest.h \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair3/NAS/COMMON/ESM/MSG/BearerResourceAllocationRequest.c \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair3/NAS/COMMON/ESM/MSG/ActivateDefaultEpsBearerContextAccept.h \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair3/NAS/COMMON/ESM/MSG/ModifyEpsBearerContextRequest.h \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair3/NAS/COMMON/ESM/MSG/ActivateDefaultEpsBearerContextAccept.c \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair3/NAS/COMMON/ESM/MSG/ActivateDefaultEpsBearerContextReject.h \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair3/NAS/COMMON/ESM/MSG/ActivateDedicatedEpsBearerContextReject.h \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair3/NAS/COMMON/ESM/MSG/EsmInformationRequest.c \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair3/NAS/COMMON/ESM/MSG/DeactivateEpsBearerContextAccept.c \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair3/NAS/COMMON/ESM/MSG/BearerResourceModificationReject.c \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair3/NAS/COMMON/ESM/MSG/PdnConnectivityReject.h \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair3/NAS/COMMON/ESM/MSG/EsmInformationRequest.h \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair3/NAS/COMMON/ESM/MSG/DeactivateEpsBearerContextRequest.c \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair3/NAS/COMMON/ESM/MSG/ActivateDedicatedEpsBearerContextAccept.h \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair3/NAS/COMMON/ESM/MSG/EsmStatus.c \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair3/NAS/COMMON/ESM/MSG/ActivateDefaultEpsBearerContextReject.c \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair3/NAS/COMMON/ESM/MSG/ActivateDedicatedEpsBearerContextAccept.c \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair3/NAS/COMMON/ESM/MSG/EsmInformationResponse.h \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair3/NAS/COMMON/ESM/MSG/esm_msg.h \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair3/NAS/COMMON/ESM/MSG/PduSessionEstablishRequest.h \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair3/NAS/COMMON/ESM/MSG/ModifyEpsBearerContextRequest.c \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair3/NAS/COMMON/IES/NetworkName.h \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair3/NAS/COMMON/IES/LinkedEpsBearerIdentity.c \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair3/NAS/COMMON/IES/SupportedCodecList.c \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair3/NAS/COMMON/NR_NAS_defs.h \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair3/NAS/COMMON/milenage.h \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair3/NAS/COMMON/ESM/MSG/EsmStatus.c \
 @CMAKE_CURRENT_SOURCE_DIR@/../openair3/NAS/COMMON/ESM/MSG/ModifyEpsBearerContextReject.h \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair3/NAS/COMMON/ESM/MSG/ModifyEpsBearerContextAccept.c \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair3/NAS/COMMON/ESM/MSG/ActivateDefaultEpsBearerContextRequest.h \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair3/NAS/COMMON/ESM/MSG/ModifyEpsBearerContextReject.c \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair3/NAS/COMMON/ESM/MSG/esm_msg.c \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair3/NAS/COMMON/ESM/MSG/PduSessionEstablishmentAccept.h \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair3/NAS/COMMON/ESM/MSG/PdnConnectivityReject.c \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair3/NAS/COMMON/ESM/MSG/EsmStatus.h \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair3/NAS/COMMON/ESM/MSG/esm_msgDef.h \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair3/NAS/COMMON/ESM/MSG/ActivateDedicatedEpsBearerContextRequest.h \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair3/NAS/COMMON/ESM/MSG/PduSessionEstablishmentAccept.c \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair3/NAS/COMMON/ESM/MSG/BearerResourceModificationRequest.c \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair3/NAS/COMMON/ESM/MSG/PdnDisconnectReject.h \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair3/NAS/COMMON/ESM/MSG/PdnConnectivityRequest.c \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair3/NAS/COMMON/ESM/MSG/PdnDisconnectRequest.h \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair3/NAS/COMMON/ESM/MSG/PdnConnectivityRequest.h \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair3/NAS/COMMON/ESM/MSG/PdnDisconnectReject.c \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair3/NAS/COMMON/ESM/MSG/PduSessionEstablishRequest.c \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair3/NAS/COMMON/ESM/MSG/ModifyEpsBearerContextAccept.h \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair3/NAS/COMMON/ESM/MSG/BearerResourceModificationRequest.h \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair3/NAS/COMMON/ESM/MSG/DeactivateEpsBearerContextAccept.h \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair3/NAS/COMMON/ESM/MSG/esm_cause.h \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair3/NAS/COMMON/ESM/MSG/BearerResourceAllocationReject.h \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair3/NAS/COMMON/ESM/MSG/ActivateDedicatedEpsBearerContextRequest.c \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair3/NAS/COMMON/ESM/MSG/ActivateDedicatedEpsBearerContextReject.c \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair3/NAS/COMMON/ESM/MSG/BearerResourceAllocationReject.c \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair3/NAS/COMMON/ESM/MSG/esm_msg.h \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair3/NAS/COMMON/ESM/MSG/ModifyEpsBearerContextRequest.h \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair3/NAS/COMMON/ESM/MSG/ActivateDefaultEpsBearerContextAccept.c \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair3/NAS/COMMON/ESM/MSG/BearerResourceAllocationRequest.c \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair3/NAS/COMMON/ESM/MSG/ActivateDedicatedEpsBearerContextAccept.h \
 @CMAKE_CURRENT_SOURCE_DIR@/../openair3/NAS/COMMON/ESM/MSG/ActivateDefaultEpsBearerContextRequest.c \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair3/NAS/COMMON/ESM/MSG/PdnDisconnectRequest.c \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair3/NAS/COMMON/ESM/MSG/BearerResourceAllocationRequest.h \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair3/NAS/COMMON/userDef.h \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair3/NAS/COMMON/milenage.h \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair3/NAS/COMMON/EMM/MSG/AuthenticationRequest.h \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair3/NAS/COMMON/EMM/MSG/IdentityResponse.h \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair3/NAS/COMMON/EMM/MSG/TrackingAreaUpdateComplete.h \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair3/NAS/COMMON/EMM/MSG/TrackingAreaUpdateRequest.h \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair3/NAS/COMMON/EMM/MSG/RegistrationRequest.c \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair3/NAS/COMMON/EMM/MSG/ServiceRequest.c \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair3/NAS/COMMON/EMM/MSG/DetachRequest.h \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair3/NAS/COMMON/EMM/MSG/TrackingAreaUpdateComplete.c \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair3/NAS/COMMON/EMM/MSG/CsServiceNotification.h \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair3/NAS/COMMON/EMM/MSG/IdentityResponse.c \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair3/NAS/COMMON/EMM/MSG/TrackingAreaUpdateAccept.h \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair3/NAS/COMMON/EMM/MSG/AuthenticationResponse.h \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair3/NAS/COMMON/EMM/MSG/emm_msg.c \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair3/NAS/COMMON/EMM/MSG/TrackingAreaUpdateAccept.c \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair3/NAS/COMMON/EMM/MSG/ServiceRequest.h \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair3/NAS/COMMON/EMM/MSG/RegistrationComplete.h \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair3/NAS/COMMON/EMM/MSG/DetachAccept.c \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair3/NAS/COMMON/EMM/MSG/FGSIdentityResponse.c \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair3/NAS/COMMON/EMM/MSG/RegistrationComplete.c \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair3/NAS/COMMON/EMM/MSG/FGSUplinkNasTransport.c \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair3/NAS/COMMON/EMM/MSG/AttachAccept.h \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair3/NAS/COMMON/EMM/MSG/emm_msgDef.h \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair3/NAS/COMMON/EMM/MSG/IdentityRequest.h \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair3/NAS/COMMON/EMM/MSG/FGSIdentityResponse.h \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair3/NAS/COMMON/EMM/MSG/EmmInformation.h \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair3/NAS/COMMON/EMM/MSG/ServiceReject.c \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair3/NAS/COMMON/EMM/MSG/DownlinkNasTransport.c \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair3/NAS/COMMON/EMM/MSG/FGSNASSecurityModeComplete.h \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair3/NAS/COMMON/EMM/MSG/IdentityRequest.c \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair3/NAS/COMMON/EMM/MSG/CsServiceNotification.c \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair3/NAS/COMMON/EMM/MSG/DetachAccept.h \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair3/NAS/COMMON/EMM/MSG/FGSAuthenticationResponse.c \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair3/NAS/COMMON/EMM/MSG/EmmInformation.c \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair3/NAS/COMMON/EMM/MSG/RegistrationAccept.h \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair3/NAS/COMMON/EMM/MSG/emm_msg.h \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair3/NAS/COMMON/EMM/MSG/EmmStatus.c \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair3/NAS/COMMON/EMM/MSG/GutiReallocationComplete.h \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair3/NAS/COMMON/EMM/MSG/AttachComplete.h \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair3/NAS/COMMON/EMM/MSG/UplinkNasTransport.c \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair3/NAS/COMMON/EMM/MSG/FGSUplinkNasTransport.h \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair3/NAS/COMMON/EMM/MSG/NASSecurityModeComplete.h \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair3/NAS/COMMON/EMM/MSG/TrackingAreaUpdateReject.h \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair3/NAS/COMMON/EMM/MSG/FGSNASSecurityModeComplete.c \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair3/NAS/COMMON/EMM/MSG/AttachReject.h \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair3/NAS/COMMON/EMM/MSG/ServiceReject.h \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair3/NAS/COMMON/EMM/MSG/AttachRequest.h \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair3/NAS/COMMON/EMM/MSG/AuthenticationResponse.c \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair3/NAS/COMMON/EMM/MSG/AttachComplete.c \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair3/NAS/COMMON/EMM/MSG/RegistrationAccept.c \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair3/NAS/COMMON/EMM/MSG/FGSAuthenticationResponse.h \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair3/NAS/COMMON/EMM/MSG/AuthenticationReject.c \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair3/NAS/COMMON/EMM/MSG/AuthenticationFailure.c \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair3/NAS/COMMON/EMM/MSG/AttachAccept.c \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair3/NAS/COMMON/EMM/MSG/UplinkNasTransport.h \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair3/NAS/COMMON/EMM/MSG/GutiReallocationComplete.c \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair3/NAS/COMMON/EMM/MSG/ExtendedServiceRequest.c \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair3/NAS/COMMON/EMM/MSG/TrackingAreaUpdateReject.c \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair3/NAS/COMMON/EMM/MSG/emm_cause.h \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair3/NAS/COMMON/EMM/MSG/AuthenticationReject.h \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair3/NAS/COMMON/EMM/MSG/AttachReject.c \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair3/NAS/COMMON/EMM/MSG/GutiReallocationCommand.h \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair3/NAS/COMMON/EMM/MSG/DownlinkNasTransport.h \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair3/NAS/COMMON/EMM/MSG/NASSecurityModeCommand.h \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair3/NAS/COMMON/EMM/MSG/SecurityModeCommand.c \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair3/NAS/COMMON/EMM/MSG/RegistrationRequest.h \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair3/NAS/COMMON/EMM/MSG/GutiReallocationCommand.c \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair3/NAS/COMMON/EMM/MSG/SecurityModeReject.h \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair3/NAS/COMMON/EMM/MSG/TrackingAreaUpdateRequest.c \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair3/NAS/COMMON/EMM/MSG/EmmStatus.h \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair3/NAS/COMMON/EMM/MSG/SecurityModeComplete.c \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair3/NAS/COMMON/EMM/MSG/ExtendedServiceRequest.h \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair3/NAS/COMMON/EMM/MSG/AuthenticationFailure.h \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair3/NAS/COMMON/EMM/MSG/AuthenticationRequest.c \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair3/NAS/COMMON/EMM/MSG/SecurityModeReject.c \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair3/NAS/COMMON/EMM/MSG/DetachRequest.c \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair3/NAS/COMMON/EMM/MSG/AttachRequest.c \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair3/ocp-gtpu/gtpv1u_gNB_task.h \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair3/ocp-gtpu/gtp_itf.cpp \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair3/ocp-gtpu/gtp_itf.h \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair3/ocp-gtpu/gtpv1u_eNB_task.h \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair3/S1AP/s1ap_eNB_context_management_procedures.h \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair3/S1AP/s1ap_eNB_itti_messaging.c \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair3/S1AP/s1ap_eNB_ue_context.c \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair3/S1AP/s1ap_eNB_management_procedures.h \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair3/S1AP/s1ap_eNB_context_management_procedures.c \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair3/S1AP/s1ap_eNB.h \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair3/S1AP/s1ap_common.c \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair3/S1AP/s1ap_eNB_overload.h \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair3/S1AP/s1ap_eNB_overload.c \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair3/S1AP/s1ap_eNB_encoder.h \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair3/S1AP/s1ap_eNB_decoder.h \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair3/S1AP/s1ap_eNB_ue_context.h \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair3/S1AP/s1ap_eNB_trace.c \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair3/S1AP/s1ap_eNB_handlers.c \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair3/S1AP/s1ap_eNB_defs.h \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair3/S1AP/s1ap_eNB_encoder.c \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair3/S1AP/s1ap_eNB_itti_messaging.h \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair3/S1AP/s1ap_eNB_trace.h \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair3/S1AP/s1ap_eNB.c \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair3/S1AP/s1ap_common.h \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair3/S1AP/s1ap_eNB_nnsf.h \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair3/S1AP/s1ap_eNB_nas_procedures.c \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair3/S1AP/s1ap_eNB_nnsf.c \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair3/S1AP/s1ap_eNB_handlers.h \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair3/S1AP/s1ap_eNB_decoder.c \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair3/S1AP/s1ap_eNB_management_procedures.c \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair3/S1AP/s1ap_eNB_nas_procedures.h \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair3/S1AP/s1ap_eNB_default_values.h \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair3/MME_APP/mme_config.h \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair3/MME_APP/mme_app.c \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair3/MME_APP/mme_app.h \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair3/MME_APP/mme_config.c \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair3/UTILS/conversions.h \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair3/SECU/kdf.c \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair3/SECU/rijndael.h \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair3/SECU/nas_stream_eea2.c \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair3/SECU/nas_stream_eia2.c \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair3/SECU/snow3g.h \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair3/SECU/rijndael.c \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair3/SECU/snow3g.c \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair3/SECU/nas_stream_eea1.c \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair3/SECU/key_nas_deriver.c \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair3/SECU/secu_defs.h \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair3/SECU/nas_stream_eia1.c \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair3/SCTP/sctp_eNB_itti_messaging.h \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair3/SCTP/sctp_eNB_itti_messaging.c \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair3/SCTP/sctp_eNB_defs.h \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair3/SCTP/sctp_eNB_task.c \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair3/SCTP/sctp_common.h \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair3/SCTP/sctp_eNB_task.h \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair3/SCTP/sctp_common.c \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair3/SCTP/sctp_default_values.h \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair3/UICC/usim_interface.c \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair3/UICC/usim_interface.h \
-@CMAKE_CURRENT_SOURCE_DIR@/../nfapi/oai_integration/nfapi_vnf.h \
-@CMAKE_CURRENT_SOURCE_DIR@/../nfapi/oai_integration/nfapi_pnf.c \
-@CMAKE_CURRENT_SOURCE_DIR@/../nfapi/oai_integration/nfapi.c \
-@CMAKE_CURRENT_SOURCE_DIR@/../nfapi/oai_integration/nfapi_vnf.c \
-@CMAKE_CURRENT_SOURCE_DIR@/../nfapi/oai_integration/gnb_ind_vars.c \
-@CMAKE_CURRENT_SOURCE_DIR@/../nfapi/oai_integration/nfapi_pnf.h \
-@CMAKE_CURRENT_SOURCE_DIR@/../nfapi/oai_integration/gnb_ind_vars.h \
-@CMAKE_CURRENT_SOURCE_DIR@/../nfapi/oai_integration/vendor_ext.h \
-@CMAKE_CURRENT_SOURCE_DIR@/../nfapi/open-nFAPI/pnf_sim/inc/fapi_interface.h \
-@CMAKE_CURRENT_SOURCE_DIR@/../nfapi/open-nFAPI/pnf_sim/inc/fapi_stub.h \
-@CMAKE_CURRENT_SOURCE_DIR@/../nfapi/open-nFAPI/vnf/src/vnf_interface.c \
-@CMAKE_CURRENT_SOURCE_DIR@/../nfapi/open-nFAPI/vnf/src/vnf_p7.c \
-@CMAKE_CURRENT_SOURCE_DIR@/../nfapi/open-nFAPI/vnf/src/vnf.c \
-@CMAKE_CURRENT_SOURCE_DIR@/../nfapi/open-nFAPI/vnf/src/vnf_p7_interface.c \
-@CMAKE_CURRENT_SOURCE_DIR@/../nfapi/open-nFAPI/vnf/inc/vnf_p7.h \
-@CMAKE_CURRENT_SOURCE_DIR@/../nfapi/open-nFAPI/vnf/inc/vnf.h \
-@CMAKE_CURRENT_SOURCE_DIR@/../nfapi/open-nFAPI/vnf/public_inc/nfapi_vnf_interface.h \
-@CMAKE_CURRENT_SOURCE_DIR@/../nfapi/open-nFAPI/common/src/debug.c \
-@CMAKE_CURRENT_SOURCE_DIR@/../nfapi/open-nFAPI/common/public_inc/debug.h \
-@CMAKE_CURRENT_SOURCE_DIR@/../nfapi/open-nFAPI/pnf/src/pnf_interface.c \
-@CMAKE_CURRENT_SOURCE_DIR@/../nfapi/open-nFAPI/pnf/src/pnf_p7_interface.c \
-@CMAKE_CURRENT_SOURCE_DIR@/../nfapi/open-nFAPI/pnf/src/pnf.c \
-@CMAKE_CURRENT_SOURCE_DIR@/../nfapi/open-nFAPI/pnf/src/pnf_p7.c \
-@CMAKE_CURRENT_SOURCE_DIR@/../nfapi/open-nFAPI/pnf/inc/pnf.h \
-@CMAKE_CURRENT_SOURCE_DIR@/../nfapi/open-nFAPI/pnf/inc/pnf_p7.h \
-@CMAKE_CURRENT_SOURCE_DIR@/../nfapi/open-nFAPI/pnf/public_inc/nfapi_pnf_interface.h \
-@CMAKE_CURRENT_SOURCE_DIR@/../nfapi/open-nFAPI/nfapi/src/nfapi.c \
-@CMAKE_CURRENT_SOURCE_DIR@/../nfapi/open-nFAPI/nfapi/src/nfapi_p4.c \
-@CMAKE_CURRENT_SOURCE_DIR@/../nfapi/open-nFAPI/nfapi/src/nfapi_p5.c \
-@CMAKE_CURRENT_SOURCE_DIR@/../nfapi/open-nFAPI/nfapi/src/nfapi_p7.c \
-@CMAKE_CURRENT_SOURCE_DIR@/../nfapi/open-nFAPI/nfapi/inc/nfapi.h \
-@CMAKE_CURRENT_SOURCE_DIR@/../nfapi/open-nFAPI/nfapi/public_inc/nfapi_nr_interface_scf.h \
-@CMAKE_CURRENT_SOURCE_DIR@/../nfapi/open-nFAPI/nfapi/public_inc/nfapi_nr_interface.h \
-@CMAKE_CURRENT_SOURCE_DIR@/../nfapi/open-nFAPI/nfapi/public_inc/nfapi_interface.h \
-@CMAKE_CURRENT_SOURCE_DIR@/../nfapi/open-nFAPI/nfapi/public_inc/fapi_nr_ue_constants.h \
-@CMAKE_CURRENT_SOURCE_DIR@/../nfapi/open-nFAPI/nfapi/public_inc/fapi_nr_ue_interface.h \
-@CMAKE_CURRENT_SOURCE_DIR@/../nfapi/open-nFAPI/sim_common/inc/vendor_ext.h \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair1/SCHED_NR/nr_prach_procedures.c \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair1/SCHED_NR/phy_procedures_nr_gNB.c \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair1/SCHED_NR/fapi_nr_l1.h \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair1/SCHED_NR/nr_ru_procedures.c \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair1/SCHED_NR/fapi_nr_l1.c \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair1/SCHED_NR/sched_nr.h \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair1/SCHED_NR/phy_frame_config_nr.h \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair1/SCHED_NR/phy_frame_config_nr.c \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair1/SCHED/ru_procedures.c \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair1/SCHED/sched_common.h \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair1/SCHED/nfapi_lte_dummy.c \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair1/SCHED/sched_eNB.h \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair1/SCHED/phy_procedures_lte_common.c \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair1/SCHED/phy_procedures_lte_eNb.c \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair1/SCHED/sched_common_extern.h \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair1/SCHED/nfapi_nr_dummy.c \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair1/SCHED/fapi_l1.c \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair1/SCHED/fapi_l1.h \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair1/SCHED/prach_procedures.c \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair1/SIMULATION/TOOLS/scm_corrmat.h \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair1/SIMULATION/TOOLS/multipath_tv_channel.c \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair1/SIMULATION/TOOLS/channel_sim.c \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair1/SIMULATION/TOOLS/rangen_double.c \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair1/SIMULATION/TOOLS/multipath_channel.c \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair1/SIMULATION/TOOLS/abstraction.c \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair1/SIMULATION/TOOLS/sim.h \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair1/SIMULATION/TOOLS/taus.c \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair1/SIMULATION/TOOLS/random_channel.c \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair1/SIMULATION/TOOLS/phase_noise.c \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair1/SIMULATION/ETH_TRANSPORT/defs.h \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair1/SIMULATION/ETH_TRANSPORT/socket.h \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair1/SIMULATION/ETH_TRANSPORT/netlink_init.c \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair1/SIMULATION/ETH_TRANSPORT/multicast_link.c \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair1/SIMULATION/ETH_TRANSPORT/vars.h \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair1/SIMULATION/ETH_TRANSPORT/multicast_link.h \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair1/SIMULATION/ETH_TRANSPORT/socket.c \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair1/SIMULATION/ETH_TRANSPORT/proto.h \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair1/SIMULATION/RF/rf.c \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair1/SIMULATION/RF/rf.h \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair1/SIMULATION/RF/adc.c \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair1/SIMULATION/RF/dac.c \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair1/SIMULATION/LTE_PHY/dummy_functions.c \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair1/SIMULATION/LTE_PHY/dlsim.c \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair1/SIMULATION/LTE_PHY/ulsim.c \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair1/SIMULATION/LTE_PHY/unitary_defs.h \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair1/SIMULATION/LTE_PHY/common_sim.h \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair1/SIMULATION/NR_PHY/nr_dummy_functions.c \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair1/SIMULATION/NR_PHY/dlsim.c \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair1/SIMULATION/NR_PHY/prachsim.c \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair1/SIMULATION/NR_PHY/ulsim.c \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair1/SIMULATION/NR_PHY/pucchsim.c \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair1/SIMULATION/NR_PHY/dlschsim.c \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair1/SIMULATION/NR_PHY/ulschsim.c \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair1/SIMULATION/NR_PHY/nr_unitary_defs.h \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair1/SIMULATION/NR_PHY/pbchsim.c \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair1/SCHED_NR_UE/defs.h \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair1/SCHED_NR_UE/harq_nr.h \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair1/SCHED_NR_UE/phy_procedures_nr_ue.c \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair1/SCHED_NR_UE/fapi_nr_ue_l1.h \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair1/SCHED_NR_UE/phy_frame_config_nr_ue.c \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair1/SCHED_NR_UE/pucch_uci_ue_nr.c \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair1/SCHED_NR_UE/pucch_uci_ue_nr.h \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair1/SCHED_NR_UE/fapi_nr_ue_l1.c \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair1/SCHED_NR_UE/phy_sch_processing_time.h \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair1/SCHED_NR_UE/phy_frame_config_nr.h \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair1/SCHED_NR_UE/harq_nr.c \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair1/SCHED_UE/phy_procedures_lte_ue.c \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair1/SCHED_UE/srs_pc.c \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair1/SCHED_UE/sched_UE.h \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair1/SCHED_UE/pucch_pc.c \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair1/SCHED_UE/pusch_pc.c \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair1/PHY/INIT/lte_init_ue.c \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair3/NAS/COMMON/ESM/MSG/ModifyEpsBearerContextAccept.c \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair3/NAS/COMMON/ESM/MSG/EsmInformationResponse.h \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair3/NAS/COMMON/ESM/MSG/EsmStatus.h \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair3/NAS/COMMON/ESM/MSG/PdnConnectivityRequest.h \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair3/NAS/COMMON/ESM/MSG/PdnDisconnectReject.h \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair3/NAS/COMMON/ESM/MSG/ActivateDedicatedEpsBearerContextReject.c \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair3/NAS/COMMON/ESM/MSG/PduSessionEstablishmentAccept.c \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair3/NAS/COMMON/ESM/MSG/PdnConnectivityReject.h \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair3/NAS/COMMON/ESM/MSG/BearerResourceModificationRequest.c \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair3/NAS/COMMON/ESM/MSG/BearerResourceModificationRequest.h \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair3/NAS/COMMON/ESM/MSG/DeactivateEpsBearerContextAccept.h \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair3/NAS/COMMON/ESM/MSG/ActivateDefaultEpsBearerContextReject.c \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair3/NAS/COMMON/ESM/MSG/EsmInformationRequest.c \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair3/NAS/COMMON/ESM/MSG/BearerResourceAllocationReject.h \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair3/NAS/COMMON/ESM/MSG/PdnConnectivityReject.c \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair3/NAS/COMMON/ESM/MSG/ActivateDedicatedEpsBearerContextAccept.c \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair3/NAS/COMMON/ESM/MSG/PduSessionEstablishRequest.c \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair3/NAS/COMMON/ESM/MSG/PdnDisconnectRequest.h \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair3/NAS/COMMON/ESM/MSG/DeactivateEpsBearerContextAccept.c \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair3/NAS/COMMON/ESM/MSG/DeactivateEpsBearerContextRequest.h \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair3/NAS/COMMON/ESM/MSG/ActivateDedicatedEpsBearerContextReject.h \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair3/NAS/COMMON/ESM/MSG/BearerResourceModificationReject.h \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair3/NAS/COMMON/ESM/MSG/DeactivateEpsBearerContextRequest.c \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair3/NAS/COMMON/ESM/MSG/EsmInformationRequest.h \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair3/NAS/COMMON/ESM/MSG/esm_cause.h \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair3/NAS/COMMON/ESM/MSG/ModifyEpsBearerContextRequest.c \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair3/NAS/COMMON/ESM/MSG/PdnConnectivityRequest.c \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair3/NAS/COMMON/ESM/MSG/BearerResourceModificationReject.c \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair3/NAS/COMMON/ESM/MSG/PduSessionEstablishmentAccept.h \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair3/NAS/COMMON/ESM/MSG/PduSessionEstablishRequest.h \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair3/NAS/COMMON/ESM/MSG/esm_msgDef.h \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair3/NAS/COMMON/ESM/MSG/ActivateDedicatedEpsBearerContextRequest.h \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair3/NAS/COMMON/ESM/MSG/BearerResourceAllocationReject.c \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair3/NAS/COMMON/ESM/MSG/ActivateDedicatedEpsBearerContextRequest.c \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair3/NAS/COMMON/ESM/MSG/ActivateDefaultEpsBearerContextRequest.h \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair3/NAS/COMMON/ESM/MSG/ModifyEpsBearerContextAccept.h \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair3/NAS/COMMON/ESM/MSG/ActivateDefaultEpsBearerContextReject.h \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair3/NAS/COMMON/ESM/MSG/ModifyEpsBearerContextReject.c \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair3/NAS/COMMON/ESM/MSG/PdnDisconnectRequest.c \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair3/NAS/COMMON/ESM/MSG/esm_msg.c \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair3/NAS/COMMON/ESM/MSG/BearerResourceAllocationRequest.h \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair3/NAS/COMMON/ESM/MSG/PdnDisconnectReject.c \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair3/NAS/COMMON/ESM/MSG/EsmInformationResponse.c \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair3/NAS/COMMON/ESM/MSG/ActivateDefaultEpsBearerContextAccept.h \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair3/NAS/COMMON/userDef.h \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair3/NAS/COMMON/nr_common.c \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair3/NAS/gNB/network_process_nas.c \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair3/UTILS/conversions.h \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair2/X2AP/x2ap_eNB_encoder.h \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair2/X2AP/x2ap_eNB_management_procedures.c \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair2/X2AP/x2ap_eNB_handler.h \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair2/X2AP/x2ap_ids.c \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair2/X2AP/x2ap_timers.h \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair2/X2AP/x2ap_eNB_generate_messages.h \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair2/X2AP/x2ap_eNB_encoder.c \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair2/X2AP/x2ap_eNB_generate_messages.c \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair2/X2AP/x2ap_eNB_decoder.h \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair2/X2AP/x2ap_eNB_handler.c \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair2/X2AP/x2ap_timers.c \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair2/X2AP/x2ap_ids.h \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair2/X2AP/x2ap_eNB_defs.h \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair2/X2AP/x2ap_eNB.h \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair2/X2AP/x2ap_eNB.c \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair2/X2AP/x2ap_common.h \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair2/X2AP/x2ap_common.c \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair2/X2AP/x2ap_eNB_decoder.c \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair2/X2AP/x2ap_eNB_itti_messaging.c \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair2/X2AP/x2ap_eNB_management_procedures.h \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair2/X2AP/x2ap_eNB_itti_messaging.h \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair2/MCE_APP/mce_app.c \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair2/MCE_APP/mce_config.c \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair2/MCE_APP/mce_app.h \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair2/MCE_APP/mce_config.h \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair2/M2AP/m2ap_eNB_handler.h \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair2/M2AP/m2ap_MCE.h \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair2/M2AP/m2ap_eNB_generate_messages.h \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair2/M2AP/m2ap_decoder.c \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair2/M2AP/m2ap_itti_messaging.c \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair2/M2AP/m2ap_MCE_handler.c \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair2/M2AP/m2ap_eNB.c \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair2/M2AP/m2ap_common.c \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair2/M2AP/m2ap_MCE_interface_management.h \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair2/M2AP/m2ap_MCE_management_procedures.c \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair2/M2AP/m2ap_MCE_handler.h \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair2/M2AP/m2ap_MCE_management_procedures.h \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair2/M2AP/m2ap_ids.h \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair2/M2AP/m2ap_encoder.h \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair2/M2AP/m2ap_MCE_generate_messages.c \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair2/M2AP/m2ap_ids.c \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair2/M2AP/m2ap_eNB_management_procedures.h \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair2/M2AP/m2ap_encoder.c \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair2/M2AP/m2ap_common.h \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair2/M2AP/m2ap_default_values.h \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair2/M2AP/m2ap_timers.h \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair2/M2AP/m2ap_MCE_generate_messages.h \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair2/M2AP/m2ap_eNB_interface_management.c \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair2/M2AP/m2ap_decoder.h \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair2/M2AP/m2ap_eNB_management_procedures.c \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair2/M2AP/m2ap_timers.c \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair2/M2AP/m2ap_MCE_interface_management.c \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair2/M2AP/m2ap_MCE.c \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair2/M2AP/m2ap_eNB_interface_management.h \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair2/M2AP/m2ap_eNB_handler.c \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair2/M2AP/m2ap_MCE_defs.h \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair2/M2AP/m2ap_eNB_generate_messages.c \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair2/M2AP/m2ap_itti_messaging.h \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair2/M2AP/m2ap_eNB_defs.h \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair2/M2AP/m2ap_eNB.h \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair2/NETWORK_DRIVER/MESH/ioctl.h \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair2/NETWORK_DRIVER/MESH/constant.h \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair2/NETWORK_DRIVER/MESH/rrc_nas_primitives.h \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair2/LAYER2/NR_MAC_COMMON/nr_mac_extern.h \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair2/LAYER2/NR_MAC_COMMON/nr_compute_tbs_common.c \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair2/LAYER2/NR_MAC_COMMON/nr_mac_common.c \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair2/LAYER2/NR_MAC_COMMON/nr_mac_common.h \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair2/LAYER2/NR_MAC_COMMON/nr_mac.h \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair2/LAYER2/nr_rlc/nr_rlc_entity_am.c \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair2/LAYER2/nr_rlc/nr_rlc_entity_um.h \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair2/LAYER2/nr_rlc/nr_rlc_entity_tm.h \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair2/LAYER2/nr_rlc/nr_rlc_entity.c \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair2/LAYER2/nr_rlc/nr_rlc_asn1_utils.h \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair2/LAYER2/nr_rlc/nr_rlc_entity_tm.c \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair2/LAYER2/nr_rlc/nr_rlc_oai_api.h \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair2/LAYER2/nr_rlc/nr_rlc_pdu.h \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair2/LAYER2/nr_rlc/nr_rlc_sdu.h \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair2/LAYER2/nr_rlc/nr_rlc_ue_manager.h \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair2/LAYER2/nr_rlc/nr_rlc_pdu.c \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair2/LAYER2/nr_rlc/nr_rlc_entity_am.h \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair2/LAYER2/nr_rlc/nr_rlc_entity.h \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair2/LAYER2/nr_rlc/nr_rlc_sdu.c \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair2/LAYER2/nr_rlc/nr_rlc_ue_manager.c \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair2/LAYER2/nr_rlc/nr_rlc_oai_api.c \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair2/LAYER2/nr_rlc/asn1_utils.c \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair2/LAYER2/nr_rlc/nr_rlc_entity_um.c \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair2/LAYER2/MAC/main.c \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair2/LAYER2/MAC/pre_processor.c \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair2/LAYER2/MAC/eNB_scheduler_fairRR.c \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair2/LAYER2/MAC/ue_procedures.c \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair2/LAYER2/MAC/mac_proto.h \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair2/LAYER2/MAC/rar_tools.c \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair2/LAYER2/MAC/eNB_scheduler_bch.c \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair2/LAYER2/MAC/mac.h \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair2/LAYER2/MAC/rar_tools_ue.c \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair2/LAYER2/MAC/config_ue.c \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair2/LAYER2/MAC/eNB_scheduler_primitives.c \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair2/LAYER2/MAC/eNB_scheduler_fairRR.h \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair2/LAYER2/MAC/eNB_scheduler_ulsch.c \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair2/LAYER2/MAC/eNB_scheduler_RA.c \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair2/LAYER2/MAC/eNB_scheduler_mch.c \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair2/LAYER2/MAC/mac_extern.h \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair2/LAYER2/MAC/eNB_scheduler_phytest.c \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair2/LAYER2/MAC/eNB_scheduler_dlsch.c \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair2/LAYER2/MAC/main_ue.c \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair2/LAYER2/MAC/config.c \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair2/LAYER2/MAC/ra_procedures.c \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair2/LAYER2/MAC/defs_NB_IoT.h \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair2/LAYER2/MAC/config_NB_IoT.h \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair2/LAYER2/MAC/eNB_scheduler.c \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair2/LAYER2/MAC/slicing/slicing.h \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair2/LAYER2/MAC/slicing/slicing_internal.h \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair2/LAYER2/MAC/slicing/slicing.c \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair2/LAYER2/MAC/l1_helpers.c \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair2/LAYER2/NR_MAC_gNB/main.c \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair2/LAYER2/NR_MAC_gNB/mac_rrc_ul.h \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_srs.c \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair2/LAYER2/NR_MAC_gNB/mac_proto.h \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair2/LAYER2/NR_MAC_gNB/gNB_scheduler.c \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_ulsch.c \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair2/LAYER2/NR_MAC_gNB/mac_rrc_ul_direct.c \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair2/LAYER2/NR_MAC_gNB/nr_mac_gNB.h \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair2/LAYER2/NR_MAC_gNB/mac_rrc_dl_handler.c \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_dlsch.c \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair2/LAYER2/NR_MAC_gNB/mac_rrc_dl_handler.h \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair2/LAYER2/NR_MAC_gNB/mac_rrc_ul_f1ap.c \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_primitives.c \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_uci.c \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair2/LAYER2/NR_MAC_gNB/config.c \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_RA.c \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_phytest.c \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_bch.c \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair2/LAYER2/openair2_proc.c \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair2/LAYER2/RLC/rlc.h \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair2/LAYER2/NR_MAC_UE/mac_vars.c \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair2/LAYER2/NR_MAC_UE/nr_ue_procedures.c \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair2/LAYER2/NR_MAC_UE/mac_defs.h \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair2/LAYER2/NR_MAC_UE/mac_proto.h \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair2/LAYER2/NR_MAC_UE/nr_ue_power_procedures.c \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair2/LAYER2/NR_MAC_UE/config_ue.c \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair2/LAYER2/NR_MAC_UE/mac_extern.h \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair2/LAYER2/NR_MAC_UE/nr_ra_procedures.c \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair2/LAYER2/NR_MAC_UE/main_ue_nr.c \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair2/LAYER2/NR_MAC_UE/nr_ue_scheduler.c \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair2/LAYER2/NR_MAC_UE/nr_ue_dci_configuration.c \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair2/LAYER2/PDCP_v10.1.0/pdcp.h \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair2/LAYER2/PDCP_v10.1.0/pdcp_primitives.h \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair2/LAYER2/PDCP_v10.1.0/pdcp.c \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair2/LAYER2/PDCP_v10.1.0/pdcp_sequence_manager.h \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair2/LAYER2/PDCP_v10.1.0/pdcp_util.h \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair2/LAYER2/nr_pdcp/nr_pdcp_ue_manager.c \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair2/LAYER2/nr_pdcp/nr_pdcp_asn1_utils.h \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair2/LAYER2/nr_pdcp/nr_pdcp_e1_api.c \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair2/LAYER2/nr_pdcp/nr_pdcp_integrity_nia2.c \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair2/LAYER2/nr_pdcp/nr_pdcp_timer_thread.c \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair2/LAYER2/nr_pdcp/nr_pdcp_e1_api.h \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair2/LAYER2/nr_pdcp/nr_pdcp_integrity_nia2.h \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair2/LAYER2/nr_pdcp/nr_pdcp_security_nea2.c \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair2/LAYER2/nr_pdcp/nr_pdcp_security_nea2.h \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair2/LAYER2/nr_pdcp/nr_pdcp_entity.c \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair2/LAYER2/nr_pdcp/nr_pdcp_timer_thread.h \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair2/LAYER2/nr_pdcp/nr_pdcp_oai_api.h \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair2/LAYER2/nr_pdcp/nr_pdcp.h \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair2/LAYER2/nr_pdcp/nr_pdcp_entity.h \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair2/LAYER2/nr_pdcp/nr_pdcp_sdu.h \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair2/LAYER2/nr_pdcp/nr_pdcp_integrity_nia1.h \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair2/LAYER2/nr_pdcp/nr_pdcp_oai_api.c \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair2/LAYER2/nr_pdcp/nr_pdcp_ue_manager.h \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair2/LAYER2/nr_pdcp/nr_pdcp_sdu.c \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair2/LAYER2/nr_pdcp/asn1_utils.c \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair2/LAYER2/nr_pdcp/nr_pdcp_integrity_nia1.c \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair2/NR_UE_PHY_INTERFACE/NR_Packet_Drop.h \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair2/NR_UE_PHY_INTERFACE/NR_Packet_Drop.c \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair2/NR_UE_PHY_INTERFACE/NR_IF_Module.h \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair2/NR_UE_PHY_INTERFACE/NR_IF_Module.c \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair2/UTIL/OPT/wireshark_headers.h \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair2/UTIL/OPT/opt.h \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair2/UTIL/OPT/probe.c \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair2/UTIL/OPT/mac_pcap.h \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair2/UTIL/OTG/otg_defs.h \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair2/UTIL/OTG/otg_tx.h \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair2/UTIL/OTG/otg_rx.h \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair2/UTIL/OTG/otg.h \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair2/UTIL/OTG/otg_models.h \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair2/UTIL/OTG/otg_externs.h \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair2/UTIL/OTG/otg_config.h \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair2/UTIL/MEM/mem_block.h \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair2/UTIL/MATH/oml.h \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair2/UTIL/MATH/oml.c \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair2/F1AP/f1ap_cu_ue_context_management.c \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair2/F1AP/f1ap_cu_interface_management.h \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair2/F1AP/f1ap_ids.h \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair2/F1AP/f1ap_du_paging.c \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair2/F1AP/f1ap_encoder.c \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair2/F1AP/f1ap_cu_rrc_message_transfer.h \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair2/F1AP/f1ap_du_interface_management.c \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair2/F1AP/f1ap_cu_paging.h \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair2/F1AP/f1ap_default_values.h \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair2/F1AP/f1ap_cu_ue_context_management.h \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair2/F1AP/f1ap_itti_messaging.c \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair2/F1AP/f1ap_cu_task.c \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair2/F1AP/f1ap_du_system_information.c \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair2/F1AP/f1ap_du_paging.h \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair2/F1AP/f1ap_du_rrc_message_transfer.c \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair2/F1AP/f1ap_encoder.h \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair2/F1AP/f1ap_cu_paging.c \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair2/F1AP/f1ap_cu_warning_message_transmission.c \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair2/F1AP/f1ap_du_ue_context_management.c \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair2/F1AP/f1ap_handlers.c \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair2/F1AP/f1ap_du_ue_context_management.h \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair2/F1AP/f1ap_common.c \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair2/F1AP/f1ap_cu_task.h \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair2/F1AP/f1ap_du_warning_message_transmission.c \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair2/F1AP/f1ap_du_rrc_message_transfer.h \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair2/F1AP/f1ap_cu_rrc_message_transfer.c \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair2/F1AP/f1ap_du_task.h \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair2/F1AP/f1ap_common.h \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair2/F1AP/f1ap_du_task.c \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair2/F1AP/f1ap_ids.c \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair2/F1AP/f1ap_itti_messaging.h \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair2/F1AP/f1ap_du_interface_management.h \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair2/F1AP/f1ap_cu_interface_management.c \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair2/GNB_APP/gnb_config.h \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair2/GNB_APP/gnb_paramdef.h \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair2/GNB_APP/L1_nr_paramdef.h \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair2/GNB_APP/RRC_nr_paramsvalues.h \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair2/GNB_APP/gnb_app.c \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair2/GNB_APP/MACRLC_nr_paramdef.h \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair2/GNB_APP/gnb_config.c \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair2/GNB_APP/gnb_app.h \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair2/PHY_INTERFACE/queue_t.h \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair2/PHY_INTERFACE/phy_interface.h \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair2/PHY_INTERFACE/IF_Module.h \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair2/PHY_INTERFACE/phy_stub_UE.c \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair2/PHY_INTERFACE/phy_interface_extern.h \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair2/PHY_INTERFACE/phy_stub_UE.h \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair2/PHY_INTERFACE/IF_Module_NB_IoT.h \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair2/PHY_INTERFACE/phy_interface_vars.h \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair2/PHY_INTERFACE/queue_t.c \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair2/PHY_INTERFACE/IF_Module.c \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair2/COMMON/pdcp_messages_def.h \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair2/COMMON/mac_rrc_primitives.h \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair2/COMMON/ngap_messages_def.h \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair2/COMMON/rlc_messages_def.h \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair2/COMMON/m3ap_messages_def.h \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair2/COMMON/sctp_messages_def.h \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair2/COMMON/x2ap_messages_types.h \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair2/COMMON/commonDef.h \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair2/COMMON/udp_messages_def.h \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair2/COMMON/nas_messages_types.h \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair2/COMMON/sctp_messages_types.h \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair2/COMMON/platform_types.h \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair2/COMMON/ngap_messages_types.h \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair2/COMMON/gtpv1_u_messages_types.h \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair2/COMMON/rlc_messages_types.h \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair2/COMMON/e1ap_messages_def.h \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair2/COMMON/phy_messages_def.h \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair2/COMMON/s1ap_messages_types.h \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair2/COMMON/networkDef.h \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair2/COMMON/f1ap_messages_types.h \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair2/COMMON/mac_messages_types.h \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair2/COMMON/udp_messages_types.h \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair2/COMMON/gtpv1_u_messages_def.h \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair2/COMMON/s1ap_messages_def.h \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair2/COMMON/rrc_messages_types.h \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair2/COMMON/e1ap_messages_types.h \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair2/COMMON/m3ap_messages_types.h \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair2/COMMON/phy_messages_types.h \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair2/COMMON/x2ap_messages_def.h \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair2/COMMON/mac_messages_def.h \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair2/COMMON/openair_defs.h \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair2/COMMON/as_message.h \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair2/COMMON/nas_messages_def.h \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair2/COMMON/pdcp_messages_types.h \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair2/COMMON/m2ap_messages_def.h \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair2/COMMON/prs_nr_paramdef.h \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair2/COMMON/f1ap_messages_def.h \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair2/COMMON/m2ap_messages_types.h \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair2/COMMON/rrc_messages_def.h \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair2/RRC/common.h \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair2/RRC/NR_UE/rrc_UE.c \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair2/RRC/NR_UE/rrc_sl_preconfig.c \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair2/RRC/NR_UE/rrc_nsa.c \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair2/RRC/NR_UE/rrc_proto.h \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair2/RRC/NR_UE/rrc_vars.h \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair2/RRC/NR_UE/sl_preconfig_paramvalues.h \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair2/RRC/NR_UE/rrc_timers_and_constants.c \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair2/RRC/NR_UE/main_ue.c \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair2/RRC/NR_UE/rrc_defs.h \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair2/RRC/NR_UE/L2_interface_ue.c \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair2/RRC/L2_INTERFACE/openair_rrc_L2_interface.h \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair2/RRC/NAS/rb_config.h \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair2/RRC/NAS/rb_config.c \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair2/RRC/NAS/nas_config.h \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair2/RRC/NAS/nas_config.c \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair2/RRC/NR/rrc_gNB_internode.c \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair2/RRC/NR/nr_rrc_defs.h \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair2/RRC/NR/cucp_cuup_if.h \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair2/RRC/NR/cucp_cuup_direct.c \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair2/RRC/NR/nr_rrc_config.c \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair2/RRC/NR/rrc_gNB_GTPV1U.h \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair2/RRC/NR/mac_rrc_dl_direct.c \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair2/RRC/NR/rrc_gNB_radio_bearers.c \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair2/RRC/NR/rrc_gNB_NGAP.h \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair2/RRC/NR/nr_rrc_proto.h \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair2/RRC/NR/nr_rrc_common.h \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair2/RRC/NR/rrc_gNB_UE_context.h \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair2/RRC/NR/MESSAGES/asn1_msg.h \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair2/RRC/NR/MESSAGES/asn1_msg.c \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair2/RRC/NR/rrc_gNB_UE_context.c \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair2/RRC/NR/cucp_cuup_e1ap.c \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair2/RRC/NR/nr_rrc_common.c \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair2/RRC/NR/rrc_gNB.c \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair2/RRC/NR/nr_rrc_config.h \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair2/RRC/NR/rrc_gNB_radio_bearers.h \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair2/RRC/NR/nr_rrc_extern.h \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair2/RRC/NR/L2_nr_interface.c \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair2/RRC/NR/rrc_gNB_reconfig.c \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair2/RRC/NR/rrc_gNB_NGAP.c \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair2/RRC/NR/mac_rrc_dl_f1ap.c \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair2/RRC/NR/rrc_gNB_GTPV1U.c \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair2/RRC/NR/mac_rrc_dl.h \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair2/RRC/NR/rrc_gNB_nsa.c \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair2/RRC/LTE/rrc_eNB_GTPV1U.c \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair2/RRC/LTE/rrc_eNB_S1AP.c \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair2/RRC/LTE/rrc_eNB_GTPV1U.h \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair2/RRC/LTE/rrc_UE.c \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair2/RRC/LTE/rrc_types.h \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair2/RRC/LTE/rrc_eNB_UE_context.c \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair2/RRC/LTE/rrc_proto.h \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair2/RRC/LTE/rrc_eNB_UE_context.h \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair2/RRC/LTE/rrc_eNB_endc.c \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair2/RRC/LTE/L2_interface_common.c \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair2/RRC/LTE/rrc_extern.h \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair2/RRC/LTE/rrc_types_NB_IoT.h \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair2/RRC/LTE/MESSAGES/asn1_msg.h \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair2/RRC/LTE/MESSAGES/asn1_msg.c \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair2/RRC/LTE/MESSAGES/asn1_msg_NB_IoT.c \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair2/RRC/LTE/rrc_vars.h \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair2/RRC/LTE/rrc_eNB.c \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair2/RRC/LTE/L2_interface.c \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair2/RRC/LTE/rrc_common.c \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair2/RRC/LTE/rrc_eNB_M2AP.h \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair2/RRC/LTE/proto_NB_IoT.h \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair2/RRC/LTE/plmn_data.h \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair2/RRC/LTE/rrc_defs.h \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair2/RRC/LTE/defs_NB_IoT.h \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair2/RRC/LTE/L2_interface_ue.c \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair2/RRC/LTE/rrc_eNB_M2AP.c \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair2/RRC/LTE/extern_NB_IoT.h \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair2/RRC/LTE/rrc_eNB_S1AP.h \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair2/ENB_APP/enb_paramdef_emtc.h \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair2/ENB_APP/enb_config.c \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair2/ENB_APP/enb_paramdef_mme.h \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair2/ENB_APP/enb_paramdef_mce.h \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair2/ENB_APP/L1_paramdef.h \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair2/ENB_APP/enb_app.h \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair2/ENB_APP/enb_config_SL.c \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair2/ENB_APP/enb_config_eMTC.c \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair2/ENB_APP/enb_paramdef_sidelink.h \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair2/ENB_APP/MACRLC_paramdef.h \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair2/ENB_APP/RRC_config_tools.c \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair2/ENB_APP/enb_paramdef.h \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair2/ENB_APP/RRC_config_tools.h \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair2/ENB_APP/enb_app.c \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair2/ENB_APP/RRC_paramsvalues.h \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair2/ENB_APP/NB_IoT_interface.h \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair2/ENB_APP/enb_config.h \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair2/E1AP/e1ap.c \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair2/E1AP/e1ap_api.c \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair2/E1AP/e1ap_common.c \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair2/E1AP/e1ap.h \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair2/E1AP/e1ap_common.h \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair2/E1AP/e1ap_default_values.h \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair2/E1AP/e1ap_api.h \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair2/E1AP/e1ap_setup.c \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair2/E1AP/e1ap_asnc.h \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair2/NR_PHY_INTERFACE/nr_sched_response.h \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair2/NR_PHY_INTERFACE/nr_sched_response.c \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair2/NR_PHY_INTERFACE/NR_IF_Module.h \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair2/NR_PHY_INTERFACE/NR_IF_Module.c \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair2/SDAP/nr_sdap/nr_sdap.h \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair2/SDAP/nr_sdap/nr_sdap.c \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair2/SDAP/nr_sdap/nr_sdap_entity.h \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair2/SDAP/nr_sdap/nr_sdap_entity.c \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair1/PHY/defs_gNB.h \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair1/PHY/impl_defs_top.h \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair1/PHY/phy_extern_nr_ue.h \
 @CMAKE_CURRENT_SOURCE_DIR@/../openair1/PHY/INIT/lte_parms.c \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair1/PHY/INIT/lte_param_init.c \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair1/PHY/INIT/nr_init_ue.c \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair1/PHY/INIT/lte_init.c \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair1/PHY/INIT/defs_NB_IoT.h \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair1/PHY/INIT/lte_init_ru.c \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair1/PHY/INIT/phy_init.h \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair1/PHY/INIT/init_top.c \
 @CMAKE_CURRENT_SOURCE_DIR@/../openair1/PHY/INIT/nr_init_ru.c \
 @CMAKE_CURRENT_SOURCE_DIR@/../openair1/PHY/INIT/nr_parms.c \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair1/PHY/INIT/lte_init_ru.c \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair1/PHY/INIT/init_top.c \
 @CMAKE_CURRENT_SOURCE_DIR@/../openair1/PHY/INIT/nr_init.c \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair1/PHY/NR_UE_TRANSPORT/pss_nr.c \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair1/PHY/NR_UE_TRANSPORT/srs_modulation_nr.h \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair1/PHY/NR_UE_TRANSPORT/nr_dlsch_decoding.c \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair1/PHY/NR_UE_TRANSPORT/nr_ulsch_ue.c \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair1/PHY/NR_UE_TRANSPORT/nr_transport_proto_ue.h \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair1/PHY/NR_UE_TRANSPORT/nr_dlsch_llr_computation.c \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair1/PHY/NR_UE_TRANSPORT/srs_modulation_nr.c \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair1/PHY/NR_UE_TRANSPORT/pucch_nr.h \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair1/PHY/NR_UE_TRANSPORT/pucch_nr.c \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair1/PHY/NR_UE_TRANSPORT/dci_nr.c \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair1/PHY/NR_UE_TRANSPORT/cic_filter_nr.c \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair1/PHY/NR_UE_TRANSPORT/nr_ue_rf_helpers.c \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair1/PHY/NR_UE_TRANSPORT/nr_initial_sync.c \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair1/PHY/NR_UE_TRANSPORT/nr_pbch.c \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair1/PHY/NR_UE_TRANSPORT/nr_dlsch_demodulation.c \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair1/PHY/NR_UE_TRANSPORT/nr_ulsch_coding.c \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair1/PHY/NR_UE_TRANSPORT/sss_nr.c \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair1/PHY/NR_UE_TRANSPORT/nr_transport_ue.h \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair1/PHY/NR_UE_TRANSPORT/cic_filter_nr.h \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair1/PHY/NR_UE_TRANSPORT/nr_prach.c \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair1/PHY/NR_UE_TRANSPORT/csi_rx.c \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair1/PHY/INIT/phy_init.h \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair1/PHY/INIT/nr_phy_init.h \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair1/PHY/INIT/nr_init_ue.c \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair1/PHY/INIT/defs_NB_IoT.h \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair1/PHY/INIT/lte_init.c \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair1/PHY/LTE_TRANSPORT/dci.h \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair1/PHY/LTE_TRANSPORT/uci_common.h \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair1/PHY/LTE_TRANSPORT/pss.c \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair1/PHY/LTE_TRANSPORT/transport_proto.h \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair1/PHY/LTE_TRANSPORT/power_control.c \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair1/PHY/LTE_TRANSPORT/prach_common.c \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair1/PHY/LTE_TRANSPORT/dci_tools.c \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair1/PHY/LTE_TRANSPORT/ulsch_demodulation.c \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair1/PHY/LTE_TRANSPORT/pmch.c \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair1/PHY/LTE_TRANSPORT/uci_NB_IoT.h \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair1/PHY/LTE_TRANSPORT/transport_common.h \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair1/PHY/LTE_TRANSPORT/pcfich.c \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair1/PHY/LTE_TRANSPORT/pucch_extern.h \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair1/PHY/LTE_TRANSPORT/pucch_common.c \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair1/PHY/LTE_TRANSPORT/rar_tools.c \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair1/PHY/LTE_TRANSPORT/mdci.h \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair1/PHY/LTE_TRANSPORT/prach_extern.h \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair1/PHY/LTE_TRANSPORT/dlsch_tbs_full.h \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair1/PHY/LTE_TRANSPORT/dci_tools_common_extern.h \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair1/PHY/LTE_TRANSPORT/pucch.c \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair1/PHY/LTE_TRANSPORT/pmch_common.c \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair1/PHY/LTE_TRANSPORT/pbch.c \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair1/PHY/LTE_TRANSPORT/phich.c \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair1/PHY/LTE_TRANSPORT/dlsch_scrambling.c \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair1/PHY/LTE_TRANSPORT/lte_mcs.c \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair1/PHY/LTE_TRANSPORT/transport_common_proto.h \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair1/PHY/LTE_TRANSPORT/sss.c \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair1/PHY/LTE_TRANSPORT/sss_gen.c \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair1/PHY/LTE_TRANSPORT/pilots.c \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair1/PHY/LTE_TRANSPORT/pcfich_common.c \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair1/PHY/LTE_TRANSPORT/dci_tools_common.c \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair1/PHY/LTE_TRANSPORT/transport_vars.h \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair1/PHY/LTE_TRANSPORT/phich_common.c \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair1/PHY/LTE_TRANSPORT/dlsch_modulation.c \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair1/PHY/LTE_TRANSPORT/dci_NB_IoT.h \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair1/PHY/LTE_TRANSPORT/group_hopping.c \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair1/PHY/LTE_TRANSPORT/if4_tools.h \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair1/PHY/LTE_TRANSPORT/uci_tools.c \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair1/PHY/LTE_TRANSPORT/prach.c \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair1/PHY/LTE_TRANSPORT/edci.c \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair1/PHY/LTE_TRANSPORT/pilots_mbsfn.c \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair1/PHY/LTE_TRANSPORT/proto_NB_IoT.h \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair1/PHY/LTE_TRANSPORT/ulsch_decoding.c \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair1/PHY/LTE_TRANSPORT/dlsch_coding.c \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair1/PHY/LTE_TRANSPORT/transport_eNB.h \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair1/PHY/LTE_TRANSPORT/defs_NB_IoT.h \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair1/PHY/LTE_TRANSPORT/dci.c \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair1/PHY/LTE_TRANSPORT/dlsch_tbs.h \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair1/PHY/defs_nr_common.h \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair1/PHY/NR_TRANSPORT/nr_ulsch.h \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair1/PHY/NR_TRANSPORT/nr_csi_rs.c \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair1/PHY/NR_TRANSPORT/pucch_rx.c \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair1/PHY/NR_TRANSPORT/nr_sch_dmrs.h \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair1/PHY/NR_TRANSPORT/nr_dlsch.h \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair1/PHY/NR_TRANSPORT/nr_dci.h \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair1/PHY/NR_TRANSPORT/nr_dci_tools.c \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair1/PHY/NR_TRANSPORT/nr_dlsch.c \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair1/PHY/NR_TRANSPORT/nr_prs.c \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair1/PHY/NR_TRANSPORT/nr_ulsch.c \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair1/PHY/NR_TRANSPORT/nr_ulsch_llr_computation.c \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair1/PHY/NR_TRANSPORT/nr_prach_common.c \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair1/PHY/NR_TRANSPORT/nr_dci.c \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair1/PHY/NR_TRANSPORT/nr_sch_dmrs.c \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair1/PHY/NR_TRANSPORT/nr_transport_proto.h \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair1/PHY/NR_TRANSPORT/nr_pss.c \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair1/PHY/NR_TRANSPORT/nr_tbs_tools.c \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair1/PHY/NR_TRANSPORT/nr_prach.h \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair1/PHY/NR_TRANSPORT/nr_ulsch_decoding.c \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair1/PHY/NR_TRANSPORT/srs_rx.c \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair1/PHY/NR_TRANSPORT/nr_ulsch_demodulation.c \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair1/PHY/NR_TRANSPORT/nr_pbch.c \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair1/PHY/NR_TRANSPORT/nr_transport_common_proto.h \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair1/PHY/NR_TRANSPORT/nr_sss.c \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair1/PHY/NR_TRANSPORT/nr_uci_tools_common.c \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair1/PHY/NR_TRANSPORT/nr_dlsch_tools.c \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair1/PHY/NR_TRANSPORT/nr_dlsch_coding.c \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair1/PHY/NR_TRANSPORT/nr_prach.c \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair1/PHY/NR_TRANSPORT/nr_scrambling.c \
 @CMAKE_CURRENT_SOURCE_DIR@/../openair1/PHY/impl_defs_top_NB_IoT.h \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair1/PHY/LTE_ESTIMATION/pss6144.h \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair1/PHY/LTE_ESTIMATION/lte_eNB_measurements.c \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair1/PHY/LTE_ESTIMATION/filt96_32.h \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair1/PHY/LTE_ESTIMATION/lte_adjust_sync_eNB.c \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair1/PHY/LTE_ESTIMATION/freq_equalization.c \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair1/PHY/LTE_ESTIMATION/lte_sync_time.c \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair1/PHY/LTE_ESTIMATION/filt96_32_khz_1dot25.h \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair1/PHY/LTE_ESTIMATION/lte_est_freq_offset.c \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair1/PHY/LTE_ESTIMATION/lte_adjust_sync_ue.c \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair1/PHY/defs_L1_NB_IoT.h \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair1/PHY/LTE_UE_TRANSPORT/srs_modulation.c \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair1/PHY/LTE_UE_TRANSPORT/transport_ue.h \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair1/PHY/LTE_UE_TRANSPORT/get_pmi.c \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair1/PHY/LTE_UE_TRANSPORT/transport_proto_ue.h \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair1/PHY/LTE_UE_TRANSPORT/drs_modulation.c \
 @CMAKE_CURRENT_SOURCE_DIR@/../openair1/PHY/LTE_ESTIMATION/lte_ul_channel_estimation.c \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair1/PHY/LTE_ESTIMATION/lte_dl_channel_estimation.c \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair1/PHY/LTE_ESTIMATION/lte_sync_time.c \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair1/PHY/LTE_ESTIMATION/freq_equalization.c \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair1/PHY/LTE_ESTIMATION/lte_adjust_sync_eNB.c \
 @CMAKE_CURRENT_SOURCE_DIR@/../openair1/PHY/LTE_ESTIMATION/lte_estimation.h \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair1/PHY/LTE_ESTIMATION/adjust_gain.c \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair1/PHY/LTE_ESTIMATION/lte_dl_mbsfn_channel_estimation.c \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair1/PHY/LTE_ESTIMATION/lte_ue_measurements.c \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair1/PHY/LTE_ESTIMATION/lte_dl_bf_channel_estimation.c \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair1/PHY/LTE_ESTIMATION/lte_sync_timefreq.c \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair1/PHY/LTE_ESTIMATION/filt16_32.h \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair1/PHY/TOOLS/cdot_prod.c \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair1/PHY/TOOLS/phy_scope_interface.h \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair1/PHY/TOOLS/phy_scope_interface.c \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair1/PHY/TOOLS/nr_phy_scope.h \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair1/PHY/TOOLS/nr_phy_scope.c \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair1/PHY/TOOLS/nr_phy_qt_scope.h \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair1/PHY/TOOLS/nr_phy_qt_scope.cpp \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair1/PHY/TOOLS/file_output.c \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair1/PHY/TOOLS/dfts_load.c \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair1/PHY/TOOLS/alaw_lut.h \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair1/PHY/TOOLS/lte_ue_scope.c \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair1/PHY/TOOLS/tools_defs.h \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair1/PHY/TOOLS/lut.c \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair1/PHY/TOOLS/signal_energy.c \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair1/PHY/TOOLS/lte_phy_scope.c \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair1/PHY/TOOLS/cadd_vv.c \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair1/PHY/TOOLS/cmult_vv.c \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair1/PHY/TOOLS/lte_enb_scope.c \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair1/PHY/TOOLS/cmult_sv.c \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair1/PHY/TOOLS/oai_dfts.c \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair1/PHY/TOOLS/sqrt.c \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair1/PHY/TOOLS/dB_routines.c \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair1/PHY/TOOLS/lte_phy_scope.h \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair1/PHY/TOOLS/log2_approx.c \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair1/PHY/defs_L1_NB_IoT.h \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair1/PHY/LTE_ESTIMATION/lte_eNB_measurements.c \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair1/PHY/MODULATION/modulation_UE.h \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair1/PHY/MODULATION/modulation_common.h \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair1/PHY/MODULATION/nr_modulation.c \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair1/PHY/MODULATION/ofdm_mod.c \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair1/PHY/MODULATION/modulation_extern.h \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair1/PHY/MODULATION/ul_7_5_kHz.c \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair1/PHY/MODULATION/nr_modulation.h \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair1/PHY/MODULATION/compute_bf_weights.c \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair1/PHY/MODULATION/beamforming.c \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair1/PHY/MODULATION/modulation_eNB.h \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair1/PHY/MODULATION/slot_fep_ul.c \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair1/PHY/MODULATION/slot_fep_nr.c \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair1/PHY/phy_vars.h \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair1/PHY/NR_REFSIG/ptrs_nr.c \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair1/PHY/NR_REFSIG/nr_gold.c \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair1/PHY/NR_REFSIG/nr_dmrs_rx.c \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair1/PHY/NR_REFSIG/pss_nr.h \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair1/PHY/NR_REFSIG/nr_gen_mod_table.c \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair1/PHY/NR_REFSIG/ul_ref_seq_nr.h \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair1/PHY/NR_REFSIG/ul_ref_seq_nr.c \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair1/PHY/NR_REFSIG/sss_nr.h \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair1/PHY/NR_REFSIG/scrambling_luts.c \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair1/PHY/NR_REFSIG/dmrs_nr.c \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair1/PHY/NR_REFSIG/refsig_defs_ue.h \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair1/PHY/NR_REFSIG/ptrs_nr.h \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair1/PHY/NR_REFSIG/nr_refsig.h \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair1/PHY/NR_REFSIG/dmrs_nr.h \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair1/PHY/NR_REFSIG/nr_mod_table.h \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair1/PHY/NR_REFSIG/ss_pbch_nr.h \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair1/PHY/NR_REFSIG/nr_gold_ue.c \
 @CMAKE_CURRENT_SOURCE_DIR@/../openair1/PHY/phy_extern_ue.h \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair1/PHY/defs_gNB.h \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair1/PHY/LTE_REFSIG/lte_dl_cell_spec.c \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair1/PHY/LTE_REFSIG/defs_NB_IoT.h \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair1/PHY/LTE_REFSIG/lte_refsig.h \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair1/PHY/LTE_REFSIG/lte_gold_mbsfn.c \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair1/PHY/LTE_REFSIG/lte_dl_mbsfn.c \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair1/PHY/LTE_REFSIG/lte_ul_ref.c \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair1/PHY/LTE_REFSIG/lte_gold.c \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair1/PHY/LTE_REFSIG/lte_dl_uespec.c \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair1/PHY/types_NB_IoT.h \
 @CMAKE_CURRENT_SOURCE_DIR@/../openair1/PHY/CODING/3gpplte_turbo_decoder.c \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair1/PHY/CODING/coding_defs.h \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair1/PHY/CODING/3gpplte_turbo_decoder_avx2_16bit.c \
 @CMAKE_CURRENT_SOURCE_DIR@/../openair1/PHY/CODING/coding_load.c \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair1/PHY/CODING/lte_interleaver_inline.h \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair1/PHY/CODING/coding_extern.h \
 @CMAKE_CURRENT_SOURCE_DIR@/../openair1/PHY/CODING/viterbi_lte.c \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair1/PHY/CODING/3gpplte_turbo_decoder_sse_16bit.c \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair1/PHY/CODING/crcext.h \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair1/PHY/CODING/viterbi.c \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair1/PHY/CODING/defs_NB_IoT.h \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair1/PHY/CODING/lte_segmentation.c \
 @CMAKE_CURRENT_SOURCE_DIR@/../openair1/PHY/CODING/crc.h \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair1/PHY/CODING/nrLDPC_defs.h \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair1/PHY/CODING/nr_rate_matching.c \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair1/PHY/CODING/viterbi.c \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair1/PHY/CODING/3gpplte_turbo_decoder_sse_8bit.c \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair1/PHY/CODING/nrLDPC_load.c \
 @CMAKE_CURRENT_SOURCE_DIR@/../openair1/PHY/CODING/nr_segmentation.c \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair1/PHY/CODING/TESTBENCH/ldpctest.c \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair1/PHY/CODING/TESTBENCH/coding_unitary_defs.h \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair1/PHY/CODING/TESTBENCH/polartest.c \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair1/PHY/CODING/TESTBENCH/smallblocktest.c \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair1/PHY/CODING/nr_polar_init.c \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair1/PHY/CODING/nrLDPC_extern.h \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair1/PHY/CODING/coding_extern.h \
 @CMAKE_CURRENT_SOURCE_DIR@/../openair1/PHY/CODING/crc_byte.c \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair1/PHY/CODING/crcext.h \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair1/PHY/CODING/nrSmallBlock/encodeSmallBlock.c \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair1/PHY/CODING/nrSmallBlock/nr_small_block_defs.h \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair1/PHY/CODING/nrSmallBlock/decodeSmallBlock.c \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair1/PHY/CODING/ccoding_byte_lte.c \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair1/PHY/CODING/lte_rate_matching.c \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair1/PHY/CODING/3gpplte_sse.c \
 @CMAKE_CURRENT_SOURCE_DIR@/../openair1/PHY/CODING/types.h \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair1/PHY/CODING/nrLDPC_encoder/ldpc240_byte.c \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair1/PHY/CODING/lte_interleaver_inline.h \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair1/PHY/CODING/nrLDPC_decoder/nrLDPC_lut.h \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair1/PHY/CODING/nrLDPC_decoder/nrLDPC_decoder.c \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair1/PHY/CODING/nrLDPC_decoder/nrLDPC_bnProc.h \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair1/PHY/CODING/nrLDPC_decoder/nrLDPC_types.h \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair1/PHY/CODING/nrLDPC_decoder/nrLDPC_tools/generator_cnProc_avx512/main.c \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair1/PHY/CODING/nrLDPC_decoder/nrLDPC_tools/generator_cnProc_avx512/cnProc_gen_BG2_avx512.c \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair1/PHY/CODING/nrLDPC_decoder/nrLDPC_tools/generator_cnProc_avx512/cnProc_gen_BG1_avx512.c \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair1/PHY/CODING/nrLDPC_decoder/nrLDPC_tools/generator_bnProc/main.c \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair1/PHY/CODING/nrLDPC_decoder/nrLDPC_tools/generator_bnProc/main128.c \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair1/PHY/CODING/nrLDPC_decoder/nrLDPC_tools/generator_bnProc/bnProcPc_gen_BG1_avx2.c \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair1/PHY/CODING/nrLDPC_decoder/nrLDPC_tools/generator_bnProc/bnProc_gen_BG2_128.c \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair1/PHY/CODING/nrLDPC_decoder/nrLDPC_tools/generator_bnProc/bnProcPc_gen_BG1_128.c \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair1/PHY/CODING/nrLDPC_decoder/nrLDPC_tools/generator_bnProc/bnProcPc_gen_BG2_avx2.c \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair1/PHY/CODING/nrLDPC_decoder/nrLDPC_tools/generator_bnProc/bnProc_gen_BG2_avx2.c \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair1/PHY/CODING/nrLDPC_decoder/nrLDPC_tools/generator_bnProc/bnProc_gen_BG1_128.c \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair1/PHY/CODING/nrLDPC_decoder/nrLDPC_tools/generator_bnProc/bnProc_gen_BG1_avx2.c \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair1/PHY/CODING/nrLDPC_decoder/nrLDPC_tools/generator_bnProc/bnProcPc_gen_BG2_128.c \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair1/PHY/CODING/nrLDPC_decoder/nrLDPC_tools/generator_cnProc/main.c \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair1/PHY/CODING/nrLDPC_decoder/nrLDPC_tools/generator_cnProc/cnProc_gen_BG1_avx2.c \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair1/PHY/CODING/nrLDPC_decoder/nrLDPC_tools/generator_cnProc/cnProc_gen_BG1_128.c \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair1/PHY/CODING/nrLDPC_decoder/nrLDPC_tools/generator_cnProc/main128.c \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair1/PHY/CODING/nrLDPC_decoder/nrLDPC_tools/generator_cnProc/cnProc_gen_BG2_128.c \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair1/PHY/CODING/nrLDPC_decoder/nrLDPC_tools/generator_cnProc/cnProc_gen_BG2_avx2.c \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair1/PHY/CODING/nrLDPC_decoder/nrLDPC_tools/generator_bnProc_avx512/main.c \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair1/PHY/CODING/nrLDPC_decoder/nrLDPC_tools/generator_bnProc_avx512/bnProcPc_gen_BG1_avx512.c \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair1/PHY/CODING/nrLDPC_decoder/nrLDPC_tools/generator_bnProc_avx512/bnProc_gen_BG2_avx512.c \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair1/PHY/CODING/nrLDPC_decoder/nrLDPC_tools/generator_bnProc_avx512/bnProc_gen_BG1_avx512.c \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair1/PHY/CODING/nrLDPC_decoder/nrLDPC_tools/generator_bnProc_avx512/bnProcPc_gen_BG2_avx512.c \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair1/PHY/CODING/nrLDPC_decoder/nrLDPC_cnProc.h \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair1/PHY/CODING/nrLDPC_decoder/nrLDPC_mPass.h \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair1/PHY/CODING/nrLDPC_decoder/nrLDPC_init.h \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair1/PHY/CODING/nrLDPC_decoder/nrLDPCdecoder_defs.h \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair1/PHY/CODING/ccoding_byte.c \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair1/PHY/CODING/3gpplte_turbo_decoder_sse_16bit.c \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair1/PHY/CODING/nrLDPC_encoder/ldpc_BG2_Zc384_byte.c \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair1/PHY/CODING/nrLDPC_encoder/ldpc_BG2_Zc80_byte.c \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair1/PHY/CODING/nrLDPC_encoder/ldpc_BG2_Zc160_byte_128.c \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair1/PHY/CODING/nrLDPC_encoder/ldpc_BG2_Zc128_byte.c \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair1/PHY/CODING/nrLDPC_encoder/ldpc_BG2_Zc120_byte.c \
 @CMAKE_CURRENT_SOURCE_DIR@/../openair1/PHY/CODING/nrLDPC_encoder/ldpc208_byte.c \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair1/PHY/CODING/nrLDPC_encoder/ldpc288_byte.c \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair1/PHY/CODING/nrLDPC_encoder/ldpc_encoder.c \
 @CMAKE_CURRENT_SOURCE_DIR@/../openair1/PHY/CODING/nrLDPC_encoder/ldpc_BG2_Zc112_byte.c \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair1/PHY/CODING/nrLDPC_encoder/ldpc_BG2_Zc208_byte.c \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair1/PHY/CODING/nrLDPC_encoder/ldpc256_byte.c \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair1/PHY/CODING/nrLDPC_encoder/ldpc_BG2_Zc104_byte.c \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair1/PHY/CODING/nrLDPC_encoder/ldpc320_byte.c \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair1/PHY/CODING/nrLDPC_encoder/ldpc_BG2_Zc192_byte.c \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair1/PHY/CODING/nrLDPC_encoder/ldpc_encode_parity_check.c \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair1/PHY/CODING/nrLDPC_encoder/ldpc_BG2_Zc176_byte.c \
 @CMAKE_CURRENT_SOURCE_DIR@/../openair1/PHY/CODING/nrLDPC_encoder/ldpc_BG2_Zc352_byte.c \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair1/PHY/CODING/nrLDPC_encoder/ldpc_BG2_Zc144_byte.c \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair1/PHY/CODING/nrLDPC_encoder/ldpc_encoder_optim.c \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair1/PHY/CODING/nrLDPC_encoder/ldpc_BG2_Zc128_byte_128.c \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair1/PHY/CODING/nrLDPC_encoder/ldpc224_byte.c \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair1/PHY/CODING/nrLDPC_encoder/ldpc_encoder_optim8seg.c \
 @CMAKE_CURRENT_SOURCE_DIR@/../openair1/PHY/CODING/nrLDPC_encoder/ldpc_generate_coefficient.c \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair1/PHY/CODING/nrLDPC_encoder/ldpc_BG2_Zc120_byte.c \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair1/PHY/CODING/nrLDPC_encoder/ldpc_BG2_Zc192_byte.c \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair1/PHY/CODING/nrLDPC_encoder/ldpc_BG2_Zc104_byte.c \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair1/PHY/CODING/nrLDPC_encoder/ldpc320_byte_128.c \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair1/PHY/CODING/nrLDPC_encoder/ldpc_BG2_Zc96_byte_128.c \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair1/PHY/CODING/nrLDPC_encoder/ldpc224_byte_128.c \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair1/PHY/CODING/nrLDPC_encoder/ldpc256_byte_128.c \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair1/PHY/CODING/nrLDPC_encoder/ldpc_BG2_Zc288_byte_128.c \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair1/PHY/CODING/nrLDPC_encoder/ldpc_BG2_Zc320_byte_128.c \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair1/PHY/CODING/nrLDPC_encoder/ldpc_BG2_Zc384_byte_128.c \
 @CMAKE_CURRENT_SOURCE_DIR@/../openair1/PHY/CODING/nrLDPC_encoder/ldpc352_byte.c \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair1/PHY/CODING/nrLDPC_encoder/ldpc384_byte.c \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair1/PHY/CODING/nrLDPC_encoder/ldpc_BG2_Zc192_byte_128.c \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair1/PHY/CODING/nrLDPC_encoder/ldpc192_byte.c \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair1/PHY/CODING/nrLDPC_encoder/ldpc192_byte_128.c \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair1/PHY/CODING/nrLDPC_encoder/ldpc_BG2_Zc320_byte.c \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair1/PHY/CODING/nrLDPC_encoder/ldpc288_byte_128.c \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair1/PHY/CODING/nrLDPC_encoder/ldpc_encoder_optim8segmulti.c \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair1/PHY/CODING/nrLDPC_encoder/ldpc_BG2_Zc144_byte.c \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair1/PHY/CODING/nrLDPC_encoder/ldpc320_byte.c \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair1/PHY/CODING/nrLDPC_encoder/ldpc384_byte_128.c \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair1/PHY/CODING/nrLDPC_encoder/ldpc_BG2_Zc72_byte.c \
 @CMAKE_CURRENT_SOURCE_DIR@/../openair1/PHY/CODING/nrLDPC_encoder/ldpc_BG2_Zc96_byte.c \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair1/PHY/CODING/nrLDPC_encoder/ldpc_BG2_Zc288_byte.c \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair1/PHY/CODING/nrLDPC_encoder/ldpc_BG2_Zc240_byte.c \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair1/PHY/CODING/nrLDPC_encoder/ldpc384_byte.c \
 @CMAKE_CURRENT_SOURCE_DIR@/../openair1/PHY/CODING/nrLDPC_encoder/ldpc176_byte.c \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair1/PHY/CODING/nrLDPC_encoder/ldpc_BG2_Zc160_byte.c \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair1/PHY/CODING/nrLDPC_encoder/ldpc_BG2_Zc256_byte_128.c \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair1/PHY/CODING/nrLDPC_encoder/ldpc_BG2_Zc224_byte_128.c \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair1/PHY/CODING/nrLDPC_encoder/ldpc352_byte_128.c \
 @CMAKE_CURRENT_SOURCE_DIR@/../openair1/PHY/CODING/nrLDPC_encoder/ldpc_BG2_Zc256_byte.c \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair1/PHY/CODING/nrLDPC_encoder/ldpc_BG2_Zc176_byte.c \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair1/PHY/CODING/nrLDPC_encoder/ldpc_BG2_Zc88_byte.c \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair1/PHY/CODING/nrLDPC_encoder/Gen_shift_value.h \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair1/PHY/CODING/nrLDPC_encoder/ldpc_BG2_Zc80_byte.c \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair1/PHY/CODING/nrLDPC_encoder/ldpc_encoder_optim8seg.c \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair1/PHY/CODING/nrLDPC_encoder/ldpc_BG2_Zc320_byte.c \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair1/PHY/CODING/nrLDPC_encoder/ldpc_BG2_Zc72_byte.c \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair1/PHY/CODING/nrLDPC_encoder/ldpc_encoder.c \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair1/PHY/CODING/nrLDPC_encoder/ldpc192_byte.c \
 @CMAKE_CURRENT_SOURCE_DIR@/../openair1/PHY/CODING/nrLDPC_encoder/ldpc_BG2_Zc224_byte.c \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair1/PHY/CODING/nrLDPC_encoder/ldpc_BG2_Zc128_byte.c \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair1/PHY/CODING/nrLDPC_encoder/ldpc_encoder_optim8segmulti.c \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair1/PHY/CODING/nrLDPC_encoder/ldpc288_byte.c \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair1/PHY/CODING/nrLDPC_encoder/ldpc_BG2_Zc240_byte.c \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair1/PHY/CODING/nrLDPC_encoder/ldpc_BG2_Zc288_byte.c \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair1/PHY/CODING/nrLDPC_encoder/ldpc224_byte.c \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair1/PHY/CODING/nrLDPC_encoder/ldpc_BG2_Zc384_byte.c \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair1/PHY/CODING/nrLDPC_encoder/ldpc_encode_parity_check.c \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair1/PHY/CODING/nrLDPC_encoder/ldpc_encoder_optim.c \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair1/PHY/CODING/nrLDPC_defs.h \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair1/PHY/CODING/lte_rate_matching.c \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair1/PHY/CODING/nr_polar_init.c \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair1/PHY/CODING/nrSmallBlock/nr_small_block_defs.h \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair1/PHY/CODING/nrSmallBlock/decodeSmallBlock.c \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair1/PHY/CODING/nrSmallBlock/encodeSmallBlock.c \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair1/PHY/CODING/ccoding_byte.c \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair1/PHY/CODING/nrLDPC_decoder_LYC/nrLDPC_decoder_LYC.h \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair1/PHY/CODING/nr_rate_matching.c \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair1/PHY/CODING/nrLDPC_extern.h \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair1/PHY/CODING/nrPolar_tools/nr_crc_byte.c \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair1/PHY/CODING/nrPolar_tools/nr_polar_sequence_pattern.c \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair1/PHY/CODING/nrPolar_tools/nr_polar_encoder.c \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair1/PHY/CODING/nrPolar_tools/nr_polar_decoder.c \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair1/PHY/CODING/nrPolar_tools/nr_polar_procedures.c \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair1/PHY/CODING/nrPolar_tools/nr_polar_pbch_defs.h \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair1/PHY/CODING/nrPolar_tools/nr_polar_interleaving_pattern.c \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair1/PHY/CODING/nrLDPC_encoder/ldpc_BG2_Zc160_byte.c \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair1/PHY/CODING/nrLDPC_encoder/ldpc256_byte.c \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair1/PHY/CODING/nrLDPC_encoder/ldpc_BG2_Zc88_byte.c \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair1/PHY/CODING/nrLDPC_encoder/ldpc_BG2_Zc208_byte.c \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair1/PHY/CODING/nrLDPC_encoder/ldpc240_byte.c \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair1/PHY/CODING/nrLDPC_encoder/ldpc_BG2_Zc352_byte_128.c \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair1/PHY/CODING/nrPolar_tools/nr_polar_defs.h \
 @CMAKE_CURRENT_SOURCE_DIR@/../openair1/PHY/CODING/nrPolar_tools/nr_polar_uci_defs.h \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair1/PHY/CODING/nrPolar_tools/nr_polar_crc.c \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair1/PHY/CODING/nrPolar_tools/nr_polar_interleaving_pattern.c \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair1/PHY/CODING/nrPolar_tools/nr_polar_decoder.c \
 @CMAKE_CURRENT_SOURCE_DIR@/../openair1/PHY/CODING/nrPolar_tools/nr_bitwise_operations.c \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair1/PHY/CODING/nrPolar_tools/nr_polar_kronecker_power_matrices.c \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair1/PHY/CODING/nrPolar_tools/nr_polar_matrix_and_array.c \
 @CMAKE_CURRENT_SOURCE_DIR@/../openair1/PHY/CODING/nrPolar_tools/nr_polar_decoding_tools.c \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair1/PHY/CODING/nrPolar_tools/nr_polar_defs.h \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair1/PHY/CODING/nrPolar_tools/nr_polar_dci_defs.h \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair1/PHY/CODING/nrPolar_tools/nr_polar_crc.c \
 @CMAKE_CURRENT_SOURCE_DIR@/../openair1/PHY/CODING/nrPolar_tools/nr_polar_kernal_operation.c \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair1/PHY/CODING/3gpplte_turbo_decoder_sse_8bit.c \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair1/PHY/CODING/nrLDPC_load.c \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair1/PHY/CODING/3gpplte_sse.c \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair1/PHY/CODING/nrPolar_tools/nr_crc_byte.c \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair1/PHY/CODING/nrPolar_tools/nr_polar_dci_defs.h \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair1/PHY/CODING/nrPolar_tools/nr_polar_pbch_defs.h \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair1/PHY/CODING/nrPolar_tools/nr_polar_procedures.c \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair1/PHY/CODING/nrPolar_tools/nr_polar_sequence_pattern.c \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair1/PHY/CODING/nrPolar_tools/nr_polar_encoder.c \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair1/PHY/CODING/nrPolar_tools/nr_polar_matrix_and_array.c \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair1/PHY/CODING/defs_NB_IoT.h \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair1/PHY/CODING/lte_segmentation.c \
 @CMAKE_CURRENT_SOURCE_DIR@/../openair1/PHY/CODING/3gpplte.c \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair1/PHY/CODING/ccoding_byte_lte.c \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair1/PHY/CODING/coding_defs.h \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair1/PHY/CODING/3gpplte_turbo_decoder_avx2_16bit.c \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair1/PHY/CODING/nrLDPC_decoder/nrLDPCdecoder_defs.h \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair1/PHY/CODING/nrLDPC_decoder/nrLDPC_tools/generator_bnProc_avx512/bnProc_gen_BG1_avx512.c \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair1/PHY/CODING/nrLDPC_decoder/nrLDPC_tools/generator_bnProc_avx512/bnProcPc_gen_BG2_avx512.c \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair1/PHY/CODING/nrLDPC_decoder/nrLDPC_tools/generator_bnProc_avx512/main.c \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair1/PHY/CODING/nrLDPC_decoder/nrLDPC_tools/generator_bnProc_avx512/bnProcPc_gen_BG1_avx512.c \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair1/PHY/CODING/nrLDPC_decoder/nrLDPC_tools/generator_bnProc_avx512/bnProc_gen_BG2_avx512.c \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair1/PHY/CODING/nrLDPC_decoder/nrLDPC_tools/generator_bnProc_avx512/CMakeLists.txt \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair1/PHY/CODING/nrLDPC_decoder/nrLDPC_tools/generator_cnProc/main.c \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair1/PHY/CODING/nrLDPC_decoder/nrLDPC_tools/generator_cnProc/cnProc_gen_BG2_avx2.c \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair1/PHY/CODING/nrLDPC_decoder/nrLDPC_tools/generator_cnProc/CMakeLists.txt \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair1/PHY/CODING/nrLDPC_decoder/nrLDPC_tools/generator_cnProc/cnProc_gen_BG1_avx2.c \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair1/PHY/CODING/nrLDPC_decoder/nrLDPC_tools/generator_bnProc/bnProcPc_gen_BG2_avx2.c \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair1/PHY/CODING/nrLDPC_decoder/nrLDPC_tools/generator_bnProc/main.c \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair1/PHY/CODING/nrLDPC_decoder/nrLDPC_tools/generator_bnProc/bnProc_gen_BG2_avx2.c \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair1/PHY/CODING/nrLDPC_decoder/nrLDPC_tools/generator_bnProc/bnProcPc_gen_BG1_avx2.c \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair1/PHY/CODING/nrLDPC_decoder/nrLDPC_tools/generator_bnProc/bnProc_gen_BG1_avx2.c \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair1/PHY/CODING/nrLDPC_decoder/nrLDPC_tools/generator_bnProc/CMakeLists.txt \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair1/PHY/CODING/nrLDPC_decoder/nrLDPC_tools/generator_cnProc_avx512/cnProc_gen_BG1_avx512.c \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair1/PHY/CODING/nrLDPC_decoder/nrLDPC_tools/generator_cnProc_avx512/main.c \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair1/PHY/CODING/nrLDPC_decoder/nrLDPC_tools/generator_cnProc_avx512/cnProc_gen_BG2_avx512.c \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair1/PHY/CODING/nrLDPC_decoder/nrLDPC_tools/generator_cnProc_avx512/CMakeLists.txt \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair1/PHY/CODING/nrLDPC_decoder/nrLDPC_tools/CMakeLists.txt \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair1/PHY/CODING/nrLDPC_decoder/nrLDPC_types.h \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair1/PHY/CODING/nrLDPC_decoder/nrLDPC_cnProc.h \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair1/PHY/CODING/nrLDPC_decoder/nrLDPC_decoder.c \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair1/PHY/CODING/nrLDPC_decoder/nrLDPC_init.h \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair1/PHY/CODING/nrLDPC_decoder/nrLDPC_mPass.h \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair1/PHY/CODING/nrLDPC_decoder/nrLDPC_lut.h \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair1/PHY/CODING/nrLDPC_decoder/nrLDPC_bnProc.h \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair1/PHY/thread_NR_UE.h \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair1/PHY/LTE_REFSIG/lte_refsig.h \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair1/PHY/LTE_REFSIG/lte_dl_uespec.c \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair1/PHY/LTE_REFSIG/lte_gold.c \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair1/PHY/LTE_REFSIG/lte_ul_ref.c \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair1/PHY/LTE_REFSIG/lte_gold_mbsfn.c \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair1/PHY/LTE_REFSIG/defs_NB_IoT.h \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair1/PHY/LTE_REFSIG/lte_dl_mbsfn.c \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair1/PHY/LTE_REFSIG/lte_dl_cell_spec.c \
 @CMAKE_CURRENT_SOURCE_DIR@/../openair1/PHY/defs_nr_UE.h \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair1/PHY/NR_REFSIG/nr_mod_table.h \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair1/PHY/NR_REFSIG/ul_ref_seq_nr.c \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair1/PHY/NR_REFSIG/ptrs_nr.h \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair1/PHY/NR_REFSIG/pss_nr.h \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair1/PHY/NR_REFSIG/scrambling_luts.c \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair1/PHY/NR_REFSIG/sss_nr.h \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair1/PHY/NR_REFSIG/nr_dmrs_rx.c \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair1/PHY/NR_REFSIG/ss_pbch_nr.h \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair1/PHY/NR_REFSIG/nr_gold_ue.c \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair1/PHY/NR_REFSIG/dmrs_nr.h \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair1/PHY/NR_REFSIG/ptrs_nr.c \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair1/PHY/NR_REFSIG/ul_ref_seq_nr.h \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair1/PHY/NR_REFSIG/nr_gold.c \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair1/PHY/NR_REFSIG/refsig_defs_ue.h \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair1/PHY/NR_REFSIG/dmrs_nr.c \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair1/PHY/NR_REFSIG/nr_refsig.h \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair1/PHY/NR_REFSIG/nr_gen_mod_table.c \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair1/PHY/defs_eNB.h \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair1/PHY/types.h \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair1/PHY/NR_TRANSPORT/nr_ulsch_llr_computation.c \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair1/PHY/NR_TRANSPORT/nr_dci.h \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair1/PHY/NR_TRANSPORT/nr_dlsch.h \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair1/PHY/NR_TRANSPORT/nr_uci_tools_common.c \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair1/PHY/NR_TRANSPORT/nr_scrambling.c \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair1/PHY/NR_TRANSPORT/nr_ulsch_demodulation.c \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair1/PHY/NR_TRANSPORT/nr_pss.c \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair1/PHY/NR_TRANSPORT/nr_ulsch_decoding.c \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair1/PHY/NR_TRANSPORT/srs_rx.c \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair1/PHY/NR_TRANSPORT/nr_sch_dmrs.h \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair1/PHY/NR_TRANSPORT/pucch_rx.c \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair1/PHY/NR_TRANSPORT/nr_transport_proto.h \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair1/PHY/NR_TRANSPORT/nr_dci_tools.c \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair1/PHY/NR_TRANSPORT/nr_dlsch.c \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair1/PHY/NR_TRANSPORT/nr_dci.c \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair1/PHY/NR_TRANSPORT/nr_csi_rs.c \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair1/PHY/NR_TRANSPORT/nr_transport_common_proto.h \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair1/PHY/NR_TRANSPORT/nr_pbch.c \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair1/PHY/NR_TRANSPORT/nr_prach.h \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair1/PHY/NR_TRANSPORT/nr_ulsch.c \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair1/PHY/NR_TRANSPORT/nr_ulsch.h \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair1/PHY/NR_TRANSPORT/nr_prs.c \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair1/PHY/NR_TRANSPORT/nr_tbs_tools.c \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair1/PHY/NR_TRANSPORT/nr_sss.c \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair1/PHY/NR_TRANSPORT/nr_sch_dmrs.c \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair1/PHY/NR_TRANSPORT/nr_prach.c \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair1/PHY/NR_TRANSPORT/nr_dlsch_tools.c \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair1/PHY/NR_TRANSPORT/nr_dlsch_coding.c \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair1/PHY/NR_TRANSPORT/nr_prach_common.c \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair1/PHY/MODULATION/slot_fep_mbsfn.c \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair1/PHY/MODULATION/modulation_common.h \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair1/PHY/MODULATION/ul_7_5_kHz_ue.c \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair1/PHY/MODULATION/nr_modulation.c \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair1/PHY/MODULATION/modulation_UE.h \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair1/PHY/MODULATION/slot_fep_nr.c \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair1/PHY/MODULATION/modulation_eNB.h \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair1/PHY/MODULATION/beamforming.c \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair1/PHY/MODULATION/modulation_extern.h \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair1/PHY/MODULATION/compute_bf_weights.c \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair1/PHY/MODULATION/ofdm_mod.c \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair1/PHY/MODULATION/gen_75KHz.cpp \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair1/PHY/MODULATION/nr_modulation.h \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair1/PHY/MODULATION/slot_fep.c \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair1/PHY/MODULATION/ul_7_5_kHz.c \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair1/PHY/MODULATION/slot_fep_ul.c \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair1/PHY/phy_extern.h \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair1/PHY/defs_UE.h \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair1/PHY/NR_UE_TRANSPORT/cic_filter_nr.h \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair1/PHY/NR_UE_TRANSPORT/nr_ulsch_coding.c \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair1/PHY/NR_UE_TRANSPORT/srs_modulation_nr.c \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair1/PHY/NR_UE_TRANSPORT/nr_transport_ue.h \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair1/PHY/NR_UE_TRANSPORT/nr_ulsch_ue.c \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair1/PHY/NR_UE_TRANSPORT/cic_filter_nr.c \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair1/PHY/NR_UE_TRANSPORT/nr_dlsch_demodulation.c \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair1/PHY/NR_UE_TRANSPORT/csi_rx.c \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair1/PHY/NR_UE_TRANSPORT/nr_initial_sync.c \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair1/PHY/NR_UE_TRANSPORT/pucch_nr.c \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair1/PHY/NR_UE_TRANSPORT/pss_nr.c \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair1/PHY/NR_UE_TRANSPORT/nr_pbch.c \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair1/PHY/NR_UE_TRANSPORT/nr_dlsch_decoding.c \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair1/PHY/NR_UE_TRANSPORT/srs_modulation_nr.h \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair1/PHY/NR_UE_TRANSPORT/pucch_nr.h \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair1/PHY/NR_UE_TRANSPORT/sss_nr.c \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair1/PHY/NR_UE_TRANSPORT/dci_nr.c \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair1/PHY/NR_UE_TRANSPORT/nr_dlsch_llr_computation.c \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair1/PHY/NR_UE_TRANSPORT/nr_prach.c \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair1/PHY/NR_UE_TRANSPORT/nr_transport_proto_ue.h \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair1/PHY/NR_UE_TRANSPORT/nr_ue_rf_helpers.c \
 @CMAKE_CURRENT_SOURCE_DIR@/../openair1/PHY/defs_RU.h \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair1/PHY/phy_vars_ue.h \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair1/PHY/LTE_TRANSPORT/transport_eNB.h \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair1/PHY/LTE_TRANSPORT/dci.h \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair1/PHY/LTE_TRANSPORT/edci.c \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair1/PHY/LTE_TRANSPORT/ulsch_decoding.c \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair1/PHY/LTE_TRANSPORT/sss.c \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair1/PHY/LTE_TRANSPORT/uci_common.h \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair1/PHY/LTE_TRANSPORT/group_hopping.c \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair1/PHY/LTE_TRANSPORT/pcfich_common.c \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair1/PHY/LTE_TRANSPORT/transport_extern.h \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair1/PHY/LTE_TRANSPORT/transport_common_proto.h \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair1/PHY/LTE_TRANSPORT/pucch_extern.h \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair1/PHY/LTE_TRANSPORT/rar_tools.c \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair1/PHY/LTE_TRANSPORT/dlsch_tbs_full.h \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair1/PHY/LTE_TRANSPORT/pmch_common.c \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair1/PHY/LTE_TRANSPORT/dlsch_modulation.c \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair1/PHY/LTE_TRANSPORT/pucch_common.c \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair1/PHY/LTE_TRANSPORT/pcfich.c \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair1/PHY/LTE_TRANSPORT/transport_vars.h \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair1/PHY/LTE_TRANSPORT/pilots_mbsfn.c \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair1/PHY/LTE_TRANSPORT/defs_NB_IoT.h \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair1/PHY/LTE_TRANSPORT/power_control.c \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair1/PHY/LTE_TRANSPORT/dci_tools.c \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair1/PHY/LTE_TRANSPORT/lte_mcs.c \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair1/PHY/LTE_TRANSPORT/transport_common.h \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair1/PHY/LTE_TRANSPORT/sss_gen.c \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair1/PHY/LTE_TRANSPORT/uci_tools.c \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair1/PHY/LTE_TRANSPORT/pss.c \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair1/PHY/LTE_TRANSPORT/pmch.c \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair1/PHY/LTE_TRANSPORT/uci_NB_IoT.h \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair1/PHY/LTE_TRANSPORT/pucch.c \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair1/PHY/LTE_TRANSPORT/phich_common.c \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair1/PHY/LTE_TRANSPORT/pbch.c \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair1/PHY/LTE_TRANSPORT/dci_tools_common_extern.h \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair1/PHY/LTE_TRANSPORT/prach_extern.h \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair1/PHY/LTE_TRANSPORT/dci.c \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair1/PHY/LTE_TRANSPORT/dci_tools_common.c \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair1/PHY/LTE_TRANSPORT/transport_proto.h \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair1/PHY/LTE_TRANSPORT/dlsch_tbs.h \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair1/PHY/LTE_TRANSPORT/dlsch_scrambling.c \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair1/PHY/LTE_TRANSPORT/prach.c \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair1/PHY/LTE_TRANSPORT/ulsch_demodulation.c \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair1/PHY/LTE_TRANSPORT/prach_common.c \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair1/PHY/LTE_TRANSPORT/phich.c \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair1/PHY/LTE_TRANSPORT/dlsch_coding.c \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair1/PHY/LTE_TRANSPORT/pilots.c \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair1/PHY/LTE_TRANSPORT/dci_NB_IoT.h \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair1/PHY/LTE_TRANSPORT/mdci.h \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair1/PHY/LTE_TRANSPORT/proto_NB_IoT.h \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair1/PHY/impl_defs_nr.h \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair1/PHY/defs_eNB.h \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair1/PHY/types_NB_IoT.h \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair1/PHY/defs_common.h \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair1/PHY/NR_UE_ESTIMATION/nr_dl_channel_estimation.c \
 @CMAKE_CURRENT_SOURCE_DIR@/../openair1/PHY/NR_UE_ESTIMATION/nr_adjust_synch_ue.c \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair1/PHY/NR_UE_ESTIMATION/filt16a_32.c \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair1/PHY/NR_UE_ESTIMATION/nr_estimation.h \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair1/PHY/NR_UE_ESTIMATION/nr_ue_measurements.c \
 @CMAKE_CURRENT_SOURCE_DIR@/../openair1/PHY/NR_UE_ESTIMATION/filt16a_32.h \
 @CMAKE_CURRENT_SOURCE_DIR@/../openair1/PHY/NR_UE_ESTIMATION/nr_adjust_gain.c \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair1/PHY/NR_UE_ESTIMATION/nr_ue_measurements.c \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair1/PHY/NR_UE_ESTIMATION/nr_estimation.h \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair1/PHY/NR_UE_ESTIMATION/nr_dl_channel_estimation.c \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair1/PHY/defs_nr_common.h \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair1/PHY/defs_common.h \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair1/PHY/phy_vars.h \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair1/PHY/LTE_UE_TRANSPORT/sldch.c \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair1/PHY/LTE_UE_TRANSPORT/pucch_ue.c \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair1/PHY/LTE_UE_TRANSPORT/pbch_ue.c \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair1/PHY/LTE_UE_TRANSPORT/dlsch_decoding.c \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair1/PHY/LTE_UE_TRANSPORT/dlsch_llr_computation_avx2.c \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair1/PHY/LTE_UE_TRANSPORT/pmch_ue.c \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair1/PHY/LTE_UE_TRANSPORT/transport_ue.h \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair1/PHY/LTE_UE_TRANSPORT/slsch.c \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair1/PHY/LTE_UE_TRANSPORT/dlsch_llr_computation.c \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair1/PHY/LTE_UE_TRANSPORT/dlsch_demodulation.c \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair1/PHY/LTE_UE_TRANSPORT/transport_proto_ue.h \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair1/PHY/LTE_UE_TRANSPORT/get_pmi.c \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair1/PHY/LTE_UE_TRANSPORT/srs_modulation.c \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair1/PHY/LTE_UE_TRANSPORT/drs_modulation.c \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair1/PHY/LTE_UE_TRANSPORT/rar_tools_ue.c \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair1/PHY/LTE_UE_TRANSPORT/phich_ue.c \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair1/PHY/LTE_UE_TRANSPORT/dci_tools_ue.c \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair1/PHY/LTE_UE_TRANSPORT/ulsch_modulation.c \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair1/PHY/LTE_UE_TRANSPORT/pcfich_ue.c \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair1/PHY/LTE_UE_TRANSPORT/slss.c \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair1/PHY/LTE_UE_TRANSPORT/linear_preprocessing_rec.h \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair1/PHY/LTE_UE_TRANSPORT/prach_ue.c \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair1/PHY/LTE_UE_TRANSPORT/linear_preprocessing_rec.c \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair1/PHY/LTE_UE_TRANSPORT/dci_ue.c \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair1/PHY/LTE_UE_TRANSPORT/ulsch_coding.c \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair1/PHY/LTE_UE_TRANSPORT/sss_ue.c \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair1/PHY/LTE_UE_TRANSPORT/initial_sync.c \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair1/PHY/LTE_UE_TRANSPORT/uci_tools_ue.c \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair1/PHY/LTE_UE_TRANSPORT/pch_ue.c \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair1/PHY/types.h \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair1/PHY/defs_UE.h \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair1/PHY/TOOLS/file_output.c \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair1/PHY/TOOLS/sqrt.c \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair1/PHY/TOOLS/cdot_prod.c \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair1/PHY/TOOLS/phy_scope_interface.c \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair1/PHY/TOOLS/oai_dfts_neon.c \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair1/PHY/TOOLS/cmult_vv.c \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair1/PHY/TOOLS/cmult_sv.c \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair1/PHY/TOOLS/dB_routines.c \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair1/PHY/TOOLS/dfts_load.c \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair1/PHY/TOOLS/log2_approx.c \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair1/PHY/TOOLS/phy_scope_interface.h \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair1/PHY/TOOLS/simde_operations.c \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair1/PHY/TOOLS/lut.c \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair1/PHY/TOOLS/nr_phy_scope.c \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair1/PHY/TOOLS/nr_phy_scope.h \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair1/PHY/TOOLS/lte_phy_scope.c \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair1/PHY/TOOLS/nr_phy_qt_scope.h \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair1/PHY/TOOLS/cadd_vv.c \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair1/PHY/TOOLS/phy_scope.h \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair1/PHY/TOOLS/signal_energy.c \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair1/PHY/TOOLS/oai_dfts.c \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair1/PHY/TOOLS/lte_ue_scope.c \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair1/PHY/TOOLS/lte_phy_scope.h \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair1/PHY/TOOLS/tools_defs.h \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair1/PHY/TOOLS/alaw_lut.h \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair1/PHY/phy_vars_nr_ue.h \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair1/PHY/phy_vars_ue.h \
 @CMAKE_CURRENT_SOURCE_DIR@/../openair1/PHY/sse_intrin.h \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair1/PHY/impl_defs_top.h \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair1/PHY/impl_defs_nr.h \
 @CMAKE_CURRENT_SOURCE_DIR@/../openair1/PHY/impl_defs_lte_NB_IoT.h \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair1/PHY/NR_ESTIMATION/nr_measurements_gNB.c \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair1/PHY/phy_extern.h \
 @CMAKE_CURRENT_SOURCE_DIR@/../openair1/PHY/NR_ESTIMATION/nr_ul_estimation.h \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair1/PHY/NR_ESTIMATION/nr_freq_equalization.c \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair1/PHY/NR_ESTIMATION/nr_measurements_gNB.c \
 @CMAKE_CURRENT_SOURCE_DIR@/../openair1/PHY/NR_ESTIMATION/nr_ul_channel_estimation.c \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair1/PHY/phy_extern_nr_ue.h \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair1/PHY/phy_vars_nr_ue.h \
-@CMAKE_CURRENT_SOURCE_DIR@/../executables/nr-ru.c \
-@CMAKE_CURRENT_SOURCE_DIR@/../executables/softmodem-common.h \
-@CMAKE_CURRENT_SOURCE_DIR@/../executables/nr-softmodem.c \
-@CMAKE_CURRENT_SOURCE_DIR@/../executables/stats.h \
-@CMAKE_CURRENT_SOURCE_DIR@/../executables/nr-gnb.c \
-@CMAKE_CURRENT_SOURCE_DIR@/../executables/nr-softmodem-common.h \
-@CMAKE_CURRENT_SOURCE_DIR@/../executables/create_tasks_mbms.c \
-@CMAKE_CURRENT_SOURCE_DIR@/../executables/create_tasks_ue.c \
-@CMAKE_CURRENT_SOURCE_DIR@/../executables/create_tasks.h \
-@CMAKE_CURRENT_SOURCE_DIR@/../executables/softmodem-common.c \
-@CMAKE_CURRENT_SOURCE_DIR@/../executables/rt_profiling.h \
-@CMAKE_CURRENT_SOURCE_DIR@/../executables/create_tasks.c \
-@CMAKE_CURRENT_SOURCE_DIR@/../executables/nr-uesoftmodem.c \
-@CMAKE_CURRENT_SOURCE_DIR@/../executables/nr-uesoftmodem.h \
-@CMAKE_CURRENT_SOURCE_DIR@/../executables/thread-common.h \
-@CMAKE_CURRENT_SOURCE_DIR@/../executables/nr-softmodem.h \
-@CMAKE_CURRENT_SOURCE_DIR@/../executables/nr-ue.c 
+@CMAKE_CURRENT_SOURCE_DIR@/../openair1/SIMULATION/ETH_TRANSPORT/proto.h \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair1/SIMULATION/ETH_TRANSPORT/multicast_link.h \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair1/SIMULATION/ETH_TRANSPORT/netlink_init.c \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair1/SIMULATION/ETH_TRANSPORT/multicast_link.c \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair1/SIMULATION/ETH_TRANSPORT/socket.h \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair1/SIMULATION/ETH_TRANSPORT/socket.c \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair1/SIMULATION/ETH_TRANSPORT/defs.h \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair1/SIMULATION/RF/adc.c \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair1/SIMULATION/RF/dac.c \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair1/SIMULATION/RF/rf.h \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair1/SIMULATION/RF/rf.c \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair1/SIMULATION/TOOLS/multipath_channel.c \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair1/SIMULATION/TOOLS/taus.c \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair1/SIMULATION/TOOLS/rangen_double.c \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair1/SIMULATION/TOOLS/scm_corrmat.h \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair1/SIMULATION/TOOLS/multipath_tv_channel.c \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair1/SIMULATION/TOOLS/abstraction.c \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair1/SIMULATION/TOOLS/random_channel.c \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair1/SIMULATION/TOOLS/phase_noise.c \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair1/SIMULATION/TOOLS/channel_sim.c \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair1/SIMULATION/TOOLS/sim.h \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair1/SCHED_NR_UE/phy_frame_config_nr.h \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair1/SCHED_NR_UE/harq_nr.c \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair1/SCHED_NR_UE/fapi_nr_ue_l1.c \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair1/SCHED_NR_UE/phy_frame_config_nr_ue.c \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair1/SCHED_NR_UE/pucch_uci_ue_nr.c \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair1/SCHED_NR_UE/harq_nr.h \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair1/SCHED_NR_UE/phy_procedures_nr_ue.c \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair1/SCHED_NR_UE/pucch_uci_ue_nr.h \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair1/SCHED_NR_UE/phy_sch_processing_time.h \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair1/SCHED_NR_UE/fapi_nr_ue_l1.h \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair1/SCHED_NR_UE/defs.h \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair1/SCHED/fapi_l1.h \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair1/SCHED/prach_procedures.c \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair1/SCHED/nfapi_nr_dummy.c \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair1/SCHED/sched_common_extern.h \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair1/SCHED/phy_procedures_lte_common.c \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair1/SCHED/phy_procedures_lte_eNb.c \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair1/SCHED/sched_common.h \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair1/SCHED/fapi_l1.c \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair1/SCHED/ru_procedures.c \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair1/SCHED/sched_eNB.h \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair1/SCHED_UE/sched_UE.h \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair1/SCHED_NR/phy_frame_config_nr.c \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair1/SCHED_NR/phy_frame_config_nr.h \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair1/SCHED_NR/nr_prach_procedures.c \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair1/SCHED_NR/fapi_nr_l1.h \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair1/SCHED_NR/phy_procedures_nr_gNB.c \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair1/SCHED_NR/sched_nr.h \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair1/SCHED_NR/fapi_nr_l1.c \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair1/SCHED_NR/nr_ru_procedures.c \
+@CMAKE_CURRENT_SOURCE_DIR@/../radio/ETHERNET/if_defs.h \
+@CMAKE_CURRENT_SOURCE_DIR@/../radio/ETHERNET/ethernet_lib.h \
+@CMAKE_CURRENT_SOURCE_DIR@/../radio/COMMON/record_player.c \
+@CMAKE_CURRENT_SOURCE_DIR@/../radio/COMMON/record_player.h \
+@CMAKE_CURRENT_SOURCE_DIR@/../radio/COMMON/common_lib.h \
+@CMAKE_CURRENT_SOURCE_DIR@/../radio/COMMON/common_lib.c \
+@CMAKE_CURRENT_SOURCE_DIR@/../radio/iqplayer/iqplayer_lib.c \
+@CMAKE_CURRENT_SOURCE_DIR@/../radio/rfsimulator/simulator.c \
+@CMAKE_CURRENT_SOURCE_DIR@/../radio/rfsimulator/rfsimulator.h \
+@CMAKE_CURRENT_SOURCE_DIR@/../radio/rfsimulator/apply_channelmod.c
 
 # This tag can be used to specify the character encoding of the source files
 # that doxygen parses. Internally doxygen uses the UTF-8 encoding. Doxygen uses
diff --git a/executables/nr-gnb.c b/executables/nr-gnb.c
index e4a9e4e5e617ae1f1e36f9fabc955d134e3c2fc6..449fdd8bea715d3d2d7ab0ae3fb726518aff48e8 100644
--- a/executables/nr-gnb.c
+++ b/executables/nr-gnb.c
@@ -19,7 +19,7 @@
  *      contact@openairinterface.org
  */
 
-/*! \file lte-enb.c
+/*! \file nr-gnb.c
  * \brief Top-level threads for gNodeB
  * \author R. Knopp, F. Kaltenberger, Navid Nikaein
  * \date 2012
diff --git a/executables/rt_profiling.h b/executables/rt_profiling.h
index e37c37bb1ef013043d07a88437261b8b694d09d5..03dcf94517592691e0c812c5bc057dc828e5baee 100644
--- a/executables/rt_profiling.h
+++ b/executables/rt_profiling.h
@@ -20,13 +20,13 @@
  *      contact@openairinterface.org
  */
 
-/*! \file time_profiling.h
- * \brief Definitions for proflling real-time scheduling 
- * \author 
+/*! \file rt_profiling.h
+ * \brief Definitions for proflling real-time scheduling
+ * \author
  * \date 2022
  * \version 0.1
  * \company Eurecom
- * \email: 
+ * \email:
  * \note
  * \warning
  */
diff --git a/executables/softmodem-common.c b/executables/softmodem-common.c
index bdf942226f9bb4d87605a9389c05d6a70d3311d0..b036caa7fc2c35ad0438f5d19c5885d2c4aa2d0b 100644
--- a/executables/softmodem-common.c
+++ b/executables/softmodem-common.c
@@ -19,7 +19,7 @@
  *      contact@openairinterface.org
  */
 
-/*! \file lte-softmodem-common.c
+/*! \file softmodem-common.c
  * \brief common code for 5G and LTE softmodem main xNB and UEs source (nr-softmodem.c, lte-softmodem.c...)
  * \author Nokia BellLabs France, francois Taburet
  * \date 2020
diff --git a/executables/softmodem-common.h b/executables/softmodem-common.h
index aa26dd1afcec794973fa492665c6915bb1adc2a8..c87370ddf6f5646a6df79bdacc694ec1a6609e21 100644
--- a/executables/softmodem-common.h
+++ b/executables/softmodem-common.h
@@ -19,13 +19,13 @@
  *      contact@openairinterface.org
  */
 
-/*! \file lte-softmodem-common.h
+/*! \file softmodem-common.h
  * \brief Top-level threads for eNodeB
- * \author 
+ * \author
  * \date 2012
  * \version 0.1
  * \company Eurecom
- * \email: 
+ * \email:
  * \note
  * \warning
  */
diff --git a/openair1/PHY/CODING/ccoding_byte.c b/openair1/PHY/CODING/ccoding_byte.c
index 576a947cff3641fffa72c01971e182e71d65eca4..dc96f6e2cafe0b0d48d69e78d75cc833e19bf03b 100644
--- a/openair1/PHY/CODING/ccoding_byte.c
+++ b/openair1/PHY/CODING/ccoding_byte.c
@@ -246,5 +246,3 @@ main() {
   printf("\n");
 }
 #endif
-
-/** @}*/
diff --git a/openair1/PHY/CODING/ccoding_byte_lte.c b/openair1/PHY/CODING/ccoding_byte_lte.c
index 5329dd42fbac596bc936a24a524ccbf9d265cfee..becdc590740a1e24721b22f0c67357afb560ee3d 100644
--- a/openair1/PHY/CODING/ccoding_byte_lte.c
+++ b/openair1/PHY/CODING/ccoding_byte_lte.c
@@ -325,5 +325,3 @@ main() {
   printf("\n");
 }
 #endif
-
-/** @}*/
diff --git a/openair1/PHY/CODING/coding_defs.h b/openair1/PHY/CODING/coding_defs.h
index 69070c5544b7a9f9104bdb383e9d634f29ac61b0..efc81620af785cf302150140b193f04bc821ff7d 100644
--- a/openair1/PHY/CODING/coding_defs.h
+++ b/openair1/PHY/CODING/coding_defs.h
@@ -504,5 +504,5 @@ int nr_rate_matching_ldpc_rx(uint32_t Tbslbrm,
 decoder_if_t phy_threegpplte_turbo_decoder;
 decoder_if_t phy_threegpplte_turbo_decoder8;
 decoder_if_t phy_threegpplte_turbo_decoder16;
-
+/** @} */
 #endif
diff --git a/openair1/PHY/CODING/coding_load.c b/openair1/PHY/CODING/coding_load.c
index 0b9e524690cc5c32067df4379a601a85738138f4..b8d130150b4b3e14c6a61ec4c72507fed677b3cc 100644
--- a/openair1/PHY/CODING/coding_load.c
+++ b/openair1/PHY/CODING/coding_load.c
@@ -19,7 +19,7 @@
  *      contact@openairinterface.org
  */
 
-/*! \file openair1/PHY/CODING
+/*! \file coding_load.c
  * \brief: load library implementing coding/decoding algorithms
  * \author Francois TABURET
  * \date 2017
diff --git a/openair1/PHY/CODING/nrLDPC_encoder/ldpc_encoder_optim.c b/openair1/PHY/CODING/nrLDPC_encoder/ldpc_encoder_optim.c
index 9a235d6a58d8cbc97e903a0f1670fdfa7b3b0922..bf1e6f3400db4157417d18735260e62c027f658b 100644
--- a/openair1/PHY/CODING/nrLDPC_encoder/ldpc_encoder_optim.c
+++ b/openair1/PHY/CODING/nrLDPC_encoder/ldpc_encoder_optim.c
@@ -19,7 +19,7 @@
  *      contact@openairinterface.org
  */
 
-/*!\file ldpc_encoder2.c
+/*! \file ldpc_encoder_optim.c
  * \brief Defines the optimized LDPC encoder
  * \author Florian Kaltenberger, Raymond Knopp, Kien le Trung (Eurecom)
  * \email openair_tech@eurecom.fr
diff --git a/openair1/PHY/CODING/nrLDPC_encoder/ldpc_encoder_optim8seg.c b/openair1/PHY/CODING/nrLDPC_encoder/ldpc_encoder_optim8seg.c
index 6ec1c05342e2bdec11463f3384a63a9183ffc4fb..03f974011c0ff63f544acf36abcd5ab96202cc8f 100644
--- a/openair1/PHY/CODING/nrLDPC_encoder/ldpc_encoder_optim8seg.c
+++ b/openair1/PHY/CODING/nrLDPC_encoder/ldpc_encoder_optim8seg.c
@@ -19,7 +19,7 @@
  *      contact@openairinterface.org
  */
 
-/*!\file ldpc_encoder2.c
+/*! \file ldpc_encoder_optim8seg.c
  * \brief Defines the optimized LDPC encoder
  * \author Florian Kaltenberger, Raymond Knopp, Kien le Trung (Eurecom)
  * \email openair_tech@eurecom.fr
diff --git a/openair1/PHY/CODING/nrLDPC_encoder/ldpc_encoder_optim8segmulti.c b/openair1/PHY/CODING/nrLDPC_encoder/ldpc_encoder_optim8segmulti.c
index 8a9df739bf27b48ab82749af8b4d47051151f413..7bbe9dfa78e3d290015d5a71afea65cf6e6965cd 100644
--- a/openair1/PHY/CODING/nrLDPC_encoder/ldpc_encoder_optim8segmulti.c
+++ b/openair1/PHY/CODING/nrLDPC_encoder/ldpc_encoder_optim8segmulti.c
@@ -19,7 +19,7 @@
  *      contact@openairinterface.org
  */
 
-/*!\file ldpc_encoder2.c
+/*! \file ldpc_encoder_optim8segmulti.c
  * \brief Defines the optimized LDPC encoder
  * \author Florian Kaltenberger, Raymond Knopp, Kien le Trung (Eurecom)
  * \email openair_tech@eurecom.fr
diff --git a/openair1/PHY/CODING/nrLDPC_load.c b/openair1/PHY/CODING/nrLDPC_load.c
index 7de9276efaf3f4681fb192a72c05f99bbaf475e9..b75c070a38a8dc2302b8050405dfb714cd969dd2 100644
--- a/openair1/PHY/CODING/nrLDPC_load.c
+++ b/openair1/PHY/CODING/nrLDPC_load.c
@@ -19,7 +19,7 @@
  *      contact@openairinterface.org
  */
 
-/*! \file openair1/PHY/CODING/coding_nr_load.c
+/*! \file nrLDPC_load.c
  * \brief: load library implementing coding/decoding algorithms
  * \author Francois TABURET
  * \date 2020
diff --git a/openair1/PHY/CODING/nrPolar_tools/nr_polar_procedures.c b/openair1/PHY/CODING/nrPolar_tools/nr_polar_procedures.c
index 4df755749583e821737ba0c91fff5f1772774767..0b2f379493fc3abc0e2cf05826a1fdb58a69da9b 100644
--- a/openair1/PHY/CODING/nrPolar_tools/nr_polar_procedures.c
+++ b/openair1/PHY/CODING/nrPolar_tools/nr_polar_procedures.c
@@ -19,7 +19,7 @@
  *      contact@openairinterface.org
  */
 
-/*!\file PHY/CODING/nrPolar_tools/nr_polar_procedures.h
+/*! \file nr_polar_procedures.c
  * \brief
  * \author Turker Yilmaz
  * \date 2018
diff --git a/openair1/PHY/CODING/nr_polar_init.c b/openair1/PHY/CODING/nr_polar_init.c
index bbc51f416b6415a4e359a9a033bf23fd446aaaac..23830cc010111faa9369eb768762215be796364f 100644
--- a/openair1/PHY/CODING/nr_polar_init.c
+++ b/openair1/PHY/CODING/nr_polar_init.c
@@ -19,7 +19,7 @@
  *      contact@openairinterface.org
  */
 
-/*!\file PHY/CODING/nr_polar_init.h
+/*! \file nr_polar_init.c
  * \brief
  * \author Turker Yilmaz, Raymond Knopp
  * \date 2018
@@ -28,7 +28,7 @@
  * \email turker.yilmaz@eurecom.fr, raymond.knopp@eurecom.fr
  * \note
  * \warning
-*/
+ */
 
 #include "PHY/CODING/nrPolar_tools/nr_polar_defs.h"
 #include "PHY/NR_TRANSPORT/nr_dci.h"
diff --git a/openair1/PHY/INIT/phy_init.h b/openair1/PHY/INIT/phy_init.h
index 2116ba9c02e78fc690de7ae65df6d10cdaa073c9..daf6eafa42e8098eb994f01b090724116d1cf996 100644
--- a/openair1/PHY/INIT/phy_init.h
+++ b/openair1/PHY/INIT/phy_init.h
@@ -42,7 +42,7 @@
  */
 
 /*!
-\fn int l1_top_init_eNB(void)
+\fn l1_north_init_eNB
 \brief Initialize north interface for L1
 @returns 0 on success
  */
@@ -74,9 +74,9 @@ int init_lte_ue_signal(PHY_VARS_UE *phy_vars_ue,
 /*!
 \brief Allocate and initialize the PHY variables releated to the transport channel buffers (UL/DL)
 @param ue Pointer to UE L1 context
-@param abstraction flag Indicates that abstraction is used in L1
+@param abstraction_flag Indicates that abstraction is used in L1
 */
-void init_lte_ue_transport(PHY_VARS_UE *ue,int absraction_flag);
+void init_lte_ue_transport(PHY_VARS_UE *ue, int abstraction_flag);
 
 /*!
 \brief Allocate and initialize the PHY variables relevant to the LTE implementation (eNB).
@@ -99,14 +99,20 @@ int phy_init_lte_eNB(PHY_VARS_eNB *phy_vars_eNb,
  */
 void phy_free_lte_eNB(PHY_VARS_eNB *phy_vars_eNb);
 
-/** \brief Configure LTE_DL_FRAME_PARMS with components derived after initial synchronization (MIB decoding + primary/secondary synch).
-\details The basically allows configuration of \f$N_{\mathrm{RB}}^{\mathrm{DL}}\f$, the cell id  \f$N_{\mathrm{ID}}^{\mathrm{cell}}\f$, the normal/extended prefix mode, the frame type (FDD/TDD), \f$N_{\mathrm{cp}}\f$, the number of TX antennas at eNB (\f$p\f$) and the number of PHICH groups, \f$N_{\mathrm{group}}^{\mathrm{PHICH}}\f$
-@param lte_frame_parms pointer to LTE parameter structure
+/** \brief Configure LTE_DL_FRAME_PARMS with components derived after initial synchronization (MIB decoding + primary/secondary
+synch). \details The basically allows configuration of \f$N_{\mathrm{RB}}^{\mathrm{DL}}\f$, the cell id
+\f$N_{\mathrm{ID}}^{\mathrm{cell}}\f$, the normal/extended prefix mode, the frame type (FDD/TDD), \f$N_{\mathrm{cp}}\f$, the number
+of TX antennas at eNB (\f$p\f$) and the number of PHICH groups, \f$N_{\mathrm{group}}^{\mathrm{PHICH}}\f$
+@param Mod_id
+@param CC_id
+@param eutra_band
 @param N_RB_DL Number of DL resource blocks
 @param Nid_cell Cell ID
 @param Ncp Normal/Extended Prefix flag
 @param p_eNB Number of eNB TX antennas
 @param phich_config Pointer to PHICH_CONFIG_COMMON
+@param dl_CarrierFreq
+@param ul_CarrierFreq
  */
 void phy_config_mib_eNB(int                    Mod_id,
                         int                    CC_id,
@@ -296,6 +302,7 @@ void phy_config_sib13_eNB(module_id_t Mod_id,
 @param index index of the node
 @param cba_rnti rnti for the cba transmission
 @param num_active_cba_groups num active cba group
+@param cba_group_id
  */
 void  phy_config_cba_rnti (module_id_t Mod_id,int CC_id,eNB_flag_t eNB_flag, uint8_t index, rnti_t cba_rnti, uint8_t cba_group_id, uint8_t num_active_cba_groups);
 
@@ -390,5 +397,6 @@ void phy_config_update_sib13_request(PHY_Config_t *phy_config);
 int init_frame_parms(LTE_DL_FRAME_PARMS *frame_parms,uint8_t osf);
 void dump_frame_parms(LTE_DL_FRAME_PARMS *frame_parms);
 void fill_subframe_mask(PHY_VARS_eNB *eNB);
+/** @}*/
 
 #endif
diff --git a/openair1/PHY/LTE_ESTIMATION/lte_estimation.h b/openair1/PHY/LTE_ESTIMATION/lte_estimation.h
index fc4ee1890503c7133b1845c75df915049ba553aa..4bc9b5d87560b061830a9ab67df0a9a5d6041131 100644
--- a/openair1/PHY/LTE_ESTIMATION/lte_estimation.h
+++ b/openair1/PHY/LTE_ESTIMATION/lte_estimation.h
@@ -32,13 +32,6 @@
 /*!\brief Timing drift hysterisis in samples*/
 #define SYNCH_HYST 2
 
-/*!
-\brief This function is used for time-frequency scanning prior to complete cell search.  It scans
-over the entire LTE band for maximum correlation and keeps the 10 best scores and the correspoding frequency offset (5 kHz granularity) for each of the 3 PSS sequences.
-\param ue Pointer to UE variables
-\param band index of lte band
-\param DL_freq Central RF Frequency in Hz
-*/
 /*!
 \brief This function allocates memory needed for the synchronization.
 \param frame_parms LTE DL frame parameter structure
@@ -151,6 +144,7 @@ This function computes the time domain channel response, finds the peak and adju
 \param frame_parms LTE DL frame parameter structure
 \param phy_vars_ue Pointer to UE PHY data structure
 \param eNb_id
+\param subframe
 \param clear If clear==1 moving average filter is reset
 \param coef Coefficient of the moving average filter (Q1.15)
  */
@@ -181,6 +175,7 @@ void lte_ue_measurements_emul(PHY_VARS_UE *phy_vars_ue,
 
 /*! \brief Function to return the path-loss based on the UE cell-specific reference signal strength and transmission power of eNB
 @param Mod_id Module ID for UE
+@param CC_id
 @param eNB_index Index of eNB on which to act
 @returns Path loss in dB
  */
diff --git a/openair1/PHY/LTE_ESTIMATION/lte_sync_time.c b/openair1/PHY/LTE_ESTIMATION/lte_sync_time.c
index 8587bf1f7019f8e9f6831d0f87f5955b5ca0f938..e80de0798d42adad2aea6bb081c7fe97e8bfda45 100644
--- a/openair1/PHY/LTE_ESTIMATION/lte_sync_time.c
+++ b/openair1/PHY/LTE_ESTIMATION/lte_sync_time.c
@@ -118,10 +118,8 @@ void lte_sync_time_free(void) {
 
 #define SHIFT 17
 
-
-int lte_sync_time(int **rxdata, ///rx data in time domain
-                  LTE_DL_FRAME_PARMS *frame_parms,
-                  int *eNB_id) {
+int lte_sync_time(int **rxdata, LTE_DL_FRAME_PARMS *frame_parms, int *eNB_id)
+{
   // perform a time domain correlation using the oversampled sync sequence
   unsigned int n, ar, s, peak_pos, peak_val, sync_source;
   struct complexd sync_out[3]= {{0}}, sync_out2[3]= {{0}};
@@ -168,7 +166,6 @@ int lte_sync_time(int **rxdata, ///rx data in time domain
   return(peak_pos);
 }
 
-
 int ru_sync_time_init(RU_t *ru) { // LTE_UE_COMMON *common_vars
   /*
   int16_t dmrs[2048];
diff --git a/openair1/PHY/LTE_REFSIG/defs_NB_IoT.h b/openair1/PHY/LTE_REFSIG/defs_NB_IoT.h
index 8f0b7b8c4ce7fb48a2dcabc360d9756ddae98d7e..13c6130ad3286474dfdd1bb6c434c77d82453692 100644
--- a/openair1/PHY/LTE_REFSIG/defs_NB_IoT.h
+++ b/openair1/PHY/LTE_REFSIG/defs_NB_IoT.h
@@ -1,16 +1,16 @@
 /*******************************************************************************
 
  *******************************************************************************/
-/*! \file PHY/LTE_REFSIG/defs_NB_IoT.c
-* \function called by lte_dl_cell_spec_NB_IoT.c ,	 TS 36-211, V13.4.0 2017-02
-* \author M. KANJ
-* \date 2017
-* \version 0.0
-* \company bcom
-* \email: matthieu.kanj@b-com.com
-* \note
-* \warning
-*/
+/*! \file defs_NB_IoT.h
+ * \function called by lte_dl_cell_spec_NB_IoT.c ,	 TS 36-211, V13.4.0 2017-02
+ * \author M. KANJ
+ * \date 2017
+ * \version 0.0
+ * \company bcom
+ * \email: matthieu.kanj@b-com.com
+ * \note
+ * \warning
+ */
 
 /* Definitions for NB_IoT Reference signals */
 
@@ -58,3 +58,4 @@ void generate_ul_ref_sigs_rx_NB_IoT(void);
 void free_ul_ref_sigs_NB_IoT(void);
 			 
 #endif
+/** @}*/
diff --git a/openair1/PHY/LTE_REFSIG/lte_dl_uespec.c b/openair1/PHY/LTE_REFSIG/lte_dl_uespec.c
index 1b9c17133c050dceea97d78391659003db3f30d0..e2cff34682218c254bfa24d14ef9ba2b30b2da25 100644
--- a/openair1/PHY/LTE_REFSIG/lte_dl_uespec.c
+++ b/openair1/PHY/LTE_REFSIG/lte_dl_uespec.c
@@ -19,16 +19,16 @@
  *      contact@openairinterface.org
  */
 
-/*! \file PHY/LTE_REFSIG/lte_dl_ue_spec.c
-* \brief Top-level routines for generating UE-specific Reference signals from 36-211, V11.3.0 2013-06
-* \author R. Knopp X. Jiang
-* \date 2015
-* \version 0.1
-* \company Eurecom
-* \email: knopp@eurecom.fr xiwen.jiang@eurecom.fr
-* \note
-* \warning
-*/
+/*! \file lte_dl_uespec.c
+ * \brief Top-level routines for generating UE-specific Reference signals from 36-211, V11.3.0 2013-06
+ * \author R. Knopp X. Jiang
+ * \date 2015
+ * \version 0.1
+ * \company Eurecom
+ * \email: knopp@eurecom.fr xiwen.jiang@eurecom.fr
+ * \note
+ * \warning
+ */
 
 #include <stdio.h>
 #include <stdlib.h>
diff --git a/openair1/PHY/LTE_REFSIG/lte_refsig.h b/openair1/PHY/LTE_REFSIG/lte_refsig.h
index 9d3bae503b2348c110de5bf92acedac939313429..b0535927980e732397f3461db25e19e61c537aad 100644
--- a/openair1/PHY/LTE_REFSIG/lte_refsig.h
+++ b/openair1/PHY/LTE_REFSIG/lte_refsig.h
@@ -186,3 +186,4 @@ int lte_generate_srs(int32_t **txdataF,
 
 
 #endif
+/** @}*/
diff --git a/openair1/PHY/LTE_TRANSPORT/prach_extern.h b/openair1/PHY/LTE_TRANSPORT/prach_extern.h
index 04b956d440733218ec0c7134700a5e7fa26865b6..6f9654fbb048d0f1a3dae375c5f4a46e89e91b0c 100644
--- a/openair1/PHY/LTE_TRANSPORT/prach_extern.h
+++ b/openair1/PHY/LTE_TRANSPORT/prach_extern.h
@@ -76,12 +76,4 @@ uint8_t get_fid_prach_tdd(module_id_t Mod_id,uint8_t tdd_map_index);
 
 int is_prach_subframe(LTE_DL_FRAME_PARMS *frame_parms,uint32_t frame, uint8_t subframe);
 
-
-void compute_prach_seq(uint16_t rootSequenceIndex,
-		       uint8_t prach_ConfigIndex,
-		       uint8_t zeroCorrelationZoneConfig,
-		       uint8_t highSpeedFlag,
-		       frame_type_t frame_type,
-		       uint32_t X_u[64][839]);
-
 #endif
diff --git a/openair1/PHY/LTE_TRANSPORT/proto_NB_IoT.h b/openair1/PHY/LTE_TRANSPORT/proto_NB_IoT.h
index d8b17ff26386e5f825c514faee7d8a0cbfbae331..9edfd257d941a89b4425c429bb20a7ad77ec77a7 100644
--- a/openair1/PHY/LTE_TRANSPORT/proto_NB_IoT.h
+++ b/openair1/PHY/LTE_TRANSPORT/proto_NB_IoT.h
@@ -19,7 +19,7 @@
  *      contact@openairinterface.org
  */
 
-/*! \file PHY/LTE_TRANSPORT/proto.h
+/*! \file proto_NB_IoT.h
  * \brief Function prototypes for PHY physical/transport channel processing and generation V8.6 2009-03
  * \author R. Knopp, F. Kaltenberger
  * \date 2011
diff --git a/openair1/PHY/LTE_TRANSPORT/transport_common.h b/openair1/PHY/LTE_TRANSPORT/transport_common.h
index 135f3cdf4bb1b372e775f42e4cbfe04590748568..bc90d44e1ed7986a6e86defcd05ac07d1168119c 100644
--- a/openair1/PHY/LTE_TRANSPORT/transport_common.h
+++ b/openair1/PHY/LTE_TRANSPORT/transport_common.h
@@ -19,16 +19,16 @@
  *      contact@openairinterface.org
  */
 
-/*! \file PHY/LTE_TRANSPORT/transport_commont.h
-* \brief data structures for PDSCH/DLSCH/PUSCH/ULSCH physical and transport channel descriptors (TX/RX) common to both eNB/UE
-* \author R. Knopp
-* \date 2011
-* \version 0.1
-* \company Eurecom
-* \email: raymond.knopp@eurecom.fr, florian.kaltenberger@eurecom.fr, oscar.tonelli@yahoo.it
-* \note
-* \warning
-*/
+/*! \file transport_common.h
+ * \brief data structures for PDSCH/DLSCH/PUSCH/ULSCH physical and transport channel descriptors (TX/RX) common to both eNB/UE
+ * \author R. Knopp
+ * \date 2011
+ * \version 0.1
+ * \company Eurecom
+ * \email: raymond.knopp@eurecom.fr, florian.kaltenberger@eurecom.fr, oscar.tonelli@yahoo.it
+ * \note
+ * \warning
+ */
 #ifndef __TRANSPORT_COMMON__H__
 #define __TRANSPORT_COMMON__H__
 #include "PHY/defs_common.h"
diff --git a/openair1/PHY/LTE_TRANSPORT/transport_common_proto.h b/openair1/PHY/LTE_TRANSPORT/transport_common_proto.h
index 57a7b2ec915eabc2e8458abfb3a8810fbf0d2369..4fd2c4f040491da8cfefafd7dbcb10fbcc31bed4 100644
--- a/openair1/PHY/LTE_TRANSPORT/transport_common_proto.h
+++ b/openair1/PHY/LTE_TRANSPORT/transport_common_proto.h
@@ -55,7 +55,7 @@ uint8_t get_I_TBS(uint8_t I_MCS);
 unsigned char get_I_TBS_UL(unsigned char I_MCS);
 
 /** \brief Compute Q (modulation order) based on downlink I_MCS. Implements table 7.1.7.1-1 from 36.213.
-    @param I_MCS
+    @param mcs
     @param nb_rb
     @return Transport block size */
 uint32_t get_TBS_DL(uint8_t mcs, uint16_t nb_rb);
@@ -63,7 +63,7 @@ uint32_t get_TBS_DL(uint8_t mcs, uint16_t nb_rb);
 uint16_t find_nb_rb_DL(uint8_t mcs, uint32_t bytes, uint16_t nb_rb_max, uint16_t rb_gran);
 
 /** \brief Compute Q (modulation order) based on uplink I_MCS. Implements table 7.1.7.1-1 from 36.213.
-    @param I_MCS
+    @param mcs
     @param nb_rb
     @return Transport block size */
 uint32_t get_TBS_UL(uint8_t mcs, uint16_t nb_rb);
@@ -212,45 +212,16 @@ int is_prach_subframe(LTE_DL_FRAME_PARMS *frame_parms,frame_t frame, uint8_t sub
 
 /*!
   \brief Helper for MAC, returns number of available PRACH in TDD for a particular configuration index
-  @param frame_parms Pointer to LTE_DL_FRAME_PARMS structure
   @returns 0-5 depending on number of available prach
 */
 uint8_t get_num_prach_tdd(module_id_t Mod_id);
 
-/*!
-  \brief Return the PRACH format as a function of the Configuration Index and Frame type.
-  @param prach_ConfigIndex PRACH Configuration Index
-  @param frame_type 0-FDD, 1-TDD
-  @returns 0-1 accordingly
-*/
-/*
-uint8_t get_prach_fmt(uint8_t prach_ConfigIndex,frame_type_t frame_type);
-*/
-
 /*!
   \brief Helper for MAC, returns frequency index of PRACH resource in TDD for a particular configuration index
-  @param frame_parms Pointer to LTE_DL_FRAME_PARMS structure
   @returns 0-5 depending on number of available prach
 */
 uint8_t get_fid_prach_tdd(module_id_t Mod_id,uint8_t tdd_map_index);
 
-/*!
-  \brief Comp ute DFT of PRACH ZC sequences.  Used for generation of prach in UE and reception of PRACH in eNB.
-  @param rootSequenceIndex PRACH root sequence
-  #param prach_ConfigIndex PRACH Configuration Index
-  @param zeroCorrelationZoneConfig PRACH ncs_config
-  @param highSpeedFlat PRACH High-Speed Flag
-  @param frame_type TDD/FDD flag
-  @param Xu DFT output
-*/
-void compute_prach_seq(uint16_t rootSequenceIndex,
-                       uint8_t prach_ConfigIndex,
-                       uint8_t zeroCorrelationZoneConfig,
-                       uint8_t highSpeedFlag,
-                       frame_type_t frame_type,
-                       uint32_t X_u[64][839]);
-
-
 void init_prach_tables(int N_ZC);
 
 /*!
diff --git a/openair1/PHY/LTE_TRANSPORT/transport_eNB.h b/openair1/PHY/LTE_TRANSPORT/transport_eNB.h
index d18f3ee44258dfdb459a85a54cf1c052795f3ad9..e356db540e895d541eda52be6f248fec82cebcdc 100644
--- a/openair1/PHY/LTE_TRANSPORT/transport_eNB.h
+++ b/openair1/PHY/LTE_TRANSPORT/transport_eNB.h
@@ -19,16 +19,16 @@
  *      contact@openairinterface.org
  */
 
-/*! \file PHY/LTE_TRANSPORT/defs.h
-* \brief data structures for PDSCH/DLSCH/PUSCH/ULSCH physical and transport channel descriptors (TX/RX)
-* \author R. Knopp
-* \date 2011
-* \version 0.1
-* \company Eurecom
-* \email: raymond.knopp@eurecom.fr, florian.kaltenberger@eurecom.fr, oscar.tonelli@yahoo.it
-* \note
-* \warning
-*/
+/*! \file transport_eNB.h
+ * \brief data structures for PDSCH/DLSCH/PUSCH/ULSCH physical and transport channel descriptors (TX/RX)
+ * \author R. Knopp
+ * \date 2011
+ * \version 0.1
+ * \company Eurecom
+ * \email: raymond.knopp@eurecom.fr, florian.kaltenberger@eurecom.fr, oscar.tonelli@yahoo.it
+ * \note
+ * \warning
+ */
 #ifndef __TRANSPORT_ENB__H__
 #define __TRANSPORT_ENB__H__
 #include "transport_common.h"
diff --git a/openair1/PHY/LTE_TRANSPORT/transport_proto.h b/openair1/PHY/LTE_TRANSPORT/transport_proto.h
index d40fb5db77e33fc16b6f32a04229c7ae9046f1fa..a6765c0fe2373bc60adb5ab03f754ff80a97ebec 100644
--- a/openair1/PHY/LTE_TRANSPORT/transport_proto.h
+++ b/openair1/PHY/LTE_TRANSPORT/transport_proto.h
@@ -306,39 +306,29 @@ int mch_modulation_khz_1dot25(int32_t **txdataF,
                    LTE_DL_FRAME_PARMS *frame_parms,
                    LTE_eNB_DLSCH_t *dlsch);
 
-
 /** \brief Top-level generation function for eNB TX of MBSFN
     @param phy_vars_eNB Pointer to eNB variables
+@param proc
     @param a Pointer to transport block
-    @param abstraction_flag
 
 */
 void generate_mch_khz_1dot25(PHY_VARS_eNB *phy_vars_eNB,L1_rxtx_proc_t *proc,uint8_t *a);
 
-
 /** \brief Top-level generation function for eNB TX of MBSFN
     @param phy_vars_eNB Pointer to eNB variables
+@param proc
     @param a Pointer to transport block
-    @param abstraction_flag
-
 */
 void generate_mch(PHY_VARS_eNB *phy_vars_eNB,L1_rxtx_proc_t *proc,uint8_t *a);
 
 /** \brief This function generates the frequency-domain pilots (cell-specific downlink reference signals)
     @param phy_vars_eNB Pointer to eNB variables
-    @param proc Pointer to RXn-TXnp4 proc information
     @param mcs MCS for MBSFN
     @param ndi new data indicator
-    @param rdvix
+    @param rvidx
 */
 void fill_eNB_dlsch_MCH(PHY_VARS_eNB *phy_vars_eNB,int mcs,int ndi,int rvidx);
 
-/** \brief This function generates the frequency-domain pilots (cell-specific downlink reference signals)
-    @param phy_vars_ue Pointer to UE variables
-    @param mcs MCS for MBSFN
-    @param eNB_id index of eNB in ue variables
-*/
-
 /** \brief This function generates the frequency-domain pilots (cell-specific downlink reference signals)
     for N subframes.
     @param phy_vars_eNB Pointer to eNB variables
@@ -426,7 +416,7 @@ void dci_encoding(uint8_t *a,
                   uint16_t rnti);
 
 /*! \brief Top-level DCI entry point. This routine codes an set of DCI PDUs and performs PDCCH modulation, interleaving and mapping.
-  \param num_dci  Number of pdcch symbols
+  \param num_pdcch_symbols
   \param num_dci  Number of DCI pdus to encode
   \param dci_alloc Allocation vectors for each DCI pdu
   \param n_rnti n_RNTI (see )
@@ -525,7 +515,6 @@ void rx_ulsch(PHY_VARS_eNB *eNB,
   @param phy_vars_eNB Pointer to eNB top-level descriptor
   @param proc Pointer to RXTX proc variables
   @param UE_id ID of UE transmitting this PUSCH
-  @param subframe Index of subframe for PUSCH
   @param control_only_flag Receive PUSCH with control information only
   @param Nbundled Nbundled parameter for ACK/NAK scrambling from 36-212/36-213
   @param llr8_flag If 1, indicate that the 8-bit turbo decoder should be used
@@ -584,7 +573,6 @@ uint32_t rx_pucch(PHY_VARS_eNB *phy_vars_eNB,
                   int     br_flag
                  );
 
-
 /*!
   \brief Process PRACH waveform
   @param phy_vars_eNB Pointer to eNB top-level descriptor. If NULL, then this is an RRU
@@ -592,6 +580,7 @@ uint32_t rx_pucch(PHY_VARS_eNB *phy_vars_eNB,
   @param max_preamble most likely preamble
   @param max_preamble_energy Estimated Energy of most likely preamble
   @param max_preamble_delay Estimated Delay of most likely preamble
+  @param avg_preamble_energy
   @param Nf System frame number
   @param tdd_mapindex Index of PRACH resource in Table 5.7.1-4 (TDD)
   @param br_flag indicator to act on eMTC PRACH
diff --git a/openair1/PHY/LTE_UE_TRANSPORT/drs_modulation.c b/openair1/PHY/LTE_UE_TRANSPORT/drs_modulation.c
index dc2df52bf44a3cc6b8a8e9fe9cfdf45c6eb08d7c..eb029aa429c799c03600ce702c57b0864ca4687d 100644
--- a/openair1/PHY/LTE_UE_TRANSPORT/drs_modulation.c
+++ b/openair1/PHY/LTE_UE_TRANSPORT/drs_modulation.c
@@ -19,16 +19,16 @@
  *      contact@openairinterface.org
  */
 
-/*! \file PHY/LTE_TRANSPORT/drs_modulation.c
-* \brief Top-level routines for generating the Demodulation Reference Signals from 36-211, V8.6 2009-03
-* \author R. Knopp, F. Kaltenberger, A. Bhamri
-* \date 2011
-* \version 0.1
-* \company Eurecom
-* \email: knopp@eurecom.fr,florian.kaltenberger@eurecom.fr,ankit.bhamri@eurecom.fr
-* \note
-* \warning
-*/
+/*! \file drs_modulation.c
+ * \brief Top-level routines for generating the Demodulation Reference Signals from 36-211, V8.6 2009-03
+ * \author R. Knopp, F. Kaltenberger, A. Bhamri
+ * \date 2011
+ * \version 0.1
+ * \company Eurecom
+ * \email: knopp@eurecom.fr,florian.kaltenberger@eurecom.fr,ankit.bhamri@eurecom.fr
+ * \note
+ * \warning
+ */
 #include "PHY/defs_UE.h"
 #include "PHY/phy_extern_ue.h"
 #include "PHY/sse_intrin.h"
diff --git a/openair1/PHY/LTE_UE_TRANSPORT/srs_modulation.c b/openair1/PHY/LTE_UE_TRANSPORT/srs_modulation.c
index 0faec65f7084278cb0d2c0ac5138937ecd09f572..c13c050a6ee26963e1d5688476e0ce5009a5336a 100644
--- a/openair1/PHY/LTE_UE_TRANSPORT/srs_modulation.c
+++ b/openair1/PHY/LTE_UE_TRANSPORT/srs_modulation.c
@@ -19,16 +19,16 @@
  *      contact@openairinterface.org
  */
 
-/*! \file PHY/LTE_TRANSPORT/srs_modulation.c
-* \brief Top-level routines for generating sounding reference signal (SRS) V8.6 2009-03
-* \author R. Knopp, F. Kaltenberger
-* \date 2011
-* \version 0.1
-* \company Eurecom
-* \email: knopp@eurecom.fr, florian.kaltenberger@eurecom.fr
-* \note
-* \warning
-*/
+/*! \file srs_modulation.c
+ * \brief Top-level routines for generating sounding reference signal (SRS) V8.6 2009-03
+ * \author R. Knopp, F. Kaltenberger
+ * \date 2011
+ * \version 0.1
+ * \company Eurecom
+ * \email: knopp@eurecom.fr, florian.kaltenberger@eurecom.fr
+ * \note
+ * \warning
+ */
 #include "PHY/defs_UE.h"
 #include "PHY/phy_extern.h"
 #include "common/utils/LOG/log.h"
diff --git a/openair1/PHY/LTE_UE_TRANSPORT/transport_proto_ue.h b/openair1/PHY/LTE_UE_TRANSPORT/transport_proto_ue.h
index 36da4ccab0e8860d4ca875053faa38cfaf34b5cf..18eb375f62b753f7347cceb103c8583689cacf8b 100644
--- a/openair1/PHY/LTE_UE_TRANSPORT/transport_proto_ue.h
+++ b/openair1/PHY/LTE_UE_TRANSPORT/transport_proto_ue.h
@@ -101,18 +101,6 @@ void qpsk_qpsk(int16_t *stream0_in,
                int16_t *rho01,
                int32_t length);
 
-/** \brief This function perform LLR computation for dual-stream (QPSK/QPSK) transmission.
-    @param frame_parms Frame descriptor structure
-    @param rxdataF_comp Compensated channel output
-    @param rxdataF_comp_i Compensated channel output for interference
-    @param rho_i Correlation between channel of signal and inteference
-    @param dlsch_llr llr output
-    @param symbol OFDM symbol index in sub-frame
-    @param first_symbol_flag flag to indicate this is the first symbol of the dlsch
-    @param nb_rb number of RBs for this allocation
-    @param pbch_pss_sss_adj Number of channel bits taken by PBCH/PSS/SSS
-    @param llr128p pointer to pointer to symbol in dlsch_llr*/
-
 void qpsk_llr(int16_t *stream0_in,
               int16_t *stream0_out,
               int length);
@@ -158,6 +146,7 @@ void qpsk_qam16(int16_t *stream0_in,
     @param rxdataF_comp Compensated channel output
     @param rxdataF_comp_i Compensated channel output for interference
     @param rho_i Correlation between channel of signal and inteference
+@param dl_ch_mag_i
     @param dlsch_llr llr output
     @param symbol OFDM symbol index in sub-frame
     @param first_symbol_flag flag to indicate this is the first symbol of the dlsch
@@ -194,6 +183,7 @@ void qpsk_qam64(int16_t *stream0_in,
     @param frame_parms Frame descriptor structure
     @param rxdataF_comp Compensated channel output
     @param rxdataF_comp_i Compensated channel output for interference
+@param dl_ch_mag_i
     @param rho_i Correlation between channel of signal and inteference
     @param dlsch_llr llr output
     @param symbol OFDM symbol index in sub-frame
@@ -231,13 +221,13 @@ void qam16_qpsk(short *stream0_in,
     @param frame_parms Frame descriptor structure
     @param rxdataF_comp Compensated channel output
     @param rxdataF_comp_i Compensated channel output for interference
-    @param ch_mag   Input from scaled channel magnitude square of h0'*g0
+    @param dl_ch_mag   Input from scaled channel magnitude square of h0'*g0
     @param rho_i Correlation between channel of signal and inteference
     @param dlsch_llr llr output
     @param symbol OFDM symbol index in sub-frame
     @param first_symbol_flag flag to indicate this is the first symbol of the dlsch
     @param nb_rb number of RBs for this allocation
-    @param pbch_pss_sss_adj Number of channel bits taken by PBCH/PSS/SSS
+    @param pbch_pss_sss_adjust Number of channel bits taken by PBCH/PSS/SSS
     @param llr16p pointer to pointer to symbol in dlsch_llr*/
 int dlsch_16qam_qpsk_llr(LTE_DL_FRAME_PARMS *frame_parms,
                          int **rxdataF_comp,
@@ -271,14 +261,14 @@ void qam16_qam16(short *stream0_in,
     @param frame_parms Frame descriptor structure
     @param rxdataF_comp Compensated channel output
     @param rxdataF_comp_i Compensated channel output for interference
-    @param ch_mag   Input from scaled channel magnitude square of h0'*g0
-    @param ch_mag_i Input from scaled channel magnitude square of h0'*g1
+    @param dl_ch_mag   Input from scaled channel magnitude square of h0'*g0
+    @param dl_ch_mag_i Input from scaled channel magnitude square of h0'*g1
     @param rho_i Correlation between channel of signal and inteference
     @param dlsch_llr llr output
     @param symbol OFDM symbol index in sub-frame
     @param first_symbol_flag flag to indicate this is the first symbol of the dlsch
     @param nb_rb number of RBs for this allocation
-    @param pbch_pss_sss_adj Number of channel bits taken by PBCH/PSS/SSS
+    @param pbch_pss_sss_adjust Number of channel bits taken by PBCH/PSS/SSS
     @param llr16p pointer to pointer to symbol in dlsch_llr*/
 int dlsch_16qam_16qam_llr(LTE_DL_FRAME_PARMS *frame_parms,
                           int **rxdataF_comp,
@@ -313,14 +303,14 @@ void qam16_qam64(short *stream0_in,
     @param frame_parms Frame descriptor structure
     @param rxdataF_comp Compensated channel output
     @param rxdataF_comp_i Compensated channel output for interference
-    @param ch_mag   Input from scaled channel magnitude square of h0'*g0
-    @param ch_mag_i Input from scaled channel magnitude square of h0'*g1
+    @param dl_ch_mag   Input from scaled channel magnitude square of h0'*g0
+    @param dl_ch_mag_i Input from scaled channel magnitude square of h0'*g1
     @param rho_i Correlation between channel of signal and inteference
     @param dlsch_llr llr output
     @param symbol OFDM symbol index in sub-frame
     @param first_symbol_flag flag to indicate this is the first symbol of the dlsch
     @param nb_rb number of RBs for this allocation
-    @param pbch_pss_sss_adj Number of channel bits taken by PBCH/PSS/SSS
+    @param pbch_pss_sss_adjust Number of channel bits taken by PBCH/PSS/SSS
     @param llr16p pointer to pointer to symbol in dlsch_llr*/
 int dlsch_16qam_64qam_llr(LTE_DL_FRAME_PARMS *frame_parms,
                           int **rxdataF_comp,
@@ -353,13 +343,13 @@ void qam64_qpsk(short *stream0_in,
     @param frame_parms Frame descriptor structure
     @param rxdataF_comp Compensated channel output
     @param rxdataF_comp_i Compensated channel output for interference
-    @param ch_mag   Input from scaled channel magnitude square of h0'*g0
+    @param dl_ch_mag   Input from scaled channel magnitude square of h0'*g0
     @param rho_i Correlation between channel of signal and inteference
     @param dlsch_llr llr output
     @param symbol OFDM symbol index in sub-frame
     @param first_symbol_flag flag to indicate this is the first symbol of the dlsch
     @param nb_rb number of RBs for this allocation
-    @param pbch_pss_sss_adj Number of channel bits taken by PBCH/PSS/SSS
+    @param pbch_pss_sss_adjust Number of channel bits taken by PBCH/PSS/SSS
     @param llr16p pointer to pointer to symbol in dlsch_llr*/
 int dlsch_64qam_qpsk_llr(LTE_DL_FRAME_PARMS *frame_parms,
                          int **rxdataF_comp,
@@ -409,14 +399,14 @@ void qam64_qam16_avx2(short *stream0_in,
     @param frame_parms Frame descriptor structure
     @param rxdataF_comp Compensated channel output
     @param rxdataF_comp_i Compensated channel output for interference
-    @param ch_mag   Input from scaled channel magnitude square of h0'*g0
-    @param ch_mag_i Input from scaled channel magnitude square of h0'*g1
+    @param dl_ch_mag   Input from scaled channel magnitude square of h0'*g0
+    @param dl_ch_mag_i Input from scaled channel magnitude square of h0'*g1
     @param rho_i Correlation between channel of signal and inteference
     @param dlsch_llr llr output
     @param symbol OFDM symbol index in sub-frame
     @param first_symbol_flag flag to indicate this is the first symbol of the dlsch
     @param nb_rb number of RBs for this allocation
-    @param pbch_pss_sss_adj Number of channel bits taken by PBCH/PSS/SSS
+    @param pbch_pss_sss_adjust Number of channel bits taken by PBCH/PSS/SSS
     @param llr16p pointer to pointer to symbol in dlsch_llr*/
 int dlsch_64qam_16qam_llr(LTE_DL_FRAME_PARMS *frame_parms,
                           int **rxdataF_comp,
@@ -467,15 +457,16 @@ void qam64_qam64_avx2(int32_t *stream0_in,
     @param frame_parms Frame descriptor structure
     @param rxdataF_comp Compensated channel output
     @param rxdataF_comp_i Compensated channel output for interference
-    @param ch_mag   Input from scaled channel magnitude square of h0'*g0
-    @param ch_mag_i Input from scaled channel magnitude square of h0'*g1
+    @param dl_ch_mag   Input from scaled channel magnitude square of h0'*g0
+    @param dl_ch_mag_i Input from scaled channel magnitude square of h0'*g1
     @param rho_i Correlation between channel of signal and inteference
     @param dlsch_llr llr output
     @param symbol OFDM symbol index in sub-frame
     @param first_symbol_flag flag to indicate this is the first symbol of the dlsch
     @param nb_rb number of RBs for this allocation
-    @param pbch_pss_sss_adj Number of channel bits taken by PBCH/PSS/SSS
-    @param llr16p pointer to pointer to symbol in dlsch_llr*/
+    @param pbch_pss_sss_adjust Number of channel bits taken by PBCH/PSS/SSS
+@param llr_offset
+*/
 int dlsch_64qam_64qam_llr(LTE_DL_FRAME_PARMS *frame_parms,
                           int **rxdataF_comp,
                           int **rxdataF_comp_i,
@@ -490,7 +481,6 @@ int dlsch_64qam_64qam_llr(LTE_DL_FRAME_PARMS *frame_parms,
                           //short **llr16p,
                           uint32_t llr_offset);
 
-
 /** \brief This function generates log-likelihood ratios (decoder input) for single-stream QPSK received waveforms.
     @param frame_parms Frame descriptor structure
     @param rxdataF_comp Compensated channel output
@@ -499,7 +489,6 @@ int dlsch_64qam_64qam_llr(LTE_DL_FRAME_PARMS *frame_parms,
     @param first_symbol_flag
     @param nb_rb number of RBs for this allocation
     @param pbch_pss_sss_adj Number of channel bits taken by PBCH/PSS/SSS
-    @param llr128p pointer to pointer to symbol in dlsch_llr
     @param beamforming_mode beamforming mode
 */
 int32_t dlsch_qpsk_llr(LTE_DL_FRAME_PARMS *frame_parms,
@@ -514,16 +503,6 @@ int32_t dlsch_qpsk_llr(LTE_DL_FRAME_PARMS *frame_parms,
 
 /**
    \brief This function generates log-likelihood ratios (decoder input) for single-stream 16QAM received waveforms
-   @param frame_parms Frame descriptor structure
-   @param rxdataF_comp Compensated channel output
-   @param dlsch_llr llr output
-   @param dl_ch_mag Squared-magnitude of channel in each resource element position corresponding to allocation and weighted for mid-point in 16QAM constellation
-   @param symbol OFDM symbol index in sub-frame
-   @param first_symbol_flag
-   @param nb_rb number of RBs for this allocation
-   @param pbch_pss_sss_adjust  Adjustment factor in RE for PBCH/PSS/SSS allocations
-   @param llr128p pointer to pointer to symbol in dlsch_llr
-   @param beamforming_mode beamforming mode
 */
 
 int32_t dlsch_qpsk_llr_SIC(LTE_DL_FRAME_PARMS *frame_parms,
@@ -551,14 +530,16 @@ void dlsch_16qam_llr(LTE_DL_FRAME_PARMS *frame_parms,
    \brief This function generates log-likelihood ratios (decoder input) for single-stream 16QAM received waveforms
    @param frame_parms Frame descriptor structure
    @param rxdataF_comp Compensated channel output
+@param sic_buffer
+@param rho_i
+@param num_pdcch_symbols
    @param dlsch_llr llr output
-   @param dl_ch_mag Squared-magnitude of channel in each resource element position corresponding to allocation, weighted by first mid-point of 64-QAM constellation
-   @param dl_ch_magb Squared-magnitude of channel in each resource element position corresponding to allocation, weighted by second mid-point of 64-QAM constellation
-   @param symbol OFDM symbol index in sub-frame
-   @param first_symbol_flag
+   @param dl_ch_mag Squared-magnitude of channel in each resource element position corresponding to allocation, weighted by first
+mid-point of 64-QAM constellation
    @param nb_rb number of RBs for this allocation
-   @param pbch_pss_sss_adjust PBCH/PSS/SSS RE adjustment (in REs)
-   @param beamforming_mode beamforming mode
+@param subframe
+@param  mod_order_0
+@param rb_alloc
 */
 void dlsch_16qam_llr_SIC (LTE_DL_FRAME_PARMS *frame_parms,
                           int32_t **rxdataF_comp,
@@ -1021,9 +1002,10 @@ void dlsch_scale_channel(int32_t **dl_ch_estimates_ext,
     @param dlsch_llr Pointer to LLR values computed by dlsch_demodulation
     @param lte_frame_parms Pointer to frame descriptor
     @param dlsch Pointer to DLSCH descriptor
+@param harq_process
     @param frame Frame number
     @param subframe Subframe number
-    @param num_pdcch_symbols Number of PDCCH symbols
+@param harq_pid
     @param is_crnti indicates if PDSCH belongs to a CRNTI (necessary for parallelizing decoding threads)
     @param llr8_flag If 1, indicate that the 8-bit turbo decoder should be used
     @returns 0 on success, 1 on unsuccessful decoding
@@ -1045,7 +1027,8 @@ uint32_t dlsch_decoding_emul(PHY_VARS_UE *phy_vars_ue,
                              PDSCH_t dlsch_id,
                              uint8_t eNB_id);
 
-/** \brief This function is the top-level entry point to PDSCH demodulation, after frequency-domain transformation and channel estimation.  It performs
+/** \brief This function is the top-level entry point to PDSCH demodulation, after frequency-domain transformation and channel
+estimation.  It performs
     - RB extraction (signal and channel estimates)
     - channel compensation (matched filtering)
     - RE extraction (pilot, PBCH, synch. signals)
@@ -1056,11 +1039,17 @@ uint32_t dlsch_decoding_emul(PHY_VARS_UE *phy_vars_ue,
     @param type Type of PDSCH (SI_PDSCH,RA_PDSCH,PDSCH,PMCH)
     @param eNB_id eNb index (Nid1) 0,1,2
     @param eNB_id_i Interfering eNB index (Nid1) 0,1,2, or 3 in case of MU-MIMO IC receiver
+@param frame
     @param subframe Subframe number
     @param symbol Symbol on which to act (within sub-frame)
     @param first_symbol_flag set to 1 on first DLSCH symbol
-    @param rx_type. rx_type=RX_IC_single_stream will enable interference cancellation of a second stream when decoding the first stream. In case of TM1, 2, 5, and this can cancel interference from a neighbouring cell given by eNB_id_i. In case of TM5, eNB_id_i should be set to n_connected_eNB to perform multi-user interference cancellation. In case of TM3, eNB_id_i should be set to eNB_id to perform co-channel interference cancellation; this option should be used together with an interference cancellation step [...]. In case of TM3, if rx_type=RX_IC_dual_stream, both streams will be decoded by applying the IC single stream receiver twice.
+    @param rx_type rx_type=RX_IC_single_stream will enable interference cancellation of a second stream when decoding the first
+stream. In case of TM1, 2, 5, and this can cancel interference from a neighbouring cell given by eNB_id_i. In case of TM5, eNB_id_i
+should be set to n_connected_eNB to perform multi-user interference cancellation. In case of TM3, eNB_id_i should be set to eNB_id
+to perform co-channel interference cancellation; this option should be used together with an interference cancellation step [...].
+In case of TM3, if rx_type=RX_IC_dual_stream, both streams will be decoded by applying the IC single stream receiver twice.
     @param i_mod Modulation order of the interfering stream
+    @param harq_pid
 */
 int32_t rx_pdsch(PHY_VARS_UE *phy_vars_ue,
                  PDSCH_t type,
@@ -1085,6 +1074,7 @@ int32_t rx_pdcch(PHY_VARS_UE *ue,
   @param phy_vars_ue Pointer to UE variables
   @param[out] pss_ext contain the PSS signals after the extraction
   @param[out] sss_ext contain the SSS signals after the extraction
+@param subframe
   @returns 0 on success
 */
 int pss_sss_extract(PHY_VARS_UE *phy_vars_ue,
@@ -1095,6 +1085,7 @@ int pss_sss_extract(PHY_VARS_UE *phy_vars_ue,
 /*! \brief Extract only PSS resource elements
   @param phy_vars_ue Pointer to UE variables
   @param[out] pss_ext contain the PSS signals after the extraction
+@param subframe
   @returns 0 on success
 */
 int pss_only_extract(PHY_VARS_UE *phy_vars_ue,
@@ -1104,6 +1095,7 @@ int pss_only_extract(PHY_VARS_UE *phy_vars_ue,
 /*! \brief Extract only SSS resource elements
   @param phy_vars_ue Pointer to UE variables
   @param[out] sss_ext contain the SSS signals after the extraction
+@param subframe
   @returns 0 on success
 */
 int sss_only_extract(PHY_VARS_UE *phy_vars_ue,
@@ -1179,7 +1171,7 @@ void generate_sldch(PHY_VARS_UE *ue,SLDCH_t *sldch,int frame_tx,int subframe_tx)
 
 /*! \brief Top-level generation route for Sidelink Shared Channel
   \param ue pointer to UE descriptor
-  \param slsch pointer to SLSCH configuration and payload
+  \param slss pointer to SLSCH configuration and payload
   \param frame_tx Frame number
   \param subframe_tx subframe number
 */
@@ -1261,13 +1253,13 @@ uint8_t get_I_TBS(uint8_t I_MCS);
 unsigned char get_I_TBS_UL(unsigned char I_MCS);
 
 /** \brief Compute Q (modulation order) based on downlink I_MCS. Implements table 7.1.7.1-1 from 36.213.
-    @param I_MCS
+    @param mcs
     @param nb_rb
     @return Transport block size */
 uint32_t get_TBS_DL(uint8_t mcs, uint16_t nb_rb);
 
 /** \brief Compute Q (modulation order) based on uplink I_MCS. Implements table 7.1.7.1-1 from 36.213.
-    @param I_MCS
+    @param  mcs
     @param nb_rb
     @return Transport block size */
 uint32_t get_TBS_UL(uint8_t mcs, uint16_t nb_rb);
@@ -1321,10 +1313,13 @@ uint8_t I_TBS2I_MCS(uint8_t I_TBS);
 uint8_t SE2I_TBS(float SE,
                  uint8_t N_PRB,
                  uint8_t symbPerRB);
-/** \brief This function generates the sounding reference symbol (SRS) for the uplink according to 36.211 v8.6.0. If IFFT_FPGA is defined, the SRS is quantized to a QPSK sequence.
+/** \brief This function generates the sounding reference symbol (SRS) for the uplink according to 36.211 v8.6.0. If IFFT_FPGA is
+defined, the SRS is quantized to a QPSK sequence.
     @param frame_parms LTE DL Frame Parameters
     @param soundingrs_ul_config_dedicated Dynamic configuration from RRC during Connection Establishment
     @param txdataF pointer to the frequency domain TX signal
+@param amp
+@param subframe
     @returns 0 on success*/
 int generate_srs(LTE_DL_FRAME_PARMS *frame_parms,
                  SOUNDINGRS_UL_CONFIG_DEDICATED *soundingrs_ul_config_dedicated,
@@ -1361,13 +1356,6 @@ int generate_drs_pusch(PHY_VARS_UE *ue,
                        unsigned int nb_rb,
                        uint8_t ant);
 
-
-/*!
-  \brief This function initializes the Group Hopping, Sequence Hopping and nPRS sequences for PUCCH/PUSCH according to 36.211 v8.6.0. It should be called after configuration of UE (reception of SIB2/3) and initial configuration of eNB (or after reconfiguration of cell-specific parameters).
-  @param frame_parms Pointer to a LTE_DL_FRAME_PARMS structure (eNB or UE)*/
-void init_ul_hopping(LTE_DL_FRAME_PARMS *frame_parms);
-
-
 /*!
   \brief This function implements the initialization of paging parameters for UE (See Section 7, 36.304).It must be called after setting IMSImod1024 during UE startup and after receiving SIB2
   @param ue Pointer to UE context
@@ -1464,16 +1452,17 @@ void generate_RIV_tables(void);
   N_RB_DL, PHICH_CONFIG and Nid_cell) and the UE can begin decoding PDCCH and DLSCH SI to retrieve the rest.  Once these
   parameters are know, the routine calls some basic initialization routines (cell-specific reference signals, etc.)
   @param phy_vars_ue Pointer to UE variables
+@param mode
 */
 int initial_sync(PHY_VARS_UE *phy_vars_ue, runmode_t mode);
 
-
 /*!
   \brief Encoding of PUSCH/ACK/RI/ACK from 36-212.
   @param a Pointer to ulsch SDU
-  @param frame_parms Pointer to Frame parameters
-  @param ulsch Pointer to ulsch descriptor
+@param phy_vars_ue
   @param harq_pid HARQ process ID
+@param eNB_id
+@param  subframe_rx
   @param tmode Transmission mode (1-7)
   @param control_only_flag Generate PUSCH with control information only
   @param Nbundled Parameter for ACK/NAK bundling (36.213 Section 7.3)
@@ -1630,44 +1619,40 @@ int is_prach_subframe(LTE_DL_FRAME_PARMS *frame_parms,frame_t frame, uint8_t sub
   @param phy_vars_ue Pointer to ue top-level descriptor
   @param eNB_id Index of destination eNB
   @param subframe subframe index to operate on
-  @param index of preamble (0-63)
   @param Nf System frame number
   @returns 0 on success
 
 */
 int32_t generate_prach(PHY_VARS_UE *phy_vars_ue,uint8_t eNB_id,uint8_t subframe,uint16_t Nf);
 
-
 /*!
   \brief Helper for MAC, returns number of available PRACH in TDD for a particular configuration index
-  @param frame_parms Pointer to LTE_DL_FRAME_PARMS structure
   @returns 0-5 depending on number of available prach
 */
 uint8_t get_num_prach_tdd(module_id_t Mod_id);
 
 /*!
-  \brief Return the PRACH format as a function of the Configuration Index and Frame type.
-  @param prach_ConfigIndex PRACH Configuration Index
-  @param frame_type 0-FDD, 1-TDD
+  \brief Return the PRACH format as a function of the Configuration Index and Frame type
+  @param prach_ConfigIndex Configuration Index
+  @param frame_type 0-FDD 1-TDD
   @returns 0-1 accordingly
 */
 uint8_t get_prach_fmt(uint8_t prach_ConfigIndex,frame_type_t frame_type);
 
 /*!
-  \brief Helper for MAC, returns frequency index of PRACH resource in TDD for a particular configuration index
-  @param frame_parms Pointer to LTE_DL_FRAME_PARMS structure
+  \brief Helper for MAC returns frequency index of PRACH resource in TDD for a particular configuration index
   @returns 0-5 depending on number of available prach
 */
 uint8_t get_fid_prach_tdd(module_id_t Mod_id,uint8_t tdd_map_index);
 
 /*!
-  \brief Comp ute DFT of PRACH ZC sequences.  Used for generation of prach in UE and reception of PRACH in eNB.
+  \brief Comp ute DFT of PRACH ZC sequences.  Used for generation of prach in UE and reception of PRACH in eNB
   @param rootSequenceIndex PRACH root sequence
-  #param prach_ConfigIndex PRACH Configuration Index
+  @param prach_ConfigIndex PRACH Configuration Index
   @param zeroCorrelationZoneConfig PRACH ncs_config
-  @param highSpeedFlat PRACH High-Speed Flag
-  @param frame_type TDD/FDD flag
-  @param Xu DFT output
+  @param highSpeedFlag PRACH High-Speed Flag
+  @param frame_type TDD-FDD flag
+  @param X_u DFT output
 */
 void compute_prach_seq(uint16_t rootSequenceIndex,
                        uint8_t prach_ConfigIndex,
diff --git a/openair1/PHY/LTE_UE_TRANSPORT/transport_ue.h b/openair1/PHY/LTE_UE_TRANSPORT/transport_ue.h
index a10e0515a5898dfbf9483a1c9d400b16b2f3fd62..2fb8e676210299ecfe66cbe542c84fc5c08cf215 100644
--- a/openair1/PHY/LTE_UE_TRANSPORT/transport_ue.h
+++ b/openair1/PHY/LTE_UE_TRANSPORT/transport_ue.h
@@ -19,16 +19,16 @@
  *      contact@openairinterface.org
  */
 
-/*! \file PHY/LTE_TRANSPORT/defs.h
-* \brief data structures for PDSCH/DLSCH/PUSCH/ULSCH physical and transport channel descriptors (TX/RX)
-* \author R. Knopp
-* \date 2011
-* \version 0.1
-* \company Eurecom
-* \email: raymond.knopp@eurecom.fr, florian.kaltenberger@eurecom.fr, oscar.tonelli@yahoo.it
-* \note
-* \warning
-*/
+/*! \file transport_ue.h
+ * \brief data structures for PDSCH/DLSCH/PUSCH/ULSCH physical and transport channel descriptors (TX/RX)
+ * \author R. Knopp
+ * \date 2011
+ * \version 0.1
+ * \company Eurecom
+ * \email: raymond.knopp@eurecom.fr, florian.kaltenberger@eurecom.fr, oscar.tonelli@yahoo.it
+ * \note
+ * \warning
+ */
 #ifndef __TRANSPORT_UE__H__
 #define __TRANSPORT_UE__H__
 #include "PHY/defs_UE.h"
diff --git a/openair1/PHY/MODULATION/modulation_common.h b/openair1/PHY/MODULATION/modulation_common.h
index 06b595fbe32e7903efba7057529c13f4bafe7291..a131cdae63cde6d9e1163d8a23becc1b2dc8327b 100644
--- a/openair1/PHY/MODULATION/modulation_common.h
+++ b/openair1/PHY/MODULATION/modulation_common.h
@@ -28,16 +28,15 @@
 */
 
 /**
-\fn void PHY_ofdm_mod(int *input,int *output,int fftsize,unsigned char nb_symbols,unsigned short nb_prefix_samples,Extension_t etype)
-This function performs OFDM modulation with cyclic extension or zero-padding.
-
-@param input The sequence input samples in the frequency-domain.  This is a concatenation of the input symbols in SIMD redundant format
-@param output The time-domain output signal
-@param fftsize size of OFDM symbol size (\f$N_d\f$)
-@param nb_symbols The number of OFDM symbols in the block
-@param nb_prefix_samples The number of prefix/suffix/zero samples
-@param etype Type of extension (CYCLIC_PREFIX,CYCLIC_SUFFIX,ZEROS)
-
+   \fn void PHY_ofdm_mod(int *input,int *output,int fftsize,unsigned char nb_symbols,unsigned short nb_prefix_samples,Extension_t
+   etype) This function performs OFDM modulation with cyclic extension or zero-padding
+   @param input The sequence input samples in the frequency-domain  This is a concatenation of the input symbols in SIMD redundant
+   format
+   @param output The time-domain output signal
+   @param fftsize size of OFDM symbol size (\f$N_d\f$)
+   @param nb_symbols The number of OFDM symbols in the block
+   @param nb_prefix_samples The number of prefix/suffix/zero samples
+   @param etype Type of extension (CYCLIC_PREFIX,CYCLIC_SUFFIX,ZEROS)
 */
 void PHY_ofdm_mod(int *input,
                   int *output,
diff --git a/openair1/PHY/MODULATION/modulation_eNB.h b/openair1/PHY/MODULATION/modulation_eNB.h
index b5b148b802feabc713af48a9086d1026f66c0c24..59ef26f306d7d4c7860b42e1ecb9a10ef1dfdb19 100644
--- a/openair1/PHY/MODULATION/modulation_eNB.h
+++ b/openair1/PHY/MODULATION/modulation_eNB.h
@@ -44,7 +44,6 @@ void remove_7_5_kHz(RU_t *ru,uint8_t subframe);
 after beamforming
     @param beam_weights Beamforming weights applied on each
 antenna element and each carrier
-    @param slot Slot number
     @param symbol Symbol index on which to act
     @param aa physical antenna index
     @param p logical antenna index
@@ -58,18 +57,18 @@ int beam_precoding(int32_t **txdataF,
 		   int aa,
 		   int p,
                    int l1_id);
-				   
+
 /** \brief This function performs beamforming precoding for common
  * data for only one eNB, fdragon
     @param txdataF Table of pointers for frequency-domain TX signals
     @param txdataF_BF Table of pointers for frequency-domain TX signals
-    @param frame_parms Frame descriptor structure
-after beamforming
     @param beam_weights Beamforming weights applied on each
 antenna element and each carrier
-    @param slot Slot number
-    @param symbol Symbol index on which to act
-    @param aa physical antenna index*/
+    @param subframe sf number
+    @param  nb_antenna_ports physical antennas
+@param nb_tx
+@param frame_parms
+*/
 int beam_precoding_one_eNB(int32_t **txdataF,
                            int32_t **txdataF_BF,
                            int32_t **beam_weights[NUMBER_OF_eNB_MAX+1][15],
diff --git a/openair1/PHY/NR_ESTIMATION/nr_ul_estimation.h b/openair1/PHY/NR_ESTIMATION/nr_ul_estimation.h
index 4934498a4a6c3a7d5b6d09afa9108c42130e2913..e3210552fc68dbd44d94df02309f1bda33be3a44 100644
--- a/openair1/PHY/NR_ESTIMATION/nr_ul_estimation.h
+++ b/openair1/PHY/NR_ESTIMATION/nr_ul_estimation.h
@@ -28,16 +28,17 @@
  * @{
  */
 
-
 /*!
 \brief This function performs channel estimation including frequency interpolation
 \param gNB Pointer to gNB PHY variables
 \param Ns slot number (0..19)
 \param p
 \param symbol symbol within slot
-\param bwp_start_subcarrier, first allocated subcarrier
-\param nb_rb_pusch, number of allocated RBs for this UE
+\param ul_id
+\param bwp_start_subcarrier first allocated subcarrier
+\param pusch_pdu
 \param max_ch maximum value of estimated channel
+\param nvar
 */
 
 int nr_pusch_channel_estimation(PHY_VARS_gNB *gNB,
@@ -95,3 +96,4 @@ void nr_freq_equalization(NR_DL_FRAME_PARMS *frame_parms,
 void nr_init_fde(void);
 
 #endif
+/** @}*/
diff --git a/openair1/PHY/NR_REFSIG/nr_dmrs_rx.c b/openair1/PHY/NR_REFSIG/nr_dmrs_rx.c
index 20c0e7db509df50e67f3e4471bae9dccf4637327..5da33435ede95b29ba8fd033f5b9f714b0e53b10 100644
--- a/openair1/PHY/NR_REFSIG/nr_dmrs_rx.c
+++ b/openair1/PHY/NR_REFSIG/nr_dmrs_rx.c
@@ -19,7 +19,7 @@
  *      contact@openairinterface.org
  */
 
-/*! \file PHY/NR_REFSIG/nr_dl_dmrs.c
+/*! \file nr_dmrs_rx.c
  * \brief Top-level routines for generating DMRS from 38-211
  * \author
  * \date 2018
diff --git a/openair1/PHY/NR_TRANSPORT/nr_dlsch.c b/openair1/PHY/NR_TRANSPORT/nr_dlsch.c
index 717b7b8155f45af7502056902644a5f71ccdcc18..ef537ea8f29bd6af5dde0457496b3018797ec342 100644
--- a/openair1/PHY/NR_TRANSPORT/nr_dlsch.c
+++ b/openair1/PHY/NR_TRANSPORT/nr_dlsch.c
@@ -19,16 +19,16 @@
  *      contact@openairinterface.org
  */
 
-/*! \file PHY/NR_TRANSPORT/dlsch_decoding.c
-* \brief Top-level routines for transmission of the PDSCH 38211 v 15.2.0
-* \author Guy De Souza
-* \date 2018
-* \version 0.1
-* \company Eurecom
-* \email: desouza@eurecom.fr
-* \note
-* \warning
-*/
+/*! \file nr_dlsch.c
+ * \brief Top-level routines for transmission of the PDSCH 38211 v 15.2.0
+ * \author Guy De Souza
+ * \date 2018
+ * \version 0.1
+ * \company Eurecom
+ * \email: desouza@eurecom.fr
+ * \note
+ * \warning
+ */
 
 #include "nr_dlsch.h"
 #include "nr_dci.h"
diff --git a/openair1/PHY/NR_TRANSPORT/nr_dlsch.h b/openair1/PHY/NR_TRANSPORT/nr_dlsch.h
index 8ee2e1171fb0ae6ec8d34ac27f4dbefb243f6eb3..aa111413e14edef149b8d3a00f619334360e17bd 100644
--- a/openair1/PHY/NR_TRANSPORT/nr_dlsch.h
+++ b/openair1/PHY/NR_TRANSPORT/nr_dlsch.h
@@ -19,16 +19,16 @@
  *      contact@openairinterface.org
  */
 
-/*! \file PHY/LTE_TRANSPORT/defs.h
-* \brief data structures for PDSCH/DLSCH/PUSCH/ULSCH physical and transport channel descriptors (TX/RX)
-* \author R. Knopp
-* \date 2011
-* \version 0.1
-* \company Eurecom
-* \email: raymond.knopp@eurecom.fr, florian.kaltenberger@eurecom.fr, oscar.tonelli@yahoo.it
-* \note
-* \warning
-*/
+/*! \file nr_dlsch.h
+ * \brief data structures for PDSCH/DLSCH/PUSCH/ULSCH physical and transport channel descriptors (TX/RX)
+ * \author R. Knopp
+ * \date 2011
+ * \version 0.1
+ * \company Eurecom
+ * \email: raymond.knopp@eurecom.fr, florian.kaltenberger@eurecom.fr, oscar.tonelli@yahoo.it
+ * \note
+ * \warning
+ */
 
 #ifndef __NR_DLSCH__H
 #define __NR_DLSCH__H
diff --git a/openair1/PHY/NR_TRANSPORT/nr_transport_proto.h b/openair1/PHY/NR_TRANSPORT/nr_transport_proto.h
index 2583996b95d7c85342fea91cf57797d869d47a5c..0f998ebee6f91099a85495a42ff8f4d1568ec7bd 100644
--- a/openair1/PHY/NR_TRANSPORT/nr_transport_proto.h
+++ b/openair1/PHY/NR_TRANSPORT/nr_transport_proto.h
@@ -19,16 +19,16 @@
  *      contact@openairinterface.org
  */
 
-/*! \file PHY/NR_TRANSPORT/nr_transport_proto.h.c
-* \brief Function prototypes for PHY physical/transport channel processing and generation
-* \author Ahmed Hussein
-* \date 2019
-* \version 0.1
-* \company Fraunhofer IIS
-* \email: ahmed.hussein@iis.fraunhofer.de
-* \note
-* \warning
-*/
+/*! \file nr_transport_proto.h
+ * \brief Function prototypes for PHY physical/transport channel processing and generation
+ * \author Ahmed Hussein
+ * \date 2019
+ * \version 0.1
+ * \company Fraunhofer IIS
+ * \email: ahmed.hussein@iis.fraunhofer.de
+ * \note
+ * \warning
+ */
 
 #ifndef __NR_TRANSPORT__H__
 #define __NR_TRANSPORT__H__
diff --git a/openair1/PHY/NR_TRANSPORT/nr_uci_tools_common.c b/openair1/PHY/NR_TRANSPORT/nr_uci_tools_common.c
index 4d286bc9378707c0405c503d0e515d3369ce807e..cccdaed8ef2ff086ef10f67eab3fe78a449c7348 100644
--- a/openair1/PHY/NR_TRANSPORT/nr_uci_tools_common.c
+++ b/openair1/PHY/NR_TRANSPORT/nr_uci_tools_common.c
@@ -19,7 +19,7 @@
  *      contact@openairinterface.org
  */
 
-/*! \file PHY/NR_TRANSPORT/nr_dci_tools_common.c
+/*! \file nr_uci_tools_common.c
  * \brief
  * \author
  * \date 2020
diff --git a/openair1/PHY/NR_UE_ESTIMATION/nr_estimation.h b/openair1/PHY/NR_UE_ESTIMATION/nr_estimation.h
index 8ac877a29ea9ccc7a732b9cb6f10dcb5a010ff7c..65591293a82bb4fa548e9181e456e1ad6629e31b 100644
--- a/openair1/PHY/NR_UE_ESTIMATION/nr_estimation.h
+++ b/openair1/PHY/NR_UE_ESTIMATION/nr_estimation.h
@@ -46,10 +46,6 @@ void peak_estimator(int32_t *buffer, int32_t buf_len, int32_t *peak_idx, int32_t
 
 /*!
 \brief This function performs channel estimation including frequency and temporal interpolation
-\param ue Pointer to UE PHY variables
-\param gNB_id Index of target gNB
-\param Ns slot number (0..19)
-\param symbol symbol within slot
 */
 void nr_pdcch_channel_estimation(PHY_VARS_NR_UE *ue,
                                  UE_nr_rxtx_proc_t *proc,
@@ -141,5 +137,5 @@ void nr_pdsch_ptrs_processing(PHY_VARS_NR_UE *ue,
                               NR_UE_DLSCH_t dlsch[2]);
 
 float_t get_nr_RSRP(module_id_t Mod_id,uint8_t CC_id,uint8_t gNB_index);
-
+/** @}*/
 #endif
diff --git a/openair1/PHY/NR_UE_TRANSPORT/dci_nr.c b/openair1/PHY/NR_UE_TRANSPORT/dci_nr.c
index 16bdb6e77b2f783044f93cbc98d90b8c0f1e8219..c979926c9251af9f25f6ca0daa9eb83de44616c9 100644
--- a/openair1/PHY/NR_UE_TRANSPORT/dci_nr.c
+++ b/openair1/PHY/NR_UE_TRANSPORT/dci_nr.c
@@ -19,13 +19,9 @@
  *      contact@openairinterface.org
  */
 
-/*! \file PHY/LTE_TRANSPORT/dci_nr.c
- * \brief Implements PDCCH physical channel TX/RX procedures (36.211) and DCI encoding/decoding (36.212/36.213). Current LTE compliance V8.6 2009-03.
- * \author R. Knopp, A. Mico Pereperez
- * \date 2018
- * \version 0.1
- * \company Eurecom
- * \email: knopp@eurecom.fr
+/*! \file dci_nr.c
+ * \brief Implements PDCCH physical channel TX/RX procedures (36.211) and DCI encoding/decoding (36.212/36.213). Current LTE
+ * compliance V8.6 2009-03. \author R. Knopp, A. Mico Pereperez \date 2018 \version 0.1 \company Eurecom \email: knopp@eurecom.fr
  * \note
  * \warning
  */
diff --git a/openair1/PHY/NR_UE_TRANSPORT/nr_dlsch_demodulation.c b/openair1/PHY/NR_UE_TRANSPORT/nr_dlsch_demodulation.c
index 300d6df911fbfc33c9e3b8926044e7c7c0c5e544..894a2ee3a38de4407565ee68461656aed9c07c39 100644
--- a/openair1/PHY/NR_UE_TRANSPORT/nr_dlsch_demodulation.c
+++ b/openair1/PHY/NR_UE_TRANSPORT/nr_dlsch_demodulation.c
@@ -19,7 +19,7 @@
  *      contact@openairinterface.org
  */
 
-/*! \file PHY/LTE_TRANSPORT/dlsch_demodulation.c
+/*! \file nr_dlsch_demodulation.c
  * \brief Top-level routines for demodulating the PDSCH physical channel from 38-211, V15.2 2018-06
  * \author H.Wang
  * \date 2018
@@ -126,21 +126,9 @@ static int nr_dlsch_llr(uint32_t rx_size_symbol,
                         uint8_t nr_slot_rx,
                         NR_UE_DLSCH_t dlsch[2],
                         uint32_t llr_offset[NR_SYMBOLS_PER_SLOT]);
-/** \fn dlsch_extract_rbs(int32_t **rxdataF,
-    int32_t **dl_ch_estimates,
-    int32_t **rxdataF_ext,
-    int32_t **dl_ch_estimates_ext,
-    unsigned char symbol
-    uint8_t pilots,
-    uint8_t config_type,
-    unsigned short start_rb,
-    unsigned short nb_rb_pdsch,
-    uint8_t n_dmrs_cdm_groups,
-    uint8_t Nl,
-    NR_DL_FRAME_PARMS *frame_parms,
-    uint16_t dlDmrsSymbPos)
-    \brief This function extracts the received resource blocks, both channel estimates and data symbols,
-    for the current allocation and for multiple layer antenna gNB transmission.
+/** \fn nr_dlsch_extract_rbs
+    \brief This function extracts the received resource blocks, both channel estimates and data symbols,    for the current
+   allocation and for multiple layer antenna gNB transmission.
     @param rxdataF Raw FFT output of received signal
     @param dl_ch_estimates Channel estimates of current slot
     @param rxdataF_ext FFT output for RBs in this allocation
diff --git a/openair1/PHY/NR_UE_TRANSPORT/nr_initial_sync.c b/openair1/PHY/NR_UE_TRANSPORT/nr_initial_sync.c
index fdd31058b8721b74f0f979c57d3a281b06b0e1f0..a0230ac8cb3fba5f0a1dc87ebc75f8cd235b5446 100644
--- a/openair1/PHY/NR_UE_TRANSPORT/nr_initial_sync.c
+++ b/openair1/PHY/NR_UE_TRANSPORT/nr_initial_sync.c
@@ -19,16 +19,16 @@
  *      contact@openairinterface.org
  */
 
-/*! \file PHY/LTE_TRANSPORT/initial_sync.c
-* \brief Routines for initial UE synchronization procedure (PSS,SSS,PBCH and frame format detection)
-* \author R. Knopp, F. Kaltenberger
-* \date 2011
-* \version 0.1
-* \company Eurecom
-* \email: knopp@eurecom.fr,kaltenberger@eurecom.fr
-* \note
-* \warning
-*/
+/*! \file nr_initial_sync.c
+ * \brief Routines for initial UE synchronization procedure (PSS,SSS,PBCH and frame format detection)
+ * \author R. Knopp, F. Kaltenberger
+ * \date 2011
+ * \version 0.1
+ * \company Eurecom
+ * \email: knopp@eurecom.fr,kaltenberger@eurecom.fr
+ * \note
+ * \warning
+ */
 #include "PHY/types.h"
 #include "PHY/defs_nr_UE.h"
 #include "PHY/MODULATION/modulation_UE.h"
diff --git a/openair1/PHY/NR_UE_TRANSPORT/nr_transport_proto_ue.h b/openair1/PHY/NR_UE_TRANSPORT/nr_transport_proto_ue.h
index 1d7c33e2ee23fc02662f71078c51432edb9cead5..4ab7baa4af1e6198ded1b921a1e72a703f98c665 100644
--- a/openair1/PHY/NR_UE_TRANSPORT/nr_transport_proto_ue.h
+++ b/openair1/PHY/NR_UE_TRANSPORT/nr_transport_proto_ue.h
@@ -19,7 +19,7 @@
  *      contact@openairinterface.org
  */
 
-/*! \file PHY/NR_UE_TRANSPORT/transport_proto_ue.h
+/*! \file nr_transport_proto_ue.h
  * \brief Function prototypes for PHY physical/transport channel processing and generation V8.6 2009-03
  * \author R. Knopp, F. Kaltenberger
  * \date 2011
@@ -71,6 +71,7 @@ void nr_qpsk_qpsk(int16_t *stream0_in,
     @param rho_i Correlation between channel of signal and inteference
     @param dlsch_llr llr output
     @param symbol OFDM symbol index in sub-frame
+    @param len
     @param first_symbol_flag flag to indicate this is the first symbol of the dlsch
     @param nb_rb number of RBs for this allocation
     @param pbch_pss_sss_adj Number of channel bits taken by PBCH/PSS/SSS
@@ -87,16 +88,14 @@ int32_t nr_dlsch_qpsk_qpsk_llr(NR_DL_FRAME_PARMS *frame_parms,
                             uint16_t pbch_pss_sss_adj,
                             int16_t **llr128p);
 
-/** \brief This function generates log-likelihood ratios (decoder input) for single-stream QPSK received waveforms.
+/** \brief This function generates log-likelihood ratios (decoder input) for single-stream QPSK received waveforms
     @param frame_parms Frame descriptor structure
     @param rxdataF_comp Compensated channel output
     @param dlsch_llr llr output
     @param symbol OFDM symbol index in sub-frame
+    @param len
     @param first_symbol_flag
     @param nb_rb number of RBs for this allocation
-    @param pbch_pss_sss_adj Number of channel bits taken by PBCH/PSS/SSS
-    @param llr128p pointer to pointer to symbol in dlsch_llr
-    @param beamforming_mode beamforming mode
 */
 int32_t nr_dlsch_qpsk_llr(NR_DL_FRAME_PARMS *frame_parms,
                    int32_t *rxdataF_comp,
@@ -111,13 +110,12 @@ int32_t nr_dlsch_qpsk_llr(NR_DL_FRAME_PARMS *frame_parms,
    @param frame_parms Frame descriptor structure
    @param rxdataF_comp Compensated channel output
    @param dlsch_llr llr output
-   @param dl_ch_mag Squared-magnitude of channel in each resource element position corresponding to allocation and weighted for mid-point in 16QAM constellation
+   @param dl_ch_mag Squared-magnitude of channel in each resource element position corresponding to allocation and weighted for
+   mid-point in 16QAM constellation
+   @param len
    @param symbol OFDM symbol index in sub-frame
    @param first_symbol_flag
    @param nb_rb number of RBs for this allocation
-   @param pbch_pss_sss_adjust  Adjustment factor in RE for PBCH/PSS/SSS allocations
-   @param llr128p pointer to pointer to symbol in dlsch_llr
-   @param beamforming_mode beamforming mode
 */
 
 void nr_dlsch_16qam_llr(NR_DL_FRAME_PARMS *frame_parms,
@@ -133,13 +131,14 @@ void nr_dlsch_16qam_llr(NR_DL_FRAME_PARMS *frame_parms,
    @param frame_parms Frame descriptor structure
    @param rxdataF_comp Compensated channel output
    @param dlsch_llr llr output
-   @param dl_ch_mag Squared-magnitude of channel in each resource element position corresponding to allocation, weighted by first mid-point of 64-QAM constellation
-   @param dl_ch_magb Squared-magnitude of channel in each resource element position corresponding to allocation, weighted by second mid-point of 64-QAM constellation
+   @param dl_ch_mag Squared-magnitude of channel in each resource element position corresponding to allocation, weighted by first
+   mid-point of 64-QAM constellation
+   @param dl_ch_magb Squared-magnitude of channel in each resource element position corresponding to allocation, weighted by second
+   mid-point of 64-QAM constellation
    @param symbol OFDM symbol index in sub-frame
+   @param len
    @param first_symbol_flag
    @param nb_rb number of RBs for this allocation
-   @param pbch_pss_sss_adjust PBCH/PSS/SSS RE adjustment (in REs)
-   @param beamforming_mode beamforming mode
 */
 
 void nr_dlsch_64qam_llr(NR_DL_FRAME_PARMS *frame_parms,
@@ -184,14 +183,18 @@ void nr_conjch0_mult_ch1(int *ch0,
     one segment or correct decoding of all segments.  Only the segment CRCs are check for the moment, the
     overall CRC is ignored.  Finally transport block reassembly is performed.
     @param phy_vars_ue Pointer to ue variables
+    @param proc
+    @param eNB_id
     @param dlsch_llr Pointer to LLR values computed by dlsch_demodulation
-    @param lte_frame_parms Pointer to frame descriptor
+    @param frame_parms Pointer to frame descriptor
     @param dlsch Pointer to DLSCH descriptor
+    @param harq_process
     @param frame Frame number
+    @param nb_symb_sch
     @param nr_slot_rx Slot number
-    @param num_pdcch_symbols Number of PDCCH symbols
-    @param is_crnti indicates if PDSCH belongs to a CRNTI (necessary for parallelizing decoding threads)
-    @param llr8_flag If 1, indicate that the 8-bit turbo decoder should be used
+    @param harq_pid
+    @param b_size
+    @param b
     @returns 0 on success, 1 on unsuccessful decoding
 */
 
@@ -217,12 +220,12 @@ int nr_ulsch_encoding(PHY_VARS_NR_UE *ue,
                      unsigned int G);
 
 /*! \brief Perform PUSCH scrambling. TS 38.211 V15.4.0 subclause 6.3.1.1
-  @param[in] in, Pointer to input bits
-  @param[in] size, of input bits
-  @param[in] Nid, cell id
-  @param[in] n_RNTI, CRNTI
+  @param[in] in Pointer to input bits
+  @param[in] size of input bits
+  @param[in] Nid cell id
+  @param[in] n_RNTI CRNTI
   @param[in] uci_on_pusch whether UCI placeholder bits need to be scrambled (true -> no optimized scrambling)
-  @param[out] out, the scrambled bits
+  @param[out] out the scrambled bits
 */
 void nr_pusch_codeword_scrambling(uint8_t *in,
                                   uint32_t size,
@@ -312,8 +315,10 @@ int dump_ue_stats(PHY_VARS_NR_UE *phy_vars_ue, UE_nr_rxtx_proc_t *proc, char* bu
   end, the basic frame parameters are known (Frame configuration - TDD/FDD and cyclic prefix length,
   N_RB_DL, PHICH_CONFIG and Nid_cell) and the UE can begin decoding PDCCH and DLSCH SI to retrieve the rest.  Once these
   parameters are know, the routine calls some basic initialization routines (cell-specific reference signals, etc.)
+@param proc
   @param phy_vars_ue Pointer to UE variables
-  @param mode current running mode
+@param n_frames
+  @param sa current running mode
 */
 int nr_initial_sync(UE_nr_rxtx_proc_t *proc,
                     PHY_VARS_NR_UE *phy_vars_ue,
@@ -321,8 +326,9 @@ int nr_initial_sync(UE_nr_rxtx_proc_t *proc,
                     int sa);
 
 /*!
-  \brief This function gets the carrier frequencies either from FP or command-line-set global variables, depending on the availability of the latter
-  @param fp         Pointer to frame params
+  \brief This function gets the carrier frequencies either from FP or command-line-set global variables, depending on the
+  availability of the latter
+  @param ue
   @param dl_Carrier Pointer to DL carrier to be set
   @param ul_Carrier Pointer to UL carrier to be set
 */
@@ -341,11 +347,7 @@ void nr_get_carrier_frequencies_sl(PHY_VARS_NR_UE *ue,
 /*!
   \brief This function sets the OAI RF card rx/tx params
   @param openair0_cfg   Pointer OAI config for a specific card
-  @param tx_gain_off    Tx gain offset
   @param rx_gain_off    Rx gain offset
-  @param ul_Carrier     UL carrier to be set
-  @param dl_Carrier     DL carrier to be set
-  @param freq_offset    Freq offset to be set
 */
 void nr_rf_card_config_gain(openair0_config_t *openair0_cfg,
                             double rx_gain_off);
@@ -371,8 +373,8 @@ uint8_t nr_dci_decoding_procedure(PHY_VARS_NR_UE *ue,
                                   fapi_nr_dci_indication_t *dci_ind,
                                   fapi_nr_dl_config_dci_dl_pdu_rel15_t *rel15);
 
-
-/** \brief This function is the top-level entry point to PDSCH demodulation, after frequency-domain transformation and channel estimation.  It performs
+/** \brief This function is the top-level entry point to PDSCH demodulation, after frequency-domain transformation and channel
+   estimation.  It performs
     - RB extraction (signal and channel estimates)
     - channel compensation (matched filtering)
     - RE extraction (pilot, PBCH, synch. signals)
@@ -380,13 +382,23 @@ uint8_t nr_dci_decoding_procedure(PHY_VARS_NR_UE *ue,
     - LLR computation
     This function supports TM1, 2, 3, 5, and 6.
     @param ue Pointer to PHY variables
-    @param type Type of PDSCH (SI_PDSCH,RA_PDSCH,PDSCH,PMCH)
-    @param eNB_id eNb index (Nid1) 0,1,2
-    @param eNB_id_i Interfering eNB index (Nid1) 0,1,2, or 3 in case of MU-MIMO IC receiver
-    @param frame Frame number
-    @param nr_slot_rx Slot number
+    @param proc
+    @prama dlsch
     @param symbol Symbol on which to act (within sub-frame)
     @param first_symbol_flag set to 1 on first DLSCH symbol
+    @param harq_pid
+    @param pdsch_est_size
+    @param dl_ch_estimates
+    @param llr
+    @param dl_valid_re
+    @param rxdataF
+    @param llr_offset
+    @param log2_maxhrx_size_symbol
+    @param rx_size_symbol
+    @param nbRx
+    @param rxdataF_comp
+    @param ptrs_phase_per_slot
+    @param ptrs_re_per_slot
 */
 int nr_rx_pdsch(PHY_VARS_NR_UE *ue,
                 UE_nr_rxtx_proc_t *proc,
diff --git a/openair1/PHY/NR_UE_TRANSPORT/nr_transport_ue.h b/openair1/PHY/NR_UE_TRANSPORT/nr_transport_ue.h
index b0ea45b7ecabaa0e946e58a6e36cf406cfbddb88..8467753af786e7b785ae77aa9bc9746dbdf57e64 100644
--- a/openair1/PHY/NR_UE_TRANSPORT/nr_transport_ue.h
+++ b/openair1/PHY/NR_UE_TRANSPORT/nr_transport_ue.h
@@ -19,16 +19,16 @@
  *      contact@openairinterface.org
  */
 
-/*! \file PHY/NR_TRANSPORT/defs.h
-* \brief data structures for PDSCH/DLSCH/PUSCH/ULSCH physical and transport channel descriptors (TX/RX)
-* \author R. Knopp
-* \date 2011
-* \version 0.1
-* \company Eurecom
-* \email: raymond.knopp@eurecom.fr, florian.kaltenberger@eurecom.fr, oscar.tonelli@yahoo.it
-* \note
-* \warning
-*/
+/*! \file nr_transport_ue.h
+ * \brief data structures for PDSCH/DLSCH/PUSCH/ULSCH physical and transport channel descriptors (TX/RX)
+ * \author R. Knopp
+ * \date 2011
+ * \version 0.1
+ * \company Eurecom
+ * \email: raymond.knopp@eurecom.fr, florian.kaltenberger@eurecom.fr, oscar.tonelli@yahoo.it
+ * \note
+ * \warning
+ */
 #ifndef __NR_TRANSPORT_UE__H__
 #define __NR_TRANSPORT_UE__H__
 #include <limits.h>
@@ -164,7 +164,4 @@ typedef struct {
   // PTRS symbol index, to be updated every PTRS symbol within a slot.
   uint8_t ptrs_symbol_index;
 } NR_UE_DLSCH_t;
-
-
-/**@}*/
 #endif
diff --git a/openair1/PHY/NR_UE_TRANSPORT/nr_ue_rf_helpers.c b/openair1/PHY/NR_UE_TRANSPORT/nr_ue_rf_helpers.c
index 1bc4d42c266e327b5e38bda4db650899ce8526e5..d07ad7fa8869bb20fa3b90d50e89c05edfe5d929 100644
--- a/openair1/PHY/NR_UE_TRANSPORT/nr_ue_rf_helpers.c
+++ b/openair1/PHY/NR_UE_TRANSPORT/nr_ue_rf_helpers.c
@@ -19,14 +19,14 @@
  *      contact@openairinterface.org
  */
 
-/*! \file PHY/NR_UE_TRANSPORT/nr_ue_rf_config.c
-* \brief      Functional helpers to configure the RF boards at UE side
-* \author     Guido Casati
-* \date       2020
-* \version    0.1
-* \company    Fraunhofer IIS
-* \email:     guido.casati@iis.fraunhofer.de
-*/
+/*! \file nr_ue_rf_helpers.c
+ * \brief      Functional helpers to configure the RF boards at UE side
+ * \author     Guido Casati
+ * \date       2020
+ * \version    0.1
+ * \company    Fraunhofer IIS
+ * \email:     guido.casati@iis.fraunhofer.de
+ */
 
 #include "PHY/defs_nr_UE.h"
 #include "PHY/phy_extern_nr_ue.h"
diff --git a/openair1/PHY/NR_UE_TRANSPORT/nr_ulsch_ue.c b/openair1/PHY/NR_UE_TRANSPORT/nr_ulsch_ue.c
index 6ca2f2da5e27f4c1b8df1271fae76761b2d4c9e3..8d2974c008ad6f6c5bac38152c243d467bacea16 100644
--- a/openair1/PHY/NR_UE_TRANSPORT/nr_ulsch_ue.c
+++ b/openair1/PHY/NR_UE_TRANSPORT/nr_ulsch_ue.c
@@ -19,16 +19,16 @@
  *      contact@openairinterface.org
  */
 
-/*! \file PHY/NR_UE_TRANSPORT/nr_ulsch.c
-* \brief Top-level routines for transmission of the PUSCH TS 38.211 v 15.4.0
-* \author Khalid Ahmed
-* \date 2019
-* \version 0.1
-* \company Fraunhofer IIS
-* \email: khalid.ahmed@iis.fraunhofer.de
-* \note
-* \warning
-*/
+/*! \file nr_ulsch_ue.c
+ * \brief Top-level routines for transmission of the PUSCH TS 38.211 v 15.4.0
+ * \author Khalid Ahmed
+ * \date 2019
+ * \version 0.1
+ * \company Fraunhofer IIS
+ * \email: khalid.ahmed@iis.fraunhofer.de
+ * \note
+ * \warning
+ */
 #include <stdint.h>
 #include "PHY/NR_REFSIG/dmrs_nr.h"
 #include "PHY/NR_REFSIG/ptrs_nr.h"
diff --git a/openair1/PHY/TOOLS/alaw_lut.h b/openair1/PHY/TOOLS/alaw_lut.h
index 1b20ce213bc03a365e20c5dff000570c68521b2d..effdf4142c0eb19bdfe5a41f853e807589a60c4b 100644
--- a/openair1/PHY/TOOLS/alaw_lut.h
+++ b/openair1/PHY/TOOLS/alaw_lut.h
@@ -19,16 +19,16 @@
  *      contact@openairinterface.org
  */
 
-/*! \file PHY/TOOLS/ALAW/alaw_lut.h
-* \brief 
-* \author S. Sandeep Kumar, Raymond Knopp
-* \date 2016
-* \version 0.1
-* \company Eurecom
-* \email: ee13b1025@iith.ac.in, knopp@eurecom.fr 
-* \note
-* \warning
-*/
+/*! \file alaw_lut.h
+ * \brief
+ * \author S. Sandeep Kumar, Raymond Knopp
+ * \date 2016
+ * \version 0.1
+ * \company Eurecom
+ * \email: ee13b1025@iith.ac.in, knopp@eurecom.fr
+ * \note
+ * \warning
+ */
 
 // Linear to ALaw
 // 16 bit signed integer (typecasted as uint16_t) to 8 bit unsigned integer
diff --git a/openair1/PHY/TOOLS/cdot_prod.c b/openair1/PHY/TOOLS/cdot_prod.c
index 7370bb21b1f13b877014230caa2fe6c7cc317a75..ccac6f5a7ea9df5cc51a6b3125b9c60a4d313d24 100644
--- a/openair1/PHY/TOOLS/cdot_prod.c
+++ b/openair1/PHY/TOOLS/cdot_prod.c
@@ -25,13 +25,13 @@
 // returns the complex dot product of x and y
 
 /*! \brief Complex number dot_product
+@param x input vector
+@param y input vector
+@param N size of vectors
+@param output_shift normalization of int multiplications
 */
 
-c32_t dot_product(const c16_t *x,//! input vector
-                  const c16_t *y,//! input vector
-                  const uint32_t N,//! size of the vectors
-                  const int output_shift //! normalization afer int16 multiplication
-                  )
+c32_t dot_product(const c16_t *x, const c16_t *y, const uint32_t N, const int output_shift)
 {
   const int16_t reflip[32] __attribute__((aligned(32))) = {1, -1, 1, -1, 1, -1, 1, -1, 1, -1, 1, -1, 1, -1, 1, -1};
   const int8_t imshuffle[64] __attribute__((aligned(32))) = {2, 3, 0, 1, 6, 7, 4, 5, 10, 11, 8, 9, 14, 15, 12, 13, 18, 19, 16, 17, 22, 23, 20, 21, 26, 27, 24, 25, 30, 31, 28, 29};
diff --git a/openair1/PHY/TOOLS/dfts_load.c b/openair1/PHY/TOOLS/dfts_load.c
index f83624fcf43e8ebabfc8981bb4142afea544cf69..d7d1ae3a2d1ee891f44a8f8af8938e2da3f53a94 100644
--- a/openair1/PHY/TOOLS/dfts_load.c
+++ b/openair1/PHY/TOOLS/dfts_load.c
@@ -19,7 +19,7 @@
  *      contact@openairinterface.org
  */
 
-/*! \file openair1/PHY/CODING/coding_nr_load.c
+/*! \file dfts_load.c
  * \brief: load library implementing coding/decoding algorithms
  * \author Francois TABURET
  * \date 2020
diff --git a/openair1/PHY/TOOLS/tools_defs.h b/openair1/PHY/TOOLS/tools_defs.h
index 4f4af5f7cb4efab69850e9a04b217061c2b86e4b..d946d7a8c85139be191405b5ea78dba83a4714a8 100644
--- a/openair1/PHY/TOOLS/tools_defs.h
+++ b/openair1/PHY/TOOLS/tools_defs.h
@@ -378,26 +378,6 @@ void init_fft(uint16_t size,
               uint8_t logsize,
               uint16_t *rev);
 
-/*!\fn void fft(int16_t *x,int16_t *y,int16_t *twiddle,uint16_t *rev,uint8_t log2size,uint8_t scale,uint8_t input_fmt)
-This function performs optimized fixed-point radix-2 FFT/IFFT.
-@param x Input
-@param y Output in format: [Re0,Im0,Re0,Im0, Re1,Im1,Re1,Im1, ....., Re(N-1),Im(N-1),Re(N-1),Im(N-1)]
-@param twiddle Twiddle factors
-@param rev bit-reversed permutation
-@param log2size Base-2 logarithm of FFT size
-@param scale Total number of shifts (should be log2size/2 for normalized FFT)
-@param input_fmt (0 - input is in complex Q1.15 format, 1 - input is in complex redundant Q1.15 format)
-*/
-/*void fft(int16_t *x,
-         int16_t *y,
-         int16_t *twiddle,
-         uint16_t *rev,
-         uint8_t log2size,
-         uint8_t scale,
-         uint8_t input_fmt
-        );
-*/
-
 #define FOREACH_DFTSZ(SZ_DEF) \
   SZ_DEF(12) \
   SZ_DEF(24) \
@@ -711,11 +691,6 @@ int32_t sub_cpx_vector16(int16_t *x,
 */
 int32_t signal_energy(int32_t *,uint32_t);
 
-/*!\fn int32_t signal_energy_fixed_p9(int *input, uint32_t length);
-\brief Computes the signal energy per subcarrier
-\ the input signal has a fixed point representation of AMP_SHIFT bits
-\ the ouput energy has a fixed point representation of AMP_SHIFT bits
-*/
 int32_t signal_energy_amp_shift(int32_t *input, uint32_t length);
 
 #ifdef LOCALIZATION
diff --git a/openair1/PHY/defs_RU.h b/openair1/PHY/defs_RU.h
index 20f59a1aa8dab17f48a18dd51fa8a3c4d0848aff..b8cc7ae84ccdf7bbc1887f6d7fd0bde3eae48989 100644
--- a/openair1/PHY/defs_RU.h
+++ b/openair1/PHY/defs_RU.h
@@ -249,7 +249,6 @@ typedef struct RU_proc_t_s {
   int instance_cnt_feptx;
   /// \internal This variable is protected by \ref mutex_ru_thread
   int instance_cnt_ru;
-  /// This varible is protected by \ref mutex_emulatedRF
   int instance_cnt_emulateRF;
   /// pthread structure for RU FH processing thread
   pthread_t pthread_FH;
diff --git a/openair1/PHY/defs_UE.h b/openair1/PHY/defs_UE.h
index 8455b2acb0cdb89c7578e320ab47d0e971ce25db..7ee8017a45c4eabcbcc3c9db9a5e3e8d6d1c1dc9 100644
--- a/openair1/PHY/defs_UE.h
+++ b/openair1/PHY/defs_UE.h
@@ -19,7 +19,7 @@
  *      contact@openairinterface.org
  */
 
-/*! \file PHY/defs.h
+/*! \file defs_UE.h
  \brief Top-level defines and structure definitions
  \author R. Knopp, F. Kaltenberger
  \date 2011
diff --git a/openair1/PHY/defs_common.h b/openair1/PHY/defs_common.h
index dfadfa2c58d89d27a3da2724d631b9fd5be022db..e021f7ce6832c3432a09a305098190cbf1bd7b68 100644
--- a/openair1/PHY/defs_common.h
+++ b/openair1/PHY/defs_common.h
@@ -19,7 +19,7 @@
  *      contact@openairinterface.org
  */
 
-/*! \file PHY/defs.h
+/*! \file defs_common.h
  \brief Top-level defines and structure definitions
  \author R. Knopp, F. Kaltenberger
  \date 2011
@@ -129,22 +129,24 @@ typedef struct {
 
 /// PRACH-ConfigInfo from 36.331 RRC spec
 typedef struct {
-  /// Parameter: prach-ConfigurationIndex, see TS 36.211 (5.7.1). \vr{[0..63]}
+  /// Parameter: prach-ConfigurationIndex, see TS 36.211 (5.7.1). {[0..63]}
   uint8_t prach_ConfigIndex;
-  /// Parameter: High-speed-flag, see TS 36.211 (5.7.2). \vr{[0..1]} 1 corresponds to Restricted set and 0 to Unrestricted set.
+  /// Parameter: High-speed-flag, see TS 36.211 (5.7.2). {[0..1]} 1 corresponds to Restricted set and 0 to Unrestricted set.
   uint8_t highSpeedFlag;
-  /// Parameter: \f$N_\text{CS}\f$, see TS 36.211 (5.7.2). \vr{[0..15]}\n Refer to table 5.7.2-2 for preamble format 0..3 and to table 5.7.2-3 for preamble format 4.
+  /// Parameter: \f$N_\text{CS}\f$, see TS 36.211 (5.7.2). {[0..15]}\n Refer to table 5.7.2-2 for preamble format 0..3 and to
+  /// table 5.7.2-3 for preamble format 4.
   uint8_t zeroCorrelationZoneConfig;
-  /// Parameter: prach-FrequencyOffset, see TS 36.211 (5.7.1). \vr{[0..94]}\n For TDD the value range is dependent on the value of \ref prach_ConfigIndex.
+  /// Parameter: prach-FrequencyOffset, see TS 36.211 (5.7.1). {[0..94]}\n For TDD the value range is dependent on the value of \ref
+  /// prach_ConfigIndex.
   uint8_t prach_FreqOffset;
 } PRACH_CONFIG_INFO;
 
 
 /// PRACH-ConfigSIB or PRACH-Config from 36.331 RRC spec
 typedef struct {
-  /// Parameter: RACH_ROOT_SEQUENCE, see TS 36.211 (5.7.1). \vr{[0..837]}
+  /// Parameter: RACH_ROOT_SEQUENCE, see TS 36.211 (5.7.1). {[0..837]}
   uint16_t rootSequenceIndex;
-  /// prach_Config_enabled=1 means enabled. \vr{[0..1]}
+  /// prach_Config_enabled=1 means enabled. {[0..1]}
   uint8_t prach_Config_enabled;
   /// PRACH Configuration Information
   PRACH_CONFIG_INFO prach_ConfigInfo;
@@ -152,11 +154,13 @@ typedef struct {
 
 /// PRACH-eMTC-Config from 36.331 RRC spec
 typedef struct {
-  /// Parameter: High-speed-flag, see TS 36.211 (5.7.2). \vr{[0..1]} 1 corresponds to Restricted set and 0 to Unrestricted set.
+  /// Parameter: High-speed-flag, see TS 36.211 (5.7.2). {[0..1]} 1 corresponds to Restricted set and 0 to Unrestricted set.
   uint8_t highSpeedFlag;
-  /// Parameter: \f$N_\text{CS}\f$, see TS 36.211 (5.7.2). \vr{[0..15]}\n Refer to table 5.7.2-2 for preamble format 0..3 and to table 5.7.2-3 for preamble format 4.
+  /// Parameter: \f$N_\text{CS}\f$, see TS 36.211 (5.7.2). {[0..15]}\n Refer to table 5.7.2-2 for preamble format 0..3 and to
+  /// table 5.7.2-3 for preamble format 4.
   uint8_t zeroCorrelationZoneConfig;
-  /// Parameter: prach-FrequencyOffset, see TS 36.211 (5.7.1). \vr{[0..94]}\n For TDD the value range is dependent on the value of \ref prach_ConfigIndex.
+  /// Parameter: prach-FrequencyOffset, see TS 36.211 (5.7.1). {[0..94]}\n For TDD the value range is dependent on the value of \ref
+  /// prach_ConfigIndex.
 
   /// PRACH starting subframe periodicity, expressed in number of subframes available for preamble transmission (PRACH opportunities), see TS 36.211. Value 2 corresponds to 2 subframes, 4 corresponds to 4 subframes and so on. EUTRAN configures the PRACH starting subframe periodicity larger than or equal to the Number of PRACH repetitions per attempt for each CE level (numRepetitionPerPreambleAttempt).
   uint8_t prach_starting_subframe_periodicity[4];
@@ -176,9 +180,9 @@ typedef struct {
 
 /// PRACH-ConfigSIB or PRACH-Config from 36.331 RRC spec
 typedef struct {
-  /// Parameter: RACH_ROOT_SEQUENCE, see TS 36.211 (5.7.1). \vr{[0..837]}
+  /// Parameter: RACH_ROOT_SEQUENCE, see TS 36.211 (5.7.1). {[0..837]}
   uint16_t rootSequenceIndex;
-  /// prach_Config_enabled=1 means enabled. \vr{[0..1]}
+  /// prach_Config_enabled=1 means enabled. {[0..1]}
   uint8_t prach_Config_enabled;
   /// PRACH Configuration Information
   PRACH_eMTC_CONFIG_INFO prach_ConfigInfo;
@@ -200,11 +204,11 @@ typedef enum {
 
 /// PUCCH-ConfigDedicated from 36.331 RRC spec
 typedef struct {
-  /// Flag to indicate ACK NAK repetition activation, see TS 36.213 (10.1). \vr{[0..1]}
+  /// Flag to indicate ACK NAK repetition activation, see TS 36.213 (10.1). {[0..1]}
   uint8_t ackNackRepetition;
   /// Parameter: \f$N_\text{ANRep}\f$, see TS 36.213 (10.1).
   ACKNAKREP_t repetitionFactor;
-  /// Parameter: \f$n^{(1)}_\text{PUCCH,ANRep}\f$, see TS 36.213 (10.1). \vr{[0..2047]}
+  /// Parameter: \f$n^{(1)}_\text{PUCCH,ANRep}\f$, see TS 36.213 (10.1). {[0..2047]}
   uint16_t n1PUCCH_AN_Rep;
   /// Feedback mode, see TS 36.213 (7.3). \details Applied to both PUCCH and PUSCH feedback. For TDD, should always be set to bundling.
   ANFBmode_t tdd_AckNackFeedbackMode;
@@ -212,13 +216,14 @@ typedef struct {
 
 /// PUCCH-ConfigCommon from 36.331 RRC spec
 typedef struct {
-  /// Parameter: \f$\Delta^\text{PUCCH}_\text{shift}\f$, see TS 36.211 (5.4.1). \vr{[1..3]} \note the specification sais it is an enumerated value.
+  /// Parameter: \f$\Delta^\text{PUCCH}_\text{shift}\f$, see TS 36.211 (5.4.1). {[1..3]} \note the specification sais it is an
+  /// enumerated value.
   uint8_t deltaPUCCH_Shift;
-  /// Parameter: \f$N^{(2)}_\text{RB}\f$, see TS 36.211 (5.4). \vr{[0..98]}
+  /// Parameter: \f$N^{(2)}_\text{RB}\f$, see TS 36.211 (5.4). {[0..98]}
   uint8_t nRB_CQI;
-  /// Parameter: \f$N^{(1)}_\text{CS}\f$, see TS 36.211 (5.4). \vr{[0..7]}
+  /// Parameter: \f$N^{(1)}_\text{CS}\f$, see TS 36.211 (5.4). {[0..7]}
   uint8_t nCS_AN;
-  /// Parameter: \f$N^{(1)}_\text{PUCCH}\f$ see TS 36.213 (10.1). \vr{[0..2047]}
+  /// Parameter: \f$N^{(1)}_\text{PUCCH}\f$ see TS 36.213 (10.1). {[0..2047]}
   uint16_t n1PUCCH_AN;
 
   /// group hopping sequence for DRS \note not part of offical UL-PUCCH_CONFIG_COMMON ASN1 specification.
@@ -229,13 +234,13 @@ typedef struct {
 
 /// UL-ReferenceSignalsPUSCH from 36.331 RRC spec
 typedef struct {
-  /// Parameter: Group-hopping-enabled, see TS 36.211 (5.5.1.3). \vr{[0..1]}
+  /// Parameter: Group-hopping-enabled, see TS 36.211 (5.5.1.3). {[0..1]}
   uint8_t groupHoppingEnabled;
-  /// Parameter: \f$\Delta SS\f$, see TS 36.211 (5.5.1.3). \vr{[0..29]}
+  /// Parameter: \f$\Delta SS\f$, see TS 36.211 (5.5.1.3). {[0..29]}
   uint8_t groupAssignmentPUSCH;
-  /// Parameter: Sequence-hopping-enabled, see TS 36.211 (5.5.1.4). \vr{[0..1]}
+  /// Parameter: Sequence-hopping-enabled, see TS 36.211 (5.5.1.4). {[0..1]}
   uint8_t sequenceHoppingEnabled;
-  /// Parameter: cyclicShift, see TS 36.211 (Table 5.5.2.1.1-2). \vr{[0..7]}
+  /// Parameter: cyclicShift, see TS 36.211 (Table 5.5.2.1.1-2). {[0..7]}
   uint8_t cyclicShift;
   /// nPRS for cyclic shift of DRS \note not part of offical UL-ReferenceSignalsPUSCH ASN1 specification.
   uint8_t nPRS[20];
@@ -253,13 +258,13 @@ typedef enum {
 
 /// PUSCH-ConfigCommon from 36.331 RRC spec.
 typedef struct {
-  /// Parameter: \f$N_{sb}\f$, see TS 36.211 (5.3.4). \vr{[1..4]}
+  /// Parameter: \f$N_{sb}\f$, see TS 36.211 (5.3.4). {[1..4]}
   uint8_t n_SB;
   /// Parameter: Hopping-mode, see TS 36.211 (5.3.4).
   PUSCH_HOPPING_t hoppingMode;
-  /// Parameter: \f$N^{HO}_{RB}\f$, see TS 36.211 (5.3.4). \vr{[0..98]}
+  /// Parameter: \f$N^{HO}_{RB}\f$, see TS 36.211 (5.3.4). {[0..98]}
   uint8_t pusch_HoppingOffset;
-  /// See TS 36.213 (8.6.1). \vr{[0..1]} 1 indicates 64QAM is allowed, 0 not allowed.
+  /// See TS 36.213 (8.6.1). {[0..1]} 1 indicates 64QAM is allowed, 0 not allowed.
   uint8_t enable64QAM;
   /// Ref signals configuration
   UL_REFERENCE_SIGNALS_PUSCH_t ul_ReferenceSignalsPUSCH;
@@ -267,11 +272,11 @@ typedef struct {
 
 /// UE specific PUSCH configuration.
 typedef struct {
-  /// Parameter: \f$I^\text{HARQ-ACK}_\text{offset}\f$, see TS 36.213 (Table 8.6.3-1). \vr{[0..15]}
+  /// Parameter: \f$I^\text{HARQ-ACK}_\text{offset}\f$, see TS 36.213 (Table 8.6.3-1). {[0..15]}
   uint16_t betaOffset_ACK_Index;
-  /// Parameter: \f$I^{RI}_\text{offset}\f$, see TS 36.213 (Table 8.6.3-2). \vr{[0..15]}
+  /// Parameter: \f$I^{RI}_\text{offset}\f$, see TS 36.213 (Table 8.6.3-2). {[0..15]}
   uint16_t betaOffset_RI_Index;
-  /// Parameter: \f$I^{CQI}_\text{offset}\f$, see TS 36.213 (Table 8.6.3-3). \vr{[0..15]}
+  /// Parameter: \f$I^{CQI}_\text{offset}\f$, see TS 36.213 (Table 8.6.3-3). {[0..15]}
   uint16_t betaOffset_CQI_Index;
 } PUSCH_CONFIG_DEDICATED;
 
@@ -285,9 +290,10 @@ typedef struct {
 
 /// PDSCH-ConfigCommon from 36.331 RRC spec
 typedef struct {
-  /// Parameter: Reference-signal power, see TS 36.213 (5.2). \vr{[-60..50]}\n Provides the downlink reference-signal EPRE. The actual value in dBm.
+  /// Parameter: Reference-signal power, see TS 36.213 (5.2). {[-60..50]}\n Provides the downlink reference-signal EPRE. The actual
+  /// value in dBm.
   int8_t referenceSignalPower;
-  /// Parameter: \f$P_B\f$, see TS 36.213 (Table 5.2-1). \vr{[0..3]}
+  /// Parameter: \f$P_B\f$, see TS 36.213 (Table 5.2-1). {[0..3]}
   uint8_t p_b;
 } PDSCH_CONFIG_COMMON;
 
@@ -311,13 +317,15 @@ typedef struct {
 
 /// SoundingRS-UL-ConfigCommon Information Element from 36.331 RRC spec
 typedef struct {
-  /// enabled flag=1 means SRS is enabled. \vr{[0..1]}
+  /// enabled flag=1 means SRS is enabled. {[0..1]}
   uint8_t enabled_flag;
-  /// Parameter: SRS Bandwidth Configuration, see TS 36.211 (table 5.5.3.2-1, 5.5.3.2-2, 5.5.3.2-3 and 5.5.3.2-4). \vr{[0..7]}\n Actual configuration depends on UL bandwidth. \note the specification sais it is an enumerated value.
+  /// Parameter: SRS Bandwidth Configuration, see TS 36.211 (table 5.5.3.2-1, 5.5.3.2-2, 5.5.3.2-3 and 5.5.3.2-4). {[0..7]}\n Actual
+  /// configuration depends on UL bandwidth. \note the specification sais it is an enumerated value.
   uint8_t srs_BandwidthConfig;
-  /// Parameter: SRS SubframeConfiguration, see TS 36.211 (table 5.5.3.3-1 for FDD, table 5.5.3.3-2 for TDD). \vr{[0..15]} \note the specification sais it is an enumerated value.
+  /// Parameter: SRS SubframeConfiguration, see TS 36.211 (table 5.5.3.3-1 for FDD, table 5.5.3.3-2 for TDD). {[0..15]} \note the
+  /// specification sais it is an enumerated value.
   uint8_t srs_SubframeConfig;
-  /// Parameter: Simultaneous-AN-and-SRS, see TS 36.213 (8.2). \vr{[0..1]}
+  /// Parameter: Simultaneous-AN-and-SRS, see TS 36.213 (8.2). {[0..1]}
   uint8_t ackNackSRS_SimultaneousTransmission;
   /// Parameter: srsMaxUpPts, see TS 36.211 (5.5.3.2). \details If this field is present, reconfiguration of \f$m^\text{max}_\text{SRS,0}\f$ applies for UpPts, otherwise reconfiguration does not apply.
   uint8_t srs_MaxUpPts;
@@ -390,19 +398,22 @@ typedef struct {
   uint8_t  subframe;
   /// rnti
   uint16_t rnti;
-  /// Parameter: \f$B_\text{SRS}\f$, see TS 36.211 (table 5.5.3.2-1, 5.5.3.2-2, 5.5.3.2-3 and 5.5.3.2-4). \vr{[0..3]} \note the specification sais it is an enumerated value.
+  /// Parameter: \f$B_\text{SRS}\f$, see TS 36.211 (table 5.5.3.2-1, 5.5.3.2-2, 5.5.3.2-3 and 5.5.3.2-4). {[0..3]} \note the
+  /// specification sais it is an enumerated value.
   uint8_t srs_Bandwidth;
-  /// Parameter: SRS hopping bandwidth \f$b_\text{hop}\in\{0,1,2,3\}\f$, see TS 36.211 (5.5.3.2) \vr{[0..3]} \note the specification sais it is an enumerated value.
+  /// Parameter: SRS hopping bandwidth \f$b_\text{hop}\in\{0,1,2,3\}\f$, see TS 36.211 (5.5.3.2) {[0..3]} \note the specification
+  /// sais it is an enumerated value.
   uint8_t srs_HoppingBandwidth;
-  /// Parameter: \f$n_\text{RRC}\f$, see TS 36.211 (5.5.3.2). \vr{[0..23]}
+  /// Parameter: \f$n_\text{RRC}\f$, see TS 36.211 (5.5.3.2). {[0..23]}
   uint8_t freqDomainPosition;
-  /// Parameter: Duration, see TS 36.213 (8.2). \vr{[0..1]} 0 corresponds to "single" and 1 to "indefinite".
+  /// Parameter: Duration, see TS 36.213 (8.2). {[0..1]} 0 corresponds to "single" and 1 to "indefinite".
   uint8_t duration;
-  /// Parameter: \f$k_\text{TC}\in\{0,1\}\f$, see TS 36.211 (5.5.3.2). \vr{[0..1]}
+  /// Parameter: \f$k_\text{TC}\in\{0,1\}\f$, see TS 36.211 (5.5.3.2). {[0..1]}
   uint8_t transmissionComb;
-  /// Parameter: \f$I_\text{SRS}\f$, see TS 36.213 (table 8.2-1). \vr{[0..1023]}
+  /// Parameter: \f$I_\text{SRS}\f$, see TS 36.213 (table 8.2-1). {[0..1023]}
   uint16_t srs_ConfigIndex;
-  /// Parameter: \f$n^\text{CS}_\text{SRS}\f$. See TS 36.211 (5.5.3.1). \vr{[0..7]} \note the specification sais it is an enumerated value.
+  /// Parameter: \f$n^\text{CS}_\text{SRS}\f$. See TS 36.211 (5.5.3.1). {[0..7]} \note the specification sais it is an enumerated
+  /// value.
   uint8_t cyclicShift;
   // Parameter: internal implementation: UE SRS configured
   uint8_t srsConfigDedicatedSetup;
@@ -414,15 +425,20 @@ typedef struct {
 
 /// UplinkPowerControlDedicated Information Element from 36.331 RRC spec
 typedef struct {
-  /// Parameter: \f$P_\text{0\_UE\_PUSCH}(1)\f$, see TS 36.213 (5.1.1.1), unit dB. \vr{[-8..7]}\n This field is applicable for non-persistent scheduling, only.
+  /// Parameter: \f$P_\text{0\_UE\_PUSCH}(1)\f$, see TS 36.213 (5.1.1.1), unit dB. {[-8..7]}\n This field is applicable for
+  /// non-persistent scheduling, only.
   int8_t p0_UE_PUSCH;
-  /// Parameter: Ks, see TS 36.213 (5.1.1.1). \vr{[0..1]}\n en0 corresponds to value 0 corresponding to state “disabled”. en1 corresponds to value 1.25 corresponding to “enabled”. \note the specification sais it is an enumerated value. \warning the enumeration values do not correspond to the given values in the specification (en1 should be 1.25).
+  /// Parameter: Ks, see TS 36.213 (5.1.1.1). {[0..1]}\n en0 corresponds to value 0 corresponding to state “disabled”. en1
+  /// corresponds to value 1.25 corresponding to “enabled”. \note the specification sais it is an enumerated value. \warning the
+  /// enumeration values do not correspond to the given values in the specification (en1 should be 1.25).
   uint8_t deltaMCS_Enabled;
-  /// Parameter: Accumulation-enabled, see TS 36.213 (5.1.1.1). \vr{[0..1]} 1 corresponds to "enabled" whereas 0 corresponds to "disabled".
+  /// Parameter: Accumulation-enabled, see TS 36.213 (5.1.1.1). {[0..1]} 1 corresponds to "enabled" whereas 0 corresponds to
+  /// "disabled".
   uint8_t accumulationEnabled;
-  /// Parameter: \f$P_\text{0\_UE\_PUCCH}(1)\f$, see TS 36.213 (5.1.2.1), unit dB. \vr{[-8..7]}
+  /// Parameter: \f$P_\text{0\_UE\_PUCCH}(1)\f$, see TS 36.213 (5.1.2.1), unit dB. {[-8..7]}
   int8_t p0_UE_PUCCH;
-  /// Parameter: \f$P_\text{SRS\_OFFSET}\f$, see TS 36.213 (5.1.3.1). \vr{[0..15]}\n For Ks=1.25 (\ref deltaMCS_Enabled), the actual parameter value is pSRS_Offset value - 3. For Ks=0, the actual parameter value is -10.5 + 1.5*pSRS_Offset value.
+  /// Parameter: \f$P_\text{SRS\_OFFSET}\f$, see TS 36.213 (5.1.3.1). {[0..15]}\n For Ks=1.25 (\ref deltaMCS_Enabled), the actual
+  /// parameter value is pSRS_Offset value - 3. For Ks=0, the actual parameter value is -10.5 + 1.5*pSRS_Offset value.
   int8_t pSRS_Offset;
   /// Specifies the filtering coefficient for RSRP measurements used to calculate path loss, as specified in TS 36.213 (5.1.1.1).\details The same filtering mechanism applies as for quantityConfig described in 5.5.3.2. \note the specification sais it is an enumerated value.
   uint8_t filterCoefficient;
@@ -452,39 +468,46 @@ typedef enum {
 
 /// UplinkPowerControlCommon Information Element from 36.331 RRC spec \note this structure does not currently make use of \ref deltaFList_PUCCH_t.
 typedef struct {
-  /// Parameter: \f$P_\text{0\_NOMINAL\_PUSCH}(1)\f$, see TS 36.213 (5.1.1.1), unit dBm. \vr{[-126..24]}\n This field is applicable for non-persistent scheduling, only.
+  /// Parameter: \f$P_\text{0\_NOMINAL\_PUSCH}(1)\f$, see TS 36.213 (5.1.1.1), unit dBm. {[-126..24]}\n This field is applicable for
+  /// non-persistent scheduling, only.
   int8_t p0_NominalPUSCH;
   /// Parameter: \f$\alpha\f$, see TS 36.213 (5.1.1.1) \warning the enumeration values do not correspond to the given values in the specification (al04 should be 0.4, ...)!
   PUSCH_alpha_t alpha;
-  /// Parameter: \f$P_\text{0\_NOMINAL\_PUCCH}\f$ See TS 36.213 (5.1.2.1), unit dBm. \vr{[-127..-96]}
+  /// Parameter: \f$P_\text{0\_NOMINAL\_PUCCH}\f$ See TS 36.213 (5.1.2.1), unit dBm. {[-127..-96]}
   int8_t p0_NominalPUCCH;
-  /// Parameter: \f$\Delta_\text{PREAMBLE\_Msg3}\f$ see TS 36.213 (5.1.1.1). \vr{[-1..6]}\n Actual value = IE value * 2 [dB].
+  /// Parameter: \f$\Delta_\text{PREAMBLE\_Msg3}\f$ see TS 36.213 (5.1.1.1). {[-1..6]}\n Actual value = IE value * 2 [dB].
   int8_t deltaPreambleMsg3;
-  /// Parameter: \f$\Delta_\text{F\_PUCCH}(F)\f$ for the PUCCH format 1, see TS 36.213 (5.1.2). \vr{[0..2]} \warning check value range, why is this a long? \note the specification sais it is an enumerated value.
+  /// Parameter: \f$\Delta_\text{F\_PUCCH}(F)\f$ for the PUCCH format 1, see TS 36.213 (5.1.2). {[0..2]} \warning check value range,
+  /// why is this a long? \note the specification sais it is an enumerated value.
   long deltaF_PUCCH_Format1;
-  /// Parameter: \f$\Delta_\text{F\_PUCCH}(F)\f$ for the PUCCH format 1a, see TS 36.213 (5.1.2). \vr{[0..2]} \warning check value range, why is this a long? \note the specification sais it is an enumerated value.
+  /// Parameter: \f$\Delta_\text{F\_PUCCH}(F)\f$ for the PUCCH format 1a, see TS 36.213 (5.1.2). {[0..2]} \warning check value
+  /// range, why is this a long? \note the specification sais it is an enumerated value.
   long deltaF_PUCCH_Format1a;
-  /// Parameter: \f$\Delta_\text{F\_PUCCH}(F)\f$ for the PUCCH format 1b, see TS 36.213 (5.1.2). \vr{[0..2]} \warning check value range, why is this a long? \note the specification sais it is an enumerated value.
+  /// Parameter: \f$\Delta_\text{F\_PUCCH}(F)\f$ for the PUCCH format 1b, see TS 36.213 (5.1.2). {[0..2]} \warning check value
+  /// range, why is this a long? \note the specification sais it is an enumerated value.
   long deltaF_PUCCH_Format1b;
-  /// Parameter: \f$\Delta_\text{F\_PUCCH}(F)\f$ for the PUCCH format 2, see TS 36.213 (5.1.2). \vr{[0..3]} \warning check value range, why is this a long? \note the specification sais it is an enumerated value.
+  /// Parameter: \f$\Delta_\text{F\_PUCCH}(F)\f$ for the PUCCH format 2, see TS 36.213 (5.1.2). {[0..3]} \warning check value range,
+  /// why is this a long? \note the specification sais it is an enumerated value.
   long deltaF_PUCCH_Format2;
-  /// Parameter: \f$\Delta_\text{F\_PUCCH}(F)\f$ for the PUCCH format 2a, see TS 36.213 (5.1.2). \vr{[0..2]} \warning check value range, why is this a long? \note the specification sais it is an enumerated value.
+  /// Parameter: \f$\Delta_\text{F\_PUCCH}(F)\f$ for the PUCCH format 2a, see TS 36.213 (5.1.2). {[0..2]} \warning check value
+  /// range, why is this a long? \note the specification sais it is an enumerated value.
   long deltaF_PUCCH_Format2a;
-  /// Parameter: \f$\Delta_\text{F\_PUCCH}(F)\f$ for the PUCCH format 2b, see TS 36.213 (5.1.2). \vr{[0..2]} \warning check value range, why is this a long? \note the specification sais it is an enumerated value.
+  /// Parameter: \f$\Delta_\text{F\_PUCCH}(F)\f$ for the PUCCH format 2b, see TS 36.213 (5.1.2). {[0..2]} \warning check value
+  /// range, why is this a long? \note the specification sais it is an enumerated value.
   long deltaF_PUCCH_Format2b;
 } UL_POWER_CONTROL_CONFIG_COMMON;
 
 /// Union for \ref TPC_PDCCH_CONFIG::tpc_Index.
 typedef union {
-  /// Index of N when DCI format 3 is used. See TS 36.212 (5.3.3.1.6). \vr{[1..15]}
+  /// Index of N when DCI format 3 is used. See TS 36.212 (5.3.3.1.6). {[1..15]}
   uint8_t indexOfFormat3;
-  /// Index of M when DCI format 3A is used. See TS 36.212 (5.3.3.1.7). \vr{[1..31]}
+  /// Index of M when DCI format 3A is used. See TS 36.212 (5.3.3.1.7). {[1..31]}
   uint8_t indexOfFormat3A;
 } TPC_INDEX_t;
 
 /// TPC-PDCCH-Config Information Element from 36.331 RRC spec
 typedef struct {
-  /// RNTI for power control using DCI format 3/3A, see TS 36.212. \vr{[0..65535]}
+  /// RNTI for power control using DCI format 3/3A, see TS 36.212. {[0..65535]}
   uint16_t rnti;
   /// Index of N or M, see TS 36.212 (5.3.3.1.6 and 5.3.3.1.7), where N or M is dependent on the used DCI format (i.e. format 3 or 3a).
   TPC_INDEX_t tpc_Index;
@@ -501,9 +524,9 @@ typedef enum {
 
 /// SchedulingRequestConfig Information Element from 36.331 RRC spec
 typedef struct {
-  /// Parameter: \f$n^{(1)}_\text{PUCCH,SRI}\f$, see TS 36.213 (10.1). \vr{[0..2047]}
+  /// Parameter: \f$n^{(1)}_\text{PUCCH,SRI}\f$, see TS 36.213 (10.1). {[0..2047]}
   uint16_t sr_PUCCH_ResourceIndex;
-  /// Parameter: \f$I_\text{SR}\f$, see TS 36.213 (10.1). \vr{[0..155]}
+  /// Parameter: \f$I_\text{SR}\f$, see TS 36.213 (10.1). {[0..155]}
   uint8_t sr_ConfigIndex;
   /// Parameter for SR transmission in TS 36.321 (5.4.4). \details The value n4 corresponds to 4 transmissions, n8 corresponds to 8 transmissions and so on.
   DSR_TRANSMAX_t dsr_TransMax;
@@ -511,15 +534,17 @@ typedef struct {
 
 /// CQI-ReportPeriodic
 typedef struct {
-  /// Parameter: \f$n^{(2)}_\text{PUCCH}\f$, see TS 36.213 (7.2). \vr{[0..1185]}, -1 indicates inactivity
+  /// Parameter: \f$n^{(2)}_\text{PUCCH}\f$, see TS 36.213 (7.2). {[0..1185]}, -1 indicates inactivity
   int16_t cqi_PUCCH_ResourceIndex;
-  /// Parameter: CQI/PMI Periodicity and Offset Configuration Index \f$I_\text{CQI/PMI}\f$, see TS 36.213 (tables 7.2.2-1A and 7.2.2-1C). \vr{[0..1023]}
+  /// Parameter: CQI/PMI Periodicity and Offset Configuration Index \f$I_\text{CQI/PMI}\f$, see TS 36.213 (tables 7.2.2-1A
+  /// and 7.2.2-1C). {[0..1023]}
   int16_t cqi_PMI_ConfigIndex;
-  /// Parameter: K, see 36.213 (4.2.2). \vr{[1..4]}
+  /// Parameter: K, see 36.213 (4.2.2). {[1..4]}
   uint8_t K;
-  /// Parameter: RI Config Index \f$I_\text{RI}\f$, see TS 36.213 (7.2.2-1B). \vr{[0..1023]}, -1 indicates inactivity
+  /// Parameter: RI Config Index \f$I_\text{RI}\f$, see TS 36.213 (7.2.2-1B). {[0..1023]}, -1 indicates inactivity
   int16_t ri_ConfigIndex;
-  /// Parameter: Simultaneous-AN-and-CQI, see TS 36.213 (10.1). \vr{[0..1]} 1 indicates that simultaneous transmission of ACK/NACK and CQI is allowed.
+  /// Parameter: Simultaneous-AN-and-CQI, see TS 36.213 (10.1). {[0..1]} 1 indicates that simultaneous transmission of ACK/NACK and
+  /// CQI is allowed.
   uint8_t simultaneousAckNackAndCQI;
   /// parameter computed from Tables 7.2.2-1A and 7.2.2-1C
   uint16_t Npd;
@@ -540,7 +565,7 @@ typedef enum {
 typedef struct {
   /// Parameter: reporting mode. Value rm12 corresponds to Mode 1-2, rm20 corresponds to Mode 2-0, rm22 corresponds to Mode 2-2 etc. PUSCH reporting modes are described in TS 36.213 [23, 7.2.1].
   CQI_REPORTMODEAPERIODIC cqi_ReportModeAperiodic;
-  /// Parameter: \f$\Delta_\text{offset}\f$, see TS 36.213 (7.2.3). \vr{[-1..6]}\n Actual value = IE value * 2 [dB].
+  /// Parameter: \f$\Delta_\text{offset}\f$, see TS 36.213 (7.2.3). {[-1..6]}\n Actual value = IE value * 2 [dB].
   int8_t nomPDSCH_RS_EPRE_Offset;
   CQI_REPORTPERIODIC CQI_ReportPeriodic;
 } CQI_REPORT_CONFIG;
@@ -549,15 +574,25 @@ typedef struct {
 typedef struct {
   /// MBSFN subframe occurance. \details Radio-frames that contain MBSFN subframes occur when equation SFN mod radioFrameAllocationPeriod = radioFrameAllocationOffset is satisfied. When fourFrames is used for subframeAllocation, the equation defines the first radio frame referred to in the description below. Values n1 and n2 are not applicable when fourFrames is used. \note the specification sais it is an enumerated value {n1, n2, n4, n8, n16, n32}.
   int radioframeAllocationPeriod;
-  /// MBSFN subframe occurance. \vr{[0..7]}\n Radio-frames that contain MBSFN subframes occur when equation SFN mod radioFrameAllocationPeriod = radioFrameAllocationOffset is satisfied. When fourFrames is used for subframeAllocation, the equation defines the first radio frame referred to in the description below. Values n1 and n2 are not applicable when fourFrames is used.
+  /// MBSFN subframe occurance. {[0..7]}\n Radio-frames that contain MBSFN subframes occur when equation SFN mod
+  /// radioFrameAllocationPeriod = radioFrameAllocationOffset is satisfied. When fourFrames is used for subframeAllocation, the
+  /// equation defines the first radio frame referred to in the description below. Values n1 and n2 are not applicable when
+  /// fourFrames is used.
   int radioframeAllocationOffset;
-  /// oneFrame or fourFrames. \vr{[0..1]}
+  /// oneFrame or fourFrames. {[0..1]}
   int fourFrames_flag;
-  /// Subframe configuration. \vr{[0..63]} (\ref fourFrames_flag == 0) or \vr{[0..16777215]} (\ref fourFrames_flag == 1)
+  /// Subframe configuration. {[0..63]} (\ref fourFrames_flag == 0) or {[0..16777215]} (\ref fourFrames_flag == 1)
   /// \par fourFrames_flag == 0
-  /// "1" denotes that the corresponding subframe is allocated for MBSFN. The following mapping applies:\n FDD: The first/leftmost bit defines the MBSFN allocation for subframe #1, the second bit for #2, third bit for #3 , fourth bit for #6, fifth bit for #7, sixth bit for #8.\n TDD: The first/leftmost bit defines the allocation for subframe #3, the second bit for #4, third bit for #7, fourth bit for #8, fifth bit for #9. Uplink subframes are not allocated. The last bit is not used.
-  /// \par fourFrames_flag == 1
-  /// A bit-map indicating MBSFN subframe allocation in four consecutive radio frames, "1" denotes that the corresponding subframe is allocated for MBSFN. The bitmap is interpreted as follows:\n FDD: Starting from the first radioframe and from the first/leftmost bit in the bitmap, the allocation applies to subframes #1, #2, #3 , #6, #7, and #8 in the sequence of the four radio-frames.\n TDD: Starting from the first radioframe and from the first/leftmost bit in the bitmap, the allocation applies to subframes #3, #4, #7, #8, and #9 in the sequence of the four radio-frames. The last four bits are not used. Uplink subframes are not allocated.
+  /// "1" denotes that the corresponding subframe is allocated for MBSFN. The following mapping applies:\n FDD: The first/leftmost
+  /// bit defines the MBSFN allocation for subframe #1, the second bit for #2, third bit for #3 , fourth bit for #6, fifth bit for
+  /// #7, sixth bit for #8.\n TDD: The first/leftmost bit defines the allocation for subframe #3, the second bit for #4, third bit
+  /// for #7, fourth bit for #8, fifth bit for #9. Uplink subframes are not allocated. The last bit is not used. \par
+  /// fourFrames_flag == 1 A bit-map indicating MBSFN subframe allocation in four consecutive radio frames, "1" denotes that the
+  /// corresponding subframe is allocated for MBSFN. The bitmap is interpreted as follows:\n FDD: Starting from the first radioframe
+  /// and from the first/leftmost bit in the bitmap, the allocation applies to subframes #1, #2, #3 , #6, #7, and #8 in the sequence
+  /// of the four radio-frames.\n TDD: Starting from the first radioframe and from the first/leftmost bit in the bitmap, the
+  /// allocation applies to subframes #3, #4, #7, #8, and #9 in the sequence of the four radio-frames. The last four bits are not
+  /// used. Uplink subframes are not allocated.
   int mbsfn_SubframeConfig;
 } MBSFN_config_t;
 
diff --git a/openair1/PHY/impl_defs_lte_NB_IoT.h b/openair1/PHY/impl_defs_lte_NB_IoT.h
index 4389d51d7810a703543d00f3743276f1ef00f5d5..50b66409ed1ce06f9614865c5046d11c68fb604d 100644
--- a/openair1/PHY/impl_defs_lte_NB_IoT.h
+++ b/openair1/PHY/impl_defs_lte_NB_IoT.h
@@ -44,15 +44,15 @@ typedef enum {SF_DL_NB_IoT, SF_UL_NB_IoT, SF_S_NB_IoT} NB_IoT_subframe_t;
 /////////////////////////
   /// Union for \ref TPC_PDCCH_CONFIG::tpc_Index.
 typedef union {
-  /// Index of N when DCI format 3 is used. See TS 36.212 (5.3.3.1.6). \vr{[1..15]}
+  /// Index of N when DCI format 3 is used. See TS 36.212 (5.3.3.1.6). {[1..15]}
   uint8_t indexOfFormat3;
-  /// Index of M when DCI format 3A is used. See TS 36.212 (5.3.3.1.7). \vr{[1..31]}
+  /// Index of M when DCI format 3A is used. See TS 36.212 (5.3.3.1.7). {[1..31]}
   uint8_t indexOfFormat3A;
 } TPC_INDEX_NB_IoT_t;
 
 /// TPC-PDCCH-Config Information Element from 36.331 RRC spec
 typedef struct {
-  /// RNTI for power control using DCI format 3/3A, see TS 36.212. \vr{[0..65535]}
+  /// RNTI for power control using DCI format 3/3A, see TS 36.212. {[0..65535]}
   uint16_t rnti;
   /// Index of N or M, see TS 36.212 (5.3.3.1.6 and 5.3.3.1.7), where N or M is dependent on the used DCI format (i.e. format 3 or 3a).
   TPC_INDEX_NB_IoT_t tpc_Index;
@@ -72,22 +72,22 @@ typedef enum {
 
 /// PUCCH-ConfigDedicated from 36.331 RRC spec
 typedef struct {
-  /// Flag to indicate ACK NAK repetition activation, see TS 36.213 (10.1). \vr{[0..1]}
+  /// Flag to indicate ACK NAK repetition activation, see TS 36.213 (10.1). {[0..1]}
   uint8_t ackNackRepetition;
   /// Parameter: \f$N_\text{ANRep}\f$, see TS 36.213 (10.1).
   ACKNAKREP_NB_IoT_t repetitionFactor;
-  /// Parameter: \f$n^{(1)}_\text{PUCCH,ANRep}\f$, see TS 36.213 (10.1). \vr{[0..2047]}
+  /// Parameter: \f$n^{(1)}_\text{PUCCH,ANRep}\f$, see TS 36.213 (10.1). {[0..2047]}
   uint16_t n1PUCCH_AN_Rep;
   /// Feedback mode, see TS 36.213 (7.3). \details Applied to both PUCCH and PUSCH feedback. For TDD, should always be set to bundling.
   ANFBmode_NB_IoT_t tdd_AckNackFeedbackMode;
 } PUCCH_CONFIG_DEDICATED_NB_IoT;
   // UE specific PUSCH configuration.
 typedef struct {
-  /// Parameter: \f$I^\text{HARQ-ACK}_\text{offset}\f$, see TS 36.213 (Table 8.6.3-1). \vr{[0..15]}
+  /// Parameter: \f$I^\text{HARQ-ACK}_\text{offset}\f$, see TS 36.213 (Table 8.6.3-1). {[0..15]}
   uint16_t betaOffset_ACK_Index;
-  /// Parameter: \f$I^{RI}_\text{offset}\f$, see TS 36.213 (Table 8.6.3-2). \vr{[0..15]}
+  /// Parameter: \f$I^{RI}_\text{offset}\f$, see TS 36.213 (Table 8.6.3-2). {[0..15]}
   uint16_t betaOffset_RI_Index;
-  /// Parameter: \f$I^{CQI}_\text{offset}\f$, see TS 36.213 (Table 8.6.3-3). \vr{[0..15]}
+  /// Parameter: \f$I^{CQI}_\text{offset}\f$, see TS 36.213 (Table 8.6.3-3). {[0..15]}
   uint16_t betaOffset_CQI_Index;
 } PUSCH_CONFIG_DEDICATED_NB_IoT;
 /// Enumeration for Parameter \f$P_A\f$ \ref PDSCH_CONFIG_DEDICATED::p_a.
@@ -110,39 +110,46 @@ typedef struct {
 
 /// UplinkPowerControlDedicated Information Element from 36.331 RRC spec
 typedef struct {
-  /// Parameter: \f$P_\text{0\_UE\_PUSCH}(1)\f$, see TS 36.213 (5.1.1.1), unit dB. \vr{[-8..7]}\n This field is applicable for non-persistent scheduling, only.
+  /// Parameter: \f$P_\text{0\_UE\_PUSCH}(1)\f$, see TS 36.213 (5.1.1.1), unit dB. {[-8..7]}\n This field is applicable for
+  /// non-persistent scheduling, only.
   int8_t p0_UE_PUSCH;
-  /// Parameter: Ks, see TS 36.213 (5.1.1.1). \vr{[0..1]}\n en0 corresponds to value 0 corresponding to state “disabled”. en1 corresponds to value 1.25 corresponding to “enabled”. \note the specification sais it is an enumerated value. \warning the enumeration values do not correspond to the given values in the specification (en1 should be 1.25).
+  /// Parameter: Ks, see TS 36.213 (5.1.1.1). {[0..1]}\n en0 corresponds to value 0 corresponding to state “disabled”. en1
+  /// corresponds to value 1.25 corresponding to “enabled”. \note the specification sais it is an enumerated value. \warning the
+  /// enumeration values do not correspond to the given values in the specification (en1 should be 1.25).
   uint8_t deltaMCS_Enabled;
-  /// Parameter: Accumulation-enabled, see TS 36.213 (5.1.1.1). \vr{[0..1]} 1 corresponds to "enabled" whereas 0 corresponds to "disabled".
+  /// Parameter: Accumulation-enabled, see TS 36.213 (5.1.1.1). {[0..1]} 1 corresponds to "enabled" whereas 0 corresponds to
+  /// "disabled".
   uint8_t accumulationEnabled;
-  /// Parameter: \f$P_\text{0\_UE\_PUCCH}(1)\f$, see TS 36.213 (5.1.2.1), unit dB. \vr{[-8..7]}
+  /// Parameter: \f$P_\text{0\_UE\_PUCCH}(1)\f$, see TS 36.213 (5.1.2.1), unit dB. {[-8..7]}
   int8_t p0_UE_PUCCH;
-  /// Parameter: \f$P_\text{SRS\_OFFSET}\f$, see TS 36.213 (5.1.3.1). \vr{[0..15]}\n For Ks=1.25 (\ref deltaMCS_Enabled), the actual parameter value is pSRS_Offset value - 3. For Ks=0, the actual parameter value is -10.5 + 1.5*pSRS_Offset value.
+  /// Parameter: \f$P_\text{SRS\_OFFSET}\f$, see TS 36.213 (5.1.3.1). {[0..15]}\n For Ks=1.25 (\ref deltaMCS_Enabled), the actual
+  /// parameter value is pSRS_Offset value - 3. For Ks=0, the actual parameter value is -10.5 + 1.5*pSRS_Offset value.
   int8_t pSRS_Offset;
   /// Specifies the filtering coefficient for RSRP measurements used to calculate path loss, as specified in TS 36.213 (5.1.1.1).\details The same filtering mechanism applies as for quantityConfig described in 5.5.3.2. \note the specification sais it is an enumerated value.
   uint8_t filterCoefficient;
 } UL_POWER_CONTROL_DEDICATED_NB_IoT;
 
 /// Union for \ref TPC_PDCCH_CONFIG::tpc_Index.
-//typedef union {
-  /// Index of N when DCI format 3 is used. See TS 36.212 (5.3.3.1.6). \vr{[1..15]}
- // uint8_t indexOfFormat3;
-  /// Index of M when DCI format 3A is used. See TS 36.212 (5.3.3.1.7). \vr{[1..31]}
- // uint8_t indexOfFormat3A;
+// typedef union {
+/// Index of N when DCI format 3 is used. See TS 36.212 (5.3.3.1.6). {[1..15]}
+// uint8_t indexOfFormat3;
+/// Index of M when DCI format 3A is used. See TS 36.212 (5.3.3.1.7). {[1..31]}
+// uint8_t indexOfFormat3A;
 //} TPC_INDEX_NB_IoT_t;
 
 /// CQI-ReportPeriodic
 typedef struct {
-  /// Parameter: \f$n^{(2)}_\text{PUCCH}\f$, see TS 36.213 (7.2). \vr{[0..1185]}, -1 indicates inactivity
+  /// Parameter: \f$n^{(2)}_\text{PUCCH}\f$, see TS 36.213 (7.2). {[0..1185]}, -1 indicates inactivity
   int16_t cqi_PUCCH_ResourceIndex;
-  /// Parameter: CQI/PMI Periodicity and Offset Configuration Index \f$I_\text{CQI/PMI}\f$, see TS 36.213 (tables 7.2.2-1A and 7.2.2-1C). \vr{[0..1023]}
+  /// Parameter: CQI/PMI Periodicity and Offset Configuration Index \f$I_\text{CQI/PMI}\f$, see TS 36.213 (tables 7.2.2-1A
+  /// and 7.2.2-1C). {[0..1023]}
   int16_t cqi_PMI_ConfigIndex;
-  /// Parameter: K, see 36.213 (4.2.2). \vr{[1..4]}
+  /// Parameter: K, see 36.213 (4.2.2). {[1..4]}
   uint8_t K;
-  /// Parameter: RI Config Index \f$I_\text{RI}\f$, see TS 36.213 (7.2.2-1B). \vr{[0..1023]}, -1 indicates inactivity
+  /// Parameter: RI Config Index \f$I_\text{RI}\f$, see TS 36.213 (7.2.2-1B). {[0..1023]}, -1 indicates inactivity
   int16_t ri_ConfigIndex;
-  /// Parameter: Simultaneous-AN-and-CQI, see TS 36.213 (10.1). \vr{[0..1]} 1 indicates that simultaneous transmission of ACK/NACK and CQI is allowed.
+  /// Parameter: Simultaneous-AN-and-CQI, see TS 36.213 (10.1). {[0..1]} 1 indicates that simultaneous transmission of ACK/NACK and
+  /// CQI is allowed.
   uint8_t simultaneousAckNackAndCQI;
   /// parameter computed from Tables 7.2.2-1A and 7.2.2-1C
   uint16_t Npd;
@@ -163,26 +170,29 @@ typedef enum {
 typedef struct {
   /// Parameter: reporting mode. Value rm12 corresponds to Mode 1-2, rm20 corresponds to Mode 2-0, rm22 corresponds to Mode 2-2 etc. PUSCH reporting modes are described in TS 36.213 [23, 7.2.1].
   CQI_REPORTMODEAPERIODIC_NB_IoT cqi_ReportModeAperiodic;
-  /// Parameter: \f$\Delta_\text{offset}\f$, see TS 36.213 (7.2.3). \vr{[-1..6]}\n Actual value = IE value * 2 [dB].
+  /// Parameter: \f$\Delta_\text{offset}\f$, see TS 36.213 (7.2.3). {[-1..6]}\n Actual value = IE value * 2 [dB].
   int8_t nomPDSCH_RS_EPRE_Offset;
   CQI_REPORTPERIODIC_NB_IoT CQI_ReportPeriodic;
 } CQI_REPORT_CONFIG_NB_IoT;
 
 /// SoundingRS-UL-ConfigDedicated Information Element from 36.331 RRC spec
 typedef struct {
-  /// Parameter: \f$B_\text{SRS}\f$, see TS 36.211 (table 5.5.3.2-1, 5.5.3.2-2, 5.5.3.2-3 and 5.5.3.2-4). \vr{[0..3]} \note the specification sais it is an enumerated value.
+  /// Parameter: \f$B_\text{SRS}\f$, see TS 36.211 (table 5.5.3.2-1, 5.5.3.2-2, 5.5.3.2-3 and 5.5.3.2-4). {[0..3]} \note the
+  /// specification sais it is an enumerated value.
   uint8_t srs_Bandwidth;
-  /// Parameter: SRS hopping bandwidth \f$b_\text{hop}\in\{0,1,2,3\}\f$, see TS 36.211 (5.5.3.2) \vr{[0..3]} \note the specification sais it is an enumerated value.
+  /// Parameter: SRS hopping bandwidth \f$b_\text{hop}\in\{0,1,2,3\}\f$, see TS 36.211 (5.5.3.2) {[0..3]} \note the specification
+  /// sais it is an enumerated value.
   uint8_t srs_HoppingBandwidth;
-  /// Parameter: \f$n_\text{RRC}\f$, see TS 36.211 (5.5.3.2). \vr{[0..23]}
+  /// Parameter: \f$n_\text{RRC}\f$, see TS 36.211 (5.5.3.2). {[0..23]}
   uint8_t freqDomainPosition;
-  /// Parameter: Duration, see TS 36.213 (8.2). \vr{[0..1]} 0 corresponds to "single" and 1 to "indefinite".
+  /// Parameter: Duration, see TS 36.213 (8.2). {[0..1]} 0 corresponds to "single" and 1 to "indefinite".
   uint8_t duration;
-  /// Parameter: \f$k_\text{TC}\in\{0,1\}\f$, see TS 36.211 (5.5.3.2). \vr{[0..1]}
+  /// Parameter: \f$k_\text{TC}\in\{0,1\}\f$, see TS 36.211 (5.5.3.2). {[0..1]}
   uint8_t transmissionComb;
-  /// Parameter: \f$I_\text{SRS}\f$, see TS 36.213 (table 8.2-1). \vr{[0..1023]}
+  /// Parameter: \f$I_\text{SRS}\f$, see TS 36.213 (table 8.2-1). {[0..1023]}
   uint16_t srs_ConfigIndex;
-  /// Parameter: \f$n^\text{CS}_\text{SRS}\f$. See TS 36.211 (5.5.3.1). \vr{[0..7]} \note the specification sais it is an enumerated value.
+  /// Parameter: \f$n^\text{CS}_\text{SRS}\f$. See TS 36.211 (5.5.3.1). {[0..7]} \note the specification sais it is an enumerated
+  /// value.
   uint8_t cyclicShift;
   // Parameter: internal implementation: UE SRS configured
   uint8_t srsConfigDedicatedSetup;
@@ -204,9 +214,9 @@ typedef enum {
 
 /// SchedulingRequestConfig Information Element from 36.331 RRC spec
 typedef struct {
-  /// Parameter: \f$n^{(1)}_\text{PUCCH,SRI}\f$, see TS 36.213 (10.1). \vr{[0..2047]}
+  /// Parameter: \f$n^{(1)}_\text{PUCCH,SRI}\f$, see TS 36.213 (10.1). {[0..2047]}
   uint16_t sr_PUCCH_ResourceIndex;
-  /// Parameter: \f$I_\text{SR}\f$, see TS 36.213 (10.1). \vr{[0..155]}
+  /// Parameter: \f$I_\text{SR}\f$, see TS 36.213 (10.1). {[0..155]}
   uint8_t sr_ConfigIndex;
   /// Parameter for SR transmission in TS 36.321 (5.4.4). \details The value n4 corresponds to 4 transmissions, n8 corresponds to 8 transmissions and so on.
   DSR_TRANSMAX_NB_IoT_t dsr_TransMax;
@@ -404,7 +414,7 @@ typedef struct {
 typedef struct {
   /// nprach_CP_Length_r13, for the CP length(unit us) only 66.7 and 266.7 is implemented
   uint16_t nprach_CP_Length;
-  /// The criterion for UEs to select a NPRACH resource. Up to 2 RSRP threshold values can be signalled.  \vr{[1..2]}
+  /// The criterion for UEs to select a NPRACH resource. Up to 2 RSRP threshold values can be signalled.  {[1..2]}
   rsrp_ThresholdsNPrachInfoList *rsrp_ThresholdsPrachInfoList;
   /// NPRACH Parameters List
   NPRACH_List_NB_IoT_t nprach_ParametersList;
@@ -413,7 +423,7 @@ typedef struct {
 
 /// NPDSCH-ConfigCommon from 36.331 RRC spec
 typedef struct {
-  ///see TS 36.213 (16.2). \vr{[-60..50]}\n Provides the downlink reference-signal EPRE. The actual value in dBm.
+  /// see TS 36.213 (16.2). {[-60..50]}\n Provides the downlink reference-signal EPRE. The actual value in dBm.
   uint16_t nrs_Power;
 } NPDSCH_CONFIG_COMMON;
 
@@ -433,11 +443,11 @@ typedef struct{
 
 /// UL-ReferenceSignalsNPUSCH from 36.331 RRC spec
 typedef struct {
-  /// Parameter: Group-hopping-enabled, see TS 36.211 (5.5.1.3). \vr{[0..1]}
+  /// Parameter: Group-hopping-enabled, see TS 36.211 (5.5.1.3). {[0..1]}
   uint8_t groupHoppingEnabled;
-  /// , see TS 36.211 (5.5.1.3). \vr{[0..29]}
+  /// , see TS 36.211 (5.5.1.3). {[0..29]}
   uint8_t groupAssignmentNPUSCH;
-  /// Parameter: cyclicShift, see TS 36.211 (Table 5.5.2.1.1-2). \vr{[0..7]}
+  /// Parameter: cyclicShift, see TS 36.211 (Table 5.5.2.1.1-2). {[0..7]}
   uint8_t cyclicShift;
   /// nPRS for cyclic shift of DRS \note not part of offical UL-ReferenceSignalsPUSCH ASN1 specification.
   uint8_t nPRS[20];
@@ -454,7 +464,7 @@ typedef struct {
   uint8_t ack_NACK_NumRepetitions_Msg4[3];
   /// SRS SubframeConfiguration. See TS 36.211 [21, table 5.5.3.3-1]. Value sc0 corresponds to value 0, sc1 to value 1 and so on.
   uint8_t srs_SubframeConfig;
-  /// Parameter: \f$N^{HO}_{RB}\f$, see TS 36.211 (5.3.4). \vr{[0..98]}
+  /// Parameter: \f$N^{HO}_{RB}\f$, see TS 36.211 (5.3.4). {[0..98]}
   DMRS_CONFIG_t dmrs_Config;
   /// Ref signals configuration
   UL_REFERENCE_SIGNALS_NPUSCH_t ul_ReferenceSignalsNPUSCH;
diff --git a/openair1/PHY/impl_defs_top.h b/openair1/PHY/impl_defs_top.h
index b83800df86be3680f3e67b772f0f331760c90593..5c461b27b0b3ec69fb573062e8089af723be592f 100644
--- a/openair1/PHY/impl_defs_top.h
+++ b/openair1/PHY/impl_defs_top.h
@@ -37,6 +37,7 @@
  * @{
 
  * @defgroup _PHY_RF_INTERFACE_ PHY - RF Interface
+ * @{
  * @ingroup _PHY_RF_INTERFACE_
  * @{
  * @defgroup _GENERIC_PHY_RF_INTERFACE_ Generic PHY - RF Interface
@@ -44,13 +45,13 @@
  * @defgroup _BLADERF_PHY_RF_INTERFACE_    PHY - BLADERF RF Interface
  * @defgroup _LMSSDR_PHY_RF_INTERFACE_    PHY - LMSSDR RF Interface
  * @}
- *
+ * @}
  * @ingroup _ref_implementation_
  * @{
  * This module is responsible for defining the generic interface between PHY and RF Target
  * @}
- 
- * @defgroup _openair1_ openair1 Reference Implementation 
+
+ * @defgroup _openair1_ openair1 Reference Implementation
  * @ingroup _ref_implementation_
  * @{
 
diff --git a/openair1/PHY/impl_defs_top_NB_IoT.h b/openair1/PHY/impl_defs_top_NB_IoT.h
index 5966d04fc49d69063b27c8f17f7dc878bc0f518e..f9560cb228f5a90e5f43c0675f44682ba1f444aa 100644
--- a/openair1/PHY/impl_defs_top_NB_IoT.h
+++ b/openair1/PHY/impl_defs_top_NB_IoT.h
@@ -33,352 +33,10 @@
 #ifndef __PHY_IMPLEMENTATION_DEFS_NB_IOT_H__
 #define __PHY_IMPLEMENTATION_DEFS_NB_IOT_H__
 
-
 #include "common/openairinterface5g_limits.h"
-/** @defgroup _ref_implementation_ OpenAirInterface LTE Implementation
- * @{
-
- * @defgroup _PHY_RF_INTERFACE_ PHY - RF Interface
- * @ingroup _PHY_RF_INTERFACE_
- * @{
- * @defgroup _GENERIC_PHY_RF_INTERFACE_ Generic PHY - RF Interface
- * @defgroup _USRP_PHY_RF_INTERFACE_    PHY - USRP RF Interface
- * @defgroup _BLADERF_PHY_RF_INTERFACE_    PHY - BLADERF RF Interface
- * @defgroup _LMSSDR_PHY_RF_INTERFACE_    PHY - LMSSDR RF Interface
- * @}
- *
- * @ingroup _ref_implementation_
- * @{
- * This module is responsible for defining the generic interface between PHY and RF Target
- * @}
- 
- * @defgroup _openair1_ openair1 Reference Implementation 
- * @ingroup _ref_implementation_
- * @{
-
-
- * @defgroup _physical_layer_ref_implementation_ Physical Layer Reference Implementation
- * @ingroup _openair1_
- * @{
-
-
- * @defgroup _PHY_STRUCTURES_ Basic Structures and Memory Initialization
- * @ingroup _physical_layer_ref_implementation_
- * @{
- * This module is responsible for defining and initializing the PHY variables during static configuration of OpenAirInterface.
- * @}
-
- * @defgroup _PHY_DSP_TOOLS_ DSP Tools
- * @ingroup _physical_layer_ref_implementation_
- * @{
- * This module is responsible for basic signal processing related to inner-MODEM processing.
- * @}
-
- * @defgroup _PHY_MODULATION_ Modulation and Demodulation
- * @ingroup _physical_layer_ref_implementation_
- * @{
- * This module is responsible for procedures related to OFDMA modulation and demodulation.
- * @}
-
- * @defgroup _PHY_PARAMETER_ESTIMATION_BLOCKS_ Parameter Estimation
- * @ingroup _physical_layer_ref_implementation_
- * @{
- * This module is responsible for procedures related to OFDMA frequency-domain channel estimation for LTE Downlink Channels.
- * @}
-
- * @defgroup _PHY_CODING_BLOCKS_ Channel Coding/Decoding Functions
- * @ingroup _physical_layer_ref_implementation_
- * @{
- * This module is responsible for procedures related to channel coding/decoding, rate-matching, segementation and interleaving.
- * @}
-
- * @defgroup _PHY_TRANSPORT_ Transport/Physical Channel Processing
- * @ingroup _physical_layer_ref_implementation_
- * @{
- * This module is responsible for defining and processing the PHY procedures (TX/RX) related to transport and physical channels.
- * @}
-
- * @defgroup _PHY_PROCEDURES_ Physical Layer Procedures
- * @ingroup _physical_layer_ref_implementation_
- * @{
- * This module is responsible for defining and processing the PHY procedures (TX/RX) related to transport and physical channels.
- * @}
-
- * @}
- * @}
- * @}
- */
-
-//#include "types.h"
-
-/*
-
-
-#define NUMBER_OF_OFDM_CARRIERS (frame_parms->ofdm_symbol_size)
-#define NUMBER_OF_SYMBOLS_PER_FRAME (frame_parms->symbols_per_tti*LTE_NUMBER_OF_SUBFRAMES_PER_FRAME)
-#define NUMBER_OF_USEFUL_CARRIERS (12*frame_parms->N_RB_DL)
-#define NUMBER_OF_ZERO_CARRIERS (NUMBER_OF_OFDM_CARRIERS-NUMBER_OF_USEFUL_CARRIERS)
-#define NUMBER_OF_USEFUL_CARRIERS_BYTES (NUMBER_OF_USEFUL_CARRIERS>>2)
-#define HALF_NUMBER_OF_USEFUL_CARRIERS (NUMBER_OF_USEFUL_CARRIERS>>1)
-#define HALF_NUMBER_OF_USEFUL_CARRIERS_BYTES (HALF_NUMBER_OF_USEFUL_CARRIERS>>2)
-#define FIRST_CARRIER_OFFSET (HALF_NUMBER_OF_USEFUL_CARRIERS+NUMBER_OF_ZERO_CARRIERS)
-#define NUMBER_OF_OFDM_SYMBOLS_PER_SLOT (NUMBER_OF_SYMBOLS_PER_FRAME/LTE_SLOTS_PER_FRAME)
-
-#ifdef EMOS
-#define EMOS_SCH_INDEX 1
-#endif //EMOS
-
-#define EXTENSION_TYPE (PHY_config->PHY_framing.Extension_type)
-
-#define NUMBER_OF_OFDM_CARRIERS_BYTES   NUMBER_OF_OFDM_CARRIERS*4
-//#define NUMBER_OF_USEFUL_CARRIERS_BYTES NUMBER_OF_USEFUL_CARRIERS*4
-#define HALF_NUMBER_OF_USER_CARRIERS_BYTES NUMBER_OF_USEFUL_CARRIERS/2
-
-#define CYCLIC_PREFIX_LENGTH (frame_parms->nb_prefix_samples)
-#define CYCLIC_PREFIX_LENGTH_SAMPLES (CYCLIC_PREFIX_LENGTH*2)
-#define CYCLIC_PREFIX_LENGTH_BYTES (CYCLIC_PREFIX_LENGTH*4)
-#define CYCLIC_PREFIX_LENGTH0 (frame_parms->nb_prefix_samples0)
-#define CYCLIC_PREFIX_LENGTH_SAMPLES0 (CYCLIC_PREFIX_LENGTH0*2)
-#define CYCLIC_PREFIX_LENGTH_BYTES0 (CYCLIC_PREFIX_LENGTH0*4)
-
-#define OFDM_SYMBOL_SIZE_SAMPLES ((NUMBER_OF_OFDM_CARRIERS + CYCLIC_PREFIX_LENGTH)*2)   // 16-bit units (i.e. real samples)
-#define OFDM_SYMBOL_SIZE_SAMPLES0 ((NUMBER_OF_OFDM_CARRIERS + CYCLIC_PREFIX_LENGTH0)*2)   // 16-bit units (i.e. real samples)
-#define OFDM_SYMBOL_SIZE_SAMPLES_MAX 4096   // 16-bit units (i.e. real samples)
-#define OFDM_SYMBOL_SIZE_COMPLEX_SAMPLES (OFDM_SYMBOL_SIZE_SAMPLES/2)                   // 32-bit units (i.e. complex samples)
-#define OFDM_SYMBOL_SIZE_COMPLEX_SAMPLES0 (OFDM_SYMBOL_SIZE_SAMPLES0/2)                   // 32-bit units (i.e. complex samples)
-#define OFDM_SYMBOL_SIZE_SAMPLES_NO_PREFIX ((NUMBER_OF_OFDM_CARRIERS)*2)
-#define OFDM_SYMBOL_SIZE_COMPLEX_SAMPLES_NO_PREFIX (OFDM_SYMBOL_SIZE_SAMPLES_NO_PREFIX/2)
-#define OFDM_SYMBOL_SIZE_BYTES (OFDM_SYMBOL_SIZE_SAMPLES*2)
-#define OFDM_SYMBOL_SIZE_BYTES0 (OFDM_SYMBOL_SIZE_SAMPLES0*2)
-#define OFDM_SYMBOL_SIZE_BYTES_NO_PREFIX (OFDM_SYMBOL_SIZE_SAMPLES_NO_PREFIX*2)
-
-#define SLOT_LENGTH_BYTES (frame_parms->samples_per_tti<<1) // 4 bytes * samples_per_tti/2
-#define SLOT_LENGTH_BYTES_NO_PREFIX (OFDM_SYMBOL_SIZE_BYTES_NO_PREFIX * NUMBER_OF_OFDM_SYMBOLS_PER_SLOT)
-
-#define FRAME_LENGTH_COMPLEX_SAMPLES (frame_parms->samples_per_tti*LTE_NUMBER_OF_SUBFRAMES_PER_FRAME)
-#define FRAME_LENGTH_SAMPLES (FRAME_LENGTH_COMPLEX_SAMPLES*2)
-#define FRAME_LENGTH_SAMPLES_NO_PREFIX (NUMBER_OF_SYMBOLS_PER_FRAME*OFDM_SYMBOL_SIZE_SAMPLES_NO_PREFIX)
-#define FRAME_LENGTH_COMPLEX_SAMPLES_NO_PREFIX (FRAME_LENGTH_SAMPLES_NO_PREFIX/2)
-
-#define NUMBER_OF_CARRIERS_PER_GROUP (NUMBER_OF_USEFUL_CARRIERS/NUMBER_OF_FREQUENCY_GROUPS)
-
-#define RX_PRECISION (16)
-#define LOG2_RX_PRECISION (4)
-#define RX_OUTPUT_SHIFT (4)
-
-
-#define SAMPLE_SIZE_BYTES    2                                           // 2 bytes/real sample
-
-#define FRAME_LENGTH_BYTES   (FRAME_LENGTH_SAMPLES * SAMPLE_SIZE_BYTES)  // frame size in bytes
-#define FRAME_LENGTH_BYTES_NO_PREFIX   (FRAME_LENGTH_SAMPLES_NO_PREFIX * SAMPLE_SIZE_BYTES)  // frame size in bytes
-
-
-#define FFT_SCALE_FACTOR     8                                           // Internal Scaling for FFT
-#define DMA_BLKS_PER_SLOT    (SLOT_LENGTH_BYTES/2048)                    // Number of DMA blocks per slot
-#define SLOT_TIME_NS         (SLOT_LENGTH_SAMPLES*(1e3)/7.68)            // slot time in ns
-
-#define NB_ANTENNA_PORTS_ENB  6                                         // total number of eNB antenna ports
-
-#define TARGET_RX_POWER 50    // Target digital power for the AGC
-#define TARGET_RX_POWER_MAX 65    // Maximum digital power, such that signal does not saturate (value found by simulation)
-#define TARGET_RX_POWER_MIN 35    // Minimum digital power, anything below will be discarded (value found by simulation)
-
-//the min and max gains have to match the calibrated gain table
-//#define MAX_RF_GAIN 160
-//#define MIN_RF_GAIN 96
-#define MAX_RF_GAIN 200
-#define MIN_RF_GAIN 80
-
-#define PHY_SYNCH_OFFSET ((OFDM_SYMBOL_SIZE_COMPLEX_SAMPLES)-1)  // OFFSET of BEACON SYNCH
-#define PHY_SYNCH_MIN_POWER 1000
-#define PHY_SYNCH_THRESHOLD 100
-
-*/
-
 #define ONE_OVER_SQRT2_Q15_NB_IoT 23170
 
-/*
-#define ONE_OVER_2_Q15 16384
-
-// QAM amplitude definitions
-
-/// First Amplitude for QAM16 (\f$ 2^{15} \times 2/\sqrt{10}\f$)
-#define QAM16_n1 20724
-/// Second Amplitude for QAM16 (\f$ 2^{15} \times 1/\sqrt{10}\f$)
-#define QAM16_n2 10362
-
-///First Amplitude for QAM64 (\f$ 2^{15} \times 4/\sqrt{42}\f$)
-#define QAM64_n1 20225
-///Second Amplitude for QAM64 (\f$ 2^{15} \times 2/\sqrt{42}\f$)
-#define QAM64_n2 10112
-///Third Amplitude for QAM64 (\f$ 2^{15} \times 1/\sqrt{42}\f$)
-#define QAM64_n3 5056
-
-/// First Amplitude for QAM16 for TM5 (\f$ 2^{15} \times 2/sqrt(20)\f$)
-#define QAM16_TM5_n1 14654
-/// Second Amplitude for QAM16 for TM5 Receiver (\f$ 2^{15} \times 1/\sqrt{20}\f$)
-#define QAM16_TM5_n2 7327
-
-///First Amplitude for QAM64 (\f$ 2^{15} \times 4/\sqrt{84}\f$)
-#define QAM64_TM5_n1 14301
-///Second Amplitude for QAM64 (\f$ 2^{15} \times 2/\sqrt{84}\f$)
-#define QAM64_TM5_n2 7150
-///Third Amplitude for QAM64 for TM5 Receiver (\f$ 2^{15} \times 1/\sqrt{84}\f$)
-#define QAM64_TM5_n3 3575
-
-
-#ifdef BIT8_RXMUX
-#define PERROR_SHIFT 0
-#else
-#define PERROR_SHIFT 10
-#endif
-
-#define BIT8_TX_SHIFT 2
-#define BIT8_TX_SHIFT_DB 12
-
-//#define CHBCH_RSSI_MIN -75
-
-#ifdef BIT8_TX
-#define AMP 128
-#else
-#define AMP 512//1024 //4096
-#endif
-
-#define AMP_OVER_SQRT2 ((AMP*ONE_OVER_SQRT2_Q15)>>15)
-#define AMP_OVER_2 (AMP>>1)
-
-/// Threshold for PUCCH Format 1 detection
-#define PUCCH1_THRES 0
-/// Threshold for PUCCH Format 1a/1b detection
-#define PUCCH1a_THRES 4
-
-/// Data structure for transmission.
-typedef struct {
-  /// RAW TX sample buffer
-  char *TX_DMA_BUFFER[2];
-} TX_VARS ;
-
-/// Data structure for reception.
-typedef struct {
-  /// RAW TX sample buffer
-  char *TX_DMA_BUFFER[2];
-  /// RAW RX sample buffer
-  int *RX_DMA_BUFFER[2];
-} TX_RX_VARS;
-
-//! \brief Extension Type /
-typedef enum {
-  CYCLIC_PREFIX,
-  CYCLIC_SUFFIX,
-  ZEROS,
-  NONE
-} Extension_t;
-	
-/// Measurement Variables
-*/
 #define NUMBER_OF_SUBBANDS_MAX_NB_IoT 13
-/*
-#define NUMBER_OF_HARQ_PID_MAX 8
-
-#define MAX_FRAME_NUMBER 0x400
-#include "common/openairinterface5g_limits.h"
-
-#define NUMBER_OF_RN_MAX 3
-typedef enum {no_relay=1,unicast_relay_type1,unicast_relay_type2, multicast_relay} relaying_type_t;
-
-typedef struct {
-  //unsigned int   rx_power[NUMBER_OF_CONNECTED_eNB_MAX][NB_ANTENNAS_RX];     //! estimated received signal power (linear)
-  //unsigned short rx_power_dB[NUMBER_OF_CONNECTED_eNB_MAX][NB_ANTENNAS_RX];  //! estimated received signal power (dB)
-  //unsigned short rx_avg_power_dB[NUMBER_OF_CONNECTED_eNB_MAX];              //! estimated avg received signal power (dB)
-
-  // RRC measurements
-  uint32_t rssi;
-  int n_adj_cells;
-  unsigned int adj_cell_id[6];
-  uint32_t rsrq[7];
-  uint32_t rsrp[7];
-  float rsrp_filtered[7]; // after layer 3 filtering
-  float rsrq_filtered[7];
-  // common measurements
-  //! estimated noise power (linear)
-  unsigned int   n0_power[NB_ANTENNAS_RX];
-  //! estimated noise power (dB)
-  unsigned short n0_power_dB[NB_ANTENNAS_RX];
-  //! total estimated noise power (linear)
-  unsigned int   n0_power_tot;
-  //! total estimated noise power (dB)
-  unsigned short n0_power_tot_dB;
-  //! average estimated noise power (linear)
-  unsigned int   n0_power_avg;
-  //! average estimated noise power (dB)
-  unsigned short n0_power_avg_dB;
-  //! total estimated noise power (dBm)
-  short n0_power_tot_dBm;
-
-  // UE measurements
-  //! estimated received spatial signal power (linear)
-  int            rx_spatial_power[NUMBER_OF_CONNECTED_eNB_MAX][2][2];
-  //! estimated received spatial signal power (dB)
-  unsigned short rx_spatial_power_dB[NUMBER_OF_CONNECTED_eNB_MAX][2][2];
-
-  /// estimated received signal power (sum over all TX antennas)
-  //int            wideband_cqi[NUMBER_OF_CONNECTED_eNB_MAX][NB_ANTENNAS_RX];
-  int            rx_power[NUMBER_OF_CONNECTED_eNB_MAX][NB_ANTENNAS_RX];
-  /// estimated received signal power (sum over all TX antennas)
-  //int            wideband_cqi_dB[NUMBER_OF_CONNECTED_eNB_MAX][NB_ANTENNAS_RX];
-  unsigned short rx_power_dB[NUMBER_OF_CONNECTED_eNB_MAX][NB_ANTENNAS_RX];
-
-  /// estimated received signal power (sum over all TX/RX antennas)
-  int            rx_power_tot[NUMBER_OF_CONNECTED_eNB_MAX]; //NEW
-  /// estimated received signal power (sum over all TX/RX antennas)
-  unsigned short rx_power_tot_dB[NUMBER_OF_CONNECTED_eNB_MAX]; //NEW
-
-  //! estimated received signal power (sum of all TX/RX antennas, time average)
-  int            rx_power_avg[NUMBER_OF_CONNECTED_eNB_MAX];
-  //! estimated received signal power (sum of all TX/RX antennas, time average, in dB)
-  unsigned short rx_power_avg_dB[NUMBER_OF_CONNECTED_eNB_MAX];
-
-  /// SINR (sum of all TX/RX antennas, in dB)
-  int            wideband_cqi_tot[NUMBER_OF_CONNECTED_eNB_MAX];
-  /// SINR (sum of all TX/RX antennas, time average, in dB)
-  int            wideband_cqi_avg[NUMBER_OF_CONNECTED_eNB_MAX];
-
-  //! estimated rssi (dBm)
-  short          rx_rssi_dBm[NUMBER_OF_CONNECTED_eNB_MAX];
-  //! estimated correlation (wideband linear) between spatial channels (computed in dlsch_demodulation)
-  int            rx_correlation[NUMBER_OF_CONNECTED_eNB_MAX][2];
-  //! estimated correlation (wideband dB) between spatial channels (computed in dlsch_demodulation)
-  int            rx_correlation_dB[NUMBER_OF_CONNECTED_eNB_MAX][2];
-
-  /// Wideband CQI (sum of all RX antennas, in dB, for precoded transmission modes (3,4,5,6), up to 4 spatial streams)
-  int            precoded_cqi_dB[NUMBER_OF_CONNECTED_eNB_MAX+1][4];
-  /// Subband CQI per RX antenna (= SINR)
-  int            subband_cqi[NUMBER_OF_CONNECTED_eNB_MAX][NB_ANTENNAS_RX][NUMBER_OF_SUBBANDS_MAX];
-  /// Total Subband CQI  (= SINR)
-  int            subband_cqi_tot[NUMBER_OF_CONNECTED_eNB_MAX][NUMBER_OF_SUBBANDS_MAX];
-  /// Subband CQI in dB (= SINR dB)
-  int            subband_cqi_dB[NUMBER_OF_CONNECTED_eNB_MAX][NB_ANTENNAS_RX][NUMBER_OF_SUBBANDS_MAX];
-  /// Total Subband CQI
-  int            subband_cqi_tot_dB[NUMBER_OF_CONNECTED_eNB_MAX][NUMBER_OF_SUBBANDS_MAX];
-  /// Wideband PMI for each RX antenna
-  int            wideband_pmi_re[NUMBER_OF_CONNECTED_eNB_MAX][NB_ANTENNAS_RX];
-  /// Wideband PMI for each RX antenna
-  int            wideband_pmi_im[NUMBER_OF_CONNECTED_eNB_MAX][NB_ANTENNAS_RX];
-  ///Subband PMI for each RX antenna
-  int            subband_pmi_re[NUMBER_OF_CONNECTED_eNB_MAX][NUMBER_OF_SUBBANDS_MAX][NB_ANTENNAS_RX];
-  ///Subband PMI for each RX antenna
-  int            subband_pmi_im[NUMBER_OF_CONNECTED_eNB_MAX][NUMBER_OF_SUBBANDS_MAX][NB_ANTENNAS_RX];
-  /// chosen RX antennas (1=Rx antenna 1, 2=Rx antenna 2, 3=both Rx antennas)
-  unsigned char           selected_rx_antennas[NUMBER_OF_CONNECTED_eNB_MAX][NUMBER_OF_SUBBANDS_MAX];
-  /// Wideband Rank indication
-  unsigned char  rank[NUMBER_OF_CONNECTED_eNB_MAX];
-  /// Number of RX Antennas
-  unsigned char  nb_antennas_rx;
-  /// DLSCH error counter
-  // short          dlsch_errors;
-
-} PHY_MEASUREMENTS;
-*/
 typedef enum {no_relay_NB_IoT=1,unicast_relay_type1_NB_IoT,unicast_relay_type2_NB_IoT, multicast_relay_NB_IoT} relaying_type_t_NB_IoT;
 typedef struct {
   //unsigned int   rx_power[NUMBER_OF_CONNECTED_eNB_MAX][NB_ANTENNAS_RX];     //! estimated received signal power (linear)
@@ -526,10 +184,5 @@ typedef struct {
   int            subband_cqi_tot_dB[NUMBER_OF_UE_MAX_NB_IoT][100];
 
 } PHY_MEASUREMENTS_eNB_NB_IoT;
-/*
-#define MCS_COUNT 28
-#define MCS_TABLE_LENGTH_MAX 64
-*/
-#endif //__PHY_IMPLEMENTATION_DEFS_H__ 
-/**@} 
-*/
+
+#endif //__PHY_IMPLEMENTATION_DEFS_H__
diff --git a/openair1/SCHED/phy_procedures_lte_common.c b/openair1/SCHED/phy_procedures_lte_common.c
index 0263f6f3cc617f650ba3debe0babd5bb81c12ace..db1981726577003fd3e62a451924e34f3730c47f 100644
--- a/openair1/SCHED/phy_procedures_lte_common.c
+++ b/openair1/SCHED/phy_procedures_lte_common.c
@@ -19,16 +19,16 @@
  *      contact@openairinterface.org
  */
 
-/*! \file phy_procedures_lte_eNB.c
-* \brief Implementation of common utilities for eNB/UE procedures from 36.213 LTE specifications
-* \author R. Knopp, F. Kaltenberger
-* \date 2011
-* \version 0.1
-* \company Eurecom
-* \email: knopp@eurecom.fr,florian.kaltenberger@eurecom.fr
-* \note
-* \warning
-*/
+/*! \file phy_procedures_lte_common.c
+ * \brief Implementation of common utilities for eNB/UE procedures from 36.213 LTE specifications
+ * \author R. Knopp, F. Kaltenberger
+ * \date 2011
+ * \version 0.1
+ * \company Eurecom
+ * \email: knopp@eurecom.fr,florian.kaltenberger@eurecom.fr
+ * \note
+ * \warning
+ */
 #include "PHY/defs_eNB.h"
 #include "PHY/defs_UE.h"
 #include "SCHED/sched_common_extern.h"
diff --git a/openair1/SCHED/phy_procedures_lte_eNb.c b/openair1/SCHED/phy_procedures_lte_eNb.c
index a9cba05d4d5d0ad9884519c86b2fa5ae6b47bf74..cdd1837bb4c03b2000b0670090f79c048366903a 100644
--- a/openair1/SCHED/phy_procedures_lte_eNb.c
+++ b/openair1/SCHED/phy_procedures_lte_eNb.c
@@ -19,7 +19,7 @@
  *      contact@openairinterface.org
  */
 
-/*! \file phy_procedures_lte_eNB.c
+/*! \file phy_procedures_lte_eNb.c
  * \brief Implementation of eNB procedures from 36.213 LTE specifications / FeMBMS 36.231 LTE procedures v14.2
  * \author R. Knopp, F. Kaltenberger, N. Nikaein, X. Foukas, J. Morgade
  * \date 2011
diff --git a/openair1/SCHED/prach_procedures.c b/openair1/SCHED/prach_procedures.c
index fd78ed4bfb73eb913ca5dd197207ed9f74ec3e32..e4d4bff17ead625134cb40aada7711ce3bae24c6 100644
--- a/openair1/SCHED/prach_procedures.c
+++ b/openair1/SCHED/prach_procedures.c
@@ -19,7 +19,7 @@
  *      contact@openairinterface.org
  */
 
-/*! \file phy_procedures_lte_eNB.c
+/*! \file prach_procedures.c
  * \brief Implementation of eNB procedures from 36.213 LTE specifications
  * \author R. Knopp, F. Kaltenberger, N. Nikaein, X. Foukas
  * \date 2011
diff --git a/openair1/SCHED/sched_eNB.h b/openair1/SCHED/sched_eNB.h
index efdb1bd199ffb544a8df92b1ed424564b1a91e42..50c6dc2efa7f243873b9834094f3443740a41e9d 100644
--- a/openair1/SCHED/sched_eNB.h
+++ b/openair1/SCHED/sched_eNB.h
@@ -85,11 +85,9 @@ enum openair_HARQ_TYPE {
  * @{
  */
 
-
-
 /*! \brief Scheduling for eNB TX procedures in normal subframes.
   @param phy_vars_eNB Pointer to eNB variables on which to act
-  @param abstraction_flag Indicator of PHY abstraction
+@param proc
   @param do_meas Do inline timing measurement
 */
 void phy_procedures_eNB_TX(PHY_VARS_eNB *phy_vars_eNB,L1_rxtx_proc_t *proc,int do_meas);
@@ -100,15 +98,9 @@ void phy_procedures_eNB_TX(PHY_VARS_eNB *phy_vars_eNB,L1_rxtx_proc_t *proc,int d
 */
 void phy_procedures_eNB_uespec_RX(PHY_VARS_eNB *phy_vars_eNB,L1_rxtx_proc_t *proc);
 
-/*! \brief Scheduling for eNB TX procedures in TDD S-subframes.
-  @param phy_vars_eNB Pointer to eNB variables on which to act
-  @param proc Pointer to RXn-TXnp4 proc information
-  @param r_type indicates the relaying operation: 0: no_relaying, 1: unicast relaying type 1, 2: unicast relaying type 2, 3: multicast relaying
-*/
-
 /*! \brief Scheduling for eNB RX common procedures in normal subframes.
   @param phy_vars_eNB Pointer to eNB variables on which to act
-  @param abstraction_flag Indicator of PHY abstraction
+  @param proc is context
 */
 void phy_procedures_eNB_common_RX(PHY_VARS_eNB *phy_vars_eNB,L1_rxtx_proc_t *proc);
 
@@ -120,11 +112,12 @@ void phy_procedures_eNB_S_TX(PHY_VARS_eNB *phy_vars_eNB);
 
 /*! \brief Scheduling for eNB RX procedures in TDD S-subframes.
   @param phy_vars_eNB Pointer to eNB variables on which to act
+@param proc
 */
 void phy_procedures_eNB_S_RX(PHY_VARS_eNB *phy_vars_eNB,L1_rxtx_proc_t *proc);
 
 /*! \brief Scheduling for eNB PRACH RX procedures
-  @param phy_vars_eNB Pointer to eNB variables on which to act
+  @param eNB Pointer to eNB variables on which to act
   @param br_flag indicator for eMTC PRACH
 */
 
@@ -166,12 +159,6 @@ void get_Msg3_alloc_ret(LTE_DL_FRAME_PARMS *frame_parms,
  */
 uint8_t get_Msg3_harq_pid(LTE_DL_FRAME_PARMS *frame_parms,uint32_t frame,uint8_t current_subframe);
 
-/*! \brief Get ULSCH harq_pid from PHICH subframe
-   @param frame_parms Pointer to DL Frame Parameters
-   @param subframe subframe of PHICH
-   @returns harq_pid (0 ... 7)
- */
-
 /*! \brief Function to indicate failure of contention resolution or RA procedure.  It places the UE back in PRACH mode.
     @param Mod_id Instance index of UE
     @param CC_id Component Carrier Index
@@ -181,6 +168,7 @@ void ra_failed(uint8_t Mod_id,uint8_t CC_id,uint8_t eNB_index);
 
 /*! \brief Indicates the SR TXOp in current subframe for eNB and particular UE index.  Implements Table 10.1-5 from 36.213.
   @param phy_vars_eNB Pointer to eNB variables
+@param proc
   @param UE_id ID of UE which may be issuing the SR
   @returns 1 if TXOp is active.
 */
@@ -218,8 +206,7 @@ int is_srs_occasion_common(LTE_DL_FRAME_PARMS *frame_parms,int frame_tx,int subf
 void compute_srs_pos(frame_type_t frameType,uint16_t isrs,uint16_t *psrsPeriodicity,uint16_t *psrsOffset);
 
 void release_rnti_of_phy(module_id_t mod_id);
-/*@}*/
-
+/**@}*/
 
 #endif
 
diff --git a/openair1/SCHED_NR_UE/defs.h b/openair1/SCHED_NR_UE/defs.h
index 30da87a35214eb4808c42d26f3146305b4d3ac9a..e999626bfd4b2ca4cbe29985f27fe7cfb44e3cae 100644
--- a/openair1/SCHED_NR_UE/defs.h
+++ b/openair1/SCHED_NR_UE/defs.h
@@ -94,7 +94,7 @@ typedef struct {
 /*! \brief Scheduling for UE TX procedures in normal subframes.
   @param ue Pointer to UE variables on which to act
   @param proc Pointer to RXn-TXnp4 proc information
-  @param eNB_id Local id of eNB on which to act
+@param phy_data
 */
 void phy_procedures_nrUE_TX(PHY_VARS_NR_UE *ue, const UE_nr_rxtx_proc_t *proc, nr_phy_data_tx_t *phy_data);
 
@@ -113,18 +113,15 @@ int phy_procedures_slot_parallelization_nrUE_RX(PHY_VARS_NR_UE *ue, UE_nr_rxtx_p
 void processSlotTX(void *arg);
 
 /*! \brief UE PRACH procedures.
-    @param
-    @param
-    @param
  */
 void nr_ue_prach_procedures(PHY_VARS_NR_UE *ue, const UE_nr_rxtx_proc_t *proc);
 
 int8_t nr_find_ue(uint16_t rnti, PHY_VARS_eNB *phy_vars_eNB);
 
 /*! \brief UL time alignment procedures for TA application
-  @param PHY_VARS_NR_UE ue
-  @param int slot_tx
-  @param int frame_tx
+  @param ue
+  @param slot_tx
+  @param frame_tx
 */
 void ue_ta_procedures(PHY_VARS_NR_UE *ue, int slot_tx, int frame_tx);
 
@@ -138,10 +135,6 @@ int is_ssb_in_slot(fapi_nr_config_request_t *config, int frame, int slot, NR_DL_
 bool is_csi_rs_in_symbol(fapi_nr_dl_config_csirs_pdu_rel15_t csirs_config_pdu, int symbol);
 
 /*! \brief This function prepares the dl indication to pass to the MAC
-    @param
-    @param
-    @param
-    @param
  */
 void nr_fill_dl_indication(nr_downlink_indication_t *dl_ind,
                            fapi_nr_dci_indication_t *dci_ind,
@@ -153,10 +146,6 @@ void nr_fill_dl_indication(nr_downlink_indication_t *dl_ind,
 /*@}*/
 
 /*! \brief This function prepares the dl rx indication
-    @param
-    @param
-    @param
-    @param
  */
 void nr_fill_rx_indication(fapi_nr_rx_indication_t *rx_ind,
                            uint8_t pdu_type,
@@ -192,4 +181,4 @@ int nr_ue_csi_im_procedures(PHY_VARS_NR_UE *ue, UE_nr_rxtx_proc_t *proc, c16_t r
 void nr_ue_csi_rs_procedures(PHY_VARS_NR_UE *ue, UE_nr_rxtx_proc_t *proc, c16_t rxdataF[][ue->frame_parms.samples_per_slot_wCP]);
 
 #endif
-
+/** @}*/
diff --git a/openair1/SIMULATION/ETH_TRANSPORT/defs.h b/openair1/SIMULATION/ETH_TRANSPORT/defs.h
index 5c4e5ad365e26bcba38d9f64e4179bf7c7b73f22..384f25e950bbe598eb435fcb5fab0650ecc46eaf 100644
--- a/openair1/SIMULATION/ETH_TRANSPORT/defs.h
+++ b/openair1/SIMULATION/ETH_TRANSPORT/defs.h
@@ -19,7 +19,7 @@
  *      contact@openairinterface.org
  */
 
-/*! \file phy_emulation.h
+/*! \file defs.h
  *  \brief specifies the data structure and variable for phy emulation
  *  \author Navid Nikaein, Raymomd Knopp  and Hicham Anouar
  *  \date 2011
diff --git a/openair1/SIMULATION/ETH_TRANSPORT/multicast_link.c b/openair1/SIMULATION/ETH_TRANSPORT/multicast_link.c
index 5ffea3d36e456337391d9c0657a1c77a3301040e..281d42a7a6aeced80b366ab7690ce53eb667963f 100644
--- a/openair1/SIMULATION/ETH_TRANSPORT/multicast_link.c
+++ b/openair1/SIMULATION/ETH_TRANSPORT/multicast_link.c
@@ -19,7 +19,7 @@
  *      contact@openairinterface.org
  */
 
-/*! \file multicast.h
+/*! \file multicast_link.c
  *  \brief
  *  \author Lionel Gauthier and Navid Nikaein
  *  \date 2011
diff --git a/openair1/SIMULATION/ETH_TRANSPORT/multicast_link.h b/openair1/SIMULATION/ETH_TRANSPORT/multicast_link.h
index 3c072e0e3c8911cbed63a09bb3e198fd41ac1b3f..fdea20455b35f44fcb5a6a1952a7ecc88c65e217 100644
--- a/openair1/SIMULATION/ETH_TRANSPORT/multicast_link.h
+++ b/openair1/SIMULATION/ETH_TRANSPORT/multicast_link.h
@@ -19,7 +19,7 @@
  *      contact@openairinterface.org
  */
 
-/*! \file multicast.h
+/*! \file multicast_link.h
  *  \brief
  *  \author Lionel Gauthier and Navid Nikaein
  *  \date 2011
diff --git a/openair1/SIMULATION/TOOLS/rangen_double.c b/openair1/SIMULATION/TOOLS/rangen_double.c
index 80bb33fc6adf796d979b2897fdc4b373d3eda2d0..aeb6bdbc64ac68eb64ce4a0dbde26899efd7c15f 100644
--- a/openair1/SIMULATION/TOOLS/rangen_double.c
+++ b/openair1/SIMULATION/TOOLS/rangen_double.c
@@ -163,7 +163,7 @@ double nfix(void)
   }
 }
 
-/*!\Procedure to create tables for normal distribution kn,wn and fn. */
+/*!Procedure to create tables for normal distribution kn,wn and fn. */
 void tableNor(unsigned long seed)
 {
   jsr = seed;
diff --git a/openair1/SIMULATION/TOOLS/sim.h b/openair1/SIMULATION/TOOLS/sim.h
index 7f6da31b7b37ca398183c791b6449592a10b315a..366e9c6c6e0e6d8a165973608aeb0c8eca2dd895 100644
--- a/openair1/SIMULATION/TOOLS/sim.h
+++ b/openair1/SIMULATION/TOOLS/sim.h
@@ -349,14 +349,14 @@ void set_channeldesc_owner(channel_desc_t *cdesc, channelmod_moduleid_t module_i
 /**
 \brief This function set a model name to a model descriptor, can be later used to identify a allocated channel model
 \param cdesc points to the model descriptor
-\param module_name is the C string to use as model name for the channel pointed by cdesc
+\param modelname is the C string to use as model name for the channel pointed by cdesc
 */
 void set_channeldesc_name(channel_desc_t *cdesc,char *modelname);
 
 /** \fn void get_cexp_doppler(struct complexd *cexp_doppler, channel_desc_t *chan_desc, const uint32_t length)
 \brief This routine generates the complex exponential to apply the Doppler shift
 \param cexp_doppler Output with the complex exponential of Doppler shift
-\param desc Pointer to the channel descriptor
+\param chan_desc Pointer to the channel descriptor
 \param length Size of complex exponential of Doppler shift
 */
 void get_cexp_doppler(struct complexd *cexp_doppler, channel_desc_t *chan_desc, const uint32_t length);
@@ -378,6 +378,7 @@ int random_channel(channel_desc_t *desc, uint8_t abstraction_flag);
 \param ts sampling time
 \param delay introduce delay in terms of number of samples
 \param pdu_bit_map bitmap indicating presence of optional PDUs
+\param ptrs_bit_map
 \param nb_antennas_rx number of receive antennas
 */
 void add_noise(c16_t **rxdata,
@@ -467,9 +468,8 @@ void load_pbch_desc(FILE *pbch_file_fd);
 */
 unsigned int taus(void);
 
-
 /**
-\fn void set_taus_seed(unsigned int seed_init)
+\fn set_taus_seed
 \brief Sets the seed for the Tausworthe generator.
 @param seed_init 0 means generate based on CPU time, otherwise provide the seed
 */
diff --git a/openair2/COMMON/prs_nr_paramdef.h b/openair2/COMMON/prs_nr_paramdef.h
index a96e4086738386eae1dd85dd7ed6c838f29dbf82..3d747ca4b70f05d5af46f49f84142d55a7c4835b 100644
--- a/openair2/COMMON/prs_nr_paramdef.h
+++ b/openair2/COMMON/prs_nr_paramdef.h
@@ -19,8 +19,8 @@
  *      contact@openairinterface.org
  */
 
-/*! \file openair2/COMMON/prs_nr_paramdef.f
- * \brief definition of configuration parameters for PRS 
+/*! \file prs_nr_paramdef.h
+ * \brief definition of configuration parameters for PRS
  * \author
  * \date 2022
  * \version 0.1
diff --git a/openair2/ENB_APP/L1_paramdef.h b/openair2/ENB_APP/L1_paramdef.h
index 5e0ac8a43b8a46a581561d0da99abf815f0ab51b..f6d83c33eea0db9aa18a28d077724b9e9ed37e2c 100644
--- a/openair2/ENB_APP/L1_paramdef.h
+++ b/openair2/ENB_APP/L1_paramdef.h
@@ -19,8 +19,8 @@
  *      contact@openairinterface.org
  */
 
-/*! \file openair2/ENB_APP/L1_paramdef.f
- * \brief definition of configuration parameters for all eNodeB modules 
+/*! \file L1_paramdef.h
+ * \brief definition of configuration parameters for all eNodeB modules
  * \author Francois TABURET
  * \date 2017
  * \version 0.1
diff --git a/openair2/ENB_APP/MACRLC_paramdef.h b/openair2/ENB_APP/MACRLC_paramdef.h
index 298215c21ac9593a9ff563e6c257d8b60b36e610..3bd215c8df55dd401ee89ccac663ea8c715ea480 100644
--- a/openair2/ENB_APP/MACRLC_paramdef.h
+++ b/openair2/ENB_APP/MACRLC_paramdef.h
@@ -19,8 +19,8 @@
  *      contact@openairinterface.org
  */
 
-/*! \file openair2/ENB_APP/MACRLC_paramdef.f
- * \brief definition of configuration parameters for all eNodeB modules 
+/*! \file MACRLC_paramdef.h
+ * \brief definition of configuration parameters for all eNodeB modules
  * \author Francois TABURET
  * \date 2017
  * \version 0.1
@@ -30,7 +30,6 @@
  * \warning
  */
 
-
 #ifndef __ENB_APP_MACRLC_PARAMDEF__H__
 #define __ENB_APP_MACRLC_PARAMDEF__H__
 
diff --git a/openair2/GNB_APP/L1_nr_paramdef.h b/openair2/GNB_APP/L1_nr_paramdef.h
index 933039cd168edab7fa6343f5b1968adbb5ede17d..dcd734847d0e4e4343afe004edf20929fa27193d 100644
--- a/openair2/GNB_APP/L1_nr_paramdef.h
+++ b/openair2/GNB_APP/L1_nr_paramdef.h
@@ -19,8 +19,8 @@
  *      contact@openairinterface.org
  */
 
-/*! \file openair2/GNB_APP/L1_nr_paramdef.f
- * \brief definition of configuration parameters for all eNodeB modules 
+/*! \file L1_nr_paramdef.h
+ * \brief definition of configuration parameters for all eNodeB modules
  * \author Francois TABURET, WEI-TAI CHEN
  * \date 2018
  * \version 0.1
diff --git a/openair2/GNB_APP/MACRLC_nr_paramdef.h b/openair2/GNB_APP/MACRLC_nr_paramdef.h
index 5d69fbc6f21c4a7dda1775ecb251bf5bb501853b..5d8dbf92393af2f642cc8707c7e7f256440df6a4 100644
--- a/openair2/GNB_APP/MACRLC_nr_paramdef.h
+++ b/openair2/GNB_APP/MACRLC_nr_paramdef.h
@@ -19,8 +19,8 @@
  *      contact@openairinterface.org
  */
 
-/*! \file openair2/GNB_APP/MACRLC_nr_paramdef.f
- * \brief definition of configuration parameters for all gNodeB modules 
+/*! \file MACRLC_nr_paramdef.h
+ * \brief definition of configuration parameters for all gNodeB modules
  * \author Francois TABURET, WEI-TAI CHEN
  * \date 2018
  * \version 0.1
@@ -30,7 +30,6 @@
  * \warning
  */
 
-
 #ifndef __GNB_APP_MACRLC_NR_PARAMDEF__H__
 #define __GNB_APP_MACRLC_NR_PARAMDEF__H__
 
diff --git a/openair2/GNB_APP/gnb_paramdef.h b/openair2/GNB_APP/gnb_paramdef.h
index d59ecb9eb3db1f3a9b230cc7fed431fb11e3dbca..92829d98b0aac0cd9e707765dce408f6753f75d0 100644
--- a/openair2/GNB_APP/gnb_paramdef.h
+++ b/openair2/GNB_APP/gnb_paramdef.h
@@ -19,8 +19,8 @@
  *      contact@openairinterface.org
  */
 
-/*! \file openair2/GNB_APP/gnb_paramdef.f
- * \brief definition of configuration parameters for all gNodeB modules 
+/*! \file gnb_paramdef.h
+ * \brief definition of configuration parameters for all gNodeB modules
  * \author Francois TABURET, WEI-TAI CHEN
  * \date 2018
  * \version 0.1
diff --git a/openair2/LAYER2/MAC/config.c b/openair2/LAYER2/MAC/config.c
index d23dc23ebf0f947c6f04f1894eccfd5ef4644ff7..b4d1b307b29f509931dc7b97f066b457bc73fb40 100644
--- a/openair2/LAYER2/MAC/config.c
+++ b/openair2/LAYER2/MAC/config.c
@@ -24,7 +24,7 @@
  * \author  Navid Nikaein and Raymond Knopp
  * \date 2010 - 2014
  * \version 0.1
- * \email: navid.nikaein@eurecom.fr
+ * \email navid.nikaein@eurecom.fr
  * @ingroup _mac
  */
 
diff --git a/openair2/LAYER2/MAC/defs_NB_IoT.h b/openair2/LAYER2/MAC/defs_NB_IoT.h
index a0edf9374e1da28c610a66b87bfc2f4bbdae4f08..92e267324e1caaa0c867c4b36debec5a2d6e4a02 100644
--- a/openair2/LAYER2/MAC/defs_NB_IoT.h
+++ b/openair2/LAYER2/MAC/defs_NB_IoT.h
@@ -1,9 +1,9 @@
 
-/*! \file defs_NB_IoT.c
+/*! \file defs_NB_IoT.h
  * \brief MAC layer structures
  * \author  NTUST BMW Lab./
  * \date 2017
- * \email: 
+ * \email:
  * \version 1.0
  *
  */
diff --git a/openair2/LAYER2/MAC/l1_helpers.c b/openair2/LAYER2/MAC/l1_helpers.c
index 9b26413cb1b468a3960ffb1402d39820743b9641..e7cd775dcdc6ce1fb39be9d187a499036fb1f506 100644
--- a/openair2/LAYER2/MAC/l1_helpers.c
+++ b/openair2/LAYER2/MAC/l1_helpers.c
@@ -19,7 +19,7 @@
  *      contact@openairinterface.org
  */
 
-/*! \file l1_helper.c
+/*! \file l1_helpers.c
 * \brief phy helper function
 * \author Navid Nikaein, Raymond Knopp
 * \date 2012 - 2014
diff --git a/openair2/LAYER2/MAC/mac.h b/openair2/LAYER2/MAC/mac.h
index 702d0d6f563340e1ecdf1098f97e336d34c7fb0c..3de061b07e3fb34805a75723a17d4e7f2e4f0938 100644
--- a/openair2/LAYER2/MAC/mac.h
+++ b/openair2/LAYER2/MAC/mac.h
@@ -19,7 +19,7 @@
 *      contact@openairinterface.org
 */
 
-/*! \file LAYER2/MAC/defs.h
+/*! \file mac.h
 * \brief MAC data structures, constant, and function prototype
 * \author Navid Nikaein and Raymond Knopp
 * \date 2011
@@ -32,7 +32,7 @@
  * @{
  */
 
-/*@}*/
+/**@}*/
 
 #ifndef __LAYER2_MAC_DEFS_H__
 #define __LAYER2_MAC_DEFS_H__
@@ -139,7 +139,7 @@
 #define MIN_CQI_VALUE  0
 /*!\brief maximum value for channel quality indicator */
 #define MAX_CQI_VALUE  15
-/*!\briefmaximum number of supported bandwidth (1.4, 5, 10, 20 MHz) */
+/*!\brief maximum number of supported bandwidth (1.4, 5, 10, 20 MHz) */
 #define MAX_SUPPORTED_BW  4
 /*!\brief CQI values range from 1 to 15 (4 bits) */
 #define CQI_VALUE_RANGE 16
@@ -467,7 +467,6 @@ typedef struct {
 #define SHORT_BSR 29
 /*!\brief LCID of long BSR for ULSCH */
 #define LONG_BSR 30
-/*!\bitmaps for BSR Triggers */
 #define BSR_TRIGGER_NONE    (0) /* No BSR Trigger */
 #define BSR_TRIGGER_REGULAR   (1) /* For Regular and ReTxBSR Expiry Triggers */
 #define BSR_TRIGGER_PERIODIC  (2) /* For BSR Periodic Timer Expiry Trigger */
@@ -1680,5 +1679,5 @@ typedef  struct {
 
 #include "mac_proto.h"
 
-/*@}*/
+/**@}*/
 #endif /*__LAYER2_MAC_DEFS_H__ */
diff --git a/openair2/LAYER2/MAC/mac_extern.h b/openair2/LAYER2/MAC/mac_extern.h
index e3cc8f3392d3b0b549a25088d51bbda17e266722..16ced80f48baaf3ea661c4faa2bfbfcc3fbf616e 100644
--- a/openair2/LAYER2/MAC/mac_extern.h
+++ b/openair2/LAYER2/MAC/mac_extern.h
@@ -19,7 +19,7 @@
  *      contact@openairinterface.org
  */
 
-/*! \file extern.h
+/*! \file mac_extern.h
 * \brief mac externs
 * \author  Navid Nikaein and Raymond Knopp
 * \date 2010 - 2014
diff --git a/openair2/LAYER2/MAC/mac_proto.h b/openair2/LAYER2/MAC/mac_proto.h
index 8a074b5ea8bf97ba634487df95d47a25a020fb35..1a8a1f98bc1db95c27a977c8905999c076b3d567 100644
--- a/openair2/LAYER2/MAC/mac_proto.h
+++ b/openair2/LAYER2/MAC/mac_proto.h
@@ -19,7 +19,7 @@
  *      contact@openairinterface.org
  */
 
-/*! \file LAYER2/MAC/proto.h
+/*! \file mac_proto.h
  * \brief MAC functions prototypes for eNB and UE
  * \author Navid Nikaein and Raymond Knopp
  * \date 2010 - 2014
@@ -35,9 +35,9 @@
 
 /** \fn void schedule_fembms_mib(module_id_t module_idP,frame_t frameP,sub_frame_t subframe);
 \brief MIB scheduling for PBCH. This function requests the MIB from RRC and provides it to L1.
-@param Mod_id Instance ID of eNB
-@param frame Frame index
-@param subframe Subframe number on which to act
+@param module_idP Instance ID of eNB
+@param frameP Frame index
+@param subframeP Subframe number on which to act
 
 */
 
@@ -50,8 +50,8 @@ void schedule_fembms_mib(module_id_t module_idP,
 
 /** \fn void schedule_mib(module_id_t module_idP,frame_t frameP,sub_frame_t subframe);
 \brief MIB scheduling for PBCH. This function requests the MIB from RRC and provides it to L1.
-@param Mod_id Instance ID of eNB
-@param frame Frame index
+@param module_idP Instance ID of eNB
+@param frameP Frame index
 @param subframe Subframe number on which to act
 
 */
@@ -59,81 +59,84 @@ void schedule_fembms_mib(module_id_t module_idP,
 void schedule_mib(module_id_t module_idP,
                   frame_t frameP, sub_frame_t subframeP);
 
-/** \fn void schedule_RA(module_id_t module_idP,frame_t frameP,sub_frame_t subframe);
-\brief First stage of Random-Access Scheduling. Loops over the ras and checks if RAR, Msg3 or its retransmission are to be scheduled in the subframe.  It returns the total number of PRB used for RA SDUs.  For Msg3 it retrieves the L3msg from RRC and fills the appropriate buffers.  For the others it just computes the number of PRBs. Each DCI uses 3 PRBs (format 1A)
-for the message.
-@param Mod_id Instance ID of eNB
-@param frame Frame index
+/** \fn void schedule_RA
+\brief First stage of Random-Access Scheduling. Loops over the ras and checks if RAR, Msg3 or its retransmission are to be scheduled
+in the subframe.  It returns the total number of PRB used for RA SDUs.  For Msg3 it retrieves the L3msg from RRC and fills the
+appropriate buffers.  For the others it just computes the number of PRBs. Each DCI uses 3 PRBs (format 1A) for the message.
+@param module_idP Instance ID of eNB
+@param frameP Frame index
 @param subframe Subframe number on which to act
 */
 
-
 void schedule_RA(module_id_t module_idP, frame_t frameP,
                  sub_frame_t subframe);
 
-/** \brief First stage of SI Scheduling. Gets a SI SDU from RRC if available and computes the MCS required to transport it as a function of the SDU length.  It assumes a length less than or equal to 64 bytes (MCS 6, 3 PRBs).
-@param Mod_id Instance ID of eNB
-@param frame Frame index
-@param subframe Subframe number on which to act
+/** \brief First stage of SI Scheduling. Gets a SI SDU from RRC if available and computes the MCS required to transport it as a
+function of the SDU length.  It assumes a length less than or equal to 64 bytes (MCS 6, 3 PRBs).
+@param module_idP Instance ID of eNB
+@param frameP Frame index
+@param subframeP Subframe number on which to act
 */
 void schedule_SI(module_id_t module_idP, frame_t frameP,
                  sub_frame_t subframeP);
 
-/** \brief First stage of SI Scheduling. Gets a SI SDU from RRC if available and computes the MCS required to transport it as a function of the SDU length.  It assumes a length less than or equal to 64 bytes (MCS 6, 3 PRBs).
-@param Mod_id Instance ID of eNB
-@param frame Frame index
-@param subframe Subframe number on which to act
+/** \brief First stage of SI Scheduling. Gets a SI SDU from RRC if available and computes the MCS required to transport it as a
+function of the SDU length.  It assumes a length less than or equal to 64 bytes (MCS 6, 3 PRBs).
+@param module_idP Instance ID of eNB
+@param frameP Frame index
+@param subframeP Subframe number on which to act
 */
 void schedule_SI_MBMS(module_id_t module_idP, frame_t frameP,
                       sub_frame_t subframeP);
 
-
-/** \brief MBMS scheduling: Checking the position for MBSFN subframes. Create MSI, transfer MCCH from RRC to MAC, transfer MTCHs from RLC to MAC. Multiplexing MSI,MCCH&MTCHs. Return 1 if there are MBSFN data being allocated, otherwise return 0;
-@param Mod_id Instance ID of eNB
-@param frame Frame index
+/** \brief MBMS scheduling: Checking the position for MBSFN subframes. Create MSI, transfer MCCH from RRC to MAC, transfer MTCHs
+from RLC to MAC. Multiplexing MSI,MCCH&MTCHs. Return 1 if there are MBSFN data being allocated, otherwise return 0;
+@param module_idP Instance ID of eNB
+@param CC_id carrier
+@param frameP Frame index
 @param subframe Subframe number on which to act
 */
 int schedule_MBMS(module_id_t module_idP, uint8_t CC_id, frame_t frameP,
                   sub_frame_t subframe);
 
-/** \brief MBMS scheduling: Checking the position for MBSFN subframes. Create MSI, transfer MCCH from RRC to MAC, transfer MTCHs from RLC to MAC. Multiplexing MSI,MCCH&MTCHs. Return 1 if there are MBSFN data being allocated, otherwise return 0;
-@param Mod_id Instance ID of eNB
-@param frame Frame index
+/** \brief MBMS scheduling: Checking the position for MBSFN subframes. Create MSI, transfer MCCH from RRC to MAC, transfer MTCHs
+from RLC to MAC. Multiplexing MSI,MCCH&MTCHs. Return 1 if there are MBSFN data being allocated, otherwise return 0;
+@param module_idP Instance ID of eNB
+@param CC_id carrier index
+@param frameP Frame index
 @param subframe Subframe number on which to act
 */
 int schedule_MBMS_NFAPI(module_id_t module_idP, uint8_t CC_id, frame_t frameP, sub_frame_t subframe);
 
-
 /** \brief check the mapping between sf allocation and sync area, Currently only supports 1:1 mapping
-@param Mod_id Instance ID of eNB
+@param module_idP Instance ID of eNB
+@param CC_id carrier index
 @param mbsfn_sync_area index of mbsfn sync area
-@param[out] index of sf pattern
 */
 int8_t get_mbsfn_sf_alloction(module_id_t module_idP, uint8_t CC_id,
                               uint8_t mbsfn_sync_area);
 
 /** \brief check the mapping between sf allocation and sync area, Currently only supports 1:1 mapping
-@param Mod_id Instance ID of eNB
+@param module_idP  Instance ID of eNB
 @param mbsfn_sync_area index of mbsfn sync area
 @param eNB_index index of eNB
-@param[out] index of sf pattern
 */
 int8_t ue_get_mbsfn_sf_alloction(module_id_t module_idP,
                                  uint8_t mbsfn_sync_area,
                                  unsigned char eNB_index);
 
 /** \brief top ULSCH Scheduling for TDD (config 1-6).
-@param Mod_id Instance ID of eNB
-@param frame Frame index
+@param module_idP Instance ID of eNB
+@param frameP Frame index
 @param subframe Subframe number on which to act
 */
 void schedule_ulsch(module_id_t module_idP, frame_t frameP,
                     sub_frame_t subframe);
 
 /** \brief ULSCH Scheduling per RNTI
-@param Mod_id Instance ID of eNB
+@param module_idP Instance ID of eNB
 @param CC_id The component carrier to schedule
-@param frame Frame index
+@param frameP Frame index
 @param subframe Subframe number on which to act
 @param sched_subframe Subframe number where PUSCH is transmitted (for DAI lookup)
 */
@@ -147,9 +150,12 @@ void schedule_ulsch_rnti_emtc(module_id_t   module_idP,
                               unsigned char sched_subframeP,
                               int          *emtc_active);
 
-/** \brief UE specific DLSCH scheduling. Retrieves next ue to be schduled from round-robin scheduler and gets the appropriate harq_pid for the subframe from PHY. If the process is active and requires a retransmission, it schedules the retransmission with the same PRB count and MCS as the first transmission. Otherwise it consults RLC for DCCH/DTCH SDUs (status with maximum number of available PRBS), builds the MAC header (timing advance sent by default) and copies
-@param Mod_id Instance ID of eNB
-@param frame Frame index
+/** \brief UE specific DLSCH scheduling. Retrieves next ue to be schduled from round-robin scheduler and gets the appropriate
+harq_pid for the subframe from PHY. If the process is active and requires a retransmission, it schedules the retransmission with the
+same PRB count and MCS as the first transmission. Otherwise it consults RLC for DCCH/DTCH SDUs (status with maximum number of
+available PRBS), builds the MAC header (timing advance sent by default) and copies
+@param module_idP Instance ID of eNB
+@param frameP Frame index
 @param subframe Subframe on which to act
 
 @param mbsfn_flag  Indicates that MCH/MCCH is in this subframe
@@ -167,21 +173,22 @@ void schedule_ue_spec_br(module_id_t   module_idP,
 void schedule_ue_spec_phy_test(module_id_t module_idP,frame_t frameP,sub_frame_t subframe,int *mbsfn_flag);
 void schedule_ulsch_phy_test(module_id_t module_idP,frame_t frameP,sub_frame_t subframeP);
 
-
 /** \brief Function for UE/PHY to compute PUSCH transmit power in power-control procedure.
-    @param Mod_id Module id of UE
+    @param module_idP Module id of UE
+    @param CC_id carrier component id of UE
     @returns Po_NOMINAL_PUSCH (PREAMBLE_RECEIVED_TARGET_POWER+DELTA_PREAMBLE
 */
 int8_t get_Po_NOMINAL_PUSCH(module_id_t module_idP, uint8_t CC_id);
 
 /** \brief Function to compute DELTA_PREAMBLE from 36.321 (for RA power ramping procedure and Msg3 PUSCH power control policy)
-    @param Mod_id Module id of UE
+    @param module_idP Module id of UE
+    @param CC_id carrier component id of UE
     @returns DELTA_PREAMBLE
 */
 int8_t get_DELTA_PREAMBLE(module_id_t module_idP, int CC_id);
 
 /** \brief Function for compute deltaP_rampup from 36.321 (for RA power ramping procedure and Msg3 PUSCH power control policy)
-    @param Mod_id Module id of UE
+    @param module_idP Module id of UE
     @param CC_id carrier component id of UE
     @returns deltaP_rampup
 */
@@ -202,7 +209,7 @@ int mac_top_init(int eMBMS_active, char *uecap_xer,
 
 void mac_top_init_eNB(void);
 
-void mac_init_cell_params(int Mod_idP, int CC_idP);
+void mac_init_cell_params(int module_idPP, int CC_idP);
 
 char layer2_init_UE(module_id_t module_idP);
 
@@ -218,14 +225,13 @@ void clear_nfapi_information(eNB_MAC_INST *eNB, int CC_idP,
 
 // eNB functions
 /* \brief This function assigns pre-available RBS to each UE in specified sub-bands before scheduling is done
-@param Mod_id Instance ID of eNB
+@param module_idP Instance ID of eNB
 @param slice_idxP Slice instance index for the slice in which scheduling happens
 @param frame Index of frame
 @param subframe Index of current subframe
 @param N_RBS Number of resource block groups
  */
 
-
 void dlsch_scheduler_pre_processor(module_id_t module_idP,
                                    int CC_id,
                                    frame_t frameP,
@@ -233,14 +239,14 @@ void dlsch_scheduler_pre_processor(module_id_t module_idP,
 
 /* \brief Function to trigger the eNB scheduling procedure.  It is called by PHY at the beginning of each subframe, \f$n$\f
    and generates all DLSCH allocations for subframe \f$n\f$ and ULSCH allocations for subframe \f$n+k$\f.
-@param Mod_id Instance ID of eNB
+@param module_idP Instance ID of eNB
 @param subframe Index of current subframe
 @param calibration_flag Flag to indicate that eNB scheduler should schedule TDD auto-calibration PUSCH.
 */
 void eNB_dlsch_ulsch_scheduler(module_id_t module_idP, frame_t frameP, sub_frame_t subframeP);  //, int calibration_flag);
 
 /* \brief Function to indicate a received preamble on PRACH.  It initiates the RA procedure.
-@param Mod_id Instance ID of eNB
+@param module_idP Instance ID of eNB
 @param preamble_index index of the received RA request
 @param timing_offset Offset in samples of the received PRACH w.r.t. eNB timing. This is used to
 @param rnti RA rnti corresponding to this PRACH preamble
@@ -252,8 +258,9 @@ void initiate_ra_proc(module_id_t module_idP, int CC_id, frame_t frameP,
                       uint8_t rach_resource_type
                      );
 
-/* \brief Function in eNB to fill RAR pdu when requested by PHY.  This provides a single RAR SDU for the moment and returns the t-CRNTI.
-@param Mod_id Instance ID of eNB
+/* \brief Function in eNB to fill RAR pdu when requested by PHY.  This provides a single RAR SDU for the moment and returns the
+t-CRNTI.
+@param module_idP Instance ID of eNB
 @param dlsch_buffer Pointer to DLSCH input buffer
 @param N_RB_UL Number of UL resource blocks
 @returns t_CRNTI
@@ -274,9 +281,8 @@ unsigned short fill_rar_br(eNB_MAC_INST *eNB,
                            uint8_t *const dlsch_buffer,
                            const uint8_t ce_level);
 
-
 /* \brief Function to indicate a failed RA response.  It removes all temporary variables related to the initial connection of a UE
-@param Mod_id Instance ID of eNB
+@param module_idP Instance ID of eNB
 @param preamble_index index of the received RA request.
 */
 void cancel_ra_proc(module_id_t module_idP, int CC_id, frame_t frameP,
@@ -285,7 +291,7 @@ void cancel_ra_proc(module_id_t module_idP, int CC_id, frame_t frameP,
 /* \brief Function used by PHY to inform MAC that an uplink is scheduled
           for Msg3 in given subframe. This is used so that the MAC
           scheduler marks as busy the RBs used by the Msg3.
-@param Mod_id        Instance ID of eNB
+@param module_idP        Instance ID of eNB
 @param CC_id         CC ID of eNB
 @param frame         current frame
 @param subframe      current subframe
@@ -296,14 +302,10 @@ void cancel_ra_proc(module_id_t module_idP, int CC_id, frame_t frameP,
 
 void clear_ra_proc(module_id_t module_idP, int CC_id, frame_t frameP);
 
-void set_msg3_subframe(module_id_t Mod_id,
-                       int CC_id,
-                       int frame,
-                       int subframe,
-                       int rnti, int Msg3_frame, int Msg3_subframe);
+void set_msg3_subframe(module_id_t module_idP, int CC_id, int frame, int subframe, int rnti, int Msg3_frame, int Msg3_subframe);
 
 /* \brief Function to indicate a received SDU on ULSCH.
-@param Mod_id Instance ID of eNB
+@param module_idP Instance ID of eNB
 @param CC_id Component carrier index
 @param rnti RNTI of UE transmitting the SDU
 @param sdu Pointer to received SDU
@@ -320,9 +322,8 @@ void rx_sdu(const module_id_t enb_mod_idP,
             const uint16_t sdu_lenP,
             const uint16_t timing_advance, const uint8_t ul_cqi);
 
-
 /* \brief Function to indicate a scheduled schduling request (SR) was received by eNB.
-@param Mod_idP Instance ID of eNB
+@param module_idPP Instance ID of eNB
 @param CC_idP CC_id of received SR
 @param frameP of received SR
 @param subframeP Index of subframe where SR was received
@@ -333,17 +334,16 @@ void SR_indication(module_id_t module_idP, int CC_id, frame_t frameP,
                    sub_frame_t subframe, rnti_t rnti, uint8_t ul_cqi);
 
 /* \brief Function to indicate a UL failure was detected by eNB PHY.
-@param Mod_id Instance ID of eNB
+@param module_idP Instance ID of eNB
 @param CC_id Component carrier
 @param frameP Frame index
 @param rnti RNTI of UE transmitting the SR
 @param subframe Index of subframe where SR was received
 */
-void UL_failure_indication(module_id_t Mod_id, int CC_id, frame_t frameP,
-                           rnti_t rnti, sub_frame_t subframe);
+void UL_failure_indication(module_id_t module_idP, int CC_id, frame_t frameP, rnti_t rnti, sub_frame_t subframe);
 
 /* \brief Function to indicate an HARQ ACK/NAK.
-@param Mod_id Instance ID of eNB
+@param module_idP Instance ID of eNB
 @param CC_id Component carrier
 @param frameP Frame index
 @param subframeP subframe index
@@ -354,7 +354,7 @@ void harq_indication(module_id_t mod_idP, int CC_idP, frame_t frameP,
                      nfapi_harq_indication_pdu_t *harq_pdu);
 
 /* \brief Function to indicate a received CQI pdu
-@param Mod_id Instance ID of eNB
+@param module_idP Instance ID of eNB
 @param CC_id Component carrier
 @param frameP Frame index
 @param subframeP subframe index
@@ -369,19 +369,15 @@ void cqi_indication(module_id_t mod_idP, int CC_idP, frame_t frameP,
 uint8_t *get_dlsch_sdu(module_id_t module_idP, int CC_id, frame_t frameP,
                        rnti_t rnti, uint8_t TBindex);
 
-/* \brief Function to retrieve MCH transport block and MCS used for MCH in this MBSFN subframe.  Returns null if no MCH is to be transmitted
-@param Mod_id Instance ID of eNB
+/* \brief Function to retrieve MCH transport block and MCS used for MCH in this MBSFN subframe.  Returns null if no MCH is to be
+transmitted
+@param module_idP Instance ID of eNB
 @param frame Index of frame
 @param subframe Index of current subframe
 @param mcs Pointer to mcs used by PHY (to be filled by MAC)
 @returns Pointer to MCH transport block and mcs for subframe
 */
-MCH_PDU *get_mch_sdu(module_id_t Mod_id, int CC_id, frame_t frame,
-                     sub_frame_t subframe);
-
-
-
-
+MCH_PDU *get_mch_sdu(module_id_t module_idP, int CC_id, frame_t frame, sub_frame_t subframe);
 
 void ue_mac_reset(module_id_t module_idP, uint8_t eNB_index);
 void ue_init_mac(module_id_t module_idP);
@@ -431,11 +427,11 @@ void set_ue_dai(sub_frame_t subframeP,
                 uint8_t CC_id, uint8_t tdd_config, UE_info_t *UE_info);
 
 uint8_t frame_subframe2_dl_harq_pid(LTE_TDD_Config_t *tdd_Config, int abs_frameP, sub_frame_t subframeP);
-/** \brief First stage of PCH Scheduling. Gets a PCH SDU from RRC if available and computes the MCS required to transport it as a function of the SDU length.  It assumes a length less than or equal to 64 bytes (MCS 6, 3 PRBs).
-@param Mod_id Instance ID of eNB
-@param frame Frame index
-@param subframe Subframe number on which to act
-@param paging_ue_index
+/** \brief First stage of PCH Scheduling. Gets a PCH SDU from RRC if available and computes the MCS required to transport it as a
+function of the SDU length.  It assumes a length less than or equal to 64 bytes (MCS 6, 3 PRBs).
+@param module_idP Instance ID of eNB
+@param frameP Frame index
+@param subframeP Subframe number on which to act
 */
 void schedule_PCH(module_id_t module_idP,frame_t frameP,sub_frame_t subframeP);
 
@@ -444,7 +440,8 @@ uint8_t find_num_active_UEs_in_cbagroup(module_id_t module_idP,
 uint8_t UE_is_to_be_scheduled(module_id_t module_idP, int CC_id,
                               uint8_t UE_id);
 /** \brief Round-robin scheduler for ULSCH traffic.
-@param Mod_id Instance ID for eNB
+@param module_idP Instance ID for eNB
+@param UE_id
 @param subframe Subframe number on which to act
 @returns UE index that is to be scheduled if needed/room
 */
@@ -463,13 +460,13 @@ uint32_t allocate_prbs(int UE_id, uint8_t nb_rb, int N_RB_DL,
 
 /* \fn uint32_t req_new_ulsch(module_id_t module_idP)
 \brief check for a new transmission in any drb
-@param Mod_id Instance id of UE in machine
+@param module_idP Instance id of UE in machine
 @returns 1 for new transmission, 0 for none
 */
 uint32_t req_new_ulsch(module_id_t module_idP);
 
 /* \brief Get SR payload (0,1) from UE MAC
-@param Mod_id Instance id of UE in machine
+@param module_idP Instance id of UE in machine
 @param CC_id Component Carrier index
 @param eNB_id Index of eNB that UE is attached to
 @param rnti C_RNTI of UE
@@ -508,7 +505,7 @@ void ue_send_sl_sdu(module_id_t module_idP,
                    );
 
 /* \brief Called by PHY to transfer MCH transport block to ue MAC.
-@param Mod_id Index of module instance
+@param module_idP Index of module instance
 @param frame Frame index
 @param sdu Pointer to transport block
 @param sdu_len Length of transport block
@@ -520,24 +517,34 @@ void ue_send_mch_sdu(module_id_t module_idP, uint8_t CC_id, frame_t frameP,
                      uint8_t sync_area);
 
 /*\brief Function to check if UE PHY needs to decode MCH for MAC.
-@param Mod_id Index of protocol instance
+@param module_idP Index of protocol instance
 @param frame Index of frame
 @param subframe Index of subframe
 @param eNB_index index of eNB for this MCH
 @param[out] sync_area return the sync area
 @param[out] mcch_active flag indicating whether this MCCH is active in this SF
 */
-int ue_query_mch(module_id_t Mod_id, uint8_t CC_id, uint32_t frame,
-                 sub_frame_t subframe, uint8_t eNB_index,
-                 uint8_t *sync_area, uint8_t *mcch_active);
-
-int ue_query_mch_fembms(module_id_t Mod_id, uint8_t CC_id, uint32_t frame,
-		 sub_frame_t subframe, uint8_t eNB_index,
-		 uint8_t * sync_area, uint8_t * mcch_active);
-
-
-/* \brief Called by PHY to get sdu for PUSCH transmission.  It performs the following operations: Checks BSR for DCCH, DCCH1 and DTCH corresponding to previous values computed either in SR or BSR procedures.  It gets rlc status indications on DCCH,DCCH1 and DTCH and forms BSR elements and PHR in MAC header.  CRNTI element is not supported yet.  It computes transport block for up to 3 SDUs and generates header and forms the complete MAC SDU.
-@param Mod_id Instance id of UE in machine
+int ue_query_mch(module_id_t module_idP,
+                 uint8_t CC_id,
+                 uint32_t frame,
+                 sub_frame_t subframe,
+                 uint8_t eNB_index,
+                 uint8_t *sync_area,
+                 uint8_t *mcch_active);
+
+int ue_query_mch_fembms(module_id_t module_idP,
+                        uint8_t CC_id,
+                        uint32_t frame,
+                        sub_frame_t subframe,
+                        uint8_t eNB_index,
+                        uint8_t *sync_area,
+                        uint8_t *mcch_active);
+
+/* \brief Called by PHY to get sdu for PUSCH transmission.  It performs the following operations: Checks BSR for DCCH, DCCH1 and
+DTCH corresponding to previous values computed either in SR or BSR procedures.  It gets rlc status indications on DCCH,DCCH1 and
+DTCH and forms BSR elements and PHR in MAC header.  CRNTI element is not supported yet.  It computes transport block for up to 3
+SDUs and generates header and forms the complete MAC SDU.
+@param module_idP Instance id of UE in machine
 @param eNB_id Index of eNB that UE is attached to
 @param rnti C_RNTI of UE
 @param subframe subframe number
@@ -548,7 +555,7 @@ void ue_get_sdu(module_id_t module_idP, int CC_id, frame_t frameP,
                 uint8_t *access_mode);
 
 /* \brief Called by PHY to get sdu for PSBCH/SSS/PSS transmission.
-@param Mod_id Instance id of UE in machine
+@param module_idP Instance id of UE in machine
 @param frame_tx TX frame index
 @param subframe_tx TX subframe index
 @returns pointer to SLSS_t descriptor
@@ -556,7 +563,7 @@ void ue_get_sdu(module_id_t module_idP, int CC_id, frame_t frameP,
 SLSS_t *ue_get_slss(module_id_t module_idP, int CC_id,frame_t frameP, sub_frame_t subframe);
 
 /* \brief Called by PHY to get sdu for PSDCH transmission.
-@param Mod_id Instance id of UE in machine
+@param module_idP Instance id of UE in machine
 @param frame_tx TX frame index
 @param subframe_tx TX subframe index
 @returns pointer to SLDCH_t descriptor
@@ -564,16 +571,19 @@ SLSS_t *ue_get_slss(module_id_t module_idP, int CC_id,frame_t frameP, sub_frame_
 SLDCH_t *ue_get_sldch(module_id_t module_idP, int CC_id,frame_t frameP, sub_frame_t subframe);
 
 /* \brief Called by PHY to get sdu for PSSCH transmission.
-@param Mod_id Instance id of UE in machine
+@param module_idP Instance id of UE in machine
 @param frame_tx TX frame index
 @param subframe_tx TX subframe index
 @returns pointer to SLSCH_t descriptor
 */
 SLSCH_t *ue_get_slsch(module_id_t module_idP, int CC_id,frame_t frameP, sub_frame_t subframe);
 
-/* \brief Function called by PHY to retrieve information to be transmitted using the RA procedure.  If the UE is not in PUSCH mode for a particular eNB index, this is assumed to be an Msg3 and MAC attempts to retrieves the CCCH message from RRC. If the UE is in PUSCH mode for a particular eNB index and PUCCH format 0 (Scheduling Request) is not activated, the MAC may use this resource for random-access to transmit a BSR along with the C-RNTI control element (see 5.1.4 from 36.321)
-@param Mod_id Index of UE instance
-@param Mod_id Component Carrier Index
+/* \brief Function called by PHY to retrieve information to be transmitted using the RA procedure.  If the UE is not in PUSCH mode
+for a particular eNB index, this is assumed to be an Msg3 and MAC attempts to retrieves the CCCH message from RRC. If the UE is in
+PUSCH mode for a particular eNB index and PUCCH format 0 (Scheduling Request) is not activated, the MAC may use this resource for
+random-access to transmit a BSR along with the C-RNTI control element (see 5.1.4 from 36.321)
+@param module_idP Index of UE instance
+@param module_idP Component Carrier Index
 @param New_Msg3 Flag to indicate this call is for a new Msg3
 @param subframe Index of subframe for PRACH transmission (0 ... 9)
 @returns A pointer to a PRACH_RESOURCES_t */
@@ -581,8 +591,9 @@ PRACH_RESOURCES_t *ue_get_rach(module_id_t module_idP, int CC_id,
                                frame_t frameP, uint8_t new_Msg3,
                                sub_frame_t subframe);
 
-/* \brief Function called by PHY to process the received RAR.  It checks that the preamble matches what was sent by the eNB and provides the timing advance and t-CRNTI.
-@param Mod_id Index of UE instance
+/* \brief Function called by PHY to process the received RAR.  It checks that the preamble matches what was sent by the eNB and
+provides the timing advance and t-CRNTI.
+@param module_idP Index of UE instance
 @param CC_id Index to a component carrier
 @param frame Frame index
 @param ra_rnti RA_RNTI value
@@ -653,10 +664,10 @@ uint8_t *parse_ulsch_header(uint8_t *mac_header,
 int to_prb(int);
 int to_rbg(int);
 int mac_init(void);
-int add_new_ue(module_id_t Mod_id, int CC_id, rnti_t rnti, int harq_pid, uint8_t rach_resource_type);
-int rrc_mac_remove_ue(module_id_t Mod_id, rnti_t rntiP);
+int add_new_ue(module_id_t module_idP, int CC_id, rnti_t rnti, int harq_pid, uint8_t rach_resource_type);
+int rrc_mac_remove_ue(module_id_t module_idP, rnti_t rntiP);
 
-void store_dlsch_buffer(module_id_t Mod_id, int CC_id, frame_t frameP, sub_frame_t subframeP);
+void store_dlsch_buffer(module_id_t module_idP, int CC_id, frame_t frameP, sub_frame_t subframeP);
 
 int prev(UE_list_t *listP, int nodeP);
 void add_ue_list(UE_list_t *listP, int UE_id);
@@ -680,7 +691,7 @@ void ulsch_scheduler_pre_processor(module_id_t module_idP,
                                    frame_t sched_frameP,
                                    sub_frame_t sched_subframeP);
 
-int phy_stats_exist(module_id_t Mod_id, int rnti);
+int phy_stats_exist(module_id_t module_idP, int rnti);
 
 /*! \fn  UE_L2_state_t ue_scheduler(const module_id_t module_idP,const frame_t frameP, const sub_frame_t subframe, const lte_subframe_t direction,const uint8_t eNB_index)
    \brief UE scheduler where all the ue background tasks are done.  This function performs the following:  1) Trigger PDCP every 5ms 2) Call RRC for link status return to PHY3) Perform SR/BSR procedures for scheduling feedback 4) Perform PHR procedures.
@@ -701,37 +712,34 @@ UE_L2_STATE_t ue_scheduler(const module_id_t module_idP,
                            const lte_subframe_t direction,
                            const uint8_t eNB_index, const int CC_id);
 
-/*! \fn  int cba_access(module_id_t module_idP,frame_t frameP,sub_frame_t subframe, uint8_t eNB_index,uint16_t buflen);
+/*! \fn  int cba_access
 \brief determine whether to use cba resource to transmit or not
-\param[in] Mod_id instance of the UE
-\param[in] frame the frame number
+\param[in] module_idP instance of the UE
+\param[in] frameP the frame number
 \param[in] subframe the subframe number
 \param[in] eNB_index instance of eNB
-\param[out] access(1) or postpone (0)
 */
 int cba_access(module_id_t module_idP, frame_t frameP,
                sub_frame_t subframe, uint8_t eNB_index, uint16_t buflen);
 
 /*! \fn  BSR_SHORT *  get_bsr_short(module_id_t module_idP, uint8_t bsr_len)
 \brief get short bsr level
-\param[in] Mod_id instance of the UE
+\param[in]  module_idP instance of the UE
 \param[in] bsr_len indicator for no, short, or long bsr
-\param[out] bsr_s pointer to short bsr
 */
 BSR_SHORT *get_bsr_short(module_id_t module_idP, uint8_t bsr_len);
 
 /*! \fn  BSR_LONG * get_bsr_long(module_id_t module_idP, uint8_t bsr_len)
 \brief get long bsr level
-\param[in] Mod_id instance of the UE
+\param[in]  module_idP instance of the UE
 \param[in] bsr_len indicator for no, short, or long bsr
-\param[out] bsr_l pointer to long bsr
 */
 BSR_LONG *get_bsr_long(module_id_t module_idP, uint8_t bsr_len);
 
 /*! \fn  bool update_bsr(module_id_t module_idP, frame_t frameP,sub_frame_t subframeP)
    \brief get the rlc stats and update the bsr level for each lcid
-\param[in] Mod_id instance of the UE
-\param[in] frame Frame index
+\param[in] module_idP instance of the UE
+\param[in] frameP Frame index
 */
 bool update_bsr(module_id_t module_idP, frame_t frameP, sub_frame_t subframeP, eNB_index_t eNB_index);
 
@@ -745,22 +753,20 @@ bool update_bsr(module_id_t module_idP, frame_t frameP, sub_frame_t subframeP, e
 uint8_t locate_BsrIndexByBufferSize(const uint32_t *table, int size,
                                     int value);
 
-
 /*! \fn  int get_sf_periodicBSRTimer(uint8_t periodicBSR_Timer)
    \brief get the number of subframe from the periodic BSR timer configured by the higher layers
-\param[in] periodicBSR_Timer timer for periodic BSR
 \return the number of subframe
 */
 int get_sf_periodicBSRTimer(uint8_t bucketSize);
 
 /*! \fn  int get_ms_bucketsizeduration(uint8_t bucketSize)
    \brief get the time in ms form the bucket size duration configured by the higher layer
-\param[in]  bucketSize the bucket size duration
+\param[in] bucketsizeduration the bucket size duration
 \return the time in ms
 */
 int get_ms_bucketsizeduration(uint8_t bucketsizeduration);
 
-/*! \fn  int get_sf_retxBSRTimer(uint8_t retxBSR_Timer)
+/*! \fn get_sf_retxBSRTimer
    \brief get the number of subframe form the bucket size duration configured by the higher layer
 \param[in]  retxBSR_Timer timer for regular BSR
 \return the time in sf
@@ -790,8 +796,9 @@ int get_db_dl_PathlossChange(uint8_t dl_PathlossChange);
 
 /*! \fn  uint8_t get_phr_mapping (module_id_t module_idP, int CC_id,uint8_t eNB_index)
    \brief get phr mapping as described in 36.313
-\param[in]  Mod_id index of eNB
+\param[in] module_idP  index of eNB
 \param[in] CC_id Component Carrier Index
+\param[in]  eNB_index
 \return phr mapping
 */
 uint8_t get_phr_mapping(module_id_t module_idP, int CC_id,
@@ -799,22 +806,25 @@ uint8_t get_phr_mapping(module_id_t module_idP, int CC_id,
 
 /*! \fn  void update_phr (module_id_t module_idP)
    \brief update/reset the phr timers
-\param[in]  Mod_id index of eNB
+\param[in]  module_idP index of eNB
 \param[in] CC_id Component carrier index
 \return void
 */
 void update_phr(module_id_t module_idP, int CC_id);
 
 /*! \brief Function to indicate Msg3 transmission/retransmission which initiates/reset Contention Resolution Timer
-\param[in] Mod_id Instance index of UE
+\param[in] module_idP  Instance index of UE
+\param[in] CC_id carrier component id of UE
+\param[in] frameP
 \param[in] eNB_id Index of eNB
 */
 void Msg3_tx(module_id_t module_idP, uint8_t CC_id, frame_t frameP,
              uint8_t eNB_id);
 
-
 /*! \brief Function to indicate the transmission of msg1/rach
-\param[in] Mod_id Instance index of UE
+\param[in] module_idP Instance index of UE
+\param[in] CC_id carrier component id of UE
+\param[in] frameP
 \param[in] eNB_id Index of eNB
 */
 
@@ -873,15 +883,18 @@ int generate_dlsch_header(unsigned char *mac_header,
                           unsigned char short_padding,
                           unsigned short post_padding);
 
-/** \brief RRC eNB Configuration primitive for PHY/MAC.  Allows configuration of PHY/MAC resources based on System Information (SI), RRCConnectionSetup and RRCConnectionReconfiguration messages.
-@param Mod_id Instance ID of eNB
+/** \brief RRC eNB Configuration primitive for PHY/MAC.  Allows configuration of PHY/MAC resources based on System Information (SI),
+RRCConnectionSetup and RRCConnectionReconfiguration messages.
+@param module_idP Instance ID of eNB
 @param CC_id Component Carrier of the eNB
 @param mib Pointer to MIB
 
 @param radioResourceConfigCommon Structure from SIB2 for common radio parameters (if NULL keep existing configuration)
-@param physicalConfigDedicated Structure from RRCConnectionSetup or RRCConnectionReconfiguration for dedicated PHY parameters (if NULL keep existing configuration)
+@param physicalConfigDedicated Structure from RRCConnectionSetup or RRCConnectionReconfiguration for dedicated PHY parameters (if
+NULL keep existing configuration)
 @param measObj Structure from RRCConnectionReconfiguration for UE measurement procedures
-@param mac_MainConfig Structure from RRCConnectionSetup or RRCConnectionReconfiguration for dedicated MAC parameters (if NULL keep existing configuration)
+@param mac_MainConfig Structure from RRCConnectionSetup or RRCConnectionReconfiguration for dedicated MAC parameters (if NULL keep
+existing configuration)
 @param logicalChannelIdentity Logical channel identity index of corresponding logical channel config
 @param logicalChannelConfig Pointer to logical channel configuration
 @param measGapConfig Measurement Gap configuration for MAC (if NULL keep existing configuration)
@@ -943,14 +956,18 @@ typedef struct {
 
 int rrc_mac_config_req_eNB(const module_id_t module_idP, const rrc_mac_config_req_eNB_t *);
 
-/** \brief RRC eNB Configuration primitive for PHY/MAC.  Allows configuration of PHY/MAC resources based on System Information (SI), RRCConnectionSetup and RRCConnectionReconfiguration messages.
-@param Mod_id Instance ID of ue
+/** \brief RRC eNB Configuration primitive for PHY/MAC.  Allows configuration of PHY/MAC resources based on System Information (SI),
+RRCConnectionSetup and RRCConnectionReconfiguration messages.
+@param module_idP Instance ID of ue
 @param CC_id Component Carrier of the ue
-@param eNB_id Index of eNB
+@param eNB_index Index of eNB
 @param radioResourceConfigCommon Structure from SIB2 for common radio parameters (if NULL keep existing configuration)
-@param physcialConfigDedicated Structure from RRCConnectionSetup or RRCConnectionReconfiguration for dedicated PHY parameters (if NULL keep existing configuration)
+@param physicalConfigDedicated Structure from RRCConnectionSetup or RRCConnectionReconfiguration for dedicated PHY parameters (if
+NULL keep existing configuration)
+@param sCellToAddMod_r10
 @param measObj Structure from RRCConnectionReconfiguration for UE measurement procedures
-@param mac_MainConfig Structure from RRCConnectionSetup or RRCConnectionReconfiguration for dedicated MAC parameters (if NULL keep existing configuration)
+@param mac_MainConfig Structure from RRCConnectionSetup or RRCConnectionReconfiguration for dedicated MAC parameters (if NULL keep
+existing configuration)
 @param logicalChannelIdentity Logical channel identity index of corresponding logical channel config
 @param logicalChannelConfig Pointer to logical channel configuration
 @param measGapConfig Measurement Gap configuration for MAC (if NULL keep existing configuration)
@@ -958,10 +975,19 @@ int rrc_mac_config_req_eNB(const module_id_t module_idP, const rrc_mac_config_re
 @param mobilityControlInfo mobility control info received for Handover
 @param SIwindowsize SI Windowsize from SIB1 (if NULL keep existing configuration)
 @param SIperiod SI Period from SIB1 (if NULL keep existing configuration)
+@param ul_CarrierFreq
+@param ul_Bandwidth
+@param additionalSpectrumEmission
 @param MBMS_Flag indicates MBMS transmission
 @param mbsfn_SubframeConfigList pointer to mbsfn subframe configuration list from SIB2
 @param mbsfn_AreaInfoList pointer to MBSFN Area Info list from SIB13
 @param pmch_InfoList pointer to PMCH_InfoList from MBSFNAreaConfiguration Message (MCCH Message)
+@param config_action
+@param sourceL2Id
+@param  destinationL2Id
+@param FeMBMS_Flag
+@param nonMBSFN_SubframeConfig
+@param mbsfn_AreaInfoList_fembms
 */
 int rrc_mac_config_req_ue(module_id_t module_idP,
                           int CC_id,
@@ -1205,7 +1231,7 @@ void pre_scd_nb_rbs_required(    module_id_t     module_idP,
 
 /* DRX Configuration */
 /* Configure local DRX timers and thresholds in UE context, following the drx_configuration input */
-void eNB_Config_Local_DRX(instance_t Mod_id, rrc_mac_drx_config_req_t *rrc_mac_drx_config_req);                        
+void eNB_Config_Local_DRX(instance_t module_idP, rrc_mac_drx_config_req_t *rrc_mac_drx_config_req);
 
 /* from here: prototypes to get rid of compilation warnings: doc to be written by function author */
 uint8_t ul_subframe2_k_phich(COMMON_channels_t *cc, sub_frame_t ul_subframe);
diff --git a/openair2/LAYER2/MAC/ue_procedures.c b/openair2/LAYER2/MAC/ue_procedures.c
index d7fd5d23dd08d15d1dd98f1ee55fd2a6e982f2f4..20b4da7b55fde03befb6e211af47da387bf2c632 100644
--- a/openair2/LAYER2/MAC/ue_procedures.c
+++ b/openair2/LAYER2/MAC/ue_procedures.c
@@ -19,8 +19,7 @@
  *      contact@openairinterface.org
  */
 
-
-/*! \file asn1_msg.c
+/*! \file ue_procedures.c
  * \brief primitives to build the asn1 messages / primitives to build FeMBMS asn1  messages
  * \author Raymond Knopp, Navid Nikaein and Javier Morgade
  * \date 2011 / 2019
diff --git a/openair2/LAYER2/NR_MAC_UE/mac_proto.h b/openair2/LAYER2/NR_MAC_UE/mac_proto.h
index 438e2082afe0562bdbf8231984e3b9b974094faa..60c64ead12ea2f256a7f6d54a79268c2f8527698 100644
--- a/openair2/LAYER2/NR_MAC_UE/mac_proto.h
+++ b/openair2/LAYER2/NR_MAC_UE/mac_proto.h
@@ -121,19 +121,20 @@ void fill_scheduled_response(nr_scheduled_response_t *scheduled_response,
                              void *phy_data);
 
 /*! \fn int8_t nr_ue_get_SR(module_id_t module_idP, frame_t frameP, slot_t slotP);
-   \brief Called by PHY to get sdu for PUSCH transmission.  It performs the following operations: Checks BSR for DCCH, DCCH1 and DTCH corresponding to previous values computed either in SR or BSR procedures.  It gets rlc status indications on DCCH,DCCH1 and DTCH and forms BSR elements and PHR in MAC header.  CRNTI element is not supported yet.  It computes transport block for up to 3 SDUs and generates header and forms the complete MAC SDU.
-\param[in] Mod_id Instance id of UE in machine
-\param[in] frameP subframe number
-\param[in] slotP slot number
+   \brief Called by PHY to get sdu for PUSCH transmission.  It performs the following operations: Checks BSR for DCCH, DCCH1 and
+DTCH corresponding to previous values computed either in SR or BSR procedures.  It gets rlc status indications on DCCH,DCCH1 and
+DTCH and forms BSR elements and PHR in MAC header.  CRNTI element is not supported yet.  It computes transport block for up to 3
+SDUs and generates header and forms the complete MAC SDU. \param[in]  module_idP Instance id of UE in machine \param[in] frameP
+subframe number \param[in] slotP slot number
 */
 int8_t nr_ue_get_SR(module_id_t module_idP, frame_t frameP, slot_t slotP);
 
-/*! \fn  bool update_bsr(module_id_t module_idP, frame_t frameP, slot_t slotP, uint8_t gNB_index)
+/*! \fn  nr_update_bsr
    \brief get the rlc stats and update the bsr level for each lcid
-\param[in] Mod_id instance of the UE
+\param[in] module_idP instance of the UE
 \param[in] frameP Frame index
-\param[in] slot slotP number
-\param[in] uint8_t gNB_index
+\param[in] slotP number
+\param[in] gNB_index
 */
 bool nr_update_bsr(module_id_t module_idP, frame_t frameP, slot_t slotP, uint8_t gNB_index);
 
@@ -424,4 +425,3 @@ int nr_config_pusch_pdu(NR_UE_MAC_INST_t *mac,
                         uint16_t rnti,
                         const nr_dci_format_t dci_format);
 #endif
-/** @}*/
diff --git a/openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_primitives.c b/openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_primitives.c
index 1e5de41ab3e170f95de2ee18c02edc84b8b65be4..e22ec72b0757a19f4e1c4262a0388ba739202524 100644
--- a/openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_primitives.c
+++ b/openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_primitives.c
@@ -27,7 +27,6 @@
  * \version 1.0
  * \company Eurecom
  * @ingroup _mac
-
  */
 
 #include <softmodem-common.h>
diff --git a/openair2/LAYER2/NR_MAC_gNB/nr_mac_gNB.h b/openair2/LAYER2/NR_MAC_gNB/nr_mac_gNB.h
index d051d93528a33ca68c44af2c446c1b943bfe649c..97709f0c6949531b254052ca086759054a695f77 100644
--- a/openair2/LAYER2/NR_MAC_gNB/nr_mac_gNB.h
+++ b/openair2/LAYER2/NR_MAC_gNB/nr_mac_gNB.h
@@ -857,3 +857,4 @@ typedef struct gNB_MAC_INST_s {
 } gNB_MAC_INST;
 
 #endif /*__LAYER2_NR_MAC_GNB_H__ */
+/** @}*/
diff --git a/openair2/LAYER2/PDCP_v10.1.0/pdcp.h b/openair2/LAYER2/PDCP_v10.1.0/pdcp.h
index 1f1a9ae74034a23cf5917dd57212c25867363934..35bcd063089392589dd87338615909ced719f577 100644
--- a/openair2/LAYER2/PDCP_v10.1.0/pdcp.h
+++ b/openair2/LAYER2/PDCP_v10.1.0/pdcp.h
@@ -336,16 +336,6 @@ void pdcp_add_UE(const protocol_ctxt_t *const  ctxt_pP);
 */
 bool pdcp_remove_UE(const protocol_ctxt_t *const  ctxt_pP);
 
-/*! \fn void rrc_pdcp_config_release( const protocol_ctxt_t* const, rb_id_t)
-* \brief This functions is unused
-* \param[in]  ctxt_pP           Running context.
-* \param[in] rab_id Radio Bearer ID of relevant PDCP entity
-* \return none
-* \note None
-* @ingroup _pdcp
-*/
-//void rrc_pdcp_config_release ( const protocol_ctxt_t* const  ctxt_pP, rb_id_t);
-
 /*! \fn void pdcp_mbms_run(const protocol_ctxt_t* const  ctxt_pP)
 * \brief Runs PDCP entity to let it handle incoming/outgoing SDUs
 * \param[in]  ctxt_pP           Running context.
@@ -506,4 +496,4 @@ extern notifiedFIFO_t         pdcp_sdu_list;
 extern hash_table_t  *pdcp_coll_p;
 
 #endif
-/*@}*/
+/** @}*/
diff --git a/openair2/LAYER2/RLC/rlc.h b/openair2/LAYER2/RLC/rlc.h
index 84d4b89b1c4a6aa194676e29ad6b5f3686c9340e..f61f9ca6c781af3ea03f370b2ff59a9fdfe9d9c7 100644
--- a/openair2/LAYER2/RLC/rlc.h
+++ b/openair2/LAYER2/RLC/rlc.h
@@ -145,13 +145,12 @@ rlc_op_status_t rrc_rlc_config_asn1_req (
   const uint32_t,
   const uint32_t );
 
-/*! \fn rlc_op_status_t rrc_rlc_remove_ue   (const protocol_ctxt_t* const ctxtP)
+/*! \fn rrc_rlc_remove_ue
  * \brief  Remove all RLC protocol instances from all radio bearers allocated to a UE.
  * \param[in]  ctxtP              Running context.
  * \return     A status about the processing, OK or error code.
-*/
-rlc_op_status_t rrc_rlc_remove_ue (const protocol_ctxt_t *const);
-
+ */
+rlc_op_status_t rrc_rlc_remove_ue(const protocol_ctxt_t *const ctxtP);
 
 /*! \fn rlc_op_status_t rrc_rlc_config_req (
      const protocol_ctxt_t* const ctxtP,
@@ -166,23 +165,32 @@ rlc_op_status_t rrc_rlc_remove_ue (const protocol_ctxt_t *const);
 * \param[in]  MBMS_flag        Flag to indicate whether this is an MBMS service (1) or not (0)
 * \param[in]  actionP          Action for this radio bearer (add, modify, remove).
 * \param[in]  rb_idP           Radio bearer identifier.
-* \param[in]  rlc_infoP        RLC configuration parameters issued from Radio Resource Manager.
 * \return     A status about the processing, OK or error code.
 */
-rlc_op_status_t rrc_rlc_config_req(const protocol_ctxt_t *const, const srb_flag_t, const MBMS_flag_t, config_action_t, const rb_id_t);
-
-/*! \fn rlc_op_status_t rrc_rlc_data_req     (const protocol_ctxt_t* const ctxtP, const  MBMS_flag_t MBMS_flagP, const  rb_id_t rb_idP, mui_t muiP, confirm_t confirmP, sdu_size_t sdu_sizeP, char* sduP)
-* \brief  Function for RRC to send a SDU through a Signalling Radio Bearer.
-* \param[in]  ctxtP            Running context.
-* \param[in]  MBMS_flag        Flag to indicate whether this is an MBMS service (1) or not (0)
-* \param[in]  rb_idP           Radio bearer identifier.
-* \param[in]  muiP             Message Unit identifier.
-* \param[in]  confirmP         Boolean, is confirmation requested.
-* \param[in]  sdu_sizeP        Size of SDU in bytes.
-* \param[in]  sduP             SDU.
-* \return     A status about the processing, OK or error code.
-*/
-rlc_op_status_t rrc_rlc_data_req     (const protocol_ctxt_t *const, const  MBMS_flag_t, const  rb_id_t, mui_t, confirm_t, sdu_size_t, char *);
+rlc_op_status_t rrc_rlc_config_req(const protocol_ctxt_t *const ctxtP,
+                                   const srb_flag_t srb_flagP,
+                                   const MBMS_flag_t MBMS_flag,
+                                   config_action_t actionP,
+                                   const rb_id_t rb_idP);
+
+/*! \fn rrc_rlc_data_req
+ * \brief  Function for RRC to send a SDU through a Signalling Radio Bearer.
+ * \param[in]  ctxtP            Running context.
+ * \param[in]  MBMS_flag        Flag to indicate whether this is an MBMS service (1) or not (0)
+ * \param[in]  rb_idP           Radio bearer identifier.
+ * \param[in]  muiP             Message Unit identifier.
+ * \param[in]  confirmP         Boolean, is confirmation requested.
+ * \param[in]  sdu_sizeP        Size of SDU in bytes.
+ * \param[in]  sduP             SDU.
+ * \return     A status about the processing, OK or error code.
+ */
+rlc_op_status_t rrc_rlc_data_req(const protocol_ctxt_t *const ctxtP,
+                                 const MBMS_flag_t MBMS_flag,
+                                 const rb_id_t rb_idP,
+                                 mui_t muiP,
+                                 confirm_t confirmP,
+                                 sdu_size_t sdu_sizeP,
+                                 char *sduP);
 
 //-----------------------------------------------------------------------------
 //   PUBLIC INTERFACE WITH MAC
@@ -236,17 +244,20 @@ mac_rlc_status_resp_t mac_rlc_status_ind   (const module_id_t, const rnti_t, con
     ,const uint32_t destinationL2Id
                                            );
 
-/*! \fn rlc_buffer_occupancy_t mac_rlc_get_buffer_occupancy_ind(const module_id_t module_idP, const rnti_t rntiP, const eNB_index_t eNB_index, const frame_t frameP, const sub_frame_t subframeP,const eNB_flag_t enb_flagP, const logical_chan_id_t channel_idP)
-* \brief    Interface with MAC layer, UE only: request and get the number of bytes scheduled for transmission by the RLC instance corresponding to the radio bearer identifier.
-* \param[in]  mod_idP          Virtualized module identifier.
-* \param[in]  rntiP            UE identifier.
-* \param[in]  frameP            Frame index.
-* \param[in]  subframeP         SubFrame index.
-* \param[in]  eNB_flagP         Flag to indicate eNB operation (1 true, 0 false)
-* \param[in]  channel_idP       Logical Channel identifier.
-* \return     The maximum number of bytes that the RLC instance can send in the next transmission sequence.
-*/
-rlc_buffer_occupancy_t mac_rlc_get_buffer_occupancy_ind(const module_id_t, const rnti_t, const eNB_index_t, const frame_t, const sub_frame_t, const eNB_flag_t, const logical_chan_id_t );
+/*! \fn mac_rlc_get_buffer_occupancy_ind
+ * \brief    Interface with MAC layer, UE only: request and get the number of bytes scheduled for transmission by the RLC instance
+ * corresponding to the radio bearer identifier. \param[in]  mod_idP          Virtualized module identifier. \param[in]  rntiP UE
+ * identifier. \param[in]  frameP            Frame index. \param[in]  subframeP         SubFrame index. \param[in]  eNB_flagP Flag
+ * to indicate eNB operation (1 true, 0 false) \param[in]  channel_idP       Logical Channel identifier. \return     The maximum
+ * number of bytes that the RLC instance can send in the next transmission sequence.
+ */
+rlc_buffer_occupancy_t mac_rlc_get_buffer_occupancy_ind(const module_id_t mod_idP,
+                                                        const rnti_t rntiP,
+                                                        const eNB_index_t enb,
+                                                        const frame_t frameP,
+                                                        const sub_frame_t subframeP,
+                                                        const eNB_flag_t eNB_flagP,
+                                                        const logical_chan_id_t channel_idP);
 //-----------------------------------------------------------------------------
 //   RLC methods
 //-----------------------------------------------------------------------------
diff --git a/openair2/M2AP/m2ap_MCE_handler.h b/openair2/M2AP/m2ap_MCE_handler.h
index 164efe171ec172c2ccfdb0d70fbf4e338adea74f..42dc81f4367fd231c99c0a2e92770a7ffaa2478c 100644
--- a/openair2/M2AP/m2ap_MCE_handler.h
+++ b/openair2/M2AP/m2ap_MCE_handler.h
@@ -19,7 +19,7 @@
  *      contact@openairinterface.org
  */
 
-/*! \file m2ap_handler.h
+/*! \file m2ap_MCE_handler.h
  * \brief m2ap handler procedures for MCE
  * \author Javier Morgade <javier.morgade@ieee.org>
  * \date 2019
diff --git a/openair2/M2AP/m2ap_common.h b/openair2/M2AP/m2ap_common.h
index 92e3274c8153f204bd296093852d0a3e11c569bf..266b303518e06515261cfb0fcb849b82b5218365 100644
--- a/openair2/M2AP/m2ap_common.h
+++ b/openair2/M2AP/m2ap_common.h
@@ -138,5 +138,6 @@ ssize_t m2ap_generate_unsuccessfull_outcome(
  @returns void
  **/
 void m2ap_handle_criticality(M2AP_Criticality_t criticality);
+/** @}*/
 
 #endif /* M2AP_COMMON_H_ */
diff --git a/openair2/M2AP/m2ap_eNB_handler.h b/openair2/M2AP/m2ap_eNB_handler.h
index 1954d20de9c2f05b626625484a13be8369275352..0055d385d810d382e41d87d50663ab18128e2c8f 100644
--- a/openair2/M2AP/m2ap_eNB_handler.h
+++ b/openair2/M2AP/m2ap_eNB_handler.h
@@ -19,7 +19,7 @@
  *      contact@openairinterface.org
  */
 
-/*! \file m2ap_handler.h
+/*! \file m2ap_eNB_handler.h
  * \brief m2ap handler procedures for eNB
  * \author Javier Morgade <javier.morgade@ieee.org>
  * \date 2019
diff --git a/openair2/M2AP/m2ap_itti_messaging.c b/openair2/M2AP/m2ap_itti_messaging.c
index 9c9528c34980a5e72f80f2785da1c0e2cebc8746..5ffecbc7cf5e2a0b76f7485e46fb7c3ad132829b 100644
--- a/openair2/M2AP/m2ap_itti_messaging.c
+++ b/openair2/M2AP/m2ap_itti_messaging.c
@@ -19,7 +19,7 @@
  *      contact@openairinterface.org
  */
 
-/*! \file m2ap_eNB_itti_messaging.c
+/*! \file m2ap_itti_messaging.c
  * \brief m2ap tasks for eNB
  * \author Javier Morgade <javier.morgade@ieee.org>
  * \date 2019
diff --git a/openair2/MCE_APP/mce_config.h b/openair2/MCE_APP/mce_config.h
index 858f09db17b8ca71193a55983c495fe4f3dece42..1fbe81a62718ddd79255817066dc711febf0fdb0 100644
--- a/openair2/MCE_APP/mce_config.h
+++ b/openair2/MCE_APP/mce_config.h
@@ -65,6 +65,4 @@ int RCconfig_m2_mcch(m2ap_setup_resp_t * m2ap_setup_resp, uint32_t i);
 int RCconfig_M2_SCHEDULING(MessageDef *msg_p, uint32_t i);
 int RCconfig_m2_scheduling(m2ap_mbms_scheduling_information_t *m2ap_mbms_scheduling_information, uint32_t i);
 
-
 #endif /* MCE_CONFIG_H_ */
-/** @} */
diff --git a/openair2/PHY_INTERFACE/phy_interface.h b/openair2/PHY_INTERFACE/phy_interface.h
index f275e91ec1b619059f81be20977c215c6345d922..09e95988a491628013fa7d41b892c6572ddf0415 100644
--- a/openair2/PHY_INTERFACE/phy_interface.h
+++ b/openair2/PHY_INTERFACE/phy_interface.h
@@ -19,13 +19,13 @@
  *      contact@openairinterface.org
  */
 
-/*! \file PHY_INTERFACE/defs.h
-* \brief mac phy interface primitives
-* \author Raymond Knopp and Navid Nikaein
-* \date 2011
-* \version 0.5
-* \mail navid.nikaein@eurecom.fr or openair_tech@eurecom.fr
-*/
+/*! \file phy_interface.h
+ * \brief mac phy interface primitives
+ * \author Raymond Knopp and Navid Nikaein
+ * \date 2011
+ * \version 0.5
+ * \mail navid.nikaein@eurecom.fr or openair_tech@eurecom.fr
+ */
 
 #ifndef __PHY_INTERFACE_H__
 #    define __PHY_INTERFACE_H__
@@ -47,9 +47,4 @@ do {
     mac_xface->macphy_exit(temp);                                                           \
 } while(0)
 
-
-
 #endif
-
-
-/** @} */
diff --git a/openair2/RRC/L2_INTERFACE/openair_rrc_L2_interface.h b/openair2/RRC/L2_INTERFACE/openair_rrc_L2_interface.h
index 270436b029d3b673a9aef9f11d6fa811097061aa..8210811862081a80b0d8e05e6b3f5655ae592b12 100644
--- a/openair2/RRC/L2_INTERFACE/openair_rrc_L2_interface.h
+++ b/openair2/RRC/L2_INTERFACE/openair_rrc_L2_interface.h
@@ -19,14 +19,14 @@
  *      contact@openairinterface.org
  */
 
-/*! \file l2_interface.c
-* \brief layer 2 interface
-* \author Navid Nikaein and Raymond Knopp
-* \date 2011
-* \version 1.0
-* \company Eurecom
-* \email: navid.nikaein@eurecom.fr,raymond.knopp@eurecom.fr
-*/
+/*! \file openair_rrc_L2_interface.h
+ * \brief layer 2 interface
+ * \author Navid Nikaein and Raymond Knopp
+ * \date 2011
+ * \version 1.0
+ * \company Eurecom
+ * \email: navid.nikaein@eurecom.fr,raymond.knopp@eurecom.fr
+ */
 #ifndef __OPENAIR_RRC_L2_INTERFACE_H__
 #define __OPENAIR_RRC_L2_INTERFACE_H__
 
diff --git a/openair2/RRC/LTE/L2_interface.c b/openair2/RRC/LTE/L2_interface.c
index 2ce9221317113ff5a3e66648fdc770ea102fe0ca..bc333bdcd69c7caf8da528bfa81dbb91fdda9790 100644
--- a/openair2/RRC/LTE/L2_interface.c
+++ b/openair2/RRC/LTE/L2_interface.c
@@ -19,7 +19,7 @@
  *      contact@openairinterface.org
  */
 
-/*! \file l2_interface.c
+/*! \file L2_interface.c
  * \brief layer 2 interface, used to support different RRC sublayer
  * \author Raymond Knopp and Navid Nikaein
  * \date 2010-2014
@@ -28,15 +28,14 @@
  * \email: raymond.knopp@eurecom.fr
  */
 
-/*! \file l2_interface.c
- * \brief layer 2 interface, added support for FeMBMS RRC sublayer 
+/*! \file L2_interface.c
+ * \brief layer 2 interface, added support for FeMBMS RRC sublayer
  * \author Javier Morgade
  * \date 2020
  * \version 1.0
  * \email: javier.morgade@ieee.org
  */
 
-
 #include "platform_types.h"
 #include "rrc_defs.h"
 #include "rrc_extern.h"
diff --git a/openair2/RRC/LTE/L2_interface_common.c b/openair2/RRC/LTE/L2_interface_common.c
index 6a0830e6df1f9ac6cd0046028a904739424459dd..86fccddcf6b45339d842b4d73c01136ab394f004 100644
--- a/openair2/RRC/LTE/L2_interface_common.c
+++ b/openair2/RRC/LTE/L2_interface_common.c
@@ -19,7 +19,7 @@
  *      contact@openairinterface.org
  */
 
-/*! \file l2_interface.c
+/*! \file L2_interface_common.c
  * \brief layer 2 interface, used to support different RRC sublayer
  * \author Raymond Knopp and Navid Nikaein
  * \date 2010-2014
diff --git a/openair2/RRC/LTE/L2_interface_ue.c b/openair2/RRC/LTE/L2_interface_ue.c
index e7f18d355f9afd5874b0502517ff114dbddba640..d1128c66ee7f15bc716e6731a218dcebadebc2fe 100644
--- a/openair2/RRC/LTE/L2_interface_ue.c
+++ b/openair2/RRC/LTE/L2_interface_ue.c
@@ -19,7 +19,7 @@
  *      contact@openairinterface.org
  */
 
-/*! \file l2_interface_ue.c
+/*! \file L2_interface_ue.c
  * \brief layer 2 interface, used to support different RRC sublayer
  * \author Raymond Knopp and Navid Nikaein
  * \date 2010-2014
@@ -28,8 +28,7 @@
  * \email: raymond.knopp@eurecom.fr
  */
 
-
-/*! \file l2_interface_ue.c
+/*! \file L2_interface_ue.c
  * \brief layer 2 interface, added support for FeMBMS RRC sublayer
  * \author J. Morgade
  * \date 2020
@@ -37,7 +36,6 @@
  * \email: javier.morgade@ieee.org
  */
 
-
 #include "platform_types.h"
 #include "rrc_defs.h"
 #include "rrc_extern.h"
diff --git a/openair2/RRC/LTE/extern_NB_IoT.h b/openair2/RRC/LTE/extern_NB_IoT.h
index 24934f4bf18b356e00cfca537db78b7ed3f9d794..773acf9d4f3ff8cff78dafe1d6276acaec2535a3 100644
--- a/openair2/RRC/LTE/extern_NB_IoT.h
+++ b/openair2/RRC/LTE/extern_NB_IoT.h
@@ -19,14 +19,14 @@
  *      contact@openairinterface.org
  */
 
-/*! \file vars.h
-* \brief rrc external vars
-* \author Navid Nikaein and Raymond Knopp, Michele Paffetti
-* \date 2011-2017
-* \version 1.0
-* \company Eurecom
-* \email: navid.nikaein@eurecom.fr, michele.paffetti@studio.unibo.it
-*/
+/*! \file extern_NB_IoT.h
+ * \brief rrc external vars
+ * \author Navid Nikaein and Raymond Knopp, Michele Paffetti
+ * \date 2011-2017
+ * \version 1.0
+ * \company Eurecom
+ * \email: navid.nikaein@eurecom.fr, michele.paffetti@studio.unibo.it
+ */
 
 #ifndef __OPENAIR_RRC_EXTERN_NB_IOT_H__
 #define __OPENAIR_RRC_EXTERN_NB_IOT_H__
diff --git a/openair2/RRC/LTE/proto_NB_IoT.h b/openair2/RRC/LTE/proto_NB_IoT.h
index e5c5d8056b58e84f680a6f8041142ba58a90a55b..9d12de0d901cbb3c5f8279fdae7f057a53959465 100644
--- a/openair2/RRC/LTE/proto_NB_IoT.h
+++ b/openair2/RRC/LTE/proto_NB_IoT.h
@@ -29,7 +29,8 @@
 /** \addtogroup _rrc
  *  @{
  */
-
+#ifndef __PROTO_NB_IOT_H
+#define __PROTO_NB_IOT_H
 #include "RRC/LTE/defs_NB_IoT.h"
 #include "pdcp.h"
 #include "rlc.h"
@@ -137,12 +138,13 @@ char openair_rrc_eNB_configuration_NB_IoT(
 
 //-----------------------------
 /**\brief RRC eNB task. (starting of the RRC state machine)
-   \param void *args_p Pointer on arguments to start the task. */
+   \param args_p Pointer on arguments to start the task. */
 void *rrc_enb_task_NB_IoT(void *args_p);
 
 /**\brief Entry routine to decode a UL-CCCH-Message-NB.  Invokes PER decoder and parses message.
    \param ctxt_pP Running context
-   \param Srb_info Pointer to SRB0 information structure (buffer, etc.)*/
+   \param Srb_info Pointer to SRB0 information structure (buffer, etc.)
+\param CC_id*/
 int rrc_eNB_decode_ccch_NB_IoT(
   protocol_ctxt_t* const ctxt_pP,
   const SRB_INFO_NB_IoT*        const Srb_info,
@@ -151,8 +153,9 @@ int rrc_eNB_decode_ccch_NB_IoT(
 
 /**\brief Entry routine to decode a UL-DCCH-Message-NB.  Invokes PER decoder and parses message.
    \param ctxt_pP Context
+\param Srb_id
    \param Rx_sdu Pointer Received Message
-   \param sdu_size Size of incoming SDU*/
+   \param sdu_sizeP Size of incoming SDU*/
 int rrc_eNB_decode_dcch_NB_IoT(
   const protocol_ctxt_t* const ctxt_pP,
   const rb_id_t                Srb_id,
@@ -256,5 +259,5 @@ int8_t mac_rrc_data_req_eNB_NB_IoT(
   uint8_t   flag
 );
 
-
-
+/** @}*/
+#endif
diff --git a/openair2/RRC/LTE/rrc_defs.h b/openair2/RRC/LTE/rrc_defs.h
index b233cd502d2835810c1daef095ed911268f261d1..4cf64e8336e45c500d0a174dff5e93aea49aee2d 100644
--- a/openair2/RRC/LTE/rrc_defs.h
+++ b/openair2/RRC/LTE/rrc_defs.h
@@ -19,14 +19,14 @@
  *      conmnc_digit_lengtht@openairinterface.org
  */
 
-/*! \file RRC/LTE/defs.h
-* \brief RRC struct definitions and function prototypes
-* \author Navid Nikaein and Raymond Knopp
-* \date 2010 - 2014
-* \version 1.0
-* \company Eurecom
-* \email: navid.nikaein@eurecom.fr, raymond.knopp@eurecom.fr
-*/
+/*! \file rrc_defs.h
+ * \brief RRC struct definitions and function prototypes
+ * \author Navid Nikaein and Raymond Knopp
+ * \date 2010 - 2014
+ * \version 1.0
+ * \company Eurecom
+ * \email: navid.nikaein@eurecom.fr, raymond.knopp@eurecom.fr
+ */
 
 #ifndef __OPENAIR_RRC_DEFS_H__
 #define __OPENAIR_RRC_DEFS_H__
@@ -49,7 +49,7 @@
 
 #include "LAYER2/MAC/mac.h"
 #include "openair2/RRC/common.h"
-//for D2D
+// for D2D
 #define DEBUG_CTRL_SOCKET
 
 #define CONTROL_SOCKET_PORT_NO 8888
diff --git a/openair2/RRC/LTE/rrc_eNB.c b/openair2/RRC/LTE/rrc_eNB.c
index f8455d76d8e8ec41d97680b47993915763e2c28a..245a8994103f0f9375bd96f8661f49ae3da49273 100644
--- a/openair2/RRC/LTE/rrc_eNB.c
+++ b/openair2/RRC/LTE/rrc_eNB.c
@@ -3244,8 +3244,8 @@ void rrc_eNB_generate_defaultRRCConnectionReconfiguration(const protocol_ctxt_t
 
 //-----------------------------------------------------------------------------
 /**
- * @fn    :encode_CG_ConfigInfo
- * @param   :enc_buf to store the encoded bits
+ * @fn    encode_CG_ConfigInfo
+ * @param   :buffer to store the encoded bits
  * @param   :ue_context_pP ue context used to fill CG-ConfigInfo
  * @param   :enc_size to store thre size of encoded size
  *      this api is to fill and encode CG-ConfigInfo
diff --git a/openair2/RRC/LTE/rrc_eNB_S1AP.c b/openair2/RRC/LTE/rrc_eNB_S1AP.c
index 8265602106d0d6c05e583167325bb69cbf1285b2..4ec1b9383d8624e6f0feb92f023adfb22ca8521b 100644
--- a/openair2/RRC/LTE/rrc_eNB_S1AP.c
+++ b/openair2/RRC/LTE/rrc_eNB_S1AP.c
@@ -335,13 +335,10 @@ get_next_ue_initial_id(
   return ue_initial_id[mod_id];
 }
 
-
-
-
-/*! \fn uint8_t get_UE_index_from_s1ap_ids(uint8_t mod_id, uint16_t ue_initial_id, uint32_t eNB_ue_s1ap_id)
+/*! \fn rrc_eNB_get_ue_context_from_s1ap_ids
  *\brief retrieve UE index in the eNB from the UE initial ID if not equal to UE_INDEX_INVALID or
  *\brief from the eNB_ue_s1ap_id previously transmitted by S1AP.
- *\param mod_id Instance ID of eNB.
+ *\param instanceP Instance ID of eNB.
  *\param ue_initial_id The UE initial ID sent to S1AP.
  *\param eNB_ue_s1ap_id The value sent by S1AP.
  *\return the UE index or UE_INDEX_INVALID if not found.
diff --git a/openair2/RRC/LTE/rrc_extern.h b/openair2/RRC/LTE/rrc_extern.h
index 644512a686f5a09271e9c60d22651cfdfb088634..199e5df52c159b6181a671f284f44505c9327b15 100644
--- a/openair2/RRC/LTE/rrc_extern.h
+++ b/openair2/RRC/LTE/rrc_extern.h
@@ -19,14 +19,14 @@
  *      contact@openairinterface.org
  */
 
-/*! \file vars.h
-* \brief rrc external vars
-* \author Navid Nikaein and Raymond Knopp
-* \date 2011
-* \version 1.0
-* \company Eurecom
-* \email: navid.nikaein@eurecom.fr
-*/
+/*! \file rrc_extern.h
+ * \brief rrc external vars
+ * \author Navid Nikaein and Raymond Knopp
+ * \date 2011
+ * \version 1.0
+ * \company Eurecom
+ * \email: navid.nikaein@eurecom.fr
+ */
 
 #ifndef __OPENAIR_RRC_EXTERN_H__
 #define __OPENAIR_RRC_EXTERN_H__
diff --git a/openair2/RRC/LTE/rrc_proto.h b/openair2/RRC/LTE/rrc_proto.h
index a54a7a7336e6d9ec9d463b9a7dc50447b2d69c75..a5f8463c47b66e48a91039c99eb8955814eb371f 100644
--- a/openair2/RRC/LTE/rrc_proto.h
+++ b/openair2/RRC/LTE/rrc_proto.h
@@ -65,7 +65,6 @@ void rrc_top_cleanup(void);
 
 /** \brief Function to update eNB timers every subframe.
 @param ctxt_pP  running context
-@param enb_index
 @param CC_id
 */
 RRC_status_t
@@ -97,8 +96,9 @@ int rrc_ue_decode_ccch( const protocol_ctxt_t *const ctxt_pP, const SRB_INFO *co
 /** \brief Decodes a DL-DCCH message and invokes appropriate routine to handle the message
     \param ctxt_pP Running context
     \param Srb_id Index of Srb (1,2)
-    \param buffer_pP Pointer to received SDU
-    \param eNB_index Index of corresponding eNB/CH*/
+    \param Buffer Pointer to received SDU
+    \param Buffer_size
+    \param eNB_indexP Index of corresponding eNB/CH*/
 void
 rrc_ue_decode_dcch(
   const protocol_ctxt_t *const ctxt_pP,
@@ -136,7 +136,7 @@ rrc_ue_process_rrcConnectionReconfiguration(
 
 /** \brief Establish SRB1 based on configuration in SRB_ToAddMod structure.  Configures RLC/PDCP accordingly
     \param module_idP Instance ID of UE
-    \param frame Frame index
+    \param frameP Frame index
     \param eNB_index Index of corresponding eNB/CH
     \param SRB_config Pointer to SRB_ToAddMod IE from configuration
     @returns 0 on success*/
@@ -144,7 +144,7 @@ int32_t  rrc_ue_establish_srb1(module_id_t module_idP,frame_t frameP,uint8_t eNB
 
 /** \brief Establish SRB2 based on configuration in SRB_ToAddMod structure.  Configures RLC/PDCP accordingly
     \param module_idP Instance ID of UE
-    \param frame Frame index
+    \param frameP Frame index
     \param eNB_index Index of corresponding eNB/CH
     \param SRB_config Pointer to SRB_ToAddMod IE from configuration
     @returns 0 on success*/
@@ -152,6 +152,7 @@ int32_t  rrc_ue_establish_srb2(module_id_t module_idP,frame_t frameP, uint8_t eN
 
 /** \brief Establish a DRB according to DRB_ToAddMod structure
     \param module_idP Instance ID of UE
+    \param frameP Frame index
     \param eNB_index Index of corresponding CH/eNB
     \param DRB_config Pointer to DRB_ToAddMod IE from configuration
     @returns 0 on success */
@@ -230,8 +231,9 @@ int rrc_eNB_decode_ccch(protocol_ctxt_t *const ctxt_pP,
 
 /**\brief Entry routine to decode a UL-DCCH-Message.  Invokes PER decoder and parses message.
    \param ctxt_pP Context
+\param Srb_id
    \param Rx_sdu Pointer Received Message
-   \param sdu_size Size of incoming SDU*/
+   \param sdu_sizeP Size of incoming SDU*/
 int
 rrc_eNB_decode_dcch(
   const protocol_ctxt_t *const ctxt_pP,
@@ -242,7 +244,8 @@ rrc_eNB_decode_dcch(
 
 /**\brief Generate the RRCConnectionSetup based on information coming from RRM
    \param ctxt_pP       Running context
-   \param ue_context_pP UE context*/
+   \param ue_context_pP UE context
+   \param CC_id*/
 void
 rrc_eNB_generate_RRCConnectionSetup(
   const protocol_ctxt_t *const ctxt_pP,
@@ -275,7 +278,6 @@ rrc_eNB_process_RRCConnectionSetupComplete(
 /**\brief Process the RRCConnectionReconfigurationComplete based on information coming from UE
    \param ctxt_pP       Running context
    \param ue_context_pP RRC UE context
-   \param rrcConnectionReconfigurationComplete Pointer to RRCConnectionReconfigurationComplete message
    \param xid         the transaction id for the rrcconnectionreconfiguration procedure
 */
 void
@@ -324,7 +326,11 @@ rrc_eNB_generate_dedeicatedRRCConnectionReconfiguration(
 
 /**\brief release Data Radio Bearer between ENB and UE
    \param ctxt_pP Running context
-   \param ue_context_pP UE context of UE receiving the message*/
+   \param ue_context_pP UE context of UE receiving the message
+\param xid
+\param nas_length
+\param nas_buffer
+*/
 void
 rrc_eNB_generate_dedicatedRRCConnectionReconfiguration_release(
   const protocol_ctxt_t   *const ctxt_pP,
@@ -344,15 +350,15 @@ void  rrc_enb_init(void);
 void *rrc_enb_process_itti_msg(void *);
 
 /**\brief RRC eNB task.
-   \param void *args_p Pointer on arguments to start the task. */
+   \param args_p Pointer on arguments to start the task. */
 void *rrc_enb_task(void *args_p);
 
 /**\brief RRC UE task.
-   \param void *args_p Pointer on arguments to start the task. */
+   \param args_p Pointer on arguments to start the task. */
 void *rrc_ue_task(void *args_p);
 
 /**\brief RRC NSA UE task.
-   \param void *args_p Pointer on arguments to start the task. */
+   \param args_p Pointer on arguments to start the task. */
 void *recv_msgs_from_nr_ue(void *args_p);
 
 void init_connections_with_nr_ue(void);
@@ -366,9 +372,7 @@ void rrc_eNB_process_handoverPreparationInformation(int mod_id, x2ap_handover_re
 void rrc_eNB_process_ENDC_x2_setup_request(int mod_id, x2ap_ENDC_setup_req_t *m);
 
 /**\brief Generate/decode the handover RRCConnectionReconfiguration at eNB
-   \param module_idP Instance ID for eNB/CH
-   \param frame Frame index
-   \param ue_module_idP Index of UE transmitting the messages*/
+ */
 void
 rrc_eNB_generate_RRCConnectionReconfiguration_handover(
   const protocol_ctxt_t *const ctxt_pP,
@@ -392,6 +396,7 @@ rrc_eNB_generate_RRCConnectionReconfiguration_Sidelink(
 
 /** \brief process the received SidelinkUEInformation message at eNB
     \param ctxt_pP Running context
+   \param ue_context_pP RRC UE context
     \param sidelinkUEInformation sidelinkUEInformation message from UE*/
 uint8_t
 rrc_eNB_process_SidelinkUEInformation(
diff --git a/openair2/RRC/NAS/nas_config.h b/openair2/RRC/NAS/nas_config.h
index de84a854caf7766a7e81a2bbf23e10cfb8005f0f..97a6dd59764d1f55964966bc5fd8d0e8cacdba89 100644
--- a/openair2/RRC/NAS/nas_config.h
+++ b/openair2/RRC/NAS/nas_config.h
@@ -34,7 +34,7 @@
 /*! \fn void void nas_getparams(void)(void)
  * \brief This function get parameters used to configure network interface when running in noS1 mode
  * \note
- * @ingroup  ?????
+ * @ingroup  _nas
  */
 void nas_getparams(void);
 
@@ -46,7 +46,7 @@ void nas_getparams(void);
  * \param[in] broadcastAddress, the broadcast address for the subnet, e.g. 10.0.1.255
  * \return 0 on success, otherwise 1, if couldn't open a socket and 2 if the ioctl fails
  * \note
- * @ingroup  ?????
+ * @ingroup  _nas
  */
 int NAS_config(char *interfaceName, char *ipAddress, char *networkMask, char *broadcastAddress);
 
@@ -59,7 +59,7 @@ int NAS_config(char *interfaceName, char *ipAddress, char *networkMask, char *br
  * \param[in] fourth octet of the ip address e.g. for the 10.1.2.3 address would be 3
  * \return 0 on success, otherwise 1, if couldn't open a socket and 2 if the ioctl fails
  * \note
- * @ingroup  ?????
+ * @ingroup  _nas
  */
 int nas_config(int interface_id, int thirdOctet, int fourthOctet, char *ifsuffix);
 
@@ -72,7 +72,7 @@ int nas_config(int interface_id, int thirdOctet, int fourthOctet, char *ifsuffix
  * \param[in] fourth octet of the ip address e.g. for the 10.1.2.3 address would be 3
  * \return 0 on success, otherwise 1, if couldn't open a socket and 2 if the ioctl fails
  * \note
- * @ingroup  ?????
+ * @ingroup  _nas
  */
 int nas_config_mbms(int interface_id, int thirdOctet, int fourthOctet, char *ifsuffix);
 
@@ -85,12 +85,10 @@ int nas_config_mbms(int interface_id, int thirdOctet, int fourthOctet, char *ifs
  * \param[in] fourth octet of the ip address e.g. for the 10.1.2.3 address would be 3
  * \return 0 on success, otherwise 1, if couldn't open a socket and 2 if the ioctl fails
  * \note
- * @ingroup  ?????
+ * @ingroup  _nas
  */
 int nas_config_mbms_s1(int interface_id, int thirdOctet, int fourthOctet, char *ifsuffix);
 
-
-
 /*! \fn int  blocking_NAS_config(char*, char*, char*, char*)
  * \brief This function initializes the nasmesh interface, in a blocking way,
  * the system calls are interrupted
@@ -100,7 +98,7 @@ int nas_config_mbms_s1(int interface_id, int thirdOctet, int fourthOctet, char *
  * \param[in] broadcastAddress, the broadcast address for the subnet, e.g. 10.0.1.255
  * \return 0 on success, otherwise 1
  * \note
- * @ingroup  ?????
+ * @ingroup  _nas
  */
 int blocking_NAS_config(char *interfaceName, char *ipAddress, char *networkMask, char *broadcastAddress);
 
@@ -113,7 +111,7 @@ int blocking_NAS_config(char *interfaceName, char *ipAddress, char *networkMask,
  *  SIOCSIFBRDADDR, SIOCSIFFLAGS), e.g. SIOCSIFBRDADDR
  * \return 0 on success, otherwise 1, if couldn't open a socket and 2 if the ioctl fails
  * \note
- * @ingroup  ?????
+ * @ingroup  _nas
  */
 int setInterfaceParameter(char *interfaceName, char *settingAddress, int operation);
 
@@ -123,7 +121,7 @@ int setInterfaceParameter(char *interfaceName, char *settingAddress, int operati
  * \param[in] address, the address of the gateway, e.g. 10.0.1.2
  * \return 0 on success, otherwise 1, if couldn't open a socket and 2 if the ioctl fails
  * \note
- * @ingroup  ?????
+ * @ingroup  _nas
  */
 int set_gateway(char *interfaceName, char *gateway);
 
@@ -131,7 +129,7 @@ int set_gateway(char *interfaceName, char *gateway);
  * \brief This function sets the basic network address used
  * \param[in] baseAddr, the new basic address e.g.for 10.0.1.2, would be 10.0
  * \note
- * @ingroup  ?????
+ * @ingroup  _nas
  */
 void setBaseNetAddress(char *baseAddr);
 
@@ -139,7 +137,7 @@ void setBaseNetAddress(char *baseAddr);
  * \brief This function returns the basic network address used
  * \return the basic network address in use
  * \note
- * @ingroup  ?????
+ * @ingroup  _nas
  */
 char *getBaseNetAddress(void);
 
@@ -147,7 +145,7 @@ char *getBaseNetAddress(void);
  * \brief This function sets the new default network mask used
  * \param[in] newNetworkMask, the new network mask e.g.for 255.255.0.0
  * \note
- * @ingroup  ?????
+ * @ingroup  _nas
  */
 void setNetMask(char *baseAddr);
 
@@ -155,7 +153,7 @@ void setNetMask(char *baseAddr);
  * \brief This function returns the network mask address in use
  * \return the network mask in use
  * \note
- * @ingroup  ?????
+ * @ingroup  _nas
  */
 char *getNetMask(void);
 
@@ -163,7 +161,7 @@ char *getNetMask(void);
  * \brief This function sets the new broadcast address used
  * \param[in] newNetworkMask, the new broadcast address e.g.for 10.0.255.255
  * \note
- * @ingroup  ?????
+ * @ingroup  _nas
  */
 void setBroadcastAddress(char *baseAddr);
 
@@ -171,7 +169,7 @@ void setBroadcastAddress(char *baseAddr);
  * \brief This function returns the broadcast address in use
  * \return the broadcast address in use
  * \note
- * @ingroup  ?????
+ * @ingroup  _nas
  */
 char *getBroadcastAddress(void);
 
diff --git a/openair2/RRC/NR/L2_nr_interface.c b/openair2/RRC/NR/L2_nr_interface.c
index 090486cf654144ba06ef68fb5885ee4cbc0d3d1d..2a652081f25d78a02c7e4b3b7a10f04473269663 100644
--- a/openair2/RRC/NR/L2_nr_interface.c
+++ b/openair2/RRC/NR/L2_nr_interface.c
@@ -19,7 +19,7 @@
  *      contact@openairinterface.org
  */
 
-/*! \file l2_nr_interface.c
+/*! \file L2_nr_interface.c
  * \brief layer 2 interface, used to support different RRC sublayer
  * \author Raymond Knopp and Navid Nikaein, WEI-TAI CHEN
  * \date 2010-2014, 2018
diff --git a/openair2/RRC/NR/nr_rrc_common.c b/openair2/RRC/NR/nr_rrc_common.c
index 99873998f0ac3caa7d81a1d12e1fb3f34c98599b..b64ea7d13f3dc958da9bafdd8458299b6866bba1 100644
--- a/openair2/RRC/NR/nr_rrc_common.c
+++ b/openair2/RRC/NR/nr_rrc_common.c
@@ -19,7 +19,7 @@
  *      contact@openairinterface.org
  */
 
-/*! \file nr_ rrc_common.c
+/*! \file nr_rrc_common.c
  * \brief rrc common procedures for gNB
  * \author Navid Nikaein and Raymond Knopp, WEI-TAI CHEN
  * \date 2011 - 2014, 2018
diff --git a/openair2/RRC/NR/nr_rrc_defs.h b/openair2/RRC/NR/nr_rrc_defs.h
index c37979598a1502edcf61ea4a2058494cc4d87122..7ccd84defd59535df34d69c6f6b363a9e61f2281 100644
--- a/openair2/RRC/NR/nr_rrc_defs.h
+++ b/openair2/RRC/NR/nr_rrc_defs.h
@@ -429,4 +429,3 @@ typedef struct gNB_RRC_INST_s {
 #include "nr_rrc_proto.h" //should be put here otherwise compilation error
 
 #endif
-/** @} */
diff --git a/openair2/RRC/NR/nr_rrc_proto.h b/openair2/RRC/NR/nr_rrc_proto.h
index 510e058495b0d7761a465687680fb9015d895406..06308fe9f7af116cda10c1056e44cd482e16f499 100644
--- a/openair2/RRC/NR/nr_rrc_proto.h
+++ b/openair2/RRC/NR/nr_rrc_proto.h
@@ -99,7 +99,7 @@ rrc_gNB_generate_RRCRelease(
 );
 
 /**\brief RRC eNB task.
-   \param void *args_p Pointer on arguments to start the task. */
+   \param args_p Pointer on arguments to start the task. */
 void *rrc_gnb_task(void *args_p);
 
 /**\ Function to set or overwrite PTRS DL RRC parameters.
@@ -160,5 +160,5 @@ void nr_pdcp_add_drbs(eNB_flag_t enb_flag,
 int rrc_gNB_generate_pcch_msg(uint32_t tmsi, uint8_t paging_drx, instance_t instance, uint8_t CC_id);
 
 void nr_rrc_transfer_protected_rrc_message(const gNB_RRC_INST *rrc, const gNB_RRC_UE_t *ue_p, uint8_t srb_id, const uint8_t* buffer, int size);
-
+/** @}*/
 #endif
diff --git a/openair2/RRC/NR/rrc_gNB.c b/openair2/RRC/NR/rrc_gNB.c
index b057d023b3bb15291aecbd46047b5f9932327cda..ae9f94cb7747bb600ffc4e365698bcf0713b86c8 100644
--- a/openair2/RRC/NR/rrc_gNB.c
+++ b/openair2/RRC/NR/rrc_gNB.c
@@ -2553,8 +2553,6 @@ static void write_rrc_stats(const gNB_RRC_INST *rrc)
   fclose(f);
 }
 
-///---------------------------------------------------------------------------------------------------------------///
-///---------------------------------------------------------------------------------------------------------------///
 void *rrc_gnb_task(void *args_p) {
   MessageDef *msg_p;
   instance_t                         instance;
diff --git a/openair2/RRC/NR_UE/rrc_defs.h b/openair2/RRC/NR_UE/rrc_defs.h
index c2d2c1a0dea4a79d3a91abff3df8ccb986cc4dc4..b4d967d3043f45061b852520350584f9fff06b3f 100644
--- a/openair2/RRC/NR_UE/rrc_defs.h
+++ b/openair2/RRC/NR_UE/rrc_defs.h
@@ -238,4 +238,3 @@ typedef struct NR_UE_RRC_INST_s {
 } NR_UE_RRC_INST_t;
 
 #endif
-/** @} */
diff --git a/openair2/RRC/NR_UE/rrc_proto.h b/openair2/RRC/NR_UE/rrc_proto.h
index 335b9ba84d92b48519f857320202fb257fe83280..56037db99726abebb502274667584481845b06f5 100644
--- a/openair2/RRC/NR_UE/rrc_proto.h
+++ b/openair2/RRC/NR_UE/rrc_proto.h
@@ -155,6 +155,5 @@ void nr_rrc_manage_rlc_bearers(const NR_CellGroupConfig_t *cellGroupConfig,
                                int rnti);
 
 int configure_NR_SL_Preconfig(int sync_source);
-/** @}*/
 #endif
 
diff --git a/openair2/UTIL/MATH/oml.h b/openair2/UTIL/MATH/oml.h
index abdc8fbf09fbfb677b790189d25d641754983adb..7c3c65c12327e2317d72233834d5cc3d65f9dcfe 100644
--- a/openair2/UTIL/MATH/oml.h
+++ b/openair2/UTIL/MATH/oml.h
@@ -41,14 +41,12 @@
 
 #define PI 3.14159265
 
-
-/*! \fn void set_taus_seed(unsigned int seed_type);
-* \brief initialize seeds used for the generation of taus random values
-* \param[in] initial value
-* \param[out]
-* \note
-* @ingroup  _oml
-*/
+/*! \fn set_taus_seed
+ * \brief initialize seeds used for the generation of taus random values
+ * \param[in] seed_type initial value
+ * \note
+ * @ingroup  _oml
+ */
 void set_taus_seed(unsigned int seed_type);
 
 /*! \fn inline unsigned int taus(unsigned int comp);
diff --git a/openair2/UTIL/OPT/probe.c b/openair2/UTIL/OPT/probe.c
index 94150164e80e032e35a393eebf35aaaebd900e2b..bc707423732546b63275a56068cb0fe6ffafd327 100644
--- a/openair2/UTIL/OPT/probe.c
+++ b/openair2/UTIL/OPT/probe.c
@@ -41,12 +41,10 @@
 There is different modules:
 - OAI Address
 - OAI Components
-- \ref _frame
 
 numbering:
 -# OAI Address
 -# OAI Components
--# \ref _frame
 
 The following diagram is based on graphviz (http://www.graphviz.org/), you need to install the package to view the diagram.
  *
@@ -73,11 +71,6 @@ Doxygen help and commands can be found at http://www.stack.nl/~dimitri/doxygen/c
 
 \section _arch Architecture
 
-You need to set the IMAGE_PATH in your Doxyfile
-
-\image html arch.png "Architecture"
-\image latex arch.eps "Architecture"
-
 \subsection _mac MAC
 thisis the mac
 \subsection _rlc RLC
@@ -641,4 +634,4 @@ void terminate_opt(void) {
       break;
   }
 }
-
+/** @}*/
diff --git a/openair2/UTIL/OTG/otg_defs.h b/openair2/UTIL/OTG/otg_defs.h
index 3f4f31e63b2616a5fdbad8b29df12b331752033c..8aea71d4438b40f96222f8624a6e72c789cb63cf 100644
--- a/openair2/UTIL/OTG/otg_defs.h
+++ b/openair2/UTIL/OTG/otg_defs.h
@@ -185,9 +185,9 @@ typedef enum {
 } VOIP_STATE;
 
 /**
- * \enum ALPHABET
+ * \enum ALPHABET_GEN
  *
- *\brief ALPHABET Alphabet type to generate random string
+ *\brief ALPHABET_GEN Alphabet type to generate random string
  *
  */
 typedef enum {
@@ -218,21 +218,6 @@ typedef enum {
   TCP_IPV6,
 } HEADER_TYPE;
 
-/**
- * \enum TRAFFIC_TYPE
- *
- * \brief HEADER_TYPE alows to identify the traffic type no specific type, m2m,etc.
- *
- */
-
-/*
-typedef enum {
-NO_TYPE=0,
-M2M_TYPE,
-}TRAFFIC_TYPE;
- */
-
-
 /*
  otg_models: definitions and structures,
  see otg_models.c for a detailed description
@@ -333,8 +318,9 @@ typedef struct {
  */
 typedef struct {
   int max_nb_frames; /*!< \brief  Max Number of frames*/
-  int application_type[NUMBER_OF_eNB_MAX + MAX_MOBILES_PER_ENB][NUMBER_OF_eNB_MAX + MAX_MOBILES_PER_ENB][MAX_NUM_APPLICATION];  /*!\brief It identify the application of the simulated traffic, could be cbr, m2m, gaming,etc*/
-  /*!\header info */
+  int application_type[NUMBER_OF_eNB_MAX + MAX_MOBILES_PER_ENB][NUMBER_OF_eNB_MAX + MAX_MOBILES_PER_ENB]
+                      [MAX_NUM_APPLICATION]; /*!\brief It identify the application of the simulated traffic, could be cbr, m2m,
+                                                gaming,etc*/
   int trans_proto[NUMBER_OF_eNB_MAX + MAX_MOBILES_PER_ENB][NUMBER_OF_eNB_MAX + MAX_MOBILES_PER_ENB][MAX_NUM_APPLICATION];   /*!\brief Transport Protocol*/
   int ip_v[NUMBER_OF_eNB_MAX + MAX_MOBILES_PER_ENB][NUMBER_OF_eNB_MAX + MAX_MOBILES_PER_ENB][MAX_NUM_APPLICATION];  /*!\brief Ip version */
   //int header_compression;         /*!\brief Specify if header compression is used or not */
diff --git a/openair2/UTIL/OTG/otg_rx.h b/openair2/UTIL/OTG/otg_rx.h
index 770d053ada0df618bbd577fc89f123484954de85..357eeb312356c3c951a79b1dce99f4c5cac7b202 100644
--- a/openair2/UTIL/OTG/otg_rx.h
+++ b/openair2/UTIL/OTG/otg_rx.h
@@ -92,12 +92,11 @@ float owd_const_mobile_core(void);
 */
 float owd_const_IP_backbone(void);
 
-/*! \fn float owd_const_applicatione();
-*\brief compute the one way delay introduced in LTE/LTE-A network REF PAPER: "Latency for Real-Time Machine-to-Machine Communication in LTE-Based System Architecture"
-*\param[out] float: application delay constant
-*\note
-*@ingroup  _otg
-*/
+/*! \fn owd_const_application
+ *\brief compute the one way delay introduced in LTE/LTE-A network REF PAPER: "Latency for Real-Time Machine-to-Machine
+ *Communication in LTE-Based System Architecture" \note
+ *@ingroup  _otg
+ */
 float owd_const_application(void);
 
 
diff --git a/openair2/UTIL/OTG/otg_tx.h b/openair2/UTIL/OTG/otg_tx.h
index 355294a8f49e6e73e88f012c67e6c0d761ad73b0..fdd6350481a53b3e94bd16595761db7bcecfab6c 100644
--- a/openair2/UTIL/OTG/otg_tx.h
+++ b/openair2/UTIL/OTG/otg_tx.h
@@ -130,9 +130,8 @@ unsigned char *header_gen(const int hdr_size);
 */
 unsigned char *payload_pkts(const int payload_size);
 
-
-/*! \fn
-char * serialize_buffer(char* const header, char* const payload, const unsigned int buffer_size, const int flag, const int flow_id, const int ctime, const int seq_num, const int hdr_type, const int state)
+/*! \fn char * serialize_buffer(char* const header, char* const payload, const unsigned int buffer_size, const int flag, const int
+flow_id, const int ctime, const int seq_num, const int hdr_type, const int state)
 * \brief serilize the packet and add otg control information
 * \param[in] char* header pointer to the header
 * \param[in] char* payload pointer to the payload
@@ -173,14 +172,6 @@ unsigned char * serialize_buffer(
 */
 int adjust_size(int size);
 
-
-/*! \fn int header_size_genint src();
-* \brief return the header size corresponding to ip version and transport protocol
-* \param[in]  the sender (src)
-* \param[out] size of packet header
-* \note
-* @ingroup  _otg
-*/
 void header_size_gen(const int src, const int dst, const int application);
 
 void init_predef_multicast_traffic(void);
diff --git a/openair2/X2AP/x2ap_common.h b/openair2/X2AP/x2ap_common.h
index f42ec6bc4cfa7c413717be905f29159d20343703..81880cb71cbd30f6fe0897445151128709a89ea0 100644
--- a/openair2/X2AP/x2ap_common.h
+++ b/openair2/X2AP/x2ap_common.h
@@ -132,5 +132,6 @@ ssize_t x2ap_generate_unsuccessfull_outcome(
  @returns void
  **/
 void x2ap_handle_criticality(X2AP_Criticality_t criticality);
+/** @}*/
 
 #endif /* X2AP_COMMON_H_ */
diff --git a/openair2/X2AP/x2ap_eNB.c b/openair2/X2AP/x2ap_eNB.c
index 831cad474270017283efbd8d542e9fc0e54cc176..1eac6b6fd74685dc9b20fc8bfca147d52852f2c3 100644
--- a/openair2/X2AP/x2ap_eNB.c
+++ b/openair2/X2AP/x2ap_eNB.c
@@ -548,9 +548,10 @@ void x2ap_gNB_trigger_sgNB_add_req_ack(instance_t instance,
 }
 
 /**
- * @fn	: Function triggers sgnb reconfiguration complete
+ * @fn x2ap_eNB_trigger_sgnb_reconfiguration_complete
+ *\brief:  Function triggers sgnb reconfiguration complete
  * @param	: IN instance, IN x2ap_reconf_complete
-**/ 
+ **/
 static
 void x2ap_eNB_trigger_sgnb_reconfiguration_complete(instance_t instance,
     x2ap_ENDC_reconf_complete_t *x2ap_reconf_complete)
diff --git a/openair3/M3AP/m3ap_MCE.h b/openair3/M3AP/m3ap_MCE.h
index 3a617776e3d7578bbc883ccfd59ebbc91185d62b..06ef1dc4982b60d69269127169e0cc2c4f827c53 100644
--- a/openair3/M3AP/m3ap_MCE.h
+++ b/openair3/M3AP/m3ap_MCE.h
@@ -19,11 +19,10 @@
  *      contact@openairinterface.org
  */
 
-/*! \file m3ap_eNB.h
+/*! \file m3ap_MCE.h
  * \brief m3ap tasks for eNB
- * \author Konstantinos Alexandris <Konstantinos.Alexandris@eurecom.fr>, Cedric Roux <Cedric.Roux@eurecom.fr>, Navid Nikaein <Navid.Nikaein@eurecom.fr>
- * \date 2018
- * \version 1.0
+ * \author Konstantinos Alexandris <Konstantinos.Alexandris@eurecom.fr>, Cedric Roux <Cedric.Roux@eurecom.fr>, Navid Nikaein
+ * <Navid.Nikaein@eurecom.fr> \date 2018 \version 1.0
  */
 
 #include <stdio.h>
diff --git a/openair3/M3AP/m3ap_MCE_handler.c b/openair3/M3AP/m3ap_MCE_handler.c
index e791b2a47cb5eda4cd00dd01afa422e315526391..f490caf3254555c504b9cbb6104f97c59b2680b2 100644
--- a/openair3/M3AP/m3ap_MCE_handler.c
+++ b/openair3/M3AP/m3ap_MCE_handler.c
@@ -19,7 +19,7 @@
  *      contact@openairinterface.org
  */
 
-/*! \file m3ap_eNB_handler.c
+/*! \file m3ap_MCE_handler.c
  * \brief m3ap handler procedures for eNB
  * \author Javier Morgade <javier.morgade@ieee.org>
  * \date 2019
diff --git a/openair3/M3AP/m3ap_MME_handler.c b/openair3/M3AP/m3ap_MME_handler.c
index a459d1000cafece2b21dcdcb0429d7495f5d1581..8a3e38820f84891686233151c77c0ed71501ba7b 100644
--- a/openair3/M3AP/m3ap_MME_handler.c
+++ b/openair3/M3AP/m3ap_MME_handler.c
@@ -19,7 +19,7 @@
  *      contact@openairinterface.org
  */
 
-/*! \file m3ap_eNB_handler.c
+/*! \file m3ap_MME_handler.c
  * \brief m3ap handler procedures for eNB
  * \author Javier Morgade <javier.morgade@ieee.org>
  * \date 2019
diff --git a/openair3/M3AP/m3ap_MME_management_procedures.h b/openair3/M3AP/m3ap_MME_management_procedures.h
index b5a75f8a232427f39af27f02ce62ac37ace6f5d9..f45c856cb8118087e455c802567a83538178b560 100644
--- a/openair3/M3AP/m3ap_MME_management_procedures.h
+++ b/openair3/M3AP/m3ap_MME_management_procedures.h
@@ -19,7 +19,7 @@
  *      contact@openairinterface.org
  */
 
-/*! \file m3ap_eNB_management_procedures.h
+/*! \file m3ap_MME_management_procedures.h
  * \brief m3ap tasks for eNB
  * \author Javier Morgade <javier.morgade@ieee.org>
  * \date 2019
diff --git a/openair3/M3AP/m3ap_common.h b/openair3/M3AP/m3ap_common.h
index d59407c2ecbfd7c6c690ea7eaecfd329248753a4..7c8ea18a5d9e871ca5659f5524039817eed59ff9 100644
--- a/openair3/M3AP/m3ap_common.h
+++ b/openair3/M3AP/m3ap_common.h
@@ -140,5 +140,6 @@ ssize_t m3ap_generate_unsuccessfull_outcome(
  @returns void
  **/
 void m3ap_handle_criticality(M3AP_Criticality_t criticality);
+/** @}*/
 
 #endif /* M3AP_COMMON_H_ */
diff --git a/openair3/M3AP/m3ap_handler.h b/openair3/M3AP/m3ap_handler.h
index 5dcc71204e91681575786a8be8bd7b1ef0057989..f736d45b25a9c2fe63e3253c965b174fec3f023c 100644
--- a/openair3/M3AP/m3ap_handler.h
+++ b/openair3/M3AP/m3ap_handler.h
@@ -19,15 +19,15 @@
  *      contact@openairinterface.org
  */
 
-/*! \file m2ap_handler.h
- * \brief m2ap handler procedures for eNB
+/*! \file m3ap_handler.h
+ * \brief m3ap handler procedures for eNB
  * \author Javier Morgade <javier.morgade@ieee.org>
  * \date 2019
  * \version 0.1
  */
 
-#ifndef M2AP_MCE_OLD_HANDLERS_H_
-#define M2AP_MCE_OLD_HANDLERS_H_
+#ifndef M3AP_MCE_OLD_HANDLERS_H_
+#define M3AP_MCE_OLD_HANDLERS_H_
 
 #include "m2ap_eNB_defs.h"
 
@@ -43,4 +43,4 @@ int m3ap_handle_message(instance_t instance,
                         const uint8_t *const data,
                         const uint32_t data_length);
 
-#endif /* M2AP_MCE_HANDLERS_H_ */
+#endif
diff --git a/openair3/M3AP/m3ap_itti_messaging.c b/openair3/M3AP/m3ap_itti_messaging.c
index 83b51f009149e8e4e0b99347e4a6658631b64f38..70183f86ff8855b809668f8199b67598f3249a83 100644
--- a/openair3/M3AP/m3ap_itti_messaging.c
+++ b/openair3/M3AP/m3ap_itti_messaging.c
@@ -19,7 +19,7 @@
  *      contact@openairinterface.org
  */
 
-/*! \file m3ap_MCE_itti_messaging.c
+/*! \file m3ap_itti_messaging.c
  * \brief m3ap tasks for MCE
  * \author Javier Morgade <javier.morgade@ieee.org>
  * \date 2019
diff --git a/openair3/NGAP/ngap_common.h b/openair3/NGAP/ngap_common.h
index 8c66a11cd000e1ff3e771fbafe0d2fb04412849f..4b845690c6955a6de125c25143cbe49bfd3ed28a 100644
--- a/openair3/NGAP/ngap_common.h
+++ b/openair3/NGAP/ngap_common.h
@@ -134,5 +134,6 @@ typedef int (*ngap_message_decoded_callback)(sctp_assoc_t assoc_id, uint32_t str
  @returns void
  **/
 void ngap_handle_criticality(NGAP_Criticality_t criticality);
+/** @}*/
 
 #endif /* NGAP_COMMON_H_ */
diff --git a/openair3/NGAP/ngap_gNB.h b/openair3/NGAP/ngap_gNB.h
index 2aa0080cd1c78e2d173ef051cf2205cd6f287627..9a838009c648c1f51ae668bbe77956cb345117c3 100644
--- a/openair3/NGAP/ngap_gNB.h
+++ b/openair3/NGAP/ngap_gNB.h
@@ -31,7 +31,7 @@
 #include <stdio.h>
 #include <stdint.h>
 
-/** @defgroup _ngap_impl_ NGAP Layer Reference Implementation for gNB
+/** @defgroup _ngap_impl_ NGAP Layer Reference Implementation
  * @ingroup _ref_implementation_
  * @{
  */
diff --git a/openair3/S1AP/s1ap_common.h b/openair3/S1AP/s1ap_common.h
index a452d284e55aa006c019d6052dd918b1e2dc63bb..797bc7be8a09fecc6a9f4774072399e424f7665c 100644
--- a/openair3/S1AP/s1ap_common.h
+++ b/openair3/S1AP/s1ap_common.h
@@ -94,5 +94,5 @@ typedef int (*s1ap_message_decoded_callback)(sctp_assoc_t assoc_id, uint32_t str
  @returns void
  **/
 void s1ap_handle_criticality(S1AP_Criticality_t criticality);
-
+/** @}*/
 #endif /* S1AP_COMMON_H_ */
diff --git a/openair3/S1AP/s1ap_eNB.h b/openair3/S1AP/s1ap_eNB.h
index 21835872147d6cc25f982847307d9c52cf3296bc..203dbc790ebaf39fc5937c6bf82cd140a84f060b 100644
--- a/openair3/S1AP/s1ap_eNB.h
+++ b/openair3/S1AP/s1ap_eNB.h
@@ -22,7 +22,7 @@
 #include <stdio.h>
 #include <stdint.h>
 
-/** @defgroup _s1ap_impl_ S1AP Layer Reference Implementation for eNB
+/** @defgroup _s1ap_impl_ S1AP Layer Reference Implementation
  * @ingroup _ref_implementation_
  * @{
  */
diff --git a/radio/COMMON/common_lib.h b/radio/COMMON/common_lib.h
index 4c21e91ec2cb155bcf7b7396081b8104d9f9aea7..d735fab4f003f601638330007515fa1da0febf70 100644
--- a/radio/COMMON/common_lib.h
+++ b/radio/COMMON/common_lib.h
@@ -457,33 +457,31 @@ struct openair0_device_t {
       @param timestamp The timestamp at whicch the first sample MUST be sent
       @param buff Buffer which holds the samples (1 dimensional)
       @param nsamps number of samples to be sent
-      @param antenna_id index of the antenna if the device has multiple anteannas
       @param flags flags must be set to true if timestamp parameter needs to be applied
   */
   int (*trx_write_func2)(openair0_device *device, openair0_timestamp timestamp, void **buff, int fd_ind,int nsamps, int flags,int nant);
 
   /*! \brief Receive samples from hardware.
-   * Read \ref nsamps samples from each channel to buffers. buff[0] is the array for
+   * Read nsamps samples from each channel to buffers. buff[0] is the array for
    * the first channel. *ptimestamp is the time at which the first sample
    * was received.
    * \param device the hardware to use
    * \param[out] ptimestamp the time at which the first sample was received.
-   * \param[out] buff An array of pointers to buffers for received samples. The buffers must be large enough to hold the number of samples \ref nsamps.
-   * \param nsamps Number of samples. One sample is 2 byte I + 2 byte Q => 4 byte.
-   * \param num_antennas number of antennas from which to receive samples
-   * \returns the number of sample read
+   * \param[out] buff An array of pointers to buffers for received samples. The buffers must be large enough to hold the number of
+   * samples nsamps. \param nsamps Number of samples. One sample is 2 byte I + 2 byte Q => 4 byte. \param num_antennas number of
+   * antennas from which to receive samples \returns the number of sample read
    */
 
   int (*trx_read_func)(openair0_device *device, openair0_timestamp *ptimestamp, void **buff, int nsamps,int num_antennas);
 
   /*! \brief Receive samples from hardware, this version provides a single antenna at a time and returns.
-   * Read \ref nsamps samples from each channel to buffers. buff[0] is the array for
+   * Read nsamps samples from each channel to buffers. buff[0] is the array for
    * the first channel. *ptimestamp is the time at which the first sample
    * was received.
    * \param device the hardware to use
    * \param[out] ptimestamp the time at which the first sample was received.
-   * \param[out] buff A pointer to a buffer[ant_id][] for received samples. The buffer[ant_id] must be large enough to hold the number of samples \ref nsamps * the number of packets.
-   * \param nsamps Number of samples. One sample is 2 byte I + 2 byte Q => 4 byte.
+   * \param[out] buff A pointer to a buffer[ant_id][] for received samples. The buffer[ant_id] must be large enough to hold the
+   * number of samples nsamps * the number of packets. \param nsamps Number of samples. One sample is 2 byte I + 2 byte Q => 4 byte.
    * \param packet_idx offset into
    * \param antenna_id Index of antenna from which samples were received
    * \returns the number of sample read
@@ -628,8 +626,9 @@ openair0_timestamp get_usrp_time(openair0_device *device);
  * \returns 0 in success
  */
 int openair0_set_rx_frequencies(openair0_device *device, openair0_config_t *openair0_cfg);
-/*! \brief read the iq record/player configuration */
+/*! \brief read the iq record-player configuration */
 extern int read_recplayconfig(recplay_conf_t **recplay_conf, recplay_state_t **recplay_state);
+
 /*! \brief store recorded iqs from memory to file. */
 extern void iqrecorder_end(openair0_device *device);
 
@@ -638,9 +637,7 @@ extern void iqrecorder_end(openair0_device *device);
 #ifndef gettid
 #define gettid() syscall(__NR_gettid)
 #endif
-/*@}*/
-
-
+/**@}*/
 
 #ifdef __cplusplus
 }
diff --git a/radio/COMMON/record_player.c b/radio/COMMON/record_player.c
index 2041ab29e1efe238774c44e745db08b96d3eb69a..485c5c7228ad7b37ac7785d251a1479c628d1ed3 100644
--- a/radio/COMMON/record_player.c
+++ b/radio/COMMON/record_player.c
@@ -37,7 +37,7 @@
 
 /*! \brief read the oai recorder or player configuration, called from common device code
  * \param recplay_conf:  store parameters
- *        recplay_state: store recorder or player data while the device runs
+ * \param recplay_state: store recorder or player data while the device runs
  */
 int read_recplayconfig(recplay_conf_t **recplay_conf, recplay_state_t **recplay_state) {
   *recplay_conf = calloc(sizeof(recplay_conf_t),1);
@@ -76,7 +76,7 @@ int read_recplayconfig(recplay_conf_t **recplay_conf, recplay_state_t **recplay_
 
 /*! \brief Terminate operation of the oai iq recorder. to be called by any device
  * used in record mode
- * \param device, the hardware used
+ * \param device the hardware used
  */
 void iqrecorder_end(openair0_device *device) {
   if (device->recplay_state != NULL) { // subframes store
diff --git a/radio/ETHERNET/ethernet_lib.h b/radio/ETHERNET/ethernet_lib.h
index 873ef26e12a76a46bb8e6151ff3b2643614395e2..3ec8b93d9d3bb25a433dce5461dea06be8eb91b6 100644
--- a/radio/ETHERNET/ethernet_lib.h
+++ b/radio/ETHERNET/ethernet_lib.h
@@ -87,8 +87,8 @@ typedef struct {
   /*!\brief timeout ms */ 
   unsigned int tx_timeout_ms;
   /*!\brief runtime flags */ 
-  uint32_t flags;   
-  /*!\compression enalbe  */
+  uint32_t flags;
+  /*!\brief compression enable  */
   uint32_t compression;
   /*!\ time offset between transmiter timestamp and receiver timestamp */ 
   double tdiff;
@@ -239,25 +239,23 @@ void *udp_read_thread(void *arg);
 void *udp_write_thread(void *arg);
 
 /*! \fn int ethernet_tune (openair0_device *device, unsigned int option, int value);
-* \brief this function allows you to configure certain ethernet parameters in socket or device level
-* \param[in] openair0 device which bears the socket
-* \param[in] name of parameter to configure
-* \return 0 on success, otherwise -1
-* \note
-* @ingroup  _oai
-*/
+ * \brief this function allows you to configure certain ethernet parameters in socket or device level
+ * \param[in] device device which bears the socket
+ * \param[in] option of parameter to configure
+ * \param[in] value of parameter to configure
+ * \return 0 on success, otherwise -1
+ * \note
+ * @ingroup  _oai
+ */
 int ethernet_tune(openair0_device *device, unsigned int option, int value);
 
-
-
 /*! \fn int eth_socket_init_udp(openair0_device *device)
-* \brief initialization of UDP Socket to communicate with one destination
-* \param[in] *device openair device for which the socket will be created
-* \param[out]
-* \return 0 on success, otherwise -1
-* \note
-* @ingroup  _oai
-*/
+ * \brief initialization of UDP Socket to communicate with one destination
+ * \param[in] device openair device for which the socket will be created
+ * \return 0 on success, otherwise -1
+ * \note
+ * @ingroup  _oai
+ */
 int eth_socket_init_udp(openair0_device *device);
 int trx_eth_write_udp(openair0_device *device, openair0_timestamp timestamp, void **buf, int fd_ind, int nsamps, int flags,int nant);
 int trx_eth_read_udp(openair0_device *device, openair0_timestamp *timestamp, uint32_t **buff, int nsamps);