merge with develop-nr

cf7c7937 · Guy De Souza · a17b08f7 · 94d14b43 · cf7c7937 · cf7c7937
Commit cf7c7937 authored Aug 20, 2018 by Guy De Souza
93 changed files
--- a/cmake_targets/CMakeLists.txt
+++ b/cmake_targets/CMakeLists.txt
@@ -176,7 +176,8 @@ set(CMAKE_EXE_LINKER_FLAGS  "${CMAKE_EXE_LINKER_FLAGS} -Wl,-rpath -Wl,${CMAKE_CU
 # these changes are related to hardcoded path to include .h files
 add_definitions(-DCMAKER)
 set(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS} -g -DMALLOC_CHECK_=3")
-set(CMAKE_C_FLAGS_RELWITHDEBINFO "${CMAKE_C_FLAGS} -g -DMALLOC_CHECK_=3 -O2")
+#set(CMAKE_C_FLAGS_RELWITHDEBINFO "${CMAKE_C_FLAGS} -g -DMALLOC_CHECK_=3 -O2")
+set(CMAKE_C_FLAGS_RELWITHDEBINFO "${CMAKE_C_FLAGS} -g -DMALLOC_CHECK_=3")


 set(GIT_BRANCH        "UNKNOWN")
@@ -435,7 +436,6 @@ execute_process(COMMAND mkdir -p ${S1AP_C_DIR}
                COMMAND env "ASN1C_PREFIX=S1AP_" asn1c -pdu=all -fcompound-names -fno-include-deps -gen-PER -no-gen-OER -no-gen-example -D ${S1AP_C_DIR} ${S1AP_ASN_DIR}/${S1AP_ASN_FILES}
                RESULT_VARIABLE ret)

-
 if (NOT ${ret} STREQUAL 0)
  message(FATAL_ERROR "${ret}: error")
 endif (NOT ${ret} STREQUAL 0)
@@ -451,7 +451,6 @@ add_custom_command (
  DEPENDS ${S1AP_ASN_DIR}/${S1AP_ASN_FILES}
 )

-
 add_library(S1AP_LIB
  ${S1AP_source}
  ${S1AP_DIR}/s1ap_common.c
@@ -1045,6 +1044,17 @@ set(SCHED_SRC_UE
 )
 add_library(SCHED_UE_LIB ${SCHED_SRC_UE})

+set(SCHED_SRC_NR_UE
+  ${OPENAIR1_DIR}/SCHED_NR_UE/phy_procedures_nr_ue.c
+  ${OPENAIR1_DIR}/SCHED_NR/phy_procedures_nr_common.c
+  ${OPENAIR1_DIR}/SCHED_NR_UE/fapi_nr_ue_l1.c 
+  ${OPENAIR1_DIR}/SCHED_NR_UE/phy_frame_config_nr.c
+  ${OPENAIR1_DIR}/SCHED_NR_UE/harq_nr.c
+  ${OPENAIR1_DIR}/SCHED_NR_UE/pucch_uci_ue_nr.c
+  ${OPENAIR1_DIR}/SCHED_NR_UE/pucch_power_control_ue_nr.c 
+)
+add_library(SCHED_NR_UE_LIB ${SCHED_SRC_NR_UE})
+
 # nFAPI
 #################################
 set(NFAPI_COMMON_SRC
@@ -1284,6 +1294,7 @@ set(PHY_SRC_UE
  ${OPENAIR1_DIR}/PHY/TOOLS/lut.c
  ${PHY_POLARSRC}
  )
+
  set(PHY_NR_UE_SRC
  # depend on code generation from asn1c
  ${RRC_FULL_DIR}/asn1_constants.h
@@ -1300,6 +1311,7 @@ set(PHY_SRC_UE
  ${OPENAIR1_DIR}/PHY/NR_UE_TRANSPORT/srs_modulation_nr.c
  ${OPENAIR1_DIR}/PHY/NR_UE_TRANSPORT/dci_nr.c
  ${OPENAIR1_DIR}/PHY/NR_UE_TRANSPORT/dci_tools_nr.c
+  ${OPENAIR1_DIR}/PHY/NR_UE_TRANSPORT/pucch_nr.c
  ${OPENAIR1_DIR}/PHY/NR_REFSIG/ul_ref_seq_nr.c
  ${OPENAIR1_DIR}/PHY/NR_REFSIG/nr_dmrs_rx.c
  ${OPENAIR1_DIR}/PHY/NR_REFSIG/nr_gold_ue.c
@@ -1317,12 +1329,10 @@ set(PHY_SRC_UE
  ${OPENAIR1_DIR}/PHY/TOOLS/time_meas.c
  ${OPENAIR1_DIR}/PHY/TOOLS/lut.c
  ${OPENAIR1_DIR}/PHY/INIT/nr_init_ue.c
-  ${OPENAIR1_DIR}/SCHED_NR_UE/phy_procedures_nr_ue.c
-  #${OPENAIR1_DIR}/SCHED_NR_UE/phy_procedures_nr_common_ue.c
-  ${OPENAIR1_DIR}/SCHED_NR_UE/fapi_nr_ue_l1.c
  ${PHY_POLARSRC}
  )

+
 if (${SMBV})
  set(PHY_SRC "${PHY_SRC} ${OPENAIR1_DIR}/PHY/TOOLS/smbv.c")
 endif  (${SMBV})
@@ -1446,9 +1456,13 @@ set(L2_SRC_UE
  ${RRC_DIR}/rrc_common.c
  ${RRC_DIR}/L2_interface_common.c
  ${RRC_DIR}/L2_interface_ue.c
+  )
+
+set(NR_L2_SRC_UE
  ${NR_UE_RRC_DIR}/L2_interface_ue.c
  ${NR_UE_RRC_DIR}/main_ue.c
  ${NR_UE_RRC_DIR}/rrc_UE.c
+#  ${NR_UE_RRC_DIR}/mac_vars.c
  )

 set(L2_NR_SRC_UE
@@ -1532,15 +1546,52 @@ add_library(L2_NR

 add_library(L2_UE
  ${L2_SRC_UE}
-  ${MAC_SRC_UE})
+  ${MAC_SRC_UE}
+  #${MAC_NR_SRC_UE}
+)

-add_library(L2_NR_UE
-  ${L2_NR_SRC_UE}
-  ${MAC_NR_SRC_UE})
+add_library( NR_L2_UE
+    #${L2_SRC_UE}
+    ${NR_L2_SRC_UE}
+    ${MAC_NR_SRC_UE}
+    #${MAC_SRC_UE}
+)

-include_directories(${NR_UE_PHY_INTERFACE_DIR})
+set ( NR_LTE_UE_REUSE_SRC
+    ${OPENAIR1_DIR}/PHY/LTE_ESTIMATION/lte_sync_timefreq.c
+  ${OPENAIR1_DIR}/SCHED/phy_procedures_lte_common.c
+  #${OPENAIR1_DIR}/SCHED_UE/phy_procedures_lte_ue.c
+  ${OPENAIR1_DIR}/PHY/LTE_TRANSPORT/lte_mcs.c
+  ${OPENAIR1_DIR}/PHY/LTE_TRANSPORT/pmch_common.c

-include_directories(${NFAPI_USER_DIR})
+  ${OPENAIR1_DIR}/PHY/LTE_REFSIG/lte_dl_cell_spec.c
+  ${OPENAIR1_DIR}/PHY/CODING/lte_segmentation.c
+  ${OPENAIR1_DIR}/PHY/LTE_TRANSPORT/prach_common.c
+#  ${OPENAIR1_DIR}/PHY/INIT/lte_init_ue.c
+  ${OPENAIR1_DIR}/PHY/CODING/crc_byte.c
+  ${OPENAIR1_DIR}/PHY/CODING/viterbi_lte.c
+  ${OPENAIR1_DIR}/PHY/CODING/viterbi.c
+  ${OPENAIR1_DIR}/PHY/LTE_TRANSPORT/phich_common.c
+  ${OPENAIR1_DIR}/PHY/LTE_UE_TRANSPORT/dlsch_llr_computation.c
+  ${OPENAIR1_DIR}/PHY/LTE_TRANSPORT/dci_tools_common.c
+  ${OPENAIR1_DIR}/PHY/CODING/lte_rate_matching.c
+  ${OPENAIR1_DIR}/PHY/CODING/ccoding_byte_lte.c
+  ${OPENAIR1_DIR}/PHY/CODING/ccoding_byte.c
+  ${OPENAIR1_DIR}/PHY/LTE_REFSIG/lte_gold.c
+  ${OPENAIR1_DIR}/PHY/LTE_ESTIMATION/lte_est_freq_offset.c
+  ${OPENAIR1_DIR}/PHY/LTE_ESTIMATION/lte_dl_channel_estimation.c
+  ${OPENAIR1_DIR}/PHY/LTE_ESTIMATION/lte_ue_measurements.c
+  ${OPENAIR1_DIR}/PHY/LTE_UE_TRANSPORT/dlsch_demodulation.c
+)
+
+add_library( NR_LTE_UE_REUSE_LIB
+    ${NR_LTE_UE_REUSE_SRC}
+)
+
+include_directories("${OPENAIR2_DIR}/NR_UE_PHY_INTERFACE")
+include_directories("${OPENAIR2_DIR}/LAYER2/NR_MAC_UE")
+include_directories("${OPENAIR1_DIR}/SCHED_NR_UE")
+#include_directories("${NFAPI_USER_DIR}"")

 # L3 Libs
 ##########################
@@ -2239,7 +2290,7 @@ target_link_libraries (nr-softmodem
  -Wl,--start-group
  UTIL HASHTABLE SCTP_CLIENT UDP SCHED_LIB SCHED_RU_LIB SCHED_NR_LIB PHY_NR PHY PHY_COMMON PHY_RU LFDS GTPV1U SECU_CN SECU_OSA
  ${ITTI_LIB} ${FLPT_MSG_LIB} ${ASYNC_IF_LIB} ${FLEXRAN_AGENT_LIB} LFDS7 ${MSC_LIB} ${RAL_LIB} ${NAS_UE_LIB}
-  RRC_LIB S1AP_LIB S1AP_ENB L2 L2_NR
+  RRC_LIB NR_RRC_LIB S1AP_LIB S1AP_ENB L2 L2_NR
  NFAPI_COMMON_LIB NFAPI_LIB NFAPI_VNF_LIB NFAPI_PNF_LIB NFAPI_USER_LIB
  -Wl,--end-group z dl)

@@ -2275,7 +2326,7 @@ add_executable(nr-softmodem-nos1
  ${SHLIB_LOADER_SOURCES}
  )

-target_link_libraries (nr-softmodem
+target_link_libraries (nr-softmodem-nos1
  -Wl,--start-group
  UTIL HASHTABLE SCTP_CLIENT UDP SCHED_LIB SCHED_RU_LIB SCHED_NR_LIB PHY_NR PHY PHY_COMMON PHY_RU LFDS GTPV1U SECU_CN SECU_OSA
  ${ITTI_LIB} ${FLPT_MSG_LIB} ${ASYNC_IF_LIB} ${FLEXRAN_AGENT_LIB} LFDS7 ${MSC_LIB} ${RAL_LIB} ${NAS_UE_LIB} ${MIH_LIB}
@@ -2283,10 +2334,10 @@ target_link_libraries (nr-softmodem
  NFAPI_COMMON_LIB NFAPI_LIB NFAPI_VNF_LIB NFAPI_PNF_LIB NFAPI_USER_LIB
  -Wl,--end-group z dl)

-target_link_libraries (nr-softmodem ${LIBXML2_LIBRARIES})
-target_link_libraries (nr-softmodem pthread m ${CONFIG_LIBRARIES} rt crypt ${CRYPTO_LIBRARIES} ${OPENSSL_LIBRARIES} ${NETTLE_LIBRARIES} sctp  ${XFORMS_LIBRARIES} ${PROTOBUF_LIB}  ${CMAKE_DL_LIBS} ${LIBYAML_LIBRARIES})
-target_link_libraries (nr-softmodem ${LIB_LMS_LIBRARIES})
-target_link_libraries (nr-softmodem ${T_LIB})
+target_link_libraries (nr-softmodem-nos1 ${LIBXML2_LIBRARIES})
+target_link_libraries (nr-softmodem-nos1 pthread m ${CONFIG_LIBRARIES} rt crypt ${CRYPTO_LIBRARIES} ${OPENSSL_LIBRARIES} ${NETTLE_LIBRARIES} sctp  ${XFORMS_LIBRARIES} ${PROTOBUF_LIB}  ${CMAKE_DL_LIBS} ${LIBYAML_LIBRARIES})
+target_link_libraries (nr-softmodem-nos1 ${LIB_LMS_LIBRARIES})
+target_link_libraries (nr-softmodem-nos1 ${T_LIB})

 # nr-uesoftmodem is  UE implementation
 #######################################
@@ -2299,7 +2350,7 @@ add_executable(nr-uesoftmodem
  ${OPENAIR_TARGETS}/RT/USER/nr-ue.c
  ${OPENAIR_TARGETS}/RT/USER/nr-uesoftmodem.c
  ${OPENAIR1_DIR}/SIMULATION/TOOLS/taus.c
-  ${OPENAIR_TARGETS}/COMMON/create_tasks_ue.c
+#  ${OPENAIR_TARGETS}/COMMON/create_tasks_ue.c
  ${OPENAIR_TARGETS}/ARCH/COMMON/common_lib.c
  ${OPENAIR1_DIR}/SIMULATION/ETH_TRANSPORT/netlink_init.c
  ${OPENAIR3_DIR}/NAS/UE/nas_ue_task.c
@@ -2314,7 +2365,7 @@ add_executable(nr-uesoftmodem

 target_link_libraries (nr-uesoftmodem
  -Wl,--start-group
-  RRC_LIB S1AP_LIB S1AP_ENB GTPV1U SECU_CN SECU_OSA UTIL HASHTABLE SCTP_CLIENT UDP SCHED_RU_LIB SCHED_UE_LIB PHY_NR_UE PHY_COMMON PHY_UE PHY_RU LFDS L2_UE L2_NR_UE
+  RRC_LIB NR_RRC_LIB S1AP_LIB S1AP_ENB GTPV1U SECU_CN SECU_OSA UTIL HASHTABLE SCTP_CLIENT UDP SCHED_RU_LIB SCHED_NR_UE_LIB PHY_NR_UE PHY_RU LFDS NR_L2_UE NR_LTE_UE_REUSE_LIB 
  ${MSC_LIB} ${RAL_LIB} ${NAS_UE_LIB} ${ITTI_LIB} ${FLPT_MSG_LIB} ${ASYNC_IF_LIB} LFDS7
  -Wl,--end-group z dl)

@@ -2349,7 +2400,7 @@ add_executable(nr-uesoftmodem-nos1

 target_link_libraries (nr-uesoftmodem-nos1
  -Wl,--start-group
-  RRC_LIB S1AP_LIB S1AP_ENB GTPV1U SECU_CN SECU_OSA UTIL HASHTABLE SCTP_CLIENT UDP SCHED_RU_LIB SCHED_UE_LIB PHY_NR_UE PHY_COMMON PHY_UE PHY_RU LFDS L2_UE L2_NR_UE
+  RRC_LIB S1AP_LIB S1AP_ENB GTPV1U SECU_CN SECU_OSA UTIL HASHTABLE SCTP_CLIENT UDP SCHED_RU_LIB SCHED_UE_LIB SCHED_NR_UE_LIB PHY_NR_UE PHY_COMMON PHY_UE PHY_RU LFDS L2_UE 
  ${MSC_LIB} ${RAL_LIB} ${NAS_UE_LIB} ${ITTI_LIB} ${FLPT_MSG_LIB} ${ASYNC_IF_LIB} LFDS7
  -Wl,--end-group z dl)


--- a/cmake_targets/build_oai
+++ b/cmake_targets/build_oai
@@ -544,7 +544,7 @@ function main() {
  if [ "$NOS1" = "1" ] ; then
      build_dir=noS1_ran_build
      if [ "$gNB" = "1" ] ; then
-         exec=nr-softmodem
+         exec=nr-softmodem-nos1
       elif [ "$nrUE" = "1" ] ; then
         exec=nr-uesoftmodem-nos1
       elif [ "$eNB" = "1" ] ; then

--- a/cmake_targets/noS1_ran_build/CMakeLists.template
+++ b/cmake_targets/noS1_ran_build/CMakeLists.template
+set (  DEBUG_OMG False )
+set (  DISABLE_XER_PRINT False )
+set (  DRIVER2013 True )
+set (  ENABLE_ITTI True )
+set (  ENABLE_NAS_UE_LOGGING False )
+set (  ENABLE_NEW_MULTICAST True )
+set (  ENABLE_RAL False )
+set (  ENABLE_SECURITY False )
+set (  ENABLE_STANDALONE_EPC False)
+set (  ENABLE_USE_CPU_EXECUTION_TIME True )
+set (  ENABLE_USE_MME False )
+set (  ENABLE_USE_RAW_SOCKET_FOR_SGI False)
+set (  ENABLE_VCD_FIFO False )
+set (  ENB_MODE True )
+set (  EXMIMO_IOT True )
+set (  JUMBO_FRAME True )
+set (  LARGE_SCALE False )
+set (  LINK_ENB_PDCP_TO_GTPV1U False)
+set (  LINUX_LIST False )
+set (  LINUX True )
+set (  LOCALIZATION False )
+set (  LOG_NO_THREAD 1 )
+set (  DEADLINE_SCHEDULER False )
+set (  MAC_CONTEXT 1 )
+set (  MAX_NUM_CCs 1 )
+set (  MESSAGE_CHART_GENERATOR         False )
+set (  MESSAGE_CHART_GENERATOR_RLC_MAC False )
+set (  MESSAGE_CHART_GENERATOR_PHY     False )
+set (  MSG_PRINT False )
+set (  MU_RECEIVER False )
+set (  NAS_ADDRESS_FIX False )
+set (  NAS_BUILT_IN_UE False)
+set (  NAS_MME False )
+set (  NAS_UE False )
+set (  NB_ANTENNAS_RX "2" )
+set (  NB_ANTENNAS_TX "2" )
+set (  NO_RRM True )
+set (  OAISIM False )
+set (  OAI_NW_DRIVER_TYPE_ETHERNET False )
+set (  OAI_NW_DRIVER_USE_NETLINK True )
+set (  OPENAIR2 True )
+set (  OPENAIR_LTE True )
+set (  PACKAGE_NAME "nr-softmodem-nos1" )
+set (  PDCP_USE_NETLINK True )
+set (  PDCP_MSG_PRINT False )
+set (  PHY_CONTEXT False )
+set (  PHY_EMUL False )
+set (  PHYSIM True )
+set (  RF_BOARD "False" )
+set (  RRC_ASN1_VERSION "Rel15" )
+set (  RLC_STOP_ON_LOST_PDU False )
+set (  RRC_MSG_PRINT False )
+set (  SECU False )
+set (  SMBV False )
+set (  TEST_OMG False )
+set (  USE_3GPP_ADDR_AS_LINK_ADDR False )
+set (  USE_MME "R10" )
+set (  XER_PRINT False )
+set (  DEBUG_PHY False )
+set (  DEBUG_PHY_PROC False)
+set (  DEBUG_DLSCH False)
--- a/nfapi/open-nFAPI/nfapi/public_inc/BAK/nr_ue_fapi_interface.h.bak
+++ b/nfapi/open-nFAPI/nfapi/public_inc/BAK/nr_ue_fapi_interface.h.bak
--- a/nfapi/open-nFAPI/nfapi/public_inc/fapi_nr_ue_interface.h
+++ b/nfapi/open-nFAPI/nfapi/public_inc/fapi_nr_ue_interface.h
@@ -67,8 +67,7 @@ typedef struct {
 #define FAPI_NR_TAG_LENGTH_PACKED_LEN 4

 typedef struct {
-	fapi_nr_tl_t tl;
-    //  common C-RNTI
+    //  dci pdu
 	uint8_t dci_format; 
    uint8_t frequency_domain_resouce_assignment;    //  38.214 chapter 5.1.2.2
    uint8_t time_domain_resource_assignment;        //  38.214 chapter 5.1.2.1
@@ -145,7 +144,32 @@ typedef struct {
    uint32_t sr;
 } fapi_nr_uci_pdu_rel15_t;

+    typedef enum {
+        CCE_REG_MAPPING_TYPE_INTERLEAVED,
+        CCE_REG_MAPPING_TYPE_NON_INTERLEAVED,
+    } coreset_cce_reg_mapping_type_t;

+    typedef enum{
+        PRECODER_GRANULARITY_SAME_AS_REG_BUNDLE, 
+        PRECODER_GRANULARITY_ALL_CONTIGUOUS_RBS
+    } coreset_precoder_granularity_t;
+
+    typedef struct {
+        /// frequency_domain_resource;
+        uint32_t rb_start;
+        uint32_t rb_end;
+
+        uint8_t duration;
+        coreset_cce_reg_mapping_type_t cce_reg_mapping_type;                   //  interleaved or noninterleaved
+        uint8_t cce_reg_interleaved_reg_bundle_size;    //  valid if CCE to REG mapping type is interleaved type
+        uint8_t cce_reg_interleaved_interleaver_size;   //  valid if CCE to REG mapping type is interleaved type
+        uint8_t cce_reg_interleaved_shift_index;        //  valid if CCE to REG mapping type is interleaved type
+        coreset_precoder_granularity_t precoder_granularity;
+        uint8_t tci_state_pdcch;
+
+        uint8_t tci_present_in_dci;
+        uint16_t pdcch_dmrs_scrambling_id;
+    } fapi_nr_coreset_t;

 //
 // Top level FAPI messages
@@ -229,22 +253,7 @@ typedef struct {
 		uint8_t pdu_type;
 		uint8_t pdu_size;
 		union {
-			/*fapi_nr_ul_config_ulsch_pdu				ulsch_pdu;
-			fapi_nr_ul_config_ulsch_cqi_ri_pdu		ulsch_cqi_ri_pdu;
-			fapi_nr_ul_config_ulsch_harq_pdu			ulsch_harq_pdu;
-			fapi_nr_ul_config_ulsch_cqi_harq_ri_pdu	ulsch_cqi_harq_ri_pdu;
-			fapi_nr_ul_config_uci_cqi_pdu				uci_cqi_pdu;
-			fapi_nr_ul_config_uci_sr_pdu				uci_sr_pdu;
-			fapi_nr_ul_config_uci_harq_pdu			uci_harq_pdu;
-			fapi_nr_ul_config_uci_sr_harq_pdu			uci_sr_harq_pdu;
-			fapi_nr_ul_config_uci_cqi_harq_pdu		uci_cqi_harq_pdu;
-			fapi_nr_ul_config_uci_cqi_sr_pdu			uci_cqi_sr_pdu;
-			fapi_nr_ul_config_uci_cqi_sr_harq_pdu		uci_cqi_sr_harq_pdu;
-			fapi_nr_ul_config_srs_pdu					srs_pdu;
-			fapi_nr_ul_config_harq_buffer_pdu			harq_buffer_pdu;
-			fapi_nr_ul_config_ulsch_uci_csi_pdu		ulsch_uci_csi_pdu;
-			fapi_nr_ul_config_ulsch_uci_harq_pdu		ulsch_uci_harq_pdu;
-			fapi_nr_ul_config_ulsch_csi_uci_harq_pdu	ulsch_csi_uci_harq_pdu;*/
+
 		};
 	} fapi_nr_ul_config_request_pdu_t;

@@ -260,21 +269,48 @@ typedef struct {
 } fapi_nr_ul_config_request_t;


+    typedef struct {
+        uint16_t rnti;
+
+        fapi_nr_coreset_t coreset;
+        uint32_t duration;
+        uint8_t aggregation_level;
+        uint8_t number_of_candidates;
+        uint16_t monitoring_symbols_within_slot;
+        //  DCI foramt-specific
+        uint8_t format_2_0_number_of_candidates[5];    //  aggregation level 1, 2, 4, 8, 16
+        uint8_t format_2_3_monitorying_periodicity;
+        uint8_t format_2_3_number_of_candidates;
+    } fapi_nr_dl_config_dci_dl_pdu_rel15_t;
+
+    typedef struct {
+        fapi_nr_dl_config_dci_dl_pdu_rel15_t dci_config_rel15;
+    } fapi_nr_dl_config_dci_pdu;
+
+    typedef struct {
+        uint16_t rnti;
+        fapi_nr_dci_pdu_rel15_t dci_config;
+    } fapi_nr_dl_config_dlsch_pdu_rel15_t;
+
+    typedef struct {
+        fapi_nr_dl_config_dlsch_pdu_rel15_t dlsch_config_rel15;
+    } fapi_nr_dl_config_dlsch_pdu;

 	typedef struct {
 		uint8_t pdu_type;
 		uint8_t pdu_size;
 		union {
-			/*fapi_nr_dl_config_dlsch_pdu	dlsch_pdu;
-			fapi_nr_dl_config_prs_pdu		prs_pdu;
-			fapi_nr_dl_config_csi_rs_pdu	csi_rs_pdu;*/
+            fapi_nr_dl_config_dci_pdu dci_pdu;
+            fapi_nr_dl_config_dlsch_pdu dlsch_pdu;
 		};
 	} fapi_nr_dl_config_request_pdu_t;

 typedef struct {
 	fapi_nr_p7_message_header_t header;
 	uint16_t sfn_sf_slot;
-	fapi_nr_dl_config_request_pdu_t dl_config_request_body;
+    uint8_t number_dci;
+    uint8_t number_pdsch;
+	fapi_nr_dl_config_request_pdu_t *dl_config_request_body;
 } fapi_nr_dl_config_request_t;


@@ -282,19 +318,7 @@ typedef struct {
 // P5
 //

-    typedef struct {
-        uint32_t frequency_domain_resource;
-        uint8_t duration;
-        uint8_t cce_reg_mapping_type;                   //  interleaved or noninterleaved
-        uint8_t cce_reg_interleaved_reg_bundle_size;    //  valid if CCE to REG mapping type is interleaved type
-        uint8_t cce_reg_interleaved_interleaver_size;   //  valid if CCE to REG mapping type is interleaved type
-        uint8_t cce_reg_interleaved_shift_index;        //  valid if CCE to REG mapping type is interleaved type
-        uint8_t precoder_granularity;
-        uint8_t tci_state_pdcch;
-
-        uint8_t tci_present_in_dci;
-        uint16_t pdcch_dmrs_scrambling_id;
-    } fapi_nr_coreset_t;
+    

    typedef struct {
        fapi_nr_coreset_t coreset;
@@ -315,7 +339,7 @@ typedef struct {
        fapi_nr_search_space_t search_space_sib1;
        fapi_nr_search_space_t search_space_others_sib;
        fapi_nr_search_space_t search_space_paging;
-        fapi_nr_coreset_t      coreset_ra;         //  common coreset
+        //fapi_nr_coreset_t      coreset_ra;         //  common coreset
        fapi_nr_search_space_t search_space_ra;    
    } fapi_nr_pdcch_config_common_t;

@@ -385,7 +409,7 @@ typedef struct {
        uint8_t dmrs_type_a_position;
        uint8_t pdcch_config_sib1;
        uint8_t cell_barred;
-        uint8_t intra_frquency_reselection;
+        uint8_t intra_frequency_reselection;

        uint16_t system_frame_number;
        uint8_t ssb_index;

--- a/nfapi/open-nFAPI/nfapi/public_inc/nfapi_nr_interface.h
+++ b/nfapi/open-nFAPI/nfapi/public_inc/nfapi_nr_interface.h
@@ -189,6 +189,7 @@ typedef struct {
  nfapi_uint16_tlv_t  p0_nominal;                                                     ///// L1 parameter 'p0-nominal-pucch'
 } nfapi_nr_pucch_config_t;

+
 typedef struct {
 //NR TDD-UL-DL-ConfigCommon                ///// L1 parameter 'UL-DL-configuration-common'
  nfapi_uint16_tlv_t  referenceSubcarrierSpacing;                                     ///// L1 parameter 'reference-SCS'
@@ -224,7 +225,7 @@ typedef struct {

 typedef struct {
  nfapi_p4_p5_message_header_t              header;
-  uint8_t 									num_tlv;
+  uint8_t num_tlv;
  nfapi_nr_subframe_config_t                subframe_config;
  nfapi_nr_rf_config_t                      rf_config;
  nfapi_nr_sch_config_t                     sch_config;

--- a/openair1/PHY/INIT/nr_init_ue.c
+++ b/openair1/PHY/INIT/nr_init_ue.c
@@ -871,7 +871,7 @@ int init_nr_ue_signal(PHY_VARS_NR_UE *ue,

  if (abstraction_flag == 0) {
    for (th_id=0; th_id<RX_NB_TH_MAX; th_id++) {
-        phy_init_lte_ue__PDSCH( (*pdsch_vars_th)[th_id][eNB_id], fp );
+        //phy_init_lte_ue__PDSCH( (*pdsch_vars_th)[th_id][eNB_id], fp );
        (*pdsch_vars_th)[th_id][eNB_id]->llr[1] = (int16_t*)malloc16_clear( (8*((3*8*8448)+12))*sizeof(int16_t) );
    }


--- a/openair1/PHY/MODULATION/modulation_UE.h
+++ b/openair1/PHY/MODULATION/modulation_UE.h
@@ -48,12 +48,13 @@ int slot_fep(PHY_VARS_UE *phy_vars_ue,
             int no_prefix,
 	     int reset_freq_est);

-int slot_fep_pbch(PHY_VARS_NR_UE *phy_vars_ue,
+int nr_slot_fep(PHY_VARS_NR_UE *phy_vars_ue,
             unsigned char l,
             unsigned char Ns,
             int sample_offset,
             int no_prefix,
-	     int reset_freq_est);
+	     int reset_freq_est,
+			 NR_CHANNEL_EST_t channel);

 int slot_fep_mbsfn(PHY_VARS_UE *phy_vars_ue,
                   unsigned char l,

--- a/openair1/PHY/MODULATION/slot_fep.c
+++ b/openair1/PHY/MODULATION/slot_fep.c
@@ -23,17 +23,19 @@
 #include "PHY/defs_nr_UE.h"
 #include "modulation_UE.h"
 #include "PHY/LTE_ESTIMATION/lte_estimation.h"
+#include "PHY/NR_UE_ESTIMATION/nr_estimation.h"

 //#define DEBUG_FEP

 #define SOFFSET 0

-int slot_fep_pbch(PHY_VARS_NR_UE *ue,
+int nr_slot_fep(PHY_VARS_NR_UE *ue,
             unsigned char l,
             unsigned char Ns,
             int sample_offset,
             int no_prefix,
-			 int reset_freq_est)
+			 int reset_freq_est,
+			 NR_CHANNEL_EST_t channel)
 {
  NR_DL_FRAME_PARMS *frame_parms = &ue->frame_parms;
  NR_UE_COMMON *common_vars   = &ue->common_vars;
@@ -44,9 +46,14 @@ int slot_fep_pbch(PHY_VARS_NR_UE *ue,
  unsigned int nb_prefix_samples0 = (no_prefix ? 0 : frame_parms->nb_prefix_samples0);
  unsigned int subframe_offset;//,subframe_offset_F;
  unsigned int slot_offset;
-  int i;
+  //int i;
  unsigned int frame_length_samples = frame_parms->samples_per_subframe * 10;
  unsigned int rx_offset;
+  //NR_UE_PDCCH *pdcch_vars  = ue->pdcch_vars[ue->current_thread_id[Ns>>1]][0];
+  uint16_t coreset_start_subcarrier = frame_parms->first_carrier_offset;
+  uint16_t nb_rb_coreset = 24;
+  uint16_t bwp_start_subcarrier = frame_parms->first_carrier_offset;
+  uint16_t nb_rb_pdsch = 100;

  /*LTE_UE_DLSCH_t **dlsch_ue = phy_vars_ue->dlsch_ue[eNB_id];
  unsigned char harq_pid = dlsch_ue[0]->current_harq_pid;
@@ -94,10 +101,10 @@ int slot_fep_pbch(PHY_VARS_NR_UE *ue,
    slot_offset = (frame_parms->samples_per_tti>>1) * (Ns%2);
  }

-  if (l<0 || l>=7-frame_parms->Ncp) {
+  /*if (l<0 || l>=7-frame_parms->Ncp) {
    printf("slot_fep: l must be between 0 and %d\n",7-frame_parms->Ncp);
    return(-1);
-  }
+    }*/

  if (Ns<0 || Ns>=20) {
    printf("slot_fep: Ns must be between 0 and 19\n");
@@ -181,12 +188,15 @@ int slot_fep_pbch(PHY_VARS_NR_UE *ue,
  }

  if (ue->perfect_ce == 0) {
-    if ((l>0) && (l<4)) {
+
+  switch(channel){
+  case NR_PBCH_EST:
+    //if ((l>4) && (l<8)) {
      for (aa=0; aa<frame_parms->nb_antenna_ports_eNB; aa++) {

-#ifdef DEBUG_FEP
+//#ifdef DEBUG_FEP
        printf("Channel estimation eNB %d, aatx %d, slot %d, symbol %d\n",eNB_id,aa,Ns,l);
-#endif
+//#endif
 #if UE_TIMING_TRACE
        start_meas(&ue->dlsch_channel_estimation_stats);
 #endif
@@ -195,8 +205,10 @@ int slot_fep_pbch(PHY_VARS_NR_UE *ue,
                                  aa,
                                  l,
                                  symbol);
-      }
-
+      //}
+#if UE_TIMING_TRACE
+        stop_meas(&ue->dlsch_channel_estimation_stats);
+#endif

      // do frequency offset estimation here!
      // use channel estimates from current symbol (=ch_t) and last symbol (ch_{t-1})
@@ -221,6 +233,60 @@ int slot_fep_pbch(PHY_VARS_NR_UE *ue,

      }
    }
+  break;
+
+  case NR_PDCCH_EST:
+      for (aa=0; aa<frame_parms->nb_antenna_ports_eNB; aa++) {
+
+#ifdef DEBUG_FEP
+          printf("Channel estimation eNB %d, aatx %d, slot %d, symbol %d\n",eNB_id,aa,Ns,l);
+#endif
+#if UE_TIMING_TRACE
+          start_meas(&ue->dlsch_channel_estimation_stats);
+#endif
+          nr_pdcch_channel_estimation(ue,eNB_id,0,
+                                    Ns,
+                                    aa,
+                                    l,
+                                    symbol,
+									coreset_start_subcarrier,
+									nb_rb_coreset);
+#if UE_TIMING_TRACE
+        stop_meas(&ue->dlsch_channel_estimation_stats);
+#endif
+      }
+    break;
+
+  case NR_PDSCH_EST:
+      for (aa=0; aa<frame_parms->nb_antenna_ports_eNB; aa++) {
+
+#ifdef DEBUG_FEP
+          printf("Channel estimation eNB %d, aatx %d, slot %d, symbol %d\n",eNB_id,aa,Ns,l);
+#endif
+#if UE_TIMING_TRACE
+          start_meas(&ue->dlsch_channel_estimation_stats);
+#endif
+          nr_pdsch_channel_estimation(ue,eNB_id,0,
+                                    Ns,
+                                    aa,
+                                    l,
+                                    symbol,
+									bwp_start_subcarrier,
+									nb_rb_pdsch);
+#if UE_TIMING_TRACE
+        stop_meas(&ue->dlsch_channel_estimation_stats);
+#endif
+      }
+    break;
+
+  case NR_SSS_EST:
+  break;
+
+  default:
+    LOG_E(PHY,"[UE][FATAL] Unknown channel format %d\n",channel);
+    return(-1);
+    break;
+  }

  }


--- a/openair1/PHY/NR_REFSIG/nr_dmrs_rx.c
+++ b/openair1/PHY/NR_REFSIG/nr_dmrs_rx.c
@@ -41,6 +41,7 @@

 #include "refsig_defs_ue.h"
 #include "PHY/defs_nr_UE.h"
+#include "nr_mod_table.h"
 #include "log.h"

 /*Table 7.4.1.1.2-1/2 from 38.211 */
@@ -49,20 +50,72 @@ int wt1[8][2] = {{1,1},{1,1},{1,1},{1,1},{1,-1},{1,-1},{1,-1},{1,-1}};
 int wf2[12][2] = {{1,1},{1,-1},{1,1},{1,-1},{1,1},{1,-1},{1,1},{1,1},{1,1},{1,-1},{1,1},{1,1}};
 int wt2[12][2] = {{1,1},{1,1},{1,1},{1,1},{1,1},{1,1},{1,-1},{1,-1},{1,-1},{1,-1},{1,-1},{1,-1}};

-//short nr_mod_table[14] = {0,0,-23170,-23170,23170,23170,-23170,-23170,-23170,23170,23170,-23170,23170,23170};
-  short nr_mod_table[14] = {0,0,23170,-23170,-23170,23170,23170,-23170,23170,23170,-23170,-23170,-23170,23170};
-//short nr_mod_table[14] = {0,0,23170,23170,-23170,-23170,23170,23170,23170,-23170,-23170,23170,-23170,-23170};
-//extern short nr_mod_table[NR_MOD_TABLE_SIZE_SHORT];

+short nr_rx_mod_table[NR_MOD_TABLE_SIZE_SHORT] = {0,0,23170,-23170,-23170,23170,23170,-23170,23170,23170,-23170,-23170,-23170,23170};
+
+int nr_pdcch_dmrs_rx(PHY_VARS_NR_UE *ue,
+						uint8_t eNB_offset,
+						unsigned int Ns,
+						unsigned int nr_gold_pdcch[7][20][3][10],
+						int32_t *output,
+						unsigned short p,
+						int length_dmrs,
+						unsigned short nb_rb_coreset)
+{
+  int32_t qpsk[4],n;
+  int w,ind,l,ind_dword,ind_qpsk_symb,kp,k;
+  short pamp;
+
+  // Compute the correct pilot amplitude, sqrt_rho_b = Q3.13
+  pamp = ONE_OVER_SQRT2_Q15;
+
+  // This includes complex conjugate for channel estimation
+  ((short *)&qpsk[0])[0] = pamp;
+  ((short *)&qpsk[0])[1] = -pamp;
+  ((short *)&qpsk[1])[0] = -pamp;
+  ((short *)&qpsk[1])[1] = -pamp;
+  ((short *)&qpsk[2])[0] = pamp;
+  ((short *)&qpsk[2])[1] = pamp;
+  ((short *)&qpsk[3])[0] = -pamp;
+  ((short *)&qpsk[3])[1] = pamp;
+
+  if (p==2000) {
+	  // r_n from 38.211 7.4.1.3
+        for (n=0; n<nb_rb_coreset*3; n++) {
+        	for (l =0; l<length_dmrs; l++){
+        		for (kp=0; kp<3; kp++){
+
+        			ind = 3*n+kp;
+        			ind_dword = ind>>4;
+        			ind_qpsk_symb = ind&0xf;
+
+        			output[k] = qpsk[(nr_gold_pdcch[eNB_offset][Ns][l][ind_dword]>>(2*ind_qpsk_symb))&3];
+
+#ifdef DEBUG_DL_DMRS
+          LOG_I(PHY,"Ns %d, p %d, ind_dword %d, ind_qpsk_symbol %d\n",
+                Ns,p,idx_dword,idx_qpsk_symb);
+          LOG_I(PHY,"index = %d\n",(nr_gold_pdsch[0][Ns][lprime][ind_dword]>>(2*ind_qpsk_symb))&3);
+#endif
+
+          	  	  	k++;
+        		}
+        	}
+        }
+  } else {
+    LOG_E(PHY,"Illegal PDCCH DMRS port %d\n",p);
+  }
+
+  return(0);
+}

 int nr_pdsch_dmrs_rx(PHY_VARS_NR_UE *ue,
-						unsigned int ncp,
+						uint8_t eNB_offset,
 						unsigned int Ns,
 						unsigned int nr_gold_pdsch[2][20][2][21],
 						int32_t *output,
 						unsigned short p,
 						int length_dmrs,
-						unsigned short nb_pdsch_rb)
+						unsigned short nb_rb_pdsch)
 {
  int32_t qpsk[4],nqpsk[4],*qpsk_p, n;
  int w,mprime,ind,l,ind_dword,ind_qpsk_symb,kp,lp, config_type, k;
@@ -76,7 +129,7 @@ int nr_pdsch_dmrs_rx(PHY_VARS_NR_UE *ue,
  printf("dmrs config type %d port %d\n", config_type, p);

  // Compute the correct pilot amplitude, sqrt_rho_b = Q3.13
-  pamp = 23170; //ONE_OVER_SQRT2_Q15;
+  pamp = ONE_OVER_SQRT2_Q15;

  // This includes complex conjugate for channel estimation
  ((short *)&qpsk[0])[0] = pamp;
@@ -104,10 +157,9 @@ int nr_pdsch_dmrs_rx(PHY_VARS_NR_UE *ue,
      LOG_E(PHY,"Bad PDSCH DMRS config type %d\n", config_type);

  if ((p>=1000) && (p<((config_type==0) ? 1008 : 1012))) {
-      if (/*ue->frame_parms.Ncp == NORMAL*/ncp ==0) {

        // r_n from 38.211 7.4.1.1
-        for (n=0; n<nb_pdsch_rb*((config_type==0) ? 3:2); n++) {
+        for (n=0; n<nb_rb_pdsch*((config_type==0) ? 3:2); n++) {
        	for (lp =0; lp<length_dmrs; lp++){
        		for (kp=0; kp<2; kp++){
        			w = (wf[p-1000][kp])*(wt[p-1000][lp]);
@@ -117,7 +169,7 @@ int nr_pdsch_dmrs_rx(PHY_VARS_NR_UE *ue,
        			ind_dword = ind>>4;
        			ind_qpsk_symb = ind&0xf;

-        			output[k] = qpsk_p[(ue->nr_gold_pdsch[0][Ns][lp][ind_dword]>>(2*ind_qpsk_symb))&3];
+        			output[k] = qpsk_p[(nr_gold_pdsch[0][Ns][lp][ind_dword]>>(2*ind_qpsk_symb))&3];


 #ifdef DEBUG_DL_DMRS
@@ -130,9 +182,6 @@ int nr_pdsch_dmrs_rx(PHY_VARS_NR_UE *ue,
        		}
        	}
        }
-      } else {
-        LOG_E(PHY,"extended cp not supported for PDSCH DMRS yet\n");
-      }
  } else {
    LOG_E(PHY,"Illegal p %d PDSCH DMRS port\n",p);
  }
@@ -143,16 +192,20 @@ int nr_pdsch_dmrs_rx(PHY_VARS_NR_UE *ue,
 int nr_pbch_dmrs_rx(unsigned int *nr_gold_pbch,
 					int32_t *output	)
 {
-	int m;
+    int m;
+    uint8_t idx=0;
+
+    /// QPSK modulation
+    for (m=0; m<NR_PBCH_DMRS_LENGTH>>1; m++) {
+      idx = ((((nr_gold_pbch[(m<<1)>>5])>>((m<<1)&0x1f))&1)<<1) ^ (((nr_gold_pbch[((m<<1)+1)>>5])>>(((m<<1)+1)&0x1f))&1);
+      ((int16_t*)output)[m<<1] = nr_rx_mod_table[(NR_MOD_TABLE_QPSK_OFFSET + idx)<<1];
+      ((int16_t*)output)[(m<<1)+1] = nr_rx_mod_table[((NR_MOD_TABLE_QPSK_OFFSET + idx)<<1) + 1];

-	/// BPSK modulation
-    for (m=0; m<NR_PBCH_DMRS_LENGTH; m++) {
-      ((int16_t*)output)[m<<1] = nr_mod_table[((1 + ((nr_gold_pbch[m>>5]&(1<<(m&0x1f)))>>(m&0x1f)))<<1)];
-      ((int16_t*)output)[(m<<1)+1] = nr_mod_table[((1 + ((nr_gold_pbch[m>>5]&(1<<(m&0x1f)))>>(m&0x1f)))<<1) + 1];
 #ifdef DEBUG_PBCH
-	//printf("nr_gold_pbch[m>>5] %x\n",nr_gold_pbch[m>>5]);
       if (m<16)
+        {printf("nr_gold_pbch[(m<<1)>>5] %x\n",nr_gold_pbch[(m<<1)>>5]);
 	printf("m %d  output %d %d addr %p\n", m, ((int16_t*)output)[m<<1], ((int16_t*)output)[(m<<1)+1],&output[0]);
+	}
 #endif
    }


--- a/openair1/PHY/NR_REFSIG/nr_gold_ue.c
+++ b/openair1/PHY/NR_REFSIG/nr_gold_ue.c
@@ -64,11 +64,54 @@ void nr_gold_pbch(PHY_VARS_NR_UE* ue)

 }

-void nr_gold_pdsch(PHY_VARS_NR_UE* ue,unsigned short lbar,unsigned int nr_gold_pdsch[2][20][2][21],unsigned int Nid_cell, unsigned short *n_idDMRS, unsigned short length_dmrs)
+void nr_gold_pdcch(PHY_VARS_NR_UE* ue,unsigned int Nid_cell, unsigned short n_idDMRS, unsigned short length_dmrs)
 {

  unsigned char ns,l;
-  unsigned int n,x1,x2,x2tmp0,x2tmp1, x2tmp2,x2s;
+  unsigned int n,x1,x2,x2tmp0;
+  unsigned int nid;
+
+    if (n_idDMRS)
+      nid = n_idDMRS;
+    else
+      nid = Nid_cell;
+
+    for (ns=0; ns<20; ns++) {
+
+      for (l=0; l<length_dmrs; l++) {
+
+    	x2tmp0 = ((14*ns+l+1)*((nid<<1)+1))<<17;
+        x2 = (x2tmp0+(nid<<1))%(1<<31);  //cinit
+
+        x1 = 1+ (1<<31);
+        x2=x2 ^ ((x2 ^ (x2>>1) ^ (x2>>2) ^ (x2>>3))<<31);
+
+        // skip first 50 double words (1600 bits)
+        for (n=1; n<50; n++) {
+          x1 = (x1>>1) ^ (x1>>4);
+          x1 = x1 ^ (x1<<31) ^ (x1<<28);
+          x2 = (x2>>1) ^ (x2>>2) ^ (x2>>3) ^ (x2>>4);
+          x2 = x2 ^ (x2<<31) ^ (x2<<30) ^ (x2<<29) ^ (x2<<28);
+            //printf("x1 : %x, x2 : %x\n",x1,x2);
+        }
+
+        for (n=0; n<10; n++) {
+          x1 = (x1>>1) ^ (x1>>4);
+          x1 = x1 ^ (x1<<31) ^ (x1<<28);
+          x2 = (x2>>1) ^ (x2>>2) ^ (x2>>3) ^ (x2>>4);
+          x2 = x2 ^ (x2<<31) ^ (x2<<30) ^ (x2<<29) ^ (x2<<28);
+          ue->nr_gold_pdcch[0][ns][l][n] = x1^x2;
+            //printf("n=%d : c %x\n",n,x1^x2);
+        }
+      }
+    }
+}
+
+void nr_gold_pdsch(PHY_VARS_NR_UE* ue,unsigned short lbar,unsigned int Nid_cell, unsigned short *n_idDMRS, unsigned short length_dmrs)
+{
+
+  unsigned char ns,l;
+  unsigned int n,x1,x2,x2tmp0;
  int nscid;
  unsigned int nid;

@@ -86,7 +129,7 @@ void nr_gold_pdsch(PHY_VARS_NR_UE* ue,unsigned short lbar,unsigned int nr_gold_p
      for (l=0; l<length_dmrs; l++) {

    	x2tmp0 = ((14*ns+(lbar+l)+1)*((nid<<1)+1))<<17;
-        x2 = (x2tmp0+(nid<<1))%(1<<31);  //cinit
+        x2 = (x2tmp0+(nid<<1)+nscid)%(1<<31);  //cinit

        x1 = 1+ (1<<31);
        x2=x2 ^ ((x2 ^ (x2>>1) ^ (x2>>2) ^ (x2>>3))<<31);
@@ -105,7 +148,7 @@ void nr_gold_pdsch(PHY_VARS_NR_UE* ue,unsigned short lbar,unsigned int nr_gold_p
          x1 = x1 ^ (x1<<31) ^ (x1<<28);
          x2 = (x2>>1) ^ (x2>>2) ^ (x2>>3) ^ (x2>>4);
          x2 = x2 ^ (x2<<31) ^ (x2<<30) ^ (x2<<29) ^ (x2<<28);
-          nr_gold_pdsch[nscid][ns][l][n] = x1^x2;
+          ue->nr_gold_pdsch[nscid][ns][l][n] = x1^x2;
            //printf("n=%d : c %x\n",n,x1^x2);
        }


--- a/openair1/PHY/NR_REFSIG/nr_mod_table.h
+++ b/openair1/PHY/NR_REFSIG/nr_mod_table.h
 #define NR_MOD_TABLE_SIZE_SHORT 14
 #define NR_MOD_TABLE_BPSK_OFFSET 1
 #define NR_MOD_TABLE_QPSK_OFFSET 3
-short nr_mod_table[MOD_TABLE_SIZE_SHORT] = {0,0,23170,23170,-23170,-23170,23170,23170,23170,-23170,-23170,23170,-23170,-23170};
+short nr_mod_table[NR_MOD_TABLE_SIZE_SHORT] = {0,0,23170,23170,-23170,-23170,23170,23170,23170,-23170,-23170,23170,-23170,-23170};
--- a/openair1/PHY/NR_REFSIG/pss_nr.h
+++ b/openair1/PHY/NR_REFSIG/pss_nr.h
@@ -49,7 +49,7 @@

 //#define CIC_DECIMATOR                          /* it allows enabling decimation based on CIC filter. By default, decimation is based on a FIF filter */

-#define TEST_SYNCHRO_TIMING_PSS        (1)     /* enable time profiling */
+#define TEST_SYNCHRO_TIMING_PSS        (1)       /* enable time profiling */

 //#define DBG_PSS_NR


--- a/openair1/PHY/NR_REFSIG/refsig_defs_ue.h
+++ b/openair1/PHY/NR_REFSIG/refsig_defs_ue.h
@@ -31,20 +31,36 @@
 */
 int nr_pbch_dmrs_rx(unsigned int *nr_gold_pbch,	int32_t *output	);

-/*int nr_pdsch_dmrs_rx(PHY_VARS_NR_UE *ue,
-						unsigned int ncp,
+/*!\brief This function generates the NR Gold sequence (38-211, Sec 5.2.1) for the PDCCH DMRS.
+@param PHY_VARS_NR_UE* ue structure provides configuration, frame parameters and the pointers to the 32 bits sequence storage tables
+ */
+int nr_pdcch_dmrs_rx(PHY_VARS_NR_UE *ue,
+						uint8_t eNB_offset,
+						unsigned int Ns,
+						unsigned int nr_gold_pdcch[7][20][3][10],
+						int32_t *output,
+						unsigned short p,
+						int length_dmrs,
+						unsigned short nb_rb_corset);
+
+int nr_pdsch_dmrs_rx(PHY_VARS_NR_UE *ue,
+						uint8_t eNB_offset,
 						unsigned int Ns,
 						unsigned int nr_gold_pdsch[2][20][2][21],
 						int32_t *output,
 						unsigned short p,
 						int length_dmrs,
-						unsigned short nb_pdsch_rb);*/
+						unsigned short nb_rb_pdsch);

 void nr_gold_pbch(PHY_VARS_NR_UE* ue);

+void nr_gold_pdcch(PHY_VARS_NR_UE* ue,
+					unsigned int Nid_cell,
+					unsigned short n_idDMRS,
+					unsigned short length_dmrs);
+
 void nr_gold_pdsch(PHY_VARS_NR_UE* ue,
 					unsigned short lbar,
-					unsigned int nr_gold_pdsch[2][20][2][21],
 					unsigned int Nid_cell,
 					unsigned short *n_idDMRS,
 					unsigned short length_dmrs);

--- a/openair1/PHY/NR_REFSIG/ss_pbch_nr.h
+++ b/openair1/PHY/NR_REFSIG/ss_pbch_nr.h
@@ -51,10 +51,10 @@
 #define  PSS_SC_START_NR              (52)     /* see from TS 38.211 table 7.4.3.1-1: Resources within an SS/PBCH block for PSS... */

 /* define ofdm symbol offset in the SS/PBCH block of NR synchronisation */
-#define  PSS_SYMBOL_NB                (0)     /* symbol numbers for each element */
-#define  PBCH_SYMBOL_NB               (1)
-#define  SSS_SYMBOL_NB                (2)
-#define  PBCH_LAST_SYMBOL_NB          (3)
+#define  PSS_SYMBOL_NB                (4)     /* symbol numbers for each element */
+#define  PBCH_SYMBOL_NB               (5)
+#define  SSS_SYMBOL_NB                (6)
+#define  PBCH_LAST_SYMBOL_NB          (7)

 /* SS/PBCH parameters */
 #define  N_RB_SS_PBCH_BLOCK           (20)

--- a/openair1/PHY/NR_REFSIG/sss_nr.h
+++ b/openair1/PHY/NR_REFSIG/sss_nr.h
@@ -32,6 +32,7 @@
 #ifndef SSS_NR_H
 #define SSS_NR_H

+#include "limits.h"
 #include "PHY/defs_nr_UE.h"
 #include "PHY/types.h"

@@ -46,7 +47,6 @@

 /************** DEFINE ********************************************/

-#define  INT_MIN	   (-2147483647 - 1)
 #define  SAMPLES_IQ                   (sizeof(int16_t)*2)
 #define  NUMBER_SSS_SEQUENCE          (336)
 #define  INVALID_SSS_SEQUENCE         (NUMBER_SSS_SEQUENCE)

--- a/openair1/PHY/NR_TRANSPORT/nr_dci.c
+++ b/openair1/PHY/NR_TRANSPORT/nr_dci.c
@@ -274,5 +274,9 @@ uint8_t nr_generate_dci_top(NR_gNB_PDCCH pdcch_vars,

  }

+#ifdef DEBUG_DCI
+  write_output("txdataF_dci.m", "txdataF_dci", txdataF[0], frame_parms.samples_per_frame_wCP>>1, 1, 1);
+#endif
+
  return 0;
 }
--- a/openair1/PHY/NR_TRANSPORT/nr_pbch.c
+++ b/openair1/PHY/NR_TRANSPORT/nr_pbch.c
@@ -177,26 +177,26 @@ void nr_pbch_scrambling(NR_gNB_PBCH *pbch,
  }
 }

-/* This portion of code is temporarily kept until the optimized version is validated
- * uint8_t nr_pbch_payload_interleaving_pattern[32] = {16, 23, 18, 17, 8, 30, 10, 6, 24, 7, 0, 5, 3, 2, 1, 4,
+// This portion of code is temporarily kept until the optimized version is validated
+uint8_t nr_pbch_payload_interleaving_pattern[32] = {16, 23, 18, 17, 8, 30, 10, 6, 24, 7, 0, 5, 3, 2, 1, 4,
                                                9, 11, 12, 13, 14, 15, 19, 20, 21, 22, 25, 26, 27, 28, 29, 31};

 uint8_t nr_pbch_payload_interleaver(uint8_t i) {
-  uint8_t j_sfn=0, j_hrf=10, j_ssb=11, j_other=14;
+  uint8_t j_sfn=6, j_hrf=10, j_ssb=11, j_other=14;

-  if (18<=i && i<=27) //Sfn bits
-    return nr_pbch_payload_interleaving_pattern[j_sfn + i -18];
+  if (24<=i && i<=27) //Sfn bits
+    return nr_pbch_payload_interleaving_pattern[j_sfn + i -24];
  else if (i==28) // Hrf bit
    return nr_pbch_payload_interleaving_pattern[j_hrf];
  else if (29<=i) // Ssb bits
    return nr_pbch_payload_interleaving_pattern[j_ssb + (i-29)];
  else
-    return nr_pbch_payload_interleaving_pattern[j_other + i];
-}*/
+    return nr_pbch_payload_interleaving_pattern[(j_other + i)&0x1f];
+}

 /*This pattern takes into account the adjustments for the field specific counters j_sfn, j_hrf, j_ssb and j_other*/
-uint8_t nr_pbch_payload_interleaving_pattern[32] = {1,4,9,11,12,13,14,15,19,20,21,22,25,26,27,28,
-                                                    29,31,16,23,18,17,8,30,10,6,24,7,0,5,3,2};
+//uint8_t nr_pbch_payload_interleaving_pattern[32] = {1,4,9,11,12,13,14,15,19,20,21,22,25,26,27,28,
+//                                                    29,31,16,23,18,17,8,30,10,6,24,7,0,5,3,2};

 int nr_generate_pbch(NR_gNB_PBCH *pbch,
                     uint8_t *pbch_pdu,
@@ -256,9 +256,9 @@ int nr_generate_pbch(NR_gNB_PBCH *pbch,
    in |= (uint32_t)(pbch->pbch_a[i]<<((3-i)<<3));

  for (int i=0; i<32; i++) {
-    out |= ((in>>i)&1)<<(nr_pbch_payload_interleaving_pattern[i]);
+    out |= ((in>>i)&1)<<(nr_pbch_payload_interleaver(i));//nr_pbch_payload_interleaving_pattern[i]
 #ifdef DEBUG_PBCH_ENCODING
-  printf("i %d in 0x%08x out 0x%08x ilv %d (in>>i)&1) 0x%08x\n", i, in, out, nr_pbch_payload_interleaving_pattern[i], (in>>i)&1);
+  printf("i %d in 0x%08x out 0x%08x ilv %d (in>>i)&1) %d\n", i, in, out, nr_pbch_payload_interleaver(i), (in>>i)&1);
 #endif
  }


--- a/openair1/PHY/NR_UE_ESTIMATION/filt16a_32.h
+++ b/openair1/PHY/NR_UE_ESTIMATION/filt16a_32.h
@@ -84,3 +84,28 @@ short filt16a_2l1[16] = {

 short filt16a_2r1[16] = {
 -4096,0,4096,8192,12288,16384,0,0,0,0,0,0,0,0,0,0};
+
+/*filter8*/
+short filt8_l0[8] = {
+16384,8192,0,0,0,0,0,0};
+
+short filt8_mr0[8] = {
+0,8192,16384,8192,0,-8192,0,0};
+
+short filt8_r0[8] = {
+0,8192,16384,24576,0,0,0,0};
+
+short filt8_m0[8] = {
+0,8192,16384,8192,0,0,0,0};
+
+short filt8_l1[8] = {
+24576,16384,0,0,0,0,0,0};
+
+short filt8_ml1[8] = {
+-8192,0,8192,16384,8192,0,0,0};
+
+short filt8_r1[8] = {
+0,0,8192,16384,0,0,0,0};
+
+short filt8_m1[8] = {
+0,0,8192,16384,8192,0,0,0};
--- a/openair1/PHY/NR_UE_ESTIMATION/nr_dl_channel_estimation.c
+++ b/openair1/PHY/NR_UE_ESTIMATION/nr_dl_channel_estimation.c
--- a/openair1/PHY/NR_UE_ESTIMATION/nr_estimation.h
+++ b/openair1/PHY/NR_UE_ESTIMATION/nr_estimation.h
@@ -19,12 +19,12 @@
 *      contact@openairinterface.org
 */

-#ifndef __LTE_ESTIMATION_DEFS__H__
-#define __LTE_ESTIMATION_DEFS__H__
+#ifndef __NR_ESTIMATION_DEFS__H__
+#define __NR_ESTIMATION_DEFS__H__


 #include "PHY/defs_nr_UE.h"
-#include "PHY/defs_gNB.h"
+//#include "PHY/defs_gNB.h"
 /** @addtogroup _PHY_PARAMETER_ESTIMATION_BLOCKS_
 * @{
 */
@@ -42,13 +42,15 @@
 \param l symbol within slot
 \param symbol symbol within frame
 */
-int nr_dl_channel_estimation(PHY_VARS_NR_UE *ue,
+int nr_pdcch_channel_estimation(PHY_VARS_NR_UE *ue,
                              uint8_t eNB_id,
                              uint8_t eNB_offset,
                              unsigned char Ns,
                              unsigned char p,
                              unsigned char l,
-                              unsigned char symbol);
+                              unsigned char symbol,
+							  unsigned short coreset_start_subcarrier,
+							  unsigned short nb_rb_coreset);

 int nr_pbch_channel_estimation(PHY_VARS_NR_UE *ue,
                              uint8_t eNB_id,
@@ -57,4 +59,14 @@ int nr_pbch_channel_estimation(PHY_VARS_NR_UE *ue,
                              unsigned char p,
                              unsigned char l,
                              unsigned char symbol);
+
+int nr_pdsch_channel_estimation(PHY_VARS_NR_UE *ue,
+                              uint8_t eNB_id,
+                              uint8_t eNB_offset,
+                              unsigned char Ns,
+                              unsigned char p,
+                              unsigned char l,
+                              unsigned char symbol,
+							  unsigned short bwp_start_subcarrier,
+							  unsigned short nb_rb_pdsch);
 #endif
--- a/openair1/PHY/NR_UE_TRANSPORT/dci_nr.c
+++ b/openair1/PHY/NR_UE_TRANSPORT/dci_nr.c
@@ -1141,16 +1141,15 @@ void nr_pdcch_extract_rbs_single(int32_t **rxdataF,

  for (aarx = 0; aarx < frame_parms->nb_antennas_rx; aarx++) {
    if (high_speed_flag == 1){
-      dl_ch0 = &dl_ch_estimates[aarx][5 + (symbol * (frame_parms->ofdm_symbol_size))];
+      dl_ch0 = &dl_ch_estimates[aarx][(symbol * (frame_parms->ofdm_symbol_size))];
      #ifdef NR_PDCCH_DCI_DEBUG
-        printf("\t\t<-NR_PDCCH_DCI_DEBUG (nr_pdcch_extract_rbs_single)-> dl_ch0 = &dl_ch_estimates[aarx = (%d)][5 + (symbol * (frame_parms->ofdm_symbol_size (%d))) = (%d)]\n",
-               aarx,frame_parms->ofdm_symbol_size,5 + (symbol * (frame_parms->ofdm_symbol_size)));
-        printf("\t\t<-NR_PDCCH_DCI_DEBUG (nr_pdcch_extract_rbs_single)-> why pointer is pointing to that position (what does '5' mean)?\n");
+        printf("\t\t<-NR_PDCCH_DCI_DEBUG (nr_pdcch_extract_rbs_single)-> dl_ch0 = &dl_ch_estimates[aarx = (%d)][ (symbol * (frame_parms->ofdm_symbol_size (%d))) = (%d)]\n",
+               aarx,frame_parms->ofdm_symbol_size,(symbol * (frame_parms->ofdm_symbol_size)));
      #endif
    } else {
-      dl_ch0 = &dl_ch_estimates[aarx][5];
+      dl_ch0 = &dl_ch_estimates[aarx][0];
      #ifdef NR_PDCCH_DCI_DEBUG
-        printf("\t\t<-NR_PDCCH_DCI_DEBUG (nr_pdcch_extract_rbs_single)-> dl_ch0 = &dl_ch_estimates[aarx = (%d)][5]\n",aarx);
+        printf("\t\t<-NR_PDCCH_DCI_DEBUG (nr_pdcch_extract_rbs_single)-> dl_ch0 = &dl_ch_estimates[aarx = (%d)][0]\n",aarx);
      #endif
    }

@@ -4109,13 +4108,14 @@ void nr_dci_decoding_procedure0(int s,
  #endif
  for (m = 0; m < nb_candidates; m++) {
    int n_ci = 0;
+    if (nCCE[p] < L2) return;
    int debug1 = nCCE[p] / L2;
    int debug2 = L2*m_p_s_L_max;
    #ifdef NR_PDCCH_DCI_DEBUG
      printf("\t\t<-NR_PDCCH_DCI_DEBUG (nr_dci_decoding_procedure0)-> debug1(%d)=nCCE[p]/L2 | nCCE[%d](%d) | L2(%d)\n",debug1,p,nCCE[p],L2);
      printf("\t\t<-NR_PDCCH_DCI_DEBUG (nr_dci_decoding_procedure0)-> debug2(%d)=L2*m_p_s_L_max | L2(%d) | m_p_s_L_max(%d)\n",debug2,L2,m_p_s_L_max);
    #endif
-    CCEind = (((Yk + ((m*nCCE[p])/(L2*m_p_s_L_max)) + n_ci) % (nCCE[p] / L2)) * L2);
+    CCEind = (((Yk + (uint16_t)(floor((m*nCCE[p])/(L2*m_p_s_L_max))) + n_ci) % (uint16_t)(floor(nCCE[p] / L2))) * L2);
    #ifdef NR_PDCCH_DCI_DEBUG
      printf ("\t\t<-NR_PDCCH_DCI_DEBUG (nr_dci_decoding_procedure0)-> CCEind(%d) = (((Yk(%d) + ((m(%d)*nCCE[p](%d))/(L2(%d)*m_p_s_L_max(%d)))) % (nCCE[p] / L2)) * L2)\n",
               CCEind,Yk,m,nCCE[p],L2,m_p_s_L_max);

--- a/openair1/PHY/NR_UE_TRANSPORT/dci_tools_nr.c
+++ b/openair1/PHY/NR_UE_TRANSPORT/dci_tools_nr.c
--- a/openair1/PHY/NR_UE_TRANSPORT/dmrs_nr.c
+++ b/openair1/PHY/NR_UE_TRANSPORT/dmrs_nr.c
@@ -30,7 +30,6 @@
 *
 ************************************************************************/

-//#include "PHY/LTE_REFSIG/defs.h"
 #include "PHY/NR_REFSIG/ss_pbch_nr.h"
 #include "PHY/NR_REFSIG/dmrs_nr.h"


--- a/openair1/PHY/NR_UE_TRANSPORT/nr_initial_sync.c
+++ b/openair1/PHY/NR_UE_TRANSPORT/nr_initial_sync.c
@@ -58,6 +58,7 @@ int nr_pbch_detection(PHY_VARS_NR_UE *ue, runmode_t mode)
  uint8_t l,pbch_decoded,frame_mod4,pbch_tx_ant,dummy;
  NR_DL_FRAME_PARMS *frame_parms=&ue->frame_parms;
  char phich_resource[6];
+  int ret =-1;

 #ifdef DEBUG_INITIAL_SYNCH
  LOG_I(PHY,"[UE%d] Initial sync: starting PBCH detection (rx_offset %d)\n",ue->Mod_id,
@@ -68,28 +69,31 @@ int nr_pbch_detection(PHY_VARS_NR_UE *ue, runmode_t mode)
  frame_parms->nb_prefix_samples0 = 0;

  //symbol 1
-  slot_fep_pbch(ue,
-    	   1,
+  nr_slot_fep(ue,
+    	   5,
    	   0,
    	   ue->rx_offset,
    	   0,
-    	   1);
+    	   1,
+		   NR_PBCH_EST);

  //symbol 2
-  slot_fep_pbch(ue,
-    	   2,
+  nr_slot_fep(ue,
+    	   6,
    	   0,
    	   ue->rx_offset,
    	   0,
-    	   1);
+    	   1,
+		   NR_PBCH_EST);

  //symbol 3
-  slot_fep_pbch(ue,
-    	   3,
+  nr_slot_fep(ue,
+    	   7,
    	   0,
    	   ue->rx_offset,
    	   0,
-    	   1);
+    	   1,
+		   NR_PBCH_EST);

  frame_parms->nb_prefix_samples0 = nb_prefix_samples0;

@@ -98,7 +102,7 @@ int nr_pbch_detection(PHY_VARS_NR_UE *ue, runmode_t mode)
  printf("pbch_detection nid_cell %d\n",frame_parms->Nid_cell);
  
  //for (frame_mod4=0; frame_mod4<4; frame_mod4++) {
-    pbch_tx_ant = nr_rx_pbch(ue,
+    ret = nr_rx_pbch(ue,
 						  &ue->proc.proc_rxtx[0],
                          ue->pbch_vars[0],
                          frame_parms,
@@ -112,9 +116,9 @@ int nr_pbch_detection(PHY_VARS_NR_UE *ue, runmode_t mode)
  //}


-  if (pbch_decoded) {
+  if (ret==0) {

-    frame_parms->nb_antenna_ports_eNB = pbch_tx_ant;
+    frame_parms->nb_antenna_ports_eNB = 1; //pbch_tx_ant;

    // set initial transmission mode to 1 or 2 depending on number of detected TX antennas
    //frame_parms->mode1_flag = (pbch_tx_ant==1);
@@ -128,13 +132,7 @@ int nr_pbch_detection(PHY_VARS_NR_UE *ue, runmode_t mode)

    for(int i=0; i<RX_NB_TH;i++)
    {
-        ue->proc.proc_rxtx[i].frame_rx =   (((ue->pbch_vars[0]->decoded_output[2]&3)<<6) + (ue->pbch_vars[0]->decoded_output[1]>>2))<<2;
-        ue->proc.proc_rxtx[i].frame_rx =   (((ue->pbch_vars[0]->decoded_output[2]&3)<<6) + (ue->pbch_vars[0]->decoded_output[1]>>2))<<2;

-#ifndef USER_MODE
-        // one frame delay
-        ue->proc.proc_rxtx[i].frame_rx ++;
-#endif
        ue->proc.proc_rxtx[i].frame_tx = ue->proc.proc_rxtx[0].frame_rx;
    }
 #ifdef DEBUG_INITIAL_SYNCH
@@ -157,7 +155,7 @@ char prefix_string[2][9] = {"NORMAL","EXTENDED"};
 int nr_initial_sync(PHY_VARS_NR_UE *ue, runmode_t mode)
 {

-  int32_t sync_pos, sync_pos2, k_ssb, N_ssb_crb;
+  int32_t sync_pos, sync_pos2, k_ssb, N_ssb_crb, sync_pos_slot;
  int32_t metric_fdd_ncp=0;
  uint8_t phase_fdd_ncp;

@@ -200,8 +198,21 @@ int nr_initial_sync(PHY_VARS_NR_UE *ue, runmode_t mode)
  /* process pss search on received buffer */
  sync_pos = pss_synchro_nr(ue, NO_RATE_CHANGE);

+  sync_pos_slot = (frame_parms->samples_per_tti>>1) - 3*(frame_parms->ofdm_symbol_size + frame_parms->nb_prefix_samples);
+
+  if (sync_pos >= frame_parms->nb_prefix_samples)
+      sync_pos2 = sync_pos - frame_parms->nb_prefix_samples;
+    else
+      sync_pos2 = sync_pos + FRAME_LENGTH_COMPLEX_SAMPLES - frame_parms->nb_prefix_samples;
+
  /* offset is used by sss serach as it is returned from pss search */
-  ue->rx_offset = sync_pos;
+  if (sync_pos2 >= sync_pos_slot)
+      ue->rx_offset = sync_pos2 - sync_pos_slot;
+    else
+      ue->rx_offset = FRAME_LENGTH_COMPLEX_SAMPLES + sync_pos2 - sync_pos_slot;
+
+  printf("sync_pos %d sync_pos_slot %d rx_offset\n",sync_pos,sync_pos_slot, ue->rx_offset);
+

  //  write_output("rxdata1.m","rxd1",ue->common_vars.rxdata[0],10*frame_parms->samples_per_tti,1,1);

@@ -223,7 +234,14 @@ int nr_initial_sync(PHY_VARS_NR_UE *ue, runmode_t mode)

    nr_gold_pbch(ue);
    ret = nr_pbch_detection(ue,mode);
-    ret = -1;  //to be deleted
+
+LOG_I(PHY,"[UE  %d] AUTOTEST Cell Sync : frame = %d, rx_offset %d, freq_offset %d \n",
+              ue->Mod_id,
+              ue->proc.proc_rxtx[0].frame_rx,
+              ue->rx_offset,
+              ue->common_vars.freq_offset );
+
+    //ret = -1;  //to be deleted
    //   write_output("rxdata2.m","rxd2",ue->common_vars.rxdata[0],10*frame_parms->samples_per_tti,1,1);

 #ifdef DEBUG_INITIAL_SYNCH
@@ -369,9 +387,9 @@ int nr_initial_sync(PHY_VARS_NR_UE *ue, runmode_t mode)
    rx_power = 0;

    // do a measurement on the best guess of the PSS
-    for (aarx=0; aarx<frame_parms->nb_antennas_rx; aarx++)
-      rx_power += signal_energy(&ue->common_vars.rxdata[aarx][sync_pos2],
-				frame_parms->ofdm_symbol_size+frame_parms->nb_prefix_samples);
+    //for (aarx=0; aarx<frame_parms->nb_antennas_rx; aarx++)
+    //  rx_power += signal_energy(&ue->common_vars.rxdata[aarx][sync_pos2],
+	//			frame_parms->ofdm_symbol_size+frame_parms->nb_prefix_samples);

    /*
    // do a measurement on the full frame
@@ -393,7 +411,7 @@ int nr_initial_sync(PHY_VARS_NR_UE *ue, runmode_t mode)
 #ifndef OAI_BLADERF
 #ifndef OAI_LMSSDR
 #ifndef OAI_ADRV9371_ZC706
-  phy_adjust_gain(ue,ue->measurements.rx_power_avg_dB[0],0);
+  //phy_adjust_gain(ue,ue->measurements.rx_power_avg_dB[0],0);
 #endif
 #endif
 #endif
@@ -406,7 +424,7 @@ int nr_initial_sync(PHY_VARS_NR_UE *ue, runmode_t mode)
 #ifndef OAI_BLADERF
 #ifndef OAI_LMSSDR
 #ifndef OAI_ADRV9371_ZC706
-  phy_adjust_gain(ue,dB_fixed(ue->measurements.rssi),0);
+  //phy_adjust_gain(ue,dB_fixed(ue->measurements.rssi),0);
 #endif
 #endif
 #endif

--- a/openair1/PHY/NR_UE_TRANSPORT/nr_pbch.c
+++ b/openair1/PHY/NR_UE_TRANSPORT/nr_pbch.c
--- a/openair1/PHY/NR_UE_TRANSPORT/nr_transport_ue.h
+++ b/openair1/PHY/NR_UE_TRANSPORT/nr_transport_ue.h
@@ -31,7 +31,9 @@
 */
 #ifndef __NR_TRANSPORT_UE__H__
 #define __NR_TRANSPORT_UE__H__
-#include "PHY/defs_nr_UE.h"
+#include <limits.h>
+#include "PHY/impl_defs_top.h"
+//#include "PHY/defs_nr_UE.h"
 //#include "../LTE_TRANSPORT/dci.h"
 //#include "../LTE_TRANSPORT/mdci.h"
 //#include "../LTE_TRANSPORT/uci_common.h"
@@ -48,7 +50,31 @@
 * @{
 */

-#define SHRT_MAX   32767
+//#if defined(UPGRADE_RAT_NR)
+#if 1
+typedef struct {
+  /// HARQ process id
+  uint8_t harq_id;
+  /// ACK bits (after decoding) 0:NACK / 1:ACK / 2:DTX
+  uint8_t ack;
+  /// send status (for PUCCH)
+  uint8_t send_harq_status;
+  /// nCCE (for PUCCH)
+  uint8_t nCCE;
+  /// DAI value detected from DCI1/1a/1b/1d/2/2a/2b/2c. 0xff indicates not touched
+  uint8_t vDAI_DL;
+  /// DAI value detected from DCI0/4. 0xff indicates not touched
+  uint8_t vDAI_UL;
+  /// allow to define pucch parameters TS 38.213 9.2.3 UE procedure for reporting HARQ-ACK
+  uint8_t  pucch_resource_indicator;
+  /// slot on which feedback ack should be send to network
+  uint16_t slot_for_feedback_ack;
+  /// index of a first CCE for the PDCCH reception
+  uint8_t  n_CCE;
+  /// number of CCEs in a control resource set of a PDCCH reception conveying DCI format 1_0
+  uint8_t  N_CCE;
+} NR_UE_HARQ_STATUS_t;
+#endif

 typedef struct {
  /// Indicator of first transmission
@@ -128,9 +154,15 @@ typedef struct {
  /// Current Number of Symbols
  uint8_t Nsymb_pusch;
  /// SRS active flag
-  uint8_t srs_active;
-  /// Pointers to 8 HARQ processes for the ULSCH
-  NR_UL_UE_HARQ_t *harq_processes[8];
+  uint8_t srs_active; 
+//#if defined(UPGRADE_RAT_NR)
+#if 1
+  // Pointers to HARQ processes for the ULSCH
+  NR_UL_UE_HARQ_t *harq_processes[NR_MAX_ULSCH_HARQ_PROCESSES];
+  int harq_process_id[NR_MAX_SLOTS_PAR_FRAME];
+  // UL number of harq processes
+  uint8_t number_harq_processes_for_pusch;
+#endif 
  /// Pointer to CQI data (+1 for 8 bits crc)
  uint8_t o[1+MAX_CQI_BYTES];
  /// Length of CQI data (bits)
@@ -197,9 +229,6 @@ typedef struct {
  uint8_t Mlimit;
 } NR_UE_ULSCH_t;

-
-
-
 typedef struct {
  /// Indicator of first transmission
  uint8_t first_tx;
@@ -269,24 +298,10 @@ typedef struct {
  uint32_t errors[8];
  /// codeword this transport block is mapped to
  uint8_t codeword;
+  /// HARQ-ACKs
+  NR_UE_HARQ_STATUS_t harq_ack;
 } NR_DL_UE_HARQ_t;

-
-typedef struct {
-  /// HARQ process id
-  uint8_t harq_id;
-  /// ACK bits (after decoding) 0:NACK / 1:ACK / 2:DTX
-  uint8_t ack;
-  /// send status (for PUCCH)
-  uint8_t send_harq_status;
-  /// nCCE (for PUCCH)
-  uint8_t nCCE;
-  /// DAI value detected from DCI1/1a/1b/1d/2/2a/2b/2c. 0xff indicates not touched
-  uint8_t vDAI_DL;
-  /// DAI value detected from DCI0/4. 0xff indicates not touched
-  uint8_t vDAI_UL;
-} nr_harq_status_t;
-
 typedef struct {
  /// RNTI
  uint16_t rnti;
@@ -310,10 +325,17 @@ typedef struct {
  uint32_t cqi_alloc2;
  /// saved subband PMI allocation from last PUSCH/PUCCH report
  uint16_t pmi_alloc;
-  /// HARQ-ACKs
-  nr_harq_status_t harq_ack[10];
-  /// Pointers to up to 8 HARQ processes
-  NR_DL_UE_HARQ_t *harq_processes[8];
+//#if defined(UPGRADE_RAT_NR)
+#if 1
+  /// Pointers to up to HARQ processes
+  NR_DL_UE_HARQ_t *harq_processes[NR_MAX_DLSCH_HARQ_PROCESSES];
+  // DL number of harq processes
+  uint8_t number_harq_processes_for_pdsch;
+  /* higher layer parameter for reception of two transport blocks TS 38.213 9.1.3.1 Type-2 HARQ-ACK codebook dtermination */
+  uint8_t Number_MCS_HARQ_DL_DCI;
+  /* spatial bundling of PUCCH */
+  uint8_t HARQ_ACK_spatial_bundling_PUCCH;
+#endif
  /// Maximum number of HARQ processes(for definition see 36-212 V8.6 2009-03, p.17
  uint8_t Mdlharq;
  /// MIMO transmission mode indicator for this sub-frame (for definition see 36-212 V8.6 2009-03, p.17)
@@ -363,6 +385,13 @@ typedef struct {
  dci_space_t search_space;
  /// DCI pdu
  uint8_t dci_pdu[8];
+//#if defined(UPGRADE_RAT_NR)
+#if 1
+  /// harq information
+  uint8_t harq_pid_pusch;
+  /// delay between current slot and slot to transmit
+  uint8_t number_slots_rx_to_tx;
+#endif
 } NR_DCI_ALLOC_t;



--- a/openair1/PHY/NR_UE_TRANSPORT/pss_nr.c
+++ b/openair1/PHY/NR_UE_TRANSPORT/pss_nr.c
@@ -669,24 +669,21 @@ int pss_synchro_nr(PHY_VARS_NR_UE *PHY_vars_UE, int rate_change)

 #endif

-#if 1
-
  synchro_position = pss_search_time_nr(rxdata,
                                        frame_parms,
                                        (int *)&PHY_vars_UE->common_vars.eNb_id);

-#else
-
-  synchro_position = lte_sync_time(rxdata,
-                                          frame_parms,
-                                          (int *)&PHY_vars_UE->common_vars.eNb_id);
-#endif
-
 #if TEST_SYNCHRO_TIMING_PSS

  stop_meas(&generic_time[TIME_PSS]);

-  printf("PSS execution duration %5.2f \n", generic_time[TIME_PSS].p_time/(cpuf*1000.0));
+  int duration_ms = generic_time[TIME_PSS].p_time/(cpuf*1000.0);
+
+  #ifndef NR_UNIT_TEST
+
+    printf("PSS execution duration %4d microseconds \n", duration_ms);
+
+  #endif

 #endif

@@ -855,7 +852,9 @@ int pss_search_time_nr(int **rxdata, ///rx data in time domain
  }
 //#endif

-#ifdef DEBUG_PHY
+#ifdef DBG_PSS_NR
+
+  static debug_cnt = 0;

  if (debug_cnt == 0) {
    write_output("pss_corr_ue0.m","pss_corr_ue0",pss_corr_ue[0],length,1,2);

--- a/openair1/PHY/NR_UE_TRANSPORT/pucch_nr.c
+++ b/openair1/PHY/NR_UE_TRANSPORT/pucch_nr.c
--- a/openair1/PHY/NR_UE_TRANSPORT/sss_nr.c
+++ b/openair1/PHY/NR_UE_TRANSPORT/sss_nr.c
@@ -181,7 +181,7 @@ void insert_sss_nr(int16_t *sss_time,
  /* get sss in the frequency domain by applying an inverse FFT */
  idft2048(synchroF_tmp,          /* complex input */
           synchro_tmp,           /* complex output */
-   	       1);                 /* scaling factor */
+   	   1);                    /* scaling factor */

  /* then get final sss in time */
  for (unsigned int i=0; i<ofdm_symbol_size; i++) {
@@ -305,8 +305,6 @@ int do_pss_sss_extract_nr(PHY_VARS_NR_UE *ue,
  int32_t **rxdataF;
  NR_DL_FRAME_PARMS *frame_parms = &ue->frame_parms;

-#if 1
-
  for (aarx=0; aarx<frame_parms->nb_antennas_rx; aarx++) {

    pss_symbol = PSS_SYMBOL_NB;  /* symbol position */
@@ -361,46 +359,6 @@ int do_pss_sss_extract_nr(PHY_VARS_NR_UE *ue,
    printf(" pss_rxF_ext [%d]  %d  %d at address %p\n", i, p2[2*i], p2[2*i+1], &p2[2*i]);
  }

-#endif
-
-#else
-
-  /* same method as LTE implementation */
-
-  uint16_t rb,nb_rb = N_RB_SS_PBCH_BLOCK;
-
-  int rx_offset = frame_parms->ofdm_symbol_size - (LENGTH_SSS_NR/2);
-
-  for (aarx=0; aarx<frame_parms->nb_antennas_rx; aarx++) {
-
-    pss_symbol = PSS_SYMBOL_NB;
-    sss_symbol = SSS_SYMBOL_NB;
-
-    rxdataF  =  ue->common_vars.common_vars_rx_data_per_thread[ue->current_thread_id[subframe]].rxdataF;
-    pss_rxF  =  &rxdataF[aarx][(rx_offset + (pss_symbol*(frame_parms->ofdm_symbol_size)))];
-    sss_rxF  =  &rxdataF[aarx][(rx_offset + (sss_symbol*(frame_parms->ofdm_symbol_size)))];
-
-    //printf("extract_rbs: symbol_mod=%d, rx_offset=%d, ch_offset=%d\n",symbol_mod,
-    //   (rx_offset + (symbol*(frame_parms->ofdm_symbol_size)))*2,
-    //   LTE_CE_OFFSET+ch_offset+(symbol_mod*(frame_parms->ofdm_symbol_size)));
-
-    pss_rxF_ext = &pss_ext[aarx][0];
-    sss_rxF_ext = &sss_ext[aarx][0];
-
-    for (rb=0; rb<nb_rb; rb++) {
-
-      for (int i=0; i<N_SC_RB; i++) {
-        if (doPss) {pss_rxF_ext[i] = pss_rxF[i];}
-        if (doSss) {sss_rxF_ext[i] = sss_rxF[i];}
-      }
-
-      pss_rxF += N_SC_RB;
-      sss_rxF += N_SC_RB;
-      pss_rxF_ext += N_SC_RB;
-      sss_rxF_ext += N_SC_RB;
-    }
-  }
-
 #endif

  return(0);
@@ -466,20 +424,22 @@ int rx_sss_nr(PHY_VARS_NR_UE *ue, int32_t *tot_metric,uint8_t *phase_max)

  // Do FFTs for SSS/PSS
  // SSS
-  slot_fep_pbch(ue,
+  nr_slot_fep(ue,
           SSS_SYMBOL_NB,      // symbol number
           0,                  // Ns slot number
           ue->rx_offset,      // sample_offset of int16_t
           0,                  // no_prefix
-           1);                 // reset frequency estimation
+           1,                  // reset frequency estimation
+		   NR_SSS_EST);

  // PSS
-  slot_fep_pbch(ue,
+  nr_slot_fep(ue,
           PSS_SYMBOL_NB,
           0,
           ue->rx_offset,
           0,
-           1);
+           1,
+		   NR_SSS_EST);

  frame_parms->nb_prefix_samples0 = nb_prefix_samples0;


--- a/openair1/PHY/defs_nr_UE.h
+++ b/openair1/PHY/defs_nr_UE.h
@@ -82,6 +82,15 @@
 //#define RX_NB_TH_MAX 3
 //#define RX_NB_TH 3

+#ifdef NR_UNIT_TEST
+  #define FILE_NAME                " "
+  #define LINE_FILE                (0)
+  #define NR_TST_PHY_PRINTF(...)   printf(__VA_ARGS__)
+#else
+  #define FILE_NAME                (__FILE__)
+  #define LINE_FILE                (__LINE__)
+  #define NR_TST_PHY_PRINTF(...)
+#endif

 //#ifdef SHRLIBDEV
 //extern int rxrescale;
@@ -149,7 +158,28 @@

 #include "targets/ARCH/COMMON/common_lib.h"

+#include "NR_IF_Module.h"
+
+//#if defined(UPGRADE_RAT_NR)
+#if 1
+                        /* see 38.321  Table 7.1-2  RNTI usage */
+typedef enum {          /* Type for Radio Network Temporary Identifier */
+  C_RNTI_NR = 0,        /* Cell RNTI */
+  Temporary_C_RNTI_NR,  /* Temporary C-RNTI */
+  CS_RNTI_NR,           /* Configured Scheduling RNTI */
+  P_RNTI_NR,            /* Paging RNTI */
+  SI_RNTI_NR,           /* System information RNTI */
+  RA_RNTI_NR,           /* Random Access RNTI */
+  TPC_CS_RNTI_NR,       /* configured scheduling uplink power control */
+  TPC_PUCCH_RNTI_NR,    /* PUCCH power control */
+  TPC_PUSCH_RNTI_NR,    /* PUSCH power control */
+  TPC_SRS_RNTI_NR,      /* SRS trigger and power control */
+  INT_RNTI_NR,          /* Indication pre-emption in DL */
+  SFI_RNTI_NR,          /* Slot Format Indication on the given cell */
+  SP_CSI_RNTI_NR        /* Semipersistent CSI reporting on PUSCH */
+} nr_rnti_type_t;

+#endif

 /// Context data structure for RX/TX portion of subframe processing
 typedef struct {
@@ -282,6 +312,13 @@ typedef struct {
  UE_nr_rxtx_proc_t proc_rxtx[RX_NB_TH];
 } UE_nr_proc_t;

+typedef enum {
+  NR_PBCH_EST=0,
+  NR_PDCCH_EST,
+  NR_PDSCH_EST,
+  NR_SSS_EST,
+} NR_CHANNEL_EST_t;
+
 #define debug_msg if (((mac_xface->frame%100) == 0) || (mac_xface->frame < 50)) msg

 typedef struct {
@@ -902,6 +939,11 @@ typedef struct {
  /// - first index: ? [0..7] (hard coded) FIXME! accessed via \c nb_antennas_rx
  /// - second index: ? [0..287] (hard coded)
  int32_t **dl_ch_estimates_ext;
+  uint8_t pbch_a[NR_POLAR_PBCH_PAYLOAD_BITS>>3];
+  uint8_t pbch_a_interleaved[NR_POLAR_PBCH_PAYLOAD_BITS>>3];
+  uint8_t pbch_a_prime[NR_POLAR_PBCH_PAYLOAD_BITS>>3];
+  uint8_t pbch_e[NR_POLAR_PBCH_E];
+  double  demod_pbch_e[NR_POLAR_PBCH_E];
  /// \brief Pointer to PBCH llrs.
  /// - first index: ? [0..1919] (hard coded)
  int8_t *llr;
@@ -973,9 +1015,9 @@ typedef struct {
  /// \brief Total gains with bypassed RF gain stage (ExpressMIMO2/Lime)
  uint32_t rx_gain_byp[4];
  /// \brief Current transmit power
-  int16_t tx_power_dBm[10];
+  int16_t tx_power_dBm[MAX_NR_OF_SLOTS];
  /// \brief Total number of REs in current transmission
-  int tx_total_RE[10];
+  int tx_total_RE[MAX_NR_OF_SLOTS];
  /// \brief Maximum transmit power
  int8_t tx_power_max_dBm;
  /// \brief Number of eNB seen by UE
@@ -991,6 +1033,10 @@ typedef struct {
  NR_DL_FRAME_PARMS  frame_parms_before_ho;
  NR_UE_COMMON    common_vars;

+  nr_ue_if_module_t *if_inst;
+  nr_downlink_indication_t dl_indication;
+  nr_uplink_indication_t ul_indication;
+
  // point to the current rxTx thread index
  uint8_t current_thread_id[10];

@@ -1040,7 +1086,7 @@ typedef struct {
  uint32_t nr_gold_pdsch[2][20][2][21];

  /// PDCCH DMRS
-  uint32_t nr_gold_pdcch[10][3][42];
+  uint32_t nr_gold_pdcch[7][20][3][10];

  uint32_t X_u[64][839];

@@ -1147,6 +1193,22 @@ typedef struct {

  PUCCH_CONFIG_DEDICATED pucch_config_dedicated[NUMBER_OF_CONNECTED_eNB_MAX];

+//#if defined(UPGRADE_RAT_NR)
+#if 1
+
+  SystemInformationBlockType1_nr_t systemInformationBlockType1_nr;
+
+  CellGroupConfig_t          cell_group_config;
+  PDSCH_ServingCellConfig_t  PDSCH_ServingCellConfig;
+  PDSCH_Config_t             PDSCH_Config;
+
+  PUCCH_ConfigCommon_nr_t    pucch_config_common_nr[NUMBER_OF_CONNECTED_eNB_MAX];
+  PUCCH_Config_t             pucch_config_dedicated_nr[NUMBER_OF_CONNECTED_eNB_MAX];
+
+  PUSCH_Config_t             pusch_config;
+
+#endif
+
  uint8_t ncs_cell[20][7];

  /// UL-POWER-Control
@@ -1165,6 +1227,12 @@ typedef struct {
  /// Scheduling Request Config
  SCHEDULING_REQUEST_CONFIG scheduling_request_config[NUMBER_OF_CONNECTED_eNB_MAX];

+//#if defined(UPGRADE_RAT_NR)
+#if 1
+  scheduling_request_config_t scheduling_request_config_nr[NUMBER_OF_CONNECTED_eNB_MAX];
+
+#endif
+
  /// Transmission mode per eNB
  uint8_t transmission_mode[NUMBER_OF_CONNECTED_eNB_MAX];


--- a/openair1/PHY/impl_defs_nr.h
+++ b/openair1/PHY/impl_defs_nr.h
--- a/openair1/PHY/impl_defs_top.h
+++ b/openair1/PHY/impl_defs_top.h
@@ -256,6 +256,21 @@
 /// Threshold for PUCCH Format 1a/1b detection
 #define PUCCH1a_THRES 4

+//#if defined(UPGRADE_RAT_NR)
+#if 1
+
+#define NB_NUMEROLOGIES_NR                       (5)
+#define TDD_CONFIG_NB_FRAMES                     (2)
+#define NR_MAX_SLOTS_PAR_FRAME                   (160)                    /* number of slots per frame */
+#define NR_UE_CAPABILITY_SLOT_RX_TO_TX           (4)                      /* FFS_NR_TODO it defines ue capability which is the number of slots */
+                                                                          /* - between reception of pdsch and tarnsmission of its acknowlegment */
+                                                                          /* - between reception of un uplink grant and its related transmission */
+
+#define NR_MAX_HARQ_PROCESSES                    (16)
+#define NR_MAX_ULSCH_HARQ_PROCESSES              (NR_MAX_HARQ_PROCESSES)  /* cf 38.214 6.1 UE procedure for receiving the physical uplink shared channel */
+#define NR_MAX_DLSCH_HARQ_PROCESSES              (NR_MAX_HARQ_PROCESSES)  /* cf 38.214 5.1 UE procedure for receiving the physical downlink shared channel */
+#endif
+
 /// Data structure for transmission.
 typedef struct {
  /// RAW TX sample buffer

--- a/openair1/PHY/phy_vars_nr_ue.h
+++ b/openair1/PHY/phy_vars_nr_ue.h
@@ -24,7 +24,6 @@

 #include "PHY/types.h"
 #include "PHY/defs_nr_UE.h"
-#include "PHY/phy_vars_nr_ue.h"

 #include "common/ran_context.h"

@@ -45,7 +44,7 @@ int16_t *primary_synch2_time;
 #ifndef OCP_FRAMEWORK
 PHY_VARS_NR_UE ***PHY_vars_UE_g;
 PHY_VARS_eNB ***PHY_vars_eNB_g;
-LTE_DL_FRAME_PARMS *lte_frame_parms_g;
+NR_DL_FRAME_PARMS *lte_frame_parms_g;
 #else
 PHY_VARS_NR_UE * PHY_vars_UE_g[MAX_UE][MAX_NUM_CCs]={NULL};


--- a/openair1/SCHED_NR_UE/defs.h
+++ b/openair1/SCHED_NR_UE/defs.h
@@ -219,6 +219,7 @@ void ra_failed(uint8_t Mod_id,uint8_t CC_id,uint8_t eNB_index);
 */
 void ra_succeeded(uint8_t Mod_id,uint8_t CC_id,uint8_t eNB_index);

+#if 0
 /*! \brief Compute ACK/NACK information for PUSCH/PUCCH for UE transmission in subframe n. This function implements table 10.1-1 of 36.213, p. 69.
  @param frame_parms Pointer to DL frame parameter descriptor
  @param harq_ack Pointer to dlsch_ue harq_ack status descriptor
@@ -264,6 +265,7 @@ uint8_t nr_ul_ACK_subframe2_M(NR_DL_FRAME_PARMS *frame_parms,unsigned char subfr
  @param eNB_id ID of eNB which is to receive the SR
  @returns 1 if TXOp is active.
 */
+#endif
 uint8_t nr_is_SR_TXOp(PHY_VARS_NR_UE *phy_vars_ue,UE_nr_rxtx_proc_t *proc,uint8_t eNB_id);

 /*! \brief Gives the UL subframe corresponding to a PDDCH order in subframe n
@@ -295,6 +297,7 @@ unsigned int get_tx_amp(int power_dBm, int power_max_dBm, int N_RB_UL, int nb_rb

 void phy_reset_ue(module_id_t Mod_id,uint8_t CC_id,uint8_t eNB_index);

+#if 0
 /*! \brief This function retrives the resource (n1_pucch) corresponding to a PDSCH transmission in
 subframe n-4 which is acknowledged in subframe n (for FDD) according to n1_pucch = Ncce + N1_pucch.  For
 TDD, this routine computes the complex procedure described in Section 10.1 of 36.213 (through tables 10.1-1,10.1-2)
@@ -313,7 +316,7 @@ uint16_t nr_get_n1_pucch(PHY_VARS_NR_UE *phy_vars_ue,
                      uint8_t *b,
                      uint8_t SR);

-
+#endif
 /*! \brief This function retrieves the PHY UE mode. It is used as a helper function for the UE MAC.
  @param Mod_id Local UE index on which to act
  @param CC_id Component Carrier Index

--- a/openair1/SCHED_NR_UE/fapi_l1.c
+++ b/openair1/SCHED_NR_UE/fapi_l1.c
--- a/openair1/SCHED_NR_UE/fapi_l1.h
+++ b/openair1/SCHED_NR_UE/fapi_l1.h
-/*
- * Licensed to the OpenAirInterface (OAI) Software Alliance under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The OpenAirInterface Software Alliance licenses this file to You under
- * the OAI Public License, Version 1.1  (the "License"); you may not use this file
- * except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.openairinterface.org/?page_id=698
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *-------------------------------------------------------------------------------
- * For more information about the OpenAirInterface (OAI) Software Alliance:
- *      contact@openairinterface.org
- */
-
-/*! \file fapi_l1.h
- * \brief function prototypes for FAPI L1 interface
- * \author R. Knopp
- * \date 2017
- * \version 0.1
- * \company Eurecom
- * \email: knopp@eurecom.fr
- * \note
- * \warning
- */
-
-#include "PHY/defs_eNB.h"
-#include "PHY/phy_extern.h"
-#include "PHY/LTE_TRANSPORT/transport_proto.h"
-#include "SCHED/sched_eNB.h"
-#include "SCHED/sched_common.h"
-#include "nfapi_interface.h"
-
-void fill_uci_harq_indication(PHY_VARS_eNB *eNB,LTE_eNB_UCI *uci,int frame,int subframe,uint8_t *harq_ack,uint8_t tdd_mapping_mode,uint16_t tdd_multiplexing_mask);
-void fill_ulsch_harq_indication(PHY_VARS_eNB *eNB,LTE_UL_eNB_HARQ_t *ulsch_harq,uint16_t rnti, int frame,int subframe,int bundling);
-void fill_ulsch_cqi_indication(PHY_VARS_eNB *eNB,uint16_t frame,uint8_t subframe,LTE_UL_eNB_HARQ_t *ulsch_harq,uint16_t rnti);
-void fill_sr_indication(PHY_VARS_eNB *eNB,uint16_t rnti,int frame,int subframe,uint32_t stat);
-void fill_rx_indication(PHY_VARS_eNB *eNB,int UE_id,int frame,int subframe);
-void fill_crc_indication(PHY_VARS_eNB *eNB,int UE_id,int frame,int subframe,uint8_t crc_flag);
-void handle_nfapi_dci_dl_pdu(PHY_VARS_eNB *eNB,int frame,int subframe,eNB_rxtx_proc_t *proc,nfapi_dl_config_request_pdu_t *dl_config_pdu);
-void handle_nfapi_mpdcch_pdu(PHY_VARS_eNB *eNB,eNB_rxtx_proc_t *proc,nfapi_dl_config_request_pdu_t *dl_config_pdu);
-void handle_nfapi_hi_dci0_dci_pdu(PHY_VARS_eNB *eNB,int frame,int subframe,eNB_rxtx_proc_t *proc,
-				  nfapi_hi_dci0_request_pdu_t *hi_dci0_config_pdu);
-void handle_nfapi_hi_dci0_hi_pdu(PHY_VARS_eNB *eNB,int frame,int subframe,eNB_rxtx_proc_t *proc,
-				 nfapi_hi_dci0_request_pdu_t *hi_dci0_config_pdu);
-void handle_nfapi_dlsch_pdu(PHY_VARS_eNB *eNB,int frame,int subframe,eNB_rxtx_proc_t *proc,
-			    nfapi_dl_config_request_pdu_t *dl_config_pdu,
-			    uint8_t codeword_index,
-			    uint8_t *sdu);
-void handle_nfapi_ul_pdu(PHY_VARS_eNB *eNB,eNB_rxtx_proc_t *proc,
-			 nfapi_ul_config_request_pdu_t *ul_config_pdu,
-			 uint16_t frame,uint8_t subframe,uint8_t srs_present);
-
-void handle_ulsch_harq_pdu(
-        PHY_VARS_eNB                           *eNB,
-        int                                     UE_id,
-        nfapi_ul_config_request_pdu_t          *ul_config_pdu,
-        nfapi_ul_config_ulsch_harq_information *harq_information,
-        uint16_t                                frame,
-        uint8_t                                 subframe);
-
-void handle_ulsch_cqi_ri_pdu(PHY_VARS_eNB *eNB,int UE_id,nfapi_ul_config_request_pdu_t *ul_config_pdu,uint16_t frame,uint8_t subframe);
-
-void handle_uci_harq_information(PHY_VARS_eNB *eNB, LTE_eNB_UCI *uci,nfapi_ul_config_harq_information *harq_information);
-
-void handle_uci_sr_pdu(PHY_VARS_eNB *eNB,int UE_id,nfapi_ul_config_request_pdu_t *ul_config_pdu,uint16_t frame,uint8_t subframe,uint8_t srs_active);
-
-void handle_uci_sr_harq_pdu(PHY_VARS_eNB *eNB,int UE_id,nfapi_ul_config_request_pdu_t *ul_config_pdu,uint16_t frame,uint8_t subframe,uint8_t srs_active);
-void handle_uci_harq_pdu(PHY_VARS_eNB *eNB,int UE_id,nfapi_ul_config_request_pdu_t *ul_config_pdu,uint16_t frame,uint8_t subframe,uint8_t srs_active);
-
-void handle_srs_pdu(PHY_VARS_eNB *eNB,nfapi_ul_config_request_pdu_t *ul_config_pdu,uint16_t frame,uint8_t subframe);
-
-void schedule_response(Sched_Rsp_t *Sched_INFO);
--- a/openair1/SCHED_NR_UE/fapi_nr_ue_l1.c
+++ b/openair1/SCHED_NR_UE/fapi_nr_ue_l1.c
@@ -19,25 +19,83 @@
 *      contact@openairinterface.org
 */

-/*! \file fapi_nr_ue_l1.c
+/* \file fapi_nr_ue_l1.c
 * \brief functions for NR UE FAPI-like interface
- * \author R. Knopp
+ * \author R. Knopp, K.H. HSU
 * \date 2018
 * \version 0.1
- * \company Eurecom
- * \email: knopp@eurecom.fr
+ * \company Eurecom / NTUST
+ * \email: knopp@eurecom.fr, kai-hsiang.hsu@eurecom.fr
 * \note
 * \warning
 */

+#include <stdio.h>
+
 #include "fapi_nr_ue_interface.h"
 #include "fapi_nr_ue_l1.h"
+//#include "PHY/phy_vars_nr_ue.h"
+
+#include "PHY/defs_nr_UE.h"
+extern PHY_VARS_NR_UE ***PHY_vars_UE_g;

 int8_t nr_ue_scheduled_response(nr_scheduled_response_t *scheduled_response){
+
+	if(scheduled_response != NULL){
+		if(scheduled_response->dl_config != NULL){
+
+		}
+
+		if(scheduled_response->ul_config != NULL){
+
+		}
+
+		if(scheduled_response->tx_request != NULL){
+
+		}
+	}
+
 	return 0;
 }


 int8_t nr_ue_phy_config_request(nr_phy_config_t *phy_config){
+
+	if(phy_config != NULL){
+		if(phy_config->config_req.config_mask & FAPI_NR_CONFIG_REQUEST_MASK_PBCH){
+			printf("[L1][IF module][PHY CONFIG]\n");
+			printf("subcarrier spacing:          %d\n", phy_config->config_req.pbch_config.subcarrier_spacing_common);
+			printf("ssb carrier offset:          %d\n", phy_config->config_req.pbch_config.ssb_subcarrier_offset);
+			printf("dmrs type A position:        %d\n", phy_config->config_req.pbch_config.dmrs_type_a_position);
+			printf("pdcch config sib1:           %d\n", phy_config->config_req.pbch_config.pdcch_config_sib1);
+			printf("cell barred:                 %d\n", phy_config->config_req.pbch_config.cell_barred);
+			printf("intra frequcney reselection: %d\n", phy_config->config_req.pbch_config.intra_frequency_reselection);
+			printf("system frame number:         %d\n", phy_config->config_req.pbch_config.system_frame_number);
+			printf("ssb index:                   %d\n", phy_config->config_req.pbch_config.ssb_index);
+			printf("half frame bit:              %d\n", phy_config->config_req.pbch_config.half_frame_bit);
+			printf("-------------------------------\n");
+
+			PHY_vars_UE_g[0][0]->proc.proc_rxtx[0].frame_rx = phy_config->config_req.pbch_config.system_frame_number;
+		}
+		
+		if(phy_config->config_req.config_mask & FAPI_NR_CONFIG_REQUEST_MASK_DL_BWP_COMMON){
+			
+		}
+
+		if(phy_config->config_req.config_mask & FAPI_NR_CONFIG_REQUEST_MASK_UL_BWP_COMMON){
+			
+		}
+
+		if(phy_config->config_req.config_mask & FAPI_NR_CONFIG_REQUEST_MASK_DL_BWP_DEDICATED){
+			
+		}
+
+		if(phy_config->config_req.config_mask & FAPI_NR_CONFIG_REQUEST_MASK_UL_BWP_DEDICATED){
+			
+		}
+	}
+	
+
+
 	return 0;
-}
\ No newline at end of file
+}
--- a/openair1/SCHED_NR_UE/fapi_nr_ue_l1.h
+++ b/openair1/SCHED_NR_UE/fapi_nr_ue_l1.h
@@ -19,13 +19,13 @@
 *      contact@openairinterface.org
 */

-/*! \file fapi_nr_ue_l1.c
+/* \file fapi_nr_ue_l1.c
 * \brief functions for FAPI L1 interface
- * \author R. Knopp
+ * \author R. Knopp, K.H. HSU
 * \date 2018
 * \version 0.1
- * \company Eurecom
- * \email: knopp@eurecom.fr
+ * \company Eurecom / NTUST
+ * \email: knopp@eurecom.fr, kai-hsiang.hsu@eurecom.fr
 * \note
 * \warning
 */

--- a/openair1/SCHED_NR_UE/harq_nr.c
+++ b/openair1/SCHED_NR_UE/harq_nr.c
--- a/openair1/SCHED_NR_UE/harq_nr.h
+++ b/openair1/SCHED_NR_UE/harq_nr.h
+/*
+ * Licensed to the OpenAirInterface (OAI) Software Alliance under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The OpenAirInterface Software Alliance licenses this file to You under
+ * the OAI Public License, Version 1.1  (the "License"); you may not use this file
+ * except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.openairinterface.org/?page_id=698
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *-------------------------------------------------------------------------------
+ * For more information about the OpenAirInterface (OAI) Software Alliance:
+ *      contact@openairinterface.org
+ */
+
+/***********************************************************************
+*
+* FILENAME    :  harq_nr.h
+*
+* MODULE      :  HARQ
+*
+* DESCRIPTION :  header related to Hybrid Automatic Repeat Request Acknowledgment
+*                This feature allows to acknowledge downlink and uplink transport blocks
+*
+************************************************************************/
+
+#ifndef HARQ_NR_H
+#define HARQ_NR_H
+
+/************** DEFINE ********************************************/
+
+#if 0
+
+/* these define are in file PHY/impl_defs_top.h" because of compilation problems due to multiple header files inclusions */
+#define NR_MAX_HARQ_PROCESSES                    (16)
+#define NR_MAX_ULSCH_HARQ_PROCESSES              (NR_MAX_HARQ_PROCESSES)  /* TS 38.214 6.1 UE procedure for receiving the physical uplink shared channel */
+#define NR_MAX_DLSCH_HARQ_PROCESSES              (NR_MAX_HARQ_PROCESSES)  /* TS 38.214 5.1 UE procedure for receiving the physical downlink shared channel */
+
+#endif
+
+#define NR_DEFAULT_DLSCH_HARQ_PROCESSES          (8)                      /* TS 38.214 5.1 */
+
+#define NR_DL_MAX_DAI                            (4)                      /* TS 38.213 table 9.1.3-1 Value of counter DAI for DCI format 1_0 and 1_1 */
+#define NR_DL_MAX_NB_CW                          (2)                      /* number of downlink code word */
+#define DL_ACKNACK_NO_SET                        (2)
+#define DL_NACK                                  (0)
+#define DL_ACK                                   (1)
+#define DL_MAX_NB_FEEDBACK                       (NR_DL_MAX_DAI * NR_DL_MAX_NB_CW)
+#define DL_DAI_NO_SET                            (0xFF)
+#define UL_DAI_NO_SET                            (DL_DAI_NO_SET)
+
+/************** INCLUDE *******************************************/
+
+#include "PHY/defs_nr_UE.h"
+
+/************* TYPE ***********************************************/
+
+typedef enum {
+ NEW_TRANSMISSION_HARQ,
+ RETRANSMISSION_HARQ
+} harq_result_t;
+
+/************** VARIABLES *****************************************/
+
+
+/*************** FUNCTIONS ****************************************/
+
+/** \brief This function configures uplink HARQ context
+    @param PHY_VARS_NR_UE ue context
+    @param gNB_id gNodeB identifier
+    @param number_harq_processes_pusch maximum number of uplink HARQ processes
+    @returns none */
+
+void config_uplink_harq_process(PHY_VARS_NR_UE *ue, int gNB_id, uint8_t number_harq_processes_pusch);
+
+/** \brief This function releases uplink HARQ context
+    @param PHY_VARS_NR_UE ue context
+    @param gNB_id gNodeB identifier
+    @returns none */
+
+void release_uplink_harq_process(PHY_VARS_NR_UE *ue, int gNB_id);
+
+/** \brief This function stores slot for transmission in HARQ context
+    @param ulsch_harq uplink harq context
+    @param harq process identifier harq_pid
+    @param slot_tx slot for transmission related to current downlink PDCCH
+    @returns 0 none */
+
+void set_tx_harq_id(PHY_VARS_NR_UE *ue, int gNB_id, int harq_pid, int slot_tx);
+
+/** \brief This function initialises context of an uplink HARQ process
+    @param ulsch_harq uplink harq context
+    @param harq process identifier harq_pid
+    @returns 0 none */
+
+int get_tx_harq_id(PHY_VARS_NR_UE *ue, int gNB_id, int slot_tx);
+
+/** \brief This function returns number of slots between current reception and related transmission
+    @param dci value
+    @returns slots number between reception and related transmission */
+
+int get_dci_slot_rx_to_tx(int dci_index);
+
+/** \brief This function update uplink harq context and return transmission type (new transmission or retransmission)
+    @param ulsch uplink harq context
+    @param harq process identifier harq_pid
+    @returns retransmission or new transmission */
+
+harq_result_t uplink_harq_process(NR_UE_ULSCH_t *ulsch, int harq_pid, int ndi, nr_rnti_type_t rnti_type);
+
+/** \brief This function initialises downlink HARQ status
+    @param pointer to downlink harq status
+    @returns none */
+
+void init_downlink_harq_status(NR_DL_UE_HARQ_t *dl_harq);
+
+/** \brief This function configures downlink HARQ context
+    @param PHY_VARS_NR_UE ue context
+    @param gNB_id gNodeB identifier
+    @param TB_id transport block identifier
+    @param execution_thread_number thread_number
+    @param number_harq_processes maximum number of downlink HARQ processes
+    @returns none */
+
+void config_downlink_harq_process(PHY_VARS_NR_UE *ue, int gNB_id, int TB_id, int execution_thread_number, uint8_t number_harq_processes);
+
+/** \brief This function releases downlink HARQ context
+    @param PHY_VARS_NR_UE ue context
+    @param gNB_id gNodeB identifier
+    @param TB_id transport block identifier
+    @param execution_thread_number thread_number
+    @returns none */
+
+void release_downlink_harq_process(PHY_VARS_NR_UE *ue, int gNB_id, int TB_id, int execution_thread_number);
+
+/** \brief This function update downlink harq context and return reception type (new transmission or retransmission)
+    @param dlsch downlink harq context
+    @param harq process identifier harq_pid
+    @param rnti_type type of rnti
+    @returns retransmission or new transmission */
+
+harq_result_t downlink_harq_process(NR_DL_UE_HARQ_t *dlsch, int harq_pid, int ndi, nr_rnti_type_t rnti_type);
+
+#undef EXTERN
+#undef INIT_VARIABLES_HARQ_NR_H
+
+#endif /* HARQ_NR_H */
--- a/openair1/SCHED_NR_UE/phy_frame_config_nr.c
+++ b/openair1/SCHED_NR_UE/phy_frame_config_nr.c
--- a/openair1/SCHED_NR_UE/phy_frame_config_nr.h
+++ b/openair1/SCHED_NR_UE/phy_frame_config_nr.h
+/*
+ * Licensed to the OpenAirInterface (OAI) Software Alliance under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The OpenAirInterface Software Alliance licenses this file to You under
+ * the OAI Public License, Version 1.1  (the "License"); you may not use this file
+ * except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.openairinterface.org/?page_id=698
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *-------------------------------------------------------------------------------
+ * For more information about the OpenAirInterface (OAI) Software Alliance:
+ *      contact@openairinterface.org
+ */
+
+/***********************************************************************
+*
+* FILENAME    :  phy_frame_configuration_nr.h
+*
+* DESCRIPTION :  functions related to FDD/TDD configuration  for NR
+*                see TS 38.213 11.1 Slot configuration
+*                and TS 38.331 for RRC configuration
+*
+************************************************************************/
+
+#ifndef PHY_FRAME_CONFIG_NR_H
+#define PHY_FRAME_CONFIG_NR_H
+
+/************** DEFINE ********************************************/
+
+/*************** FUNCTIONS *****************************************/
+
+/** \brief This function processes tdd dedicated configuration for nr
+ *  @param frame_parms NR DL Frame parameters
+ *  @param dl_UL_TransmissionPeriodicity periodicity
+ *  @param nrofDownlinkSlots number of downlink slots
+ *  @param nrofDownlinkSymbols number of downlink symbols
+ *  @param nrofUplinkSlots number of uplink slots
+ *  @param nrofUplinkSymbols number of uplink symbols
+    @returns 0 if tdd dedicated configuration has been properly set or -1 on error with message */
+
+int set_tdd_config_nr(NR_DL_FRAME_PARMS *frame_parms, int dl_UL_TransmissionPeriodicity,
+                       int nrofDownlinkSlots, int nrofDownlinkSymbols,
+                       int nrofUplinkSlots,   int nrofUplinkSymbols);
+
+/** \brief This function adds a slot configuration to current dedicated configuration for nr
+ *  @param frame_parms NR DL Frame parameters
+ *  @param slotIndex
+ *  @param nrofDownlinkSymbols
+ *  @param nrofUplinkSymbols
+    @returns none */
+
+void add_tdd_dedicated_configuration_nr(NR_DL_FRAME_PARMS *frame_parms, int slotIndex,
+                                        int nrofDownlinkSymbols, int nrofUplinkSymbols);
+
+/** \brief This function processes tdd dedicated configuration for nr
+ *  @param frame_parms nr frame parameters
+ *  @param dl_UL_TransmissionPeriodicity periodicity
+ *  @param nrofDownlinkSlots number of downlink slots
+ *  @param nrofDownlinkSymbols number of downlink symbols
+ *  @param nrofUplinkSlots number of uplink slots
+ *  @param nrofUplinkSymbols number of uplink symbols
+    @returns 0 if tdd dedicated configuration has been properly set or -1 on error with message */
+
+int set_tdd_configuration_dedicated_nr(NR_DL_FRAME_PARMS *frame_parms);
+
+/** \brief This function checks nr slot direction : downlink or uplink
+ *  @param frame_parms NR DL Frame parameters
+ *  @param nr_frame : frame number
+ *  @param nr_tti   : slot number
+    @returns nr_slot_t : downlink or uplink */
+
+nr_slot_t slot_select_nr(NR_DL_FRAME_PARMS *frame_parms, int nr_frame, int nr_tti);
+
+/** \brief This function frees tdd configuration for nr
+ *  @param frame_parms NR DL Frame parameters
+    @returns none */
+
+void free_tdd_configuration_nr(NR_DL_FRAME_PARMS *frame_parms);
+
+/** \brief This function frees tdd dedicated configuration for nr
+ *  @param frame_parms NR DL Frame parameters
+    @returns none */
+
+void free_tdd_configuration_dedicated_nr(NR_DL_FRAME_PARMS *frame_parms);
+
+#endif  /* PHY_FRAME_CONFIG_NR_H */
+
--- a/openair1/SCHED_NR_UE/phy_procedures_nr_ue.c
+++ b/openair1/SCHED_NR_UE/phy_procedures_nr_ue.c
--- a/openair1/SCHED_NR_UE/pucch_power_control_ue_nr.c
+++ b/openair1/SCHED_NR_UE/pucch_power_control_ue_nr.c
--- a/openair2/NR_UE_PHY_INTERFACE/vars.h
+++ b/openair2/NR_UE_PHY_INTERFACE/vars.h
@@ -19,26 +19,47 @@
 *      contact@openairinterface.org
 */

-#ifndef __PHY_INTERFACE_VARS_H__
-#define __PHY_INTERFACE_VARS_H__
+/************************************************************************
+*
+* MODULE      :  PUCCH power control for UE NR
+*
+* DESCRIPTION :  functions related to PUCCH Transmit power
+*                TS 38.213 7.2.1 UE behaviour
+*
+**************************************************************************/

-//#include "SIMULATION/PHY_EMULATION/spec_defs.h"
-#include "defs.h"
+#ifndef PUCCH_POWER_CONTROL_H
+#define PUCCH_POWER_CONTROL_H

-#ifdef PHY_EMUL
-#include "SIMULATION/PHY_EMULATION/DEVICE_DRIVER/defs.h"
-#include "SIMULATION/simulation_defs.h"
-#endif
+/*************** INCLUDE *******************************************/

+/*************** DEFINE ********************************************/

-unsigned int mac_debug;
+#define PUCCH_POWER_DEFAULT         (0)       /* in dBm */

-//MAC_xface *mac_xface;
+/*************** VARIABLES *****************************************/

-//MACPHY_PARAMS MACPHY_params;
+/*************** FUNCTIONS *****************************************/

-unsigned int mac_registered;

+/** \brief This function returns pucch power level in dBm
+    @param ue context
+    @param gNB_id identity
+    @param slots for rx and tx
+    @param pucch_format_nr_t pucch format
+    @param nb_of_prbs number of prb allocated to pucch
+    @param N_sc_ctrl_RB subcarrier control rb related to current pucch format
+    @param N_symb_PUCCH number of pucch symbols excluding those reserved for dmrs
+    @param O_UCI number of bits for UCI Uplink Control Information
+    @param O_SR number of bits for SR scheduling Request
+    @param int O_UCI number of  bits for CSI Channel State Information
+    @param O_ACK number of bits for HARQ-ACK
+    @param O_CRC number of bits for CRC
+    @param n_HARQ_ACK use for obtaining a PUCCH transmission power
+    @returns pucch power level in dBm */

-#endif
+int16_t get_pucch_tx_power_ue(PHY_VARS_NR_UE *ue, uint8_t gNB_id, UE_nr_rxtx_proc_t *proc, pucch_format_nr_t pucch_format,
+                              int nb_of_prbs, int N_sc_ctrl_RB, int N_symb_PUCCH, int O_UCI, int O_SR, int O_CSI, int O_ACK,
+                              int O_CRC, int n_HARQ_ACK);

+#endif /* PUCCH_POWER_CONTROL_H */
--- a/openair1/SCHED_NR_UE/pucch_uci_ue_nr.c
+++ b/openair1/SCHED_NR_UE/pucch_uci_ue_nr.c
--- a/openair1/SCHED_NR_UE/pucch_uci_ue_nr.h
+++ b/openair1/SCHED_NR_UE/pucch_uci_ue_nr.h
--- a/openair1/SIMULATION/NR_UE_PHY/unit_tests/build/CMakeLists.txt
+++ b/openair1/SIMULATION/NR_UE_PHY/unit_tests/build/CMakeLists.txt
--- a/openair1/SIMULATION/NR_UE_PHY/unit_tests/build/reflogs/frame_config_test.txt
+++ b/openair1/SIMULATION/NR_UE_PHY/unit_tests/build/reflogs/frame_config_test.txt
--- a/openair1/SIMULATION/NR_UE_PHY/unit_tests/build/reflogs/harq_test.txt
+++ b/openair1/SIMULATION/NR_UE_PHY/unit_tests/build/reflogs/harq_test.txt
--- a/openair1/SIMULATION/NR_UE_PHY/unit_tests/build/reflogs/pbch_test.txt
+++ b/openair1/SIMULATION/NR_UE_PHY/unit_tests/build/reflogs/pbch_test.txt
--- a/openair1/SIMULATION/NR_UE_PHY/unit_tests/build/reflogs/pss_test.txt
+++ b/openair1/SIMULATION/NR_UE_PHY/unit_tests/build/reflogs/pss_test.txt
--- a/openair1/SIMULATION/NR_UE_PHY/unit_tests/build/reflogs/pucch_uci_test.txt
+++ b/openair1/SIMULATION/NR_UE_PHY/unit_tests/build/reflogs/pucch_uci_test.txt
--- a/openair1/SIMULATION/NR_UE_PHY/unit_tests/build/reflogs/srs_test.txt
+++ b/openair1/SIMULATION/NR_UE_PHY/unit_tests/build/reflogs/srs_test.txt
--- a/openair1/SIMULATION/NR_UE_PHY/unit_tests/build/reflogs/sss_test.txt
+++ b/openair1/SIMULATION/NR_UE_PHY/unit_tests/build/reflogs/sss_test.txt
--- a/openair1/SIMULATION/NR_UE_PHY/unit_tests/build/run_tests.sh
+++ b/openair1/SIMULATION/NR_UE_PHY/unit_tests/build/run_tests.sh
--- a/openair1/SIMULATION/NR_UE_PHY/unit_tests/readme.txt
+++ b/openair1/SIMULATION/NR_UE_PHY/unit_tests/readme.txt
--- a/openair1/SIMULATION/NR_UE_PHY/unit_tests/src/dummy_functions.c
+++ b/openair1/SIMULATION/NR_UE_PHY/unit_tests/src/dummy_functions.c
--- a/openair1/SIMULATION/NR_UE_PHY/unit_tests/src/frame_config_test.c
+++ b/openair1/SIMULATION/NR_UE_PHY/unit_tests/src/frame_config_test.c
--- a/openair1/SIMULATION/NR_UE_PHY/unit_tests/src/harq_test.c
+++ b/openair1/SIMULATION/NR_UE_PHY/unit_tests/src/harq_test.c
--- a/openair1/SIMULATION/NR_UE_PHY/unit_tests/src/input_buffer_test.h
+++ b/openair1/SIMULATION/NR_UE_PHY/unit_tests/src/input_buffer_test.h
--- a/openair1/SIMULATION/NR_UE_PHY/unit_tests/src/pbch_test.c
+++ b/openair1/SIMULATION/NR_UE_PHY/unit_tests/src/pbch_test.c
--- a/openair1/SIMULATION/NR_UE_PHY/unit_tests/src/pss_test.c
+++ b/openair1/SIMULATION/NR_UE_PHY/unit_tests/src/pss_test.c
--- a/openair1/SIMULATION/NR_UE_PHY/unit_tests/src/pss_util_test.c
+++ b/openair1/SIMULATION/NR_UE_PHY/unit_tests/src/pss_util_test.c
--- a/openair1/SIMULATION/NR_UE_PHY/unit_tests/src/pss_util_test.h
+++ b/openair1/SIMULATION/NR_UE_PHY/unit_tests/src/pss_util_test.h
--- a/openair1/SIMULATION/NR_UE_PHY/unit_tests/src/pucch_uci_test.c
+++ b/openair1/SIMULATION/NR_UE_PHY/unit_tests/src/pucch_uci_test.c
--- a/openair1/SIMULATION/NR_UE_PHY/unit_tests/src/srs_test.c
+++ b/openair1/SIMULATION/NR_UE_PHY/unit_tests/src/srs_test.c
--- a/openair1/SIMULATION/NR_UE_PHY/unit_tests/src/sss_test.c
+++ b/openair1/SIMULATION/NR_UE_PHY/unit_tests/src/sss_test.c
--- a/openair2/COMMON/platform_types.h
+++ b/openair2/COMMON/platform_types.h
@@ -68,6 +68,7 @@ typedef int32_t               sdu_size_t;
 typedef uint32_t              frame_t;
 typedef int32_t               sframe_t;
 typedef uint32_t              sub_frame_t;
+typedef uint32_t              slot_t;
 typedef uint8_t               module_id_t;
 typedef uint8_t               slice_id_t;
 typedef uint8_t               eNB_index_t;

--- a/openair2/LAYER2/NR_MAC_UE/config_ue.c
+++ b/openair2/LAYER2/NR_MAC_UE/config_ue.c
--- a/openair2/LAYER2/NR_MAC_UE/extern.h
+++ b/openair2/LAYER2/NR_MAC_UE/extern.h
--- a/openair2/LAYER2/NR_MAC_UE/mac.h
+++ b/openair2/LAYER2/NR_MAC_UE/mac.h
--- a/openair2/LAYER2/NR_MAC_UE/mac_defs.h
+++ b/openair2/LAYER2/NR_MAC_UE/mac_defs.h
--- a/openair2/NR_UE_PHY_INTERFACE/extern.h
+++ b/openair2/NR_UE_PHY_INTERFACE/extern.h
--- a/openair2/LAYER2/NR_MAC_UE/proto.h
+++ b/openair2/LAYER2/NR_MAC_UE/proto.h
--- a/openair2/LAYER2/NR_MAC_UE/mac_vars.c
+++ b/openair2/LAYER2/NR_MAC_UE/mac_vars.c
--- a/openair2/LAYER2/NR_MAC_UE/main_ue_nr.c
+++ b/openair2/LAYER2/NR_MAC_UE/main_ue_nr.c
--- a/openair2/LAYER2/NR_MAC_UE/nr_ue_procedures.c
+++ b/openair2/LAYER2/NR_MAC_UE/nr_ue_procedures.c
--- a/openair2/NR_UE_PHY_INTERFACE/NR_IF_Module.c
+++ b/openair2/NR_UE_PHY_INTERFACE/NR_IF_Module.c
--- a/openair2/NR_UE_PHY_INTERFACE/NR_IF_Module.h
+++ b/openair2/NR_UE_PHY_INTERFACE/NR_IF_Module.h
--- a/openair2/NR_UE_PHY_INTERFACE/defs.h
+++ b/openair2/NR_UE_PHY_INTERFACE/defs.h
--- a/openair2/NR_UE_PHY_INTERFACE/mac_phy_primitives.c
+++ b/openair2/NR_UE_PHY_INTERFACE/mac_phy_primitives.c
--- a/openair2/NR_UE_PHY_INTERFACE/mac_phy_primitives.h
+++ b/openair2/NR_UE_PHY_INTERFACE/mac_phy_primitives.h
--- a/openair2/RRC/NR_UE/L2_interface_ue.c
+++ b/openair2/RRC/NR_UE/L2_interface_ue.c
--- a/openair2/RRC/NR_UE/main_ue.c
+++ b/openair2/RRC/NR_UE/main_ue.c
--- a/openair2/RRC/NR_UE/rrc_UE.c
+++ b/openair2/RRC/NR_UE/rrc_UE.c
--- a/openair2/RRC/NR_UE/rrc_defs.h
+++ b/openair2/RRC/NR_UE/rrc_defs.h
--- a/openair2/RRC/NR_UE/rrc_list.h
+++ b/openair2/RRC/NR_UE/rrc_list.h
--- a/openair2/RRC/NR_UE/rrc_proto.h
+++ b/openair2/RRC/NR_UE/rrc_proto.h
--- a/openair2/RRC/NR_UE/rrc_vars.h
+++ b/openair2/RRC/NR_UE/rrc_vars.h
--- a/openair2/UTIL/LOG/log.h
+++ b/openair2/UTIL/LOG/log.h
--- a/targets/RT/USER/nr-ue.c
+++ b/targets/RT/USER/nr-ue.c